From e3b0d7219e1ea269ccd7c5f04747ad21f62c73b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <fdelawarde@wirelessmundi.com>
Date: Sun, 6 Jul 2014 16:57:50 +0200
Subject: [PATCH 001/130] Fix BLF confusion when dealing with the same
 extension in multiple domains

---
 src/mod/endpoints/mod_sofia/sofia_presence.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 50ee7d36c0..259b9097f3 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -877,15 +877,16 @@ static void do_dialog_probe(switch_event_t *event)
 							 "sip_subscriptions.call_id='%q' "
 							 "left join sip_registrations on sip_registrations.hostname=sip_dialogs.hostname and "
 							 "sip_registrations.profile_name=sip_dialogs.profile_name and "
-							 "(sip_dialogs.sip_from_user = sip_registrations.sip_user "
-							 "and (sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
+							 "(sip_dialogs.sip_from_user = sip_registrations.sip_user and sip_dialogs.sip_from_host = '%q' and "
+							 "(sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
 							 "sip_dialogs.sip_from_host = sip_registrations.sip_host) ) "
 							 "where sip_dialogs.hostname='%q' and sip_dialogs.profile_name='%q' and "
 							 "sip_dialogs.call_info_state != 'seized' and sip_dialogs.presence_id='%q@%q' or (sip_registrations.sip_user='%q' and "
 							 "(sip_registrations.orig_server_host='%q' or sip_registrations.sub_host='%q' "
 							 "or sip_registrations.presence_hosts like '%%%q%%'))",
 							 probe_euser, probe_host,
-							 sub_call_id, mod_sofia_globals.hostname, profile->name,
+							 sub_call_id, probe_host,
+							 mod_sofia_globals.hostname, profile->name,
 							 probe_euser, probe_host,
 							 probe_euser, probe_host, probe_host, probe_host);
 		switch_assert(sql);

From 025fe24632539509fd5d166836784333163ec095 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 15 Jul 2014 22:25:32 +0500
Subject: [PATCH 002/130] minor tweak

---
 html5/verto/demo/js/verto-min.js   | 3 ++-
 html5/verto/js/src/jquery.verto.js | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index 6c5f942a1d..236d5b45ba 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -121,7 +121,8 @@ verto.sendMethod("verto.broadcast",msg);};$.verto.prototype.purge=function(callI
 x++;verto.dialogs[i].setState($.verto.enum.state.purge);}
 for(i in verto.eventSUBS){if(verto.eventSUBS[i]){console.log("purging subscription: "+i);delete verto.eventSUBS[i];}}};$.verto.prototype.hangup=function(callID){var verto=this;if(callID){var dialog=verto.dialogs[callID];if(dialog){dialog.hangup();}}else{for(var i in verto.dialogs){verto.dialogs[i].hangup();}}};$.verto.prototype.newCall=function(args,callbacks){var verto=this;if(!verto.rpcClient.socketReady()){console.error("Not Connected...");return;}
 var dialog=new $.verto.dialog($.verto.enum.direction.outbound,this,args);dialog.invite();if(callbacks){dialog.callbacks=callbacks;}
-return dialog;};$.verto.prototype.handleMessage=function(data){var verto=this;if(data.params.callID){var dialog=verto.dialogs[data.params.callID];if(dialog){switch(data.method){case'verto.bye':dialog.hangup(data.params);break;case'verto.answer':dialog.handleAnswer(data.params);break;case'verto.media':dialog.handleMedia(data.params);break;case'verto.display':dialog.handleDisplay(data.params);break;case'verto.info':dialog.handleInfo(data.params);break;default:console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED",data.method);break;}}else{switch(data.method){case'verto.attach':data.params.attach=true;if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.useVideo=true;}
+return dialog;};$.verto.prototype.handleMessage=function(data){var verto=this;if(!(data&&data.method)){console.error("Invalid Data",data);return;}
+if(data.params.callID){var dialog=verto.dialogs[data.params.callID];if(dialog){switch(data.method){case'verto.bye':dialog.hangup(data.params);break;case'verto.answer':dialog.handleAnswer(data.params);break;case'verto.media':dialog.handleMedia(data.params);break;case'verto.display':dialog.handleDisplay(data.params);break;case'verto.info':dialog.handleInfo(data.params);break;default:console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED",dialog,data.method);break;}}else{switch(data.method){case'verto.attach':data.params.attach=true;if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.useVideo=true;}
 if(data.params.sdp&&data.params.sdp.indexOf("stereo=1")>0){data.params.useStereo=true;}
 dialog=new $.verto.dialog($.verto.enum.direction.inbound,verto,data.params);break;case'verto.invite':if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.wantVideo=true;}
 if(data.params.sdp&&data.params.sdp.indexOf("stereo=1")>0){data.params.useStereo=true;}
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 2fc091bdd2..e56503dd3f 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -414,6 +414,11 @@
     $.verto.prototype.handleMessage = function(data) {
         var verto = this;
 
+	if (!(data && data.method)) {
+	    console.error("Invalid Data", data);
+	    return;
+	}
+
         if (data.params.callID) {
             var dialog = verto.dialogs[data.params.callID];
 
@@ -436,7 +441,7 @@
                     dialog.handleInfo(data.params);
                     break;
                 default:
-                    console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED", data.method);
+                    console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED", dialog, data.method);
                     break;
                 }
             } else {

From 4e34aa639ad1c829a28e4ac98d9851699210a803 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 15 Jul 2014 23:01:56 +0500
Subject: [PATCH 003/130] hash auto dialing

---
 html5/verto/demo/verto.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 393641dc5d..65d23bb03c 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -368,6 +368,13 @@ function init() {
 $(document).ready(function() {
     init();
     $("#page-incall").on("pagebeforechange", function(event) {});
+
+    if (window.location.hash) {
+	var hash = window.location.hash.substring(1);
+	$("#ext").val(hash);
+	$("#callbtn").trigger("click");
+    }
+
 });
 
 $(document).bind("pagebeforechange", function(e, data) {

From 58f7376fea08be493ee1536474052a5cd38a07f4 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 15 Jul 2014 23:34:01 +0500
Subject: [PATCH 004/130] update

---
 html5/verto/demo/verto.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 65d23bb03c..a39dc991ec 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -371,8 +371,10 @@ $(document).ready(function() {
 
     if (window.location.hash) {
 	var hash = window.location.hash.substring(1);
-	$("#ext").val(hash);
-	$("#callbtn").trigger("click");
+	if (hash && !hash.contains("page-")) {
+	    $("#ext").val(hash);
+	    $("#callbtn").trigger("click");
+	}
     }
 
 });

From 6174a80e7c3f07a6748e6d6acf2c21f5cf9e7000 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 15 Jul 2014 23:49:22 +0500
Subject: [PATCH 005/130] revert

---
 html5/verto/demo/verto.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index a39dc991ec..393641dc5d 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -368,15 +368,6 @@ function init() {
 $(document).ready(function() {
     init();
     $("#page-incall").on("pagebeforechange", function(event) {});
-
-    if (window.location.hash) {
-	var hash = window.location.hash.substring(1);
-	if (hash && !hash.contains("page-")) {
-	    $("#ext").val(hash);
-	    $("#callbtn").trigger("click");
-	}
-    }
-
 });
 
 $(document).bind("pagebeforechange", function(e, data) {

From 6f12de990a462ffec7b6f6d5c70abff4199f8f88 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 00:11:48 +0500
Subject: [PATCH 006/130] hash dial take 2

---
 html5/verto/demo/verto.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 393641dc5d..e4017e7dcb 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -366,8 +366,24 @@ function init() {
 }
 
 $(document).ready(function() {
+    var autocall = false;
+    var hash = window.location.hash.substring(1);    
+
+    if (hash && hash.indexOf("page-") == -1) {
+	window.location.hash = "";
+	autocall = true;
+    }
+
     init();
+
     $("#page-incall").on("pagebeforechange", function(event) {});
+
+    if (autocall) {
+	$("#ext").val(hash);
+	$("#callbtn").trigger("click");
+    }
+
+
 });
 
 $(document).bind("pagebeforechange", function(e, data) {

From db63dc58844f0d5d516c185f4b206449b3040454 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 00:37:09 +0500
Subject: [PATCH 007/130] drop connection on bad write

---
 src/mod/endpoints/mod_verto/mod_verto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 54ee5af86d..48286c9d0d 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -548,6 +548,7 @@ static switch_ssize_t ws_write_json(jsock_t *jsock, cJSON **json, switch_bool_t
 
 	if (r <= 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE RETURNED ERROR %ld\n", r);
+		jsock->drop = 1;
 	}
 
 	return r;

From c58e64bf6d4e07592f7d9df5f150c7c5b9dd11cf Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 00:55:46 +0500
Subject: [PATCH 008/130] add some more headers to sip messages

---
 src/mod/endpoints/mod_sofia/sofia.c          |  2 +
 src/mod/endpoints/mod_sofia/sofia_presence.c | 70 +++++++++++++++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index a32cf56ab1..c5e2dfaa21 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -9673,6 +9673,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 				tech_pvt->x_freeswitch_support_remote = switch_core_session_strdup(session, un->un_value);
 			} else if (!strcasecmp(un->un_name, "Geolocation")) {
 				switch_channel_set_variable(channel, "sip_geolocation", un->un_value);
+			} else if (!strcasecmp(un->un_name, "Geolocation-Error")) {
+				switch_channel_set_variable(channel, "sip_geolocation_error", un->un_value);
 			} else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2) || !strcasecmp(un->un_name, "User-to-User")) {
 				if (!zstr(un->un_value)) {
 					char new_name[512] = "";
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 50ee7d36c0..e8e4b5b825 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -4807,6 +4807,8 @@ void sofia_presence_handle_sip_i_message(int status,
 			char *p;
 			char *full_from;
 			char proto[512] = SOFIA_CHAT_PROTO;
+			sip_unknown_t *un;
+			int first_history_info = 1;
 
 			full_from = sip_header_as_string(nh->nh_home, (void *) sip->sip_from);
 
@@ -4852,10 +4854,76 @@ void sofia_presence_handle_sip_i_message(int status,
 				} else {
 					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "text/plain");
 				}
-
+				
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_full", full_from);
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_profile", profile->name);
+				
 
+				if (sip->sip_call_info) {
+					sip_call_info_t *call_info = sip->sip_call_info;
+					char *ci = sip_header_as_string(nua_handle_home(nh), (void *) call_info);
+					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_call_info", ci);
+				}
+				
+				/* Loop thru unknown Headers Here so we can do something with them */
+				for (un = sip->sip_unknown; un; un = un->un_next) {
+					if (!strncasecmp(un->un_name, "Diversion", 9)) {
+						/* Basic Diversion Support for Diversion Indication in SIP */
+						/* draft-levy-sip-diversion-08 */
+						if (!zstr(un->un_value)) {
+							char *tmp_name;
+							if ((tmp_name = switch_mprintf("%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name))) {
+								switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, tmp_name, un->un_value);
+								free(tmp_name);
+							}
+						}
+					} else if (!strncasecmp(un->un_name, "History-Info", 12)) {
+						if (first_history_info) {
+							/* If the header exists first time, make sure to remove old info and re-set the variable */
+							switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_history_info", un->un_value);
+							first_history_info = 0;
+						} else {
+							/* Append the History-Info into one long string */
+							const char *history_var = switch_channel_get_variable(channel, "sip_history_info");
+							if (!zstr(history_var)) {
+								char *tmp_str;
+								if ((tmp_str = switch_mprintf("%s, %s", history_var, un->un_value))) {
+									switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_history_info", tmp_str);
+									free(tmp_str);
+								} else {
+									switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_history_info", un->un_value);
+								}
+							} else {
+								switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_history_info", un->un_value);
+							}
+						}
+					} else if (!strcasecmp(un->un_name, "Geolocation")) {
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_geolocation", un->un_value);
+					} else if (!strcasecmp(un->un_name, "Geolocation-Error")) {
+						switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "sip_geolocation_error", un->un_value);
+					} else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2) || !strcasecmp(un->un_name, "User-to-User")) {
+						if (!zstr(un->un_value)) {
+							char new_name[512] = "";
+							int reps = 0;
+							for (;;) {
+								char postfix[25] = "";
+								if (reps > 0) {
+									switch_snprintf(postfix, sizeof(postfix), "-%d", reps);
+								}
+								reps++;
+								switch_snprintf(new_name, sizeof(new_name), "%s%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name, postfix);
+
+								if (switch_channel_get_variable(channel, new_name)) {
+									continue;
+								}
+
+								switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, new_name, un->un_value);
+								break;
+							}
+						}
+					}
+				}
+				
 				if (msg) {
 					switch_event_add_body(event, "%s", msg);
 				}

From 41ea9c5af7a2c8c06243666f13816154a9408836 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 15 Jul 2014 16:45:58 -0500
Subject: [PATCH 009/130] LONG LIVE git.freeswitch.org, still using it? UPDATE
 UPDATE UPDATE also subscribe to mailing list or follow us @freeswitch on
 twitter...

---
 build/Makefile.centos5   | 2 +-
 build/Makefile.centos6   | 2 +-
 build/Makefile.solaris11 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/Makefile.centos5 b/build/Makefile.centos5
index 79d3e1465f..7eab269d46 100644
--- a/build/Makefile.centos5
+++ b/build/Makefile.centos5
@@ -29,7 +29,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone git://git.freeswitch.org/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git  freeswitch.git
 
 install: freeswitch
 	cd freeswitch.git && make install
diff --git a/build/Makefile.centos6 b/build/Makefile.centos6
index 9c27f2e7ad..c0dd9b761f 100644
--- a/build/Makefile.centos6
+++ b/build/Makefile.centos6
@@ -19,7 +19,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone git://git.freeswitch.org/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git freeswitch.git
 
 rpmforge:
 	(which rpm && rpm -i http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm) || true
diff --git a/build/Makefile.solaris11 b/build/Makefile.solaris11
index 59557b2d1c..0097ba1196 100644
--- a/build/Makefile.solaris11
+++ b/build/Makefile.solaris11
@@ -31,7 +31,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone git://git.freeswitch.org/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git  freeswitch.git
 
 install: freeswitch
 	cd freeswitch.git && gmake install

From e75d7067463c3fe743b792e4a08c9b7091829672 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 03:01:30 +0500
Subject: [PATCH 010/130] remove select call from switch_nat.c

---
 src/include/switch_apr.h |  5 ++++-
 src/switch_apr.c         | 10 ++++++++++
 src/switch_nat.c         | 28 ++++++++++++++++++++++------
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 387cc7a94f..c723a533e3 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -1389,6 +1389,9 @@ SWITCH_DECLARE(switch_status_t) switch_pollset_poll(switch_pollset_t *pollset, s
 */
 SWITCH_DECLARE(switch_status_t) switch_socket_create_pollset(switch_pollfd_t ** poll, switch_socket_t *sock, int16_t flags, switch_memory_pool_t *pool);
 
+SWITCH_DECLARE(switch_interval_time_t) switch_interval_time_from_timeval(struct timeval *tvp);
+																
+
 /*!
   \brief Create a pollfd out of a socket
   \param pollfd the pollfd to create
@@ -1402,7 +1405,7 @@ SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **po
 SWITCH_DECLARE(switch_status_t) switch_match_glob(const char *pattern, switch_array_header_t ** result, switch_memory_pool_t *pool);
 SWITCH_DECLARE(switch_status_t) switch_os_sock_get(switch_os_socket_t *thesock, switch_socket_t *sock);
 SWITCH_DECLARE(switch_status_t) switch_socket_addr_get(switch_sockaddr_t ** sa, switch_bool_t remote, switch_socket_t *sock);
-
+SWITCH_DECLARE(switch_status_t) switch_os_sock_put(switch_socket_t **sock, switch_os_socket_t *thesock, switch_memory_pool_t *pool);
 /**
  * Create an anonymous pipe.
  * @param in The file descriptor to use as input to the pipe.
diff --git a/src/switch_apr.c b/src/switch_apr.c
index 7b41c60af4..a12ae2ddeb 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -646,8 +646,18 @@ SWITCH_DECLARE(switch_status_t) switch_thread_create(switch_thread_t ** new_thre
 	return apr_thread_create(new_thread, attr, func, data, cont);
 }
 
+SWITCH_DECLARE(switch_interval_time_t) switch_interval_time_from_timeval(struct timeval *tvp)
+{
+	return ((switch_interval_time_t)tvp->tv_sec * 1000000) + tvp->tv_usec / 1000;
+}
+
 /* socket stubs */
 
+SWITCH_DECLARE(switch_status_t) switch_os_sock_put(switch_socket_t **sock, switch_os_socket_t *thesock, switch_memory_pool_t *pool)
+{
+	return apr_os_sock_put(sock, thesock, pool);
+}
+
 SWITCH_DECLARE(switch_status_t) switch_os_sock_get(switch_os_socket_t *thesock, switch_socket_t *sock)
 {
 	return apr_os_sock_get(thesock, sock);
diff --git a/src/switch_nat.c b/src/switch_nat.c
index 3e404ae985..503fa891c3 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -149,9 +149,13 @@ static int get_pmp_pubaddr(char *pub_addr)
 	int r = 0, i = 0, max = 5;
 	natpmpresp_t response;
 	char *pubaddr = NULL;
-	fd_set fds;
 	natpmp_t natpmp;
 	const char *err = NULL;
+	switch_pollfd_t *pollfd = NULL;
+	switch_socket_t *sock = NULL;
+	switch_memory_pool_t *pool;
+	int32_t num = 0;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
 
 	if ((r = initnatpmp(&natpmp)) < 0) {
 		err = "init failed";
@@ -163,24 +167,34 @@ static int get_pmp_pubaddr(char *pub_addr)
 		goto end;
 	}
 
+	switch_core_new_memory_pool(&pool);
+
+	switch_os_sock_put(&sock, &natpmp.s, pool);
+
+	if (switch_socket_create_pollset(&pollfd, sock, SWITCH_POLLIN | SWITCH_POLLERR, pool) != SWITCH_STATUS_SUCCESS) {
+		err = "cannot create pollset";
+		goto end;
+	}
+
 	do {
 		struct timeval timeout = { 1, 0 };
 		i++;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP %d/%d\n", i, max);
 
-		FD_ZERO(&fds);
-		FD_SET(natpmp.s, &fds);
-
 		if ((r = getnatpmprequesttimeout(&natpmp, &timeout)) < 0) {
 			err = "get timeout failed";
 			goto end;
 		}
+		
+		status = switch_poll(pollfd, 1, &num, switch_interval_time_from_timeval(&timeout));
 
-		if ((r = select(FD_SETSIZE, &fds, NULL, NULL, &timeout)) < 0) {
-			err = "select failed";
+		if (!(status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_TIMEOUT)) {
+			err = "poll failed";
 			goto end;
 		}
+
 		r = readnatpmpresponseorretry(&natpmp, &response);
+
 	} while (r == NATPMP_TRYAGAIN && i < max);
 
 	if (r < 0) {
@@ -196,6 +210,8 @@ static int get_pmp_pubaddr(char *pub_addr)
 
   end:
 
+	switch_core_destroy_memory_pool(&pool);
+
 	if (err) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error checking for PMP [%s]\n", err);
 	}

From 8d11e8abb1342543917663f7b4eaa97ecbf10017 Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@freeswitch.org>
Date: Tue, 15 Jul 2014 17:34:16 -0500
Subject: [PATCH 011/130] git.freeswitch.org is DEAD... Long Live git via
 http://stash.freeswitch.org

---
 Makefile.am            | 2 +-
 debian/README.source   | 2 +-
 debian/bootstrap.sh    | 4 ++--
 docs/SubmittingPatches | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0ec757d9c..5ea5ef389f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -547,7 +547,7 @@ is-scm:
 		echo ; echo ; \
 		echo "*****************************************************************************************************" ; \
 		echo "You cannot update a release tarball without a git tree.  Please clone FreeSWITCH as so:              " ; \
-		echo "  git clone git://git.freeswitch.org/freeswitch.git                                                  " ; \
+		echo "  git clone https://stash.freeswitch.org/scm/fs/freeswitch.git                                       " ; \
 		echo "*****************************************************************************************************" ; \
 		echo ; echo ; \
 		exit 1; \
diff --git a/debian/README.source b/debian/README.source
index f6fe1c1d9d..f067c0ebe4 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -18,7 +18,7 @@ of a FreeSWITCH git repository.  You can achieve this with:
 
     aptitude update && aptitude install -y git
     mkdir -p /usr/src/freeswitch
-    git clone git://git.freeswitch.org/freeswitch /usr/src/freeswitch/src
+    git clone https://stash.freeswitch.org/scm/fs/freeswitch.git /usr/src/freeswitch/src
     cd /usr/src/freeswitch/src
 
 Ensuring you have a clean build directory
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 4716dd7c78..b71ab98265 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -306,8 +306,8 @@ Build-Depends:
  $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3
 Homepage: http://freeswitch.org/
-Vcs-Git: git://git.freeswitch.org/freeswitch
-Vcs-Browser: http://git.freeswitch.org/git/freeswitch/
+Vcs-Git: https://stash.freeswitch.org/scm/fs/freeswitch.git
+Vcs-Browser: https://stash.freeswitch.org/projects/FS/repos/freeswitch/browse
 
 EOF
 }
diff --git a/docs/SubmittingPatches b/docs/SubmittingPatches
index 13cfa5c601..8e9b9d9e94 100644
--- a/docs/SubmittingPatches
+++ b/docs/SubmittingPatches
@@ -4,7 +4,7 @@ How to Contribute Patches to FreeSWITCH
 Download the Source Code
 ------------------------
 
-    git clone git://git.freeswitch.org/freeswitch.git
+    git clone https://stash.freeswitch.org/scm/fs/freeswitch.git
     cd freeswitch
 
 Create Your Patch

From 4042571003f64a368e8465ddb24de77fedaaeca6 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 15 Jul 2014 19:09:19 -0500
Subject: [PATCH 012/130] swigall

---
 .../src/org/freeswitch/swig/freeswitch.java   |   8 +
 .../org/freeswitch/swig/freeswitchJNI.java    |   2 +
 .../languages/mod_java/switch_swig_wrap.cpp   |  76 ++++++++
 src/mod/languages/mod_lua/mod_lua_wrap.cpp    |  66 +++++++
 .../languages/mod_managed/freeswitch_wrap.cxx |  10 ++
 src/mod/languages/mod_managed/managed/swig.cs |   7 +
 src/mod/languages/mod_perl/freeswitch.pm      |   2 +
 src/mod/languages/mod_perl/mod_perl_wrap.cpp  | 170 ++++++++++++++++--
 src/mod/languages/mod_python/freeswitch.py    |   2 +
 .../languages/mod_python/mod_python_wrap.cpp  | 154 +++++++++++++++-
 .../legacy/languages/mod_lua/mod_lua_wrap.cpp |  66 +++++++
 11 files changed, 543 insertions(+), 20 deletions(-)

diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
index 48c03c2f10..095fa05872 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
@@ -25,6 +25,10 @@ public class freeswitch {
     freeswitchJNI.consoleCleanLog(msg);
   }
 
+  public static void consoleChannelLog(String level_str, String file, String func, int line, String msg) {
+    freeswitchJNI.consoleChannelLog(level_str, file, func, line, msg);
+  }
+
   public static boolean running() {
     return freeswitchJNI.running();
   }
@@ -41,6 +45,10 @@ public class freeswitch {
     freeswitchJNI.console_clean_log(msg);
   }
 
+  public static void console_channel_log(String level_str, String file, String func, int line, String msg) {
+    freeswitchJNI.console_channel_log(level_str, file, func, line, msg);
+  }
+
   public static void msleep(long ms) {
     freeswitchJNI.msleep(ms);
   }
diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
index 111f128863..4a5e352964 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
@@ -13,6 +13,7 @@ class freeswitchJNI {
   public final static native String getGlobalVariable(String jarg1);
   public final static native void consoleLog(String jarg1, String jarg2);
   public final static native void consoleCleanLog(String jarg1);
+  public final static native void consoleChannelLog(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native boolean running();
   public final static native boolean email(String jarg1, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7);
   public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, String jarg9, String jarg10, String jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17);
@@ -160,6 +161,7 @@ class freeswitchJNI {
   public final static native void CoreSession_consoleLog(long jarg1, CoreSession jarg1_, String jarg2, String jarg3);
   public final static native void console_log(String jarg1, String jarg2);
   public final static native void console_clean_log(String jarg1);
+  public final static native void console_channel_log(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native void msleep(long jarg1);
   public final static native void bridge(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_);
   public final static native long hanguphook(long jarg1);
diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp
index fee7726382..fab99e45f5 100644
--- a/src/mod/languages/mod_java/switch_swig_wrap.cpp
+++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp
@@ -287,6 +287,44 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleCleanLog(J
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleChannelLog(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = 0;
+  if (jarg1) {
+    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
+    if (!arg1) return ;
+  }
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return ;
+  }
+  arg3 = 0;
+  if (jarg3) {
+    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+    if (!arg3) return ;
+  }
+  arg4 = (int)jarg4; 
+  arg5 = 0;
+  if (jarg5) {
+    arg5 = (char *)jenv->GetStringUTFChars(jarg5, 0);
+    if (!arg5) return ;
+  }
+  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+  if (arg5) jenv->ReleaseStringUTFChars(jarg5, (const char *)arg5);
+}
+
+
 SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_running(JNIEnv *jenv, jclass jcls) {
   jboolean jresult = 0 ;
   bool result;
@@ -3163,6 +3201,44 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1clean_1l
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1channel_1log(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = 0;
+  if (jarg1) {
+    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
+    if (!arg1) return ;
+  }
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return ;
+  }
+  arg3 = 0;
+  if (jarg3) {
+    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+    if (!arg3) return ;
+  }
+  arg4 = (int)jarg4; 
+  arg5 = 0;
+  if (jarg5) {
+    arg5 = (char *)jenv->GetStringUTFChars(jarg5, 0);
+    if (!arg5) return ;
+  }
+  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+  if (arg5) jenv->ReleaseStringUTFChars(jarg5, (const char *)arg5);
+}
+
+
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_msleep(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   unsigned int arg1 ;
   
diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index 21e22ed53d..25ba089d21 100644
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -1627,6 +1627,38 @@ fail:
 }
 
 
+static int _wrap_consoleChannelLog(lua_State* L) {
+  int SWIG_arg = -1;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  SWIG_check_num_args("consoleChannelLog",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleChannelLog",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleChannelLog",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleChannelLog",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleChannelLog",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleChannelLog",5,"char *");
+  arg1 = (char *)lua_tostring(L, 1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static int _wrap_running(lua_State* L) {
   int SWIG_arg = -1;
   bool result;
@@ -6295,6 +6327,38 @@ fail:
 }
 
 
+static int _wrap_console_channel_log(lua_State* L) {
+  int SWIG_arg = -1;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  SWIG_check_num_args("console_channel_log",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_channel_log",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("console_channel_log",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("console_channel_log",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_channel_log",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("console_channel_log",5,"char *");
+  arg1 = (char *)lua_tostring(L, 1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static int _wrap_msleep(lua_State* L) {
   int SWIG_arg = -1;
   unsigned int arg1 ;
@@ -7918,10 +7982,12 @@ static const struct luaL_Reg swig_commands[] = {
     { "getGlobalVariable", _wrap_getGlobalVariable},
     { "consoleLog", _wrap_consoleLog},
     { "consoleCleanLog", _wrap_consoleCleanLog},
+    { "consoleChannelLog", _wrap_consoleChannelLog},
     { "running", _wrap_running},
     { "email", _wrap_email},
     { "console_log", _wrap_console_log},
     { "console_clean_log", _wrap_console_clean_log},
+    { "console_channel_log", _wrap_console_channel_log},
     { "msleep", _wrap_msleep},
     { "bridge", _wrap_bridge},
     { "hanguphook", _wrap_hanguphook},
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index 22c248e64d..f03a35cca1 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -29704,6 +29704,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_init(void * jarg1, void * jarg2
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_presence_data_vals(void * jarg1, char * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_channel_set_presence_data_vals(arg1,(char const *)arg2);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_presence(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, int jarg7) {
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;
   char *arg2 = (char *) 0 ;
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index c628160b7e..0e8aec3d4c 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -4186,6 +4186,10 @@ public class freeswitch {
     return ret;
   }
 
+  public static void switch_channel_set_presence_data_vals(SWIGTYPE_p_switch_channel channel, string presence_data_cols) {
+    freeswitchPINVOKE.switch_channel_set_presence_data_vals(SWIGTYPE_p_switch_channel.getCPtr(channel), presence_data_cols);
+  }
+
   public static void switch_channel_perform_presence(SWIGTYPE_p_switch_channel channel, string rpid, string status, string id, string file, string func, int line) {
     freeswitchPINVOKE.switch_channel_perform_presence(SWIGTYPE_p_switch_channel.getCPtr(channel), rpid, status, id, file, func, line);
   }
@@ -14661,6 +14665,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_init")]
   public static extern int switch_channel_init(HandleRef jarg1, HandleRef jarg2, int jarg3, int jarg4);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_presence_data_vals")]
+  public static extern void switch_channel_set_presence_data_vals(HandleRef jarg1, string jarg2);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_perform_presence")]
   public static extern void switch_channel_perform_presence(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, int jarg7);
 
diff --git a/src/mod/languages/mod_perl/freeswitch.pm b/src/mod/languages/mod_perl/freeswitch.pm
index 93f024e28f..6b9ffbe6f2 100644
--- a/src/mod/languages/mod_perl/freeswitch.pm
+++ b/src/mod/languages/mod_perl/freeswitch.pm
@@ -52,10 +52,12 @@ package freeswitch;
 *getGlobalVariable = *freeswitchc::getGlobalVariable;
 *consoleLog = *freeswitchc::consoleLog;
 *consoleCleanLog = *freeswitchc::consoleCleanLog;
+*consoleChannelLog = *freeswitchc::consoleChannelLog;
 *running = *freeswitchc::running;
 *email = *freeswitchc::email;
 *console_log = *freeswitchc::console_log;
 *console_clean_log = *freeswitchc::console_clean_log;
+*console_channel_log = *freeswitchc::console_channel_log;
 *msleep = *freeswitchc::msleep;
 *bridge = *freeswitchc::bridge;
 *hanguphook = *freeswitchc::hanguphook;
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index d34db2d079..45a917174b 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -1586,19 +1586,6 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
-SWIGINTERNINLINE SV *
-SWIG_From_bool  SWIG_PERL_DECL_ARGS_1(bool value)
-{    
-  SV *obj = sv_newmortal();
-  if (value) {
-    sv_setsv(obj, &PL_sv_yes);
-  } else {
-    sv_setsv(obj, &PL_sv_no); 
-  }
-  return obj;
-}
-
-
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
 # if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
@@ -1727,6 +1714,19 @@ SWIG_AsVal_int SWIG_PERL_DECL_ARGS_2(SV * obj, int *val)
 }
 
 
+SWIGINTERNINLINE SV *
+SWIG_From_bool  SWIG_PERL_DECL_ARGS_1(bool value)
+{    
+  SV *obj = sv_newmortal();
+  if (value) {
+    sv_setsv(obj, &PL_sv_yes);
+  } else {
+    sv_setsv(obj, &PL_sv_no); 
+  }
+  return obj;
+}
+
+
 SWIGINTERNINLINE SV *
 SWIG_From_long  SWIG_PERL_DECL_ARGS_1(long value)
 {    
@@ -2051,6 +2051,77 @@ XS(_wrap_consoleCleanLog) {
 }
 
 
+XS(_wrap_consoleChannelLog) {
+  {
+    char *arg1 = (char *) 0 ;
+    char *arg2 = (char *) 0 ;
+    char *arg3 = (char *) 0 ;
+    int arg4 ;
+    char *arg5 = (char *) 0 ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 5) || (items > 5)) {
+      SWIG_croak("Usage: consoleChannelLog(level_str,file,func,line,msg);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleChannelLog" "', argument " "1"" of type '" "char *""'");
+    }
+    arg1 = reinterpret_cast< char * >(buf1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleChannelLog" "', argument " "2"" of type '" "char *""'");
+    }
+    arg2 = reinterpret_cast< char * >(buf2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleChannelLog" "', argument " "3"" of type '" "char *""'");
+    }
+    arg3 = reinterpret_cast< char * >(buf3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleChannelLog" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleChannelLog" "', argument " "5"" of type '" "char *""'");
+    }
+    arg5 = reinterpret_cast< char * >(buf5);
+    consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+    
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    
+    if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    
+    if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_running) {
   {
     bool result;
@@ -8179,6 +8250,77 @@ XS(_wrap_console_clean_log) {
 }
 
 
+XS(_wrap_console_channel_log) {
+  {
+    char *arg1 = (char *) 0 ;
+    char *arg2 = (char *) 0 ;
+    char *arg3 = (char *) 0 ;
+    int arg4 ;
+    char *arg5 = (char *) 0 ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 5) || (items > 5)) {
+      SWIG_croak("Usage: console_channel_log(level_str,file,func,line,msg);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_channel_log" "', argument " "1"" of type '" "char *""'");
+    }
+    arg1 = reinterpret_cast< char * >(buf1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_channel_log" "', argument " "2"" of type '" "char *""'");
+    }
+    arg2 = reinterpret_cast< char * >(buf2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_channel_log" "', argument " "3"" of type '" "char *""'");
+    }
+    arg3 = reinterpret_cast< char * >(buf3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_channel_log" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_channel_log" "', argument " "5"" of type '" "char *""'");
+    }
+    arg5 = reinterpret_cast< char * >(buf5);
+    console_channel_log(arg1,arg2,arg3,arg4,arg5);
+    
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    
+    if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    
+    if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_msleep) {
   {
     unsigned int arg1 ;
@@ -9808,6 +9950,7 @@ static swig_command_info swig_commands[] = {
 {"freeswitchc::getGlobalVariable", _wrap_getGlobalVariable},
 {"freeswitchc::consoleLog", _wrap_consoleLog},
 {"freeswitchc::consoleCleanLog", _wrap_consoleCleanLog},
+{"freeswitchc::consoleChannelLog", _wrap_consoleChannelLog},
 {"freeswitchc::running", _wrap_running},
 {"freeswitchc::email", _wrap_email},
 {"freeswitchc::new_IVRMenu", _wrap_new_IVRMenu},
@@ -9948,6 +10091,7 @@ static swig_command_info swig_commands[] = {
 {"freeswitchc::CoreSession_consoleLog", _wrap_CoreSession_consoleLog},
 {"freeswitchc::console_log", _wrap_console_log},
 {"freeswitchc::console_clean_log", _wrap_console_clean_log},
+{"freeswitchc::console_channel_log", _wrap_console_channel_log},
 {"freeswitchc::msleep", _wrap_msleep},
 {"freeswitchc::bridge", _wrap_bridge},
 {"freeswitchc::hanguphook", _wrap_hanguphook},
diff --git a/src/mod/languages/mod_python/freeswitch.py b/src/mod/languages/mod_python/freeswitch.py
index 27ed50a7c5..a48afef5d3 100644
--- a/src/mod/languages/mod_python/freeswitch.py
+++ b/src/mod/languages/mod_python/freeswitch.py
@@ -52,6 +52,7 @@ setGlobalVariable = _freeswitch.setGlobalVariable
 getGlobalVariable = _freeswitch.getGlobalVariable
 consoleLog = _freeswitch.consoleLog
 consoleCleanLog = _freeswitch.consoleCleanLog
+consoleChannelLog = _freeswitch.consoleChannelLog
 running = _freeswitch.running
 email = _freeswitch.email
 class IVRMenu(_object):
@@ -323,6 +324,7 @@ CoreSession_swigregister(CoreSession)
 
 console_log = _freeswitch.console_log
 console_clean_log = _freeswitch.console_clean_log
+console_channel_log = _freeswitch.console_channel_log
 msleep = _freeswitch.msleep
 bridge = _freeswitch.bridge
 hanguphook = _freeswitch.hanguphook
diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp
index 8db6cc0c8f..f27e17a15a 100644
--- a/src/mod/languages/mod_python/mod_python_wrap.cpp
+++ b/src/mod/languages/mod_python/mod_python_wrap.cpp
@@ -2711,13 +2711,6 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
-SWIGINTERNINLINE PyObject*
-  SWIG_From_bool  (bool value)
-{
-  return PyBool_FromLong(value ? 1 : 0);
-}
-
-
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
 # if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
@@ -2863,6 +2856,13 @@ SWIG_AsVal_int (PyObject * obj, int *val)
 }
 
 
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool  (bool value)
+{
+  return PyBool_FromLong(value ? 1 : 0);
+}
+
+
   #define SWIG_From_long   PyInt_FromLong 
 
 
@@ -3133,6 +3133,75 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_consoleChannelLog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:consoleChannelLog",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleChannelLog" "', argument " "1"" of type '" "char *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleChannelLog" "', argument " "2"" of type '" "char *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleChannelLog" "', argument " "3"" of type '" "char *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleChannelLog" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleChannelLog" "', argument " "5"" of type '" "char *""'");
+  }
+  arg5 = reinterpret_cast< char * >(buf5);
+  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_running(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   bool result;
@@ -8387,6 +8456,75 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_console_channel_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:console_channel_log",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_channel_log" "', argument " "1"" of type '" "char *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_channel_log" "', argument " "2"" of type '" "char *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_channel_log" "', argument " "3"" of type '" "char *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_channel_log" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_channel_log" "', argument " "5"" of type '" "char *""'");
+  }
+  arg5 = reinterpret_cast< char * >(buf5);
+  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc5 == SWIG_NEWOBJ) delete[] buf5;
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_msleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   unsigned int arg1 ;
@@ -9318,6 +9456,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"getGlobalVariable", _wrap_getGlobalVariable, METH_VARARGS, NULL},
 	 { (char *)"consoleLog", _wrap_consoleLog, METH_VARARGS, NULL},
 	 { (char *)"consoleCleanLog", _wrap_consoleCleanLog, METH_VARARGS, NULL},
+	 { (char *)"consoleChannelLog", _wrap_consoleChannelLog, METH_VARARGS, NULL},
 	 { (char *)"running", _wrap_running, METH_VARARGS, NULL},
 	 { (char *)"email", _wrap_email, METH_VARARGS, NULL},
 	 { (char *)"new_IVRMenu", _wrap_new_IVRMenu, METH_VARARGS, NULL},
@@ -9466,6 +9605,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"CoreSession_swigregister", CoreSession_swigregister, METH_VARARGS, NULL},
 	 { (char *)"console_log", _wrap_console_log, METH_VARARGS, NULL},
 	 { (char *)"console_clean_log", _wrap_console_clean_log, METH_VARARGS, NULL},
+	 { (char *)"console_channel_log", _wrap_console_channel_log, METH_VARARGS, NULL},
 	 { (char *)"msleep", _wrap_msleep, METH_VARARGS, NULL},
 	 { (char *)"bridge", _wrap_bridge, METH_VARARGS, NULL},
 	 { (char *)"hanguphook", _wrap_hanguphook, METH_VARARGS, NULL},
diff --git a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
index b2877983a9..8fd3790a30 100644
--- a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
@@ -1627,6 +1627,38 @@ fail:
 }
 
 
+static int _wrap_consoleChannelLog(lua_State* L) {
+  int SWIG_arg = -1;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  SWIG_check_num_args("consoleChannelLog",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleChannelLog",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleChannelLog",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleChannelLog",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleChannelLog",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleChannelLog",5,"char *");
+  arg1 = (char *)lua_tostring(L, 1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static int _wrap_running(lua_State* L) {
   int SWIG_arg = -1;
   bool result;
@@ -6295,6 +6327,38 @@ fail:
 }
 
 
+static int _wrap_console_channel_log(lua_State* L) {
+  int SWIG_arg = -1;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  SWIG_check_num_args("console_channel_log",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_channel_log",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("console_channel_log",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("console_channel_log",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_channel_log",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("console_channel_log",5,"char *");
+  arg1 = (char *)lua_tostring(L, 1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static int _wrap_msleep(lua_State* L) {
   int SWIG_arg = -1;
   unsigned int arg1 ;
@@ -7918,10 +7982,12 @@ static const struct luaL_reg swig_commands[] = {
     { "getGlobalVariable", _wrap_getGlobalVariable},
     { "consoleLog", _wrap_consoleLog},
     { "consoleCleanLog", _wrap_consoleCleanLog},
+    { "consoleChannelLog", _wrap_consoleChannelLog},
     { "running", _wrap_running},
     { "email", _wrap_email},
     { "console_log", _wrap_console_log},
     { "console_clean_log", _wrap_console_clean_log},
+    { "console_channel_log", _wrap_console_channel_log},
     { "msleep", _wrap_msleep},
     { "bridge", _wrap_bridge},
     { "hanguphook", _wrap_hanguphook},

From 3526ca5cb5f5a960ae0b10e8f0e2187353228b60 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 16 Jul 2014 00:25:56 +0000
Subject: [PATCH 013/130] Allow setting threshold for RTP auto adjust

If we see a certain number of RTP packets from a host and port other
than was negotiated, we adjust to send our RTP to that host and port.
Traditionally we've waited for 10 packets.  This commit makes the
threshold adjustable by setting the channel variable
`rtp_auto_adjust_threshold` to any positive value less than 2^16.
---
 src/switch_rtp.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index de6a238852..a1a95ff092 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -301,6 +301,7 @@ struct switch_rtp {
 	rtcp_msg_t *rtcp_recv_msg_p;
 
 	uint32_t autoadj_window;
+	uint32_t autoadj_threshold;
 	uint32_t autoadj_tally;
 
 	srtp_ctx_t *send_ctx[2];
@@ -4112,7 +4113,19 @@ SWITCH_DECLARE(void) switch_rtp_set_flags(switch_rtp_t *rtp_session, switch_rtp_
 
 			if (i == SWITCH_RTP_FLAG_AUTOADJ) {
 				rtp_session->autoadj_window = 20;
+				rtp_session->autoadj_threshold = 10;
 				rtp_session->autoadj_tally = 0;
+				if (rtp_session->session) {
+					switch_channel_t *channel = switch_core_session_get_channel(rtp_session->session);
+					const char *x = switch_channel_get_variable(channel, "rtp_auto_adjust_threshold");
+					if (x && *x) {
+						int xn = atoi(x);
+						if (xn > 0 && xn <= 65535) {
+							rtp_session->autoadj_window = xn*2;
+							rtp_session->autoadj_threshold = xn;
+						}
+					}
+				}
 				rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE);
 			} else if (i == SWITCH_RTP_FLAG_NOBLOCK && rtp_session->sock_input) {
 				switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE);
@@ -4145,7 +4158,19 @@ SWITCH_DECLARE(void) switch_rtp_set_flag(switch_rtp_t *rtp_session, switch_rtp_f
 		reset_jitter_seq(rtp_session);
 	} else if (flag == SWITCH_RTP_FLAG_AUTOADJ) {
 		rtp_session->autoadj_window = 20;
+		rtp_session->autoadj_threshold = 10;
 		rtp_session->autoadj_tally = 0;
+		if (rtp_session->session) {
+			switch_channel_t *channel = switch_core_session_get_channel(rtp_session->session);
+			const char *x = switch_channel_get_variable(channel, "rtp_auto_adjust_threshold");
+			if (x && *x) {
+				int xn = atoi(x);
+				if (xn > 0 && xn <= 65535) {
+					rtp_session->autoadj_window = xn*2;
+					rtp_session->autoadj_threshold = xn;
+				}
+			}
+		}
 		rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE);
 		if (rtp_session->jb) {
 			stfu_n_reset(rtp_session->jb);
@@ -5583,7 +5608,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
 		if (bytes && rtp_session->flags[SWITCH_RTP_FLAG_AUTOADJ] && switch_sockaddr_get_port(rtp_session->from_addr)) {
 			if (!switch_cmp_addr(rtp_session->from_addr, rtp_session->remote_addr)) {
-				if (++rtp_session->autoadj_tally >= 10) {
+				if (++rtp_session->autoadj_tally >= rtp_session->autoadj_threshold) {
 					const char *err;
 					uint32_t old = rtp_session->remote_port;
 					const char *tx_host;

From 502cd3f659730d47c6098a480c0e9353caae63a9 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 15 Jul 2014 21:01:38 -0500
Subject: [PATCH 014/130] fix verto compile error on arm

---
 src/mod/endpoints/mod_verto/mod_verto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 48286c9d0d..74819c87d0 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -517,7 +517,7 @@ static switch_ssize_t ws_write_json(jsock_t *jsock, cJSON **json, switch_bool_t
 	switch_assert(json);
 
 	if (!*json) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE NULL JS ERROR %ld\n", r);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE NULL JS ERROR %" SWITCH_SIZE_T_FMT "\n", r);
 		return r;
 	}
 
@@ -547,7 +547,7 @@ static switch_ssize_t ws_write_json(jsock_t *jsock, cJSON **json, switch_bool_t
 	}
 
 	if (r <= 0) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE RETURNED ERROR %ld\n", r);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE RETURNED ERROR %" SWITCH_SIZE_T_FMT " \n", r);
 		jsock->drop = 1;
 	}
 

From 74262ee9649fd3e8f20b5e35412e1c245db8c8b2 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 16 Jul 2014 02:28:30 +0000
Subject: [PATCH 015/130] Add `session::consoleLog2()`

This allows emitting log messages that include the file name and line
number of the call.  Because we have the session object here, the log
messages can be correctly associated with the session from which they
were emitted.

As when the kernel developers need to 'fix' a system call, we'll just
add a number to the name of the existing function.
---
 src/include/switch_cpp.h |  1 +
 src/switch_cpp.cpp       | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index 9ccb04d39e..382c4b4fa1 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -392,6 +392,7 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod
 		 virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype) = 0;
 
 		 SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg);
+		 SWITCH_DECLARE(void) consoleLog2(char *level_str, char *file, char *func, int line, char *msg);
 	 };
 
 
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index 38481fd635..e00f4d6280 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1237,6 +1237,19 @@ SWITCH_DECLARE(void) CoreSession::consoleLog(char *level_str, char *msg)
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), level, "%s", switch_str_nil(msg));
 }
 
+SWITCH_DECLARE(void) CoreSession::consoleLog2(char *level_str, char *file, char *func, int line, char *msg)
+{
+	switch_log_level_t level = SWITCH_LOG_DEBUG;
+	if (level_str) {
+		level = switch_log_str2level(level_str);
+		if (level == SWITCH_LOG_INVALID) {
+			level = SWITCH_LOG_DEBUG;
+		}
+	}
+    switch_log_printf(SWITCH_CHANNEL_ID_SESSION, file, func, line, (const char*)session,
+					  level, "%s", switch_str_nil(msg));
+}
+
 /* ---- methods not bound to CoreSession instance ---- */
 
 

From d1ec643286afbc07fa44b327988b85141703e9f9 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 16 Jul 2014 02:40:15 +0000
Subject: [PATCH 016/130] Improve name of new console log function

The new console log function here isn't any more of a channel log than
the old one.  The name was bad, and no one could have been using this
yet since we just ran reswig.  We'll take the same tack the kernel
developers do when replacing a function with an otherwise equivalent
one with a better API.
---
 src/include/switch_cpp.h |  4 ++--
 src/switch_cpp.cpp       | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index 382c4b4fa1..13d41cb096 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -70,8 +70,8 @@ SWITCH_DECLARE(void) setGlobalVariable(char *var_name, char *var_val);
 SWITCH_DECLARE(char *) getGlobalVariable(char *var_name);
 
 SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg);
+SWITCH_DECLARE(void) consoleLog2(char *level_str, char *file, char *func, int line, char *msg);
 SWITCH_DECLARE(void) consoleCleanLog(char *msg);
-SWITCH_DECLARE(void) consoleChannelLog(char *level_str, char *file, char *func, int line, char *msg);
 SWITCH_DECLARE(bool) running(void);
 
 SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *body = NULL,
@@ -399,8 +399,8 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod
 /* ---- functions not bound to CoreSession instance ----- */
 
 SWITCH_DECLARE(void) console_log(char *level_str, char *msg);
+SWITCH_DECLARE(void) console_log2(char *level_str, char *file, char *func, int line, char *msg);
 SWITCH_DECLARE(void) console_clean_log(char *msg);
-SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func, int line, char *msg);
 SWITCH_DECLARE(void) switch_msleep(unsigned ms);
 
 /** \brief bridge the audio of session_b into session_a
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index e00f4d6280..b1613f3a26 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1287,16 +1287,16 @@ SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg)
 	return console_log(level_str, msg);
 }
 
+SWITCH_DECLARE(void) consoleLog2(char *level_str, char *file, char *func, int line, char *msg)
+{
+	return console_log2(level_str, file, func, line, msg);
+}
+
 SWITCH_DECLARE(void) consoleCleanLog(char *msg)
 {
 	return console_clean_log(msg);
 }
 
-SWITCH_DECLARE(void) consoleChannelLog(char *level_str, char *file, char *func, int line, char *msg)
-{
-    return console_channel_log(level_str, file, func, line, msg);
-}
-
 SWITCH_DECLARE(void) console_log(char *level_str, char *msg)
 {
     switch_log_level_t level = SWITCH_LOG_DEBUG;
@@ -1309,12 +1309,7 @@ SWITCH_DECLARE(void) console_log(char *level_str, char *msg)
     switch_log_printf(SWITCH_CHANNEL_LOG, level, "%s", switch_str_nil(msg));
 }
 
-SWITCH_DECLARE(void) console_clean_log(char *msg)
-{
-    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg));
-}
-
-SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func, int line, char *msg)
+SWITCH_DECLARE(void) console_log2(char *level_str, char *file, char *func, int line, char *msg)
 {
     switch_log_level_t level = SWITCH_LOG_DEBUG;
     if (level_str) {
@@ -1326,6 +1321,11 @@ SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func
     switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, level, "%s", switch_str_nil(msg));
 }
 
+SWITCH_DECLARE(void) console_clean_log(char *msg)
+{
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg));
+}
+
 SWITCH_DECLARE(bool) email(char *to, char *from, char *headers, char *body, char *file, char *convert_cmd, char *convert_ext)
 {
     if (switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext) == SWITCH_TRUE) {

From aab164b3e6a12946dafcbb2f7d20c63feb1d170f Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 16 Jul 2014 03:29:56 +0000
Subject: [PATCH 017/130] make swigall

---
 .../src/org/freeswitch/swig/CoreSession.java  |   4 +
 .../src/org/freeswitch/swig/freeswitch.java   |  16 +-
 .../org/freeswitch/swig/freeswitchJNI.java    |   5 +-
 .../languages/mod_java/switch_swig_wrap.cpp   | 109 +++++---
 src/mod/languages/mod_lua/mod_lua_wrap.cpp    | 124 +++++----
 .../languages/mod_managed/freeswitch_wrap.cxx |  58 +++--
 src/mod/languages/mod_perl/freeswitch.pm      |   5 +-
 src/mod/languages/mod_perl/mod_perl_wrap.cpp  | 236 ++++++++++++------
 src/mod/languages/mod_python/freeswitch.py    |   5 +-
 .../languages/mod_python/mod_python_wrap.cpp  | 211 +++++++++++-----
 .../legacy/languages/mod_lua/mod_lua_wrap.cpp | 124 +++++----
 11 files changed, 602 insertions(+), 295 deletions(-)

diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java
index d00693fa86..e8f8f35a6e 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java
@@ -317,4 +317,8 @@ public class CoreSession {
     freeswitchJNI.CoreSession_consoleLog(swigCPtr, this, level_str, msg);
   }
 
+  public void consoleLog2(String level_str, String file, String func, int line, String msg) {
+    freeswitchJNI.CoreSession_consoleLog2(swigCPtr, this, level_str, file, func, line, msg);
+  }
+
 }
diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
index 095fa05872..fe0a0d9bc7 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
@@ -21,12 +21,12 @@ public class freeswitch {
     freeswitchJNI.consoleLog(level_str, msg);
   }
 
-  public static void consoleCleanLog(String msg) {
-    freeswitchJNI.consoleCleanLog(msg);
+  public static void consoleLog2(String level_str, String file, String func, int line, String msg) {
+    freeswitchJNI.consoleLog2(level_str, file, func, line, msg);
   }
 
-  public static void consoleChannelLog(String level_str, String file, String func, int line, String msg) {
-    freeswitchJNI.consoleChannelLog(level_str, file, func, line, msg);
+  public static void consoleCleanLog(String msg) {
+    freeswitchJNI.consoleCleanLog(msg);
   }
 
   public static boolean running() {
@@ -41,12 +41,12 @@ public class freeswitch {
     freeswitchJNI.console_log(level_str, msg);
   }
 
-  public static void console_clean_log(String msg) {
-    freeswitchJNI.console_clean_log(msg);
+  public static void console_log2(String level_str, String file, String func, int line, String msg) {
+    freeswitchJNI.console_log2(level_str, file, func, line, msg);
   }
 
-  public static void console_channel_log(String level_str, String file, String func, int line, String msg) {
-    freeswitchJNI.console_channel_log(level_str, file, func, line, msg);
+  public static void console_clean_log(String msg) {
+    freeswitchJNI.console_clean_log(msg);
   }
 
   public static void msleep(long ms) {
diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
index 4a5e352964..8204194fae 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
@@ -12,8 +12,8 @@ class freeswitchJNI {
   public final static native void setGlobalVariable(String jarg1, String jarg2);
   public final static native String getGlobalVariable(String jarg1);
   public final static native void consoleLog(String jarg1, String jarg2);
+  public final static native void consoleLog2(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native void consoleCleanLog(String jarg1);
-  public final static native void consoleChannelLog(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native boolean running();
   public final static native boolean email(String jarg1, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7);
   public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, String jarg9, String jarg10, String jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17);
@@ -159,9 +159,10 @@ class freeswitchJNI {
   public final static native void CoreSession_check_hangup_hook(long jarg1, CoreSession jarg1_);
   public final static native long CoreSession_run_dtmf_callback(long jarg1, CoreSession jarg1_, long jarg2, long jarg3);
   public final static native void CoreSession_consoleLog(long jarg1, CoreSession jarg1_, String jarg2, String jarg3);
+  public final static native void CoreSession_consoleLog2(long jarg1, CoreSession jarg1_, String jarg2, String jarg3, String jarg4, int jarg5, String jarg6);
   public final static native void console_log(String jarg1, String jarg2);
+  public final static native void console_log2(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native void console_clean_log(String jarg1);
-  public final static native void console_channel_log(String jarg1, String jarg2, String jarg3, int jarg4, String jarg5);
   public final static native void msleep(long jarg1);
   public final static native void bridge(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_);
   public final static native long hanguphook(long jarg1);
diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp
index fab99e45f5..0c177274b0 100644
--- a/src/mod/languages/mod_java/switch_swig_wrap.cpp
+++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp
@@ -272,22 +272,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleLog(JNIEnv
 }
 
 
-SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleCleanLog(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
-    if (!arg1) return ;
-  }
-  consoleCleanLog(arg1);
-  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleChannelLog(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleLog2(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -317,7 +302,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleChannelLog
     arg5 = (char *)jenv->GetStringUTFChars(jarg5, 0);
     if (!arg5) return ;
   }
-  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
   if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
@@ -325,6 +310,21 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleChannelLog
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_consoleCleanLog(JNIEnv *jenv, jclass jcls, jstring jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = 0;
+  if (jarg1) {
+    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
+    if (!arg1) return ;
+  }
+  consoleCleanLog(arg1);
+  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
+}
+
+
 SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_running(JNIEnv *jenv, jclass jcls) {
   jboolean jresult = 0 ;
   bool result;
@@ -3164,6 +3164,47 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1cons
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1consoleLog2(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jint jarg5, jstring jarg6) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(CoreSession **)&jarg1; 
+  arg2 = 0;
+  if (jarg2) {
+    arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
+    if (!arg2) return ;
+  }
+  arg3 = 0;
+  if (jarg3) {
+    arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
+    if (!arg3) return ;
+  }
+  arg4 = 0;
+  if (jarg4) {
+    arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0);
+    if (!arg4) return ;
+  }
+  arg5 = (int)jarg5; 
+  arg6 = 0;
+  if (jarg6) {
+    arg6 = (char *)jenv->GetStringUTFChars(jarg6, 0);
+    if (!arg6) return ;
+  }
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
+  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
+  if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4);
+  if (arg6) jenv->ReleaseStringUTFChars(jarg6, (const char *)arg6);
+}
+
+
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1log(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -3186,22 +3227,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1log(JNIE
 }
 
 
-SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1clean_1log(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
-    if (!arg1) return ;
-  }
-  console_clean_log(arg1);
-  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
-}
-
-
-SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1channel_1log(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1log2(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3, jint jarg4, jstring jarg5) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -3231,7 +3257,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1channel_
     arg5 = (char *)jenv->GetStringUTFChars(jarg5, 0);
     if (!arg5) return ;
   }
-  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  console_log2(arg1,arg2,arg3,arg4,arg5);
   if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
@@ -3239,6 +3265,21 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1channel_
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1clean_1log(JNIEnv *jenv, jclass jcls, jstring jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = 0;
+  if (jarg1) {
+    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
+    if (!arg1) return ;
+  }
+  console_clean_log(arg1);
+  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
+}
+
+
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_msleep(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   unsigned int arg1 ;
   
diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index 25ba089d21..c961afa633 100644
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -1607,14 +1607,26 @@ fail:
 }
 
 
-static int _wrap_consoleCleanLog(lua_State* L) {
+static int _wrap_consoleLog2(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("consoleCleanLog",1,1)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleCleanLog",1,"char *");
+  SWIG_check_num_args("consoleLog2",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleLog2",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleLog2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleLog2",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleLog2",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleLog2",5,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  consoleCleanLog(arg1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -1627,26 +1639,14 @@ fail:
 }
 
 
-static int _wrap_consoleChannelLog(lua_State* L) {
+static int _wrap_consoleCleanLog(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("consoleChannelLog",5,5)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleChannelLog",1,"char *");
-  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleChannelLog",2,"char *");
-  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleChannelLog",3,"char *");
-  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleChannelLog",4,"int");
-  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleChannelLog",5,"char *");
+  SWIG_check_num_args("consoleCleanLog",1,1)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleCleanLog",1,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  arg2 = (char *)lua_tostring(L, 2);
-  arg3 = (char *)lua_tostring(L, 3);
-  arg4 = (int)lua_tonumber(L, 4);
-  arg5 = (char *)lua_tostring(L, 5);
-  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  consoleCleanLog(arg1);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -6212,6 +6212,45 @@ fail:
 }
 
 
+static int _wrap_CoreSession_consoleLog2(lua_State* L) {
+  int SWIG_arg = -1;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  SWIG_check_num_args("consoleLog2",6,6)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("consoleLog2",1,"CoreSession *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleLog2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleLog2",3,"char *");
+  if(!lua_isstring(L,4)) SWIG_fail_arg("consoleLog2",4,"char *");
+  if(!lua_isnumber(L,5)) SWIG_fail_arg("consoleLog2",5,"int");
+  if(!lua_isstring(L,6)) SWIG_fail_arg("consoleLog2",6,"char *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){
+    SWIG_fail_ptr("CoreSession_consoleLog2",1,SWIGTYPE_p_CoreSession);
+  }
+  
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (char *)lua_tostring(L, 4);
+  arg5 = (int)lua_tonumber(L, 5);
+  arg6 = (char *)lua_tostring(L, 6);
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static void swig_delete_CoreSession(void *obj) {
 CoreSession *arg1 = (CoreSession *) obj;
 delete arg1;
@@ -6265,6 +6304,7 @@ static swig_lua_method swig_CoreSession_methods[] = {
     {"check_hangup_hook", _wrap_CoreSession_check_hangup_hook}, 
     {"run_dtmf_callback", _wrap_CoreSession_run_dtmf_callback}, 
     {"consoleLog", _wrap_CoreSession_consoleLog}, 
+    {"consoleLog2", _wrap_CoreSession_consoleLog2}, 
     {0,0}
 };
 static swig_lua_attribute swig_CoreSession_attributes[] = {
@@ -6307,14 +6347,26 @@ fail:
 }
 
 
-static int _wrap_console_clean_log(lua_State* L) {
+static int _wrap_console_log2(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("console_clean_log",1,1)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("console_clean_log",1,"char *");
+  SWIG_check_num_args("console_log2",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_log2",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("console_log2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("console_log2",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_log2",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("console_log2",5,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  console_clean_log(arg1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  console_log2(arg1,arg2,arg3,arg4,arg5);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -6327,26 +6379,14 @@ fail:
 }
 
 
-static int _wrap_console_channel_log(lua_State* L) {
+static int _wrap_console_clean_log(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("console_channel_log",5,5)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("console_channel_log",1,"char *");
-  if(!lua_isstring(L,2)) SWIG_fail_arg("console_channel_log",2,"char *");
-  if(!lua_isstring(L,3)) SWIG_fail_arg("console_channel_log",3,"char *");
-  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_channel_log",4,"int");
-  if(!lua_isstring(L,5)) SWIG_fail_arg("console_channel_log",5,"char *");
+  SWIG_check_num_args("console_clean_log",1,1)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_clean_log",1,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  arg2 = (char *)lua_tostring(L, 2);
-  arg3 = (char *)lua_tostring(L, 3);
-  arg4 = (int)lua_tonumber(L, 4);
-  arg5 = (char *)lua_tostring(L, 5);
-  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  console_clean_log(arg1);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -7981,13 +8021,13 @@ static const struct luaL_Reg swig_commands[] = {
     { "setGlobalVariable", _wrap_setGlobalVariable},
     { "getGlobalVariable", _wrap_getGlobalVariable},
     { "consoleLog", _wrap_consoleLog},
+    { "consoleLog2", _wrap_consoleLog2},
     { "consoleCleanLog", _wrap_consoleCleanLog},
-    { "consoleChannelLog", _wrap_consoleChannelLog},
     { "running", _wrap_running},
     { "email", _wrap_email},
     { "console_log", _wrap_console_log},
+    { "console_log2", _wrap_console_log2},
     { "console_clean_log", _wrap_console_clean_log},
-    { "console_channel_log", _wrap_console_channel_log},
     { "msleep", _wrap_msleep},
     { "bridge", _wrap_bridge},
     { "hanguphook", _wrap_hanguphook},
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index f03a35cca1..0059a87457 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -41828,15 +41828,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog(char * jarg1, char * jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  consoleCleanLog(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_consoleChannelLog(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -41848,7 +41840,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_consoleChannelLog(char * jarg1, char * jarg2,
   arg3 = (char *)jarg3; 
   arg4 = (int)jarg4; 
   arg5 = (char *)jarg5; 
-  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  consoleCleanLog(arg1);
 }
 
 
@@ -43656,6 +43656,24 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog(void * jarg1, char * j
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog2(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5, char * jarg6) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (char *)jarg6; 
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -43666,15 +43684,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  console_clean_log(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_console_channel_log(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_console_log2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -43686,7 +43696,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_console_channel_log(char * jarg1, char * jarg
   arg3 = (char *)jarg3; 
   arg4 = (int)jarg4; 
   arg5 = (char *)jarg5; 
-  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  console_log2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  console_clean_log(arg1);
 }
 
 
diff --git a/src/mod/languages/mod_perl/freeswitch.pm b/src/mod/languages/mod_perl/freeswitch.pm
index 6b9ffbe6f2..c8e57832b1 100644
--- a/src/mod/languages/mod_perl/freeswitch.pm
+++ b/src/mod/languages/mod_perl/freeswitch.pm
@@ -51,13 +51,13 @@ package freeswitch;
 *setGlobalVariable = *freeswitchc::setGlobalVariable;
 *getGlobalVariable = *freeswitchc::getGlobalVariable;
 *consoleLog = *freeswitchc::consoleLog;
+*consoleLog2 = *freeswitchc::consoleLog2;
 *consoleCleanLog = *freeswitchc::consoleCleanLog;
-*consoleChannelLog = *freeswitchc::consoleChannelLog;
 *running = *freeswitchc::running;
 *email = *freeswitchc::email;
 *console_log = *freeswitchc::console_log;
+*console_log2 = *freeswitchc::console_log2;
 *console_clean_log = *freeswitchc::console_clean_log;
-*console_channel_log = *freeswitchc::console_channel_log;
 *msleep = *freeswitchc::msleep;
 *bridge = *freeswitchc::bridge;
 *hanguphook = *freeswitchc::hanguphook;
@@ -461,6 +461,7 @@ sub DESTROY {
 *check_hangup_hook = *freeswitchc::CoreSession_check_hangup_hook;
 *run_dtmf_callback = *freeswitchc::CoreSession_run_dtmf_callback;
 *consoleLog = *freeswitchc::CoreSession_consoleLog;
+*consoleLog2 = *freeswitchc::CoreSession_consoleLog2;
 sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index 45a917174b..0f8d70409c 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -2023,35 +2023,7 @@ XS(_wrap_consoleLog) {
 }
 
 
-XS(_wrap_consoleCleanLog) {
-  {
-    char *arg1 = (char *) 0 ;
-    int res1 ;
-    char *buf1 = 0 ;
-    int alloc1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: consoleCleanLog(msg);");
-    }
-    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleCleanLog" "', argument " "1"" of type '" "char *""'");
-    }
-    arg1 = reinterpret_cast< char * >(buf1);
-    consoleCleanLog(arg1);
-    
-    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-    XSRETURN(argvi);
-  fail:
-    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_consoleChannelLog) {
+XS(_wrap_consoleLog2) {
   {
     char *arg1 = (char *) 0 ;
     char *arg2 = (char *) 0 ;
@@ -2076,34 +2048,34 @@ XS(_wrap_consoleChannelLog) {
     dXSARGS;
     
     if ((items < 5) || (items > 5)) {
-      SWIG_croak("Usage: consoleChannelLog(level_str,file,func,line,msg);");
+      SWIG_croak("Usage: consoleLog2(level_str,file,func,line,msg);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleChannelLog" "', argument " "1"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleLog2" "', argument " "1"" of type '" "char *""'");
     }
     arg1 = reinterpret_cast< char * >(buf1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleChannelLog" "', argument " "2"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleLog2" "', argument " "2"" of type '" "char *""'");
     }
     arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleChannelLog" "', argument " "3"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleLog2" "', argument " "3"" of type '" "char *""'");
     }
     arg3 = reinterpret_cast< char * >(buf3);
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleChannelLog" "', argument " "4"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleLog2" "', argument " "4"" of type '" "int""'");
     } 
     arg4 = static_cast< int >(val4);
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleChannelLog" "', argument " "5"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleLog2" "', argument " "5"" of type '" "char *""'");
     }
     arg5 = reinterpret_cast< char * >(buf5);
-    consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+    consoleLog2(arg1,arg2,arg3,arg4,arg5);
     
     if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
@@ -2122,6 +2094,34 @@ XS(_wrap_consoleChannelLog) {
 }
 
 
+XS(_wrap_consoleCleanLog) {
+  {
+    char *arg1 = (char *) 0 ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: consoleCleanLog(msg);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleCleanLog" "', argument " "1"" of type '" "char *""'");
+    }
+    arg1 = reinterpret_cast< char * >(buf1);
+    consoleCleanLog(arg1);
+    
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_running) {
   {
     bool result;
@@ -8183,6 +8183,87 @@ XS(_wrap_CoreSession_consoleLog) {
 }
 
 
+XS(_wrap_CoreSession_consoleLog2) {
+  {
+    CoreSession *arg1 = (CoreSession *) 0 ;
+    char *arg2 = (char *) 0 ;
+    char *arg3 = (char *) 0 ;
+    char *arg4 = (char *) 0 ;
+    int arg5 ;
+    char *arg6 = (char *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 6) || (items > 6)) {
+      SWIG_croak("Usage: CoreSession_consoleLog2(self,level_str,file,func,line,msg);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_consoleLog2" "', argument " "1"" of type '" "CoreSession *""'"); 
+    }
+    arg1 = reinterpret_cast< CoreSession * >(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_consoleLog2" "', argument " "2"" of type '" "char *""'");
+    }
+    arg2 = reinterpret_cast< char * >(buf2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_consoleLog2" "', argument " "3"" of type '" "char *""'");
+    }
+    arg3 = reinterpret_cast< char * >(buf3);
+    res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_consoleLog2" "', argument " "4"" of type '" "char *""'");
+    }
+    arg4 = reinterpret_cast< char * >(buf4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_consoleLog2" "', argument " "5"" of type '" "int""'");
+    } 
+    arg5 = static_cast< int >(val5);
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CoreSession_consoleLog2" "', argument " "6"" of type '" "char *""'");
+    }
+    arg6 = reinterpret_cast< char * >(buf6);
+    (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+    
+    
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
+    
+    if (alloc6 == SWIG_NEWOBJ) delete[] buf6;
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
+    
+    if (alloc6 == SWIG_NEWOBJ) delete[] buf6;
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_console_log) {
   {
     char *arg1 = (char *) 0 ;
@@ -8222,35 +8303,7 @@ XS(_wrap_console_log) {
 }
 
 
-XS(_wrap_console_clean_log) {
-  {
-    char *arg1 = (char *) 0 ;
-    int res1 ;
-    char *buf1 = 0 ;
-    int alloc1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: console_clean_log(msg);");
-    }
-    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_clean_log" "', argument " "1"" of type '" "char *""'");
-    }
-    arg1 = reinterpret_cast< char * >(buf1);
-    console_clean_log(arg1);
-    
-    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-    XSRETURN(argvi);
-  fail:
-    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_console_channel_log) {
+XS(_wrap_console_log2) {
   {
     char *arg1 = (char *) 0 ;
     char *arg2 = (char *) 0 ;
@@ -8275,34 +8328,34 @@ XS(_wrap_console_channel_log) {
     dXSARGS;
     
     if ((items < 5) || (items > 5)) {
-      SWIG_croak("Usage: console_channel_log(level_str,file,func,line,msg);");
+      SWIG_croak("Usage: console_log2(level_str,file,func,line,msg);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_channel_log" "', argument " "1"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_log2" "', argument " "1"" of type '" "char *""'");
     }
     arg1 = reinterpret_cast< char * >(buf1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_channel_log" "', argument " "2"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_log2" "', argument " "2"" of type '" "char *""'");
     }
     arg2 = reinterpret_cast< char * >(buf2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_channel_log" "', argument " "3"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_log2" "', argument " "3"" of type '" "char *""'");
     }
     arg3 = reinterpret_cast< char * >(buf3);
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_channel_log" "', argument " "4"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_log2" "', argument " "4"" of type '" "int""'");
     } 
     arg4 = static_cast< int >(val4);
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_channel_log" "', argument " "5"" of type '" "char *""'");
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_log2" "', argument " "5"" of type '" "char *""'");
     }
     arg5 = reinterpret_cast< char * >(buf5);
-    console_channel_log(arg1,arg2,arg3,arg4,arg5);
+    console_log2(arg1,arg2,arg3,arg4,arg5);
     
     if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
@@ -8321,6 +8374,34 @@ XS(_wrap_console_channel_log) {
 }
 
 
+XS(_wrap_console_clean_log) {
+  {
+    char *arg1 = (char *) 0 ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: console_clean_log(msg);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_clean_log" "', argument " "1"" of type '" "char *""'");
+    }
+    arg1 = reinterpret_cast< char * >(buf1);
+    console_clean_log(arg1);
+    
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_msleep) {
   {
     unsigned int arg1 ;
@@ -9949,8 +10030,8 @@ static swig_command_info swig_commands[] = {
 {"freeswitchc::setGlobalVariable", _wrap_setGlobalVariable},
 {"freeswitchc::getGlobalVariable", _wrap_getGlobalVariable},
 {"freeswitchc::consoleLog", _wrap_consoleLog},
+{"freeswitchc::consoleLog2", _wrap_consoleLog2},
 {"freeswitchc::consoleCleanLog", _wrap_consoleCleanLog},
-{"freeswitchc::consoleChannelLog", _wrap_consoleChannelLog},
 {"freeswitchc::running", _wrap_running},
 {"freeswitchc::email", _wrap_email},
 {"freeswitchc::new_IVRMenu", _wrap_new_IVRMenu},
@@ -10089,9 +10170,10 @@ static swig_command_info swig_commands[] = {
 {"freeswitchc::CoreSession_check_hangup_hook", _wrap_CoreSession_check_hangup_hook},
 {"freeswitchc::CoreSession_run_dtmf_callback", _wrap_CoreSession_run_dtmf_callback},
 {"freeswitchc::CoreSession_consoleLog", _wrap_CoreSession_consoleLog},
+{"freeswitchc::CoreSession_consoleLog2", _wrap_CoreSession_consoleLog2},
 {"freeswitchc::console_log", _wrap_console_log},
+{"freeswitchc::console_log2", _wrap_console_log2},
 {"freeswitchc::console_clean_log", _wrap_console_clean_log},
-{"freeswitchc::console_channel_log", _wrap_console_channel_log},
 {"freeswitchc::msleep", _wrap_msleep},
 {"freeswitchc::bridge", _wrap_bridge},
 {"freeswitchc::hanguphook", _wrap_hanguphook},
@@ -10416,17 +10498,17 @@ XS(SWIG_init) {
   SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
   SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
   SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
-  /*@SWIG://share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG://share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG://share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
     SvREADONLY_on(sv);
diff --git a/src/mod/languages/mod_python/freeswitch.py b/src/mod/languages/mod_python/freeswitch.py
index a48afef5d3..0420994ea7 100644
--- a/src/mod/languages/mod_python/freeswitch.py
+++ b/src/mod/languages/mod_python/freeswitch.py
@@ -51,8 +51,8 @@ del types
 setGlobalVariable = _freeswitch.setGlobalVariable
 getGlobalVariable = _freeswitch.getGlobalVariable
 consoleLog = _freeswitch.consoleLog
+consoleLog2 = _freeswitch.consoleLog2
 consoleCleanLog = _freeswitch.consoleCleanLog
-consoleChannelLog = _freeswitch.consoleChannelLog
 running = _freeswitch.running
 email = _freeswitch.email
 class IVRMenu(_object):
@@ -319,12 +319,13 @@ class CoreSession(_object):
     def check_hangup_hook(*args): return _freeswitch.CoreSession_check_hangup_hook(*args)
     def run_dtmf_callback(*args): return _freeswitch.CoreSession_run_dtmf_callback(*args)
     def consoleLog(*args): return _freeswitch.CoreSession_consoleLog(*args)
+    def consoleLog2(*args): return _freeswitch.CoreSession_consoleLog2(*args)
 CoreSession_swigregister = _freeswitch.CoreSession_swigregister
 CoreSession_swigregister(CoreSession)
 
 console_log = _freeswitch.console_log
+console_log2 = _freeswitch.console_log2
 console_clean_log = _freeswitch.console_clean_log
-console_channel_log = _freeswitch.console_channel_log
 msleep = _freeswitch.msleep
 bridge = _freeswitch.bridge
 hanguphook = _freeswitch.hanguphook
diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp
index f27e17a15a..1386a9814f 100644
--- a/src/mod/languages/mod_python/mod_python_wrap.cpp
+++ b/src/mod/languages/mod_python/mod_python_wrap.cpp
@@ -3109,31 +3109,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_consoleCleanLog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:consoleCleanLog",&obj0)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleCleanLog" "', argument " "1"" of type '" "char *""'");
-  }
-  arg1 = reinterpret_cast< char * >(buf1);
-  consoleCleanLog(arg1);
-  resultobj = SWIG_Py_Void();
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_consoleChannelLog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_consoleLog2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -3160,33 +3136,33 @@ SWIGINTERN PyObject *_wrap_consoleChannelLog(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:consoleChannelLog",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:consoleLog2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleChannelLog" "', argument " "1"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleLog2" "', argument " "1"" of type '" "char *""'");
   }
   arg1 = reinterpret_cast< char * >(buf1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleChannelLog" "', argument " "2"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "consoleLog2" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleChannelLog" "', argument " "3"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "consoleLog2" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = reinterpret_cast< char * >(buf3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleChannelLog" "', argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "consoleLog2" "', argument " "4"" of type '" "int""'");
   } 
   arg4 = static_cast< int >(val4);
   res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleChannelLog" "', argument " "5"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "consoleLog2" "', argument " "5"" of type '" "char *""'");
   }
   arg5 = reinterpret_cast< char * >(buf5);
-  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
   resultobj = SWIG_Py_Void();
   if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
@@ -3202,6 +3178,30 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_consoleCleanLog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:consoleCleanLog",&obj0)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "consoleCleanLog" "', argument " "1"" of type '" "char *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  consoleCleanLog(arg1);
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_running(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   bool result;
@@ -8389,6 +8389,84 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_CoreSession_consoleLog2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int res6 ;
+  char *buf6 = 0 ;
+  int alloc6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CoreSession_consoleLog2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_consoleLog2" "', argument " "1"" of type '" "CoreSession *""'"); 
+  }
+  arg1 = reinterpret_cast< CoreSession * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_consoleLog2" "', argument " "2"" of type '" "char *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_consoleLog2" "', argument " "3"" of type '" "char *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_consoleLog2" "', argument " "4"" of type '" "char *""'");
+  }
+  arg4 = reinterpret_cast< char * >(buf4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_consoleLog2" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  res6 = SWIG_AsCharPtrAndSize(obj5, &buf6, NULL, &alloc6);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CoreSession_consoleLog2" "', argument " "6"" of type '" "char *""'");
+  }
+  arg6 = reinterpret_cast< char * >(buf6);
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
+  if (alloc6 == SWIG_NEWOBJ) delete[] buf6;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
+  if (alloc6 == SWIG_NEWOBJ) delete[] buf6;
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *CoreSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -8432,31 +8510,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_console_clean_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:console_clean_log",&obj0)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_clean_log" "', argument " "1"" of type '" "char *""'");
-  }
-  arg1 = reinterpret_cast< char * >(buf1);
-  console_clean_log(arg1);
-  resultobj = SWIG_Py_Void();
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_console_channel_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_console_log2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -8483,33 +8537,33 @@ SWIGINTERN PyObject *_wrap_console_channel_log(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:console_channel_log",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:console_log2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_channel_log" "', argument " "1"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_log2" "', argument " "1"" of type '" "char *""'");
   }
   arg1 = reinterpret_cast< char * >(buf1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_channel_log" "', argument " "2"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_log2" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
   res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_channel_log" "', argument " "3"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "console_log2" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = reinterpret_cast< char * >(buf3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_channel_log" "', argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "console_log2" "', argument " "4"" of type '" "int""'");
   } 
   arg4 = static_cast< int >(val4);
   res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5);
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_channel_log" "', argument " "5"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "console_log2" "', argument " "5"" of type '" "char *""'");
   }
   arg5 = reinterpret_cast< char * >(buf5);
-  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  console_log2(arg1,arg2,arg3,arg4,arg5);
   resultobj = SWIG_Py_Void();
   if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
@@ -8525,6 +8579,30 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_console_clean_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:console_clean_log",&obj0)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_clean_log" "', argument " "1"" of type '" "char *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  console_clean_log(arg1);
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_msleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   unsigned int arg1 ;
@@ -9455,8 +9533,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"setGlobalVariable", _wrap_setGlobalVariable, METH_VARARGS, NULL},
 	 { (char *)"getGlobalVariable", _wrap_getGlobalVariable, METH_VARARGS, NULL},
 	 { (char *)"consoleLog", _wrap_consoleLog, METH_VARARGS, NULL},
+	 { (char *)"consoleLog2", _wrap_consoleLog2, METH_VARARGS, NULL},
 	 { (char *)"consoleCleanLog", _wrap_consoleCleanLog, METH_VARARGS, NULL},
-	 { (char *)"consoleChannelLog", _wrap_consoleChannelLog, METH_VARARGS, NULL},
 	 { (char *)"running", _wrap_running, METH_VARARGS, NULL},
 	 { (char *)"email", _wrap_email, METH_VARARGS, NULL},
 	 { (char *)"new_IVRMenu", _wrap_new_IVRMenu, METH_VARARGS, NULL},
@@ -9602,10 +9680,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"CoreSession_check_hangup_hook", _wrap_CoreSession_check_hangup_hook, METH_VARARGS, NULL},
 	 { (char *)"CoreSession_run_dtmf_callback", _wrap_CoreSession_run_dtmf_callback, METH_VARARGS, NULL},
 	 { (char *)"CoreSession_consoleLog", _wrap_CoreSession_consoleLog, METH_VARARGS, NULL},
+	 { (char *)"CoreSession_consoleLog2", _wrap_CoreSession_consoleLog2, METH_VARARGS, NULL},
 	 { (char *)"CoreSession_swigregister", CoreSession_swigregister, METH_VARARGS, NULL},
 	 { (char *)"console_log", _wrap_console_log, METH_VARARGS, NULL},
+	 { (char *)"console_log2", _wrap_console_log2, METH_VARARGS, NULL},
 	 { (char *)"console_clean_log", _wrap_console_clean_log, METH_VARARGS, NULL},
-	 { (char *)"console_channel_log", _wrap_console_channel_log, METH_VARARGS, NULL},
 	 { (char *)"msleep", _wrap_msleep, METH_VARARGS, NULL},
 	 { (char *)"bridge", _wrap_bridge, METH_VARARGS, NULL},
 	 { (char *)"hanguphook", _wrap_hanguphook, METH_VARARGS, NULL},
diff --git a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
index 8fd3790a30..d4027d471f 100644
--- a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
@@ -1607,14 +1607,26 @@ fail:
 }
 
 
-static int _wrap_consoleCleanLog(lua_State* L) {
+static int _wrap_consoleLog2(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("consoleCleanLog",1,1)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleCleanLog",1,"char *");
+  SWIG_check_num_args("consoleLog2",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleLog2",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleLog2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleLog2",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleLog2",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleLog2",5,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  consoleCleanLog(arg1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -1627,26 +1639,14 @@ fail:
 }
 
 
-static int _wrap_consoleChannelLog(lua_State* L) {
+static int _wrap_consoleCleanLog(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("consoleChannelLog",5,5)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleChannelLog",1,"char *");
-  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleChannelLog",2,"char *");
-  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleChannelLog",3,"char *");
-  if(!lua_isnumber(L,4)) SWIG_fail_arg("consoleChannelLog",4,"int");
-  if(!lua_isstring(L,5)) SWIG_fail_arg("consoleChannelLog",5,"char *");
+  SWIG_check_num_args("consoleCleanLog",1,1)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("consoleCleanLog",1,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  arg2 = (char *)lua_tostring(L, 2);
-  arg3 = (char *)lua_tostring(L, 3);
-  arg4 = (int)lua_tonumber(L, 4);
-  arg5 = (char *)lua_tostring(L, 5);
-  consoleChannelLog(arg1,arg2,arg3,arg4,arg5);
+  consoleCleanLog(arg1);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -6212,6 +6212,45 @@ fail:
 }
 
 
+static int _wrap_CoreSession_consoleLog2(lua_State* L) {
+  int SWIG_arg = -1;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  SWIG_check_num_args("consoleLog2",6,6)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("consoleLog2",1,"CoreSession *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("consoleLog2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("consoleLog2",3,"char *");
+  if(!lua_isstring(L,4)) SWIG_fail_arg("consoleLog2",4,"char *");
+  if(!lua_isnumber(L,5)) SWIG_fail_arg("consoleLog2",5,"int");
+  if(!lua_isstring(L,6)) SWIG_fail_arg("consoleLog2",6,"char *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){
+    SWIG_fail_ptr("CoreSession_consoleLog2",1,SWIGTYPE_p_CoreSession);
+  }
+  
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (char *)lua_tostring(L, 4);
+  arg5 = (int)lua_tonumber(L, 5);
+  arg6 = (char *)lua_tostring(L, 6);
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static void swig_delete_CoreSession(void *obj) {
 CoreSession *arg1 = (CoreSession *) obj;
 delete arg1;
@@ -6265,6 +6304,7 @@ static swig_lua_method swig_CoreSession_methods[] = {
     {"check_hangup_hook", _wrap_CoreSession_check_hangup_hook}, 
     {"run_dtmf_callback", _wrap_CoreSession_run_dtmf_callback}, 
     {"consoleLog", _wrap_CoreSession_consoleLog}, 
+    {"consoleLog2", _wrap_CoreSession_consoleLog2}, 
     {0,0}
 };
 static swig_lua_attribute swig_CoreSession_attributes[] = {
@@ -6307,14 +6347,26 @@ fail:
 }
 
 
-static int _wrap_console_clean_log(lua_State* L) {
+static int _wrap_console_log2(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("console_clean_log",1,1)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("console_clean_log",1,"char *");
+  SWIG_check_num_args("console_log2",5,5)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_log2",1,"char *");
+  if(!lua_isstring(L,2)) SWIG_fail_arg("console_log2",2,"char *");
+  if(!lua_isstring(L,3)) SWIG_fail_arg("console_log2",3,"char *");
+  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_log2",4,"int");
+  if(!lua_isstring(L,5)) SWIG_fail_arg("console_log2",5,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  console_clean_log(arg1);
+  arg2 = (char *)lua_tostring(L, 2);
+  arg3 = (char *)lua_tostring(L, 3);
+  arg4 = (int)lua_tonumber(L, 4);
+  arg5 = (char *)lua_tostring(L, 5);
+  console_log2(arg1,arg2,arg3,arg4,arg5);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -6327,26 +6379,14 @@ fail:
 }
 
 
-static int _wrap_console_channel_log(lua_State* L) {
+static int _wrap_console_clean_log(lua_State* L) {
   int SWIG_arg = -1;
   char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
   
-  SWIG_check_num_args("console_channel_log",5,5)
-  if(!lua_isstring(L,1)) SWIG_fail_arg("console_channel_log",1,"char *");
-  if(!lua_isstring(L,2)) SWIG_fail_arg("console_channel_log",2,"char *");
-  if(!lua_isstring(L,3)) SWIG_fail_arg("console_channel_log",3,"char *");
-  if(!lua_isnumber(L,4)) SWIG_fail_arg("console_channel_log",4,"int");
-  if(!lua_isstring(L,5)) SWIG_fail_arg("console_channel_log",5,"char *");
+  SWIG_check_num_args("console_clean_log",1,1)
+  if(!lua_isstring(L,1)) SWIG_fail_arg("console_clean_log",1,"char *");
   arg1 = (char *)lua_tostring(L, 1);
-  arg2 = (char *)lua_tostring(L, 2);
-  arg3 = (char *)lua_tostring(L, 3);
-  arg4 = (int)lua_tonumber(L, 4);
-  arg5 = (char *)lua_tostring(L, 5);
-  console_channel_log(arg1,arg2,arg3,arg4,arg5);
+  console_clean_log(arg1);
   SWIG_arg=0;
   
   return SWIG_arg;
@@ -7981,13 +8021,13 @@ static const struct luaL_reg swig_commands[] = {
     { "setGlobalVariable", _wrap_setGlobalVariable},
     { "getGlobalVariable", _wrap_getGlobalVariable},
     { "consoleLog", _wrap_consoleLog},
+    { "consoleLog2", _wrap_consoleLog2},
     { "consoleCleanLog", _wrap_consoleCleanLog},
-    { "consoleChannelLog", _wrap_consoleChannelLog},
     { "running", _wrap_running},
     { "email", _wrap_email},
     { "console_log", _wrap_console_log},
+    { "console_log2", _wrap_console_log2},
     { "console_clean_log", _wrap_console_clean_log},
-    { "console_channel_log", _wrap_console_channel_log},
     { "msleep", _wrap_msleep},
     { "bridge", _wrap_bridge},
     { "hanguphook", _wrap_hanguphook},

From 1b7360159a92a2b86cf8e778e85d40503f6fc7e7 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 16 Jul 2014 04:57:39 +0000
Subject: [PATCH 018/130] Associate "sending early media" log with session

---
 src/mod/endpoints/mod_sofia/mod_sofia.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index a661abad94..a1cff0d006 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -2170,7 +2170,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			if (!sofia_test_flag(tech_pvt, TFLAG_ANS) && !sofia_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) {
 
 				sofia_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
-				switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->_file, msg->_func, msg->_line, NULL, SWITCH_LOG_INFO, "Sending early media\n");
+				switch_log_printf(SWITCH_CHANNEL_ID_SESSION, msg->_file, msg->_func, msg->_line,
+								  (const char*)session, SWITCH_LOG_INFO, "Sending early media\n");
 
 				/* Transmit 183 Progress with SDP */
 				if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {

From 958d9d9b21f1a3a78cce4593e63260315185e9fd Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 16 Jul 2014 09:05:15 -0500
Subject: [PATCH 019/130] FS-5384 implement support for ring-on-active and
 ring-on-idle attributes - right now, will just switch from 'ring' to
 'indicate only' if set to 0, defaults to 1/on

---
 src/mod/endpoints/mod_skinny/skinny_server.c | 26 +++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index b3caee09e8..cd5f10b03f 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -583,8 +583,8 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
 	/* char *label = argv[4]; */
 	char *value = argv[5];
 	char *caller_name = argv[6];
-	/* uint32_t ring_on_idle = atoi(argv[7]); */
-	/* uint32_t ring_on_active = atoi(argv[8]); */
+	uint32_t ring_on_idle = atoi(argv[7]);
+	uint32_t ring_on_active = atoi(argv[8]);
 	/* uint32_t busy_trigger = atoi(argv[9]); */
 	/* char *forward_all = argv[10]; */
 	/* char *forward_busy = argv[11]; */
@@ -643,11 +643,13 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
 		skinny_session_send_call_info(helper->tech_pvt->session, listener, line_instance);
 		send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_BLINK);
 
-		if ( active_calls < 1 ) {
+		if ( active_calls < 1 && ring_on_idle ) {
 			send_set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
-		} else {
+		} else if ( active_calls > 0 && ring_on_active ) {
 			send_start_tone(listener, SKINNY_TONE_CALLWAITTONE, 0, line_instance, helper->tech_pvt->call_id);
 			send_stop_tone(listener, line_instance, helper->tech_pvt->call_id);
+		} else {
+			/* silent ring - would like to just flash the lamp */
 		}
 		switch_channel_ring_ready(channel);
 	}
@@ -1157,13 +1159,25 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 				if(type ==  SKINNY_BUTTON_LINE) {
 					const char *caller_name = switch_xml_attr_soft(xbutton, "caller-name");
 					const char *reg_metadata = switch_xml_attr_soft(xbutton, "registration-metadata");
-					uint32_t ring_on_idle = atoi(switch_xml_attr_soft(xbutton, "ring-on-idle"));
-					uint32_t ring_on_active = atoi(switch_xml_attr_soft(xbutton, "ring-on-active"));
+					uint32_t ring_on_idle = 1;
+					uint32_t ring_on_active = 1;
 					uint32_t busy_trigger = atoi(switch_xml_attr_soft(xbutton, "busy-trigger"));
 					const char *forward_all = switch_xml_attr_soft(xbutton, "forward-all");
 					const char *forward_busy = switch_xml_attr_soft(xbutton, "forward-busy");
 					const char *forward_noanswer = switch_xml_attr_soft(xbutton, "forward-noanswer");
 					uint32_t noanswer_duration = atoi(switch_xml_attr_soft(xbutton, "noanswer-duration"));
+					const char *tmp;
+
+					tmp = switch_xml_attr_soft(xbutton, "ring-on-active");
+					if ( !zstr(tmp) ) {
+						ring_on_active = atoi(tmp);
+					}
+
+					tmp = switch_xml_attr_soft(xbutton, "ring-on-idle");
+					if ( !zstr(tmp) ) {
+						ring_on_idle = atoi(tmp);
+					}
+
 					if ((sql = switch_mprintf(
 									"INSERT INTO skinny_lines "
 									"(device_name, device_instance, position, line_instance, "

From 3a00260dc6f0453a2322142b74872c76d05c88b1 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 19:33:10 +0500
Subject: [PATCH 020/130] FS-6615 test this patch

---
 src/include/switch_cpp.h                      |   1 -
 src/mod/languages/mod_lua/freeswitch.i        |   2 +
 src/mod/languages/mod_lua/mod_lua_wrap.cpp    |   2 +
 src/mod/languages/mod_managed/freeswitch.i    |   2 +
 .../languages/mod_managed/freeswitch_wrap.cxx |  24 +-
 src/mod/languages/mod_managed/managed/swig.cs | 813 +++++++++---------
 src/mod/languages/mod_perl/freeswitch.i       |   2 +
 src/mod/languages/mod_perl/mod_perl_wrap.cpp  |   2 +
 src/mod/legacy/languages/mod_lua/freeswitch.i |   2 +
 .../legacy/languages/mod_lua/mod_lua_wrap.cpp |   2 +
 src/switch_cpp.cpp                            |  12 +-
 11 files changed, 440 insertions(+), 424 deletions(-)

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index 13d41cb096..49f4c116dd 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -106,7 +106,6 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod
 
 	 class API {
 	   protected:
-		 char *last_data;
 		 char time_buf[64];
 		 switch_core_session_t *session;
 	   public:
diff --git a/src/mod/languages/mod_lua/freeswitch.i b/src/mod/languages/mod_lua/freeswitch.i
index e61cad315b..d94ce07fb2 100644
--- a/src/mod/languages/mod_lua/freeswitch.i
+++ b/src/mod/languages/mod_lua/freeswitch.i
@@ -40,6 +40,8 @@
 %newobject Event;
 %newobject Stream;
 %newobject Dbh;
+%newobject API::execute;
+%newobject API::executeString;
 
 /**
  * tell swig to grok everything defined in these header files and
diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index c961afa633..bf06a26019 100644
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -1980,6 +1980,7 @@ static int _wrap_API_execute(lua_State* L) {
   result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
   SWIG_arg=0;
   lua_pushstring(L,(const char*)result); SWIG_arg++;
+  free(result);
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2008,6 +2009,7 @@ static int _wrap_API_executeString(lua_State* L) {
   result = (char *)(arg1)->executeString((char const *)arg2);
   SWIG_arg=0;
   lua_pushstring(L,(const char*)result); SWIG_arg++;
+  free(result);
   return SWIG_arg;
   
   if(0) SWIG_fail;
diff --git a/src/mod/languages/mod_managed/freeswitch.i b/src/mod/languages/mod_managed/freeswitch.i
index 228afaa751..1123651479 100644
--- a/src/mod/languages/mod_managed/freeswitch.i
+++ b/src/mod/languages/mod_managed/freeswitch.i
@@ -82,6 +82,8 @@ char * SWIG_csharp_string_callback(const char * str) {
 %newobject CoreSession;
 %newobject Event;
 %newobject Stream;
+%newobject API::execute;
+%newobject API::executeString;
 
 // Allow bitwise compare on flag fields
 %typemap(csclassmodifiers) session_flag_t "[System.Flags] public enum"
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index 0059a87457..a444a30749 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGCSHARP
@@ -65,28 +65,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -129,7 +129,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -41996,6 +41996,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_Execute(void * jarg1, char * jarg2, cha
   arg3 = (char *)jarg3; 
   result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
   jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
   return jresult;
 }
 
@@ -42010,6 +42011,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_ExecuteString(void * jarg1, char * jarg
   arg2 = (char *)jarg2; 
   result = (char *)(arg1)->executeString((char const *)arg2);
   jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
   return jresult;
 }
 
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index 0e8aec3d4c..6225771afa 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -64,7 +64,7 @@ public class Api : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -133,7 +133,7 @@ public class audio_buffer_header_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -149,7 +149,7 @@ public enum cache_db_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -509,12 +509,16 @@ public class CoreSession : IDisposable {
     freeswitchPINVOKE.CoreSession_consoleLog(swigCPtr, level_str, msg);
   }
 
+  public void consoleLog2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.CoreSession_consoleLog2(swigCPtr, level_str, file, func, line, msg);
+  }
+
 }
 
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -530,7 +534,7 @@ public enum dm_match_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -620,7 +624,7 @@ public class dtls_fingerprint_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -639,7 +643,7 @@ public enum dtls_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -657,7 +661,7 @@ public enum dtls_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -726,7 +730,7 @@ public class DTMF : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -742,7 +746,7 @@ public enum dtmf_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -878,7 +882,7 @@ public class EventConsumer : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -1016,7 +1020,7 @@ public partial class Event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -6859,12 +6863,12 @@ public class freeswitch {
     freeswitchPINVOKE.consoleLog(level_str, msg);
   }
 
-  public static void consoleCleanLog(string msg) {
-    freeswitchPINVOKE.consoleCleanLog(msg);
+  public static void consoleLog2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.consoleLog2(level_str, file, func, line, msg);
   }
 
-  public static void consoleChannelLog(string level_str, string file, string func, int line, string msg) {
-    freeswitchPINVOKE.consoleChannelLog(level_str, file, func, line, msg);
+  public static void consoleCleanLog(string msg) {
+    freeswitchPINVOKE.consoleCleanLog(msg);
   }
 
   public static bool running() {
@@ -6881,12 +6885,12 @@ public class freeswitch {
     freeswitchPINVOKE.console_log(level_str, msg);
   }
 
-  public static void console_clean_log(string msg) {
-    freeswitchPINVOKE.console_clean_log(msg);
+  public static void console_log2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.console_log2(level_str, file, func, line, msg);
   }
 
-  public static void console_channel_log(string level_str, string file, string func, int line, string msg) {
-    freeswitchPINVOKE.console_channel_log(level_str, file, func, line, msg);
+  public static void console_clean_log(string msg) {
+    freeswitchPINVOKE.console_clean_log(msg);
   }
 
   public static void msleep(uint ms) {
@@ -7146,7 +7150,7 @@ public class freeswitch {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17404,12 +17408,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_consoleLog")]
   public static extern void consoleLog(string jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_consoleLog2")]
+  public static extern void consoleLog2(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
+
   [DllImport("mod_managed", EntryPoint="CSharp_consoleCleanLog")]
   public static extern void consoleCleanLog(string jarg1);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_consoleChannelLog")]
-  public static extern void consoleChannelLog(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
-
   [DllImport("mod_managed", EntryPoint="CSharp_running")]
   public static extern bool running();
 
@@ -17824,15 +17828,18 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_consoleLog")]
   public static extern void CoreSession_consoleLog(HandleRef jarg1, string jarg2, string jarg3);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_consoleLog2")]
+  public static extern void CoreSession_consoleLog2(HandleRef jarg1, string jarg2, string jarg3, string jarg4, int jarg5, string jarg6);
+
   [DllImport("mod_managed", EntryPoint="CSharp_console_log")]
   public static extern void console_log(string jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_console_log2")]
+  public static extern void console_log2(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
+
   [DllImport("mod_managed", EntryPoint="CSharp_console_clean_log")]
   public static extern void console_clean_log(string jarg1);
 
-  [DllImport("mod_managed", EntryPoint="CSharp_console_channel_log")]
-  public static extern void console_channel_log(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
-
   [DllImport("mod_managed", EntryPoint="CSharp_msleep")]
   public static extern void msleep(uint jarg1);
 
@@ -17864,7 +17871,7 @@ class freeswitchPINVOKE {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18023,7 +18030,7 @@ public class icand_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18039,7 +18046,7 @@ public enum ice_proto_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18150,7 +18157,7 @@ public class ice_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18242,7 +18249,7 @@ public class input_callback_state_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18313,7 +18320,7 @@ public class ip_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18370,7 +18377,7 @@ public class IvrMenu : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18424,7 +18431,7 @@ public partial class ManagedSession : CoreSession {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18714,7 +18721,7 @@ public class payload_map_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18794,7 +18801,7 @@ public class profile_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18811,7 +18818,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18872,7 +18879,7 @@ public partial class Stream : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18902,7 +18909,7 @@ public class SWIGTYPE_p_a_2__icand_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18932,7 +18939,7 @@ public class SWIGTYPE_p_apr_pool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18962,7 +18969,7 @@ public class SWIGTYPE_p_cJSON {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -18992,7 +18999,7 @@ public class SWIGTYPE_p_FILE {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19022,7 +19029,7 @@ public class SWIGTYPE_p_float {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19052,7 +19059,7 @@ public class SWIGTYPE_p_f_p_char_enum_switch_management_action_t_p_char_switch_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19082,7 +19089,7 @@ public class SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19112,7 +19119,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_cJSON_p_q_const__char_unsigned_long_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19142,7 +19149,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_p_switch_console_cal
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19172,7 +19179,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_co
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19202,7 +19209,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_unsigned_long__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19232,7 +19239,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19262,7 +19269,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19292,7 +19299,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_switch_codec_fmtp__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19322,7 +19329,7 @@ public class SWIGTYPE_p_f_p_q_const__char_p_switch_core_session_p_switch_stream_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19352,7 +19359,7 @@ public class SWIGTYPE_p_f_p_q_const__cJSON_p_switch_core_session_p_p_cJSON__swit
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19382,7 +19389,7 @@ public class SWIGTYPE_p_f_p_q_const__switch_log_node_t_enum_switch_log_level_t__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19412,7 +19419,7 @@ public class SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19442,7 +19449,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19472,7 +19479,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19502,7 +19509,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19532,7 +19539,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_char_p_unsigned_long__switch_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19562,7 +19569,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_switch_event_p_unsigned_long__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19592,7 +19599,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_int_p_q_const__cha
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19622,7 +19629,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char_p_q_const__char__s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19652,7 +19659,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19682,7 +19689,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_q_const__switch_dtmf_t_p_unsigne
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19712,7 +19719,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_unsigned_long__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19742,7 +19749,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle_p_void_unsigned_int_p_unsigned_lon
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19772,7 +19779,7 @@ public class SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19802,7 +19809,7 @@ public class SWIGTYPE_p_f_p_switch_codec_p_switch_codec_p_void_unsigned_long_uns
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19832,7 +19839,7 @@ public class SWIGTYPE_p_f_p_switch_codec__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19862,7 +19869,7 @@ public class SWIGTYPE_p_f_p_switch_codec_unsigned_long_p_q_const__switch_codec_s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19892,7 +19899,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_enum_switch_channel_callstate_t_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19922,7 +19929,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_enum_switch_media_type_t__p_stfu
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19952,7 +19959,7 @@ public class SWIGTYPE_p_f_p_switch_core_session__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19982,7 +19989,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_int__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20012,7 +20019,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_char_p_switch_say_args_t_p_p_c
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20042,7 +20049,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_char_p_switch_say_args_t_p_swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20072,7 +20079,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_p_switch_frame_unsigned_long_i
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20102,7 +20109,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20132,7 +20139,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20162,7 +20169,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20192,7 +20199,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20222,7 +20229,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t_enum_sw
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20252,7 +20259,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__switch_dtmf_t__switch
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20282,7 +20289,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_core_session_message__s
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20312,7 +20319,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_p
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20342,7 +20349,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event_p_switch_caller_p
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20372,7 +20379,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_event__switch_status_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20402,7 +20409,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_p_void__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20432,7 +20439,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_switch_frame_unsigned_long_int
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20462,7 +20469,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20492,7 +20499,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_p_void__p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20522,7 +20529,7 @@ public class SWIGTYPE_p_f_p_switch_core_session__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20552,7 +20559,7 @@ public class SWIGTYPE_p_f_p_switch_core_session_t_p_void_p_switch_caller_profile
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20582,7 +20589,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char_p_char__switch
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20612,7 +20619,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_char_p_char__switch_status
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20642,7 +20649,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle_p_p_char_p_p_char__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20672,7 +20679,7 @@ public class SWIGTYPE_p_f_p_switch_directory_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20702,7 +20709,7 @@ public class SWIGTYPE_p_f_p_switch_event_p_q_const__char__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20732,7 +20739,7 @@ public class SWIGTYPE_p_f_p_switch_event__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20762,7 +20769,7 @@ public class SWIGTYPE_p_f_p_switch_event__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20792,7 +20799,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_p_q_con
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20822,7 +20829,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_enum_switch_audio_col_t_p_q_const
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20852,7 +20859,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_long_long__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20882,7 +20889,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_q_const__char__switch_status_t
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20912,7 +20919,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_unsigned_int_long_long_int__swi
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20942,7 +20949,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle_p_void_p_switch_size_t__switch_st
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -20972,7 +20979,7 @@ public class SWIGTYPE_p_f_p_switch_file_handle__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21002,7 +21009,7 @@ public class SWIGTYPE_p_f_p_switch_ivr_dmachine_match__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21032,7 +21039,7 @@ public class SWIGTYPE_p_f_p_switch_ivr_menu_p_char_p_char_size_t_p_void__switch_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21062,7 +21069,7 @@ public class SWIGTYPE_p_f_p_switch_live_array_s_p_q_const__char_p_q_const__char_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21092,7 +21099,7 @@ public class SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__swit
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21122,7 +21129,7 @@ public class SWIGTYPE_p_f_p_switch_media_bug_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21152,7 +21159,7 @@ public class SWIGTYPE_p_f_p_switch_rtp_p_switch_socket_t_p_void_switch_size_t_p_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21182,7 +21189,7 @@ public class SWIGTYPE_p_f_p_switch_scheduler_task__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21212,7 +21219,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_double__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21242,7 +21249,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_int__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21272,7 +21279,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_q_const__char__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21302,7 +21309,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_char_p_unsigned_long__switch_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21332,7 +21339,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_q_const__char_int_int_p_unsig
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21362,7 +21369,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_unsigned_long__switch_status_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21392,7 +21399,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle_p_void_p_switch_size_t_p_unsign
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21422,7 +21429,7 @@ public class SWIGTYPE_p_f_p_switch_speech_handle__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21452,7 +21459,7 @@ public class SWIGTYPE_p_f_p_switch_stream_handle_p_q_const__char_v_______switch_
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21482,7 +21489,7 @@ public class SWIGTYPE_p_f_p_switch_stream_handle_p_unsigned_char_switch_size_t__
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21512,7 +21519,7 @@ public class SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21542,7 +21549,7 @@ public class SWIGTYPE_p_f_p_switch_timer_enum_switch_bool_t__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21572,7 +21579,7 @@ public class SWIGTYPE_p_f_p_switch_timer__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21602,7 +21609,7 @@ public class SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21632,7 +21639,7 @@ public class SWIGTYPE_p_f_p_void_p_q_const__char__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21662,7 +21669,7 @@ public class SWIGTYPE_p_f_p_void_p_switch_event__int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21692,7 +21699,7 @@ public class SWIGTYPE_p_f_p_void__void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21722,7 +21729,7 @@ public class SWIGTYPE_p_f_uint8_t_p_p_q_const__char_p_void__p_switch_xml {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21752,7 +21759,7 @@ public class SWIGTYPE_p_f_void__p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21782,7 +21789,7 @@ public class SWIGTYPE_p_f_void__switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21812,7 +21819,7 @@ public class SWIGTYPE_p_in6_addr {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21842,7 +21849,7 @@ public class SWIGTYPE_p_int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21872,7 +21879,7 @@ public class SWIGTYPE_p_p_apr_pool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21902,7 +21909,7 @@ public class SWIGTYPE_p_p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21932,7 +21939,7 @@ public class SWIGTYPE_p_p_cJSON {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21962,7 +21969,7 @@ public class SWIGTYPE_p_pid_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -21992,7 +21999,7 @@ public class SWIGTYPE_p_p_payload_map_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22022,7 +22029,7 @@ public class SWIGTYPE_p_p_p_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22052,7 +22059,7 @@ public class SWIGTYPE_p_p_real_pcre {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22082,7 +22089,7 @@ public class SWIGTYPE_p_p_sqlite3 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22112,7 +22119,7 @@ public class SWIGTYPE_p_p_sqlite3_stmt {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22142,7 +22149,7 @@ public class SWIGTYPE_p_p_switch_audio_resampler_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22172,7 +22179,7 @@ public class SWIGTYPE_p_p_switch_buffer {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22202,7 +22209,7 @@ public class SWIGTYPE_p_p_switch_cache_db_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22232,7 +22239,7 @@ public class SWIGTYPE_p_p_switch_caller_extension {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22262,7 +22269,7 @@ public class SWIGTYPE_p_p_switch_channel {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22292,7 +22299,7 @@ public class SWIGTYPE_p_p_switch_codec_implementation {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22322,7 +22329,7 @@ public class SWIGTYPE_p_p_switch_console_callback_match {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22352,7 +22359,7 @@ public class SWIGTYPE_p_p_switch_core_port_allocator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22382,7 +22389,7 @@ public class SWIGTYPE_p_p_switch_core_session {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22412,7 +22419,7 @@ public class SWIGTYPE_p_p_switch_core_session_message {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22442,7 +22449,7 @@ public class SWIGTYPE_p_p_switch_device_record_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22472,7 +22479,7 @@ public class SWIGTYPE_p_p_switch_event {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22502,7 +22509,7 @@ public class SWIGTYPE_p_p_switch_event_node {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22532,7 +22539,7 @@ public class SWIGTYPE_p_p_switch_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22562,7 +22569,7 @@ public class SWIGTYPE_p_p_switch_frame {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22592,7 +22599,7 @@ public class SWIGTYPE_p_p_switch_hashtable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22622,7 +22629,7 @@ public class SWIGTYPE_p_p_switch_hashtable_iterator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22652,7 +22659,7 @@ public class SWIGTYPE_p_p_switch_ivr_digit_stream {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22682,7 +22689,7 @@ public class SWIGTYPE_p_p_switch_ivr_digit_stream_parser {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22712,7 +22719,7 @@ public class SWIGTYPE_p_p_switch_ivr_dmachine {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22742,7 +22749,7 @@ public class SWIGTYPE_p_p_switch_ivr_dmachine_match {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22772,7 +22779,7 @@ public class SWIGTYPE_p_p_switch_ivr_menu {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22802,7 +22809,7 @@ public class SWIGTYPE_p_p_switch_ivr_menu_xml_ctx {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22832,7 +22839,7 @@ public class SWIGTYPE_p_p_switch_live_array_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22862,7 +22869,7 @@ public class SWIGTYPE_p_p_switch_log_node_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22892,7 +22899,7 @@ public class SWIGTYPE_p_p_switch_media_bug {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22922,7 +22929,7 @@ public class SWIGTYPE_p_p_switch_network_list {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22952,7 +22959,7 @@ public class SWIGTYPE_p_p_switch_rtp {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -22982,7 +22989,7 @@ public class SWIGTYPE_p_p_switch_say_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23012,7 +23019,7 @@ public class SWIGTYPE_p_p_switch_sql_queue_manager {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23042,7 +23049,7 @@ public class SWIGTYPE_p_p_switch_thread_data_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23072,7 +23079,7 @@ public class SWIGTYPE_p_p_switch_xml_binding {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23102,7 +23109,7 @@ public class SWIGTYPE_p_p_switch_xml {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23132,7 +23139,7 @@ public class SWIGTYPE_p_p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23162,7 +23169,7 @@ public class SWIGTYPE_p_real_pcre {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23192,7 +23199,7 @@ public class SWIGTYPE_p_short {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23222,7 +23229,7 @@ public class SWIGTYPE_p_sockaddr {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23252,7 +23259,7 @@ public class SWIGTYPE_p_sockaddr_in6 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23282,7 +23289,7 @@ public class SWIGTYPE_p_socklen_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23312,7 +23319,7 @@ public class SWIGTYPE_p_sqlite3 {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23342,7 +23349,7 @@ public class SWIGTYPE_p_sqlite3_stmt {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23372,7 +23379,7 @@ public class SWIGTYPE_p_stfu_instance_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23402,7 +23409,7 @@ public class SWIGTYPE_p_switch_buffer {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23432,7 +23439,7 @@ public class SWIGTYPE_p_switch_cache_db_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23462,7 +23469,7 @@ public class SWIGTYPE_p_switch_call_cause_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23492,7 +23499,7 @@ public class SWIGTYPE_p_switch_channel {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23522,7 +23529,7 @@ public class SWIGTYPE_p_switch_core_port_allocator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23552,7 +23559,7 @@ public class SWIGTYPE_p_switch_core_session {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23582,7 +23589,7 @@ public class SWIGTYPE_p_switch_event_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23612,7 +23619,7 @@ public class SWIGTYPE_p_switch_file_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23642,7 +23649,7 @@ public class SWIGTYPE_p_switch_hashtable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23672,7 +23679,7 @@ public class SWIGTYPE_p_switch_hashtable_iterator {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23702,7 +23709,7 @@ public class SWIGTYPE_p_switch_interval_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23732,7 +23739,7 @@ public class SWIGTYPE_p_switch_ivr_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23762,7 +23769,7 @@ public class SWIGTYPE_p_switch_ivr_digit_stream {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23792,7 +23799,7 @@ public class SWIGTYPE_p_switch_ivr_digit_stream_parser {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23822,7 +23829,7 @@ public class SWIGTYPE_p_switch_ivr_dmachine {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23852,7 +23859,7 @@ public class SWIGTYPE_p_switch_ivr_menu {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23882,7 +23889,7 @@ public class SWIGTYPE_p_switch_ivr_menu_xml_ctx {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23912,7 +23919,7 @@ public class SWIGTYPE_p_switch_live_array_s {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23942,7 +23949,7 @@ public class SWIGTYPE_p_switch_media_bug {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -23972,7 +23979,7 @@ public class SWIGTYPE_p_switch_mutex_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24002,7 +24009,7 @@ public class SWIGTYPE_p_switch_network_list {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24032,7 +24039,7 @@ public class SWIGTYPE_p_switch_odbc_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24062,7 +24069,7 @@ public class SWIGTYPE_p_switch_pgsql_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24092,7 +24099,7 @@ public class SWIGTYPE_p_switch_pollfd_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24122,7 +24129,7 @@ public class SWIGTYPE_p_switch_queue_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24152,7 +24159,7 @@ public class SWIGTYPE_p_switch_rtcp_frame {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24182,7 +24189,7 @@ public class SWIGTYPE_p_switch_rtp {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24212,7 +24219,7 @@ public class SWIGTYPE_p_switch_rtp_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24242,7 +24249,7 @@ public class SWIGTYPE_p_switch_say_file_handle {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24272,7 +24279,7 @@ public class SWIGTYPE_p_switch_size_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24302,7 +24309,7 @@ public class SWIGTYPE_p_switch_sockaddr_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24332,7 +24339,7 @@ public class SWIGTYPE_p_switch_socket_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24362,7 +24369,7 @@ public class SWIGTYPE_p_switch_sql_queue_manager {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24392,7 +24399,7 @@ public class SWIGTYPE_p_switch_ssize_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24422,7 +24429,7 @@ public class SWIGTYPE_p_switch_thread_rwlock_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24452,7 +24459,7 @@ public class SWIGTYPE_p_switch_thread_start_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24482,7 +24489,7 @@ public class SWIGTYPE_p_switch_time_exp_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24512,7 +24519,7 @@ public class SWIGTYPE_p_switch_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24542,7 +24549,7 @@ public class SWIGTYPE_p_switch_xml_binding {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24572,7 +24579,7 @@ public class SWIGTYPE_p_time_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24602,7 +24609,7 @@ public class SWIGTYPE_p_unsigned_char {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24632,7 +24639,7 @@ public class SWIGTYPE_p_unsigned_int {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24662,7 +24669,7 @@ public class SWIGTYPE_p_unsigned_long {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24692,7 +24699,7 @@ public class SWIGTYPE_p_unsigned_short {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24722,7 +24729,7 @@ public class SWIGTYPE_p_void {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24745,7 +24752,7 @@ public enum switch_abc_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24889,7 +24896,7 @@ public class switch_api_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -24909,7 +24916,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25073,7 +25080,7 @@ public class switch_application_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25165,7 +25172,7 @@ public class switch_app_log : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25185,7 +25192,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25392,7 +25399,7 @@ public class switch_asr_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25703,7 +25710,7 @@ public class switch_asr_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25723,7 +25730,7 @@ public enum switch_audio_col_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25864,7 +25871,7 @@ public class switch_audio_resampler_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25886,7 +25893,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25902,7 +25909,7 @@ public enum switch_bitpack_mode_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26083,7 +26090,7 @@ public class switch_bitpack_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26099,7 +26106,7 @@ public enum switch_bool_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26181,7 +26188,7 @@ public class switch_cache_db_connection_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26240,7 +26247,7 @@ public class switch_cache_db_core_db_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26257,7 +26264,7 @@ public enum switch_cache_db_handle_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26339,7 +26346,7 @@ public class switch_cache_db_native_handle_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26418,7 +26425,7 @@ public class switch_cache_db_odbc_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26477,7 +26484,7 @@ public class switch_cache_db_pgsql_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26561,7 +26568,7 @@ public enum switch_call_cause_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26577,7 +26584,7 @@ public enum switch_call_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26668,7 +26675,7 @@ public class switch_caller_application : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26792,7 +26799,7 @@ public class switch_caller_extension : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27271,7 +27278,7 @@ public class switch_caller_profile : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27289,7 +27296,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27308,7 +27315,7 @@ public enum switch_channel_app_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27331,7 +27338,7 @@ public enum switch_channel_callstate_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27352,7 +27359,7 @@ public enum switch_channel_cap_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27489,7 +27496,7 @@ public enum switch_channel_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27517,7 +27524,7 @@ public enum switch_channel_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27709,7 +27716,7 @@ public class switch_channel_timetable : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27724,7 +27731,7 @@ public enum switch_chat_application_flag_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27888,7 +27895,7 @@ public class switch_chat_application_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28012,7 +28019,7 @@ public class switch_chat_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28189,7 +28196,7 @@ public class switch_codec : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28212,7 +28219,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28312,7 +28319,7 @@ public class switch_codec_fmtp : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28566,7 +28573,7 @@ public class switch_codec_implementation : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28711,7 +28718,7 @@ public class switch_codec_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28770,7 +28777,7 @@ public class switch_codec_settings : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28788,7 +28795,7 @@ public enum switch_codec_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -28928,7 +28935,7 @@ public class switch_config : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29019,7 +29026,7 @@ public class switch_console_callback_match : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29089,7 +29096,7 @@ public class switch_console_callback_match_node : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29129,7 +29136,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29146,7 +29153,7 @@ public enum switch_core_media_ice_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29388,7 +29395,7 @@ public class switch_core_session_message : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29405,7 +29412,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29468,7 +29475,7 @@ public enum switch_core_session_message_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29571,7 +29578,7 @@ public class switch_core_thread_session : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29690,7 +29697,7 @@ public class switch_core_time_duration : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29835,7 +29842,7 @@ public class switch_device_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30107,7 +30114,7 @@ public class switch_device_record_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30128,7 +30135,7 @@ public enum switch_device_state_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30427,7 +30434,7 @@ public class switch_device_stats_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30551,7 +30558,7 @@ public class switch_dialplan_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30568,7 +30575,7 @@ public enum switch_digit_action_target_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30767,7 +30774,7 @@ public class switch_directories : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30782,7 +30789,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -30874,7 +30881,7 @@ public class switch_directory_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31042,7 +31049,7 @@ public class switch_directory_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31058,7 +31065,7 @@ public enum switch_dtmf_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31077,7 +31084,7 @@ public enum switch_dtmf_source_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31166,7 +31173,7 @@ public class switch_dtmf_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31185,7 +31192,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31342,7 +31349,7 @@ public class switch_endpoint_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31516,7 +31523,7 @@ public class switch_event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31533,7 +31540,7 @@ public enum switch_event_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31642,7 +31649,7 @@ public class switch_event_header : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31746,7 +31753,7 @@ public enum switch_event_types_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -31779,7 +31786,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32290,7 +32297,7 @@ public class switch_file_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32522,7 +32529,7 @@ public class switch_file_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32581,7 +32588,7 @@ public class switch_filenames : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32828,7 +32835,7 @@ public class switch_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32854,7 +32861,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32948,7 +32955,7 @@ public class switch_hold_record_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -32965,7 +32972,7 @@ public enum switch_hup_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33089,7 +33096,7 @@ public class switch_input_args_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33105,7 +33112,7 @@ public enum switch_input_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33176,7 +33183,7 @@ public class switch_io_event_hook_kill_channel : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33247,7 +33254,7 @@ public class switch_io_event_hook_outgoing_channel : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33318,7 +33325,7 @@ public class switch_io_event_hook_read_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33389,7 +33396,7 @@ public class switch_io_event_hook_receive_event : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33460,7 +33467,7 @@ public class switch_io_event_hook_receive_message : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33531,7 +33538,7 @@ public class switch_io_event_hook_recv_dtmf : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33712,7 +33719,7 @@ public class switch_io_event_hooks : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33783,7 +33790,7 @@ public class switch_io_event_hook_send_dtmf : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33854,7 +33861,7 @@ public class switch_io_event_hook_state_change : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33925,7 +33932,7 @@ public class switch_io_event_hook_state_run : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -33996,7 +34003,7 @@ public class switch_io_event_hook_video_read_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34067,7 +34074,7 @@ public class switch_io_event_hook_video_write_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34138,7 +34145,7 @@ public class switch_io_event_hook_write_frame : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34155,7 +34162,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34180,7 +34187,7 @@ public enum switch_io_routine_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34372,7 +34379,7 @@ public class switch_io_routines : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34393,7 +34400,7 @@ public enum switch_ivr_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34494,7 +34501,7 @@ public class switch_ivr_dmachine_match : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34511,7 +34518,7 @@ public enum switch_ivr_menu_flags {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34528,7 +34535,7 @@ public enum switch_ivr_option_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34672,7 +34679,7 @@ public class switch_json_api_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34851,7 +34858,7 @@ public class switch_limit_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34953,7 +34960,7 @@ public class switch_loadable_module_function_table_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35220,7 +35227,7 @@ public class switch_loadable_module_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35254,7 +35261,7 @@ public enum switch_log_level_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35405,7 +35412,7 @@ public class switch_log_node_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35422,7 +35429,7 @@ public enum switch_management_action_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35546,7 +35553,7 @@ public class switch_management_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35578,7 +35585,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35602,7 +35609,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35618,7 +35625,7 @@ public enum switch_media_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35634,7 +35641,7 @@ public enum switch_module_flag_enum_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35664,7 +35671,7 @@ public enum switch_module_interface_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35686,7 +35693,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35705,7 +35712,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35722,7 +35729,7 @@ public enum switch_priority_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35738,7 +35745,7 @@ public enum switch_pvt_class_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35755,7 +35762,7 @@ public enum switch_ring_ready_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35854,7 +35861,7 @@ public class switch_rtcp_hdr_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35933,7 +35940,7 @@ public class switch_rtcp_numbers_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35960,7 +35967,7 @@ public enum switch_rtp_bug_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -35979,7 +35986,7 @@ public enum switch_rtp_crypto_direction_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36082,7 +36089,7 @@ public class switch_rtp_crypto_key : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36106,7 +36113,7 @@ public enum switch_rtp_crypto_key_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36160,7 +36167,7 @@ public enum switch_rtp_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36177,7 +36184,7 @@ public enum switch_rtp_flush_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36246,7 +36253,7 @@ public class switch_rtp_hdr_ext_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36385,7 +36392,7 @@ public class switch_rtp_hdr_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36761,7 +36768,7 @@ public class switch_rtp_numbers_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36853,7 +36860,7 @@ public class switch_rtp_stats_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36942,7 +36949,7 @@ public class switch_say_args_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -36960,7 +36967,7 @@ public enum switch_say_gender_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37095,7 +37102,7 @@ public class switch_say_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37114,7 +37121,7 @@ public enum switch_say_method_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37147,7 +37154,7 @@ public enum switch_say_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37165,7 +37172,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37295,7 +37302,7 @@ public class switch_scheduler_task : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37311,7 +37318,7 @@ public enum switch_sdp_type_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37380,7 +37387,7 @@ public class switch_serial_event_header_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37489,7 +37496,7 @@ public class switch_serial_event_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37546,7 +37553,7 @@ public enum switch_session_ctl_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37564,7 +37571,7 @@ public enum switch_signal_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37656,7 +37663,7 @@ public class switch_slin_data : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37678,7 +37685,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -37925,7 +37932,7 @@ public class switch_speech_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38126,7 +38133,7 @@ public class switch_speech_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38205,7 +38212,7 @@ public class switch_srtp_crypto_suite_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38224,7 +38231,7 @@ public enum switch_stack_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38239,7 +38246,7 @@ public enum switch_state_handler_flag_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38265,7 +38272,7 @@ public enum switch_state_handler_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38467,7 +38474,7 @@ public class switch_state_handler_table : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38506,7 +38513,7 @@ public enum switch_status_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38658,7 +38665,7 @@ public class switch_stream_handle : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38857,7 +38864,7 @@ public class switch_t38_options_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38875,7 +38882,7 @@ public enum switch_text_channel_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38968,7 +38975,7 @@ public class switch_thread_data_t : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38986,7 +38993,7 @@ public enum switch_thread_priority_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39132,7 +39139,7 @@ public class switch_timer : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39147,7 +39154,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39167,7 +39174,7 @@ public enum switch_timer_func_name_t {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39346,7 +39353,7 @@ public class switch_timer_interface : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39563,7 +39570,7 @@ public class switch_unicast_conninfo : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39581,7 +39588,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39598,7 +39605,7 @@ public enum switch_uri_flags {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39616,7 +39623,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39801,7 +39808,7 @@ public class switch_xml : IDisposable {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -39819,7 +39826,7 @@ namespace FreeSWITCH.Native {
 }
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/src/mod/languages/mod_perl/freeswitch.i b/src/mod/languages/mod_perl/freeswitch.i
index a02d4476c6..262a70e2c1 100644
--- a/src/mod/languages/mod_perl/freeswitch.i
+++ b/src/mod/languages/mod_perl/freeswitch.i
@@ -15,6 +15,8 @@
 %newobject CoreSession;
 %newobject Event;
 %newobject Stream;
+%newobject API::execute;
+%newobject API::executeString;
 
 /** insert the following includes into generated code so it compiles */
 %{
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index 0f8d70409c..dfaebd8aa7 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -2679,6 +2679,7 @@ XS(_wrap_API_execute) {
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+    free(result);
     XSRETURN(argvi);
   fail:
     
@@ -2719,6 +2720,7 @@ XS(_wrap_API_executeString) {
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+    free(result);
     XSRETURN(argvi);
   fail:
     
diff --git a/src/mod/legacy/languages/mod_lua/freeswitch.i b/src/mod/legacy/languages/mod_lua/freeswitch.i
index 0a2246f161..1c1a5f375b 100644
--- a/src/mod/legacy/languages/mod_lua/freeswitch.i
+++ b/src/mod/legacy/languages/mod_lua/freeswitch.i
@@ -38,6 +38,8 @@
 %newobject Event;
 %newobject Stream;
 %newobject Dbh;
+%newobject API::execute;
+%newobject API::executeString;
 
 /**
  * tell swig to grok everything defined in these header files and
diff --git a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
index d4027d471f..abe8d944ba 100644
--- a/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/legacy/languages/mod_lua/mod_lua_wrap.cpp
@@ -1980,6 +1980,7 @@ static int _wrap_API_execute(lua_State* L) {
   result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
   SWIG_arg=0;
   lua_pushstring(L,(const char*)result); SWIG_arg++;
+  free(result);
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2008,6 +2009,7 @@ static int _wrap_API_executeString(lua_State* L) {
   result = (char *)(arg1)->executeString((char const *)arg2);
   SWIG_arg=0;
   lua_pushstring(L,(const char*)result); SWIG_arg++;
+  free(result);
   return SWIG_arg;
   
   if(0) SWIG_fail;
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index b1613f3a26..778c53d20e 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -222,12 +222,11 @@ SWITCH_DECLARE_CONSTRUCTOR API::API(CoreSession *s)
 	} else {
 		session = NULL;
 	}
-	last_data = NULL;
 }
 
 SWITCH_DECLARE_CONSTRUCTOR API::~API()
 {
-	switch_safe_free(last_data);
+	return;
 }
 
 
@@ -237,9 +236,7 @@ SWITCH_DECLARE(const char *) API::execute(const char *cmd, const char *arg)
 	this_check("");
 	SWITCH_STANDARD_STREAM(stream);
 	switch_api_execute(cmd, arg, session, &stream);
-	switch_safe_free(last_data);
-	last_data = (char *) stream.data;
-	return last_data;
+	return (char *) stream.data;
 }
 
 
@@ -269,13 +266,10 @@ SWITCH_DECLARE(const char *) API::executeString(const char *cmd)
 		*arg++ = '\0';
 	}
 
-	switch_safe_free(last_data);
-	
 	SWITCH_STANDARD_STREAM(stream);
 	switch_api_execute(mycmd, arg, session, &stream);
-	last_data = (char *) stream.data;
 	switch_safe_free(mycmd);
-	return last_data;
+	return (char *) stream.data;
 }
 
 SWITCH_DECLARE_CONSTRUCTOR Event::Event(const char *type, const char *subclass_name)

From 6f439d3741ae01ff8b612f3623571a69fe0080a9 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Wed, 16 Jul 2014 23:26:20 +0800
Subject: [PATCH 021/130] Tweaks, and a fix for FAX polling.

---
 libs/spandsp/src/ademco_contactid.c           |  2 +-
 libs/spandsp/src/async.c                      |  1 +
 libs/spandsp/src/bell_r2_mf.c                 |  8 +-
 libs/spandsp/src/fax_modems.c                 |  5 +
 libs/spandsp/src/gsm0610_local.h              | 38 ++++----
 libs/spandsp/src/gsm0610_rpe.c                |  2 +-
 libs/spandsp/src/sig_tone.c                   |  2 +-
 libs/spandsp/src/spandsp/fast_convert.h       |  4 +-
 libs/spandsp/src/spandsp/fir.h                | 14 +--
 libs/spandsp/src/spandsp/hdlc.h               |  3 +-
 .../src/spandsp/private/at_interpreter.h      |  4 +-
 libs/spandsp/src/spandsp/private/bell_r2_mf.h |  2 +-
 libs/spandsp/src/spandsp/private/g722.h       |  4 +-
 libs/spandsp/src/spandsp/private/v42.h        |  2 +-
 libs/spandsp/src/spandsp/t30.h                |  2 +-
 libs/spandsp/src/spandsp/t38_gateway.h        |  8 +-
 libs/spandsp/src/spandsp/tone_detect.h        |  2 +-
 libs/spandsp/src/t30.c                        |  8 +-
 libs/spandsp/src/t31.c                        |  5 +-
 libs/spandsp/src/t35.c                        |  4 +-
 libs/spandsp/src/t38_core.c                   | 96 ++++++++++++++++++-
 libs/spandsp/src/t38_gateway.c                | 10 +-
 libs/spandsp/src/t38_terminal.c               |  1 +
 libs/spandsp/src/testcpuid.c                  | 46 ++++-----
 libs/spandsp/src/time_scale.c                 |  4 +-
 libs/spandsp/src/v8.c                         |  2 +-
 libs/spandsp/tests/fax_tester.h               | 24 +++++
 libs/spandsp/tests/tsb85_tests.c              | 17 ++--
 28 files changed, 222 insertions(+), 98 deletions(-)

diff --git a/libs/spandsp/src/ademco_contactid.c b/libs/spandsp/src/ademco_contactid.c
index f497106d2f..975525adb8 100644
--- a/libs/spandsp/src/ademco_contactid.c
+++ b/libs/spandsp/src/ademco_contactid.c
@@ -504,7 +504,7 @@ SPAN_DECLARE(int) decode_msg(ademco_contactid_report_t *report, const char buf[]
     int x;
     char buf2[20];
 
-    /* We need to remap normal DTMF (0-0, *, #, A-D) to Ademco's pseudo-hex (0-0, B-F, nothing for A)
+    /* We need to remap normal DTMF (0-9, *, #, A-D) to Ademco's pseudo-hex (0-9, B-F, nothing for A)
        and calculate the checksum */
     for (sum = 0, s = buf, t = buf2;  *s;  s++, t++)
     {
diff --git a/libs/spandsp/src/async.c b/libs/spandsp/src/async.c
index d1bf5bda5b..bd4166aab9 100644
--- a/libs/spandsp/src/async.c
+++ b/libs/spandsp/src/async.c
@@ -85,6 +85,7 @@ SPAN_DECLARE(const char *) signal_status_to_str(int status)
     case SIG_STATUS_LINK_IDLE:
         return "Link idle";
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
diff --git a/libs/spandsp/src/bell_r2_mf.c b/libs/spandsp/src/bell_r2_mf.c
index 41c11674b4..fe106ed6d3 100644
--- a/libs/spandsp/src/bell_r2_mf.c
+++ b/libs/spandsp/src/bell_r2_mf.c
@@ -293,15 +293,15 @@ SPAN_DECLARE(int) bell_mf_tx(bell_mf_tx_state_t *s, int16_t amp[], int max_sampl
     if (s->tones.current_section >= 0)
     {
         /* Deal with the fragment left over from last time */
-        len = tone_gen(&(s->tones), amp, max_samples);
+        len = tone_gen(&s->tones, amp, max_samples);
     }
     while (len < max_samples  &&  (digit = queue_read_byte(&s->queue.queue)) >= 0)
     {
         /* Step to the next digit */
         if ((cp = strchr(bell_mf_tone_codes, digit)) == NULL)
             continue;
-        tone_gen_init(&(s->tones), &bell_mf_digit_tones[cp - bell_mf_tone_codes]);
-        len += tone_gen(&(s->tones), amp + len, max_samples - len);
+        tone_gen_init(&s->tones, &bell_mf_digit_tones[cp - bell_mf_tone_codes]);
+        len += tone_gen(&s->tones, amp + len, max_samples - len);
     }
     return len;
 }
@@ -338,7 +338,7 @@ SPAN_DECLARE(bell_mf_tx_state_t *) bell_mf_tx_init(bell_mf_tx_state_t *s)
 
     if (!bell_mf_gen_inited)
         bell_mf_gen_init();
-    tone_gen_init(&(s->tones), &bell_mf_digit_tones[0]);
+    tone_gen_init(&s->tones, &bell_mf_digit_tones[0]);
     s->current_sample = 0;
     queue_init(&s->queue.queue, MAX_BELL_MF_DIGITS, QUEUE_READ_ATOMIC | QUEUE_WRITE_ATOMIC);
     s->tones.current_section = -1;
diff --git a/libs/spandsp/src/fax_modems.c b/libs/spandsp/src/fax_modems.c
index df89b088c2..4602854a6f 100644
--- a/libs/spandsp/src/fax_modems.c
+++ b/libs/spandsp/src/fax_modems.c
@@ -161,8 +161,10 @@ SPAN_DECLARE_NONSTD(void) fax_modems_hdlc_accept(void *user_data, const uint8_t
        say the current signal source is valid. */
     if (len >= 0  &&  ok)
         s->rx_frame_received = true;
+    /*endif*/
     if (s->hdlc_accept)
         s->hdlc_accept(s->hdlc_accept_user_data, msg, len, ok);
+    /*endif*/
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -176,6 +178,7 @@ SPAN_DECLARE_NONSTD(void) fax_modems_hdlc_tx_frame(void *user_data, const uint8_
         hdlc_tx_restart(&s->hdlc_tx);
     else
         hdlc_tx_frame(&s->hdlc_tx, msg, len);
+    /*endif*/
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -579,6 +582,7 @@ SPAN_DECLARE(int) fax_modems_set_next_tx_type(fax_modems_state_t *s)
         fax_modems_set_next_tx_handler(s, (span_tx_handler_t) NULL, NULL);
         return 0;
     }
+    /*endif*/
     /* There is nothing else to change to, so use zero length silence */
     silence_gen_alter(&s->silence_gen, 0);
     fax_modems_set_tx_handler(s, (span_tx_handler_t) &silence_gen, &s->silence_gen);
@@ -619,6 +623,7 @@ SPAN_DECLARE(fax_modems_state_t *) fax_modems_init(fax_modems_state_t *s,
     {
         if ((s = (fax_modems_state_t *) span_alloc(sizeof(*s))) == NULL)
             return NULL;
+        /*endif*/
     }
     /*endif*/
     memset(s, 0, sizeof(*s));
diff --git a/libs/spandsp/src/gsm0610_local.h b/libs/spandsp/src/gsm0610_local.h
index 8aaac612e0..e1b3b10ed8 100644
--- a/libs/spandsp/src/gsm0610_local.h
+++ b/libs/spandsp/src/gsm0610_local.h
@@ -53,7 +53,7 @@ static __inline__ int16_t gsm_add(int16_t a, int16_t b)
     int32_t sum;
 
     sum = (int32_t) a + (int32_t) b;
-    return  saturate16(sum);
+    return saturate16(sum);
 #endif
 }
 /*- End of function --------------------------------------------------------*/
@@ -78,17 +78,17 @@ static __inline__ int32_t gsm_l_add(int32_t a, int32_t b)
     if (a < 0)
     {
         if (b >= 0)
-            return  a + b;
+            return a + b;
         /*endif*/
         A = (uint32_t) -(a + 1) + (uint32_t) -(b + 1);
-        return  (A >= INT32_MAX)  ?  INT32_MIN  :  -(int32_t) A - 2;
+        return (A >= INT32_MAX)  ?  INT32_MIN  :  -(int32_t) A - 2;
     }
     /*endif*/
     if (b <= 0)
-        return  a + b;
+        return a + b;
     /*endif*/
     A = (uint32_t) a + (uint32_t) b;
-    return  (A > INT32_MAX)  ?  INT32_MAX  :  A;
+    return (A > INT32_MAX)  ?  INT32_MAX  :  A;
 #endif
 }
 /*- End of function --------------------------------------------------------*/
@@ -98,23 +98,23 @@ static __inline__ int16_t gsm_sub(int16_t a, int16_t b)
     int32_t diff;
 
     diff = (int32_t) a - (int32_t) b;
-    return  saturate16(diff);
+    return saturate16(diff);
 }
 /*- End of function --------------------------------------------------------*/
 
 static __inline__ int16_t gsm_mult(int16_t a, int16_t b)
 {
     if (a == INT16_MIN  &&  b == INT16_MIN)
-        return  INT16_MAX;
+        return INT16_MAX;
     /*endif*/
-    return  (int16_t) (((int32_t) a * (int32_t) b) >> 15);
+    return (int16_t) (((int32_t) a * (int32_t) b) >> 15);
 }
 /*- End of function --------------------------------------------------------*/
 
 static __inline__ int32_t gsm_l_mult(int16_t a, int16_t b)
 {
     assert (a != INT16_MIN  ||  b != INT16_MIN);
-    return  ((int32_t) a * (int32_t) b) << 1;
+    return ((int32_t) a * (int32_t) b) << 1;
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -123,47 +123,47 @@ static __inline__ int16_t gsm_mult_r(int16_t a, int16_t b)
     int32_t prod;
 
     if (b == INT16_MIN  &&  a == INT16_MIN)
-        return  INT16_MAX;
+        return INT16_MAX;
     /*endif*/
     prod = (int32_t) a * (int32_t) b + 16384;
     prod >>= 15;
-    return  (int16_t) (prod & 0xFFFF);
+    return (int16_t) (prod & 0xFFFF);
 }
 /*- End of function --------------------------------------------------------*/
 
 static __inline__ int16_t gsm_abs(int16_t a)
 {
-    return  (a == INT16_MIN)  ?  INT16_MAX  :  (int16_t) abs(a);
+    return (a == INT16_MIN)  ?  INT16_MAX  :  (int16_t) abs(a);
 }
 /*- End of function --------------------------------------------------------*/
 
 static __inline__ int16_t gsm_asr(int16_t a, int n)
 {
     if (n >= 16)
-        return  (int16_t) (-(a < 0));
+        return (int16_t) (-(a < 0));
     /*endif*/
     if (n <= -16)
-        return  0;
+        return 0;
     /*endif*/
     if (n < 0)
         return (int16_t) (a << -n);
     /*endif*/
-    return  (int16_t) (a >> n);
+    return (int16_t) (a >> n);
 }
 /*- End of function --------------------------------------------------------*/
 
 static __inline__ int16_t gsm_asl(int16_t a, int n)
 {
     if (n >= 16)
-        return  0;
+        return 0;
     /*endif*/
     if (n <= -16)
-        return  (int16_t) (-(a < 0));
+        return (int16_t) (-(a < 0));
     /*endif*/
     if (n < 0)
-        return  gsm_asr(a, -n);
+        return gsm_asr(a, -n);
     /*endif*/
-    return  (int16_t) (a << n);
+    return (int16_t) (a << n);
 }
 /*- End of function --------------------------------------------------------*/
 
diff --git a/libs/spandsp/src/gsm0610_rpe.c b/libs/spandsp/src/gsm0610_rpe.c
index b21e43af14..dbec0d24bb 100644
--- a/libs/spandsp/src/gsm0610_rpe.c
+++ b/libs/spandsp/src/gsm0610_rpe.c
@@ -59,7 +59,7 @@
 static void weighting_filter(int16_t x[40],
                              const int16_t *e)      // signal [-5..0.39.44] IN)
 {
-#if defined(__GNUC__)  &&  defined(SPANDSP_USE_MMX)  &&  defined(__x86_64__) && !(defined(__APPLE_CC__)  && __APPLE_CC__ >= 5448) && !defined(__OpenBSD__)
+#if defined(__GNUC__)  &&  defined(SPANDSP_USE_MMX)  &&  defined(__x86_64__)
     /* Table 4.4   Coefficients of the weighting filter */
     /* This must be padded to a multiple of 4 for MMX to work */
     static const union
diff --git a/libs/spandsp/src/sig_tone.c b/libs/spandsp/src/sig_tone.c
index 20e16df3e4..046b2e8735 100644
--- a/libs/spandsp/src/sig_tone.c
+++ b/libs/spandsp/src/sig_tone.c
@@ -302,7 +302,7 @@ SPAN_DECLARE(int) sig_tone_tx(sig_tone_tx_state_t *s, int16_t amp[], int len)
                 {
                     for (j = i;  j < i + n;  j++)
                     {
-                        tone = dds_mod(&(s->phase_acc[k]), s->phase_rate[k], s->tone_scaling[k][high_low], 0);
+                        tone = dds_mod(&s->phase_acc[k], s->phase_rate[k], s->tone_scaling[k][high_low], 0);
                         amp[j] = sat_add16(amp[j], tone);
                     }
                     /*endfor*/
diff --git a/libs/spandsp/src/spandsp/fast_convert.h b/libs/spandsp/src/spandsp/fast_convert.h
index 120050646f..8f79b110d4 100644
--- a/libs/spandsp/src/spandsp/fast_convert.h
+++ b/libs/spandsp/src/spandsp/fast_convert.h
@@ -322,12 +322,12 @@ extern "C"
 #if (_MSC_VER < 1800)
     __inline long int lrint(double x)
     {
-        return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) );
+        return (long int)_mm_cvtsd_si64x(_mm_loadu_pd((const double *) &x));
     }
 
     __inline long int lrintf(float x)
     {
-        return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) );
+        return _mm_cvt_ss2si(_mm_load_ss((const float *) &x));
     }
 #endif
 
diff --git a/libs/spandsp/src/spandsp/fir.h b/libs/spandsp/src/spandsp/fir.h
index 74b0bc2d3f..85be5d2a6f 100644
--- a/libs/spandsp/src/spandsp/fir.h
+++ b/libs/spandsp/src/spandsp/fir.h
@@ -88,10 +88,10 @@ static __inline__ const int16_t *fir16_create(fir16_state_t *fir,
     fir->curr_pos = taps - 1;
     fir->coeffs = coeffs;
 #if defined(USE_MMX)  ||  defined(USE_SSE2)
-    if ((fir->history = malloc(2*taps*sizeof(int16_t))))
+    if ((fir->history = span_alloc(2*taps*sizeof(int16_t))))
         memset(fir->history, 0, 2*taps*sizeof(int16_t));
 #else
-    if ((fir->history = (int16_t *) malloc(taps*sizeof(int16_t))))
+    if ((fir->history = (int16_t *) span_alloc(taps*sizeof(int16_t))))
         memset(fir->history, 0, taps*sizeof(int16_t));
 #endif
     return fir->history;
@@ -110,7 +110,7 @@ static __inline__ void fir16_flush(fir16_state_t *fir)
 
 static __inline__ void fir16_free(fir16_state_t *fir)
 {
-    free(fir->history);
+    span_free(fir->history);
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -210,7 +210,7 @@ static __inline__ const int16_t *fir32_create(fir32_state_t *fir,
     fir->taps = taps;
     fir->curr_pos = taps - 1;
     fir->coeffs = coeffs;
-    fir->history = (int16_t *) malloc(taps*sizeof(int16_t));
+    fir->history = (int16_t *) span_alloc(taps*sizeof(int16_t));
     if (fir->history)
         memset(fir->history, '\0', taps*sizeof(int16_t));
     return fir->history;
@@ -225,7 +225,7 @@ static __inline__ void fir32_flush(fir32_state_t *fir)
 
 static __inline__ void fir32_free(fir32_state_t *fir)
 {
-    free(fir->history);
+    span_free(fir->history);
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -258,7 +258,7 @@ static __inline__ const float *fir_float_create(fir_float_state_t *fir,
     fir->taps = taps;
     fir->curr_pos = taps - 1;
     fir->coeffs = coeffs;
-    fir->history = (float *) malloc(taps*sizeof(float));
+    fir->history = (float *) span_alloc(taps*sizeof(float));
     if (fir->history)
         memset(fir->history, '\0', taps*sizeof(float));
     return fir->history;
@@ -267,7 +267,7 @@ static __inline__ const float *fir_float_create(fir_float_state_t *fir,
 
 static __inline__ void fir_float_free(fir_float_state_t *fir)
 {
-    free(fir->history);
+    span_free(fir->history);
 }
 /*- End of function --------------------------------------------------------*/
 
diff --git a/libs/spandsp/src/spandsp/hdlc.h b/libs/spandsp/src/spandsp/hdlc.h
index 52f68505b1..a9369475c1 100644
--- a/libs/spandsp/src/spandsp/hdlc.h
+++ b/libs/spandsp/src/spandsp/hdlc.h
@@ -81,7 +81,8 @@ extern "C"
 {
 #endif
 
-/*! \brief Initialise an HDLC receiver context.
+/*! Initialise an HDLC receiver context.
+    \brief Initialise an HDLC receiver context.
     \param s A pointer to an HDLC receiver context.
     \param crc32 True to use ITU CRC32. False to use ITU CRC16.
     \param report_bad_frames True to request the reporting of bad frames.
diff --git a/libs/spandsp/src/spandsp/private/at_interpreter.h b/libs/spandsp/src/spandsp/private/at_interpreter.h
index 3ddade99c5..764b90bd00 100644
--- a/libs/spandsp/src/spandsp/private/at_interpreter.h
+++ b/libs/spandsp/src/spandsp/private/at_interpreter.h
@@ -106,9 +106,9 @@ struct at_state_s
     int command_dial;
     int ok_is_pending;
     int dte_is_waiting;
-    /*! \brief True if a carrier is presnt. Otherwise false. */
+    /*! \brief True if a carrier is present. */
     bool rx_signal_present;
-    /*! \brief True if a modem has trained, Otherwise false. */
+    /*! \brief True if a modem has trained, */
     bool rx_trained;
     int transmit;
 
diff --git a/libs/spandsp/src/spandsp/private/bell_r2_mf.h b/libs/spandsp/src/spandsp/private/bell_r2_mf.h
index d0681be23f..c694b9e2fa 100644
--- a/libs/spandsp/src/spandsp/private/bell_r2_mf.h
+++ b/libs/spandsp/src/spandsp/private/bell_r2_mf.h
@@ -88,7 +88,7 @@ struct r2_mf_rx_state_s
     tone_report_func_t callback;
     /*! An opaque pointer passed to the callback function. */
     void *callback_data;
-    /*! Tue is we are detecting forward tones. False if we are detecting backward tones */
+    /*! True if we are detecting forward tones. False if we are detecting backward tones */
     bool fwd;
     /*! Tone detector working states */
     goertzel_state_t out[6];
diff --git a/libs/spandsp/src/spandsp/private/g722.h b/libs/spandsp/src/spandsp/private/g722.h
index a98a574ce6..34d0fcba81 100644
--- a/libs/spandsp/src/spandsp/private/g722.h
+++ b/libs/spandsp/src/spandsp/private/g722.h
@@ -48,7 +48,7 @@ typedef struct
 struct g722_encode_state_s
 {
     /*! True if operating in the special ITU test mode, with the band split filters
-             disabled. */
+        disabled. */
     bool itu_test_mode;
     /*! True if the G.722 data is packed */
     bool packed;
@@ -74,7 +74,7 @@ struct g722_encode_state_s
 struct g722_decode_state_s
 {
     /*! True if operating in the special ITU test mode, with the band split filters
-             disabled. */
+        disabled. */
     bool itu_test_mode;
     /*! True if the G.722 data is packed */
     bool packed;
diff --git a/libs/spandsp/src/spandsp/private/v42.h b/libs/spandsp/src/spandsp/private/v42.h
index 5eac89f873..5d0a060a77 100644
--- a/libs/spandsp/src/spandsp/private/v42.h
+++ b/libs/spandsp/src/spandsp/private/v42.h
@@ -133,7 +133,7 @@ struct v42_state_s
 {
     /*! True if we are the calling party, otherwise false. */
     bool calling_party;
-    /*! True if we should detect whether the far end is V.42 capable. false if we go
+    /*! True if we should detect whether the far end is V.42 capable. False if we go
         directly to protocol establishment. */
     bool detect;
 
diff --git a/libs/spandsp/src/spandsp/t30.h b/libs/spandsp/src/spandsp/t30.h
index fce40ba8d3..b3c0b6ad36 100644
--- a/libs/spandsp/src/spandsp/t30.h
+++ b/libs/spandsp/src/spandsp/t30.h
@@ -32,7 +32,7 @@
 
 \section t30_page_sec_1 What does it do?
 The T.30 protocol is the core protocol used for FAX transmission. This module
-implements most of its key features. It does not interface to the outside work.
+implements most of its key features. It does not interface to the outside world.
 Seperate modules do that for T.38, analogue line, and other forms of FAX
 communication.
 
diff --git a/libs/spandsp/src/spandsp/t38_gateway.h b/libs/spandsp/src/spandsp/t38_gateway.h
index 4c68b7ff4a..8d7f2e0500 100644
--- a/libs/spandsp/src/spandsp/t38_gateway.h
+++ b/libs/spandsp/src/spandsp/t38_gateway.h
@@ -45,16 +45,14 @@ to maximum the tolerance of jitter and packet loss on the IP network.
 typedef struct t38_gateway_state_s t38_gateway_state_t;
 
 /*!
-    T.30 real time frame handler.
-    \brief T.30 real time frame handler.
-    \param s The T.30 context.
+    T.38 gateway real time frame handler.
+    \brief T.38 gateway real time frame handler.
     \param user_data An opaque pointer.
     \param incoming True for incoming, false for outgoing.
     \param msg The HDLC message.
     \param len The length of the message.
 */
-typedef void (*t38_gateway_real_time_frame_handler_t)(t38_gateway_state_t *s,
-                                                      void *user_data,
+typedef void (*t38_gateway_real_time_frame_handler_t)(void *user_data,
                                                       bool incoming,
                                                       const uint8_t *msg,
                                                       int len);
diff --git a/libs/spandsp/src/spandsp/tone_detect.h b/libs/spandsp/src/spandsp/tone_detect.h
index df75f230d6..7df69468bf 100644
--- a/libs/spandsp/src/spandsp/tone_detect.h
+++ b/libs/spandsp/src/spandsp/tone_detect.h
@@ -78,7 +78,7 @@ SPAN_DECLARE(void) make_goertzel_descriptor(goertzel_descriptor_t *t,
                                             int samples);
 
 /*! \brief Initialise the state of a Goertzel transform.
-    \param s The Goertzel context. If NULL, a context is allocated with malloc.
+    \param s The Goertzel context. If NULL, a context is allocated.
     \param t The Goertzel descriptor.
     \return A pointer to the Goertzel state. */
 SPAN_DECLARE(goertzel_state_t *) goertzel_init(goertzel_state_t *s,
diff --git a/libs/spandsp/src/t30.c b/libs/spandsp/src/t30.c
index e9a8c7d0d3..304a0aa570 100644
--- a/libs/spandsp/src/t30.c
+++ b/libs/spandsp/src/t30.c
@@ -2657,7 +2657,6 @@ static int start_receiving_document(t30_state_t *s)
         return -1;
     }
     span_log(&s->logging, SPAN_LOG_FLOW, "Start receiving document\n");
-    queue_phase(s, T30_PHASE_B_TX);
     s->ecm_block = 0;
     send_dis_or_dtc_sequence(s, true);
     return 0;
@@ -2745,7 +2744,7 @@ static int process_rx_dis_dtc(t30_state_t *s, const uint8_t *msg, int len)
         send_dcs_sequence(s, true);
         return 0;
     }
-    span_log(&s->logging, SPAN_LOG_FLOW, "%s nothing to send\n", t30_frametype(msg[2]));
+    span_log(&s->logging, SPAN_LOG_FLOW, "%s - nothing to send\n", t30_frametype(msg[2]));
     /* ... then try to receive something */
     if (s->rx_file[0])
     {
@@ -2772,7 +2771,7 @@ static int process_rx_dis_dtc(t30_state_t *s, const uint8_t *msg, int len)
         send_dis_or_dtc_sequence(s, true);
         return 0;
     }
-    span_log(&s->logging, SPAN_LOG_FLOW, "%s nothing to receive\n", t30_frametype(msg[2]));
+    span_log(&s->logging, SPAN_LOG_FLOW, "%s - nothing to receive\n", t30_frametype(msg[2]));
     /* There is nothing to do, or nothing we are able to do. */
     send_dcn(s);
     return -1;
@@ -5105,6 +5104,7 @@ static void queue_phase(t30_state_t *s, int phase)
                 s->send_hdlc_handler(s->send_hdlc_user_data, NULL, -1);
         }
         s->next_phase = phase;
+        span_log(&s->logging, SPAN_LOG_FLOW, "Queuing phase %s\n", phase_names[s->next_phase]);
     }
     else
     {
@@ -5116,7 +5116,7 @@ static void queue_phase(t30_state_t *s, int phase)
 
 static void set_phase(t30_state_t *s, int phase)
 {
-    if (phase != s->next_phase  &&  s->next_phase != T30_PHASE_IDLE)
+    if (s->next_phase != phase  &&  s->next_phase != T30_PHASE_IDLE)
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Flushing queued phase %s\n", phase_names[s->next_phase]);
         /* Ensure nothing has been left in the queue that was scheduled to go out in the previous next
diff --git a/libs/spandsp/src/t31.c b/libs/spandsp/src/t31.c
index ddc330694d..943063e8a2 100644
--- a/libs/spandsp/src/t31.c
+++ b/libs/spandsp/src/t31.c
@@ -69,6 +69,7 @@
 #include "spandsp/async.h"
 #include "spandsp/crc.h"
 #include "spandsp/hdlc.h"
+#include "spandsp/vector_int.h"
 #include "spandsp/silence_gen.h"
 #include "spandsp/super_tone_rx.h"
 #include "spandsp/fsk.h"
@@ -929,7 +930,7 @@ static int stream_non_ecm(t31_state_t *s)
                        help for all implentations. It is usually ignored, which is probably
                        the right thing to do after receiving a message saying the signal has
                        ended. */
-                    memset(buf + len, 0, fe->octets_per_data_packet - len);
+                    memset(&buf[len], 0, fe->octets_per_data_packet - len);
                     fe->non_ecm_trailer_bytes = 3*fe->octets_per_data_packet + len;
                     len = fe->octets_per_data_packet;
                     fe->timed_step = T38_TIMED_STEP_NON_ECM_MODEM_4;
@@ -2868,7 +2869,7 @@ SPAN_DECLARE_NONSTD(int) t31_tx(t31_state_t *s, int16_t amp[], int max_len)
     if (s->audio.modems.transmit_on_idle)
     {
         /* Pad to the requested length with silence */
-        memset(&amp[len], 0, (max_len - len)*sizeof(int16_t));
+        vec_zeroi16(&amp[len], max_len - len);
         len = max_len;
     }
     /*endif*/
diff --git a/libs/spandsp/src/t35.c b/libs/spandsp/src/t35.c
index f44f872fb3..c6fbaf8b41 100644
--- a/libs/spandsp/src/t35.c
+++ b/libs/spandsp/src/t35.c
@@ -500,7 +500,7 @@ static const nsf_data_t vendor_b5[] =
     {"\x00\x6E", 2, "Microsoft", false, NULL},
     {"\x00\x72", 2, "Speaking Devices", false, NULL},
     {"\x00\x74", 2, "Compaq", false, NULL},
-    {"\x00\x76", 2, "Microsoft", false, NULL},      /* uses LSB for country but MSB for manufacturer */
+    {"\x00\x76", 2, "Microsoft", false, NULL},      /* Uses LSB for country but MSB for manufacturer */
     {"\x00\x78", 2, "Cylink", false, NULL},
     {"\x00\x7A", 2, "Pitney Bowes", false, NULL},
     {"\x00\x7C", 2, "Digiboard", false, NULL},
@@ -724,7 +724,7 @@ static const country_code_t t35_country_codes[255] =
     {"Vanuatu", NULL},
     {"Vatican City State", NULL},
     {"Venezuela", NULL},
-    {"Viet Nam", vendor_bc},
+    {"Vietnam", vendor_bc},
     {"Wallis and Futuna", NULL},
     {"Western Samoa", NULL},
     {"Yemen (Republic of)", NULL},
diff --git a/libs/spandsp/src/t38_core.c b/libs/spandsp/src/t38_core.c
index c310ebbd95..de13af3e11 100644
--- a/libs/spandsp/src/t38_core.c
+++ b/libs/spandsp/src/t38_core.c
@@ -147,6 +147,7 @@ SPAN_DECLARE(const char *) t38_indicator_to_str(int indicator)
     case T38_IND_V33_14400_TRAINING:
         return "v33-14400-training";
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
@@ -186,6 +187,7 @@ SPAN_DECLARE(const char *) t38_data_type_to_str(int data_type)
     case T38_DATA_V33_14400:
         return "v33-14400";
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
@@ -219,6 +221,7 @@ SPAN_DECLARE(const char *) t38_field_type_to_str(int field_type)
     case T38_FIELD_V34RATE:
         return "v34rate";
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
@@ -240,6 +243,7 @@ SPAN_DECLARE(const char *) t38_cm_profile_to_str(int profile)
     case '6':
         return "V.34 HDX-only FAX receiving terminal";
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
@@ -248,6 +252,7 @@ SPAN_DECLARE(const char *) t38_jm_to_str(const uint8_t *data, int len)
 {
     if (len < 2)
         return "???";
+    /*endif*/
     switch (data[0])
     {
     case 'A':
@@ -256,6 +261,7 @@ SPAN_DECLARE(const char *) t38_jm_to_str(const uint8_t *data, int len)
         case '0':
             return "ACK";
         }
+        /*endswitch*/
         break;
     case 'N':
         switch (data[1])
@@ -269,8 +275,10 @@ SPAN_DECLARE(const char *) t38_jm_to_str(const uint8_t *data, int len)
             /* Response for profiles 5 and 6 */
             return "NACK: V.34 only FAX.";
         }
+        /*endswitch*/
         break;
     }
+    /*endswitch*/
     return "???";
 }
 /*- End of function --------------------------------------------------------*/
@@ -282,12 +290,15 @@ SPAN_DECLARE(int) t38_v34rate_to_bps(const uint8_t *data, int len)
 
     if (len < 3)
         return -1;
+    /*endif*/
     for (i = 0, rate = 0;  i < 3;  i++)
     {
         if (data[i] < '0'  ||  data[i] > '9')
             return -1;
+        /*endif*/
         rate = rate*10 + data[i] - '0';
     }
+    /*endfor*/
     return rate*100;
 }
 /*- End of function --------------------------------------------------------*/
@@ -307,11 +318,13 @@ static __inline__ int classify_seq_no_offset(int expected, int actual)
             /* In the near future */
             return 1;
         }
+        /*endif*/
         if (expected < actual + ACCEPTABLE_SEQ_NO_OFFSET)
         {
             /* In the recent past */
             return -1;
         }
+        /*endif*/
     }
     else
     {
@@ -320,12 +333,15 @@ static __inline__ int classify_seq_no_offset(int expected, int actual)
             /* In the near future */
             return 1;
         }
+        /*endif*/
         if (expected + 0x10000 - ACCEPTABLE_SEQ_NO_OFFSET < actual)
         {
             /* In the recent past */
             return -1;
         }
+        /*endif*/
     }
+    /*endif*/
     /* There has been a huge step in the sequence */
     return 0;
 }
@@ -355,6 +371,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
         sprintf(tag, "Rx %5d: IFP", log_seq_no);
         span_log_buf(&s->logging, SPAN_LOG_FLOW, tag, buf, len);
     }
+    /*endif*/
     ptr = 0;
     pkt_len = len;
     switch (s->data_transport_protocol)
@@ -369,15 +386,19 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             /* Version */
             if (buf[0] != 3)
                 return -1;
+            /*endif*/
             /* Reserved */
             if (buf[1] != 0)
                 return -1;
+            /*endif*/
             /* Packet length - this includes the length of the header itself */
             pkt_len = (buf[2] << 8) | buf[3];
             if (len < pkt_len)
                 return 0;
+            /*endif*/
             ptr = 4;
         }
+        /*endif*/
         ret = -1;
         break;
     default:
@@ -385,8 +406,10 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
         ret = -1;
         break;
     }
+    /*endswitch*/
     if ((ptr + 1) > pkt_len)
         return ret;
+    /*endif*/
     data_field_present = buf[ptr] & 0x80;
     type = (buf[ptr] >> 6) & 1;
     switch (type)
@@ -398,6 +421,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Data field with indicator\n", log_seq_no);
             return -1;
         }
+        /*endif*/
         /* Any received indicator should mean we no longer have a valid concept of "last received data/field type". */
         s->current_rx_data_type = -1;
         s->current_rx_field_type = -1;
@@ -406,12 +430,14 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             /* Extension */
             if ((ptr + 2) > pkt_len)
                 return ret;
+            /*endif*/
             t30_indicator = T38_IND_V8_ANSAM + (((buf[ptr] << 2) & 0x3C) | ((buf[ptr + 1] >> 6) & 0x3));
             if (t30_indicator > T38_IND_V33_14400_TRAINING)
             {
                 span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Unknown indicator - %d\n", log_seq_no, t30_indicator);
                 return -1;
             }
+            /*endif*/
             ptr += 2;
         }
         else
@@ -419,6 +445,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             t30_indicator = (buf[ptr] >> 1) & 0xF;
             ptr += 1;
         }
+        /*endif*/
         span_log(&s->logging, SPAN_LOG_FLOW, "Rx %5d: indicator %s\n", log_seq_no, t38_indicator_to_str(t30_indicator));
         s->rx_indicator_handler(s, s->rx_user_data, t30_indicator);
         /* This must come after the indicator handler, so the handler routine sees the existing state of the
@@ -431,12 +458,14 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             /* Extension */
             if ((ptr + 2) > pkt_len)
                 return ret;
+            /*endif*/
             t30_data = T38_DATA_V8 + (((buf[ptr] << 2) & 0x3C) | ((buf[ptr + 1] >> 6) & 0x3));
             if (t30_data > T38_DATA_V33_14400)
             {
                 span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Unknown data type - %d\n", log_seq_no, t30_data);
                 return -1;
             }
+            /*endif*/
             ptr += 2;
         }
         else
@@ -447,16 +476,20 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                 span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Unknown data type - %d\n", log_seq_no, t30_data);
                 return -1;
             }
+            /*endif*/
             ptr += 1;
         }
+        /*endif*/
         if (!data_field_present)
         {
             /* This is kinda weird, but I guess if the length checks out we accept it. */
             span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Data type with no data field\n", log_seq_no);
             break;
         }
+        /*endif*/
         if (ptr >= pkt_len)
             return ret;
+        /*endif*/
         count = buf[ptr++];
         //printf("Count is %d\n", count);
         /* Do a dummy run through the fields to check we have a complete and uncorrupted packet. */
@@ -466,6 +499,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
         {
             if (ptr >= pkt_len)
                 return ret;
+            /*endif*/
             if (s->t38_version == 0)
             {
                 /* The original version of T.38 with a typo in the ASN.1 spec. */
@@ -488,12 +522,15 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                         ptr++;
                     else
                         other_half = true;
+                    /*endif*/
                 }
+                /*endif*/
                 if (t30_field_type > T38_FIELD_T4_NON_ECM_SIG_END)
                 {
                     span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Unknown field type - %d\n", log_seq_no, t30_field_type);
                     return -1;
                 }
+                /*endif*/
             }
             else
             {
@@ -503,35 +540,45 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                 {
                     if ((ptr + 2) > pkt_len)
                         return ret;
+                    /*endif*/
                     t30_field_type = T38_FIELD_CM_MESSAGE + (((buf[ptr] << 2) & 0x3C) | ((buf[ptr + 1] >> 6) & 0x3));
                     if (t30_field_type > T38_FIELD_V34RATE)
                     {
                         span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Unknown field type - %d\n", log_seq_no, t30_field_type);
                         return -1;
                     }
+                    /*endif*/
                     ptr += 2;
                 }
                 else
                 {
                     ptr++;
                 }
+                /*endif*/
             }
+            /*endif*/
             /* Decode field_data */
             if (field_data_present)
             {
                 if ((ptr + 2) > pkt_len)
                     return ret;
+                /*endif*/
                 numocts = ((buf[ptr] << 8) | buf[ptr + 1]) + 1;
                 ptr += numocts + 2;
             }
+            /*endif*/
             if (ptr > pkt_len)
                 return ret;
+            /*endif*/
         }
+        /*endfor*/
         /* Check if we finished mid byte in a version 0 packet. */
         if (other_half)
             ptr++;
+        /*endif*/
         if (ptr > pkt_len)
             return ret;
+        /*endif*/
 
         /* Things look alright in the data, so lets run through the fields again, actually processing them.
            There is no need to do all the error checking along the way on this pass. */
@@ -561,7 +608,9 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                         ptr++;
                     else
                         other_half = true;
+                    /*endif*/
                 }
+                /*endif*/
             }
             else
             {
@@ -576,7 +625,9 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                 {
                     t30_field_type = (buf[ptr++] >> 3) & 0x7;
                 }
+                /*endif*/
             }
+            /*endif*/
             /* Decode field_data */
             if (field_data_present)
             {
@@ -589,6 +640,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
                 numocts = 0;
                 msg = NULL;
             }
+            /*endif*/
             span_log(&s->logging,
                      SPAN_LOG_FLOW,
                      "Rx %5d: (%d) data %s/%s + %d byte(s)\n",
@@ -601,13 +653,17 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_stream(t38_core_state_t *s, const uint8
             s->current_rx_data_type = t30_data;
             s->current_rx_field_type = t30_field_type;
         }
+        /*endfor*/
         /* Check if we finished mid byte in a version 0 packet. */
         if (other_half)
             ptr++;
+        /*endif*/
         break;
     }
+    /*endswitch*/
     if (ptr > pkt_len)
         return ret;
+    /*endif*/
     return ptr;
 }
 /*- End of function --------------------------------------------------------*/
@@ -645,6 +701,7 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_packet(t38_core_state_t *s, const uint8
                     span_log(&s->logging, SPAN_LOG_FLOW, "Rx %5d: Repeat packet number\n", log_seq_no);
                     return 0;
                 }
+                /*endif*/
                 /* Distinguish between a little bit out of sequence, and a huge hop. */
                 switch (classify_seq_no_offset(s->rx_expected_seq_no, seq_no))
                 {
@@ -665,15 +722,20 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_packet(t38_core_state_t *s, const uint8
                     s->missing_packets++;
                     break;
                 }
+                /*endswitch*/
             }
+            /*endif*/
             s->rx_expected_seq_no = seq_no;
         }
+        /*endif*/
     }
+    /*endif*/
     if (len < 1)
     {
         span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Bad packet length - %d\n", log_seq_no, len);
         return -1;
     }
+    /*endif*/
     /* The sequence numbering is defined as rolling from 0xFFFF to 0x0000. Some implementations
        of T.38 roll from 0xFFFF to 0x0001. Isn't standardisation a wonderful thing? The T.38
        document specifies only a small fraction of what it should, yet then they actually nail
@@ -690,8 +752,10 @@ SPAN_DECLARE_NONSTD(int) t38_core_rx_ifp_packet(t38_core_state_t *s, const uint8
     {
         if (ptr >= 0)
             span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Rx %5d: Invalid length for packet - %d %d\n", log_seq_no, ptr, len);
+        /*endif*/
         return -1;
     }
+    /*endif*/
     return 0;
 }
 /*- End of function --------------------------------------------------------*/
@@ -704,6 +768,7 @@ static int t38_encode_indicator(t38_core_state_t *s, uint8_t buf[], int indicato
     len = 0;
     if (s->data_transport_protocol == T38_TRANSPORT_TCP_TPKT)
         len = 4;
+    /*endif*/
 
     /* Data field not present */
     /* Indicator packet */
@@ -721,9 +786,10 @@ static int t38_encode_indicator(t38_core_state_t *s, uint8_t buf[], int indicato
     {
         len = -1;
     }
+    /*endif*/
     if (s->data_transport_protocol == T38_TRANSPORT_TCP_TPKT)
     {
-        /* Fill in the TPKT header (se RFC1006) */
+        /* Fill in the TPKT header (see RFC1006) */
         /* Version */
         buf[0] = 3;
         /* Reserved */
@@ -732,6 +798,7 @@ static int t38_encode_indicator(t38_core_state_t *s, uint8_t buf[], int indicato
         buf[2] = (len >> 8) & 0xFF;
         buf[3] = len & 0xFF;
     }
+    /*endif*/
     return len;
 }
 /*- End of function --------------------------------------------------------*/
@@ -755,6 +822,7 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
     len = 0;
     if (s->data_transport_protocol == T38_TRANSPORT_TCP_TPKT)
         len = 4;
+    /*endif*/
 
     /* There seems no valid reason why a packet would ever be generated without a data field present */
     data_field_present = (fields > 0)  ?  0x80  :  0x00;
@@ -775,6 +843,7 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
     {
         return -1;
     }
+    /*endif*/
 
     if (data_field_present)
     {
@@ -803,6 +872,7 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
                 buf[len++] = (uint8_t) (0xC0 | multiplier);
                 enclen = 0x4000*multiplier;
             }
+            /*endif*/
 
             fragment_len = enclen;
             encoded_len += fragment_len;
@@ -817,6 +887,7 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
                     /* Original version of T.38 with a typo */
                     if (q->field_type > T38_FIELD_T4_NON_ECM_SIG_END)
                         return -1;
+                    /*endif*/
                     buf[len++] = (uint8_t) ((field_data_present << 7) | (q->field_type << 4));
                 }
                 else
@@ -834,22 +905,28 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
                     {
                         return -1;
                     }
+                    /*endif*/
                 }
+                /*endif*/
                 /* Encode field_data */
                 if (field_data_present)
                 {
                     if (q->field_len < 1  ||  q->field_len > 65535)
                         return -1;
+                    /*endif*/
                     buf[len++] = (uint8_t) (((q->field_len - 1) >> 8) & 0xFF);
                     buf[len++] = (uint8_t) ((q->field_len - 1) & 0xFF);
                     memcpy(&buf[len], q->field, q->field_len);
                     len += q->field_len;
                 }
+                /*endif*/
                 data_field_no++;
             }
+            /*endfor*/
         }
         while ((int) encoded_len != fields  ||  fragment_len >= 16384);
     }
+    /*endif*/
 
     for (data_field_no = 0;  data_field_no < fields;  data_field_no++)
     {
@@ -862,6 +939,7 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
                  t38_field_type_to_str(field[data_field_no].field_type),
                  field[data_field_no].field_len);
     }
+    /*endfor*/
 
     if (s->data_transport_protocol == T38_TRANSPORT_TCP_TPKT)
     {
@@ -874,12 +952,14 @@ static int t38_encode_data(t38_core_state_t *s, uint8_t buf[], int data_type, co
         buf[2] = (len >> 8) & 0xFF;
         buf[3] = len & 0xFF;
     }
+    /*endif*/
 
     if (span_log_test(&s->logging, SPAN_LOG_FLOW))
     {
         sprintf(tag, "Tx %5d: IFP", s->tx_seq_no);
         span_log_buf(&s->logging, SPAN_LOG_FLOW, tag, buf, len);
     }
+    /*endif*/
     return len;
 }
 /*- End of function --------------------------------------------------------*/
@@ -907,22 +987,28 @@ SPAN_DECLARE(int) t38_core_send_indicator(t38_core_state_t *s, int indicator)
                 span_log(&s->logging, SPAN_LOG_FLOW, "T.38 indicator len is %d\n", len);
                 return len;
             }
+            /*endif*/
             span_log(&s->logging, SPAN_LOG_FLOW, "Tx %5d: indicator %s\n", s->tx_seq_no, t38_indicator_to_str(indicator));
             if (s->tx_packet_handler(s, s->tx_packet_user_data, buf, len, transmissions) < 0)
             {
                 span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Tx packet handler failure\n");
                 return -1;
             }
+            /*endif*/
             s->tx_seq_no = (s->tx_seq_no + 1) & 0xFFFF;
             if (s->pace_transmission)
             {
                 delay = modem_startup_time[indicator].training;
                 if (s->allow_for_tep)
                     delay += modem_startup_time[indicator].tep;
+                /*endif*/
             }
+            /*endif*/
         }
+        /*endif*/
         s->current_tx_indicator = indicator;
     }
+    /*endif*/
     return delay;
 }
 /*- End of function --------------------------------------------------------*/
@@ -931,6 +1017,7 @@ SPAN_DECLARE(int) t38_core_send_flags_delay(t38_core_state_t *s, int indicator)
 {
     if (s->pace_transmission)
         return modem_startup_time[indicator].flags;
+    /*endif*/
     return 0;
 }
 /*- End of function --------------------------------------------------------*/
@@ -939,6 +1026,7 @@ SPAN_DECLARE(int) t38_core_send_training_delay(t38_core_state_t *s, int indicato
 {
     if (s->pace_transmission)
         return modem_startup_time[indicator].training;
+    /*endif*/
     return 0;
 }
 /*- End of function --------------------------------------------------------*/
@@ -957,11 +1045,13 @@ SPAN_DECLARE(int) t38_core_send_data(t38_core_state_t *s, int data_type, int fie
         span_log(&s->logging, SPAN_LOG_FLOW, "T.38 data len is %d\n", len);
         return len;
     }
+    /*endif*/
     if (s->tx_packet_handler(s, s->tx_packet_user_data, buf, len, s->category_control[category]) < 0)
     {
         span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Tx packet handler failure\n");
         return -1;
     }
+    /*endif*/
     s->tx_seq_no = (s->tx_seq_no + 1) & 0xFFFF;
     return 0;
 }
@@ -977,11 +1067,13 @@ SPAN_DECLARE(int) t38_core_send_data_multi_field(t38_core_state_t *s, int data_t
         span_log(&s->logging, SPAN_LOG_FLOW, "T.38 data len is %d\n", len);
         return len;
     }
+    /*endif*/
     if (s->tx_packet_handler(s, s->tx_packet_user_data, buf, len, s->category_control[category]) < 0)
     {
         span_log(&s->logging, SPAN_LOG_PROTOCOL_WARNING, "Tx packet handler failure\n");
         return -1;
     }
+    /*endif*/
     s->tx_seq_no = (s->tx_seq_no + 1) & 0xFFFF;
     return 0;
 }
@@ -1109,7 +1201,9 @@ SPAN_DECLARE(t38_core_state_t *) t38_core_init(t38_core_state_t *s,
     {
         if ((s = (t38_core_state_t *) span_alloc(sizeof(*s))) == NULL)
             return NULL;
+        /*endif*/
     }
+    /*endif*/
     memset(s, 0, sizeof(*s));
     span_log_init(&s->logging, SPAN_LOG_NONE, NULL);
     span_log_set_protocol(&s->logging, "T.38");
diff --git a/libs/spandsp/src/t38_gateway.c b/libs/spandsp/src/t38_gateway.c
index 1e6a19d0c2..2a9e41b74c 100644
--- a/libs/spandsp/src/t38_gateway.c
+++ b/libs/spandsp/src/t38_gateway.c
@@ -1105,7 +1105,7 @@ static int process_rx_data(t38_core_state_t *t, void *user_data, int data_type,
                 {
                     monitor_control_messages(s, false, hdlc_buf->buf, hdlc_buf->len);
                     if (s->core.real_time_frame_handler)
-                        s->core.real_time_frame_handler(s, s->core.real_time_frame_user_data, false, hdlc_buf->buf, hdlc_buf->len);
+                        s->core.real_time_frame_handler(s->core.real_time_frame_user_data, false, hdlc_buf->buf, hdlc_buf->len);
                     /*endif*/
                 }
                 /*endif*/
@@ -1193,7 +1193,7 @@ static int process_rx_data(t38_core_state_t *t, void *user_data, int data_type,
                 {
                     monitor_control_messages(s, false, hdlc_buf->buf, hdlc_buf->len);
                     if (s->core.real_time_frame_handler)
-                        s->core.real_time_frame_handler(s, s->core.real_time_frame_user_data, false, hdlc_buf->buf, hdlc_buf->len);
+                        s->core.real_time_frame_handler(s->core.real_time_frame_user_data, false, hdlc_buf->buf, hdlc_buf->len);
                     /*endif*/
                 }
                 /*endif*/
@@ -1830,7 +1830,7 @@ static void rx_flag_or_abort(hdlc_rx_state_t *t)
                         {
                             monitor_control_messages(s, true, t->buffer, t->len - 2);
                             if (s->core.real_time_frame_handler)
-                                s->core.real_time_frame_handler(s, s->core.real_time_frame_user_data, true, t->buffer, t->len - 2);
+                                s->core.real_time_frame_handler(s->core.real_time_frame_user_data, true, t->buffer, t->len - 2);
                             /*endif*/
                         }
                         else
@@ -1937,13 +1937,13 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     if (t->len == 1)
     {
         /* All valid HDLC frames in FAX communication begin 0xFF 0x03 or 0xFF 0x13.
-           Anything else is bogus, */
+           Anything else is bogus. */
         if (t->buffer[0] != 0xFF  ||  (t->buffer[1] & 0xEF) != 0x03)
         {
             /* Abandon the frame, and wait for the next flag octet. */
             /* If this is a real frame, where one of these first two octets has a bit
                error, we will fail to forward the frame with a CRC error, as we do for
-               other bad framess. This will affect the timing of what goes forward.
+               other bad frames. This will affect the timing of what goes forward.
                Hopefully such timing changes will have less frequent bad effects than
                the consequences of a bad bit stream simulating an HDLC frame start. */
             span_log(&s->logging, SPAN_LOG_FLOW, "Bad HDLC frame header. Abandoning frame.\n");
diff --git a/libs/spandsp/src/t38_terminal.c b/libs/spandsp/src/t38_terminal.c
index b00606b2b8..cbdd1f50bf 100644
--- a/libs/spandsp/src/t38_terminal.c
+++ b/libs/spandsp/src/t38_terminal.c
@@ -330,6 +330,7 @@ static void process_hdlc_data(t38_terminal_front_end_state_t *fe, const uint8_t
     {
         fe->rx_data_missing = true;
     }
+    /*endif*/
 }
 /*- End of function --------------------------------------------------------*/
 
diff --git a/libs/spandsp/src/testcpuid.c b/libs/spandsp/src/testcpuid.c
index 8453067e9e..ccf24d1d78 100644
--- a/libs/spandsp/src/testcpuid.c
+++ b/libs/spandsp/src/testcpuid.c
@@ -95,14 +95,14 @@ int has_MMX(void)
     /*endif*/
     __asm__ __volatile__(
         " push  %%ebx;\n"
-        " mov    $1,%%eax;\n"
+        " mov   $1,%%eax;\n"
         " cpuid;\n"
         " xor   %%eax,%%eax;\n"
-        " test    $0x800000,%%edx;\n"
-        " jz    1f;\n"                /* no MMX support */
-        " inc   %%eax;\n"        /* MMX support */
+        " test  $0x800000,%%edx;\n"
+        " jz    1f;\n"                  /* no MMX support */
+        " inc   %%eax;\n"               /* MMX support */
         "1:\n"
-        " pop  %%ebx;\n"
+        " pop   %%ebx;\n"
         : "=a" (result)
         :
         : "ecx", "edx");
@@ -119,14 +119,14 @@ int has_SIMD(void)
     /*endif*/
     __asm__ __volatile__(
         " push  %%ebx;\n"
-        " mov    $1,%%eax;\n"
+        " mov   $1,%%eax;\n"
         " cpuid;\n"
         " xor   %%eax,%%eax;\n"
-        " test    $0x02000000,%%edx;\n"
-        " jz    1f;\n"                /* no SIMD support */
-        " inc    %%eax;\n"        /* SIMD support */
+        " test  $0x02000000,%%edx;\n"
+        " jz    1f;\n"                  /* no SIMD support */
+        " inc   %%eax;\n"               /* SIMD support */
         "1:\n"
-        " pop  %%ebx;\n"
+        " pop   %%ebx;\n"
         : "=a" (result)
         :
         : "ecx", "edx");
@@ -143,14 +143,14 @@ int has_SIMD2(void)
     /*endif*/
     __asm__ __volatile__(
         " push  %%ebx;\n"
-        " mov    $1,%%eax;\n"
+        " mov   $1,%%eax;\n"
         " cpuid;\n"
         " xor   %%eax,%%eax;\n"
-        " test    $0x04000000,%%edx;\n"
-        " jz    1f;\n"                /* no SIMD2 support */
-        " inc    %%eax;\n"        /* SIMD2 support */
+        " test  $0x04000000,%%edx;\n"
+        " jz    1f;\n"                  /* no SIMD2 support */
+        " inc   %%eax;\n"               /* SIMD2 support */
         "1:\n"
-        " pop  %%ebx;\n"
+        " pop   %%ebx;\n"
         : "=a" (result)
         :
         : "ecx", "edx");
@@ -167,19 +167,19 @@ int has_3DNow(void)
     /*endif*/
     __asm__ __volatile__(
         " push  %%ebx;\n"
-        " mov    $0x80000000,%%eax;\n"
+        " mov   $0x80000000,%%eax;\n"
         " cpuid;\n"
         " xor   %%ecx,%%ecx;\n"
-        " cmp    $0x80000000,%%eax;\n"
-        " jbe    1f;\n"                /* no extended MSR(1), so no 3DNow! */
-        " mov    $0x80000001,%%eax;\n"
+        " cmp   $0x80000000,%%eax;\n"
+        " jbe   1f;\n"                  /* no extended MSR(1), so no 3DNow! */
+        " mov   $0x80000001,%%eax;\n"
         " cpuid;\n"
         " xor   %%ecx,%%ecx;\n"
-        " test    $0x80000000,%%edx;\n"
-        " jz    1f;\n"                /* no 3DNow! support */
-        " inc   %%ecx;\n"        /* 3DNow! support */
+        " test  $0x80000000,%%edx;\n"
+        " jz    1f;\n"                  /* no 3DNow! support */
+        " inc   %%ecx;\n"               /* 3DNow! support */
         "1:\n"
-        " pop  %%ebx;\n"
+        " pop   %%ebx;\n"
         : "=c" (result)
         :
         : "eax", "edx");
diff --git a/libs/spandsp/src/time_scale.c b/libs/spandsp/src/time_scale.c
index 6d0ae51071..c8b6b23825 100644
--- a/libs/spandsp/src/time_scale.c
+++ b/libs/spandsp/src/time_scale.c
@@ -258,7 +258,7 @@ SPAN_DECLARE(int) time_scale(time_scale_state_t *s, int16_t out[], int16_t in[],
             if (s->playout_rate < 1.0f)
             {
                 /* Speed up - drop a chunk of data */
-                overlap_add(s->buf, s->buf + pitch, pitch);
+                overlap_add(s->buf, &s->buf[pitch], pitch);
                 memcpy(&s->buf[pitch], &s->buf[2*pitch], sizeof(int16_t)*(s->buf_len - 2*pitch));
                 if (len - in_len < pitch)
                 {
@@ -275,7 +275,7 @@ SPAN_DECLARE(int) time_scale(time_scale_state_t *s, int16_t out[], int16_t in[],
                 /* Slow down - insert a chunk of data */
                 memcpy(&out[out_len], s->buf, sizeof(int16_t)*pitch);
                 out_len += pitch;
-                overlap_add(s->buf + pitch, s->buf, pitch);
+                overlap_add(&s->buf[pitch], s->buf, pitch);
             }
         }
     }
diff --git a/libs/spandsp/src/v8.c b/libs/spandsp/src/v8.c
index c9c2e3a144..40cc6feac1 100644
--- a/libs/spandsp/src/v8.c
+++ b/libs/spandsp/src/v8.c
@@ -1144,7 +1144,7 @@ SPAN_DECLARE(int) v8_free(v8_state_t *s)
 {
     int ret;
 
-    ret = queue_free(s->tx_queue);
+    ret = v8_release(s);
     span_free(s);
     return ret;
 }
diff --git a/libs/spandsp/tests/fax_tester.h b/libs/spandsp/tests/fax_tester.h
index bcfcb1d085..48308f7329 100644
--- a/libs/spandsp/tests/fax_tester.h
+++ b/libs/spandsp/tests/fax_tester.h
@@ -61,6 +61,17 @@ typedef void (*faxtester_front_end_step_complete_handler_t)(faxtester_state_t *s
 */
 struct faxtester_state_s
 {
+    /*! \brief The far end FAX context */
+    fax_state_t *far_fax;
+
+    /*! \brief The far end T.38 terminal context */
+    t38_terminal_state_t *far_t38_fax;
+
+    /*! \brief Path for the FAX image test files. */
+    char image_path[1024];
+
+    /*! \brief Pointer to the XML document. */
+    xmlDocPtr doc;
     /*! \brief Pointer to our current step in the test. */
     xmlNodePtr cur;
 
@@ -113,6 +124,19 @@ struct faxtester_state_s
     int64_t timer;
     int64_t timeout;
 
+    bool test_for_call_clear;
+    int call_clear_timer;
+
+    bool far_end_cleared_call;
+
+    int timein_x;
+    int timeout_x;
+
+    uint8_t awaited[1000];
+    int awaited_len;
+
+    char next_tx_file[1000];
+
     /*! \brief Error and flow logging control */
     logging_state_t logging;
 };
diff --git a/libs/spandsp/tests/tsb85_tests.c b/libs/spandsp/tests/tsb85_tests.c
index 5b7051c8ec..4c1559c5dc 100644
--- a/libs/spandsp/tests/tsb85_tests.c
+++ b/libs/spandsp/tests/tsb85_tests.c
@@ -1420,7 +1420,6 @@ static int parse_test_group(faxtester_state_t *s, xmlDocPtr doc, xmlNsPtr ns, xm
 static int get_test_set(faxtester_state_t *s, const char *test_file, const char *test)
 {
     xmlParserCtxtPtr ctxt;
-    xmlDocPtr doc;
     xmlNsPtr ns;
     xmlNodePtr cur;
 
@@ -1435,7 +1434,7 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
         exit(2);
     }
     /* parse the file, activating the DTD validation option */
-    if ((doc = xmlCtxtReadFile(ctxt, test_file, NULL, XML_PARSE_XINCLUDE | XML_PARSE_DTDVALID)) == NULL)
+    if ((s->doc = xmlCtxtReadFile(ctxt, test_file, NULL, XML_PARSE_XINCLUDE | XML_PARSE_DTDVALID)) == NULL)
     {
         fprintf(stderr, "Failed to read the XML document\n");
         printf("Test failed\n");
@@ -1444,7 +1443,7 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
     if (ctxt->valid == 0)
     {
         fprintf(stderr, "Failed to validate the XML document\n");
-    	xmlFreeDoc(doc);
+    	xmlFreeDoc(s->doc);
         xmlFreeParserCtxt(ctxt);
         printf("Test failed\n");
         exit(2);
@@ -1452,9 +1451,9 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
     xmlFreeParserCtxt(ctxt);
 
     /* Check the document is of the right kind */
-    if ((cur = xmlDocGetRootElement(doc)) == NULL)
+    if ((cur = xmlDocGetRootElement(s->doc)) == NULL)
     {
-        xmlFreeDoc(doc);
+        xmlFreeDoc(s->doc);
         fprintf(stderr, "Empty document\n");
         printf("Test failed\n");
         exit(2);
@@ -1462,7 +1461,7 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
     /*endif*/
     if (xmlStrcmp(cur->name, (const xmlChar *) "fax-tests"))
     {
-        xmlFreeDoc(doc);
+        xmlFreeDoc(s->doc);
         fprintf(stderr, "Document of the wrong type, root node != fax-tests");
         printf("Test failed\n");
         exit(2);
@@ -1482,12 +1481,12 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
     {
         if (xmlStrcmp(cur->name, (const xmlChar *) "config") == 0)
         {
-            parse_config(s, doc, ns, cur->xmlChildrenNode);
+            parse_config(s, s->doc, ns, cur->xmlChildrenNode);
         }
         /*endif*/
         if (xmlStrcmp(cur->name, (const xmlChar *) "test-group") == 0)
         {
-            if (parse_test_group(s, doc, ns, cur->xmlChildrenNode, test) == 0)
+            if (parse_test_group(s, s->doc, ns, cur->xmlChildrenNode, test) == 0)
             {
                 /* We found the test we want, so run it. */
                 exchange(s);
@@ -1499,7 +1498,7 @@ static int get_test_set(faxtester_state_t *s, const char *test_file, const char
         cur = cur->next;
     }
     /*endwhile*/
-    xmlFreeDoc(doc);
+    xmlFreeDoc(s->doc);
     return 0;
 }
 /*- End of function --------------------------------------------------------*/

From b6566b8354fa82bd504b596d0479d86bd0916a60 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 16 Jul 2014 10:42:30 -0500
Subject: [PATCH 022/130] FS-5384 enable the flash indicator on ring

---
 src/mod/endpoints/mod_skinny/skinny_server.c | 2 +-
 src/mod/endpoints/mod_skinny/skinny_tables.c | 1 +
 src/mod/endpoints/mod_skinny/skinny_tables.h | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index cd5f10b03f..26566423f0 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -649,7 +649,7 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
 			send_start_tone(listener, SKINNY_TONE_CALLWAITTONE, 0, line_instance, helper->tech_pvt->call_id);
 			send_stop_tone(listener, line_instance, helper->tech_pvt->call_id);
 		} else {
-			/* silent ring - would like to just flash the lamp */
+			send_set_ringer(listener, SKINNY_RING_FLASHONLY, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
 		}
 		switch_channel_ring_ready(channel);
 	}
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index b4917bf475..87d0412dfe 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -195,6 +195,7 @@ SKINNY_DECLARE_STR2ID(skinny_str2tone, SKINNY_TONS, -1)
 		{SKINNY_RING_INSIDE, "RingInside"},
 		{SKINNY_RING_OUTSIDE, "RingOutside"},
 		{SKINNY_RING_FEATURE, "RingFeature"},
+		{SKINNY_RING_FLASHONLY, "RingFlashOnly"},
 		{0, NULL}
 	};
 	SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index f766cbe13d..40abce5c71 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -115,9 +115,10 @@ enum skinny_ring_type {
 	SKINNY_RING_OFF = 1,
 	SKINNY_RING_INSIDE = 2,
 	SKINNY_RING_OUTSIDE = 3,
-	SKINNY_RING_FEATURE = 4
+	SKINNY_RING_FEATURE = 4,
+	SKINNY_RING_FLASHONLY = 5
 };
-extern struct skinny_table SKINNY_RING_TYPES[5];
+extern struct skinny_table SKINNY_RING_TYPES[6];
 const char *skinny_ring_type2str(uint32_t id);
 uint32_t skinny_str2ring_type(const char *str);
 #define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)

From 91d405a2c1a01091cf8c42f9c65f2f4a0624cfd7 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Jul 2014 21:40:18 +0500
Subject: [PATCH 023/130] call recovery_track on recovering channels once the
 recovery has completed and fix race condition with repeated recovery

---
 src/mod/endpoints/mod_sofia/sofia.c | 1 -
 src/switch_channel.c                | 4 ++++
 src/switch_core_state_machine.c     | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index c5e2dfaa21..390c8886a9 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -6134,7 +6134,6 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 
 			extract_header_vars(profile, sip, session, nh);
 			extract_vars(profile, sip, session);
-			switch_core_recovery_track(session);
 			switch_channel_clear_flag(tech_pvt->channel, CF_RECOVERING);
 		}
 
diff --git a/src/switch_channel.c b/src/switch_channel.c
index c27f1c5ff9..f6d3a96ddc 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1990,6 +1990,10 @@ SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch
 		switch_core_session_wake_video_thread(channel->session);
 	}
 
+	if (flag == CF_RECOVERING && !channel->hangup_cause) {
+		switch_core_recovery_track(channel->session);
+	}
+
 }
 
 
diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 91fe8f7a3d..eb54bc9ca1 100644
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -48,6 +48,8 @@ static void switch_core_standard_on_init(switch_core_session_t *session)
 			switch_channel_set_state(session->channel, CS_ROUTING);
 		}
 	}
+
+	switch_channel_clear_flag(session->channel, CF_RECOVERING);
 }
 
 static void switch_core_standard_on_hangup(switch_core_session_t *session)

From 3df080a79fa8b49963843e9a0f23e5b51e6c8034 Mon Sep 17 00:00:00 2001
From: Chris Rienzo <chris.rienzo@grasshopper.com>
Date: Wed, 16 Jul 2014 13:18:52 -0400
Subject: [PATCH 024/130] FS-6447 #close SUBSCRIBER_ABSENT also needs handling.
  Thanks to Ben Langfeld.

---
 src/mod/event_handlers/mod_rayo/mod_rayo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.c b/src/mod/event_handlers/mod_rayo/mod_rayo.c
index f2be64dd24..bbc3c4529e 100644
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.c
+++ b/src/mod/event_handlers/mod_rayo/mod_rayo.c
@@ -2743,6 +2743,7 @@ static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void *
 						/* out of sessions, typically */
 						response = iks_new_error_detailed(iq, STANZA_ERROR_RESOURCE_CONSTRAINT, "DESTINATION_OUT_OF_ORDER");
 						break;
+					case SWITCH_CAUSE_SUBSCRIBER_ABSENT:
 					case SWITCH_CAUSE_USER_NOT_REGISTERED: {
 						/* call session was never created, so we must fake it so that a call error is sent and
 						   not a dial error */

From 6c80281ce9c4dc53ee76e1931490947d31c2c39e Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 17 Jul 2014 01:07:49 +0500
Subject: [PATCH 025/130] buffer websocket headers and body before sending to
 avoid fragmentation

---
 libs/sofia-sip/.update                    |  2 +-
 libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 43 +++++++++++++++++++----
 libs/sofia-sip/libsofia-sip-ua/tport/ws.h |  2 ++
 src/mod/endpoints/mod_verto/ws.c          | 43 +++++++++++++++++++----
 src/mod/endpoints/mod_verto/ws.h          |  2 ++
 5 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 1ff6ae92de..09ad6c7180 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Sat Jul 12 04:39:49 CDT 2014
+Thu Jul 17 01:07:28 CDT 2014
diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 0ee867dba5..3b152e4fec 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
 {
 	size_t r;
 	int sanity = 2000;
+	int ssl_err = 0;
 
 	if (wsh->ssl) {
 		do {
@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
 			if (sanity < 2000) {
 				ms_sleep(1);
 			}
-		} while (--sanity > 0 && r == -1 && SSL_get_error(wsh->ssl, r) == SSL_ERROR_WANT_WRITE);
 
+			if (r == -1) {
+				ssl_err = SSL_get_error(wsh->ssl, r);
+			}
+
+		} while (--sanity > 0 && r == -1 && ssl_err == SSL_ERROR_WANT_WRITE);
+
+		if (ssl_err) {
+			r = ssl_err * -1;
+		}
+		
 		return r;
 	}
 
@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh)
 	
 	wsh->down = 2;
 
+	if (wsh->write_buffer) {
+		free(wsh->write_buffer);
+		wsh->write_buffer = NULL;
+		wsh->write_buffer_len = 0;
+	}
+
 	if (wsh->ssl) {
 		int code;
 		do {
@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
 {
 	uint8_t hdr[14] = { 0 };
 	size_t hlen = 2;
+	uint8_t *bp;
+	ssize_t raw_ret = 0;
 
 	if (wsh->down) {
 		return -1;
@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
 		*u64 = htonl(bytes);
 	}
 
-	if (ws_raw_write(wsh, (void *) &hdr[0], hlen) != (ssize_t)hlen) {
-		return -1;
-	}
+	if (wsh->write_buffer_len < (hlen + bytes + 1)) {
+		void *tmp;
 
-	if (ws_raw_write(wsh, data, bytes) != (ssize_t)bytes) {
-		return -2;
+		wsh->write_buffer_len = hlen + bytes + 1;
+		if ((tmp = realloc(wsh->write_buffer, wsh->write_buffer_len))) {
+			wsh->write_buffer = tmp;
+		} else {
+			abort();
+		}
+	}
+	
+	bp = (uint8_t *) wsh->write_buffer;
+	memcpy(bp, (void *) &hdr[0], hlen);
+	memcpy(bp + hlen, data, bytes);
+	
+	raw_ret = ws_raw_write(wsh, bp, (hlen + bytes));
+
+	if (raw_ret != (ssize_t) (hlen + bytes)) {
+		return raw_ret;
 	}
 	
 	return bytes;
diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.h b/libs/sofia-sip/libsofia-sip-ua/tport/ws.h
index 699779b515..b4d30b47f2 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.h
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.h
@@ -89,6 +89,8 @@ typedef struct wsh_s {
 	int secure_established;
 	int logical_established;
 	int x;
+	void *write_buffer;
+	size_t write_buffer_len;
 } wsh_t;
 
 ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc);
diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index 0ee867dba5..3b152e4fec 100644
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
 {
 	size_t r;
 	int sanity = 2000;
+	int ssl_err = 0;
 
 	if (wsh->ssl) {
 		do {
@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
 			if (sanity < 2000) {
 				ms_sleep(1);
 			}
-		} while (--sanity > 0 && r == -1 && SSL_get_error(wsh->ssl, r) == SSL_ERROR_WANT_WRITE);
 
+			if (r == -1) {
+				ssl_err = SSL_get_error(wsh->ssl, r);
+			}
+
+		} while (--sanity > 0 && r == -1 && ssl_err == SSL_ERROR_WANT_WRITE);
+
+		if (ssl_err) {
+			r = ssl_err * -1;
+		}
+		
 		return r;
 	}
 
@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh)
 	
 	wsh->down = 2;
 
+	if (wsh->write_buffer) {
+		free(wsh->write_buffer);
+		wsh->write_buffer = NULL;
+		wsh->write_buffer_len = 0;
+	}
+
 	if (wsh->ssl) {
 		int code;
 		do {
@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
 {
 	uint8_t hdr[14] = { 0 };
 	size_t hlen = 2;
+	uint8_t *bp;
+	ssize_t raw_ret = 0;
 
 	if (wsh->down) {
 		return -1;
@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
 		*u64 = htonl(bytes);
 	}
 
-	if (ws_raw_write(wsh, (void *) &hdr[0], hlen) != (ssize_t)hlen) {
-		return -1;
-	}
+	if (wsh->write_buffer_len < (hlen + bytes + 1)) {
+		void *tmp;
 
-	if (ws_raw_write(wsh, data, bytes) != (ssize_t)bytes) {
-		return -2;
+		wsh->write_buffer_len = hlen + bytes + 1;
+		if ((tmp = realloc(wsh->write_buffer, wsh->write_buffer_len))) {
+			wsh->write_buffer = tmp;
+		} else {
+			abort();
+		}
+	}
+	
+	bp = (uint8_t *) wsh->write_buffer;
+	memcpy(bp, (void *) &hdr[0], hlen);
+	memcpy(bp + hlen, data, bytes);
+	
+	raw_ret = ws_raw_write(wsh, bp, (hlen + bytes));
+
+	if (raw_ret != (ssize_t) (hlen + bytes)) {
+		return raw_ret;
 	}
 	
 	return bytes;
diff --git a/src/mod/endpoints/mod_verto/ws.h b/src/mod/endpoints/mod_verto/ws.h
index 699779b515..b4d30b47f2 100644
--- a/src/mod/endpoints/mod_verto/ws.h
+++ b/src/mod/endpoints/mod_verto/ws.h
@@ -89,6 +89,8 @@ typedef struct wsh_s {
 	int secure_established;
 	int logical_established;
 	int x;
+	void *write_buffer;
+	size_t write_buffer_len;
 } wsh_t;
 
 ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc);

From ae670ad9249fab471291e051df318676777b989c Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Wed, 16 Jul 2014 15:24:03 -0500
Subject: [PATCH 026/130] FS-6615 reswig vs2010

---
 .../mod_managed/freeswitch_wrap.2010.cxx      | 70 +++++++++++++++++--
 .../mod_managed/managed/swig.2010.cs          | 28 ++++++++
 2 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 14fc7b55bb..2cc066aaa2 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -3016,7 +3016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RECOMMENDED_BUFFER_SIZE_get() {
   int jresult ;
   int result;
   
-  result = (int)(4096);
+  result = (int)(8192);
   jresult = result; 
   return jresult;
 }
@@ -29061,8 +29061,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_frame_data_set(void * jarg1,
   arg2 = (char *)jarg2; 
   {
     if(arg2) {
-      strncpy((char*)arg1->frame_data, (const char *)arg2, 4096-1);
-      arg1->frame_data[4096-1] = 0;
+      strncpy((char*)arg1->frame_data, (const char *)arg2, 8192-1);
+      arg1->frame_data[8192-1] = 0;
     } else {
       arg1->frame_data[0] = 0;
     }
@@ -29704,6 +29704,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_init(void * jarg1, void * jarg2
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_presence_data_vals(void * jarg1, char * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_channel_set_presence_data_vals(arg1,(char const *)arg2);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_presence(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, int jarg7) {
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -33927,7 +33937,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_data_set(
   {
     size_t ii;
     switch_byte_t *b = (switch_byte_t *) arg1->write_frame_data;
-    for (ii = 0; ii < (size_t)4096; ii++) b[ii] = *((switch_byte_t *) arg2 + ii);
+    for (ii = 0; ii < (size_t)8192; ii++) b[ii] = *((switch_byte_t *) arg2 + ii);
   }
 }
 
@@ -41818,6 +41828,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog(char * jarg1, char * jarg2) {
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) {
   char *arg1 = (char *) 0 ;
   
@@ -41970,6 +41996,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_Execute(void * jarg1, char * jarg2, cha
   arg3 = (char *)jarg3; 
   result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
   jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
   return jresult;
 }
 
@@ -41984,6 +42011,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Api_ExecuteString(void * jarg1, char * jarg
   arg2 = (char *)jarg2; 
   result = (char *)(arg1)->executeString((char const *)arg2);
   jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
   return jresult;
 }
 
@@ -43630,6 +43658,24 @@ SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog(void * jarg1, char * j
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog2(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5, char * jarg6) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (char *)jarg6; 
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -43640,6 +43686,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_console_log2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  console_log2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
   char *arg1 = (char *) 0 ;
   
diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index cc64743d27..85c1924b63 100644
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -509,6 +509,10 @@ public class CoreSession : IDisposable {
     freeswitchPINVOKE.CoreSession_consoleLog(swigCPtr, level_str, msg);
   }
 
+  public void consoleLog2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.CoreSession_consoleLog2(swigCPtr, level_str, file, func, line, msg);
+  }
+
 }
 
 }
@@ -4186,6 +4190,10 @@ public class freeswitch {
     return ret;
   }
 
+  public static void switch_channel_set_presence_data_vals(SWIGTYPE_p_switch_channel channel, string presence_data_cols) {
+    freeswitchPINVOKE.switch_channel_set_presence_data_vals(SWIGTYPE_p_switch_channel.getCPtr(channel), presence_data_cols);
+  }
+
   public static void switch_channel_perform_presence(SWIGTYPE_p_switch_channel channel, string rpid, string status, string id, string file, string func, int line) {
     freeswitchPINVOKE.switch_channel_perform_presence(SWIGTYPE_p_switch_channel.getCPtr(channel), rpid, status, id, file, func, line);
   }
@@ -6855,6 +6863,10 @@ public class freeswitch {
     freeswitchPINVOKE.consoleLog(level_str, msg);
   }
 
+  public static void consoleLog2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.consoleLog2(level_str, file, func, line, msg);
+  }
+
   public static void consoleCleanLog(string msg) {
     freeswitchPINVOKE.consoleCleanLog(msg);
   }
@@ -6873,6 +6885,10 @@ public class freeswitch {
     freeswitchPINVOKE.console_log(level_str, msg);
   }
 
+  public static void console_log2(string level_str, string file, string func, int line, string msg) {
+    freeswitchPINVOKE.console_log2(level_str, file, func, line, msg);
+  }
+
   public static void console_clean_log(string msg) {
     freeswitchPINVOKE.console_clean_log(msg);
   }
@@ -14653,6 +14669,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_init")]
   public static extern int switch_channel_init(HandleRef jarg1, HandleRef jarg2, int jarg3, int jarg4);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_presence_data_vals")]
+  public static extern void switch_channel_set_presence_data_vals(HandleRef jarg1, string jarg2);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_perform_presence")]
   public static extern void switch_channel_perform_presence(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, int jarg7);
 
@@ -17389,6 +17408,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_consoleLog")]
   public static extern void consoleLog(string jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_consoleLog2")]
+  public static extern void consoleLog2(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
+
   [DllImport("mod_managed", EntryPoint="CSharp_consoleCleanLog")]
   public static extern void consoleCleanLog(string jarg1);
 
@@ -17806,9 +17828,15 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_consoleLog")]
   public static extern void CoreSession_consoleLog(HandleRef jarg1, string jarg2, string jarg3);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_consoleLog2")]
+  public static extern void CoreSession_consoleLog2(HandleRef jarg1, string jarg2, string jarg3, string jarg4, int jarg5, string jarg6);
+
   [DllImport("mod_managed", EntryPoint="CSharp_console_log")]
   public static extern void console_log(string jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_console_log2")]
+  public static extern void console_log2(string jarg1, string jarg2, string jarg3, int jarg4, string jarg5);
+
   [DllImport("mod_managed", EntryPoint="CSharp_console_clean_log")]
   public static extern void console_clean_log(string jarg1);
 

From 419a2a617dea89b9cc27126a3f87c8805c01ec4b Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 17 Jul 2014 00:34:42 -0500
Subject: [PATCH 027/130] FS-6542 oart 1 this will break vs2012 temporarily
 unless you manually delete libs\portaudio

---
 Freeswitch.2012.sln                           |  20 +-
 libs/win32/Download PORTAUDIO.2010.vcxproj    |  82 ++
 libs/win32/Download PORTAUDIO.2012.vcxproj    |  84 ++
 libs/win32/portaudio/portaudio.2010.vcxproj   | 859 +++++++++++++++++
 .../portaudio/portaudio.2010.vcxproj.filters  | 132 +++
 libs/win32/portaudio/portaudio.2012.vcxproj   | 863 ++++++++++++++++++
 .../portaudio/portaudio.2012.vcxproj.filters  | 138 +++
 .../mod_portaudio/mod_PortAudio.2012.vcxproj  |   9 +-
 8 files changed, 2181 insertions(+), 6 deletions(-)
 create mode 100644 libs/win32/Download PORTAUDIO.2010.vcxproj
 create mode 100644 libs/win32/Download PORTAUDIO.2012.vcxproj
 create mode 100644 libs/win32/portaudio/portaudio.2010.vcxproj
 create mode 100644 libs/win32/portaudio/portaudio.2010.vcxproj.filters
 create mode 100644 libs/win32/portaudio/portaudio.2012.vcxproj
 create mode 100644 libs/win32/portaudio/portaudio.2012.vcxproj.filters

diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index fb3536036b..9386d5d8cc 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -274,7 +274,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2012.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.2012.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\win32\portaudio\portaudio.2012.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2012.vcxproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}"
 EndProject
@@ -616,6 +616,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SQLITE", "libs\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LDNS", "libs\win32\Download LDNS.2012.vcxproj", "{5BE9A596-F11F-4379-928C-412F81AE182B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.2012.vcxproj", "{C0779BCC-C037-4F58-B890-EF37BA956B3C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -4141,6 +4143,21 @@ Global
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.Build.0 = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x86 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.Build.0 = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x64.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x64 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x86 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.Build.0 = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.Build.0 = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x86 Setup.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4310,6 +4327,7 @@ Global
 		{1BDAB935-27DC-47E3-95EA-17E024D39C31} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{97D25665-34CD-4E0C-96E7-88F0795B8883} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{5BE9A596-F11F-4379-928C-412F81AE182B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
diff --git a/libs/win32/Download PORTAUDIO.2010.vcxproj b/libs/win32/Download PORTAUDIO.2010.vcxproj
new file mode 100644
index 0000000000..2d5736b42f
--- /dev/null
+++ b/libs/win32/Download PORTAUDIO.2010.vcxproj	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Download PORTAUDIO</ProjectName>
+    <ProjectGuid>{C0779BCC-C037-4F58-B890-EF37BA956B3C}</ProjectGuid>
+    <RootNamespace>Download PORTAUDIO</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)\w32\extdll.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\PORTAUDIO\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\PORTAUDIO\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="cleancount">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading PORTAUDIO.</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).."
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\portaudio;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading PORTAUDIO.</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).."
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\portaudio;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/Download PORTAUDIO.2012.vcxproj b/libs/win32/Download PORTAUDIO.2012.vcxproj
new file mode 100644
index 0000000000..5543794515
--- /dev/null
+++ b/libs/win32/Download PORTAUDIO.2012.vcxproj	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Download PORTAUDIO</ProjectName>
+    <ProjectGuid>{C0779BCC-C037-4F58-B890-EF37BA956B3C}</ProjectGuid>
+    <RootNamespace>Download PORTAUDIO</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)\w32\extdll.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\PORTAUDIO\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\PORTAUDIO\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
+    </BuildLog>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="cleancount">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading PORTAUDIO.</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).."
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\portaudio;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading PORTAUDIO.</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).."
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\portaudio;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/libs/win32/portaudio/portaudio.2010.vcxproj b/libs/win32/portaudio/portaudio.2010.vcxproj
new file mode 100644
index 0000000000..188e5afe12
--- /dev/null
+++ b/libs/win32/portaudio/portaudio.2010.vcxproj
@@ -0,0 +1,859 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug DirectSound|Win32">
+      <Configuration>Debug DirectSound</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug DirectSound|x64">
+      <Configuration>Debug DirectSound</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release DirectSound|Win32">
+      <Configuration>Release DirectSound</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release DirectSound|x64">
+      <Configuration>Release DirectSound</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>portaudio</ProjectName>
+    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
+    <RootNamespace>portaudio</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_skeleton.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c" />
+    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c" />
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c" />
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="portaudio.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/portaudio/portaudio.2010.vcxproj.filters b/libs/win32/portaudio/portaudio.2010.vcxproj.filters
new file mode 100644
index 0000000000..27e3520845
--- /dev/null
+++ b/libs/win32/portaudio/portaudio.2010.vcxproj.filters
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{27479ed0-78ba-43cc-8fb5-31de44bbc8da}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\common">
+      <UniqueIdentifier>{8f150320-dccc-4b5c-b43c-b3b91378f721}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi">
+      <UniqueIdentifier>{ac26acd3-797a-4668-a607-9694e9f10a16}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\ASIO">
+      <UniqueIdentifier>{03878aa4-e6a3-4d56-81fe-f93794a1e3a1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\ASIO\ASIOSDK">
+      <UniqueIdentifier>{99774f7f-59c1-48cb-b72a-09d78537e6e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\dsound">
+      <UniqueIdentifier>{f47fabee-145b-4c98-9423-3d1bb7c1f3b3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wmme">
+      <UniqueIdentifier>{4ea57aa2-5b6b-4022-86b9-f3a02dd2284b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wasapi">
+      <UniqueIdentifier>{9c44aff3-3f53-4117-8097-ee8b810caba2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os">
+      <UniqueIdentifier>{a20f633f-4213-4f4b-bd65-a8e49cf9f842}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os\win">
+      <UniqueIdentifier>{ce9a362c-b700-4ea4-88b4-51c222789754}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{6e72bafa-42f5-450a-90f4-0206faddcf3d}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{5060bc7a-2362-400f-bda0-ae74643cea86}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_skeleton.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
+      <Filter>Source Files\hostapi\ASIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
+      <Filter>Source Files\hostapi\wmme</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.cpp">
+      <Filter>Source Files\hostapi\wasapi</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="portaudio.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/portaudio/portaudio.2012.vcxproj b/libs/win32/portaudio/portaudio.2012.vcxproj
new file mode 100644
index 0000000000..4767c16c9e
--- /dev/null
+++ b/libs/win32/portaudio/portaudio.2012.vcxproj
@@ -0,0 +1,863 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug DirectSound|Win32">
+      <Configuration>Debug DirectSound</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug DirectSound|x64">
+      <Configuration>Debug DirectSound</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release DirectSound|Win32">
+      <Configuration>Release DirectSound</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release DirectSound|x64">
+      <Configuration>Release DirectSound</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>portaudio</ProjectName>
+    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
+    <RootNamespace>portaudio</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\..\w32\extlib.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;PAWIN_WDMKS_NO_KSGUID_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c" />
+    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c" />
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c" />
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c" />
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="portaudio.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Download PORTAUDIO.2012.vcxproj">
+      <Project>{c0779bcc-c037-4f58-b890-ef37ba956b3c}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/portaudio/portaudio.2012.vcxproj.filters b/libs/win32/portaudio/portaudio.2012.vcxproj.filters
new file mode 100644
index 0000000000..7698bf12a9
--- /dev/null
+++ b/libs/win32/portaudio/portaudio.2012.vcxproj.filters
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{27479ed0-78ba-43cc-8fb5-31de44bbc8da}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\common">
+      <UniqueIdentifier>{8f150320-dccc-4b5c-b43c-b3b91378f721}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi">
+      <UniqueIdentifier>{ac26acd3-797a-4668-a607-9694e9f10a16}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\ASIO">
+      <UniqueIdentifier>{03878aa4-e6a3-4d56-81fe-f93794a1e3a1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\ASIO\ASIOSDK">
+      <UniqueIdentifier>{99774f7f-59c1-48cb-b72a-09d78537e6e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\dsound">
+      <UniqueIdentifier>{f47fabee-145b-4c98-9423-3d1bb7c1f3b3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wmme">
+      <UniqueIdentifier>{4ea57aa2-5b6b-4022-86b9-f3a02dd2284b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\hostapi\wasapi">
+      <UniqueIdentifier>{9c44aff3-3f53-4117-8097-ee8b810caba2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os">
+      <UniqueIdentifier>{a20f633f-4213-4f4b-bd65-a8e49cf9f842}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\os\win">
+      <UniqueIdentifier>{ce9a362c-b700-4ea4-88b4-51c222789754}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{6e72bafa-42f5-450a-90f4-0206faddcf3d}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{5060bc7a-2362-400f-bda0-ae74643cea86}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Source Files\hostapi\skeleton">
+      <UniqueIdentifier>{c6fef444-cd76-4087-8d12-3397c463b3e9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
+      <Filter>Source Files\hostapi\ASIO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
+      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
+      <Filter>Source Files\hostapi\dsound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
+      <Filter>Source Files\hostapi\wmme</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c">
+      <Filter>Source Files\hostapi\skeleton</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c">
+      <Filter>Source Files\os\win</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="portaudio.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2012.vcxproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2012.vcxproj
index f28babf744..d2f4f29cf1 100644
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2012.vcxproj
+++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2012.vcxproj
@@ -177,14 +177,13 @@
     <ClInclude Include="pablio.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\portaudio\build\msvc\portaudio.2012.vcxproj">
-      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
       <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\libs\win32\portaudio\portaudio.2012.vcxproj">
+      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -193,4 +192,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

From 52435978d0187e59af503dd263946c735dd97c3d Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Thu, 17 Jul 2014 22:32:17 +0800
Subject: [PATCH 028/130] Step FAX modem type on sending CTC.

---
 libs/spandsp/src/t30.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/spandsp/src/t30.c b/libs/spandsp/src/t30.c
index 304a0aa570..f601ad5583 100644
--- a/libs/spandsp/src/t30.c
+++ b/libs/spandsp/src/t30.c
@@ -3133,8 +3133,9 @@ static void process_rx_ppr(t30_state_t *s, const uint8_t *msg, int len)
         /* Continue to correct? */
         /* Continue only if we have been making progress */
         s->ppr_count = 0;
-        if (s->ecm_progress)
+        if (s->ecm_progress  &&  fallback_sequence[s->current_fallback + 1].bit_rate)
         {
+            s->current_fallback++;
             s->ecm_progress = 0;
             queue_phase(s, T30_PHASE_D_TX);
             set_state(s, T30_STATE_IV_CTC);

From a2921e269c95a8e6150350f1d7906b82800a3283 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 01:03:57 +0500
Subject: [PATCH 029/130] update verto with some fixes and enhancements with
 reconnection

---
 configure.ac                               |   2 +-
 html5/verto/demo/index.html                |  10 +-
 html5/verto/demo/js/verto-min.js           |  25 +--
 html5/verto/demo/verto.js                  |  77 ++++-----
 html5/verto/js/src/jquery.jsonrpcclient.js |  47 ++++--
 html5/verto/js/src/jquery.verto.js         |  10 +-
 src/include/switch_types.h                 |  13 +-
 src/include/switch_utils.h                 |   2 +-
 src/mod/endpoints/mod_verto/mcast/mcast.c  |  13 +-
 src/mod/endpoints/mod_verto/mod_verto.c    | 161 +++++++++++++++----
 src/mod/endpoints/mod_verto/mod_verto.h    |  13 +-
 src/switch_utils.c                         | 172 +++++++++++++++++++++
 12 files changed, 424 insertions(+), 121 deletions(-)

diff --git a/configure.ac b/configure.ac
index 52eda71b0b..a1bff4b6ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -787,7 +787,7 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep getifaddrs timerfd_create getdtablesize posix_openpt])
+AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep getifaddrs timerfd_create getdtablesize posix_openpt poll])
 AC_CHECK_FUNCS([sched_setscheduler setpriority setrlimit setgroups initgroups])
 AC_CHECK_FUNCS([wcsncmp setgroups asprintf setenv pselect gettimeofday localtime_r gmtime_r strcasecmp stricmp _stricmp])
 
diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index 724e92b96f..ca4c6b1f47 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="css/jquery.mobile-1.3.2.min.css" />
+  <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.css"/>
   <link rel="stylesheet" type="text/css" href="css/jsontable.css" />
   <link rel="shortcut icon" href="favicon.ico" />
     <meta charset="utf-8" />
@@ -143,7 +143,7 @@
         <div id="errordisplay" style="font-weight:bold;font-size:18px;color:#ae0000"></div>
       </div>
 
-      <div id="online" align="center">
+      <div id="online" align="center" style="width:600px">
 	<div id="text"></div>
 	<div data-role="fieldcontain">
 	  <input type="text" id="ext"/><br>
@@ -267,11 +267,11 @@
     </div>
 
 
-    <script type="text/javascript" src="js/jquery-2.0.3.min.js"></script> 
-    <script type="text/javascript" src="js/jquery.mobile-1.3.2.min.js"></script> 
+    <script type="text/javascript" src="//code.jquery.com/jquery-2.1.1.min.js"></script> 
+    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.js"></script> 
     <script type="text/javascript" src="js/jquery.json-2.4.min.js"></script>  
     <script type="text/javascript" src="js/jquery.cookie.js"></script>
-    <script type="text/javascript" src="js/jquery.dataTables.js"></script>
+    <script type="text/javascript" src="//cdn.datatables.net/1.10.1/js/jquery.dataTables.min.js"></script>
     <script type="text/javascript" src="js/verto-min.js"></script>
     
     <script type="text/javascript" src="verto.js"></script>
diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index 236d5b45ba..d56d60da55 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -55,7 +55,7 @@ return{addAnswerSDP:function(sdp,cbSuccess,cbError){peer.setRemoteDescription(ne
 var video_constraints={mandatory:{},optional:[]};function getUserMedia(options){var n=navigator,media;n.getMedia=n.webkitGetUserMedia||n.mozGetUserMedia;n.getMedia(options.constraints||{audio:true,video:video_constraints},streaming,options.onerror||function(e){console.error(e);});function streaming(stream){var video=options.video;if(video){video[moz?'mozSrcObject':'src']=moz?stream:window.webkitURL.createObjectURL(stream);}
 if(options.onsuccess){options.onsuccess(stream);}
 media=stream;}
-return media;}})(jQuery);(function($){$.JsonRpcClient=function(options){var self=this;this.options=$.extend({ajaxUrl:null,socketUrl:null,onmessage:null,login:null,passwd:null,sessid:null,getSocket:function(onmessage_cb){return self._getSocket(onmessage_cb);}},options);this.wsOnMessage=function(event){self._wsOnMessage(event);};};$.JsonRpcClient.prototype._ws_socket=null;$.JsonRpcClient.prototype._ws_callbacks={};$.JsonRpcClient.prototype._current_id=1;$.JsonRpcClient.prototype.call=function(method,params,success_cb,error_cb){if(!params){params={};}
+return media;}})(jQuery);(function($){$.JsonRpcClient=function(options){var self=this;this.options=$.extend({ajaxUrl:null,socketUrl:null,onmessage:null,login:null,passwd:null,sessid:null,getSocket:function(onmessage_cb){return self._getSocket(onmessage_cb);}},options);self.ws_cnt=0;this.wsOnMessage=function(event){self._wsOnMessage(event);};};$.JsonRpcClient.prototype._ws_socket=null;$.JsonRpcClient.prototype._ws_callbacks={};$.JsonRpcClient.prototype._current_id=1;$.JsonRpcClient.prototype.call=function(method,params,success_cb,error_cb){if(!params){params={};}
 if(this.options.sessid){params.sessid=this.options.sessid;}
 var request={jsonrpc:'2.0',method:method,params:params,id:this._current_id++};if(!success_cb){success_cb=function(e){console.log("Success: ",e);};}
 if(!error_cb){error_cb=function(e){console.log("Error: ",e);};}
@@ -70,12 +70,15 @@ return true;}
 $.JsonRpcClient.prototype.closeSocket=function(){if(self.socketReady()){this._ws_socket.onclose=function(w){console.log("Closing Socket")}
 this._ws_socket.close();}}
 $.JsonRpcClient.prototype.loginData=function(params){self.options.login=params.login;self.options.passwd=params.passwd;}
-$.JsonRpcClient.prototype.connectSocket=function(onmessage_cb){var self=this;if(!self.socketReady()){self.authing=false;this._ws_socket=new WebSocket(this.options.socketUrl);if(this._ws_socket){this._ws_socket.onmessage=onmessage_cb;this._ws_socket.onclose=function(w){if(!self.ws_sleep){self.ws_sleep=2;}
-self.ws_cnt=0;if(self.options.onWSClose){self.options.onWSClose(self);}
-console.error("Websocket Lost sleep: "+self.ws_sleep+"sec");setTimeout(function(){console.log("Attempting Reconnection....");self.connectSocket(onmessage_cb);},self.ws_sleep*1000);if(++self.ws_cnt>=150){self.ws_sleep=30;}}
-this._ws_socket.onopen=function(){this.ws_sleep=2;this.ws_cnt=0;if(self.options.onWSConnect){self.options.onWSConnect(self);}
+$.JsonRpcClient.prototype.connectSocket=function(onmessage_cb){var self=this;if(self.to){clearTimeout(self.to);}
+if(!self.socketReady()){self.authing=false;if(self._ws_socket){delete self._ws_socket;}
+self._ws_socket=new WebSocket(self.options.socketUrl);if(self._ws_socket){self._ws_socket.onmessage=onmessage_cb;self._ws_socket.onclose=function(w){if(!self.ws_sleep){self.ws_sleep=500;}
+if(self.options.onWSClose){self.options.onWSClose(self);}
+console.error("Websocket Lost "+self.ws_cnt+" sleep: "+self.ws_sleep+"msec");self.to=setTimeout(function(){console.log("Attempting Reconnection....");self.connectSocket(onmessage_cb);},self.ws_sleep);self.ws_cnt++;if(self.ws_sleep<3000&&(self.ws_cnt%100)==0){self.ws_sleep+=500;}}
+self._ws_socket.onopen=function(){if(self.to){clearTimeout(self.to);}
+self.ws_sleep=500;self.ws_cnt=0;if(self.options.onWSConnect){self.options.onWSConnect(self);}
 var req;while(req=$.JsonRpcClient.q.pop()){self._ws_socket.send(req);}}}}
-return this._ws_socket?true:false;}
+return self._ws_socket?true:false;}
 $.JsonRpcClient.prototype._getSocket=function(onmessage_cb){if(this.options.socketUrl===null||!("WebSocket"in window))return null;this.connectSocket(onmessage_cb);return this._ws_socket;};$.JsonRpcClient.q=[];$.JsonRpcClient.prototype._wsCall=function(socket,request,success_cb,error_cb){var request_json=$.toJSON(request);if(socket.readyState<1){self=this;$.JsonRpcClient.q.push(request_json);}
 else{socket.send(request_json);}
 if('id'in request&&typeof success_cb!=='undefined'){this._ws_callbacks[request.id]={request:request_json,request_obj:request,success_cb:success_cb,error_cb:error_cb};}};$.JsonRpcClient.prototype._wsOnMessage=function(event){var response;try{response=$.parseJSON(event.data);if(typeof response==='object'&&'jsonrpc'in response&&response.jsonrpc==='2.0'){if('result'in response&&this._ws_callbacks[response.id]){var success_cb=this._ws_callbacks[response.id].success_cb;delete this._ws_callbacks[response.id];success_cb(response.result,this);return;}
@@ -102,7 +105,7 @@ verto.purge();}});if(verto.options.ringFile&&verto.options.tag){verto.ringer=$("
 verto.rpcClient.call('login',{});};$.verto.prototype.loginData=function(params){verto.options.login=params.login;verto.options.passwd=params.passwd;verto.rpcClient.loginData(params);};$.verto.prototype.logout=function(msg){var verto=this;verto.rpcClient.closeSocket();verto.purge();};$.verto.prototype.login=function(msg){var verto=this;verto.logout();verto.rpcClient.call('login',{});};$.verto.prototype.message=function(msg){var verto=this;var err=0;if(!msg.to){console.error("Missing To");err++;}
 if(!msg.body){console.error("Missing Body");err++;}
 if(err){return false;}
-verto.sendMethod("verto.info",{msg:msg});return true;};$.verto.prototype.processReply=function(method,success,e){var verto=this;var i;console.log("Response: "+method,success,e);switch(method){case"verto.subscribe":for(i in e.unauthorizedChannels){drop_bad(verto,e.unauthorizedChannels[i]);}
+verto.sendMethod("verto.info",{msg:msg});return true;};$.verto.prototype.processReply=function(method,success,e){var verto=this;var i;switch(method){case"verto.subscribe":for(i in e.unauthorizedChannels){drop_bad(verto,e.unauthorizedChannels[i]);}
 for(i in e.subscribedChannels){mark_ready(verto,e.subscribedChannels[i]);}
 break;case"verto.unsubscribe":break;}};$.verto.prototype.sendMethod=function(method,params){var verto=this;verto.rpcClient.call(method,params,function(e){verto.processReply(method,true,e);},function(e){verto.processReply(method,false,e);});};function do_sub(verto,channel,obj){}
 function drop_bad(verto,channel){console.error("drop unauthorized channel: "+channel);delete verto.eventSUBS[channel];}
@@ -148,7 +151,7 @@ if(la.onChange){la.onChange(la,{serno:serno,action:"bootObj",data:val,redraw:tru
 if(la.checkSerno(serno)){var redraw=la._add(key,val,index);if(la.onChange){la.onChange(la,{serno:serno,action:"add",index:index,key:key,data:val,redraw:redraw});}}};la.modify=function(serno,val,key,index){if(key===null||key===undefined){key=serno;}
 if(la.checkSerno(serno)){la._add(key,val,index);if(la.onChange){la.onChange(la,{serno:serno,action:"modify",key:key,data:val,index:index});}}};la.del=function(serno,key,index){if(key===null||key===undefined){key=serno;}
 if(la.checkSerno(serno)){if(index===null||index<0||index===undefined){index=la.indexOf(key);}
-var ok=la._del(key);if(ok&&la.onChange){la.onChange(la,{serno:serno,action:"del",key:key,index:index});}}};var eventHandler=function(v,e,la){var packet=e.data;console.error("READ:",packet);if(packet.name!=la.name){return;}
+var ok=la._del(key);if(ok&&la.onChange){la.onChange(la,{serno:serno,action:"del",key:key,index:index});}}};var eventHandler=function(v,e,la){var packet=e.data;if(packet.name!=la.name){return;}
 switch(packet.action){case"init":la.init(packet.wireSerno,packet.data,packet.hashKey,packet.arrIndex);break;case"bootObj":la.bootObj(packet.wireSerno,packet.data);break;case"add":la.add(packet.wireSerno,packet.data,packet.hashKey,packet.arrIndex);break;case"modify":if(!(packet.arrIndex||packet.hashKey)){console.error("Invalid Packet",packet);}else{la.modify(packet.wireSerno,packet.data,packet.hashKey,packet.arrIndex);}
 break;case"del":if(!(packet.arrIndex||packet.hashKey)){console.error("Invalid Packet",packet);}else{la.del(packet.wireSerno,packet.hashKey,packet.arrIndex);}
 break;case"clear":la.clear();break;case"reorder":la.reorder(packet.wireSerno,packet.order);break;default:if(la.checkSerno(packet.wireSerno)){if(la.onChange){la.onChange(la,{serno:packet.wireSerno,action:packet.action,data:packet.data});}}
@@ -165,7 +168,7 @@ try{switch(args.action){case"bootObj":if(!args.data){console.error("missing data
 dt.fnClearTable();dt.fnAddData(obj.asArray());dt.fnAdjustColumnSizing();break;case"add":if(!args.data){console.error("missing data");return;}
 if(args.redraw>-1){dt.fnClearTable();dt.fnAddData(obj.asArray());}else{dt.fnAddData(args.data);}
 dt.fnAdjustColumnSizing();break;case"modify":if(!args.data){return;}
-console.debug(args,index);dt.fnUpdate(args.data,index);dt.fnAdjustColumnSizing();break;case"del":dt.fnDeleteRow(index);dt.fnAdjustColumnSizing();break;case"clear":dt.fnClearTable();break;case"reorder":dt.fnClearTable();dt.fnAddData(obj.asArray());break;case"hide":jq.hide();break;case"show":jq.show();break;}}catch(err){console.error("ERROR: "+err);iserr++;}
+dt.fnUpdate(args.data,index);dt.fnAdjustColumnSizing();break;case"del":dt.fnDeleteRow(index);dt.fnAdjustColumnSizing();break;case"clear":dt.fnClearTable();break;case"reorder":dt.fnClearTable();dt.fnAddData(obj.asArray());break;case"hide":jq.hide();break;case"show":jq.show();break;}}catch(err){console.error("ERROR: "+err);iserr++;}
 if(iserr){obj.errs++;if(obj.errs<3){obj.bootstrap(obj.user_obj);}}else{obj.errs=0;}};la.onChange(la,{action:"init"});};var CONFMAN_SERNO=1;$.verto.confMan=function(verto,params){var confMan=this;conf
 confMan.params=$.extend({tableID:null,statusID:null,mainModID:null,dialog:null,hasVid:false,laData:null,onBroadcast:null,onLaChange:null,onLaRow:null},params);confMan.verto=verto;confMan.serno=CONFMAN_SERNO++;function genMainMod(jq){var play_id="play_"+confMan.serno;var stop_id="stop_"+confMan.serno;var recording_id="recording_"+confMan.serno;var rec_stop_id="recording_stop"+confMan.serno;var div_id="confman_"+confMan.serno;var html="<div id='"+div_id+"'><br>"+"<button class='ctlbtn' id='"+play_id+"'>Play</button>"+"<button class='ctlbtn' id='"+stop_id+"'>Stop</button>"+"<button class='ctlbtn' id='"+recording_id+"'>Record</button>"+"<button class='ctlbtn' id='"+rec_stop_id+"'>Record Stop</button>"
 +"<br><br></div>";jq.html(html);$("#"+play_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("play",null,file);});$("#"+stop_id).click(function(){confMan.modCommand("stop",null,"all");});$("#"+recording_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("recording",null,["start",file]);});$("#"+rec_stop_id).click(function(){confMan.modCommand("recording",null,["stop","all"]);});}
@@ -192,12 +195,12 @@ dialog.verto.rpcClient.call(method,obj,function(e){dialog.processReply(method,tr
 return false;}
 $.verto.dialog.prototype.setState=function(state){var dialog=this;if(dialog.state==$.verto.enum.state.ringing){dialog.stopRinging();}
 if(dialog.state==state||!checkStateChange(dialog.state,state)){console.error("Dialog "+dialog.callID+": INVALID state change from "+dialog.state.name+" to "+state.name);dialog.hangup();return false;}
-console.error("Dialog "+dialog.callID+": state change from "+dialog.state.name+" to "+state.name);dialog.lastState=dialog.state;dialog.state=state;if(!dialog.causeCode){dialog.causeCode=16;}
+console.info("Dialog "+dialog.callID+": state change from "+dialog.state.name+" to "+state.name);dialog.lastState=dialog.state;dialog.state=state;if(!dialog.causeCode){dialog.causeCode=16;}
 if(!dialog.cause){dialog.cause="NORMAL CLEARING";}
 if(dialog.callbacks.onDialogState){dialog.callbacks.onDialogState(this);}
 switch(dialog.state){case $.verto.enum.state.purge:dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.hangup:if(dialog.lastState.val>$.verto.enum.state.requesting.val&&dialog.lastState.val<$.verto.enum.state.hangup.val){dialog.sendMethod("verto.bye",{});}
 dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.destroy:delete verto.dialogs[dialog.callID];dialog.rtc.stop();break;}
-return true;};$.verto.dialog.prototype.processReply=function(method,success,e){var dialog=this;console.log("Response: "+method+" State:"+dialog.state.name,success,e);switch(method){case"verto.answer":case"verto.attach":if(success){dialog.setState($.verto.enum.state.active);}else{dialog.hangup();}
+return true;};$.verto.dialog.prototype.processReply=function(method,success,e){var dialog=this;switch(method){case"verto.answer":case"verto.attach":if(success){dialog.setState($.verto.enum.state.active);}else{dialog.hangup();}
 break;case"verto.invite":if(success){dialog.setState($.verto.enum.state.trying);}else{dialog.setState($.verto.enum.state.destroy);}
 break;case"verto.bye":dialog.hangup();break;case"verto.modify":if(e.holdState){if(e.holdState=="held"){if(dialog.state!=$.verto.enum.state.held){dialog.setState($.verto.enum.state.held);}}else if(e.holdState=="active"){if(dialog.state!=$.verto.enum.state.active){dialog.setState($.verto.enum.state.active);}}}
 if(success){}
diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index e4017e7dcb..af9392bbfa 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -4,6 +4,9 @@ var confMan = null;
 var $display = $("#display");
 var verto;
 var ringing = false;
+var autocall = false;
+
+$( ".selector" ).pagecontainer({ "theme": "a" });
 
 function display(msg) {
     $("#calltitle").html(msg);
@@ -19,13 +22,11 @@ function clearConfMan() {
 }
 
 function goto_dialog(where) {
-    $.mobile.changePage("#dialog-" + where, {
-        role: "dialog"
-    });
+    $( ":mobile-pagecontainer" ).pagecontainer( "change", "#dialog-" + where, { role: "dialog" } );
 }
 
-function goto_page(where) {
-    $.mobile.changePage("#page-" + where);
+function goto_page(where, force) {
+    $( ":mobile-pagecontainer" ).pagecontainer( "change", "#page-" + where);
 }
 
 var first_login = false;
@@ -58,7 +59,7 @@ var callbacks = {
 
         switch (msg) {
         case $.verto.enum.message.pvtEvent:
-            console.error("pvtEvent", data.pvtData.action);
+            //console.error("pvtEvent", data.pvtData.action);
             if (data.pvtData) {
                 switch (data.pvtData.action) {
 
@@ -139,6 +140,10 @@ var callbacks = {
 
             break;
 
+        case $.verto.enum.state.trying:
+            display("Calling: " + d.cidString());
+            goto_page("incall");
+	    break;
         case $.verto.enum.state.early:
         case $.verto.enum.state.active:
             display("Talking to: " + d.cidString());
@@ -168,14 +173,22 @@ var callbacks = {
         if (success) {
             online(true);
 
+	    /*
             verto.subscribe("presence", {
                 handler: function(v, e) {
                     console.error("PRESENCE:", e);
                 }
-            });
+		});
+	    */
+
             if (!window.location.hash) {
                 goto_page("main");
             }
+
+	    if (autocall) {
+		autocall = false;
+		docall();
+	    }
         } else {
             goto_page("login");
             goto_dialog("login-error");
@@ -193,7 +206,7 @@ var callbacks = {
     },
 
     onEvent: function(v, e) {
-        console.debug("w00t", e);
+        console.debug("GOT EVENT", e);
     },
 };
 
@@ -246,7 +259,7 @@ $("#webcam").click(function() {
     check_vid();
 });
 
-$("#callbtn").click(function() {
+function docall() {
     $('#ext').trigger('change');
 
     if (cur_call) {
@@ -262,6 +275,10 @@ $("#callbtn").click(function() {
         useVideo: check_vid(),
         useStereo: $("#use_stereo").is(':checked')
     });
+}
+
+$("#callbtn").click(function() {
+    docall();
 });
 
 function pop(id, cname, dft) {
@@ -366,58 +383,43 @@ function init() {
 }
 
 $(document).ready(function() {
-    var autocall = false;
     var hash = window.location.hash.substring(1);    
 
     if (hash && hash.indexOf("page-") == -1) {
 	window.location.hash = "";
+	$("#ext").val(hash);
 	autocall = true;
     }
 
     init();
 
-    $("#page-incall").on("pagebeforechange", function(event) {});
-
-    if (autocall) {
-	$("#ext").val(hash);
-	$("#callbtn").trigger("click");
-    }
-
-
 });
 
-$(document).bind("pagebeforechange", function(e, data) {
-    if (typeof(data.toPage) !== "string") {
-        return;
+
+var lastTo = 0;
+
+$(document).bind("pagecontainerchange", function(e, data) {
+
+    if (lastTo) {
+	clearTimeout(lastTo);
     }
 
     switch (window.location.hash) {
 
     case "#page-incall":
-
-        console.error(e, data);
-        setTimeout(function() {
+        lastTo = setTimeout(function() {
             if (!cur_call) {
                 goto_page("main");
             }
-        },
-        10000);
+        }, 1000);
+
         break;
 
     case "#page-main":
-
-        console.error(e, data);
-        setTimeout(function() {
-            if (cur_call && !ringing) {
-                goto_page("incall");
-            }
-        },
-        2000);
-        break;
-
+	break;
     case "#page-login":
 
-        setTimeout(function() {
+        lastTo = setTimeout(function() {
             if (online_visible) {
                 goto_page("main");
             }
@@ -426,3 +428,4 @@ $(document).bind("pagebeforechange", function(e, data) {
         break;
     }
 });
+
diff --git a/html5/verto/js/src/jquery.jsonrpcclient.js b/html5/verto/js/src/jquery.jsonrpcclient.js
index c5ff8d7422..9505cd14de 100644
--- a/html5/verto/js/src/jquery.jsonrpcclient.js
+++ b/html5/verto/js/src/jquery.jsonrpcclient.js
@@ -74,6 +74,8 @@
       getSocket   : function(onmessage_cb) { return self._getSocket(onmessage_cb); }
     }, options);
       
+      self.ws_cnt = 0;
+
     // Declare an instance version of the onmessage callback to wrap 'this'.
     this.wsOnMessage = function(event) { self._wsOnMessage(event); };
   };
@@ -261,42 +263,53 @@
   $.JsonRpcClient.prototype.connectSocket = function(onmessage_cb) {
       var self = this;
 
+      if (self.to) {
+	  clearTimeout(self.to);
+      }
+
       if (!self.socketReady()) {
 	  self.authing = false;
+
+	  if (self._ws_socket) {
+	      delete self._ws_socket;
+	  }
+
 	  // No socket, or dying socket, let's get a new one.
-	  this._ws_socket = new WebSocket(this.options.socketUrl);
+	  self._ws_socket = new WebSocket(self.options.socketUrl);
 	  
-	  if (this._ws_socket) {
+	  if (self._ws_socket) {
 	      // Set up onmessage handler.
-	      this._ws_socket.onmessage = onmessage_cb;
-	      this._ws_socket.onclose = function (w) {
+	      self._ws_socket.onmessage = onmessage_cb;
+	      self._ws_socket.onclose = function (w) {
 		  if (!self.ws_sleep) {
-		      self.ws_sleep = 2;
+		      self.ws_sleep = 500;
 		  }
 
-		  self.ws_cnt = 0;
-		  
 		  if (self.options.onWSClose) {
 		      self.options.onWSClose(self);
 		  }
 
-		  console.error("Websocket Lost sleep: " + self.ws_sleep + "sec");
-
-		  setTimeout(function() {
+		  console.error("Websocket Lost " + self.ws_cnt + " sleep: " + self.ws_sleep + "msec");
+		  
+		  self.to = setTimeout(function() {
 		      console.log("Attempting Reconnection....");
 		      self.connectSocket(onmessage_cb);
-		  }, self.ws_sleep * 1000);
+		  }, self.ws_sleep);
 		  
+		  self.ws_cnt++;
 
-		  if (++self.ws_cnt >= 150) {
-		      self.ws_sleep = 30;
+		  if (self.ws_sleep < 3000 && (self.ws_cnt % 100) == 0) {
+		      self.ws_sleep += 500;
 		  }
 	      }
 
 	      // Set up sending of message for when the socket is open.
-	      this._ws_socket.onopen = function() {
-		  this.ws_sleep = 2;	  
-		  this.ws_cnt = 0;
+	      self._ws_socket.onopen = function() {
+		  if (self.to) {
+		      clearTimeout(self.to);
+		  }
+		  self.ws_sleep = 500;	  
+		  self.ws_cnt = 0;
 		  if (self.options.onWSConnect) {
 		      self.options.onWSConnect(self);
 		  }
@@ -310,7 +323,7 @@
 	  }
       }      
       
-      return this._ws_socket ? true : false;
+      return self._ws_socket ? true : false;
   }
 
   $.JsonRpcClient.prototype._getSocket = function(onmessage_cb) {
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index e56503dd3f..029afc32a1 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -165,7 +165,7 @@
         var verto = this;
 	var i;
 
-        console.log("Response: " + method, success, e);
+        //console.log("Response: " + method, success, e);
 
         switch (method) {
         case "verto.subscribe":
@@ -864,7 +864,7 @@
         var eventHandler = function(v, e, la) {
             var packet = e.data;
 
-            console.error("READ:", packet);
+            //console.error("READ:", packet);
 
             if (packet.name != la.name) {
                 return;
@@ -1079,7 +1079,7 @@
                     if (!args.data) {
                         return;
                     }
-                    console.debug(args, index);
+                    //console.debug(args, index);
                     dt.fnUpdate(args.data, index);
                     dt.fnAdjustColumnSizing();
                     break;
@@ -1539,7 +1539,7 @@
             return false;
         }
 
-        console.error("Dialog " + dialog.callID + ": state change from " + dialog.state.name + " to " + state.name);
+        console.info("Dialog " + dialog.callID + ": state change from " + dialog.state.name + " to " + state.name);
 
         dialog.lastState = dialog.state;
         dialog.state = state;
@@ -1580,7 +1580,7 @@
     $.verto.dialog.prototype.processReply = function(method, success, e) {
         var dialog = this;
 
-        console.log("Response: " + method + " State:" + dialog.state.name, success, e);
+        //console.log("Response: " + method + " State:" + dialog.state.name, success, e);
 
         switch (method) {
 
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 96a484e6a0..8b2fd99b9f 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -2024,8 +2024,10 @@ typedef enum {
 
 #ifdef WIN32
 typedef SOCKET switch_os_socket_t;
+#define SWITCH_SOCK_INVALID INVALID_SOCKET
 #else
 typedef int switch_os_socket_t;
+#define SWITCH_SOCK_INVALID -1
 #endif
 
 typedef struct apr_pool_t switch_memory_pool_t;
@@ -2385,7 +2387,16 @@ typedef enum {
 	ICE_CONTROLLED = (1 << 2)
 } switch_core_media_ice_type_t;
 
-
+typedef enum {
+	SWITCH_POLL_READ = (1 << 0),
+	SWITCH_POLL_WRITE = (1 << 1),
+	SWITCH_POLL_ERROR = (1 << 2),
+	SWITCH_POLL_HUP = (1 << 3),
+	SWITCH_POLL_RDNORM = (1 << 4),
+	SWITCH_POLL_RDBAND = (1 << 5),
+	SWITCH_POLL_PRI = (1 << 6),
+	SWITCH_POLL_INVALID = (1 << 7)
+} switch_poll_t;
 
 SWITCH_END_EXTERN_C
 #endif
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 751b94632c..fc6c06861b 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -1066,7 +1066,7 @@ SWITCH_DECLARE(unsigned long) switch_atoul(const char *nptr);
  * \return	Pointer to message buffer, returning error message or "Unknown error xxx" if none found
  */
 SWITCH_DECLARE(char *) switch_strerror_r(int errnum, char *buf, switch_size_t buflen);
-
+SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags);
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:
diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.c b/src/mod/endpoints/mod_verto/mcast/mcast.c
index 71080b0677..9a2371b8ce 100644
--- a/src/mod/endpoints/mod_verto/mcast/mcast.c
+++ b/src/mod/endpoints/mod_verto/mcast/mcast.c
@@ -44,6 +44,7 @@
 #include <unistd.h>
 #include "mcast.h"
 #include <poll.h>
+#include <switch_utils.h>
 
 int mcast_socket_create(const char *host, int16_t port, mcast_handle_t *handle, mcast_flag_t flags)
 {
@@ -151,7 +152,6 @@ ssize_t mcast_socket_send(mcast_handle_t *handle, void *data, size_t datalen)
 ssize_t mcast_socket_recv(mcast_handle_t *handle, void *data, size_t datalen, int ms)
 {
 	socklen_t addrlen = sizeof(handle->recv_addr);
-	int r;
 
 	if (data == NULL || datalen == 0) {
 		data = handle->buffer;
@@ -159,16 +159,9 @@ ssize_t mcast_socket_recv(mcast_handle_t *handle, void *data, size_t datalen, in
 	}
 
 	if (ms > 0) {
-		struct pollfd pfds[1];
-		
-		pfds[0].fd = handle->sock;
-		pfds[0].events = POLLIN|POLLERR;
-		
-		if ((r = poll(pfds, 1, ms)) <= 0) {
-			return r;
-		}
+		int pflags = switch_wait_sock(handle->sock, ms, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
 
-		if (pfds[0].revents & POLLERR) {
+		if ((pflags & SWITCH_POLL_ERROR) || (pflags & SWITCH_POLL_HUP)) {
 			return -1;
 		}
 	}
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 74819c87d0..a5897fbbb6 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -554,6 +554,29 @@ static switch_ssize_t ws_write_json(jsock_t *jsock, cJSON **json, switch_bool_t
 	return r;
 }
 
+static switch_status_t jsock_queue_event(jsock_t *jsock, cJSON **json)
+{
+	switch_status_t status = SWITCH_STATUS_FALSE;
+	
+	if (switch_queue_trypush(jsock->event_queue, *json) == SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_SUCCESS;
+		if (jsock->lost_events) {
+			int le = jsock->lost_events;
+			jsock->lost_events = 0;
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d json events!\n", le);
+		}
+	} else {
+		if (++jsock->lost_events > MAX_MISSED) {
+			jsock->drop++;
+		}
+		cJSON_Delete(*json);
+	}
+
+	*json = NULL;
+
+	return status;
+}
+
 
 static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *event)
 {
@@ -569,7 +592,8 @@ static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *ev
 				params = cJSON_Duplicate(event, 1);
 				cJSON_AddItemToObject(params, "eventSerno", cJSON_CreateNumber(np->serno++));
 				msg = jrpc_new_req("verto.event", NULL, &params);
-				ws_write_json(np->jsock, &msg, SWITCH_TRUE);
+				//ws_write_json(np->jsock, &msg, SWITCH_TRUE);
+				jsock_queue_event(np->jsock, &msg);
 			}
 		}
 	}
@@ -601,7 +625,8 @@ static void jsock_send_event(cJSON *event)
 		cJSON *msg = NULL, *params;
 		params = cJSON_Duplicate(event, 1);
 		msg = jrpc_new_req("verto.event", NULL, &params);
-		ws_write_json(use_jsock, &msg, SWITCH_TRUE); 
+		//ws_write_json(use_jsock, &msg, SWITCH_TRUE); 
+		jsock_queue_event(use_jsock, &msg);
 		switch_thread_rwlock_unlock(use_jsock->rwlock);
 		use_jsock = NULL;
 		return;
@@ -747,6 +772,7 @@ static void check_permissions(jsock_t *jsock, switch_xml_t x_user, cJSON *params
 		}
 	}
 
+
 	set_perm(allowed_methods, &jsock->allowed_methods);
 	set_perm(allowed_jsapi, &jsock->allowed_jsapi);
 	set_perm(allowed_fsapi, &jsock->allowed_fsapi);
@@ -1186,6 +1212,19 @@ static switch_status_t process_input(jsock_t *jsock, uint8_t *data, switch_ssize
 	return status;
 }
 
+static void jsock_check_event_queue(jsock_t *jsock)
+{
+	void *pop;
+	int this_pass = switch_queue_size(jsock->event_queue);
+
+	switch_mutex_lock(jsock->write_mutex);
+	while(this_pass-- > 0 && switch_queue_trypop(jsock->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+		cJSON *json = (cJSON *) pop;
+		ws_write_json(jsock, &json, SWITCH_TRUE);
+	}
+	switch_mutex_unlock(jsock->write_mutex);
+}
+
 static void client_run(jsock_t *jsock)
 {
 
@@ -1199,43 +1238,31 @@ static void client_run(jsock_t *jsock)
 	}
 
 	while(jsock->profile->running) {
-		struct pollfd pfds[1];
-		int res;
-		
-		memset(&pfds[0], 0, sizeof(pfds[0]));
-
-		pfds[0].fd = jsock->client_socket;
-		pfds[0].events = POLLIN|POLLERR|POLLHUP|POLLRDNORM|POLLRDBAND|POLLPRI;
-
-		
-		if ((res = poll(pfds, 1, -1)) < 0) {
-			if (errno != EINTR) {
-				die("%s POLL FAILED\n", jsock->name);
-			}
-		}
-
-		if (res < 0) {
-			die("%s POLL ERROR\n", jsock->name);
-		}
+		int pflags = switch_wait_sock(jsock->client_socket, 50, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
 
 		if (jsock->drop) {
 			die("%s Dropping Connection\n", jsock->name);
 		}
 
+		if (pflags < 0) {
+			if (errno != EINTR) {
+				die("%s POLL FAILED\n", jsock->name);
+			}
+		}
 
-		if (pfds[0].revents & POLLERR) {
+		if (pflags & SWITCH_POLL_ERROR) {
 			die("%s POLL ERROR\n", jsock->name);
 		}
 
-		if (pfds[0].revents & POLLHUP) {
+		if (pflags & SWITCH_POLL_HUP) {
 			die("%s POLL HANGUP DETECTED\n", jsock->name);
 		}
 
-		if (pfds[0].revents & POLLNVAL) {
+		if (pflags & SWITCH_POLL_INVALID) {
 			die("%s POLL INVALID SOCKET\n", jsock->name);
 		}
 
-		if (pfds[0].revents & POLLIN) {
+		if (pflags & SWITCH_POLL_READ) {
 			switch_ssize_t bytes;
 			ws_opcode_t oc;
 			uint8_t *data;
@@ -1257,6 +1284,8 @@ static void client_run(jsock_t *jsock)
 					switch_set_flag(jsock, JPFLAG_CHECK_ATTACH);
 				}
 			}
+		} else {
+			jsock_check_event_queue(jsock);
 		}
 	}
 
@@ -1268,6 +1297,18 @@ static void client_run(jsock_t *jsock)
 	return;
 }
 
+static void jsock_flush(jsock_t *jsock)
+{
+	void *pop;
+
+	switch_mutex_lock(jsock->write_mutex);
+	while(switch_queue_trypop(jsock->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+		cJSON *json = (cJSON *) pop;
+		cJSON_Delete(json);
+	}
+	switch_mutex_unlock(jsock->write_mutex);
+}
+
 static void *SWITCH_THREAD_FUNC client_thread(switch_thread_t *thread, void *obj)
 {
 	jsock_t *jsock = (jsock_t *) obj;
@@ -1302,6 +1343,7 @@ static void *SWITCH_THREAD_FUNC client_thread(switch_thread_t *thread, void *obj
 	switch_event_destroy(&jsock->allowed_jsapi);
 	switch_event_destroy(&jsock->allowed_event_channels);
 
+	jsock_flush(jsock);
 
     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s Ending client thread.\n", jsock->name);
 	switch_thread_rwlock_wrlock(jsock->rwlock);
@@ -1772,7 +1814,8 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 					jmsg = jrpc_new_req("verto.display", tech_pvt->call_id, &params);
 					cJSON_AddItemToObject(params, "display_name", cJSON_CreateString(name));
 					cJSON_AddItemToObject(params, "display_number", cJSON_CreateString(number));
-					ws_write_json(jsock, &jmsg, SWITCH_TRUE);
+					//ws_write_json(jsock, &jmsg, SWITCH_TRUE);
+					jsock_queue_event(jsock, &jmsg);
 				}
 
 				switch_thread_rwlock_unlock(jsock->rwlock);
@@ -2709,7 +2752,8 @@ static switch_bool_t event_channel_check_auth(jsock_t *jsock, const char *event_
 			}
 		}
 
-		if (!(switch_event_get_header(jsock->allowed_event_channels, event_channel) || 
+		if ((!globals.enable_fs_events && (!strcasecmp(event_channel, "FSevent") || (main_event_channel && !strcasecmp(main_event_channel, "FSevent")))) || 
+			!(switch_event_get_header(jsock->allowed_event_channels, event_channel) || 
 			  (main_event_channel && switch_event_get_header(jsock->allowed_event_channels, main_event_channel)))) {
 			ok = SWITCH_FALSE;
 		}
@@ -3062,6 +3106,8 @@ static int start_jsock(verto_profile_t *profile, int sock)
 	td->pool = pool;
 
 	switch_mutex_init(&jsock->write_mutex, SWITCH_MUTEX_NESTED, jsock->pool);
+	switch_mutex_init(&jsock->filter_mutex, SWITCH_MUTEX_NESTED, jsock->pool);
+	switch_queue_create(&jsock->event_queue, MAX_QUEUE_LEN, jsock->pool);
 	switch_thread_rwlock_create(&jsock->rwlock, jsock->pool);
 	switch_thread_pool_launch_thread(&td);
 
@@ -3561,6 +3607,8 @@ static switch_status_t parse_config(const char *cf)
 				}
 			} else if (!strcasecmp(var, "enable-presence") && val) {
 				globals.enable_presence = switch_true(val);
+			} else if (!strcasecmp(var, "enable-fs-events") && val) {
+				globals.enable_fs_events = switch_true(val);
 			} else if (!strcasecmp(var, "detach-timeout-sec") && val) {
 				int tmp = atoi(val);
 				if (tmp > 0) {
@@ -3917,9 +3965,10 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 			jsock_t *jsock;
 
 			if ((jsock = get_jsock(tech_pvt->jsock_uuid))) {
-				if (ws_write_json(jsock, &msg, SWITCH_FALSE) <= 0) {
-					switch_channel_hangup(switch_core_session_get_channel(session), SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-				}
+				jsock_queue_event(jsock, &msg);
+				//if (ws_write_json(jsock, &msg, SWITCH_FALSE) <= 0) {
+				//	switch_channel_hangup(switch_core_session_get_channel(session), SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+				//}
 				switch_thread_rwlock_unlock(jsock->rwlock);
 				done = 1;
 			}
@@ -3939,7 +3988,8 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 		
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
 			if (!strcmp(uid, jsock->uid)) {
-				ws_write_json(jsock, &msg, SWITCH_FALSE);
+				//ws_write_json(jsock, &msg, SWITCH_FALSE);
+				jsock_queue_event(jsock, &msg);
 				hits++;
 			}
 		}
@@ -4351,6 +4401,10 @@ static void presence_event_handler(switch_event_t *event)
 	char *event_channel;
 	const char *presence_id = switch_event_get_header(event, "channel-presence-id");
 
+	if (!globals.running) {
+		return;
+	}
+
 	if (!globals.enable_presence || zstr(presence_id)) {
 		return;
 	}
@@ -4388,6 +4442,38 @@ static void presence_event_handler(switch_event_t *event)
 
 }
 
+static void event_handler(switch_event_t *event)
+{
+	cJSON *msg = NULL, *data = NULL;
+	char *event_channel;
+
+	if (!globals.enable_fs_events) {
+		return;
+	}
+
+	switch_event_serialize_json_obj(event, &data);
+
+	msg = cJSON_CreateObject();
+
+	if (event->event_id == SWITCH_EVENT_CUSTOM) {
+		const char *subclass = switch_event_get_header(event, "Event-Subclass");
+		event_channel = switch_mprintf("FSevent.%s::%s", switch_event_name(event->event_id), subclass);
+		switch_tolower_max(event_channel + 8);
+	} else {
+		event_channel = switch_mprintf("FSevent.%s", switch_event_name(event->event_id));
+		switch_tolower_max(event_channel + 8);
+	}
+	
+	cJSON_AddItemToObject(msg, "eventChannel", cJSON_CreateString(event_channel));
+	cJSON_AddItemToObject(msg, "data", data);
+
+	/* comment broadcasting globally and change to only within the module cos FS events are heavy */
+	//switch_event_channel_broadcast(event_channel, &msg, __FILE__, NO_EVENT_CHANNEL_ID);
+	verto_broadcast(event_channel, msg, __FILE__, NO_EVENT_CHANNEL_ID);cJSON_Delete(msg);
+
+	free(event_channel);
+
+}
 
 /* Macro expands to: switch_status_t mod_verto_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
 SWITCH_MODULE_LOAD_FUNCTION(mod_verto_load)
@@ -4403,6 +4489,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_verto_load)
 	globals.pool = pool;
 	globals.ready = SIGUSR1;
 	globals.enable_presence = SWITCH_TRUE;
+	globals.enable_fs_events = SWITCH_FALSE;
 
 	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
 
@@ -4423,8 +4510,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_verto_load)
 	globals.detach_timeout = 120;
 
 	
-	switch_event_bind(modname, SWITCH_EVENT_CHANNEL_CALLSTATE, SWITCH_EVENT_SUBCLASS_ANY, presence_event_handler, NULL);
-
 
 
 	memset(&json_GLOBALS, 0, sizeof(json_GLOBALS));
@@ -4462,6 +4547,17 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_verto_load)
 
 	switch_core_register_secondary_recover_callback(modname, verto_recover_callback);
 
+	if (globals.enable_presence) {
+		switch_event_bind(modname, SWITCH_EVENT_CHANNEL_CALLSTATE, SWITCH_EVENT_SUBCLASS_ANY, presence_event_handler, NULL);
+	}
+
+	if (globals.enable_fs_events) {
+		if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+			return SWITCH_STATUS_GENERR;
+		}
+	}
+
 	run_profiles();
 
 	/* indicate that the module should continue to be loaded */
@@ -4478,6 +4574,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_verto_shutdown)
 
 	switch_event_channel_unbind(NULL, verto_broadcast);
 	switch_event_unbind_callback(presence_event_handler);
+	switch_event_unbind_callback(event_handler);
 
 	switch_core_unregister_secondary_recover_callback(modname);
 	do_shutdown();
diff --git a/src/mod/endpoints/mod_verto/mod_verto.h b/src/mod/endpoints/mod_verto/mod_verto.h
index d7df38bf15..84a98649b9 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.h
+++ b/src/mod/endpoints/mod_verto/mod_verto.h
@@ -51,6 +51,9 @@
 #include <openssl/ssl.h>
 #include "mcast.h"
 
+#define MAX_QUEUE_LEN 100000
+#define MAX_MISSED 500
+
 #define MAXPENDING 10000
 #define STACK_SIZE 80 * 1024
 
@@ -73,7 +76,10 @@ typedef enum {
 typedef enum {
 	JPFLAG_INIT = (1 << 0),
 	JPFLAG_AUTHED = (1 << 1),
-	JPFLAG_CHECK_ATTACH = (1 << 2)
+	JPFLAG_CHECK_ATTACH = (1 << 2),
+	JPFLAG_EVENTS = (1 << 3),
+	JPFLAG_AUTH_EVENTS = (1 << 4),
+	JPFLAG_ALL_EVENTS_AUTHED = (1 << 5)
 } jpflag_t;
 
 struct verto_profile_s;
@@ -114,10 +120,14 @@ struct jsock_s {
 	switch_thread_rwlock_t *rwlock;
 	
 	switch_mutex_t *write_mutex;
+	switch_mutex_t *filter_mutex;
 
 	switch_event_t *params;
 	switch_event_t *vars;
 
+	switch_queue_t *event_queue;
+	int lost_events;
+
 	struct jsock_s *next;
 };
 
@@ -231,6 +241,7 @@ struct globals_s {
 	int ready;
 	int profile_threads;
 	int enable_presence;
+	int enable_fs_events;
 
 	switch_hash_t *jsock_hash;
 	switch_mutex_t *jsock_mutex;
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 66aa2e56d8..a45187b2cc 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2491,6 +2491,178 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 	return dest;
 }
 
+
+
+#ifdef HAVE_POLL
+#include <poll.h>
+SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags)
+{
+	struct pollfd pfds[2] = { { 0 } };
+	int s = 0, r = 0;
+
+	if (sock == SWITCH_SOCK_INVALID) {
+		return SWITCH_SOCK_INVALID;
+	}	
+
+	pfds[0].fd = sock;
+
+
+	if ((flags & SWITCH_POLL_READ)) {
+		pfds[0].events |= POLLIN;
+	}
+
+	if ((flags & SWITCH_POLL_WRITE)) {
+		pfds[0].events |= POLLOUT;
+	}
+
+	if ((flags & SWITCH_POLL_ERROR)) {
+		pfds[0].events |= POLLERR;
+	}
+
+	if ((flags & SWITCH_POLL_HUP)) {
+		pfds[0].events |= POLLHUP;
+	}
+
+	if ((flags & SWITCH_POLL_RDNORM)) {
+		pfds[0].events |= POLLRDNORM;
+	}
+
+	if ((flags & SWITCH_POLL_RDBAND)) {
+		pfds[0].events |= POLLRDBAND;
+	}
+
+	if ((flags & SWITCH_POLL_PRI)) {
+		pfds[0].events |= POLLPRI;
+	}
+	
+	s = poll(pfds, 1, ms);
+
+	if (s < 0) {
+		r = s;
+	} else if (s > 0) {
+		if ((pfds[0].revents & POLLIN)) {
+			r |= SWITCH_POLL_READ;
+		}
+		if ((pfds[0].revents & POLLOUT)) {
+			r |= SWITCH_POLL_WRITE;
+		}
+		if ((pfds[0].revents & POLLERR)) {
+			r |= SWITCH_POLL_ERROR;
+		}
+		if ((pfds[0].revents & POLLHUP)) {
+			r |= SWITCH_POLL_HUP;
+		}
+		if ((pfds[0].revents & POLLRDNORM)) {
+			r |= SWITCH_POLL_RDNORM;
+		}
+		if ((pfds[0].revents & POLLRDBAND)) {
+			r |= SWITCH_POLL_RDBAND;
+		}
+		if ((pfds[0].revents & POLLPRI)) {
+			r |= SWITCH_POLL_PRI;
+		}
+		if ((pfds[0].revents & POLLNVAL)) {
+			r |= SWITCH_POLL_INVALID;
+		}
+	}
+
+	return r;
+
+}
+
+#else
+/* use select instead of poll */
+SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags)
+{
+	int s = 0, r = 0;
+	fd_set *rfds;
+	fd_set *wfds;
+	fd_set *efds;
+	struct timeval tv;
+
+	if (sock == SWITCH_SOCK_INVALID) {
+		return SWITCH_SOCK_INVALID;
+	}
+
+	rfds = malloc(sizeof(fd_set));
+	wfds = malloc(sizeof(fd_set));
+	efds = malloc(sizeof(fd_set));
+
+	FD_ZERO(rfds);
+	FD_ZERO(wfds);
+	FD_ZERO(efds);
+
+#ifndef WIN32
+	/* Wouldn't you rather know?? */
+	assert(sock <= FD_SETSIZE);
+#endif
+	
+	if ((flags & SWITCH_POLL_READ)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+	FD_SET(sock, rfds);
+#pragma warning( pop ) 
+#else
+	FD_SET(sock, rfds);
+#endif
+	}
+
+	if ((flags & SWITCH_POLL_WRITE)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+	FD_SET(sock, wfds);
+#pragma warning( pop ) 
+#else
+	FD_SET(sock, wfds);
+#endif
+	}
+
+	if ((flags & SWITCH_POLL_ERROR)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+	FD_SET(sock, efds);
+#pragma warning( pop ) 
+#else
+	FD_SET(sock, efds);
+#endif
+	}
+
+	tv.tv_sec = ms / 1000;
+	tv.tv_usec = (ms % 1000) * ms;
+	
+	s = select(sock + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv);
+
+	if (s < 0) {
+		r = s;
+	} else if (s > 0) {
+		if ((flags & SWITCH_POLL_READ) && FD_ISSET(sock, rfds)) {
+			r |= SWITCH_POLL_READ;
+		}
+
+		if ((flags & SWITCH_POLL_WRITE) && FD_ISSET(sock, wfds)) {
+			r |= SWITCH_POLL_WRITE;
+		}
+
+		if ((flags & SWITCH_POLL_ERROR) && FD_ISSET(sock, efds)) {
+			r |= SWITCH_POLL_ERROR;
+		}
+	}
+
+	free(rfds);
+	free(wfds);
+	free(efds);
+
+	return r;
+
+}
+#endif
+
 SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
 {
 	int nsds = 0;

From 83ba9d82e160885002d62b25a2fd0c2c48e60d3a Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 17 Jul 2014 16:26:37 -0400
Subject: [PATCH 030/130] rm unused files

---
 .../demo/css/jquery.mobile-1.3.2.min.css      |    12 -
 html5/verto/demo/js/jquery-2.0.3.min.js       |     6 -
 html5/verto/demo/js/jquery.dataTables.js      | 12099 ----------------
 .../verto/demo/js/jquery.mobile-1.3.2.min.js  |     9 -
 4 files changed, 12126 deletions(-)
 delete mode 100644 html5/verto/demo/css/jquery.mobile-1.3.2.min.css
 delete mode 100644 html5/verto/demo/js/jquery-2.0.3.min.js
 delete mode 100644 html5/verto/demo/js/jquery.dataTables.js
 delete mode 100644 html5/verto/demo/js/jquery.mobile-1.3.2.min.js

diff --git a/html5/verto/demo/css/jquery.mobile-1.3.2.min.css b/html5/verto/demo/css/jquery.mobile-1.3.2.min.css
deleted file mode 100644
index 0975cbc5b1..0000000000
--- a/html5/verto/demo/css/jquery.mobile-1.3.2.min.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*! jQuery Mobile 1.3.2 | Git HEAD hash: 528cf0e <> 2013-07-19T22:17:57Z | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */
-
-/*!
-* jQuery Mobile 1.3.2
-* Git HEAD hash: 528cf0e96940644ea644096bfeb913ed920ffaef <> Date: Fri Jul 19 2013 22:17:57 UTC
-* http://jquerymobile.com
-*
-* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
-* Released under the MIT license.
-* http://jquery.org/license
-*
-*/.ui-bar-a{border:1px solid #333;background:#111;color:#fff;font-weight:700;text-shadow:0 -1px 0 #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#111));background-image:-webkit-linear-gradient(#3c3c3c,#111);background-image:-moz-linear-gradient(#3c3c3c,#111);background-image:-ms-linear-gradient(#3c3c3c,#111);background-image:-o-linear-gradient(#3c3c3c,#111);background-image:linear-gradient(#3c3c3c,#111)}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a a.ui-link{color:#7cc4e7;font-weight:700}.ui-bar-a a.ui-link:visited{color:#2489ce}.ui-bar-a a.ui-link:hover{color:#2489ce}.ui-bar-a a.ui-link:active{color:#2489ce}.ui-body-a,.ui-overlay-a{border:1px solid #444;background:#222;color:#fff;text-shadow:0 1px 0 #111;font-weight:400;background-image:-webkit-gradient(linear,left top,left bottom,from(#444),to(#222));background-image:-webkit-linear-gradient(#444,#222);background-image:-moz-linear-gradient(#444,#222);background-image:-ms-linear-gradient(#444,#222);background-image:-o-linear-gradient(#444,#222);background-image:linear-gradient(#444,#222)}.ui-overlay-a{background-image:none;border-width:0}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:700}.ui-body-a .ui-link:visited{color:#2489ce}.ui-body-a .ui-link:hover{color:#2489ce}.ui-body-a .ui-link:active{color:#2489ce}.ui-btn-up-a{border:1px solid #111;background:#333;font-weight:700;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from(#444),to(#2d2d2d));background-image:-webkit-linear-gradient(#444,#2d2d2d);background-image:-moz-linear-gradient(#444,#2d2d2d);background-image:-ms-linear-gradient(#444,#2d2d2d);background-image:-o-linear-gradient(#444,#2d2d2d);background-image:linear-gradient(#444,#2d2d2d)}.ui-btn-up-a:visited,.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:700;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#383838));background-image:-webkit-linear-gradient(#555,#383838);background-image:-moz-linear-gradient(#555,#383838);background-image:-ms-linear-gradient(#555,#383838);background-image:-o-linear-gradient(#555,#383838);background-image:linear-gradient(#555,#383838)}.ui-btn-hover-a:visited,.ui-btn-hover-a:hover,.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#222;font-weight:700;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from(#202020),to(#2c2c2c));background-image:-webkit-linear-gradient(#202020,#2c2c2c);background-image:-moz-linear-gradient(#202020,#2c2c2c);background-image:-ms-linear-gradient(#202020,#2c2c2c);background-image:-o-linear-gradient(#202020,#2c2c2c);background-image:linear-gradient(#202020,#2c2c2c)}.ui-btn-down-a:visited,.ui-btn-down-a:hover,.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:700;text-shadow:0 1px 0 #3e6790;background-image:-webkit-gradient(linear,left top,left bottom,from(#6facd5),to(#497bae));background-image:-webkit-linear-gradient(#6facd5,#497bae);background-image:-moz-linear-gradient(#6facd5,#497bae);background-image:-ms-linear-gradient(#6facd5,#497bae);background-image:-o-linear-gradient(#6facd5,#497bae);background-image:linear-gradient(#6facd5,#497bae)}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b a.ui-link{color:#ddf0f8;font-weight:700}.ui-bar-b a.ui-link:visited{color:#ddf0f8}.ui-bar-b a.ui-link:hover{color:#ddf0f8}.ui-bar-b a.ui-link:active{color:#ddf0f8}.ui-body-b,.ui-overlay-b{border:1px solid #999;background:#f3f3f3;color:#222;text-shadow:0 1px 0 #fff;font-weight:400;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#ccc));background-image:-webkit-linear-gradient(#ddd,#ccc);background-image:-moz-linear-gradient(#ddd,#ccc);background-image:-ms-linear-gradient(#ddd,#ccc);background-image:-o-linear-gradient(#ddd,#ccc);background-image:linear-gradient(#ddd,#ccc)}.ui-overlay-b{background-image:none;border-width:0}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:700}.ui-body-b .ui-link:visited{color:#2489ce}.ui-body-b .ui-link:hover{color:#2489ce}.ui-body-b .ui-link:active{color:#2489ce}.ui-btn-up-b{border:1px solid #044062;background:#396b9e;font-weight:700;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from(#5f9cc5),to(#396b9e));background-image:-webkit-linear-gradient(#5f9cc5,#396b9e);background-image:-moz-linear-gradient(#5f9cc5,#396b9e);background-image:-ms-linear-gradient(#5f9cc5,#396b9e);background-image:-o-linear-gradient(#5f9cc5,#396b9e);background-image:linear-gradient(#5f9cc5,#396b9e)}.ui-btn-up-b:visited,.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00415e;background:#4b88b6;font-weight:700;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from(#6facd5),to(#4272a4));background-image:-webkit-linear-gradient(#6facd5,#4272a4);background-image:-moz-linear-gradient(#6facd5,#4272a4);background-image:-ms-linear-gradient(#6facd5,#4272a4);background-image:-o-linear-gradient(#6facd5,#4272a4);background-image:linear-gradient(#6facd5,#4272a4)}.ui-btn-hover-b:visited,.ui-btn-hover-b:hover,.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:700;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from(#295b8e),to(#3e79b5));background-image:-webkit-linear-gradient(#295b8e,#3e79b5);background-image:-moz-linear-gradient(#295b8e,#3e79b5);background-image:-ms-linear-gradient(#295b8e,#3e79b5);background-image:-o-linear-gradient(#295b8e,#3e79b5);background-image:linear-gradient(#295b8e,#3e79b5)}.ui-btn-down-b:visited,.ui-btn-down-b:hover,.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#eee;color:#3e3e3e;font-weight:700;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f0f0f0),to(#ddd));background-image:-webkit-linear-gradient(#f0f0f0,#ddd);background-image:-moz-linear-gradient(#f0f0f0,#ddd);background-image:-ms-linear-gradient(#f0f0f0,#ddd);background-image:-o-linear-gradient(#f0f0f0,#ddd);background-image:linear-gradient(#f0f0f0,#ddd)}.ui-bar-c .ui-link-inherit{color:#3e3e3e}.ui-bar-c a.ui-link{color:#7cc4e7;font-weight:700}.ui-bar-c a.ui-link:visited{color:#2489ce}.ui-bar-c a.ui-link:hover{color:#2489ce}.ui-bar-c a.ui-link:active{color:#2489ce}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c,.ui-overlay-c{border:1px solid #aaa;color:#333;text-shadow:0 1px 0 #fff;background:#f9f9f9;background-image:-webkit-gradient(linear,left top,left bottom,from(#f9f9f9),to(#eee));background-image:-webkit-linear-gradient(#f9f9f9,#eee);background-image:-moz-linear-gradient(#f9f9f9,#eee);background-image:-ms-linear-gradient(#f9f9f9,#eee);background-image:-o-linear-gradient(#f9f9f9,#eee);background-image:linear-gradient(#f9f9f9,#eee)}.ui-overlay-c{background-image:none;border-width:0}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:700}.ui-body-c .ui-link:visited{color:#2489ce}.ui-body-c .ui-link:hover{color:#2489ce}.ui-body-c .ui-link:active{color:#2489ce}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:700;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1)}.ui-btn-up-c:visited,.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dfdfdf;font-weight:700;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f6f6f6),to(#e0e0e0));background-image:-webkit-linear-gradient(#f6f6f6,#e0e0e0);background-image:-moz-linear-gradient(#f6f6f6,#e0e0e0);background-image:-ms-linear-gradient(#f6f6f6,#e0e0e0);background-image:-o-linear-gradient(#f6f6f6,#e0e0e0);background-image:linear-gradient(#f6f6f6,#e0e0e0)}.ui-btn-hover-c:visited,.ui-btn-hover-c:hover,.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #bbb;background:#d6d6d6;font-weight:700;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#d0d0d0),to(#dfdfdf));background-image:-webkit-linear-gradient(#d0d0d0,#dfdfdf);background-image:-moz-linear-gradient(#d0d0d0,#dfdfdf);background-image:-ms-linear-gradient(#d0d0d0,#dfdfdf);background-image:-o-linear-gradient(#d0d0d0,#dfdfdf);background-image:linear-gradient(#d0d0d0,#dfdfdf)}.ui-btn-down-c:visited,.ui-btn-down-c:hover,.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #bbb;background:#bbb;color:#333;font-weight:700;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#bbb));background-image:-webkit-linear-gradient(#ddd,#bbb);background-image:-moz-linear-gradient(#ddd,#bbb);background-image:-ms-linear-gradient(#ddd,#bbb);background-image:-o-linear-gradient(#ddd,#bbb);background-image:linear-gradient(#ddd,#bbb)}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d a.ui-link{color:#2489ce;font-weight:700}.ui-bar-d a.ui-link:visited{color:#2489ce}.ui-bar-d a.ui-link:hover{color:#2489ce}.ui-bar-d a.ui-link:active{color:#2489ce}.ui-body-d,.ui-overlay-d{border:1px solid #bbb;color:#333;text-shadow:0 1px 0 #fff;background:#fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#fff));background-image:-webkit-linear-gradient(#fff,#fff);background-image:-moz-linear-gradient(#fff,#fff);background-image:-ms-linear-gradient(#fff,#fff);background-image:-o-linear-gradient(#fff,#fff);background-image:linear-gradient(#fff,#fff)}.ui-overlay-d{background-image:none;border-width:0}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:700}.ui-body-d .ui-link:visited{color:#2489ce}.ui-body-d .ui-link:hover{color:#2489ce}.ui-body-d .ui-link:active{color:#2489ce}.ui-btn-up-d{border:1px solid #bbb;background:#fff;font-weight:700;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#f6f6f6));background-image:-webkit-linear-gradient(#fafafa,#f6f6f6);background-image:-moz-linear-gradient(#fafafa,#f6f6f6);background-image:-ms-linear-gradient(#fafafa,#f6f6f6);background-image:-o-linear-gradient(#fafafa,#f6f6f6);background-image:linear-gradient(#fafafa,#f6f6f6)}.ui-btn-up-d:visited,.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:700;color:#333;cursor:pointer;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fff));background-image:-webkit-linear-gradient(#eee,#fff);background-image:-moz-linear-gradient(#eee,#fff);background-image:-ms-linear-gradient(#eee,#fff);background-image:-o-linear-gradient(#eee,#fff);background-image:linear-gradient(#eee,#fff)}.ui-btn-hover-d:visited,.ui-btn-hover-d:hover,.ui-btn-hover-d a.ui-link-inherit{color:#333}.ui-btn-down-d{border:1px solid #aaa;background:#eee;font-weight:700;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#e5e5e5),to(#f2f2f2));background-image:-webkit-linear-gradient(#e5e5e5,#f2f2f2);background-image:-moz-linear-gradient(#e5e5e5,#f2f2f2);background-image:-ms-linear-gradient(#e5e5e5,#f2f2f2);background-image:-o-linear-gradient(#e5e5e5,#f2f2f2);background-image:linear-gradient(#e5e5e5,#f2f2f2)}.ui-btn-down-d:visited,.ui-btn-down-d:hover,.ui-btn-down-d a.ui-link-inherit{color:#333}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;font-weight:700;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fbef7e));background-image:-webkit-linear-gradient(#fceda7,#fbef7e);background-image:-moz-linear-gradient(#fceda7,#fbef7e);background-image:-ms-linear-gradient(#fceda7,#fbef7e);background-image:-o-linear-gradient(#fceda7,#fbef7e);background-image:linear-gradient(#fceda7,#fbef7e)}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e a.ui-link{color:#2489ce;font-weight:700}.ui-bar-e a.ui-link:visited{color:#2489ce}.ui-bar-e a.ui-link:hover{color:#2489ce}.ui-bar-e a.ui-link:active{color:#2489ce}.ui-body-e,.ui-overlay-e{border:1px solid #f7c942;color:#222;text-shadow:0 1px 0 #fff;background:#fff9df;background-image:-webkit-gradient(linear,left top,left bottom,from(#fffadf),to(#fff3a5));background-image:-webkit-linear-gradient(#fffadf,#fff3a5);background-image:-moz-linear-gradient(#fffadf,#fff3a5);background-image:-ms-linear-gradient(#fffadf,#fff3a5);background-image:-o-linear-gradient(#fffadf,#fff3a5);background-image:linear-gradient(#fffadf,#fff3a5)}.ui-overlay-e{background-image:none;border-width:0}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#222}.ui-body-e .ui-link{color:#2489ce;font-weight:700}.ui-body-e .ui-link:visited{color:#2489ce}.ui-body-e .ui-link:hover{color:#2489ce}.ui-body-e .ui-link:active{color:#2489ce}.ui-btn-up-e{border:1px solid #f4c63f;background:#fadb4e;font-weight:700;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#ffefaa),to(#ffe155));background-image:-webkit-linear-gradient(#ffefaa,#ffe155);background-image:-moz-linear-gradient(#ffefaa,#ffe155);background-image:-ms-linear-gradient(#ffefaa,#ffe155);background-image:-o-linear-gradient(#ffefaa,#ffe155);background-image:linear-gradient(#ffefaa,#ffe155)}.ui-btn-up-e:visited,.ui-btn-up-e a.ui-link-inherit{color:#222}.ui-btn-hover-e{border:1px solid #f2c43d;background:#fbe26f;font-weight:700;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff5ba),to(#fbdd52));background-image:-webkit-linear-gradient(#fff5ba,#fbdd52);background-image:-moz-linear-gradient(#fff5ba,#fbdd52);background-image:-ms-linear-gradient(#fff5ba,#fbdd52);background-image:-o-linear-gradient(#fff5ba,#fbdd52);background-image:linear-gradient(#fff5ba,#fbdd52)}.ui-btn-hover-e:visited,.ui-btn-hover-e:hover,.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f2c43d;background:#fceda7;font-weight:700;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8d94c),to(#fadb4e));background-image:-webkit-linear-gradient(#f8d94c,#fadb4e);background-image:-moz-linear-gradient(#f8d94c,#fadb4e);background-image:-ms-linear-gradient(#f8d94c,#fadb4e);background-image:-o-linear-gradient(#f8d94c,#fadb4e);background-image:linear-gradient(#f8d94c,#fadb4e)}.ui-btn-down-e:visited,.ui-btn-down-e:hover,.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #2373a5;background:#5393c5;font-weight:700;color:#fff;cursor:pointer;text-shadow:0 1px 0 #3373a5;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#5393c5),to(#6facd5));background-image:-webkit-linear-gradient(#5393c5,#6facd5);background-image:-moz-linear-gradient(#5393c5,#6facd5);background-image:-ms-linear-gradient(#5393c5,#6facd5);background-image:-o-linear-gradient(#5393c5,#6facd5);background-image:linear-gradient(#5393c5,#6facd5);font-family:Helvetica,Arial,sans-serif}.ui-btn-active:visited,.ui-btn-active:hover,.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-all{-webkit-border-radius:.6em;border-radius:.6em}.ui-br{border-color:#828282;border-color:rgba(130,130,130,.3);border-style:solid}.ui-disabled{filter:Alpha(Opacity=30);opacity:.3;zoom:1}.ui-disabled,.ui-disabled a{cursor:default!important;pointer-events:none}.ui-icon,.ui-icon-searchfield:after{background:#666;background:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt .ui-icon,.ui-icon-alt .ui-icon-searchfield:after{background-color:#fff;background-color:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}.ui-icon-nodisc .ui-icon,.ui-icon-nodisc .ui-icon-searchfield:after,.ui-icon-nodisc .ui-icon-alt .ui-icon,.ui-icon-nodisc .ui-icon-alt .ui-icon-searchfield:after{background-color:transparent}.ui-icon-plus{background-position:-1px -1px}.ui-icon-minus{background-position:-37px -1px}.ui-icon-delete{background-position:-73px -1px}.ui-icon-arrow-r{background-position:-108px -1px}.ui-icon-arrow-l{background-position:-144px -1px}.ui-icon-arrow-u{background-position:-180px -1px}.ui-icon-arrow-d{background-position:-216px -1px}.ui-icon-check{background-position:-252px -1px}.ui-icon-gear{background-position:-288px -1px}.ui-icon-refresh{background-position:-323px -1px}.ui-icon-forward{background-position:-360px -1px}.ui-icon-back{background-position:-396px -1px}.ui-icon-grid{background-position:-432px -1px}.ui-icon-star{background-position:-467px -1px}.ui-icon-alert{background-position:-503px -1px}.ui-icon-info{background-position:-539px -1px}.ui-icon-home{background-position:-575px -1px}.ui-icon-search,.ui-icon-searchfield:after{background-position:-611px -1px}.ui-icon-checkbox-on{background-position:-647px -1px}.ui-icon-checkbox-off{background-position:-683px -1px}.ui-icon-radio-on{background-position:-718px -1px}.ui-icon-radio-off{background-position:-754px -1px}.ui-icon-bars{background-position:-788px -1px}.ui-icon-edit{background-position:-824px -1px}@media only screen and (-webkit-min-device-pixel-ratio:1.3),only screen and (min--moz-device-pixel-ratio:1.3),only screen and (min-resolution:200dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-bars,.ui-icon-edit,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:864px 18px;-o-background-size:864px 18px;-webkit-background-size:864px 18px;background-size:864px 18px}.ui-icon-alt .ui-icon{background-image:url(images/icons-36-black.png)}.ui-icon-plus{background-position:0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-179px 50%}.ui-icon-arrow-d{background-position:-215px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-287px 50%}.ui-icon-refresh{background-position:-323px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-395px 50%}.ui-icon-grid{background-position:-431px 50%}.ui-icon-star{background-position:-467px 50%}.ui-icon-alert{background-position:-503px 50%}.ui-icon-info{background-position:-538px 50%}.ui-icon-home{background-position:-575px 50%}.ui-icon-search,.ui-icon-searchfield:after{background-position:-611px 50%}.ui-icon-checkbox-on{background-position:-647px 50%}.ui-icon-checkbox-off{background-position:-683px 50%}.ui-icon-radio-on{background-position:-718px 50%}.ui-icon-radio-off{background-position:-754px 50%}.ui-icon-bars{background-position:-788px 50%}.ui-icon-edit{background-position:-824px 50%}}.ui-checkbox .ui-icon,.ui-selectmenu-list .ui-icon{-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-loading{background:url(images/ajax-loader.gif);background-size:46px 46px}.ui-btn-corner-all{-webkit-border-radius:1em;border-radius:1em}.ui-corner-all,.ui-btn-corner-all{-webkit-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;filter:Alpha(Opacity=50);opacity:.5;position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 3px rgba(0,0,0,.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-btn:focus,.ui-link-inherit:focus{outline:0}.ui-btn.ui-focus{z-index:1}.ui-focus,.ui-btn:focus{-moz-box-shadow:inset 0 0 3px #387bbe,0 0 9px #387bbe;-webkit-box-shadow:inset 0 0 3px #387bbe,0 0 9px #387bbe;box-shadow:inset 0 0 3px #387bbe,0 0 9px #387bbe}.ui-input-text.ui-focus,.ui-input-search.ui-focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus,.ui-mobile-nosupport-boxshadow .ui-btn:focus,.ui-mobile-nosupport-boxshadow .ui-link-inherit:focus{outline-width:1px;outline-style:auto}.ui-mobile,.ui-mobile body{height:99.9%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border-width:0}.ui-mobile fieldset{min-width:0}.ui-mobile-viewport{margin:0;overflow-x:visible;-webkit-text-size-adjust:100%;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}body.ui-mobile-viewport,div.ui-mobile-viewport{overflow-x:hidden}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.ui-page{outline:0}@media screen and (orientation:portrait){.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile .ui-page{min-height:300px}}.ui-loading .ui-loader{display:block}.ui-loader{display:none;z-index:9999999;position:fixed;top:50%;left:50%;border:0}.ui-loader-default{background:0;filter:Alpha(Opacity=18);opacity:.18;width:46px;height:46px;margin-left:-23px;margin-top:-23px}.ui-loader-verbose{width:200px;filter:Alpha(Opacity=88);opacity:.88;box-shadow:0 1px 1px -1px #fff;height:auto;margin-left:-110px;margin-top:-43px;padding:10px}.ui-loader-default h1{font-size:0;width:0;height:0;overflow:hidden}.ui-loader-verbose h1{font-size:16px;margin:0;text-align:center}.ui-loader .ui-icon{background-color:#000;display:block;margin:0;width:44px;height:44px;padding:1px;-webkit-border-radius:36px;border-radius:36px}.ui-loader-verbose .ui-icon{margin:0 auto 10px;filter:Alpha(Opacity=75);opacity:.75}.ui-loader-textonly{padding:15px;margin-left:-115px}.ui-loader-textonly .ui-icon{display:none}.ui-loader-fakefix{position:absolute}.ui-mobile-rendering>*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{position:relative;zoom:1}.ui-mobile .ui-header,.ui-mobile .ui-footer{border-left-width:0;border-right-width:0}.ui-header .ui-btn-left,.ui-header .ui-btn-right,.ui-footer .ui-btn-left,.ui-footer .ui-btn-right,.ui-header-fixed.ui-fixed-hidden .ui-btn-left,.ui-header-fixed.ui-fixed-hidden .ui-btn-right{position:absolute;top:3px}.ui-header-fixed .ui-btn-left,.ui-header-fixed .ui-btn-right{top:4px}.ui-header .ui-btn-left,.ui-footer .ui-btn-left{left:5px}.ui-header .ui-btn-right,.ui-footer .ui-btn-right{right:5px}.ui-footer>.ui-btn-icon-notext,.ui-header>.ui-btn-icon-notext,.ui-header-fixed.ui-fixed-hidden>.ui-btn-icon-notext{top:6px}.ui-header-fixed>.ui-btn-icon-notext{top:7px}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 30% .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:.6em 15px .8em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-corner-all>.ui-header:first-child,.ui-corner-all>.ui-content:first-child,.ui-corner-all>.ui-footer:first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-corner-all>.ui-header:last-child,.ui-corner-all>.ui-content:last-child,.ui-corner-all>.ui-footer:last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-icon{width:18px;height:18px}.ui-nojs{position:absolute;left:-9999px}.ui-hide-label label.ui-input-text,.ui-hide-label label.ui-select,.ui-hide-label label.ui-slider,.ui-hide-label label.ui-submit,.ui-hide-label .ui-controlgroup-label,.ui-hidden-accessible{position:absolute!important;left:-9999px;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-page-pre-in{opacity:0}.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-timing-function:ease-out;animation-duration:350ms}.out{-webkit-animation-timing-function:ease-in;-webkit-animation-duration:225ms;-moz-animation-timing-function:ease-in;-moz-animation-duration:225ms;animation-timing-function:ease-in;animation-duration:225ms}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-moz-keyframes fadein{from{opacity:0}to{opacity:1}}@keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}@-moz-keyframes fadeout{from{opacity:1}to{opacity:0}}@keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{opacity:0;-webkit-animation-duration:125ms;-webkit-animation-name:fadeout;-moz-animation-duration:125ms;-moz-animation-name:fadeout;animation-duration:125ms;animation-name:fadeout}.fade.in{opacity:1;-webkit-animation-duration:225ms;-webkit-animation-name:fadein;-moz-animation-duration:225ms;-moz-animation-name:fadein;animation-duration:225ms;animation-name:fadein}.pop{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%;transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);-webkit-animation-name:popin;-webkit-animation-duration:350ms;-moz-transform:scale(1);-moz-animation-name:popin;-moz-animation-duration:350ms;transform:scale(1);animation-name:popin;animation-duration:350ms;opacity:1}.pop.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms;opacity:0}.pop.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;animation-name:fadein}.pop.out.reverse{-webkit-transform:scale(.8);-webkit-animation-name:popout;-moz-transform:scale(.8);-moz-animation-name:popout;transform:scale(.8);animation-name:popout}@-webkit-keyframes popin{from{-webkit-transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-moz-keyframes popin{from{-moz-transform:scale(.8);opacity:0}to{-moz-transform:scale(1);opacity:1}}@keyframes popin{from{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.8);opacity:0}}@-moz-keyframes popout{from{-moz-transform:scale(1);opacity:1}to{-moz-transform:scale(.8);opacity:0}}@keyframes popout{from{transform:scale(1);opacity:1}to{transform:scale(.8);opacity:0}}@-webkit-keyframes slideinfromright{from{-webkit-transform:translate3d(100%,0,0)}to{-webkit-transform:translate3d(0,0,0)}}@-moz-keyframes slideinfromright{from{-moz-transform:translateX(100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromright{from{transform:translateX(100%)}to{transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translate3d(-100%,0,0)}to{-webkit-transform:translate3d(0,0,0)}}@-moz-keyframes slideinfromleft{from{-moz-transform:translateX(-100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromleft{from{transform:translateX(-100%)}to{transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(-100%,0,0)}}@-moz-keyframes slideouttoleft{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(-100%)}}@keyframes slideouttoleft{from{transform:translateX(0)}to{transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(100%,0,0)}}@-moz-keyframes slideouttoright{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(100%)}}@keyframes slideouttoright{from{transform:translateX(0)}to{transform:translateX(100%)}}.slide.out,.slide.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-timing-function:ease-out;animation-duration:350ms}.slide.out{-webkit-transform:translate3d(-100%,0,0);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;transform:translateX(-100%);animation-name:slideouttoleft}.slide.in{-webkit-transform:translate3d(0,0,0);-webkit-animation-name:slideinfromright;-moz-transform:translateX(0);-moz-animation-name:slideinfromright;transform:translateX(0);animation-name:slideinfromright}.slide.out.reverse{-webkit-transform:translate3d(100%,0,0);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;transform:translateX(100%);animation-name:slideouttoright}.slide.in.reverse{-webkit-transform:translate3d(0,0,0);-webkit-animation-name:slideinfromleft;-moz-transform:translateX(0);-moz-animation-name:slideinfromleft;transform:translateX(0);animation-name:slideinfromleft}.slidefade.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-webkit-animation-duration:225ms;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;-moz-animation-duration:225ms;transform:translateX(-100%);animation-name:slideouttoleft;animation-duration:225ms}.slidefade.in{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidefade.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-webkit-animation-duration:200ms;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;-moz-animation-duration:200ms;transform:translateX(100%);animation-name:slideouttoright;animation-duration:200ms}.slidefade.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidedown.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfromtop;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfromtop;animation-duration:250ms}.slidedown.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slidedown.out.reverse{-webkit-transform:translateY(-100%);-webkit-animation-name:slideouttotop;-webkit-animation-duration:200ms;-moz-transform:translateY(-100%);-moz-animation-name:slideouttotop;-moz-animation-duration:200ms;transform:translateY(-100%);animation-name:slideouttotop;animation-duration:200ms}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfromtop{from{-moz-transform:translateY(-100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfromtop{from{transform:translateY(-100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-moz-keyframes slideouttotop{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(-100%)}}@keyframes slideouttotop{from{transform:translateY(0)}to{transform:translateY(-100%)}}.slideup.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfrombottom;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfrombottom;animation-duration:250ms}.slideup.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slideup.out.reverse{-webkit-transform:translateY(100%);-webkit-animation-name:slideouttobottom;-webkit-animation-duration:200ms;-moz-transform:translateY(100%);-moz-animation-name:slideouttobottom;-moz-animation-duration:200ms;transform:translateY(100%);animation-name:slideouttobottom;animation-duration:200ms}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfrombottom{from{-moz-transform:translateY(100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfrombottom{from{transform:translateY(100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-moz-keyframes slideouttobottom{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(100%)}}@keyframes slideouttobottom{from{transform:translateY(0)}to{transform:translateY(100%)}}.viewport-flip{-webkit-perspective:1000;-moz-perspective:1000;perspective:1000;position:absolute}.flip{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-moz-backface-visibility:hidden;-moz-transform:translateX(0);backface-visibility:hidden;transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:175ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:175ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:175ms}.flip.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:225ms;-moz-animation-name:flipintoright;-moz-animation-duration:225ms;animation-name:flipintoright;animation-duration:225ms}.flip.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.flip.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.viewport-turn{-webkit-perspective:200px;-moz-perspective:200px;-ms-perspective:200px;perspective:200px;position:absolute}.turn{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-webkit-transform-origin:0;-moz-backface-visibility:hidden;-moz-transform:translateX(0);-moz-transform-origin:0;backface-visibility :hidden;transform:translateX(0);transform-origin:0}.turn.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:125ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:125ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:125ms}.turn.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:250ms;-moz-animation-name:flipintoright;-moz-animation-duration:250ms;animation-name:flipintoright;animation-duration:250ms}.turn.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.turn.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.flow{-webkit-transform-origin:50% 30%;-webkit-box-shadow:0 0 20px rgba(0,0,0,.4);-moz-transform-origin:50% 30%;-moz-box-shadow:0 0 20px rgba(0,0,0,.4);transform-origin:50% 30%;box-shadow:0 0 20px rgba(0,0,0,.4)}.ui-dialog.flow{-webkit-transform-origin:none;-webkit-box-shadow:none;-moz-transform-origin:none;-moz-box-shadow:none;transform-origin:none;box-shadow:none}.flow.out{-webkit-transform:translateX(-100%) scale(.7);-webkit-animation-name:flowouttoleft;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(-100%) scale(.7);-moz-animation-name:flowouttoleft;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(-100%) scale(.7);animation-name:flowouttoleft;animation-timing-function:ease;animation-duration:350ms}.flow.in{-webkit-transform:translateX(0) scale(1);-webkit-animation-name:flowinfromright;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(0) scale(1);-moz-animation-name:flowinfromright;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(0) scale(1);animation-name:flowinfromright;animation-timing-function:ease;animation-duration:350ms}.flow.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:flowouttoright;-moz-transform:translateX(100%);-moz-animation-name:flowouttoright;transform:translateX(100%);animation-name:flowouttoright}.flow.in.reverse{-webkit-animation-name:flowinfromleft;-moz-animation-name:flowinfromleft;animation-name:flowinfromleft}@-webkit-keyframes flowouttoleft{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(-100%) scale(.7)}}@-moz-keyframes flowouttoleft{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(-100%) scale(.7)}}@keyframes flowouttoleft{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(-100%) scale(.7)}}@-webkit-keyframes flowouttoright{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(100%) scale(.7)}}@-moz-keyframes flowouttoright{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(100%) scale(.7)}}@keyframes flowouttoright{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(100%) scale(.7)}}@-webkit-keyframes flowinfromleft{0%{-webkit-transform:translateX(-100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromleft{0%{-moz-transform:translateX(-100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromleft{0%{transform:translateX(-100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}@-webkit-keyframes flowinfromright{0%{-webkit-transform:translateX(100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromright{0%{-moz-transform:translateX(100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromright{0%{transform:translateX(100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-grid-solo .ui-block-a{display:block;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:49.95%}.ui-grid-a>:nth-child(n){width:50%;margin-right:-.5px}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.25%}.ui-grid-b>:nth-child(n){width:33.333%;margin-right:-.5px}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:24.925%}.ui-grid-c>:nth-child(n){width:25%;margin-right:-.5px}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:19.925%}.ui-grid-d>:nth-child(n){width:20%}.ui-grid-d .ui-block-a{clear:left}@media all and (max-width:35em){.ui-responsive .ui-block-a,.ui-responsive .ui-block-b,.ui-responsive .ui-block-c,.ui-responsive .ui-block-d,.ui-responsive .ui-block-e{width:100%;float:none}}.ui-header-fixed,.ui-footer-fixed{left:0;right:0;width:100%;position:fixed;z-index:1000}.ui-header-fixed{top:-1px;padding-top:1px}.ui-header-fixed.ui-fixed-hidden{top:0;padding-top:0}.ui-footer-fixed{bottom:-1px;padding-bottom:1px}.ui-footer-fixed.ui-fixed-hidden{bottom:0;padding-bottom:0}.ui-header-fullscreen,.ui-footer-fullscreen{filter:Alpha(Opacity=90);opacity:.9}.ui-page-header-fixed{padding-top:2.6875em}.ui-page-footer-fixed{padding-bottom:2.6875em}.ui-page-header-fullscreen>.ui-content,.ui-page-footer-fullscreen>.ui-content{padding:0}.ui-fixed-hidden{position:absolute}.ui-page-header-fullscreen .ui-fixed-hidden,.ui-page-footer-fullscreen .ui-fixed-hidden{left:-9999px}.ui-header-fixed .ui-btn,.ui-footer-fixed .ui-btn{z-index:10}.ui-android-2x-fixed .ui-li-has-thumb{-webkit-transform:translate3d(0,0,0)}.ui-navbar{max-width:100%}.ui-navbar.ui-mini{margin:0}.ui-navbar ul:before,.ui-navbar ul:after{content:" ";display:table}.ui-navbar ul:after{clear:both}.ui-navbar ul{list-style:none;margin:0;padding:0;position:relative;display:block;border:0;max-width:100%;overflow:visible;zoom:1}.ui-navbar li .ui-btn{display:block;text-align:center;margin:0 -1px 0 0;border-right-width:0}.ui-navbar li .ui-btn-icon-right .ui-icon{right:6px}.ui-navbar li:last-child .ui-btn,.ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:0;border-right-width:1px}.ui-header .ui-navbar li:last-child .ui-btn,.ui-footer .ui-navbar li:last-child .ui-btn,.ui-header .ui-navbar .ui-grid-duo .ui-block-b .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:-1px;border-right-width:0}.ui-navbar .ui-grid-duo li.ui-block-a:last-child .ui-btn{margin-right:-1px;border-right-width:1px}.ui-header .ui-navbar li .ui-btn,.ui-footer .ui-navbar li .ui-btn{border-top-width:0;border-bottom-width:0}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn{margin-right:-5px}.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn{margin-right:-4px}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon{right:8px}.ui-navbar li .ui-btn .ui-btn-inner{padding-top:.7em;padding-bottom:.8em}.ui-navbar li .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-navbar li .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 0;padding:0}.ui-mini{margin-top:.25em;margin-bottom:.25em}.ui-btn-left,.ui-btn-right,.ui-input-clear,.ui-btn-inline,.ui-grid-a .ui-btn,.ui-grid-b .ui-btn,.ui-grid-c .ui-btn,.ui-grid-d .ui-btn,.ui-grid-e .ui-btn,.ui-grid-solo .ui-btn{margin-right:5px;margin-left:5px}.ui-btn-inner{font-size:16px;padding:.6em 20px;min-width:.75em;display:block;position:relative;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;zoom:1}.ui-btn input,.ui-btn button{z-index:2}.ui-btn-left,.ui-btn-right,.ui-btn-inline{display:inline-block;vertical-align:middle}.ui-mobile .ui-btn-left,.ui-mobile .ui-btn-right,.ui-btn-left>.ui-btn,.ui-btn-right>.ui-btn{margin:0}.ui-btn-block{display:block}.ui-header>.ui-btn,.ui-footer>.ui-btn{display:inline-block;margin:0}.ui-header .ui-btn-block,.ui-footer .ui-btn-block{display:block}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-mini .ui-btn-inner{font-size:12.5px;padding:.55em 11px .5em}.ui-fullsize .ui-btn-inner,.ui-fullsize .ui-btn-inner{font-size:16px;padding:.6em 20px}.ui-btn-icon-notext{width:24px;height:24px}.ui-btn-icon-notext .ui-btn-inner{padding:0;height:100%}.ui-btn-icon-notext .ui-btn-inner .ui-icon{margin:2px 1px 2px 3px;float:left}.ui-btn-text{position:relative;z-index:1;width:100%;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}div.ui-btn-text{width:auto}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-9999px}.ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-btn-icon-right .ui-btn-inner{padding-right:40px}.ui-btn-icon-top .ui-btn-inner{padding-top:40px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:40px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-mini .ui-btn-icon-left .ui-btn-inner{padding-left:30px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-mini .ui-btn-icon-right .ui-btn-inner{padding-right:30px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner{padding:30px 3px .5em}.ui-mini.ui-btn-icon-top .ui-btn-inner,.ui-mini .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner{padding:.55em 3px 30px}.ui-mini.ui-btn-icon-bottom .ui-btn-inner,.ui-mini .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn-inner{-webkit-border-radius:inherit;border-radius:inherit}.ui-btn-icon-notext .ui-icon{display:block;z-index:0}.ui-btn-icon-left>.ui-btn-inner>.ui-icon,.ui-btn-icon-right>.ui-btn-inner>.ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-btn-inner .ui-icon,.ui-btn-icon-bottom .ui-btn-inner .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-btn-icon-top .ui-icon{top:10px}.ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-mini.ui-btn-icon-left .ui-icon,.ui-mini .ui-btn-icon-left .ui-icon{left:5px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-mini.ui-btn-icon-right .ui-icon,.ui-mini .ui-btn-icon-right .ui-icon{right:5px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-mini.ui-btn-icon-top .ui-icon,.ui-mini .ui-btn-icon-top .ui-icon{top:5px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-mini.ui-btn-icon-bottom .ui-icon,.ui-mini .ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:none;cursor:pointer;background:#fff;background:rgba(255,255,255,0);filter:Alpha(Opacity=0);opacity:.1;font-size:1px;border:0;text-indent:-9999px}.ui-disabled .ui-btn-hidden{display:none}.ui-disabled{z-index:1}.ui-field-contain .ui-btn.ui-submit{margin:0}label.ui-submit{font-size:16px;line-height:1.4;font-weight:400;margin:0 0 .3em;display:block}@media all and (min-width:28em){.ui-field-contain label.ui-submit{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-btn.ui-submit{width:78%;display:inline-block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-hide-label .ui-btn.ui-submit{width:auto;display:block}}.ui-collapsible-inset{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -15px;padding:0;position:relative}.ui-collapsible-inset .ui-collapsible-heading{margin:0}.ui-collapsible-heading .ui-btn{text-align:left;margin:0;border-left-width:0;border-right-width:0}.ui-collapsible-inset .ui-collapsible-heading .ui-btn{border-right-width:1px;border-left-width:1px}.ui-collapsible-collapsed+.ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:0}.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:1px}.ui-collapsible-heading .ui-btn-inner{padding-left:12px;padding-right:12px}.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner{padding-right:40px}.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner{text-align:center}.ui-collapsible-heading .ui-btn-icon-left.ui-mini .ui-btn-inner{padding-left:30px}.ui-collapsible-heading .ui-btn-icon-right.ui-mini .ui-btn-inner{padding-right:30px}.ui-collapsible-heading .ui-btn span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading .ui-btn span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading .ui-btn span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;top:-9999px;left:0}.ui-collapsible-content{display:block;margin:0 -15px;padding:10px 15px;border-left-width:0;border-right-width:0;border-top:0;background-image:none}.ui-collapsible-inset .ui-collapsible-content{margin:0;border-right-width:1px;border-left-width:1px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set>.ui-collapsible.ui-corner-all{-webkit-border-radius:0;border-radius:0}.ui-collapsible-heading,.ui-collapsible-heading>.ui-btn{-webkit-border-radius:inherit;border-radius:inherit}.ui-collapsible-set .ui-collapsible.ui-first-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-collapsible-content,.ui-collapsible-set .ui-collapsible.ui-last-child{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-collapsible-themed-content:not(.ui-collapsible-collapsed)>.ui-collapsible-heading{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible{margin:-1px 0 0}.ui-collapsible-set .ui-collapsible.ui-first-child{margin-top:0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0;zoom:1}.ui-controlgroup.ui-mini,fieldset.ui-controlgroup.ui-mini{margin:.25em 0}.ui-field-contain .ui-controlgroup,.ui-field-contain fieldset.ui-controlgroup{margin:0}.ui-bar .ui-controlgroup{margin:0 5px}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:400;margin:0 0 .4em}.ui-controlgroup-label legend{max-width:100%}.ui-controlgroup-controls label.ui-select,.ui-controlgroup-controls label.ui-submit{position:absolute;left:-9999px}.ui-controlgroup li{list-style:none}.ui-controlgroup .ui-btn{margin:0}.ui-controlgroup .ui-btn-icon-notext{width:auto;height:auto;top:auto}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:20px;padding:.6em 20px}.ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner{width:18px}.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner,.ui-header .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner,.ui-footer .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:16px;padding:.55em 11px .5em}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;right:50%;margin:-9px -9px 0 0}.ui-controlgroup-horizontal .ui-btn-inner{text-align:center}.ui-controlgroup-horizontal.ui-mini .ui-btn-inner{height:16px;line-height:16px}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}.ui-controlgroup-horizontal .ui-controlgroup-controls:before,.ui-controlgroup-horizontal .ui-controlgroup-controls:after{content:"";display:table}.ui-controlgroup-horizontal .ui-controlgroup-controls:after{clear:both}.ui-controlgroup-horizontal .ui-controlgroup-controls{display:inline-block;vertical-align:middle;zoom:1}.ui-controlgroup-horizontal .ui-controlgroup-controls>.ui-btn,.ui-controlgroup-horizontal .ui-controlgroup-controls li>.ui-btn,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio,.ui-controlgroup-horizontal .ui-select{float:left;clear:none;margin:0}.ui-controlgroup-horizontal .ui-select .ui-btn-text{width:auto}.ui-controlgroup-vertical .ui-btn{border-bottom-width:0}.ui-controlgroup-vertical .ui-btn.ui-last-child{border-bottom-width:1px}.ui-controlgroup-horizontal .ui-btn{border-right-width:0}.ui-controlgroup-horizontal .ui-btn.ui-last-child{border-right-width:1px}.ui-controlgroup .ui-btn-corner-all{-webkit-border-radius:0;border-radius:0}.ui-controlgroup .ui-controlgroup-controls,.ui-controlgroup .ui-radio,.ui-controlgroup .ui-checkbox,.ui-controlgroup .ui-select,.ui-controlgroup li{-webkit-border-radius:inherit;border-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-last-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup .ui-shadow:not(.ui-focus){-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}@media all and (min-width:28em){.ui-field-contain .ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-controlgroup-controls{width:78%;display:inline-block}.ui-field-contain .ui-controlgroup .ui-select{width:100%;display:block}.ui-field-contain .ui-controlgroup-horizontal .ui-select{width:auto}.ui-hide-label .ui-controlgroup-controls{width:100%}}.ui-dialog{background:none!important}.ui-dialog-contain{width:92.5%;max-width:500px;margin:10% auto 15px;padding:0;position:relative;top:-15px}.ui-dialog-contain>.ui-header,.ui-dialog-contain>.ui-content,.ui-dialog-contain>.ui-footer{display:block;position:relative;width:auto;margin:0}.ui-dialog-contain>.ui-header{border:0;overflow:hidden;z-index:10;padding:0}.ui-dialog-contain>.ui-content{padding:15px}.ui-dialog-contain>.ui-footer{z-index:10;padding:0 15px}.ui-popup-open .ui-header-fixed,.ui-popup-open .ui-footer-fixed{position:absolute!important}.ui-popup-screen{background-image:url(data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==);top:0;left:0;right:0;bottom:1px;position:absolute;filter:Alpha(Opacity=0);opacity:0;z-index:1099}.ui-popup-screen.in{opacity:.5;filter:Alpha(Opacity=50)}.ui-popup-screen.out{opacity:0;filter:Alpha(Opacity=0)}.ui-popup-container{z-index:1100;display:inline-block;position:absolute;padding:0;outline:0}.ui-popup{position:relative}.ui-popup.ui-content,.ui-popup .ui-content{overflow:visible}.ui-popup>p,.ui-popup>h1,.ui-popup>h2,.ui-popup>h3,.ui-popup>h4,.ui-popup>h5,.ui-popup>h6{margin:.5em 7px}.ui-popup>span{display:block;margin:.5em 7px}.ui-popup .ui-title{font-size:16px;font-weight:700;margin-top:.5em;margin-bottom:.5em}.ui-popup-container .ui-content>p,.ui-popup-container .ui-content>h1,.ui-popup-container .ui-content>h2,.ui-popup-container .ui-content>h3,.ui-popup-container .ui-content>h4,.ui-popup-container .ui-content>h5,.ui-popup-container .ui-content>h6{margin:.5em 0}.ui-popup-container .ui-content>span{margin:0}.ui-popup-container .ui-content>p:first-child,.ui-popup-container .ui-content>h1:first-child,.ui-popup-container .ui-content>h2:first-child,.ui-popup-container .ui-content>h3:first-child,.ui-popup-container .ui-content>h4:first-child,.ui-popup-container .ui-content>h5:first-child,.ui-popup-container .ui-content>h6:first-child{margin-top:0}.ui-popup-container .ui-content>p:last-child,.ui-popup-container .ui-content>h1:last-child,.ui-popup-container .ui-content>h2:last-child,.ui-popup-container .ui-content>h3:last-child,.ui-popup-container .ui-content>h4:last-child,.ui-popup-container .ui-content>h5:last-child,.ui-popup-container .ui-content>h6:last-child{margin-bottom:0}.ui-popup>img{width:auto;height:auto;max-width:100%;max-height:100%;vertical-align:middle}.ui-popup:not(.ui-content)>img:only-child,.ui-popup:not(.ui-content)>.ui-btn-left:first-child+img:last-child,.ui-popup:not(.ui-content)>.ui-btn-right:first-child+img:last-child{-webkit-border-radius:inherit;border-radius:inherit}.ui-popup iframe{vertical-align:middle}@media all and (min-width:28em){.ui-popup .ui-field-contain label.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-label,.ui-popup .ui-field-contain label.ui-select,.ui-popup .ui-field-contain label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:400;margin:0 0 .3em}.ui-popup .ui-field-contain .ui-btn.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-controls,.ui-popup .ui-field-contain .ui-select,.ui-popup .ui-field-contain input.ui-input-text,.ui-popup .ui-field-contain textarea.ui-input-text,.ui-popup .ui-field-contain .ui-input-search{width:100%;display:block}}.ui-popup>.ui-btn-left,.ui-popup>.ui-btn-right{position:absolute;top:-9px;margin:0;z-index:1101}.ui-popup>.ui-btn-left{left:-9px}.ui-popup>.ui-btn-right{right:-9px}.ui-popup-hidden{top:-99999px;left:-9999px;visibility:hidden}.ui-checkbox,.ui-radio{position:relative;clear:both;margin:0;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{text-align:left;z-index:2}.ui-controlgroup .ui-checkbox .ui-btn,.ui-controlgroup .ui-radio .ui-btn{margin:0}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-left .ui-btn-inner{padding-left:36px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:36px}.ui-checkbox .ui-btn-icon-top .ui-btn-inner,.ui-radio .ui-btn-icon-top .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-btn-icon-bottom .ui-btn-inner,.ui-radio .ui-btn-icon-bottom .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon,.ui-radio .ui-mini.ui-btn-icon-left .ui-icon{left:9px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-checkbox .ui-btn-icon-top .ui-icon,.ui-radio .ui-btn-icon-top .ui-icon{top:10px}.ui-checkbox .ui-btn-icon-bottom .ui-icon,.ui-radio .ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-controlgroup-horizontal .ui-checkbox .ui-icon,.ui-controlgroup-horizontal .ui-radio .ui-icon{display:none}.ui-controlgroup-horizontal .ui-checkbox .ui-btn-inner,.ui-controlgroup-horizontal .ui-radio .ui-btn-inner{padding:.6em 20px}.ui-controlgroup-horizontal .ui-checkbox .ui-mini .ui-btn-inner,.ui-controlgroup-horizontal .ui-radio .ui-mini .ui-btn-inner{padding:.55em 11px .5em}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain,fieldset.ui-field-contain{padding:.8em 0;margin:0;border-width:0 0 1px;overflow:visible}.ui-field-contain:last-child{border-bottom-width:0}.ui-field-contain{max-width:100%}@media all and (min-width:28em){.ui-field-contain,.ui-mobile fieldset.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{opacity:1}.ui-field-contain .ui-select .ui-btn{margin:0}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:none;left:0;top:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;filter:Alpha(Opacity=0);opacity:0;z-index:2}.ui-select .ui-disabled{opacity:.3}.ui-select .ui-disabled select{display:none}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn.ui-select-nativeonly{border-radius:0;border:0}.ui-select .ui-btn.ui-select-nativeonly select{opacity:1;text-indent:0;display:block}.ui-select .ui-disabled.ui-select-nativeonly .ui-btn-inner{opacity:0}.ui-select .ui-btn-icon-right .ui-btn-inner,.ui-select .ui-li-has-count .ui-btn-inner{padding-right:45px}.ui-select .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:32px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:80px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:67px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}.ui-select .ui-mini.ui-btn-icon-right .ui-icon{right:7px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-li-count{right:45px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-li-count{right:32px}label.ui-select{font-size:16px;line-height:1.4;font-weight:400;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em;overflow:hidden!important}.ui-select .ui-btn-text{text-overflow:ellipsis}.ui-selectmenu{padding:6px;min-width:160px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header{margin:0;padding:0}.ui-selectmenu.ui-popup .ui-header{-webkit-border-top-left-radius:0;border-top-left-radius:0;-webkit-border-top-right-radius:0;border-top-right-radius:0}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:28em){.ui-field-contain label.ui-select{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-select{width:78%;display:inline-block}.ui-hide-label .ui-select{width:100%}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:400;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;margin:.5em 0;min-height:1.4em;line-height:1.4em;font-size:16px;display:block;width:100%;outline:0}input.ui-mini,.ui-mini input,textarea.ui-mini{font-size:14px}div.ui-input-text input.ui-input-text,div.ui-input-text textarea.ui-input-text,.ui-input-search input.ui-input-text{border:0;width:100%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search,div.ui-input-text{margin:.5em 0;background-image:none;position:relative}.ui-input-search{padding:0 30px}div.ui-input-text{padding:0 .4em}div.ui-input-has-clear{padding:0 30px 0 .4em}input.ui-input-text.ui-mini,textarea.ui-input-text.ui-mini,.ui-input-search.ui-mini,div.ui-input-text.ui-mini{margin:.25em 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{margin:0}textarea.ui-input-text{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}textarea.ui-mini{height:45px}.ui-icon-searchfield:after{position:absolute;left:7px;top:50%;margin-top:-9px;content:"";width:18px;height:18px;opacity:.5}.ui-input-search .ui-input-clear,.ui-input-text .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-13px}.ui-mini .ui-input-clear{right:-3px}.ui-input-search .ui-input-clear-hidden,.ui-input-text .ui-input-clear-hidden{display:none}input::-moz-placeholder,textarea::-moz-placeholder{color:#aaa}:-ms-input-placeholder{color:#aaa}input[type=number]::-webkit-outer-spin-button{margin:0}@media all and (min-width:28em){.ui-field-contain label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{width:78%;display:inline-block}.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-hide-label input.ui-input-text,.ui-hide-label textarea.ui-input-text,.ui-hide-label .ui-input-search,.ui-hide-label div.ui-input-text,.ui-input-search input.ui-input-text,div.ui-input-text input.ui-input-text{width:100%}}.ui-rangeslider{zoom:1;margin:0}.ui-rangeslider:before,.ui-rangeslider:after{content:"";display:table}.ui-rangeslider:after{clear:both}.ui-rangeslider input.ui-input-text.ui-slider-input{margin:.57143em 0}.ui-rangeslider.ui-mini input.ui-slider-input{margin:.28571em 0}.ui-rangeslider input.ui-slider-input.ui-rangeslider-last{float:right}.ui-rangeslider .ui-rangeslider-sliders{position:relative;overflow:visible;height:30px;margin:.5em 68px}.ui-rangeslider.ui-mini .ui-rangeslider-sliders{margin:.25em 68px}.ui-field-contain .ui-rangeslider input.ui-slider-input,.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input,.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders{margin-top:0;margin-bottom:0}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track{position:absolute;top:6px;right:0;left:0;margin:0}.ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track{top:8px}.ui-rangeslider .ui-slider-track:first-child .ui-slider-bg{display:none}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child{background-color:transparent;background:0;border-width:0;height:0}html >body .ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child{height:15px;border-width:1px}html >body .ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track:first-child{height:12px}@media all and (min-width:28em){.ui-field-contain .ui-rangeslider label.ui-slider{float:left}.ui-field-contain .ui-rangeslider input.ui-slider-input{position:relative;z-index:1}.ui-field-contain .ui-rangeslider input.ui-slider-input.ui-rangeslider-first,.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input.ui-rangeslider-first{margin-right:17px}.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders{float:left;width:78%;margin:0 -68px}.ui-field-contain .ui-rangeslider .ui-slider-track,.ui-field-contain .ui-rangeslider.ui-mini .ui-slider-track{right:68px;left:68px}.ui-field-contain.ui-hide-label .ui-rangeslider input.ui-slider-input.ui-rangeslider-first{margin:0}.ui-field-contain.ui-hide-label .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-rangeslider-sliders{width:auto;float:none;margin:0 68px}.ui-field-contain.ui-hide-label .ui-rangeslider .ui-slider-track,.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-slider-track{right:0;left:0}}.ui-listview{margin:0}ol.ui-listview,ol.ui-listview .ui-li-divider{counter-reset:listnumbering}.ui-content .ui-listview,.ui-panel-inner>.ui-listview{margin:-15px}.ui-collapsible-content>.ui-listview{margin:-10px -15px}.ui-content .ui-listview-inset,.ui-panel-inner .ui-listview-inset{margin:1em 0}.ui-collapsible-content .ui-listview-inset{margin:.5em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li.ui-btn,.ui-li.ui-field-contain,.ui-li-divider,.ui-li-static{margin:0}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li.ui-last-child,.ui-li.ui-field-contain.ui-last-child{border-bottom-width:1px}.ui-collapsible-content>.ui-listview:not(.ui-listview-inset)>.ui-li.ui-first-child{border-top-width:0}.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset)>.ui-li.ui-last-child{border-bottom-width:0}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-static{background-image:none}.ui-li-divider{padding:.5em 15px;font-size:14px;font-weight:700}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:400;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview .ui-li>.ui-btn-text{-webkit-border-radius:inherit;border-radius:inherit}.ui-listview>.ui-li.ui-first-child,.ui-listview .ui-btn.ui-first-child>.ui-li>.ui-btn-text>.ui-link-inherit{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview>.ui-li.ui-last-child,.ui-listview .ui-btn.ui-last-child>.ui-li>.ui-btn-text>.ui-link-inherit,.ui-collapsible-content>.ui-listview:not(.ui-listview-inset),.ui-collapsible-content>.ui-listview:not(.ui-listview-inset) .ui-li.ui-last-child{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-listview>.ui-li.ui-first-child .ui-li-link-alt{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-listview>.ui-li.ui-last-child .ui-li-link-alt{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-listview>.ui-li.ui-first-child .ui-li-thumb:not(.ui-li-icon){-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview>.ui-li.ui-last-child .ui-li-thumb:not(.ui-li-icon){-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:59px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-count,.ui-li-divider.ui-li-has-count{padding-right:45px}.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow{padding-right:40px}.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow.ui-li-has-count{padding-right:75px}.ui-li-heading{font-size:16px;font-weight:700;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:400;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}ol.ui-listview>.ui-li .ui-li-heading{display:inline-block;width:100%;margin-left:-1.3em;text-indent:1.3em;vertical-align:middle}ol.ui-listview>.ui-li .ui-li-desc:not(.ui-li-aside){text-indent:1.55em}.ui-li-thumb,.ui-listview .ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-listview .ui-li-icon{max-height:16px;max-width:16px;left:10px;top:.9em}.ui-li-thumb,.ui-listview .ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:53px}.ui-li-has-alt.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt.ui-li-has-count{padding-right:88px}.ui-li-has-count .ui-li-count{position:absolute;font-size:11px;font-weight:700;padding:.2em .5em;top:50%;margin-top:-.9em;right:10px}.ui-li-has-count.ui-li-divider .ui-li-count,.ui-li-has-count .ui-link-inherit .ui-li-count{margin-top:-.95em}.ui-li-has-arrow.ui-li-has-count .ui-li-count{right:40px}.ui-li-has-alt.ui-li-has-count .ui-li-count{right:53px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-13px 0 0 0;border-bottom-width:1px;z-index:-1}.ui-li-link-alt .ui-btn-inner{padding:0;height:100%;position:absolute;width:100%;top:0;left:0}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-li-link-alt .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-listview * .ui-btn-inner>.ui-btn>.ui-btn-inner{border-top:0}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-collapsible-content .ui-listview-filter{margin:-10px -15px 10px -15px;border-bottom:inherit}.ui-listview-filter-inset{margin:-15px -5px;background:transparent}.ui-collapsible-content .ui-listview-filter-inset{margin:-5px;border-bottom-width:0}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{font-size:16px;line-height:1.4;font-weight:400;margin:0;display:block}.ui-field-contain label.ui-slider{margin-bottom:.4em}div.ui-slider{height:30px;margin:.5em 0;zoom:1}div.ui-slider.ui-mini{margin:.25em 0}.ui-field-contain div.ui-slider,.ui-field-contain div.ui-slider.ui-mini{margin:0}div.ui-slider:before,div.ui-slider:after{content:"";display:table}div.ui-slider:after{clear:both}input.ui-input-text.ui-slider-input{display:block;float:left;margin:0;padding:4px;width:40px;height:22px;line-height:22px;font-size:14px;border-width:0;background-image:none;font-weight:700;text-align:center;vertical-align:text-bottom;outline:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;-ms-box-sizing:content-box;box-sizing:content-box}.ui-slider-input::-webkit-outer-spin-button,.ui-slider-input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.ui-slider-track,.ui-slider-switch{position:relative;overflow:visible;height:15px;margin:0 15px 0 68px;top:6px}.ui-slider-track.ui-mini{height:12px;top:8px}.ui-slider-bg{border:0;height:100%}.ui-slider-track .ui-btn.ui-slider-handle,.ui-slider-switch .ui-btn.ui-slider-handle{position:absolute;z-index:1;top:50%;width:28px;height:28px;margin:-15px 0 0 -15px;outline:0}.ui-slider-track.ui-mini .ui-slider-handle{height:14px;width:14px;margin:-8px 0 0 -7px}.ui-slider-handle .ui-btn-inner{padding:0;height:100%}.ui-slider-track.ui-mini .ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:-9px 0 0 -9px;border-top:0}select.ui-slider-switch{display:none}div.ui-slider-switch{display:inline-block;height:32px;width:5.8em;margin:.5em 0;top:0}div.ui-slider-switch:before,div.ui-slider-switch:after{display:none;clear:none}div.ui-slider-switch.ui-mini{width:5em;height:29px;margin:.25em 0;top:0}.ui-field-contain .ui-slider-switch,.ui-field-contain .ui-slider-switch.ui-mini{margin:0}.ui-slider-inneroffset{margin:0 16px;position:relative;z-index:1}.ui-slider-switch.ui-mini .ui-slider-inneroffset{margin:0 15px 0 14px}.ui-slider-switch .ui-btn.ui-slider-handle{margin:1px 0 0 -15px}.ui-slider-switch.ui-mini .ui-slider-handle{width:25px;height:25px;margin:1px 0 0 -13px;padding:0}.ui-slider-handle-snapping{-webkit-transition:left 70ms linear;-moz-transition:left 70ms linear}.ui-slider-switch.ui-mini .ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:0;border-top:0}.ui-slider-switch .ui-slider-label{position:absolute;text-align:center;width:100%;overflow:hidden;font-size:16px;top:0;line-height:2;min-height:100%;border-width:0;white-space:nowrap;cursor:pointer}.ui-slider-switch.ui-mini .ui-slider-label{font-size:14px}.ui-slider-switch .ui-slider-label-a{z-index:1;left:0;text-indent:-1.5em}.ui-slider-switch .ui-slider-label-b{z-index:0;right:0;text-indent:1.5em}@media all and (min-width:28em){.ui-field-contain label.ui-slider{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain div.ui-slider{display:inline-block;width:78%}.ui-field-contain.ui-hide-label div.ui-slider{display:block;width:auto}.ui-field-contain div.ui-slider-switch,.ui-field-contain.ui-hide-label div.ui-slider-switch{display:inline-block;width:5.8em}.ui-field-contain div.ui-slider-switch.ui-mini{width:5em}}.ui-table{border:0;border-collapse:collapse;padding:0;width:100%}.ui-table th,.ui-table td{line-height:1.5em;text-align:left;padding:.4em .5em;vertical-align:top}.ui-table th .ui-btn,.ui-table td .ui-btn{line-height:normal}.ui-table th{font-weight:700}.ui-table caption{text-align:left;margin-bottom:1.4em;opacity:.5}.table-stroke thead th{border-bottom:1px solid #d6d6d6;border-bottom:1px solid rgba(0,0,0,.1)}.table-stroke tbody th,.table-stroke tbody td{border-bottom:1px solid #e6e6e6;border-bottom:1px solid rgba(0,0,0,.05)}.table-stripe tbody tr:nth-child(odd) td,.table-stripe tbody tr:nth-child(odd) th{background-color:#eee;background-color:rgba(0,0,0,.04)}.table-stripe thead th,.table-stripe tbody tr:last-child{border-bottom:1px solid #d6d6d6;border-bottom:1px solid rgba(0,0,0,.1)}.ui-table-columntoggle-btn{float:right;margin-bottom:.8em}.ui-table-columntoggle-popup fieldset{margin:0}@media only all{th.ui-table-priority-6,td.ui-table-priority-6,th.ui-table-priority-5,td.ui-table-priority-5,th.ui-table-priority-4,td.ui-table-priority-4,th.ui-table-priority-3,td.ui-table-priority-3,th.ui-table-priority-2,td.ui-table-priority-2,th.ui-table-priority-1,td.ui-table-priority-1{display:none}}@media screen and (min-width:20em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-1,.ui-table-columntoggle.ui-responsive td.ui-table-priority-1{display:table-cell}}@media screen and (min-width:30em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-2,.ui-table-columntoggle.ui-responsive td.ui-table-priority-2{display:table-cell}}@media screen and (min-width:40em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-3,.ui-table-columntoggle.ui-responsive td.ui-table-priority-3{display:table-cell}}@media screen and (min-width:50em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-4,.ui-table-columntoggle.ui-responsive td.ui-table-priority-4{display:table-cell}}@media screen and (min-width:60em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-5,.ui-table-columntoggle.ui-responsive td.ui-table-priority-5{display:table-cell}}@media screen and (min-width:70em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-6,.ui-table-columntoggle.ui-responsive td.ui-table-priority-6{display:table-cell}}.ui-table-columntoggle th.ui-table-cell-hidden,.ui-table-columntoggle td.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive th.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive td.ui-table-cell-hidden{display:none}.ui-table-columntoggle th.ui-table-cell-visible,.ui-table-columntoggle td.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive th.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive td.ui-table-cell-visible{display:table-cell}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{display:none}@media only all{.ui-table-reflow thead td,.ui-table-reflow thead th{display:none}.ui-table-reflow td,.ui-table-reflow th{text-align:left;display:block}.ui-table-reflow tbody th{margin-top:3em}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{padding:.4em;min-width:30%;display:inline-block;margin:-.4em 1em -.4em -.4em}.ui-table-reflow th .ui-table-cell-label-top,.ui-table-reflow td .ui-table-cell-label-top{display:block;padding:.4em 0;margin:.4em 0;text-transform:uppercase;font-size:.9em;font-weight:400}}@media (min-width:35em){.ui-table-reflow.ui-responsive{display:table-row-group}.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th,.ui-table-reflow.ui-responsive tbody th,.ui-table-reflow.ui-responsive tbody td,.ui-table-reflow.ui-responsive thead td,.ui-table-reflow.ui-responsive thead th{display:table-cell;margin:0}.ui-table-reflow.ui-responsive td .ui-table-cell-label,.ui-table-reflow.ui-responsive th .ui-table-cell-label{display:none}}@media (max-width:35em){.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;clear:left}}.ui-panel{width:17em;min-height:100%;max-height:none;border-width:0;position:absolute;top:0;display:block}.ui-panel-closed{width:0;max-height:100%;overflow:hidden;visibility:hidden}.ui-panel-fixed{position:fixed;bottom:-1px;padding-bottom:1px}.ui-panel-display-overlay{z-index:1001}.ui-panel-display-reveal{z-index:0}.ui-panel-display-push{z-index:999}.ui-panel-inner{padding:15px}.ui-panel-content-wrap{position:relative;left:0;min-height:inherit;border:0;z-index:999}.ui-panel-content-wrap-display-overlay,.ui-panel-animate.ui-panel-content-wrap>.ui-header,.ui-panel-content-wrap-closed{position:static}.ui-panel-dismiss{position:absolute;top:0;left:0;height:100%;width:100%;z-index:1002;display:none}.ui-panel-dismiss-open{display:block}.ui-panel-animate{-webkit-transition:-webkit-transform 350ms ease;-moz-transition:-moz-transform 350ms ease;transition:transform 350ms ease}.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal),.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal)>div,.ui-panel-animate.ui-panel-closed.ui-panel-display-reveal>div,.ui-panel-animate.ui-panel-content-wrap,.ui-panel-animate.ui-panel-content-fixed-toolbar{-webkit-backface-visibility:hidden;-webkit-transform:translate3d(0,0,0)}.ui-panel-position-left{left:-17em}.ui-panel-animate.ui-panel-position-left.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-left.ui-panel-display-push{left:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-position-left.ui-panel-display-reveal,.ui-panel-position-left.ui-panel-open{left:0}.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-moz-transform:none}.ui-panel-position-right{right:-17em}.ui-panel-animate.ui-panel-position-right.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-right.ui-panel-display-push{right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-position-right.ui-panel-display-reveal,.ui-panel-position-right.ui-panel-open{right:0}.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-moz-transform:none}.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open,.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,.ui-panel-dismiss-position-left.ui-panel-dismiss-open{left:17em;right:-17em}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal,.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal,.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push{left:0;right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open,.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open,.ui-panel-dismiss-position-right.ui-panel-dismiss-open{left:-17em;right:17em}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal,.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal,.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push{left:0;right:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-overlay,.ui-panel-content-wrap-open.ui-panel-content-wrap-display-overlay{left:0}.ui-page-active.ui-page-panel{overflow-x:hidden}.ui-panel-display-reveal{-webkit-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);box-shadow:inset -5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-reveal{-webkit-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);box-shadow:inset 5px 0 5px rgba(0,0,0,.15)}.ui-panel-display-overlay{-webkit-box-shadow:5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:5px 0 5px rgba(0,0,0,.15);box-shadow:5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-overlay{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15)}.ui-panel-display-push.ui-panel-open.ui-panel-position-left{border-right-width:1px;margin-right:-1px}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push{margin-left:1px}.ui-panel-display-push.ui-panel-open.ui-panel-position-right{border-left-width:1px;margin-left:-1px}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push{margin-right:1px}@media (min-width:55em){.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-left{margin-right:17em}.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right{margin-left:17em}.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal{width:auto}.ui-responsive-panel .ui-panel-dismiss-display-push{display:none}}
\ No newline at end of file
diff --git a/html5/verto/demo/js/jquery-2.0.3.min.js b/html5/verto/demo/js/jquery-2.0.3.min.js
deleted file mode 100644
index e1e3d3a87b..0000000000
--- a/html5/verto/demo/js/jquery-2.0.3.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery v2.0.3 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-//# sourceMappingURL=jquery-2.0.3.min.map
-*/
-(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t)
-};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|&#?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ct={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1></$2>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1></$2>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(xt[0].contentWindow||xt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=Mt(e,t),xt.detach()),Nt[e]=n),n}function Mt(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,t){x.cssHooks[t]={get:function(e,n,r){return n?0===e.offsetWidth&&bt.test(x.css(e,"display"))?x.swap(e,Et,function(){return Pt(e,t,r)}):Pt(e,t,r):undefined},set:function(e,n,r){var i=r&&qt(e);return Ot(e,n,r?Ft(e,t,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,t){return t?x.swap(e,{display:"inline-block"},vt,[e,"marginRight"]):undefined}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,t){x.cssHooks[t]={get:function(e,n){return n?(n=vt(e,t),Ct.test(n)?x(e).position()[t]+"px":n):undefined}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+jt[r]+t]=o[r]||o[r-2]||o[0];return i}},wt.test(e)||(x.cssHooks[e+t].set=Ot)});var Wt=/%20/g,$t=/\[\]$/,Bt=/\r?\n/g,It=/^(?:submit|button|image|reset|file)$/i,zt=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&zt.test(this.nodeName)&&!It.test(e)&&(this.checked||!ot.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(Bt,"\r\n")}}):{name:t.name,value:n.replace(Bt,"\r\n")}}).get()}}),x.param=function(e,t){var n,r=[],i=function(e,t){t=x.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(t===undefined&&(t=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){i(this.name,this.value)});else for(n in e)_t(n,e[n],t,i);return r.join("&").replace(Wt,"+")};function _t(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||$t.test(e)?r(e,i):_t(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)_t(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)
-},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var Xt,Ut,Yt=x.now(),Vt=/\?/,Gt=/#.*$/,Jt=/([?&])_=[^&]*/,Qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Kt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Zt=/^(?:GET|HEAD)$/,en=/^\/\//,tn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,nn=x.fn.load,rn={},on={},sn="*/".concat("*");try{Ut=i.href}catch(an){Ut=o.createElement("a"),Ut.href="",Ut=Ut.href}Xt=tn.exec(Ut.toLowerCase())||[];function un(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function ln(e,t,n,r){var i={},o=e===on;function s(a){var u;return i[a]=!0,x.each(e[a]||[],function(e,a){var l=a(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):undefined:(t.dataTypes.unshift(l),s(l),!1)}),u}return s(t.dataTypes[0])||!i["*"]&&s("*")}function cn(e,t){var n,r,i=x.ajaxSettings.flatOptions||{};for(n in t)t[n]!==undefined&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,t,n){if("string"!=typeof e&&nn)return nn.apply(this,arguments);var r,i,o,s=this,a=e.indexOf(" ");return a>=0&&(r=e.slice(a),e=e.slice(0,a)),x.isFunction(t)?(n=t,t=undefined):t&&"object"==typeof t&&(i="POST"),s.length>0&&x.ajax({url:e,type:i,dataType:"html",data:t}).done(function(e){o=arguments,s.html(r?x("<div>").append(x.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){s.each(n,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ut,type:"GET",isLocal:Kt.test(Xt[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":sn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?cn(cn(e,x.ajaxSettings),t):cn(x.ajaxSettings,e)},ajaxPrefilter:un(rn),ajaxTransport:un(on),ajax:function(e,t){"object"==typeof e&&(t=e,e=undefined),t=t||{};var n,r,i,o,s,a,u,l,c=x.ajaxSetup({},t),p=c.context||c,f=c.context&&(p.nodeType||p.jquery)?x(p):x.event,h=x.Deferred(),d=x.Callbacks("once memory"),g=c.statusCode||{},m={},y={},v=0,b="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===v){if(!o){o={};while(t=Qt.exec(i))o[t[1].toLowerCase()]=t[2]}t=o[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===v?i:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return v||(e=y[n]=y[n]||e,m[e]=t),this},overrideMimeType:function(e){return v||(c.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>v)for(t in e)g[t]=[g[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||b;return n&&n.abort(t),k(0,t),this}};if(h.promise(T).complete=d.add,T.success=T.done,T.error=T.fail,c.url=((e||c.url||Ut)+"").replace(Gt,"").replace(en,Xt[1]+"//"),c.type=t.method||t.type||c.method||c.type,c.dataTypes=x.trim(c.dataType||"*").toLowerCase().match(w)||[""],null==c.crossDomain&&(a=tn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===Xt[1]&&a[2]===Xt[2]&&(a[3]||("http:"===a[1]?"80":"443"))===(Xt[3]||("http:"===Xt[1]?"80":"443")))),c.data&&c.processData&&"string"!=typeof c.data&&(c.data=x.param(c.data,c.traditional)),ln(rn,c,t,T),2===v)return T;u=c.global,u&&0===x.active++&&x.event.trigger("ajaxStart"),c.type=c.type.toUpperCase(),c.hasContent=!Zt.test(c.type),r=c.url,c.hasContent||(c.data&&(r=c.url+=(Vt.test(r)?"&":"?")+c.data,delete c.data),c.cache===!1&&(c.url=Jt.test(r)?r.replace(Jt,"$1_="+Yt++):r+(Vt.test(r)?"&":"?")+"_="+Yt++)),c.ifModified&&(x.lastModified[r]&&T.setRequestHeader("If-Modified-Since",x.lastModified[r]),x.etag[r]&&T.setRequestHeader("If-None-Match",x.etag[r])),(c.data&&c.hasContent&&c.contentType!==!1||t.contentType)&&T.setRequestHeader("Content-Type",c.contentType),T.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+("*"!==c.dataTypes[0]?", "+sn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)T.setRequestHeader(l,c.headers[l]);if(c.beforeSend&&(c.beforeSend.call(p,T,c)===!1||2===v))return T.abort();b="abort";for(l in{success:1,error:1,complete:1})T[l](c[l]);if(n=ln(on,c,t,T)){T.readyState=1,u&&f.trigger("ajaxSend",[T,c]),c.async&&c.timeout>0&&(s=setTimeout(function(){T.abort("timeout")},c.timeout));try{v=1,n.send(m,k)}catch(C){if(!(2>v))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,t,o,a){var l,m,y,b,w,C=t;2!==v&&(v=2,s&&clearTimeout(s),n=undefined,i=a||"",T.readyState=e>0?4:0,l=e>=200&&300>e||304===e,o&&(b=pn(c,T,o)),b=fn(c,b,T,l),l?(c.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(x.lastModified[r]=w),w=T.getResponseHeader("etag"),w&&(x.etag[r]=w)),204===e||"HEAD"===c.type?C="nocontent":304===e?C="notmodified":(C=b.state,m=b.data,y=b.error,l=!y)):(y=C,(e||!C)&&(C="error",0>e&&(e=0))),T.status=e,T.statusText=(t||C)+"",l?h.resolveWith(p,[m,C,T]):h.rejectWith(p,[T,C,y]),T.statusCode(g),g=undefined,u&&f.trigger(l?"ajaxSuccess":"ajaxError",[T,c,l?m:y]),d.fireWith(p,[T,C]),u&&(f.trigger("ajaxComplete",[T,c]),--x.active||x.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,t){return x.get(e,undefined,t,"script")}}),x.each(["get","post"],function(e,t){x[t]=function(e,n,r,i){return x.isFunction(n)&&(i=i||r,r=n,n=undefined),x.ajax({url:e,type:t,dataType:i,data:n,success:r})}});function pn(e,t,n){var r,i,o,s,a=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),r===undefined&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in a)if(a[i]&&a[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}s||(s=i)}o=o||s}return o?(o!==u[0]&&u.unshift(o),n[o]):undefined}function fn(e,t,n,r){var i,o,s,a,u,l={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)l[s.toLowerCase()]=e.converters[s];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(s=l[u+" "+o]||l["* "+o],!s)for(i in l)if(a=i.split(" "),a[1]===o&&(s=l[u+" "+a[0]]||l["* "+a[0]])){s===!0?s=l[i]:l[i]!==!0&&(o=a[0],c.unshift(a[1]));break}if(s!==!0)if(s&&e["throws"])t=s(t);else try{t=s(t)}catch(p){return{state:"parsererror",error:s?p:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),x.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(r,i){t=x("<script>").prop({async:!0,charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&i("error"===e.type?404:200,e.type)}),o.head.appendChild(t[0])},abort:function(){n&&n()}}}});var hn=[],dn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=hn.pop()||x.expando+"_"+Yt++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,s,a=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&!(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");return a||"jsonp"===t.dataTypes[0]?(i=t.jsonpCallback=x.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,a?t[a]=t[a].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(Vt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return s||x.error(i+" was not called"),s[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){s=arguments},r.always(function(){e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,hn.push(i)),s&&x.isFunction(o)&&o(s[0]),s=o=undefined}),"script"):undefined}),x.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(e){}};var gn=x.ajaxSettings.xhr(),mn={0:200,1223:204},yn=0,vn={};e.ActiveXObject&&x(e).on("unload",function(){for(var e in vn)vn[e]();vn=undefined}),x.support.cors=!!gn&&"withCredentials"in gn,x.support.ajax=gn=!!gn,x.ajaxTransport(function(e){var t;return x.support.cors||gn&&!e.crossDomain?{send:function(n,r){var i,o,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(i in e.xhrFields)s[i]=e.xhrFields[i];e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||n["X-Requested-With"]||(n["X-Requested-With"]="XMLHttpRequest");for(i in n)s.setRequestHeader(i,n[i]);t=function(e){return function(){t&&(delete vn[o],t=s.onload=s.onerror=null,"abort"===e?s.abort():"error"===e?r(s.status||404,s.statusText):r(mn[s.status]||s.status,s.statusText,"string"==typeof s.responseText?{text:s.responseText}:undefined,s.getAllResponseHeaders()))}},s.onload=t(),s.onerror=t("error"),t=vn[o=yn++]=t("abort"),s.send(e.hasContent&&e.data||null)},abort:function(){t&&t()}}:undefined});var xn,bn,wn=/^(?:toggle|show|hide)$/,Tn=RegExp("^(?:([+-])=|)("+b+")([a-z%]*)$","i"),Cn=/queueHooks$/,kn=[An],Nn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Tn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),s=(x.cssNumber[e]||"px"!==o&&+r)&&Tn.exec(x.css(n.elem,e)),a=1,u=20;if(s&&s[3]!==o){o=o||s[3],i=i||[],s=+r||1;do a=a||".5",s/=a,x.style(n.elem,e,s+o);while(a!==(a=n.cur()/r)&&1!==a&&--u)}return i&&(s=n.start=+s||+r||0,n.unit=o,n.end=i[1]?s+(i[1]+1)*i[2]:+i[2]),n}]};function En(){return setTimeout(function(){xn=undefined}),xn=x.now()}function Sn(e,t,n){var r,i=(Nn[t]||[]).concat(Nn["*"]),o=0,s=i.length;for(;s>o;o++)if(r=i[o].call(n,t,e))return r}function jn(e,t,n){var r,i,o=0,s=kn.length,a=x.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=xn||En(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,s=0,u=l.tweens.length;for(;u>s;s++)l.tweens[s].run(o);return a.notifyWith(e,[l,o,n]),1>o&&u?n:(a.resolveWith(e,[l]),!1)},l=a.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:xn||En(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?a.resolveWith(e,[l,t]):a.rejectWith(e,[l,t]),this}}),c=l.props;for(Dn(c,l.opts.specialEasing);s>o;o++)if(r=kn[o].call(l,e,c,l.opts))return r;return x.map(c,Sn,l),x.isFunction(l.opts.start)&&l.opts.start.call(e,l),x.fx.timer(x.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function Dn(e,t){var n,r,i,o,s;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),s=x.cssHooks[r],s&&"expand"in s){o=s.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(jn,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Nn[n]=Nn[n]||[],Nn[n].unshift(t)},prefilter:function(e,t){t?kn.unshift(e):kn.push(e)}});function An(e,t,n){var r,i,o,s,a,u,l=this,c={},p=e.style,f=e.nodeType&&Lt(e),h=q.get(e,"fxshow");n.queue||(a=x._queueHooks(e,"fx"),null==a.unqueued&&(a.unqueued=0,u=a.empty.fire,a.empty.fire=function(){a.unqueued||u()}),a.unqueued++,l.always(function(){l.always(function(){a.unqueued--,x.queue(e,"fx").length||a.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(p.display="inline-block")),n.overflow&&(p.overflow="hidden",l.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],wn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show")){if("show"!==i||!h||h[r]===undefined)continue;f=!0}c[r]=h&&h[r]||x.style(e,r)}if(!x.isEmptyObject(c)){h?"hidden"in h&&(f=h.hidden):h=q.access(e,"fxshow",{}),o&&(h.hidden=!f),f?x(e).show():l.done(function(){x(e).hide()}),l.done(function(){var t;q.remove(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)s=Sn(f?h[r]:0,r,l),r in h||(h[r]=s.start,f&&(s.end=s.start,s.start="width"===r||"height"===r?1:0))}}function Ln(e,t,n,r,i){return new Ln.prototype.init(e,t,n,r,i)}x.Tween=Ln,Ln.prototype={constructor:Ln,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=Ln.propHooks[this.prop];return e&&e.get?e.get(this):Ln.propHooks._default.get(this)},run:function(e){var t,n=Ln.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ln.propHooks._default.set(this),this}},Ln.prototype.init.prototype=Ln.prototype,Ln.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Ln.propHooks.scrollTop=Ln.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(qn(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Lt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),s=function(){var t=jn(this,x.extend({},e),o);(i||q.get(this,"finish"))&&t.stop(!0)};return s.finish=s,i||o.queue===!1?this.each(s):this.queue(o.queue,s)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=undefined),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=x.timers,s=q.get(this);if(i)s[i]&&s[i].stop&&r(s[i]);else for(i in s)s[i]&&s[i].stop&&Cn.test(i)&&r(s[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));(t||!n)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=q.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,s=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;s>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function qn(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=jt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:qn("show"),slideUp:qn("hide"),slideToggle:qn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=Ln.prototype.init,x.fx.tick=function(){var e,t=x.timers,n=0;for(xn=x.now();t.length>n;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||x.fx.stop(),xn=undefined},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){bn||(bn=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(bn),bn=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===undefined?this:this.each(function(t){x.offset.setOffset(this,e,t)});var t,n,i=this[0],o={top:0,left:0},s=i&&i.ownerDocument;if(s)return t=s.documentElement,x.contains(t,i)?(typeof i.getBoundingClientRect!==r&&(o=i.getBoundingClientRect()),n=Hn(s),{top:o.top+n.pageYOffset-t.clientTop,left:o.left+n.pageXOffset-t.clientLeft}):o},x.offset={setOffset:function(e,t,n){var r,i,o,s,a,u,l,c=x.css(e,"position"),p=x(e),f={};"static"===c&&(e.style.position="relative"),a=p.offset(),o=x.css(e,"top"),u=x.css(e,"left"),l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1,l?(r=p.position(),s=r.top,i=r.left):(s=parseFloat(o)||0,i=parseFloat(u)||0),x.isFunction(t)&&(t=t.call(e,n,a)),null!=t.top&&(f.top=t.top-a.top+s),null!=t.left&&(f.left=t.left-a.left+i),"using"in t?t.using.call(e,f):p.css(f)}},x.fn.extend({position:function(){if(this[0]){var e,t,n=this[0],r={top:0,left:0};return"fixed"===x.css(n,"position")?t=n.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(r=e.offset()),r.top+=x.css(e[0],"borderTopWidth",!0),r.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-r.top-x.css(n,"marginTop",!0),left:t.left-r.left-x.css(n,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,n){var r="pageYOffset"===n;x.fn[t]=function(i){return x.access(this,function(t,i,o){var s=Hn(t);return o===undefined?s?s[n]:t[i]:(s?s.scrollTo(r?e.pageXOffset:o,r?o:e.pageYOffset):t[i]=o,undefined)},t,i,arguments.length,null)}});function Hn(e){return x.isWindow(e)?e:9===e.nodeType&&e.defaultView}x.each({Height:"height",Width:"width"},function(e,t){x.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){x.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),s=n||(r===!0||i===!0?"margin":"border");return x.access(this,function(t,n,r){var i;return x.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):r===undefined?x.css(t,n,s):x.style(t,n,r,s)},t,o?r:undefined,o,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}),"object"==typeof e&&"object"==typeof e.document&&(e.jQuery=e.$=x)})(window);
diff --git a/html5/verto/demo/js/jquery.dataTables.js b/html5/verto/demo/js/jquery.dataTables.js
deleted file mode 100644
index 1d8a220ba8..0000000000
--- a/html5/verto/demo/js/jquery.dataTables.js
+++ /dev/null
@@ -1,12099 +0,0 @@
-/**
- * @summary     DataTables
- * @description Paginate, search and sort HTML tables
- * @version     1.9.4
- * @file        jquery.dataTables.js
- * @author      Allan Jardine (www.sprymedia.co.uk)
- * @contact     www.sprymedia.co.uk/contact
- *
- * @copyright Copyright 2008-2012 Allan Jardine, all rights reserved.
- *
- * This source file is free software, under either the GPL v2 license or a
- * BSD style license, available at:
- *   http://datatables.net/license_gpl2
- *   http://datatables.net/license_bsd
- * 
- * This source file is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
- * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
- * 
- * For details please refer to: http://www.datatables.net
- */
-
-/*jslint evil: true, undef: true, browser: true */
-/*globals $, jQuery,define,_fnExternApiFunc,_fnInitialise,_fnInitComplete,_fnLanguageCompat,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnCreateTr,_fnGatherData,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnServerParams,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAdjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnDetectHeader,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap,_fnGetRowData,_fnGetCellData,_fnSetCellData,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnApplyColumnDefs,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnJsonString,_fnRender,_fnNodeToColumnIndex,_fnInfoMacros,_fnBrowserDetect,_fnGetColumns*/
-
-(/** @lends <global> */function( window, document, undefined ) {
-
-(function( factory ) {
-	"use strict";
-
-	// Define as an AMD module if possible
-	if ( typeof define === 'function' && define.amd )
-	{
-		define( ['jquery'], factory );
-	}
-	/* Define using browser globals otherwise
-	 * Prevent multiple instantiations if the script is loaded twice
-	 */
-	else if ( jQuery && !jQuery.fn.dataTable )
-	{
-		factory( jQuery );
-	}
-}
-(/** @lends <global> */function( $ ) {
-	"use strict";
-	/** 
-	 * DataTables is a plug-in for the jQuery Javascript library. It is a 
-	 * highly flexible tool, based upon the foundations of progressive 
-	 * enhancement, which will add advanced interaction controls to any 
-	 * HTML table. For a full list of features please refer to
-	 * <a href="http://datatables.net">DataTables.net</a>.
-	 *
-	 * Note that the <i>DataTable</i> object is not a global variable but is
-	 * aliased to <i>jQuery.fn.DataTable</i> and <i>jQuery.fn.dataTable</i> through which 
-	 * it may be  accessed.
-	 *
-	 *  @class
-	 *  @param {object} [oInit={}] Configuration object for DataTables. Options
-	 *    are defined by {@link DataTable.defaults}
-	 *  @requires jQuery 1.3+
-	 * 
-	 *  @example
-	 *    // Basic initialisation
-	 *    $(document).ready( function {
-	 *      $('#example').dataTable();
-	 *    } );
-	 *  
-	 *  @example
-	 *    // Initialisation with configuration options - in this case, disable
-	 *    // pagination and sorting.
-	 *    $(document).ready( function {
-	 *      $('#example').dataTable( {
-	 *        "bPaginate": false,
-	 *        "bSort": false 
-	 *      } );
-	 *    } );
-	 */
-	var DataTable = function( oInit )
-	{
-		
-		
-		/**
-		 * Add a column to the list used for the table with default values
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {node} nTh The th element for this column
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAddColumn( oSettings, nTh )
-		{
-			var oDefaults = DataTable.defaults.columns;
-			var iCol = oSettings.aoColumns.length;
-			var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
-				"sSortingClass": oSettings.oClasses.sSortable,
-				"sSortingClassJUI": oSettings.oClasses.sSortJUI,
-				"nTh": nTh ? nTh : document.createElement('th'),
-				"sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
-				"aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
-				"mData": oDefaults.mData ? oDefaults.oDefaults : iCol
-			} );
-			oSettings.aoColumns.push( oCol );
-			
-			/* Add a column specific filter */
-			if ( oSettings.aoPreSearchCols[ iCol ] === undefined || oSettings.aoPreSearchCols[ iCol ] === null )
-			{
-				oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch );
-			}
-			else
-			{
-				var oPre = oSettings.aoPreSearchCols[ iCol ];
-				
-				/* Don't require that the user must specify bRegex, bSmart or bCaseInsensitive */
-				if ( oPre.bRegex === undefined )
-				{
-					oPre.bRegex = true;
-				}
-				
-				if ( oPre.bSmart === undefined )
-				{
-					oPre.bSmart = true;
-				}
-				
-				if ( oPre.bCaseInsensitive === undefined )
-				{
-					oPre.bCaseInsensitive = true;
-				}
-			}
-			
-			/* Use the column options function to initialise classes etc */
-			_fnColumnOptions( oSettings, iCol, null );
-		}
-		
-		
-		/**
-		 * Apply options for a column
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iCol column index to consider
-		 *  @param {object} oOptions object with sType, bVisible and bSearchable etc
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnColumnOptions( oSettings, iCol, oOptions )
-		{
-			var oCol = oSettings.aoColumns[ iCol ];
-			
-			/* User specified column options */
-			if ( oOptions !== undefined && oOptions !== null )
-			{
-				/* Backwards compatibility for mDataProp */
-				if ( oOptions.mDataProp && !oOptions.mData )
-				{
-					oOptions.mData = oOptions.mDataProp;
-				}
-		
-				if ( oOptions.sType !== undefined )
-				{
-					oCol.sType = oOptions.sType;
-					oCol._bAutoType = false;
-				}
-				
-				$.extend( oCol, oOptions );
-				_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
-		
-				/* iDataSort to be applied (backwards compatibility), but aDataSort will take
-				 * priority if defined
-				 */
-				if ( oOptions.iDataSort !== undefined )
-				{
-					oCol.aDataSort = [ oOptions.iDataSort ];
-				}
-				_fnMap( oCol, oOptions, "aDataSort" );
-			}
-		
-			/* Cache the data get and set functions for speed */
-			var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
-			var mData = _fnGetObjectDataFn( oCol.mData );
-		
-			oCol.fnGetData = function (oData, sSpecific) {
-				var innerData = mData( oData, sSpecific );
-		
-				if ( oCol.mRender && (sSpecific && sSpecific !== '') )
-				{
-					return mRender( innerData, sSpecific, oData );
-				}
-				return innerData;
-			};
-			oCol.fnSetData = _fnSetObjectDataFn( oCol.mData );
-			
-			/* Feature sorting overrides column specific when off */
-			if ( !oSettings.oFeatures.bSort )
-			{
-				oCol.bSortable = false;
-			}
-			
-			/* Check that the class assignment is correct for sorting */
-			if ( !oCol.bSortable ||
-				 ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) )
-			{
-				oCol.sSortingClass = oSettings.oClasses.sSortableNone;
-				oCol.sSortingClassJUI = "";
-			}
-			else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1 )
-			{
-				oCol.sSortingClass = oSettings.oClasses.sSortable;
-				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUI;
-			}
-			else if ( $.inArray('asc', oCol.asSorting) != -1 && $.inArray('desc', oCol.asSorting) == -1 )
-			{
-				oCol.sSortingClass = oSettings.oClasses.sSortableAsc;
-				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIAscAllowed;
-			}
-			else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) != -1 )
-			{
-				oCol.sSortingClass = oSettings.oClasses.sSortableDesc;
-				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIDescAllowed;
-			}
-		}
-		
-		
-		/**
-		 * Adjust the table column widths for new data. Note: you would probably want to 
-		 * do a redraw after calling this function!
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAdjustColumnSizing ( oSettings )
-		{
-			/* Not interested in doing column width calculation if auto-width is disabled */
-			if ( oSettings.oFeatures.bAutoWidth === false )
-			{
-				return false;
-			}
-			
-			_fnCalculateColumnWidths( oSettings );
-			for ( var i=0 , iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				oSettings.aoColumns[i].nTh.style.width = oSettings.aoColumns[i].sWidth;
-			}
-		}
-		
-		
-		/**
-		 * Covert the index of a visible column to the index in the data array (take account
-		 * of hidden columns)
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iMatch Visible column index to lookup
-		 *  @returns {int} i the data index
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnVisibleToColumnIndex( oSettings, iMatch )
-		{
-			var aiVis = _fnGetColumns( oSettings, 'bVisible' );
-		
-			return typeof aiVis[iMatch] === 'number' ?
-				aiVis[iMatch] :
-				null;
-		}
-		
-		
-		/**
-		 * Covert the index of an index in the data array and convert it to the visible
-		 *   column index (take account of hidden columns)
-		 *  @param {int} iMatch Column index to lookup
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {int} i the data index
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnColumnIndexToVisible( oSettings, iMatch )
-		{
-			var aiVis = _fnGetColumns( oSettings, 'bVisible' );
-			var iPos = $.inArray( iMatch, aiVis );
-		
-			return iPos !== -1 ? iPos : null;
-		}
-		
-		
-		/**
-		 * Get the number of visible columns
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {int} i the number of visible columns
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnVisbleColumns( oSettings )
-		{
-			return _fnGetColumns( oSettings, 'bVisible' ).length;
-		}
-		
-		
-		/**
-		 * Get an array of column indexes that match a given property
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string} sParam Parameter in aoColumns to look for - typically 
-		 *    bVisible or bSearchable
-		 *  @returns {array} Array of indexes with matched properties
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetColumns( oSettings, sParam )
-		{
-			var a = [];
-		
-			$.map( oSettings.aoColumns, function(val, i) {
-				if ( val[sParam] ) {
-					a.push( i );
-				}
-			} );
-		
-			return a;
-		}
-		
-		
-		/**
-		 * Get the sort type based on an input string
-		 *  @param {string} sData data we wish to know the type of
-		 *  @returns {string} type (defaults to 'string' if no type can be detected)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDetectType( sData )
-		{
-			var aTypes = DataTable.ext.aTypes;
-			var iLen = aTypes.length;
-			
-			for ( var i=0 ; i<iLen ; i++ )
-			{
-				var sType = aTypes[i]( sData );
-				if ( sType !== null )
-				{
-					return sType;
-				}
-			}
-			
-			return 'string';
-		}
-		
-		
-		/**
-		 * Figure out how to reorder a display list
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns array {int} aiReturn index list for reordering
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnReOrderIndex ( oSettings, sColumns )
-		{
-			var aColumns = sColumns.split(',');
-			var aiReturn = [];
-			
-			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				for ( var j=0 ; j<iLen ; j++ )
-				{
-					if ( oSettings.aoColumns[i].sName == aColumns[j] )
-					{
-						aiReturn.push( j );
-						break;
-					}
-				}
-			}
-			
-			return aiReturn;
-		}
-		
-		
-		/**
-		 * Get the column ordering that DataTables expects
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {string} comma separated list of names
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnColumnOrdering ( oSettings )
-		{
-			var sNames = '';
-			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				sNames += oSettings.aoColumns[i].sName+',';
-			}
-			if ( sNames.length == iLen )
-			{
-				return "";
-			}
-			return sNames.slice(0, -1);
-		}
-		
-		
-		/**
-		 * Take the column definitions and static columns arrays and calculate how
-		 * they relate to column indexes. The callback function will then apply the
-		 * definition found for a column to a suitable configuration object.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {array} aoColDefs The aoColumnDefs array that is to be applied
-		 *  @param {array} aoCols The aoColumns array that defines columns individually
-		 *  @param {function} fn Callback function - takes two parameters, the calculated
-		 *    column index and the definition for that column.
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, fn )
-		{
-			var i, iLen, j, jLen, k, kLen;
-		
-			// Column definitions with aTargets
-			if ( aoColDefs )
-			{
-				/* Loop over the definitions array - loop in reverse so first instance has priority */
-				for ( i=aoColDefs.length-1 ; i>=0 ; i-- )
-				{
-					/* Each definition can target multiple columns, as it is an array */
-					var aTargets = aoColDefs[i].aTargets;
-					if ( !$.isArray( aTargets ) )
-					{
-						_fnLog( oSettings, 1, 'aTargets must be an array of targets, not a '+(typeof aTargets) );
-					}
-		
-					for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
-					{
-						if ( typeof aTargets[j] === 'number' && aTargets[j] >= 0 )
-						{
-							/* Add columns that we don't yet know about */
-							while( oSettings.aoColumns.length <= aTargets[j] )
-							{
-								_fnAddColumn( oSettings );
-							}
-		
-							/* Integer, basic index */
-							fn( aTargets[j], aoColDefs[i] );
-						}
-						else if ( typeof aTargets[j] === 'number' && aTargets[j] < 0 )
-						{
-							/* Negative integer, right to left column counting */
-							fn( oSettings.aoColumns.length+aTargets[j], aoColDefs[i] );
-						}
-						else if ( typeof aTargets[j] === 'string' )
-						{
-							/* Class name matching on TH element */
-							for ( k=0, kLen=oSettings.aoColumns.length ; k<kLen ; k++ )
-							{
-								if ( aTargets[j] == "_all" ||
-								     $(oSettings.aoColumns[k].nTh).hasClass( aTargets[j] ) )
-								{
-									fn( k, aoColDefs[i] );
-								}
-							}
-						}
-					}
-				}
-			}
-		
-			// Statically defined columns array
-			if ( aoCols )
-			{
-				for ( i=0, iLen=aoCols.length ; i<iLen ; i++ )
-				{
-					fn( i, aoCols[i] );
-				}
-			}
-		}
-		
-		/**
-		 * Add a data array to the table, creating DOM node etc. This is the parallel to 
-		 * _fnGatherData, but for adding rows from a Javascript source, rather than a
-		 * DOM source.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {array} aData data array to be added
-		 *  @returns {int} >=0 if successful (index of new aoData entry), -1 if failed
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAddData ( oSettings, aDataSupplied )
-		{
-			var oCol;
-			
-			/* Take an independent copy of the data source so we can bash it about as we wish */
-			var aDataIn = ($.isArray(aDataSupplied)) ?
-				aDataSupplied.slice() :
-				$.extend( true, {}, aDataSupplied );
-			
-			/* Create the object for storing information about this new row */
-			var iRow = oSettings.aoData.length;
-			var oData = $.extend( true, {}, DataTable.models.oRow );
-			oData._aData = aDataIn;
-			oSettings.aoData.push( oData );
-		
-			/* Create the cells */
-			var nTd, sThisType;
-			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				oCol = oSettings.aoColumns[i];
-		
-				/* Use rendered data for filtering / sorting */
-				if ( typeof oCol.fnRender === 'function' && oCol.bUseRendered && oCol.mData !== null )
-				{
-					_fnSetCellData( oSettings, iRow, i, _fnRender(oSettings, iRow, i) );
-				}
-				else
-				{
-					_fnSetCellData( oSettings, iRow, i, _fnGetCellData( oSettings, iRow, i ) );
-				}
-				
-				/* See if we should auto-detect the column type */
-				if ( oCol._bAutoType && oCol.sType != 'string' )
-				{
-					/* Attempt to auto detect the type - same as _fnGatherData() */
-					var sVarType = _fnGetCellData( oSettings, iRow, i, 'type' );
-					if ( sVarType !== null && sVarType !== '' )
-					{
-						sThisType = _fnDetectType( sVarType );
-						if ( oCol.sType === null )
-						{
-							oCol.sType = sThisType;
-						}
-						else if ( oCol.sType != sThisType && oCol.sType != "html" )
-						{
-							/* String is always the 'fallback' option */
-							oCol.sType = 'string';
-						}
-					}
-				}
-			}
-			
-			/* Add to the display array */
-			oSettings.aiDisplayMaster.push( iRow );
-		
-			/* Create the DOM information */
-			if ( !oSettings.oFeatures.bDeferRender )
-			{
-				_fnCreateTr( oSettings, iRow );
-			}
-		
-			return iRow;
-		}
-		
-		
-		/**
-		 * Read in the data from the target table from the DOM
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGatherData( oSettings )
-		{
-			var iLoop, i, iLen, j, jLen, jInner,
-			 	nTds, nTrs, nTd, nTr, aLocalData, iThisIndex,
-				iRow, iRows, iColumn, iColumns, sNodeName,
-				oCol, oData;
-			
-			/*
-			 * Process by row first
-			 * Add the data object for the whole table - storing the tr node. Note - no point in getting
-			 * DOM based data if we are going to go and replace it with Ajax source data.
-			 */
-			if ( oSettings.bDeferLoading || oSettings.sAjaxSource === null )
-			{
-				nTr = oSettings.nTBody.firstChild;
-				while ( nTr )
-				{
-					if ( nTr.nodeName.toUpperCase() == "TR" )
-					{
-						iThisIndex = oSettings.aoData.length;
-						nTr._DT_RowIndex = iThisIndex;
-						oSettings.aoData.push( $.extend( true, {}, DataTable.models.oRow, {
-							"nTr": nTr
-						} ) );
-		
-						oSettings.aiDisplayMaster.push( iThisIndex );
-						nTd = nTr.firstChild;
-						jInner = 0;
-						while ( nTd )
-						{
-							sNodeName = nTd.nodeName.toUpperCase();
-							if ( sNodeName == "TD" || sNodeName == "TH" )
-							{
-								_fnSetCellData( oSettings, iThisIndex, jInner, $.trim(nTd.innerHTML) );
-								jInner++;
-							}
-							nTd = nTd.nextSibling;
-						}
-					}
-					nTr = nTr.nextSibling;
-				}
-			}
-			
-			/* Gather in the TD elements of the Table - note that this is basically the same as
-			 * fnGetTdNodes, but that function takes account of hidden columns, which we haven't yet
-			 * setup!
-			 */
-			nTrs = _fnGetTrNodes( oSettings );
-			nTds = [];
-			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-			{
-				nTd = nTrs[i].firstChild;
-				while ( nTd )
-				{
-					sNodeName = nTd.nodeName.toUpperCase();
-					if ( sNodeName == "TD" || sNodeName == "TH" )
-					{
-						nTds.push( nTd );
-					}
-					nTd = nTd.nextSibling;
-				}
-			}
-			
-			/* Now process by column */
-			for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
-			{
-				oCol = oSettings.aoColumns[iColumn];
-		
-				/* Get the title of the column - unless there is a user set one */
-				if ( oCol.sTitle === null )
-				{
-					oCol.sTitle = oCol.nTh.innerHTML;
-				}
-				
-				var
-					bAutoType = oCol._bAutoType,
-					bRender = typeof oCol.fnRender === 'function',
-					bClass = oCol.sClass !== null,
-					bVisible = oCol.bVisible,
-					nCell, sThisType, sRendered, sValType;
-				
-				/* A single loop to rule them all (and be more efficient) */
-				if ( bAutoType || bRender || bClass || !bVisible )
-				{
-					for ( iRow=0, iRows=oSettings.aoData.length ; iRow<iRows ; iRow++ )
-					{
-						oData = oSettings.aoData[iRow];
-						nCell = nTds[ (iRow*iColumns) + iColumn ];
-						
-						/* Type detection */
-						if ( bAutoType && oCol.sType != 'string' )
-						{
-							sValType = _fnGetCellData( oSettings, iRow, iColumn, 'type' );
-							if ( sValType !== '' )
-							{
-								sThisType = _fnDetectType( sValType );
-								if ( oCol.sType === null )
-								{
-									oCol.sType = sThisType;
-								}
-								else if ( oCol.sType != sThisType && 
-								          oCol.sType != "html" )
-								{
-									/* String is always the 'fallback' option */
-									oCol.sType = 'string';
-								}
-							}
-						}
-		
-						if ( oCol.mRender )
-						{
-							// mRender has been defined, so we need to get the value and set it
-							nCell.innerHTML = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
-						}
-						else if ( oCol.mData !== iColumn )
-						{
-							// If mData is not the same as the column number, then we need to
-							// get the dev set value. If it is the column, no point in wasting
-							// time setting the value that is already there!
-							nCell.innerHTML = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
-						}
-						
-						/* Rendering */
-						if ( bRender )
-						{
-							sRendered = _fnRender( oSettings, iRow, iColumn );
-							nCell.innerHTML = sRendered;
-							if ( oCol.bUseRendered )
-							{
-								/* Use the rendered data for filtering / sorting */
-								_fnSetCellData( oSettings, iRow, iColumn, sRendered );
-							}
-						}
-						
-						/* Classes */
-						if ( bClass )
-						{
-							nCell.className += ' '+oCol.sClass;
-						}
-						
-						/* Column visibility */
-						if ( !bVisible )
-						{
-							oData._anHidden[iColumn] = nCell;
-							nCell.parentNode.removeChild( nCell );
-						}
-						else
-						{
-							oData._anHidden[iColumn] = null;
-						}
-		
-						if ( oCol.fnCreatedCell )
-						{
-							oCol.fnCreatedCell.call( oSettings.oInstance,
-								nCell, _fnGetCellData( oSettings, iRow, iColumn, 'display' ), oData._aData, iRow, iColumn
-							);
-						}
-					}
-				}
-			}
-		
-			/* Row created callbacks */
-			if ( oSettings.aoRowCreatedCallback.length !== 0 )
-			{
-				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-				{
-					oData = oSettings.aoData[i];
-					_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, i] );
-				}
-			}
-		}
-		
-		
-		/**
-		 * Take a TR element and convert it to an index in aoData
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {node} n the TR element to find
-		 *  @returns {int} index if the node is found, null if not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnNodeToDataIndex( oSettings, n )
-		{
-			return (n._DT_RowIndex!==undefined) ? n._DT_RowIndex : null;
-		}
-		
-		
-		/**
-		 * Take a TD element and convert it into a column data index (not the visible index)
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow The row number the TD/TH can be found in
-		 *  @param {node} n The TD/TH element to find
-		 *  @returns {int} index if the node is found, -1 if not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnNodeToColumnIndex( oSettings, iRow, n )
-		{
-			var anCells = _fnGetTdNodes( oSettings, iRow );
-		
-			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				if ( anCells[i] === n )
-				{
-					return i;
-				}
-			}
-			return -1;
-		}
-		
-		
-		/**
-		 * Get an array of data for a given row from the internal data cache
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow aoData row id
-		 *  @param {string} sSpecific data get type ('type' 'filter' 'sort')
-		 *  @param {array} aiColumns Array of column indexes to get data from
-		 *  @returns {array} Data array
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetRowData( oSettings, iRow, sSpecific, aiColumns )
-		{
-			var out = [];
-			for ( var i=0, iLen=aiColumns.length ; i<iLen ; i++ )
-			{
-				out.push( _fnGetCellData( oSettings, iRow, aiColumns[i], sSpecific ) );
-			}
-			return out;
-		}
-		
-		
-		/**
-		 * Get the data for a given cell from the internal cache, taking into account data mapping
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow aoData row id
-		 *  @param {int} iCol Column index
-		 *  @param {string} sSpecific data get type ('display', 'type' 'filter' 'sort')
-		 *  @returns {*} Cell data
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetCellData( oSettings, iRow, iCol, sSpecific )
-		{
-			var sData;
-			var oCol = oSettings.aoColumns[iCol];
-			var oData = oSettings.aoData[iRow]._aData;
-		
-			if ( (sData=oCol.fnGetData( oData, sSpecific )) === undefined )
-			{
-				if ( oSettings.iDrawError != oSettings.iDraw && oCol.sDefaultContent === null )
-				{
-					_fnLog( oSettings, 0, "Requested unknown parameter "+
-						(typeof oCol.mData=='function' ? '{mData function}' : "'"+oCol.mData+"'")+
-						" from the data source for row "+iRow );
-					oSettings.iDrawError = oSettings.iDraw;
-				}
-				return oCol.sDefaultContent;
-			}
-		
-			/* When the data source is null, we can use default column data */
-			if ( sData === null && oCol.sDefaultContent !== null )
-			{
-				sData = oCol.sDefaultContent;
-			}
-			else if ( typeof sData === 'function' )
-			{
-				/* If the data source is a function, then we run it and use the return */
-				return sData();
-			}
-		
-			if ( sSpecific == 'display' && sData === null )
-			{
-				return '';
-			}
-			return sData;
-		}
-		
-		
-		/**
-		 * Set the value for a specific cell, into the internal data cache
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow aoData row id
-		 *  @param {int} iCol Column index
-		 *  @param {*} val Value to set
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSetCellData( oSettings, iRow, iCol, val )
-		{
-			var oCol = oSettings.aoColumns[iCol];
-			var oData = oSettings.aoData[iRow]._aData;
-		
-			oCol.fnSetData( oData, val );
-		}
-		
-		
-		// Private variable that is used to match array syntax in the data property object
-		var __reArray = /\[.*?\]$/;
-		
-		/**
-		 * Return a function that can be used to get data from a source object, taking
-		 * into account the ability to use nested objects as a source
-		 *  @param {string|int|function} mSource The data source for the object
-		 *  @returns {function} Data get function
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetObjectDataFn( mSource )
-		{
-			if ( mSource === null )
-			{
-				/* Give an empty string for rendering / sorting etc */
-				return function (data, type) {
-					return null;
-				};
-			}
-			else if ( typeof mSource === 'function' )
-			{
-				return function (data, type, extra) {
-					return mSource( data, type, extra );
-				};
-			}
-			else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 || mSource.indexOf('[') !== -1) )
-			{
-				/* If there is a . in the source string then the data source is in a 
-				 * nested object so we loop over the data for each level to get the next
-				 * level down. On each loop we test for undefined, and if found immediately
-				 * return. This allows entire objects to be missing and sDefaultContent to
-				 * be used if defined, rather than throwing an error
-				 */
-				var fetchData = function (data, type, src) {
-					var a = src.split('.');
-					var arrayNotation, out, innerSrc;
-		
-					if ( src !== "" )
-					{
-						for ( var i=0, iLen=a.length ; i<iLen ; i++ )
-						{
-							// Check if we are dealing with an array notation request
-							arrayNotation = a[i].match(__reArray);
-		
-							if ( arrayNotation ) {
-								a[i] = a[i].replace(__reArray, '');
-		
-								// Condition allows simply [] to be passed in
-								if ( a[i] !== "" ) {
-									data = data[ a[i] ];
-								}
-								out = [];
-								
-								// Get the remainder of the nested object to get
-								a.splice( 0, i+1 );
-								innerSrc = a.join('.');
-		
-								// Traverse each entry in the array getting the properties requested
-								for ( var j=0, jLen=data.length ; j<jLen ; j++ ) {
-									out.push( fetchData( data[j], type, innerSrc ) );
-								}
-		
-								// If a string is given in between the array notation indicators, that
-								// is used to join the strings together, otherwise an array is returned
-								var join = arrayNotation[0].substring(1, arrayNotation[0].length-1);
-								data = (join==="") ? out : out.join(join);
-		
-								// The inner call to fetchData has already traversed through the remainder
-								// of the source requested, so we exit from the loop
-								break;
-							}
-		
-							if ( data === null || data[ a[i] ] === undefined )
-							{
-								return undefined;
-							}
-							data = data[ a[i] ];
-						}
-					}
-		
-					return data;
-				};
-		
-				return function (data, type) {
-					return fetchData( data, type, mSource );
-				};
-			}
-			else
-			{
-				/* Array or flat object mapping */
-				return function (data, type) {
-					return data[mSource];	
-				};
-			}
-		}
-		
-		
-		/**
-		 * Return a function that can be used to set data from a source object, taking
-		 * into account the ability to use nested objects as a source
-		 *  @param {string|int|function} mSource The data source for the object
-		 *  @returns {function} Data set function
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSetObjectDataFn( mSource )
-		{
-			if ( mSource === null )
-			{
-				/* Nothing to do when the data source is null */
-				return function (data, val) {};
-			}
-			else if ( typeof mSource === 'function' )
-			{
-				return function (data, val) {
-					mSource( data, 'set', val );
-				};
-			}
-			else if ( typeof mSource === 'string' && (mSource.indexOf('.') !== -1 || mSource.indexOf('[') !== -1) )
-			{
-				/* Like the get, we need to get data from a nested object */
-				var setData = function (data, val, src) {
-					var a = src.split('.'), b;
-					var arrayNotation, o, innerSrc;
-		
-					for ( var i=0, iLen=a.length-1 ; i<iLen ; i++ )
-					{
-						// Check if we are dealing with an array notation request
-						arrayNotation = a[i].match(__reArray);
-		
-						if ( arrayNotation )
-						{
-							a[i] = a[i].replace(__reArray, '');
-							data[ a[i] ] = [];
-							
-							// Get the remainder of the nested object to set so we can recurse
-							b = a.slice();
-							b.splice( 0, i+1 );
-							innerSrc = b.join('.');
-		
-							// Traverse each entry in the array setting the properties requested
-							for ( var j=0, jLen=val.length ; j<jLen ; j++ )
-							{
-								o = {};
-								setData( o, val[j], innerSrc );
-								data[ a[i] ].push( o );
-							}
-		
-							// The inner call to setData has already traversed through the remainder
-							// of the source and has set the data, thus we can exit here
-							return;
-						}
-		
-						// If the nested object doesn't currently exist - since we are
-						// trying to set the value - create it
-						if ( data[ a[i] ] === null || data[ a[i] ] === undefined )
-						{
-							data[ a[i] ] = {};
-						}
-						data = data[ a[i] ];
-					}
-		
-					// If array notation is used, we just want to strip it and use the property name
-					// and assign the value. If it isn't used, then we get the result we want anyway
-					data[ a[a.length-1].replace(__reArray, '') ] = val;
-				};
-		
-				return function (data, val) {
-					return setData( data, val, mSource );
-				};
-			}
-			else
-			{
-				/* Array or flat object mapping */
-				return function (data, val) {
-					data[mSource] = val;	
-				};
-			}
-		}
-		
-		
-		/**
-		 * Return an array with the full table data
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns array {array} aData Master data array
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetDataMaster ( oSettings )
-		{
-			var aData = [];
-			var iLen = oSettings.aoData.length;
-			for ( var i=0 ; i<iLen; i++ )
-			{
-				aData.push( oSettings.aoData[i]._aData );
-			}
-			return aData;
-		}
-		
-		
-		/**
-		 * Nuke the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnClearTable( oSettings )
-		{
-			oSettings.aoData.splice( 0, oSettings.aoData.length );
-			oSettings.aiDisplayMaster.splice( 0, oSettings.aiDisplayMaster.length );
-			oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length );
-			_fnCalculateEnd( oSettings );
-		}
-		
-		
-		 /**
-		 * Take an array of integers (index array) and remove a target integer (value - not 
-		 * the key!)
-		 *  @param {array} a Index array to target
-		 *  @param {int} iTarget value to find
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDeleteIndex( a, iTarget )
-		{
-			var iTargetIndex = -1;
-			
-			for ( var i=0, iLen=a.length ; i<iLen ; i++ )
-			{
-				if ( a[i] == iTarget )
-				{
-					iTargetIndex = i;
-				}
-				else if ( a[i] > iTarget )
-				{
-					a[i]--;
-				}
-			}
-			
-			if ( iTargetIndex != -1 )
-			{
-				a.splice( iTargetIndex, 1 );
-			}
-		}
-		
-		
-		 /**
-		 * Call the developer defined fnRender function for a given cell (row/column) with
-		 * the required parameters and return the result.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow aoData index for the row
-		 *  @param {int} iCol aoColumns index for the column
-		 *  @returns {*} Return of the developer's fnRender function
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnRender( oSettings, iRow, iCol )
-		{
-			var oCol = oSettings.aoColumns[iCol];
-		
-			return oCol.fnRender( {
-				"iDataRow":    iRow,
-				"iDataColumn": iCol,
-				"oSettings":   oSettings,
-				"aData":       oSettings.aoData[iRow]._aData,
-				"mDataProp":   oCol.mData
-			}, _fnGetCellData(oSettings, iRow, iCol, 'display') );
-		}
-		/**
-		 * Create a new TR element (and it's TD children) for a row
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iRow Row to consider
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCreateTr ( oSettings, iRow )
-		{
-			var oData = oSettings.aoData[iRow];
-			var nTd;
-		
-			if ( oData.nTr === null )
-			{
-				oData.nTr = document.createElement('tr');
-		
-				/* Use a private property on the node to allow reserve mapping from the node
-				 * to the aoData array for fast look up
-				 */
-				oData.nTr._DT_RowIndex = iRow;
-		
-				/* Special parameters can be given by the data source to be used on the row */
-				if ( oData._aData.DT_RowId )
-				{
-					oData.nTr.id = oData._aData.DT_RowId;
-				}
-		
-				if ( oData._aData.DT_RowClass )
-				{
-					oData.nTr.className = oData._aData.DT_RowClass;
-				}
-		
-				/* Process each column */
-				for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					var oCol = oSettings.aoColumns[i];
-					nTd = document.createElement( oCol.sCellType );
-		
-					/* Render if needed - if bUseRendered is true then we already have the rendered
-					 * value in the data source - so can just use that
-					 */
-					nTd.innerHTML = (typeof oCol.fnRender === 'function' && (!oCol.bUseRendered || oCol.mData === null)) ?
-						_fnRender( oSettings, iRow, i ) :
-						_fnGetCellData( oSettings, iRow, i, 'display' );
-				
-					/* Add user defined class */
-					if ( oCol.sClass !== null )
-					{
-						nTd.className = oCol.sClass;
-					}
-					
-					if ( oCol.bVisible )
-					{
-						oData.nTr.appendChild( nTd );
-						oData._anHidden[i] = null;
-					}
-					else
-					{
-						oData._anHidden[i] = nTd;
-					}
-		
-					if ( oCol.fnCreatedCell )
-					{
-						oCol.fnCreatedCell.call( oSettings.oInstance,
-							nTd, _fnGetCellData( oSettings, iRow, i, 'display' ), oData._aData, iRow, i
-						);
-					}
-				}
-		
-				_fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [oData.nTr, oData._aData, iRow] );
-			}
-		}
-		
-		
-		/**
-		 * Create the HTML header for the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnBuildHead( oSettings )
-		{
-			var i, nTh, iLen, j, jLen;
-			var iThs = $('th, td', oSettings.nTHead).length;
-			var iCorrector = 0;
-			var jqChildren;
-			
-			/* If there is a header in place - then use it - otherwise it's going to get nuked... */
-			if ( iThs !== 0 )
-			{
-				/* We've got a thead from the DOM, so remove hidden columns and apply width to vis cols */
-				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					nTh = oSettings.aoColumns[i].nTh;
-					nTh.setAttribute('role', 'columnheader');
-					if ( oSettings.aoColumns[i].bSortable )
-					{
-						nTh.setAttribute('tabindex', oSettings.iTabIndex);
-						nTh.setAttribute('aria-controls', oSettings.sTableId);
-					}
-		
-					if ( oSettings.aoColumns[i].sClass !== null )
-					{
-						$(nTh).addClass( oSettings.aoColumns[i].sClass );
-					}
-					
-					/* Set the title of the column if it is user defined (not what was auto detected) */
-					if ( oSettings.aoColumns[i].sTitle != nTh.innerHTML )
-					{
-						nTh.innerHTML = oSettings.aoColumns[i].sTitle;
-					}
-				}
-			}
-			else
-			{
-				/* We don't have a header in the DOM - so we are going to have to create one */
-				var nTr = document.createElement( "tr" );
-				
-				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					nTh = oSettings.aoColumns[i].nTh;
-					nTh.innerHTML = oSettings.aoColumns[i].sTitle;
-					nTh.setAttribute('tabindex', '0');
-					
-					if ( oSettings.aoColumns[i].sClass !== null )
-					{
-						$(nTh).addClass( oSettings.aoColumns[i].sClass );
-					}
-					
-					nTr.appendChild( nTh );
-				}
-				$(oSettings.nTHead).html( '' )[0].appendChild( nTr );
-				_fnDetectHeader( oSettings.aoHeader, oSettings.nTHead );
-			}
-			
-			/* ARIA role for the rows */	
-			$(oSettings.nTHead).children('tr').attr('role', 'row');
-			
-			/* Add the extra markup needed by jQuery UI's themes */
-			if ( oSettings.bJUI )
-			{
-				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					nTh = oSettings.aoColumns[i].nTh;
-					
-					var nDiv = document.createElement('div');
-					nDiv.className = oSettings.oClasses.sSortJUIWrapper;
-					$(nTh).contents().appendTo(nDiv);
-					
-					var nSpan = document.createElement('span');
-					nSpan.className = oSettings.oClasses.sSortIcon;
-					nDiv.appendChild( nSpan );
-					nTh.appendChild( nDiv );
-				}
-			}
-			
-			if ( oSettings.oFeatures.bSort )
-			{
-				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-				{
-					if ( oSettings.aoColumns[i].bSortable !== false )
-					{
-						_fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
-					}
-					else
-					{
-						$(oSettings.aoColumns[i].nTh).addClass( oSettings.oClasses.sSortableNone );
-					}
-				}
-			}
-			
-			/* Deal with the footer - add classes if required */
-			if ( oSettings.oClasses.sFooterTH !== "" )
-			{
-				$(oSettings.nTFoot).children('tr').children('th').addClass( oSettings.oClasses.sFooterTH );
-			}
-			
-			/* Cache the footer elements */
-			if ( oSettings.nTFoot !== null )
-			{
-				var anCells = _fnGetUniqueThs( oSettings, null, oSettings.aoFooter );
-				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					if ( anCells[i] )
-					{
-						oSettings.aoColumns[i].nTf = anCells[i];
-						if ( oSettings.aoColumns[i].sClass )
-						{
-							$(anCells[i]).addClass( oSettings.aoColumns[i].sClass );
-						}
-					}
-				}
-			}
-		}
-		
-		
-		/**
-		 * Draw the header (or footer) element based on the column visibility states. The
-		 * methodology here is to use the layout array from _fnDetectHeader, modified for
-		 * the instantaneous column visibility, to construct the new layout. The grid is
-		 * traversed over cell at a time in a rows x columns grid fashion, although each 
-		 * cell insert can cover multiple elements in the grid - which is tracks using the
-		 * aApplied array. Cell inserts in the grid will only occur where there isn't
-		 * already a cell in that position.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param array {objects} aoSource Layout array from _fnDetectHeader
-		 *  @param {boolean} [bIncludeHidden=false] If true then include the hidden columns in the calc, 
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
-		{
-			var i, iLen, j, jLen, k, kLen, n, nLocalTr;
-			var aoLocal = [];
-			var aApplied = [];
-			var iColumns = oSettings.aoColumns.length;
-			var iRowspan, iColspan;
-		
-			if (  bIncludeHidden === undefined )
-			{
-				bIncludeHidden = false;
-			}
-		
-			/* Make a copy of the master layout array, but without the visible columns in it */
-			for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
-			{
-				aoLocal[i] = aoSource[i].slice();
-				aoLocal[i].nTr = aoSource[i].nTr;
-		
-				/* Remove any columns which are currently hidden */
-				for ( j=iColumns-1 ; j>=0 ; j-- )
-				{
-					if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
-					{
-						aoLocal[i].splice( j, 1 );
-					}
-				}
-		
-				/* Prep the applied array - it needs an element for each row */
-				aApplied.push( [] );
-			}
-		
-			for ( i=0, iLen=aoLocal.length ; i<iLen ; i++ )
-			{
-				nLocalTr = aoLocal[i].nTr;
-				
-				/* All cells are going to be replaced, so empty out the row */
-				if ( nLocalTr )
-				{
-					while( (n = nLocalTr.firstChild) )
-					{
-						nLocalTr.removeChild( n );
-					}
-				}
-		
-				for ( j=0, jLen=aoLocal[i].length ; j<jLen ; j++ )
-				{
-					iRowspan = 1;
-					iColspan = 1;
-		
-					/* Check to see if there is already a cell (row/colspan) covering our target
-					 * insert point. If there is, then there is nothing to do.
-					 */
-					if ( aApplied[i][j] === undefined )
-					{
-						nLocalTr.appendChild( aoLocal[i][j].cell );
-						aApplied[i][j] = 1;
-		
-						/* Expand the cell to cover as many rows as needed */
-						while ( aoLocal[i+iRowspan] !== undefined &&
-						        aoLocal[i][j].cell == aoLocal[i+iRowspan][j].cell )
-						{
-							aApplied[i+iRowspan][j] = 1;
-							iRowspan++;
-						}
-		
-						/* Expand the cell to cover as many columns as needed */
-						while ( aoLocal[i][j+iColspan] !== undefined &&
-						        aoLocal[i][j].cell == aoLocal[i][j+iColspan].cell )
-						{
-							/* Must update the applied array over the rows for the columns */
-							for ( k=0 ; k<iRowspan ; k++ )
-							{
-								aApplied[i+k][j+iColspan] = 1;
-							}
-							iColspan++;
-						}
-		
-						/* Do the actual expansion in the DOM */
-						aoLocal[i][j].cell.rowSpan = iRowspan;
-						aoLocal[i][j].cell.colSpan = iColspan;
-					}
-				}
-			}
-		}
-		
-		
-		/**
-		 * Insert the required TR nodes into the table for display
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDraw( oSettings )
-		{
-			/* Provide a pre-callback function which can be used to cancel the draw is false is returned */
-			var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] );
-			if ( $.inArray( false, aPreDraw ) !== -1 )
-			{
-				_fnProcessingDisplay( oSettings, false );
-				return;
-			}
-			
-			var i, iLen, n;
-			var anRows = [];
-			var iRowCount = 0;
-			var iStripes = oSettings.asStripeClasses.length;
-			var iOpenRows = oSettings.aoOpenRows.length;
-			
-			oSettings.bDrawing = true;
-			
-			/* Check and see if we have an initial draw position from state saving */
-			if ( oSettings.iInitDisplayStart !== undefined && oSettings.iInitDisplayStart != -1 )
-			{
-				if ( oSettings.oFeatures.bServerSide )
-				{
-					oSettings._iDisplayStart = oSettings.iInitDisplayStart;
-				}
-				else
-				{
-					oSettings._iDisplayStart = (oSettings.iInitDisplayStart >= oSettings.fnRecordsDisplay()) ?
-						0 : oSettings.iInitDisplayStart;
-				}
-				oSettings.iInitDisplayStart = -1;
-				_fnCalculateEnd( oSettings );
-			}
-			
-			/* Server-side processing draw intercept */
-			if ( oSettings.bDeferLoading )
-			{
-				oSettings.bDeferLoading = false;
-				oSettings.iDraw++;
-			}
-			else if ( !oSettings.oFeatures.bServerSide )
-			{
-				oSettings.iDraw++;
-			}
-			else if ( !oSettings.bDestroying && !_fnAjaxUpdate( oSettings ) )
-			{
-				return;
-			}
-			
-			if ( oSettings.aiDisplay.length !== 0 )
-			{
-				var iStart = oSettings._iDisplayStart;
-				var iEnd = oSettings._iDisplayEnd;
-				
-				if ( oSettings.oFeatures.bServerSide )
-				{
-					iStart = 0;
-					iEnd = oSettings.aoData.length;
-				}
-				
-				for ( var j=iStart ; j<iEnd ; j++ )
-				{
-					var aoData = oSettings.aoData[ oSettings.aiDisplay[j] ];
-					if ( aoData.nTr === null )
-					{
-						_fnCreateTr( oSettings, oSettings.aiDisplay[j] );
-					}
-		
-					var nRow = aoData.nTr;
-					
-					/* Remove the old striping classes and then add the new one */
-					if ( iStripes !== 0 )
-					{
-						var sStripe = oSettings.asStripeClasses[ iRowCount % iStripes ];
-						if ( aoData._sRowStripe != sStripe )
-						{
-							$(nRow).removeClass( aoData._sRowStripe ).addClass( sStripe );
-							aoData._sRowStripe = sStripe;
-						}
-					}
-					
-					/* Row callback functions - might want to manipulate the row */
-					_fnCallbackFire( oSettings, 'aoRowCallback', null, 
-						[nRow, oSettings.aoData[ oSettings.aiDisplay[j] ]._aData, iRowCount, j] );
-					
-					anRows.push( nRow );
-					iRowCount++;
-					
-					/* If there is an open row - and it is attached to this parent - attach it on redraw */
-					if ( iOpenRows !== 0 )
-					{
-						for ( var k=0 ; k<iOpenRows ; k++ )
-						{
-							if ( nRow == oSettings.aoOpenRows[k].nParent )
-							{
-								anRows.push( oSettings.aoOpenRows[k].nTr );
-								break;
-							}
-						}
-					}
-				}
-			}
-			else
-			{
-				/* Table is empty - create a row with an empty message in it */
-				anRows[ 0 ] = document.createElement( 'tr' );
-				
-				if ( oSettings.asStripeClasses[0] )
-				{
-					anRows[ 0 ].className = oSettings.asStripeClasses[0];
-				}
-		
-				var oLang = oSettings.oLanguage;
-				var sZero = oLang.sZeroRecords;
-				if ( oSettings.iDraw == 1 && oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
-				{
-					sZero = oLang.sLoadingRecords;
-				}
-				else if ( oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0 )
-				{
-					sZero = oLang.sEmptyTable;
-				}
-		
-				var nTd = document.createElement( 'td' );
-				nTd.setAttribute( 'valign', "top" );
-				nTd.colSpan = _fnVisbleColumns( oSettings );
-				nTd.className = oSettings.oClasses.sRowEmpty;
-				nTd.innerHTML = _fnInfoMacros( oSettings, sZero );
-				
-				anRows[ iRowCount ].appendChild( nTd );
-			}
-			
-			/* Header and footer callbacks */
-			_fnCallbackFire( oSettings, 'aoHeaderCallback', 'header', [ $(oSettings.nTHead).children('tr')[0], 
-				_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
-			
-			_fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0], 
-				_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(), oSettings.aiDisplay ] );
-			
-			/* 
-			 * Need to remove any old row from the display - note we can't just empty the tbody using
-			 * $().html('') since this will unbind the jQuery event handlers (even although the node 
-			 * still exists!) - equally we can't use innerHTML, since IE throws an exception.
-			 */
-			var
-				nAddFrag = document.createDocumentFragment(),
-				nRemoveFrag = document.createDocumentFragment(),
-				nBodyPar, nTrs;
-			
-			if ( oSettings.nTBody )
-			{
-				nBodyPar = oSettings.nTBody.parentNode;
-				nRemoveFrag.appendChild( oSettings.nTBody );
-				
-				/* When doing infinite scrolling, only remove child rows when sorting, filtering or start
-				 * up. When not infinite scroll, always do it.
-				 */
-				if ( !oSettings.oScroll.bInfinite || !oSettings._bInitComplete ||
-				 	oSettings.bSorted || oSettings.bFiltered )
-				{
-					while( (n = oSettings.nTBody.firstChild) )
-					{
-						oSettings.nTBody.removeChild( n );
-					}
-				}
-				
-				/* Put the draw table into the dom */
-				for ( i=0, iLen=anRows.length ; i<iLen ; i++ )
-				{
-					nAddFrag.appendChild( anRows[i] );
-				}
-				
-				oSettings.nTBody.appendChild( nAddFrag );
-				if ( nBodyPar !== null )
-				{
-					nBodyPar.appendChild( oSettings.nTBody );
-				}
-			}
-			
-			/* Call all required callback functions for the end of a draw */
-			_fnCallbackFire( oSettings, 'aoDrawCallback', 'draw', [oSettings] );
-			
-			/* Draw is complete, sorting and filtering must be as well */
-			oSettings.bSorted = false;
-			oSettings.bFiltered = false;
-			oSettings.bDrawing = false;
-			
-			if ( oSettings.oFeatures.bServerSide )
-			{
-				_fnProcessingDisplay( oSettings, false );
-				if ( !oSettings._bInitComplete )
-				{
-					_fnInitComplete( oSettings );
-				}
-			}
-		}
-		
-		
-		/**
-		 * Redraw the table - taking account of the various features which are enabled
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnReDraw( oSettings )
-		{
-			if ( oSettings.oFeatures.bSort )
-			{
-				/* Sorting will refilter and draw for us */
-				_fnSort( oSettings, oSettings.oPreviousSearch );
-			}
-			else if ( oSettings.oFeatures.bFilter )
-			{
-				/* Filtering will redraw for us */
-				_fnFilterComplete( oSettings, oSettings.oPreviousSearch );
-			}
-			else
-			{
-				_fnCalculateEnd( oSettings );
-				_fnDraw( oSettings );
-			}
-		}
-		
-		
-		/**
-		 * Add the options to the page HTML for the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAddOptionsHtml ( oSettings )
-		{
-			/*
-			 * Create a temporary, empty, div which we can later on replace with what we have generated
-			 * we do it this way to rendering the 'options' html offline - speed :-)
-			 */
-			var nHolding = $('<div></div>')[0];
-			oSettings.nTable.parentNode.insertBefore( nHolding, oSettings.nTable );
-			
-			/* 
-			 * All DataTables are wrapped in a div
-			 */
-			oSettings.nTableWrapper = $('<div id="'+oSettings.sTableId+'_wrapper" class="'+oSettings.oClasses.sWrapper+'" role="grid"></div>')[0];
-			oSettings.nTableReinsertBefore = oSettings.nTable.nextSibling;
-		
-			/* Track where we want to insert the option */
-			var nInsertNode = oSettings.nTableWrapper;
-			
-			/* Loop over the user set positioning and place the elements as needed */
-			var aDom = oSettings.sDom.split('');
-			var nTmp, iPushFeature, cOption, nNewNode, cNext, sAttr, j;
-			for ( var i=0 ; i<aDom.length ; i++ )
-			{
-				iPushFeature = 0;
-				cOption = aDom[i];
-				
-				if ( cOption == '<' )
-				{
-					/* New container div */
-					nNewNode = $('<div></div>')[0];
-					
-					/* Check to see if we should append an id and/or a class name to the container */
-					cNext = aDom[i+1];
-					if ( cNext == "'" || cNext == '"' )
-					{
-						sAttr = "";
-						j = 2;
-						while ( aDom[i+j] != cNext )
-						{
-							sAttr += aDom[i+j];
-							j++;
-						}
-						
-						/* Replace jQuery UI constants */
-						if ( sAttr == "H" )
-						{
-							sAttr = oSettings.oClasses.sJUIHeader;
-						}
-						else if ( sAttr == "F" )
-						{
-							sAttr = oSettings.oClasses.sJUIFooter;
-						}
-						
-						/* The attribute can be in the format of "#id.class", "#id" or "class" This logic
-						 * breaks the string into parts and applies them as needed
-						 */
-						if ( sAttr.indexOf('.') != -1 )
-						{
-							var aSplit = sAttr.split('.');
-							nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
-							nNewNode.className = aSplit[1];
-						}
-						else if ( sAttr.charAt(0) == "#" )
-						{
-							nNewNode.id = sAttr.substr(1, sAttr.length-1);
-						}
-						else
-						{
-							nNewNode.className = sAttr;
-						}
-						
-						i += j; /* Move along the position array */
-					}
-					
-					nInsertNode.appendChild( nNewNode );
-					nInsertNode = nNewNode;
-				}
-				else if ( cOption == '>' )
-				{
-					/* End container div */
-					nInsertNode = nInsertNode.parentNode;
-				}
-				else if ( cOption == 'l' && oSettings.oFeatures.bPaginate && oSettings.oFeatures.bLengthChange )
-				{
-					/* Length */
-					nTmp = _fnFeatureHtmlLength( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( cOption == 'f' && oSettings.oFeatures.bFilter )
-				{
-					/* Filter */
-					nTmp = _fnFeatureHtmlFilter( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( cOption == 'r' && oSettings.oFeatures.bProcessing )
-				{
-					/* pRocessing */
-					nTmp = _fnFeatureHtmlProcessing( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( cOption == 't' )
-				{
-					/* Table */
-					nTmp = _fnFeatureHtmlTable( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( cOption ==  'i' && oSettings.oFeatures.bInfo )
-				{
-					/* Info */
-					nTmp = _fnFeatureHtmlInfo( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( cOption == 'p' && oSettings.oFeatures.bPaginate )
-				{
-					/* Pagination */
-					nTmp = _fnFeatureHtmlPaginate( oSettings );
-					iPushFeature = 1;
-				}
-				else if ( DataTable.ext.aoFeatures.length !== 0 )
-				{
-					/* Plug-in features */
-					var aoFeatures = DataTable.ext.aoFeatures;
-					for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
-					{
-						if ( cOption == aoFeatures[k].cFeature )
-						{
-							nTmp = aoFeatures[k].fnInit( oSettings );
-							if ( nTmp )
-							{
-								iPushFeature = 1;
-							}
-							break;
-						}
-					}
-				}
-				
-				/* Add to the 2D features array */
-				if ( iPushFeature == 1 && nTmp !== null )
-				{
-					if ( typeof oSettings.aanFeatures[cOption] !== 'object' )
-					{
-						oSettings.aanFeatures[cOption] = [];
-					}
-					oSettings.aanFeatures[cOption].push( nTmp );
-					nInsertNode.appendChild( nTmp );
-				}
-			}
-			
-			/* Built our DOM structure - replace the holding div with what we want */
-			nHolding.parentNode.replaceChild( oSettings.nTableWrapper, nHolding );
-		}
-		
-		
-		/**
-		 * Use the DOM source to create up an array of header cells. The idea here is to
-		 * create a layout grid (array) of rows x columns, which contains a reference
-		 * to the cell that that point in the grid (regardless of col/rowspan), such that
-		 * any column / row could be removed and the new grid constructed
-		 *  @param array {object} aLayout Array to store the calculated layout in
-		 *  @param {node} nThead The header/footer element for the table
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDetectHeader ( aLayout, nThead )
-		{
-			var nTrs = $(nThead).children('tr');
-			var nTr, nCell;
-			var i, k, l, iLen, jLen, iColShifted, iColumn, iColspan, iRowspan;
-			var bUnique;
-			var fnShiftCol = function ( a, i, j ) {
-				var k = a[i];
-		                while ( k[j] ) {
-					j++;
-				}
-				return j;
-			};
-		
-			aLayout.splice( 0, aLayout.length );
-			
-			/* We know how many rows there are in the layout - so prep it */
-			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-			{
-				aLayout.push( [] );
-			}
-			
-			/* Calculate a layout array */
-			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
-			{
-				nTr = nTrs[i];
-				iColumn = 0;
-				
-				/* For every cell in the row... */
-				nCell = nTr.firstChild;
-				while ( nCell ) {
-					if ( nCell.nodeName.toUpperCase() == "TD" ||
-					     nCell.nodeName.toUpperCase() == "TH" )
-					{
-						/* Get the col and rowspan attributes from the DOM and sanitise them */
-						iColspan = nCell.getAttribute('colspan') * 1;
-						iRowspan = nCell.getAttribute('rowspan') * 1;
-						iColspan = (!iColspan || iColspan===0 || iColspan===1) ? 1 : iColspan;
-						iRowspan = (!iRowspan || iRowspan===0 || iRowspan===1) ? 1 : iRowspan;
-		
-						/* There might be colspan cells already in this row, so shift our target 
-						 * accordingly
-						 */
-						iColShifted = fnShiftCol( aLayout, i, iColumn );
-						
-						/* Cache calculation for unique columns */
-						bUnique = iColspan === 1 ? true : false;
-						
-						/* If there is col / rowspan, copy the information into the layout grid */
-						for ( l=0 ; l<iColspan ; l++ )
-						{
-							for ( k=0 ; k<iRowspan ; k++ )
-							{
-								aLayout[i+k][iColShifted+l] = {
-									"cell": nCell,
-									"unique": bUnique
-								};
-								aLayout[i+k].nTr = nTr;
-							}
-						}
-					}
-					nCell = nCell.nextSibling;
-				}
-			}
-		}
-		
-		
-		/**
-		 * Get an array of unique th elements, one for each column
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {node} nHeader automatically detect the layout from this node - optional
-		 *  @param {array} aLayout thead/tfoot layout from _fnDetectHeader - optional
-		 *  @returns array {node} aReturn list of unique th's
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetUniqueThs ( oSettings, nHeader, aLayout )
-		{
-			var aReturn = [];
-			if ( !aLayout )
-			{
-				aLayout = oSettings.aoHeader;
-				if ( nHeader )
-				{
-					aLayout = [];
-					_fnDetectHeader( aLayout, nHeader );
-				}
-			}
-		
-			for ( var i=0, iLen=aLayout.length ; i<iLen ; i++ )
-			{
-				for ( var j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
-				{
-					if ( aLayout[i][j].unique && 
-						 (!aReturn[j] || !oSettings.bSortCellsTop) )
-					{
-						aReturn[j] = aLayout[i][j].cell;
-					}
-				}
-			}
-			
-			return aReturn;
-		}
-		
-		
-		
-		/**
-		 * Update the table using an Ajax call
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {boolean} Block the table drawing or not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAjaxUpdate( oSettings )
-		{
-			if ( oSettings.bAjaxDataGet )
-			{
-				oSettings.iDraw++;
-				_fnProcessingDisplay( oSettings, true );
-				var iColumns = oSettings.aoColumns.length;
-				var aoData = _fnAjaxParameters( oSettings );
-				_fnServerParams( oSettings, aoData );
-				
-				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
-					function(json) {
-						_fnAjaxUpdateDraw( oSettings, json );
-					}, oSettings );
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-		
-		
-		/**
-		 * Build up the parameters in an object needed for a server-side processing request
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {bool} block the table drawing or not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAjaxParameters( oSettings )
-		{
-			var iColumns = oSettings.aoColumns.length;
-			var aoData = [], mDataProp, aaSort, aDataSort;
-			var i, j;
-			
-			aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
-			aoData.push( { "name": "iColumns",       "value": iColumns } );
-			aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
-			aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
-			aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
-				oSettings._iDisplayLength : -1 } );
-				
-			for ( i=0 ; i<iColumns ; i++ )
-			{
-			  mDataProp = oSettings.aoColumns[i].mData;
-				aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)==="function" ? 'function' : mDataProp } );
-			}
-			
-			/* Filtering */
-			if ( oSettings.oFeatures.bFilter !== false )
-			{
-				aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
-				aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
-				for ( i=0 ; i<iColumns ; i++ )
-				{
-					aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
-					aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
-					aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
-				}
-			}
-			
-			/* Sorting */
-			if ( oSettings.oFeatures.bSort !== false )
-			{
-				var iCounter = 0;
-		
-				aaSort = ( oSettings.aaSortingFixed !== null ) ?
-					oSettings.aaSortingFixed.concat( oSettings.aaSorting ) :
-					oSettings.aaSorting.slice();
-				
-				for ( i=0 ; i<aaSort.length ; i++ )
-				{
-					aDataSort = oSettings.aoColumns[ aaSort[i][0] ].aDataSort;
-					
-					for ( j=0 ; j<aDataSort.length ; j++ )
-					{
-						aoData.push( { "name": "iSortCol_"+iCounter,  "value": aDataSort[j] } );
-						aoData.push( { "name": "sSortDir_"+iCounter,  "value": aaSort[i][1] } );
-						iCounter++;
-					}
-				}
-				aoData.push( { "name": "iSortingCols",   "value": iCounter } );
-				
-				for ( i=0 ; i<iColumns ; i++ )
-				{
-					aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
-				}
-			}
-			
-			return aoData;
-		}
-		
-		
-		/**
-		 * Add Ajax parameters from plug-ins
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param array {objects} aoData name/value pairs to send to the server
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnServerParams( oSettings, aoData )
-		{
-			_fnCallbackFire( oSettings, 'aoServerParams', 'serverParams', [aoData] );
-		}
-		
-		
-		/**
-		 * Data the data from the server (nuking the old) and redraw the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {object} json json data return from the server.
-		 *  @param {string} json.sEcho Tracking flag for DataTables to match requests
-		 *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
-		 *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
-		 *  @param {array} json.aaData The data to display on this page
-		 *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnAjaxUpdateDraw ( oSettings, json )
-		{
-			if ( json.sEcho !== undefined )
-			{
-				/* Protect against old returns over-writing a new one. Possible when you get
-				 * very fast interaction, and later queries are completed much faster
-				 */
-				if ( json.sEcho*1 < oSettings.iDraw )
-				{
-					return;
-				}
-				else
-				{
-					oSettings.iDraw = json.sEcho * 1;
-				}
-			}
-			
-			if ( !oSettings.oScroll.bInfinite ||
-				   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
-			{
-				_fnClearTable( oSettings );
-			}
-			oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
-			oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
-			
-			/* Determine if reordering is required */
-			var sOrdering = _fnColumnOrdering(oSettings);
-			var bReOrder = (json.sColumns !== undefined && sOrdering !== "" && json.sColumns != sOrdering );
-			var aiIndex;
-			if ( bReOrder )
-			{
-				aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
-			}
-			
-			var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
-			for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
-			{
-				if ( bReOrder )
-				{
-					/* If we need to re-order, then create a new array with the correct order and add it */
-					var aDataSorted = [];
-					for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
-					{
-						aDataSorted.push( aData[i][ aiIndex[j] ] );
-					}
-					_fnAddData( oSettings, aDataSorted );
-				}
-				else
-				{
-					/* No re-order required, sever got it "right" - just straight add */
-					_fnAddData( oSettings, aData[i] );
-				}
-			}
-			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			
-			oSettings.bAjaxDataGet = false;
-			_fnDraw( oSettings );
-			oSettings.bAjaxDataGet = true;
-			_fnProcessingDisplay( oSettings, false );
-		}
-		
-		
-		
-		/**
-		 * Generate the node required for filtering text
-		 *  @returns {node} Filter control element
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlFilter ( oSettings )
-		{
-			var oPreviousSearch = oSettings.oPreviousSearch;
-			
-			var sSearchStr = oSettings.oLanguage.sSearch;
-			sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
-			  sSearchStr.replace('_INPUT_', '<input type="text" />') :
-			  sSearchStr==="" ? '<input type="text" />' : sSearchStr+' <input type="text" />';
-			
-			var nFilter = document.createElement( 'div' );
-			nFilter.className = oSettings.oClasses.sFilter;
-			nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
-			if ( !oSettings.aanFeatures.f )
-			{
-				nFilter.id = oSettings.sTableId+'_filter';
-			}
-			
-			var jqFilter = $('input[type="text"]', nFilter);
-		
-			// Store a reference to the input element, so other input elements could be
-			// added to the filter wrapper if needed (submit button for example)
-			nFilter._DT_Input = jqFilter[0];
-		
-			jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
-			jqFilter.bind( 'keyup.DT', function(e) {
-				/* Update all other filter input elements for the new display */
-				var n = oSettings.aanFeatures.f;
-				var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
-		
-				for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-				{
-					if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
-					{
-						$(n[i]._DT_Input).val( val );
-					}
-				}
-				
-				/* Now do the filter */
-				if ( val != oPreviousSearch.sSearch )
-				{
-					_fnFilterComplete( oSettings, { 
-						"sSearch": val, 
-						"bRegex": oPreviousSearch.bRegex,
-						"bSmart": oPreviousSearch.bSmart ,
-						"bCaseInsensitive": oPreviousSearch.bCaseInsensitive 
-					} );
-				}
-			} );
-		
-			jqFilter
-				.attr('aria-controls', oSettings.sTableId)
-				.bind( 'keypress.DT', function(e) {
-					/* Prevent form submission */
-					if ( e.keyCode == 13 )
-					{
-						return false;
-					}
-				}
-			);
-			
-			return nFilter;
-		}
-		
-		
-		/**
-		 * Filter the table using both the global filter and column based filtering
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {object} oSearch search information
-		 *  @param {int} [iForce] force a research of the master array (1) or not (undefined or 0)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFilterComplete ( oSettings, oInput, iForce )
-		{
-			var oPrevSearch = oSettings.oPreviousSearch;
-			var aoPrevSearch = oSettings.aoPreSearchCols;
-			var fnSaveFilter = function ( oFilter ) {
-				/* Save the filtering values */
-				oPrevSearch.sSearch = oFilter.sSearch;
-				oPrevSearch.bRegex = oFilter.bRegex;
-				oPrevSearch.bSmart = oFilter.bSmart;
-				oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
-			};
-		
-			/* In server-side processing all filtering is done by the server, so no point hanging around here */
-			if ( !oSettings.oFeatures.bServerSide )
-			{
-				/* Global filter */
-				_fnFilter( oSettings, oInput.sSearch, iForce, oInput.bRegex, oInput.bSmart, oInput.bCaseInsensitive );
-				fnSaveFilter( oInput );
-		
-				/* Now do the individual column filter */
-				for ( var i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
-				{
-					_fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, aoPrevSearch[i].bRegex, 
-						aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
-				}
-				
-				/* Custom filtering */
-				_fnFilterCustom( oSettings );
-			}
-			else
-			{
-				fnSaveFilter( oInput );
-			}
-			
-			/* Tell the draw function we have been filtering */
-			oSettings.bFiltered = true;
-			$(oSettings.oInstance).trigger('filter', oSettings);
-			
-			/* Redraw the table */
-			oSettings._iDisplayStart = 0;
-			_fnCalculateEnd( oSettings );
-			_fnDraw( oSettings );
-			
-			/* Rebuild search array 'offline' */
-			_fnBuildSearchArray( oSettings, 0 );
-		}
-		
-		
-		/**
-		 * Apply custom filtering functions
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFilterCustom( oSettings )
-		{
-			var afnFilters = DataTable.ext.afnFiltering;
-			var aiFilterColumns = _fnGetColumns( oSettings, 'bSearchable' );
-		
-			for ( var i=0, iLen=afnFilters.length ; i<iLen ; i++ )
-			{
-				var iCorrector = 0;
-				for ( var j=0, jLen=oSettings.aiDisplay.length ; j<jLen ; j++ )
-				{
-					var iDisIndex = oSettings.aiDisplay[j-iCorrector];
-					var bTest = afnFilters[i](
-						oSettings,
-						_fnGetRowData( oSettings, iDisIndex, 'filter', aiFilterColumns ),
-						iDisIndex
-					);
-					
-					/* Check if we should use this row based on the filtering function */
-					if ( !bTest )
-					{
-						oSettings.aiDisplay.splice( j-iCorrector, 1 );
-						iCorrector++;
-					}
-				}
-			}
-		}
-		
-		
-		/**
-		 * Filter the table on a per-column basis
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string} sInput string to filter on
-		 *  @param {int} iColumn column to filter
-		 *  @param {bool} bRegex treat search string as a regular expression or not
-		 *  @param {bool} bSmart use smart filtering or not
-		 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFilterColumn ( oSettings, sInput, iColumn, bRegex, bSmart, bCaseInsensitive )
-		{
-			if ( sInput === "" )
-			{
-				return;
-			}
-			
-			var iIndexCorrector = 0;
-			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
-			
-			for ( var i=oSettings.aiDisplay.length-1 ; i>=0 ; i-- )
-			{
-				var sData = _fnDataToSearch( _fnGetCellData( oSettings, oSettings.aiDisplay[i], iColumn, 'filter' ),
-					oSettings.aoColumns[iColumn].sType );
-				if ( ! rpSearch.test( sData ) )
-				{
-					oSettings.aiDisplay.splice( i, 1 );
-					iIndexCorrector++;
-				}
-			}
-		}
-		
-		
-		/**
-		 * Filter the data table based on user input and draw the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string} sInput string to filter on
-		 *  @param {int} iForce optional - force a research of the master array (1) or not (undefined or 0)
-		 *  @param {bool} bRegex treat as a regular expression or not
-		 *  @param {bool} bSmart perform smart filtering or not
-		 *  @param {bool} bCaseInsensitive Do case insenstive matching or not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFilter( oSettings, sInput, iForce, bRegex, bSmart, bCaseInsensitive )
-		{
-			var i;
-			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart, bCaseInsensitive );
-			var oPrevSearch = oSettings.oPreviousSearch;
-			
-			/* Check if we are forcing or not - optional parameter */
-			if ( !iForce )
-			{
-				iForce = 0;
-			}
-			
-			/* Need to take account of custom filtering functions - always filter */
-			if ( DataTable.ext.afnFiltering.length !== 0 )
-			{
-				iForce = 1;
-			}
-			
-			/*
-			 * If the input is blank - we want the full data set
-			 */
-			if ( sInput.length <= 0 )
-			{
-				oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
-				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			}
-			else
-			{
-				/*
-				 * We are starting a new search or the new search string is smaller 
-				 * then the old one (i.e. delete). Search from the master array
-			 	 */
-				if ( oSettings.aiDisplay.length == oSettings.aiDisplayMaster.length ||
-					   oPrevSearch.sSearch.length > sInput.length || iForce == 1 ||
-					   sInput.indexOf(oPrevSearch.sSearch) !== 0 )
-				{
-					/* Nuke the old display array - we are going to rebuild it */
-					oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
-					
-					/* Force a rebuild of the search array */
-					_fnBuildSearchArray( oSettings, 1 );
-					
-					/* Search through all records to populate the search array
-					 * The the oSettings.aiDisplayMaster and asDataSearch arrays have 1 to 1 
-					 * mapping
-					 */
-					for ( i=0 ; i<oSettings.aiDisplayMaster.length ; i++ )
-					{
-						if ( rpSearch.test(oSettings.asDataSearch[i]) )
-						{
-							oSettings.aiDisplay.push( oSettings.aiDisplayMaster[i] );
-						}
-					}
-			  }
-			  else
-				{
-			  	/* Using old search array - refine it - do it this way for speed
-			  	 * Don't have to search the whole master array again
-					 */
-			  	var iIndexCorrector = 0;
-			  	
-			  	/* Search the current results */
-			  	for ( i=0 ; i<oSettings.asDataSearch.length ; i++ )
-					{
-			  		if ( ! rpSearch.test(oSettings.asDataSearch[i]) )
-						{
-			  			oSettings.aiDisplay.splice( i-iIndexCorrector, 1 );
-			  			iIndexCorrector++;
-			  		}
-			  	}
-			  }
-			}
-		}
-		
-		
-		/**
-		 * Create an array which can be quickly search through
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iMaster use the master data array - optional
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnBuildSearchArray ( oSettings, iMaster )
-		{
-			if ( !oSettings.oFeatures.bServerSide )
-			{
-				/* Clear out the old data */
-				oSettings.asDataSearch = [];
-		
-				var aiFilterColumns = _fnGetColumns( oSettings, 'bSearchable' );
-				var aiIndex = (iMaster===1) ?
-				 	oSettings.aiDisplayMaster :
-				 	oSettings.aiDisplay;
-				
-				for ( var i=0, iLen=aiIndex.length ; i<iLen ; i++ )
-				{
-					oSettings.asDataSearch[i] = _fnBuildSearchRow(
-						oSettings,
-						_fnGetRowData( oSettings, aiIndex[i], 'filter', aiFilterColumns )
-					);
-				}
-			}
-		}
-		
-		
-		/**
-		 * Create a searchable string from a single data row
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {array} aData Row data array to use for the data to search
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnBuildSearchRow( oSettings, aData )
-		{
-			var sSearch = aData.join('  ');
-			
-			/* If it looks like there is an HTML entity in the string, attempt to decode it */
-			if ( sSearch.indexOf('&') !== -1 )
-			{
-				sSearch = $('<div>').html(sSearch).text();
-			}
-			
-			// Strip newline characters
-			return sSearch.replace( /[\n\r]/g, " " );
-		}
-		
-		/**
-		 * Build a regular expression object suitable for searching a table
-		 *  @param {string} sSearch string to search for
-		 *  @param {bool} bRegex treat as a regular expression or not
-		 *  @param {bool} bSmart perform smart filtering or not
-		 *  @param {bool} bCaseInsensitive Do case insensitive matching or not
-		 *  @returns {RegExp} constructed object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFilterCreateSearch( sSearch, bRegex, bSmart, bCaseInsensitive )
-		{
-			var asSearch, sRegExpString;
-			
-			if ( bSmart )
-			{
-				/* Generate the regular expression to use. Something along the lines of:
-				 * ^(?=.*?\bone\b)(?=.*?\btwo\b)(?=.*?\bthree\b).*$
-				 */
-				asSearch = bRegex ? sSearch.split( ' ' ) : _fnEscapeRegex( sSearch ).split( ' ' );
-				sRegExpString = '^(?=.*?'+asSearch.join( ')(?=.*?' )+').*$';
-				return new RegExp( sRegExpString, bCaseInsensitive ? "i" : "" );
-			}
-			else
-			{
-				sSearch = bRegex ? sSearch : _fnEscapeRegex( sSearch );
-				return new RegExp( sSearch, bCaseInsensitive ? "i" : "" );
-			}
-		}
-		
-		
-		/**
-		 * Convert raw data into something that the user can search on
-		 *  @param {string} sData data to be modified
-		 *  @param {string} sType data type
-		 *  @returns {string} search string
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnDataToSearch ( sData, sType )
-		{
-			if ( typeof DataTable.ext.ofnSearch[sType] === "function" )
-			{
-				return DataTable.ext.ofnSearch[sType]( sData );
-			}
-			else if ( sData === null )
-			{
-				return '';
-			}
-			else if ( sType == "html" )
-			{
-				return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" );
-			}
-			else if ( typeof sData === "string" )
-			{
-				return sData.replace(/[\r\n]/g," ");
-			}
-			return sData;
-		}
-		
-		
-		/**
-		 * scape a string such that it can be used in a regular expression
-		 *  @param {string} sVal string to escape
-		 *  @returns {string} escaped string
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnEscapeRegex ( sVal )
-		{
-			var acEscape = [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ];
-			var reReplace = new RegExp( '(\\' + acEscape.join('|\\') + ')', 'g' );
-			return sVal.replace(reReplace, '\\$1');
-		}
-		
-		
-		/**
-		 * Generate the node required for the info display
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {node} Information element
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlInfo ( oSettings )
-		{
-			var nInfo = document.createElement( 'div' );
-			nInfo.className = oSettings.oClasses.sInfo;
-			
-			/* Actions that are to be taken once only for this feature */
-			if ( !oSettings.aanFeatures.i )
-			{
-				/* Add draw callback */
-				oSettings.aoDrawCallback.push( {
-					"fn": _fnUpdateInfo,
-					"sName": "information"
-				} );
-				
-				/* Add id */
-				nInfo.id = oSettings.sTableId+'_info';
-			}
-			oSettings.nTable.setAttribute( 'aria-describedby', oSettings.sTableId+'_info' );
-			
-			return nInfo;
-		}
-		
-		
-		/**
-		 * Update the information elements in the display
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnUpdateInfo ( oSettings )
-		{
-			/* Show information about the table */
-			if ( !oSettings.oFeatures.bInfo || oSettings.aanFeatures.i.length === 0 )
-			{
-				return;
-			}
-			
-			var
-				oLang = oSettings.oLanguage,
-				iStart = oSettings._iDisplayStart+1,
-				iEnd = oSettings.fnDisplayEnd(),
-				iMax = oSettings.fnRecordsTotal(),
-				iTotal = oSettings.fnRecordsDisplay(),
-				sOut;
-			
-			if ( iTotal === 0 )
-			{
-				/* Empty record set */
-				sOut = oLang.sInfoEmpty;
-			}
-			else {
-				/* Normal record set */
-				sOut = oLang.sInfo;
-			}
-		
-			if ( iTotal != iMax )
-			{
-				/* Record set after filtering */
-				sOut += ' ' + oLang.sInfoFiltered;
-			}
-		
-			// Convert the macros
-			sOut += oLang.sInfoPostFix;
-			sOut = _fnInfoMacros( oSettings, sOut );
-			
-			if ( oLang.fnInfoCallback !== null )
-			{
-				sOut = oLang.fnInfoCallback.call( oSettings.oInstance, 
-					oSettings, iStart, iEnd, iMax, iTotal, sOut );
-			}
-			
-			var n = oSettings.aanFeatures.i;
-			for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-			{
-				$(n[i]).html( sOut );
-			}
-		}
-		
-		
-		function _fnInfoMacros ( oSettings, str )
-		{
-			var
-				iStart = oSettings._iDisplayStart+1,
-				sStart = oSettings.fnFormatNumber( iStart ),
-				iEnd = oSettings.fnDisplayEnd(),
-				sEnd = oSettings.fnFormatNumber( iEnd ),
-				iTotal = oSettings.fnRecordsDisplay(),
-				sTotal = oSettings.fnFormatNumber( iTotal ),
-				iMax = oSettings.fnRecordsTotal(),
-				sMax = oSettings.fnFormatNumber( iMax );
-		
-			// When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
-			// internally
-			if ( oSettings.oScroll.bInfinite )
-			{
-				sStart = oSettings.fnFormatNumber( 1 );
-			}
-		
-			return str.
-				replace(/_START_/g, sStart).
-				replace(/_END_/g,   sEnd).
-				replace(/_TOTAL_/g, sTotal).
-				replace(/_MAX_/g,   sMax);
-		}
-		
-		
-		
-		/**
-		 * Draw the table for the first time, adding all required features
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnInitialise ( oSettings )
-		{
-			var i, iLen, iAjaxStart=oSettings.iInitDisplayStart;
-			
-			/* Ensure that the table data is fully initialised */
-			if ( oSettings.bInitialised === false )
-			{
-				setTimeout( function(){ _fnInitialise( oSettings ); }, 200 );
-				return;
-			}
-			
-			/* Show the display HTML options */
-			_fnAddOptionsHtml( oSettings );
-			
-			/* Build and draw the header / footer for the table */
-			_fnBuildHead( oSettings );
-			_fnDrawHead( oSettings, oSettings.aoHeader );
-			if ( oSettings.nTFoot )
-			{
-				_fnDrawHead( oSettings, oSettings.aoFooter );
-			}
-		
-			/* Okay to show that something is going on now */
-			_fnProcessingDisplay( oSettings, true );
-			
-			/* Calculate sizes for columns */
-			if ( oSettings.oFeatures.bAutoWidth )
-			{
-				_fnCalculateColumnWidths( oSettings );
-			}
-			
-			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				if ( oSettings.aoColumns[i].sWidth !== null )
-				{
-					oSettings.aoColumns[i].nTh.style.width = _fnStringToCss( oSettings.aoColumns[i].sWidth );
-				}
-			}
-			
-			/* If there is default sorting required - let's do it. The sort function will do the
-			 * drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
-			 * the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
-			 */
-			if ( oSettings.oFeatures.bSort )
-			{
-				_fnSort( oSettings );
-			}
-			else if ( oSettings.oFeatures.bFilter )
-			{
-				_fnFilterComplete( oSettings, oSettings.oPreviousSearch );
-			}
-			else
-			{
-				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-				_fnCalculateEnd( oSettings );
-				_fnDraw( oSettings );
-			}
-			
-			/* if there is an ajax source load the data */
-			if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
-			{
-				var aoData = [];
-				_fnServerParams( oSettings, aoData );
-				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData, function(json) {
-					var aData = (oSettings.sAjaxDataProp !== "") ?
-					 	_fnGetObjectDataFn( oSettings.sAjaxDataProp )(json) : json;
-		
-					/* Got the data - add it to the table */
-					for ( i=0 ; i<aData.length ; i++ )
-					{
-						_fnAddData( oSettings, aData[i] );
-					}
-					
-					/* Reset the init display for cookie saving. We've already done a filter, and
-					 * therefore cleared it before. So we need to make it appear 'fresh'
-					 */
-					oSettings.iInitDisplayStart = iAjaxStart;
-					
-					if ( oSettings.oFeatures.bSort )
-					{
-						_fnSort( oSettings );
-					}
-					else
-					{
-						oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-						_fnCalculateEnd( oSettings );
-						_fnDraw( oSettings );
-					}
-					
-					_fnProcessingDisplay( oSettings, false );
-					_fnInitComplete( oSettings, json );
-				}, oSettings );
-				return;
-			}
-			
-			/* Server-side processing initialisation complete is done at the end of _fnDraw */
-			if ( !oSettings.oFeatures.bServerSide )
-			{
-				_fnProcessingDisplay( oSettings, false );
-				_fnInitComplete( oSettings );
-			}
-		}
-		
-		
-		/**
-		 * Draw the table for the first time, adding all required features
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {object} [json] JSON from the server that completed the table, if using Ajax source
-		 *    with client-side processing (optional)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnInitComplete ( oSettings, json )
-		{
-			oSettings._bInitComplete = true;
-			_fnCallbackFire( oSettings, 'aoInitComplete', 'init', [oSettings, json] );
-		}
-		
-		
-		/**
-		 * Language compatibility - when certain options are given, and others aren't, we
-		 * need to duplicate the values over, in order to provide backwards compatibility
-		 * with older language files.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnLanguageCompat( oLanguage )
-		{
-			var oDefaults = DataTable.defaults.oLanguage;
-		
-			/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
-			 * sZeroRecords - assuming that is given.
-			 */
-			if ( !oLanguage.sEmptyTable && oLanguage.sZeroRecords &&
-				oDefaults.sEmptyTable === "No data available in table" )
-			{
-				_fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sEmptyTable' );
-			}
-		
-			/* Likewise with loading records */
-			if ( !oLanguage.sLoadingRecords && oLanguage.sZeroRecords &&
-				oDefaults.sLoadingRecords === "Loading..." )
-			{
-				_fnMap( oLanguage, oLanguage, 'sZeroRecords', 'sLoadingRecords' );
-			}
-		}
-		
-		
-		
-		/**
-		 * Generate the node required for user display length changing
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {node} Display length feature node
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlLength ( oSettings )
-		{
-			if ( oSettings.oScroll.bInfinite )
-			{
-				return null;
-			}
-			
-			/* This can be overruled by not using the _MENU_ var/macro in the language variable */
-			var sName = 'name="'+oSettings.sTableId+'_length"';
-			var sStdMenu = '<select size="1" '+sName+'>';
-			var i, iLen;
-			var aLengthMenu = oSettings.aLengthMenu;
-			
-			if ( aLengthMenu.length == 2 && typeof aLengthMenu[0] === 'object' && 
-					typeof aLengthMenu[1] === 'object' )
-			{
-				for ( i=0, iLen=aLengthMenu[0].length ; i<iLen ; i++ )
-				{
-					sStdMenu += '<option value="'+aLengthMenu[0][i]+'">'+aLengthMenu[1][i]+'</option>';
-				}
-			}
-			else
-			{
-				for ( i=0, iLen=aLengthMenu.length ; i<iLen ; i++ )
-				{
-					sStdMenu += '<option value="'+aLengthMenu[i]+'">'+aLengthMenu[i]+'</option>';
-				}
-			}
-			sStdMenu += '</select>';
-			
-			var nLength = document.createElement( 'div' );
-			if ( !oSettings.aanFeatures.l )
-			{
-				nLength.id = oSettings.sTableId+'_length';
-			}
-			nLength.className = oSettings.oClasses.sLength;
-			nLength.innerHTML = '<label>'+oSettings.oLanguage.sLengthMenu.replace( '_MENU_', sStdMenu )+'</label>';
-			
-			/*
-			 * Set the length to the current display length - thanks to Andrea Pavlovic for this fix,
-			 * and Stefan Skopnik for fixing the fix!
-			 */
-			$('select option[value="'+oSettings._iDisplayLength+'"]', nLength).attr("selected", true);
-			
-			$('select', nLength).bind( 'change.DT', function(e) {
-				var iVal = $(this).val();
-				
-				/* Update all other length options for the new display */
-				var n = oSettings.aanFeatures.l;
-				for ( i=0, iLen=n.length ; i<iLen ; i++ )
-				{
-					if ( n[i] != this.parentNode )
-					{
-						$('select', n[i]).val( iVal );
-					}
-				}
-				
-				/* Redraw the table */
-				oSettings._iDisplayLength = parseInt(iVal, 10);
-				_fnCalculateEnd( oSettings );
-				
-				/* If we have space to show extra rows (backing up from the end point - then do so */
-				if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
-				{
-					oSettings._iDisplayStart = oSettings.fnDisplayEnd() - oSettings._iDisplayLength;
-					if ( oSettings._iDisplayStart < 0 )
-					{
-						oSettings._iDisplayStart = 0;
-					}
-				}
-				
-				if ( oSettings._iDisplayLength == -1 )
-				{
-					oSettings._iDisplayStart = 0;
-				}
-				
-				_fnDraw( oSettings );
-			} );
-		
-		
-			$('select', nLength).attr('aria-controls', oSettings.sTableId);
-			
-			return nLength;
-		}
-		
-		
-		/**
-		 * Recalculate the end point based on the start point
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCalculateEnd( oSettings )
-		{
-			if ( oSettings.oFeatures.bPaginate === false )
-			{
-				oSettings._iDisplayEnd = oSettings.aiDisplay.length;
-			}
-			else
-			{
-				/* Set the end point of the display - based on how many elements there are
-				 * still to display
-				 */
-				if ( oSettings._iDisplayStart + oSettings._iDisplayLength > oSettings.aiDisplay.length ||
-					   oSettings._iDisplayLength == -1 )
-				{
-					oSettings._iDisplayEnd = oSettings.aiDisplay.length;
-				}
-				else
-				{
-					oSettings._iDisplayEnd = oSettings._iDisplayStart + oSettings._iDisplayLength;
-				}
-			}
-		}
-		
-		
-		
-		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-		 * Note that most of the paging logic is done in 
-		 * DataTable.ext.oPagination
-		 */
-		
-		/**
-		 * Generate the node required for default pagination
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {node} Pagination feature node
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlPaginate ( oSettings )
-		{
-			if ( oSettings.oScroll.bInfinite )
-			{
-				return null;
-			}
-			
-			var nPaginate = document.createElement( 'div' );
-			nPaginate.className = oSettings.oClasses.sPaging+oSettings.sPaginationType;
-			
-			DataTable.ext.oPagination[ oSettings.sPaginationType ].fnInit( oSettings, nPaginate, 
-				function( oSettings ) {
-					_fnCalculateEnd( oSettings );
-					_fnDraw( oSettings );
-				}
-			);
-			
-			/* Add a draw callback for the pagination on first instance, to update the paging display */
-			if ( !oSettings.aanFeatures.p )
-			{
-				oSettings.aoDrawCallback.push( {
-					"fn": function( oSettings ) {
-						DataTable.ext.oPagination[ oSettings.sPaginationType ].fnUpdate( oSettings, function( oSettings ) {
-							_fnCalculateEnd( oSettings );
-							_fnDraw( oSettings );
-						} );
-					},
-					"sName": "pagination"
-				} );
-			}
-			return nPaginate;
-		}
-		
-		
-		/**
-		 * Alter the display settings to change the page
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
-		 *    or page number to jump to (integer)
-		 *  @returns {bool} true page has changed, false - no change (no effect) eg 'first' on page 1
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnPageChange ( oSettings, mAction )
-		{
-			var iOldStart = oSettings._iDisplayStart;
-			
-			if ( typeof mAction === "number" )
-			{
-				oSettings._iDisplayStart = mAction * oSettings._iDisplayLength;
-				if ( oSettings._iDisplayStart > oSettings.fnRecordsDisplay() )
-				{
-					oSettings._iDisplayStart = 0;
-				}
-			}
-			else if ( mAction == "first" )
-			{
-				oSettings._iDisplayStart = 0;
-			}
-			else if ( mAction == "previous" )
-			{
-				oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
-					oSettings._iDisplayStart - oSettings._iDisplayLength :
-					0;
-				
-				/* Correct for under-run */
-				if ( oSettings._iDisplayStart < 0 )
-				{
-				  oSettings._iDisplayStart = 0;
-				}
-			}
-			else if ( mAction == "next" )
-			{
-				if ( oSettings._iDisplayLength >= 0 )
-				{
-					/* Make sure we are not over running the display array */
-					if ( oSettings._iDisplayStart + oSettings._iDisplayLength < oSettings.fnRecordsDisplay() )
-					{
-						oSettings._iDisplayStart += oSettings._iDisplayLength;
-					}
-				}
-				else
-				{
-					oSettings._iDisplayStart = 0;
-				}
-			}
-			else if ( mAction == "last" )
-			{
-				if ( oSettings._iDisplayLength >= 0 )
-				{
-					var iPages = parseInt( (oSettings.fnRecordsDisplay()-1) / oSettings._iDisplayLength, 10 ) + 1;
-					oSettings._iDisplayStart = (iPages-1) * oSettings._iDisplayLength;
-				}
-				else
-				{
-					oSettings._iDisplayStart = 0;
-				}
-			}
-			else
-			{
-				_fnLog( oSettings, 0, "Unknown paging action: "+mAction );
-			}
-			$(oSettings.oInstance).trigger('page', oSettings);
-			
-			return iOldStart != oSettings._iDisplayStart;
-		}
-		
-		
-		
-		/**
-		 * Generate the node required for the processing node
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {node} Processing element
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlProcessing ( oSettings )
-		{
-			var nProcessing = document.createElement( 'div' );
-			
-			if ( !oSettings.aanFeatures.r )
-			{
-				nProcessing.id = oSettings.sTableId+'_processing';
-			}
-			nProcessing.innerHTML = oSettings.oLanguage.sProcessing;
-			nProcessing.className = oSettings.oClasses.sProcessing;
-			oSettings.nTable.parentNode.insertBefore( nProcessing, oSettings.nTable );
-			
-			return nProcessing;
-		}
-		
-		
-		/**
-		 * Display or hide the processing indicator
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {bool} bShow Show the processing indicator (true) or not (false)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnProcessingDisplay ( oSettings, bShow )
-		{
-			if ( oSettings.oFeatures.bProcessing )
-			{
-				var an = oSettings.aanFeatures.r;
-				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
-				{
-					an[i].style.visibility = bShow ? "visible" : "hidden";
-				}
-			}
-		
-			$(oSettings.oInstance).trigger('processing', [oSettings, bShow]);
-		}
-		
-		/**
-		 * Add any control elements for the table - specifically scrolling
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {node} Node to add to the DOM
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnFeatureHtmlTable ( oSettings )
-		{
-			/* Check if scrolling is enabled or not - if not then leave the DOM unaltered */
-			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
-			{
-				return oSettings.nTable;
-			}
-			
-			/*
-			 * The HTML structure that we want to generate in this function is:
-			 *  div - nScroller
-			 *    div - nScrollHead
-			 *      div - nScrollHeadInner
-			 *        table - nScrollHeadTable
-			 *          thead - nThead
-			 *    div - nScrollBody
-			 *      table - oSettings.nTable
-			 *        thead - nTheadSize
-			 *        tbody - nTbody
-			 *    div - nScrollFoot
-			 *      div - nScrollFootInner
-			 *        table - nScrollFootTable
-			 *          tfoot - nTfoot
-			 */
-			var
-			 	nScroller = document.createElement('div'),
-			 	nScrollHead = document.createElement('div'),
-			 	nScrollHeadInner = document.createElement('div'),
-			 	nScrollBody = document.createElement('div'),
-			 	nScrollFoot = document.createElement('div'),
-			 	nScrollFootInner = document.createElement('div'),
-			 	nScrollHeadTable = oSettings.nTable.cloneNode(false),
-			 	nScrollFootTable = oSettings.nTable.cloneNode(false),
-				nThead = oSettings.nTable.getElementsByTagName('thead')[0],
-			 	nTfoot = oSettings.nTable.getElementsByTagName('tfoot').length === 0 ? null : 
-					oSettings.nTable.getElementsByTagName('tfoot')[0],
-				oClasses = oSettings.oClasses;
-			
-			nScrollHead.appendChild( nScrollHeadInner );
-			nScrollFoot.appendChild( nScrollFootInner );
-			nScrollBody.appendChild( oSettings.nTable );
-			nScroller.appendChild( nScrollHead );
-			nScroller.appendChild( nScrollBody );
-			nScrollHeadInner.appendChild( nScrollHeadTable );
-			nScrollHeadTable.appendChild( nThead );
-			if ( nTfoot !== null )
-			{
-				nScroller.appendChild( nScrollFoot );
-				nScrollFootInner.appendChild( nScrollFootTable );
-				nScrollFootTable.appendChild( nTfoot );
-			}
-			
-			nScroller.className = oClasses.sScrollWrapper;
-			nScrollHead.className = oClasses.sScrollHead;
-			nScrollHeadInner.className = oClasses.sScrollHeadInner;
-			nScrollBody.className = oClasses.sScrollBody;
-			nScrollFoot.className = oClasses.sScrollFoot;
-			nScrollFootInner.className = oClasses.sScrollFootInner;
-			
-			if ( oSettings.oScroll.bAutoCss )
-			{
-				nScrollHead.style.overflow = "hidden";
-				nScrollHead.style.position = "relative";
-				nScrollFoot.style.overflow = "hidden";
-				nScrollBody.style.overflow = "auto";
-			}
-			
-			nScrollHead.style.border = "0";
-			nScrollHead.style.width = "100%";
-			nScrollFoot.style.border = "0";
-			nScrollHeadInner.style.width = oSettings.oScroll.sXInner !== "" ?
-				oSettings.oScroll.sXInner : "100%"; /* will be overwritten */
-			
-			/* Modify attributes to respect the clones */
-			nScrollHeadTable.removeAttribute('id');
-			nScrollHeadTable.style.marginLeft = "0";
-			oSettings.nTable.style.marginLeft = "0";
-			if ( nTfoot !== null )
-			{
-				nScrollFootTable.removeAttribute('id');
-				nScrollFootTable.style.marginLeft = "0";
-			}
-			
-			/* Move caption elements from the body to the header, footer or leave where it is
-			 * depending on the configuration. Note that the DTD says there can be only one caption */
-			var nCaption = $(oSettings.nTable).children('caption');
-			if ( nCaption.length > 0 )
-			{
-				nCaption = nCaption[0];
-				if ( nCaption._captionSide === "top" )
-				{
-					nScrollHeadTable.appendChild( nCaption );
-				}
-				else if ( nCaption._captionSide === "bottom" && nTfoot )
-				{
-					nScrollFootTable.appendChild( nCaption );
-				}
-			}
-			
-			/*
-			 * Sizing
-			 */
-			/* When x-scrolling add the width and a scroller to move the header with the body */
-			if ( oSettings.oScroll.sX !== "" )
-			{
-				nScrollHead.style.width = _fnStringToCss( oSettings.oScroll.sX );
-				nScrollBody.style.width = _fnStringToCss( oSettings.oScroll.sX );
-				
-				if ( nTfoot !== null )
-				{
-					nScrollFoot.style.width = _fnStringToCss( oSettings.oScroll.sX );	
-				}
-				
-				/* When the body is scrolled, then we also want to scroll the headers */
-				$(nScrollBody).scroll( function (e) {
-					nScrollHead.scrollLeft = this.scrollLeft;
-					
-					if ( nTfoot !== null )
-					{
-						nScrollFoot.scrollLeft = this.scrollLeft;
-					}
-				} );
-			}
-			
-			/* When yscrolling, add the height */
-			if ( oSettings.oScroll.sY !== "" )
-			{
-				nScrollBody.style.height = _fnStringToCss( oSettings.oScroll.sY );
-			}
-			
-			/* Redraw - align columns across the tables */
-			oSettings.aoDrawCallback.push( {
-				"fn": _fnScrollDraw,
-				"sName": "scrolling"
-			} );
-			
-			/* Infinite scrolling event handlers */
-			if ( oSettings.oScroll.bInfinite )
-			{
-				$(nScrollBody).scroll( function() {
-					/* Use a blocker to stop scrolling from loading more data while other data is still loading */
-					if ( !oSettings.bDrawing && $(this).scrollTop() !== 0 )
-					{
-						/* Check if we should load the next data set */
-						if ( $(this).scrollTop() + $(this).height() > 
-							$(oSettings.nTable).height() - oSettings.oScroll.iLoadGap )
-						{
-							/* Only do the redraw if we have to - we might be at the end of the data */
-							if ( oSettings.fnDisplayEnd() < oSettings.fnRecordsDisplay() )
-							{
-								_fnPageChange( oSettings, 'next' );
-								_fnCalculateEnd( oSettings );
-								_fnDraw( oSettings );
-							}
-						}
-					}
-				} );
-			}
-			
-			oSettings.nScrollHead = nScrollHead;
-			oSettings.nScrollFoot = nScrollFoot;
-			
-			return nScroller;
-		}
-		
-		
-		/**
-		 * Update the various tables for resizing. It's a bit of a pig this function, but
-		 * basically the idea to:
-		 *   1. Re-create the table inside the scrolling div
-		 *   2. Take live measurements from the DOM
-		 *   3. Apply the measurements
-		 *   4. Clean up
-		 *  @param {object} o dataTables settings object
-		 *  @returns {node} Node to add to the DOM
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnScrollDraw ( o )
-		{
-			var
-				nScrollHeadInner = o.nScrollHead.getElementsByTagName('div')[0],
-				nScrollHeadTable = nScrollHeadInner.getElementsByTagName('table')[0],
-				nScrollBody = o.nTable.parentNode,
-				i, iLen, j, jLen, anHeadToSize, anHeadSizers, anFootSizers, anFootToSize, oStyle, iVis,
-				nTheadSize, nTfootSize,
-				iWidth, aApplied=[], aAppliedFooter=[], iSanityWidth,
-				nScrollFootInner = (o.nTFoot !== null) ? o.nScrollFoot.getElementsByTagName('div')[0] : null,
-				nScrollFootTable = (o.nTFoot !== null) ? nScrollFootInner.getElementsByTagName('table')[0] : null,
-				ie67 = o.oBrowser.bScrollOversize,
-				zeroOut = function(nSizer) {
-					oStyle = nSizer.style;
-					oStyle.paddingTop = "0";
-					oStyle.paddingBottom = "0";
-					oStyle.borderTopWidth = "0";
-					oStyle.borderBottomWidth = "0";
-					oStyle.height = 0;
-				};
-			
-			/*
-			 * 1. Re-create the table inside the scrolling div
-			 */
-			
-			/* Remove the old minimised thead and tfoot elements in the inner table */
-			$(o.nTable).children('thead, tfoot').remove();
-		
-			/* Clone the current header and footer elements and then place it into the inner table */
-			nTheadSize = $(o.nTHead).clone()[0];
-			o.nTable.insertBefore( nTheadSize, o.nTable.childNodes[0] );
-			anHeadToSize = o.nTHead.getElementsByTagName('tr');
-			anHeadSizers = nTheadSize.getElementsByTagName('tr');
-			
-			if ( o.nTFoot !== null )
-			{
-				nTfootSize = $(o.nTFoot).clone()[0];
-				o.nTable.insertBefore( nTfootSize, o.nTable.childNodes[1] );
-				anFootToSize = o.nTFoot.getElementsByTagName('tr');
-				anFootSizers = nTfootSize.getElementsByTagName('tr');
-			}
-			
-			/*
-			 * 2. Take live measurements from the DOM - do not alter the DOM itself!
-			 */
-			
-			/* Remove old sizing and apply the calculated column widths
-			 * Get the unique column headers in the newly created (cloned) header. We want to apply the
-			 * calculated sizes to this header
-			 */
-			if ( o.oScroll.sX === "" )
-			{
-				nScrollBody.style.width = '100%';
-				nScrollHeadInner.parentNode.style.width = '100%';
-			}
-			
-			var nThs = _fnGetUniqueThs( o, nTheadSize );
-			for ( i=0, iLen=nThs.length ; i<iLen ; i++ )
-			{
-				iVis = _fnVisibleToColumnIndex( o, i );
-				nThs[i].style.width = o.aoColumns[iVis].sWidth;
-			}
-			
-			if ( o.nTFoot !== null )
-			{
-				_fnApplyToChildren( function(n) {
-					n.style.width = "";
-				}, anFootSizers );
-			}
-		
-			// If scroll collapse is enabled, when we put the headers back into the body for sizing, we
-			// will end up forcing the scrollbar to appear, making our measurements wrong for when we
-			// then hide it (end of this function), so add the header height to the body scroller.
-			if ( o.oScroll.bCollapse && o.oScroll.sY !== "" )
-			{
-				nScrollBody.style.height = (nScrollBody.offsetHeight + o.nTHead.offsetHeight)+"px";
-			}
-			
-			/* Size the table as a whole */
-			iSanityWidth = $(o.nTable).outerWidth();
-			if ( o.oScroll.sX === "" )
-			{
-				/* No x scrolling */
-				o.nTable.style.width = "100%";
-				
-				/* I know this is rubbish - but IE7 will make the width of the table when 100% include
-				 * the scrollbar - which is shouldn't. When there is a scrollbar we need to take this
-				 * into account.
-				 */
-				if ( ie67 && ($('tbody', nScrollBody).height() > nScrollBody.offsetHeight || 
-					$(nScrollBody).css('overflow-y') == "scroll")  )
-				{
-					o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth() - o.oScroll.iBarWidth);
-				}
-			}
-			else
-			{
-				if ( o.oScroll.sXInner !== "" )
-				{
-					/* x scroll inner has been given - use it */
-					o.nTable.style.width = _fnStringToCss(o.oScroll.sXInner);
-				}
-				else if ( iSanityWidth == $(nScrollBody).width() &&
-				   $(nScrollBody).height() < $(o.nTable).height() )
-				{
-					/* There is y-scrolling - try to take account of the y scroll bar */
-					o.nTable.style.width = _fnStringToCss( iSanityWidth-o.oScroll.iBarWidth );
-					if ( $(o.nTable).outerWidth() > iSanityWidth-o.oScroll.iBarWidth )
-					{
-						/* Not possible to take account of it */
-						o.nTable.style.width = _fnStringToCss( iSanityWidth );
-					}
-				}
-				else
-				{
-					/* All else fails */
-					o.nTable.style.width = _fnStringToCss( iSanityWidth );
-				}
-			}
-			
-			/* Recalculate the sanity width - now that we've applied the required width, before it was
-			 * a temporary variable. This is required because the column width calculation is done
-			 * before this table DOM is created.
-			 */
-			iSanityWidth = $(o.nTable).outerWidth();
-			
-			/* We want the hidden header to have zero height, so remove padding and borders. Then
-			 * set the width based on the real headers
-			 */
-			
-			// Apply all styles in one pass. Invalidates layout only once because we don't read any 
-			// DOM properties.
-			_fnApplyToChildren( zeroOut, anHeadSizers );
-			 
-			// Read all widths in next pass. Forces layout only once because we do not change 
-			// any DOM properties.
-			_fnApplyToChildren( function(nSizer) {
-				aApplied.push( _fnStringToCss( $(nSizer).width() ) );
-			}, anHeadSizers );
-			 
-			// Apply all widths in final pass. Invalidates layout only once because we do not
-			// read any DOM properties.
-			_fnApplyToChildren( function(nToSize, i) {
-				nToSize.style.width = aApplied[i];
-			}, anHeadToSize );
-		
-			$(anHeadSizers).height(0);
-			
-			/* Same again with the footer if we have one */
-			if ( o.nTFoot !== null )
-			{
-				_fnApplyToChildren( zeroOut, anFootSizers );
-				 
-				_fnApplyToChildren( function(nSizer) {
-					aAppliedFooter.push( _fnStringToCss( $(nSizer).width() ) );
-				}, anFootSizers );
-				 
-				_fnApplyToChildren( function(nToSize, i) {
-					nToSize.style.width = aAppliedFooter[i];
-				}, anFootToSize );
-		
-				$(anFootSizers).height(0);
-			}
-			
-			/*
-			 * 3. Apply the measurements
-			 */
-			
-			/* "Hide" the header and footer that we used for the sizing. We want to also fix their width
-			 * to what they currently are
-			 */
-			_fnApplyToChildren( function(nSizer, i) {
-				nSizer.innerHTML = "";
-				nSizer.style.width = aApplied[i];
-			}, anHeadSizers );
-			
-			if ( o.nTFoot !== null )
-			{
-				_fnApplyToChildren( function(nSizer, i) {
-					nSizer.innerHTML = "";
-					nSizer.style.width = aAppliedFooter[i];
-				}, anFootSizers );
-			}
-			
-			/* Sanity check that the table is of a sensible width. If not then we are going to get
-			 * misalignment - try to prevent this by not allowing the table to shrink below its min width
-			 */
-			if ( $(o.nTable).outerWidth() < iSanityWidth )
-			{
-				/* The min width depends upon if we have a vertical scrollbar visible or not */
-				var iCorrection = ((nScrollBody.scrollHeight > nScrollBody.offsetHeight || 
-					$(nScrollBody).css('overflow-y') == "scroll")) ?
-						iSanityWidth+o.oScroll.iBarWidth : iSanityWidth;
-				
-				/* IE6/7 are a law unto themselves... */
-				if ( ie67 && (nScrollBody.scrollHeight > 
-					nScrollBody.offsetHeight || $(nScrollBody).css('overflow-y') == "scroll")  )
-				{
-					o.nTable.style.width = _fnStringToCss( iCorrection-o.oScroll.iBarWidth );
-				}
-				
-				/* Apply the calculated minimum width to the table wrappers */
-				nScrollBody.style.width = _fnStringToCss( iCorrection );
-				o.nScrollHead.style.width = _fnStringToCss( iCorrection );
-				
-				if ( o.nTFoot !== null )
-				{
-					o.nScrollFoot.style.width = _fnStringToCss( iCorrection );
-				}
-				
-				/* And give the user a warning that we've stopped the table getting too small */
-				if ( o.oScroll.sX === "" )
-				{
-					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
-						" misalignment. The table has been drawn at its minimum possible width." );
-				}
-				else if ( o.oScroll.sXInner !== "" )
-				{
-					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
-						" misalignment. Increase the sScrollXInner value or remove it to allow automatic"+
-						" calculation" );
-				}
-			}
-			else
-			{
-				nScrollBody.style.width = _fnStringToCss( '100%' );
-				o.nScrollHead.style.width = _fnStringToCss( '100%' );
-				
-				if ( o.nTFoot !== null )
-				{
-					o.nScrollFoot.style.width = _fnStringToCss( '100%' );
-				}
-			}
-			
-			
-			/*
-			 * 4. Clean up
-			 */
-			if ( o.oScroll.sY === "" )
-			{
-				/* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
-				 * the scrollbar height from the visible display, rather than adding it on. We need to
-				 * set the height in order to sort this. Don't want to do it in any other browsers.
-				 */
-				if ( ie67 )
-				{
-					nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+o.oScroll.iBarWidth );
-				}
-			}
-			
-			if ( o.oScroll.sY !== "" && o.oScroll.bCollapse )
-			{
-				nScrollBody.style.height = _fnStringToCss( o.oScroll.sY );
-				
-				var iExtra = (o.oScroll.sX !== "" && o.nTable.offsetWidth > nScrollBody.offsetWidth) ?
-				 	o.oScroll.iBarWidth : 0;
-				if ( o.nTable.offsetHeight < nScrollBody.offsetHeight )
-				{
-					nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+iExtra );
-				}
-			}
-			
-			/* Finally set the width's of the header and footer tables */
-			var iOuterWidth = $(o.nTable).outerWidth();
-			nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth );
-			nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth );
-		
-			// Figure out if there are scrollbar present - if so then we need a the header and footer to
-			// provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar)
-			var bScrolling = $(o.nTable).height() > nScrollBody.clientHeight || $(nScrollBody).css('overflow-y') == "scroll";
-			nScrollHeadInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px";
-			
-			if ( o.nTFoot !== null )
-			{
-				nScrollFootTable.style.width = _fnStringToCss( iOuterWidth );
-				nScrollFootInner.style.width = _fnStringToCss( iOuterWidth );
-				nScrollFootInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px";
-			}
-		
-			/* Adjust the position of the header in case we loose the y-scrollbar */
-			$(nScrollBody).scroll();
-			
-			/* If sorting or filtering has occurred, jump the scrolling back to the top */
-			if ( o.bSorted || o.bFiltered )
-			{
-				nScrollBody.scrollTop = 0;
-			}
-		}
-		
-		
-		/**
-		 * Apply a given function to the display child nodes of an element array (typically
-		 * TD children of TR rows
-		 *  @param {function} fn Method to apply to the objects
-		 *  @param array {nodes} an1 List of elements to look through for display children
-		 *  @param array {nodes} an2 Another list (identical structure to the first) - optional
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnApplyToChildren( fn, an1, an2 )
-		{
-			var index=0, i=0, iLen=an1.length;
-			var nNode1, nNode2;
-		
-			while ( i < iLen )
-			{
-				nNode1 = an1[i].firstChild;
-				nNode2 = an2 ? an2[i].firstChild : null;
-				while ( nNode1 )
-				{
-					if ( nNode1.nodeType === 1 )
-					{
-						if ( an2 )
-						{
-							fn( nNode1, nNode2, index );
-						}
-						else
-						{
-							fn( nNode1, index );
-						}
-						index++;
-					}
-					nNode1 = nNode1.nextSibling;
-					nNode2 = an2 ? nNode2.nextSibling : null;
-				}
-				i++;
-			}
-		}
-		
-		/**
-		 * Convert a CSS unit width to pixels (e.g. 2em)
-		 *  @param {string} sWidth width to be converted
-		 *  @param {node} nParent parent to get the with for (required for relative widths) - optional
-		 *  @returns {int} iWidth width in pixels
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnConvertToWidth ( sWidth, nParent )
-		{
-			if ( !sWidth || sWidth === null || sWidth === '' )
-			{
-				return 0;
-			}
-			
-			if ( !nParent )
-			{
-				nParent = document.body;
-			}
-			
-			var iWidth;
-			var nTmp = document.createElement( "div" );
-			nTmp.style.width = _fnStringToCss( sWidth );
-			
-			nParent.appendChild( nTmp );
-			iWidth = nTmp.offsetWidth;
-			nParent.removeChild( nTmp );
-			
-			return ( iWidth );
-		}
-		
-		
-		/**
-		 * Calculate the width of columns for the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCalculateColumnWidths ( oSettings )
-		{
-			var iTableWidth = oSettings.nTable.offsetWidth;
-			var iUserInputs = 0;
-			var iTmpWidth;
-			var iVisibleColumns = 0;
-			var iColums = oSettings.aoColumns.length;
-			var i, iIndex, iCorrector, iWidth;
-			var oHeaders = $('th', oSettings.nTHead);
-			var widthAttr = oSettings.nTable.getAttribute('width');
-			var nWrapper = oSettings.nTable.parentNode;
-			
-			/* Convert any user input sizes into pixel sizes */
-			for ( i=0 ; i<iColums ; i++ )
-			{
-				if ( oSettings.aoColumns[i].bVisible )
-				{
-					iVisibleColumns++;
-					
-					if ( oSettings.aoColumns[i].sWidth !== null )
-					{
-						iTmpWidth = _fnConvertToWidth( oSettings.aoColumns[i].sWidthOrig, 
-							nWrapper );
-						if ( iTmpWidth !== null )
-						{
-							oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
-						}
-							
-						iUserInputs++;
-					}
-				}
-			}
-			
-			/* If the number of columns in the DOM equals the number that we have to process in 
-			 * DataTables, then we can use the offsets that are created by the web-browser. No custom 
-			 * sizes can be set in order for this to happen, nor scrolling used
-			 */
-			if ( iColums == oHeaders.length && iUserInputs === 0 && iVisibleColumns == iColums &&
-				oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
-			{
-				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-				{
-					iTmpWidth = $(oHeaders[i]).width();
-					if ( iTmpWidth !== null )
-					{
-						oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
-					}
-				}
-			}
-			else
-			{
-				/* Otherwise we are going to have to do some calculations to get the width of each column.
-				 * Construct a 1 row table with the widest node in the data, and any user defined widths,
-				 * then insert it into the DOM and allow the browser to do all the hard work of
-				 * calculating table widths.
-				 */
-				var
-					nCalcTmp = oSettings.nTable.cloneNode( false ),
-					nTheadClone = oSettings.nTHead.cloneNode(true),
-					nBody = document.createElement( 'tbody' ),
-					nTr = document.createElement( 'tr' ),
-					nDivSizing;
-				
-				nCalcTmp.removeAttribute( "id" );
-				nCalcTmp.appendChild( nTheadClone );
-				if ( oSettings.nTFoot !== null )
-				{
-					nCalcTmp.appendChild( oSettings.nTFoot.cloneNode(true) );
-					_fnApplyToChildren( function(n) {
-						n.style.width = "";
-					}, nCalcTmp.getElementsByTagName('tr') );
-				}
-				
-				nCalcTmp.appendChild( nBody );
-				nBody.appendChild( nTr );
-				
-				/* Remove any sizing that was previously applied by the styles */
-				var jqColSizing = $('thead th', nCalcTmp);
-				if ( jqColSizing.length === 0 )
-				{
-					jqColSizing = $('tbody tr:eq(0)>td', nCalcTmp);
-				}
-		
-				/* Apply custom sizing to the cloned header */
-				var nThs = _fnGetUniqueThs( oSettings, nTheadClone );
-				iCorrector = 0;
-				for ( i=0 ; i<iColums ; i++ )
-				{
-					var oColumn = oSettings.aoColumns[i];
-					if ( oColumn.bVisible && oColumn.sWidthOrig !== null && oColumn.sWidthOrig !== "" )
-					{
-						nThs[i-iCorrector].style.width = _fnStringToCss( oColumn.sWidthOrig );
-					}
-					else if ( oColumn.bVisible )
-					{
-						nThs[i-iCorrector].style.width = "";
-					}
-					else
-					{
-						iCorrector++;
-					}
-				}
-		
-				/* Find the biggest td for each column and put it into the table */
-				for ( i=0 ; i<iColums ; i++ )
-				{
-					if ( oSettings.aoColumns[i].bVisible )
-					{
-						var nTd = _fnGetWidestNode( oSettings, i );
-						if ( nTd !== null )
-						{
-							nTd = nTd.cloneNode(true);
-							if ( oSettings.aoColumns[i].sContentPadding !== "" )
-							{
-								nTd.innerHTML += oSettings.aoColumns[i].sContentPadding;
-							}
-							nTr.appendChild( nTd );
-						}
-					}
-				}
-				
-				/* Build the table and 'display' it */
-				nWrapper.appendChild( nCalcTmp );
-				
-				/* When scrolling (X or Y) we want to set the width of the table as appropriate. However,
-				 * when not scrolling leave the table width as it is. This results in slightly different,
-				 * but I think correct behaviour
-				 */
-				if ( oSettings.oScroll.sX !== "" && oSettings.oScroll.sXInner !== "" )
-				{
-					nCalcTmp.style.width = _fnStringToCss(oSettings.oScroll.sXInner);
-				}
-				else if ( oSettings.oScroll.sX !== "" )
-				{
-					nCalcTmp.style.width = "";
-					if ( $(nCalcTmp).width() < nWrapper.offsetWidth )
-					{
-						nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
-					}
-				}
-				else if ( oSettings.oScroll.sY !== "" )
-				{
-					nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
-				}
-				else if ( widthAttr )
-				{
-					nCalcTmp.style.width = _fnStringToCss( widthAttr );
-				}
-				nCalcTmp.style.visibility = "hidden";
-				
-				/* Scrolling considerations */
-				_fnScrollingWidthAdjust( oSettings, nCalcTmp );
-				
-				/* Read the width's calculated by the browser and store them for use by the caller. We
-				 * first of all try to use the elements in the body, but it is possible that there are
-				 * no elements there, under which circumstances we use the header elements
-				 */
-				var oNodes = $("tbody tr:eq(0)", nCalcTmp).children();
-				if ( oNodes.length === 0 )
-				{
-					oNodes = _fnGetUniqueThs( oSettings, $('thead', nCalcTmp)[0] );
-				}
-		
-				/* Browsers need a bit of a hand when a width is assigned to any columns when 
-				 * x-scrolling as they tend to collapse the table to the min-width, even if
-				 * we sent the column widths. So we need to keep track of what the table width
-				 * should be by summing the user given values, and the automatic values
-				 */
-				if ( oSettings.oScroll.sX !== "" )
-				{
-					var iTotal = 0;
-					iCorrector = 0;
-					for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-					{
-						if ( oSettings.aoColumns[i].bVisible )
-						{
-							if ( oSettings.aoColumns[i].sWidthOrig === null )
-							{
-								iTotal += $(oNodes[iCorrector]).outerWidth();
-							}
-							else
-							{
-								iTotal += parseInt(oSettings.aoColumns[i].sWidth.replace('px',''), 10) +
-									($(oNodes[iCorrector]).outerWidth() - $(oNodes[iCorrector]).width());
-							}
-							iCorrector++;
-						}
-					}
-					
-					nCalcTmp.style.width = _fnStringToCss( iTotal );
-					oSettings.nTable.style.width = _fnStringToCss( iTotal );
-				}
-		
-				iCorrector = 0;
-				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-				{
-					if ( oSettings.aoColumns[i].bVisible )
-					{
-						iWidth = $(oNodes[iCorrector]).width();
-						if ( iWidth !== null && iWidth > 0 )
-						{
-							oSettings.aoColumns[i].sWidth = _fnStringToCss( iWidth );
-						}
-						iCorrector++;
-					}
-				}
-		
-				var cssWidth = $(nCalcTmp).css('width');
-				oSettings.nTable.style.width = (cssWidth.indexOf('%') !== -1) ?
-				    cssWidth : _fnStringToCss( $(nCalcTmp).outerWidth() );
-				nCalcTmp.parentNode.removeChild( nCalcTmp );
-			}
-		
-			if ( widthAttr )
-			{
-				oSettings.nTable.style.width = _fnStringToCss( widthAttr );
-			}
-		}
-		
-		
-		/**
-		 * Adjust a table's width to take account of scrolling
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {node} n table node
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnScrollingWidthAdjust ( oSettings, n )
-		{
-			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY !== "" )
-			{
-				/* When y-scrolling only, we want to remove the width of the scroll bar so the table
-				 * + scroll bar will fit into the area avaialble.
-				 */
-				var iOrigWidth = $(n).width();
-				n.style.width = _fnStringToCss( $(n).outerWidth()-oSettings.oScroll.iBarWidth );
-			}
-			else if ( oSettings.oScroll.sX !== "" )
-			{
-				/* When x-scrolling both ways, fix the table at it's current size, without adjusting */
-				n.style.width = _fnStringToCss( $(n).outerWidth() );
-			}
-		}
-		
-		
-		/**
-		 * Get the widest node
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iCol column of interest
-		 *  @returns {node} widest table node
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetWidestNode( oSettings, iCol )
-		{
-			var iMaxIndex = _fnGetMaxLenString( oSettings, iCol );
-			if ( iMaxIndex < 0 )
-			{
-				return null;
-			}
-		
-			if ( oSettings.aoData[iMaxIndex].nTr === null )
-			{
-				var n = document.createElement('td');
-				n.innerHTML = _fnGetCellData( oSettings, iMaxIndex, iCol, '' );
-				return n;
-			}
-			return _fnGetTdNodes(oSettings, iMaxIndex)[iCol];
-		}
-		
-		
-		/**
-		 * Get the maximum strlen for each data column
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iCol column of interest
-		 *  @returns {string} max string length for each column
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetMaxLenString( oSettings, iCol )
-		{
-			var iMax = -1;
-			var iMaxIndex = -1;
-			
-			for ( var i=0 ; i<oSettings.aoData.length ; i++ )
-			{
-				var s = _fnGetCellData( oSettings, i, iCol, 'display' )+"";
-				s = s.replace( /<.*?>/g, "" );
-				if ( s.length > iMax )
-				{
-					iMax = s.length;
-					iMaxIndex = i;
-				}
-			}
-			
-			return iMaxIndex;
-		}
-		
-		
-		/**
-		 * Append a CSS unit (only if required) to a string
-		 *  @param {array} aArray1 first array
-		 *  @param {array} aArray2 second array
-		 *  @returns {int} 0 if match, 1 if length is different, 2 if no match
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnStringToCss( s )
-		{
-			if ( s === null )
-			{
-				return "0px";
-			}
-			
-			if ( typeof s == 'number' )
-			{
-				if ( s < 0 )
-				{
-					return "0px";
-				}
-				return s+"px";
-			}
-			
-			/* Check if the last character is not 0-9 */
-			var c = s.charCodeAt( s.length-1 );
-			if (c < 0x30 || c > 0x39)
-			{
-				return s;
-			}
-			return s+"px";
-		}
-		
-		
-		/**
-		 * Get the width of a scroll bar in this browser being used
-		 *  @returns {int} width in pixels
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnScrollBarWidth ()
-		{  
-			var inner = document.createElement('p');
-			var style = inner.style;
-			style.width = "100%";
-			style.height = "200px";
-			style.padding = "0px";
-			
-			var outer = document.createElement('div');
-			style = outer.style;
-			style.position = "absolute";
-			style.top = "0px";
-			style.left = "0px";
-			style.visibility = "hidden";
-			style.width = "200px";
-			style.height = "150px";
-			style.padding = "0px";
-			style.overflow = "hidden";
-			outer.appendChild(inner);
-			
-			document.body.appendChild(outer);
-			var w1 = inner.offsetWidth;
-			outer.style.overflow = 'scroll';
-			var w2 = inner.offsetWidth;
-			if ( w1 == w2 )
-			{
-				w2 = outer.clientWidth;
-			}
-			
-			document.body.removeChild(outer);
-			return (w1 - w2);  
-		}
-		
-		/**
-		 * Change the order of the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {bool} bApplyClasses optional - should we apply classes or not
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSort ( oSettings, bApplyClasses )
-		{
-			var
-				i, iLen, j, jLen, k, kLen,
-				sDataType, nTh,
-				aaSort = [],
-			 	aiOrig = [],
-				oSort = DataTable.ext.oSort,
-				aoData = oSettings.aoData,
-				aoColumns = oSettings.aoColumns,
-				oAria = oSettings.oLanguage.oAria;
-			
-			/* No sorting required if server-side or no sorting array */
-			if ( !oSettings.oFeatures.bServerSide && 
-				(oSettings.aaSorting.length !== 0 || oSettings.aaSortingFixed !== null) )
-			{
-				aaSort = ( oSettings.aaSortingFixed !== null ) ?
-					oSettings.aaSortingFixed.concat( oSettings.aaSorting ) :
-					oSettings.aaSorting.slice();
-				
-				/* If there is a sorting data type, and a function belonging to it, then we need to
-				 * get the data from the developer's function and apply it for this column
-				 */
-				for ( i=0 ; i<aaSort.length ; i++ )
-				{
-					var iColumn = aaSort[i][0];
-					var iVisColumn = _fnColumnIndexToVisible( oSettings, iColumn );
-					sDataType = oSettings.aoColumns[ iColumn ].sSortDataType;
-					if ( DataTable.ext.afnSortData[sDataType] )
-					{
-						var aData = DataTable.ext.afnSortData[sDataType].call( 
-							oSettings.oInstance, oSettings, iColumn, iVisColumn
-						);
-						if ( aData.length === aoData.length )
-						{
-							for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
-							{
-								_fnSetCellData( oSettings, j, iColumn, aData[j] );
-							}
-						}
-						else
-						{
-							_fnLog( oSettings, 0, "Returned data sort array (col "+iColumn+") is the wrong length" );
-						}
-					}
-				}
-				
-				/* Create a value - key array of the current row positions such that we can use their
-				 * current position during the sort, if values match, in order to perform stable sorting
-				 */
-				for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
-				{
-					aiOrig[ oSettings.aiDisplayMaster[i] ] = i;
-				}
-		
-				/* Build an internal data array which is specific to the sort, so we can get and prep
-				 * the data to be sorted only once, rather than needing to do it every time the sorting
-				 * function runs. This make the sorting function a very simple comparison
-				 */
-				var iSortLen = aaSort.length;
-				var fnSortFormat, aDataSort;
-				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-				{
-					for ( j=0 ; j<iSortLen ; j++ )
-					{
-						aDataSort = aoColumns[ aaSort[j][0] ].aDataSort;
-		
-						for ( k=0, kLen=aDataSort.length ; k<kLen ; k++ )
-						{
-							sDataType = aoColumns[ aDataSort[k] ].sType;
-							fnSortFormat = oSort[ (sDataType ? sDataType : 'string')+"-pre" ];
-							
-							aoData[i]._aSortData[ aDataSort[k] ] = fnSortFormat ?
-								fnSortFormat( _fnGetCellData( oSettings, i, aDataSort[k], 'sort' ) ) :
-								_fnGetCellData( oSettings, i, aDataSort[k], 'sort' );
-						}
-					}
-				}
-				
-				/* Do the sort - here we want multi-column sorting based on a given data source (column)
-				 * and sorting function (from oSort) in a certain direction. It's reasonably complex to
-				 * follow on it's own, but this is what we want (example two column sorting):
-				 *  fnLocalSorting = function(a,b){
-				 *  	var iTest;
-				 *  	iTest = oSort['string-asc']('data11', 'data12');
-				 *  	if (iTest !== 0)
-				 *  		return iTest;
-				 *    iTest = oSort['numeric-desc']('data21', 'data22');
-				 *    if (iTest !== 0)
-				 *  		return iTest;
-				 *  	return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
-				 *  }
-				 * Basically we have a test for each sorting column, if the data in that column is equal,
-				 * test the next column. If all columns match, then we use a numeric sort on the row 
-				 * positions in the original data array to provide a stable sort.
-				 */
-				oSettings.aiDisplayMaster.sort( function ( a, b ) {
-					var k, l, lLen, iTest, aDataSort, sDataType;
-					for ( k=0 ; k<iSortLen ; k++ )
-					{
-						aDataSort = aoColumns[ aaSort[k][0] ].aDataSort;
-		
-						for ( l=0, lLen=aDataSort.length ; l<lLen ; l++ )
-						{
-							sDataType = aoColumns[ aDataSort[l] ].sType;
-							
-							iTest = oSort[ (sDataType ? sDataType : 'string')+"-"+aaSort[k][1] ](
-								aoData[a]._aSortData[ aDataSort[l] ],
-								aoData[b]._aSortData[ aDataSort[l] ]
-							);
-						
-							if ( iTest !== 0 )
-							{
-								return iTest;
-							}
-						}
-					}
-					
-					return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
-				} );
-			}
-			
-			/* Alter the sorting classes to take account of the changes */
-			if ( (bApplyClasses === undefined || bApplyClasses) && !oSettings.oFeatures.bDeferRender )
-			{
-				_fnSortingClasses( oSettings );
-			}
-		
-			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				var sTitle = aoColumns[i].sTitle.replace( /<.*?>/g, "" );
-				nTh = aoColumns[i].nTh;
-				nTh.removeAttribute('aria-sort');
-				nTh.removeAttribute('aria-label');
-				
-				/* In ARIA only the first sorting column can be marked as sorting - no multi-sort option */
-				if ( aoColumns[i].bSortable )
-				{
-					if ( aaSort.length > 0 && aaSort[0][0] == i )
-					{
-						nTh.setAttribute('aria-sort', aaSort[0][1]=="asc" ? "ascending" : "descending" );
-						
-						var nextSort = (aoColumns[i].asSorting[ aaSort[0][2]+1 ]) ? 
-							aoColumns[i].asSorting[ aaSort[0][2]+1 ] : aoColumns[i].asSorting[0];
-						nTh.setAttribute('aria-label', sTitle+
-							(nextSort=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
-					}
-					else
-					{
-						nTh.setAttribute('aria-label', sTitle+
-							(aoColumns[i].asSorting[0]=="asc" ? oAria.sSortAscending : oAria.sSortDescending) );
-					}
-				}
-				else
-				{
-					nTh.setAttribute('aria-label', sTitle);
-				}
-			}
-			
-			/* Tell the draw function that we have sorted the data */
-			oSettings.bSorted = true;
-			$(oSettings.oInstance).trigger('sort', oSettings);
-			
-			/* Copy the master data into the draw array and re-draw */
-			if ( oSettings.oFeatures.bFilter )
-			{
-				/* _fnFilter() will redraw the table for us */
-				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
-			}
-			else
-			{
-				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-				oSettings._iDisplayStart = 0; /* reset display back to page 0 */
-				_fnCalculateEnd( oSettings );
-				_fnDraw( oSettings );
-			}
-		}
-		
-		
-		/**
-		 * Attach a sort handler (click) to a node
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {node} nNode node to attach the handler to
-		 *  @param {int} iDataIndex column sorting index
-		 *  @param {function} [fnCallback] callback function
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSortAttachListener ( oSettings, nNode, iDataIndex, fnCallback )
-		{
-			_fnBindAction( nNode, {}, function (e) {
-				/* If the column is not sortable - don't to anything */
-				if ( oSettings.aoColumns[iDataIndex].bSortable === false )
-				{
-					return;
-				}
-				
-				/*
-				 * This is a little bit odd I admit... I declare a temporary function inside the scope of
-				 * _fnBuildHead and the click handler in order that the code presented here can be used 
-				 * twice - once for when bProcessing is enabled, and another time for when it is 
-				 * disabled, as we need to perform slightly different actions.
-				 *   Basically the issue here is that the Javascript engine in modern browsers don't 
-				 * appear to allow the rendering engine to update the display while it is still executing
-				 * it's thread (well - it does but only after long intervals). This means that the 
-				 * 'processing' display doesn't appear for a table sort. To break the js thread up a bit
-				 * I force an execution break by using setTimeout - but this breaks the expected 
-				 * thread continuation for the end-developer's point of view (their code would execute
-				 * too early), so we only do it when we absolutely have to.
-				 */
-				var fnInnerSorting = function () {
-					var iColumn, iNextSort;
-					
-					/* If the shift key is pressed then we are multiple column sorting */
-					if ( e.shiftKey )
-					{
-						/* Are we already doing some kind of sort on this column? */
-						var bFound = false;
-						for ( var i=0 ; i<oSettings.aaSorting.length ; i++ )
-						{
-							if ( oSettings.aaSorting[i][0] == iDataIndex )
-							{
-								bFound = true;
-								iColumn = oSettings.aaSorting[i][0];
-								iNextSort = oSettings.aaSorting[i][2]+1;
-								
-								if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
-								{
-									/* Reached the end of the sorting options, remove from multi-col sort */
-									oSettings.aaSorting.splice( i, 1 );
-								}
-								else
-								{
-									/* Move onto next sorting direction */
-									oSettings.aaSorting[i][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
-									oSettings.aaSorting[i][2] = iNextSort;
-								}
-								break;
-							}
-						}
-						
-						/* No sort yet - add it in */
-						if ( bFound === false )
-						{
-							oSettings.aaSorting.push( [ iDataIndex, 
-								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
-						}
-					}
-					else
-					{
-						/* If no shift key then single column sort */
-						if ( oSettings.aaSorting.length == 1 && oSettings.aaSorting[0][0] == iDataIndex )
-						{
-							iColumn = oSettings.aaSorting[0][0];
-							iNextSort = oSettings.aaSorting[0][2]+1;
-							if ( !oSettings.aoColumns[iColumn].asSorting[iNextSort] )
-							{
-								iNextSort = 0;
-							}
-							oSettings.aaSorting[0][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
-							oSettings.aaSorting[0][2] = iNextSort;
-						}
-						else
-						{
-							oSettings.aaSorting.splice( 0, oSettings.aaSorting.length );
-							oSettings.aaSorting.push( [ iDataIndex, 
-								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
-						}
-					}
-					
-					/* Run the sort */
-					_fnSort( oSettings );
-				}; /* /fnInnerSorting */
-				
-				if ( !oSettings.oFeatures.bProcessing )
-				{
-					fnInnerSorting();
-				}
-				else
-				{
-					_fnProcessingDisplay( oSettings, true );
-					setTimeout( function() {
-						fnInnerSorting();
-						if ( !oSettings.oFeatures.bServerSide )
-						{
-							_fnProcessingDisplay( oSettings, false );
-						}
-					}, 0 );
-				}
-				
-				/* Call the user specified callback function - used for async user interaction */
-				if ( typeof fnCallback == 'function' )
-				{
-					fnCallback( oSettings );
-				}
-			} );
-		}
-		
-		
-		/**
-		 * Set the sorting classes on the header, Note: it is safe to call this function 
-		 * when bSort and bSortClasses are false
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSortingClasses( oSettings )
-		{
-			var i, iLen, j, jLen, iFound;
-			var aaSort, sClass;
-			var iColumns = oSettings.aoColumns.length;
-			var oClasses = oSettings.oClasses;
-			
-			for ( i=0 ; i<iColumns ; i++ )
-			{
-				if ( oSettings.aoColumns[i].bSortable )
-				{
-					$(oSettings.aoColumns[i].nTh).removeClass( oClasses.sSortAsc +" "+ oClasses.sSortDesc +
-						" "+ oSettings.aoColumns[i].sSortingClass );
-				}
-			}
-			
-			if ( oSettings.aaSortingFixed !== null )
-			{
-				aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
-			}
-			else
-			{
-				aaSort = oSettings.aaSorting.slice();
-			}
-			
-			/* Apply the required classes to the header */
-			for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-			{
-				if ( oSettings.aoColumns[i].bSortable )
-				{
-					sClass = oSettings.aoColumns[i].sSortingClass;
-					iFound = -1;
-					for ( j=0 ; j<aaSort.length ; j++ )
-					{
-						if ( aaSort[j][0] == i )
-						{
-							sClass = ( aaSort[j][1] == "asc" ) ?
-								oClasses.sSortAsc : oClasses.sSortDesc;
-							iFound = j;
-							break;
-						}
-					}
-					$(oSettings.aoColumns[i].nTh).addClass( sClass );
-					
-					if ( oSettings.bJUI )
-					{
-						/* jQuery UI uses extra markup */
-						var jqSpan = $("span."+oClasses.sSortIcon,  oSettings.aoColumns[i].nTh);
-						jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+ 
-							oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );
-						
-						var sSpanClass;
-						if ( iFound == -1 )
-						{
-						 	sSpanClass = oSettings.aoColumns[i].sSortingClassJUI;
-						}
-						else if ( aaSort[iFound][1] == "asc" )
-						{
-							sSpanClass = oClasses.sSortJUIAsc;
-						}
-						else
-						{
-							sSpanClass = oClasses.sSortJUIDesc;
-						}
-						
-						jqSpan.addClass( sSpanClass );
-					}
-				}
-				else
-				{
-					/* No sorting on this column, so add the base class. This will have been assigned by
-					 * _fnAddColumn
-					 */
-					$(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
-				}
-			}
-			
-			/* 
-			 * Apply the required classes to the table body
-			 * Note that this is given as a feature switch since it can significantly slow down a sort
-			 * on large data sets (adding and removing of classes is always slow at the best of times..)
-			 * Further to this, note that this code is admittedly fairly ugly. It could be made a lot 
-			 * simpler using jQuery selectors and add/removeClass, but that is significantly slower
-			 * (on the order of 5 times slower) - hence the direct DOM manipulation here.
-			 * Note that for deferred drawing we do use jQuery - the reason being that taking the first
-			 * row found to see if the whole column needs processed can miss classes since the first
-			 * column might be new.
-			 */
-			sClass = oClasses.sSortColumn;
-			
-			if ( oSettings.oFeatures.bSort && oSettings.oFeatures.bSortClasses )
-			{
-				var nTds = _fnGetTdNodes( oSettings );
-				
-				/* Determine what the sorting class for each column should be */
-				var iClass, iTargetCol;
-				var asClasses = [];
-				for (i = 0; i < iColumns; i++)
-				{
-					asClasses.push("");
-				}
-				for (i = 0, iClass = 1; i < aaSort.length; i++)
-				{
-					iTargetCol = parseInt( aaSort[i][0], 10 );
-					asClasses[iTargetCol] = sClass + iClass;
-					
-					if ( iClass < 3 )
-					{
-						iClass++;
-					}
-				}
-				
-				/* Make changes to the classes for each cell as needed */
-				var reClass = new RegExp(sClass + "[123]");
-				var sTmpClass, sCurrentClass, sNewClass;
-				for ( i=0, iLen=nTds.length; i<iLen; i++ )
-				{
-					/* Determine which column we're looking at */
-					iTargetCol = i % iColumns;
-					
-					/* What is the full list of classes now */
-					sCurrentClass = nTds[i].className;
-					/* What sorting class should be applied? */
-					sNewClass = asClasses[iTargetCol];
-					/* What would the new full list be if we did a replacement? */
-					sTmpClass = sCurrentClass.replace(reClass, sNewClass);
-					
-					if ( sTmpClass != sCurrentClass )
-					{
-						/* We changed something */
-						nTds[i].className = $.trim( sTmpClass );
-					}
-					else if ( sNewClass.length > 0 && sCurrentClass.indexOf(sNewClass) == -1 )
-					{
-						/* We need to add a class */
-						nTds[i].className = sCurrentClass + " " + sNewClass;
-					}
-				}
-			}
-		}
-		
-		
-		
-		/**
-		 * Save the state of a table in a cookie such that the page can be reloaded
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSaveState ( oSettings )
-		{
-			if ( !oSettings.oFeatures.bStateSave || oSettings.bDestroying )
-			{
-				return;
-			}
-		
-			/* Store the interesting variables */
-			var i, iLen, bInfinite=oSettings.oScroll.bInfinite;
-			var oState = {
-				"iCreate":      new Date().getTime(),
-				"iStart":       (bInfinite ? 0 : oSettings._iDisplayStart),
-				"iEnd":         (bInfinite ? oSettings._iDisplayLength : oSettings._iDisplayEnd),
-				"iLength":      oSettings._iDisplayLength,
-				"aaSorting":    $.extend( true, [], oSettings.aaSorting ),
-				"oSearch":      $.extend( true, {}, oSettings.oPreviousSearch ),
-				"aoSearchCols": $.extend( true, [], oSettings.aoPreSearchCols ),
-				"abVisCols":    []
-			};
-		
-			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-			{
-				oState.abVisCols.push( oSettings.aoColumns[i].bVisible );
-			}
-		
-			_fnCallbackFire( oSettings, "aoStateSaveParams", 'stateSaveParams', [oSettings, oState] );
-			
-			oSettings.fnStateSave.call( oSettings.oInstance, oSettings, oState );
-		}
-		
-		
-		/**
-		 * Attempt to load a saved table state from a cookie
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {object} oInit DataTables init object so we can override settings
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnLoadState ( oSettings, oInit )
-		{
-			if ( !oSettings.oFeatures.bStateSave )
-			{
-				return;
-			}
-		
-			var oData = oSettings.fnStateLoad.call( oSettings.oInstance, oSettings );
-			if ( !oData )
-			{
-				return;
-			}
-			
-			/* Allow custom and plug-in manipulation functions to alter the saved data set and
-			 * cancelling of loading by returning false
-			 */
-			var abStateLoad = _fnCallbackFire( oSettings, 'aoStateLoadParams', 'stateLoadParams', [oSettings, oData] );
-			if ( $.inArray( false, abStateLoad ) !== -1 )
-			{
-				return;
-			}
-			
-			/* Store the saved state so it might be accessed at any time */
-			oSettings.oLoadedState = $.extend( true, {}, oData );
-			
-			/* Restore key features */
-			oSettings._iDisplayStart    = oData.iStart;
-			oSettings.iInitDisplayStart = oData.iStart;
-			oSettings._iDisplayEnd      = oData.iEnd;
-			oSettings._iDisplayLength   = oData.iLength;
-			oSettings.aaSorting         = oData.aaSorting.slice();
-			oSettings.saved_aaSorting   = oData.aaSorting.slice();
-			
-			/* Search filtering  */
-			$.extend( oSettings.oPreviousSearch, oData.oSearch );
-			$.extend( true, oSettings.aoPreSearchCols, oData.aoSearchCols );
-			
-			/* Column visibility state
-			 * Pass back visibility settings to the init handler, but to do not here override
-			 * the init object that the user might have passed in
-			 */
-			oInit.saved_aoColumns = [];
-			for ( var i=0 ; i<oData.abVisCols.length ; i++ )
-			{
-				oInit.saved_aoColumns[i] = {};
-				oInit.saved_aoColumns[i].bVisible = oData.abVisCols[i];
-			}
-		
-			_fnCallbackFire( oSettings, 'aoStateLoaded', 'stateLoaded', [oSettings, oData] );
-		}
-		
-		
-		/**
-		 * Create a new cookie with a value to store the state of a table
-		 *  @param {string} sName name of the cookie to create
-		 *  @param {string} sValue the value the cookie should take
-		 *  @param {int} iSecs duration of the cookie
-		 *  @param {string} sBaseName sName is made up of the base + file name - this is the base
-		 *  @param {function} fnCallback User definable function to modify the cookie
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCreateCookie ( sName, sValue, iSecs, sBaseName, fnCallback )
-		{
-			var date = new Date();
-			date.setTime( date.getTime()+(iSecs*1000) );
-			
-			/* 
-			 * Shocking but true - it would appear IE has major issues with having the path not having
-			 * a trailing slash on it. We need the cookie to be available based on the path, so we
-			 * have to append the file name to the cookie name. Appalling. Thanks to vex for adding the
-			 * patch to use at least some of the path
-			 */
-			var aParts = window.location.pathname.split('/');
-			var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
-			var sFullCookie, oData;
-			
-			if ( fnCallback !== null )
-			{
-				oData = (typeof $.parseJSON === 'function') ? 
-					$.parseJSON( sValue ) : eval( '('+sValue+')' );
-				sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(),
-					aParts.join('/')+"/" );
-			}
-			else
-			{
-				sFullCookie = sNameFile + "=" + encodeURIComponent(sValue) +
-					"; expires=" + date.toGMTString() +"; path=" + aParts.join('/')+"/";
-			}
-			
-			/* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies
-			 * belonging to DataTables.
-			 */
-			var
-				aCookies =document.cookie.split(';'),
-				iNewCookieLen = sFullCookie.split(';')[0].length,
-				aOldCookies = [];
-			
-			if ( iNewCookieLen+document.cookie.length+10 > 4096 ) /* Magic 10 for padding */
-			{
-				for ( var i=0, iLen=aCookies.length ; i<iLen ; i++ )
-				{
-					if ( aCookies[i].indexOf( sBaseName ) != -1 )
-					{
-						/* It's a DataTables cookie, so eval it and check the time stamp */
-						var aSplitCookie = aCookies[i].split('=');
-						try {
-							oData = eval( '('+decodeURIComponent(aSplitCookie[1])+')' );
-		
-							if ( oData && oData.iCreate )
-							{
-								aOldCookies.push( {
-									"name": aSplitCookie[0],
-									"time": oData.iCreate
-								} );
-							}
-						}
-						catch( e ) {}
-					}
-				}
-		
-				// Make sure we delete the oldest ones first
-				aOldCookies.sort( function (a, b) {
-					return b.time - a.time;
-				} );
-		
-				// Eliminate as many old DataTables cookies as we need to
-				while ( iNewCookieLen + document.cookie.length + 10 > 4096 ) {
-					if ( aOldCookies.length === 0 ) {
-						// Deleted all DT cookies and still not enough space. Can't state save
-						return;
-					}
-					
-					var old = aOldCookies.pop();
-					document.cookie = old.name+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
-						aParts.join('/') + "/";
-				}
-			}
-			
-			document.cookie = sFullCookie;
-		}
-		
-		
-		/**
-		 * Read an old cookie to get a cookie with an old table state
-		 *  @param {string} sName name of the cookie to read
-		 *  @returns {string} contents of the cookie - or null if no cookie with that name found
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnReadCookie ( sName )
-		{
-			var
-				aParts = window.location.pathname.split('/'),
-				sNameEQ = sName + '_' + aParts[aParts.length-1].replace(/[\/:]/g,"").toLowerCase() + '=',
-			 	sCookieContents = document.cookie.split(';');
-			
-			for( var i=0 ; i<sCookieContents.length ; i++ )
-			{
-				var c = sCookieContents[i];
-				
-				while (c.charAt(0)==' ')
-				{
-					c = c.substring(1,c.length);
-				}
-				
-				if (c.indexOf(sNameEQ) === 0)
-				{
-					return decodeURIComponent( c.substring(sNameEQ.length,c.length) );
-				}
-			}
-			return null;
-		}
-		
-		
-		/**
-		 * Return the settings object for a particular table
-		 *  @param {node} nTable table we are using as a dataTable
-		 *  @returns {object} Settings object - or null if not found
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnSettingsFromNode ( nTable )
-		{
-			for ( var i=0 ; i<DataTable.settings.length ; i++ )
-			{
-				if ( DataTable.settings[i].nTable === nTable )
-				{
-					return DataTable.settings[i];
-				}
-			}
-			
-			return null;
-		}
-		
-		
-		/**
-		 * Return an array with the TR nodes for the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {array} TR array
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetTrNodes ( oSettings )
-		{
-			var aNodes = [];
-			var aoData = oSettings.aoData;
-			for ( var i=0, iLen=aoData.length ; i<iLen ; i++ )
-			{
-				if ( aoData[i].nTr !== null )
-				{
-					aNodes.push( aoData[i].nTr );
-				}
-			}
-			return aNodes;
-		}
-		
-		
-		/**
-		 * Return an flat array with all TD nodes for the table, or row
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} [iIndividualRow] aoData index to get the nodes for - optional 
-		 *    if not given then the return array will contain all nodes for the table
-		 *  @returns {array} TD array
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnGetTdNodes ( oSettings, iIndividualRow )
-		{
-			var anReturn = [];
-			var iCorrector;
-			var anTds, nTd;
-			var iRow, iRows=oSettings.aoData.length,
-				iColumn, iColumns, oData, sNodeName, iStart=0, iEnd=iRows;
-			
-			/* Allow the collection to be limited to just one row */
-			if ( iIndividualRow !== undefined )
-			{
-				iStart = iIndividualRow;
-				iEnd = iIndividualRow+1;
-			}
-		
-			for ( iRow=iStart ; iRow<iEnd ; iRow++ )
-			{
-				oData = oSettings.aoData[iRow];
-				if ( oData.nTr !== null )
-				{
-					/* get the TD child nodes - taking into account text etc nodes */
-					anTds = [];
-					nTd = oData.nTr.firstChild;
-					while ( nTd )
-					{
-						sNodeName = nTd.nodeName.toLowerCase();
-						if ( sNodeName == 'td' || sNodeName == 'th' )
-						{
-							anTds.push( nTd );
-						}
-						nTd = nTd.nextSibling;
-					}
-		
-					iCorrector = 0;
-					for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
-					{
-						if ( oSettings.aoColumns[iColumn].bVisible )
-						{
-							anReturn.push( anTds[iColumn-iCorrector] );
-						}
-						else
-						{
-							anReturn.push( oData._anHidden[iColumn] );
-							iCorrector++;
-						}
-					}
-				}
-			}
-		
-			return anReturn;
-		}
-		
-		
-		/**
-		 * Log an error message
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {int} iLevel log error messages, or display them to the user
-		 *  @param {string} sMesg error message
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnLog( oSettings, iLevel, sMesg )
-		{
-			var sAlert = (oSettings===null) ?
-				"DataTables warning: "+sMesg :
-				"DataTables warning (table id = '"+oSettings.sTableId+"'): "+sMesg;
-			
-			if ( iLevel === 0 )
-			{
-				if ( DataTable.ext.sErrMode == 'alert' )
-				{
-					alert( sAlert );
-				}
-				else
-				{
-					throw new Error(sAlert);
-				}
-				return;
-			}
-			else if ( window.console && console.log )
-			{
-				console.log( sAlert );
-			}
-		}
-		
-		
-		/**
-		 * See if a property is defined on one object, if so assign it to the other object
-		 *  @param {object} oRet target object
-		 *  @param {object} oSrc source object
-		 *  @param {string} sName property
-		 *  @param {string} [sMappedName] name to map too - optional, sName used if not given
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnMap( oRet, oSrc, sName, sMappedName )
-		{
-			if ( sMappedName === undefined )
-			{
-				sMappedName = sName;
-			}
-			if ( oSrc[sName] !== undefined )
-			{
-				oRet[sMappedName] = oSrc[sName];
-			}
-		}
-		
-		
-		/**
-		 * Extend objects - very similar to jQuery.extend, but deep copy objects, and shallow
-		 * copy arrays. The reason we need to do this, is that we don't want to deep copy array
-		 * init values (such as aaSorting) since the dev wouldn't be able to override them, but
-		 * we do want to deep copy arrays.
-		 *  @param {object} oOut Object to extend
-		 *  @param {object} oExtender Object from which the properties will be applied to oOut
-		 *  @returns {object} oOut Reference, just for convenience - oOut === the return.
-		 *  @memberof DataTable#oApi
-		 *  @todo This doesn't take account of arrays inside the deep copied objects.
-		 */
-		function _fnExtend( oOut, oExtender )
-		{
-			var val;
-			
-			for ( var prop in oExtender )
-			{
-				if ( oExtender.hasOwnProperty(prop) )
-				{
-					val = oExtender[prop];
-		
-					if ( typeof oInit[prop] === 'object' && val !== null && $.isArray(val) === false )
-					{
-						$.extend( true, oOut[prop], val );
-					}
-					else
-					{
-						oOut[prop] = val;
-					}
-				}
-			}
-		
-			return oOut;
-		}
-		
-		
-		/**
-		 * Bind an event handers to allow a click or return key to activate the callback.
-		 * This is good for accessibility since a return on the keyboard will have the
-		 * same effect as a click, if the element has focus.
-		 *  @param {element} n Element to bind the action to
-		 *  @param {object} oData Data object to pass to the triggered function
-		 *  @param {function} fn Callback function for when the event is triggered
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnBindAction( n, oData, fn )
-		{
-			$(n)
-				.bind( 'click.DT', oData, function (e) {
-						n.blur(); // Remove focus outline for mouse users
-						fn(e);
-					} )
-				.bind( 'keypress.DT', oData, function (e){
-					if ( e.which === 13 ) {
-						fn(e);
-					} } )
-				.bind( 'selectstart.DT', function () {
-					/* Take the brutal approach to cancelling text selection */
-					return false;
-					} );
-		}
-		
-		
-		/**
-		 * Register a callback function. Easily allows a callback function to be added to
-		 * an array store of callback functions that can then all be called together.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string} sStore Name of the array storage for the callbacks in oSettings
-		 *  @param {function} fn Function to be called back
-		 *  @param {string} sName Identifying name for the callback (i.e. a label)
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCallbackReg( oSettings, sStore, fn, sName )
-		{
-			if ( fn )
-			{
-				oSettings[sStore].push( {
-					"fn": fn,
-					"sName": sName
-				} );
-			}
-		}
-		
-		
-		/**
-		 * Fire callback functions and trigger events. Note that the loop over the callback
-		 * array store is done backwards! Further note that you do not want to fire off triggers
-		 * in time sensitive applications (for example cell creation) as its slow.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {string} sStore Name of the array storage for the callbacks in oSettings
-		 *  @param {string} sTrigger Name of the jQuery custom event to trigger. If null no trigger
-		 *    is fired
-		 *  @param {array} aArgs Array of arguments to pass to the callback function / trigger
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnCallbackFire( oSettings, sStore, sTrigger, aArgs )
-		{
-			var aoStore = oSettings[sStore];
-			var aRet =[];
-		
-			for ( var i=aoStore.length-1 ; i>=0 ; i-- )
-			{
-				aRet.push( aoStore[i].fn.apply( oSettings.oInstance, aArgs ) );
-			}
-		
-			if ( sTrigger !== null )
-			{
-				$(oSettings.oInstance).trigger(sTrigger, aArgs);
-			}
-		
-			return aRet;
-		}
-		
-		
-		/**
-		 * JSON stringify. If JSON.stringify it provided by the browser, json2.js or any other
-		 * library, then we use that as it is fast, safe and accurate. If the function isn't 
-		 * available then we need to built it ourselves - the inspiration for this function comes
-		 * from Craig Buckler ( http://www.sitepoint.com/javascript-json-serialization/ ). It is
-		 * not perfect and absolutely should not be used as a replacement to json2.js - but it does
-		 * do what we need, without requiring a dependency for DataTables.
-		 *  @param {object} o JSON object to be converted
-		 *  @returns {string} JSON string
-		 *  @memberof DataTable#oApi
-		 */
-		var _fnJsonString = (window.JSON) ? JSON.stringify : function( o )
-		{
-			/* Not an object or array */
-			var sType = typeof o;
-			if (sType !== "object" || o === null)
-			{
-				// simple data type
-				if (sType === "string")
-				{
-					o = '"'+o+'"';
-				}
-				return o+"";
-			}
-		
-			/* If object or array, need to recurse over it */
-			var
-				sProp, mValue,
-				json = [],
-				bArr = $.isArray(o);
-			
-			for (sProp in o)
-			{
-				mValue = o[sProp];
-				sType = typeof mValue;
-		
-				if (sType === "string")
-				{
-					mValue = '"'+mValue+'"';
-				}
-				else if (sType === "object" && mValue !== null)
-				{
-					mValue = _fnJsonString(mValue);
-				}
-		
-				json.push((bArr ? "" : '"'+sProp+'":') + mValue);
-			}
-		
-			return (bArr ? "[" : "{") + json + (bArr ? "]" : "}");
-		};
-		
-		
-		/**
-		 * From some browsers (specifically IE6/7) we need special handling to work around browser
-		 * bugs - this function is used to detect when these workarounds are needed.
-		 *  @param {object} oSettings dataTables settings object
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnBrowserDetect( oSettings )
-		{
-			/* IE6/7 will oversize a width 100% element inside a scrolling element, to include the
-			 * width of the scrollbar, while other browsers ensure the inner element is contained
-			 * without forcing scrolling
-			 */
-			var n = $(
-				'<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+
-					'<div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;">'+
-						'<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+
-					'</div>'+
-				'</div>')[0];
-		
-			document.body.appendChild( n );
-			oSettings.oBrowser.bScrollOversize = $('#DT_BrowserTest', n)[0].offsetWidth === 100 ? true : false;
-			document.body.removeChild( n );
-		}
-		
-
-		/**
-		 * Perform a jQuery selector action on the table's TR elements (from the tbody) and
-		 * return the resulting jQuery object.
-		 *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
-		 *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
-		 *  @param {string} [oOpts.filter=none] Select TR elements that meet the current filter
-		 *    criterion ("applied") or all TR elements (i.e. no filter).
-		 *  @param {string} [oOpts.order=current] Order of the TR elements in the processed array.
-		 *    Can be either 'current', whereby the current sorting of the table is used, or
-		 *    'original' whereby the original order the data was read into the table is used.
-		 *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
-		 *    ("current") or not ("all"). If 'current' is given, then order is assumed to be 
-		 *    'current' and filter is 'applied', regardless of what they might be given as.
-		 *  @returns {object} jQuery object, filtered by the given selector.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *
-		 *      // Highlight every second row
-		 *      oTable.$('tr:odd').css('backgroundColor', 'blue');
-		 *    } );
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *
-		 *      // Filter to rows with 'Webkit' in them, add a background colour and then
-		 *      // remove the filter, thus highlighting the 'Webkit' rows only.
-		 *      oTable.fnFilter('Webkit');
-		 *      oTable.$('tr', {"filter": "applied"}).css('backgroundColor', 'blue');
-		 *      oTable.fnFilter('');
-		 *    } );
-		 */
-		this.$ = function ( sSelector, oOpts )
-		{
-			var i, iLen, a = [], tr;
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var aoData = oSettings.aoData;
-			var aiDisplay = oSettings.aiDisplay;
-			var aiDisplayMaster = oSettings.aiDisplayMaster;
-		
-			if ( !oOpts )
-			{
-				oOpts = {};
-			}
-		
-			oOpts = $.extend( {}, {
-				"filter": "none", // applied
-				"order": "current", // "original"
-				"page": "all" // current
-			}, oOpts );
-		
-			// Current page implies that order=current and fitler=applied, since it is fairly
-			// senseless otherwise
-			if ( oOpts.page == 'current' )
-			{
-				for ( i=oSettings._iDisplayStart, iLen=oSettings.fnDisplayEnd() ; i<iLen ; i++ )
-				{
-					tr = aoData[ aiDisplay[i] ].nTr;
-					if ( tr )
-					{
-						a.push( tr );
-					}
-				}
-			}
-			else if ( oOpts.order == "current" && oOpts.filter == "none" )
-			{
-				for ( i=0, iLen=aiDisplayMaster.length ; i<iLen ; i++ )
-				{
-					tr = aoData[ aiDisplayMaster[i] ].nTr;
-					if ( tr )
-					{
-						a.push( tr );
-					}
-				}
-			}
-			else if ( oOpts.order == "current" && oOpts.filter == "applied" )
-			{
-				for ( i=0, iLen=aiDisplay.length ; i<iLen ; i++ )
-				{
-					tr = aoData[ aiDisplay[i] ].nTr;
-					if ( tr )
-					{
-						a.push( tr );
-					}
-				}
-			}
-			else if ( oOpts.order == "original" && oOpts.filter == "none" )
-			{
-				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-				{
-					tr = aoData[ i ].nTr ;
-					if ( tr )
-					{
-						a.push( tr );
-					}
-				}
-			}
-			else if ( oOpts.order == "original" && oOpts.filter == "applied" )
-			{
-				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-				{
-					tr = aoData[ i ].nTr;
-					if ( $.inArray( i, aiDisplay ) !== -1 && tr )
-					{
-						a.push( tr );
-					}
-				}
-			}
-			else
-			{
-				_fnLog( oSettings, 1, "Unknown selection options" );
-			}
-		
-			/* We need to filter on the TR elements and also 'find' in their descendants
-			 * to make the selector act like it would in a full table - so we need
-			 * to build both results and then combine them together
-			 */
-			var jqA = $(a);
-			var jqTRs = jqA.filter( sSelector );
-			var jqDescendants = jqA.find( sSelector );
-		
-			return $( [].concat($.makeArray(jqTRs), $.makeArray(jqDescendants)) );
-		};
-		
-		
-		/**
-		 * Almost identical to $ in operation, but in this case returns the data for the matched
-		 * rows - as such, the jQuery selector used should match TR row nodes or TD/TH cell nodes
-		 * rather than any descendants, so the data can be obtained for the row/cell. If matching
-		 * rows are found, the data returned is the original data array/object that was used to  
-		 * create the row (or a generated array if from a DOM source).
-		 *
-		 * This method is often useful in-combination with $ where both functions are given the
-		 * same parameters and the array indexes will match identically.
-		 *  @param {string|node|jQuery} sSelector jQuery selector or node collection to act on
-		 *  @param {object} [oOpts] Optional parameters for modifying the rows to be included
-		 *  @param {string} [oOpts.filter=none] Select elements that meet the current filter
-		 *    criterion ("applied") or all elements (i.e. no filter).
-		 *  @param {string} [oOpts.order=current] Order of the data in the processed array.
-		 *    Can be either 'current', whereby the current sorting of the table is used, or
-		 *    'original' whereby the original order the data was read into the table is used.
-		 *  @param {string} [oOpts.page=all] Limit the selection to the currently displayed page
-		 *    ("current") or not ("all"). If 'current' is given, then order is assumed to be 
-		 *    'current' and filter is 'applied', regardless of what they might be given as.
-		 *  @returns {array} Data for the matched elements. If any elements, as a result of the
-		 *    selector, were not TR, TD or TH elements in the DataTable, they will have a null 
-		 *    entry in the array.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *
-		 *      // Get the data from the first row in the table
-		 *      var data = oTable._('tr:first');
-		 *
-		 *      // Do something useful with the data
-		 *      alert( "First cell is: "+data[0] );
-		 *    } );
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *
-		 *      // Filter to 'Webkit' and get all data for 
-		 *      oTable.fnFilter('Webkit');
-		 *      var data = oTable._('tr', {"filter": "applied"});
-		 *      
-		 *      // Do something with the data
-		 *      alert( data.length+" rows matched the filter" );
-		 *    } );
-		 */
-		this._ = function ( sSelector, oOpts )
-		{
-			var aOut = [];
-			var i, iLen, iIndex;
-			var aTrs = this.$( sSelector, oOpts );
-		
-			for ( i=0, iLen=aTrs.length ; i<iLen ; i++ )
-			{
-				aOut.push( this.fnGetData(aTrs[i]) );
-			}
-		
-			return aOut;
-		};
-		
-		
-		/**
-		 * Add a single new row or multiple rows of data to the table. Please note
-		 * that this is suitable for client-side processing only - if you are using 
-		 * server-side processing (i.e. "bServerSide": true), then to add data, you
-		 * must add it to the data source, i.e. the server-side, through an Ajax call.
-		 *  @param {array|object} mData The data to be added to the table. This can be:
-		 *    <ul>
-		 *      <li>1D array of data - add a single row with the data provided</li>
-		 *      <li>2D array of arrays - add multiple rows in a single call</li>
-		 *      <li>object - data object when using <i>mData</i></li>
-		 *      <li>array of objects - multiple data objects when using <i>mData</i></li>
-		 *    </ul>
-		 *  @param {bool} [bRedraw=true] redraw the table or not
-		 *  @returns {array} An array of integers, representing the list of indexes in 
-		 *    <i>aoData</i> ({@link DataTable.models.oSettings}) that have been added to 
-		 *    the table.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    // Global var for counter
-		 *    var giCount = 2;
-		 *    
-		 *    $(document).ready(function() {
-		 *      $('#example').dataTable();
-		 *    } );
-		 *    
-		 *    function fnClickAddRow() {
-		 *      $('#example').dataTable().fnAddData( [
-		 *        giCount+".1",
-		 *        giCount+".2",
-		 *        giCount+".3",
-		 *        giCount+".4" ]
-		 *      );
-		 *        
-		 *      giCount++;
-		 *    }
-		 */
-		this.fnAddData = function( mData, bRedraw )
-		{
-			if ( mData.length === 0 )
-			{
-				return [];
-			}
-			
-			var aiReturn = [];
-			var iTest;
-			
-			/* Find settings from table node */
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			
-			/* Check if we want to add multiple rows or not */
-			if ( typeof mData[0] === "object" && mData[0] !== null )
-			{
-				for ( var i=0 ; i<mData.length ; i++ )
-				{
-					iTest = _fnAddData( oSettings, mData[i] );
-					if ( iTest == -1 )
-					{
-						return aiReturn;
-					}
-					aiReturn.push( iTest );
-				}
-			}
-			else
-			{
-				iTest = _fnAddData( oSettings, mData );
-				if ( iTest == -1 )
-				{
-					return aiReturn;
-				}
-				aiReturn.push( iTest );
-			}
-			
-			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnReDraw( oSettings );
-			}
-			return aiReturn;
-		};
-		
-		
-		/**
-		 * This function will make DataTables recalculate the column sizes, based on the data 
-		 * contained in the table and the sizes applied to the columns (in the DOM, CSS or 
-		 * through the sWidth parameter). This can be useful when the width of the table's 
-		 * parent element changes (for example a window resize).
-		 *  @param {boolean} [bRedraw=true] Redraw the table or not, you will typically want to
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sScrollY": "200px",
-		 *        "bPaginate": false
-		 *      } );
-		 *      
-		 *      $(window).bind('resize', function () {
-		 *        oTable.fnAdjustColumnSizing();
-		 *      } );
-		 *    } );
-		 */
-		this.fnAdjustColumnSizing = function ( bRedraw )
-		{
-			var oSettings = _fnSettingsFromNode(this[DataTable.ext.iApiIndex]);
-			_fnAdjustColumnSizing( oSettings );
-			
-			if ( bRedraw === undefined || bRedraw )
-			{
-				this.fnDraw( false );
-			}
-			else if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
-			{
-				/* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
-				this.oApi._fnScrollDraw(oSettings);
-			}
-		};
-		
-		
-		/**
-		 * Quickly and simply clear a table
-		 *  @param {bool} [bRedraw=true] redraw the table or not
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Immediately 'nuke' the current rows (perhaps waiting for an Ajax callback...)
-		 *      oTable.fnClearTable();
-		 *    } );
-		 */
-		this.fnClearTable = function( bRedraw )
-		{
-			/* Find settings from table node */
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			_fnClearTable( oSettings );
-			
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnDraw( oSettings );
-			}
-		};
-		
-		
-		/**
-		 * The exact opposite of 'opening' a row, this function will close any rows which 
-		 * are currently 'open'.
-		 *  @param {node} nTr the table row to 'close'
-		 *  @returns {int} 0 on success, or 1 if failed (can't find the row)
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable;
-		 *      
-		 *      // 'open' an information row when a row is clicked on
-		 *      $('#example tbody tr').click( function () {
-		 *        if ( oTable.fnIsOpen(this) ) {
-		 *          oTable.fnClose( this );
-		 *        } else {
-		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-		 *        }
-		 *      } );
-		 *      
-		 *      oTable = $('#example').dataTable();
-		 *    } );
-		 */
-		this.fnClose = function( nTr )
-		{
-			/* Find settings from table node */
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			
-			for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
-			{
-				if ( oSettings.aoOpenRows[i].nParent == nTr )
-				{
-					var nTrParent = oSettings.aoOpenRows[i].nTr.parentNode;
-					if ( nTrParent )
-					{
-						/* Remove it if it is currently on display */
-						nTrParent.removeChild( oSettings.aoOpenRows[i].nTr );
-					}
-					oSettings.aoOpenRows.splice( i, 1 );
-					return 0;
-				}
-			}
-			return 1;
-		};
-		
-		
-		/**
-		 * Remove a row for the table
-		 *  @param {mixed} mTarget The index of the row from aoData to be deleted, or
-		 *    the TR element you want to delete
-		 *  @param {function|null} [fnCallBack] Callback function
-		 *  @param {bool} [bRedraw=true] Redraw the table or not
-		 *  @returns {array} The row that was deleted
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Immediately remove the first row
-		 *      oTable.fnDeleteRow( 0 );
-		 *    } );
-		 */
-		this.fnDeleteRow = function( mTarget, fnCallBack, bRedraw )
-		{
-			/* Find settings from table node */
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var i, iLen, iAODataIndex;
-			
-			iAODataIndex = (typeof mTarget === 'object') ? 
-				_fnNodeToDataIndex(oSettings, mTarget) : mTarget;
-			
-			/* Return the data array from this row */
-			var oData = oSettings.aoData.splice( iAODataIndex, 1 );
-		
-			/* Update the _DT_RowIndex parameter */
-			for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-			{
-				if ( oSettings.aoData[i].nTr !== null )
-				{
-					oSettings.aoData[i].nTr._DT_RowIndex = i;
-				}
-			}
-			
-			/* Remove the target row from the search array */
-			var iDisplayIndex = $.inArray( iAODataIndex, oSettings.aiDisplay );
-			oSettings.asDataSearch.splice( iDisplayIndex, 1 );
-			
-			/* Delete from the display arrays */
-			_fnDeleteIndex( oSettings.aiDisplayMaster, iAODataIndex );
-			_fnDeleteIndex( oSettings.aiDisplay, iAODataIndex );
-			
-			/* If there is a user callback function - call it */
-			if ( typeof fnCallBack === "function" )
-			{
-				fnCallBack.call( this, oSettings, oData );
-			}
-			
-			/* Check for an 'overflow' they case for displaying the table */
-			if ( oSettings._iDisplayStart >= oSettings.fnRecordsDisplay() )
-			{
-				oSettings._iDisplayStart -= oSettings._iDisplayLength;
-				if ( oSettings._iDisplayStart < 0 )
-				{
-					oSettings._iDisplayStart = 0;
-				}
-			}
-			
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnCalculateEnd( oSettings );
-				_fnDraw( oSettings );
-			}
-			
-			return oData;
-		};
-		
-		
-		/**
-		 * Restore the table to it's original state in the DOM by removing all of DataTables 
-		 * enhancements, alterations to the DOM structure of the table and event listeners.
-		 *  @param {boolean} [bRemove=false] Completely remove the table from the DOM
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      // This example is fairly pointless in reality, but shows how fnDestroy can be used
-		 *      var oTable = $('#example').dataTable();
-		 *      oTable.fnDestroy();
-		 *    } );
-		 */
-		this.fnDestroy = function ( bRemove )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var nOrig = oSettings.nTableWrapper.parentNode;
-			var nBody = oSettings.nTBody;
-			var i, iLen;
-		
-			bRemove = (bRemove===undefined) ? false : bRemove;
-			
-			/* Flag to note that the table is currently being destroyed - no action should be taken */
-			oSettings.bDestroying = true;
-			
-			/* Fire off the destroy callbacks for plug-ins etc */
-			_fnCallbackFire( oSettings, "aoDestroyCallback", "destroy", [oSettings] );
-		
-			/* If the table is not being removed, restore the hidden columns */
-			if ( !bRemove )
-			{
-				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
-				{
-					if ( oSettings.aoColumns[i].bVisible === false )
-					{
-						this.fnSetColumnVis( i, true );
-					}
-				}
-			}
-			
-			/* Blitz all DT events */
-			$(oSettings.nTableWrapper).find('*').andSelf().unbind('.DT');
-			
-			/* If there is an 'empty' indicator row, remove it */
-			$('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove();
-			
-			/* When scrolling we had to break the table up - restore it */
-			if ( oSettings.nTable != oSettings.nTHead.parentNode )
-			{
-				$(oSettings.nTable).children('thead').remove();
-				oSettings.nTable.appendChild( oSettings.nTHead );
-			}
-			
-			if ( oSettings.nTFoot && oSettings.nTable != oSettings.nTFoot.parentNode )
-			{
-				$(oSettings.nTable).children('tfoot').remove();
-				oSettings.nTable.appendChild( oSettings.nTFoot );
-			}
-			
-			/* Remove the DataTables generated nodes, events and classes */
-			oSettings.nTable.parentNode.removeChild( oSettings.nTable );
-			$(oSettings.nTableWrapper).remove();
-			
-			oSettings.aaSorting = [];
-			oSettings.aaSortingFixed = [];
-			_fnSortingClasses( oSettings );
-			
-			$(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripeClasses.join(' ') );
-			
-			$('th, td', oSettings.nTHead).removeClass( [
-				oSettings.oClasses.sSortable,
-				oSettings.oClasses.sSortableAsc,
-				oSettings.oClasses.sSortableDesc,
-				oSettings.oClasses.sSortableNone ].join(' ')
-			);
-			if ( oSettings.bJUI )
-			{
-				$('th span.'+oSettings.oClasses.sSortIcon
-					+ ', td span.'+oSettings.oClasses.sSortIcon, oSettings.nTHead).remove();
-		
-				$('th, td', oSettings.nTHead).each( function () {
-					var jqWrapper = $('div.'+oSettings.oClasses.sSortJUIWrapper, this);
-					var kids = jqWrapper.contents();
-					$(this).append( kids );
-					jqWrapper.remove();
-				} );
-			}
-			
-			/* Add the TR elements back into the table in their original order */
-			if ( !bRemove && oSettings.nTableReinsertBefore )
-			{
-				nOrig.insertBefore( oSettings.nTable, oSettings.nTableReinsertBefore );
-			}
-			else if ( !bRemove )
-			{
-				nOrig.appendChild( oSettings.nTable );
-			}
-		
-			for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
-			{
-				if ( oSettings.aoData[i].nTr !== null )
-				{
-					nBody.appendChild( oSettings.aoData[i].nTr );
-				}
-			}
-			
-			/* Restore the width of the original table */
-			if ( oSettings.oFeatures.bAutoWidth === true )
-			{
-			  oSettings.nTable.style.width = _fnStringToCss(oSettings.sDestroyWidth);
-			}
-			
-			/* If the were originally stripe classes - then we add them back here. Note
-			 * this is not fool proof (for example if not all rows had stripe classes - but
-			 * it's a good effort without getting carried away
-			 */
-			iLen = oSettings.asDestroyStripes.length;
-			if (iLen)
-			{
-				var anRows = $(nBody).children('tr');
-				for ( i=0 ; i<iLen ; i++ )
-				{
-					anRows.filter(':nth-child(' + iLen + 'n + ' + i + ')').addClass( oSettings.asDestroyStripes[i] );
-				}
-			}
-			
-			/* Remove the settings object from the settings array */
-			for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
-			{
-				if ( DataTable.settings[i] == oSettings )
-				{
-					DataTable.settings.splice( i, 1 );
-				}
-			}
-			
-			/* End it all */
-			oSettings = null;
-			oInit = null;
-		};
-		
-		
-		/**
-		 * Redraw the table
-		 *  @param {bool} [bComplete=true] Re-filter and resort (if enabled) the table before the draw.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Re-draw the table - you wouldn't want to do it here, but it's an example :-)
-		 *      oTable.fnDraw();
-		 *    } );
-		 */
-		this.fnDraw = function( bComplete )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			if ( bComplete === false )
-			{
-				_fnCalculateEnd( oSettings );
-				_fnDraw( oSettings );
-			}
-			else
-			{
-				_fnReDraw( oSettings );
-			}
-		};
-		
-		
-		/**
-		 * Filter the input based on data
-		 *  @param {string} sInput String to filter the table on
-		 *  @param {int|null} [iColumn] Column to limit filtering to
-		 *  @param {bool} [bRegex=false] Treat as regular expression or not
-		 *  @param {bool} [bSmart=true] Perform smart filtering or not
-		 *  @param {bool} [bShowGlobal=true] Show the input global filter in it's input box(es)
-		 *  @param {bool} [bCaseInsensitive=true] Do case-insensitive matching (true) or not (false)
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Sometime later - filter...
-		 *      oTable.fnFilter( 'test string' );
-		 *    } );
-		 */
-		this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseInsensitive )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			
-			if ( !oSettings.oFeatures.bFilter )
-			{
-				return;
-			}
-			
-			if ( bRegex === undefined || bRegex === null )
-			{
-				bRegex = false;
-			}
-			
-			if ( bSmart === undefined || bSmart === null )
-			{
-				bSmart = true;
-			}
-			
-			if ( bShowGlobal === undefined || bShowGlobal === null )
-			{
-				bShowGlobal = true;
-			}
-			
-			if ( bCaseInsensitive === undefined || bCaseInsensitive === null )
-			{
-				bCaseInsensitive = true;
-			}
-			
-			if ( iColumn === undefined || iColumn === null )
-			{
-				/* Global filter */
-				_fnFilterComplete( oSettings, {
-					"sSearch":sInput+"",
-					"bRegex": bRegex,
-					"bSmart": bSmart,
-					"bCaseInsensitive": bCaseInsensitive
-				}, 1 );
-				
-				if ( bShowGlobal && oSettings.aanFeatures.f )
-				{
-					var n = oSettings.aanFeatures.f;
-					for ( var i=0, iLen=n.length ; i<iLen ; i++ )
-					{
-						// IE9 throws an 'unknown error' if document.activeElement is used
-						// inside an iframe or frame...
-						try {
-							if ( n[i]._DT_Input != document.activeElement )
-							{
-								$(n[i]._DT_Input).val( sInput );
-							}
-						}
-						catch ( e ) {
-							$(n[i]._DT_Input).val( sInput );
-						}
-					}
-				}
-			}
-			else
-			{
-				/* Single column filter */
-				$.extend( oSettings.aoPreSearchCols[ iColumn ], {
-					"sSearch": sInput+"",
-					"bRegex": bRegex,
-					"bSmart": bSmart,
-					"bCaseInsensitive": bCaseInsensitive
-				} );
-				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
-			}
-		};
-		
-		
-		/**
-		 * Get the data for the whole table, an individual row or an individual cell based on the 
-		 * provided parameters.
-		 *  @param {int|node} [mRow] A TR row node, TD/TH cell node or an integer. If given as
-		 *    a TR node then the data source for the whole row will be returned. If given as a
-		 *    TD/TH cell node then iCol will be automatically calculated and the data for the
-		 *    cell returned. If given as an integer, then this is treated as the aoData internal
-		 *    data index for the row (see fnGetPosition) and the data for that row used.
-		 *  @param {int} [iCol] Optional column index that you want the data of.
-		 *  @returns {array|object|string} If mRow is undefined, then the data for all rows is
-		 *    returned. If mRow is defined, just data for that row, and is iCol is
-		 *    defined, only data for the designated cell is returned.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    // Row data
-		 *    $(document).ready(function() {
-		 *      oTable = $('#example').dataTable();
-		 *
-		 *      oTable.$('tr').click( function () {
-		 *        var data = oTable.fnGetData( this );
-		 *        // ... do something with the array / object of data for the row
-		 *      } );
-		 *    } );
-		 *
-		 *  @example
-		 *    // Individual cell data
-		 *    $(document).ready(function() {
-		 *      oTable = $('#example').dataTable();
-		 *
-		 *      oTable.$('td').click( function () {
-		 *        var sData = oTable.fnGetData( this );
-		 *        alert( 'The cell clicked on had the value of '+sData );
-		 *      } );
-		 *    } );
-		 */
-		this.fnGetData = function( mRow, iCol )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			
-			if ( mRow !== undefined )
-			{
-				var iRow = mRow;
-				if ( typeof mRow === 'object' )
-				{
-					var sNode = mRow.nodeName.toLowerCase();
-					if (sNode === "tr" )
-					{
-						iRow = _fnNodeToDataIndex(oSettings, mRow);
-					}
-					else if ( sNode === "td" )
-					{
-						iRow = _fnNodeToDataIndex(oSettings, mRow.parentNode);
-						iCol = _fnNodeToColumnIndex( oSettings, iRow, mRow );
-					}
-				}
-		
-				if ( iCol !== undefined )
-				{
-					return _fnGetCellData( oSettings, iRow, iCol, '' );
-				}
-				return (oSettings.aoData[iRow]!==undefined) ?
-					oSettings.aoData[iRow]._aData : null;
-			}
-			return _fnGetDataMaster( oSettings );
-		};
-		
-		
-		/**
-		 * Get an array of the TR nodes that are used in the table's body. Note that you will 
-		 * typically want to use the '$' API method in preference to this as it is more 
-		 * flexible.
-		 *  @param {int} [iRow] Optional row index for the TR element you want
-		 *  @returns {array|node} If iRow is undefined, returns an array of all TR elements
-		 *    in the table's body, or iRow is defined, just the TR element requested.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Get the nodes from the table
-		 *      var nNodes = oTable.fnGetNodes( );
-		 *    } );
-		 */
-		this.fnGetNodes = function( iRow )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			
-			if ( iRow !== undefined ) {
-				return (oSettings.aoData[iRow]!==undefined) ?
-					oSettings.aoData[iRow].nTr : null;
-			}
-			return _fnGetTrNodes( oSettings );
-		};
-		
-		
-		/**
-		 * Get the array indexes of a particular cell from it's DOM element
-		 * and column index including hidden columns
-		 *  @param {node} nNode this can either be a TR, TD or TH in the table's body
-		 *  @returns {int} If nNode is given as a TR, then a single index is returned, or
-		 *    if given as a cell, an array of [row index, column index (visible), 
-		 *    column index (all)] is given.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      $('#example tbody td').click( function () {
-		 *        // Get the position of the current data from the node
-		 *        var aPos = oTable.fnGetPosition( this );
-		 *        
-		 *        // Get the data array for this row
-		 *        var aData = oTable.fnGetData( aPos[0] );
-		 *        
-		 *        // Update the data array and return the value
-		 *        aData[ aPos[1] ] = 'clicked';
-		 *        this.innerHTML = 'clicked';
-		 *      } );
-		 *      
-		 *      // Init DataTables
-		 *      oTable = $('#example').dataTable();
-		 *    } );
-		 */
-		this.fnGetPosition = function( nNode )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var sNodeName = nNode.nodeName.toUpperCase();
-			
-			if ( sNodeName == "TR" )
-			{
-				return _fnNodeToDataIndex(oSettings, nNode);
-			}
-			else if ( sNodeName == "TD" || sNodeName == "TH" )
-			{
-				var iDataIndex = _fnNodeToDataIndex( oSettings, nNode.parentNode );
-				var iColumnIndex = _fnNodeToColumnIndex( oSettings, iDataIndex, nNode );
-				return [ iDataIndex, _fnColumnIndexToVisible(oSettings, iColumnIndex ), iColumnIndex ];
-			}
-			return null;
-		};
-		
-		
-		/**
-		 * Check to see if a row is 'open' or not.
-		 *  @param {node} nTr the table row to check
-		 *  @returns {boolean} true if the row is currently open, false otherwise
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable;
-		 *      
-		 *      // 'open' an information row when a row is clicked on
-		 *      $('#example tbody tr').click( function () {
-		 *        if ( oTable.fnIsOpen(this) ) {
-		 *          oTable.fnClose( this );
-		 *        } else {
-		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-		 *        }
-		 *      } );
-		 *      
-		 *      oTable = $('#example').dataTable();
-		 *    } );
-		 */
-		this.fnIsOpen = function( nTr )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var aoOpenRows = oSettings.aoOpenRows;
-			
-			for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
-			{
-				if ( oSettings.aoOpenRows[i].nParent == nTr )
-				{
-					return true;
-				}
-			}
-			return false;
-		};
-		
-		
-		/**
-		 * This function will place a new row directly after a row which is currently 
-		 * on display on the page, with the HTML contents that is passed into the 
-		 * function. This can be used, for example, to ask for confirmation that a 
-		 * particular record should be deleted.
-		 *  @param {node} nTr The table row to 'open'
-		 *  @param {string|node|jQuery} mHtml The HTML to put into the row
-		 *  @param {string} sClass Class to give the new TD cell
-		 *  @returns {node} The row opened. Note that if the table row passed in as the
-		 *    first parameter, is not found in the table, this method will silently
-		 *    return.
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable;
-		 *      
-		 *      // 'open' an information row when a row is clicked on
-		 *      $('#example tbody tr').click( function () {
-		 *        if ( oTable.fnIsOpen(this) ) {
-		 *          oTable.fnClose( this );
-		 *        } else {
-		 *          oTable.fnOpen( this, "Temporary row opened", "info_row" );
-		 *        }
-		 *      } );
-		 *      
-		 *      oTable = $('#example').dataTable();
-		 *    } );
-		 */
-		this.fnOpen = function( nTr, mHtml, sClass )
-		{
-			/* Find settings from table node */
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-		
-			/* Check that the row given is in the table */
-			var nTableRows = _fnGetTrNodes( oSettings );
-			if ( $.inArray(nTr, nTableRows) === -1 )
-			{
-				return;
-			}
-			
-			/* the old open one if there is one */
-			this.fnClose( nTr );
-			
-			var nNewRow = document.createElement("tr");
-			var nNewCell = document.createElement("td");
-			nNewRow.appendChild( nNewCell );
-			nNewCell.className = sClass;
-			nNewCell.colSpan = _fnVisbleColumns( oSettings );
-		
-			if (typeof mHtml === "string")
-			{
-				nNewCell.innerHTML = mHtml;
-			}
-			else
-			{
-				$(nNewCell).html( mHtml );
-			}
-		
-			/* If the nTr isn't on the page at the moment - then we don't insert at the moment */
-			var nTrs = $('tr', oSettings.nTBody);
-			if ( $.inArray(nTr, nTrs) != -1  )
-			{
-				$(nNewRow).insertAfter(nTr);
-			}
-			
-			oSettings.aoOpenRows.push( {
-				"nTr": nNewRow,
-				"nParent": nTr
-			} );
-			
-			return nNewRow;
-		};
-		
-		
-		/**
-		 * Change the pagination - provides the internal logic for pagination in a simple API 
-		 * function. With this function you can have a DataTables table go to the next, 
-		 * previous, first or last pages.
-		 *  @param {string|int} mAction Paging action to take: "first", "previous", "next" or "last"
-		 *    or page number to jump to (integer), note that page 0 is the first page.
-		 *  @param {bool} [bRedraw=true] Redraw the table or not
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      oTable.fnPageChange( 'next' );
-		 *    } );
-		 */
-		this.fnPageChange = function ( mAction, bRedraw )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			_fnPageChange( oSettings, mAction );
-			_fnCalculateEnd( oSettings );
-			
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnDraw( oSettings );
-			}
-		};
-		
-		
-		/**
-		 * Show a particular column
-		 *  @param {int} iCol The column whose display should be changed
-		 *  @param {bool} bShow Show (true) or hide (false) the column
-		 *  @param {bool} [bRedraw=true] Redraw the table or not
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Hide the second column after initialisation
-		 *      oTable.fnSetColumnVis( 1, false );
-		 *    } );
-		 */
-		this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var i, iLen;
-			var aoColumns = oSettings.aoColumns;
-			var aoData = oSettings.aoData;
-			var nTd, bAppend, iBefore;
-			
-			/* No point in doing anything if we are requesting what is already true */
-			if ( aoColumns[iCol].bVisible == bShow )
-			{
-				return;
-			}
-			
-			/* Show the column */
-			if ( bShow )
-			{
-				var iInsert = 0;
-				for ( i=0 ; i<iCol ; i++ )
-				{
-					if ( aoColumns[i].bVisible )
-					{
-						iInsert++;
-					}
-				}
-				
-				/* Need to decide if we should use appendChild or insertBefore */
-				bAppend = (iInsert >= _fnVisbleColumns( oSettings ));
-		
-				/* Which coloumn should we be inserting before? */
-				if ( !bAppend )
-				{
-					for ( i=iCol ; i<aoColumns.length ; i++ )
-					{
-						if ( aoColumns[i].bVisible )
-						{
-							iBefore = i;
-							break;
-						}
-					}
-				}
-		
-				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-				{
-					if ( aoData[i].nTr !== null )
-					{
-						if ( bAppend )
-						{
-							aoData[i].nTr.appendChild( 
-								aoData[i]._anHidden[iCol]
-							);
-						}
-						else
-						{
-							aoData[i].nTr.insertBefore(
-								aoData[i]._anHidden[iCol], 
-								_fnGetTdNodes( oSettings, i )[iBefore] );
-						}
-					}
-				}
-			}
-			else
-			{
-				/* Remove a column from display */
-				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
-				{
-					if ( aoData[i].nTr !== null )
-					{
-						nTd = _fnGetTdNodes( oSettings, i )[iCol];
-						aoData[i]._anHidden[iCol] = nTd;
-						nTd.parentNode.removeChild( nTd );
-					}
-				}
-			}
-		
-			/* Clear to set the visible flag */
-			aoColumns[iCol].bVisible = bShow;
-		
-			/* Redraw the header and footer based on the new column visibility */
-			_fnDrawHead( oSettings, oSettings.aoHeader );
-			if ( oSettings.nTFoot )
-			{
-				_fnDrawHead( oSettings, oSettings.aoFooter );
-			}
-			
-			/* If there are any 'open' rows, then we need to alter the colspan for this col change */
-			for ( i=0, iLen=oSettings.aoOpenRows.length ; i<iLen ; i++ )
-			{
-				oSettings.aoOpenRows[i].nTr.colSpan = _fnVisbleColumns( oSettings );
-			}
-			
-			/* Do a redraw incase anything depending on the table columns needs it 
-			 * (built-in: scrolling) 
-			 */
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnAdjustColumnSizing( oSettings );
-				_fnDraw( oSettings );
-			}
-			
-			_fnSaveState( oSettings );
-		};
-		
-		
-		/**
-		 * Get the settings for a particular table for external manipulation
-		 *  @returns {object} DataTables settings object. See 
-		 *    {@link DataTable.models.oSettings}
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      var oSettings = oTable.fnSettings();
-		 *      
-		 *      // Show an example parameter from the settings
-		 *      alert( oSettings._iDisplayStart );
-		 *    } );
-		 */
-		this.fnSettings = function()
-		{
-			return _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-		};
-		
-		
-		/**
-		 * Sort the table by a particular column
-		 *  @param {int} iCol the data index to sort on. Note that this will not match the 
-		 *    'display index' if you have hidden data entries
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Sort immediately with columns 0 and 1
-		 *      oTable.fnSort( [ [0,'asc'], [1,'asc'] ] );
-		 *    } );
-		 */
-		this.fnSort = function( aaSort )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			oSettings.aaSorting = aaSort;
-			_fnSort( oSettings );
-		};
-		
-		
-		/**
-		 * Attach a sort listener to an element for a given column
-		 *  @param {node} nNode the element to attach the sort listener to
-		 *  @param {int} iColumn the column that a click on this node will sort on
-		 *  @param {function} [fnCallback] callback function when sort is run
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      
-		 *      // Sort on column 1, when 'sorter' is clicked on
-		 *      oTable.fnSortListener( document.getElementById('sorter'), 1 );
-		 *    } );
-		 */
-		this.fnSortListener = function( nNode, iColumn, fnCallback )
-		{
-			_fnSortAttachListener( _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ), nNode, iColumn,
-			 	fnCallback );
-		};
-		
-		
-		/**
-		 * Update a table cell or row - this method will accept either a single value to
-		 * update the cell with, an array of values with one element for each column or
-		 * an object in the same format as the original data source. The function is
-		 * self-referencing in order to make the multi column updates easier.
-		 *  @param {object|array|string} mData Data to update the cell/row with
-		 *  @param {node|int} mRow TR element you want to update or the aoData index
-		 *  @param {int} [iColumn] The column to update (not used of mData is an array or object)
-		 *  @param {bool} [bRedraw=true] Redraw the table or not
-		 *  @param {bool} [bAction=true] Perform pre-draw actions or not
-		 *  @returns {int} 0 on success, 1 on error
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      oTable.fnUpdate( 'Example update', 0, 0 ); // Single cell
-		 *      oTable.fnUpdate( ['a', 'b', 'c', 'd', 'e'], 1, 0 ); // Row
-		 *    } );
-		 */
-		this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
-		{
-			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
-			var i, iLen, sDisplay;
-			var iRow = (typeof mRow === 'object') ? 
-				_fnNodeToDataIndex(oSettings, mRow) : mRow;
-			
-			if ( $.isArray(mData) && iColumn === undefined )
-			{
-				/* Array update - update the whole row */
-				oSettings.aoData[iRow]._aData = mData.slice();
-				
-				/* Flag to the function that we are recursing */
-				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-				{
-					this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
-				}
-			}
-			else if ( $.isPlainObject(mData) && iColumn === undefined )
-			{
-				/* Object update - update the whole row - assume the developer gets the object right */
-				oSettings.aoData[iRow]._aData = $.extend( true, {}, mData );
-		
-				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
-				{
-					this.fnUpdate( _fnGetCellData( oSettings, iRow, i ), iRow, i, false, false );
-				}
-			}
-			else
-			{
-				/* Individual cell update */
-				_fnSetCellData( oSettings, iRow, iColumn, mData );
-				sDisplay = _fnGetCellData( oSettings, iRow, iColumn, 'display' );
-				
-				var oCol = oSettings.aoColumns[iColumn];
-				if ( oCol.fnRender !== null )
-				{
-					sDisplay = _fnRender( oSettings, iRow, iColumn );
-					if ( oCol.bUseRendered )
-					{
-						_fnSetCellData( oSettings, iRow, iColumn, sDisplay );
-					}
-				}
-				
-				if ( oSettings.aoData[iRow].nTr !== null )
-				{
-					/* Do the actual HTML update */
-					_fnGetTdNodes( oSettings, iRow )[iColumn].innerHTML = sDisplay;
-				}
-			}
-			
-			/* Modify the search index for this row (strictly this is likely not needed, since fnReDraw
-			 * will rebuild the search array - however, the redraw might be disabled by the user)
-			 */
-			var iDisplayIndex = $.inArray( iRow, oSettings.aiDisplay );
-			oSettings.asDataSearch[iDisplayIndex] = _fnBuildSearchRow(
-				oSettings, 
-				_fnGetRowData( oSettings, iRow, 'filter', _fnGetColumns( oSettings, 'bSearchable' ) )
-			);
-			
-			/* Perform pre-draw actions */
-			if ( bAction === undefined || bAction )
-			{
-				_fnAdjustColumnSizing( oSettings );
-			}
-			
-			/* Redraw the table */
-			if ( bRedraw === undefined || bRedraw )
-			{
-				_fnReDraw( oSettings );
-			}
-			return 0;
-		};
-		
-		
-		/**
-		 * Provide a common method for plug-ins to check the version of DataTables being used, in order
-		 * to ensure compatibility.
-		 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
-		 *    formats "X" and "X.Y" are also acceptable.
-		 *  @returns {boolean} true if this version of DataTables is greater or equal to the required
-		 *    version, or false if this version of DataTales is not suitable
-		 *  @method
-		 *  @dtopt API
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      alert( oTable.fnVersionCheck( '1.9.0' ) );
-		 *    } );
-		 */
-		this.fnVersionCheck = DataTable.ext.fnVersionCheck;
-		
-		
-		/*
-		 * This is really a good bit rubbish this method of exposing the internal methods
-		 * publicly... - To be fixed in 2.0 using methods on the prototype
-		 */
-		
-		
-		/**
-		 * Create a wrapper function for exporting an internal functions to an external API.
-		 *  @param {string} sFunc API function name
-		 *  @returns {function} wrapped function
-		 *  @memberof DataTable#oApi
-		 */
-		function _fnExternApiFunc (sFunc)
-		{
-			return function() {
-				var aArgs = [_fnSettingsFromNode(this[DataTable.ext.iApiIndex])].concat( 
-					Array.prototype.slice.call(arguments) );
-				return DataTable.ext.oApi[sFunc].apply( this, aArgs );
-			};
-		}
-		
-		
-		/**
-		 * Reference to internal functions for use by plug-in developers. Note that these
-		 * methods are references to internal functions and are considered to be private.
-		 * If you use these methods, be aware that they are liable to change between versions
-		 * (check the upgrade notes).
-		 *  @namespace
-		 */
-		this.oApi = {
-			"_fnExternApiFunc": _fnExternApiFunc,
-			"_fnInitialise": _fnInitialise,
-			"_fnInitComplete": _fnInitComplete,
-			"_fnLanguageCompat": _fnLanguageCompat,
-			"_fnAddColumn": _fnAddColumn,
-			"_fnColumnOptions": _fnColumnOptions,
-			"_fnAddData": _fnAddData,
-			"_fnCreateTr": _fnCreateTr,
-			"_fnGatherData": _fnGatherData,
-			"_fnBuildHead": _fnBuildHead,
-			"_fnDrawHead": _fnDrawHead,
-			"_fnDraw": _fnDraw,
-			"_fnReDraw": _fnReDraw,
-			"_fnAjaxUpdate": _fnAjaxUpdate,
-			"_fnAjaxParameters": _fnAjaxParameters,
-			"_fnAjaxUpdateDraw": _fnAjaxUpdateDraw,
-			"_fnServerParams": _fnServerParams,
-			"_fnAddOptionsHtml": _fnAddOptionsHtml,
-			"_fnFeatureHtmlTable": _fnFeatureHtmlTable,
-			"_fnScrollDraw": _fnScrollDraw,
-			"_fnAdjustColumnSizing": _fnAdjustColumnSizing,
-			"_fnFeatureHtmlFilter": _fnFeatureHtmlFilter,
-			"_fnFilterComplete": _fnFilterComplete,
-			"_fnFilterCustom": _fnFilterCustom,
-			"_fnFilterColumn": _fnFilterColumn,
-			"_fnFilter": _fnFilter,
-			"_fnBuildSearchArray": _fnBuildSearchArray,
-			"_fnBuildSearchRow": _fnBuildSearchRow,
-			"_fnFilterCreateSearch": _fnFilterCreateSearch,
-			"_fnDataToSearch": _fnDataToSearch,
-			"_fnSort": _fnSort,
-			"_fnSortAttachListener": _fnSortAttachListener,
-			"_fnSortingClasses": _fnSortingClasses,
-			"_fnFeatureHtmlPaginate": _fnFeatureHtmlPaginate,
-			"_fnPageChange": _fnPageChange,
-			"_fnFeatureHtmlInfo": _fnFeatureHtmlInfo,
-			"_fnUpdateInfo": _fnUpdateInfo,
-			"_fnFeatureHtmlLength": _fnFeatureHtmlLength,
-			"_fnFeatureHtmlProcessing": _fnFeatureHtmlProcessing,
-			"_fnProcessingDisplay": _fnProcessingDisplay,
-			"_fnVisibleToColumnIndex": _fnVisibleToColumnIndex,
-			"_fnColumnIndexToVisible": _fnColumnIndexToVisible,
-			"_fnNodeToDataIndex": _fnNodeToDataIndex,
-			"_fnVisbleColumns": _fnVisbleColumns,
-			"_fnCalculateEnd": _fnCalculateEnd,
-			"_fnConvertToWidth": _fnConvertToWidth,
-			"_fnCalculateColumnWidths": _fnCalculateColumnWidths,
-			"_fnScrollingWidthAdjust": _fnScrollingWidthAdjust,
-			"_fnGetWidestNode": _fnGetWidestNode,
-			"_fnGetMaxLenString": _fnGetMaxLenString,
-			"_fnStringToCss": _fnStringToCss,
-			"_fnDetectType": _fnDetectType,
-			"_fnSettingsFromNode": _fnSettingsFromNode,
-			"_fnGetDataMaster": _fnGetDataMaster,
-			"_fnGetTrNodes": _fnGetTrNodes,
-			"_fnGetTdNodes": _fnGetTdNodes,
-			"_fnEscapeRegex": _fnEscapeRegex,
-			"_fnDeleteIndex": _fnDeleteIndex,
-			"_fnReOrderIndex": _fnReOrderIndex,
-			"_fnColumnOrdering": _fnColumnOrdering,
-			"_fnLog": _fnLog,
-			"_fnClearTable": _fnClearTable,
-			"_fnSaveState": _fnSaveState,
-			"_fnLoadState": _fnLoadState,
-			"_fnCreateCookie": _fnCreateCookie,
-			"_fnReadCookie": _fnReadCookie,
-			"_fnDetectHeader": _fnDetectHeader,
-			"_fnGetUniqueThs": _fnGetUniqueThs,
-			"_fnScrollBarWidth": _fnScrollBarWidth,
-			"_fnApplyToChildren": _fnApplyToChildren,
-			"_fnMap": _fnMap,
-			"_fnGetRowData": _fnGetRowData,
-			"_fnGetCellData": _fnGetCellData,
-			"_fnSetCellData": _fnSetCellData,
-			"_fnGetObjectDataFn": _fnGetObjectDataFn,
-			"_fnSetObjectDataFn": _fnSetObjectDataFn,
-			"_fnApplyColumnDefs": _fnApplyColumnDefs,
-			"_fnBindAction": _fnBindAction,
-			"_fnExtend": _fnExtend,
-			"_fnCallbackReg": _fnCallbackReg,
-			"_fnCallbackFire": _fnCallbackFire,
-			"_fnJsonString": _fnJsonString,
-			"_fnRender": _fnRender,
-			"_fnNodeToColumnIndex": _fnNodeToColumnIndex,
-			"_fnInfoMacros": _fnInfoMacros,
-			"_fnBrowserDetect": _fnBrowserDetect,
-			"_fnGetColumns": _fnGetColumns
-		};
-		
-		$.extend( DataTable.ext.oApi, this.oApi );
-		
-		for ( var sFunc in DataTable.ext.oApi )
-		{
-			if ( sFunc )
-			{
-				this[sFunc] = _fnExternApiFunc(sFunc);
-			}
-		}
-		
-		
-		var _that = this;
-		this.each(function() {
-			var i=0, iLen, j, jLen, k, kLen;
-			var sId = this.getAttribute( 'id' );
-			var bInitHandedOff = false;
-			var bUsePassedData = false;
-			
-			
-			/* Sanity check */
-			if ( this.nodeName.toLowerCase() != 'table' )
-			{
-				_fnLog( null, 0, "Attempted to initialise DataTables on a node which is not a "+
-					"table: "+this.nodeName );
-				return;
-			}
-			
-			/* Check to see if we are re-initialising a table */
-			for ( i=0, iLen=DataTable.settings.length ; i<iLen ; i++ )
-			{
-				/* Base check on table node */
-				if ( DataTable.settings[i].nTable == this )
-				{
-					if ( oInit === undefined || oInit.bRetrieve )
-					{
-						return DataTable.settings[i].oInstance;
-					}
-					else if ( oInit.bDestroy )
-					{
-						DataTable.settings[i].oInstance.fnDestroy();
-						break;
-					}
-					else
-					{
-						_fnLog( DataTable.settings[i], 0, "Cannot reinitialise DataTable.\n\n"+
-							"To retrieve the DataTables object for this table, pass no arguments or see "+
-							"the docs for bRetrieve and bDestroy" );
-						return;
-					}
-				}
-				
-				/* If the element we are initialising has the same ID as a table which was previously
-				 * initialised, but the table nodes don't match (from before) then we destroy the old
-				 * instance by simply deleting it. This is under the assumption that the table has been
-				 * destroyed by other methods. Anyone using non-id selectors will need to do this manually
-				 */
-				if ( DataTable.settings[i].sTableId == this.id )
-				{
-					DataTable.settings.splice( i, 1 );
-					break;
-				}
-			}
-			
-			/* Ensure the table has an ID - required for accessibility */
-			if ( sId === null || sId === "" )
-			{
-				sId = "DataTables_Table_"+(DataTable.ext._oExternConfig.iNextUnique++);
-				this.id = sId;
-			}
-			
-			/* Create the settings object for this table and set some of the default parameters */
-			var oSettings = $.extend( true, {}, DataTable.models.oSettings, {
-				"nTable":        this,
-				"oApi":          _that.oApi,
-				"oInit":         oInit,
-				"sDestroyWidth": $(this).width(),
-				"sInstance":     sId,
-				"sTableId":      sId
-			} );
-			DataTable.settings.push( oSettings );
-			
-			// Need to add the instance after the instance after the settings object has been added
-			// to the settings array, so we can self reference the table instance if more than one
-			oSettings.oInstance = (_that.length===1) ? _that : $(this).dataTable();
-			
-			/* Setting up the initialisation object */
-			if ( !oInit )
-			{
-				oInit = {};
-			}
-			
-			// Backwards compatibility, before we apply all the defaults
-			if ( oInit.oLanguage )
-			{
-				_fnLanguageCompat( oInit.oLanguage );
-			}
-			
-			oInit = _fnExtend( $.extend(true, {}, DataTable.defaults), oInit );
-			
-			// Map the initialisation options onto the settings object
-			_fnMap( oSettings.oFeatures, oInit, "bPaginate" );
-			_fnMap( oSettings.oFeatures, oInit, "bLengthChange" );
-			_fnMap( oSettings.oFeatures, oInit, "bFilter" );
-			_fnMap( oSettings.oFeatures, oInit, "bSort" );
-			_fnMap( oSettings.oFeatures, oInit, "bInfo" );
-			_fnMap( oSettings.oFeatures, oInit, "bProcessing" );
-			_fnMap( oSettings.oFeatures, oInit, "bAutoWidth" );
-			_fnMap( oSettings.oFeatures, oInit, "bSortClasses" );
-			_fnMap( oSettings.oFeatures, oInit, "bServerSide" );
-			_fnMap( oSettings.oFeatures, oInit, "bDeferRender" );
-			_fnMap( oSettings.oScroll, oInit, "sScrollX", "sX" );
-			_fnMap( oSettings.oScroll, oInit, "sScrollXInner", "sXInner" );
-			_fnMap( oSettings.oScroll, oInit, "sScrollY", "sY" );
-			_fnMap( oSettings.oScroll, oInit, "bScrollCollapse", "bCollapse" );
-			_fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" );
-			_fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" );
-			_fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" );
-			_fnMap( oSettings, oInit, "asStripeClasses" );
-			_fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy
-			_fnMap( oSettings, oInit, "fnServerData" );
-			_fnMap( oSettings, oInit, "fnFormatNumber" );
-			_fnMap( oSettings, oInit, "sServerMethod" );
-			_fnMap( oSettings, oInit, "aaSorting" );
-			_fnMap( oSettings, oInit, "aaSortingFixed" );
-			_fnMap( oSettings, oInit, "aLengthMenu" );
-			_fnMap( oSettings, oInit, "sPaginationType" );
-			_fnMap( oSettings, oInit, "sAjaxSource" );
-			_fnMap( oSettings, oInit, "sAjaxDataProp" );
-			_fnMap( oSettings, oInit, "iCookieDuration" );
-			_fnMap( oSettings, oInit, "sCookiePrefix" );
-			_fnMap( oSettings, oInit, "sDom" );
-			_fnMap( oSettings, oInit, "bSortCellsTop" );
-			_fnMap( oSettings, oInit, "iTabIndex" );
-			_fnMap( oSettings, oInit, "oSearch", "oPreviousSearch" );
-			_fnMap( oSettings, oInit, "aoSearchCols", "aoPreSearchCols" );
-			_fnMap( oSettings, oInit, "iDisplayLength", "_iDisplayLength" );
-			_fnMap( oSettings, oInit, "bJQueryUI", "bJUI" );
-			_fnMap( oSettings, oInit, "fnCookieCallback" );
-			_fnMap( oSettings, oInit, "fnStateLoad" );
-			_fnMap( oSettings, oInit, "fnStateSave" );
-			_fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
-			
-			/* Callback functions which are array driven */
-			_fnCallbackReg( oSettings, 'aoDrawCallback',       oInit.fnDrawCallback,      'user' );
-			_fnCallbackReg( oSettings, 'aoServerParams',       oInit.fnServerParams,      'user' );
-			_fnCallbackReg( oSettings, 'aoStateSaveParams',    oInit.fnStateSaveParams,   'user' );
-			_fnCallbackReg( oSettings, 'aoStateLoadParams',    oInit.fnStateLoadParams,   'user' );
-			_fnCallbackReg( oSettings, 'aoStateLoaded',        oInit.fnStateLoaded,       'user' );
-			_fnCallbackReg( oSettings, 'aoRowCallback',        oInit.fnRowCallback,       'user' );
-			_fnCallbackReg( oSettings, 'aoRowCreatedCallback', oInit.fnCreatedRow,        'user' );
-			_fnCallbackReg( oSettings, 'aoHeaderCallback',     oInit.fnHeaderCallback,    'user' );
-			_fnCallbackReg( oSettings, 'aoFooterCallback',     oInit.fnFooterCallback,    'user' );
-			_fnCallbackReg( oSettings, 'aoInitComplete',       oInit.fnInitComplete,      'user' );
-			_fnCallbackReg( oSettings, 'aoPreDrawCallback',    oInit.fnPreDrawCallback,   'user' );
-			
-			if ( oSettings.oFeatures.bServerSide && oSettings.oFeatures.bSort &&
-				   oSettings.oFeatures.bSortClasses )
-			{
-				/* Enable sort classes for server-side processing. Safe to do it here, since server-side
-				 * processing must be enabled by the developer
-				 */
-				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'server_side_sort_classes' );
-			}
-			else if ( oSettings.oFeatures.bDeferRender )
-			{
-				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSortingClasses, 'defer_sort_classes' );
-			}
-			
-			if ( oInit.bJQueryUI )
-			{
-				/* Use the JUI classes object for display. You could clone the oStdClasses object if 
-				 * you want to have multiple tables with multiple independent classes 
-				 */
-				$.extend( oSettings.oClasses, DataTable.ext.oJUIClasses );
-				
-				if ( oInit.sDom === DataTable.defaults.sDom && DataTable.defaults.sDom === "lfrtip" )
-				{
-					/* Set the DOM to use a layout suitable for jQuery UI's theming */
-					oSettings.sDom = '<"H"lfr>t<"F"ip>';
-				}
-			}
-			else
-			{
-				$.extend( oSettings.oClasses, DataTable.ext.oStdClasses );
-			}
-			$(this).addClass( oSettings.oClasses.sTable );
-			
-			/* Calculate the scroll bar width and cache it for use later on */
-			if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
-			{
-				oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
-			}
-			
-			if ( oSettings.iInitDisplayStart === undefined )
-			{
-				/* Display start point, taking into account the save saving */
-				oSettings.iInitDisplayStart = oInit.iDisplayStart;
-				oSettings._iDisplayStart = oInit.iDisplayStart;
-			}
-			
-			/* Must be done after everything which can be overridden by a cookie! */
-			if ( oInit.bStateSave )
-			{
-				oSettings.oFeatures.bStateSave = true;
-				_fnLoadState( oSettings, oInit );
-				_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState, 'state_save' );
-			}
-			
-			if ( oInit.iDeferLoading !== null )
-			{
-				oSettings.bDeferLoading = true;
-				var tmp = $.isArray( oInit.iDeferLoading );
-				oSettings._iRecordsDisplay = tmp ? oInit.iDeferLoading[0] : oInit.iDeferLoading;
-				oSettings._iRecordsTotal = tmp ? oInit.iDeferLoading[1] : oInit.iDeferLoading;
-			}
-			
-			if ( oInit.aaData !== null )
-			{
-				bUsePassedData = true;
-			}
-			
-			/* Language definitions */
-			if ( oInit.oLanguage.sUrl !== "" )
-			{
-				/* Get the language definitions from a file - because this Ajax call makes the language
-				 * get async to the remainder of this function we use bInitHandedOff to indicate that 
-				 * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
-				 */
-				oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
-				$.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
-					_fnLanguageCompat( json );
-					$.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
-					_fnInitialise( oSettings );
-				} );
-				bInitHandedOff = true;
-			}
-			else
-			{
-				$.extend( true, oSettings.oLanguage, oInit.oLanguage );
-			}
-			
-			
-			/*
-			 * Stripes
-			 */
-			if ( oInit.asStripeClasses === null )
-			{
-				oSettings.asStripeClasses =[
-					oSettings.oClasses.sStripeOdd,
-					oSettings.oClasses.sStripeEven
-				];
-			}
-			
-			/* Remove row stripe classes if they are already on the table row */
-			iLen=oSettings.asStripeClasses.length;
-			oSettings.asDestroyStripes = [];
-			if (iLen)
-			{
-				var bStripeRemove = false;
-				var anRows = $(this).children('tbody').children('tr:lt(' + iLen + ')');
-				for ( i=0 ; i<iLen ; i++ )
-				{
-					if ( anRows.hasClass( oSettings.asStripeClasses[i] ) )
-					{
-						bStripeRemove = true;
-						
-						/* Store the classes which we are about to remove so they can be re-added on destroy */
-						oSettings.asDestroyStripes.push( oSettings.asStripeClasses[i] );
-					}
-				}
-				
-				if ( bStripeRemove )
-				{
-					anRows.removeClass( oSettings.asStripeClasses.join(' ') );
-				}
-			}
-			
-			/*
-			 * Columns
-			 * See if we should load columns automatically or use defined ones
-			 */
-			var anThs = [];
-			var aoColumnsInit;
-			var nThead = this.getElementsByTagName('thead');
-			if ( nThead.length !== 0 )
-			{
-				_fnDetectHeader( oSettings.aoHeader, nThead[0] );
-				anThs = _fnGetUniqueThs( oSettings );
-			}
-			
-			/* If not given a column array, generate one with nulls */
-			if ( oInit.aoColumns === null )
-			{
-				aoColumnsInit = [];
-				for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
-				{
-					aoColumnsInit.push( null );
-				}
-			}
-			else
-			{
-				aoColumnsInit = oInit.aoColumns;
-			}
-			
-			/* Add the columns */
-			for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
-			{
-				/* Short cut - use the loop to check if we have column visibility state to restore */
-				if ( oInit.saved_aoColumns !== undefined && oInit.saved_aoColumns.length == iLen )
-				{
-					if ( aoColumnsInit[i] === null )
-					{
-						aoColumnsInit[i] = {};
-					}
-					aoColumnsInit[i].bVisible = oInit.saved_aoColumns[i].bVisible;
-				}
-				
-				_fnAddColumn( oSettings, anThs ? anThs[i] : null );
-			}
-			
-			/* Apply the column definitions */
-			_fnApplyColumnDefs( oSettings, oInit.aoColumnDefs, aoColumnsInit, function (iCol, oDef) {
-				_fnColumnOptions( oSettings, iCol, oDef );
-			} );
-			
-			
-			/*
-			 * Sorting
-			 * Check the aaSorting array
-			 */
-			for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
-			{
-				if ( oSettings.aaSorting[i][0] >= oSettings.aoColumns.length )
-				{
-					oSettings.aaSorting[i][0] = 0;
-				}
-				var oColumn = oSettings.aoColumns[ oSettings.aaSorting[i][0] ];
-				
-				/* Add a default sorting index */
-				if ( oSettings.aaSorting[i][2] === undefined )
-				{
-					oSettings.aaSorting[i][2] = 0;
-				}
-				
-				/* If aaSorting is not defined, then we use the first indicator in asSorting */
-				if ( oInit.aaSorting === undefined && oSettings.saved_aaSorting === undefined )
-				{
-					oSettings.aaSorting[i][1] = oColumn.asSorting[0];
-				}
-				
-				/* Set the current sorting index based on aoColumns.asSorting */
-				for ( j=0, jLen=oColumn.asSorting.length ; j<jLen ; j++ )
-				{
-					if ( oSettings.aaSorting[i][1] == oColumn.asSorting[j] )
-					{
-						oSettings.aaSorting[i][2] = j;
-						break;
-					}
-				}
-			}
-				
-			/* Do a first pass on the sorting classes (allows any size changes to be taken into
-			 * account, and also will apply sorting disabled classes if disabled
-			 */
-			_fnSortingClasses( oSettings );
-			
-			
-			/*
-			 * Final init
-			 * Cache the header, body and footer as required, creating them if needed
-			 */
-			
-			/* Browser support detection */
-			_fnBrowserDetect( oSettings );
-			
-			// Work around for Webkit bug 83867 - store the caption-side before removing from doc
-			var captions = $(this).children('caption').each( function () {
-				this._captionSide = $(this).css('caption-side');
-			} );
-			
-			var thead = $(this).children('thead');
-			if ( thead.length === 0 )
-			{
-				thead = [ document.createElement( 'thead' ) ];
-				this.appendChild( thead[0] );
-			}
-			oSettings.nTHead = thead[0];
-			
-			var tbody = $(this).children('tbody');
-			if ( tbody.length === 0 )
-			{
-				tbody = [ document.createElement( 'tbody' ) ];
-				this.appendChild( tbody[0] );
-			}
-			oSettings.nTBody = tbody[0];
-			oSettings.nTBody.setAttribute( "role", "alert" );
-			oSettings.nTBody.setAttribute( "aria-live", "polite" );
-			oSettings.nTBody.setAttribute( "aria-relevant", "all" );
-			
-			var tfoot = $(this).children('tfoot');
-			if ( tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
-			{
-				// If we are a scrolling table, and no footer has been given, then we need to create
-				// a tfoot element for the caption element to be appended to
-				tfoot = [ document.createElement( 'tfoot' ) ];
-				this.appendChild( tfoot[0] );
-			}
-			
-			if ( tfoot.length > 0 )
-			{
-				oSettings.nTFoot = tfoot[0];
-				_fnDetectHeader( oSettings.aoFooter, oSettings.nTFoot );
-			}
-			
-			/* Check if there is data passing into the constructor */
-			if ( bUsePassedData )
-			{
-				for ( i=0 ; i<oInit.aaData.length ; i++ )
-				{
-					_fnAddData( oSettings, oInit.aaData[ i ] );
-				}
-			}
-			else
-			{
-				/* Grab the data from the page */
-				_fnGatherData( oSettings );
-			}
-			
-			/* Copy the data index array */
-			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			
-			/* Initialisation complete - table can be drawn */
-			oSettings.bInitialised = true;
-			
-			/* Check if we need to initialise the table (it might not have been handed off to the
-			 * language processor)
-			 */
-			if ( bInitHandedOff === false )
-			{
-				_fnInitialise( oSettings );
-			}
-		} );
-		_that = null;
-		return this;
-	};
-
-	
-	
-	/**
-	 * Provide a common method for plug-ins to check the version of DataTables being used, in order
-	 * to ensure compatibility.
-	 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note that the
-	 *    formats "X" and "X.Y" are also acceptable.
-	 *  @returns {boolean} true if this version of DataTables is greater or equal to the required
-	 *    version, or false if this version of DataTales is not suitable
-	 *  @static
-	 *  @dtopt API-Static
-	 *
-	 *  @example
-	 *    alert( $.fn.dataTable.fnVersionCheck( '1.9.0' ) );
-	 */
-	DataTable.fnVersionCheck = function( sVersion )
-	{
-		/* This is cheap, but effective */
-		var fnZPad = function (Zpad, count)
-		{
-			while(Zpad.length < count) {
-				Zpad += '0';
-			}
-			return Zpad;
-		};
-		var aThis = DataTable.ext.sVersion.split('.');
-		var aThat = sVersion.split('.');
-		var sThis = '', sThat = '';
-		
-		for ( var i=0, iLen=aThat.length ; i<iLen ; i++ )
-		{
-			sThis += fnZPad( aThis[i], 3 );
-			sThat += fnZPad( aThat[i], 3 );
-		}
-		
-		return parseInt(sThis, 10) >= parseInt(sThat, 10);
-	};
-	
-	
-	/**
-	 * Check if a TABLE node is a DataTable table already or not.
-	 *  @param {node} nTable The TABLE node to check if it is a DataTable or not (note that other
-	 *    node types can be passed in, but will always return false).
-	 *  @returns {boolean} true the table given is a DataTable, or false otherwise
-	 *  @static
-	 *  @dtopt API-Static
-	 *
-	 *  @example
-	 *    var ex = document.getElementById('example');
-	 *    if ( ! $.fn.DataTable.fnIsDataTable( ex ) ) {
-	 *      $(ex).dataTable();
-	 *    }
-	 */
-	DataTable.fnIsDataTable = function ( nTable )
-	{
-		var o = DataTable.settings;
-	
-		for ( var i=0 ; i<o.length ; i++ )
-		{
-			if ( o[i].nTable === nTable || o[i].nScrollHead === nTable || o[i].nScrollFoot === nTable )
-			{
-				return true;
-			}
-		}
-	
-		return false;
-	};
-	
-	
-	/**
-	 * Get all DataTable tables that have been initialised - optionally you can select to
-	 * get only currently visible tables.
-	 *  @param {boolean} [bVisible=false] Flag to indicate if you want all (default) or 
-	 *    visible tables only.
-	 *  @returns {array} Array of TABLE nodes (not DataTable instances) which are DataTables
-	 *  @static
-	 *  @dtopt API-Static
-	 *
-	 *  @example
-	 *    var table = $.fn.dataTable.fnTables(true);
-	 *    if ( table.length > 0 ) {
-	 *      $(table).dataTable().fnAdjustColumnSizing();
-	 *    }
-	 */
-	DataTable.fnTables = function ( bVisible )
-	{
-		var out = [];
-	
-		jQuery.each( DataTable.settings, function (i, o) {
-			if ( !bVisible || (bVisible === true && $(o.nTable).is(':visible')) )
-			{
-				out.push( o.nTable );
-			}
-		} );
-	
-		return out;
-	};
-	
-
-	/**
-	 * Version string for plug-ins to check compatibility. Allowed format is
-	 * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
-	 * e are optional
-	 *  @member
-	 *  @type string
-	 *  @default Version number
-	 */
-	DataTable.version = "1.9.4";
-
-	/**
-	 * Private data store, containing all of the settings objects that are created for the
-	 * tables on a given page.
-	 * 
-	 * Note that the <i>DataTable.settings</i> object is aliased to <i>jQuery.fn.dataTableExt</i> 
-	 * through which it may be accessed and manipulated, or <i>jQuery.fn.dataTable.settings</i>.
-	 *  @member
-	 *  @type array
-	 *  @default []
-	 *  @private
-	 */
-	DataTable.settings = [];
-
-	/**
-	 * Object models container, for the various models that DataTables has available
-	 * to it. These models define the objects that are used to hold the active state 
-	 * and configuration of the table.
-	 *  @namespace
-	 */
-	DataTable.models = {};
-	
-	
-	/**
-	 * DataTables extension options and plug-ins. This namespace acts as a collection "area"
-	 * for plug-ins that can be used to extend the default DataTables behaviour - indeed many
-	 * of the build in methods use this method to provide their own capabilities (sorting methods
-	 * for example).
-	 * 
-	 * Note that this namespace is aliased to jQuery.fn.dataTableExt so it can be readily accessed
-	 * and modified by plug-ins.
-	 *  @namespace
-	 */
-	DataTable.models.ext = {
-		/**
-		 * Plug-in filtering functions - this method of filtering is complimentary to the default
-		 * type based filtering, and a lot more comprehensive as it allows you complete control
-		 * over the filtering logic. Each element in this array is a function (parameters
-		 * described below) that is called for every row in the table, and your logic decides if
-		 * it should be included in the filtered data set or not.
-		 *   <ul>
-		 *     <li>
-		 *       Function input parameters:
-		 *       <ul>
-		 *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-		 *         <li>{array|object} Data for the row to be processed (same as the original format
-		 *           that was passed in as the data source, or an array from a DOM data source</li>
-		 *         <li>{int} Row index in aoData ({@link DataTable.models.oSettings.aoData}), which can
-		 *           be useful to retrieve the TR element if you need DOM interaction.</li>
-		 *       </ul>
-		 *     </li>
-		 *     <li>
-		 *       Function return:
-		 *       <ul>
-		 *         <li>{boolean} Include the row in the filtered result set (true) or not (false)</li>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 *
-		 *  @example
-		 *    // The following example shows custom filtering being applied to the fourth column (i.e.
-		 *    // the aData[3] index) based on two input values from the end-user, matching the data in 
-		 *    // a certain range.
-		 *    $.fn.dataTableExt.afnFiltering.push(
-		 *      function( oSettings, aData, iDataIndex ) {
-		 *        var iMin = document.getElementById('min').value * 1;
-		 *        var iMax = document.getElementById('max').value * 1;
-		 *        var iVersion = aData[3] == "-" ? 0 : aData[3]*1;
-		 *        if ( iMin == "" && iMax == "" ) {
-		 *          return true;
-		 *        }
-		 *        else if ( iMin == "" && iVersion < iMax ) {
-		 *          return true;
-		 *        }
-		 *        else if ( iMin < iVersion && "" == iMax ) {
-		 *          return true;
-		 *        }
-		 *        else if ( iMin < iVersion && iVersion < iMax ) {
-		 *          return true;
-		 *        }
-		 *        return false;
-		 *      }
-		 *    );
-		 */
-		"afnFiltering": [],
-	
-	
-		/**
-		 * Plug-in sorting functions - this method of sorting is complimentary to the default type
-		 * based sorting that DataTables does automatically, allowing much greater control over the
-		 * the data that is being used to sort a column. This is useful if you want to do sorting
-		 * based on live data (for example the contents of an 'input' element) rather than just the
-		 * static string that DataTables knows of. The way these plug-ins work is that you create
-		 * an array of the values you wish to be sorted for the column in question and then return
-		 * that array. Which pre-sorting function is run here depends on the sSortDataType parameter
-		 * that is used for the column (if any). This is the corollary of <i>ofnSearch</i> for sort 
-		 * data.
-		 *   <ul>
-	     *     <li>
-	     *       Function input parameters:
-	     *       <ul>
-		 *         <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-	     *         <li>{int} Target column index</li>
-	     *       </ul>
-	     *     </li>
-		 *     <li>
-		 *       Function return:
-		 *       <ul>
-		 *         <li>{array} Data for the column to be sorted upon</li>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 *  
-		 * Note that as of v1.9, it is typically preferable to use <i>mData</i> to prepare data for
-		 * the different uses that DataTables can put the data to. Specifically <i>mData</i> when
-		 * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
-		 * prepare the data as required for the different types. As such, this method is deprecated.
-		 *  @type array
-		 *  @default []
-		 *  @deprecated
-		 *
-		 *  @example
-		 *    // Updating the cached sorting information with user entered values in HTML input elements
-		 *    jQuery.fn.dataTableExt.afnSortData['dom-text'] = function ( oSettings, iColumn )
-		 *    {
-		 *      var aData = [];
-		 *      $( 'td:eq('+iColumn+') input', oSettings.oApi._fnGetTrNodes(oSettings) ).each( function () {
-		 *        aData.push( this.value );
-		 *      } );
-		 *      return aData;
-		 *    }
-		 */
-		"afnSortData": [],
-	
-	
-		/**
-		 * Feature plug-ins - This is an array of objects which describe the feature plug-ins that are
-		 * available to DataTables. These feature plug-ins are accessible through the sDom initialisation
-		 * option. As such, each feature plug-in must describe a function that is used to initialise
-		 * itself (fnInit), a character so the feature can be enabled by sDom (cFeature) and the name
-		 * of the feature (sFeature). Thus the objects attached to this method must provide:
-		 *   <ul>
-		 *     <li>{function} fnInit Initialisation of the plug-in
-		 *       <ul>
-	     *         <li>
-	     *           Function input parameters:
-	     *           <ul>
-		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-	     *           </ul>
-	     *         </li>
-		 *         <li>
-		 *           Function return:
-		 *           <ul>
-		 *             <li>{node|null} The element which contains your feature. Note that the return
-		 *                may also be void if your plug-in does not require to inject any DOM elements 
-		 *                into DataTables control (sDom) - for example this might be useful when 
-		 *                developing a plug-in which allows table control via keyboard entry.</li>
-		 *           </ul>
-		 *         </il>
-		 *       </ul>
-		 *     </li>
-		 *     <li>{character} cFeature Character that will be matched in sDom - case sensitive</li>
-		 *     <li>{string} sFeature Feature name</li>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 * 
-		 *  @example
-		 *    // How TableTools initialises itself.
-		 *    $.fn.dataTableExt.aoFeatures.push( {
-		 *      "fnInit": function( oSettings ) {
-		 *        return new TableTools( { "oDTSettings": oSettings } );
-		 *      },
-		 *      "cFeature": "T",
-		 *      "sFeature": "TableTools"
-		 *    } );
-		 */
-		"aoFeatures": [],
-	
-	
-		/**
-		 * Type detection plug-in functions - DataTables utilises types to define how sorting and
-		 * filtering behave, and types can be either  be defined by the developer (sType for the
-		 * column) or they can be automatically detected by the methods in this array. The functions
-		 * defined in the array are quite simple, taking a single parameter (the data to analyse) 
-		 * and returning the type if it is a known type, or null otherwise.
-		 *   <ul>
-	     *     <li>
-	     *       Function input parameters:
-	     *       <ul>
-		 *         <li>{*} Data from the column cell to be analysed</li>
-	     *       </ul>
-	     *     </li>
-		 *     <li>
-		 *       Function return:
-		 *       <ul>
-		 *         <li>{string|null} Data type detected, or null if unknown (and thus pass it
-		 *           on to the other type detection functions.</li>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 *  
-		 *  @example
-		 *    // Currency type detection plug-in:
-		 *    jQuery.fn.dataTableExt.aTypes.push(
-		 *      function ( sData ) {
-		 *        var sValidChars = "0123456789.-";
-		 *        var Char;
-		 *        
-		 *        // Check the numeric part
-		 *        for ( i=1 ; i<sData.length ; i++ ) {
-		 *          Char = sData.charAt(i); 
-		 *          if (sValidChars.indexOf(Char) == -1) {
-		 *            return null;
-		 *          }
-		 *        }
-		 *        
-		 *        // Check prefixed by currency
-		 *        if ( sData.charAt(0) == '$' || sData.charAt(0) == '&pound;' ) {
-		 *          return 'currency';
-		 *        }
-		 *        return null;
-		 *      }
-		 *    );
-		 */
-		"aTypes": [],
-	
-	
-		/**
-		 * Provide a common method for plug-ins to check the version of DataTables being used, 
-		 * in order to ensure compatibility.
-		 *  @type function
-		 *  @param {string} sVersion Version string to check for, in the format "X.Y.Z". Note 
-		 *    that the formats "X" and "X.Y" are also acceptable.
-		 *  @returns {boolean} true if this version of DataTables is greater or equal to the 
-		 *    required version, or false if this version of DataTales is not suitable
-		 *
-		 *  @example
-		 *    $(document).ready(function() {
-		 *      var oTable = $('#example').dataTable();
-		 *      alert( oTable.fnVersionCheck( '1.9.0' ) );
-		 *    } );
-		 */
-		"fnVersionCheck": DataTable.fnVersionCheck,
-	
-	
-		/**
-		 * Index for what 'this' index API functions should use
-		 *  @type int
-		 *  @default 0
-		 */
-		"iApiIndex": 0,
-	
-	
-		/**
-		 * Pre-processing of filtering data plug-ins - When you assign the sType for a column
-		 * (or have it automatically detected for you by DataTables or a type detection plug-in), 
-		 * you will typically be using this for custom sorting, but it can also be used to provide 
-		 * custom filtering by allowing you to pre-processing the data and returning the data in
-		 * the format that should be filtered upon. This is done by adding functions this object 
-		 * with a parameter name which matches the sType for that target column. This is the
-		 * corollary of <i>afnSortData</i> for filtering data.
-		 *   <ul>
-	     *     <li>
-	     *       Function input parameters:
-	     *       <ul>
-		 *         <li>{*} Data from the column cell to be prepared for filtering</li>
-	     *       </ul>
-	     *     </li>
-		 *     <li>
-		 *       Function return:
-		 *       <ul>
-		 *         <li>{string|null} Formatted string that will be used for the filtering.</li>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 * 
-		 * Note that as of v1.9, it is typically preferable to use <i>mData</i> to prepare data for
-		 * the different uses that DataTables can put the data to. Specifically <i>mData</i> when
-		 * used as a function will give you a 'type' (sorting, filtering etc) that you can use to 
-		 * prepare the data as required for the different types. As such, this method is deprecated.
-		 *  @type object
-		 *  @default {}
-		 *  @deprecated
-		 *
-		 *  @example
-		 *    $.fn.dataTableExt.ofnSearch['title-numeric'] = function ( sData ) {
-		 *      return sData.replace(/\n/g," ").replace( /<.*?>/g, "" );
-		 *    }
-		 */
-		"ofnSearch": {},
-	
-	
-		/**
-		 * Container for all private functions in DataTables so they can be exposed externally
-		 *  @type object
-		 *  @default {}
-		 */
-		"oApi": {},
-	
-	
-		/**
-		 * Storage for the various classes that DataTables uses
-		 *  @type object
-		 *  @default {}
-		 */
-		"oStdClasses": {},
-		
-	
-		/**
-		 * Storage for the various classes that DataTables uses - jQuery UI suitable
-		 *  @type object
-		 *  @default {}
-		 */
-		"oJUIClasses": {},
-	
-	
-		/**
-		 * Pagination plug-in methods - The style and controls of the pagination can significantly 
-		 * impact on how the end user interacts with the data in your table, and DataTables allows 
-		 * the addition of pagination controls by extending this object, which can then be enabled
-		 * through the <i>sPaginationType</i> initialisation parameter. Each pagination type that
-		 * is added is an object (the property name of which is what <i>sPaginationType</i> refers
-		 * to) that has two properties, both methods that are used by DataTables to update the
-		 * control's state.
-		 *   <ul>
-		 *     <li>
-		 *       fnInit -  Initialisation of the paging controls. Called only during initialisation 
-		 *         of the table. It is expected that this function will add the required DOM elements 
-		 *         to the page for the paging controls to work. The element pointer 
-		 *         'oSettings.aanFeatures.p' array is provided by DataTables to contain the paging 
-		 *         controls (note that this is a 2D array to allow for multiple instances of each 
-		 *         DataTables DOM element). It is suggested that you add the controls to this element 
-		 *         as children
-		 *       <ul>
-	     *         <li>
-	     *           Function input parameters:
-	     *           <ul>
-		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-		 *             <li>{node} Container into which the pagination controls must be inserted</li>
-		 *             <li>{function} Draw callback function - whenever the controls cause a page
-		 *               change, this method must be called to redraw the table.</li>
-	     *           </ul>
-	     *         </li>
-		 *         <li>
-		 *           Function return:
-		 *           <ul>
-		 *             <li>No return required</li>
-		 *           </ul>
-		 *         </il>
-		 *       </ul>
-		 *     </il>
-		 *     <li>
-		 *       fnInit -  This function is called whenever the paging status of the table changes and is
-		 *         typically used to update classes and/or text of the paging controls to reflex the new 
-		 *         status.
-		 *       <ul>
-	     *         <li>
-	     *           Function input parameters:
-	     *           <ul>
-		 *             <li>{object} DataTables settings object: see {@link DataTable.models.oSettings}.</li>
-		 *             <li>{function} Draw callback function - in case you need to redraw the table again
-		 *               or attach new event listeners</li>
-	     *           </ul>
-	     *         </li>
-		 *         <li>
-		 *           Function return:
-		 *           <ul>
-		 *             <li>No return required</li>
-		 *           </ul>
-		 *         </il>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 *  @type object
-		 *  @default {}
-		 *
-		 *  @example
-		 *    $.fn.dataTableExt.oPagination.four_button = {
-		 *      "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) {
-		 *        nFirst = document.createElement( 'span' );
-		 *        nPrevious = document.createElement( 'span' );
-		 *        nNext = document.createElement( 'span' );
-		 *        nLast = document.createElement( 'span' );
-		 *        
-		 *        nFirst.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sFirst ) );
-		 *        nPrevious.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sPrevious ) );
-		 *        nNext.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sNext ) );
-		 *        nLast.appendChild( document.createTextNode( oSettings.oLanguage.oPaginate.sLast ) );
-		 *        
-		 *        nFirst.className = "paginate_button first";
-		 *        nPrevious.className = "paginate_button previous";
-		 *        nNext.className="paginate_button next";
-		 *        nLast.className = "paginate_button last";
-		 *        
-		 *        nPaging.appendChild( nFirst );
-		 *        nPaging.appendChild( nPrevious );
-		 *        nPaging.appendChild( nNext );
-		 *        nPaging.appendChild( nLast );
-		 *        
-		 *        $(nFirst).click( function () {
-		 *          oSettings.oApi._fnPageChange( oSettings, "first" );
-		 *          fnCallbackDraw( oSettings );
-		 *        } );
-		 *        
-		 *        $(nPrevious).click( function() {
-		 *          oSettings.oApi._fnPageChange( oSettings, "previous" );
-		 *          fnCallbackDraw( oSettings );
-		 *        } );
-		 *        
-		 *        $(nNext).click( function() {
-		 *          oSettings.oApi._fnPageChange( oSettings, "next" );
-		 *          fnCallbackDraw( oSettings );
-		 *        } );
-		 *        
-		 *        $(nLast).click( function() {
-		 *          oSettings.oApi._fnPageChange( oSettings, "last" );
-		 *          fnCallbackDraw( oSettings );
-		 *        } );
-		 *        
-		 *        $(nFirst).bind( 'selectstart', function () { return false; } );
-		 *        $(nPrevious).bind( 'selectstart', function () { return false; } );
-		 *        $(nNext).bind( 'selectstart', function () { return false; } );
-		 *        $(nLast).bind( 'selectstart', function () { return false; } );
-		 *      },
-		 *      
-		 *      "fnUpdate": function ( oSettings, fnCallbackDraw ) {
-		 *        if ( !oSettings.aanFeatures.p ) {
-		 *          return;
-		 *        }
-		 *        
-		 *        // Loop over each instance of the pager
-		 *        var an = oSettings.aanFeatures.p;
-		 *        for ( var i=0, iLen=an.length ; i<iLen ; i++ ) {
-		 *          var buttons = an[i].getElementsByTagName('span');
-		 *          if ( oSettings._iDisplayStart === 0 ) {
-		 *            buttons[0].className = "paginate_disabled_previous";
-		 *            buttons[1].className = "paginate_disabled_previous";
-		 *          }
-		 *          else {
-		 *            buttons[0].className = "paginate_enabled_previous";
-		 *            buttons[1].className = "paginate_enabled_previous";
-		 *          }
-		 *          
-		 *          if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) {
-		 *            buttons[2].className = "paginate_disabled_next";
-		 *            buttons[3].className = "paginate_disabled_next";
-		 *          }
-		 *          else {
-		 *            buttons[2].className = "paginate_enabled_next";
-		 *            buttons[3].className = "paginate_enabled_next";
-		 *          }
-		 *        }
-		 *      }
-		 *    };
-		 */
-		"oPagination": {},
-	
-	
-		/**
-		 * Sorting plug-in methods - Sorting in DataTables is based on the detected type of the
-		 * data column (you can add your own type detection functions, or override automatic 
-		 * detection using sType). With this specific type given to the column, DataTables will 
-		 * apply the required sort from the functions in the object. Each sort type must provide
-		 * two mandatory methods, one each for ascending and descending sorting, and can optionally
-		 * provide a pre-formatting method that will help speed up sorting by allowing DataTables
-		 * to pre-format the sort data only once (rather than every time the actual sort functions
-		 * are run). The two sorting functions are typical Javascript sort methods:
-		 *   <ul>
-	     *     <li>
-	     *       Function input parameters:
-	     *       <ul>
-		 *         <li>{*} Data to compare to the second parameter</li>
-		 *         <li>{*} Data to compare to the first parameter</li>
-	     *       </ul>
-	     *     </li>
-		 *     <li>
-		 *       Function return:
-		 *       <ul>
-		 *         <li>{int} Sorting match: <0 if first parameter should be sorted lower than
-		 *           the second parameter, ===0 if the two parameters are equal and >0 if
-		 *           the first parameter should be sorted height than the second parameter.</li>
-		 *       </ul>
-		 *     </il>
-		 *   </ul>
-		 *  @type object
-		 *  @default {}
-		 *
-		 *  @example
-		 *    // Case-sensitive string sorting, with no pre-formatting method
-		 *    $.extend( $.fn.dataTableExt.oSort, {
-		 *      "string-case-asc": function(x,y) {
-		 *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-		 *      },
-		 *      "string-case-desc": function(x,y) {
-		 *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-		 *      }
-		 *    } );
-		 *
-		 *  @example
-		 *    // Case-insensitive string sorting, with pre-formatting
-		 *    $.extend( $.fn.dataTableExt.oSort, {
-		 *      "string-pre": function(x) {
-		 *        return x.toLowerCase();
-		 *      },
-		 *      "string-asc": function(x,y) {
-		 *        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-		 *      },
-		 *      "string-desc": function(x,y) {
-		 *        return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-		 *      }
-		 *    } );
-		 */
-		"oSort": {},
-	
-	
-		/**
-		 * Version string for plug-ins to check compatibility. Allowed format is
-		 * a.b.c.d.e where: a:int, b:int, c:int, d:string(dev|beta), e:int. d and
-		 * e are optional
-		 *  @type string
-		 *  @default Version number
-		 */
-		"sVersion": DataTable.version,
-	
-	
-		/**
-		 * How should DataTables report an error. Can take the value 'alert' or 'throw'
-		 *  @type string
-		 *  @default alert
-		 */
-		"sErrMode": "alert",
-	
-	
-		/**
-		 * Store information for DataTables to access globally about other instances
-		 *  @namespace
-		 *  @private
-		 */
-		"_oExternConfig": {
-			/* int:iNextUnique - next unique number for an instance */
-			"iNextUnique": 0
-		}
-	};
-	
-	
-	
-	
-	/**
-	 * Template object for the way in which DataTables holds information about
-	 * search information for the global filter and individual column filters.
-	 *  @namespace
-	 */
-	DataTable.models.oSearch = {
-		/**
-		 * Flag to indicate if the filtering should be case insensitive or not
-		 *  @type boolean
-		 *  @default true
-		 */
-		"bCaseInsensitive": true,
-	
-		/**
-		 * Applied search term
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 */
-		"sSearch": "",
-	
-		/**
-		 * Flag to indicate if the search term should be interpreted as a
-		 * regular expression (true) or not (false) and therefore and special
-		 * regex characters escaped.
-		 *  @type boolean
-		 *  @default false
-		 */
-		"bRegex": false,
-	
-		/**
-		 * Flag to indicate if DataTables is to use its smart filtering or not.
-		 *  @type boolean
-		 *  @default true
-		 */
-		"bSmart": true
-	};
-	
-	
-	
-	
-	/**
-	 * Template object for the way in which DataTables holds information about
-	 * each individual row. This is the object format used for the settings 
-	 * aoData array.
-	 *  @namespace
-	 */
-	DataTable.models.oRow = {
-		/**
-		 * TR element for the row
-		 *  @type node
-		 *  @default null
-		 */
-		"nTr": null,
-	
-		/**
-		 * Data object from the original data source for the row. This is either
-		 * an array if using the traditional form of DataTables, or an object if
-		 * using mData options. The exact type will depend on the passed in
-		 * data from the data source, or will be an array if using DOM a data 
-		 * source.
-		 *  @type array|object
-		 *  @default []
-		 */
-		"_aData": [],
-	
-		/**
-		 * Sorting data cache - this array is ostensibly the same length as the
-		 * number of columns (although each index is generated only as it is 
-		 * needed), and holds the data that is used for sorting each column in the
-		 * row. We do this cache generation at the start of the sort in order that
-		 * the formatting of the sort data need be done only once for each cell
-		 * per sort. This array should not be read from or written to by anything
-		 * other than the master sorting methods.
-		 *  @type array
-		 *  @default []
-		 *  @private
-		 */
-		"_aSortData": [],
-	
-		/**
-		 * Array of TD elements that are cached for hidden rows, so they can be
-		 * reinserted into the table if a column is made visible again (or to act
-		 * as a store if a column is made hidden). Only hidden columns have a 
-		 * reference in the array. For non-hidden columns the value is either
-		 * undefined or null.
-		 *  @type array nodes
-		 *  @default []
-		 *  @private
-		 */
-		"_anHidden": [],
-	
-		/**
-		 * Cache of the class name that DataTables has applied to the row, so we
-		 * can quickly look at this variable rather than needing to do a DOM check
-		 * on className for the nTr property.
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 *  @private
-		 */
-		"_sRowStripe": ""
-	};
-	
-	
-	
-	/**
-	 * Template object for the column information object in DataTables. This object
-	 * is held in the settings aoColumns array and contains all the information that
-	 * DataTables needs about each individual column.
-	 * 
-	 * Note that this object is related to {@link DataTable.defaults.columns} 
-	 * but this one is the internal data store for DataTables's cache of columns.
-	 * It should NOT be manipulated outside of DataTables. Any configuration should
-	 * be done through the initialisation options.
-	 *  @namespace
-	 */
-	DataTable.models.oColumn = {
-		/**
-		 * A list of the columns that sorting should occur on when this column
-		 * is sorted. That this property is an array allows multi-column sorting
-		 * to be defined for a column (for example first name / last name columns
-		 * would benefit from this). The values are integers pointing to the
-		 * columns to be sorted on (typically it will be a single integer pointing
-		 * at itself, but that doesn't need to be the case).
-		 *  @type array
-		 */
-		"aDataSort": null,
-	
-		/**
-		 * Define the sorting directions that are applied to the column, in sequence
-		 * as the column is repeatedly sorted upon - i.e. the first value is used
-		 * as the sorting direction when the column if first sorted (clicked on).
-		 * Sort it again (click again) and it will move on to the next index.
-		 * Repeat until loop.
-		 *  @type array
-		 */
-		"asSorting": null,
-		
-		/**
-		 * Flag to indicate if the column is searchable, and thus should be included
-		 * in the filtering or not.
-		 *  @type boolean
-		 */
-		"bSearchable": null,
-		
-		/**
-		 * Flag to indicate if the column is sortable or not.
-		 *  @type boolean
-		 */
-		"bSortable": null,
-		
-		/**
-		 * <code>Deprecated</code> When using fnRender, you have two options for what 
-		 * to do with the data, and this property serves as the switch. Firstly, you 
-		 * can have the sorting and filtering use the rendered value (true - default), 
-		 * or you can have the sorting and filtering us the original value (false).
-		 *
-		 * Please note that this option has now been deprecated and will be removed
-		 * in the next version of DataTables. Please use mRender / mData rather than
-		 * fnRender.
-		 *  @type boolean
-		 *  @deprecated
-		 */
-		"bUseRendered": null,
-		
-		/**
-		 * Flag to indicate if the column is currently visible in the table or not
-		 *  @type boolean
-		 */
-		"bVisible": null,
-		
-		/**
-		 * Flag to indicate to the type detection method if the automatic type
-		 * detection should be used, or if a column type (sType) has been specified
-		 *  @type boolean
-		 *  @default true
-		 *  @private
-		 */
-		"_bAutoType": true,
-		
-		/**
-		 * Developer definable function that is called whenever a cell is created (Ajax source,
-		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
-		 * allowing you to modify the DOM element (add background colour for example) when the
-		 * element is available.
-		 *  @type function
-		 *  @param {element} nTd The TD node that has been created
-		 *  @param {*} sData The Data for the cell
-		 *  @param {array|object} oData The data for the whole row
-		 *  @param {int} iRow The row index for the aoData data store
-		 *  @default null
-		 */
-		"fnCreatedCell": null,
-		
-		/**
-		 * Function to get data from a cell in a column. You should <b>never</b>
-		 * access data directly through _aData internally in DataTables - always use
-		 * the method attached to this property. It allows mData to function as
-		 * required. This function is automatically assigned by the column 
-		 * initialisation method
-		 *  @type function
-		 *  @param {array|object} oData The data array/object for the array 
-		 *    (i.e. aoData[]._aData)
-		 *  @param {string} sSpecific The specific data type you want to get - 
-		 *    'display', 'type' 'filter' 'sort'
-		 *  @returns {*} The data for the cell from the given row's data
-		 *  @default null
-		 */
-		"fnGetData": null,
-		
-		/**
-		 * <code>Deprecated</code> Custom display function that will be called for the 
-		 * display of each cell in this column.
-		 *
-		 * Please note that this option has now been deprecated and will be removed
-		 * in the next version of DataTables. Please use mRender / mData rather than
-		 * fnRender.
-		 *  @type function
-		 *  @param {object} o Object with the following parameters:
-		 *  @param {int}    o.iDataRow The row in aoData
-		 *  @param {int}    o.iDataColumn The column in question
-		 *  @param {array}  o.aData The data for the row in question
-		 *  @param {object} o.oSettings The settings object for this DataTables instance
-		 *  @returns {string} The string you which to use in the display
-		 *  @default null
-		 *  @deprecated
-		 */
-		"fnRender": null,
-		
-		/**
-		 * Function to set data for a cell in the column. You should <b>never</b> 
-		 * set the data directly to _aData internally in DataTables - always use
-		 * this method. It allows mData to function as required. This function
-		 * is automatically assigned by the column initialisation method
-		 *  @type function
-		 *  @param {array|object} oData The data array/object for the array 
-		 *    (i.e. aoData[]._aData)
-		 *  @param {*} sValue Value to set
-		 *  @default null
-		 */
-		"fnSetData": null,
-		
-		/**
-		 * Property to read the value for the cells in the column from the data 
-		 * source array / object. If null, then the default content is used, if a
-		 * function is given then the return from the function is used.
-		 *  @type function|int|string|null
-		 *  @default null
-		 */
-		"mData": null,
-		
-		/**
-		 * Partner property to mData which is used (only when defined) to get
-		 * the data - i.e. it is basically the same as mData, but without the
-		 * 'set' option, and also the data fed to it is the result from mData.
-		 * This is the rendering method to match the data method of mData.
-		 *  @type function|int|string|null
-		 *  @default null
-		 */
-		"mRender": null,
-		
-		/**
-		 * Unique header TH/TD element for this column - this is what the sorting
-		 * listener is attached to (if sorting is enabled.)
-		 *  @type node
-		 *  @default null
-		 */
-		"nTh": null,
-		
-		/**
-		 * Unique footer TH/TD element for this column (if there is one). Not used 
-		 * in DataTables as such, but can be used for plug-ins to reference the 
-		 * footer for each column.
-		 *  @type node
-		 *  @default null
-		 */
-		"nTf": null,
-		
-		/**
-		 * The class to apply to all TD elements in the table's TBODY for the column
-		 *  @type string
-		 *  @default null
-		 */
-		"sClass": null,
-		
-		/**
-		 * When DataTables calculates the column widths to assign to each column,
-		 * it finds the longest string in each column and then constructs a
-		 * temporary table and reads the widths from that. The problem with this
-		 * is that "mmm" is much wider then "iiii", but the latter is a longer 
-		 * string - thus the calculation can go wrong (doing it properly and putting
-		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
-		 * a "work around" we provide this option. It will append its value to the
-		 * text that is found to be the longest string for the column - i.e. padding.
-		 *  @type string
-		 */
-		"sContentPadding": null,
-		
-		/**
-		 * Allows a default value to be given for a column's data, and will be used
-		 * whenever a null data source is encountered (this can be because mData
-		 * is set to null, or because the data source itself is null).
-		 *  @type string
-		 *  @default null
-		 */
-		"sDefaultContent": null,
-		
-		/**
-		 * Name for the column, allowing reference to the column by name as well as
-		 * by index (needs a lookup to work by name).
-		 *  @type string
-		 */
-		"sName": null,
-		
-		/**
-		 * Custom sorting data type - defines which of the available plug-ins in
-		 * afnSortData the custom sorting will use - if any is defined.
-		 *  @type string
-		 *  @default std
-		 */
-		"sSortDataType": 'std',
-		
-		/**
-		 * Class to be applied to the header element when sorting on this column
-		 *  @type string
-		 *  @default null
-		 */
-		"sSortingClass": null,
-		
-		/**
-		 * Class to be applied to the header element when sorting on this column -
-		 * when jQuery UI theming is used.
-		 *  @type string
-		 *  @default null
-		 */
-		"sSortingClassJUI": null,
-		
-		/**
-		 * Title of the column - what is seen in the TH element (nTh).
-		 *  @type string
-		 */
-		"sTitle": null,
-		
-		/**
-		 * Column sorting and filtering type
-		 *  @type string
-		 *  @default null
-		 */
-		"sType": null,
-		
-		/**
-		 * Width of the column
-		 *  @type string
-		 *  @default null
-		 */
-		"sWidth": null,
-		
-		/**
-		 * Width of the column when it was first "encountered"
-		 *  @type string
-		 *  @default null
-		 */
-		"sWidthOrig": null
-	};
-	
-	
-	
-	/**
-	 * Initialisation options that can be given to DataTables at initialisation 
-	 * time.
-	 *  @namespace
-	 */
-	DataTable.defaults = {
-		/**
-		 * An array of data to use for the table, passed in at initialisation which 
-		 * will be used in preference to any data which is already in the DOM. This is
-		 * particularly useful for constructing tables purely in Javascript, for
-		 * example with a custom Ajax call.
-		 *  @type array
-		 *  @default null
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    // Using a 2D array data source
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "aaData": [
-		 *          ['Trident', 'Internet Explorer 4.0', 'Win 95+', 4, 'X'],
-		 *          ['Trident', 'Internet Explorer 5.0', 'Win 95+', 5, 'C'],
-		 *        ],
-		 *        "aoColumns": [
-		 *          { "sTitle": "Engine" },
-		 *          { "sTitle": "Browser" },
-		 *          { "sTitle": "Platform" },
-		 *          { "sTitle": "Version" },
-		 *          { "sTitle": "Grade" }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using an array of objects as a data source (mData)
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "aaData": [
-		 *          {
-		 *            "engine":   "Trident",
-		 *            "browser":  "Internet Explorer 4.0",
-		 *            "platform": "Win 95+",
-		 *            "version":  4,
-		 *            "grade":    "X"
-		 *          },
-		 *          {
-		 *            "engine":   "Trident",
-		 *            "browser":  "Internet Explorer 5.0",
-		 *            "platform": "Win 95+",
-		 *            "version":  5,
-		 *            "grade":    "C"
-		 *          }
-		 *        ],
-		 *        "aoColumns": [
-		 *          { "sTitle": "Engine",   "mData": "engine" },
-		 *          { "sTitle": "Browser",  "mData": "browser" },
-		 *          { "sTitle": "Platform", "mData": "platform" },
-		 *          { "sTitle": "Version",  "mData": "version" },
-		 *          { "sTitle": "Grade",    "mData": "grade" }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"aaData": null,
-	
-	
-		/**
-		 * If sorting is enabled, then DataTables will perform a first pass sort on 
-		 * initialisation. You can define which column(s) the sort is performed upon, 
-		 * and the sorting direction, with this variable. The aaSorting array should 
-		 * contain an array for each column to be sorted initially containing the 
-		 * column's index and a direction string ('asc' or 'desc').
-		 *  @type array
-		 *  @default [[0,'asc']]
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    // Sort by 3rd column first, and then 4th column
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aaSorting": [[2,'asc'], [3,'desc']]
-		 *      } );
-		 *    } );
-		 *    
-		 *    // No initial sorting
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aaSorting": []
-		 *      } );
-		 *    } );
-		 */
-		"aaSorting": [[0,'asc']],
-	
-	
-		/**
-		 * This parameter is basically identical to the aaSorting parameter, but 
-		 * cannot be overridden by user interaction with the table. What this means 
-		 * is that you could have a column (visible or hidden) which the sorting will 
-		 * always be forced on first - any sorting after that (from the user) will 
-		 * then be performed as required. This can be useful for grouping rows 
-		 * together.
-		 *  @type array
-		 *  @default null
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aaSortingFixed": [[0,'asc']]
-		 *      } );
-		 *    } )
-		 */
-		"aaSortingFixed": null,
-	
-	
-		/**
-		 * This parameter allows you to readily specify the entries in the length drop
-		 * down menu that DataTables shows when pagination is enabled. It can be 
-		 * either a 1D array of options which will be used for both the displayed 
-		 * option and the value, or a 2D array which will use the array in the first 
-		 * position as the value, and the array in the second position as the 
-		 * displayed options (useful for language strings such as 'All').
-		 *  @type array
-		 *  @default [ 10, 25, 50, 100 ]
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]]
-		 *      } );
-		 *    } );
-		 *  
-		 *  @example
-		 *    // Setting the default display length as well as length menu
-		 *    // This is likely to be wanted if you remove the '10' option which
-		 *    // is the iDisplayLength default.
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "iDisplayLength": 25,
-		 *        "aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]]
-		 *      } );
-		 *    } );
-		 */
-		"aLengthMenu": [ 10, 25, 50, 100 ],
-	
-	
-		/**
-		 * The aoColumns option in the initialisation parameter allows you to define
-		 * details about the way individual columns behave. For a full list of
-		 * column options that can be set, please see 
-		 * {@link DataTable.defaults.columns}. Note that if you use aoColumns to
-		 * define your columns, you must have an entry in the array for every single
-		 * column that you have in your table (these can be null if you don't which
-		 * to specify any options).
-		 *  @member
-		 */
-		"aoColumns": null,
-	
-		/**
-		 * Very similar to aoColumns, aoColumnDefs allows you to target a specific 
-		 * column, multiple columns, or all columns, using the aTargets property of 
-		 * each object in the array. This allows great flexibility when creating 
-		 * tables, as the aoColumnDefs arrays can be of any length, targeting the 
-		 * columns you specifically want. aoColumnDefs may use any of the column 
-		 * options available: {@link DataTable.defaults.columns}, but it _must_
-		 * have aTargets defined in each object in the array. Values in the aTargets
-		 * array may be:
-		 *   <ul>
-		 *     <li>a string - class name will be matched on the TH for the column</li>
-		 *     <li>0 or a positive integer - column index counting from the left</li>
-		 *     <li>a negative integer - column index counting from the right</li>
-		 *     <li>the string "_all" - all columns (i.e. assign a default)</li>
-		 *   </ul>
-		 *  @member
-		 */
-		"aoColumnDefs": null,
-	
-	
-		/**
-		 * Basically the same as oSearch, this parameter defines the individual column
-		 * filtering state at initialisation time. The array must be of the same size 
-		 * as the number of columns, and each element be an object with the parameters
-		 * "sSearch" and "bEscapeRegex" (the latter is optional). 'null' is also
-		 * accepted and the default will be used.
-		 *  @type array
-		 *  @default []
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoSearchCols": [
-		 *          null,
-		 *          { "sSearch": "My filter" },
-		 *          null,
-		 *          { "sSearch": "^[0-9]", "bEscapeRegex": false }
-		 *        ]
-		 *      } );
-		 *    } )
-		 */
-		"aoSearchCols": [],
-	
-	
-		/**
-		 * An array of CSS classes that should be applied to displayed rows. This 
-		 * array may be of any length, and DataTables will apply each class 
-		 * sequentially, looping when required.
-		 *  @type array
-		 *  @default null <i>Will take the values determined by the oClasses.sStripe*
-		 *    options</i>
-		 *  @dtopt Option
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "asStripeClasses": [ 'strip1', 'strip2', 'strip3' ]
-		 *      } );
-		 *    } )
-		 */
-		"asStripeClasses": null,
-	
-	
-		/**
-		 * Enable or disable automatic column width calculation. This can be disabled
-		 * as an optimisation (it takes some time to calculate the widths) if the
-		 * tables widths are passed in using aoColumns.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bAutoWidth": false
-		 *      } );
-		 *    } );
-		 */
-		"bAutoWidth": true,
-	
-	
-		/**
-		 * Deferred rendering can provide DataTables with a huge speed boost when you
-		 * are using an Ajax or JS data source for the table. This option, when set to
-		 * true, will cause DataTables to defer the creation of the table elements for
-		 * each row until they are needed for a draw - saving a significant amount of
-		 * time.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sAjaxSource": "sources/arrays.txt",
-		 *        "bDeferRender": true
-		 *      } );
-		 *    } );
-		 */
-		"bDeferRender": false,
-	
-	
-		/**
-		 * Replace a DataTable which matches the given selector and replace it with 
-		 * one which has the properties of the new initialisation object passed. If no
-		 * table matches the selector, then the new DataTable will be constructed as
-		 * per normal.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sScrollY": "200px",
-		 *        "bPaginate": false
-		 *      } );
-		 *      
-		 *      // Some time later....
-		 *      $('#example').dataTable( {
-		 *        "bFilter": false,
-		 *        "bDestroy": true
-		 *      } );
-		 *    } );
-		 */
-		"bDestroy": false,
-	
-	
-		/**
-		 * Enable or disable filtering of data. Filtering in DataTables is "smart" in
-		 * that it allows the end user to input multiple words (space separated) and
-		 * will match a row containing those words, even if not in the order that was
-		 * specified (this allow matching across multiple columns). Note that if you
-		 * wish to use filtering in DataTables this must remain 'true' - to remove the
-		 * default filtering input box and retain filtering abilities, please use
-		 * {@link DataTable.defaults.sDom}.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bFilter": false
-		 *      } );
-		 *    } );
-		 */
-		"bFilter": true,
-	
-	
-		/**
-		 * Enable or disable the table information display. This shows information 
-		 * about the data that is currently visible on the page, including information
-		 * about filtered data if that action is being performed.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bInfo": false
-		 *      } );
-		 *    } );
-		 */
-		"bInfo": true,
-	
-	
-		/**
-		 * Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
-		 * slightly different and additional mark-up from what DataTables has
-		 * traditionally used).
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bJQueryUI": true
-		 *      } );
-		 *    } );
-		 */
-		"bJQueryUI": false,
-	
-	
-		/**
-		 * Allows the end user to select the size of a formatted page from a select
-		 * menu (sizes are 10, 25, 50 and 100). Requires pagination (bPaginate).
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bLengthChange": false
-		 *      } );
-		 *    } );
-		 */
-		"bLengthChange": true,
-	
-	
-		/**
-		 * Enable or disable pagination.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bPaginate": false
-		 *      } );
-		 *    } );
-		 */
-		"bPaginate": true,
-	
-	
-		/**
-		 * Enable or disable the display of a 'processing' indicator when the table is
-		 * being processed (e.g. a sort). This is particularly useful for tables with
-		 * large amounts of data where it can take a noticeable amount of time to sort
-		 * the entries.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bProcessing": true
-		 *      } );
-		 *    } );
-		 */
-		"bProcessing": false,
-	
-	
-		/**
-		 * Retrieve the DataTables object for the given selector. Note that if the
-		 * table has already been initialised, this parameter will cause DataTables
-		 * to simply return the object that has already been set up - it will not take
-		 * account of any changes you might have made to the initialisation object
-		 * passed to DataTables (setting this parameter to true is an acknowledgement
-		 * that you understand this). bDestroy can be used to reinitialise a table if
-		 * you need.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      initTable();
-		 *      tableActions();
-		 *    } );
-		 *    
-		 *    function initTable ()
-		 *    {
-		 *      return $('#example').dataTable( {
-		 *        "sScrollY": "200px",
-		 *        "bPaginate": false,
-		 *        "bRetrieve": true
-		 *      } );
-		 *    }
-		 *    
-		 *    function tableActions ()
-		 *    {
-		 *      var oTable = initTable();
-		 *      // perform API operations with oTable 
-		 *    }
-		 */
-		"bRetrieve": false,
-	
-	
-		/**
-		 * Indicate if DataTables should be allowed to set the padding / margin
-		 * etc for the scrolling header elements or not. Typically you will want
-		 * this.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bScrollAutoCss": false,
-		 *        "sScrollY": "200px"
-		 *      } );
-		 *    } );
-		 */
-		"bScrollAutoCss": true,
-	
-	
-		/**
-		 * When vertical (y) scrolling is enabled, DataTables will force the height of
-		 * the table's viewport to the given height at all times (useful for layout).
-		 * However, this can look odd when filtering data down to a small data set,
-		 * and the footer is left "floating" further down. This parameter (when
-		 * enabled) will cause DataTables to collapse the table's viewport down when
-		 * the result set will fit within the given Y height.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sScrollY": "200",
-		 *        "bScrollCollapse": true
-		 *      } );
-		 *    } );
-		 */
-		"bScrollCollapse": false,
-	
-	
-		/**
-		 * Enable infinite scrolling for DataTables (to be used in combination with
-		 * sScrollY). Infinite scrolling means that DataTables will continually load
-		 * data as a user scrolls through a table, which is very useful for large
-		 * dataset. This cannot be used with pagination, which is automatically
-		 * disabled. Note - the Scroller extra for DataTables is recommended in
-		 * in preference to this option.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bScrollInfinite": true,
-		 *        "bScrollCollapse": true,
-		 *        "sScrollY": "200px"
-		 *      } );
-		 *    } );
-		 */
-		"bScrollInfinite": false,
-	
-	
-		/**
-		 * Configure DataTables to use server-side processing. Note that the
-		 * sAjaxSource parameter must also be given in order to give DataTables a
-		 * source to obtain the required data for each draw.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "xhr.php"
-		 *      } );
-		 *    } );
-		 */
-		"bServerSide": false,
-	
-	
-		/**
-		 * Enable or disable sorting of columns. Sorting of individual columns can be
-		 * disabled by the "bSortable" option for each column.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bSort": false
-		 *      } );
-		 *    } );
-		 */
-		"bSort": true,
-	
-	
-		/**
-		 * Allows control over whether DataTables should use the top (true) unique
-		 * cell that is found for a single column, or the bottom (false - default).
-		 * This is useful when using complex headers.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bSortCellsTop": true
-		 *      } );
-		 *    } );
-		 */
-		"bSortCellsTop": false,
-	
-	
-		/**
-		 * Enable or disable the addition of the classes 'sorting_1', 'sorting_2' and
-		 * 'sorting_3' to the columns which are currently being sorted on. This is
-		 * presented as a feature switch as it can increase processing time (while
-		 * classes are removed and added) so for large data sets you might want to
-		 * turn this off.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bSortClasses": false
-		 *      } );
-		 *    } );
-		 */
-		"bSortClasses": true,
-	
-	
-		/**
-		 * Enable or disable state saving. When enabled a cookie will be used to save
-		 * table display information such as pagination information, display length,
-		 * filtering and sorting. As such when the end user reloads the page the
-		 * display display will match what thy had previously set up.
-		 *  @type boolean
-		 *  @default false
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true
-		 *      } );
-		 *    } );
-		 */
-		"bStateSave": false,
-	
-	
-		/**
-		 * Customise the cookie and / or the parameters being stored when using
-		 * DataTables with state saving enabled. This function is called whenever
-		 * the cookie is modified, and it expects a fully formed cookie string to be
-		 * returned. Note that the data object passed in is a Javascript object which
-		 * must be converted to a string (JSON.stringify for example).
-		 *  @type function
-		 *  @param {string} sName Name of the cookie defined by DataTables
-		 *  @param {object} oData Data to be stored in the cookie
-		 *  @param {string} sExpires Cookie expires string
-		 *  @param {string} sPath Path of the cookie to set
-		 *  @returns {string} Cookie formatted string (which should be encoded by
-		 *    using encodeURIComponent())
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function () {
-		 *      $('#example').dataTable( {
-		 *        "fnCookieCallback": function (sName, oData, sExpires, sPath) {
-		 *          // Customise oData or sName or whatever else here
-		 *          return sName + "="+JSON.stringify(oData)+"; expires=" + sExpires +"; path=" + sPath;
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnCookieCallback": null,
-	
-	
-		/**
-		 * This function is called when a TR element is created (and all TD child
-		 * elements have been inserted), or registered if using a DOM source, allowing
-		 * manipulation of the TR element (adding classes etc).
-		 *  @type function
-		 *  @param {node} nRow "TR" element for the current row
-		 *  @param {array} aData Raw data array for this row
-		 *  @param {int} iDataIndex The index of this row in aoData
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnCreatedRow": function( nRow, aData, iDataIndex ) {
-		 *          // Bold the grade for all 'A' grade browsers
-		 *          if ( aData[4] == "A" )
-		 *          {
-		 *            $('td:eq(4)', nRow).html( '<b>A</b>' );
-		 *          }
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnCreatedRow": null,
-	
-	
-		/**
-		 * This function is called on every 'draw' event, and allows you to
-		 * dynamically modify any aspect you want about the created DOM.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnDrawCallback": function( oSettings ) {
-		 *          alert( 'DataTables has redrawn the table' );
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnDrawCallback": null,
-	
-	
-		/**
-		 * Identical to fnHeaderCallback() but for the table footer this function
-		 * allows you to modify the table footer on every 'draw' even.
-		 *  @type function
-		 *  @param {node} nFoot "TR" element for the footer
-		 *  @param {array} aData Full table data (as derived from the original HTML)
-		 *  @param {int} iStart Index for the current display starting point in the 
-		 *    display array
-		 *  @param {int} iEnd Index for the current display ending point in the 
-		 *    display array
-		 *  @param {array int} aiDisplay Index array to translate the visual position
-		 *    to the full data array
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnFooterCallback": function( nFoot, aData, iStart, iEnd, aiDisplay ) {
-		 *          nFoot.getElementsByTagName('th')[0].innerHTML = "Starting index is "+iStart;
-		 *        }
-		 *      } );
-		 *    } )
-		 */
-		"fnFooterCallback": null,
-	
-	
-		/**
-		 * When rendering large numbers in the information element for the table
-		 * (i.e. "Showing 1 to 10 of 57 entries") DataTables will render large numbers
-		 * to have a comma separator for the 'thousands' units (e.g. 1 million is
-		 * rendered as "1,000,000") to help readability for the end user. This
-		 * function will override the default method DataTables uses.
-		 *  @type function
-		 *  @member
-		 *  @param {int} iIn number to be formatted
-		 *  @returns {string} formatted string for DataTables to show the number
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnFormatNumber": function ( iIn ) {
-		 *          if ( iIn &lt; 1000 ) {
-		 *            return iIn;
-		 *          } else {
-		 *            var 
-		 *              s=(iIn+""), 
-		 *              a=s.split(""), out="", 
-		 *              iLen=s.length;
-		 *            
-		 *            for ( var i=0 ; i&lt;iLen ; i++ ) {
-		 *              if ( i%3 === 0 &amp;&amp; i !== 0 ) {
-		 *                out = "'"+out;
-		 *              }
-		 *              out = a[iLen-i-1]+out;
-		 *            }
-		 *          }
-		 *          return out;
-		 *        };
-		 *      } );
-		 *    } );
-		 */
-		"fnFormatNumber": function ( iIn ) {
-			if ( iIn < 1000 )
-			{
-				// A small optimisation for what is likely to be the majority of use cases
-				return iIn;
-			}
-	
-			var s=(iIn+""), a=s.split(""), out="", iLen=s.length;
-			
-			for ( var i=0 ; i<iLen ; i++ )
-			{
-				if ( i%3 === 0 && i !== 0 )
-				{
-					out = this.oLanguage.sInfoThousands+out;
-				}
-				out = a[iLen-i-1]+out;
-			}
-			return out;
-		},
-	
-	
-		/**
-		 * This function is called on every 'draw' event, and allows you to
-		 * dynamically modify the header row. This can be used to calculate and
-		 * display useful information about the table.
-		 *  @type function
-		 *  @param {node} nHead "TR" element for the header
-		 *  @param {array} aData Full table data (as derived from the original HTML)
-		 *  @param {int} iStart Index for the current display starting point in the
-		 *    display array
-		 *  @param {int} iEnd Index for the current display ending point in the
-		 *    display array
-		 *  @param {array int} aiDisplay Index array to translate the visual position
-		 *    to the full data array
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnHeaderCallback": function( nHead, aData, iStart, iEnd, aiDisplay ) {
-		 *          nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records";
-		 *        }
-		 *      } );
-		 *    } )
-		 */
-		"fnHeaderCallback": null,
-	
-	
-		/**
-		 * The information element can be used to convey information about the current
-		 * state of the table. Although the internationalisation options presented by
-		 * DataTables are quite capable of dealing with most customisations, there may
-		 * be times where you wish to customise the string further. This callback
-		 * allows you to do exactly that.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {int} iStart Starting position in data for the draw
-		 *  @param {int} iEnd End position in data for the draw
-		 *  @param {int} iMax Total number of rows in the table (regardless of
-		 *    filtering)
-		 *  @param {int} iTotal Total number of rows in the data set, after filtering
-		 *  @param {string} sPre The string that DataTables has formatted using it's
-		 *    own rules
-		 *  @returns {string} The string to be displayed in the information element.
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $('#example').dataTable( {
-		 *      "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) {
-		 *        return iStart +" to "+ iEnd;
-		 *      }
-		 *    } );
-		 */
-		"fnInfoCallback": null,
-	
-	
-		/**
-		 * Called when the table has been initialised. Normally DataTables will
-		 * initialise sequentially and there will be no need for this function,
-		 * however, this does not hold true when using external language information
-		 * since that is obtained using an async XHR call.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {object} json The JSON object request from the server - only
-		 *    present if client-side Ajax sourced data is used
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnInitComplete": function(oSettings, json) {
-		 *          alert( 'DataTables has finished its initialisation.' );
-		 *        }
-		 *      } );
-		 *    } )
-		 */
-		"fnInitComplete": null,
-	
-	
-		/**
-		 * Called at the very start of each table draw and can be used to cancel the
-		 * draw by returning false, any other return (including undefined) results in
-		 * the full draw occurring).
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @returns {boolean} False will cancel the draw, anything else (including no
-		 *    return) will allow it to complete.
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnPreDrawCallback": function( oSettings ) {
-		 *          if ( $('#test').val() == 1 ) {
-		 *            return false;
-		 *          }
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnPreDrawCallback": null,
-	
-	
-		/**
-		 * This function allows you to 'post process' each row after it have been
-		 * generated for each table draw, but before it is rendered on screen. This
-		 * function might be used for setting the row class name etc.
-		 *  @type function
-		 *  @param {node} nRow "TR" element for the current row
-		 *  @param {array} aData Raw data array for this row
-		 *  @param {int} iDisplayIndex The display index for the current table draw
-		 *  @param {int} iDisplayIndexFull The index of the data in the full list of
-		 *    rows (after filtering)
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
-		 *          // Bold the grade for all 'A' grade browsers
-		 *          if ( aData[4] == "A" )
-		 *          {
-		 *            $('td:eq(4)', nRow).html( '<b>A</b>' );
-		 *          }
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnRowCallback": null,
-	
-	
-		/**
-		 * This parameter allows you to override the default function which obtains
-		 * the data from the server ($.getJSON) so something more suitable for your
-		 * application. For example you could use POST data, or pull information from
-		 * a Gears or AIR database.
-		 *  @type function
-		 *  @member
-		 *  @param {string} sSource HTTP source to obtain the data from (sAjaxSource)
-		 *  @param {array} aoData A key/value pair object containing the data to send
-		 *    to the server
-		 *  @param {function} fnCallback to be called on completion of the data get
-		 *    process that will draw the data on the page.
-		 *  @param {object} oSettings DataTables settings object
-		 *  @dtopt Callbacks
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    // POST data to server
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bProcessing": true,
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "xhr.php",
-		 *        "fnServerData": function ( sSource, aoData, fnCallback, oSettings ) {
-		 *          oSettings.jqXHR = $.ajax( {
-		 *            "dataType": 'json', 
-		 *            "type": "POST", 
-		 *            "url": sSource, 
-		 *            "data": aoData, 
-		 *            "success": fnCallback
-		 *          } );
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnServerData": function ( sUrl, aoData, fnCallback, oSettings ) {
-			oSettings.jqXHR = $.ajax( {
-				"url":  sUrl,
-				"data": aoData,
-				"success": function (json) {
-					if ( json.sError ) {
-						oSettings.oApi._fnLog( oSettings, 0, json.sError );
-					}
-					
-					$(oSettings.oInstance).trigger('xhr', [oSettings, json]);
-					fnCallback( json );
-				},
-				"dataType": "json",
-				"cache": false,
-				"type": oSettings.sServerMethod,
-				"error": function (xhr, error, thrown) {
-					if ( error == "parsererror" ) {
-						oSettings.oApi._fnLog( oSettings, 0, "DataTables warning: JSON data from "+
-							"server could not be parsed. This is caused by a JSON formatting error." );
-					}
-				}
-			} );
-		},
-	
-	
-		/**
-		 * It is often useful to send extra data to the server when making an Ajax
-		 * request - for example custom filtering information, and this callback
-		 * function makes it trivial to send extra information to the server. The
-		 * passed in parameter is the data set that has been constructed by
-		 * DataTables, and you can add to this or modify it as you require.
-		 *  @type function
-		 *  @param {array} aoData Data array (array of objects which are name/value
-		 *    pairs) that has been constructed by DataTables and will be sent to the
-		 *    server. In the case of Ajax sourced data with server-side processing
-		 *    this will be an empty array, for server-side processing there will be a
-		 *    significant number of parameters!
-		 *  @returns {undefined} Ensure that you modify the aoData array passed in,
-		 *    as this is passed by reference.
-		 *  @dtopt Callbacks
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bProcessing": true,
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "scripts/server_processing.php",
-		 *        "fnServerParams": function ( aoData ) {
-		 *          aoData.push( { "name": "more_data", "value": "my_value" } );
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnServerParams": null,
-	
-	
-		/**
-		 * Load the table state. With this function you can define from where, and how, the
-		 * state of a table is loaded. By default DataTables will load from its state saving
-		 * cookie, but you might wish to use local storage (HTML5) or a server-side database.
-		 *  @type function
-		 *  @member
-		 *  @param {object} oSettings DataTables settings object
-		 *  @return {object} The DataTables state object to be loaded
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateLoad": function (oSettings) {
-		 *          var o;
-		 *          
-		 *          // Send an Ajax request to the server to get the data. Note that
-		 *          // this is a synchronous request.
-		 *          $.ajax( {
-		 *            "url": "/state_load",
-		 *            "async": false,
-		 *            "dataType": "json",
-		 *            "success": function (json) {
-		 *              o = json;
-		 *            }
-		 *          } );
-		 *          
-		 *          return o;
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnStateLoad": function ( oSettings ) {
-			var sData = this.oApi._fnReadCookie( oSettings.sCookiePrefix+oSettings.sInstance );
-			var oData;
-	
-			try {
-				oData = (typeof $.parseJSON === 'function') ? 
-					$.parseJSON(sData) : eval( '('+sData+')' );
-			} catch (e) {
-				oData = null;
-			}
-	
-			return oData;
-		},
-	
-	
-		/**
-		 * Callback which allows modification of the saved state prior to loading that state.
-		 * This callback is called when the table is loading state from the stored data, but
-		 * prior to the settings object being modified by the saved state. Note that for 
-		 * plug-in authors, you should use the 'stateLoadParams' event to load parameters for 
-		 * a plug-in.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {object} oData The state object that is to be loaded
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    // Remove a saved filter, so filtering is never loaded
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateLoadParams": function (oSettings, oData) {
-		 *          oData.oSearch.sSearch = "";
-		 *        }
-		 *      } );
-		 *    } );
-		 * 
-		 *  @example
-		 *    // Disallow state loading by returning false
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateLoadParams": function (oSettings, oData) {
-		 *          return false;
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnStateLoadParams": null,
-	
-	
-		/**
-		 * Callback that is called when the state has been loaded from the state saving method
-		 * and the DataTables settings object has been modified as a result of the loaded state.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {object} oData The state object that was loaded
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    // Show an alert with the filtering value that was saved
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateLoaded": function (oSettings, oData) {
-		 *          alert( 'Saved filter was: '+oData.oSearch.sSearch );
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnStateLoaded": null,
-	
-	
-		/**
-		 * Save the table state. This function allows you to define where and how the state
-		 * information for the table is stored - by default it will use a cookie, but you
-		 * might want to use local storage (HTML5) or a server-side database.
-		 *  @type function
-		 *  @member
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {object} oData The state object to be saved
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateSave": function (oSettings, oData) {
-		 *          // Send an Ajax request to the server with the state object
-		 *          $.ajax( {
-		 *            "url": "/state_save",
-		 *            "data": oData,
-		 *            "dataType": "json",
-		 *            "method": "POST"
-		 *            "success": function () {}
-		 *          } );
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnStateSave": function ( oSettings, oData ) {
-			this.oApi._fnCreateCookie( 
-				oSettings.sCookiePrefix+oSettings.sInstance, 
-				this.oApi._fnJsonString(oData), 
-				oSettings.iCookieDuration, 
-				oSettings.sCookiePrefix, 
-				oSettings.fnCookieCallback
-			);
-		},
-	
-	
-		/**
-		 * Callback which allows modification of the state to be saved. Called when the table 
-		 * has changed state a new state save is required. This method allows modification of
-		 * the state saving object prior to actually doing the save, including addition or 
-		 * other state properties or modification. Note that for plug-in authors, you should 
-		 * use the 'stateSaveParams' event to save parameters for a plug-in.
-		 *  @type function
-		 *  @param {object} oSettings DataTables settings object
-		 *  @param {object} oData The state object to be saved
-		 *  @dtopt Callbacks
-		 * 
-		 *  @example
-		 *    // Remove a saved filter, so filtering is never saved
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bStateSave": true,
-		 *        "fnStateSaveParams": function (oSettings, oData) {
-		 *          oData.oSearch.sSearch = "";
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"fnStateSaveParams": null,
-	
-	
-		/**
-		 * Duration of the cookie which is used for storing session information. This
-		 * value is given in seconds.
-		 *  @type int
-		 *  @default 7200 <i>(2 hours)</i>
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "iCookieDuration": 60*60*24; // 1 day
-		 *      } );
-		 *    } )
-		 */
-		"iCookieDuration": 7200,
-	
-	
-		/**
-		 * When enabled DataTables will not make a request to the server for the first
-		 * page draw - rather it will use the data already on the page (no sorting etc
-		 * will be applied to it), thus saving on an XHR at load time. iDeferLoading
-		 * is used to indicate that deferred loading is required, but it is also used
-		 * to tell DataTables how many records there are in the full table (allowing
-		 * the information element and pagination to be displayed correctly). In the case
-		 * where a filtering is applied to the table on initial load, this can be
-		 * indicated by giving the parameter as an array, where the first element is
-		 * the number of records available after filtering and the second element is the
-		 * number of records without filtering (allowing the table information element
-		 * to be shown correctly).
-		 *  @type int | array
-		 *  @default null
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    // 57 records available in the table, no filtering applied
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "scripts/server_processing.php",
-		 *        "iDeferLoading": 57
-		 *      } );
-		 *    } );
-		 * 
-		 *  @example
-		 *    // 57 records after filtering, 100 without filtering (an initial filter applied)
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "scripts/server_processing.php",
-		 *        "iDeferLoading": [ 57, 100 ],
-		 *        "oSearch": {
-		 *          "sSearch": "my_filter"
-		 *        }
-		 *      } );
-		 *    } );
-		 */
-		"iDeferLoading": null,
-	
-	
-		/**
-		 * Number of rows to display on a single page when using pagination. If
-		 * feature enabled (bLengthChange) then the end user will be able to override
-		 * this to a custom setting using a pop-up menu.
-		 *  @type int
-		 *  @default 10
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "iDisplayLength": 50
-		 *      } );
-		 *    } )
-		 */
-		"iDisplayLength": 10,
-	
-	
-		/**
-		 * Define the starting point for data display when using DataTables with
-		 * pagination. Note that this parameter is the number of records, rather than
-		 * the page number, so if you have 10 records per page and want to start on
-		 * the third page, it should be "20".
-		 *  @type int
-		 *  @default 0
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "iDisplayStart": 20
-		 *      } );
-		 *    } )
-		 */
-		"iDisplayStart": 0,
-	
-	
-		/**
-		 * The scroll gap is the amount of scrolling that is left to go before
-		 * DataTables will load the next 'page' of data automatically. You typically
-		 * want a gap which is big enough that the scrolling will be smooth for the
-		 * user, while not so large that it will load more data than need.
-		 *  @type int
-		 *  @default 100
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bScrollInfinite": true,
-		 *        "bScrollCollapse": true,
-		 *        "sScrollY": "200px",
-		 *        "iScrollLoadGap": 50
-		 *      } );
-		 *    } );
-		 */
-		"iScrollLoadGap": 100,
-	
-	
-		/**
-		 * By default DataTables allows keyboard navigation of the table (sorting, paging,
-		 * and filtering) by adding a tabindex attribute to the required elements. This
-		 * allows you to tab through the controls and press the enter key to activate them.
-		 * The tabindex is default 0, meaning that the tab follows the flow of the document.
-		 * You can overrule this using this parameter if you wish. Use a value of -1 to
-		 * disable built-in keyboard navigation.
-		 *  @type int
-		 *  @default 0
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "iTabIndex": 1
-		 *      } );
-		 *    } );
-		 */
-		"iTabIndex": 0,
-	
-	
-		/**
-		 * All strings that DataTables uses in the user interface that it creates
-		 * are defined in this object, allowing you to modified them individually or
-		 * completely replace them all as required.
-		 *  @namespace
-		 */
-		"oLanguage": {
-			/**
-			 * Strings that are used for WAI-ARIA labels and controls only (these are not
-			 * actually visible on the page, but will be read by screenreaders, and thus
-			 * must be internationalised as well).
-			 *  @namespace
-			 */
-			"oAria": {
-				/**
-				 * ARIA label that is added to the table headers when the column may be
-				 * sorted ascending by activing the column (click or return when focused).
-				 * Note that the column header is prefixed to this string.
-				 *  @type string
-				 *  @default : activate to sort column ascending
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oAria": {
-				 *            "sSortAscending": " - click/return to sort ascending"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sSortAscending": ": activate to sort column ascending",
-	
-				/**
-				 * ARIA label that is added to the table headers when the column may be
-				 * sorted descending by activing the column (click or return when focused).
-				 * Note that the column header is prefixed to this string.
-				 *  @type string
-				 *  @default : activate to sort column ascending
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oAria": {
-				 *            "sSortDescending": " - click/return to sort descending"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sSortDescending": ": activate to sort column descending"
-			},
-	
-			/**
-			 * Pagination string used by DataTables for the two built-in pagination
-			 * control types ("two_button" and "full_numbers")
-			 *  @namespace
-			 */
-			"oPaginate": {
-				/**
-				 * Text to use when using the 'full_numbers' type of pagination for the
-				 * button to take the user to the first page.
-				 *  @type string
-				 *  @default First
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oPaginate": {
-				 *            "sFirst": "First page"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sFirst": "First",
-			
-			
-				/**
-				 * Text to use when using the 'full_numbers' type of pagination for the
-				 * button to take the user to the last page.
-				 *  @type string
-				 *  @default Last
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oPaginate": {
-				 *            "sLast": "Last page"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sLast": "Last",
-			
-			
-				/**
-				 * Text to use for the 'next' pagination button (to take the user to the 
-				 * next page).
-				 *  @type string
-				 *  @default Next
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oPaginate": {
-				 *            "sNext": "Next page"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sNext": "Next",
-			
-			
-				/**
-				 * Text to use for the 'previous' pagination button (to take the user to  
-				 * the previous page).
-				 *  @type string
-				 *  @default Previous
-				 *  @dtopt Language
-				 * 
-				 *  @example
-				 *    $(document).ready( function() {
-				 *      $('#example').dataTable( {
-				 *        "oLanguage": {
-				 *          "oPaginate": {
-				 *            "sPrevious": "Previous page"
-				 *          }
-				 *        }
-				 *      } );
-				 *    } );
-				 */
-				"sPrevious": "Previous"
-			},
-		
-			/**
-			 * This string is shown in preference to sZeroRecords when the table is
-			 * empty of data (regardless of filtering). Note that this is an optional
-			 * parameter - if it is not given, the value of sZeroRecords will be used
-			 * instead (either the default or given value).
-			 *  @type string
-			 *  @default No data available in table
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sEmptyTable": "No data available in table"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sEmptyTable": "No data available in table",
-		
-		
-			/**
-			 * This string gives information to the end user about the information that 
-			 * is current on display on the page. The _START_, _END_ and _TOTAL_ 
-			 * variables are all dynamically replaced as the table display updates, and 
-			 * can be freely moved or removed as the language requirements change.
-			 *  @type string
-			 *  @default Showing _START_ to _END_ of _TOTAL_ entries
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sInfo": "Got a total of _TOTAL_ entries to show (_START_ to _END_)"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
-		
-		
-			/**
-			 * Display information string for when the table is empty. Typically the 
-			 * format of this string should match sInfo.
-			 *  @type string
-			 *  @default Showing 0 to 0 of 0 entries
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sInfoEmpty": "No entries to show"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sInfoEmpty": "Showing 0 to 0 of 0 entries",
-		
-		
-			/**
-			 * When a user filters the information in a table, this string is appended 
-			 * to the information (sInfo) to give an idea of how strong the filtering 
-			 * is. The variable _MAX_ is dynamically updated.
-			 *  @type string
-			 *  @default (filtered from _MAX_ total entries)
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sInfoFiltered": " - filtering from _MAX_ records"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sInfoFiltered": "(filtered from _MAX_ total entries)",
-		
-		
-			/**
-			 * If can be useful to append extra information to the info string at times,
-			 * and this variable does exactly that. This information will be appended to
-			 * the sInfo (sInfoEmpty and sInfoFiltered in whatever combination they are
-			 * being used) at all times.
-			 *  @type string
-			 *  @default <i>Empty string</i>
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sInfoPostFix": "All records shown are derived from real information."
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sInfoPostFix": "",
-		
-		
-			/**
-			 * DataTables has a build in number formatter (fnFormatNumber) which is used
-			 * to format large numbers that are used in the table information. By
-			 * default a comma is used, but this can be trivially changed to any
-			 * character you wish with this parameter.
-			 *  @type string
-			 *  @default ,
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sInfoThousands": "'"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sInfoThousands": ",",
-		
-		
-			/**
-			 * Detail the action that will be taken when the drop down menu for the
-			 * pagination length option is changed. The '_MENU_' variable is replaced
-			 * with a default select list of 10, 25, 50 and 100, and can be replaced
-			 * with a custom select box if required.
-			 *  @type string
-			 *  @default Show _MENU_ entries
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    // Language change only
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sLengthMenu": "Display _MENU_ records"
-			 *        }
-			 *      } );
-			 *    } );
-			 *    
-			 *  @example
-			 *    // Language and options change
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sLengthMenu": 'Display <select>'+
-			 *            '<option value="10">10</option>'+
-			 *            '<option value="20">20</option>'+
-			 *            '<option value="30">30</option>'+
-			 *            '<option value="40">40</option>'+
-			 *            '<option value="50">50</option>'+
-			 *            '<option value="-1">All</option>'+
-			 *            '</select> records'
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sLengthMenu": "Show _MENU_ entries",
-		
-		
-			/**
-			 * When using Ajax sourced data and during the first draw when DataTables is
-			 * gathering the data, this message is shown in an empty row in the table to
-			 * indicate to the end user the the data is being loaded. Note that this
-			 * parameter is not used when loading data by server-side processing, just
-			 * Ajax sourced data with client-side processing.
-			 *  @type string
-			 *  @default Loading...
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sLoadingRecords": "Please wait - loading..."
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sLoadingRecords": "Loading...",
-		
-		
-			/**
-			 * Text which is displayed when the table is processing a user action
-			 * (usually a sort command or similar).
-			 *  @type string
-			 *  @default Processing...
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sProcessing": "DataTables is currently busy"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sProcessing": "Processing...",
-		
-		
-			/**
-			 * Details the actions that will be taken when the user types into the
-			 * filtering input text box. The variable "_INPUT_", if used in the string,
-			 * is replaced with the HTML text box for the filtering input allowing
-			 * control over where it appears in the string. If "_INPUT_" is not given
-			 * then the input box is appended to the string automatically.
-			 *  @type string
-			 *  @default Search:
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    // Input text box will be appended at the end automatically
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sSearch": "Filter records:"
-			 *        }
-			 *      } );
-			 *    } );
-			 *    
-			 *  @example
-			 *    // Specify where the filter should appear
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sSearch": "Apply filter _INPUT_ to table"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sSearch": "Search:",
-		
-		
-			/**
-			 * All of the language information can be stored in a file on the
-			 * server-side, which DataTables will look up if this parameter is passed.
-			 * It must store the URL of the language file, which is in a JSON format,
-			 * and the object has the same properties as the oLanguage object in the
-			 * initialiser object (i.e. the above parameters). Please refer to one of
-			 * the example language files to see how this works in action.
-			 *  @type string
-			 *  @default <i>Empty string - i.e. disabled</i>
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sUrl": "http://www.sprymedia.co.uk/dataTables/lang.txt"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sUrl": "",
-		
-		
-			/**
-			 * Text shown inside the table records when the is no information to be
-			 * displayed after filtering. sEmptyTable is shown when there is simply no
-			 * information in the table at all (regardless of filtering).
-			 *  @type string
-			 *  @default No matching records found
-			 *  @dtopt Language
-			 * 
-			 *  @example
-			 *    $(document).ready( function() {
-			 *      $('#example').dataTable( {
-			 *        "oLanguage": {
-			 *          "sZeroRecords": "No records to display"
-			 *        }
-			 *      } );
-			 *    } );
-			 */
-			"sZeroRecords": "No matching records found"
-		},
-	
-	
-		/**
-		 * This parameter allows you to have define the global filtering state at
-		 * initialisation time. As an object the "sSearch" parameter must be
-		 * defined, but all other parameters are optional. When "bRegex" is true,
-		 * the search string will be treated as a regular expression, when false
-		 * (default) it will be treated as a straight string. When "bSmart"
-		 * DataTables will use it's smart filtering methods (to word match at
-		 * any point in the data), when false this will not be done.
-		 *  @namespace
-		 *  @extends DataTable.models.oSearch
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "oSearch": {"sSearch": "Initial search"}
-		 *      } );
-		 *    } )
-		 */
-		"oSearch": $.extend( {}, DataTable.models.oSearch ),
-	
-	
-		/**
-		 * By default DataTables will look for the property 'aaData' when obtaining
-		 * data from an Ajax source or for server-side processing - this parameter
-		 * allows that property to be changed. You can use Javascript dotted object
-		 * notation to get a data source for multiple levels of nesting.
-		 *  @type string
-		 *  @default aaData
-		 *  @dtopt Options
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    // Get data from { "data": [...] }
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sAjaxSource": "sources/data.txt",
-		 *        "sAjaxDataProp": "data"
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Get data from { "data": { "inner": [...] } }
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sAjaxSource": "sources/data.txt",
-		 *        "sAjaxDataProp": "data.inner"
-		 *      } );
-		 *    } );
-		 */
-		"sAjaxDataProp": "aaData",
-	
-	
-		/**
-		 * You can instruct DataTables to load data from an external source using this
-		 * parameter (use aData if you want to pass data in you already have). Simply
-		 * provide a url a JSON object can be obtained from. This object must include
-		 * the parameter 'aaData' which is the data source for the table.
-		 *  @type string
-		 *  @default null
-		 *  @dtopt Options
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sAjaxSource": "http://www.sprymedia.co.uk/dataTables/json.php"
-		 *      } );
-		 *    } )
-		 */
-		"sAjaxSource": null,
-	
-	
-		/**
-		 * This parameter can be used to override the default prefix that DataTables
-		 * assigns to a cookie when state saving is enabled.
-		 *  @type string
-		 *  @default SpryMedia_DataTables_
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sCookiePrefix": "my_datatable_",
-		 *      } );
-		 *    } );
-		 */
-		"sCookiePrefix": "SpryMedia_DataTables_",
-	
-	
-		/**
-		 * This initialisation variable allows you to specify exactly where in the
-		 * DOM you want DataTables to inject the various controls it adds to the page
-		 * (for example you might want the pagination controls at the top of the
-		 * table). DIV elements (with or without a custom class) can also be added to
-		 * aid styling. The follow syntax is used:
-		 *   <ul>
-		 *     <li>The following options are allowed:	
-		 *       <ul>
-		 *         <li>'l' - Length changing</li
-		 *         <li>'f' - Filtering input</li>
-		 *         <li>'t' - The table!</li>
-		 *         <li>'i' - Information</li>
-		 *         <li>'p' - Pagination</li>
-		 *         <li>'r' - pRocessing</li>
-		 *       </ul>
-		 *     </li>
-		 *     <li>The following constants are allowed:
-		 *       <ul>
-		 *         <li>'H' - jQueryUI theme "header" classes ('fg-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix')</li>
-		 *         <li>'F' - jQueryUI theme "footer" classes ('fg-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix')</li>
-		 *       </ul>
-		 *     </li>
-		 *     <li>The following syntax is expected:
-		 *       <ul>
-		 *         <li>'&lt;' and '&gt;' - div elements</li>
-		 *         <li>'&lt;"class" and '&gt;' - div with a class</li>
-		 *         <li>'&lt;"#id" and '&gt;' - div with an ID</li>
-		 *       </ul>
-		 *     </li>
-		 *     <li>Examples:
-		 *       <ul>
-		 *         <li>'&lt;"wrapper"flipt&gt;'</li>
-		 *         <li>'&lt;lf&lt;t&gt;ip&gt;'</li>
-		 *       </ul>
-		 *     </li>
-		 *   </ul>
-		 *  @type string
-		 *  @default lfrtip <i>(when bJQueryUI is false)</i> <b>or</b> 
-		 *    <"H"lfr>t<"F"ip> <i>(when bJQueryUI is true)</i>
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sDom": '&lt;"top"i&gt;rt&lt;"bottom"flp&gt;&lt;"clear"&gt;'
-		 *      } );
-		 *    } );
-		 */
-		"sDom": "lfrtip",
-	
-	
-		/**
-		 * DataTables features two different built-in pagination interaction methods
-		 * ('two_button' or 'full_numbers') which present different page controls to
-		 * the end user. Further methods can be added using the API (see below).
-		 *  @type string
-		 *  @default two_button
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sPaginationType": "full_numbers"
-		 *      } );
-		 *    } )
-		 */
-		"sPaginationType": "two_button",
-	
-	
-		/**
-		 * Enable horizontal scrolling. When a table is too wide to fit into a certain
-		 * layout, or you have a large number of columns in the table, you can enable
-		 * x-scrolling to show the table in a viewport, which can be scrolled. This
-		 * property can be any CSS unit, or a number (in which case it will be treated
-		 * as a pixel measurement).
-		 *  @type string
-		 *  @default <i>blank string - i.e. disabled</i>
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sScrollX": "100%",
-		 *        "bScrollCollapse": true
-		 *      } );
-		 *    } );
-		 */
-		"sScrollX": "",
-	
-	
-		/**
-		 * This property can be used to force a DataTable to use more width than it
-		 * might otherwise do when x-scrolling is enabled. For example if you have a
-		 * table which requires to be well spaced, this parameter is useful for
-		 * "over-sizing" the table, and thus forcing scrolling. This property can by
-		 * any CSS unit, or a number (in which case it will be treated as a pixel
-		 * measurement).
-		 *  @type string
-		 *  @default <i>blank string - i.e. disabled</i>
-		 *  @dtopt Options
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sScrollX": "100%",
-		 *        "sScrollXInner": "110%"
-		 *      } );
-		 *    } );
-		 */
-		"sScrollXInner": "",
-	
-	
-		/**
-		 * Enable vertical scrolling. Vertical scrolling will constrain the DataTable
-		 * to the given height, and enable scrolling for any data which overflows the
-		 * current viewport. This can be used as an alternative to paging to display
-		 * a lot of data in a small area (although paging and scrolling can both be
-		 * enabled at the same time). This property can be any CSS unit, or a number
-		 * (in which case it will be treated as a pixel measurement).
-		 *  @type string
-		 *  @default <i>blank string - i.e. disabled</i>
-		 *  @dtopt Features
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "sScrollY": "200px",
-		 *        "bPaginate": false
-		 *      } );
-		 *    } );
-		 */
-		"sScrollY": "",
-	
-	
-		/**
-		 * Set the HTTP method that is used to make the Ajax call for server-side
-		 * processing or Ajax sourced data.
-		 *  @type string
-		 *  @default GET
-		 *  @dtopt Options
-		 *  @dtopt Server-side
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "bServerSide": true,
-		 *        "sAjaxSource": "scripts/post.php",
-		 *        "sServerMethod": "POST"
-		 *      } );
-		 *    } );
-		 */
-		"sServerMethod": "GET"
-	};
-	
-	
-	
-	/**
-	 * Column options that can be given to DataTables at initialisation time.
-	 *  @namespace
-	 */
-	DataTable.defaults.columns = {
-		/**
-		 * Allows a column's sorting to take multiple columns into account when 
-		 * doing a sort. For example first name / last name columns make sense to 
-		 * do a multi-column sort over the two columns.
-		 *  @type array
-		 *  @default null <i>Takes the value of the column index automatically</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [
-		 *          { "aDataSort": [ 0, 1 ], "aTargets": [ 0 ] },
-		 *          { "aDataSort": [ 1, 0 ], "aTargets": [ 1 ] },
-		 *          { "aDataSort": [ 2, 3, 4 ], "aTargets": [ 2 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [
-		 *          { "aDataSort": [ 0, 1 ] },
-		 *          { "aDataSort": [ 1, 0 ] },
-		 *          { "aDataSort": [ 2, 3, 4 ] },
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"aDataSort": null,
-	
-	
-		/**
-		 * You can control the default sorting direction, and even alter the behaviour
-		 * of the sort handler (i.e. only allow ascending sorting etc) using this
-		 * parameter.
-		 *  @type array
-		 *  @default [ 'asc', 'desc' ]
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [
-		 *          { "asSorting": [ "asc" ], "aTargets": [ 1 ] },
-		 *          { "asSorting": [ "desc", "asc", "asc" ], "aTargets": [ 2 ] },
-		 *          { "asSorting": [ "desc" ], "aTargets": [ 3 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [
-		 *          null,
-		 *          { "asSorting": [ "asc" ] },
-		 *          { "asSorting": [ "desc", "asc", "asc" ] },
-		 *          { "asSorting": [ "desc" ] },
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"asSorting": [ 'asc', 'desc' ],
-	
-	
-		/**
-		 * Enable or disable filtering on the data in this column.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "bSearchable": false, "aTargets": [ 0 ] }
-		 *        ] } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "bSearchable": false },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ] } );
-		 *    } );
-		 */
-		"bSearchable": true,
-	
-	
-		/**
-		 * Enable or disable sorting on this column.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "bSortable": false, "aTargets": [ 0 ] }
-		 *        ] } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "bSortable": false },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ] } );
-		 *    } );
-		 */
-		"bSortable": true,
-	
-	
-		/**
-		 * <code>Deprecated</code> When using fnRender() for a column, you may wish 
-		 * to use the original data (before rendering) for sorting and filtering 
-		 * (the default is to used the rendered data that the user can see). This 
-		 * may be useful for dates etc.
-		 * 
-		 * Please note that this option has now been deprecated and will be removed
-		 * in the next version of DataTables. Please use mRender / mData rather than
-		 * fnRender.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Columns
-		 *  @deprecated
-		 */
-		"bUseRendered": true,
-	
-	
-		/**
-		 * Enable or disable the display of this column.
-		 *  @type boolean
-		 *  @default true
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "bVisible": false, "aTargets": [ 0 ] }
-		 *        ] } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "bVisible": false },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ] } );
-		 *    } );
-		 */
-		"bVisible": true,
-		
-		
-		/**
-		 * Developer definable function that is called whenever a cell is created (Ajax source,
-		 * etc) or processed for input (DOM source). This can be used as a compliment to mRender
-		 * allowing you to modify the DOM element (add background colour for example) when the
-		 * element is available.
-		 *  @type function
-		 *  @param {element} nTd The TD node that has been created
-		 *  @param {*} sData The Data for the cell
-		 *  @param {array|object} oData The data for the whole row
-		 *  @param {int} iRow The row index for the aoData data store
-		 *  @param {int} iCol The column index for aoColumns
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ {
-		 *          "aTargets": [3],
-		 *          "fnCreatedCell": function (nTd, sData, oData, iRow, iCol) {
-		 *            if ( sData == "1.7" ) {
-		 *              $(nTd).css('color', 'blue')
-		 *            }
-		 *          }
-		 *        } ]
-		 *      });
-		 *    } );
-		 */
-		"fnCreatedCell": null,
-	
-	
-		/**
-		 * <code>Deprecated</code> Custom display function that will be called for the 
-		 * display of each cell in this column.
-		 *
-		 * Please note that this option has now been deprecated and will be removed
-		 * in the next version of DataTables. Please use mRender / mData rather than
-		 * fnRender.
-		 *  @type function
-		 *  @param {object} o Object with the following parameters:
-		 *  @param {int}    o.iDataRow The row in aoData
-		 *  @param {int}    o.iDataColumn The column in question
-		 *  @param {array}  o.aData The data for the row in question
-		 *  @param {object} o.oSettings The settings object for this DataTables instance
-		 *  @param {object} o.mDataProp The data property used for this column
-		 *  @param {*}      val The current cell value
-		 *  @returns {string} The string you which to use in the display
-		 *  @dtopt Columns
-		 *  @deprecated
-		 */
-		"fnRender": null,
-	
-	
-		/**
-		 * The column index (starting from 0!) that you wish a sort to be performed
-		 * upon when this column is selected for sorting. This can be used for sorting
-		 * on hidden columns for example.
-		 *  @type int
-		 *  @default -1 <i>Use automatically calculated column index</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "iDataSort": 1, "aTargets": [ 0 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "iDataSort": 1 },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"iDataSort": -1,
-	
-	
-		/**
-		 * This parameter has been replaced by mData in DataTables to ensure naming
-		 * consistency. mDataProp can still be used, as there is backwards compatibility
-		 * in DataTables for this option, but it is strongly recommended that you use
-		 * mData in preference to mDataProp.
-		 *  @name DataTable.defaults.columns.mDataProp
-		 */
-	
-	
-		/**
-		 * This property can be used to read data from any JSON data source property,
-		 * including deeply nested objects / properties. mData can be given in a
-		 * number of different ways which effect its behaviour:
-		 *   <ul>
-		 *     <li>integer - treated as an array index for the data source. This is the
-		 *       default that DataTables uses (incrementally increased for each column).</li>
-		 *     <li>string - read an object property from the data source. Note that you can
-		 *       use Javascript dotted notation to read deep properties / arrays from the
-		 *       data source.</li>
-		 *     <li>null - the sDefaultContent option will be used for the cell (null
-		 *       by default, so you will need to specify the default content you want -
-		 *       typically an empty string). This can be useful on generated columns such 
-		 *       as edit / delete action columns.</li>
-		 *     <li>function - the function given will be executed whenever DataTables 
-		 *       needs to set or get the data for a cell in the column. The function 
-		 *       takes three parameters:
-		 *       <ul>
-		 *         <li>{array|object} The data source for the row</li>
-		 *         <li>{string} The type call data requested - this will be 'set' when
-		 *           setting data or 'filter', 'display', 'type', 'sort' or undefined when 
-		 *           gathering data. Note that when <i>undefined</i> is given for the type
-		 *           DataTables expects to get the raw data for the object back</li>
-		 *         <li>{*} Data to set when the second parameter is 'set'.</li>
-		 *       </ul>
-		 *       The return value from the function is not required when 'set' is the type
-		 *       of call, but otherwise the return is what will be used for the data
-		 *       requested.</li>
-		 *    </ul>
-		 *
-		 * Note that prior to DataTables 1.9.2 mData was called mDataProp. The name change
-		 * reflects the flexibility of this property and is consistent with the naming of
-		 * mRender. If 'mDataProp' is given, then it will still be used by DataTables, as
-		 * it automatically maps the old name to the new if required.
-		 *  @type string|int|function|null
-		 *  @default null <i>Use automatically calculated column index</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Read table data from objects
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sAjaxSource": "sources/deep.txt",
-		 *        "aoColumns": [
-		 *          { "mData": "engine" },
-		 *          { "mData": "browser" },
-		 *          { "mData": "platform.inner" },
-		 *          { "mData": "platform.details.0" },
-		 *          { "mData": "platform.details.1" }
-		 *        ]
-		 *      } );
-		 *    } );
-		 * 
-		 *  @example
-		 *    // Using mData as a function to provide different information for
-		 *    // sorting, filtering and display. In this case, currency (price)
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "aoColumnDefs": [ {
-		 *          "aTargets": [ 0 ],
-		 *          "mData": function ( source, type, val ) {
-		 *            if (type === 'set') {
-		 *              source.price = val;
-		 *              // Store the computed dislay and filter values for efficiency
-		 *              source.price_display = val=="" ? "" : "$"+numberFormat(val);
-		 *              source.price_filter  = val=="" ? "" : "$"+numberFormat(val)+" "+val;
-		 *              return;
-		 *            }
-		 *            else if (type === 'display') {
-		 *              return source.price_display;
-		 *            }
-		 *            else if (type === 'filter') {
-		 *              return source.price_filter;
-		 *            }
-		 *            // 'sort', 'type' and undefined all just use the integer
-		 *            return source.price;
-		 *          }
-		 *        } ]
-		 *      } );
-		 *    } );
-		 */
-		"mData": null,
-	
-	
-		/**
-		 * This property is the rendering partner to mData and it is suggested that
-		 * when you want to manipulate data for display (including filtering, sorting etc)
-		 * but not altering the underlying data for the table, use this property. mData
-		 * can actually do everything this property can and more, but this parameter is
-		 * easier to use since there is no 'set' option. Like mData is can be given
-		 * in a number of different ways to effect its behaviour, with the addition of 
-		 * supporting array syntax for easy outputting of arrays (including arrays of
-		 * objects):
-		 *   <ul>
-		 *     <li>integer - treated as an array index for the data source. This is the
-		 *       default that DataTables uses (incrementally increased for each column).</li>
-		 *     <li>string - read an object property from the data source. Note that you can
-		 *       use Javascript dotted notation to read deep properties / arrays from the
-		 *       data source and also array brackets to indicate that the data reader should
-		 *       loop over the data source array. When characters are given between the array
-		 *       brackets, these characters are used to join the data source array together.
-		 *       For example: "accounts[, ].name" would result in a comma separated list with
-		 *       the 'name' value from the 'accounts' array of objects.</li>
-		 *     <li>function - the function given will be executed whenever DataTables 
-		 *       needs to set or get the data for a cell in the column. The function 
-		 *       takes three parameters:
-		 *       <ul>
-		 *         <li>{array|object} The data source for the row (based on mData)</li>
-		 *         <li>{string} The type call data requested - this will be 'filter', 'display', 
-		 *           'type' or 'sort'.</li>
-		 *         <li>{array|object} The full data source for the row (not based on mData)</li>
-		 *       </ul>
-		 *       The return value from the function is what will be used for the data
-		 *       requested.</li>
-		 *    </ul>
-		 *  @type string|int|function|null
-		 *  @default null <i>Use mData</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Create a comma separated list from an array of objects
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "sAjaxSource": "sources/deep.txt",
-		 *        "aoColumns": [
-		 *          { "mData": "engine" },
-		 *          { "mData": "browser" },
-		 *          {
-		 *            "mData": "platform",
-		 *            "mRender": "[, ].name"
-		 *          }
-		 *        ]
-		 *      } );
-		 *    } );
-		 * 
-		 *  @example
-		 *    // Use as a function to create a link from the data source
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "aoColumnDefs": [
-		 *        {
-		 *          "aTargets": [ 0 ],
-		 *          "mData": "download_link",
-		 *          "mRender": function ( data, type, full ) {
-		 *            return '<a href="'+data+'">Download</a>';
-		 *          }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"mRender": null,
-	
-	
-		/**
-		 * Change the cell type created for the column - either TD cells or TH cells. This
-		 * can be useful as TH cells have semantic meaning in the table body, allowing them
-		 * to act as a header for a row (you may wish to add scope='row' to the TH elements).
-		 *  @type string
-		 *  @default td
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Make the first column use TH cells
-		 *    $(document).ready( function() {
-		 *      var oTable = $('#example').dataTable( {
-		 *        "aoColumnDefs": [ {
-		 *          "aTargets": [ 0 ],
-		 *          "sCellType": "th"
-		 *        } ]
-		 *      } );
-		 *    } );
-		 */
-		"sCellType": "td",
-	
-	
-		/**
-		 * Class to give to each cell in this column.
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "sClass": "my_class", "aTargets": [ 0 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "sClass": "my_class" },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sClass": "",
-		
-		/**
-		 * When DataTables calculates the column widths to assign to each column,
-		 * it finds the longest string in each column and then constructs a
-		 * temporary table and reads the widths from that. The problem with this
-		 * is that "mmm" is much wider then "iiii", but the latter is a longer 
-		 * string - thus the calculation can go wrong (doing it properly and putting
-		 * it into an DOM object and measuring that is horribly(!) slow). Thus as
-		 * a "work around" we provide this option. It will append its value to the
-		 * text that is found to be the longest string for the column - i.e. padding.
-		 * Generally you shouldn't need this, and it is not documented on the 
-		 * general DataTables.net documentation
-		 *  @type string
-		 *  @default <i>Empty string<i>
-		 *  @dtopt Columns
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          {
-		 *            "sContentPadding": "mmm"
-		 *          }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sContentPadding": "",
-	
-	
-		/**
-		 * Allows a default value to be given for a column's data, and will be used
-		 * whenever a null data source is encountered (this can be because mData
-		 * is set to null, or because the data source itself is null).
-		 *  @type string
-		 *  @default null
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          {
-		 *            "mData": null,
-		 *            "sDefaultContent": "Edit",
-		 *            "aTargets": [ -1 ]
-		 *          }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          {
-		 *            "mData": null,
-		 *            "sDefaultContent": "Edit"
-		 *          }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sDefaultContent": null,
-	
-	
-		/**
-		 * This parameter is only used in DataTables' server-side processing. It can
-		 * be exceptionally useful to know what columns are being displayed on the
-		 * client side, and to map these to database fields. When defined, the names
-		 * also allow DataTables to reorder information from the server if it comes
-		 * back in an unexpected order (i.e. if you switch your columns around on the
-		 * client-side, your server-side code does not also need updating).
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "sName": "engine", "aTargets": [ 0 ] },
-		 *          { "sName": "browser", "aTargets": [ 1 ] },
-		 *          { "sName": "platform", "aTargets": [ 2 ] },
-		 *          { "sName": "version", "aTargets": [ 3 ] },
-		 *          { "sName": "grade", "aTargets": [ 4 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "sName": "engine" },
-		 *          { "sName": "browser" },
-		 *          { "sName": "platform" },
-		 *          { "sName": "version" },
-		 *          { "sName": "grade" }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sName": "",
-	
-	
-		/**
-		 * Defines a data source type for the sorting which can be used to read
-		 * real-time information from the table (updating the internally cached
-		 * version) prior to sorting. This allows sorting to occur on user editable
-		 * elements such as form inputs.
-		 *  @type string
-		 *  @default std
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [
-		 *          { "sSortDataType": "dom-text", "aTargets": [ 2, 3 ] },
-		 *          { "sType": "numeric", "aTargets": [ 3 ] },
-		 *          { "sSortDataType": "dom-select", "aTargets": [ 4 ] },
-		 *          { "sSortDataType": "dom-checkbox", "aTargets": [ 5 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [
-		 *          null,
-		 *          null,
-		 *          { "sSortDataType": "dom-text" },
-		 *          { "sSortDataType": "dom-text", "sType": "numeric" },
-		 *          { "sSortDataType": "dom-select" },
-		 *          { "sSortDataType": "dom-checkbox" }
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sSortDataType": "std",
-	
-	
-		/**
-		 * The title of this column.
-		 *  @type string
-		 *  @default null <i>Derived from the 'TH' value for this column in the 
-		 *    original HTML table.</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "sTitle": "My column title", "aTargets": [ 0 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "sTitle": "My column title" },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sTitle": null,
-	
-	
-		/**
-		 * The type allows you to specify how the data for this column will be sorted.
-		 * Four types (string, numeric, date and html (which will strip HTML tags
-		 * before sorting)) are currently available. Note that only date formats
-		 * understood by Javascript's Date() object will be accepted as type date. For
-		 * example: "Mar 26, 2008 5:03 PM". May take the values: 'string', 'numeric',
-		 * 'date' or 'html' (by default). Further types can be adding through
-		 * plug-ins.
-		 *  @type string
-		 *  @default null <i>Auto-detected from raw data</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "sType": "html", "aTargets": [ 0 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "sType": "html" },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sType": null,
-	
-	
-		/**
-		 * Defining the width of the column, this parameter may take any CSS value
-		 * (3em, 20px etc). DataTables apples 'smart' widths to columns which have not
-		 * been given a specific width through this interface ensuring that the table
-		 * remains readable.
-		 *  @type string
-		 *  @default null <i>Automatic</i>
-		 *  @dtopt Columns
-		 * 
-		 *  @example
-		 *    // Using aoColumnDefs
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumnDefs": [ 
-		 *          { "sWidth": "20%", "aTargets": [ 0 ] }
-		 *        ]
-		 *      } );
-		 *    } );
-		 *    
-		 *  @example
-		 *    // Using aoColumns
-		 *    $(document).ready( function() {
-		 *      $('#example').dataTable( {
-		 *        "aoColumns": [ 
-		 *          { "sWidth": "20%" },
-		 *          null,
-		 *          null,
-		 *          null,
-		 *          null
-		 *        ]
-		 *      } );
-		 *    } );
-		 */
-		"sWidth": null
-	};
-	
-	
-	
-	/**
-	 * DataTables settings object - this holds all the information needed for a
-	 * given table, including configuration, data and current application of the
-	 * table options. DataTables does not have a single instance for each DataTable
-	 * with the settings attached to that instance, but rather instances of the
-	 * DataTable "class" are created on-the-fly as needed (typically by a 
-	 * $().dataTable() call) and the settings object is then applied to that
-	 * instance.
-	 * 
-	 * Note that this object is related to {@link DataTable.defaults} but this 
-	 * one is the internal data store for DataTables's cache of columns. It should
-	 * NOT be manipulated outside of DataTables. Any configuration should be done
-	 * through the initialisation options.
-	 *  @namespace
-	 *  @todo Really should attach the settings object to individual instances so we
-	 *    don't need to create new instances on each $().dataTable() call (if the
-	 *    table already exists). It would also save passing oSettings around and
-	 *    into every single function. However, this is a very significant 
-	 *    architecture change for DataTables and will almost certainly break
-	 *    backwards compatibility with older installations. This is something that
-	 *    will be done in 2.0.
-	 */
-	DataTable.models.oSettings = {
-		/**
-		 * Primary features of DataTables and their enablement state.
-		 *  @namespace
-		 */
-		"oFeatures": {
-			
-			/**
-			 * Flag to say if DataTables should automatically try to calculate the
-			 * optimum table and columns widths (true) or not (false).
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bAutoWidth": null,
-	
-			/**
-			 * Delay the creation of TR and TD elements until they are actually
-			 * needed by a driven page draw. This can give a significant speed
-			 * increase for Ajax source and Javascript source data, but makes no
-			 * difference at all fro DOM and server-side processing tables.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bDeferRender": null,
-			
-			/**
-			 * Enable filtering on the table or not. Note that if this is disabled
-			 * then there is no filtering at all on the table, including fnFilter.
-			 * To just remove the filtering input use sDom and remove the 'f' option.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bFilter": null,
-			
-			/**
-			 * Table information element (the 'Showing x of y records' div) enable
-			 * flag.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bInfo": null,
-			
-			/**
-			 * Present a user control allowing the end user to change the page size
-			 * when pagination is enabled.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bLengthChange": null,
-	
-			/**
-			 * Pagination enabled or not. Note that if this is disabled then length
-			 * changing must also be disabled.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bPaginate": null,
-			
-			/**
-			 * Processing indicator enable flag whenever DataTables is enacting a
-			 * user request - typically an Ajax request for server-side processing.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bProcessing": null,
-			
-			/**
-			 * Server-side processing enabled flag - when enabled DataTables will
-			 * get all data from the server for every draw - there is no filtering,
-			 * sorting or paging done on the client-side.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bServerSide": null,
-			
-			/**
-			 * Sorting enablement flag.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bSort": null,
-			
-			/**
-			 * Apply a class to the columns which are being sorted to provide a
-			 * visual highlight or not. This can slow things down when enabled since
-			 * there is a lot of DOM interaction.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bSortClasses": null,
-			
-			/**
-			 * State saving enablement flag.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bStateSave": null
-		},
-		
-	
-		/**
-		 * Scrolling settings for a table.
-		 *  @namespace
-		 */
-		"oScroll": {
-			/**
-			 * Indicate if DataTables should be allowed to set the padding / margin
-			 * etc for the scrolling header elements or not. Typically you will want
-			 * this.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bAutoCss": null,
-			
-			/**
-			 * When the table is shorter in height than sScrollY, collapse the
-			 * table container down to the height of the table (when true).
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bCollapse": null,
-			
-			/**
-			 * Infinite scrolling enablement flag. Now deprecated in favour of
-			 * using the Scroller plug-in.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type boolean
-			 */
-			"bInfinite": null,
-			
-			/**
-			 * Width of the scrollbar for the web-browser's platform. Calculated
-			 * during table initialisation.
-			 *  @type int
-			 *  @default 0
-			 */
-			"iBarWidth": 0,
-			
-			/**
-			 * Space (in pixels) between the bottom of the scrolling container and 
-			 * the bottom of the scrolling viewport before the next page is loaded
-			 * when using infinite scrolling.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type int
-			 */
-			"iLoadGap": null,
-			
-			/**
-			 * Viewport width for horizontal scrolling. Horizontal scrolling is 
-			 * disabled if an empty string.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type string
-			 */
-			"sX": null,
-			
-			/**
-			 * Width to expand the table to when using x-scrolling. Typically you
-			 * should not need to use this.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type string
-			 *  @deprecated
-			 */
-			"sXInner": null,
-			
-			/**
-			 * Viewport height for vertical scrolling. Vertical scrolling is disabled
-			 * if an empty string.
-			 * Note that this parameter will be set by the initialisation routine. To
-			 * set a default use {@link DataTable.defaults}.
-			 *  @type string
-			 */
-			"sY": null
-		},
-		
-		/**
-		 * Language information for the table.
-		 *  @namespace
-		 *  @extends DataTable.defaults.oLanguage
-		 */
-		"oLanguage": {
-			/**
-			 * Information callback function. See 
-			 * {@link DataTable.defaults.fnInfoCallback}
-			 *  @type function
-			 *  @default null
-			 */
-			"fnInfoCallback": null
-		},
-		
-		/**
-		 * Browser support parameters
-		 *  @namespace
-		 */
-		"oBrowser": {
-			/**
-			 * Indicate if the browser incorrectly calculates width:100% inside a
-			 * scrolling element (IE6/7)
-			 *  @type boolean
-			 *  @default false
-			 */
-			"bScrollOversize": false
-		},
-		
-		/**
-		 * Array referencing the nodes which are used for the features. The 
-		 * parameters of this object match what is allowed by sDom - i.e.
-		 *   <ul>
-		 *     <li>'l' - Length changing</li>
-		 *     <li>'f' - Filtering input</li>
-		 *     <li>'t' - The table!</li>
-		 *     <li>'i' - Information</li>
-		 *     <li>'p' - Pagination</li>
-		 *     <li>'r' - pRocessing</li>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 */
-		"aanFeatures": [],
-		
-		/**
-		 * Store data information - see {@link DataTable.models.oRow} for detailed
-		 * information.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoData": [],
-		
-		/**
-		 * Array of indexes which are in the current display (after filtering etc)
-		 *  @type array
-		 *  @default []
-		 */
-		"aiDisplay": [],
-		
-		/**
-		 * Array of indexes for display - no filtering
-		 *  @type array
-		 *  @default []
-		 */
-		"aiDisplayMaster": [],
-		
-		/**
-		 * Store information about each column that is in use
-		 *  @type array
-		 *  @default []
-		 */
-		"aoColumns": [],
-		
-		/**
-		 * Store information about the table's header
-		 *  @type array
-		 *  @default []
-		 */
-		"aoHeader": [],
-		
-		/**
-		 * Store information about the table's footer
-		 *  @type array
-		 *  @default []
-		 */
-		"aoFooter": [],
-		
-		/**
-		 * Search data array for regular expression searching
-		 *  @type array
-		 *  @default []
-		 */
-		"asDataSearch": [],
-		
-		/**
-		 * Store the applied global search information in case we want to force a 
-		 * research or compare the old search to a new one.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @namespace
-		 *  @extends DataTable.models.oSearch
-		 */
-		"oPreviousSearch": {},
-		
-		/**
-		 * Store the applied search for each column - see 
-		 * {@link DataTable.models.oSearch} for the format that is used for the
-		 * filtering information for each column.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoPreSearchCols": [],
-		
-		/**
-		 * Sorting that is applied to the table. Note that the inner arrays are
-		 * used in the following manner:
-		 * <ul>
-		 *   <li>Index 0 - column number</li>
-		 *   <li>Index 1 - current sorting direction</li>
-		 *   <li>Index 2 - index of asSorting for this column</li>
-		 * </ul>
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type array
-		 *  @todo These inner arrays should really be objects
-		 */
-		"aaSorting": null,
-		
-		/**
-		 * Sorting that is always applied to the table (i.e. prefixed in front of
-		 * aaSorting).
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type array|null
-		 *  @default null
-		 */
-		"aaSortingFixed": null,
-		
-		/**
-		 * Classes to use for the striping of a table.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type array
-		 *  @default []
-		 */
-		"asStripeClasses": null,
-		
-		/**
-		 * If restoring a table - we should restore its striping classes as well
-		 *  @type array
-		 *  @default []
-		 */
-		"asDestroyStripes": [],
-		
-		/**
-		 * If restoring a table - we should restore its width 
-		 *  @type int
-		 *  @default 0
-		 */
-		"sDestroyWidth": 0,
-		
-		/**
-		 * Callback functions array for every time a row is inserted (i.e. on a draw).
-		 *  @type array
-		 *  @default []
-		 */
-		"aoRowCallback": [],
-		
-		/**
-		 * Callback functions for the header on each draw.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoHeaderCallback": [],
-		
-		/**
-		 * Callback function for the footer on each draw.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoFooterCallback": [],
-		
-		/**
-		 * Array of callback functions for draw callback functions
-		 *  @type array
-		 *  @default []
-		 */
-		"aoDrawCallback": [],
-		
-		/**
-		 * Array of callback functions for row created function
-		 *  @type array
-		 *  @default []
-		 */
-		"aoRowCreatedCallback": [],
-		
-		/**
-		 * Callback functions for just before the table is redrawn. A return of 
-		 * false will be used to cancel the draw.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoPreDrawCallback": [],
-		
-		/**
-		 * Callback functions for when the table has been initialised.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoInitComplete": [],
-	
-		
-		/**
-		 * Callbacks for modifying the settings to be stored for state saving, prior to
-		 * saving state.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoStateSaveParams": [],
-		
-		/**
-		 * Callbacks for modifying the settings that have been stored for state saving
-		 * prior to using the stored values to restore the state.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoStateLoadParams": [],
-		
-		/**
-		 * Callbacks for operating on the settings object once the saved state has been
-		 * loaded
-		 *  @type array
-		 *  @default []
-		 */
-		"aoStateLoaded": [],
-		
-		/**
-		 * Cache the table ID for quick access
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 */
-		"sTableId": "",
-		
-		/**
-		 * The TABLE node for the main table
-		 *  @type node
-		 *  @default null
-		 */
-		"nTable": null,
-		
-		/**
-		 * Permanent ref to the thead element
-		 *  @type node
-		 *  @default null
-		 */
-		"nTHead": null,
-		
-		/**
-		 * Permanent ref to the tfoot element - if it exists
-		 *  @type node
-		 *  @default null
-		 */
-		"nTFoot": null,
-		
-		/**
-		 * Permanent ref to the tbody element
-		 *  @type node
-		 *  @default null
-		 */
-		"nTBody": null,
-		
-		/**
-		 * Cache the wrapper node (contains all DataTables controlled elements)
-		 *  @type node
-		 *  @default null
-		 */
-		"nTableWrapper": null,
-		
-		/**
-		 * Indicate if when using server-side processing the loading of data 
-		 * should be deferred until the second draw.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type boolean
-		 *  @default false
-		 */
-		"bDeferLoading": false,
-		
-		/**
-		 * Indicate if all required information has been read in
-		 *  @type boolean
-		 *  @default false
-		 */
-		"bInitialised": false,
-		
-		/**
-		 * Information about open rows. Each object in the array has the parameters
-		 * 'nTr' and 'nParent'
-		 *  @type array
-		 *  @default []
-		 */
-		"aoOpenRows": [],
-		
-		/**
-		 * Dictate the positioning of DataTables' control elements - see
-		 * {@link DataTable.model.oInit.sDom}.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string
-		 *  @default null
-		 */
-		"sDom": null,
-		
-		/**
-		 * Which type of pagination should be used.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string 
-		 *  @default two_button
-		 */
-		"sPaginationType": "two_button",
-		
-		/**
-		 * The cookie duration (for bStateSave) in seconds.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type int
-		 *  @default 0
-		 */
-		"iCookieDuration": 0,
-		
-		/**
-		 * The cookie name prefix.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string
-		 *  @default <i>Empty string</i>
-		 */
-		"sCookiePrefix": "",
-		
-		/**
-		 * Callback function for cookie creation.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type function
-		 *  @default null
-		 */
-		"fnCookieCallback": null,
-		
-		/**
-		 * Array of callback functions for state saving. Each array element is an 
-		 * object with the following parameters:
-		 *   <ul>
-		 *     <li>function:fn - function to call. Takes two parameters, oSettings
-		 *       and the JSON string to save that has been thus far created. Returns
-		 *       a JSON string to be inserted into a json object 
-		 *       (i.e. '"param": [ 0, 1, 2]')</li>
-		 *     <li>string:sName - name of callback</li>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 */
-		"aoStateSave": [],
-		
-		/**
-		 * Array of callback functions for state loading. Each array element is an 
-		 * object with the following parameters:
-		 *   <ul>
-		 *     <li>function:fn - function to call. Takes two parameters, oSettings 
-		 *       and the object stored. May return false to cancel state loading</li>
-		 *     <li>string:sName - name of callback</li>
-		 *   </ul>
-		 *  @type array
-		 *  @default []
-		 */
-		"aoStateLoad": [],
-		
-		/**
-		 * State that was loaded from the cookie. Useful for back reference
-		 *  @type object
-		 *  @default null
-		 */
-		"oLoadedState": null,
-		
-		/**
-		 * Source url for AJAX data for the table.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string
-		 *  @default null
-		 */
-		"sAjaxSource": null,
-		
-		/**
-		 * Property from a given object from which to read the table data from. This
-		 * can be an empty string (when not server-side processing), in which case 
-		 * it is  assumed an an array is given directly.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string
-		 */
-		"sAjaxDataProp": null,
-		
-		/**
-		 * Note if draw should be blocked while getting data
-		 *  @type boolean
-		 *  @default true
-		 */
-		"bAjaxDataGet": true,
-		
-		/**
-		 * The last jQuery XHR object that was used for server-side data gathering. 
-		 * This can be used for working with the XHR information in one of the 
-		 * callbacks
-		 *  @type object
-		 *  @default null
-		 */
-		"jqXHR": null,
-		
-		/**
-		 * Function to get the server-side data.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type function
-		 */
-		"fnServerData": null,
-		
-		/**
-		 * Functions which are called prior to sending an Ajax request so extra 
-		 * parameters can easily be sent to the server
-		 *  @type array
-		 *  @default []
-		 */
-		"aoServerParams": [],
-		
-		/**
-		 * Send the XHR HTTP method - GET or POST (could be PUT or DELETE if 
-		 * required).
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type string
-		 */
-		"sServerMethod": null,
-		
-		/**
-		 * Format numbers for display.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type function
-		 */
-		"fnFormatNumber": null,
-		
-		/**
-		 * List of options that can be used for the user selectable length menu.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type array
-		 *  @default []
-		 */
-		"aLengthMenu": null,
-		
-		/**
-		 * Counter for the draws that the table does. Also used as a tracker for
-		 * server-side processing
-		 *  @type int
-		 *  @default 0
-		 */
-		"iDraw": 0,
-		
-		/**
-		 * Indicate if a redraw is being done - useful for Ajax
-		 *  @type boolean
-		 *  @default false
-		 */
-		"bDrawing": false,
-		
-		/**
-		 * Draw index (iDraw) of the last error when parsing the returned data
-		 *  @type int
-		 *  @default -1
-		 */
-		"iDrawError": -1,
-		
-		/**
-		 * Paging display length
-		 *  @type int
-		 *  @default 10
-		 */
-		"_iDisplayLength": 10,
-	
-		/**
-		 * Paging start point - aiDisplay index
-		 *  @type int
-		 *  @default 0
-		 */
-		"_iDisplayStart": 0,
-	
-		/**
-		 * Paging end point - aiDisplay index. Use fnDisplayEnd rather than
-		 * this property to get the end point
-		 *  @type int
-		 *  @default 10
-		 *  @private
-		 */
-		"_iDisplayEnd": 10,
-		
-		/**
-		 * Server-side processing - number of records in the result set
-		 * (i.e. before filtering), Use fnRecordsTotal rather than
-		 * this property to get the value of the number of records, regardless of
-		 * the server-side processing setting.
-		 *  @type int
-		 *  @default 0
-		 *  @private
-		 */
-		"_iRecordsTotal": 0,
-	
-		/**
-		 * Server-side processing - number of records in the current display set
-		 * (i.e. after filtering). Use fnRecordsDisplay rather than
-		 * this property to get the value of the number of records, regardless of
-		 * the server-side processing setting.
-		 *  @type boolean
-		 *  @default 0
-		 *  @private
-		 */
-		"_iRecordsDisplay": 0,
-		
-		/**
-		 * Flag to indicate if jQuery UI marking and classes should be used.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type boolean
-		 */
-		"bJUI": null,
-		
-		/**
-		 * The classes to use for the table
-		 *  @type object
-		 *  @default {}
-		 */
-		"oClasses": {},
-		
-		/**
-		 * Flag attached to the settings object so you can check in the draw 
-		 * callback if filtering has been done in the draw. Deprecated in favour of
-		 * events.
-		 *  @type boolean
-		 *  @default false
-		 *  @deprecated
-		 */
-		"bFiltered": false,
-		
-		/**
-		 * Flag attached to the settings object so you can check in the draw 
-		 * callback if sorting has been done in the draw. Deprecated in favour of
-		 * events.
-		 *  @type boolean
-		 *  @default false
-		 *  @deprecated
-		 */
-		"bSorted": false,
-		
-		/**
-		 * Indicate that if multiple rows are in the header and there is more than 
-		 * one unique cell per column, if the top one (true) or bottom one (false) 
-		 * should be used for sorting / title by DataTables.
-		 * Note that this parameter will be set by the initialisation routine. To
-		 * set a default use {@link DataTable.defaults}.
-		 *  @type boolean
-		 */
-		"bSortCellsTop": null,
-		
-		/**
-		 * Initialisation object that is used for the table
-		 *  @type object
-		 *  @default null
-		 */
-		"oInit": null,
-		
-		/**
-		 * Destroy callback functions - for plug-ins to attach themselves to the
-		 * destroy so they can clean up markup and events.
-		 *  @type array
-		 *  @default []
-		 */
-		"aoDestroyCallback": [],
-	
-		
-		/**
-		 * Get the number of records in the current record set, before filtering
-		 *  @type function
-		 */
-		"fnRecordsTotal": function ()
-		{
-			if ( this.oFeatures.bServerSide ) {
-				return parseInt(this._iRecordsTotal, 10);
-			} else {
-				return this.aiDisplayMaster.length;
-			}
-		},
-		
-		/**
-		 * Get the number of records in the current record set, after filtering
-		 *  @type function
-		 */
-		"fnRecordsDisplay": function ()
-		{
-			if ( this.oFeatures.bServerSide ) {
-				return parseInt(this._iRecordsDisplay, 10);
-			} else {
-				return this.aiDisplay.length;
-			}
-		},
-		
-		/**
-		 * Set the display end point - aiDisplay index
-		 *  @type function
-		 *  @todo Should do away with _iDisplayEnd and calculate it on-the-fly here
-		 */
-		"fnDisplayEnd": function ()
-		{
-			if ( this.oFeatures.bServerSide ) {
-				if ( this.oFeatures.bPaginate === false || this._iDisplayLength == -1 ) {
-					return this._iDisplayStart+this.aiDisplay.length;
-				} else {
-					return Math.min( this._iDisplayStart+this._iDisplayLength, 
-						this._iRecordsDisplay );
-				}
-			} else {
-				return this._iDisplayEnd;
-			}
-		},
-		
-		/**
-		 * The DataTables object for this table
-		 *  @type object
-		 *  @default null
-		 */
-		"oInstance": null,
-		
-		/**
-		 * Unique identifier for each instance of the DataTables object. If there
-		 * is an ID on the table node, then it takes that value, otherwise an
-		 * incrementing internal counter is used.
-		 *  @type string
-		 *  @default null
-		 */
-		"sInstance": null,
-	
-		/**
-		 * tabindex attribute value that is added to DataTables control elements, allowing
-		 * keyboard navigation of the table and its controls.
-		 */
-		"iTabIndex": 0,
-	
-		/**
-		 * DIV container for the footer scrolling table if scrolling
-		 */
-		"nScrollHead": null,
-	
-		/**
-		 * DIV container for the footer scrolling table if scrolling
-		 */
-		"nScrollFoot": null
-	};
-
-	/**
-	 * Extension object for DataTables that is used to provide all extension options.
-	 * 
-	 * Note that the <i>DataTable.ext</i> object is available through
-	 * <i>jQuery.fn.dataTable.ext</i> where it may be accessed and manipulated. It is
-	 * also aliased to <i>jQuery.fn.dataTableExt</i> for historic reasons.
-	 *  @namespace
-	 *  @extends DataTable.models.ext
-	 */
-	DataTable.ext = $.extend( true, {}, DataTable.models.ext );
-	
-	$.extend( DataTable.ext.oStdClasses, {
-		"sTable": "dataTable",
-	
-		/* Two buttons buttons */
-		"sPagePrevEnabled": "paginate_enabled_previous",
-		"sPagePrevDisabled": "paginate_disabled_previous",
-		"sPageNextEnabled": "paginate_enabled_next",
-		"sPageNextDisabled": "paginate_disabled_next",
-		"sPageJUINext": "",
-		"sPageJUIPrev": "",
-		
-		/* Full numbers paging buttons */
-		"sPageButton": "paginate_button",
-		"sPageButtonActive": "paginate_active",
-		"sPageButtonStaticDisabled": "paginate_button paginate_button_disabled",
-		"sPageFirst": "first",
-		"sPagePrevious": "previous",
-		"sPageNext": "next",
-		"sPageLast": "last",
-		
-		/* Striping classes */
-		"sStripeOdd": "odd",
-		"sStripeEven": "even",
-		
-		/* Empty row */
-		"sRowEmpty": "dataTables_empty",
-		
-		/* Features */
-		"sWrapper": "dataTables_wrapper",
-		"sFilter": "dataTables_filter",
-		"sInfo": "dataTables_info",
-		"sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
-		"sLength": "dataTables_length",
-		"sProcessing": "dataTables_processing",
-		
-		/* Sorting */
-		"sSortAsc": "sorting_asc",
-		"sSortDesc": "sorting_desc",
-		"sSortable": "sorting", /* Sortable in both directions */
-		"sSortableAsc": "sorting_asc_disabled",
-		"sSortableDesc": "sorting_desc_disabled",
-		"sSortableNone": "sorting_disabled",
-		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
-		"sSortJUIAsc": "",
-		"sSortJUIDesc": "",
-		"sSortJUI": "",
-		"sSortJUIAscAllowed": "",
-		"sSortJUIDescAllowed": "",
-		"sSortJUIWrapper": "",
-		"sSortIcon": "",
-		
-		/* Scrolling */
-		"sScrollWrapper": "dataTables_scroll",
-		"sScrollHead": "dataTables_scrollHead",
-		"sScrollHeadInner": "dataTables_scrollHeadInner",
-		"sScrollBody": "dataTables_scrollBody",
-		"sScrollFoot": "dataTables_scrollFoot",
-		"sScrollFootInner": "dataTables_scrollFootInner",
-		
-		/* Misc */
-		"sFooterTH": "",
-		"sJUIHeader": "",
-		"sJUIFooter": ""
-	} );
-	
-	
-	$.extend( DataTable.ext.oJUIClasses, DataTable.ext.oStdClasses, {
-		/* Two buttons buttons */
-		"sPagePrevEnabled": "fg-button ui-button ui-state-default ui-corner-left",
-		"sPagePrevDisabled": "fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",
-		"sPageNextEnabled": "fg-button ui-button ui-state-default ui-corner-right",
-		"sPageNextDisabled": "fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",
-		"sPageJUINext": "ui-icon ui-icon-circle-arrow-e",
-		"sPageJUIPrev": "ui-icon ui-icon-circle-arrow-w",
-		
-		/* Full numbers paging buttons */
-		"sPageButton": "fg-button ui-button ui-state-default",
-		"sPageButtonActive": "fg-button ui-button ui-state-default ui-state-disabled",
-		"sPageButtonStaticDisabled": "fg-button ui-button ui-state-default ui-state-disabled",
-		"sPageFirst": "first ui-corner-tl ui-corner-bl",
-		"sPageLast": "last ui-corner-tr ui-corner-br",
-		
-		/* Features */
-		"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
-			"ui-buttonset-multi paging_", /* Note that the type is postfixed */
-		
-		/* Sorting */
-		"sSortAsc": "ui-state-default",
-		"sSortDesc": "ui-state-default",
-		"sSortable": "ui-state-default",
-		"sSortableAsc": "ui-state-default",
-		"sSortableDesc": "ui-state-default",
-		"sSortableNone": "ui-state-default",
-		"sSortJUIAsc": "css_right ui-icon ui-icon-triangle-1-n",
-		"sSortJUIDesc": "css_right ui-icon ui-icon-triangle-1-s",
-		"sSortJUI": "css_right ui-icon ui-icon-carat-2-n-s",
-		"sSortJUIAscAllowed": "css_right ui-icon ui-icon-carat-1-n",
-		"sSortJUIDescAllowed": "css_right ui-icon ui-icon-carat-1-s",
-		"sSortJUIWrapper": "DataTables_sort_wrapper",
-		"sSortIcon": "DataTables_sort_icon",
-		
-		/* Scrolling */
-		"sScrollHead": "dataTables_scrollHead ui-state-default",
-		"sScrollFoot": "dataTables_scrollFoot ui-state-default",
-		
-		/* Misc */
-		"sFooterTH": "ui-state-default",
-		"sJUIHeader": "fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix",
-		"sJUIFooter": "fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix"
-	} );
-	
-	/*
-	 * Variable: oPagination
-	 * Purpose:  
-	 * Scope:    jQuery.fn.dataTableExt
-	 */
-	$.extend( DataTable.ext.oPagination, {
-		/*
-		 * Variable: two_button
-		 * Purpose:  Standard two button (forward/back) pagination
-		 * Scope:    jQuery.fn.dataTableExt.oPagination
-		 */
-		"two_button": {
-			/*
-			 * Function: oPagination.two_button.fnInit
-			 * Purpose:  Initialise dom elements required for pagination with forward/back buttons only
-			 * Returns:  -
-			 * Inputs:   object:oSettings - dataTables settings object
-			 *           node:nPaging - the DIV which contains this pagination control
-			 *           function:fnCallbackDraw - draw function which must be called on update
-			 */
-			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
-			{
-				var oLang = oSettings.oLanguage.oPaginate;
-				var oClasses = oSettings.oClasses;
-				var fnClickHandler = function ( e ) {
-					if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
-					{
-						fnCallbackDraw( oSettings );
-					}
-				};
-	
-				var sAppend = (!oSettings.bJUI) ?
-					'<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sPrevious+'</a>'+
-					'<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button">'+oLang.sNext+'</a>'
-					:
-					'<a class="'+oSettings.oClasses.sPagePrevDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUIPrev+'"></span></a>'+
-					'<a class="'+oSettings.oClasses.sPageNextDisabled+'" tabindex="'+oSettings.iTabIndex+'" role="button"><span class="'+oSettings.oClasses.sPageJUINext+'"></span></a>';
-				$(nPaging).append( sAppend );
-				
-				var els = $('a', nPaging);
-				var nPrevious = els[0],
-					nNext = els[1];
-				
-				oSettings.oApi._fnBindAction( nPrevious, {action: "previous"}, fnClickHandler );
-				oSettings.oApi._fnBindAction( nNext,     {action: "next"},     fnClickHandler );
-				
-				/* ID the first elements only */
-				if ( !oSettings.aanFeatures.p )
-				{
-					nPaging.id = oSettings.sTableId+'_paginate';
-					nPrevious.id = oSettings.sTableId+'_previous';
-					nNext.id = oSettings.sTableId+'_next';
-	
-					nPrevious.setAttribute('aria-controls', oSettings.sTableId);
-					nNext.setAttribute('aria-controls', oSettings.sTableId);
-				}
-			},
-			
-			/*
-			 * Function: oPagination.two_button.fnUpdate
-			 * Purpose:  Update the two button pagination at the end of the draw
-			 * Returns:  -
-			 * Inputs:   object:oSettings - dataTables settings object
-			 *           function:fnCallbackDraw - draw function to call on page change
-			 */
-			"fnUpdate": function ( oSettings, fnCallbackDraw )
-			{
-				if ( !oSettings.aanFeatures.p )
-				{
-					return;
-				}
-				
-				var oClasses = oSettings.oClasses;
-				var an = oSettings.aanFeatures.p;
-				var nNode;
-	
-				/* Loop over each instance of the pager */
-				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
-				{
-					nNode = an[i].firstChild;
-					if ( nNode )
-					{
-						/* Previous page */
-						nNode.className = ( oSettings._iDisplayStart === 0 ) ?
-						    oClasses.sPagePrevDisabled : oClasses.sPagePrevEnabled;
-						    
-						/* Next page */
-						nNode = nNode.nextSibling;
-						nNode.className = ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) ?
-						    oClasses.sPageNextDisabled : oClasses.sPageNextEnabled;
-					}
-				}
-			}
-		},
-		
-		
-		/*
-		 * Variable: iFullNumbersShowPages
-		 * Purpose:  Change the number of pages which can be seen
-		 * Scope:    jQuery.fn.dataTableExt.oPagination
-		 */
-		"iFullNumbersShowPages": 5,
-		
-		/*
-		 * Variable: full_numbers
-		 * Purpose:  Full numbers pagination
-		 * Scope:    jQuery.fn.dataTableExt.oPagination
-		 */
-		"full_numbers": {
-			/*
-			 * Function: oPagination.full_numbers.fnInit
-			 * Purpose:  Initialise dom elements required for pagination with a list of the pages
-			 * Returns:  -
-			 * Inputs:   object:oSettings - dataTables settings object
-			 *           node:nPaging - the DIV which contains this pagination control
-			 *           function:fnCallbackDraw - draw function which must be called on update
-			 */
-			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
-			{
-				var oLang = oSettings.oLanguage.oPaginate;
-				var oClasses = oSettings.oClasses;
-				var fnClickHandler = function ( e ) {
-					if ( oSettings.oApi._fnPageChange( oSettings, e.data.action ) )
-					{
-						fnCallbackDraw( oSettings );
-					}
-				};
-	
-				$(nPaging).append(
-					'<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageFirst+'">'+oLang.sFirst+'</a>'+
-					'<a  tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPagePrevious+'">'+oLang.sPrevious+'</a>'+
-					'<span></span>'+
-					'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageNext+'">'+oLang.sNext+'</a>'+
-					'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+" "+oClasses.sPageLast+'">'+oLang.sLast+'</a>'
-				);
-				var els = $('a', nPaging);
-				var nFirst = els[0],
-					nPrev = els[1],
-					nNext = els[2],
-					nLast = els[3];
-				
-				oSettings.oApi._fnBindAction( nFirst, {action: "first"},    fnClickHandler );
-				oSettings.oApi._fnBindAction( nPrev,  {action: "previous"}, fnClickHandler );
-				oSettings.oApi._fnBindAction( nNext,  {action: "next"},     fnClickHandler );
-				oSettings.oApi._fnBindAction( nLast,  {action: "last"},     fnClickHandler );
-				
-				/* ID the first elements only */
-				if ( !oSettings.aanFeatures.p )
-				{
-					nPaging.id = oSettings.sTableId+'_paginate';
-					nFirst.id =oSettings.sTableId+'_first';
-					nPrev.id =oSettings.sTableId+'_previous';
-					nNext.id =oSettings.sTableId+'_next';
-					nLast.id =oSettings.sTableId+'_last';
-				}
-			},
-			
-			/*
-			 * Function: oPagination.full_numbers.fnUpdate
-			 * Purpose:  Update the list of page buttons shows
-			 * Returns:  -
-			 * Inputs:   object:oSettings - dataTables settings object
-			 *           function:fnCallbackDraw - draw function to call on page change
-			 */
-			"fnUpdate": function ( oSettings, fnCallbackDraw )
-			{
-				if ( !oSettings.aanFeatures.p )
-				{
-					return;
-				}
-				
-				var iPageCount = DataTable.ext.oPagination.iFullNumbersShowPages;
-				var iPageCountHalf = Math.floor(iPageCount / 2);
-				var iPages = Math.ceil((oSettings.fnRecordsDisplay()) / oSettings._iDisplayLength);
-				var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
-				var sList = "";
-				var iStartButton, iEndButton, i, iLen;
-				var oClasses = oSettings.oClasses;
-				var anButtons, anStatic, nPaginateList, nNode;
-				var an = oSettings.aanFeatures.p;
-				var fnBind = function (j) {
-					oSettings.oApi._fnBindAction( this, {"page": j+iStartButton-1}, function(e) {
-						/* Use the information in the element to jump to the required page */
-						oSettings.oApi._fnPageChange( oSettings, e.data.page );
-						fnCallbackDraw( oSettings );
-						e.preventDefault();
-					} );
-				};
-				
-				/* Pages calculation */
-				if ( oSettings._iDisplayLength === -1 )
-				{
-					iStartButton = 1;
-					iEndButton = 1;
-					iCurrentPage = 1;
-				}
-				else if (iPages < iPageCount)
-				{
-					iStartButton = 1;
-					iEndButton = iPages;
-				}
-				else if (iCurrentPage <= iPageCountHalf)
-				{
-					iStartButton = 1;
-					iEndButton = iPageCount;
-				}
-				else if (iCurrentPage >= (iPages - iPageCountHalf))
-				{
-					iStartButton = iPages - iPageCount + 1;
-					iEndButton = iPages;
-				}
-				else
-				{
-					iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1;
-					iEndButton = iStartButton + iPageCount - 1;
-				}
-	
-				
-				/* Build the dynamic list */
-				for ( i=iStartButton ; i<=iEndButton ; i++ )
-				{
-					sList += (iCurrentPage !== i) ?
-						'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButton+'">'+oSettings.fnFormatNumber(i)+'</a>' :
-						'<a tabindex="'+oSettings.iTabIndex+'" class="'+oClasses.sPageButtonActive+'">'+oSettings.fnFormatNumber(i)+'</a>';
-				}
-				
-				/* Loop over each instance of the pager */
-				for ( i=0, iLen=an.length ; i<iLen ; i++ )
-				{
-					nNode = an[i];
-					if ( !nNode.hasChildNodes() )
-					{
-						continue;
-					}
-					
-					/* Build up the dynamic list first - html and listeners */
-					$('span:eq(0)', nNode)
-						.html( sList )
-						.children('a').each( fnBind );
-					
-					/* Update the permanent button's classes */
-					anButtons = nNode.getElementsByTagName('a');
-					anStatic = [
-						anButtons[0], anButtons[1], 
-						anButtons[anButtons.length-2], anButtons[anButtons.length-1]
-					];
-	
-					$(anStatic).removeClass( oClasses.sPageButton+" "+oClasses.sPageButtonActive+" "+oClasses.sPageButtonStaticDisabled );
-					$([anStatic[0], anStatic[1]]).addClass( 
-						(iCurrentPage==1) ?
-							oClasses.sPageButtonStaticDisabled :
-							oClasses.sPageButton
-					);
-					$([anStatic[2], anStatic[3]]).addClass(
-						(iPages===0 || iCurrentPage===iPages || oSettings._iDisplayLength===-1) ?
-							oClasses.sPageButtonStaticDisabled :
-							oClasses.sPageButton
-					);
-				}
-			}
-		}
-	} );
-	
-	$.extend( DataTable.ext.oSort, {
-		/*
-		 * text sorting
-		 */
-		"string-pre": function ( a )
-		{
-			if ( typeof a != 'string' ) {
-				a = (a !== null && a.toString) ? a.toString() : '';
-			}
-			return a.toLowerCase();
-		},
-	
-		"string-asc": function ( x, y )
-		{
-			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-		},
-		
-		"string-desc": function ( x, y )
-		{
-			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-		},
-		
-		
-		/*
-		 * html sorting (ignore html tags)
-		 */
-		"html-pre": function ( a )
-		{
-			return a.replace( /<.*?>/g, "" ).toLowerCase();
-		},
-		
-		"html-asc": function ( x, y )
-		{
-			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-		},
-		
-		"html-desc": function ( x, y )
-		{
-			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
-		},
-		
-		
-		/*
-		 * date sorting
-		 */
-		"date-pre": function ( a )
-		{
-			var x = Date.parse( a );
-			
-			if ( isNaN(x) || x==="" )
-			{
-				x = Date.parse( "01/01/1970 00:00:00" );
-			}
-			return x;
-		},
-	
-		"date-asc": function ( x, y )
-		{
-			return x - y;
-		},
-		
-		"date-desc": function ( x, y )
-		{
-			return y - x;
-		},
-		
-		
-		/*
-		 * numerical sorting
-		 */
-		"numeric-pre": function ( a )
-		{
-			return (a=="-" || a==="") ? 0 : a*1;
-		},
-	
-		"numeric-asc": function ( x, y )
-		{
-			return x - y;
-		},
-		
-		"numeric-desc": function ( x, y )
-		{
-			return y - x;
-		}
-	} );
-	
-	
-	$.extend( DataTable.ext.aTypes, [
-		/*
-		 * Function: -
-		 * Purpose:  Check to see if a string is numeric
-		 * Returns:  string:'numeric' or null
-		 * Inputs:   mixed:sText - string to check
-		 */
-		function ( sData )
-		{
-			/* Allow zero length strings as a number */
-			if ( typeof sData === 'number' )
-			{
-				return 'numeric';
-			}
-			else if ( typeof sData !== 'string' )
-			{
-				return null;
-			}
-			
-			var sValidFirstChars = "0123456789-";
-			var sValidChars = "0123456789.";
-			var Char;
-			var bDecimal = false;
-			
-			/* Check for a valid first char (no period and allow negatives) */
-			Char = sData.charAt(0); 
-			if (sValidFirstChars.indexOf(Char) == -1) 
-			{
-				return null;
-			}
-			
-			/* Check all the other characters are valid */
-			for ( var i=1 ; i<sData.length ; i++ ) 
-			{
-				Char = sData.charAt(i); 
-				if (sValidChars.indexOf(Char) == -1) 
-				{
-					return null;
-				}
-				
-				/* Only allowed one decimal place... */
-				if ( Char == "." )
-				{
-					if ( bDecimal )
-					{
-						return null;
-					}
-					bDecimal = true;
-				}
-			}
-			
-			return 'numeric';
-		},
-		
-		/*
-		 * Function: -
-		 * Purpose:  Check to see if a string is actually a formatted date
-		 * Returns:  string:'date' or null
-		 * Inputs:   string:sText - string to check
-		 */
-		function ( sData )
-		{
-			var iParse = Date.parse(sData);
-			if ( (iParse !== null && !isNaN(iParse)) || (typeof sData === 'string' && sData.length === 0) )
-			{
-				return 'date';
-			}
-			return null;
-		},
-		
-		/*
-		 * Function: -
-		 * Purpose:  Check to see if a string should be treated as an HTML string
-		 * Returns:  string:'html' or null
-		 * Inputs:   string:sText - string to check
-		 */
-		function ( sData )
-		{
-			if ( typeof sData === 'string' && sData.indexOf('<') != -1 && sData.indexOf('>') != -1 )
-			{
-				return 'html';
-			}
-			return null;
-		}
-	] );
-	
-
-	// jQuery aliases
-	$.fn.DataTable = DataTable;
-	$.fn.dataTable = DataTable;
-	$.fn.dataTableSettings = DataTable.settings;
-	$.fn.dataTableExt = DataTable.ext;
-
-
-	// Information about events fired by DataTables - for documentation.
-	/**
-	 * Draw event, fired whenever the table is redrawn on the page, at the same point as
-	 * fnDrawCallback. This may be useful for binding events or performing calculations when
-	 * the table is altered at all.
-	 *  @name DataTable#draw
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 */
-
-	/**
-	 * Filter event, fired when the filtering applied to the table (using the build in global
-	 * global filter, or column filters) is altered.
-	 *  @name DataTable#filter
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 */
-
-	/**
-	 * Page change event, fired when the paging of the table is altered.
-	 *  @name DataTable#page
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 */
-
-	/**
-	 * Sort event, fired when the sorting applied to the table is altered.
-	 *  @name DataTable#sort
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 */
-
-	/**
-	 * DataTables initialisation complete event, fired when the table is fully drawn,
-	 * including Ajax data loaded, if Ajax data is required.
-	 *  @name DataTable#init
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} oSettings DataTables settings object
-	 *  @param {object} json The JSON object request from the server - only
-	 *    present if client-side Ajax sourced data is used</li></ol>
-	 */
-
-	/**
-	 * State save event, fired when the table has changed state a new state save is required.
-	 * This method allows modification of the state saving object prior to actually doing the
-	 * save, including addition or other state properties (for plug-ins) or modification
-	 * of a DataTables core property.
-	 *  @name DataTable#stateSaveParams
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} oSettings DataTables settings object
-	 *  @param {object} json The state information to be saved
-	 */
-
-	/**
-	 * State load event, fired when the table is loading state from the stored data, but
-	 * prior to the settings object being modified by the saved state - allowing modification
-	 * of the saved state is required or loading of state for a plug-in.
-	 *  @name DataTable#stateLoadParams
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} oSettings DataTables settings object
-	 *  @param {object} json The saved state information
-	 */
-
-	/**
-	 * State loaded event, fired when state has been loaded from stored data and the settings
-	 * object has been modified by the loaded data.
-	 *  @name DataTable#stateLoaded
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} oSettings DataTables settings object
-	 *  @param {object} json The saved state information
-	 */
-
-	/**
-	 * Processing event, fired when DataTables is doing some kind of processing (be it,
-	 * sort, filter or anything else). Can be used to indicate to the end user that
-	 * there is something happening, or that something has finished.
-	 *  @name DataTable#processing
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} oSettings DataTables settings object
-	 *  @param {boolean} bShow Flag for if DataTables is doing processing or not
-	 */
-
-	/**
-	 * Ajax (XHR) event, fired whenever an Ajax request is completed from a request to 
-	 * made to the server for new data (note that this trigger is called in fnServerData,
-	 * if you override fnServerData and which to use this event, you need to trigger it in
-	 * you success function).
-	 *  @name DataTable#xhr
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 *  @param {object} json JSON returned from the server
-	 */
-
-	/**
-	 * Destroy event, fired when the DataTable is destroyed by calling fnDestroy or passing
-	 * the bDestroy:true parameter in the initialisation object. This can be used to remove
-	 * bound events, added DOM nodes, etc.
-	 *  @name DataTable#destroy
-	 *  @event
-	 *  @param {event} e jQuery event object
-	 *  @param {object} o DataTables settings object {@link DataTable.models.oSettings}
-	 */
-}));
-
-}(window, document));
-
diff --git a/html5/verto/demo/js/jquery.mobile-1.3.2.min.js b/html5/verto/demo/js/jquery.mobile-1.3.2.min.js
deleted file mode 100644
index e06e5902e1..0000000000
--- a/html5/verto/demo/js/jquery.mobile-1.3.2.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*! jQuery Mobile 1.3.2 | Git HEAD hash: 528cf0e <> 2013-07-19T22:17:57Z | (c) 2010, 2013 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b,c){"function"==typeof define&&define.amd?define(["jquery"],function(d){return c(d,a,b),d.mobile}):c(a.jQuery,a,b)}(this,document,function(a,b,c,d){!function(a){a.mobile={}}(a),function(a,b,d){var e={};a.mobile=a.extend(a.mobile,{version:"1.3.2",ns:"",subPageUrlKey:"ui-page",activePageClass:"ui-page-active",activeBtnClass:"ui-btn-active",focusClass:"ui-focus",ajaxEnabled:!0,hashListeningEnabled:!0,linkBindingEnabled:!0,defaultPageTransition:"fade",maxTransitionWidth:!1,minScrollBack:250,touchOverflowEnabled:!1,defaultDialogTransition:"pop",pageLoadErrorMessage:"Error Loading Page",pageLoadErrorMessageTheme:"e",phonegapNavigationEnabled:!1,autoInitializePage:!0,pushStateEnabled:!0,ignoreContentEnabled:!1,orientationChangeEnabled:!0,buttonMarkup:{hoverDelay:200},window:a(b),document:a(c),keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91},behaviors:{},silentScroll:function(c){"number"!==a.type(c)&&(c=a.mobile.defaultHomeScroll),a.event.special.scrollstart.enabled=!1,setTimeout(function(){b.scrollTo(0,c),a.mobile.document.trigger("silentscroll",{x:0,y:c})},20),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},nsNormalizeDict:e,nsNormalize:function(b){return b?e[b]||(e[b]=a.camelCase(a.mobile.ns+b)):void 0},getInheritedTheme:function(a,b){for(var c,d,e=a[0],f="",g=/ui-(bar|body|overlay)-([a-z])\b/;e&&(c=e.className||"",!(c&&(d=g.exec(c))&&(f=d[2])));)e=e.parentNode;return f||b||"a"},closestPageData:function(a){return a.closest(':jqmData(role="page"), :jqmData(role="dialog")').data("mobile-page")},enhanceable:function(a){return this.haveParents(a,"enhance")},hijackable:function(a){return this.haveParents(a,"ajax")},haveParents:function(b,c){if(!a.mobile.ignoreContentEnabled)return b;for(var d,e,f,g=b.length,h=a(),i=0;g>i;i++){for(e=b.eq(i),f=!1,d=b[i];d;){var j=d.getAttribute?d.getAttribute("data-"+a.mobile.ns+c):"";if("false"===j){f=!0;break}d=d.parentNode}f||(h=h.add(e))}return h},getScreenHeight:function(){return b.innerHeight||a.mobile.window.height()}},a.mobile),a.fn.jqmData=function(b,c){var e;return"undefined"!=typeof b&&(b&&(b=a.mobile.nsNormalize(b)),e=arguments.length<2||c===d?this.data(b):this.data(b,c)),e},a.jqmData=function(b,c,d){var e;return"undefined"!=typeof c&&(e=a.data(b,c?a.mobile.nsNormalize(c):c,d)),e},a.fn.jqmRemoveData=function(b){return this.removeData(a.mobile.nsNormalize(b))},a.jqmRemoveData=function(b,c){return a.removeData(b,a.mobile.nsNormalize(c))},a.fn.removeWithDependents=function(){a.removeWithDependents(this)},a.removeWithDependents=function(b){var c=a(b);(c.jqmData("dependents")||a()).remove(),c.remove()},a.fn.addDependents=function(b){a.addDependents(a(this),b)},a.addDependents=function(b,c){var d=a(b).jqmData("dependents")||a();a(b).jqmData("dependents",a.merge(d,c))},a.fn.getEncodedText=function(){return a("<div/>").text(a(this).text()).html()},a.fn.jqmEnhanceable=function(){return a.mobile.enhanceable(this)},a.fn.jqmHijackable=function(){return a.mobile.hijackable(this)};var f=a.find,g=/:jqmData\(([^)]*)\)/g;a.find=function(b,c,d,e){return b=b.replace(g,"[data-"+(a.mobile.ns||"")+"$1]"),f.call(this,b,c,d,e)},a.extend(a.find,f),a.find.matches=function(b,c){return a.find(b,null,null,c)},a.find.matchesSelector=function(b,c){return a.find(c,null,null,[b]).length>0}}(a,this),function(a,b){var c=0,d=Array.prototype.slice,e=a.cleanData;a.cleanData=function(b){for(var c,d=0;null!=(c=b[d]);d++)try{a(c).triggerHandler("remove")}catch(f){}e(b)},a.widget=function(b,c,d){var e,f,g,h,i=b.split(".")[0];b=b.split(".")[1],e=i+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e.toLowerCase()]=function(b){return!!a.data(b,e)},a[i]=a[i]||{},f=a[i][b],g=a[i][b]=function(a,b){return this._createWidget?(arguments.length&&this._createWidget(a,b),void 0):new g(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,e){a.isFunction(e)&&(d[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},d=function(a){return c.prototype[b].apply(this,a)};return function(){var b,c=this._super,f=this._superApply;return this._super=a,this._superApply=d,b=e.apply(this,arguments),this._super=c,this._superApply=f,b}}())}),g.prototype=a.widget.extend(h,{widgetEventPrefix:f?h.widgetEventPrefix:b},d,{constructor:g,namespace:i,widgetName:b,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g)},a.widget.extend=function(c){for(var e,f,g=d.call(arguments,1),h=0,i=g.length;i>h;h++)for(e in g[h])f=g[h][e],g[h].hasOwnProperty(e)&&f!==b&&(c[e]=a.isPlainObject(f)?a.isPlainObject(c[e])?a.widget.extend({},c[e],f):a.widget.extend({},f):f);return c},a.widget.bridge=function(c,e){var f=e.prototype.widgetFullName||c;a.fn[c]=function(g){var h="string"==typeof g,i=d.call(arguments,1),j=this;return g=!h&&i.length?a.widget.extend.apply(null,[g].concat(i)):g,h?this.each(function(){var d,e=a.data(this,f);return e?a.isFunction(e[g])&&"_"!==g.charAt(0)?(d=e[g].apply(e,i),d!==e&&d!==b?(j=d&&d.jquery?j.pushStack(d.get()):d,!1):void 0):a.error("no such method '"+g+"' for "+c+" widget instance"):a.error("cannot call methods on "+c+" prior to initialization; "+"attempted to call method '"+g+"'")}):this.each(function(){var b=a.data(this,f);b?b.option(g||{})._init():a.data(this,f,new e(g,this))}),j}},a.Widget=function(){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,d){d=a(d||this.defaultElement||this)[0],this.element=a(d),this.uuid=c++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this.bindings=a(),this.hoverable=a(),this.focusable=a(),d!==this&&(a.data(d,this.widgetFullName,this),this._on(!0,this.element,{remove:function(a){a.target===d&&this.destroy()}}),this.document=a(d.style?d.ownerDocument:d.document||d),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(c,d){var e,f,g,h=c;if(0===arguments.length)return a.widget.extend({},this.options);if("string"==typeof c)if(h={},e=c.split("."),c=e.shift(),e.length){for(f=h[c]=a.widget.extend({},this.options[c]),g=0;g<e.length-1;g++)f[e[g]]=f[e[g]]||{},f=f[e[g]];if(c=e.pop(),d===b)return f[c]===b?null:f[c];f[c]=d}else{if(d===b)return this.options[c]===b?null:this.options[c];h[c]=d}return this._setOptions(h),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,"disabled"===a&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!b).attr("aria-disabled",b),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(b,c,d){var e,f=this;"boolean"!=typeof b&&(d=c,c=b,b=!1),d?(c=e=a(c),this.bindings=this.bindings.add(c)):(d=c,c=this.element,e=this.widget()),a.each(d,function(d,g){function h(){return b||f.options.disabled!==!0&&!a(this).hasClass("ui-state-disabled")?("string"==typeof g?f[g]:g).apply(f,arguments):void 0}"string"!=typeof g&&(h.guid=g.guid=g.guid||h.guid||a.guid++);var i=d.match(/^(\w+)\s*(.*)$/),j=i[1]+f.eventNamespace,k=i[2];k?e.delegate(k,j,h):c.bind(j,h)})},_off:function(a,b){b=(b||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,a.unbind(b).undelegate(b)},_delay:function(a,b){function c(){return("string"==typeof a?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];if(d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){"string"==typeof e&&(e={effect:e});var g,h=e?e===!0||"number"==typeof e?c:e.effect||c:b;e=e||{},"number"==typeof e&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&a.effects.effect[h]?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}})}(a),function(a,b){a.widget("mobile.widget",{_createWidget:function(){a.Widget.prototype._createWidget.apply(this,arguments),this._trigger("init")},_getCreateOptions:function(){var c=this.element,d={};return a.each(this.options,function(a){var e=c.jqmData(a.replace(/[A-Z]/g,function(a){return"-"+a.toLowerCase()}));e!==b&&(d[a]=e)}),d},enhanceWithin:function(b,c){this.enhance(a(this.options.initSelector,a(b)),c)},enhance:function(b,c){var d,e,f=a(b);f=a.mobile.enhanceable(f),c&&f.length&&(d=a.mobile.closestPageData(f),e=d&&d.keepNativeSelector()||"",f=f.not(e)),f[this.widgetName]()},raise:function(a){throw"Widget ["+this.widgetName+"]: "+a}})}(a),function(a){a.extend(a.mobile,{loadingMessageTextVisible:d,loadingMessageTheme:d,loadingMessage:d,showPageLoadingMsg:function(b,c,d){a.mobile.loading("show",b,c,d)},hidePageLoadingMsg:function(){a.mobile.loading("hide")},loading:function(){this.loaderWidget.loader.apply(this.loaderWidget,arguments)}});var b="ui-loader",c=a("html"),e=a.mobile.window;a.widget("mobile.loader",{options:{theme:"a",textVisible:!1,html:"",text:"loading"},defaultHtml:"<div class='"+b+"'>"+"<span class='ui-icon ui-icon-loading'></span>"+"<h1></h1>"+"</div>",fakeFixLoader:function(){var b=a("."+a.mobile.activeBtnClass).first();this.element.css({top:a.support.scrollTop&&e.scrollTop()+e.height()/2||b.length&&b.offset().top||100})},checkLoaderPosition:function(){var b=this.element.offset(),c=e.scrollTop(),d=a.mobile.getScreenHeight();(b.top<c||b.top-c>d)&&(this.element.addClass("ui-loader-fakefix"),this.fakeFixLoader(),e.unbind("scroll",this.checkLoaderPosition).bind("scroll",a.proxy(this.fakeFixLoader,this)))},resetHtml:function(){this.element.html(a(this.defaultHtml).html())},show:function(f,g,h){var i,j,k;this.resetHtml(),"object"===a.type(f)?(k=a.extend({},this.options,f),f=k.theme||a.mobile.loadingMessageTheme):(k=this.options,f=f||a.mobile.loadingMessageTheme||k.theme),j=g||a.mobile.loadingMessage||k.text,c.addClass("ui-loading"),(a.mobile.loadingMessage!==!1||k.html)&&(i=a.mobile.loadingMessageTextVisible!==d?a.mobile.loadingMessageTextVisible:k.textVisible,this.element.attr("class",b+" ui-corner-all ui-body-"+f+" ui-loader-"+(i||g||f.text?"verbose":"default")+(k.textonly||h?" ui-loader-textonly":"")),k.html?this.element.html(k.html):this.element.find("h1").text(j),this.element.appendTo(a.mobile.pageContainer),this.checkLoaderPosition(),e.bind("scroll",a.proxy(this.checkLoaderPosition,this)))},hide:function(){c.removeClass("ui-loading"),a.mobile.loadingMessage&&this.element.removeClass("ui-loader-fakefix"),a.mobile.window.unbind("scroll",this.fakeFixLoader),a.mobile.window.unbind("scroll",this.checkLoaderPosition)}}),e.bind("pagecontainercreate",function(){a.mobile.loaderWidget=a.mobile.loaderWidget||a(a.mobile.loader.prototype.defaultHtml).loader()})}(a,this),function(a,b,d){function e(a){return a=a||location.href,"#"+a.replace(/^[^#]*#?(.*)$/,"$1")}var f,g="hashchange",h=c,i=a.event.special,j=h.documentMode,k="on"+g in b&&(j===d||j>7);a.fn[g]=function(a){return a?this.bind(g,a):this.trigger(g)},a.fn[g].delay=50,i[g]=a.extend(i[g],{setup:function(){return k?!1:(a(f.start),void 0)},teardown:function(){return k?!1:(a(f.stop),void 0)}}),f=function(){function c(){var d=e(),h=n(j);d!==j?(m(j=d,h),a(b).trigger(g)):h!==j&&(location.href=location.href.replace(/#.*/,"")+h),f=setTimeout(c,a.fn[g].delay)}var f,i={},j=e(),l=function(a){return a},m=l,n=l;return i.start=function(){f||c()},i.stop=function(){f&&clearTimeout(f),f=d},b.attachEvent&&!b.addEventListener&&!k&&function(){var b,d;i.start=function(){b||(d=a.fn[g].src,d=d&&d+e(),b=a('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){d||m(e()),c()}).attr("src",d||"javascript:0").insertAfter("body")[0].contentWindow,h.onpropertychange=function(){try{"title"===event.propertyName&&(b.document.title=h.title)}catch(a){}})},i.stop=l,n=function(){return e(b.location.href)},m=function(c,d){var e=b.document,f=a.fn[g].domain;c!==d&&(e.title=h.title,e.open(),f&&e.write('<script>document.domain="'+f+'"</script>'),e.close(),b.location.hash=c)}}(),i}()}(a,this),function(a){b.matchMedia=b.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(c),a.mobile.media=function(a){return b.matchMedia(a).matches}}(a),function(a){var b={touch:"ontouchend"in c};a.mobile.support=a.mobile.support||{},a.extend(a.support,b),a.extend(a.mobile.support,b)}(a),function(a){a.extend(a.support,{orientation:"orientation"in b&&"onorientationchange"in b})}(a),function(a,d){function e(a){var b=a.charAt(0).toUpperCase()+a.substr(1),c=(a+" "+n.join(b+" ")+b).split(" ");for(var e in c)if(m[c[e]]!==d)return!0}function f(a,b,d){for(var e,f=c.createElement("div"),g=function(a){return a.charAt(0).toUpperCase()+a.substr(1)},h=function(a){return""===a?"":"-"+a.charAt(0).toLowerCase()+a.substr(1)+"-"},i=function(c){var d=h(c)+a+": "+b+";",i=g(c),j=i+(""===i?a:g(a));f.setAttribute("style",d),f.style[j]&&(e=!0)},j=d?d:n,k=0;k<j.length;k++)i(j[k]);return!!e}function g(){var e="transform-3d",f=a.mobile.media("(-"+n.join("-"+e+"),(-")+"-"+e+"),("+e+")");if(f)return!!f;var g=c.createElement("div"),h={MozTransform:"-moz-transform",transform:"transform"};l.append(g);for(var i in h)g.style[i]!==d&&(g.style[i]="translate3d( 100px, 1px, 1px )",f=b.getComputedStyle(g).getPropertyValue(h[i]));return!!f&&"none"!==f}function h(){var b,c,d=location.protocol+"//"+location.host+location.pathname+"ui-dir/",e=a("head base"),f=null,g="";return e.length?g=e.attr("href"):e=f=a("<base>",{href:d}).appendTo("head"),b=a("<a href='testurl' />").prependTo(l),c=b[0].href,e[0].href=g||location.pathname,f&&f.remove(),0===c.indexOf(d)}function i(){var a,d=c.createElement("x"),e=c.documentElement,f=b.getComputedStyle;return"pointerEvents"in d.style?(d.style.pointerEvents="auto",d.style.pointerEvents="x",e.appendChild(d),a=f&&"auto"===f(d,"").pointerEvents,e.removeChild(d),!!a):!1}function j(){var a=c.createElement("div");return"undefined"!=typeof a.getBoundingClientRect}function k(){var a=b,c=navigator.userAgent,d=navigator.platform,e=c.match(/AppleWebKit\/([0-9]+)/),f=!!e&&e[1],g=c.match(/Fennec\/([0-9]+)/),h=!!g&&g[1],i=c.match(/Opera Mobi\/([0-9]+)/),j=!!i&&i[1];return(d.indexOf("iPhone")>-1||d.indexOf("iPad")>-1||d.indexOf("iPod")>-1)&&f&&534>f||a.operamini&&"[object OperaMini]"==={}.toString.call(a.operamini)||i&&7458>j||c.indexOf("Android")>-1&&f&&533>f||h&&6>h||"palmGetResource"in b&&f&&534>f||c.indexOf("MeeGo")>-1&&c.indexOf("NokiaBrowser/8.5.0")>-1?!1:!0}var l=a("<body>").prependTo("html"),m=l[0].style,n=["Webkit","Moz","O"],o="palmGetResource"in b,p=b.opera,q=b.operamini&&"[object OperaMini]"==={}.toString.call(b.operamini),r=b.blackberry&&!e("-webkit-transform");a.extend(a.mobile,{browser:{}}),a.mobile.browser.oldIE=function(){var a=3,b=c.createElement("div"),d=b.all||[];do b.innerHTML="<!--[if gt IE "+ ++a+"]><br><![endif]-->";while(d[0]);return a>4?a:!a}(),a.extend(a.support,{cssTransitions:"WebKitTransitionEvent"in b||f("transition","height 100ms linear",["Webkit","Moz",""])&&!a.mobile.browser.oldIE&&!p,pushState:"pushState"in history&&"replaceState"in history&&!(b.navigator.userAgent.indexOf("Firefox")>=0&&b.top!==b)&&-1===b.navigator.userAgent.search(/CriOS/),mediaquery:a.mobile.media("only all"),cssPseudoElement:!!e("content"),touchOverflow:!!e("overflowScrolling"),cssTransform3d:g(),boxShadow:!!e("boxShadow")&&!r,fixedPosition:k(),scrollTop:("pageXOffset"in b||"scrollTop"in c.documentElement||"scrollTop"in l[0])&&!o&&!q,dynamicBaseTag:h(),cssPointerEvents:i(),boundingRect:j()}),l.remove();var s=function(){var a=b.navigator.userAgent;return a.indexOf("Nokia")>-1&&(a.indexOf("Symbian/3")>-1||a.indexOf("Series60/5")>-1)&&a.indexOf("AppleWebKit")>-1&&a.match(/(BrowserNG|NokiaBrowser)\/7\.[0-3]/)}();a.mobile.gradeA=function(){return(a.support.mediaquery||a.mobile.browser.oldIE&&a.mobile.browser.oldIE>=7)&&(a.support.boundingRect||null!==a.fn.jquery.match(/1\.[0-7+]\.[0-9+]?/))},a.mobile.ajaxBlacklist=b.blackberry&&!b.WebKitPoint||q||s,s&&a(function(){a("head link[rel='stylesheet']").attr("rel","alternate stylesheet").attr("rel","stylesheet")}),a.support.boxShadow||a("html").addClass("ui-mobile-nosupport-boxshadow")}(a),function(a,b){var c,d=a.mobile.window;a.event.special.navigate=c={bound:!1,pushStateEnabled:!0,originalEventName:b,isPushStateEnabled:function(){return a.support.pushState&&a.mobile.pushStateEnabled===!0&&this.isHashChangeEnabled()},isHashChangeEnabled:function(){return a.mobile.hashListeningEnabled===!0},popstate:function(b){var c=new a.Event("navigate"),e=new a.Event("beforenavigate"),f=b.originalEvent.state||{};location.href,d.trigger(e),e.isDefaultPrevented()||(b.historyState&&a.extend(f,b.historyState),c.originalEvent=b,setTimeout(function(){d.trigger(c,{state:f})},0))},hashchange:function(b){var c=new a.Event("navigate"),e=new a.Event("beforenavigate");d.trigger(e),e.isDefaultPrevented()||(c.originalEvent=b,d.trigger(c,{state:b.hashchangeState||{}}))},setup:function(){c.bound||(c.bound=!0,c.isPushStateEnabled()?(c.originalEventName="popstate",d.bind("popstate.navigate",c.popstate)):c.isHashChangeEnabled()&&(c.originalEventName="hashchange",d.bind("hashchange.navigate",c.hashchange)))}}}(a),function(a,c){var d,e,f="&ui-state=dialog";a.mobile.path=d={uiStateKey:"&ui-state",urlParseRE:/^\s*(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,getLocation:function(a){var b=a?this.parseUrl(a):location,c=this.parseUrl(a||location.href).hash;return c="#"===c?"":c,b.protocol+"//"+b.host+b.pathname+b.search+c},parseLocation:function(){return this.parseUrl(this.getLocation())},parseUrl:function(b){if("object"===a.type(b))return b;var c=d.urlParseRE.exec(b||"")||[];return{href:c[0]||"",hrefNoHash:c[1]||"",hrefNoSearch:c[2]||"",domain:c[3]||"",protocol:c[4]||"",doubleSlash:c[5]||"",authority:c[6]||"",username:c[8]||"",password:c[9]||"",host:c[10]||"",hostname:c[11]||"",port:c[12]||"",pathname:c[13]||"",directory:c[14]||"",filename:c[15]||"",search:c[16]||"",hash:c[17]||""}},makePathAbsolute:function(a,b){if(a&&"/"===a.charAt(0))return a;a=a||"",b=b?b.replace(/^\/|(\/[^\/]*|[^\/]+)$/g,""):"";for(var c=b?b.split("/"):[],d=a.split("/"),e=0;e<d.length;e++){var f=d[e];switch(f){case".":break;case"..":c.length&&c.pop();break;default:c.push(f)}}return"/"+c.join("/")},isSameDomain:function(a,b){return d.parseUrl(a).domain===d.parseUrl(b).domain},isRelativeUrl:function(a){return""===d.parseUrl(a).protocol},isAbsoluteUrl:function(a){return""!==d.parseUrl(a).protocol},makeUrlAbsolute:function(a,b){if(!d.isRelativeUrl(a))return a;b===c&&(b=this.documentBase);var e=d.parseUrl(a),f=d.parseUrl(b),g=e.protocol||f.protocol,h=e.protocol?e.doubleSlash:e.doubleSlash||f.doubleSlash,i=e.authority||f.authority,j=""!==e.pathname,k=d.makePathAbsolute(e.pathname||f.filename,f.pathname),l=e.search||!j&&f.search||"",m=e.hash;return g+h+i+k+l+m},addSearchParams:function(b,c){var e=d.parseUrl(b),f="object"==typeof c?a.param(c):c,g=e.search||"?";return e.hrefNoSearch+g+("?"!==g.charAt(g.length-1)?"&":"")+f+(e.hash||"")},convertUrlToDataUrl:function(a){var c=d.parseUrl(a);return d.isEmbeddedPage(c)?c.hash.split(f)[0].replace(/^#/,"").replace(/\?.*$/,""):d.isSameDomain(c,this.documentBase)?c.hrefNoHash.replace(this.documentBase.domain,"").split(f)[0]:b.decodeURIComponent(a)},get:function(a){return a===c&&(a=d.parseLocation().hash),d.stripHash(a).replace(/[^\/]*\.[^\/*]+$/,"")},set:function(a){location.hash=a},isPath:function(a){return/\//.test(a)},clean:function(a){return a.replace(this.documentBase.domain,"")},stripHash:function(a){return a.replace(/^#/,"")},stripQueryParams:function(a){return a.replace(/\?.*$/,"")},cleanHash:function(a){return d.stripHash(a.replace(/\?.*$/,"").replace(f,""))},isHashValid:function(a){return/^#[^#]+$/.test(a)},isExternal:function(a){var b=d.parseUrl(a);return b.protocol&&b.domain!==this.documentUrl.domain?!0:!1},hasProtocol:function(a){return/^(:?\w+:)/.test(a)},isEmbeddedPage:function(a){var b=d.parseUrl(a);return""!==b.protocol?!this.isPath(b.hash)&&b.hash&&(b.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&b.hrefNoHash===this.documentBase.hrefNoHash):/^#/.test(b.href)},squash:function(a,b){var c,e,f,g,h=this.isPath(a),i=this.parseUrl(a),j=i.hash,k="";return b=b||(d.isPath(a)?d.getLocation():d.getDocumentUrl()),e=h?d.stripHash(a):a,e=d.isPath(i.hash)?d.stripHash(i.hash):e,g=e.indexOf(this.uiStateKey),g>-1&&(k=e.slice(g),e=e.slice(0,g)),c=d.makeUrlAbsolute(e,b),f=this.parseUrl(c).search,h?((d.isPath(j)||0===j.replace("#","").indexOf(this.uiStateKey))&&(j=""),k&&-1===j.indexOf(this.uiStateKey)&&(j+=k),-1===j.indexOf("#")&&""!==j&&(j="#"+j),c=d.parseUrl(c),c=c.protocol+"//"+c.host+c.pathname+f+j):c+=c.indexOf("#")>-1?k:"#"+k,c},isPreservableHash:function(a){return 0===a.replace("#","").indexOf(this.uiStateKey)}},d.documentUrl=d.parseLocation(),e=a("head").find("base"),d.documentBase=e.length?d.parseUrl(d.makeUrlAbsolute(e.attr("href"),d.documentUrl.href)):d.documentUrl,d.documentBaseDiffers=d.documentUrl.hrefNoHash!==d.documentBase.hrefNoHash,d.getDocumentUrl=function(b){return b?a.extend({},d.documentUrl):d.documentUrl.href},d.getDocumentBase=function(b){return b?a.extend({},d.documentBase):d.documentBase.href}}(a),function(a,b){a.mobile.path,a.mobile.History=function(a,b){this.stack=a||[],this.activeIndex=b||0},a.extend(a.mobile.History.prototype,{getActive:function(){return this.stack[this.activeIndex]},getLast:function(){return this.stack[this.previousIndex]},getNext:function(){return this.stack[this.activeIndex+1]},getPrev:function(){return this.stack[this.activeIndex-1]},add:function(a,b){b=b||{},this.getNext()&&this.clearForward(),b.hash&&-1===b.hash.indexOf("#")&&(b.hash="#"+b.hash),b.url=a,this.stack.push(b),this.activeIndex=this.stack.length-1},clearForward:function(){this.stack=this.stack.slice(0,this.activeIndex+1)},find:function(a,b,c){b=b||this.stack;var d,e,f,g=b.length;for(e=0;g>e;e++)if(d=b[e],(decodeURIComponent(a)===decodeURIComponent(d.url)||decodeURIComponent(a)===decodeURIComponent(d.hash))&&(f=e,c))return f;return f},closest:function(a){var c,d=this.activeIndex;return c=this.find(a,this.stack.slice(0,d)),c===b&&(c=this.find(a,this.stack.slice(d),!0),c=c===b?c:c+d),c},direct:function(c){var d=this.closest(c.url),e=this.activeIndex;d!==b&&(this.activeIndex=d,this.previousIndex=e),e>d?(c.present||c.back||a.noop)(this.getActive(),"back"):d>e?(c.present||c.forward||a.noop)(this.getActive(),"forward"):d===b&&c.missing&&c.missing(this.getActive())}})}(a),function(a){var d=a.mobile.path,e=location.href;a.mobile.Navigator=function(b){this.history=b,this.ignoreInitialHashChange=!0,a.mobile.window.bind({"popstate.history":a.proxy(this.popstate,this),"hashchange.history":a.proxy(this.hashchange,this)})},a.extend(a.mobile.Navigator.prototype,{squash:function(e,f){var g,h,i=d.isPath(e)?d.stripHash(e):e;return h=d.squash(e),g=a.extend({hash:i,url:h},f),b.history.replaceState(g,g.title||c.title,h),g},hash:function(a,b){var c,e,f;if(c=d.parseUrl(a),e=d.parseLocation(),e.pathname+e.search===c.pathname+c.search)f=c.hash?c.hash:c.pathname+c.search;else if(d.isPath(a)){var g=d.parseUrl(b);f=g.pathname+g.search+(d.isPreservableHash(g.hash)?g.hash.replace("#",""):"")}else f=a;return f},go:function(e,f,g){var h,i,j,k,l=a.event.special.navigate.isPushStateEnabled();i=d.squash(e),j=this.hash(e,i),g&&j!==d.stripHash(d.parseLocation().hash)&&(this.preventNextHashChange=g),this.preventHashAssignPopState=!0,b.location.hash=j,this.preventHashAssignPopState=!1,h=a.extend({url:i,hash:j,title:c.title},f),l&&(k=new a.Event("popstate"),k.originalEvent={type:"popstate",state:null},this.squash(e,h),g||(this.ignorePopState=!0,a.mobile.window.trigger(k))),this.history.add(h.url,h)},popstate:function(b){var c,f;if(a.event.special.navigate.isPushStateEnabled())return this.preventHashAssignPopState?(this.preventHashAssignPopState=!1,b.stopImmediatePropagation(),void 0):this.ignorePopState?(this.ignorePopState=!1,void 0):!b.originalEvent.state&&1===this.history.stack.length&&this.ignoreInitialHashChange&&(this.ignoreInitialHashChange=!1,location.href===e)?(b.preventDefault(),void 0):(c=d.parseLocation().hash,!b.originalEvent.state&&c?(f=this.squash(c),this.history.add(f.url,f),b.historyState=f,void 0):(this.history.direct({url:(b.originalEvent.state||{}).url||c,present:function(c,d){b.historyState=a.extend({},c),b.historyState.direction=d}}),void 0))},hashchange:function(b){var e,f;if(a.event.special.navigate.isHashChangeEnabled()&&!a.event.special.navigate.isPushStateEnabled()){if(this.preventNextHashChange)return this.preventNextHashChange=!1,b.stopImmediatePropagation(),void 0;e=this.history,f=d.parseLocation().hash,this.history.direct({url:f,present:function(c,d){b.hashchangeState=a.extend({},c),b.hashchangeState.direction=d},missing:function(){e.add(f,{hash:f,title:c.title})}})}}})}(a),function(a){a.mobile.navigate=function(b,c,d){a.mobile.navigate.navigator.go(b,c,d)},a.mobile.navigate.history=new a.mobile.History,a.mobile.navigate.navigator=new a.mobile.Navigator(a.mobile.navigate.history);var b=a.mobile.path.parseLocation();a.mobile.navigate.history.add(b.href,{hash:b.hash})}(a),function(a,b,c,d){function e(a){for(;a&&"undefined"!=typeof a.originalEvent;)a=a.originalEvent;return a}function f(b,c){var f,g,h,i,j,k,l,m,n,o=b.type;if(b=a.Event(b),b.type=c,f=b.originalEvent,g=a.event.props,o.search(/^(mouse|click)/)>-1&&(g=D),f)for(l=g.length,i;l;)i=g[--l],b[i]=f[i];if(o.search(/mouse(down|up)|click/)>-1&&!b.which&&(b.which=1),-1!==o.search(/^touch/)&&(h=e(f),o=h.touches,j=h.changedTouches,k=o&&o.length?o[0]:j&&j.length?j[0]:d))for(m=0,n=B.length;n>m;m++)i=B[m],b[i]=k[i];return b}function g(b){for(var c,d,e={};b;){c=a.data(b,y);for(d in c)c[d]&&(e[d]=e.hasVirtualBinding=!0);b=b.parentNode}return e}function h(b,c){for(var d;b;){if(d=a.data(b,y),d&&(!c||d[c]))return b;b=b.parentNode}return null}function i(){L=!1}function j(){L=!0}function k(){P=0,J.length=0,K=!1,j()}function l(){i()}function m(){n(),F=setTimeout(function(){F=0,k()},a.vmouse.resetTimerDuration)}function n(){F&&(clearTimeout(F),F=0)}function o(b,c,d){var e;return(d&&d[b]||!d&&h(c.target,b))&&(e=f(c,b),a(c.target).trigger(e)),e}function p(b){var c=a.data(b.target,z);if(!(K||P&&P===c)){var d=o("v"+b.type,b);d&&(d.isDefaultPrevented()&&b.preventDefault(),d.isPropagationStopped()&&b.stopPropagation(),d.isImmediatePropagationStopped()&&b.stopImmediatePropagation())}}function q(b){var c,d,f=e(b).touches;if(f&&1===f.length&&(c=b.target,d=g(c),d.hasVirtualBinding)){P=O++,a.data(c,z,P),n(),l(),I=!1;var h=e(b).touches[0];G=h.pageX,H=h.pageY,o("vmouseover",b,d),o("vmousedown",b,d)}}function r(a){L||(I||o("vmousecancel",a,g(a.target)),I=!0,m())}function s(b){if(!L){var c=e(b).touches[0],d=I,f=a.vmouse.moveDistanceThreshold,h=g(b.target);I=I||Math.abs(c.pageX-G)>f||Math.abs(c.pageY-H)>f,I&&!d&&o("vmousecancel",b,h),o("vmousemove",b,h),m()}}function t(a){if(!L){j();var b,c=g(a.target);if(o("vmouseup",a,c),!I){var d=o("vclick",a,c);d&&d.isDefaultPrevented()&&(b=e(a).changedTouches[0],J.push({touchID:P,x:b.clientX,y:b.clientY}),K=!0)}o("vmouseout",a,c),I=!1,m()}}function u(b){var c,d=a.data(b,y);if(d)for(c in d)if(d[c])return!0;return!1}function v(){}function w(b){var c=b.substr(1);return{setup:function(){u(this)||a.data(this,y,{});var d=a.data(this,y);d[b]=!0,E[b]=(E[b]||0)+1,1===E[b]&&N.bind(c,p),a(this).bind(c,v),M&&(E.touchstart=(E.touchstart||0)+1,1===E.touchstart&&N.bind("touchstart",q).bind("touchend",t).bind("touchmove",s).bind("scroll",r))},teardown:function(){--E[b],E[b]||N.unbind(c,p),M&&(--E.touchstart,E.touchstart||N.unbind("touchstart",q).unbind("touchmove",s).unbind("touchend",t).unbind("scroll",r));var d=a(this),e=a.data(this,y);e&&(e[b]=!1),d.unbind(c,v),u(this)||d.removeData(y)}}}var x,y="virtualMouseBindings",z="virtualTouchID",A="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),B="clientX clientY pageX pageY screenX screenY".split(" "),C=a.event.mouseHooks?a.event.mouseHooks.props:[],D=a.event.props.concat(C),E={},F=0,G=0,H=0,I=!1,J=[],K=!1,L=!1,M="addEventListener"in c,N=a(c),O=1,P=0;a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500};for(var Q=0;Q<A.length;Q++)a.event.special[A[Q]]=w(A[Q]);M&&c.addEventListener("click",function(b){var c,d,e,f,g,h,i=J.length,j=b.target;if(i)for(c=b.clientX,d=b.clientY,x=a.vmouse.clickDistanceThreshold,e=j;e;){for(f=0;i>f;f++)if(g=J[f],h=0,e===j&&Math.abs(g.x-c)<x&&Math.abs(g.y-d)<x||a.data(e,z)===g.touchID)return b.preventDefault(),b.stopPropagation(),void 0;e=e.parentNode}},!0)}(a,b,c),function(a,b,d){function e(b,c,d){var e=d.type;d.type=c,a.event.dispatch.call(b,d),d.type=e}var f=a(c);a.each("touchstart touchmove touchend tap taphold swipe swipeleft swiperight scrollstart scrollstop".split(" "),function(b,c){a.fn[c]=function(a){return a?this.bind(c,a):this.trigger(c)},a.attrFn&&(a.attrFn[c]=!0)});var g=a.mobile.support.touch,h="touchmove scroll",i=g?"touchstart":"mousedown",j=g?"touchend":"mouseup",k=g?"touchmove":"mousemove";a.event.special.scrollstart={enabled:!0,setup:function(){function b(a,b){c=b,e(f,c?"scrollstart":"scrollstop",a)}var c,d,f=this,g=a(f);g.bind(h,function(e){a.event.special.scrollstart.enabled&&(c||b(e,!0),clearTimeout(d),d=setTimeout(function(){b(e,!1)},50))})}},a.event.special.tap={tapholdThreshold:750,setup:function(){var b=this,c=a(b);c.bind("vmousedown",function(d){function g(){clearTimeout(j)}function h(){g(),c.unbind("vclick",i).unbind("vmouseup",g),f.unbind("vmousecancel",h)}function i(a){h(),k===a.target&&e(b,"tap",a)
-}if(d.which&&1!==d.which)return!1;var j,k=d.target;d.originalEvent,c.bind("vmouseup",g).bind("vclick",i),f.bind("vmousecancel",h),j=setTimeout(function(){e(b,"taphold",a.Event("taphold",{target:k}))},a.event.special.tap.tapholdThreshold)})}},a.event.special.swipe={scrollSupressionThreshold:30,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:75,start:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b;return{time:(new Date).getTime(),coords:[c.pageX,c.pageY],origin:a(b.target)}},stop:function(a){var b=a.originalEvent.touches?a.originalEvent.touches[0]:a;return{time:(new Date).getTime(),coords:[b.pageX,b.pageY]}},handleSwipe:function(b,c){c.time-b.time<a.event.special.swipe.durationThreshold&&Math.abs(b.coords[0]-c.coords[0])>a.event.special.swipe.horizontalDistanceThreshold&&Math.abs(b.coords[1]-c.coords[1])<a.event.special.swipe.verticalDistanceThreshold&&b.origin.trigger("swipe").trigger(b.coords[0]>c.coords[0]?"swipeleft":"swiperight")},setup:function(){var b=this,c=a(b);c.bind(i,function(b){function e(b){g&&(f=a.event.special.swipe.stop(b),Math.abs(g.coords[0]-f.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault())}var f,g=a.event.special.swipe.start(b);c.bind(k,e).one(j,function(){c.unbind(k,e),g&&f&&a.event.special.swipe.handleSwipe(g,f),g=f=d})})}},a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe",swiperight:"swipe"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)}}})}(a,this),function(a){a.event.special.throttledresize={setup:function(){a(this).bind("resize",f)},teardown:function(){a(this).unbind("resize",f)}};var b,c,d,e=250,f=function(){c=(new Date).getTime(),d=c-g,d>=e?(g=c,a(this).trigger("throttledresize")):(b&&clearTimeout(b),b=setTimeout(f,e-d))},g=0}(a),function(a,b){function d(){var a=e();a!==f&&(f=a,i.trigger(j))}var e,f,g,h,i=a(b),j="orientationchange",k={0:!0,180:!0};if(a.support.orientation){var l=b.innerWidth||i.width(),m=b.innerHeight||i.height(),n=50;g=l>m&&l-m>n,h=k[b.orientation],(g&&h||!g&&!h)&&(k={"-90":!0,90:!0})}a.event.special.orientationchange=a.extend({},a.event.special.orientationchange,{setup:function(){return a.support.orientation&&!a.event.special.orientationchange.disabled?!1:(f=e(),i.bind("throttledresize",d),void 0)},teardown:function(){return a.support.orientation&&!a.event.special.orientationchange.disabled?!1:(i.unbind("throttledresize",d),void 0)},add:function(a){var b=a.handler;a.handler=function(a){return a.orientation=e(),b.apply(this,arguments)}}}),a.event.special.orientationchange.orientation=e=function(){var d=!0,e=c.documentElement;return d=a.support.orientation?k[b.orientation]:e&&e.clientWidth/e.clientHeight<1.1,d?"portrait":"landscape"},a.fn[j]=function(a){return a?this.bind(j,a):this.trigger(j)},a.attrFn&&(a.attrFn[j]=!0)}(a,this),function(a){a.widget("mobile.page",a.mobile.widget,{options:{theme:"c",domCache:!1,keepNativeDefault:":jqmData(role='none'), :jqmData(role='nojs')"},_create:function(){return this._trigger("beforecreate")===!1?!1:(this.element.attr("tabindex","0").addClass("ui-page ui-body-"+this.options.theme),this._on(this.element,{pagebeforehide:"removeContainerBackground",pagebeforeshow:"_handlePageBeforeShow"}),void 0)},_handlePageBeforeShow:function(){this.setContainerBackground()},removeContainerBackground:function(){a.mobile.pageContainer.removeClass("ui-overlay-"+a.mobile.getInheritedTheme(this.element.parent()))},setContainerBackground:function(b){this.options.theme&&a.mobile.pageContainer.addClass("ui-overlay-"+(b||this.options.theme))},keepNativeSelector:function(){var b=this.options,c=b.keepNative&&a.trim(b.keepNative);return c&&b.keepNative!==b.keepNativeDefault?[b.keepNative,b.keepNativeDefault].join(", "):b.keepNativeDefault}})}(a),function(a,b,c){var d=function(d){return d===c&&(d=!0),function(c,e,f,g){var h=new a.Deferred,i=e?" reverse":"",j=a.mobile.urlHistory.getActive(),k=j.lastScroll||a.mobile.defaultHomeScroll,l=a.mobile.getScreenHeight(),m=a.mobile.maxTransitionWidth!==!1&&a.mobile.window.width()>a.mobile.maxTransitionWidth,n=!a.support.cssTransitions||m||!c||"none"===c||Math.max(a.mobile.window.scrollTop(),k)>a.mobile.getMaxScrollForTransition(),o=" ui-page-pre-in",p=function(){a.mobile.pageContainer.toggleClass("ui-mobile-viewport-transitioning viewport-"+c)},q=function(){a.event.special.scrollstart.enabled=!1,b.scrollTo(0,k),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},r=function(){g.removeClass(a.mobile.activePageClass+" out in reverse "+c).height("")},s=function(){d?g.animationComplete(t):t(),g.height(l+a.mobile.window.scrollTop()).addClass(c+" out"+i)},t=function(){g&&d&&r(),u()},u=function(){f.css("z-index",-10),f.addClass(a.mobile.activePageClass+o),a.mobile.focusPage(f),f.height(l+k),q(),f.css("z-index",""),n||f.animationComplete(v),f.removeClass(o).addClass(c+" in"+i),n&&v()},v=function(){d||g&&r(),f.removeClass("out in reverse "+c).height(""),p(),a.mobile.window.scrollTop()!==k&&q(),h.resolve(c,e,f,g,!0)};return p(),g&&!n?s():t(),h.promise()}},e=d(),f=d(!1),g=function(){return 3*a.mobile.getScreenHeight()};a.mobile.defaultTransitionHandler=e,a.mobile.transitionHandlers={"default":a.mobile.defaultTransitionHandler,sequential:e,simultaneous:f},a.mobile.transitionFallbacks={},a.mobile._maybeDegradeTransition=function(b){return b&&!a.support.cssTransform3d&&a.mobile.transitionFallbacks[b]&&(b=a.mobile.transitionFallbacks[b]),b},a.mobile.getMaxScrollForTransition=a.mobile.getMaxScrollForTransition||g}(a,this),function(a,d){function e(b){!p||p.closest("."+a.mobile.activePageClass).length&&!b||p.removeClass(a.mobile.activeBtnClass),p=null}function f(){t=!1,s.length>0&&a.mobile.changePage.apply(null,s.pop())}function g(b,c,d,e){c&&c.data("mobile-page")._trigger("beforehide",null,{nextPage:b}),b.data("mobile-page")._trigger("beforeshow",null,{prevPage:c||a("")}),a.mobile.hidePageLoadingMsg(),d=a.mobile._maybeDegradeTransition(d);var f=a.mobile.transitionHandlers[d||"default"]||a.mobile.defaultTransitionHandler,g=f(d,e,b,c);return g.done(function(){c&&c.data("mobile-page")._trigger("hide",null,{nextPage:b}),b.data("mobile-page")._trigger("show",null,{prevPage:c||a("")})}),g}function h(b,c){c&&b.attr("data-"+a.mobile.ns+"role",c),b.page()}function i(){var b=a.mobile.activePage&&k(a.mobile.activePage);return b||x.hrefNoHash}function j(a){for(;a&&("string"!=typeof a.nodeName||"a"!==a.nodeName.toLowerCase());)a=a.parentNode;return a}function k(b){var c=a(b).closest(".ui-page").jqmData("url"),d=x.hrefNoHash;return c&&n.isPath(c)||(c=d),n.makeUrlAbsolute(c,d)}var l=a.mobile.window,m=(a("html"),a("head")),n=a.extend(a.mobile.path,{getFilePath:function(b){var c="&"+a.mobile.subPageUrlKey;return b&&b.split(c)[0].split(u)[0]},isFirstPageUrl:function(b){var c=n.parseUrl(n.makeUrlAbsolute(b,this.documentBase)),e=c.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&c.hrefNoHash===this.documentBase.hrefNoHash,f=a.mobile.firstPage,g=f&&f[0]?f[0].id:d;return e&&(!c.hash||"#"===c.hash||g&&c.hash.replace(/^#/,"")===g)},isPermittedCrossDomainRequest:function(b,c){return a.mobile.allowCrossDomainPages&&"file:"===b.protocol&&-1!==c.search(/^https?:/)}}),o=null,p=null,q=a.Deferred(),r=a.mobile.navigate.history,s=[],t=!1,u="&ui-state=dialog",v=m.children("base"),w=n.documentUrl,x=n.documentBase,y=(n.documentBaseDiffers,a.mobile.getScreenHeight),z=a.support.dynamicBaseTag?{element:v.length?v:a("<base>",{href:x.hrefNoHash}).prependTo(m),set:function(a){a=n.parseUrl(a).hrefNoHash,z.element.attr("href",n.makeUrlAbsolute(a,x))},reset:function(){z.element.attr("href",x.hrefNoSearch)}}:d;a.mobile.getDocumentUrl=n.getDocumentUrl,a.mobile.getDocumentBase=n.getDocumentBase,a.mobile.back=function(){var a=b.navigator;this.phonegapNavigationEnabled&&a&&a.app&&a.app.backHistory?a.app.backHistory():b.history.back()},a.mobile.focusPage=function(a){var b=a.find("[autofocus]"),c=a.find(".ui-title:eq(0)");return b.length?(b.focus(),void 0):(c.length?c.focus():a.focus(),void 0)};var A,B,C=!0;A=function(){if(C){var b=a.mobile.urlHistory.getActive();if(b){var c=l.scrollTop();b.lastScroll=c<a.mobile.minScrollBack?a.mobile.defaultHomeScroll:c}}},B=function(){setTimeout(A,100)},l.bind(a.support.pushState?"popstate":"hashchange",function(){C=!1}),l.one(a.support.pushState?"popstate":"hashchange",function(){C=!0}),l.one("pagecontainercreate",function(){a.mobile.pageContainer.bind("pagechange",function(){C=!0,l.unbind("scrollstop",B),l.bind("scrollstop",B)})}),l.bind("scrollstop",B),a.mobile._maybeDegradeTransition=a.mobile._maybeDegradeTransition||function(a){return a},a.mobile.resetActivePageHeight=function(b){var c=a("."+a.mobile.activePageClass),d=parseFloat(c.css("padding-top")),e=parseFloat(c.css("padding-bottom")),f=parseFloat(c.css("border-top-width")),g=parseFloat(c.css("border-bottom-width"));b="number"==typeof b?b:y(),c.css("min-height",b-d-e-f-g)},a.fn.animationComplete=function(b){return a.support.cssTransitions?a(this).one("webkitAnimationEnd animationend",b):(setTimeout(b,0),a(this))},a.mobile.path=n,a.mobile.base=z,a.mobile.urlHistory=r,a.mobile.dialogHashKey=u,a.mobile.allowCrossDomainPages=!1,a.mobile._bindPageRemove=function(){var b=a(this);!b.data("mobile-page").options.domCache&&b.is(":jqmData(external-page='true')")&&b.bind("pagehide.remove",function(){var b=a(this),c=new a.Event("pageremove");b.trigger(c),c.isDefaultPrevented()||b.removeWithDependents()})},a.mobile.loadPage=function(b,c){var e=a.Deferred(),f=a.extend({},a.mobile.loadPage.defaults,c),g=null,j=null,k=n.makeUrlAbsolute(b,i());f.data&&"get"===f.type&&(k=n.addSearchParams(k,f.data),f.data=d),f.data&&"post"===f.type&&(f.reloadPage=!0);var l=n.getFilePath(k),m=n.convertUrlToDataUrl(k);if(f.pageContainer=f.pageContainer||a.mobile.pageContainer,g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+m+"']"),0===g.length&&m&&!n.isPath(m)&&(g=f.pageContainer.children("#"+m).attr("data-"+a.mobile.ns+"url",m).jqmData("url",m)),0===g.length)if(a.mobile.firstPage&&n.isFirstPageUrl(l))a.mobile.firstPage.parent().length&&(g=a(a.mobile.firstPage));else if(n.isEmbeddedPage(l))return e.reject(k,c),e.promise();if(g.length){if(!f.reloadPage)return h(g,f.role),e.resolve(k,c,g),z&&!c.prefetch&&z.set(b),e.promise();j=g}var o=f.pageContainer,p=new a.Event("pagebeforeload"),q={url:b,absUrl:k,dataUrl:m,deferred:e,options:f};if(o.trigger(p,q),p.isDefaultPrevented())return e.promise();if(f.showLoadMsg)var r=setTimeout(function(){a.mobile.showPageLoadingMsg()},f.loadMsgDelay),s=function(){clearTimeout(r),a.mobile.hidePageLoadingMsg()};return!z||"undefined"!=typeof c&&"undefined"!=typeof c.prefetch||z.reset(),a.mobile.allowCrossDomainPages||n.isSameDomain(w,k)?a.ajax({url:l,type:f.type,data:f.data,contentType:f.contentType,dataType:"html",success:function(d,i,o){var p=a("<div></div>"),r=d.match(/<title[^>]*>([^<]*)/)&&RegExp.$1,t=new RegExp("(<[^>]+\\bdata-"+a.mobile.ns+"role=[\"']?page[\"']?[^>]*>)"),u=new RegExp("\\bdata-"+a.mobile.ns+"url=[\"']?([^\"'>]*)[\"']?");if(t.test(d)&&RegExp.$1&&u.test(RegExp.$1)&&RegExp.$1&&(b=l=n.getFilePath(a("<div>"+RegExp.$1+"</div>").text())),!z||"undefined"!=typeof c&&"undefined"!=typeof c.prefetch||z.set(l),p.get(0).innerHTML=d,g=p.find(":jqmData(role='page'), :jqmData(role='dialog')").first(),g.length||(g=a("<div data-"+a.mobile.ns+"role='page'>"+(d.split(/<\/?body[^>]*>/gim)[1]||"")+"</div>")),r&&!g.jqmData("title")&&(~r.indexOf("&")&&(r=a("<div>"+r+"</div>").text()),g.jqmData("title",r)),!a.support.dynamicBaseTag){var v=n.get(l);g.find("[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]").each(function(){var b=a(this).is("[href]")?"href":a(this).is("[src]")?"src":"action",c=a(this).attr(b);c=c.replace(location.protocol+"//"+location.host+location.pathname,""),/^(\w+:|#|\/)/.test(c)||a(this).attr(b,v+c)})}g.attr("data-"+a.mobile.ns+"url",n.convertUrlToDataUrl(l)).attr("data-"+a.mobile.ns+"external-page",!0).appendTo(f.pageContainer),g.one("pagecreate",a.mobile._bindPageRemove),h(g,f.role),k.indexOf("&"+a.mobile.subPageUrlKey)>-1&&(g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+m+"']")),f.showLoadMsg&&s(),q.xhr=o,q.textStatus=i,q.page=g,f.pageContainer.trigger("pageload",q),e.resolve(k,c,g,j)},error:function(b,d,g){z&&z.set(n.get()),q.xhr=b,q.textStatus=d,q.errorThrown=g;var h=new a.Event("pageloadfailed");f.pageContainer.trigger(h,q),h.isDefaultPrevented()||(f.showLoadMsg&&(s(),a.mobile.showPageLoadingMsg(a.mobile.pageLoadErrorMessageTheme,a.mobile.pageLoadErrorMessage,!0),setTimeout(a.mobile.hidePageLoadingMsg,1500)),e.reject(k,c))}}):e.reject(k,c),e.promise()},a.mobile.loadPage.defaults={type:"get",data:d,reloadPage:!1,role:d,showLoadMsg:!1,pageContainer:d,loadMsgDelay:50},a.mobile.changePage=function(b,j){if(t)return s.unshift(arguments),void 0;var k,l=a.extend({},a.mobile.changePage.defaults,j);l.pageContainer=l.pageContainer||a.mobile.pageContainer,l.fromPage=l.fromPage||a.mobile.activePage,k="string"==typeof b;var m=l.pageContainer,o=new a.Event("pagebeforechange"),p={toPage:b,options:l};if(p.absUrl=k?n.makeUrlAbsolute(b,i()):b.data("absUrl"),m.trigger(o,p),!o.isDefaultPrevented()){if(b=p.toPage,k="string"==typeof b,t=!0,k)return l.target=b,a.mobile.loadPage(b,l).done(function(b,c,d,e){t=!1,c.duplicateCachedPage=e,d.data("absUrl",p.absUrl),a.mobile.changePage(d,c)}).fail(function(){e(!0),f(),l.pageContainer.trigger("pagechangefailed",p)}),void 0;b[0]!==a.mobile.firstPage[0]||l.dataUrl||(l.dataUrl=w.hrefNoHash);var q=l.fromPage,v=l.dataUrl&&n.convertUrlToDataUrl(l.dataUrl)||b.jqmData("url"),x=v,y=(n.getFilePath(v),r.getActive()),z=0===r.activeIndex,A=0,B=c.title,C="dialog"===l.role||"dialog"===b.jqmData("role");if(q&&q[0]===b[0]&&!l.allowSamePageTransition)return t=!1,m.trigger("pagechange",p),l.fromHashChange&&r.direct({url:v}),void 0;h(b,l.role),l.fromHashChange&&(A="back"===j.direction?-1:1);try{c.activeElement&&"body"!==c.activeElement.nodeName.toLowerCase()?a(c.activeElement).blur():a("input:focus, textarea:focus, select:focus").blur()}catch(D){}var E=!1;C&&y&&(y.url&&y.url.indexOf(u)>-1&&a.mobile.activePage&&!a.mobile.activePage.is(".ui-dialog")&&r.activeIndex>0&&(l.changeHash=!1,E=!0),v=y.url||"",v+=!E&&v.indexOf("#")>-1?u:"#"+u,0===r.activeIndex&&v===r.initialDst&&(v+=u));var F=y?b.jqmData("title")||b.children(":jqmData(role='header')").find(".ui-title").text():B;if(F&&B===c.title&&(B=F),b.jqmData("title")||b.jqmData("title",B),l.transition=l.transition||(A&&!z?y.transition:d)||(C?a.mobile.defaultDialogTransition:a.mobile.defaultPageTransition),!A&&E&&(r.getActive().pageUrl=x),v&&!l.fromHashChange){var G;!n.isPath(v)&&v.indexOf("#")<0&&(v="#"+v),G={transition:l.transition,title:B,pageUrl:x,role:l.role},l.changeHash!==!1&&a.mobile.hashListeningEnabled?a.mobile.navigate(v,G,!0):b[0]!==a.mobile.firstPage[0]&&a.mobile.navigate.history.add(v,G)}c.title=B,a.mobile.activePage=b,l.reverse=l.reverse||0>A,g(b,q,l.transition,l.reverse).done(function(c,d,g,h,i){e(),l.duplicateCachedPage&&l.duplicateCachedPage.remove(),i||a.mobile.focusPage(b),f(),m.trigger("pagechange",p)})}},a.mobile.changePage.defaults={transition:d,reverse:!1,changeHash:!0,fromHashChange:!1,role:d,duplicateCachedPage:d,pageContainer:d,showLoadMsg:!0,dataUrl:d,fromPage:d,allowSamePageTransition:!1},a.mobile.navreadyDeferred=a.Deferred(),a.mobile._registerInternalEvents=function(){var c=function(b,c){var d,e,f,g,h=!0;return!a.mobile.ajaxEnabled||b.is(":jqmData(ajax='false')")||!b.jqmHijackable().length||b.attr("target")?!1:(d=b.attr("action"),g=(b.attr("method")||"get").toLowerCase(),d||(d=k(b),"get"===g&&(d=n.parseUrl(d).hrefNoSearch),d===x.hrefNoHash&&(d=w.hrefNoSearch)),d=n.makeUrlAbsolute(d,k(b)),n.isExternal(d)&&!n.isPermittedCrossDomainRequest(w,d)?!1:(c||(e=b.serializeArray(),o&&o[0].form===b[0]&&(f=o.attr("name"),f&&(a.each(e,function(a,b){return b.name===f?(f="",!1):void 0}),f&&e.push({name:f,value:o.attr("value")}))),h={url:d,options:{type:g,data:a.param(e),transition:b.jqmData("transition"),reverse:"reverse"===b.jqmData("direction"),reloadPage:!0}}),h))};a.mobile.document.delegate("form","submit",function(b){var d=c(a(this));d&&(a.mobile.changePage(d.url,d.options),b.preventDefault())}),a.mobile.document.bind("vclick",function(b){var d,f,g=b.target,h=!1;if(!(b.which>1)&&a.mobile.linkBindingEnabled){if(o=a(g),a.data(g,"mobile-button")){if(!c(a(g).closest("form"),!0))return;g.parentNode&&(g=g.parentNode)}else{if(g=j(g),!g||"#"===n.parseUrl(g.getAttribute("href")||"#").hash)return;if(!a(g).jqmHijackable().length)return}~g.className.indexOf("ui-link-inherit")?g.parentNode&&(f=a.data(g.parentNode,"buttonElements")):f=a.data(g,"buttonElements"),f?g=f.outer:h=!0,d=a(g),h&&(d=d.closest(".ui-btn")),d.length>0&&!d.hasClass("ui-disabled")&&(e(!0),p=d,p.addClass(a.mobile.activeBtnClass))}}),a.mobile.document.bind("click",function(c){if(a.mobile.linkBindingEnabled&&!c.isDefaultPrevented()){var f,g=j(c.target),h=a(g);if(g&&!(c.which>1)&&h.jqmHijackable().length){if(f=function(){b.setTimeout(function(){e(!0)},200)},h.is(":jqmData(rel='back')"))return a.mobile.back(),!1;var i=k(h),l=n.makeUrlAbsolute(h.attr("href")||"#",i);if(!a.mobile.ajaxEnabled&&!n.isEmbeddedPage(l))return f(),void 0;if(-1!==l.search("#")){if(l=l.replace(/[^#]*#/,""),!l)return c.preventDefault(),void 0;l=n.isPath(l)?n.makeUrlAbsolute(l,i):n.makeUrlAbsolute("#"+l,w.hrefNoHash)}var m=h.is("[rel='external']")||h.is(":jqmData(ajax='false')")||h.is("[target]"),o=m||n.isExternal(l)&&!n.isPermittedCrossDomainRequest(w,l);if(o)return f(),void 0;var p=h.jqmData("transition"),q="reverse"===h.jqmData("direction")||h.jqmData("back"),r=h.attr("data-"+a.mobile.ns+"rel")||d;a.mobile.changePage(l,{transition:p,reverse:q,role:r,link:h}),c.preventDefault()}}}),a.mobile.document.delegate(".ui-page","pageshow.prefetch",function(){var b=[];a(this).find("a:jqmData(prefetch)").each(function(){var c=a(this),d=c.attr("href");d&&-1===a.inArray(d,b)&&(b.push(d),a.mobile.loadPage(d,{role:c.attr("data-"+a.mobile.ns+"rel"),prefetch:!0}))})}),a.mobile._handleHashChange=function(c,e){var f=n.stripHash(c),g=0===a.mobile.urlHistory.stack.length?"none":d,h={changeHash:!1,fromHashChange:!0,reverse:"back"===e.direction};if(a.extend(h,e,{transition:(r.getLast()||{}).transition||g}),r.activeIndex>0&&f.indexOf(u)>-1&&r.initialDst!==f){if(a.mobile.activePage&&!a.mobile.activePage.is(".ui-dialog"))return"back"===e.direction?a.mobile.back():b.history.forward(),void 0;f=e.pageUrl;var i=a.mobile.urlHistory.getActive();a.extend(h,{role:i.role,transition:i.transition,reverse:"back"===e.direction})}f?(f=n.isPath(f)?f:n.makeUrlAbsolute("#"+f,x),f===n.makeUrlAbsolute("#"+r.initialDst,x)&&r.stack.length&&r.stack[0].url!==r.initialDst.replace(u,"")&&(f=a.mobile.firstPage),a.mobile.changePage(f,h)):a.mobile.changePage(a.mobile.firstPage,h)},l.bind("navigate",function(b,c){var d;b.originalEvent&&b.originalEvent.isDefaultPrevented()||(d=a.event.special.navigate.originalEventName.indexOf("hashchange")>-1?c.state.hash:c.state.url,d||(d=a.mobile.path.parseLocation().hash),d&&"#"!==d&&0!==d.indexOf("#"+a.mobile.path.uiStateKey)||(d=location.href),a.mobile._handleHashChange(d,c.state))}),a.mobile.document.bind("pageshow",a.mobile.resetActivePageHeight),a.mobile.window.bind("throttledresize",a.mobile.resetActivePageHeight)},a(function(){q.resolve()}),a.when(q,a.mobile.navreadyDeferred).done(function(){a.mobile._registerInternalEvents()})}(a),function(a){a.mobile.transitionFallbacks.flip="fade"}(a,this),function(a){a.mobile.transitionFallbacks.flow="fade"}(a,this),function(a){a.mobile.transitionFallbacks.pop="fade"}(a,this),function(a){a.mobile.transitionHandlers.slide=a.mobile.transitionHandlers.simultaneous,a.mobile.transitionFallbacks.slide="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slidedown="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slidefade="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slideup="fade"}(a,this),function(a){a.mobile.transitionFallbacks.turn="fade"}(a,this),function(a){a.mobile.page.prototype.options.degradeInputs={color:!1,date:!1,datetime:!1,"datetime-local":!1,email:!1,month:!1,number:!1,range:"number",search:"text",tel:!1,time:!1,url:!1,week:!1},a.mobile.document.bind("pagecreate create",function(b){var c,d=a.mobile.closestPageData(a(b.target));d&&(c=d.options,a(b.target).find("input").not(d.keepNativeSelector()).each(function(){var b=a(this),d=this.getAttribute("type"),e=c.degradeInputs[d]||"text";if(c.degradeInputs[d]){var f=a("<div>").html(b.clone()).html(),g=f.indexOf(" type=")>-1,h=g?/\s+type=["']?\w+['"]?/:/\/?>/,i=' type="'+e+'" data-'+a.mobile.ns+'type="'+d+'"'+(g?"":">");b.replaceWith(f.replace(h,i))}}))})}(a),function(a){a.widget("mobile.dialog",a.mobile.widget,{options:{closeBtn:"left",closeBtnText:"Close",overlayTheme:"a",corners:!0,initSelector:":jqmData(role='dialog')"},_handlePageBeforeShow:function(){this._isCloseable=!0,this.options.overlayTheme&&this.element.page("removeContainerBackground").page("setContainerBackground",this.options.overlayTheme)},_handlePageBeforeHide:function(){this._isCloseable=!1},_create:function(){var b=this.element,c=this.options.corners?" ui-corner-all":"",d=a("<div/>",{role:"dialog","class":"ui-dialog-contain ui-overlay-shadow"+c});b.addClass("ui-dialog ui-overlay-"+this.options.overlayTheme),b.wrapInner(d),b.bind("vclick submit",function(b){var c,d=a(b.target).closest("vclick"===b.type?"a":"form");d.length&&!d.jqmData("transition")&&(c=a.mobile.urlHistory.getActive()||{},d.attr("data-"+a.mobile.ns+"transition",c.transition||a.mobile.defaultDialogTransition).attr("data-"+a.mobile.ns+"direction","reverse"))}),this._on(b,{pagebeforeshow:"_handlePageBeforeShow",pagebeforehide:"_handlePageBeforeHide"}),a.extend(this,{_createComplete:!1}),this._setCloseBtn(this.options.closeBtn)},_setCloseBtn:function(b){var c,d,e=this;this._headerCloseButton&&(this._headerCloseButton.remove(),this._headerCloseButton=null),"none"!==b&&(d="left"===b?"left":"right",c=a("<a href='#' class='ui-btn-"+d+"' data-"+a.mobile.ns+"icon='delete' data-"+a.mobile.ns+"iconpos='notext'>"+this.options.closeBtnText+"</a>"),this.element.children().find(":jqmData(role='header')").first().prepend(c),this._createComplete&&a.fn.buttonMarkup&&c.buttonMarkup(),this._createComplete=!0,c.bind("click",function(){e.close()}),this._headerCloseButton=c)},_setOption:function(a,b){"closeBtn"===a&&this._setCloseBtn(b),this._super(a,b)},close:function(){var b,c,d=a.mobile.navigate.history;this._isCloseable&&(this._isCloseable=!1,a.mobile.hashListeningEnabled&&d.activeIndex>0?a.mobile.back():(b=Math.max(0,d.activeIndex-1),c=d.stack[b].pageUrl||d.stack[b].url,d.previousIndex=d.activeIndex,d.activeIndex=b,a.mobile.path.isPath(c)||(c=a.mobile.path.makeUrlAbsolute("#"+c)),a.mobile.changePage(c,{direction:"back",changeHash:!1,fromHashChange:!0})))}}),a.mobile.document.delegate(a.mobile.dialog.prototype.options.initSelector,"pagecreate",function(){a.mobile.dialog.prototype.enhance(this)})}(a,this),function(a){a.mobile.page.prototype.options.backBtnText="Back",a.mobile.page.prototype.options.addBackBtn=!1,a.mobile.page.prototype.options.backBtnTheme=null,a.mobile.page.prototype.options.headerTheme="a",a.mobile.page.prototype.options.footerTheme="a",a.mobile.page.prototype.options.contentTheme=null,a.mobile.document.bind("pagecreate",function(b){var c=a(b.target),d=c.data("mobile-page").options,e=c.jqmData("role"),f=d.theme;a(":jqmData(role='header'), :jqmData(role='footer'), :jqmData(role='content')",c).jqmEnhanceable().each(function(){var b,g,h,i,j=a(this),k=j.jqmData("role"),l=j.jqmData("theme"),m=l||d.contentTheme||"dialog"===e&&f;if(j.addClass("ui-"+k),"header"===k||"footer"===k){var n=l||("header"===k?d.headerTheme:d.footerTheme)||f;j.addClass("ui-bar-"+n).attr("role","header"===k?"banner":"contentinfo"),"header"===k&&(b=j.children("a, button"),g=b.hasClass("ui-btn-left"),h=b.hasClass("ui-btn-right"),g=g||b.eq(0).not(".ui-btn-right").addClass("ui-btn-left").length,h=h||b.eq(1).addClass("ui-btn-right").length),d.addBackBtn&&"header"===k&&a(".ui-page").length>1&&c.jqmData("url")!==a.mobile.path.stripHash(location.hash)&&!g&&(i=a("<a href='javascript:void(0);' class='ui-btn-left' data-"+a.mobile.ns+"rel='back' data-"+a.mobile.ns+"icon='arrow-l'>"+d.backBtnText+"</a>").attr("data-"+a.mobile.ns+"theme",d.backBtnTheme||n).prependTo(j)),j.children("h1, h2, h3, h4, h5, h6").addClass("ui-title").attr({role:"heading","aria-level":"1"})}else"content"===k&&(m&&j.addClass("ui-body-"+m),j.attr("role","main"))})})}(a),function(a,b){function d(a){for(var b;a&&(b="string"==typeof a.className&&a.className+" ",!(b&&b.indexOf("ui-btn ")>-1&&b.indexOf("ui-disabled ")<0));)a=a.parentNode;return a}function e(d,e,f,g,h){var i=a.data(d[0],"buttonElements");d.removeClass(e).addClass(f),i&&(i.bcls=a(c.createElement("div")).addClass(i.bcls+" "+f).removeClass(e).attr("class"),g!==b&&(i.hover=g),i.state=h)}var f=function(a,c){var d=a.getAttribute(c);return"true"===d?!0:"false"===d?!1:null===d?b:d};a.fn.buttonMarkup=function(d){var e,h=this,i="data-"+a.mobile.ns;d=d&&"object"===a.type(d)?d:{};for(var j=0;j<h.length;j++){var k,l,m,n,o,p,q=h.eq(j),r=q[0],s=a.extend({},a.fn.buttonMarkup.defaults,{icon:d.icon!==b?d.icon:f(r,i+"icon"),iconpos:d.iconpos!==b?d.iconpos:f(r,i+"iconpos"),theme:d.theme!==b?d.theme:f(r,i+"theme")||a.mobile.getInheritedTheme(q,"c"),inline:d.inline!==b?d.inline:f(r,i+"inline"),shadow:d.shadow!==b?d.shadow:f(r,i+"shadow"),corners:d.corners!==b?d.corners:f(r,i+"corners"),iconshadow:d.iconshadow!==b?d.iconshadow:f(r,i+"iconshadow"),mini:d.mini!==b?d.mini:f(r,i+"mini")},d),t="ui-btn-inner",u="ui-btn-text",v=!1,w="up";for(e in s)s[e]===b||null===s[e]?q.removeAttr(i+e):r.setAttribute(i+e,s[e]);for(p=a.data("INPUT"===r.tagName||"BUTTON"===r.tagName?r.parentNode:r,"buttonElements"),p?(r=p.outer,q=a(r),m=p.inner,n=p.text,a(p.icon).remove(),p.icon=null,v=p.hover,w=p.state):(m=c.createElement(s.wrapperEls),n=c.createElement(s.wrapperEls)),o=s.icon?c.createElement("span"):null,g&&!p&&g(),s.theme||(s.theme=a.mobile.getInheritedTheme(q,"c")),k="ui-btn ",k+=v?"ui-btn-hover-"+s.theme:"",k+=w?" ui-btn-"+w+"-"+s.theme:"",k+=s.shadow?" ui-shadow":"",k+=s.corners?" ui-btn-corner-all":"",s.mini!==b&&(k+=s.mini===!0?" ui-mini":" ui-fullsize"),s.inline!==b&&(k+=s.inline===!0?" ui-btn-inline":" ui-btn-block"),s.icon&&(s.icon="ui-icon-"+s.icon,s.iconpos=s.iconpos||"left",l="ui-icon "+s.icon,s.iconshadow&&(l+=" ui-icon-shadow")),s.iconpos&&(k+=" ui-btn-icon-"+s.iconpos,"notext"!==s.iconpos||q.attr("title")||q.attr("title",q.getEncodedText())),p&&q.removeClass(p.bcls||""),q.removeClass("ui-link").addClass(k),m.className=t,n.className=u,p||m.appendChild(n),o&&(o.className=l,p&&p.icon||(o.innerHTML="&#160;",m.appendChild(o)));r.firstChild&&!p;)n.appendChild(r.firstChild);p||r.appendChild(m),p={hover:v,state:w,bcls:k,outer:r,inner:m,text:n,icon:o},a.data(r,"buttonElements",p),a.data(m,"buttonElements",p),a.data(n,"buttonElements",p),o&&a.data(o,"buttonElements",p)}return this},a.fn.buttonMarkup.defaults={corners:!0,shadow:!0,iconshadow:!0,wrapperEls:"span"};var g=function(){var c,f,h=a.mobile.buttonMarkup.hoverDelay;a.mobile.document.bind({"vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart":function(g){var i,j=a(d(g.target)),k=g.originalEvent&&/^touch/.test(g.originalEvent.type),l=g.type;j.length&&(i=j.attr("data-"+a.mobile.ns+"theme"),"vmousedown"===l?k?c=setTimeout(function(){e(j,"ui-btn-up-"+i,"ui-btn-down-"+i,b,"down")},h):e(j,"ui-btn-up-"+i,"ui-btn-down-"+i,b,"down"):"vmousecancel"===l||"vmouseup"===l?e(j,"ui-btn-down-"+i,"ui-btn-up-"+i,b,"up"):"vmouseover"===l||"focus"===l?k?f=setTimeout(function(){e(j,"ui-btn-up-"+i,"ui-btn-hover-"+i,!0,"")},h):e(j,"ui-btn-up-"+i,"ui-btn-hover-"+i,!0,""):("vmouseout"===l||"blur"===l||"scrollstart"===l)&&(e(j,"ui-btn-hover-"+i+" ui-btn-down-"+i,"ui-btn-up-"+i,!1,"up"),c&&clearTimeout(c),f&&clearTimeout(f)))},"focusin focus":function(b){a(d(b.target)).addClass(a.mobile.focusClass)},"focusout blur":function(b){a(d(b.target)).removeClass(a.mobile.focusClass)}}),g=null};a.mobile.document.bind("pagecreate create",function(b){a(":jqmData(role='button'), .ui-bar > a, .ui-header > a, .ui-footer > a, .ui-bar > :jqmData(role='controlgroup') > a",b.target).jqmEnhanceable().not("button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')").buttonMarkup()})}(a),function(a,b){a.widget("mobile.collapsible",a.mobile.widget,{options:{expandCueText:" click to expand contents",collapseCueText:" click to collapse contents",collapsed:!0,heading:"h1,h2,h3,h4,h5,h6,legend",collapsedIcon:"plus",expandedIcon:"minus",iconpos:"left",theme:null,contentTheme:null,inset:!0,corners:!0,mini:!1,initSelector:":jqmData(role='collapsible')"},_create:function(){var c=this.element,d=this.options,e=c.addClass("ui-collapsible"),f=c.children(d.heading).first(),g=e.wrapInner("<div class='ui-collapsible-content'></div>").children(".ui-collapsible-content"),h=c.closest(":jqmData(role='collapsible-set')").addClass("ui-collapsible-set"),i="";f.is("legend")&&(f=a("<div role='heading'>"+f.html()+"</div>").insertBefore(f),f.next().remove()),h.length?(d.theme||(d.theme=h.jqmData("theme")||a.mobile.getInheritedTheme(h,"c")),d.contentTheme||(d.contentTheme=h.jqmData("content-theme")),d.collapsedIcon=c.jqmData("collapsed-icon")||h.jqmData("collapsed-icon")||d.collapsedIcon,d.expandedIcon=c.jqmData("expanded-icon")||h.jqmData("expanded-icon")||d.expandedIcon,d.iconpos=c.jqmData("iconpos")||h.jqmData("iconpos")||d.iconpos,d.inset=h.jqmData("inset")!==b?h.jqmData("inset"):!0,d.corners=!1,d.mini||(d.mini=h.jqmData("mini"))):d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),d.inset&&(i+=" ui-collapsible-inset",d.corners&&(i+=" ui-corner-all")),d.contentTheme&&(i+=" ui-collapsible-themed-content",g.addClass("ui-body-"+d.contentTheme)),""!==i&&e.addClass(i),f.insertBefore(g).addClass("ui-collapsible-heading").append("<span class='ui-collapsible-heading-status'></span>").wrapInner("<a href='#' class='ui-collapsible-heading-toggle'></a>").find("a").first().buttonMarkup({shadow:!1,corners:!1,iconpos:d.iconpos,icon:d.collapsedIcon,mini:d.mini,theme:d.theme}),e.bind("expand collapse",function(b){if(!b.isDefaultPrevented()){var c=a(this),e="collapse"===b.type;b.preventDefault(),f.toggleClass("ui-collapsible-heading-collapsed",e).find(".ui-collapsible-heading-status").text(e?d.expandCueText:d.collapseCueText).end().find(".ui-icon").toggleClass("ui-icon-"+d.expandedIcon,!e).toggleClass("ui-icon-"+d.collapsedIcon,e||d.expandedIcon===d.collapsedIcon).end().find("a").first().removeClass(a.mobile.activeBtnClass),c.toggleClass("ui-collapsible-collapsed",e),g.toggleClass("ui-collapsible-content-collapsed",e).attr("aria-hidden",e),g.trigger("updatelayout")}}).trigger(d.collapsed?"collapse":"expand"),f.bind("tap",function(){f.find("a").first().addClass(a.mobile.activeBtnClass)}).bind("click",function(a){var b=f.is(".ui-collapsible-heading-collapsed")?"expand":"collapse";e.trigger(b),a.preventDefault(),a.stopPropagation()})}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.collapsible.prototype.enhanceWithin(b.target)})}(a),function(a){a.mobile.behaviors.addFirstLastClasses={_getVisibles:function(a,b){var c;return b?c=a.not(".ui-screen-hidden"):(c=a.filter(":visible"),0===c.length&&(c=a.not(".ui-screen-hidden"))),c},_addFirstLastClasses:function(a,b,c){a.removeClass("ui-first-child ui-last-child"),b.eq(0).addClass("ui-first-child").end().last().addClass("ui-last-child"),c||this.element.trigger("updatelayout")}}}(a),function(a,b){a.widget("mobile.collapsibleset",a.mobile.widget,a.extend({options:{initSelector:":jqmData(role='collapsible-set')"},_create:function(){var c=this.element.addClass("ui-collapsible-set"),d=this.options;d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),d.contentTheme||(d.contentTheme=c.jqmData("content-theme")),d.corners||(d.corners=c.jqmData("corners")),c.jqmData("inset")!==b&&(d.inset=c.jqmData("inset")),d.inset=d.inset!==b?d.inset:!0,d.corners=d.corners!==b?d.corners:!0,d.corners&&d.inset&&c.addClass("ui-corner-all"),c.jqmData("collapsiblebound")||c.jqmData("collapsiblebound",!0).bind("expand",function(b){var c=a(b.target).closest(".ui-collapsible");
-c.parent().is(":jqmData(role='collapsible-set')")&&c.siblings(".ui-collapsible").trigger("collapse")})},_init:function(){var a=this.element,b=a.children(":jqmData(role='collapsible')"),c=b.filter(":jqmData(collapsed='false')");this._refresh("true"),c.trigger("expand")},_refresh:function(b){var c=this.element.children(":jqmData(role='collapsible')");a.mobile.collapsible.prototype.enhance(c.not(".ui-collapsible")),this._addFirstLastClasses(c,this._getVisibles(c,b),b)},refresh:function(){this._refresh(!1)}},a.mobile.behaviors.addFirstLastClasses)),a.mobile.document.bind("pagecreate create",function(b){a.mobile.collapsibleset.prototype.enhanceWithin(b.target)})}(a),function(a){a.fn.fieldcontain=function(){return this.addClass("ui-field-contain ui-body ui-br").contents().filter(function(){return 3===this.nodeType&&!/\S/.test(this.nodeValue)}).remove()},a(c).bind("pagecreate create",function(b){a(":jqmData(role='fieldcontain')",b.target).jqmEnhanceable().fieldcontain()})}(a),function(a){a.fn.grid=function(b){return this.each(function(){var c,d=a(this),e=a.extend({grid:null},b),f=d.children(),g={solo:1,a:2,b:3,c:4,d:5},h=e.grid;if(!h)if(f.length<=5)for(var i in g)g[i]===f.length&&(h=i);else h="a",d.addClass("ui-grid-duo");c=g[h],d.addClass("ui-grid-"+h),f.filter(":nth-child("+c+"n+1)").addClass("ui-block-a"),c>1&&f.filter(":nth-child("+c+"n+2)").addClass("ui-block-b"),c>2&&f.filter(":nth-child("+c+"n+3)").addClass("ui-block-c"),c>3&&f.filter(":nth-child("+c+"n+4)").addClass("ui-block-d"),c>4&&f.filter(":nth-child("+c+"n+5)").addClass("ui-block-e")})}}(a),function(a,b){a.widget("mobile.navbar",a.mobile.widget,{options:{iconpos:"top",grid:null,initSelector:":jqmData(role='navbar')"},_create:function(){var d=this.element,e=d.find("a"),f=e.filter(":jqmData(icon)").length?this.options.iconpos:b;d.addClass("ui-navbar ui-mini").attr("role","navigation").find("ul").jqmEnhanceable().grid({grid:this.options.grid}),e.buttonMarkup({corners:!1,shadow:!1,inline:!0,iconpos:f}),d.delegate("a","vclick",function(b){var d=a(b.target).is("a")?a(this):a(this).parent("a");if(!d.is(".ui-disabled, .ui-btn-active")){e.removeClass(a.mobile.activeBtnClass),a(this).addClass(a.mobile.activeBtnClass);var f=a(this);a(c).one("pagehide",function(){f.removeClass(a.mobile.activeBtnClass)})}}),d.closest(".ui-page").bind("pagebeforeshow",function(){e.filter(".ui-state-persist").addClass(a.mobile.activeBtnClass)})}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.navbar.prototype.enhanceWithin(b.target)})}(a),function(a){var b={};a.widget("mobile.listview",a.mobile.widget,a.extend({options:{theme:null,countTheme:"c",headerTheme:"b",dividerTheme:"b",icon:"arrow-r",splitIcon:"arrow-r",splitTheme:"b",corners:!0,shadow:!0,inset:!1,initSelector:":jqmData(role='listview')"},_create:function(){var a=this,b="";b+=a.options.inset?" ui-listview-inset":"",a.options.inset&&(b+=a.options.corners?" ui-corner-all":"",b+=a.options.shadow?" ui-shadow":""),a.element.addClass(function(a,c){return c+" ui-listview"+b}),a.refresh(!0)},_findFirstElementByTagName:function(a,b,c,d){var e={};for(e[c]=e[d]=!0;a;){if(e[a.nodeName])return a;a=a[b]}return null},_getChildrenByTagName:function(b,c,d){var e=[],f={};for(f[c]=f[d]=!0,b=b.firstChild;b;)f[b.nodeName]&&e.push(b),b=b.nextSibling;return a(e)},_addThumbClasses:function(b){var c,d,e=b.length;for(c=0;e>c;c++)d=a(this._findFirstElementByTagName(b[c].firstChild,"nextSibling","img","IMG")),d.length&&(d.addClass("ui-li-thumb"),a(this._findFirstElementByTagName(d[0].parentNode,"parentNode","li","LI")).addClass(d.is(".ui-li-icon")?"ui-li-has-icon":"ui-li-has-thumb"))},refresh:function(b){this.parentPage=this.element.closest(".ui-page"),this._createSubPages();var d,e,f,g,h,i,j,k,l,m,n,o,p=this.options,q=this.element,r=q.jqmData("dividertheme")||p.dividerTheme,s=q.jqmData("splittheme"),t=q.jqmData("spliticon"),u=q.jqmData("icon"),v=this._getChildrenByTagName(q[0],"li","LI"),w=!!a.nodeName(q[0],"ol"),x=!a.support.cssPseudoElement,y=q.attr("start"),z={};w&&x&&q.find(".ui-li-dec").remove(),w&&(y||0===y?x?j=parseInt(y,10):(k=parseInt(y,10)-1,q.css("counter-reset","listnumbering "+k)):x&&(j=1)),p.theme||(p.theme=a.mobile.getInheritedTheme(this.element,"c"));for(var A=0,B=v.length;B>A;A++){if(d=v.eq(A),e="ui-li",b||!d.hasClass("ui-li")){f=d.jqmData("theme")||p.theme,g=this._getChildrenByTagName(d[0],"a","A");var C="list-divider"===d.jqmData("role");g.length&&!C?(n=d.jqmData("icon"),d.buttonMarkup({wrapperEls:"div",shadow:!1,corners:!1,iconpos:"right",icon:g.length>1||n===!1?!1:n||u||p.icon,theme:f}),n!==!1&&1===g.length&&d.addClass("ui-li-has-arrow"),g.first().removeClass("ui-link").addClass("ui-link-inherit"),g.length>1&&(e+=" ui-li-has-alt",h=g.last(),i=s||h.jqmData("theme")||p.splitTheme,o=h.jqmData("icon"),h.appendTo(d).attr("title",a.trim(h.getEncodedText())).addClass("ui-li-link-alt").empty().buttonMarkup({shadow:!1,corners:!1,theme:f,icon:!1,iconpos:"notext"}).find(".ui-btn-inner").append(a(c.createElement("span")).buttonMarkup({shadow:!0,corners:!0,theme:i,iconpos:"notext",icon:o||n||t||p.splitIcon})))):C?(e+=" ui-li-divider ui-bar-"+(d.jqmData("theme")||r),d.attr("role","heading"),w&&(y||0===y?x?j=parseInt(y,10):(l=parseInt(y,10)-1,d.css("counter-reset","listnumbering "+l)):x&&(j=1))):e+=" ui-li-static ui-btn-up-"+f}w&&x&&e.indexOf("ui-li-divider")<0&&(m=e.indexOf("ui-li-static")>0?d:d.find(".ui-link-inherit"),m.addClass("ui-li-jsnumbering").prepend("<span class='ui-li-dec'>"+j++ +". </span>")),z[e]||(z[e]=[]),z[e].push(d[0])}for(e in z)a(z[e]).addClass(e).children(".ui-btn-inner").addClass(e);q.find("h1, h2, h3, h4, h5, h6").addClass("ui-li-heading").end().find("p, dl").addClass("ui-li-desc").end().find(".ui-li-aside").each(function(){var b=a(this);b.prependTo(b.parent())}).end().find(".ui-li-count").each(function(){a(this).closest("li").addClass("ui-li-has-count")}).addClass("ui-btn-up-"+(q.jqmData("counttheme")||this.options.countTheme)+" ui-btn-corner-all"),this._addThumbClasses(v),this._addThumbClasses(q.find(".ui-link-inherit")),this._addFirstLastClasses(v,this._getVisibles(v,b),b),this._trigger("afterrefresh")},_idStringEscape:function(a){return a.replace(/[^a-zA-Z0-9]/g,"-")},_createSubPages:function(){var c,d=this.element,e=d.closest(".ui-page"),f=e.jqmData("url"),g=f||e[0][a.expando],h=d.attr("id"),i=this.options,j="data-"+a.mobile.ns,k=this,l=e.find(":jqmData(role='footer')").jqmData("id");if("undefined"==typeof b[g]&&(b[g]=-1),h=h||++b[g],a(d.find("li>ul, li>ol").toArray().reverse()).each(function(b){var e,g,k=a(this),m=k.attr("id")||h+"-"+b,n=k.parent(),o=a(k.prevAll().toArray().reverse()),p=o.length?o:a("<span>"+a.trim(n.contents()[0].nodeValue)+"</span>"),q=p.first().getEncodedText(),r=(f||"")+"&"+a.mobile.subPageUrlKey+"="+m,s=k.jqmData("theme")||i.theme,t=k.jqmData("counttheme")||d.jqmData("counttheme")||i.countTheme;c=!0,e=k.detach().wrap("<div "+j+"role='page' "+j+"url='"+r+"' "+j+"theme='"+s+"' "+j+"count-theme='"+t+"'><div "+j+"role='content'></div></div>").parent().before("<div "+j+"role='header' "+j+"theme='"+i.headerTheme+"'><div class='ui-title'>"+q+"</div></div>").after(l?a("<div "+j+"role='footer' "+j+"id='"+l+"'>"):"").parent().appendTo(a.mobile.pageContainer),e.page(),g=n.find("a:first"),g.length||(g=a("<a/>").html(p||q).prependTo(n.empty())),g.attr("href","#"+r)}).listview(),c&&e.is(":jqmData(external-page='true')")&&e.data("mobile-page").options.domCache===!1){var m=function(b,c){var d,g=c.nextPage,h=new a.Event("pageremove");c.nextPage&&(d=g.jqmData("url"),0!==d.indexOf(f+"&"+a.mobile.subPageUrlKey)&&(k.childPages().remove(),e.trigger(h),h.isDefaultPrevented()||e.removeWithDependents()))};e.unbind("pagehide.remove").bind("pagehide.remove",m)}},childPages:function(){var b=this.parentPage.jqmData("url");return a(":jqmData(url^='"+b+"&"+a.mobile.subPageUrlKey+"')")}},a.mobile.behaviors.addFirstLastClasses)),a.mobile.document.bind("pagecreate create",function(b){a.mobile.listview.prototype.enhanceWithin(b.target)})}(a),function(a){var b=a("meta[name=viewport]"),c=b.attr("content"),d=c+",maximum-scale=1, user-scalable=no",e=c+",maximum-scale=10, user-scalable=yes",f=/(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test(c);a.mobile.zoom=a.extend({},{enabled:!f,locked:!1,disable:function(c){f||a.mobile.zoom.locked||(b.attr("content",d),a.mobile.zoom.enabled=!1,a.mobile.zoom.locked=c||!1)},enable:function(c){f||a.mobile.zoom.locked&&c!==!0||(b.attr("content",e),a.mobile.zoom.enabled=!0,a.mobile.zoom.locked=!1)},restore:function(){f||(b.attr("content",c),a.mobile.zoom.enabled=!0)}})}(a),function(a){a.widget("mobile.textinput",a.mobile.widget,{options:{theme:null,mini:!1,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type]), input[type='file']",clearBtn:!1,clearSearchButtonText:null,clearBtnText:"clear text",disabled:!1},_create:function(){function b(){setTimeout(function(){d.toggleClass("ui-input-clear-hidden",!f.val())},0)}var c,d,e=this,f=this.element,g=this.options,h=g.theme||a.mobile.getInheritedTheme(this.element,"c"),i=" ui-body-"+h,j=g.mini?" ui-mini":"",k=f.is("[type='search'], :jqmData(type='search')"),l=g.clearSearchButtonText||g.clearBtnText,m=f.is("textarea, :jqmData(type='range')"),n=!!g.clearBtn&&!m,o=f.is("input")&&!f.is(":jqmData(type='range')");if(a("label[for='"+f.attr("id")+"']").addClass("ui-input-text"),c=f.addClass("ui-input-text ui-body-"+h),"undefined"==typeof f[0].autocorrect||a.support.touchOverflow||(f[0].setAttribute("autocorrect","off"),f[0].setAttribute("autocomplete","off")),k?c=f.wrap("<div class='ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-searchfield"+i+j+"'></div>").parent():o&&(c=f.wrap("<div class='ui-input-text ui-shadow-inset ui-corner-all ui-btn-shadow"+i+j+"'></div>").parent()),n||k?(d=a("<a href='#' class='ui-input-clear' title='"+l+"'>"+l+"</a>").bind("click",function(a){f.val("").focus().trigger("change"),d.addClass("ui-input-clear-hidden"),a.preventDefault()}).appendTo(c).buttonMarkup({icon:"delete",iconpos:"notext",corners:!0,shadow:!0,mini:g.mini}),k||c.addClass("ui-input-has-clear"),b(),f.bind("paste cut keyup input focus change blur",b)):o||k||f.addClass("ui-corner-all ui-shadow-inset"+i+j),f.focus(function(){g.preventFocusZoom&&a.mobile.zoom.disable(!0),c.addClass(a.mobile.focusClass)}).blur(function(){c.removeClass(a.mobile.focusClass),g.preventFocusZoom&&a.mobile.zoom.enable(!0)}),f.is("textarea")){var p,q=15,r=100;this._keyup=function(){var a=f[0].scrollHeight,b=f[0].clientHeight;if(a>b){var c=parseFloat(f.css("padding-top")),d=parseFloat(f.css("padding-bottom")),e=c+d;f.height(a-e+q)}},f.on("keyup change input paste",function(){clearTimeout(p),p=setTimeout(e._keyup,r)}),this._on(!0,a.mobile.document,{pagechange:"_keyup"}),a.trim(f.val())&&this._on(!0,a.mobile.window,{load:"_keyup"})}f.attr("disabled")&&this.disable()},disable:function(){var a,b=this.element.is("[type='search'], :jqmData(type='search')"),c=this.element.is("input")&&!this.element.is(":jqmData(type='range')"),d=this.element.attr("disabled",!0)&&(c||b);return a=d?this.element.parent():this.element,a.addClass("ui-disabled"),this._setOption("disabled",!0)},enable:function(){var a,b=this.element.is("[type='search'], :jqmData(type='search')"),c=this.element.is("input")&&!this.element.is(":jqmData(type='range')"),d=this.element.attr("disabled",!1)&&(c||b);return a=d?this.element.parent():this.element,a.removeClass("ui-disabled"),this._setOption("disabled",!1)}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.textinput.prototype.enhanceWithin(b.target,!0)})}(a),function(a){a.mobile.listview.prototype.options.filter=!1,a.mobile.listview.prototype.options.filterPlaceholder="Filter items...",a.mobile.listview.prototype.options.filterTheme="c",a.mobile.listview.prototype.options.filterReveal=!1;var b=function(a,b){return-1===a.toString().toLowerCase().indexOf(b)};a.mobile.listview.prototype.options.filterCallback=b,a.mobile.document.delegate("ul, ol","listviewcreate",function(){var c=a(this),d=c.data("mobile-listview");if(d&&d.options.filter){d.options.filterReveal&&c.children().addClass("ui-screen-hidden");var e=a("<form>",{"class":"ui-listview-filter ui-bar-"+d.options.filterTheme,role:"search"}).submit(function(a){a.preventDefault(),g.blur()}),f=function(){var e,f=a(this),g=this.value.toLowerCase(),h=null,i=c.children(),j=f.jqmData("lastval")+"",k=!1,l="",m=d.options.filterCallback!==b;if(!j||j!==g){if(d._trigger("beforefilter","beforefilter",{input:this}),f.jqmData("lastval",g),m||g.length<j.length||0!==g.indexOf(j)?h=c.children():(h=c.children(":not(.ui-screen-hidden)"),!h.length&&d.options.filterReveal&&(h=c.children(".ui-screen-hidden"))),g){for(var n=h.length-1;n>=0;n--)e=a(h[n]),l=e.jqmData("filtertext")||e.text(),e.is("li:jqmData(role=list-divider)")?(e.toggleClass("ui-filter-hidequeue",!k),k=!1):d.options.filterCallback(l,g,e)?e.toggleClass("ui-filter-hidequeue",!0):k=!0;h.filter(":not(.ui-filter-hidequeue)").toggleClass("ui-screen-hidden",!1),h.filter(".ui-filter-hidequeue").toggleClass("ui-screen-hidden",!0).toggleClass("ui-filter-hidequeue",!1)}else h.toggleClass("ui-screen-hidden",!!d.options.filterReveal);d._addFirstLastClasses(i,d._getVisibles(i,!1),!1)}},g=a("<input>",{placeholder:d.options.filterPlaceholder}).attr("data-"+a.mobile.ns+"type","search").jqmData("lastval","").bind("keyup change input",f).appendTo(e).textinput();d.options.inset&&e.addClass("ui-listview-filter-inset"),e.bind("submit",function(){return!1}).insertBefore(c)}})}(a),function(a){a.mobile.listview.prototype.options.autodividers=!1,a.mobile.listview.prototype.options.autodividersSelector=function(b){var c=a.trim(b.text())||null;return c?c=c.slice(0,1).toUpperCase():null},a.mobile.document.delegate("ul,ol","listviewcreate",function(){var b=a(this),d=b.data("mobile-listview");if(d&&d.options.autodividers){var e=function(){b.find("li:jqmData(role='list-divider')").remove();for(var e,f,g=b.find("li"),h=null,i=0;i<g.length;i++){if(e=g[i],f=d.options.autodividersSelector(a(e)),f&&h!==f){var j=c.createElement("li");j.appendChild(c.createTextNode(f)),j.setAttribute("data-"+a.mobile.ns+"role","list-divider"),e.parentNode.insertBefore(j,e)}h=f}},f=function(){b.unbind("listviewafterrefresh",f),e(),d.refresh(),b.bind("listviewafterrefresh",f)};f()}})}(a),function(a){a(c).bind("pagecreate create",function(b){a(":jqmData(role='nojs')",b.target).addClass("ui-nojs")})}(a),function(a){a.mobile.behaviors.formReset={_handleFormReset:function(){this._on(this.element.closest("form"),{reset:function(){this._delay("_reset")}})}}}(a),function(a){a.widget("mobile.checkboxradio",a.mobile.widget,a.extend({options:{theme:null,mini:!1,initSelector:"input[type='checkbox'],input[type='radio']"},_create:function(){var b=this,d=this.element,e=this.options,f=function(a,b){return a.jqmData(b)||a.closest("form, fieldset").jqmData(b)},g=a(d).closest("label"),h=g.length?g:a(d).closest("form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')").find("label").filter("[for='"+d[0].id+"']").first(),i=d[0].type,j=f(d,"mini")||e.mini,k=i+"-on",l=i+"-off",m=f(d,"iconpos"),n="ui-"+k,o="ui-"+l;if("checkbox"===i||"radio"===i){a.extend(this,{label:h,inputtype:i,checkedClass:n,uncheckedClass:o,checkedicon:k,uncheckedicon:l}),e.theme||(e.theme=a.mobile.getInheritedTheme(this.element,"c")),h.buttonMarkup({theme:e.theme,icon:l,shadow:!1,mini:j,iconpos:m});var p=c.createElement("div");p.className="ui-"+i,d.add(h).wrapAll(p),h.bind({vmouseover:function(b){a(this).parent().is(".ui-disabled")&&b.stopPropagation()},vclick:function(a){return d.is(":disabled")?(a.preventDefault(),void 0):(b._cacheVals(),d.prop("checked","radio"===i&&!0||!d.prop("checked")),d.triggerHandler("click"),b._getInputSet().not(d).prop("checked",!1),b._updateAll(),!1)}}),d.bind({vmousedown:function(){b._cacheVals()},vclick:function(){var c=a(this);c.is(":checked")?(c.prop("checked",!0),b._getInputSet().not(c).prop("checked",!1)):c.prop("checked",!1),b._updateAll()},focus:function(){h.addClass(a.mobile.focusClass)},blur:function(){h.removeClass(a.mobile.focusClass)}}),this._handleFormReset(),this.refresh()}},_cacheVals:function(){this._getInputSet().each(function(){a(this).jqmData("cacheVal",this.checked)})},_getInputSet:function(){return"checkbox"===this.inputtype?this.element:this.element.closest("form, :jqmData(role='page'), :jqmData(role='dialog')").find("input[name='"+this.element[0].name+"'][type='"+this.inputtype+"']")},_updateAll:function(){var b=this;this._getInputSet().each(function(){var c=a(this);(this.checked||"checkbox"===b.inputtype)&&c.trigger("change")}).checkboxradio("refresh")},_reset:function(){this.refresh()},refresh:function(){var b=this.element[0],c=" "+a.mobile.activeBtnClass,d=this.checkedClass+(this.element.parents(".ui-controlgroup-horizontal").length?c:""),e=this.label;b.checked?e.removeClass(this.uncheckedClass+c).addClass(d).buttonMarkup({icon:this.checkedicon}):e.removeClass(d).addClass(this.uncheckedClass).buttonMarkup({icon:this.uncheckedicon}),b.disabled?this.disable():this.enable()},disable:function(){this.element.prop("disabled",!0).parent().addClass("ui-disabled")},enable:function(){this.element.prop("disabled",!1).parent().removeClass("ui-disabled")}},a.mobile.behaviors.formReset)),a.mobile.document.bind("pagecreate create",function(b){a.mobile.checkboxradio.prototype.enhanceWithin(b.target,!0)})}(a),function(a){a.widget("mobile.button",a.mobile.widget,{options:{theme:null,icon:null,iconpos:null,corners:!0,shadow:!0,iconshadow:!0,inline:null,mini:null,initSelector:"button, [type='button'], [type='submit'], [type='reset']"},_create:function(){var b,c=this.element,d=function(a){var b,c={};for(b in a)null!==a[b]&&"initSelector"!==b&&(c[b]=a[b]);return c}(this.options),e="";return"A"===c[0].tagName?(c.hasClass("ui-btn")||c.buttonMarkup(),void 0):(this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.element,"c")),~c[0].className.indexOf("ui-btn-left")&&(e="ui-btn-left"),~c[0].className.indexOf("ui-btn-right")&&(e="ui-btn-right"),("submit"===c.attr("type")||"reset"===c.attr("type"))&&(e?e+=" ui-submit":e="ui-submit"),a("label[for='"+c.attr("id")+"']").addClass("ui-submit"),this.button=a("<div></div>")[c.html()?"html":"text"](c.html()||c.val()).insertBefore(c).buttonMarkup(d).addClass(e).append(c.addClass("ui-btn-hidden")),b=this.button,c.bind({focus:function(){b.addClass(a.mobile.focusClass)},blur:function(){b.removeClass(a.mobile.focusClass)}}),this.refresh(),void 0)},_setOption:function(b,c){var d={};d[b]=c,"initSelector"!==b&&(this.button.buttonMarkup(d),this.element.attr("data-"+(a.mobile.ns||"")+b.replace(/([A-Z])/,"-$1").toLowerCase(),c)),this._super("_setOption",b,c)},enable:function(){return this.element.attr("disabled",!1),this.button.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.button.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)},refresh:function(){var b=this.element;b.prop("disabled")?this.disable():this.enable(),a(this.button.data("buttonElements").text)[b.html()?"html":"text"](b.html()||b.val())}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.button.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){a.widget("mobile.slider",a.mobile.widget,a.extend({widgetEventPrefix:"slide",options:{theme:null,trackTheme:null,disabled:!1,initSelector:"input[type='range'], :jqmData(type='range'), :jqmData(role='slider')",mini:!1,highlight:!1},_create:function(){var e,f,g=this,h=this.element,i=a.mobile.getInheritedTheme(h,"c"),j=this.options.theme||i,k=this.options.trackTheme||i,l=h[0].nodeName.toLowerCase(),m=(this.isToggleSwitch="select"===l,h.parent().is(":jqmData(role='rangeslider')")),n=this.isToggleSwitch?"ui-slider-switch":"",o=h.attr("id"),p=a("[for='"+o+"']"),q=p.attr("id")||o+"-label",r=p.attr("id",q),s=this.isToggleSwitch?0:parseFloat(h.attr("min")),t=this.isToggleSwitch?h.find("option").length-1:parseFloat(h.attr("max")),u=b.parseFloat(h.attr("step")||1),v=this.options.mini||h.jqmData("mini")?" ui-mini":"",w=c.createElement("a"),x=a(w),y=c.createElement("div"),z=a(y),A=this.options.highlight&&!this.isToggleSwitch?function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass+" ui-btn-corner-all",a(b).prependTo(z)}():!1;if(w.setAttribute("href","#"),y.setAttribute("role","application"),y.className=[this.isToggleSwitch?"ui-slider ":"ui-slider-track ",n," ui-btn-down-",k," ui-btn-corner-all",v].join(""),w.className="ui-slider-handle",y.appendChild(w),x.buttonMarkup({corners:!0,theme:j,shadow:!0}).attr({role:"slider","aria-valuemin":s,"aria-valuemax":t,"aria-valuenow":this._value(),"aria-valuetext":this._value(),title:this._value(),"aria-labelledby":q}),a.extend(this,{slider:z,handle:x,type:l,step:u,max:t,min:s,valuebg:A,isRangeslider:m,dragging:!1,beforeStart:null,userModified:!1,mouseMoved:!1}),this.isToggleSwitch){f=c.createElement("div"),f.className="ui-slider-inneroffset";for(var B=0,C=y.childNodes.length;C>B;B++)f.appendChild(y.childNodes[B]);y.appendChild(f),x.addClass("ui-slider-handle-snapping"),e=h.find("option");for(var D=0,E=e.length;E>D;D++){var F=D?"a":"b",G=D?" "+a.mobile.activeBtnClass:" ui-btn-down-"+k,H=(c.createElement("div"),c.createElement("span"));H.className=["ui-slider-label ui-slider-label-",F,G," ui-btn-corner-all"].join(""),H.setAttribute("role","img"),H.appendChild(c.createTextNode(e[D].innerHTML)),a(H).prependTo(z)}g._labels=a(".ui-slider-label",z)}r.addClass("ui-slider"),h.addClass(this.isToggleSwitch?"ui-slider-switch":"ui-slider-input"),this._on(h,{change:"_controlChange",keyup:"_controlKeyup",blur:"_controlBlur",vmouseup:"_controlVMouseUp"}),z.bind("vmousedown",a.proxy(this._sliderVMouseDown,this)).bind("vclick",!1),this._on(c,{vmousemove:"_preventDocumentDrag"}),this._on(z.add(c),{vmouseup:"_sliderVMouseUp"}),z.insertAfter(h),this.isToggleSwitch||m||(f=this.options.mini?"<div class='ui-slider ui-mini'>":"<div class='ui-slider'>",h.add(z).wrapAll(f)),this.isToggleSwitch&&this.handle.bind({focus:function(){z.addClass(a.mobile.focusClass)},blur:function(){z.removeClass(a.mobile.focusClass)}}),this._on(this.handle,{vmousedown:"_handleVMouseDown",keydown:"_handleKeydown",keyup:"_handleKeyup"}),this.handle.bind("vclick",!1),this._handleFormReset(),this.refresh(d,d,!0)},_controlChange:function(a){return this._trigger("controlchange",a)===!1?!1:(this.mouseMoved||this.refresh(this._value(),!0),void 0)},_controlKeyup:function(){this.refresh(this._value(),!0,!0)},_controlBlur:function(){this.refresh(this._value(),!0)},_controlVMouseUp:function(){this._checkedRefresh()},_handleVMouseDown:function(){this.handle.focus()},_handleKeydown:function(b){var c=this._value();if(!this.options.disabled){switch(b.keyCode){case a.mobile.keyCode.HOME:case a.mobile.keyCode.END:case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:b.preventDefault(),this._keySliding||(this._keySliding=!0,this.handle.addClass("ui-state-active"))}switch(b.keyCode){case a.mobile.keyCode.HOME:this.refresh(this.min);break;case a.mobile.keyCode.END:this.refresh(this.max);break;case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:this.refresh(c+this.step);break;case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:this.refresh(c-this.step)}}},_handleKeyup:function(){this._keySliding&&(this._keySliding=!1,this.handle.removeClass("ui-state-active"))},_sliderVMouseDown:function(a){return this.options.disabled||1!==a.which&&0!==a.which&&a.which!==d?!1:this._trigger("beforestart",a)===!1?!1:(this.dragging=!0,this.userModified=!1,this.mouseMoved=!1,this.isToggleSwitch&&(this.beforeStart=this.element[0].selectedIndex),this.refresh(a),this._trigger("start"),!1)},_sliderVMouseUp:function(){return this.dragging?(this.dragging=!1,this.isToggleSwitch&&(this.handle.addClass("ui-slider-handle-snapping"),this.mouseMoved?this.userModified?this.refresh(0===this.beforeStart?1:0):this.refresh(this.beforeStart):this.refresh(0===this.beforeStart?1:0)),this.mouseMoved=!1,this._trigger("stop"),!1):void 0},_preventDocumentDrag:function(a){return this._trigger("drag",a)===!1?!1:this.dragging&&!this.options.disabled?(this.mouseMoved=!0,this.isToggleSwitch&&this.handle.removeClass("ui-slider-handle-snapping"),this.refresh(a),this.userModified=this.beforeStart!==this.element[0].selectedIndex,!1):void 0},_checkedRefresh:function(){this.value!==this._value()&&this.refresh(this._value())},_value:function(){return this.isToggleSwitch?this.element[0].selectedIndex:parseFloat(this.element.val())},_reset:function(){this.refresh(d,!1,!0)},refresh:function(b,d,e){var f,g,h,i,j=this,k=a.mobile.getInheritedTheme(this.element,"c"),l=this.options.theme||k,m=this.options.trackTheme||k;j.slider[0].className=[this.isToggleSwitch?"ui-slider ui-slider-switch":"ui-slider-track"," ui-btn-down-"+m," ui-btn-corner-all",this.options.mini?" ui-mini":""].join(""),(this.options.disabled||this.element.attr("disabled"))&&this.disable(),this.value=this._value(),this.options.highlight&&!this.isToggleSwitch&&0===this.slider.find(".ui-slider-bg").length&&(this.valuebg=function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass+" ui-btn-corner-all",a(b).prependTo(j.slider)}()),this.handle.buttonMarkup({corners:!0,theme:l,shadow:!0});var n,o,p=this.element,q=!this.isToggleSwitch,r=q?[]:p.find("option"),s=q?parseFloat(p.attr("min")):0,t=q?parseFloat(p.attr("max")):r.length-1,u=q&&parseFloat(p.attr("step"))>0?parseFloat(p.attr("step")):1;if("object"==typeof b){if(h=b,i=8,f=this.slider.offset().left,g=this.slider.width(),n=g/((t-s)/u),!this.dragging||h.pageX<f-i||h.pageX>f+g+i)return;o=n>1?100*((h.pageX-f)/g):Math.round(100*((h.pageX-f)/g))}else null==b&&(b=q?parseFloat(p.val()||0):p[0].selectedIndex),o=100*((parseFloat(b)-s)/(t-s));if(!isNaN(o)){var v=o/100*(t-s)+s,w=(v-s)%u,x=v-w;2*Math.abs(w)>=u&&(x+=w>0?u:-u);var y=100/((t-s)/u);if(v=parseFloat(x.toFixed(5)),"undefined"==typeof n&&(n=g/((t-s)/u)),n>1&&q&&(o=(v-s)*y*(1/u)),0>o&&(o=0),o>100&&(o=100),s>v&&(v=s),v>t&&(v=t),this.handle.css("left",o+"%"),this.handle[0].setAttribute("aria-valuenow",q?v:r.eq(v).attr("value")),this.handle[0].setAttribute("aria-valuetext",q?v:r.eq(v).getEncodedText()),this.handle[0].setAttribute("title",q?v:r.eq(v).getEncodedText()),this.valuebg&&this.valuebg.css("width",o+"%"),this._labels){var z=100*(this.handle.width()/this.slider.width()),A=o&&z+(100-z)*o/100,B=100===o?0:Math.min(z+100-A,100);this._labels.each(function(){var b=a(this).is(".ui-slider-label-a");a(this).width((b?A:B)+"%")})}if(!e){var C=!1;if(q?(C=p.val()!==v,p.val(v)):(C=p[0].selectedIndex!==v,p[0].selectedIndex=v),this._trigger("beforechange",b)===!1)return!1;!d&&C&&p.trigger("change")}}},enable:function(){return this.element.attr("disabled",!1),this.slider.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.slider.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)}},a.mobile.behaviors.formReset)),a.mobile.document.bind("pagecreate create",function(b){a.mobile.slider.prototype.enhanceWithin(b.target,!0)})}(a),function(a){a.widget("mobile.rangeslider",a.mobile.widget,{options:{theme:null,trackTheme:null,disabled:!1,initSelector:":jqmData(role='rangeslider')",mini:!1,highlight:!0},_create:function(){var b,c=this.element,d=this.options.mini?"ui-rangeslider ui-mini":"ui-rangeslider",e=c.find("input").first(),f=c.find("input").last(),g=c.find("label").first(),h=a.data(e.get(0),"mobileSlider").slider,i=a.data(f.get(0),"mobileSlider").slider,j=a.data(e.get(0),"mobileSlider").handle,k=a('<div class="ui-rangeslider-sliders" />').appendTo(c);c.find("label").length>1&&(b=c.find("label").last().hide()),e.addClass("ui-rangeslider-first"),f.addClass("ui-rangeslider-last"),c.addClass(d),h.appendTo(k),i.appendTo(k),g.prependTo(c),j.prependTo(i),a.extend(this,{_inputFirst:e,_inputLast:f,_sliderFirst:h,_sliderLast:i,_targetVal:null,_sliderTarget:!1,_sliders:k,_proxy:!1}),this.refresh(),this._on(this.element.find("input.ui-slider-input"),{slidebeforestart:"_slidebeforestart",slidestop:"_slidestop",slidedrag:"_slidedrag",slidebeforechange:"_change",blur:"_change",keyup:"_change"}),this._on({mousedown:"_change"}),this._on(this.element.closest("form"),{reset:"_handleReset"}),this._on(j,{vmousedown:"_dragFirstHandle"})},_handleReset:function(){var a=this;setTimeout(function(){a._updateHighlight()},0)},_dragFirstHandle:function(b){return a.data(this._inputFirst.get(0),"mobileSlider").dragging=!0,a.data(this._inputFirst.get(0),"mobileSlider").refresh(b),!1},_slidedrag:function(b){var c=a(b.target).is(this._inputFirst),d=c?this._inputLast:this._inputFirst;return this._sliderTarget=!1,"first"===this._proxy&&c||"last"===this._proxy&&!c?(a.data(d.get(0),"mobileSlider").dragging=!0,a.data(d.get(0),"mobileSlider").refresh(b),!1):void 0},_slidestop:function(b){var c=a(b.target).is(this._inputFirst);this._proxy=!1,this.element.find("input").trigger("vmouseup"),this._sliderFirst.css("z-index",c?1:"")},_slidebeforestart:function(b){this._sliderTarget=!1,a(b.originalEvent.target).hasClass("ui-slider-track")&&(this._sliderTarget=!0,this._targetVal=a(b.target).val())},_setOption:function(a){this._superApply(a),this.refresh()},refresh:function(){var a=this.element,b=this.options;a.find("input").slider({theme:b.theme,trackTheme:b.trackTheme,disabled:b.disabled,mini:b.mini,highlight:b.highlight}).slider("refresh"),this._updateHighlight()},_change:function(b){if("keyup"===b.type)return this._updateHighlight(),!1;var c=this,d=parseFloat(this._inputFirst.val(),10),e=parseFloat(this._inputLast.val(),10),f=a(b.target).hasClass("ui-rangeslider-first"),g=f?this._inputFirst:this._inputLast,h=f?this._inputLast:this._inputFirst;if(this._inputFirst.val()>this._inputLast.val()&&"mousedown"===b.type&&!a(b.target).hasClass("ui-slider-handle"))g.blur();else if("mousedown"===b.type)return;return d>e&&!this._sliderTarget?(g.val(f?e:d).slider("refresh"),this._trigger("normalize")):d>e&&(g.val(this._targetVal).slider("refresh"),setTimeout(function(){h.val(f?d:e).slider("refresh"),a.data(h.get(0),"mobileSlider").handle.focus(),c._sliderFirst.css("z-index",f?"":1),c._trigger("normalize")},0),this._proxy=f?"first":"last"),d===e?(a.data(g.get(0),"mobileSlider").handle.css("z-index",1),a.data(h.get(0),"mobileSlider").handle.css("z-index",0)):(a.data(h.get(0),"mobileSlider").handle.css("z-index",""),a.data(g.get(0),"mobileSlider").handle.css("z-index","")),this._updateHighlight(),d>=e?!1:void 0},_updateHighlight:function(){var b=parseInt(a.data(this._inputFirst.get(0),"mobileSlider").handle.get(0).style.left,10),c=parseInt(a.data(this._inputLast.get(0),"mobileSlider").handle.get(0).style.left,10),d=c-b;this.element.find(".ui-slider-bg").css({"margin-left":b+"%",width:d+"%"})},_destroy:function(){this.element.removeClass("ui-rangeslider ui-mini").find("label").show(),this._inputFirst.after(this._sliderFirst),this._inputLast.after(this._sliderLast),this._sliders.remove(),this.element.find("input").removeClass("ui-rangeslider-first ui-rangeslider-last").slider("destroy")}}),a.widget("mobile.rangeslider",a.mobile.rangeslider,a.mobile.behaviors.formReset),a(c).bind("pagecreate create",function(b){a.mobile.rangeslider.prototype.enhanceWithin(b.target,!0)})}(a),function(a){a.widget("mobile.selectmenu",a.mobile.widget,a.extend({options:{theme:null,disabled:!1,icon:"arrow-d",iconpos:"right",inline:!1,corners:!0,shadow:!0,iconshadow:!0,overlayTheme:"a",dividerTheme:"b",hidePlaceholderMenuItems:!0,closeText:"Close",nativeMenu:!0,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"select:not( :jqmData(role='slider') )",mini:!1},_button:function(){return a("<div/>")
-},_setDisabled:function(a){return this.element.attr("disabled",a),this.button.attr("aria-disabled",a),this._setOption("disabled",a)},_focusButton:function(){var a=this;setTimeout(function(){a.button.focus()},40)},_selectOptions:function(){return this.select.find("option")},_preExtension:function(){var b="";~this.element[0].className.indexOf("ui-btn-left")&&(b=" ui-btn-left"),~this.element[0].className.indexOf("ui-btn-right")&&(b=" ui-btn-right"),this.select=this.element.removeClass("ui-btn-left ui-btn-right").wrap("<div class='ui-select"+b+"'>"),this.selectID=this.select.attr("id"),this.label=a("label[for='"+this.selectID+"']").addClass("ui-select"),this.isMultiple=this.select[0].multiple,this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.select,"c"))},_destroy:function(){var a=this.element.parents(".ui-select");a.length>0&&(a.is(".ui-btn-left, .ui-btn-right")&&this.element.addClass(a.is(".ui-btn-left")?"ui-btn-left":"ui-btn-right"),this.element.insertAfter(a),a.remove())},_create:function(){this._preExtension(),this._trigger("beforeCreate"),this.button=this._button();var c=this,d=this.options,e=d.inline||this.select.jqmData("inline"),f=d.mini||this.select.jqmData("mini"),g=d.icon?d.iconpos||this.select.jqmData("iconpos"):!1,h=(-1===this.select[0].selectedIndex?0:this.select[0].selectedIndex,this.button.insertBefore(this.select).buttonMarkup({theme:d.theme,icon:d.icon,iconpos:g,inline:e,corners:d.corners,shadow:d.shadow,iconshadow:d.iconshadow,mini:f}));this.setButtonText(),d.nativeMenu&&b.opera&&b.opera.version&&h.addClass("ui-select-nativeonly"),this.isMultiple&&(this.buttonCount=a("<span>").addClass("ui-li-count ui-btn-up-c ui-btn-corner-all").hide().appendTo(h.addClass("ui-li-has-count"))),(d.disabled||this.element.attr("disabled"))&&this.disable(),this.select.change(function(){c.refresh(),d.nativeMenu&&this.blur()}),this._handleFormReset(),this.build()},build:function(){var b=this;this.select.appendTo(b.button).bind("vmousedown",function(){b.button.addClass(a.mobile.activeBtnClass)}).bind("focus",function(){b.button.addClass(a.mobile.focusClass)}).bind("blur",function(){b.button.removeClass(a.mobile.focusClass)}).bind("focus vmouseover",function(){b.button.trigger("vmouseover")}).bind("vmousemove",function(){b.button.removeClass(a.mobile.activeBtnClass)}).bind("change blur vmouseout",function(){b.button.trigger("vmouseout").removeClass(a.mobile.activeBtnClass)}).bind("change blur",function(){b.button.removeClass("ui-btn-down-"+b.options.theme)}),b.button.bind("vmousedown",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.label.bind("click focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.select.bind("focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.button.bind("mouseup",function(){b.options.preventFocusZoom&&setTimeout(function(){a.mobile.zoom.enable(!0)},0)}),b.select.bind("blur",function(){b.options.preventFocusZoom&&a.mobile.zoom.enable(!0)})},selected:function(){return this._selectOptions().filter(":selected")},selectedIndices:function(){var a=this;return this.selected().map(function(){return a._selectOptions().index(this)}).get()},setButtonText:function(){var b=this,d=this.selected(),e=this.placeholder,f=a(c.createElement("span"));this.button.find(".ui-btn-text").html(function(){return e=d.length?d.map(function(){return a(this).text()}).get().join(", "):b.placeholder,f.text(e).addClass(b.select.attr("class")).addClass(d.attr("class"))})},setButtonCount:function(){var a=this.selected();this.isMultiple&&this.buttonCount[a.length>1?"show":"hide"]().text(a.length)},_reset:function(){this.refresh()},refresh:function(){this.setButtonText(),this.setButtonCount()},open:a.noop,close:a.noop,disable:function(){this._setDisabled(!0),this.button.addClass("ui-disabled")},enable:function(){this._setDisabled(!1),this.button.removeClass("ui-disabled")}},a.mobile.behaviors.formReset)),a.mobile.document.bind("pagecreate create",function(b){a.mobile.selectmenu.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){function e(a,b,c,d){var e=d;return e=b>a?c+(a-b)/2:Math.min(Math.max(c,d-b/2),c+a-b)}function f(){var c=a.mobile.window;return{x:c.scrollLeft(),y:c.scrollTop(),cx:b.innerWidth||c.width(),cy:b.innerHeight||c.height()}}a.widget("mobile.popup",a.mobile.widget,{options:{theme:null,overlayTheme:null,shadow:!0,corners:!0,transition:"none",positionTo:"origin",tolerance:null,initSelector:":jqmData(role='popup')",closeLinkSelector:"a:jqmData(rel='back')",closeLinkEvents:"click.popup",navigateEvents:"navigate.popup",closeEvents:"navigate.popup pagebeforechange.popup",dismissible:!0,history:!a.mobile.browser.oldIE},_eatEventAndClose:function(a){return a.preventDefault(),a.stopImmediatePropagation(),this.options.dismissible&&this.close(),!1},_resizeScreen:function(){var a=this._ui.container.outerHeight(!0);this._ui.screen.removeAttr("style"),a>this._ui.screen.height()&&this._ui.screen.height(a)},_handleWindowKeyUp:function(b){return this._isOpen&&b.keyCode===a.mobile.keyCode.ESCAPE?this._eatEventAndClose(b):void 0},_expectResizeEvent:function(){var b=f();if(this._resizeData){if(b.x===this._resizeData.winCoords.x&&b.y===this._resizeData.winCoords.y&&b.cx===this._resizeData.winCoords.cx&&b.cy===this._resizeData.winCoords.cy)return!1;clearTimeout(this._resizeData.timeoutId)}return this._resizeData={timeoutId:setTimeout(a.proxy(this,"_resizeTimeout"),200),winCoords:b},!0},_resizeTimeout:function(){this._isOpen?this._expectResizeEvent()||(this._ui.container.hasClass("ui-popup-hidden")&&(this._ui.container.removeClass("ui-popup-hidden"),this.reposition({positionTo:"window"}),this._ignoreResizeEvents()),this._resizeScreen(),this._resizeData=null,this._orientationchangeInProgress=!1):(this._resizeData=null,this._orientationchangeInProgress=!1)},_ignoreResizeEvents:function(){var a=this;this._ignoreResizeTo&&clearTimeout(this._ignoreResizeTo),this._ignoreResizeTo=setTimeout(function(){a._ignoreResizeTo=0},1e3)},_handleWindowResize:function(){this._isOpen&&0===this._ignoreResizeTo&&(!this._expectResizeEvent()&&!this._orientationchangeInProgress||this._ui.container.hasClass("ui-popup-hidden")||this._ui.container.addClass("ui-popup-hidden").removeAttr("style"))},_handleWindowOrientationchange:function(){!this._orientationchangeInProgress&&this._isOpen&&0===this._ignoreResizeTo&&(this._expectResizeEvent(),this._orientationchangeInProgress=!0)},_handleDocumentFocusIn:function(b){var d,e=b.target,f=this._ui;if(this._isOpen){if(e!==f.container[0]){if(d=a(b.target),0===d.parents().filter(f.container[0]).length)return a(c.activeElement).one("focus",function(){d.blur()}),f.focusElement.focus(),b.preventDefault(),b.stopImmediatePropagation(),!1;f.focusElement[0]===f.container[0]&&(f.focusElement=d)}this._ignoreResizeEvents()}},_create:function(){var b={screen:a("<div class='ui-screen-hidden ui-popup-screen'></div>"),placeholder:a("<div style='display: none;'><!-- placeholder --></div>"),container:a("<div class='ui-popup-container ui-popup-hidden'></div>")},c=this.element.closest(".ui-page"),d=this.element.attr("id"),e=this.options;e.history=e.history&&a.mobile.ajaxEnabled&&a.mobile.hashListeningEnabled,0===c.length&&(c=a("body")),e.container=e.container||a.mobile.pageContainer||c,c.append(b.screen),b.container.insertAfter(b.screen),b.placeholder.insertAfter(this.element),d&&(b.screen.attr("id",d+"-screen"),b.container.attr("id",d+"-popup"),b.placeholder.html("<!-- placeholder for "+d+" -->")),b.container.append(this.element),b.focusElement=b.container,this.element.addClass("ui-popup"),a.extend(this,{_scrollTop:0,_page:c,_ui:b,_fallbackTransition:"",_currentTransition:!1,_prereqs:null,_isOpen:!1,_tolerance:null,_resizeData:null,_ignoreResizeTo:0,_orientationchangeInProgress:!1}),this._applyTheme(this.element,e.theme,"body"),this._applyTheme(this._ui.screen,e.overlayTheme,"overlay"),this._applyTransition(e.transition),this.element.toggleClass("ui-overlay-shadow",e.shadow).toggleClass("ui-corner-all",e.corners),this._setTolerance(e.tolerance),b.screen.bind("vclick",a.proxy(this,"_eatEventAndClose")),this._on(a.mobile.window,{orientationchange:a.proxy(this,"_handleWindowOrientationchange"),resize:a.proxy(this,"_handleWindowResize"),keyup:a.proxy(this,"_handleWindowKeyUp")}),this._on(a.mobile.document,{focusin:a.proxy(this,"_handleDocumentFocusIn")})},_applyTheme:function(a,b,c){for(var d,e=(a.attr("class")||"").split(" "),f=null,g=String(b);e.length>0;){if(f=e.pop(),d=new RegExp("^ui-"+c+"-([a-z])$").exec(f),d&&d.length>1){f=d[1];break}f=null}b!==f&&(a.removeClass("ui-"+c+"-"+f),null!==b&&"none"!==b&&a.addClass("ui-"+c+"-"+g))},_setTheme:function(a){this._applyTheme(this.element,a,"body")},_setOverlayTheme:function(a){this._applyTheme(this._ui.screen,a,"overlay"),this._isOpen&&this._ui.screen.addClass("in")},_setShadow:function(a){this.element.toggleClass("ui-overlay-shadow",a)},_setCorners:function(a){this.element.toggleClass("ui-corner-all",a)},_applyTransition:function(b){this._ui.container.removeClass(this._fallbackTransition),b&&"none"!==b&&(this._fallbackTransition=a.mobile._maybeDegradeTransition(b),"none"===this._fallbackTransition&&(this._fallbackTransition=""),this._ui.container.addClass(this._fallbackTransition))},_setTransition:function(a){this._currentTransition||this._applyTransition(a)},_setTolerance:function(b){var c={t:30,r:15,b:30,l:15};if(b!==d){var e=String(b).split(",");switch(a.each(e,function(a,b){e[a]=parseInt(b,10)}),e.length){case 1:isNaN(e[0])||(c.t=c.r=c.b=c.l=e[0]);break;case 2:isNaN(e[0])||(c.t=c.b=e[0]),isNaN(e[1])||(c.l=c.r=e[1]);break;case 4:isNaN(e[0])||(c.t=e[0]),isNaN(e[1])||(c.r=e[1]),isNaN(e[2])||(c.b=e[2]),isNaN(e[3])||(c.l=e[3])}}this._tolerance=c},_setOption:function(a,b){var c="_set"+a.charAt(0).toUpperCase()+a.slice(1);this[c]!==d&&this[c](b),this._super(a,b)},_placementCoords:function(a){var b,d,g=f(),h={x:this._tolerance.l,y:g.y+this._tolerance.t,cx:g.cx-this._tolerance.l-this._tolerance.r,cy:g.cy-this._tolerance.t-this._tolerance.b};this._ui.container.css("max-width",h.cx),b={cx:this._ui.container.outerWidth(!0),cy:this._ui.container.outerHeight(!0)},d={x:e(h.cx,b.cx,h.x,a.x),y:e(h.cy,b.cy,h.y,a.y)},d.y=Math.max(0,d.y);var i=c.documentElement,j=c.body,k=Math.max(i.clientHeight,j.scrollHeight,j.offsetHeight,i.scrollHeight,i.offsetHeight);return d.y-=Math.min(d.y,Math.max(0,d.y+b.cy-k)),{left:d.x,top:d.y}},_createPrereqs:function(b,c,d){var e,f=this;e={screen:a.Deferred(),container:a.Deferred()},e.screen.then(function(){e===f._prereqs&&b()}),e.container.then(function(){e===f._prereqs&&c()}),a.when(e.screen,e.container).done(function(){e===f._prereqs&&(f._prereqs=null,d())}),f._prereqs=e},_animate:function(b){return this._ui.screen.removeClass(b.classToRemove).addClass(b.screenClassToAdd),b.prereqs.screen.resolve(),b.transition&&"none"!==b.transition&&(b.applyTransition&&this._applyTransition(b.transition),this._fallbackTransition)?(this._ui.container.animationComplete(a.proxy(b.prereqs.container,"resolve")).addClass(b.containerClassToAdd).removeClass(b.classToRemove),void 0):(this._ui.container.removeClass(b.classToRemove),b.prereqs.container.resolve(),void 0)},_desiredCoords:function(b){var c,d=null,e=f(),g=b.x,h=b.y,i=b.positionTo;if(i&&"origin"!==i)if("window"===i)g=e.cx/2+e.x,h=e.cy/2+e.y;else{try{d=a(i)}catch(j){d=null}d&&(d.filter(":visible"),0===d.length&&(d=null))}return d&&(c=d.offset(),g=c.left+d.outerWidth()/2,h=c.top+d.outerHeight()/2),("number"!==a.type(g)||isNaN(g))&&(g=e.cx/2+e.x),("number"!==a.type(h)||isNaN(h))&&(h=e.cy/2+e.y),{x:g,y:h}},_reposition:function(a){a={x:a.x,y:a.y,positionTo:a.positionTo},this._trigger("beforeposition",d,a),this._ui.container.offset(this._placementCoords(this._desiredCoords(a)))},reposition:function(a){this._isOpen&&this._reposition(a)},_openPrereqsComplete:function(){this._ui.container.addClass("ui-popup-active"),this._isOpen=!0,this._resizeScreen(),this._ui.container.attr("tabindex","0").focus(),this._ignoreResizeEvents(),this._trigger("afteropen")},_open:function(b){var c=a.extend({},this.options,b),d=function(){var a=navigator.userAgent,b=a.match(/AppleWebKit\/([0-9\.]+)/),c=!!b&&b[1],d=a.match(/Android (\d+(?:\.\d+))/),e=!!d&&d[1],f=a.indexOf("Chrome")>-1;return null!==d&&"4.0"===e&&c&&c>534.13&&!f?!0:!1}();this._createPrereqs(a.noop,a.noop,a.proxy(this,"_openPrereqsComplete")),this._currentTransition=c.transition,this._applyTransition(c.transition),this.options.theme||this._setTheme(this._page.jqmData("theme")||a.mobile.getInheritedTheme(this._page,"c")),this._ui.screen.removeClass("ui-screen-hidden"),this._ui.container.removeClass("ui-popup-hidden"),this._reposition(c),this.options.overlayTheme&&d&&this.element.closest(".ui-page").addClass("ui-popup-open"),this._animate({additionalCondition:!0,transition:c.transition,classToRemove:"",screenClassToAdd:"in",containerClassToAdd:"in",applyTransition:!1,prereqs:this._prereqs})},_closePrereqScreen:function(){this._ui.screen.removeClass("out").addClass("ui-screen-hidden")},_closePrereqContainer:function(){this._ui.container.removeClass("reverse out").addClass("ui-popup-hidden").removeAttr("style")},_closePrereqsDone:function(){var b=this._ui.container;b.removeAttr("tabindex"),a.mobile.popup.active=d,a(":focus",b[0]).add(b[0]).blur(),this._trigger("afterclose")},_close:function(b){this._ui.container.removeClass("ui-popup-active"),this._page.removeClass("ui-popup-open"),this._isOpen=!1,this._createPrereqs(a.proxy(this,"_closePrereqScreen"),a.proxy(this,"_closePrereqContainer"),a.proxy(this,"_closePrereqsDone")),this._animate({additionalCondition:this._ui.screen.hasClass("in"),transition:b?"none":this._currentTransition,classToRemove:"in",screenClassToAdd:"out",containerClassToAdd:"reverse out",applyTransition:!0,prereqs:this._prereqs})},_unenhance:function(){this._setTheme("none"),this.element.detach().insertAfter(this._ui.placeholder).removeClass("ui-popup ui-overlay-shadow ui-corner-all"),this._ui.screen.remove(),this._ui.container.remove(),this._ui.placeholder.remove()},_destroy:function(){a.mobile.popup.active===this?(this.element.one("popupafterclose",a.proxy(this,"_unenhance")),this.close()):this._unenhance()},_closePopup:function(c,d){var e,f,g=this.options,h=!1;b.scrollTo(0,this._scrollTop),c&&"pagebeforechange"===c.type&&d&&(e="string"==typeof d.toPage?d.toPage:d.toPage.jqmData("url"),e=a.mobile.path.parseUrl(e),f=e.pathname+e.search+e.hash,this._myUrl!==a.mobile.path.makeUrlAbsolute(f)?h=!0:c.preventDefault()),g.container.unbind(g.closeEvents),this.element.undelegate(g.closeLinkSelector,g.closeLinkEvents),this._close(h)},_bindContainerClose:function(){this.options.container.one(this.options.closeEvents,a.proxy(this,"_closePopup"))},open:function(c){var d,e,f,g,h,i,j=this,k=this.options;if(!a.mobile.popup.active){if(a.mobile.popup.active=this,this._scrollTop=a.mobile.window.scrollTop(),!k.history)return j._open(c),j._bindContainerClose(),j.element.delegate(k.closeLinkSelector,k.closeLinkEvents,function(a){j.close(),a.preventDefault()}),void 0;if(i=a.mobile.urlHistory,e=a.mobile.dialogHashKey,f=a.mobile.activePage,g=f.is(".ui-dialog"),this._myUrl=d=i.getActive().url,h=d.indexOf(e)>-1&&!g&&i.activeIndex>0)return j._open(c),j._bindContainerClose(),void 0;-1!==d.indexOf(e)||g?d=a.mobile.path.parseLocation().hash+e:d+=d.indexOf("#")>-1?e:"#"+e,0===i.activeIndex&&d===i.initialDst&&(d+=e),a(b).one("beforenavigate",function(a){a.preventDefault(),j._open(c),j._bindContainerClose()}),this.urlAltered=!0,a.mobile.navigate(d,{role:"dialog"})}},close:function(){a.mobile.popup.active===this&&(this._scrollTop=a.mobile.window.scrollTop(),this.options.history&&this.urlAltered?(a.mobile.back(),this.urlAltered=!1):this._closePopup())}}),a.mobile.popup.handleLink=function(b){var c,d=b.closest(":jqmData(role='page')"),e=0===d.length?a("body"):d,f=a(a.mobile.path.parseUrl(b.attr("href")).hash,e[0]);f.data("mobile-popup")&&(c=b.offset(),f.popup("open",{x:c.left+b.outerWidth()/2,y:c.top+b.outerHeight()/2,transition:b.jqmData("transition"),positionTo:b.jqmData("position-to")})),setTimeout(function(){var c=b.parent().parent();c.hasClass("ui-li")&&(b=c.parent()),b.removeClass(a.mobile.activeBtnClass)},300)},a.mobile.document.bind("pagebeforechange",function(b,c){"popup"===c.options.role&&(a.mobile.popup.handleLink(c.options.link),b.preventDefault())}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.popup.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){var d=function(d){var e,f,g,h=(d.select,d._destroy),i=d.selectID,j=i?i:(a.mobile.ns||"")+"uuid-"+d.uuid,k=j+"-listbox",l=j+"-dialog",m=d.label,n=d.select.closest(".ui-page"),o=d._selectOptions(),p=d.isMultiple=d.select[0].multiple,q=i+"-button",r=i+"-menu",s=a("<div data-"+a.mobile.ns+"role='dialog' id='"+l+"' data-"+a.mobile.ns+"theme='"+d.options.theme+"' data-"+a.mobile.ns+"overlay-theme='"+d.options.overlayTheme+"'>"+"<div data-"+a.mobile.ns+"role='header'>"+"<div class='ui-title'>"+m.getEncodedText()+"</div>"+"</div>"+"<div data-"+a.mobile.ns+"role='content'></div>"+"</div>"),t=a("<div id='"+k+"' class='ui-selectmenu'>").insertAfter(d.select).popup({theme:d.options.overlayTheme}),u=a("<ul>",{"class":"ui-selectmenu-list",id:r,role:"listbox","aria-labelledby":q}).attr("data-"+a.mobile.ns+"theme",d.options.theme).attr("data-"+a.mobile.ns+"divider-theme",d.options.dividerTheme).appendTo(t),v=a("<div>",{"class":"ui-header ui-bar-"+d.options.theme}).prependTo(t),w=a("<h1>",{"class":"ui-title"}).appendTo(v);d.isMultiple&&(g=a("<a>",{text:d.options.closeText,href:"#","class":"ui-btn-left"}).attr("data-"+a.mobile.ns+"iconpos","notext").attr("data-"+a.mobile.ns+"icon","delete").appendTo(v).buttonMarkup()),a.extend(d,{select:d.select,selectID:i,buttonId:q,menuId:r,popupID:k,dialogID:l,thisPage:n,menuPage:s,label:m,selectOptions:o,isMultiple:p,theme:d.options.theme,listbox:t,list:u,header:v,headerTitle:w,headerClose:g,menuPageContent:e,menuPageClose:f,placeholder:"",build:function(){var c=this,e=function(a){return a.replace(/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g,"\\$1")};c.refresh(),c._origTabIndex===b&&(c._origTabIndex=null===c.select[0].getAttribute("tabindex")?!1:c.select.attr("tabindex")),c.select.attr("tabindex","-1").focus(function(){a(this).blur(),c.button.focus()}),c.button.bind("vclick keydown",function(b){c.options.disabled||c.isOpen||("vclick"===b.type||b.keyCode&&(b.keyCode===a.mobile.keyCode.ENTER||b.keyCode===a.mobile.keyCode.SPACE))&&(c._decideFormat(),"overlay"===c.menuType?c.button.attr("href","#"+e(c.popupID)).attr("data-"+(a.mobile.ns||"")+"rel","popup"):c.button.attr("href","#"+e(c.dialogID)).attr("data-"+(a.mobile.ns||"")+"rel","dialog"),c.isOpen=!0)}),c.list.attr("role","listbox").bind("focusin",function(b){a(b.target).attr("tabindex","0").trigger("vmouseover")}).bind("focusout",function(b){a(b.target).attr("tabindex","-1").trigger("vmouseout")}).delegate("li:not(.ui-disabled, .ui-li-divider)","click",function(b){var e=c.select[0].selectedIndex,f=c.list.find("li:not(.ui-li-divider)").index(this),g=c._selectOptions().eq(f)[0];g.selected=c.isMultiple?!g.selected:!0,c.isMultiple&&a(this).find(".ui-icon").toggleClass("ui-icon-checkbox-on",g.selected).toggleClass("ui-icon-checkbox-off",!g.selected),(c.isMultiple||e!==f)&&c.select.trigger("change"),c.isMultiple?c.list.find("li:not(.ui-li-divider)").eq(f).addClass("ui-btn-down-"+d.options.theme).find("a").first().focus():c.close(),b.preventDefault()}).keydown(function(b){var c,e,f=a(b.target),g=f.closest("li");switch(b.keyCode){case 38:return c=g.prev().not(".ui-selectmenu-placeholder"),c.is(".ui-li-divider")&&(c=c.prev()),c.length&&(f.blur().attr("tabindex","-1"),c.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 40:return e=g.next(),e.is(".ui-li-divider")&&(e=e.next()),e.length&&(f.blur().attr("tabindex","-1"),e.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 13:case 32:return f.trigger("click"),!1}}),c.menuPage.bind("pagehide",function(){a.mobile._bindPageRemove.call(c.thisPage)}),c.listbox.bind("popupafterclose",function(){c.close()}),c.isMultiple&&c.headerClose.click(function(){return"overlay"===c.menuType?(c.close(),!1):void 0}),c.thisPage.addDependents(this.menuPage)},_isRebuildRequired:function(){var a=this.list.find("li"),b=this._selectOptions();return b.text()!==a.text()},selected:function(){return this._selectOptions().filter(":selected:not( :jqmData(placeholder='true') )")},refresh:function(b){var c,d=this;this.element,this.isMultiple,(b||this._isRebuildRequired())&&d._buildList(),c=this.selectedIndices(),d.setButtonText(),d.setButtonCount(),d.list.find("li:not(.ui-li-divider)").removeClass(a.mobile.activeBtnClass).attr("aria-selected",!1).each(function(b){if(a.inArray(b,c)>-1){var e=a(this);e.attr("aria-selected",!0),d.isMultiple?e.find(".ui-icon").removeClass("ui-icon-checkbox-off").addClass("ui-icon-checkbox-on"):e.is(".ui-selectmenu-placeholder")?e.next().addClass(a.mobile.activeBtnClass):e.addClass(a.mobile.activeBtnClass)}})},close:function(){if(!this.options.disabled&&this.isOpen){var a=this;"page"===a.menuType?(a.menuPage.dialog("close"),a.list.appendTo(a.listbox)):a.listbox.popup("close"),a._focusButton(),a.isOpen=!1}},open:function(){this.button.click()},_decideFormat:function(){function b(){var b=c.list.find("."+a.mobile.activeBtnClass+" a");0===b.length&&(b=c.list.find("li.ui-btn:not( :jqmData(placeholder='true') ) a")),b.first().focus().closest("li").addClass("ui-btn-down-"+d.options.theme)}var c=this,e=a.mobile.window,f=c.list.parent(),g=f.outerHeight(),h=(f.outerWidth(),a("."+a.mobile.activePageClass),e.scrollTop()),i=c.button.offset().top,j=e.height();e.width(),g>j-80||!a.support.scrollTop?(c.menuPage.appendTo(a.mobile.pageContainer).page(),c.menuPageContent=s.find(".ui-content"),c.menuPageClose=s.find(".ui-header a"),c.thisPage.unbind("pagehide.remove"),0===h&&i>j&&c.thisPage.one("pagehide",function(){a(this).jqmData("lastScroll",i)}),c.menuPage.one("pageshow",function(){b()}).one("pagehide",function(){c.close()}),c.menuType="page",c.menuPageContent.append(c.list),c.menuPage.find("div .ui-title").text(c.label.text())):(c.menuType="overlay",c.listbox.one("popupafteropen",b))},_buildList:function(){var b=this,d=this.options,e=this.placeholder,f=!0,g=b.isMultiple?"checkbox-off":"false";b.list.empty().filter(".ui-listview").listview("destroy");for(var h,i=b.select.find("option"),j=i.length,k=this.select[0],l="data-"+a.mobile.ns,m=l+"option-index",n=l+"icon",o=l+"role",p=l+"placeholder",q=c.createDocumentFragment(),r=!1,s=0;j>s;s++,r=!1){var t=i[s],u=a(t),v=t.parentNode,w=u.text(),x=c.createElement("a"),y=[];if(x.setAttribute("href","#"),x.appendChild(c.createTextNode(w)),v!==k&&"optgroup"===v.nodeName.toLowerCase()){var z=v.getAttribute("label");if(z!==h){var A=c.createElement("li");A.setAttribute(o,"list-divider"),A.setAttribute("role","option"),A.setAttribute("tabindex","-1"),A.appendChild(c.createTextNode(z)),q.appendChild(A),h=z}}!f||t.getAttribute("value")&&0!==w.length&&!u.jqmData("placeholder")||(f=!1,r=!0,null===t.getAttribute(p)&&(this._removePlaceholderAttr=!0),t.setAttribute(p,!0),d.hidePlaceholderMenuItems&&y.push("ui-selectmenu-placeholder"),e!==w&&(e=b.placeholder=w));var B=c.createElement("li");t.disabled&&(y.push("ui-disabled"),B.setAttribute("aria-disabled",!0)),B.setAttribute(m,s),B.setAttribute(n,g),r&&B.setAttribute(p,!0),B.className=y.join(" "),B.setAttribute("role","option"),x.setAttribute("tabindex","-1"),B.appendChild(x),q.appendChild(B)}b.list[0].appendChild(q),this.isMultiple||e.length?this.headerTitle.text(this.placeholder):this.header.hide(),b.list.listview()},_button:function(){return a("<a>",{href:"#",role:"button",id:this.buttonId,"aria-haspopup":"true","aria-owns":this.menuId})},_destroy:function(){this.close(),this._origTabIndex!==b&&(this._origTabIndex!==!1?this.select.attr("tabindex",this._origTabIndex):this.select.removeAttr("tabindex")),this._removePlaceholderAttr&&this._selectOptions().removeAttr("data-"+a.mobile.ns+"placeholder"),this.listbox.remove(),this.menuPage.remove(),h.apply(this,arguments)}})};a.mobile.document.bind("selectmenubeforecreate",function(b){var c=a(b.target).data("mobile-selectmenu");c.options.nativeMenu||0!==c.element.parents(":jqmData(role='popup')").length||d(c)})}(a),function(a,b){a.widget("mobile.controlgroup",a.mobile.widget,a.extend({options:{shadow:!1,corners:!0,excludeInvisible:!0,type:"vertical",mini:!1,initSelector:":jqmData(role='controlgroup')"},_create:function(){var c=this.element,d={inner:a("<div class='ui-controlgroup-controls'></div>"),legend:a("<div role='heading' class='ui-controlgroup-label'></div>")},e=c.children("legend"),f=this;c.wrapInner(d.inner),e.length&&d.legend.append(e).insertBefore(c.children(0)),c.addClass("ui-corner-all ui-controlgroup"),a.extend(this,{_initialRefresh:!0}),a.each(this.options,function(a,c){f.options[a]=b,f._setOption(a,c,!0)})},_init:function(){this.refresh()},_setOption:function(c,d){var e="_set"+c.charAt(0).toUpperCase()+c.slice(1);this[e]!==b&&this[e](d),this._super(c,d),this.element.attr("data-"+(a.mobile.ns||"")+c.replace(/([A-Z])/,"-$1").toLowerCase(),d)},_setType:function(a){this.element.removeClass("ui-controlgroup-horizontal ui-controlgroup-vertical").addClass("ui-controlgroup-"+a),this.refresh()},_setCorners:function(a){this.element.toggleClass("ui-corner-all",a)},_setShadow:function(a){this.element.toggleClass("ui-shadow",a)},_setMini:function(a){this.element.toggleClass("ui-mini",a)},container:function(){return this.element.children(".ui-controlgroup-controls")},refresh:function(){var b=this.element.find(".ui-btn").not(".ui-slider-handle"),c=this._initialRefresh;a.mobile.checkboxradio&&this.element.find(":mobile-checkboxradio").checkboxradio("refresh"),this._addFirstLastClasses(b,this.options.excludeInvisible?this._getVisibles(b,c):b,c),this._initialRefresh=!1}},a.mobile.behaviors.addFirstLastClasses)),a(function(){a.mobile.document.bind("pagecreate create",function(b){a.mobile.controlgroup.prototype.enhanceWithin(b.target,!0)})})}(a),function(a){a(c).bind("pagecreate create",function(b){a(b.target).find("a").jqmEnhanceable().filter(":jqmData(rel='popup')[href][href!='']").each(function(){var b=this,d=a(this).attr("href"),e=d.substring(1);b.setAttribute("aria-haspopup",!0),b.setAttribute("aria-owns",e),b.setAttribute("aria-expanded",!1),a(c).on("popupafteropen",d,function(){b.setAttribute("aria-expanded",!0)}).on("popupafterclose",d,function(){b.setAttribute("aria-expanded",!1)})}).end().not(".ui-btn, .ui-link-inherit, :jqmData(role='none'), :jqmData(role='nojs')").addClass("ui-link")})}(a),function(a,b){a.widget("mobile.fixedtoolbar",a.mobile.widget,{options:{visibleOnPageShow:!0,disablePageZoom:!0,transition:"slide",fullscreen:!1,tapToggle:!0,tapToggleBlacklist:"a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup, .ui-panel, .ui-panel-dismiss-open",hideDuringFocus:"input, textarea, select",updatePagePadding:!0,trackPersistentToolbars:!0,supportBlacklist:function(){return!a.support.fixedPosition},initSelector:":jqmData(position='fixed')"},_create:function(){var b=this,c=b.options,d=b.element,e=d.is(":jqmData(role='header')")?"header":"footer",f=d.closest(".ui-page");return c.supportBlacklist()?(b.destroy(),void 0):(d.addClass("ui-"+e+"-fixed"),c.fullscreen?(d.addClass("ui-"+e+"-fullscreen"),f.addClass("ui-page-"+e+"-fullscreen")):f.addClass("ui-page-"+e+"-fixed"),a.extend(this,{_thisPage:null}),b._addTransitionClass(),b._bindPageEvents(),b._bindToggleHandlers(),void 0)},_addTransitionClass:function(){var a=this.options.transition;a&&"none"!==a&&("slide"===a&&(a=this.element.is(".ui-header")?"slidedown":"slideup"),this.element.addClass(a))},_bindPageEvents:function(){this._thisPage=this.element.closest(".ui-page"),this._on(this._thisPage,{pagebeforeshow:"_handlePageBeforeShow",webkitAnimationStart:"_handleAnimationStart",animationstart:"_handleAnimationStart",updatelayout:"_handleAnimationStart",pageshow:"_handlePageShow",pagebeforehide:"_handlePageBeforeHide"})},_handlePageBeforeShow:function(){var b=this.options;b.disablePageZoom&&a.mobile.zoom.disable(!0),b.visibleOnPageShow||this.hide(!0)},_handleAnimationStart:function(){this.options.updatePagePadding&&this.updatePagePadding(this._thisPage)},_handlePageShow:function(){this.updatePagePadding(this._thisPage),this.options.updatePagePadding&&this._on(a.mobile.window,{throttledresize:"updatePagePadding"})},_handlePageBeforeHide:function(b,c){var d=this.options;if(d.disablePageZoom&&a.mobile.zoom.enable(!0),d.updatePagePadding&&this._off(a.mobile.window,"throttledresize"),d.trackPersistentToolbars){var e=a(".ui-footer-fixed:jqmData(id)",this._thisPage),f=a(".ui-header-fixed:jqmData(id)",this._thisPage),g=e.length&&c.nextPage&&a(".ui-footer-fixed:jqmData(id='"+e.jqmData("id")+"')",c.nextPage)||a(),h=f.length&&c.nextPage&&a(".ui-header-fixed:jqmData(id='"+f.jqmData("id")+"')",c.nextPage)||a();(g.length||h.length)&&(g.add(h).appendTo(a.mobile.pageContainer),c.nextPage.one("pageshow",function(){h.prependTo(this),g.appendTo(this)}))}},_visible:!0,updatePagePadding:function(c){var d=this.element,e=d.is(".ui-header"),f=parseFloat(d.css(e?"top":"bottom"));this.options.fullscreen||(c=c&&c.type===b&&c||this._thisPage||d.closest(".ui-page"),a(c).css("padding-"+(e?"top":"bottom"),d.outerHeight()+f))},_useTransition:function(b){var c=a.mobile.window,d=this.element,e=c.scrollTop(),f=d.height(),g=d.closest(".ui-page").height(),h=a.mobile.getScreenHeight(),i=d.is(":jqmData(role='header')")?"header":"footer";return!b&&(this.options.transition&&"none"!==this.options.transition&&("header"===i&&!this.options.fullscreen&&e>f||"footer"===i&&!this.options.fullscreen&&g-f>e+h)||this.options.fullscreen)},show:function(a){var b="ui-fixed-hidden",c=this.element;this._useTransition(a)?c.removeClass("out "+b).addClass("in").animationComplete(function(){c.removeClass("in")}):c.removeClass(b),this._visible=!0},hide:function(a){var b="ui-fixed-hidden",c=this.element,d="out"+("slide"===this.options.transition?" reverse":"");this._useTransition(a)?c.addClass(d).removeClass("in").animationComplete(function(){c.addClass(b).removeClass(d)}):c.addClass(b).removeClass(d),this._visible=!1},toggle:function(){this[this._visible?"hide":"show"]()},_bindToggleHandlers:function(){var b,c,d=this,e=d.options,f=d.element,g=!0;f.closest(".ui-page").bind("vclick",function(b){e.tapToggle&&!a(b.target).closest(e.tapToggleBlacklist).length&&d.toggle()}).bind("focusin focusout",function(f){screen.width<1025&&a(f.target).is(e.hideDuringFocus)&&!a(f.target).closest(".ui-header-fixed, .ui-footer-fixed").length&&("focusout"!==f.type||g?"focusin"===f.type&&g&&(clearTimeout(b),g=!1,c=setTimeout(function(){d.hide()},0)):(g=!0,clearTimeout(c),b=setTimeout(function(){d.show()},0)))})},_destroy:function(){var a=this.element,b=a.is(".ui-header");a.closest(".ui-page").css("padding-"+(b?"top":"bottom"),""),a.removeClass("ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden"),a.closest(".ui-page").removeClass("ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen")}}),a.mobile.document.bind("pagecreate create",function(b){a(b.target).jqmData("fullscreen")&&a(a.mobile.fixedtoolbar.prototype.options.initSelector,b.target).not(":jqmData(fullscreen)").jqmData("fullscreen",!0),a.mobile.fixedtoolbar.prototype.enhanceWithin(b.target)})}(a),function(a){a.widget("mobile.fixedtoolbar",a.mobile.fixedtoolbar,{_create:function(){this._super(),this._workarounds()},_workarounds:function(){var a=navigator.userAgent,b=navigator.platform,c=a.match(/AppleWebKit\/([0-9]+)/),d=!!c&&c[1],e=null,f=this;if(b.indexOf("iPhone")>-1||b.indexOf("iPad")>-1||b.indexOf("iPod")>-1)e="ios";else{if(!(a.indexOf("Android")>-1))return;e="android"}if("ios"===e)f._bindScrollWorkaround();else{if(!("android"===e&&d&&534>d))return;f._bindScrollWorkaround(),f._bindListThumbWorkaround()}},_viewportOffset:function(){var b=this.element,c=b.is(".ui-header"),d=Math.abs(b.offset().top-a.mobile.window.scrollTop());
-return c||(d=Math.round(d-a.mobile.window.height()+b.outerHeight())-60),d},_bindScrollWorkaround:function(){var b=this;this._on(a.mobile.window,{scrollstop:function(){var a=b._viewportOffset();a>2&&b._visible&&b._triggerRedraw()}})},_bindListThumbWorkaround:function(){this.element.closest(".ui-page").addClass("ui-android-2x-fixed")},_triggerRedraw:function(){var b=parseFloat(a(".ui-page-active").css("padding-bottom"));a(".ui-page-active").css("padding-bottom",b+1+"px"),setTimeout(function(){a(".ui-page-active").css("padding-bottom",b+"px")},0)},destroy:function(){this._super(),this.element.closest(".ui-page-active").removeClass("ui-android-2x-fix")}})}(a),function(a,d){a.widget("mobile.panel",a.mobile.widget,{options:{classes:{panel:"ui-panel",panelOpen:"ui-panel-open",panelClosed:"ui-panel-closed",panelFixed:"ui-panel-fixed",panelInner:"ui-panel-inner",modal:"ui-panel-dismiss",modalOpen:"ui-panel-dismiss-open",pagePanel:"ui-page-panel",pagePanelOpen:"ui-page-panel-open",contentWrap:"ui-panel-content-wrap",contentWrapOpen:"ui-panel-content-wrap-open",contentWrapClosed:"ui-panel-content-wrap-closed",contentFixedToolbar:"ui-panel-content-fixed-toolbar",contentFixedToolbarOpen:"ui-panel-content-fixed-toolbar-open",contentFixedToolbarClosed:"ui-panel-content-fixed-toolbar-closed",animate:"ui-panel-animate"},animate:!0,theme:"c",position:"left",dismissible:!0,display:"reveal",initSelector:":jqmData(role='panel')",swipeClose:!0,positionFixed:!1},_panelID:null,_closeLink:null,_page:null,_modal:null,_panelInner:null,_wrapper:null,_fixedToolbar:null,_create:function(){var b=this,c=b.element,d=c.closest(":jqmData(role='page')"),e=function(){var b=a.data(d[0],"mobilePage").options.theme,c="ui-body-"+b;return c},f=function(){var a=c.find("."+b.options.classes.panelInner);return 0===a.length&&(a=c.children().wrapAll('<div class="'+b.options.classes.panelInner+'" />').parent()),a},g=function(){var c=d.find("."+b.options.classes.contentWrap);return 0===c.length&&(c=d.children(".ui-header:not(:jqmData(position='fixed')), .ui-content:not(:jqmData(role='popup')), .ui-footer:not(:jqmData(position='fixed'))").wrapAll('<div class="'+b.options.classes.contentWrap+" "+e()+'" />').parent(),a.support.cssTransform3d&&b.options.animate&&c.addClass(b.options.classes.animate)),c},h=function(){var c=d.find("."+b.options.classes.contentFixedToolbar);return 0===c.length&&(c=d.find(".ui-header:jqmData(position='fixed'), .ui-footer:jqmData(position='fixed')").addClass(b.options.classes.contentFixedToolbar),a.support.cssTransform3d&&b.options.animate&&c.addClass(b.options.classes.animate)),c};a.extend(this,{_panelID:c.attr("id"),_closeLink:c.find(":jqmData(rel='close')"),_page:c.closest(":jqmData(role='page')"),_pageTheme:e(),_panelInner:f(),_wrapper:g(),_fixedToolbar:h()}),b._addPanelClasses(),b._wrapper.addClass(this.options.classes.contentWrapClosed),b._fixedToolbar.addClass(this.options.classes.contentFixedToolbarClosed),b._page.addClass(b.options.classes.pagePanel),a.support.cssTransform3d&&b.options.animate&&this.element.addClass(b.options.classes.animate),b._bindUpdateLayout(),b._bindCloseEvents(),b._bindLinkListeners(),b._bindPageEvents(),b.options.dismissible&&b._createModal(),b._bindSwipeEvents()},_createModal:function(){var b=this;b._modal=a("<div class='"+b.options.classes.modal+"' data-panelid='"+b._panelID+"'></div>").on("mousedown",function(){b.close()}).appendTo(this._page)},_getPosDisplayClasses:function(a){return a+"-position-"+this.options.position+" "+a+"-display-"+this.options.display},_getPanelClasses:function(){var a=this.options.classes.panel+" "+this._getPosDisplayClasses(this.options.classes.panel)+" "+this.options.classes.panelClosed;return this.options.theme&&(a+=" ui-body-"+this.options.theme),this.options.positionFixed&&(a+=" "+this.options.classes.panelFixed),a},_addPanelClasses:function(){this.element.addClass(this._getPanelClasses())},_bindCloseEvents:function(){var a=this;a._closeLink.on("click.panel",function(b){return b.preventDefault(),a.close(),!1}),a.element.on("click.panel","a:jqmData(ajax='false')",function(){a.close()})},_positionPanel:function(){var b=this,c=b._panelInner.outerHeight(),d=c>a.mobile.getScreenHeight();d||!b.options.positionFixed?(d&&(b._unfixPanel(),a.mobile.resetActivePageHeight(c)),b._scrollIntoView(c)):b._fixPanel()},_scrollIntoView:function(c){c<a(b).scrollTop()&&b.scrollTo(0,0)},_bindFixListener:function(){this._on(a(b),{throttledresize:"_positionPanel"})},_unbindFixListener:function(){this._off(a(b),"throttledresize")},_unfixPanel:function(){this.options.positionFixed&&a.support.fixedPosition&&this.element.removeClass(this.options.classes.panelFixed)},_fixPanel:function(){this.options.positionFixed&&a.support.fixedPosition&&this.element.addClass(this.options.classes.panelFixed)},_bindUpdateLayout:function(){var a=this;a.element.on("updatelayout",function(){a._open&&a._positionPanel()})},_bindLinkListeners:function(){var b=this;b._page.on("click.panel","a",function(c){if(this.href.split("#")[1]===b._panelID&&b._panelID!==d){c.preventDefault();var e,f=a(this);return f.hasClass("ui-link")||(e=f.parent().parent(),e.hasClass("ui-li")&&(f=e.parent()),f.addClass(a.mobile.activeBtnClass),b.element.one("panelopen panelclose",function(){f.removeClass(a.mobile.activeBtnClass)})),b.toggle(),!1}})},_bindSwipeEvents:function(){var a=this,b=a._modal?a.element.add(a._modal):a.element;a.options.swipeClose&&("left"===a.options.position?b.on("swipeleft.panel",function(){a.close()}):b.on("swiperight.panel",function(){a.close()}))},_bindPageEvents:function(){var a=this;a._page.on("panelbeforeopen",function(b){a._open&&b.target!==a.element[0]&&a.close()}).on("pagehide",function(){a._open&&a.close(!0)}).on("keyup.panel",function(b){27===b.keyCode&&a._open&&a.close()})},_open:!1,_contentWrapOpenClasses:null,_fixedToolbarOpenClasses:null,_modalOpenClasses:null,open:function(b){if(!this._open){var c=this,d=c.options,e=function(){c._page.off("panelclose"),c._page.jqmData("panel","open"),!b&&a.support.cssTransform3d&&d.animate?c.element.add(c._wrapper).on(c._transitionEndEvents,f):setTimeout(f,0),c.options.theme&&"overlay"!==c.options.display&&c._page.removeClass(c._pageTheme).addClass("ui-body-"+c.options.theme),c.element.removeClass(d.classes.panelClosed).addClass(d.classes.panelOpen),c._positionPanel(),c.options.theme&&"overlay"!==c.options.display&&c._wrapper.css("min-height",c._page.css("min-height")),c._contentWrapOpenClasses=c._getPosDisplayClasses(d.classes.contentWrap),c._wrapper.removeClass(d.classes.contentWrapClosed).addClass(c._contentWrapOpenClasses+" "+d.classes.contentWrapOpen),c._fixedToolbarOpenClasses=c._getPosDisplayClasses(d.classes.contentFixedToolbar),c._fixedToolbar.removeClass(d.classes.contentFixedToolbarClosed).addClass(c._fixedToolbarOpenClasses+" "+d.classes.contentFixedToolbarOpen),c._modalOpenClasses=c._getPosDisplayClasses(d.classes.modal)+" "+d.classes.modalOpen,c._modal&&c._modal.addClass(c._modalOpenClasses)},f=function(){c.element.add(c._wrapper).off(c._transitionEndEvents,f),c._page.addClass(d.classes.pagePanelOpen),c._bindFixListener(),c._trigger("open")};this.element.closest(".ui-page-active").length<0&&(b=!0),c._trigger("beforeopen"),"open"===c._page.jqmData("panel")?c._page.on("panelclose",function(){e()}):e(),c._open=!0}},close:function(b){if(this._open){var c=this.options,d=this,e=function(){!b&&a.support.cssTransform3d&&c.animate?d.element.add(d._wrapper).on(d._transitionEndEvents,f):setTimeout(f,0),d._page.removeClass(c.classes.pagePanelOpen),d.element.removeClass(c.classes.panelOpen),d._wrapper.removeClass(c.classes.contentWrapOpen),d._fixedToolbar.removeClass(c.classes.contentFixedToolbarOpen),d._modal&&d._modal.removeClass(d._modalOpenClasses)},f=function(){d.options.theme&&"overlay"!==d.options.display&&(d._page.removeClass("ui-body-"+d.options.theme).addClass(d._pageTheme),d._wrapper.css("min-height","")),d.element.add(d._wrapper).off(d._transitionEndEvents,f),d.element.addClass(c.classes.panelClosed),d._wrapper.removeClass(d._contentWrapOpenClasses).addClass(c.classes.contentWrapClosed),d._fixedToolbar.removeClass(d._fixedToolbarOpenClasses).addClass(c.classes.contentFixedToolbarClosed),d._fixPanel(),d._unbindFixListener(),a.mobile.resetActivePageHeight(),d._page.jqmRemoveData("panel"),d._trigger("close")};this.element.closest(".ui-page-active").length<0&&(b=!0),d._trigger("beforeclose"),e(),d._open=!1}},toggle:function(){this[this._open?"close":"open"]()},_transitionEndEvents:"webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd",_destroy:function(){var b=this.options.classes,c=this.options.theme,d=this.element.siblings("."+b.panel).length;d?this._open&&(this._wrapper.removeClass(b.contentWrapOpen),this._fixedToolbar.removeClass(b.contentFixedToolbarOpen),this._page.jqmRemoveData("panel"),this._page.removeClass(b.pagePanelOpen),c&&this._page.removeClass("ui-body-"+c).addClass(this._pageTheme)):(this._wrapper.children().unwrap(),this._page.find("a").unbind("panelopen panelclose"),this._page.removeClass(b.pagePanel),this._open&&(this._page.jqmRemoveData("panel"),this._page.removeClass(b.pagePanelOpen),c&&this._page.removeClass("ui-body-"+c).addClass(this._pageTheme),a.mobile.resetActivePageHeight())),this._panelInner.children().unwrap(),this.element.removeClass([this._getPanelClasses(),b.panelAnimate].join(" ")).off("swipeleft.panel swiperight.panel").off("panelbeforeopen").off("panelhide").off("keyup.panel").off("updatelayout"),this._closeLink.off("click.panel"),this._modal&&this._modal.remove(),this.element.off(this._transitionEndEvents).removeClass([b.panelUnfixed,b.panelClosed,b.panelOpen].join(" "))}}),a(c).bind("pagecreate create",function(b){a.mobile.panel.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.table",a.mobile.widget,{options:{classes:{table:"ui-table"},initSelector:":jqmData(role='table')"},_create:function(){var a=this;a.refresh(!0)},refresh:function(c){var d=this,e=this.element.find("thead tr");c&&this.element.addClass(this.options.classes.table),d.headers=this.element.find("tr:eq(0)").children(),d.allHeaders=d.headers.add(e.children()),e.each(function(){var f=0;a(this).children().each(function(){var g=parseInt(a(this).attr("colspan"),10),h=":nth-child("+(f+1)+")";if(a(this).jqmData("colstart",f+1),g)for(var i=0;g-1>i;i++)f++,h+=", :nth-child("+(f+1)+")";c===b&&a(this).jqmData("cells",""),a(this).jqmData("cells",d.element.find("tr").not(e.eq(0)).not(this).children(h)),f++})}),c===b&&this.element.trigger("refresh")}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.table.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.mobile.table.prototype.options.mode="columntoggle",a.mobile.table.prototype.options.columnBtnTheme=null,a.mobile.table.prototype.options.columnPopupTheme=null,a.mobile.table.prototype.options.columnBtnText="Columns...",a.mobile.table.prototype.options.classes=a.extend(a.mobile.table.prototype.options.classes,{popup:"ui-table-columntoggle-popup",columnBtn:"ui-table-columntoggle-btn",priorityPrefix:"ui-table-priority-",columnToggleTable:"ui-table-columntoggle"}),a.mobile.document.delegate(":jqmData(role='table')","tablecreate refresh",function(c){var d,e,f,g,h=a(this),i=h.data("mobile-table"),j=c.type,k=i.options,l=a.mobile.ns,m=(h.attr("id")||k.classes.popup)+"-popup";"columntoggle"===k.mode&&("refresh"!==j&&(i.element.addClass(k.classes.columnToggleTable),d=a("<a href='#"+m+"' class='"+k.classes.columnBtn+"' data-"+l+"rel='popup' data-"+l+"mini='true'>"+k.columnBtnText+"</a>"),e=a("<div data-"+l+"role='popup' data-"+l+"role='fieldcontain' class='"+k.classes.popup+"' id='"+m+"'></div>"),f=a("<fieldset data-"+l+"role='controlgroup'></fieldset>")),i.headers.not("td").each(function(b){var c=a(this).jqmData("priority"),d=a(this).add(a(this).jqmData("cells"));c&&(d.addClass(k.classes.priorityPrefix+c),"refresh"!==j?a("<label><input type='checkbox' checked />"+a(this).text()+"</label>").appendTo(f).children(0).jqmData("cells",d).checkboxradio({theme:k.columnPopupTheme}):a("#"+m+" fieldset div:eq("+b+")").find("input").jqmData("cells",d))}),"refresh"!==j&&f.appendTo(e),g=f===b?a("#"+m+" fieldset"):f,"refresh"!==j&&(g.on("change","input",function(){this.checked?a(this).jqmData("cells").removeClass("ui-table-cell-hidden").addClass("ui-table-cell-visible"):a(this).jqmData("cells").removeClass("ui-table-cell-visible").addClass("ui-table-cell-hidden")}),d.insertBefore(h).buttonMarkup({theme:k.columnBtnTheme}),e.insertBefore(h).popup()),i.update=function(){g.find("input").each(function(){this.checked?(this.checked="table-cell"===a(this).jqmData("cells").eq(0).css("display"),"refresh"===j&&a(this).jqmData("cells").addClass("ui-table-cell-visible")):a(this).jqmData("cells").addClass("ui-table-cell-hidden"),a(this).checkboxradio("refresh")})},a.mobile.window.on("throttledresize",i.update),i.update())})}(a),function(a){a.mobile.table.prototype.options.mode="reflow",a.mobile.table.prototype.options.classes=a.extend(a.mobile.table.prototype.options.classes,{reflowTable:"ui-table-reflow",cellLabels:"ui-table-cell-label"}),a.mobile.document.delegate(":jqmData(role='table')","tablecreate refresh",function(b){var c=a(this),d=b.type,e=c.data("mobile-table"),f=e.options;if("reflow"===f.mode){"refresh"!==d&&e.element.addClass(f.classes.reflowTable);var g=a(e.allHeaders.get().reverse());g.each(function(){var b=a(this).jqmData("cells"),c=a(this).jqmData("colstart"),d=b.not(this).filter("thead th").length&&" ui-table-cell-label-top",e=a(this).text();if(""!==e)if(d){var g=parseInt(a(this).attr("colspan"),10),h="";g&&(h="td:nth-child("+g+"n + "+c+")"),b.filter(h).prepend("<b class='"+f.classes.cellLabels+d+"'>"+e+"</b>")}else b.prepend("<b class='"+f.classes.cellLabels+"'>"+e+"</b>")})}})}(a),function(a,b){function c(a){e=a.originalEvent,i=e.accelerationIncludingGravity,f=Math.abs(i.x),g=Math.abs(i.y),h=Math.abs(i.z),!b.orientation&&(f>7||(h>6&&8>g||8>h&&g>6)&&f>5)?j.enabled&&j.disable():j.enabled||j.enable()}a.mobile.iosorientationfixEnabled=!0;var d=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(d)&&d.indexOf("AppleWebKit")>-1))return a.mobile.iosorientationfixEnabled=!1,void 0;var e,f,g,h,i,j=a.mobile.zoom;a.mobile.document.on("mobileinit",function(){a.mobile.iosorientationfixEnabled&&a.mobile.window.bind("orientationchange.iosorientationfix",j.enable).bind("devicemotion.iosorientationfix",c)})}(a,this),function(a,b){function d(){e.removeClass("ui-mobile-rendering")}var e=a("html"),f=(a("head"),a.mobile.window);a(b.document).trigger("mobileinit"),a.mobile.gradeA()&&(a.mobile.ajaxBlacklist&&(a.mobile.ajaxEnabled=!1),e.addClass("ui-mobile ui-mobile-rendering"),setTimeout(d,5e3),a.extend(a.mobile,{initializePage:function(){var b=a.mobile.path,e=a(":jqmData(role='page'), :jqmData(role='dialog')"),g=b.stripHash(b.stripQueryParams(b.parseLocation().hash)),h=c.getElementById(g);e.length||(e=a("body").wrapInner("<div data-"+a.mobile.ns+"role='page'></div>").children(0)),e.each(function(){var b=a(this);b.jqmData("url")||b.attr("data-"+a.mobile.ns+"url",b.attr("id")||location.pathname+location.search)}),a.mobile.firstPage=e.first(),a.mobile.pageContainer=a.mobile.firstPage.parent().addClass("ui-mobile-viewport"),a.mobile.navreadyDeferred.resolve(),f.trigger("pagecontainercreate"),a.mobile.showPageLoadingMsg(),d(),a.mobile.hashListeningEnabled&&a.mobile.path.isHashValid(location.hash)&&(a(h).is(':jqmData(role="page")')||a.mobile.path.isPath(g)||g===a.mobile.dialogHashKey)?a.event.special.navigate.isPushStateEnabled()?(a.mobile.navigate.history.stack=[],a.mobile.navigate(a.mobile.path.isPath(location.hash)?location.hash:location.href)):f.trigger("hashchange",[!0]):(a.mobile.path.isHashValid(location.hash)&&(a.mobile.urlHistory.initialDst=g.replace("#","")),a.event.special.navigate.isPushStateEnabled()&&a.mobile.navigate.navigator.squash(b.parseLocation().href),a.mobile.changePage(a.mobile.firstPage,{transition:"none",reverse:!0,changeHash:!1,fromHashChange:!0}))}}),a(function(){b.scrollTo(0,1),a.mobile.defaultHomeScroll=a.support.scrollTop&&1!==a.mobile.window.scrollTop()?1:0,a.mobile.autoInitializePage&&a.mobile.initializePage(),f.load(a.mobile.silentScroll),a.support.cssPointerEvents||a.mobile.document.delegate(".ui-disabled","vclick",function(a){a.preventDefault(),a.stopImmediatePropagation()})}))}(a,this)});
-/*
-//@ sourceMappingURL=jquery.mobile-1.3.2.min.map
-*/
\ No newline at end of file

From a0e19e1c7f2fa9256eaf76be346f50302eeed51f Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 21 May 2014 23:49:16 +0000
Subject: [PATCH 031/130] Use system portaudio library

This removes our in-tree version of portaudio-19 and migrates
mod_portaudio and mod_portaudio_stream to use the system version of
the library.  Our detection of the system library relies on
pkg-config.
---
 .gitignore                                    |    2 -
 Makefile.am                                   |    6 -
 bootstrap.sh                                  |    2 +-
 configure.ac                                  |    4 +-
 debian/control-modules                        |    3 +-
 debian/copyright                              |   18 -
 libs/.gitignore                               |    9 -
 libs/portaudio/.update                        |    1 -
 libs/portaudio/COMPILING.DARWIN               |    1 -
 libs/portaudio/Doxyfile                       |  239 -
 libs/portaudio/LICENSE.txt                    |   81 -
 libs/portaudio/Makefile.darwin                |  225 -
 libs/portaudio/Makefile.in                    |  215 -
 libs/portaudio/README.txt                     |   96 -
 libs/portaudio/SConstruct                     |  194 -
 libs/portaudio/V19-devel-readme.txt           |  129 -
 libs/portaudio/acinclude.m4                   |   59 -
 libs/portaudio/bindings/cpp/AUTHORS           |    0
 libs/portaudio/bindings/cpp/COPYING           |   31 -
 libs/portaudio/bindings/cpp/ChangeLog         |  178 -
 libs/portaudio/bindings/cpp/INSTALL           |  236 -
 libs/portaudio/bindings/cpp/Makefile.am       |    7 -
 libs/portaudio/bindings/cpp/NEWS              |    0
 libs/portaudio/bindings/cpp/README            |    0
 libs/portaudio/bindings/cpp/SConscript        |   64 -
 libs/portaudio/bindings/cpp/bin/Makefile.am   |    9 -
 .../bindings/cpp/build/gnu/Makefile.in        |  106 -
 .../bindings/cpp/build/gnu/OUT_OF_DATE        |    0
 .../bindings/cpp/build/gnu/aclocal.m4         |   57 -
 .../bindings/cpp/build/gnu/config.guess       | 1308 -----
 .../bindings/cpp/build/gnu/config.sub         | 1505 ------
 .../bindings/cpp/build/gnu/configure          | 4297 -----------------
 .../bindings/cpp/build/gnu/configure.ac       |  214 -
 .../bindings/cpp/build/gnu/install-sh         |  251 -
 .../bindings/cpp/build/vc6/devs_example.dsp   |  248 -
 .../bindings/cpp/build/vc6/devs_example.dsw   |   44 -
 .../bindings/cpp/build/vc6/sine_example.dsp   |  252 -
 .../bindings/cpp/build/vc6/sine_example.dsw   |   44 -
 .../bindings/cpp/build/vc6/static_library.dsp |  395 --
 .../bindings/cpp/build/vc6/static_library.dsw |   29 -
 .../bindings/cpp/build/vc7/OUT_OF_DATE        |    0
 .../bindings/cpp/build/vc7_1/devs_example.sln |   30 -
 .../cpp/build/vc7_1/devs_example.vcproj       |  195 -
 .../bindings/cpp/build/vc7_1/sine_example.sln |   30 -
 .../cpp/build/vc7_1/sine_example.vcproj       |  327 --
 .../cpp/build/vc7_1/static_library.sln        |   21 -
 .../cpp/build/vc7_1/static_library.vcproj     |  218 -
 libs/portaudio/bindings/cpp/configure.ac      |   54 -
 libs/portaudio/bindings/cpp/doc/Makefile.am   |    5 -
 libs/portaudio/bindings/cpp/doc/README        |   34 -
 libs/portaudio/bindings/cpp/doc/config.doxy   |  211 -
 .../bindings/cpp/doc/config.doxy.linux        |  210 -
 libs/portaudio/bindings/cpp/example/devs.cxx  |  177 -
 libs/portaudio/bindings/cpp/example/sine.cxx  |  137 -
 .../bindings/cpp/include/Makefile.am          |   22 -
 .../portaudiocpp/AsioDeviceAdapter.hxx        |   44 -
 .../cpp/include/portaudiocpp/AutoSystem.hxx   |   62 -
 .../include/portaudiocpp/BlockingStream.hxx   |   45 -
 .../portaudiocpp/CFunCallbackStream.hxx       |   49 -
 .../portaudiocpp/CallbackInterface.hxx        |   45 -
 .../include/portaudiocpp/CallbackStream.hxx   |   40 -
 .../portaudiocpp/CppFunCallbackStream.hxx     |   86 -
 .../cpp/include/portaudiocpp/Device.hxx       |   91 -
 .../DirectionSpecificStreamParameters.hxx     |   77 -
 .../cpp/include/portaudiocpp/Exception.hxx    |  108 -
 .../cpp/include/portaudiocpp/HostApi.hxx      |   76 -
 .../portaudiocpp/InterfaceCallbackStream.hxx  |   49 -
 .../portaudiocpp/MemFunCallbackStream.hxx     |  107 -
 .../cpp/include/portaudiocpp/PortAudioCpp.hxx |  109 -
 .../include/portaudiocpp/SampleDataFormat.hxx |   35 -
 .../cpp/include/portaudiocpp/Stream.hxx       |   82 -
 .../include/portaudiocpp/StreamParameters.hxx |   77 -
 .../cpp/include/portaudiocpp/System.hxx       |  107 -
 .../portaudiocpp/SystemDeviceIterator.hxx     |   66 -
 .../portaudiocpp/SystemHostApiIterator.hxx    |   61 -
 libs/portaudio/bindings/cpp/lib/Makefile.am   |   26 -
 .../portaudio/bindings/cpp/portaudiocpp.pc.in |   12 -
 .../source/portaudiocpp/AsioDeviceAdapter.cxx |   83 -
 .../source/portaudiocpp/BlockingStream.cxx    |  100 -
 .../portaudiocpp/CFunCallbackStream.cxx       |   41 -
 .../source/portaudiocpp/CallbackInterface.cxx |   25 -
 .../source/portaudiocpp/CallbackStream.cxx    |   20 -
 .../portaudiocpp/CppFunCallbackStream.cxx     |   81 -
 .../cpp/source/portaudiocpp/Device.cxx        |  168 -
 .../DirectionSpecificStreamParameters.cxx     |  163 -
 .../cpp/source/portaudiocpp/Exception.cxx     |  123 -
 .../cpp/source/portaudiocpp/HostApi.cxx       |  121 -
 .../portaudiocpp/InterfaceCallbackStream.cxx  |   45 -
 .../portaudiocpp/MemFunCallbackStream.cxx     |    4 -
 .../cpp/source/portaudiocpp/Stream.cxx        |  195 -
 .../source/portaudiocpp/StreamParameters.cxx  |  165 -
 .../cpp/source/portaudiocpp/System.cxx        |  308 --
 .../portaudiocpp/SystemDeviceIterator.cxx     |   60 -
 .../portaudiocpp/SystemHostApiIterator.cxx    |   59 -
 libs/portaudio/build/dev-cpp/Makefile-dll     |   78 -
 libs/portaudio/build/dev-cpp/Makefile-static  |   75 -
 .../portaudio/build/dev-cpp/portaudio-dll.dev |  209 -
 .../build/dev-cpp/portaudio-static.dev        |  209 -
 libs/portaudio/build/dev-cpp/readme.txt       |   23 -
 .../build/msvc/portaudio.2008.vcproj          | 2735 -----------
 .../build/msvc/portaudio.2010.vcxproj         |  858 ----
 .../build/msvc/portaudio.2010.vcxproj.filters |  132 -
 .../build/msvc/portaudio.2012.vcxproj         |  874 ----
 .../build/msvc/portaudio.2012.vcxproj.filters |  132 -
 libs/portaudio/build/msvc/portaudio.def       |   43 -
 libs/portaudio/build/msvc/portaudio.dsp       |  265 -
 libs/portaudio/build/msvc/portaudio.dsw       |   29 -
 libs/portaudio/build/msvc/portaudio.sln       |   26 -
 libs/portaudio/build/msvc/portaudio.vcproj    | 2729 -----------
 libs/portaudio/build/msvc/readme.txt          |   80 -
 libs/portaudio/build/scons/SConscript_common  |   28 -
 libs/portaudio/build/scons/SConscript_opts    |   92 -
 libs/portaudio/configure.ac                   |  324 --
 libs/portaudio/configure.gnu                  |    4 -
 libs/portaudio/doc/html/.empty                |    0
 libs/portaudio/doc/src/license.dox            |   38 -
 libs/portaudio/doc/src/mainpage.dox           |   44 -
 libs/portaudio/doc/src/srcguide.dox           |   38 -
 libs/portaudio/doc/utils/checkfiledocs.py     |   76 -
 libs/portaudio/fixdir.bat                     |   19 -
 libs/portaudio/fixfile.bat                    |    7 -
 libs/portaudio/include/pa_asio.h              |  129 -
 libs/portaudio/include/pa_jack.h              |   75 -
 libs/portaudio/include/pa_linux_alsa.h        |   93 -
 libs/portaudio/include/pa_mac_core.h          |  171 -
 libs/portaudio/include/pa_win_ds.h            |  100 -
 libs/portaudio/include/pa_win_waveformat.h    |  180 -
 libs/portaudio/include/pa_win_wmme.h          |  176 -
 libs/portaudio/include/portaudio.h            | 1133 -----
 libs/portaudio/index.html                     |  105 -
 libs/portaudio/pablio/README.txt              |   45 -
 libs/portaudio/pablio/pablio.c                |  314 --
 libs/portaudio/pablio/pablio.def              |   35 -
 libs/portaudio/pablio/pablio.h                |  116 -
 libs/portaudio/pablio/test_rw.c               |  105 -
 libs/portaudio/pablio/test_rw_echo.c          |  129 -
 libs/portaudio/pablio/test_w_saw.c            |  114 -
 libs/portaudio/pablio/test_w_saw8.c           |  112 -
 libs/portaudio/portaudio-2.0.pc.in            |   12 -
 libs/portaudio/src/SConscript                 |  211 -
 libs/portaudio/src/common/pa_allocation.c     |  243 -
 libs/portaudio/src/common/pa_allocation.h     |  104 -
 libs/portaudio/src/common/pa_converters.c     | 1935 --------
 libs/portaudio/src/common/pa_converters.h     |  263 -
 libs/portaudio/src/common/pa_cpuload.c        |  105 -
 libs/portaudio/src/common/pa_cpuload.h        |   72 -
 libs/portaudio/src/common/pa_debugprint.c     |  107 -
 libs/portaudio/src/common/pa_debugprint.h     |  149 -
 libs/portaudio/src/common/pa_dither.c         |  218 -
 libs/portaudio/src/common/pa_dither.h         |  106 -
 libs/portaudio/src/common/pa_endianness.h     |  141 -
 libs/portaudio/src/common/pa_front.c          | 1760 -------
 libs/portaudio/src/common/pa_hostapi.h        |  253 -
 libs/portaudio/src/common/pa_process.c        | 1772 -------
 libs/portaudio/src/common/pa_process.h        |  750 ---
 libs/portaudio/src/common/pa_ringbuffer.c     |  285 --
 libs/portaudio/src/common/pa_ringbuffer.h     |  198 -
 libs/portaudio/src/common/pa_skeleton.c       |  816 ----
 libs/portaudio/src/common/pa_stream.c         |  150 -
 libs/portaudio/src/common/pa_stream.h         |  205 -
 libs/portaudio/src/common/pa_trace.c          |   97 -
 libs/portaudio/src/common/pa_trace.h          |   79 -
 libs/portaudio/src/common/pa_types.h          |  107 -
 libs/portaudio/src/common/pa_util.h           |  159 -
 .../src/hostapi/alsa/pa_linux_alsa.c          | 3563 --------------
 .../src/hostapi/asihpi/pa_linux_asihpi.c      | 2910 -----------
 .../src/hostapi/asio/ASIO-README.txt          |  137 -
 .../src/hostapi/asio/Callback_adaptation_.pdf |  Bin 50527 -> 0 bytes
 libs/portaudio/src/hostapi/asio/Pa_ASIO.pdf   |  Bin 50778 -> 0 bytes
 .../hostapi/asio/iasiothiscallresolver.cpp    |  563 ---
 .../src/hostapi/asio/iasiothiscallresolver.h  |  197 -
 libs/portaudio/src/hostapi/asio/pa_asio.cpp   | 3023 ------------
 .../portaudio/src/hostapi/coreaudio/notes.txt |  196 -
 .../src/hostapi/coreaudio/pa_mac_core.c       | 2329 ---------
 .../hostapi/coreaudio/pa_mac_core_blocking.c  |  585 ---
 .../hostapi/coreaudio/pa_mac_core_blocking.h  |  136 -
 .../hostapi/coreaudio/pa_mac_core_internal.h  |  165 -
 .../src/hostapi/coreaudio/pa_mac_core_old.c   |  913 ----
 .../hostapi/coreaudio/pa_mac_core_utilities.c |  620 ---
 .../hostapi/coreaudio/pa_mac_core_utilities.h |  205 -
 libs/portaudio/src/hostapi/dsound/pa_win_ds.c | 2510 ----------
 .../src/hostapi/dsound/pa_win_ds_dynlink.c    |  180 -
 .../src/hostapi/dsound/pa_win_ds_dynlink.h    |   95 -
 libs/portaudio/src/hostapi/jack/pa_jack.c     | 1761 -------
 .../src/hostapi/oss/low_latency_tip.txt       |  Bin 3111 -> 0 bytes
 libs/portaudio/src/hostapi/oss/pa_unix_oss.c  | 1955 --------
 libs/portaudio/src/hostapi/oss/recplay.c      |  114 -
 .../src/hostapi/wasapi/pa_win_wasapi.cpp      | 1911 --------
 .../src/hostapi/wdmks/pa_win_wdmks.c          | 3283 -------------
 libs/portaudio/src/hostapi/wdmks/readme.txt   |   82 -
 libs/portaudio/src/hostapi/wmme/pa_win_wmme.c | 3900 ---------------
 .../src/os/mac_osx/pa_mac_hostapis.c          |   87 -
 libs/portaudio/src/os/unix/pa_unix_hostapis.c |   78 -
 libs/portaudio/src/os/unix/pa_unix_util.c     |  666 ---
 libs/portaudio/src/os/unix/pa_unix_util.h     |  224 -
 libs/portaudio/src/os/win/pa_win_hostapis.c   |  100 -
 libs/portaudio/src/os/win/pa_win_util.c       |  147 -
 libs/portaudio/src/os/win/pa_win_waveformat.c |  159 -
 .../portaudio/src/os/win/pa_win_wdmks_utils.c |  261 -
 .../portaudio/src/os/win/pa_win_wdmks_utils.h |   65 -
 .../src/os/win/pa_x86_plain_converters.c      | 1219 -----
 .../src/os/win/pa_x86_plain_converters.h      |   60 -
 libs/portaudio/test/README.txt                |   60 -
 libs/portaudio/test/debug_convert.c           |  138 -
 libs/portaudio/test/debug_dither_calc.c       |   62 -
 libs/portaudio/test/debug_dual.c              |  190 -
 libs/portaudio/test/debug_multi_in.c          |  186 -
 libs/portaudio/test/debug_multi_out.c         |  151 -
 libs/portaudio/test/debug_record.c            |  346 --
 libs/portaudio/test/debug_record_reuse.c      |  358 --
 libs/portaudio/test/debug_sine.c              |  199 -
 libs/portaudio/test/debug_sine_amp.c          |  164 -
 libs/portaudio/test/debug_sine_formats.c      |  209 -
 libs/portaudio/test/debug_srate.c             |  272 --
 libs/portaudio/test/debug_test1.c             |  114 -
 libs/portaudio/test/pa_devs.c                 |  238 -
 libs/portaudio/test/pa_fuzz.c                 |  176 -
 libs/portaudio/test/pa_minlat.c               |  194 -
 libs/portaudio/test/paqa_devs.c               |  355 --
 libs/portaudio/test/paqa_errs.c               |  387 --
 libs/portaudio/test/patest1.c                 |  200 -
 libs/portaudio/test/patest_buffer.c           |  200 -
 libs/portaudio/test/patest_callbackstop.c     |  248 -
 libs/portaudio/test/patest_clip.c             |  186 -
 libs/portaudio/test/patest_dither.c           |  186 -
 libs/portaudio/test/patest_dsound_surround.c  |  205 -
 libs/portaudio/test/patest_hang.c             |  160 -
 libs/portaudio/test/patest_in_overflow.c      |  232 -
 libs/portaudio/test/patest_latency.c          |  189 -
 libs/portaudio/test/patest_leftright.c        |  181 -
 libs/portaudio/test/patest_longsine.c         |  147 -
 libs/portaudio/test/patest_many.c             |  206 -
 libs/portaudio/test/patest_maxsines.c         |  212 -
 libs/portaudio/test/patest_mono.c             |  155 -
 .../test/patest_mono_asio_channel_select.c    |  166 -
 libs/portaudio/test/patest_multi_sine.c       |  201 -
 libs/portaudio/test/patest_out_underflow.c    |  225 -
 libs/portaudio/test/patest_pink.c             |  276 --
 libs/portaudio/test/patest_prime.c            |  230 -
 libs/portaudio/test/patest_read_record.c      |  236 -
 libs/portaudio/test/patest_read_write_wire.c  |  215 -
 libs/portaudio/test/patest_record.c           |  344 --
 libs/portaudio/test/patest_ringmix.c          |   86 -
 libs/portaudio/test/patest_saw.c              |  133 -
 libs/portaudio/test/patest_sine.c             |  172 -
 libs/portaudio/test/patest_sine8.c            |  221 -
 libs/portaudio/test/patest_sine_channelmaps.c |  184 -
 libs/portaudio/test/patest_sine_formats.c     |  203 -
 libs/portaudio/test/patest_sine_time.c        |  215 -
 libs/portaudio/test/patest_start_stop.c       |  168 -
 libs/portaudio/test/patest_stop.c             |  320 --
 libs/portaudio/test/patest_stop_playout.c     |  439 --
 libs/portaudio/test/patest_sync.c             |  267 -
 libs/portaudio/test/patest_timing.c           |  173 -
 libs/portaudio/test/patest_toomanysines.c     |  181 -
 libs/portaudio/test/patest_two_rates.c        |  178 -
 libs/portaudio/test/patest_underflow.c        |  158 -
 libs/portaudio/test/patest_wire.c             |  292 --
 libs/portaudio/test/patest_wmme_surround.c    |  206 -
 libs/portaudio/test/patest_write_sine.c       |  155 -
 libs/portaudio/test/patest_write_stop.c       |  165 -
 libs/portaudio/testcvs/changeme.txt           |    8 -
 src/mod/endpoints/mod_portaudio/Makefile.am   |   28 +-
 .../endpoints/mod_portaudio/mod_portaudio.c   |    2 +-
 .../endpoints/mod_portaudio/pa_ringbuffer.c   |    2 +-
 src/mod/endpoints/mod_portaudio/pablio.c      |    7 +-
 src/mod/endpoints/mod_portaudio/pablio.h      |    5 +-
 .../formats/mod_portaudio_stream/Makefile.am  |   27 +-
 .../mod_portaudio_stream.c                    |    2 +-
 269 files changed, 36 insertions(+), 84800 deletions(-)
 delete mode 100644 libs/portaudio/.update
 delete mode 100644 libs/portaudio/COMPILING.DARWIN
 delete mode 100644 libs/portaudio/Doxyfile
 delete mode 100644 libs/portaudio/LICENSE.txt
 delete mode 100644 libs/portaudio/Makefile.darwin
 delete mode 100644 libs/portaudio/Makefile.in
 delete mode 100644 libs/portaudio/README.txt
 delete mode 100644 libs/portaudio/SConstruct
 delete mode 100644 libs/portaudio/V19-devel-readme.txt
 delete mode 100644 libs/portaudio/acinclude.m4
 delete mode 100644 libs/portaudio/bindings/cpp/AUTHORS
 delete mode 100644 libs/portaudio/bindings/cpp/COPYING
 delete mode 100644 libs/portaudio/bindings/cpp/ChangeLog
 delete mode 100644 libs/portaudio/bindings/cpp/INSTALL
 delete mode 100644 libs/portaudio/bindings/cpp/Makefile.am
 delete mode 100644 libs/portaudio/bindings/cpp/NEWS
 delete mode 100644 libs/portaudio/bindings/cpp/README
 delete mode 100644 libs/portaudio/bindings/cpp/SConscript
 delete mode 100644 libs/portaudio/bindings/cpp/bin/Makefile.am
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/Makefile.in
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/OUT_OF_DATE
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/aclocal.m4
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/config.guess
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/config.sub
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/configure
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/configure.ac
 delete mode 100644 libs/portaudio/bindings/cpp/build/gnu/install-sh
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/devs_example.dsp
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/devs_example.dsw
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/sine_example.dsp
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/sine_example.dsw
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/static_library.dsp
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc6/static_library.dsw
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7/OUT_OF_DATE
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/devs_example.sln
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/devs_example.vcproj
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/sine_example.sln
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/sine_example.vcproj
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/static_library.sln
 delete mode 100644 libs/portaudio/bindings/cpp/build/vc7_1/static_library.vcproj
 delete mode 100644 libs/portaudio/bindings/cpp/configure.ac
 delete mode 100644 libs/portaudio/bindings/cpp/doc/Makefile.am
 delete mode 100644 libs/portaudio/bindings/cpp/doc/README
 delete mode 100644 libs/portaudio/bindings/cpp/doc/config.doxy
 delete mode 100644 libs/portaudio/bindings/cpp/doc/config.doxy.linux
 delete mode 100644 libs/portaudio/bindings/cpp/example/devs.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/example/sine.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/Makefile.am
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/System.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx
 delete mode 100644 libs/portaudio/bindings/cpp/lib/Makefile.am
 delete mode 100644 libs/portaudio/bindings/cpp/portaudiocpp.pc.in
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/BlockingStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/Device.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/Exception.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/HostApi.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/Stream.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/StreamParameters.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/System.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx
 delete mode 100644 libs/portaudio/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx
 delete mode 100644 libs/portaudio/build/dev-cpp/Makefile-dll
 delete mode 100644 libs/portaudio/build/dev-cpp/Makefile-static
 delete mode 100644 libs/portaudio/build/dev-cpp/portaudio-dll.dev
 delete mode 100644 libs/portaudio/build/dev-cpp/portaudio-static.dev
 delete mode 100644 libs/portaudio/build/dev-cpp/readme.txt
 delete mode 100644 libs/portaudio/build/msvc/portaudio.2008.vcproj
 delete mode 100644 libs/portaudio/build/msvc/portaudio.2010.vcxproj
 delete mode 100644 libs/portaudio/build/msvc/portaudio.2010.vcxproj.filters
 delete mode 100644 libs/portaudio/build/msvc/portaudio.2012.vcxproj
 delete mode 100644 libs/portaudio/build/msvc/portaudio.2012.vcxproj.filters
 delete mode 100644 libs/portaudio/build/msvc/portaudio.def
 delete mode 100644 libs/portaudio/build/msvc/portaudio.dsp
 delete mode 100644 libs/portaudio/build/msvc/portaudio.dsw
 delete mode 100644 libs/portaudio/build/msvc/portaudio.sln
 delete mode 100644 libs/portaudio/build/msvc/portaudio.vcproj
 delete mode 100644 libs/portaudio/build/msvc/readme.txt
 delete mode 100644 libs/portaudio/build/scons/SConscript_common
 delete mode 100644 libs/portaudio/build/scons/SConscript_opts
 delete mode 100644 libs/portaudio/configure.ac
 delete mode 100644 libs/portaudio/configure.gnu
 delete mode 100644 libs/portaudio/doc/html/.empty
 delete mode 100644 libs/portaudio/doc/src/license.dox
 delete mode 100644 libs/portaudio/doc/src/mainpage.dox
 delete mode 100644 libs/portaudio/doc/src/srcguide.dox
 delete mode 100644 libs/portaudio/doc/utils/checkfiledocs.py
 delete mode 100755 libs/portaudio/fixdir.bat
 delete mode 100755 libs/portaudio/fixfile.bat
 delete mode 100644 libs/portaudio/include/pa_asio.h
 delete mode 100644 libs/portaudio/include/pa_jack.h
 delete mode 100644 libs/portaudio/include/pa_linux_alsa.h
 delete mode 100644 libs/portaudio/include/pa_mac_core.h
 delete mode 100644 libs/portaudio/include/pa_win_ds.h
 delete mode 100644 libs/portaudio/include/pa_win_waveformat.h
 delete mode 100644 libs/portaudio/include/pa_win_wmme.h
 delete mode 100644 libs/portaudio/include/portaudio.h
 delete mode 100644 libs/portaudio/index.html
 delete mode 100644 libs/portaudio/pablio/README.txt
 delete mode 100644 libs/portaudio/pablio/pablio.c
 delete mode 100644 libs/portaudio/pablio/pablio.def
 delete mode 100644 libs/portaudio/pablio/pablio.h
 delete mode 100644 libs/portaudio/pablio/test_rw.c
 delete mode 100644 libs/portaudio/pablio/test_rw_echo.c
 delete mode 100644 libs/portaudio/pablio/test_w_saw.c
 delete mode 100644 libs/portaudio/pablio/test_w_saw8.c
 delete mode 100644 libs/portaudio/portaudio-2.0.pc.in
 delete mode 100644 libs/portaudio/src/SConscript
 delete mode 100644 libs/portaudio/src/common/pa_allocation.c
 delete mode 100644 libs/portaudio/src/common/pa_allocation.h
 delete mode 100644 libs/portaudio/src/common/pa_converters.c
 delete mode 100644 libs/portaudio/src/common/pa_converters.h
 delete mode 100644 libs/portaudio/src/common/pa_cpuload.c
 delete mode 100644 libs/portaudio/src/common/pa_cpuload.h
 delete mode 100644 libs/portaudio/src/common/pa_debugprint.c
 delete mode 100644 libs/portaudio/src/common/pa_debugprint.h
 delete mode 100644 libs/portaudio/src/common/pa_dither.c
 delete mode 100644 libs/portaudio/src/common/pa_dither.h
 delete mode 100644 libs/portaudio/src/common/pa_endianness.h
 delete mode 100644 libs/portaudio/src/common/pa_front.c
 delete mode 100644 libs/portaudio/src/common/pa_hostapi.h
 delete mode 100644 libs/portaudio/src/common/pa_process.c
 delete mode 100644 libs/portaudio/src/common/pa_process.h
 delete mode 100644 libs/portaudio/src/common/pa_ringbuffer.c
 delete mode 100644 libs/portaudio/src/common/pa_ringbuffer.h
 delete mode 100644 libs/portaudio/src/common/pa_skeleton.c
 delete mode 100644 libs/portaudio/src/common/pa_stream.c
 delete mode 100644 libs/portaudio/src/common/pa_stream.h
 delete mode 100644 libs/portaudio/src/common/pa_trace.c
 delete mode 100644 libs/portaudio/src/common/pa_trace.h
 delete mode 100644 libs/portaudio/src/common/pa_types.h
 delete mode 100644 libs/portaudio/src/common/pa_util.h
 delete mode 100644 libs/portaudio/src/hostapi/alsa/pa_linux_alsa.c
 delete mode 100644 libs/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
 delete mode 100644 libs/portaudio/src/hostapi/asio/ASIO-README.txt
 delete mode 100644 libs/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
 delete mode 100644 libs/portaudio/src/hostapi/asio/Pa_ASIO.pdf
 delete mode 100644 libs/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
 delete mode 100644 libs/portaudio/src/hostapi/asio/iasiothiscallresolver.h
 delete mode 100644 libs/portaudio/src/hostapi/asio/pa_asio.cpp
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/notes.txt
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
 delete mode 100644 libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
 delete mode 100644 libs/portaudio/src/hostapi/dsound/pa_win_ds.c
 delete mode 100644 libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
 delete mode 100644 libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
 delete mode 100644 libs/portaudio/src/hostapi/jack/pa_jack.c
 delete mode 100644 libs/portaudio/src/hostapi/oss/low_latency_tip.txt
 delete mode 100644 libs/portaudio/src/hostapi/oss/pa_unix_oss.c
 delete mode 100644 libs/portaudio/src/hostapi/oss/recplay.c
 delete mode 100644 libs/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
 delete mode 100644 libs/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
 delete mode 100644 libs/portaudio/src/hostapi/wdmks/readme.txt
 delete mode 100644 libs/portaudio/src/hostapi/wmme/pa_win_wmme.c
 delete mode 100644 libs/portaudio/src/os/mac_osx/pa_mac_hostapis.c
 delete mode 100644 libs/portaudio/src/os/unix/pa_unix_hostapis.c
 delete mode 100644 libs/portaudio/src/os/unix/pa_unix_util.c
 delete mode 100644 libs/portaudio/src/os/unix/pa_unix_util.h
 delete mode 100644 libs/portaudio/src/os/win/pa_win_hostapis.c
 delete mode 100644 libs/portaudio/src/os/win/pa_win_util.c
 delete mode 100644 libs/portaudio/src/os/win/pa_win_waveformat.c
 delete mode 100644 libs/portaudio/src/os/win/pa_win_wdmks_utils.c
 delete mode 100644 libs/portaudio/src/os/win/pa_win_wdmks_utils.h
 delete mode 100644 libs/portaudio/src/os/win/pa_x86_plain_converters.c
 delete mode 100644 libs/portaudio/src/os/win/pa_x86_plain_converters.h
 delete mode 100644 libs/portaudio/test/README.txt
 delete mode 100644 libs/portaudio/test/debug_convert.c
 delete mode 100644 libs/portaudio/test/debug_dither_calc.c
 delete mode 100644 libs/portaudio/test/debug_dual.c
 delete mode 100644 libs/portaudio/test/debug_multi_in.c
 delete mode 100644 libs/portaudio/test/debug_multi_out.c
 delete mode 100644 libs/portaudio/test/debug_record.c
 delete mode 100644 libs/portaudio/test/debug_record_reuse.c
 delete mode 100644 libs/portaudio/test/debug_sine.c
 delete mode 100644 libs/portaudio/test/debug_sine_amp.c
 delete mode 100644 libs/portaudio/test/debug_sine_formats.c
 delete mode 100644 libs/portaudio/test/debug_srate.c
 delete mode 100644 libs/portaudio/test/debug_test1.c
 delete mode 100644 libs/portaudio/test/pa_devs.c
 delete mode 100644 libs/portaudio/test/pa_fuzz.c
 delete mode 100644 libs/portaudio/test/pa_minlat.c
 delete mode 100644 libs/portaudio/test/paqa_devs.c
 delete mode 100644 libs/portaudio/test/paqa_errs.c
 delete mode 100644 libs/portaudio/test/patest1.c
 delete mode 100644 libs/portaudio/test/patest_buffer.c
 delete mode 100644 libs/portaudio/test/patest_callbackstop.c
 delete mode 100644 libs/portaudio/test/patest_clip.c
 delete mode 100644 libs/portaudio/test/patest_dither.c
 delete mode 100644 libs/portaudio/test/patest_dsound_surround.c
 delete mode 100644 libs/portaudio/test/patest_hang.c
 delete mode 100644 libs/portaudio/test/patest_in_overflow.c
 delete mode 100644 libs/portaudio/test/patest_latency.c
 delete mode 100644 libs/portaudio/test/patest_leftright.c
 delete mode 100644 libs/portaudio/test/patest_longsine.c
 delete mode 100644 libs/portaudio/test/patest_many.c
 delete mode 100644 libs/portaudio/test/patest_maxsines.c
 delete mode 100644 libs/portaudio/test/patest_mono.c
 delete mode 100644 libs/portaudio/test/patest_mono_asio_channel_select.c
 delete mode 100644 libs/portaudio/test/patest_multi_sine.c
 delete mode 100644 libs/portaudio/test/patest_out_underflow.c
 delete mode 100644 libs/portaudio/test/patest_pink.c
 delete mode 100644 libs/portaudio/test/patest_prime.c
 delete mode 100644 libs/portaudio/test/patest_read_record.c
 delete mode 100644 libs/portaudio/test/patest_read_write_wire.c
 delete mode 100644 libs/portaudio/test/patest_record.c
 delete mode 100644 libs/portaudio/test/patest_ringmix.c
 delete mode 100644 libs/portaudio/test/patest_saw.c
 delete mode 100644 libs/portaudio/test/patest_sine.c
 delete mode 100644 libs/portaudio/test/patest_sine8.c
 delete mode 100644 libs/portaudio/test/patest_sine_channelmaps.c
 delete mode 100644 libs/portaudio/test/patest_sine_formats.c
 delete mode 100644 libs/portaudio/test/patest_sine_time.c
 delete mode 100644 libs/portaudio/test/patest_start_stop.c
 delete mode 100644 libs/portaudio/test/patest_stop.c
 delete mode 100644 libs/portaudio/test/patest_stop_playout.c
 delete mode 100644 libs/portaudio/test/patest_sync.c
 delete mode 100644 libs/portaudio/test/patest_timing.c
 delete mode 100644 libs/portaudio/test/patest_toomanysines.c
 delete mode 100644 libs/portaudio/test/patest_two_rates.c
 delete mode 100644 libs/portaudio/test/patest_underflow.c
 delete mode 100644 libs/portaudio/test/patest_wire.c
 delete mode 100644 libs/portaudio/test/patest_wmme_surround.c
 delete mode 100644 libs/portaudio/test/patest_write_sine.c
 delete mode 100644 libs/portaudio/test/patest_write_stop.c
 delete mode 100644 libs/portaudio/testcvs/changeme.txt

diff --git a/.gitignore b/.gitignore
index ad40d3cd3d..2923d395f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,8 +199,6 @@ ipch/
 /w32/Library/switch_version.inc
 /w32/Setup/Fragments
 
-/libs/portaudio/build/msvc/Win32/Debug DirectSound/portaudio.*.log
-/libs/portaudio/build/msvc/Win32/Release DirectSound/portaudio.*.log
 /libs/win32/mpg123/Win32/Debug_Generic/libmpg123.*.log
 /libs/win32/mpg123/Win32/Release_Generic/libmpg123.*.log
 /libs/win32/pthread/Win32/Debug DLL/pthread.*.log
diff --git a/Makefile.am b/Makefile.am
index 5ea5ef389f..b25b08956f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -615,7 +615,6 @@ pristine:
 
 update-clean: clean python-reconf lua-reconf spandsp-reconf srtp-reconf
 	cd libs/sofia-sip && $(MAKE) clean
-	cd libs/portaudio && $(MAKE) clean
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean
 
@@ -637,11 +636,6 @@ python-reconf:
 	rm -f src/mod/languages/mod_python/Makefile
 	./config.status
 
-pa-reconf:
-	cd libs/portaudio && $(MAKE) clean
-	cd libs/portaudio && sh ./configure.gnu
-	$(MAKE) mod_portaudio-clean
-
 srtp-reconf:
 	cd libs/srtp && $(MAKE) clean
 	cd libs/srtp && sh ./config.status --recheck
diff --git a/bootstrap.sh b/bootstrap.sh
index ebcba322e0..0f19936230 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -10,7 +10,7 @@ BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
 SUBDIRS="apr \
   libzrtp ilbc iksemel js js/nsprpub libdingaling libsndfile sofia-sip \
-  speex srtp freetdm spandsp libg722_1 portaudio unimrcp tiff-4.0.2 broadvoice silk libcodec2 \
+  speex srtp freetdm spandsp libg722_1 unimrcp tiff-4.0.2 broadvoice silk libcodec2 \
   fs";
 
 while getopts 'jhd:v' o; do 
diff --git a/configure.ac b/configure.ac
index a1bff4b6ea..d80875c376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1150,6 +1150,9 @@ PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1])
 PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.4],[
   AM_CONDITIONAL([HAVE_YAML],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_YAML],[false])])
+PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19],[
+  AM_CONDITIONAL([HAVE_PORTAUDIO],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PORTAUDIO],[false])])
 PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[
   AM_CONDITIONAL([HAVE_LDNS],[true])],[
   AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns])
@@ -1660,7 +1663,6 @@ AC_CONFIG_SUBDIRS([libs/js])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
 AC_CONFIG_SUBDIRS([libs/libsndfile])
 AC_CONFIG_SUBDIRS([libs/sofia-sip])
-AC_CONFIG_SUBDIRS([libs/portaudio])
 AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
 AC_CONFIG_SUBDIRS([libs/tiff-4.0.2])
diff --git a/debian/control-modules b/debian/control-modules
index dd694d842b..dce770f279 100644
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -405,7 +405,7 @@ Build-Depends: libopal-dev
 Module: endpoints/mod_portaudio
 Description: mod_portaudio
  Adds mod_portaudio.
-Build-Depends: libasound2-dev
+Build-Depends: portaudio19-dev
 
 Module: endpoints/mod_reference
 Description: mod_reference
@@ -517,6 +517,7 @@ Description: mod_native_file
 Module: formats/mod_portaudio_stream
 Description: mod_portaudio_stream
  Adds mod_portaudio_stream.
+Build-Depends: portaudio19-dev
 
 Module: formats/mod_shell_stream
 Description: mod_shell_stream
diff --git a/debian/copyright b/debian/copyright
index ed2c5918d1..954a73e017 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1708,24 +1708,6 @@ Copyright: 2007 <robs@users.sourceforge.net>
  2007-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
 License: LGPL-2+
 
-Files: libs/portaudio/*
-Copyright: 1999-2007 Ross Bencina and Phil Burk
- 1999-2002 Phil Burk, Ross Bencina
- 1999-2007 Andrew Baldwin, Ross Bencina
- 1999-2007 Ross Bencina, Andrew Baldwin
- 1999-2006 Phil Burk, Robert Marsanyi and Ross Bencina
- 1999-2007 Ross Bencina, Phil Burk, Robert Marsanyi
- 1999-2007 Ross Bencina
- 1999-2000 Phil Burk
- 2004-2007 Arve Knudsen <aknuds-1@broadpark.no>
- 2005-2006 Bjorn Roche
- 2006-2007 David Viens
- 2003 Fred Gleason
- 2002 Joshua Haberman <joshua@haberman.com>
- 2005,2006 Ludwig Schwardt
- 2004 Stefan Westerfeld <stefan@space.twc.de
-License: MIT/X11 (BSD like)
-
 Files: libs/tiff-4.0.2/*
 Copyright: 1988-1997 Sam Leffler
  1991-1997 Silicon Graphics, Inc.
diff --git a/libs/.gitignore b/libs/.gitignore
index 4fca482c49..4855f271d2 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -331,10 +331,6 @@ opal
 /openssl-*/
 /opus-*/
 /pocketsphinx-*/
-/portaudio/bin/
-/portaudio/bin-stamp
-/portaudio/lib-stamp
-/portaudio/Makefile
 /pthreads-w32-2-7-0-release/
 /pthreads-w32-2-9-1/
 /silk/compile
@@ -814,11 +810,6 @@ opal
 !/libdingaling/missing
 !/libg722_1/config/depcomp
 !/libg722_1/config/missing
-!/portaudio/bindings/cpp/build/gnu/aclocal.m4
-!/portaudio/bindings/cpp/build/gnu/config.guess
-!/portaudio/bindings/cpp/build/gnu/config.sub
-!/portaudio/bindings/cpp/build/gnu/configure
-!/portaudio/bindings/cpp/build/gnu/install-sh
 !/tiff-*/config/depcomp
 !/tiff-*/config/missing
 !/xmlrpc-c/install-sh
diff --git a/libs/portaudio/.update b/libs/portaudio/.update
deleted file mode 100644
index 4c2d1fc0dd..0000000000
--- a/libs/portaudio/.update
+++ /dev/null
@@ -1 +0,0 @@
-Fri Mar 16 17:19:02 EDT 2007
diff --git a/libs/portaudio/COMPILING.DARWIN b/libs/portaudio/COMPILING.DARWIN
deleted file mode 100644
index 6d7aa8714f..0000000000
--- a/libs/portaudio/COMPILING.DARWIN
+++ /dev/null
@@ -1 +0,0 @@
-To compile on darwin, you will need to use the darwin makefile, gcc 3.3 or later and the universal SDK. for more info, see http://portaudio.com/trac/wiki/TutorialDir/Compile/MacintoshCoreAudio
diff --git a/libs/portaudio/Doxyfile b/libs/portaudio/Doxyfile
deleted file mode 100644
index 7dbfdfe661..0000000000
--- a/libs/portaudio/Doxyfile
+++ /dev/null
@@ -1,239 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = PortAudio
-PROJECT_NUMBER         = 2.0
-OUTPUT_DIRECTORY       = ./doc/
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-BUILTIN_STL_SUPPORT    = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = doc/src \
-                         src \
-                         include \
-                         test
-FILE_PATTERNS          = *.h \
-                         *.c \
-                         *.cpp \
-                         *.dox
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-HIDE_UNDOC_RELATIONS   = NO
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/libs/portaudio/LICENSE.txt b/libs/portaudio/LICENSE.txt
deleted file mode 100644
index e0ac4e8a0c..0000000000
--- a/libs/portaudio/LICENSE.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Portable header file to contain:
->>>>>
-/*
- * PortAudio Portable Real-Time Audio Library
- * PortAudio API Header File
- * Latest version available at: http://www.portaudio.com
- *
- * Copyright (c) 1999-2006 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-<<<<<
- 
-
-Implementation files to contain:
->>>>>
-/*
- * PortAudio Portable Real-Time Audio Library
- * Latest version at: http://www.portaudio.com
- * <platform> Implementation
- * Copyright (c) 1999-2000 <author(s)>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-<<<<<
\ No newline at end of file
diff --git a/libs/portaudio/Makefile.darwin b/libs/portaudio/Makefile.darwin
deleted file mode 100644
index 9aec51de24..0000000000
--- a/libs/portaudio/Makefile.darwin
+++ /dev/null
@@ -1,225 +0,0 @@
-#
-# PortAudio V19 Makefile.darwin
-#
-# Bjorn Roche of XO Audio (www.xoaudio.com)
-# Based on autoconf's makefile, created from Makefile generated by
-# autoconf. Autoconf files written by by Dominic Mazzoni with modifications
-# by Mikael Magnusson.
-#
-
-top_srcdir = .
-srcdir = .
-
-top_builddir = .
-OPT_LEVEL := -O2
-PREFIX = /usr/local
-prefix = $(PREFIX)
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-libdir = ${exec_prefix}/lib
-includedir = ${prefix}/include
-CC = gcc
-CFLAGS = -g -std=gnu99 -Werror -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3 $(OPT_LEVEL) -Wall -pedantic -pipe -fPIC -DPA_BIG_ENDIAN  -Ipa_common -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DPA_USE_COREAUDIO=1 -DHAVE_LIBKERN_OSATOMIC_H=1 -Iinclude -Isrc/common
-LIBS = -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
-AR = /usr/bin/ar
-RANLIB = ranlib
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-SHARED_FLAGS = -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3
-DLL_LIBS = 
-CXXFLAGS = -g $(OPT_LEVEL)
-NASM = 
-NASMOPT = 
-LN_S = ln -s
-LT_RELEASE=@LT_RELEASE@
-LT_CURRENT=2
-LT_REVISION=0
-LT_AGE=0
-
-
-OTHER_OBJS = src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o
-
-PALIB = libportaudio.a
-PADLL = libportaudio
-PADLLV_MIN = 19
-PADLLV = 0.0.19
-PADLLEXT = .dylib
-PASHLIBNAME = $(PADLL).$(PADLLV)$(PADLLEXT)
-PAINC = include/portaudio.h
-PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined -export -symbols-regex "Pa_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-COMMON_OBJS = \
-	src/common/pa_allocation.o \
-	src/common/pa_converters.o \
-	src/common/pa_cpuload.o \
-	src/common/pa_debugprint.o \
-	src/common/pa_dither.o \
-	src/common/pa_front.o \
-	src/common/pa_process.o \
-	src/common/pa_ringbuffer.o \
-	src/common/pa_skeleton.o \
-	src/common/pa_stream.o \
-	src/common/pa_trace.o
-
-TESTS = \
-	bin/paqa_devs \
-	bin/paqa_errs \
-	bin/patest1 \
-	bin/patest_buffer \
-	bin/patest_callbackstop \
-	bin/patest_clip \
-	bin/patest_dither \
-	bin/patest_hang \
-	bin/patest_in_overflow \
-	bin/patest_latency \
-	bin/patest_leftright \
-	bin/patest_longsine \
-	bin/patest_many \
-	bin/patest_maxsines \
-	bin/patest_multi_sine \
-	bin/patest_out_underflow \
-	bin/patest_pink \
-	bin/patest_prime \
-	bin/patest_read_record \
-	bin/patest_read_write_wire \
-	bin/patest_record \
-	bin/patest_ringmix \
-	bin/patest_saw \
-	bin/patest_sine8 \
-	bin/patest_sine \
-	bin/patest_sine_channelmaps \
-	bin/patest_sine_formats \
-	bin/patest_sine_time \
-	bin/patest_start_stop \
-	bin/patest_stop \
-	bin/patest_sync \
-	bin/patest_timing \
-	bin/patest_toomanysines \
-	bin/patest_underflow \
-	bin/patest_wire \
-	bin/patest_write_sine \
-	bin/patest_write_stop \
-	bin/pa_devs \
-	bin/pa_fuzz \
-	bin/pa_minlat
-
-# Most of these don't compile yet.  Put them in TESTS, above, if
-# you want to try to compile them...
-ALL_TESTS = \
-	$(TESTS) \
-	bin/debug_convert \
-	bin/debug_dither_calc \
-	bin/debug_dual \
-	bin/debug_multi_in \
-	bin/debug_multi_out \
-	bin/debug_record \
-	bin/debug_record_reuse \
-	bin/debug_sine_amp \
-	bin/debug_sine \
-	bin/debug_sine_formats \
-	bin/debug_srate \
-	bin/debug_test1 \
-	bin/pa_devs \
-	bin/pa_fuzz \
-	bin/pa_minlat \
-	bin/paqa_devs \
-	bin/paqa_errs \
-	bin/patest1 \
-	bin/patest_buffer \
-	bin/patest_clip \
-	bin/patest_dither \
-	bin/patest_hang \
-	bin/patest_in_overflow \
-	bin/patest_latency \
-	bin/patest_leftright \
-	bin/patest_longsine \
-	bin/patest_many \
-	bin/patest_maxsines \
-	bin/patest_multi_sine \
-	bin/patest_out_underflow \
-	bin/patest_pink \
-	bin/patest_read_record \
-	bin/patest_record \
-	bin/patest_ringmix \
-	bin/patest_saw \
-	bin/patest_sine8 \
-	bin/patest_sine \
-	bin/patest_sine_channelmaps \
-	bin/patest_sine_formats \
-	bin/patest_sine_time \
-	bin/patest_start_stop \
-	bin/patest_stop \
-	bin/patest_sync \
-	bin/patest_timing \
-	bin/patest_toomanysines \
-	bin/patest_underflow \
-	bin/patest_wire \
-	bin/patest_write_sine
-
-OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
-
-#LTOBJS:= $(OBJS:.o=.lo)
-
-all: lib/$(PALIB) lib/$(PASHLIBNAME) tests
-
-tests: bin/ $(TESTS)
-
-lib/$(PALIB): lib/ $(OBJS) Makefile.darwin $(PAINC)
-	-rm lib/$(PALIB)
-	$(AR) ruv lib/$(PALIB) $(OBJS)
-	$(RANLIB) lib/$(PALIB)
-
-lib/$(PASHLIBNAME): lib/ $(OBJS) Makefile.darwin $(PAINC)
-	$(CC) $(SHARED_FLAGS) -o lib/$(PASHLIBNAME) $(OBJS) $(DLL_LIBS) -install_name $(PREFIX)/lib/$(PASHLIBNAME) -compatibility_version $(PADLLV) -current_version $(PADLLV)
-
-$(TESTS): bin/%: lib/$(PALIB) Makefile.darwin $(PAINC) test/%.c
-	$(CC) -o $@ $(CFLAGS) test/$*.c lib/$(PALIB) $(LIBS)
-
-install: lib/$(PALIB) lib/$(PASHLIBNAME) portaudio-2.0.pc
-	$(INSTALL) -d $(PREFIX)/lib
-	$(INSTALL) -m 644 lib/$(PASHLIBNAME) $(PREFIX)/lib/$(PASHLIBNAME)
-	$(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB)
-	cd $(PREFIX)/lib && rm -f $(PADLL)$(PADLLEXT) && ln -s $(PASHLIBNAME) $(PADLL)$(PADLLEXT)
-	$(INSTALL) -d $(PREFIX)/include
-	$(INSTALL) -m 644 include/portaudio.h $(PREFIX)/include/portaudio.h
-	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
-	$(INSTALL) -m 644 portaudio-2.0.pc $(PREFIX)/lib/pkgconfig/portaudio-2.0.pc
-	@echo ""
-	@echo "------------------------------------------------------------"
-	@echo "PortAudio was successfully installed."
-	@echo ""
-	@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
-	@echo "to make the shared object available.  You may also need to"
-	@echo "modify your LD_LIBRARY_PATH environment variable to include"
-	@echo "the directory $(PREFIX)/lib"
-	@echo "------------------------------------------------------------"
-	@echo ""
-
-uninstall:
-	rm -f $(PREFIX)/lib/$(PASHLIBNAME)
-	rm -f $(PREFIX)/lib/$(PALIB)
-	rm -f $(PREFIX)/lib/$(PADLL)$(PADLLEXT)
-	rm -f $(PREFIX)/include/portaudio.h
-
-clean:
-	rm -f $(OBJS) $(TESTS) lib/$(PALIB) lib/$(PASHLIBNAME)
-
-%.o: %.c Makefile.darwin $(PAINC)
-	$(CC) -c $(CFLAGS) $< -o $@
-
-%.o: %.cpp Makefile.darwin $(PAINC)
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-%.o: %.asm
-	$(NASM) $(NASMOPT) -o $@ $<
-
-bin:
-	mkdir bin
-
-lib:
-	mkdir lib
-
-
-
-
diff --git a/libs/portaudio/Makefile.in b/libs/portaudio/Makefile.in
deleted file mode 100644
index c1fd8fe00f..0000000000
--- a/libs/portaudio/Makefile.in
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# PortAudio V19 Makefile.in
-#
-# Dominic Mazzoni
-# Modifications by Mikael Magnusson
-#
-
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-top_builddir = .
-PREFIX = @prefix@
-prefix = $(PREFIX)
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-CC = @CC@
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @CFLAGS@ @DEFS@
-LIBS = @LIBS@
-AR = @AR@
-RANLIB = @RANLIB@
-LIBTOOL = @LIBTOOL@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-SHARED_FLAGS = @SHARED_FLAGS@
-LDFLAGS = @LDFLAGS@
-DLL_LIBS = @DLL_LIBS@
-CXXFLAGS = @CXXFLAGS@
-NASM = @NASM@
-NASMOPT = @NASMOPT@
-LN_S = @LN_S@
-LT_RELEASE=@LT_RELEASE@
-LT_CURRENT=@LT_CURRENT@
-LT_REVISION=@LT_REVISION@
-LT_AGE=@LT_AGE@
-SHELL=@SHELL@
-
-OTHER_OBJS = @OTHER_OBJS@
-
-PALIB = libportaudio.la
-PAINC = include/portaudio.h
-
-PA_LDFLAGS = $(LDFLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-# we are building disable-shared but its still inserting flags for shared libs???
-# $(SHARED_FLAGS)
-#MAKEFILE = Makefile
-
-COMMON_OBJS = \
-	src/common/pa_allocation.o \
-	src/common/pa_converters.o \
-	src/common/pa_cpuload.o \
-	src/common/pa_dither.o \
-	src/common/pa_debugprint.o \
-	src/common/pa_front.o \
-	src/common/pa_process.o \
-	src/common/pa_skeleton.o \
-	src/common/pa_stream.o \
-	src/common/pa_trace.o
-
-TESTS = \
-	bin/paqa_devs \
-	bin/paqa_errs \
-	bin/patest1 \
-	bin/patest_buffer \
-	bin/patest_callbackstop \
-	bin/patest_clip \
-	bin/patest_dither \
-	bin/patest_hang \
-	bin/patest_in_overflow \
-	bin/patest_latency \
-	bin/patest_leftright \
-	bin/patest_longsine \
-	bin/patest_many \
-	bin/patest_maxsines \
-	bin/patest_multi_sine \
-	bin/patest_out_underflow \
-	bin/patest_pink \
-	bin/patest_prime \
-	bin/patest_read_record \
-	bin/patest_read_write_wire \
-	bin/patest_record \
-	bin/patest_ringmix \
-	bin/patest_saw \
-	bin/patest_sine8 \
-	bin/patest_sine \
-	bin/patest_sine_channelmaps \
-	bin/patest_sine_formats \
-	bin/patest_sine_time \
-	bin/patest_start_stop \
-	bin/patest_stop \
-	bin/patest_stop_playout \
-	bin/patest_toomanysines \
-	bin/patest_underflow \
-	bin/patest_wire \
-	bin/patest_write_sine \
-	bin/pa_devs \
-	bin/pa_fuzz \
-	bin/pa_minlat
-
-# Most of these don't compile yet.  Put them in TESTS, above, if
-# you want to try to compile them...
-ALL_TESTS = \
-	$(TESTS) \
-	bin/patest_sync \
-	bin/debug_convert \
-	bin/debug_dither_calc \
-	bin/debug_dual \
-	bin/debug_multi_in \
-	bin/debug_multi_out \
-	bin/debug_record \
-	bin/debug_record_reuse \
-	bin/debug_sine_amp \
-	bin/debug_sine \
-	bin/debug_sine_formats \
-	bin/debug_srate \
-	bin/debug_test1
-
-OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
-
-LTOBJS:= $(OBJS:.o=.lo)
-
-SUBDIRS =
-@ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp
-
-all: lib/$(PALIB) all-recursive tests
-
-tests: bin-stamp $(TESTS)
-
-
-lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC)
-	$(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
-
-$(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
-
-
-install: lib/$(PALIB) portaudio-2.0.pc
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
-	$(INSTALL) -d $(DESTDIR)$(includedir)
-	$(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC) $(DESTDIR)$(includedir)/portaudio.h
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
-	@echo ""
-	@echo "------------------------------------------------------------"
-	@echo "PortAudio was successfully installed."
-	@echo ""
-	@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
-	@echo "to make the shared object available.  You may also need to"
-	@echo "modify your LD_LIBRARY_PATH environment variable to include"
-	@echo "the directory $(libdir)"
-	@echo "------------------------------------------------------------"
-	@echo ""
-	$(MAKE) install-recursive
-
-uninstall:
-	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(PALIB)
-	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(includedir)/portaudio.h
-	$(MAKE) uninstall-recursive
-
-clean:
-	$(LIBTOOL) --mode=clean rm -f $(LTOBJS) $(ALL_TESTS) lib/$(PALIB)
-	rm -f bin-stamp lib-stamp
-	-rm -rf bin lib
-
-distclean: clean
-	rm -f config.log config.status Makefile libtool portaudio-2.0.pc
-
-%.o: %.c $(MAKEFILE) $(PAINC)
-	$(CC) -c $(CFLAGS) $< -o $@
-
-%.lo: %.c $(MAKEFILE) $(PAINC)
-	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
-
-%.o: %.cpp $(MAKEFILE) $(PAINC)
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-%.o: %.asm
-	$(NASM) $(NASMOPT) -o $@ $<
-
-bin-stamp:
-	-mkdir bin
-	touch $@
-
-lib-stamp:
-	-mkdir lib
-	-mkdir -p \
-		src/common \
-		src/hostapi/alsa \
-		src/hostapi/asihpi \
-		src/hostapi/asio \
-		src/hostapi/coreaudio \
-		src/hostapi/dsound \
-		src/hostapi/jack \
-		src/hostapi/oss \
-		src/hostapi/wasapi \
-		src/hostapi/wdmks \
-		src/hostapi/wmme \
-		src/os/mac_osx \
-		src/os/unix \
-		src/os/win
-	touch $@
-
-Makefile: Makefile.in config.status
-	$(SHELL) config.status
-
-all-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir all; done
-
-install-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir install; done
-
-uninstall-recursive:
-	for dir in $(SUBDIRS); do make -C $$dir uninstall; done
diff --git a/libs/portaudio/README.txt b/libs/portaudio/README.txt
deleted file mode 100644
index 2d7877f67c..0000000000
--- a/libs/portaudio/README.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-README for PortAudio
-
-/*
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Copyright (c) 1999-2006 Phil Burk and Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-
-PortAudio is a portable audio I/O library designed for cross-platform
-support of audio. It uses either a callback mechanism to request audio 
-processing, or blocking read/write calls to buffer data between the 
-native audio subsystem and the client. Audio can be processed in various 
-formats, including 32 bit floating point, and will be converted to the 
-native format internally.
-
-Documentation:
-	Documentation is available in "/doc/html/index.html"
-	Also see "src/common/portaudio.h" for API spec.
-	Also see http://www.portaudio.com/docs/
-	And see "tests/patest_saw.c" for an example.
-
-For information on compiling programs with PortAudio, please see the
-tutorial at:
-
-  http://portaudio.com/trac/wiki/TutorialDir/TutorialStart
-  
-
-Important Files and Folders:
-    include/portaudio.h     = header file for PortAudio API. Specifies API.	
-    src/common/             = platform independant code, host independant 
-                              code for all implementations.
-    src/os                  = os specific (but host api neutral) code
-    src/hostapi             = implementations for different host apis
-
-    pablio                  = simple blocking read/write interface
-    
-
-Host API Implementations:
-    src/hostapi/alsa        = Advanced Linux Sound Architecture (ALSA)
-    src/hostapi/asihpi      = AudioScience HPI
-    src/hostapi/asio        = ASIO for Windows and Macintosh
-    src/hostapi/coreaudio   = Macintosh Core Audio for OS X
-    src/hostapi/dsound      = Windows Direct Sound
-    src/hostapi/jack        = JACK Audio Connection Kit
-    src/hostapi/oss         = Unix Open Sound System (OSS)
-    src/hostapi/wasapi      = Windows Vista WASAPI
-    src/hostapi/wdmks       = Windows WDM Kernel Streaming
-    src/hostapi/wmme        = Windows MME (most widely supported)
-
-
-Test Programs:
-    tests/pa_fuzz.c         = guitar fuzz box
-    tests/pa_devs.c         = print a list of available devices
-    tests/pa_minlat.c       = determine minimum latency for your machine
-    tests/paqa_devs.c       = self test that opens all devices
-    tests/paqa_errs.c       = test error detection and reporting
-    tests/patest_clip.c     = hear a sine wave clipped and unclipped
-    tests/patest_dither.c   = hear effects of dithering (extremely subtle)
-    tests/patest_pink.c     = fun with pink noise
-    tests/patest_record.c   = record and playback some audio
-    tests/patest_maxsines.c = how many sine waves can we play? Tests Pa_GetCPULoad().
-    tests/patest_sine.c     = output a sine wave in a simple PA app
-    tests/patest_sync.c     = test syncronization of audio and video
-    tests/patest_wire.c     = pass input to output, wire simulator
diff --git a/libs/portaudio/SConstruct b/libs/portaudio/SConstruct
deleted file mode 100644
index 15d36bad57..0000000000
--- a/libs/portaudio/SConstruct
+++ /dev/null
@@ -1,194 +0,0 @@
-import sys, os.path
-
-def rsplit(toSplit, sub, max=-1):
-    """ str.rsplit seems to have been introduced in 2.4 :( """
-    l = []
-    i = 0
-    while i != max:
-        try: idx = toSplit.rindex(sub)
-        except ValueError: break
-
-        toSplit, splitOff = toSplit[:idx], toSplit[idx + len(sub):]
-        l.insert(0, splitOff)
-        i += 1
-
-    l.insert(0, toSplit)
-    return l
-
-sconsDir = os.path.join("build", "scons")
-SConscript(os.path.join(sconsDir, "SConscript_common"))
-Import("Platform", "Posix", "ApiVer")
-
-# SConscript_opts exports PortAudio options
-optsDict = SConscript(os.path.join(sconsDir, "SConscript_opts"))
-optionsCache = os.path.join(sconsDir, "options.cache")   # Save options between runs in this cache
-options = Options(optionsCache, args=ARGUMENTS)
-for k in ("Installation Dirs", "Build Targets", "Host APIs", "Build Parameters", "Bindings"):
-    options.AddOptions(*optsDict[k])
-# Propagate options into environment
-env = Environment(options=options)
-# Save options for next run
-options.Save(optionsCache, env)
-# Generate help text for options
-env.Help(options.GenerateHelpText(env))
-
-buildDir = os.path.join("#", sconsDir, env["PLATFORM"])
-
-# Determine parameters to build tools
-if Platform in Posix:
-    baseLinkFlags = threadCFlags = "-pthread"
-    baseCxxFlags = baseCFlags = "-Wall -pedantic -pipe " + threadCFlags
-    debugCxxFlags = debugCFlags = "-g"
-    optCxxFlags = optCFlags  = "-O2"
-env["CCFLAGS"] = baseCFlags.split()
-env["CXXFLAGS"] = baseCxxFlags.split()
-env["LINKFLAGS"] = baseLinkFlags.split()
-if env["enableDebug"]:
-    env.AppendUnique(CCFLAGS=debugCFlags.split())
-    env.AppendUnique(CXXFLAGS=debugCxxFlags.split())
-if env["enableOptimize"]:
-    env.AppendUnique(CCFLAGS=optCFlags.split())
-    env.AppendUnique(CXXFLAGS=optCxxFlags.split())
-if not env["enableAsserts"]:
-    env.AppendUnique(CPPDEFINES=["-DNDEBUG"])
-if env["customCFlags"]:
-    env.Append(CCFLAGS=Split(env["customCFlags"]))
-if env["customCxxFlags"]:
-    env.Append(CXXFLAGS=Split(env["customCxxFlags"]))
-if env["customLinkFlags"]:
-    env.Append(LINKFLAGS=Split(env["customLinkFlags"]))
-
-env.Append(CPPPATH=[os.path.join("#", "include"), "common"])
-
-# Store all signatures in one file, otherwise .sconsign files will get installed along with our own files
-env.SConsignFile(os.path.join(sconsDir, ".sconsign"))
-
-env.SConscriptChdir(False)
-sources, sharedLib, staticLib, tests, portEnv, hostApis = env.SConscript(os.path.join("src", "SConscript"),
-        build_dir=buildDir, duplicate=False, exports=["env"])
-
-if Platform in Posix:
-    prefix = env["prefix"]
-    includeDir = os.path.join(prefix, "include")
-    libDir = os.path.join(prefix, "lib")
-    env.Alias("install", includeDir)
-    env.Alias("install", libDir)
-
-    # pkg-config
-
-    def installPkgconfig(env, target, source):
-        tgt = str(target[0])
-        src = str(source[0])
-        f = open(src)
-        try: txt = f.read()
-        finally: f.close()
-        txt = txt.replace("@prefix@", prefix)
-        txt = txt.replace("@exec_prefix@", prefix)
-        txt = txt.replace("@libdir@", libDir)
-        txt = txt.replace("@includedir@", includeDir)
-        txt = txt.replace("@LIBS@", " ".join(["-l%s" % l for l in portEnv["LIBS"]]))
-        txt = txt.replace("@THREAD_CFLAGS@", threadCFlags)
-
-        f = open(tgt, "w")
-        try: f.write(txt)
-        finally: f.close()
-
-    pkgconfigTgt = "portaudio-%d.0.pc" % int(ApiVer.split(".", 1)[0])
-    env.Command(os.path.join(libDir, "pkgconfig", pkgconfigTgt),
-        os.path.join("#", pkgconfigTgt + ".in"), installPkgconfig)
-
-# Default to None, since if the user disables all targets and no Default is set, all targets
-# are built by default
-env.Default(None)
-if env["enableTests"]:
-    env.Default(tests)
-if env["enableShared"]:
-    env.Default(sharedLib)
-
-    if Platform in Posix:
-        def symlink(env, target, source):
-            trgt = str(target[0])
-            src = str(source[0])
-
-            if os.path.islink(trgt) or os.path.exists(trgt):
-                os.remove(trgt)
-            os.symlink(os.path.basename(src), trgt)
-
-        major, minor, micro = [int(c) for c in ApiVer.split(".")]
-        
-        soFile = "%s.%s" % (os.path.basename(str(sharedLib[0])), ApiVer)
-        env.InstallAs(target=os.path.join(libDir, soFile), source=sharedLib)
-        # Install symlinks
-        symTrgt = os.path.join(libDir, soFile)
-        env.Command(os.path.join(libDir, "libportaudio.so.%d.%d" % (major, minor)),
-            symTrgt, symlink)
-        symTrgt = rsplit(symTrgt, ".", 1)[0]
-        env.Command(os.path.join(libDir, "libportaudio.so.%d" % major), symTrgt, symlink)
-        symTrgt = rsplit(symTrgt, ".", 1)[0]
-        env.Command(os.path.join(libDir, "libportaudio.so"), symTrgt, symlink)
-
-if env["enableStatic"]:
-    env.Default(staticLib)
-    env.Install(libDir, staticLib)
-
-env.Install(includeDir, os.path.join("include", "portaudio.h"))
-
-
-if env["enableCxx"]:
-    env.SConscriptChdir(True)
-    cxxEnv = env.Copy()
-    sharedLibs, staticLibs, headers = env.SConscript(os.path.join("bindings", "cpp", "SConscript"),
-            exports={"env": cxxEnv, "buildDir": buildDir}, build_dir=os.path.join(buildDir, "portaudiocpp"), duplicate=False)
-    if env["enableStatic"]:
-        env.Default(staticLibs)
-        env.Install(libDir, staticLibs)
-    if env["enableShared"]:
-        env.Default(sharedLibs)
-        env.Install(libDir, sharedLibs)
-    env.Install(os.path.join(includeDir, "portaudiocpp"), headers)
-
-# Generate portaudio_config.h header with compile-time definitions of which PA
-# back-ends are available, and which includes back-end extension headers
-
-# Host-specific headers
-hostApiHeaders = {"ALSA": "pa_linux_alsa.h",
-                    "ASIO": "pa_asio.h",
-                    "COREAUDIO": "pa_mac_core.h",
-                    "JACK": "pa_jack.h",
-                    "WMME": "pa_winwmme.h",
-                    }
-
-def buildConfigH(target, source, env):
-    """builder for portaudio_config.h"""
-    global hostApiHeaders, hostApis
-    out = ""
-    for hostApi in hostApis:
-        out += "#define PA_HAVE_%s\n" % hostApi
-
-        hostApiSpecificHeader = hostApiHeaders.get(hostApi, None)
-        if hostApiSpecificHeader:
-            out += "#include \"%s\"\n" % hostApiSpecificHeader
-
-        out += "\n"
-    # Strip the last newline
-    if out[-1] == "\n":
-        out = out[:-1]
-
-    f = file(str(target[0]), 'w')
-    try: f.write(out)
-    finally: f.close()
-    return 0
-
-# Define the builder for the config header
-env.Append(BUILDERS={"portaudioConfig": env.Builder(action=Action(buildConfigH,
-        "generating '$TARGET'"), target_factory=env.fs.File,)})
-
-confH = env.portaudioConfig(File("portaudio_config.h", "include"),
-        File("portaudio.h", "include"))
-env.Default(confH)
-env.Install(os.path.join(includeDir, "portaudio"), confH)
-
-for api in hostApis:
-    if api in hostApiHeaders:
-        env.Install(os.path.join(includeDir, "portaudio"),
-                File(hostApiHeaders[api], "include"))
diff --git a/libs/portaudio/V19-devel-readme.txt b/libs/portaudio/V19-devel-readme.txt
deleted file mode 100644
index ad5e137580..0000000000
--- a/libs/portaudio/V19-devel-readme.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-	This file was a scribble area during the early phases of development.
-
-	It's out of date but will probably hang around untill all the content 
-	has been cleaned out or found a new home.
-
-	Here's some tasks to undertake:
-		o- make sure that the @brief comments in each file are at least
-			as good as the file descriptions below, then delete the file
-			descriptions below.
-
-		o- make sure that the coding guidelines below appear in the
-			pa_proposals style guide, then delete from below.
-
-		o- verify and move the TODO items into TRAC
-*/
-
-
-FILES:
-
-portaudio.h
-    public api header file
-
-pa_front.c
-    implements the interface defined in portaudio.h. manages multiple host apis.
-    validates function parameters before calling through to host apis. tracks
-    open streams and closes them at Pa_Terminate().
-
-pa_util.h 
-    declares utility functions for use my implementations. including utility
-    functions which must be implemented separately for each platform.
-
-pa_hostapi.h
-    hostapi representation structure used to interface between pa_front.c
-    and implementations
-    
-pa_stream.c/h
-    stream interface and representation structures and helper functions
-    used to interface between pa_front.c and implementations
-
-pa_cpuload.c/h
-    source and header for cpu load calculation facility
-
-pa_trace.c/h
-    source and header for debug trace log facility
-
-pa_converters.c/h
-    sample buffer conversion facility
-
-pa_dither.c/h
-    dither noise generator
-
-pa_process.c/h
-    callback buffer processing facility including interleave and block adaption
-
-pa_allocation.c/h
-    allocation context for tracking groups of allocations
-
-pa_skeleton.c
-    an skeleton implementation showing how the common code can be used.
-
-pa_win_util.c
-    Win32 implementation of platform specific PaUtil functions (memory allocation,
-    usec clock, Pa_Sleep().)  The file will be used with all Win32 host APIs.
-    
-pa_win_hostapis.c
-    contains the paHostApiInitializers array and an implementation of
-    Pa_GetDefaultHostApi() for win32 builds.
-
-pa_win_wmme.c
-    Win32 host api implementation for the windows multimedia extensions audio API.
-
-pa_win_wmme.h
-    public header file containing interfaces to mme-specific functions and the
-    deviceInfo data structure.
-
-
-CODING GUIDELINES:
-
-naming conventions:
-    #defines begin with PA_
-    #defines local to a file end with _
-    global utility variables begin with paUtil
-    global utility types begin with PaUtil  (including function types)
-    global utility functions begin with PaUtil_
-    static variables end with _
-    static constants begin with const and end with _
-    static funtions have no special prefix/suffix
-
-In general, implementations should declare all of their members static,
-except for their initializer which should be exported. All exported names
-should be preceeded by Pa<MN>_ where MN is the module name, for example
-the windows mme initializer should be named PaWinWmme_Initialize().
-
-Every host api should define an initializer which returns an error code
-and a PaHostApiInterface*. The initializer should only return an error other
-than paNoError if it encounters an unexpected and fatal error (memory allocation
-error for example). In general, there may be conditions under which it returns
-a NULL interface pointer and also returns paNoError. For example, if the ASIO
-implementation detects that ASIO is not installed, it should return a
-NULL interface, and paNoError.
-
-Platform-specific shared functions should begin with Pa<PN>_ where PN is the
-platform name. eg. PaWin_ for windows, PaUnix_ for unix.
-
-The above two conventions should also be followed whenever it is necessary to
-share functions accross multiple source files.
-
-Two utilities for debug messages are provided. The PA_DEBUG macro defined in
-pa_implementation.h provides a simple way to print debug messages to stderr.
-Due to real-time performance issues, PA_DEBUG may not be suitable for use
-within the portaudio processing callback, or in other threads. In such cases
-the event tracing facility provided in pa_trace.h may be more appropriate.
-
-If PA_LOG_API_CALLS is defined, all calls to the public PortAudio API
-will be logged to stderr along with parameter and return values.
-
-
-TODO: (these need to be turned into TRAC items)
-    write some new tests to exercise the multi-host-api functions
-
-    write (doxygen) documentation for pa_trace (phil?)
-
-    create a global configuration file which documents which PA_ defines can be
-    used for configuration
-
-    need a coding standard for comment formatting
-
-    write style guide document (ross)
diff --git a/libs/portaudio/acinclude.m4 b/libs/portaudio/acinclude.m4
deleted file mode 100644
index 72e6d438a8..0000000000
--- a/libs/portaudio/acinclude.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-
-
diff --git a/libs/portaudio/bindings/cpp/AUTHORS b/libs/portaudio/bindings/cpp/AUTHORS
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/bindings/cpp/COPYING b/libs/portaudio/bindings/cpp/COPYING
deleted file mode 100644
index c1c60a030e..0000000000
--- a/libs/portaudio/bindings/cpp/COPYING
+++ /dev/null
@@ -1,31 +0,0 @@
-PortAudio Portable Real-Time Audio Library
-Copyright (c) 1999-2006 Ross Bencina and Phil Burk
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-The text above constitutes the entire PortAudio license; however, 
-the PortAudio community also makes the following non-binding requests:
-
-Any person wishing to distribute modifications to the Software is
-requested to send the modifications to the original developer so that
-they can be incorporated into the canonical version. It is also 
-requested that these non-binding requests be included along with the 
-license above.
diff --git a/libs/portaudio/bindings/cpp/ChangeLog b/libs/portaudio/bindings/cpp/ChangeLog
deleted file mode 100644
index 0201a0f0f5..0000000000
--- a/libs/portaudio/bindings/cpp/ChangeLog
+++ /dev/null
@@ -1,178 +0,0 @@
-Note: Because PortAudioCpp is now in the main PortAudio SVN repository, having these per-release changelogs probably doesn't make much sense anymore. Perhaps it's better to just note mayor changes by date from now on.
-
-PortAudioCpp v19 revision 16 06/05/22:
-
-	mblaauw:
-	- Added up-to-date MSVC 6.0 projects created by David Moore. Besides MSVC 6.0 users, MSVC 7.0 users may use these projects and automatically convert them to MSVC 7.0 projects.
-	- Changed the code and projects (MSVC 7.1 only) to be up-to-date with PortAudio's new directory structure.
-	- Added equivalents of the PaAsio_GetInputChannelName() and PaAsio_GetOutputChannelName() functions to the AsioDeviceAdapter wrapper-class (missing functions pointed out by David Moore).
-	- Added code to PortAudio's main SVN repository.
-
-PortAudioCpp v19 revision 15 (unknown release date):
-
-	mblaauw:
-	- Changed some exception handling code in HostApi's constructor.
-	- Added accessors to PortAudio PaStream from PortAudioCpp Stream (their absense being pointed out
-	by Tom Jordan).
-	- Fixed a bug/typo in MemFunToCallbackInterfaceAdapter::init() thanks to Fredrik Viklund.
-	- Fixed issue with concrete Stream classes possibly throwing an exception and fixed documentation w.r.t. this.
-	- Moved files to portaudio/binding/cpp/. Made new msvc 7.1 projects to reflect the change and removed msvc 6.0 
-	and 7.0 projects (because I can no longer maintain them myself). Gnu projects will probably need updating.
-
-PortAudioCpp v19 revision 14 03/10/24:
-
-	mblaauw:
-	- Fixed some error handling bugs in Stream and System (pointed out by Tom Jordan).
-	- Updated documentation a little (main page).
-	- Fixed order of members so initializer list was in the right order in 
-	StreamParameters (pointed out by Ludwig Schwardt).
-	- Added new lines at EOF's (as indicated by Ludwig Schwardt).
-
-PortAudioCpp v19 revision 13 03/10/19:
-
-	lschwardt:
-	- Added build files for GNU/Linux.
-	- Fixed bug in Exception where the inherited what() member function (and destructor) had looser 
-	exception specification (namely no exception specification, i.e. could throw anything) than 
-	the std::exception base class's what() member function (which had throw(), i.e. no-throw guarantee).
-	- Changed the iterators so that they have a set of public typedefs instead of deriving the C++ standard 
-	library std::iterator<> struct. G++ 2.95 doesn't support std::exception<> and composition-by-aggregation 
-	is prefered over composition-by-inheritance in this case.
-	- Changed some minor things to avoid G++ warning messages.
-
-	mblaauw:
-	- Renamed this file (/WHATSNEW.txt) to /CHANGELOG.
-	- Renamed /PA_ISSUES.txt to /PA_ISSUES.
-	- Added /INSTALL file with some build info for GNU/Linux and VC6.
-	- Added MSVC 6.0 projects for building PortAudioCpp as a staticly or dynamically linkable library.
-	- Moved build files to /build/(gnu/ or vc6/).
-	- Moved Doxygen configuration files to /doc/ and output to /doc/api_reference/.
-	- Added a /doc/README with some info how to generate Doxygen documentation.
-
-PortAudioCpp v19 revision 12 03/09/02:
-
-	mblaauw:
-	- Updated code to reflect changes on V19-devel CVS branch.
-	- Fixed some typos in the documentation.
-
-PortAudioCpp v19 revision 11 03/07/31:
-
-	mblaauw:
-	- Renamed SingleDirecionStreamParameters to DirectionSpecificStreamParameters.
-	- Implemented BlockingStream.
-	- Updated code to reflect recent changes to PortAudio V19-devel.
-	- Fixed a potential memory leak when an exception was thrown in the HostApi 
-	constructor.
-	- Renamed ``Latency'' to ``BufferSize'' in AsioDeviceAdapter.
-	- Updated class documentation.
-
-PortAudioCpp v19 revision 10 03/07/18:
-
-	mblaauw:
-	- SingleDirectionStreamParameters now has a (static) null() method.
-	- StreamParameters uses references for the direction-specific stream parameters 
-	instead of pointers (use null() method (above) instead of NULL).
-	- StreamParameters and SingleDirectionStreamParameters must now be fully specified 
-	and now default values are used (because this was not very useful in general and 
-	only made things more complex).
-	- Updated documentation.
-
-PortAudioCpp v19 revision 09 03/06/25:
-
-	mblaauw:
-	- Changed some things in SingleDirectionStreamParameters to ease it's usage.
-	- Placed all SingleDirectionStreamParameters stuff into a separate file.
-	+ Totally redid the callback stuff, now it's less ackward and supports C++ functions.
-
-PortAudioCpp v19 revision 08 03/06/20:
-
-	mblaauw:
-	- Made deconstructors for Device and HostApi private.
-	+ Added a AsioDeviceWrapper host api specific device extension class.
-	- Refactored Exception into a Exception base class and PaException and PaCppException 
-	derived classes.
-	- Added ASIO specific device info to the devs.cxx example.
-	- Fixed a bug in System::hostApiCount() and System::defaultHostApi().
-	+ Moved Device::null to System::nullDevice.
-	- Fixed some bugs in Device and System.
-
-PortAudioCpp v19 revision 07 03/06/08:
-
-	mblaauw:
-	- Updated some doxy comments.
-	+ Renamed CbXyz to CallbackXyz.
-	+ Renamed all ``configurations'' to ``parameters''.
-	+ Renamed HalfDuplexStreamConfiguration to SingleDirectionStreamConfiguration.
-	- Renamed SingleDirectionStreamParameters::streamParameters() to 
-	SingleDirectionStreamParameters::paSteamParameters.
-	- Added a non-constant version of SingleDirectionStreamParameters::paStreamParameters().
-	- A few improvements to SingleDirectionStreamParameters.
-	- Allowed AutoSystem to be created without initializing the System singleton 
-	(using a ctor flag).
-	- Added a BlockingStream class (not implemented for now).
-	- Fixed many bugs in the implementation of the iterators.
-	- Fixed a bug in Device::operator==().
-	+ Added a C++ version of the patest_sine.c test/example.
-	- Added a ctor for StreamParameters for a default half-duplex stream.
-	- Added SingleDirectionStreamParameters::setDevice() and setNumChannels().
-	- Renamed System::numHostApis() to System::hostApiCount().
-	+ Rewrote the iterators and related classes. They are now fully STL compliant. The System now 
-	has a static array of all HostApis and all Devices. Only the System can create HostApis and 
-	Devices and they are non-copyable now. All HostApis and Devices are now passed by-reference.
-	- Renamed (System::) getVersion() to version() and getVersionText() to versionText().
-	- Renamed (Device::) numXyzChannels() to maxXyzChannels().
-	- Changed some stuff in StreamParameters.
-	+ Added a C++ version of the patest_devs.c test/example.
-
-PortAudioCpp v19 revision 06 03/06/04:
-
-	mblaauw:
-	+ Added this file to the project (roughly, a `+' denotes a major change, a `-' a minor change).
-	- Added System::deviceByIndex(), useful when a Device's index is stored for instance.
-	- Renamed System::hostApiFromTypeId() to System::hostApiByTypeId().
-	- Updated and added some Doxygen documentation.
-	- Made Stream::usedIntputLatency(), Stream::usedOutputLatency() and 
-	Stream::usedSampleRate() throw an paInternalError equivalent exception instead of paBadStreamPtr.
-	- Changed exception handling in Stream::open() functions. They now follow the PA error handling 
-	mechanism better and a couple of bugs regarding ownership of objects were fixed.
-	- Renamed Device::isDefaultXyzDevice() to Device::isSystemDefaultXyzDevice().
-	- Added Device::isHostApiDefaultXyzDevice().
-	- Added StreamConfiguration::unsetFlag().
-	- Removed CUSTOM from SampleDataFormat.
-	- System::hostApiByTypeId() now throws an paInternalError if the type id was out-of-range; this 
-	is a temporary work-around (see comments).
-	- Changed CbInterface to use paCallbackFun() instead of operator()().
-	- Renamed ``object'' to ``instance'' in CbMemFunAdapter.hxx.
-	- Added StreamConfiguration::setXyzHostApiSpecificSampleFormat().
-	- Added StreamConfiguration::isXyzSampleFormatHostApiSpecific().
-	- Changed error handling in System::terminate(), it can now throw an Exception.
-	- Added error handling in System::defaultHostApi().
-	- Added error handling in System::hostApisEnd().
-	- Changed some (but probably not all) C casts to C++ casts to avoid confusion with a 
-	certain Python person.
-	- Renamed RaiiSystem to AutoSystem (class and file) as this is a come common convention.
-	- Renamed System::numDevices() to System::deviceCount() to be more compatible with PortAudio 
-	(although PortAudio uses Pa_CountDevices() instead, see comment).
-	- Renamed HostApi::numDevices() to HostApi::deviceCount().
-	- Changed INC_ to INCLUDED_ in the header multiple include guards.
-	- Changed the order of functions in the StreamConfiguration class' header.
-	- Written some more info in PortAudioCpp.hxx (Doxygen).
-	- Added CallbackStream.hxx and CallbackStream.cxx files.
-	+ Refactored StreamConfiguration to remove the duplication which was there. There is now a 
-	HalfDuplexStreamConfiguration class. Also made some improvements to these classes while 
-	doing the refactoring.
-	+ Moved all code files to source/portaudiocpp/ and changed includes.
-	+ Moved all header files to include/portaudiocpp/ to easy a binary build if needed. The project 
-	must be set to have .../include/ as a path to look for includes.
-	+ Refactored the Stream class into a Stream base class and a CallbackStream derived class.
-	- Renamed Stream::usingXyz() to Stream::xyz().
-	- Updated some doxy comments.
-	- Changed ``using namespace portaudio'' in .cxx files to ``namespace portaudio { ... }''.
-
-PortAudioCpp v19 revision 05 03/04/09:
-
-	mblaauw:
-	- Initial release on the PortAudio mailinglist.
-
-
-
diff --git a/libs/portaudio/bindings/cpp/INSTALL b/libs/portaudio/bindings/cpp/INSTALL
deleted file mode 100644
index 23e5f25d0e..0000000000
--- a/libs/portaudio/bindings/cpp/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/libs/portaudio/bindings/cpp/Makefile.am b/libs/portaudio/bindings/cpp/Makefile.am
deleted file mode 100644
index b10449ceff..0000000000
--- a/libs/portaudio/bindings/cpp/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = lib include bin 
-#doc
-
-EXTRA_DIST = portaudiocpp.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = portaudiocpp.pc
diff --git a/libs/portaudio/bindings/cpp/NEWS b/libs/portaudio/bindings/cpp/NEWS
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/bindings/cpp/README b/libs/portaudio/bindings/cpp/README
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/bindings/cpp/SConscript b/libs/portaudio/bindings/cpp/SConscript
deleted file mode 100644
index 2bad5ee685..0000000000
--- a/libs/portaudio/bindings/cpp/SConscript
+++ /dev/null
@@ -1,64 +0,0 @@
-import os.path
-
-Import("env", "buildDir")
-env.Append(CPPPATH="include")
-
-ApiVer = "0.0.12"
-Major, Minor, Micro = [int(c) for c in ApiVer.split(".")]
-
-sharedLibs = []
-staticLibs = []
-Import("Platform", "Posix")
-if Platform in Posix:
-    env["SHLIBSUFFIX"] = ".so.%d.%d.%d" % (Major, Minor, Micro)
-    soFile = "libportaudiocpp.so"
-    env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%s.%d" % (soFile, Major))
-
-    # Create symlinks
-    def symlink(env, target, source):
-        trgt = str(target[0])
-        src = str(source[0])
-        if os.path.islink(trgt) or os.path.exists(trgt):
-            os.remove(trgt)
-        os.symlink(os.path.basename(src), trgt)
-    lnk0 = env.Command(soFile + ".%d" % (Major), soFile + ".%d.%d.%d" % (Major, Minor, Micro), symlink)
-    lnk1 = env.Command(soFile, soFile + ".%d" % (Major), symlink)
-    sharedLibs.append(lnk0)
-    sharedLibs.append(lnk1)
-
-src = [os.path.join("source", "portaudiocpp", "%s.cxx" % f) for f in ("BlockingStream", "CallbackInterface", \
-    "CallbackStream", "CFunCallbackStream","CppFunCallbackStream", "Device",
-    "DirectionSpecificStreamParameters", "Exception", "HostApi", "InterfaceCallbackStream",
-    "MemFunCallbackStream", "Stream", "StreamParameters", "System", "SystemDeviceIterator",
-    "SystemHostApiIterator")]
-env.Append(LIBS="portaudio", LIBPATH=buildDir)
-sharedLib = env.SharedLibrary("portaudiocpp", src, LIBS=["portaudio"])
-staticLib = env.Library("portaudiocpp", src, LIBS=["portaudio"])
-sharedLibs.append(sharedLib)
-staticLibs.append(staticLib)
-
-headers = Split("""AutoSystem.hxx                         
-                   BlockingStream.hxx                     
-                   CallbackInterface.hxx                  
-                   CallbackStream.hxx
-                   CFunCallbackStream.hxx                 
-                   CppFunCallbackStream.hxx               
-                   Device.hxx                             
-                   DirectionSpecificStreamParameters.hxx  
-                   Exception.hxx                           
-                   HostApi.hxx
-                   InterfaceCallbackStream.hxx
-                   MemFunCallbackStream.hxx
-                   PortAudioCpp.hxx
-                   SampleDataFormat.hxx
-                   Stream.hxx
-                   StreamParameters.hxx
-                   SystemDeviceIterator.hxx
-                   SystemHostApiIterator.hxx
-                   System.hxx
-                   """)
-if env["PLATFORM"] == "win32":
-    headers.append("AsioDeviceAdapter.hxx") 
-headers = [File(os.path.join("include", "portaudiocpp", h)) for h in headers]
-
-Return("sharedLibs", "staticLibs", "headers")
diff --git a/libs/portaudio/bindings/cpp/bin/Makefile.am b/libs/portaudio/bindings/cpp/bin/Makefile.am
deleted file mode 100644
index 5f97f9445a..0000000000
--- a/libs/portaudio/bindings/cpp/bin/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-BINDIR = $(top_srcdir)/example
-LIBDIR = $(top_builddir)/lib
-
-noinst_PROGRAMS = devs sine
-
-LDADD = $(LIBDIR)/libportaudiocpp.la
-
-devs_SOURCES = $(BINDIR)/devs.cxx
-sine_SOURCES = $(BINDIR)/sine.cxx
diff --git a/libs/portaudio/bindings/cpp/build/gnu/Makefile.in b/libs/portaudio/bindings/cpp/build/gnu/Makefile.in
deleted file mode 100644
index 0bc6f28e75..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/Makefile.in
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Makefile template for PortAudioCpp
-# Ludwig Schwardt
-# 01/10/2003
-#
-# Not much to edit here - rather check configure.ac
-#
-
-PREFIX = @prefix@
-CC = @CC@
-CXX = @CXX@
-CFLAGS = @CFLAGS@ @DEFS@
-CXXFLAGS = @CXXFLAGS@
-SHARED_FLAGS = @SHARED_FLAGS@
-LIBS = @LIBS@
-DLL_LIBS = @DLL_LIBS@
-AR = @AR@
-RANLIB = @RANLIB@
-INSTALL = @INSTALL@
-
-PACPP_ROOT = @PACPP_ROOT@
-PORTAUDIO = @PORTAUDIO@
-PADLL = @PADLL@
-PACPP_DLL = @PACPP_DLL@
-PALIB = libportaudio.a
-PACPP_LIB = libportaudiocpp.a
-PACPP_DLLV = $(PACPP_DLL).0.0.12
-
-SRCDIR = $(PACPP_ROOT)/source/portaudiocpp
-BINDIR = $(PACPP_ROOT)/example
-LIBDIR = $(PACPP_ROOT)/lib
-DOCDIR = $(PACPP_ROOT)/doc
-
-OBJS = \
-       $(SRCDIR)/BlockingStream.o \
-       $(SRCDIR)/CallbackInterface.o \
-       $(SRCDIR)/CallbackStream.o \
-       $(SRCDIR)/CFunCallbackStream.o \
-       $(SRCDIR)/CppFunCallbackStream.o \
-       $(SRCDIR)/Device.o \
-       $(SRCDIR)/DirectionSpecificStreamParameters.o \
-       $(SRCDIR)/Exception.o \
-       $(SRCDIR)/HostApi.o \
-       $(SRCDIR)/InterfaceCallbackStream.o \
-       $(SRCDIR)/MemFunCallbackStream.o \
-       $(SRCDIR)/Stream.o \
-       $(SRCDIR)/StreamParameters.o \
-       $(SRCDIR)/System.o \
-       $(SRCDIR)/SystemDeviceIterator.o \
-       $(SRCDIR)/SystemHostApiIterator.o
-
-# Not supported yet
-#      $(SRCDIR)/AsioDeviceAdapter.o
-
-EXAMPLES = \
-           $(BINDIR)/devs \
-	   $(BINDIR)/sine
-
-.PHONY: all clean docs
-
-all: $(EXAMPLES) $(LIBDIR)/$(PACPP_LIB) $(LIBDIR)/$(PACPP_DLL)
-
-clean:
-	rm -rf $(SRCDIR)/*.o $(BINDIR)/*.o $(EXAMPLES) $(LIBDIR) $(DOCDIR)/api_reference 
-	rm -rf autom4te.cache config.status config.log
-
-docs:
-	cd $(DOCDIR); doxygen config.doxy.linux
-	
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-		
-%.o: %.cxx
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-
-$(EXAMPLES): $(BINDIR)/%: $(BINDIR)/%.o $(OBJS)
-	$(CXX) $^ -o $@ $(LIBS)
-
-$(LIBDIR)/$(PACPP_LIB): $(LIBDIR) $(OBJS)
-	$(AR) ruv $(LIBDIR)/$(PACPP_LIB) $(OBJS)
-	$(RANLIB) $(LIBDIR)/$(PACPP_LIB)
-
-$(LIBDIR)/$(PACPP_DLLV): $(LIBDIR) $(OBJS)
-	$(CXX) $(SHARED_FLAGS) -o $(LIBDIR)/$(PACPP_DLLV) $(OBJS) $(DLL_LIBS)
-
-$(LIBDIR)/$(PACPP_DLL): $(LIBDIR) $(OBJS)
-	$(CXX) $(SHARED_FLAGS) -o $(LIBDIR)/$(PACPP_DLL) $(OBJS) $(DLL_LIBS)
-
-#install: $(LIBDIR)/$(PACPP_LIB) $(LIBDIR)/$(PACPP_DLLV)
-#	$(INSTALL) -m 644 $(LIBDIR)/$(PACPP_DLLV) $(PREFIX)/lib/$(PACPP_DLLV)
-#	$(INSTALL) -m 644 $(LIBDIR)/$(PACPP_LIB) $(PREFIX)/lib/$(PACPP_LIB)
-#	cd $(PREFIX)/lib && rm -f $(PACPP_DLL) && ln -s $(PACPP_DLLV) $(PACPP_DLL)
-#	@echo ""
-#	@echo "------------------------------------------------------------"
-#	@echo "PortAudioCpp was successfully installed."
-#	@echo ""
-#	@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
-#	@echo "to make the shared object available.  You may also need to"
-#	@echo "modify your LD_LIBRARY_PATH environment variable to include"
-#	@echo "the directory $(PREFIX)/lib"
-#	@echo "------------------------------------------------------------"
-#	@echo ""
-
-$(LIBDIR):
-	mkdir $(LIBDIR)
diff --git a/libs/portaudio/bindings/cpp/build/gnu/OUT_OF_DATE b/libs/portaudio/bindings/cpp/build/gnu/OUT_OF_DATE
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/bindings/cpp/build/gnu/aclocal.m4 b/libs/portaudio/bindings/cpp/build/gnu/aclocal.m4
deleted file mode 100644
index c80e0acfc4..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/aclocal.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-
diff --git a/libs/portaudio/bindings/cpp/build/gnu/config.guess b/libs/portaudio/bindings/cpp/build/gnu/config.guess
deleted file mode 100644
index 297e5c30f4..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/config.guess
+++ /dev/null
@@ -1,1308 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-10-05'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    sparc*) machine=`uname -p`-unknown ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/libs/portaudio/bindings/cpp/build/gnu/config.sub b/libs/portaudio/bindings/cpp/build/gnu/config.sub
deleted file mode 100644
index 6eea727283..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/config.sub
+++ /dev/null
@@ -1,1505 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-07-17'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/libs/portaudio/bindings/cpp/build/gnu/configure b/libs/portaudio/bindings/cpp/build/gnu/configure
deleted file mode 100644
index 69070c66d4..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/configure
+++ /dev/null
@@ -1,4297 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for PortAudioCpp 12.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='PortAudioCpp'
-PACKAGE_TARNAME='portaudiocpp'
-PACKAGE_VERSION='12'
-PACKAGE_STRING='PortAudioCpp 12'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="../../include/portaudiocpp/PortAudioCpp.hxx"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX LN_S RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PACPP_ROOT PORTAUDIO PADLL PACPP_DLL PACPP_INC SHARED_FLAGS DLL_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKG_CONFIG JACK_CFLAGS JACK_LIBS LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures PortAudioCpp 12 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of PortAudioCpp 12:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-alsa (default=auto)
-  --with-jack (default=auto)
-  --with-oss (default=yes)
-  --with-host_os (no default)
-  --with-winapi ((wmme/directx/asio) default=wmme)
-  --with-macapi (asio) default=asio)
-  --with-asiodir (default=/usr/local/asiosdk2)
-  --with-dxdir (default=/usr/local/dx7sdk)
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-PortAudioCpp configure 12
-generated by GNU Autoconf 2.57
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by PortAudioCpp $as_me 12, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-        ac_must_keep_next=false # Got value, back to normal.
-      else
-        case $ac_arg in
-          *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=true ;;
-        esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-###### Top-level directory of pacpp
-###### This makes it easy to shuffle the build directories
-###### Also edit AC_CONFIG_SRCDIR above (wouldn't accept this variable)!
-PACPP_ROOT="../.."
-
-######
-###### SET THIS TO PORTAUDIO DIRECTORY
-######
-PORTAUDIO="$PACPP_ROOT/../portaudio"
-
-# Various other variables and flags
-
-PACPP_INC="$PACPP_ROOT/include"
-INCLUDES="-I$PACPP_INC -I$PORTAUDIO -I$PORTAUDIO/pa_common"
-CFLAGS="-g -O2 -Wall -ansi -pedantic $INCLUDES"
-CXXFLAGS="$CFLAGS"
-PALIBDIR="$PORTAUDIO/lib"
-
-# Checks for programs
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-        ;;
-    conftest.$ac_ext )
-        # This is the source file.
-        ;;
-    [ab].out )
-        # We found the default executable, but exeext='' is most
-        # certainly right.
-        break;;
-    *.* )
-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
-    * )
-        break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-          if test $ac_prog = install &&
-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # AIX install.  It has an incompatible calling convention.
-            :
-          elif test $ac_prog = install &&
-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # program-specific install script used by HP pwplus--don't use.
-            :
-          else
-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
-          fi
-        fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $AR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AR="$AR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_AR" && ac_cv_path_AR="no"
-  ;;
-esac
-fi
-AR=$ac_cv_path_AR
-
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if [ $AR = "no" ] ; then
-    { { echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
-echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
-   { (exit 1); exit 1; }; };
-fi
-
-# This must be one of the first tests we do or it will fail...
-
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-main ()
-{
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-
-# Transfer these variables to the Makefile
-
-
-
-
-
-
-
-
-
-##################### CHECK FOR INSTALLED PACKAGES ############################
-
-# checks for various host APIs and arguments to configure that
-# turn them on or off
-
-echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char snd_pcm_open ();
-int
-main ()
-{
-snd_pcm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_asound_snd_pcm_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_asound_snd_pcm_open=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
-  have_alsa=yes
-else
-  have_alsa=no
-fi
-
-
-# Determine the host description for the subsequent test.
-# PKG_CHECK_MODULES seems to check and set the host variable also, but
-# that then requires pkg-config availability which is not standard on
-# MinGW systems and can be a pain to install.
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for jack" >&5
-echo $ECHO_N "checking for jack... $ECHO_C" >&6
-
-        if $PKG_CONFIG --exists "jack" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-            succeeded=yes
-
-            echo "$as_me:$LINENO: checking JACK_CFLAGS" >&5
-echo $ECHO_N "checking JACK_CFLAGS... $ECHO_C" >&6
-            JACK_CFLAGS=`$PKG_CONFIG --cflags "jack"`
-            echo "$as_me:$LINENO: result: $JACK_CFLAGS" >&5
-echo "${ECHO_T}$JACK_CFLAGS" >&6
-
-            echo "$as_me:$LINENO: checking JACK_LIBS" >&5
-echo $ECHO_N "checking JACK_LIBS... $ECHO_C" >&6
-            JACK_LIBS=`$PKG_CONFIG --libs "jack"`
-            echo "$as_me:$LINENO: result: $JACK_LIBS" >&5
-echo "${ECHO_T}$JACK_LIBS" >&6
-        else
-            JACK_CFLAGS=""
-            JACK_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     have_jack=yes
-  else
-     have_jack=no
-  fi
-
-
-
-# Check whether --with-alsa or --without-alsa was given.
-if test "${with_alsa+set}" = set; then
-  withval="$with_alsa"
-  with_alsa=$withval
-else
-  with_alsa="yes"
-fi;
-
-
-# Check whether --with-jack or --without-jack was given.
-if test "${with_jack+set}" = set; then
-  withval="$with_jack"
-  with_jack=$withval
-else
-  with_jack="yes"
-fi;
-
-
-# Check whether --with-oss or --without-oss was given.
-if test "${with_oss+set}" = set; then
-  withval="$with_oss"
-  with_oss=$withval
-else
-  with_oss="yes"
-fi;
-
-
-# Check whether --with-host_os or --without-host_os was given.
-if test "${with_host_os+set}" = set; then
-  withval="$with_host_os"
-  host_os=$withval
-fi;
-
-
-# Check whether --with-winapi or --without-winapi was given.
-if test "${with_winapi+set}" = set; then
-  withval="$with_winapi"
-  with_winapi=$withval
-else
-  with_winapi="wmme"
-fi;
-
-# Mac API added for ASIO, can have other api's listed
-
-# Check whether --with-macapi or --without-macapi was given.
-if test "${with_macapi+set}" = set; then
-  withval="$with_macapi"
-  with_macapi=$withval
-else
-  with_macapi="asio"
-fi;
-
-
-# Check whether --with-asiodir or --without-asiodir was given.
-if test "${with_asiodir+set}" = set; then
-  withval="$with_asiodir"
-  with_asiodir=$withval
-else
-  with_asiodir="/usr/local/asiosdk2"
-fi;
-
-
-# Check whether --with-dxdir or --without-dxdir was given.
-if test "${with_dxdir+set}" = set; then
-  withval="$with_dxdir"
-  with_dxdir=$withval
-else
-  with_dxdir="/usr/local/dx7sdk"
-fi;
-
-
-##################### HOST-SPECIFIC LIBRARY SETTINGS ##########################
-
-case "${host_os}" in
-  darwin* )
-	# Mac OS X configuration
-
-	LIBS="-framework AudioUnit -framework AudioToolbox -framework CoreAudio";
-	PADLL="libportaudio.dylib";
-	PACPP_DLL="libportaudiocpp.dylib";
-	SHARED_FLAGS="-framework AudioUnit -framework AudioToolbox";
-	SHARED_FLAGS="$SHARED_FLAGS -framework CoreAudio -dynamiclib";
-        if [ $with_macapi = "asio" ] ; then
-            if [ $with_asiodir ] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR";
-        fi
-	;;
-
-  mingw* )
-        # MingW configuration
-
-        echo "WINAPI: $with_winapi"
-        if [ $with_winapi = "directx" ] ; then
-            if [ $with_dxdir ] ; then
-              DXDIR="$with_dxdir";
-            else
-              DXDIR="/usr/local/dx7sdk";
-            fi
-            echo "DXDIR: $DXDIR"
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -ldsound -lole32";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-            CFLAGS="$CFLAGS -DPA_NO_WMME -DPA_NO_ASIO";
-	    CXXFLAGS="$CFLAGS"
-        elif [ $with_winapi = "asio" ] ; then
-            if [ $with_asiodir ] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR"
-
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -DPA_NO_WMME -DPA_NO_DS -DWINDOWS";
-            CXXFLAGS="$CFLAGS";
-        else   # WMME default
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm";
-            CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_ASIO";
-            CXXFLAGS="$CFLAGS";
-        fi
-        ;;
-
-  cygwin* )
-	# Cygwin configuration
-
-	LIBS="-L$PALIBDIR -lportaudio"
-	LIBS="$LIBS -lwinmm -lm";
-	PADLL="portaudio.dll";
-	PACPP_DLL="portaudiocpp.dll";
-	SHARED_FLAGS="-shared -mthreads";
-	DLL_LIBS="-lwinmm";
-	;;
-
-  *)
-	# Unix OSS configuration
-
-
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_create ();
-int
-main ()
-{
-pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-if test $ac_cv_lib_pthread_pthread_create = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-else
-  { { echo "$as_me:$LINENO: error: libpthread not found!" >&5
-echo "$as_me: error: libpthread not found!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-	LIBS="$LIBS -L$PALIBDIR -lportaudio"
-
-	if [ $have_jack = "yes" ] && [ $with_jack != "no" ] ; then
-   	      	LIBS="$LIBS $JACK_LIBS"
-		CFLAGS="$CFLAGS $JACK_CFLAGS"
-                cat >>confdefs.h <<\_ACEOF
-#define PA_USE_JACK 1
-_ACEOF
-
-	fi
-
-	if [ $have_alsa = "yes" ] && [ $with_alsa != "no" ] ; then
-                LIBS="$LIBS -lasound"
-                cat >>confdefs.h <<\_ACEOF
-#define PA_USE_ALSA 1
-_ACEOF
-
-	fi
-
-	if [ $with_oss != "no" ] ; then
-		cat >>confdefs.h <<\_ACEOF
-#define PA_USE_OSS 1
-_ACEOF
-
-	fi
-	LIBS="$LIBS -lm -lpthread";
-	PADLL="libportaudio.so";
-	PACPP_DLL="libportaudiocpp.so";
-	SHARED_FLAGS="-shared";
-esac
-
-          ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ 	]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ 	]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by PortAudioCpp $as_me 12, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-PortAudioCpp config.status 12
-configured by $0, generated by GNU Autoconf 2.57,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@LN_S@,$LN_S,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@AR@,$AR,;t t
-s,@PACPP_ROOT@,$PACPP_ROOT,;t t
-s,@PORTAUDIO@,$PORTAUDIO,;t t
-s,@PADLL@,$PADLL,;t t
-s,@PACPP_DLL@,$PACPP_DLL,;t t
-s,@PACPP_INC@,$PACPP_INC,;t t
-s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
-s,@DLL_LIBS@,$DLL_LIBS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@JACK_CFLAGS@,$JACK_CFLAGS,;t t
-s,@JACK_LIBS@,$JACK_LIBS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-                                     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         echo $f;;
-      *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/libs/portaudio/bindings/cpp/build/gnu/configure.ac b/libs/portaudio/bindings/cpp/build/gnu/configure.ac
deleted file mode 100644
index 5457c53420..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/configure.ac
+++ /dev/null
@@ -1,214 +0,0 @@
-#
-# PortAudioCpp V19 autoconf input file
-# Shamelessly ripped from the PortAudio one by Dominic Mazzoni
-# Ludwig Schwardt
-#
-
-# Require autoconf >= 2.13
-AC_PREREQ(2.13)
-
-AC_INIT([PortAudioCpp], [12])
-AC_CONFIG_SRCDIR([../../include/portaudiocpp/PortAudioCpp.hxx])
-
-###### Top-level directory of pacpp
-###### This makes it easy to shuffle the build directories
-###### Also edit AC_CONFIG_SRCDIR above (wouldn't accept this variable)!
-PACPP_ROOT="../.."
-
-######
-###### SET THIS TO PORTAUDIO DIRECTORY
-######
-PORTAUDIO="$PACPP_ROOT/../portaudio"
-
-# Various other variables and flags
-
-PACPP_INC="$PACPP_ROOT/include"
-INCLUDES="-I$PACPP_INC -I$PORTAUDIO -I$PORTAUDIO/pa_common"
-CFLAGS="-g -O2 -Wall -ansi -pedantic $INCLUDES"
-CXXFLAGS="$CFLAGS"
-PALIBDIR="$PORTAUDIO/lib"
-
-# Checks for programs
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_PATH_PROG(AR, ar, no)
-if [[ $AR = "no" ]] ; then
-    AC_MSG_ERROR("Could not find ar - needed to create a library");
-fi
-
-# This must be one of the first tests we do or it will fail...
-AC_C_BIGENDIAN
-
-# Transfer these variables to the Makefile
-AC_SUBST(PACPP_ROOT)
-AC_SUBST(PORTAUDIO)
-AC_SUBST(PADLL)
-AC_SUBST(PACPP_DLL)
-AC_SUBST(PACPP_INC)
-AC_SUBST(SHARED_FLAGS)
-AC_SUBST(DLL_LIBS)
-AC_SUBST(CXXFLAGS)
-
-##################### CHECK FOR INSTALLED PACKAGES ############################
-
-# checks for various host APIs and arguments to configure that
-# turn them on or off
-
-AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-
-# Determine the host description for the subsequent test.
-# PKG_CHECK_MODULES seems to check and set the host variable also, but
-# that then requires pkg-config availability which is not standard on
-# MinGW systems and can be a pain to install.
-AC_CANONICAL_HOST
-
-PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-
-AC_ARG_WITH(alsa, 
-            [  --with-alsa (default=auto)],
-            with_alsa=$withval, with_alsa="yes")
-
-AC_ARG_WITH(jack, 
-            [  --with-jack (default=auto)],
-            with_jack=$withval, with_jack="yes")
-
-AC_ARG_WITH(oss, 
-            [  --with-oss (default=yes)],
-            with_oss=$withval, with_oss="yes")
-
-AC_ARG_WITH(host_os, 
-            [  --with-host_os (no default)],
-            host_os=$withval)
-
-AC_ARG_WITH(winapi,
-            [  --with-winapi ((wmme/directx/asio) default=wmme)],
-            with_winapi=$withval, with_winapi="wmme")
-
-# Mac API added for ASIO, can have other api's listed
-AC_ARG_WITH(macapi,
-            [  --with-macapi (asio) default=asio)],
-            with_macapi=$withval, with_macapi="asio")
-
-AC_ARG_WITH(asiodir,
-            [  --with-asiodir (default=/usr/local/asiosdk2)],
-            with_asiodir=$withval, with_asiodir="/usr/local/asiosdk2")
-
-AC_ARG_WITH(dxdir,
-            [  --with-dxdir (default=/usr/local/dx7sdk)],
-            with_dxdir=$withval, with_dxdir="/usr/local/dx7sdk")
-
-
-##################### HOST-SPECIFIC LIBRARY SETTINGS ##########################
-
-case "${host_os}" in
-  darwin* )
-	# Mac OS X configuration
-
-	LIBS="-framework AudioUnit -framework AudioToolbox -framework CoreAudio";
-	PADLL="libportaudio.dylib";
-	PACPP_DLL="libportaudiocpp.dylib";
-	SHARED_FLAGS="-framework AudioUnit -framework AudioToolbox";
-	SHARED_FLAGS="$SHARED_FLAGS -framework CoreAudio -dynamiclib";
-        if [[ $with_macapi = "asio" ]] ; then
-            if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR";
-        fi
-	;;
-
-  mingw* )
-        # MingW configuration
-
-        echo "WINAPI: $with_winapi"
-        if [[ $with_winapi = "directx" ]] ; then
-            if [[ $with_dxdir ]] ; then
-              DXDIR="$with_dxdir";
-            else
-              DXDIR="/usr/local/dx7sdk";
-            fi
-            echo "DXDIR: $DXDIR"
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -ldsound -lole32";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-            CFLAGS="$CFLAGS -DPA_NO_WMME -DPA_NO_ASIO";
-	    CXXFLAGS="$CFLAGS"
-        elif [[ $with_winapi = "asio" ]] ; then
-            if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR"
-
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -DPA_NO_WMME -DPA_NO_DS -DWINDOWS";
-            CXXFLAGS="$CFLAGS";
-        else   # WMME default
-	    LIBS="-L$PALIBDIR -lportaudio"
-            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            PACPP_DLL="portaudiocpp.dll";
-            SHARED_FLAGS="-shared -mthreads";
-            DLL_LIBS="-lwinmm";
-            CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_ASIO";
-            CXXFLAGS="$CFLAGS";
-        fi
-        ;;
-
-  cygwin* )
-	# Cygwin configuration
-
-	LIBS="-L$PALIBDIR -lportaudio"
-	LIBS="$LIBS -lwinmm -lm";
-	PADLL="portaudio.dll";
-	PACPP_DLL="portaudiocpp.dll";
-	SHARED_FLAGS="-shared -mthreads";
-	DLL_LIBS="-lwinmm";
-	;;
-
-  *)
-	# Unix OSS configuration
-
-   AC_CHECK_LIB(pthread, pthread_create,
-                ,
-                AC_MSG_ERROR([libpthread not found!]))
-	
-	LIBS="$LIBS -L$PALIBDIR -lportaudio"
-	
-	if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then
-   	      	LIBS="$LIBS $JACK_LIBS"
-		CFLAGS="$CFLAGS $JACK_CFLAGS"
-                AC_DEFINE(PA_USE_JACK)
-	fi
-
-	if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then
-                LIBS="$LIBS -lasound"
-                AC_DEFINE(PA_USE_ALSA)
-	fi
-
-	if [[ $with_oss != "no" ]] ; then
-		AC_DEFINE(PA_USE_OSS)
-	fi
-	LIBS="$LIBS -lm -lpthread";
-	PADLL="libportaudio.so";
-	PACPP_DLL="libportaudiocpp.so";
-	SHARED_FLAGS="-shared";
-esac
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/libs/portaudio/bindings/cpp/build/gnu/install-sh b/libs/portaudio/bindings/cpp/build/gnu/install-sh
deleted file mode 100644
index e9de23842d..0000000000
--- a/libs/portaudio/bindings/cpp/build/gnu/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsp b/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsp
deleted file mode 100644
index af26847776..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsp
+++ /dev/null
@@ -1,248 +0,0 @@
-# Microsoft Developer Studio Project File - Name="devs_example" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=devs_example - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "devs_example.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "devs_example.mak" CFG="devs_example - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "devs_example - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "devs_example - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "devs_example - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /O2 /I "../../include/" /I "../../../../include/" /I "../../../../src/common/" /I "../../../../../asiosdk2/common/" /I "../../../../../asiosdk2/host/" /I "../../../../../asiosdk2/host/pc/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 portaudiocpp-vc6-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/devs_example.exe" /libpath:"../../lib"
-
-!ELSEIF  "$(CFG)" == "devs_example - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include/" /I "../../../../include/" /I "../../../../src/common/" /I "../../../../../asiosdk2/common/" /I "../../../../../asiosdk2/host/" /I "../../../../../asiosdk2/host/pc/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 portaudiocpp-vc6-d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/devs_example.exe" /pdbtype:sept /libpath:"../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "devs_example - Win32 Release"
-# Name "devs_example - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\iasiothiscallresolver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\pa_asio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_x86_plain_converters.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\iasiothiscallresolver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_x86_plain_converters.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "Example Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\example\devs.cxx
-# End Source File
-# End Group
-# Begin Group "ASIO 2 SDK"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\common\asio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\host\asiodrivers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\host\pc\asiolist.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsw b/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsw
deleted file mode 100644
index 480c4d54e9..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/devs_example.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "devs_example"=".\devs_example.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name static_library
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "static_library"=".\static_library.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsp b/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsp
deleted file mode 100644
index 2539cbd8d2..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsp
+++ /dev/null
@@ -1,252 +0,0 @@
-# Microsoft Developer Studio Project File - Name="sine_example" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=sine_example - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "sine_example.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "sine_example.mak" CFG="sine_example - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "sine_example - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "sine_example - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "sine_example - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /O2 /I "../../include/" /I "../../../../include/" /I "../../../../src/common/" /I "../../../../../asiosdk2/common/" /I "../../../../../asiosdk2/host/" /I "../../../../../asiosdk2/host/pc/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 portaudiocpp-vc6-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/sine_example.exe" /libpath:"../../lib"
-
-!ELSEIF  "$(CFG)" == "sine_example - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include/" /I "../../../../include/" /I "../../../../src/common/" /I "../../../../../asiosdk2/common/" /I "../../../../../asiosdk2/host/" /I "../../../../../asiosdk2/host/pc/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 portaudiocpp-vc6-d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/sine_example.exe" /pdbtype:sept /libpath:"../../lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "sine_example - Win32 Release"
-# Name "sine_example - Win32 Debug"
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\iasiothiscallresolver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_x86_plain_converters.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "Example Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\example\sine.cxx
-# End Source File
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\iasiothiscallresolver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\pa_asio\pa_asio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\wasapi\pa_win_wasapi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\os\win\pa_x86_plain_converters.c
-# End Source File
-# End Group
-# Begin Group "ASIO 2 SDK"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\common\asio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\host\asiodrivers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\asiosdk2\host\pc\asiolist.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsw b/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsw
deleted file mode 100644
index 04c4714c80..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/sine_example.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "sine_example"=".\sine_example.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name static_library
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "static_library"=".\static_library.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libs/portaudio/bindings/cpp/build/vc6/static_library.dsp b/libs/portaudio/bindings/cpp/build/vc6/static_library.dsp
deleted file mode 100644
index d33ba9fe99..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/static_library.dsp
+++ /dev/null
@@ -1,395 +0,0 @@
-# Microsoft Developer Studio Project File - Name="static_library" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=static_library - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "static_library.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "static_library.mak" CFG="static_library - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "static_library - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "static_library - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /O2 /I "../../include/" /I "../../../../include/" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../lib/portaudiocpp-vc6-r.lib"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include/" /I "../../../../include/" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ  /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../lib/portaudiocpp-vc6-d.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "static_library - Win32 Release"
-# Name "static_library - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\AsioDeviceAdapter.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\BlockingStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\CallbackInterface.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\CallbackStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\CFunCallbackStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\CppFunCallbackStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\Device.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\DirectionSpecificStreamParameters.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\Exception.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\HostApi.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\InterfaceCallbackStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\MemFunCallbackStream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\Stream.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\StreamParameters.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\System.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\SystemDeviceIterator.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\portaudiocpp\SystemHostApiIterator.cxx
-
-!IF  "$(CFG)" == "static_library - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "static_library - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\AsioDeviceAdapter.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\AutoSystem.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\BlockingStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\CallbackInterface.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\CallbackStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\CFunCallbackStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\CppFunCallbackStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\Device.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\DirectionSpecificStreamParameters.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\Exception.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\HostApi.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\InterfaceCallbackStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\MemFunCallbackStream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\PortAudioCpp.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\SampleDataFormat.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\Stream.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\StreamParameters.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\System.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\SystemDeviceIterator.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\portaudiocpp\SystemHostApiIterator.hxx
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libs/portaudio/bindings/cpp/build/vc6/static_library.dsw b/libs/portaudio/bindings/cpp/build/vc6/static_library.dsw
deleted file mode 100644
index cb9d090545..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc6/static_library.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "static_library"=".\static_library.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libs/portaudio/bindings/cpp/build/vc7/OUT_OF_DATE b/libs/portaudio/bindings/cpp/build/vc7/OUT_OF_DATE
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.sln b/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.sln
deleted file mode 100644
index c443bce5b1..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "devs_example", "devs_example.vcproj", "{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A} = {D18EA0C9-8C65-441D-884C-55EB43A84F2A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "static_library", "static_library.vcproj", "{D18EA0C9-8C65-441D-884C-55EB43A84F2A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Debug.ActiveCfg = Debug|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Debug.Build.0 = Debug|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Release.ActiveCfg = Release|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Release.Build.0 = Release|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.ActiveCfg = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.Build.0 = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.ActiveCfg = Release|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.vcproj b/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.vcproj
deleted file mode 100644
index fc065f8de2..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/devs_example.vcproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="devs_example"
-	ProjectGUID="{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include/;../../../../include/;../../../../src/common/;../../../../../asiosdk2/common/,../../../../../asiosdk2/host/,../../../../../asiosdk2/host/pc/"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/portaudiocpp-vc7_1-d.lib"
-				OutputFile="../../bin/devs_example.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/devs_example.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include/;../../../../include/;../../../../src/common/;../../../../../asiosdk2/common/,../../../../../asiosdk2/host/,../../../../../asiosdk2/host/pc/"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/portaudiocpp-vc7_1-r.lib"
-				OutputFile="../../bin/devs_example.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Files"
-			Filter="">
-			<File
-				RelativePath="..\..\example\devs.cxx">
-			</File>
-		</Filter>
-		<Filter
-			Name="PortAudio v19 Files"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\src\common\pa_allocation.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\asio\pa_asio.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_converters.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_cpuload.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_dither.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_front.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_process.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_skeleton.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_stream.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_trace.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\dsound\pa_win_ds.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_win_hostapis.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_win_util.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\wmme\pa_win_wmme.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_x86_plain_converters.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="ASIO 2 SDK Files"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\common\asio.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\host\asiodrivers.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\host\pc\asiolist.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.sln b/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.sln
deleted file mode 100644
index 7be7c583c8..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sine_example", "sine_example.vcproj", "{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A} = {D18EA0C9-8C65-441D-884C-55EB43A84F2A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "static_library", "static_library.vcproj", "{D18EA0C9-8C65-441D-884C-55EB43A84F2A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Debug.ActiveCfg = Debug|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Debug.Build.0 = Debug|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Release.ActiveCfg = Release|Win32
-		{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}.Release.Build.0 = Release|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.ActiveCfg = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.Build.0 = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.ActiveCfg = Release|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.vcproj b/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.vcproj
deleted file mode 100644
index b1c7b6209d..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/sine_example.vcproj
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="sine_example"
-	ProjectGUID="{1B9A038D-80A3-4DBD-9F0D-AF10B49B863A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include/;../../../../include/;../../../../src/common/;../../../../../asiosdk2/common/,../../../../../asiosdk2/host/,../../../../../asiosdk2/host/pc/"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/portaudiocpp-vc7_1-d.lib"
-				OutputFile="../../bin/sine_example.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/sine_example.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include/;../../../../include/;../../../../src/common/;../../../../../asiosdk2/common/,../../../../../asiosdk2/host/,../../../../../asiosdk2/host/pc/"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="../../lib/portaudiocpp-vc7_1-r.lib"
-				OutputFile="../../bin/sine_example.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Files"
-			Filter="">
-			<File
-				RelativePath="..\..\example\sine.cxx">
-			</File>
-		</Filter>
-		<Filter
-			Name="PortAudio v19 Files"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\src\common\pa_allocation.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\asio\pa_asio.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_converters.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_cpuload.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_dither.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_front.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_process.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_skeleton.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_stream.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\common\pa_trace.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\dsound\pa_win_ds.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_win_hostapis.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_win_util.c">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\hostapi\wmme\pa_win_wmme.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\..\src\os\win\pa_x86_plain_converters.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="ASIO 2 SDK Files"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\common\asio.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\host\asiodrivers.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\asiosdk2\host\pc\asiolist.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/static_library.sln b/libs/portaudio/bindings/cpp/build/vc7_1/static_library.sln
deleted file mode 100644
index 36f2ac1a4f..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/static_library.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "static_library", "static_library.vcproj", "{D18EA0C9-8C65-441D-884C-55EB43A84F2A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.ActiveCfg = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Debug.Build.0 = Debug|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.ActiveCfg = Release|Win32
-		{D18EA0C9-8C65-441D-884C-55EB43A84F2A}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/libs/portaudio/bindings/cpp/build/vc7_1/static_library.vcproj b/libs/portaudio/bindings/cpp/build/vc7_1/static_library.vcproj
deleted file mode 100644
index d67324ead4..0000000000
--- a/libs/portaudio/bindings/cpp/build/vc7_1/static_library.vcproj
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="static_library"
-	ProjectGUID="{D18EA0C9-8C65-441D-884C-55EB43A84F2A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib/"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include/;../../../../include/"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/portaudiocpp-vc7_1-d.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib/"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include/;../../../../include/"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)/vc71.pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/portaudiocpp-vc7_1-r.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Files"
-			Filter="">
-			<File
-				RelativePath="..\..\source\portaudiocpp\AsioDeviceAdapter.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\AsioDeviceAdapter.hxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\AutoSystem.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\BlockingStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\BlockingStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\CallbackInterface.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\CallbackInterface.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\CallbackStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\CallbackStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\CFunCallbackStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\CFunCallbackStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\CppFunCallbackStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\CppFunCallbackStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\Device.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\Device.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\DirectionSpecificStreamParameters.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\DirectionSpecificStreamParameters.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\Exception.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\Exception.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\HostApi.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\HostApi.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\InterfaceCallbackStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\InterfaceCallbackStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\MemFunCallbackStream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\MemFunCallbackStream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\PortAudioCpp.hxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\SampleDataFormat.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\Stream.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\Stream.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\StreamParameters.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\StreamParameters.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\System.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\System.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\SystemDeviceIterator.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\SystemDeviceIterator.hxx">
-			</File>
-			<File
-				RelativePath="..\..\source\portaudiocpp\SystemHostApiIterator.cxx">
-			</File>
-			<File
-				RelativePath="..\..\include\portaudiocpp\SystemHostApiIterator.hxx">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/portaudio/bindings/cpp/configure.ac b/libs/portaudio/bindings/cpp/configure.ac
deleted file mode 100644
index 100656ac41..0000000000
--- a/libs/portaudio/bindings/cpp/configure.ac
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# PortAudioCpp V19 autoconf input file
-# Shamelessly ripped from the PortAudio one by Dominic Mazzoni
-# Ludwig Schwardt
-# Customized for automake by Mikael Magnusson
-#
-
-# Require autoconf >= 2.13
-AC_PREREQ(2.13)
-
-m4_define([lt_current], [0])
-m4_define([lt_revision], [12])
-m4_define([lt_age], [0])
-
-AC_INIT([PortAudioCpp], [12])
-AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx])
-AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE
-
-###### Top-level directory of pacpp
-###### This makes it easy to shuffle the build directories
-###### Also edit AC_CONFIG_SRCDIR above (wouldn't accept this variable)!
-PACPP_ROOT="\$(top_srcdir)"
-PORTAUDIO_ROOT="../.."
-
-# Various other variables and flags
-DEFAULT_INCLUDES="-I$PACPP_ROOT/include -I$PACPP_ROOT/$PORTAUDIO_ROOT/include"
-CFLAGS=${CFLAGS-"-g -O2 -Wall -ansi -pedantic"}
-CXXFLAGS=${CXXFLAGS-"${CFLAGS}"}
-
-LT_VERSION_INFO="lt_current:lt_revision:lt_age"
-
-# Checks for programs
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-# Transfer these variables to the Makefile
-AC_SUBST(DEFAULT_INCLUDES)
-AC_SUBST(PORTAUDIO_ROOT)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LT_VERSION_INFO)
-
-AC_CONFIG_FILES([
-                 Makefile
-                 lib/Makefile
-                 include/Makefile
-                 bin/Makefile
-                 doc/Makefile
-                 portaudiocpp.pc
-                ])
-AC_OUTPUT
diff --git a/libs/portaudio/bindings/cpp/doc/Makefile.am b/libs/portaudio/bindings/cpp/doc/Makefile.am
deleted file mode 100644
index 7eb81ba305..0000000000
--- a/libs/portaudio/bindings/cpp/doc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-PACPP_ROOT = .
-#INCLUDES = -I$(srcdir)/$(PACPP_ROOT)/include -I$(top_srcdir)/include
-
-docs:
-	doxygen $(srcdir)/config.doxy.linux
diff --git a/libs/portaudio/bindings/cpp/doc/README b/libs/portaudio/bindings/cpp/doc/README
deleted file mode 100644
index 5e2297299a..0000000000
--- a/libs/portaudio/bindings/cpp/doc/README
+++ /dev/null
@@ -1,34 +0,0 @@
-GNU/Linux:
-----------
-
-1) Download and install a recent version of Doxygen (preferably version 1.3.3 or 
-later). See http://www.doxygen.org/.
-2) Download and install a recent version of GraphViz. See 
-http://www.research.att.com/sw/tools/graphviz/.
-3) Run ``doxygen config.doxy.linux'' in this directory or load and generate the file 
-config.doxy.linux from the Doxywizard application. Or alternatively ``make docs'' can 
-be run from the build/gnu folder.
-
-The generated html documentation will be placed in /doc/api_reference/. To open 
-the main page of the documentation, open the file /doc/api_reference/index.html in 
-an html browser.
-
-
-Windows:
---------
-
-1) Download and install a recent Doxygen (preferably version 1.3.4 or later). See 
-http://www.doxygen.org/.
-2) Download and install a recent version of GraphViz. See 
-http://www.research.att.com/sw/tools/graphviz/.
-3) If needed, edit the config.doxy file in an ascii text editor so that 
-``DOT_PATH'' variable points to the folder where GraphViz is installed.
-4) Run ``doxygen config.doxy'' in this directory or load and generate the file 
-config.doxy from the Doxywizard application.
-
-The generated html documentation will be placed in /doc/api_reference/. To open 
-the main page of the documentation, open the file /doc/api_reference/index.html in 
-an html browser.
-
-
-
diff --git a/libs/portaudio/bindings/cpp/doc/config.doxy b/libs/portaudio/bindings/cpp/doc/config.doxy
deleted file mode 100644
index 0bfe9d311a..0000000000
--- a/libs/portaudio/bindings/cpp/doc/config.doxy
+++ /dev/null
@@ -1,211 +0,0 @@
-# Doxyfile 1.3.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = PortAudioCpp
-PROJECT_NUMBER         = 2.0
-OUTPUT_DIRECTORY       = ./
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-SHORT_NAMES            = YES
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = YES
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 4
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../source \
-                         ../include
-FILE_PATTERNS          = *.hxx \
-                         *.cxx
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 2
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = api_reference
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-UML_LOOK               = YES
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = "c:/Program Files/ATT/Graphviz/bin/"
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 0
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/libs/portaudio/bindings/cpp/doc/config.doxy.linux b/libs/portaudio/bindings/cpp/doc/config.doxy.linux
deleted file mode 100644
index 38079f6957..0000000000
--- a/libs/portaudio/bindings/cpp/doc/config.doxy.linux
+++ /dev/null
@@ -1,210 +0,0 @@
-# Doxyfile 1.3.3
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = PortAudioCpp
-PROJECT_NUMBER         = 2.0
-OUTPUT_DIRECTORY       = ./
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = YES
-INHERIT_DOCS           = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 4
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SHOW_USED_FILES        = YES
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../source \
-                         ../include
-FILE_PATTERNS          = *.hxx \
-                         *.cxx
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 2
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = api_reference
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-UML_LOOK               = YES
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = "/usr/bin/dot"
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 0
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = search.cgi
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = /usr/local/bin/
-EXT_DOC_PATHS          = 
diff --git a/libs/portaudio/bindings/cpp/example/devs.cxx b/libs/portaudio/bindings/cpp/example/devs.cxx
deleted file mode 100644
index 31a560f884..0000000000
--- a/libs/portaudio/bindings/cpp/example/devs.cxx
+++ /dev/null
@@ -1,177 +0,0 @@
-#include <iostream>
-#include "portaudiocpp/PortAudioCpp.hxx"
-
-#ifdef WIN32
-#include "portaudiocpp/AsioDeviceAdapter.hxx"
-#endif
-
-// ---------------------------------------------------------------------------------------
-
-void printSupportedStandardSampleRates(
-		const portaudio::DirectionSpecificStreamParameters &inputParameters, 
-		const portaudio::DirectionSpecificStreamParameters &outputParameters)
-{
-	static double STANDARD_SAMPLE_RATES[] = {
-		8000.0, 9600.0, 11025.0, 12000.0, 16000.0, 22050.0, 24000.0, 32000.0,
-		44100.0, 48000.0, 88200.0, 96000.0, -1 }; // negative terminated list
-
-	int printCount = 0;
-
-	for (int i = 0; STANDARD_SAMPLE_RATES[i] > 0; ++i)
-	{
-		portaudio::StreamParameters tmp = portaudio::StreamParameters(inputParameters, outputParameters, STANDARD_SAMPLE_RATES[i], 0, paNoFlag);
-
-		if (tmp.isSupported())
-		{
-			if (printCount == 0)
-			{
-				std::cout << "    " << STANDARD_SAMPLE_RATES[i]; // 8.2
-				printCount = 1;
-			}
-			else if (printCount == 4)
-			{
-				std::cout << "," << std::endl;
-				std::cout << "    " << STANDARD_SAMPLE_RATES[i]; // 8.2
-				printCount = 1;
-			}
-			else
-			{
-				std::cout << ", " << STANDARD_SAMPLE_RATES[i]; // 8.2
-				++printCount;
-			}
-		}
-	}
-
-	if (printCount == 0)
-		std::cout << "None" << std::endl;
-	else
-		std::cout << std::endl;
-}
-
-// ---------------------------------------------------------------------------------------
-
-int main(int, char*[]);
-int main(int, char*[])
-{
-	try
-	{
-		portaudio::AutoSystem autoSys;
-
-		portaudio::System &sys = portaudio::System::instance();
-
-		std::cout << "PortAudio version number = " << sys.version() << std::endl;
-		std::cout << "PortAudio version text = '" << sys.versionText() << "'" << std::endl;
-
-		int numDevices = sys.deviceCount();
-		std::cout << "Number of devices = " << numDevices << std::endl;
-
-		for (portaudio::System::DeviceIterator i = sys.devicesBegin(); i != sys.devicesEnd(); ++i)
-		{
-			std::cout << "--------------------------------------- device #" << (*i).index() << std::endl;
-
-			// Mark global and API specific default devices:
-			bool defaultDisplayed = false;
-
-			if ((*i).isSystemDefaultInputDevice())
-			{
-				std::cout << "[ Default Input";
-				defaultDisplayed = true;
-			}
-			else if ((*i).isHostApiDefaultInputDevice())
-			{
-				std::cout << "[ Default " << (*i).hostApi().name() << " Input";
-				defaultDisplayed = true;
-			}
-
-			if ((*i).isSystemDefaultOutputDevice())
-			{
-				std::cout << (defaultDisplayed ? "," : "[");
-				std::cout << " Default Output";
-				defaultDisplayed = true;
-			}
-			else if ((*i).isHostApiDefaultOutputDevice())
-			{
-				std::cout << (defaultDisplayed ? "," : "[");
-				std::cout << " Default " << (*i).hostApi().name() << " Output";
-				defaultDisplayed = true;
-			}
-			
-			if (defaultDisplayed)
-				std::cout << " ]" << std::endl;
-
-			// Print device info:
-			std::cout << "Name                        = " << (*i).name() << std::endl;
-			std::cout << "Host API                    = " << (*i).hostApi().name() << std::endl;
-			std::cout << "Max inputs = " << (*i).maxInputChannels() << ", Max outputs = " << (*i).maxOutputChannels() << std::endl;
-
-			std::cout << "Default low input latency   = " << (*i).defaultLowInputLatency() << std::endl; // 8.3
-			std::cout << "Default low output latency  = " << (*i).defaultLowOutputLatency() << std::endl; // 8.3
-			std::cout << "Default high input latency  = " << (*i).defaultHighInputLatency() << std::endl; // 8.3
-			std::cout << "Default high output latency = " << (*i).defaultHighOutputLatency() << std::endl; // 8.3
-
-#ifdef WIN32
-			// ASIO specific latency information:
-			if ((*i).hostApi().typeId() == paASIO)
-			{
-				portaudio::AsioDeviceAdapter asioDevice((*i));
-
-				std::cout << "ASIO minimum buffer size    = " << asioDevice.minBufferSize() << std::endl;
-				std::cout << "ASIO maximum buffer size    = " << asioDevice.maxBufferSize() << std::endl;
-				std::cout << "ASIO preferred buffer size  = " << asioDevice.preferredBufferSize() << std::endl;
-
-				if (asioDevice.granularity() == -1)
-					std::cout << "ASIO buffer granularity     = power of 2" << std::endl;
-				else
-					std::cout << "ASIO buffer granularity     = " << asioDevice.granularity() << std::endl;
-			}
-#endif // WIN32
-
-			std::cout << "Default sample rate         = " << (*i).defaultSampleRate() << std::endl; // 8.2
-
-			// Poll for standard sample rates:
-			portaudio::DirectionSpecificStreamParameters inputParameters((*i), (*i).maxInputChannels(), portaudio::INT16, true, 0.0, NULL);
-			portaudio::DirectionSpecificStreamParameters outputParameters((*i), (*i).maxOutputChannels(), portaudio::INT16, true, 0.0, NULL);
-
-			if (inputParameters.numChannels() > 0)
-			{
-				std::cout << "Supported standard sample rates" << std::endl;
-				std::cout << " for half-duplex 16 bit " << inputParameters.numChannels() << " channel input = " << std::endl;
-				printSupportedStandardSampleRates(inputParameters, portaudio::DirectionSpecificStreamParameters::null());
-			}
-
-			if (outputParameters.numChannels() > 0)
-			{
-				std::cout << "Supported standard sample rates" << std::endl;
-				std::cout << " for half-duplex 16 bit " << outputParameters.numChannels() << " channel output = " << std::endl;
-				printSupportedStandardSampleRates(portaudio::DirectionSpecificStreamParameters::null(), outputParameters);
-			}
-
-			if (inputParameters.numChannels() > 0 && outputParameters.numChannels() > 0)
-			{
-				std::cout << "Supported standard sample rates" << std::endl;
-				std::cout << " for full-duplex 16 bit " << inputParameters.numChannels() << " channel input, " << outputParameters.numChannels() << " channel output = " << std::endl;
-				printSupportedStandardSampleRates(inputParameters, outputParameters);
-			}
-		}
-
-		std::cout << "----------------------------------------------" << std::endl;
-	}
-	catch (const portaudio::PaException &e)
-	{
-		std::cout << "A PortAudio error occured: " << e.paErrorText() << std::endl;
-	}
-	catch (const portaudio::PaCppException &e)
-	{
-		std::cout << "A PortAudioCpp error occured: " << e.what() << std::endl;
-	}
-	catch (const std::exception &e)
-	{
-		std::cout << "A generic exception occured: " << e.what() << std::endl;
-	}
-	catch (...)
-	{
-		std::cout << "An unknown exception occured." << std::endl;
-	}
-
-	return 0;
-}
diff --git a/libs/portaudio/bindings/cpp/example/sine.cxx b/libs/portaudio/bindings/cpp/example/sine.cxx
deleted file mode 100644
index 0676e3e76c..0000000000
--- a/libs/portaudio/bindings/cpp/example/sine.cxx
+++ /dev/null
@@ -1,137 +0,0 @@
-// ---------------------------------------------------------------------------------------
-
-#include <iostream>
-#include <cmath>
-#include <cassert>
-#include <cstddef>
-#include "portaudiocpp/PortAudioCpp.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Some constants:
-const int NUM_SECONDS = 5;
-const double SAMPLE_RATE = 44100.0;
-const int FRAMES_PER_BUFFER = 64;
-const int TABLE_SIZE = 200;
-
-// ---------------------------------------------------------------------------------------
-
-// SineGenerator class:
-class SineGenerator
-{
-public:
-	SineGenerator(int tableSize) : tableSize_(tableSize), leftPhase_(0), rightPhase_(0)
-	{
-		const double PI = 3.14159265;
-		table_ = new float[tableSize];
-		for (int i = 0; i < tableSize; ++i)
-		{
-			table_[i] = 0.125f * (float)sin(((double)i/(double)tableSize)*PI*2.);
-		}
-	}
-
-	~SineGenerator()
-	{
-		delete[] table_;
-	}
-
-	int generate(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, 
-		const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags)
-	{
-		assert(outputBuffer != NULL);
-
-		float **out = static_cast<float **>(outputBuffer);
-
-		for (unsigned int i = 0; i < framesPerBuffer; ++i)
-		{
-			out[0][i] = table_[leftPhase_];
-			out[1][i] = table_[rightPhase_];
-
-			leftPhase_ += 1;
-			if (leftPhase_ >= tableSize_)
-				leftPhase_ -= tableSize_;
-
-			rightPhase_ += 3;
-			if (rightPhase_ >= tableSize_)
-				rightPhase_ -= tableSize_;
-		}
-
-		return paContinue;
-	}
-
-private:
-	float *table_;
-	int tableSize_;
-	int leftPhase_;
-	int rightPhase_;
-};
-
-// ---------------------------------------------------------------------------------------
-
-// main:
-int main(int, char *[]);
-int main(int, char *[])
-{
-	try
-	{
-		// Create a SineGenerator object:
-		SineGenerator sineGenerator(TABLE_SIZE);
-
-		std::cout << "Setting up PortAudio..." << std::endl;
-
-		// Set up the System:
-		portaudio::AutoSystem autoSys;
-		portaudio::System &sys = portaudio::System::instance();
-
-		// Set up the parameters required to open a (Callback)Stream:
-		portaudio::DirectionSpecificStreamParameters outParams(sys.defaultOutputDevice(), 2, portaudio::FLOAT32, false, sys.defaultOutputDevice().defaultLowOutputLatency(), NULL);
-		portaudio::StreamParameters params(portaudio::DirectionSpecificStreamParameters::null(), outParams, SAMPLE_RATE, FRAMES_PER_BUFFER, paClipOff);
-
-		std::cout << "Opening stereo output stream..." << std::endl;
-
-		// Create (and open) a new Stream, using the SineGenerator::generate function as a callback:
-		portaudio::MemFunCallbackStream<SineGenerator> stream(params, sineGenerator, &SineGenerator::generate);
-
-		std::cout << "Starting playback for " << NUM_SECONDS << " seconds." << std::endl;
-
-		// Start the Stream (audio playback starts):
-		stream.start();
-
-		// Wait for 5 seconds:
-		sys.sleep(NUM_SECONDS * 1000);
-
-		std::cout << "Closing stream..." <<std::endl;
-
-		// Stop the Stream (not strictly needed as termintating the System will also stop all open Streams):
-		stream.stop();
-
-		// Close the Stream (not strictly needed as terminating the System will also close all open Streams):
-		stream.close();
-
-		// Terminate the System (not strictly needed as the AutoSystem will also take care of this when it 
-		// goes out of scope):
-		sys.terminate();
-
-		std::cout << "Test finished." << std::endl;
-	}
-	catch (const portaudio::PaException &e)
-	{
-		std::cout << "A PortAudio error occured: " << e.paErrorText() << std::endl;
-	}
-	catch (const portaudio::PaCppException &e)
-	{
-		std::cout << "A PortAudioCpp error occured: " << e.what() << std::endl;
-	}
-	catch (const std::exception &e)
-	{
-		std::cout << "A generic exception occured: " << e.what() << std::endl;
-	}
-	catch (...)
-	{
-		std::cout << "An unknown exception occured." << std::endl;
-	}
-
-	return 0;
-}
-
-
diff --git a/libs/portaudio/bindings/cpp/include/Makefile.am b/libs/portaudio/bindings/cpp/include/Makefile.am
deleted file mode 100644
index f92565714a..0000000000
--- a/libs/portaudio/bindings/cpp/include/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-pkginclude_HEADERS = \
-       portaudiocpp/AutoSystem.hxx \
-       portaudiocpp/BlockingStream.hxx \
-       portaudiocpp/CallbackInterface.hxx \
-       portaudiocpp/CallbackStream.hxx \
-       portaudiocpp/CFunCallbackStream.hxx \
-       portaudiocpp/CppFunCallbackStream.hxx \
-       portaudiocpp/Device.hxx \
-       portaudiocpp/DirectionSpecificStreamParameters.hxx \
-       portaudiocpp/Exception.hxx \
-       portaudiocpp/HostApi.hxx \
-       portaudiocpp/InterfaceCallbackStream.hxx \
-       portaudiocpp/MemFunCallbackStream.hxx \
-       portaudiocpp/PortAudioCpp.hxx \
-       portaudiocpp/SampleDataFormat.hxx \
-       portaudiocpp/Stream.hxx \
-       portaudiocpp/StreamParameters.hxx \
-       portaudiocpp/SystemDeviceIterator.hxx \
-       portaudiocpp/SystemHostApiIterator.hxx \
-       portaudiocpp/System.hxx
-
-#       portaudiocpp/AsioDeviceAdapter.hxx
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
deleted file mode 100644
index 1964b6a202..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
-#define INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
-
-namespace portaudio
-{
-
-	// Forward declaration(s):
-	class Device;
-
-	// Declaration(s):
-	//////
-	/// @brief Adapts the given Device to an ASIO specific extension.
-	///
-	/// Deleting the AsioDeviceAdapter does not affect the underlaying 
-	/// Device.
-	//////
-	class AsioDeviceAdapter
-	{
-	public:
-		AsioDeviceAdapter(Device &device);
-
-		Device &device();
-
-		long minBufferSize() const;
-		long maxBufferSize() const;
-		long preferredBufferSize() const;
-		long granularity() const;
-
-		void showControlPanel(void *systemSpecific);
-
-		const char *inputChannelName(int channelIndex) const;
-		const char *outputChannelName(int channelIndex) const;
-
-	private:
-		Device *device_;
-
-		long minBufferSize_;
-		long maxBufferSize_;
-		long preferredBufferSize_;
-		long granularity_;
-	};
-}
-
-#endif // INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
deleted file mode 100644
index 16cac5ed50..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
-#define INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief A RAII idiom class to ensure automatic clean-up when an exception is 
-	/// raised.
-	///
-	/// A simple helper class which uses the 'Resource Acquisition is Initialization' 
-	/// idiom (RAII). Use this class to initialize/terminate the System rather than 
-	/// using System directly. AutoSystem must be created on stack and must be valid 
-	/// throughout the time you wish to use PortAudioCpp. Your 'main' function might be 
-	/// a good place for it.
-	///
-	/// To avoid having to type portaudio::System::instance().xyz() all the time, it's usually 
-	/// a good idea to make a reference to the System which can be accessed directly.
-	/// @verbatim
-	/// portaudio::AutoSys autoSys;
-	/// portaudio::System &sys = portaudio::System::instance();
-	/// @endverbatim
-	//////
-	class AutoSystem
-	{
-	public:
-		AutoSystem(bool initialize = true)
-		{
-			if (initialize)
-				System::initialize();
-		}
-
-		~AutoSystem()
-		{
-			if (System::exists())
-				System::terminate();
-		}
-
-		void initialize()
-		{
-			System::initialize();
-		}
-
-		void terminate()
-		{
-			System::terminate();
-		}
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
deleted file mode 100644
index 37fa76652d..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-#define INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudiocpp/Stream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-
-	//////
-	/// @brief Stream class for blocking read/write-style input and output.
-	//////
-	class BlockingStream : public Stream
-	{
-	public:
-		BlockingStream();
-		BlockingStream(const StreamParameters &parameters);
-		~BlockingStream();
-
-		void open(const StreamParameters &parameters);
-
-		void read(void *buffer, unsigned long numFrames);
-		void write(const void *buffer, unsigned long numFrames);
-
-		signed long availableReadSize() const;
-		signed long availableWriteSize() const;
-
-	private:
-		BlockingStream(const BlockingStream &); // non-copyable
-		BlockingStream &operator=(const BlockingStream &); // non-copyable
-	};
-
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
deleted file mode 100644
index b3e3b5c1b8..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s)
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Callback stream using a free function with C linkage. It's important that the function 
-	/// the passed function pointer points to is declared ``extern "C"''.
-	//////
-	class CFunCallbackStream : public CallbackStream
-	{
-	public:
-		CFunCallbackStream();
-		CFunCallbackStream(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData);
-		~CFunCallbackStream();
-		
-		void open(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData);
-
-	private:
-		CFunCallbackStream(const CFunCallbackStream &); // non-copyable
-		CFunCallbackStream &operator=(const CFunCallbackStream &); // non-copyable
-	};
-
-	// -----------------------------------------------------------------------------------
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
deleted file mode 100644
index d498ec5b78..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
-#define INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Interface for an object that's callable as a PortAudioCpp callback object (ie that implements the 
-	/// paCallbackFun method).
-	//////
-	class CallbackInterface
-	{
-	public:
-		virtual ~CallbackInterface() {}
-
-		virtual int paCallbackFun(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags) = 0;
-	};
-
-	// -----------------------------------------------------------------------------------
-
-	namespace impl
-	{
-		extern "C"
-		{
-			int callbackInterfaceToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-				void *userData);
-		} // extern "C"
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
deleted file mode 100644
index 0382275e3a..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/Stream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Base class for all Streams which use a callback-based mechanism.
-	//////
-	class CallbackStream : public Stream
-	{
-	protected:
-		CallbackStream();
-		virtual ~CallbackStream();
-
-	public:
-		// stream info (time-varying)
-		double cpuLoad() const;
-
-	private:
-		CallbackStream(const CallbackStream &); // non-copyable
-		CallbackStream &operator=(const CallbackStream &); // non-copyable
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
deleted file mode 100644
index e0c001274d..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	namespace impl
-	{
-		extern "C"
-		{
-			int cppCallbackToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-				void *userData);
-		} // extern "C"
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Callback stream using a C++ function (either a free function or a static function) 
-	/// callback.
-	//////
-	class FunCallbackStream : public CallbackStream
-	{
-	public:
-		typedef int (*CallbackFunPtr)(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-			void *userData);
-
-		// -------------------------------------------------------------------------------
-
-		//////
-		/// @brief Simple structure containing a function pointer to the C++ callback function and a 
-		/// (void) pointer to the user supplied data.
-		//////
-		struct CppToCCallbackData
-		{
-			CppToCCallbackData();
-			CppToCCallbackData(CallbackFunPtr funPtr, void *userData);
-			void init(CallbackFunPtr funPtr, void *userData);
-
-			CallbackFunPtr funPtr;
-			void *userData;
-		};
-
-		// -------------------------------------------------------------------------------
-
-		FunCallbackStream();
-		FunCallbackStream(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData);
-		~FunCallbackStream();
-
-		void open(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData);
-
-	private:
-		FunCallbackStream(const FunCallbackStream &); // non-copyable
-		FunCallbackStream &operator=(const FunCallbackStream &); // non-copyable
-
-		CppToCCallbackData adapterData_;
-
-		void open(const StreamParameters &parameters);
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
deleted file mode 100644
index ffde7aa8e3..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_DEVICE_HXX
-#define INCLUDED_PORTAUDIO_DEVICE_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-
-#include "portaudio.h"
-
-#include "portaudiocpp/SampleDataFormat.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class System;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief Class which represents a PortAudio device in the System.
-	///
-	/// A single physical device in the system may have multiple PortAudio 
-	/// Device representations using different HostApi 's though. A Device 
-	/// can be half-duplex or full-duplex. A half-duplex Device can be used 
-	/// to create a half-duplex Stream. A full-duplex Device can be used to 
-	/// create a full-duplex Stream. If supported by the HostApi, two 
-	/// half-duplex Devices can even be used to create a full-duplex Stream.
-	///
-	/// Note that Device objects are very light-weight and can be passed around 
-	/// by-value.
-	//////
-	class Device
-	{
-	public:
-		// query info: name, max in channels, max out channels, 
-		// default low/hight input/output latency, default sample rate
-		PaDeviceIndex index() const;
-		const char *name() const;
-		int maxInputChannels() const;
-		int maxOutputChannels() const;
-		PaTime defaultLowInputLatency() const;
-		PaTime defaultHighInputLatency() const;
-		PaTime defaultLowOutputLatency() const;
-		PaTime defaultHighOutputLatency() const;
-		double defaultSampleRate() const;
-
-		bool isInputOnlyDevice() const; // extended
-		bool isOutputOnlyDevice() const; // extended
-		bool isFullDuplexDevice() const; // extended
-		bool isSystemDefaultInputDevice() const; // extended
-		bool isSystemDefaultOutputDevice() const; // extended
-		bool isHostApiDefaultInputDevice() const; // extended
-		bool isHostApiDefaultOutputDevice() const; // extended
-
-		bool operator==(const Device &rhs);
-		bool operator!=(const Device &rhs);
-
-		// host api reference
-		HostApi &hostApi();
-		const HostApi &hostApi() const;
-
-	private:
-		PaDeviceIndex index_;
-		const PaDeviceInfo *info_;
-
-	private:
-		friend class System;
-		
-		explicit Device(PaDeviceIndex index);
-		~Device();
-
-		Device(const Device &); // non-copyable
-		Device &operator=(const Device &); // non-copyable
-	};
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_DEVICE_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
deleted file mode 100644
index dd5ae0b908..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
-#define INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <cstddef>
-
-#include "portaudio.h"
-
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/SampleDataFormat.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief All parameters for one direction (either in or out) of a Stream. Together with 
-	/// parameters common to both directions, two DirectionSpecificStreamParameters can make up 
-	/// a StreamParameters object which contains all parameters for a Stream.
-	//////
-	class DirectionSpecificStreamParameters
-	{
-	public:
-		static DirectionSpecificStreamParameters null();
-
-		DirectionSpecificStreamParameters();
-		DirectionSpecificStreamParameters(const Device &device, int numChannels, SampleDataFormat format, 
-			bool interleaved, PaTime suggestedLatency, void *hostApiSpecificStreamInfo);
-
-		// Set up methods:
-		void setDevice(const Device &device);
-		void setNumChannels(int numChannels);
-
-		void setSampleFormat(SampleDataFormat format, bool interleaved = true);
-		void setHostApiSpecificSampleFormat(PaSampleFormat format, bool interleaved = true);
-
-		void setSuggestedLatency(PaTime latency);
-
-		void setHostApiSpecificStreamInfo(void *streamInfo);
-
-		// Accessor methods:
-		PaStreamParameters *paStreamParameters();
-		const PaStreamParameters *paStreamParameters() const;
-
-		Device &device() const;
-		int numChannels() const;
-
-		SampleDataFormat sampleFormat() const;
-		bool isSampleFormatInterleaved() const;
-		bool isSampleFormatHostApiSpecific() const;
-		PaSampleFormat hostApiSpecificSampleFormat() const;
-
-		PaTime suggestedLatency() const;
-
-		void *hostApiSpecificStreamInfo() const;
-	
-	private:
-		PaStreamParameters paStreamParameters_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
deleted file mode 100644
index a70c2f1d6e..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_EXCEPTION_HXX
-#define INCLUDED_PORTAUDIO_EXCEPTION_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <exception>
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-	//////
-	/// @brief Base class for all exceptions PortAudioCpp can throw.
-	///
-	/// Class is derived from std::exception.
-	//////
-	class Exception : public std::exception
-	{
-	public:
-		virtual ~Exception() throw() {}
-
-		virtual const char *what() const throw() = 0;
-	};
-	
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Wrapper for PortAudio error codes to C++ exceptions.
-	///
-	/// It wraps up PortAudio's error handling mechanism using 
-	/// C++ exceptions and is derived from std::exception for 
-	/// easy exception handling and to ease integration with 
-	/// other code.
-	///
-	/// To know what exceptions each function may throw, look up 
-	/// the errors that can occure in the PortAudio documentation 
-	/// for the equivalent functions.
-	///
-	/// Some functions are likely to throw an exception (such as 
-	/// Stream::open(), etc) and these should always be called in 
-	/// try{} catch{} blocks and the thrown exceptions should be 
-	/// handled properly (ie. the application shouldn't just abort, 
-	/// but merely display a warning dialog to the user or something).
-	/// However nearly all functions in PortAudioCpp are capable 
-	/// of throwing exceptions. When a function like Stream::isStopped() 
-	/// throws an exception, it's such an exceptional state that it's 
-	/// not likely that it can be recovered. PaExceptions such as these 
-	/// can ``safely'' be left to be handled by some outer catch-all-like 
-	/// mechanism for unrecoverable errors.
-	//////
-	class PaException : public Exception
-	{
-	public:
-		explicit PaException(PaError error);
-
-		const char *what() const throw();
-
-		PaError paError() const;
-		const char *paErrorText() const;
-
-		bool isHostApiError() const; // extended
-		long lastHostApiError() const;
-		const char *lastHostApiErrorText() const;
-
-		bool operator==(const PaException &rhs) const;
-		bool operator!=(const PaException &rhs) const;
-
-	private:
-		PaError error_;
- 	};
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Exceptions specific to PortAudioCpp (ie. exceptions which do not have an 
-	/// equivalent PortAudio error code).
-	//////
-	class PaCppException : public Exception
-	{
-	public:
-		enum ExceptionSpecifier
-		{
-			UNABLE_TO_ADAPT_DEVICE
-		};
-
-		PaCppException(ExceptionSpecifier specifier);
-
-		const char *what() const throw();
-
-		ExceptionSpecifier specifier() const;
-
-		bool operator==(const PaCppException &rhs) const;
-		bool operator!=(const PaCppException &rhs) const;
-
-	private:
-		ExceptionSpecifier specifier_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_EXCEPTION_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
deleted file mode 100644
index 899fc42d76..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_HOSTAPI_HXX
-#define INCLUDED_PORTAUDIO_HOSTAPI_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief HostApi represents a host API (usually type of driver) in the System.
-	///
-	/// A single System can support multiple HostApi's each one typically having 
-	/// a set of Devices using that HostApi (usually driver type). All Devices in 
-	/// the HostApi can be enumerated and the default input/output Device for this 
-	/// HostApi can be retreived.
-	//////
-	class HostApi
-	{
-	public:
-		typedef System::DeviceIterator DeviceIterator;
-
-		// query info: id, name, numDevices
-		PaHostApiTypeId typeId() const;
-		PaHostApiIndex index() const;
-		const char *name() const;
-		int deviceCount() const;
-
-		// iterate devices
-		DeviceIterator devicesBegin();
-		DeviceIterator devicesEnd();
-
-		// default devices
-		Device &defaultInputDevice() const;
-		Device &defaultOutputDevice() const;
-
-		// comparison operators
-		bool operator==(const HostApi &rhs) const;
-		bool operator!=(const HostApi &rhs) const;
-
-	private:
-		const PaHostApiInfo *info_;
-		Device **devices_;
-
-	private:
-		friend class System;
-
-		explicit HostApi(PaHostApiIndex index);
-		~HostApi();
-
-		HostApi(const HostApi &); // non-copyable
-		HostApi &operator=(const HostApi &); // non-copyable
-	};
-
-
-}
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_HOSTAPI_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
deleted file mode 100644
index e496dd272a..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s)
-namespace portaudio
-{
-	class StreamParameters;
-	class CallbackInterface;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Callback stream using an instance of an object that's derived from the CallbackInterface 
-	/// interface.
-	//////
-	class InterfaceCallbackStream : public CallbackStream
-	{
-	public:
-		InterfaceCallbackStream();
-		InterfaceCallbackStream(const StreamParameters &parameters, CallbackInterface &instance);
-		~InterfaceCallbackStream();
-		
-		void open(const StreamParameters &parameters, CallbackInterface &instance);
-
-	private:
-		InterfaceCallbackStream(const InterfaceCallbackStream &); // non-copyable
-		InterfaceCallbackStream &operator=(const InterfaceCallbackStream &); // non-copyable
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
deleted file mode 100644
index a9e50ca637..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-#include "portaudiocpp/CallbackInterface.hxx"
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/InterfaceCallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Callback stream using a class's member function as a callback. Template argument T is the type of the 
-	/// class of which a member function is going to be used.
-	///
-	/// Example usage:
-	/// @verbatim MemFunCallback<MyClass> stream = MemFunCallbackStream(parameters, *this, &MyClass::myCallbackFunction); @endverbatim
-	//////
-	template<typename T>
-	class MemFunCallbackStream : public CallbackStream
-	{
-	public:
-		typedef int (T::*CallbackFunPtr)(const void *, void *, unsigned long, const PaStreamCallbackTimeInfo *, 
-			PaStreamCallbackFlags);
-
-		// -------------------------------------------------------------------------------
-
-		MemFunCallbackStream()
-		{
-		}
-
-		MemFunCallbackStream(const StreamParameters &parameters, T &instance, CallbackFunPtr memFun) : adapter_(instance, memFun)
-		{
-			open(parameters);
-		}
-
-		~MemFunCallbackStream()
-		{
-			close();
-		}
-
-		void open(const StreamParameters &parameters, T &instance, CallbackFunPtr memFun)
-		{
-			// XXX:	need to check if already open?
-
-			adapter_.init(instance, memFun);
-			open(parameters);
-		}
-
-	private:
-		MemFunCallbackStream(const MemFunCallbackStream &); // non-copyable
-		MemFunCallbackStream &operator=(const MemFunCallbackStream &); // non-copyable
-
-		//////
-		/// @brief Inner class which adapts a member function callback to a CallbackInterface compliant 
-		/// class (so it can be adapted using the paCallbackAdapter function).
-		//////
-		class MemFunToCallbackInterfaceAdapter : public CallbackInterface
-		{
-		public:
-			MemFunToCallbackInterfaceAdapter() {}
-			MemFunToCallbackInterfaceAdapter(T &instance, CallbackFunPtr memFun) : instance_(&instance), memFun_(memFun) {}
-
-			void init(T &instance, CallbackFunPtr memFun)
-			{
-				instance_ = &instance;
-				memFun_ = memFun;
-			}
-
-			int paCallbackFun(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags)
-			{
-				return (instance_->*memFun_)(inputBuffer, outputBuffer, numFrames, timeInfo, statusFlags);
-			}
-
-		private:
-			T *instance_;
-			CallbackFunPtr memFun_;
-		};
-
-		MemFunToCallbackInterfaceAdapter adapter_;
-
-		void open(const StreamParameters &parameters)
-		{
-			PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-				parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), &impl::callbackInterfaceToPaCallbackAdapter, 
-				static_cast<void *>(&adapter_));
-
-			if (err != paNoError)
-				throw PaException(err);
-		}
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
deleted file mode 100644
index f11e7fb9f4..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
-#define INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @mainpage PortAudioCpp
-///
-///	<h1>PortAudioCpp - A Native C++ Binding of PortAudio V19</h1>
-/// <h2>PortAudio</h2>
-/// <p>
-///   PortAudio is a portable and mature C API for accessing audio hardware. It offers both callback-based and blocking 
-///   style input and output, deals with sample data format conversions, dithering and much more. There are a large number 
-///   of implementations available for various platforms including Windows MME, Windows DirectX, Windows and MacOS (Classic) 
-///   ASIO, MacOS Classic SoundManager, MacOS X CoreAudio, OSS (Linux), Linux ALSA, JACK (MacOS X and Linux) and SGI Irix 
-///   AL. Note that, currently not all of these implementations are equally complete or up-to-date (as PortAudio V19 is 
-///   still in development). Because PortAudio has a C API, it can easily be called from a variety of other programming 
-///   languages.
-/// </p>
-/// <h2>PortAudioCpp</h2>
-/// <p>
-///   Although, it is possible to use PortAudio's C API from within a C++ program, this is usually a little awkward 
-///   as procedural and object-oriented paradigms need to be mixed. PortAudioCpp aims to resolve this by encapsulating 
-///   PortAudio's C API to form an equivalent object-oriented C++ API. It provides a more natural integration of PortAudio 
-///   into C++ programs as well as a more structured interface. PortAudio's concepts were preserved as much as possible and 
-///   no additional features were added except for some `convenience methods'.
-/// </p>
-/// <p>
-///   PortAudioCpp's main features are:
-///   <ul>
-///     <li>Structured object model.</li>
-///     <li>C++ exception handling instead of C-style error return codes.</li>
-///     <li>Handling of callbacks using free functions (C and C++), static functions, member functions or instances of classes 
-///     derived from a given interface.</li>
-///     <li>STL compliant iterators to host APIs and devices.</li>
-///     <li>Some additional convenience functions to more easily set up and use PortAudio.</li>
-///   </ul>
-/// </p>
-/// <p>
-///   PortAudioCpp requires a recent version of the PortAudio V19 source code. This can be obtained from CVS or as a snapshot 
-///   from the website. The examples also require the ASIO 2 SDK which can be obtained from the Steinberg website. Alternatively, the 
-///   examples can easily be modified to compile without needing ASIO.
-/// </p>
-/// <p>
-///   Supported platforms:
-///   <ul>
-///     <li>Microsoft Visual C++ 6.0, 7.0 (.NET 2002) and 7.1 (.NET 2003).</li>
-///     <li>GNU G++ 2.95 and G++ 3.3.</li>
-///   </ul>
-///   Other platforms should be easily supported as PortAudioCpp is platform-independent and (reasonably) C++ standard compliant.
-/// </p>
-/// <p>
-///   This documentation mainly provides information specific to PortAudioCpp. For a more complete explaination of all of the 
-///   concepts used, please consult the PortAudio documentation.
-/// </p>
-/// <p>
-///   PortAudioCpp was developed by Merlijn Blaauw with many great suggestions and help from Ross Bencina. Ludwig Schwardt provided 
-///   GNU/Linux build files and checked G++ compatibility. PortAudioCpp may be used under the same licensing, conditions and 
-///   warranty as PortAudio. See <a href="http://www.portaudio.com/license.html">the PortAudio license</a> for more details.
-/// </p>
-/// <h2>Links</h2>
-/// <p>
-///   <a href="http://www.portaudio.com/">Official PortAudio site.</a><br>
-/// </p>
-//////
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @namespace portaudio
-///
-/// To avoid name collision, everything in PortAudioCpp is in the portaudio 
-/// namespace. If this name is too long it's usually pretty safe to use an 
-/// alias like ``namespace pa = portaudio;''.
-//////
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @file PortAudioCpp.hxx
-/// An include-all header file (for lazy programmers and using pre-compiled headers).
-//////
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/AutoSystem.hxx"
-#include "portaudiocpp/BlockingStream.hxx"
-#include "portaudiocpp/CallbackInterface.hxx"
-#include "portaudiocpp/CallbackStream.hxx"
-#include "portaudiocpp/CFunCallbackStream.hxx"
-#include "portaudiocpp/CppFunCallbackStream.hxx"
-#include "portaudiocpp/Device.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/InterfaceCallbackStream.hxx"
-#include "portaudiocpp/MemFunCallbackStream.hxx"
-#include "portaudiocpp/SampleDataFormat.hxx"
-#include "portaudiocpp/DirectionSpecificStreamParameters.hxx"
-#include "portaudiocpp/Stream.hxx"
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/SystemDeviceIterator.hxx"
-#include "portaudiocpp/SystemHostApiIterator.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
deleted file mode 100644
index a7e25b2413..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
-#define INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief PortAudio sample data formats.
-	///
-	/// Small helper enum to wrap the PortAudio defines.
-	//////
-	enum SampleDataFormat
-	{
-		INVALID_FORMAT	= 0,
-		FLOAT32			= paFloat32,
-		INT32			= paInt32,
-		INT24			= paInt24,
-		INT16			= paInt16,
-		INT8			= paInt8,
-		UINT8			= paUInt8
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
deleted file mode 100644
index 8a255ec768..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_STREAM_HXX
-#define INCLUDED_PORTAUDIO_STREAM_HXX
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief A Stream represents an active or inactive input and/or output data 
-	/// stream in the System.
-	/// 
-	/// Concrete Stream classes should ensure themselves being in a closed state at 
-	/// destruction (i.e. by calling their own close() method in their deconstructor). 
-	/// Following good C++ programming practices, care must be taken to ensure no 
-	/// exceptions are thrown by the deconstructor of these classes. As a consequence, 
-	/// clients need to explicitly call close() to ensure the stream closed successfully.
-	///
-	/// The Stream object can be used to manipulate the Stream's state. Also, time-constant 
-	/// and time-varying information about the Stream can be retreived.
-	//////
-	class Stream
-	{
-	public:
-		// Opening/closing:
-		virtual ~Stream();
-
-		virtual void close();
-		bool isOpen() const;
-
-		// Additional set up:
-		void setStreamFinishedCallback(PaStreamFinishedCallback *callback);
-
-		// State management:
-		void start();
-		void stop();
-		void abort();
-
-		bool isStopped() const;
-		bool isActive() const;
-
-		// Stream info (time-constant, but might become time-variant soon):
-		PaTime inputLatency() const;
-		PaTime outputLatency() const;
-		double sampleRate() const;
-
-		// Stream info (time-varying):
-		PaTime time() const;
-
-		// Accessors for PortAudio PaStream, useful for interfacing 
-		// with PortAudio add-ons (such as PortMixer) for instance:
-		const PaStream *paStream() const;
-		PaStream *paStream();
-
-	protected:
-		Stream(); // abstract class
-
-		PaStream *stream_;
-
-	private:
-		Stream(const Stream &); // non-copyable
-		Stream &operator=(const Stream &); // non-copyable
-	};
-
-
-} // namespace portaudio
-
-
-#endif // INCLUDED_PORTAUDIO_STREAM_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
deleted file mode 100644
index 2b6aa2ef4c..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
-#define INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/DirectionSpecificStreamParameters.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief The entire set of parameters needed to configure and open 
-	/// a Stream.
-	///
-	/// It contains parameters of input, output and shared parameters. 
-	/// Using the isSupported() method, the StreamParameters can be 
-	/// checked if opening a Stream using this StreamParameters would 
-	/// succeed or not. Accessors are provided to higher-level parameters 
-	/// aswell as the lower-level parameters which are mainly intended for 
-	/// internal use.
-	//////
-	class StreamParameters
-	{
-	public:
-		StreamParameters();
-		StreamParameters(const DirectionSpecificStreamParameters &inputParameters, 
-			const DirectionSpecificStreamParameters &outputParameters, double sampleRate, 
-			unsigned long framesPerBuffer, PaStreamFlags flags);
-
-		// Set up for direction-specific:
-		void setInputParameters(const DirectionSpecificStreamParameters &parameters);
-		void setOutputParameters(const DirectionSpecificStreamParameters &parameters);
-
-		// Set up for common parameters:
-		void setSampleRate(double sampleRate);
-		void setFramesPerBuffer(unsigned long framesPerBuffer);
-		void setFlag(PaStreamFlags flag);
-		void unsetFlag(PaStreamFlags flag);
-		void clearFlags();
-
-		// Validation:
-		bool isSupported() const;
-
-		// Accessors (direction-specific):
-		DirectionSpecificStreamParameters &inputParameters();
-		const DirectionSpecificStreamParameters &inputParameters() const;
-		DirectionSpecificStreamParameters &outputParameters();
-		const DirectionSpecificStreamParameters &outputParameters() const;
-
-		// Accessors (common):
-		double sampleRate() const;
-		unsigned long framesPerBuffer() const;
-		PaStreamFlags flags() const;
-		bool isFlagSet(PaStreamFlags flag) const;
-
-	private:
-		// Half-duplex specific parameters:
-		DirectionSpecificStreamParameters inputParameters_;
-		DirectionSpecificStreamParameters outputParameters_;
-
-		// Common parameters:
-		double sampleRate_;
-		unsigned long framesPerBuffer_;
-		PaStreamFlags flags_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/System.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/System.hxx
deleted file mode 100644
index f5fb7132af..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/System.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEM_HXX
-#define INCLUDED_PORTAUDIO_SYSTEM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-	class Stream;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief System singleton which represents the PortAudio system.
-	///
-	/// The System is used to initialize/terminate PortAudio and provide 
-	/// a single acccess point to the PortAudio System (instance()).
-	/// It can be used to iterate through all HostApi 's in the System as 
-	/// well as all devices in the System. It also provides some utility 
-	/// functionality of PortAudio.
-	///
-	/// Terminating the System will also abort and close the open streams. 
-	/// The Stream objects will need to be deallocated by the client though 
-	/// (it's usually a good idea to have them cleaned up automatically).
-	//////
-	class System
-	{
-	public:
-		class HostApiIterator; // forward declaration
-		class DeviceIterator; // forward declaration
-
-		// -------------------------------------------------------------------------------
-
-		static int version();
-		static const char *versionText();
-
-		static void initialize();
-		static void terminate();
-
-		static System &instance();
-		static bool exists();
-
-		// -------------------------------------------------------------------------------
-
-		// host apis:
-		HostApiIterator hostApisBegin();
-		HostApiIterator hostApisEnd();
-
-		HostApi &defaultHostApi();
-
-		HostApi &hostApiByTypeId(PaHostApiTypeId type);
-		HostApi &hostApiByIndex(PaHostApiIndex index);
-
-		int hostApiCount();
-
-		// -------------------------------------------------------------------------------
-
-		// devices:
-		DeviceIterator devicesBegin();
-		DeviceIterator devicesEnd();
-
-		Device &defaultInputDevice();
-		Device &defaultOutputDevice();
-
-		Device &deviceByIndex(PaDeviceIndex index);
-
-		int deviceCount();
-
-		static Device &nullDevice();
-
-		// -------------------------------------------------------------------------------
-
-		// misc:
-		void sleep(long msec);
-		int sizeOfSample(PaSampleFormat format);
-
-	private:
-		System();
-		~System();
-
-		static System *instance_;
-		static int initCount_;
-
-		static HostApi **hostApis_;
-		static Device **devices_;
-
-		static Device *nullDevice_;
-	};
-
-
-} // namespace portaudio
-
-
-#endif // INCLUDED_PORTAUDIO_SYSTEM_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
deleted file mode 100644
index 613fc3db51..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-#define INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-#include <cstddef>
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	
-	//////
-	/// @brief Iterator class for iterating through all Devices in a System.
-	///
-	/// Devices will be iterated by iterating all Devices in each 
-	/// HostApi in the System. Compliant with the STL bidirectional 
-	/// iterator concept.
-	//////
-	class System::DeviceIterator
-	{
-	public:
-		typedef std::bidirectional_iterator_tag iterator_category;
-		typedef Device value_type;
-		typedef ptrdiff_t difference_type;
-		typedef Device * pointer;
-		typedef Device & reference;
-
-		Device &operator*() const;
-		Device *operator->() const;
-
-		DeviceIterator &operator++();
-		DeviceIterator operator++(int);
-		DeviceIterator &operator--();
-		DeviceIterator operator--(int);
-
-		bool operator==(const DeviceIterator &rhs);
-		bool operator!=(const DeviceIterator &rhs);
-
-	private:
-		friend class System;
-		friend class HostApi;
-		Device **ptr_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-
diff --git a/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx b/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx
deleted file mode 100644
index b9b13b85eb..0000000000
--- a/libs/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
-#define INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-#include <cstddef>
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Iterator class for iterating through all HostApis in a System.
-	///
-	/// Compliant with the STL bidirectional iterator concept.
-	//////
-	class System::HostApiIterator
-	{
-	public:
-		typedef std::bidirectional_iterator_tag iterator_category;
-		typedef Device value_type;
-		typedef ptrdiff_t difference_type;
-		typedef HostApi * pointer;
-		typedef HostApi & reference;
-
-		HostApi &operator*() const;
-		HostApi *operator->() const;
-
-		HostApiIterator &operator++();
-		HostApiIterator operator++(int);
-		HostApiIterator &operator--();
-		HostApiIterator operator--(int);
-
-		bool operator==(const HostApiIterator &rhs);
-		bool operator!=(const HostApiIterator &rhs);
-
-	private:
-		friend class System;
-		HostApi **ptr_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
diff --git a/libs/portaudio/bindings/cpp/lib/Makefile.am b/libs/portaudio/bindings/cpp/lib/Makefile.am
deleted file mode 100644
index a27f7c5663..0000000000
--- a/libs/portaudio/bindings/cpp/lib/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SRCDIR = $(top_srcdir)/source/portaudiocpp
-
-lib_LTLIBRARIES = libportaudiocpp.la
-
-LDADD = libportaudiocpp.la
-
-libportaudiocpp_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
-
-libportaudiocpp_la_LIBADD = $(top_builddir)/$(PORTAUDIO_ROOT)/lib/libportaudio.la
-libportaudiocpp_la_SOURCES = \
-       $(SRCDIR)/BlockingStream.cxx \
-       $(SRCDIR)/CallbackInterface.cxx \
-       $(SRCDIR)/CallbackStream.cxx \
-       $(SRCDIR)/CFunCallbackStream.cxx \
-       $(SRCDIR)/CppFunCallbackStream.cxx \
-       $(SRCDIR)/Device.cxx \
-       $(SRCDIR)/DirectionSpecificStreamParameters.cxx \
-       $(SRCDIR)/Exception.cxx \
-       $(SRCDIR)/HostApi.cxx \
-       $(SRCDIR)/InterfaceCallbackStream.cxx \
-       $(SRCDIR)/MemFunCallbackStream.cxx \
-       $(SRCDIR)/Stream.cxx \
-       $(SRCDIR)/StreamParameters.cxx \
-       $(SRCDIR)/System.cxx \
-       $(SRCDIR)/SystemDeviceIterator.cxx \
-       $(SRCDIR)/SystemHostApiIterator.cxx
diff --git a/libs/portaudio/bindings/cpp/portaudiocpp.pc.in b/libs/portaudio/bindings/cpp/portaudiocpp.pc.in
deleted file mode 100644
index 8b126d1315..0000000000
--- a/libs/portaudio/bindings/cpp/portaudiocpp.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: PortAudioCpp
-Description: Portable audio I/O C++ bindings
-Version: 12
-Requires: portaudio-2.0
-
-Libs: -L${libdir} -lportaudiocpp
-Cflags: -I${includedir}
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx
deleted file mode 100644
index 3efc100f62..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "portaudiocpp/AsioDeviceAdapter.hxx"
-
-#include "portaudio.h"
-#include "pa_asio.h"
-
-#include "portaudiocpp/Device.hxx"
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-	AsioDeviceAdapter::AsioDeviceAdapter(Device &device)
-	{
-		if (device.hostApi().typeId() != paASIO)
-			throw PaCppException(PaCppException::UNABLE_TO_ADAPT_DEVICE);
-
-		device_ = &device;
-
-		PaError err = PaAsio_GetAvailableLatencyValues(device_->index(), &minBufferSize_, &maxBufferSize_, 
-			&preferredBufferSize_, &granularity_);
-
-		if (err != paNoError)
-			throw PaException(err);
-
-	}
-
-	Device &AsioDeviceAdapter::device()
-	{
-		return *device_;
-	}
-
-	long AsioDeviceAdapter::minBufferSize() const
-	{
-		return minBufferSize_;
-	}
-
-	long AsioDeviceAdapter::maxBufferSize() const
-	{
-		return maxBufferSize_;
-	}
-
-	long AsioDeviceAdapter::preferredBufferSize() const
-	{
-		return preferredBufferSize_;
-	}
-
-	long AsioDeviceAdapter::granularity() const
-	{
-		return granularity_;
-	}
-
-	void AsioDeviceAdapter::showControlPanel(void *systemSpecific)
-	{
-		PaError err = PaAsio_ShowControlPanel(device_->index(), systemSpecific);
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-	const char *AsioDeviceAdapter::inputChannelName(int channelIndex) const
-	{
-		const char *channelName;
-		PaError err = PaAsio_GetInputChannelName(device_->index(), channelIndex, &channelName);
-
-		if (err != paNoError)
-			throw PaException(err);
-
-		return channelName;
-	}
-
-	const char *AsioDeviceAdapter::outputChannelName(int channelIndex) const
-	{
-		const char *channelName;
-		PaError err = PaAsio_GetOutputChannelName(device_->index(), channelIndex, &channelName);
-
-		if (err != paNoError)
-			throw PaException(err);
-
-		return channelName;
-	}
-}
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/BlockingStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/BlockingStream.cxx
deleted file mode 100644
index b26b9e81a4..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/BlockingStream.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "portaudiocpp/BlockingStream.hxx"
-
-#include "portaudio.h"
-
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-
-	// --------------------------------------------------------------------------------------
-
-	BlockingStream::BlockingStream()
-	{
-	}
-
-	BlockingStream::BlockingStream(const StreamParameters &parameters)
-	{
-		open(parameters);
-	}
-
-	BlockingStream::~BlockingStream()
-	{
-		try
-		{
-			close();
-		}
-		catch (...)
-		{
-			// ignore all errors
-		}
-	}
-
-	// --------------------------------------------------------------------------------------
-
-	void BlockingStream::open(const StreamParameters &parameters)
-	{
-		PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-			parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), NULL, NULL);
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-
-	// --------------------------------------------------------------------------------------
-
-	void BlockingStream::read(void *buffer, unsigned long numFrames)
-	{
-		PaError err = Pa_ReadStream(stream_, buffer, numFrames);
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-
-	void BlockingStream::write(const void *buffer, unsigned long numFrames)
-	{
-		PaError err = Pa_WriteStream(stream_, buffer, numFrames);
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-
-	// --------------------------------------------------------------------------------------
-
-	signed long BlockingStream::availableReadSize() const
-	{
-		signed long avail = Pa_GetStreamReadAvailable(stream_);
-
-		if (avail < 0)
-		{
-			throw PaException(avail);
-		}
-
-		return avail;
-	}
-
-	signed long BlockingStream::availableWriteSize() const
-	{
-		signed long avail = Pa_GetStreamWriteAvailable(stream_);
-
-		if (avail < 0)
-		{
-			throw PaException(avail);
-		}
-
-		return avail;
-	}
-
-	// --------------------------------------------------------------------------------------
-
-} // portaudio
-
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx
deleted file mode 100644
index 9cceda9ab9..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "portaudiocpp/CFunCallbackStream.hxx"
-
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-	CFunCallbackStream::CFunCallbackStream()
-	{
-	}
-
-	CFunCallbackStream::CFunCallbackStream(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData)
-	{
-		open(parameters, funPtr, userData);
-	}
-
-	CFunCallbackStream::~CFunCallbackStream()
-	{
-		try
-		{
-			close();
-		}
-		catch (...)
-		{
-			// ignore all errors
-		}
-	}
-
-	// ---------------------------------------------------------------------------------==
-
-	void CFunCallbackStream::open(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData)
-	{
-		PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-			parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), funPtr, userData);
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-}
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx
deleted file mode 100644
index 01372612e4..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "portaudiocpp/CallbackInterface.hxx"
-
-namespace portaudio
-{
-
-	namespace impl
-	{
-
-		//////
-		/// Adapts any CallbackInterface object to a C-callable function (ie this function). A 
-		/// pointer to the object should be passed as ``userData'' when setting up the callback.
-		//////
-		int callbackInterfaceToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-		{
-			CallbackInterface *cb = static_cast<CallbackInterface *>(userData);
-			return cb->paCallbackFun(inputBuffer, outputBuffer, numFrames, timeInfo, statusFlags);
-		}
-
-
-	} // namespace impl
-
-} // namespace portaudio
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackStream.cxx
deleted file mode 100644
index b6c8e1d03e..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/CallbackStream.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "portaudiocpp/CallbackStream.hxx"
-
-namespace portaudio
-{
-	CallbackStream::CallbackStream()
-	{
-	}
-
-	CallbackStream::~CallbackStream()
-	{
-	}
-
-	// -----------------------------------------------------------------------------------
-	
-	double CallbackStream::cpuLoad() const
-	{
-		return Pa_GetStreamCpuLoad(stream_);
-	}
-
-} // namespace portaudio
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx
deleted file mode 100644
index fe0b4ab0cd..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "portaudiocpp/CppFunCallbackStream.hxx"
-
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-	namespace impl
-	{
-		//////
-		/// Adapts any a C++ callback to a C-callable function (ie this function). A 
-		/// pointer to a struct with the C++ function pointer and the actual user data should be 
-		/// passed as the ``userData'' parameter when setting up the callback.
-		//////
-		int cppCallbackToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-		{
-			FunCallbackStream::CppToCCallbackData *data = static_cast<FunCallbackStream::CppToCCallbackData *>(userData);
-			return data->funPtr(inputBuffer, outputBuffer, numFrames, timeInfo, statusFlags, data->userData);
-		}
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	FunCallbackStream::CppToCCallbackData::CppToCCallbackData()
-	{
-	}
-
-	FunCallbackStream::CppToCCallbackData::CppToCCallbackData(CallbackFunPtr funPtr, void *userData) : funPtr(funPtr), userData(userData)
-	{
-	}
-
-	void FunCallbackStream::CppToCCallbackData::init(CallbackFunPtr funPtr, void *userData)
-	{
-		this->funPtr = funPtr;
-		this->userData = userData;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	FunCallbackStream::FunCallbackStream()
-	{
-	}
-
-	FunCallbackStream::FunCallbackStream(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData) : adapterData_(funPtr, userData)
-	{
-		open(parameters);
-	}
-
-	FunCallbackStream::~FunCallbackStream()
-	{
-		try
-		{
-			close();
-		}
-		catch (...)
-		{
-			// ignore all errors
-		}
-	}
-
-	void FunCallbackStream::open(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData)
-	{
-		adapterData_.init(funPtr, userData);
-		open(parameters);
-	}
-
-	void FunCallbackStream::open(const StreamParameters &parameters)
-	{
-		PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-			parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), &impl::cppCallbackToPaCallbackAdapter, 
-			static_cast<void *>(&adapterData_));
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-
-	// -----------------------------------------------------------------------------------
-}
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/Device.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/Device.cxx
deleted file mode 100644
index 369e8c28fe..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/Device.cxx
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "portaudiocpp/Device.hxx"
-
-#include <cstddef>
-
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-
-		// -------------------------------------------------------------------------------
-
-		Device::Device(PaDeviceIndex index) : index_(index)
-		{
-			if (index == paNoDevice)
-				info_ = NULL;
-			else
-				info_ = Pa_GetDeviceInfo(index);
-		}
-
-		Device::~Device()
-		{
-		}
-
-		PaDeviceIndex Device::index() const
-		{
-			return index_;
-		}
-
-		const char *Device::name() const
-		{
-			if (info_ == NULL)
-				return "";
-
-			return info_->name;
-		}
-
-		int Device::maxInputChannels() const
-		{
-			if (info_ == NULL)
-				return 0;
-
-			return info_->maxInputChannels;
-		}
-
-		int Device::maxOutputChannels() const
-		{
-			if (info_ == NULL)
-				return 0;
-
-			return info_->maxOutputChannels;
-		}
-
-		PaTime Device::defaultLowInputLatency() const
-		{
-			if (info_ == NULL)
-				return static_cast<PaTime>(0.0);
-
-			return info_->defaultLowInputLatency;
-		}
-
-		PaTime Device::defaultHighInputLatency() const
-		{
-			if (info_ == NULL)
-				return static_cast<PaTime>(0.0);
-
-			return info_->defaultHighInputLatency;
-		}
-
-		PaTime Device::defaultLowOutputLatency() const
-		{
-			if (info_ == NULL)
-				return static_cast<PaTime>(0.0);
-
-			return info_->defaultLowOutputLatency;
-		}
-
-		PaTime Device::defaultHighOutputLatency() const
-		{
-			if (info_ == NULL)
-				return static_cast<PaTime>(0.0);
-
-			return info_->defaultHighOutputLatency;
-		}
-
-		double Device::defaultSampleRate() const
-		{
-			if (info_ == NULL)
-				return 0.0;
-
-			return info_->defaultSampleRate;
-		}
-
-		// -------------------------------------------------------------------------------
-
-		bool Device::isInputOnlyDevice() const
-		{
-			return (maxOutputChannels() == 0);
-		}
-
-		bool Device::isOutputOnlyDevice() const
-		{
-			return (maxInputChannels() == 0);
-		}
-
-		bool Device::isFullDuplexDevice() const
-		{
-			return (maxInputChannels() > 0 && maxOutputChannels() > 0);
-		}
-
-		bool Device::isSystemDefaultInputDevice() const
-		{
-			return (System::instance().defaultInputDevice() == *this);
-		}
-
-		bool Device::isSystemDefaultOutputDevice() const
-		{
-			return (System::instance().defaultOutputDevice() == *this);
-		}
-
-		bool Device::isHostApiDefaultInputDevice() const
-		{
-			return (hostApi().defaultInputDevice() == *this);
-		}
-
-		bool Device::isHostApiDefaultOutputDevice() const
-		{
-			return (hostApi().defaultOutputDevice() == *this);
-		}
-
-		// -------------------------------------------------------------------------------
-
-		bool Device::operator==(const Device &rhs)
-		{
-			return (index_ == rhs.index_);
-		}
-
-		bool Device::operator!=(const Device &rhs)
-		{
-			return !(*this == rhs);
-		}
-
-		// -------------------------------------------------------------------------------
-
-		HostApi &Device::hostApi()
-		{
-			// NOTE: will cause an exception when called for the null device
-			if (info_ == NULL)
-				throw PaException(paInternalError);
-
-			return System::instance().hostApiByIndex(info_->hostApi);
-		}
-
-		const HostApi &Device::hostApi() const
-		{
-			// NOTE; will cause an exception when called for the null device
-			if (info_ == NULL)
-				throw PaException(paInternalError);
-
-			return System::instance().hostApiByIndex(info_->hostApi);
-		}
-
-		// -------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx
deleted file mode 100644
index 68453d0212..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "portaudiocpp/DirectionSpecificStreamParameters.hxx"
-
-#include "portaudiocpp/Device.hxx"
-
-namespace portaudio
-{
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Returns a `nil' DirectionSpecificStreamParameters object. This can be used to 
-	/// specify that one direction of a Stream is not required (i.e. when creating 
-	/// a half-duplex Stream). All fields of the null DirectionSpecificStreamParameters 
-	/// object are invalid except for the device and the number of channel, which are set 
-	/// to paNoDevice and 0 respectively.
-	//////
-	DirectionSpecificStreamParameters DirectionSpecificStreamParameters::null()
-	{
-		DirectionSpecificStreamParameters tmp;
-		tmp.paStreamParameters_.device = paNoDevice;
-		tmp.paStreamParameters_.channelCount = 0;
-		return tmp;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Default constructor -- all parameters will be uninitialized.
-	//////
-	DirectionSpecificStreamParameters::DirectionSpecificStreamParameters()
-	{
-	}
-
-	//////
-	/// Constructor which sets all required fields.
-	//////
-	DirectionSpecificStreamParameters::DirectionSpecificStreamParameters(const Device &device, int numChannels, 
-		SampleDataFormat format, bool interleaved, PaTime suggestedLatency, void *hostApiSpecificStreamInfo)
-	{
-		setDevice(device);
-		setNumChannels(numChannels);
-		setSampleFormat(format, interleaved);
-		setSuggestedLatency(suggestedLatency);
-		setHostApiSpecificStreamInfo(hostApiSpecificStreamInfo);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	void DirectionSpecificStreamParameters::setDevice(const Device &device)
-	{
-		paStreamParameters_.device = device.index();
-	}
-
-	void DirectionSpecificStreamParameters::setNumChannels(int numChannels)
-	{
-		paStreamParameters_.channelCount = numChannels;
-	}
-
-	void DirectionSpecificStreamParameters::setSampleFormat(SampleDataFormat format, bool interleaved)
-	{
-		paStreamParameters_.sampleFormat = static_cast<PaSampleFormat>(format);
-
-		if (!interleaved)
-			paStreamParameters_.sampleFormat |= paNonInterleaved;
-	}
-
-	void DirectionSpecificStreamParameters::setHostApiSpecificSampleFormat(PaSampleFormat format, bool interleaved)
-	{
-		paStreamParameters_.sampleFormat = format;
-
-		paStreamParameters_.sampleFormat |= paCustomFormat;
-
-		if (!interleaved)
-			paStreamParameters_.sampleFormat |= paNonInterleaved;
-	}
-
-	void DirectionSpecificStreamParameters::setSuggestedLatency(PaTime latency)
-	{
-		paStreamParameters_.suggestedLatency = latency;
-	}
-
-	void DirectionSpecificStreamParameters::setHostApiSpecificStreamInfo(void *streamInfo)
-	{
-		paStreamParameters_.hostApiSpecificStreamInfo = streamInfo;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	PaStreamParameters *DirectionSpecificStreamParameters::paStreamParameters()
-	{
-		if (paStreamParameters_.channelCount > 0 && paStreamParameters_.device != paNoDevice)
-			return &paStreamParameters_;
-		else
-			return NULL;
-	}
-
-	const PaStreamParameters *DirectionSpecificStreamParameters::paStreamParameters() const
-	{
-		if (paStreamParameters_.channelCount > 0 && paStreamParameters_.device != paNoDevice)
-			return &paStreamParameters_;
-		else
-			return NULL;
-	}
-
-	Device &DirectionSpecificStreamParameters::device() const
-	{
-		return System::instance().deviceByIndex(paStreamParameters_.device);
-	}
-
-	int DirectionSpecificStreamParameters::numChannels() const
-	{
-		return paStreamParameters_.channelCount;
-	}
-
-	//////
-	/// Returns the (non host api-specific) sample format, without including 
-	/// the paNonInterleaved flag. If the sample format is host api-spefific, 
-	/// INVALID_FORMAT (0) will be returned.
-	//////
-	SampleDataFormat DirectionSpecificStreamParameters::sampleFormat() const
-	{
-		if (isSampleFormatHostApiSpecific())
-			return INVALID_FORMAT;
-		else
-			return static_cast<SampleDataFormat>(paStreamParameters_.sampleFormat & ~paNonInterleaved);
-	}
-
-	bool DirectionSpecificStreamParameters::isSampleFormatInterleaved() const
-	{
-		return ((paStreamParameters_.sampleFormat & paNonInterleaved) == 0);
-	}
-
-	bool DirectionSpecificStreamParameters::isSampleFormatHostApiSpecific() const
-	{
-		return ((paStreamParameters_.sampleFormat & paCustomFormat) == 0);
-	}
-
-	//////
-	/// Returns the host api-specific sample format, without including any 
-	/// paCustomFormat or paNonInterleaved flags. Will return 0 if the sample format is 
-	/// not host api-specific.
-	//////
-	PaSampleFormat DirectionSpecificStreamParameters::hostApiSpecificSampleFormat() const
-	{
-		if (isSampleFormatHostApiSpecific())
-			return paStreamParameters_.sampleFormat & ~paCustomFormat & ~paNonInterleaved;
-		else
-			return 0;
-	}
-
-	PaTime DirectionSpecificStreamParameters::suggestedLatency() const
-	{
-		return paStreamParameters_.suggestedLatency;
-	}
-
-	void *DirectionSpecificStreamParameters::hostApiSpecificStreamInfo() const
-	{
-		return paStreamParameters_.hostApiSpecificStreamInfo;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/Exception.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/Exception.cxx
deleted file mode 100644
index 98945c8172..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/Exception.cxx
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-	// PaException:
-	// -----------------------------------------------------------------------------------
-
-	//////
-	///  Wraps a PortAudio error into a PortAudioCpp PaException.
-	//////
-	PaException::PaException(PaError error) : error_(error)
-	{
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Alias for paErrorText(), to have std::exception compliance.
-	//////
-	const char *PaException::what() const throw()
-	{
-		return paErrorText();
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Returns the PortAudio error code (PaError).
-	//////
-	PaError PaException::paError() const
-	{
-		return error_;
-	}
-
-	//////
-	/// Returns the error as a (zero-terminated) text string.
-	//////
-	const char *PaException::paErrorText() const
-	{
-		return Pa_GetErrorText(error_);
-	}
-
-	//////
-	/// Returns true is the error is a HostApi error.
-	//////
-	bool PaException::isHostApiError() const
-	{
-		return (error_ == paUnanticipatedHostError);
-	}
-
-	//////
-	/// Returns the last HostApi error (which is the current one if 
-	/// isHostApiError() returns true) as an error code.
-	//////
-	long PaException::lastHostApiError() const
-	{
-		return Pa_GetLastHostErrorInfo()->errorCode;
-	}
-
-	//////
-	/// Returns the last HostApi error (which is the current one if 
-	/// isHostApiError() returns true) as a (zero-terminated) text 
-	/// string, if it's available.
-	//////
-	const char *PaException::lastHostApiErrorText() const
-	{
-		return Pa_GetLastHostErrorInfo()->errorText;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	bool PaException::operator==(const PaException &rhs) const
-	{
-		return (error_ == rhs.error_);
-	}
-
-	bool PaException::operator!=(const PaException &rhs) const
-	{
-		return !(*this == rhs);
-	}
-
-	// -----------------------------------------------------------------------------------
-	// PaCppException:
-	// -----------------------------------------------------------------------------------
-	
-	PaCppException::PaCppException(ExceptionSpecifier specifier) : specifier_(specifier)
-	{
-	}
-
-	const char *PaCppException::what() const throw()
-	{
-		switch (specifier_)
-		{
-			case UNABLE_TO_ADAPT_DEVICE:
-			{
-				return "Unable to adapt the given device to the specified host api specific device extension";
-			}
-		}
-
-		return "Unknown exception";
-	}
-
-	PaCppException::ExceptionSpecifier PaCppException::specifier() const
-	{
-		return specifier_;
-	}
-
-	bool PaCppException::operator==(const PaCppException &rhs) const
-	{
-		return (specifier_ == rhs.specifier_);
-	}
-
-	bool PaCppException::operator!=(const PaCppException &rhs) const
-	{
-		return !(*this == rhs);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/HostApi.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/HostApi.cxx
deleted file mode 100644
index 6a09670c00..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/HostApi.cxx
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "portaudiocpp/HostApi.hxx"
-
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/Device.hxx"
-#include "portaudiocpp/SystemDeviceIterator.hxx"
-#include "portaudiocpp/Exception.hxx"
-
-namespace portaudio
-{
-
-	// -----------------------------------------------------------------------------------
-
-	HostApi::HostApi(PaHostApiIndex index) : devices_(NULL)
-	{
-		try
-		{
-			info_ = Pa_GetHostApiInfo(index);
-
-			// Create and populate devices array:
-			int numDevices = deviceCount();
-
-			devices_ = new Device*[numDevices];
-
-			for (int i = 0; i < numDevices; ++i)
-			{
-				PaDeviceIndex deviceIndex = Pa_HostApiDeviceIndexToDeviceIndex(index, i);
-
-				if (deviceIndex < 0)
-				{
-					throw PaException(deviceIndex);
-				}
-
-				devices_[i] = &System::instance().deviceByIndex(deviceIndex);
-			}
-		}
-		catch (const std::exception &e)
-		{
-			// Delete any (partially) constructed objects (deconstructor isn't called):
-			delete[] devices_; // devices_ is either NULL or valid
-
-			// Re-throw exception:
-			throw e;
-		}
-	}
-
-	HostApi::~HostApi()
-	{
-		// Destroy devices array:
-		delete[] devices_;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	PaHostApiTypeId HostApi::typeId() const
-	{
-		return info_->type;
-	}
-
-	PaHostApiIndex HostApi::index() const
-	{
-		PaHostApiIndex index = Pa_HostApiTypeIdToHostApiIndex(typeId());
-
-		if (index < 0)
-			throw PaException(index);
-
-		return index;
-	}
-
-	const char *HostApi::name() const
-	{
-		return info_->name;
-	}
-
-	int HostApi::deviceCount() const
-	{
-		return info_->deviceCount;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	HostApi::DeviceIterator HostApi::devicesBegin()
-	{
-		DeviceIterator tmp;
-		tmp.ptr_ = &devices_[0]; // begin (first element)
-		return tmp;
-	}
-
-	HostApi::DeviceIterator HostApi::devicesEnd()
-	{
-		DeviceIterator tmp;
-		tmp.ptr_ = &devices_[deviceCount()]; // end (one past last element)
-		return tmp;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	Device &HostApi::defaultInputDevice() const
-	{
-		return System::instance().deviceByIndex(info_->defaultInputDevice);
-	}
-
-	Device &HostApi::defaultOutputDevice() const
-	{
-		return System::instance().deviceByIndex(info_->defaultOutputDevice);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	bool HostApi::operator==(const HostApi &rhs) const
-	{
-		return (typeId() == rhs.typeId());
-	}
-
-	bool HostApi::operator!=(const HostApi &rhs) const
-	{
-		return !(*this == rhs);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx
deleted file mode 100644
index 5433fa3732..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "portaudiocpp/InterfaceCallbackStream.hxx"
-
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/CallbackInterface.hxx"
-
-namespace portaudio
-{
-
-	// ---------------------------------------------------------------------------------==
-
-	InterfaceCallbackStream::InterfaceCallbackStream()
-	{
-	}
-
-	InterfaceCallbackStream::InterfaceCallbackStream(const StreamParameters &parameters, CallbackInterface &instance)
-	{
-		open(parameters, instance);
-	}
-
-	InterfaceCallbackStream::~InterfaceCallbackStream()
-	{
-		try
-		{
-			close();
-		}
-		catch (...)
-		{
-			// ignore all errors
-		}
-	}
-
-	// ---------------------------------------------------------------------------------==
-
-	void InterfaceCallbackStream::open(const StreamParameters &parameters, CallbackInterface &instance)
-	{
-		PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-			parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), &impl::callbackInterfaceToPaCallbackAdapter, static_cast<void *>(&instance));
-
-		if (err != paNoError)
-		{
-			throw PaException(err);
-		}
-	}
-}
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx
deleted file mode 100644
index 5141de2aba..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "portaudiocpp/MemFunCallbackStream.hxx"
-
-// (... template class ...)
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/Stream.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/Stream.cxx
deleted file mode 100644
index ba16e0335f..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/Stream.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "portaudiocpp/Stream.hxx"
-
-#include <cstddef>
-
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/System.hxx"
-
-namespace portaudio
-{
-
-	// -----------------------------------------------------------------------------------
-
-	Stream::Stream() : stream_(NULL)
-	{
-	}
-
-	Stream::~Stream()
-	{
-		// (can't call close here, 
-		// the derived class should atleast call 
-		// close() in it's deconstructor)
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Closes the Stream if it's open, else does nothing.
-	//////
-	void Stream::close()
-	{
-		if (isOpen() && System::exists())
-		{
-			PaError err = Pa_CloseStream(stream_);
-			stream_ = NULL;
-
-			if (err != paNoError)
-				throw PaException(err);
-		}
-	}
-
-	//////
-	/// Returns true if the Stream is open.
-	//////
-	bool Stream::isOpen() const
-	{
-		return (stream_ != NULL);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	void Stream::setStreamFinishedCallback(PaStreamFinishedCallback *callback)
-	{
-		PaError err = Pa_SetStreamFinishedCallback(stream_, callback);
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	void Stream::start()
-	{
-		PaError err = Pa_StartStream(stream_);
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-	void Stream::stop()
-	{
-		PaError err = Pa_StopStream(stream_);
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-	void Stream::abort()
-	{
-		PaError err = Pa_AbortStream(stream_);
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-	bool Stream::isStopped() const
-	{
-		PaError ret = Pa_IsStreamStopped(stream_);
-
-		if (ret < 0)
-			throw PaException(ret);
-
-		return (ret == 1);
-	}
-
-	bool Stream::isActive() const
-	{
-		PaError ret = Pa_IsStreamActive(stream_);
-
-		if (ret < 0)
-			throw PaException(ret);
-
-		return (ret == 1);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Returns the best known input latency for the Stream. This value may differ from the 
-	/// suggested input latency set in the StreamParameters. Includes all sources of 
-	/// latency known to PortAudio such as internal buffering, and Host API reported latency. 
-	/// Doesn't include any estimates of unknown latency.
-	//////
-	PaTime Stream::inputLatency() const
-	{
-		const PaStreamInfo *info = Pa_GetStreamInfo(stream_);
-		if (info == NULL)
-		{
-			throw PaException(paInternalError);
-			return PaTime(0.0);
-		}
-
-		return info->inputLatency;
-	}
-
-	//////
-	/// Returns the best known output latency for the Stream. This value may differ from the 
-	/// suggested output latency set in the StreamParameters. Includes all sources of 
-	/// latency known to PortAudio such as internal buffering, and Host API reported latency. 
-	/// Doesn't include any estimates of unknown latency.
-	//////
-	PaTime Stream::outputLatency() const
-	{
-		const PaStreamInfo *info = Pa_GetStreamInfo(stream_);
-		if (info == NULL)
-		{
-			throw PaException(paInternalError);
-			return PaTime(0.0);
-		}
-
-		return info->outputLatency;
-	}
-
-	//////
-	/// Returns the sample rate of the Stream. Usually this will be the 
-	/// best known estimate of the used sample rate. For instance when opening a 
-	/// Stream setting 44100.0 Hz in the StreamParameters, the actual sample 
-	/// rate might be something like 44103.2 Hz (due to imperfections in the 
-	/// sound card hardware).
-	//////
-	double Stream::sampleRate() const
-	{
-		const PaStreamInfo *info = Pa_GetStreamInfo(stream_);
-		if (info == NULL)
-		{
-			throw PaException(paInternalError);
-			return 0.0;
-		}
-
-		return info->sampleRate;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	PaTime Stream::time() const
-	{
-		return Pa_GetStreamTime(stream_);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Accessor (const) for PortAudio PaStream pointer, useful for interfacing with 
-	/// PortAudio add-ons such as PortMixer for instance. Normally accessing this 
-	/// pointer should not be needed as PortAudioCpp aims to provide all of PortAudio's 
-	/// functionality.
-	//////
-	const PaStream *Stream::paStream() const
-	{
-		return stream_;
-	}
-
-	//////
-	/// Accessor (non-const) for PortAudio PaStream pointer, useful for interfacing with 
-	/// PortAudio add-ons such as PortMixer for instance. Normally accessing this 
-	/// pointer should not be needed as PortAudioCpp aims to provide all of PortAudio's 
-	/// functionality.
-	//////
-	PaStream *Stream::paStream()
-	{
-		return stream_;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/StreamParameters.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/StreamParameters.cxx
deleted file mode 100644
index 5b9e89716a..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/StreamParameters.cxx
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "portaudiocpp/StreamParameters.hxx"
-
-#include <cstddef>
-
-#include "portaudiocpp/Device.hxx"
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Default constructor; does nothing.
-	//////
-	StreamParameters::StreamParameters()
-	{
-	}
-
-	//////
-	/// Sets up the all parameters needed to open either a half-duplex or full-duplex Stream.
-	///
-	/// @param inputParameters The parameters for the input direction of the to-be opened 
-	/// Stream or DirectionSpecificStreamParameters::null() for an output-only Stream.
-	/// @param outputParameters The parameters for the output direction of the to-be opened
-	/// Stream or DirectionSpecificStreamParameters::null() for an input-only Stream.
-	/// @param sampleRate The to-be opened Stream's sample rate in Hz.
-	/// @param framesPerBuffer The number of frames per buffer for a CallbackStream, or 
-	/// the preferred buffer granularity for a BlockingStream.
-	/// @param flags The flags for the to-be opened Stream; default paNoFlag.
-	//////
-	StreamParameters::StreamParameters(const DirectionSpecificStreamParameters &inputParameters, 
-		const DirectionSpecificStreamParameters &outputParameters, double sampleRate, unsigned long framesPerBuffer, 
-		PaStreamFlags flags) : inputParameters_(inputParameters), outputParameters_(outputParameters), 
-		sampleRate_(sampleRate), framesPerBuffer_(framesPerBuffer), flags_(flags)
-	{
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// Sets the requested sample rate. If this sample rate isn't supported by the hardware, the 
-	/// Stream will fail to open. The real-life sample rate used might differ slightly due to 
-	/// imperfections in the sound card hardware; use Stream::sampleRate() to retreive the 
-	/// best known estimate for this value.
-	//////
-	void StreamParameters::setSampleRate(double sampleRate)
-	{
-		sampleRate_ = sampleRate;
-	}
-
-	//////
-	/// Either the number of frames per buffer for a CallbackStream, or 
-	/// the preferred buffer granularity for a BlockingStream. See PortAudio 
-	/// documentation.
-	//////
-	void StreamParameters::setFramesPerBuffer(unsigned long framesPerBuffer)
-	{
-		framesPerBuffer_ = framesPerBuffer;
-	}
-
-	//////
-	/// Sets the specified flag or does nothing when the flag is already set. Doesn't 
-	/// `unset' any previously existing flags (use clearFlags() for that).
-	//////
-	void StreamParameters::setFlag(PaStreamFlags flag)
-	{
-		flags_ |= flag;
-	}
-
-	//////
-	/// Unsets the specified flag or does nothing if the flag isn't set. Doesn't affect 
-	/// any other flags.
-	//////
-	void StreamParameters::unsetFlag(PaStreamFlags flag)
-	{
-		flags_ &= ~flag;
-	}
-
-	//////
-	/// Clears or `unsets' all set flags.
-	//////
-	void StreamParameters::clearFlags()
-	{
-		flags_ = paNoFlag;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	void StreamParameters::setInputParameters(const DirectionSpecificStreamParameters &parameters)
-	{
-		inputParameters_ = parameters;
-	}
-
-	void StreamParameters::setOutputParameters(const DirectionSpecificStreamParameters &parameters)
-	{
-		outputParameters_ = parameters;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	bool StreamParameters::isSupported() const
-	{
-		return (Pa_IsFormatSupported(inputParameters_.paStreamParameters(), 
-			outputParameters_.paStreamParameters(), sampleRate_) == paFormatIsSupported);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	double StreamParameters::sampleRate() const
-	{
-		return sampleRate_;
-	}
-
-	unsigned long StreamParameters::framesPerBuffer() const
-	{
-		return framesPerBuffer_;
-	}
-
-	//////
-	/// Returns all currently set flags as a binary combined 
-	/// integer value (PaStreamFlags). Use isFlagSet() to 
-	/// avoid dealing with the bitmasks.
-	//////
-	PaStreamFlags StreamParameters::flags() const
-	{
-		return flags_;
-	}
-
-	//////
-	/// Returns true if the specified flag is currently set 
-	/// or false if it isn't.
-	//////
-	bool StreamParameters::isFlagSet(PaStreamFlags flag) const
-	{
-		return ((flags_ & flag) != 0);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	DirectionSpecificStreamParameters &StreamParameters::inputParameters()
-	{
-		return inputParameters_;
-	}
-
-	const DirectionSpecificStreamParameters &StreamParameters::inputParameters() const
-	{
-		return inputParameters_;
-	}
-
-	DirectionSpecificStreamParameters &StreamParameters::outputParameters()
-	{
-		return outputParameters_;
-	}
-
-	const DirectionSpecificStreamParameters &StreamParameters::outputParameters() const
-	{
-		return outputParameters_;
-	}
-
-	// -----------------------------------------------------------------------------------
-} // namespace portaudio
-
-
-
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/System.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/System.cxx
deleted file mode 100644
index acb419d4aa..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/System.cxx
+++ /dev/null
@@ -1,308 +0,0 @@
-#include "portaudiocpp/System.hxx"
-
-#include <cstddef>
-#include <cassert>
-
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/Device.hxx"
-#include "portaudiocpp/Stream.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/SystemHostApiIterator.hxx"
-#include "portaudiocpp/SystemDeviceIterator.hxx"
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	// Static members:
-	System *System::instance_ = NULL;
-	int System::initCount_ = 0;
-	HostApi **System::hostApis_ = NULL;
-	Device **System::devices_ = NULL;
-	Device *System::nullDevice_ = NULL;
-
-	// -----------------------------------------------------------------------------------
-
-	int System::version()
-	{
-		return Pa_GetVersion();
-	}
-
-	const char *System::versionText()
-	{
-		return Pa_GetVersionText();
-	}
-
-	void System::initialize()
-	{
-		++initCount_;
-
-		if (initCount_ == 1)
-		{
-			// Create singleton:
-			assert(instance_ == NULL);
-			instance_ = new System();
-
-			// Initialize the PortAudio system:
-			{
-				PaError err = Pa_Initialize();
-
-				if (err != paNoError)
-					throw PaException(err);
-			}
-
-			// Create and populate device array:
-			{
-				int numDevices = instance().deviceCount();
-
-				devices_ = new Device*[numDevices];
-
-				for (int i = 0; i < numDevices; ++i)
-					devices_[i] = new Device(i);
-			}
-
-			// Create and populate host api array:
-			{
-				int numHostApis = instance().hostApiCount();
-
-				hostApis_ = new HostApi*[numHostApis];
-
-				for (int i = 0; i < numHostApis; ++i)
-					hostApis_[i] = new HostApi(i);
-			}
-			
-			// Create null device:
-			nullDevice_ = new Device(paNoDevice);
-		}
-	}
-
-	void System::terminate()
-	{
-		PaError err = paNoError;
-
-		if (initCount_ == 1)
-		{
-			// Destroy null device:
-			delete nullDevice_;
-
-			// Destroy host api array:
-			{
-				if (hostApis_ != NULL)
-				{
-					int numHostApis = instance().hostApiCount();
-
-					for (int i = 0; i < numHostApis; ++i)
-						delete hostApis_[i];
-
-					delete[] hostApis_;
-					hostApis_ = NULL;
-				}
-			}
-
-			// Destroy device array:
-			{
-				if (devices_ != NULL)
-				{
-					int numDevices = instance().deviceCount();
-
-					for (int i = 0; i < numDevices; ++i)
-						delete devices_[i];
-
-					delete[] devices_;
-					devices_ = NULL;
-				}
-			}
-
-			// Terminate the PortAudio system:
-			assert(instance_ != NULL);
-			err = Pa_Terminate();
-
-			// Destroy singleton:
-			delete instance_;
-			instance_ = NULL;
-		}
-
-		if (initCount_ > 0)
-			--initCount_;
-
-		if (err != paNoError)
-			throw PaException(err);
-	}
-
-
-	System &System::instance()
-	{
-		assert(exists());
-
-		return *instance_;
-	}
-
-	bool System::exists()
-	{
-		return (instance_ != NULL);
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	System::HostApiIterator System::hostApisBegin()
-	{
-		System::HostApiIterator tmp;
-		tmp.ptr_ = &hostApis_[0]; // begin (first element)
-		return tmp;
-	}
-
-	System::HostApiIterator System::hostApisEnd()
-	{
-		int count = hostApiCount();
-
-		System::HostApiIterator tmp;
-		tmp.ptr_ = &hostApis_[count]; // end (one past last element)
-		return tmp;
-	}
-
-	HostApi &System::defaultHostApi()
-	{
-		PaHostApiIndex defaultHostApi = Pa_GetDefaultHostApi();
-
-		if (defaultHostApi < 0)
-			throw PaException(defaultHostApi);
-
-		return *hostApis_[defaultHostApi];
-	}
-
-	HostApi &System::hostApiByTypeId(PaHostApiTypeId type)
-	{
-		PaHostApiIndex index = Pa_HostApiTypeIdToHostApiIndex(type);
-
-		if (index < 0)
-			throw PaException(index);
-
-		return *hostApis_[index];
-	}
-
-	HostApi &System::hostApiByIndex(PaHostApiIndex index)
-	{
-		if (index < 0 || index >= hostApiCount())
-			throw PaException(paInternalError);
-
-		return *hostApis_[index];
-	}
-
-	int System::hostApiCount()
-	{
-		PaHostApiIndex count = Pa_GetHostApiCount();
-
-		if (count < 0)
-			throw PaException(count);
-
-		return count;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	System::DeviceIterator System::devicesBegin()
-	{
-		DeviceIterator tmp;
-		tmp.ptr_ = &devices_[0];
-
-		return tmp;
-	}
-
-	System::DeviceIterator System::devicesEnd()
-	{
-		int count = deviceCount();
-
-		DeviceIterator tmp;
-		tmp.ptr_ = &devices_[count];
-
-		return tmp;
-	}
-
-	//////
-	/// Returns the System's default input Device, or the null Device if none 
-	/// was available.
-	//////
-	Device &System::defaultInputDevice()
-	{
-		PaDeviceIndex index = Pa_GetDefaultInputDevice();
-		return deviceByIndex(index);
-	}
-
-	//////
-	/// Returns the System's default output Device, or the null Device if none 
-	/// was available.
-	//////
-	Device &System::defaultOutputDevice()
-	{
-		PaDeviceIndex index = Pa_GetDefaultOutputDevice();
-		return deviceByIndex(index);
-	}
-
-	//////
-	/// Returns the Device for the given index.
-	/// Will throw a paInternalError equivalent PaException if the given index 
-	/// is out of range.
-	//////
-	Device &System::deviceByIndex(PaDeviceIndex index)
-	{
-		if (index < -1 || index >= deviceCount())
-		{
-			throw PaException(paInternalError);
-		}
-
-		if (index == -1)
-			return System::instance().nullDevice();
-
-		return *devices_[index];
-	}
-
-	int System::deviceCount()
-	{
-		PaDeviceIndex count = Pa_GetDeviceCount();
-
-		if (count < 0)
-			throw PaException(count);
-
-		return count;
-	}
-
-	Device &System::nullDevice()
-	{
-		return *nullDevice_;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	void System::sleep(long msec)
-	{
-		Pa_Sleep(msec);
-	}
-
-	int System::sizeOfSample(PaSampleFormat format)
-	{
-		PaError err = Pa_GetSampleSize(format);
-		if (err < 0)
-		{
-			throw PaException(err);
-			return 0;
-		}
-
-		return err;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	System::System()
-	{
-		// (left blank intentionally)
-	}
-
-	System::~System()
-	{
-		// (left blank intentionally)
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx
deleted file mode 100644
index 704d29c889..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "portaudiocpp/SystemDeviceIterator.hxx"
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	Device &System::DeviceIterator::operator*() const
-	{
-		return **ptr_;
-	}
-
-	Device *System::DeviceIterator::operator->() const
-	{
-		return &**this;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	System::DeviceIterator &System::DeviceIterator::operator++()
-	{
-		++ptr_;
-		return *this;
-	}
-
-	System::DeviceIterator System::DeviceIterator::operator++(int)
-	{
-		System::DeviceIterator prev = *this;
-		++*this;
-		return prev;
-	}
-
-	System::DeviceIterator &System::DeviceIterator::operator--()
-	{
-		--ptr_;
-		return *this;
-	}
-
-	System::DeviceIterator System::DeviceIterator::operator--(int)
-	{
-		System::DeviceIterator prev = *this;
-		--*this;
-		return prev;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	bool System::DeviceIterator::operator==(const System::DeviceIterator &rhs)
-	{
-		return (ptr_ == rhs.ptr_);
-	}
-
-	bool System::DeviceIterator::operator!=(const System::DeviceIterator &rhs)
-	{
-		return !(*this == rhs);
-	}
-
-	// -----------------------------------------------------------------------------------
-} // namespace portaudio
-
-
diff --git a/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx b/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx
deleted file mode 100644
index 185b36947c..0000000000
--- a/libs/portaudio/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "portaudiocpp/SystemHostApiIterator.hxx"
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	HostApi &System::HostApiIterator::operator*() const
-	{
-		return **ptr_;
-	}
-
-	HostApi *System::HostApiIterator::operator->() const
-	{
-		return &**this;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	System::HostApiIterator &System::HostApiIterator::operator++()
-	{
-		++ptr_;
-		return *this;
-	}
-
-	System::HostApiIterator System::HostApiIterator::operator++(int)
-	{
-		System::HostApiIterator prev = *this;
-		++*this;
-		return prev;
-	}
-
-	System::HostApiIterator &System::HostApiIterator::operator--()
-	{
-		--ptr_;
-		return *this;
-	}
-
-	System::HostApiIterator System::HostApiIterator::operator--(int)
-	{
-		System::HostApiIterator prev = *this;
-		--*this;
-		return prev;
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	bool System::HostApiIterator::operator==(const System::HostApiIterator &rhs)
-	{
-		return (ptr_ == rhs.ptr_);
-	}
-
-	bool System::HostApiIterator::operator!=(const System::HostApiIterator &rhs)
-	{
-		return !(*this == rhs);
-	}
-
-	// -----------------------------------------------------------------------------------
-} // namespace portaudio
-
diff --git a/libs/portaudio/build/dev-cpp/Makefile-dll b/libs/portaudio/build/dev-cpp/Makefile-dll
deleted file mode 100644
index 856af638e3..0000000000
--- a/libs/portaudio/build/dev-cpp/Makefile-dll
+++ /dev/null
@@ -1,78 +0,0 @@
-# Project: portaudio-dll
-# Makefile created by Dev-C++ 4.9.8.2
-
-CPP  = g++.exe
-CC   = gcc.exe
-WINDRES = windres.exe
-RES  = 
-OBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LINKOBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LIBS =  -L"C:/Dev-CPP/lib" -fmessage-length=0 --no-export-all-symbols --add-stdcall-alias ../../../asiosdk2/asiosdk2.a -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwinmm -O3 -s 
-INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-BIN  = portaudio-dll.dll
-CXXFLAGS = $(CXXINCS)-O3   -fmessage-length=0 -Wall
-CFLAGS = $(INCS)-DBUILDING_DLL=1 -O3   -fmessage-length=0 -Wall
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before portaudio-dll.dll all-after
-
-
-clean: clean-custom
-	rm -f $(OBJ) $(BIN)
-
-DLLWRAP=dllwrap.exe
-DEFFILE=libportaudio-dll.def
-STATICLIB=libportaudio-dll.a
-
-$(BIN): $(LINKOBJ)
-	$(DLLWRAP) --output-def $(DEFFILE) --driver-name c++ --implib $(STATICLIB) $(LINKOBJ) $(LIBS) -o $(BIN)
-
-./pa_skeleton.o: ../../pa_common/pa_skeleton.c
-	$(CPP) -c ../../pa_common/pa_skeleton.c -o ./pa_skeleton.o $(CXXFLAGS)
-
-./pa_stream.o: ../../pa_common/pa_stream.c
-	$(CPP) -c ../../pa_common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
-
-./pa_trace.o: ../../pa_common/pa_trace.c
-	$(CPP) -c ../../pa_common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
-
-./pa_allocation.o: ../../pa_common/pa_allocation.c
-	$(CPP) -c ../../pa_common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
-
-./pa_converters.o: ../../pa_common/pa_converters.c
-	$(CPP) -c ../../pa_common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
-
-./pa_cpuload.o: ../../pa_common/pa_cpuload.c
-	$(CPP) -c ../../pa_common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
-
-./pa_dither.o: ../../pa_common/pa_dither.c
-	$(CPP) -c ../../pa_common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
-
-./pa_front.o: ../../pa_common/pa_front.c
-	$(CPP) -c ../../pa_common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
-
-./pa_process.o: ../../pa_common/pa_process.c
-	$(CPP) -c ../../pa_common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
-
-./pa_asio.o: ../../pa_asio/pa_asio.cpp
-	$(CPP) -c ../../pa_asio/pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
-
-./pa_win_util.o: ../pa_win_util.c
-	$(CPP) -c ../pa_win_util.c -o ./pa_win_util.o $(CXXFLAGS)
-
-./pa_win_hostapis.o: ../pa_win_hostapis.c
-	$(CPP) -c ../pa_win_hostapis.c -o ./pa_win_hostapis.o $(CXXFLAGS)
-
-./pa_win_ds.o: ../../pa_win_ds/pa_win_ds.c
-	$(CPP) -c ../../pa_win_ds/pa_win_ds.c -o ./pa_win_ds.o $(CXXFLAGS)
-
-./dsound_wrapper.o: ../../pa_win_ds/dsound_wrapper.c
-	$(CPP) -c ../../pa_win_ds/dsound_wrapper.c -o ./dsound_wrapper.o $(CXXFLAGS)
-
-./pa_win_wmme.o: ../../pa_win_wmme/pa_win_wmme.c
-	$(CPP) -c ../../pa_win_wmme/pa_win_wmme.c -o ./pa_win_wmme.o $(CXXFLAGS)
-
-./iasiothiscallresolver.o: ../../pa_asio/iasiothiscallresolver.cpp
-	$(CPP) -c ../../pa_asio/iasiothiscallresolver.cpp -o ./iasiothiscallresolver.o $(CXXFLAGS)
diff --git a/libs/portaudio/build/dev-cpp/Makefile-static b/libs/portaudio/build/dev-cpp/Makefile-static
deleted file mode 100644
index 2a1647ddc5..0000000000
--- a/libs/portaudio/build/dev-cpp/Makefile-static
+++ /dev/null
@@ -1,75 +0,0 @@
-# Project: portaudio-static
-# Makefile created by Dev-C++ 4.9.8.2
-
-CPP  = g++.exe
-CC   = gcc.exe
-WINDRES = windres.exe
-RES  = 
-OBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LINKOBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LIBS =  -L"C:/Dev-CPP/lib" -fmessage-length=0 -O3 -s 
-INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-BIN  = portaudio-static.a
-CXXFLAGS = $(CXXINCS)-O3   -fmessage-length=0 -Wall
-CFLAGS = $(INCS)-O3   -fmessage-length=0 -Wall
-
-.PHONY: all all-before all-after clean clean-custom
-
-all: all-before portaudio-static.a all-after
-
-
-clean: clean-custom
-	rm -f $(OBJ) $(BIN)
-
-$(BIN): $(LINKOBJ)
-	ar r $(BIN) $(LINKOBJ)
-	ranlib $(BIN)
-
-./pa_skeleton.o: ../../pa_common/pa_skeleton.c
-	$(CPP) -c ../../pa_common/pa_skeleton.c -o ./pa_skeleton.o $(CXXFLAGS)
-
-./pa_stream.o: ../../pa_common/pa_stream.c
-	$(CPP) -c ../../pa_common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
-
-./pa_trace.o: ../../pa_common/pa_trace.c
-	$(CPP) -c ../../pa_common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
-
-./pa_allocation.o: ../../pa_common/pa_allocation.c
-	$(CPP) -c ../../pa_common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
-
-./pa_converters.o: ../../pa_common/pa_converters.c
-	$(CPP) -c ../../pa_common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
-
-./pa_cpuload.o: ../../pa_common/pa_cpuload.c
-	$(CPP) -c ../../pa_common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
-
-./pa_dither.o: ../../pa_common/pa_dither.c
-	$(CPP) -c ../../pa_common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
-
-./pa_front.o: ../../pa_common/pa_front.c
-	$(CPP) -c ../../pa_common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
-
-./pa_process.o: ../../pa_common/pa_process.c
-	$(CPP) -c ../../pa_common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
-
-./pa_asio.o: ../../pa_asio/pa_asio.cpp
-	$(CPP) -c ../../pa_asio/pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
-
-./pa_win_util.o: ../pa_win_util.c
-	$(CPP) -c ../pa_win_util.c -o ./pa_win_util.o $(CXXFLAGS)
-
-./pa_win_hostapis.o: ../pa_win_hostapis.c
-	$(CPP) -c ../pa_win_hostapis.c -o ./pa_win_hostapis.o $(CXXFLAGS)
-
-./pa_win_ds.o: ../../pa_win_ds/pa_win_ds.c
-	$(CPP) -c ../../pa_win_ds/pa_win_ds.c -o ./pa_win_ds.o $(CXXFLAGS)
-
-./dsound_wrapper.o: ../../pa_win_ds/dsound_wrapper.c
-	$(CPP) -c ../../pa_win_ds/dsound_wrapper.c -o ./dsound_wrapper.o $(CXXFLAGS)
-
-./pa_win_wmme.o: ../../pa_win_wmme/pa_win_wmme.c
-	$(CPP) -c ../../pa_win_wmme/pa_win_wmme.c -o ./pa_win_wmme.o $(CXXFLAGS)
-
-./iasiothiscallresolver.o: ../../pa_asio/iasiothiscallresolver.cpp
-	$(CPP) -c ../../pa_asio/iasiothiscallresolver.cpp -o ./iasiothiscallresolver.o $(CXXFLAGS)
diff --git a/libs/portaudio/build/dev-cpp/portaudio-dll.dev b/libs/portaudio/build/dev-cpp/portaudio-dll.dev
deleted file mode 100644
index 086e109eef..0000000000
--- a/libs/portaudio/build/dev-cpp/portaudio-dll.dev
+++ /dev/null
@@ -1,209 +0,0 @@
-[Project]
-FileName=portaudio-dll.dev
-Name=portaudio-dll
-UnitCount=16
-Type=3
-Ver=1
-ObjFiles=
-Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\pa_common
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=-DBUILDING_DLL=1_@@_-O3_@@_
-CppCompiler=-O3_@@_
-Linker=--no-export-all-symbols --add-stdcall-alias_@@_../../../asiosdk2/asiosdk2.a_@@_-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwinmm_@@_-O3 -s_@@_
-IsCpp=1
-Icon=
-ExeOutput=.
-ObjectOutput=.
-OverrideOutput=0
-OverrideOutputName=portaudio.a
-HostApplication=
-Folders=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-UseCustomMakefile=0
-CustomMakefile=
-
-[Unit1]
-FileName=..\..\pa_common\pa_skeleton.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_skeleton.c -o ./pa_skeleton.o $(CFLAGS)
-
-[Unit2]
-FileName=..\..\pa_common\pa_stream.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_stream.c -o ./pa_stream.o $(CFLAGS)
-
-[Unit3]
-FileName=..\..\pa_common\pa_trace.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_trace.c -o ./pa_trace.o $(CFLAGS)
-
-[Unit4]
-FileName=..\..\pa_common\pa_allocation.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_allocation.c -o ./pa_allocation.o $(CFLAGS)
-
-[Unit5]
-FileName=..\..\pa_common\pa_converters.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_converters.c -o ./pa_converters.o $(CFLAGS)
-
-[Unit6]
-FileName=..\..\pa_common\pa_cpuload.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_cpuload.c -o ./pa_cpuload.o $(CFLAGS)
-
-[Unit7]
-FileName=..\..\pa_common\pa_dither.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_dither.c -o ./pa_dither.o $(CFLAGS)
-
-[Unit8]
-FileName=..\..\pa_common\pa_front.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_front.c -o ./pa_front.o $(CFLAGS)
-
-[Unit9]
-FileName=..\..\pa_common\pa_process.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_process.c -o ./pa_process.o $(CFLAGS)
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit10]
-FileName=..\..\pa_asio\pa_asio.cpp
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CPP) -c pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
-
-[Unit11]
-FileName=..\pa_win_util.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_util.c -o ./pa_win_util.o $(CFLAGS)
-
-[Unit12]
-FileName=..\pa_win_hostapis.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_hostapis.c -o ./pa_win_hostapis.o $(CFLAGS)
-
-[Unit13]
-FileName=..\..\pa_win_ds\pa_win_ds.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_ds.c -o ./pa_win_ds.o $(CFLAGS)
-
-[Unit14]
-FileName=..\..\pa_win_ds\dsound_wrapper.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c dsound_wrapper.c -o ./dsound_wrapper.o $(CFLAGS)
-
-[Unit15]
-FileName=..\..\pa_win_wmme\pa_win_wmme.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_wmme.c -o ./pa_win_wmme.o $(CFLAGS)
-
-[Unit16]
-FileName=..\..\pa_asio\iasiothiscallresolver.cpp
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/libs/portaudio/build/dev-cpp/portaudio-static.dev b/libs/portaudio/build/dev-cpp/portaudio-static.dev
deleted file mode 100644
index 2aae584df4..0000000000
--- a/libs/portaudio/build/dev-cpp/portaudio-static.dev
+++ /dev/null
@@ -1,209 +0,0 @@
-[Project]
-FileName=portaudio-static.dev
-Name=portaudio-static
-UnitCount=16
-Type=2
-Ver=1
-ObjFiles=
-Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\pa_common
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=-O3_@@_
-CppCompiler=-O3_@@_
-Linker=-O3 -s_@@_
-IsCpp=1
-Icon=
-ExeOutput=.
-ObjectOutput=.
-OverrideOutput=0
-OverrideOutputName=portaudio.a
-HostApplication=
-Folders=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000000000000000
-UseCustomMakefile=0
-CustomMakefile=
-
-[Unit1]
-FileName=..\..\pa_common\pa_skeleton.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_skeleton.c -o ./pa_skeleton.o $(CFLAGS)
-
-[Unit2]
-FileName=..\..\pa_common\pa_stream.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_stream.c -o ./pa_stream.o $(CFLAGS)
-
-[Unit3]
-FileName=..\..\pa_common\pa_trace.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_trace.c -o ./pa_trace.o $(CFLAGS)
-
-[Unit4]
-FileName=..\..\pa_common\pa_allocation.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_allocation.c -o ./pa_allocation.o $(CFLAGS)
-
-[Unit5]
-FileName=..\..\pa_common\pa_converters.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_converters.c -o ./pa_converters.o $(CFLAGS)
-
-[Unit6]
-FileName=..\..\pa_common\pa_cpuload.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_cpuload.c -o ./pa_cpuload.o $(CFLAGS)
-
-[Unit7]
-FileName=..\..\pa_common\pa_dither.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_dither.c -o ./pa_dither.o $(CFLAGS)
-
-[Unit8]
-FileName=..\..\pa_common\pa_front.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_front.c -o ./pa_front.o $(CFLAGS)
-
-[Unit9]
-FileName=..\..\pa_common\pa_process.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_process.c -o ./pa_process.o $(CFLAGS)
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit10]
-FileName=..\..\pa_asio\pa_asio.cpp
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CPP) -c pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
-
-[Unit11]
-FileName=..\..\pa_win\pa_win_util.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_util.c -o ./pa_win_util.o $(CFLAGS)
-
-[Unit12]
-FileName=..\..\pa_win\pa_win_hostapis.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_hostapis.c -o ./pa_win_hostapis.o $(CFLAGS)
-
-[Unit13]
-FileName=..\..\pa_win_ds\pa_win_ds.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_ds.c -o ./pa_win_ds.o $(CFLAGS)
-
-[Unit14]
-FileName=..\..\pa_win_ds\dsound_wrapper.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c dsound_wrapper.c -o ./dsound_wrapper.o $(CFLAGS)
-
-[Unit15]
-FileName=..\..\pa_win_wmme\pa_win_wmme.c
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_win_wmme.c -o ./pa_win_wmme.o $(CFLAGS)
-
-[Unit16]
-FileName=..\..\pa_asio\iasiothiscallresolver.cpp
-CompileCpp=1
-Folder=portaudio
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/libs/portaudio/build/dev-cpp/readme.txt b/libs/portaudio/build/dev-cpp/readme.txt
deleted file mode 100644
index 07108a7dde..0000000000
--- a/libs/portaudio/build/dev-cpp/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-From: "Peter L Jones" 
-Sent: Wednesday, September 17, 2003 5:18 AM
-Subject: Dev-C++ project files
-
-I attach two project files intended for portaudio/pa_win/dev-cpp (i.e. in
-parallel with the msvc directory), if you want them.  One is for a static
-library build and one for a DLL.  I've used the static library (in building
-a single monolithic DLL) but I can't guarantee the DLL version will build a
-working library (I think it's mostly there, though!).
-
-I also attach the resulting makefiles, which may be of use to other MinGW
-users.
-
-They're rooted in the directory given above and drop their object and
-library files in the same place.  They assume the asiosdk2 files are in the
-same directory as portaudio/ in a sub-directory called asiosdk2/.  Oh!  The
-DLL is built against a static asiosdk2.a library... maybe not the best way
-to do it...  I ought to figure out how to link against a "home made" dll in
-Dev-C++, I guess ;-)
-
-Cheers,
-
--- Peter
diff --git a/libs/portaudio/build/msvc/portaudio.2008.vcproj b/libs/portaudio/build/msvc/portaudio.2008.vcproj
deleted file mode 100644
index 8684bc7ef6..0000000000
--- a/libs/portaudio/build/msvc/portaudio.2008.vcproj
+++ /dev/null
@@ -1,2735 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="portaudio"
-	ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
-	RootNamespace="portaudio"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ksuser.lib"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug DirectSound|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ksuser.lib"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release DirectSound|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\..\src\common\pa_allocation.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_converters.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_cpuload.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_debugprint.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_dither.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_front.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_process.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_skeleton.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_stream.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_trace.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="hostapi"
-				>
-				<Filter
-					Name="ASIO"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\asio\pa_asio.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<Filter
-						Name="ASIOSDK"
-						>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="dsound"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="wmme"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="wasapi"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="os"
-				>
-				<Filter
-					Name="win"
-					>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_hostapis.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_util.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_waveformat.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_x86_plain_converters.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="portaudio.def"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/portaudio/build/msvc/portaudio.2010.vcxproj b/libs/portaudio/build/msvc/portaudio.2010.vcxproj
deleted file mode 100644
index 10b4c25fd9..0000000000
--- a/libs/portaudio/build/msvc/portaudio.2010.vcxproj
+++ /dev/null
@@ -1,858 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug DirectSound|Win32">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug DirectSound|x64">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|Win32">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|x64">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>portaudio</ProjectName>
-    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
-    <RootNamespace>portaudio</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\common\pa_allocation.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_cpuload.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_debugprint.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_dither.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_front.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_process.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_skeleton.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_trace.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\pa_asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wmme\pa_win_wmme.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_hostapis.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_util.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_waveformat.c" />
-    <ClCompile Include="..\..\src\os\win\pa_win_wdmks_utils.c" />
-    <ClCompile Include="..\..\src\os\win\pa_x86_plain_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/portaudio/build/msvc/portaudio.2010.vcxproj.filters b/libs/portaudio/build/msvc/portaudio.2010.vcxproj.filters
deleted file mode 100644
index 8fc7695006..0000000000
--- a/libs/portaudio/build/msvc/portaudio.2010.vcxproj.filters
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{27479ed0-78ba-43cc-8fb5-31de44bbc8da}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Source Files\common">
-      <UniqueIdentifier>{8f150320-dccc-4b5c-b43c-b3b91378f721}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi">
-      <UniqueIdentifier>{ac26acd3-797a-4668-a607-9694e9f10a16}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\ASIO">
-      <UniqueIdentifier>{03878aa4-e6a3-4d56-81fe-f93794a1e3a1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\ASIO\ASIOSDK">
-      <UniqueIdentifier>{99774f7f-59c1-48cb-b72a-09d78537e6e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\dsound">
-      <UniqueIdentifier>{f47fabee-145b-4c98-9423-3d1bb7c1f3b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\wmme">
-      <UniqueIdentifier>{4ea57aa2-5b6b-4022-86b9-f3a02dd2284b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\wasapi">
-      <UniqueIdentifier>{9c44aff3-3f53-4117-8097-ee8b810caba2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\os">
-      <UniqueIdentifier>{a20f633f-4213-4f4b-bd65-a8e49cf9f842}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\os\win">
-      <UniqueIdentifier>{ce9a362c-b700-4ea4-88b4-51c222789754}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{6e72bafa-42f5-450a-90f4-0206faddcf3d}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{5060bc7a-2362-400f-bda0-ae74643cea86}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\common\pa_allocation.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_converters.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_cpuload.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_debugprint.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_dither.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_front.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_process.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_skeleton.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_stream.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_trace.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\pa_asio.cpp">
-      <Filter>Source Files\hostapi\ASIO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds.c">
-      <Filter>Source Files\hostapi\dsound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <Filter>Source Files\hostapi\dsound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wmme\pa_win_wmme.c">
-      <Filter>Source Files\hostapi\wmme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-      <Filter>Source Files\hostapi\wasapi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_hostapis.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_util.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_waveformat.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_wdmks_utils.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_x86_plain_converters.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/portaudio/build/msvc/portaudio.2012.vcxproj b/libs/portaudio/build/msvc/portaudio.2012.vcxproj
deleted file mode 100644
index 3a44ba8692..0000000000
--- a/libs/portaudio/build/msvc/portaudio.2012.vcxproj
+++ /dev/null
@@ -1,874 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug DirectSound|Win32">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug DirectSound|x64">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|Win32">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|x64">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>portaudio</ProjectName>
-    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
-    <RootNamespace>portaudio</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_WMME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\common\pa_allocation.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_cpuload.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_debugprint.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_dither.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_front.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_process.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_skeleton.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_trace.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\pa_asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wmme\pa_win_wmme.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_hostapis.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_util.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_waveformat.c" />
-    <ClCompile Include="..\..\src\os\win\pa_win_wdmks_utils.c" />
-    <ClCompile Include="..\..\src\os\win\pa_x86_plain_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/libs/portaudio/build/msvc/portaudio.2012.vcxproj.filters b/libs/portaudio/build/msvc/portaudio.2012.vcxproj.filters
deleted file mode 100644
index 8fc7695006..0000000000
--- a/libs/portaudio/build/msvc/portaudio.2012.vcxproj.filters
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{27479ed0-78ba-43cc-8fb5-31de44bbc8da}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Source Files\common">
-      <UniqueIdentifier>{8f150320-dccc-4b5c-b43c-b3b91378f721}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi">
-      <UniqueIdentifier>{ac26acd3-797a-4668-a607-9694e9f10a16}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\ASIO">
-      <UniqueIdentifier>{03878aa4-e6a3-4d56-81fe-f93794a1e3a1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\ASIO\ASIOSDK">
-      <UniqueIdentifier>{99774f7f-59c1-48cb-b72a-09d78537e6e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\dsound">
-      <UniqueIdentifier>{f47fabee-145b-4c98-9423-3d1bb7c1f3b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\wmme">
-      <UniqueIdentifier>{4ea57aa2-5b6b-4022-86b9-f3a02dd2284b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\hostapi\wasapi">
-      <UniqueIdentifier>{9c44aff3-3f53-4117-8097-ee8b810caba2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\os">
-      <UniqueIdentifier>{a20f633f-4213-4f4b-bd65-a8e49cf9f842}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\os\win">
-      <UniqueIdentifier>{ce9a362c-b700-4ea4-88b4-51c222789754}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{6e72bafa-42f5-450a-90f4-0206faddcf3d}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{5060bc7a-2362-400f-bda0-ae74643cea86}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\common\pa_allocation.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_converters.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_cpuload.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_debugprint.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_dither.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_front.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_process.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_skeleton.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_stream.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\common\pa_trace.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\pa_asio.cpp">
-      <Filter>Source Files\hostapi\ASIO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <Filter>Source Files\hostapi\ASIO\ASIOSDK</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds.c">
-      <Filter>Source Files\hostapi\dsound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <Filter>Source Files\hostapi\dsound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wmme\pa_win_wmme.c">
-      <Filter>Source Files\hostapi\wmme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp">
-      <Filter>Source Files\hostapi\wasapi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_hostapis.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_util.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_waveformat.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_win_wdmks_utils.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os\win\pa_x86_plain_converters.c">
-      <Filter>Source Files\os\win</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/portaudio/build/msvc/portaudio.def b/libs/portaudio/build/msvc/portaudio.def
deleted file mode 100644
index 08929d65c0..0000000000
--- a/libs/portaudio/build/msvc/portaudio.def
+++ /dev/null
@@ -1,43 +0,0 @@
-EXPORTS
-
-;
-Pa_GetVersion                       @1
-Pa_GetVersionText                   @2
-Pa_GetErrorText                     @3                 
-Pa_Initialize                       @4
-Pa_Terminate                        @5
-Pa_GetHostApiCount                  @6
-Pa_GetDefaultHostApi                @7
-Pa_GetHostApiInfo                   @8
-Pa_HostApiTypeIdToHostApiIndex      @9
-Pa_HostApiDeviceIndexToDeviceIndex  @10
-Pa_GetLastHostErrorInfo             @11
-Pa_GetDeviceCount                   @12
-Pa_GetDefaultInputDevice            @13
-Pa_GetDefaultOutputDevice           @14
-Pa_GetDeviceInfo                    @15
-Pa_IsFormatSupported                @16
-Pa_OpenStream                       @17
-Pa_OpenDefaultStream                @18
-Pa_CloseStream                      @19
-Pa_SetStreamFinishedCallback        @20
-Pa_StartStream                      @21
-Pa_StopStream                       @22
-Pa_AbortStream                      @23
-Pa_IsStreamStopped                  @24
-Pa_IsStreamActive                   @25
-Pa_GetStreamInfo                    @26
-Pa_GetStreamTime                    @27
-Pa_GetStreamCpuLoad                 @28
-Pa_ReadStream                       @29
-Pa_WriteStream                      @30
-Pa_GetStreamReadAvailable           @31
-Pa_GetStreamWriteAvailable          @32
-Pa_GetSampleSize                    @33
-Pa_Sleep                            @34
-PaAsio_GetAvailableLatencyValues    @50
-PaAsio_ShowControlPanel             @51
-PaUtil_InitializeX86PlainConverters @52
-PaAsio_GetInputChannelName          @53
-PaAsio_GetOutputChannelName         @54
-PaUtil_SetDebugPrintFunction        @55
\ No newline at end of file
diff --git a/libs/portaudio/build/msvc/portaudio.dsp b/libs/portaudio/build/msvc/portaudio.dsp
deleted file mode 100644
index efc37f6345..0000000000
--- a/libs/portaudio/build/msvc/portaudio.dsp
+++ /dev/null
@@ -1,265 +0,0 @@
-# Microsoft Developer Studio Project File - Name="portaudio" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=portaudio - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "portaudio.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "portaudio.mak" CFG="portaudio - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "portaudio - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "portaudio - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "portaudio - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_x86"
-# PROP BASE Intermediate_Dir "Release_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src\common" /I "..\..\include" /I ".\\" /I "..\..\src\os\win" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PAWIN_USE_WDMKS_DEVICE_INFO" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib /nologo /dll /machine:I386 /out:"./Release_x86/portaudio_x86.dll"
-
-!ELSEIF  "$(CFG)" == "portaudio - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_x86"
-# PROP BASE Intermediate_Dir "Debug_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src\common" /I "..\..\include" /I ".\\" /I "..\..\src\os\win" /D "WIN32" /D "_DEBUG" /D "_USRDLL" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PAWIN_USE_WDMKS_DEVICE_INFO" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib /nologo /dll /debug /machine:I386 /out:"./Debug_x86/portaudio_x86.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "portaudio - Win32 Release"
-# Name "portaudio - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_debugprint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pa_stream.c
-# End Source File
-# End Group
-# Begin Group "hostapi"
-
-# PROP Default_Filter ""
-# Begin Group "ASIO"
-
-# PROP Default_Filter ""
-# Begin Group "ASIOSDK"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\register.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\asio\pa_asio.cpp
-# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I "..\..\src\hostapi\asio\ASIOSDK\host\pc" /I "..\..\src\hostapi\asio\ASIOSDK\common"
-# End Source File
-# End Group
-# Begin Group "dsound"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\dsound\pa_win_ds.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\dsound\pa_win_ds_dynlink.c
-# End Source File
-# End Group
-# Begin Group "wmme"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# End Group
-# Begin Group "wasapi"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\wasapi\pa_win_wasapi.cpp
-# End Source File
-# End Group
-# Begin Group "wdm-ks"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\hostapi\wdmks\pa_win_wdmks.c
-# End Source File
-# End Group
-# End Group
-# Begin Group "os"
-
-# PROP Default_Filter ""
-# Begin Group "win"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\os\win\pa_win_waveformat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\os\win\pa_win_wdmks_utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\os\win\pa_x86_plain_converters.c
-# End Source File
-# End Group
-# End Group
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\portaudio.def
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libs/portaudio/build/msvc/portaudio.dsw b/libs/portaudio/build/msvc/portaudio.dsw
deleted file mode 100644
index 6af88f43a8..0000000000
--- a/libs/portaudio/build/msvc/portaudio.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "portaudio"=".\portaudio.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libs/portaudio/build/msvc/portaudio.sln b/libs/portaudio/build/msvc/portaudio.sln
deleted file mode 100644
index d4cc5dcef7..0000000000
--- a/libs/portaudio/build/msvc/portaudio.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64
-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/portaudio/build/msvc/portaudio.vcproj b/libs/portaudio/build/msvc/portaudio.vcproj
deleted file mode 100644
index 8cd9997ff3..0000000000
--- a/libs/portaudio/build/msvc/portaudio.vcproj
+++ /dev/null
@@ -1,2729 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="portaudio"
-	ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
-	RootNamespace="portaudio"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ksuser.lib"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ksuser.lib"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug DirectSound|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ksuser.lib"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release DirectSound|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\..\src\common\pa_allocation.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_converters.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_cpuload.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_debugprint.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_dither.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_front.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_process.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_skeleton.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_stream.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\common\pa_trace.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release DirectSound|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="hostapi"
-				>
-				<Filter
-					Name="ASIO"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\asio\pa_asio.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<Filter
-						Name="ASIOSDK"
-						>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp"
-							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|Win32"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release DirectSound|x64"
-								>
-								<Tool
-									Name="VCCLCompilerTool"
-									AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common"
-									PreprocessorDefinitions=""
-								/>
-							</FileConfiguration>
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="dsound"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="wmme"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-				<Filter
-					Name="wasapi"
-					>
-					<File
-						RelativePath="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="os"
-				>
-				<Filter
-					Name="win"
-					>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_hostapis.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_util.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_waveformat.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\os\win\pa_x86_plain_converters.c"
-						>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release DirectSound|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AdditionalIncludeDirectories=""
-								PreprocessorDefinitions=""
-							/>
-						</FileConfiguration>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="portaudio.def"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/portaudio/build/msvc/readme.txt b/libs/portaudio/build/msvc/readme.txt
deleted file mode 100644
index 5364797db1..0000000000
--- a/libs/portaudio/build/msvc/readme.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-Hello
-
-  This is a small list of steps in order to build portaudio
-(Currently v19-devel) into a VC6 DLL and lib file.
-This DLL contains all 3 current win32 PA APIS (MM/DS/ASIO)
-
-1)Copy the source dirs that comes with the ASIO SDK inside src\hostapi\asio\ASIOSDK
-  so you should now have example:
-  
-  portaudio19svn\src\hostapi\asio\ASIOSDK\common
-  portaudio19svn\src\hostapi\asio\ASIOSDK\host
-  portaudio19svn\src\hostapi\asio\ASIOSDK\host\sample
-  portaudio19svn\src\hostapi\asio\ASIOSDK\host\pc
-  portaudio19svn\src\hostapi\asio\ASIOSDK\host\mac (not needed)
-  
-  You dont need "driver"
-  
-2)
-  *If you have Visual Studio 6.0*, please make sure you have it updated with the latest (and final)
-  microsoft libraries for it, namely:
-  
-  Service pack 5:         
-     Latest known URL:  
-     http://msdn2.microsoft.com/en-us/vstudio/aa718363.aspx 
-	 Yes there EXISTS a service pack 6 , but the processor pack (below) isnt compatible with it.
-	 
-  Processor Pack(only works with above SP5)
-     Latest known URL:
-     http://msdn2.microsoft.com/en-us/vstudio/Aa718349.aspx
-	 This isnt absolutely required for portaudio, but if you plan on using SSE intrinsics and similar things.
-	 Up to you to decide upon Service pack 5 or 6 depending on your need for intrinsics.
-
-  Platform SDK (Feb 2003) : 
-     Latest known URL:  
-     http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
-	 (This will allow your code base to be x64 friendly, with correct defines 
-	 for LONG_PTR and such)
-	 NOTE A) Yes you have to use IE activex scripts to install that - wont work in Firefox, you 
-	 may have to temporarily change tyour default browser(aint life unfair)
-	 NOTE B) Dont forget to hit "Register PSDK Directories with Visual Studio". 
-	 you can make sure its right in VC6 if you open tools/options/directories/include files and you see SDK 2003 as the FIRST entry
-	 (it must be the same for libs)
-  
-  DirectX 9.0 SDK Update - (Summer 2003)
-    Latest known URL:
-    http://www.microsoft.com/downloads/details.aspx?familyid=9216652f-51e0-402e-b7b5-feb68d00f298&displaylang=en
-    Again register the links in VC6, and check inside vc6 if headers are in second place right after SDk 2003
-	
-  *If you have 7.0(VC.NET/2001) or 7.1(VC.2003) *
-  then I suggest you open portaudio.dsp (and convert if needed)
- 
-  *If you have Visual Studio 2005*, I suggest you open the portaudio.sln file
-  which contains 4 configurations. Win32/x64 in both Release and Debug variants
-
-  hit compile and hope for the best.
- 
-3)Now in any  project, in which you require portaudio,
-  you can just link with portaudio_x86.lib, (or _x64) and of course include the 
-  relevant headers
-  (portaudio.h, and/or pa_asio.h , pa_x86_plain_converters.h) See (*)
-  
-4) Your new exe should now use portaudio_xXX.dll.
-
-
-Have fun!
-
-(*): you may want to add/remove some DLL entry points.
-Right now those 6 entries are _not_ from portaudio.h
-
-(from portaudio.def)
-(...)
-PaAsio_GetAvailableLatencyValues    @50
-PaAsio_ShowControlPanel             @51
-PaUtil_InitializeX86PlainConverters @52
-PaAsio_GetInputChannelName          @53
-PaAsio_GetOutputChannelName         @54
-PaUtil_SetLogPrintFunction          @55
-
------
-David Viens, davidv@plogue.com
\ No newline at end of file
diff --git a/libs/portaudio/build/scons/SConscript_common b/libs/portaudio/build/scons/SConscript_common
deleted file mode 100644
index e5d1647515..0000000000
--- a/libs/portaudio/build/scons/SConscript_common
+++ /dev/null
@@ -1,28 +0,0 @@
-import os.path, sys
-
-class ConfigurationError(Exception):
-    def __init__(self, reason):
-        Exception.__init__(self, "Configuration failed: %s" % reason)
-
-env = Environment()
-
-# sunos, aix, hpux, irix, sunos appear to be platforms known by SCons, assuming they're POSIX compliant
-Posix = ("linux", "darwin", "sunos", "aix", "hpux", "irix", "sunos")
-Windows = ("win32", "cygwin")
-
-if env["PLATFORM"] == "posix":
-    if sys.platform[:5] == "linux":
-        Platform = "linux"
-    else:
-        raise ConfigurationError("Unknown platform %s" % sys.platform)
-else:
-    if not env["PLATFORM"] in ("win32", "cygwin") + Posix:
-        raise ConfigurationError("Unknown platform %s" % env["PLATFORM"])
-    Platform = env["PLATFORM"]
-
-# Inspired by the versioning scheme followed by Qt, it seems sensible enough. There are three components: major, minor
-# and micro. Major changes with each subtraction from the API (backward-incompatible, i.e. V19 vs. V18), minor changes
-# with each addition to the API (backward-compatible), micro changes with each revision of the source code.
-ApiVer = "2.0.0"
-
-Export("Platform", "Posix", "ConfigurationError", "ApiVer")
diff --git a/libs/portaudio/build/scons/SConscript_opts b/libs/portaudio/build/scons/SConscript_opts
deleted file mode 100644
index 7c9204c3bf..0000000000
--- a/libs/portaudio/build/scons/SConscript_opts
+++ /dev/null
@@ -1,92 +0,0 @@
-import os.path, sys
-
-def _PackageOption(pkgName, default=1):
-    """ Allow user to choose whether a package should be used if available. This results in a commandline option use<Pkgname>,
-    where Pkgname is the name of the package with a capitalized first letter.
-    @param pkgName: Name of package.
-    @param default: The default value for this option ("yes"/"no").
-    """
-    return BoolOption("use%s" % pkgName[0].upper() + pkgName[1:], "use %s if available" % (pkgName), default)
-
-def _BoolOption(opt, explanation, default=1):
-    """ Allow user to enable/disable a certain option. This results in a commandline option enable<Option>, where Option
-    is the name of the option with a capitalized first letter.
-    @param opt: Name of option.
-    @param explanation: Explanation of option.
-    @param default: The default value for this option (1/0).
-    """
-    return BoolOption("enable%s" % opt[0].upper() + opt[1:], explanation, default)
-
-def _EnumOption(opt, explanation, allowedValues, default):
-    """ Allow the user to choose among a set of values for an option. This results in a commandline option with<Option>,
-    where Option is the name of the option with a capitalized first letter.
-    @param opt: The name of the option.
-    @param explanation: Explanation of option.
-    @param allowedValues: The set of values to choose from.
-    @param default: The default value.
-    """
-    assert default in allowedValues
-    return EnumOption("with%s" % opt[0].upper() + opt[1:], explanation, default, allowed_values=allowedValues)
-
-def _DirectoryOption(opt, explanation, default):
-    """ Allow the user to configure the location for a certain directory, for instance the prefix. This results in a
-    commandline option which is simply the name of this option.
-    @param opt: The configurable directory, for instance "prefix".
-    @param explanation: Explanation of option.
-    @param default: The default value for this option.
-    """
-    return PathOption(opt, explanation, default)
-    # Incompatible with the latest stable SCons
-    # return PathOption(path, help, default, PathOption.PathIsDir)
-
-import SCons.Errors
-try:
-    Import("Platform", "Posix")
-except SCons.Errors.UserError:
-    # The common objects must be exported first
-    SConscript("SConscript_common")
-    Import("Platform", "Posix")
-
-# Expose the options as a dictionary of sets of options
-opts = {}
-
-if Platform in Posix:
-    opts["Installation Dirs"] = [_DirectoryOption("prefix", "installation prefix", "/usr/local")]
-elif Platform in Windows:
-    if Platform == "cygwin":
-        opts["Installation Dirs"] = [_DirectoryOption("prefix", "installation prefix", "/usr/local")]
-
-opts["Build Targets"] = [_BoolOption("shared", "create shared library"), _BoolOption("static", "create static library"),
-        _BoolOption("tests", "build test programs")]
-
-apis = []
-if Platform in Posix:
-    apis.append(_PackageOption("OSS"))
-    apis.append(_PackageOption("JACK"))
-    if Platform == "linux":
-        apis.append(_PackageOption("ALSA"))
-        apis.append(_PackageOption("ASIHPI"))
-elif Platform in Windows:
-    if Platform == "cygwin":
-        apis.append(_EnumOption("winAPI", "Windows API to use", ("wmme", "directx", "asio"), "wmme"))
-elif Platform == "darwin":
-    apis.append(_EnumOption("macAPI", "Mac API to use", ("asio", "core", "sm"), "core"))
-opts["Host APIs"] = apis
-
-opts["Build Parameters"] = [\
-        _BoolOption("debug", "compile with debug symbols"),
-        _BoolOption("optimize", "compile with optimization", default=0),
-        _BoolOption("asserts", "runtime assertions are helpful for debugging, but can be detrimental to performance",
-                default=1),
-        _BoolOption("debugOutput", "enable debug output", default=0),
-        # _BoolOption("python", "create Python binding"),
-        ("customCFlags", "customize compilation of C code", ""),
-        ("customCxxFlags", "customize compilation of C++ code", ""),
-        ("customLinkFlags", "customize linking", ""),
-        ]
-
-opts["Bindings"] = [\
-        _BoolOption("cxx", "build Merlijn Blaauw's PA C++ wrapper", default=0)
-        ]
-    
-Return("opts")
diff --git a/libs/portaudio/configure.ac b/libs/portaudio/configure.ac
deleted file mode 100644
index f4ef9abbee..0000000000
--- a/libs/portaudio/configure.ac
+++ /dev/null
@@ -1,324 +0,0 @@
-	dnl
-dnl portaudio V19 configure.in script
-dnl
-dnl Dominic Mazzoni, Arve Knudsen
-dnl
-
-dnl Require autoconf >= 2.13
-AC_PREREQ(2.13)
-
-dnl Init autoconf and make sure configure is being called
-dnl from the right directory
-AC_INIT([include/portaudio.h])
-
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
-
-dnl Specify options
-
-AC_ARG_WITH(alsa, 
-            [  --with-alsa (default=yes)],
-            with_alsa=$withval, with_alsa="yes")
-
-AC_ARG_WITH(jack, 
-            [  --with-jack (default=yes)],
-            with_jack=$withval, with_jack="yes")
-
-AC_ARG_WITH(oss, 
-            [  --with-oss (default=yes)],
-            with_oss=$withval, with_oss="yes")
-
-AC_ARG_WITH(asihpi,
-            [  --with-asihpi (default=auto)],
-            with_asihpi=$withval, with_asihpi="yes")
-
-AC_ARG_WITH(host_os, 
-            [  --with-host_os (no default)],
-            host_os=$withval)
-
-AC_ARG_WITH(winapi,
-            [  --with-winapi ((wmme/directx/asio) default=wmme)],
-            with_winapi=$withval, with_winapi="wmme")
-
-dnl Mac API added for ASIO, can have other api's listed
-AC_ARG_WITH(macapi,
-            [  --with-macapi ((asio/core/sm) default=core)],
-            with_macapi=$withval, with_macapi="core")
-
-AC_ARG_WITH(asiodir,
-            [  --with-asiodir (default=/usr/local/asiosdk2)],
-            with_asiodir=$withval, with_asiodir="/usr/local/asiosdk2")
-
-AC_ARG_WITH(dxdir,
-            [  --with-dxdir (default=/usr/local/dx7sdk)],
-            with_dxdir=$withval, with_dxdir="/usr/local/dx7sdk")
-
-AC_ARG_ENABLE(debug-output,
-	[  --enable-debug-output],
-        [if test x$enableval != xno ; then
-	     AC_DEFINE(PA_ENABLE_DEBUG_OUTPUT,,[Enable debugging messages])
-          fi
-        ])
-
-AC_ARG_ENABLE(cxx,
-              [  --enable-cxx (default=no)],
-              enable_cxx=$enableval, enable_cxx="no")
-
-dnl Checks for programs.
-
-AC_PROG_CC
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PATH_PROG(AR, ar, no)
-if [[ $AR = "no" ]] ; then
-    AC_MSG_ERROR("Could not find ar - needed to create a library");
-fi
-
-dnl This must be one of the first tests we do or it will fail...
-AC_C_BIGENDIAN
-
-dnl checks for various host APIs and arguments to configure that
-dnl turn them on or off
-
-AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
-
-dnl Determine the host description for the subsequent test.
-dnl PKG_CHECK_MODULES seems to check and set the host variable also, but
-dnl that then requires pkg-config availability which is not standard on
-dnl MinGW systems and can be a pain to install.
-dnl AC_CANONICAL_HOST
-
-PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-
-dnl checks for header files
-AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h])
-
-dnl sizeof checks: we will need a 16-bit and a 32-bit type
-
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-save_LIBS="${LIBS}"
-AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"])
-LIBS="${LIBS}${rt_libs}"
-DLL_LIBS="${DLL_LIBS}${rt_libs}"
-AC_CHECK_FUNCS([clock_gettime nanosleep])
-LIBS="${save_LIBS}"
-
-dnl LT_RELEASE=19
-LT_CURRENT=2
-LT_REVISION=0
-LT_AGE=0
-
-dnl AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
-dnl extra variables
-AC_SUBST(OTHER_OBJS)
-AC_SUBST(PADLL)
-AC_SUBST(SHARED_FLAGS)
-AC_SUBST(THREAD_CFLAGS)
-AC_SUBST(DLL_LIBS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(NASM)
-AC_SUBST(NASMOPT)
-
-CFLAGS=${CFLAGS:-"-g -O2 -Wall -pedantic -pipe -fPIC"}
-
-if [[ $ac_cv_c_bigendian = "yes" ]] ; then
-   CFLAGS="$CFLAGS -DPA_BIG_ENDIAN"
-else
-   CFLAGS="$CFLAGS -DPA_LITTLE_ENDIAN"
-fi
-
-case "${host_os}" in
-  darwin* )
-	dnl Mac OS X configuration
-
-	AC_DEFINE(PA_USE_COREAUDIO)
-	if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
-		SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-		CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-	else
-		SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib  -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-		CFLAGS="-Werror $CFLAGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-	fi
-	OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o";
-	LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
-	PADLL="libportaudio.dylib";
-        if [[ $with_macapi = "asio" ]] ; then
-            if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR";
-
-            OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIDIR/host/mac -I$ASIODIR/common";
-            CXXFLAGS="$CFLAGS";
-        fi
-	;;
-
-  mingw* )
-        dnl MingW configuration
-
-        echo "WINAPI: $with_winapi"
-        if [[ $with_winapi = "directx" ]] ; then
-            if [[ $with_dxdir ]] ; then
-              DXDIR="$with_dxdir";
-            else
-              DXDIR="/usr/local/dx7sdk";
-            fi
-            echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -ldsound -lole32";
-            PADLL="portaudio.dll";
-	    THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
-        elif [[ $with_winapi = "asio" ]] ; then
-            if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
-            else
-              ASIODIR="/usr/local/asiosdk2";
-            fi
-            echo "ASIODIR: $ASIODIR"
-
-            OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-	    THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid";
-            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
-            CXXFLAGS="$CFLAGS";
-        elif [[ $with_winapi = "wdmks" ]] ; then
-            if [[ $with_dxdir ]] ; then
-              DXDIR="$with_dxdir";
-            else
-              DXDIR="/usr/local/dx7sdk";
-            fi
-            echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32";
-            PADLL="portaudio.dll";
-	    THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
-        else   # WMME default
-            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-	    THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
-        fi
-        ;;
-
-  cygwin* )
-	dnl Cygwin configuration
-
-	OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-	CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
-	LIBS="-lwinmm -lm";
-	PADLL="portaudio.dll";
-	THREAD_CFLAGS="-mthreads"
-	SHARED_FLAGS="-shared";
-	DLL_LIBS="${DLL_LIBS} -lwinmm";
-	;;
-
-  irix* )
-	dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003).
-	dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST).
-    dnl
-	AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!]))
-	AC_CHECK_LIB(audio,   alOpenPort,     , AC_MSG_ERROR([IRIX audio library not found!]))
-	AC_CHECK_LIB(dmedia,  dmGetUST,       , AC_MSG_ERROR([IRIX digital media library not found!]))
-
-	dnl See the '#ifdef PA_USE_SGI' in file pa_unix/pa_unix_hostapis.c
-	dnl which selects the appropriate PaXXX_Initialize() function.
-	dnl
-	AC_DEFINE(PA_USE_SGI)
-
-	dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm.
-	dnl
-	THREAD_CFLAGS="-D_REENTRANT"
-    
-	OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o";
-	
-	dnl SGI books say -lpthread should be the last of the libs mentioned.
-	dnl
-	LIBS="-lm -ldmedia -laudio -lpthread";
-	PADLL="libportaudio.so";
-	SHARED_FLAGS="";
-	;;
-
-  *)
-	dnl Unix configuration
-
-   AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"]
-                ,
-                AC_MSG_ERROR([libpthread not found!]))
-
-	if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then
-		DLL_LIBS="$DLL_LIBS -lasound"
-		OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
-                AC_DEFINE(PA_USE_ALSA)
-	fi
-
-	if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then
-		DLL_LIBS="$DLL_LIBS $JACK_LIBS"
-		CFLAGS="$CFLAGS $JACK_CFLAGS"
-		OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
-                AC_DEFINE(PA_USE_JACK)
-	fi
-
-	if [[ $with_oss != "no" ]] ; then
-		OTHER_OBJS="$OTHER_OBJS src/hostapi/oss/pa_unix_oss.o"
-		AC_DEFINE(PA_USE_OSS)
-	fi
-	
-	if [[ $have_asihpi = "yes" ] && [ $with_asihpi != "no" ]] ; then
-                LIBS="$LIBS -lhpi"
-		DLL_LIBS="$DLL_LIBS -lhpi"
-		OTHER_OBJS="$OTHER_OBJS src/hostapi/asihpi/pa_linux_asihpi.o"
-                AC_DEFINE(PA_USE_ASIHPI)
-	fi
-	
-	THREAD_CFLAGS="-pthread"
-	DLL_LIBS="$DLL_LIBS -lm -lpthread";
-	LIBS="$LIBS -lm -lpthread";
-	PADLL="libportaudio.so";
-	SHARED_FLAGS="-shared -fPIC";
-
-        OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o"
-esac
-CFLAGS="$CFLAGS $THREAD_CFLAGS"
-
-if test "$enable_cxx" = "yes"; then
-   AC_CONFIG_SUBDIRS([bindings/cpp])
-   ENABLE_CXX_TRUE=""
-   ENABLE_CXX_FALE="#"
-else
-   ENABLE_CXX_TRUE="#"
-   ENABLE_CXX_FALE=""
-fi
-AC_SUBST(ENABLE_CXX_TRUE)
-AC_SUBST(ENABLE_CXX_FALSE)
-
-AC_OUTPUT([Makefile portaudio-2.0.pc])
diff --git a/libs/portaudio/configure.gnu b/libs/portaudio/configure.gnu
deleted file mode 100644
index 4c80df6509..0000000000
--- a/libs/portaudio/configure.gnu
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
-$srcpath/configure "$@" --with-pic --disable-shared
-
diff --git a/libs/portaudio/doc/html/.empty b/libs/portaudio/doc/html/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/portaudio/doc/src/license.dox b/libs/portaudio/doc/src/license.dox
deleted file mode 100644
index 9344107473..0000000000
--- a/libs/portaudio/doc/src/license.dox
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @page License PortAudio License
-
-PortAudio Portable Real-Time Audio Library <br>
-Copyright (c) 1999-2006 Ross Bencina, Phil Burk
-
-
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-<br>
-
-The text above constitutes the entire PortAudio license; however, 
-the PortAudio community also makes the following non-binding requests:
-
-Any person wishing to distribute modifications to the Software is
-requested to send the modifications to the original developer so that
-they can be incorporated into the canonical version. It is also 
-requested that these non-binding requests be included along with the 
-license above.
-
-*/
\ No newline at end of file
diff --git a/libs/portaudio/doc/src/mainpage.dox b/libs/portaudio/doc/src/mainpage.dox
deleted file mode 100644
index b57e81c289..0000000000
--- a/libs/portaudio/doc/src/mainpage.dox
+++ /dev/null
@@ -1,44 +0,0 @@
-/* doxygen index page */
-/** @mainpage
-
-PortAudio is an open-source cross-platform ‘C’ library for audio input
-and output. It is designed to simplify the porting of audio applications
-between various platforms, and also to simplify the development of audio
-software in general by hiding the complexities of device interfacing.
-
-See the PortAudio website for further information http://www.portaudio.com
-
-This documentation pertains to PortAudio V19, API version 2.0 which is
-currently under development. API version 2.0 differs in a number of ways from
-previous versions, please consult the enhancement proposals for further details:
-http://www.portaudio.com/docs/proposals/index.html
-
-This documentation is under construction. Things you might be interested in
-include:
-
-- The PortAudio API 2.0, as documented in portaudio.h
-
-- Tutorials for the V19 API, currently housed on the PortAudio Wiki:
-http://www.portaudio.com/trac/wiki/TutorialDir/TutorialStart
-
-- Implementation status is documented here:
-http://www.portaudio.com/docs/proposals/status.html
-
-- @ref srcguide
-
-- The @ref License
-
-
-If you're interested in contributing to PortAudio, you may be interested in:
-
-- The doxygen generated <a href="todo.html">TODO List</a>. Feel free to pick an item off TODO list 
-and fix/implement it. You may want to enquire about status on the PortAudio mailing list first.
-
-- Our issue tracking system:
-http://www.portaudio.com/trac
-
-- Coding guidelines:
-http://www.portaudio.com/docs/proposals/014-StyleGuide.html
-
-
-*/
\ No newline at end of file
diff --git a/libs/portaudio/doc/src/srcguide.dox b/libs/portaudio/doc/src/srcguide.dox
deleted file mode 100644
index bf6205a2f6..0000000000
--- a/libs/portaudio/doc/src/srcguide.dox
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- define all of the file groups used to structure the documentation.
-*/
-
-/**
- @defgroup common_src Source code common to all implementations
-*/
-
-/**
- @defgroup win_src Source code common to all Windows implementations
-*/
-
-/**
- @defgroup unix_src Source code common to all Unix implementations
-*/
-
-/**
- @defgroup macosx_src Source code common to all Macintosh implementations
-*/
-
-/**
- @defgroup hostaip_src Source code for specific Host APIs
-*/
-
-/**
- @defgroup test_src Test and example programs
-*/
-
-/**
- @page srcguide A guide to the PortAudio sources.
-
- - \ref common_src
- - \ref win_src
- - \ref unix_src
- - \ref macosx_src
- - \ref hostaip_src
- - \ref test_src
-*/
\ No newline at end of file
diff --git a/libs/portaudio/doc/utils/checkfiledocs.py b/libs/portaudio/doc/utils/checkfiledocs.py
deleted file mode 100644
index 236bdb754c..0000000000
--- a/libs/portaudio/doc/utils/checkfiledocs.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import os
-import os.path
-import string
-
-paRootDirectory = '../../'
-paHtmlDocDirectory = os.path.join( paRootDirectory, "doc", "html" )
-
-##this script assumes that html doxygen documentation has been generated
-##
-##it then walks the entire portaudio source tree and check that
-##- every source file (.c,.h,.cpp) has a doxygen comment block containing
-##	- a @file directive
-##	- a @brief directive
-##	- a @ingroup directive
-##- it also checks that a corresponding html documentation file has been generated.
-##
-##This can be used as a first-level check to make sure the documentation is in order.
-##
-##The idea is to get a list of which files are missing doxygen documentation.
-
-
-# recurse from top and return a list of all with the given
-# extensions. ignore .svn directories. return absolute paths
-def recursiveFindFiles( top, extensions, includePaths ):
-    result = []
-    for (dirpath, dirnames, filenames) in os.walk(top):
-        if not '.svn' in dirpath:
-            for f in filenames:
-                if os.path.splitext(f)[1] in extensions:
-                    if includePaths:
-                        result.append( os.path.abspath( os.path.join( dirpath, f ) ) )
-                    else:
-                        result.append( f )
-    return result
-
-# generate the html file name that doxygen would use for
-# a particular source file. this is a brittle conversion
-# which i worked out by trial and error
-def doxygenHtmlDocFileName( sourceFile ):
-    return sourceFile.replace( '_', '__' ).replace( '.', '_8' ) + '.html'
-
-
-sourceFiles = recursiveFindFiles( paRootDirectory, [ '.c', '.h', '.cpp' ], True );
-docFiles = recursiveFindFiles( paHtmlDocDirectory, [ '.html' ], False );
-
-
-
-currentFile = ""
-
-def printError( f, message ):
-    global currentFile
-    if f != currentFile:
-        currentFile = f
-        print f, ":"
-    print "\t!", message
-
-
-for f in sourceFiles:
-    if not doxygenHtmlDocFileName( os.path.basename(f) ) in docFiles:
-        printError( f, "no doxygen generated doc page" )
-
-    s = file( f, 'rt' ).read()
-
-    if not '/**' in s:
-        printError( f, "no doxygen /** block" )  
-    
-    if not '@file' in s:
-        printError( f, "no doxygen @file tag" )
-
-    if not '@brief' in s:
-        printError( f, "no doxygen @brief tag" )
-        
-    if not '@ingroup' in s:
-        printError( f, "no doxygen @ingroup tag" )
-        
-
diff --git a/libs/portaudio/fixdir.bat b/libs/portaudio/fixdir.bat
deleted file mode 100755
index 92d6c7470d..0000000000
--- a/libs/portaudio/fixdir.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-rem Use Astyle to fix style in 'C' files
-cd %1%
-
-fixlines -p *.c
-fixlines -p *.cpp
-fixlines -p *.cc
-
-astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.c
-astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cpp
-astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cc
-del *.orig
-@rem convert line terminators to Unix style LFs
-fixlines -u *.c
-fixlines -u *.cpp
-fixlines -u *.cc
-fixlines -u *.h
-del *.bak
-
-cd ..\
diff --git a/libs/portaudio/fixfile.bat b/libs/portaudio/fixfile.bat
deleted file mode 100755
index 48f6fbc2f6..0000000000
--- a/libs/portaudio/fixfile.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-rem Use Astyle to fix style in a file
-fixlines -p %1%
-astyle --style=ansi -c -o --convert-tabs --indent-preprocessor %1%
-del %1%.orig
-@rem convert line terminators to Unix style LFs
-fixlines -u %1%
-del %1%.bak
diff --git a/libs/portaudio/include/pa_asio.h b/libs/portaudio/include/pa_asio.h
deleted file mode 100644
index 21f50ddacd..0000000000
--- a/libs/portaudio/include/pa_asio.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef PA_ASIO_H
-#define PA_ASIO_H
-/*
- * $Id: pa_asio.h 1083 2006-08-23 07:30:49Z rossb $
- * PortAudio Portable Real-Time Audio Library
- * ASIO specific extensions
- *
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-
-/** @file
- @brief ASIO-specific PortAudio API extension header file.
-*/
-
-
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-/** Retrieve legal latency settings for the specificed device, in samples.
-
- @param device The global index of the device about which the query is being made.
- @param minLatency A pointer to the location which will recieve the minimum latency value.
- @param maxLatency A pointer to the location which will recieve the maximum latency value.
- @param preferredLatency A pointer to the location which will recieve the preferred latency value.
- @param granularity A pointer to the location which will recieve the granularity. This value 
- determines which values between minLatency and maxLatency are available. ie the step size,
- if granularity is -1 then available latency settings are powers of two.
-
- @see ASIOGetBufferSize in the ASIO SDK.
-
- @todo This function should have a better name, any suggestions?
-*/
-PaError PaAsio_GetAvailableLatencyValues( PaDeviceIndex device,
-		long *minLatency, long *maxLatency, long *preferredLatency, long *granularity );
-
-        
-/** Display the ASIO control panel for the specified device.
-
-  @param device The global index of the device whose control panel is to be displayed.
-  @param systemSpecific On Windows, the calling application's main window handle,
-  on Macintosh this value should be zero.
-*/
-PaError PaAsio_ShowControlPanel( PaDeviceIndex device, void* systemSpecific );
-
-
-
-
-/** Retrieve a pointer to a string containing the name of the specified
- input channel. The string is valid until Pa_Terminate is called.
-
- The string will be no longer than 32 characters including the null terminator.
-*/
-PaError PaAsio_GetInputChannelName( PaDeviceIndex device, int channelIndex,
-        const char** channelName );
-
-        
-/** Retrieve a pointer to a string containing the name of the specified
- input channel. The string is valid until Pa_Terminate is called.
-
- The string will be no longer than 32 characters including the null terminator.
-*/
-PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex,
-        const char** channelName );
-
-
-#define paAsioUseChannelSelectors      (0x01)
-
-typedef struct PaAsioStreamInfo{
-    unsigned long size;             /**< sizeof(PaAsioStreamInfo) */
-    PaHostApiTypeId hostApiType;    /**< paASIO */
-    unsigned long version;          /**< 1 */
-
-    unsigned long flags;
-
-    /* Support for opening only specific channels of an ASIO device.
-        If the paAsioUseChannelSelectors flag is set, channelSelectors is a
-        pointer to an array of integers specifying the device channels to use.
-        When used, the length of the channelSelectors array must match the
-        corresponding channelCount parameter to Pa_OpenStream() otherwise a
-        crash may result.
-        The values in the selectors array must specify channels within the
-        range of supported channels for the device or paInvalidChannelCount will
-        result.
-    */
-    int *channelSelectors;
-}PaAsioStreamInfo;
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_ASIO_H */
diff --git a/libs/portaudio/include/pa_jack.h b/libs/portaudio/include/pa_jack.h
deleted file mode 100644
index c4eca1d6f0..0000000000
--- a/libs/portaudio/include/pa_jack.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef PA_JACK_H
-#define PA_JACK_H
-
-/*
- * $Id:
- * PortAudio Portable Real-Time Audio Library
- * JACK-specific extensions
- *
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- * JACK-specific PortAudio API extension header file.
- */
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Set the JACK client name.
- *
- * During Pa_Initialize, When PA JACK connects as a client of the JACK server, it requests a certain
- * name, which is for instance prepended to port names. By default this name is "PortAudio". The
- * JACK server may append a suffix to the client name, in order to avoid clashes among clients that
- * try to connect with the same name (e.g., different PA JACK clients).
- *
- * This function must be called before Pa_Initialize, otherwise it won't have any effect. Note that
- * the string is not copied, but instead referenced directly, so it must not be freed for as long as
- * PA might need it.
- * @sa PaJack_GetClientName
- */
-PaError PaJack_SetClientName( const char* name );
-
-/** Get the JACK client name used by PA JACK.
- *
- * The caller is responsible for freeing the returned pointer.
- */
-PaError PaJack_GetClientName(const char** clientName);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libs/portaudio/include/pa_linux_alsa.h b/libs/portaudio/include/pa_linux_alsa.h
deleted file mode 100644
index 7db633aeac..0000000000
--- a/libs/portaudio/include/pa_linux_alsa.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef PA_LINUX_ALSA_H
-#define PA_LINUX_ALSA_H
-
-/*
- * $Id: pa_linux_alsa.h 1236 2007-06-24 20:39:26Z aknudsen $
- * PortAudio Portable Real-Time Audio Library
- * ALSA-specific extensions
- *
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- * ALSA-specific PortAudio API extension header file.
- */
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct PaAlsaStreamInfo
-{
-    unsigned long size;
-    PaHostApiTypeId hostApiType;
-    unsigned long version;
-
-    const char *deviceString;
-}
-PaAlsaStreamInfo;
-
-/** Initialize host API specific structure, call this before setting relevant attributes. */
-void PaAlsa_InitializeStreamInfo( PaAlsaStreamInfo *info );
-
-/** Instruct whether to enable real-time priority when starting the audio thread.
- *
- * If this is turned on by the stream is started, the audio callback thread will be created
- * with the FIFO scheduling policy, which is suitable for realtime operation.
- **/
-void PaAlsa_EnableRealtimeScheduling( PaStream *s, int enable );
-
-#if 0
-void PaAlsa_EnableWatchdog( PaStream *s, int enable );
-#endif
-
-/** Get the ALSA-lib card index of this stream's input device. */
-PaError PaAlsa_GetStreamInputCard( PaStream *s, int *card );
-
-/** Get the ALSA-lib card index of this stream's output device. */
-PaError PaAlsa_GetStreamOutputCard( PaStream *s, int *card );
-
-/** Set the number of periods (buffer fragments) to configure devices with.
- *
- * By default the number of periods is 4, this is the lowest number of periods that works well on
- * the author's soundcard.
- * @param numPeriods The number of periods.
- */
-PaError PaAlsa_SetNumPeriods( int numPeriods );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libs/portaudio/include/pa_mac_core.h b/libs/portaudio/include/pa_mac_core.h
deleted file mode 100644
index 783e3bc974..0000000000
--- a/libs/portaudio/include/pa_mac_core.h
+++ /dev/null
@@ -1,171 +0,0 @@
-#ifndef PA_MAC_CORE_H
-#define PA_MAC_CORE_H
-/*
- * PortAudio Portable Real-Time Audio Library
- * Macintosh Core Audio specific extensions
- * portaudio.h should be included before this file.
- *
- * Copyright (c) 2005-2006 Bjorn Roche
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <AudioUnit/AudioUnit.h>
-//#include <AudioToolbox/AudioToolbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * A pointer to a paMacCoreStreamInfo may be passed as
- * the hostApiSpecificStreamInfo in the PaStreamParameters struct
- * when opening a stream or querying the format. Use NULL, for the
- * defaults. Note that for duplex streams, flags for input and output
- * should be the same or behaviour is undefined.
- */
-typedef struct
-{
-    unsigned long size;           /**size of whole structure including this header */
-    PaHostApiTypeId hostApiType;  /**host API for which this data is intended */
-    unsigned long version;        /**structure version */
-    unsigned long flags;          /* flags to modify behaviour */
-    SInt32 const * channelMap;    /* Channel map for HAL channel mapping , if not needed, use NULL;*/ 
-    unsigned long channelMapSize; /* Channel map size for HAL channel mapping , if not needed, use 0;*/ 
-} PaMacCoreStreamInfo;
-
-/*
- * Functions
- */
-
-
-/* Use this function to initialize a paMacCoreStreamInfo struct
- * using the requested flags. Note that channel mapping is turned
- * off after a call to this function.
- * @param data The datastructure to initialize
- * @param flags The flags to initialize the datastructure with.
-*/
-void PaMacCore_SetupStreamInfo( PaMacCoreStreamInfo *data, unsigned long flags );
-
-/* call this after pa_SetupMacCoreStreamInfo to use channel mapping as described in notes.txt.
- * @param data The stream info structure to assign a channel mapping to
- * @param channelMap The channel map array, as described in notes.txt. This array pointer will be used directly (ie the underlying data will not be copied), so the caller should not free the array until after the stream has been opened.
- * @param channelMapSize The size of the channel map array.
- */
-void PaMacCore_SetupChannelMap( PaMacCoreStreamInfo *data, const SInt32 * const channelMap, unsigned long channelMapSize );
-
-/*
- * Retrieve the AudioDeviceID of the input device assigned to an open stream
- *
- * @param s The stream to query.
- *
- * @return A valid AudioDeviceID, or NULL if an error occurred.
- */
-AudioDeviceID PaMacCore_GetStreamInputDevice( PaStream* s );
- 
-/*
- * Retrieve the AudioDeviceID of the output device assigned to an open stream
- *
- * @param s The stream to query.
- *
- * @return A valid AudioDeviceID, or NULL if an error occurred.
- */
-AudioDeviceID PaMacCore_GetStreamOutputDevice( PaStream* s );
-
-/*
- * Returns a statically allocated string with the device's name
- * for the given channel. NULL will be returned on failure.
- *
- * This function's implemenation is not complete!
- *
- * @param device The PortAudio device index.
- * @param channel The channel number who's name is requested.
- * @return a statically allocated string with the name of the device.
- *         Because this string is statically allocated, it must be
- *         coppied if it is to be saved and used by the user after
- *         another call to this function.
- *
- */
-const char *PaMacCore_GetChannelName( int device, int channelIndex, bool input );
-
-/*
- * Flags
- */
-
-/*
- * The following flags alter the behaviour of PA on the mac platform.
- * they can be ORed together. These should work both for opening and
- * checking a device.
- */
-
-/* Allows PortAudio to change things like the device's frame size,
- * which allows for much lower latency, but might disrupt the device
- * if other programs are using it, even when you are just Querying
- * the device. */
-#define paMacCoreChangeDeviceParameters (0x01)
-
-/* In combination with the above flag,
- * causes the stream opening to fail, unless the exact sample rates
- * are supported by the device. */
-#define paMacCoreFailIfConversionRequired (0x02)
-
-/* These flags set the SR conversion quality, if required. The wierd ordering
- * allows Maximum Quality to be the default.*/
-#define paMacCoreConversionQualityMin    (0x0100)
-#define paMacCoreConversionQualityMedium (0x0200)
-#define paMacCoreConversionQualityLow    (0x0300)
-#define paMacCoreConversionQualityHigh   (0x0400)
-#define paMacCoreConversionQualityMax    (0x0000)
-
-/*
- * Here are some "preset" combinations of flags (above) to get to some
- * common configurations. THIS IS OVERKILL, but if more flags are added
- * it won't be.
- */
-
-/*This is the default setting: do as much sample rate conversion as possible
- * and as little mucking with the device as possible. */
-#define paMacCorePlayNice                    (0x00)
-/*This setting is tuned for pro audio apps. It allows SR conversion on input
-  and output, but it tries to set the appropriate SR on the device.*/
-#define paMacCorePro                         (0x01)
-/*This is a setting to minimize CPU usage and still play nice.*/
-#define paMacCoreMinimizeCPUButPlayNice      (0x0100)
-/*This is a setting to minimize CPU usage, even if that means interrupting the device. */
-#define paMacCoreMinimizeCPU                 (0x0101)
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_MAC_CORE_H */
diff --git a/libs/portaudio/include/pa_win_ds.h b/libs/portaudio/include/pa_win_ds.h
deleted file mode 100644
index e658ee6004..0000000000
--- a/libs/portaudio/include/pa_win_ds.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef PA_WIN_DS_H
-#define PA_WIN_DS_H
-/*
- * $Id:  $
- * PortAudio Portable Real-Time Audio Library
- * DirectSound specific extensions
- *
- * Copyright (c) 1999-2007 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @brief DirectSound-specific PortAudio API extension header file.
-*/
-
-
-#include "portaudio.h"
-#include "pa_win_waveformat.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#define paWinDirectSoundUseLowLevelLatencyParameters            (0x01)
-#define paWinDirectSoundUseChannelMask                          (0x04)
-
-
-typedef struct PaWinDirectSoundStreamInfo{
-    unsigned long size;             /**< sizeof(PaWinDirectSoundStreamInfo) */
-    PaHostApiTypeId hostApiType;    /**< paDirectSound */
-    unsigned long version;          /**< 1 */
-
-    unsigned long flags;
-
-    /* low-level latency setting support
-        TODO ** NOT IMPLEMENTED **
-        These settings control the number and size of host buffers in order
-        to set latency. They will be used instead of the generic parameters
-        to Pa_OpenStream() if flags contains the paWinDirectSoundUseLowLevelLatencyParameters
-        flag.
-
-        If PaWinDirectSoundStreamInfo structures with paWinDirectSoundUseLowLevelLatencyParameters
-        are supplied for both input and output in a full duplex stream, then the
-        input and output framesPerBuffer must be the same, or the larger of the
-        two must be a multiple of the smaller, otherwise a
-        paIncompatibleHostApiSpecificStreamInfo error will be returned from
-        Pa_OpenStream().
-
-    unsigned long framesPerBuffer;
-    */
-
-    /*
-        support for WAVEFORMATEXTENSIBLE channel masks. If flags contains
-        paWinDirectSoundUseChannelMask this allows you to specify which speakers 
-        to address in a multichannel stream. Constants for channelMask
-        are specified in pa_win_waveformat.h
-
-    */
-    PaWinWaveFormatChannelMask channelMask;
-
-}PaWinDirectSoundStreamInfo;
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_WIN_DS_H */                                  
diff --git a/libs/portaudio/include/pa_win_waveformat.h b/libs/portaudio/include/pa_win_waveformat.h
deleted file mode 100644
index 46ce9cc316..0000000000
--- a/libs/portaudio/include/pa_win_waveformat.h
+++ /dev/null
@@ -1,180 +0,0 @@
-#ifndef PA_WIN_WAVEFORMAT_H
-#define PA_WIN_WAVEFORMAT_H
-
-/*
- * PortAudio Portable Real-Time Audio Library
- * Windows WAVEFORMAT* data structure utilities
- * portaudio.h should be included before this file.
- *
- * Copyright (c) 2007 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @brief Windows specific PortAudio API extension and utilities header file.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-	The following #defines for speaker channel masks are the same
-	as those in ksmedia.h, except with PAWIN_ prepended, KSAUDIO_ removed
-	in some cases, and casts to PaWinWaveFormatChannelMask added.
-*/
-
-typedef unsigned long PaWinWaveFormatChannelMask;
-
-/* Speaker Positions: */
-#define PAWIN_SPEAKER_FRONT_LEFT				((PaWinWaveFormatChannelMask)0x1)
-#define PAWIN_SPEAKER_FRONT_RIGHT				((PaWinWaveFormatChannelMask)0x2)
-#define PAWIN_SPEAKER_FRONT_CENTER				((PaWinWaveFormatChannelMask)0x4)
-#define PAWIN_SPEAKER_LOW_FREQUENCY				((PaWinWaveFormatChannelMask)0x8)
-#define PAWIN_SPEAKER_BACK_LEFT					((PaWinWaveFormatChannelMask)0x10)
-#define PAWIN_SPEAKER_BACK_RIGHT				((PaWinWaveFormatChannelMask)0x20)
-#define PAWIN_SPEAKER_FRONT_LEFT_OF_CENTER		((PaWinWaveFormatChannelMask)0x40)
-#define PAWIN_SPEAKER_FRONT_RIGHT_OF_CENTER		((PaWinWaveFormatChannelMask)0x80)
-#define PAWIN_SPEAKER_BACK_CENTER				((PaWinWaveFormatChannelMask)0x100)
-#define PAWIN_SPEAKER_SIDE_LEFT					((PaWinWaveFormatChannelMask)0x200)
-#define PAWIN_SPEAKER_SIDE_RIGHT				((PaWinWaveFormatChannelMask)0x400)
-#define PAWIN_SPEAKER_TOP_CENTER				((PaWinWaveFormatChannelMask)0x800)
-#define PAWIN_SPEAKER_TOP_FRONT_LEFT			((PaWinWaveFormatChannelMask)0x1000)
-#define PAWIN_SPEAKER_TOP_FRONT_CENTER			((PaWinWaveFormatChannelMask)0x2000)
-#define PAWIN_SPEAKER_TOP_FRONT_RIGHT			((PaWinWaveFormatChannelMask)0x4000)
-#define PAWIN_SPEAKER_TOP_BACK_LEFT				((PaWinWaveFormatChannelMask)0x8000)
-#define PAWIN_SPEAKER_TOP_BACK_CENTER			((PaWinWaveFormatChannelMask)0x10000)
-#define PAWIN_SPEAKER_TOP_BACK_RIGHT			((PaWinWaveFormatChannelMask)0x20000)
-
-/* Bit mask locations reserved for future use */
-#define PAWIN_SPEAKER_RESERVED					((PaWinWaveFormatChannelMask)0x7FFC0000)
-
-/* Used to specify that any possible permutation of speaker configurations */
-#define PAWIN_SPEAKER_ALL						((PaWinWaveFormatChannelMask)0x80000000)
-
-/* DirectSound Speaker Config */
-#define PAWIN_SPEAKER_DIRECTOUT					0
-#define PAWIN_SPEAKER_MONO						(PAWIN_SPEAKER_FRONT_CENTER)
-#define PAWIN_SPEAKER_STEREO					(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT)
-#define PAWIN_SPEAKER_QUAD						(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_BACK_LEFT  | PAWIN_SPEAKER_BACK_RIGHT)
-#define PAWIN_SPEAKER_SURROUND					(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_BACK_CENTER)
-#define PAWIN_SPEAKER_5POINT1					(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \
-												PAWIN_SPEAKER_BACK_LEFT  | PAWIN_SPEAKER_BACK_RIGHT)
-#define PAWIN_SPEAKER_7POINT1					(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \
-												PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT | \
-												PAWIN_SPEAKER_FRONT_LEFT_OF_CENTER | PAWIN_SPEAKER_FRONT_RIGHT_OF_CENTER)
-#define PAWIN_SPEAKER_5POINT1_SURROUND			(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \
-												PAWIN_SPEAKER_SIDE_LEFT  | PAWIN_SPEAKER_SIDE_RIGHT)
-#define PAWIN_SPEAKER_7POINT1_SURROUND			(PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_RIGHT | \
-												PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_LOW_FREQUENCY | \
-												PAWIN_SPEAKER_BACK_LEFT | PAWIN_SPEAKER_BACK_RIGHT | \
-												PAWIN_SPEAKER_SIDE_LEFT | PAWIN_SPEAKER_SIDE_RIGHT)
-/*
- According to the Microsoft documentation:
- The following are obsolete 5.1 and 7.1 settings (they lack side speakers).  Note this means
- that the default 5.1 and 7.1 settings (KSAUDIO_SPEAKER_5POINT1 and KSAUDIO_SPEAKER_7POINT1 are
- similarly obsolete but are unchanged for compatibility reasons).
-*/
-#define PAWIN_SPEAKER_5POINT1_BACK				PAWIN_SPEAKER_5POINT1
-#define PAWIN_SPEAKER_7POINT1_WIDE				PAWIN_SPEAKER_7POINT1
-
-/* DVD Speaker Positions */
-#define PAWIN_SPEAKER_GROUND_FRONT_LEFT			PAWIN_SPEAKER_FRONT_LEFT
-#define PAWIN_SPEAKER_GROUND_FRONT_CENTER		PAWIN_SPEAKER_FRONT_CENTER
-#define PAWIN_SPEAKER_GROUND_FRONT_RIGHT		PAWIN_SPEAKER_FRONT_RIGHT
-#define PAWIN_SPEAKER_GROUND_REAR_LEFT			PAWIN_SPEAKER_BACK_LEFT
-#define PAWIN_SPEAKER_GROUND_REAR_RIGHT			PAWIN_SPEAKER_BACK_RIGHT
-#define PAWIN_SPEAKER_TOP_MIDDLE				PAWIN_SPEAKER_TOP_CENTER
-#define PAWIN_SPEAKER_SUPER_WOOFER				PAWIN_SPEAKER_LOW_FREQUENCY
-
-
-/*
-	PaWinWaveFormat is defined here to provide compatibility with
-	compilation environments which don't have headers defining 
-	WAVEFORMATEXTENSIBLE (e.g. older versions of MSVC, Borland C++ etc.
-
-	The fields for WAVEFORMATEX and WAVEFORMATEXTENSIBLE are declared as an
-    unsigned char array here to avoid clients who include this file having 
-    a dependency on windows.h and mmsystem.h, and also to to avoid having
-    to write separate packing pragmas for each compiler.
-*/
-#define PAWIN_SIZEOF_WAVEFORMATEX   18
-#define PAWIN_SIZEOF_WAVEFORMATEXTENSIBLE (PAWIN_SIZEOF_WAVEFORMATEX + 22)
-
-typedef struct{
-    unsigned char fields[ PAWIN_SIZEOF_WAVEFORMATEXTENSIBLE ];
-    unsigned long extraLongForAlignment; /* ensure that compiler aligns struct to DWORD */ 
-} PaWinWaveFormat;
-
-/*
-    WAVEFORMATEXTENSIBLE fields:
-    
-    union  {
-	    WORD  wValidBitsPerSample;    
-	    WORD  wSamplesPerBlock;    
-	    WORD  wReserved;  
-    } Samples;
-    DWORD  dwChannelMask;  
-    GUID  SubFormat;
-*/
-
-#define PAWIN_INDEXOF_WVALIDBITSPERSAMPLE	(PAWIN_SIZEOF_WAVEFORMATEX+0)
-#define PAWIN_INDEXOF_DWCHANNELMASK			(PAWIN_SIZEOF_WAVEFORMATEX+2)
-#define PAWIN_INDEXOF_SUBFORMAT				(PAWIN_SIZEOF_WAVEFORMATEX+6)
-
-/*
-	Use the following two functions to initialize the waveformat structure.
-*/
-
-void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, 
-		int numChannels, PaSampleFormat sampleFormat, double sampleRate );
-
-
-void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, 
-		int numChannels, PaSampleFormat sampleFormat, double sampleRate,
-	    PaWinWaveFormatChannelMask channelMask );
-
-
-/* Map a channel count to a speaker channel mask */
-PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_WIN_WAVEFORMAT_H */
\ No newline at end of file
diff --git a/libs/portaudio/include/pa_win_wmme.h b/libs/portaudio/include/pa_win_wmme.h
deleted file mode 100644
index 2e61a52bf1..0000000000
--- a/libs/portaudio/include/pa_win_wmme.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef PA_WIN_WMME_H
-#define PA_WIN_WMME_H
-/*
- * $Id: pa_win_wmme.h 1247 2007-08-11 16:29:09Z rossb $
- * PortAudio Portable Real-Time Audio Library
- * MME specific extensions
- *
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @brief WMME-specific PortAudio API extension header file.
-*/
-
-
-#include "portaudio.h"
-#include "pa_win_waveformat.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#define paWinMmeUseLowLevelLatencyParameters            (0x01)
-#define paWinMmeUseMultipleDevices                      (0x02)  /* use mme specific multiple device feature */
-#define paWinMmeUseChannelMask                          (0x04)
-
-/* By default, the mme implementation drops the processing thread's priority
-    to THREAD_PRIORITY_NORMAL and sleeps the thread if the CPU load exceeds 100%
-    This flag disables any priority throttling. The processing thread will always
-    run at THREAD_PRIORITY_TIME_CRITICAL.
-*/
-#define paWinMmeDontThrottleOverloadedProcessingThread  (0x08)
-
-
-typedef struct PaWinMmeDeviceAndChannelCount{
-    PaDeviceIndex device;
-    int channelCount;
-}PaWinMmeDeviceAndChannelCount;
-
-
-typedef struct PaWinMmeStreamInfo{
-    unsigned long size;             /**< sizeof(PaWinMmeStreamInfo) */
-    PaHostApiTypeId hostApiType;    /**< paMME */
-    unsigned long version;          /**< 1 */
-
-    unsigned long flags;
-
-    /* low-level latency setting support
-        These settings control the number and size of host buffers in order
-        to set latency. They will be used instead of the generic parameters
-        to Pa_OpenStream() if flags contains the PaWinMmeUseLowLevelLatencyParameters
-        flag.
-
-        If PaWinMmeStreamInfo structures with PaWinMmeUseLowLevelLatencyParameters
-        are supplied for both input and output in a full duplex stream, then the
-        input and output framesPerBuffer must be the same, or the larger of the
-        two must be a multiple of the smaller, otherwise a
-        paIncompatibleHostApiSpecificStreamInfo error will be returned from
-        Pa_OpenStream().
-    */
-    unsigned long framesPerBuffer;
-    unsigned long bufferCount;  /* formerly numBuffers */ 
-
-    /* multiple devices per direction support
-        If flags contains the PaWinMmeUseMultipleDevices flag,
-        this functionality will be used, otherwise the device parameter to
-        Pa_OpenStream() will be used instead.
-        If devices are specified here, the corresponding device parameter
-        to Pa_OpenStream() should be set to paUseHostApiSpecificDeviceSpecification,
-        otherwise an paInvalidDevice error will result.
-        The total number of channels accross all specified devices
-        must agree with the corresponding channelCount parameter to
-        Pa_OpenStream() otherwise a paInvalidChannelCount error will result.
-    */
-    PaWinMmeDeviceAndChannelCount *devices;
-    unsigned long deviceCount;
-
-    /*
-        support for WAVEFORMATEXTENSIBLE channel masks. If flags contains
-        paWinMmeUseChannelMask this allows you to specify which speakers 
-        to address in a multichannel stream. Constants for channelMask
-        are specified in pa_win_waveformat.h
-
-    */
-    PaWinWaveFormatChannelMask channelMask;
-
-}PaWinMmeStreamInfo;
-
-
-/** Retrieve the number of wave in handles used by a PortAudio WinMME stream.
- Returns zero if the stream is output only.
-
- @return A non-negative value indicating the number of wave in handles
- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
-
- @see PaWinMME_GetStreamInputHandle
-*/
-int PaWinMME_GetStreamInputHandleCount( PaStream* stream );
-
-
-/** Retrieve a wave in handle used by a PortAudio WinMME stream.
-
- @param stream The stream to query.
- @param handleIndex The zero based index of the wave in handle to retrieve. This
-    should be in the range [0, PaWinMME_GetStreamInputHandleCount(stream)-1].
-
- @return A valid wave in handle, or NULL if an error occurred.
-
- @see PaWinMME_GetStreamInputHandle
-*/
-HWAVEIN PaWinMME_GetStreamInputHandle( PaStream* stream, int handleIndex );
-
-
-/** Retrieve the number of wave out handles used by a PortAudio WinMME stream.
- Returns zero if the stream is input only.
- 
- @return A non-negative value indicating the number of wave out handles
- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
-
- @see PaWinMME_GetStreamOutputHandle
-*/
-int PaWinMME_GetStreamOutputHandleCount( PaStream* stream );
-
-
-/** Retrieve a wave out handle used by a PortAudio WinMME stream.
-
- @param stream The stream to query.
- @param handleIndex The zero based index of the wave out handle to retrieve.
-    This should be in the range [0, PaWinMME_GetStreamOutputHandleCount(stream)-1].
-
- @return A valid wave out handle, or NULL if an error occurred.
-
- @see PaWinMME_GetStreamOutputHandleCount
-*/
-HWAVEOUT PaWinMME_GetStreamOutputHandle( PaStream* stream, int handleIndex );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_WIN_WMME_H */                                  
diff --git a/libs/portaudio/include/portaudio.h b/libs/portaudio/include/portaudio.h
deleted file mode 100644
index d30a59913f..0000000000
--- a/libs/portaudio/include/portaudio.h
+++ /dev/null
@@ -1,1133 +0,0 @@
-#ifndef PORTAUDIO_H
-#define PORTAUDIO_H
-/*
- * $Id: portaudio.h 1247 2007-08-11 16:29:09Z rossb $
- * PortAudio Portable Real-Time Audio Library
- * PortAudio API Header File
- * Latest version available at: http://www.portaudio.com/
- *
- * Copyright (c) 1999-2002 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @brief The PortAudio API.
-*/
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
- 
-/** Retrieve the release number of the currently running PortAudio build,
- eg 1900.
-*/
-int Pa_GetVersion( void );
-
-
-/** Retrieve a textual description of the current PortAudio build,
- eg "PortAudio V19-devel 13 October 2002".
-*/
-const char* Pa_GetVersionText( void );
-
-
-/** Error codes returned by PortAudio functions.
- Note that with the exception of paNoError, all PaErrorCodes are negative.
-*/
-
-typedef int PaError;
-typedef enum PaErrorCode
-{
-    paNoError = 0,
-
-    paNotInitialized = -10000,
-    paUnanticipatedHostError,
-    paInvalidChannelCount,
-    paInvalidSampleRate,
-    paInvalidDevice,
-    paInvalidFlag,
-    paSampleFormatNotSupported,
-    paBadIODeviceCombination,
-    paInsufficientMemory,
-    paBufferTooBig,
-    paBufferTooSmall,
-    paNullCallback,
-    paBadStreamPtr,
-    paTimedOut,
-    paInternalError,
-    paDeviceUnavailable,
-    paIncompatibleHostApiSpecificStreamInfo,
-    paStreamIsStopped,
-    paStreamIsNotStopped,
-    paInputOverflowed,
-    paOutputUnderflowed,
-    paHostApiNotFound,
-    paInvalidHostApi,
-    paCanNotReadFromACallbackStream,      /**< @todo review error code name */
-    paCanNotWriteToACallbackStream,       /**< @todo review error code name */
-    paCanNotReadFromAnOutputOnlyStream,   /**< @todo review error code name */
-    paCanNotWriteToAnInputOnlyStream,     /**< @todo review error code name */
-    paIncompatibleStreamHostApi,
-    paBadBufferPtr
-} PaErrorCode;
-
-
-/** Translate the supplied PortAudio error code into a human readable
- message.
-*/
-const char *Pa_GetErrorText( PaError errorCode );
-
-
-/** Library initialization function - call this before using PortAudio.
- This function initialises internal data structures and prepares underlying
- host APIs for use.  With the exception of Pa_GetVersion(), Pa_GetVersionText(),
- and Pa_GetErrorText(), this function MUST be called before using any other
- PortAudio API functions.
-
- If Pa_Initialize() is called multiple times, each successful 
- call must be matched with a corresponding call to Pa_Terminate(). 
- Pairs of calls to Pa_Initialize()/Pa_Terminate() may overlap, and are not 
- required to be fully nested.
-
- Note that if Pa_Initialize() returns an error code, Pa_Terminate() should
- NOT be called.
-
- @return paNoError if successful, otherwise an error code indicating the cause
- of failure.
-
- @see Pa_Terminate
-*/
-PaError Pa_Initialize( void );
-
-
-/** Library termination function - call this when finished using PortAudio.
- This function deallocates all resources allocated by PortAudio since it was
- initializied by a call to Pa_Initialize(). In cases where Pa_Initialise() has
- been called multiple times, each call must be matched with a corresponding call
- to Pa_Terminate(). The final matching call to Pa_Terminate() will automatically
- close any PortAudio streams that are still open.
-
- Pa_Terminate() MUST be called before exiting a program which uses PortAudio.
- Failure to do so may result in serious resource leaks, such as audio devices
- not being available until the next reboot.
-
- @return paNoError if successful, otherwise an error code indicating the cause
- of failure.
- 
- @see Pa_Initialize
-*/
-PaError Pa_Terminate( void );
-
-
-
-/** The type used to refer to audio devices. Values of this type usually
- range from 0 to (Pa_GetDeviceCount()-1), and may also take on the PaNoDevice
- and paUseHostApiSpecificDeviceSpecification values.
-
- @see Pa_GetDeviceCount, paNoDevice, paUseHostApiSpecificDeviceSpecification
-*/
-typedef int PaDeviceIndex;
-
-
-/** A special PaDeviceIndex value indicating that no device is available,
- or should be used.
-
- @see PaDeviceIndex
-*/
-#define paNoDevice ((PaDeviceIndex)-1)
-
-
-/** A special PaDeviceIndex value indicating that the device(s) to be used
- are specified in the host api specific stream info structure.
-
- @see PaDeviceIndex
-*/
-#define paUseHostApiSpecificDeviceSpecification ((PaDeviceIndex)-2)
-
-
-/* Host API enumeration mechanism */
-
-/** The type used to enumerate to host APIs at runtime. Values of this type
- range from 0 to (Pa_GetHostApiCount()-1).
-
- @see Pa_GetHostApiCount
-*/
-typedef int PaHostApiIndex;
-
-
-/** Retrieve the number of available host APIs. Even if a host API is
- available it may have no devices available.
-
- @return A non-negative value indicating the number of available host APIs
- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
-
- @see PaHostApiIndex
-*/
-PaHostApiIndex Pa_GetHostApiCount( void );
-
-
-/** Retrieve the index of the default host API. The default host API will be
- the lowest common denominator host API on the current platform and is
- unlikely to provide the best performance.
-
- @return A non-negative value ranging from 0 to (Pa_GetHostApiCount()-1)
- indicating the default host API index or, a PaErrorCode (which are always
- negative) if PortAudio is not initialized or an error is encountered.
-*/
-PaHostApiIndex Pa_GetDefaultHostApi( void );
-
-
-/** Unchanging unique identifiers for each supported host API. This type
- is used in the PaHostApiInfo structure. The values are guaranteed to be
- unique and to never change, thus allowing code to be written that
- conditionally uses host API specific extensions.
-
- New type ids will be allocated when support for a host API reaches
- "public alpha" status, prior to that developers should use the
- paInDevelopment type id.
-
- @see PaHostApiInfo
-*/
-typedef enum PaHostApiTypeId
-{
-    paInDevelopment=0, /* use while developing support for a new host API */
-    paDirectSound=1,
-    paMME=2,
-    paASIO=3,
-    paSoundManager=4,
-    paCoreAudio=5,
-    paOSS=7,
-    paALSA=8,
-    paAL=9,
-    paBeOS=10,
-    paWDMKS=11,
-    paJACK=12,
-    paWASAPI=13,
-    paAudioScienceHPI=14
-} PaHostApiTypeId;
-
-
-/** A structure containing information about a particular host API. */
-
-typedef struct PaHostApiInfo
-{
-    /** this is struct version 1 */
-    int structVersion;
-    /** The well known unique identifier of this host API @see PaHostApiTypeId */
-    PaHostApiTypeId type;
-    /** A textual description of the host API for display on user interfaces. */
-    const char *name;
-
-    /**  The number of devices belonging to this host API. This field may be
-     used in conjunction with Pa_HostApiDeviceIndexToDeviceIndex() to enumerate
-     all devices for this host API.
-     @see Pa_HostApiDeviceIndexToDeviceIndex
-    */
-    int deviceCount;
-
-    /** The default input device for this host API. The value will be a
-     device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice
-     if no default input device is available.
-    */
-    PaDeviceIndex defaultInputDevice;
-
-    /** The default output device for this host API. The value will be a
-     device index ranging from 0 to (Pa_GetDeviceCount()-1), or paNoDevice
-     if no default output device is available.
-    */
-    PaDeviceIndex defaultOutputDevice;
-    
-} PaHostApiInfo;
-
-
-/** Retrieve a pointer to a structure containing information about a specific
- host Api.
-
- @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1)
-
- @return A pointer to an immutable PaHostApiInfo structure describing
- a specific host API. If the hostApi parameter is out of range or an error
- is encountered, the function returns NULL.
-
- The returned structure is owned by the PortAudio implementation and must not
- be manipulated or freed. The pointer is only guaranteed to be valid between
- calls to Pa_Initialize() and Pa_Terminate().
-*/
-const PaHostApiInfo * Pa_GetHostApiInfo( PaHostApiIndex hostApi );
-
-
-/** Convert a static host API unique identifier, into a runtime
- host API index.
-
- @param type A unique host API identifier belonging to the PaHostApiTypeId
- enumeration.
-
- @return A valid PaHostApiIndex ranging from 0 to (Pa_GetHostApiCount()-1) or,
- a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
- 
- The paHostApiNotFound error code indicates that the host API specified by the
- type parameter is not available.
-
- @see PaHostApiTypeId
-*/
-PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type );
-
-
-/** Convert a host-API-specific device index to standard PortAudio device index.
- This function may be used in conjunction with the deviceCount field of
- PaHostApiInfo to enumerate all devices for the specified host API.
-
- @param hostApi A valid host API index ranging from 0 to (Pa_GetHostApiCount()-1)
-
- @param hostApiDeviceIndex A valid per-host device index in the range
- 0 to (Pa_GetHostApiInfo(hostApi)->deviceCount-1)
-
- @return A non-negative PaDeviceIndex ranging from 0 to (Pa_GetDeviceCount()-1)
- or, a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
-
- A paInvalidHostApi error code indicates that the host API index specified by
- the hostApi parameter is out of range.
-
- A paInvalidDevice error code indicates that the hostApiDeviceIndex parameter
- is out of range.
- 
- @see PaHostApiInfo
-*/
-PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi,
-        int hostApiDeviceIndex );
-
-
-
-/** Structure used to return information about a host error condition.
-*/
-typedef struct PaHostErrorInfo{
-    PaHostApiTypeId hostApiType;    /**< the host API which returned the error code */
-    long errorCode;                 /**< the error code returned */
-    const char *errorText;          /**< a textual description of the error if available, otherwise a zero-length string */
-}PaHostErrorInfo;
-
-
-/** Return information about the last host error encountered. The error
- information returned by Pa_GetLastHostErrorInfo() will never be modified
- asyncronously by errors occurring in other PortAudio owned threads
- (such as the thread that manages the stream callback.)
-
- This function is provided as a last resort, primarily to enhance debugging
- by providing clients with access to all available error information.
-
- @return A pointer to an immutable structure constaining information about
- the host error. The values in this structure will only be valid if a
- PortAudio function has previously returned the paUnanticipatedHostError
- error code.
-*/
-const PaHostErrorInfo* Pa_GetLastHostErrorInfo( void );
-
-
-
-/* Device enumeration and capabilities */
-
-/** Retrieve the number of available devices. The number of available devices
- may be zero.
-
- @return A non-negative value indicating the number of available devices or,
- a PaErrorCode (which are always negative) if PortAudio is not initialized
- or an error is encountered.
-*/
-PaDeviceIndex Pa_GetDeviceCount( void );
-
-
-/** Retrieve the index of the default input device. The result can be
- used in the inputDevice parameter to Pa_OpenStream().
-
- @return The default input device index for the default host API, or paNoDevice
- if no default input device is available or an error was encountered.
-*/
-PaDeviceIndex Pa_GetDefaultInputDevice( void );
-
-
-/** Retrieve the index of the default output device. The result can be
- used in the outputDevice parameter to Pa_OpenStream().
-
- @return The default output device index for the defualt host API, or paNoDevice
- if no default output device is available or an error was encountered.
-
- @note
- On the PC, the user can specify a default device by
- setting an environment variable. For example, to use device #1.
-<pre>
- set PA_RECOMMENDED_OUTPUT_DEVICE=1
-</pre>
- The user should first determine the available device ids by using
- the supplied application "pa_devs".
-*/
-PaDeviceIndex Pa_GetDefaultOutputDevice( void );
-
-
-/** The type used to represent monotonic time in seconds that can be used
- for syncronisation. The type is used for the outTime argument to the
- PaStreamCallback and as the result of Pa_GetStreamTime().
-     
- @see PaStreamCallback, Pa_GetStreamTime
-*/
-typedef double PaTime;
-
-
-/** A type used to specify one or more sample formats. Each value indicates
- a possible format for sound data passed to and from the stream callback,
- Pa_ReadStream and Pa_WriteStream.
-
- The standard formats paFloat32, paInt16, paInt32, paInt24, paInt8
- and aUInt8 are usually implemented by all implementations.
-
- The floating point representation (paFloat32) uses +1.0 and -1.0 as the
- maximum and minimum respectively.
-
- paUInt8 is an unsigned 8 bit format where 128 is considered "ground"
-
- The paNonInterleaved flag indicates that a multichannel buffer is passed
- as a set of non-interleaved pointers.
-
- @see Pa_OpenStream, Pa_OpenDefaultStream, PaDeviceInfo
- @see paFloat32, paInt16, paInt32, paInt24, paInt8
- @see paUInt8, paCustomFormat, paNonInterleaved
-*/
-typedef unsigned long PaSampleFormat;
-
-
-#define paFloat32        ((PaSampleFormat) 0x00000001) /**< @see PaSampleFormat */
-#define paInt32          ((PaSampleFormat) 0x00000002) /**< @see PaSampleFormat */
-#define paInt24          ((PaSampleFormat) 0x00000004) /**< Packed 24 bit format. @see PaSampleFormat */
-#define paInt16          ((PaSampleFormat) 0x00000008) /**< @see PaSampleFormat */
-#define paInt8           ((PaSampleFormat) 0x00000010) /**< @see PaSampleFormat */
-#define paUInt8          ((PaSampleFormat) 0x00000020) /**< @see PaSampleFormat */
-#define paCustomFormat   ((PaSampleFormat) 0x00010000)/**< @see PaSampleFormat */
-
-#define paNonInterleaved ((PaSampleFormat) 0x80000000)
-
-/** A structure providing information and capabilities of PortAudio devices.
- Devices may support input, output or both input and output.
-*/
-typedef struct PaDeviceInfo
-{
-    int structVersion;  /* this is struct version 2 */
-    const char *name;
-    PaHostApiIndex hostApi; /* note this is a host API index, not a type id*/
-    
-    int maxInputChannels;
-    int maxOutputChannels;
-
-    /* Default latency values for interactive performance. */
-    PaTime defaultLowInputLatency;
-    PaTime defaultLowOutputLatency;
-    /* Default latency values for robust non-interactive applications (eg. playing sound files). */
-    PaTime defaultHighInputLatency;
-    PaTime defaultHighOutputLatency;
-
-    double defaultSampleRate;
-} PaDeviceInfo;
-
-
-/** Retrieve a pointer to a PaDeviceInfo structure containing information
- about the specified device.
- @return A pointer to an immutable PaDeviceInfo structure. If the device
- parameter is out of range the function returns NULL.
-
- @param device A valid device index in the range 0 to (Pa_GetDeviceCount()-1)
-
- @note PortAudio manages the memory referenced by the returned pointer,
- the client must not manipulate or free the memory. The pointer is only
- guaranteed to be valid between calls to Pa_Initialize() and Pa_Terminate().
-
- @see PaDeviceInfo, PaDeviceIndex
-*/
-const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device );
-
-
-/** Parameters for one direction (input or output) of a stream.
-*/
-typedef struct PaStreamParameters
-{
-    /** A valid device index in the range 0 to (Pa_GetDeviceCount()-1)
-     specifying the device to be used or the special constant
-     paUseHostApiSpecificDeviceSpecification which indicates that the actual
-     device(s) to use are specified in hostApiSpecificStreamInfo.
-     This field must not be set to paNoDevice.
-    */
-    PaDeviceIndex device;
-    
-    /** The number of channels of sound to be delivered to the
-     stream callback or accessed by Pa_ReadStream() or Pa_WriteStream().
-     It can range from 1 to the value of maxInputChannels in the
-     PaDeviceInfo record for the device specified by the device parameter.
-    */
-    int channelCount;
-
-    /** The sample format of the buffer provided to the stream callback,
-     a_ReadStream() or Pa_WriteStream(). It may be any of the formats described
-     by the PaSampleFormat enumeration.
-    */
-    PaSampleFormat sampleFormat;
-
-    /** The desired latency in seconds. Where practical, implementations should
-     configure their latency based on these parameters, otherwise they may
-     choose the closest viable latency instead. Unless the suggested latency
-     is greater than the absolute upper limit for the device implementations
-     should round the suggestedLatency up to the next practial value - ie to
-     provide an equal or higher latency than suggestedLatency wherever possibe.
-     Actual latency values for an open stream may be retrieved using the
-     inputLatency and outputLatency fields of the PaStreamInfo structure
-     returned by Pa_GetStreamInfo().
-     @see default*Latency in PaDeviceInfo, *Latency in PaStreamInfo
-    */
-    PaTime suggestedLatency;
-
-    /** An optional pointer to a host api specific data structure
-     containing additional information for device setup and/or stream processing.
-     hostApiSpecificStreamInfo is never required for correct operation,
-     if not used it should be set to NULL.
-    */
-    void *hostApiSpecificStreamInfo;
-
-} PaStreamParameters;
-
-
-/** Return code for Pa_IsFormatSupported indicating success. */
-#define paFormatIsSupported (0)
-
-/** Determine whether it would be possible to open a stream with the specified
- parameters.
-
- @param inputParameters A structure that describes the input parameters used to
- open a stream. The suggestedLatency field is ignored. See PaStreamParameters
- for a description of these parameters. inputParameters must be NULL for
- output-only streams.
-
- @param outputParameters A structure that describes the output parameters used
- to open a stream. The suggestedLatency field is ignored. See PaStreamParameters
- for a description of these parameters. outputParameters must be NULL for
- input-only streams.
-
- @param sampleRate The required sampleRate. For full-duplex streams it is the
- sample rate for both input and output
-
- @return Returns 0 if the format is supported, and an error code indicating why
- the format is not supported otherwise. The constant paFormatIsSupported is
- provided to compare with the return value for success.
-
- @see paFormatIsSupported, PaStreamParameters
-*/
-PaError Pa_IsFormatSupported( const PaStreamParameters *inputParameters,
-                              const PaStreamParameters *outputParameters,
-                              double sampleRate );
-
-
-
-/* Streaming types and functions */
-
-
-/**
- A single PaStream can provide multiple channels of real-time
- streaming audio input and output to a client application. A stream
- provides access to audio hardware represented by one or more
- PaDevices. Depending on the underlying Host API, it may be possible 
- to open multiple streams using the same device, however this behavior 
- is implementation defined. Portable applications should assume that 
- a PaDevice may be simultaneously used by at most one PaStream.
-
- Pointers to PaStream objects are passed between PortAudio functions that
- operate on streams.
-
- @see Pa_OpenStream, Pa_OpenDefaultStream, Pa_OpenDefaultStream, Pa_CloseStream,
- Pa_StartStream, Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive,
- Pa_GetStreamTime, Pa_GetStreamCpuLoad
-
-*/
-typedef void PaStream;
-
-
-/** Can be passed as the framesPerBuffer parameter to Pa_OpenStream()
- or Pa_OpenDefaultStream() to indicate that the stream callback will
- accept buffers of any size.
-*/
-#define paFramesPerBufferUnspecified  (0)
-
-
-/** Flags used to control the behavior of a stream. They are passed as
- parameters to Pa_OpenStream or Pa_OpenDefaultStream. Multiple flags may be
- ORed together.
-
- @see Pa_OpenStream, Pa_OpenDefaultStream
- @see paNoFlag, paClipOff, paDitherOff, paNeverDropInput,
-  paPrimeOutputBuffersUsingStreamCallback, paPlatformSpecificFlags
-*/
-typedef unsigned long PaStreamFlags;
-
-/** @see PaStreamFlags */
-#define   paNoFlag          ((PaStreamFlags) 0)
-
-/** Disable default clipping of out of range samples.
- @see PaStreamFlags
-*/
-#define   paClipOff         ((PaStreamFlags) 0x00000001)
-
-/** Disable default dithering.
- @see PaStreamFlags
-*/
-#define   paDitherOff       ((PaStreamFlags) 0x00000002)
-
-/** Flag requests that where possible a full duplex stream will not discard
- overflowed input samples without calling the stream callback. This flag is
- only valid for full duplex callback streams and only when used in combination
- with the paFramesPerBufferUnspecified (0) framesPerBuffer parameter. Using
- this flag incorrectly results in a paInvalidFlag error being returned from
- Pa_OpenStream and Pa_OpenDefaultStream.
-
- @see PaStreamFlags, paFramesPerBufferUnspecified
-*/
-#define   paNeverDropInput  ((PaStreamFlags) 0x00000004)
-
-/** Call the stream callback to fill initial output buffers, rather than the
- default behavior of priming the buffers with zeros (silence). This flag has
- no effect for input-only and blocking read/write streams.
- 
- @see PaStreamFlags
-*/
-#define   paPrimeOutputBuffersUsingStreamCallback ((PaStreamFlags) 0x00000008)
-
-/** A mask specifying the platform specific bits.
- @see PaStreamFlags
-*/
-#define   paPlatformSpecificFlags ((PaStreamFlags)0xFFFF0000)
-
-/**
- Timing information for the buffers passed to the stream callback.
-*/
-typedef struct PaStreamCallbackTimeInfo{
-    PaTime inputBufferAdcTime;
-    PaTime currentTime;
-    PaTime outputBufferDacTime;
-} PaStreamCallbackTimeInfo;
-
-
-/**
- Flag bit constants for the statusFlags to PaStreamCallback.
-
- @see paInputUnderflow, paInputOverflow, paOutputUnderflow, paOutputOverflow,
- paPrimingOutput
-*/
-typedef unsigned long PaStreamCallbackFlags;
-
-/** In a stream opened with paFramesPerBufferUnspecified, indicates that
- input data is all silence (zeros) because no real data is available. In a
- stream opened without paFramesPerBufferUnspecified, it indicates that one or
- more zero samples have been inserted into the input buffer to compensate
- for an input underflow.
- @see PaStreamCallbackFlags
-*/
-#define paInputUnderflow   ((PaStreamCallbackFlags) 0x00000001)
-
-/** In a stream opened with paFramesPerBufferUnspecified, indicates that data
- prior to the first sample of the input buffer was discarded due to an
- overflow, possibly because the stream callback is using too much CPU time.
- Otherwise indicates that data prior to one or more samples in the
- input buffer was discarded.
- @see PaStreamCallbackFlags
-*/
-#define paInputOverflow    ((PaStreamCallbackFlags) 0x00000002)
-
-/** Indicates that output data (or a gap) was inserted, possibly because the
- stream callback is using too much CPU time.
- @see PaStreamCallbackFlags
-*/
-#define paOutputUnderflow  ((PaStreamCallbackFlags) 0x00000004)
-
-/** Indicates that output data will be discarded because no room is available.
- @see PaStreamCallbackFlags
-*/
-#define paOutputOverflow   ((PaStreamCallbackFlags) 0x00000008)
-
-/** Some of all of the output data will be used to prime the stream, input
- data may be zero.
- @see PaStreamCallbackFlags
-*/
-#define paPrimingOutput    ((PaStreamCallbackFlags) 0x00000010)
-
-/**
- Allowable return values for the PaStreamCallback.
- @see PaStreamCallback
-*/
-typedef enum PaStreamCallbackResult
-{
-    paContinue=0,
-    paComplete=1,
-    paAbort=2
-} PaStreamCallbackResult;
-
-
-/**
- Functions of type PaStreamCallback are implemented by PortAudio clients.
- They consume, process or generate audio in response to requests from an
- active PortAudio stream.
-     
- @param input and @param output are arrays of interleaved samples,
- the format, packing and number of channels used by the buffers are
- determined by parameters to Pa_OpenStream().
-     
- @param frameCount The number of sample frames to be processed by
- the stream callback.
-
- @param timeInfo The time in seconds when the first sample of the input
- buffer was received at the audio input, the time in seconds when the first
- sample of the output buffer will begin being played at the audio output, and
- the time in seconds when the stream callback was called.
- See also Pa_GetStreamTime()
-
- @param statusFlags Flags indicating whether input and/or output buffers
- have been inserted or will be dropped to overcome underflow or overflow
- conditions.
-
- @param userData The value of a user supplied pointer passed to
- Pa_OpenStream() intended for storing synthesis data etc.
-
- @return
- The stream callback should return one of the values in the
- PaStreamCallbackResult enumeration. To ensure that the callback continues
- to be called, it should return paContinue (0). Either paComplete or paAbort
- can be returned to finish stream processing, after either of these values is
- returned the callback will not be called again. If paAbort is returned the
- stream will finish as soon as possible. If paComplete is returned, the stream
- will continue until all buffers generated by the callback have been played.
- This may be useful in applications such as soundfile players where a specific
- duration of output is required. However, it is not necessary to utilise this
- mechanism as Pa_StopStream(), Pa_AbortStream() or Pa_CloseStream() can also
- be used to stop the stream. The callback must always fill the entire output
- buffer irrespective of its return value.
-
- @see Pa_OpenStream, Pa_OpenDefaultStream
-
- @note With the exception of Pa_GetStreamCpuLoad() it is not permissable to call
- PortAudio API functions from within the stream callback.
-*/
-typedef int PaStreamCallback(
-    const void *input, void *output,
-    unsigned long frameCount,
-    const PaStreamCallbackTimeInfo* timeInfo,
-    PaStreamCallbackFlags statusFlags,
-    void *userData );
-
-
-/** Opens a stream for either input, output or both.
-     
- @param stream The address of a PaStream pointer which will receive
- a pointer to the newly opened stream.
-     
- @param inputParameters A structure that describes the input parameters used by
- the opened stream. See PaStreamParameters for a description of these parameters.
- inputParameters must be NULL for output-only streams.
-
- @param outputParameters A structure that describes the output parameters used by
- the opened stream. See PaStreamParameters for a description of these parameters.
- outputParameters must be NULL for input-only streams.
- 
- @param sampleRate The desired sampleRate. For full-duplex streams it is the
- sample rate for both input and output
-     
- @param framesPerBuffer The number of frames passed to the stream callback
- function, or the preferred block granularity for a blocking read/write stream.
- The special value paFramesPerBufferUnspecified (0) may be used to request that
- the stream callback will recieve an optimal (and possibly varying) number of
- frames based on host requirements and the requested latency settings.
- Note: With some host APIs, the use of non-zero framesPerBuffer for a callback
- stream may introduce an additional layer of buffering which could introduce
- additional latency. PortAudio guarantees that the additional latency
- will be kept to the theoretical minimum however, it is strongly recommended
- that a non-zero framesPerBuffer value only be used when your algorithm
- requires a fixed number of frames per stream callback.
- 
- @param streamFlags Flags which modify the behaviour of the streaming process.
- This parameter may contain a combination of flags ORed together. Some flags may
- only be relevant to certain buffer formats.
-     
- @param streamCallback A pointer to a client supplied function that is responsible
- for processing and filling input and output buffers. If this parameter is NULL
- the stream will be opened in 'blocking read/write' mode. In blocking mode,
- the client can receive sample data using Pa_ReadStream and write sample data
- using Pa_WriteStream, the number of samples that may be read or written
- without blocking is returned by Pa_GetStreamReadAvailable and
- Pa_GetStreamWriteAvailable respectively.
-
- @param userData A client supplied pointer which is passed to the stream callback
- function. It could for example, contain a pointer to instance data necessary
- for processing the audio buffers. This parameter is ignored if streamCallback
- is NULL.
-     
- @return
- Upon success Pa_OpenStream() returns paNoError and places a pointer to a
- valid PaStream in the stream argument. The stream is inactive (stopped).
- If a call to Pa_OpenStream() fails, a non-zero error code is returned (see
- PaError for possible error codes) and the value of stream is invalid.
-
- @see PaStreamParameters, PaStreamCallback, Pa_ReadStream, Pa_WriteStream,
- Pa_GetStreamReadAvailable, Pa_GetStreamWriteAvailable
-*/
-PaError Pa_OpenStream( PaStream** stream,
-                       const PaStreamParameters *inputParameters,
-                       const PaStreamParameters *outputParameters,
-                       double sampleRate,
-                       unsigned long framesPerBuffer,
-                       PaStreamFlags streamFlags,
-                       PaStreamCallback *streamCallback,
-                       void *userData );
-
-
-/** A simplified version of Pa_OpenStream() that opens the default input
- and/or output devices.
-
- @param stream The address of a PaStream pointer which will receive
- a pointer to the newly opened stream.
- 
- @param numInputChannels  The number of channels of sound that will be supplied
- to the stream callback or returned by Pa_ReadStream. It can range from 1 to
- the value of maxInputChannels in the PaDeviceInfo record for the default input
- device. If 0 the stream is opened as an output-only stream.
-
- @param numOutputChannels The number of channels of sound to be delivered to the
- stream callback or passed to Pa_WriteStream. It can range from 1 to the value
- of maxOutputChannels in the PaDeviceInfo record for the default output dvice.
- If 0 the stream is opened as an output-only stream.
-
- @param sampleFormat The sample format of both the input and output buffers
- provided to the callback or passed to and from Pa_ReadStream and Pa_WriteStream.
- sampleFormat may be any of the formats described by the PaSampleFormat
- enumeration.
- 
- @param sampleRate Same as Pa_OpenStream parameter of the same name.
- @param framesPerBuffer Same as Pa_OpenStream parameter of the same name.
- @param streamCallback Same as Pa_OpenStream parameter of the same name.
- @param userData Same as Pa_OpenStream parameter of the same name.
-
- @return As for Pa_OpenStream
-
- @see Pa_OpenStream, PaStreamCallback
-*/
-PaError Pa_OpenDefaultStream( PaStream** stream,
-                              int numInputChannels,
-                              int numOutputChannels,
-                              PaSampleFormat sampleFormat,
-                              double sampleRate,
-                              unsigned long framesPerBuffer,
-                              PaStreamCallback *streamCallback,
-                              void *userData );
-
-
-/** Closes an audio stream. If the audio stream is active it
- discards any pending buffers as if Pa_AbortStream() had been called.
-*/
-PaError Pa_CloseStream( PaStream *stream );
-
-
-/** Functions of type PaStreamFinishedCallback are implemented by PortAudio 
- clients. They can be registered with a stream using the Pa_SetStreamFinishedCallback
- function. Once registered they are called when the stream becomes inactive
- (ie once a call to Pa_StopStream() will not block).
- A stream will become inactive after the stream callback returns non-zero,
- or when Pa_StopStream or Pa_AbortStream is called. For a stream providing audio
- output, if the stream callback returns paComplete, or Pa_StopStream is called,
- the stream finished callback will not be called until all generated sample data
- has been played.
- 
- @param userData The userData parameter supplied to Pa_OpenStream()
-
- @see Pa_SetStreamFinishedCallback
-*/
-typedef void PaStreamFinishedCallback( void *userData );
-
-
-/** Register a stream finished callback function which will be called when the 
- stream becomes inactive. See the description of PaStreamFinishedCallback for 
- further details about when the callback will be called.
-
- @param stream a pointer to a PaStream that is in the stopped state - if the
- stream is not stopped, the stream's finished callback will remain unchanged 
- and an error code will be returned.
-
- @param streamFinishedCallback a pointer to a function with the same signature
- as PaStreamFinishedCallback, that will be called when the stream becomes
- inactive. Passing NULL for this parameter will un-register a previously
- registered stream finished callback function.
-
- @return on success returns paNoError, otherwise an error code indicating the cause
- of the error.
-
- @see PaStreamFinishedCallback
-*/
-PaError Pa_SetStreamFinishedCallback( PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback ); 
-
-
-/** Commences audio processing.
-*/
-PaError Pa_StartStream( PaStream *stream );
-
-
-/** Terminates audio processing. It waits until all pending
- audio buffers have been played before it returns.
-*/
-PaError Pa_StopStream( PaStream *stream );
-
-
-/** Terminates audio processing immediately without waiting for pending
- buffers to complete.
-*/
-PaError Pa_AbortStream( PaStream *stream );
-
-
-/** Determine whether the stream is stopped.
- A stream is considered to be stopped prior to a successful call to
- Pa_StartStream and after a successful call to Pa_StopStream or Pa_AbortStream.
- If a stream callback returns a value other than paContinue the stream is NOT
- considered to be stopped.
-
- @return Returns one (1) when the stream is stopped, zero (0) when
- the stream is running or, a PaErrorCode (which are always negative) if
- PortAudio is not initialized or an error is encountered.
-
- @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamActive
-*/
-PaError Pa_IsStreamStopped( PaStream *stream );
-
-
-/** Determine whether the stream is active.
- A stream is active after a successful call to Pa_StartStream(), until it
- becomes inactive either as a result of a call to Pa_StopStream() or
- Pa_AbortStream(), or as a result of a return value other than paContinue from
- the stream callback. In the latter case, the stream is considered inactive
- after the last buffer has finished playing.
-
- @return Returns one (1) when the stream is active (ie playing or recording
- audio), zero (0) when not playing or, a PaErrorCode (which are always negative)
- if PortAudio is not initialized or an error is encountered.
-
- @see Pa_StopStream, Pa_AbortStream, Pa_IsStreamStopped
-*/
-PaError Pa_IsStreamActive( PaStream *stream );
-
-
-
-/** A structure containing unchanging information about an open stream.
- @see Pa_GetStreamInfo
-*/
-
-typedef struct PaStreamInfo
-{
-    /** this is struct version 1 */
-    int structVersion;
-
-    /** The input latency of the stream in seconds. This value provides the most
-     accurate estimate of input latency available to the implementation. It may
-     differ significantly from the suggestedLatency value passed to Pa_OpenStream().
-     The value of this field will be zero (0.) for output-only streams.
-     @see PaTime
-    */
-    PaTime inputLatency;
-
-    /** The output latency of the stream in seconds. This value provides the most
-     accurate estimate of output latency available to the implementation. It may
-     differ significantly from the suggestedLatency value passed to Pa_OpenStream().
-     The value of this field will be zero (0.) for input-only streams.
-     @see PaTime
-    */
-    PaTime outputLatency;
-
-    /** The sample rate of the stream in Hertz (samples per second). In cases
-     where the hardware sample rate is inaccurate and PortAudio is aware of it,
-     the value of this field may be different from the sampleRate parameter
-     passed to Pa_OpenStream(). If information about the actual hardware sample
-     rate is not available, this field will have the same value as the sampleRate
-     parameter passed to Pa_OpenStream().
-    */
-    double sampleRate;
-    
-} PaStreamInfo;
-
-
-/** Retrieve a pointer to a PaStreamInfo structure containing information
- about the specified stream.
- @return A pointer to an immutable PaStreamInfo structure. If the stream
- parameter invalid, or an error is encountered, the function returns NULL.
-
- @param stream A pointer to an open stream previously created with Pa_OpenStream.
-
- @note PortAudio manages the memory referenced by the returned pointer,
- the client must not manipulate or free the memory. The pointer is only
- guaranteed to be valid until the specified stream is closed.
-
- @see PaStreamInfo
-*/
-const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream );
-
-
-/** Determine the current time for the stream according to the same clock used
- to generate buffer timestamps. This time may be used for syncronising other
- events to the audio stream, for example synchronizing audio to MIDI.
-                                        
- @return The stream's current time in seconds, or 0 if an error occurred.
-
- @see PaTime, PaStreamCallback
-*/
-PaTime Pa_GetStreamTime( PaStream *stream );
-
-
-/** Retrieve CPU usage information for the specified stream.
- The "CPU Load" is a fraction of total CPU time consumed by a callback stream's
- audio processing routines including, but not limited to the client supplied
- stream callback. This function does not work with blocking read/write streams.
-
- This function may be called from the stream callback function or the
- application.
-     
- @return
- A floating point value, typically between 0.0 and 1.0, where 1.0 indicates
- that the stream callback is consuming the maximum number of CPU cycles possible
- to maintain real-time operation. A value of 0.5 would imply that PortAudio and
- the stream callback was consuming roughly 50% of the available CPU time. The
- return value may exceed 1.0. A value of 0.0 will always be returned for a
- blocking read/write stream, or if an error occurrs.
-*/
-double Pa_GetStreamCpuLoad( PaStream* stream );
-
-
-/** Read samples from an input stream. The function doesn't return until
- the entire buffer has been filled - this may involve waiting for the operating
- system to supply the data.
-
- @param stream A pointer to an open stream previously created with Pa_OpenStream.
- 
- @param buffer A pointer to a buffer of sample frames. The buffer contains
- samples in the format specified by the inputParameters->sampleFormat field
- used to open the stream, and the number of channels specified by
- inputParameters->numChannels. If non-interleaved samples were requested,
- buffer is a pointer to the first element of an array of non-interleaved
- buffer pointers, one for each channel.
-
- @param frames The number of frames to be read into buffer. This parameter
- is not constrained to a specific range, however high performance applications
- will want to match this parameter to the framesPerBuffer parameter used
- when opening the stream.
-
- @return On success PaNoError will be returned, or PaInputOverflowed if input
- data was discarded by PortAudio after the previous call and before this call.
-*/
-PaError Pa_ReadStream( PaStream* stream,
-                       void *buffer,
-                       unsigned long frames );
-
-
-/** Write samples to an output stream. This function doesn't return until the
- entire buffer has been consumed - this may involve waiting for the operating
- system to consume the data.
-
- @param stream A pointer to an open stream previously created with Pa_OpenStream.
-
- @param buffer A pointer to a buffer of sample frames. The buffer contains
- samples in the format specified by the outputParameters->sampleFormat field
- used to open the stream, and the number of channels specified by
- outputParameters->numChannels. If non-interleaved samples were requested,
- buffer is a pointer to the first element of an array of non-interleaved
- buffer pointers, one for each channel.
-
- @param frames The number of frames to be written from buffer. This parameter
- is not constrained to a specific range, however high performance applications
- will want to match this parameter to the framesPerBuffer parameter used
- when opening the stream.
-
- @return On success PaNoError will be returned, or paOutputUnderflowed if
- additional output data was inserted after the previous call and before this
- call.
-*/
-PaError Pa_WriteStream( PaStream* stream,
-                        const void *buffer,
-                        unsigned long frames );
-
-
-/** Retrieve the number of frames that can be read from the stream without
- waiting.
-
- @return Returns a non-negative value representing the maximum number of frames
- that can be read from the stream without blocking or busy waiting or, a
- PaErrorCode (which are always negative) if PortAudio is not initialized or an
- error is encountered.
-*/
-signed long Pa_GetStreamReadAvailable( PaStream* stream );
-
-
-/** Retrieve the number of frames that can be written to the stream without
- waiting.
-
- @return Returns a non-negative value representing the maximum number of frames
- that can be written to the stream without blocking or busy waiting or, a
- PaErrorCode (which are always negative) if PortAudio is not initialized or an
- error is encountered.
-*/
-signed long Pa_GetStreamWriteAvailable( PaStream* stream );
-
-
-/* Miscellaneous utilities */
-
-
-/** Retrieve the size of a given sample format in bytes.
-
- @return The size in bytes of a single sample in the specified format,
- or paSampleFormatNotSupported if the format is not supported.
-*/
-PaError Pa_GetSampleSize( PaSampleFormat format );
-
-
-/** Put the caller to sleep for at least 'msec' milliseconds. This function is
- provided only as a convenience for authors of portable code (such as the tests
- and examples in the PortAudio distribution.)
-
- The function may sleep longer than requested so don't rely on this for accurate
- musical timing.
-*/
-void Pa_Sleep( long msec );
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PORTAUDIO_H */
diff --git a/libs/portaudio/index.html b/libs/portaudio/index.html
deleted file mode 100644
index 55f9ed62c5..0000000000
--- a/libs/portaudio/index.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]">
-   <meta name="Author" content="Phil Burk">
-   <meta name="Description" content="PortAudio is a cross platform, open-source, audio I/O library.It provides a very simple API for recording and/or playing sound using a simple callback function.">
-   <meta name="KeyWords" content="audio, library, portable, open-source, DirectSound,sound, music, JSyn, synthesis,">
-   <title>PortAudio Implementations for DirectSound</title>
-</head>
-<body>
-&nbsp;
-<center><table COLS=1 WIDTH="100%" BGCOLOR="#FADA7A" >
-<tr>
-<td>
-<center>
-<h1>
-PortAudio - Portable Audio Library</h1></center>
-</td>
-</tr>
-</table></center>
-
-<p>PortAudio is a cross platform, <a href="#License">open-source</a>, audio
-I/O library proposed by <b>Ross Bencina</b> to the <a href="http://shoko.calarts.edu/~glmrboy/musicdsp/music-dsp.html">music-dsp</a>
-mailing list. It lets you write simple audio programs in 'C' that will
-compile and run on <b>Windows, Macintosh, Unix, BeOS</b>. PortAudio is
-intended to promote the exchange of audio synthesis software between developers
-on different platforms.
-<p>For complete information on PortAudio and to download the latest releases,
-please visit "<b><font size=+2><a href="http://www.portaudio.com">http://www.portaudio.com</a></font></b>".
-<br>&nbsp;
-<br>&nbsp;
-<center>
-<h2>
-<b><a href="doc/html/index.html">Click here for Documentation</a></b></h2></center>
-
-<h2>
-<b><font size=+2></font></b></h2>
-
-<h2>
-<b><font size=+2>Contacts and E-Mail List</font></b></h2>
-
-<ul>
-<li>
-If you are using or implementing PortAudio then please join the <b><font size=+1><a href="http://techweb.rfa.org/mailman/listinfo/portaudio">PortAudio
-mail list</a></font><font size=+2> </font></b>.</li>
-
-<li>
-If you find bugs in one of these implementations, or have suggestions,
-please e-mail them to <a href="mailto:philburk@softsynth.com">Phil Burk</a>.</li>
-
-<li>
-If you make improvements to the library, please send them to us so we can
-incorporate the improvements.</li>
-</ul>
-
-<h2>
-<a NAME="License"></a>License</h2>
-
-<table width="600">
-<tr><td>
-<p>
-PortAudio Portable Real-Time Audio Library
-<br>Copyright &copy; 1999-2006 Ross Bencina and Phil Burk
-</p>
-<p>Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT.
-<br>IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<p><i>
-The text above constitutes the entire PortAudio license; however, 
-the PortAudio community also makes the following non-binding requests:
-</i></p>
-<p><i>
-Any person wishing to distribute modifications to the Software is
-requested to send the modifications to the original developer so that
-they can be incorporated into the canonical version. It is also 
-requested that these non-binding requests be included along with the 
-license above.
-</i></p>
-
-</td></tr></table>
-
-
-
-<br>&nbsp;
-</body>
-</html>
diff --git a/libs/portaudio/pablio/README.txt b/libs/portaudio/pablio/README.txt
deleted file mode 100644
index 675feb317b..0000000000
--- a/libs/portaudio/pablio/README.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-README for PABLIO
-Portable Audio Blocking I/O Library
-Author: Phil Burk
-
-PABLIO is a simplified interface to PortAudio that provide
-read/write style blocking I/O.
-
-Please see the .DOC file for documentation.
-
-/*
- * More information on PortAudio at: http://www.portaudio.com
- * Copyright (c) 1999-2000 Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-
diff --git a/libs/portaudio/pablio/pablio.c b/libs/portaudio/pablio/pablio.c
deleted file mode 100644
index 494702e9f6..0000000000
--- a/libs/portaudio/pablio/pablio.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * $Id: pablio.c 1151 2006-11-29 02:11:16Z leland_lucius $
- * pablio.c
- * Portable Audio Blocking Input/Output utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_ringbuffer.h"
-#include "pablio.h"
-#include <string.h>
-
-/************************************************************************/
-/******** Constants *****************************************************/
-/************************************************************************/
-
-#define FRAMES_PER_BUFFER    (256)
-
-/************************************************************************/
-/******** Prototypes ****************************************************/
-/************************************************************************/
-
-static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
-                               unsigned long framesPerBuffer,
-                               PaTimestamp outTime, void *userData );
-static PaError PABLIO_InitFIFO( RingBuffer *rbuf, long numFrames, long bytesPerFrame );
-static PaError PABLIO_TermFIFO( RingBuffer *rbuf );
-
-/************************************************************************/
-/******** Functions *****************************************************/
-/************************************************************************/
-
-/* Called from PortAudio.
- * Read and write data only if there is room in FIFOs.
- */
-static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
-                               unsigned long framesPerBuffer,
-                               PaTimestamp outTime, void *userData )
-{
-    PABLIO_Stream *data = (PABLIO_Stream*)userData;
-    long numBytes = data->bytesPerFrame * framesPerBuffer;
-    (void) outTime;
-
-    /* This may get called with NULL inputBuffer during initial setup. */
-    if( inputBuffer != NULL )
-    {
-        PaUtil_WriteRingBuffer( &data->inFIFO, inputBuffer, numBytes );
-    }
-    if( outputBuffer != NULL )
-    {
-        int i;
-        int numRead = PaUtil_ReadRingBuffer( &data->outFIFO, outputBuffer, numBytes );
-        /* Zero out remainder of buffer if we run out of data. */
-        for( i=numRead; i<numBytes; i++ )
-        {
-            ((char *)outputBuffer)[i] = 0;
-        }
-    }
-
-    return 0;
-}
-
-/* Allocate buffer. */
-static PaError PABLIO_InitFIFO( RingBuffer *rbuf, long numFrames, long bytesPerFrame )
-{
-    long numBytes = numFrames * bytesPerFrame;
-    char *buffer = (char *) malloc( numBytes );
-    if( buffer == NULL ) return paInsufficientMemory;
-    memset( buffer, 0, numBytes );
-    return (PaError) PaUtil_InitializeRingBuffer( rbuf, numBytes, buffer );
-}
-
-/* Free buffer. */
-static PaError PABLIO_TermFIFO( RingBuffer *rbuf )
-{
-    if( rbuf->buffer ) free( rbuf->buffer );
-    rbuf->buffer = NULL;
-    return paNoError;
-}
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
-{
-    long bytesWritten;
-    char *p = (char *) data;
-    long numBytes = aStream->bytesPerFrame * numFrames;
-    while( numBytes > 0)
-    {
-        bytesWritten = PaUtil_WriteRingBuffer( &aStream->outFIFO, p, numBytes );
-        numBytes -= bytesWritten;
-        p += bytesWritten;
-        if( numBytes > 0) Pa_Sleep(10);
-    }
-    return numFrames;
-}
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
-{
-    long bytesRead;
-    char *p = (char *) data;
-    long numBytes = aStream->bytesPerFrame * numFrames;
-    while( numBytes > 0)
-    {
-        bytesRead = PaUtil_ReadRingBuffer( &aStream->inFIFO, p, numBytes );
-        numBytes -= bytesRead;
-        p += bytesRead;
-        if( numBytes > 0) Pa_Sleep(10);
-    }
-    return numFrames;
-}
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable( PABLIO_Stream *aStream )
-{
-    int bytesEmpty = PaUtil_GetRingBufferWriteAvailable( &aStream->outFIFO );
-    return bytesEmpty / aStream->bytesPerFrame;
-}
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable( PABLIO_Stream *aStream )
-{
-    int bytesFull = PaUtil_GetRingBufferReadAvailable( &aStream->inFIFO );
-    return bytesFull / aStream->bytesPerFrame;
-}
-
-/************************************************************/
-static unsigned long RoundUpToNextPowerOf2( unsigned long n )
-{
-    long numBits = 0;
-    if( ((n-1) & n) == 0) return n; /* Already Power of two. */
-    while( n > 0 )
-    {
-        n= n>>1;
-        numBits++;
-    }
-    return (1<<numBits);
-}
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- * flags parameter can be an ORed combination of:
- *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
- *    and either PABLIO_MONO or PABLIO_STEREO
- */
-PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
-                         PaSampleFormat format, long flags )
-{
-    long   bytesPerSample;
-    long   doRead = 0;
-    long   doWrite = 0;
-    PaError err;
-    PABLIO_Stream *aStream;
-    long   minNumBuffers;
-    long   numFrames;
-
-    /* Allocate PABLIO_Stream structure for caller. */
-    aStream = (PABLIO_Stream *) malloc( sizeof(PABLIO_Stream) );
-    if( aStream == NULL ) return paInsufficientMemory;
-    memset( aStream, 0, sizeof(PABLIO_Stream) );
-
-    /* Determine size of a sample. */
-    bytesPerSample = Pa_GetSampleSize( format );
-    if( bytesPerSample < 0 )
-    {
-        err = (PaError) bytesPerSample;
-        goto error;
-    }
-    aStream->samplesPerFrame = ((flags&PABLIO_MONO) != 0) ? 1 : 2;
-    aStream->bytesPerFrame = bytesPerSample * aStream->samplesPerFrame;
-
-    /* Initialize PortAudio  */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    /* Warning: numFrames must be larger than amount of data processed per interrupt
-     *    inside PA to prevent glitches. Just to be safe, adjust size upwards.
-     */
-    minNumBuffers = 2 * Pa_GetMinNumBuffers( FRAMES_PER_BUFFER, sampleRate );
-    numFrames = minNumBuffers * FRAMES_PER_BUFFER;
-    numFrames = RoundUpToNextPowerOf2( numFrames );
-
-    /* Initialize Ring Buffers */
-    doRead = ((flags & PABLIO_READ) != 0);
-    doWrite = ((flags & PABLIO_WRITE) != 0);
-    if(doRead)
-    {
-        err = PABLIO_InitFIFO( &aStream->inFIFO, numFrames, aStream->bytesPerFrame );
-        if( err != paNoError ) goto error;
-    }
-    if(doWrite)
-    {
-        long numBytes;
-        err = PABLIO_InitFIFO( &aStream->outFIFO, numFrames, aStream->bytesPerFrame );
-        if( err != paNoError ) goto error;
-        /* Make Write FIFO appear full initially. */
-        numBytes = PaUtil_GetRingBufferWriteAvailable( &aStream->outFIFO );
-        PaUtil_AdvanceRingBufferWriteIndex( &aStream->outFIFO, numBytes );
-    }
-
-    /* Open a PortAudio stream that we will use to communicate with the underlying
-     * audio drivers. */
-    err = Pa_OpenStream(
-              &aStream->stream,
-              (doRead ? Pa_GetDefaultInputDeviceID() : paNoDevice),
-              (doRead ? aStream->samplesPerFrame : 0 ),
-              format,
-              NULL,
-              (doWrite ? Pa_GetDefaultOutputDeviceID() : paNoDevice),
-              (doWrite ? aStream->samplesPerFrame : 0 ),
-              format,
-              NULL,
-              sampleRate,
-              FRAMES_PER_BUFFER,
-              minNumBuffers,
-              paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-              blockingIOCallback,
-              aStream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( aStream->stream );
-    if( err != paNoError ) goto error;
-
-    *rwblPtr = aStream;
-    return paNoError;
-
-error:
-    CloseAudioStream( aStream );
-    *rwblPtr = NULL;
-    return err;
-}
-
-/************************************************************/
-PaError CloseAudioStream( PABLIO_Stream *aStream )
-{
-    PaError err;
-    int bytesEmpty;
-    int byteSize = aStream->outFIFO.bufferSize;
-
-    /* If we are writing data, make sure we play everything written. */
-    if( byteSize > 0 )
-    {
-        bytesEmpty = PaUtil_GetRingBufferWriteAvailable( &aStream->outFIFO );
-        while( bytesEmpty < byteSize )
-        {
-            Pa_Sleep( 10 );
-            bytesEmpty = PaUtil_GetRingBufferWriteAvailable( &aStream->outFIFO );
-        }
-    }
-
-    err = Pa_StopStream( aStream->stream );
-    if( err != paNoError ) goto error;
-    err = Pa_CloseStream( aStream->stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-
-error:
-    PABLIO_TermFIFO( &aStream->inFIFO );
-    PABLIO_TermFIFO( &aStream->outFIFO );
-    free( aStream );
-    return err;
-}
diff --git a/libs/portaudio/pablio/pablio.def b/libs/portaudio/pablio/pablio.def
deleted file mode 100644
index a10f952915..0000000000
--- a/libs/portaudio/pablio/pablio.def
+++ /dev/null
@@ -1,35 +0,0 @@
-LIBRARY      PABLIO
-DESCRIPTION  'PABLIO   Portable Audio Blocking I/O'
-
-EXPORTS
-    ; Explicit exports can go here
-	Pa_Initialize                   @1
-	Pa_Terminate                    @2
-	Pa_GetHostError                 @3
-	Pa_GetErrorText                 @4
-	Pa_CountDevices                 @5
-	Pa_GetDefaultInputDeviceID      @6
-	Pa_GetDefaultOutputDeviceID     @7
-	Pa_GetDeviceInfo                @8
-	Pa_OpenStream                   @9
-	Pa_OpenDefaultStream            @10
-	Pa_CloseStream                  @11
-	Pa_StartStream                  @12
-	Pa_StopStream                   @13
-	Pa_StreamActive                 @14
-	Pa_StreamTime                   @15
-	Pa_GetCPULoad                   @16
-	Pa_GetMinNumBuffers             @17
-	Pa_Sleep                        @18
-
-	OpenAudioStream                 @19
-	CloseAudioStream                @20
-	WriteAudioStream                @21
-	ReadAudioStream                 @22
-
-	Pa_GetSampleSize                @23
-
-   ;123456789012345678901234567890123456
-   ;000000000111111111122222222223333333
-
-
diff --git a/libs/portaudio/pablio/pablio.h b/libs/portaudio/pablio/pablio.h
deleted file mode 100644
index d996a03429..0000000000
--- a/libs/portaudio/pablio/pablio.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef _PABLIO_H
-#define _PABLIO_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/*
- * $Id: pablio.h 1083 2006-08-23 07:30:49Z rossb $
- * PABLIO.h
- * Portable Audio Blocking read/write utility.
- *
- * Author: Phil Burk, http://www.softsynth.com/portaudio/
- *
- * Include file for PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "portaudio.h"
-#include "ringbuffer.h"
-#include <string.h>
-
-typedef struct
-{
-    RingBuffer   inFIFO;
-    RingBuffer   outFIFO;
-    PortAudioStream *stream;
-    int          bytesPerFrame;
-    int          samplesPerFrame;
-}
-PABLIO_Stream;
-
-/* Values for flags for OpenAudioStream(). */
-#define PABLIO_READ     (1<<0)
-#define PABLIO_WRITE    (1<<1)
-#define PABLIO_READ_WRITE    (PABLIO_READ|PABLIO_WRITE)
-#define PABLIO_MONO     (1<<2)
-#define PABLIO_STEREO   (1<<3)
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable( PABLIO_Stream *aStream );
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable( PABLIO_Stream *aStream );
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- * flags parameter can be an ORed combination of:
- *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
- *    and either PABLIO_MONO or PABLIO_STEREO
- */
-PaError OpenAudioStream( PABLIO_Stream **aStreamPtr, double sampleRate,
-                         PaSampleFormat format, long flags );
-
-PaError CloseAudioStream( PABLIO_Stream *aStream );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* _PABLIO_H */
diff --git a/libs/portaudio/pablio/test_rw.c b/libs/portaudio/pablio/test_rw.c
deleted file mode 100644
index d717b9a07c..0000000000
--- a/libs/portaudio/pablio/test_rw.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * $Id: test_rw.c 1083 2006-08-23 07:30:49Z rossb $
- * test_rw.c
- * Read input from one stream and write it to another.
- *
- * Author: Phil Burk, http://www.softsynth.com/portaudio/
- *
- * This program uses PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "pablio.h"
-
-/*
-** Note that many of the older ISA sound cards on PCs do NOT support
-** full duplex audio (simultaneous record and playback).
-** And some only support full duplex at lower sample rates.
-*/
-#define SAMPLE_RATE          (44100)
-#define NUM_SECONDS              (5)
-#define SAMPLES_PER_FRAME        (2)
-#define FRAMES_PER_BLOCK        (64)
-
-/* Select whether we will use floats or shorts. */
-#if 1
-#define SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#else
-#define SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#endif
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    int      i;
-    SAMPLE   samples[SAMPLES_PER_FRAME * FRAMES_PER_BLOCK];
-    PaError  err;
-    PABLIO_Stream     *aStream;
-
-    printf("Full duplex sound test using PortAudio and RingBuffers\n");
-    fflush(stdout);
-
-    /* Open simplified blocking I/O layer on top of PortAudio. */
-    err = OpenAudioStream( &aStream, SAMPLE_RATE, SAMPLE_TYPE,
-                           (PABLIO_READ_WRITE | PABLIO_STEREO) );
-    if( err != paNoError ) goto error;
-
-    /* Process samples in the foreground. */
-    for( i=0; i<(NUM_SECONDS * SAMPLE_RATE); i += FRAMES_PER_BLOCK )
-    {
-        /* Read one block of data into sample array from audio input. */
-        ReadAudioStream( aStream, samples, FRAMES_PER_BLOCK );
-        /* Write that same block of data to output. */
-        WriteAudioStream( aStream, samples, FRAMES_PER_BLOCK );
-    }
-
-    CloseAudioStream( aStream );
-
-    printf("Full duplex sound test complete.\n" );
-    fflush(stdout);
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
diff --git a/libs/portaudio/pablio/test_rw_echo.c b/libs/portaudio/pablio/test_rw_echo.c
deleted file mode 100644
index 3738c9e6b6..0000000000
--- a/libs/portaudio/pablio/test_rw_echo.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * $Id: test_rw_echo.c 1083 2006-08-23 07:30:49Z rossb $
- * test_rw_echo.c
- * Echo delayed input to output.
- *
- * Author: Phil Burk, http://www.softsynth.com/portaudio/
- *
- * This program uses PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- *
- * Note that if you need low latency, you should not use PABLIO.
- * Use the PA_OpenStream callback technique which is lower level
- * than PABLIO.
- *
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "pablio.h"
-#include <string.h>
-
-/*
-** Note that many of the older ISA sound cards on PCs do NOT support
-** full duplex audio (simultaneous record and playback).
-** And some only support full duplex at lower sample rates.
-*/
-#define SAMPLE_RATE         (22050)
-#define NUM_SECONDS            (20)
-#define SAMPLES_PER_FRAME       (2)
-
-/* Select whether we will use floats or shorts. */
-#if 1
-#define SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#else
-#define SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#endif
-
-#define NUM_ECHO_FRAMES   (2*SAMPLE_RATE)
-SAMPLE   samples[NUM_ECHO_FRAMES][SAMPLES_PER_FRAME] = {0.0};
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    int      i;
-    PaError  err;
-    PABLIO_Stream     *aInStream;
-    PABLIO_Stream     *aOutStream;
-    int      index;
-
-    printf("Full duplex sound test using PABLIO\n");
-    fflush(stdout);
-
-    /* Open simplified blocking I/O layer on top of PortAudio. */
-    /* Open input first so it can start to fill buffers. */
-    err = OpenAudioStream( &aInStream, SAMPLE_RATE, SAMPLE_TYPE,
-                           (PABLIO_READ | PABLIO_STEREO) );
-    if( err != paNoError ) goto error;
-    /* printf("opened input\n");  fflush(stdout); /**/
-
-    err = OpenAudioStream( &aOutStream, SAMPLE_RATE, SAMPLE_TYPE,
-                           (PABLIO_WRITE | PABLIO_STEREO) );
-    if( err != paNoError ) goto error;
-    /* printf("opened output\n");  fflush(stdout); /**/
-
-    /* Process samples in the foreground. */
-    index = 0;
-    for( i=0; i<(NUM_SECONDS * SAMPLE_RATE); i++ )
-    {
-        /* Write old frame of data to output. */
-        /* samples[index][1] = (i&256) * (1.0f/256.0f); /* sawtooth */
-        WriteAudioStream( aOutStream, &samples[index][0], 1 );
-
-        /* Read one frame of data into sample array for later output. */
-        ReadAudioStream( aInStream, &samples[index][0], 1 );
-        index += 1;
-        if( index >= NUM_ECHO_FRAMES ) index = 0;
-
-        if( (i & 0xFFFF) == 0 ) printf("i = %d\n", i ); fflush(stdout); /**/
-    }
-
-    CloseAudioStream( aOutStream );
-    CloseAudioStream( aInStream );
-
-    printf("R/W echo sound test complete.\n" );
-    fflush(stdout);
-    return 0;
-
-error:
-    fprintf( stderr, "An error occured while using PortAudio\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
diff --git a/libs/portaudio/pablio/test_w_saw.c b/libs/portaudio/pablio/test_w_saw.c
deleted file mode 100644
index 42a3d4fb9e..0000000000
--- a/libs/portaudio/pablio/test_w_saw.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * $Id: test_w_saw.c 1083 2006-08-23 07:30:49Z rossb $
- * test_w_saw.c
- * Generate stereo sawtooth waveforms.
- *
- * Author: Phil Burk, http://www.softsynth.com
- *
- * This program uses PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- *
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "pablio.h"
-#include <string.h>
-
-#define SAMPLE_RATE         (44100)
-#define NUM_SECONDS             (6)
-#define SAMPLES_PER_FRAME       (2)
-
-#define FREQUENCY           (220.0f)
-#define PHASE_INCREMENT     (2.0f * FREQUENCY / SAMPLE_RATE)
-#define FRAMES_PER_BLOCK    (100)
-
-float   samples[FRAMES_PER_BLOCK][SAMPLES_PER_FRAME];
-float   phases[SAMPLES_PER_FRAME];
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    int             i,j;
-    PaError         err;
-    PABLIO_Stream  *aOutStream;
-
-    printf("Generate sawtooth waves using PABLIO.\n");
-    fflush(stdout);
-
-    /* Open simplified blocking I/O layer on top of PortAudio. */
-    err = OpenAudioStream( &aOutStream, SAMPLE_RATE, paFloat32,
-                           (PABLIO_WRITE | PABLIO_STEREO) );
-    if( err != paNoError ) goto error;
-
-    /* Initialize oscillator phases. */
-    phases[0] = 0.0;
-    phases[1] = 0.0;
-
-    for( i=0; i<(NUM_SECONDS * SAMPLE_RATE); i += FRAMES_PER_BLOCK )
-    {
-        /* Generate sawtooth waveforms in a block for efficiency. */
-        for( j=0; j<FRAMES_PER_BLOCK; j++ )
-        {
-            /* Generate a sawtooth wave by incrementing a variable. */
-            phases[0] += PHASE_INCREMENT;
-            /* The signal range is -1.0 to +1.0 so wrap around if we go over. */
-            if( phases[0] > 1.0f ) phases[0] -= 2.0f;
-            samples[j][0] = phases[0];
-
-            /* On the second channel, generate a sawtooth wave a fifth higher. */
-            phases[1] += PHASE_INCREMENT * (3.0f / 2.0f);
-            if( phases[1] > 1.0f ) phases[1] -= 2.0f;
-            samples[j][1] = phases[1];
-        }
-
-        /* Write samples to output. */
-        WriteAudioStream( aOutStream, samples, FRAMES_PER_BLOCK );
-    }
-
-    CloseAudioStream( aOutStream );
-
-    printf("Sawtooth sound test complete.\n" );
-    fflush(stdout);
-    return 0;
-
-error:
-    fprintf( stderr, "An error occured while using PABLIO\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
diff --git a/libs/portaudio/pablio/test_w_saw8.c b/libs/portaudio/pablio/test_w_saw8.c
deleted file mode 100644
index dc0e00f062..0000000000
--- a/libs/portaudio/pablio/test_w_saw8.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * $Id: test_w_saw8.c 1083 2006-08-23 07:30:49Z rossb $
- * test_w_saw8.c
- * Generate stereo 8 bit sawtooth waveforms.
- *
- * Author: Phil Burk, http://www.softsynth.com
- *
- * This program uses PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- *
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "pablio.h"
-#include <string.h>
-
-#define SAMPLE_RATE         (22050)
-#define NUM_SECONDS             (6)
-#define SAMPLES_PER_FRAME       (2)
-
-
-#define FRAMES_PER_BLOCK    (100)
-
-unsigned char   samples[FRAMES_PER_BLOCK][SAMPLES_PER_FRAME];
-unsigned char   phases[SAMPLES_PER_FRAME];
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    int             i,j;
-    PaError         err;
-    PABLIO_Stream  *aOutStream;
-
-    printf("Generate unsigned 8 bit sawtooth waves using PABLIO.\n");
-    fflush(stdout);
-
-    /* Open simplified blocking I/O layer on top of PortAudio. */
-    err = OpenAudioStream( &aOutStream, SAMPLE_RATE, paUInt8,
-                           (PABLIO_WRITE | PABLIO_STEREO) );
-    if( err != paNoError ) goto error;
-
-    /* Initialize oscillator phases to "ground" level for paUInt8. */
-    phases[0] = 128;
-    phases[1] = 128;
-
-    for( i=0; i<(NUM_SECONDS * SAMPLE_RATE); i += FRAMES_PER_BLOCK )
-    {
-        /* Generate sawtooth waveforms in a block for efficiency. */
-        for( j=0; j<FRAMES_PER_BLOCK; j++ )
-        {
-            /* Generate a sawtooth wave by incrementing a variable. */
-            phases[0] += 1;
-            /* We don't have to do anything special to wrap when using paUint8 because
-             * 8 bit arithmetic automatically wraps. */
-            samples[j][0] = phases[0];
-
-            /* On the second channel, generate a higher sawtooth wave. */
-            phases[1] += 3;
-            samples[j][1] = phases[1];
-        }
-
-        /* Write samples to output. */
-        WriteAudioStream( aOutStream, samples, FRAMES_PER_BLOCK );
-    }
-
-    CloseAudioStream( aOutStream );
-
-    printf("Sawtooth sound test complete.\n" );
-    fflush(stdout);
-    return 0;
-
-error:
-    fprintf( stderr, "An error occured while using PABLIO\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
diff --git a/libs/portaudio/portaudio-2.0.pc.in b/libs/portaudio/portaudio-2.0.pc.in
deleted file mode 100644
index f5c196913a..0000000000
--- a/libs/portaudio/portaudio-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: PortAudio
-Description: Portable audio I/O
-Requires:
-Version: 19
-
-Libs: -L${libdir} -lportaudio @LIBS@
-Cflags: -I${includedir} @THREAD_CFLAGS@
diff --git a/libs/portaudio/src/SConscript b/libs/portaudio/src/SConscript
deleted file mode 100644
index 9ef7ff1095..0000000000
--- a/libs/portaudio/src/SConscript
+++ /dev/null
@@ -1,211 +0,0 @@
-import os.path, copy, sys
-
-def checkSymbol(conf, header, library=None, symbol=None, autoAdd=True, critical=False, pkgName=None):
-    """ Check for symbol in library, optionally look only for header.
-    @param conf: Configure instance.
-    @param header: The header file where the symbol is declared.
-    @param library: The library in which the symbol exists, if None it is taken to be the standard C library.
-    @param symbol: The symbol to look for, if None only the header will be looked up.
-    @param autoAdd: Automatically link with this library if check is positive.
-    @param critical: Raise on error?
-    @param pkgName: Optional name of pkg-config entry for library, to determine build parameters.
-    @return: True/False
-    """
-    origEnv = conf.env.Copy() # Copy unmodified environment so we can restore it upon error
-    env = conf.env
-    if library is None:
-        library = "c"   # Standard library
-        autoAdd = False
-
-    if pkgName is not None:
-        origLibs = copy.copy(env.get("LIBS", None))
-
-        try: env.ParseConfig("pkg-config --silence-errors %s --cflags --libs" % pkgName)
-        except: pass
-        else:
-            # I see no other way of checking that the parsing succeeded, if it did add no more linking parameters
-            if env.get("LIBS", None) != origLibs:
-                autoAdd = False
-
-    try:
-        if not conf.CheckCHeader(header, include_quotes="<>"):
-            raise ConfigurationError("missing header %s" % header)
-        if symbol is not None and not conf.CheckLib(library, symbol, language="C", autoadd=autoAdd):
-            raise ConfigurationError("missing symbol %s in library %s" % (symbol, library))
-    except ConfigurationError:
-        conf.env = origEnv
-        if not critical:
-            return False
-        raise
-
-    return True
-
-import SCons.Errors
-
-# Import common variables
-
-# Could use '#' to refer to top-level SConstruct directory, but looks like env.SConsignFile doesn't interpret this at least :(
-sconsDir = os.path.abspath(os.path.join("build", "scons"))
-
-try:
-    Import("Platform", "Posix", "ConfigurationError", "ApiVer")
-except SCons.Errors.UserError:
-    # The common objects must be exported first
-    SConscript(os.path.join(sconsDir, "SConscript_common"))
-    Import("Platform", "Posix", "ConfigurationError", "ApiVer")
-
-Import("env")
-
-# This will be manipulated
-env = env.Copy()
-
-# We operate with a set of needed libraries and optional libraries, the latter stemming from host API implementations.
-# For libraries of both types we record a set of values that is used to look for the library in question, during
-# configuration. If the corresponding library for a host API implementation isn't found, the implementation is left out.
-neededLibs = []
-optionalImpls = {}
-if Platform in Posix:
-    env.Append(CPPPATH=os.path.join("os", "unix"))
-    neededLibs += [("pthread", "pthread.h", "pthread_create"), ("m", "math.h", "sin")]
-    if env["useALSA"]:
-        optionalImpls["ALSA"] = ("asound", "alsa/asoundlib.h", "snd_pcm_open")
-    if env["useJACK"]:
-        optionalImpls["JACK"] = ("jack", "jack/jack.h", "jack_client_new")
-    if env["useOSS"]:
-        # TODO: It looks like the prefix for soundcard.h depends on the platform
-        optionalImpls["OSS"] = ("oss", "sys/soundcard.h", None)
-    if env["useASIHPI"]:
-        optionalImpls["ASIHPI"] = ("hpi", "asihpi/hpi.h", "HPI_SubSysCreate")
-else:
-    raise ConfigurationError("unknown platform %s" % Platform)
-
-if Platform == "darwin":
-    env.Append(LINKFLAGS=["-framework CoreAudio", "-framework AudioToolBox"])
-    env.Append(CPPDEFINES=["PA_USE_COREAUDIO"])
-elif Platform == "cygwin":
-    env.Append(LIBS=["winmm"])
-elif Platform == "irix":
-    neededLibs +=  [("audio", "dmedia/audio.h", "alOpenPort"), ("dmedia", "dmedia/dmedia.h", "dmGetUST")]
-    env.Append(CPPDEFINES=["PA_USE_SGI"])
-
-def CheckCTypeSize(context, tp):
-    """ Check size of C type.
-    @param context: A configuration context.
-    @param tp: The type to check.
-    @return: Size of type, in bytes.
-    """
-    context.Message("Checking the size of C type %s..." % tp)
-    ret = context.TryRun("""
-#include <stdio.h>
-
-int main() {
-    printf("%%d", sizeof(%s));
-    return 0;
-}
-""" % tp, ".c")
-    if not ret[0]:
-        context.Result(" Couldn't obtain size of type %s!" % tp)
-        return None
-
-    assert ret[1]
-    sz = int(ret[1])
-    context.Result("%d" % sz)
-    return sz
-
-"""
-if sys.byteorder == "little":
-    env.Append(CPPDEFINES=["PA_LITTLE_ENDIAN"])
-elif sys.byteorder == "big":
-    env.Append(CPPDEFINES=["PA_BIG_ENDIAN"])
-else:
-    raise ConfigurationError("unknown byte order: %s" % sys.byteorder)
-"""
-if env["enableDebugOutput"]:
-    env.Append(CPPDEFINES=["PA_ENABLE_DEBUG_OUTPUT"])
-
-# Start configuration
-
-# Use an absolute path for conf_dir, otherwise it gets created both relative to current directory and build directory
-conf = env.Configure(log_file=os.path.join(sconsDir, "sconf.log"), custom_tests={"CheckCTypeSize": CheckCTypeSize},
-        conf_dir=os.path.join(sconsDir, ".sconf_temp"))
-conf.env.Append(CPPDEFINES=["SIZEOF_SHORT=%d" % conf.CheckCTypeSize("short")])
-conf.env.Append(CPPDEFINES=["SIZEOF_INT=%d" % conf.CheckCTypeSize("int")])
-conf.env.Append(CPPDEFINES=["SIZEOF_LONG=%d" % conf.CheckCTypeSize("long")])
-if checkSymbol(conf, "time.h", "rt", "clock_gettime"):
-    conf.env.Append(CPPDEFINES=["HAVE_CLOCK_GETTIME"])
-if checkSymbol(conf, "time.h", symbol="nanosleep"):
-    conf.env.Append(CPPDEFINES=["HAVE_NANOSLEEP"])
-if conf.CheckCHeader("sys/soundcard.h"):
-    conf.env.Append(CPPDEFINES=["HAVE_SYS_SOUNDCARD_H"])
-if conf.CheckCHeader("linux/soundcard.h"):
-    conf.env.Append(CPPDEFINES=["HAVE_LINUX_SOUNDCARD_H"])
-if conf.CheckCHeader("machine/soundcard.h"):
-    conf.env.Append(CPPDEFINES=["HAVE_MACHINE_SOUNDCARD_H"])
-
-# Look for needed libraries and link with them
-for lib, hdr, sym in neededLibs:
-    checkSymbol(conf, hdr, lib, sym, critical=True)
-# Look for host API libraries, if a library isn't found disable corresponding host API implementation.
-for name, val in optionalImpls.items():
-    lib, hdr, sym = val
-    if checkSymbol(conf, hdr, lib, sym, critical=False, pkgName=name.lower()):
-        conf.env.Append(CPPDEFINES=["PA_USE_%s=1" % name.upper()])
-    else:
-        del optionalImpls[name]
-
-# Configuration finished
-env = conf.Finish()
-
-# PA infrastructure
-CommonSources = [os.path.join("common", f) for f in "pa_allocation.c pa_converters.c pa_cpuload.c pa_dither.c pa_front.c \
-        pa_process.c pa_skeleton.c pa_stream.c pa_trace.c pa_debugprint.c pa_ringbuffer.c".split()]
-
-# Host API implementations
-ImplSources = []
-if Platform in Posix:
-    ImplSources += [os.path.join("os", "unix", f) for f in "pa_unix_hostapis.c pa_unix_util.c".split()]
-
-if "ALSA" in optionalImpls:
-    ImplSources.append(os.path.join("hostapi", "alsa", "pa_linux_alsa.c"))
-if "JACK" in optionalImpls:
-    ImplSources.append(os.path.join("hostapi", "jack", "pa_jack.c"))
-if "OSS" in optionalImpls:
-    ImplSources.append(os.path.join("hostapi", "oss", "pa_unix_oss.c"))
-if "ASIHPI" in optionalImpls:
-    ImplSources.append(os.path.join("hostapi", "asihpi", "pa_linux_asihpi.c"))
-
-
-sources = CommonSources + ImplSources
-
-sharedLibEnv = env.Copy()
-if Platform in Posix:
-    # Add soname to library, this is so a reference is made to the versioned library in programs linking against libportaudio.so
-    sharedLibEnv.AppendUnique(SHLINKFLAGS="-Wl,-soname=libportaudio.so.%d" % int(ApiVer.split(".")[0]))
-sharedLib = sharedLibEnv.SharedLibrary(target="portaudio", source=sources)
-
-staticLib = env.StaticLibrary(target="portaudio", source=sources)
-
-if Platform in Posix:
-    prefix = env["prefix"]
-    includeDir = os.path.join(prefix, "include")
-    libDir = os.path.join(prefix, "lib")
-
-testNames = ["patest_sine", "paqa_devs", "paqa_errs", "patest1", "patest_buffer", "patest_callbackstop", "patest_clip", \
-        "patest_dither", "patest_hang", "patest_in_overflow", "patest_latency", "patest_leftright", "patest_longsine", \
-        "patest_many", "patest_maxsines", "patest_multi_sine", "patest_out_underflow", "patest_pink", "patest_prime", \
-        "patest_read_record", "patest_record", "patest_ringmix", "patest_saw", "patest_sine8", "patest_sine", \
-        "patest_sine_time", "patest_start_stop", "patest_stop", "patest_sync", "patest_toomanysines", \
-        "patest_underflow", "patest_wire", "patest_write_sine", "pa_devs", "pa_fuzz", "pa_minlat", \
-        "patest_sine_channelmaps",]
-
-# The test directory ("bin") should be in the top-level PA directory
-tests = [env.Program(target=os.path.join("#", "bin", name), source=[os.path.join("#", "test", name + ".c"),
-        staticLib]) for name in testNames]
-
-# Detect host APIs
-hostApis = []
-for cppdef in env["CPPDEFINES"]:
-    if cppdef.startswith("PA_USE_"):
-        hostApis.append(cppdef[7:-2])
-
-Return("sources", "sharedLib", "staticLib", "tests", "env", "hostApis")
diff --git a/libs/portaudio/src/common/pa_allocation.c b/libs/portaudio/src/common/pa_allocation.c
deleted file mode 100644
index c78c2cf7e2..0000000000
--- a/libs/portaudio/src/common/pa_allocation.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * $Id: pa_allocation.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library allocation group implementation
- * memory allocation group for tracking allocation groups
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Allocation Group implementation.
-*/
-
-
-#include "pa_allocation.h"
-#include "pa_util.h"
-
-
-/*
-    Maintain 3 singly linked lists...
-    linkBlocks: the buffers used to allocate the links
-    spareLinks: links available for use in the allocations list
-    allocations: the buffers currently allocated using PaUtil_ContextAllocateMemory()
-
-    Link block size is doubled every time new links are allocated.
-*/
-
-
-#define PA_INITIAL_LINK_COUNT_    16
-
-struct PaUtilAllocationGroupLink
-{
-    struct PaUtilAllocationGroupLink *next;
-    void *buffer;
-};
-
-/*
-    Allocate a block of links. The first link will have it's buffer member
-    pointing to the block, and it's next member set to <nextBlock>. The remaining
-    links will have NULL buffer members, and each link will point to
-    the next link except the last, which will point to <nextSpare>
-*/
-static struct PaUtilAllocationGroupLink *AllocateLinks( long count,
-        struct PaUtilAllocationGroupLink *nextBlock,
-        struct PaUtilAllocationGroupLink *nextSpare )
-{
-    struct PaUtilAllocationGroupLink *result;
-    int i;
-    
-    result = (struct PaUtilAllocationGroupLink *)PaUtil_AllocateMemory(
-            sizeof(struct PaUtilAllocationGroupLink) * count );
-    if( result )
-    {
-        /* the block link */
-        result[0].buffer = result;
-        result[0].next = nextBlock;
-
-        /* the spare links */
-        for( i=1; i<count; ++i )
-        {
-            result[i].buffer = 0;
-            result[i].next = &result[i+1];
-        }
-        result[count-1].next = nextSpare;
-    }
-    
-    return result;
-}
-
-
-PaUtilAllocationGroup* PaUtil_CreateAllocationGroup( void )
-{
-    PaUtilAllocationGroup* result = 0;
-    struct PaUtilAllocationGroupLink *links;
-
-
-    links = AllocateLinks( PA_INITIAL_LINK_COUNT_, 0, 0 );
-    if( links != 0 )
-    {
-        result = (PaUtilAllocationGroup*)PaUtil_AllocateMemory( sizeof(PaUtilAllocationGroup) );
-        if( result )
-        {
-            result->linkCount = PA_INITIAL_LINK_COUNT_;
-            result->linkBlocks = &links[0];
-            result->spareLinks = &links[1];
-            result->allocations = 0;
-        }
-        else
-        {
-            PaUtil_FreeMemory( links );
-        }
-    }
-
-    return result;
-}
-
-
-void PaUtil_DestroyAllocationGroup( PaUtilAllocationGroup* group )
-{
-    struct PaUtilAllocationGroupLink *current = group->linkBlocks;
-    struct PaUtilAllocationGroupLink *next;
-
-    while( current )
-    {
-        next = current->next;
-        PaUtil_FreeMemory( current->buffer );
-        current = next;
-    }
-
-    PaUtil_FreeMemory( group );
-}
-
-
-void* PaUtil_GroupAllocateMemory( PaUtilAllocationGroup* group, long size )
-{
-    struct PaUtilAllocationGroupLink *links, *link;
-    void *result = 0;
-    
-    /* allocate more links if necessary */
-    if( !group->spareLinks )
-    {
-        /* double the link count on each block allocation */
-        links = AllocateLinks( group->linkCount, group->linkBlocks, group->spareLinks );
-        if( links )
-        {
-            group->linkCount += group->linkCount;
-            group->linkBlocks = &links[0];
-            group->spareLinks = &links[1];
-        }
-    }
-
-    if( group->spareLinks )
-    {
-        result = PaUtil_AllocateMemory( size );
-        if( result )
-        {
-            link = group->spareLinks;
-            group->spareLinks = link->next;
-
-            link->buffer = result;
-            link->next = group->allocations;
-
-            group->allocations = link;
-        }
-    }
-
-    return result;    
-}
-
-
-void PaUtil_GroupFreeMemory( PaUtilAllocationGroup* group, void *buffer )
-{
-    struct PaUtilAllocationGroupLink *current = group->allocations;
-    struct PaUtilAllocationGroupLink *previous = 0;
-
-    if( buffer == 0 )
-        return;
-
-    /* find the right link and remove it */
-    while( current )
-    {
-        if( current->buffer == buffer )
-        {
-            if( previous )
-            {
-                previous->next = current->next;
-            }
-            else
-            {
-                group->allocations = current->next;
-            }
-
-            current->buffer = 0;
-            current->next = group->spareLinks;
-            group->spareLinks = current;
-
-            break;
-        }
-        
-        previous = current;
-        current = current->next;
-    }
-
-    PaUtil_FreeMemory( buffer ); /* free the memory whether we found it in the list or not */
-}
-
-
-void PaUtil_FreeAllAllocations( PaUtilAllocationGroup* group )
-{
-    struct PaUtilAllocationGroupLink *current = group->allocations;
-    struct PaUtilAllocationGroupLink *previous = 0;
-
-    /* free all buffers in the allocations list */
-    while( current )
-    {
-        PaUtil_FreeMemory( current->buffer );
-        current->buffer = 0;
-
-        previous = current;
-        current = current->next;
-    }
-
-    /* link the former allocations list onto the front of the spareLinks list */
-    if( previous )
-    {
-        previous->next = group->spareLinks;
-        group->spareLinks = group->allocations;
-        group->allocations = 0;
-    }
-}
-
diff --git a/libs/portaudio/src/common/pa_allocation.h b/libs/portaudio/src/common/pa_allocation.h
deleted file mode 100644
index b265b016fa..0000000000
--- a/libs/portaudio/src/common/pa_allocation.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef PA_ALLOCATION_H
-#define PA_ALLOCATION_H
-/*
- * $Id: pa_allocation.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library allocation context header
- * memory allocation context for tracking allocation groups
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Allocation Group prototypes. An Allocation Group makes it easy to
- allocate multiple blocks of memory and free them all simultanously.
- 
- An allocation group is useful for keeping track of multiple blocks
- of memory which are allocated at the same time (such as during initialization)
- and need to be deallocated at the same time. The allocation group maintains
- a list of allocated blocks, and can deallocate them all simultaneously which
- can be usefull for cleaning up after a partially initialized object fails.
-
- The allocation group implementation is built on top of the lower
- level allocation functions defined in pa_util.h
-*/
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-typedef struct
-{
-    long linkCount;
-    struct PaUtilAllocationGroupLink *linkBlocks;
-    struct PaUtilAllocationGroupLink *spareLinks;
-    struct PaUtilAllocationGroupLink *allocations;
-}PaUtilAllocationGroup;
-
-
-
-/** Create an allocation group.
-*/
-PaUtilAllocationGroup* PaUtil_CreateAllocationGroup( void );
-
-/** Destroy an allocation group, but not the memory allocated through the group.
-*/
-void PaUtil_DestroyAllocationGroup( PaUtilAllocationGroup* group );
-
-/** Allocate a block of memory though an allocation group.
-*/
-void* PaUtil_GroupAllocateMemory( PaUtilAllocationGroup* group, long size );
-
-/** Free a block of memory that was previously allocated though an allocation
- group. Calling this function is a relatively time consuming operation.
- Under normal circumstances clients should call PaUtil_FreeAllAllocations to
- free all allocated blocks simultaneously.
- @see PaUtil_FreeAllAllocations
-*/
-void PaUtil_GroupFreeMemory( PaUtilAllocationGroup* group, void *buffer );
-
-/** Free all blocks of memory which have been allocated through the allocation
- group. This function doesn't destroy the group itself.
-*/
-void PaUtil_FreeAllAllocations( PaUtilAllocationGroup* group );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_ALLOCATION_H */
diff --git a/libs/portaudio/src/common/pa_converters.c b/libs/portaudio/src/common/pa_converters.c
deleted file mode 100644
index 3b98c858ac..0000000000
--- a/libs/portaudio/src/common/pa_converters.c
+++ /dev/null
@@ -1,1935 +0,0 @@
-/*
- * $Id: pa_converters.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library sample conversion mechanism
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Conversion functions implementations.
- 
- If the C9x function lrintf() is available, define PA_USE_C99_LRINTF to use it
-
- @todo Consider whether functions which dither but don't clip should exist,
- V18 automatically enabled clipping whenever dithering was selected. Perhaps
- we should do the same.
-
- @todo implement the converters marked IMPLEMENT ME: Float32_To_UInt8_Dither,
- Float32_To_UInt8_Clip, Float32_To_UInt8_DitherClip, Int32_To_Int24_Dither,
- Int32_To_UInt8_Dither, Int24_To_Int16_Dither, Int24_To_Int8_Dither, 
- Int24_To_UInt8_Dither, Int16_To_Int8_Dither, Int16_To_UInt8_Dither,
-
- @todo review the converters marked REVIEW: Float32_To_Int32,
- Float32_To_Int32_Dither, Float32_To_Int32_Clip, Float32_To_Int32_DitherClip,
- Int32_To_Int16_Dither, Int32_To_Int8_Dither, Int16_To_Int32
-*/
-
-
-#include "pa_converters.h"
-#include "pa_dither.h"
-#include "pa_endianness.h"
-#include "pa_types.h"
-
-
-PaSampleFormat PaUtil_SelectClosestAvailableFormat(
-        PaSampleFormat availableFormats, PaSampleFormat format )
-{
-    PaSampleFormat result;
-
-    format &= ~paNonInterleaved;
-    availableFormats &= ~paNonInterleaved;
-    
-    if( (format & availableFormats) == 0 )
-    {
-        /* NOTE: this code depends on the sample format constants being in
-            descending order of quality - ie best quality is 0
-            FIXME: should write an assert which checks that all of the
-            known constants conform to that requirement.
-        */
-
-        if( format != 0x01 )
-        {
-            /* scan for better formats */
-            result = format;
-            do
-            {
-                result >>= 1;
-            }
-            while( (result & availableFormats) == 0 && result != 0 );
-        }
-        else
-        {
-            result = 0;
-        }
-        
-        if( result == 0 ){
-            /* scan for worse formats */
-            result = format;
-            do
-            {
-                result <<= 1;
-            }
-            while( (result & availableFormats) == 0 && result != paCustomFormat );
-
-            if( (result & availableFormats) == 0 )
-                result = paSampleFormatNotSupported;
-        }
-        
-    }else{
-        result = format;
-    }
-
-    return result;
-}
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_SELECT_FORMAT_( format, float32, int32, int24, int16, int8, uint8 ) \
-    switch( format & ~paNonInterleaved ){                                      \
-    case paFloat32:                                                            \
-        float32                                                                \
-    case paInt32:                                                              \
-        int32                                                                  \
-    case paInt24:                                                              \
-        int24                                                                  \
-    case paInt16:                                                              \
-        int16                                                                  \
-    case paInt8:                                                               \
-        int8                                                                   \
-    case paUInt8:                                                              \
-        uint8                                                                  \
-    default: return 0;                                                         \
-    }
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_SELECT_CONVERTER_DITHER_CLIP_( flags, source, destination )         \
-    if( flags & paClipOff ){ /* no clip */                                     \
-        if( flags & paDitherOff ){ /* no dither */                             \
-            return paConverters. source ## _To_ ## destination;                \
-        }else{ /* dither */                                                    \
-            return paConverters. source ## _To_ ## destination ## _Dither;     \
-        }                                                                      \
-    }else{ /* clip */                                                          \
-        if( flags & paDitherOff ){ /* no dither */                             \
-            return paConverters. source ## _To_ ## destination ## _Clip;       \
-        }else{ /* dither */                                                    \
-            return paConverters. source ## _To_ ## destination ## _DitherClip; \
-        }                                                                      \
-    }
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_SELECT_CONVERTER_DITHER_( flags, source, destination )              \
-    if( flags & paDitherOff ){ /* no dither */                                 \
-        return paConverters. source ## _To_ ## destination;                    \
-    }else{ /* dither */                                                        \
-        return paConverters. source ## _To_ ## destination ## _Dither;         \
-    }
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_USE_CONVERTER_( source, destination )\
-    return paConverters. source ## _To_ ## destination;
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_UNITY_CONVERSION_( wordlength )\
-    return paConverters. Copy_ ## wordlength ## _To_ ## wordlength;
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilConverter* PaUtil_SelectConverter( PaSampleFormat sourceFormat,
-        PaSampleFormat destinationFormat, PaStreamFlags flags )
-{
-    PA_SELECT_FORMAT_( sourceFormat,
-                       /* paFloat32: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_UNITY_CONVERSION_( 32 ),
-                                          /* paInt32: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int32 ),
-                                          /* paInt24: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int24 ),
-                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int16 ),
-                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int8 ),
-                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, UInt8 )
-                                        ),
-                       /* paInt32: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_USE_CONVERTER_( Int32, Float32 ),
-                                          /* paInt32: */          PA_UNITY_CONVERSION_( 32 ),
-                                          /* paInt24: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int24 ),
-                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int16 ),
-                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int8 ),
-                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int32, UInt8 )
-                                        ),
-                       /* paInt24: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_USE_CONVERTER_( Int24, Float32 ),
-                                          /* paInt32: */          PA_USE_CONVERTER_( Int24, Int32 ),
-                                          /* paInt24: */          PA_UNITY_CONVERSION_( 24 ),
-                                          /* paInt16: */          PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int16 ),
-                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int8 ),
-                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int24, UInt8 )
-                                        ),
-                       /* paInt16: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_USE_CONVERTER_( Int16, Float32 ),
-                                          /* paInt32: */          PA_USE_CONVERTER_( Int16, Int32 ),
-                                          /* paInt24: */          PA_USE_CONVERTER_( Int16, Int24 ),
-                                          /* paInt16: */          PA_UNITY_CONVERSION_( 16 ),
-                                          /* paInt8: */           PA_SELECT_CONVERTER_DITHER_( flags, Int16, Int8 ),
-                                          /* paUInt8: */          PA_SELECT_CONVERTER_DITHER_( flags, Int16, UInt8 )
-                                        ),
-                       /* paInt8: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_USE_CONVERTER_( Int8, Float32 ),
-                                          /* paInt32: */          PA_USE_CONVERTER_( Int8, Int32 ),
-                                          /* paInt24: */          PA_USE_CONVERTER_( Int8, Int24 ),
-                                          /* paInt16: */          PA_USE_CONVERTER_( Int8, Int16 ),
-                                          /* paInt8: */           PA_UNITY_CONVERSION_( 8 ),
-                                          /* paUInt8: */          PA_USE_CONVERTER_( Int8, UInt8 )
-                                        ),
-                       /* paUInt8: */
-                       PA_SELECT_FORMAT_( destinationFormat,
-                                          /* paFloat32: */        PA_USE_CONVERTER_( UInt8, Float32 ),
-                                          /* paInt32: */          PA_USE_CONVERTER_( UInt8, Int32 ),
-                                          /* paInt24: */          PA_USE_CONVERTER_( UInt8, Int24 ),
-                                          /* paInt16: */          PA_USE_CONVERTER_( UInt8, Int16 ),
-                                          /* paInt8: */           PA_USE_CONVERTER_( UInt8, Int8 ),
-                                          /* paUInt8: */          PA_UNITY_CONVERSION_( 8 )
-                                        )
-                     )
-}
-
-/* -------------------------------------------------------------------------- */
-
-#ifdef PA_NO_STANDARD_CONVERTERS
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilConverterTable paConverters = {
-    0, /* PaUtilConverter *Float32_To_Int32; */
-    0, /* PaUtilConverter *Float32_To_Int32_Dither; */
-    0, /* PaUtilConverter *Float32_To_Int32_Clip; */
-    0, /* PaUtilConverter *Float32_To_Int32_DitherClip; */
-
-    0, /* PaUtilConverter *Float32_To_Int24; */
-    0, /* PaUtilConverter *Float32_To_Int24_Dither; */
-    0, /* PaUtilConverter *Float32_To_Int24_Clip; */
-    0, /* PaUtilConverter *Float32_To_Int24_DitherClip; */
-
-    0, /* PaUtilConverter *Float32_To_Int16; */
-    0, /* PaUtilConverter *Float32_To_Int16_Dither; */
-    0, /* PaUtilConverter *Float32_To_Int16_Clip; */
-    0, /* PaUtilConverter *Float32_To_Int16_DitherClip; */
-
-    0, /* PaUtilConverter *Float32_To_Int8; */
-    0, /* PaUtilConverter *Float32_To_Int8_Dither; */
-    0, /* PaUtilConverter *Float32_To_Int8_Clip; */
-    0, /* PaUtilConverter *Float32_To_Int8_DitherClip; */
-
-    0, /* PaUtilConverter *Float32_To_UInt8; */
-    0, /* PaUtilConverter *Float32_To_UInt8_Dither; */
-    0, /* PaUtilConverter *Float32_To_UInt8_Clip; */
-    0, /* PaUtilConverter *Float32_To_UInt8_DitherClip; */
-
-    0, /* PaUtilConverter *Int32_To_Float32; */
-    0, /* PaUtilConverter *Int32_To_Int24; */
-    0, /* PaUtilConverter *Int32_To_Int24_Dither; */
-    0, /* PaUtilConverter *Int32_To_Int16; */
-    0, /* PaUtilConverter *Int32_To_Int16_Dither; */
-    0, /* PaUtilConverter *Int32_To_Int8; */
-    0, /* PaUtilConverter *Int32_To_Int8_Dither; */
-    0, /* PaUtilConverter *Int32_To_UInt8; */
-    0, /* PaUtilConverter *Int32_To_UInt8_Dither; */
-
-    0, /* PaUtilConverter *Int24_To_Float32; */
-    0, /* PaUtilConverter *Int24_To_Int32; */
-    0, /* PaUtilConverter *Int24_To_Int16; */
-    0, /* PaUtilConverter *Int24_To_Int16_Dither; */
-    0, /* PaUtilConverter *Int24_To_Int8; */
-    0, /* PaUtilConverter *Int24_To_Int8_Dither; */
-    0, /* PaUtilConverter *Int24_To_UInt8; */
-    0, /* PaUtilConverter *Int24_To_UInt8_Dither; */
-    
-    0, /* PaUtilConverter *Int16_To_Float32; */
-    0, /* PaUtilConverter *Int16_To_Int32; */
-    0, /* PaUtilConverter *Int16_To_Int24; */
-    0, /* PaUtilConverter *Int16_To_Int8; */
-    0, /* PaUtilConverter *Int16_To_Int8_Dither; */
-    0, /* PaUtilConverter *Int16_To_UInt8; */
-    0, /* PaUtilConverter *Int16_To_UInt8_Dither; */
-
-    0, /* PaUtilConverter *Int8_To_Float32; */
-    0, /* PaUtilConverter *Int8_To_Int32; */
-    0, /* PaUtilConverter *Int8_To_Int24 */
-    0, /* PaUtilConverter *Int8_To_Int16; */
-    0, /* PaUtilConverter *Int8_To_UInt8; */
-
-    0, /* PaUtilConverter *UInt8_To_Float32; */
-    0, /* PaUtilConverter *UInt8_To_Int32; */
-    0, /* PaUtilConverter *UInt8_To_Int24; */
-    0, /* PaUtilConverter *UInt8_To_Int16; */
-    0, /* PaUtilConverter *UInt8_To_Int8; */
-
-    0, /* PaUtilConverter *Copy_8_To_8; */
-    0, /* PaUtilConverter *Copy_16_To_16; */
-    0, /* PaUtilConverter *Copy_24_To_24; */
-    0  /* PaUtilConverter *Copy_32_To_32; */
-};
-
-/* -------------------------------------------------------------------------- */
-
-#else /* PA_NO_STANDARD_CONVERTERS is not defined */
-
-/* -------------------------------------------------------------------------- */
-
-#define PA_CLIP_( val, min, max )\
-    { val = ((val) < (min)) ? (min) : (((val) > (max)) ? (max) : (val)); }
-
-
-static const float const_1_div_128_ = 1.0f / 128.0f;  /* 8 bit multiplier */
-
-static const float const_1_div_32768_ = 1.0f / 32768.f; /* 16 bit multiplier */
-
-static const double const_1_div_2147483648_ = 1.0 / 2147483648.0; /* 32 bit multiplier */
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* REVIEW */
-#ifdef PA_USE_C99_LRINTF
-        float scaled = *src * 0x7FFFFFFF;
-        *dest = lrintf(scaled-0.5f);
-#else
-        double scaled = *src * 0x7FFFFFFF;
-        *dest = (PaInt32) scaled;        
-#endif
-        
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-
-    while( count-- )
-    {
-        /* REVIEW */
-#ifdef PA_USE_C99_LRINTF
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = ((float)*src * (2147483646.0f)) + dither;
-        *dest = lrintf(dithered - 0.5f);
-#else
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        *dest = (PaInt32) dithered;
-#endif
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        /* REVIEW */
-#ifdef PA_USE_C99_LRINTF
-        float scaled = *src * 0x7FFFFFFF;
-        PA_CLIP_( scaled, -2147483648.f, 2147483647.f  );
-        *dest = lrintf(scaled-0.5f);
-#else
-        double scaled = *src * 0x7FFFFFFF;
-        PA_CLIP_( scaled, -2147483648., 2147483647.  );
-        *dest = (PaInt32) scaled;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-
-    while( count-- )
-    {
-        /* REVIEW */
-#ifdef PA_USE_C99_LRINTF
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = ((float)*src * (2147483646.0f)) + dither;
-        PA_CLIP_( dithered, -2147483648.f, 2147483647.f  );
-        *dest = lrintf(dithered-0.5f);
-#else
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        PA_CLIP_( dithered, -2147483648., 2147483647.  );
-        *dest = (PaInt32) dithered;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    PaInt32 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        /* convert to 32 bit and drop the low 8 bits */
-        double scaled = *src * 0x7FFFFFFF;
-        temp = (PaInt32) scaled;
-        
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 24);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 8);
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    PaInt32 temp;
-
-    while( count-- )
-    {
-        /* convert to 32 bit and drop the low 8 bits */
-
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        
-        temp = (PaInt32) dithered;
-
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 24);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 8);
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    PaInt32 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        /* convert to 32 bit and drop the low 8 bits */
-        double scaled = *src * 0x7FFFFFFF;
-        PA_CLIP_( scaled, -2147483648., 2147483647.  );
-        temp = (PaInt32) scaled;
-
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 24);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 8);
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    PaInt32 temp;
-    
-    while( count-- )
-    {
-        /* convert to 32 bit and drop the low 8 bits */
-        
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        PA_CLIP_( dithered, -2147483648., 2147483647.  );
-        
-        temp = (PaInt32) dithered;
-
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 24);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 8);
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-#ifdef PA_USE_C99_LRINTF
-        float tempf = (*src * (32767.0f)) ;
-        *dest = lrintf(tempf-0.5f);
-#else
-        short samp = (short) (*src * (32767.0f));
-        *dest = samp;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt16 *dest = (PaInt16*)destinationBuffer;
-
-    while( count-- )
-    {
-
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = (*src * (32766.0f)) + dither;
-
-#ifdef PA_USE_C99_LRINTF
-        *dest = lrintf(dithered-0.5f);
-#else
-        *dest = (PaInt16) dithered;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-#ifdef PA_USE_C99_LRINTF
-        long samp = lrintf((*src * (32767.0f)) -0.5f);
-#else
-        long samp = (PaInt32) (*src * (32767.0f));
-#endif
-        PA_CLIP_( samp, -0x8000, 0x7FFF );
-        *dest = (PaInt16) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = (*src * (32766.0f)) + dither;
-        PaInt32 samp = (PaInt32) dithered;
-        PA_CLIP_( samp, -0x8000, 0x7FFF );
-#ifdef PA_USE_C99_LRINTF
-        *dest = lrintf(samp-0.5f);
-#else
-        *dest = (PaInt16) samp;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        signed char samp = (signed char) (*src * (127.0f));
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = (*src * (126.0f)) + dither;
-        PaInt32 samp = (PaInt32) dithered;
-        *dest = (signed char) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int8_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        PaInt32 samp = (PaInt32)(*src * (127.0f));
-        PA_CLIP_( samp, -0x80, 0x7F );
-        *dest = (signed char) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int8_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        /* use smaller scaler to prevent overflow when we add the dither */
-        float dithered = (*src * (126.0f)) + dither;
-        PaInt32 samp = (PaInt32) dithered;
-        PA_CLIP_( samp, -0x80, 0x7F );
-        *dest = (signed char) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_UInt8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        unsigned char samp = (unsigned char)(128 + ((unsigned char) (*src * (127.0f))));
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_UInt8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_UInt8_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_UInt8_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Float32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    float *dest =  (float*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        *dest = (float) ((double)*src * const_1_div_2147483648_);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src    = (PaInt32*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    (void) ditherGenerator; /* unused parameter */
-    
-	while( count-- )
-    {
-		/* REVIEW */
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = (unsigned char)(*src >> 8);
-        dest[1] = (unsigned char)(*src >> 16);
-        dest[2] = (unsigned char)(*src >> 24);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(*src >> 24);
-        dest[1] = (unsigned char)(*src >> 16);
-        dest[2] = (unsigned char)(*src >> 8);
-#endif
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int24_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    (void) destinationBuffer; /* unused parameters */
-    (void) destinationStride; /* unused parameters */
-    (void) sourceBuffer; /* unused parameters */
-    (void) sourceStride; /* unused parameters */
-    (void) count; /* unused parameters */
-    (void) ditherGenerator; /* unused parameters */
-    /* IMPLEMENT ME */
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        *dest = (PaInt16) ((*src) >> 16);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int16_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    PaInt32 dither;
-
-    while( count-- )
-    {
-        /* REVIEW */
-        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
-        *dest = (PaInt16) ((((*src)>>1) + dither) >> 15);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        *dest = (signed char) ((*src) >> 24);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_Int8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    PaInt32 dither;
-
-    while( count-- )
-    {
-        /* REVIEW */
-        dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
-        *dest = (signed char) ((((*src)>>1) + dither) >> 23);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_UInt8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-		(*dest) = (unsigned char)(((*src) >> 24) + 128); 
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int32_To_UInt8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt32 *src = (PaInt32*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Float32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    float *dest = (float*)destinationBuffer;
-    PaInt32 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-
-#if defined(PA_LITTLE_ENDIAN)
-        temp = (((long)src[0]) << 8);  
-        temp = temp | (((long)src[1]) << 16);
-        temp = temp | (((long)src[2]) << 24);
-#elif defined(PA_BIG_ENDIAN)
-        temp = (((long)src[0]) << 24);
-        temp = temp | (((long)src[1]) << 16);
-        temp = temp | (((long)src[2]) << 8);
-#endif
-
-        *dest = (float) ((double)temp * const_1_div_2147483648_);
-
-        src += sourceStride * 3;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src  = (unsigned char*)sourceBuffer;
-    PaInt32 *dest = (PaInt32*)  destinationBuffer;
-    PaInt32 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-
-#if defined(PA_LITTLE_ENDIAN)
-        temp = (((long)src[0]) << 8);  
-        temp = temp | (((long)src[1]) << 16);
-        temp = temp | (((long)src[2]) << 24);
-#elif defined(PA_BIG_ENDIAN)
-        temp = (((long)src[0]) << 24);
-        temp = temp | (((long)src[1]) << 16);
-        temp = temp | (((long)src[2]) << 8);
-#endif
-
-        *dest = temp;
-
-        src += sourceStride * 3;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    PaInt16 *dest = (PaInt16*)destinationBuffer;
-    
-    PaInt16 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-        
-    while( count-- )
-    {
-		
-#if defined(PA_LITTLE_ENDIAN)
-		/* src[0] is discarded */
-        temp = (((PaInt16)src[1]));
-        temp = temp | (PaInt16)(((PaInt16)src[2]) << 8);
-#elif defined(PA_BIG_ENDIAN)
-		/* src[2] is discarded */
-        temp = (PaInt16)(((PaInt16)src[0]) << 8);
-        temp = temp | (((PaInt16)src[1]));
-#endif
-
-        *dest = temp;
-
-        src += sourceStride * 3;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Int16_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    (void) destinationBuffer; /* unused parameters */
-    (void) destinationStride; /* unused parameters */
-    (void) sourceBuffer; /* unused parameters */
-    (void) sourceStride; /* unused parameters */
-    (void) count; /* unused parameters */
-    (void) ditherGenerator; /* unused parameters */
-    /* IMPLEMENT ME */
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Int8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    signed char  *dest = (signed char*)destinationBuffer;
-    
-    (void) ditherGenerator; /* unused parameter */
-        
-    while( count-- )
-    {	
-	
-#if defined(PA_LITTLE_ENDIAN)
-		/* src[0] is discarded */
-		/* src[1] is discarded */
-        *dest = src[2];
-#elif defined(PA_BIG_ENDIAN)
-		/* src[2] is discarded */
-		/* src[1] is discarded */
-		*dest = src[0];
-#endif
-
-        src += sourceStride * 3;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_Int8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    (void) destinationBuffer; /* unused parameters */
-    (void) destinationStride; /* unused parameters */
-    (void) sourceBuffer; /* unused parameters */
-    (void) sourceStride; /* unused parameters */
-    (void) count; /* unused parameters */
-    (void) ditherGenerator; /* unused parameters */
-    /* IMPLEMENT ME */
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_UInt8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    
-    (void) ditherGenerator; /* unused parameter */
-        
-    while( count-- )
-    {
-		
-#if defined(PA_LITTLE_ENDIAN)
-		/* src[0] is discarded */
-		/* src[1] is discarded */
-        *dest = (unsigned char)(src[2] + 128);
-#elif defined(PA_BIG_ENDIAN)
-        *dest = (unsigned char)(src[0] + 128);
-		/* src[1] is discarded */
-		/* src[2] is discarded */		
-#endif
-
-        src += sourceStride * 3;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int24_To_UInt8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    (void) destinationBuffer; /* unused parameters */
-    (void) destinationStride; /* unused parameters */
-    (void) sourceBuffer; /* unused parameters */
-    (void) sourceStride; /* unused parameters */
-    (void) count; /* unused parameters */
-    (void) ditherGenerator; /* unused parameters */
-    /* IMPLEMENT ME */
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_Float32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    float *dest =  (float*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        float samp = *src * const_1_div_32768_; /* FIXME: i'm concerned about this being asymetrical with float->int16 -rb */
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* REVIEW: we should consider something like
-            (*src << 16) | (*src & 0xFFFF)
-        */
-        
-        *dest = *src << 16;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src   = (PaInt16*) sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    PaInt16 temp;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        temp = *src;
-        
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = 0;
-        dest[1] = (unsigned char)(temp);
-        dest[2] = (unsigned char)(temp >> 8);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp);
-        dest[2] = 0;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_Int8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        (*dest) = (signed char)((*src) >> 8);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_Int8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    signed char *dest =  (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_UInt8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-		(*dest) = (unsigned char)(((*src) >> 8) + 128); 
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int16_To_UInt8_Dither(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaInt16 *src = (PaInt16*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        /* IMPLEMENT ME */
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int8_To_Float32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    signed char *src = (signed char*)sourceBuffer;
-    float *dest =  (float*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        float samp = *src * const_1_div_128_;
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int8_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    signed char *src = (signed char*)sourceBuffer;
-    PaInt32 *dest =  (PaInt32*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-		(*dest) = (*src) << 24;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int8_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    signed char *src = (signed char*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = 0;
-        dest[1] = 0;
-        dest[2] = (*src);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (*src);
-        dest[1] = 0;
-        dest[2] = 0;
-#endif
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int8_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    signed char *src = (signed char*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        (*dest) = (PaInt16)((*src) << 8);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Int8_To_UInt8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    signed char *src = (signed char*)sourceBuffer;
-    unsigned char *dest =  (unsigned char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        (*dest) = (unsigned char)(*src + 128);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void UInt8_To_Float32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    float *dest =  (float*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        float samp = (*src - 128) * const_1_div_128_;
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void UInt8_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    PaInt32 *dest = (PaInt32*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-		(*dest) = (*src - 128) << 24;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void UInt8_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-	unsigned char *src  = (unsigned char*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    (void) ditherGenerator; /* unused parameters */
-    
-	while( count-- )
-    {
-
-#if defined(PA_LITTLE_ENDIAN)
-        dest[0] = 0;
-        dest[1] = 0;
-        dest[2] = (unsigned char)(*src - 128);
-#elif defined(PA_BIG_ENDIAN)
-        dest[0] = (unsigned char)(*src - 128);
-        dest[1] = 0;
-        dest[2] = 0;
-#endif
-		
-        src += sourceStride;
-        dest += destinationStride * 3;    
-	}
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void UInt8_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    PaInt16 *dest =  (PaInt16*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        (*dest) = (PaInt16)((*src - 128) << 8);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void UInt8_To_Int8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    signed char  *dest = (signed char*)destinationBuffer;
-    (void)ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        (*dest) = (signed char)(*src - 128);
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Copy_8_To_8(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-                                                      
-    (void) ditherGenerator; /* unused parameter */
-
-    while( count-- )
-    {
-        *dest = *src;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Copy_16_To_16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaUint16 *src = (PaUint16 *)sourceBuffer;
-    PaUint16 *dest = (PaUint16 *)destinationBuffer;
-                                                        
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        *dest = *src;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Copy_24_To_24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    unsigned char *src = (unsigned char*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        dest[0] = src[0];
-        dest[1] = src[1];
-        dest[2] = src[2];
-
-        src += sourceStride * 3;
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Copy_32_To_32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    PaUint32 *dest = (PaUint32 *)destinationBuffer;
-    PaUint32 *src = (PaUint32 *)sourceBuffer;
-
-    (void) ditherGenerator; /* unused parameter */
-    
-    while( count-- )
-    {
-        *dest = *src;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilConverterTable paConverters = {
-    Float32_To_Int32,              /* PaUtilConverter *Float32_To_Int32; */
-    Float32_To_Int32_Dither,       /* PaUtilConverter *Float32_To_Int32_Dither; */
-    Float32_To_Int32_Clip,         /* PaUtilConverter *Float32_To_Int32_Clip; */
-    Float32_To_Int32_DitherClip,   /* PaUtilConverter *Float32_To_Int32_DitherClip; */
-
-    Float32_To_Int24,              /* PaUtilConverter *Float32_To_Int24; */
-    Float32_To_Int24_Dither,       /* PaUtilConverter *Float32_To_Int24_Dither; */
-    Float32_To_Int24_Clip,         /* PaUtilConverter *Float32_To_Int24_Clip; */
-    Float32_To_Int24_DitherClip,   /* PaUtilConverter *Float32_To_Int24_DitherClip; */
-    
-    Float32_To_Int16,              /* PaUtilConverter *Float32_To_Int16; */
-    Float32_To_Int16_Dither,       /* PaUtilConverter *Float32_To_Int16_Dither; */
-    Float32_To_Int16_Clip,         /* PaUtilConverter *Float32_To_Int16_Clip; */
-    Float32_To_Int16_DitherClip,   /* PaUtilConverter *Float32_To_Int16_DitherClip; */
-
-    Float32_To_Int8,               /* PaUtilConverter *Float32_To_Int8; */
-    Float32_To_Int8_Dither,        /* PaUtilConverter *Float32_To_Int8_Dither; */
-    Float32_To_Int8_Clip,          /* PaUtilConverter *Float32_To_Int8_Clip; */
-    Float32_To_Int8_DitherClip,    /* PaUtilConverter *Float32_To_Int8_DitherClip; */
-
-    Float32_To_UInt8,              /* PaUtilConverter *Float32_To_UInt8; */
-    Float32_To_UInt8_Dither,       /* PaUtilConverter *Float32_To_UInt8_Dither; */
-    Float32_To_UInt8_Clip,         /* PaUtilConverter *Float32_To_UInt8_Clip; */
-    Float32_To_UInt8_DitherClip,   /* PaUtilConverter *Float32_To_UInt8_DitherClip; */
-
-    Int32_To_Float32,              /* PaUtilConverter *Int32_To_Float32; */
-    Int32_To_Int24,                /* PaUtilConverter *Int32_To_Int24; */
-    Int32_To_Int24_Dither,         /* PaUtilConverter *Int32_To_Int24_Dither; */
-    Int32_To_Int16,                /* PaUtilConverter *Int32_To_Int16; */
-    Int32_To_Int16_Dither,         /* PaUtilConverter *Int32_To_Int16_Dither; */
-    Int32_To_Int8,                 /* PaUtilConverter *Int32_To_Int8; */
-    Int32_To_Int8_Dither,          /* PaUtilConverter *Int32_To_Int8_Dither; */
-    Int32_To_UInt8,                /* PaUtilConverter *Int32_To_UInt8; */
-    Int32_To_UInt8_Dither,         /* PaUtilConverter *Int32_To_UInt8_Dither; */
-
-    Int24_To_Float32,              /* PaUtilConverter *Int24_To_Float32; */
-    Int24_To_Int32,                /* PaUtilConverter *Int24_To_Int32; */
-    Int24_To_Int16,                /* PaUtilConverter *Int24_To_Int16; */
-    Int24_To_Int16_Dither,         /* PaUtilConverter *Int24_To_Int16_Dither; */
-    Int24_To_Int8,                 /* PaUtilConverter *Int24_To_Int8; */
-    Int24_To_Int8_Dither,          /* PaUtilConverter *Int24_To_Int8_Dither; */
-    Int24_To_UInt8,                /* PaUtilConverter *Int24_To_UInt8; */
-    Int24_To_UInt8_Dither,         /* PaUtilConverter *Int24_To_UInt8_Dither; */
-
-    Int16_To_Float32,              /* PaUtilConverter *Int16_To_Float32; */
-    Int16_To_Int32,                /* PaUtilConverter *Int16_To_Int32; */
-    Int16_To_Int24,                /* PaUtilConverter *Int16_To_Int24; */
-    Int16_To_Int8,                 /* PaUtilConverter *Int16_To_Int8; */
-    Int16_To_Int8_Dither,          /* PaUtilConverter *Int16_To_Int8_Dither; */
-    Int16_To_UInt8,                /* PaUtilConverter *Int16_To_UInt8; */
-    Int16_To_UInt8_Dither,         /* PaUtilConverter *Int16_To_UInt8_Dither; */
-
-    Int8_To_Float32,               /* PaUtilConverter *Int8_To_Float32; */
-    Int8_To_Int32,                 /* PaUtilConverter *Int8_To_Int32; */
-    Int8_To_Int24,                 /* PaUtilConverter *Int8_To_Int24 */
-    Int8_To_Int16,                 /* PaUtilConverter *Int8_To_Int16; */
-    Int8_To_UInt8,                 /* PaUtilConverter *Int8_To_UInt8; */
-
-    UInt8_To_Float32,              /* PaUtilConverter *UInt8_To_Float32; */
-    UInt8_To_Int32,                /* PaUtilConverter *UInt8_To_Int32; */
-    UInt8_To_Int24,                /* PaUtilConverter *UInt8_To_Int24; */
-    UInt8_To_Int16,                /* PaUtilConverter *UInt8_To_Int16; */
-    UInt8_To_Int8,                 /* PaUtilConverter *UInt8_To_Int8; */
-
-    Copy_8_To_8,                   /* PaUtilConverter *Copy_8_To_8; */
-    Copy_16_To_16,                 /* PaUtilConverter *Copy_16_To_16; */
-    Copy_24_To_24,                 /* PaUtilConverter *Copy_24_To_24; */
-    Copy_32_To_32                  /* PaUtilConverter *Copy_32_To_32; */
-};
-
-/* -------------------------------------------------------------------------- */
-
-#endif /* PA_NO_STANDARD_CONVERTERS */
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilZeroer* PaUtil_SelectZeroer( PaSampleFormat destinationFormat )
-{
-    switch( destinationFormat & ~paNonInterleaved ){
-    case paFloat32:
-        return paZeroers.Zero32;
-    case paInt32:
-        return paZeroers.Zero32;
-    case paInt24:
-        return paZeroers.Zero24;
-    case paInt16:
-        return paZeroers.Zero16;
-    case paInt8:
-        return paZeroers.Zero8;
-    case paUInt8:
-        return paZeroers.ZeroU8;
-    default: return 0;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-#ifdef PA_NO_STANDARD_ZEROERS
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilZeroerTable paZeroers = {
-    0,  /* PaUtilZeroer *ZeroU8; */
-    0,  /* PaUtilZeroer *Zero8; */
-    0,  /* PaUtilZeroer *Zero16; */
-    0,  /* PaUtilZeroer *Zero24; */
-    0,  /* PaUtilZeroer *Zero32; */
-};
-
-/* -------------------------------------------------------------------------- */
-
-#else /* PA_NO_STANDARD_ZEROERS is not defined */
-
-/* -------------------------------------------------------------------------- */
-
-static void ZeroU8( void *destinationBuffer, signed int destinationStride,
-        unsigned int count )
-{
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-
-    while( count-- )
-    {
-        *dest = 128;
-
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Zero8( void *destinationBuffer, signed int destinationStride,
-        unsigned int count )
-{
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-
-    while( count-- )
-    {
-        *dest = 0;
-
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Zero16( void *destinationBuffer, signed int destinationStride,
-        unsigned int count )
-{
-    PaUint16 *dest = (PaUint16 *)destinationBuffer;
-
-    while( count-- )
-    {
-        *dest = 0;
-
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Zero24( void *destinationBuffer, signed int destinationStride,
-        unsigned int count )
-{
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-
-    while( count-- )
-    {
-        dest[0] = 0;
-        dest[1] = 0;
-        dest[2] = 0;
-
-        dest += destinationStride * 3;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Zero32( void *destinationBuffer, signed int destinationStride,
-        unsigned int count )
-{
-    PaUint32 *dest = (PaUint32 *)destinationBuffer;
-
-    while( count-- )
-    {
-        *dest = 0;
-
-        dest += destinationStride;
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-PaUtilZeroerTable paZeroers = {
-    ZeroU8,  /* PaUtilZeroer *ZeroU8; */
-    Zero8,  /* PaUtilZeroer *Zero8; */
-    Zero16,  /* PaUtilZeroer *Zero16; */
-    Zero24,  /* PaUtilZeroer *Zero24; */
-    Zero32,  /* PaUtilZeroer *Zero32; */
-};
-
-/* -------------------------------------------------------------------------- */
-
-#endif /* PA_NO_STANDARD_ZEROERS */
diff --git a/libs/portaudio/src/common/pa_converters.h b/libs/portaudio/src/common/pa_converters.h
deleted file mode 100644
index 7ddfcaa3c2..0000000000
--- a/libs/portaudio/src/common/pa_converters.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef PA_CONVERTERS_H
-#define PA_CONVERTERS_H
-/*
- * $Id: pa_converters.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library sample conversion mechanism
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Conversion functions used to convert buffers of samples from one
- format to another.
-*/
-
-
-#include "portaudio.h"  /* for PaSampleFormat */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-struct PaUtilTriangularDitherGenerator;
-
-
-/** Choose an available sample format which is most appropriate for
- representing the requested format. If the requested format is not available
- higher quality formats are considered before lower quality formates.
- @param availableFormats A variable containing the logical OR of all available
- formats.
- @param format The desired format.
- @return The most appropriate available format for representing the requested
- format.
-*/
-PaSampleFormat PaUtil_SelectClosestAvailableFormat(
-        PaSampleFormat availableFormats, PaSampleFormat format );
-
-
-/* high level conversions functions for use by implementations */
-
-
-/** The generic sample converter prototype. Sample converters convert count
-    samples from sourceBuffer to destinationBuffer. The actual type of the data
-    pointed to by these parameters varys for different converter functions.
-    @param destinationBuffer A pointer to the first sample of the destination.
-    @param destinationStride An offset between successive destination samples
-    expressed in samples (not bytes.) It may be negative.
-    @param sourceBuffer A pointer to the first sample of the source.
-    @param sourceStride An offset between successive source samples
-    expressed in samples (not bytes.) It may be negative.
-    @param count The number of samples to convert.
-    @param ditherState State information used to calculate dither. Converters
-    that do not perform dithering will ignore this parameter, in which case
-    NULL or invalid dither state may be passed.
-*/
-typedef void PaUtilConverter(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, struct PaUtilTriangularDitherGenerator *ditherGenerator );
-
-
-/** Find a sample converter function for the given source and destinations
-    formats and flags (clip and dither.)
-    @return
-    A pointer to a PaUtilConverter which will perform the requested
-    conversion, or NULL if the given format conversion is not supported.
-    For conversions where clipping or dithering is not necessary, the
-    clip and dither flags are ignored and a non-clipping or dithering
-    version is returned.
-    If the source and destination formats are the same, a function which
-    copies data of the appropriate size will be returned.
-*/
-PaUtilConverter* PaUtil_SelectConverter( PaSampleFormat sourceFormat,
-        PaSampleFormat destinationFormat, PaStreamFlags flags );
-
-
-/** The generic buffer zeroer prototype. Buffer zeroers copy count zeros to
-    destinationBuffer. The actual type of the data pointed to varys for
-    different zeroer functions.
-    @param destinationBuffer A pointer to the first sample of the destination.
-    @param destinationStride An offset between successive destination samples
-    expressed in samples (not bytes.) It may be negative.
-    @param count The number of samples to zero.
-*/
-typedef void PaUtilZeroer(
-    void *destinationBuffer, signed int destinationStride, unsigned int count );
-
-    
-/** Find a buffer zeroer function for the given destination format.
-    @return
-    A pointer to a PaUtilZeroer which will perform the requested
-    zeroing.
-*/
-PaUtilZeroer* PaUtil_SelectZeroer( PaSampleFormat destinationFormat );
-
-/*----------------------------------------------------------------------------*/
-/* low level functions and data structures which may be used for
-    substituting conversion functions */
-
-
-/** The type used to store all sample conversion functions.
-    @see paConverters;
-*/
-typedef struct{
-    PaUtilConverter *Float32_To_Int32;
-    PaUtilConverter *Float32_To_Int32_Dither;
-    PaUtilConverter *Float32_To_Int32_Clip;
-    PaUtilConverter *Float32_To_Int32_DitherClip;
-
-    PaUtilConverter *Float32_To_Int24;
-    PaUtilConverter *Float32_To_Int24_Dither;
-    PaUtilConverter *Float32_To_Int24_Clip;
-    PaUtilConverter *Float32_To_Int24_DitherClip;
-    
-    PaUtilConverter *Float32_To_Int16;
-    PaUtilConverter *Float32_To_Int16_Dither;
-    PaUtilConverter *Float32_To_Int16_Clip;
-    PaUtilConverter *Float32_To_Int16_DitherClip;
-
-    PaUtilConverter *Float32_To_Int8;
-    PaUtilConverter *Float32_To_Int8_Dither;
-    PaUtilConverter *Float32_To_Int8_Clip;
-    PaUtilConverter *Float32_To_Int8_DitherClip;
-
-    PaUtilConverter *Float32_To_UInt8;
-    PaUtilConverter *Float32_To_UInt8_Dither;
-    PaUtilConverter *Float32_To_UInt8_Clip;
-    PaUtilConverter *Float32_To_UInt8_DitherClip;
-
-    PaUtilConverter *Int32_To_Float32;
-    PaUtilConverter *Int32_To_Int24;
-    PaUtilConverter *Int32_To_Int24_Dither;
-    PaUtilConverter *Int32_To_Int16;
-    PaUtilConverter *Int32_To_Int16_Dither;
-    PaUtilConverter *Int32_To_Int8;
-    PaUtilConverter *Int32_To_Int8_Dither;
-    PaUtilConverter *Int32_To_UInt8;
-    PaUtilConverter *Int32_To_UInt8_Dither;
-
-    PaUtilConverter *Int24_To_Float32;
-    PaUtilConverter *Int24_To_Int32;
-    PaUtilConverter *Int24_To_Int16;
-    PaUtilConverter *Int24_To_Int16_Dither;
-    PaUtilConverter *Int24_To_Int8;
-    PaUtilConverter *Int24_To_Int8_Dither;
-    PaUtilConverter *Int24_To_UInt8;
-    PaUtilConverter *Int24_To_UInt8_Dither;
-
-    PaUtilConverter *Int16_To_Float32;
-    PaUtilConverter *Int16_To_Int32;
-    PaUtilConverter *Int16_To_Int24;
-    PaUtilConverter *Int16_To_Int8;
-    PaUtilConverter *Int16_To_Int8_Dither;
-    PaUtilConverter *Int16_To_UInt8;
-    PaUtilConverter *Int16_To_UInt8_Dither;
-
-    PaUtilConverter *Int8_To_Float32;
-    PaUtilConverter *Int8_To_Int32;
-    PaUtilConverter *Int8_To_Int24;
-    PaUtilConverter *Int8_To_Int16;
-    PaUtilConverter *Int8_To_UInt8;
-    
-    PaUtilConverter *UInt8_To_Float32;
-    PaUtilConverter *UInt8_To_Int32;
-    PaUtilConverter *UInt8_To_Int24;
-    PaUtilConverter *UInt8_To_Int16;
-    PaUtilConverter *UInt8_To_Int8;
-
-    PaUtilConverter *Copy_8_To_8;       /* copy without any conversion */
-    PaUtilConverter *Copy_16_To_16;     /* copy without any conversion */
-    PaUtilConverter *Copy_24_To_24;     /* copy without any conversion */
-    PaUtilConverter *Copy_32_To_32;     /* copy without any conversion */
-} PaUtilConverterTable;
-
-
-/** A table of pointers to all required converter functions.
-    PaUtil_SelectConverter() uses this table to lookup the appropriate
-    conversion functions. The fields of this structure are initialized
-    with default conversion functions. Fields may be NULL, indicating that
-    no conversion function is available. User code may substitue optimised
-    conversion functions by assigning different function pointers to
-    these fields.
-
-    @note
-    If the PA_NO_STANDARD_CONVERTERS preprocessor variable is defined,
-    PortAudio's standard converters will not be compiled, and all fields
-    of this structure will be initialized to NULL. In such cases, users
-    should supply their own conversion functions if the require PortAudio
-    to open a stream that requires sample conversion.
-
-    @see PaUtilConverterTable, PaUtilConverter, PaUtil_SelectConverter
-*/
-extern PaUtilConverterTable paConverters;
-
-
-/** The type used to store all buffer zeroing functions.
-    @see paZeroers;
-*/
-typedef struct{
-    PaUtilZeroer *ZeroU8; /* unsigned 8 bit, zero == 128 */
-    PaUtilZeroer *Zero8;
-    PaUtilZeroer *Zero16;
-    PaUtilZeroer *Zero24;
-    PaUtilZeroer *Zero32;
-} PaUtilZeroerTable;
-
-
-/** A table of pointers to all required zeroer functions.
-    PaUtil_SelectZeroer() uses this table to lookup the appropriate
-    conversion functions. The fields of this structure are initialized
-    with default conversion functions. User code may substitue optimised
-    conversion functions by assigning different function pointers to
-    these fields.
-
-    @note
-    If the PA_NO_STANDARD_ZEROERS preprocessor variable is defined,
-    PortAudio's standard zeroers will not be compiled, and all fields
-    of this structure will be initialized to NULL. In such cases, users
-    should supply their own zeroing functions for the sample sizes which
-    they intend to use.
-
-    @see PaUtilZeroerTable, PaUtilZeroer, PaUtil_SelectZeroer
-*/
-extern PaUtilZeroerTable paZeroers;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_CONVERTERS_H */
diff --git a/libs/portaudio/src/common/pa_cpuload.c b/libs/portaudio/src/common/pa_cpuload.c
deleted file mode 100644
index 445503c291..0000000000
--- a/libs/portaudio/src/common/pa_cpuload.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * $Id: pa_cpuload.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library CPU Load measurement functions
- * Portable CPU load measurement facility.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 2002 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Functions to assist in measuring the CPU utilization of a callback
- stream. Used to implement the Pa_GetStreamCpuLoad() function.
-
- @todo Dynamically calculate the coefficients used to smooth the CPU Load
- Measurements over time to provide a uniform characterisation of CPU Load
- independent of rate at which PaUtil_BeginCpuLoadMeasurement /
- PaUtil_EndCpuLoadMeasurement are called.
-*/
-
-
-#include "pa_cpuload.h"
-
-#include <assert.h>
-
-#include "pa_util.h"   /* for PaUtil_GetTime() */
-
-
-void PaUtil_InitializeCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer, double sampleRate )
-{
-    assert( sampleRate > 0 );
-
-    measurer->samplingPeriod = 1. / sampleRate;
-    measurer->averageLoad = 0.;
-}
-
-void PaUtil_ResetCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer )
-{
-    measurer->averageLoad = 0.;
-}
-
-void PaUtil_BeginCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer )
-{
-    measurer->measurementStartTime = PaUtil_GetTime();
-}
-
-
-void PaUtil_EndCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer, unsigned long framesProcessed )
-{
-    double measurementEndTime, secondsFor100Percent, measuredLoad;
-
-    if( framesProcessed > 0 ){
-        measurementEndTime = PaUtil_GetTime();
-
-        assert( framesProcessed > 0 );
-        secondsFor100Percent = framesProcessed * measurer->samplingPeriod;
-
-        measuredLoad = (measurementEndTime - measurer->measurementStartTime) / secondsFor100Percent;
-
-        /* Low pass filter the calculated CPU load to reduce jitter using a simple IIR low pass filter. */
-        /** FIXME @todo these coefficients shouldn't be hardwired */
-#define LOWPASS_COEFFICIENT_0   (0.9)
-#define LOWPASS_COEFFICIENT_1   (0.99999 - LOWPASS_COEFFICIENT_0)
-
-        measurer->averageLoad = (LOWPASS_COEFFICIENT_0 * measurer->averageLoad) +
-                               (LOWPASS_COEFFICIENT_1 * measuredLoad);
-    }
-}
-
-
-double PaUtil_GetCpuLoad( PaUtilCpuLoadMeasurer* measurer )
-{
-    return measurer->averageLoad;
-}
diff --git a/libs/portaudio/src/common/pa_cpuload.h b/libs/portaudio/src/common/pa_cpuload.h
deleted file mode 100644
index 4a594430b8..0000000000
--- a/libs/portaudio/src/common/pa_cpuload.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef PA_CPULOAD_H
-#define PA_CPULOAD_H
-/*
- * $Id: pa_cpuload.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library CPU Load measurement functions
- * Portable CPU load measurement facility.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 2002 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Functions to assist in measuring the CPU utilization of a callback
- stream. Used to implement the Pa_GetStreamCpuLoad() function.
-*/
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-typedef struct {
-    double samplingPeriod;
-    double measurementStartTime;
-    double averageLoad;
-} PaUtilCpuLoadMeasurer; /**< @todo need better name than measurer */
-
-void PaUtil_InitializeCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer, double sampleRate );
-void PaUtil_BeginCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer );
-void PaUtil_EndCpuLoadMeasurement( PaUtilCpuLoadMeasurer* measurer, unsigned long framesProcessed );
-void PaUtil_ResetCpuLoadMeasurer( PaUtilCpuLoadMeasurer* measurer );
-double PaUtil_GetCpuLoad( PaUtilCpuLoadMeasurer* measurer );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */     
-#endif /* PA_CPULOAD_H */
diff --git a/libs/portaudio/src/common/pa_debugprint.c b/libs/portaudio/src/common/pa_debugprint.c
deleted file mode 100644
index 98836994e6..0000000000
--- a/libs/portaudio/src/common/pa_debugprint.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * $Id: pa_log.c $
- * Portable Audio I/O Library Multi-Host API front end
- * Validate function parameters and manage multiple host APIs.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Implements log function.
-
-    PaUtil_SetLogPrintFunction can be user called to replace the provided
-	DefaultLogPrint function, which writes to stderr.
-	One can NOT pass var_args across compiler/dll boundaries as it is not
-	"byte code/abi portable". So the technique used here is to allocate a local
-	a static array, write in it, then callback the user with a pointer to its
-	start.
-
-    @todo Consider allocating strdump using dynamic allocation.
-    @todo Consider reentrancy and possibly corrupted strdump buffer.
-*/
-
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "pa_debugprint.h"
-
-
-
-static PaUtilLogCallback userCB=0;
-
-
-void PaUtil_SetDebugPrintFunction(PaUtilLogCallback cb)
-{
-    userCB = cb;
-}
-
-/*
- If your platform doesn’t have vsnprintf, you are stuck with a
- VERY dangerous alternative, vsprintf (with no n)
- */
-
-#if (_MSC_VER) && (_MSC_VER <= 1400)
-#define VSNPRINTF  _vsnprintf
-#else
-#define VSNPRINTF  vsnprintf
-#endif
-
-#define SIZEDUMP 1024
-
-static char strdump[SIZEDUMP];
-
-void PaUtil_DebugPrint( const char *format, ... )
-{
-
-    if (userCB)
-    {
-        va_list ap;
-        va_start( ap, format );
-        VSNPRINTF( strdump, SIZEDUMP, format, ap );
-        userCB(strdump);
-        va_end( ap ); 
-    }
-    else
-    {
-        va_list ap;
-        va_start( ap, format );
-        vfprintf( stderr, format, ap );
-        va_end( ap );
-        fflush( stderr );
-    }
-
-}
diff --git a/libs/portaudio/src/common/pa_debugprint.h b/libs/portaudio/src/common/pa_debugprint.h
deleted file mode 100644
index 5fba7667dc..0000000000
--- a/libs/portaudio/src/common/pa_debugprint.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef PA_LOG_H
-#define PA_LOG_H
-/*
- * Log file redirector function
- * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/** @file
- @ingroup common_src
-*/
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-
-void PaUtil_DebugPrint( const char *format, ... );
-
-
-/*
-    The basic format for log messages is described below. If you need to
-    add any log messages, please follow this format.
-
-    Function entry (void function):
-
-        "FunctionName called.\n"
-
-    Function entry (non void function):
-
-        "FunctionName called:\n"
-        "\tParam1Type param1: param1Value\n"
-        "\tParam2Type param2: param2Value\n"      (etc...)
-
-
-    Function exit (no return value):
-
-        "FunctionName returned.\n"
-
-    Function exit (simple return value):
-
-        "FunctionName returned:\n"
-        "\tReturnType: returnValue\n"
-
-    If the return type is an error code, the error text is displayed in ()
-
-    If the return type is not an error code, but has taken a special value
-    because an error occurred, then the reason for the error is shown in []
-
-    If the return type is a struct ptr, the struct is dumped.
-
-    See the code below for examples
-*/
-
-/** PA_DEBUG() provides a simple debug message printing facility. The macro
- passes it's argument to a printf-like function called PaUtil_DebugPrint()
- which prints to stderr and always flushes the stream after printing.
- Because preprocessor macros cannot directly accept variable length argument
- lists, calls to the macro must include an additional set of parenthesis, eg:
- PA_DEBUG(("errorno: %d", 1001 ));
-*/
-
-
-#ifdef PA_ENABLE_DEBUG_OUTPUT
-#define PA_DEBUG(x) PaUtil_DebugPrint x ;
-#else
-#define PA_DEBUG(x)
-#endif
-
-
-#ifdef PA_LOG_API_CALLS
-#define PA_LOGAPI(x) PaUtil_DebugPrint x 
-
-#define PA_LOGAPI_ENTER(functionName) PaUtil_DebugPrint( functionName " called.\n" )
-
-#define PA_LOGAPI_ENTER_PARAMS(functionName) PaUtil_DebugPrint( functionName " called:\n" )
-
-#define PA_LOGAPI_EXIT(functionName) PaUtil_DebugPrint( functionName " returned.\n" )
-
-#define PA_LOGAPI_EXIT_PAERROR( functionName, result ) \
-	PaUtil_DebugPrint( functionName " returned:\n" ); \
-	PaUtil_DebugPrint("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) )
-
-#define PA_LOGAPI_EXIT_T( functionName, resultFormatString, result ) \
-	PaUtil_DebugPrint( functionName " returned:\n" ); \
-	PaUtil_DebugPrint("\t" resultFormatString "\n", result )
-
-#define PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( functionName, positiveResultFormatString, result ) \
-	PaUtil_DebugPrint( functionName " returned:\n" ); \
-	if( result > 0 ) \
-        PaUtil_DebugPrint("\t" positiveResultFormatString "\n", result ); \
-    else \
-        PaUtil_DebugPrint("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) )
-#else
-#define PA_LOGAPI(x)
-#define PA_LOGAPI_ENTER(functionName)
-#define PA_LOGAPI_ENTER_PARAMS(functionName)
-#define PA_LOGAPI_EXIT(functionName)
-#define PA_LOGAPI_EXIT_PAERROR( functionName, result )
-#define PA_LOGAPI_EXIT_T( functionName, resultFormatString, result )
-#define PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( functionName, positiveResultFormatString, result )
-#endif
-
-    
-typedef void (*PaUtilLogCallback ) (const char *log);
-
-/**
-    Install user provided log function
-*/
-void PaUtil_SetDebugPrintFunction(PaUtilLogCallback  cb);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_LOG_H */
diff --git a/libs/portaudio/src/common/pa_dither.c b/libs/portaudio/src/common/pa_dither.c
deleted file mode 100644
index 92b6af0241..0000000000
--- a/libs/portaudio/src/common/pa_dither.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * $Id: pa_dither.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library triangular dither generator
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Functions for generating dither noise
-*/
-
-#include "pa_types.h"
-#include "pa_dither.h"
-
-
-/* Note that the linear congruential algorithm requires 32 bit integers
- * because it uses arithmetic overflow. So use PaUint32 instead of
- * unsigned long so it will work on 64 bit systems.
- */
-
-#define PA_DITHER_BITS_   (15)
-
-
-void PaUtil_InitializeTriangularDitherState( PaUtilTriangularDitherGenerator *state )
-{
-    state->previous = 0;
-    state->randSeed1 = 22222;
-    state->randSeed2 = 5555555;
-}
-
-
-PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state )
-{
-    PaInt32 current, highPass;
-
-    /* Generate two random numbers. */
-    state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
-    state->randSeed2 = (state->randSeed2 * 196314165) + 907633515;
-
-    /* Generate triangular distribution about 0.
-     * Shift before adding to prevent overflow which would skew the distribution.
-     * Also shift an extra bit for the high pass filter. 
-     */
-#define DITHER_SHIFT_  ((sizeof(PaInt32)*8 - PA_DITHER_BITS_) + 1)
-	
-    current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
-              (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
-
-    /* High pass filter to reduce audibility. */
-    highPass = current - state->previous;
-    state->previous = current;
-    return highPass;
-}
-
-
-/* Multiply by PA_FLOAT_DITHER_SCALE_ to get a float between -2.0 and +1.99999 */
-#define PA_FLOAT_DITHER_SCALE_  (1.0f / ((1<<PA_DITHER_BITS_)-1))
-static const float const_float_dither_scale_ = PA_FLOAT_DITHER_SCALE_;
-
-float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *state )
-{
-    PaInt32 current, highPass;
-
-    /* Generate two random numbers. */
-    state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
-    state->randSeed2 = (state->randSeed2 * 196314165) + 907633515;
-
-    /* Generate triangular distribution about 0.
-     * Shift before adding to prevent overflow which would skew the distribution.
-     * Also shift an extra bit for the high pass filter. 
-     */
-    current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
-              (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
-
-    /* High pass filter to reduce audibility. */
-    highPass = current - state->previous;
-    state->previous = current;
-    return ((float)highPass) * const_float_dither_scale_;
-}
-
-
-/*
-The following alternate dither algorithms (from musicdsp.org) could be
-considered
-*/
-
-/*Noise shaped dither  (March 2000)
--------------------
-
-This is a simple implementation of highpass triangular-PDF dither with
-2nd-order noise shaping, for use when truncating floating point audio
-data to fixed point.
-
-The noise shaping lowers the noise floor by 11dB below 5kHz (@ 44100Hz
-sample rate) compared to triangular-PDF dither. The code below assumes
-input data is in the range +1 to -1 and doesn't check for overloads!
-
-To save time when generating dither for multiple channels you can do
-things like this:  r3=(r1 & 0x7F)<<8; instead of calling rand() again.
-
-
-
-  int   r1, r2;                //rectangular-PDF random numbers
-  float s1, s2;                //error feedback buffers
-  float s = 0.5f;              //set to 0.0f for no noise shaping
-  float w = pow(2.0,bits-1);   //word length (usually bits=16)
-  float wi= 1.0f/w;            
-  float d = wi / RAND_MAX;     //dither amplitude (2 lsb)
-  float o = wi * 0.5f;         //remove dc offset
-  float in, tmp;
-  int   out;
-
-
-//for each sample...
-
-  r2=r1;                               //can make HP-TRI dither by
-  r1=rand();                           //subtracting previous rand()
-    
-  in += s * (s1 + s1 - s2);            //error feedback
-  tmp = in + o + d * (float)(r1 - r2); //dc offset and dither 
-  
-  out = (int)(w * tmp);                //truncate downwards
-  if(tmp<0.0f) out--;                  //this is faster than floor()
-
-  s2 = s1;                            
-  s1 = in - wi * (float)out;           //error
-
-
-
--- 
-paul.kellett@maxim.abel.co.uk
-http://www.maxim.abel.co.uk
-*/
-
-
-/*
-16-to-8-bit first-order dither
-
-Type : First order error feedforward dithering code
-References : Posted by Jon Watte
-
-Notes : 
-This is about as simple a dithering algorithm as you can implement, but it's
-likely to sound better than just truncating to N bits.
-
-Note that you might not want to carry forward the full difference for infinity.
-It's probably likely that the worst performance hit comes from the saturation
-conditionals, which can be avoided with appropriate instructions on many DSPs
-and integer SIMD type instructions, or CMOV.
-
-Last, if sound quality is paramount (such as when going from > 16 bits to 16
-bits) you probably want to use a higher-order dither function found elsewhere
-on this site. 
-
-
-Code : 
-// This code will down-convert and dither a 16-bit signed short 
-// mono signal into an 8-bit unsigned char signal, using a first 
-// order forward-feeding error term dither. 
-
-#define uchar unsigned char 
-
-void dither_one_channel_16_to_8( short * input, uchar * output, int count, int * memory ) 
-{ 
-  int m = *memory; 
-  while( count-- > 0 ) { 
-    int i = *input++; 
-    i += m; 
-    int j = i + 32768 - 128; 
-    uchar o; 
-    if( j < 0 ) { 
-      o = 0; 
-    } 
-    else if( j > 65535 ) { 
-      o = 255; 
-    } 
-    else { 
-      o = (uchar)((j>>8)&0xff); 
-    } 
-    m = ((j-32768+128)-i); 
-    *output++ = o; 
-  } 
-  *memory = m; 
-} 
-*/
diff --git a/libs/portaudio/src/common/pa_dither.h b/libs/portaudio/src/common/pa_dither.h
deleted file mode 100644
index a602364f57..0000000000
--- a/libs/portaudio/src/common/pa_dither.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef PA_DITHER_H
-#define PA_DITHER_H
-/*
- * $Id: pa_dither.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library triangular dither generator
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Functions for generating dither noise
-*/
-
-#include "pa_types.h"
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* Note that the linear congruential algorithm requires 32 bit integers
- * because it uses arithmetic overflow. So use PaUint32 instead of
- * unsigned long so it will work on 64 bit systems.
- */
-
-/** @brief State needed to generate a dither signal */
-typedef struct PaUtilTriangularDitherGenerator{
-    PaUint32 previous;
-    PaUint32 randSeed1;
-    PaUint32 randSeed2;
-} PaUtilTriangularDitherGenerator;
-
-
-/** @brief Initialize dither state */
-void PaUtil_InitializeTriangularDitherState( PaUtilTriangularDitherGenerator *ditherState );
-
-
-/**
- @brief Calculate 2 LSB dither signal with a triangular distribution.
- Ranged for adding to a 1 bit right-shifted 32 bit integer
- prior to >>15. eg:
-<pre>
-    signed long in = *
-    signed long dither = PaUtil_Generate16BitTriangularDither( ditherState );
-    signed short out = (signed short)(((in>>1) + dither) >> 15);
-</pre>
- @return
- A signed 32-bit integer with a range of +32767 to -32768
-*/
-PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
-
-
-/**
- @brief Calculate 2 LSB dither signal with a triangular distribution.
- Ranged for adding to a pre-scaled float.
-<pre>
-    float in = *
-    float dither = PaUtil_GenerateFloatTriangularDither( ditherState );
-    // use smaller scaler to prevent overflow when we add the dither
-    signed short out = (signed short)(in*(32766.0f) + dither );
-</pre>
- @return
- A float with a range of -2.0 to +1.99999.
-*/
-float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_DITHER_H */
diff --git a/libs/portaudio/src/common/pa_endianness.h b/libs/portaudio/src/common/pa_endianness.h
deleted file mode 100644
index bdcc74f792..0000000000
--- a/libs/portaudio/src/common/pa_endianness.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef PA_ENDIANNESS_H
-#define PA_ENDIANNESS_H
-/*
- * $Id: pa_endianness.h 1216 2007-06-10 09:26:00Z aknudsen $
- * Portable Audio I/O Library current platform endianness macros
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Configure endianness symbols for the target processor.
-
- Arrange for either the PA_LITTLE_ENDIAN or PA_BIG_ENDIAN preprocessor symbols
- to be defined. The one that is defined reflects the endianness of the target
- platform and may be used to implement conditional compilation of byte-order
- dependent code.
-
- If either PA_LITTLE_ENDIAN or PA_BIG_ENDIAN is defined already, then no attempt
- is made to override that setting. This may be useful if you have a better way
- of determining the platform's endianness. The autoconf mechanism uses this for
- example.
-
- A PA_VALIDATE_ENDIANNESS macro is provided to compare the compile time
- and runtime endiannes and raise an assertion if they don't match.
-*/
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* If this is an apple, we need to do detect endianness this way */
-#if defined(__APPLE__)
-    /* we need to do some endian detection that is sensitive to harware arch */
-    #if defined(__LITTLE_ENDIAN__)
-       #if !defined( PA_LITTLE_ENDIAN )
-          #define PA_LITTLE_ENDIAN
-       #endif
-       #if defined( PA_BIG_ENDIAN )
-          #undef PA_BIG_ENDIAN
-       #endif
-    #else
-       #if !defined( PA_BIG_ENDIAN )
-          #define PA_BIG_ENDIAN
-       #endif
-       #if defined( PA_LITTLE_ENDIAN )
-          #undef PA_LITTLE_ENDIAN
-       #endif
-    #endif
-#else
-    /* this is not an apple, so first check the existing defines, and, failing that,
-       detect well-known architechtures. */
-
-    #if defined(PA_LITTLE_ENDIAN) || defined(PA_BIG_ENDIAN)
-        /* endianness define has been set externally, such as by autoconf */
-
-        #if defined(PA_LITTLE_ENDIAN) && defined(PA_BIG_ENDIAN)
-        #error both PA_LITTLE_ENDIAN and PA_BIG_ENDIAN have been defined externally to pa_endianness.h - only one endianness at a time please
-        #endif
-
-    #else
-        /* endianness define has not been set externally */
-
-        /* set PA_LITTLE_ENDIAN or PA_BIG_ENDIAN by testing well known platform specific defines */
-
-        #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(LITTLE_ENDIAN) || defined(__i386) || defined(_M_IX86) || defined(__x86_64__)
-            #define PA_LITTLE_ENDIAN /* win32, assume intel byte order */
-        #else
-            #define PA_BIG_ENDIAN
-        #endif
-    #endif
-
-    #if !defined(PA_LITTLE_ENDIAN) && !defined(PA_BIG_ENDIAN)
-        /*
-         If the following error is raised, you either need to modify the code above
-         to automatically determine the endianness from other symbols defined on your
-         platform, or define either PA_LITTLE_ENDIAN or PA_BIG_ENDIAN externally.
-        */
-        #error pa_endianness.h was unable to automatically determine the endianness of the target platform
-    #endif
-
-#endif
-
-
-/* PA_VALIDATE_ENDIANNESS compares the compile time and runtime endianness,
- and raises an assertion if they don't match. <assert.h> must be included in
- the context in which this macro is used.
-*/
-#if defined(PA_LITTLE_ENDIAN)
-    #define PA_VALIDATE_ENDIANNESS \
-    { \
-        const long nativeOne = 1; \
-        assert( "PortAudio: compile time and runtime endianness don't match" && (((char *)&nativeOne)[0]) == 1 ); \
-    }
-#elif defined(PA_BIG_ENDIAN)
-    #define PA_VALIDATE_ENDIANNESS \
-    { \
-        const long nativeOne = 1; \
-        assert( "PortAudio: compile time and runtime endianness don't match" && (((char *)&nativeOne)[0]) == 0 ); \
-    }
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_ENDIANNESS_H */
diff --git a/libs/portaudio/src/common/pa_front.c b/libs/portaudio/src/common/pa_front.c
deleted file mode 100644
index f1de930919..0000000000
--- a/libs/portaudio/src/common/pa_front.c
+++ /dev/null
@@ -1,1760 +0,0 @@
-/*
- * $Id: pa_front.c 1229 2007-06-15 16:11:11Z rossb $
- * Portable Audio I/O Library Multi-Host API front end
- * Validate function parameters and manage multiple host APIs.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Implements public PortAudio API, checks some errors, forwards to
- host API implementations.
- 
- Implements the functions defined in the PortAudio API, checks for
- some parameter and state inconsistencies and forwards API requests to
- specific Host API implementations (via the interface declared in
- pa_hostapi.h), and Streams (via the interface declared in pa_stream.h).
-
- This file handles initialization and termination of Host API
- implementations via initializers stored in the paHostApiInitializers
- global variable.
-
- Some utility functions declared in pa_util.h are implemented in this file.
-
- All PortAudio API functions can be conditionally compiled with logging code.
- To compile with logging, define the PA_LOG_API_CALLS precompiler symbol.
-
-    @todo Consider adding host API specific error text in Pa_GetErrorText() for
-    paUnanticipatedHostError
-
-    @todo Consider adding a new error code for when (inputParameters == NULL)
-    && (outputParameters == NULL)
-
-    @todo review whether Pa_CloseStream() should call the interface's
-    CloseStream function if aborting the stream returns an error code.
-
-    @todo Create new error codes if a NULL buffer pointer, or a
-    zero frame count is passed to Pa_ReadStream or Pa_WriteStream.
-*/
-
-
-#include <stdio.h>
-#include <memory.h>
-#include <string.h>
-#include <assert.h> /* needed by PA_VALIDATE_ENDIANNESS */
-
-#include "portaudio.h"
-#include "pa_util.h"
-#include "pa_endianness.h"
-#include "pa_types.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_trace.h" /* still usefull?*/
-#include "pa_debugprint.h"
-
-
-#define PA_VERSION_  1899
-#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__  ")"
-
-
-
-
-int Pa_GetVersion( void )
-{
-    return PA_VERSION_;
-}
-
-
-const char* Pa_GetVersionText( void )
-{
-    return PA_VERSION_TEXT_;
-}
-
-
-
-#define PA_LAST_HOST_ERROR_TEXT_LENGTH_  1024
-
-static char lastHostErrorText_[ PA_LAST_HOST_ERROR_TEXT_LENGTH_ + 1 ] = {0};
-
-static PaHostErrorInfo lastHostErrorInfo_ = { (PaHostApiTypeId)-1, 0, lastHostErrorText_ };
-
-
-void PaUtil_SetLastHostErrorInfo( PaHostApiTypeId hostApiType, long errorCode,
-        const char *errorText )
-{
-    lastHostErrorInfo_.hostApiType = hostApiType;
-    lastHostErrorInfo_.errorCode = errorCode;
-
-    strncpy( lastHostErrorText_, errorText, PA_LAST_HOST_ERROR_TEXT_LENGTH_ );
-}
-
-
-
-static PaUtilHostApiRepresentation **hostApis_ = 0;
-static int hostApisCount_ = 0;
-static int initializationCount_ = 0;
-static int deviceCount_ = 0;
-
-PaUtilStreamRepresentation *firstOpenStream_ = NULL;
-
-
-#define PA_IS_INITIALISED_ (initializationCount_ != 0)
-
-
-static int CountHostApiInitializers( void )
-{
-    int result = 0;
-
-    while( paHostApiInitializers[ result ] != 0 )
-        ++result;
-    return result;
-}
-
-
-static void TerminateHostApis( void )
-{
-    /* terminate in reverse order from initialization */
-    PA_DEBUG(("TerminateHostApis in \n"));
-
-    while( hostApisCount_ > 0 )
-    {
-        --hostApisCount_;
-        hostApis_[hostApisCount_]->Terminate( hostApis_[hostApisCount_] );
-    }
-    hostApisCount_ = 0;
-    deviceCount_ = 0;
-
-    if( hostApis_ != 0 )
-        PaUtil_FreeMemory( hostApis_ );
-    hostApis_ = 0;
-
-    PA_DEBUG(("TerminateHostApis out\n"));
-}
-
-
-static PaError InitializeHostApis( void )
-{
-    PaError result = paNoError;
-    int i, initializerCount, baseDeviceIndex;
-
-    initializerCount = CountHostApiInitializers();
-
-    hostApis_ = (PaUtilHostApiRepresentation**)PaUtil_AllocateMemory(
-            sizeof(PaUtilHostApiRepresentation*) * initializerCount );
-    if( !hostApis_ )
-    {
-        result = paInsufficientMemory;
-        goto error; 
-    }
-
-    hostApisCount_ = 0;
-    deviceCount_ = 0;
-    baseDeviceIndex = 0;
-
-    for( i=0; i< initializerCount; ++i )
-    {
-        hostApis_[hostApisCount_] = NULL;
-
-        PA_DEBUG(( "before paHostApiInitializers[%d].\n",i));
-
-        result = paHostApiInitializers[i]( &hostApis_[hostApisCount_], hostApisCount_ );
-        if( result != paNoError )
-            goto error;
-
-        PA_DEBUG(( "after paHostApiInitializers[%d].\n",i));
-
-        if( hostApis_[hostApisCount_] )
-        {
-            PaUtilHostApiRepresentation* hostApi = hostApis_[hostApisCount_];
-            assert( hostApi->info.defaultInputDevice < hostApi->info.deviceCount );
-            assert( hostApi->info.defaultOutputDevice < hostApi->info.deviceCount );
-
-            hostApi->privatePaFrontInfo.baseDeviceIndex = baseDeviceIndex;
-
-            if( hostApi->info.defaultInputDevice != paNoDevice )
-                hostApi->info.defaultInputDevice += baseDeviceIndex;
-
-            if( hostApi->info.defaultOutputDevice != paNoDevice )
-                hostApi->info.defaultOutputDevice += baseDeviceIndex;
-
-            baseDeviceIndex += hostApi->info.deviceCount;
-            deviceCount_ += hostApi->info.deviceCount;
-
-            ++hostApisCount_;
-        }
-    }
-
-    return result;
-
-error:
-    TerminateHostApis();
-    return result;
-}
-
-
-/*
-    FindHostApi() finds the index of the host api to which
-    <device> belongs and returns it. if <hostSpecificDeviceIndex> is
-    non-null, the host specific device index is returned in it.
-    returns -1 if <device> is out of range.
- 
-*/
-static int FindHostApi( PaDeviceIndex device, int *hostSpecificDeviceIndex )
-{
-    int i=0;
-
-    if( !PA_IS_INITIALISED_ )
-        return -1;
-
-    if( device < 0 )
-        return -1;
-
-    while( i < hostApisCount_
-            && device >= hostApis_[i]->info.deviceCount )
-    {
-
-        device -= hostApis_[i]->info.deviceCount;
-        ++i;
-    }
-
-    if( i >= hostApisCount_ )
-        return -1;
-
-    if( hostSpecificDeviceIndex )
-        *hostSpecificDeviceIndex = device;
-
-    return i;
-}
-
-
-static void AddOpenStream( PaStream* stream )
-{
-    ((PaUtilStreamRepresentation*)stream)->nextOpenStream = firstOpenStream_;
-    firstOpenStream_ = (PaUtilStreamRepresentation*)stream;
-}
-
-
-static void RemoveOpenStream( PaStream* stream )
-{
-    PaUtilStreamRepresentation *previous = NULL;
-    PaUtilStreamRepresentation *current = firstOpenStream_;
-
-    while( current != NULL )
-    {
-        if( ((PaStream*)current) == stream )
-        {
-            if( previous == NULL )
-            {
-                firstOpenStream_ = current->nextOpenStream;
-            }
-            else
-            {
-                previous->nextOpenStream = current->nextOpenStream;
-            }
-            return;
-        }
-        else
-        {
-            previous = current;
-            current = current->nextOpenStream;
-        }
-    }
-}
-
-
-static void CloseOpenStreams( void )
-{
-    /* we call Pa_CloseStream() here to ensure that the same destruction
-        logic is used for automatically closed streams */
-
-    while( firstOpenStream_ != NULL )
-        Pa_CloseStream( firstOpenStream_ );
-}
-
-
-PaError Pa_Initialize( void )
-{
-    PaError result;
-
-    PA_LOGAPI_ENTER( "Pa_Initialize" );
-
-    if( PA_IS_INITIALISED_ )
-    {
-        ++initializationCount_;
-        result = paNoError;
-    }
-    else
-    {
-        PA_VALIDATE_TYPE_SIZES;
-        PA_VALIDATE_ENDIANNESS;
-        
-        PaUtil_InitializeClock();
-        PaUtil_ResetTraceMessages();
-
-        result = InitializeHostApis();
-        if( result == paNoError )
-            ++initializationCount_;
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_Initialize", result );
-
-    return result;
-}
-
-
-PaError Pa_Terminate( void )
-{
-    PaError result;
-
-    PA_LOGAPI_ENTER( "Pa_Terminate" );
-
-    if( PA_IS_INITIALISED_ )
-    {
-        if( --initializationCount_ == 0 )
-        {
-            CloseOpenStreams();
-
-            TerminateHostApis();
-
-            PaUtil_DumpTraceMessages();
-        }
-        result = paNoError;
-    }
-    else
-    {
-        result=  paNotInitialized;
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_Terminate", result );
-
-    return result;
-}
-
-
-const PaHostErrorInfo* Pa_GetLastHostErrorInfo( void )
-{
-    return &lastHostErrorInfo_;
-}
-
-
-const char *Pa_GetErrorText( PaError errorCode )
-{
-    const char *result;
-
-    switch( errorCode )
-    {
-    case paNoError:                  result = "Success"; break;
-    case paNotInitialized:           result = "PortAudio not initialized"; break;
-    /** @todo could catenate the last host error text to result in the case of paUnanticipatedHostError */
-    case paUnanticipatedHostError:   result = "Unanticipated host error"; break;
-    case paInvalidChannelCount:      result = "Invalid number of channels"; break;
-    case paInvalidSampleRate:        result = "Invalid sample rate"; break;
-    case paInvalidDevice:            result = "Invalid device"; break;
-    case paInvalidFlag:              result = "Invalid flag"; break;
-    case paSampleFormatNotSupported: result = "Sample format not supported"; break;
-    case paBadIODeviceCombination:   result = "Illegal combination of I/O devices"; break;
-    case paInsufficientMemory:       result = "Insufficient memory"; break;
-    case paBufferTooBig:             result = "Buffer too big"; break;
-    case paBufferTooSmall:           result = "Buffer too small"; break;
-    case paNullCallback:             result = "No callback routine specified"; break;
-    case paBadStreamPtr:             result = "Invalid stream pointer"; break;
-    case paTimedOut:                 result = "Wait timed out"; break;
-    case paInternalError:            result = "Internal PortAudio error"; break;
-    case paDeviceUnavailable:        result = "Device unavailable"; break;
-    case paIncompatibleHostApiSpecificStreamInfo:   result = "Incompatible host API specific stream info"; break;
-    case paStreamIsStopped:          result = "Stream is stopped"; break;
-    case paStreamIsNotStopped:       result = "Stream is not stopped"; break;
-    case paInputOverflowed:          result = "Input overflowed"; break;
-    case paOutputUnderflowed:        result = "Output underflowed"; break;
-    case paHostApiNotFound:          result = "Host API not found"; break;
-    case paInvalidHostApi:           result = "Invalid host API"; break;
-    case paCanNotReadFromACallbackStream:       result = "Can't read from a callback stream"; break;
-    case paCanNotWriteToACallbackStream:        result = "Can't write to a callback stream"; break;
-    case paCanNotReadFromAnOutputOnlyStream:    result = "Can't read from an output only stream"; break;
-    case paCanNotWriteToAnInputOnlyStream:      result = "Can't write to an input only stream"; break;
-    default:                         
-		if( errorCode > 0 )
-			result = "Invalid error code (value greater than zero)"; 
-        else
-			result = "Invalid error code"; 
-        break;
-    }
-    return result;
-}
-
-
-PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type )
-{
-    PaHostApiIndex result;
-    int i;
-    
-    PA_LOGAPI_ENTER_PARAMS( "Pa_HostApiTypeIdToHostApiIndex" );
-    PA_LOGAPI(("\tPaHostApiTypeId type: %d\n", type ));
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        result = paHostApiNotFound;
-        
-        for( i=0; i < hostApisCount_; ++i )
-        {
-            if( hostApis_[i]->info.type == type )
-            {
-                result = i;
-                break;
-            }         
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_HostApiTypeIdToHostApiIndex", "PaHostApiIndex: %d", result );
-
-    return result;
-}
-
-
-PaError PaUtil_GetHostApiRepresentation( struct PaUtilHostApiRepresentation **hostApi,
-        PaHostApiTypeId type )
-{
-    PaError result;
-    int i;
-    
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        result = paHostApiNotFound;
-                
-        for( i=0; i < hostApisCount_; ++i )
-        {
-            if( hostApis_[i]->info.type == type )
-            {
-                *hostApi = hostApis_[i];
-                result = paNoError;
-                break;
-            }
-        }
-    }
-
-    return result;
-}
-
-
-PaError PaUtil_DeviceIndexToHostApiDeviceIndex(
-        PaDeviceIndex *hostApiDevice, PaDeviceIndex device, struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaError result;
-    PaDeviceIndex x;
-    
-    x = device - hostApi->privatePaFrontInfo.baseDeviceIndex;
-
-    if( x < 0 || x >= hostApi->info.deviceCount )
-    {
-        result = paInvalidDevice;
-    }
-    else
-    {
-        *hostApiDevice = x;
-        result = paNoError;
-    }
-
-    return result;
-}
-
-
-PaHostApiIndex Pa_GetHostApiCount( void )
-{
-    int result;
-
-    PA_LOGAPI_ENTER( "Pa_GetHostApiCount" );
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        result = hostApisCount_;
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetHostApiCount", "PaHostApiIndex: %d", result );
-
-    return result;
-}
-
-
-PaHostApiIndex Pa_GetDefaultHostApi( void )
-{
-    int result;
-
-    PA_LOGAPI_ENTER( "Pa_GetDefaultHostApi" );
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        result = paDefaultHostApiIndex;
-
-        /* internal consistency check: make sure that the default host api
-         index is within range */
-
-        if( result < 0 || result >= hostApisCount_ )
-        {
-            result = paInternalError;
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetDefaultHostApi", "PaHostApiIndex: %d", result );
-
-    return result;
-}
-
-
-const PaHostApiInfo* Pa_GetHostApiInfo( PaHostApiIndex hostApi )
-{
-    PaHostApiInfo *info;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetHostApiInfo" );
-    PA_LOGAPI(("\tPaHostApiIndex hostApi: %d\n", hostApi ));
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        info = NULL;
-
-        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
-        PA_LOGAPI(("\tPaHostApiInfo*: NULL [ PortAudio not initialized ]\n" ));
-
-    }
-    else if( hostApi < 0 || hostApi >= hostApisCount_ )
-    {
-        info = NULL;
-        
-        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
-        PA_LOGAPI(("\tPaHostApiInfo*: NULL [ hostApi out of range ]\n" ));
-
-    }
-    else
-    {
-        info = &hostApis_[hostApi]->info;
-
-        PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
-        PA_LOGAPI(("\tPaHostApiInfo*: 0x%p\n", info ));
-        PA_LOGAPI(("\t{\n" ));
-        PA_LOGAPI(("\t\tint structVersion: %d\n", info->structVersion ));
-        PA_LOGAPI(("\t\tPaHostApiTypeId type: %d\n", info->type ));
-        PA_LOGAPI(("\t\tconst char *name: %s\n", info->name ));
-        PA_LOGAPI(("\t}\n" ));
-
-    }
-
-     return info;
-}
-
-
-PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi, int hostApiDeviceIndex )
-{
-    PaDeviceIndex result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_HostApiDeviceIndexToPaDeviceIndex" );
-    PA_LOGAPI(("\tPaHostApiIndex hostApi: %d\n", hostApi ));
-    PA_LOGAPI(("\tint hostApiDeviceIndex: %d\n", hostApiDeviceIndex ));
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        if( hostApi < 0 || hostApi >= hostApisCount_ )
-        {
-            result = paInvalidHostApi;
-        }
-        else
-        {
-            if( hostApiDeviceIndex < 0 ||
-                    hostApiDeviceIndex >= hostApis_[hostApi]->info.deviceCount )
-            {
-                result = paInvalidDevice;
-            }
-            else
-            {
-                result = hostApis_[hostApi]->privatePaFrontInfo.baseDeviceIndex + hostApiDeviceIndex;
-            }
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_HostApiDeviceIndexToPaDeviceIndex", "PaDeviceIndex: %d", result );
-
-    return result;
-}
-
-
-PaDeviceIndex Pa_GetDeviceCount( void )
-{
-    PaDeviceIndex result;
-
-    PA_LOGAPI_ENTER( "Pa_GetDeviceCount" );
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-    }
-    else
-    {
-        result = deviceCount_;
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetDeviceCount", "PaDeviceIndex: %d", result );
-
-    return result;
-}
-
-
-PaDeviceIndex Pa_GetDefaultInputDevice( void )
-{
-    PaHostApiIndex hostApi;
-    PaDeviceIndex result;
-
-    PA_LOGAPI_ENTER( "Pa_GetDefaultInputDevice" );
-
-    hostApi = Pa_GetDefaultHostApi();
-    if( hostApi < 0 )
-    {
-        result = paNoDevice;
-    }
-    else
-    {
-        result = hostApis_[hostApi]->info.defaultInputDevice;
-    }
-
-    PA_LOGAPI_EXIT_T( "Pa_GetDefaultInputDevice", "PaDeviceIndex: %d", result );
-
-    return result;
-}
-
-
-PaDeviceIndex Pa_GetDefaultOutputDevice( void )
-{
-    PaHostApiIndex hostApi;
-    PaDeviceIndex result;
-    
-    PA_LOGAPI_ENTER( "Pa_GetDefaultOutputDevice" );
-
-    hostApi = Pa_GetDefaultHostApi();
-    if( hostApi < 0 )
-    {
-        result = paNoDevice;
-    }
-    else
-    {
-        result = hostApis_[hostApi]->info.defaultOutputDevice;
-    }
-
-    PA_LOGAPI_EXIT_T( "Pa_GetDefaultOutputDevice", "PaDeviceIndex: %d", result );
-
-    return result;
-}
-
-
-const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device )
-{
-    int hostSpecificDeviceIndex;
-    int hostApiIndex = FindHostApi( device, &hostSpecificDeviceIndex );
-    PaDeviceInfo *result;
-
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetDeviceInfo" );
-    PA_LOGAPI(("\tPaDeviceIndex device: %d\n", device ));
-
-    if( hostApiIndex < 0 )
-    {
-        result = NULL;
-
-        PA_LOGAPI(("Pa_GetDeviceInfo returned:\n" ));
-        PA_LOGAPI(("\tPaDeviceInfo* NULL [ invalid device index ]\n" ));
-
-    }
-    else
-    {
-        result = hostApis_[hostApiIndex]->deviceInfos[ hostSpecificDeviceIndex ];
-
-        PA_LOGAPI(("Pa_GetDeviceInfo returned:\n" ));
-        PA_LOGAPI(("\tPaDeviceInfo*: 0x%p:\n", result ));
-        PA_LOGAPI(("\t{\n" ));
-
-        PA_LOGAPI(("\t\tint structVersion: %d\n", result->structVersion ));
-        PA_LOGAPI(("\t\tconst char *name: %s\n", result->name ));
-        PA_LOGAPI(("\t\tPaHostApiIndex hostApi: %d\n", result->hostApi ));
-        PA_LOGAPI(("\t\tint maxInputChannels: %d\n", result->maxInputChannels ));
-        PA_LOGAPI(("\t\tint maxOutputChannels: %d\n", result->maxOutputChannels ));
-        PA_LOGAPI(("\t}\n" ));
-
-    }
-
-    return result;
-}
-
-
-/*
-    SampleFormatIsValid() returns 1 if sampleFormat is a sample format
-    defined in portaudio.h, or 0 otherwise.
-*/
-static int SampleFormatIsValid( PaSampleFormat format )
-{
-    switch( format & ~paNonInterleaved )
-    {
-    case paFloat32: return 1;
-    case paInt16: return 1;
-    case paInt32: return 1;
-    case paInt24: return 1;
-    case paInt8: return 1;
-    case paUInt8: return 1;
-    case paCustomFormat: return 1;
-    default: return 0;
-    }
-}
-
-/*
-    NOTE: make sure this validation list is kept syncronised with the one in
-            pa_hostapi.h
-
-    ValidateOpenStreamParameters() checks that parameters to Pa_OpenStream()
-    conform to the expected values as described below. This function is
-    also designed to be used with the proposed Pa_IsFormatSupported() function.
-    
-    There are basically two types of validation that could be performed:
-    Generic conformance validation, and device capability mismatch
-    validation. This function performs only generic conformance validation.
-    Validation that would require knowledge of device capabilities is
-    not performed because of potentially complex relationships between
-    combinations of parameters - for example, even if the sampleRate
-    seems ok, it might not be for a duplex stream - we have no way of
-    checking this in an API-neutral way, so we don't try.
- 
-    On success the function returns PaNoError and fills in hostApi,
-    hostApiInputDeviceID, and hostApiOutputDeviceID fields. On failure
-    the function returns an error code indicating the first encountered
-    parameter error.
- 
- 
-    If ValidateOpenStreamParameters() returns paNoError, the following
-    assertions are guaranteed to be true.
- 
-    - at least one of inputParameters & outputParmeters is valid (not NULL)
-
-    - if inputParameters & outputParameters are both valid, that
-        inputParameters->device & outputParameters->device  both use the same host api
- 
-    PaDeviceIndex inputParameters->device
-        - is within range (0 to Pa_GetDeviceCount-1) Or:
-        - is paUseHostApiSpecificDeviceSpecification and
-            inputParameters->hostApiSpecificStreamInfo is non-NULL and refers
-            to a valid host api
-
-    int inputParameters->channelCount
-        - if inputParameters->device is not paUseHostApiSpecificDeviceSpecification, channelCount is > 0
-        - upper bound is NOT validated against device capabilities
- 
-    PaSampleFormat inputParameters->sampleFormat
-        - is one of the sample formats defined in portaudio.h
-
-    void *inputParameters->hostApiSpecificStreamInfo
-        - if supplied its hostApi field matches the input device's host Api
- 
-    PaDeviceIndex outputParmeters->device
-        - is within range (0 to Pa_GetDeviceCount-1)
- 
-    int outputParmeters->channelCount
-        - if inputDevice is valid, channelCount is > 0
-        - upper bound is NOT validated against device capabilities
- 
-    PaSampleFormat outputParmeters->sampleFormat
-        - is one of the sample formats defined in portaudio.h
-        
-    void *outputParmeters->hostApiSpecificStreamInfo
-        - if supplied its hostApi field matches the output device's host Api
- 
-    double sampleRate
-        - is not an 'absurd' rate (less than 1000. or greater than 200000.)
-        - sampleRate is NOT validated against device capabilities
- 
-    PaStreamFlags streamFlags
-        - unused platform neutral flags are zero
-        - paNeverDropInput is only used for full-duplex callback streams with
-            variable buffer size (paFramesPerBufferUnspecified)
-*/
-static PaError ValidateOpenStreamParameters(
-    const PaStreamParameters *inputParameters,
-    const PaStreamParameters *outputParameters,
-    double sampleRate,
-    unsigned long framesPerBuffer,
-    PaStreamFlags streamFlags,
-    PaStreamCallback *streamCallback,
-    PaUtilHostApiRepresentation **hostApi,
-    PaDeviceIndex *hostApiInputDevice,
-    PaDeviceIndex *hostApiOutputDevice )
-{
-    int inputHostApiIndex  = -1, /* Surpress uninitialised var warnings: compiler does */
-        outputHostApiIndex = -1; /* not see that if inputParameters and outputParame-  */
-                                 /* ters are both nonzero, these indices are set.      */
-
-    if( (inputParameters == NULL) && (outputParameters == NULL) )
-    {
-        return paInvalidDevice; /** @todo should be a new error code "invalid device parameters" or something */
-    }
-    else
-    {
-        if( inputParameters == NULL )
-        {
-            *hostApiInputDevice = paNoDevice;
-        }
-        else if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-        {
-            if( inputParameters->hostApiSpecificStreamInfo )
-            {
-                inputHostApiIndex = Pa_HostApiTypeIdToHostApiIndex(
-                        ((PaUtilHostApiSpecificStreamInfoHeader*)inputParameters->hostApiSpecificStreamInfo)->hostApiType );
-
-                if( inputHostApiIndex != -1 )
-                {
-                    *hostApiInputDevice = paUseHostApiSpecificDeviceSpecification;
-                    *hostApi = hostApis_[inputHostApiIndex];
-                }
-                else
-                {
-                    return paInvalidDevice;
-                }
-            }
-            else
-            {
-                return paInvalidDevice;
-            }
-        }
-        else
-        {
-            if( inputParameters->device < 0 || inputParameters->device >= deviceCount_ )
-                return paInvalidDevice;
-
-            inputHostApiIndex = FindHostApi( inputParameters->device, hostApiInputDevice );
-            if( inputHostApiIndex < 0 )
-                return paInternalError;
-
-            *hostApi = hostApis_[inputHostApiIndex];
-
-            if( inputParameters->channelCount <= 0 )
-                return paInvalidChannelCount;
-
-            if( !SampleFormatIsValid( inputParameters->sampleFormat ) )
-                return paSampleFormatNotSupported;
-
-            if( inputParameters->hostApiSpecificStreamInfo != NULL )
-            {
-                if( ((PaUtilHostApiSpecificStreamInfoHeader*)inputParameters->hostApiSpecificStreamInfo)->hostApiType
-                        != (*hostApi)->info.type )
-                    return paIncompatibleHostApiSpecificStreamInfo;
-            }
-        }
-
-        if( outputParameters == NULL )
-        {
-            *hostApiOutputDevice = paNoDevice;
-        }
-        else if( outputParameters->device == paUseHostApiSpecificDeviceSpecification  )
-        {
-            if( outputParameters->hostApiSpecificStreamInfo )
-            {
-                outputHostApiIndex = Pa_HostApiTypeIdToHostApiIndex(
-                        ((PaUtilHostApiSpecificStreamInfoHeader*)outputParameters->hostApiSpecificStreamInfo)->hostApiType );
-
-                if( outputHostApiIndex != -1 )
-                {
-                    *hostApiOutputDevice = paUseHostApiSpecificDeviceSpecification;
-                    *hostApi = hostApis_[outputHostApiIndex];
-                }
-                else
-                {
-                    return paInvalidDevice;
-                }
-            }
-            else
-            {
-                return paInvalidDevice;
-            }
-        }
-        else
-        {
-            if( outputParameters->device < 0 || outputParameters->device >= deviceCount_ )
-                return paInvalidDevice;
-
-            outputHostApiIndex = FindHostApi( outputParameters->device, hostApiOutputDevice );
-            if( outputHostApiIndex < 0 )
-                return paInternalError;
-
-            *hostApi = hostApis_[outputHostApiIndex];
-
-            if( outputParameters->channelCount <= 0 )
-                return paInvalidChannelCount;
-
-            if( !SampleFormatIsValid( outputParameters->sampleFormat ) )
-                return paSampleFormatNotSupported;
-
-            if( outputParameters->hostApiSpecificStreamInfo != NULL )
-            {
-                if( ((PaUtilHostApiSpecificStreamInfoHeader*)outputParameters->hostApiSpecificStreamInfo)->hostApiType
-                        != (*hostApi)->info.type )
-                    return paIncompatibleHostApiSpecificStreamInfo;
-            }
-        }   
-
-        if( (inputParameters != NULL) && (outputParameters != NULL) )
-        {
-            /* ensure that both devices use the same API */
-            if( inputHostApiIndex != outputHostApiIndex )
-                return paBadIODeviceCombination;
-        }
-    }
-    
-    
-    /* Check for absurd sample rates. */
-    if( (sampleRate < 1000.0) || (sampleRate > 200000.0) )
-        return paInvalidSampleRate;
-
-    if( ((streamFlags & ~paPlatformSpecificFlags) & ~(paClipOff | paDitherOff | paNeverDropInput | paPrimeOutputBuffersUsingStreamCallback ) ) != 0 )
-        return paInvalidFlag;
-
-    if( streamFlags & paNeverDropInput )
-    {
-        /* must be a callback stream */
-        if( !streamCallback )
-             return paInvalidFlag;
-
-        /* must be a full duplex stream */
-        if( (inputParameters == NULL) || (outputParameters == NULL) )
-            return paInvalidFlag;
-
-        /* must use paFramesPerBufferUnspecified */
-        if( framesPerBuffer != paFramesPerBufferUnspecified )
-            return paInvalidFlag;
-    }
-    
-    return paNoError;
-}
-
-
-PaError Pa_IsFormatSupported( const PaStreamParameters *inputParameters,
-                              const PaStreamParameters *outputParameters,
-                              double sampleRate )
-{
-    PaError result;
-    PaUtilHostApiRepresentation *hostApi = 0;
-    PaDeviceIndex hostApiInputDevice = paNoDevice, hostApiOutputDevice = paNoDevice;
-    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
-    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
-
-
-#ifdef PA_LOG_API_CALLS
-    PA_LOGAPI_ENTER_PARAMS( "Pa_IsFormatSupported" );
-
-    if( inputParameters == NULL ){
-        PA_LOGAPI(("\tPaStreamParameters *inputParameters: NULL\n" ));
-    }else{
-        PA_LOGAPI(("\tPaStreamParameters *inputParameters: 0x%p\n", inputParameters ));
-        PA_LOGAPI(("\tPaDeviceIndex inputParameters->device: %d\n", inputParameters->device ));
-        PA_LOGAPI(("\tint inputParameters->channelCount: %d\n", inputParameters->channelCount ));
-        PA_LOGAPI(("\tPaSampleFormat inputParameters->sampleFormat: %d\n", inputParameters->sampleFormat ));
-        PA_LOGAPI(("\tPaTime inputParameters->suggestedLatency: %f\n", inputParameters->suggestedLatency ));
-        PA_LOGAPI(("\tvoid *inputParameters->hostApiSpecificStreamInfo: 0x%p\n", inputParameters->hostApiSpecificStreamInfo ));
-    }
-
-    if( outputParameters == NULL ){
-        PA_LOGAPI(("\tPaStreamParameters *outputParameters: NULL\n" ));
-    }else{
-        PA_LOGAPI(("\tPaStreamParameters *outputParameters: 0x%p\n", outputParameters ));
-        PA_LOGAPI(("\tPaDeviceIndex outputParameters->device: %d\n", outputParameters->device ));
-        PA_LOGAPI(("\tint outputParameters->channelCount: %d\n", outputParameters->channelCount ));
-        PA_LOGAPI(("\tPaSampleFormat outputParameters->sampleFormat: %d\n", outputParameters->sampleFormat ));
-        PA_LOGAPI(("\tPaTime outputParameters->suggestedLatency: %f\n", outputParameters->suggestedLatency ));
-        PA_LOGAPI(("\tvoid *outputParameters->hostApiSpecificStreamInfo: 0x%p\n", outputParameters->hostApiSpecificStreamInfo ));
-    }
-    
-    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
-#endif
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-
-        PA_LOGAPI_EXIT_PAERROR( "Pa_IsFormatSupported", result );
-        return result;
-    }
-
-    result = ValidateOpenStreamParameters( inputParameters,
-                                           outputParameters,
-                                           sampleRate, 0, paNoFlag, 0,
-                                           &hostApi,
-                                           &hostApiInputDevice,
-                                           &hostApiOutputDevice );
-    if( result != paNoError )
-    {
-        PA_LOGAPI_EXIT_PAERROR( "Pa_IsFormatSupported", result );
-        return result;
-    }
-    
-
-    if( inputParameters )
-    {
-        hostApiInputParameters.device = hostApiInputDevice;
-        hostApiInputParameters.channelCount = inputParameters->channelCount;
-        hostApiInputParameters.sampleFormat = inputParameters->sampleFormat;
-        hostApiInputParameters.suggestedLatency = inputParameters->suggestedLatency;
-        hostApiInputParameters.hostApiSpecificStreamInfo = inputParameters->hostApiSpecificStreamInfo;
-        hostApiInputParametersPtr = &hostApiInputParameters;
-    }
-    else
-    {
-        hostApiInputParametersPtr = NULL;
-    }
-
-    if( outputParameters )
-    {
-        hostApiOutputParameters.device = hostApiOutputDevice;
-        hostApiOutputParameters.channelCount = outputParameters->channelCount;
-        hostApiOutputParameters.sampleFormat = outputParameters->sampleFormat;
-        hostApiOutputParameters.suggestedLatency = outputParameters->suggestedLatency;
-        hostApiOutputParameters.hostApiSpecificStreamInfo = outputParameters->hostApiSpecificStreamInfo;
-        hostApiOutputParametersPtr = &hostApiOutputParameters;
-    }
-    else
-    {
-        hostApiOutputParametersPtr = NULL;
-    }
-
-    result = hostApi->IsFormatSupported( hostApi,
-                                  hostApiInputParametersPtr, hostApiOutputParametersPtr,
-                                  sampleRate );
-
-#ifdef PA_LOG_API_CALLS
-    PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-    if( result == paFormatIsSupported )
-        PA_LOGAPI(("\tPaError: 0 [ paFormatIsSupported ]\n" ));
-    else
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-#endif
-
-    return result;
-}
-
-
-PaError Pa_OpenStream( PaStream** stream,
-                       const PaStreamParameters *inputParameters,
-                       const PaStreamParameters *outputParameters,
-                       double sampleRate,
-                       unsigned long framesPerBuffer,
-                       PaStreamFlags streamFlags,
-                       PaStreamCallback *streamCallback,
-                       void *userData )
-{
-    PaError result;
-    PaUtilHostApiRepresentation *hostApi = 0;
-    PaDeviceIndex hostApiInputDevice = paNoDevice, hostApiOutputDevice = paNoDevice;
-    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
-    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
-
-
-#ifdef PA_LOG_API_CALLS
-    PA_LOGAPI_ENTER_PARAMS( "Pa_OpenStream" );
-    PA_LOGAPI(("\tPaStream** stream: 0x%p\n", stream ));
-
-    if( inputParameters == NULL ){
-        PA_LOGAPI(("\tPaStreamParameters *inputParameters: NULL\n" ));
-    }else{
-        PA_LOGAPI(("\tPaStreamParameters *inputParameters: 0x%p\n", inputParameters ));
-        PA_LOGAPI(("\tPaDeviceIndex inputParameters->device: %d\n", inputParameters->device ));
-        PA_LOGAPI(("\tint inputParameters->channelCount: %d\n", inputParameters->channelCount ));
-        PA_LOGAPI(("\tPaSampleFormat inputParameters->sampleFormat: %d\n", inputParameters->sampleFormat ));
-        PA_LOGAPI(("\tPaTime inputParameters->suggestedLatency: %f\n", inputParameters->suggestedLatency ));
-        PA_LOGAPI(("\tvoid *inputParameters->hostApiSpecificStreamInfo: 0x%p\n", inputParameters->hostApiSpecificStreamInfo ));
-    }
-
-    if( outputParameters == NULL ){
-        PA_LOGAPI(("\tPaStreamParameters *outputParameters: NULL\n" ));
-    }else{
-        PA_LOGAPI(("\tPaStreamParameters *outputParameters: 0x%p\n", outputParameters ));
-        PA_LOGAPI(("\tPaDeviceIndex outputParameters->device: %d\n", outputParameters->device ));
-        PA_LOGAPI(("\tint outputParameters->channelCount: %d\n", outputParameters->channelCount ));
-        PA_LOGAPI(("\tPaSampleFormat outputParameters->sampleFormat: %d\n", outputParameters->sampleFormat ));
-        PA_LOGAPI(("\tPaTime outputParameters->suggestedLatency: %f\n", outputParameters->suggestedLatency ));
-        PA_LOGAPI(("\tvoid *outputParameters->hostApiSpecificStreamInfo: 0x%p\n", outputParameters->hostApiSpecificStreamInfo ));
-    }
-    
-    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
-    PA_LOGAPI(("\tunsigned long framesPerBuffer: %d\n", framesPerBuffer ));
-    PA_LOGAPI(("\tPaStreamFlags streamFlags: 0x%x\n", streamFlags ));
-    PA_LOGAPI(("\tPaStreamCallback *streamCallback: 0x%p\n", streamCallback ));
-    PA_LOGAPI(("\tvoid *userData: 0x%p\n", userData ));
-#endif
-
-    if( !PA_IS_INITIALISED_ )
-    {
-        result = paNotInitialized;
-
-        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-        return result;
-    }
-
-    /* Check for parameter errors.
-        NOTE: make sure this validation list is kept syncronised with the one
-        in pa_hostapi.h
-    */
-
-    if( stream == NULL )
-    {
-        result = paBadStreamPtr;
-
-        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-        return result;
-    }
-
-    result = ValidateOpenStreamParameters( inputParameters,
-                                           outputParameters,
-                                           sampleRate, framesPerBuffer,
-                                           streamFlags, streamCallback,
-                                           &hostApi,
-                                           &hostApiInputDevice,
-                                           &hostApiOutputDevice );
-    if( result != paNoError )
-    {
-        PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-        PA_LOGAPI(("\t*(PaStream** stream): undefined\n" ));
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-        return result;
-    }
-    
-
-    if( inputParameters )
-    {
-        hostApiInputParameters.device = hostApiInputDevice;
-        hostApiInputParameters.channelCount = inputParameters->channelCount;
-        hostApiInputParameters.sampleFormat = inputParameters->sampleFormat;
-        hostApiInputParameters.suggestedLatency = inputParameters->suggestedLatency;
-        hostApiInputParameters.hostApiSpecificStreamInfo = inputParameters->hostApiSpecificStreamInfo;
-        hostApiInputParametersPtr = &hostApiInputParameters;
-    }
-    else
-    {
-        hostApiInputParametersPtr = NULL;
-    }
-
-    if( outputParameters )
-    {
-        hostApiOutputParameters.device = hostApiOutputDevice;
-        hostApiOutputParameters.channelCount = outputParameters->channelCount;
-        hostApiOutputParameters.sampleFormat = outputParameters->sampleFormat;
-        hostApiOutputParameters.suggestedLatency = outputParameters->suggestedLatency;
-        hostApiOutputParameters.hostApiSpecificStreamInfo = outputParameters->hostApiSpecificStreamInfo;
-        hostApiOutputParametersPtr = &hostApiOutputParameters;
-    }
-    else
-    {
-        hostApiOutputParametersPtr = NULL;
-    }
-
-    result = hostApi->OpenStream( hostApi, stream,
-                                  hostApiInputParametersPtr, hostApiOutputParametersPtr,
-                                  sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
-
-    if( result == paNoError )
-        AddOpenStream( *stream );
-
-
-    PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-    PA_LOGAPI(("\t*(PaStream** stream): 0x%p\n", *stream ));
-    PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-
-    return result;
-}
-
-
-PaError Pa_OpenDefaultStream( PaStream** stream,
-                              int inputChannelCount,
-                              int outputChannelCount,
-                              PaSampleFormat sampleFormat,
-                              double sampleRate,
-                              unsigned long framesPerBuffer,
-                              PaStreamCallback *streamCallback,
-                              void *userData )
-{
-    PaError result;
-    PaStreamParameters hostApiInputParameters, hostApiOutputParameters;
-    PaStreamParameters *hostApiInputParametersPtr, *hostApiOutputParametersPtr;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_OpenDefaultStream" );
-    PA_LOGAPI(("\tPaStream** stream: 0x%p\n", stream ));
-    PA_LOGAPI(("\tint inputChannelCount: %d\n", inputChannelCount ));
-    PA_LOGAPI(("\tint outputChannelCount: %d\n", outputChannelCount ));
-    PA_LOGAPI(("\tPaSampleFormat sampleFormat: %d\n", sampleFormat ));
-    PA_LOGAPI(("\tdouble sampleRate: %g\n", sampleRate ));
-    PA_LOGAPI(("\tunsigned long framesPerBuffer: %d\n", framesPerBuffer ));
-    PA_LOGAPI(("\tPaStreamCallback *streamCallback: 0x%p\n", streamCallback ));
-    PA_LOGAPI(("\tvoid *userData: 0x%p\n", userData ));
-
-
-    if( inputChannelCount > 0 )
-    {
-        hostApiInputParameters.device = Pa_GetDefaultInputDevice();
-		if( hostApiInputParameters.device == paNoDevice )
-			return paDeviceUnavailable; 
-	
-        hostApiInputParameters.channelCount = inputChannelCount;
-        hostApiInputParameters.sampleFormat = sampleFormat;
-        /* defaultHighInputLatency is used below instead of
-           defaultLowInputLatency because it is more important for the default
-           stream to work reliably than it is for it to work with the lowest
-           latency.
-         */
-        hostApiInputParameters.suggestedLatency = 
-             Pa_GetDeviceInfo( hostApiInputParameters.device )->defaultHighInputLatency;
-        hostApiInputParameters.hostApiSpecificStreamInfo = NULL;
-        hostApiInputParametersPtr = &hostApiInputParameters;
-    }
-    else
-    {
-        hostApiInputParametersPtr = NULL;
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        hostApiOutputParameters.device = Pa_GetDefaultOutputDevice();
-		if( hostApiOutputParameters.device == paNoDevice )
-			return paDeviceUnavailable; 
-
-        hostApiOutputParameters.channelCount = outputChannelCount;
-        hostApiOutputParameters.sampleFormat = sampleFormat;
-        /* defaultHighOutputLatency is used below instead of
-           defaultLowOutputLatency because it is more important for the default
-           stream to work reliably than it is for it to work with the lowest
-           latency.
-         */
-        hostApiOutputParameters.suggestedLatency =
-             Pa_GetDeviceInfo( hostApiOutputParameters.device )->defaultHighOutputLatency;
-        hostApiOutputParameters.hostApiSpecificStreamInfo = NULL;
-        hostApiOutputParametersPtr = &hostApiOutputParameters;
-    }
-    else
-    {
-        hostApiOutputParametersPtr = NULL;
-    }
-
-
-    result = Pa_OpenStream(
-                 stream, hostApiInputParametersPtr, hostApiOutputParametersPtr,
-                 sampleRate, framesPerBuffer, paNoFlag, streamCallback, userData );
-
-    PA_LOGAPI(("Pa_OpenDefaultStream returned:\n" ));
-    PA_LOGAPI(("\t*(PaStream** stream): 0x%p", *stream ));
-    PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-
-    return result;
-}
-
-
-PaError PaUtil_ValidateStreamPointer( PaStream* stream )
-{
-    if( !PA_IS_INITIALISED_ ) return paNotInitialized;
-
-    if( stream == NULL ) return paBadStreamPtr;
-
-    if( ((PaUtilStreamRepresentation*)stream)->magic != PA_STREAM_MAGIC )
-        return paBadStreamPtr;
-
-    return paNoError;
-}
-
-
-PaError Pa_CloseStream( PaStream* stream )
-{
-    PaUtilStreamInterface *interface;
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_CloseStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    /* always remove the open stream from our list, even if this function
-        eventually returns an error. Otherwise CloseOpenStreams() will
-        get stuck in an infinite loop */
-    RemoveOpenStream( stream ); /* be sure to call this _before_ closing the stream */
-
-    if( result == paNoError )
-    {
-        interface = PA_STREAM_INTERFACE(stream);
-
-        /* abort the stream if it isn't stopped */
-        result = interface->IsStopped( stream );
-        if( result == 1 )
-            result = paNoError;
-        else if( result == 0 )
-            result = interface->Abort( stream );
-
-        //if( result == paNoError )                 /** @todo REVIEW: shouldn't we close anyway? (probably!)*/
-		result = interface->Close( stream );
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_CloseStream", result );
-
-    return result;
-}
-
-
-PaError Pa_SetStreamFinishedCallback( PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_SetStreamFinishedCallback" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-    PA_LOGAPI(("\tPaStreamFinishedCallback* streamFinishedCallback: 0x%p\n", streamFinishedCallback ));
-
-    if( result == paNoError )
-    {
-        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-        if( result == 0 )
-        {
-            result = paStreamIsNotStopped ;
-        }
-        if( result == 1 )
-        {
-            PA_STREAM_REP( stream )->streamFinishedCallback = streamFinishedCallback;
-            result = paNoError;
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_SetStreamFinishedCallback", result );
-
-    return result;
-
-}
-
-
-PaError Pa_StartStream( PaStream *stream )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_StartStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-    {
-        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-        if( result == 0 )
-        {
-            result = paStreamIsNotStopped ;
-        }
-        else if( result == 1 )
-        {
-            result = PA_STREAM_INTERFACE(stream)->Start( stream );
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_StartStream", result );
-
-    return result;
-}
-
-
-PaError Pa_StopStream( PaStream *stream )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_StopStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-    {
-        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-        if( result == 0 )
-        {
-            result = PA_STREAM_INTERFACE(stream)->Stop( stream );
-        }
-        else if( result == 1 )
-        {
-            result = paStreamIsStopped;
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_StopStream", result );
-
-    return result;
-}
-
-
-PaError Pa_AbortStream( PaStream *stream )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_AbortStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-    {
-        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-        if( result == 0 )
-        {
-            result = PA_STREAM_INTERFACE(stream)->Abort( stream );
-        }
-        else if( result == 1 )
-        {
-            result = paStreamIsStopped;
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_AbortStream", result );
-
-    return result;
-}
-
-
-PaError Pa_IsStreamStopped( PaStream *stream )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_IsStreamStopped" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-        result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_IsStreamStopped", result );
-
-    return result;
-}
-
-
-PaError Pa_IsStreamActive( PaStream *stream )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_IsStreamActive" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-        result = PA_STREAM_INTERFACE(stream)->IsActive( stream );
-
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_IsStreamActive", result );
-
-    return result;
-}
-
-
-const PaStreamInfo* Pa_GetStreamInfo( PaStream *stream )
-{
-    PaError error = PaUtil_ValidateStreamPointer( stream );
-    const PaStreamInfo *result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamInfo" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( error != paNoError )
-    {
-        result = 0;
-
-        PA_LOGAPI(("Pa_GetStreamInfo returned:\n" ));
-        PA_LOGAPI(("\tconst PaStreamInfo*: 0 [PaError error:%d ( %s )]\n", result, error, Pa_GetErrorText( error ) ));
-
-    }
-    else
-    {
-        result = &PA_STREAM_REP( stream )->streamInfo;
-
-        PA_LOGAPI(("Pa_GetStreamInfo returned:\n" ));
-        PA_LOGAPI(("\tconst PaStreamInfo*: 0x%p:\n", result ));
-        PA_LOGAPI(("\t{" ));
-
-        PA_LOGAPI(("\t\tint structVersion: %d\n", result->structVersion ));
-        PA_LOGAPI(("\t\tPaTime inputLatency: %f\n", result->inputLatency ));
-        PA_LOGAPI(("\t\tPaTime outputLatency: %f\n", result->outputLatency ));
-        PA_LOGAPI(("\t\tdouble sampleRate: %f\n", result->sampleRate ));
-        PA_LOGAPI(("\t}\n" ));
-
-    }
-
-    return result;
-}
-
-
-PaTime Pa_GetStreamTime( PaStream *stream )
-{
-    PaError error = PaUtil_ValidateStreamPointer( stream );
-    PaTime result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamTime" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( error != paNoError )
-    {
-        result = 0;
-
-        PA_LOGAPI(("Pa_GetStreamTime returned:\n" ));
-        PA_LOGAPI(("\tPaTime: 0 [PaError error:%d ( %s )]\n", result, error, Pa_GetErrorText( error ) ));
-
-    }
-    else
-    {
-        result = PA_STREAM_INTERFACE(stream)->GetTime( stream );
-
-        PA_LOGAPI(("Pa_GetStreamTime returned:\n" ));
-        PA_LOGAPI(("\tPaTime: %g\n", result ));
-
-    }
-
-    return result;
-}
-
-
-double Pa_GetStreamCpuLoad( PaStream* stream )
-{
-    PaError error = PaUtil_ValidateStreamPointer( stream );
-    double result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamCpuLoad" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( error != paNoError )
-    {
-
-        result = 0.0;
-
-        PA_LOGAPI(("Pa_GetStreamCpuLoad returned:\n" ));
-        PA_LOGAPI(("\tdouble: 0.0 [PaError error: %d ( %s )]\n", error, Pa_GetErrorText( error ) ));
-
-    }
-    else
-    {
-        result = PA_STREAM_INTERFACE(stream)->GetCpuLoad( stream );
-
-        PA_LOGAPI(("Pa_GetStreamCpuLoad returned:\n" ));
-        PA_LOGAPI(("\tdouble: %g\n", result ));
-
-    }
-
-    return result;
-}
-
-
-PaError Pa_ReadStream( PaStream* stream,
-                       void *buffer,
-                       unsigned long frames )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_ReadStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-    {
-        if( frames == 0 )
-        {
-            /* XXX: Should we not allow the implementation to signal any overflow condition? */
-            result = paNoError;
-        }
-        else if( buffer == 0 )
-        {
-            result = paBadBufferPtr;
-        }
-        else
-        {
-            result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-            if( result == 0 )
-            {
-                result = PA_STREAM_INTERFACE(stream)->Read( stream, buffer, frames );
-            }
-            else if( result == 1 )
-            {
-                result = paStreamIsStopped;
-            }
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_ReadStream", result );
-
-    return result;
-}
-
-
-PaError Pa_WriteStream( PaStream* stream,
-                        const void *buffer,
-                        unsigned long frames )
-{
-    PaError result = PaUtil_ValidateStreamPointer( stream );
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_WriteStream" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( result == paNoError )
-    {
-        if( frames == 0 )
-        {
-            /* XXX: Should we not allow the implementation to signal any underflow condition? */
-            result = paNoError;
-        }
-        else if( buffer == 0 )
-        {
-            result = paBadBufferPtr;
-        }
-        else
-        {
-            result = PA_STREAM_INTERFACE(stream)->IsStopped( stream );
-            if( result == 0 )
-            {
-                result = PA_STREAM_INTERFACE(stream)->Write( stream, buffer, frames );
-            }
-            else if( result == 1 )
-            {
-                result = paStreamIsStopped;
-            }  
-        }
-    }
-
-    PA_LOGAPI_EXIT_PAERROR( "Pa_WriteStream", result );
-
-    return result;
-}
-
-signed long Pa_GetStreamReadAvailable( PaStream* stream )
-{
-    PaError error = PaUtil_ValidateStreamPointer( stream );
-    signed long result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamReadAvailable" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( error != paNoError )
-    {
-        result = 0;
-
-        PA_LOGAPI(("Pa_GetStreamReadAvailable returned:\n" ));
-        PA_LOGAPI(("\tunsigned long: 0 [ PaError error: %d ( %s ) ]\n", error, Pa_GetErrorText( error ) ));
-
-    }
-    else
-    {
-        result = PA_STREAM_INTERFACE(stream)->GetReadAvailable( stream );
-
-        PA_LOGAPI(("Pa_GetStreamReadAvailable returned:\n" ));
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-
-    }
-
-    return result;
-}
-
-
-signed long Pa_GetStreamWriteAvailable( PaStream* stream )
-{
-    PaError error = PaUtil_ValidateStreamPointer( stream );
-    signed long result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetStreamWriteAvailable" );
-    PA_LOGAPI(("\tPaStream* stream: 0x%p\n", stream ));
-
-    if( error != paNoError )
-    {
-        result = 0;
-
-        PA_LOGAPI(("Pa_GetStreamWriteAvailable returned:\n" ));
-        PA_LOGAPI(("\tunsigned long: 0 [ PaError error: %d ( %s ) ]\n", error, Pa_GetErrorText( error ) ));
-
-    }
-    else
-    {
-        result = PA_STREAM_INTERFACE(stream)->GetWriteAvailable( stream );
-
-        PA_LOGAPI(("Pa_GetStreamWriteAvailable returned:\n" ));
-        PA_LOGAPI(("\tPaError: %d ( %s )\n", result, Pa_GetErrorText( result ) ));
-
-    }
-
-    return result;
-}
-
-
-PaError Pa_GetSampleSize( PaSampleFormat format )
-{
-    int result;
-
-    PA_LOGAPI_ENTER_PARAMS( "Pa_GetSampleSize" );
-    PA_LOGAPI(("\tPaSampleFormat format: %d\n", format ));
-
-    switch( format & ~paNonInterleaved )
-    {
-
-    case paUInt8:
-    case paInt8:
-        result = 1;
-        break;
-
-    case paInt16:
-        result = 2;
-        break;
-
-    case paInt24:
-        result = 3;
-        break;
-
-    case paFloat32:
-    case paInt32:
-        result = 4;
-        break;
-
-    default:
-        result = paSampleFormatNotSupported;
-        break;
-    }
-
-    PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetSampleSize", "int: %d", result );
-
-    return (PaError) result;
-}
-
diff --git a/libs/portaudio/src/common/pa_hostapi.h b/libs/portaudio/src/common/pa_hostapi.h
deleted file mode 100644
index 5a86d4e947..0000000000
--- a/libs/portaudio/src/common/pa_hostapi.h
+++ /dev/null
@@ -1,253 +0,0 @@
-#ifndef PA_HOSTAPI_H
-#define PA_HOSTAPI_H
-/*
- * $Id: pa_hostapi.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library
- * host api representation
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Interface used by pa_front to virtualize functions which operate on
- host APIs.
-*/
-
-
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-/** **FOR THE USE OF pa_front.c ONLY**
-    Do NOT use fields in this structure, they my change at any time.
-    Use functions defined in pa_util.h if you think you need functionality
-    which can be derived from here.
-*/
-typedef struct PaUtilPrivatePaFrontHostApiInfo {
-
-
-    unsigned long baseDeviceIndex;
-}PaUtilPrivatePaFrontHostApiInfo;
-
-
-/** The common header for all data structures whose pointers are passed through
- the hostApiSpecificStreamInfo field of the PaStreamParameters structure.
- Note that in order to keep the public PortAudio interface clean, this structure
- is not used explicitly when declaring hostApiSpecificStreamInfo data structures.
- However, some code in pa_front depends on the first 3 members being equivalent
- with this structure.
- @see PaStreamParameters
-*/
-typedef struct PaUtilHostApiSpecificStreamInfoHeader
-{
-    unsigned long size;             /**< size of whole structure including this header */
-    PaHostApiTypeId hostApiType;    /**< host API for which this data is intended */
-    unsigned long version;          /**< structure version */
-} PaUtilHostApiSpecificStreamInfoHeader;
-
-
-
-/** A structure representing the interface to a host API. Contains both
- concrete data and pointers to functions which implement the interface.
-*/
-typedef struct PaUtilHostApiRepresentation {
-    PaUtilPrivatePaFrontHostApiInfo privatePaFrontInfo;
-
-    /** The host api implementation should populate the info field. In the
-        case of info.defaultInputDevice and info.defaultOutputDevice the
-        values stored should be 0 based indices within the host api's own
-        device index range (0 to deviceCount). These values will be converted
-        to global device indices by pa_front after PaUtilHostApiInitializer()
-        returns.
-    */
-    PaHostApiInfo info;
-
-    PaDeviceInfo** deviceInfos;
-
-    /**
-        (*Terminate)() is guaranteed to be called with a valid <hostApi>
-        parameter, which was previously returned from the same implementation's
-        initializer.
-    */
-    void (*Terminate)( struct PaUtilHostApiRepresentation *hostApi );
-
-    /**
-        The inputParameters and outputParameters pointers should not be saved
-        as they will not remain valid after OpenStream is called.
-
-        
-        The following guarantees are made about parameters to (*OpenStream)():
-
-            [NOTE: the following list up to *END PA FRONT VALIDATIONS* should be
-                kept in sync with the one for ValidateOpenStreamParameters and
-                Pa_OpenStream in pa_front.c]
-                
-            PaHostApiRepresentation *hostApi
-                - is valid for this implementation
-
-            PaStream** stream
-                - is non-null
-
-            - at least one of inputParameters & outputParmeters is valid (not NULL)
-
-            - if inputParameters & outputParmeters are both valid, that
-                inputParameters->device & outputParmeters->device  both use the same host api
- 
-            PaDeviceIndex inputParameters->device
-                - is within range (0 to Pa_CountDevices-1) Or:
-                - is paUseHostApiSpecificDeviceSpecification and
-                    inputParameters->hostApiSpecificStreamInfo is non-NULL and refers
-                    to a valid host api
-
-            int inputParameters->numChannels
-                - if inputParameters->device is not paUseHostApiSpecificDeviceSpecification, numInputChannels is > 0
-                - upper bound is NOT validated against device capabilities
- 
-            PaSampleFormat inputParameters->sampleFormat
-                - is one of the sample formats defined in portaudio.h
-
-            void *inputParameters->hostApiSpecificStreamInfo
-                - if supplied its hostApi field matches the input device's host Api
- 
-            PaDeviceIndex outputParmeters->device
-                - is within range (0 to Pa_CountDevices-1)
- 
-            int outputParmeters->numChannels
-                - if inputDevice is valid, numInputChannels is > 0
-                - upper bound is NOT validated against device capabilities
- 
-            PaSampleFormat outputParmeters->sampleFormat
-                - is one of the sample formats defined in portaudio.h
-        
-            void *outputParmeters->hostApiSpecificStreamInfo
-                - if supplied its hostApi field matches the output device's host Api
- 
-            double sampleRate
-                - is not an 'absurd' rate (less than 1000. or greater than 200000.)
-                - sampleRate is NOT validated against device capabilities
- 
-            PaStreamFlags streamFlags
-                - unused platform neutral flags are zero
-                - paNeverDropInput is only used for full-duplex callback streams
-                    with variable buffer size (paFramesPerBufferUnspecified)
-
-            [*END PA FRONT VALIDATIONS*]
-
-
-        The following validations MUST be performed by (*OpenStream)():
-
-            - check that input device can support numInputChannels
-            
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - if inputStreamInfo is supplied, validate its contents,
-                or return an error if no inputStreamInfo is expected
-
-            - check that output device can support numOutputChannels
-            
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - if outputStreamInfo is supplied, validate its contents,
-                or return an error if no outputStreamInfo is expected
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-            - check that the device supports sampleRate
-
-            - alter sampleRate to a close allowable rate if necessary
-
-            - validate inputLatency and outputLatency
-
-            - validate any platform specific flags, if flags are supplied they
-                must be valid.
-    */
-    PaError (*OpenStream)( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** stream,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerCallback,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-
-
-    PaError (*IsFormatSupported)( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-} PaUtilHostApiRepresentation;
-
-
-/** Prototype for the initialization function which must be implemented by every
- host API.
- 
- @see paHostApiInitializers
-*/
-typedef PaError PaUtilHostApiInitializer( PaUtilHostApiRepresentation**, PaHostApiIndex );
-
-
-/** paHostApiInitializers is a NULL-terminated array of host API initialization
- functions. These functions are called by pa_front to initialize the host APIs
- when the client calls Pa_Initialize().
-
- There is a platform specific file which defines paHostApiInitializers for that
- platform, pa_win/pa_win_hostapis.c contains the Win32 definitions for example.
-*/
-extern PaUtilHostApiInitializer *paHostApiInitializers[];
-
-
-/** The index of the default host API in the paHostApiInitializers array.
- 
- There is a platform specific file which defines paDefaultHostApiIndex for that
- platform, see pa_win/pa_win_hostapis.c for example.
-*/
-extern int paDefaultHostApiIndex;
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_HOSTAPI_H */
diff --git a/libs/portaudio/src/common/pa_process.c b/libs/portaudio/src/common/pa_process.c
deleted file mode 100644
index fac474d556..0000000000
--- a/libs/portaudio/src/common/pa_process.c
+++ /dev/null
@@ -1,1772 +0,0 @@
-/*
- * $Id: pa_process.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library
- * streamCallback <-> host buffer processing adapter
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Buffer Processor implementation.
-    
- The code in this file is not optimised yet - although it's not clear that
- it needs to be. there may appear to be redundancies
- that could be factored into common functions, but the redundanceis are left
- intentionally as each appearance may have different optimisation possibilities.
-
- The optimisations which are planned involve only converting data in-place
- where possible, rather than copying to the temp buffer(s).
-
- Note that in the extreme case of being able to convert in-place, and there
- being no conversion necessary there should be some code which short-circuits
- the operation.
-
-    @todo Consider cache tilings for intereave<->deinterleave.
-
-    @todo implement timeInfo->currentTime int PaUtil_BeginBufferProcessing()
-
-    @todo specify and implement some kind of logical policy for handling the
-        underflow and overflow stream flags when the underflow/overflow overlaps
-        multiple user buffers/callbacks.
-
-	@todo provide support for priming the buffers with data from the callback.
-        The client interface is now implemented through PaUtil_SetNoInput()
-        which sets bp->hostInputChannels[0][0].data to zero. However this is
-        currently only implemented in NonAdaptingProcess(). It shouldn't be
-        needed for AdaptingInputOnlyProcess() (no priming should ever be
-        requested for AdaptingInputOnlyProcess()).
-        Not sure if additional work should be required to make it work with
-        AdaptingOutputOnlyProcess, but it definitely is required for
-        AdaptingProcess.
-
-    @todo implement PaUtil_SetNoOutput for AdaptingProcess
-
-    @todo don't allocate temp buffers for blocking streams unless they are
-        needed. At the moment they are needed, but perhaps for host APIs
-        where the implementation passes a buffer to the host they could be
-        used.
-*/
-
-
-#include <assert.h>
-#include <string.h> /* memset() */
-
-#include "pa_process.h"
-#include "pa_util.h"
-
-
-#define PA_FRAMES_PER_TEMP_BUFFER_WHEN_HOST_BUFFER_SIZE_IS_UNKNOWN_    1024
-
-#define PA_MIN_( a, b ) ( ((a)<(b)) ? (a) : (b) )
-
-
-/* greatest common divisor - PGCD in French */
-static unsigned long GCD( unsigned long a, unsigned long b )
-{
-    return (b==0) ? a : GCD( b, a%b);
-}
-
-/* least common multiple - PPCM in French */
-static unsigned long LCM( unsigned long a, unsigned long b )
-{
-    return (a*b) / GCD(a,b);
-}
-
-#define PA_MAX_( a, b ) (((a) > (b)) ? (a) : (b))
-
-static unsigned long CalculateFrameShift( unsigned long M, unsigned long N )
-{
-    unsigned long result = 0;
-    unsigned long i;
-    unsigned long lcm;
-
-    assert( M > 0 );
-    assert( N > 0 );
-
-    lcm = LCM( M, N );
-    for( i = M; i < lcm; i += M )
-        result = PA_MAX_( result, i % N );
-
-    return result;
-}
-
-
-PaError PaUtil_InitializeBufferProcessor( PaUtilBufferProcessor* bp,
-        int inputChannelCount, PaSampleFormat userInputSampleFormat,
-        PaSampleFormat hostInputSampleFormat,
-        int outputChannelCount, PaSampleFormat userOutputSampleFormat,
-        PaSampleFormat hostOutputSampleFormat,
-        double sampleRate,
-        PaStreamFlags streamFlags,
-        unsigned long framesPerUserBuffer,
-        unsigned long framesPerHostBuffer,
-        PaUtilHostBufferSizeMode hostBufferSizeMode,
-        PaStreamCallback *streamCallback, void *userData )
-{
-    PaError result = paNoError;
-    PaError bytesPerSample;
-    unsigned long tempInputBufferSize, tempOutputBufferSize;
-
-    if( streamFlags & paNeverDropInput )
-    {
-        /* paNeverDropInput is only valid for full-duplex callback streams, with an unspecified number of frames per buffer. */
-        if( !streamCallback || !(inputChannelCount > 0 && outputChannelCount > 0) ||
-                framesPerUserBuffer != paFramesPerBufferUnspecified )
-            return paInvalidFlag;
-    }
-
-    /* initialize buffer ptrs to zero so they can be freed if necessary in error */
-    bp->tempInputBuffer = 0;
-    bp->tempInputBufferPtrs = 0;
-    bp->tempOutputBuffer = 0;
-    bp->tempOutputBufferPtrs = 0;
-
-    bp->framesPerUserBuffer = framesPerUserBuffer;
-    bp->framesPerHostBuffer = framesPerHostBuffer;
-
-    bp->inputChannelCount = inputChannelCount;
-    bp->outputChannelCount = outputChannelCount;
-
-    bp->hostBufferSizeMode = hostBufferSizeMode;
-
-    bp->hostInputChannels[0] = bp->hostInputChannels[1] = 0;
-    bp->hostOutputChannels[0] = bp->hostOutputChannels[1] = 0;
-
-    if( framesPerUserBuffer == 0 ) /* streamCallback will accept any buffer size */
-    {
-        bp->useNonAdaptingProcess = 1;
-        bp->initialFramesInTempInputBuffer = 0;
-        bp->initialFramesInTempOutputBuffer = 0;
-
-        if( hostBufferSizeMode == paUtilFixedHostBufferSize
-                || hostBufferSizeMode == paUtilBoundedHostBufferSize )
-        {
-            bp->framesPerTempBuffer = framesPerHostBuffer;
-        }
-        else /* unknown host buffer size */
-        {
-             bp->framesPerTempBuffer = PA_FRAMES_PER_TEMP_BUFFER_WHEN_HOST_BUFFER_SIZE_IS_UNKNOWN_;
-        }
-    }
-    else
-    {
-        bp->framesPerTempBuffer = framesPerUserBuffer;
-
-        if( hostBufferSizeMode == paUtilFixedHostBufferSize
-                && framesPerHostBuffer % framesPerUserBuffer == 0 )
-        {
-            bp->useNonAdaptingProcess = 1;
-            bp->initialFramesInTempInputBuffer = 0;
-            bp->initialFramesInTempOutputBuffer = 0;
-        }
-        else
-        {
-            bp->useNonAdaptingProcess = 0;
-
-            if( inputChannelCount > 0 && outputChannelCount > 0 )
-            {
-                /* full duplex */
-                if( hostBufferSizeMode == paUtilFixedHostBufferSize )
-                {
-                    unsigned long frameShift =
-                        CalculateFrameShift( framesPerHostBuffer, framesPerUserBuffer );
-
-                    if( framesPerUserBuffer > framesPerHostBuffer )
-                    {
-                        bp->initialFramesInTempInputBuffer = frameShift;
-                        bp->initialFramesInTempOutputBuffer = 0;
-                    }
-                    else
-                    {
-                        bp->initialFramesInTempInputBuffer = 0;
-                        bp->initialFramesInTempOutputBuffer = frameShift;
-                    }
-                }
-                else /* variable host buffer size, add framesPerUserBuffer latency */
-                {
-                    bp->initialFramesInTempInputBuffer = 0;
-                    bp->initialFramesInTempOutputBuffer = framesPerUserBuffer;
-                }
-            }
-            else
-            {
-                /* half duplex */
-                bp->initialFramesInTempInputBuffer = 0;
-                bp->initialFramesInTempOutputBuffer = 0;
-            }
-        }
-    }
-
-
-    bp->framesInTempInputBuffer = bp->initialFramesInTempInputBuffer;
-    bp->framesInTempOutputBuffer = bp->initialFramesInTempOutputBuffer;
-
-    
-    if( inputChannelCount > 0 )
-    {
-        bytesPerSample = Pa_GetSampleSize( hostInputSampleFormat );
-        if( bytesPerSample > 0 )
-        {
-            bp->bytesPerHostInputSample = bytesPerSample;
-        }
-        else
-        {
-            result = bytesPerSample;
-            goto error;
-        }
-
-        bytesPerSample = Pa_GetSampleSize( userInputSampleFormat );
-        if( bytesPerSample > 0 )
-        {
-            bp->bytesPerUserInputSample = bytesPerSample;
-        }
-        else
-        {
-            result = bytesPerSample;
-            goto error;
-        }
-
-        bp->inputConverter =
-            PaUtil_SelectConverter( hostInputSampleFormat, userInputSampleFormat, streamFlags );
-
-        bp->inputZeroer = PaUtil_SelectZeroer( hostInputSampleFormat );
-            
-        bp->userInputIsInterleaved = (userInputSampleFormat & paNonInterleaved)?0:1;
-
-
-        tempInputBufferSize =
-            bp->framesPerTempBuffer * bp->bytesPerUserInputSample * inputChannelCount;
-         
-        bp->tempInputBuffer = PaUtil_AllocateMemory( tempInputBufferSize );
-        if( bp->tempInputBuffer == 0 )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-        
-        if( bp->framesInTempInputBuffer > 0 )
-            memset( bp->tempInputBuffer, 0, tempInputBufferSize );
-
-        if( userInputSampleFormat & paNonInterleaved )
-        {
-            bp->tempInputBufferPtrs =
-                (void **)PaUtil_AllocateMemory( sizeof(void*)*inputChannelCount );
-            if( bp->tempInputBufferPtrs == 0 )
-            {
-                result = paInsufficientMemory;
-                goto error;
-            }
-        }
-
-        bp->hostInputChannels[0] = (PaUtilChannelDescriptor*)
-                PaUtil_AllocateMemory( sizeof(PaUtilChannelDescriptor) * inputChannelCount * 2);
-        if( bp->hostInputChannels[0] == 0 )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        bp->hostInputChannels[1] = &bp->hostInputChannels[0][inputChannelCount];
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        bytesPerSample = Pa_GetSampleSize( hostOutputSampleFormat );
-        if( bytesPerSample > 0 )
-        {
-            bp->bytesPerHostOutputSample = bytesPerSample;
-        }
-        else
-        {
-            result = bytesPerSample;
-            goto error;
-        }
-
-        bytesPerSample = Pa_GetSampleSize( userOutputSampleFormat );
-        if( bytesPerSample > 0 )
-        {
-            bp->bytesPerUserOutputSample = bytesPerSample;
-        }
-        else
-        {
-            result = bytesPerSample;
-            goto error;
-        }
-
-        bp->outputConverter =
-            PaUtil_SelectConverter( userOutputSampleFormat, hostOutputSampleFormat, streamFlags );
-
-        bp->outputZeroer = PaUtil_SelectZeroer( hostOutputSampleFormat );
-
-        bp->userOutputIsInterleaved = (userOutputSampleFormat & paNonInterleaved)?0:1;
-
-        tempOutputBufferSize =
-                bp->framesPerTempBuffer * bp->bytesPerUserOutputSample * outputChannelCount;
-
-        bp->tempOutputBuffer = PaUtil_AllocateMemory( tempOutputBufferSize );
-        if( bp->tempOutputBuffer == 0 )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        if( bp->framesInTempOutputBuffer > 0 )
-            memset( bp->tempOutputBuffer, 0, tempOutputBufferSize );
-        
-        if( userOutputSampleFormat & paNonInterleaved )
-        {
-            bp->tempOutputBufferPtrs =
-                (void **)PaUtil_AllocateMemory( sizeof(void*)*outputChannelCount );
-            if( bp->tempOutputBufferPtrs == 0 )
-            {
-                result = paInsufficientMemory;
-                goto error;
-            }
-        }
-
-        bp->hostOutputChannels[0] = (PaUtilChannelDescriptor*)
-                PaUtil_AllocateMemory( sizeof(PaUtilChannelDescriptor)*outputChannelCount * 2 );
-        if( bp->hostOutputChannels[0] == 0 )
-        {                                                                     
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        bp->hostOutputChannels[1] = &bp->hostOutputChannels[0][outputChannelCount];
-    }
-
-    PaUtil_InitializeTriangularDitherState( &bp->ditherGenerator );
-
-    bp->samplePeriod = 1. / sampleRate;
-
-    bp->streamCallback = streamCallback;
-    bp->userData = userData;
-
-    return result;
-
-error:
-    if( bp->tempInputBuffer )
-        PaUtil_FreeMemory( bp->tempInputBuffer );
-
-    if( bp->tempInputBufferPtrs )
-        PaUtil_FreeMemory( bp->tempInputBufferPtrs );
-
-    if( bp->hostInputChannels[0] )
-        PaUtil_FreeMemory( bp->hostInputChannels[0] );
-
-    if( bp->tempOutputBuffer )
-        PaUtil_FreeMemory( bp->tempOutputBuffer );
-
-    if( bp->tempOutputBufferPtrs )
-        PaUtil_FreeMemory( bp->tempOutputBufferPtrs );
-
-    if( bp->hostOutputChannels[0] )
-        PaUtil_FreeMemory( bp->hostOutputChannels[0] );
-
-    return result;
-}
-
-
-void PaUtil_TerminateBufferProcessor( PaUtilBufferProcessor* bp )
-{
-    if( bp->tempInputBuffer )
-        PaUtil_FreeMemory( bp->tempInputBuffer );
-
-    if( bp->tempInputBufferPtrs )
-        PaUtil_FreeMemory( bp->tempInputBufferPtrs );
-
-    if( bp->hostInputChannels[0] )
-        PaUtil_FreeMemory( bp->hostInputChannels[0] );
-        
-    if( bp->tempOutputBuffer )
-        PaUtil_FreeMemory( bp->tempOutputBuffer );
-
-    if( bp->tempOutputBufferPtrs )
-        PaUtil_FreeMemory( bp->tempOutputBufferPtrs );
-
-    if( bp->hostOutputChannels[0] )
-        PaUtil_FreeMemory( bp->hostOutputChannels[0] );
-}
-
-
-void PaUtil_ResetBufferProcessor( PaUtilBufferProcessor* bp )
-{
-    unsigned long tempInputBufferSize, tempOutputBufferSize;
-
-    bp->framesInTempInputBuffer = bp->initialFramesInTempInputBuffer;
-    bp->framesInTempOutputBuffer = bp->initialFramesInTempOutputBuffer;
-
-    if( bp->framesInTempInputBuffer > 0 )
-    {
-        tempInputBufferSize =
-            bp->framesPerTempBuffer * bp->bytesPerUserInputSample * bp->inputChannelCount;
-        memset( bp->tempInputBuffer, 0, tempInputBufferSize );
-    }
-
-    if( bp->framesInTempOutputBuffer > 0 )
-    {      
-        tempOutputBufferSize =
-            bp->framesPerTempBuffer * bp->bytesPerUserOutputSample * bp->outputChannelCount;
-        memset( bp->tempOutputBuffer, 0, tempOutputBufferSize );
-    }
-}
-
-
-unsigned long PaUtil_GetBufferProcessorInputLatency( PaUtilBufferProcessor* bp )
-{
-    return bp->initialFramesInTempInputBuffer;
-}
-
-
-unsigned long PaUtil_GetBufferProcessorOutputLatency( PaUtilBufferProcessor* bp )
-{
-    return bp->initialFramesInTempOutputBuffer;
-}
-
-
-void PaUtil_SetInputFrameCount( PaUtilBufferProcessor* bp,
-        unsigned long frameCount )
-{
-    if( frameCount == 0 )
-        bp->hostInputFrameCount[0] = bp->framesPerHostBuffer;
-    else
-        bp->hostInputFrameCount[0] = frameCount;
-}
-        
-
-void PaUtil_SetNoInput( PaUtilBufferProcessor* bp )
-{
-    assert( bp->inputChannelCount > 0 );
-
-    bp->hostInputChannels[0][0].data = 0;
-}
-
-
-void PaUtil_SetInputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data, unsigned int stride )
-{
-    assert( channel < bp->inputChannelCount );
-    
-    bp->hostInputChannels[0][channel].data = data;
-    bp->hostInputChannels[0][channel].stride = stride;
-}
-
-
-void PaUtil_SetInterleavedInputChannels( PaUtilBufferProcessor* bp,
-        unsigned int firstChannel, void *data, unsigned int channelCount )
-{
-    unsigned int i;
-    unsigned int channel = firstChannel;
-    unsigned char *p = (unsigned char*)data;
-
-    if( channelCount == 0 )
-        channelCount = bp->inputChannelCount;
-
-    assert( firstChannel < bp->inputChannelCount );
-    assert( firstChannel + channelCount <= bp->inputChannelCount );
-
-    for( i=0; i< channelCount; ++i )
-    {
-        bp->hostInputChannels[0][channel+i].data = p;
-        p += bp->bytesPerHostInputSample;
-        bp->hostInputChannels[0][channel+i].stride = channelCount;
-    }
-}
-
-
-void PaUtil_SetNonInterleavedInputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data )
-{
-    assert( channel < bp->inputChannelCount );
-    
-    bp->hostInputChannels[0][channel].data = data;
-    bp->hostInputChannels[0][channel].stride = 1;
-}
-
-
-void PaUtil_Set2ndInputFrameCount( PaUtilBufferProcessor* bp,
-        unsigned long frameCount )
-{
-    bp->hostInputFrameCount[1] = frameCount;
-}
-
-
-void PaUtil_Set2ndInputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data, unsigned int stride )
-{
-    assert( channel < bp->inputChannelCount );
-
-    bp->hostInputChannels[1][channel].data = data;
-    bp->hostInputChannels[1][channel].stride = stride;
-}
-
-
-void PaUtil_Set2ndInterleavedInputChannels( PaUtilBufferProcessor* bp,
-        unsigned int firstChannel, void *data, unsigned int channelCount )
-{
-    unsigned int i;
-    unsigned int channel = firstChannel;
-    unsigned char *p = (unsigned char*)data;
-
-    if( channelCount == 0 )
-        channelCount = bp->inputChannelCount;
-
-    assert( firstChannel < bp->inputChannelCount );
-    assert( firstChannel + channelCount <= bp->inputChannelCount );
-    
-    for( i=0; i< channelCount; ++i )
-    {
-        bp->hostInputChannels[1][channel+i].data = p;
-        p += bp->bytesPerHostInputSample;
-        bp->hostInputChannels[1][channel+i].stride = channelCount;
-    }
-}
-
-        
-void PaUtil_Set2ndNonInterleavedInputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data )
-{
-    assert( channel < bp->inputChannelCount );
-    
-    bp->hostInputChannels[1][channel].data = data;
-    bp->hostInputChannels[1][channel].stride = 1;
-}
-
-
-void PaUtil_SetOutputFrameCount( PaUtilBufferProcessor* bp,
-        unsigned long frameCount )
-{
-    if( frameCount == 0 )
-        bp->hostOutputFrameCount[0] = bp->framesPerHostBuffer;
-    else
-        bp->hostOutputFrameCount[0] = frameCount;
-}
-
-
-void PaUtil_SetNoOutput( PaUtilBufferProcessor* bp )
-{
-    assert( bp->outputChannelCount > 0 );
-
-    bp->hostOutputChannels[0][0].data = 0;
-}
-
-
-void PaUtil_SetOutputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data, unsigned int stride )
-{
-    assert( channel < bp->outputChannelCount );
-    assert( data != NULL );
-
-    bp->hostOutputChannels[0][channel].data = data;
-    bp->hostOutputChannels[0][channel].stride = stride;
-}
-
-
-void PaUtil_SetInterleavedOutputChannels( PaUtilBufferProcessor* bp,
-        unsigned int firstChannel, void *data, unsigned int channelCount )
-{
-    unsigned int i;
-    unsigned int channel = firstChannel;
-    unsigned char *p = (unsigned char*)data;
-
-    if( channelCount == 0 )
-        channelCount = bp->outputChannelCount;
-
-    assert( firstChannel < bp->outputChannelCount );
-    assert( firstChannel + channelCount <= bp->outputChannelCount );
-    
-    for( i=0; i< channelCount; ++i )
-    {
-        PaUtil_SetOutputChannel( bp, channel + i, p, channelCount );
-        p += bp->bytesPerHostOutputSample;
-    }
-}
-
-
-void PaUtil_SetNonInterleavedOutputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data )
-{
-    assert( channel < bp->outputChannelCount );
-
-    PaUtil_SetOutputChannel( bp, channel, data, 1 );
-}
-
-
-void PaUtil_Set2ndOutputFrameCount( PaUtilBufferProcessor* bp,
-        unsigned long frameCount )
-{
-    bp->hostOutputFrameCount[1] = frameCount;
-}
-
-
-void PaUtil_Set2ndOutputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data, unsigned int stride )
-{
-    assert( channel < bp->outputChannelCount );
-    assert( data != NULL );
-
-    bp->hostOutputChannels[1][channel].data = data;
-    bp->hostOutputChannels[1][channel].stride = stride;
-}
-
-
-void PaUtil_Set2ndInterleavedOutputChannels( PaUtilBufferProcessor* bp,
-        unsigned int firstChannel, void *data, unsigned int channelCount )
-{
-    unsigned int i;
-    unsigned int channel = firstChannel;
-    unsigned char *p = (unsigned char*)data;
-
-    if( channelCount == 0 )
-        channelCount = bp->outputChannelCount;
-
-    assert( firstChannel < bp->outputChannelCount );
-    assert( firstChannel + channelCount <= bp->outputChannelCount );
-    
-    for( i=0; i< channelCount; ++i )
-    {
-        PaUtil_Set2ndOutputChannel( bp, channel + i, p, channelCount );
-        p += bp->bytesPerHostOutputSample;
-    }
-}
-
-        
-void PaUtil_Set2ndNonInterleavedOutputChannel( PaUtilBufferProcessor* bp,
-        unsigned int channel, void *data )
-{
-    assert( channel < bp->outputChannelCount );
-    
-    PaUtil_Set2ndOutputChannel( bp, channel, data, 1 );
-}
-
-
-void PaUtil_BeginBufferProcessing( PaUtilBufferProcessor* bp,
-        PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags callbackStatusFlags )
-{
-    bp->timeInfo = timeInfo;
-
-    /* the first streamCallback will be called to process samples which are
-        currently in the input buffer before the ones starting at the timeInfo time */
-        
-    bp->timeInfo->inputBufferAdcTime -= bp->framesInTempInputBuffer * bp->samplePeriod;
-    
-    bp->timeInfo->currentTime = 0; /** FIXME: @todo time info currentTime not implemented */
-
-    /* the first streamCallback will be called to generate samples which will be
-        outputted after the frames currently in the output buffer have been
-        outputted. */
-    bp->timeInfo->outputBufferDacTime += bp->framesInTempOutputBuffer * bp->samplePeriod;
-
-    bp->callbackStatusFlags = callbackStatusFlags;
-
-    bp->hostInputFrameCount[1] = 0;
-    bp->hostOutputFrameCount[1] = 0;
-}
-
-
-/*
-    NonAdaptingProcess() is a simple buffer copying adaptor that can handle
-    both full and half duplex copies. It processes framesToProcess frames,
-    broken into blocks bp->framesPerTempBuffer long.
-    This routine can be used when the streamCallback doesn't care what length
-    the buffers are, or when framesToProcess is an integer multiple of
-    bp->framesPerTempBuffer, in which case streamCallback will always be called
-    with bp->framesPerTempBuffer samples.
-*/
-static unsigned long NonAdaptingProcess( PaUtilBufferProcessor *bp,
-        int *streamCallbackResult,
-        PaUtilChannelDescriptor *hostInputChannels,
-        PaUtilChannelDescriptor *hostOutputChannels,
-        unsigned long framesToProcess )
-{
-    void *userInput, *userOutput;
-    unsigned char *srcBytePtr, *destBytePtr;
-    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i;
-    unsigned long frameCount;
-    unsigned long framesToGo = framesToProcess;
-    unsigned long framesProcessed = 0;
-
-
-    if( *streamCallbackResult == paContinue )
-    {
-        do
-        {
-            frameCount = PA_MIN_( bp->framesPerTempBuffer, framesToGo );
-
-            /* configure user input buffer and convert input data (host -> user) */
-            if( bp->inputChannelCount == 0 )
-            {
-                /* no input */
-                userInput = 0;
-            }
-            else /* there are input channels */
-            {
-                /*
-                    could use more elaborate logic here and sometimes process
-                    buffers in-place.
-                */
-            
-                destBytePtr = (unsigned char *)bp->tempInputBuffer;
-
-                if( bp->userInputIsInterleaved )
-                {
-                    destSampleStrideSamples = bp->inputChannelCount;
-                    destChannelStrideBytes = bp->bytesPerUserInputSample;
-                    userInput = bp->tempInputBuffer;
-                }
-                else /* user input is not interleaved */
-                {
-                    destSampleStrideSamples = 1;
-                    destChannelStrideBytes = frameCount * bp->bytesPerUserInputSample;
-
-                    /* setup non-interleaved ptrs */
-                    for( i=0; i<bp->inputChannelCount; ++i )
-                    {
-                        bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
-                            i * bp->bytesPerUserInputSample * frameCount;
-                    }
-                
-                    userInput = bp->tempInputBufferPtrs;
-                }
-
-                if( !bp->hostInputChannels[0][0].data )
-                {
-                    /* no input was supplied (see PaUtil_SetNoInput), so
-                        zero the input buffer */
-
-                    for( i=0; i<bp->inputChannelCount; ++i )
-                    {
-                        bp->inputZeroer( destBytePtr, destSampleStrideSamples, frameCount );
-                        destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
-                    }
-                }
-                else
-                {
-                    for( i=0; i<bp->inputChannelCount; ++i )
-                    {
-                        bp->inputConverter( destBytePtr, destSampleStrideSamples,
-                                                hostInputChannels[i].data,
-                                                hostInputChannels[i].stride,
-                                                frameCount, &bp->ditherGenerator );
-
-                        destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
-
-                        /* advance src ptr for next iteration */
-                        hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
-                                frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
-                    }
-                }
-            }
-
-            /* configure user output buffer */
-            if( bp->outputChannelCount == 0 )
-            {
-                /* no output */
-                userOutput = 0;
-            }
-            else /* there are output channels */
-            {
-                if( bp->userOutputIsInterleaved )
-                {
-                    userOutput = bp->tempOutputBuffer;
-                }
-                else /* user output is not interleaved */
-                {
-                    for( i = 0; i < bp->outputChannelCount; ++i )
-                    {
-                        bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
-                            i * bp->bytesPerUserOutputSample * frameCount;
-                    }
-
-                    userOutput = bp->tempOutputBufferPtrs;
-                }
-            }
-        
-            *streamCallbackResult = bp->streamCallback( userInput, userOutput,
-                    frameCount, bp->timeInfo, bp->callbackStatusFlags, bp->userData );
-
-            if( *streamCallbackResult == paAbort )
-            {
-                /* callback returned paAbort, don't advance framesProcessed
-                        and framesToGo, they will be handled below */
-            }
-            else
-            {
-                bp->timeInfo->inputBufferAdcTime += frameCount * bp->samplePeriod;
-                bp->timeInfo->outputBufferDacTime += frameCount * bp->samplePeriod;
-
-                /* convert output data (user -> host) */
-                
-                if( bp->outputChannelCount != 0 && bp->hostOutputChannels[0][0].data )
-                {
-                    /*
-                        could use more elaborate logic here and sometimes process
-                        buffers in-place.
-                    */
-            
-                    srcBytePtr = (unsigned char *)bp->tempOutputBuffer;
-
-                    if( bp->userOutputIsInterleaved )
-                    {
-                        srcSampleStrideSamples = bp->outputChannelCount;
-                        srcChannelStrideBytes = bp->bytesPerUserOutputSample;
-                    }
-                    else /* user output is not interleaved */
-                    {
-                        srcSampleStrideSamples = 1;
-                        srcChannelStrideBytes = frameCount * bp->bytesPerUserOutputSample;
-                    }
-
-                    for( i=0; i<bp->outputChannelCount; ++i )
-                    {
-                        bp->outputConverter(    hostOutputChannels[i].data,
-                                                hostOutputChannels[i].stride,
-                                                srcBytePtr, srcSampleStrideSamples,
-                                                frameCount, &bp->ditherGenerator );
-
-                        srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
-
-                        /* advance dest ptr for next iteration */
-                        hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                                frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-                    }
-                }
-             
-                framesProcessed += frameCount;
-
-                framesToGo -= frameCount;
-            }
-        }
-        while( framesToGo > 0  && *streamCallbackResult == paContinue );
-    }
-
-    if( framesToGo > 0 )
-    {
-        /* zero any remaining frames output. There will only be remaining frames
-            if the callback has returned paComplete or paAbort */
-
-        frameCount = framesToGo;
-
-        if( bp->outputChannelCount != 0 && bp->hostOutputChannels[0][0].data )
-        {
-            for( i=0; i<bp->outputChannelCount; ++i )
-            {
-                bp->outputZeroer(   hostOutputChannels[i].data,
-                                    hostOutputChannels[i].stride,
-                                    frameCount );
-
-                /* advance dest ptr for next iteration */
-                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-            }
-        }
-
-        framesProcessed += frameCount;
-    }
-
-    return framesProcessed;
-}
-
-
-/*
-    AdaptingInputOnlyProcess() is a half duplex input buffer processor. It
-    converts data from the input buffers into the temporary input buffer,
-    when the temporary input buffer is full, it calls the streamCallback.
-*/
-static unsigned long AdaptingInputOnlyProcess( PaUtilBufferProcessor *bp,
-        int *streamCallbackResult,
-        PaUtilChannelDescriptor *hostInputChannels,
-        unsigned long framesToProcess )
-{
-    void *userInput, *userOutput;
-    unsigned char *destBytePtr;
-    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i;
-    unsigned long frameCount;
-    unsigned long framesToGo = framesToProcess;
-    unsigned long framesProcessed = 0;
-    
-    userOutput = 0;
-
-    do
-    {
-        frameCount = ( bp->framesInTempInputBuffer + framesToGo > bp->framesPerUserBuffer )
-                ? ( bp->framesPerUserBuffer - bp->framesInTempInputBuffer )
-                : framesToGo;
-
-        /* convert frameCount samples into temp buffer */
-
-        if( bp->userInputIsInterleaved )
-        {
-            destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
-                    bp->bytesPerUserInputSample * bp->inputChannelCount *
-                    bp->framesInTempInputBuffer;
-                      
-            destSampleStrideSamples = bp->inputChannelCount;
-            destChannelStrideBytes = bp->bytesPerUserInputSample;
-
-            userInput = bp->tempInputBuffer;
-        }
-        else /* user input is not interleaved */
-        {
-            destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
-                    bp->bytesPerUserInputSample * bp->framesInTempInputBuffer;
-
-            destSampleStrideSamples = 1;
-            destChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
-
-            /* setup non-interleaved ptrs */
-            for( i=0; i<bp->inputChannelCount; ++i )
-            {
-                bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
-                    i * bp->bytesPerUserInputSample * bp->framesPerUserBuffer;
-            }
-                    
-            userInput = bp->tempInputBufferPtrs;
-        }
-
-        for( i=0; i<bp->inputChannelCount; ++i )
-        {
-            bp->inputConverter( destBytePtr, destSampleStrideSamples,
-                                    hostInputChannels[i].data,
-                                    hostInputChannels[i].stride,
-                                    frameCount, &bp->ditherGenerator );
-
-            destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
-
-            /* advance src ptr for next iteration */
-            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
-                    frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
-        }
-
-        bp->framesInTempInputBuffer += frameCount;
-
-        if( bp->framesInTempInputBuffer == bp->framesPerUserBuffer )
-        {
-            /**
-            @todo (non-critical optimisation)
-            The conditional below implements the continue/complete/abort mechanism
-            simply by continuing on iterating through the input buffer, but not
-            passing the data to the callback. With care, the outer loop could be
-            terminated earlier, thus some unneeded conversion cycles would be
-            saved.
-            */
-            if( *streamCallbackResult == paContinue )
-            {
-                bp->timeInfo->outputBufferDacTime = 0;
-
-                *streamCallbackResult = bp->streamCallback( userInput, userOutput,
-                        bp->framesPerUserBuffer, bp->timeInfo,
-                        bp->callbackStatusFlags, bp->userData );
-
-                bp->timeInfo->inputBufferAdcTime += frameCount * bp->samplePeriod;
-            }
-            
-            bp->framesInTempInputBuffer = 0;
-        }
-
-        framesProcessed += frameCount;
-
-        framesToGo -= frameCount;
-    }while( framesToGo > 0 );
-
-    return framesProcessed;
-}
-
-
-/*
-    AdaptingOutputOnlyProcess() is a half duplex output buffer processor.
-    It converts data from the temporary output buffer, to the output buffers,
-    when the temporary output buffer is empty, it calls the streamCallback.
-*/
-static unsigned long AdaptingOutputOnlyProcess( PaUtilBufferProcessor *bp,
-        int *streamCallbackResult,
-        PaUtilChannelDescriptor *hostOutputChannels,
-        unsigned long framesToProcess )
-{
-    void *userInput, *userOutput;
-    unsigned char *srcBytePtr;
-    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int srcChannelStrideBytes;  /* stride from one channel to the next, in bytes */
-    unsigned int i;
-    unsigned long frameCount;
-    unsigned long framesToGo = framesToProcess;
-    unsigned long framesProcessed = 0;
-
-    do
-    {
-        if( bp->framesInTempOutputBuffer == 0 && *streamCallbackResult == paContinue )
-        {
-            userInput = 0;
-
-            /* setup userOutput */
-            if( bp->userOutputIsInterleaved )
-            {
-                userOutput = bp->tempOutputBuffer;
-            }
-            else /* user output is not interleaved */
-            {
-                for( i = 0; i < bp->outputChannelCount; ++i )
-                {
-                    bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
-                            i * bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
-                }
-
-                userOutput = bp->tempOutputBufferPtrs;
-            }
-
-            bp->timeInfo->inputBufferAdcTime = 0;
-            
-            *streamCallbackResult = bp->streamCallback( userInput, userOutput,
-                    bp->framesPerUserBuffer, bp->timeInfo,
-                    bp->callbackStatusFlags, bp->userData );
-
-            if( *streamCallbackResult == paAbort )
-            {
-                /* if the callback returned paAbort, we disregard its output */
-            }
-            else
-            {
-                bp->timeInfo->outputBufferDacTime += bp->framesPerUserBuffer * bp->samplePeriod;
-
-                bp->framesInTempOutputBuffer = bp->framesPerUserBuffer;
-            }
-        }
-
-        if( bp->framesInTempOutputBuffer > 0 )
-        {
-            /* convert frameCount frames from user buffer to host buffer */
-
-            frameCount = PA_MIN_( bp->framesInTempOutputBuffer, framesToGo );
-
-            if( bp->userOutputIsInterleaved )
-            {
-                srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
-                        bp->bytesPerUserOutputSample * bp->outputChannelCount *
-                        (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
-
-                srcSampleStrideSamples = bp->outputChannelCount;
-                srcChannelStrideBytes = bp->bytesPerUserOutputSample;
-            }
-            else /* user output is not interleaved */
-            {
-                srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
-                        bp->bytesPerUserOutputSample *
-                        (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
-                            
-                srcSampleStrideSamples = 1;
-                srcChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
-            }
-
-            for( i=0; i<bp->outputChannelCount; ++i )
-            {
-                bp->outputConverter(    hostOutputChannels[i].data,
-                                        hostOutputChannels[i].stride,
-                                        srcBytePtr, srcSampleStrideSamples,
-                                        frameCount, &bp->ditherGenerator );
-
-                srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
-
-                /* advance dest ptr for next iteration */
-                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-            }
-
-            bp->framesInTempOutputBuffer -= frameCount;
-        }
-        else
-        {
-            /* no more user data is available because the callback has returned
-                paComplete or paAbort. Fill the remainder of the host buffer
-                with zeros.
-            */
-
-            frameCount = framesToGo;
-
-            for( i=0; i<bp->outputChannelCount; ++i )
-            {
-                bp->outputZeroer(   hostOutputChannels[i].data,
-                                    hostOutputChannels[i].stride,
-                                    frameCount );
-
-                /* advance dest ptr for next iteration */
-                hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                        frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-            }
-        }
-        
-        framesProcessed += frameCount;
-        
-        framesToGo -= frameCount;
-
-    }while( framesToGo > 0 );
-
-    return framesProcessed;
-}
-
-/* CopyTempOutputBuffersToHostOutputBuffers is called from AdaptingProcess to copy frames from
-	tempOutputBuffer to hostOutputChannels. This includes data conversion
-	and interleaving. 
-*/
-static void CopyTempOutputBuffersToHostOutputBuffers( PaUtilBufferProcessor *bp)
-{
-    unsigned long maxFramesToCopy;
-    PaUtilChannelDescriptor *hostOutputChannels;
-    unsigned int frameCount;
-    unsigned char *srcBytePtr;
-    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i;
-
-     /* copy frames from user to host output buffers */
-     while( bp->framesInTempOutputBuffer > 0 &&
-             ((bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]) > 0) )
-     {
-         maxFramesToCopy = bp->framesInTempOutputBuffer;
-
-         /* select the output buffer set (1st or 2nd) */
-         if( bp->hostOutputFrameCount[0] > 0 )
-         {
-             hostOutputChannels = bp->hostOutputChannels[0];
-             frameCount = PA_MIN_( bp->hostOutputFrameCount[0], maxFramesToCopy );
-         }
-         else
-         {
-             hostOutputChannels = bp->hostOutputChannels[1];
-             frameCount = PA_MIN_( bp->hostOutputFrameCount[1], maxFramesToCopy );
-         }
-
-         if( bp->userOutputIsInterleaved )
-         {
-             srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
-                     bp->bytesPerUserOutputSample * bp->outputChannelCount *
-                     (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
-                         
-             srcSampleStrideSamples = bp->outputChannelCount;
-             srcChannelStrideBytes = bp->bytesPerUserOutputSample;
-         }
-         else /* user output is not interleaved */
-         {
-             srcBytePtr = ((unsigned char*)bp->tempOutputBuffer) +
-                     bp->bytesPerUserOutputSample *
-                     (bp->framesPerUserBuffer - bp->framesInTempOutputBuffer);
-
-             srcSampleStrideSamples = 1;
-             srcChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
-         }
-
-         for( i=0; i<bp->outputChannelCount; ++i )
-         {
-             assert( hostOutputChannels[i].data != NULL );
-             bp->outputConverter(    hostOutputChannels[i].data,
-                                     hostOutputChannels[i].stride,
-                                     srcBytePtr, srcSampleStrideSamples,
-                                     frameCount, &bp->ditherGenerator );
-
-             srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
-
-             /* advance dest ptr for next iteration */
-             hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                     frameCount * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-         }
-
-         if( bp->hostOutputFrameCount[0] > 0 )
-             bp->hostOutputFrameCount[0] -= frameCount;
-         else
-             bp->hostOutputFrameCount[1] -= frameCount;
-
-         bp->framesInTempOutputBuffer -= frameCount;
-     }
-}
-
-/*
-    AdaptingProcess is a full duplex adapting buffer processor. It converts
-    data from the temporary output buffer into the host output buffers, then
-    from the host input buffers into the temporary input buffers. Calling the
-    streamCallback when necessary.
-    When processPartialUserBuffers is 0, all available input data will be
-    consumed and all available output space will be filled. When
-    processPartialUserBuffers is non-zero, as many full user buffers
-    as possible will be processed, but partial buffers will not be consumed.
-*/
-static unsigned long AdaptingProcess( PaUtilBufferProcessor *bp,
-        int *streamCallbackResult, int processPartialUserBuffers )
-{
-    void *userInput, *userOutput;
-    unsigned long framesProcessed = 0;
-    unsigned long framesAvailable;
-    unsigned long endProcessingMinFrameCount;
-    unsigned long maxFramesToCopy;
-    PaUtilChannelDescriptor *hostInputChannels, *hostOutputChannels;
-    unsigned int frameCount;
-    unsigned char *destBytePtr;
-    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i, j;
- 
-
-    framesAvailable = bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1];/* this is assumed to be the same as the output buffer's frame count */
-
-    if( processPartialUserBuffers )
-        endProcessingMinFrameCount = 0;
-    else
-        endProcessingMinFrameCount = (bp->framesPerUserBuffer - 1);
-
-    /* Fill host output with remaining frames in user output (tempOutputBuffer) */
-    CopyTempOutputBuffersToHostOutputBuffers( bp );		  	
-
-    while( framesAvailable > endProcessingMinFrameCount ) 
-    {
-
-        if( bp->framesInTempOutputBuffer == 0 && *streamCallbackResult != paContinue )
-        {
-            /* the callback will not be called any more, so zero what remains
-                of the host output buffers */
-
-            for( i=0; i<2; ++i )
-            {
-                frameCount = bp->hostOutputFrameCount[i];
-                if( frameCount > 0 )
-                {
-                    hostOutputChannels = bp->hostOutputChannels[i];
-                    
-                    for( j=0; j<bp->outputChannelCount; ++j )
-                    {
-                        bp->outputZeroer(   hostOutputChannels[j].data,
-                                            hostOutputChannels[j].stride,
-                                            frameCount );
-
-                        /* advance dest ptr for next iteration  */
-                        hostOutputChannels[j].data = ((unsigned char*)hostOutputChannels[j].data) +
-                                frameCount * hostOutputChannels[j].stride * bp->bytesPerHostOutputSample;
-                    }
-                    bp->hostOutputFrameCount[i] = 0;
-                }
-            }
-        }          
-
-
-        /* copy frames from host to user input buffers */
-        while( bp->framesInTempInputBuffer < bp->framesPerUserBuffer &&
-                ((bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1]) > 0) )
-        {
-            maxFramesToCopy = bp->framesPerUserBuffer - bp->framesInTempInputBuffer;
-
-            /* select the input buffer set (1st or 2nd) */
-            if( bp->hostInputFrameCount[0] > 0 )
-            {
-                hostInputChannels = bp->hostInputChannels[0];
-                frameCount = PA_MIN_( bp->hostInputFrameCount[0], maxFramesToCopy );
-            }
-            else
-            {
-                hostInputChannels = bp->hostInputChannels[1];
-                frameCount = PA_MIN_( bp->hostInputFrameCount[1], maxFramesToCopy );
-            }
-
-            /* configure conversion destination pointers */
-            if( bp->userInputIsInterleaved )
-            {
-                destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
-                        bp->bytesPerUserInputSample * bp->inputChannelCount *
-                        bp->framesInTempInputBuffer;
-
-                destSampleStrideSamples = bp->inputChannelCount;
-                destChannelStrideBytes = bp->bytesPerUserInputSample;
-            }
-            else /* user input is not interleaved */
-            {
-                destBytePtr = ((unsigned char*)bp->tempInputBuffer) +
-                        bp->bytesPerUserInputSample * bp->framesInTempInputBuffer;
-
-                destSampleStrideSamples = 1;
-                destChannelStrideBytes = bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
-            }
-
-            for( i=0; i<bp->inputChannelCount; ++i )
-            {
-                bp->inputConverter( destBytePtr, destSampleStrideSamples,
-                                        hostInputChannels[i].data,
-                                        hostInputChannels[i].stride,
-                                        frameCount, &bp->ditherGenerator );
-
-                destBytePtr += destChannelStrideBytes;  /* skip to next destination channel */
-
-                /* advance src ptr for next iteration */
-                hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
-                        frameCount * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
-            }
-
-            if( bp->hostInputFrameCount[0] > 0 )
-                bp->hostInputFrameCount[0] -= frameCount;
-            else
-                bp->hostInputFrameCount[1] -= frameCount;
-                
-            bp->framesInTempInputBuffer += frameCount;
-
-            /* update framesAvailable and framesProcessed based on input consumed
-                unless something is very wrong this will also correspond to the
-                amount of output generated */
-            framesAvailable -= frameCount;
-            framesProcessed += frameCount;
-        }
-
-        /* call streamCallback */
-        if( bp->framesInTempInputBuffer == bp->framesPerUserBuffer &&
-            bp->framesInTempOutputBuffer == 0 )
-        {
-            if( *streamCallbackResult == paContinue )
-            {
-                /* setup userInput */
-                if( bp->userInputIsInterleaved )
-                {
-                    userInput = bp->tempInputBuffer;
-                }
-                else /* user input is not interleaved */
-                {
-                    for( i = 0; i < bp->inputChannelCount; ++i )
-                    {
-                        bp->tempInputBufferPtrs[i] = ((unsigned char*)bp->tempInputBuffer) +
-                                i * bp->framesPerUserBuffer * bp->bytesPerUserInputSample;
-                    }
-
-                    userInput = bp->tempInputBufferPtrs;
-                }
-
-                /* setup userOutput */
-                if( bp->userOutputIsInterleaved )
-                {
-                    userOutput = bp->tempOutputBuffer;
-                }
-                else /* user output is not interleaved */
-                {
-                    for( i = 0; i < bp->outputChannelCount; ++i )
-                    {
-                        bp->tempOutputBufferPtrs[i] = ((unsigned char*)bp->tempOutputBuffer) +
-                                i * bp->framesPerUserBuffer * bp->bytesPerUserOutputSample;
-                    }
-
-                    userOutput = bp->tempOutputBufferPtrs;
-                }
-
-                /* call streamCallback */
-
-                *streamCallbackResult = bp->streamCallback( userInput, userOutput,
-                        bp->framesPerUserBuffer, bp->timeInfo,
-                        bp->callbackStatusFlags, bp->userData );
-
-                bp->timeInfo->inputBufferAdcTime += bp->framesPerUserBuffer * bp->samplePeriod;
-                bp->timeInfo->outputBufferDacTime += bp->framesPerUserBuffer * bp->samplePeriod;
-
-                bp->framesInTempInputBuffer = 0;
-
-                if( *streamCallbackResult == paAbort )
-                    bp->framesInTempOutputBuffer = 0;
-                else
-                    bp->framesInTempOutputBuffer = bp->framesPerUserBuffer;
-            }
-            else
-            {
-                /* paComplete or paAbort has already been called. */
-
-                bp->framesInTempInputBuffer = 0;
-            }
-        }
-
-        /* copy frames from user (tempOutputBuffer) to host output buffers (hostOutputChannels) 
-           Means to process the user output provided by the callback. Has to be called after
-            each callback. */
-        CopyTempOutputBuffersToHostOutputBuffers( bp );		  	
-
-    }
-    
-    return framesProcessed;
-}
-
-
-unsigned long PaUtil_EndBufferProcessing( PaUtilBufferProcessor* bp, int *streamCallbackResult )
-{
-    unsigned long framesToProcess, framesToGo;
-    unsigned long framesProcessed = 0;
-    
-    if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0
-            && bp->hostInputChannels[0][0].data /* input was supplied (see PaUtil_SetNoInput) */
-            && bp->hostOutputChannels[0][0].data /* output was supplied (see PaUtil_SetNoOutput) */ )
-    {
-        assert( (bp->hostInputFrameCount[0] + bp->hostInputFrameCount[1]) ==
-                (bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]) );
-    }
-
-    assert( *streamCallbackResult == paContinue
-            || *streamCallbackResult == paComplete
-            || *streamCallbackResult == paAbort ); /* don't forget to pass in a valid callback result value */
-
-    if( bp->useNonAdaptingProcess )
-    {
-        if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0 )
-        {
-            /* full duplex non-adapting process, splice buffers if they are
-                different lengths */
-
-            framesToGo = bp->hostOutputFrameCount[0] + bp->hostOutputFrameCount[1]; /* relies on assert above for input/output equivalence */
-
-            do{
-                unsigned long noInputInputFrameCount;
-                unsigned long *hostInputFrameCount;
-                PaUtilChannelDescriptor *hostInputChannels;
-                unsigned long noOutputOutputFrameCount;
-                unsigned long *hostOutputFrameCount;
-                PaUtilChannelDescriptor *hostOutputChannels;
-                unsigned long framesProcessedThisIteration;
-
-                if( !bp->hostInputChannels[0][0].data )
-                {
-                    /* no input was supplied (see PaUtil_SetNoInput)
-                        NonAdaptingProcess knows how to deal with this
-                    */
-                    noInputInputFrameCount = framesToGo;
-                    hostInputFrameCount = &noInputInputFrameCount;
-                    hostInputChannels = 0;
-                }
-                else if( bp->hostInputFrameCount[0] != 0 )
-                {
-                    hostInputFrameCount = &bp->hostInputFrameCount[0];
-                    hostInputChannels = bp->hostInputChannels[0];
-                }
-                else
-                {
-                    hostInputFrameCount = &bp->hostInputFrameCount[1];
-                    hostInputChannels = bp->hostInputChannels[1];
-                }
-
-                if( !bp->hostOutputChannels[0][0].data )
-                {
-                    /* no output was supplied (see PaUtil_SetNoOutput)
-                        NonAdaptingProcess knows how to deal with this
-                    */
-                    noOutputOutputFrameCount = framesToGo;
-                    hostOutputFrameCount = &noOutputOutputFrameCount;
-                    hostOutputChannels = 0;
-                }
-                if( bp->hostOutputFrameCount[0] != 0 )
-                {
-                    hostOutputFrameCount = &bp->hostOutputFrameCount[0];
-                    hostOutputChannels = bp->hostOutputChannels[0];
-                }
-                else
-                {
-                    hostOutputFrameCount = &bp->hostOutputFrameCount[1];
-                    hostOutputChannels = bp->hostOutputChannels[1];
-                }
-
-                framesToProcess = PA_MIN_( *hostInputFrameCount,
-                                       *hostOutputFrameCount );
-
-                assert( framesToProcess != 0 );
-                
-                framesProcessedThisIteration = NonAdaptingProcess( bp, streamCallbackResult,
-                        hostInputChannels, hostOutputChannels,
-                        framesToProcess );                                       
-
-                *hostInputFrameCount -= framesProcessedThisIteration;
-                *hostOutputFrameCount -= framesProcessedThisIteration;
-
-                framesProcessed += framesProcessedThisIteration;
-                framesToGo -= framesProcessedThisIteration;
-                
-            }while( framesToGo > 0 );
-        }
-        else
-        {
-            /* half duplex non-adapting process, just process 1st and 2nd buffer */
-            /* process first buffer */
-
-            framesToProcess = (bp->inputChannelCount != 0)
-                            ? bp->hostInputFrameCount[0]
-                            : bp->hostOutputFrameCount[0];
-
-            framesProcessed = NonAdaptingProcess( bp, streamCallbackResult,
-                        bp->hostInputChannels[0], bp->hostOutputChannels[0],
-                        framesToProcess );
-
-            /* process second buffer if provided */
-    
-            framesToProcess = (bp->inputChannelCount != 0)
-                            ? bp->hostInputFrameCount[1]
-                            : bp->hostOutputFrameCount[1];
-            if( framesToProcess > 0 )
-            {
-                framesProcessed += NonAdaptingProcess( bp, streamCallbackResult,
-                    bp->hostInputChannels[1], bp->hostOutputChannels[1],
-                    framesToProcess );
-            }
-        }
-    }
-    else /* block adaption necessary*/
-    {
-
-        if( bp->inputChannelCount != 0 && bp->outputChannelCount != 0 )
-        {
-            /* full duplex */
-            
-            if( bp->hostBufferSizeMode == paUtilVariableHostBufferSizePartialUsageAllowed  )
-            {
-                framesProcessed = AdaptingProcess( bp, streamCallbackResult,
-                        0 /* dont process partial user buffers */ );
-            }
-            else
-            {
-                framesProcessed = AdaptingProcess( bp, streamCallbackResult,
-                        1 /* process partial user buffers */ );
-            }
-        }
-        else if( bp->inputChannelCount != 0 )
-        {
-            /* input only */
-            framesToProcess = bp->hostInputFrameCount[0];
-
-            framesProcessed = AdaptingInputOnlyProcess( bp, streamCallbackResult,
-                        bp->hostInputChannels[0], framesToProcess );
-
-            framesToProcess = bp->hostInputFrameCount[1];
-            if( framesToProcess > 0 )
-            {
-                framesProcessed += AdaptingInputOnlyProcess( bp, streamCallbackResult,
-                        bp->hostInputChannels[1], framesToProcess );
-            }
-        }
-        else
-        {
-            /* output only */
-            framesToProcess = bp->hostOutputFrameCount[0];
-
-            framesProcessed = AdaptingOutputOnlyProcess( bp, streamCallbackResult,
-                        bp->hostOutputChannels[0], framesToProcess );
-
-            framesToProcess = bp->hostOutputFrameCount[1];
-            if( framesToProcess > 0 )
-            {
-                framesProcessed += AdaptingOutputOnlyProcess( bp, streamCallbackResult,
-                        bp->hostOutputChannels[1], framesToProcess );
-            }
-        }
-    }
-
-    return framesProcessed;
-}
-
-
-int PaUtil_IsBufferProcessorOutputEmpty( PaUtilBufferProcessor* bp )
-{
-    return (bp->framesInTempOutputBuffer) ? 0 : 1;
-} 
-
-
-unsigned long PaUtil_CopyInput( PaUtilBufferProcessor* bp,
-        void **buffer, unsigned long frameCount )
-{
-    PaUtilChannelDescriptor *hostInputChannels;
-    unsigned int framesToCopy;
-    unsigned char *destBytePtr;
-    void **nonInterleavedDestPtrs;
-    unsigned int destSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int destChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i;
-
-    hostInputChannels = bp->hostInputChannels[0];
-    framesToCopy = PA_MIN_( bp->hostInputFrameCount[0], frameCount );
-
-    if( bp->userInputIsInterleaved )
-    {
-        destBytePtr = (unsigned char*)*buffer;
-        
-        destSampleStrideSamples = bp->inputChannelCount;
-        destChannelStrideBytes = bp->bytesPerUserInputSample;
-
-        for( i=0; i<bp->inputChannelCount; ++i )
-        {
-            bp->inputConverter( destBytePtr, destSampleStrideSamples,
-                                hostInputChannels[i].data,
-                                hostInputChannels[i].stride,
-                                framesToCopy, &bp->ditherGenerator );
-
-            destBytePtr += destChannelStrideBytes;  /* skip to next source channel */
-
-            /* advance dest ptr for next iteration */
-            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
-                    framesToCopy * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
-        }
-
-        /* advance callers dest pointer (buffer) */
-        *buffer = ((unsigned char *)*buffer) +
-                framesToCopy * bp->inputChannelCount * bp->bytesPerUserInputSample;
-    }
-    else
-    {
-        /* user input is not interleaved */
-        
-        nonInterleavedDestPtrs = (void**)*buffer;
-
-        destSampleStrideSamples = 1;
-        
-        for( i=0; i<bp->inputChannelCount; ++i )
-        {
-            destBytePtr = (unsigned char*)nonInterleavedDestPtrs[i];
-
-            bp->inputConverter( destBytePtr, destSampleStrideSamples,
-                                hostInputChannels[i].data,
-                                hostInputChannels[i].stride,
-                                framesToCopy, &bp->ditherGenerator );
-
-            /* advance callers dest pointer (nonInterleavedDestPtrs[i]) */
-            destBytePtr += bp->bytesPerUserInputSample * framesToCopy;
-            nonInterleavedDestPtrs[i] = destBytePtr;
-            
-            /* advance dest ptr for next iteration */
-            hostInputChannels[i].data = ((unsigned char*)hostInputChannels[i].data) +
-                    framesToCopy * hostInputChannels[i].stride * bp->bytesPerHostInputSample;
-        }
-    }
-
-    bp->hostInputFrameCount[0] -= framesToCopy;
-    
-    return framesToCopy;
-}
-
-unsigned long PaUtil_CopyOutput( PaUtilBufferProcessor* bp,
-        const void ** buffer, unsigned long frameCount )
-{
-    PaUtilChannelDescriptor *hostOutputChannels;
-    unsigned int framesToCopy;
-    unsigned char *srcBytePtr;
-    void **nonInterleavedSrcPtrs;
-    unsigned int srcSampleStrideSamples; /* stride from one sample to the next within a channel, in samples */
-    unsigned int srcChannelStrideBytes; /* stride from one channel to the next, in bytes */
-    unsigned int i;
-
-    hostOutputChannels = bp->hostOutputChannels[0];
-    framesToCopy = PA_MIN_( bp->hostOutputFrameCount[0], frameCount );
-
-    if( bp->userOutputIsInterleaved )
-    {
-        srcBytePtr = (unsigned char*)*buffer;
-        
-        srcSampleStrideSamples = bp->outputChannelCount;
-        srcChannelStrideBytes = bp->bytesPerUserOutputSample;
-
-        for( i=0; i<bp->outputChannelCount; ++i )
-        {
-            bp->outputConverter(    hostOutputChannels[i].data,
-                                    hostOutputChannels[i].stride,
-                                    srcBytePtr, srcSampleStrideSamples,
-                                    framesToCopy, &bp->ditherGenerator );
-
-            srcBytePtr += srcChannelStrideBytes;  /* skip to next source channel */
-
-            /* advance dest ptr for next iteration */
-            hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                    framesToCopy * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-        }
-
-        /* advance callers source pointer (buffer) */
-        *buffer = ((unsigned char *)*buffer) +
-                framesToCopy * bp->outputChannelCount * bp->bytesPerUserOutputSample;
-
-    }
-    else
-    {
-        /* user output is not interleaved */
-        
-        nonInterleavedSrcPtrs = (void**)*buffer;
-
-        srcSampleStrideSamples = 1;
-        
-        for( i=0; i<bp->outputChannelCount; ++i )
-        {
-            srcBytePtr = (unsigned char*)nonInterleavedSrcPtrs[i];
-            
-            bp->outputConverter(    hostOutputChannels[i].data,
-                                    hostOutputChannels[i].stride,
-                                    srcBytePtr, srcSampleStrideSamples,
-                                    framesToCopy, &bp->ditherGenerator );
-
-
-            /* advance callers source pointer (nonInterleavedSrcPtrs[i]) */
-            srcBytePtr += bp->bytesPerUserOutputSample * framesToCopy;
-            nonInterleavedSrcPtrs[i] = srcBytePtr;
-            
-            /* advance dest ptr for next iteration */
-            hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                    framesToCopy * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-        }
-    }
-
-    bp->hostOutputFrameCount[0] += framesToCopy;
-    
-    return framesToCopy;
-}
-
-
-unsigned long PaUtil_ZeroOutput( PaUtilBufferProcessor* bp, unsigned long frameCount )
-{
-    PaUtilChannelDescriptor *hostOutputChannels;
-    unsigned int framesToZero;
-    unsigned int i;
-
-    hostOutputChannels = bp->hostOutputChannels[0];
-    framesToZero = PA_MIN_( bp->hostOutputFrameCount[0], frameCount );
-
-    for( i=0; i<bp->outputChannelCount; ++i )
-    {
-        bp->outputZeroer(   hostOutputChannels[i].data,
-                            hostOutputChannels[i].stride,
-                            framesToZero );
-
-
-        /* advance dest ptr for next iteration */
-        hostOutputChannels[i].data = ((unsigned char*)hostOutputChannels[i].data) +
-                framesToZero * hostOutputChannels[i].stride * bp->bytesPerHostOutputSample;
-    }
-
-    bp->hostOutputFrameCount[0] += framesToZero;
-    
-    return framesToZero;
-}
diff --git a/libs/portaudio/src/common/pa_process.h b/libs/portaudio/src/common/pa_process.h
deleted file mode 100644
index 89584bc074..0000000000
--- a/libs/portaudio/src/common/pa_process.h
+++ /dev/null
@@ -1,750 +0,0 @@
-#ifndef PA_PROCESS_H
-#define PA_PROCESS_H
-/*
- * $Id: pa_process.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library callback buffer processing adapters
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
- 
-/** @file
- @ingroup common_src
-
- @brief Buffer Processor prototypes. A Buffer Processor performs buffer length
- adaption, coordinates sample format conversion, and interleaves/deinterleaves
- channels.
-
- <h3>Overview</h3>
-
- The "Buffer Processor" (PaUtilBufferProcessor) manages conversion of audio
- data from host buffers to user buffers and back again. Where required, the
- buffer processor takes care of converting between host and user sample formats,
- interleaving and deinterleaving multichannel buffers, and adapting between host
- and user buffers with different lengths. The buffer processor may be used with
- full and half duplex streams, for both callback streams and blocking read/write
- streams.
-
- One of the important capabilities provided by the buffer processor is
- the ability to adapt between user and host buffer sizes of different lengths
- with minimum latency. Although this task is relatively easy to perform when
- the host buffer size is an integer multiple of the user buffer size, the
- problem is more complicated when this is not the case - especially for
- full-duplex callback streams. Where necessary the adaption is implemented by
- internally buffering some input and/or output data. The buffer adation
- algorithm used by the buffer processor was originally implemented by
- Stephan Letz for the ASIO version of PortAudio, and is described in his
- Callback_adaption_.pdf which is included in the distribution.
-
- The buffer processor performs sample conversion using the functions provided
- by pa_converters.c.
-
- The following sections provide an overview of how to use the buffer processor.
- Interested readers are advised to consult the host API implementations for
- examples of buffer processor usage.
- 
-
- <h4>Initialization, resetting and termination</h4>
-
- When a stream is opened, the buffer processor should be initialized using
- PaUtil_InitializeBufferProcessor. This function initializes internal state
- and allocates temporary buffers as neccesary according to the supplied
- configuration parameters. Some of the parameters correspond to those requested
- by the user in their call to Pa_OpenStream(), others reflect the requirements
- of the host API implementation - they indicate host buffer sizes, formats,
- and the type of buffering which the Host API uses. The buffer processor should
- be initialized for callback streams and blocking read/write streams.
-
- Call PaUtil_ResetBufferProcessor to clear any sample data which is present
- in the buffer processor before starting to use it (for example when
- Pa_StartStream is called).
-
- When the buffer processor is no longer used call
- PaUtil_TerminateBufferProcessor.
-
- 
- <h4>Using the buffer processor for a callback stream</h4>
-
- The buffer processor's role in a callback stream is to take host input buffers
- process them with the stream callback, and fill host output buffers. For a
- full duplex stream, the buffer processor handles input and output simultaneously
- due to the requirements of the minimum-latency buffer adation algorithm.
-
- When a host buffer becomes available, the implementation should call
- the buffer processor to process the buffer. The buffer processor calls the
- stream callback to consume and/or produce audio data as necessary. The buffer
- processor will convert sample formats, interleave/deinterleave channels,
- and slice or chunk the data to the appropriate buffer lengths according to
- the requirements of the stream callback and the host API.
-
- To process a host buffer (or a pair of host buffers for a full-duplex stream)
- use the following calling sequence:
-
- -# Call PaUtil_BeginBufferProcessing
- -# For a stream which takes input:
-    - Call PaUtil_SetInputFrameCount with the number of frames in the host input
-        buffer.
-    - Call one of the following functions one or more times to tell the
-        buffer processor about the host input buffer(s): PaUtil_SetInputChannel,
-        PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel.
-        Which function you call will depend on whether the host buffer(s) are
-        interleaved or not.
-    - If the available host data is split accross two buffers (for example a
-        data range at the end of a circular buffer and another range at the
-        beginning of the circular buffer), also call
-        PaUtil_Set2ndInputFrameCount, PaUtil_Set2ndInputChannel,
-        PaUtil_Set2ndInterleavedInputChannels,
-        PaUtil_Set2ndNonInterleavedInputChannel as necessary to tell the buffer
-        processor about the second buffer.
- -# For a stream which generates output:
-    - Call PaUtil_SetOutputFrameCount with the number of frames in the host
-        output buffer.
-    - Call one of the following functions one or more times to tell the
-        buffer processor about the host output buffer(s): PaUtil_SetOutputChannel,
-        PaUtil_SetInterleavedOutputChannels, PaUtil_SetNonInterleavedOutputChannel.
-        Which function you call will depend on whether the host buffer(s) are
-        interleaved or not.
-    - If the available host output buffer space is split accross two buffers
-        (for example a data range at the end of a circular buffer and another
-        range at the beginning of the circular buffer), call
-        PaUtil_Set2ndOutputFrameCount, PaUtil_Set2ndOutputChannel,
-        PaUtil_Set2ndInterleavedOutputChannels,
-        PaUtil_Set2ndNonInterleavedOutputChannel as necessary to tell the buffer
-        processor about the second buffer.
- -# Call PaUtil_EndBufferProcessing, this function performs the actual data
-    conversion and processing.
-
-
- <h4>Using the buffer processor for a blocking read/write stream</h4>
-
- Blocking read/write streams use the buffer processor to convert and copy user
- output data to a host buffer, and to convert and copy host input data to
- the user's buffer. The buffer processor does not perform any buffer adaption.
- When using the buffer processor in a blocking read/write stream the input and
- output conversion are performed separately by the PaUtil_CopyInput and
- PaUtil_CopyOutput functions.
-
- To copy data from a host input buffer to the buffer(s) which the user supplies
- to Pa_ReadStream, use the following calling sequence.
-
- - Repeat the following three steps until the user buffer(s) have been filled
-    with samples from the host input buffers:
-     -# Call PaUtil_SetInputFrameCount with the number of frames in the host
-        input buffer.
-     -# Call one of the following functions one or more times to tell the
-        buffer processor about the host input buffer(s): PaUtil_SetInputChannel,
-        PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel.
-        Which function you call will depend on whether the host buffer(s) are
-        interleaved or not.
-     -# Call PaUtil_CopyInput with the user buffer pointer (or a copy of the
-        array of buffer pointers for a non-interleaved stream) passed to
-        Pa_ReadStream, along with the number of frames in the user buffer(s).
-        Be careful to pass a <i>copy</i> of the user buffer pointers to
-        PaUtil_CopyInput because PaUtil_CopyInput advances the pointers to
-        the start of the next region to copy.
- - PaUtil_CopyInput will not copy more data than is available in the
-    host buffer(s), so the above steps need to be repeated until the user
-    buffer(s) are full.
-
- 
- To copy data to the host output buffer from the user buffers(s) supplied
- to Pa_WriteStream use the following calling sequence.
-
- - Repeat the following three steps until all frames from the user buffer(s)
-    have been copied to the host API:
-     -# Call PaUtil_SetOutputFrameCount with the number of frames in the host
-        output buffer.
-     -# Call one of the following functions one or more times to tell the
-        buffer processor about the host output buffer(s): PaUtil_SetOutputChannel,
-        PaUtil_SetInterleavedOutputChannels, PaUtil_SetNonInterleavedOutputChannel.
-        Which function you call will depend on whether the host buffer(s) are
-        interleaved or not.
-     -# Call PaUtil_CopyOutput with the user buffer pointer (or a copy of the
-        array of buffer pointers for a non-interleaved stream) passed to
-        Pa_WriteStream, along with the number of frames in the user buffer(s).
-        Be careful to pass a <i>copy</i> of the user buffer pointers to 
-        PaUtil_CopyOutput because PaUtil_CopyOutput advances the pointers to
-        the start of the next region to copy.
- - PaUtil_CopyOutput will not copy more data than fits in the host buffer(s),
-    so the above steps need to be repeated until all user data is copied.
-*/
-
-
-#include "portaudio.h"
-#include "pa_converters.h"
-#include "pa_dither.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-/** @brief Mode flag passed to PaUtil_InitializeBufferProcessor indicating the type
- of buffering that the host API uses.
-
- The mode used depends on whether the host API or the implementation manages
- the buffers, and how these buffers are used (scatter gather, circular buffer).
-*/
-typedef enum {
-/** The host buffer size is a fixed known size. */
-    paUtilFixedHostBufferSize,
-
-/** The host buffer size may vary, but has a known maximum size. */
-    paUtilBoundedHostBufferSize,
-
-/** Nothing is known about the host buffer size. */
-    paUtilUnknownHostBufferSize,
-
-/** The host buffer size varies, and the client does not require the buffer
- processor to consume all of the input and fill all of the output buffer. This
- is useful when the implementation has access to the host API's circular buffer
- and only needs to consume/fill some of it, not necessarily all of it, with each
- call to the buffer processor. This is the only mode where
- PaUtil_EndBufferProcessing() may not consume the whole buffer.
-*/
-    paUtilVariableHostBufferSizePartialUsageAllowed
-}PaUtilHostBufferSizeMode;
-
-
-/** @brief An auxilliary data structure used internally by the buffer processor
- to represent host input and output buffers. */
-typedef struct PaUtilChannelDescriptor{
-    void *data;
-    unsigned int stride;  /**< stride in samples, not bytes */
-}PaUtilChannelDescriptor;
-
-
-/** @brief The main buffer processor data structure.
-
- Allocate one of these, initialize it with PaUtil_InitializeBufferProcessor
- and terminate it with PaUtil_TerminateBufferProcessor.
-*/
-typedef struct {
-    unsigned long framesPerUserBuffer;
-    unsigned long framesPerHostBuffer;
-
-    PaUtilHostBufferSizeMode hostBufferSizeMode;
-    int useNonAdaptingProcess;
-    unsigned long framesPerTempBuffer;
-
-    unsigned int inputChannelCount;
-    unsigned int bytesPerHostInputSample;
-    unsigned int bytesPerUserInputSample;
-    int userInputIsInterleaved;
-    PaUtilConverter *inputConverter;
-    PaUtilZeroer *inputZeroer;
-    
-    unsigned int outputChannelCount;
-    unsigned int bytesPerHostOutputSample;
-    unsigned int bytesPerUserOutputSample;
-    int userOutputIsInterleaved;
-    PaUtilConverter *outputConverter;
-    PaUtilZeroer *outputZeroer;
-
-    unsigned long initialFramesInTempInputBuffer;
-    unsigned long initialFramesInTempOutputBuffer;
-
-    void *tempInputBuffer;          /**< used for slips, block adaption, and conversion. */
-    void **tempInputBufferPtrs;     /**< storage for non-interleaved buffer pointers, NULL for interleaved user input */
-    unsigned long framesInTempInputBuffer; /**< frames remaining in input buffer from previous adaption iteration */
-
-    void *tempOutputBuffer;         /**< used for slips, block adaption, and conversion. */
-    void **tempOutputBufferPtrs;    /**< storage for non-interleaved buffer pointers, NULL for interleaved user output */
-    unsigned long framesInTempOutputBuffer; /**< frames remaining in input buffer from previous adaption iteration */
-
-    PaStreamCallbackTimeInfo *timeInfo;
-
-    PaStreamCallbackFlags callbackStatusFlags;
-
-    unsigned long hostInputFrameCount[2];
-    PaUtilChannelDescriptor *hostInputChannels[2]; /**< pointers to arrays of channel descriptors.
-                                                        pointers are NULL for half-duplex output processing.
-                                                        hostInputChannels[i].data is NULL when the caller
-                                                        calls PaUtil_SetNoInput()
-                                                        */
-    unsigned long hostOutputFrameCount[2];
-    PaUtilChannelDescriptor *hostOutputChannels[2]; /**< pointers to arrays of channel descriptors.
-                                                         pointers are NULL for half-duplex input processing.
-                                                         hostOutputChannels[i].data is NULL when the caller
-                                                         calls PaUtil_SetNoOutput()
-                                                         */
-
-    PaUtilTriangularDitherGenerator ditherGenerator;
-
-    double samplePeriod;
-
-    PaStreamCallback *streamCallback;
-    void *userData;
-} PaUtilBufferProcessor;
-
-
-/** @name Initialization, termination, resetting and info */
-/*@{*/
-
-/** Initialize a buffer processor's representation stored in a
- PaUtilBufferProcessor structure. Be sure to call
- PaUtil_TerminateBufferProcessor after finishing with a buffer processor.
-
- @param bufferProcessor The buffer processor structure to initialize.
-
- @param inputChannelCount The number of input channels as passed to
- Pa_OpenStream or 0 for an output-only stream.
-
- @param userInputSampleFormat Format of user input samples, as passed to
- Pa_OpenStream. This parameter is ignored for ouput-only streams.
- 
- @param hostInputSampleFormat Format of host input samples. This parameter is
- ignored for output-only streams. See note about host buffer interleave below.
-
- @param outputChannelCount The number of output channels as passed to
- Pa_OpenStream or 0 for an input-only stream.
-
- @param userOutputSampleFormat Format of user output samples, as passed to
- Pa_OpenStream. This parameter is ignored for input-only streams.
- 
- @param hostOutputSampleFormat Format of host output samples. This parameter is
- ignored for input-only streams. See note about host buffer interleave below.
-
- @param sampleRate Sample rate of the stream. The more accurate this is the
- better - it is used for updating time stamps when adapting buffers.
- 
- @param streamFlags Stream flags as passed to Pa_OpenStream, this parameter is
- used for selecting special sample conversion options such as clipping and
- dithering.
- 
- @param framesPerUserBuffer Number of frames per user buffer, as requested
- by the framesPerBuffer parameter to Pa_OpenStream. This parameter may be
- zero to indicate that the user will accept any (and varying) buffer sizes.
-
- @param framesPerHostBuffer Specifies the number of frames per host buffer
- for the fixed buffer size mode, and the maximum number of frames
- per host buffer for the bounded host buffer size mode. It is ignored for
- the other modes.
-
- @param hostBufferSizeMode A mode flag indicating the size variability of
- host buffers that will be passed to the buffer processor. See
- PaUtilHostBufferSizeMode for further details.
- 
- @param streamCallback The user stream callback passed to Pa_OpenStream.
-
- @param userData The user data field passed to Pa_OpenStream.
-    
- @note The interleave flag is ignored for host buffer formats. Host
- interleave is determined by the use of different SetInput and SetOutput
- functions.
-
- @return An error code indicating whether the initialization was successful.
- If the error code is not PaNoError, the buffer processor was not initialized
- and should not be used.
- 
- @see Pa_OpenStream, PaUtilHostBufferSizeMode, PaUtil_TerminateBufferProcessor
-*/
-PaError PaUtil_InitializeBufferProcessor( PaUtilBufferProcessor* bufferProcessor,
-            int inputChannelCount, PaSampleFormat userInputSampleFormat,
-            PaSampleFormat hostInputSampleFormat,
-            int outputChannelCount, PaSampleFormat userOutputSampleFormat,
-            PaSampleFormat hostOutputSampleFormat,
-            double sampleRate,
-            PaStreamFlags streamFlags,
-            unsigned long framesPerUserBuffer, /* 0 indicates don't care */
-            unsigned long framesPerHostBuffer,
-            PaUtilHostBufferSizeMode hostBufferSizeMode,
-            PaStreamCallback *streamCallback, void *userData );
-
-
-/** Terminate a buffer processor's representation. Deallocates any temporary
- buffers allocated by PaUtil_InitializeBufferProcessor.
- 
- @param bufferProcessor The buffer processor structure to terminate.
-
- @see PaUtil_InitializeBufferProcessor.
-*/
-void PaUtil_TerminateBufferProcessor( PaUtilBufferProcessor* bufferProcessor );
-
-
-/** Clear any internally buffered data. If you call
- PaUtil_InitializeBufferProcessor in your OpenStream routine, make sure you
- call PaUtil_ResetBufferProcessor in your StartStream call.
-
- @param bufferProcessor The buffer processor to reset.
-*/
-void PaUtil_ResetBufferProcessor( PaUtilBufferProcessor* bufferProcessor );
-
-
-/** Retrieve the input latency of a buffer processor.
-
- @param bufferProcessor The buffer processor examine.
-
- @return The input latency introduced by the buffer processor, in frames.
-
- @see PaUtil_GetBufferProcessorOutputLatency
-*/
-unsigned long PaUtil_GetBufferProcessorInputLatency( PaUtilBufferProcessor* bufferProcessor );
-
-/** Retrieve the output latency of a buffer processor.
-
- @param bufferProcessor The buffer processor examine.
-
- @return The output latency introduced by the buffer processor, in frames.
-
- @see PaUtil_GetBufferProcessorInputLatency
-*/
-unsigned long PaUtil_GetBufferProcessorOutputLatency( PaUtilBufferProcessor* bufferProcessor );
-
-/*@}*/
-
-
-/** @name Host buffer pointer configuration
-
- Functions to set host input and output buffers, used by both callback streams
- and blocking read/write streams.
-*/
-/*@{*/ 
-
-
-/** Set the number of frames in the input host buffer(s) specified by the
- PaUtil_Set*InputChannel functions.
-
- @param bufferProcessor The buffer processor.
-
- @param frameCount The number of host input frames. A 0 frameCount indicates to
- use the framesPerHostBuffer value passed to PaUtil_InitializeBufferProcessor.
-
- @see PaUtil_SetNoInput, PaUtil_SetInputChannel,
- PaUtil_SetInterleavedInputChannels, PaUtil_SetNonInterleavedInputChannel
-*/
-void PaUtil_SetInputFrameCount( PaUtilBufferProcessor* bufferProcessor,
-        unsigned long frameCount );
-
-        
-/** Indicate that no input is avalable. This function should be used when
- priming the output of a full-duplex stream opened with the
- paPrimeOutputBuffersUsingStreamCallback flag. Note that it is not necessary
- to call this or any othe PaUtil_Set*Input* functions for ouput-only streams.
-
- @param bufferProcessor The buffer processor.
-*/
-void PaUtil_SetNoInput( PaUtilBufferProcessor* bufferProcessor );
-
-
-/** Provide the buffer processor with a pointer to a host input channel.
-
- @param bufferProcessor The buffer processor.
- @param channel The channel number.
- @param data The buffer.
- @param stride The stride from one sample to the next, in samples. For
- interleaved host buffers, the stride will usually be the same as the number of
- channels in the buffer.
-*/
-void PaUtil_SetInputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data, unsigned int stride );
-
-
-/** Provide the buffer processor with a pointer to an number of interleaved
- host input channels.
-
- @param bufferProcessor The buffer processor.
- @param firstChannel The first channel number.
- @param data The buffer.
- @param channelCount The number of interleaved channels in the buffer. If
- channelCount is zero, the number of channels specified to
- PaUtil_InitializeBufferProcessor will be used.
-*/
-void PaUtil_SetInterleavedInputChannels( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int firstChannel, void *data, unsigned int channelCount );
-
-
-/** Provide the buffer processor with a pointer to one non-interleaved host
- output channel.
-
- @param bufferProcessor The buffer processor.
- @param channel The channel number.
- @param data The buffer.
-*/
-void PaUtil_SetNonInterleavedInputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data );
-
-
-/** Use for the second buffer half when the input buffer is split in two halves.
- @see PaUtil_SetInputFrameCount
-*/
-void PaUtil_Set2ndInputFrameCount( PaUtilBufferProcessor* bufferProcessor,
-        unsigned long frameCount );
-
-/** Use for the second buffer half when the input buffer is split in two halves.
- @see PaUtil_SetInputChannel
-*/
-void PaUtil_Set2ndInputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data, unsigned int stride );
-
-/** Use for the second buffer half when the input buffer is split in two halves.
- @see PaUtil_SetInterleavedInputChannels
-*/
-void PaUtil_Set2ndInterleavedInputChannels( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int firstChannel, void *data, unsigned int channelCount );
-
-/** Use for the second buffer half when the input buffer is split in two halves.
- @see PaUtil_SetNonInterleavedInputChannel
-*/
-void PaUtil_Set2ndNonInterleavedInputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data );
-
-        
-/** Set the number of frames in the output host buffer(s) specified by the
- PaUtil_Set*OutputChannel functions.
-
- @param bufferProcessor The buffer processor.
-
- @param frameCount The number of host output frames. A 0 frameCount indicates to
- use the framesPerHostBuffer value passed to PaUtil_InitializeBufferProcessor.
-
- @see PaUtil_SetOutputChannel, PaUtil_SetInterleavedOutputChannels,
- PaUtil_SetNonInterleavedOutputChannel
-*/
-void PaUtil_SetOutputFrameCount( PaUtilBufferProcessor* bufferProcessor,
-        unsigned long frameCount );
-
-
-/** Indicate that the output will be discarded. This function should be used
- when implementing the paNeverDropInput mode for full duplex streams.
-
- @param bufferProcessor The buffer processor.
-*/
-void PaUtil_SetNoOutput( PaUtilBufferProcessor* bufferProcessor );
-
-
-/** Provide the buffer processor with a pointer to a host output channel.
-
- @param bufferProcessor The buffer processor.
- @param channel The channel number.
- @param data The buffer.
- @param stride The stride from one sample to the next, in samples. For
- interleaved host buffers, the stride will usually be the same as the number of
- channels in the buffer.
-*/
-void PaUtil_SetOutputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data, unsigned int stride );
-
-
-/** Provide the buffer processor with a pointer to a number of interleaved
- host output channels.
-
- @param bufferProcessor The buffer processor.
- @param firstChannel The first channel number.
- @param data The buffer.
- @param channelCount The number of interleaved channels in the buffer. If
- channelCount is zero, the number of channels specified to
- PaUtil_InitializeBufferProcessor will be used.
-*/
-void PaUtil_SetInterleavedOutputChannels( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int firstChannel, void *data, unsigned int channelCount );
-
-        
-/** Provide the buffer processor with a pointer to one non-interleaved host
- output channel.
-
- @param bufferProcessor The buffer processor.
- @param channel The channel number.
- @param data The buffer.
-*/
-void PaUtil_SetNonInterleavedOutputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data );
-
-
-/** Use for the second buffer half when the output buffer is split in two halves.
- @see PaUtil_SetOutputFrameCount
-*/
-void PaUtil_Set2ndOutputFrameCount( PaUtilBufferProcessor* bufferProcessor,
-        unsigned long frameCount );
-
-/** Use for the second buffer half when the output buffer is split in two halves.
- @see PaUtil_SetOutputChannel
-*/
-void PaUtil_Set2ndOutputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data, unsigned int stride );
-
-/** Use for the second buffer half when the output buffer is split in two halves.
- @see PaUtil_SetInterleavedOutputChannels
-*/
-void PaUtil_Set2ndInterleavedOutputChannels( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int firstChannel, void *data, unsigned int channelCount );
-
-/** Use for the second buffer half when the output buffer is split in two halves.
- @see PaUtil_SetNonInterleavedOutputChannel
-*/
-void PaUtil_Set2ndNonInterleavedOutputChannel( PaUtilBufferProcessor* bufferProcessor,
-        unsigned int channel, void *data );
-
-/*@}*/
-
-
-/** @name Buffer processing functions for callback streams
-*/
-/*@{*/
-
-/** Commence processing a host buffer (or a pair of host buffers in the
- full-duplex case) for a callback stream.
-
- @param bufferProcessor The buffer processor.
-
- @param timeInfo Timing information for the first sample of the host
- buffer(s). This information may be adjusted when buffer adaption is being
- performed.
-
- @param callbackStatusFlags Flags indicating whether underruns and overruns
- have occurred since the last time the buffer processor was called.
-*/
-void PaUtil_BeginBufferProcessing( PaUtilBufferProcessor* bufferProcessor,
-        PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags callbackStatusFlags );
-
-        
-/** Finish processing a host buffer (or a pair of host buffers in the
- full-duplex case) for a callback stream.
-
- @param bufferProcessor The buffer processor.
- 
- @param callbackResult On input, indicates a previous callback result, and on
- exit, the result of the user stream callback, if it is called.
- On entry callbackResult should contain one of { paContinue, paComplete, or
- paAbort}. If paComplete is passed, the stream callback will not be called
- but any audio that was generated by previous stream callbacks will be copied
- to the output buffer(s). You can check whether the buffer processor's internal
- buffer is empty by calling PaUtil_IsBufferProcessorOutputEmpty.
-
- If the stream callback is called its result is stored in *callbackResult. If
- the stream callback returns paComplete or paAbort, all output buffers will be
- full of valid data - some of which may be zeros to acount for data that
- wasn't generated by the terminating callback.
-
- @return The number of frames processed. This usually corresponds to the
- number of frames specified by the PaUtil_Set*FrameCount functions, exept in
- the paUtilVariableHostBufferSizePartialUsageAllowed buffer size mode when a
- smaller value may be returned.
-*/
-unsigned long PaUtil_EndBufferProcessing( PaUtilBufferProcessor* bufferProcessor,
-        int *callbackResult );
-
-
-/** Determine whether any callback generated output remains in the bufffer
- processor's internal buffers. This method may be used to determine when to
- continue calling PaUtil_EndBufferProcessing() after the callback has returned
- a callbackResult of paComplete.
-
- @param bufferProcessor The buffer processor.
- 
- @return Returns non-zero when callback generated output remains in the internal
- buffer and zero (0) when there internal buffer contains no callback generated
- data.
-*/
-int PaUtil_IsBufferProcessorOutputEmpty( PaUtilBufferProcessor* bufferProcessor );
-
-/*@}*/
-
-
-/** @name Buffer processing functions for blocking read/write streams
-*/
-/*@{*/
-
-/** Copy samples from host input channels set up by the PaUtil_Set*InputChannels
- functions to a user supplied buffer. This function is intended for use with
- blocking read/write streams. Copies the minimum of the number of
- user frames (specified by the frameCount parameter) and the number of available
- host frames (specified in a previous call to SetInputFrameCount()).
-
- @param bufferProcessor The buffer processor.
-
- @param buffer A pointer to the user buffer pointer, or a pointer to a pointer
- to an array of user buffer pointers for a non-interleaved stream. It is
- important that this parameter points to a copy of the user buffer pointers,
- not to the actual user buffer pointers, because this function updates the
- pointers before returning.
-
- @param frameCount The number of frames of data in the buffer(s) pointed to by
- the buffer parameter.
-
- @return The number of frames copied. The buffer pointer(s) pointed to by the
- buffer parameter are advanced to point to the frame(s) following the last one
- filled.
-*/
-unsigned long PaUtil_CopyInput( PaUtilBufferProcessor* bufferProcessor,
-        void **buffer, unsigned long frameCount );
-
-
-/* Copy samples from a user supplied buffer to host output channels set up by
- the PaUtil_Set*OutputChannels functions. This function is intended for use with
- blocking read/write streams. Copies the minimum of the number of
- user frames (specified by the frameCount parameter) and the number of
- host frames (specified in a previous call to SetOutputFrameCount()).
-
- @param bufferProcessor The buffer processor.
-
- @param buffer A pointer to the user buffer pointer, or a pointer to a pointer
- to an array of user buffer pointers for a non-interleaved stream. It is
- important that this parameter points to a copy of the user buffer pointers,
- not to the actual user buffer pointers, because this function updates the
- pointers before returning.
-
- @param frameCount The number of frames of data in the buffer(s) pointed to by
- the buffer parameter.
-
- @return The number of frames copied. The buffer pointer(s) pointed to by the
- buffer parameter are advanced to point to the frame(s) following the last one
- copied.
-*/
-unsigned long PaUtil_CopyOutput( PaUtilBufferProcessor* bufferProcessor,
-        const void ** buffer, unsigned long frameCount );
-
-
-/* Zero samples in host output channels set up by the PaUtil_Set*OutputChannels
- functions. This function is useful for flushing streams.
- Zeros the minimum of frameCount and the number of host frames specified in a
- previous call to SetOutputFrameCount().
-
- @param bufferProcessor The buffer processor.
-
- @param frameCount The maximum number of frames to zero.
- 
- @return The number of frames zeroed.
-*/
-unsigned long PaUtil_ZeroOutput( PaUtilBufferProcessor* bufferProcessor,
-        unsigned long frameCount );
-
-
-/*@}*/
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_PROCESS_H */
diff --git a/libs/portaudio/src/common/pa_ringbuffer.c b/libs/portaudio/src/common/pa_ringbuffer.c
deleted file mode 100644
index f4e1201a6b..0000000000
--- a/libs/portaudio/src/common/pa_ringbuffer.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * $Id: pa_ringbuffer.c 1240 2007-07-17 13:05:07Z bjornroche $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on Mac OS X by Bjorn Roche
- * modified for SMP safety on Linux by Leland Lucius
- * also, allowed for const where possible
- * Note that this is safe only for a single-thread reader and a
- * single-thread writer.
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup common_src
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "pa_ringbuffer.h"
-#include <string.h>
-
-/****************
- * First, we'll define some memory barrier primitives based on the system.
- * right now only OS X, FreeBSD, and Linux are supported. In addition to providing
- * memory barriers, these functions should ensure that data cached in registers
- * is written out to cache where it can be snooped by other CPUs. (ie, the volatile
- * keyword should not be required)
- *
- * the primitives that must be defined are:
- *
- * PaUtil_FullMemoryBarrier()
- * PaUtil_ReadMemoryBarrier()
- * PaUtil_WriteMemoryBarrier()
- *
- ****************/
-
-#if defined(__APPLE__)
-#   include <libkern/OSAtomic.h>
-    /* Here are the memory barrier functions. Mac OS X only provides
-       full memory barriers, so the three types of barriers are the same,
-       however, these barriers are superior to compiler-based ones. */
-#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
-#elif defined(__GNUC__)
-    /* GCC >= 4.1 has built-in intrinsics. We'll use those */
-#   if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-#      define PaUtil_FullMemoryBarrier()  __sync_synchronize()
-#      define PaUtil_ReadMemoryBarrier()  __sync_synchronize()
-#      define PaUtil_WriteMemoryBarrier() __sync_synchronize()
-    /* as a fallback, GCC understands volatile asm and "memory" to mean it
-     * should not reorder memory read/writes */
-#   elif defined( __PPC__ )
-#      define PaUtil_FullMemoryBarrier()  asm volatile("sync":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  asm volatile("sync":::"memory")
-#      define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory")
-#   elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined( __x86_64__ )
-#      define PaUtil_FullMemoryBarrier()  asm volatile("mfence":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  asm volatile("lfence":::"memory")
-#      define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory")
-#   else
-#      ifdef ALLOW_SMP_DANGERS
-#         warning Memory barriers not defined on this system or system unknown
-#         warning For SMP safety, you should fix this.
-#         define PaUtil_FullMemoryBarrier()
-#         define PaUtil_ReadMemoryBarrier()
-#         define PaUtil_WriteMemoryBarrier()
-#      else
-#         error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
-#      endif
-#   endif
-#else
-#   ifdef ALLOW_SMP_DANGERS
-#      warning Memory barriers not defined on this system or system unknown
-#      warning For SMP safety, you should fix this.
-#      define PaUtil_FullMemoryBarrier()
-#      define PaUtil_ReadMemoryBarrier()
-#      define PaUtil_WriteMemoryBarrier()
-#   else
-#      error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
-#   endif
-#endif
-
-/***************************************************************************
- * Initialize FIFO.
- * numBytes must be power of 2, returns -1 if not.
- */
-long PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, long numBytes, void *dataPtr )
-{
-    if( ((numBytes-1) & numBytes) != 0) return -1; /* Not Power of two. */
-    rbuf->bufferSize = numBytes;
-    rbuf->buffer = (char *)dataPtr;
-    PaUtil_FlushRingBuffer( rbuf );
-    rbuf->bigMask = (numBytes*2)-1;
-    rbuf->smallMask = (numBytes)-1;
-    return 0;
-}
-
-/***************************************************************************
-** Return number of bytes available for reading. */
-long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf )
-{
-    PaUtil_ReadMemoryBarrier();
-    return ( (rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask );
-}
-/***************************************************************************
-** Return number of bytes available for writing. */
-long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf )
-{
-    /* Since we are calling PaUtil_GetRingBufferReadAvailable, we don't need an aditional MB */
-    return ( rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf));
-}
-
-/***************************************************************************
-** Clear buffer. Should only be called when buffer is NOT being read. */
-void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf )
-{
-    rbuf->writeIndex = rbuf->readIndex = 0;
-}
-
-/***************************************************************************
-** Get address of region(s) to which we can write data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes,
-                                       void **dataPtr1, long *sizePtr1,
-                                       void **dataPtr2, long *sizePtr2 )
-{
-    long   index;
-    long   available = PaUtil_GetRingBufferWriteAvailable( rbuf );
-    if( numBytes > available ) numBytes = available;
-    /* Check to see if write is not contiguous. */
-    index = rbuf->writeIndex & rbuf->smallMask;
-    if( (index + numBytes) > rbuf->bufferSize )
-    {
-        /* Write data in two blocks that wrap the buffer. */
-        long   firstHalf = rbuf->bufferSize - index;
-        *dataPtr1 = &rbuf->buffer[index];
-        *sizePtr1 = firstHalf;
-        *dataPtr2 = &rbuf->buffer[0];
-        *sizePtr2 = numBytes - firstHalf;
-    }
-    else
-    {
-        *dataPtr1 = &rbuf->buffer[index];
-        *sizePtr1 = numBytes;
-        *dataPtr2 = NULL;
-        *sizePtr2 = 0;
-    }
-    return numBytes;
-}
-
-
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes )
-{
-    /* we need to ensure that previous writes are seen before we update the write index */
-    PaUtil_WriteMemoryBarrier();
-    return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Get address of region(s) from which we can read data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes,
-                                void **dataPtr1, long *sizePtr1,
-                                void **dataPtr2, long *sizePtr2 )
-{
-    long   index;
-    long   available = PaUtil_GetRingBufferReadAvailable( rbuf );
-    if( numBytes > available ) numBytes = available;
-    /* Check to see if read is not contiguous. */
-    index = rbuf->readIndex & rbuf->smallMask;
-    if( (index + numBytes) > rbuf->bufferSize )
-    {
-        /* Write data in two blocks that wrap the buffer. */
-        long firstHalf = rbuf->bufferSize - index;
-        *dataPtr1 = &rbuf->buffer[index];
-        *sizePtr1 = firstHalf;
-        *dataPtr2 = &rbuf->buffer[0];
-        *sizePtr2 = numBytes - firstHalf;
-    }
-    else
-    {
-        *dataPtr1 = &rbuf->buffer[index];
-        *sizePtr1 = numBytes;
-        *dataPtr2 = NULL;
-        *sizePtr2 = 0;
-    }
-    return numBytes;
-}
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, long numBytes )
-{
-    /* we need to ensure that previous writes are always seen before updating the index. */
-    PaUtil_WriteMemoryBarrier();
-    return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Return bytes written. */
-long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numBytes )
-{
-    long size1, size2, numWritten;
-    void *data1, *data2;
-    numWritten = PaUtil_GetRingBufferWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
-    if( size2 > 0 )
-    {
-
-        memcpy( data1, data, size1 );
-        data = ((char *)data) + size1;
-        memcpy( data2, data, size2 );
-    }
-    else
-    {
-        memcpy( data1, data, size1 );
-    }
-    PaUtil_AdvanceRingBufferWriteIndex( rbuf, numWritten );
-    return numWritten;
-}
-
-/***************************************************************************
-** Return bytes read. */
-long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes )
-{
-    long size1, size2, numRead;
-    void *data1, *data2;
-    numRead = PaUtil_GetRingBufferReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
-    if( size2 > 0 )
-    {
-        memcpy( data, data1, size1 );
-        data = ((char *)data) + size1;
-        memcpy( data, data2, size2 );
-    }
-    else
-    {
-        memcpy( data, data1, size1 );
-    }
-    PaUtil_AdvanceRingBufferReadIndex( rbuf, numRead );
-    return numRead;
-}
diff --git a/libs/portaudio/src/common/pa_ringbuffer.h b/libs/portaudio/src/common/pa_ringbuffer.h
deleted file mode 100644
index b380889815..0000000000
--- a/libs/portaudio/src/common/pa_ringbuffer.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef PA_RINGBUFFER_H
-#define PA_RINGBUFFER_H
-/*
- * $Id: pa_ringbuffer.h 1151 2006-11-29 02:11:16Z leland_lucius $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on OS X by Bjorn Roche.
- * also allowed for const where possible.
- * Note that this is safe only for a single-thread reader
- * and a single-thread writer.
- *
- * This program is distributed with the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-*/
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-typedef struct PaUtilRingBuffer
-{
-    long   bufferSize; /* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */
-    long   writeIndex; /* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */
-    long   readIndex;  /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */
-    long   bigMask;    /* Used for wrapping indices with extra bit to distinguish full/empty. */
-    long   smallMask;  /* Used for fitting indices to buffer. */
-    char  *buffer;
-}PaUtilRingBuffer;
-
-/** Initialize Ring Buffer.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes in the buffer and must be power of 2.
-
- @param dataPtr A pointer to a previously allocated area where the data
- will be maintained.  It must be numBytes long.
-
- @return -1 if numBytes is not a power of 2, otherwise 0.
-*/
-long PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, long numBytes, void *dataPtr );
-
-/** Clear buffer. Should only be called when buffer is NOT being read.
-
- @param rbuf The ring buffer.
-*/
-void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf );
-
-/** Retrieve the number of bytes available in the ring buffer for writing.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for writing.
-*/
-long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf );
-
-/** Retrieve the number of bytes available in the ring buffer for reading.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for reading.
-*/
-long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf );
-
-/** Write data to the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address of new data to write to the buffer.
-
- @param numBytes The number of bytes to be written.
-
- @return The number of bytes written.
-*/
-long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numBytes );
-
-/** Read data from the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address where the data should be stored.
-
- @param numBytes The number of bytes to be read.
-
- @return The number of bytes read.
-*/
-long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes );
-
-/** Get address of region(s) to which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes,
-                                       void **dataPtr1, long *sizePtr1,
-                                       void **dataPtr2, long *sizePtr2 );
-
-/** Advance the write index to the next location to be written.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes );
-
-/** Get address of region(s) from which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The number of bytes available for reading.
-*/
-long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes,
-                                      void **dataPtr1, long *sizePtr1,
-                                      void **dataPtr2, long *sizePtr2 );
-
-/** Advance the read index to the next location to be read.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-long PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, long numBytes );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_RINGBUFFER_H */
diff --git a/libs/portaudio/src/common/pa_skeleton.c b/libs/portaudio/src/common/pa_skeleton.c
deleted file mode 100644
index e229b07ba1..0000000000
--- a/libs/portaudio/src/common/pa_skeleton.c
+++ /dev/null
@@ -1,816 +0,0 @@
-/*
- * $Id: pa_skeleton.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library skeleton implementation
- * demonstrates how to use the common functions to implement support
- * for a host API
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Skeleton implementation of support for a host API.
-
- @note This file is provided as a starting point for implementing support for
- a new host API. IMPLEMENT ME comments are used to indicate functionality
- which much be customised for each implementation.
-*/
-
-
-#include <string.h> /* strlen() */
-
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-
-
-/* prototypes for functions declared in this file */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-
-/* IMPLEMENT ME: a macro like the following one should be used for reporting
- host errors */
-#define PA_SKELETON_SET_LAST_HOST_ERROR( errorCode, errorText ) \
-    PaUtil_SetLastHostErrorInfo( paInDevelopment, errorCode, errorText )
-
-/* PaSkeletonHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    /* implementation specific data goes here */
-}
-PaSkeletonHostApiRepresentation;  /* IMPLEMENT ME: rename this */
-
-
-PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i, deviceCount;
-    PaSkeletonHostApiRepresentation *skeletonHostApi;
-    PaDeviceInfo *deviceInfoArray;
-
-    skeletonHostApi = (PaSkeletonHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaSkeletonHostApiRepresentation) );
-    if( !skeletonHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    skeletonHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !skeletonHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    *hostApi = &skeletonHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paInDevelopment;            /* IMPLEMENT ME: change to correct type id */
-    (*hostApi)->info.name = "skeleton implementation";  /* IMPLEMENT ME: change to correct name */
-
-    (*hostApi)->info.defaultInputDevice = paNoDevice;  /* IMPLEMENT ME */
-    (*hostApi)->info.defaultOutputDevice = paNoDevice; /* IMPLEMENT ME */
-
-    (*hostApi)->info.deviceCount = 0;  
-
-    deviceCount = 0; /* IMPLEMENT ME */
-    
-    if( deviceCount > 0 )
-    {
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                skeletonHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount );
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaDeviceInfo*)PaUtil_GroupAllocateMemory(
-                skeletonHostApi->allocations, sizeof(PaDeviceInfo) * deviceCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( i=0; i < deviceCount; ++i )
-        {
-            PaDeviceInfo *deviceInfo = &deviceInfoArray[i];
-            deviceInfo->structVersion = 2;
-            deviceInfo->hostApi = hostApiIndex;
-            deviceInfo->name = 0; /* IMPLEMENT ME: allocate block and copy name eg:
-                deviceName = (char*)PaUtil_GroupAllocateMemory( skeletonHostApi->allocations, strlen(srcName) + 1 );
-                if( !deviceName )
-                {
-                    result = paInsufficientMemory;
-                    goto error;
-                }
-                strcpy( deviceName, srcName );
-                deviceInfo->name = deviceName;
-            */
-
-            deviceInfo->maxInputChannels = 0;  /* IMPLEMENT ME */
-            deviceInfo->maxOutputChannels = 0;  /* IMPLEMENT ME */
-            
-            deviceInfo->defaultLowInputLatency = 0.;  /* IMPLEMENT ME */
-            deviceInfo->defaultLowOutputLatency = 0.;  /* IMPLEMENT ME */
-            deviceInfo->defaultHighInputLatency = 0.;  /* IMPLEMENT ME */
-            deviceInfo->defaultHighOutputLatency = 0.;  /* IMPLEMENT ME */  
-
-            deviceInfo->defaultSampleRate = 0.; /* IMPLEMENT ME */
-            
-            (*hostApi)->deviceInfos[i] = deviceInfo;
-            ++(*hostApi)->info.deviceCount;
-        }
-    }
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &skeletonHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &skeletonHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    return result;
-
-error:
-    if( skeletonHostApi )
-    {
-        if( skeletonHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( skeletonHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( skeletonHostApi->allocations );
-        }
-                
-        PaUtil_FreeMemory( skeletonHostApi );
-    }
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaSkeletonHostApiRepresentation *skeletonHostApi = (PaSkeletonHostApiRepresentation*)hostApi;
-
-    /*
-        IMPLEMENT ME:
-            - clean up any resources not handled by the allocation group
-    */
-
-    if( skeletonHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( skeletonHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( skeletonHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( skeletonHostApi );
-}
-
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support outputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-    
-    /*
-        IMPLEMENT ME:
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported if necessary
-
-            - check that the device supports sampleRate
-
-        Because the buffer adapter handles conversion between all standard
-        sample formats, the following checks are only required if paCustomFormat
-        is implemented, or under some other unusual conditions.
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from inputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-    */
-
-
-    /* suppress unused variable warnings */
-    (void) sampleRate;
-
-    return paFormatIsSupported;
-}
-
-/* PaSkeletonStream - a stream data structure specifically for this implementation */
-
-typedef struct PaSkeletonStream
-{ /* IMPLEMENT ME: rename this */
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    /* IMPLEMENT ME:
-            - implementation specific data goes here
-    */
-    unsigned long framesPerHostCallback; /* just an example */
-}
-PaSkeletonStream;
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaSkeletonHostApiRepresentation *skeletonHostApi = (PaSkeletonHostApiRepresentation*)hostApi;
-    PaSkeletonStream *stream = 0;
-    unsigned long framesPerHostBuffer = framesPerBuffer; /* these may not be equivalent for all implementations */
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-        /* IMPLEMENT ME - establish which  host formats are available */
-        hostInputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, inputSampleFormat );
-    }
-    else
-    {
-        inputChannelCount = 0;
-        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-        /* IMPLEMENT ME - establish which  host formats are available */
-        hostOutputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, outputSampleFormat );
-    }
-    else
-    {
-        outputChannelCount = 0;
-        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
-    }
-
-    /*
-        IMPLEMENT ME:
-
-        ( the following two checks are taken care of by PaUtil_InitializeBufferProcessor() FIXME - checks needed? )
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-            - check that the device supports sampleRate
-
-            - alter sampleRate to a close allowable rate if possible / necessary
-
-            - validate suggestedInputLatency and suggestedOutputLatency parameters,
-                use default values where necessary
-    */
-
-
-
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-
-    stream = (PaSkeletonStream*)PaUtil_AllocateMemory( sizeof(PaSkeletonStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &skeletonHostApi->callbackStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &skeletonHostApi->blockingStreamInterface, streamCallback, userData );
-    }
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-
-    /* we assume a fixed host buffer size in this example, but the buffer processor
-        can also support bounded and unknown host buffer sizes by passing 
-        paUtilBoundedHostBufferSize or paUtilUnknownHostBufferSize instead of
-        paUtilFixedHostBufferSize below. */
-        
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-              inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-              outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-              sampleRate, streamFlags, framesPerBuffer,
-              framesPerHostBuffer, paUtilFixedHostBufferSize,
-              streamCallback, userData );
-    if( result != paNoError )
-        goto error;
-
-
-    /*
-        IMPLEMENT ME: initialise the following fields with estimated or actual
-        values.
-    */
-    stream->streamRepresentation.streamInfo.inputLatency =
-            PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor);
-    stream->streamRepresentation.streamInfo.outputLatency =
-            PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor);
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-    
-    /*
-        IMPLEMENT ME:
-            - additional stream setup + opening
-    */
-
-    stream->framesPerHostCallback = framesPerHostBuffer;
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    if( stream )
-        PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-/*
-    ExampleHostProcessingLoop() illustrates the kind of processing which may
-    occur in a host implementation.
- 
-*/
-static void ExampleHostProcessingLoop( void *inputBuffer, void *outputBuffer, void *userData )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)userData;
-    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /* IMPLEMENT ME */
-    int callbackResult;
-    unsigned long framesProcessed;
-    
-    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-    
-    /*
-        IMPLEMENT ME:
-            - generate timing information
-            - handle buffer slips
-    */
-
-    /*
-        If you need to byte swap or shift inputBuffer to convert it into a
-        portaudio format, do it here.
-    */
-
-
-
-    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, 0 /* IMPLEMENT ME: pass underflow/overflow flags when necessary */ );
-
-    /*
-        depending on whether the host buffers are interleaved, non-interleaved
-        or a mixture, you will want to call PaUtil_SetInterleaved*Channels(),
-        PaUtil_SetNonInterleaved*Channel() or PaUtil_Set*Channel() here.
-    */
-    
-    PaUtil_SetInputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
-    PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
-            0, /* first channel of inputBuffer is channel 0 */
-            inputBuffer,
-            0 ); /* 0 - use inputChannelCount passed to init buffer processor */
-
-    PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
-    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
-            0, /* first channel of outputBuffer is channel 0 */
-            outputBuffer,
-            0 ); /* 0 - use outputChannelCount passed to init buffer processor */
-
-    /* you must pass a valid value of callback result to PaUtil_EndBufferProcessing()
-        in general you would pass paContinue for normal operation, and
-        paComplete to drain the buffer processor's internal output buffer.
-        You can check whether the buffer processor's output buffer is empty
-        using PaUtil_IsBufferProcessorOuputEmpty( bufferProcessor )
-    */
-    callbackResult = paContinue;
-    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-
-    
-    /*
-        If you need to byte swap or shift outputBuffer to convert it to
-        host format, do it here.
-    */
-
-    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-
-
-    if( callbackResult == paContinue )
-    {
-        /* nothing special to do */
-    }
-    else if( callbackResult == paAbort )
-    {
-        /* IMPLEMENT ME - finish playback immediately  */
-
-        /* once finished, call the finished callback */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-    else
-    {
-        /* User callback has asked us to stop with paComplete or other non-zero value */
-
-        /* IMPLEMENT ME - finish playback once currently queued audio has completed  */
-
-        /* once finished, call the finished callback */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-}
-
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /*
-        IMPLEMENT ME:
-            - additional stream closing + cleanup
-    */
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    /* suppress unused function warning. the code in ExampleHostProcessingLoop or
-       something similar should be implemented to feed samples to and from the
-       host after StartStream() is called.
-    */
-    (void) ExampleHostProcessingLoop;
-
-    return result;
-}
-
-
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    return result;
-}
-
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    return result;
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    return 0;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    return 0;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaSkeletonStream *stream = (PaSkeletonStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-
-
diff --git a/libs/portaudio/src/common/pa_stream.c b/libs/portaudio/src/common/pa_stream.c
deleted file mode 100644
index 172e7d26bc..0000000000
--- a/libs/portaudio/src/common/pa_stream.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * $Id: pa_stream.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 2002 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Interface used by pa_front to virtualize functions which operate on
- streams.
-*/
-
-
-#include "pa_stream.h"
-
-
-void PaUtil_InitializeStreamInterface( PaUtilStreamInterface *streamInterface,
-                                       PaError (*Close)( PaStream* ),
-                                       PaError (*Start)( PaStream* ),
-                                       PaError (*Stop)( PaStream* ),
-                                       PaError (*Abort)( PaStream* ),
-                                       PaError (*IsStopped)( PaStream* ),
-                                       PaError (*IsActive)( PaStream* ),
-                                       PaTime (*GetTime)( PaStream* ),
-                                       double (*GetCpuLoad)( PaStream* ),
-                                       PaError (*Read)( PaStream*, void *, unsigned long ),
-                                       PaError (*Write)( PaStream*, const void *, unsigned long ),
-                                       signed long (*GetReadAvailable)( PaStream* ),
-                                       signed long (*GetWriteAvailable)( PaStream* )  )
-{
-    streamInterface->Close = Close;
-    streamInterface->Start = Start;
-    streamInterface->Stop = Stop;
-    streamInterface->Abort = Abort;
-    streamInterface->IsStopped = IsStopped;
-    streamInterface->IsActive = IsActive;
-    streamInterface->GetTime = GetTime;
-    streamInterface->GetCpuLoad = GetCpuLoad;
-    streamInterface->Read = Read;
-    streamInterface->Write = Write;
-    streamInterface->GetReadAvailable = GetReadAvailable;
-    streamInterface->GetWriteAvailable = GetWriteAvailable;
-}
-
-
-void PaUtil_InitializeStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation,
-        PaUtilStreamInterface *streamInterface,
-        PaStreamCallback *streamCallback,
-        void *userData )
-{
-    streamRepresentation->magic = PA_STREAM_MAGIC;
-    streamRepresentation->nextOpenStream = 0;
-    streamRepresentation->streamInterface = streamInterface;
-    streamRepresentation->streamCallback = streamCallback;
-    streamRepresentation->streamFinishedCallback = 0;
-
-    streamRepresentation->userData = userData;
-
-    streamRepresentation->streamInfo.inputLatency = 0.;
-    streamRepresentation->streamInfo.outputLatency = 0.;
-    streamRepresentation->streamInfo.sampleRate = 0.;
-}
-
-
-void PaUtil_TerminateStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation )
-{
-    streamRepresentation->magic = 0;
-}
-
-
-PaError PaUtil_DummyRead( PaStream* stream,
-                               void *buffer,
-                               unsigned long frames )
-{
-    (void)stream; /* unused parameter */
-    (void)buffer; /* unused parameter */
-    (void)frames; /* unused parameter */
-
-    return paCanNotReadFromACallbackStream;
-}
-
-
-PaError PaUtil_DummyWrite( PaStream* stream,
-                               const void *buffer,
-                               unsigned long frames )
-{
-    (void)stream; /* unused parameter */
-    (void)buffer; /* unused parameter */
-    (void)frames; /* unused parameter */
-
-    return paCanNotWriteToACallbackStream;
-}
-
-
-signed long PaUtil_DummyGetReadAvailable( PaStream* stream )
-{
-    (void)stream; /* unused parameter */
-
-    return paCanNotReadFromACallbackStream;
-}
-
-
-signed long PaUtil_DummyGetWriteAvailable( PaStream* stream )
-{
-    (void)stream; /* unused parameter */
-
-    return paCanNotWriteToACallbackStream;
-}
-
-
-double PaUtil_DummyGetCpuLoad( PaStream* stream )
-{
-    (void)stream; /* unused parameter */
-
-    return 0.0;
-}
diff --git a/libs/portaudio/src/common/pa_stream.h b/libs/portaudio/src/common/pa_stream.h
deleted file mode 100644
index f5363b3e1b..0000000000
--- a/libs/portaudio/src/common/pa_stream.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#ifndef PA_STREAM_H
-#define PA_STREAM_H
-/*
- * $Id: pa_stream.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library
- * stream interface
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Interface used by pa_front to virtualize functions which operate on
- streams.
-*/
-
-
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#define PA_STREAM_MAGIC (0x18273645)
-
-
-/** A structure representing an (abstract) interface to a host API. Contains
- pointers to functions which implement the interface.
-
- All PaStreamInterface functions are guaranteed to be called with a non-null,
- valid stream parameter.
-*/
-typedef struct {
-    PaError (*Close)( PaStream* stream );
-    PaError (*Start)( PaStream *stream );
-    PaError (*Stop)( PaStream *stream );
-    PaError (*Abort)( PaStream *stream );
-    PaError (*IsStopped)( PaStream *stream );
-    PaError (*IsActive)( PaStream *stream );
-    PaTime (*GetTime)( PaStream *stream );
-    double (*GetCpuLoad)( PaStream* stream );
-    PaError (*Read)( PaStream* stream, void *buffer, unsigned long frames );
-    PaError (*Write)( PaStream* stream, const void *buffer, unsigned long frames );
-    signed long (*GetReadAvailable)( PaStream* stream );
-    signed long (*GetWriteAvailable)( PaStream* stream );
-} PaUtilStreamInterface;
-
-
-/** Initialize the fields of a PaUtilStreamInterface structure.
-*/
-void PaUtil_InitializeStreamInterface( PaUtilStreamInterface *streamInterface,
-    PaError (*Close)( PaStream* ),
-    PaError (*Start)( PaStream* ),
-    PaError (*Stop)( PaStream* ),
-    PaError (*Abort)( PaStream* ),
-    PaError (*IsStopped)( PaStream* ),
-    PaError (*IsActive)( PaStream* ),
-    PaTime (*GetTime)( PaStream* ),
-    double (*GetCpuLoad)( PaStream* ),
-    PaError (*Read)( PaStream* stream, void *buffer, unsigned long frames ),
-    PaError (*Write)( PaStream* stream, const void *buffer, unsigned long frames ),
-    signed long (*GetReadAvailable)( PaStream* stream ),
-    signed long (*GetWriteAvailable)( PaStream* stream ) );
-
-
-/** Dummy Read function for use in interfaces to a callback based streams.
- Pass to the Read parameter of PaUtil_InitializeStreamInterface.
- @return An error code indicating that the function has no effect
- because the stream is a callback stream.
-*/
-PaError PaUtil_DummyRead( PaStream* stream,
-                       void *buffer,
-                       unsigned long frames );
-
-
-/** Dummy Write function for use in an interfaces to callback based streams.
- Pass to the Write parameter of PaUtil_InitializeStreamInterface.
- @return An error code indicating that the function has no effect
- because the stream is a callback stream.
-*/
-PaError PaUtil_DummyWrite( PaStream* stream,
-                       const void *buffer,
-                       unsigned long frames );
-
-
-/** Dummy GetReadAvailable function for use in interfaces to callback based
- streams. Pass to the GetReadAvailable parameter of PaUtil_InitializeStreamInterface.
- @return An error code indicating that the function has no effect
- because the stream is a callback stream.
-*/
-signed long PaUtil_DummyGetReadAvailable( PaStream* stream );
-
-
-/** Dummy GetWriteAvailable function for use in interfaces to callback based
- streams. Pass to the GetWriteAvailable parameter of PaUtil_InitializeStreamInterface.
- @return An error code indicating that the function has no effect
- because the stream is a callback stream.
-*/
-signed long PaUtil_DummyGetWriteAvailable( PaStream* stream );
-
-
-
-/** Dummy GetCpuLoad function for use in an interface to a read/write stream.
- Pass to the GetCpuLoad parameter of PaUtil_InitializeStreamInterface.
- @return Returns 0.
-*/
-double PaUtil_DummyGetCpuLoad( PaStream* stream );
-
-
-/** Non host specific data for a stream. This data is used by pa_front to
- forward to the appropriate functions in the streamInterface structure.
-*/
-typedef struct PaUtilStreamRepresentation {
-    unsigned long magic;    /**< set to PA_STREAM_MAGIC */
-    struct PaUtilStreamRepresentation *nextOpenStream; /**< field used by multi-api code */
-    PaUtilStreamInterface *streamInterface;
-    PaStreamCallback *streamCallback;
-    PaStreamFinishedCallback *streamFinishedCallback;
-    void *userData;
-    PaStreamInfo streamInfo;
-} PaUtilStreamRepresentation;
-
-
-/** Initialize a PaUtilStreamRepresentation structure.
-
- @see PaUtil_InitializeStreamRepresentation
-*/
-void PaUtil_InitializeStreamRepresentation(
-        PaUtilStreamRepresentation *streamRepresentation,
-        PaUtilStreamInterface *streamInterface,
-        PaStreamCallback *streamCallback,
-        void *userData );
-        
-
-/** Clean up a PaUtilStreamRepresentation structure previously initialized
- by a call to PaUtil_InitializeStreamRepresentation.
-
- @see PaUtil_InitializeStreamRepresentation
-*/
-void PaUtil_TerminateStreamRepresentation( PaUtilStreamRepresentation *streamRepresentation );
-
-
-/** Check that the stream pointer is valid.
-
- @return Returns paNoError if the stream pointer appears to be OK, otherwise
- returns an error indicating the cause of failure.
-*/
-PaError PaUtil_ValidateStreamPointer( PaStream *stream );
-
-
-/** Cast an opaque stream pointer into a pointer to a PaUtilStreamRepresentation.
-
- @see PaUtilStreamRepresentation
-*/
-#define PA_STREAM_REP( stream )\
-    ((PaUtilStreamRepresentation*) (stream) )
-
-
-/** Cast an opaque stream pointer into a pointer to a PaUtilStreamInterface.
-
- @see PaUtilStreamRepresentation, PaUtilStreamInterface
-*/
-#define PA_STREAM_INTERFACE( stream )\
-    PA_STREAM_REP( (stream) )->streamInterface
-
-
-    
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_STREAM_H */
diff --git a/libs/portaudio/src/common/pa_trace.c b/libs/portaudio/src/common/pa_trace.c
deleted file mode 100644
index 583d3ae9f1..0000000000
--- a/libs/portaudio/src/common/pa_trace.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * $Id: pa_trace.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library Trace Facility
- * Store trace information in real-time for later printing.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2000 Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Event trace mechanism for debugging.
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "pa_trace.h"
-
-#if PA_TRACE_REALTIME_EVENTS
-
-static char *traceTextArray[PA_MAX_TRACE_RECORDS];
-static int traceIntArray[PA_MAX_TRACE_RECORDS];
-static int traceIndex = 0;
-static int traceBlock = 0;
-
-/*********************************************************************/
-void PaUtil_ResetTraceMessages()
-{
-    traceIndex = 0;
-}
-
-/*********************************************************************/
-void PaUtil_DumpTraceMessages()
-{
-    int i;
-    int messageCount = (traceIndex < PA_MAX_TRACE_RECORDS) ? traceIndex : PA_MAX_TRACE_RECORDS;
-
-    printf("DumpTraceMessages: traceIndex = %d\n", traceIndex );
-    for( i=0; i<messageCount; i++ )
-    {
-        printf("%3d: %s = 0x%08X\n",
-               i, traceTextArray[i], traceIntArray[i] );
-    }
-    PaUtil_ResetTraceMessages();
-    fflush(stdout);
-}
-
-/*********************************************************************/
-void PaUtil_AddTraceMessage( const char *msg, int data )
-{
-    if( (traceIndex == PA_MAX_TRACE_RECORDS) && (traceBlock == 0) )
-    {
-        traceBlock = 1;
-        /*  PaUtil_DumpTraceMessages(); */
-    }
-    else if( traceIndex < PA_MAX_TRACE_RECORDS )
-    {
-        traceTextArray[traceIndex] = msg;
-        traceIntArray[traceIndex] = data;
-        traceIndex++;
-    }
-}
-
-#endif /* TRACE_REALTIME_EVENTS */
diff --git a/libs/portaudio/src/common/pa_trace.h b/libs/portaudio/src/common/pa_trace.h
deleted file mode 100644
index a4d2a3314a..0000000000
--- a/libs/portaudio/src/common/pa_trace.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef PA_TRACE_H
-#define PA_TRACE_H
-/*
- * $Id: pa_trace.h 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library Trace Facility
- * Store trace information in real-time for later printing.
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2000 Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Event trace mechanism for debugging.
-
- Allows data to be written to the buffer at interrupt time and dumped later.
-*/
-
-
-#define PA_TRACE_REALTIME_EVENTS     (0)   /* Keep log of various real-time events. */
-#define PA_MAX_TRACE_RECORDS      (2048)
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#if PA_TRACE_REALTIME_EVENTS
-
-void PaUtil_ResetTraceMessages();
-void PaUtil_AddTraceMessage( const char *msg, int data );
-void PaUtil_DumpTraceMessages();
-    
-#else
-
-#define PaUtil_ResetTraceMessages() /* noop */
-#define PaUtil_AddTraceMessage(msg,data) /* noop */
-#define PaUtil_DumpTraceMessages() /* noop */
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_TRACE_H */
diff --git a/libs/portaudio/src/common/pa_types.h b/libs/portaudio/src/common/pa_types.h
deleted file mode 100644
index 5b647d641e..0000000000
--- a/libs/portaudio/src/common/pa_types.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef PA_TYPES_H
-#define PA_TYPES_H
-
-/* 
- * Portable Audio I/O Library
- * integer type definitions
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2006 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
- @brief Definition of 16 and 32 bit integer types (PaInt16, PaInt32 etc)
-
- SIZEOF_SHORT, SIZEOF_INT and SIZEOF_LONG are set by the configure script
- when it is used. Otherwise we default to the common 32 bit values, if your
- platform doesn't use configure, and doesn't use the default values below
- you will need to explicitly define these symbols in your make file.
-
- A PA_VALIDATE_SIZES macro is provided to assert that the values set in this
- file are correct.
-*/
-
-#ifndef SIZEOF_SHORT
-#define SIZEOF_SHORT 2
-#endif
-
-#ifndef SIZEOF_INT
-#define SIZEOF_INT 4
-#endif
-
-#ifndef SIZEOF_LONG
-#define SIZEOF_LONG 4
-#endif
-
-
-#if SIZEOF_SHORT == 2
-typedef signed short PaInt16;
-typedef unsigned short PaUint16;
-#elif SIZEOF_INT == 2
-typedef signed int PaInt16;
-typedef unsigned int PaUint16;
-#else
-#error pa_types.h was unable to determine which type to use for 16bit integers on the target platform
-#endif
-
-#if SIZEOF_SHORT == 4
-typedef signed short PaInt32;
-typedef unsigned short PaUint32;
-#elif SIZEOF_INT == 4
-typedef signed int PaInt32;
-typedef unsigned int PaUint32;
-#elif SIZEOF_LONG == 4
-typedef signed long PaInt32;
-typedef unsigned long PaUint32;
-#else
-#error pa_types.h was unable to determine which type to use for 32bit integers on the target platform
-#endif
-
-
-/* PA_VALIDATE_TYPE_SIZES compares the size of the integer types at runtime to
- ensure that PortAudio was configured correctly, and raises an assertion if
- they don't match the expected values. <assert.h> must be included in the
- context in which this macro is used.
-*/
-#define PA_VALIDATE_TYPE_SIZES \
-    { \
-        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaUint16 ) == 2 ); \
-        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaInt16 ) == 2 ); \
-        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaUint32 ) == 4 ); \
-        assert( "PortAudio: type sizes are not correct in pa_types.h" && sizeof( PaInt32 ) == 4 ); \
-    }
-
-
-#endif /* PA_TYPES_H */
diff --git a/libs/portaudio/src/common/pa_util.h b/libs/portaudio/src/common/pa_util.h
deleted file mode 100644
index 55eaa13882..0000000000
--- a/libs/portaudio/src/common/pa_util.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifndef PA_UTIL_H
-#define PA_UTIL_H
-/*
- * $Id: pa_util.h 1229 2007-06-15 16:11:11Z rossb $
- * Portable Audio I/O Library implementation utilities header
- * common implementation utilities and interfaces
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup common_src
-
-    @brief Prototypes for utility functions used by PortAudio implementations.
-
-    @todo Document and adhere to the alignment guarantees provided by
-    PaUtil_AllocateMemory().
-*/
-
-
-#include "portaudio.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-struct PaUtilHostApiRepresentation;
-
-
-/** Retrieve a specific host API representation. This function can be used
- by implementations to retrieve a pointer to their representation in
- host api specific extension functions which aren't passed a rep pointer
- by pa_front.c.
-
- @param hostApi A pointer to a host API represenation pointer. Apon success
- this will receive the requested representation pointer.
-
- @param type A valid host API type identifier.
-
- @returns An error code. If the result is PaNoError then a pointer to the
- requested host API representation will be stored in *hostApi. If the host API
- specified by type is not found, this function returns paHostApiNotFound.
-*/
-PaError PaUtil_GetHostApiRepresentation( struct PaUtilHostApiRepresentation **hostApi,
-        PaHostApiTypeId type );
-
-
-/** Convert a PortAudio device index into a host API specific device index.
- @param hostApiDevice Pointer to a device index, on success this will recieve the
- converted device index value.
- @param device The PortAudio device index to convert.
- @param hostApi The host api which the index should be converted for.
-
- @returns On success returns PaNoError and places the converted index in the
- hostApiDevice parameter.
-*/
-PaError PaUtil_DeviceIndexToHostApiDeviceIndex(
-        PaDeviceIndex *hostApiDevice, PaDeviceIndex device,
-        struct PaUtilHostApiRepresentation *hostApi );
-
-
-/** Set the host error information returned by Pa_GetLastHostErrorInfo. This
- function and the paUnanticipatedHostError error code should be used as a
- last resort.  Implementors should use existing PA error codes where possible,
- or nominate new ones. Note that at it is always better to use
- PaUtil_SetLastHostErrorInfo() and paUnanticipatedHostError than to return an
- ambiguous or inaccurate PaError code.
-
- @param hostApiType  The host API which encountered the error (ie of the caller)
-
- @param errorCode The error code returned by the native API function.
-
- @param errorText A string describing the error. PaUtil_SetLastHostErrorInfo
- makes a copy of the string, so it is not necessary for the pointer to remain
- valid after the call to PaUtil_SetLastHostErrorInfo() returns.
-
-*/
-void PaUtil_SetLastHostErrorInfo( PaHostApiTypeId hostApiType, long errorCode,
-        const char *errorText );
-
-
-        
-/* the following functions are implemented in a platform platform specific
- .c file
-*/
-
-/** Allocate size bytes, guaranteed to be aligned to a FIXME byte boundary */
-void *PaUtil_AllocateMemory( long size );
-
-
-/** Realease block if non-NULL. block may be NULL */
-void PaUtil_FreeMemory( void *block );
-
-
-/** Return the number of currently allocated blocks. This function can be
- used for detecting memory leaks.
-
- @note Allocations will only be tracked if PA_TRACK_MEMORY is #defined. If
- it isn't, this function will always return 0.
-*/
-int PaUtil_CountCurrentlyAllocatedBlocks( void );
-
-
-/** Initialize the clock used by PaUtil_GetTime(). Call this before calling
- PaUtil_GetTime.
-
- @see PaUtil_GetTime
-*/
-void PaUtil_InitializeClock( void );
-
-
-/** Return the system time in seconds. Used to implement CPU load functions
-
- @see PaUtil_InitializeClock
-*/
-double PaUtil_GetTime( void );
-
-
-/* void Pa_Sleep( long msec );  must also be implemented in per-platform .c file */
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_UTIL_H */
diff --git a/libs/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/libs/portaudio/src/hostapi/alsa/pa_linux_alsa.c
deleted file mode 100644
index 0842bb4b96..0000000000
--- a/libs/portaudio/src/hostapi/alsa/pa_linux_alsa.c
+++ /dev/null
@@ -1,3563 +0,0 @@
-/*
- * $Id: pa_linux_alsa.c 1278 2007-09-12 17:39:48Z aknudsen $
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- * ALSA implementation by Joshua Haberman and Arve Knudsen
- *
- * Copyright (c) 2002 Joshua Haberman <joshua@haberman.com>
- * Copyright (c) 2005-2007 Arve Knudsen <aknuds-1@broadpark.no>
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostapi_src
-*/
-
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
-#include <alsa/asoundlib.h>
-#undef ALSA_PCM_NEW_HW_PARAMS_API
-#undef ALSA_PCM_NEW_SW_PARAMS_API
-
-#include <sys/poll.h>
-#include <string.h> /* strlen() */
-#include <limits.h>
-#include <math.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/mman.h>
-#include <signal.h> /* For sig_atomic_t */
-
-#include "portaudio.h"
-#include "pa_util.h"
-#include "pa_unix_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_endianness.h"
-#include "pa_debugprint.h"
-
-#include "pa_linux_alsa.h"
-
-/* Check return value of ALSA function, and map it to PaError */
-#define ENSURE_(expr, code) \
-    do { \
-        if( UNLIKELY( (aErr_ = (expr)) < 0 ) ) \
-        { \
-            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
-            if( (code) == paUnanticipatedHostError && pthread_equal( pthread_self(), paUnixMainThread) ) \
-            { \
-                PaUtil_SetLastHostErrorInfo( paALSA, aErr_, snd_strerror( aErr_ ) ); \
-            } \
-            PaUtil_DebugPrint( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" ); \
-            if( (code) == paUnanticipatedHostError ) \
-                PA_DEBUG(( "Host error description: %s\n", snd_strerror( aErr_ ) )); \
-            result = (code); \
-            goto error; \
-        } \
-    } while( 0 );
-
-#define ASSERT_CALL_(expr, success) \
-    aErr_ = (expr); \
-    assert( success == aErr_ );
-
-static int aErr_;               /* Used with ENSURE_ */
-static int numPeriods_ = 4;
-
-int PaAlsa_SetNumPeriods( int numPeriods )
-{
-    numPeriods_ = numPeriods;
-    return paNoError;
-}
-
-typedef enum
-{
-    StreamDirection_In,
-    StreamDirection_Out
-} StreamDirection;
-
-typedef struct
-{
-    PaSampleFormat hostSampleFormat;
-    unsigned long framesPerBuffer;
-    int numUserChannels, numHostChannels;
-    int userInterleaved, hostInterleaved;
-    PaDeviceIndex device;     /* Keep the device index */
-
-    snd_pcm_t *pcm;
-    snd_pcm_uframes_t bufferSize;
-    snd_pcm_format_t nativeFormat;
-    unsigned int nfds;
-    int ready;  /* Marked ready from poll */
-    void **userBuffers;
-    snd_pcm_uframes_t offset;
-    StreamDirection streamDir;
-
-    snd_pcm_channel_area_t *channelAreas;  /* Needed for channel adaption */
-} PaAlsaStreamComponent;
-
-/* Implementation specific stream structure */
-typedef struct PaAlsaStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-    PaUnixThread thread;
-
-    unsigned long framesPerUserBuffer, maxFramesPerHostBuffer;
-
-    int primeBuffers;
-    int callbackMode;              /* bool: are we running in callback mode? */
-    int pcmsSynced;	            /* Have we successfully synced pcms */
-    int rtSched;
-
-    /* the callback thread uses these to poll the sound device(s), waiting
-     * for data to be ready/available */
-    struct pollfd* pfds;
-    int pollTimeout;
-
-    /* Used in communication between threads */
-    volatile sig_atomic_t callback_finished; /* bool: are we in the "callback finished" state? */
-    volatile sig_atomic_t callbackAbort;    /* Drop frames? */
-    volatile sig_atomic_t isActive;         /* Is stream in active state? (Between StartStream and StopStream || !paContinue) */
-    PaUnixMutex stateMtx;                   /* Used to synchronize access to stream state */
-
-    int neverDropInput;
-
-    PaTime underrun;
-    PaTime overrun;
-
-    PaAlsaStreamComponent capture, playback;
-}
-PaAlsaStream;
-
-/* PaAlsaHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct PaAlsaHostApiRepresentation
-{
-    PaUtilHostApiRepresentation baseHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    PaHostApiIndex hostApiIndex;
-}
-PaAlsaHostApiRepresentation;
-
-typedef struct PaAlsaDeviceInfo
-{
-    PaDeviceInfo baseDeviceInfo;
-    char *alsaName;
-    int isPlug;
-    int minInputChannels;
-    int minOutputChannels;
-}
-PaAlsaDeviceInfo;
-
-/* prototypes for functions declared in this file */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *callback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError BuildDeviceList( PaAlsaHostApiRepresentation *hostApi );
-static int SetApproximateSampleRate( snd_pcm_t *pcm, snd_pcm_hw_params_t *hwParams, double sampleRate );
-static int GetExactSampleRate( snd_pcm_hw_params_t *hwParams, double *sampleRate );
-
-/* Callback prototypes */
-static void *CallbackThreadFunc( void *userData );
-
-/* Blocking prototypes */
-static signed long GetStreamReadAvailable( PaStream* s );
-static signed long GetStreamWriteAvailable( PaStream* s );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-
-
-static const PaAlsaDeviceInfo *GetDeviceInfo( const PaUtilHostApiRepresentation *hostApi, int device )
-{
-    return (const PaAlsaDeviceInfo *)hostApi->deviceInfos[device];
-}
-
-static void AlsaErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...)
-{
-}
-
-PaError PaAlsa_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaAlsaHostApiRepresentation *alsaHostApi = NULL;
-
-    PA_UNLESS( alsaHostApi = (PaAlsaHostApiRepresentation*) PaUtil_AllocateMemory(
-                sizeof(PaAlsaHostApiRepresentation) ), paInsufficientMemory );
-    PA_UNLESS( alsaHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
-    alsaHostApi->hostApiIndex = hostApiIndex;
-
-    *hostApi = (PaUtilHostApiRepresentation*)alsaHostApi;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paALSA;
-    (*hostApi)->info.name = "ALSA";
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    ENSURE_( snd_lib_error_set_handler(AlsaErrorHandler), paUnanticipatedHostError );
-
-    PA_ENSURE( BuildDeviceList( alsaHostApi ) );
-
-    PaUtil_InitializeStreamInterface( &alsaHostApi->callbackStreamInterface,
-                                      CloseStream, StartStream,
-                                      StopStream, AbortStream,
-                                      IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable,
-                                      PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &alsaHostApi->blockingStreamInterface,
-                                      CloseStream, StartStream,
-                                      StopStream, AbortStream,
-                                      IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream,
-                                      GetStreamReadAvailable,
-                                      GetStreamWriteAvailable );
-
-    PA_ENSURE( PaUnixThreading_Initialize() );
-
-    return result;
-
-error:
-    if( alsaHostApi )
-    {
-        if( alsaHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( alsaHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( alsaHostApi->allocations );
-        }
-
-        PaUtil_FreeMemory( alsaHostApi );
-    }
-
-    return result;
-}
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaAlsaHostApiRepresentation *alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
-
-    assert( hostApi );
-
-    if( alsaHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( alsaHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( alsaHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( alsaHostApi );
-    snd_config_update_free_global();
-}
-
-/** Determine max channels and default latencies.
- *
- * This function provides functionality to grope an opened (might be opened for capture or playback) pcm device for 
- * traits like max channels, suitable default latencies and default sample rate. Upon error, max channels is set to zero,
- * and a suitable result returned. The device is closed before returning.
- */
-static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
-        PaAlsaDeviceInfo* devInfo, int* canMmap )
-{
-    PaError result = paNoError;
-    snd_pcm_hw_params_t *hwParams;
-    snd_pcm_uframes_t lowLatency = 512, highLatency = 2048;
-    unsigned int minChans, maxChans;
-    int* minChannels, * maxChannels;
-    double * defaultLowLatency, * defaultHighLatency, * defaultSampleRate =
-        &devInfo->baseDeviceInfo.defaultSampleRate;
-    double defaultSr = *defaultSampleRate;
-
-    assert( pcm );
-
-    if( StreamDirection_In == mode )
-    {
-        minChannels = &devInfo->minInputChannels;
-        maxChannels = &devInfo->baseDeviceInfo.maxInputChannels;
-        defaultLowLatency = &devInfo->baseDeviceInfo.defaultLowInputLatency;
-        defaultHighLatency = &devInfo->baseDeviceInfo.defaultHighInputLatency;
-    }
-    else
-    {
-        minChannels = &devInfo->minOutputChannels;
-        maxChannels = &devInfo->baseDeviceInfo.maxOutputChannels;
-        defaultLowLatency = &devInfo->baseDeviceInfo.defaultLowOutputLatency;
-        defaultHighLatency = &devInfo->baseDeviceInfo.defaultHighOutputLatency;
-    }
-
-    ENSURE_( snd_pcm_nonblock( pcm, 0 ), paUnanticipatedHostError );
-
-    snd_pcm_hw_params_alloca( &hwParams );
-    snd_pcm_hw_params_any( pcm, hwParams );
-
-    *canMmap = snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_INTERLEAVED ) >= 0 ||
-            snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED ) >= 0;
-
-    if( defaultSr >= 0 )
-    {
-        /* Could be that the device opened in one mode supports samplerates that the other mode wont have,
-         * so try again .. */
-        if( SetApproximateSampleRate( pcm, hwParams, defaultSr ) < 0 )
-        {
-            defaultSr = -1.;
-            PA_DEBUG(( "%s: Original default samplerate failed, trying again ..\n", __FUNCTION__ ));
-        }
-    }
-
-    if( defaultSr < 0. )           /* Default sample rate not set */
-    {
-        unsigned int sampleRate = 44100;        /* Will contain approximate rate returned by alsa-lib */
-        if( snd_pcm_hw_params_set_rate_near( pcm, hwParams, &sampleRate, NULL ) < 0)
-        {
-            result = paUnanticipatedHostError;
-            goto error;
-        }
-        ENSURE_( GetExactSampleRate( hwParams, &defaultSr ), paUnanticipatedHostError );
-    }
-    
-    ENSURE_( snd_pcm_hw_params_get_channels_min( hwParams, &minChans ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_hw_params_get_channels_max( hwParams, &maxChans ), paUnanticipatedHostError );
-    assert( maxChans <= INT_MAX );
-    assert( maxChans > 0 );    /* Weird linking issue could cause wrong version of ALSA symbols to be called,
-                                   resulting in zeroed values */
-
-    /* XXX: Limit to sensible number (ALSA plugins accept a crazy amount of channels)? */
-    if( isPlug && maxChans > 128 )
-    {
-        maxChans = 128;
-        PA_DEBUG(( "%s: Limiting number of plugin channels to %u\n", __FUNCTION__, maxChans ));
-    }
-
-    /* TWEAKME:
-     *
-     * Giving values for default min and max latency is not
-     * straightforward.  Here are our objectives:
-     *
-     *         * for low latency, we want to give the lowest value
-     *         that will work reliably.  This varies based on the
-     *         sound card, kernel, CPU, etc.  I think it is better
-     *         to give sub-optimal latency than to give a number
-     *         too low and cause dropouts.  My conservative
-     *         estimate at this point is to base it on 4096-sample
-     *         latency at 44.1 kHz, which gives a latency of 23ms.
-     *         * for high latency we want to give a large enough
-     *         value that dropouts are basically impossible.  This
-     *         doesn't really require as much tweaking, since
-     *         providing too large a number will just cause us to
-     *         select the nearest setting that will work at stream
-     *         config time.
-     */
-    ENSURE_( snd_pcm_hw_params_set_buffer_size_near( pcm, hwParams, &lowLatency ), paUnanticipatedHostError );
-
-    /* Have to reset hwParams, to set new buffer size */
-    ENSURE_( snd_pcm_hw_params_any( pcm, hwParams ), paUnanticipatedHostError ); 
-    ENSURE_( snd_pcm_hw_params_set_buffer_size_near( pcm, hwParams, &highLatency ), paUnanticipatedHostError );
-
-    *minChannels = (int)minChans;
-    *maxChannels = (int)maxChans;
-    *defaultSampleRate = defaultSr;
-    *defaultLowLatency = (double) lowLatency / *defaultSampleRate;
-    *defaultHighLatency = (double) highLatency / *defaultSampleRate;
-
-end:
-    snd_pcm_close( pcm );
-    return result;
-
-error:
-    goto end;
-}
-
-/* Initialize device info with invalid values (maxInputChannels and maxOutputChannels are set to zero since these indicate
- * wether input/output is available) */
-static void InitializeDeviceInfo( PaDeviceInfo *deviceInfo )
-{
-    deviceInfo->structVersion = -1;
-    deviceInfo->name = NULL;
-    deviceInfo->hostApi = -1;
-    deviceInfo->maxInputChannels = 0;
-    deviceInfo->maxOutputChannels = 0;
-    deviceInfo->defaultLowInputLatency = -1.;
-    deviceInfo->defaultLowOutputLatency = -1.;
-    deviceInfo->defaultHighInputLatency = -1.;
-    deviceInfo->defaultHighOutputLatency = -1.;
-    deviceInfo->defaultSampleRate = -1.;
-}
-
-/* Helper struct */
-typedef struct
-{
-    char *alsaName;
-    char *name;
-    int isPlug;
-    int hasPlayback;
-    int hasCapture;
-} HwDevInfo;
-
-
-HwDevInfo predefinedNames[] = {
-    { "center_lfe", NULL, 0, 1, 0 },
-/* { "default", NULL, 0, 1, 0 }, */
-/* { "dmix", NULL, 0, 1, 0 }, */
-/* { "dpl", NULL, 0, 1, 0 }, */
-/* { "dsnoop", NULL, 0, 1, 0 }, */
-    { "front", NULL, 0, 1, 0 },
-    { "iec958", NULL, 0, 1, 0 },
-/* { "modem", NULL, 0, 1, 0 }, */
-    { "rear", NULL, 0, 1, 0 },
-    { "side", NULL, 0, 1, 0 },
-/*     { "spdif", NULL, 0, 0, 0 }, */
-    { "surround40", NULL, 0, 1, 0 },
-    { "surround41", NULL, 0, 1, 0 },
-    { "surround50", NULL, 0, 1, 0 },
-    { "surround51", NULL, 0, 1, 0 },
-    { "surround71", NULL, 0, 1, 0 },
-    { NULL, NULL, 0, 1, 0 }
-};
-
-static const HwDevInfo *FindDeviceName( const char *name )
-{
-    int i;
-
-    for( i = 0; predefinedNames[i].alsaName; i++ )
-    {
-	if( strcmp( name, predefinedNames[i].alsaName ) == 0 )
-	{
-	    return &predefinedNames[i];
-	}
-    }
-
-    return NULL;
-}
-
-static PaError PaAlsa_StrDup( PaAlsaHostApiRepresentation *alsaApi,
-        char **dst,
-        const char *src)
-{
-    PaError result = paNoError;
-    int len = strlen( src ) + 1;
-
-    /* PA_DEBUG(("PaStrDup %s %d\n", src, len)); */
-
-    PA_UNLESS( *dst = (char *)PaUtil_GroupAllocateMemory( alsaApi->allocations, len ),
-            paInsufficientMemory );
-    strncpy( *dst, src, len );
-
-error:
-    return result;
-}
-
-/* Disregard some standard plugins
- */
-static int IgnorePlugin( const char *pluginId )
-{
-    static const char *ignoredPlugins[] = {"hw", "plughw", "plug", "dsnoop", "tee",
-        "file", "null", "shm", "cards", "rate_convert", NULL};
-    int i = 0;
-    while( ignoredPlugins[i] )
-    {
-        if( !strcmp( pluginId, ignoredPlugins[i] ) )
-        {
-            return 1;
-        }
-        ++i;
-    }
-
-    return 0;
-}
-
-/** Open PCM device.
- *
- * Wrapper around snd_pcm_open which may repeatedly retry opening a device if it is busy, for
- * a certain time. This is because dmix may temporarily hold on to a device after it (dmix)
- * has been opened and closed.
- * @param mode: Open mode (e.g., SND_PCM_BLOCKING).
- * @param waitOnBusy: Retry opening busy device for up to one second?
- **/
-static int OpenPcm( snd_pcm_t **pcmp, const char *name, snd_pcm_stream_t stream, int mode, int waitOnBusy )
-{
-    int tries = 0, maxTries = waitOnBusy ? 100 : 0;
-    int ret = snd_pcm_open( pcmp, name, stream, mode );
-    for( tries = 0; tries < maxTries && -EBUSY == ret; ++tries )
-    {
-        Pa_Sleep( 10 );
-        ret = snd_pcm_open( pcmp, name, stream, mode );
-        if( -EBUSY != ret )
-        {
-            PA_DEBUG(( "%s: Successfully opened initially busy device after %d tries\n",
-                        __FUNCTION__, tries ));
-        }
-    }
-    if( -EBUSY == ret )
-    {
-        PA_DEBUG(( "%s: Failed to open busy device '%s'\n",
-                    __FUNCTION__, name ));
-    }
-
-    return ret;
-}
-
-static PaError FillInDevInfo( PaAlsaHostApiRepresentation *alsaApi, HwDevInfo* deviceName, int blocking,
-        PaAlsaDeviceInfo* devInfo, int* devIdx )
-{
-    PaError result = 0;
-    PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
-    snd_pcm_t *pcm;
-    int canMmap = -1;
-    PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
-
-    /* Zero fields */
-    InitializeDeviceInfo( baseDeviceInfo );
-
-    /* to determine device capabilities, we must open the device and query the
-     * hardware parameter configuration space */
-
-    /* Query capture */
-    if( deviceName->hasCapture &&
-            OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
-            >= 0 )
-    {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo,
-                    &canMmap ) != paNoError )
-        {
-            /* Error */
-            PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
-            goto end;
-        }
-    }
-
-    /* Query playback */
-    if( deviceName->hasPlayback &&
-            OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
-            >= 0 )
-    {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo,
-                    &canMmap ) != paNoError )
-        {
-            /* Error */
-            PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
-            goto end;
-        }
-    }
-
-    if( 0 == canMmap )
-    {
-        PA_DEBUG(("%s: Device %s doesn't support mmap\n", __FUNCTION__, deviceName->alsaName));
-        goto end;
-    }
-
-    baseDeviceInfo->structVersion = 2;
-    baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
-    baseDeviceInfo->name = deviceName->name;
-    devInfo->alsaName = deviceName->alsaName;
-    devInfo->isPlug = deviceName->isPlug;
-
-    /* A: Storing pointer to PaAlsaDeviceInfo object as pointer to PaDeviceInfo object.
-     * Should now be safe to add device info, unless the device supports neither capture nor playback
-     */
-    if( baseDeviceInfo->maxInputChannels > 0 || baseDeviceInfo->maxOutputChannels > 0 )
-    {
-        /* Make device default if there isn't already one or it is the ALSA "default" device */
-        if( (baseApi->info.defaultInputDevice == paNoDevice || !strcmp(deviceName->alsaName,
-                        "default" )) && baseDeviceInfo->maxInputChannels > 0 )
-        {
-            baseApi->info.defaultInputDevice = *devIdx;
-            PA_DEBUG(("Default input device: %s\n", deviceName->name));
-        }
-        if( (baseApi->info.defaultOutputDevice == paNoDevice || !strcmp(deviceName->alsaName,
-                        "default" )) && baseDeviceInfo->maxOutputChannels > 0 )
-        {
-            baseApi->info.defaultOutputDevice = *devIdx;
-            PA_DEBUG(("Default output device: %s\n", deviceName->name));
-        }
-        PA_DEBUG(("%s: Adding device %s: %d\n", __FUNCTION__, deviceName->name, *devIdx));
-        baseApi->deviceInfos[*devIdx] = (PaDeviceInfo *) devInfo;
-        (*devIdx) += 1;
-    }
-
-end:
-    return result;
-}
-
-/* Build PaDeviceInfo list, ignore devices for which we cannot determine capabilities (possibly busy, sigh) */
-static PaError BuildDeviceList( PaAlsaHostApiRepresentation *alsaApi )
-{
-    PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
-    PaAlsaDeviceInfo *deviceInfoArray;
-    int cardIdx = -1, devIdx = 0;
-    snd_ctl_card_info_t *cardInfo;
-    PaError result = paNoError;
-    size_t numDeviceNames = 0, maxDeviceNames = 1, i;
-    HwDevInfo *hwDevInfos = NULL;
-    snd_config_t *topNode = NULL;
-    snd_pcm_info_t *pcmInfo;
-    int res;
-    int blocking = SND_PCM_NONBLOCK;
-    char alsaCardName[50];
-#ifdef PA_ENABLE_DEBUG_OUTPUT
-    PaTime startTime = PaUtil_GetTime();
-#endif
-
-    if( getenv( "PA_ALSA_INITIALIZE_BLOCK" ) && atoi( getenv( "PA_ALSA_INITIALIZE_BLOCK" ) ) )
-        blocking = 0;
-
-    /* These two will be set to the first working input and output device, respectively */
-    baseApi->info.defaultInputDevice = paNoDevice;
-    baseApi->info.defaultOutputDevice = paNoDevice;
-
-    /* Gather info about hw devices
-
-     * snd_card_next() modifies the integer passed to it to be:
-     *      the index of the first card if the parameter is -1
-     *      the index of the next card if the parameter is the index of a card
-     *      -1 if there are no more cards
-     *
-     * The function itself returns 0 if it succeeded. */
-    cardIdx = -1;
-    snd_ctl_card_info_alloca( &cardInfo );
-    snd_pcm_info_alloca( &pcmInfo );
-    while( snd_card_next( &cardIdx ) == 0 && cardIdx >= 0 )
-    {
-        char *cardName;
-        int devIdx = -1;
-        snd_ctl_t *ctl;
-        char buf[50];
-
-        snprintf( alsaCardName, sizeof (alsaCardName), "hw:%d", cardIdx );
-
-        /* Acquire name of card */
-        if( snd_ctl_open( &ctl, alsaCardName, 0 ) < 0 )
-        {
-            /* Unable to open card :( */
-            PA_DEBUG(( "%s: Unable to open device %s\n", __FUNCTION__, alsaCardName ));
-            continue;
-        }
-        snd_ctl_card_info( ctl, cardInfo );
-
-        PA_ENSURE( PaAlsa_StrDup( alsaApi, &cardName, snd_ctl_card_info_get_name( cardInfo )) );
-
-        while( snd_ctl_pcm_next_device( ctl, &devIdx ) == 0 && devIdx >= 0 )
-        {
-            char *alsaDeviceName, *deviceName;
-            size_t len;
-            int hasPlayback = 0, hasCapture = 0;
-            snprintf( buf, sizeof (buf), "hw:%d,%d", cardIdx, devIdx );
-
-            /* Obtain info about this particular device */
-            snd_pcm_info_set_device( pcmInfo, devIdx );
-            snd_pcm_info_set_subdevice( pcmInfo, 0 );
-            snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_CAPTURE );
-            if( snd_ctl_pcm_info( ctl, pcmInfo ) >= 0 )
-            {
-                hasCapture = 1;
-            }
-            
-            snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_PLAYBACK );
-            if( snd_ctl_pcm_info( ctl, pcmInfo ) >= 0 )
-            {
-                hasPlayback = 1;
-            }
-
-            if( !hasPlayback && !hasCapture )
-            {
-                /* Error */
-                continue;
-            }
-
-            /* The length of the string written by snprintf plus terminating 0 */
-            len = snprintf( NULL, 0, "%s: %s (%s)", cardName, snd_pcm_info_get_name( pcmInfo ), buf ) + 1;
-            PA_UNLESS( deviceName = (char *)PaUtil_GroupAllocateMemory( alsaApi->allocations, len ),
-                    paInsufficientMemory );
-            snprintf( deviceName, len, "%s: %s (%s)", cardName,
-                    snd_pcm_info_get_name( pcmInfo ), buf );
-
-            ++numDeviceNames;
-            if( !hwDevInfos || numDeviceNames > maxDeviceNames )
-            {
-                maxDeviceNames *= 2;
-                PA_UNLESS( hwDevInfos = (HwDevInfo *) realloc( hwDevInfos, maxDeviceNames * sizeof (HwDevInfo) ),
-                        paInsufficientMemory );
-            }
-
-            PA_ENSURE( PaAlsa_StrDup( alsaApi, &alsaDeviceName, buf ) );
-
-            hwDevInfos[ numDeviceNames - 1 ].alsaName = alsaDeviceName;
-            hwDevInfos[ numDeviceNames - 1 ].name = deviceName;
-            hwDevInfos[ numDeviceNames - 1 ].isPlug = 0;
-            hwDevInfos[ numDeviceNames - 1 ].hasPlayback = hasPlayback;
-            hwDevInfos[ numDeviceNames - 1 ].hasCapture = hasCapture;
-        }
-        snd_ctl_close( ctl );
-    }
-
-    /* Iterate over plugin devices */
-
-    if( NULL == snd_config )
-    {
-        /* snd_config_update is called implicitly by some functions, if this hasn't happened snd_config will be NULL (bleh) */
-        ENSURE_( snd_config_update(), paUnanticipatedHostError );
-        PA_DEBUG(( "Updating snd_config\n" ));
-    }
-    assert( snd_config );
-    if( (res = snd_config_search( snd_config, "pcm", &topNode )) >= 0 )
-    {
-        snd_config_iterator_t i, next;
-
-        snd_config_for_each( i, next, topNode )
-        {
-            const char *tpStr = "unknown", *idStr = NULL;
-            int err = 0;
-
-            char *alsaDeviceName, *deviceName;
-	    const HwDevInfo *predefined = NULL;
-            snd_config_t *n = snd_config_iterator_entry( i ), * tp = NULL;;
-
-            if( (err = snd_config_search( n, "type", &tp )) < 0 )
-            {
-                if( -ENOENT != err )
-                {
-                    ENSURE_(err, paUnanticipatedHostError);
-                }
-            }
-            else 
-            {
-                ENSURE_( snd_config_get_string( tp, &tpStr ), paUnanticipatedHostError );
-            }
-            ENSURE_( snd_config_get_id( n, &idStr ), paUnanticipatedHostError );
-            if( IgnorePlugin( idStr ) )
-            {
-                PA_DEBUG(( "%s: Ignoring ALSA plugin device %s of type %s\n", __FUNCTION__, idStr, tpStr ));
-                continue;
-            }
-            PA_DEBUG(( "%s: Found plugin %s of type %s\n", __FUNCTION__, idStr, tpStr ));
-
-            PA_UNLESS( alsaDeviceName = (char*)PaUtil_GroupAllocateMemory( alsaApi->allocations,
-                                                            strlen(idStr) + 6 ), paInsufficientMemory );
-            strcpy( alsaDeviceName, idStr );
-            PA_UNLESS( deviceName = (char*)PaUtil_GroupAllocateMemory( alsaApi->allocations,
-                                                            strlen(idStr) + 1 ), paInsufficientMemory );
-            strcpy( deviceName, idStr );
-
-            ++numDeviceNames;
-            if( !hwDevInfos || numDeviceNames > maxDeviceNames )
-            {
-                maxDeviceNames *= 2;
-                PA_UNLESS( hwDevInfos = (HwDevInfo *) realloc( hwDevInfos, maxDeviceNames * sizeof (HwDevInfo) ),
-                        paInsufficientMemory );
-            }
-
-	    predefined = FindDeviceName( alsaDeviceName );
-
-            hwDevInfos[numDeviceNames - 1].alsaName = alsaDeviceName;
-            hwDevInfos[numDeviceNames - 1].name = deviceName;
-            hwDevInfos[numDeviceNames - 1].isPlug = 1;
-
-	    if( predefined )
-	    {
-		hwDevInfos[numDeviceNames - 1].hasPlayback =
-		    predefined->hasPlayback;
-		hwDevInfos[numDeviceNames - 1].hasCapture =
-		    predefined->hasCapture;
-	    }
-	    else
-	    {
-		hwDevInfos[numDeviceNames - 1].hasPlayback = 1;
-		hwDevInfos[numDeviceNames - 1].hasCapture = 1;
-	    }
-        }
-    }
-    else
-        PA_DEBUG(( "%s: Iterating over ALSA plugins failed: %s\n", __FUNCTION__, snd_strerror( res ) ));
-
-    /* allocate deviceInfo memory based on the number of devices */
-    PA_UNLESS( baseApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-            alsaApi->allocations, sizeof(PaDeviceInfo*) * (numDeviceNames) ), paInsufficientMemory );
-
-    /* allocate all device info structs in a contiguous block */
-    PA_UNLESS( deviceInfoArray = (PaAlsaDeviceInfo*)PaUtil_GroupAllocateMemory(
-            alsaApi->allocations, sizeof(PaAlsaDeviceInfo) * numDeviceNames ), paInsufficientMemory );
-
-    /* Loop over list of cards, filling in info. If a device is deemed unavailable (can't get name),
-     * it's ignored.
-     *
-     * Note that we do this in two stages. This is a workaround owing to the fact that the 'dmix'
-     * plugin may cause the underlying hardware device to be busy for a short while even after it
-     * (dmix) is closed. The 'default' plugin may also point to the dmix plugin, so the same goes
-     * for this.
-     */
-
-    for( i = 0, devIdx = 0; i < numDeviceNames; ++i )
-    {
-        PaAlsaDeviceInfo* devInfo = &deviceInfoArray[i];
-        HwDevInfo* hwInfo = &hwDevInfos[i];
-        if( !strcmp( hwInfo->name, "dmix" ) || !strcmp( hwInfo->name, "default" ) )
-        {
-            continue;
-        }
-
-        PA_ENSURE( FillInDevInfo( alsaApi, hwInfo, blocking, devInfo, &devIdx ) );
-    }
-    assert( devIdx < numDeviceNames );
-    /* Now inspect 'dmix' and 'default' plugins */
-    for( i = 0; i < numDeviceNames; ++i )
-    {
-        PaAlsaDeviceInfo* devInfo = &deviceInfoArray[i];
-        HwDevInfo* hwInfo = &hwDevInfos[i];
-        if( strcmp( hwInfo->name, "dmix" ) && strcmp( hwInfo->name, "default" ) )
-        {
-            continue;
-        }
-
-        PA_ENSURE( FillInDevInfo( alsaApi, hwInfo, blocking, devInfo,
-                    &devIdx ) );
-    }
-    free( hwDevInfos );
-
-    baseApi->info.deviceCount = devIdx;   /* Number of successfully queried devices */
-
-#ifdef PA_ENABLE_DEBUG_OUTPUT
-    PA_DEBUG(( "%s: Building device list took %f seconds\n", __FUNCTION__, PaUtil_GetTime() - startTime ));
-#endif
-
-end:
-    return result;
-
-error:
-    /* No particular action */
-    goto end;
-}
-
-/* Check against known device capabilities */
-static PaError ValidateParameters( const PaStreamParameters *parameters, PaUtilHostApiRepresentation *hostApi, StreamDirection mode )
-{
-    PaError result = paNoError;
-    int maxChans;
-    const PaAlsaDeviceInfo *deviceInfo = NULL;
-    assert( parameters );
-
-    if( parameters->device != paUseHostApiSpecificDeviceSpecification )
-    {
-        assert( parameters->device < hostApi->info.deviceCount );
-        PA_UNLESS( parameters->hostApiSpecificStreamInfo == NULL, paBadIODeviceCombination );
-        deviceInfo = GetDeviceInfo( hostApi, parameters->device );
-    }
-    else
-    {
-        const PaAlsaStreamInfo *streamInfo = parameters->hostApiSpecificStreamInfo;
-
-        PA_UNLESS( parameters->device == paUseHostApiSpecificDeviceSpecification, paInvalidDevice );
-        PA_UNLESS( streamInfo->size == sizeof (PaAlsaStreamInfo) && streamInfo->version == 1,
-                paIncompatibleHostApiSpecificStreamInfo );
-        PA_UNLESS( streamInfo->deviceString != NULL, paInvalidDevice );
-
-        /* Skip further checking */
-        return paNoError;
-    }
-
-    assert( deviceInfo );
-    assert( parameters->hostApiSpecificStreamInfo == NULL );
-    maxChans = (StreamDirection_In == mode ? deviceInfo->baseDeviceInfo.maxInputChannels :
-        deviceInfo->baseDeviceInfo.maxOutputChannels);
-    PA_UNLESS( parameters->channelCount <= maxChans, paInvalidChannelCount );
-
-error:
-    return result;
-}
-
-/* Given an open stream, what sample formats are available? */
-static PaSampleFormat GetAvailableFormats( snd_pcm_t *pcm )
-{
-    PaSampleFormat available = 0;
-    snd_pcm_hw_params_t *hwParams;
-    snd_pcm_hw_params_alloca( &hwParams );
-
-    snd_pcm_hw_params_any( pcm, hwParams );
-
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_FLOAT ) >= 0)
-        available |= paFloat32;
-
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S32 ) >= 0)
-        available |= paInt32;
-
-#ifdef PA_LITTLE_ENDIAN
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3LE ) >= 0)
-        available |= paInt24;
-#elif defined PA_BIG_ENDIAN
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S24_3BE ) >= 0)
-        available |= paInt24;
-#endif
-
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S16 ) >= 0)
-        available |= paInt16;
-
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_U8 ) >= 0)
-        available |= paUInt8;
-
-    if( snd_pcm_hw_params_test_format( pcm, hwParams, SND_PCM_FORMAT_S8 ) >= 0)
-        available |= paInt8;
-
-    return available;
-}
-
-static snd_pcm_format_t Pa2AlsaFormat( PaSampleFormat paFormat )
-{
-    switch( paFormat )
-    {
-        case paFloat32:
-            return SND_PCM_FORMAT_FLOAT;
-
-        case paInt16:
-            return SND_PCM_FORMAT_S16;
-
-        case paInt24:
-#ifdef PA_LITTLE_ENDIAN
-            return SND_PCM_FORMAT_S24_3LE;
-#elif defined PA_BIG_ENDIAN
-            return SND_PCM_FORMAT_S24_3BE;
-#endif
-
-        case paInt32:
-            return SND_PCM_FORMAT_S32;
-
-        case paInt8:
-            return SND_PCM_FORMAT_S8;
-
-        case paUInt8:
-            return SND_PCM_FORMAT_U8;
-
-        default:
-            return SND_PCM_FORMAT_UNKNOWN;
-    }
-}
-
-/** Open an ALSA pcm handle.
- * 
- * The device to be open can be specified in a custom PaAlsaStreamInfo struct, or it will be a device number. In case of a
- * device number, it maybe specified through an env variable (PA_ALSA_PLUGHW) that we should open the corresponding plugin
- * device.
- */
-static PaError AlsaOpen( const PaUtilHostApiRepresentation *hostApi, const PaStreamParameters *params, StreamDirection
-        streamDir, snd_pcm_t **pcm )
-{
-    PaError result = paNoError;
-    int ret;
-    char dnameArray[50];
-    const char* deviceName = dnameArray;
-    const PaAlsaDeviceInfo *deviceInfo = NULL;
-    PaAlsaStreamInfo *streamInfo = (PaAlsaStreamInfo *)params->hostApiSpecificStreamInfo;
-
-    if( !streamInfo )
-    {
-        int usePlug = 0;
-        deviceInfo = GetDeviceInfo( hostApi, params->device );
-        
-        /* If device name starts with hw: and PA_ALSA_PLUGHW is 1, we open the plughw device instead */
-        if( !strncmp( "hw:", deviceInfo->alsaName, 3 ) && getenv( "PA_ALSA_PLUGHW" ) )
-            usePlug = atoi( getenv( "PA_ALSA_PLUGHW" ) );
-        if( usePlug )
-            snprintf( dnameArray, 50, "plug%s", deviceInfo->alsaName );
-        else
-            deviceName = deviceInfo->alsaName;
-    }
-    else
-        deviceName = streamInfo->deviceString;
-
-    PA_DEBUG(( "%s: Opening device %s\n", __FUNCTION__, deviceName ));
-    if( (ret = OpenPcm( pcm, deviceName, streamDir == StreamDirection_In ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK,
-                    SND_PCM_NONBLOCK, 1 )) < 0 )
-    {
-        /* Not to be closed */
-        *pcm = NULL;
-        ENSURE_( ret, -EBUSY == ret ? paDeviceUnavailable : paBadIODeviceCombination );
-    }
-    ENSURE_( snd_pcm_nonblock( *pcm, 0 ), paUnanticipatedHostError );
-
-end:
-    return result;
-
-error:
-    goto end;
-}
-
-static PaError TestParameters( const PaUtilHostApiRepresentation *hostApi, const PaStreamParameters *parameters,
-        double sampleRate, StreamDirection streamDir )
-{
-    PaError result = paNoError;
-    snd_pcm_t *pcm = NULL;
-    PaSampleFormat availableFormats;
-    /* We are able to adapt to a number of channels less than what the device supports */
-    unsigned int numHostChannels;
-    PaSampleFormat hostFormat;
-    snd_pcm_hw_params_t *hwParams;
-    snd_pcm_hw_params_alloca( &hwParams );
-    
-    if( !parameters->hostApiSpecificStreamInfo )
-    {
-        const PaAlsaDeviceInfo *devInfo = GetDeviceInfo( hostApi, parameters->device );
-        numHostChannels = PA_MAX( parameters->channelCount, StreamDirection_In == streamDir ?
-                devInfo->minInputChannels : devInfo->minOutputChannels );
-    }
-    else
-        numHostChannels = parameters->channelCount;
-
-    PA_ENSURE( AlsaOpen( hostApi, parameters, streamDir, &pcm ) );
-
-    snd_pcm_hw_params_any( pcm, hwParams );
-
-    if( SetApproximateSampleRate( pcm, hwParams, sampleRate ) < 0 )
-    {
-        result = paInvalidSampleRate;
-        goto error;
-    }
-
-    if( snd_pcm_hw_params_set_channels( pcm, hwParams, numHostChannels ) < 0 )
-    {
-        result = paInvalidChannelCount;
-        goto error;
-    }
-
-    /* See if we can find a best possible match */
-    availableFormats = GetAvailableFormats( pcm );
-    PA_ENSURE( hostFormat = PaUtil_SelectClosestAvailableFormat( availableFormats, parameters->sampleFormat ) );
-    ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, Pa2AlsaFormat( hostFormat ) ), paUnanticipatedHostError );
-
-    {
-        /* It happens that this call fails because the device is busy */
-        int ret = 0;
-        if( (ret = snd_pcm_hw_params( pcm, hwParams )) < 0)
-        {
-            if( -EINVAL == ret )
-            {
-                /* Don't know what to return here */
-                result = paBadIODeviceCombination;
-                goto error;
-            }
-            else if( -EBUSY == ret )
-            {
-                result = paDeviceUnavailable;
-                PA_DEBUG(( "%s: Device is busy\n", __FUNCTION__ ));
-            }
-            else
-            {
-                result = paUnanticipatedHostError;
-            }
-
-            ENSURE_( ret, result );
-        }
-    }
-
-end:
-    if( pcm )
-    {
-        snd_pcm_close( pcm );
-    }
-    return result;
-
-error:
-    goto end;
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    int inputChannelCount = 0, outputChannelCount = 0;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaError result = paFormatIsSupported;
-
-    if( inputParameters )
-    {
-        PA_ENSURE( ValidateParameters( inputParameters, hostApi, StreamDirection_In ) );
-
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-    }
-
-    if( outputParameters )
-    {
-        PA_ENSURE( ValidateParameters( outputParameters, hostApi, StreamDirection_Out ) );
-
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-    }
-
-    if( inputChannelCount )
-    {
-        if( (result = TestParameters( hostApi, inputParameters, sampleRate, StreamDirection_In ))
-                != paNoError )
-            goto error;
-    }
-    if ( outputChannelCount )
-    {
-        if( (result = TestParameters( hostApi, outputParameters, sampleRate, StreamDirection_Out ))
-                != paNoError )
-            goto error;
-    }
-
-    return paFormatIsSupported;
-
-error:
-    return result;
-}
-
-static PaError PaAlsaStreamComponent_Initialize( PaAlsaStreamComponent *self, PaAlsaHostApiRepresentation *alsaApi,
-        const PaStreamParameters *params, StreamDirection streamDir, int callbackMode )
-{
-    PaError result = paNoError;
-    PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat;
-    assert( params->channelCount > 0 );
-
-    /* Make sure things have an initial value */
-    memset( self, 0, sizeof (PaAlsaStreamComponent) );
-
-    if( NULL == params->hostApiSpecificStreamInfo )
-    {
-        const PaAlsaDeviceInfo *devInfo = GetDeviceInfo( &alsaApi->baseHostApiRep, params->device );
-        self->numHostChannels = PA_MAX( params->channelCount, StreamDirection_In == streamDir ? devInfo->minInputChannels
-                : devInfo->minOutputChannels );
-    }
-    else
-    {
-        /* We're blissfully unaware of the minimum channelCount */
-        self->numHostChannels = params->channelCount;
-    }
-
-    self->device = params->device;
-
-    PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
-    self->nfds = snd_pcm_poll_descriptors_count( self->pcm );
-    hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat );
-
-    self->hostSampleFormat = hostSampleFormat;
-    self->nativeFormat = Pa2AlsaFormat( hostSampleFormat );
-    self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
-    self->numUserChannels = params->channelCount;
-    self->streamDir = streamDir;
-
-    if( !callbackMode && !self->userInterleaved )
-    {
-        /* Pre-allocate non-interleaved user provided buffers */
-        PA_UNLESS( self->userBuffers = PaUtil_AllocateMemory( sizeof (void *) * self->numUserChannels ),
-                paInsufficientMemory );
-    }
-
-error:
-    return result;
-}
-
-static void PaAlsaStreamComponent_Terminate( PaAlsaStreamComponent *self )
-{
-    snd_pcm_close( self->pcm );
-    if( self->userBuffers )
-        PaUtil_FreeMemory( self->userBuffers );
-}
-
-/*
-static int nearbyint_(float value) {
-    if(  value - (int)value > .5 )
-        return (int)ceil( value );
-    return (int)floor( value );
-}
-*/
-
-/** Initiate configuration, preparing for determining a period size suitable for both capture and playback components.
- *
- */
-static PaError PaAlsaStreamComponent_InitialConfigure( PaAlsaStreamComponent *self, const PaStreamParameters *params,
-        int primeBuffers, snd_pcm_hw_params_t *hwParams, double *sampleRate )
-{
-    /* Configuration consists of setting all of ALSA's parameters.
-     * These parameters come in two flavors: hardware parameters
-     * and software paramters.  Hardware parameters will affect
-     * the way the device is initialized, software parameters
-     * affect the way ALSA interacts with me, the user-level client.
-     */
-
-    PaError result = paNoError;
-    snd_pcm_access_t accessMode, alternateAccessMode;
-    int dir = 0;
-    snd_pcm_t *pcm = self->pcm;
-    double sr = *sampleRate;
-    unsigned int minPeriods = 2;
-
-    /* self->framesPerBuffer = framesPerHostBuffer; */
-
-    /* ... fill up the configuration space with all possibile
-     * combinations of parameters this device will accept */
-    ENSURE_( snd_pcm_hw_params_any( pcm, hwParams ), paUnanticipatedHostError );
-
-    ENSURE_( snd_pcm_hw_params_set_periods_integer( pcm, hwParams ), paUnanticipatedHostError );
-    /* I think there should be at least 2 periods (even though ALSA doesn't appear to enforce this) */
-    dir = 0;
-    ENSURE_( snd_pcm_hw_params_set_periods_min( pcm, hwParams, &minPeriods, &dir ), paUnanticipatedHostError );
-
-    if( self->userInterleaved )
-    {
-        accessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-        alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
-    }
-    else
-    {
-        accessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
-        alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-    }
-    /* If requested access mode fails, try alternate mode */
-    if( snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
-    {
-        int err = 0;
-        if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
-        {
-            result = paUnanticipatedHostError;
-            if( -EINVAL == err )
-            {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, "PA ALSA requires that a device supports mmap access" );
-            }
-            else
-            {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
-            }
-            goto error;
-        }
-        /* Flip mode */
-        self->hostInterleaved = !self->userInterleaved;
-    }
-
-    ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
-
-    ENSURE_( SetApproximateSampleRate( pcm, hwParams, sr ), paInvalidSampleRate );
-    ENSURE_( GetExactSampleRate( hwParams, &sr ), paUnanticipatedHostError );
-    /* reject if there's no sample rate within 1% of the one requested */
-    if( (fabs( *sampleRate - sr ) / *sampleRate) > 0.01 )
-    {
-        PA_DEBUG(("%s: Wanted %f, closest sample rate was %d\n", __FUNCTION__, sampleRate, sr ));                 
-        PA_ENSURE( paInvalidSampleRate );
-    }
-
-    ENSURE_( snd_pcm_hw_params_set_channels( pcm, hwParams, self->numHostChannels ), paInvalidChannelCount );
-
-    *sampleRate = sr;
-
-end:
-    return result;
-
-error:
-    /* No particular action */
-    goto end;
-}
-
-/** Finish the configuration of the component's ALSA device.
- *
- * As part of this method, the component's bufferSize attribute will be set.
- * @param latency: The latency for this component.
- */
-static PaError PaAlsaStreamComponent_FinishConfigure( PaAlsaStreamComponent *self, snd_pcm_hw_params_t* hwParams,
-        const PaStreamParameters *params, int primeBuffers, double sampleRate, PaTime* latency )
-{
-    PaError result = paNoError;
-    snd_pcm_sw_params_t* swParams;
-    snd_pcm_uframes_t bufSz = 0;
-    *latency = -1.;
-
-    snd_pcm_sw_params_alloca( &swParams );
-
-    bufSz = params->suggestedLatency * sampleRate;
-    ENSURE_( snd_pcm_hw_params_set_buffer_size_near( self->pcm, hwParams, &bufSz ), paUnanticipatedHostError );
-
-    /* Set the parameters! */
-    {
-        int r = snd_pcm_hw_params( self->pcm, hwParams );
-#ifdef PA_ENABLE_DEBUG_OUTPUT
-        if( r < 0 )
-        {
-            snd_output_t *output = NULL;
-            snd_output_stdio_attach( &output, stderr, 0 );
-            snd_pcm_hw_params_dump( hwParams, output );
-        }
-#endif
-        ENSURE_(r, paUnanticipatedHostError );
-    }
-    ENSURE_( snd_pcm_hw_params_get_buffer_size( hwParams, &self->bufferSize ), paUnanticipatedHostError );
-    /* Latency in seconds */
-    *latency = self->bufferSize / sampleRate;
-
-    /* Now software parameters... */
-    ENSURE_( snd_pcm_sw_params_current( self->pcm, swParams ), paUnanticipatedHostError );
-
-    ENSURE_( snd_pcm_sw_params_set_start_threshold( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_sw_params_set_stop_threshold( self->pcm, swParams, self->bufferSize ), paUnanticipatedHostError );
-
-    /* Silence buffer in the case of underrun */
-    if( !primeBuffers ) /* XXX: Make sense? */
-    {
-        snd_pcm_uframes_t boundary;
-        ENSURE_( snd_pcm_sw_params_get_boundary( swParams, &boundary ), paUnanticipatedHostError );
-        ENSURE_( snd_pcm_sw_params_set_silence_threshold( self->pcm, swParams, 0 ), paUnanticipatedHostError );
-        ENSURE_( snd_pcm_sw_params_set_silence_size( self->pcm, swParams, boundary ), paUnanticipatedHostError );
-    }
-        
-    ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
-
-    /* Set the parameters! */
-    ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
-
-error:
-    return result;
-}
-
-static PaError PaAlsaStream_Initialize( PaAlsaStream *self, PaAlsaHostApiRepresentation *alsaApi, const PaStreamParameters *inParams,
-        const PaStreamParameters *outParams, double sampleRate, unsigned long framesPerUserBuffer, PaStreamCallback callback,
-        PaStreamFlags streamFlags, void *userData )
-{
-    PaError result = paNoError;
-    assert( self );
-
-    memset( self, 0, sizeof (PaAlsaStream) );
-
-    if( NULL != callback )
-    {
-        PaUtil_InitializeStreamRepresentation( &self->streamRepresentation,
-                                               &alsaApi->callbackStreamInterface,
-                                               callback, userData );
-        self->callbackMode = 1;
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &self->streamRepresentation,
-                                               &alsaApi->blockingStreamInterface,
-                                               NULL, userData );
-    }
-
-    self->framesPerUserBuffer = framesPerUserBuffer;
-    self->neverDropInput = streamFlags & paNeverDropInput;
-    /* XXX: Ignore paPrimeOutputBuffersUsingStreamCallback untill buffer priming is fully supported in pa_process.c */
-    /*
-    if( outParams & streamFlags & paPrimeOutputBuffersUsingStreamCallback )
-        self->primeBuffers = 1;
-        */
-    memset( &self->capture, 0, sizeof (PaAlsaStreamComponent) );
-    memset( &self->playback, 0, sizeof (PaAlsaStreamComponent) );
-    if( inParams )
-    {
-        PA_ENSURE( PaAlsaStreamComponent_Initialize( &self->capture, alsaApi, inParams, StreamDirection_In, NULL != callback ) );
-    }
-    if( outParams )
-    {
-        PA_ENSURE( PaAlsaStreamComponent_Initialize( &self->playback, alsaApi, outParams, StreamDirection_Out, NULL != callback ) );
-    }
-
-    assert( self->capture.nfds || self->playback.nfds );
-
-    PA_UNLESS( self->pfds = (struct pollfd*)PaUtil_AllocateMemory( (self->capture.nfds +
-                    self->playback.nfds) * sizeof (struct pollfd) ), paInsufficientMemory );
-
-    PaUtil_InitializeCpuLoadMeasurer( &self->cpuLoadMeasurer, sampleRate );
-    ASSERT_CALL_( PaUnixMutex_Initialize( &self->stateMtx ), paNoError );
-
-error:
-    return result;
-}
-
-/** Free resources associated with stream, and eventually stream itself.
- *
- * Frees allocated memory, and terminates individual StreamComponents.
- */
-static void PaAlsaStream_Terminate( PaAlsaStream *self )
-{
-    assert( self );
-
-    if( self->capture.pcm )
-    {
-        PaAlsaStreamComponent_Terminate( &self->capture );
-    }
-    if( self->playback.pcm )
-    {
-        PaAlsaStreamComponent_Terminate( &self->playback );
-    }
-
-    PaUtil_FreeMemory( self->pfds );
-    ASSERT_CALL_( PaUnixMutex_Terminate( &self->stateMtx ), paNoError );
-
-    PaUtil_FreeMemory( self );
-}
-
-/** Calculate polling timeout
- *
- * @param frames Time to wait
- * @return Polling timeout in milliseconds
- */
-static int CalculatePollTimeout( const PaAlsaStream *stream, unsigned long frames )
-{
-    assert( stream->streamRepresentation.streamInfo.sampleRate > 0.0 );
-    /* Period in msecs, rounded up */
-    return (int)ceil( 1000 * frames / stream->streamRepresentation.streamInfo.sampleRate );
-}
-
-/** Determine size per host buffer.
- *
- * During this method call, the component's framesPerBuffer attribute gets computed, and the corresponding period size
- * gets configured for the device.
- * @param accurate: If the configured period size is non-integer, this will be set to 0.
- */
-static PaError PaAlsaStreamComponent_DetermineFramesPerBuffer( PaAlsaStreamComponent* self, const PaStreamParameters* params,
-        unsigned long framesPerUserBuffer, double sampleRate, snd_pcm_hw_params_t* hwParams, int* accurate )
-{
-    PaError result = paNoError;
-    unsigned long bufferSize = params->suggestedLatency * sampleRate, framesPerHostBuffer;
-    int dir = 0;
-    
-    {
-        snd_pcm_uframes_t tmp;
-        snd_pcm_hw_params_get_buffer_size_min( hwParams, &tmp );
-        bufferSize = PA_MAX( bufferSize, tmp );
-        snd_pcm_hw_params_get_buffer_size_max( hwParams, &tmp );
-        bufferSize = PA_MIN( bufferSize, tmp );
-    }
-
-    assert( bufferSize > 0 );
-
-    if( framesPerUserBuffer != paFramesPerBufferUnspecified )
-    {
-        /* Preferably the host buffer size should be a multiple of the user buffer size */
-
-        if( bufferSize > framesPerUserBuffer )
-        {
-            snd_pcm_uframes_t remainder = bufferSize % framesPerUserBuffer;
-            if( remainder > framesPerUserBuffer / 2. )
-                bufferSize += framesPerUserBuffer - remainder;
-            else
-                bufferSize -= remainder;
-
-            assert( bufferSize % framesPerUserBuffer == 0 );
-        }
-        else if( framesPerUserBuffer % bufferSize != 0 )
-        {
-            /*  Find a good compromise between user specified latency and buffer size */
-            if( bufferSize > framesPerUserBuffer * .75 )
-            {
-                bufferSize = framesPerUserBuffer;
-            }
-            else
-            {
-                snd_pcm_uframes_t newSz = framesPerUserBuffer;
-                while( newSz / 2 >= bufferSize )
-                {
-                    if( framesPerUserBuffer % (newSz / 2) != 0 )
-                    {
-                        /* No use dividing any further */
-                        break;
-                    }
-                    newSz /= 2;
-                }
-                bufferSize = newSz;
-            }
-
-            assert( framesPerUserBuffer % bufferSize == 0 );
-        }
-    }
-
-    /* Using the base number of periods, we try to approximate the suggested latency (+1 period),
-       finding a combination of period/buffer size which best fits these constraints */
-    {
-        unsigned numPeriods = numPeriods_, maxPeriods = 0;
-        /* It may be that the device only supports 2 periods for instance */
-        dir = 0;
-        ENSURE_( snd_pcm_hw_params_get_periods_max( hwParams, &maxPeriods, &dir ), paUnanticipatedHostError );
-        assert( maxPeriods > 1 );
-        numPeriods = PA_MIN( maxPeriods, numPeriods );
-
-        if( framesPerUserBuffer != paFramesPerBufferUnspecified )
-        {
-            /* Try to get a power-of-two of the user buffer size. */
-            framesPerHostBuffer = framesPerUserBuffer;
-            if( framesPerHostBuffer < bufferSize )
-            {
-                while( bufferSize / framesPerHostBuffer > numPeriods )
-                {
-                    framesPerHostBuffer *= 2;
-                }
-                /* One extra period is preferrable to one less (should be more robust) */
-                if( bufferSize / framesPerHostBuffer < numPeriods )
-                {
-                    framesPerHostBuffer /= 2;
-                }
-            }
-            else
-            {
-                while( bufferSize / framesPerHostBuffer < numPeriods )
-                {
-                    if( framesPerUserBuffer % (framesPerHostBuffer / 2) != 0 )
-                    {
-                        /* Can't be divided any further */
-                        break;
-                    }
-                    framesPerHostBuffer /= 2;
-                }
-            }
-
-            if( framesPerHostBuffer < framesPerUserBuffer )
-            {
-                assert( framesPerUserBuffer % framesPerHostBuffer == 0 );
-                if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
-                {
-                    if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer * 2, 0 ) == 0 )
-                        framesPerHostBuffer *= 2;
-                    else if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer / 2, 0 ) == 0 )
-                        framesPerHostBuffer /= 2;
-                }
-            }
-            else
-            {
-                assert( framesPerHostBuffer % framesPerUserBuffer == 0 );
-                if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer, 0 ) < 0 )
-                {
-                    if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer + framesPerUserBuffer, 0 ) == 0 )
-                        framesPerHostBuffer += framesPerUserBuffer;
-                    else if( snd_pcm_hw_params_test_period_size( self->pcm, hwParams, framesPerHostBuffer - framesPerUserBuffer, 0 ) == 0 )
-                        framesPerHostBuffer -= framesPerUserBuffer;
-                }
-            }
-        }
-        else
-        {
-            framesPerHostBuffer = bufferSize / numPeriods;
-        }
-    }
-
-    assert( framesPerHostBuffer > 0 );
-    {
-        snd_pcm_uframes_t min = 0, max = 0;
-        ENSURE_( snd_pcm_hw_params_get_period_size_min( hwParams, &min, NULL ), paUnanticipatedHostError );
-        ENSURE_( snd_pcm_hw_params_get_period_size_max( hwParams, &max, NULL ), paUnanticipatedHostError );
-
-        if( framesPerHostBuffer < min )
-        {
-            PA_DEBUG(( "%s: The determined period size (%lu) is less than minimum (%lu)\n", __FUNCTION__,
-                        framesPerHostBuffer, min ));
-            framesPerHostBuffer = min;
-        }
-        else if( framesPerHostBuffer > max )
-        {
-            PA_DEBUG(( "%s: The determined period size (%lu) is greater than maximum (%lu)\n", __FUNCTION__,
-                        framesPerHostBuffer, max ));
-            framesPerHostBuffer = max;
-        }
-
-        assert( framesPerHostBuffer >= min && framesPerHostBuffer <= max );
-        dir = 0;
-        ENSURE_( snd_pcm_hw_params_set_period_size_near( self->pcm, hwParams, &framesPerHostBuffer, &dir ),
-                paUnanticipatedHostError );
-        if( dir != 0 )
-        {
-            PA_DEBUG(( "%s: The configured period size is non-integer.\n", __FUNCTION__, dir ));
-            *accurate = 0;
-        }
-    }
-    self->framesPerBuffer = framesPerHostBuffer;
-
-error:
-    return result;
-}
-
-/* We need to determine how many frames per host buffer (period) to use.  Our
- * goals are to provide the best possible performance, but also to
- * honor the requested latency settings as closely as we can. Therefore this
- * decision is based on:
- *
- *   - the period sizes that playback and/or capture support.  The
- *     host buffer size has to be one of these.
- *   - the number of periods that playback and/or capture support.
- *
- * We want to make period_size*(num_periods-1) to be as close as possible
- * to latency*rate for both playback and capture.
- *
- * This method will determine suitable period sizes for capture and playback handles, and report the maximum number of
- * frames per host buffer. The latter is relevant, in case we should be so unfortunate that the period size differs
- * between capture and playback. If this should happen, the stream's hostBufferSizeMode attribute will be set to
- * paUtilBoundedHostBufferSize, because the best we can do is limit the size of individual host buffers to the upper
- * bound. The size of host buffers scheduled for processing should only matter if the user has specified a buffer size,
- * but when he/she does we must strive for an optimal configuration. By default we'll opt for a fixed host buffer size,
- * which should be fine if the period size is the same for capture and playback. In general, if there is a specified user
- * buffer size, this method tries it best to determine a period size which is a multiple of the user buffer size.
- *
- * The framesPerBuffer attributes of the individual capture and playback components of the stream are set to corresponding
- * values determined here. Since these should be reported as 
- *
- * This is one of those blocks of code that will just take a lot of
- * refinement to be any good.
- *
- * In the full-duplex case it is possible that the routine was unable
- * to find a number of frames per buffer acceptable to both devices
- * TODO: Implement an algorithm to find the value closest to acceptance
- * by both devices, to minimize difference between period sizes?
- *
- * @param determinedFramesPerHostBuffer: The determined host buffer size.
- */
-static PaError PaAlsaStream_DetermineFramesPerBuffer( PaAlsaStream* self, double sampleRate, const PaStreamParameters* inputParameters,
-        const PaStreamParameters* outputParameters, unsigned long framesPerUserBuffer, snd_pcm_hw_params_t* hwParamsCapture,
-        snd_pcm_hw_params_t* hwParamsPlayback, PaUtilHostBufferSizeMode* hostBufferSizeMode )
-{
-    PaError result = paNoError;
-    unsigned long framesPerHostBuffer = 0;
-    int dir = 0;
-    int accurate = 1;
-    unsigned numPeriods = numPeriods_;
-
-    if( self->capture.pcm && self->playback.pcm )
-    {
-        if( framesPerUserBuffer == paFramesPerBufferUnspecified )
-        {
-            /* Come up with a common desired latency */
-            snd_pcm_uframes_t desiredBufSz, e, minPeriodSize, maxPeriodSize, optimalPeriodSize, periodSize,
-                              minCapture, minPlayback, maxCapture, maxPlayback;
-
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_get_period_size_min( hwParamsCapture, &minCapture, &dir ), paUnanticipatedHostError );
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_get_period_size_min( hwParamsPlayback, &minPlayback, &dir ), paUnanticipatedHostError );
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_get_period_size_max( hwParamsCapture, &maxCapture, &dir ), paUnanticipatedHostError );
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_get_period_size_max( hwParamsPlayback, &maxPlayback, &dir ), paUnanticipatedHostError );
-            minPeriodSize = PA_MAX( minPlayback, minCapture );
-            maxPeriodSize = PA_MIN( maxPlayback, maxCapture );
-            PA_UNLESS( minPeriodSize <= maxPeriodSize, paBadIODeviceCombination );
-
-            desiredBufSz = (snd_pcm_uframes_t)(PA_MIN( outputParameters->suggestedLatency, inputParameters->suggestedLatency )
-                    * sampleRate);
-            /* Clamp desiredBufSz */
-            {
-                snd_pcm_uframes_t maxBufferSize;
-                snd_pcm_uframes_t maxBufferSizeCapture, maxBufferSizePlayback;
-                ENSURE_( snd_pcm_hw_params_get_buffer_size_max( hwParamsCapture, &maxBufferSizeCapture ), paUnanticipatedHostError );
-                ENSURE_( snd_pcm_hw_params_get_buffer_size_max( hwParamsPlayback, &maxBufferSizePlayback ), paUnanticipatedHostError );
-                maxBufferSize = PA_MIN( maxBufferSizeCapture, maxBufferSizePlayback );
-
-                desiredBufSz = PA_MIN( desiredBufSz, maxBufferSize );
-            }
-
-            /* Find the closest power of 2 */
-            e = ilogb( minPeriodSize );
-            if( minPeriodSize & (minPeriodSize - 1) )
-                e += 1;
-            periodSize = (snd_pcm_uframes_t)pow( 2, e );
-
-            while( periodSize <= maxPeriodSize )
-            {
-                if( snd_pcm_hw_params_test_period_size( self->playback.pcm, hwParamsPlayback, periodSize, 0 ) >= 0 &&
-                        snd_pcm_hw_params_test_period_size( self->capture.pcm, hwParamsCapture, periodSize, 0 ) >= 0 )
-                {
-                    /* OK! */
-                    break;
-                }
-
-                periodSize *= 2;
-            }
-
-            optimalPeriodSize = PA_MAX( desiredBufSz / numPeriods, minPeriodSize );
-            optimalPeriodSize = PA_MIN( optimalPeriodSize, maxPeriodSize );
-
-            /* Find the closest power of 2 */
-            e = ilogb( optimalPeriodSize );
-            if( optimalPeriodSize & (optimalPeriodSize - 1) )
-                e += 1;
-            optimalPeriodSize = (snd_pcm_uframes_t)pow( 2, e );
-
-            while( optimalPeriodSize >= periodSize )
-            {
-                if( snd_pcm_hw_params_test_period_size( self->capture.pcm, hwParamsCapture, optimalPeriodSize, 0 )
-                        >= 0 && snd_pcm_hw_params_test_period_size( self->playback.pcm, hwParamsPlayback,
-                            optimalPeriodSize, 0 ) >= 0 )
-                {
-                    break;
-                }
-                optimalPeriodSize /= 2;
-            }
-        
-            if( optimalPeriodSize > periodSize )
-                periodSize = optimalPeriodSize;
-
-            if( periodSize <= maxPeriodSize )
-            {
-                /* Looks good, the periodSize _should_ be acceptable by both devices */
-                ENSURE_( snd_pcm_hw_params_set_period_size( self->capture.pcm, hwParamsCapture, periodSize, 0 ),
-                        paUnanticipatedHostError );
-                ENSURE_( snd_pcm_hw_params_set_period_size( self->playback.pcm, hwParamsPlayback, periodSize, 0 ),
-                        paUnanticipatedHostError );
-                self->capture.framesPerBuffer = self->playback.framesPerBuffer = periodSize;
-                framesPerHostBuffer = periodSize;
-            }
-            else
-            {
-                /* Unable to find a common period size, oh well */
-                optimalPeriodSize = PA_MAX( desiredBufSz / numPeriods, minPeriodSize );
-                optimalPeriodSize = PA_MIN( optimalPeriodSize, maxPeriodSize );
-
-                self->capture.framesPerBuffer = optimalPeriodSize;
-                dir = 0;
-                ENSURE_( snd_pcm_hw_params_set_period_size_near( self->capture.pcm, hwParamsCapture, &self->capture.framesPerBuffer, &dir ),
-                        paUnanticipatedHostError );
-                self->playback.framesPerBuffer = optimalPeriodSize;
-                dir = 0;
-                ENSURE_( snd_pcm_hw_params_set_period_size_near( self->playback.pcm, hwParamsPlayback, &self->playback.framesPerBuffer, &dir ),
-                        paUnanticipatedHostError );
-                framesPerHostBuffer = PA_MAX( self->capture.framesPerBuffer, self->playback.framesPerBuffer );
-                *hostBufferSizeMode = paUtilBoundedHostBufferSize;
-            }
-        }
-        else
-        {
-            /* We choose the simple route and determine a suitable number of frames per buffer for one component of
-             * the stream, then we hope that this will work for the other component too (it should!).
-             */
-
-            unsigned maxPeriods = 0;
-            PaAlsaStreamComponent* first = &self->capture, * second = &self->playback;
-            const PaStreamParameters* firstStreamParams = inputParameters;
-            snd_pcm_hw_params_t* firstHwParams = hwParamsCapture, * secondHwParams = hwParamsPlayback;
-
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_get_periods_max( hwParamsPlayback, &maxPeriods, &dir ), paUnanticipatedHostError );
-            if( maxPeriods < numPeriods )
-            {
-                /* The playback component is trickier to get right, try that first */
-                first = &self->playback;
-                second = &self->capture;
-                firstStreamParams = outputParameters;
-                firstHwParams = hwParamsPlayback;
-                secondHwParams = hwParamsCapture;
-            }
-
-            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( first, firstStreamParams, framesPerUserBuffer,
-                        sampleRate, firstHwParams, &accurate ) );
-
-            second->framesPerBuffer = first->framesPerBuffer;
-            dir = 0;
-            ENSURE_( snd_pcm_hw_params_set_period_size_near( second->pcm, secondHwParams, &second->framesPerBuffer, &dir ),
-                    paUnanticipatedHostError );
-            if( self->capture.framesPerBuffer == self->playback.framesPerBuffer )
-            {
-                framesPerHostBuffer = self->capture.framesPerBuffer;
-            }
-            else
-            {
-                framesPerHostBuffer = PA_MAX( self->capture.framesPerBuffer, self->playback.framesPerBuffer );
-                *hostBufferSizeMode = paUtilBoundedHostBufferSize;
-            }
-        }
-    }
-    else    /* half-duplex is a slightly simpler case */
-    {
-        if( self->capture.pcm )
-        {
-            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( &self->capture, inputParameters, framesPerUserBuffer,
-                        sampleRate, hwParamsCapture, &accurate) );
-            framesPerHostBuffer = self->capture.framesPerBuffer;
-        }
-        else
-        {
-            assert( self->playback.pcm );
-            PA_ENSURE( PaAlsaStreamComponent_DetermineFramesPerBuffer( &self->playback, outputParameters, framesPerUserBuffer,
-                        sampleRate, hwParamsPlayback, &accurate ) );
-            framesPerHostBuffer = self->playback.framesPerBuffer;
-        }
-    }
-
-    PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
-    self->maxFramesPerHostBuffer = framesPerHostBuffer;
-
-    if( !accurate )
-    {
-        /* Don't know the exact size per host buffer */
-        *hostBufferSizeMode = paUtilBoundedHostBufferSize;
-        /* Raise upper bound */
-        ++self->maxFramesPerHostBuffer;
-    }
-
-error:
-    return result;
-}
-
-/** Set up ALSA stream parameters.
- *
- */
-static PaError PaAlsaStream_Configure( PaAlsaStream *self, const PaStreamParameters *inParams, const PaStreamParameters*
-        outParams, double sampleRate, unsigned long framesPerUserBuffer, double* inputLatency, double* outputLatency,
-        PaUtilHostBufferSizeMode* hostBufferSizeMode )
-{
-    PaError result = paNoError;
-    double realSr = sampleRate;
-    snd_pcm_hw_params_t* hwParamsCapture, * hwParamsPlayback;
-
-    snd_pcm_hw_params_alloca( &hwParamsCapture );
-    snd_pcm_hw_params_alloca( &hwParamsPlayback );
-
-    if( self->capture.pcm )
-        PA_ENSURE( PaAlsaStreamComponent_InitialConfigure( &self->capture, inParams, self->primeBuffers, hwParamsCapture,
-                    &realSr ) );
-    if( self->playback.pcm )
-        PA_ENSURE( PaAlsaStreamComponent_InitialConfigure( &self->playback, outParams, self->primeBuffers, hwParamsPlayback,
-                    &realSr ) );
-
-    PA_ENSURE( PaAlsaStream_DetermineFramesPerBuffer( self, realSr, inParams, outParams, framesPerUserBuffer,
-                hwParamsCapture, hwParamsPlayback, hostBufferSizeMode ) );
-
-    if( self->capture.pcm )
-    {
-        assert( self->capture.framesPerBuffer != 0 );
-        PA_ENSURE( PaAlsaStreamComponent_FinishConfigure( &self->capture, hwParamsCapture, inParams, self->primeBuffers, realSr,
-                    inputLatency ) );
-        PA_DEBUG(( "%s: Capture period size: %lu, latency: %f\n", __FUNCTION__, self->capture.framesPerBuffer, *inputLatency ));
-    }
-    if( self->playback.pcm )
-    {
-        assert( self->playback.framesPerBuffer != 0 );
-        PA_ENSURE( PaAlsaStreamComponent_FinishConfigure( &self->playback, hwParamsPlayback, outParams, self->primeBuffers, realSr,
-                    outputLatency ) );
-        PA_DEBUG(( "%s: Playback period size: %lu, latency: %f\n", __FUNCTION__, self->playback.framesPerBuffer, *outputLatency ));
-    }
-
-    /* Should be exact now */
-    self->streamRepresentation.streamInfo.sampleRate = realSr;
-
-    /* this will cause the two streams to automatically start/stop/prepare in sync.
-     * We only need to execute these operations on one of the pair.
-     * A: We don't want to do this on a blocking stream.
-     */
-    if( self->callbackMode && self->capture.pcm && self->playback.pcm )
-    {
-        int err = snd_pcm_link( self->capture.pcm, self->playback.pcm );
-        if( err == 0 )
-            self->pcmsSynced = 1;
-        else
-            PA_DEBUG(( "%s: Unable to sync pcms: %s\n", __FUNCTION__, snd_strerror( err ) ));
-    }
-
-    {
-        unsigned long minFramesPerHostBuffer = PA_MIN( self->capture.pcm ? self->capture.framesPerBuffer : ULONG_MAX,
-            self->playback.pcm ? self->playback.framesPerBuffer : ULONG_MAX );
-        self->pollTimeout = CalculatePollTimeout( self, minFramesPerHostBuffer );    /* Period in msecs, rounded up */
-
-        /* Time before watchdog unthrottles realtime thread == 1/4 of period time in msecs */
-        /* self->threading.throttledSleepTime = (unsigned long) (minFramesPerHostBuffer / sampleRate / 4 * 1000); */
-    }
-
-    if( self->callbackMode )
-    {
-        /* If the user expects a certain number of frames per callback we will either have to rely on block adaption
-         * (framesPerHostBuffer is not an integer multiple of framesPerBuffer) or we can simply align the number
-         * of host buffer frames with what the user specified */
-        if( self->framesPerUserBuffer != paFramesPerBufferUnspecified )
-        {
-            /* self->alignFrames = 1; */
-
-            /* Unless the ratio between number of host and user buffer frames is an integer we will have to rely
-             * on block adaption */
-        /*
-            if( framesPerHostBuffer % framesPerBuffer != 0 || (self->capture.pcm && self->playback.pcm &&
-                        self->capture.framesPerBuffer != self->playback.framesPerBuffer) )
-                self->useBlockAdaption = 1;
-            else
-                self->alignFrames = 1;
-        */
-        }
-    }
-
-error:
-    return result;
-}
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback* callback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaAlsaHostApiRepresentation *alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
-    PaAlsaStream *stream = NULL;
-    PaSampleFormat hostInputSampleFormat = 0, hostOutputSampleFormat = 0;
-    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
-    int numInputChannels = 0, numOutputChannels = 0;
-    PaTime inputLatency, outputLatency;
-    /* Operate with fixed host buffer size by default, since other modes will invariably lead to block adaption */
-    /* XXX: Use Bounded by default? Output tends to get stuttery with Fixed ... */
-    PaUtilHostBufferSizeMode hostBufferSizeMode = paUtilFixedHostBufferSize;
-
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag;
-
-    if( inputParameters )
-    {
-        PA_ENSURE( ValidateParameters( inputParameters, hostApi, StreamDirection_In ) );
-
-        numInputChannels = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-    }
-    if( outputParameters )
-    {
-        PA_ENSURE( ValidateParameters( outputParameters, hostApi, StreamDirection_Out ) );
-
-        numOutputChannels = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-    }
-
-    /* XXX: Why do we support this anyway? */
-    if( framesPerBuffer == paFramesPerBufferUnspecified && getenv( "PA_ALSA_PERIODSIZE" ) != NULL )
-    {
-        PA_DEBUG(( "%s: Getting framesPerBuffer from environment\n", __FUNCTION__ ));
-        framesPerBuffer = atoi( getenv("PA_ALSA_PERIODSIZE") );
-    }
-
-    PA_UNLESS( stream = (PaAlsaStream*)PaUtil_AllocateMemory( sizeof(PaAlsaStream) ), paInsufficientMemory );
-    PA_ENSURE( PaAlsaStream_Initialize( stream, alsaHostApi, inputParameters, outputParameters, sampleRate,
-                framesPerBuffer, callback, streamFlags, userData ) );
-
-    PA_ENSURE( PaAlsaStream_Configure( stream, inputParameters, outputParameters, sampleRate, framesPerBuffer,
-                &inputLatency, &outputLatency, &hostBufferSizeMode ) );
-    hostInputSampleFormat = stream->capture.hostSampleFormat;
-    hostOutputSampleFormat = stream->playback.hostSampleFormat;
-
-    PA_ENSURE( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                    numInputChannels, inputSampleFormat, hostInputSampleFormat,
-                    numOutputChannels, outputSampleFormat, hostOutputSampleFormat,
-                    sampleRate, streamFlags, framesPerBuffer, stream->maxFramesPerHostBuffer,
-                    hostBufferSizeMode, callback, userData ) );
-
-    /* Ok, buffer processor is initialized, now we can deduce it's latency */
-    if( numInputChannels > 0 )
-        stream->streamRepresentation.streamInfo.inputLatency = inputLatency + PaUtil_GetBufferProcessorInputLatency(
-                &stream->bufferProcessor );
-    if( numOutputChannels > 0 )
-        stream->streamRepresentation.streamInfo.outputLatency = outputLatency + PaUtil_GetBufferProcessorOutputLatency(
-                &stream->bufferProcessor );
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    if( stream )
-    {
-        PA_DEBUG(( "%s: Stream in error, terminating\n", __FUNCTION__ ));
-        PaAlsaStream_Terminate( stream );
-    }
-
-    return result;
-}
-
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-
-    PaAlsaStream_Terminate( stream );
-
-    return result;
-}
-
-static void SilenceBuffer( PaAlsaStream *stream )
-{
-    const snd_pcm_channel_area_t *areas;
-    snd_pcm_uframes_t frames = (snd_pcm_uframes_t)snd_pcm_avail_update( stream->playback.pcm ), offset;
-
-    snd_pcm_mmap_begin( stream->playback.pcm, &areas, &offset, &frames );
-    snd_pcm_areas_silence( areas, offset, stream->playback.numHostChannels, frames, stream->playback.nativeFormat );
-    snd_pcm_mmap_commit( stream->playback.pcm, offset, frames );
-}
-
-/** Start/prepare pcm(s) for streaming.
- *
- * Depending on wether the stream is in callback or blocking mode, we will respectively start or simply
- * prepare the playback pcm. If the buffer has _not_ been primed, we will in callback mode prepare and
- * silence the buffer before starting playback. In blocking mode we simply prepare, as the playback will
- * be started automatically as the user writes to output. 
- *
- * The capture pcm, however, will simply be prepared and started.
- */
-static PaError AlsaStart( PaAlsaStream *stream, int priming )
-{
-    PaError result = paNoError;
-
-    if( stream->playback.pcm )
-    {
-        if( stream->callbackMode )
-        {
-            if( !priming )
-            {
-                /* Buffer isn't primed, so prepare and silence */
-                ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
-                SilenceBuffer( stream );
-            }
-            ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
-        }
-        else
-            ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
-    }
-    if( stream->capture.pcm && !stream->pcmsSynced )
-    {
-        ENSURE_( snd_pcm_prepare( stream->capture.pcm ), paUnanticipatedHostError );
-        /* For a blocking stream we want to start capture as well, since nothing will happen otherwise */
-        ENSURE_( snd_pcm_start( stream->capture.pcm ), paUnanticipatedHostError );
-    }
-
-end:
-    return result;
-error:
-    goto end;
-}
-
-/** Utility function for determining if pcms are in running state.
- *
- */
-#if 0
-static int IsRunning( PaAlsaStream *stream )
-{
-    int result = 0;
-
-    PA_ENSURE( PaUnixMutex_Lock( &stream->stateMtx ) );
-    if( stream->capture.pcm )
-    {
-        snd_pcm_state_t capture_state = snd_pcm_state( stream->capture.pcm );
-
-        if( capture_state == SND_PCM_STATE_RUNNING || capture_state == SND_PCM_STATE_XRUN
-                || capture_state == SND_PCM_STATE_DRAINING )
-        {
-            result = 1;
-            goto end;
-        }
-    }
-
-    if( stream->playback.pcm )
-    {
-        snd_pcm_state_t playback_state = snd_pcm_state( stream->playback.pcm );
-
-        if( playback_state == SND_PCM_STATE_RUNNING || playback_state == SND_PCM_STATE_XRUN
-                || playback_state == SND_PCM_STATE_DRAINING )
-        {
-            result = 1;
-            goto end;
-        }
-    }
-
-end:
-    ASSERT_CALL_( PaUnixMutex_Unlock( &stream->stateMtx ), paNoError );
-    return result;
-error:
-    goto error;
-}
-#endif
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAlsaStream* stream = (PaAlsaStream*)s;
-    int streamStarted = 0;  /* So we can know wether we need to take the stream down */
-
-    /* Ready the processor */
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-
-    /* Set now, so we can test for activity further down */
-    stream->isActive = 1;
-
-    if( stream->callbackMode )
-    {
-        PA_ENSURE( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., stream->rtSched ) );
-    }
-    else
-    {
-        PA_ENSURE( AlsaStart( stream, 0 ) );
-        streamStarted = 1;
-    }
-
-end:
-    return result;
-error:
-    if( streamStarted )
-    {
-        AbortStream( stream );
-    }
-    stream->isActive = 0;
-    
-    goto end;
-}
-
-/** Stop PCM handle, either softly or abruptly.
- */
-static PaError AlsaStop( PaAlsaStream *stream, int abort )
-{
-    PaError result = paNoError;
-    /* XXX: snd_pcm_drain tends to lock up, avoid it until we find out more */
-    abort = 1;
-    /*
-    if( stream->capture.pcm && !strcmp( Pa_GetDeviceInfo( stream->capture.device )->name,
-                "dmix" ) )
-    {
-        abort = 1;
-    }
-    else if( stream->playback.pcm && !strcmp( Pa_GetDeviceInfo( stream->playback.device )->name,
-                "dmix" ) )
-    {
-        abort = 1;
-    }
-    */
-
-    if( abort )
-    {
-        if( stream->playback.pcm )
-        {
-            ENSURE_( snd_pcm_drop( stream->playback.pcm ), paUnanticipatedHostError );
-        }
-        if( stream->capture.pcm && !stream->pcmsSynced )
-        {
-            ENSURE_( snd_pcm_drop( stream->capture.pcm ), paUnanticipatedHostError );
-        }
-
-        PA_DEBUG(( "%s: Dropped frames\n", __FUNCTION__ ));
-    }
-    else
-    {
-        if( stream->playback.pcm )
-        {
-            ENSURE_( snd_pcm_nonblock( stream->playback.pcm, 0 ), paUnanticipatedHostError );
-            if( snd_pcm_drain( stream->playback.pcm ) < 0 )
-            {
-                PA_DEBUG(( "%s: Draining playback handle failed!\n", __FUNCTION__ ));
-            }
-        }
-        if( stream->capture.pcm && !stream->pcmsSynced )
-        {
-            /* We don't need to retrieve any remaining frames */
-            if( snd_pcm_drain( stream->capture.pcm ) < 0 )
-            {
-                PA_DEBUG(( "%s: Draining capture handle failed!\n", __FUNCTION__ ));
-            }
-        }
-    }
-
-end:
-    return result;
-error:
-    goto end;
-}
-
-/** Stop or abort stream.
- *
- * If a stream is in callback mode we will have to inspect wether the background thread has
- * finished, or we will have to take it out. In either case we join the thread before
- * returning. In blocking mode, we simply tell ALSA to stop abruptly (abort) or finish
- * buffers (drain)
- *
- * Stream will be considered inactive (!PaAlsaStream::isActive) after a call to this function
- */
-static PaError RealStop( PaAlsaStream *stream, int abort )
-{
-    PaError result = paNoError;
-
-    /* First deal with the callback thread, cancelling and/or joining
-     * it if necessary
-     */
-    if( stream->callbackMode )
-    {
-        PaError threadRes;
-        stream->callbackAbort = abort;
-
-        if( !abort )
-        {
-            PA_DEBUG(( "Stopping callback\n" ));
-        }
-        PA_ENSURE( PaUnixThread_Terminate( &stream->thread, !abort, &threadRes ) );
-        if( threadRes != paNoError )
-        {
-            PA_DEBUG(( "Callback thread returned: %d\n", threadRes ));
-        }
-#if 0
-        if( watchdogRes != paNoError )
-            PA_DEBUG(( "Watchdog thread returned: %d\n", watchdogRes ));
-#endif
-
-        stream->callback_finished = 0;
-    }
-    else
-    {
-        PA_ENSURE( AlsaStop( stream, abort ) );
-    }
-
-    stream->isActive = 0;
-
-end:
-    return result;
-
-error:
-    goto end;
-}
-
-static PaError StopStream( PaStream *s )
-{
-    return RealStop( (PaAlsaStream *) s, 0 );
-}
-
-static PaError AbortStream( PaStream *s )
-{
-    return RealStop( (PaAlsaStream * ) s, 1 );
-}
-
-/** The stream is considered stopped before StartStream, or AFTER a call to Abort/StopStream (callback
- * returning !paContinue is not considered)
- *
- */
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaAlsaStream *stream = (PaAlsaStream *)s;
-
-    /* callback_finished indicates we need to join callback thread (ie. in Abort/StopStream) */
-    return !IsStreamActive( s ) && !stream->callback_finished;
-}
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-    return stream->isActive;
-}
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-
-    snd_timestamp_t timestamp;
-    snd_pcm_status_t* status;
-    snd_pcm_status_alloca( &status );
-
-    /* TODO: what if we have both?  does it really matter? */
-
-    /* TODO: if running in callback mode, this will mean
-     * libasound routines are being called from multiple threads.
-     * need to verify that libasound is thread-safe. */
-
-    if( stream->capture.pcm )
-    {
-        snd_pcm_status( stream->capture.pcm, status );
-    }
-    else if( stream->playback.pcm )
-    {
-        snd_pcm_status( stream->playback.pcm, status );
-    }
-
-    snd_pcm_status_get_tstamp( status, &timestamp );
-    return timestamp.tv_sec + (PaTime)timestamp.tv_usec / 1e6;
-}
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-static int SetApproximateSampleRate( snd_pcm_t *pcm, snd_pcm_hw_params_t *hwParams, double sampleRate )
-{
-    unsigned long approx = (unsigned long) sampleRate;
-    int dir = 0;
-    double fraction = sampleRate - approx;
-
-    assert( pcm && hwParams );
-
-    if( fraction > 0.0 )
-    {
-        if( fraction > 0.5 )
-        {
-            ++approx;
-            dir = -1;
-        }
-        else
-            dir = 1;
-    }
-
-    return snd_pcm_hw_params_set_rate( pcm, hwParams, approx, dir );
-}
-
-/* Return exact sample rate in param sampleRate */
-static int GetExactSampleRate( snd_pcm_hw_params_t *hwParams, double *sampleRate )
-{
-    unsigned int num, den;
-    int err; 
-
-    assert( hwParams );
-
-    err = snd_pcm_hw_params_get_rate_numden( hwParams, &num, &den );
-    *sampleRate = (double) num / den;
-
-    return err;
-}
-
-/* Utility functions for blocking/callback interfaces */
-
-/* Atomic restart of stream (we don't want the intermediate state visible) */
-static PaError AlsaRestart( PaAlsaStream *stream )
-{
-    PaError result = paNoError;
-
-    PA_ENSURE( PaUnixMutex_Lock( &stream->stateMtx ) );
-    PA_ENSURE( AlsaStop( stream, 0 ) );
-    PA_ENSURE( AlsaStart( stream, 0 ) );
-
-    PA_DEBUG(( "%s: Restarted audio\n", __FUNCTION__ ));
-
-error:
-    PA_ENSURE( PaUnixMutex_Unlock( &stream->stateMtx ) );
-
-    return result;
-}
-
-/** Recover from xrun state.
- *
- */
-static PaError PaAlsaStream_HandleXrun( PaAlsaStream *self )
-{
-    PaError result = paNoError;
-    snd_pcm_status_t *st;
-    PaTime now = PaUtil_GetTime();
-    snd_timestamp_t t;
-
-    snd_pcm_status_alloca( &st );
-
-    if( self->playback.pcm )
-    {
-        snd_pcm_status( self->playback.pcm, st );
-        if( snd_pcm_status_get_state( st ) == SND_PCM_STATE_XRUN )
-        {
-            snd_pcm_status_get_trigger_tstamp( st, &t );
-            self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
-        }
-    }
-    if( self->capture.pcm )
-    {
-        snd_pcm_status( self->capture.pcm, st );
-        if( snd_pcm_status_get_state( st ) == SND_PCM_STATE_XRUN )
-        {
-            snd_pcm_status_get_trigger_tstamp( st, &t );
-            self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
-        }
-    }
-
-    PA_ENSURE( AlsaRestart( self ) );
-
-end:
-    return result;
-error:
-    goto end;
-}
-
-/** Decide if we should continue polling for specified direction, eventually adjust the poll timeout.
- * 
- */
-static PaError ContinuePoll( const PaAlsaStream *stream, StreamDirection streamDir, int *pollTimeout, int *continuePoll )
-{
-    PaError result = paNoError;
-    snd_pcm_sframes_t delay, margin;
-    int err;
-    const PaAlsaStreamComponent *component = NULL, *otherComponent = NULL;
-
-    *continuePoll = 1;
-
-    if( StreamDirection_In == streamDir )
-    {
-        component = &stream->capture;
-        otherComponent = &stream->playback;
-    }
-    else
-    {
-        component = &stream->playback;
-        otherComponent = &stream->capture;
-    }
-
-    /* ALSA docs say that negative delay should indicate xrun, but in my experience snd_pcm_delay returns -EPIPE */
-    if( (err = snd_pcm_delay( otherComponent->pcm, &delay )) < 0 )
-    {
-        if( err == -EPIPE )
-        {
-            /* Xrun */
-            *continuePoll = 0;
-            goto error;
-        }
-
-        ENSURE_( err, paUnanticipatedHostError );
-    }
-
-    if( StreamDirection_Out == streamDir )
-    {
-        /* Number of eligible frames before capture overrun */
-        delay = otherComponent->bufferSize - delay;
-    }
-    margin = delay - otherComponent->framesPerBuffer / 2;
-
-    if( margin < 0 )
-    {
-        PA_DEBUG(( "%s: Stopping poll for %s\n", __FUNCTION__, StreamDirection_In == streamDir ? "capture" : "playback" ));
-        *continuePoll = 0;
-    }
-    else if( margin < otherComponent->framesPerBuffer )
-    {
-        *pollTimeout = CalculatePollTimeout( stream, margin );
-        PA_DEBUG(( "%s: Trying to poll again for %s frames, pollTimeout: %d\n",
-                    __FUNCTION__, StreamDirection_In == streamDir ? "capture" : "playback", *pollTimeout ));
-    }
-
-error:
-    return result;
-}
-
-/* Callback interface */
-
-static void OnExit( void *data )
-{
-    PaAlsaStream *stream = (PaAlsaStream *) data;
-
-    assert( data );
-
-    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
-
-    stream->callback_finished = 1;  /* Let the outside world know stream was stopped in callback */
-    PA_DEBUG(( "%s: Stopping ALSA handles\n", __FUNCTION__ ));
-    AlsaStop( stream, stream->callbackAbort );
-    
-    PA_DEBUG(( "%s: Stoppage\n", __FUNCTION__ ));
-
-    /* Eventually notify user all buffers have played */
-    if( stream->streamRepresentation.streamFinishedCallback )
-    {
-        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-    stream->isActive = 0;
-}
-
-static void CalculateTimeInfo( PaAlsaStream *stream, PaStreamCallbackTimeInfo *timeInfo )
-{
-    snd_pcm_status_t *capture_status, *playback_status;
-    snd_timestamp_t capture_timestamp, playback_timestamp;
-    PaTime capture_time = 0., playback_time = 0.;
-
-    snd_pcm_status_alloca( &capture_status );
-    snd_pcm_status_alloca( &playback_status );
-
-    if( stream->capture.pcm )
-    {
-        snd_pcm_sframes_t capture_delay;
-
-        snd_pcm_status( stream->capture.pcm, capture_status );
-        snd_pcm_status_get_tstamp( capture_status, &capture_timestamp );
-
-        capture_time = capture_timestamp.tv_sec +
-            ((PaTime)capture_timestamp.tv_usec / 1000000.0);
-        timeInfo->currentTime = capture_time;
-
-        capture_delay = snd_pcm_status_get_delay( capture_status );
-        timeInfo->inputBufferAdcTime = timeInfo->currentTime -
-            (PaTime)capture_delay / stream->streamRepresentation.streamInfo.sampleRate;
-    }
-    if( stream->playback.pcm )
-    {
-        snd_pcm_sframes_t playback_delay;
-
-        snd_pcm_status( stream->playback.pcm, playback_status );
-        snd_pcm_status_get_tstamp( playback_status, &playback_timestamp );
-
-        playback_time = playback_timestamp.tv_sec +
-            ((PaTime)playback_timestamp.tv_usec / 1000000.0);
-
-        if( stream->capture.pcm ) /* Full duplex */
-        {
-            /* Hmm, we have both a playback and a capture timestamp.
-             * Hopefully they are the same... */
-            if( fabs( capture_time - playback_time ) > 0.01 )
-                PA_DEBUG(("Capture time and playback time differ by %f\n", fabs(capture_time-playback_time)));
-        }
-        else
-            timeInfo->currentTime = playback_time;
-
-        playback_delay = snd_pcm_status_get_delay( playback_status );
-        timeInfo->outputBufferDacTime = timeInfo->currentTime +
-            (PaTime)playback_delay / stream->streamRepresentation.streamInfo.sampleRate;
-    }
-}
-
-/** Called after buffer processing is finished.
- *
- * A number of mmapped frames is committed, it is possible that an xrun has occurred in the meantime.
- *
- * @param numFrames The number of frames that has been processed
- * @param xrun Return whether an xrun has occurred
- */
-static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
-{
-    PaError result = paNoError;
-    int res;
-
-    /* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
-     * afterwards
-     */
-    if( !self->ready )
-        goto end;
-
-    res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
-    if( res == -EPIPE || res == -ESTRPIPE )
-    {
-        *xrun = 1;
-    }
-    else
-    {
-        ENSURE_( res, paUnanticipatedHostError );
-    }
-
-end:
-error:
-    return result;
-}
-
-/* Extract buffer from channel area */
-static unsigned char *ExtractAddress( const snd_pcm_channel_area_t *area, snd_pcm_uframes_t offset )
-{
-    return (unsigned char *) area->addr + (area->first + offset * area->step) / 8;
-}
-
-/** Do necessary adaption between user and host channels.
- *
-    @concern ChannelAdaption Adapting between user and host channels can involve silencing unused channels and
-    duplicating mono information if host outputs come in pairs.
- */
-static PaError PaAlsaStreamComponent_DoChannelAdaption( PaAlsaStreamComponent *self, PaUtilBufferProcessor *bp, int numFrames )
-{
-    PaError result = paNoError;
-    unsigned char *p;
-    int i;
-    int unusedChans = self->numHostChannels - self->numUserChannels;
-    unsigned char *src, *dst;
-    int convertMono = (self->numHostChannels % 2) == 0 && (self->numUserChannels % 2) != 0;
-
-    assert( StreamDirection_Out == self->streamDir );
-
-    if( self->hostInterleaved )
-    {
-        int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
-        unsigned char *buffer = ExtractAddress( self->channelAreas, self->offset );
-
-        /* Start after the last user channel */
-        p = buffer + self->numUserChannels * swidth;
-
-        if( convertMono )
-        {
-            /* Convert the last user channel into stereo pair */
-            src = buffer + (self->numUserChannels - 1) * swidth;
-            for( i = 0; i < numFrames; ++i )
-            {
-                dst = src + swidth;
-                memcpy( dst, src, swidth );
-                src += self->numHostChannels * swidth;
-            }
-
-            /* Don't touch the channel we just wrote to */
-            p += swidth;
-            --unusedChans;
-        }
-
-        if( unusedChans > 0 )
-        {
-            /* Silence unused output channels */
-            for( i = 0; i < numFrames; ++i )
-            {
-                memset( p, 0, swidth * unusedChans );
-                p += self->numHostChannels * swidth;
-            }
-        }
-    }
-    else
-    {
-        /* We extract the last user channel */
-        if( convertMono )
-        {
-            ENSURE_( snd_pcm_area_copy( self->channelAreas + self->numUserChannels, self->offset, self->channelAreas +
-                    (self->numUserChannels - 1), self->offset, numFrames, self->nativeFormat ), paUnanticipatedHostError );
-            --unusedChans;
-        }
-        if( unusedChans > 0 )
-        {
-            snd_pcm_areas_silence( self->channelAreas + (self->numHostChannels - unusedChans), self->offset, unusedChans, numFrames,
-                    self->nativeFormat );
-        }
-    }
-
-error:
-    return result;
-}
-
-static PaError PaAlsaStream_EndProcessing( PaAlsaStream *self, unsigned long numFrames, int *xrunOccurred )
-{
-    PaError result = paNoError;
-    int xrun = 0;
-
-    if( self->capture.pcm )
-    {
-        PA_ENSURE( PaAlsaStreamComponent_EndProcessing( &self->capture, numFrames, &xrun ) );
-    }
-    if( self->playback.pcm )
-    {
-        if( self->playback.numHostChannels > self->playback.numUserChannels )
-        {
-            PA_ENSURE( PaAlsaStreamComponent_DoChannelAdaption( &self->playback, &self->bufferProcessor, numFrames ) );
-        }
-        PA_ENSURE( PaAlsaStreamComponent_EndProcessing( &self->playback, numFrames, &xrun ) );
-    }
-
-error:
-    *xrunOccurred = xrun;
-    return result;
-}
-
-/** Update the number of available frames.
- *
- */
-static PaError PaAlsaStreamComponent_GetAvailableFrames( PaAlsaStreamComponent *self, unsigned long *numFrames, int *xrunOccurred )
-{
-    PaError result = paNoError;
-    snd_pcm_sframes_t framesAvail = snd_pcm_avail_update( self->pcm );
-    *xrunOccurred = 0;
-
-    if( -EPIPE == framesAvail )
-    {
-        *xrunOccurred = 1;
-        framesAvail = 0;
-    }
-    else
-    {
-        ENSURE_( framesAvail, paUnanticipatedHostError );
-    }
-
-    *numFrames = framesAvail;
-
-error:
-    return result;
-}
-
-/** Fill in pollfd objects.
- */
-static PaError PaAlsaStreamComponent_BeginPolling( PaAlsaStreamComponent* self, struct pollfd* pfds )
-{
-    PaError result = paNoError;
-    int ret = snd_pcm_poll_descriptors( self->pcm, pfds, self->nfds );
-    (void)ret;  /* Prevent unused variable warning if asserts are turned off */
-    assert( ret == self->nfds );
-
-    self->ready = 0;
-
-    return result;
-}
-
-/** Examine results from poll().
- *
- * @param pfds pollfds to inspect
- * @param shouldPoll Should we continue to poll
- * @param xrun Has an xrun occurred
- */
-static PaError PaAlsaStreamComponent_EndPolling( PaAlsaStreamComponent* self, struct pollfd* pfds, int* shouldPoll, int* xrun )
-{
-    PaError result = paNoError;
-    unsigned short revents;
-
-    ENSURE_( snd_pcm_poll_descriptors_revents( self->pcm, pfds, self->nfds, &revents ), paUnanticipatedHostError );
-    if( revents != 0 )
-    {
-        if( revents & POLLERR )
-        {
-            *xrun = 1;
-        }
-        else
-            self->ready = 1;
-
-        *shouldPoll = 0;
-    }
-
-error:
-    return result;
-}
-
-/** Return the number of available frames for this stream.
- *
- * @concern FullDuplex The minimum available for the two directions is calculated, it might be desirable to ignore
- * one direction however (not marked ready from poll), so this is controlled by queryCapture and queryPlayback.
- *
- * @param queryCapture Check available for capture
- * @param queryPlayback Check available for playback
- * @param available The returned number of frames
- * @param xrunOccurred Return whether an xrun has occurred
- */
-static PaError PaAlsaStream_GetAvailableFrames( PaAlsaStream *self, int queryCapture, int queryPlayback, unsigned long
-        *available, int *xrunOccurred )
-{
-    PaError result = paNoError;
-    unsigned long captureFrames, playbackFrames;
-    *xrunOccurred = 0;
-
-    assert( queryCapture || queryPlayback );
-
-    if( queryCapture )
-    {
-        assert( self->capture.pcm );
-        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &self->capture, &captureFrames, xrunOccurred ) );
-        if( *xrunOccurred )
-        {
-            goto end;
-        }
-    }
-    if( queryPlayback )
-    {
-        assert( self->playback.pcm );
-        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &self->playback, &playbackFrames, xrunOccurred ) );
-        if( *xrunOccurred )
-        {
-            goto end;
-        }
-    }
-
-    if( queryCapture && queryPlayback )
-    {
-        *available = PA_MIN( captureFrames, playbackFrames );
-        /*PA_DEBUG(("capture: %lu, playback: %lu, combined: %lu\n", captureFrames, playbackFrames, *available));*/
-    }
-    else if( queryCapture )
-    {
-        *available = captureFrames;
-    }
-    else
-    {
-        *available = playbackFrames;
-    }
-
-end:
-error:
-    return result;
-}
-
-/** Wait for and report available buffer space from ALSA.
- *
- * Unless ALSA reports a minimum of frames available for I/O, we poll the ALSA filedescriptors for more.
- * Both of these operations can uncover xrun conditions.
- *
- * @concern Xruns Both polling and querying available frames can report an xrun condition.
- *
- * @param framesAvail Return the number of available frames
- * @param xrunOccurred Return whether an xrun has occurred
- */ 
-static PaError PaAlsaStream_WaitForFrames( PaAlsaStream *self, unsigned long *framesAvail, int *xrunOccurred )
-{
-    PaError result = paNoError;
-    int pollPlayback = self->playback.pcm != NULL, pollCapture = self->capture.pcm != NULL;
-    int pollTimeout = self->pollTimeout;
-    int xrun = 0;
-
-    assert( self );
-    assert( framesAvail );
-
-    if( !self->callbackMode )
-    {
-        /* In blocking mode we will only wait if necessary */
-        PA_ENSURE( PaAlsaStream_GetAvailableFrames( self, self->capture.pcm != NULL, self->playback.pcm != NULL,
-                    framesAvail, &xrun ) );
-        if( xrun )
-        {
-            goto end;
-        }
-
-        if( *framesAvail > 0 )
-        {
-            /* Mark pcms ready from poll */
-            if( self->capture.pcm )
-                self->capture.ready = 1;
-            if( self->playback.pcm )
-                self->playback.ready = 1;
-
-            goto end;
-        }
-    }
-
-    while( pollPlayback || pollCapture )
-    {
-        int totalFds = 0;
-        struct pollfd *capturePfds = NULL, *playbackPfds = NULL;
-
-        pthread_testcancel();
-
-        if( pollCapture )
-        {
-            capturePfds = self->pfds;
-            PA_ENSURE( PaAlsaStreamComponent_BeginPolling( &self->capture, capturePfds ) );
-            totalFds += self->capture.nfds;
-        }
-        if( pollPlayback )
-        {
-            playbackPfds = self->pfds + (self->capture.pcm ? self->capture.nfds : 0);
-            PA_ENSURE( PaAlsaStreamComponent_BeginPolling( &self->playback, playbackPfds ) );
-            totalFds += self->playback.nfds;
-        }
-        
-        if( poll( self->pfds, totalFds, pollTimeout ) < 0 )
-        {
-            /*  XXX: Depend on preprocessor condition? */
-            if( errno == EINTR )
-            {
-                /* gdb */
-                continue;
-            }
-
-            /* TODO: Add macro for checking system calls */
-            PA_ENSURE( paInternalError );
-        }
-
-        /* check the return status of our pfds */
-        if( pollCapture )
-        {
-            PA_ENSURE( PaAlsaStreamComponent_EndPolling( &self->capture, capturePfds, &pollCapture, &xrun ) );
-        }
-        if( pollPlayback )
-        {
-            PA_ENSURE( PaAlsaStreamComponent_EndPolling( &self->playback, playbackPfds, &pollPlayback, &xrun ) );
-        }
-        if( xrun )
-        {
-            break;
-        }
-
-        /* @concern FullDuplex If only one of two pcms is ready we may want to compromise between the two.
-         * If there is less than half a period's worth of samples left of frames in the other pcm's buffer we will
-         * stop polling.
-         */
-        if( self->capture.pcm && self->playback.pcm )
-        {
-            if( pollCapture && !pollPlayback )
-            {
-                PA_ENSURE( ContinuePoll( self, StreamDirection_In, &pollTimeout, &pollCapture ) );
-            }
-            else if( pollPlayback && !pollCapture )
-            {
-                PA_ENSURE( ContinuePoll( self, StreamDirection_Out, &pollTimeout, &pollPlayback ) );
-            }
-        }
-    }
-
-    if( !xrun )
-    {
-        /* Get the number of available frames for the pcms that are marked ready.
-         * @concern FullDuplex If only one direction is marked ready (from poll), the number of frames available for
-         * the other direction is returned. Output is normally preferred over capture however, so capture frames may be
-         * discarded to avoid overrun unless paNeverDropInput is specified.
-         */
-        int captureReady = self->capture.pcm ? self->capture.ready : 0,
-            playbackReady = self->playback.pcm ? self->playback.ready : 0;
-        PA_ENSURE( PaAlsaStream_GetAvailableFrames( self, captureReady, playbackReady, framesAvail, &xrun ) );
-
-        if( self->capture.pcm && self->playback.pcm )
-        {
-            if( !self->playback.ready && !self->neverDropInput )
-            {
-                /* Drop input, a period's worth */
-                assert( self->capture.ready );
-                PaAlsaStreamComponent_EndProcessing( &self->capture, PA_MIN( self->capture.framesPerBuffer,
-                            *framesAvail ), &xrun );
-                *framesAvail = 0;
-                self->capture.ready = 0;
-            }
-        }
-        else if( self->capture.pcm )
-            assert( self->capture.ready );
-        else
-            assert( self->playback.ready );
-    }
-
-end:
-error:
-    if( xrun )
-    {
-        /* Recover from the xrun state */
-        PA_ENSURE( PaAlsaStream_HandleXrun( self ) );
-        *framesAvail = 0;
-    }
-    else
-    {
-        if( 0 != *framesAvail )
-        {
-            /* If we're reporting frames eligible for processing, one of the handles better be ready */
-            PA_UNLESS( self->capture.ready || self->playback.ready, paInternalError );
-        }
-    }
-    *xrunOccurred = xrun;
-
-    return result;
-}
-
-/** Register per-channel ALSA buffer information with buffer processor.
- *
- * Mmapped buffer space is acquired from ALSA, and registered with the buffer processor. Differences between the
- * number of host and user channels is taken into account.
- * 
- * @param numFrames On entrance the number of requested frames, on exit the number of contiguously accessible frames.
- */
-static PaError PaAlsaStreamComponent_RegisterChannels( PaAlsaStreamComponent* self, PaUtilBufferProcessor* bp,
-        unsigned long* numFrames, int* xrun )
-{
-    PaError result = paNoError;
-    const snd_pcm_channel_area_t *areas, *area;
-    void (*setChannel)(PaUtilBufferProcessor *, unsigned int, void *, unsigned int) =
-        StreamDirection_In == self->streamDir ? PaUtil_SetInputChannel : PaUtil_SetOutputChannel;
-    unsigned char *buffer, *p;
-    int i;
-    unsigned long framesAvail;
-
-    /* This _must_ be called before mmap_begin */
-    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( self, &framesAvail, xrun ) );
-    if( *xrun )
-    {
-        *numFrames = 0;
-        goto end;
-    }
-
-    ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
-
-    if( self->hostInterleaved )
-    {
-        int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
-
-        p = buffer = ExtractAddress( areas, self->offset );
-        for( i = 0; i < self->numUserChannels; ++i )
-        {
-            /* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
-            setChannel( bp, i, p, self->numHostChannels );
-            p += swidth;
-        }
-    }
-    else
-    {
-        for( i = 0; i < self->numUserChannels; ++i )
-        {
-            area = areas + i;
-            buffer = ExtractAddress( area, self->offset );
-            setChannel( bp, i, buffer, 1 );
-        }
-    }
-
-    /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
-    self->channelAreas = (snd_pcm_channel_area_t *)areas;
-
-end:
-error:
-    return result;
-}
-
-/** Initiate buffer processing.
- *
- * ALSA buffers are registered with the PA buffer processor and the buffer size (in frames) set.
- *
- * @concern FullDuplex If both directions are being processed, the minimum amount of frames for the two directions is
- * calculated.
- *
- * @param numFrames On entrance the number of available frames, on exit the number of received frames
- * @param xrunOccurred Return whether an xrun has occurred
- */
-static PaError PaAlsaStream_SetUpBuffers( PaAlsaStream* self, unsigned long* numFrames, int* xrunOccurred )
-{
-    PaError result = paNoError;
-    unsigned long captureFrames = ULONG_MAX, playbackFrames = ULONG_MAX, commonFrames = 0;
-    int xrun = 0;
-
-    if( *xrunOccurred )
-    {
-        *numFrames = 0;
-        return result;
-    }
-    /* If we got here at least one of the pcm's should be marked ready */
-    PA_UNLESS( self->capture.ready || self->playback.ready, paInternalError );
-
-    /* Extract per-channel ALSA buffer pointers and register them with the buffer processor.
-     * It is possible that a direction is not marked ready however, because it is out of sync with the other.
-     */
-    if( self->capture.pcm && self->capture.ready )
-    {
-        captureFrames = *numFrames;
-        PA_ENSURE( PaAlsaStreamComponent_RegisterChannels( &self->capture, &self->bufferProcessor, &captureFrames, 
-                    &xrun ) );
-    }
-    if( self->playback.pcm && self->playback.ready )
-    {
-        playbackFrames = *numFrames;
-        PA_ENSURE( PaAlsaStreamComponent_RegisterChannels( &self->playback, &self->bufferProcessor, &playbackFrames, 
-                    &xrun ) );
-    }
-    if( xrun )
-    {
-        /* Nothing more to do */
-        assert( 0 == commonFrames );
-        goto end;
-    }
-
-    commonFrames = PA_MIN( captureFrames, playbackFrames );
-    /* assert( commonFrames <= *numFrames ); */
-    if( commonFrames > *numFrames )
-    {
-        /* Hmmm ... how come there are more frames available than we requested!? Blah. */
-        PA_DEBUG(( "%s: Common available frames are reported to be more than number requested: %lu, %lu, callbackMode: %d\n", __FUNCTION__,
-                    commonFrames, *numFrames, self->callbackMode ));
-        if( self->capture.pcm )
-        {
-            PA_DEBUG(( "%s: captureFrames: %lu, capture.ready: %d\n", __FUNCTION__, captureFrames, self->capture.ready ));
-        }
-        if( self->playback.pcm )
-        {
-            PA_DEBUG(( "%s: playbackFrames: %lu, playback.ready: %d\n", __FUNCTION__, playbackFrames, self->playback.ready ));
-        }
-        
-        commonFrames = 0;
-        goto end;
-    }
-
-    /* Inform PortAudio of the number of frames we got.
-     * @concern FullDuplex We might be experiencing underflow in either end; if its an input underflow, we go on
-     * with output. If its output underflow however, depending on the paNeverDropInput flag, we may want to simply
-     * discard the excess input or call the callback with paOutputOverflow flagged.
-     */
-    if( self->capture.pcm )
-    {
-        if( self->capture.ready )
-        {
-            PaUtil_SetInputFrameCount( &self->bufferProcessor, commonFrames );
-        }
-        else
-        {
-            /* We have input underflow */
-            PaUtil_SetNoInput( &self->bufferProcessor );
-        }
-    }
-    if( self->playback.pcm )
-    {
-        if( self->playback.ready )
-        {
-            PaUtil_SetOutputFrameCount( &self->bufferProcessor, commonFrames );
-        }
-        else
-        {
-            /* We have output underflow, but keeping input data (paNeverDropInput) */
-            assert( self->neverDropInput );
-            assert( self->capture.pcm != NULL );
-            PA_DEBUG(( "%s: Setting output buffers to NULL\n", __FUNCTION__ ));
-            PaUtil_SetNoOutput( &self->bufferProcessor );
-        }
-    }
-    
-end:
-    *numFrames = commonFrames;
-error:
-    if( xrun )
-    {
-        PA_ENSURE( PaAlsaStream_HandleXrun( self ) );
-        *numFrames = 0;
-    }
-    *xrunOccurred = xrun;
-
-    return result;
-}
-
-/** Callback thread's function.
- *
- * Roughly, the workflow can be described in the following way: The number of available frames that can be processed
- * directly is obtained from ALSA, we then request as much directly accessible memory as possible within this amount
- * from ALSA. The buffer memory is registered with the PA buffer processor and processing is carried out with
- * PaUtil_EndBufferProcessing. Finally, the number of processed frames is reported to ALSA. The processing can
- * happen in several iterations untill we have consumed the known number of available frames (or an xrun is detected).
- */
-static void *CallbackThreadFunc( void *userData )
-{
-    PaError result = paNoError;
-    PaAlsaStream *stream = (PaAlsaStream*) userData;
-    PaStreamCallbackTimeInfo timeInfo = {0, 0, 0};
-    snd_pcm_sframes_t startThreshold = 0;
-    int callbackResult = paContinue;
-    PaStreamCallbackFlags cbFlags = 0;  /* We might want to keep state across iterations */
-    int streamStarted = 0;
-
-    assert( stream );
-
-    /* Execute OnExit when exiting */
-    pthread_cleanup_push( &OnExit, stream );
-
-    /* Not implemented */
-    assert( !stream->primeBuffers );
-
-    /* @concern StreamStart If the output is being primed the output pcm needs to be prepared, otherwise the
-     * stream is started immediately. The latter involves signaling the waiting main thread.
-     */
-    if( stream->primeBuffers )
-    {
-        snd_pcm_sframes_t avail;
-        
-        if( stream->playback.pcm )
-            ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
-        if( stream->capture.pcm && !stream->pcmsSynced )
-            ENSURE_( snd_pcm_prepare( stream->capture.pcm ), paUnanticipatedHostError );
-
-        /* We can't be certain that the whole ring buffer is available for priming, but there should be
-         * at least one period */
-        avail = snd_pcm_avail_update( stream->playback.pcm );
-        startThreshold = avail - (avail % stream->playback.framesPerBuffer);
-        assert( startThreshold >= stream->playback.framesPerBuffer );
-    }
-    else
-    {
-        PA_ENSURE( PaUnixThread_PrepareNotify( &stream->thread ) );
-        /* Buffer will be zeroed */
-        PA_ENSURE( AlsaStart( stream, 0 ) );
-        PA_ENSURE( PaUnixThread_NotifyParent( &stream->thread ) );
-
-        streamStarted = 1;
-    }
-
-    while( 1 )
-    {
-        unsigned long framesAvail, framesGot;
-        int xrun = 0;
-
-        pthread_testcancel();
-
-        /* @concern StreamStop if the main thread has requested a stop and the stream has not been effectively
-         * stopped we signal this condition by modifying callbackResult (we'll want to flush buffered output).
-         */
-        if( PaUnixThread_StopRequested( &stream->thread ) && paContinue == callbackResult )
-        {
-            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
-            callbackResult = paComplete;
-        }
-
-        if( paContinue != callbackResult )
-        {
-            stream->callbackAbort = (paAbort == callbackResult);
-            if( stream->callbackAbort ||
-                    /** @concern BlockAdaption: Go on if adaption buffers are empty */
-                    PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) ) 
-            {
-                goto end;
-            }
-
-            PA_DEBUG(( "%s: Flushing buffer processor\n", __FUNCTION__ ));
-            /* There is still buffered output that needs to be processed */
-        }
-
-        /* Wait for data to become available, this comes down to polling the ALSA file descriptors untill we have
-         * a number of available frames.
-         */
-        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
-        if( xrun )
-        {
-            assert( 0 == framesAvail );
-            continue;
-
-            /* XXX: Report xruns to the user? A situation is conceivable where the callback is never invoked due
-             * to constant xruns, it might be desirable to notify the user of this.
-             */
-        }
-
-        /* Consume buffer space. Once we have a number of frames available for consumption we must retrieve the
-         * mmapped buffers from ALSA, this is contiguously accessible memory however, so we may receive smaller
-         * portions at a time than is available as a whole. Therefore we should be prepared to process several
-         * chunks successively. The buffers are passed to the PA buffer processor.
-         */
-        while( framesAvail > 0 )
-        {
-            xrun = 0;
-
-            pthread_testcancel();
-
-            /** @concern Xruns Under/overflows are to be reported to the callback */
-            if( stream->underrun > 0.0 )
-            {
-                cbFlags |= paOutputUnderflow;
-                stream->underrun = 0.0;
-            }
-            if( stream->overrun > 0.0 )
-            {
-                cbFlags |= paInputOverflow;
-                stream->overrun = 0.0;
-            }
-            if( stream->capture.pcm && stream->playback.pcm )
-            {
-                /** @concern FullDuplex It's possible that only one direction is being processed to avoid an
-                 * under- or overflow, this should be reported correspondingly */
-                if( !stream->capture.ready )
-                {
-                    cbFlags |= paInputUnderflow;
-                    PA_DEBUG(( "%s: Input underflow\n", __FUNCTION__ ));
-                }
-                else if( !stream->playback.ready )
-                {
-                    cbFlags |= paOutputOverflow;
-                    PA_DEBUG(( "%s: Output overflow\n", __FUNCTION__ ));
-                }
-            }
-
-#if 0
-            CallbackUpdate( &stream->threading );
-#endif
-            CalculateTimeInfo( stream, &timeInfo );
-            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, cbFlags );
-            cbFlags = 0;
-
-            /* CPU load measurement should include processing activivity external to the stream callback */
-            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-            framesGot = framesAvail;
-            if( paUtilFixedHostBufferSize == stream->bufferProcessor.hostBufferSizeMode )
-            {
-                /* We've committed to a fixed host buffer size, stick to that */
-                framesGot = framesGot >= stream->maxFramesPerHostBuffer ? stream->maxFramesPerHostBuffer : 0;
-            }
-            else
-            {
-                /* We've committed to an upper bound on the size of host buffers */
-                assert( paUtilBoundedHostBufferSize == stream->bufferProcessor.hostBufferSizeMode );
-                framesGot = PA_MIN( framesGot, stream->maxFramesPerHostBuffer );
-            }
-            PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
-            /* Check the host buffer size against the buffer processor configuration */
-            framesAvail -= framesGot;
-
-            if( framesGot > 0 )
-            {
-                assert( !xrun );
-                PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-                PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
-            }
-            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesGot );
-
-            if( 0 == framesGot )
-            {
-                /* Go back to polling for more frames */
-                break;
-
-            }
-
-            if( paContinue != callbackResult )
-                break;
-        }
-    }
-
-    /* Match pthread_cleanup_push */
-    pthread_cleanup_pop( 1 );
-
-end:
-    PA_DEBUG(( "%s: Thread %d exiting\n ", __FUNCTION__, pthread_self() ));
-    PaUnixThreading_EXIT( result );
-error:
-    goto end;
-}
-
-/* Blocking interface */
-
-static PaError ReadStream( PaStream* s, void *buffer, unsigned long frames )
-{
-    PaError result = paNoError;
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-    unsigned long framesGot, framesAvail;
-    void *userBuffer;
-    snd_pcm_t *save = stream->playback.pcm;
-
-    assert( stream );
-
-    PA_UNLESS( stream->capture.pcm, paCanNotReadFromAnOutputOnlyStream );
-
-    /* Disregard playback */
-    stream->playback.pcm = NULL;
-
-    if( stream->overrun > 0. )
-    {
-        result = paInputOverflowed;
-        stream->overrun = 0.0;
-    }
-
-    if( stream->capture.userInterleaved )
-    {
-        userBuffer = buffer;
-    }
-    else
-    {
-        /* Copy channels into local array */
-        userBuffer = stream->capture.userBuffers;
-        memcpy( userBuffer, buffer, sizeof (void *) * stream->capture.numUserChannels );
-    }
-
-    /* Start stream if in prepared state */
-    if( snd_pcm_state( stream->capture.pcm ) == SND_PCM_STATE_PREPARED )
-    {
-        ENSURE_( snd_pcm_start( stream->capture.pcm ), paUnanticipatedHostError );
-    }
-
-    while( frames > 0 )
-    {
-        int xrun = 0;
-        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
-        framesGot = PA_MIN( framesAvail, frames );
-
-        PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
-        if( framesGot > 0 )
-        {
-            framesGot = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesGot );
-            PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
-            frames -= framesGot;
-        }
-    }
-
-end:
-    stream->playback.pcm = save;
-    return result;
-error:
-    goto end;
-}
-
-static PaError WriteStream( PaStream* s, const void *buffer, unsigned long frames )
-{
-    PaError result = paNoError;
-    signed long err;
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-    snd_pcm_uframes_t framesGot, framesAvail;
-    const void *userBuffer;
-    snd_pcm_t *save = stream->capture.pcm;
-    
-    assert( stream );
-
-    PA_UNLESS( stream->playback.pcm, paCanNotWriteToAnInputOnlyStream );
-
-    /* Disregard capture */
-    stream->capture.pcm = NULL;
-
-    if( stream->underrun > 0. )
-    {
-        result = paOutputUnderflowed;
-        stream->underrun = 0.0;
-    }
-
-    if( stream->playback.userInterleaved )
-        userBuffer = buffer;
-    else /* Copy channels into local array */
-    {
-        userBuffer = stream->playback.userBuffers;
-        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->playback.numUserChannels );
-    }
-
-    while( frames > 0 )
-    {
-        int xrun = 0;
-        snd_pcm_uframes_t hwAvail;
-
-        PA_ENSURE( PaAlsaStream_WaitForFrames( stream, &framesAvail, &xrun ) );
-        framesGot = PA_MIN( framesAvail, frames );
-
-        PA_ENSURE( PaAlsaStream_SetUpBuffers( stream, &framesGot, &xrun ) );
-        if( framesGot > 0 )
-        {
-            framesGot = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, framesGot );
-            PA_ENSURE( PaAlsaStream_EndProcessing( stream, framesGot, &xrun ) );
-            frames -= framesGot;
-        }
-
-        /* Start stream after one period of samples worth */
-
-        /* Frames residing in buffer */
-        PA_ENSURE( err = GetStreamWriteAvailable( stream ) );
-        framesAvail = err;
-        hwAvail = stream->playback.bufferSize - framesAvail;
-
-        if( snd_pcm_state( stream->playback.pcm ) == SND_PCM_STATE_PREPARED &&
-                hwAvail >= stream->playback.framesPerBuffer )
-        {
-            ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
-        }
-    }
-
-end:
-    stream->capture.pcm = save;
-    return result;
-error:
-    goto end;
-}
-
-/* Return frames available for reading. In the event of an overflow, the capture pcm will be restarted */
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaError result = paNoError;
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-    unsigned long avail;
-    int xrun;
-
-    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->capture, &avail, &xrun ) );
-    if( xrun )
-    {
-        PA_ENSURE( PaAlsaStream_HandleXrun( stream ) );
-        PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->capture, &avail, &xrun ) );
-        if( xrun )
-            PA_ENSURE( paInputOverflowed );
-    }
-
-    return (signed long)avail;
-
-error:
-    return result;
-}
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaError result = paNoError;
-    PaAlsaStream *stream = (PaAlsaStream*)s;
-    unsigned long avail;
-    int xrun;
-
-    PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->playback, &avail, &xrun ) );
-    if( xrun )
-    {
-        snd_pcm_sframes_t savail;
-
-        PA_ENSURE( PaAlsaStream_HandleXrun( stream ) );
-        savail = snd_pcm_avail_update( stream->playback.pcm );
-
-        /* savail should not contain -EPIPE now, since PaAlsaStream_HandleXrun will only prepare the pcm */
-        ENSURE_( savail, paUnanticipatedHostError );
-
-        avail = (unsigned long) savail;
-    }
-
-    return (signed long)avail;
-
-error:
-    return result;
-}
-
-/* Extensions */
-
-void PaAlsa_InitializeStreamInfo( PaAlsaStreamInfo *info )
-{
-    info->size = sizeof (PaAlsaStreamInfo);
-    info->hostApiType = paALSA;
-    info->version = 1;
-    info->deviceString = NULL;
-}
-
-void PaAlsa_EnableRealtimeScheduling( PaStream *s, int enable )
-{
-    PaAlsaStream *stream = (PaAlsaStream *) s;
-    stream->rtSched = enable;
-}
-
-#if 0
-void PaAlsa_EnableWatchdog( PaStream *s, int enable )
-{
-    PaAlsaStream *stream = (PaAlsaStream *) s;
-    stream->thread.useWatchdog = enable;
-}
-#endif
-
-PaError PaAlsa_GetStreamInputCard(PaStream* s, int* card) {
-    PaAlsaStream *stream = (PaAlsaStream *) s;
-    snd_pcm_info_t* pcmInfo;
-    PaError result = paNoError;
-
-    /* XXX: More descriptive error? */
-    PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
-
-    snd_pcm_info_alloca( &pcmInfo );
-    PA_ENSURE( snd_pcm_info( stream->capture.pcm, pcmInfo ) );
-    *card = snd_pcm_info_get_card( pcmInfo );
-
-error:
-    return result;
-}
-
-PaError PaAlsa_GetStreamOutputCard(PaStream* s, int* card) {
-    PaAlsaStream *stream = (PaAlsaStream *) s;
-    snd_pcm_info_t* pcmInfo;
-    PaError result = paNoError;
-
-    /* XXX: More descriptive error? */
-    PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
-
-    snd_pcm_info_alloca( &pcmInfo );
-    PA_ENSURE( snd_pcm_info( stream->playback.pcm, pcmInfo ) );
-    *card = snd_pcm_info_get_card( pcmInfo );
-
-error:
-    return result;
-}
diff --git a/libs/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/libs/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
deleted file mode 100644
index e969d693aa..0000000000
--- a/libs/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
+++ /dev/null
@@ -1,2910 +0,0 @@
-/*
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * PortAudio v18 version of AudioScience HPI driver by Fred Gleason <fredg@salemradiolabs.com>
- * PortAudio v19 version of AudioScience HPI driver by Ludwig Schwardt <schwardt@sun.ac.za>
- *
- * Copyright (c) 2003 Fred Gleason
- * Copyright (c) 2005,2006 Ludwig Schwardt
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/*
- * Modification History
- * 12/2003 - Initial version
- * 09/2005 - v19 version [rewrite]
- */
-
-/** @file
- @ingroup hostapi_src
- @brief Host API implementation supporting AudioScience cards
-        via the Linux HPI interface.
-
- <h3>Overview</h3>
-
- This is a PortAudio implementation for the AudioScience HPI Audio API
- on the Linux platform. AudioScience makes a range of audio adapters customised
- for the broadcasting industry, with support for both Windows and Linux.
- More information on their products can be found on their website:
-
-     http://www.audioscience.com
-
- Documentation for the HPI API can be found at:
-
-     http://www.audioscience.com/internet/download/sdk/spchpi.pdf
-
- The Linux HPI driver itself (a kernel module + library) can be downloaded from:
-
-     http://www.audioscience.com/internet/download/linux_drivers.htm
-
- <h3>Implementation strategy</h3>
-
- *Note* Ideally, AudioScience cards should be handled by the PortAudio ALSA
- implementation on Linux, as ALSA is the preferred Linux soundcard API. The existence
- of this host API implementation might therefore seem a bit flawed. Unfortunately, at
- the time of the creation of this implementation (June 2006), the PA ALSA implementation
- could not make use of the existing AudioScience ALSA driver. PA ALSA uses the
- "memory-mapped" (mmap) ALSA access mode to interact with the ALSA library, while the
- AudioScience ALSA driver only supports the "read-write" access mode. The appropriate
- solution to this problem is to add "read-write" support to PortAudio ALSA, thereby
- extending the range of soundcards it supports (AudioScience cards are not the only
- ones with this problem). Given the author's limited knowledge of ALSA and the
- simplicity of the HPI API, the second-best solution was born...
-
- The following mapping between HPI and PA was followed:
- HPI subsystem => PortAudio host API
- HPI adapter => nothing specific
- HPI stream => PortAudio device
-
- Each HPI stream is either input or output (not both), and can support
- different channel counts, sampling rates and sample formats. It is therefore
- a more natural fit to a PA device. A PA stream can therefore combine two
- HPI streams (one input and one output) into a "full-duplex" stream. These
- HPI streams can even be on different physical adapters. The two streams ought to be
- sample-synchronised when they reside on the same adapter, as most AudioScience adapters
- derive their ADC and DAC clocks from one master clock. When combining two adapters
- into one full-duplex stream, however, the use of a word clock connection between the
- adapters is strongly recommended.
-
- The HPI interface is inherently blocking, making use of read and write calls to
- transfer data between user buffers and driver buffers. The callback interface therefore
- requires a helper thread ("callback engine") which periodically transfers data (one thread
- per PA stream, in fact). The current implementation explicitly sleeps via Pa_Sleep() until
- enough samples can be transferred (select() or poll() would be better, but currently seems
- impossible...). The thread implementation makes use of the Unix thread helper functions
- and some pthread calls here and there. If a unified PA thread exists, this host API
- implementation might also compile on Windows, as this is the only real Linux-specific
- part of the code.
-
- There is no inherent fixed buffer size in the HPI interface, as in some other host APIs.
- The PortAudio implementation contains a buffer that is allocated during OpenStream and
- used to transfer data between the callback and the HPI driver buffer. The size of this
- buffer is quite flexible and is derived from latency suggestions and matched to the
- requested callback buffer size as far as possible. It can become quite huge, as the
- AudioScience cards are typically geared towards higher-latency applications and contain
- large hardware buffers.
-
- The HPI interface natively supports most common sample formats and sample rates (some
- conversion is done on the adapter itself).
-
- Stream time is measured based on the number of processed frames, which is adjusted by the
- number of frames currently buffered by the HPI driver.
-
- There is basic support for detecting overflow and underflow. The HPI interface does not
- explicitly indicate this, so thresholds on buffer levels are used in combination with
- stream state. Recovery from overflow and underflow is left to the PA client.
-
- Blocking streams are also implemented. It makes use of the same polling routines that
- the callback interface uses, in order to prevent the allocation of variable-sized
- buffers during reading and writing. The framesPerBuffer parameter is therefore still
- relevant, and this can be increased in the blocking case to improve efficiency.
-
- The implementation contains extensive reporting macros (slightly modified PA_ENSURE and
- PA_UNLESS versions) and a useful stream dump routine to provide debugging feedback.
-
- Output buffer priming via the user callback (i.e. paPrimeOutputBuffersUsingStreamCallback
- and friends) is not implemented yet. All output is primed with silence.
-
- Please send bug reports etc. to Ludwig Schwardt <schwardt@sun.ac.za>
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>          /* strlen() */
-#include <pthread.h>         /* pthreads and friends */
-#include <assert.h>          /* assert */
-#include <math.h>            /* ceil, floor */
-
-#include <asihpi/hpi.h>      /* HPI API */
-
-#include "portaudio.h"       /* PortAudio API */
-#include "pa_util.h"         /* PA_DEBUG, other small utilities */
-#include "pa_unix_util.h"    /* Unix threading utilities */
-#include "pa_allocation.h"   /* Group memory allocation */
-#include "pa_hostapi.h"      /* Host API structs */
-#include "pa_stream.h"       /* Stream interface structs */
-#include "pa_cpuload.h"      /* CPU load measurer */
-#include "pa_process.h"      /* Buffer processor */
-#include "pa_converters.h"   /* PaUtilZeroer */
-#include "pa_debugprint.h"
-
-/* -------------------------------------------------------------------------- */
-
-/*
- * Defines
- */
-
-/* Error reporting and assertions */
-
-/** Evaluate expression, and return on any PortAudio errors */
-#define PA_ENSURE_(expr) \
-    do { \
-        PaError paError = (expr); \
-        if( UNLIKELY( paError < paNoError ) ) \
-        { \
-            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = paError; \
-            goto error; \
-        } \
-    } while (0);
-
-/** Assert expression, else return the provided PaError */
-#define PA_UNLESS_(expr, paError) \
-    do { \
-        if( UNLIKELY( (expr) == 0 ) ) \
-        { \
-            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = (paError); \
-            goto error; \
-        } \
-    } while( 0 );
-
-/** Check return value of HPI function, and map it to PaError */
-#define PA_ASIHPI_UNLESS_(expr, paError) \
-    do { \
-        HW16 hpiError = (expr); \
-        /* If HPI error occurred */ \
-        if( UNLIKELY( hpiError ) ) \
-        { \
-	    char szError[256]; \
-	    HPI_GetErrorText( hpiError, szError ); \
-	    PA_DEBUG(( "HPI error %d occurred: %s\n", hpiError, szError )); \
-	    /* This message will always be displayed, even if debug info is disabled */ \
-            PA_DEBUG(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            if( (paError) == paUnanticipatedHostError ) \
-	    { \
-	        PA_DEBUG(( "Host error description: %s\n", szError )); \
-	        /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
-	        if( pthread_equal( pthread_self(), paUnixMainThread ) ) \
-                { \
-		    PaUtil_SetLastHostErrorInfo( paInDevelopment, hpiError, szError ); \
-                } \
-	    } \
-	    /* If paNoError is specified, continue as usual */ \
-            /* (useful if you only want to print out the debug messages above) */ \
-	    if( (paError) < 0 ) \
-	    { \
-	        result = (paError); \
-	        goto error; \
-	    } \
-        } \
-    } while( 0 );
-
-/** Report HPI error code and text */
-#define PA_ASIHPI_REPORT_ERROR_(hpiErrorCode) \
-    do { \
-        char szError[256]; \
-        HPI_GetErrorText( hpiError, szError ); \
-        PA_DEBUG(( "HPI error %d occurred: %s\n", hpiError, szError )); \
-        /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
-        if( pthread_equal( pthread_self(), paUnixMainThread ) ) \
-	{ \
-	    PaUtil_SetLastHostErrorInfo( paInDevelopment, (hpiErrorCode), szError ); \
-	} \
-    } while( 0 );
-
-/* Defaults */
-
-/** Sample formats available natively on AudioScience hardware */
-#define PA_ASIHPI_AVAILABLE_FORMATS_ (paFloat32 | paInt32 | paInt24 | paInt16 | paUInt8)
-/** Enable background bus mastering (BBM) for buffer transfers, if available (see HPI docs) */
-#define PA_ASIHPI_USE_BBM_ 1
-/** Minimum number of frames in HPI buffer (for either data or available space).
- If buffer contains less data/space, it indicates xrun or completion. */
-#define PA_ASIHPI_MIN_FRAMES_ 1152
-/** Minimum polling interval in milliseconds, which determines minimum host buffer size */
-#define PA_ASIHPI_MIN_POLLING_INTERVAL_ 10
-
-/* -------------------------------------------------------------------------- */
-
-/*
- * Structures
- */
-
-/** Host API global data */
-typedef struct PaAsiHpiHostApiRepresentation
-{
-    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
-    PaUtilHostApiRepresentation baseHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    /* implementation specific data goes here */
-
-    PaHostApiIndex hostApiIndex;
-    /** HPI subsystem pointer */
-    HPI_HSUBSYS *subSys;
-}
-PaAsiHpiHostApiRepresentation;
-
-
-/** Device data */
-typedef struct PaAsiHpiDeviceInfo
-{
-    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
-    /** Common PortAudio device information */
-    PaDeviceInfo baseDeviceInfo;
-
-    /* implementation specific data goes here */
-
-    /** HPI subsystem (required for most HPI calls) */
-    HPI_HSUBSYS *subSys;
-    /** Adapter index */
-    HW16 adapterIndex;
-    /** Adapter model number (hex) */
-    HW16 adapterType;
-    /** Adapter HW/SW version */
-    HW16 adapterVersion;
-    /** Adapter serial number */
-    HW32 adapterSerialNumber;
-    /** Stream number */
-    HW16 streamIndex;
-    /** 0=Input, 1=Output (HPI streams are either input or output but not both) */
-    HW16 streamIsOutput;
-}
-PaAsiHpiDeviceInfo;
-
-
-/** Stream state as defined by PortAudio.
- It seems that the host API implementation has to keep track of the PortAudio stream state.
- Please note that this is NOT the same as the state of the underlying HPI stream. By separating
- these two concepts, a lot of flexibility is gained. There is a rough match between the two,
- of course, but forcing a precise match is difficult. For example, HPI_STATE_DRAINED can occur
- during the Active state of PortAudio (due to underruns) and also during CallBackFinished in
- the case of an output stream. Similarly, HPI_STATE_STOPPED mostly coincides with the Stopped
- PortAudio state, by may also occur in the CallbackFinished state when recording is finished.
-
- Here is a rough match-up:
-
- PortAudio state   =>     HPI state
- ---------------          ---------
- Active            =>     HPI_STATE_RECORDING, HPI_STATE_PLAYING, (HPI_STATE_DRAINED)
- Stopped           =>     HPI_STATE_STOPPED
- CallbackFinished  =>     HPI_STATE_STOPPED, HPI_STATE_DRAINED */
-typedef enum PaAsiHpiStreamState
-{
-    paAsiHpiStoppedState=0,
-    paAsiHpiActiveState=1,
-    paAsiHpiCallbackFinishedState=2
-}
-PaAsiHpiStreamState;
-
-
-/** Stream component data (associated with one direction, i.e. either input or output) */
-typedef struct PaAsiHpiStreamComponent
-{
-    /** Device information (HPI handles, etc) */
-    PaAsiHpiDeviceInfo *hpiDevice;
-    /** Stream handle, as passed to HPI interface.
-     HACK: we assume types HPI_HISTREAM and HPI_HOSTREAM are the same...
-     (both are HW32 up to version 3.00 of ASIHPI, and hopefully they stay that way) */
-    HPI_HISTREAM hpiStream;
-    /** Stream format, as passed to HPI interface */
-    HPI_FORMAT hpiFormat;
-    /** Number of bytes per frame, derived from hpiFormat and saved for convenience */
-    HW32 bytesPerFrame;
-    /** Size of hardware (on-card) buffer of stream in bytes */
-    HW32 hardwareBufferSize;
-    /** Size of host (BBM) buffer of stream in bytes (if used) */
-    HW32 hostBufferSize;
-    /** Upper limit on the utilization of output stream buffer (both hardware and host).
-     This prevents large latencies in an output-only stream with a potentially huge buffer
-     and a fast data generator, which would otherwise keep the hardware buffer filled to
-     capacity. See also the "Hardware Buffering=off" option in the AudioScience WAV driver. */
-    HW32 outputBufferCap;
-    /** Sample buffer (halfway station between HPI and buffer processor) */
-    HW8 *tempBuffer;
-    /** Sample buffer size, in bytes */
-    HW32 tempBufferSize;
-}
-PaAsiHpiStreamComponent;
-
-
-/** Stream data */
-typedef struct PaAsiHpiStream
-{
-    /* PortAudio "base class" - keep the baseRep first! (C-style inheritance) */
-    PaUtilStreamRepresentation baseStreamRep;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    PaUtilAllocationGroup *allocations;
-
-    /* implementation specific data goes here */
-
-    /** Separate structs for input and output sides of stream */
-    PaAsiHpiStreamComponent *input, *output;
-
-    /** Polling interval (in milliseconds) */
-    HW32 pollingInterval;
-    /** Are we running in callback mode? */
-    int callbackMode;
-    /** Number of frames to transfer at a time to/from HPI */
-    unsigned long maxFramesPerHostBuffer;
-    /** Indicates that the stream is in the paNeverDropInput mode */
-    int neverDropInput;
-    /** Contains copy of user buffers, used by blocking interface to transfer non-interleaved data.
-     It went here instead of to each stream component, as the stream component buffer setup in
-     PaAsiHpi_SetupBuffers doesn't know the stream details such as callbackMode.
-     (Maybe a problem later if ReadStream and WriteStream happens concurrently on same stream.) */
-    void **blockingUserBufferCopy;
-
-    /* Thread-related variables */
-
-    /** Helper thread which will deliver data to user callback */
-    PaUnixThread thread;
-    /** PortAudio stream state (Active/Stopped/CallbackFinished) */
-    volatile sig_atomic_t state;
-    /** Hard abort, i.e. drop frames? */
-    volatile sig_atomic_t callbackAbort;
-    /** True if stream stopped via exiting callback with paComplete/paAbort flag
-     (as opposed to explicit call to StopStream/AbortStream) */
-    volatile sig_atomic_t callbackFinished;
-}
-PaAsiHpiStream;
-
-
-/** Stream state information, collected together for convenience */
-typedef struct PaAsiHpiStreamInfo
-{
-    /** HPI stream state (HPI_STATE_STOPPED, HPI_STATE_PLAYING, etc.) */
-    HW16 state;
-    /** Size (in bytes) of recording/playback data buffer in HPI driver */
-    HW32 bufferSize;
-    /** Amount of data (in bytes) available in the buffer */
-    HW32 dataSize;
-    /** Number of frames played/recorded since last stream reset */
-    HW32 frameCounter;
-    /** Amount of data (in bytes) in hardware (on-card) buffer.
-     This differs from dataSize if bus mastering (BBM) is used, which introduces another
-     driver-level buffer to which dataSize/bufferSize then refers. */
-    HW32 auxDataSize;
-    /** Total number of data frames currently buffered by HPI driver (host + hw buffers) */
-    HW32 totalBufferedData;
-    /** Size of immediately available data (for input) or space (for output) in frames.
-     This only checks the first-level buffer (typically host buffer). This amount can be
-     transferred immediately. */
-    HW32 availableFrames;
-    /** Indicates that hardware buffer is getting too full */
-    int overflow;
-    /** Indicates that hardware buffer is getting too empty */
-    int underflow;
-}
-PaAsiHpiStreamInfo;
-
-/* -------------------------------------------------------------------------- */
-
-/*
- * Function prototypes
- */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-    /* The only exposed function in the entire host API implementation */
-    PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-
-/* Stream prototypes */
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream **s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream *s );
-static PaError StartStream( PaStream *s );
-static PaError StopStream( PaStream *s );
-static PaError AbortStream( PaStream *s );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *s );
-static PaTime GetStreamTime( PaStream *s );
-static double GetStreamCpuLoad( PaStream *s );
-
-/* Blocking prototypes */
-static PaError ReadStream( PaStream *s, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream *s, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream *s );
-static signed long GetStreamWriteAvailable( PaStream *s );
-
-/* Callback prototypes */
-static void *CallbackThreadFunc( void *userData );
-
-/* Functions specific to this API */
-static PaError PaAsiHpi_BuildDeviceList( PaAsiHpiHostApiRepresentation *hpiHostApi );
-static HW16 PaAsiHpi_PaToHpiFormat( PaSampleFormat paFormat );
-static PaSampleFormat PaAsiHpi_HpiToPaFormat( HW16 hpiFormat );
-static PaError PaAsiHpi_CreateFormat( struct PaUtilHostApiRepresentation *hostApi,
-                                      const PaStreamParameters *parameters, double sampleRate,
-                                      PaAsiHpiDeviceInfo **hpiDevice, HPI_FORMAT *hpiFormat );
-static PaError PaAsiHpi_OpenInput( struct PaUtilHostApiRepresentation *hostApi,
-                                   const PaAsiHpiDeviceInfo *hpiDevice, const HPI_FORMAT *hpiFormat,
-                                   HPI_HISTREAM *hpiStream );
-static PaError PaAsiHpi_OpenOutput( struct PaUtilHostApiRepresentation *hostApi,
-                                    const PaAsiHpiDeviceInfo *hpiDevice, const HPI_FORMAT *hpiFormat,
-                                    HPI_HOSTREAM *hpiStream );
-static PaError PaAsiHpi_GetStreamInfo( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStreamInfo *info );
-static void PaAsiHpi_StreamComponentDump( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStream *stream );
-static void PaAsiHpi_StreamDump( PaAsiHpiStream *stream );
-static PaError PaAsiHpi_SetupBuffers( PaAsiHpiStreamComponent *streamComp, HW32 pollingInterval,
-                                      unsigned long framesPerPaHostBuffer, PaTime suggestedLatency );
-static PaError PaAsiHpi_PrimeOutputWithSilence( PaAsiHpiStream *stream );
-static PaError PaAsiHpi_StartStream( PaAsiHpiStream *stream, int outputPrimed );
-static PaError PaAsiHpi_StopStream( PaAsiHpiStream *stream, int abort );
-static PaError PaAsiHpi_ExplicitStop( PaAsiHpiStream *stream, int abort );
-static void PaAsiHpi_OnThreadExit( void *userData );
-static PaError PaAsiHpi_WaitForFrames( PaAsiHpiStream *stream, unsigned long *framesAvail,
-                                       PaStreamCallbackFlags *cbFlags );
-static void PaAsiHpi_CalculateTimeInfo( PaAsiHpiStream *stream, PaStreamCallbackTimeInfo *timeInfo );
-static PaError PaAsiHpi_BeginProcessing( PaAsiHpiStream* stream, unsigned long* numFrames,
-        PaStreamCallbackFlags *cbFlags );
-static PaError PaAsiHpi_EndProcessing( PaAsiHpiStream *stream, unsigned long numFrames,
-                                       PaStreamCallbackFlags *cbFlags );
-
-/* ==========================================================================
- * ============================= IMPLEMENTATION =============================
- * ========================================================================== */
-
-/* --------------------------- Host API Interface --------------------------- */
-
-/** Enumerate all PA devices (= HPI streams).
- This compiles a list of all HPI adapters, and registers a PA device for each input and
- output stream it finds. Most errors are ignored, as missing or erroneous devices are
- simply skipped.
-
- @param hpiHostApi Pointer to HPI host API struct
-
- @return PortAudio error code (only paInsufficientMemory in practice)
- */
-static PaError PaAsiHpi_BuildDeviceList( PaAsiHpiHostApiRepresentation *hpiHostApi )
-{
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *hostApi = &hpiHostApi->baseHostApiRep;
-    PaHostApiInfo *baseApiInfo = &hostApi->info;
-    PaAsiHpiDeviceInfo *hpiDeviceList;
-    HW16 adapterList[ HPI_MAX_ADAPTERS ];
-    HW16 numAdapters;
-    HW16 hpiError = 0;
-    int i, j, deviceCount = 0, deviceIndex = 0;
-
-    assert( hpiHostApi );
-    assert( hpiHostApi->subSys );
-
-    /* Look for adapters (not strictly necessary, as AdapterOpen can do the same, but this */
-    /* way we have less errors since we do not try to open adapters we know aren't there) */
-    /* Errors not considered critical here (subsystem may report 0 devices), but report them */
-    /* in debug mode. */
-    PA_ASIHPI_UNLESS_( HPI_SubSysFindAdapters( hpiHostApi->subSys, &numAdapters,
-                       adapterList, HPI_MAX_ADAPTERS ), paNoError );
-
-    /* First open and count the number of devices (= number of streams), to ease memory allocation */
-    for( i=0; i < HPI_MAX_ADAPTERS; ++i )
-    {
-        HW16 inStreams, outStreams;
-        HW16 version;
-        HW32 serial;
-        HW16 type;
-
-        /* If no adapter found at this index, skip it */
-        if( adapterList[i] == 0 )
-            continue;
-
-        /* Try to open adapter */
-        hpiError = HPI_AdapterOpen( hpiHostApi->subSys, i );
-        /* Report error and skip to next device on failure */
-        if( hpiError )
-        {
-            PA_ASIHPI_REPORT_ERROR_( hpiError );
-            continue;
-        }
-        hpiError = HPI_AdapterGetInfo( hpiHostApi->subSys, i,
-                                       &outStreams, &inStreams, &version, &serial, &type );
-        /* Skip to next device on failure */
-        if( hpiError )
-        {
-            PA_ASIHPI_REPORT_ERROR_( hpiError );
-            continue;
-        }
-        else
-        {
-            /* Assign default devices if available and increment device count */
-            if( (baseApiInfo->defaultInputDevice == paNoDevice) && (inStreams > 0) )
-                baseApiInfo->defaultInputDevice = deviceCount;
-            deviceCount += inStreams;
-            if( (baseApiInfo->defaultOutputDevice == paNoDevice) && (outStreams > 0) )
-                baseApiInfo->defaultOutputDevice = deviceCount;
-            deviceCount += outStreams;
-        }
-    }
-
-    /* Register any discovered devices */
-    if( deviceCount > 0 )
-    {
-        /* Memory allocation */
-        PA_UNLESS_( hostApi->deviceInfos = (PaDeviceInfo**) PaUtil_GroupAllocateMemory(
-                                               hpiHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount ),
-                    paInsufficientMemory );
-        /* Allocate all device info structs in a contiguous block */
-        PA_UNLESS_( hpiDeviceList = (PaAsiHpiDeviceInfo*) PaUtil_GroupAllocateMemory(
-                                        hpiHostApi->allocations, sizeof(PaAsiHpiDeviceInfo) * deviceCount ),
-                    paInsufficientMemory );
-
-        /* Now query devices again for information */
-        for( i=0; i < HPI_MAX_ADAPTERS; ++i )
-        {
-            HW16 inStreams, outStreams;
-            HW16 version;
-            HW32 serial;
-            HW16 type;
-
-            /* If no adapter found at this index, skip it */
-            if( adapterList[i] == 0 )
-                continue;
-
-            /* Assume adapter is still open from previous round */
-            hpiError = HPI_AdapterGetInfo( hpiHostApi->subSys, i,
-                                           &outStreams, &inStreams, &version, &serial, &type );
-            /* Report error and skip to next device on failure */
-            if( hpiError )
-            {
-                PA_ASIHPI_REPORT_ERROR_( hpiError );
-                continue;
-            }
-            else
-            {
-                PA_DEBUG(( "Found HPI Adapter ID=%4X Idx=%d #In=%d #Out=%d S/N=%d HWver=%c%d DSPver=%03d\n",
-                           type, i, inStreams, outStreams, serial,
-                           ((version>>3)&0xf)+'A',                  /* Hw version major */
-                           version&0x7,                             /* Hw version minor */
-                           ((version>>13)*100)+((version>>7)&0x3f)  /* DSP code version */
-                         ));
-            }
-
-            /* First add all input streams as devices */
-            for( j=0; j < inStreams; ++j )
-            {
-                PaAsiHpiDeviceInfo *hpiDevice = &hpiDeviceList[deviceIndex];
-                PaDeviceInfo *baseDeviceInfo = &hpiDevice->baseDeviceInfo;
-                char srcName[72];
-                char *deviceName;
-
-                memset( hpiDevice, 0, sizeof(PaAsiHpiDeviceInfo) );
-                /* Set implementation-specific device details */
-                hpiDevice->subSys = hpiHostApi->subSys;
-                hpiDevice->adapterIndex = i;
-                hpiDevice->adapterType = type;
-                hpiDevice->adapterVersion = version;
-                hpiDevice->adapterSerialNumber = serial;
-                hpiDevice->streamIndex = j;
-                hpiDevice->streamIsOutput = 0;
-                /* Set common PortAudio device stats */
-                baseDeviceInfo->structVersion = 2;
-                /* Make sure name string is owned by API info structure */
-                sprintf( srcName,
-                         "Adapter %d (%4X) - Input Stream %d", i+1, type, j+1 );
-                PA_UNLESS_( deviceName = (char *) PaUtil_GroupAllocateMemory(
-                                             hpiHostApi->allocations, strlen(srcName) + 1 ), paInsufficientMemory );
-                strcpy( deviceName, srcName );
-                baseDeviceInfo->name = deviceName;
-                baseDeviceInfo->hostApi = hpiHostApi->hostApiIndex;
-                baseDeviceInfo->maxInputChannels = HPI_MAX_CHANNELS;
-                baseDeviceInfo->maxOutputChannels = 0;
-                /* Default latency values for interactive performance */
-                baseDeviceInfo->defaultLowInputLatency = 0.01;
-                baseDeviceInfo->defaultLowOutputLatency = -1.0;
-                /* Default latency values for robust non-interactive applications (eg. playing sound files) */
-                baseDeviceInfo->defaultHighInputLatency = 0.2;
-                baseDeviceInfo->defaultHighOutputLatency = -1.0;
-                /* HPI interface can actually handle any sampling rate to 1 Hz accuracy,
-                * so this default is as good as any */
-                baseDeviceInfo->defaultSampleRate = 44100;
-
-                /* Store device in global PortAudio list */
-                hostApi->deviceInfos[deviceIndex++] = (PaDeviceInfo *) hpiDevice;
-            }
-
-            /* Now add all output streams as devices (I know, the repetition is painful) */
-            for( j=0; j < outStreams; ++j )
-            {
-                PaAsiHpiDeviceInfo *hpiDevice = &hpiDeviceList[deviceIndex];
-                PaDeviceInfo *baseDeviceInfo = &hpiDevice->baseDeviceInfo;
-                char srcName[72];
-                char *deviceName;
-
-                memset( hpiDevice, 0, sizeof(PaAsiHpiDeviceInfo) );
-                /* Set implementation-specific device details */
-                hpiDevice->subSys = hpiHostApi->subSys;
-                hpiDevice->adapterIndex = i;
-                hpiDevice->adapterType = type;
-                hpiDevice->adapterVersion = version;
-                hpiDevice->adapterSerialNumber = serial;
-                hpiDevice->streamIndex = j;
-                hpiDevice->streamIsOutput = 1;
-                /* Set common PortAudio device stats */
-                baseDeviceInfo->structVersion = 2;
-                /* Make sure name string is owned by API info structure */
-                sprintf( srcName,
-                         "Adapter %d (%4X) - Output Stream %d", i+1, type, j+1 );
-                PA_UNLESS_( deviceName = (char *) PaUtil_GroupAllocateMemory(
-                                             hpiHostApi->allocations, strlen(srcName) + 1 ), paInsufficientMemory );
-                strcpy( deviceName, srcName );
-                baseDeviceInfo->name = deviceName;
-                baseDeviceInfo->hostApi = hpiHostApi->hostApiIndex;
-                baseDeviceInfo->maxInputChannels = 0;
-                baseDeviceInfo->maxOutputChannels = HPI_MAX_CHANNELS;
-                /* Default latency values for interactive performance. */
-                baseDeviceInfo->defaultLowInputLatency = -1.0;
-                baseDeviceInfo->defaultLowOutputLatency = 0.01;
-                /* Default latency values for robust non-interactive applications (eg. playing sound files). */
-                baseDeviceInfo->defaultHighInputLatency = -1.0;
-                baseDeviceInfo->defaultHighOutputLatency = 0.2;
-                /* HPI interface can actually handle any sampling rate to 1 Hz accuracy,
-                * so this default is as good as any */
-                baseDeviceInfo->defaultSampleRate = 44100;
-
-                /* Store device in global PortAudio list */
-                hostApi->deviceInfos[deviceIndex++] = (PaDeviceInfo *) hpiDevice;
-            }
-        }
-    }
-
-    /* Finally acknowledge checked devices */
-    baseApiInfo->deviceCount = deviceIndex;
-
-error:
-    return result;
-}
-
-
-/** Initialize host API implementation.
- This is the only function exported beyond this file. It is called by PortAudio to initialize
- the host API. It stores API info, finds and registers all devices, and sets up callback and
- blocking interfaces.
-
- @param hostApi Pointer to host API struct
-
- @param hostApiIndex Index of current (HPI) host API
-
- @return PortAudio error code
- */
-PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaAsiHpiHostApiRepresentation *hpiHostApi = NULL;
-    PaHostApiInfo *baseApiInfo;
-
-    /* Allocate host API structure */
-    PA_UNLESS_( hpiHostApi = (PaAsiHpiHostApiRepresentation*) PaUtil_AllocateMemory(
-                                 sizeof(PaAsiHpiHostApiRepresentation) ), paInsufficientMemory );
-    PA_UNLESS_( hpiHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
-
-    hpiHostApi->hostApiIndex = hostApiIndex;
-    hpiHostApi->subSys = NULL;
-
-    /* Try to initialize HPI subsystem */
-    if( ( hpiHostApi->subSys = HPI_SubSysCreate() ) == NULL)
-    {
-        /* the V19 development docs say that if an implementation
-         * detects that it cannot be used, it should return a NULL
-         * interface and paNoError */
-        PA_DEBUG(( "Could not open HPI interface\n" ));
-        result = paNoError;
-        *hostApi = NULL;
-        goto error;
-    }
-    else
-    {
-        HW32 hpiVersion;
-        PA_ASIHPI_UNLESS_( HPI_SubSysGetVersion( hpiHostApi->subSys, &hpiVersion ), paUnanticipatedHostError );
-        PA_DEBUG(( "HPI interface v%d.%02d\n",
-                   hpiVersion >> 8, 10*((hpiVersion & 0xF0) >> 4) + (hpiVersion & 0x0F) ));
-    }
-
-    *hostApi = &hpiHostApi->baseHostApiRep;
-    baseApiInfo = &((*hostApi)->info);
-    /* Fill in common API details */
-    baseApiInfo->structVersion = 1;
-    baseApiInfo->type = paAudioScienceHPI;
-    baseApiInfo->name = "AudioScience HPI";
-    baseApiInfo->deviceCount = 0;
-    baseApiInfo->defaultInputDevice = paNoDevice;
-    baseApiInfo->defaultOutputDevice = paNoDevice;
-
-    PA_ENSURE_( PaAsiHpi_BuildDeviceList( hpiHostApi ) );
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &hpiHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &hpiHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    /* Store identity of main thread */
-    PA_ENSURE_( PaUnixThreading_Initialize() );
-
-    return result;
-error:
-    /* Clean up memory */
-    Terminate( (PaUtilHostApiRepresentation *)hpiHostApi );
-    return result;
-}
-
-
-/** Terminate host API implementation.
- This closes all HPI adapters and frees the HPI subsystem. It also frees the host API struct
- memory. It should be called once for every PaAsiHpi_Initialize call.
-
- @param Pointer to host API struct
- */
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
-    int i;
-    PaError result = paNoError;
-
-    if( hpiHostApi )
-    {
-        /* Get rid of HPI-specific structures */
-        if( hpiHostApi->subSys )
-        {
-            HW16 lastAdapterIndex = HPI_MAX_ADAPTERS;
-            /* Iterate through device list and close adapters */
-            for( i=0; i < hostApi->info.deviceCount; ++i )
-            {
-                PaAsiHpiDeviceInfo *hpiDevice = (PaAsiHpiDeviceInfo *) hostApi->deviceInfos[ i ];
-                /* Close adapter only if it differs from previous one */
-                if( hpiDevice->adapterIndex != lastAdapterIndex )
-                {
-                    /* Ignore errors (report only during debugging) */
-                    PA_ASIHPI_UNLESS_( HPI_AdapterClose( hpiHostApi->subSys,
-                                                         hpiDevice->adapterIndex ), paNoError );
-                    lastAdapterIndex = hpiDevice->adapterIndex;
-                }
-            }
-            /* Finally dismantle HPI subsystem */
-            HPI_SubSysFree( hpiHostApi->subSys );
-        }
-
-        if( hpiHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( hpiHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( hpiHostApi->allocations );
-        }
-
-        PaUtil_FreeMemory( hpiHostApi );
-    }
-error:
-    return;
-}
-
-
-/** Converts PortAudio sample format to equivalent HPI format.
-
- @param paFormat PortAudio sample format
-
- @return HPI sample format
- */
-static HW16 PaAsiHpi_PaToHpiFormat( PaSampleFormat paFormat )
-{
-    /* Ignore interleaving flag */
-    switch( paFormat & ~paNonInterleaved )
-    {
-    case paFloat32:
-        return HPI_FORMAT_PCM32_FLOAT;
-
-    case paInt32:
-        return HPI_FORMAT_PCM32_SIGNED;
-
-    case paInt24:
-        return HPI_FORMAT_PCM24_SIGNED;
-
-    case paInt16:
-        return HPI_FORMAT_PCM16_SIGNED;
-
-    case paUInt8:
-        return HPI_FORMAT_PCM8_UNSIGNED;
-
-        /* Default is 16-bit signed */
-    case paInt8:
-    default:
-        return HPI_FORMAT_PCM16_SIGNED;
-    }
-}
-
-
-/** Converts HPI sample format to equivalent PortAudio format.
-
- @param paFormat HPI sample format
-
- @return PortAudio sample format
- */
-static PaSampleFormat PaAsiHpi_HpiToPaFormat( HW16 hpiFormat )
-{
-    switch( hpiFormat )
-    {
-    case HPI_FORMAT_PCM32_FLOAT:
-        return paFloat32;
-
-    case HPI_FORMAT_PCM32_SIGNED:
-        return paInt32;
-
-    case HPI_FORMAT_PCM24_SIGNED:
-        return paInt24;
-
-    case HPI_FORMAT_PCM16_SIGNED:
-        return paInt16;
-
-    case HPI_FORMAT_PCM8_UNSIGNED:
-        return paUInt8;
-
-        /* Default is custom format (e.g. for HPI MP3 format) */
-    default:
-        return paCustomFormat;
-    }
-}
-
-
-/** Creates HPI format struct based on PortAudio parameters.
- This also does some checks to see whether the desired format is valid, and whether
- the device allows it. This only checks the format of one half (input or output) of the
- PortAudio stream.
-
- @param hostApi Pointer to host API struct
-
- @param parameters Pointer to stream parameter struct
-
- @param sampleRate Desired sample rate
-
- @param hpiDevice Pointer to HPI device struct
-
- @param hpiFormat Resulting HPI format returned here
-
- @return PortAudio error code (typically indicating a problem with stream format)
- */
-static PaError PaAsiHpi_CreateFormat( struct PaUtilHostApiRepresentation *hostApi,
-                                      const PaStreamParameters *parameters, double sampleRate,
-                                      PaAsiHpiDeviceInfo **hpiDevice, HPI_FORMAT *hpiFormat )
-{
-    int maxChannelCount = 0;
-    PaSampleFormat hostSampleFormat = 0;
-    HW16 hpiError = 0;
-
-    /* Unless alternate device specification is supported, reject the use of
-       paUseHostApiSpecificDeviceSpecification */
-    if( parameters->device == paUseHostApiSpecificDeviceSpecification )
-        return paInvalidDevice;
-    else
-    {
-        assert( parameters->device < hostApi->info.deviceCount );
-        *hpiDevice = (PaAsiHpiDeviceInfo*) hostApi->deviceInfos[ parameters->device ];
-    }
-
-    /* Validate streamInfo - this implementation doesn't use custom stream info */
-    if( parameters->hostApiSpecificStreamInfo )
-        return paIncompatibleHostApiSpecificStreamInfo;
-
-    /* Check that device can support channel count */
-    if( (*hpiDevice)->streamIsOutput )
-    {
-        maxChannelCount = (*hpiDevice)->baseDeviceInfo.maxOutputChannels;
-    }
-    else
-    {
-        maxChannelCount = (*hpiDevice)->baseDeviceInfo.maxInputChannels;
-    }
-    if( (maxChannelCount == 0) || (parameters->channelCount > maxChannelCount) )
-        return paInvalidChannelCount;
-
-    /* All standard sample formats are supported by the buffer adapter,
-       and this implementation doesn't support any custom sample formats */
-    if( parameters->sampleFormat & paCustomFormat )
-        return paSampleFormatNotSupported;
-
-    /* Switch to closest HPI native format */
-    hostSampleFormat = PaUtil_SelectClosestAvailableFormat(PA_ASIHPI_AVAILABLE_FORMATS_,
-                       parameters->sampleFormat );
-    /* Setup format + info objects */
-    hpiError = HPI_FormatCreate( hpiFormat, (HW16)parameters->channelCount,
-                                 PaAsiHpi_PaToHpiFormat( hostSampleFormat ),
-                                 (HW32)sampleRate, 0, 0 );
-    if( hpiError )
-    {
-        PA_ASIHPI_REPORT_ERROR_( hpiError );
-        switch( hpiError )
-        {
-        case HPI_ERROR_INVALID_FORMAT:
-            return paSampleFormatNotSupported;
-
-        case HPI_ERROR_INVALID_SAMPLERATE:
-        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
-            return paInvalidSampleRate;
-
-        case HPI_ERROR_INVALID_CHANNELS:
-            return paInvalidChannelCount;
-        }
-    }
-
-    return paNoError;
-}
-
-
-/** Open HPI input stream with given format.
- This attempts to open HPI input stream with desired format. If the format is not supported
- or the device is unavailable, the stream is closed and a PortAudio error code is returned.
-
- @param hostApi Pointer to host API struct
-
- @param hpiDevice Pointer to HPI device struct
-
- @param hpiFormat Pointer to HPI format struct
-
- @return PortAudio error code (typically indicating a problem with stream format or device)
-*/
-static PaError PaAsiHpi_OpenInput( struct PaUtilHostApiRepresentation *hostApi,
-                                   const PaAsiHpiDeviceInfo *hpiDevice, const HPI_FORMAT *hpiFormat,
-                                   HPI_HISTREAM *hpiStream )
-{
-    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
-    PaError result = paNoError;
-    HW16 hpiError = 0;
-
-    /* Catch misplaced output devices, as they typically have 0 input channels */
-    PA_UNLESS_( !hpiDevice->streamIsOutput, paInvalidChannelCount );
-    /* Try to open input stream */
-    PA_ASIHPI_UNLESS_( HPI_InStreamOpen( hpiHostApi->subSys, hpiDevice->adapterIndex,
-                                         hpiDevice->streamIndex, hpiStream ), paDeviceUnavailable );
-    /* Set input format (checking it in the process) */
-    /* Could also use HPI_InStreamQueryFormat, but this economizes the process */
-    hpiError = HPI_InStreamSetFormat( hpiHostApi->subSys, *hpiStream, (HPI_FORMAT*)hpiFormat );
-    if( hpiError )
-    {
-        PA_ASIHPI_REPORT_ERROR_( hpiError );
-        PA_ASIHPI_UNLESS_( HPI_InStreamClose( hpiHostApi->subSys, *hpiStream ), paNoError );
-        switch( hpiError )
-        {
-        case HPI_ERROR_INVALID_FORMAT:
-            return paSampleFormatNotSupported;
-
-        case HPI_ERROR_INVALID_SAMPLERATE:
-        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
-            return paInvalidSampleRate;
-
-        case HPI_ERROR_INVALID_CHANNELS:
-            return paInvalidChannelCount;
-
-        default:
-            /* In case anything else went wrong */
-            return paInvalidDevice;
-        }
-    }
-
-error:
-    return result;
-}
-
-
-/** Open HPI output stream with given format.
- This attempts to open HPI output stream with desired format. If the format is not supported
- or the device is unavailable, the stream is closed and a PortAudio error code is returned.
-
- @param hostApi Pointer to host API struct
-
- @param hpiDevice Pointer to HPI device struct
-
- @param hpiFormat Pointer to HPI format struct
-
- @return PortAudio error code (typically indicating a problem with stream format or device)
-*/
-static PaError PaAsiHpi_OpenOutput( struct PaUtilHostApiRepresentation *hostApi,
-                                    const PaAsiHpiDeviceInfo *hpiDevice, const HPI_FORMAT *hpiFormat,
-                                    HPI_HOSTREAM *hpiStream )
-{
-    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
-    PaError result = paNoError;
-    HW16 hpiError = 0;
-
-    /* Catch misplaced input devices, as they typically have 0 output channels */
-    PA_UNLESS_( hpiDevice->streamIsOutput, paInvalidChannelCount );
-    /* Try to open output stream */
-    PA_ASIHPI_UNLESS_( HPI_OutStreamOpen( hpiHostApi->subSys, hpiDevice->adapterIndex,
-                                          hpiDevice->streamIndex, hpiStream ), paDeviceUnavailable );
-
-    /* Check output format (format is set on first write to output stream) */
-    hpiError = HPI_OutStreamQueryFormat( hpiHostApi->subSys, *hpiStream, (HPI_FORMAT*)hpiFormat );
-    if( hpiError )
-    {
-        PA_ASIHPI_REPORT_ERROR_( hpiError );
-        PA_ASIHPI_UNLESS_( HPI_OutStreamClose( hpiHostApi->subSys, *hpiStream ), paNoError );
-        switch( hpiError )
-        {
-        case HPI_ERROR_INVALID_FORMAT:
-            return paSampleFormatNotSupported;
-
-        case HPI_ERROR_INVALID_SAMPLERATE:
-        case HPI_ERROR_INCOMPATIBLE_SAMPLERATE:
-            return paInvalidSampleRate;
-
-        case HPI_ERROR_INVALID_CHANNELS:
-            return paInvalidChannelCount;
-
-        default:
-            /* In case anything else went wrong */
-            return paInvalidDevice;
-        }
-    }
-
-error:
-    return result;
-}
-
-
-/** Checks whether the desired stream formats and devices are supported
- (for both input and output).
- This is done by actually opening the appropriate HPI streams and closing them again.
-
- @param hostApi Pointer to host API struct
-
- @param inputParameters Pointer to stream parameter struct for input side of stream
-
- @param outputParameters Pointer to stream parameter struct for output side of stream
-
- @param sampleRate Desired sample rate
-
- @return PortAudio error code (paFormatIsSupported on success)
- */
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaError result = paFormatIsSupported;
-    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
-    PaAsiHpiDeviceInfo *hpiDevice = NULL;
-    HPI_FORMAT hpiFormat;
-
-    /* Input stream */
-    if( inputParameters )
-    {
-        HPI_HISTREAM hpiStream;
-        PA_DEBUG(( "%s: Checking input params: dev=%d, sr=%d, chans=%d, fmt=%d\n",
-                   __FUNCTION__, inputParameters->device, (int)sampleRate,
-                   inputParameters->channelCount, inputParameters->sampleFormat ));
-        /* Create and validate format */
-        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, inputParameters, sampleRate,
-                                           &hpiDevice, &hpiFormat ) );
-        /* Open stream to further check format */
-        PA_ENSURE_( PaAsiHpi_OpenInput( hostApi, hpiDevice, &hpiFormat, &hpiStream ) );
-        /* Close stream again */
-        PA_ASIHPI_UNLESS_( HPI_InStreamClose( hpiHostApi->subSys, hpiStream ), paNoError );
-    }
-
-    /* Output stream */
-    if( outputParameters )
-    {
-        HPI_HOSTREAM hpiStream;
-        PA_DEBUG(( "%s: Checking output params: dev=%d, sr=%d, chans=%d, fmt=%d\n",
-                   __FUNCTION__, outputParameters->device, (int)sampleRate,
-                   outputParameters->channelCount, outputParameters->sampleFormat ));
-        /* Create and validate format */
-        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, outputParameters, sampleRate,
-                                           &hpiDevice, &hpiFormat ) );
-        /* Open stream to further check format */
-        PA_ENSURE_( PaAsiHpi_OpenOutput( hostApi, hpiDevice, &hpiFormat, &hpiStream ) );
-        /* Close stream again */
-        PA_ASIHPI_UNLESS_( HPI_OutStreamClose( hpiHostApi->subSys, hpiStream ), paNoError );
-    }
-
-error:
-    return result;
-}
-
-/* ---------------------------- Stream Interface ---------------------------- */
-
-/** Obtain HPI stream information.
- This obtains info such as stream state and available data/space in buffers. It also
- estimates whether an underflow or overflow occurred.
-
- @param streamComp Pointer to stream component (input or output) to query
-
- @param info Pointer to stream info struct that will contain result
-
- @return PortAudio error code (either paNoError, paDeviceUnavailable or paUnanticipatedHostError)
- */
-static PaError PaAsiHpi_GetStreamInfo( PaAsiHpiStreamComponent *streamComp, PaAsiHpiStreamInfo *info )
-{
-    PaError result = paDeviceUnavailable;
-    HW16 state;
-    HW32 bufferSize, dataSize, frameCounter, auxDataSize, threshold;
-    HW32 hwBufferSize, hwDataSize;
-
-    assert( streamComp );
-    assert( info );
-
-    /* First blank the stream info struct, in case something goes wrong below.
-       This saves the caller from initializing the struct. */
-    info->state = 0;
-    info->bufferSize = 0;
-    info->dataSize = 0;
-    info->frameCounter = 0;
-    info->auxDataSize = 0;
-    info->totalBufferedData = 0;
-    info->availableFrames = 0;
-    info->underflow = 0;
-    info->overflow = 0;
-
-    if( streamComp->hpiDevice && streamComp->hpiStream )
-    {
-        /* Obtain detailed stream info (either input or output) */
-        if( streamComp->hpiDevice->streamIsOutput )
-        {
-            PA_ASIHPI_UNLESS_( HPI_OutStreamGetInfoEx( streamComp->hpiDevice->subSys,
-                               streamComp->hpiStream,
-                               &state, &bufferSize, &dataSize, &frameCounter,
-                               &auxDataSize ), paUnanticipatedHostError );
-        }
-        else
-        {
-            PA_ASIHPI_UNLESS_( HPI_InStreamGetInfoEx( streamComp->hpiDevice->subSys,
-                               streamComp->hpiStream,
-                               &state, &bufferSize, &dataSize, &frameCounter,
-                               &auxDataSize ), paUnanticipatedHostError );
-        }
-        /* Load stream info */
-        info->state = state;
-        info->bufferSize = bufferSize;
-        info->dataSize = dataSize;
-        info->frameCounter = frameCounter;
-        info->auxDataSize = auxDataSize;
-        /* Determine total buffered data */
-        info->totalBufferedData = dataSize;
-        if( streamComp->hostBufferSize > 0 )
-            info->totalBufferedData += auxDataSize;
-        info->totalBufferedData /= streamComp->bytesPerFrame;
-        /* Determine immediately available frames */
-        info->availableFrames = streamComp->hpiDevice->streamIsOutput ?
-                                bufferSize - dataSize : dataSize;
-        info->availableFrames /= streamComp->bytesPerFrame;
-        /* Minimum space/data required in buffers */
-        threshold = PA_MIN( streamComp->tempBufferSize,
-                            streamComp->bytesPerFrame * PA_ASIHPI_MIN_FRAMES_ );
-        /* Obtain hardware buffer stats first, to simplify things */
-        hwBufferSize = streamComp->hardwareBufferSize;
-        hwDataSize = streamComp->hostBufferSize > 0 ? auxDataSize : dataSize;
-        /* Underflow is a bit tricky */
-        info->underflow = streamComp->hpiDevice->streamIsOutput ?
-                          /* Stream seems to start in drained state sometimes, so ignore initial underflow */
-                          (frameCounter > 0) && ( (state == HPI_STATE_DRAINED) || (hwDataSize == 0) ) :
-                          /* Input streams check the first-level (host) buffer for underflow */
-                          (state != HPI_STATE_STOPPED) && (dataSize < threshold);
-        /* Check for overflow in second-level (hardware) buffer for both input and output */
-        info->overflow = (state != HPI_STATE_STOPPED) && (hwBufferSize - hwDataSize < threshold);
-
-        return paNoError;
-    }
-
-error:
-    return result;
-}
-
-
-/** Display stream component information for debugging purposes.
-
- @param streamComp Pointer to stream component (input or output) to query
-
- @param stream Pointer to stream struct which contains the component above
- */
-static void PaAsiHpi_StreamComponentDump( PaAsiHpiStreamComponent *streamComp,
-        PaAsiHpiStream *stream )
-{
-    PaAsiHpiStreamInfo streamInfo;
-
-    assert( streamComp );
-    assert( stream );
-
-    /* Name of soundcard/device used by component */
-    PA_DEBUG(( "device: %s\n", streamComp->hpiDevice->baseDeviceInfo.name ));
-    /* Unfortunately some overlap between input and output here */
-    if( streamComp->hpiDevice->streamIsOutput )
-    {
-        /* Settings on the user side (as experienced by user callback) */
-        PA_DEBUG(( "user: %d-bit, %d ",
-                   8*stream->bufferProcessor.bytesPerUserOutputSample,
-                   stream->bufferProcessor.outputChannelCount));
-        if( stream->bufferProcessor.userOutputIsInterleaved )
-        {
-            PA_DEBUG(( "interleaved channels, " ));
-        }
-        else
-        {
-            PA_DEBUG(( "non-interleaved channels, " ));
-        }
-        PA_DEBUG(( "%d frames/buffer, latency = %5.1f ms\n",
-                   stream->bufferProcessor.framesPerUserBuffer,
-                   1000*stream->baseStreamRep.streamInfo.outputLatency ));
-        /* Settings on the host side (internal to PortAudio host API) */
-        PA_DEBUG(( "host: %d-bit, %d interleaved channels, %d frames/buffer ",
-                   8*stream->bufferProcessor.bytesPerHostOutputSample,
-                   stream->bufferProcessor.outputChannelCount,
-                   stream->bufferProcessor.framesPerHostBuffer ));
-    }
-    else
-    {
-        /* Settings on the user side (as experienced by user callback) */
-        PA_DEBUG(( "user: %d-bit, %d ",
-                   8*stream->bufferProcessor.bytesPerUserInputSample,
-                   stream->bufferProcessor.inputChannelCount));
-        if( stream->bufferProcessor.userInputIsInterleaved )
-        {
-            PA_DEBUG(( "interleaved channels, " ));
-        }
-        else
-        {
-            PA_DEBUG(( "non-interleaved channels, " ));
-        }
-        PA_DEBUG(( "%d frames/buffer, latency = %5.1f ms\n",
-                   stream->bufferProcessor.framesPerUserBuffer,
-                   1000*stream->baseStreamRep.streamInfo.inputLatency ));
-        /* Settings on the host side (internal to PortAudio host API) */
-        PA_DEBUG(( "host: %d-bit, %d interleaved channels, %d frames/buffer ",
-                   8*stream->bufferProcessor.bytesPerHostInputSample,
-                   stream->bufferProcessor.inputChannelCount,
-                   stream->bufferProcessor.framesPerHostBuffer ));
-    }
-    switch( stream->bufferProcessor.hostBufferSizeMode )
-    {
-    case paUtilFixedHostBufferSize:
-        PA_DEBUG(( "[fixed] " ));
-        break;
-    case paUtilBoundedHostBufferSize:
-        PA_DEBUG(( "[bounded] " ));
-        break;
-    case paUtilUnknownHostBufferSize:
-        PA_DEBUG(( "[unknown] " ));
-        break;
-    case paUtilVariableHostBufferSizePartialUsageAllowed:
-        PA_DEBUG(( "[variable] " ));
-        break;
-    }
-    PA_DEBUG(( "(%d max)\n", streamComp->tempBufferSize / streamComp->bytesPerFrame ));
-    /* HPI hardware settings */
-    PA_DEBUG(( "HPI: adapter %d stream %d, %d-bit, %d-channel, %d Hz\n",
-               streamComp->hpiDevice->adapterIndex, streamComp->hpiDevice->streamIndex,
-               8 * streamComp->bytesPerFrame / streamComp->hpiFormat.wChannels,
-               streamComp->hpiFormat.wChannels,
-               streamComp->hpiFormat.dwSampleRate ));
-    /* Stream state and buffer levels */
-    PA_DEBUG(( "HPI: " ));
-    PaAsiHpi_GetStreamInfo( streamComp, &streamInfo );
-    switch( streamInfo.state )
-    {
-    case HPI_STATE_STOPPED:
-        PA_DEBUG(( "[STOPPED] " ));
-        break;
-    case HPI_STATE_PLAYING:
-        PA_DEBUG(( "[PLAYING] " ));
-        break;
-    case HPI_STATE_RECORDING:
-        PA_DEBUG(( "[RECORDING] " ));
-        break;
-    case HPI_STATE_DRAINED:
-        PA_DEBUG(( "[DRAINED] " ));
-        break;
-    default:
-        PA_DEBUG(( "[unknown state] " ));
-        break;
-    }
-    if( streamComp->hostBufferSize )
-    {
-        PA_DEBUG(( "host = %d/%d B, ", streamInfo.dataSize, streamComp->hostBufferSize ));
-        PA_DEBUG(( "hw = %d/%d (%d) B, ", streamInfo.auxDataSize,
-                   streamComp->hardwareBufferSize, streamComp->outputBufferCap ));
-    }
-    else
-    {
-        PA_DEBUG(( "hw = %d/%d B, ", streamInfo.dataSize, streamComp->hardwareBufferSize ));
-    }
-    PA_DEBUG(( "count = %d", streamInfo.frameCounter ));
-    if( streamInfo.overflow )
-    {
-        PA_DEBUG(( " [overflow]" ));
-    }
-    else if( streamInfo.underflow )
-    {
-        PA_DEBUG(( " [underflow]" ));
-    }
-    PA_DEBUG(( "\n" ));
-}
-
-
-/** Display stream information for debugging purposes.
-
- @param stream Pointer to stream to query
- */
-static void PaAsiHpi_StreamDump( PaAsiHpiStream *stream )
-{
-    assert( stream );
-
-    PA_DEBUG(( "\n------------------------- STREAM INFO FOR %p ---------------------------\n", stream ));
-    /* General stream info (input+output) */
-    if( stream->baseStreamRep.streamCallback )
-    {
-        PA_DEBUG(( "[callback] " ));
-    }
-    else
-    {
-        PA_DEBUG(( "[blocking] " ));
-    }
-    PA_DEBUG(( "sr=%d Hz, poll=%d ms, max %d frames/buf ",
-               (int)stream->baseStreamRep.streamInfo.sampleRate,
-               stream->pollingInterval, stream->maxFramesPerHostBuffer ));
-    switch( stream->state )
-    {
-    case paAsiHpiStoppedState:
-        PA_DEBUG(( "[stopped]\n" ));
-        break;
-    case paAsiHpiActiveState:
-        PA_DEBUG(( "[active]\n" ));
-        break;
-    case paAsiHpiCallbackFinishedState:
-        PA_DEBUG(( "[cb fin]\n" ));
-        break;
-    default:
-        PA_DEBUG(( "[unknown state]\n" ));
-        break;
-    }
-    if( stream->callbackMode )
-    {
-        PA_DEBUG(( "cb info: thread=%p, cbAbort=%d, cbFinished=%d\n",
-                   stream->thread.thread, stream->callbackAbort, stream->callbackFinished ));
-    }
-
-    PA_DEBUG(( "----------------------------------- Input  ------------------------------------\n" ));
-    if( stream->input )
-    {
-        PaAsiHpi_StreamComponentDump( stream->input, stream );
-    }
-    else
-    {
-        PA_DEBUG(( "*none*\n" ));
-    }
-
-    PA_DEBUG(( "----------------------------------- Output ------------------------------------\n" ));
-    if( stream->output )
-    {
-        PaAsiHpi_StreamComponentDump( stream->output, stream );
-    }
-    else
-    {
-        PA_DEBUG(( "*none*\n" ));
-    }
-    PA_DEBUG(( "-------------------------------------------------------------------------------\n\n" ));
-
-}
-
-
-/** Determine buffer sizes and allocate appropriate stream buffers.
- This attempts to allocate a BBM (host) buffer for the HPI stream component (either input
- or output, as both have similar buffer needs). Not all AudioScience adapters support BBM,
- in which case the hardware buffer has to suffice. The size of the HPI host buffer is chosen
- as a multiple of framesPerPaHostBuffer, and also influenced by the suggested latency and the
- estimated minimum polling interval. The HPI host and hardware buffer sizes are stored, and an
- appropriate cap for the hardware buffer is also calculated. Finally, the temporary stream
- buffer which serves as the PortAudio host buffer for this implementation is allocated.
- This buffer contains an integer number of user buffers, to simplify buffer adaption in the
- buffer processor. The function returns paBufferTooBig if the HPI interface cannot allocate
- an HPI host buffer of the desired size.
-
- @param streamComp Pointer to stream component struct
-
- @param pollingInterval Polling interval for stream, in milliseconds
-
- @param framesPerPaHostBuffer Size of PortAudio host buffer, in frames
-
- @param suggestedLatency Suggested latency for stream component, in seconds
-
- @return PortAudio error code (possibly paBufferTooBig or paInsufficientMemory)
- */
-static PaError PaAsiHpi_SetupBuffers( PaAsiHpiStreamComponent *streamComp, HW32 pollingInterval,
-                                      unsigned long framesPerPaHostBuffer, PaTime suggestedLatency )
-{
-    PaError result = paNoError;
-    PaAsiHpiStreamInfo streamInfo;
-    unsigned long hpiBufferSize = 0, paHostBufferSize = 0;
-
-    assert( streamComp );
-    assert( streamComp->hpiDevice );
-
-    /* Obtain size of hardware buffer of HPI stream, since we will be activating BBM shortly
-       and afterwards the buffer size will refer to the BBM (host-side) buffer.
-       This is necessary to enable reliable detection of xruns. */
-    PA_ENSURE_( PaAsiHpi_GetStreamInfo( streamComp, &streamInfo ) );
-    streamComp->hardwareBufferSize = streamInfo.bufferSize;
-    hpiBufferSize = streamInfo.bufferSize;
-
-    /* Check if BBM (background bus mastering) is to be enabled */
-    if( PA_ASIHPI_USE_BBM_ )
-    {
-        HW32 bbmBufferSize = 0, preLatencyBufferSize = 0;
-        HW16 hpiError = 0;
-        PaTime pollingOverhead;
-
-        /* Check overhead of Pa_Sleep() call (minimum sleep duration in ms -> OS dependent) */
-        pollingOverhead = PaUtil_GetTime();
-        Pa_Sleep( 0 );
-        pollingOverhead = 1000*(PaUtil_GetTime() - pollingOverhead);
-        PA_DEBUG(( "polling overhead = %f ms (length of 0-second sleep)\n", pollingOverhead ));
-        /* Obtain minimum recommended size for host buffer (in bytes) */
-        PA_ASIHPI_UNLESS_( HPI_StreamEstimateBufferSize( &streamComp->hpiFormat,
-                           pollingInterval + (HW32)ceil( pollingOverhead ),
-                           &bbmBufferSize ), paUnanticipatedHostError );
-        /* BBM places more stringent requirements on buffer size (see description */
-        /* of HPI_StreamEstimateBufferSize in HPI API document) */
-        bbmBufferSize *= 3;
-        /* Make sure the BBM buffer contains multiple PA host buffers */
-        if( bbmBufferSize < 3 * streamComp->bytesPerFrame * framesPerPaHostBuffer )
-            bbmBufferSize = 3 * streamComp->bytesPerFrame * framesPerPaHostBuffer;
-        /* Try to honor latency suggested by user by growing buffer (no decrease possible) */
-        if( suggestedLatency > 0.0 )
-        {
-            PaTime bufferDuration = ((PaTime)bbmBufferSize) / streamComp->bytesPerFrame
-                                    / streamComp->hpiFormat.dwSampleRate;
-            /* Don't decrease buffer */
-            if( bufferDuration < suggestedLatency )
-            {
-                /* Save old buffer size, to be retried if new size proves too big */
-                preLatencyBufferSize = bbmBufferSize;
-                bbmBufferSize = (HW32)ceil( suggestedLatency * streamComp->bytesPerFrame
-                                            * streamComp->hpiFormat.dwSampleRate );
-            }
-        }
-        /* Choose closest memory block boundary (HPI API document states that
-        "a buffer size of Nx4096 - 20 makes the best use of memory"
-        (under the entry for HPI_StreamEstimateBufferSize)) */
-        bbmBufferSize = ((HW32)ceil((bbmBufferSize + 20)/4096.0))*4096 - 20;
-        streamComp->hostBufferSize = bbmBufferSize;
-        /* Allocate BBM host buffer (this enables bus mastering transfers in background) */
-        if( streamComp->hpiDevice->streamIsOutput )
-            hpiError = HPI_OutStreamHostBufferAllocate( streamComp->hpiDevice->subSys,
-                       streamComp->hpiStream,
-                       bbmBufferSize );
-        else
-            hpiError = HPI_InStreamHostBufferAllocate( streamComp->hpiDevice->subSys,
-                       streamComp->hpiStream,
-                       bbmBufferSize );
-        if( hpiError )
-        {
-            PA_ASIHPI_REPORT_ERROR_( hpiError );
-            /* Indicate that BBM is disabled */
-            streamComp->hostBufferSize = 0;
-            /* Retry with smaller buffer size (transfers will still work, but not via BBM) */
-            if( hpiError == HPI_ERROR_INVALID_DATASIZE )
-            {
-                /* Retry BBM allocation with smaller size if requested latency proved too big */
-                if( preLatencyBufferSize > 0 )
-                {
-                    PA_DEBUG(( "Retrying BBM allocation with smaller size (%d vs. %d bytes)\n",
-                               preLatencyBufferSize, bbmBufferSize ));
-                    bbmBufferSize = preLatencyBufferSize;
-                    if( streamComp->hpiDevice->streamIsOutput )
-                        hpiError = HPI_OutStreamHostBufferAllocate( streamComp->hpiDevice->subSys,
-                                   streamComp->hpiStream,
-                                   bbmBufferSize );
-                    else
-                        hpiError = HPI_InStreamHostBufferAllocate( streamComp->hpiDevice->subSys,
-                                   streamComp->hpiStream,
-                                   bbmBufferSize );
-                    /* Another round of error checking */
-                    if( hpiError )
-                    {
-                        PA_ASIHPI_REPORT_ERROR_( hpiError );
-                        /* No escapes this time */
-                        if( hpiError == HPI_ERROR_INVALID_DATASIZE )
-                        {
-                            result = paBufferTooBig;
-                            goto error;
-                        }
-                        else if( hpiError != HPI_ERROR_INVALID_OPERATION )
-                        {
-                            result = paUnanticipatedHostError;
-                            goto error;
-                        }
-                    }
-                    else
-                    {
-                        streamComp->hostBufferSize = bbmBufferSize;
-                        hpiBufferSize = bbmBufferSize;
-                    }
-                }
-                else
-                {
-                    result = paBufferTooBig;
-                    goto error;
-                }
-            }
-            /* If BBM not supported, foreground transfers will be used, but not a show-stopper */
-            /* Anything else is an error */
-            else if( hpiError != HPI_ERROR_INVALID_OPERATION )
-            {
-                result = paUnanticipatedHostError;
-                goto error;
-            }
-        }
-        else
-        {
-            hpiBufferSize = bbmBufferSize;
-        }
-    }
-
-    /* Final check of buffer size */
-    paHostBufferSize = streamComp->bytesPerFrame * framesPerPaHostBuffer;
-    if( hpiBufferSize < 3*paHostBufferSize )
-    {
-        result = paBufferTooBig;
-        goto error;
-    }
-    /* Set cap on output buffer size, based on latency suggestions */
-    if( streamComp->hpiDevice->streamIsOutput )
-    {
-        PaTime latency = suggestedLatency > 0.0 ? suggestedLatency :
-                         streamComp->hpiDevice->baseDeviceInfo.defaultHighOutputLatency;
-        streamComp->outputBufferCap =
-            (HW32)ceil( latency * streamComp->bytesPerFrame * streamComp->hpiFormat.dwSampleRate );
-        /* The cap should not be too small, to prevent underflow */
-        if( streamComp->outputBufferCap < 4*paHostBufferSize )
-            streamComp->outputBufferCap = 4*paHostBufferSize;
-    }
-    else
-    {
-        streamComp->outputBufferCap = 0;
-    }
-    /* Temp buffer size should be multiple of PA host buffer size (or 1x, if using fixed blocks) */
-    streamComp->tempBufferSize = paHostBufferSize;
-    /* Allocate temp buffer */
-    PA_UNLESS_( streamComp->tempBuffer = (HW8 *)PaUtil_AllocateMemory( streamComp->tempBufferSize ),
-                paInsufficientMemory );
-error:
-    return result;
-}
-
-
-/** Opens PortAudio stream.
- This determines a suitable value for framesPerBuffer, if the user didn't specify it,
- based on the suggested latency. It then opens each requested stream direction with the
- appropriate stream format, and allocates the required stream buffers. It sets up the
- various PortAudio structures dealing with streams, and estimates the stream latency.
-
- See pa_hostapi.h for a list of validity guarantees made about OpenStream parameters.
-
- @param hostApi Pointer to host API struct
-
- @param s List of open streams, where successfully opened stream will go
-
- @param inputParameters Pointer to stream parameter struct for input side of stream
-
- @param outputParameters Pointer to stream parameter struct for output side of stream
-
- @param sampleRate Desired sample rate
-
- @param framesPerBuffer Desired number of frames per buffer passed to user callback
-                        (or chunk size for blocking stream)
-
- @param streamFlags Stream flags
-
- @param streamCallback Pointer to user callback function (zero for blocking interface)
-
- @param userData Pointer to user data that will be passed to callback function along with data
-
- @return PortAudio error code
-*/
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream **s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaAsiHpiHostApiRepresentation *hpiHostApi = (PaAsiHpiHostApiRepresentation*)hostApi;
-    PaAsiHpiStream *stream = NULL;
-    unsigned long framesPerHostBuffer = framesPerBuffer;
-    int inputChannelCount = 0, outputChannelCount = 0;
-    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
-    PaSampleFormat hostInputSampleFormat = 0, hostOutputSampleFormat = 0;
-    PaTime maxSuggestedLatency = 0.0;
-
-    /* Validate platform-specific flags -> none expected for HPI */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform-specific flag */
-
-    /* Create blank stream structure */
-    PA_UNLESS_( stream = (PaAsiHpiStream *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStream) ),
-                paInsufficientMemory );
-    memset( stream, 0, sizeof(PaAsiHpiStream) );
-
-    /* If the number of frames per buffer is unspecified, we have to come up with one. */
-    if( framesPerHostBuffer == paFramesPerBufferUnspecified )
-    {
-        if( inputParameters )
-            maxSuggestedLatency = inputParameters->suggestedLatency;
-        if( outputParameters && (outputParameters->suggestedLatency > maxSuggestedLatency) )
-            maxSuggestedLatency = outputParameters->suggestedLatency;
-        /* Use suggested latency if available */
-        if( maxSuggestedLatency > 0.0 )
-            framesPerHostBuffer = (unsigned long)ceil( maxSuggestedLatency * sampleRate );
-        else
-            /* AudioScience cards like BIG buffers by default */
-            framesPerHostBuffer = 4096;
-    }
-    /* Lower bounds on host buffer size, due to polling and HPI constraints */
-    if( 1000.0*framesPerHostBuffer/sampleRate < PA_ASIHPI_MIN_POLLING_INTERVAL_ )
-        framesPerHostBuffer = (unsigned long)ceil( sampleRate * PA_ASIHPI_MIN_POLLING_INTERVAL_ / 1000.0 );
-    /*    if( framesPerHostBuffer < PA_ASIHPI_MIN_FRAMES_ )
-            framesPerHostBuffer = PA_ASIHPI_MIN_FRAMES_; */
-    /* Efficient if host buffer size is integer multiple of user buffer size */
-    if( framesPerBuffer > 0 )
-        framesPerHostBuffer = (unsigned long)ceil( (double)framesPerHostBuffer / framesPerBuffer ) * framesPerBuffer;
-    /* Buffer should always be a multiple of 4 bytes to facilitate 32-bit PCI transfers.
-     By keeping the frames a multiple of 4, this is ensured even for 8-bit mono sound. */
-    framesPerHostBuffer = (framesPerHostBuffer / 4) * 4;
-    /* Polling is based on time length (in milliseconds) of user-requested block size */
-    stream->pollingInterval = (HW32)ceil( 1000.0*framesPerHostBuffer/sampleRate );
-    assert( framesPerHostBuffer > 0 );
-
-    /* Open underlying streams, check formats and allocate buffers */
-    if( inputParameters )
-    {
-        /* Create blank stream component structure */
-        PA_UNLESS_( stream->input = (PaAsiHpiStreamComponent *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStreamComponent) ),
-                    paInsufficientMemory );
-        memset( stream->input, 0, sizeof(PaAsiHpiStreamComponent) );
-        /* Create/validate format */
-        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, inputParameters, sampleRate,
-                                           &stream->input->hpiDevice, &stream->input->hpiFormat ) );
-        /* Open stream and set format */
-        PA_ENSURE_( PaAsiHpi_OpenInput( hostApi, stream->input->hpiDevice, &stream->input->hpiFormat,
-                                        &stream->input->hpiStream ) );
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-        hostInputSampleFormat = PaAsiHpi_HpiToPaFormat( stream->input->hpiFormat.wFormat );
-        stream->input->bytesPerFrame = inputChannelCount * Pa_GetSampleSize( hostInputSampleFormat );
-        assert( stream->input->bytesPerFrame > 0 );
-        /* Allocate host and temp buffers of appropriate size */
-        PA_ENSURE_( PaAsiHpi_SetupBuffers( stream->input, stream->pollingInterval,
-                                           framesPerHostBuffer, inputParameters->suggestedLatency ) );
-    }
-    if( outputParameters )
-    {
-        /* Create blank stream component structure */
-        PA_UNLESS_( stream->output = (PaAsiHpiStreamComponent *)PaUtil_AllocateMemory( sizeof(PaAsiHpiStreamComponent) ),
-                    paInsufficientMemory );
-        memset( stream->output, 0, sizeof(PaAsiHpiStreamComponent) );
-        /* Create/validate format */
-        PA_ENSURE_( PaAsiHpi_CreateFormat( hostApi, outputParameters, sampleRate,
-                                           &stream->output->hpiDevice, &stream->output->hpiFormat ) );
-        /* Open stream and check format */
-        PA_ENSURE_( PaAsiHpi_OpenOutput( hostApi, stream->output->hpiDevice,
-                                         &stream->output->hpiFormat,
-                                         &stream->output->hpiStream ) );
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        hostOutputSampleFormat = PaAsiHpi_HpiToPaFormat( stream->output->hpiFormat.wFormat );
-        stream->output->bytesPerFrame = outputChannelCount * Pa_GetSampleSize( hostOutputSampleFormat );
-        /* Allocate host and temp buffers of appropriate size */
-        PA_ENSURE_( PaAsiHpi_SetupBuffers( stream->output, stream->pollingInterval,
-                                           framesPerHostBuffer, outputParameters->suggestedLatency ) );
-    }
-
-    /* Determine maximum frames per host buffer (least common denominator of input/output) */
-    if( inputParameters && outputParameters )
-    {
-        stream->maxFramesPerHostBuffer = PA_MIN( stream->input->tempBufferSize / stream->input->bytesPerFrame,
-                                         stream->output->tempBufferSize / stream->output->bytesPerFrame );
-    }
-    else
-    {
-        stream->maxFramesPerHostBuffer = inputParameters ? stream->input->tempBufferSize / stream->input->bytesPerFrame
-                                         : stream->output->tempBufferSize / stream->output->bytesPerFrame;
-    }
-    assert( stream->maxFramesPerHostBuffer > 0 );
-    /* Initialize various other stream parameters */
-    stream->neverDropInput = streamFlags & paNeverDropInput;
-    stream->state = paAsiHpiStoppedState;
-
-    /* Initialize either callback or blocking interface */
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->baseStreamRep,
-                                               &hpiHostApi->callbackStreamInterface,
-                                               streamCallback, userData );
-        stream->callbackMode = 1;
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->baseStreamRep,
-                                               &hpiHostApi->blockingStreamInterface,
-                                               streamCallback, userData );
-        /* Pre-allocate non-interleaved user buffer pointers for blocking interface */
-        PA_UNLESS_( stream->blockingUserBufferCopy =
-                        PaUtil_AllocateMemory( sizeof(void *) * PA_MAX( inputChannelCount, outputChannelCount ) ),
-                    paInsufficientMemory );
-        stream->callbackMode = 0;
-    }
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-    /* Following pa_linux_alsa's lead, we operate with fixed host buffer size by default, */
-    /* since other modes will invariably lead to block adaption (maybe Bounded better?) */
-    PA_ENSURE_( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-                outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-                sampleRate, streamFlags,
-                framesPerBuffer, framesPerHostBuffer, paUtilFixedHostBufferSize,
-                streamCallback, userData ) );
-
-    stream->baseStreamRep.streamInfo.structVersion = 1;
-    stream->baseStreamRep.streamInfo.sampleRate = sampleRate;
-    /* Determine input latency from buffer processor and buffer sizes */
-    if( stream->input )
-    {
-        PaTime bufferDuration = ( stream->input->hostBufferSize + stream->input->hardwareBufferSize )
-                                / sampleRate / stream->input->bytesPerFrame;
-        stream->baseStreamRep.streamInfo.inputLatency =
-            PaUtil_GetBufferProcessorInputLatency( &stream->bufferProcessor ) +
-            bufferDuration - stream->maxFramesPerHostBuffer / sampleRate;
-        assert( stream->baseStreamRep.streamInfo.inputLatency > 0.0 );
-    }
-    /* Determine output latency from buffer processor and buffer sizes */
-    if( stream->output )
-    {
-        PaTime bufferDuration = ( stream->output->hostBufferSize + stream->output->hardwareBufferSize )
-                                / sampleRate / stream->output->bytesPerFrame;
-        /* Take buffer size cap into account (see PaAsiHpi_WaitForFrames) */
-        if( !stream->input && (stream->output->outputBufferCap > 0) )
-        {
-            bufferDuration = PA_MIN( bufferDuration,
-                                     stream->output->outputBufferCap / sampleRate / stream->output->bytesPerFrame );
-        }
-        stream->baseStreamRep.streamInfo.outputLatency =
-            PaUtil_GetBufferProcessorOutputLatency( &stream->bufferProcessor ) +
-            bufferDuration - stream->maxFramesPerHostBuffer / sampleRate;
-        assert( stream->baseStreamRep.streamInfo.outputLatency > 0.0 );
-    }
-
-    /* Report stream info, for debugging purposes */
-    PaAsiHpi_StreamDump( stream );
-
-    /* Save initialized stream to PA stream list */
-    *s = (PaStream*)stream;
-    return result;
-
-error:
-    CloseStream( (PaStream*)stream );
-    return result;
-}
-
-
-/** Close PortAudio stream.
- When CloseStream() is called, the multi-api layer ensures that the stream has already
- been stopped or aborted. This closes the underlying HPI streams and deallocates stream
- buffers and structs.
-
- @param s Pointer to PortAudio stream
-
- @return PortAudio error code
-*/
-static PaError CloseStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-
-    /* If stream is already gone, all is well */
-    if( stream == NULL )
-        return paNoError;
-
-    /* Generic stream cleanup */
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->baseStreamRep );
-
-    /* Implementation-specific details - close internal streams */
-    if( stream->input )
-    {
-        /* Close HPI stream (freeing BBM host buffer in the process, if used) */
-        if( stream->input->hpiStream )
-        {
-            PA_ASIHPI_UNLESS_( HPI_InStreamClose( stream->input->hpiDevice->subSys,
-                                                  stream->input->hpiStream ), paUnanticipatedHostError );
-        }
-        /* Free temp buffer and stream component */
-        PaUtil_FreeMemory( stream->input->tempBuffer );
-        PaUtil_FreeMemory( stream->input );
-    }
-    if( stream->output )
-    {
-        /* Close HPI stream (freeing BBM host buffer in the process, if used) */
-        if( stream->output->hpiStream )
-        {
-            PA_ASIHPI_UNLESS_( HPI_OutStreamClose( stream->output->hpiDevice->subSys,
-                                                   stream->output->hpiStream ), paUnanticipatedHostError );
-        }
-        /* Free temp buffer and stream component */
-        PaUtil_FreeMemory( stream->output->tempBuffer );
-        PaUtil_FreeMemory( stream->output );
-    }
-
-    PaUtil_FreeMemory( stream->blockingUserBufferCopy );
-    PaUtil_FreeMemory( stream );
-
-error:
-    return result;
-}
-
-
-/** Prime HPI output stream with silence.
- This resets the output stream and uses PortAudio helper routines to fill the
- temp buffer with silence. It then writes two host buffers to the stream. This is supposed
- to be called before the stream is started. It has no effect on input-only streams.
-
- @param stream Pointer to stream struct
-
- @return PortAudio error code
- */
-static PaError PaAsiHpi_PrimeOutputWithSilence( PaAsiHpiStream *stream )
-{
-    PaError result = paNoError;
-    PaAsiHpiStreamComponent *out;
-    PaUtilZeroer *zeroer;
-    PaSampleFormat outputFormat;
-    HPI_DATA data;
-
-    assert( stream );
-    out = stream->output;
-    /* Only continue if stream has output channels */
-    if( !out )
-        return result;
-    assert( out->tempBuffer );
-
-    /* Clear all existing data in hardware playback buffer */
-    PA_ASIHPI_UNLESS_( HPI_OutStreamReset( out->hpiDevice->subSys,
-                                           out->hpiStream ), paUnanticipatedHostError );
-    /* Fill temp buffer with silence */
-    outputFormat = PaAsiHpi_HpiToPaFormat( out->hpiFormat.wFormat );
-    zeroer = PaUtil_SelectZeroer( outputFormat );
-    zeroer(out->tempBuffer, 1, out->tempBufferSize / Pa_GetSampleSize(outputFormat) );
-    /* Write temp buffer to hardware fifo twice, to get started */
-    PA_ASIHPI_UNLESS_( HPI_DataCreate( &data, &out->hpiFormat, out->tempBuffer, out->tempBufferSize ),
-                       paUnanticipatedHostError );
-    PA_ASIHPI_UNLESS_( HPI_OutStreamWrite( out->hpiDevice->subSys,
-                                           out->hpiStream, &data ), paUnanticipatedHostError );
-    PA_ASIHPI_UNLESS_( HPI_OutStreamWrite( out->hpiDevice->subSys,
-                                           out->hpiStream, &data ), paUnanticipatedHostError );
-
-error:
-    return result;
-}
-
-
-/** Start HPI streams (both input + output).
- This starts all HPI streams in the PortAudio stream. Output streams are first primed with
- silence, if required. After this call the PA stream is in the Active state.
-
- @todo Implement priming via the user callback
-
- @param stream Pointer to stream struct
-
- @param outputPrimed True if output is already primed (if false, silence will be loaded before starting)
-
- @return PortAudio error code
- */
-static PaError PaAsiHpi_StartStream( PaAsiHpiStream *stream, int outputPrimed )
-{
-    PaError result = paNoError;
-
-    if( stream->input )
-    {
-        PA_ASIHPI_UNLESS_( HPI_InStreamStart( stream->input->hpiDevice->subSys,
-                                              stream->input->hpiStream ), paUnanticipatedHostError );
-    }
-    if( stream->output )
-    {
-        if( !outputPrimed )
-        {
-            /* Buffer isn't primed, so load stream with silence */
-            PA_ENSURE_( PaAsiHpi_PrimeOutputWithSilence( stream ) );
-        }
-        PA_ASIHPI_UNLESS_( HPI_OutStreamStart( stream->output->hpiDevice->subSys,
-                                               stream->output->hpiStream ), paUnanticipatedHostError );
-    }
-    stream->state = paAsiHpiActiveState;
-    stream->callbackFinished = 0;
-
-    /* Report stream info for debugging purposes */
-    /*    PaAsiHpi_StreamDump( stream );   */
-
-error:
-    return result;
-}
-
-
-/** Start PortAudio stream.
- If the stream has a callback interface, this starts a helper thread to feed the user callback.
- The thread will then take care of starting the HPI streams, and this function will block
- until the streams actually start. In the case of a blocking interface, the HPI streams
- are simply started.
-
- @param s Pointer to PortAudio stream
-
- @return PortAudio error code
-*/
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-
-    assert( stream );
-
-    /* Ready the processor */
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-
-    if( stream->callbackMode )
-    {
-        /* Create and start callback engine thread */
-        /* Also waits 1 second for stream to be started by engine thread (otherwise aborts) */
-        PA_ENSURE_( PaUnixThread_New( &stream->thread, &CallbackThreadFunc, stream, 1., 0 ) );
-    }
-    else
-    {
-        PA_ENSURE_( PaAsiHpi_StartStream( stream, 0 ) );
-    }
-
-error:
-    return result;
-}
-
-
-/** Stop HPI streams (input + output), either softly or abruptly.
- If abort is false, the function blocks until the output stream is drained, otherwise it
- stops immediately and discards data in the stream hardware buffers.
-
- This function is safe to call from the callback engine thread as well as the main thread.
-
- @param stream Pointer to stream struct
-
- @param abort True if samples in output buffer should be discarded (otherwise blocks until stream is done)
-
- @return PortAudio error code
-
- */
-static PaError PaAsiHpi_StopStream( PaAsiHpiStream *stream, int abort )
-{
-    PaError result = paNoError;
-
-    assert( stream );
-
-    /* Input channels */
-    if( stream->input )
-    {
-        PA_ASIHPI_UNLESS_( HPI_InStreamReset( stream->input->hpiDevice->subSys,
-                                              stream->input->hpiStream ), paUnanticipatedHostError );
-    }
-    /* Output channels */
-    if( stream->output )
-    {
-        if( !abort )
-        {
-            /* Wait until HPI output stream is drained */
-            while( 1 )
-            {
-                PaAsiHpiStreamInfo streamInfo;
-                PaTime timeLeft;
-
-                /* Obtain number of samples waiting to be played */
-                PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &streamInfo ) );
-                /* Check if stream is drained */
-                if( (streamInfo.state != HPI_STATE_PLAYING) &&
-                        (streamInfo.dataSize < stream->output->bytesPerFrame * PA_ASIHPI_MIN_FRAMES_) )
-                    break;
-                /* Sleep amount of time represented by remaining samples */
-                timeLeft = 1000.0 * streamInfo.dataSize / stream->output->bytesPerFrame
-                           / stream->baseStreamRep.streamInfo.sampleRate;
-                Pa_Sleep( (long)ceil( timeLeft ) );
-            }
-        }
-        PA_ASIHPI_UNLESS_( HPI_OutStreamReset( stream->output->hpiDevice->subSys,
-                                               stream->output->hpiStream ), paUnanticipatedHostError );
-    }
-
-    /* Report stream info for debugging purposes */
-    /*    PaAsiHpi_StreamDump( stream ); */
-
-error:
-    return result;
-}
-
-
-/** Stop or abort PortAudio stream.
-
- This function is used to explicitly stop the PortAudio stream (via StopStream/AbortStream),
- as opposed to the situation when the callback finishes with a result other than paContinue.
- If a stream is in callback mode we will have to inspect whether the background thread has
- finished, or we will have to take it out. In either case we join the thread before returning.
- In blocking mode, we simply tell HPI to stop abruptly (abort) or finish buffers (drain).
- The PortAudio stream will be in the Stopped state after a call to this function.
-
- Don't call this from the callback engine thread!
-
- @param stream Pointer to stream struct
-
- @param abort True if samples in output buffer should be discarded (otherwise blocks until stream is done)
-
- @return PortAudio error code
-*/
-static PaError PaAsiHpi_ExplicitStop( PaAsiHpiStream *stream, int abort )
-{
-    PaError result = paNoError;
-
-    /* First deal with the callback thread, cancelling and/or joining it if necessary */
-    if( stream->callbackMode )
-    {
-        PaError threadRes;
-        stream->callbackAbort = abort;
-        if( abort )
-        {
-            PA_DEBUG(( "Aborting callback\n" ));
-        }
-        else
-        {
-            PA_DEBUG(( "Stopping callback\n" ));
-        }
-        PA_ENSURE_( PaUnixThread_Terminate( &stream->thread, !abort, &threadRes ) );
-        if( threadRes != paNoError )
-        {
-            PA_DEBUG(( "Callback thread returned: %d\n", threadRes ));
-        }
-    }
-    else
-    {
-        PA_ENSURE_( PaAsiHpi_StopStream( stream, abort ) );
-    }
-
-    stream->state = paAsiHpiStoppedState;
-
-error:
-    return result;
-}
-
-
-/** Stop PortAudio stream.
- This blocks until the output buffers are drained.
-
- @param s Pointer to PortAudio stream
-
- @return PortAudio error code
-*/
-static PaError StopStream( PaStream *s )
-{
-    return PaAsiHpi_ExplicitStop( (PaAsiHpiStream *) s, 0 );
-}
-
-
-/** Abort PortAudio stream.
- This discards any existing data in output buffers and stops the stream immediately.
-
- @param s Pointer to PortAudio stream
-
- @return PortAudio error code
-*/
-static PaError AbortStream( PaStream *s )
-{
-    return PaAsiHpi_ExplicitStop( (PaAsiHpiStream * ) s, 1 );
-}
-
-
-/** Determine whether the stream is stopped.
- A stream is considered to be stopped prior to a successful call to StartStream and after
- a successful call to StopStream or AbortStream. If a stream callback returns a value other
- than paContinue the stream is NOT considered to be stopped (it is in CallbackFinished state).
-
- @param s Pointer to PortAudio stream
-
- @return Returns one (1) when the stream is stopped, zero (0) when the stream is running, or
-         a PaErrorCode (which are always negative) if PortAudio is not initialized or an
-         error is encountered.
-*/
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-
-    assert( stream );
-    return stream->state == paAsiHpiStoppedState ? 1 : 0;
-}
-
-
-/** Determine whether the stream is active.
- A stream is active after a successful call to StartStream(), until it becomes inactive either
- as a result of a call to StopStream() or AbortStream(), or as a result of a return value
- other than paContinue from the stream callback. In the latter case, the stream is considered
- inactive after the last buffer has finished playing.
-
- @param s Pointer to PortAudio stream
-
- @return Returns one (1) when the stream is active (i.e. playing or recording audio),
-         zero (0) when not playing, or a PaErrorCode (which are always negative)
-         if PortAudio is not initialized or an error is encountered.
-*/
-static PaError IsStreamActive( PaStream *s )
-{
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-
-    assert( stream );
-    return stream->state == paAsiHpiActiveState ? 1 : 0;
-}
-
-
-/** Returns current stream time.
- This corresponds to the system clock. The clock should run continuously while the stream
- is open, i.e. between calls to OpenStream() and CloseStream(), therefore a frame counter
- is not good enough.
-
- @param s Pointer to PortAudio stream
-
- @return Stream time, in seconds
- */
-static PaTime GetStreamTime( PaStream *s )
-{
-    return PaUtil_GetTime();
-}
-
-
-/** Returns CPU load.
-
- @param s Pointer to PortAudio stream
-
- @return CPU load (0.0 if blocking interface is used)
- */
-static double GetStreamCpuLoad( PaStream *s )
-{
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-
-    return stream->callbackMode ? PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer ) : 0.0;
-}
-
-/* --------------------------- Callback Interface --------------------------- */
-
-/** Exit routine which is called when callback thread quits.
- This takes care of stopping the HPI streams (either waiting for output to finish, or
- abruptly). It also calls the user-supplied StreamFinished callback, and sets the
- stream state to CallbackFinished if it was reached via a non-paContinue return from
- the user callback function.
-
- @param userData A pointer to an open stream previously created with Pa_OpenStream
- */
-static void PaAsiHpi_OnThreadExit( void *userData )
-{
-    PaAsiHpiStream *stream = (PaAsiHpiStream *) userData;
-
-    assert( stream );
-
-    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
-
-    PA_DEBUG(( "%s: Stopping HPI streams\n", __FUNCTION__ ));
-    PaAsiHpi_StopStream( stream, stream->callbackAbort );
-    PA_DEBUG(( "%s: Stoppage\n", __FUNCTION__ ));
-
-    /* Eventually notify user all buffers have played */
-    if( stream->baseStreamRep.streamFinishedCallback )
-    {
-        stream->baseStreamRep.streamFinishedCallback( stream->baseStreamRep.userData );
-    }
-
-    /* Unfortunately both explicit calls to Stop/AbortStream (leading to Stopped state)
-     and implicit stops via paComplete/paAbort (leading to CallbackFinished state)
-     end up here - need another flag to remind us which is the case */
-    if( stream->callbackFinished )
-        stream->state = paAsiHpiCallbackFinishedState;
-}
-
-
-/** Wait until there is enough frames to fill a host buffer.
- The routine attempts to sleep until at least a full host buffer can be retrieved from the
- input HPI stream and passed to the output HPI stream. It will first sleep until enough
- output space is available, as this is usually easily achievable. If it is an output-only
- stream, it will also sleep if the hardware buffer is too full, thereby throttling the
- filling of the output buffer and reducing output latency. The routine then blocks until
- enough input samples are available, unless this will cause an output underflow. In the
- process, input overflows and output underflows are indicated.
-
- @param stream Pointer to stream struct
-
- @param framesAvail Returns the number of available frames
-
- @param cbFlags Overflows and underflows indicated in here
-
- @return PortAudio error code (only paUnanticipatedHostError expected)
- */
-static PaError PaAsiHpi_WaitForFrames( PaAsiHpiStream *stream, unsigned long *framesAvail,
-                                       PaStreamCallbackFlags *cbFlags )
-{
-    PaError result = paNoError;
-    double sampleRate;
-    unsigned long framesTarget;
-    HW32 outputData = 0, outputSpace = 0, inputData = 0, framesLeft = 0;
-
-    assert( stream );
-    assert( stream->input || stream->output );
-
-    sampleRate = stream->baseStreamRep.streamInfo.sampleRate;
-    /* We have to come up with this much frames on both input and output */
-    framesTarget = stream->bufferProcessor.framesPerHostBuffer;
-    assert( framesTarget > 0 );
-
-    while( 1 )
-    {
-        PaAsiHpiStreamInfo info;
-        /* Check output first, as this takes priority in the default full-duplex mode */
-        if( stream->output )
-        {
-            PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
-            /* Wait until enough space is available in output buffer to receive a full block */
-            if( info.availableFrames < framesTarget )
-            {
-                framesLeft = framesTarget - info.availableFrames;
-                Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
-                continue;
-            }
-            /* Wait until the data in hardware buffer has dropped to a sensible level.
-             Without this, the hardware buffer quickly fills up in the absence of an input
-             stream to regulate its data rate (if data generation is fast). This leads to
-             large latencies, as the AudioScience hardware buffers are humongous.
-             This is similar to the default "Hardware Buffering=off" option in the
-             AudioScience WAV driver. */
-            if( !stream->input && (stream->output->outputBufferCap > 0) &&
-                    ( info.totalBufferedData > stream->output->outputBufferCap / stream->output->bytesPerFrame ) )
-            {
-                framesLeft = info.totalBufferedData - stream->output->outputBufferCap / stream->output->bytesPerFrame;
-                Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
-                continue;
-            }
-            outputData = info.totalBufferedData;
-            outputSpace = info.availableFrames;
-            /* Report output underflow to callback */
-            if( info.underflow )
-            {
-                *cbFlags |= paOutputUnderflow;
-            }
-        }
-
-        /* Now check input side */
-        if( stream->input )
-        {
-            PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
-            /* If a full block of samples hasn't been recorded yet, wait for it if possible */
-            if( info.availableFrames < framesTarget )
-            {
-                framesLeft = framesTarget - info.availableFrames;
-                /* As long as output is not disrupted in the process, wait for a full
-                block of input samples */
-                if( !stream->output || (outputData > framesLeft) )
-                {
-                    Pa_Sleep( (long)ceil( 1000 * framesLeft / sampleRate ) );
-                    continue;
-                }
-            }
-            inputData = info.availableFrames;
-            /** @todo The paInputOverflow flag should be set in the callback containing the
-             first input sample following the overflow. That means the block currently sitting
-             at the fore-front of recording, i.e. typically the one containing the newest (last)
-             sample in the HPI buffer system. This is most likely not the same as the current
-             block of data being passed to the callback. The current overflow should ideally
-             be noted in an overflow list of sorts, with an indication of when it should be
-             reported. The trouble starts if there are several separate overflow incidents,
-             given a big input buffer. Oh well, something to try out later... */
-            if( info.overflow )
-            {
-                *cbFlags |= paInputOverflow;
-            }
-        }
-        break;
-    }
-    /* Full-duplex stream */
-    if( stream->input && stream->output )
-    {
-        if( outputSpace >= framesTarget )
-            *framesAvail = outputSpace;
-        /* If input didn't make the target, keep the output count instead (input underflow) */
-        if( (inputData >= framesTarget) && (inputData < outputSpace) )
-            *framesAvail = inputData;
-    }
-    else
-    {
-        *framesAvail = stream->input ? inputData : outputSpace;
-    }
-
-error:
-    return result;
-}
-
-
-/** Obtain recording, current and playback timestamps of stream.
- The current time is determined by the system clock. This "now" timestamp occurs at the
- forefront of recording (and playback in the full-duplex case), which happens later than the
- input timestamp by an amount equal to the total number of recorded frames in the input buffer.
- The output timestamp indicates when the next generated sample will actually be played. This
- happens after all the samples currently in the output buffer are played. The output timestamp
- therefore follows the current timestamp by an amount equal to the number of frames yet to be
- played back in the output buffer.
-
- If the current timestamp is the present, the input timestamp is in the past and the output
- timestamp is in the future.
-
- @param stream Pointer to stream struct
-
- @param timeInfo Pointer to timeInfo struct that will contain timestamps
- */
-static void PaAsiHpi_CalculateTimeInfo( PaAsiHpiStream *stream, PaStreamCallbackTimeInfo *timeInfo )
-{
-    PaAsiHpiStreamInfo streamInfo;
-    double sampleRate;
-
-    assert( stream );
-    assert( timeInfo );
-    sampleRate = stream->baseStreamRep.streamInfo.sampleRate;
-
-    /* The current time ("now") is at the forefront of both recording and playback */
-    timeInfo->currentTime = GetStreamTime( (PaStream *)stream );
-    /* The last sample in the input buffer was recorded just now, so the first sample
-     happened (number of recorded samples)/sampleRate ago */
-    timeInfo->inputBufferAdcTime = timeInfo->currentTime;
-    if( stream->input )
-    {
-        PaAsiHpi_GetStreamInfo( stream->input, &streamInfo );
-        timeInfo->inputBufferAdcTime -= streamInfo.totalBufferedData / sampleRate;
-    }
-    /* The first of the outgoing samples will be played after all the samples in the output
-     buffer is done */
-    timeInfo->outputBufferDacTime = timeInfo->currentTime;
-    if( stream->output )
-    {
-        PaAsiHpi_GetStreamInfo( stream->output, &streamInfo );
-        timeInfo->outputBufferDacTime += streamInfo.totalBufferedData / sampleRate;
-    }
-}
-
-
-/** Read from HPI input stream and register buffers.
- This reads data from the HPI input stream (if it exists) and registers the temp stream
- buffers of both input and output streams with the buffer processor. In the process it also
- handles input underflows in the full-duplex case.
-
- @param stream Pointer to stream struct
-
- @param numFrames On entrance the number of available frames, on exit the number of
-                  received frames
-
- @param cbFlags Indicates overflows and underflows
-
- @return PortAudio error code
- */
-static PaError PaAsiHpi_BeginProcessing( PaAsiHpiStream *stream, unsigned long *numFrames,
-        PaStreamCallbackFlags *cbFlags )
-{
-    PaError result = paNoError;
-
-    assert( stream );
-    if( *numFrames > stream->maxFramesPerHostBuffer )
-        *numFrames = stream->maxFramesPerHostBuffer;
-
-    if( stream->input )
-    {
-        PaAsiHpiStreamInfo info;
-        HPI_DATA data;
-        HW32 framesToGet = *numFrames;
-
-        /* Check for overflows and underflows yet again */
-        PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
-        if( info.overflow )
-        {
-            *cbFlags |= paInputOverflow;
-        }
-        /* Input underflow if less than expected number of samples pitch up */
-        if( framesToGet > info.availableFrames )
-        {
-            PaUtilZeroer *zeroer;
-            PaSampleFormat inputFormat;
-
-            /* Never call an input-only stream with InputUnderflow set */
-            if( stream->output )
-                *cbFlags |= paInputUnderflow;
-            framesToGet = info.availableFrames;
-            /* Fill temp buffer with silence (to make up for missing input samples) */
-            inputFormat = PaAsiHpi_HpiToPaFormat( stream->input->hpiFormat.wFormat );
-            zeroer = PaUtil_SelectZeroer( inputFormat );
-            zeroer(stream->input->tempBuffer, 1,
-                   stream->input->tempBufferSize / Pa_GetSampleSize(inputFormat) );
-        }
-
-        /* Setup HPI data structure around temp buffer */
-        HPI_DataCreate( &data, &stream->input->hpiFormat, stream->input->tempBuffer,
-                        framesToGet * stream->input->bytesPerFrame );
-        /* Read block of data into temp buffer */
-        PA_ASIHPI_UNLESS_( HPI_InStreamRead( stream->input->hpiDevice->subSys,
-                                             stream->input->hpiStream, &data ),
-                           paUnanticipatedHostError );
-        /* Register temp buffer with buffer processor (always FULL buffer) */
-        PaUtil_SetInputFrameCount( &stream->bufferProcessor, *numFrames );
-        /* HPI interface only allows interleaved channels */
-        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
-                                            0, stream->input->tempBuffer,
-                                            stream->input->hpiFormat.wChannels );
-    }
-    if( stream->output )
-    {
-        /* Register temp buffer with buffer processor */
-        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, *numFrames );
-        /* HPI interface only allows interleaved channels */
-        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
-                                             0, stream->output->tempBuffer,
-                                             stream->output->hpiFormat.wChannels );
-    }
-
-error:
-    return result;
-}
-
-
-/** Flush output buffers to HPI output stream.
- This completes the processing cycle by writing the temp buffer to the HPI interface.
- Additional output underflows are caught before data is written to the stream, as this
- action typically remedies the underflow and hides it in the process.
-
- @param stream Pointer to stream struct
-
- @param numFrames The number of frames to write to the output stream
-
- @param cbFlags Indicates overflows and underflows
- */
-static PaError PaAsiHpi_EndProcessing( PaAsiHpiStream *stream, unsigned long numFrames,
-                                       PaStreamCallbackFlags *cbFlags )
-{
-    PaError result = paNoError;
-
-    assert( stream );
-
-    if( stream->output )
-    {
-        PaAsiHpiStreamInfo info;
-        HPI_DATA data;
-
-        /* Check for underflows after the (potentially time-consuming) callback */
-        PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
-        if( info.underflow )
-        {
-            *cbFlags |= paOutputUnderflow;
-        }
-
-        /* Setup HPI data structure around temp buffer */
-        HPI_DataCreate( &data, &stream->output->hpiFormat, stream->output->tempBuffer,
-                        numFrames * stream->output->bytesPerFrame );
-        /* Write temp buffer to HPI stream */
-        PA_ASIHPI_UNLESS_( HPI_OutStreamWrite( stream->output->hpiDevice->subSys,
-                                               stream->output->hpiStream, &data ),
-                           paUnanticipatedHostError );
-    }
-
-error:
-    return result;
-}
-
-
-/** Main callback engine.
- This function runs in a separate thread and does all the work of fetching audio data from
- the AudioScience card via the HPI interface, feeding it to the user callback via the buffer
- processor, and delivering the resulting output data back to the card via HPI calls.
- It is started and terminated when the PortAudio stream is started and stopped, and starts
- the HPI streams on startup.
-
- @param userData A pointer to an open stream previously created with Pa_OpenStream.
-*/
-static void *CallbackThreadFunc( void *userData )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream *) userData;
-    int callbackResult = paContinue;
-
-    assert( stream );
-
-    /* Cleanup routine stops streams on thread exit */
-    pthread_cleanup_push( &PaAsiHpi_OnThreadExit, stream );
-
-    /* Start HPI streams and notify parent when we're done */
-    PA_ENSURE_( PaUnixThread_PrepareNotify( &stream->thread ) );
-    /* Buffer will be primed with silence */
-    PA_ENSURE_( PaAsiHpi_StartStream( stream, 0 ) );
-    PA_ENSURE_( PaUnixThread_NotifyParent( &stream->thread ) );
-
-    /* MAIN LOOP */
-    while( 1 )
-    {
-        PaStreamCallbackFlags cbFlags = 0;
-        unsigned long framesAvail, framesGot;
-
-        pthread_testcancel();
-
-        /** @concern StreamStop if the main thread has requested a stop and the stream has not
-        * been effectively stopped we signal this condition by modifying callbackResult
-        * (we'll want to flush buffered output). */
-        if( PaUnixThread_StopRequested( &stream->thread ) && (callbackResult == paContinue) )
-        {
-            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
-            callbackResult = paComplete;
-        }
-
-        /* Start winding down thread if requested */
-        if( callbackResult != paContinue )
-        {
-            stream->callbackAbort = (callbackResult == paAbort);
-            if( stream->callbackAbort ||
-                    /** @concern BlockAdaption: Go on if adaption buffers are empty */
-                    PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
-            {
-                goto end;
-            }
-            PA_DEBUG(( "%s: Flushing buffer processor\n", __FUNCTION__ ));
-            /* There is still buffered output that needs to be processed */
-        }
-
-        /* SLEEP */
-        /* Wait for data (or buffer space) to become available. This basically sleeps and
-        polls the HPI interface until a full block of frames can be moved. */
-        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
-
-        /* Consume buffer space. Once we have a number of frames available for consumption we
-        must retrieve the data from the HPI interface and pass it to the PA buffer processor.
-        We should be prepared to process several chunks successively. */
-        while( framesAvail > 0 )
-        {
-            PaStreamCallbackTimeInfo timeInfo = {0, 0, 0};
-
-            pthread_testcancel();
-
-            framesGot = framesAvail;
-            if( stream->bufferProcessor.hostBufferSizeMode == paUtilFixedHostBufferSize )
-            {
-                /* We've committed to a fixed host buffer size, stick to that */
-                framesGot = framesGot >= stream->maxFramesPerHostBuffer ? stream->maxFramesPerHostBuffer : 0;
-            }
-            else
-            {
-                /* We've committed to an upper bound on the size of host buffers */
-                assert( stream->bufferProcessor.hostBufferSizeMode == paUtilBoundedHostBufferSize );
-                framesGot = PA_MIN( framesGot, stream->maxFramesPerHostBuffer );
-            }
-
-            /* Obtain buffer timestamps */
-            PaAsiHpi_CalculateTimeInfo( stream, &timeInfo );
-            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, cbFlags );
-            /* CPU load measurement should include processing activivity external to the stream callback */
-            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-            if( framesGot > 0 )
-            {
-                /* READ FROM HPI INPUT STREAM */
-                PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
-                /* Input overflow in a full-duplex stream makes for interesting times */
-                if( stream->input && stream->output && (cbFlags & paInputOverflow) )
-                {
-                    /* Special full-duplex paNeverDropInput mode */
-                    if( stream->neverDropInput )
-                    {
-                        PaUtil_SetNoOutput( &stream->bufferProcessor );
-                        cbFlags |= paOutputOverflow;
-                    }
-                }
-                /* CALL USER CALLBACK WITH INPUT DATA, AND OBTAIN OUTPUT DATA */
-                PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-                /* Clear overflow and underflow information (but PaAsiHpi_EndProcessing might
-                still show up output underflow that will carry over to next round) */
-                cbFlags = 0;
-                /*  WRITE TO HPI OUTPUT STREAM */
-                PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
-                /* Advance frame counter */
-                framesAvail -= framesGot;
-            }
-            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesGot );
-
-            if( framesGot == 0 )
-            {
-                /* Go back to polling for more frames */
-                break;
-
-            }
-            if( callbackResult != paContinue )
-                break;
-        }
-    }
-
-    /* This code is unreachable, but important to include regardless because it
-     * is possibly a macro with a closing brace to match the opening brace in
-     * pthread_cleanup_push() above.  The documentation states that they must
-     * always occur in pairs. */
-    pthread_cleanup_pop( 1 );
-
-end:
-    /* Indicates normal exit of callback, as opposed to the thread getting killed explicitly */
-    stream->callbackFinished = 1;
-    PA_DEBUG(( "%s: Thread %d exiting (callbackResult = %d)\n ",
-               __FUNCTION__, pthread_self(), callbackResult ));
-    /* Exit from thread and report any PortAudio error in the process */
-    PaUnixThreading_EXIT( result );
-error:
-    goto end;
-}
-
-/* --------------------------- Blocking Interface --------------------------- */
-
-/* As separate stream interfaces are used for blocking and callback streams, the following
- functions can be guaranteed to only be called for blocking streams. */
-
-/** Read data from input stream.
- This reads the indicated number of frames into the supplied buffer from an input stream,
- and blocks until this is done.
-
- @param s Pointer to PortAudio stream
-
- @param buffer Pointer to buffer that will receive interleaved data (or an array of pointers
-               to a buffer for each non-interleaved channel)
-
- @param frames Number of frames to read from stream
-
- @return PortAudio error code (also indicates overflow via paInputOverflowed)
- */
-static PaError ReadStream( PaStream *s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-    PaAsiHpiStreamInfo info;
-    void *userBuffer;
-
-    assert( stream );
-    PA_UNLESS_( stream->input, paCanNotReadFromAnOutputOnlyStream );
-
-    /* Check for input overflow since previous call to ReadStream */
-    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
-    if( info.overflow )
-    {
-        result = paInputOverflowed;
-    }
-
-    /* NB Make copy of user buffer pointers, since they are advanced by buffer processor */
-    if( stream->bufferProcessor.userInputIsInterleaved )
-    {
-        userBuffer = buffer;
-    }
-    else
-    {
-        /* Copy channels into local array */
-        userBuffer = stream->blockingUserBufferCopy;
-        memcpy( userBuffer, buffer, sizeof (void *) * stream->input->hpiFormat.wChannels );
-    }
-
-    while( frames > 0 )
-    {
-        unsigned long framesGot, framesAvail;
-        PaStreamCallbackFlags cbFlags = 0;
-
-        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
-        framesGot = PA_MIN( framesAvail, frames );
-        PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
-
-        if( framesGot > 0 )
-        {
-            framesGot = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesGot );
-            PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
-            /* Advance frame counter */
-            frames -= framesGot;
-        }
-    }
-
-error:
-    return result;
-}
-
-
-/** Write data to output stream.
- This writes the indicated number of frames from the supplied buffer to an output stream,
- and blocks until this is done.
-
- @param s Pointer to PortAudio stream
-
- @param buffer Pointer to buffer that provides interleaved data (or an array of pointers
-               to a buffer for each non-interleaved channel)
-
- @param frames Number of frames to write to stream
-
- @return PortAudio error code (also indicates underflow via paOutputUnderflowed)
- */
-static PaError WriteStream( PaStream *s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-    PaAsiHpiStreamInfo info;
-    const void *userBuffer;
-
-    assert( stream );
-    PA_UNLESS_( stream->output, paCanNotWriteToAnInputOnlyStream );
-
-    /* Check for output underflow since previous call to WriteStream */
-    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
-    if( info.underflow )
-    {
-        result = paOutputUnderflowed;
-    }
-
-    /* NB Make copy of user buffer pointers, since they are advanced by buffer processor */
-    if( stream->bufferProcessor.userOutputIsInterleaved )
-    {
-        userBuffer = buffer;
-    }
-    else
-    {
-        /* Copy channels into local array */
-        userBuffer = stream->blockingUserBufferCopy;
-        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->output->hpiFormat.wChannels );
-    }
-
-    while( frames > 0 )
-    {
-        unsigned long framesGot, framesAvail;
-        PaStreamCallbackFlags cbFlags = 0;
-
-        PA_ENSURE_( PaAsiHpi_WaitForFrames( stream, &framesAvail, &cbFlags ) );
-        framesGot = PA_MIN( framesAvail, frames );
-        PA_ENSURE_( PaAsiHpi_BeginProcessing( stream, &framesGot, &cbFlags ) );
-
-        if( framesGot > 0 )
-        {
-            framesGot = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, framesGot );
-            PA_ENSURE_( PaAsiHpi_EndProcessing( stream, framesGot, &cbFlags ) );
-            /* Advance frame counter */
-            frames -= framesGot;
-        }
-    }
-
-error:
-    return result;
-}
-
-
-/** Number of frames that can be read from input stream without blocking.
-
- @param s Pointer to PortAudio stream
-
- @return Number of frames, or PortAudio error code
- */
-static signed long GetStreamReadAvailable( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-    PaAsiHpiStreamInfo info;
-
-    assert( stream );
-    PA_UNLESS_( stream->input, paCanNotReadFromAnOutputOnlyStream );
-
-    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->input, &info ) );
-    /* Round down to the nearest host buffer multiple */
-    result = (info.availableFrames / stream->maxFramesPerHostBuffer) * stream->maxFramesPerHostBuffer;
-    if( info.overflow )
-    {
-        result = paInputOverflowed;
-    }
-
-error:
-    return result;
-}
-
-
-/** Number of frames that can be written to output stream without blocking.
-
- @param s Pointer to PortAudio stream
-
- @return Number of frames, or PortAudio error code
- */
-static signed long GetStreamWriteAvailable( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsiHpiStream *stream = (PaAsiHpiStream*)s;
-    PaAsiHpiStreamInfo info;
-
-    assert( stream );
-    PA_UNLESS_( stream->output, paCanNotWriteToAnInputOnlyStream );
-
-    PA_ENSURE_( PaAsiHpi_GetStreamInfo( stream->output, &info ) );
-    /* Round down to the nearest host buffer multiple */
-    result = (info.availableFrames / stream->maxFramesPerHostBuffer) * stream->maxFramesPerHostBuffer;
-    if( info.underflow )
-    {
-        result = paOutputUnderflowed;
-    }
-
-error:
-    return result;
-}
diff --git a/libs/portaudio/src/hostapi/asio/ASIO-README.txt b/libs/portaudio/src/hostapi/asio/ASIO-README.txt
deleted file mode 100644
index 9fb74ae16d..0000000000
--- a/libs/portaudio/src/hostapi/asio/ASIO-README.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-ASIO-README.txt
-
-This document contains information to help you compile PortAudio with 
-ASIO support. If you find any omissions or errors in this document 
-please notify Ross Bencina <rossb@audiomulch.com>.
-
-
-Building PortAudio with ASIO support
-------------------------------------
-
-To build PortAudio with ASIO support you need to compile and link with
-pa_asio.c, and files from the ASIO SDK (see below), along with the common 
-files from pa_common/ and platform specific files from pa_win/ (for Win32) 
-or pa_mac/ (for Macintosh).
-
-If you are compiling with a non-Microsoft compiler on windows, also 
-compile and link with iasiothiscallresolver.cpp (see below for 
-an explanation).
-
-For some platforms (MingW, possibly Mac), you may simply
-be able to type:
-
-./configure --with-host_os=mingw --with-winapi=asio [--with-asiodir=/usr/local/asiosdk2]
-make
-
-./configure --with-host_os=darwin --with-winapi=asio [--with-asiodir=/usr/local/asiosdk2]
-make
-
-and life will be good.
-
-
-Obtaining the ASIO SDK
-----------------------
-
-In order to build PortAudio with ASIO support, you need to download 
-the ASIO SDK (version 2.0) from Steinberg. Steinberg makes the ASIO 
-SDK available to anyone free of charge, however they do not permit its 
-source code to be distributed.
-
-NOTE: In some cases the ASIO SDK may require patching, see below 
-for further details.
-
-http://www.steinberg.net/en/ps/support/3rdparty/asio_sdk/
-
-If the above link is broken search Google for:
-"download steinberg ASIO SDK"
-
-
-
-Building the ASIO SDK on Macintosh
-----------------------------------
-
-To build the ASIO SDK on Macintosh you need to compile and link with the 
-following files from the ASIO SDK:
-
-host/asiodrivers.cpp 
-host/mac/asioshlib.cpp 
-host/mac/codefragements.cpp
-
-
-
-Building the ASIO SDK on Windows
---------------------------------
-
-To build the ASIO SDK on Windows you need to compile and link with the 
-following files from the ASIO SDK:
-
-asio_sdk\common\asio.cpp
-asio_sdk\host\asiodrivers.cpp
-asio_sdk\host\pc\asiolist.cpp
-
-You may also need to adjust your include paths to support inclusion of 
-header files from the above directories.
-
-The ASIO SDK depends on the following COM API functions: 
-CoInitialize, CoUninitialize, CoCreateInstance, CLSIDFromString
-For compilation with MinGW you will need to link with -lole32, for
-Borland link with Import32.lib.
-
-
-
-Non-Microsoft (MSVC) Compilers on Windows including Borland and GCC
--------------------------------------------------------------------
-
-Steinberg did not specify a calling convention in the IASIO interface 
-definition. This causes the Microsoft compiler to use the proprietary 
-thiscall convention which is not compatible with other compilers, such 
-as compilers from Borland (BCC and C++Builder) and GNU (gcc). 
-Steinberg's ASIO SDK will compile but crash on initialization if 
-compiled with a non-Microsoft compiler on Windows.
-
-PortAudio solves this problem using the iasiothiscallresolver library 
-which is included in the distribution. When building ASIO support for
-non-Microsoft compilers, be sure to compile and link with
-iasiothiscallresolver.cpp. Note that iasiothiscallresolver includes
-conditional directives which cause it to have no effect if it is
-compiled with a Microsoft compiler, or on the Macintosh.
-
-If you use configure and make (see above), this should be handled
-automatically for you.
-
-For further information about the IASIO thiscall problem see this page:
-http://www.audiomulch.com/~rossb/code/calliasio
-
-
-
-Macintosh ASIO SDK Bug Patch
-----------------------------
-
-There is a bug in the ASIO SDK that causes the Macintosh version to 
-often fail during initialization. Below is a patch that you can apply.
-
-In codefragments.cpp replace getFrontProcessDirectory function with 
-the following one (GetFrontProcess replaced by GetCurrentProcess).
-
-
-bool CodeFragments::getFrontProcessDirectory(void *specs)
-{
-	FSSpec *fss = (FSSpec *)specs;
-	ProcessInfoRec pif;
-	ProcessSerialNumber psn;
-
-	memset(&psn,0,(long)sizeof(ProcessSerialNumber));
-	//  if(GetFrontProcess(&psn) == noErr)  // wrong !!!
-	if(GetCurrentProcess(&psn) == noErr)  // correct !!!
-	{
-		pif.processName = 0;
-		pif.processAppSpec = fss;
-		pif.processInfoLength = sizeof(ProcessInfoRec);
-		if(GetProcessInformation(&psn, &pif) == noErr)
-				return true;
-	}
-	return false;
-}
-
-
----
diff --git a/libs/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/libs/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
deleted file mode 100644
index 76bf67863524626aa079d74629c9dd9f720b0b54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50527
zcmc$`by!`^@+OMAy9WpmeB<u!u0c1jvEc5(-3b=l-QC^Y-6gntAi3l_=ljjMGv|5c
z%$<4W{#U!ZS9h=8z3Q!gtEwrL#3UG)8Cj4iclV~|kP%o&nMiGoERp&6kO6Wa8#5<!
zQf5w8W@Lbbg_RS?ffOKN1#|+5fsAcUK*$0D$c|19AfPoef>c<!=9<GA2ihCNTc5xv
zegs)}T1w}<3x*;~O+whhvC}S}5;+AkB|J7%1+BrBp0DOgxaTc4x$nSAof+=f*uegQ
z4h#~`Dg55{F6S@f8dT+@p4^n?>eTl3PUGqls>;1qdjElN3HtASMuN{Q9lyNnZ(&UB
zC?oVLg8b83M>Vdr)yS307`&vCP}05i+OyoELkyUVQBV!9Jy<>lq!R|1d}&21vresu
zC$cHPF`omm4w~9HH9m0w9T9D#1;NFj@~dOr5W}o;Qp+f&l1ENlrDjcvFf&Fl>Y3jp
z8EB2i8X9%C;}C)4BT0UkK_=r!dZy(Y$DWhD8yqyyUT818=R@vUuZ9_fJ?Rhfwg&;!
zNm39)=cb^etGq<hody|%YvaXynR+!?;~;LJ*+4Z8hk#=jyr>sSDNgL7T?Tc|&J89L
zIYNdbcl%qUnfKHA9)oU}+G|+<_t5c}Zsx7lxV$VuTe#dh4XEt{9UF0$JtR}SVH-)4
z<t%-Ax{CP3#t8nl<skeaOoH*aCBtZ|^iDb4wQ_&8$`g@q1S-lEYK>Uf6xA=vaP|iQ
z!v_la)kz3<8r`2t?!+@pF<iJHbiM5#FY+J{14WK1<SJk`n4|1v_tu+YnZ_*`4YjM5
zMAS)_Volj7eAOQ^x)W)vPQ)k+a3CC7a1(?1W^#3j(QLwtlR^f4S6HrknDKa6enukd
z!AXe>?ByF?RnE&4-iOm``K(2ro5=n2UIdAip$xtzSzJ>T@lqzYP#b2c`JxOHWT+hV
z_@o^iY0%a=1ngAjSH=`~KHXJ<z7M7x)TMCWT6Fa`x48j@8dCgIwB=Ia>*Lkg*T}x&
zjY8a5m0&n`2Vlr=ldz~kXV;6V;871+X&6nW2n~PUyIMD5g0YQP*Ra&Ko_MX&P960I
zWux>w2?q>5et&&7`@~~MbHA7}V0BueN0lfw#r#4Lz7OV1NdT#cU>Q1WU2r53CoZ;X
zfwg`xtN`?*W-mdD_xh+_*fc=;p}v2pcmx=kEOHq{Eq~>P+Q6gs8EYYi;#gIKE#8U^
zL@~1CKaR;?(Q;DH^j6KVP|mOr8AtRP_?e;_H%V4o0}oPsal|>1pVUo`#$m-yJJ$de
za`v)lf3;)iSwn;1x97(C8~$MSAS&$b@F7(NiSlLB{NB0PFKf)i3wT+H<Lr}+LM}Mc
zTjb!2D+W^(d|lby457Tx`uUIyU(LMPV`bzI^P*J~Z~*fN)YYz&4v$#v7l`r)#wedj
z@H0_u)GRVNE!Bq3isPGOjhxr{Q?XBvW`gX>HoL66gBVR%{h2{GV<?FMk5Uz*9M?L@
zQxiodO=H)k90(s#m<&{A^%H1mNWR<@NYn6|B@D^&Xf5)57$41hu|g!{?Ti*Az?^8b
z_U9pG!`>(?xF)%hVKPx;%FUX{;6^0>M)|xR@obu}yA<ZVRhi23a1xb49h!%(XR`*K
zDk73G)`%_}HZdlYGEJKxVqY#7@2YWD{mV$^ah8Zhw*3`0s6qL@T>=QTcS&>hHF3H8
zQaiY&{|gM_&PTG>Q?%Qby=TU+Si5U^XvUDcQAXp&L&!BW#PPU|(A?>d1>x)Gdu>xn
zbFwpEUd5m&8>0)V4_ZnVOfyP8J<fG%<WckNHM`JcT7G^hzM(25R3*0$Ai<?kwyDLq
zjOCRcSYT;M4nQong+~Kv^h$ga$?+d5gXxfi<}^L8U@gsVx9({nbbii0sb$mb2L=(V
zyU_1yQn}dTV0tyBR8PZ_KrPn>`wo6fQF?TX>bhiB+G4WvY?Zg!9@E5CS&s)lw}-IW
z77ck&zQVI^Pt%>1mACWCvOfgBG_Z`O>qdjqhg*)cU)nXF+#&fj@ZtxZ!)tmq8d$+0
z85reE*D^>YX(-8YJ#)*^GNrgmkxp+IV_!S$jq*voN0lqa>T~+kGDUik6~-hN$v{KT
z$i}B#4isER&pf@@Q1huE2uUeAjt=hVT^kd#+mRP&Z_;>38=SP7A^TG0;XM5yGNp@D
z#&z9+Z^~3V))33&H(HwLLmVt;F1=w2p#x8cC#k`s-+;9?3hskEtcz<IOxb?Gfm$}E
zGfH~o^WjMpb3>o`nQpiFx$YQ0hb2}P3w^2=&57>zMtMp0E37k8m)%fTmlqR4ZnU5Z
z$lGG)Z2Xm#9LQmVA3|)LC~jJ3B_;G!>B|G9nR|8Bge%&{P=c{wO3~u1g~@qy^lr<s
zb<1D0;Z_lFn*&VG)vielf+BYsu-s!RDY=9*xjiO-x(%7a4B*4gE6q7BPCq4sL4vii
zj7B4aY)t-%X7AD;3}pQmEL3u^HC6>Vk?H{60h1J<26A&E)q6)pTN@|RKUgWjOv?7&
zT;*M2A!Yxk#7fHXPl=tB^DpTgF#+OkPLirl?<o4$gOaMuq+Ea3y;uKpY-Z;7vi}Z<
zS(sT^{{tY-*IbKUlfZZfVo^cb!QzR|D^pTb`&vQ@U(=duU+>{VKMWn#NE#KglDGzg
zE_H9RG%QIB3_OyF(1}vjCdX1iTbvKSN8moDz4=2!{qB(@h~tVLKCFft9(y+t4Dj47
zaKVuwP(Han5z4C8as!fnAFxntl#y3yCuG%0#Ca<xRs1?>oA~gKgr_u#%vxKo`R8yp
z=WtZhleS|^t>;q8#EQf#nGc=|UXMQym%w%9f{66Z!UE8P4xLplrFC8v;~IQy2gtuy
z`^I7CjdvV))rv*e#P~Xlx-mT&@faar4wch4tz49G+xP{sC6VK2U(b8&gav5So4{6;
zt_ww2U`Pu{P_4_76A2TN8MDE65Zw%SU^$!~(}tORAE3bLWu5tX(1_$sfbP6xqK>Gc
zrqH@-GMeJ(izlyrwjkd8faVwEWC`9cFQ$w%k^(P7Wh^#D<;hpzFZ%X&SJPP=xm8I|
zLOea#S`Rmqm=tMA*powgzsh*dJ8a0CPP(N78jFzT;c)g@rHR)olIagK;9n^cxK>fm
zvcU!z&CnBYWYH24T(Qa|I*tW4CzKA~23cDm&~1Txs%u<u4w~GxyL)G{eO8`mA}F%Q
zDs*(jk&O|Cky?V6qn;M$((yN+eWUUt&qnWLmf05KZ?sv$f*YAZ;z9u@&<xLc)1rPW
z=}>-xn$29rtzx?IEriEORTWS*S;Nm-V1!g-TGUPyokRyI$Kk4%P|->2XX~gtD_*6W
zJTsrxRu<FE>aQvgho0W*c9hf#l%~f6?uFwdh--6cOL1#$YayY$VQxbB+E;F%jgtuB
z#<Klo0%odCmg8RMvr}9BfvsmU;^VB{>1}2yyE5LV<KQwJPmjmd0}|_)8?n5cgHN&%
z=%rSVmJF6w>KpjxX{c1{I4ZIEFqm8uqmC}j7>gom^)UmA*FxM9a%dBsjAJj6TCUCu
zBC4XSP2M*I3nUAb0losqKuk7*G$$pMs;b(_z--TaR6v@G29~t#s>)ib$yfi_rADs3
z!f>I(c5u|$%{IH*gE|f*i#(T7H`QlM6PRE1sJc!G_E8oD5{^)Y;{ezD9j#J@L|nZ+
z_;ae9st3Q1SwctLdIDq}FHQ~dOeIJCwoUqLD!k@-R*|ri;=p6xqCJxq)8jn2eUpcw
z^P-6r4ubt1U8kzK*_v+-BdWF=hCb(+#H){-AJvk+dFBe#*Xsz`9XdaD6)7lHa2aKW
zm1I9~F`d)JO^5dE9-8qwA!7|Lp8q^Sn^g*~?0#WC547BS$g$;}PX7|mU&^b&A7v&^
z#z8t-uDWmmkv{)fh8qk>>??FDO~BobP2t!Ur|P+%Ah!fc%*yuc5(ess7m0ux%@uNe
z1Bb6+trd7SV#9(PvG(hZ`6mvwGl?DhS~6BUGzPLhrD%Pn4ZbHr-n(!}k%Q%=dzJ`E
zwMGuh-BD;Vcdh)1Vx0vuxujel+#nww+YzoicKu0&iuXv&a#tV4dJmy^EyfUi@+(Vy
z!~HH_`e>!^`u(?a{`s)iAye?CC}>5fxa?{q4w6YfPaGxd8`js~*zs4ec!I{Xi~CJm
zknw$V&^@l^QYP`eii1LpJB<(kpP50Za@I~}M=gr$yDPJHjG#Fqgk@h7qBh>RrG``2
z(tckTipgGJ&1~xITm5T6?=9Lv79z~|kH+Ax3{OHoev@Ihez3aoRYeb+jDBe4`waOz
zGc$??)}_HLnaNZC;oclvbvrE4mt5qHt(+@8h*AZDvzxHm?)Y0gKU4&C4R1tsdn>P&
zn-SDl_RCTUVW0nH4fAF|;<VUq$&&y*l{pfR#S}r-VJT+>Q`AoHDcVU*LLHp=xD@%8
zWXcI)fp6)SBsGnV!v+0IqzBo2g{z*?R}Uc(zi&ftjH20^7*wun{JTobzx3OxD1th{
zN#QrieIUHA(h=h<e+a2ga(l6JDN0UyXDuuDKC^N7ebK@ab_}fE>;A-}qezae^!-!{
z$lMw3gkd;6bsGT8DLSo=EJ_3B_&)<Du7aR;aN-st3KF&9)e!hU=}w6&B;|FFt~nyN
z;hm*P9S)#0C$>Xa3r<u;d9)Z1l01aD*RNUsOoQ;sh<bW?4l5TFP~`l%z=V9LY3kuv
z8>6{NZnB8hpMl;47wx-HWV1|sWDVZh8UycE3>`WJucY6OZN0&lD@b(Xy`Xvc0}>NT
zZNT23<9qfG>7TWBgUAtP>yZ_#NBzn_TO|^E=Bd2yedXaElP08jA}3ayBCT)SHVYM)
zQKM)hl%o%_N4+LXyVn&`dZ*0e$F)H{dS&!crWL;qp8RS%o`fBZ=$cP;JRxIdc|9Rv
z8QZ%!wRlm_ksr>s)(ER<A0J^DNp#HY=&H?Z&ygP+VcH!xw+OUez^L2Um+Me%k*_l<
z{DNj6bs!NFLYiP)A95;y10o1FkO4EY^1BZ&6!rBlvIVy2LlPa>_a)GSV!Ko)I)#E$
z)O>aZZ<$y3nA~)pS-zYP&f1G+CO;L6Wnap2E!uc@+2Zh_5?krCN6&~I6?&$78eY_#
zf6yrDoEonxD<gjn(9A-)6f?Xo<8k@+Dn#3S6=fp*am|Zqi6>c?riv6lRh1i$8K`-(
zrapgb?wPOHsr3L~s+h?a|AF=chGRG!QVM|-PWy+#>m9Tc!mVRpg+-;FA2I1?X=mA=
z%flx%^ptDeoio=el~=%J*8Q>7<C1GPA=YJMjM=5?y0G?3#~HV6JX4i@a8X*h&2ZI@
z+9jlL&LT?H5)$p$LNYDy8WtKh9`j$S8zcM^chzE`lrY9iRU7mJS~4<!BQk+?A@<4t
zj|LI*zp?}WpDd#Pbvx*fRrTN5LCoAN{|O<HuDNEjCh->`!ADyn?&#{y{vFIdO*UXv
z939(R>PASKE&^V>v|Y=-tCQ6;N9ucS6nUt4SRJcbrP+fAcbnIcUylQ?G2^u0D;z&u
zA6U}QR7BUhvBxaDb#>Myd%eRR2YJOv$!fkyfvKR6+sXOyq}vEC;_7{+D>fi_^_Qx^
zQtn|E1{vzcX|<;>KMo?Q#$xK4#_(yguBC*Ia<#$JMQO}**xpEfe-#tkLfeY7+vxsL
z#b|XUhTznHO}5|pf`~YIv|hBr-m*`a-0Tt-U`Q7DWZ~tINVwng`Y>>#gBlzHt2MpL
z<N^`=75~;VnCAt0C?Re^unXTDIS_A#;Au1AGh|H05<%cbEPjFV9T&x$6jaXEiP|rN
zPUAjuLuT4*qj;U-dBpIQ*QRyDC$m8#T5K^ih+pEeUqvge8hDx`4t5$n)aHM{=50^q
zSnXeFX|1@cx{ifS(x-fsG9pVyOX{-J+8=?VFWognz=>EcA<gt1SZ{QL(<q8%ppQT5
znJxZhenL_XmJnpYi%91}e%CoMiA8_N4J6XmwoWL)%!AuwiiQUY!AURQ52A;okzdk_
zNK{NIo!~#4bc){gj>b=P%b{u(FA~Z!H?n5b_V7IiDe7AVPdX%P#CCU5Q<g`(ktGNk
z%8MQ~C$xAgW5Z&V%{i-#$=lLWrtK?za{j!p#IM${-q%TnhtVjWU`yntD%#O!YoU!F
zYN^%Y8)t%pgB_R|^v&A8L7~<vvAoNGH1LADf2Zhd6Rel<;B(<4MuqN}vwv!DmO<Zn
zP;D`W*}}G{LiQ1_M>XS3=}OTv@p^Bg+yjPatSwvZfh=?&44SZ!z9A{`sL@>cG1>|3
z_m}A^6o1nOvg~00Y~hXGDLc{Vqo>8$%nP1Et0t&jdwRf9V8{T~7cKSi;7=j#O7<GC
zxF<rN^8HgG(8qt2im-V(`6L*vpPc1zmXi-*W^$$8i5ky7M*T#gXD+34Pd?;^2H)VP
zY*eq*Ww|(*@CnLnfQ~C&{xIheQdK+Ne*zJS2qV(OxLO;Uh&WKHpaRm>W~?penr*V|
zNbrQ$+=z>&*b%q4%||3S7I@fj)QbN2!Oi{&Yb*!<1M=OI)Y^4F#fR(A0KmGv0QuEL
zibjlJ#ey+p#m7hrf4GWUcnJ(YrKd^OcsR%bDT%3lC`@$KNE4GH{E;+63jc$F9;lD#
z^hOlyJDK1SPlLk>tnr*ZQV8$F6P~n~E^|Dt+mtUhtprQ$6fhqSr&Gc$I1WpM^SdF1
z9~~;QijH6c+{XbajU=nVq&PRX;CLleR3@nAs|&MrNmzFz{9nQ15hke(wsk8Hlp1^|
zL!mjvR|}Z%+hpZ3w<ggc57HS*LuMjSgR$G4?lI7&NGnaFvE3!5$naJ?)>5(3ASwRi
zy?lMa63kU40OL3=2NmrX5omG#lNo+R4niXTjAt_lQPt!5=S<GkCpHr6ty5vYT=V$C
z^y=Mos6LnEA9Jdcn$Di4qfv6vzC7jf9)<}dfi;C;iqHzXDi;&k9A~Yv7nJkRGu^K4
z#lX35;i3-t`ytMzTR;ojGhTx0mRDs$KXt$QxI^ltc+c;cW0B>UHs-Q3oI25D+T_m<
z%|M#BQ9oC4)n4y-_IjjmFo@sRhAs69;i6GAnop%<y-jyoPE<J=f)OvSlKKL{`+~?W
z0qeIrkPX2P-E5(Yvp3AQ##IM<D3}fvQ2NJk7SZBjE-@{Nv-H}){#jk=vq?M_JKRAP
zTjIJg%G+L){VoMzLC93`B5b35e@~R#oZ?caME;{yrslL9cKX;CYI~ZBn4s0|{niru
zw=YYupv{*Yk7&uh2i2Ks9bmzibukfukLA*Ib(}HG<fDw~kvG~7mVo<Z6Z31=<YW1L
zdlLy=0)Gs@z+E$8Nm0iSj{ElH7u1XfoAsZuu;r?i<rPbAt8d1si|nlnjg2d$ut_+P
zdp^EYJQV}vc|Tplk|XzdHzn+DDDa0rz%#6REVK)cjXSGfZtXfA?NXH$MxDgBa#b7z
zM9APm5gmKXo4C0yV~bP5{(RZyaUAW~?6Ac#(QfWYJ=r-yzn$@64sy*AN&x9Ta#}bK
z$A{DzQ_tX5%=z1dWb`XyC60J30epA%KjVpQ9Aj%Kfpgy5ZFGRwmuhv9$g#ug!1U_t
zl0@-G%6@=;U{<yv#OX*?f%zF3NEpAC%E4C~M3{;=w(#_n7qN$PteLES)~_q({a}up
zI_&Gi_Jmfy)<WO9D6e_{vOXT}$Cul*TXbr(3_rFFW%EJv%3QDei{c8+ykykw!>sG~
z{m$!yiAE|rsrC^nZmW161_${X+zrcF?BJY}t@=us5f&8a#T;LJ50A2li?Ej?ws0<k
z540$FU~i7Dd0I0<6uBhY5Uc6^o6q#6cv+2!HVt^Z28S>A5{eAvePh#aH@RtVKPWrS
zp-B`eh&9Wy;1>4UQGW)up+s!Vje|T6Rf>=Z25^PV#_e=A*DI~Ss`NWZvN}3UEgpxo
z7y_8DmW#Zn^>OZYsmDcrX1&uXhGK^?|HgXwLyP<k<^Pwghd->#-$VY>ox#G)!So-o
zC@axxTsUtKzab4Ent4FjoYp=2IjnODnJ~I=Xq+!(lL7Q|jTqXcGx6WYm!>+fXyR(=
z)O+${zg2{~a`XMTy4f(be^gY!TOq=U#CY{HK&P}Pikom39<jH7{PpqUkc%*+Oe#eh
zksvep7ZTj8q|5o5;?i86_!ps@a(Y+oUx{`%Fc8WrC6W&2wRM)#i`28ly4YLuzYcE?
zQKiO%`@faDb&ni=;DJ_@Lm)xL_o-To###{FiqrebRUF(-N#$F@2akt{KQ9nysAd>S
ziDg&!%yIw}rZzXypOa?liQkqjV+%D&iN!`tsR$e_#GnoIxt+p^pQ1&_`pnMYqmD}K
zRXLT<OLH?_Y%9LeMDaT_86m;S2VbZjc!1S#(NR3_p5cfHCr>QKsNoj-lp?_)*8haI
z+hloZo6<$e;cTKhc62;}r=p6=i}N{m7`VfJM&4hk{G+`1A+*QO%6@M6i;%OYBkmk9
zi@~Z9elP{oF}N=sU$>WIwuW9F3F!>O7^Lq=_=G?2U0t*o1iU)T_kD#n2a{61lyRnd
z8BsXU-lBC&U-}WE;vAmN7{9MAUP{nOo_FG%RmR_Kk}N{^6>_+d(`PGQm<-;vxfAI%
z(*lj02$LnR*4?BG=7Kz~3k0fyG1Nrk$`8BBjxW)s#jIm4Lef~&a_}iV)lh#rUpAB1
zaF!9CF8`Qnz>EmVte&71)n6j~n>$q3jkI<2CILND(uxGeBAr6Da2n?W$^fLoSK$?B
zgNu=55*7<r-$ri6TfE$JVCwlJjP{x|8gB;N7c=t3S)I*<Qh=;6{$`Sp1(2esAR3ck
zfjrVWnLUF!g-6qxFxC|e`kNosS-%9{RYS(<^wYKy+jO#DjicQ<<NYL<a>zt<0JWb#
zpI(G=U@+Br36~Qdv8Z6?iAw5(MVkcZ$N2=qus}#m1;LRM{i&WtJj<zC;#bsRY<T&|
zaLka%m{=iOIc+cX&;jsB(V=vEX+!UwKocuUd|6<rK)@}HQ1;1GTaV|u^)(mdPCP|w
z?|{ncxlr@uFh;&X%;XWNRri7rVPMW7_-7L664Y{jEDX`7R9z;k#mk7*?eI`S2(4e2
zr!vqcj{a|i6kjqwoRAo<dWYbi2@s#umVdY=?8zu$=ieMR#1a<MfG}~lCmB^zbsyX5
ztJ+9c+snBb6!a0s<8vr5TlX)2cUv@31e7khKJJTdICY&Y4h<KwzE(ag*WG_g>*pO}
zNHe$MLOjC$@$1Z{Q^nH`MHSX+&YTmUo0NI6^FS*q((syXo5nd1(BP4Ls`*HQK*T0a
zY^jhfp|QVqkS9Q*ANLV#MxX3ShN-${B@Bepbj^1^J1SI2)0Xa??d<F3iMhSjWsSph
z%+M?q7AfM75n^1ejF|puvu{g~v>O-hDO7d$yVr}{2uTta)Djd~oHW*UE86_H-OkVe
zZ#t7`ADDn#O1j;Z3Ot8}#Q4FgG@#o!KVR&InU}Bk2)*xXDy~;JO*eot*T!g5aBen6
z#-~$-OVC=kO9S&ES3^%?oKZh!<+kFQqSfkrbUU;6ix8t1atz6-hX@|7GxS<%JB;51
zHm|F|MI>C_W6aPDymd1qXVy29`!5Y_lYMjCP`f)_S~H#}170LW=jc*FjROaKI$I~V
zTi>cOW^ZA}8}vjtQa)XVs7-}!Wz1J_rD7MIBDKOVVSoO#R`yfq(F8t)N^E%fli~O7
z!U$^jR8zYaI8j*$$$?A{BQ=P}c}&Ogj{~R+2|`ZI<GSioia5VbCiDyFcW{+=RuFR?
zn!N<Du{~2B0Y`{0upqt_LAP#tDn1WkIWE-9NO;atcR76i4+)ZImg7A!ct|yM#aBm`
zYI;z*!au~7p8d(SJhc0r1$VpY_9UafGoBZF42GGb?Fb7X4{>N<{N6HEn;16_HKHG(
z=;SF&<vubyFMh%2y&)R9FGL5oL@TabQ$ARokwJByEGE_ti8A77du%A}bI7)1LBXy_
z#j_#S3=%X}G;ULJ*jib!dP;H@*NfU?Q7Fr=YR#qC!`^oIK2sO-wJn~Rl~3y!_kO?`
zwAAh5^>p>vz^JMi`|AlC)?#$xsX@$(pq<7j<G23<*!>XD%4X<`CFj_OUU%A59bW-c
z=f!geZ^XX&(}rYBi8rq3j5u3!WYvsXTZA7roPFU#!Weyidp2{!uFcCwRD$l$0+2Vh
zVYhIdU5kCUI(UX5iv3xlAX4)qxNsEMGbRsHIOJ}nZs>iu^7%)2-I#%b=1B&|dLo36
ztma<j>;V$1+b&NZtswa7Tez1z-BuDb?J@EvDdoP{Hh)}Q(*l|!*4Aile82*$3zq7K
z0z-Xfs@|G_bs1GT-p{xwq`GFvzoBF;Sm<upa|Tj!ImN-noaEGBrH)ys3o3lyD&d3F
zN&P(5^`pRMy5FX)96XbR%vfmilrFQe<(>hBnp9y{FgwB!i~%`-Nw+$Cvrws!V~=iK
z!F_%8?i<2tu`4kJOK))P`0wqB^P9}xUDEX1P4&`y0c+<$@U`cHIPSs^E35Qs0a9zK
z8_AwdiB>U-@G(k@U{SLbAAXjP_>Q_v?hgyJLAR17jenW*gGG630}zDraM!m$^%gZg
zRYBx2S3XY9{}h0=tA;(X5Yqxj<mI=u)SZ2Zvj6_!&@xMb!=)_D-V;O!WhHvjO}+2N
z%+!!x_xmVny4FvRgO4MfIH~QM{JnA~5yw}m<P_P*^hSrBL4rX@Qo#l1GT%C%8mw`E
z35m;OBdeLiQDtT(WOA#AQNYfx9COl|OqO-k+0|fJzwaNUqvzTvW?oV!m#>#u5!gl@
z)p3!`Q;!7}5>#Z|2;zswRrj<26XuVC;4omk3?(W5##s8}6Z+e7`M+Z<u`vD1kpC_A
zgX=#qmfmAO{z0|;>TAbRf{57FcaufOYN;=QT$cX_*Ahk-_7~UU9P!K3%%ug3Mz&TN
zOZbeP+w<^DcM`>5Dq}^F2ya{y<<|GtPL+}f9t_hK4@r5(N?Q!lV#8ibW=ODXN2pQC
zWriZ=j*MHvJOV|#ue>&AwYespx^Tu@0V$nbY9jVGI`c1HJZ{ftW3L^zd+WkhA(9Xx
zB%;*5j>X^VM5ZpUetS~fVIQA|Eh2lp><WkTvSc$<qUK!AD59uNnr}(|V9yx7ROp`w
z<AQtr5I#*ZGB=csDQA;8(S>3GRRcEYpDFnxMEZ3kMbLq*8#h#OhWROB%~)-Vv)Cw<
zAP^Wcs+hYwDRfti+WbpWja$UKJ247l#%~nUk7S5*dne`i?30VGHvQl%2KtJ;Ge7)j
z|9<Nc*XvGoXgjQyFRAFw9WU0ZW=s$N1;SJl7f*769_-a=jrEbkxVagxMH(<}Hj~B?
zT3aqC;%<xJbI#Xr4YZF9+ZYTuHKO=@A`$L64V0e)9;)kyjl{;PUka=T>mg858tdxG
zIpa+zKNJm2>kw({?5Q@rS_IpNq6-IuGgBBVW||H|hVHuu*PJp3YbXwXddL|vv6U5o
zERz=Dyeq-_S$S9dA)k^!i|lr98g9iaFI%AzfriRi+hl+sNg5nc{D*?_NcM^eyFl3j
zHibBXX94nwe9Mrgbbuh%8Le}2qIJerz>8z@Cv88^1TQ@e?Yfl{WNH0msIvPhNTiRa
zeYlS|qsVmUZ8Sh_8&~VR`WTTCtgKB+_cC3)5$cm5K)doI!ioNtnPR+jbiw{wBM%_K
zzf?ZDK=Nmty&XOO>N0PS^bKbEpjtjIe<?LY*wbuVHZ^(Zea<9ZcxYs<6BjPsyU$jc
zXH7PI*FX&`mr@!qNsBN;E*=->hQTl!G5JuN+mDMSJ{O;iCH~$p-%D3n%nGZZ?#%#8
zob`^8=1(to_l|Kn%2;21Qiu!Vk+57b`{;zgl2k$r+Xpp-YPtXBaMhTq*@V1OhM2*U
zMEe{EZjJCWafM_paWkih7eaQ43&XAF`=dzpWSn;yF+7D85qxBtJ;iW=i;2dewxOm+
zh`o~phEjMiwE4av8|(JjM|4j%c6bGb3rXA}swjpx*aWyJ0@&1^S?&TBmB_<1)xKaP
z)cK{tr@$nwj{G*<nE3qsLh-a8)umSu#m+Pm%WbNI>%RuOlbFPF5QFNU&D5R!y_OMw
zA}tkPz+fk)A=OKKIJ7!bLlA~N`}sf{KMn?%=b^hp4m4&xHvp+`ILm5m^BdC5bk~yL
zq~2Gvompz_xaPfJ&mZg*&YF)=OyQ2)q;;II?W##7$6Qc)I^jUWgg=zbuLpo~<UGHf
z`+bLAR|l;!s-N_hf#!BAJ<s{16Z8_;w6%%!qVrC1Q1u(J^YO__bD8fBr-;)!?8%QU
zE2|8<a@vmsnV9-xMQ1^lI=i`(jcvN<m#gf_;qpkPo}<@i8pJIvvc-o2#g^(CYx!E_
z^pO|2$97pL9rZc5yG*)Aj@IgRG^$!n(ur76Dj{C`(s|(r-kMwyKWAL$N%gq`V%<9m
zu;!x>mypZrcuf)w>t|pbA%E^?T3+^t_E<BvEF}&!iJ&rZJ(--!8xJC^t{3bg%x8!+
z6=E!L%_uq0>zK?fQdNDQA)V4gph5qJdAoFlXrCf)n&um3Lo)ZHlMMDt`Y=KL<@e(!
zUJM&~;zG-!aHnbZ7YcTxX&pA6fvv^$=xJNCb>gLzb25GaM%gL3`uq}{GnHV72Zwe`
z1`A=hx3qORWG>A_vv-}+2I8X@okvB#Y%t=MzOo+(2Z~1@6Mji;LB|SnVsE@&jJmw*
zs5y!UH-N@X{m{LoNXYb~R5+jdN(!(%$N25sH=a+3lk+i6!AM^@bQEC{Ew5_acMP2u
zxU%EOWBi>BeqMgTC=B=kGya}YDHBx(|C9#}*CRIbh(jmIExx=sXE469TK*!QRu*Sj
z!lh7QEqt;f{y?Hn5gJ8)eqdQ7-EnP){;U-ax4lj51wv~R;OI<2-}l6tF4~5PQmX&`
zY0C6UC*eRlfs6(#-9GVPr8V2hDGQQnhKg{9i*SDk^=z0DX-isypfqe?kVt$?660ky
z#mnvSu)>{Cz^e?H+Xn`g#s1j=`tHm1Gyba{jhw6>0O#t4((UO8wmb<}sQK=W_8H~8
z^S30dMr$W0LYWI%dQn)Oy5wzNS{f|dxlTZ?yMBHOUs0D?l8(ay>!~E^3tyPMN6KL3
z{NCxBP3&D8&4Ix?3{O;ao&Jw7%<`{c82?)^43OX?W%=Vj`4b|-P0I2oxJ2bo1m%Ag
z55n@V<jLRQ%)<4b#DlE=4bE?Uq(WdaiPRSkBa~&WLc9GPU@}N4-lZ=>()kq<<k0cq
zX)wPYC-tQmOAvQ^y-QvV!&Wo69VgfCI0)oysnJ4b!R>`!cLcY<C%r>mAYm_H=dv!~
z){`NJT!{P?HFt@DWMVM^TNTGxxlgJpBKNUEEzi7ud_f`Y<%aH3bNRkpI(<3)oG-VJ
zN)!t@!}C#R)jGSP?Fl&7C=({qwF--|hZ8|=Z7owS(i+IWLw&@Xb$gI0SC#zlQ=lTi
zGK9eDIkchsjuiQbOXucI`_VOXU2ljI{j`>@U7SA>ZSh;p%4|$OK&G{%*K>XYT}P{8
z^U&vKJ>&Ivp+@9Dagjw6SNnDcE@K(obhgvlXd472n6ss1Qyzw3Kp!PDsglBKZjX-}
zlN=Lau2U}&^6_NtbbZ)<c<_i;{9)V={&dt<#@+c`dVap!btUT+qh+uchR>IZ;x^Pd
zE4f~-EcLpWu=_);^@&F>mKet}6YmF$Q5>1ULs%dKMGWexJW82co8DlVA}GX3RBh|l
zGQlRpx$;v<6K#Eyf{OHV?+M(*d90nN`9SrZdxf40U-+$G*;ErtPKukQNGNf$0DA))
zwzgK*?F4~Dn$_3h%~2=f0FQ4UX!laVN-<tJXvPCRY7<`W(n=^ZUeVPm#tEPBQTX&#
zHKT&mi8PASjam<Jcb(g-b}bXkexy7=jMR@pbsc1zYU9JCwjfby$vn-zV)RmA9&^N$
zDK{OaoCoVqO9{8kia@=}%4*?aCt2X(S!%Hs1bl(*zvX2QnxtvjPUmjFCw_^#j0t8T
z{-M>3Vzvo?X^ym!mQ!}4exd9eWAT|vD<;*_o8^PkZw#Dt0Xvb&2AZiprZ3Aj*{i8c
zmP&=~&NXer=~JuikGdIDB#9ZT-@%Iw`FQt-@U4%0h!lOy_xxHv8RA_$GeI137=E+I
z50d^>!jvKp|M3&Wl{E>>8QU475x12bv|K+MUrb8<MrN3VV|rOp*dt%BA~_W!awq=v
znBBVK)z<<0re0zn95BQ+49AwW;&QL89gb<j5;D-ISBx}!&ZDJa*0=CsgWf7pg~&*K
zNBFo)-^PJLb_}#hB>WSYPXvh0Rs@EGmz+4nv#Qo-QAa!O_CTTL+|B#?{QG(*x4OIy
zqT0k1aHWH4IYWc}EKZ}T-Wb&89Ba(ta4tI4hKR&#o34QYV5(Y-bZ(lEZ5-XsnZO}}
zz`RgS^mkMT>IV~~UXQEKOV7W?Y|YbtMP_=;yH^&KB)~|o727?WE&|59kzNw$DgW@?
z`B<)YC8souI}3Fc24$sh3X*8js~Roa1tOagbCdpsD$WMkV_3=^C;b6*m#6neaUBFp
z=HFh<@P>l0BYqVj$O40U2Ty#2fwZK2IzV9<?D|(lESp_-{GhNc`kDKy!Ha3QSJSo$
zP5YqSfhW3S^vVLB2I@ff#u(mkVBmsAO0lF#-I_d_lVpgrxu+OXxeY6MdV|Lu!7N;B
zIN}3j<s;{p=q^N0+}425?aqU04fkBm{!P>}<~tAjj<v;HRex5l>@E7%&CMA9Fm`55
zxa{8tM$HjHU{8rpiD^ZWk~pFaZH_?YdGc_c0a~`T<C)Cj>{99MIC-Bl1`3SQ(lCPU
z-WR4)^if*^-IOss(Zk#;df7Qb#bmCAFfG$hFvp!-*8&8uAG^Wu_JvCRjaL5?miHeY
zuKrs*-{0Qr|6N`FuV=fzbvY{&_kVEEYJb<|dw+uLfA{f?mJGzsdvDNB%eS`CRIfnT
zXDxawS<x!f$p+JZTE=;PM3GkJlvVhtLg|}fXUdh#Y9{ePqi!q)oJota4vzYl7}_)1
zlR&u(D?&`&nBpT62`XzE#)$`dImgrG!q|9t({(4U%+I%L($Q0{F_PVhEIa75ms5w%
z7f5ky2`+)^))^`<M)~?x#etj`J2?#H&7!aH^S^VkG;sq6Jy={NBvO$eK($y4HRCyp
zDj1Dx9a*$Bn(lVbai`h%>dJc|F<r{}y;R>kD#O1iP1%E*x5~$4n;Bhx8dIVu@xycR
z6-Yx**}Gu*qS%np$T-L5ALRJ&hUQ*nw+FlWemc%c8U)DX(2`Ef(MGZ2C#reV%*hDF
zQNSvLlR%7rHF(Rd8&-om`hGngR&T7LYzlY4tGPHie7D${l2EZ6;gxn6<A(0#$F<d)
z(Rv64&qC=#s%lgg5zzQDCEhB2sYd&;;s6b>EkK)_wa5TtDs-Jt8H)36phj|y?|lBO
zqq$sbXpMZwC?~z-=$td5ixI5v_Ib7IpoTY)=#j|z`yn<3s2%gM)Irnx@*@URxeE#L
zvX>Qwr%wn*ukb0y5(BWJ2(2SU=-Q(aeG~$NMXY)vEJAVa)8H}GVnWo_9=6<icnN`G
zu#<jY$Si>%KV}n#=<1{<avxo`Y|7erQKc;33XEe6lkC~Uf-5xPTyUnK2+Hi?lCiU8
zeT7(6a)T!V+C1UYr#!*aEJ^a?EC=M5PVp#h4kPFJzOeGKF(MMBjEG6S2kBb=P1AjK
z6IlCB>OJKy?Zo3^?=JS!m=t1UowfV*Q1q{~X~v0}rITVgzki2MD=;gB^tH5XzvQGM
z@|CWIz?LfA3=+n{=bz(M7Ql;UMsf${oNJ`kC{1-*e6Fua8K%+Wn4T|uauI4mpl9$?
zQOB0`bWHN(z9uL7SkLkM2IkZ<^Cn;A&Q^M9Vfn*O6^cY`LA*+69mWKQon=Wx9K5P`
z90`~+L%vF$G1qgKHL^kkO4h>B6>>2;Ns~L}DBmP0_hA|>g9HED2g_IvH+bS*G2jr9
z8Ba)7jk>(^i@9(pbYyVfPLFdyv~O?%)As#St&@XKADg}VfZ^mby-5c5lEt${IX&q}
zcylY*1f%>3?ljU?--i7oDS;aEu7s22H%`97Td*f;EGOh1&ur6G_JVst_gklE_aP!A
z7d+gydOgVSx5w)<sQ!C-NQ;CXJ4C!(Tl?<`J_1SdA`tmWI}|y}fP9h!o{hXFxL+Y<
zn;m0e7tTL*UZ5yr@Coq)^rzjPK70N$)wI9(Ug<DCy1PBQbhdjK^>OoJk5<F`9;H#d
zBcrSX7uTu*Zz;l7eefB)3$1{@$$)01eClujl=E8*1j^SSq2Db%Q8U|IJ{Qif6RitP
zQ+oGPPoxqO$Vkk^eeJx5+;vYu=E1Y_5Ppyr()0POrV*f~{}r70yPof_C9$zzmW35@
z3Gl5w<x6^ey~(Po!XXR5uxMPaouzwp7pEWHR}Y+D()C}$GXf6Q4;|uw8me8_?4IG%
z-wt+mJZyFi9xSPW3?og!bUr{+@nLpNvVA8BGN0%<dY|DyIma21#-AulKVC|x3R)=*
zFLs%_QPU)&Wr^tMu8<YC3RRw4+=ZEBwRM&#=WV|;pg+ja<{44Zawk&djs`8C;I7Hn
ztd&)m-<_*T9xkwkVFpi)Oy;2zORZ#S)_sM-14Avy5&Sn=p8Nk-EzkO|M~DB?@|^!m
zblTgymamjLXKZO-w)5?m{*EK8!Zw<)0K1w?-`EaEj^D%ZdYRD?yBq%vv{V3|fadyR
zJe`}B_dUg6T<}E*Sd$qjbOi{UhTM7t#>vC2D;^4d&9gI5pf|!?GOlj!%fkIR!p3mp
zsdbr4&-itu$@#t`()IG>o@Y}pli`<GT@H(EcP>XCBF^O}^FVt^f|_fx*rY?p;nOpY
zP2rkF9I}`_^>+VK-!}5KLVIk{hA^P&H*75DAU8X@9;_r3pnc_Aex8p{BB5Xo@;SBd
z4y_F?ibvE}AT|AZBoE$OXgpi1ys?zSoeGy`vQf}Zy13|8%?3^STg}t`c9E<V2}`uo
z$4|Y+qo^o!MdhaQAsq@RHsj46uR7_?>n>=EAeZ79cJ6d3hxuQ$Yx=bH0w}1U@6&__
zs24U_I=#Bsexwt~>|boU)itJejN=O>Mjxab{Pfbrr8Da{Kl;Hq|8V?RB)X*QBXx-k
zBdM2$Y=eW0SNC@8cDN%G@Ov>921l&STnC%?G|Eo<T<Nm2atWlX$3c%ECo$vVS(ma0
zn{qhgM5^(n#pdf<(krnm^FZ1sCiV4bnU4O0kTn0t!W4O^v3M_cinEnw!z44RXxb0g
z!=Y8$FyMO_MsvpBc0K*Av@|CYur!A%e?aRc#>hyQfAovb6hX6L0XHrtuZG;(+u*OY
zEE+2@bt;TszTw9FjO&Ncpjz1Y7=+zgakx;BDELkQif^NBtX}n4gl}7~QKLBEc8(O5
zlz0a3i>ls~mZWf!xx+%&Y*B<RnhWhZ&ECNb-yr>B#;6>D#1mtLa246BK<8^p741s`
zCpbBj7TsjII>4XcpXDbVLEUf^ihv=sGcK0V&-*cZi&&G8R)~TsV%O0rGhWvAjdyU?
z#G8*nb5CJR*I7*}cx1Xt3+>^JMde_HUPyaXO};APJV3|{V#IKzNpJ8?6jT#SQ#WRz
z*jSgBKM_5UJ2qA0%`(21K<kw9mArNOV~9$=+G#9CVFXN~8}W`Gg|kbDV$;lqfr#<o
zjFp8b{|`3A!qNT(6+<`C5@HxX7c*M4D)#K21~b_7E5;?il>vzqeh;H@3bOS=5*Wc0
zg87^+D~<!f0Kk^uSDV_t;JWVSqd>jG$is5VUffjEka{*_2!UxAx#F~PEa##ZfMJ(x
zH9J-<1nh*64hb9Nqgdu3>gO}$e(IY~15aInZ)9s4s2}w%AwK1s-_KTem<95ie+ejl
z1M2o=4#Ip{?Sb?dJvX=VvYgJHYb<e%*A!_!yzlqgzP<1g>d*&GY>$BZt#wLv;MP-%
zPh?9HKi`0*$A4e>Ijn8Jye>#v{!vog*jg8?<FEqyY7SoK(<IRn=SQE&IToJ*zlF<V
zaM$OrTs7&*Sz38&O%C0*;l4;^jCdtUm<0~Gq!V6F0_p}CYdIB~G_3%c8R^K34w~Z`
zlaZ8iUecIdSMpF7B4*JpTz=#&{?bU+M0?$CD_p>aK^Ot}{ZNH@m7|uG-7e#7{qmUN
z1W#94JUM`Dbs+b6^tw*2mM5zJiN?bQ;XqV-0ACl5N#>mbnCSbR>urKDx}X$&vd@W8
z=3CIGWsH(VT#WV=^IXFdJY`?KeQjY4p{>m$U_90OD`uh{;ShIu0$Y?OtCSu1<mdoN
z#t`Hzk*dhCF10u29q5E^Sb69*hFm+fpx=(f{ytscjd&_q|5v1c@9}_rY9+OEA$`#V
z*sVs`MZ59`lw$d)?Z`vdFJc7>E&*`>0#i8(Nj7>=5RxncOn%9UQ%K5ZMqSv;9U|&r
za)S+MSU;_6AoH`PFE|(tG??xG2o<dVOM$Kb#}5Ro|1QXtg^TS!I1uz}uGp+;{1xO%
z>I*JiNWB>)yN)B3UO<z*T&#ZAGY-iR2TvHrB2_A(bGOCon$sNCc&A2CZQ*c{agfgK
z`0T>{{cE<6VQOS3<PGfaW)!zf#If^XzpA|FAzlcBh&W?jl)fT5_n~IrgSjIgzN|h6
zShBo&sivRuYJ+Z5*{?W#P1FX0;_gTm8iVegU+H%md}`=qmd`&tQu3W8P)yF$`-X5$
z8XEL}L7c^yg{a-Y>|YzY0i<|o|MK_q;F%U0z%OPBng$xF?FqUb6Htu_PP0rWA&I&`
z5dgNLOj&#+2LyldD~>&x8W=$d8q?dVqj?lu3l}p$gq#*c%Q+K8SLIC{l7066S{F?+
zrY8_2wH1hY;35&Ii`5;uj0LE}dVBk5aC_*8kBqC<!QM9R6Yo5ud>m>MpC2mwgq}{<
z&2#!WWjE3JzVe&nrt8ltg^}&k?#NXn0Eo0_AC`$fk?f^;0=--$N9`LN)fvXU;wNXX
z)Jx3+ffyZi9fgI#e!{^3gefd+WN78!QH!CzjJwTXvE@MSdi{x4S|7#s&{&w^rZ6;b
zU$$-pN;zTUJdw5!eSwaz?0MjOdy@F(5Iaxm>LE)AF^bx_brBN;y-c1UVZ@D0AXkgZ
zzC_cfm)4c6qq3>|+jJn^;U`L$`71AjPn3noS<+{Cw>qO#5V;hhvr|_gKWzqnQ#$Cq
z_$C5XBK(mL&~22gG0j_zHLM%+0-1I`JdJ8)pZWBiSH+xPtW@qj!;X}gmoyACz?<nC
zh&aIpwXPIeAO}Fd%v35f$PU6ulUVQVa!jTLt0q3Q6-UZd-R+N})&tBR;VWKD2DyfC
zthd+3v4k(4f)E32ez-%9C#`+79K0@_@2;31Pn=@={$Y=PG7oup1}pKHF~B6NVqRXe
zDW6W{4SXlprCV21l(myJpt1qFX`|cqR9Q4-$(Kp(OiRlFtJh2w*q;V`R!GO0=dY%3
zU?D=N01G;|H`;CM=+Lh>%Hu%R)gO|0>#jBh0-0_HC}&vvlRvNC%B9qj%r4qc7teK)
zs@LGmJT}+WR-8alrowjgmTYg=LCa%ETe9g*6n~1ttsoeEy)%6KR<Kbsdr!=iHBT(l
zZ10Un*vgm)3~&g4tt_NsIiE1C)3FHO=~rX@jQT^wX8Z1^#uD4gS*`=Z2AMx4a+&Ln
z3E{{@4apq&8}BCNp*k1y4w<J8A^ZJxd&Xz^1#=UtxfT3m%Ttdrp8LV1!Z5iW6k28b
zlV3*GdgWc__sL>hI5~qt#!1`cXDr@YGGBd>uBHwsNhV-W3|cczd^0C<Rd|zKG>9Rp
z`svRrxrQeEmS0HKub-B<KGV4%5o;*!+i!5fiZs0h+y8FAO}UKAemL<2xU<u>j!HNY
zj+{lKNGzeavE$wQkE#~gmNULp1hHd9uH1dC^40zEROFMyl;)7NM8b`)M6XDQ;*AM4
zRAi1l(&mPlJazgo5{K8PzjgAN(w*qhj<1l|BW_K59;)qz>zlJ8FHu!yNr(HT%54tI
zri8^}YSDO^fY|&nd8=Yg*MvFlQ;zu56WUp6|E>QTPGN$$vz9qgDJCA*%2Phi3iX<d
zZn3DYEZVAZi}nmvOJ9JQcQvWG7aq$VWQ++8_9Xac>&N({uBpXZFmb(TiHm^Ol&@$o
z27Fd~loNrm%cSrS7S}%9FN*KV{KHB_`@d1<|4NnrPdWSl^UD0+#2j*Pv-}6T+)HiE
zVU-E%72?+pUpxv|{KSN}V`V`C8`2ZQNB})z`Jk3s{1}D7*2j@pHhG?LyeP`^mAbYe
zGxy6oS{Q`qR!L*hr@k(Dzhft;=SE4xIo=L^<>eHTFgQx%VeU#hKi7wjUwD)1eW#03
z3+elU=us}_6xrx89GM>Vp|KPwa1>;$A$D6+zICmPcwZqjYBNAMHQfmM>^GWp*+wu3
zWCY6=Krv%+{GN4)O=V9=4dE|P%N;zu+hgI{zgx|hzT_YmvwxdqxE8>BCLae=Ai2F<
z-j0=!dg@I$ZT*<XhO(}u+FJ<v4%DVsf$z@k)hbTKM*b=>SU{cQc0ucY#%V1Ut2yg6
zA8EmjJ6OKf>f@p&t3`KC=cfORs~D=lE8&z5Bf(ox@ntAOcbn&nYze8(IJo$j#w{;(
z(9UO^P-?>FF7yXzBQcLih?`G7s;k^$W~`d;*)aNy6wfVH3EB=<_d-tb(GWA9ic}dW
zb9d-0<FNhcenPIG21A_{E5psR&xo!Sp8BC%xf;AR&Q$!;gge}1X(C6+e0R@%@Y7h=
zS8<&y+9eG^JIW0?kM_IEPn7W7)-%K5$NX~;l}!Up!|VqWSuTe|(iopZF?o(ZbM^fK
z^}*OJo)l%1(<j>FxDZCjECL_N!uB*pJ0ZSo+k{9|sg<?(I-XxJFmWE;;zT#@G(ZWA
z?jGR{q9Z%ue6}Z(`8Gj>!8D|MGAJ3fz!k1DkFM$#aXY+W;)3IG67V}~GE!OhWdgiB
z_RS!i2L&&jE***yS@ZXaB+5%%APM;ufq>a^rBM{v?+enTi0%*?lv-Ut-I^@hBk=;I
z&-)Pud%YUs(>N+F%5P6>{_A~j3?FJbwD@VV0#O$D9g+~cB7rrUev94R^E`PP<PO!{
zN&UkPK?o!;rLeEF|K{8KS8DTr`tAL@oaw(g*8kWu#`>?vd^LAF5Gg<kXl3eTYXd_5
zFX^xH_oSh}YZQRiAW~{EkSWmF%8BOv+jIcgJA-VD-AVrh2MgPnS%FB|*pUIMcD7Cu
z&NjwQ7PdB|02Nzj8<RgiyMHEW|Le>CW90wJ?S6k$nA8+#<@i1cMWw$bDK%2SKL`Dn
zZrJ`c@a7-={K+d9134NySlBt)I=s)w(HQieY0km@J||J2ofOEz%>4Z)$Gckj)9g<j
z!+T)!`-@ls%^XSp2=6_Jh}gQ3>M$^KaQ;<G%FM*XP0G#8`p?AmzZL-?B_=N=Cq<`b
zVGVLr0J*BzS_5sAROQu>0n$!DD+}X)EXMn)s5*hHHAvqDt$z;B#>V+R8*`w;pTu}-
zfECEm5#VI*00IFl0FnSFfGPk4G<J3Z0p8aZXaxW|zF#0?;rIn$<N!4O0&=nfnK}V1
z0nPwvfW5P=6UfBK>aQYofC<3t{Z^Ux)&Nrr7ZBhJzy)AzYi$h#*jYI{{{6VapCtf@
z0URyd0M-CGfVsP!Imia!3eW^t0USXt@3IX*9^ekJdmq)-1mFe$Isv2rMgUuY0>A?x
z0{CkU0oni~=l5})0LB1OfE~cb!bTSv1W*JxS^*u+0crpbkb^A%1h5Avz0bkQ)&^h)
zbO71>HPQDS1`q}~+5wG00C9i=00=PsGuWSh1K{Lp`(JPMkC~bS904i-34qx@dibmG
z&(3@QpWg4*0kM*@{UMD0atZ%)d;L}Lx0~YM-M{l+H}o*EbG`FQs?J7Ef9?N2dx%-|
z|9w4=$u|o%RZWPY53vU|cyTXUo1WgN0~Na*9_vl5q#8oPXh^(9*<|o!@TkLsMq24S
zuq#jyfoLKo$@2NNbf4)a!R@E*@f#X5?0GU9S0~**Ca;ElIGpo(%J{jH`J2DX^YXVo
zZy+dUd1b|&SOCw7>#Eu|MTuOA2-}1tSq4KTKs2CNK+dKbgYn`j<T;Px|Do)jf<%eJ
zEkT!U+qP}nwr!oVdCInN%C>FWwrxyx-`gFxduBRj9`Y&kB{L&;?8x}m`p?Cjf>u?4
zoituP+MIu|bz6I<Q7d&I3eb`hE;_gPOg6v$NJ(avur*^Uowg^pO@GRa2`*ZNLHflD
z;xI`1DlqB@UM?@mY&8er1UVq~Por8J;$yGkNn=K}(CWtk*Fp)n5lqknF9qYi^hQ|%
zi-^M!1ep*?Mw_8cFzfrT^K?^r_Z<2KuNe+*VJCu`a-PDwB6!E=9Ch1TTJ7h;Vnkzl
zINCU?+@KsB-Ny9eCI{Tn(Q`CjgD###-y*+{-6pTz#0~Mg^mIZ(T5sIgy>K1|dAxYZ
zd3&BR`ju~622GvNIi;(LkI$U9xx4)Ik=lM+VrEXRnI7)bj_lPMt6g+G98sIgFOcV~
ztXwl{8g6`dc2;1fvWeEhJEC7uNkopRT5lF4m)Tc!Fd+GT@WtwfIeF~2H}xf&!N<@H
zZx%+|FrHts+E@~7&Fl|5bN>z)DJAZk^jT;*xcTE>tK%AQ%4rI<?}IDNEd~%?aokz7
zUrmGXGOm68@!zjGq<@7k{rD8-^&=oEWGQ20k$@gtCq8ErV#jGOW&4*^#3wJW91#wq
zYMGp(hLJqgwpD6I@w3hESljyERvdfY(1^($;T9=nQLvNzCAJ2Wa9~PUN^=<07jP~h
zO<@XoCDlqLNU9FbIxsj;_FQ8>i`=694VZO%b}6|gE9FM)LC}tB8y!;}K~`YQqLdl_
zNwGX#vju{_H>=sDiXuu%StJEXn6T{1)ab780MokL+jZQrELdJqw>B%+$nK}GE2}kB
z3nPsojj67ax-*)l+9iVNe+=|zHwZY^YS#=9ngZJ4?91cxZnf}iL%ycqOQ+Qq|1q%h
z$N}E!fCMJspF`^+&=}*X;94s@XN{Wt8$Z0S57O1~JA4j?9EPYzB0+@7ltC&nSAS-I
zh7k7iN|m_mY#EY~10@`9Lw+U<U7pG8(c}27?w%JMxLvGZVynT1&n~FDeXrdk?63F~
z5+H(083(`w<e|X+05G45{a(=S(P9iFbNE+SBl?^x;-SW#kQ_kz6se8ksq(wp7>COg
z%N6FcW_ULtp)ZYUVV3K0m;07ujdc`UDUp>UHOQX<HU7I#;<A)0(W($>8V4%InxRr(
zvZ8Rc_3<S(WJprMvS{f3n7@5Wd7e(;la9Zw?37R~8b`J^QgpTH76^`<!01XDXUUjm
zK@4q&5~kI)rm*h}XFt(V<|%0eZvUqDd{^Qgnktxx$2Dp|Tgt$Ghz_o+t}F?yo=e4!
zY9-yEVOMlgZZ$NA?IF^mXK^|Is2C~luISOTXDTRpmr_QyTf}5xRf!hUoJKg4@r4s+
zUh7X<g@|Af&B*foo`4<*wJzP$67{3r&Tp`QNfNB893?@)G*7b9s#+|Dbo4N_IY2CD
zD<Nv;5SyhqmAG!n)(JxmBu#4?^?W}2)U@uKehYl-zgq5pD<Id&VSmLNHWF@`{8Mr#
zc~n{(c8-|CHjFs7pXI_yt9~dU+FDCAl_qMsq<zm7ety0`Po-sFO-oBYoti~UkuU8!
z)VAjCj;4<w30W|}{~|Ab(Awj|hk?^>X+6q(VKi9|-u>WtYVFn03vbhhK_*W&JcMpS
z7CO$L>9i59CT$uN!In-%YwK=ZO*$Zwj-gqchA`p8jFB<Yl0&#QwCWAVi9YSyUw0gL
z$@VM<2M^*80#ogC=SJ^9{>@{Hm!5AfX2;hCbvZ{L;8R#-itQMO2M9+CoU`cHT!sBY
z2o#w1YW#Rzn`g@y7a}IC)?W2;;ox2bU7Z^eN!jbW60-#OFUCHMY_?n42Ua~ICq}0v
z{Ti_;B>kn}im$2JZ3761b(1InhswEzM20{}^k3rQ*x>f;UM{E$jDr-obuS~1!$d$K
zAcr!Kf?T~8!-0UgDYBxva+<oR`jKj>G}Elo*_*%o?aqAbMkLY0Qj%PDcGcv>IJYXs
zEog=b?Zq+J7iAsGgU~T(Rd*g9EkhRWJGESW5~a>7j9oQigNHN6tg)1236XA<!i1AD
z^jx6IH$FVVE$xZZOHD7_C4jg;uY(6rD=~oJ#y{(u?IC?q-i<%88EY;1(Cf&2naX_J
zBKYq#zR_58A|0Hv@SgTjF9lr(Em6vYmqjc#S$NQ0r!AOamlUVx(30a|n}G2BIB9`o
zT^*BO=(7!pHY;~`n<!wHH{EHk$*s)OBs%#uBxyolcehy-qBzCj+_VtrVUhg}L{JKn
z+<$CXQZe(z)AU3mC(|_PSxNGvKg+`*KK*Ip@C8F2f=s`IS*luf1S@9#sgkmhu#J{G
z%@mSKsn%r})VpYDpRvA`)99#C-xyGo9JozO1AzpRBKtoP`}~N`Sa1BiC$**CvZDG?
zJ2+^AL+SkZd`!u|(wY(3Wo1CFt%D*OE%0&jr@<YIzeBRQl=6BkCzEg^1T8(7)t26p
zFI5g+9G$Jz-UXem_C<QN9B7k(2L_ex8vHD7iGcK6Bjuu{r=4FaHIis6R}!JH(ZW_O
zA6F!`&JvuZC|PdlTjnCk<E{MREvnHB<p!^Y`Aj`$0{pu#b-+Qf^$-p<yv4RU<rY~T
zD(o0SKmbut3tW)p#E}Ke1T+9Z3>U_LQ&3WQF9Cw0Akqs6!U-ZSn1Bff3Ztlkf>Nlq
zAE<tnfpL(T&aU*aD%-qS{a)Vw{&exa{qpql;wQgWVuu43Eu73gVqt;wwe6ds`wd6i
z6~Tl0<F7r*QZX7f8$EkND%;4Pi5#(L*3zkBJ}r4KI;%C(bkSK!97l+d$B7vphW5J*
za5sW|LrxjDM9WC&G0fs%!3o?$vcDHR(UMqNWIblY^2YRh?_&+GldX+}R%F^`*>tSA
zHCVU8>wjef{{<Y<SZYw3#T#Al@=Fs>W?lBHGRTR7$Zl_=8_}W`nWuiX35POl5fAwX
z&J@@>eoR7lFSTzl%rS~V-^ncW;^%X7h{8SV+17jq!jL|zsvI3cORTF7o{^%$`jR5Y
zfMu*?ZyKWmVIgAGKNTT6I0SEmrxkULOy*EQmiiZd6zcZh78Xy<NBzaf_Mq_JfZWb@
z2G3Y*Y}=nbR$e;X4aRY@Qua;J;f1(PZr{Qx^v1G^MJi9Cvy>SG?o(SoJWQr=4eIA3
zXYZY&=w}y$qvsNZX3E26be7td&C4cIK7d|}X!_*M#t$Jm>QPHdJKN$V^A7qy^|<2!
z=Za>H?9|<f7vVK<cLl=G#LOX;GOfg`rp!)($7Z+1-ML(;3V7Ip;NxzC!wrs%f|{A>
zvfn3*@j6AGGgtU$@%Mf2zG`!RlB^D>->C65HeQ|nkS=nCyF?b7p6FN(vzH?+v%7pc
zFb<8v&=$hN=zxv2p(G!hrmE~269f&#f}^A92ODIXdGZz}^G2-aeV$R@wHK@pDCkGH
zsi9HCDV~~MnzqMYmz%B5J}JP*L##PuI@VH0kfI-?QT7%CPa40yGN=_hfxha@YfB@~
zdWtLXjOEvBtZu{X;LA23tl0AIZ}W!WolrO$j_nl66yRjsc@iz3{AnqlF_xOq1r}%v
zrmXmeTF?42(q@dbiH>1>C{xptsh|Ao7yM#gU6;g-2b`-}T#eKeTeW=YY5P;FmX)q<
z8Oek4o#}>M;Rv_4?j359XJU9WQ5=aD^QSM|pE@t{wg{}um6BxN!wYK{RpysZ)R5pg
zb{fP)-FxY2*k4w5k1{7xq=lRzTbi^9>!eLcb7L68H#e3WTWv?zG0WO>-u}d(nCr7S
zs)AQSYO5uamxk?&|29Hf`<BPRe*zx_19kud!ecnoD@P5OQP81PCLbH#zyED6bZ_uK
z?K$GWIsmfd=UY;N1USG&8gC)9ykND49v6f}hnvPx*GIYvsNvK*2>?tvi&gj|YoUf^
z#gRuZw-9GS4%Q!>()VZzIRDuV5dHK3YBV=sdF%#*v=|ZOmM}`whU=pxh}-n<j3+dj
zt6wr;)e5~NLInF}GI87EHt8o^xKZ!gACL!(F&P!q#^TZseumGZ{Q#);1&_{OGrq;h
z=sQZyqYYBdrH1ty=z{b*owEmiufk3-Y%BEWK#brVFq#Hwy(jkf$B#qo8+D3NALsNK
z`Yy+6zt(WpB-dUqbN2w%5;mT4Vs2Cu(*RL&oxdN%Sm)jlH0c{}CVdlq6MYvIhgJ?C
zVUx@0l_)y;3qvQYxLRIRlk2himT?u58~w?3hfu0o{%)V1^6)m#1y?Bl2PUTor5jbT
ztg(`Un>%)DdaH^45TSYK*iG+tZgo8AJ?XuuFWA!Oubh2~#Cb6@KXjFdcEX_a^YP#N
zpvc?I>nomI<No?eWrB;v?(&AleGze6`VSm3<P5BPMkwOP7Xw&OXjWZ^n(oM1WAp{I
zQ$CBO#p3RUfx<_V_v~6jHkZ|}`xDpQq*xzFvZ(I}3DI({dnMFOOij&FVqW83XZr2<
zmawfRZaVTbNOa2|8KWO^YOHJL7i_Q&x*dRVY*zQ6CmN5<7cgv(p$ZSzC*mQ8uzGlJ
zhy@WP)GlGt7L3+gQ?1*VO^I93Zfe{Ve9CCkVn#?KL9$U48>)IUBqVrzMCW~C%Mqq-
zpbV-UJ!=)$#^=#D;#~*h3q#U}^LQRudHIg^21Xzj2&#br3v@<5YY6Q94l>*+^UW>k
zicJn#dU*P|%~IEA096{g)h>4M!-)sDLk3XI5$c6jJnT#^YA{-%;eA`QtRXgWFFz3g
zei5lzp~2bFChRKj7_|CP(2RarIfc-NP%v2Fh0Vp@Li0igL8+!SPm{yCIc`9b+byTd
zbX4mLPaV#c9RCgOe*&K>&-SxPp(#tZ%1790Z^!GaU3Rm)&#i8MJ$`tGegN6`*e%LL
zXe@}7S%iojmqD5qjohI^cLF8|h756O+GCCoBnFDd9P;T|419KKybJ<*i~?+|6<G>@
zj{RWE-wOrphJe~&@bmYb0v&=_>?M;z?*y{bTXoq6d+B%02}gI)uhC8Ngi=Ox#eDZh
zoj{ok;`g9LLI||UW*Z)(h|TR(f+yJZy~eWAgtyu~YfE!F2>4Syv^=@KlJfeIUE(}$
zwT+HDOT%zZlMa4fUDPZ~fq8{*y}P3*r%fVF?>8rj;xeh$=*@^k+8;<#4xov0q8w4|
zA|sI_6PXhK3K$yQ3jP7RB1Lw?ryV;vB>fnNO9=u#3R@4ekY!N0155gNz;5;QaGf6G
zEnX|`XTqPYmPCx#w;P3$Oz?-X)X2vUQgJ_lXP}a|J}_J8D%{T9>2DgvX0j%2N;oeq
zugXiF45KnS29RrME8}R1ub?X(<<5bYGSL^kGoLut!O6)SBa=RG4svYI7;^)pl%srO
z-&(?3Tucu8qvdp?d&$(WUh820yj^z@)9mV2v>sS#+XRJ@3P%KCBp?C=1SAy4PKcmK
z#m7KMLI^1-0|AMEyiH+$_vK3v&c)SHy_~(4&F8k^oao%wg?Lpj$L;*n?tFdYd&0f*
z^5H9<EqX+`8lVy+3DX43?)c8E5C*qeK1g1QY-F3yq)wRx1vgTghNOfr7Fw{1Lr69$
z`CD698`B&(ml_m3qS*ojU!r=G8qQc()F~#D1X)~;Vim+Glu0sRBFP<lMX)OQu%d}b
zP0>nmDnB8d$BqWLvks2f3K3>4zKh=z6e-ynW1H&jH!H&9MPi>*aLp#Kee-1WX!SUK
zN0=PZ$hy%~7+jXfNJ4y&y>w)Qm0Tfx_?E`=<1Pd-eLD-XH{I{fsD?ID6GO@e#{dVe
z6flr!Zsa#;<c9zxzZ)I21b6#k=^yX^g7SGywkqI1^n>R89+$DohG3yTj+8D{^Jk`a
z+WxGm+P-xq=4k?^XfjXf0=uqcnN5?M@zB6*lSi9cx)Rz0ZrEJEbL?S~I_IUUuOW9K
z@lJR}N{>FqiN5<}w}&g~GbA#be%4xCzmTC*jPcaqx=Y9~{}Eb|fv+K_5&qmY-FJ8Q
zdvZp%M+kphj0LQIYq2W*b?E9d%Vu-KQ1^ffxY<b=bZjl6SVM9jUDc03jiACfMoPML
z|6qSu3RSJT;w-B-du9&&i8vZesd~kdmP*DHlhZfMfuTAH(Ivk^bDghhop78yG324z
zEn5UY%&SOR`AfM+3i-93Ss)eJbAc;I9M3$)B(u@W)yhuEF&KNPh!}2-OrhymDTHh6
z)OhnKLQWby6Q*ctwUAdl%Z=fNNM>)7vSics??7i}VAfeR6|-UqlWasMg0h+PpO6FR
z9Dda;-OeRl)*#;Kw{p=3Rmr5~2Ls%H1GF(Vc;=if6Ha+r;;zY>qFnLSiy3RUu~W7>
z3gm&|nKj5$%ZT0O2U%jektf%VmprjRhpf|fXyjf6n3VtG>*(hAkc+2MM?iKP$Y<BI
ztBG-j4~mKU0A>zY(CNZD=~tyU^l+}*U{)H`!SIpZ14(=7QGz>eWbwBQd=6y+?Rz_*
z_`o|H5n3=ogy?!D{TouZlUMf0fWQWlwe!ezgg7H#oN@&ZQ8odj9n*3kzJS!?CV;m$
z08<fev*E#WY>U(aMICpU2?hm+0U%zn+~efQe>ed;A$q^qwr}XTzbsGb)`zOjcsy!@
z0J?WJ>|~V^*>UCjHeLrdwLhUrem+yS36Ra8-W4GIgc+88tS{eS=W<(%ho$l=cgZ1Z
zl_CX=ejAbVKNLp3|1SLI4(F7YG$RG+|FNqxF4H$5A`h7M`<CllNV5$a4Qq(1fP6d3
zInZP#)$MWiiS&IBjMSI;h%=un7i0L`nd&(y;cmj#JJ@!zZX>yV)5{xzUtItrEF5&-
zNw2;REpx}-rEgw*LMHGd&Y>2JJQ7M{?=c0&(+JS~K-Qi9Aczxhpc9eJ3EvM3J9!A}
z0_WRTaT^t$25Zv8r8yHgGxEen>I^k0TB6^zXs^u~FKRS$uHx$_c2lw>M8SL+;2)}~
zFH2I5!$(50J82#CZ`n3m)sXab0##6;FQFilax%$6xiZ~4({i&KQNMuL<}HI4zxw%$
zQyFRPODbm>uPEHd?JC0bvNg<H4W<N6%SeZ^!7h}HEzI9J7{c%e$n1t4gCbz}sI-JB
z?_F_sG=MRKzx<}%p`{HIa7XLd%Jk?)4xLQ9LT4Y7PV|eb(H<k7nlzfG9P=^(dcLL|
zUjUzW?Ot|zMn)#Yf(MEmEade&dAGaGVCcF5)p<RC-meX5Cdix~_YXq*l)FrBdNl`V
z_xIltqMR4ky1pW8=WI7%GEsbOri<D_zNcYgk%wsmS~#;u>mp@^$vWojSaVd2U}=G$
z)FF2H|A}uqT;Mi?)3~Hd!xPO#1pFmpqlnaMcpUqy<B>pvbYbHB#b$nO{riVSswD#5
zjp!H!Dm9sQ0+QUh|G+3Hfl+Wa7g`-z5D^MFcOUzu5t`eXD{_R&&H$C&iau)Z5!pqH
zt&%Z;ToYU#p)lqxeqJ$U0L&tWhzh`bk^&}fpaoWY^qKXb@1@yz;~yY7cqIYAjrhZ=
z&-wT3D(VA@S&q^dfIEi|R(1kh`J;)S^-P4L(O}=DIke{;$ITtb%vMoR-WD!v0-BU+
zRov(VLtCky%HJE>=us`{{$Wi<6|M)4^jK;7RfmSjJk><2Xw7BGRoo~_P{s?mWhzS7
zrV=G$H3_T<?7<8i*A%KQpJaLV%t4O^kVVee+T6(DsMdVJl}X=f)``pDxjq~z!S;2%
z8BnVH$|8@jrCdF}llwa2-9Ti2=?4FW=vlq$^kwpQW~#!P=@NFVq_qB7s-_0nAD_jk
z*50YsEgj{u;>KjDI-TG#>5It7+o-_Sq8f?SNpGMl7Yg&2;y_<wJ4Gz53<=f9kZA4-
z?rQ{PXWOQ~SmU<z3aO=$RS{qLEW<ia0e^OEwi9DONT|kW!`>tSW)yGz)m-$?IJT_r
zSX;DU*;tns4HGOQ(7+SN{$4YE;lIW~f4GMOJZ_oyyFWs6*@XJ=4;|dL=Ea^Y_IA6v
zV8HuCLTZP(2k@<z9Urr{gmZ^uw}kbi7m&>s71`vMB2|=Ca%c#uNW@4{myI8=jstU5
zs{OIJgoLZklP{l%q%|@0Q|l0jO*igV0Y#Dqc6vixMDta9RO3<3sGuW@Tx^#@Hk==0
zv68Av!Q8kFI^jSQm7ai{H)y2vj9~5>vP2tCSVn1v+6n59CCUTmC!r*vv{QeUt0d?W
ziu1Rhx4l{uC3}oI)+cQ5z*=-0Uv=+(!B5mk(z(@dpBSzv`-nP7CT`<jNy%<#km=%g
ztFg6hS?iK0Q<m<SK2RZYgP>MWfF$_cWkkdU2Y2?wkH!#o9*PMe2?@DJ5Q=Q)=b`9_
zdWxLbsFq|exK)^MI4<FN^+EG?0J=8weu3va`0(wVyz%wq%7-eBW6QwxaMBEm8p{4)
ztY2J01~dA#vOfxzPWW_RJopN12`jM|-#Z%uc`!0|r=-v1ag`la&$|~eE9?Mm$)Y79
zlSf6Db3v9SE|zo!`wj`oq2{7wD*y~dNDh#YV7`FcZ}p9tU&|#>k3~~Nq$W6SR2#3f
z*y6o{>U^AYFTNz+wdE4OpdqDi=irH>$jL*x$?hU|a3z$YQalX+UpQ%KSjmy`<2rFf
z<Izn&C4qS$GH?gNJc_S#>-aw#+9iDc)qDqgf!84%omr#Zfb?r}-8DnYac%hAF~NB^
z9jO|#wCVI?atDM9hP`LwQCK5sMBjK}Pr_gJchXO-#&-k7+GJdY)93coVaZ_(jW)Hh
zlrFg0S^q48eGM%VvI1>FEB0NM_OU;9rFmQDhwk=osR^6WAEwX6??5KWMQ>9hoxDP1
z7RNM+i&}XZya+~;Mpd!C3dUREma&t@u5Db(BF`1XhdUuw;cn`*ge-p1rufqxtYl9(
z(xAMdOz>35dZRSKc92<WD!S;rD3zq;>N1ray*eDrNBK^VgYVi5vlrC8H#+*^uN9%t
zLwt~?t;w5u7SK-9E-#d%gZutDNor%{Qg9%DE3uk)I^2PZYos3$>)bk;1Ajabw_|>d
zRx*GwHe*K5H0J)zuYq0{S*b6s7pl@veR+t&L+ZhwEKnt0mij?qVg}r7c&r~{g7f)#
zJV%Xw2dxhFef%EvO$(*Wk#57c+u*En#&9;Zjfs}y8U1ra$b>k_JCl}60y~+%=lCOu
z5q(N+iCLdFsw^ad1$BjK@GUDgu(Z2)iy*<l{xZI~lb%ZX#Uj*g@skv85F_E-u>-qV
zbrnO*fWdH~<(SK+fOy#Ks7;E;JL|QH#{TGm-KDpA;M({)TX+va9vpos2W=B%e-nqk
zkXps@!#hVuAhYmk#+xB$yCY?n+Y?z!W0MHOEV-o0L_0f5RX$;e_{WW-JwkExPsk~F
z@eYTi{(VOgo+Lp_{6`v8z@0xzm5oBHO4{$+dK_KQ;HhrPm`J&QMC~o&DpktgB)GwV
zpLh+{AtOqUlOaSN`FQ~Kwd8tFr9Ooml8~fVb7G;tjVUbsX61e|{;;?8vQ=#Y>Znw_
z0rBkL=ZRulYKuUNvbcK_z7lx&ws@i-Ij{?xmN_{2*UsM=;#<U_%@i6x!^FiKX5;Ff
zJ!RLhCTQDrRf}$0?WlE8ht;uU)&!U->LCGBW;1NCzVW@Xmtpcfjr$6Rc2h;d(#1)g
z6c%zH%0UiqGh@(zYHE<e3Z7PY79dNXmzmrFiW4<JuX5N=)9jZPcEe5EaR<<~m-F}0
z*k=p4+xRxf5R*F)U$b?fQ~kl*I2KEUCFie_ODqL{0|527Op4-+;5qn(7PyAHV`c$!
z6c{%5rfwQH3I|e*&PrmhNOi+J^(KBKdbu&BP7KJo?(9K*T6m59U_U9zz&N9-Az6rC
zMHQG<M4l)A;q<X+eAg$JPyjWAZQ>g2<P`YFbbbSriMLTL`8jA#PIw`9D7Q>Gz_q$Z
zkq9OM$P>3;pwdcQ7C)2~Oj?`HKLyJGHOfl5;N;D<ONv4P6LOW-@qFuYH(=q4rXLn5
zJ>gOJhbTLU3NB(i$}^yB95-h;6ZF#}P!8>k_=Y1`hL?3d62jCZvSECK@guP^3{+&K
zT%5#@b(rj0W`S4l)*10e*MjU&|IM(sLnR>?QKTT9n8b;bhBOs)*Z^$#M(}ejJYfdb
z(hDlVu3EOMe-uvuV~q|`PLmWXWlLlRDv(t+SVCebhR~@b*19EV23B>?IbtV8m*P(2
zmYkt~?MET`XvteC{spEG>m>wDn*063!7N2znukDNCaBT+lOB>LSy`iE9iUgtR*@&O
zxk=dznlBYQ4TqyD<%OC=DI-N%t%iAoq_R$Pm0(yu8}19m*Sh8P1jOgVDpXCdQV8#-
zDNwVvyUzkrc9b*kZf<@t&w`PASeVVnN}mU<9!CQ`B5+gv*B3f7Ku*bOO+1Jqf{638
zU5vHbYLRtFz`e>xnZg5#kQfDZXWCh{RIzHvfW_FXa9*n}xLN__qeBYED3^fdse#<h
zSLSTgxIzM#66gHlCcIr;JX0K7epSHzTNDtf@=hxYY?tM?-ly~|Z_KD)hAW<eK6hTB
zQx$%NE~fWth-@7_lVJTTRw&24JVMucE(G4#E+fZD*@m`=)KoN{7l=E5up*q4y^E0@
zIaU6U7!p2mR36{X6pg`Xn`NZ)&Tj(Sa1#6cJ8@qtdK@B3YR>3xlOkcFfg3OS?+aqS
zCN9!nIJaDwfRr2x#1LfQ`hJA#6YhrQya$YXJJ_E*JZ8y8RVdt9N~sFxGpP@J`<zef
z%n>20P@8FEW8uBhKTYgd+!z1AOhX>AJ0|11G-xZt6beTsk-C&@0jM<7+c2nF8*W4~
zMGLqJsFq!oU6~o0wLauVd=>FCr!C$Y)+F};!oCHapfa9&H+gJ_^t|Oo#inCWra133
z6hU0jk3E<OYZfc__KL9rbTsmrFX_$d0Mdowm!@t^o=J?A$~cnRgNm>oRFPx~kWOC&
zJz&reep;jW44iN;xg)2?<F%RnaJ%7R#ZhtiuTMA@&RV`3B-~`z3I!DT;82E)VBOXZ
z1Q@;i`_Q42G$sDHsV&5g$wh#-{up<!`>k`$I3y49nfK(`{Uzrh=O)))vWZtCtlCOo
zTNuqi5}I!$ktGn2FzRJP$M)`H>)zu=xAedJTJ^v2uZsp02I_+}!6XS_ft^^dveamH
z%U&*tFKOCf^cGt`G2xe4=V$Qg;oo`i-TC0VdFUN?Pu)y@{Z5SqUe-&X3oBaChNvjI
zp5(p^qWH-B+y#Wmi%7jjM=}^8_8h^?=*9mbWbn%E<o7bBeZt80z5F-;6D#bj*?G@;
zJqB290)gl}4ezWDp1fQg(eg6|x&-4N=>20Fa_O{B^HF&U@~w5(uYP3mhKv|Ji_yII
zNl+^Sf+kL$$nZ)=o+bJDrzJz4Ce9;f3S<KBUVAs?$purlXu@Ivu2dniJXSf>_6M5s
z$|y4_Sh8xxD!No`(Pn?o$gadTL38aE-?Ai1Z`Eq6jQh7$Za=WpTO`&hp`pZ@W9rrD
zSsp(=_s1A7V=&j?@r9Gc>6LlEZ>+$CP*1PSCUmai?epv*Orbp@$RD!Tg_W5}^or)j
z9fmCE=%V27#Nk!JU6%npm>$aas|}<gU?la>PDOsfEK^JqDa=AC=W6yhLSc`HuMc%H
zOxtYd6znPz52X6IV)$p(wi&q&G%PTV#jg`7{|YhL`^LJ(RR|B@g}m*5C)|&I3Ul@A
zL$6la^Khc8ce#27W?326)!{G_1J#ifQ=zwKb-r`6D?vlsHmReQECwz|pz*$a1MtE^
zB-qX|r+kAQ_WVRIu4A=OUJ3Rq)E_+EiYI4Z4qqy6S`~l2EYiy%IJnPS-TK?EUHO!(
z@hmH%Fk_EOkuO+4FMLh_<;Iy~-SCqx)UQ9cvH0cGsGp-OA#ieB$<1!ARV)=-zJVpf
z8DbOcIfCyXDOo0c6!5Tv$SAKn!bBdontj)HN^xGYsfI51)?{mJvY{b@-Y?Ae;cSc=
zZeY9~P9gw8;*AdPcW@%!_wrYwJq6b5>GW7mV!V{;Y*N?a-x>gNoSKy*OG3_HX*Rs?
zcSc21P)$d<&u7ESq<>uFgauC(somwiN<J-g!{WwML0MQ)g?3hmNd0Jb;;?#JXgZ|?
z6E*kCsQP)byNMjmv&Z#bj#i};I0Q%V%a81Lu`9$YYGX?mbzTg6T?+S<y*uQ+-8(tq
z^&^Lcp!4B;Y$2j$@pTM{SlLecL-zX0EJdRz^lDgZvBPH_vNENMkzQ_F22ClWR*Oc0
zuE3cK0I_NR1T#-l8#Id+wM1EwRT}h>R13=MN)2&xJNBc6XK-Wx3Evbx$y6zjrdlgR
z%b2C?3zZGP`)!%a2uglYZ#BYYoML;E&^NR`5u>5EEiqT&tK|(qi3@|KJP{?I(6Qa4
zlm@PtSPZT4yoCFsh_JBdA8dl)JH>~%ry7RiFe%`|p<1bHfuz=6Qjf}473W|Da^dgE
zK+dL=QJ;%?f7dfJNKb><(ei#WLyeyxcm|tU7=R&4avl9-3VuhJqV?&L*gII0Q`^D0
zv`_MF8Gsi%RZ!H0iTl;d9?dYE#j=Zs9)Cr|)%0G$Xp+CrO4g2wBK76ap`TsWXWDu$
z8eKDEF|^gGPLT>IvjJc+`@qOfvLN+;0tY2!Iw<m4gWzXR;_Wd#u>D+zqL;uJ;|`1y
z9yuh|WOTP*P3D@+cTa*<joLBnR#9ip#Xn6fOgsllGE9h;c=l)8@t!YhH)+XOSzYZS
z?%FitFPaC!FfSdH)Dm=#O1|<yehATXrSlGpD)ADV#S#|WLwC7G0?dFXujvOmry~e+
zFJnF%3!}v@2y)=|1&~xyc4S5#MjyJ9KK?~?5@B@RTSt7CH5dao_rKZ_PAwn20)>j6
zq&O4vcr-#n{4Ad;cPq4N89Nxt3OM|<4g4nbi5c$Y9KIYA=)zJ?Z`1<LS8PrPb=cmP
zBFfV1*4<BbznH(_1-g1H^nTxX%+Kt}l^zKKCA=x+g^LJMr9;9yUmR!&85RnnBxzbI
z9^6Zf@vDM61(TfylGH(eHo}X9PH5o{qb+p5R*mODKg?kWebnn3kP!64-t`iN<Ls)_
zP4L6%q@qk*lr#Z#ijW~6k(G)R7V+c&sz9+v!$fshDt97l8Y2DMh&b;cli6>-2{TQb
zIPn1el8|fK-PA<C!+ik-&(R4uF1)tcY$(mK0<qFIT3Yj=NxV7<OxC!wX+CQt)Sy64
z0>HfiPLi(mo7GN@G8j;+8If(}6|_cqkvEGpAnq;lh?T325{E^9WJ(sGLl;&i<lE7V
z3X)GxubLtqK5WKi1g0h)x|HQM4@Iip&08@Sw(ZuO(9O~_GV59Ep5C=BK_t&MU}5^v
zucy|{@)&&wbRU;sI0JpB1a4$}$eAZ+?=ewTl^l;T8p^MCK~+rFi?2L*Q5QO6NtX*#
zU#|PuPcCPPucm^=ABx;TRaZ@{C2BXAsV1+C{8vOSUAG{-BnhXOE7LTyH|A*0AQKvB
zhfzB0GUL-RNIBS)aV-bCR<`_%;TTl5V@M|3Y-bOV=|)NnNraOdT@_WxJQ}cka2fe;
zRz{otqM!0?V`%lP?*So`Io_%#P(G$Z2$2cNDR#I{QTLRySvb66iPNS*YsI)fde}EC
zf@Qs<%+O{y9wrL;`!qQMzGRN_&~+?AD?FR{CzBS_+K#ieIfj-R&0TpArN;M_X!^*S
zlt_tWu9?l4_9t1CLjJ}-tWjZ_kJ_%m70c$(zgxes*UFU#GdJ#zo(=CH&*o6k!qv<U
z)9J=sR}*f#Eo>`zbzzXDX88}`$z78zk`m1vl=G@lIIUOcmCFm9J7IIh%}xdpuZNQM
z14-Q45~<Rd>sd&;Q%JfbXF!`k!wo%mm+OZjT(`cmi0>ylC<Ft5$)C&P|2u+a`LAiR
z|Fh@)Z-Dpzzvty(`SrX^Z2#|`S61qO_q?=1_BJN}pHMIB|AKn|!}I>9*!>U4YWYih
z|EJ~sA9D9UPKo~~^;M!bvv+m+g}tuys{es@P5!5b{qJ=4e{;RIzijtE{qFyx-Tfb`
z*8M*Luh4%dy#EPz|3m5;|KeTY|IoTBzg}15SM2^*ultL7f3@*{6}!K<_*d*Yo7!6b
z$91Cr-R%B%-TNOm^WVU(`7itZuUuK|e-*p`v&89th~57>GVK2(b~%_Ce$##bN3iRn
zVymF6j@6Brfb$6vE_Szl(M7X#9;38XJ~R|4QPHZR0E2=^9D+cgFCfI{?=LAbsKq#Z
zi%US_EhPX`nnn~DX;hI{WhY)SUAkfWZ+&gLwc!Givu~@GyW{6M%VUSx{J3+*W1D%#
z86)k7C#ugtp@Uy;H5;LaPLl)~jTDOY1KK40?ZbVq4s`x9_^=Hbduy=YbX#<r28o7n
z4N|5Yc0>1WhQ9mtracZ89i&e-K%sM0q`DiKN4??mr`IraD1X(;=BfaKCIK<z3IH<7
zXVsS`JwE2HPKE&Ta`2iNqs0dS19(6K1FaSUx{o0+KoJ8Cto8+C^@hO)In>tB0N+T1
zC3FbLMxLN#kO48&(py_!d6nu?7c7>M2mWQ_fcz=*-s`+)kbm<B)tTHmu-Npeo_MY8
z@`C_f1>_a<lcmQ}us<+8#2lTH1K-gT*cm7ntPH(I+Xn6!G&Asq7E_-}hikx<Zln3q
z5Q6-0|1T@`^)8?Y!yXB;I+GflvgD(amgG#RS#bB))D(m3s>W*OA29VXp5N!AeH_`s
zO4856df6g1|HHYGC{vKuGFJ4%5s5rbnBGLvkZdB=YR^x~8<vJ(?x7@U29AtKgG5@j
zKRhD2E&gyjyG`42P{zOMOY;`;dStoNW$F1_aR?t5@FV<5^iAi=?yLQq_Vv})+azbX
z#5vSzd~#}lSS(2=is$dnzc=>5QYD<L7#|lLQq)!DRIFxS#;~w0oL2LIJFUk3S&+t=
zX6Iw#rfg`)Z&(AGWPLKv2p@hgH#YM;KDHr!N#r;?R^VBz^Pr0Po9RjOp8onK*%LeR
z=;z*v_`~U&kr5MnsV`pnqtNID58IKgBkj>;6eHel`N93VK92kDQciReE~E`cMfFJT
zBGNW(QJp89;etEz9$<L*`r?51z5Z%D1z?J2aoWi8X0eEg9Z}-9u)7($ltZm^7~4!%
zNJ7#d{}@Yw`Cce7p6UxPc?jN8<ge(~-`f{Sq`uDE2mcla=&cAhuqTKEMa$3+2wWPI
zdV=3($4RG;{k;sTWAi8oMT7|amS5%XywT-Mjs8ARh0Fl?*MZ_l5br)Leo;q=<WV@Y
zCWz&ErHxqg<gL&#DAN-G__Y8sq>u&Y$U-p~1XSVv#i@|_`7b}WgF8C@?V7`bt3<yC
z-zG$_W6zD{-udKTxIF}naWoBP$n^faxmm0!MN>k$3iZYcN>#6#K1mk0Y%X3AZ7sPb
zB>Qp`rsNWt9-#_q3e-}Nav;@otfaD7)G<eo=y@$6RP8JAj)<ITu8!#DwG6r?Z&$P4
zMbqXSTif$`Sd9m)qY|W@Np{mrWZLv+A_bG1#TNwKXRM0fmj31Dm)-1<b(blXh^pQc
zTT~5bAFBCf>MKy6JkLiVS8?eHN$5L|o-Y$(#?#UU*V(J)P&obgzUn%qDlAc3zIa*%
zGn09wc%|YcYuAw9|1xs$m^0~>WYz<1&4LE5%TKNcU+;EJ(e-7huAsr468}`@%87*Y
zVd%?~SD7fa&4Lz-7%ijftqfyCxAUrAx>l13TQV=yJfQcS{^V<e3U^YqAkn^1by1=0
zKOjEl0dHpRJn{I2@GJR|Vw8k7z^%U^p9Lz_rJ+SM_QUWrFt&(`NqW6cgoa<cDQ73M
zWyt=E4*u=uIWV^{K01TK&Cy9nNEJFNzUPZX3xHuW$?^03I{w3_I7#EQbK;px5byzs
zGPxz*=UFXMIdy#C9ob8mUlfzCguaJmbA45a8*@yEeocj&^r#3Ik(Vxi3tEf>IVI`*
zZ<2Fsf|%EeOlRDQJbp4!24!;JT_XovXDk*RZ%`L}<-pBF6j8Abl(OSAn-aW0q(YDk
zYMub7st>V{vC^E?bYr{jWpgh-n0{eoNPve;lS_6J!~U{UD%J&7-=RILdRy`XcsCfZ
ziUA{mL#HCx1WZRJf5yD$L`~E(5z5KGT*VLpSt(>qNeEqg+zXaC&$}GS$&d-|$1Yft
zH8IJf{>@07yH?}!7;j%FRc}k?&+mq0+74hT&`N|5Snnv>)XB`dM+0v~JLIpnQ@Sm2
z>iK&_^RiS|Nb~7$PfufS5pQ<3|IGcWcFaE&in2n{Vp36Yfi|KFrijt0bWU%<aj7ZJ
zjiRDRtO>2yHNlXt!B^(Z2c^klceZv(J38qx`uLO&u?Rs`NGjD&WPHTYp+GAQh?U+n
zF9rymud;)Yo?YT~#<AZVEeFq}Gr-6<ZwiOe7Wn+2hNrlYlslc4=bpsqMFhFAA8|Jx
z{XYCc>RWSB_G^28Q<-(?;-5MDIY1X6Sm32ef{*-66Q@o2t*K4!xtQ?i*X@MHP8%w2
z_J&u2I{rFmo}3tb^k)p2Jh4K~LZW+A&t&;wsxF;S^X6mDqa=q*O-2)B2C(YR_Y3Ry
zry64iLYRTvvYxSwyn3={AIzgp*YEKmJM>dGR$bg7e5o6<?IJr8v6o<EY$7OkMi&@*
zMk3s|H;y0I^Se{&{pC_I1`&A3bvV)kpe})I*|K`nx3{7CeU&LU)KTLBfwc+w8xi2?
zUxanBoR3|Lz3nfk;2&sah8V_*&BQ$+0@SR{t~~z4)rqnp+lDJM&CZ<J2CVx}3!)Xe
zdMYC1!4jj^*ohaa*CWFv-yaDA-cre1jx~d|v65|u>NKXO|0ZQ6U|pz9^1Ejn_8v&b
z0#$$fUp-lFMLz!Bd-Byh^!w1!nctk=lb~#o`6hh*$FtQOQ|O%=bBE{O<@ATevLhZZ
zJYUCf2s|`V0SF5|7($C+2uTP=gxf-@TtbZQ9+)_w2>(0+v_Wbpqa{Uo#F>SMtO~6<
zwLgh}63>nwd8}>Cvzq-bC#NsFA3k$-evgwEIG1RDWMWqKo?(g`*+q`r4v?&SnD-Z9
zRYUj?`9kb?#`5rktf*ezX;Yf3;*B;JlnrGZb9ScGw_syos}GvyLe$>PKNBLdy=7#<
zd#yQ6r6CX<$O*W7I%SXKlv1=+RxK#fG$|`Z7KX(X?xaIs)9~B6-6y3aBbP0~=ia<Y
z@1~^*7Tyg4Q+S1k)jgm1;>g@sSHFY5!H%xl0lN@6_V3QO7Wj@e1jbrTy$7a)GzrMR
z^3)=WP0Crhh-3-p!w$Gbo;B4-uHzO<OOtRBvtoUREpXuf6%$3xv*Pe7Bg7&6bhG$c
zOC{ljpE^*tQ>E(X(Evf3TAE>-(KV+0LHJr^fy)lo36<uQVQdPMhO}Tr9SG-~6u0rF
zoiWb+B6|^$pGtpNU0Y->;1gPHDWe^QnY7*w9&q5hCJ`B3d#>DCGD&VGsbWAyDLEFa
z>D9qIy}vw#A&rkOms7R~P(#ebjf%Ydra%>&vg_g$i^;L?_yX}F=&bYhhp^W-2vNo^
z&1K)Tx;h7p3eubKai=6M4!V?h3#t@@unHa?bzSAM6-kJbK(a|3x&-=*;kU(;WhX+J
zoH%hMX^F}%;{Oh@@ZPj~v-)EcUX*5=fZ--NEONaa9@&DPLMdsg8QKQQ?T{c0o+n>z
zT9iek`PU;0^g2I>cJ4~0BH%ZLanr8~WGoA@#%Anx6vpuwnln!jo`3+WRm%VX)XR70
zz;tNj-~<c;?0~}vFtVd5;}IOFuuSNHOo^YBahq4^k%VK5dDg=QRGOQgJFSn_C<PK+
zkwWEjm)_mPYdzYVQ(93!La^tEbwR_!XyrtDG{+~VQJss`xd_`%r&rSz9qWVMV-}19
zd6~Tez}u(DrMGJb-SO`wyDuw{?cVoHoi!*$aN_LwTKV@o3&R!{7?2p-0>==QC>!fr
z1R+Yp;`c+5I|s$>3EWnlMK{m+%Y~>N#Fy=gc~;U0ggUBzJm?$KR+9Jabx_X|ESIl#
zWhC7!okH4cEb^!voH6n68tNsujJ{k4@;J>Rj8ttfwV~E}+QJvSgWfH~ftWh#3@gRN
zOFs~&3sWEUks)s!V@$#7D3UrqG+)^icFUu)Nsivo$mYaQti6u2g5x#VV?<Xw$H$X4
zVsvgXPkAv~?^4LbkBKvngA&@x2znW@Pywmy)UK5b$RerKg^fH@h=7@=?j#ZpA_t{?
ziVoF%`yd&t_lhJ^%iAI$N(H+<pjk{%VRCa<fpHZAmourr8ZTS^{@Om;9zNd$nhTi8
zs}z2jQ}>{}2UaVH(0RcA3fG>QF+I;cc6~D}72T0gWlc&?El<As%H}KUZwP2nxO39i
z^^?-u64)fJVT@oXq{ql@61gCgZc5PLa#I(H@pVynTHL3rEtmMOh2;Znpe%2#+XXwJ
zO$d`JHgQDCRESjJckICO9#DI#Qzp!_5Yol9YP15ey0yPp)uhtCRzMwF98BewjnpJ?
zC@i5zg<~3odQITMo($4-AhTMZDFa%N#8V~mLqtk4ub}Wn*s^|fcNeUL9lyGg&gY%5
z@Y~Db3+l`H4GyRZ^SVzdV@(>vVww~+3~K1{XCi0sc^0vi7_C`Xb4H~cyCu{jfqpje
zT6mwCN+se2iDzD_#Iw|$N3IG!JOOZwxK0W$5M=B;MezM_4*qw?8>FGH)BbRX@9%6s
z*DvJHHDSqK-un&zJ<jY|Y>l&QqCdVdSRXEQ4X>!N8R$G@r!D*5@ji*kKM5lyDdJzT
zJX|Gt=x|NwNeH3k`w2|I96GjR_Cws2)3OCI_~$BLGp<G@Op=d_?9+=Z_2yhv)8Rjg
zw&)9zrQ}a-K0(PJDKkGnZ#|GR?Je-9A3W1qbPL2>&tk*nS*rk(Z|W>2JtjRlT|(yx
z^Qu^;<zm%|7tQ7qZ~)QaXd3am7Q&`P=^E*tBn^<4j92#9!#EcT?J3~sj#dcmNhgjW
z2lHKO=uglHKXr6^r?;_^8B$x4-KEeA(F}NW^v9`i^vhl`OC9l%v&}v!mE~Ki>+6TV
zwVdu5)F`^?&6J8_qb7UjN3G#%8pRfmDMk%xDENwBcU)#a*ym{%PEHv(awZHd4W%&@
z<;=<I7}QbC{mh`f<G~TL72uxAv_cBm7BJd@jKrnR`94Vl6q`tY94_@X!By2`pR$3w
z%%@hajpU7c-d>6B%=J0CFzp7@J8qg+DlHszsu|N|=#(;<#s$URat_oPJdvb)M55^_
zFo_H+e5hWgJzA`<R&|=Z;f@P6hGU5eUab>TcD0^v;Hf0u)v(WVu6puxb-3aj9WD5&
ziTEgJ*A>fnvJ9d>kUIq*{za?7u;ST+r-o_S@eYe6(uu+%C<6Cg`7Y&+!^<)C54ApY
z{R!+24Z+K_R_O%v8E>&j_rZI4d&-X2HBlF-+M%&2CR3RvKlFAKYJ@5+_+maexH!AX
z>G0`K#$UHDfMw-v_H`{mU;XW9+#JDg!-{7w`mDDnUh78f6h)6VK5dJkvBh00vxr}c
zI2TzWRK*WM^CW`zJ=XKq<(bB@`<c7kQZ*@FK9s8_U}d+WJpM!o$*K>b4G@_)52)>M
zBrv?q$?$~#SE7uJ-Hk(P@4LpV;sL3mM^m6+g(!wS*NvlXh^n}#pr)%1B-4}vgl*T%
zgoHTnMZ;VbK(mre5qZ>0F>_Kgkd{c1mCUD&Cp9V@GPie`Ov|Iu1q8pYq4NSiT)|da
z#ta>cd)HlvyJD9~>7(yiBll-h%fxoXRmWQWLTed*S+oueg#?lj1OgBUWb}`O#A_N+
zutc{o1Yt0BT(AfbT^><Wqt;N38t&F|)5YZVq?>KW)pl?6wVs9_$5+GGPq+E>L)J;w
z2@YQ0Ln_>8fdJavmZ^-l9j{x5?dE0Ql&)LY2oOz9+!+p3DE^H(*yfNsQC$}5_=uCV
z3>s*Dt(7hqzQwr>q;4RkBsJQ`P;}-NTIK-=#~#6k_}r?5k?r_q^Q+eJOEPG}oAK(a
zzu*9lIabA{3ar+Jb_gbe>9?1SJh3|cz!OuIRvECTX?lFnJ?LE%<-|03+Kw~*n}+Hk
z<r4~4q*jNp$S5}oRtCyP0<|eqG|t&$6&di{tQ`xxra)nFF+Et>k3noy?m1AaQ6otP
zFHC5|LI+y`?pcPFS+9DXGzbpC?&8r&zflK=LWDFB;S|JQ7!6PF;F=LMj9_2ayn6ha
zhto~BQ<jY_wN7e;OB_*O{h+^Px#QIg6aJdZDY<Y94DANIuq{7~(3cZP=AGbcbaJH-
z^iVP5|7Hhn$a?Zq5KFS?05u^`uNEh09G4(l0^^=7KIHo2XfNUS;>*&<ybk=kqaZm(
zOi07qgp7VNX@sZv3U$p_G*xh!%p&;ooFGbO+k`Qi_A(9kYDvo7MG-L<as}b9-HjUt
zFHaYTl=TBo(YO3Q(D+m~QFRAI)gNYXO>WJ9bM<+RvY_@qDdF14V;bH}bHiA$%TS*p
zr*U4mUsy#uvtL5-A=Ge-5as6rwyNpX7<Zy-`lN(+lwdH5v#Sd{uK2@#(Yjn-zPCVH
zl0(N*W%_j}`}1IkT$6P#&=JIleKK#l3cl*DKh(crYq?t*zC+knu(**bWe&)&&W6fp
z^Ytr^^HhKcKLK1(!}<Av)%q1rCyePNSyS2F1I-OjWklm|$q&ogkkuzK#;zn^#Q8Bp
zuCoUgo~s6Nk45OyhKjBDiNT}OH+iuhiYL;CHc?YksbeC?A#=2}1H-~1#Sw_A?Q*6S
zz{GowmoCtrlM$#fBX$SWJ9!6%_iZd+vUtt7OwCSI6x-yUCuxZvo?1^&<nH(Lowdb>
z)5q{3WU~I8_|aETfu5M5hz-f0v^>@M{6-4y3tcgKi$>NFyZ*OWWNbz#-gI-@Q9k!a
zfbvqtwWQ$Imh+@fVS>zMKT+DSpX=5Oo=EN)Pob`@-s4A?$ASyyHp@g2p-5VXvTU#3
z_QY<|gwRvdniJbq8Jq3iLiIU&q4(n63}_j-l^%0tkan*v?t92PN1ONKbU#$DL{RX*
zP$EhMw1`%37B?S03*r%z*rfW{rK$wmZIc33^hLFg+yr$od}B~XJFZ)i(=;h0;hya<
zSloLRj*(T~21l80m7y*-Lb?1o9Ru$f!)2%%%uURc7WW%jtqaF2UU36vl`ROzq0OGC
zmG;YQ)_240X3>CB+}6BII>(TwffQU8ch5+CHB<8a4p#_2By#u6+1dzS-sKd;*%C7p
z>lsk|qtfrZ+4V6}9-mYx3mQfWyRcBvS|z|-n(6Uj!FP8EZh3EM#U<#aS)rq%94}NM
z#?%K1Z#HOMJWcK|aQj<ZAvc|n3%nl%HawoENH6&onWuSq;n2Z2oF^2UcpE?dkw1cc
zRb|y6OH1qbN)%4vl8kaG@+$g?z(-3P?evIEkGa(WJqQci3w^s781IQ6mn@$Zy9<Ae
zImYB%=PMAq3OOUluN|0PQiV_M`nsp_V!>bBKeI`!eg|P&3L`Hx_mb`_88~t90QMv6
zqF48Z`)VNeFMV4nu|SmSE;>J6GX3PhZ19QD=I0v6<BV)PLbZxDDH9DsQ%jk6lc2N>
zAPFI<&F}>-N^Nv?L*U)PdlFfssf2feG#y7|pjttcZZ_p9Z&W7;%ZVa(Ak`TC$aMkE
zNxQ9n#2|itb2&kTwgU~|ZJy&==ZY?B|5(h2L6lHd^KL1__-JL~teW6vxxAXtH!t)q
zl{>UG>Nr;-Li|Sdqju=(tUU#~7C4+hhcoNG7kq$y*&SZqxj*7IEN9mtJC+MrmVlJ6
z?lx^1>L52vcP$TP;-pl^76?FXQPG;POE*L3uo=2RKJxcctYFlmRYlx|4dVW+x&q)%
ztw?x)sArIm{*E9Uh(NDR4lDDal-$rTs;iF!Z-XOLre?%c8lII{6-)q;<Pv7&D1eES
z%tAruY73`U2_FLa(jrO@U|V0TaUJ&;Haorwh`?z6moHE?Xk8)A3Q8-ZRz*nje^vM9
z@l-xv;CRTsgi2Cz5!u~)-Rs_qkTnX~Wy!wpdq}j%Ua};zgeYXsz9b}DRCd|7>`P>)
z-}7AQjozR4=kxx(zTZE-_w}0B%ri6R%$Yf7&df8<+;iTlS}B&?sp_LFCHrRNe?m$j
zvpZhmsx{Hb#Xx^|!e{G#J<^+@xI!Mq)E#Gj{BYOS&9ZuZDKINgv(f4ceQ}tlBl8cq
z&Lz*dt=S~PRS^O4k{gUV@0!gx^G2+BYNW`v-F*qVkS57w4P?$e0@_+yHyVb%7?hyh
zZnraWE5r_-_VySGEBi?ZH8yX=ty(`*I9|9ztCtvwQ|Csb_mN37z2wZRQu3ro{W5$~
zc?tr;k~@9V(;Bb05-qhx&mk+%TN~Ow@XznsloLzBMR822$_6VbTZV9*S2|UN&H(f*
z@28?5<~-7by2m?VMyQFo`NHKSo=#<|dchZ!Dt)y(AH`mkKfopDyL5g`_EM{I)z?$R
z>ZN3cL4G%C=qGL26h<0aPwL|kU%phpjCZa<QRX3~G>1dc%+*QXL|Ty}xcI)aQEY<h
z%wv>i&HHm=?s;!?;|5<nwsnH3hVg2bnz5=YPX1S@i**A2j*$Ia8~*6V<CULRJn{*U
z5pnu&9xTa~Hg<HNZ&F-*IX6e9T54UW`qe#E`LU`~Il;A~lDIfx)VThz^NgcnnGZ$9
zh%SJpMPLL(ls3c$5@afZoP%=~*9)huO!M<%V{J-fXJ=%D5@!8N-^T3p{T%REANPz~
z^^D8g9BgxWC90JWngGA^ym;l=gsolZ!<3$8Z$GkGJXP9=4|Eqe#33qfwQgrI$|;me
zv&1c`k#Phyz<Z*fay@3FUz>*bGA%3WfsC0k=|<Q|rV*~3(~LKmJ3dmKew35^l5tqD
zhIOqq<&h<Q0+QjxKz;ntu=ULi7e=Gz@lfrlf^S@(Jcn;&X5bE<jP;PAyGmnTN6u}V
zWRViy%7&|y^E|@W?##k%M%LweDFmPB59w_tAM>K^fhQ;1a)<raw<_mJd&DkRCOt0w
zvdIiHN(p4*3%EYo=ekjQD%;1uE_RTa^493uDBqgQ(#Xci@Ir?n3TE6CT3ZharVD|_
zy-Gpc26>p|Nu1F#(N8}Y5}2dYXijs`*hgGtekFfYIstCu>qGs7#wVklSX1Z0yVFnC
zaOqNM$9-N5wi^j=&np+&axsT7+D9;uGR(7dh6?I^j|}~2MbJRqfog}~f2d`MucF>q
zE((*b=W&mUyFz?Z&M{Cd5qF9;?x9R^&S%9}YqA+~Q+TqzJhvhf8_3Qu4V>>>kg~u%
znJJeUkeg{>v|17PZ7I8KDX6+B*1K4FE6^HBoH^dSP2lOg-r5>2^r)}WvolBE6pe=A
z*JVA|W$E~mT=qbXQAx2=u-`9-CVEGvjN<qQp_&JEo(O8%rGAN9o^%11@q#^tV#pUX
zm+mlBvkTN@4Ivkdyp?dg+$p|XDwnpjeBa*jW{MA4m=`z{es06s(!Y#20<{<s@gVE8
z0y|Y$6H^}BY&hxX>%rUlYYs6|cF(0dR)totZNBh;4&uAK3@quR2~-^LccwkdeVeLi
z;uwc?$a9AIRXuv$Rl5^$Dr5m=uheU*(;t6df;VGc2Pr#^PVkGirQ8-BTFNjQ&todN
z`YOcINwhPKpM%n;7w{rf@g=W-dNf$5zn=Q_=!*qAdhJ0B4ZGOA*Y6X(#s+wUJ4$$Q
z3qSQ#-dUGT&<F~6A8bLPq&DmyQ!6k1G_dS~ckCo2{>uZn?@YP;u`lMGmc6t;ht9d3
zh>FkOG|isg`3&<STQe+pmbXx5^+Yh(;pL+y+v~l#H@7yDMKzg=w6n9)TV};{%5PX6
ziHZ)*W-rtfbh|lBPT63^+W#`AwZ}xOxkS}{J+pOF;jFNt-QYx)g106UXFI`I0mJNx
zgubg@KaP%tuo~nF5-olYbM+&4q-_!Bd}Yv~BN`q+k&bJblV%@_H*vOh2!mb>q1?K6
zf-=56nKAO_cQ3Ud9D|dN7H5*5OWu;<lsFF$Q+-&U!BN^l{-*pvDhqnOx^3fB62z}*
zqSy4TcTZzhE-Ttw&|b%#wD??}Tarf2sdItNI1Zi$+oXm3-3zzc$(JT;%3tU$%M7aV
z;+sZh33lN~)r+Wz>nG{9w&J>Law);InK7EBcr3b%Bcm;Tyyj)b>rNsw1?Y1Z&0JmM
z-6&7XnWrZ_??|${ym|j!)q;zGTSTnq#aZKcpH#YwGS>%lc*i$NYDG(=vgznx%a&Fo
z-kbu@==A-gnYktFBkNuoxfqbkomD=zQhAZJ*WywJO%^6b_<ogzndr3YYMsX@PiAQi
zM-ywFvSl5E;=H82Dv_^!-pRs5ouUunbN*L~nN+><mO|tC?AW#hJ{Od5dhmw<_Dn96
zsI9h+r>>-hBA4sFYdF=QW=Kblt5AJ6oVws%NTZIUZLHRyf1^5Tc$+QVOyn{1xof3C
zDRS=9V>X;t)_G6mCSFfZo$N77^G!?~imu}Q9$5QuphtEFVr%mAVN=srZH-E5E9&g0
z0ZVP=x`MciHP);wDTq{VP0mli|3?TTUVXI^7vyTL99-V!%@twtlATVU8J8KPiIq*h
zq?&=-=SWv71!+E+AUXVsG@O^ukIdnMJ!;d@fRmf^9V<>bYoz0g$H$`2D@Bkg=DRpe
zK{MVDPWbXlM~Dv#4^p8trbBw%C7JVE@MYysYR?(@OkJ~K;|OG4J%zhyZe=I5(hgtr
zsEXyPdq_QSu58|AwPbVg8=lsS5Yw`bsSrGA$4Ct#^?;>x2So>RjF^qW>*O4U27}vO
z`UTzgZ5^}7W66Y1q<k89mxwM_B~-U&Q5C9_=1#AE`NBGWWf&(m{`%XoDn=>tSHeFW
ziHmVCp-~f8cYIu&k)kWd#4{z;+s0fs$}^8pEL6T(rx&yOc-1*;Czw^X{{e0do@U3l
zniW&aNiwPGgo_Jt>Au5c;Z(ZAKTo^8IpOyq=cZ8hGUFDbS1R;j?P*_JkB~mX^&l}W
z&SG}cKCaluo!OgmH?uaoYB0;aYr%o`Mkc+dN%Rv!9J!)tLVn;)9LZ{aCpJZ=`HWXz
zAh_8~booI61#=4OOsUm^*!<SoSpj|&YA2JS*SjvVp)j69=!jBc@POvr>l)6M3Wc}Z
zHwKg5RxxOoG{#81j7sho8|6}N$gJ+Ny58=#cDH<k?$p=~Qsg7Xdpq*JgnZ7?J%S-C
zE=d*S)1L}bPb?5Grlv8y$$j<e`|~5=qBW~b@l78F2#G(}+H$*g<Ykik|NQdvLgf*_
z2J4%@xx}*HCh<RCV)-A9(xE`N+xx82p)tEw=`d)1$ln>Ilb8GB63ebdy2IC4xM85B
zzCW$gfp=?uTc-nWttexS%^6`0%7Ir-tN;sfzwN_;hT+@+D{yvzIVSK1325<c&$`?0
zT@mbskb@UMKvSa!Ot$T}J^D`<K#=@Mz)0UeUjP9uwwcm>u)Xh5Jo3q};PYsIQ@PCv
zeCx#^zS$xb0*U8VKH0LD*pJFE)`Z+Y0{j~a$4DDuMTe_hRZ&-QD#V*pNkua<wYiQh
zBjanAz0^RZWJ=DrrVp5J+wrT7d0X*ITm6wZ-I?CBWVP<|+dKU@J3NfIjJnj7k%WQw
zbJ*h-3pOtshT+@qFxnbwa~Ey*Bs*Wh(Jq}YcG-a{;<;J=^w?VaY2zW7-GGD6z@<<B
z(d#^)>GrI8{VhJ@N81i@22rmEx1Ng<JfaF@?KXwds%OYh;@wrd^ht`y;Q>UQ;7u4#
zaZ*V9MW+xP>+BLAesTG0WXqwC%M3OHJorZnJoE|IxTsBBE9ZzeoRXIs#s)gNKlFH2
zztQj4I5|2vbwn**V`(zlaX!w|cHToICo_YEMyMG2rXy`kiHDr~Ne}mx;)0)g+z;%`
z3&$ukGfwOC*k^phbTx!FI=*1Ks=|>lDj}fy(!A=~R6`njXkx=ubT+G8Mhp{M@r$eX
z1JBbH#~9r`6)35V_Wv>7`&}F*9d}G5s#@Wpsszoe<6Sh;FUmOQBmhH4kHZubGT{2P
zRSlsWi7(Ph@-rAHAtBcK%p^T>tNwG(<(m~r^S*phH7j9*eS`8ywh?D1w`<~1h$v~W
zG8-pH5uEg~Aahe;HWBJhKpp2j6*(wzU*6qN|MMfN#(6I5p)1zVF!_AFk=JD9xhfuX
z?QzX06$6!Szex%l71GG5@mDg27e8pIYxNn3HohvT!s+cXOeIicsr=Tn<d|NU*2{-U
z=6EBa8Xn=#V!<?e<7mchN15C!wP7rd;SNzulCcSLbtBu7=I0!~SioLEE7-(a^ffDV
z2JMHqxgu%R2ObIUjC`1ThG$0D#=%$~edC@RZQs{bs@cujZPTRBPrKdfz3c{w_?KI7
zc!-M}_3&?+Qp`wX&>i_&x!E-^<~lM@Y40k=OFwbR1K5KJ+R-_L(>pM7TS#~KnQqUW
zqb;9e`$&<DqE>TjouF6OUG?^ZFmjNQG?CN{xK5XymZUFZkMg*S<3id6#gFlaEi|ux
zQ@2&<s}O*B(p(hWb{<1+t$&ng`CK@CR9U;r9~nCkuN>>6#@X;CStIm|?iS;vD+4hy
ziRwh<64VbRoUV=ezty>RL8)U*^=1*Gy0RWRsuG=@(t7I5IPsC|lo}h$aT^>v!?5<v
zkXxSw4e7V&&c*QSl-{{`xy*SGZr|;w%vnyaYvEaHz94X4Rrq2mL+!Ve(Zy{eU2VCi
zs1@^+w~!FZqf#G^YF;2&uK!+{geS|6qAt=b(Hp-BZ?v*7pLx$I=N3)yUB1D{#FwT$
z-}T$-@T!fvv-X87*Putv@=39+?HvV?c|0$!QdSWUXvr(Y#%=Ub{zyvPnMufkI(}5Y
z=P5B?xgLFeYv?uF;4Z=!wJ}qxL>fvm?B_B%@C5qw(F?EC%gPqlg5i9;=hV&RW11M3
z6zXKxYAKHo0QN@%@%?>>(bgjz3oGYWJy_;?9^$JlXo~x%@e(qb-Z~O_!)u_J`)Kmo
zm~M?;oYGIgiX);&y6pJCj!f%&2z)}UA%h{OAgo+6>Hd)f>&S=IeMHA!iOv`Zq?4vb
zXFM~Tw3(Z;p-;GGF>2B6x;8*r;)&57Wm-}u!jR~v2<Zfy1Ps3!Dq8F8T%yGE;Y%|o
zY*8E1vGZA2&}G*)*nWK{i`&LEcUPDB5w8W@qW(!+z<o9@wbf#dm<cIwa*ex@oFUfB
z)J@v78uzbDn@M1zJM7zPQZXECkE+XiCCfZVJGM&;HotHxriYq8Bk$Ugy<vKmYT$D`
zf54+)^@6DSXX2}KAMwtA430gSCKz+yKcJONmg%eB7yc1X@%D2`qnE$=x!qK|_Cfdr
z#P9gaB#UGYg+NQ^m&<N1GDkJcF)1R7w{pXw7jcJ3OD6`d4E_-23M<+orI!*UY?VhC
z;Kx7M$-dBpcPgL-QFqz=UWp?ua5&;~x{KOG&(U~p1OJVyksn=UsaCGCoLUWOksWQI
zt$LS{fN`bP)nX3j>rawenrp(-*d}f6R%G`Q%zONR51DTHN`H*>V)80m?%Y()`ox)~
zsf$Nc${XcR&mtv!?6vEMYUVr^MI#l9%Wtxd`Drg0wEi4@H}JN&F)e=nt-TxBxl*U(
z+a&YTO_Xm!xczHi9kB{Ca(u%~HA_1@=Sq8V=2QsHed$|j?PKD1^VMpfN|L@Gq-|{B
zL<=Yd1u!$KP!+jqIP=B_&CA6XJ={)T92>o2U}ocB;!b-mE-o|nogkfa_X#&m<=1Kk
zJ-B^2+Dy8UNoq#yxrlBzI)sAGb0vKT&lJXI*XTGLEf;EgzV}$<R;*u@7U6&T+4+T!
z8HU<mxl*L-$;`Z1$(mQL;7v}tGRe_Vzge>ds4rE*xYqE6HP^z_IorDKxNgooM|N_n
z@w-1dj~TOcopfo7hYzQuY3JYJYCUmX$7r<ijR6xcr+Q|XRkD{!;8*48nv<_C#b`Sm
z6&ZX|wRybQ{HHX-#^(Yxr@>Kjt?Y7DoIY4h!rY}v3@1jV<-FT!)mEcvB__^AuhA1p
zb?d4ISNb(d67l>3nt6uI$ulg{n^G5~GKnp^5-PUPQMex!Q<w5@+RU+g@<gTcemZ5S
zV(#?=ffHwM%{giM4mw-d+mINGnsXBLzVNdl;Ps_Gz6W=Z;@(R{Ax9zfA6uG-`ZBtQ
z-E-w{vBGGQtg9!SpP8B7y>5iDT{Ok{+D~}=l<B8;u&{NZj<9YXGuG&%`X}So)FQ*5
z>)zz)e4f&bc<9<2x7<|HxW@9;j$)HuQ-`x(%hX~~iMLOuh6d){Tc*c^gL@u0i3tr6
z#OXapR2)hga-Wj==v_wbQP$^)iLLID`Z_w=U!AAaT&G<&WskY6)Rb&HRFs?ce{+i;
z`1#X|pXy8$gRMw5wcPdk%|1G-N4)04M=qa!`_UtyI>N3`=oZ6mQNMdyp`nky$r!M>
zN$2}6wpp!00`<rPF7W90KWI+5am4<cYg{Q#c#tpOvX*0^f^K!G;2U_ulNU6Pj|g%!
z8=K;}tlTN9sXFnlAnm9#!>w;ytB!@AXup3ByhYLpD=Pl>tmE>8&1i3waNEFf7qVd<
zkJx@OTFWz*Z=P1DC57Q-l*y;QGm`Sr!B<(CFk0(r;yE?s6!rC%Mr2voH^LpIf{TPA
zF{&R0CC&~TkB!lDHI2L&wf&Y%qHtMK>9GXkmjnUD+nxlOm!$@8&=s#5Gd=6o&Qav_
zJ2{))l*vX(L);LM{OV2k%Q5A|ZnICvogcX0qq2lYzor??es-3kDYcN(`uTNk+t6V#
zd%#LvU3$I}m72}*Vq;O-30293?#BLv#+q_c#}?a4<j6p9^?m!BL_8jko4nJ_Gvb*?
zJ>EQhzc4&7A*7I+UK5~srArQjCa%-9Te&51>&>(6A%dXE`m+MK4=7p|=GY2Oq@0Xg
z`~;5+)qS`aJNELv-t=RuIF<TH6}8K<*Vq-RM+_z9Z9+)zz8@LutTAiPFO4Q#>m*%y
z=w?u{WWeS?5FB)qH6@3t`v~f2fV<bg$@vR>El>w*p=S*b(yTU22u=8U&hk@|$UFBg
zR~5>&R6BNl7VNC@a=Ra!HmUjprzn<Y>zG(UYe%SX36rwBc1^~pl3cnN%X@8Ws@p*$
zQ|v6VCFz70ayBd07co$j@R_*k4^<BIES$;mYOJiUhuHFt6pypWzfGo1pQ21W7qJrH
z!1b(AmV+Q!=Bv>(yJ64N>C4RWM_D|pHM;02?q7QD_1vR}&^0?wUBbzX4Do^S^zv4r
zP_W;-&W=w(rCOHZ6jcdOX-CT9yJZa09n5yzvm8eGah4)yXoI&&GUIL!e%Fq97IT*P
zIYoTuOzmueKx`CrI=W3ZD63I@^vL&&WK}=AQh|GqRG*&b!Mt)Qc0O0sX=_j5|D3b!
z<mn(Xm({}6hyob;I=&S}eARXFq1T%t&8(aqMkGbexU@?KoL>YiW9e%*+H?$f7Xlir
zS#CDmzF|TAIJ_h-h|x=K&bM4-RMDVGBJpb3xz+LEmUjiABn8y2rTn7A3GcT#x(eQs
z6sX#KVolv*?^08xdSPfz*iO=VIr5!<p@2ocnrwd%2fkXeFh@UW-2j&{1fKGc8#s3u
zR!d8y;r-EaC!ymLk-eLfg~_Otq9C(KZ1wQMjpAs6&M7*%&zgyuCNP4thDXME;Po#j
z!)K~D(C1@sEI-NlU}`rso8d0U_xUwH``FX(M$YADi8?|_?MLIOilSD|imhoC-FmW2
z9`;ON36Q2N0dH5|m^-(b&I)-=u8bs7)cP;qJ>E;A!lK@hX7BT*Kb0x`_K+B(HoH69
zwis;1?%|O6848_e6SGA5Ke{((s>l7MET86tUsZMtq2!(rzOK;syjk1yl_dGb1I>#m
z?VPF(mG%7vVcLs4GFpw^FTL0p<Ie>Z(3a>vdzb3cK(=L5UQ3^UerkimInL}9#8c#U
zke`dCgO5h?^)F0#xipVD9{I|D6=bSWF*8}2QZG{`qsa4q&n>Rn9-w(LbG=wgt;uH2
zviRs=SP@FF{(?DCL~cB{@N+E^O2@Y?dhhzU-6QU0r(c!DPs!?ROZB$njQS3zxMOLS
z2Swp}bvu-}-rmYmr@wLisSv|r5>I@~%=?Tdnif~(H18<|_#@oDY<u_SFLUE|ewG^C
z90?KrG4ElwEnc*>h)aiVA0v}EW|oRaC;lc=gk2%6QYJQ<yE`wcteWz*>TS)t#B!=_
zc8xmL0u23B*+pzZI-Y&^lI}6<ywnm1yht`Tlz7XcC;}dF<56cDKcZdo3PKBZW$BeI
z&NT;`K*X`rgc~{fa)mW`LZKvQj<qzs7IN{sd|6vE^ZWp0$wusWHO8DCu)Ek6%f!3j
zceKDj=&dL>50esxJvE*s_t@B+UWK@102jgfGT-^}x8YoLq}5U{-p!gpN4P1<1q5`Z
z()1mEz!q&p=e%SB?_R_?-lw|;SeLB1v9+_6G&!x@*&=_{DS_v0XYT{lR}1GSo!X?g
zhv{@QgH`5KOvClYSpD;&185a9OT}EgMC^HPEjG+Vp7_jVBAk9%lq$p1`cuAQVrpVW
z3eSg|;S&-sW*w)Uj*_O{OJw_Ota6b({`=E<iSO^6PkiRA!-KB8*AJLD!4Z19^yXvX
zuoW3Q(hB3_BG!00cZw}d-EpHUq(VZxt;uGh^>N3W&g~d(HGa4gb)ly7)LfIoMah?O
zF2b9qR-TGP^5fNwTv?qkx;6Yn#HP|w;mz_BN|y5Pz=f)#c+ef;Ai}m)22}j8;dZXU
z6nUVIv=Y?eWZ*5-;~+wqUH9;DSvs=v*kGI9k+k-*Py(M5$`eKHr@aw7YY*(w+0t`4
z)VPdOm8Xzxp&G!y!aTSNb7Z70%W>p2-<`7h;X*hL|AD?xX>B&0N%Cr|q>IigJM)w;
zgXl0%KF&^ncjM5;6(~-HZ{JB>li<6GY6bI<xQ1~1RzJktPMd;o8HF*~_xNt2rt1wa
zT&s=426}IL_rJBbT%hSc_nKynD890}xhAxIQ)1JbO{R{kk!m!Y{+mNl4AX5!W4Mox
zCeMzq)4<VZYl1N^Hau+X{cmiDJZTh3@#hN~Y3+8er!gr&vb)YveCy5q_z_cRT#ZQ~
zx+~#y7k#__h3LA@i*lOG@D=wr??rkX!oLh~zfn2L#clS1_AZ3cdzkF%dt-YZrYJs`
zV&NzoVdIUi?>pP9^P9Kgzin;{&9JU#pH~?QUU_m#!yzR6rs9UM)rWUoj~-^9NnoA{
z9Q)dTM>*yLuAUDunfms9vWG?Y47;`>JOW9{9!aWSuHdR*)#7<PqLdgNZuvdm7isB3
zdC&8)vXU{P9*Qp)&BiBjoi4+ri-N=+-}tu9j&Gk%gZ_XPra`d2!tQ2Eh4{6(dTnj*
zaQ_|Y0%30}t=oEQfztxqJHj5vCZ`ou)?shW$h%k6Jc)P`6=9+&iuC8c<JH-^T3q&i
zsd7B^exvGu?1<vvu`}o<!e07u)ucXH7lvWBc<RjD*`l4!(e1@E<@#?2j2}cdncTxS
zPdSs1Fljs8=AL|`N4t|mtx_$$<BpTttPaKN?L-!#Bb#)+vYZwf7ozQ7oVT^s9vCPM
zey`#8(WGA!m*k?1CC{+LdkJ~2x9>Q^{HG=Sl*F{IWK(n6C`~hpTL<3=m{Eur9n-_S
zJU_{v{YhnpODeXiBB=g;{k`o;8yur2pCGLYohQ}(t||J6KK4H!Z$)~_z(;>FX702~
zjhykkgIF(5Y3FAjz^;GVx$2i6BE;*eT6S`Xtqf+i+PKbUGQ6f2YavVi=($mZV4FRE
zk#h2Letz}ECyv6rJ#(dc#LUbCSMbX<AOoIVYp@f;^02TNu{q5r9ECPaZqfsC3QaUd
z#7dmU>gsTX?XJ4aHwY09D5Q`MHPGag(y(X?=aNq15e)bS<6p>><9*_?&`KS+H1;Dz
z<9_<+^yi&;Dh)mL#$=?@Pxr}pnpK!A`>wuT-KP}t^r9t-qHk_$)0Z-PY3VyS={t11
zGqnFO?2sF1Pjo6k1)X?}?&=AtC?^xnnf!;Fr#^{9xjp=O?CVv^6-D}DJm)%NRv6QX
zHh+0TbIH>m_})&{u199A-nTk(+`54Ej96<h9bFQVfE>T`uJ^#B+g0+890i=i@F68f
z)zT9Y1?#GPbxqpyy+ZsVn@@*e+N{X1VD3kZc@XD>Ok7<@uToqMy)$FdxaA!WDP8it
ztSpvq`$Wdm=sIZPY!G;RlWb`#OheCk7QD~h8T4gy)SIO8?W+&Ap!3%r|Ewc?@A%~O
zdD)n*g=aV&LmK}0Oi<{(z6wjnt&b8PMNXIe7|Dn;?<6vsOW{2_=$)oKC0Sn7#Uxe(
z&yT4jx|{a6im5Um-NS8PN0c4ej;Ooltg3^#@jAqWbw*z|bR_D7$bckVmmhj2Up>6#
z<T1-{)6#zW-Ow|_Rkl0?iq9CL2+oz}S|ST_$`{jY7&YrDO`oE1^8Cx6)||58cUfPi
zKmX}cI|jx(CuA%<YWOxg=jQP<cL|EFlrqckrOP~Lzn8EWCHQDgsN{#!!)|C!m)BQ5
zoT$=hclV(qZWP&(FQvX{;`ht5PeF?l6VwPe$w<Pet<^Lmc<eOU?-3+MNKsxl{&Mva
zZggcuS)eC5SyxAmU$pK~i_TNU<plV(dcOS+$ecLsQRAUqN=;uss3)zBtz%BJ*I&Or
zK<q<(S)6~u$xrPi3UQaBE&9xi=F1dGLvJ%#<7<$1YU)TmrBvBl1W%$YW{*A>JT-R7
zy?SLyyzAO(Z1GFc?ZPMx6VkjT%<-ilf8d5+88N<X39Ix_HV0%WLD)P$-$92I!+L?O
zjHK2)3a|`xUwrcOO$3cx7zNydJeokmO)Z&OktFhDgmFw)*fX}Kpszb}F%UspnfK}<
ziUZGar@V#yR`c#HZoPUsz(kq#XnM}owIqh;Wof(heX=JZw@H8_NcAu^Qgj5B)e;_5
zNK*Sck0Q^7(fs>qYNX~C-<w&PW+1506YPUduPbub`JRkRa2J+Ultrv&9l<-oI<)}&
zjnT%)(FyR5VhyH1=OBN7PJj4pnVfgm+lv(71V_r;!O;mk8HWH5SAoBBV$*OWaEh*O
zZscU<2+=~J(2)NWpb$6`dZ6_1Gx>i4{ZILSp#xEo^YH=RP@rfC5(>ozH1G_9!q89%
zSOx}c89xF`3-}BI!ht$qKKUNtKgD2WEC7H6`70n02nYragOH=(aKO6`3LCI#7z~0$
z@<YHh7_d|TA29aH(7)2)Gg$980`P$!0Nw+{04?mL!F(*~03~3I;KyLe2h-#rDIod#
zW3XVaOTWnn>VRo*eD=z~7&`_a03Sdawx2*ISb!z*R~kf)00tEfJcBV3a5;nJ5zvj_
zUD!`P2#f^+0sl+Dc43dqy?8%~|1C|9_(kSkMLvMX2;}Y<p!k8V00FaKCJ-3NZ%)8~
zK|}%>zXOO2#ScMX01g0!XgGifD2Jl}Ap-LGU?4&?mgQiBVE3?+h!qYH5r_bY`C$N$
ze^CZ_RQfd?fPvZL>mCVUC30+yy`jSL17sqA2BZV50YZTun!xn$azJW8$-!a(B^xXN
zkzlcb5PM7k<2^arg9hV0T0m}MIr%#S00x<{zw$q&0bfy)HiouF<~F8)fMP#)@rvm?
z8iQZ*08d;0(RmbD{+9<UU^*ZAQnvp?*<YU*|D)OhzUBQtp|+4n<U!#8b=Us!23d+k
z?FtPz?*CeE?J)~P@;d-XF?@iuVMPNFraf+Bbr`6AerX6$8DNDDcm~UUt0V9ksJE-R
z0TIFKt$m1o3*KG}SlWNd5fTk($6w;Rt9t?21;rJ_0>)rvY{!A;y}<y>z%)2Od$JD3
z<iCLcTCspYCYEN9EO7LIfJF*SAUGVD8{k9&;sc6nk4)@90Ih)W9`NB9M7BTtz2f>s
z#bID9>0sGj0I2(0#f1c>09Xly0N4Wr?1=tmCZG^@hZv;w->5D=?6~i$uKk_dRb8Nr
z{LiWjX!<vs!EWyAuDuTLC-q<JE)dCY+@Rp?@dr$ULb*Te3G1%z`o%mfBma-<u75C;
zaae(YMm_d_>IZe<o^!VUL4oo8Kcc`8z)ad>`QE+@4%?l=d()U7h5Y}&@7j|i5XoKu
z8^iz&lkY8OzeVKN^0vo)5Ez`QU^zIMKnnNQ-Bo}95Vi~8Yy(6FM2f8l=Kq?ed%Geq
zM*PwZAoAZ^N3azT2^fQFYHv)yG#K{s!3Orqz<77x^-H4n0QX1+V=!P_1uDaVF~Dwe
ze(k%kDi}KkK>zmQy}s{nWq*1P>0bQz>I-OXKhQs=|6YB8+a&<W|Mh(r*a$f|K%j8^
zC*=ihvA~rRJ4OIo!7&2YGOS#H2*3)zc@6LtE4sgSUEn~0Wq<6t_Kgww-mVK<5!~hN
zHMKw9ljXg5k5#*x3!v$D29O4YVXxwUi~sws>mP4N9oAjoJK}!bwckbY|Dd~o7sJ2y
zfFP_A`My0M)^jK~)^F%Or=~!M|CN3OtPcG{8{)Rk4(7%V`|<BLwevsp0rS7$$686+
z*9dmQdr-;m5eYb6H8(La27G}U8UruP5GXH?4d6%=g5kBXwXxQBumm>D4#rN-4mJ=N
z-{0iH(Y%+8fG!z3nmdx~>~Hf==KNEewoXRICJ;2xIySZIjudS2R|W)*`JIIAZxndx
zgYVWp&^+jb^k9##>6-#hY_EZCPn{s3vt5AuO2&==N5G!%nn2<e2e$h_xg+H8G6}p@
z{X2xf+ZDEn-xz`EeNcLV?a{wPxqD6TFCu~U>=4R7SMz`FHVpLr3k<|xRPN4;znlZZ
z{`5=y&nSU&hl41A1@R!2@ITLb{tL=qFKoZ5gzt{TUsS^Xl(zqZ@|Ohsg>rW!{z3`7
zhx|MC@Eztj-(ije3jAN9Jj`*v!yM=Pw;bm?%yGWM9RGWUJCgHWF*gEK1h!MaE*NAg
zFhO@CEQ26eSy6&u`3po?#1QN_DgjFdwkDQdC170uR3R`AVZdctIb$PpeXNUT5GN9Y
zgrE`d1FGat2i4;GfKz8%Q*b_;0<(9QnSb#PSRwx!XmQX9GvN4I0&v9)ILj6QPKjW^
zj}JJ8gYzMQi?D!$ZzE?zV+RP^B|`^W1AQlmgt?=WIp9v&0m8=vg+oki9U#|iU4chA
zeM55_CtF7|0PK>plNnIJ2Ka-vGm}ODIoOuKtV?!wR>tbK4wjAr5a49e*g@UF9Pk4T
zK|`bf%jRev6b}rju3`>2kA|>`>swhF0IsAV`bPS8PFPae_bJkw4#p<r;I4-pSiXP#
zApA%q9};2$+08?sVF*A{z#qisS00dt0bDtl2SbCC@jxDe4+Fei9m+$(Pyq7|*5e0X
zP!Ht+yQsr$0FdD9JP3=%pn%D7C=dQeJtz#^{2Z(YMZiD@(uZLAfMeBzc~Ar#*b5!X
z<A)>v1{QNT56aKS{|79Z9~jMp_z-9WaLRTt4~j;?4)+%ZMS{W){(kcVfkHtK*F&Jt
z(8IJK&`9KASQwNaIN3dj4+gAzf5P&E2UG{zg#m9phsO%WhXi%gfqDou3fLMS%!Bdq
zBmaO!!oazI2p0XP93bJKW;sv~#t+W!gLw!vxW_%12kdCUeb+%)6hPr0dHlfaJX{Zj
zIm}BK@Y-~^9vlM&m*@j+z%fX0K|GMhhXOA3AI?L={}?L-3iAgoz*+Pk_z)Nv>~KGT
zJm5v?ce_pw`hX{O2XY}H;2hE1-58wvyh^sVPQc+ds6+vm_BJNAz{%^c2MLIl5DEn|
zfWlB1q=^yK$Pj};Bl%HKJ~T?-2nyvhFoX;L_ZnE0>j-?Fbi%3}1cna<BWGceRFES7
F{{U7nKEVJ0

diff --git a/libs/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/libs/portaudio/src/hostapi/asio/Pa_ASIO.pdf
deleted file mode 100644
index ac5ecadbc9c861e9fae4b77f5493951504f36f4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50778
zcmce-Wo)F&nr>-krZO{@InB(>%$%k&Gcz+YGrP=O#xgTAGc%X%yZ7m{XL@vd)IHMG
zNGWAxM801re`Lhcvmz)IMaAiv832eBd;8P#h;YorOvHA^KM;9&5gAoI>`jRoH5H71
zn3^~vGOD;3JO8Uk%Erjt6p>Nh$mXwMDH~=)Mh#1#vjs7Ll?9Pe($v!2!kHMr!Gy>t
zZ0YQzXzD0pXJc<?YijFE%!$Y-VrOmVsA6wqVoD77Yc6F(Mp;u^^S`QD*_r+-7q_%_
zHgzOs6t^~VHWf8Bu>+bS^7A7)IXjvf*&xD6MqH%9cXrSr^oE5OYiVh_HeP=*ZzI+e
zg&#pO9{<_qQ;6_i_XVtiyck@-jhk9>lzw|c{bi!mTAJuuCosI3a6GN}4E74Y@PX>f
z^}zJ($NXTw>__v!+3H93V3FpB*M#ZkhuKJB?uXjQrs0R!C???t+o;Cj2ia&!#pYsF
zEm`BGs@68tSnA{U9T!K3-~ppM+2#9+8neQl6rzXP%>0Ye+#97H;=QOolZY3+!9(<j
zmDWjxuHn!TZsG$F37h|D&&<*+$tSGSL&V*2|CpX|CZxz(B(nfQ_ifupW#WO=rtccn
z7;w!}P|MT2eNo|In2;&w=xi_EjS1_*HFz1xHdK<K6F)%CE#huO)0;w|O0*8&mxMkg
z2?<BK9o$yu)oE-qug!cHTM^H<2XJzg<IR-wL&oaf7i5ZjKW@~k&&|d%vlTj$^_c^J
zk09Ag<qHn&^49$VTV<iCAfo^7=GsL>PCvrvS~7kb0Zg<DmnX4<eI+mP#vDnz9#K15
zB!#{R`Lb>3GbK-eybB#%?2VNtz|bi4QZi#{2x}h>gW;eOFfr$p7V1=mx%lnS&M}BU
z2;Z{%M-)#NdT`ODC2U6IP9(>uml10*;^eL0CwfWQkd`QXTWV}FDcN#>okrg^1IG(G
zv(H%)R+4jN?G~f8&I)x9N%8BEMMO~ct6(*7wX%TgS6w1&o7sSL(q-NeYbYY6Ky?VX
zA6|R(`+gs5DPGfOx?ig|D82yx6}M$IoSVuc_Xgre8#jSt(cBt91_>dGVB%4W8u@~F
zQfI(kLAGQYV}gEU4S){Vhr@{iIg;OrB3w%%ZY`%{nHL}tKywoY((}nSPT0Ubno<Hu
zIFd+%u+|K8@s0DdUeOwoCR)dsgd9H$WuvS^5S}9v5D7JbpPBYm;}>njOpFnn#kdM9
z_eHBEdnGz1pS2dBa1-{4Y!BMXw%LW3t1OZ>1HNf_t}d;znRr^`N+qIvYXPw^w8Dg^
z!pCK4oN{W>8fW#W^3Hya0hd*g2#;va;ZuZhDHqd3t3x?eJw$wY=>jr~3Fj<t)mqPX
z>1sc%grWG>betdkxLjLe_2*WBJnZK$>ObBdegTna$ov??t30Z=W`}LtAC&k$QV^1a
z64<hviosY38cCkD%{pCO4j@Ur#EWjUj^;i934COYPZZN{-QTp$HkZ0uzG<0FE?nS^
zf`wX*IN?my(AP)MMOuet;2eyDPrA)VsVgG7Z~RfDbu$Ip?kP<elyS(Fo0U_<SA{q|
zA44hVe5d(ZsqVgyCHFySdXW7!5(p6-MgQ#SayrG#<mXcOGmE}?cwr=C&qFkxvi8`a
zBZ;lipmoCtdZ@HBB7?<1uTUm2@EFwIlJz~{^NHXoVMxzY`^b8LOF3^9^!o@@qui@Y
zu-Du1{SrTo(^K*t(oSPp=mv1<3N*jP+?iHaT#9hT=pno<bfdRAE!2d-BC_N(-7>}0
zovV+*ffeZFImg~|OUSDBW1o#fa!jcfA6=yb9!yrvchTMos#(ZdDuR!hDNTk&M*O0@
zp3>!H`WKtV@<{bJO0j`VSe?k~2&51BTrBz(6;rwI3myZNSyn)X<<-~2Yci1%-iE6K
z?TqoeYZ4tdhmQ$A!qu~g`o3VB5VAqVKrId<on6U_JjPE%;C=x!26H$qd$7o5l_Hpi
zP>^s}S^jU*U~g8}D6N8yd9_**6pbpbZNxm-Gy)NSS><(F{a6Wf{GmW^xJir&w|k|&
zMT!B`#I#aJg2XhPQj;QKvn@QX9XCp@>4a-3=Kz4?1lRKoq=W0QdL$WPkJ#C-YNYld
zT`_r-?-Ee<IK#Ff_?JXdy5d7$FBvd96Fvgb4tdt!ahFN+_Ot~!z8^?90*Lc67+2Iq
zwp5VKp=nACqVaPvW6tBzDyORBJ;vs^??Q40ZxzM58+lLwu#DnBb@ev5S)|y-B9mBz
zvV(H6;Rw$wZSk!JJ~r9_#24~vcr675abRD1>_sE=F-LPM%@HYdf|w&hUBvpbJOvF~
zgOR1yE?lvGaC&@#l0>Qmu3xuGg6IKh$ZHo&wl@&jG-Ny~fU}3uli+G7`$_Lg1+Nv@
z5#$fPJ^PXohD3F%cLh;7NRVJ46q7xErcT_vhWo>-g+j!P_C6}Y9qj=3R(S$yAQWsO
zvLtgiBwZ)L27qU5iDO1~i$7A$IW&Q6!(_=X6w3~5Y5=)Q6N9pvkTaP6Gl5IEdB(5l
zP{EaYBwpLKzc*faOb73pNk9E-g3Z_r;c?b%jc$5EcPlFjlbwrcj%t2ihJ<C)US$b;
zKUu5bv*9>#t;%*HY2epczMc31QTOz0#cK@mebp(A&o+LcS2%We8T<YRft5#~nn>r*
zqXK1}1G}O3_9r=w*O=#79${I^9-Qk7-7v!%KMip5!#|jT<Dg)<Ln}MpQJXy7F`#?N
z&>&#%Z7SGr%v+n{X-R?-5J}+t&rVdW5CMB&UHbW&oN=eqjOQb{0G^IOP;-E1prJA)
zGA9KfvNm2U(P2k|=CJ)o*|Uu8z?B0hfbM>mI_a0=-ATZ=f}cp7umb`f!nkP!#a(GG
zz!xxiH_<IGlrdU%!z>#zZ>2jl0BAR~ZYteb41fQ_y=_fV6jDud3==ye30H>Mjz{Ia
zFW1J6Fe`%-8)onXMQnsg)9NnyR8fo@i5||z>Z!w|23IvMexp}i9D-NdS>PS!om%%{
z6#@#RC4?PN_wa||{-#Zwi4mRtus_&4ssKA@BL6Nfls*J+kwT%h+2_DS+(|->_hvy-
zD_Or6)dMD&tCwLg)`;7bm=-u`m_n?{DrEl!MRF$bYCw`v8+4sXL33{lsV5LR!rx0+
z9?q2k%qvd{$0H^nhVfj`q%*kQJe_O+(d(Jn`o?iM1~Eiqf?h&5?gIL$_{Tu|eyePE
zw?)XuJ{}GQtrd!};b#Qohv*hD>|hFmM!?UJL9Tv!94(CYt6*CDA_tnN$QS8uZaCrJ
zT!@b_MWsSZsqr2;ny`0W6KgK0I8okxyhHUcu%~XR$pHp0Zc5+{*r7Se6#&3gI)PEj
zx9j|{ca|4T!(D|}!o+iP+;~ReHBOZ6!=n!&b39*}mZqfrX#r)Z(v8$P5Hn7;3;3rt
zs!wS!ohY{Nx$IK1JnWyz*WWRDSbM>R6Wfv`y!|Gu;MF2|1x9|bOgrfu`Gp!BlTn@+
z){MNo3sG+0t7aeT2;ZT%UDQX?p|Ktwn!Jb);Z-=|X@Dz#2#B<aAw)eo;xN$`QQ`u|
zAh$*iI;96+{S_qBTQ(7S_#=lKvQWat@wf`<E-z^i=lz4e*7uQWdF+XxX9S8$L`ATS
z)3Ue!DjIi9kFXRB4kw?z-^3JcnIs|uv<DoJ62hv2y^G`EgY(Gs+cc;l*OE6_jR>J#
zBwoIrs)1)!qKQT}^5DxKZ{Ehp9;Sl}{VvqQ%pmPAv3soxkmyHJ-Kqx5$N<YalRs5Y
zIGraiW^u{}mm!S7?bOm~8uR5aYi0*#WaK=vIz2A>Wvs@j+6{LyaX5bSssRSIA5SHl
z9;ioc`a>B`6D*su&~H6~opQeNSzWbV1#fJp#DW%R<siP|-LD`wtuoD1PNh)w5F@+o
zk0(I_bRgO(<YJr(A5Xo53<BHeS>m1x!~*v85Hi$i1;EvlTccH3Ub89ee9k92=`HO5
zl~lJ}QGed}3q5Np?3m!x#yqCks@)G$_@mAy*?U}MX&;>e)ZX<PJ~qOZaT`qUOP%fb
zcpj21BM{-z^nsfP5KBEi?f2+bPh}bvWnm!+RP|dOm41oX4{9}AAHV8qD{5?0WzeT%
zsx=_sC0D!0m0AW<ctC{N=KkOws3>>b6q2bUUR72RanLY0FevEW%9f)Y3OtQl3#nm4
z4MZrSh(SSODtUhm^PU14n%gkpr$$5QHSdm#3gp}>2l?C!YgD~TNvM8<`9@`+zcdU0
zbzY%{5zW5+1|NnEr5Zxhjc`q(3hpoh7V7E6n=yX~#R;S^we%bW<KKX0Sjgz&;)@_&
zLal1*u|$KgW78af7mRtJUuO7Ph-&sRI!ce^ViT{Eb8xD6WbRK$Sm&<*-C;#0OfptZ
zg(;dOE*08}qQi)%mqt|ocod^`Dv$Kol^?fNT)?a<+Q2Q0=dPJ%*ukTe8(~X51lt~@
zXc!ABTy|k_c)QZ#+AEHf83CKY+Ngi(j4sMpFJ9e3uSLjVjjooIf!)m4Y)f5iwp0{-
za|_;BW5xAjORyY^4c5NfJPysawyf!xd$`Nkn*VWVLjA-t8>-3fB70{WpOq!P{}T(K
z>Tyw_r8L4!RdOK@0l>E}VXu&E2}_Mt+D3Go+*p{_+_3P$dY8p^8T`=v>@n<xW3C3_
zBF3_D(jcs<^ct+2<kbcy3Du?{FTT1SJb7|`zh@2i!u!2U_S_nVnm{GPy9LG$36z7)
zUoEY!h}pTfoJX~)MAi9Wwi=fq-qCHsSGiQX6RsswEugcaXcfsRymT5Hw!xcOShcW3
zmc_7zd49re)Xg!vx0b1?F@WlLE(|$G0F<iwc@EP4n7J5Os54z{Vd+dD>-0`elHsD%
zMU+t*+`9jA%IO(KHNSMLZ@szLN8!j388CVGxFh>W$2oG*{h;V`W9&ZAxf7O<^%}CN
z6H1l4jE(Wh>&O_|$@03OiU-Z}p6+t}7Jx!nOo-3E*JnDy>hbZrXh86pms{lOIoFGj
z$NGcE#Inbt1&B%{(OmOU%%#JgW7$dWs_OVD@mW_;%F%s7B<^Z&;S%C~&PnWAbalY@
z%tk<OkcWO*r6bONh&?2WC2k$IjxH$qAtG@e75}Ym%OEhCAfcYqpus{%7`slc`-hbe
zs$+KEa}*>9+0WrfTTvYtKI)dNmeeF^2tOWIg2tUdiHM63Vs74gH=Aa=@7<apbz>Bc
zO_SlBdl8e|KaieG@!>rJBHUJ`faTvAd)X8&vTO<b)mEVqB)m4?P2FQ*bEsTg;nKYP
z0hKQ2AcSxY=8VH^YvkLQR}%R|=KWq7>slUP@i%(qVf9MSkp!gYDS2f$_zMEV-kyhD
z&kcF7$G#UX>}^>GJoA5?S=|WRNI06y&%@HaP;PoG6(%heLL%Rcp1j5@o111ImSsL!
zzbxZDTDvZmN8nP)tNl+JN(f50>wP>`TQ6`kOJ5JY@wA~zG%jQT`152rARu7;1qI*8
z;XG<=wb;S$@QBh+O$&stQ0_muS4%?<?q|)h?|)BC-v}LWq+!gj{iN)8H5(jE0eE<%
zdQ*Lh$0~}6Y4>Z6WQsl5lu;Jg9+LhX>!Q0aI*?I_h7<^vWdq<rYdJO4)md5SJ_zh<
z-{Xc_ZRu7pVJ$j%=l8#;M(RAtjcQXYan4??F-%n}e=Eq?N$q-4l^sL6_@<?&<y3__
z3(Lc7U0d{2IOEeqpk+QX>9Syq;ufES#t~&urJwZ~lNf6qEoJL@zTZySopDHQyT0Wd
zArQ)oV|YH|d1O0#x=;;W_?qsZ{F{t)JDq9}p6?(qVU`(dMOas8$lF&<aKd=&)~N4{
zKgT6*i<`y0E9K4vjMpy59xNdURuD6imU~LgTNMQL6NT6lMcsuc*89cP=w_wXs?3-V
zIDPMHzb$wK1j8x9)q2FyCq3GoI#6O#Ak6SxYO^Fh_8>{PXYD4b`Xo6X_2I+g8`Jg$
zhEmC8t*9*tGSEyzIz}AhHJll^2hK0&;qb{@)nhG*AgRbU9JS)7w4seyOA&-rzhRPi
z{r){cXzq`&8jEg^%?SgPREfYpK1I}eO7no4&_N<msJKWheNFw~g_OL*#5ffrwo@b>
zz_c4_=;@yc+hYpn{jkG%nQ|h<w#^j`RU{cG5y$d*y!=Y<G5sJYTY@z|yxl&>H0(h@
zFMQ-%bB4Ergpb2AKVlA#b;%>-3=W(0AAns8hdc(_R3|M2PdbLP5VsH<Y>VVV)^9R>
z5#Gs$(?fCN8G98>!K^A*JCU}aUv`Dt{N~}<YbDEFgS{p3qCMgQ8_+>#Q!#eO@l2KS
zY5Z20$HCM}1$%@%ap?f}2g%SDxxgFsCo4WV?x)*O=!(Sr<~#R5YJ2Qa&xh1IRWC?>
zjjJo7sV(r|DbQc7zauKv{}fgIJ40e-W&SIT`foF&V09anbxxE|$XDcdRNF+uQ9CIC
zf~JuD&{X}TjI6AEe(IL&^5&9-#DJUgPTEzH02*kP-@oV1R*yYgHNK6{u2O(QjsIXZ
z!YBPxGEE*yoYmKWBUVS4qeqWjeMy}ujyi6nHG@8W`!R5`omBPnIFG*{Vk^sRooltf
zY^oBhTbfo($9hM+y43z{`)*o^H|7=^IsFbJl}H>NZloPqvR*#5VZ}l%9G4%DirMTp
zWwc!3h4U-o?WCtSi=-x8Gz)UPpecBH^t+&e?0K?2xKFNI3BdmI5H~vXe(=!-2J5kp
zG~5G>E`}yuBKh6oli8Smqkq#O)rLb@rY+%WR3f|-wxs_lqnKsQ?QV5r+$@CGe&b5R
zOy$$K#K3(qQoLI(+cJdZl7Tqa?43Hdjl?qdL3(0%#uaT0saBMhK-U{|$czT)MCj1=
zC(?ZLkJCHO*0?f1X{&znD!e@%tmQ)b@wHVTXN@+Pz3Zq~5%DcLf6lerfqs9|eTqvB
zwXP<9*dQu>4D<xoIkWja;k{!KU2^FOZUsT|99E6C6g*f<IYBzyhIsc3s->{asaK*?
z{8JKjvg?qo;0fBNdIu}AE8H^D!F~&t^!iT!NxaxlqJMZjCy1jLG8SGDT=1NhR;<yY
z8s-n+ViJT>WDUCfZiUfn9MW=ojD6jeC~Z>`8g7YNkddg?ckRfyW_#stJjqgPwXREK
zkNK%R9;}vFZ5lCfx0es;Z$Y?n`w%a@@M0Z|B)YD>GAmt-H|EpxN9ltipcGxp6eRrN
zP(-^|<ni71H5iBqzBRLz_UpUbohpjS0mnVbDRT`Eur@l4Y$G_;u5BvcV+QM<go!cd
zv=uND!<nTFwA3mUi$6ipmDbMDO1j)4Zxoq0e+WZi2W_4j&*RqQ@@klrPY(3fOOO)X
zu2!T}rmQDOoNUBcj6?I{m(U%uDpLH|`0>8nQB9*3><U9I?<MHa51tQ2p_&B7VWEXy
z7wPX&0KNpK&|nf*ta?BwJr`-FBh%Y2PIx76jI{mb4rUHg^1G~a{`Pz@#S(AVf@^$8
zqWs0%0?Y$f@fH|OfT#|)Yy!tDFpgIKgUnlG1GhSXWNXthkN?!2QI%fZU6Z<Geb52t
zRmAUffHN-iX;c^w!S-M{<-LW#+`~>{Xuq49>$>WW3&AKvyGDEVN_dpy{+YT2va{84
z$H1de8MoBw<%I9#`CCoBYoJ~qD&|%n|3Z*ukB;$9yb1eyTo<9-^w>-LarCbE>6HUQ
zRMk1NZi})$9sf%a<H4mdT=yiKvPI{x?62l81(|BBRt}DItR-ccI~dFrl5}g3q{BaT
z4At62w?ijfF(QI0Na|ZA;cvb2Vgi<Q-sjatZ`Kq(WoHEi+VjmJze7}UC5laQmD50v
zL8uXK9uC`nv*KoMV<_?~2UJsd)Jt^Czw{eRT75sJb)eV`O2+LR`Bgoc3PSp6z7eGO
zHIJA?j)SYc#REg+EyC0HWx)Q#v6&8hUl(IXSfd-w-E{Z<C8+F8K_F?3DF3`X4<x&y
zpf}hJM)?hRJl9r}e5)-#WV-ckYEYxzP52yDyphU9wh1pzw*Tg|6@ICn`hqc!dZh+*
z0KrLH3XkSK#^8tRvghro;?{e)eab(}45U31VJ(~mG5SNOHo~-2<gp!su$4SB7-RXa
z8X8W$t3+kw9JS{TeQF0Yt<m1}>=r%nb|mM!^%_r<Rz&2?Ar%zMJ7i^?ESOuY$Xe8R
z9@+=Z@@C~+|EKxPgBwqkh>|qRbU+RglVya>F+dddtVl#z=vD}}g9+v91bFEM;(H6n
z`kLEag)m8I{Gc~2yJnIFZQ+!C=QLve=dhUS%Xm%z5*wuU(fa&<U(4D4(^{_RXlJ5g
z>P)P|_?Md?W>htGcm7*5{N)@({{1ec_tzqC_m@xj+fs-#6SMz^NDv1QbNsu-Ld^N^
z78^0wzgmAugnv}Vzsmmd7Q}zc4&}e~0;8C_vxJKCU&`TMV-hNVjWPXSga1ic{5_$_
zU!(t_F8-?g>-F#L=<lw-w<R4$DO;eayD5;EQPkAc(!^9*LYSE4uLu6CM(>}m|LfyF
zrsba<OGrgTN{W;1-`?XNGr|mD{m%}>iBsb{2?+_cqytdX#F@-mMn_x2n2D5|PDp`L
zR)SZIg_1<WQcR9ZN0&>)++NU>#Y9^S$l%N+!$x97ZOBUPf=F&fYc9%UNUbGIrYxc_
zr_XImW+W(JLn~sTu1w1##mCOBD{kQI!b)#TE)AsR)s}OXBh!&n^ZnOv{eN!4%>UIc
z%*Da+KiP#f)*aV5(LTVwzzGj)P=nxM13m6J(;n5$_6bgnDk*hTnji)@N+dDG25)^o
zT=#{+>Z~a$NC)%n$~qM|eDw@|z5j+GJKtPPR0{OF&CrOHlv;YHmG1tlzsvaG{Wj7p
z`6#=Z<0W-IvO2F8YujBvUO}XXYWe)jpWU`OBHCe4X!8v`*DN390L$Rbv#Rxp{GLi|
zYV4H!a6-#aEf(ujH@==~`Ah%HWN8Y}7p2AJ?mu?jVP<{S@@imAGJPkF5de8eXJ3&W
zvacDJ*`+XXQ=K??fone0JUDrFMY|RmO{bM`3$~+m7wsi8F)UmKZ!yb@%!_d+ELeCj
zh%-{YGZZaE$Jz_1{mvzGu+;mJkNkKe%!4>vSfarY1#dw^0p6!8XR(QdOYX~e>FUYZ
z?JwszNV*a{tuV-#uRiL{0N%F^7pYWWcC5KuC0ou>8C@^vXS?v_d)86<p1V-D$BW#g
zp@MiXgGm|LE80gjp>D!gOi>D;D4->+_9mVYTf%@#x}5m~QVk0t#O|`rzmWBn81`1)
ziqn2R@=~4^fWVG%zRp;DCF!%q{y}%M&_wT1hx>r#8yiP0ooQR;m*{KmYyCbiQe|T(
zNraOnE%7$D%btK-3N~W0c{S1sN%0}L(rR`0uwqTPdyeV^a)cz(Gb?eE!pn<?{<u5C
zp5<x%#vmeT0RfuVi-i@y7Jl)*FPZsKKs3~WH+r>TqlhodyF|8{x8v702OHx*E4NP6
z%#4|D-aBB|*=_SqC3^NNLKz5{61s9CX275;I+Tr6O*IlrXo9Cjohv+SON)_%$6RPu
zRYET27Q>16XHx5^OTn=`#DPC8e>l`lO&!`o*D3fQp_$>O#f<4Q%C*4>eK+HfLFLrw
zB7i|R>WNtH9ToZR1c5s9qf#A<x3?>vMKHpc!ZKcR*8~GyLOYzFbr@VV)trC*9aK97
z#7l|BqXjdhLs42OQg>?`rUnBvt?$GOkr_6KuSSulMXKK;1g>KI=#^I!6JEOMCR*(P
zRh`JMUs5bMRW{JJ*BO?5FTuiHUYi-T+{e<jSAH6AhscnOxX$b38BfF*)V#ROoH@kt
z8fBV5XPcP9b=`9%S0lX3LAKn;EdA257kTmpu_c+za(1|WmF%7B;X0f=FaLHt1uoIg
z;ESz{O*$Z$)ICELp_rP=f@E-#+}7JRE3AMp*F+;#9;c0r(kEAoYm&^bo6xxx*X38-
z1`P|tfLyHST7G2M)dC*SjfaPB+Er&RNLm^E3cNB#&na@+R-Mjq0%0;`RtRl-tby}b
z`xJM{-Br|q17Z`UUn$QssIsv1krTEO&FyW#!_M#+7X26+<{PhLnSk!oQ2E^z9U^D>
zWEaKF#$I|OQpqQbKzenyjak;un$X*AJ9}xvDeK4^hqdT365FQ|70iB<kBn^1bE9o%
zTfE3$)Q;0<Q7oZ)n^UQA^{3xyl?XLWY^n2(3$ryvAovi)CwjL<oTgX0g)t`Pd9y4&
zIW_=hE*#Hppvb&S0<4b8^D&+$XQ}vWo*Rz?gkV8Gw)gY{WpL4?n^Jn$=FWaWF`q=m
zp5V3=v7BS(Jps+As+RLmSNwA)-{uy*dSJb{OSRllZ|*4>{~UDu{6bRtc!d5lDj5v}
zq$c3Hp_J+Iu*HkUC(RK$X&RaZwavhv(v%a@77y{GM7IT_hM6D!@x9^uTw!j1lmzz1
zQy^`C9zy<^BG*tdN_k?XY#I^^aN~PMLR@(F=c%$g|8g;xxD=035m*+*c=rV71wANy
zyUq#%r_=^51$-i#Ui3r^GI9C^Ub|^7nbKIfWN{vBH_)bJahh{L5}6Ap(7HW^KN27_
zV91$c3gY<cicO)afk_8aa(tD@-I7Jnn+3HHI8@cAB;p2g#3cUu{8YS417=`TVh<S%
zZi!^#dcKpfCwZk~+aL0H+y7`dnH7puGX^pNwf4;FZ0^IsMldUE_EFnV38GMVKF6E9
z;GK}c5nVszwWLnOA#%U-g#3FbA<YB&4LgrDTKV2&Y99d)NoRlYk7Y+n>V5B^H|S=1
zE0`u`j^4E#i3cv-_tU%QTWc>}#tcKc{ix2i#h+;ubT?72)$fL)obgtvjQj?Srl5s2
z9+88iA4~bkETe$-w)UesNJjN12k5v#jd%H4t`+)^2rob5!kIv=89DsYBx~>rS$n)z
z4;F|0o!&MFF30A?T9XtL^>PNWV`1}l8S3$m2M4}DxDiGaj-tpw9u?5f^Wv~$<Tr`N
zS+~vFxOq})auGR%2@BKnu8_+=P^BZ#PF69x+MYNtxN!YxxZlQx9oO?ZX0@9Ve`4=H
zC3XsO%=+-kqBpB?<-Jx9uMc;eJ6n}LyxAT3ce?Hbtas=vYGU_v!Uu8nTTD%#Fd1S;
z2Gtm-<A-@ul&q`bRF%3XE<U6z$okmL8JYf3|2-z#E64F`Q;tixZ5kvs-JOgF*4n(l
z#a$01nYmS`9sDV`T^io07A$v^H}5F}AiUdR%kjl~dAqr-0nTcyRJqsZ3BMD=jpBuw
zI<x;xnFcVih3VsNu;bin=?o+2zbPH(AolBB^<{C!)kVx*EdlK(*?ZkPSMFz9_gfDL
zI0!Yt<?jE^Zp{B3y#2Sd_79^migOS%{{wSe#LWLebN?Nm{oe@2{5R_T!&Lu{1OUwc
zBN(av8%9P@Kfpc*c;{%~b7>jgTdXY6DVopae)A5}U_u~?k+;=>C^p<bp60?cflEgw
zO1Dc>mSp61XY-f6mu()+PvaN?-BxrDBX)xO1>U7#rIf{7FGCZDC(E|CneRAlE&AOP
zlJuHaKh?Lk<qnxP<$@U2kvskTYx>uWd1)LogK9R}bPJ@Z-42mII9II<rshw1ciG$%
z`l7Pi=anO(=38@ky50#0QF%K#9q0L$a$0=b(jnyBb7`-k(VLi-eY-k8jIVZ1X=%`M
zv9fg|iX~Ncr|wqanYQz`&?yv5%HHPjgvK6MUBVyw*LX+|gdtF$$~eG^8*V^-ZQqo7
z$b>12#&mVP25F>UFBV+*a(9*#jt7L0_u(^)togm}YxLE^sVb5;Jd&7^1K)E9*E(pa
z<hCC2=12Ux9$nd;vI>P-KaxJZ386OSmPI~_p}pcdw~Q8Ck^V471=>%jL@_EGdH?nl
z=E~#HNeB;4V5Hhy+$4Jq;61bKSMd5!)yQ1fEFfBQtbCv9?%jYVRl@F$%faejrDt-O
z&g!x0aXv_EsO+pDii4P!cp92dNDiV5>zF08e1l7D3Nx3K8cM1?Yaj{hUOf*`HJ$Ix
z>lUV&u)#Zq*%ouR<Nl$XD=(*q!#En&bNy*yby6^?`NPLVmTUV09d?!AvE1aivVp7v
z|Ge~7o{+U7*7O;MF~-HKf7_cX-cwf5c~qR`vH0TYfa#&eVH}_Na|NrA&P~eL(ukn_
z2`XE}&8KSAqcY30vTtv9Lk&A+QtMT9N$z#Vg6R3r$mU}n%xfPnMI!5Wgl5&}6d5tn
z_!;t&?^*SddW>v7?Z_mDa12S&N7h`E#mFJY>==O@B%nrSGqYH|+}>1iH^0apAs$u8
zPRG>o+yXY>DeqPfX<4V>&2>pmarO@eFd5-e?7zWo<%lG}()#zFSPQPnLolr?`i2}2
zQRlMKKsawZ4zh>7N+L?P0B7bs{5MQ8XN~5FVEh5)K~+5@kWk_K0BQb4?jYH?BW4sq
zd~(w{kuXWOL%k3ca?<IvG0CIFGeQ-wuj59-ZiB4Pu8^nbez4F{iX@pFIOKNHM;Gom
zC@%UvOn~TE<y?`_&(jjFHkjRCV%d)mks{Gxa~RGzCF-H;4cvj>$(dIW^gxzh2698@
z0w-C2j~;jPEW{n}5_l(hz-J_~*W$Tz_HWg*3JIZ;0UkfeD$L$zW@pA0>#rrO%~W=s
z-a%UPhuFSvmwh4#$bGqW;0R<c4LO;7Fa`z76l(PY9N(<fOlY2iFmX;CH!XDBS+zry
ziVoXre9&Wn+is=j`^9&nQrIM^rNC|)rQKX}BO%Y$4j6LOk`$5mf(WkWA^-L$pB7St
zg7PAN`iKjE`HDfrv-NM0CRUBH<!3@2g6^HaM!UtfEE>R4Zr4~k`az9vH8;q4W$tvL
zelna{b^N|bXTxaMCWjj_zPxyP)dcrebQ<Cu)gT@A6b~d#d);kmWa+aes`&g${OvuI
zsCMRpG>nEJg$}_|`n|tJM)QRU`koiQ4{ajXvx8;n6RcGOq(BM@fv8|ZhOb%K4#(p%
z7qasbYhNG!@}a>B0Y(99RZQ-WrUv`s&tohBXp^<Q!k#OiCbYz#ryK5;yv{x^4z{-I
zp^EQe4R2*BYeR9^Mq%BFTJ8p7%4qkG<`!L}3h54`IC6lWl}|qi^Jk|r%Lx+)XKAwX
zzwL|(F*Yc|rG1z1#a`z%a_2l)RP``R^)@pTnsB`vRk-;%-%uw5R<5hND_SC5>xHQ!
z#T81NR+VJ;((Vv)@W-VgsA6jTw42ah%22lvR@h?b0MtW+E?Mf>ttlL`QQ^DT316PU
z)7G>Ccv_4_?~hXtgMBxke(<E_iP8^rszMrIhQx$0%cu5d18cb63l_!&sh=-nrzFvM
zyQZu?5k%SRS7JB5g(Z7x$f=HzD5Wy<=iGp7clxi-hrFcL8J1Ymkb_-k(5hm*&hm6-
zI@sDU!xI~jP8a0iCN)S$_2AQS(nxLg>E^ZYY^Y^?wika5mPE;4tPp5-{3Y}ky|)Nn
zQ8ep=FN2LT*Y*0#Y$rD_06t7u^W8`k5CNBxAZZs```%bQTeywqigV?GK921(8Vhh(
zY=q%~1%c!SQ-0Ookr*?#?O7x1F3H^@<ZiUV1-=`?bcH$I!WYc}xds&A3ki;aYBMpA
z)QD|NfvJm3F32?m%l7Q|mtaAUge2blmrBWu?`CZDxXHE(hYr<OLOZ^M_A>3EQg$_{
zaF!l49STUzYAcClj^&dh`~-cb_M^58t|MX`zUN`566jh8XLLr@Fh9gHG#KEI^frg4
zde_Jykq-v1r3q(8f4Cbf4)8MA=5l{Iu`RPxEb--?E=O5CD%39e91q2vcx2psRpz9t
z8SwN~1Jy7*EH3(E745x1e?8<MhwA01rdicb4ZP;GV~$NxxlKPhM-wVB^@W(A-N!Lq
zwaCmNTUA0SYZXUvdFtqw$7=3J@ij;`&>=oL*zWbiPw_Gq<UyIbv@UP|0c*UT4wvMB
zA{;*w?6#%J@X`n9@&vjX`tF!kc!32P83>^8AkeR8ql4+5{F(CPW^*yc1(5iKH21Ul
zKM!`kIryw;LgrsP>@<221#HpRWO0rawRsFTG}XoK%EIXLF1BUwOn&mdR>8K5Q8M%B
zxY)8WEjChyrUejPl*0OSZ<z)5>AvhrQr~Yq!JzGjsW%7*s~X32T!Jdq;SvG;@eUn|
z+;Q#qJr(q(kpn^&TI(27aFR5}=+qJigOAN+zSn3A35RNci%ir+z>?}f4$av!6!N>M
zzQ$^nUk}z9wvXRE1XAF~(0qeahaTx9?xL2260NfeXuX-3w7s_jg#w9`2w3>vp$hPK
z{PYjX{8x$C|8GzQ_$S!<JNx<vs#rMwC!Qr+W8HQ`{I7)PLqs4J9C7mMXmN#(*lr2_
z(smDokQiC1?t~;OQ~w@dl$4nLbGx$JUUDk>g3g$D&O)=g(&=oW;<+=cm590ksIh5n
zDS0FC$8UlxksP?Z5qxlabSc2EbXRWIPmDn0t-Yhb8d{cX=exO~7IZOcA1~VcL$Od@
z8==xFg783TJF{oQr{hZ!PHEXo$(wSzvUXJ8A|%h7#MHc7#l>Zluj(nmSz<K{1y>kN
zsItDc_0YZg5FTPSvCHdz{VI=xS8^m3GWx=oslwq%dEdxP#mi7hHdMc<BM_t6f;gB`
zZJX^VhH`8jd16VyvKNpm46WN0-sz4SqgSChR4@;I;DQg`Ktv03(ci{C$CS?-BX4BE
z?LyaVG%};-E&va}om)Nsa8k-%KlZ(P+qI=rlMqLI>`DZ8rZ6v4jP6j31|T%Uj$Gxl
zdNjUYPo`1{P2{`j;LgyPKYuWpKP{@DV?HQKK|m?~EO8g^71c>JDQjL^cKqQq+pN&A
zJOUwzdQLyoopxzxJObqlAck&1-US<{G07Zep;I#j`!xpxW=djUi@2%2&Ch(39~pGG
zTYo)PA1}y)UWEsZaHQhMw~G5>JYi|Fjc$0Y&gIq3l%D$)=ND~Gwa`Wd61N`(aWbR<
zgEBZ89W=in&VT{t9udMD-Uxgme-?8XS`xV#dmr!*^YBavxXlhwaiYVVCzeO=u<*jp
zWM3hQIk48Ik&z=LE>gBV77dPjp#b>ue6zu&rt`&>-8yQf9Nu(u<#ZCr&afK4A{NRp
zn_CQL1TqS3YD<drpF_?lvE4-Qj<v7~Yve4T&hzh{k5n%b38wE7Ly>w$l&67uAj^G=
zEo2}#n=fF`iNWZ-4msP(e4xr^>E+_7Ky-<WU~w9nXBi}$gvq;*Gk9DXag5-P3JeyO
z-fhq3yfdobll@9eo=P7kRlqq)q~(^ijz7L=ENJ0H0z@;X0eG5kR3-=>k%f!EMBZ$l
zG)~Py<90fC;XVy#d+1GVbpVa@S{NBF5q1wwcvKs_IG{lEY|-RBi&b$bEqv|Ack1RC
zA5(M|Y}ju+le!nIhqn0U)d8M_UbDpT0sdg@_KdsBd>5KpeXimaxhhe-)(7MDX}Ino
zK}vlC$^u>W(IO{<${dJSv^Jto!Lfb|<l&Z&4e@7EfkQ}P@PH&J);+4wx|xFC!f}b-
zsDpxQ^{YPzDTHjenA5mJ3Kx>Fk1Nx9;wr-$tmQyoEsnb{NNB6OlUvOM)k(9VrIP1Z
zZbrfKQF8iez>(o{1U-V&Ec!>2%0YFHHOvMF$bUEPWiaM)Gm{|ZFGj}*oi5e$fGJI`
zCT=E}yZx5C#S=uI8SF>wjcO`zh~J~JqaDM;9)fJPM44=jPs7R;<L9~sP)IDT9JE1~
zl{pE#Wo+-OLGyUpLlr{GHF-k>^Si{%3&ST;u80TWN+vc<lD~AF$J!yp1Uk>A%*aTL
z%xP)l(@^vBf4ma!9P7cGsWyprw@rlBRt3D%OG8RCR*E~ITo&<;?(vS?3o%HtuYY4f
zKVd~lHCRV1CemR^L(U?KAlM@U^1%oXd`tJG!-4`eMJ~MyREXr`t|#JM5m6*TaH?Qp
zS;ex2;Tfqmxa668q>XZZzUR}XCIf+jch8@<c!64}t<U`yz2(bF_@Rr|KcSHwfLc$8
zrvE^#(+Cq2v+XB`IVwa9%8e{2=o?@RQGMB`Nu1P4l)}P!1P^%Vz!A3<I{Qn0whJh}
zn0*W73>=`}K+7X$vkUlb#Vjb(V;INH>8(8%IAclw#@Oc>UW-q)Ko4oLxNTSv1K!^w
z@7s)=+NXKN{q}Q-P&R#s+<geQwmoLMPCIh%M0{$?Eahx>)4dvJCt#1ViWZ;acN+-D
zGug0>2TEn1Ibtm(ZQjZ0l+}U#iL{~wwX4s>>?sJ$>x69QMpMLtrkj@%V>28498->-
z(!z62htndf^x3X*S@$quyWU66YvacuI%&g9dyUt0|CblN*(|TATjL6F*^c9<8mCBG
z!jZS{x#^goVfS*;1Bk_5qwde-67!sA#)p2HEo-i04-}gz!H>_B(&}o01-yIOcL$k9
z;=Ue+j=ikCiO$oA*+TP@%Rp@tqBkoF*_BhAlYP(rIr3bRUw6GHLbaqH-z->I-vX_x
z&kpNSMA*H?Jq!>D(-<m%8F?A;F$5g*3{dhcP)6zd?6Yi6o?Fq6`8S~srAN`ch%a^&
zP$&St{>K7tmc8XMol7gEDi*1GnY6-`OT;Fhj?xR41Hz2=9_kF#Pl(#ni3VD!c!pTr
zvyhBZTS3OU`}MlDjunma-#x-5ug%;6hH;A;;SU-O>GM`-NW6QN&I#hD%a%<jO`}qp
zRwl2il~g62zI$pDy~uPAz2_{ZNL5b!s|RUvC5GIVsk$t`tpUGp#U@>Z+srC|R0)i$
zD&|Iuvy{GN4JhnEmI}|abk7aav@*S;XNTz6@{N|Jt-4I<7Y!yht{8MFQO)IQM@Q6j
zOzh7n?fxOn07Y@Ky0Cg&VIXCi+2za%@L-#$0?9iXaJ<3qI9yG*rEC9f_}4$E58Z#O
z@sVnRadMDt2Omj$cJZ!=E+5tc#af78Pn@tg{BX*i`Of!{bG&)qd(lmaF*aHJ3af)`
zNJ71m6SAIADu0~WcTAHQz#G&Ui2Pjma<LKLXrx)saqc=_bPHKV->08?C$+SR`s@0`
zUw$|6nfspe?oe|87Q`vW%^yFw^0v(2i#|*M=7Qx-$9_qu7rF?57L+362(!Av@7Y9J
zme1U7u!T~U8^WM$L0UrhkkIxl!FyK*x3JF$rX=9Xw?TuLEu8X0#_k(i+ZC?p4>N-*
z!YLt}*dkj99?1tGHE?`M6nTsR3*C=$NI1}B#GXtqktDYny$K%&+zIx0m8#m5sn;)y
ziF*anhn?|Ku???wwizj<m;EuG%hI6hBDFy;up&_Rr)bSwgH}=SF3pcU^;-gDGFoee
zLJiGmc8_$KCVa1LVxuc|t7v-S<Ip!evB3%U=g`S^YDWxcy+6<#zkT4Z>sTH@nO`*3
zw2`VpP@!p7CS<sCju`fMFn*Xis=XjH^KJ{)o2c5trl6-DlTXsIC}4_dPHnq!e4!hH
zP`U)1{TEos@_z~o|L3V1;6LYk{{SF>h3kKy_=+{GoYvW~J|I7lU#PFOVL;LH(@$N8
zEZHk~<TeP-bvABi$bk-%VX4K{9X-C+gFz59t5WmiEb5~7d$~?m`#YO&7n9K9*jjc|
zsdU6I-~1w(NR<;^T(IK98aasUusu$uz;MHfDbEqQ^@ygr>B3)~x`9e)vp|P&G6x1Q
zT*i^t>vIEQc8+?ou^@kun@6u`G(q?9hLw_ahR$`j%3oX0ojzZ-J*(wUB3bHZo{guf
ze%+tf>BLFNjX*YWShO5?Z*7OP8Jz~JjzY%FObj+lXU#yWcrOCo<K_d<7*67niJ>=k
z-9H!%3DG!W^<h@)&L6FNaJ-syO?B9Q1WSjLi;t*uSd_p~8n@ZK5%DMw<3hbB6ma7b
z(_8aOkteYd21#!4VX*vR)4|`;BJcFS228GfrN?E#J65r>a0tcsna~Jn=Soq;5+Iva
zmovCLvxK=9YgJP!-;q9lN^0}7+RWO~Dm$0!$-jjH<sj2jJ|Ux0XEAg4N3k_=E(^jM
z2cewEAG<rk&}Qn{<*I_LBU{d4BO$y=b3&!=u=;{k<u!pKB~n2kGJ*Ilm6UnDe`H65
z5_D}MwI?}cE&9=WZb~$WeI2qZ;l&}J&vRhYAkA^{U%xTiaSjTaQVxH6vC7<J;Meo+
z<|_kwT8N6#nOx6+wlm}ndcqg-mK^FAaKBsuqG{mw?7s*5+MV+EN6C*MA#(uU+GW1u
z+^548UR#w2N*{@7;S}c1wMbseh}nM2-GeR%h~W|(Kk1t6W{+XlXQK&3#Qy%;b-6W~
ziTUxeX0XU|I;!i1O{b3xd32bu1FCo1%R~By;g?1NNB>GVyRVYH)Bvy<7s7zM@~dzU
zy#LU>p%sHSRv$xm2F1Kp>Pym!?<MN3X-R}shENGBBAreI7fH243JuOk^&3pf>3rg!
z%%{q!+?ut4&*E9<yN*W;D$iI(1`fXBqVwsg%xX1Pu<22wY&hoc<0iGELV5y~TjYx6
zw!%Y^;#K7MCCRo|(x_9%wy8@8`iS$7^|na+76gs{XDC~&hPGLCE8?sNr7pHQmChNn
zG(7%PJFs}cW7*mr`Gx7y-e(H&@jRfi=zdyV8a!&pVjqHZCLTJx6)oT)0V}w{I9L%z
zkFHAAl19zflKM^G&&SOnvJ;>47;+HmP|u($jRSWx@FN>U6Il}<1%{ABgw$QJn7p%+
z-Wx^<d8C)()qh4EoJ~F|k+1Bl1e$w=h7?VpTXMyO$}y2m<3VjOW)M3+e(TVU(PXIb
z!v!~*{QW|Yb%Hkya4Dw!46ey8;~BR)UHn2rKwA^*aSPT_C5_g*ws*|fAMc$|3~oPb
zXjwU(Hn60;vPL*=A@EbL$(8It=@Oh2_fs><65?aE$y@rcH#^S#f<k6^_Lwzfwj?zh
zyjM48<p2u^HDm9M_Tj1zGzLU|HELYmdp)WG&nmZA=W&J{US7#oj7+B*gf^4qGJ{yY
zOT8symE_uSTP=gH1R}%L5MXDI3HtlJgbL|q#On4t0KzrMDm6e}bNR40B!EMm1ECo>
z7Mfe=z%|z)6%jDIA9U1#VIT<l>y@_4=}2K%g9a9hUr#g5T-4RbOyaR;1)#GOnQJ{@
zzv*zf^pZG(Q&w3vdHql&k_a%T((nzJRCHfmH%4}KUCr}M*PCk9R#zX4mIm#O(u?ih
zw6{4*Q4GglTg>X(jerf<y{v5UtJ|B!nv+D%H29-n3{p&Aq=%*2y^op(KuWlLri^7p
z1%=4;G18pa7?tI4R<$YrB-Z}SCunZBsX#4r=9c^zi#;pP!0SCz`w_Y(p8fE2+6~Mh
z-<WxKR*~B=s-uxtE@N-??1RiW)Fc5RMoE7ECOsHi(g&D1ioxSS)7bO6G&v!ms}kuv
z|Kpy4#Cu4(#Geh$zXV3niV4Tl2=+(jECC2gRM@<ui93mMT8R?kPU7=6BObM>{5m&k
zoaPAI3i`P?(H@<w5yw*<T?&m7DiTh|gmTtBw}Vkpub`wiAHVGBsW~~w33E&t1cx1i
znSdp&{B3why4p#pLNMtC&(j@x^rvRzt2>!*eP8tL`2Zso0W3}))Zeb)I?u^RoeNhJ
z)uW3c4s9Qz&H!oW0%Sh@0h8~YEu+sFJrgdX<^x?gSKk6|ZI9Y|=J9El@g1#W^LD*`
za^AXr-Zbi9Igw~$jJDr-O2fC(vfHQ-bbf@31MaeUIM`8OStU08!LyQaHhRhL*{f=R
zdS4Q|BDf*4Q;0)gsi%)a!X%9+U~Vq<!d^TYk0B`B>{j3N^<4CCgHdsno|@MS*eyC-
z^I2QLE5b3NhV|qPsWiQgWV`XmuI`*Ge;(566F>P&IUO(9M2p0Yb|Rb3hk5(fOQXeE
zADtM|npr`32;8MJjT=^!sDZl0wi;N%pHHEU1-k$6nQZU_ofvbnm>c<V1hFRx8ZN{Z
zkTk>jU_K2)mAZ{IyaU3U1b>Mz9Z$O=&xxWMnCGq+uSk6U!ve`k0d;6X^3F;L)2tYq
zs@bZeR&X4i@Rv<)lgxEBY?Bc<sk<OByR9zw8`CCL0lq+G_wp0kt|}*1=k6KHu7xkC
z(G(f;c|tecQVjbB<_d2(um}V0Ijdz;Yt1OESaFOmnc+0k@n_gt!D<>87U!18cmvl2
zWdYe!eM?-t(TZUq3jvnwQG@-t288W~T~?_|^E`x|ojdcU2_SyWRs$;|WBCK?VgvL_
zBFD(24U+WK16=d06q?w6o_pt~F~IlL*dj?Yb!i^drYmXt#^<eEUL3@!hvrAfCsfSH
zqx>QVAFG?`vHu&{q-Qx-8$8JLlJlEd8LGVY{>j@(WI))`sFb_=A%5T(BZwuRHk4#(
zpq{uvdkO<|&`FT4-SIcj9VDp-VU;_1Q<}ORyB<FG6I`XeXE{WoKR~Fkhrm`6U{(hX
zgLOm1X>{-nISDfYoOQGV`Wf5H_2cT-Ux(BV)CoBM3;6n5P5vLr<o-Xv*Wc&Z{+aWi
zQ_k!xe_gKs=gipu>rMG!4L!HN?u30n{t5GteTG<W0NwW~k`ibzpFe__dMdaKsuQb@
zp|4LQkoNnSk_2GSm6|KGVvHB@xLs}FY*mZ@+-5ecTZ<l|gL;em%q>MvpEO*IHg?DU
z<=X?iF_dt?7#_t?hxC!2!&mQ|O^Z?=&=#yn@z<lkz|iJ{otJ(Di8`F5(sav;VZtiz
zPs+h8{W?Nx`(983@oNs(_NiCr*>2OOlRZ$4g5ElYA$V|^p7pMi+K6f$PTxo8gN?Kr
z)wsuXWRI6PsxdlVPjk!K3iU>_LJi`l`d6&FUz^B0D}G)>{0Lafns)n;8!%{@KSI1b
zl|g)G&x;o2GKc-LkhY}s+FkEF2Rzy`V9S5*N3<oJ3jAlVqDWz~lz9QhaM*7oC|64e
zL8&-_(Ne<rIr;@{K4Md86xdi&(fZw%5GtjnHUBNR0iB5{;Xce1u)gGcOwCQ0ozik(
zlmrhMo%gRcAqY0QG&|7kU-LXhSG9&pt!M*2K4Myk%!r(b<d9}3`I~SZ7U0w2EeY^<
zZ+d$rgN3lsNz|t@Y#G6INedD=Vl*4B&BaW=^o7HNxTlQ~@*z9;liuQy#18I+Dy*#_
z>=bSDJIrFNNsm5LdvT7GM`AEcAvngY8d!!>@*K%XI1_JCQ|W_G;oU0-JdmyV6?mC6
z;%D#>zh~XdVx|lMJc$htkx~2R`c~c{tb@StT%&moAPgY^ljkB>JP}m&y?QbJnB88a
z)%vGWfLs5iy8uxaUjg6J&jCv3TlZi4UNRR84MK<oxz9*$13lxVR<W0Nyr?fRAZEWn
zN+%xA5RmEgGU~KFJ1L;bwfywHOgblm!qt0fwJVhVEXbEMiTY95ghVv+1c-5kWELxh
zGMv~MRWx?OcP~xN$`kMQA)rSfhf_l5niD2eEo!;*j^qwrJNaVyx$;Ko5_Fgm?y0c7
z2=1fOfhpIeT%Fm!bIKI~$BsmD8aRVZ9EjxEW2h<Y&iV3}wZ3f*e@Kzi#oU<?Ha?KY
z&9BLk0)h5zc6zS%DIhIamp5}ZlX|qyl_||$f>_a$GCs^VOD3y6E!Kq09ri0J)oJkK
zX3$i4(!Wz)$jyI{ca`s`@31k#dlD9!-*>q+(Rd3k{gBS@>vrBcvQo2GS=(OGS&E{O
z3H;S=<cZ>#&W8&P!Kmk90rl9eh%2SOF|ERC;cUGc&J@wqk2c>+_@k^<*iljGb7B?y
zoGW^MYt@qx9<#R%0%rRe1qL(>`cFBpzY6X!9W0N;o@*?tk?kpGf_YsyLT%IcvskE!
z47O|r2Ab1$E~`;iE+min#Bi8L2XVS9+nw~7{mgD*qm8>j^>3^Q#;=X4C0knMoLohU
zzPI%RF~@Qm%kMG>{um}>waBsj6Ph3cnrOIJ?jM=+(L3ul^ifQcuwibRTH~(BzSDP&
z!Ro}>19)8+)5d){{X=4dDQL~#R-7&d3gVwdNX$WHM<zH_X{?P7aId+ok|J5@tu@zA
zw7letM2=IDIXI9`^D%I{%gFWhy`ujYX>S=^$*wL~+AcFQGxIiMnVFfHnb|I5naa$}
z%*;$>W@cuWnYn$=x%c&*o)<5AVj}hrr82itN-5*Z2rVs{-^FLM`JA1WJ37Mc?4Qoi
znYp38^rugL?*nhfPMc0FX{I;R<sAXJJ&A}8m~vhH9=xH{FQ)N5YnwCl`=k(!-r0=;
z--;ORIjgNL*&7KMxiGLT=iu)vwPk(qmE1F}9Z}esEv1*bV+z_c5k5CwM+d<4YM`J@
zC*>W~2bACx$gu{#=o<#b&Uc)nXLj`*NgxUY_lLI}vIutQC8Q_eGdAsfxB2Ba+Y|4E
z7GHoC5gI)gLJRw><FI2y$mbY@T$1Np-&4=_a^<3JTYGfv<pz9fS<8w8$+ma>2cm-R
zq;{P?y#zLBY5^_gT{644zw+B`GFz|y);2yj2pK9qF3cyZOk6(i$G~Y11q;)_5*Bq#
z?&F2!rr|GajuJ>csU0(2H{2!^^t42uP)Owb^Yfoc7Wo-HwGh?ojv-lY;i8H$T0zuY
z$H{<fUG;L96MWsixN;>?3fTmVOW2_So80VM47vD^M`>K=*8{tm56A|C-lk=GkaaiV
zMKswMR<Y~bIJ>c$^{_m}n{HY4sj=7B-{)Et7g&p424L@1e%;U5Ytx;|`jTcWT>B@j
zsJxae5sU-Y<I5bA9X-VY+pSA(@K9m2`R}Pd{))OjQU!B%YWaV~M#yG;$^Rxc{wI3#
z|7*VL|2{S{|K}XpKe8He18Y;~FW1bMhvr|Yzw^H)tNwlbx3z{+*u>Pp#oC$bD~vjt
zIJlVD8hH@1eFaqkTQh4DLKfC9+l{@Qv#5)$k+X%JEg?YB&c)XFKVa{_>F|Gt<$rGd
zUkLfve+39l4XmBMY9S~8@07UmUp)BVcm0oYzPRxJ9p3*b=P$5b*u=@m(Zb%@&he{C
zPDX#JbJ#e)DkWrK|1ZA|8ygecS9$-Oqhn%Z`)Y}`fteHGUx}|01O@Hf3AN}L+1LsH
zI{SsQGjI}eGBW>b+VCHDkGO!0l#DoyvW1O_ldOrGqMeO_t-O+qG8{m{*}&Su=%1(Y
z^;ndgO>9&NzY^;Ix;+ca7vU{rZs7PAs80!SHg_~J0Z0KX0Ac`VfD*vOz{thf1mFNL
zbTlxsGI6#xF?9x*+POFaECDV634nu(owJFtq4nSSDqpiX|GLicFLw~Y)WX#SU<Ggm
z7}?p_7y!(^)IVQNAi!5Y8CV0XO`MznU!7s%=wxK)XaaDua0l1`qygq0_U0zG05^ad
zKowvOa58cII<f`G06YNpCXN<%#sGJKfiplHU<j}S$O1e8f`GqGMF0(eleK}9Ilu@Y
z1ki@F2gm_zEo@ByhAv;Va|S2_JWU+!044xofc#f|tnF+8_6Ck7wtv_BYoGxH08W3&
zi~u44M}Psq^q;2v(++1hyMHeJ=g=JB1W*K+0Yv|+`G4pCH3q*r?CW#Rgqe`}zZMq!
zYgNJD8UG$=|J^6wzo%pw8JIb~hQxnKn*JJ0j6(mpZb1B(ajb{3k{R}3cR_0_Mquc%
zNh|y2SRS#IPOt(nn20cc4tS`4O=xUk9TZU@9kqeBWibyWnufA*Br$hOfFN-RWdt~)
z{rn78F<v9rVqvCFEJ8++@3`J=)-CrX!KKHhQ`XTA5I%-I2ksjG*7Wu?znX)jXxwgi
zLC4iN?24^|aLLo-9`rXG(;%OWXTh(PY}fJ;rC|QApRW__pKGQZ`|A9~tqi8RrB}Du
zV_U3ApPx{uTFd^0xa_@L7vS;ww7BsBn1~R&{^L!c<~<x{$o9dJnmxchf#1f#^ocN*
z(}CDwTa0>O{9J&ZfNFsKBAfUT_~C)5fcAm;foc|xL1;mw_^DD31{`NO?lW|4iJL#`
z3A6l~qud~rjPTwRe|*~vh~C~p`5uo`wCVKcaGg1v9V2B4M%k(J2)|igvm+y!?=tdW
z=~ivrw^2V#Tdb>L)wXl^rR`qm>~S&MT6YCMkG52SE6k^vA+*+DvM$!OL8r>Q{O9=2
zR@ABpSoj3SmiBIwagRme-0*C5MrTI1i-Y6Jg=9Ogy%tZWQYbJDN%m+Uq;&F5wqsz2
zZ_Jz_(dv~1?f%IV2zPG{5uUf$XhSL2Z~lkK^<RA$fyl^~=3sbK<~mSxtkW4Y{Ph>j
zZDOk-FWhpTq2U}iS0YW~HJHzcqIvR|s}e*IaLAUitVYJj*Lv;iFi-8rI;b<hAnt72
z$<HW2`x!KbaYz8dO_JEZBas?$<mf0)V=Op{W4{GiKM+ZAGMViU)6PiL$?l?H?qZ3N
z?oAsZuL|~h9m{lt@V+y^lFLsEzz4-nr!nrrJlooV+*#Suosbx}@IH9n{iYPuhw$ZJ
z8z~opBk{Cs$>A#uKarHE_*L934Hz9Utw$3{wNRGSP?h10_tjKdmsC?tN>Hs)fuoR$
zo)L?}=XFn@+tAC~6qC3ql$eoLtT0yNhewL`HBUe7^qez4C^Z1KC<&-yRvBKvB)JPI
zmnf`L&yp=9NM52!UFV8yOXV%5s;)FTI~`@6nCEOHZ;mQe8XcQEac<>O8-Xqe=7Xw5
zb}SO-pzFoIg%c61z|tDS=+UPnnK_#B(Lty@?motO8C<UIN{{v;Ol|>by&vTG;P1^4
zZ}C8CF!<Q3l|B-O2%&bfHtGDGi|-IBHbAT!Rhwgix;pEhB$opQJHXo%Q=DUQ##arG
ze6%*T^f0YcX?dX0L{q7;UXx|+@ZF-Kmr`6YcL6JOYQJ&{k)jaE;@3zS;N%`@X_LIx
zVVVV^t+x_&AX*^ak|PAE$4F2YMZ>AJvLlw)Wmnz-OiMw#h$~Gh!4x0LwaB#IeyTbT
zp(N$K%=;BO>^9sDANqqi*7~Um1>v17m*vuZ^SV<7LJkF@96`^UAIbx)l*2PjHB)>D
zbPlzG7>4Nvm6JM1vTD;il%qxKrI8@g=RoiH4a+eHV;!V*`VZs4D<Prg9fg=!>C%Xt
z_fRV178+it6nB**-0HY3{OV4Tpwll|pFQPAI34zxN}RG*F*#VXFqaCp-H1<WXamOK
zJ~SvSl3^GdK@rMC@eg-kU$F8TV<SA6;>*|=?icGTGf&~-1RX=b$SE-hrG!ERahAdW
z1-Zm5nMK^&@K0e;n5uI%n%8Asljb}L-FP>ydal%xWL05NMV}i)3sREUuzg@>Q`Heh
zuyU?Am00<7d75f@0-`8%)T9z~laG&1YSqRgegj@IzSNB}<Ah4LFx_be&{YJ%O&r%7
zjU{e#Ngjo$F<WNtU_nnFO(^s0vCKz41)<SicRXhFrlN1as~hZE)P^Fn=AQ*<mDD)B
zL(u&Oj%obbKNk1n(Sp%22WMFB0_O%X@uty#BsDM@dus<xRHcpdfq_#Hp$q1Xrh;=^
zPRj+MU^M}dDF)hP0$t})@3ZDlVfkW1k$!zCYUW~RmChB}DrGfVs}nfd?BpbfDjCw2
z`^z5iDQR;Q%b2;CQ!6I5yt1dG2{JF9XuNcsD$j2U$1u1XWSV~!<)XM<D#_Qpt34h?
z>;Z-^=vND#fo*FUTdoNN39O4^08dY{q36W!KOX)(81pcFV0Jl9j4pi8GlmKYlT?B1
z3}*=L^qX^LL?1Hbl0-A<&dNh_{*3udSm?I?1bRkgk?_D{_$>|Y?m}0rqpkE)dnNct
zCYtNQb-mN^wao#162TIj^|8DgK*H63mD;nyxqn^6T!{U05;~qA(pguuiFIB2n{(4)
z4bwqeSrrqn^Hx|28pq3HiS9RQZi-@br2Mx+6tqu6@HM~!dm>5z#2l+}e4EX_<fVSS
zjZ1jdA7C4Xohc5O8BN%mr(jB=CZw}8nf_R`v;k0tfgEBKVUN7ZgsBx7_MceQuXZSe
z5<+uol`l{aU0t_!)umL=-lbU*v!2l;@kcRyye`E;V$SB}jqme66TAezATIt#r%)jh
zYZFa-ARNSuy53A^ZX(+xhKV)NcOrYe)1z)O0pXtWV11@W&i2NfOiJ^$txZ`AD=+#?
zvo-+y;;}_1Jz(eiTBdycM0Q+>k&{V;B6+0xS;+UCY48sYW_~tum5b2azJysksPW0C
ztM7cCdyAqrv^eDxSl*(M%3l(K9&>Q|JA{Wmk<d@e6%}7WARcB3b10eBAtL?UiFyP?
zX+fGkaf*hJDpYM8xN{xCY>(Q-N(gUJ5}bDXfm`EmNrlTKO3+ZN8TVZgmv+ucUh+z6
z_(KXK6W3siE0mj3mvmgzd37|jB9vk3RK#JTVI2fJNdAa~`h6s%J7_w^)QNt`o4_8z
z_@YQbc><tdR$49<H}cL!@NG6`OKrT9GO`6;bA}=3ExsA4;}e{ZKE7L9&)z=WS_qGy
z(%(&`JwyugS`7$1xZSIt=Z9!)r82yVV1$wd*zl}t4)<@KL<IZn^llr?Eg#*X`=Pnt
z5=}eWvpXDXt1UvOA5)C}MA#fyHUUi}p=|oN$INQ&2tv<3A!os=2l00~{I-+FkQLIY
zuo!0->Xc^wcDlQjOV1*tLt6yjJ;9zWf%0KTVxG1FnKr<T4eT@+X3K4+KEeo}9;Y7v
zhl*mg_gJ{v@VzGso9$X7SDLfw1Xc%kZ{k;Jx-BMlbH>N-@9ZCAHOb7Z(iF8HgKS*s
zxJ4N<<?8g-dkhn1I)+*+nq3WzKMe1-Npn{`cv8>%UQF%<KSn6~KI`YFcuLW-s^Gb2
zKzb^SS*+-~Dm|;C#BL^?B|Lv!bd@m+&EH2|&-nI(@$Xc_9_%Sl#A7oLM-0|O^IYFa
z%q<Mf?|rQC-7$YMmt)Zfs&X{Q`uo9{#gD%{A*C@xg3sVKlz_#8-tf!L(3`^rEw&K)
z9k%DX=#yw-{AA0s;c#5aZ6paLz060@TNBWd+y0Gued>NJ-6P)OjaZk10+vZQn6u>r
zc>$ztjj|eLN`y?Ohp?D`FieHZcy7R1XYq>tC8>Eycj0^PK>(_cBLu^9ICe$niWU@e
zM6L1#I}%KXVgR<;4!fO>)i0Pr0^=#pf{66c(SfPrVgZ<q;!VhjVfJIi?Tq6iWHTV1
z)>Du~AetpB4^yVLm1zECM{Q1Wi7U*E<kJm=x2Nyy1Ghn}|I?BIuHYev+Ql;#WG5Ep
zM)o516!I!2dZXyaz$J<<2Ptw8iKQ%Rq$`HuQ)yapYjy*z?Rk4JjCnkFmQIgyuGw1R
zZ#Zp68%)6&>2n&2s-2OYm?&i`@rVJ6Z<=Oa9))L5+eX|<)k<~k`KF{)H)9;{mny8(
zeYJSyMhcyDApU&g_rtWfIO<$$oMx;7G&K=y!Nq;=m(#u4uo=TI5vv*~)Bz@M1XkP>
zF}HqPCHAp_yYD~yo))KvIJflJf4~sPwWF{|U*J4+)U*LBzi^df_NCxo-=}<N+e(tC
zkkGFkg~@5u@W2Q;BE-DT8P$CY)$iH?U^3I`pB{S6cOIT?VA%Rq;b5EMdc`?!U4moz
z%(T0BpZ^@(angC;wn4<3RM5jx^cL$8;VT0FA+!N&etX^XbAKn#ToDxw0GS9RalH5g
zf|z$_SOJ)fBTX~onk=V$h5V<<eeFyBYW}vk)KDz_ZZSli@}c{wngg9d4rc=~2jr*l
zc0F?p?A@yswkE&3XOgO2(J_rRxv<t4yjGH*5~X~>k@2@yTD4ReN+v04#nR12E1X3{
zbH+59WfQTLb4QoWNcA291HlGJB#xV7f%2?e5z-e>&HhT9+>{wOx-^I^#rSUsS?d8X
z@m4nLv4u-X=huXrW=>7awT?nU)er|W?MJTbq@kJPo^X{8=6W!E$DXpTJOmxD-U!F7
z+zNaW9Ue&?UJ2OO-L_jn;`Z25MIIHPPADw)Nj;L7KOpEsaKlP}{$5IP+}^#)Cv6!<
z(2Vi1<Hc_@+B6KoJyRexXuA^&DBB`4cQPoEmcC&&tb1gF%KQA8s|=2ikrumVA_V%z
zt&JT@t1AzP3Bq5=-{81G5PhJD1^Z=MDV)K-FK*wQxY(lDl=K|o4Fh{*qfyVf<?X`I
z{mU{wGfw$e*(|lt!ded}ErzbCjKy>3GJkPI>yS!n;j8u)75dtvymD?JE$Uc7+z&z-
zBy^}yhAxG0#)Bt0Ra*3e(KR#_5=2r-<XZt<!5#rQkOTeelObhC$s%e>Zgu#CgAf-X
z4m_ayKmJw39?T1*<rBOfIV|M~YKJh+&P)W{4OGkw3Xn{~0v_p51;uOTJvnuwh(<|X
z#ns}QvW;VDWcPiZ1~$U?veW(}xmm1*#`{fK^a)M!jnFQ(zfemC^hBRhY@BFdlO%^p
z6)IT#Vx^+b1Q`YD%9w(XvyBIrsO57w=e==?+4}*@8|NZno@KfUnJQTdS-Qw>q@gpY
zzlWeZ>V$+(2z3UOKoO5&G+|zSaI9$|CfKj+^KSV4K`5bb;He=!Jb$Ihd9XT^8>#T4
z;b`DWGB};AqgL?*9eQzBJqSnvVNA%1V5UWru=8j>gV2%3Li`+KP*WH9?yaoql-;Jr
zoQHP~(!l(BaV>SKWb8GOddj;yuMtm<f5ulnZq%lrTi75CGD<p>|HD3>j+>f?iAE53
zf5%`HvCqV)-^6Y7{U)k5hMjQVg)0Lhd3#y|f)Cf<FR&@z{>0{3q~|wakBz4Q9Hf0?
zYMD`#d|GQ9rG5uvb>b=G*5+CyF<9ARKGB7OU*y(8g~ma`44e72f-b?*?BxyX<6(*K
z^*h_S(`ojPP5l(J)gD(G_vUA(+d~DNWoJcFW_BDO6JM`Cna~s5Xq{Yh#|>fVWwu4o
z@e^wv4RC9xRxkchw^`9Rbjt`TFVt`=o@Mox+n>R=T~<c$L)wEvgPpi7K$=@^D!E<j
zPPv`=Rh_csw(_hAEa+CzK$$0mpDgW_0;TdwmLk8tV@%Nw52MF^_hliV6V4rWn=3||
zaSY;YoC9Bax3v#Xf~piVYvWUj9j`d<c}3e;66sjd*JI1n4?7nx8RMu@ch%OVjo+OO
zSjXk0nvzf%METLrgqN;0Ub%1Cs(A_A3^m7RUI-Tv#7G+qJy>oJpdg~>jZB6q=%^H-
zf%F>ZJXZgeFv?lQp-}PxSX#iJAIKcCqg~m!^<39x#s6dKT3pH8bUI;i26gXg!z1#0
zmoSeIB=5#YGN1#Bh;Ta}nw(ZbToCz&5K#~W3gAJu`}#Y#L?weM%j|4I=d#RcX^Xr&
zrd_7>p=0uo9(Q~8`=86#XCJ<7fNH+Qae5!m)J*H)FI7AVD^|;T5Tz7~$qlkUymo`2
zFQ@Z{CfBcf5P@XIZTb$D9$rX(i~^i-6*Uz)D;BxdgC~zYXc55}%H!AZ6;NPVlhl%x
zp-^vo6+BQY$wkMsd7~_i@wY8*R4@EYt3@Q0p2aW74x1NRQBR|9Bwg5-kVDPizqM|2
z=-TAKE|f{O!Ny}q!i(&E6!PWZmoB65PZ%vUg=%(%O6El*LC86If{@YgJE%ImPEee(
zD*L)5%ahD2yBu)GF@7eg*&Buyh-7e}i(TpAPJNqy4gPeBio{S3`!O}wdt;22p6r0{
za1RrWP3Z!KM-T;Y&VgaxWX9E-cEf`R_7FH~wMW~3_t!CSa!B#O^XaP+CL)Ce8|!%y
zN5oqu-byz;8i0nb0P0BJHnInWkl^km9|q%qvL6nzvg@w|T?b#f2$tGm8dZuNdq*ZF
zv1hL6Gnh1J;eEsVLesP$wwXY>x=f$OzUIWP>PfGV5Vr~KFav$T0*1}%eR05hLAQP4
zJ3jE!ZB?ZC_72$Y?z8?7@gGZ_jnlHeioG&lVSluklV3xpx_dnG2Ldw-SH$*bqjbG|
zVyQ_;tq=OyYd|R{e-HvUCGN&PIg2C{$}2CSWaLf@)ZV)5k%0f?p=n`SiW!iUj#PsQ
zE+O(~)yeidK{56+y4t#FCaaMkBueX!q~v+fP$F`<v(|M=0yV1gNrvFiaJ?|KXy9t4
zS?PGZDW1|tK*0t<?0?I7#Xjs>^>D-YRd?og2$RkTJK3uG-LST09Yh1AcTN*=LVyYL
z8SQ{u_o*^S>KSIsBQi%<tOaRvbi%9}CZPd&2-J;tJ#-sT<!I7OPWC>KZ3?}ooj^0$
zKnJ@OQ_sqj6cMTIjp}%ICc6}7#fyRjd>Anr4q?6TZfheEiHWiVi9;PK*`=H)aBusf
zK2c<7ZDTrMdKw=ZQM2G)LA#kEjUD$VWN>z9wks53S@xmLX<2<W*=|zF%;?mbiyI;u
zeSo4UhU!=B@121pJV_}QG#k!iO3VoY9yYCO)}$S&W)hhVWI7om7CJjsBx*C65t&od
zlN|B2&;_k?3S7{q1DMxNPRom|y(xf$+kK#Z25N)}Jo#Fj4UYCzq(#d`xSJgT)(~`s
z;49F@Vq_F-%(s3F7v_P5u|$vLlJHickoLW{$CIYf#d_W}Jj9nX1dj|#Te6P+6QQ)K
zrbsMnPp#xGwWvnSkaRml!trVmpZQ9+6|5`EWRFHd^h|8@<a&Xej(YxddYU|?!di8L
zbgc{fH$AY`5gG)R>+<+v_JF>`1)Ap>Qa&y!B4RwL@F$&>S7G6Z@fdNkQ)apVULU<6
zsqc}$igBu2><_<QPOhri_)cpGIi&c9-^13`hxNezfHj<`S7}Pv;vK8DjRKROUTa6M
zweJW(Aqbm9K$lwaXGr(M=WPaU(Ww_SA7JhrPWYVwEEV&STv@Y_^pu*{s9HbZs@0xY
z;~a{@iQ=@-Sgvq!rKrZ_xdRh-pM$QBXmO5q{Xji0>x_=nG6|Y0I}1CtxKlQ>vwNqC
zEotMN$-%5W&sg1pO6A1az6WU|mbvktVnTl)<ELQCST`>4o9_cpT^^cd&>tcr|Co+=
zgb#UiJ?V(a301}_&W~B1SVo|;!IWREm!$+Ch%dJh1~|$wQuubAhM}=bxLA^vDyJ5B
z2Toit8xxXGjEHg;R;VqM3fHYJrlH4%RnyAvt1kv|EdNmI;OCD#f_-h9E*x^9!%k{a
zw251V?A&mp{&sTt!D~YWIy?ICO~+uIx|@9<*pCJusEQ6K>YG78Cjxi2C4llS7rR`w
zI^Kv$r+8pcbE4gR`_C+hOH(TL>3l+)EPY-Orp|)4Lex<rdEo`ILAxDE17mCk$&zHq
zU5iE)b5ksIeyYoA6@Mr{?0Mupv}MJxVp)Z<sxuybm@&iF1fu)pP!gk+oWMg7xNwWP
z@HQv(A!h2H=+v{UQ%PyPl$na54G(x}8pEphbH#i$^Jidmt9?vJfq$=97bX6!9r-Dd
z*C%gu|6YJVmKYcWpK+f1F|yu#h<MEsXs7n4e2SYnJ{0)R2(b}5TlO%|&=c;x&lWkE
z+|tq@5CgnLc?w=C@_|M(G8g5IR`6#ixWy9A1JAIZILC7@W5moFY|8o)bB0AvcwsUF
z={q9780Rkr0$O<7y9&fL1d?c2UBLTtV#^W|6sZ>6_9y@j<4pOrKj%*>>wtIr_(hsh
znar9+D*Krgo^)YhCD*gscvw&5cLXX}#4?fs>=ynw;1erl#FMc@ius1mik@fz5Z+AC
z*QAOq!X(tMQ_{2MOgSad)B~dwI;tC+`vp&Fy>+VS>u-vlaUj6;a=824_DK<Y_0xtp
z$9O_}WHAedcc(M)j#i-xJ94WM^Q;OJCq&epW>)032H#_ke>ao{z?i77fHg160PP?2
z#2=wPjcjdfs}aIND5I+*Gm1@${MdeDt#zEBe+qx3n$o=c4H8{`ac)zK)LgYMDx(;$
zP;`G)%%QE@!o?f6j?_&-ktQyeT*g!?t&&8v7RK0LGH1Y=hKi{L5smZIs*%oQ#C%)(
z^SV9U4Y_+|H)BieJpJesjkdR&mB(R=cnH_F-=@z3DfzTC3faR)NmHpT5P)L%BT{3Z
za2yZWWV=F(Mf69WKJ6i&v)ZSc(j!(D?v77e(_2k_gJ*TSnwE=|8(X&;*Q!ReO2jfT
zu77|eBqj)y1gW0*@Wdky@(Lp;DLaS+q(6`-B*rtfNVqEAX~Ss^rIJ;-i;I@r(#an<
zZ4NVbzsaWJ&mOO=M~|=HmK!9V<i>JGm`<;hlWJxEV&yLL6r+^EVPpRI)X-9%mF*kP
zBa-8z>FaL=>$~0QpM>vu4YmSr1N2yC3{mj2wMCQa`N9S?LeAh67Jbt6eMVN`O^0FO
zcT?LV{<xtQ28T<NiYKo~iEFw+sm;03OifLs#N$%oZcMkE1IQ^J9^)|MV+{2<R@cj(
z&hN#KHy@F>UnZ_QBkvFYt6Bu$Tc&{ysUdqd2W~M9p-4%BSx9LBthd(%HP?5J^%t{!
z@pg?le;0F2lMj&YZTT!_2x&B-%i{Bx0zw7y?lA4c>Ds*4^|51<3!EJjNR;l3W^yDc
z?f9tyW*P%i4fb!5)j~^=pYd`-gj<^@*zFPCOpC7?8*0Blz~Y1ju;oC7JEXsZY1}W)
zIM6rU2Oqb8yCY_}He8>lS{*+j;K1jIls8bKf)PSX@PrZnEzre`Cf$kVcI9broI^06
zm!i&l&1sgvs1tCkmZ2ACFppMc2j%WpT>IMv6pBqFGBRarniK&#Jtz{o8Y-m&KON%w
z)$#}L_?Z*y(+<6hI-+3oxw!3WgtfThrAhMHW(GpRnm?(==TM?ObiD~mr^zW!sMQ`4
zb%Olqs4{qt+Q^tx%y$E0KgrO&@KeD*GB`CEhS9(5%u!I~?1~=kSq#T`$+SJ?l|u4e
z+~wy=We?Gz&JP5$>V`=nK)VQr3=C?Hg^|)cqq8UqIUzH}0bC#VB!5oHPOFWshSH3{
z#AX7j{uDiGdn}Y^j#p<~a=3DjQva4!i5!8GE|~C!tg5_;fumg6MhMjO`{?hz5eSTG
z#o=;;YUh}BIEQ&sns^Q%O7P*Wn(*pT2vXt9fDb`YR^^6&-hP2@?!>ONU&V8UuwQO~
zFoujrT1xI9szKN25N)7?lG;V@?1Yvrl|wMe&;8@md*ZF7=<!{KG1Q&{$c&+o$^h!E
z$TdXW4_f$#40_xo3@oaF*JPP3Pq3YbXdjQcn^^THsG}qQZx|!7A_DslC5PX$rQZxX
z)pQ{*;|>cB@;of8l*eHpZ^M^xyjqtxO=YyWaVsqDaYcD@i%8CQ(#f$A@6KFZ1HJOD
z`x+*L$6||4xdyb%NQN)v2JTcS7w8E`<pqtHFh~6bi0G%p0%NVASLw=#SyO^pzHq7@
z&F=135ZoF5p^#TDDuOH5U>!VhFB*S#1K{;?(r{p^s?7(hlvZGq4+(7p(MmE=I9nj_
z%7TpO1ZWa0W$mhYiCxSKro|*Lzt)*eC-fpae&-68_2uZK%y>K+4%k)Dju+{`WGm%E
z!|x`Rhl6~6zZSf5o@g~&DP0M~Dw`-xY9hXLCMBy|*0w^cY2w`kx343IY%LS(1rPZ?
zjd2M?ia{EcgU8QGC%A_UQUMG}))r-!?t&l=@@gv3Wn_sX-TtXV@@X>q3i;@b3dJOT
zV9CoKv{0p}1M%a6Z1YHPe&#g<JTP*U9!~a>>Kvxe2-~39K`0siBxXCqraSyfSbR`o
zU}c4gv_W&>xm&BvT4a<&%!#M4J%MKx9C>jI&A%8OO6IMcLDW(gHG)f60#(CL?87yI
zY0eTuR7$9w$5{ftcX{2tP%Iao8N6_Ml6`-E)pi|!F<nPAKJ<by+OUbNx2^d;Ax6<|
znbb39B;O{ZZ)%2NHswIWKn-o<rA`b@NvWi)lHY%YZDf-Gnce9HS~SJ)oMK?86?VGM
zwXDyqRZ+5#*EnWYx+g`0u$$6Hb{oEy2)udKv=$M|TkFR*8~1UMr8-(4Q$|qnybQcr
ztcxVn3!Ob-18(coI0A(73Wej3ELzIK9Wui#0z;lWslI(7jY7vP6GP|U8bgt7Vfd=(
z{-UWYvx~)Q;>rs{l^NjrE3*KdhQw^)PGmuw#g_vjEPFh^J7axdBr@DmiC}^Jio}Lg
z!6qd{E*$5s1x&qRHg#76H9=+Hc|zki`;hzqWKc<0)Ev?Dv_vc_(|Y-CNR8icW*1VH
zU~VQ_-aC1MJmx5isQx@^l38uyO}2E_i&y+m5cLb*1&Yx7d4gSTbXe6rvo|%b*C9qb
zlWAF@S}2WliHgDO={S%Yn${yRw!!{4YI-?MktC7!D!OWjBvG%&m17dObdKUnQI%q{
zPLPLRX#0y7f^~IpHyg|J9+swxc^?7RlmJ++r<F~Xf|BVnKp*tIVWY4u%hBb5BXH(O
z+Uca6;{%IP6B8rDEzqjvNH1Cm2uAt?;VGq#!)Ni>E`;#L$HlF^Fq}8zN3(zWuvmg9
zVh;$28}zH~cLWn<)G4sA2Z<bWQ_HKcY|yX;nDGzu9AU(!`r8+LWf##!8e?vh!$nh~
zYPz*SdvqgbaF~}T(gBIlt!G|7;474Qs51lbK)ud75EDb&8Afgk)K({wX*aO;S+`RF
zj~o9Z-lti!0X8H-rx(HdrKjnK1h@#Bwc-(lL2SxFMtS#{vCl{cFf$;rYTGR5<n1ob
z*!cV~x0<;o!Z&dm5w5>^Bl#P}Opm=5#sVaEsVsYtHVzU6g2DB^aLS&gZG~a8b!R3=
zARe)0!~#c29}O7y_Q@q-Ri@oSo@(ZbIjLWlur(U-O+aWJ4Sl&iecBl$f>q-?&yhhJ
z-f2wWe5Gkl@k<2-BG&_fcXqVFBLRG!*sf)YE^$t-+eL2vrA>}1A(n<F<Lmn`x8ieI
z&<1fJ#>`KnE=}K6u1ovE0bVmbdG_DP8S$A)Hk!@i<u|!$Wo!$xjblLt3h}OVP=Tb{
zf4&V4Chx&??X&}1_+8)Q;#_U$TMzjW@!R{+1{K7ZnkcZb%CJ<X7gcH$NUS--R?j?e
z{YY)_)%Wb?yS(+<+PZw^LD+_9cR$$U3Aj>59}K)l6X}P$*}N`Q>!HDP*ZA0rmP3N8
zY4Lo^H)Z=qw^u-ImoAcd{V_`t@e2ODuwh7qBy8oH)t8iG9;;cRBy6%%1*8pwM<Qt6
z(&Il!A~upQme%XmqX3IL`7^mG8p+Ov&-N9i>qoo{eQbDXqt+vS-h%1{N-t9V*|ua|
zzG~$-RiBsefvS4T^7&l6C!aEr`qS|TPzV=N&bk)zF&W;2>s#^t3Z1!9^S<wn?qG{h
zsabP#=tN`XAG_;ki*h!(!v+U35}{OExmU7^8+u}!<lzEO^OzQ#7_MQzpC8^fQC;%l
zPc*944(j3XR^`x8EvFgxYDeQ0?CJ{nW&H{&!?GoAaj`jR$`Eiw9G{(3N8`|{yy3=t
z>6+uxIk02y0US82<>V3z#-njPC`emfwPA%d5>8=JNQ|1u1y{|Ryii?U8T*=A`qf$M
zoInyQaPZ;v2ris948W-iw!RctmMw>cSL|{$^sF&(7>SqNKXo8kO#+3Byl+>x(y~}L
z?8YRgt(Qt_uu!mnZ#W8W(w*82o=puU;|$B$Dz3G4=NVq9MDd-%z4UQ#FCIn2u7+qW
zaz7=nm1?E$A4)y|M|c4;U$D2cQMMPhGA0_NEh$dtsjOVV$7)VSNMln{3~YBFZBMwu
zjAKU^i=%QlFS=3?5<Ty)de=Z!sATFDsBBKnkz9N73#3a@UIhvR=Do02=mXBfX0doI
zQ^uEzu6_sE!+Tz6S0y~*+8m`HfLAUCrm<ibV<(rtD?FVcc_B%jW^-P%Av!gaiOYDn
zJc@xJIlAdDa#aZpxqL){S0Ibh>vXJ2oXF#mHH}=Mhe=3DSd2PDa82S}i3idiy;vLV
zr$nCL<H%=k(sc%_=nDDlmLjmC{5eRl7Y%crqQz9ZF2wO){?3Wf-v01}K>1{hv@?r4
z1<D*6;A-*7{__onraItNeB$^5SYQ&%2`m$7%p72)4_m<`?4WmE+vxP;Vl4A+S&=0>
zbe_>a@aP4R3r<x;oR@bRgY=s>Z}C!CTc(gJPEq4n1Tjb`4db*1{%&erlru<pR74#t
zk}*jZDlemshulE*$}{&j0PQNd*U-Jui-SYKul81qlFUP=*c&BTHILDs&9;AxXV=(G
zm%Lr(^mPNrVM%o&&`c`u>#>x$jXP0+d8=T5J~(C^8AD*Ahxdnr2$Lo}(jnx{CC(8S
zaKyL<TT=-s<J)S1xzn{MKV!A1%U+GgR~e(?IE8@t5N}6Eqw32f3K18O>l`FDpUxU<
zvO66tdabwj=)m{@cM#yVFP8i%ol9kLZ6hdbSpXq^FB~;8mM7VR465a?sBw<o_8HdM
zXRwcD_oZL79e{<eUlC2Yqb^3BT$_RkwU^(`?{{vgyqiIp?&m2z=$gQ5zit1mNUxg=
zDfi?U!?BD?G{TsS)<wsH{-tnjW?MkH{P8)?7r{7ILLx7AL_5NO?g&BTp{Kvj<FBTN
zRthC};o;SX-Sl!!d)Le;p}w=^DEBD4kOf>lcXYz0sZ?CZicWVi-Tn^EM4I3^@1ERO
z^|O3Yp0#vCKtxicBwoV_soR^Pt3|d7K*vY<R{K`Dp=Q;8+q)mihifEMk$fH19={-}
zjzokK`+*U;?GnW?ZEzGb5iyeK7@h${mq^5)tmSb^CPfq!>D5ORtS{&w2Oce}7S%86
zCvgj$jIk`YTBXhkUaDFiSS0AN;sOGpcRSY3ZPjtYL$C{quN%v!4m}=u@bh}cejwbF
z<o4o~qj|9U&B-oE>^va`DEY|c=2NeZ#x3tn{fg%*Bl*Z_Y~2Z8{@N<b>BzMUiG^+U
zNY0P~`A8~K*vR7N=3w`-c!H$ymz!*PuuI;SB`H*K?|EP1Z2)3)kQ`ZcU;&T!N!tEC
z;6<C~VMkp_K)eAXj3?aPfErOQ?ia_mZwmz`Tg`L8oVIND?a~Ef=J+*xY(q6$5?mec
zJD_Yhv|rXJCid)&6v3kyc4ITmDqa4uGJ)PinA1l&eS#?6;N`xv-&tTkJgHN}V@pAq
zWBbWze|cMX<FaFyFU#he^!Trx_xnItJl@yuEoXEirW5C-2Ay?hiI~N(pVU_(wo87@
z=|t)~@N_jsR-Pr5Vi^Wo5_E@!lbUJ@P@C6Rz?^+l)Aj{}iwPE_!@+vkS1*~|#*r)<
z#KT)P%40+2#%iB`rxVtSq4+h?`rBpLTfL?R|ML&9D}><`a=o(EKD4aFICYxxtf>c@
z7E~=Opyu27wm7CCM97bprM)_@vSo0z#YHJ9E+`SR^8El*!%yB$*6tekW~=AM4YuAv
z)x#Yl$nLuUPn?2H`U{m&ahYfpqQL?m6X$GCY=jyi5~F?lY4-i!-n_{RQl5kz==s))
zopJJt$w9@d(__Q=zvQYh>~dJ!yMzvWVLnKDfLtxxi~ipPG4p>eZT_E8*uU7<|L-U)
z2g?@<%k)2>u(Fc>Ckjg^XlHHwf5pSH{x>}A-=OF}?5D-wSge857sqPhWc5YK{sXiA
zjl@cPA+h$>E>2$<?7vah|AT=2Z*W()e*>@o8+G;gB3%E4x~hM1um6y)e{rt=LRn@1
z3v~SpauxbQTmO@4bpZS)&Fc6?vKjzHwBY~>fd9f+|7KqQH^urFiTnSASO0QB|LxQM
zH@y0va_IjFUgcos{M!5Te`Hq^RJ@dx#PGZLFD42NbB@6}*f-1N%d6_7)U@V}bfz_V
zs-}qvd9fKuiTIHTNr?ilQ01)-kUXfWW3C`s1Neodk@Wm#+f=m9EDLqEmu;hMnv*Wt
zoJL6h1oN0}yqkS4r`}GC6WqT0bf?~WGvh-Jp<G{G<+zE8zVmu6rL`yr38T@?T#U#=
z&TU1)ZKM%li2a_pgfybc2KrKmA`|Eh9Es*S)6~`P6A=8kx?Bl?L4WdJ=puYMP<lg)
z{kYBO`9y-Jde8{2*zF3o5oGfc-EF`27AGbiFzLbz9ip%$-t{Nk)E*!Zq6F1A{RO%w
zP8nq_90Liu5=PSQjl>#Y?Sv845l|s4OU&m5?j`D(#$%Jk=Wd`YSS=yTb41>Taofvg
zh_}q~5IDAzw5w=0`Z_7q3iF2Xw#!_1r3T~WUfLnCrPy8QqXbxbNq+jQIey3kVE76a
zK)8c1e`^MlrGwITOob)6RQmW4W~bMdJa}S2Zm=?I@^YX%M%J6Ly+-6gWJE-N6%kDg
zY&*ViMYLP8Gg<naLDh#e6oTaB@MDrS;%Ic2b4Z|d4;h%#UI;hBzmzm#%g@2@8~e<K
z0m-%y;L7tm?|3Aa@3vr>_ovQGyz{nydn|%rFEFw=wm=J-``o#l7ygQ!20$0<Z9HnN
z^(xYRI0Szh#<pieV)+~gvIiJPlpj`{%>O(3fFS&`@DxG}LdW*Y*^|%3&}?o2e(zP(
zhl|eiH@AG?;J$ZK>BW9~th=Jb?j&1@9~9?TT|#y+_P`hw-SAI6b9n5yN44E9EGR(>
z8t2G3wkY8df|9W+6$?z7=SVK(r6p6AV@0esX5p_T%$XE4*3w3|Bj~4>L#WV^Y}Mw!
zx)?~*3Xm+ASUgtTbzMs(C8(|DMe#C?SO{w6b?{tFQH+>aVdo>%GTEI~apW3VoYN+8
zlqM<RxZLE}L(B7Vf=tn>nA}iZ6fzI7^J6U-7n@vS@d_)0WEv(D43Kd|2FFFcJG*pk
zCOJZq5gwDiHa5sMFW9_f%jOWe*E*9vmrg%%ZckUXUc^2@w^6m>B111l35uXqshq($
zfnkP;yQQ{HB*2aU-#bCjdUY_;+u(#*(J>xjn<@HJ(FQA7O08^#8Ck}mBv58)LQZ6Z
zoRx&r0B%#5ryaLm^1ZTp$Rpi`R;mWuj2zOKSpyEz(Ndii*10Sb8<Pb9zwP%LS_`40
zv=tv+Hze}&PJb5o7XLJdlASJ6LS{h<Sz-svA~_(*&E;r?QYt-na#&dvhnl){v}{kT
zJY}>lEKZO~79$&3u9$QHe={zO!V!3t*~R-$ZwIw0MqM__Bow6~h2OCrmW90B@a&x-
zFqJu~hDpP^<yfQA!$(p55oUSgh$+Q+>wBG3g9^DNvOI`FmGt11HqMGWFEvR<?GG_F
zXmlfMSOOk@LEi}WvAuk%z+235i=@0tp>Hl5%2rYu3M6yt%6j_Kd*I$d9AVDC9rgII
z_410MOB`LwK)&<Ql+p&rkx${DCK^GF6l2dvoJ#9Tm0|%H3A))NxUz~IJfawq<ir^p
z`6;H{*mY`)U;%TGQFi$`c;8kCQ7S-@-24fAo~O>Ye1zansz*i5SB7(Y)oE-u>f0S4
z8V}(-?o`Q{sCkv4F&@!DCnBV^--BMB(j*y%wNX<Ho8qmQ)W|9dP;`UJcX-`#;dj$k
zd@h8NqHmU~m&tb@(5>7tpQCJj!&1<tf;b^ccxLdHTp8P|B-+B@+#^-B3Ug=c!&qz?
z&BGF)6_?{?iwnrqD4c+jL6G!M4zf*CQnRZ-2oR-ZO}C`5bK^xf-;XD{w0M%~)&I2o
z-n92f`9ax@!Xp|jYIg!%=!24lgwrcLAR0mtsC$w2c@r|!FITG7uNfOz`%7~xoJ2$<
z&zi9k$*i#Wh|&?cp?hwdN_)H9z3uS<J;Mzw0@<1f7Yv;N`ppmWWulD`!3nHYn-bMw
zrEf*M&%$L^JIS<?@^bT!=kAZA5mV?6I8`z`FaTo@_syZ^vCN<)f~0VR_)QkuX656k
zC0%}r3}YB=J3SQbC|3uYl7)O1hgU7r&jidl@Y$1sbfuM^@U-Vm7KRCFy*KBtJxo5$
z^Ulj9kU{@^8xEsjx$}Z=j_zAeqw#|_oHFG5$u)lv-fL6^`Pi6z!^sRvx&;fh0{zW_
zy}+JRTPnDrqOmgH=FIlbo3<ap%b!@!I8XQP1=r+Oqjs*vSFyLZpGno-WW9OwX59GG
z2(E#TU6N$vN$9wy4JKs)&XpdA>+?OG{$57x-Iy<i$6`3@?&!_-J6f0h47J=?KJywP
zu=nK%E{s3dChU>cWdx`CY^bT|R801%DTC^|boz(eRrcB}wApoTCfxS<pLP1(8Z2^(
ztKxTSWw1cKrq4m=U9hyy*Fzr+&e<!x-$mCQ_vGMu;z2f2P%>X>pmqBXeL)+Iz=-1C
zhk}^OW%w@pM9c5Hwas1H<=^^(D71S&yPeo?Iiat}cGAG7OpAM+P^Z^h#U??WQI@WU
zTOq*4S}xQqoBZv+g9AH78vub*Z~zuNCNOXp2L7=8I7|!n6(ZUruZ22Zx<Issh2GGP
zxrF=%oyS?rR^9<yO-l)&C2b^oc{Ajai`P#3GKEZa&4xqK7~iL<iWEO7^*Wh#?G5GN
zj+dsllRzR}#uU@V7XE60kh(Tz%T0b&RWWR=f=^~Y(s&V<lCc{j<be*5R}I<-vCEsB
z+r|VQsJP3nNcK`jS-~6fCQWUp6B#ASa3Rm^%{O164_~Dd82}T(PE4-J0YS!(3j`7%
z{`w%$?-Od^<qz!;(7n+#L_|aby{;7zsL*U2HdJwLZnunmX+g2wcFx<#T3qEBs(&{+
zj81KJ>h7Mpbo1%H3<Akdv3UzLf}e1&;0dm7DfY4g==K5%bx|`(f{vP;-P!zt;ml>B
z90`jgkd7419;&d*xbkT$8PHIR4uh(C&D57qGvp&P<_oCj;+XkG9o?hYiJ08=8Gz_*
zKTok(T?_X%Nk7!x&F+C(Tb)YrHCTJI**0u0FTe(=R>NQS+sF&UPbHrPHEBQ_`||Yl
z*4arY6~xI!MWn#E1?qZ)Y~-dVFqNg9T05!EcZ&$8F_lj*gM24{P!OVk%^(9aPl5Kf
zvmx!C2cbDi>gHN-1YdIZ7d<cU+sH@~{3blCO-@U*ixTb>Dg~7+{BA{&8%kaFWyeCN
z<-K9_uZZ=ipy;Cv^q|)n6a!*VgG~!*;YeEw>;Xy>fzMe%$RHd;cw+3&z(KHq;y7{$
zvW>vzX7k*6p!6fqr-!%AvJ&BMaZOy0RX<i=YWLUN!f}-10^TK`#YEAM>h};MEWgEC
zVVY%k?}TvH!zpbS`~J#h+E2;a*0t3ImHKnfSsFDSJ+XKFrFXkG0RA-nhHnYJ3AQQY
z^3TcHg%yD<KA23t$zHUB_+X#Mrak-#oEdinQN7Rfy_B&|BrepR(~N|ymXa!$5#+4Y
z95m{7%$xqx<rNmpI0-wkmPlEAVpyj1sH<dsKBRxB&!oTW_eJjum6KLKdb8>78ej!;
zIHQK9TsgJXxGEgHAai=6*aM3LWzR0rbS2oj@Q35cJtYbT4mah@*$I6%=BF!l=JgS)
z6)c;1eMz|rdO-}I`TSA%hMA`C2~*~$mMUXsrD1o(&$*=b{Ed3YMzaH3c(H|~3lb-i
zLEt6GM)lHZ?iGTQK<AU_4y41h`l;mv%g2^D(X>!zvhxoe{m_zC6O<$L5Gy9F#kM;Q
zWNhxD`R0Y1XpxNfz4rnKx?tJ<Y(h0L^;W&`7zTup5jV0=aIyT4{5Vk_S-t(FXp?QJ
z`L@Nj!&5_zL5)ERH;qyP5Ior-j-M3WZkDW|Ct$b++CGeP!{Kw1%ryL_9v8o?INs0p
zmhXErV~<L2W4VS5jlrCQRc12ASsnQ_0%^aiQYU<CWl-Of5}tXFxdtH@!nLJVNt7p3
zD)W=1no2^!QV?-DE4_EolG?lVXPc(*#q-~tX=@w?rz@ByZqTQ56x!j~ou}nG=f`)t
zyvMyExamgo1YnC_bjAtMGhPd8J=5LWEaVSD3<1v@@Ia*9hD+GkSa>8hNtSav9}-T>
z0gz5=l7cHDu*=9hl~r;;LlPj!((McS2dHZ`<G|`j<JQ&td_*Rwcz^SuISaj@4)DnQ
z#5IrXruLX&kYJO}>T<dVX<>Lv9+cQUK!N&1x{u-O*e9(6_w)=IM%_}b><zYZe!&o1
zz=?9uSPNx{H3;YZlZ_jX8Ktr1lu_4Hg?~&-Nz%CR+XPKhUUAN`B=dMy&JM|?b5d!-
z_i)7AM7p4IQ&VYeyn?ed8~%mwVDXpiz<8v8Fh9>DUiGKcP4vo#OR|qRg}srDVMhM9
z{BOj~L4Sbi5Vv3lM`}5<Vj*r4l?@FvB}~bNE7mt$;MhCdmmc&^i+^7>^F%N7o)n@i
z$41Dx6nF2`cD4-a&irc5p@9#+y*}wS;PoQ&svjO#cQI@eB$HDanP<9xz&+v3L7q|Y
zjB+b^5dV(mOL}i^O0%rf)@+2Cee?U63;!iSXDoNjqayte)_r$k@J(b40WF-A_0ucA
z)R>Ha7Zscl!q9M9Ez8G`(YOicInj7Wq{Z4|vUX237f~I>{1%0`od|-%tR^yDNy)<W
z#BwO4%!=sWf+XQM0|`$hyMG{UpSamf*qJA6Gt&-X4>P}O%i&i6Dl4eVs4Zza)Pe2>
zfskCS^n5MD5$6Xmz&Q2>6|6l|4I*r$+0eMH_iD>pk1-&RNH9>t@?E@#cgX6<W0^A$
z-c@_FK`w%EF8f&#i^+3b0B@LWI}8a3I*7myv(7>n$qL%!tD1hQ9%&z-u)0gF-g&as
ziwE1`2M3U1KXBhAdtn*8m<D+hE-`>fbA2Rv4chB$_MI%jGV0;l`dDyn%R&e;y=4W*
zdN09q!5H66%2KeRJd~_|l07=ySE3xz|NM}GYaY5j+IjT#ihRo_shi1_33PaSFY3m>
zjT)wr%!`Akkz!5cS89Eom&su3-=?s46<9$GT7^?xhftG-2(7AIC{NyQ8nHDXG8Ru!
z%VUnseS7~f4(nR;@3am2kRSAhs+<z^YC#VPU{{BX^Y0U~RZ~Fq7aoqBBHUIOM*+W~
zCe`=L6d;fxl!|NJ{$X}ZdLlsZX7Q{<u>FcU8EGWgeOuCUfyL@~Ain2h5}4^ElT6XL
zV?12rjJvuZP>y6O<(F10Zd<LxqZwSl5hs#|Ml+3j!|aQ(V`x}Ac8%m4OiL5TnayDQ
zEn2YM2_SCHc(*h*9pQ(*<w0^Q5Pz*N8_lfk+3650(|*di`(7J@5;ZKfdxzx9?{-{+
zFjN+tCg&1>BQ$g&yKVGqNeFy62KZ8T30wX=Y&<Lmh4DT9F|XS{mmo_m;SJq8JVZUH
zH|y2XSj?V%0Z;j;4bn~Rd8AKVBZY%r85lJeKNUWZ@BN-8s&yhE-U7&in3bs!`;TI|
zBWmDxRV}(4(1pI)7Lc6C&|w6U>8T`09i5WIDg}6R^b3vMrIu9d^?9sWf*AtdE-cNb
zs1P{eGh|Ja)8=F;fz~^Mh-54IuSK#$VpbfN%Xmc_HljZecp!!*trP1`UGbJqElYpn
z5Ql+PhDwA=_#rZ^_e%`(genQsw>lxm#|-q-u|v7%(u!aJ8gnYcD;8ZFW!=n9Pn*`V
zwtroSE+KGpzZ!IR-;Uq<W_kF2e$J`T2S2k0;qt1Ek5o<xCs#vHR`f27|H(a4o3;Zo
z=%7h4exUeBLQ}{6+LN5?%T3Aq_TyfIxBz%negIMAMA=hdf6VKt6Cl==AHU6>=sVgS
ze4Z-X-uvd6B$2j^O7G@Sdb1hKn`3|W1NHkJW*BG<zwtU_&}O?%od<aK$`8}RcmsbW
ziLzzhq<t)PyYFVJQbYp}4DPpm9FUo9r(a!h)xdtzO?wI!{Yc^d<JkAA>x+l+P_Mq*
zC20iyrFM+g=GM08$N#5L*|fj@`{Psb(BsOSTV8&_#?iH_SKD`;&LI*4GR#?8Vd4aV
zvjIHp^jS&>(Y(wUfmr(?uW|-cs`_6Va&9&s{w54f>eexTYSt!FRu0b~^S|{{lm|&9
z^yZVWZdfYHF1nVzhE0AZ`5@X!8EB86yNtOSJCTM<l_MawH~f0_gC))wU1S5JzbIiu
z+3>5elAyS|kJ4%THS?n_b8{*K-e(&f`wXMGG`ciVzDQ*_5i^%|;lc*Iuhm3Ac%Gb1
zB2$sVjQD8nsc%^w+NJ<dABVHcy%Ie&9iEkCfKFDi%ZkvR#<jo_6(u}Q0pi}niinAs
z=&o31%w$4RHq+E}=CI))bcBRr&W3j{Li8@TpSz<JNk9@jM(ia-*uXw^&6bv0SRo-C
zc^be33<1dj2LWSHs<K<%SMcHI2nqL?x{klT*Yxz7+dQJ@f^21PDNfVirYXUEc!hu+
zqEIbXY`;T+s+y++&Shc)QLhi)huZzSCzAV?Up9;M)mwdf0xChD>}P-E-tqgT7{QE$
z`zvpVUm3`_s3($^;)V#ad!^RFSrD+)G)_<7UVMJ@6v!bp@iuN;V(y5=jPL6hfB2C8
zf;ua?NC>UNI3CSdNU8J=kYKetDsoT(k|84!{)|t=W~Pfs@m1;0^;mHiNGvzS$BmnN
zb_-e8|Eli0qM}-sKqX3)AW7m#&M?C;3^{|KNX`h7Gf2)VIVc%LGKh$xWD&_pa+V-b
zKv6)F1VK>X?LCSI_1tsreQUjs2dh{2?yj!tuBxux)6-KG7MV|UcwJTIx^WQ`O|RaS
zZ++{Z?g?iGy;OMTxH8w|8%RkspV)mbFHXP6C%B^}V%j6<Bet5!l^hQFJ+tzByky@9
zi2zJ^jbU3uSm_Kzw@qTH;U=rV?n2j+Nhz*U)#cmQJ4!Rj=DxNBb#@tMZ{B^o?DwgC
zZM+HU(D;6RO*Z2}SjoHR3g+@O#Q{$WJGihkoJ}+_2{l-~7#XU2>dqtep_yK1MAIsB
z*yvOqsEzVsKW(k#=Ch>WZ@76$InML|iqZXI<I|}FPG9qVxi6g81vfkM=0x8E-%V9M
zxG!@iVaP18AG=*Pj3c-$W^%+z-WtOunc-di5x3W7u1rA^<}}MU-ZQBcbun4D7APn`
z+%3XjS*F%KAcaZp=Bqqyd-d?hAZ~VT>3pI<#OVy#xpK-=Tdbrl&Sm=~(oderIwjDI
zOk-2pJbxzFa5I*#ZAQUnd&zt!s?IOUGdFyBg2&b9m1aP}hFF}6&H5nzoGM-Aiut{O
zo^y-BXxyIGibTEvW&Gx3u}|WxbG3S>E&Hts39Yj)y-GW+!>sl^sJ*uNX-JR#Aqyp`
zIN<pVEjqWds3weejxzVGiT^j*$6WFyH4pTR@a?+gI3=nNFlOXPGQawaV~8K%MVw3A
z-Zqq>?o7qnu)M_QN4)pOMHIH@&lLP<GDp|IMU{>Nx)qo*lbM2@lKEi%OY2x-mHrL}
zcCLv6@ag?&lV@>j%s9`^Wj4EVs$tez&DRfgq&#jF$cG9FJ!Ah|GOD+pWD3hS5r|OO
zS1AJYzs#G1>M6tQt{Iu+>v{^y>vwtk`kKqjE{^84#GWZZ2t4jy9A*Pz5~X%;V?Ja`
zQh^Z;bZ`=gX_1N2NO@M$!bU!y3cbQmPq1K|4`mi+4X91-<-Wu>of_Ftqy6GKOONXZ
zIlPh!hvaJk8`vB4(zuin$mn#&7trcuUdl=7Ys+>8QYz5}WwcR_q{>0+cNXl51kv}l
zReE*V>t>y&18%gj8Refot=QOj&eZ|^I@6c!X?6wj2a_rAq)rFZ4Q4vebG+rY>GX>N
z)ftz2mbR%mp82r4J|h$tGTks~D*mD<+vEoE?sJ(Fpc)N}I5j$7nDg@B<{O!Q>xT)o
zlVv=@?BcO0{ST4Pz3wH?k+!lv#yLyRo4BDKe~&=f#kR!u<M{`PJe2{a+$*bIVS~i-
z5m%6P^R{P2v$wc9e6MQJ>B43D<`RN9pH|P-JtSur;2ZiV8nUH|P{ZJ#{S=;lZ(PvT
zA1_Zgz)Oy%F>$D<4(Ew)R@W;W?y@tNDg3MH#vd#ckm;E_=54A85Vvxo;~c#hE^x=F
znC9O;ce?_@ruucimKow#tH7W<@tKp$NjqhJ^>cRJq23%el}WV2;8s#}B%^jz8Kr#G
z<e9Y83)zs*Em<vNV)KgAx6Lp$Z_}RH!j_U;Z&{nR8I-o<AzB!vCtm43U8?p?n|ZI(
zK!oj1MIcXnN2pjwMI>oWf*P6+86DmPJ6=A!9|SLaUK%%4oir!omaBY-T#&%UcT2dA
zEsB>5R$x~XJvN^=d6SJl<Z?<d|19{v>uql2a|4WyCY?y7%jiMF^2N=<`eNitm(%te
zur(Q^ypJA78pmEb4D2%%<Cg3<;0U)1)+ua#X6NHZxBtyU$v!l1^nkDJiTLx!U-3?d
zx!owx5z(nl@hkVcXvl*x>S*BOE*6F@&!TkxX6LO3^GnPztH>B=OxEid^LFWwmo6*z
z?Vb+p(3mX*b1B9>;!Dc;379%I3PPg=5RZcAg9Vz!y&eTuP9HuRc(8gj^Ui+(_@9Xv
z-CVC%I!v;INLmFPeA()M(?IR+gd?KJLpf<1|3;lq<>P60ab(Fmt2~0cOKEVGM+%(t
z$#>P!qq==JbMtL|9%9a5+#|f9yV-Ec>Zx#|3>BZDZ`ra>NauBG)1_UKOk?Q_kHn=`
z2g4WUzMQjxi-?KLqj?q=+vjZ~#Z_FM)GovMl|(kZ8auOO+oJ`svFy}rY*lpMYSgil
zUl^j&nlN_O-NBf$y=QbuoIIVDioo}#_0>j^o7*B;r5E0?pgq*2+jGv#>>Aab-Nq!r
zy+ix1{I*w-h0*G;q76kIf%s^^gLH*ELxk_rAvmshzOHe#GItg+J@4m~a7*gC1`BDQ
zI~5qk=*O#}cKf1osfLo0_Ia8(zP!yZT^UDgL_yGr*a%z?KDC<dc+tlc-q+qwyrg~W
zAM=%Mr@6CG?QXr%6DjiO=&lLt%B&4$kF*#OLdKzOuZr_p<m4(^F*oD8WUP5L^nz|J
zExugWrldTz*{bC}U;2{UO_enqos2+J5?6iT73((TMT-esS0<Tyg`yOeA^NNMu?igw
zaWu1hsS<@%v7_IFk3Iw{@%vmYwq}#Dbl~oKkSA^)vy`~A>G=L8`}%||^eSg@s6p{{
zO2?wOEjdz1GU6j9PD9`#rMX#_+0*y1fx}Xd%nxw?wV4kr!?p7f``;SZ@h24GZdS^_
zzu&ItKlU;ygzud|M+T8N<w8kS<fq=*0OH#9FW)YH$=Q@XAm!BKtm!-x%&}AR#w#v&
z5AQm(?asBT+P7N!0-5&x>mh2FFWxZ-RA%v4k*8T@3Vx@C+tBi~k<4o9p&NQeH`4ta
zYeP_5mm(IE>nFRnr?wb0Ul(&TCNjO^l%(id&C}7Gy!x@SEZPXsMe<r`1fn0#CxHxW
zHC!@dJEK0`lb|EvSZSDKXY>%OR|Q=bOM{MqA$+rcbYfm2+l5MoVIaUY1%FU<oU=(!
zC3~u(N!$2UM(oOj-^cmu4o6C!o~@p0rC0XTc=)mUto!Oi>#M)WqwS%S*2#R~HO=i)
zyJm)`HY4NQrYrD12s?v{qj<TFy&37I65ILObh9Mch@n0@41;pNh*3fne_B46G4|#x
z`u)-E9j<E$xVZM1gy>k=;*ITGWOR0)KRSxsA5SRr&**ZS@<-Z+U(e^#5X>oH&3X9h
z%d=@)hF6dIxq7HY>jVaj>m@O>BB2-P-Dfu0)_H~{mgw=e(Q1a|@hiutMkhi&sOan(
zFw-|r3z}aTP~G-}7Wa!#2eNIPS7Ml8BOxBSu%v{wF8(wmIoZtyA7Y;<88*tgMY^QA
zc@Ga-WCuMJTvSD<cuhNBK5Q>abu21QXa_%r!c<<db^Plb_xjv5dg}R}g@AxrPnQRy
z0eCN3?_$$)4@cx_XmOGYZp9@qI=?u@g`?YpPmk_Y9qjv(>N3OgU6HyA$#oU2(YWi=
zTJmu;0-i^fD+xEg1xez4Q=c3;_a)3MOfq^i-_6M(bq1d0x8x47BsSt5d%fyXqo(Ve
z#d7nKO6LnxZX?kY@eOP$CEWxD=nJkstBY-^mR3uBK>><ou@-d!Hti&87mHM$%cd-x
z@laB;4{h+he`Z)kj$DXjvo)L{Vc8lQm>jRIt*#qp^XUwJ%wwM3kR~*OnCFA~$m_8V
z-zY~eT-R6B<URb<KtRO=g!&qZnwR1cFQjCG$>+<5KIS&4c|*8e*Y+3-x#8+My;TW`
zP+p#}=aXH{TM#}g)|mBzxgpFbc4D7VZ;Y~vI0b9C`b+gf5@Ikem3c$`d}8e#8`>LG
zFGep8jlVC)7Hvd+zAi{+w^h0QNIG_cJGoh~OtxZD?IR1P!a>xxu=9FaD!VOC<wJwP
z28HxP#IVd^U0LZmO0N#_x3e1qI<77$-PO;^e8LtbeMzGlF-(R(Z^t$bGc?)R^o-4z
zwV(xh2}WMk7f?06ts(h<Uj6A8&M^3d*f7SfJ1K>L9dtKEhT|NWu59pr{RevO*sfMD
zO8uAIQFn~w4{l5FMcOLj+~e2B!Jkm^7S)7qEZw;<S?r#<vxQ9*X3RF3>{Vv<sx#)L
zM46ut!#ixiLkWxBy}4HWc<9U{KDkQ+S!!9YE*MPv%HZP^D&+=Y5r*!4RlEE~0wyal
zwqmzDHDD)fUeS2hv;6Vd43`YaZYtHCfkGSF#skuZd6~6}-g(4F&gEUL{ln<?a%40O
zwJ`Y?C4*JnSZQ=yzkKW=cSPD}itI`%$20rqpLB+K-pdHgS(-E{JybqOn0x#T&!S`^
zd*pex!IfOoyyz?D#OqJTxZQ@alqtt8s4FtQ-TbWTDq!xIei6+|g_Tc{8B+yTr4wl5
zL3aiFk~2bNe@=j;w`3Tj_7(O;It|0vTZ^`D9?fYt<z4Q(K-a|($!^xMS|#N`O;b&E
z;2Hl7W9hO*DdRl8Y~}Qtv6p12Mu|_Vk0XXiI36--S_5jtA+B~OQsc=ZsGYsPV6dMm
z$>)|ciM^Mz5%yWONbM3bu4mUnbyvuVtW_Hnj7|E?M%GOq=-hMesJUe7d+@L<c!gRm
zVC6N;PCOxzeqGtW4cS1Oy{~xwbuHK1P0@pZqEl!Qjn9@SWSlOm8YCa}#W5GjqHXe;
zJHAqN3MfnMv=XA7B3zfa!QZAZUWzqm689B9P><kND>{BwV-^l&O#1-U*Q-~B%9iQQ
ze?>muQQF<VEqKHHQ1K?(DW1bztiQSTa?-p0KVN(KFFn8s0e;#}x`0Cpe|G^Vj70pc
z2RK!gKd!xecmMYL#TOnZ=ojx#S8(8MoS&}XzTb2KoxE89{?b7IZH_3XYz`=AY(H<P
z_@Ml-`2t?oz{@D$RTLM%!P>DiweQzYz^f+KzuqwU9vt+qh@S!{UGo0Z4HE=EKi~xL
zA8(krYuW3aT_VpsB|t#YbTPN{l1T6qo7We+pL;IndderYCQX_(M&RHxa+Ap13<>cg
zZEmH(W=4~}sWeZD76=KVyoyCBFGcB7>*;8zJ34J(|Jvz^Npr}v;IG@(H){KL50DGu
zz`vg)#ry~KQa$c0aZ%ae7Fi*=sFzBwN|;-XBa!D1&Ni{ubDvj9qN1)MerMexu8Y(W
zY4%>5*_@I!ZN^+3{I>8i@+c#7t<ev6Y@Tq3xA3itT{6%7wIjas4|cW#5i$)yo-+RI
zWO&xNdNS;2DqCtV%2@AdMPNzaI^RJP^d>m_Gx1rRz0&MnZX0||tZcPMr=QJ`8}!17
z3Ij)Fs?>z+DeVVXhCT}wnbbr#qeb9vHj1Bp@8j*e&HZt2+`fOXmE#tJpP#p+5u?%m
z+^apyk?vjIhK(&_&ndjQu2>zrg)<vhZLl!%V-#iGM7;8EFYE~V@g^vK6=m{qYKcgW
zP40Iw=+9hDulDsIsB?X?^nuFL*fKs1w;XU39%$X6g@^Sxj?!AGBq-{>GP$~Xf#$ib
z=sl6ok2SQO6sd7QAHy_Lr5{9*4&_>Eakh6akb7qps*!aw-;-m@Ba=Hb^5FUGUDg05
zd5xs{&LI6^YjQGajt9QDyzvDo)W)9uRm$|~U71Hydp$F{jjGD;So2us6&W;H+#KpJ
zL<??M_<Cf<ry1tk@|!C-26$koPY;Z}89a?c+*j%n=ReUfpPPWef>)$$1nF15FPxC{
z*4rrTQG%(VXv-;l$)S(soeozrrIm8*WY3L6o#U!52#aJ`puL7ClixQvwvGRC2j4J!
zU=YnuWvs-0WvW0X;~~Y!@LigZP-V%h*X2&-9as$!cubG=2qH2Z9R#v{3uGr_1z2cV
z<x&W4ywNwFkU}J7a*T2e+F4pk)8D=SrWl9OX5^d7(x`*9Cv~M-d`4DL*9dbmZVV-i
zx>$ft!G=ipgN{qxhqb^-F=R;LWqOYCyBgHIdC>Q1<x6PR!iv>AhV04r88@2zB{DZI
zr{7c}9Bx~7?Z4*MPbP#gSJ_7!5=T!O&${`(PyYpFsaH?$tFk?v(&F1$d>=mCawEeN
zG>CI~!JIm$CP1qh(T8_2zC(`gjy#N83*Sn3+E7UDRN+Cz5}M%fK(nI_bR^BAV&bsN
z@6Mw;nJ!tCNQR+{3-m49ZZEqJCwOO@8Z4Y6w(t)R?h;jEKE=&V&L()dt>Js_c{kNS
zRq*1J3y-@9MRZ!`okN<_^;flL2xjAN3Sk&EzCBlR&T@bV5mYf|LS{mDU5;5Is(NDs
zYg=a4^CL!jn7?I~6U33zWJl`i)^j5M3DMvWa)aw61UmzZo(;1%OAbiPv}j3;iDQaC
zuh%ok(!b!#*rUNlI$j+?>ZuY0wwlzYdLs|7nOSU#`Ci}jJV^fX<SR#DFup4B?X6jl
zmCnujw{7Uppe9*NEgJZ;0yk9n%S98FYa)V~HHx%crOrk0_0-V}8U|B*aGL!<9ktwh
zFK<Von;Q*6gWhc{p{_D3S)1*f6+g56=3KoyO&#3!aFcgOr7JkLJ)*R6Wc3-*nvIDb
z#G9tGD5cie11syCF6|l<A8YE)YSZC8N=`gBxw%r8x!d=zU2ozQLtIkaOKj}73au;3
zD-G{;EUfdctGYBTBca@o`8rSfqKIFY-v%2IP4&Z$$3^zC(}^~_7EGF+Pp`rQLWpBA
zCG~b)r@P~75+t-<>ALT6A{?rHmly{pk3wy!Zy++NZiLWMJm0J|)o<5`Wg*SzXmI#C
z%gnrRp}tlvx&VKx%k^5`zJ)wg|2nKjq?5|_GK~G%qOE!q;#~ff135qR&S_~5Lm|^S
zkDwj)`*Rm=Y|}~14oaxL_L94=rO}&%<W{4grj(a!-4qadmnKm*6#-#V7-H~`_0ZbZ
zIYY`A;^~%t(~p?XQ2fHZZd1efu%(Cb&okY`#TT&Ilc?_v9N``b$asl_CJ>IFU#EA^
zWK<0OphPMtBes>nk$JvC2T2jBT!856bjY0;4yqWPS;oADb2W7muR-2;N^K#NWwPvJ
zf_X_uLa_4r!QfN6vo|w5Ius_*_+DItMLQm~7*VdiT?s1eX#U(MnIedADWnwTzFVy$
zTT}Ek=}ni*Q+ar&_<M?q(l~qWr+wY6WO@3^xH*?772DT5SJHRq^cr0Rh^ZT?G4u-k
zjMNQ1q^%!AN2v%a+U&~fi(NM@2wU7j=c;rO*>J8GR`M#oW&1A*aNLIbyd<AlFCH4-
zcv6)zIptsB`ElArvlE9-eDuj7hhBP!QY<}3ESn8c{@FDPf^o^y<&wGa&C)))VJY@q
z#3RgarO`;6&TJk4ixF$+mKwJ0vt>>Puexl}c;wUw8^g=+q7g5G#9cl~9~eGym1I7o
zfLVe(G5szLUL<3%zT24w@2XP!INC*es(KiY-CKWZR^^@^Y3<N17-12Iu(r0sT`h)@
zk*nHls=A9fTV7H&Gs;Igcwaw_f9Oe-MZay_kZi2Tblb&t(Q9&dwYfFL+MrBH|5m|Q
zyq((j;ij_+1Q@Rk1vGPQ)*CGg7}jmMx?qXMvs6TH+Aq7lHt5MG@J_4JvSt3<sx9xM
zmjhFH9-Xb2LH8*}NRqXoE$fDt(@OFDt`LJH-HqTkzC(u;Qe&D+8Dr9Bvsb;{PVwI6
zO=ydQ>c^Kh`4c-5y&X6rZk*}6(dv}BS|f@GIWt{5A{Jw^(nnqq@5s@1kKdufUF9hs
z$uiA3V$#^Q@Q_ZXPX}3Wy**~VChwQ{+mounxhru;n?`HWDp!1HXU18)t-bELc!mk4
zcc(wOXz%mI$ZJ$%X5!9%1RMuPPd@Gx8Y#i~5axLmDN&|4HXkWcob$LB_(Q^N)TBxo
z&B=LS!=DA8i+DUU9CspG8R>hYS9vsb)K|Cb)wjEKkm;;E5${0X*4>w2J(p!M5zKub
zq9^Wow)SH>Lss|#eay@~>b9`_hZD}ThkXVq!8SS{$uzPhwEZ+NmhH9il%gLfa6Hj8
z^N7-P6(+W8r8t*lU;w{dTRuJP#3oW}b##h~G=pbT+C;tDk+R-O`y5l`1v7`~q`Nos
zT9a>llF(a!BbbUSpkVFYzfn~a)97ec?Yuv+EnAdEUvWX+QNevKLE(mCFrl;k2s?L(
z`ncRd=p*Co4^7q7(It1Yqz<JPK5M=3*6C^H8ls%5sdOV^J?p~YY*dqVJNua|mmvw!
z^Jnxpw4qgjIbFAs+-U>ey?m{k+0!5ui8ZfLeJu-i3kxX{sEy7-QBzIFK;^j;9-(#v
zh(Md{z$R|au>3+Q=<$4%uVB$2+(s}&!B6=K#+jCz0eJT*OG$X<Z^5anjuwh+U>kfl
zChKYV{J1Cr4F`qL2eSHd?&U|^#E}Sq9S{?_cY4!>+_L8F!?2KJt>TWk6f!)>ZDf2^
zE;nNKU1=oE*uaI!Mau!UHB-Nw@C@67)0uHEEsI!2`7517h{K_8k?ZZjbVW(=7;z-~
zQCp;nF6_2v3Keg#6x7ma?9g_Tx8b<OK05R6v3^XT7^8Ex-8}w)XLb4G(~ML5xm!i2
znUZrO7e&iWGU_6|ydJ$Ac9gOpP6}qy7T(k6mt2-|awW<AmirM?p3lH#FMnKAPisd8
zt#uje*;>!7(d;9qYu}9cK1iG`A(%zD)wN04EK}QQOKIk7UCdV2;L}7e)v>!PTP6II
zAo+@OIf+i%n>BO^CAN0LY0JG24&OfIP+!K5ZxT*Q+p<;Xy`^3fnb;-COB#VG^H?hS
zF%}lvkjoN1^~5=)HUGqP)uJbQxty^i{u(LT>K%N%lIo1ja+b8@$*u=s3WVx2-ev0e
zsn0}m(F}S-Zei&OTBYD3xR_NK(@nIwC`b~h?_4<L%^E06u$M{iL!4DRitvtp;brN0
zow_yrIzdhdahFuXl`&aGE+#|gfes?}8a!@^+aHkK4tWYadZ{x>(TQ>2=<I<|4dIhp
zNA=YF87aY8O-(Il)6Xr1-G7#FmUabGvF$xt(Vf?=;WU!nZzC*>Of5r8$j-VX(ekoC
zFROD{<iXu=(lH$oTIXb#oe_t5^^mw_=pHn=>0KKWhGB=b9ymyHukDRhPN`UB<}Tbr
zvR2_HronqDuD(j;W?kHk@tks!?RMV^95)>6>1}+iDy8cfTT6LgCH~Egp^lvnxmV;o
zy<~J}OSr~|A8MO7lRht?lI$wW;9yd&vB%~O{905sz@1L0f^D^dkA@q*c?V{1%sTtJ
z%px3e?g%@!o~cf4x~W}+vzJ^fuC?zXN1!DKL!_>HXZ7HCmICcAo?p0BBkd>5?EK;e
zzn)OULa#37h#nc>D&|!#{#_)EO*HS<C9A1H1FmvnipLWEUzw8=cFj8z;Yn1&p_>Nn
zlYG8??f$oPV#G^?i~EeL;VVttMTj~Kp|p=9zB0v5_g%xE@Wxrmx^^z_+I&-qa_4<C
zfa^%AXYTe$^b?}8=_5-mqJa-dOuM*dzs^%Wq#usArEi31%@SI^e}r7VovpM`dL@M2
z&XlRp;}sHt=}TUJt(W-Ir97lLADdw41*I$U3h_6XckgE&eb8{~d7yrQ`&P8xw~9+z
z8kRDPHo89S3~=O|yOBGUmiH&nR-3y_y5u|rr45XoA9~6Nt=K<%TX<LGPQ0s7p%GpI
zxnhB*%w~V_kgeH6kt`z4ZSBHgDIUjR(XXcs4_aPUY~`M98EReK4hnuMMzP>nz~OSI
zTAGrcCEX6Yu-z5ye!4vC-X`R8Y{y35rJ4y20S{5QvfJ1zOHzpLJl=EZSD&|ZQm@v)
z!ihLPH&Z~#Dv{bwQ#VGZNSGB4&L(QkxK=N6Tba^-#bhmxAMJE`Uz{a?US41M9zP<p
zUBNw}f5>K75OA}9dN52TwZ4DErjd?^x+;{v+XKcikghe_ef|bhr}x>5vK#S<>}(O&
zXI!6K^KSPq#}-Rgy9+P2Iq)Xe6ADp(d}KcQnA(yNqV^$bN5*w>Sr?u}CVYD|Ty1-i
zXm_BXeUYf2-ZYapYvinP_I(O=nijVJUQw3t{NX77xfqXmf;utv=fz~7JVug`%!rza
zP%m!+gz}r`Z`K00Fk0%%c`{foi+sK2g2r+tMXzXZw!$Mn?PCkm$LPiZ|2Lm;G(3rA
z?dgYib_35_Ru151G~=B;-QV+6ELEDBxk0flzTv!^GZWpkuacy97-vC75Mq%mDNXrP
zkc_-GG``F1!J2Acf5&)_k+kLJd67L=NuH0ANrg7I&<!SR!{0xncP_Od>y;~)x#)OL
z&gGe%DD!T8BtbAVD1pwTnysezrP0CCW@4#fZY6Kb?JxXkH7d^SX(}FeEuy?#H|Eg&
z>JoIS<l~L;yhU;<!lD-WDJ2@lrxkCXE;7#g7RJaJs~@LpbeSZ_m-3p2DdVG@Xpt-y
zGFHYEs|HhAeDsE9E}XM2L8;-Tu`N@wD|_%rMl%kdQ?1;z4<oLs<saE?*lo*A@UCO~
zw-`80*qI5sP2LU09c%is8G>2TR_+*tn{rlQ%KD2?zu4LS$n~P0p6L3Q3MQV{kN7^_
z7EME-b($Bi%O`dx3auDNFVH$Kaj+=+G3RjHyeesMoq;EOcx!3(sMKgjS|#0w*10fJ
z)Gfn!VGVY6XK6Lp+T@|vj=^$9jEH#OeH>U6UJx3$Ob9U!<^{xg8ksVEnQIT3Lx?vs
ziDl+l!cGactJ|RoW2;Tjk2Tlb{;UxDcwywS<B{H5nRWWwv;#lu-QAso>-DjXFWI#t
zt@M_7L?YezlCL!&J67d%s(JQ^r|$}Swvu8_zoFP)a$JJHh>1shAWdHlw<bH?;cqD$
zrL1X&99Pb@F|4@5vz2$(6VFa$+w<XB^J;@DPE(UE<XAoZ<3%>ISrW|;;EMab(8l`S
zW^yvLtniiCF>$w*<rVucQFit7vTuQCV{=20uLLaO`2EVN7Wu130vB<sZe%T#-j5cO
zPMSvSeSVcZmXS9ZISHAVVJB)SnbJ-Tx2A@55Cn-8AvL)YZdp*~S-vWZqQ)h)jeN<D
z)$ZE-`r@3pC+X*11y@<fyXW@BT;WgrG<+?R)8!#tDw$u;_`hGwsl4nuS&}&AR(7R$
zPQQK#nq+GB+Flat9mDCjL)Sbu`z8W(8cArLsb!3+J<_&QBG*>6SIOgHyJQ%xmfhHq
zIBKwJ_o#f(vn>$Xr;~hoH(TKn>B>yjx5m}Nd6$N%4vKlV{`9fkK9?1lLo5w~g83uG
zOp*{WzQcI(BJqr&3CX)_H{%}_A<&sNdFF+UzS?gyrfP_!4ka}rXr=GbZl>70^tvQk
z*lroNRRBlFeOWHHLwG&uAadj#-MXO)?i(DFb()&b2UF82s$rz@5i@}mqO=rjizOA$
z$FfHppwE{kwdkU+uw!~w8Ps0QZWovh%^^yUgo;hk4%Fc2o*e<sb~i@r4nKb4J>yEH
z+fiQ|qp;1MpG!;P>bp6Wn1x?39Hk&Uz~#uxkyL%5rj)SUhI&G4wu8gcg@oHzH6<<d
z;tF{^UNhUd&NNYkmpfbt(nhOH<Jy|g7G)=VzL;WJ4kFMXs*c@FT41?l{xtnY)K`3E
zTZ~Nl^;6gOdoJN5;0x^IUOV!%@TKUxyxY$=7x{2wANRf!qxD`T5!br{36Y3FX*VyN
zSdroozX-K21p;Uihr!BXnC5wbXGbebO%KIH+qvE`3B77~mO)|BkeO!8&P$wC;G?Tz
zLdw`Vf5!RgW(Sjd5oYm{7A73?J<$-xRZNa=IO#F{Z;bSwtdM_rpqpfu#vhsvx5@H-
zca+o^`Bk*oF=uW4_4>wG<(K+2F(<yGVh6rrD(E1Yj0~*eo?o83uD+GBzE#uU(Bpi~
zTX<X-ZYOmRG7l{Acw)mm%UeQsUsy5jM&2lWQrn@s){3OJ3NqlE8!1@DgOCVyUA%hP
z=Z*g0I=0fBV&(l7r<eLpUNtmh4uz~V&r-Nqv0p=OiOGBmGo004AI*#Uq^#(8LH<!S
zQ<!wg3$bUlc)H2-W$1VNGf7>-Eku{ld-SY|SS#mea%HK<dgY`XIz~hZoNr(5SDh|g
zBl++^>7u)hbKD(jwfBw)0r(`Zmq^y(CrR9$>CdOdoQMi^vW%p@mTr9bkTa^bOt^JG
zCVp|G^s$+z=&p2_T3L$-u@iof9^cSnu=s;@@%9aVuYun9)hT{No5@UCkKR;|6c;f=
zroNF+$>!{qbMm;g^=pL&oIbOdz@0^6`rKlO9u9)N#x78%cab_r=k-(dcOtj?ir7T9
zdFvR&uiS188Q<2iAkpTG|3c+*+wV|iE#D@~L|K(O^u2!)d%f~?rnnVv$wj{zeAc%L
zgvxZO**$)PGT}RHFAlWy<#(zu7S0&;+!-+sW33KFbJq+{4w}ZZOvZZzH=G$2gyAGD
zui6#I*x-aNab2|-_WDe1bg#DCY^FTL+(=roa{5a6osfNPrfjc)AxQ#fmCJmrhdOhV
zqmczK6YMTcW;>3e<(5u2N#(W>kEqgFG*BEarNv695SSjSHO^thIGv>nWi8GhA#9%Z
zG&v<AG8sT3X0fel+$_tn>YDwqhn454!0;n3`v-!Xc9tU&m)VmfonAa9(k$K2DLBuo
z$1E2b%iJ*5Ok`hM*-O}l{n_Hw{+%`M_O+B=%8;^G_iLZ_1O?q9jU*Kq?6nfGfmZ4p
z3>H)(Q^k2CH1j)y#;JnkPk+1ve;mSjM_N7n$tpEbs8kPdeP6A4ND_?=Tla2*y!{TR
zUqnFs^cL_Va%hd)Qq31@y>9|XQ)HR^FNaMTpB8wHWGhiu7(B|ODx+X?w4;=N!Cow3
zgO{5A&{M$5vGiW5%YkKZ3M-Yy72`WzfRkPKNOq6i6fGCijcREde~WJ+k>|`OkiuQj
z`8lwmhD&BaB-gLP2Nrhs0s@O}l9waHCqJP1MK`3B`b6p`hKR1^2=FXC;ZuY0<c+9d
ztKeJNvDc@cdEs&$#^e+Ex@PYk-B)3n^-#79NyDSq*#>liQ%#2@@qd03a`GtuuP;J=
zKeQ+0`yRVS0XWWAuyu8F2fuoN01uadU)Q3_FhSsJ3SC<ZcN;f|p^y*~@}Ckv1SZJ;
zOY85?g#W4Qf2#ir9f*oh0QgZeoF54h<mX2vB=8J&g(CSOU>lfFZ3sAOEZ{TP5eC43
z^@PVA|0xH7Q5^szf<F=*4u=TCpb$bK7z}~{f&hUDRfa+#f`SNC8GJ^K0{DjLxDENE
z3_gQ!KM{Zr2%t0A048C8!f_d_M-3eq37EqX!l>bcWkPT$;P6l8V8ij0ehwdi0m~qN
zj@!T-#RIT|05CMvJb_BE0X4)QWe_<WU@8oF26I6;Fj5d1Fw&n>I5~W<0o4iY_%8`H
zh2vo!=O>5wZ)HOGk6|7I3IH;O3x4N;5CWJAkc3a_1Y8*MQxZ^siGo1I&jcb9LO|fc
zfCPX>Bn&_Vw8Mk|B?9UNfZ$X@2qa46AVF|?C{08u2Z#tn0OSZLAmbk+1L8ydSPnnr
z3o__<2p|w43gVbmD0zTF1kixv03pC0V7w`?{Iea<8c=gk7(mSi8$cu|Y+#RLp@8|Z
z9v$}va}WlV0BNEm`LhCO0EKZ9_@Bx^<STh6b7u=%Cu@j+5bBred@`nPmf%;V5WfE$
z3JYxiD;^iX-QRxX4x%~^(DYxJE#S-2|1ZpzprGKd$^qK0ll%rnDk$__X+XaJ&vxrr
zSRj(02|y|g#C7|*W{;(fvSFb40T(qWb-);)lny9^Z9mNs_zb{(x7>h=pzPKU;|C)9
zsd(T6*b_B&5F;=LK_p-uf2i+w+Y9I}sIDLuFh>D_69=A;nQ>eO83dM5i~(}OpPhiQ
zqB{O)1Sz9{07NLHzygB7fVBZGBq0CAa2*d5%#Rz6JO7@8$WEreH(bX<1gCK_f%PX7
z(Dt{6OA!8j{zAZK0x+RC3eFETN5CL_XEDH1&^rCsrb_^zCjf{ZG+ie-^xbrUI`Ute
zE`an;F@sb5Zo7^rdvd7%v+V+r{KWn9r3$DKN|iuCpGe2b3g$l*5+z7Ln8)gKJe+^Z
z|J`=|gYS~x4H)QW<)oL6lM#mh3j+o?>iGY{fWd*4bS(1YeHRS+eF>v96_6xCNbvuD
z-*qf75Xo@@2?_&*36EcAKUL(%>+M+jU}tctg6-g{14nog_PYTDI-#Zj0Dv7qq$ohJ
z{>M^1-W7p4{D)xyk^kH}f>b~xU=HfsF;BoUn2zgDt~n6q`@ZXkHXnC99x|AN2}KnE
zh5<Z4ZE}9>yHF+=#RG6@fO7}(<GCM?;P?C(>2dz|<_n<qd&mFu{P*Sy+%5q~{-5u=
zKq7=7gFxl@PsR(}Vu5c?6psKtfjk1=WhlJ>5r6<cWqrcPf|d(p6xjC1uImJk2#<GN
zC_r$RcTDPJeyq#K`LU?JTP|QsKP!MTs0_z||Cax|<@(3#XTRGn@Uq-V+jTPP?0;dq
zfDeX$?Eyi%r$KmP4~U9`%7co6dLl$C5IpsN+Ta0>p#Fiz1xp7{OLtpyQ<Q6|lVtwK
zeWdVzN9F_t)TZ~>o$B#Gfl#uxR#uikTvKyP;6pQnpO4oGh<^$Z=5um(ax`_d2R6;F
zmhK*|P7tWT-_*g7e9{)SKz}z|H^M6?Y5w_g`6rsr?iQ9-5F|hyRpLX1Rs~7^sDQwP
ze-@!9i2@(|VBevCCI5%$)J&~`u)Jzu2v>Iqu-;HApke9e?BNPd{kwkg$pU+R0Kg6M
z-J=x{{?{D{K?~slKDVEk9I(6jT{Hd#J@j|{!29U?2>zbHpWOQw0>G;Wh41GCpx_Dt
zwEXX90Gtr~k23&_=dT0+d+<*LPI>_QzCizN2H&rE{v`s~51##p8T`3y{*Ay7j{Ia1
z?1v%vdjcpO`E}KR1l$PuF4|fEYX!v*Kt(|=0OvZW48>Lr2n;1$z+8frfFYCxf=B~_
zoC*0<EG=wJQ30AkaR~|wLXdFSFU#gnyC!Q2gk*NM26Y#peyqBG-Gl`;<$sA%77UpT
z1g@3?wU%8@1UMFf0)GNfAwghw0$iyDB6M4Lm|MC+*rm-~oy|<$A#%2E?zTY4V^@d(
zFFy=o<?ISkbM^urRZPuoo!p(>Y=Cak9>A$H&<XHkcg;o-4%DD1fmPDit~prhI=kAt
zi9mp(I7?SuS6jf_9Rvwc(1!6Kd4+hP0JxSd5DOZ@u4ZZ?t*N96)ciF8Z&ynzLSUN$
zB?MklKmH&HK|ujQh!x~#9cYcgKZw(D9Rd!Vd;D4lM<Nk`TK)<L7XtYFTO9%>1aSHn
zI5-@E1cdo(ogh*eVDGPWLQsA{u)o$J1;F+8OC1zAo&i?bFLl7X8`vlPTE~wN1l8tO
zIHWM}cK@}GA0Y%T@?YTikwQX$_JxDm_zN5y`8PC#`GJF|U*Y(H>HaYfC=@uP`V|f?
z3<b6>zt%yaFyY_nLIs52zteyV!+_6@zx5SB3jRSC0TudPmT+MKVCVB&Ujz*K2VEgy
z;otj0kx<}3_P4%B0sh~|2Sp;`zr(?V1weBL{{7THn6MDAL;JN3h{P@QJ3eq~f655)
zhrYm(LV(8qiVrR<DERwW;KGQLGIDn{1p<h>5{iid2j;fEKn#1}NL<6&*&R4l0L>2&
z(%s3*8Q7!$c#wk_ioswOP<~+f@bg<)@x$O|7UpnEb0H|qN*FF|W)2gU_;(1D(Q<P)
Vb#+HAUpR1x2_s}-kylk9{6Fg**QEde

diff --git a/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
deleted file mode 100644
index 8dfefbd67b..0000000000
--- a/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
-	IASIOThiscallResolver.cpp see the comments in iasiothiscallresolver.h for
-    the top level description - this comment describes the technical details of
-    the implementation.
-
-    The latest version of this file is available from:
-    http://www.audiomulch.com/~rossb/code/calliasio
-
-    please email comments to Ross Bencina <rossb@audiomulch.com>
-
-    BACKGROUND
-
-    The IASIO interface declared in the Steinberg ASIO 2 SDK declares
-    functions with no explicit calling convention. This causes MSVC++ to default
-    to using the thiscall convention, which is a proprietary convention not
-    implemented by some non-microsoft compilers - notably borland BCC,
-    C++Builder, and gcc. MSVC++ is the defacto standard compiler used by
-    Steinberg. As a result of this situation, the ASIO sdk will compile with
-    any compiler, however attempting to execute the compiled code will cause a
-    crash due to different default calling conventions on non-Microsoft
-    compilers.
-
-    IASIOThiscallResolver solves the problem by providing an adapter class that
-    delegates to the IASIO interface using the correct calling convention
-    (thiscall). Due to the lack of support for thiscall in the Borland and GCC
-    compilers, the calls have been implemented in assembly language.
-
-    A number of macros are defined for thiscall function calls with different
-    numbers of parameters, with and without return values - it may be possible
-    to modify the format of these macros to make them work with other inline
-    assemblers.
-
-
-    THISCALL DEFINITION
-
-    A number of definitions of the thiscall calling convention are floating
-    around the internet. The following definition has been validated against
-    output from the MSVC++ compiler:
-
-    For non-vararg functions, thiscall works as follows: the object (this)
-    pointer is passed in ECX. All arguments are passed on the stack in
-    right to left order. The return value is placed in EAX. The callee
-    clears the passed arguments from the stack.
-
-
-    FINDING FUNCTION POINTERS FROM AN IASIO POINTER
-
-    The first field of a COM object is a pointer to its vtble. Thus a pointer
-    to an object implementing the IASIO interface also points to a pointer to
-    that object's vtbl. The vtble is a table of function pointers for all of
-    the virtual functions exposed by the implemented interfaces.
-
-    If we consider a variable declared as a pointer to IASO:
-
-    IASIO *theAsioDriver
-
-    theAsioDriver points to:
-
-    object implementing IASIO
-    {
-        IASIOvtbl *vtbl
-        other data
-    }
-
-    in other words, theAsioDriver points to a pointer to an IASIOvtbl
-
-    vtbl points to a table of function pointers:
-
-    IASIOvtbl ( interface IASIO : public IUnknown )
-    {
-    (IUnknown functions)
-    0   virtual HRESULT STDMETHODCALLTYPE (*QueryInterface)(REFIID riid, void **ppv) = 0;
-    4   virtual ULONG STDMETHODCALLTYPE (*AddRef)() = 0;
-    8   virtual ULONG STDMETHODCALLTYPE (*Release)() = 0;      
-
-    (IASIO functions)
-    12	virtual ASIOBool (*init)(void *sysHandle) = 0;
-    16	virtual void (*getDriverName)(char *name) = 0;
-    20	virtual long (*getDriverVersion)() = 0;
-    24	virtual void (*getErrorMessage)(char *string) = 0;
-    28	virtual ASIOError (*start)() = 0;
-    32	virtual ASIOError (*stop)() = 0;
-    36	virtual ASIOError (*getChannels)(long *numInputChannels, long *numOutputChannels) = 0;
-    40	virtual ASIOError (*getLatencies)(long *inputLatency, long *outputLatency) = 0;
-    44	virtual ASIOError (*getBufferSize)(long *minSize, long *maxSize,
-            long *preferredSize, long *granularity) = 0;
-    48	virtual ASIOError (*canSampleRate)(ASIOSampleRate sampleRate) = 0;
-    52	virtual ASIOError (*getSampleRate)(ASIOSampleRate *sampleRate) = 0;
-    56	virtual ASIOError (*setSampleRate)(ASIOSampleRate sampleRate) = 0;
-    60	virtual ASIOError (*getClockSources)(ASIOClockSource *clocks, long *numSources) = 0;
-    64	virtual ASIOError (*setClockSource)(long reference) = 0;
-    68	virtual ASIOError (*getSamplePosition)(ASIOSamples *sPos, ASIOTimeStamp *tStamp) = 0;
-    72	virtual ASIOError (*getChannelInfo)(ASIOChannelInfo *info) = 0;
-    76	virtual ASIOError (*createBuffers)(ASIOBufferInfo *bufferInfos, long numChannels,
-            long bufferSize, ASIOCallbacks *callbacks) = 0;
-    80	virtual ASIOError (*disposeBuffers)() = 0;
-    84	virtual ASIOError (*controlPanel)() = 0;
-    88	virtual ASIOError (*future)(long selector,void *opt) = 0;
-    92	virtual ASIOError (*outputReady)() = 0;
-    };
-
-    The numbers in the left column show the byte offset of each function ptr
-    from the beginning of the vtbl. These numbers are used in the code below
-    to select different functions.
-
-    In order to find the address of a particular function, theAsioDriver
-    must first be dereferenced to find the value of the vtbl pointer:
-
-    mov     eax, theAsioDriver
-    mov     edx, [theAsioDriver]  // edx now points to vtbl[0]
-
-    Then an offset must be added to the vtbl pointer to select a
-    particular function, for example vtbl+44 points to the slot containing
-    a pointer to the getBufferSize function.
-
-    Finally vtbl+x must be dereferenced to obtain the value of the function
-    pointer stored in that address:
-
-    call    [edx+44]    // call the function pointed to by
-                        // the value in the getBufferSize field of the vtbl
-
-
-    SEE ALSO
-
-    Martin Fay's OpenASIO DLL at http://www.martinfay.com solves the same
-    problem by providing a new COM interface which wraps IASIO with an
-    interface that uses portable calling conventions. OpenASIO must be compiled
-    with MSVC, and requires that you ship the OpenASIO DLL with your
-    application.
-
-    
-    ACKNOWLEDGEMENTS
-
-    Ross Bencina: worked out the thiscall details above, wrote the original
-    Borland asm macros, and a patch for asio.cpp (which is no longer needed).
-    Thanks to Martin Fay for introducing me to the issues discussed here,
-    and to Rene G. Ceballos for assisting with asm dumps from MSVC++.
-
-    Antti Silvast: converted the original calliasio to work with gcc and NASM
-    by implementing the asm code in a separate file.
-
-	Fraser Adams: modified the original calliasio containing the Borland inline
-    asm to add inline asm for gcc i.e. Intel syntax for Borland and AT&T syntax
-    for gcc. This seems a neater approach for gcc than to have a separate .asm
-    file and it means that we only need one version of the thiscall patch.
-
-    Fraser Adams: rewrote the original calliasio patch in the form of the
-    IASIOThiscallResolver class in order to avoid modifications to files from
-    the Steinberg SDK, which may have had potential licence issues.
-
-    Andrew Baldwin: contributed fixes for compatibility problems with more
-    recent versions of the gcc assembler.
-*/
-
-
-// We only need IASIOThiscallResolver at all if we are on Win32. For other
-// platforms we simply bypass the IASIOThiscallResolver definition to allow us
-// to be safely #include'd whatever the platform to keep client code portable
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-
-
-// If microsoft compiler we can call IASIO directly so IASIOThiscallResolver
-// is not used.
-#if !defined(_MSC_VER)
-
-
-#include <new>
-#include <assert.h>
-
-// We have a mechanism in iasiothiscallresolver.h to ensure that asio.h is
-// #include'd before it in client code, we do NOT want to do this test here.
-#define iasiothiscallresolver_sourcefile 1
-#include "iasiothiscallresolver.h"
-#undef iasiothiscallresolver_sourcefile
-
-// iasiothiscallresolver.h redefines ASIOInit for clients, but we don't want
-// this macro defined in this translation unit.
-#undef ASIOInit
-
-
-// theAsioDriver is a global pointer to the current IASIO instance which the
-// ASIO SDK uses to perform all actions on the IASIO interface. We substitute
-// our own forwarding interface into this pointer.
-extern IASIO* theAsioDriver;
-
-
-// The following macros define the inline assembler for BORLAND first then gcc
-
-#if defined(__BCPLUSPLUS__) || defined(__BORLANDC__)          
-
-
-#define CALL_THISCALL_0( resultName, thisPtr, funcOffset )\
-    void *this_ = (thisPtr);                                                \
-    __asm {                                                                 \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-        mov     resultName, eax       ;                                     \
-    }
-
-
-#define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 )\
-    void *this_ = (thisPtr);                                                \
-    __asm {                                                                 \
-        mov     eax, param1           ;                                     \
-        push    eax                   ;                                     \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-    }
-
-
-#define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 )\
-    void *this_ = (thisPtr);                                                \
-    __asm {                                                                 \
-        mov     eax, param1           ;                                     \
-        push    eax                   ;                                     \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-        mov     resultName, eax       ;                                     \
-    }
-
-
-#define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 )\
-    void *this_ = (thisPtr);                                                \
-    void *doubleParamPtr_ (&param1);                                        \
-    __asm {                                                                 \
-        mov     eax, doubleParamPtr_  ;                                     \
-        push    [eax+4]               ;                                     \
-        push    [eax]                 ;                                     \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-        mov     resultName, eax       ;                                     \
-    }
-
-
-#define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 )\
-    void *this_ = (thisPtr);                                                \
-    __asm {                                                                 \
-        mov     eax, param2           ;                                     \
-        push    eax                   ;                                     \
-        mov     eax, param1           ;                                     \
-        push    eax                   ;                                     \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-        mov     resultName, eax       ;                                     \
-    }
-
-
-#define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\
-    void *this_ = (thisPtr);                                                \
-    __asm {                                                                 \
-        mov     eax, param4           ;                                     \
-        push    eax                   ;                                     \
-        mov     eax, param3           ;                                     \
-        push    eax                   ;                                     \
-        mov     eax, param2           ;                                     \
-        push    eax                   ;                                     \
-        mov     eax, param1           ;                                     \
-        push    eax                   ;                                     \
-        mov     ecx, this_            ;                                     \
-        mov     eax, [ecx]            ;                                     \
-        call    [eax+funcOffset]      ;                                     \
-        mov     resultName, eax       ;                                     \
-    }
-
-
-#elif defined(__GNUC__)
-
-
-#define CALL_THISCALL_0( resultName, thisPtr, funcOffset )                  \
-    __asm__ __volatile__ ("movl (%1), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx)\n\t"                  \
-                          :"=a"(resultName) /* Output Operands */           \
-                          :"c"(thisPtr)     /* Input Operands */            \
-                         );                                                 \
-
-
-#define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 )                 \
-    __asm__ __volatile__ ("pushl %0\n\t"                                    \
-                          "movl (%1), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx)\n\t"                  \
-                          :                 /* Output Operands */           \
-                          :"r"(param1),     /* Input Operands */            \
-                           "c"(thisPtr)                                     \
-                         );                                                 \
-
-
-#define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 )          \
-    __asm__ __volatile__ ("pushl %1\n\t"                                    \
-                          "movl (%2), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx)\n\t"                  \
-                          :"=a"(resultName) /* Output Operands */           \
-                          :"r"(param1),     /* Input Operands */            \
-                           "c"(thisPtr)                                     \
-                          );                                                \
-
-
-#define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 )   \
-    __asm__ __volatile__ ("pushl 4(%1)\n\t"                                 \
-                          "pushl (%1)\n\t"                                  \
-                          "movl (%2), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx);\n\t"                 \
-                          :"=a"(resultName) /* Output Operands */           \
-                          :"a"(&param1),    /* Input Operands */            \
-                           /* Note: Using "r" above instead of "a" fails */ \
-                           /* when using GCC 3.3.3, and maybe later versions*/\
-                           "c"(thisPtr)                                     \
-                          );                                                \
-
-
-#define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 )  \
-    __asm__ __volatile__ ("pushl %1\n\t"                                    \
-                          "pushl %2\n\t"                                    \
-                          "movl (%3), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx)\n\t"                  \
-                          :"=a"(resultName) /* Output Operands */           \
-                          :"r"(param2),     /* Input Operands */            \
-                           "r"(param1),                                     \
-                           "c"(thisPtr)                                     \
-                          );                                                \
-
-
-#define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\
-    __asm__ __volatile__ ("pushl %1\n\t"                                    \
-                          "pushl %2\n\t"                                    \
-                          "pushl %3\n\t"                                    \
-                          "pushl %4\n\t"                                    \
-                          "movl (%5), %%edx\n\t"                            \
-                          "call *"#funcOffset"(%%edx)\n\t"                  \
-                          :"=a"(resultName) /* Output Operands */           \
-                          :"r"(param4),     /* Input Operands  */           \
-                           "r"(param3),                                     \
-                           "r"(param2),                                     \
-                           "r"(param1),                                     \
-                           "c"(thisPtr)                                     \
-                          );                                                \
-
-#endif
-
-
-
-// Our static singleton instance.
-IASIOThiscallResolver IASIOThiscallResolver::instance;
-
-// Constructor called to initialize static Singleton instance above. Note that
-// it is important not to clear that_ incase it has already been set by the call
-// to placement new in ASIOInit().
-IASIOThiscallResolver::IASIOThiscallResolver()
-{
-}
-
-// Constructor called from ASIOInit() below
-IASIOThiscallResolver::IASIOThiscallResolver(IASIO* that)
-: that_( that )
-{
-}
-
-// Implement IUnknown methods as assert(false). IASIOThiscallResolver is not
-// really a COM object, just a wrapper which will work with the ASIO SDK.
-// If you wanted to use ASIO without the SDK you might want to implement COM
-// aggregation in these methods.
-HRESULT STDMETHODCALLTYPE IASIOThiscallResolver::QueryInterface(REFIID riid, void **ppv)
-{
-    (void)riid;     // suppress unused variable warning
-
-    assert( false ); // this function should never be called by the ASIO SDK.
-
-    *ppv = NULL;
-    return E_NOINTERFACE;
-}
-
-ULONG STDMETHODCALLTYPE IASIOThiscallResolver::AddRef()
-{
-    assert( false ); // this function should never be called by the ASIO SDK.
-
-    return 1;
-}
-
-ULONG STDMETHODCALLTYPE IASIOThiscallResolver::Release()
-{
-    assert( false ); // this function should never be called by the ASIO SDK.
-    
-    return 1;
-}
-
-
-// Implement the IASIO interface methods by performing the vptr manipulation
-// described above then delegating to the real implementation.
-ASIOBool IASIOThiscallResolver::init(void *sysHandle)
-{
-    ASIOBool result;
-    CALL_THISCALL_1( result, that_, 12, sysHandle );
-    return result;
-}
-
-void IASIOThiscallResolver::getDriverName(char *name)
-{
-    CALL_VOID_THISCALL_1( that_, 16, name );
-}
-
-long IASIOThiscallResolver::getDriverVersion()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 20 );
-    return result;
-}
-
-void IASIOThiscallResolver::getErrorMessage(char *string)
-{
-     CALL_VOID_THISCALL_1( that_, 24, string );
-}
-
-ASIOError IASIOThiscallResolver::start()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 28 );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::stop()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 32 );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getChannels(long *numInputChannels, long *numOutputChannels)
-{
-    ASIOBool result;
-    CALL_THISCALL_2( result, that_, 36, numInputChannels, numOutputChannels );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getLatencies(long *inputLatency, long *outputLatency)
-{
-    ASIOBool result;
-    CALL_THISCALL_2( result, that_, 40, inputLatency, outputLatency );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getBufferSize(long *minSize, long *maxSize,
-        long *preferredSize, long *granularity)
-{
-    ASIOBool result;
-    CALL_THISCALL_4( result, that_, 44, minSize, maxSize, preferredSize, granularity );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::canSampleRate(ASIOSampleRate sampleRate)
-{
-    ASIOBool result;
-    CALL_THISCALL_1_DOUBLE( result, that_, 48, sampleRate );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getSampleRate(ASIOSampleRate *sampleRate)
-{
-    ASIOBool result;
-    CALL_THISCALL_1( result, that_, 52, sampleRate );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::setSampleRate(ASIOSampleRate sampleRate)
-{    
-    ASIOBool result;
-    CALL_THISCALL_1_DOUBLE( result, that_, 56, sampleRate );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getClockSources(ASIOClockSource *clocks, long *numSources)
-{
-    ASIOBool result;
-    CALL_THISCALL_2( result, that_, 60, clocks, numSources );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::setClockSource(long reference)
-{
-    ASIOBool result;
-    CALL_THISCALL_1( result, that_, 64, reference );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp)
-{
-    ASIOBool result;
-    CALL_THISCALL_2( result, that_, 68, sPos, tStamp );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::getChannelInfo(ASIOChannelInfo *info)
-{
-    ASIOBool result;
-    CALL_THISCALL_1( result, that_, 72, info );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::createBuffers(ASIOBufferInfo *bufferInfos,
-        long numChannels, long bufferSize, ASIOCallbacks *callbacks)
-{
-    ASIOBool result;
-    CALL_THISCALL_4( result, that_, 76, bufferInfos, numChannels, bufferSize, callbacks );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::disposeBuffers()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 80 );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::controlPanel()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 84 );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::future(long selector,void *opt)
-{
-    ASIOBool result;
-    CALL_THISCALL_2( result, that_, 88, selector, opt );
-    return result;
-}
-
-ASIOError IASIOThiscallResolver::outputReady()
-{
-    ASIOBool result;
-    CALL_THISCALL_0( result, that_, 92 );
-    return result;
-}
-
-
-// Implement our substitute ASIOInit() method
-ASIOError IASIOThiscallResolver::ASIOInit(ASIODriverInfo *info)
-{
-    // To ensure that our instance's vptr is correctly constructed, even if
-    // ASIOInit is called prior to main(), we explicitly call its constructor
-    // (potentially over the top of an existing instance). Note that this is
-    // pretty ugly, and is only safe because IASIOThiscallResolver has no
-    // destructor and contains no objects with destructors.
-    new((void*)&instance) IASIOThiscallResolver( theAsioDriver );
-
-    // Interpose between ASIO client code and the real driver.
-    theAsioDriver = &instance;
-
-    // Note that we never need to switch theAsioDriver back to point to the
-    // real driver because theAsioDriver is reset to zero in ASIOExit().
-
-    // Delegate to the real ASIOInit
-	return ::ASIOInit(info);
-}
-
-
-#endif /* !defined(_MSC_VER) */
-
-#endif /* Win32 */
-
diff --git a/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.h
deleted file mode 100644
index 2ecfed799a..0000000000
--- a/libs/portaudio/src/hostapi/asio/iasiothiscallresolver.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// ****************************************************************************
-// File:			IASIOThiscallResolver.h
-// Description:     The IASIOThiscallResolver class implements the IASIO
-//					interface and acts as a proxy to the real IASIO interface by
-//                  calling through its vptr table using the thiscall calling
-//                  convention. To put it another way, we interpose
-//                  IASIOThiscallResolver between ASIO SDK code and the driver.
-//                  This is necessary because most non-Microsoft compilers don't
-//                  implement the thiscall calling convention used by IASIO.
-//
-//					iasiothiscallresolver.cpp contains the background of this
-//					problem plus a technical description of the vptr
-//                  manipulations.
-//
-//					In order to use this mechanism one simply has to add
-//					iasiothiscallresolver.cpp to the list of files to compile
-//                  and #include <iasiothiscallresolver.h>
-//
-//					Note that this #include must come after the other ASIO SDK
-//                  #includes, for example:
-//
-//					#include <windows.h>
-//					#include <asiosys.h>
-//					#include <asio.h>
-//					#include <asiodrivers.h>
-//					#include <iasiothiscallresolver.h>
-//
-//					Actually the important thing is to #include
-//                  <iasiothiscallresolver.h> after <asio.h>. We have
-//                  incorporated a test to enforce this ordering.
-//
-//					The code transparently takes care of the interposition by
-//                  using macro substitution to intercept calls to ASIOInit()
-//                  and ASIOExit(). We save the original ASIO global
-//                  "theAsioDriver" in our "that" variable, and then set
-//                  "theAsioDriver" to equal our IASIOThiscallResolver instance.
-//
-// 					Whilst this method of resolving the thiscall problem requires
-//					the addition of #include <iasiothiscallresolver.h> to client
-//                  code it has the advantage that it does not break the terms
-//                  of the ASIO licence by publishing it. We are NOT modifying
-//                  any Steinberg code here, we are merely implementing the IASIO
-//					interface in the same way that we would need to do if we
-//					wished to provide an open source ASIO driver.
-//
-//					For compilation with MinGW -lole32 needs to be added to the
-//                  linker options. For BORLAND, linking with Import32.lib is
-//                  sufficient.
-//
-//					The dependencies are with: CoInitialize, CoUninitialize,
-//					CoCreateInstance, CLSIDFromString - used by asiolist.cpp
-//					and are required on Windows whether ThiscallResolver is used
-//					or not.
-//
-//					Searching for the above strings in the root library path
-//					of your compiler should enable the correct libraries to be
-//					identified if they aren't immediately obvious.
-//
-//                  Note that the current implementation of IASIOThiscallResolver
-//                  is not COM compliant - it does not correctly implement the
-//                  IUnknown interface. Implementing it is not necessary because
-//                  it is not called by parts of the ASIO SDK which call through
-//                  theAsioDriver ptr. The IUnknown methods are implemented as
-//                  assert(false) to ensure that the code fails if they are
-//                  ever called.
-// Restrictions:	None. Public Domain & Open Source distribute freely
-//					You may use IASIOThiscallResolver commercially as well as
-//                  privately.
-//					You the user assume the responsibility for the use of the
-//					files, binary or text, and there is no guarantee or warranty,
-//					expressed or implied, including but not limited to the
-//					implied warranties of merchantability and fitness for a
-//					particular purpose. You assume all responsibility and agree
-//					to hold no entity, copyright holder or distributors liable
-//					for any loss of data or inaccurate representations of data
-//					as a result of using IASIOThiscallResolver.
-// Version:         1.4 Added separate macro CALL_THISCALL_1_DOUBLE from
-//                  Andrew Baldwin, and volatile for whole gcc asm blocks,
-//                  both for compatibility with newer gcc versions. Cleaned up
-//                  Borland asm to use one less register.
-//                  1.3 Switched to including assert.h for better compatibility.
-//                  Wrapped entire .h and .cpp contents with a check for
-//                  _MSC_VER to provide better compatibility with MS compilers.
-//                  Changed Singleton implementation to use static instance
-//                  instead of freestore allocated instance. Removed ASIOExit
-//                  macro as it is no longer needed.
-//                  1.2 Removed semicolons from ASIOInit and ASIOExit macros to
-//                  allow them to be embedded in expressions (if statements).
-//                  Cleaned up some comments. Removed combase.c dependency (it
-//                  doesn't compile with BCB anyway) by stubbing IUnknown.
-//                  1.1 Incorporated comments from Ross Bencina including things
-//					such as changing name from ThiscallResolver to
-//					IASIOThiscallResolver, tidying up the constructor, fixing
-//					a bug in IASIOThiscallResolver::ASIOExit() and improving
-//					portability through the use of conditional compilation
-//					1.0 Initial working version.
-// Created:			6/09/2003
-// Authors:         Fraser Adams
-//                  Ross Bencina
-//                  Rene G. Ceballos
-//                  Martin Fay
-//                  Antti Silvast
-//                  Andrew Baldwin
-//
-// ****************************************************************************
-
-
-#ifndef included_iasiothiscallresolver_h
-#define included_iasiothiscallresolver_h
-
-// We only need IASIOThiscallResolver at all if we are on Win32. For other
-// platforms we simply bypass the IASIOThiscallResolver definition to allow us
-// to be safely #include'd whatever the platform to keep client code portable
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-
-
-// If microsoft compiler we can call IASIO directly so IASIOThiscallResolver
-// is not used.
-#if !defined(_MSC_VER)
-
-
-// The following is in order to ensure that this header is only included after
-// the other ASIO headers (except for the case of iasiothiscallresolver.cpp).
-// We need to do this because IASIOThiscallResolver works by eclipsing the
-// original definition of ASIOInit() with a macro (see below).
-#if !defined(iasiothiscallresolver_sourcefile)
-	#if !defined(__ASIO_H)
-	#error iasiothiscallresolver.h must be included AFTER asio.h
-	#endif
-#endif
-
-#include <windows.h>
-#include <asiodrvr.h> /* From ASIO SDK */
-
-
-class IASIOThiscallResolver : public IASIO {
-private:
-	IASIO* that_; // Points to the real IASIO
-
-	static IASIOThiscallResolver instance; // Singleton instance
-
-	// Constructors - declared private so construction is limited to
-    // our Singleton instance
-    IASIOThiscallResolver();
-	IASIOThiscallResolver(IASIO* that);
-public:
-
-    // Methods from the IUnknown interface. We don't fully implement IUnknown
-    // because the ASIO SDK never calls these methods through theAsioDriver ptr.
-    // These methods are implemented as assert(false).
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppv);
-    virtual ULONG STDMETHODCALLTYPE AddRef();
-    virtual ULONG STDMETHODCALLTYPE Release();
-
-    // Methods from the IASIO interface, implemented as forwarning calls to that.
-	virtual ASIOBool init(void *sysHandle);
-	virtual void getDriverName(char *name);
-	virtual long getDriverVersion();
-	virtual void getErrorMessage(char *string);
-	virtual ASIOError start();
-	virtual ASIOError stop();
-	virtual ASIOError getChannels(long *numInputChannels, long *numOutputChannels);
-	virtual ASIOError getLatencies(long *inputLatency, long *outputLatency);
-	virtual ASIOError getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity);
-	virtual ASIOError canSampleRate(ASIOSampleRate sampleRate);
-	virtual ASIOError getSampleRate(ASIOSampleRate *sampleRate);
-	virtual ASIOError setSampleRate(ASIOSampleRate sampleRate);
-	virtual ASIOError getClockSources(ASIOClockSource *clocks, long *numSources);
-	virtual ASIOError setClockSource(long reference);
-	virtual ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp);
-	virtual ASIOError getChannelInfo(ASIOChannelInfo *info);
-	virtual ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks);
-	virtual ASIOError disposeBuffers();
-	virtual ASIOError controlPanel();
-	virtual ASIOError future(long selector,void *opt);
-	virtual ASIOError outputReady();
-
-    // Class method, see ASIOInit() macro below.
-    static ASIOError ASIOInit(ASIODriverInfo *info); // Delegates to ::ASIOInit
-};
-
-
-// Replace calls to ASIOInit with our interposing version.
-// This macro enables us to perform thiscall resolution simply by #including
-// <iasiothiscallresolver.h> after the asio #includes (this file _must_ be
-// included _after_ the asio #includes)
-
-#define ASIOInit(name) IASIOThiscallResolver::ASIOInit((name))
-
-
-#endif /* !defined(_MSC_VER) */
-
-#endif /* Win32 */
-
-#endif /* included_iasiothiscallresolver_h */
-
-
diff --git a/libs/portaudio/src/hostapi/asio/pa_asio.cpp b/libs/portaudio/src/hostapi/asio/pa_asio.cpp
deleted file mode 100644
index 4b3fb68e0e..0000000000
--- a/libs/portaudio/src/hostapi/asio/pa_asio.cpp
+++ /dev/null
@@ -1,3023 +0,0 @@
-/*
- * $Id: pa_asio.cpp 1230 2007-06-15 16:16:33Z rossb $
- * Portable Audio I/O Library for ASIO Drivers
- *
- * Author: Stephane Letz
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 2000-2002 Stephane Letz, Phil Burk, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/* Modification History
-
-        08-03-01 First version : Stephane Letz
-        08-06-01 Tweaks for PC, use C++, buffer allocation, Float32 to Int32 conversion : Phil Burk
-        08-20-01 More conversion, PA_StreamTime, Pa_GetHostError : Stephane Letz
-        08-21-01 PaUInt8 bug correction, implementation of ASIOSTFloat32LSB and ASIOSTFloat32MSB native formats : Stephane Letz
-        08-24-01 MAX_INT32_FP hack, another Uint8 fix : Stephane and Phil
-        08-27-01 Implementation of hostBufferSize < userBufferSize case, better management of the ouput buffer when
-                 the stream is stopped : Stephane Letz
-        08-28-01 Check the stream pointer for null in bufferSwitchTimeInfo, correct bug in bufferSwitchTimeInfo when
-                 the stream is stopped : Stephane Letz
-        10-12-01 Correct the PaHost_CalcNumHostBuffers function: computes FramesPerHostBuffer to be the lowest that
-                 respect requested FramesPerUserBuffer and userBuffersPerHostBuffer : Stephane Letz
-        10-26-01 Management of hostBufferSize and userBufferSize of any size : Stephane Letz
-        10-27-01 Improve calculus of hostBufferSize to be multiple or divisor of userBufferSize if possible : Stephane and Phil
-        10-29-01 Change MAX_INT32_FP to (2147483520.0f) to prevent roundup to 0x80000000 : Phil Burk
-        10-31-01 Clear the ouput buffer and user buffers in PaHost_StartOutput, correct bug in GetFirstMultiple : Stephane Letz
-        11-06-01 Rename functions : Stephane Letz
-        11-08-01 New Pa_ASIO_Adaptor_Init function to init Callback adpatation variables, cleanup of Pa_ASIO_Callback_Input: Stephane Letz
-        11-29-01 Break apart device loading to debug random failure in Pa_ASIO_QueryDeviceInfo ; Phil Burk
-        01-03-02 Desallocate all resources in PaHost_Term for cases where Pa_CloseStream is not called properly :  Stephane Letz
-        02-01-02 Cleanup, test of multiple-stream opening : Stephane Letz
-        19-02-02 New Pa_ASIO_loadDriver that calls CoInitialize on each thread on Windows : Stephane Letz
-        09-04-02 Correct error code management in PaHost_Term, removes various compiler warning : Stephane Letz
-        12-04-02 Add Mac includes for <Devices.h> and <Timer.h> : Phil Burk
-        13-04-02 Removes another compiler warning : Stephane Letz
-        30-04-02 Pa_ASIO_QueryDeviceInfo bug correction, memory allocation checking, better error handling : D Viens, P Burk, S Letz
-        12-06-02 Rehashed into new multi-api infrastructure, added support for all ASIO sample formats : Ross Bencina
-        18-06-02 Added pa_asio.h, PaAsio_GetAvailableLatencyValues() : Ross B.
-        21-06-02 Added SelectHostBufferSize() which selects host buffer size based on user latency parameters : Ross Bencina
-        ** NOTE  maintanance history is now stored in CVS **
-*/
-
-/** @file
-	@ingroup hostapi_src
-
-    Note that specific support for paInputUnderflow, paOutputOverflow and
-    paNeverDropInput is not necessary or possible with this driver due to the
-    synchronous full duplex double-buffered architecture of ASIO.
-
-    @todo check that CoInitialize()/CoUninitialize() are always correctly
-        paired, even in error cases.
-
-    @todo implement host api specific extension to set i/o buffer sizes in frames
-
-    @todo implement ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable
-
-    @todo implement IsFormatSupported
-
-    @todo work out how to implement stream stoppage from callback and
-            implement IsStreamActive properly. Stream stoppage could be implemented
-            using a high-priority thread blocked on an Event which is signalled
-            by the callback. Or, we could just call ASIO stop from the callback
-            and see what happens.
-
-    @todo rigorously check asio return codes and convert to pa error codes
-
-    @todo Different channels of a multichannel stream can have different sample
-            formats, but we assume that all are the same as the first channel for now.
-            Fixing this will require the block processor to maintain per-channel
-            conversion functions - could get nasty.
-
-    @todo investigate whether the asio processNow flag needs to be honoured
-
-    @todo handle asioMessages() callbacks in a useful way, or at least document
-            what cases we don't handle.
-
-    @todo miscellaneous other FIXMEs
-
-    @todo provide an asio-specific method for setting the systems specific
-        value (aka main window handle) - check that this matches the value
-        passed to PaAsio_ShowControlPanel, or remove it entirely from
-        PaAsio_ShowControlPanel. - this would allow PaAsio_ShowControlPanel
-        to be called for the currently open stream (at present all streams
-        must be closed).
-*/
-
-
-
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-//#include <values.h>
-
-#include <windows.h>
-#include <mmsystem.h>
-
-#include "portaudio.h"
-#include "pa_asio.h"
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_debugprint.h"
-
-/* This version of pa_asio.cpp is currently only targetted at Win32,
-   It would require a few tweaks to work with pre-OS X Macintosh.
-   To make configuration easier, we define WIN32 here to make sure
-   that the ASIO SDK knows this is Win32.
-*/
-#ifndef WIN32
-#define WIN32
-#endif
-
-#include "asiosys.h"
-#include "asio.h"
-#include "asiodrivers.h"
-#include "iasiothiscallresolver.h"
-
-/*
-#if MAC
-#include <Devices.h>
-#include <Timer.h>
-#include <Math64.h>
-#else
-*/
-/*
-#include <math.h>
-#include <windows.h>
-#include <mmsystem.h>
-*/
-/*
-#endif
-*/
-
-/* external references */
-extern AsioDrivers* asioDrivers ;
-bool loadAsioDriver(char *name);
-
-
-/* We are trying to be compatible with CARBON but this has not been thoroughly tested. */
-/* not tested at all since new code was introduced. */
-#define CARBON_COMPATIBLE  (0)
-
-
-
-
-/* prototypes for functions declared in this file */
-
-extern "C" PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex );
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-/* our ASIO callback functions */
-
-static void bufferSwitch(long index, ASIOBool processNow);
-static ASIOTime *bufferSwitchTimeInfo(ASIOTime *timeInfo, long index, ASIOBool processNow);
-static void sampleRateChanged(ASIOSampleRate sRate);
-static long asioMessages(long selector, long value, void* message, double* opt);
-
-static ASIOCallbacks asioCallbacks_ =
-    { bufferSwitch, sampleRateChanged, asioMessages, bufferSwitchTimeInfo };
-
-
-#define PA_ASIO_SET_LAST_HOST_ERROR( errorCode, errorText ) \
-    PaUtil_SetLastHostErrorInfo( paASIO, errorCode, errorText )
-
-
-static void PaAsio_SetLastSystemError( DWORD errorCode )
-{
-    LPVOID lpMsgBuf;
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-        NULL,
-        errorCode,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR) &lpMsgBuf,
-        0,
-        NULL
-    );
-    PaUtil_SetLastHostErrorInfo( paASIO, errorCode, (const char*)lpMsgBuf );
-    LocalFree( lpMsgBuf );
-}
-
-#define PA_ASIO_SET_LAST_SYSTEM_ERROR( errorCode ) \
-    PaAsio_SetLastSystemError( errorCode )
-
-
-static const char* PaAsio_GetAsioErrorText( ASIOError asioError )
-{
-    const char *result;
-
-    switch( asioError ){
-        case ASE_OK:
-        case ASE_SUCCESS:           result = "Success"; break;
-        case ASE_NotPresent:        result = "Hardware input or output is not present or available"; break;
-        case ASE_HWMalfunction:     result = "Hardware is malfunctioning"; break;
-        case ASE_InvalidParameter:  result = "Input parameter invalid"; break;
-        case ASE_InvalidMode:       result = "Hardware is in a bad mode or used in a bad mode"; break;
-        case ASE_SPNotAdvancing:    result = "Hardware is not running when sample position is inquired"; break;
-        case ASE_NoClock:           result = "Sample clock or rate cannot be determined or is not present"; break;
-        case ASE_NoMemory:          result = "Not enough memory for completing the request"; break;
-        default:                    result = "Unknown ASIO error"; break;
-    }
-
-    return result;
-}
-
-
-#define PA_ASIO_SET_LAST_ASIO_ERROR( asioError ) \
-    PaUtil_SetLastHostErrorInfo( paASIO, asioError, PaAsio_GetAsioErrorText( asioError ) )
-
-
-
-
-// Atomic increment and decrement operations
-#if MAC
-	/* need to be implemented on Mac */
-	inline long PaAsio_AtomicIncrement(volatile long* v) {return ++(*const_cast<long*>(v));}
-	inline long PaAsio_AtomicDecrement(volatile long* v) {return --(*const_cast<long*>(v));}
-#elif WINDOWS
-	inline long PaAsio_AtomicIncrement(volatile long* v) {return InterlockedIncrement(const_cast<long*>(v));}
-	inline long PaAsio_AtomicDecrement(volatile long* v) {return InterlockedDecrement(const_cast<long*>(v));}
-#endif
-
-
-
-typedef struct PaAsioDriverInfo
-{
-    ASIODriverInfo asioDriverInfo;
-    long inputChannelCount, outputChannelCount;
-    long bufferMinSize, bufferMaxSize, bufferPreferredSize, bufferGranularity;
-    bool postOutput;
-}
-PaAsioDriverInfo;
-
-
-/* PaAsioHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    void *systemSpecific;
-    
-    /* the ASIO C API only allows one ASIO driver to be open at a time,
-        so we keep track of whether we have the driver open here, and
-        use this information to return errors from OpenStream if the
-        driver is already open.
-
-        openAsioDeviceIndex will be PaNoDevice if there is no device open
-        and a valid pa_asio (not global) device index otherwise.
-
-        openAsioDriverInfo is populated with the driver info for the
-        currently open device (if any)
-    */
-    PaDeviceIndex openAsioDeviceIndex;
-    PaAsioDriverInfo openAsioDriverInfo;
-}
-PaAsioHostApiRepresentation;
-
-
-/*
-    Retrieve <driverCount> driver names from ASIO, returned in a char**
-    allocated in <group>.
-*/
-static char **GetAsioDriverNames( PaUtilAllocationGroup *group, long driverCount )
-{
-    char **result = 0;
-    int i;
-
-    result =(char**)PaUtil_GroupAllocateMemory(
-            group, sizeof(char*) * driverCount );
-    if( !result )
-        goto error;
-
-    result[0] = (char*)PaUtil_GroupAllocateMemory(
-            group, 32 * driverCount );
-    if( !result[0] )
-        goto error;
-
-    for( i=0; i<driverCount; ++i )
-        result[i] = result[0] + (32 * i);
-
-    asioDrivers->getDriverNames( result, driverCount );
-
-error:
-    return result;
-}
-
-
-static PaSampleFormat AsioSampleTypeToPaNativeSampleFormat(ASIOSampleType type)
-{
-    switch (type) {
-        case ASIOSTInt16MSB:
-        case ASIOSTInt16LSB:
-                return paInt16;
-
-        case ASIOSTFloat32MSB:
-        case ASIOSTFloat32LSB:
-        case ASIOSTFloat64MSB:
-        case ASIOSTFloat64LSB:
-                return paFloat32;
-
-        case ASIOSTInt32MSB:
-        case ASIOSTInt32LSB:
-        case ASIOSTInt32MSB16:
-        case ASIOSTInt32LSB16:
-        case ASIOSTInt32MSB18:
-        case ASIOSTInt32MSB20:
-        case ASIOSTInt32MSB24:
-        case ASIOSTInt32LSB18:
-        case ASIOSTInt32LSB20:
-        case ASIOSTInt32LSB24:
-                return paInt32;
-
-        case ASIOSTInt24MSB:
-        case ASIOSTInt24LSB:
-                return paInt24;
-
-        default:
-                return paCustomFormat;
-    }
-}
-
-void AsioSampleTypeLOG(ASIOSampleType type)
-{
-    switch (type) {
-        case ASIOSTInt16MSB:  PA_DEBUG(("ASIOSTInt16MSB\n"));  break;
-        case ASIOSTInt16LSB:  PA_DEBUG(("ASIOSTInt16LSB\n"));  break;
-        case ASIOSTFloat32MSB:PA_DEBUG(("ASIOSTFloat32MSB\n"));break;
-        case ASIOSTFloat32LSB:PA_DEBUG(("ASIOSTFloat32LSB\n"));break;
-        case ASIOSTFloat64MSB:PA_DEBUG(("ASIOSTFloat64MSB\n"));break;
-        case ASIOSTFloat64LSB:PA_DEBUG(("ASIOSTFloat64LSB\n"));break;
-        case ASIOSTInt32MSB:  PA_DEBUG(("ASIOSTInt32MSB\n"));  break;
-        case ASIOSTInt32LSB:  PA_DEBUG(("ASIOSTInt32LSB\n"));  break;
-        case ASIOSTInt32MSB16:PA_DEBUG(("ASIOSTInt32MSB16\n"));break;
-        case ASIOSTInt32LSB16:PA_DEBUG(("ASIOSTInt32LSB16\n"));break;
-        case ASIOSTInt32MSB18:PA_DEBUG(("ASIOSTInt32MSB18\n"));break;
-        case ASIOSTInt32MSB20:PA_DEBUG(("ASIOSTInt32MSB20\n"));break;
-        case ASIOSTInt32MSB24:PA_DEBUG(("ASIOSTInt32MSB24\n"));break;
-        case ASIOSTInt32LSB18:PA_DEBUG(("ASIOSTInt32LSB18\n"));break;
-        case ASIOSTInt32LSB20:PA_DEBUG(("ASIOSTInt32LSB20\n"));break;
-        case ASIOSTInt32LSB24:PA_DEBUG(("ASIOSTInt32LSB24\n"));break;
-        case ASIOSTInt24MSB:  PA_DEBUG(("ASIOSTInt24MSB\n"));  break;
-        case ASIOSTInt24LSB:  PA_DEBUG(("ASIOSTInt24LSB\n"));  break;
-        default:              PA_DEBUG(("Custom Format%d\n",type));break;
-
-    }
-}
-
-static int BytesPerAsioSample( ASIOSampleType sampleType )
-{
-    switch (sampleType) {
-        case ASIOSTInt16MSB:
-        case ASIOSTInt16LSB:
-            return 2;
-
-        case ASIOSTFloat64MSB:
-        case ASIOSTFloat64LSB:
-            return 8;
-
-        case ASIOSTFloat32MSB:
-        case ASIOSTFloat32LSB:
-        case ASIOSTInt32MSB:
-        case ASIOSTInt32LSB:
-        case ASIOSTInt32MSB16:
-        case ASIOSTInt32LSB16:
-        case ASIOSTInt32MSB18:
-        case ASIOSTInt32MSB20:
-        case ASIOSTInt32MSB24:
-        case ASIOSTInt32LSB18:
-        case ASIOSTInt32LSB20:
-        case ASIOSTInt32LSB24:
-            return 4;
-
-        case ASIOSTInt24MSB:
-        case ASIOSTInt24LSB:
-            return 3;
-
-        default:
-            return 0;
-    }
-}
-
-
-static void Swap16( void *buffer, long shift, long count )
-{
-    unsigned short *p = (unsigned short*)buffer;
-    unsigned short temp;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-    {
-        temp = *p;
-        *p++ = (unsigned short)((temp<<8) | (temp>>8));
-    }
-}
-
-static void Swap24( void *buffer, long shift, long count )
-{
-    unsigned char *p = (unsigned char*)buffer;
-    unsigned char temp;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-    {
-        temp = *p;
-        *p = *(p+2);
-        *(p+2) = temp;
-        p += 3;
-    }
-}
-
-#define PA_SWAP32_( x ) ((x>>24) | ((x>>8)&0xFF00) | ((x<<8)&0xFF0000) | (x<<24));
-
-static void Swap32( void *buffer, long shift, long count )
-{
-    unsigned long *p = (unsigned long*)buffer;
-    unsigned long temp;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-    {
-        temp = *p;
-        *p++ = PA_SWAP32_( temp);
-    }
-}
-
-static void SwapShiftLeft32( void *buffer, long shift, long count )
-{
-    unsigned long *p = (unsigned long*)buffer;
-    unsigned long temp;
-
-    while( count-- )
-    {
-        temp = *p;
-        temp = PA_SWAP32_( temp);
-        *p++ = temp << shift;
-    }
-}
-
-static void ShiftRightSwap32( void *buffer, long shift, long count )
-{
-    unsigned long *p = (unsigned long*)buffer;
-    unsigned long temp;
-
-    while( count-- )
-    {
-        temp = *p >> shift;
-        *p++ = PA_SWAP32_( temp);
-    }
-}
-
-static void ShiftLeft32( void *buffer, long shift, long count )
-{
-    unsigned long *p = (unsigned long*)buffer;
-    unsigned long temp;
-
-    while( count-- )
-    {
-        temp = *p;
-        *p++ = temp << shift;
-    }
-}
-
-static void ShiftRight32( void *buffer, long shift, long count )
-{
-    unsigned long *p = (unsigned long*)buffer;
-    unsigned long temp;
-
-    while( count-- )
-    {
-        temp = *p;
-        *p++ = temp >> shift;
-    }
-}
-
-#define PA_SWAP_( x, y ) temp=x; x = y; y = temp;
-
-static void Swap64ConvertFloat64ToFloat32( void *buffer, long shift, long count )
-{
-    double *in = (double*)buffer;
-    float *out = (float*)buffer;
-    unsigned char *p;
-    unsigned char temp;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-    {
-        p = (unsigned char*)in;
-        PA_SWAP_( p[0], p[7] );
-        PA_SWAP_( p[1], p[6] );
-        PA_SWAP_( p[2], p[5] );
-        PA_SWAP_( p[3], p[4] );
-
-        *out++ = (float) (*in++);
-    }
-}
-
-static void ConvertFloat64ToFloat32( void *buffer, long shift, long count )
-{
-    double *in = (double*)buffer;
-    float *out = (float*)buffer;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-        *out++ = (float) (*in++);
-}
-
-static void ConvertFloat32ToFloat64Swap64( void *buffer, long shift, long count )
-{
-    float *in = ((float*)buffer) + (count-1);
-    double *out = ((double*)buffer) + (count-1);
-    unsigned char *p;
-    unsigned char temp;
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-    {
-        *out = *in--;
-
-        p = (unsigned char*)out;
-        PA_SWAP_( p[0], p[7] );
-        PA_SWAP_( p[1], p[6] );
-        PA_SWAP_( p[2], p[5] );
-        PA_SWAP_( p[3], p[4] );
-
-        out--;
-    }
-}
-
-static void ConvertFloat32ToFloat64( void *buffer, long shift, long count )
-{
-    float *in = ((float*)buffer) + (count-1);
-    double *out = ((double*)buffer) + (count-1);
-    (void) shift; /* unused parameter */
-
-    while( count-- )
-        *out-- = *in--;
-}
-
-#ifdef MAC
-#define PA_MSB_IS_NATIVE_
-#undef PA_LSB_IS_NATIVE_
-#endif
-
-#ifdef WINDOWS
-#undef PA_MSB_IS_NATIVE_
-#define PA_LSB_IS_NATIVE_
-#endif
-
-typedef void PaAsioBufferConverter( void *, long, long );
-
-static void SelectAsioToPaConverter( ASIOSampleType type, PaAsioBufferConverter **converter, long *shift )
-{
-    *shift = 0;
-    *converter = 0;
-
-    switch (type) {
-        case ASIOSTInt16MSB:
-            /* dest: paInt16, no conversion necessary, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap16;
-            #endif
-            break;
-        case ASIOSTInt16LSB:
-            /* dest: paInt16, no conversion necessary, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap16;
-            #endif
-            break;
-        case ASIOSTFloat32MSB:
-            /* dest: paFloat32, no conversion necessary, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTFloat32LSB:
-            /* dest: paFloat32, no conversion necessary, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTFloat64MSB:
-            /* dest: paFloat32, in-place conversion to/from float32, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap64ConvertFloat64ToFloat32;
-            #else
-                *converter = ConvertFloat64ToFloat32;
-            #endif
-            break;
-        case ASIOSTFloat64LSB:
-            /* dest: paFloat32, in-place conversion to/from float32, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap64ConvertFloat64ToFloat32;
-            #else
-                *converter = ConvertFloat64ToFloat32;
-            #endif
-            break;
-        case ASIOSTInt32MSB:
-            /* dest: paInt32, no conversion necessary, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTInt32LSB:
-            /* dest: paInt32, no conversion necessary, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTInt32MSB16:
-            /* dest: paInt32, 16 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 16;
-            break;
-        case ASIOSTInt32MSB18:
-            /* dest: paInt32, 14 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 14;
-            break;
-        case ASIOSTInt32MSB20:
-            /* dest: paInt32, 12 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 12;
-            break;
-        case ASIOSTInt32MSB24:
-            /* dest: paInt32, 8 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 8;
-            break;
-        case ASIOSTInt32LSB16:
-            /* dest: paInt32, 16 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 16;
-            break;
-        case ASIOSTInt32LSB18:
-            /* dest: paInt32, 14 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 14;
-            break;
-        case ASIOSTInt32LSB20:
-            /* dest: paInt32, 12 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 12;
-            break;
-        case ASIOSTInt32LSB24:
-            /* dest: paInt32, 8 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = SwapShiftLeft32;
-            #else
-                *converter = ShiftLeft32;
-            #endif
-            *shift = 8;
-            break;
-        case ASIOSTInt24MSB:
-            /* dest: paInt24, no conversion necessary, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap24;
-            #endif
-            break;
-        case ASIOSTInt24LSB:
-            /* dest: paInt24, no conversion necessary, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap24;
-            #endif
-            break;
-    }
-}
-
-
-static void SelectPaToAsioConverter( ASIOSampleType type, PaAsioBufferConverter **converter, long *shift )
-{
-    *shift = 0;
-    *converter = 0;
-
-    switch (type) {
-        case ASIOSTInt16MSB:
-            /* src: paInt16, no conversion necessary, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap16;
-            #endif
-            break;
-        case ASIOSTInt16LSB:
-            /* src: paInt16, no conversion necessary, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap16;
-            #endif
-            break;
-        case ASIOSTFloat32MSB:
-            /* src: paFloat32, no conversion necessary, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTFloat32LSB:
-            /* src: paFloat32, no conversion necessary, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTFloat64MSB:
-            /* src: paFloat32, in-place conversion to/from float32, possible byte swap*/
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = ConvertFloat32ToFloat64Swap64;
-            #else
-                *converter = ConvertFloat32ToFloat64;
-            #endif
-            break;
-        case ASIOSTFloat64LSB:
-            /* src: paFloat32, in-place conversion to/from float32, possible byte swap*/
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = ConvertFloat32ToFloat64Swap64;
-            #else
-                *converter = ConvertFloat32ToFloat64;
-            #endif
-            break;
-        case ASIOSTInt32MSB:
-            /* src: paInt32, no conversion necessary, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTInt32LSB:
-            /* src: paInt32, no conversion necessary, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap32;
-            #endif
-            break;
-        case ASIOSTInt32MSB16:
-            /* src: paInt32, 16 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 16;
-            break;
-        case ASIOSTInt32MSB18:
-            /* src: paInt32, 14 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 14;
-            break;
-        case ASIOSTInt32MSB20:
-            /* src: paInt32, 12 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 12;
-            break;
-        case ASIOSTInt32MSB24:
-            /* src: paInt32, 8 bit shift, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 8;
-            break;
-        case ASIOSTInt32LSB16:
-            /* src: paInt32, 16 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 16;
-            break;
-        case ASIOSTInt32LSB18:
-            /* src: paInt32, 14 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 14;
-            break;
-        case ASIOSTInt32LSB20:
-            /* src: paInt32, 12 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 12;
-            break;
-        case ASIOSTInt32LSB24:
-            /* src: paInt32, 8 bit shift, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = ShiftRightSwap32;
-            #else
-                *converter = ShiftRight32;
-            #endif
-            *shift = 8;
-            break;
-        case ASIOSTInt24MSB:
-            /* src: paInt24, no conversion necessary, possible byte swap */
-            #ifdef PA_LSB_IS_NATIVE_
-                *converter = Swap24;
-            #endif
-            break;
-        case ASIOSTInt24LSB:
-            /* src: paInt24, no conversion necessary, possible byte swap */
-            #ifdef PA_MSB_IS_NATIVE_
-                *converter = Swap24;
-            #endif
-            break;
-    }
-}
-
-
-typedef struct PaAsioDeviceInfo
-{
-    PaDeviceInfo commonDeviceInfo;
-    long minBufferSize;
-    long maxBufferSize;
-    long preferredBufferSize;
-    long bufferGranularity;
-
-    ASIOChannelInfo *asioChannelInfos;
-}
-PaAsioDeviceInfo;
-
-
-PaError PaAsio_GetAvailableLatencyValues( PaDeviceIndex device,
-		long *minLatency, long *maxLatency, long *preferredLatency, long *granularity )
-{
-    PaError result;
-    PaUtilHostApiRepresentation *hostApi;
-    PaDeviceIndex hostApiDevice;
-
-    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
-
-    if( result == paNoError )
-    {
-        result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
-
-        if( result == paNoError )
-        {
-            PaAsioDeviceInfo *asioDeviceInfo =
-                    (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
-
-            *minLatency = asioDeviceInfo->minBufferSize;
-            *maxLatency = asioDeviceInfo->maxBufferSize;
-            *preferredLatency = asioDeviceInfo->preferredBufferSize;
-            *granularity = asioDeviceInfo->bufferGranularity;
-        }
-    }
-
-    return result;
-}
-
-
-
-/*
-    load the asio driver named by <driverName> and return statistics about
-    the driver in info. If no error occurred, the driver will remain open
-    and must be closed by the called by calling ASIOExit() - if an error
-    is returned the driver will already be closed.
-*/
-static PaError LoadAsioDriver( const char *driverName,
-        PaAsioDriverInfo *driverInfo, void *systemSpecific )
-{
-    PaError result = paNoError;
-    ASIOError asioError;
-    int asioIsInitialized = 0;
-
-    if( !loadAsioDriver( const_cast<char*>(driverName) ) )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_HOST_ERROR( 0, "Failed to load ASIO driver" );
-        goto error;
-    }
-
-    memset( &driverInfo->asioDriverInfo, 0, sizeof(ASIODriverInfo) );
-    driverInfo->asioDriverInfo.asioVersion = 2;
-    driverInfo->asioDriverInfo.sysRef = systemSpecific;
-    if( (asioError = ASIOInit( &driverInfo->asioDriverInfo )) != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        goto error;
-    }
-    else
-    {
-        asioIsInitialized = 1;
-    }
-
-    if( (asioError = ASIOGetChannels(&driverInfo->inputChannelCount,
-            &driverInfo->outputChannelCount)) != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        goto error;
-    }
-
-    if( (asioError = ASIOGetBufferSize(&driverInfo->bufferMinSize,
-            &driverInfo->bufferMaxSize, &driverInfo->bufferPreferredSize,
-            &driverInfo->bufferGranularity)) != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        goto error;
-    }
-
-    if( ASIOOutputReady() == ASE_OK )
-        driverInfo->postOutput = true;
-    else
-        driverInfo->postOutput = false;
-
-    return result;
-
-error:
-    if( asioIsInitialized )
-        ASIOExit();
-
-    return result;
-}
-
-
-#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_     13   /* must be the same number of elements as in the array below */
-static ASIOSampleRate defaultSampleRateSearchOrder_[]
-     = {44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0,
-        192000.0, 16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
-
-
-/* we look up IsDebuggerPresent at runtime incase it isn't present (on Win95 for example) */
-typedef BOOL (WINAPI *IsDebuggerPresentPtr)(VOID);
-IsDebuggerPresentPtr IsDebuggerPresent_ = 0;
-//FARPROC IsDebuggerPresent_ = 0; // this is the current way to do it apparently according to davidv
-
-PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i, driverCount;
-    PaAsioHostApiRepresentation *asioHostApi;
-    PaAsioDeviceInfo *deviceInfoArray;
-    char **names;
-    PaAsioDriverInfo paAsioDriverInfo;
-
-    asioHostApi = (PaAsioHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaAsioHostApiRepresentation) );
-    if( !asioHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    asioHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !asioHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    asioHostApi->systemSpecific = 0;
-    asioHostApi->openAsioDeviceIndex = paNoDevice;
-
-    *hostApi = &asioHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-
-    (*hostApi)->info.type = paASIO;
-    (*hostApi)->info.name = "ASIO";
-    (*hostApi)->info.deviceCount = 0;
-
-    #ifdef WINDOWS
-        /* use desktop window as system specific ptr */
-        asioHostApi->systemSpecific = GetDesktopWindow();
-        CoInitialize(NULL);
-    #endif
-
-    /* MUST BE CHECKED : to force fragments loading on Mac */
-    loadAsioDriver( "dummy" ); 
-
-    /* driverCount is the number of installed drivers - not necessarily
-        the number of installed physical devices. */
-    #if MAC
-        driverCount = asioDrivers->getNumFragments();
-    #elif WINDOWS
-        driverCount = asioDrivers->asioGetNumDev();
-    #endif
-
-    if( driverCount > 0 )
-    {
-        names = GetAsioDriverNames( asioHostApi->allocations, driverCount );
-        if( !names )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-
-        /* allocate enough space for all drivers, even if some aren't installed */
-
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                asioHostApi->allocations, sizeof(PaDeviceInfo*) * driverCount );
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaAsioDeviceInfo*)PaUtil_GroupAllocateMemory(
-                asioHostApi->allocations, sizeof(PaAsioDeviceInfo) * driverCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-		IsDebuggerPresent_ = GetProcAddress( LoadLibrary( "Kernel32.dll" ), "IsDebuggerPresent" );
-
-        for( i=0; i < driverCount; ++i )
-        {
-
-            PA_DEBUG(("ASIO names[%d]:%s\n",i,names[i]));
-
-            // Since portaudio opens ALL ASIO drivers, and no one else does that,
-            // we face fact that some drivers were not meant for it, drivers which act
-            // like shells on top of REAL drivers, for instance.
-            // so we get duplicate handles, locks and other problems.
-            // so lets NOT try to load any such wrappers. 
-            // The ones i [davidv] know of so far are:
-
-            if (   strcmp (names[i],"ASIO DirectX Full Duplex Driver") == 0
-                || strcmp (names[i],"ASIO Multimedia Driver")          == 0
-                || strncmp(names[i],"Premiere",8)                      == 0   //"Premiere Elements Windows Sound 1.0"
-                || strncmp(names[i],"Adobe",5)                         == 0   //"Adobe Default Windows Sound 1.5"
-                || strncmp(names[i],"ReaRoute ASIO",13)                == 0   //Reaper www.reaper.fm <- fix your stuff man.
-               )
-            {
-                PA_DEBUG(("BLACKLISTED!!!\n"));
-                continue;
-            }
-
-
-            if( IsDebuggerPresent_ && IsDebuggerPresent_() )  
-            {
-                /* ASIO Digidesign Driver uses PACE copy protection which quits out
-                   if a debugger is running. So we don't load it if a debugger is running. */
-                if( strcmp(names[i], "ASIO Digidesign Driver") == 0 )  
-                {
-                    PA_DEBUG(("BLACKLISTED!!! ASIO Digidesign Driver would quit the debugger\n"));  
-                    continue;  
-                }  
-            }  
-
-
-            /* Attempt to load the asio driver... */
-            if( LoadAsioDriver( names[i], &paAsioDriverInfo, asioHostApi->systemSpecific ) == paNoError )
-            {
-                PaAsioDeviceInfo *asioDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
-                PaDeviceInfo *deviceInfo = &asioDeviceInfo->commonDeviceInfo;
-
-                deviceInfo->structVersion = 2;
-                deviceInfo->hostApi = hostApiIndex;
-
-                deviceInfo->name = names[i];
-                PA_DEBUG(("PaAsio_Initialize: drv:%d name = %s\n",  i,deviceInfo->name));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d inputChannels       = %d\n", i, paAsioDriverInfo.inputChannelCount));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d outputChannels      = %d\n", i, paAsioDriverInfo.outputChannelCount));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferMinSize       = %d\n", i, paAsioDriverInfo.bufferMinSize));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferMaxSize       = %d\n", i, paAsioDriverInfo.bufferMaxSize));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferPreferredSize = %d\n", i, paAsioDriverInfo.bufferPreferredSize));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d bufferGranularity   = %d\n", i, paAsioDriverInfo.bufferGranularity));
-
-                deviceInfo->maxInputChannels  = paAsioDriverInfo.inputChannelCount;
-                deviceInfo->maxOutputChannels = paAsioDriverInfo.outputChannelCount;
-
-                deviceInfo->defaultSampleRate = 0.;
-                bool foundDefaultSampleRate = false;
-                for( int j=0; j < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++j )
-                {
-                    ASIOError asioError = ASIOCanSampleRate( defaultSampleRateSearchOrder_[j] );
-                    if( asioError != ASE_NoClock && asioError != ASE_NotPresent )
-                    {
-                        deviceInfo->defaultSampleRate = defaultSampleRateSearchOrder_[j];
-                        foundDefaultSampleRate = true;
-                        break;
-                    }
-                }
-
-                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultSampleRate = %f\n", i, deviceInfo->defaultSampleRate));
-
-                if( foundDefaultSampleRate ){
-
-                    /* calculate default latency values from bufferPreferredSize
-                        for default low latency, and bufferPreferredSize * 3
-                        for default high latency.
-                        use the default sample rate to convert from samples to
-                        seconds. Without knowing what sample rate the user will
-                        use this is the best we can do.
-                    */
-
-                    double defaultLowLatency =
-                            paAsioDriverInfo.bufferPreferredSize / deviceInfo->defaultSampleRate;
-
-                    deviceInfo->defaultLowInputLatency = defaultLowLatency;
-                    deviceInfo->defaultLowOutputLatency = defaultLowLatency;
-
-                    long defaultHighLatencyBufferSize =
-                            paAsioDriverInfo.bufferPreferredSize * 3;
-
-                    if( defaultHighLatencyBufferSize > paAsioDriverInfo.bufferMaxSize )
-                        defaultHighLatencyBufferSize = paAsioDriverInfo.bufferMaxSize;
-
-                    double defaultHighLatency =
-                            defaultHighLatencyBufferSize / deviceInfo->defaultSampleRate;
-
-                    if( defaultHighLatency < defaultLowLatency )
-                        defaultHighLatency = defaultLowLatency; /* just incase the driver returns something strange */ 
-                            
-                    deviceInfo->defaultHighInputLatency = defaultHighLatency;
-                    deviceInfo->defaultHighOutputLatency = defaultHighLatency;
-                    
-                }else{
-
-                    deviceInfo->defaultLowInputLatency = 0.;
-                    deviceInfo->defaultLowOutputLatency = 0.;
-                    deviceInfo->defaultHighInputLatency = 0.;
-                    deviceInfo->defaultHighOutputLatency = 0.;
-                }
-
-                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultLowInputLatency = %f\n", i, deviceInfo->defaultLowInputLatency));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultLowOutputLatency = %f\n", i, deviceInfo->defaultLowOutputLatency));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultHighInputLatency = %f\n", i, deviceInfo->defaultHighInputLatency));
-                PA_DEBUG(("PaAsio_Initialize: drv:%d defaultHighOutputLatency = %f\n", i, deviceInfo->defaultHighOutputLatency));
-
-                asioDeviceInfo->minBufferSize = paAsioDriverInfo.bufferMinSize;
-                asioDeviceInfo->maxBufferSize = paAsioDriverInfo.bufferMaxSize;
-                asioDeviceInfo->preferredBufferSize = paAsioDriverInfo.bufferPreferredSize;
-                asioDeviceInfo->bufferGranularity = paAsioDriverInfo.bufferGranularity;
-
-
-                asioDeviceInfo->asioChannelInfos = (ASIOChannelInfo*)PaUtil_GroupAllocateMemory(
-                        asioHostApi->allocations,
-                        sizeof(ASIOChannelInfo) * (deviceInfo->maxInputChannels
-                                + deviceInfo->maxOutputChannels) );
-                if( !asioDeviceInfo->asioChannelInfos )
-                {
-                    result = paInsufficientMemory;
-                    goto error;
-                }
-
-                int a;
-
-                for( a=0; a < deviceInfo->maxInputChannels; ++a ){
-                    asioDeviceInfo->asioChannelInfos[a].channel = a;
-                    asioDeviceInfo->asioChannelInfos[a].isInput = ASIOTrue;
-                    ASIOError asioError = ASIOGetChannelInfo( &asioDeviceInfo->asioChannelInfos[a] );
-                    if( asioError != ASE_OK )
-                    {
-                        result = paUnanticipatedHostError;
-                        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-                        goto error;
-                    }
-                }
-
-                for( a=0; a < deviceInfo->maxOutputChannels; ++a ){
-                    int b = deviceInfo->maxInputChannels + a;
-                    asioDeviceInfo->asioChannelInfos[b].channel = a;
-                    asioDeviceInfo->asioChannelInfos[b].isInput = ASIOFalse;
-                    ASIOError asioError = ASIOGetChannelInfo( &asioDeviceInfo->asioChannelInfos[b] );
-                    if( asioError != ASE_OK )
-                    {
-                        result = paUnanticipatedHostError;
-                        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-                        goto error;
-                    }
-                }
-
-
-                /* unload the driver */
-                ASIOExit();
-
-                (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
-                ++(*hostApi)->info.deviceCount;
-            }
-        }
-    }
-
-    if( (*hostApi)->info.deviceCount > 0 )
-    {
-        (*hostApi)->info.defaultInputDevice = 0;
-        (*hostApi)->info.defaultOutputDevice = 0;
-    }
-    else
-    {
-        (*hostApi)->info.defaultInputDevice = paNoDevice;
-        (*hostApi)->info.defaultOutputDevice = paNoDevice;
-    }
-
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &asioHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &asioHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    return result;
-
-error:
-    if( asioHostApi )
-    {
-        if( asioHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( asioHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( asioHostApi->allocations );
-        }
-
-        PaUtil_FreeMemory( asioHostApi );
-    }
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
-
-    /*
-        IMPLEMENT ME:
-            - clean up any resources not handled by the allocation group
-    */
-
-    if( asioHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( asioHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( asioHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( asioHostApi );
-}
-
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaError result = paNoError;
-    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
-    PaAsioDriverInfo *driverInfo = &asioHostApi->openAsioDriverInfo;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaDeviceIndex asioDeviceIndex;                                  
-    ASIOError asioError;
-    
-    if( inputParameters && outputParameters )
-    {
-        /* full duplex ASIO stream must use the same device for input and output */
-
-        if( inputParameters->device != outputParameters->device )
-            return paBadIODeviceCombination;
-    }
-    
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        asioDeviceIndex = inputParameters->device;
-
-        /* validate inputStreamInfo */
-        /** @todo do more validation here */
-        // if( inputParameters->hostApiSpecificStreamInfo )
-        //    return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        asioDeviceIndex = outputParameters->device;
-
-        /* validate outputStreamInfo */
-        /** @todo do more validation here */
-        // if( outputParameters->hostApiSpecificStreamInfo )
-        //    return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-
-
-    /* if an ASIO device is open we can only get format information for the currently open device */
-
-    if( asioHostApi->openAsioDeviceIndex != paNoDevice 
-			&& asioHostApi->openAsioDeviceIndex != asioDeviceIndex )
-    {
-        return paDeviceUnavailable;
-    }
-
-
-    /* NOTE: we load the driver and use its current settings
-        rather than the ones in our device info structure which may be stale */
-
-    /* open the device if it's not already open */
-    if( asioHostApi->openAsioDeviceIndex == paNoDevice )
-    {
-        result = LoadAsioDriver( asioHostApi->inheritedHostApiRep.deviceInfos[ asioDeviceIndex ]->name,
-                driverInfo, asioHostApi->systemSpecific );
-        if( result != paNoError )
-            return result;
-    }
-
-    /* check that input device can support inputChannelCount */
-    if( inputChannelCount > 0 )
-    {
-        if( inputChannelCount > driverInfo->inputChannelCount )
-        {
-            result = paInvalidChannelCount;
-            goto done;
-        }
-    }
-
-    /* check that output device can support outputChannelCount */
-    if( outputChannelCount )
-    {
-        if( outputChannelCount > driverInfo->outputChannelCount )
-        {
-            result = paInvalidChannelCount;
-            goto done;
-        }
-    }
-    
-    /* query for sample rate support */
-    asioError = ASIOCanSampleRate( sampleRate );
-    if( asioError == ASE_NoClock || asioError == ASE_NotPresent )
-    {
-        result = paInvalidSampleRate;
-        goto done;
-    }
-
-done:
-    /* close the device if it wasn't already open */
-    if( asioHostApi->openAsioDeviceIndex == paNoDevice )
-    {
-        ASIOExit(); /* not sure if we should check for errors here */
-    }
-
-    if( result == paNoError )
-        return paFormatIsSupported;
-    else
-        return result;
-}
-
-
-
-/* PaAsioStream - a stream data structure specifically for this implementation */
-
-typedef struct PaAsioStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    PaAsioHostApiRepresentation *asioHostApi;
-    unsigned long framesPerHostCallback;
-
-    /* ASIO driver info  - these may not be needed for the life of the stream,
-        but store them here until we work out how format conversion is going
-        to work. */
-
-    ASIOBufferInfo *asioBufferInfos;
-    ASIOChannelInfo *asioChannelInfos;
-    long inputLatency, outputLatency; // actual latencies returned by asio
-
-    long inputChannelCount, outputChannelCount;
-    bool postOutput;
-
-    void **bufferPtrs; /* this is carved up for inputBufferPtrs and outputBufferPtrs */
-    void **inputBufferPtrs[2];
-    void **outputBufferPtrs[2];
-
-    PaAsioBufferConverter *inputBufferConverter;
-    long inputShift;
-    PaAsioBufferConverter *outputBufferConverter;
-    long outputShift;
-
-    volatile bool stopProcessing;
-    int stopPlayoutCount;
-    HANDLE completedBuffersPlayedEvent;
-
-    bool streamFinishedCallbackCalled;
-    volatile int isActive;
-    volatile bool zeroOutput; /* all future calls to the callback will output silence */
-
-    volatile long reenterCount;
-    volatile long reenterError;
-
-    PaStreamCallbackFlags callbackFlags;
-}
-PaAsioStream;
-
-static PaAsioStream *theAsioStream = 0; /* due to ASIO sdk limitations there can be only one stream */
-
-
-static void ZeroOutputBuffers( PaAsioStream *stream, long index )
-{
-    int i;
-
-    for( i=0; i < stream->outputChannelCount; ++i )
-    {
-        void *buffer = stream->asioBufferInfos[ i + stream->inputChannelCount ].buffers[index];
-
-        int bytesPerSample = BytesPerAsioSample( stream->asioChannelInfos[ i + stream->inputChannelCount ].type );
-
-        memset( buffer, 0, stream->framesPerHostCallback * bytesPerSample );
-    }
-}
-
-
-static unsigned long SelectHostBufferSize( unsigned long suggestedLatencyFrames,
-        PaAsioDriverInfo *driverInfo )
-{
-    unsigned long result;
-
-    if( suggestedLatencyFrames == 0 )
-    {
-        result = driverInfo->bufferPreferredSize;
-    }
-    else{
-        if( suggestedLatencyFrames <= (unsigned long)driverInfo->bufferMinSize )
-        {
-            result = driverInfo->bufferMinSize;
-        }
-        else if( suggestedLatencyFrames >= (unsigned long)driverInfo->bufferMaxSize )
-        {
-            result = driverInfo->bufferMaxSize;
-        }
-        else
-        {
-            if( driverInfo->bufferGranularity == -1 )
-            {
-                /* power-of-two */
-                result = 2;
-
-                while( result < suggestedLatencyFrames )
-                    result *= 2;
-
-                if( result < (unsigned long)driverInfo->bufferMinSize )
-                    result = driverInfo->bufferMinSize;
-
-                if( result > (unsigned long)driverInfo->bufferMaxSize )
-                    result = driverInfo->bufferMaxSize;
-            }
-            else if( driverInfo->bufferGranularity == 0 )
-            {
-                /* the documentation states that bufferGranularity should be
-                    zero when bufferMinSize, bufferMaxSize and
-                    bufferPreferredSize are the same. We assume that is the case.
-                */
-
-                result = driverInfo->bufferPreferredSize;
-            }
-            else
-            {
-                /* modulo granularity */
-
-                unsigned long remainder =
-                        suggestedLatencyFrames % driverInfo->bufferGranularity;
-
-                if( remainder == 0 )
-                {
-                    result = suggestedLatencyFrames;
-                }
-                else
-                {
-                    result = suggestedLatencyFrames
-                            + (driverInfo->bufferGranularity - remainder);
-
-                    if( result > (unsigned long)driverInfo->bufferMaxSize )
-                        result = driverInfo->bufferMaxSize;
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
-
-/* returns channelSelectors if present */
-
-static PaError ValidateAsioSpecificStreamInfo(
-        const PaStreamParameters *streamParameters,
-        const PaAsioStreamInfo *streamInfo,
-        int deviceChannelCount,
-        int **channelSelectors )
-{
-	if( streamInfo )
-	{
-	    if( streamInfo->size != sizeof( PaAsioStreamInfo )
-	            || streamInfo->version != 1 )
-	    {
-	        return paIncompatibleHostApiSpecificStreamInfo;
-	    }
-
-	    if( streamInfo->flags & paAsioUseChannelSelectors )
-            *channelSelectors = streamInfo->channelSelectors;
-
-        if( !(*channelSelectors) )
-            return paIncompatibleHostApiSpecificStreamInfo;
-
-        for( int i=0; i < streamParameters->channelCount; ++i ){
-             if( (*channelSelectors)[i] < 0
-                    || (*channelSelectors)[i] >= deviceChannelCount ){
-                return paInvalidChannelCount;
-             }           
-        }
-	}
-
-	return paNoError;
-}
-
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream  parameters */
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaAsioHostApiRepresentation *asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
-    PaAsioStream *stream = 0;
-    PaAsioStreamInfo *inputStreamInfo, *outputStreamInfo;
-    unsigned long framesPerHostBuffer;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-    unsigned long suggestedInputLatencyFrames;
-    unsigned long suggestedOutputLatencyFrames;
-    PaDeviceIndex asioDeviceIndex;
-    ASIOError asioError;
-    int asioIsInitialized = 0;
-    int asioBuffersCreated = 0;
-    int completedBuffersPlayedEventInited = 0;
-    int i;
-    PaAsioDriverInfo *driverInfo;
-    int *inputChannelSelectors = 0;
-    int *outputChannelSelectors = 0;
-    bool isExternal = false;
-
-    /* unless we move to using lower level ASIO calls, we can only have
-        one device open at a time */
-    if( asioHostApi->openAsioDeviceIndex != paNoDevice ){
-        PA_DEBUG(("OpenStream paDeviceUnavailable\n"));
-        return paDeviceUnavailable;
-    }
-
-    if( inputParameters && outputParameters )
-    {
-        /* full duplex ASIO stream must use the same device for input and output */
-
-        if( inputParameters->device != outputParameters->device ){
-            PA_DEBUG(("OpenStream paBadIODeviceCombination\n"));
-            return paBadIODeviceCombination;
-    }
-    }
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-        suggestedInputLatencyFrames = (unsigned long)((inputParameters->suggestedLatency * sampleRate)+0.5f);
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        asioDeviceIndex = inputParameters->device;
-
-        PaAsioDeviceInfo *asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[asioDeviceIndex];
-
-        /* validate hostApiSpecificStreamInfo */
-        inputStreamInfo = (PaAsioStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
-        result = ValidateAsioSpecificStreamInfo( inputParameters, inputStreamInfo,
-            asioDeviceInfo->commonDeviceInfo.maxInputChannels,
-            &inputChannelSelectors
-        );
-        if( result != paNoError ) return result;
-    }
-    else
-    {
-        inputChannelCount = 0;
-        inputSampleFormat = 0;
-        suggestedInputLatencyFrames = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        suggestedOutputLatencyFrames = (unsigned long)((outputParameters->suggestedLatency * sampleRate)+0.5f);
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        asioDeviceIndex = outputParameters->device;
-
-        PaAsioDeviceInfo *asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[asioDeviceIndex];
-
-        /* validate hostApiSpecificStreamInfo */
-        outputStreamInfo = (PaAsioStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
-        result = ValidateAsioSpecificStreamInfo( outputParameters, outputStreamInfo,
-            asioDeviceInfo->commonDeviceInfo.maxOutputChannels,
-            &outputChannelSelectors
-        );
-        if( result != paNoError ) return result;
-    }
-    else
-    {
-        outputChannelCount = 0;
-        outputSampleFormat = 0;
-        suggestedOutputLatencyFrames = 0;
-    }
-
-    driverInfo = &asioHostApi->openAsioDriverInfo;
-
-    /* NOTE: we load the driver and use its current settings
-        rather than the ones in our device info structure which may be stale */
-
-    result = LoadAsioDriver( asioHostApi->inheritedHostApiRep.deviceInfos[ asioDeviceIndex ]->name,
-            driverInfo, asioHostApi->systemSpecific );
-    if( result == paNoError )
-        asioIsInitialized = 1;
-    else{
-        PA_DEBUG(("OpenStream ERROR1\n"));
-        goto error;
-    }
-
-    /* check that input device can support inputChannelCount */
-    if( inputChannelCount > 0 )
-    {
-        if( inputChannelCount > driverInfo->inputChannelCount )
-        {
-            result = paInvalidChannelCount;
-            PA_DEBUG(("OpenStream ERROR2\n"));
-            goto error;
-        }
-    }
-
-    /* check that output device can support outputChannelCount */
-    if( outputChannelCount )
-    {
-        if( outputChannelCount > driverInfo->outputChannelCount )
-        {
-            result = paInvalidChannelCount;
-            PA_DEBUG(("OpenStream ERROR3\n"));
-            goto error;
-        }
-    }
-
-
-    /* davidv: listing ASIO Clock sources, there is an ongoing investigation by
-       me about whether or not call ASIOSetSampleRate if an external Clock is
-       used. A few drivers expected different things here */
-    {
-        ASIOClockSource clocks[32];
-        long numSources=32;
-        asioError = ASIOGetClockSources(clocks, &numSources);
-        if( asioError != ASE_OK ){
-            PA_DEBUG(("ERROR: ASIOGetClockSources: %s\n", PaAsio_GetAsioErrorText(asioError) ));
-        }else{
-            PA_DEBUG(("INFO ASIOGetClockSources listing %d clocks\n", numSources ));
-            for (int i=0;i<numSources;++i){
-                PA_DEBUG(("ASIOClockSource%d %s current:%d\n", i,clocks[i].name, clocks[i].isCurrentSource ));
-               
-                /*
-                  If you have problems with some drivers when externally clocked, 
-                  uncomment the next two lines
-                 */
-                //if (clocks[i].isCurrentSource)
-                //    isExternal = true;
-            }
-        }
-    }
-
-    // check that the device supports the requested sample rate 
-
-    asioError = ASIOCanSampleRate( sampleRate );
-    PA_DEBUG(("ASIOCanSampleRate(%f):%d\n",sampleRate, asioError ));
-
-    if( asioError != ASE_OK )
-    {
-        result = paInvalidSampleRate;
-        PA_DEBUG(("ERROR: ASIOCanSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
-        goto error;
-    }
-
-
-    // retrieve the current sample rate, we only change to the requested
-    // sample rate if the device is not already in that rate.
-
-    ASIOSampleRate oldRate;
-    asioError = ASIOGetSampleRate(&oldRate);
-    if( asioError != ASE_OK )
-    {
-        result = paInvalidSampleRate;
-        PA_DEBUG(("ERROR: ASIOGetSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
-        goto error;
-    }
-    PA_DEBUG(("ASIOGetSampleRate:%f\n",oldRate));
-
-    if (oldRate != sampleRate){
-
-        PA_DEBUG(("before ASIOSetSampleRate(%f)\n",sampleRate));
-
-        asioError = ASIOSetSampleRate( isExternal?0:sampleRate );
-        /* Set sample rate */
-        if( asioError != ASE_OK )
-        {
-            result = paInvalidSampleRate;
-            PA_DEBUG(("ERROR: ASIOSetSampleRate: %s\n", PaAsio_GetAsioErrorText(asioError) ));
-            goto error;
-        }
-        PA_DEBUG(("after ASIOSetSampleRate(%f)\n",sampleRate));
-    }
-    else
-    {
-        PA_DEBUG(("No Need to change SR\n"));
-    }
-
-
-    /*
-        IMPLEMENT ME:
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-    */
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 ){
-        PA_DEBUG(("OpenStream invalid flags!!\n"));
-        return paInvalidFlag; /* unexpected platform specific flag */
-    }
-
-
-    stream = (PaAsioStream*)PaUtil_AllocateMemory( sizeof(PaAsioStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        PA_DEBUG(("OpenStream ERROR5\n"));
-        goto error;
-    }
-
-    stream->completedBuffersPlayedEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
-    if( stream->completedBuffersPlayedEvent == NULL )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
-        PA_DEBUG(("OpenStream ERROR6\n"));
-        goto error;
-    }
-    completedBuffersPlayedEventInited = 1;
-
-
-    stream->asioBufferInfos = 0; /* for deallocation in error */
-    stream->asioChannelInfos = 0; /* for deallocation in error */
-    stream->bufferPtrs = 0; /* for deallocation in error */
-
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &asioHostApi->callbackStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &asioHostApi->blockingStreamInterface, streamCallback, userData );
-    }
-
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-
-    stream->asioBufferInfos = (ASIOBufferInfo*)PaUtil_AllocateMemory(
-            sizeof(ASIOBufferInfo) * (inputChannelCount + outputChannelCount) );
-    if( !stream->asioBufferInfos )
-    {
-        result = paInsufficientMemory;
-        PA_DEBUG(("OpenStream ERROR7\n"));
-        goto error;
-    }
-
-
-    for( i=0; i < inputChannelCount; ++i )
-    {
-        ASIOBufferInfo *info = &stream->asioBufferInfos[i];
-
-        info->isInput = ASIOTrue;
-
-        if( inputChannelSelectors ){
-            // inputChannelSelectors values have already been validated in
-            // ValidateAsioSpecificStreamInfo() above
-            info->channelNum = inputChannelSelectors[i];
-        }else{
-            info->channelNum = i;
-        }
-
-        info->buffers[0] = info->buffers[1] = 0;
-    }
-
-    for( i=0; i < outputChannelCount; ++i ){
-        ASIOBufferInfo *info = &stream->asioBufferInfos[inputChannelCount+i];
-
-        info->isInput = ASIOFalse;
-
-        if( outputChannelSelectors ){
-            // outputChannelSelectors values have already been validated in
-            // ValidateAsioSpecificStreamInfo() above
-            info->channelNum = outputChannelSelectors[i];
-        }else{
-            info->channelNum = i;
-        }
-        
-        info->buffers[0] = info->buffers[1] = 0;
-    }
-
-
-    framesPerHostBuffer = SelectHostBufferSize(
-            (( suggestedInputLatencyFrames > suggestedOutputLatencyFrames )
-                    ? suggestedInputLatencyFrames : suggestedOutputLatencyFrames),
-            driverInfo );
-
-
-	PA_DEBUG(("PaAsioOpenStream: framesPerHostBuffer :%d\n",  framesPerHostBuffer));
-
-    asioError = ASIOCreateBuffers( stream->asioBufferInfos,
-            inputChannelCount+outputChannelCount,
-            framesPerHostBuffer, &asioCallbacks_ );
-
-    if( asioError != ASE_OK
-            && framesPerHostBuffer != (unsigned long)driverInfo->bufferPreferredSize )
-    {
-        PA_DEBUG(("ERROR: ASIOCreateBuffers: %s\n", PaAsio_GetAsioErrorText(asioError) ));
-        /*
-            Some buggy drivers (like the Hoontech DSP24) give incorrect
-            [min, preferred, max] values They should work with the preferred size
-            value, thus if Pa_ASIO_CreateBuffers fails with the hostBufferSize
-            computed in SelectHostBufferSize, we try again with the preferred size.
-        */
-
-        framesPerHostBuffer = driverInfo->bufferPreferredSize;
-
-        PA_DEBUG(("PaAsioOpenStream: CORRECTED framesPerHostBuffer :%d\n",  framesPerHostBuffer));
-
-        ASIOError asioError2 = ASIOCreateBuffers( stream->asioBufferInfos,
-                inputChannelCount+outputChannelCount,
-                 framesPerHostBuffer, &asioCallbacks_ );
-        if( asioError2 == ASE_OK )
-            asioError = ASE_OK;
-    }
-
-    if( asioError != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        PA_DEBUG(("OpenStream ERROR9\n"));
-        goto error;
-    }
-
-    asioBuffersCreated = 1;
-
-    stream->asioChannelInfos = (ASIOChannelInfo*)PaUtil_AllocateMemory(
-            sizeof(ASIOChannelInfo) * (inputChannelCount + outputChannelCount) );
-    if( !stream->asioChannelInfos )
-    {
-        result = paInsufficientMemory;
-        PA_DEBUG(("OpenStream ERROR10\n"));
-        goto error;
-    }
-
-    for( i=0; i < inputChannelCount + outputChannelCount; ++i )
-    {
-        stream->asioChannelInfos[i].channel = stream->asioBufferInfos[i].channelNum;
-        stream->asioChannelInfos[i].isInput = stream->asioBufferInfos[i].isInput;
-        asioError = ASIOGetChannelInfo( &stream->asioChannelInfos[i] );
-        if( asioError != ASE_OK )
-        {
-            result = paUnanticipatedHostError;
-            PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-            PA_DEBUG(("OpenStream ERROR11\n"));
-            goto error;
-        }
-    }
-
-    stream->bufferPtrs = (void**)PaUtil_AllocateMemory(
-            2 * sizeof(void*) * (inputChannelCount + outputChannelCount) );
-    if( !stream->bufferPtrs )
-    {
-        result = paInsufficientMemory;
-        PA_DEBUG(("OpenStream ERROR12\n"));
-        goto error;
-    }
-
-    if( inputChannelCount > 0 )
-    {
-        stream->inputBufferPtrs[0] = stream-> bufferPtrs;
-        stream->inputBufferPtrs[1] = &stream->bufferPtrs[inputChannelCount];
-
-        for( i=0; i<inputChannelCount; ++i )
-        {
-            stream->inputBufferPtrs[0][i] = stream->asioBufferInfos[i].buffers[0];
-            stream->inputBufferPtrs[1][i] = stream->asioBufferInfos[i].buffers[1];
-        }
-    }
-    else
-    {
-        stream->inputBufferPtrs[0] = 0;
-        stream->inputBufferPtrs[1] = 0;
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        stream->outputBufferPtrs[0] = &stream->bufferPtrs[inputChannelCount*2];
-        stream->outputBufferPtrs[1] = &stream->bufferPtrs[inputChannelCount*2 + outputChannelCount];
-
-        for( i=0; i<outputChannelCount; ++i )
-        {
-            stream->outputBufferPtrs[0][i] = stream->asioBufferInfos[inputChannelCount+i].buffers[0];
-            stream->outputBufferPtrs[1][i] = stream->asioBufferInfos[inputChannelCount+i].buffers[1];
-        }
-    }
-    else
-    {
-        stream->outputBufferPtrs[0] = 0;
-        stream->outputBufferPtrs[1] = 0;
-    }
-
-    if( inputChannelCount > 0 )
-    {
-        /* FIXME: assume all channels use the same type for now */
-        ASIOSampleType inputType = stream->asioChannelInfos[0].type;
-
-        PA_DEBUG(("ASIO Input  type:%d",inputType));
-        AsioSampleTypeLOG(inputType);
-        hostInputSampleFormat = AsioSampleTypeToPaNativeSampleFormat( inputType );
-
-        SelectAsioToPaConverter( inputType, &stream->inputBufferConverter, &stream->inputShift );
-    }
-    else
-    {
-        hostInputSampleFormat = 0;
-        stream->inputBufferConverter = 0;
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        /* FIXME: assume all channels use the same type for now */
-        ASIOSampleType outputType = stream->asioChannelInfos[inputChannelCount].type;
-
-        PA_DEBUG(("ASIO Output type:%d",outputType));
-        AsioSampleTypeLOG(outputType);
-        hostOutputSampleFormat = AsioSampleTypeToPaNativeSampleFormat( outputType );
-
-        SelectPaToAsioConverter( outputType, &stream->outputBufferConverter, &stream->outputShift );
-    }
-    else
-    {
-        hostOutputSampleFormat = 0;
-        stream->outputBufferConverter = 0;
-    }
-
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                    inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-                    outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-                    sampleRate, streamFlags, framesPerBuffer,
-                    framesPerHostBuffer, paUtilFixedHostBufferSize,
-                    streamCallback, userData );
-    if( result != paNoError ){
-        PA_DEBUG(("OpenStream ERROR13\n"));
-        goto error;
-    }
-
-
-    ASIOGetLatencies( &stream->inputLatency, &stream->outputLatency );
-
-    stream->streamRepresentation.streamInfo.inputLatency =
-            (double)( PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor)
-                + stream->inputLatency) / sampleRate;   // seconds
-    stream->streamRepresentation.streamInfo.outputLatency =
-            (double)( PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor)
-                + stream->outputLatency) / sampleRate; // seconds
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-    // the code below prints the ASIO latency which doesn't include the
-    // buffer processor latency. it reports the added latency separately
-    PA_DEBUG(("PaAsio : ASIO InputLatency = %ld (%ld ms), added buffProc:%ld (%ld ms)\n",
-            stream->inputLatency,
-            (long)((stream->inputLatency*1000)/ sampleRate),  
-            PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor),
-            (long)((PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor)*1000)/ sampleRate)
-            ));
-
-    PA_DEBUG(("PaAsio : ASIO OuputLatency = %ld (%ld ms), added buffProc:%ld (%ld ms)\n",
-            stream->outputLatency,
-            (long)((stream->outputLatency*1000)/ sampleRate), 
-            PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor),
-            (long)((PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor)*1000)/ sampleRate)
-            ));
-
-    stream->asioHostApi = asioHostApi;
-    stream->framesPerHostCallback = framesPerHostBuffer;
-
-    stream->inputChannelCount = inputChannelCount;
-    stream->outputChannelCount = outputChannelCount;
-    stream->postOutput = driverInfo->postOutput;
-    stream->isActive = 0;
-
-    asioHostApi->openAsioDeviceIndex = asioDeviceIndex;
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    PA_DEBUG(("goto errored\n"));
-    if( stream )
-    {
-        if( completedBuffersPlayedEventInited )
-            CloseHandle( stream->completedBuffersPlayedEvent );
-
-        if( stream->asioBufferInfos )
-            PaUtil_FreeMemory( stream->asioBufferInfos );
-
-        if( stream->asioChannelInfos )
-            PaUtil_FreeMemory( stream->asioChannelInfos );
-
-        if( stream->bufferPtrs )
-            PaUtil_FreeMemory( stream->bufferPtrs );
-
-        PaUtil_FreeMemory( stream );
-    }
-
-    if( asioBuffersCreated )
-        ASIODisposeBuffers();
-
-    if( asioIsInitialized )
-        ASIOExit();
-
-    return result;
-}
-
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    /*
-        IMPLEMENT ME:
-            - additional stream closing + cleanup
-    */
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-
-    stream->asioHostApi->openAsioDeviceIndex = paNoDevice;
-
-    CloseHandle( stream->completedBuffersPlayedEvent );
-
-    PaUtil_FreeMemory( stream->asioBufferInfos );
-    PaUtil_FreeMemory( stream->asioChannelInfos );
-    PaUtil_FreeMemory( stream->bufferPtrs );
-    PaUtil_FreeMemory( stream );
-
-    ASIODisposeBuffers();
-    ASIOExit();
-
-    return result;
-}
-
-
-static void bufferSwitch(long index, ASIOBool directProcess)
-{
-//TAKEN FROM THE ASIO SDK
-
-    // the actual processing callback.
-    // Beware that this is normally in a seperate thread, hence be sure that
-    // you take care about thread synchronization. This is omitted here for
-    // simplicity.
-
-    // as this is a "back door" into the bufferSwitchTimeInfo a timeInfo needs
-    // to be created though it will only set the timeInfo.samplePosition and
-    // timeInfo.systemTime fields and the according flags
-
-    ASIOTime  timeInfo;
-    memset( &timeInfo, 0, sizeof (timeInfo) );
-
-    // get the time stamp of the buffer, not necessary if no
-    // synchronization to other media is required
-    if( ASIOGetSamplePosition(&timeInfo.timeInfo.samplePosition, &timeInfo.timeInfo.systemTime) == ASE_OK)
-            timeInfo.timeInfo.flags = kSystemTimeValid | kSamplePositionValid;
-
-    // Call the real callback
-    bufferSwitchTimeInfo( &timeInfo, index, directProcess );
-}
-
-
-// conversion from 64 bit ASIOSample/ASIOTimeStamp to double float
-#if NATIVE_INT64
-	#define ASIO64toDouble(a)  (a)
-#else
-	const double twoRaisedTo32 = 4294967296.;
-	#define ASIO64toDouble(a)  ((a).lo + (a).hi * twoRaisedTo32)
-#endif
-
-static ASIOTime *bufferSwitchTimeInfo( ASIOTime *timeInfo, long index, ASIOBool directProcess )
-{
-    // the actual processing callback.
-    // Beware that this is normally in a seperate thread, hence be sure that
-    // you take care about thread synchronization.
-
-
-    /* The SDK says the following about the directProcess flag:
-        suggests to the host whether it should immediately start processing
-        (directProcess == ASIOTrue), or whether its process should be deferred
-        because the call comes from a very low level (for instance, a high level
-        priority interrupt), and direct processing would cause timing instabilities for
-        the rest of the system. If in doubt, directProcess should be set to ASIOFalse.
-
-        We just ignore directProcess. This could cause incompatibilities with
-        drivers which really don't want the audio processing to occur in this
-        callback, but none have been identified yet.
-    */
-
-    (void) directProcess; /* suppress unused parameter warning */
-
-#if 0
-    // store the timeInfo for later use
-    asioDriverInfo.tInfo = *timeInfo;
-
-    // get the time stamp of the buffer, not necessary if no
-    // synchronization to other media is required
-
-    if (timeInfo->timeInfo.flags & kSystemTimeValid)
-            asioDriverInfo.nanoSeconds = ASIO64toDouble(timeInfo->timeInfo.systemTime);
-    else
-            asioDriverInfo.nanoSeconds = 0;
-
-    if (timeInfo->timeInfo.flags & kSamplePositionValid)
-            asioDriverInfo.samples = ASIO64toDouble(timeInfo->timeInfo.samplePosition);
-    else
-            asioDriverInfo.samples = 0;
-
-    if (timeInfo->timeCode.flags & kTcValid)
-            asioDriverInfo.tcSamples = ASIO64toDouble(timeInfo->timeCode.timeCodeSamples);
-    else
-            asioDriverInfo.tcSamples = 0;
-
-    // get the system reference time
-    asioDriverInfo.sysRefTime = get_sys_reference_time();
-#endif
-
-#if 0
-    // a few debug messages for the Windows device driver developer
-    // tells you the time when driver got its interrupt and the delay until the app receives
-    // the event notification.
-    static double last_samples = 0;
-    char tmp[128];
-    sprintf (tmp, "diff: %d / %d ms / %d ms / %d samples                 \n", asioDriverInfo.sysRefTime - (long)(asioDriverInfo.nanoSeconds / 1000000.0), asioDriverInfo.sysRefTime, (long)(asioDriverInfo.nanoSeconds / 1000000.0), (long)(asioDriverInfo.samples - last_samples));
-    OutputDebugString (tmp);
-    last_samples = asioDriverInfo.samples;
-#endif
-
-
-    if( !theAsioStream )
-        return 0L;
-
-    // Keep sample position
-    // FIXME: asioDriverInfo.pahsc_NumFramesDone = timeInfo->timeInfo.samplePosition.lo;
-
-
-    // protect against reentrancy
-    if( PaAsio_AtomicIncrement(&theAsioStream->reenterCount) )
-    {
-        theAsioStream->reenterError++;
-        //DBUG(("bufferSwitchTimeInfo : reentrancy detection = %d\n", asioDriverInfo.reenterError));
-        return 0L;
-    }
-
-    int buffersDone = 0;
-    
-    do
-    {
-        if( buffersDone > 0 )
-        {
-            // this is a reentered buffer, we missed processing it on time
-            // set the input overflow and output underflow flags as appropriate
-            
-            if( theAsioStream->inputChannelCount > 0 )
-                theAsioStream->callbackFlags |= paInputOverflow;
-                
-            if( theAsioStream->outputChannelCount > 0 )
-                theAsioStream->callbackFlags |= paOutputUnderflow;
-        }
-        else
-        {
-            if( theAsioStream->zeroOutput )
-            {
-                ZeroOutputBuffers( theAsioStream, index );
-
-                // Finally if the driver supports the ASIOOutputReady() optimization,
-                // do it here, all data are in place
-                if( theAsioStream->postOutput )
-                    ASIOOutputReady();
-
-                if( theAsioStream->stopProcessing )
-                {
-                    if( theAsioStream->stopPlayoutCount < 2 )
-                    {
-                        ++theAsioStream->stopPlayoutCount;
-                        if( theAsioStream->stopPlayoutCount == 2 )
-                        {
-                            theAsioStream->isActive = 0;
-                            if( theAsioStream->streamRepresentation.streamFinishedCallback != 0 )
-                                theAsioStream->streamRepresentation.streamFinishedCallback( theAsioStream->streamRepresentation.userData );
-                            theAsioStream->streamFinishedCallbackCalled = true;
-                            SetEvent( theAsioStream->completedBuffersPlayedEvent );
-                        }
-                    }
-                }
-            }
-            else
-            {
-
-#if 0
-// test code to try to detect slip conditions... these may work on some systems
-// but neither of them work on the RME Digi96
-
-// check that sample delta matches buffer size (otherwise we must have skipped
-// a buffer.
-static double last_samples = -512;
-double samples;
-//if( timeInfo->timeCode.flags & kTcValid )
-//    samples = ASIO64toDouble(timeInfo->timeCode.timeCodeSamples);
-//else
-    samples = ASIO64toDouble(timeInfo->timeInfo.samplePosition);
-int delta = samples - last_samples;
-//printf( "%d\n", delta);
-last_samples = samples;
-
-if( delta > theAsioStream->framesPerHostCallback )
-{
-    if( theAsioStream->inputChannelCount > 0 )
-        theAsioStream->callbackFlags |= paInputOverflow;
-
-    if( theAsioStream->outputChannelCount > 0 )
-        theAsioStream->callbackFlags |= paOutputUnderflow;
-}
-
-// check that the buffer index is not the previous index (which would indicate
-// that a buffer was skipped.
-static int previousIndex = 1;
-if( index == previousIndex )
-{
-    if( theAsioStream->inputChannelCount > 0 )
-        theAsioStream->callbackFlags |= paInputOverflow;
-
-    if( theAsioStream->outputChannelCount > 0 )
-        theAsioStream->callbackFlags |= paOutputUnderflow;
-}
-previousIndex = index;
-#endif
-
-                int i;
-
-                PaUtil_BeginCpuLoadMeasurement( &theAsioStream->cpuLoadMeasurer );
-
-                PaStreamCallbackTimeInfo paTimeInfo;
-
-                // asio systemTime is supposed to be measured according to the same
-                // clock as timeGetTime
-                paTimeInfo.currentTime = (ASIO64toDouble( timeInfo->timeInfo.systemTime ) * .000000001);
-
-                /* patch from Paul Boege */
-                paTimeInfo.inputBufferAdcTime = paTimeInfo.currentTime -
-                    ((double)theAsioStream->inputLatency/theAsioStream->streamRepresentation.streamInfo.sampleRate);
-
-                paTimeInfo.outputBufferDacTime = paTimeInfo.currentTime +
-                    ((double)theAsioStream->outputLatency/theAsioStream->streamRepresentation.streamInfo.sampleRate);
-
-                /* old version is buggy because the buffer processor also adds in its latency to the time parameters
-                paTimeInfo.inputBufferAdcTime = paTimeInfo.currentTime - theAsioStream->streamRepresentation.streamInfo.inputLatency;
-                paTimeInfo.outputBufferDacTime = paTimeInfo.currentTime + theAsioStream->streamRepresentation.streamInfo.outputLatency;
-                */
-#if 1
-// detect underflows by checking inter-callback time > 2 buffer period
-static double previousTime = -1;
-if( previousTime > 0 ){
-
-    double delta = paTimeInfo.currentTime - previousTime;
-
-    if( delta >= 2. * (theAsioStream->framesPerHostCallback / theAsioStream->streamRepresentation.streamInfo.sampleRate) ){
-        if( theAsioStream->inputChannelCount > 0 )
-            theAsioStream->callbackFlags |= paInputOverflow;
-
-        if( theAsioStream->outputChannelCount > 0 )
-            theAsioStream->callbackFlags |= paOutputUnderflow;
-    }
-}
-previousTime = paTimeInfo.currentTime;
-#endif
-
-                // note that the above input and output times do not need to be
-                // adjusted for the latency of the buffer processor -- the buffer
-                // processor handles that.
-
-                if( theAsioStream->inputBufferConverter )
-                {
-                    for( i=0; i<theAsioStream->inputChannelCount; i++ )
-                    {
-                        theAsioStream->inputBufferConverter( theAsioStream->inputBufferPtrs[index][i],
-                                theAsioStream->inputShift, theAsioStream->framesPerHostCallback );
-                    }
-                }
-
-                PaUtil_BeginBufferProcessing( &theAsioStream->bufferProcessor, &paTimeInfo, theAsioStream->callbackFlags );
-
-                /* reset status flags once they've been passed to the callback */
-                theAsioStream->callbackFlags = 0;
-
-                PaUtil_SetInputFrameCount( &theAsioStream->bufferProcessor, 0 /* default to host buffer size */ );
-                for( i=0; i<theAsioStream->inputChannelCount; ++i )
-                    PaUtil_SetNonInterleavedInputChannel( &theAsioStream->bufferProcessor, i, theAsioStream->inputBufferPtrs[index][i] );
-
-                PaUtil_SetOutputFrameCount( &theAsioStream->bufferProcessor, 0 /* default to host buffer size */ );
-                for( i=0; i<theAsioStream->outputChannelCount; ++i )
-                    PaUtil_SetNonInterleavedOutputChannel( &theAsioStream->bufferProcessor, i, theAsioStream->outputBufferPtrs[index][i] );
-
-                int callbackResult;
-                if( theAsioStream->stopProcessing )
-                    callbackResult = paComplete;
-                else
-                    callbackResult = paContinue;
-                unsigned long framesProcessed = PaUtil_EndBufferProcessing( &theAsioStream->bufferProcessor, &callbackResult );
-
-                if( theAsioStream->outputBufferConverter )
-                {
-                    for( i=0; i<theAsioStream->outputChannelCount; i++ )
-                    {
-                        theAsioStream->outputBufferConverter( theAsioStream->outputBufferPtrs[index][i],
-                                theAsioStream->outputShift, theAsioStream->framesPerHostCallback );
-                    }
-                }
-
-                PaUtil_EndCpuLoadMeasurement( &theAsioStream->cpuLoadMeasurer, framesProcessed );
-
-                // Finally if the driver supports the ASIOOutputReady() optimization,
-                // do it here, all data are in place
-                if( theAsioStream->postOutput )
-                    ASIOOutputReady();
-
-                if( callbackResult == paContinue )
-                {
-                    /* nothing special to do */
-                }
-                else if( callbackResult == paAbort )
-                {
-                    /* finish playback immediately  */
-                    theAsioStream->isActive = 0;
-                    if( theAsioStream->streamRepresentation.streamFinishedCallback != 0 )
-                        theAsioStream->streamRepresentation.streamFinishedCallback( theAsioStream->streamRepresentation.userData );
-                    theAsioStream->streamFinishedCallbackCalled = true;
-                    SetEvent( theAsioStream->completedBuffersPlayedEvent );
-                    theAsioStream->zeroOutput = true;
-                }
-                else /* paComplete or other non-zero value indicating complete */
-                {
-                    /* Finish playback once currently queued audio has completed. */
-                    theAsioStream->stopProcessing = true;
-
-                    if( PaUtil_IsBufferProcessorOutputEmpty( &theAsioStream->bufferProcessor ) )
-                    {
-                        theAsioStream->zeroOutput = true;
-                        theAsioStream->stopPlayoutCount = 0;
-                    }
-                }
-            }
-        }
-        
-        ++buffersDone;
-    }while( PaAsio_AtomicDecrement(&theAsioStream->reenterCount) >= 0 );
-
-    return 0L;
-}
-
-
-static void sampleRateChanged(ASIOSampleRate sRate)
-{
-    // TAKEN FROM THE ASIO SDK
-    // do whatever you need to do if the sample rate changed
-    // usually this only happens during external sync.
-    // Audio processing is not stopped by the driver, actual sample rate
-    // might not have even changed, maybe only the sample rate status of an
-    // AES/EBU or S/PDIF digital input at the audio device.
-    // You might have to update time/sample related conversion routines, etc.
-
-    (void) sRate; /* unused parameter */
-    PA_DEBUG( ("sampleRateChanged : %d \n", sRate));
-}
-
-static long asioMessages(long selector, long value, void* message, double* opt)
-{
-// TAKEN FROM THE ASIO SDK
-    // currently the parameters "value", "message" and "opt" are not used.
-    long ret = 0;
-
-    (void) message; /* unused parameters */
-    (void) opt;
-
-    PA_DEBUG( ("asioMessages : %d , %d \n", selector, value));
-
-    switch(selector)
-    {
-        case kAsioSelectorSupported:
-            if(value == kAsioResetRequest
-            || value == kAsioEngineVersion
-            || value == kAsioResyncRequest
-            || value == kAsioLatenciesChanged
-            // the following three were added for ASIO 2.0, you don't necessarily have to support them
-            || value == kAsioSupportsTimeInfo
-            || value == kAsioSupportsTimeCode
-            || value == kAsioSupportsInputMonitor)
-                    ret = 1L;
-            break;
-
-        case kAsioBufferSizeChange:
-            //printf("kAsioBufferSizeChange \n");
-            break;
-
-        case kAsioResetRequest:
-            // defer the task and perform the reset of the driver during the next "safe" situation
-            // You cannot reset the driver right now, as this code is called from the driver.
-            // Reset the driver is done by completely destruct is. I.e. ASIOStop(), ASIODisposeBuffers(), Destruction
-            // Afterwards you initialize the driver again.
-
-            /*FIXME: commented the next line out */
-            //asioDriverInfo.stopped;  // In this sample the processing will just stop
-            ret = 1L;
-            break;
-
-        case kAsioResyncRequest:
-            // This informs the application, that the driver encountered some non fatal data loss.
-            // It is used for synchronization purposes of different media.
-            // Added mainly to work around the Win16Mutex problems in Windows 95/98 with the
-            // Windows Multimedia system, which could loose data because the Mutex was hold too long
-            // by another thread.
-            // However a driver can issue it in other situations, too.
-            ret = 1L;
-            break;
-
-        case kAsioLatenciesChanged:
-            // This will inform the host application that the drivers were latencies changed.
-            // Beware, it this does not mean that the buffer sizes have changed!
-            // You might need to update internal delay data.
-            ret = 1L;
-            //printf("kAsioLatenciesChanged \n");
-            break;
-
-        case kAsioEngineVersion:
-            // return the supported ASIO version of the host application
-            // If a host applications does not implement this selector, ASIO 1.0 is assumed
-            // by the driver
-            ret = 2L;
-            break;
-
-        case kAsioSupportsTimeInfo:
-            // informs the driver wether the asioCallbacks.bufferSwitchTimeInfo() callback
-            // is supported.
-            // For compatibility with ASIO 1.0 drivers the host application should always support
-            // the "old" bufferSwitch method, too.
-            ret = 1;
-            break;
-
-        case kAsioSupportsTimeCode:
-            // informs the driver wether application is interested in time code info.
-            // If an application does not need to know about time code, the driver has less work
-            // to do.
-            ret = 0;
-            break;
-    }
-    return ret;
-}
-
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsioStream *stream = (PaAsioStream*)s;
-    ASIOError asioError;
-
-    if( stream->outputChannelCount > 0 )
-    {
-        ZeroOutputBuffers( stream, 0 );
-        ZeroOutputBuffers( stream, 1 );
-    }
-
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-    stream->stopProcessing = false;
-    stream->zeroOutput = false;
-
-    /* Reentrancy counter initialisation */
-    stream->reenterCount = -1;
-    stream->reenterError = 0;
-
-    stream->callbackFlags = 0;
-
-    if( ResetEvent( stream->completedBuffersPlayedEvent ) == 0 )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_SYSTEM_ERROR( GetLastError() );
-    }
-
-    if( result == paNoError )
-    {
-        theAsioStream = stream;
-        asioError = ASIOStart();
-        if( asioError == ASE_OK )
-        {
-            stream->isActive = 1;
-            stream->streamFinishedCallbackCalled = false;
-        }
-        else
-        {
-            theAsioStream = 0;
-            result = paUnanticipatedHostError;
-            PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        }
-    }
-
-    return result;
-}
-
-
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsioStream *stream = (PaAsioStream*)s;
-    ASIOError asioError;
-
-    if( stream->isActive )
-    {
-        stream->stopProcessing = true;
-
-        /* wait for the stream to finish playing out enqueued buffers.
-            timeout after four times the stream latency.
-
-            @todo should use a better time out value - if the user buffer
-            length is longer than the asio buffer size then that should
-            be taken into account.
-        */
-        if( WaitForSingleObject( theAsioStream->completedBuffersPlayedEvent,
-                (DWORD)(stream->streamRepresentation.streamInfo.outputLatency * 1000. * 4.) )
-                    == WAIT_TIMEOUT	 )
-        {
-            PA_DEBUG(("WaitForSingleObject() timed out in StopStream()\n" ));
-        }
-    }
-
-    asioError = ASIOStop();
-    if( asioError != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-    }
-
-    theAsioStream = 0;
-    stream->isActive = 0;
-
-    if( !stream->streamFinishedCallbackCalled )
-    {
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-
-    return result;
-}
-
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaAsioStream *stream = (PaAsioStream*)s;
-    ASIOError asioError;
-
-    stream->zeroOutput = true;
-
-    asioError = ASIOStop();
-    if( asioError != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-    }
-    else
-    {
-        // make sure that the callback is not still in-flight when ASIOStop()
-        // returns. This has been observed to happen on the Hoontech DSP24 for
-        // example.
-        int count = 2000;  // only wait for 2 seconds, rather than hanging.
-        while( theAsioStream->reenterCount != -1 && count > 0 )
-        {
-            Sleep(1);
-            --count;
-        }
-    }
-
-    /* it is questionable whether we should zero theAsioStream if ASIOStop()
-        returns an error, because the callback could still be active. We assume
-        not - this is based on the fact that ASIOStop is unlikely to fail
-        if the callback is running - it's more likely to fail because the
-        callback is not running. */
-        
-    theAsioStream = 0;
-    stream->isActive = 0;
-
-    if( !stream->streamFinishedCallbackCalled )
-    {
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-
-    return result;
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    //PaAsioStream *stream = (PaAsioStream*)s;
-    (void) s; /* unused parameter */
-    return theAsioStream == 0;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    return stream->isActive;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    (void) s; /* unused parameter */
-    return (double)timeGetTime() * .001;
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    (void) stream; /* unused parameters */
-    (void) buffer;
-    (void) frames;
-
-    return paNoError;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    (void) stream; /* unused parameters */
-    (void) buffer;
-    (void) frames;
-
-    return paNoError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    (void) stream; /* unused parameter */
-
-    return 0;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaAsioStream *stream = (PaAsioStream*)s;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    (void) stream; /* unused parameter */
-
-    return 0;
-}
-
-
-PaError PaAsio_ShowControlPanel( PaDeviceIndex device, void* systemSpecific )
-{
-	PaError result = paNoError;
-    PaUtilHostApiRepresentation *hostApi;
-    PaDeviceIndex hostApiDevice;
-    ASIODriverInfo asioDriverInfo;
-	ASIOError asioError;
-    int asioIsInitialized = 0;
-    PaAsioHostApiRepresentation *asioHostApi;
-    PaAsioDeviceInfo *asioDeviceInfo;
-
-
-    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
-    if( result != paNoError )
-        goto error;
-
-    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
-    if( result != paNoError )
-        goto error;
-
-    /*
-        In theory we could proceed if the currently open device was the same
-        one for which the control panel was requested, however  because the
-        window pointer is not available until this function is called we
-        currently need to call ASIOInit() again here, which of course can't be
-        done safely while a stream is open.
-    */
-
-    asioHostApi = (PaAsioHostApiRepresentation*)hostApi;
-    if( asioHostApi->openAsioDeviceIndex != paNoDevice )
-    {
-        result = paDeviceUnavailable;
-        goto error;
-    }
-
-    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
-
-    if( !loadAsioDriver( const_cast<char*>(asioDeviceInfo->commonDeviceInfo.name) ) )
-    {
-        result = paUnanticipatedHostError;
-        goto error;
-    }
-
-    /* CRUCIAL!!! */
-    memset( &asioDriverInfo, 0, sizeof(ASIODriverInfo) );
-    asioDriverInfo.asioVersion = 2;
-    asioDriverInfo.sysRef = systemSpecific;
-    asioError = ASIOInit( &asioDriverInfo );
-    if( asioError != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        goto error;
-    }
-    else
-    {
-        asioIsInitialized = 1;
-    }
-
-PA_DEBUG(("PaAsio_ShowControlPanel: ASIOInit(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
-PA_DEBUG(("asioVersion: ASIOInit(): %ld\n",   asioDriverInfo.asioVersion )); 
-PA_DEBUG(("driverVersion: ASIOInit(): %ld\n", asioDriverInfo.driverVersion )); 
-PA_DEBUG(("Name: ASIOInit(): %s\n",           asioDriverInfo.name )); 
-PA_DEBUG(("ErrorMessage: ASIOInit(): %s\n",   asioDriverInfo.errorMessage )); 
-
-    asioError = ASIOControlPanel();
-    if( asioError != ASE_OK )
-    {
-        PA_DEBUG(("PaAsio_ShowControlPanel: ASIOControlPanel(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        goto error;
-    }
-
-PA_DEBUG(("PaAsio_ShowControlPanel: ASIOControlPanel(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
-
-    asioError = ASIOExit();
-    if( asioError != ASE_OK )
-    {
-        result = paUnanticipatedHostError;
-        PA_ASIO_SET_LAST_ASIO_ERROR( asioError );
-        asioIsInitialized = 0;
-        goto error;
-    }
-
-PA_DEBUG(("PaAsio_ShowControlPanel: ASIOExit(): %s\n", PaAsio_GetAsioErrorText(asioError) ));
-
-	return result;
-
-error:
-    if( asioIsInitialized )
-        ASIOExit();
-
-	return result;
-}
-
-
-PaError PaAsio_GetInputChannelName( PaDeviceIndex device, int channelIndex,
-        const char** channelName )
-{
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *hostApi;
-    PaDeviceIndex hostApiDevice;
-    PaAsioDeviceInfo *asioDeviceInfo;
-
-
-    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
-    if( result != paNoError )
-        goto error;
-
-    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
-    if( result != paNoError )
-        goto error;
-
-    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
-
-    if( channelIndex < 0 || channelIndex >= asioDeviceInfo->commonDeviceInfo.maxInputChannels ){
-        result = paInvalidChannelCount;
-        goto error;
-    }
-
-    *channelName = asioDeviceInfo->asioChannelInfos[channelIndex].name;
-
-    return paNoError;
-    
-error:
-    return result;
-}
-
-
-PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex,
-        const char** channelName )
-{
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *hostApi;
-    PaDeviceIndex hostApiDevice;
-    PaAsioDeviceInfo *asioDeviceInfo;
-
-
-    result = PaUtil_GetHostApiRepresentation( &hostApi, paASIO );
-    if( result != paNoError )
-        goto error;
-
-    result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice, device, hostApi );
-    if( result != paNoError )
-        goto error;
-
-    asioDeviceInfo = (PaAsioDeviceInfo*)hostApi->deviceInfos[hostApiDevice];
-
-    if( channelIndex < 0 || channelIndex >= asioDeviceInfo->commonDeviceInfo.maxOutputChannels ){
-        result = paInvalidChannelCount;
-        goto error;
-    }
-
-    *channelName = asioDeviceInfo->asioChannelInfos[
-            asioDeviceInfo->commonDeviceInfo.maxInputChannels + channelIndex].name;
-
-    return paNoError;
-    
-error:
-    return result;
-}
diff --git a/libs/portaudio/src/hostapi/coreaudio/notes.txt b/libs/portaudio/src/hostapi/coreaudio/notes.txt
deleted file mode 100644
index 145afe1544..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/notes.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-Notes on status of CoreAudio Implementation of PortAudio
-
-Document Last Updated December 9, 2005
-
-There are currently two implementations of PortAudio for Mac Core Audio.
-
-The original is in pa_mac_core_old.c, and the newer, default implementation
-is in pa_mac_core.c.
-Only pa_mac_core.c is currently developed and supported as it uses apple's
-current core audio technology. To select use the old implementation, replace
-pa_mac_core.c with pa_mac_core_old.c (eg. "cp pa_mac_core_auhal.c
-pa_mac_core.c"), then run configure and make as usual.
-
--------------------------------------------
-
-Notes on Newer/Default AUHAL implementation:
-
-by Bjorn Roche
-
-Last Updated December 9, 2005
-
-Principle of Operation:
-
-This implementation uses AUHAL for audio I/O. To some extent, it also
-operates at the "HAL" Layer, though this behavior can be limited by
-platform specific flags (see pa_mac_core.h for details). The default
-settings should be reasonable: they don't change the SR of the device and
-don't cause interruptions if other devices are using the device.
-
-Major Software Elements Used: Apple's HAL AUs provide output SR
-conversion transparently, however, only on output, so this
-implementation uses AudioConverters to convert the sample rate on input.
-A PortAudio ring buffer is used to buffer input when sample rate
-conversion is required or when separate audio units are used for duplex
-IO. Finally, a PortAudio buffer processor is used to convert formats and
-provide additional buffers if needed. Internally, interleaved floating
-point data streams are used exclusively - the audio unit converts from
-the audio hardware's native format to interleaved float PCM and
-PortAudio's Buffer processor is used for conversion to user formats.
-
-Simplex Input: Simplex input uses a single callback. If sample rate
-conversion is required, a ring buffer and AudioConverter are used as
-well.
-
-Simplex output: Simplex output uses a single callback. No ring buffer or
-audio converter is used because AUHAL does its own output SR conversion.
-
-Duplex, one device (no SR conversion): When one device is used, a single
-callback is used. This achieves very low latency.
-
-Duplex, separate devices or SR conversion: When SR conversion is
-required, data must be buffered before it is converted and data is not
-always available at the same times on input and output, so SR conversion
-requires the same treatment as separate devices. The input callback
-reads data and puts it in the ring buffer. The output callback reads the
-data off the ring buffer, into an audio converter and finally to the
-buffer processor.
-
-Platform Specific Options:
-
-By using the flags in pa_mac_core.h, the user may specify several options.
-For example, the user can specify the sample-rate conversion quality, and
-the extent to which PA will attempt to "play nice" and to what extent it
-will interrupt other apps to improve performance. For example, if 44100 Hz
-sample rate is requested but the device is set at 48000 Hz, PA can either
-change the device for optimal playback ("Pro" mode), which may interrupt
-other programs playing back audio, or simple use a sample-rate coversion,
-which allows for friendlier sharing of the device ("Play Nice" mode).
-
-Additionally, the user may define a "channel mapping" by calling
-paSetupMacCoreChannelMap() on their stream info structure before opening
-the stream with it. See below for creating a channel map.
-
-Known issues:
-
-- Buffering: No buffering beyond that provided by core audio is provided
-except where absolutely needed for the implementation to work. This may cause
-issues with large framesPerBuffer settings and it also means that no additional
-latency will be provided even if a large latency setting is selected.
-
-- Latency: Latency settings are generally ignored. They may be used as a
-hint for buffer size in paHostFramesPerBufferUnspecified, or the value may
-be used in cases where additional buffering is needed, such as doing input and
-output on seperate devices. Latency settings are always automatically bound
-to "safe" values, however, so setting extreme values here should not be
-an issue.
-
-- Buffer Size: paHostFramesPerBufferUnspecified and specific host buffer sizes
-are supported. paHostFramesPerBufferUnspecified works best in "pro" mode,
-where the buffer size and sample rate of the audio device is most likely
-to match the expected values. In the case of paHostFramesPerBuffer, an
-appropriate framesPerBuffer value will be used that guarantees minimum
-requested latency if that's possible.
-
-- Timing info. It reports on stream time, but I'm probably doing something
-wrong since patest_sine_time often reports negative latency numbers. Also,
-there are currently issues with some devices whehn plugging/unplugging
-devices.
-
-- xrun detection: The only xrun detection performed is when reading
-and writing the ring buffer. There is probably more that can be done.
-
-- abort/stop issues: stopping a stream is always a complete operation,
-but latency should be low enough to make the lack of a separate abort
-unnecessary. Apple clarifies its AudioOutputUnitStop() call here:
-http://lists.apple.com/archives/coreaudio-api/2005/Dec/msg00055.html
-
-- blocking interface: should work fine.
-
-- multichannel: It has been tested successfully on multichannel hardware
-from MOTU: traveler and 896HD. Also Presonus firepod and others. It is
-believed to work with all Core Audio devices, including virtual devices
-such as soundflower.
-
-- sample rate conversion quality: By default, SR conversion is the maximum
-available. This can be tweaked using flags pa_mac_core.h. Note that the AU
-render quyality property is used to set the sample rate conversion quality
-as "documented" here:
-http://lists.apple.com/archives/coreaudio-api/2004/Jan/msg00141.html
-
-- x86/Universal Binary: Universal binaries can be build.
-
-
-
-Creating a channel map:
-
-How to create the map array -  Text taken From AUHAL.rtfd :
-[3] Channel Maps
-Clients can tell the AUHAL units which channels of the device they are interested in.  For example, the client may be processing stereo data, but outputting to a six-channel device.  This is done by using the kAudioOutputUnitProperty_ChannelMap property.  To use this property:
-
-For Output:
-Create an array of SInt32 that is the size of the number of channels of the device (Get the Format of the AUHAL's output Element == 0)
-Initialize each of the array's values to -1 (-1 indicates that that channel is NOT to be presented in the conversion.)
-
-Next, for each channel of your app's output, set:
-channelMapArray[deviceOutputChannel] = desiredAppOutputChannel.
-
-For example: we have a 6 channel output device and our application has a stereo source it wants to provide to the device.  Suppose we want that stereo source to go to the 3rd and 4th channels of the device. The channel map would look like this: { -1, -1, 0, 1, -1, -1 }
-
-Where the formats are:
-Input Element == 0: 2 channels (- client format - settable)
-Output Element == 0: 6 channels (- device format - NOT settable)
-
-So channel 2 (zero-based) of the device will take the first channel of output and channel 3 will take the second channel of output. (This translates to the 3rd and 4th plugs of the 6 output plugs of the device of course!)
-
-For Input:
-Create an array of SInt32 that is the size of the number of channels of the format you require for input.  Get (or Set in this case as needed) the AUHAL's output Element == 1.
-
-Next, for each channel of input you require, set:
-channelMapArray[desiredAppInputChannel] = deviceOutputChannel;
-
-For example: we have a 6 channel input device from which we wish to receive stereo input from the 3rd and 4th channels. The channel map looks like this: { 2, 3 }
-
-Where the formats are:
-Input Element == 0: 2 channels (- device format - NOT settable)
-Output Element == 0: 6 channels (- client format - settable)
-
-
-
-----------------------------------------
-
-Notes on Original implementation:
-
-by Phil Burk and Darren Gibbs
-
-Last updated March 20, 2002
-
-WHAT WORKS
-
-Output with very low latency, <10 msec.
-Half duplex input or output.
-Full duplex on the same CoreAudio device.
-The paFLoat32, paInt16, paInt8, paUInt8 sample formats.
-Pa_GetCPULoad()
-Pa_StreamTime()
-
-KNOWN BUGS OR LIMITATIONS
-
-We do not yet support simultaneous input and output on different 
-devices. Note that some CoreAudio devices like the Roland UH30 look 
-like one device but are actually two different CoreAudio devices. The 
-Built-In audio is typically one CoreAudio device.
-
-Mono doesn't work.
-
-DEVICE MAPPING
-
-CoreAudio devices can support both input and output. But the sample 
-rates supported may be different. So we have map one or two PortAudio 
-device to each CoreAudio device depending on whether it supports 
-input, output or both.
-
-When we query devices, we first get a list of CoreAudio devices. Then 
-we scan the list and add a PortAudio device for each CoreAudio device 
-that supports input. Then we make a scan for output devices.
-
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c
deleted file mode 100644
index 0c19d99771..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c
+++ /dev/null
@@ -1,2329 +0,0 @@
-/*
- * Implementation of the PortAudio API for Apple AUHAL
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file pa_mac_core
- @ingroup hostapi_src
- @author Bjorn Roche
- @brief AUHAL implementation of PortAudio
-*/
-
-/* FIXME: not all error conditions call PaUtil_SetLastHostErrorInfo()
- * PaMacCore_SetError() will do this.
- */
-
-#include "pa_mac_core_internal.h"
-
-#include <string.h> /* strlen(), memcmp() etc. */
-#include <libkern/OSAtomic.h>
-
-#include "pa_mac_core.h"
-#include "pa_mac_core_utilities.h"
-#include "pa_mac_core_blocking.h"
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* prototypes for functions declared in this file */
-
-PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-/*
- * Function declared in pa_mac_core.h. Sets up a PaMacCoreStreamInfoStruct
- * with the requested flags and initializes channel map.
- */
-void PaMacCore_SetupStreamInfo(  PaMacCoreStreamInfo *data, const unsigned long flags )
-{
-   bzero( data, sizeof( PaMacCoreStreamInfo ) );
-   data->size = sizeof( PaMacCoreStreamInfo );
-   data->hostApiType = paCoreAudio;
-   data->version = 0x01;
-   data->flags = flags;
-   data->channelMap = NULL;
-   data->channelMapSize = 0;
-}
-
-/*
- * Function declared in pa_mac_core.h. Adds channel mapping to a PaMacCoreStreamInfoStruct
- */
-void PaMacCore_SetupChannelMap( PaMacCoreStreamInfo *data, const SInt32 * const channelMap, const unsigned long channelMapSize )
-{
-   data->channelMap = channelMap;
-   data->channelMapSize = channelMapSize;
-}
-static char *channelName = NULL;
-static int channelNameSize = 0;
-static bool ensureChannelNameSize( int size )
-{
-   if( size >= channelNameSize ) {
-      free( channelName );
-      channelName = (char *) malloc( ( channelNameSize = size ) + 1 );
-      if( !channelName ) {
-         channelNameSize = 0;
-         return false;
-      }
-   }
-   return true;
-}
-/*
- * Function declared in pa_mac_core.h. retrives channel names.
- */
-const char *PaMacCore_GetChannelName( int device, int channelIndex, bool input )
-{
-   struct PaUtilHostApiRepresentation *hostApi;
-   PaError err;
-   OSStatus error;
-   err = PaUtil_GetHostApiRepresentation( &hostApi, paCoreAudio );
-   assert(err == paNoError);
-   PaMacAUHAL *macCoreHostApi = (PaMacAUHAL*)hostApi;
-   AudioDeviceID hostApiDevice = macCoreHostApi->devIds[device];
-
-   UInt32 size = 0;
-
-   error = AudioDeviceGetPropertyInfo( hostApiDevice,
-                                       channelIndex + 1,
-                                       input,
-                                       kAudioDevicePropertyChannelName,
-                                       &size,
-                                       NULL );
-   if( error ) {
-      //try the CFString
-      CFStringRef name;
-      bool isDeviceName = false;
-      size = sizeof( name );
-      error = AudioDeviceGetProperty( hostApiDevice,
-                                      channelIndex + 1,
-                                      input,
-                                      kAudioDevicePropertyChannelNameCFString,
-                                      &size,
-                                      &name );
-      if( error ) { //as a last-ditch effort, get the device name. Later we'll append the channel number.
-         size = sizeof( name );
-         error = AudioDeviceGetProperty( hostApiDevice,
-                                      channelIndex + 1,
-                                      input,
-                                      kAudioDevicePropertyDeviceNameCFString,
-                                      &size,
-                                      &name );
-         if( error )
-            return NULL;
-         isDeviceName = true;
-      }
-      if( isDeviceName ) {
-         name = CFStringCreateWithFormat( NULL, NULL, CFSTR( "%@: %d"), name, channelIndex + 1 );
-      }
-
-      CFIndex length = CFStringGetLength(name);
-      while( ensureChannelNameSize( length * sizeof(UniChar) + 1 ) ) {
-         if( CFStringGetCString( name, channelName, channelNameSize, kCFStringEncodingUTF8 ) ) {
-            if( isDeviceName )
-               CFRelease( name );
-            return channelName;
-         }
-         if( length == 0 )
-            ++length;
-         length *= 2;
-      }
-      if( isDeviceName )
-         CFRelease( name );
-      return NULL;
-   }
-
-   //continue with C string:
-   if( !ensureChannelNameSize( size ) )
-      return NULL;
-
-   error = AudioDeviceGetProperty( hostApiDevice,
-                                   channelIndex + 1,
-                                   input,
-                                   kAudioDevicePropertyChannelName,
-                                   &size,
-                                   channelName );
-
-   if( error ) {
-      ERR( error );
-      return NULL;
-   }
-   return channelName;
-}
-
-
-
-
-
-AudioDeviceID PaMacCore_GetStreamInputDevice( PaStream* s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    VVDBUG(("PaMacCore_GetStreamInputHandle()\n"));
-
-    return ( stream->inputDevice );
-}
-
-AudioDeviceID PaMacCore_GetStreamOutputDevice( PaStream* s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    VVDBUG(("PaMacCore_GetStreamOutputHandle()\n"));
-
-    return ( stream->outputDevice );
-}
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#define RING_BUFFER_ADVANCE_DENOMINATOR (4)
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static void setStreamStartTime( PaStream *stream );
-static OSStatus AudioIOProc( void *inRefCon,
-                               AudioUnitRenderActionFlags *ioActionFlags,
-                               const AudioTimeStamp *inTimeStamp,
-                               UInt32 inBusNumber,
-                               UInt32 inNumberFrames,
-                               AudioBufferList *ioData );
-static double GetStreamCpuLoad( PaStream* stream );
-
-static PaError GetChannelInfo( PaMacAUHAL *auhalHostApi,
-                               PaDeviceInfo *deviceInfo,
-                               AudioDeviceID macCoreDeviceId,
-                               int isInput);
-
-static PaError OpenAndSetupOneAudioUnit(
-                                   const PaMacCoreStream *stream,
-                                   const PaStreamParameters *inStreamParams,
-                                   const PaStreamParameters *outStreamParams,
-                                   const UInt32 requestedFramesPerBuffer,
-                                   UInt32 *actualInputFramesPerBuffer,
-                                   UInt32 *actualOutputFramesPerBuffer,
-                                   const PaMacAUHAL *auhalHostApi,
-                                   AudioUnit *audioUnit,
-                                   AudioConverterRef *srConverter,
-                                   AudioDeviceID *audioDevice,
-                                   const double sampleRate,
-                                   void *refCon );
-
-/* for setting errors. */
-#define PA_AUHAL_SET_LAST_HOST_ERROR( errorCode, errorText ) \
-    PaUtil_SetLastHostErrorInfo( paInDevelopment, errorCode, errorText )
-
-/*
- * Callback for setting over/underrun flags.
- *
- */
-static OSStatus xrunCallback(
-    AudioDeviceID inDevice, 
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID, 
-    void* inClientData)
-{
-   PaMacCoreStream *stream = (PaMacCoreStream *) inClientData;
-   if( stream->state != ACTIVE )
-      return 0; //if the stream isn't active, we don't care if the device is dropping
-   if( isInput )
-      OSAtomicOr32( paInputUnderflow, (uint32_t *)&(stream->xrunFlags) );
-   else
-      OSAtomicOr32( paOutputOverflow, (uint32_t *)&(stream->xrunFlags) );
-
-   return 0;
-}
-
-/*
- * Callback called when starting or stopping a stream.
- */
-static void startStopCallback(
-   void *               inRefCon,
-   AudioUnit            ci,
-   AudioUnitPropertyID  inID,
-   AudioUnitScope       inScope,
-   AudioUnitElement     inElement )
-{
-   PaMacCoreStream *stream = (PaMacCoreStream *) inRefCon;
-   UInt32 isRunning;
-   UInt32 size = sizeof( isRunning );
-   assert( !AudioUnitGetProperty( ci, kAudioOutputUnitProperty_IsRunning, inScope, inElement, &isRunning, &size ) );
-   if( isRunning )
-      return; //We are only interested in when we are stopping
-   // -- if we are using 2 I/O units, we only need one notification!
-   if( stream->inputUnit && stream->outputUnit && stream->inputUnit != stream->outputUnit && ci == stream->inputUnit )
-      return;
-   PaStreamFinishedCallback *sfc = stream->streamRepresentation.streamFinishedCallback;
-   if( stream->state == STOPPING )
-      stream->state = STOPPED ;
-   if( sfc )
-      sfc( stream->streamRepresentation.userData );
-}
-
-
-/*currently, this is only used in initialization, but it might be modified
-  to be used when the list of devices changes.*/
-static PaError gatherDeviceInfo(PaMacAUHAL *auhalHostApi)
-{
-    UInt32 size;
-    UInt32 propsize;
-    VVDBUG(("gatherDeviceInfo()\n"));
-    /* -- free any previous allocations -- */
-    if( auhalHostApi->devIds )
-        PaUtil_GroupFreeMemory(auhalHostApi->allocations, auhalHostApi->devIds);
-    auhalHostApi->devIds = NULL;
-
-    /* -- figure out how many devices there are -- */
-    AudioHardwareGetPropertyInfo( kAudioHardwarePropertyDevices,
-                                  &propsize,
-                                  NULL );
-    auhalHostApi->devCount = propsize / sizeof( AudioDeviceID );
-
-    VDBUG( ( "Found %ld device(s).\n", auhalHostApi->devCount ) );
-
-    /* -- copy the device IDs -- */
-    auhalHostApi->devIds = (AudioDeviceID *)PaUtil_GroupAllocateMemory(
-                             auhalHostApi->allocations,
-                             propsize );
-    if( !auhalHostApi->devIds )
-        return paInsufficientMemory;
-    AudioHardwareGetProperty( kAudioHardwarePropertyDevices,
-                                  &propsize,
-                                  auhalHostApi->devIds );
-#ifdef MAC_CORE_VERBOSE_DEBUG
-    {
-       int i;
-       for( i=0; i<auhalHostApi->devCount; ++i )
-          printf( "Device %d\t: %ld\n", i, auhalHostApi->devIds[i] );
-    }
-#endif
-
-    size = sizeof(AudioDeviceID);
-    auhalHostApi->defaultIn  = kAudioDeviceUnknown;
-    auhalHostApi->defaultOut = kAudioDeviceUnknown;
-
-    /* determine the default device. */
-    /* I am not sure how these calls to AudioHardwareGetProperty()
-       could fail, but in case they do, we use the first available
-       device as the default. */
-    if( 0 != AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,
-                     &size,
-                     &auhalHostApi->defaultIn) ) {
-       int i;
-       auhalHostApi->defaultIn  = kAudioDeviceUnknown;
-       VDBUG(("Failed to get default input device from OS."));
-       VDBUG((" I will substitute the first available input Device."));
-       for( i=0; i<auhalHostApi->devCount; ++i ) {
-          PaDeviceInfo devInfo;
-          if( 0 != GetChannelInfo( auhalHostApi, &devInfo,
-                                   auhalHostApi->devIds[i], TRUE ) )
-             if( devInfo.maxInputChannels ) {
-                auhalHostApi->defaultIn = auhalHostApi->devIds[i];
-                break;
-             }
-       }
-    }   
-    if( 0 != AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
-                     &size,
-                     &auhalHostApi->defaultOut) ) {
-       int i;
-       auhalHostApi->defaultIn  = kAudioDeviceUnknown;
-       VDBUG(("Failed to get default output device from OS."));
-       VDBUG((" I will substitute the first available output Device."));
-       for( i=0; i<auhalHostApi->devCount; ++i ) {
-          PaDeviceInfo devInfo;
-          if( 0 != GetChannelInfo( auhalHostApi, &devInfo,
-                                   auhalHostApi->devIds[i], FALSE ) )
-             if( devInfo.maxOutputChannels ) {
-                auhalHostApi->defaultOut = auhalHostApi->devIds[i];
-                break;
-             }
-       }
-    }   
-
-    VDBUG( ( "Default in : %ld\n", auhalHostApi->defaultIn  ) );
-    VDBUG( ( "Default out: %ld\n", auhalHostApi->defaultOut ) );
-
-    return paNoError;
-}
-
-static PaError GetChannelInfo( PaMacAUHAL *auhalHostApi,
-                               PaDeviceInfo *deviceInfo,
-                               AudioDeviceID macCoreDeviceId,
-                               int isInput)
-{
-    UInt32 propSize;
-    PaError err = paNoError;
-    UInt32 i;
-    int numChannels = 0;
-    AudioBufferList *buflist = NULL;
-    UInt32 frameLatency;
-
-    VVDBUG(("GetChannelInfo()\n"));
-
-    /* Get the number of channels from the stream configuration.
-       Fail if we can't get this. */
-
-    err = ERR(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, NULL));
-    if (err)
-        return err;
-
-    buflist = PaUtil_AllocateMemory(propSize);
-    if( !buflist )
-       return paInsufficientMemory;
-    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, buflist));
-    if (err)
-        goto error;
-
-    for (i = 0; i < buflist->mNumberBuffers; ++i)
-        numChannels += buflist->mBuffers[i].mNumberChannels;
-
-    if (isInput)
-        deviceInfo->maxInputChannels = numChannels;
-    else
-        deviceInfo->maxOutputChannels = numChannels;
-      
-    if (numChannels > 0) /* do not try to retrieve the latency if there is no channels. */
-    {
-       /* Get the latency.  Don't fail if we can't get this. */
-       /* default to something reasonable */
-       deviceInfo->defaultLowInputLatency = .01;
-       deviceInfo->defaultHighInputLatency = .10;
-       deviceInfo->defaultLowOutputLatency = .01;
-       deviceInfo->defaultHighOutputLatency = .10;
-       propSize = sizeof(UInt32);
-       err = WARNING(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyLatency, &propSize, &frameLatency));
-       if (!err)
-       {
-          /** FEEDBACK:
-           * This code was arrived at by trial and error, and some extentive, but not exhaustive
-           * testing. Sebastien Beaulieu <seb@plogue.com> has suggested using
-           * kAudioDevicePropertyLatency + kAudioDevicePropertySafetyOffset + buffer size instead.
-           * At the time this code was written, many users were reporting dropouts with audio
-           * programs that probably used this formula. This was probably
-           * around 10.4.4, and the problem is probably fixed now. So perhaps
-           * his formula should be reviewed and used.
-           * */
-          double secondLatency = frameLatency / deviceInfo->defaultSampleRate;
-          if (isInput)
-          {
-             deviceInfo->defaultLowInputLatency = 3 * secondLatency;
-             deviceInfo->defaultHighInputLatency = 3 * 10 * secondLatency;
-          }
-          else
-          {
-             deviceInfo->defaultLowOutputLatency = 3 * secondLatency;
-             deviceInfo->defaultHighOutputLatency = 3 * 10 * secondLatency;
-          }
-       }
-    }
-    PaUtil_FreeMemory( buflist );
-    return paNoError;
- error:
-    PaUtil_FreeMemory( buflist );
-    return err;
-}
-
-static PaError InitializeDeviceInfo( PaMacAUHAL *auhalHostApi,
-                                     PaDeviceInfo *deviceInfo,
-                                     AudioDeviceID macCoreDeviceId,
-                                     PaHostApiIndex hostApiIndex )
-{
-    Float64 sampleRate;
-    char *name;
-    PaError err = paNoError;
-    UInt32 propSize;
-
-    VVDBUG(("InitializeDeviceInfo(): macCoreDeviceId=%ld\n", macCoreDeviceId));
-
-    memset(deviceInfo, 0, sizeof(deviceInfo));
-
-    deviceInfo->structVersion = 2;
-    deviceInfo->hostApi = hostApiIndex;
-
-    /* Get the device name.  Fail if we can't get it. */
-    err = ERR(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, NULL));
-    if (err)
-        return err;
-
-    name = PaUtil_GroupAllocateMemory(auhalHostApi->allocations,propSize);
-    if ( !name )
-        return paInsufficientMemory;
-    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, name));
-    if (err)
-        return err;
-    deviceInfo->name = name;
-
-    /* Try to get the default sample rate.  Don't fail if we can't get this. */
-    propSize = sizeof(Float64);
-    err = ERR(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyNominalSampleRate, &propSize, &sampleRate));
-    if (err)
-        deviceInfo->defaultSampleRate = 0.0;
-    else
-        deviceInfo->defaultSampleRate = sampleRate;
-
-    /* Get the maximum number of input and output channels.  Fail if we can't get this. */
-
-    err = GetChannelInfo(auhalHostApi, deviceInfo, macCoreDeviceId, 1);
-    if (err)
-        return err;
-
-    err = GetChannelInfo(auhalHostApi, deviceInfo, macCoreDeviceId, 0);
-    if (err)
-        return err;
-
-    return paNoError;
-}
-
-PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i;
-    PaMacAUHAL *auhalHostApi;
-    PaDeviceInfo *deviceInfoArray;
-
-    VVDBUG(("PaMacCore_Initialize(): hostApiIndex=%d\n", hostApiIndex));
-
-    auhalHostApi = (PaMacAUHAL*)PaUtil_AllocateMemory( sizeof(PaMacAUHAL) );
-    if( !auhalHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    auhalHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !auhalHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    auhalHostApi->devIds = NULL;
-    auhalHostApi->devCount = 0;
-
-    /* get the info we need about the devices */
-    result = gatherDeviceInfo( auhalHostApi );
-    if( result != paNoError )
-       goto error;
-
-    *hostApi = &auhalHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paCoreAudio;
-    (*hostApi)->info.name = "Core Audio";
-
-    (*hostApi)->info.defaultInputDevice = paNoDevice;
-    (*hostApi)->info.defaultOutputDevice = paNoDevice;
-
-    (*hostApi)->info.deviceCount = 0;  
-
-    if( auhalHostApi->devCount > 0 )
-    {
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                auhalHostApi->allocations, sizeof(PaDeviceInfo*) * auhalHostApi->devCount);
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaDeviceInfo*)PaUtil_GroupAllocateMemory(
-                auhalHostApi->allocations, sizeof(PaDeviceInfo) * auhalHostApi->devCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( i=0; i < auhalHostApi->devCount; ++i )
-        {
-            int err;
-            err = InitializeDeviceInfo( auhalHostApi, &deviceInfoArray[i],
-                                      auhalHostApi->devIds[i],
-                                      hostApiIndex );
-            if (err == paNoError)
-            { /* copy some info and set the defaults */
-                (*hostApi)->deviceInfos[(*hostApi)->info.deviceCount] = &deviceInfoArray[i];
-                if (auhalHostApi->devIds[i] == auhalHostApi->defaultIn)
-                    (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
-                if (auhalHostApi->devIds[i] == auhalHostApi->defaultOut)
-                    (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
-                (*hostApi)->info.deviceCount++;
-            }
-            else
-            { /* there was an error. we need to shift the devices down, so we ignore this one */
-                int j;
-                auhalHostApi->devCount--;
-                for( j=i; j<auhalHostApi->devCount; ++j )
-                   auhalHostApi->devIds[j] = auhalHostApi->devIds[j+1];
-                i--;
-            }
-        }
-    }
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &auhalHostApi->callbackStreamInterface,
-                                      CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped,
-                                      IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable,
-                                      PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &auhalHostApi->blockingStreamInterface,
-                                      CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped,
-                                      IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream,
-                                      GetStreamReadAvailable,
-                                      GetStreamWriteAvailable );
-
-    return result;
-
-error:
-    if( auhalHostApi )
-    {
-        if( auhalHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( auhalHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( auhalHostApi->allocations );
-        }
-                
-        PaUtil_FreeMemory( auhalHostApi );
-    }
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaMacAUHAL *auhalHostApi = (PaMacAUHAL*)hostApi;
-
-    VVDBUG(("Terminate()\n"));
-
-    /*
-        IMPLEMENT ME:
-            - clean up any resources not handled by the allocation group
-        TODO: Double check that everything is handled by alloc group
-    */
-
-    if( auhalHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( auhalHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( auhalHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( auhalHostApi );
-}
-
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-
-    VVDBUG(("IsFormatSupported(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld sampleRate=%g\n",
-                inputParameters  ? inputParameters->channelCount  : -1,
-                inputParameters  ? inputParameters->sampleFormat  : -1,
-                outputParameters ? outputParameters->channelCount : -1,
-                outputParameters ? outputParameters->sampleFormat : -1,
-                (float) sampleRate ));
- 
-    /** These first checks are standard PA checks. We do some fancier checks
-        later. */
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support outputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
- 
-    /* FEEDBACK */
-    /*        I think the only way to check a given format SR combo is     */
-    /*        to try opening it. This could be disruptive, is that Okay?   */
-    /*        The alternative is to just read off available sample rates,  */
-    /*        but this will not work %100 of the time (eg, a device that   */
-    /*        supports N output at one rate but only N/2 at a higher rate.)*/
-
-    /* The following code opens the device with the requested parameters to
-       see if it works. */
-    {
-       PaError err;
-       PaStream *s;
-       err = OpenStream( hostApi, &s, inputParameters, outputParameters,
-                           sampleRate, 1024, 0, (PaStreamCallback *)1, NULL );
-       if( err != paNoError && err != paInvalidSampleRate )
-          DBUG( ( "OpenStream @ %g returned: %d: %s\n",
-                  (float) sampleRate, err, Pa_GetErrorText( err ) ) );
-       if( err ) 
-          return err;
-       err = CloseStream( s );
-       if( err ) {
-          /* FEEDBACK: is this more serious? should we assert? */
-          DBUG( ( "WARNING: could not close Stream. %d: %s\n",
-                  err, Pa_GetErrorText( err ) ) );
-       }
-    }
-
-    return paFormatIsSupported;
-}
-
-static PaError OpenAndSetupOneAudioUnit(
-                                   const PaMacCoreStream *stream,
-                                   const PaStreamParameters *inStreamParams,
-                                   const PaStreamParameters *outStreamParams,
-                                   const UInt32 requestedFramesPerBuffer,
-                                   UInt32 *actualInputFramesPerBuffer,
-                                   UInt32 *actualOutputFramesPerBuffer,
-                                   const PaMacAUHAL *auhalHostApi,
-                                   AudioUnit *audioUnit,
-                                   AudioConverterRef *srConverter,
-                                   AudioDeviceID *audioDevice,
-                                   const double sampleRate,
-                                   void *refCon )
-{
-    ComponentDescription desc;
-    Component comp;
-    /*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
-    AudioStreamBasicDescription desiredFormat;
-    OSStatus result = noErr;
-    PaError paResult = paNoError;
-    int line = 0;
-    UInt32 callbackKey;
-    AURenderCallbackStruct rcbs;
-    unsigned long macInputStreamFlags  = paMacCorePlayNice;
-    unsigned long macOutputStreamFlags = paMacCorePlayNice;
-    SInt32 const *inChannelMap = NULL;
-    SInt32 const *outChannelMap = NULL;
-    unsigned long inChannelMapSize = 0;
-    unsigned long outChannelMapSize = 0;
-
-    VVDBUG(("OpenAndSetupOneAudioUnit(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld, requestedFramesPerBuffer=%ld\n",
-                inStreamParams  ? inStreamParams->channelCount  : -1,
-                inStreamParams  ? inStreamParams->sampleFormat  : -1,
-                outStreamParams ? outStreamParams->channelCount : -1,
-                outStreamParams ? outStreamParams->sampleFormat : -1,
-                requestedFramesPerBuffer ));
-
-    /* -- handle the degenerate case  -- */
-    if( !inStreamParams && !outStreamParams ) {
-       *audioUnit = NULL;
-       *audioDevice = kAudioDeviceUnknown;
-       return paNoError;
-    }
-
-    /* -- get the user's api specific info, if they set any -- */
-    if( inStreamParams && inStreamParams->hostApiSpecificStreamInfo )
-    {
-       macInputStreamFlags=
-            ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
-                  ->flags;
-       inChannelMap = ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
-                  ->channelMap;
-       inChannelMapSize = ((PaMacCoreStreamInfo*)inStreamParams->hostApiSpecificStreamInfo)
-                  ->channelMapSize;
-    }
-    if( outStreamParams && outStreamParams->hostApiSpecificStreamInfo )
-    {
-       macOutputStreamFlags=
-            ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
-                  ->flags;
-       outChannelMap = ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
-                  ->channelMap;
-       outChannelMapSize = ((PaMacCoreStreamInfo*)outStreamParams->hostApiSpecificStreamInfo)
-                  ->channelMapSize; 
-    }
-    /* Override user's flags here, if desired for testing. */
-
-    /*
-     * The HAL AU is a Mac OS style "component".
-     * the first few steps deal with that.
-     * Later steps work on a combination of Mac OS
-     * components and the slightly lower level
-     * HAL.
-     */
-
-    /* -- describe the output type AudioUnit -- */
-    /*  Note: for the default AudioUnit, we could use the
-     *  componentSubType value kAudioUnitSubType_DefaultOutput;
-     *  but I don't think that's relevant here.
-     */
-    desc.componentType         = kAudioUnitType_Output;
-    desc.componentSubType      = kAudioUnitSubType_HALOutput;
-    desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-    desc.componentFlags        = 0;
-    desc.componentFlagsMask    = 0;
-    /* -- find the component -- */
-    comp = FindNextComponent( NULL, &desc );
-    if( !comp )
-    {
-       DBUG( ( "AUHAL component not found." ) );
-       *audioUnit = NULL;
-       *audioDevice = kAudioDeviceUnknown;
-       return paUnanticipatedHostError;
-    }
-    /* -- open it -- */
-    result = OpenAComponent( comp, audioUnit );
-    if( result )
-    {
-       DBUG( ( "Failed to open AUHAL component." ) );
-       *audioUnit = NULL;
-       *audioDevice = kAudioDeviceUnknown;
-       return ERR( result );
-    }
-    /* -- prepare a little error handling logic / hackery -- */
-#define ERR_WRAP(mac_err) do { result = mac_err ; line = __LINE__ ; if ( result != noErr ) goto error ; } while(0)
-
-    /* -- if there is input, we have to explicitly enable input -- */
-    if( inStreamParams )
-    {
-       UInt32 enableIO = 1;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                 kAudioOutputUnitProperty_EnableIO,
-                 kAudioUnitScope_Input,
-                 INPUT_ELEMENT,
-                 &enableIO,
-                 sizeof(enableIO) ) );
-    }
-    /* -- if there is no output, we must explicitly disable output -- */
-    if( !outStreamParams )
-    {
-       UInt32 enableIO = 0;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                 kAudioOutputUnitProperty_EnableIO,
-                 kAudioUnitScope_Output,
-                 OUTPUT_ELEMENT,
-                 &enableIO,
-                 sizeof(enableIO) ) );
-    }
-
-    /* -- set the devices -- */
-    /* make sure input and output are the same device if we are doing input and
-       output. */
-    if( inStreamParams && outStreamParams )
-    {
-       assert( outStreamParams->device == inStreamParams->device );
-    }
-    if( inStreamParams )
-    {
-       *audioDevice = auhalHostApi->devIds[inStreamParams->device] ;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                    kAudioOutputUnitProperty_CurrentDevice,
-                    kAudioUnitScope_Global,
-                    INPUT_ELEMENT,
-                    audioDevice,
-                    sizeof(AudioDeviceID) ) );
-    }
-    if( outStreamParams && outStreamParams != inStreamParams )
-    {
-       *audioDevice = auhalHostApi->devIds[outStreamParams->device] ;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                    kAudioOutputUnitProperty_CurrentDevice,
-                    kAudioUnitScope_Global,
-                    OUTPUT_ELEMENT,
-                    audioDevice,
-                    sizeof(AudioDeviceID) ) );
-    }
-    /* -- add listener for dropouts -- */
-    ERR_WRAP( AudioDeviceAddPropertyListener( *audioDevice,
-                                              0,
-                                              outStreamParams ? false : true,
-                                              kAudioDeviceProcessorOverload,
-                                              xrunCallback,
-                                              (void *)stream) );
-
-    /* -- listen for stream start and stop -- */
-    ERR_WRAP( AudioUnitAddPropertyListener( *audioUnit,
-                                            kAudioOutputUnitProperty_IsRunning,
-                                            startStopCallback,
-                                            (void *)stream ) );
-
-    /* -- set format -- */
-    bzero( &desiredFormat, sizeof(desiredFormat) );
-    desiredFormat.mFormatID         = kAudioFormatLinearPCM ;
-    desiredFormat.mFormatFlags      = kAudioFormatFlagsNativeFloatPacked;
-    desiredFormat.mFramesPerPacket  = 1;
-    desiredFormat.mBitsPerChannel   = sizeof( float ) * 8;
-
-    result = 0;
-    /*  set device format first, but only touch the device if the user asked */
-    if( inStreamParams ) {
-       /*The callback never calls back if we don't set the FPB */
-       /*This seems wierd, because I would think setting anything on the device
-         would be disruptive.*/
-       paResult = setBestFramesPerBuffer( *audioDevice, FALSE,
-                                          requestedFramesPerBuffer,
-                                          actualInputFramesPerBuffer );
-       if( paResult ) goto error;
-       if( macInputStreamFlags & paMacCoreChangeDeviceParameters ) {
-          bool requireExact;
-          requireExact=macInputStreamFlags & paMacCoreFailIfConversionRequired;
-          paResult = setBestSampleRateForDevice( *audioDevice, FALSE,
-                                                 requireExact, sampleRate );
-          if( paResult ) goto error;
-       }
-       if( actualInputFramesPerBuffer && actualOutputFramesPerBuffer )
-          *actualOutputFramesPerBuffer = *actualInputFramesPerBuffer ;
-    }
-    if( outStreamParams && !inStreamParams ) {
-       /*The callback never calls back if we don't set the FPB */
-       /*This seems wierd, because I would think setting anything on the device
-         would be disruptive.*/
-       paResult = setBestFramesPerBuffer( *audioDevice, TRUE,
-                                          requestedFramesPerBuffer,
-                                          actualOutputFramesPerBuffer );
-       if( paResult ) goto error;
-       if( macOutputStreamFlags & paMacCoreChangeDeviceParameters ) {
-          bool requireExact;
-          requireExact=macOutputStreamFlags & paMacCoreFailIfConversionRequired;
-          paResult = setBestSampleRateForDevice( *audioDevice, TRUE,
-                                                 requireExact, sampleRate );
-          if( paResult ) goto error;
-       }
-    }
-
-    /* -- set the quality of the output converter -- */
-    if( outStreamParams ) {
-       UInt32 value = kAudioConverterQuality_Max;
-       switch( macOutputStreamFlags & 0x0700 ) {
-       case 0x0100: /*paMacCore_ConversionQualityMin:*/
-          value=kRenderQuality_Min;
-          break;
-       case 0x0200: /*paMacCore_ConversionQualityLow:*/
-          value=kRenderQuality_Low;
-          break;
-       case 0x0300: /*paMacCore_ConversionQualityMedium:*/
-          value=kRenderQuality_Medium;
-          break;
-       case 0x0400: /*paMacCore_ConversionQualityHigh:*/
-          value=kRenderQuality_High;
-          break;
-       }
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                    kAudioUnitProperty_RenderQuality,
-                    kAudioUnitScope_Global,
-                    OUTPUT_ELEMENT,
-                    &value,
-                    sizeof(value) ) );
-    }
-    /* now set the format on the Audio Units. */
-    if( outStreamParams )
-    {
-       desiredFormat.mSampleRate    =sampleRate;
-       desiredFormat.mBytesPerPacket=sizeof(float)*outStreamParams->channelCount;
-       desiredFormat.mBytesPerFrame =sizeof(float)*outStreamParams->channelCount;
-       desiredFormat.mChannelsPerFrame = outStreamParams->channelCount;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                            kAudioUnitProperty_StreamFormat,
-                            kAudioUnitScope_Input,
-                            OUTPUT_ELEMENT,
-                            &desiredFormat,
-                            sizeof(AudioStreamBasicDescription) ) );
-    }
-    if( inStreamParams )
-    {
-       AudioStreamBasicDescription sourceFormat;
-       UInt32 size = sizeof( AudioStreamBasicDescription );
-
-       /* keep the sample rate of the device, or we confuse AUHAL */
-       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
-                            kAudioUnitProperty_StreamFormat,
-                            kAudioUnitScope_Input,
-                            INPUT_ELEMENT,
-                            &sourceFormat,
-                            &size ) );
-       desiredFormat.mSampleRate = sourceFormat.mSampleRate;
-       desiredFormat.mBytesPerPacket=sizeof(float)*inStreamParams->channelCount;
-       desiredFormat.mBytesPerFrame =sizeof(float)*inStreamParams->channelCount;
-       desiredFormat.mChannelsPerFrame = inStreamParams->channelCount;
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                            kAudioUnitProperty_StreamFormat,
-                            kAudioUnitScope_Output,
-                            INPUT_ELEMENT,
-                            &desiredFormat,
-                            sizeof(AudioStreamBasicDescription) ) );
-    }
-    /* set the maximumFramesPerSlice */
-    /* not doing this causes real problems
-       (eg. the callback might not be called). The idea of setting both this
-       and the frames per buffer on the device is that we'll be most likely
-       to actually get the frame size we requested in the callback with the
-       minimum latency. */
-    if( outStreamParams ) {
-       UInt32 size = sizeof( *actualOutputFramesPerBuffer );
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                            kAudioUnitProperty_MaximumFramesPerSlice,
-                            kAudioUnitScope_Input,
-                            OUTPUT_ELEMENT,
-                            actualOutputFramesPerBuffer,
-                            sizeof(*actualOutputFramesPerBuffer) ) );
-       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
-                            kAudioUnitProperty_MaximumFramesPerSlice,
-                            kAudioUnitScope_Global,
-                            OUTPUT_ELEMENT,
-                            actualOutputFramesPerBuffer,
-                            &size ) );
-    }
-    if( inStreamParams ) {
-       /*UInt32 size = sizeof( *actualInputFramesPerBuffer );*/
-       ERR_WRAP( AudioUnitSetProperty( *audioUnit,
-                            kAudioUnitProperty_MaximumFramesPerSlice,
-                            kAudioUnitScope_Output,
-                            INPUT_ELEMENT,
-                            actualInputFramesPerBuffer,
-                            sizeof(*actualInputFramesPerBuffer) ) );
-/* Don't know why this causes problems
-       ERR_WRAP( AudioUnitGetProperty( *audioUnit,
-                            kAudioUnitProperty_MaximumFramesPerSlice,
-                            kAudioUnitScope_Global, //Output,
-                            INPUT_ELEMENT,
-                            actualInputFramesPerBuffer,
-                            &size ) );
-*/
-    }
-
-    /* -- if we have input, we may need to setup an SR converter -- */
-    /* even if we got the sample rate we asked for, we need to do
-       the conversion in case another program changes the underlying SR. */
-    /* FIXME: I think we need to monitor stream and change the converter if the incoming format changes. */
-    if( inStreamParams ) {
-       AudioStreamBasicDescription desiredFormat;
-       AudioStreamBasicDescription sourceFormat;
-       UInt32 sourceSize = sizeof( sourceFormat );
-       bzero( &desiredFormat, sizeof(desiredFormat) );
-       desiredFormat.mSampleRate       = sampleRate;
-       desiredFormat.mFormatID         = kAudioFormatLinearPCM ;
-       desiredFormat.mFormatFlags      = kAudioFormatFlagsNativeFloatPacked;
-       desiredFormat.mFramesPerPacket  = 1;
-       desiredFormat.mBitsPerChannel   = sizeof( float ) * 8;
-       desiredFormat.mBytesPerPacket=sizeof(float)*inStreamParams->channelCount;
-       desiredFormat.mBytesPerFrame =sizeof(float)*inStreamParams->channelCount;
-       desiredFormat.mChannelsPerFrame = inStreamParams->channelCount;
-
-       /* get the source format */
-       ERR_WRAP( AudioUnitGetProperty(
-                         *audioUnit,
-                         kAudioUnitProperty_StreamFormat,
-                         kAudioUnitScope_Output,
-                         INPUT_ELEMENT,
-                         &sourceFormat,
-                         &sourceSize ) );
-
-       if( desiredFormat.mSampleRate != sourceFormat.mSampleRate )
-       {
-          UInt32 value = kAudioConverterQuality_Max;
-          switch( macInputStreamFlags & 0x0700 ) {
-          case 0x0100: /*paMacCore_ConversionQualityMin:*/
-             value=kAudioConverterQuality_Min;
-             break;
-          case 0x0200: /*paMacCore_ConversionQualityLow:*/
-             value=kAudioConverterQuality_Low;
-             break;
-          case 0x0300: /*paMacCore_ConversionQualityMedium:*/
-             value=kAudioConverterQuality_Medium;
-             break;
-          case 0x0400: /*paMacCore_ConversionQualityHigh:*/
-             value=kAudioConverterQuality_High;
-             break;
-          }
-          VDBUG(( "Creating sample rate converter for input"
-                  " to convert from %g to %g\n",
-                  (float)sourceFormat.mSampleRate,
-                  (float)desiredFormat.mSampleRate ) );
-          /* create our converter */
-          ERR_WRAP( AudioConverterNew( 
-                             &sourceFormat,
-                             &desiredFormat,
-                             srConverter ) );
-          /* Set quality */
-          ERR_WRAP( AudioConverterSetProperty(
-                             *srConverter,
-                             kAudioConverterSampleRateConverterQuality,
-                             sizeof( value ),
-                             &value ) );
-       }
-    }
-    /* -- set IOProc (callback) -- */
-    callbackKey = outStreamParams ? kAudioUnitProperty_SetRenderCallback
-                                  : kAudioOutputUnitProperty_SetInputCallback ;
-    rcbs.inputProc = AudioIOProc;
-    rcbs.inputProcRefCon = refCon;
-    ERR_WRAP( AudioUnitSetProperty(
-                               *audioUnit,
-                               callbackKey,
-                               kAudioUnitScope_Output,
-                               outStreamParams ? OUTPUT_ELEMENT : INPUT_ELEMENT,
-                               &rcbs,
-                               sizeof(rcbs)) );
-
-    if( inStreamParams && outStreamParams && *srConverter )
-           ERR_WRAP( AudioUnitSetProperty(
-                               *audioUnit,
-                               kAudioOutputUnitProperty_SetInputCallback,
-                               kAudioUnitScope_Output,
-                               INPUT_ELEMENT,
-                               &rcbs,
-                               sizeof(rcbs)) );
-
-    /* channel mapping. */
-    if(inChannelMap)
-    {
-        UInt32 mapSize = inChannelMapSize *sizeof(SInt32);
-
-        //for each channel of desired input, map the channel from
-        //the device's output channel.
-        ERR_WRAP( AudioUnitSetProperty(*audioUnit,
-                                kAudioOutputUnitProperty_ChannelMap,
-                                kAudioUnitScope_Output,
-                                INPUT_ELEMENT,
-                                inChannelMap,
-                                mapSize));
-    }
-    if(outChannelMap)
-    {
-        UInt32 mapSize = outChannelMapSize *sizeof(SInt32);
-
-        //for each channel of desired output, map the channel from
-        //the device's output channel.
-        ERR_WRAP(AudioUnitSetProperty(*audioUnit,
-                                kAudioOutputUnitProperty_ChannelMap,
-                                kAudioUnitScope_Output,
-                                OUTPUT_ELEMENT,
-                                outChannelMap,
-                                mapSize));
-    }
-    /* initialize the audio unit */
-    ERR_WRAP( AudioUnitInitialize(*audioUnit) );
-
-    if( inStreamParams && outStreamParams )
-       VDBUG( ("Opened device %ld for input and output.\n", *audioDevice ) );
-    else if( inStreamParams )
-       VDBUG( ("Opened device %ld for input.\n", *audioDevice ) );
-    else if( outStreamParams )
-       VDBUG( ("Opened device %ld for output.\n", *audioDevice ) );
-    return paNoError;
-#undef ERR_WRAP
-
-    error:
-       CloseComponent( *audioUnit );
-       *audioUnit = NULL;
-       if( result )
-          return PaMacCore_SetError( result, line, 1 );
-       return paResult;
-}
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaMacAUHAL *auhalHostApi = (PaMacAUHAL*)hostApi;
-    PaMacCoreStream *stream = 0;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-    VVDBUG(("OpenStream(): in chan=%d, in fmt=%ld, out chan=%d, out fmt=%ld SR=%g, FPB=%ld\n",
-                inputParameters  ? inputParameters->channelCount  : -1,
-                inputParameters  ? inputParameters->sampleFormat  : -1,
-                outputParameters ? outputParameters->channelCount : -1,
-                outputParameters ? outputParameters->sampleFormat : -1,
-                (float) sampleRate,
-                framesPerBuffer ));
-    VDBUG( ("Opening Stream.\n") );
-
-    /*These first few bits of code are from paSkeleton with few modifications.*/
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* Host supports interleaved float32 */
-        hostInputSampleFormat = paFloat32;
-    }
-    else
-    {
-        inputChannelCount = 0;
-        inputSampleFormat = hostInputSampleFormat = paFloat32; /* Surpress 'uninitialised var' warnings. */
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* Host supports interleaved float32 */
-        hostOutputSampleFormat = paFloat32;
-    }
-    else
-    {
-        outputChannelCount = 0;
-        outputSampleFormat = hostOutputSampleFormat = paFloat32; /* Surpress 'uninitialized var' warnings. */
-    }
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-    stream = (PaMacCoreStream*)PaUtil_AllocateMemory( sizeof(PaMacCoreStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    /* If we fail after this point, we my be left in a bad state, with
-       some data structures setup and others not. So, first thing we
-       do is initialize everything so that if we fail, we know what hasn't
-       been touched.
-     */
-
-    stream->inputAudioBufferList.mBuffers[0].mData = NULL;
-    stream->inputRingBuffer.buffer = NULL;
-    bzero( &stream->blio, sizeof( PaMacBlio ) );
-/*
-    stream->blio.inputRingBuffer.buffer = NULL;
-    stream->blio.outputRingBuffer.buffer = NULL;
-    stream->blio.inputSampleFormat = inputParameters?inputParameters->sampleFormat:0;
-    stream->blio.inputSampleSize = computeSampleSizeFromFormat(stream->blio.inputSampleFormat);
-    stream->blio.outputSampleFormat=outputParameters?outputParameters->sampleFormat:0;
-    stream->blio.outputSampleSize = computeSampleSizeFromFormat(stream->blio.outputSampleFormat);
-*/
-    stream->inputSRConverter = NULL;
-    stream->inputUnit = NULL;
-    stream->outputUnit = NULL;
-    stream->inputFramesPerBuffer = 0;
-    stream->outputFramesPerBuffer = 0;
-    stream->bufferProcessorIsInitialized = FALSE;
-
-    /* assert( streamCallback ) ; */ /* only callback mode is implemented */
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                        &auhalHostApi->callbackStreamInterface,
-                                        streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                        &auhalHostApi->blockingStreamInterface,
-                                        BlioCallback, &stream->blio );
-    }
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-    /* -- handle paFramesPerBufferUnspecified -- */
-    if( framesPerBuffer == paFramesPerBufferUnspecified ) {
-       long requested = 64;
-       if( inputParameters )
-          requested = MAX( requested, inputParameters->suggestedLatency * sampleRate / 2 );
-       if( outputParameters )
-          requested = MAX( requested, outputParameters->suggestedLatency *sampleRate / 2 );
-       VDBUG( ("Block Size unspecified. Based on Latency, the user wants a Block Size near: %ld.\n",
-              requested ) );
-       if( requested <= 64 ) {
-          /*requested a realtively low latency. make sure this is in range of devices */
-          /*try to get the device's min natural buffer size and use that (but no smaller than 64).*/
-          AudioValueRange audioRange;
-          UInt32 size = sizeof( audioRange );
-          if( inputParameters ) {
-             WARNING( result = AudioDeviceGetProperty( auhalHostApi->devIds[inputParameters->device],
-                                          0,
-                                          false,
-                                          kAudioDevicePropertyBufferFrameSizeRange,
-                                          &size, &audioRange ) );
-             if( result )
-                requested = MAX( requested, audioRange.mMinimum );
-          }
-          size = sizeof( audioRange );
-          if( outputParameters ) {
-             WARNING( result = AudioDeviceGetProperty( auhalHostApi->devIds[outputParameters->device],
-                                          0,
-                                          false,
-                                          kAudioDevicePropertyBufferFrameSizeRange,
-                                          &size, &audioRange ) );
-             if( result )
-                requested = MAX( requested, audioRange.mMinimum );
-          }
-       } else {
-          /* requested a realtively high latency. make sure this is in range of devices */
-          /*try to get the device's max natural buffer size and use that (but no larger than 1024).*/
-          AudioValueRange audioRange;
-          UInt32 size = sizeof( audioRange );
-          requested = MIN( requested, 1024 );
-          if( inputParameters ) {
-             WARNING( result = AudioDeviceGetProperty( auhalHostApi->devIds[inputParameters->device],
-                                          0,
-                                          false,
-                                          kAudioDevicePropertyBufferFrameSizeRange,
-                                          &size, &audioRange ) );
-             if( result )
-                requested = MIN( requested, audioRange.mMaximum );
-          }
-          size = sizeof( audioRange );
-          if( outputParameters ) {
-             WARNING( result = AudioDeviceGetProperty( auhalHostApi->devIds[outputParameters->device],
-                                          0,
-                                          false,
-                                          kAudioDevicePropertyBufferFrameSizeRange,
-                                          &size, &audioRange ) );
-             if( result )
-                requested = MIN( requested, audioRange.mMaximum );
-          }
-       }
-       /* -- double check ranges -- */
-       if( requested > 1024 ) requested = 1024;
-       if( requested < 64 ) requested = 64;
-       VDBUG(("After querying hardware, setting block size to %ld.\n", requested));
-       framesPerBuffer = requested;
-    }
-
-    /* -- Now we actually open and setup streams. -- */
-    if( inputParameters && outputParameters && outputParameters->device == inputParameters->device )
-    { /* full duplex. One device. */
-       UInt32 inputFramesPerBuffer  = (UInt32) stream->inputFramesPerBuffer;
-       UInt32 outputFramesPerBuffer = (UInt32) stream->outputFramesPerBuffer;
-       result = OpenAndSetupOneAudioUnit( stream,
-                                          inputParameters,
-                                          outputParameters,
-                                          framesPerBuffer,
-                                          &inputFramesPerBuffer,
-                                          &outputFramesPerBuffer,
-                                          auhalHostApi,
-                                          &(stream->inputUnit),
-                                          &(stream->inputSRConverter),
-                                          &(stream->inputDevice),
-                                          sampleRate,
-                                          stream );
-       stream->inputFramesPerBuffer = inputFramesPerBuffer;
-       stream->outputFramesPerBuffer = outputFramesPerBuffer;
-       stream->outputUnit = stream->inputUnit;
-       stream->outputDevice = stream->inputDevice;
-       if( result != paNoError )
-           goto error;
-    }
-    else
-    { /* full duplex, different devices OR simplex */
-       UInt32 outputFramesPerBuffer = (UInt32) stream->outputFramesPerBuffer;
-       UInt32 inputFramesPerBuffer  = (UInt32) stream->inputFramesPerBuffer;
-       result = OpenAndSetupOneAudioUnit( stream,
-                                          NULL,
-                                          outputParameters,
-                                          framesPerBuffer,
-                                          NULL,
-                                          &outputFramesPerBuffer,
-                                          auhalHostApi,
-                                          &(stream->outputUnit),
-                                          NULL,
-                                          &(stream->outputDevice),
-                                          sampleRate,
-                                          stream );
-       if( result != paNoError )
-           goto error;
-       result = OpenAndSetupOneAudioUnit( stream,
-                                          inputParameters,
-                                          NULL,
-                                          framesPerBuffer,
-                                          &inputFramesPerBuffer,
-                                          NULL,
-                                          auhalHostApi,
-                                          &(stream->inputUnit),
-                                          &(stream->inputSRConverter),
-                                          &(stream->inputDevice),
-                                          sampleRate,
-                                          stream );
-       if( result != paNoError )
-           goto error;
-       stream->inputFramesPerBuffer = inputFramesPerBuffer;
-       stream->outputFramesPerBuffer = outputFramesPerBuffer;
-    }
-
-    if( stream->inputUnit ) {
-       const size_t szfl = sizeof(float);
-       /* setup the AudioBufferList used for input */
-       bzero( &stream->inputAudioBufferList, sizeof( AudioBufferList ) );
-       stream->inputAudioBufferList.mNumberBuffers = 1;
-       stream->inputAudioBufferList.mBuffers[0].mNumberChannels
-                 = inputChannelCount;
-       stream->inputAudioBufferList.mBuffers[0].mDataByteSize
-                 = stream->inputFramesPerBuffer*inputChannelCount*szfl;
-       stream->inputAudioBufferList.mBuffers[0].mData
-                 = (float *) calloc(
-                               stream->inputFramesPerBuffer*inputChannelCount,
-                               szfl );
-       if( !stream->inputAudioBufferList.mBuffers[0].mData )
-       {
-          result = paInsufficientMemory;
-          goto error;
-       }
-        
-       /*
-        * If input and output devs are different or we are doing SR conversion,
-        * we also need a
-        * ring buffer to store inpt data while waiting for output
-        * data.
-        */
-       if( (stream->outputUnit && stream->inputUnit != stream->outputUnit)
-           || stream->inputSRConverter )
-       {
-          /* May want the ringSize ot initial position in
-             ring buffer to depend somewhat on sample rate change */
-
-          void *data;
-          long ringSize;
-
-          ringSize = computeRingBufferSize( inputParameters,
-                                            outputParameters,
-                                            stream->inputFramesPerBuffer,
-                                            stream->outputFramesPerBuffer,
-                                            sampleRate );
-          /*ringSize <<= 4; *//*16x bigger, for testing */
-
-
-          /*now, we need to allocate memory for the ring buffer*/
-          data = calloc( ringSize, szfl );
-          if( !data )
-          {
-             result = paInsufficientMemory;
-             goto error;
-          }
-
-          /* now we can initialize the ring buffer */
-          PaUtil_InitializeRingBuffer( &stream->inputRingBuffer,
-                                   ringSize*szfl, data ) ;
-          /* advance the read point a little, so we are reading from the
-             middle of the buffer */
-          if( stream->outputUnit )
-             PaUtil_AdvanceRingBufferWriteIndex( &stream->inputRingBuffer, ringSize*szfl / RING_BUFFER_ADVANCE_DENOMINATOR );
-       }
-    }
-
-    /* -- initialize Blio Buffer Processors -- */
-    if( !streamCallback )
-    {
-       long ringSize;
-
-       ringSize = computeRingBufferSize( inputParameters,
-                                         outputParameters,
-                                         stream->inputFramesPerBuffer,
-                                         stream->outputFramesPerBuffer,
-                                         sampleRate );
-       result = initializeBlioRingBuffers( &stream->blio,
-              inputParameters?inputParameters->sampleFormat:0 ,
-              outputParameters?outputParameters->sampleFormat:0 ,
-              MAX(stream->inputFramesPerBuffer,stream->outputFramesPerBuffer),
-              ringSize,
-              inputParameters?inputChannelCount:0 ,
-              outputParameters?outputChannelCount:0 ) ;
-       if( result != paNoError )
-          goto error;
-    }
-
-    /* -- initialize Buffer Processor -- */
-    {
-       unsigned long maxHostFrames = stream->inputFramesPerBuffer;
-       if( stream->outputFramesPerBuffer > maxHostFrames )
-          maxHostFrames = stream->outputFramesPerBuffer;
-       result = PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                 inputChannelCount, inputSampleFormat,
-                 hostInputSampleFormat,
-                 outputChannelCount, outputSampleFormat,
-                 hostOutputSampleFormat,
-                 sampleRate,
-                 streamFlags,
-                 framesPerBuffer,
-                 /* If sample rate conversion takes place, the buffer size
-                    will not be known. */
-                 maxHostFrames,
-                 stream->inputSRConverter
-                              ? paUtilUnknownHostBufferSize
-                              : paUtilBoundedHostBufferSize,
-                 streamCallback ? streamCallback : BlioCallback,
-                 streamCallback ? userData : &stream->blio );
-       if( result != paNoError )
-           goto error;
-    }
-    stream->bufferProcessorIsInitialized = TRUE;
-
-    /*
-        IMPLEMENT ME: initialise the following fields with estimated or actual
-        values.
-        I think this is okay the way it is br 12/1/05
-        maybe need to change input latency estimate if IO devs differ
-    */
-    stream->streamRepresentation.streamInfo.inputLatency =
-            PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor)/sampleRate;
-    stream->streamRepresentation.streamInfo.outputLatency =
-            PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor)/sampleRate;
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-    stream->sampleRate  = sampleRate;
-    stream->outDeviceSampleRate = 0;
-    if( stream->outputUnit ) {
-       Float64 rate;
-       UInt32 size = sizeof( rate );
-       result = ERR( AudioDeviceGetProperty( stream->outputDevice,
-                                    0,
-                                    FALSE,
-                                    kAudioDevicePropertyNominalSampleRate,
-                                    &size, &rate ) );
-       if( result )
-          goto error;
-       stream->outDeviceSampleRate = rate;
-    }
-    stream->inDeviceSampleRate = 0;
-    if( stream->inputUnit ) {
-       Float64 rate;
-       UInt32 size = sizeof( rate );
-       result = ERR( AudioDeviceGetProperty( stream->inputDevice,
-                                    0,
-                                    TRUE,
-                                    kAudioDevicePropertyNominalSampleRate,
-                                    &size, &rate ) );
-       if( result )
-          goto error;
-       stream->inDeviceSampleRate = rate;
-    }
-    stream->userInChan  = inputChannelCount;
-    stream->userOutChan = outputChannelCount;
-
-    stream->isTimeSet   = FALSE;
-    stream->state = STOPPED;
-    stream->xrunFlags = 0;
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    CloseStream( stream );
-    return result;
-}
-
-PaTime GetStreamTime( PaStream *s )
-{
-   /* FIXME: I am not at all sure this timing info stuff is right.
-             patest_sine_time reports negative latencies, which is wierd.*/
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    AudioTimeStamp timeStamp;
-
-    VVDBUG(("GetStreamTime()\n"));
-
-    if ( !stream->isTimeSet )
-        return (PaTime)0;
-
-    if ( stream->outputDevice ) {
-        AudioDeviceGetCurrentTime( stream->outputDevice, &timeStamp);
-        return (PaTime)(timeStamp.mSampleTime - stream->startTime.mSampleTime)/stream->outDeviceSampleRate;
-    } else if ( stream->inputDevice ) {
-        AudioDeviceGetCurrentTime( stream->inputDevice, &timeStamp);
-    return (PaTime)(timeStamp.mSampleTime - stream->startTime.mSampleTime)/stream->inDeviceSampleRate;
-    } else {
-        return (PaTime)0;
-    }
-}
-
-static void setStreamStartTime( PaStream *stream )
-{
-   /* FIXME: I am not at all sure this timing info stuff is right.
-             patest_sine_time reports negative latencies, which is wierd.*/
-   PaMacCoreStream *s = (PaMacCoreStream *) stream;
-   VVDBUG(("setStreamStartTime()\n"));
-   if( s->outputDevice )
-      AudioDeviceGetCurrentTime( s->outputDevice, &s->startTime);
-   else if( s->inputDevice )
-      AudioDeviceGetCurrentTime( s->inputDevice, &s->startTime);
-   else
-      bzero( &s->startTime, sizeof( s->startTime ) );
-
-   //FIXME: we need a memory barier here
-
-   s->isTimeSet = TRUE;
-}
-
-
-static PaTime TimeStampToSecs(PaMacCoreStream *stream, const AudioTimeStamp* timeStamp)
-{
-    VVDBUG(("TimeStampToSecs()\n"));
-    //printf( "ATS: %lu, %g, %g\n", timeStamp->mFlags, timeStamp->mSampleTime, timeStamp->mRateScalar );
-    if (timeStamp->mFlags & kAudioTimeStampSampleTimeValid)
-        return (timeStamp->mSampleTime / stream->sampleRate);
-    else
-        return 0;
-}
-
-#define RING_BUFFER_EMPTY (1000)
-
-static OSStatus ringBufferIOProc( AudioConverterRef inAudioConverter, 
-                             UInt32*ioDataSize, 
-                             void** outData, 
-                             void*inUserData )
-{
-   void *dummyData;
-   long dummySize;
-   PaUtilRingBuffer *rb = (PaUtilRingBuffer *) inUserData;
-
-   VVDBUG(("ringBufferIOProc()\n"));
-   /*
-	 Removing this fixes it but no clue if it breaks other things. (bkw_)
-	 assert( sizeof( UInt32 ) == sizeof( long ) );
-   */
-   if( PaUtil_GetRingBufferReadAvailable( rb ) == 0 ) {
-      *outData = NULL;
-      *ioDataSize = 0;
-      return RING_BUFFER_EMPTY;
-   }
-   PaUtil_GetRingBufferReadRegions( rb, *ioDataSize,
-                                    outData, (long *)ioDataSize, 
-                                    &dummyData, &dummySize );
-      
-   assert( *ioDataSize );
-   PaUtil_AdvanceRingBufferReadIndex( rb, *ioDataSize );
-
-   return noErr;
-}
-
-/*
- * Called by the AudioUnit API to process audio from the sound card.
- * This is where the magic happens.
- */
-/* FEEDBACK: there is a lot of redundant code here because of how all the cases differ. This makes it hard to maintain, so if there are suggestinos for cleaning it up, I'm all ears. */
-static OSStatus AudioIOProc( void *inRefCon,
-                               AudioUnitRenderActionFlags *ioActionFlags,
-                               const AudioTimeStamp *inTimeStamp,
-                               UInt32 inBusNumber,
-                               UInt32 inNumberFrames,
-                               AudioBufferList *ioData )
-{
-   unsigned long framesProcessed     = 0;
-   PaStreamCallbackTimeInfo timeInfo = {0,0,0};
-   PaMacCoreStream *stream           = (PaMacCoreStream*)inRefCon;
-   const bool isRender               = inBusNumber == OUTPUT_ELEMENT;
-   int callbackResult                = paContinue ;
-
-   VVDBUG(("AudioIOProc()\n"));
-
-   PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-   /* -----------------------------------------------------------------*\
-      This output may be useful for debugging,
-      But printing durring the callback is a bad enough idea that
-      this is not enabled by enableing the usual debugging calls.
-   \* -----------------------------------------------------------------*/
-   /*
-   static int renderCount = 0;
-   static int inputCount = 0;
-   printf( "-------------------  starting reder/input\n" );
-   if( isRender )
-      printf("Render callback (%d):\t", ++renderCount);
-   else
-      printf("Input callback  (%d):\t", ++inputCount);
-   printf( "Call totals: %d (input), %d (render)\n", inputCount, renderCount );
-
-   printf( "--- inBusNumber: %lu\n", inBusNumber );
-   printf( "--- inNumberFrames: %lu\n", inNumberFrames );
-   printf( "--- %x ioData\n", (unsigned) ioData );
-   if( ioData )
-   {
-      int i=0;
-      printf( "--- ioData.mNumBuffers %lu: \n", ioData->mNumberBuffers );
-      for( i=0; i<ioData->mNumberBuffers; ++i )
-         printf( "--- ioData buffer %d size: %lu.\n", i, ioData->mBuffers[i].mDataByteSize );
-   }
-      ----------------------------------------------------------------- */
-
-   if( !stream->isTimeSet )
-      setStreamStartTime( stream );
-
-   if( isRender ) {
-      AudioTimeStamp currentTime;
-      timeInfo.outputBufferDacTime = TimeStampToSecs(stream, inTimeStamp);
-      AudioDeviceGetCurrentTime(stream->outputDevice, &currentTime);
-      timeInfo.currentTime = TimeStampToSecs(stream, &currentTime);
-   }
-   if( isRender && stream->inputUnit == stream->outputUnit )
-      timeInfo.inputBufferAdcTime = TimeStampToSecs(stream, inTimeStamp);
-   if( !isRender ) {
-      AudioTimeStamp currentTime;
-      timeInfo.inputBufferAdcTime = TimeStampToSecs(stream, inTimeStamp);
-      AudioDeviceGetCurrentTime(stream->inputDevice, &currentTime);
-      timeInfo.currentTime = TimeStampToSecs(stream, &currentTime);
-   }
-
-   //printf( "---%g, %g, %g\n", timeInfo.inputBufferAdcTime, timeInfo.currentTime, timeInfo.outputBufferDacTime );
-
-   if( isRender && stream->inputUnit == stream->outputUnit
-                && !stream->inputSRConverter )
-   {
-      /* --------- Full Duplex, One Device, no SR Conversion -------
-       *
-       * This is the lowest latency case, and also the simplest.
-       * Input data and output data are available at the same time.
-       * we do not use the input SR converter or the input ring buffer.
-       *
-       */
-      OSStatus err = 0;
-      unsigned long frames;
-
-      /* -- start processing -- */
-      PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
-                                    &timeInfo,
-                                    stream->xrunFlags );
-      stream->xrunFlags = 0; //FIXME: this flag also gets set outside by a callback, which calls the xrunCallback function. It should be in the same thread as the main audio callback, but the apple docs just use the word "usually" so it may be possible to loose an xrun notification, if that callback happens here.
-
-      /* -- compute frames. do some checks -- */
-      assert( ioData->mNumberBuffers == 1 );
-      assert( ioData->mBuffers[0].mNumberChannels == stream->userOutChan );
-      frames = ioData->mBuffers[0].mDataByteSize;
-      frames /= sizeof( float ) * ioData->mBuffers[0].mNumberChannels;
-      /* -- copy and process input data -- */
-      err= AudioUnitRender(stream->inputUnit,
-                    ioActionFlags,
-                    inTimeStamp,
-                    INPUT_ELEMENT,
-                    inNumberFrames,
-                    &stream->inputAudioBufferList );
-      /* FEEDBACK: I'm not sure what to do when this call fails */
-      assert( !err );
-
-      PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
-      PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                          0,
-                          stream->inputAudioBufferList.mBuffers[0].mData,
-                          stream->inputAudioBufferList.mBuffers[0].mNumberChannels);
-      /* -- Copy and process output data -- */
-      PaUtil_SetOutputFrameCount( &(stream->bufferProcessor), frames );
-      PaUtil_SetInterleavedOutputChannels( &(stream->bufferProcessor),
-                                        0,
-                                        ioData->mBuffers[0].mData,
-                                        ioData->mBuffers[0].mNumberChannels);
-      /* -- complete processing -- */
-      framesProcessed =
-                 PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                             &callbackResult );
-   }
-   else if( isRender )
-   {
-      /* -------- Output Side of Full Duplex (Separate Devices or SR Conversion)
-       *       -- OR Simplex Output
-       *
-       * This case handles output data as in the full duplex case,
-       * and, if there is input data, reads it off the ring buffer 
-       * and into the PA buffer processor. If sample rate conversion
-       * is required on input, that is done here as well.
-       */
-      unsigned long frames;
-
-      /* Sometimes, when stopping a duplex stream we get erroneous
-         xrun flags, so if this is our last run, clear the flags. */
-      int xrunFlags = stream->xrunFlags;
-/*
-      if( xrunFlags & paInputUnderflow )
-         printf( "input underflow.\n" );
-      if( xrunFlags & paInputOverflow )
-         printf( "input overflow.\n" );
-*/
-      if( stream->state == STOPPING || stream->state == CALLBACK_STOPPED )
-         xrunFlags = 0;
-
-      /* -- start processing -- */
-      PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
-                                    &timeInfo,
-                                    xrunFlags );
-      stream->xrunFlags = 0; /* FEEDBACK: we only send flags to Buf Proc once */
-
-      /* -- Copy and process output data -- */
-      assert( ioData->mNumberBuffers == 1 );
-      frames = ioData->mBuffers[0].mDataByteSize;
-      frames /= sizeof( float ) * ioData->mBuffers[0].mNumberChannels;
-      assert( ioData->mBuffers[0].mNumberChannels == stream->userOutChan );
-      PaUtil_SetOutputFrameCount( &(stream->bufferProcessor), frames );
-      PaUtil_SetInterleavedOutputChannels( &(stream->bufferProcessor),
-                                     0,
-                                     ioData->mBuffers[0].mData,
-                                     ioData->mBuffers[0].mNumberChannels);
-
-      /* -- copy and process input data, and complete processing -- */
-      if( stream->inputUnit ) {
-         const int flsz = sizeof( float );
-         /* Here, we read the data out of the ring buffer, through the
-            audio converter. */
-         int inChan = stream->inputAudioBufferList.mBuffers[0].mNumberChannels;
-         if( stream->inputSRConverter )
-         {
-               OSStatus err;
-               UInt32 size;
-               float data[ inChan * frames ];
-               size = sizeof( data );
-               err = AudioConverterFillBuffer( 
-                             stream->inputSRConverter,
-                             ringBufferIOProc,
-                             &stream->inputRingBuffer,
-                             &size,
-                             (void *)&data );
-               if( err == RING_BUFFER_EMPTY )
-               { /*the ring buffer callback underflowed */
-                  err = 0;
-                  bzero( ((char *)data) + size, sizeof(data)-size );
-                  stream->xrunFlags |= paInputUnderflow;
-               }
-               ERR( err );
-               assert( !err );
-               
-               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
-               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                                   0,
-                                   data,
-                                   inChan );
-               framesProcessed =
-                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                                &callbackResult );
-         }
-         else
-         {
-            /* Without the AudioConverter is actually a bit more complex
-               because we have to do a little buffer processing that the
-               AudioConverter would otherwise handle for us. */
-            void *data1, *data2;
-            long size1, size2;
-            PaUtil_GetRingBufferReadRegions( &stream->inputRingBuffer,
-                                             inChan*frames*flsz,
-                                             &data1, &size1,
-                                             &data2, &size2 );
-            if( size1 / ( flsz * inChan ) == frames ) {
-               /* simplest case: all in first buffer */
-               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
-               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                                   0,
-                                   data1,
-                                   inChan );
-               framesProcessed =
-                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                                &callbackResult );
-               PaUtil_AdvanceRingBufferReadIndex(&stream->inputRingBuffer, size1 );
-            } else if( ( size1 + size2 ) / ( flsz * inChan ) < frames ) {
-               /*we underflowed. take what data we can, zero the rest.*/
-               unsigned char data[frames*inChan*flsz];
-               if( size1 )
-                  memcpy( data, data1, size1 );
-               if( size2 )
-                  memcpy( data+size1, data2, size2 );
-               bzero( data+size1+size2, frames*flsz*inChan - size1 - size2 );
-
-               PaUtil_SetInputFrameCount( &(stream->bufferProcessor), frames );
-               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                                   0,
-                                   data,
-                                   inChan );
-               framesProcessed =
-                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                                &callbackResult );
-               PaUtil_AdvanceRingBufferReadIndex( &stream->inputRingBuffer,
-                                                  size1+size2 );
-               /* flag underflow */
-               stream->xrunFlags |= paInputUnderflow;
-            } else {
-               /*we got all the data, but split between buffers*/
-               PaUtil_SetInputFrameCount( &(stream->bufferProcessor),
-                                          size1 / ( flsz * inChan ) );
-               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                                   0,
-                                   data1,
-                                   inChan );
-               PaUtil_Set2ndInputFrameCount( &(stream->bufferProcessor),
-                                             size2 / ( flsz * inChan ) );
-               PaUtil_Set2ndInterleavedInputChannels( &(stream->bufferProcessor),
-                                   0,
-                                   data2,
-                                   inChan );
-               framesProcessed =
-                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                                &callbackResult );
-               PaUtil_AdvanceRingBufferReadIndex(&stream->inputRingBuffer, size1+size2 );
-            }
-         }
-      } else {
-         framesProcessed =
-                 PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                             &callbackResult );
-      }
-
-   }
-   else
-   {
-      /* ------------------ Input
-       *
-       * First, we read off the audio data and put it in the ring buffer.
-       * if this is an input-only stream, we need to process it more,
-       * otherwise, we let the output case deal with it.
-       */
-      OSStatus err = 0;
-      int chan = stream->inputAudioBufferList.mBuffers[0].mNumberChannels ;
-      /* FIXME: looping here may not actually be necessary, but it was something I tried in testing. */
-      do {
-         err= AudioUnitRender(stream->inputUnit,
-                 ioActionFlags,
-                 inTimeStamp,
-                 INPUT_ELEMENT,
-                 inNumberFrames,
-                 &stream->inputAudioBufferList );
-         if( err == -10874 )
-            inNumberFrames /= 2;
-      } while( err == -10874 && inNumberFrames > 1 );
-      /* FEEDBACK: I'm not sure what to do when this call fails */
-      ERR( err );
-      assert( !err );
-      if( stream->inputSRConverter || stream->outputUnit )
-      {
-         /* If this is duplex or we use a converter, put the data
-            into the ring buffer. */
-         long bytesIn, bytesOut;
-         bytesIn = sizeof( float ) * inNumberFrames * chan;
-         bytesOut = PaUtil_WriteRingBuffer( &stream->inputRingBuffer,
-                                            stream->inputAudioBufferList.mBuffers[0].mData,
-                                            bytesIn );
-         if( bytesIn != bytesOut )
-            stream->xrunFlags |= paInputOverflow ;
-      }
-      else
-      {
-         /* for simplex input w/o SR conversion,
-            just pop the data into the buffer processor.*/
-         PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
-                              &timeInfo,
-                              stream->xrunFlags );
-         stream->xrunFlags = 0;
-
-         PaUtil_SetInputFrameCount( &(stream->bufferProcessor), inNumberFrames);
-         PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                             0,
-                             stream->inputAudioBufferList.mBuffers[0].mData,
-                             chan );
-         framesProcessed =
-              PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                          &callbackResult );
-      }
-      if( !stream->outputUnit && stream->inputSRConverter )
-      {
-         /* ------------------ Simplex Input w/ SR Conversion
-          *
-          * if this is a simplex input stream, we need to read off the buffer,
-          * do our sample rate conversion and pass the results to the buffer
-          * processor.
-          * The logic here is complicated somewhat by the fact that we don't
-          * know how much data is available, so we loop on reasonably sized
-          * chunks, and let the BufferProcessor deal with the rest.
-          *
-          */
-         /*This might be too big or small depending on SR conversion*/
-         float data[ chan * inNumberFrames ];
-         OSStatus err;
-         do
-         { /*Run the buffer processor until we are out of data*/
-            UInt32 size;
-            long f;
-
-            size = sizeof( data );
-            err = AudioConverterFillBuffer( 
-                          stream->inputSRConverter,
-                          ringBufferIOProc,
-                          &stream->inputRingBuffer,
-                          &size,
-                          (void *)data );
-            if( err != RING_BUFFER_EMPTY )
-               ERR( err );
-            assert( err == 0 || err == RING_BUFFER_EMPTY );
-
-            f = size / ( chan * sizeof(float) );
-            PaUtil_SetInputFrameCount( &(stream->bufferProcessor), f );
-            if( f )
-            {
-               PaUtil_BeginBufferProcessing( &(stream->bufferProcessor),
-                                             &timeInfo,
-                                             stream->xrunFlags );
-               stream->xrunFlags = 0;
-
-               PaUtil_SetInterleavedInputChannels( &(stream->bufferProcessor),
-                                0,
-                                data,
-                                chan );
-               framesProcessed =
-                    PaUtil_EndBufferProcessing( &(stream->bufferProcessor),
-                                                &callbackResult );
-            }
-         } while( callbackResult == paContinue && !err );
-      }
-   }
-
-   switch( callbackResult )
-   {
-   case paContinue: break;
-   case paComplete:
-   case paAbort:
-      stream->isTimeSet = FALSE;
-      stream->state = CALLBACK_STOPPED ;
-      if( stream->outputUnit )
-         AudioOutputUnitStop(stream->outputUnit);
-      if( stream->inputUnit )
-         AudioOutputUnitStop(stream->inputUnit);
-      break;
-   }
-
-   PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-   return noErr;
-}
-
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    /* This may be called from a failed OpenStream.
-       Therefore, each piece of info is treated seperately. */
-    PaError result = paNoError;
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-
-    VVDBUG(("CloseStream()\n"));
-    VDBUG( ( "Closing stream.\n" ) );
-
-    if( stream ) {
-       if( stream->outputUnit )
-          AudioDeviceRemovePropertyListener( stream->outputDevice,
-                                             0,
-                                             false,
-                                             kAudioDeviceProcessorOverload,
-                                             xrunCallback );
-       if( stream->inputUnit && stream->outputUnit != stream->inputUnit )
-          AudioDeviceRemovePropertyListener( stream->inputDevice,
-                                             0,
-                                             true,
-                                             kAudioDeviceProcessorOverload,
-                                             xrunCallback );
-       if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
-          AudioUnitUninitialize( stream->outputUnit );
-          CloseComponent( stream->outputUnit );
-       }
-       stream->outputUnit = NULL;
-       if( stream->inputUnit )
-       {
-          AudioUnitUninitialize( stream->inputUnit );
-          CloseComponent( stream->inputUnit );
-          stream->inputUnit = NULL;
-       }
-       if( stream->inputRingBuffer.buffer )
-          free( (void *) stream->inputRingBuffer.buffer );
-       stream->inputRingBuffer.buffer = NULL;
-       /*TODO: is there more that needs to be done on error
-               from AudioConverterDispose?*/
-       if( stream->inputSRConverter )
-          ERR( AudioConverterDispose( stream->inputSRConverter ) );
-       stream->inputSRConverter = NULL;
-       if( stream->inputAudioBufferList.mBuffers[0].mData )
-          free( stream->inputAudioBufferList.mBuffers[0].mData );
-       stream->inputAudioBufferList.mBuffers[0].mData = NULL;
-
-       result = destroyBlioRingBuffers( &stream->blio );
-       if( result )
-          return result;
-       if( stream->bufferProcessorIsInitialized )
-          PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-       PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-       PaUtil_FreeMemory( stream );
-    }
-
-    return result;
-}
-
-static PaError StartStream( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    OSStatus result = noErr;
-    VVDBUG(("StartStream()\n"));
-    VDBUG( ( "Starting stream.\n" ) );
-
-#define ERR_WRAP(mac_err) do { result = mac_err ; if ( result != noErr ) return ERR(result) ; } while(0)
-
-    /*FIXME: maybe want to do this on close/abort for faster start? */
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-    if(  stream->inputSRConverter )
-       ERR_WRAP( AudioConverterReset( stream->inputSRConverter ) );
-
-    /* -- start -- */
-    stream->state = ACTIVE;
-    if( stream->inputUnit ) {
-       ERR_WRAP( AudioOutputUnitStart(stream->inputUnit) );
-    }
-    if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
-       ERR_WRAP( AudioOutputUnitStart(stream->outputUnit) );
-    }
-
-    //setStreamStartTime( stream );
-    //stream->isTimeSet = TRUE;
-
-    return paNoError;
-#undef ERR_WRAP
-}
-
-// it's not clear from appl's docs that this really waits
-// until all data is flushed.
-static ComponentResult BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
-{
-    Boolean isRunning = 1;
-    while( isRunning ) {
-       UInt32 s = sizeof( isRunning );
-       ComponentResult err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element,  &isRunning, &s );
-       if( err )
-          return err;
-       Pa_Sleep( 100 );
-    }
-    return noErr;
-}
-
-static PaError StopStream( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    OSStatus result = noErr;
-    PaError paErr;
-    VVDBUG(("StopStream()\n"));
-
-    VDBUG( ("Waiting for BLIO.\n") );
-    waitUntilBlioWriteBufferIsFlushed( &stream->blio );
-    VDBUG( ( "Stopping stream.\n" ) );
-
-    stream->isTimeSet = FALSE;
-    stream->state = STOPPING;
-
-#define ERR_WRAP(mac_err) do { result = mac_err ; if ( result != noErr ) return ERR(result) ; } while(0)
-    /* -- stop and reset -- */
-    if( stream->inputUnit == stream->outputUnit && stream->inputUnit )
-    {
-       ERR_WRAP( AudioOutputUnitStop(stream->inputUnit) );
-       ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,0) );
-       ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,1) );
-       ERR_WRAP( AudioUnitReset(stream->inputUnit, kAudioUnitScope_Global, 1) );
-       ERR_WRAP( AudioUnitReset(stream->inputUnit, kAudioUnitScope_Global, 0) );
-    }
-    else
-    {
-       if( stream->inputUnit )
-       {
-          ERR_WRAP(AudioOutputUnitStop(stream->inputUnit) );
-          ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->inputUnit,1) );
-          ERR_WRAP(AudioUnitReset(stream->inputUnit,kAudioUnitScope_Global,1));
-       }
-       if( stream->outputUnit )
-       {
-          ERR_WRAP(AudioOutputUnitStop(stream->outputUnit));
-          ERR_WRAP( BlockWhileAudioUnitIsRunning(stream->outputUnit,0) );
-          ERR_WRAP(AudioUnitReset(stream->outputUnit,kAudioUnitScope_Global,0));
-       }
-    }
-    if( stream->inputRingBuffer.buffer ) {
-       PaUtil_FlushRingBuffer( &stream->inputRingBuffer );
-       bzero( (void *)stream->inputRingBuffer.buffer,
-              stream->inputRingBuffer.bufferSize );
-       /* advance the write point a little, so we are reading from the
-          middle of the buffer. We'll need extra at the end because
-          testing has shown that this helps. */
-       if( stream->outputUnit )
-          PaUtil_AdvanceRingBufferWriteIndex( &stream->inputRingBuffer,
-                                              stream->inputRingBuffer.bufferSize
-                                              / RING_BUFFER_ADVANCE_DENOMINATOR );
-    }
-
-    stream->xrunFlags = 0;
-    stream->state = STOPPED;
-
-    paErr = resetBlioRingBuffers( &stream->blio );
-    if( paErr )
-       return paErr;
-
-/*
-    //stream->isTimeSet = FALSE;
-*/
-
-    VDBUG( ( "Stream Stopped.\n" ) );
-    return paNoError;
-#undef ERR_WRAP
-}
-
-static PaError AbortStream( PaStream *s )
-{
-    VVDBUG(("AbortStream()->StopStream()\n"));
-    VDBUG( ( "Aborting stream.\n" ) );
-    /* We have nothing faster than StopStream. */
-    return StopStream(s);
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    VVDBUG(("IsStreamStopped()\n"));
-
-    return stream->state == STOPPED ? 1 : 0;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    VVDBUG(("IsStreamActive()\n"));
-    return ( stream->state == ACTIVE || stream->state == STOPPING );
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    VVDBUG(("GetStreamCpuLoad()\n"));
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
deleted file mode 100644
index 3a654903d4..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * Implementation of the PortAudio API for Apple AUHAL
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostaip_src
-
- This file contains the implementation
- required for blocking I/O. It is separated from pa_mac_core.c simply to ease
- development.
-*/
-
-#include "pa_mac_core_blocking.h"
-#include "pa_mac_core_internal.h"
-#include <assert.h>
-#ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
-# define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
-# define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
-#else
-# include <libkern/OSAtomic.h>
-#endif
-
-/*
- * This fnuction determines the size of a particular sample format.
- * if the format is not recognized, this returns zero.
- */
-static size_t computeSampleSizeFromFormat( PaSampleFormat format )
-{
-   switch( format ) {
-   case paFloat32: return 4;
-   case paInt32: return 4;
-   case paInt24: return 3;
-   case paInt16: return 2;
-   case paInt8: case paUInt8: return 1;
-   default: return 0;
-   }
-}
-/*
- * Same as computeSampleSizeFromFormat, except that if
- * the size is not a power of two, it returns the next power of two up
- */
-static size_t computeSampleSizeFromFormatPow2( PaSampleFormat format )
-{
-   switch( format ) {
-   case paFloat32: return 4;
-   case paInt32: return 4;
-   case paInt24: return 4;
-   case paInt16: return 2;
-   case paInt8: case paUInt8: return 1;
-   default: return 0;
-   }
-}
-
-
-
-/*
- * Functions for initializing, resetting, and destroying BLIO structures.
- *
- */
-
-/* This should be called with the relevant info when initializing a stream for
-   callback. */
-PaError initializeBlioRingBuffers(
-                                       PaMacBlio *blio,
-                                       PaSampleFormat inputSampleFormat,
-                                       PaSampleFormat outputSampleFormat,
-                                       size_t framesPerBuffer,
-                                       long ringBufferSize,
-                                       int inChan,
-                                       int outChan )
-{
-   void *data;
-   int result;
-
-   /* zeroify things */
-   bzero( blio, sizeof( PaMacBlio ) );
-   /* this is redundant, but the buffers are used to check
-      if the bufffers have been initialized, so we do it explicitly. */
-   blio->inputRingBuffer.buffer = NULL;
-   blio->outputRingBuffer.buffer = NULL;
-
-   /* initialize simple data */
-   blio->ringBufferFrames = ringBufferSize;
-   blio->inputSampleFormat = inputSampleFormat;
-   blio->inputSampleSizeActual = computeSampleSizeFromFormat(inputSampleFormat);
-   blio->inputSampleSizePow2 = computeSampleSizeFromFormatPow2(inputSampleFormat);
-   blio->outputSampleFormat = outputSampleFormat;
-   blio->outputSampleSizeActual = computeSampleSizeFromFormat(outputSampleFormat);
-   blio->outputSampleSizePow2 = computeSampleSizeFromFormatPow2(outputSampleFormat);
-
-   blio->framesPerBuffer = framesPerBuffer;
-   blio->inChan = inChan;
-   blio->outChan = outChan;
-   blio->statusFlags = 0;
-   blio->errors = paNoError;
-#ifdef PA_MAC_BLIO_MUTEX
-   blio->isInputEmpty = false;
-   blio->isOutputFull = false;
-#endif
-
-   /* setup ring buffers */
-#ifdef PA_MAC_BLIO_MUTEX
-   result = PaMacCore_SetUnixError( pthread_mutex_init(&(blio->inputMutex),NULL), 0 );
-   if( result )
-      goto error;
-   result = UNIX_ERR( pthread_cond_init( &(blio->inputCond), NULL ) );
-   if( result )
-      goto error;
-   result = UNIX_ERR( pthread_mutex_init(&(blio->outputMutex),NULL) );
-   if( result )
-      goto error;
-   result = UNIX_ERR( pthread_cond_init( &(blio->outputCond), NULL ) );
-#endif
-   if( inChan ) {
-      data = calloc( ringBufferSize, blio->inputSampleSizePow2*inChan );
-      if( !data )
-      {
-         result = paInsufficientMemory;
-         goto error;
-      }
-
-      assert( 0 == PaUtil_InitializeRingBuffer(
-            &blio->inputRingBuffer,
-            ringBufferSize*blio->inputSampleSizePow2*inChan,
-            data ) );
-   }
-   if( outChan ) {
-      data = calloc( ringBufferSize, blio->outputSampleSizePow2*outChan );
-      if( !data )
-      {
-         result = paInsufficientMemory;
-         goto error;
-      }
-
-      assert( 0 == PaUtil_InitializeRingBuffer(
-            &blio->outputRingBuffer,
-            ringBufferSize*blio->outputSampleSizePow2*outChan,
-            data ) );
-   }
-
-   result = resetBlioRingBuffers( blio );
-   if( result )
-      goto error;
-
-   return 0;
-
- error:
-   destroyBlioRingBuffers( blio );
-   return result;
-}
-
-#ifdef PA_MAC_BLIO_MUTEX
-PaError blioSetIsInputEmpty( PaMacBlio *blio, bool isEmpty )
-{
-   PaError result = paNoError;
-   if( isEmpty == blio->isInputEmpty )
-      goto done;
-
-   /* we need to update the value. Here's what we do:
-    * - Lock the mutex, so noone else can write.
-    * - update the value.
-    * - unlock.
-    * - broadcast to all listeners.
-    */
-   result = UNIX_ERR( pthread_mutex_lock( &blio->inputMutex ) );
-   if( result )
-      goto done;
-   blio->isInputEmpty = isEmpty;
-   result = UNIX_ERR( pthread_mutex_unlock( &blio->inputMutex ) );
-   if( result )
-      goto done;
-   result = UNIX_ERR( pthread_cond_broadcast( &blio->inputCond ) );
-   if( result )
-      goto done;
-
- done:
-   return result;
-}
-PaError blioSetIsOutputFull( PaMacBlio *blio, bool isFull )
-{
-   PaError result = paNoError;
-   if( isFull == blio->isOutputFull )
-      goto done;
-
-   /* we need to update the value. Here's what we do:
-    * - Lock the mutex, so noone else can write.
-    * - update the value.
-    * - unlock.
-    * - broadcast to all listeners.
-    */
-   result = UNIX_ERR( pthread_mutex_lock( &blio->outputMutex ) );
-   if( result )
-      goto done;
-   blio->isOutputFull = isFull;
-   result = UNIX_ERR( pthread_mutex_unlock( &blio->outputMutex ) );
-   if( result )
-      goto done;
-   result = UNIX_ERR( pthread_cond_broadcast( &blio->outputCond ) );
-   if( result )
-      goto done;
-
- done:
-   return result;
-}
-#endif
-
-/* This should be called after stopping or aborting the stream, so that on next
-   start, the buffers will be ready. */
-PaError resetBlioRingBuffers( PaMacBlio *blio )
-{
-#ifdef PA_MAC__BLIO_MUTEX
-   int result;
-#endif
-   blio->statusFlags = 0;
-   if( blio->outputRingBuffer.buffer ) {
-      PaUtil_FlushRingBuffer( &blio->outputRingBuffer );
-      bzero( blio->outputRingBuffer.buffer,
-             blio->outputRingBuffer.bufferSize );
-      /* Advance buffer */
-      PaUtil_AdvanceRingBufferWriteIndex( &blio->outputRingBuffer, blio->ringBufferFrames*blio->outputSampleSizeActual*blio->outChan );
-      //PaUtil_AdvanceRingBufferWriteIndex( &blio->outputRingBuffer, blio->outputRingBuffer.bufferSize );
-
-      /* Update isOutputFull. */
-#ifdef PA_MAC__BLIO_MUTEX
-      result = blioSetIsOutputFull( blio, toAdvance == blio->outputRingBuffer.bufferSize );
-      if( result )
-         goto error;
-#endif
-/*
-      printf( "------%d\n" ,  blio->framesPerBuffer );
-      printf( "------%d\n" ,  blio->outChan );
-      printf( "------%d\n" ,  blio->outputSampleSize );
-      printf( "------%d\n" ,  blio->framesPerBuffer*blio->outChan*blio->outputSampleSize );
-*/
-   }
-   if( blio->inputRingBuffer.buffer ) {
-      PaUtil_FlushRingBuffer( &blio->inputRingBuffer );
-      bzero( blio->inputRingBuffer.buffer,
-             blio->inputRingBuffer.bufferSize );
-      /* Update isInputEmpty. */
-#ifdef PA_MAC__BLIO_MUTEX
-      result = blioSetIsInputEmpty( blio, true );
-      if( result )
-         goto error;
-#endif
-   }
-   return paNoError;
-#ifdef PA_MAC__BLIO_MUTEX
- error:
-   return result;
-#endif
-}
-
-/*This should be called when you are done with the blio. It can safely be called
-  multiple times if there are no exceptions. */
-PaError destroyBlioRingBuffers( PaMacBlio *blio )
-{
-   PaError result = paNoError;
-   if( blio->inputRingBuffer.buffer ) {
-      free( blio->inputRingBuffer.buffer );
-#ifdef PA_MAC__BLIO_MUTEX
-      result = UNIX_ERR( pthread_mutex_destroy( & blio->inputMutex ) );
-      if( result ) return result;
-      result = UNIX_ERR( pthread_cond_destroy( & blio->inputCond ) );
-      if( result ) return result;
-#endif
-   }
-   blio->inputRingBuffer.buffer = NULL;
-   if( blio->outputRingBuffer.buffer ) {
-      free( blio->outputRingBuffer.buffer );
-#ifdef PA_MAC__BLIO_MUTEX
-      result = UNIX_ERR( pthread_mutex_destroy( & blio->outputMutex ) );
-      if( result ) return result;
-      result = UNIX_ERR( pthread_cond_destroy( & blio->outputCond ) );
-      if( result ) return result;
-#endif
-   }
-   blio->outputRingBuffer.buffer = NULL;
-
-   return result;
-}
-
-/*
- * this is the BlioCallback function. It expects to recieve a PaMacBlio Object
- * pointer as userData.
- *
- */
-int BlioCallback( const void *input, void *output, unsigned long frameCount,
-	const PaStreamCallbackTimeInfo* timeInfo,
-        PaStreamCallbackFlags statusFlags,
-        void *userData )
-{
-   PaMacBlio *blio = (PaMacBlio*)userData;
-   long avail;
-   long toRead;
-   long toWrite;
-
-   /* set flags returned by OS: */
-   OSAtomicOr32( statusFlags, &blio->statusFlags ) ;
-
-   /* --- Handle Input Buffer --- */
-   if( blio->inChan ) {
-      avail = PaUtil_GetRingBufferWriteAvailable( &blio->inputRingBuffer );
-
-      /* check for underflow */
-      if( avail < frameCount * blio->inputSampleSizeActual * blio->inChan )
-         OSAtomicOr32( paInputOverflow, &blio->statusFlags );
-
-      toRead = MIN( avail, frameCount * blio->inputSampleSizeActual * blio->inChan );
-
-      /* copy the data */
-      /*printf( "reading %d\n", toRead );*/
-      assert( toRead == PaUtil_WriteRingBuffer( &blio->inputRingBuffer, input, toRead ) );
-#ifdef PA_MAC__BLIO_MUTEX
-      /* Priority inversion. See notes below. */
-      blioSetIsInputEmpty( blio, false );
-#endif
-   }
-
-
-   /* --- Handle Output Buffer --- */
-   if( blio->outChan ) {
-      avail = PaUtil_GetRingBufferReadAvailable( &blio->outputRingBuffer );
-
-      /* check for underflow */
-      if( avail < frameCount * blio->outputSampleSizeActual * blio->outChan )
-         OSAtomicOr32( paOutputUnderflow, &blio->statusFlags );
-
-      toWrite = MIN( avail, frameCount * blio->outputSampleSizeActual * blio->outChan );
-
-      if( toWrite != frameCount * blio->outputSampleSizeActual * blio->outChan )
-         bzero( ((char *)output)+toWrite,
-                frameCount * blio->outputSampleSizeActual * blio->outChan - toWrite );
-      /* copy the data */
-      /*printf( "writing %d\n", toWrite );*/
-      assert( toWrite == PaUtil_ReadRingBuffer( &blio->outputRingBuffer, output, toWrite ) );
-#ifdef PA_MAC__BLIO_MUTEX
-      /* We have a priority inversion here. However, we will only have to
-         wait if this was true and is now false, which means we've got
-         some room in the buffer.
-         Hopefully problems will be minimized. */
-      blioSetIsOutputFull( blio, false );
-#endif
-   }
-
-   return paContinue;
-}
-
-PaError ReadStream( PaStream* stream,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
-    char *cbuf = (char *) buffer;
-    PaError ret = paNoError;
-    VVDBUG(("ReadStream()\n"));
-
-    while( frames > 0 ) {
-       long avail;
-       long toRead;
-       do {
-          avail = PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer );
-/*
-          printf( "Read Buffer is %%%g full: %ld of %ld.\n",
-                  100 * (float)avail / (float) blio->inputRingBuffer.bufferSize,
-                  avail, blio->inputRingBuffer.bufferSize );
-*/
-          if( avail == 0 ) {
-#ifdef PA_MAC_BLIO_MUTEX
-             /**block when empty*/
-             ret = UNIX_ERR( pthread_mutex_lock( &blio->inputMutex ) );
-             if( ret )
-                return ret;
-             while( blio->isInputEmpty ) {
-                ret = UNIX_ERR( pthread_cond_wait( &blio->inputCond, &blio->inputMutex ) );
-                if( ret )
-                   return ret;
-             }
-             ret = UNIX_ERR( pthread_mutex_unlock( &blio->inputMutex ) );
-             if( ret )
-                return ret;
-#else
-             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
-#endif
-          }
-       } while( avail == 0 );
-       toRead = MIN( avail, frames * blio->inputSampleSizeActual * blio->inChan );
-       toRead -= toRead % blio->inputSampleSizeActual * blio->inChan ;
-       PaUtil_ReadRingBuffer( &blio->inputRingBuffer, (void *)cbuf, toRead );
-       cbuf += toRead;
-       frames -= toRead / ( blio->inputSampleSizeActual * blio->inChan );
-
-       if( toRead == avail ) {
-#ifdef PA_MAC_BLIO_MUTEX
-          /* we just emptied the buffer, so we need to mark it as empty. */
-          ret = blioSetIsInputEmpty( blio, true );
-          if( ret )
-             return ret;
-          /* of course, in the meantime, the callback may have put some sats
-             in, so
-             so check for that, too, to avoid a race condition. */
-          if( PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer ) ) {
-             blioSetIsInputEmpty( blio, false );
-             if( ret )
-                return ret;
-          }
-#endif
-       }
-    }
-
-    /*   Report either paNoError or paInputOverflowed. */
-    /*   may also want to report other errors, but this is non-standard. */
-    ret = blio->statusFlags & paInputOverflow;
-
-    /* report underflow only once: */
-    if( ret ) {
-       OSAtomicAnd32( (uint32_t)(~paInputOverflow), &blio->statusFlags );
-       ret = paInputOverflowed;
-    }
-
-    return ret;
-}
-
-
-PaError WriteStream( PaStream* stream,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
-    char *cbuf = (char *) buffer;
-    PaError ret = paNoError;
-    VVDBUG(("WriteStream()\n"));
-
-    while( frames > 0 ) {
-       long avail = 0;
-       long toWrite;
-
-       do {
-          avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
-/*
-          printf( "Write Buffer is %%%g full: %ld of %ld.\n",
-                  100 - 100 * (float)avail / (float) blio->outputRingBuffer.bufferSize,
-                  avail, blio->outputRingBuffer.bufferSize );
-*/
-          if( avail == 0 ) {
-#ifdef PA_MAC_BLIO_MUTEX
-             /*block while full*/
-             ret = UNIX_ERR( pthread_mutex_lock( &blio->outputMutex ) );
-             if( ret )
-                return ret;
-             while( blio->isOutputFull ) {
-                ret = UNIX_ERR( pthread_cond_wait( &blio->outputCond, &blio->outputMutex ) );
-                if( ret )
-                   return ret;
-             }
-             ret = UNIX_ERR( pthread_mutex_unlock( &blio->outputMutex ) );
-             if( ret )
-                return ret;
-#else
-             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
-#endif
-          }
-       } while( avail == 0 );
-
-       toWrite = MIN( avail, frames * blio->outputSampleSizeActual * blio->outChan );
-       toWrite -= toWrite % blio->outputSampleSizeActual * blio->outChan ;
-       PaUtil_WriteRingBuffer( &blio->outputRingBuffer, (void *)cbuf, toWrite );
-       cbuf += toWrite;
-       frames -= toWrite / ( blio->outputSampleSizeActual * blio->outChan );
-
-#ifdef PA_MAC_BLIO_MUTEX
-       if( toWrite == avail ) {
-          /* we just filled up the buffer, so we need to mark it as filled. */
-          ret = blioSetIsOutputFull( blio, true );
-          if( ret )
-             return ret;
-          /* of course, in the meantime, we may have emptied the buffer, so
-             so check for that, too, to avoid a race condition. */
-          if( PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer ) ) {
-             blioSetIsOutputFull( blio, false );
-             if( ret )
-                return ret;
-          }
-       }
-#endif
-    }
-
-    /*   Report either paNoError or paOutputUnderflowed. */
-    /*   may also want to report other errors, but this is non-standard. */
-    ret = blio->statusFlags & paOutputUnderflow;
-
-    /* report underflow only once: */
-    if( ret ) {
-      OSAtomicAnd32( (uint32_t)(~paOutputUnderflow), &blio->statusFlags );
-      ret = paOutputUnderflowed;
-    }
-
-    return ret;
-}
-
-/*
- *
- */
-void waitUntilBlioWriteBufferIsFlushed( PaMacBlio *blio )
-{
-    if( blio->outputRingBuffer.buffer ) {
-       long avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
-       while( avail != blio->outputRingBuffer.bufferSize ) {
-          if( avail == 0 )
-             Pa_Sleep( PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL );
-          avail = PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer );
-       }
-    }
-}
-
-
-signed long GetStreamReadAvailable( PaStream* stream )
-{
-    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
-    VVDBUG(("GetStreamReadAvailable()\n"));
-
-    return PaUtil_GetRingBufferReadAvailable( &blio->inputRingBuffer )
-                         / ( blio->outputSampleSizeActual * blio->outChan );
-}
-
-
-signed long GetStreamWriteAvailable( PaStream* stream )
-{
-    PaMacBlio *blio = & ((PaMacCoreStream*)stream) -> blio;
-    VVDBUG(("GetStreamWriteAvailable()\n"));
-
-    return PaUtil_GetRingBufferWriteAvailable( &blio->outputRingBuffer )
-                         / ( blio->outputSampleSizeActual * blio->outChan );
-}
-
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
deleted file mode 100644
index c5ec78a689..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Internal blocking interfaces for PortAudio Apple AUHAL implementation
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostaip_src
-*/
-
-#ifndef PA_MAC_CORE_BLOCKING_H_
-#define PA_MAC_CORE_BLOCKING_H_
-
-#include "pa_ringbuffer.h"
-#include "portaudio.h"
-#include "pa_mac_core_utilities.h"
-
-/*
- * Number of miliseconds to busy wait whil waiting for data in blocking calls.
- */
-#define PA_MAC_BLIO_BUSY_WAIT_SLEEP_INTERVAL (5)
-/*
- * Define exactly one of these blocking methods
- * PA_MAC_BLIO_MUTEX is not actively maintained.
- */
-#define PA_MAC_BLIO_BUSY_WAIT
-/*
-#define PA_MAC_BLIO_MUTEX
-*/
-
-typedef struct {
-    PaUtilRingBuffer inputRingBuffer;
-    PaUtilRingBuffer outputRingBuffer;
-    size_t ringBufferFrames;
-    PaSampleFormat inputSampleFormat;
-    size_t inputSampleSizeActual;
-    size_t inputSampleSizePow2;
-    PaSampleFormat outputSampleFormat;
-    size_t outputSampleSizeActual;
-    size_t outputSampleSizePow2;
-
-    size_t framesPerBuffer;
-
-    int inChan;
-    int outChan;
-
-    //PaStreamCallbackFlags statusFlags;
-    uint32_t statusFlags;
-    PaError errors;
-
-    /* Here we handle blocking, using condition variables. */
-#ifdef  PA_MAC_BLIO_MUTEX
-    volatile bool isInputEmpty;
-    pthread_mutex_t inputMutex;
-    pthread_cond_t inputCond;
-
-    volatile bool isOutputFull;
-    pthread_mutex_t outputMutex;
-    pthread_cond_t outputCond;
-#endif
-}
-PaMacBlio;
-
-/*
- * These functions operate on condition and related variables.
- */
-
-PaError initializeBlioRingBuffers(
-                                       PaMacBlio *blio,
-                                       PaSampleFormat inputSampleFormat,
-                                       PaSampleFormat outputSampleFormat,
-                                       size_t framesPerBuffer,
-                                       long ringBufferSize,
-                                       int inChan,
-                                       int outChan );
-PaError destroyBlioRingBuffers( PaMacBlio *blio );
-PaError resetBlioRingBuffers( PaMacBlio *blio );
-
-int BlioCallback(
-        const void *input, void *output,
-        unsigned long frameCount,
-        const PaStreamCallbackTimeInfo* timeInfo,
-        PaStreamCallbackFlags statusFlags,
-        void *userData );
-
-void waitUntilBlioWriteBufferIsFlushed( PaMacBlio *blio );
-
-#endif /*PA_MAC_CORE_BLOCKING_H_*/
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
deleted file mode 100644
index d2b5c105a1..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Internal interfaces for PortAudio Apple AUHAL implementation
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file pa_mac_core
- @ingroup hostapi_src
- @author Bjorn Roche
- @brief AUHAL implementation of PortAudio
-*/
-
-#ifndef PA_MAC_CORE_INTERNAL_H__
-#define PA_MAC_CORE_INTERNAL_H__
-
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
-#include <CoreServices/CoreServices.h>
-
-
-#include "portaudio.h"
-#include "pa_util.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_allocation.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_ringbuffer.h"
-
-#include "pa_mac_core_blocking.h"
-
-/* function prototypes */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#define RING_BUFFER_ADVANCE_DENOMINATOR (4)
-
-PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-signed long GetStreamReadAvailable( PaStream* stream );
-signed long GetStreamWriteAvailable( PaStream* stream );
-/* PaMacAUHAL - host api datastructure specific to this implementation */
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    /* implementation specific data goes here */
-    long devCount;
-    AudioDeviceID *devIds; /*array of all audio devices*/
-    AudioDeviceID defaultIn;
-    AudioDeviceID defaultOut;
-}
-PaMacAUHAL;
-
-
-
-/* stream data structure specifically for this implementation */
-typedef struct PaMacCoreStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    /* implementation specific data goes here */
-    bool bufferProcessorIsInitialized;
-    AudioUnit inputUnit;
-    AudioUnit outputUnit;
-    AudioDeviceID inputDevice;
-    AudioDeviceID outputDevice;
-    size_t userInChan;
-    size_t userOutChan;
-    size_t inputFramesPerBuffer;
-    size_t outputFramesPerBuffer;
-    PaMacBlio blio;
-    /* We use this ring buffer when input and out devs are different. */
-    PaUtilRingBuffer inputRingBuffer;
-    /* We may need to do SR conversion on input. */
-    AudioConverterRef inputSRConverter;
-    /* We need to preallocate an inputBuffer for reading data. */
-    AudioBufferList inputAudioBufferList;
-    AudioTimeStamp startTime;
-    /* FIXME: instead of volatile, these should be properly memory barriered */
-    volatile PaStreamCallbackFlags xrunFlags;
-    volatile bool isTimeSet;
-    volatile enum {
-       STOPPED          = 0, /* playback is completely stopped,
-                                and the user has called StopStream(). */
-       CALLBACK_STOPPED = 1, /* callback has requested stop,
-                                but user has not yet called StopStream(). */
-       STOPPING         = 2, /* The stream is in the process of closing
-                                because the user has called StopStream.
-                                This state is just used internally;
-                                externally it is indistinguishable from
-                                ACTIVE.*/
-       ACTIVE           = 3  /* The stream is active and running. */
-    } state;
-    double sampleRate;
-    //these may be different from the stream sample rate due to SR conversion:
-    double outDeviceSampleRate;
-    double inDeviceSampleRate;
-}
-PaMacCoreStream;
-
-#endif /* PA_MAC_CORE_INTERNAL_H__ */
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
deleted file mode 100644
index 4ef89549b0..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
+++ /dev/null
@@ -1,913 +0,0 @@
-/*
- * $Id: pa_mac_core_old.c 1083 2006-08-23 07:30:49Z rossb $
- * pa_mac_core.c
- * Implementation of PortAudio for Mac OS X CoreAudio       
- *                                                                                         
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Authors: Ross Bencina and Phil Burk
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <CoreAudio/CoreAudio.h>
-#include <AudioToolbox/AudioToolbox.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
-
-#include "portaudio.h"
-#include "pa_trace.h"
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-
-// =====  constants  =====
-
-// =====  structs  =====
-#pragma mark structs
-
-// PaMacCoreHostApiRepresentation - host api datastructure specific to this implementation
-typedef struct PaMacCore_HAR
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-    
-    PaUtilAllocationGroup *allocations;
-    AudioDeviceID *macCoreDeviceIds;
-}
-PaMacCoreHostApiRepresentation;
-
-typedef struct PaMacCore_DI
-{
-    PaDeviceInfo inheritedDeviceInfo;
-}
-PaMacCoreDeviceInfo;
-
-// PaMacCoreStream - a stream data structure specifically for this implementation
-typedef struct PaMacCore_S
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-    
-    int primeStreamUsingCallback;
-    
-    AudioDeviceID inputDevice;
-    AudioDeviceID outputDevice;
-    
-    // Processing thread management --------------
-//    HANDLE abortEvent;
-//    HANDLE processingThread;
-//    DWORD processingThreadId;
-    
-    char throttleProcessingThreadOnOverload; // 0 -> don't throtte, non-0 -> throttle
-    int processingThreadPriority;
-    int highThreadPriority;
-    int throttledThreadPriority;
-    unsigned long throttledSleepMsecs;
-    
-    int isStopped;
-    volatile int isActive;
-    volatile int stopProcessing; // stop thread once existing buffers have been returned
-    volatile int abortProcessing; // stop thread immediately
-    
-//    DWORD allBuffersDurationMs; // used to calculate timeouts
-}
-PaMacCoreStream;
-
-// Data needed by the CoreAudio callback functions
-typedef struct PaMacCore_CD
-{
-    PaMacCoreStream *stream;
-    PaStreamCallback *callback;
-    void *userData;
-    PaUtilConverter *inputConverter;
-    PaUtilConverter *outputConverter;
-    void *inputBuffer;
-    void *outputBuffer;
-    int inputChannelCount;
-    int outputChannelCount;
-    PaSampleFormat inputSampleFormat;
-    PaSampleFormat outputSampleFormat;
-    PaUtilTriangularDitherGenerator *ditherGenerator;
-}
-PaMacClientData;
-
-// =====  CoreAudio-PortAudio bridge functions =====
-#pragma mark CoreAudio-PortAudio bridge functions
-
-// Maps CoreAudio OSStatus codes to PortAudio PaError codes
-static PaError conv_err(OSStatus error)
-{
-    PaError result;
-    
-    switch (error) {
-        case kAudioHardwareNoError:
-            result = paNoError; break;
-        case kAudioHardwareNotRunningError:
-            result = paInternalError; break;
-        case kAudioHardwareUnspecifiedError:
-            result = paInternalError; break;
-        case kAudioHardwareUnknownPropertyError:
-            result = paInternalError; break;
-        case kAudioHardwareBadPropertySizeError:
-            result = paInternalError; break;
-        case kAudioHardwareIllegalOperationError:
-            result = paInternalError; break;
-        case kAudioHardwareBadDeviceError:
-            result = paInvalidDevice; break;
-        case kAudioHardwareBadStreamError:
-            result = paBadStreamPtr; break;
-        case kAudioHardwareUnsupportedOperationError:
-            result = paInternalError; break;
-        case kAudioDeviceUnsupportedFormatError:
-            result = paSampleFormatNotSupported; break;
-        case kAudioDevicePermissionsError:
-            result = paDeviceUnavailable; break;
-        default:
-            result = paInternalError;
-    }
-    
-    return result;
-}
-
-/* This function is unused
-static AudioStreamBasicDescription *InitializeStreamDescription(const PaStreamParameters *parameters, double sampleRate)
-{
-    struct AudioStreamBasicDescription *streamDescription = PaUtil_AllocateMemory(sizeof(AudioStreamBasicDescription));
-    streamDescription->mSampleRate = sampleRate;
-    streamDescription->mFormatID = kAudioFormatLinearPCM;
-    streamDescription->mFormatFlags = 0;
-    streamDescription->mFramesPerPacket = 1;
-    
-    if (parameters->sampleFormat & paNonInterleaved) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsNonInterleaved;
-        streamDescription->mChannelsPerFrame = 1;
-        streamDescription->mBytesPerFrame = Pa_GetSampleSize(parameters->sampleFormat);
-        streamDescription->mBytesPerPacket = Pa_GetSampleSize(parameters->sampleFormat);
-    }
-    else {
-        streamDescription->mChannelsPerFrame = parameters->channelCount;
-    }
-    
-    streamDescription->mBytesPerFrame = Pa_GetSampleSize(parameters->sampleFormat) * streamDescription->mChannelsPerFrame;
-    streamDescription->mBytesPerPacket = streamDescription->mBytesPerFrame * streamDescription->mFramesPerPacket;
-    
-    if (parameters->sampleFormat & paFloat32) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsFloat;
-        streamDescription->mBitsPerChannel = 32;
-    }
-    else if (parameters->sampleFormat & paInt32) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
-        streamDescription->mBitsPerChannel = 32;
-    }
-    else if (parameters->sampleFormat & paInt24) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
-        streamDescription->mBitsPerChannel = 24;
-    }
-    else if (parameters->sampleFormat & paInt16) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
-        streamDescription->mBitsPerChannel = 16;
-    }
-    else if (parameters->sampleFormat & paInt8) {
-        streamDescription->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
-        streamDescription->mBitsPerChannel = 8;
-    }    
-    else if (parameters->sampleFormat & paInt32) {
-        streamDescription->mBitsPerChannel = 8;
-    }
-    
-    return streamDescription;
-}
-*/
-
-static PaStreamCallbackTimeInfo *InitializeTimeInfo(const AudioTimeStamp* now, const AudioTimeStamp* inputTime, const AudioTimeStamp* outputTime)
-{
-    PaStreamCallbackTimeInfo *timeInfo = PaUtil_AllocateMemory(sizeof(PaStreamCallbackTimeInfo));
-    
-    timeInfo->inputBufferAdcTime = inputTime->mSampleTime;
-    timeInfo->currentTime = now->mSampleTime;
-    timeInfo->outputBufferDacTime = outputTime->mSampleTime;
-    
-    return timeInfo;
-}
-
-// =====  support functions  =====
-#pragma mark support functions
-
-static void CleanUp(PaMacCoreHostApiRepresentation *macCoreHostApi)
-{
-    if( macCoreHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( macCoreHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( macCoreHostApi->allocations );
-    }
-    
-    PaUtil_FreeMemory( macCoreHostApi );    
-}
-
-static PaError GetChannelInfo(PaDeviceInfo *deviceInfo, AudioDeviceID macCoreDeviceId, int isInput)
-{
-    UInt32 propSize;
-    PaError err = paNoError;
-    UInt32 i;
-    int numChannels = 0;
-    AudioBufferList *buflist;
-
-    err = conv_err(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, NULL));
-    buflist = PaUtil_AllocateMemory(propSize);
-    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamConfiguration, &propSize, buflist));
-    if (!err) {
-        for (i = 0; i < buflist->mNumberBuffers; ++i) {
-            numChannels += buflist->mBuffers[i].mNumberChannels;
-        }
-		
-		if (isInput)
-			deviceInfo->maxInputChannels = numChannels;
-		else
-			deviceInfo->maxOutputChannels = numChannels;
-		
-        int frameLatency;
-        propSize = sizeof(UInt32);
-        err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyLatency, &propSize, &frameLatency));
-        if (!err) {
-            double secondLatency = frameLatency / deviceInfo->defaultSampleRate;
-            if (isInput) {
-                deviceInfo->defaultLowInputLatency = secondLatency;
-                deviceInfo->defaultHighInputLatency = secondLatency;
-            }
-            else {
-                deviceInfo->defaultLowOutputLatency = secondLatency;
-                deviceInfo->defaultHighOutputLatency = secondLatency;
-            }
-        }
-    }
-    PaUtil_FreeMemory(buflist);
-    
-    return err;
-}
-
-static PaError InitializeDeviceInfo(PaMacCoreDeviceInfo *macCoreDeviceInfo,  AudioDeviceID macCoreDeviceId, PaHostApiIndex hostApiIndex )
-{
-    PaDeviceInfo *deviceInfo = &macCoreDeviceInfo->inheritedDeviceInfo;
-    deviceInfo->structVersion = 2;
-    deviceInfo->hostApi = hostApiIndex;
-    
-    PaError err = paNoError;
-    UInt32 propSize;
-
-    err = conv_err(AudioDeviceGetPropertyInfo(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, NULL));
-    // FIXME: this allocation should be part of the allocations group
-    char *name = PaUtil_AllocateMemory(propSize);
-    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyDeviceName, &propSize, name));
-    if (!err) {
-        deviceInfo->name = name;
-    }
-    
-    Float64 sampleRate;
-    propSize = sizeof(Float64);
-    err = conv_err(AudioDeviceGetProperty(macCoreDeviceId, 0, 0, kAudioDevicePropertyNominalSampleRate, &propSize, &sampleRate));
-    if (!err) {
-        deviceInfo->defaultSampleRate = sampleRate;
-    }
-
-
-    // Get channel info
-    err = GetChannelInfo(deviceInfo, macCoreDeviceId, 1);
-    err = GetChannelInfo(deviceInfo, macCoreDeviceId, 0);
-
-    return err;
-}
-
-static PaError InitializeDeviceInfos( PaMacCoreHostApiRepresentation *macCoreHostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *hostApi;
-    PaMacCoreDeviceInfo *deviceInfoArray;
-
-    // initialise device counts and default devices under the assumption that there are no devices. These values are incremented below if and when devices are successfully initialized.
-    hostApi = &macCoreHostApi->inheritedHostApiRep;
-    hostApi->info.deviceCount = 0;
-    hostApi->info.defaultInputDevice = paNoDevice;
-    hostApi->info.defaultOutputDevice = paNoDevice;
-    
-    UInt32 propsize;
-    AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propsize, NULL);
-    int numDevices = propsize / sizeof(AudioDeviceID);
-    hostApi->info.deviceCount = numDevices;
-    if (numDevices > 0) {
-        hostApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                                            macCoreHostApi->allocations, sizeof(PaDeviceInfo*) * numDevices );
-        if( !hostApi->deviceInfos )
-        {
-            return paInsufficientMemory;
-        }
-
-        // allocate all device info structs in a contiguous block
-        deviceInfoArray = (PaMacCoreDeviceInfo*)PaUtil_GroupAllocateMemory(
-                                macCoreHostApi->allocations, sizeof(PaMacCoreDeviceInfo) * numDevices );
-        if( !deviceInfoArray )
-        {
-            return paInsufficientMemory;
-        }
-        
-        macCoreHostApi->macCoreDeviceIds = PaUtil_GroupAllocateMemory(macCoreHostApi->allocations, propsize);
-        AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &propsize, macCoreHostApi->macCoreDeviceIds);
-
-        AudioDeviceID defaultInputDevice, defaultOutputDevice;
-        propsize = sizeof(AudioDeviceID);
-        AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &propsize, &defaultInputDevice);
-        AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propsize, &defaultOutputDevice);
-        
-        UInt32 i;
-        for (i = 0; i < numDevices; ++i) {
-            if (macCoreHostApi->macCoreDeviceIds[i] == defaultInputDevice) {
-                hostApi->info.defaultInputDevice = i;
-            }
-            if (macCoreHostApi->macCoreDeviceIds[i] == defaultOutputDevice) {
-                hostApi->info.defaultOutputDevice = i;
-            }
-            InitializeDeviceInfo(&deviceInfoArray[i], macCoreHostApi->macCoreDeviceIds[i], hostApiIndex);
-            hostApi->deviceInfos[i] = &(deviceInfoArray[i].inheritedDeviceInfo);      
-        }
-    }
-
-    return result;
-}
-
-static OSStatus CheckFormat(AudioDeviceID macCoreDeviceId, const PaStreamParameters *parameters, double sampleRate, int isInput)
-{
-    UInt32 propSize = sizeof(AudioStreamBasicDescription);
-    AudioStreamBasicDescription *streamDescription = PaUtil_AllocateMemory(propSize);
-
-    streamDescription->mSampleRate = sampleRate;
-    streamDescription->mFormatID = 0;
-    streamDescription->mFormatFlags = 0;
-    streamDescription->mBytesPerPacket = 0;
-    streamDescription->mFramesPerPacket = 0;
-    streamDescription->mBytesPerFrame = 0;
-    streamDescription->mChannelsPerFrame = 0;
-    streamDescription->mBitsPerChannel = 0;
-    streamDescription->mReserved = 0;
-
-    OSStatus result = AudioDeviceGetProperty(macCoreDeviceId, 0, isInput, kAudioDevicePropertyStreamFormatSupported, &propSize, streamDescription);
-    PaUtil_FreeMemory(streamDescription);
-    return result;
-}
-
-static OSStatus CopyInputData(PaMacClientData* destination, const AudioBufferList *source, unsigned long frameCount)
-{
-    int frameSpacing, channelSpacing;
-    if (destination->inputSampleFormat & paNonInterleaved) {
-        frameSpacing = 1;
-        channelSpacing = destination->inputChannelCount;
-    }
-    else {
-        frameSpacing = destination->inputChannelCount;
-        channelSpacing = 1;
-    }
-    
-    AudioBuffer const *inputBuffer = &source->mBuffers[0];
-    void *coreAudioBuffer = inputBuffer->mData;
-    void *portAudioBuffer = destination->inputBuffer;
-    UInt32 i, streamNumber, streamChannel;
-    for (i = streamNumber = streamChannel = 0; i < destination->inputChannelCount; ++i, ++streamChannel) {
-        if (streamChannel >= inputBuffer->mNumberChannels) {
-            ++streamNumber;
-            inputBuffer = &source->mBuffers[streamNumber];
-            coreAudioBuffer = inputBuffer->mData;
-            streamChannel = 0;
-        }
-        destination->inputConverter(portAudioBuffer, frameSpacing, coreAudioBuffer, inputBuffer->mNumberChannels, frameCount, destination->ditherGenerator);
-        coreAudioBuffer += sizeof(Float32);
-        portAudioBuffer += Pa_GetSampleSize(destination->inputSampleFormat) * channelSpacing;
-    }
-    return noErr;
-}
-
-static OSStatus CopyOutputData(AudioBufferList* destination, PaMacClientData *source, unsigned long frameCount)
-{
-    int frameSpacing, channelSpacing;
-    if (source->outputSampleFormat & paNonInterleaved) {
-        frameSpacing = 1;
-        channelSpacing = source->outputChannelCount;
-    }
-    else {
-        frameSpacing = source->outputChannelCount;
-        channelSpacing = 1;
-    }
-    
-    AudioBuffer *outputBuffer = &destination->mBuffers[0];
-    void *coreAudioBuffer = outputBuffer->mData;
-    void *portAudioBuffer = source->outputBuffer;
-    UInt32 i, streamNumber, streamChannel;
-    for (i = streamNumber = streamChannel = 0; i < source->outputChannelCount; ++i, ++streamChannel) {
-        if (streamChannel >= outputBuffer->mNumberChannels) {
-            ++streamNumber;
-            outputBuffer = &destination->mBuffers[streamNumber];
-            coreAudioBuffer = outputBuffer->mData;
-            streamChannel = 0;
-        }
-        source->outputConverter(coreAudioBuffer, outputBuffer->mNumberChannels, portAudioBuffer, frameSpacing, frameCount, NULL);
-        coreAudioBuffer += sizeof(Float32);
-        portAudioBuffer += Pa_GetSampleSize(source->outputSampleFormat) * channelSpacing;
-    }
-    return noErr;
-}
-
-static OSStatus AudioIOProc( AudioDeviceID inDevice,
-                      const AudioTimeStamp* inNow,
-                      const AudioBufferList* inInputData,
-                      const AudioTimeStamp* inInputTime,
-                      AudioBufferList* outOutputData, 
-                      const AudioTimeStamp* inOutputTime,
-                      void* inClientData)
-{
-    PaMacClientData *clientData = (PaMacClientData *)inClientData;
-    PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
-    
-    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
-    
-    AudioBuffer *outputBuffer = &outOutputData->mBuffers[0];
-    unsigned long frameCount = outputBuffer->mDataByteSize / (outputBuffer->mNumberChannels * sizeof(Float32));
-
-    if (clientData->inputBuffer) {
-        CopyInputData(clientData, inInputData, frameCount);
-    }
-    PaStreamCallbackResult result = clientData->callback(clientData->inputBuffer, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
-    if (clientData->outputBuffer) {
-        CopyOutputData(outOutputData, clientData, frameCount);
-    }
-
-    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
-    
-    if (result == paComplete || result == paAbort) {
-        Pa_StopStream(clientData->stream);
-    }
-
-    PaUtil_FreeMemory( timeInfo );
-    return noErr;
-}
-
-// This is not for input-only streams, this is for streams where the input device is different from the output device
-static OSStatus AudioInputProc( AudioDeviceID inDevice,
-                         const AudioTimeStamp* inNow,
-                         const AudioBufferList* inInputData,
-                         const AudioTimeStamp* inInputTime,
-                         AudioBufferList* outOutputData, 
-                         const AudioTimeStamp* inOutputTime,
-                         void* inClientData)
-{
-    PaMacClientData *clientData = (PaMacClientData *)inClientData;
-    PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
-
-    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
-
-    AudioBuffer const *inputBuffer = &inInputData->mBuffers[0];
-    unsigned long frameCount = inputBuffer->mDataByteSize / (inputBuffer->mNumberChannels * sizeof(Float32));
-
-    CopyInputData(clientData, inInputData, frameCount);
-    PaStreamCallbackResult result = clientData->callback(clientData->inputBuffer, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
-    
-    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
-    if( result == paComplete || result == paAbort )
-       Pa_StopStream(clientData->stream);
-    PaUtil_FreeMemory( timeInfo );
-    return noErr;
-}
-
-// This is not for output-only streams, this is for streams where the input device is different from the output device
-static OSStatus AudioOutputProc( AudioDeviceID inDevice,
-                          const AudioTimeStamp* inNow,
-                          const AudioBufferList* inInputData,
-                          const AudioTimeStamp* inInputTime,
-                          AudioBufferList* outOutputData, 
-                          const AudioTimeStamp* inOutputTime,
-                          void* inClientData)
-{
-    PaMacClientData *clientData = (PaMacClientData *)inClientData;
-    //PaStreamCallbackTimeInfo *timeInfo = InitializeTimeInfo(inNow, inInputTime, inOutputTime);
-
-    PaUtil_BeginCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer );
-
-    AudioBuffer *outputBuffer = &outOutputData->mBuffers[0];
-    unsigned long frameCount = outputBuffer->mDataByteSize / (outputBuffer->mNumberChannels * sizeof(Float32));
-
-    //clientData->callback(NULL, clientData->outputBuffer, frameCount, timeInfo, paNoFlag, clientData->userData);
-
-    CopyOutputData(outOutputData, clientData, frameCount);
-
-    PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
-    return noErr;
-}
-
-static PaError SetSampleRate(AudioDeviceID device, double sampleRate, int isInput)
-{
-    PaError result = paNoError;
-    
-    double actualSampleRate;
-    UInt32 propSize = sizeof(double);
-    result = conv_err(AudioDeviceSetProperty(device, NULL, 0, isInput, kAudioDevicePropertyNominalSampleRate, propSize, &sampleRate));
-    
-    result = conv_err(AudioDeviceGetProperty(device, 0, isInput, kAudioDevicePropertyNominalSampleRate, &propSize, &actualSampleRate));
-    
-    if (result == paNoError && actualSampleRate != sampleRate) {
-        result = paInvalidSampleRate;
-    }
-    
-    return result;    
-}
-
-static PaError SetFramesPerBuffer(AudioDeviceID device, unsigned long framesPerBuffer, int isInput)
-{
-    PaError result = paNoError;
-    UInt32 preferredFramesPerBuffer = framesPerBuffer;
-    //    while (preferredFramesPerBuffer > UINT32_MAX) {
-    //        preferredFramesPerBuffer /= 2;
-    //    }
-    
-    UInt32 actualFramesPerBuffer;
-    UInt32 propSize = sizeof(UInt32);
-    result = conv_err(AudioDeviceSetProperty(device, NULL, 0, isInput, kAudioDevicePropertyBufferFrameSize, propSize, &preferredFramesPerBuffer));
-    
-    result = conv_err(AudioDeviceGetProperty(device, 0, isInput, kAudioDevicePropertyBufferFrameSize, &propSize, &actualFramesPerBuffer));
-    
-    if (result != paNoError) {
-        // do nothing
-    }
-    else if (actualFramesPerBuffer > framesPerBuffer) {
-        result = paBufferTooSmall;
-    }
-    else if (actualFramesPerBuffer < framesPerBuffer) {
-        result = paBufferTooBig;
-    }
-    
-    return result;    
-}
-    
-static PaError SetUpUnidirectionalStream(AudioDeviceID device, double sampleRate, unsigned long framesPerBuffer, int isInput)
-{
-    PaError err = paNoError;
-    err = SetSampleRate(device, sampleRate, isInput);
-    if( err == paNoError )
-        err = SetFramesPerBuffer(device, framesPerBuffer, isInput);
-    return err;
-}
-
-// =====  PortAudio functions  =====
-#pragma mark PortAudio functions
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-    
-    PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation*)hostApi;
-    
-    CleanUp(macCoreHostApi);
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation*)hostApi;
-    PaDeviceInfo *deviceInfo;
-    
-    PaError result = paNoError;
-    if (inputParameters) {
-        deviceInfo = macCoreHostApi->inheritedHostApiRep.deviceInfos[inputParameters->device];
-        if (inputParameters->channelCount > deviceInfo->maxInputChannels)
-            result = paInvalidChannelCount;
-        else if (CheckFormat(macCoreHostApi->macCoreDeviceIds[inputParameters->device], inputParameters, sampleRate, 1) != kAudioHardwareNoError) {
-            result = paInvalidSampleRate;
-        }
-    }
-    if (outputParameters && result == paNoError) {
-        deviceInfo = macCoreHostApi->inheritedHostApiRep.deviceInfos[outputParameters->device];
-        if (outputParameters->channelCount > deviceInfo->maxOutputChannels)
-            result = paInvalidChannelCount;
-        else if (CheckFormat(macCoreHostApi->macCoreDeviceIds[outputParameters->device], outputParameters, sampleRate, 0) != kAudioHardwareNoError) {
-            result = paInvalidSampleRate;
-        }
-    }
-
-    return result;
-}
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError err = paNoError;
-    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation *)hostApi;
-    PaMacCoreStream *stream = PaUtil_AllocateMemory(sizeof(PaMacCoreStream));
-    stream->isActive = 0;
-    stream->isStopped = 1;
-    stream->inputDevice = kAudioDeviceUnknown;
-    stream->outputDevice = kAudioDeviceUnknown;
-    
-    PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                           ( (streamCallback)
-                                             ? &macCoreHostApi->callbackStreamInterface
-                                             : &macCoreHostApi->blockingStreamInterface ),
-                                           streamCallback, userData );
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-    
-    *s = (PaStream*)stream;
-    PaMacClientData *clientData = PaUtil_AllocateMemory(sizeof(PaMacClientData));
-    clientData->stream = stream;
-    clientData->callback = streamCallback;
-    clientData->userData = userData;
-    clientData->inputBuffer = 0;
-    clientData->outputBuffer = 0;
-    clientData->ditherGenerator = PaUtil_AllocateMemory(sizeof(PaUtilTriangularDitherGenerator));
-    PaUtil_InitializeTriangularDitherState(clientData->ditherGenerator);
-    
-    if (inputParameters != NULL) {
-        stream->inputDevice = macCoreHostApi->macCoreDeviceIds[inputParameters->device];
-        clientData->inputConverter = PaUtil_SelectConverter(paFloat32, inputParameters->sampleFormat, streamFlags);
-        clientData->inputBuffer = PaUtil_AllocateMemory(Pa_GetSampleSize(inputParameters->sampleFormat) * framesPerBuffer * inputParameters->channelCount);
-        clientData->inputChannelCount = inputParameters->channelCount;
-        clientData->inputSampleFormat = inputParameters->sampleFormat;
-        err = SetUpUnidirectionalStream(stream->inputDevice, sampleRate, framesPerBuffer, 1);
-    }
-    
-    if (err == paNoError && outputParameters != NULL) {
-        stream->outputDevice = macCoreHostApi->macCoreDeviceIds[outputParameters->device];
-        clientData->outputConverter = PaUtil_SelectConverter(outputParameters->sampleFormat, paFloat32, streamFlags);
-        clientData->outputBuffer = PaUtil_AllocateMemory(Pa_GetSampleSize(outputParameters->sampleFormat) * framesPerBuffer * outputParameters->channelCount);
-        clientData->outputChannelCount = outputParameters->channelCount;
-        clientData->outputSampleFormat = outputParameters->sampleFormat;
-        err = SetUpUnidirectionalStream(stream->outputDevice, sampleRate, framesPerBuffer, 0);
-    }
-
-    if (inputParameters == NULL || outputParameters == NULL || stream->inputDevice == stream->outputDevice) {
-        AudioDeviceID device = (inputParameters == NULL) ? stream->outputDevice : stream->inputDevice;
-
-        AudioDeviceAddIOProc(device, AudioIOProc, clientData);
-    }
-    else {
-        // using different devices for input and output
-        AudioDeviceAddIOProc(stream->inputDevice, AudioInputProc, clientData);
-        AudioDeviceAddIOProc(stream->outputDevice, AudioOutputProc, clientData);
-    }
-    
-    return err;
-}
-
-// Note: When CloseStream() is called, the multi-api layer ensures that the stream has already been stopped or aborted.
-static PaError CloseStream( PaStream* s )
-{
-    PaError err = paNoError;
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-
-    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
-
-    if (stream->inputDevice != kAudioDeviceUnknown) {
-        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
-            err = conv_err(AudioDeviceRemoveIOProc(stream->inputDevice, AudioIOProc));
-        }
-        else {
-            err = conv_err(AudioDeviceRemoveIOProc(stream->inputDevice, AudioInputProc));
-            err = conv_err(AudioDeviceRemoveIOProc(stream->outputDevice, AudioOutputProc));
-        }
-    }
-    else {
-        err = conv_err(AudioDeviceRemoveIOProc(stream->outputDevice, AudioIOProc));
-    }
-    
-    return err;
-}
-
-
-static PaError StartStream( PaStream *s )
-{
-    PaError err = paNoError;
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-
-    if (stream->inputDevice != kAudioDeviceUnknown) {
-        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
-            err = conv_err(AudioDeviceStart(stream->inputDevice, AudioIOProc));
-        }
-        else {
-            err = conv_err(AudioDeviceStart(stream->inputDevice, AudioInputProc));
-            err = conv_err(AudioDeviceStart(stream->outputDevice, AudioOutputProc));
-        }
-    }
-    else {
-        err = conv_err(AudioDeviceStart(stream->outputDevice, AudioIOProc));
-    }
-    
-    stream->isActive = 1;
-    stream->isStopped = 0;
-    return err;
-}
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError err = paNoError;
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    
-    if (stream->inputDevice != kAudioDeviceUnknown) {
-        if (stream->outputDevice == kAudioDeviceUnknown || stream->outputDevice == stream->inputDevice) {
-            err = conv_err(AudioDeviceStop(stream->inputDevice, AudioIOProc));
-        }
-        else {
-            err = conv_err(AudioDeviceStop(stream->inputDevice, AudioInputProc));
-            err = conv_err(AudioDeviceStop(stream->outputDevice, AudioOutputProc));
-        }
-    }
-    else {
-        err = conv_err(AudioDeviceStop(stream->outputDevice, AudioIOProc));
-    }
-    
-    stream->isActive = 0;
-    stream->isStopped = 1;
-    return err;
-}    
-
-static PaError StopStream( PaStream *s )
-{
-    // TODO: this should be nicer than abort
-    return AbortStream(s);
-}
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    
-    return stream->isStopped;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-
-    return stream->isActive;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    OSStatus err;
-    PaTime result;
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-
-    AudioTimeStamp *timeStamp = PaUtil_AllocateMemory(sizeof(AudioTimeStamp));
-    if (stream->inputDevice != kAudioDeviceUnknown) {
-        err = AudioDeviceGetCurrentTime(stream->inputDevice, timeStamp);
-    }
-    else {
-        err = AudioDeviceGetCurrentTime(stream->outputDevice, timeStamp);
-    }
-    
-    result = err ? 0 : timeStamp->mSampleTime;
-    PaUtil_FreeMemory(timeStamp);
-
-    return result;
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaMacCoreStream *stream = (PaMacCoreStream*)s;
-    
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-// As separate stream interfaces are used for blocking and callback streams, the following functions can be guaranteed to only be called for blocking streams.
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    return paInternalError;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    return paInternalError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    return paInternalError;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    return paInternalError;
-}
-
-// HostAPI-specific initialization function
-PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaMacCoreHostApiRepresentation *macCoreHostApi = (PaMacCoreHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaMacCoreHostApiRepresentation) );
-    if( !macCoreHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    
-    macCoreHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !macCoreHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    
-    *hostApi = &macCoreHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paCoreAudio;
-    (*hostApi)->info.name = "CoreAudio";
-
-    result = InitializeDeviceInfos(macCoreHostApi, hostApiIndex);
-    if (result != paNoError) {
-        goto error;
-    }
-    
-    // Set up the proper callbacks to this HostApi's functions
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-    
-    PaUtil_InitializeStreamInterface( &macCoreHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-    
-    PaUtil_InitializeStreamInterface( &macCoreHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-    
-    return result;
-    
-error:
-        if( macCoreHostApi ) {
-            CleanUp(macCoreHostApi);
-        }
-    
-    return result;
-}
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
deleted file mode 100644
index e96b78b9d5..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Helper and utility functions for pa_mac_core.c (Apple AUHAL implementation)
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostapi_src
-*/
-
-#include "pa_mac_core_utilities.h"
-
-PaError PaMacCore_SetUnixError( int err, int line )
-{
-   PaError ret;
-   const char *errorText;
-
-   if( err == 0 )
-   {
-      return paNoError;
-   }
-
-   ret = paNoError;
-   errorText = strerror( err );
-
-   /** Map Unix error to PaError. Pretty much the only one that maps
-       is ENOMEM. */
-   if( err == ENOMEM )
-      ret = paInsufficientMemory;
-   else
-      ret = paInternalError;
-
-   DBUG(("%d on line %d: msg='%s'\n", err, line, errorText));
-   PaUtil_SetLastHostErrorInfo( paCoreAudio, err, errorText );
-
-   return ret;
-}
-
-/*
- * Translates MacOS generated errors into PaErrors
- */
-PaError PaMacCore_SetError(OSStatus error, int line, int isError)
-{
-    /*FIXME: still need to handle possible ComponentResult values.*/
-    /*       unfortunately, they don't seem to be documented anywhere.*/
-    PaError result;
-    const char *errorType; 
-    const char *errorText;
-    
-    switch (error) {
-    case kAudioHardwareNoError:
-        return paNoError;
-    case kAudioHardwareNotRunningError:
-        errorText = "Audio Hardware Not Running";
-        result = paInternalError; break;
-    case kAudioHardwareUnspecifiedError: 
-        errorText = "Unspecified Audio Hardware Error";
-        result = paInternalError; break;
-    case kAudioHardwareUnknownPropertyError:
-        errorText = "Audio Hardware: Unknown Property";
-        result = paInternalError; break;
-    case kAudioHardwareBadPropertySizeError:
-        errorText = "Audio Hardware: Bad Property Size";
-        result = paInternalError; break;
-    case kAudioHardwareIllegalOperationError: 
-        errorText = "Audio Hardware: Illegal Operation";
-        result = paInternalError; break;
-    case kAudioHardwareBadDeviceError:
-        errorText = "Audio Hardware: Bad Device";
-        result = paInvalidDevice; break;
-    case kAudioHardwareBadStreamError:
-        errorText = "Audio Hardware: BadStream";
-        result = paBadStreamPtr; break;
-    case kAudioHardwareUnsupportedOperationError:
-        errorText = "Audio Hardware: Unsupported Operation";
-        result = paInternalError; break;
-    case kAudioDeviceUnsupportedFormatError:
-        errorText = "Audio Device: Unsupported Format";
-        result = paSampleFormatNotSupported; break;
-    case kAudioDevicePermissionsError:
-        errorText = "Audio Device: Permissions Error";
-        result = paDeviceUnavailable; break;
-    /* Audio Unit Errors: http://developer.apple.com/documentation/MusicAudio/Reference/CoreAudio/audio_units/chapter_5_section_3.html */
-    case kAudioUnitErr_InvalidProperty:
-        errorText = "Audio Unit: Invalid Property";
-        result = paInternalError; break;
-    case kAudioUnitErr_InvalidParameter:
-        errorText = "Audio Unit: Invalid Parameter";
-        result = paInternalError; break;
-    case kAudioUnitErr_NoConnection:
-        errorText = "Audio Unit: No Connection";
-        result = paInternalError; break;
-    case kAudioUnitErr_FailedInitialization:
-        errorText = "Audio Unit: Initialization Failed";
-        result = paInternalError; break;
-    case kAudioUnitErr_TooManyFramesToProcess:
-        errorText = "Audio Unit: Too Many Frames";
-        result = paInternalError; break;
-    case kAudioUnitErr_IllegalInstrument:
-        errorText = "Audio Unit: Illegal Instrument";
-        result = paInternalError; break;
-    case kAudioUnitErr_InstrumentTypeNotFound:
-        errorText = "Audio Unit: Instrument Type Not Found";
-        result = paInternalError; break;
-    case kAudioUnitErr_InvalidFile:
-        errorText = "Audio Unit: Invalid File";
-        result = paInternalError; break;
-    case kAudioUnitErr_UnknownFileType:
-        errorText = "Audio Unit: Unknown File Type";
-        result = paInternalError; break;
-    case kAudioUnitErr_FileNotSpecified:
-        errorText = "Audio Unit: File Not Specified";
-        result = paInternalError; break;
-    case kAudioUnitErr_FormatNotSupported:
-        errorText = "Audio Unit: Format Not Supported";
-        result = paInternalError; break;
-    case kAudioUnitErr_Uninitialized:
-        errorText = "Audio Unit: Unitialized";
-        result = paInternalError; break;
-    case kAudioUnitErr_InvalidScope:
-        errorText = "Audio Unit: Invalid Scope";
-        result = paInternalError; break;
-    case kAudioUnitErr_PropertyNotWritable:
-        errorText = "Audio Unit: PropertyNotWritable";
-        result = paInternalError; break;
-    case kAudioUnitErr_InvalidPropertyValue:
-        errorText = "Audio Unit: Invalid Property Value";
-        result = paInternalError; break;
-    case kAudioUnitErr_PropertyNotInUse:
-        errorText = "Audio Unit: Property Not In Use";
-        result = paInternalError; break;
-    case kAudioUnitErr_Initialized:
-        errorText = "Audio Unit: Initialized";
-        result = paInternalError; break;
-    case kAudioUnitErr_InvalidOfflineRender:
-        errorText = "Audio Unit: Invalid Offline Render";
-        result = paInternalError; break;
-    case kAudioUnitErr_Unauthorized:
-        errorText = "Audio Unit: Unauthorized";
-        result = paInternalError; break;
-    case kAudioUnitErr_CannotDoInCurrentContext:
-        errorText = "Audio Unit: cannot do in current context";
-        result = paInternalError; break;
-    default:
-        errorText = "Unknown Error";
-        result = paInternalError;
-    }
-
-    if (isError)
-        errorType = "Error";
-    else
-        errorType = "Warning";
-
-    char str[20];
-    // see if it appears to be a 4-char-code
-    *(UInt32 *)(str + 1) = CFSwapInt32HostToBig(error);
-    if (isprint(str[1]) && isprint(str[2]) && isprint(str[3]) && isprint(str[4]))
-    {
-        str[0] = str[5] = '\'';
-        str[6] = '\0';
-    } else {
-        // no, format it as an integer
-        sprintf(str, "%d", (int)error);
-    }
-
-    DBUG(("%s on line %d: err='%s', msg=%s\n", errorType, line, str, errorText));
-
-    PaUtil_SetLastHostErrorInfo( paCoreAudio, error, errorText );
-
-    return result;
-}
-
-/*
- * This function computes an appropriate ring buffer size given
- * a requested latency (in seconds), sample rate and framesPerBuffer.
- *
- * The returned ringBufferSize is computed using the following
- * constraints:
- *   - it must be at least 4.
- *   - it must be at least 3x framesPerBuffer.
- *   - it must be at least 2x the suggestedLatency.
- *   - it must be a power of 2.
- * This function attempts to compute the minimum such size.
- *
- * FEEDBACK: too liberal/conservative/another way?
- */
-long computeRingBufferSize( const PaStreamParameters *inputParameters,
-                                   const PaStreamParameters *outputParameters,
-                                   long inputFramesPerBuffer,
-                                   long outputFramesPerBuffer,
-                                   double sampleRate )
-{
-   long ringSize;
-   int index;
-   int i;
-   double latencyTimesChannelCount ;
-   long framesPerBufferTimesChannelCount ;
-
-   VVDBUG(( "computeRingBufferSize()\n" ));
-
-   assert( inputParameters || outputParameters );
-
-   if( outputParameters && inputParameters )
-   {
-      latencyTimesChannelCount = MAX(
-           inputParameters->suggestedLatency * inputParameters->channelCount,
-           outputParameters->suggestedLatency * outputParameters->channelCount );
-      framesPerBufferTimesChannelCount = MAX(
-           inputFramesPerBuffer * inputParameters->channelCount,
-           outputFramesPerBuffer * outputParameters->channelCount );
-   } 
-   else if( outputParameters )
-   {
-      latencyTimesChannelCount
-                = outputParameters->suggestedLatency * outputParameters->channelCount;
-      framesPerBufferTimesChannelCount
-                = outputFramesPerBuffer * outputParameters->channelCount;
-   }
-   else /* we have inputParameters  */
-   {
-      latencyTimesChannelCount
-                = inputParameters->suggestedLatency * inputParameters->channelCount;
-      framesPerBufferTimesChannelCount
-                = inputFramesPerBuffer * inputParameters->channelCount;
-   }
-
-   ringSize = (long) ( latencyTimesChannelCount * sampleRate * 2 + .5);
-   VDBUG( ( "suggested latency * channelCount: %d\n", (int) (latencyTimesChannelCount*sampleRate) ) );
-   if( ringSize < framesPerBufferTimesChannelCount * 3 )
-      ringSize = framesPerBufferTimesChannelCount * 3 ;
-   VDBUG(("framesPerBuffer*channelCount:%d\n",(int)framesPerBufferTimesChannelCount));
-   VDBUG(("Ringbuffer size (1): %d\n", (int)ringSize ));
-
-   /* make sure it's at least 4 */
-   ringSize = MAX( ringSize, 4 );
-
-   /* round up to the next power of 2 */
-   index = -1;
-   for( i=0; i<sizeof(long)*8; ++i )
-      if( ringSize >> i & 0x01 )
-         index = i;
-   assert( index > 0 );
-   if( ringSize <= ( 0x01 << index ) )
-      ringSize = 0x01 << index ;
-   else
-      ringSize = 0x01 << ( index + 1 );
-
-   VDBUG(( "Final Ringbuffer size (2): %d\n", (int)ringSize ));
-   return ringSize;
-}
-
-
-/*
- * Durring testing of core audio, I found that serious crashes could occur
- * if properties such as sample rate were changed multiple times in rapid
- * succession. The function below has some fancy logic to make sure that changes
- * are acknowledged before another is requested. That seems to help a lot.
- */
-
-OSStatus propertyProc(
-    AudioDeviceID inDevice, 
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID, 
-    void* inClientData )
-{
-   MutexAndBool *mab = (MutexAndBool *) inClientData;
-   mab->once = TRUE;
-   pthread_mutex_unlock( &(mab->mutex) );
-   return noErr;
-}
-
-/* sets the value of the given property and waits for the change to 
-   be acknowledged, and returns the final value, which is not guaranteed
-   by this function to be the same as the desired value. Obviously, this
-   function can only be used for data whose input and output are the
-   same size and format, and their size and format are known in advance.*/
-PaError AudioDeviceSetPropertyNowAndWaitForChange(
-    AudioDeviceID inDevice,
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID,
-    UInt32 inPropertyDataSize, 
-    const void *inPropertyData,
-    void *outPropertyData )
-{
-   OSStatus macErr;
-   int unixErr;
-   MutexAndBool mab;
-   UInt32 outPropertyDataSize = inPropertyDataSize;
-
-   /* First, see if it already has that value. If so, return. */
-   macErr = AudioDeviceGetProperty( inDevice, inChannel,
-                                 isInput, inPropertyID, 
-                                 &outPropertyDataSize, outPropertyData );
-   if( macErr )
-      goto failMac2;
-   if( inPropertyDataSize!=outPropertyDataSize )
-      return paInternalError;
-   if( 0==memcmp( outPropertyData, inPropertyData, outPropertyDataSize ) )
-      return paNoError;
-
-   /* setup and lock mutex */
-   mab.once = FALSE;
-   unixErr = pthread_mutex_init( &mab.mutex, NULL );
-   if( unixErr )
-      goto failUnix2;
-   unixErr = pthread_mutex_lock( &mab.mutex );
-   if( unixErr )
-      goto failUnix;
-
-   /* add property listener */
-   macErr = AudioDeviceAddPropertyListener( inDevice, inChannel, isInput,
-                                   inPropertyID, propertyProc,
-                                   &mab ); 
-   if( macErr )
-      goto failMac;
-   /* set property */
-   macErr  = AudioDeviceSetProperty( inDevice, NULL, inChannel,
-                                 isInput, inPropertyID,
-                                 inPropertyDataSize, inPropertyData );
-   if( macErr ) {
-      /* we couldn't set the property, so we'll just unlock the mutex
-         and move on. */
-      pthread_mutex_unlock( &mab.mutex );
-   }
-
-   /* wait for property to change */                      
-   unixErr = pthread_mutex_lock( &mab.mutex );
-   if( unixErr )
-      goto failUnix;
-
-   /* now read the property back out */
-   macErr = AudioDeviceGetProperty( inDevice, inChannel,
-                                 isInput, inPropertyID, 
-                                 &outPropertyDataSize, outPropertyData );
-   if( macErr )
-      goto failMac;
-   /* cleanup */
-   AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput,
-                                      inPropertyID, propertyProc );
-   unixErr = pthread_mutex_unlock( &mab.mutex );
-   if( unixErr )
-      goto failUnix2;
-   unixErr = pthread_mutex_destroy( &mab.mutex );
-   if( unixErr )
-      goto failUnix2;
-
-   return paNoError;
-
- failUnix:
-   pthread_mutex_destroy( &mab.mutex );
-   AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput,
-                                      inPropertyID, propertyProc );
-
- failUnix2:
-   DBUG( ("Error #%d while setting a device property: %s\n", unixErr, strerror( unixErr ) ) );
-   return paUnanticipatedHostError;
-
- failMac:
-   pthread_mutex_destroy( &mab.mutex );
-   AudioDeviceRemovePropertyListener( inDevice, inChannel, isInput,
-                                      inPropertyID, propertyProc );
- failMac2:
-   return ERR( macErr );
-}
-
-/*
- * Sets the sample rate the HAL device.
- * if requireExact: set the sample rate or fail.
- *
- * otherwise      : set the exact sample rate.
- *             If that fails, check for available sample rates, and choose one
- *             higher than the requested rate. If there isn't a higher one,
- *             just use the highest available.
- */
-PaError setBestSampleRateForDevice( const AudioDeviceID device,
-                                    const bool isOutput,
-                                    const bool requireExact,
-                                    const Float64 desiredSrate )
-{
-   /*FIXME: changing the sample rate is disruptive to other programs using the
-            device, so it might be good to offer a custom flag to not change the
-            sample rate and just do conversion. (in my casual tests, there is
-            no disruption unless the sample rate really does need to change) */
-   const bool isInput = isOutput ? 0 : 1;
-   Float64 srate;
-   UInt32 propsize = sizeof( Float64 );
-   OSErr err;
-   AudioValueRange *ranges;
-   int i=0;
-   Float64 max  = -1; /*the maximum rate available*/
-   Float64 best = -1; /*the lowest sample rate still greater than desired rate*/
-   VDBUG(("Setting sample rate for device %ld to %g.\n",device,(float)desiredSrate));
-
-   /* -- try setting the sample rate -- */
-   err = AudioDeviceSetPropertyNowAndWaitForChange(
-                                 device, 0, isInput,
-                                 kAudioDevicePropertyNominalSampleRate,
-                                 propsize, &desiredSrate, &srate );
-   if( err )
-      return err;
-
-   /* -- if the rate agrees, and we got no errors, we are done -- */
-   if( !err && srate == desiredSrate )
-      return paNoError;
-   /* -- we've failed if the rates disagree and we are setting input -- */
-   if( requireExact )
-      return paInvalidSampleRate;
-
-   /* -- generate a list of available sample rates -- */
-   err = AudioDeviceGetPropertyInfo( device, 0, isInput,
-                                kAudioDevicePropertyAvailableNominalSampleRates,
-                                &propsize, NULL );
-   if( err )
-      return ERR( err );
-   ranges = (AudioValueRange *)calloc( 1, propsize );
-   if( !ranges )
-      return paInsufficientMemory;
-   err = AudioDeviceGetProperty( device, 0, isInput,
-                                kAudioDevicePropertyAvailableNominalSampleRates,
-                                &propsize, ranges );
-   if( err )
-   {
-      free( ranges );
-      return ERR( err );
-   }
-   VDBUG(("Requested sample rate of %g was not available.\n", (float)desiredSrate));
-   VDBUG(("%lu Available Sample Rates are:\n",propsize/sizeof(AudioValueRange)));
-#ifdef MAC_CORE_VERBOSE_DEBUG
-   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
-      VDBUG( ("\t%g-%g\n",
-              (float) ranges[i].mMinimum,
-              (float) ranges[i].mMaximum ) );
-#endif
-   VDBUG(("-----\n"));
-   
-   /* -- now pick the best available sample rate -- */
-   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
-   {
-      if( ranges[i].mMaximum > max ) max = ranges[i].mMaximum;
-      if( ranges[i].mMinimum > desiredSrate ) {
-         if( best < 0 )
-            best = ranges[i].mMinimum;
-         else if( ranges[i].mMinimum < best )
-            best = ranges[i].mMinimum;
-      }
-   }
-   if( best < 0 )
-      best = max;
-   VDBUG( ("Maximum Rate %g. best is %g.\n", max, best ) );
-   free( ranges );
-
-   /* -- set the sample rate -- */
-   propsize = sizeof( best );
-   err = AudioDeviceSetPropertyNowAndWaitForChange(
-                                 device, 0, isInput,
-                                 kAudioDevicePropertyNominalSampleRate,
-                                 propsize, &best, &srate );
-   if( err )
-      return err;
-
-   if( err )
-      return ERR( err );
-   /* -- if the set rate matches, we are done -- */
-   if( srate == best )
-      return paNoError;
-
-   /* -- otherwise, something wierd happened: we didn't set the rate, and we got no errors. Just bail. */
-   return paInternalError;
-}
-
-
-/*
-   Attempts to set the requestedFramesPerBuffer. If it can't set the exact
-   value, it settles for something smaller if available. If nothing smaller
-   is available, it uses the smallest available size.
-   actualFramesPerBuffer will be set to the actual value on successful return.
-   OK to pass NULL to actualFramesPerBuffer.
-   The logic is very simmilar too setBestSampleRate only failure here is
-   not usually catastrophic.
-*/
-PaError setBestFramesPerBuffer( const AudioDeviceID device,
-                                const bool isOutput,
-                                UInt32 requestedFramesPerBuffer, 
-                                UInt32 *actualFramesPerBuffer )
-{
-   UInt32 afpb;
-   const bool isInput = !isOutput;
-   UInt32 propsize = sizeof(UInt32);
-   OSErr err;
-   Float64 min  = -1; /*the min blocksize*/
-   Float64 best = -1; /*the best blocksize*/
-   int i=0;
-   AudioValueRange *ranges;
-
-   if( actualFramesPerBuffer == NULL )
-      actualFramesPerBuffer = &afpb;
-
-
-   /* -- try and set exact FPB -- */
-   err = AudioDeviceSetProperty( device, NULL, 0, isInput,
-                                 kAudioDevicePropertyBufferFrameSize,
-                                 propsize, &requestedFramesPerBuffer);
-   err = AudioDeviceGetProperty( device, 0, isInput,
-                           kAudioDevicePropertyBufferFrameSize,
-                           &propsize, actualFramesPerBuffer);
-   if( err )
-      return ERR( err );
-   if( *actualFramesPerBuffer == requestedFramesPerBuffer )
-      return paNoError; /* we are done */
-
-   /* -- fetch available block sizes -- */
-   err = AudioDeviceGetPropertyInfo( device, 0, isInput,
-                           kAudioDevicePropertyBufferSizeRange,
-                           &propsize, NULL );
-   if( err )
-      return ERR( err );
-   ranges = (AudioValueRange *)calloc( 1, propsize );
-   if( !ranges )
-      return paInsufficientMemory;
-   err = AudioDeviceGetProperty( device, 0, isInput,
-                                kAudioDevicePropertyBufferSizeRange,
-                                &propsize, ranges );
-   if( err )
-   {
-      free( ranges );
-      return ERR( err );
-   }
-   VDBUG(("Requested block size of %lu was not available.\n",
-          requestedFramesPerBuffer ));
-   VDBUG(("%lu Available block sizes are:\n",propsize/sizeof(AudioValueRange)));
-#ifdef MAC_CORE_VERBOSE_DEBUG
-   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
-      VDBUG( ("\t%g-%g\n",
-              (float) ranges[i].mMinimum,
-              (float) ranges[i].mMaximum ) );
-#endif
-   VDBUG(("-----\n"));
-   
-   /* --- now pick the best available framesPerBuffer -- */
-   for( i=0; i<propsize/sizeof(AudioValueRange); ++i )
-   {
-      if( min == -1 || ranges[i].mMinimum < min ) min = ranges[i].mMinimum;
-      if( ranges[i].mMaximum < requestedFramesPerBuffer ) {
-         if( best < 0 )
-            best = ranges[i].mMaximum;
-         else if( ranges[i].mMaximum > best )
-            best = ranges[i].mMaximum;
-      }
-   }
-   if( best == -1 )
-      best = min;
-   VDBUG( ("Minimum FPB  %g. best is %g.\n", min, best ) );
-   free( ranges );
-
-   /* --- set the buffer size (ignore errors) -- */
-   requestedFramesPerBuffer = (UInt32) best ;
-   propsize = sizeof( UInt32 );
-   err = AudioDeviceSetProperty( device, NULL, 0, isInput,
-                                 kAudioDevicePropertyBufferSize,
-                                 propsize, &requestedFramesPerBuffer );
-   /* --- read the property to check that it was set -- */
-   err = AudioDeviceGetProperty( device, 0, isInput,
-                                 kAudioDevicePropertyBufferSize,
-                                 &propsize, actualFramesPerBuffer );
-
-   if( err )
-      return ERR( err );
-
-   return paNoError;
-}
diff --git a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
deleted file mode 100644
index 0b72b26447..0000000000
--- a/libs/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Helper and utility functions for pa_mac_core.c (Apple AUHAL implementation)
- *
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Written by Bjorn Roche of XO Audio LLC, from PA skeleton code.
- * Portions copied from code by Dominic Mazzoni (who wrote a HAL implementation)
- *
- * Dominic's code was based on code by Phil Burk, Darren Gibbs,
- * Gord Peters, Stephane Letz, and Greg Pfiel.
- *
- * The following people also deserve acknowledgements:
- *
- * Olivier Tristan for feedback and testing
- * Glenn Zelniker and Z-Systems engineering for sponsoring the Blocking I/O
- * interface.
- * 
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostapi_src
-*/
-
-#ifndef PA_MAC_CORE_UTILITIES_H__
-#define PA_MAC_CORE_UTILITIES_H__
-
-#include <pthread.h>
-#include "portaudio.h"
-#include "pa_util.h"
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
-
-#ifndef MIN
-#define MIN(a, b)  (((a)<(b))?(a):(b))
-#endif
-
-#ifndef MAX
-#define MAX(a, b)  (((a)<(b))?(b):(a))
-#endif
-
-#define ERR(mac_error) PaMacCore_SetError(mac_error, __LINE__, 1 ) 
-#define WARNING(mac_error) PaMacCore_SetError(mac_error, __LINE__, 0 )
-
-
-/* Help keep track of AUHAL element numbers */
-#define INPUT_ELEMENT  (1)
-#define OUTPUT_ELEMENT (0)
-
-/* Normal level of debugging: fine for most apps that don't mind the occational warning being printf'ed */
-/*
- */
-#define MAC_CORE_DEBUG
-#ifdef MAC_CORE_DEBUG
-# define DBUG(MSG) do { printf("||PaMacCore (AUHAL)|| "); printf MSG ; fflush(stdout); } while(0)
-#else
-# define DBUG(MSG)
-#endif
-
-/* Verbose Debugging: useful for developement */
-/*
-#define MAC_CORE_VERBOSE_DEBUG
-*/
-#ifdef MAC_CORE_VERBOSE_DEBUG
-# define VDBUG(MSG) do { printf("||PaMacCore (v )|| "); printf MSG ; fflush(stdout); } while(0)
-#else
-# define VDBUG(MSG)
-#endif
-
-/* Very Verbose Debugging: Traces every call. */
-/*
-#define MAC_CORE_VERY_VERBOSE_DEBUG
- */
-#ifdef MAC_CORE_VERY_VERBOSE_DEBUG
-# define VVDBUG(MSG) do { printf("||PaMacCore (vv)|| "); printf MSG ; fflush(stdout); } while(0)
-#else
-# define VVDBUG(MSG)
-#endif
-
-
-
-
-
-#define UNIX_ERR(err) PaMacCore_SetUnixError( err, __LINE__ )
-
-PaError PaMacCore_SetUnixError( int err, int line );
-
-/*
- * Translates MacOS generated errors into PaErrors
- */
-PaError PaMacCore_SetError(OSStatus error, int line, int isError);
-
-/*
- * This function computes an appropriate ring buffer size given
- * a requested latency (in seconds), sample rate and framesPerBuffer.
- *
- * The returned ringBufferSize is computed using the following
- * constraints:
- *   - it must be at least 4.
- *   - it must be at least 3x framesPerBuffer.
- *   - it must be at least 2x the suggestedLatency.
- *   - it must be a power of 2.
- * This function attempts to compute the minimum such size.
- *
- */
-long computeRingBufferSize( const PaStreamParameters *inputParameters,
-                                   const PaStreamParameters *outputParameters,
-                                   long inputFramesPerBuffer,
-                                   long outputFramesPerBuffer,
-                                   double sampleRate );
-
-/*
- * Durring testing of core audio, I found that serious crashes could occur
- * if properties such as sample rate were changed multiple times in rapid
- * succession. The function below has some fancy logic to make sure that changes
- * are acknowledged before another is requested. That seems to help a lot.
- */
-
-typedef struct {
-   bool once; /* I didn't end up using this. bdr */
-   pthread_mutex_t mutex;
-} MutexAndBool ;
-
-OSStatus propertyProc(
-    AudioDeviceID inDevice, 
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID, 
-    void* inClientData );
-
-/* sets the value of the given property and waits for the change to 
-   be acknowledged, and returns the final value, which is not guaranteed
-   by this function to be the same as the desired value. Obviously, this
-   function can only be used for data whose input and output are the
-   same size and format, and their size and format are known in advance.*/
-PaError AudioDeviceSetPropertyNowAndWaitForChange(
-    AudioDeviceID inDevice,
-    UInt32 inChannel, 
-    Boolean isInput, 
-    AudioDevicePropertyID inPropertyID,
-    UInt32 inPropertyDataSize, 
-    const void *inPropertyData,
-    void *outPropertyData );
-
-/*
- * Sets the sample rate the HAL device.
- * if requireExact: set the sample rate or fail.
- *
- * otherwise      : set the exact sample rate.
- *             If that fails, check for available sample rates, and choose one
- *             higher than the requested rate. If there isn't a higher one,
- *             just use the highest available.
- */
-PaError setBestSampleRateForDevice( const AudioDeviceID device,
-                                    const bool isOutput,
-                                    const bool requireExact,
-                                    const Float64 desiredSrate );
-/*
-   Attempts to set the requestedFramesPerBuffer. If it can't set the exact
-   value, it settles for something smaller if available. If nothing smaller
-   is available, it uses the smallest available size.
-   actualFramesPerBuffer will be set to the actual value on successful return.
-   OK to pass NULL to actualFramesPerBuffer.
-   The logic is very simmilar too setBestSampleRate only failure here is
-   not usually catastrophic.
-*/
-PaError setBestFramesPerBuffer( const AudioDeviceID device,
-                                const bool isOutput,
-                                UInt32 requestedFramesPerBuffer, 
-                                UInt32 *actualFramesPerBuffer );
-#endif /* PA_MAC_CORE_UTILITIES_H__*/
diff --git a/libs/portaudio/src/hostapi/dsound/pa_win_ds.c b/libs/portaudio/src/hostapi/dsound/pa_win_ds.c
deleted file mode 100644
index 3f0d3f9450..0000000000
--- a/libs/portaudio/src/hostapi/dsound/pa_win_ds.c
+++ /dev/null
@@ -1,2510 +0,0 @@
-/*
- * $Id: pa_win_ds.c 1286 2007-09-26 21:34:23Z rossb $
- * Portable Audio I/O Library DirectSound implementation
- *
- * Authors: Phil Burk, Robert Marsanyi & Ross Bencina
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2007 Ross Bencina, Phil Burk, Robert Marsanyi
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup hostaip_src
-
-    @todo implement paInputOverflow callback status flag
-    
-    @todo implement paNeverDropInput.
-
-    @todo implement host api specific extension to set i/o buffer sizes in frames
-
-    @todo implement initialisation of PaDeviceInfo default*Latency fields (currently set to 0.)
-
-    @todo implement ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable
-
-    @todo audit handling of DirectSound result codes - in many cases we could convert a HRESULT into
-        a native portaudio error code. Standard DirectSound result codes are documented at msdn.
-
-    @todo implement IsFormatSupported
-
-    @todo call PaUtil_SetLastHostErrorInfo with a specific error string (currently just "DSound error").
-
-    @todo make sure all buffers have been played before stopping the stream
-        when the stream callback returns paComplete
-
-    @todo retrieve default devices using the DRVM_MAPPER_PREFERRED_GET functions used in the wmme api
-        these wave device ids can be aligned with the directsound devices either by retrieving
-        the system interface device name using DRV_QUERYDEVICEINTERFACE or by using the wave device
-        id retrieved in KsPropertySetEnumerateCallback.
-
-    old TODOs from phil, need to work out if these have been done:
-        O- fix "patest_stop.c"
-*/
-
-
-#include <stdio.h>
-#include <string.h> /* strlen() */
-#include <windows.h>
-#include <objbase.h>
-
-/*
-  We are only using DX3 in here, no need to polute the namespace - davidv
-*/
-#define DIRECTSOUND_VERSION 0x0300
-#include <dsound.h>
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-#include <dsconf.h>
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_debugprint.h"
-
-#include "pa_win_ds.h"
-#include "pa_win_ds_dynlink.h"
-#include "pa_win_waveformat.h"
-#include "pa_win_wdmks_utils.h"
-
-
-#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
-#pragma comment( lib, "dsound.lib" )
-#pragma comment( lib, "winmm.lib" )
-#endif
-
-/*
- provided in newer platform sdks and x64
- */
-#ifndef DWORD_PTR
-#define DWORD_PTR DWORD
-#endif
-
-#define PRINT(x) PA_DEBUG(x);
-#define ERR_RPT(x) PRINT(x)
-#define DBUG(x)   PRINT(x)
-#define DBUGX(x)  PRINT(x)
-
-#define PA_USE_HIGH_LATENCY   (0)
-#if PA_USE_HIGH_LATENCY
-#define PA_WIN_9X_LATENCY     (500)
-#define PA_WIN_NT_LATENCY     (600)
-#else
-#define PA_WIN_9X_LATENCY     (140)
-#define PA_WIN_NT_LATENCY     (280)
-#endif
-
-#define PA_WIN_WDM_LATENCY       (120)
-
-#define SECONDS_PER_MSEC      (0.001)
-#define MSEC_PER_SECOND       (1000)
-
-/* prototypes for functions declared in this file */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-
-/* FIXME: should convert hr to a string */
-#define PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr ) \
-    PaUtil_SetLastHostErrorInfo( paDirectSound, hr, "DirectSound error" )
-
-/************************************************* DX Prototypes **********/
-static BOOL CALLBACK CollectGUIDsProc(LPGUID lpGUID,
-                                     LPCTSTR lpszDesc,
-                                     LPCTSTR lpszDrvName,
-                                     LPVOID lpContext );
-
-/************************************************************************************/
-/********************** Structures **************************************************/
-/************************************************************************************/
-/* PaWinDsHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct PaWinDsDeviceInfo
-{
-    PaDeviceInfo        inheritedDeviceInfo;
-    GUID                guid;
-    GUID                *lpGUID;
-    double              sampleRates[3];
-    char deviceInputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
-    char deviceOutputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
-} PaWinDsDeviceInfo;
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface    callbackStreamInterface;
-    PaUtilStreamInterface    blockingStreamInterface;
-
-    PaUtilAllocationGroup   *allocations;
-
-    /* implementation specific data goes here */
-
-    char                    comWasInitialized;
-
-} PaWinDsHostApiRepresentation;
-
-
-/* PaWinDsStream - a stream data structure specifically for this implementation */
-
-typedef struct PaWinDsStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-/* DirectSound specific data. */
-
-/* Output */
-    LPDIRECTSOUND        pDirectSound;
-    LPDIRECTSOUNDBUFFER  pDirectSoundOutputBuffer;
-    DWORD                outputBufferWriteOffsetBytes;     /* last write position */
-    INT                  outputBufferSizeBytes;
-    INT                  bytesPerOutputFrame;
-    /* Try to detect play buffer underflows. */
-    LARGE_INTEGER        perfCounterTicksPerBuffer; /* counter ticks it should take to play a full buffer */
-    LARGE_INTEGER        previousPlayTime;
-    UINT                 previousPlayCursor;
-    UINT                 outputUnderflowCount;
-    BOOL                 outputIsRunning;
-    /* use double which lets us can play for several thousand years with enough precision */
-    double               dsw_framesWritten;
-    double               framesPlayed;
-/* Input */
-    LPDIRECTSOUNDCAPTURE pDirectSoundCapture;
-    LPDIRECTSOUNDCAPTUREBUFFER   pDirectSoundInputBuffer;
-    INT                  bytesPerInputFrame;
-    UINT                 readOffset;      /* last read position */
-    UINT                 inputSize;
-
-    
-    MMRESULT         timerID;
-    int              framesPerDSBuffer;
-    double           framesWritten;
-    double           secondsPerHostByte; /* Used to optimize latency calculation for outTime */
-
-    PaStreamCallbackFlags callbackFlags;
-    
-/* FIXME - move all below to PaUtilStreamRepresentation */
-    volatile int     isStarted;
-    volatile int     isActive;
-    volatile int     stopProcessing; /* stop thread once existing buffers have been returned */
-    volatile int     abortProcessing; /* stop thread immediately */
-} PaWinDsStream;
-
-
-/************************************************************************************
-** Duplicate the input string using the allocations allocator.
-** A NULL string is converted to a zero length string.
-** If memory cannot be allocated, NULL is returned.
-**/
-static char *DuplicateDeviceNameString( PaUtilAllocationGroup *allocations, const char* src )
-{
-    char *result = 0;
-    
-    if( src != NULL )
-    {
-        size_t len = strlen(src);
-        result = (char*)PaUtil_GroupAllocateMemory( allocations, (long)(len + 1) );
-        if( result )
-            memcpy( (void *) result, src, len+1 );
-    }
-    else
-    {
-        result = (char*)PaUtil_GroupAllocateMemory( allocations, 1 );
-        if( result )
-            result[0] = '\0';
-    }
-
-    return result;
-}
-
-/************************************************************************************
-** DSDeviceNameAndGUID, DSDeviceNameAndGUIDVector used for collecting preliminary
-** information during device enumeration.
-*/
-typedef struct DSDeviceNameAndGUID{
-    char *name; // allocated from parent's allocations, never deleted by this structure
-    GUID guid;
-    LPGUID lpGUID;
-    void *pnpInterface;  // wchar_t* interface path, allocated using the DS host api's allocation group
-} DSDeviceNameAndGUID;
-
-typedef struct DSDeviceNameAndGUIDVector{
-    PaUtilAllocationGroup *allocations;
-    PaError enumerationError;
-
-    int count;
-    int free;
-    DSDeviceNameAndGUID *items; // Allocated using LocalAlloc()
-} DSDeviceNameAndGUIDVector;
-
-typedef struct DSDeviceNamesAndGUIDs{
-    PaWinDsHostApiRepresentation *winDsHostApi;
-    DSDeviceNameAndGUIDVector inputNamesAndGUIDs;
-    DSDeviceNameAndGUIDVector outputNamesAndGUIDs;
-} DSDeviceNamesAndGUIDs;
-
-static PaError InitializeDSDeviceNameAndGUIDVector(
-        DSDeviceNameAndGUIDVector *guidVector, PaUtilAllocationGroup *allocations )
-{
-    PaError result = paNoError;
-
-    guidVector->allocations = allocations;
-    guidVector->enumerationError = paNoError;
-
-    guidVector->count = 0;
-    guidVector->free = 8;
-    guidVector->items = (DSDeviceNameAndGUID*)LocalAlloc( LMEM_FIXED, sizeof(DSDeviceNameAndGUID) * guidVector->free );
-    if( guidVector->items == NULL )
-        result = paInsufficientMemory;
-    
-    return result;
-}
-
-static PaError ExpandDSDeviceNameAndGUIDVector( DSDeviceNameAndGUIDVector *guidVector )
-{
-    PaError result = paNoError;
-    DSDeviceNameAndGUID *newItems;
-    int i;
-    
-    /* double size of vector */
-    int size = guidVector->count + guidVector->free;
-    guidVector->free += size;
-
-    newItems = (DSDeviceNameAndGUID*)LocalAlloc( LMEM_FIXED, sizeof(DSDeviceNameAndGUID) * size * 2 );
-    if( newItems == NULL )
-    {
-        result = paInsufficientMemory;
-    }
-    else
-    {
-        for( i=0; i < guidVector->count; ++i )
-        {
-            newItems[i].name = guidVector->items[i].name;
-            if( guidVector->items[i].lpGUID == NULL )
-            {
-                newItems[i].lpGUID = NULL;
-            }
-            else
-            {
-                newItems[i].lpGUID = &newItems[i].guid;
-                memcpy( &newItems[i].guid, guidVector->items[i].lpGUID, sizeof(GUID) );;
-            }
-            newItems[i].pnpInterface = guidVector->items[i].pnpInterface;
-        }
-
-        LocalFree( guidVector->items );
-        guidVector->items = newItems;
-    }                                
-
-    return result;
-}
-
-/*
-    it's safe to call DSDeviceNameAndGUIDVector multiple times
-*/
-static PaError TerminateDSDeviceNameAndGUIDVector( DSDeviceNameAndGUIDVector *guidVector )
-{
-    PaError result = paNoError;
-
-    if( guidVector->items != NULL )
-    {
-        if( LocalFree( guidVector->items ) != NULL )
-            result = paInsufficientMemory;              /** @todo this isn't the correct error to return from a deallocation failure */
-
-        guidVector->items = NULL;
-    }
-
-    return result;
-}
-
-/************************************************************************************
-** Collect preliminary device information during DirectSound enumeration 
-*/
-static BOOL CALLBACK CollectGUIDsProc(LPGUID lpGUID,
-                                     LPCTSTR lpszDesc,
-                                     LPCTSTR lpszDrvName,
-                                     LPVOID lpContext )
-{
-    DSDeviceNameAndGUIDVector *namesAndGUIDs = (DSDeviceNameAndGUIDVector*)lpContext;
-    PaError error;
-
-    (void) lpszDrvName; /* unused variable */
-
-    if( namesAndGUIDs->free == 0 )
-    {
-        error = ExpandDSDeviceNameAndGUIDVector( namesAndGUIDs );
-        if( error != paNoError )
-        {
-            namesAndGUIDs->enumerationError = error;
-            return FALSE;
-        }
-    }
-    
-    /* Set GUID pointer, copy GUID to storage in DSDeviceNameAndGUIDVector. */
-    if( lpGUID == NULL )
-    {
-        namesAndGUIDs->items[namesAndGUIDs->count].lpGUID = NULL;
-    }
-    else
-    {
-        namesAndGUIDs->items[namesAndGUIDs->count].lpGUID =
-                &namesAndGUIDs->items[namesAndGUIDs->count].guid;
-      
-        memcpy( &namesAndGUIDs->items[namesAndGUIDs->count].guid, lpGUID, sizeof(GUID) );
-    }
-
-    namesAndGUIDs->items[namesAndGUIDs->count].name =
-            DuplicateDeviceNameString( namesAndGUIDs->allocations, lpszDesc );
-    if( namesAndGUIDs->items[namesAndGUIDs->count].name == NULL )
-    {
-        namesAndGUIDs->enumerationError = paInsufficientMemory;
-        return FALSE;
-    }
-
-    namesAndGUIDs->items[namesAndGUIDs->count].pnpInterface = 0;
-
-    ++namesAndGUIDs->count;
-    --namesAndGUIDs->free;
-    
-    return TRUE;
-}
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-
-static void *DuplicateWCharString( PaUtilAllocationGroup *allocations, wchar_t *source )
-{
-    size_t len;
-    wchar_t *result;
-
-    len = wcslen( source );
-    result = (wchar_t*)PaUtil_GroupAllocateMemory( allocations, (long) ((len+1) * sizeof(wchar_t)) );
-    wcscpy( result, source );
-    return result;
-}
-
-static BOOL CALLBACK KsPropertySetEnumerateCallback( PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data, LPVOID context )
-{
-    int i;
-    DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs = (DSDeviceNamesAndGUIDs*)context;
-
-    if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER )
-    {
-        for( i=0; i < deviceNamesAndGUIDs->outputNamesAndGUIDs.count; ++i )
-        {
-            if( deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID
-                && memcmp( &data->DeviceId, deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
-            {
-                deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].pnpInterface = 
-                        (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
-                break;
-            }
-        }
-    }
-    else if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE )
-    {
-        for( i=0; i < deviceNamesAndGUIDs->inputNamesAndGUIDs.count; ++i )
-        {
-            if( deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID
-                && memcmp( &data->DeviceId, deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
-            {
-                deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].pnpInterface = 
-                        (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
-                break;
-            }
-        }
-    }
-
-    return TRUE;
-}
-
-
-static GUID pawin_CLSID_DirectSoundPrivate = 
-{ 0x11ab3ec0, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x00, 0xc0, 0x4f, 0xc2, 0x8a, 0xca };
-
-static GUID pawin_DSPROPSETID_DirectSoundDevice = 
-{ 0x84624f82, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x00, 0xc0, 0x4f, 0xc2, 0x8a, 0xca };
-
-static GUID pawin_IID_IKsPropertySet = 
-{ 0x31efac30, 0x515c, 0x11d0, 0xa9, 0xaa, 0x00, 0xaa, 0x00, 0x61, 0xbe, 0x93 };
-
-
-/*
-    FindDevicePnpInterfaces fills in the pnpInterface fields in deviceNamesAndGUIDs
-    with UNICODE file paths to the devices. The DS documentation mentions
-    at least two techniques by which these Interface paths can be found using IKsPropertySet on
-    the DirectSound class object. One is using the DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION 
-    property, and the other is using DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE.
-    I tried both methods and only the second worked. I found two postings on the
-    net from people who had the same problem with the first method, so I think the method used here is 
-    more common/likely to work. The probem is that IKsPropertySet_Get returns S_OK
-    but the fields of the device description are not filled in.
-
-    The mechanism we use works by registering an enumeration callback which is called for 
-    every DSound device. Our callback searches for a device in our deviceNamesAndGUIDs list
-    with the matching GUID and copies the pointer to the Interface path.
-    Note that we could have used this enumeration callback to perform the original 
-    device enumeration, however we choose not to so we can disable this step easily.
-
-    Apparently the IKsPropertySet mechanism was added in DirectSound 9c 2004
-    http://www.tech-archive.net/Archive/Development/microsoft.public.win32.programmer.mmedia/2004-12/0099.html
-
-        -- rossb
-*/
-static void FindDevicePnpInterfaces( DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs )
-{
-    IClassFactory *pClassFactory;
-   
-    if( paWinDsDSoundEntryPoints.DllGetClassObject(&pawin_CLSID_DirectSoundPrivate, &IID_IClassFactory, (PVOID *) &pClassFactory) == S_OK ){
-        IKsPropertySet *pPropertySet;
-        if( pClassFactory->lpVtbl->CreateInstance( pClassFactory, NULL, &pawin_IID_IKsPropertySet, (PVOID *) &pPropertySet) == S_OK ){
-            
-            DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data;
-            ULONG bytesReturned;
-
-            data.Callback = KsPropertySetEnumerateCallback;
-            data.Context = deviceNamesAndGUIDs;
-
-            IKsPropertySet_Get( pPropertySet,
-                &pawin_DSPROPSETID_DirectSoundDevice,
-                DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W,
-                NULL,
-                0,
-                &data,
-                sizeof(data),
-                &bytesReturned
-            );
-            
-            IKsPropertySet_Release( pPropertySet );
-        }
-        pClassFactory->lpVtbl->Release( pClassFactory );
-    }
-
-    /*
-        The following code fragment, which I chose not to use, queries for the 
-        device interface for a device with a specific GUID:
-
-        ULONG BytesReturned;
-        DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA Property;
-
-        memset (&Property, 0, sizeof(Property));
-        Property.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
-        Property.DeviceId = *lpGUID;  
-
-        hr = IKsPropertySet_Get( pPropertySet,
-            &pawin_DSPROPSETID_DirectSoundDevice,
-            DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W,
-            NULL,
-            0,
-            &Property,
-            sizeof(Property),
-            &BytesReturned
-        );
-
-        if( hr == S_OK )
-        {
-            //pnpInterface = Property.Interface;
-        }
-    */
-}
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-
-/* 
-    GUIDs for emulated devices which we blacklist below.
-    are there more than two of them??
-*/
-
-GUID IID_IRolandVSCEmulated1 = {0xc2ad1800, 0xb243, 0x11ce, 0xa8, 0xa4, 0x00, 0xaa, 0x00, 0x6c, 0x45, 0x01};
-GUID IID_IRolandVSCEmulated2 = {0xc2ad1800, 0xb243, 0x11ce, 0xa8, 0xa4, 0x00, 0xaa, 0x00, 0x6c, 0x45, 0x02};
-
-
-#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_  (13) /* must match array length below */
-static double defaultSampleRateSearchOrder_[] =
-    { 44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0, 192000.0,
-        16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
-
-/************************************************************************************
-** Extract capabilities from an output device, and add it to the device info list
-** if successful. This function assumes that there is enough room in the
-** device info list to accomodate all entries.
-**
-** The device will not be added to the device list if any errors are encountered.
-*/
-static PaError AddOutputDeviceInfoFromDirectSound(
-        PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
-{
-    PaUtilHostApiRepresentation  *hostApi = &winDsHostApi->inheritedHostApiRep;
-    PaWinDsDeviceInfo            *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
-    PaDeviceInfo                 *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
-    HRESULT                       hr;
-    LPDIRECTSOUND                 lpDirectSound;
-    DSCAPS                        caps;
-    int                           deviceOK = TRUE;
-    PaError                       result = paNoError;
-    int                           i;
-
-    /* Copy GUID to the device info structure. Set pointer. */
-    if( lpGUID == NULL )
-    {
-        winDsDeviceInfo->lpGUID = NULL;
-    }
-    else
-    {
-        memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
-        winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
-    }
-    
-    if( lpGUID )
-    {
-        if (IsEqualGUID (&IID_IRolandVSCEmulated1,lpGUID) ||
-            IsEqualGUID (&IID_IRolandVSCEmulated2,lpGUID) )
-        {
-            PA_DEBUG(("BLACKLISTED: %s \n",name));
-            return paNoError;
-        }
-    }
-
-    /* Create a DirectSound object for the specified GUID
-        Note that using CoCreateInstance doesn't work on windows CE.
-    */
-    hr = paWinDsDSoundEntryPoints.DirectSoundCreate( lpGUID, &lpDirectSound, NULL );
-
-    /** try using CoCreateInstance because DirectSoundCreate was hanging under
-        some circumstances - note this was probably related to the
-        #define BOOL short bug which has now been fixed
-        @todo delete this comment and the following code once we've ensured
-        there is no bug.
-    */
-    /*
-    hr = CoCreateInstance( &CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER,
-            &IID_IDirectSound, (void**)&lpDirectSound );
-
-    if( hr == S_OK )
-    {
-        hr = IDirectSound_Initialize( lpDirectSound, lpGUID );
-    }
-    */
-    
-    if( hr != DS_OK )
-    {
-        if (hr == DSERR_ALLOCATED)
-            PA_DEBUG(("AddOutputDeviceInfoFromDirectSound %s DSERR_ALLOCATED\n",name));
-        DBUG(("Cannot create DirectSound for %s. Result = 0x%x\n", name, hr ));
-        if (lpGUID)
-            DBUG(("%s's GUID: {0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x,0x%x, 0x%x} \n",
-                 name,
-                 lpGUID->Data1,
-                 lpGUID->Data2,
-                 lpGUID->Data3,
-                 lpGUID->Data4[0],
-                 lpGUID->Data4[1],
-                 lpGUID->Data4[2],
-                 lpGUID->Data4[3],
-                 lpGUID->Data4[4],
-                 lpGUID->Data4[5],
-                 lpGUID->Data4[6],
-                 lpGUID->Data4[7]));
-
-        deviceOK = FALSE;
-    }
-    else
-    {
-        /* Query device characteristics. */
-        memset( &caps, 0, sizeof(caps) ); 
-        caps.dwSize = sizeof(caps);
-        hr = IDirectSound_GetCaps( lpDirectSound, &caps );
-        if( hr != DS_OK )
-        {
-            DBUG(("Cannot GetCaps() for DirectSound device %s. Result = 0x%x\n", name, hr ));
-            deviceOK = FALSE;
-        }
-        else
-        {
-
-#ifndef PA_NO_WMME
-            if( caps.dwFlags & DSCAPS_EMULDRIVER )
-            {
-                /* If WMME supported, then reject Emulated drivers because they are lousy. */
-                deviceOK = FALSE;
-            }
-#endif
-
-            if( deviceOK )
-            {
-                deviceInfo->maxInputChannels = 0;
-                winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
-
-                /* DS output capabilities only indicate supported number of channels
-                   using two flags which indicate mono and/or stereo.
-                   We assume that stereo devices may support more than 2 channels
-                   (as is the case with 5.1 devices for example) and so
-                   set deviceOutputChannelCountIsKnown to 0 (unknown).
-                   In this case OpenStream will try to open the device
-                   when the user requests more than 2 channels, rather than
-                   returning an error. 
-                */
-                if( caps.dwFlags & DSCAPS_PRIMARYSTEREO )
-                {
-                    deviceInfo->maxOutputChannels = 2;
-                    winDsDeviceInfo->deviceOutputChannelCountIsKnown = 0;
-                }
-                else
-                {
-                    deviceInfo->maxOutputChannels = 1;
-                    winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-                }
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-                if( pnpInterface )
-                {
-                    int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( pnpInterface, /* isInput= */ 0  );
-                    if( count > 0 )
-                    {
-                        deviceInfo->maxOutputChannels = count;
-                        winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-                    }
-                }
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-                deviceInfo->defaultLowInputLatency = 0.;    /** @todo IMPLEMENT ME */
-                deviceInfo->defaultLowOutputLatency = 0.;   /** @todo IMPLEMENT ME */
-                deviceInfo->defaultHighInputLatency = 0.;   /** @todo IMPLEMENT ME */
-                deviceInfo->defaultHighOutputLatency = 0.;  /** @todo IMPLEMENT ME */
-                
-                /* initialize defaultSampleRate */
-                
-                if( caps.dwFlags & DSCAPS_CONTINUOUSRATE )
-                {
-                    /* initialize to caps.dwMaxSecondarySampleRate incase none of the standard rates match */
-                    deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
-
-                    for( i = 0; i < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++i )
-                    {
-                        if( defaultSampleRateSearchOrder_[i] >= caps.dwMinSecondarySampleRate
-                                && defaultSampleRateSearchOrder_[i] <= caps.dwMaxSecondarySampleRate )
-                        {
-                            deviceInfo->defaultSampleRate = defaultSampleRateSearchOrder_[i];
-                            break;
-                        }
-                    }
-                }
-                else if( caps.dwMinSecondarySampleRate == caps.dwMaxSecondarySampleRate )
-                {
-                    if( caps.dwMinSecondarySampleRate == 0 )
-                    {
-                        /*
-                        ** On my Thinkpad 380Z, DirectSoundV6 returns min-max=0 !!
-                        ** But it supports continuous sampling.
-                        ** So fake range of rates, and hope it really supports it.
-                        */
-                        deviceInfo->defaultSampleRate = 44100.0f;
-
-                        DBUG(("PA - Reported rates both zero. Setting to fake values for device #%s\n", name ));
-                    }
-                    else
-                    {
-	                    deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
-                    }
-                }
-                else if( (caps.dwMinSecondarySampleRate < 1000.0) && (caps.dwMaxSecondarySampleRate > 50000.0) )
-                {
-                    /* The EWS88MT drivers lie, lie, lie. The say they only support two rates, 100 & 100000.
-                    ** But we know that they really support a range of rates!
-                    ** So when we see a ridiculous set of rates, assume it is a range.
-                    */
-                  deviceInfo->defaultSampleRate = 44100.0f;
-                  DBUG(("PA - Sample rate range used instead of two odd values for device #%s\n", name ));
-                }
-                else deviceInfo->defaultSampleRate = caps.dwMaxSecondarySampleRate;
-
-
-                //printf( "min %d max %d\n", caps.dwMinSecondarySampleRate, caps.dwMaxSecondarySampleRate );
-                // dwFlags | DSCAPS_CONTINUOUSRATE 
-            }
-        }
-
-        IDirectSound_Release( lpDirectSound );
-    }
-
-    if( deviceOK )
-    {
-        deviceInfo->name = name;
-
-        if( lpGUID == NULL )
-            hostApi->info.defaultOutputDevice = hostApi->info.deviceCount;
-            
-        hostApi->info.deviceCount++;
-    }
-
-    return result;
-}
-
-
-/************************************************************************************
-** Extract capabilities from an input device, and add it to the device info list
-** if successful. This function assumes that there is enough room in the
-** device info list to accomodate all entries.
-**
-** The device will not be added to the device list if any errors are encountered.
-*/
-static PaError AddInputDeviceInfoFromDirectSoundCapture(
-        PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
-{
-    PaUtilHostApiRepresentation  *hostApi = &winDsHostApi->inheritedHostApiRep;
-    PaWinDsDeviceInfo            *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
-    PaDeviceInfo                 *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
-    HRESULT                       hr;
-    LPDIRECTSOUNDCAPTURE          lpDirectSoundCapture;
-    DSCCAPS                       caps;
-    int                           deviceOK = TRUE;
-    PaError                       result = paNoError;
-    
-    /* Copy GUID to the device info structure. Set pointer. */
-    if( lpGUID == NULL )
-    {
-        winDsDeviceInfo->lpGUID = NULL;
-    }
-    else
-    {
-        winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
-        memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
-    }
-
-    hr = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( lpGUID, &lpDirectSoundCapture, NULL );
-
-    /** try using CoCreateInstance because DirectSoundCreate was hanging under
-        some circumstances - note this was probably related to the
-        #define BOOL short bug which has now been fixed
-        @todo delete this comment and the following code once we've ensured
-        there is no bug.
-    */
-    /*
-    hr = CoCreateInstance( &CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER,
-            &IID_IDirectSoundCapture, (void**)&lpDirectSoundCapture );
-    */
-    if( hr != DS_OK )
-    {
-        DBUG(("Cannot create Capture for %s. Result = 0x%x\n", name, hr ));
-        deviceOK = FALSE;
-    }
-    else
-    {
-        /* Query device characteristics. */
-        memset( &caps, 0, sizeof(caps) );
-        caps.dwSize = sizeof(caps);
-        hr = IDirectSoundCapture_GetCaps( lpDirectSoundCapture, &caps );
-        if( hr != DS_OK )
-        {
-            DBUG(("Cannot GetCaps() for Capture device %s. Result = 0x%x\n", name, hr ));
-            deviceOK = FALSE;
-        }
-        else
-        {
-#ifndef PA_NO_WMME
-            if( caps.dwFlags & DSCAPS_EMULDRIVER )
-            {
-                /* If WMME supported, then reject Emulated drivers because they are lousy. */
-                deviceOK = FALSE;
-            }
-#endif
-
-            if( deviceOK )
-            {
-                deviceInfo->maxInputChannels = caps.dwChannels;
-                winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
-
-                deviceInfo->maxOutputChannels = 0;
-                winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-                if( pnpInterface )
-                {
-                    int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( pnpInterface, /* isInput= */ 1  );
-                    if( count > 0 )
-                    {
-                        deviceInfo->maxInputChannels = count;
-                        winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
-                    }
-                }
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-                deviceInfo->defaultLowInputLatency = 0.;    /** @todo IMPLEMENT ME */
-                deviceInfo->defaultLowOutputLatency = 0.;   /** @todo IMPLEMENT ME */
-                deviceInfo->defaultHighInputLatency = 0.;   /** @todo IMPLEMENT ME */
-                deviceInfo->defaultHighOutputLatency = 0.;  /** @todo IMPLEMENT ME */
-
-/*  constants from a WINE patch by Francois Gouget, see:
-    http://www.winehq.com/hypermail/wine-patches/2003/01/0290.html
-
-    ---
-    Date: Fri, 14 May 2004 10:38:12 +0200 (CEST)
-    From: Francois Gouget <fgouget@ ... .fr>
-    To: Ross Bencina <rbencina@ ... .au>
-    Subject: Re: Permission to use wine 48/96 wave patch in BSD licensed library
-
-    [snip]
-
-    I give you permission to use the patch below under the BSD license.
-    http://www.winehq.com/hypermail/wine-patches/2003/01/0290.html
-
-    [snip]
-*/
-#ifndef WAVE_FORMAT_48M08
-#define WAVE_FORMAT_48M08      0x00001000    /* 48     kHz, Mono,   8-bit  */
-#define WAVE_FORMAT_48S08      0x00002000    /* 48     kHz, Stereo, 8-bit  */
-#define WAVE_FORMAT_48M16      0x00004000    /* 48     kHz, Mono,   16-bit */
-#define WAVE_FORMAT_48S16      0x00008000    /* 48     kHz, Stereo, 16-bit */
-#define WAVE_FORMAT_96M08      0x00010000    /* 96     kHz, Mono,   8-bit  */
-#define WAVE_FORMAT_96S08      0x00020000    /* 96     kHz, Stereo, 8-bit  */
-#define WAVE_FORMAT_96M16      0x00040000    /* 96     kHz, Mono,   16-bit */
-#define WAVE_FORMAT_96S16      0x00080000    /* 96     kHz, Stereo, 16-bit */
-#endif
-
-                /* defaultSampleRate */
-                if( caps.dwChannels == 2 )
-                {
-                    if( caps.dwFormats & WAVE_FORMAT_4S16 )
-                        deviceInfo->defaultSampleRate = 44100.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_48S16 )
-                        deviceInfo->defaultSampleRate = 48000.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_2S16 )
-                        deviceInfo->defaultSampleRate = 22050.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_1S16 )
-                        deviceInfo->defaultSampleRate = 11025.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_96S16 )
-                        deviceInfo->defaultSampleRate = 96000.0;
-                    else
-                        deviceInfo->defaultSampleRate = 0.;
-                }
-                else if( caps.dwChannels == 1 )
-                {
-                    if( caps.dwFormats & WAVE_FORMAT_4M16 )
-                        deviceInfo->defaultSampleRate = 44100.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_48M16 )
-                        deviceInfo->defaultSampleRate = 48000.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_2M16 )
-                        deviceInfo->defaultSampleRate = 22050.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_1M16 )
-                        deviceInfo->defaultSampleRate = 11025.0;
-                    else if( caps.dwFormats & WAVE_FORMAT_96M16 )
-                        deviceInfo->defaultSampleRate = 96000.0;
-                    else
-                        deviceInfo->defaultSampleRate = 0.;
-                }
-                else deviceInfo->defaultSampleRate = 0.;
-            }
-        }
-        
-        IDirectSoundCapture_Release( lpDirectSoundCapture );
-    }
-
-    if( deviceOK )
-    {
-        deviceInfo->name = name;
-
-        if( lpGUID == NULL )
-            hostApi->info.defaultInputDevice = hostApi->info.deviceCount;
-
-        hostApi->info.deviceCount++;
-    }
-
-    return result;
-}
-
-
-/***********************************************************************************/
-PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i, deviceCount;
-    PaWinDsHostApiRepresentation *winDsHostApi;
-    DSDeviceNamesAndGUIDs deviceNamesAndGUIDs;
-
-    PaWinDsDeviceInfo *deviceInfoArray;
-    char comWasInitialized = 0;
-
-    /*
-        If COM is already initialized CoInitialize will either return
-        FALSE, or RPC_E_CHANGED_MODE if it was initialised in a different
-        threading mode. In either case we shouldn't consider it an error
-        but we need to be careful to not call CoUninitialize() if 
-        RPC_E_CHANGED_MODE was returned.
-    */
-
-    HRESULT hr = CoInitialize(NULL);
-    if( FAILED(hr) && hr != RPC_E_CHANGED_MODE )
-        return paUnanticipatedHostError;
-
-    if( hr != RPC_E_CHANGED_MODE )
-        comWasInitialized = 1;
-
-    /* initialise guid vectors so they can be safely deleted on error */
-    deviceNamesAndGUIDs.winDsHostApi = NULL;
-    deviceNamesAndGUIDs.inputNamesAndGUIDs.items = NULL;
-    deviceNamesAndGUIDs.outputNamesAndGUIDs.items = NULL;
-
-    PaWinDs_InitializeDSoundEntryPoints();
-
-    winDsHostApi = (PaWinDsHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinDsHostApiRepresentation) );
-    if( !winDsHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    winDsHostApi->comWasInitialized = comWasInitialized;
-
-    winDsHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !winDsHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    *hostApi = &winDsHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paDirectSound;
-    (*hostApi)->info.name = "Windows DirectSound";
-    
-    (*hostApi)->info.deviceCount = 0;
-    (*hostApi)->info.defaultInputDevice = paNoDevice;
-    (*hostApi)->info.defaultOutputDevice = paNoDevice;
-
-    
-/* DSound - enumerate devices to count them and to gather their GUIDs */
-
-    result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs, winDsHostApi->allocations );
-    if( result != paNoError )
-        goto error;
-
-    result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs, winDsHostApi->allocations );
-    if( result != paNoError )
-        goto error;
-
-    paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.inputNamesAndGUIDs );
-
-    paWinDsDSoundEntryPoints.DirectSoundEnumerate( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.outputNamesAndGUIDs );
-
-    if( deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError != paNoError )
-    {
-        result = deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError;
-        goto error;
-    }
-
-    if( deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError != paNoError )
-    {
-        result = deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError;
-        goto error;
-    }
-
-    deviceCount = deviceNamesAndGUIDs.inputNamesAndGUIDs.count + deviceNamesAndGUIDs.outputNamesAndGUIDs.count;
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-    if( deviceCount > 0 )
-    {
-        deviceNamesAndGUIDs.winDsHostApi = winDsHostApi;
-        FindDevicePnpInterfaces( &deviceNamesAndGUIDs );
-    }
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-    if( deviceCount > 0 )
-    {
-        /* allocate array for pointers to PaDeviceInfo structs */
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                winDsHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount );
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all PaDeviceInfo structs in a contiguous block */
-        deviceInfoArray = (PaWinDsDeviceInfo*)PaUtil_GroupAllocateMemory(
-                winDsHostApi->allocations, sizeof(PaWinDsDeviceInfo) * deviceCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( i=0; i < deviceCount; ++i )
-        {
-            PaDeviceInfo *deviceInfo = &deviceInfoArray[i].inheritedDeviceInfo;
-            deviceInfo->structVersion = 2;
-            deviceInfo->hostApi = hostApiIndex;
-            deviceInfo->name = 0;
-            (*hostApi)->deviceInfos[i] = deviceInfo;
-        }
-
-        for( i=0; i < deviceNamesAndGUIDs.inputNamesAndGUIDs.count; ++i )
-        {
-            result = AddInputDeviceInfoFromDirectSoundCapture( winDsHostApi,
-                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].name,
-                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].lpGUID,
-                    deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].pnpInterface );
-            if( result != paNoError )
-                goto error;
-        }
-
-        for( i=0; i < deviceNamesAndGUIDs.outputNamesAndGUIDs.count; ++i )
-        {
-            result = AddOutputDeviceInfoFromDirectSound( winDsHostApi,
-                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].name,
-                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].lpGUID,
-                    deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].pnpInterface );
-            if( result != paNoError )
-                goto error;
-        }
-    }    
-
-    result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
-    if( result != paNoError )
-        goto error;
-
-    result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
-    if( result != paNoError )
-        goto error;
-
-    
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &winDsHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &winDsHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    return result;
-
-error:
-    if( winDsHostApi )
-    {
-        if( winDsHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( winDsHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( winDsHostApi->allocations );
-        }
-                
-        PaUtil_FreeMemory( winDsHostApi );
-    }
-
-    TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
-    TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
-
-    if( comWasInitialized )
-        CoUninitialize();
-
-    return result;
-}
-
-
-/***********************************************************************************/
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
-    char comWasInitialized = winDsHostApi->comWasInitialized;
-
-    /*
-        IMPLEMENT ME:
-            - clean up any resources not handled by the allocation group
-    */
-
-    if( winDsHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( winDsHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( winDsHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( winDsHostApi );
-
-    PaWinDs_TerminateDSoundEntryPoints();
-
-    if( comWasInitialized )
-        CoUninitialize();
-}
-
-
-/* Set minimal latency based on whether NT or Win95.
- * NT has higher latency.
- */
-static int PaWinDS_GetMinSystemLatency( void )
-{
-    int minLatencyMsec;
-    /* Set minimal latency based on whether NT or other OS.
-     * NT has higher latency.
-     */
-    OSVERSIONINFO osvi;
-	osvi.dwOSVersionInfoSize = sizeof( osvi );
-	GetVersionEx( &osvi );
-    DBUG(("PA - PlatformId = 0x%x\n", osvi.dwPlatformId ));
-    DBUG(("PA - MajorVersion = 0x%x\n", osvi.dwMajorVersion ));
-    DBUG(("PA - MinorVersion = 0x%x\n", osvi.dwMinorVersion ));
-    /* Check for NT */
-	if( (osvi.dwMajorVersion == 4) && (osvi.dwPlatformId == 2) )
-	{
-		minLatencyMsec = PA_WIN_NT_LATENCY;
-	}
-	else if(osvi.dwMajorVersion >= 5)
-	{
-		minLatencyMsec = PA_WIN_WDM_LATENCY;
-	}
-	else
-	{
-		minLatencyMsec = PA_WIN_9X_LATENCY;
-	}
-    return minLatencyMsec;
-}
-
-static PaError ValidateWinDirectSoundSpecificStreamInfo(
-        const PaStreamParameters *streamParameters,
-        const PaWinDirectSoundStreamInfo *streamInfo )
-{
-	if( streamInfo )
-	{
-	    if( streamInfo->size != sizeof( PaWinDirectSoundStreamInfo )
-	            || streamInfo->version != 1 )
-	    {
-	        return paIncompatibleHostApiSpecificStreamInfo;
-	    }
-	}
-
-	return paNoError;
-}
-
-/***********************************************************************************/
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaError result;
-    PaWinDsDeviceInfo *inputWinDsDeviceInfo, *outputWinDsDeviceInfo;
-    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaWinDirectSoundStreamInfo *inputStreamInfo, *outputStreamInfo;
-
-    if( inputParameters )
-    {
-        inputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ inputParameters->device ];
-        inputDeviceInfo = &inputWinDsDeviceInfo->inheritedDeviceInfo;
-
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputWinDsDeviceInfo->deviceInputChannelCountIsKnown
-                && inputChannelCount > inputDeviceInfo->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        inputStreamInfo = (PaWinDirectSoundStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinDirectSoundSpecificStreamInfo( inputParameters, inputStreamInfo );
-		if( result != paNoError ) return result;
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ outputParameters->device ];
-        outputDeviceInfo = &outputWinDsDeviceInfo->inheritedDeviceInfo;
-
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputWinDsDeviceInfo->deviceOutputChannelCountIsKnown
-                && outputChannelCount > outputDeviceInfo->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        outputStreamInfo = (PaWinDirectSoundStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinDirectSoundSpecificStreamInfo( outputParameters, outputStreamInfo );
-		if( result != paNoError ) return result;
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-    
-    /*
-        IMPLEMENT ME:
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported if necessary
-
-            - check that the device supports sampleRate
-
-        Because the buffer adapter handles conversion between all standard
-        sample formats, the following checks are only required if paCustomFormat
-        is implemented, or under some other unusual conditions.
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-    */
-
-    return paFormatIsSupported;
-}
-
-
-/*************************************************************************
-** Determine minimum number of buffers required for this host based
-** on minimum latency. Latency can be optionally set by user by setting
-** an environment variable. For example, to set latency to 200 msec, put:
-**
-**    set PA_MIN_LATENCY_MSEC=200
-**
-** in the AUTOEXEC.BAT file and reboot.
-** If the environment variable is not set, then the latency will be determined
-** based on the OS. Windows NT has higher latency than Win95.
-*/
-#define PA_LATENCY_ENV_NAME  ("PA_MIN_LATENCY_MSEC")
-#define PA_ENV_BUF_SIZE  (32)
-
-static int PaWinDs_GetMinLatencyFrames( double sampleRate )
-{
-    char      envbuf[PA_ENV_BUF_SIZE];
-    DWORD     hresult;
-    int       minLatencyMsec = 0;
-
-    /* Let user determine minimal latency by setting environment variable. */
-    hresult = GetEnvironmentVariable( PA_LATENCY_ENV_NAME, envbuf, PA_ENV_BUF_SIZE );
-    if( (hresult > 0) && (hresult < PA_ENV_BUF_SIZE) )
-    {
-        minLatencyMsec = atoi( envbuf );
-    }
-    else
-    {
-        minLatencyMsec = PaWinDS_GetMinSystemLatency();
-#if PA_USE_HIGH_LATENCY
-        PRINT(("PA - Minimum Latency set to %d msec!\n", minLatencyMsec ));
-#endif
-
-    }
-
-    return (int) (minLatencyMsec * sampleRate * SECONDS_PER_MSEC);
-}
-
-
-static HRESULT InitInputBuffer( PaWinDsStream *stream, PaSampleFormat sampleFormat, unsigned long nFrameRate, WORD nChannels, int bytesPerBuffer, PaWinWaveFormatChannelMask channelMask )
-{
-    DSCBUFFERDESC  captureDesc;
-    PaWinWaveFormat waveFormat;
-    HRESULT        result;
-    
-    stream->bytesPerInputFrame = nChannels * Pa_GetSampleSize(sampleFormat);
-
-    stream->inputSize = bytesPerBuffer;
-    // ----------------------------------------------------------------------
-    // Setup the secondary buffer description
-    ZeroMemory(&captureDesc, sizeof(DSCBUFFERDESC));
-    captureDesc.dwSize = sizeof(DSCBUFFERDESC);
-    captureDesc.dwFlags =  0;
-    captureDesc.dwBufferBytes = bytesPerBuffer;
-    captureDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat;
-    
-    // Create the capture buffer
-
-    // first try WAVEFORMATEXTENSIBLE. if this fails, fall back to WAVEFORMATEX
-    PaWin_InitializeWaveFormatExtensible( &waveFormat, nChannels, 
-                sampleFormat, nFrameRate, channelMask );
-
-    if( IDirectSoundCapture_CreateCaptureBuffer( stream->pDirectSoundCapture,
-                  &captureDesc, &stream->pDirectSoundInputBuffer, NULL) != DS_OK )
-    {
-        PaWin_InitializeWaveFormatEx( &waveFormat, nChannels, sampleFormat, nFrameRate );
-
-        if ((result = IDirectSoundCapture_CreateCaptureBuffer( stream->pDirectSoundCapture,
-                    &captureDesc, &stream->pDirectSoundInputBuffer, NULL)) != DS_OK) return result;
-    }
-
-    stream->readOffset = 0;  // reset last read position to start of buffer
-    return DS_OK;
-}
-
-
-static HRESULT InitOutputBuffer( PaWinDsStream *stream, PaSampleFormat sampleFormat, unsigned long nFrameRate, WORD nChannels, int bytesPerBuffer, PaWinWaveFormatChannelMask channelMask )
-{
-    /** @todo FIXME: if InitOutputBuffer returns an error I'm not sure it frees all resources cleanly */
-
-    DWORD          dwDataLen;
-    DWORD          playCursor;
-    HRESULT        result;
-    LPDIRECTSOUNDBUFFER pPrimaryBuffer;
-    HWND           hWnd;
-    HRESULT        hr;
-    PaWinWaveFormat waveFormat;
-    DSBUFFERDESC   primaryDesc;
-    DSBUFFERDESC   secondaryDesc;
-    unsigned char* pDSBuffData;
-    LARGE_INTEGER  counterFrequency;
-    int bytesPerSample = Pa_GetSampleSize(sampleFormat);
-
-    stream->outputBufferSizeBytes = bytesPerBuffer;
-    stream->outputIsRunning = FALSE;
-    stream->outputUnderflowCount = 0;
-    stream->dsw_framesWritten = 0;
-    stream->bytesPerOutputFrame = nChannels * bytesPerSample;
-
-    // We were using getForegroundWindow() but sometimes the ForegroundWindow may not be the
-    // applications's window. Also if that window is closed before the Buffer is closed
-    // then DirectSound can crash. (Thanks for Scott Patterson for reporting this.)
-    // So we will use GetDesktopWindow() which was suggested by Miller Puckette.
-    // hWnd = GetForegroundWindow();
-    //
-    //  FIXME: The example code I have on the net creates a hidden window that
-    //      is managed by our code - I think we should do that - one hidden
-    //      window for the whole of Pa_DS
-    //
-    hWnd = GetDesktopWindow();
-
-    // Set cooperative level to DSSCL_EXCLUSIVE so that we can get 16 bit output, 44.1 KHz.
-    // Exclusize also prevents unexpected sounds from other apps during a performance.
-    if ((hr = IDirectSound_SetCooperativeLevel( stream->pDirectSound,
-              hWnd, DSSCL_EXCLUSIVE)) != DS_OK)
-    {
-        return hr;
-    }
-
-    // -----------------------------------------------------------------------
-    // Create primary buffer and set format just so we can specify our custom format.
-    // Otherwise we would be stuck with the default which might be 8 bit or 22050 Hz.
-    // Setup the primary buffer description
-    ZeroMemory(&primaryDesc, sizeof(DSBUFFERDESC));
-    primaryDesc.dwSize        = sizeof(DSBUFFERDESC);
-    primaryDesc.dwFlags       = DSBCAPS_PRIMARYBUFFER; // all panning, mixing, etc done by synth
-    primaryDesc.dwBufferBytes = 0;
-    primaryDesc.lpwfxFormat   = NULL;
-    // Create the buffer
-    if ((result = IDirectSound_CreateSoundBuffer( stream->pDirectSound,
-                  &primaryDesc, &pPrimaryBuffer, NULL)) != DS_OK) return result;
-
-    // Set the primary buffer's format
-
-    // first try WAVEFORMATEXTENSIBLE. if this fails, fall back to WAVEFORMATEX
-    PaWin_InitializeWaveFormatExtensible( &waveFormat, nChannels, 
-                sampleFormat, nFrameRate, channelMask );
-
-    if( IDirectSoundBuffer_SetFormat( pPrimaryBuffer, (WAVEFORMATEX*)&waveFormat) != DS_OK )
-    {
-        PaWin_InitializeWaveFormatEx( &waveFormat, nChannels, sampleFormat, nFrameRate );
-
-        if((result = IDirectSoundBuffer_SetFormat( pPrimaryBuffer, (WAVEFORMATEX*)&waveFormat)) != DS_OK) return result;
-    }
-
-    // ----------------------------------------------------------------------
-    // Setup the secondary buffer description
-    ZeroMemory(&secondaryDesc, sizeof(DSBUFFERDESC));
-    secondaryDesc.dwSize = sizeof(DSBUFFERDESC);
-    secondaryDesc.dwFlags =  DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
-    secondaryDesc.dwBufferBytes = bytesPerBuffer;
-    secondaryDesc.lpwfxFormat = (WAVEFORMATEX*)&waveFormat;
-    // Create the secondary buffer
-    if ((result = IDirectSound_CreateSoundBuffer( stream->pDirectSound,
-                  &secondaryDesc, &stream->pDirectSoundOutputBuffer, NULL)) != DS_OK) return result;
-    // Lock the DS buffer
-    if ((result = IDirectSoundBuffer_Lock( stream->pDirectSoundOutputBuffer, 0, stream->outputBufferSizeBytes, (LPVOID*)&pDSBuffData,
-                                           &dwDataLen, NULL, 0, 0)) != DS_OK) return result;
-    // Zero the DS buffer
-    ZeroMemory(pDSBuffData, dwDataLen);
-    // Unlock the DS buffer
-    if ((result = IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, pDSBuffData, dwDataLen, NULL, 0)) != DS_OK) return result;
-    if( QueryPerformanceFrequency( &counterFrequency ) )
-    {
-        int framesInBuffer = bytesPerBuffer / (nChannels * bytesPerSample);
-        stream->perfCounterTicksPerBuffer.QuadPart = (counterFrequency.QuadPart * framesInBuffer) / nFrameRate;
-    }
-    else
-    {
-        stream->perfCounterTicksPerBuffer.QuadPart = 0;
-    }
-    // Let DSound set the starting write position because if we set it to zero, it looks like the
-    // buffer is full to begin with. This causes a long pause before sound starts when using large buffers.
-    hr = IDirectSoundBuffer_GetCurrentPosition( stream->pDirectSoundOutputBuffer,
-            &playCursor, &stream->outputBufferWriteOffsetBytes );
-    if( hr != DS_OK )
-    {
-        return hr;
-    }
-    stream->dsw_framesWritten = stream->outputBufferWriteOffsetBytes / stream->bytesPerOutputFrame;
-    /* printf("DSW_InitOutputBuffer: playCursor = %d, writeCursor = %d\n", playCursor, dsw->dsw_WriteOffset ); */
-    return DS_OK;
-}
-
-/***********************************************************************************/
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
-    PaWinDsStream *stream = 0;
-    PaWinDsDeviceInfo *inputWinDsDeviceInfo, *outputWinDsDeviceInfo;
-    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-    unsigned long suggestedInputLatencyFrames, suggestedOutputLatencyFrames;
-    PaWinDirectSoundStreamInfo *inputStreamInfo, *outputStreamInfo;
-    PaWinWaveFormatChannelMask inputChannelMask, outputChannelMask;
-
-    if( inputParameters )
-    {
-        inputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ inputParameters->device ];
-        inputDeviceInfo = &inputWinDsDeviceInfo->inheritedDeviceInfo;
-
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-        suggestedInputLatencyFrames = (unsigned long)(inputParameters->suggestedLatency * sampleRate);
-
-        /* IDEA: the following 3 checks could be performed by default by pa_front
-            unless some flag indicated otherwise */
-            
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputWinDsDeviceInfo->deviceInputChannelCountIsKnown
-                && inputChannelCount > inputDeviceInfo->maxInputChannels )
-            return paInvalidChannelCount;
-            
-        /* validate hostApiSpecificStreamInfo */
-        inputStreamInfo = (PaWinDirectSoundStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinDirectSoundSpecificStreamInfo( inputParameters, inputStreamInfo );
-		if( result != paNoError ) return result;
-
-        if( inputStreamInfo && inputStreamInfo->flags & paWinDirectSoundUseChannelMask )
-            inputChannelMask = inputStreamInfo->channelMask;
-        else
-            inputChannelMask = PaWin_DefaultChannelMask( inputChannelCount );
-    }
-    else
-    {
-        inputChannelCount = 0;
-		inputSampleFormat = 0;
-        suggestedInputLatencyFrames = 0;
-    }
-
-
-    if( outputParameters )
-    {
-        outputWinDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[ outputParameters->device ];
-        outputDeviceInfo = &outputWinDsDeviceInfo->inheritedDeviceInfo;
-
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        suggestedOutputLatencyFrames = (unsigned long)(outputParameters->suggestedLatency * sampleRate);
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support outputChannelCount */
-        if( outputWinDsDeviceInfo->deviceOutputChannelCountIsKnown
-                && outputChannelCount > outputDeviceInfo->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate hostApiSpecificStreamInfo */
-        outputStreamInfo = (PaWinDirectSoundStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinDirectSoundSpecificStreamInfo( outputParameters, outputStreamInfo );
-		if( result != paNoError ) return result;   
-
-        if( outputStreamInfo && outputStreamInfo->flags & paWinDirectSoundUseChannelMask )
-            outputChannelMask = outputStreamInfo->channelMask;
-        else
-            outputChannelMask = PaWin_DefaultChannelMask( outputChannelCount );
-    }
-    else
-    {
-        outputChannelCount = 0;
-		outputSampleFormat = 0;
-        suggestedOutputLatencyFrames = 0;
-    }
-
-
-    /*
-        IMPLEMENT ME:
-
-        ( the following two checks are taken care of by PaUtil_InitializeBufferProcessor() )
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-            - check that the device supports sampleRate
-
-            - alter sampleRate to a close allowable rate if possible / necessary
-
-            - validate suggestedInputLatency and suggestedOutputLatency parameters,
-                use default values where necessary
-    */
-
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-
-    stream = (PaWinDsStream*)PaUtil_AllocateMemory( sizeof(PaWinDsStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    memset( stream, 0, sizeof(PaWinDsStream) ); /* initialize all stream variables to 0 */
-
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &winDsHostApi->callbackStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &winDsHostApi->blockingStreamInterface, streamCallback, userData );
-    }
-    
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-
-    if( inputParameters )
-    {
-        /* IMPLEMENT ME - establish which  host formats are available */
-        PaSampleFormat nativeInputFormats = paInt16;
-        //PaSampleFormat nativeFormats = paUInt8 | paInt16 | paInt24 | paInt32 | paFloat32;
-
-        hostInputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( nativeInputFormats, inputParameters->sampleFormat );
-    }
-	else
-	{
-		hostInputSampleFormat = 0;
-	}
-
-    if( outputParameters )
-    {
-        /* IMPLEMENT ME - establish which  host formats are available */
-        PaSampleFormat nativeOutputFormats = paInt16;
-        //PaSampleFormat nativeOutputFormats = paUInt8 | paInt16 | paInt24 | paInt32 | paFloat32;
-
-        hostOutputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( nativeOutputFormats, outputParameters->sampleFormat );
-    }
-    else
-	{
-		hostOutputSampleFormat = 0;
-	}
-
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                    inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-                    outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-                    sampleRate, streamFlags, framesPerBuffer,
-                    framesPerBuffer, /* ignored in paUtilVariableHostBufferSizePartialUsageAllowed mode. */
-                /* This next mode is required because DS can split the host buffer when it wraps around. */
-                    paUtilVariableHostBufferSizePartialUsageAllowed,
-                    streamCallback, userData );
-    if( result != paNoError )
-        goto error;
-
-
-    stream->streamRepresentation.streamInfo.inputLatency =
-            PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor);   /* FIXME: not initialised anywhere else */
-    stream->streamRepresentation.streamInfo.outputLatency =
-            PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor);    /* FIXME: not initialised anywhere else */
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-    
-/* DirectSound specific initialization */ 
-    {
-        HRESULT          hr;
-        int              bytesPerDirectSoundBuffer;
-        int              userLatencyFrames;
-        int              minLatencyFrames;
-
-        stream->timerID = 0;
-
-    /* Get system minimum latency. */
-        minLatencyFrames = PaWinDs_GetMinLatencyFrames( sampleRate );
-
-    /* Let user override latency by passing latency parameter. */
-        userLatencyFrames = (suggestedInputLatencyFrames > suggestedOutputLatencyFrames)
-                    ? suggestedInputLatencyFrames
-                    : suggestedOutputLatencyFrames;
-        if( userLatencyFrames > 0 ) minLatencyFrames = userLatencyFrames;
-
-    /* Calculate stream->framesPerDSBuffer depending on framesPerBuffer */
-        if( framesPerBuffer == paFramesPerBufferUnspecified )
-        {
-        /* App support variable framesPerBuffer */
-            stream->framesPerDSBuffer = minLatencyFrames;
-
-            stream->streamRepresentation.streamInfo.outputLatency = (double)(minLatencyFrames - 1) / sampleRate;
-        }
-        else
-        {
-        /* Round up to number of buffers needed to guarantee that latency. */
-            int numUserBuffers = (minLatencyFrames + framesPerBuffer - 1) / framesPerBuffer;
-            if( numUserBuffers < 1 ) numUserBuffers = 1;
-            numUserBuffers += 1; /* So we have latency worth of buffers ahead of current buffer. */
-            stream->framesPerDSBuffer = framesPerBuffer * numUserBuffers;
-
-            stream->streamRepresentation.streamInfo.outputLatency = (double)(framesPerBuffer * (numUserBuffers-1)) / sampleRate;
-        }
-
-        {
-            /** @todo REVIEW: this calculation seems incorrect to me - rossb. */
-            int msecLatency = (int) ((stream->framesPerDSBuffer * MSEC_PER_SECOND) / sampleRate);
-            PRINT(("PortAudio on DirectSound - Latency = %d frames, %d msec\n", stream->framesPerDSBuffer, msecLatency ));
-        }
-
-
-        /* ------------------ OUTPUT */
-        if( outputParameters )
-        {
-            /*
-            PaDeviceInfo *deviceInfo = hostApi->deviceInfos[ outputParameters->device ];
-            DBUG(("PaHost_OpenStream: deviceID = 0x%x\n", outputParameters->device));
-            */
-            
-            int bytesPerSample = Pa_GetSampleSize(hostOutputSampleFormat);
-            bytesPerDirectSoundBuffer = stream->framesPerDSBuffer * outputParameters->channelCount * bytesPerSample;
-            if( bytesPerDirectSoundBuffer < DSBSIZE_MIN )
-            {
-                result = paBufferTooSmall;
-                goto error;
-            }
-            else if( bytesPerDirectSoundBuffer > DSBSIZE_MAX )
-            {
-                result = paBufferTooBig;
-                goto error;
-            }
-
-            hr = paWinDsDSoundEntryPoints.DirectSoundCreate( 
-                ((PaWinDsDeviceInfo*)hostApi->deviceInfos[outputParameters->device])->lpGUID,
-                &stream->pDirectSound, NULL );
-
-            if( hr != DS_OK )
-            {
-                ERR_RPT(("PortAudio: DirectSoundCreate() failed!\n"));
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-                goto error;
-            }
-            hr = InitOutputBuffer( stream,
-                                       hostOutputSampleFormat,
-                                       (unsigned long) (sampleRate + 0.5),
-                                       (WORD)outputParameters->channelCount, bytesPerDirectSoundBuffer,
-                                       outputChannelMask );
-            DBUG(("InitOutputBuffer() returns %x\n", hr));
-            if( hr != DS_OK )
-            {
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-                goto error;
-            }
-            /* Calculate value used in latency calculation to avoid real-time divides. */
-            stream->secondsPerHostByte = 1.0 /
-                (stream->bufferProcessor.bytesPerHostOutputSample *
-                outputChannelCount * sampleRate);
-        }
-
-        /* ------------------ INPUT */
-        if( inputParameters )
-        {
-            /*
-            PaDeviceInfo *deviceInfo = hostApi->deviceInfos[ inputParameters->device ];
-            DBUG(("PaHost_OpenStream: deviceID = 0x%x\n", inputParameters->device));
-            */
-            
-            int bytesPerSample = Pa_GetSampleSize(hostInputSampleFormat);
-            bytesPerDirectSoundBuffer = stream->framesPerDSBuffer * inputParameters->channelCount * bytesPerSample;
-            if( bytesPerDirectSoundBuffer < DSBSIZE_MIN )
-            {
-                result = paBufferTooSmall;
-                goto error;
-            }
-            else if( bytesPerDirectSoundBuffer > DSBSIZE_MAX )
-            {
-                result = paBufferTooBig;
-                goto error;
-            }
-
-            hr = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( 
-                    ((PaWinDsDeviceInfo*)hostApi->deviceInfos[inputParameters->device])->lpGUID,
-                    &stream->pDirectSoundCapture, NULL );
-            if( hr != DS_OK )
-            {
-                ERR_RPT(("PortAudio: DirectSoundCaptureCreate() failed!\n"));
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-                goto error;
-            }
-            hr = InitInputBuffer( stream,
-                                      hostInputSampleFormat,
-                                      (unsigned long) (sampleRate + 0.5),
-                                      (WORD)inputParameters->channelCount, bytesPerDirectSoundBuffer,
-                                      inputChannelMask );
-            DBUG(("InitInputBuffer() returns %x\n", hr));
-            if( hr != DS_OK )
-            {
-                ERR_RPT(("PortAudio: DSW_InitInputBuffer() returns %x\n", hr));
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-                goto error;
-            }
-        }
-
-    }
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    if( stream )
-        PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-
-/************************************************************************************
- * Determine how much space can be safely written to in DS buffer.
- * Detect underflows and overflows.
- * Does not allow writing into safety gap maintained by DirectSound.
- */
-static HRESULT QueryOutputSpace( PaWinDsStream *stream, long *bytesEmpty )
-{
-    HRESULT hr;
-    DWORD   playCursor;
-    DWORD   writeCursor;
-    long    numBytesEmpty;
-    long    playWriteGap;
-    // Query to see how much room is in buffer.
-    hr = IDirectSoundBuffer_GetCurrentPosition( stream->pDirectSoundOutputBuffer,
-            &playCursor, &writeCursor );
-    if( hr != DS_OK )
-    {
-        return hr;
-    }
-    // Determine size of gap between playIndex and WriteIndex that we cannot write into.
-    playWriteGap = writeCursor - playCursor;
-    if( playWriteGap < 0 ) playWriteGap += stream->outputBufferSizeBytes; // unwrap
-    /* DirectSound doesn't have a large enough playCursor so we cannot detect wrap-around. */
-    /* Attempt to detect playCursor wrap-around and correct it. */
-    if( stream->outputIsRunning && (stream->perfCounterTicksPerBuffer.QuadPart != 0) )
-    {
-        /* How much time has elapsed since last check. */
-        LARGE_INTEGER   currentTime;
-        LARGE_INTEGER   elapsedTime;
-        long            bytesPlayed;
-        long            bytesExpected;
-        long            buffersWrapped;
-        QueryPerformanceCounter( &currentTime );
-        elapsedTime.QuadPart = currentTime.QuadPart - stream->previousPlayTime.QuadPart;
-        stream->previousPlayTime = currentTime;
-        /* How many bytes does DirectSound say have been played. */
-        bytesPlayed = playCursor - stream->previousPlayCursor;
-        if( bytesPlayed < 0 ) bytesPlayed += stream->outputBufferSizeBytes; // unwrap
-        stream->previousPlayCursor = playCursor;
-        /* Calculate how many bytes we would have expected to been played by now. */
-        bytesExpected = (long) ((elapsedTime.QuadPart * stream->outputBufferSizeBytes) / stream->perfCounterTicksPerBuffer.QuadPart);
-        buffersWrapped = (bytesExpected - bytesPlayed) / stream->outputBufferSizeBytes;
-        if( buffersWrapped > 0 )
-        {
-            playCursor += (buffersWrapped * stream->outputBufferSizeBytes);
-            bytesPlayed += (buffersWrapped * stream->outputBufferSizeBytes);
-        }
-        /* Maintain frame output cursor. */
-        stream->framesPlayed += (bytesPlayed / stream->bytesPerOutputFrame);
-    }
-    numBytesEmpty = playCursor - stream->outputBufferWriteOffsetBytes;
-    if( numBytesEmpty < 0 ) numBytesEmpty += stream->outputBufferSizeBytes; // unwrap offset
-    /* Have we underflowed? */
-    if( numBytesEmpty > (stream->outputBufferSizeBytes - playWriteGap) )
-    {
-        if( stream->outputIsRunning )
-        {
-            stream->outputUnderflowCount += 1;
-        }
-        stream->outputBufferWriteOffsetBytes = writeCursor;
-        numBytesEmpty = stream->outputBufferSizeBytes - playWriteGap;
-    }
-    *bytesEmpty = numBytesEmpty;
-    return hr;
-}
-
-/***********************************************************************************/
-static PaError Pa_TimeSlice( PaWinDsStream *stream )
-{
-    PaError           result = 0;   /* FIXME: this should be declared int and this function should also return that type (same as stream callback return type)*/
-    long              numFrames = 0;
-    long              bytesEmpty = 0;
-    long              bytesFilled = 0;
-    long              bytesToXfer = 0;
-    long              framesToXfer = 0;
-    long              numInFramesReady = 0;
-    long              numOutFramesReady = 0;
-    long              bytesProcessed;
-    HRESULT           hresult;
-    double            outputLatency = 0;
-    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement inputBufferAdcTime */
-    
-/* Input */
-    LPBYTE            lpInBuf1 = NULL;
-    LPBYTE            lpInBuf2 = NULL;
-    DWORD             dwInSize1 = 0;
-    DWORD             dwInSize2 = 0;
-/* Output */
-    LPBYTE            lpOutBuf1 = NULL;
-    LPBYTE            lpOutBuf2 = NULL;
-    DWORD             dwOutSize1 = 0;
-    DWORD             dwOutSize2 = 0;
-
-    /* How much input data is available? */
-    if( stream->bufferProcessor.inputChannelCount > 0 )
-    {
-        HRESULT hr;
-        DWORD capturePos;
-        DWORD readPos;
-        long  filled = 0;
-        // Query to see how much data is in buffer.
-        // We don't need the capture position but sometimes DirectSound doesn't handle NULLS correctly
-        // so let's pass a pointer just to be safe.
-        hr = IDirectSoundCaptureBuffer_GetCurrentPosition( stream->pDirectSoundInputBuffer, &capturePos, &readPos );
-        if( hr == DS_OK )
-        {
-            filled = readPos - stream->readOffset;
-            if( filled < 0 ) filled += stream->inputSize; // unwrap offset
-            bytesFilled = filled;
-        }
-            // FIXME: what happens if IDirectSoundCaptureBuffer_GetCurrentPosition fails?
-
-        framesToXfer = numInFramesReady = bytesFilled / stream->bytesPerInputFrame;
-        outputLatency = ((double)bytesFilled) * stream->secondsPerHostByte;
-
-        /** @todo Check for overflow */
-    }
-
-    /* How much output room is available? */
-    if( stream->bufferProcessor.outputChannelCount > 0 )
-    {
-        UINT previousUnderflowCount = stream->outputUnderflowCount;
-        QueryOutputSpace( stream, &bytesEmpty );
-        framesToXfer = numOutFramesReady = bytesEmpty / stream->bytesPerOutputFrame;
-
-        /* Check for underflow */
-        if( stream->outputUnderflowCount != previousUnderflowCount )
-            stream->callbackFlags |= paOutputUnderflow;
-    }
-
-    if( (numInFramesReady > 0) && (numOutFramesReady > 0) )
-    {
-        framesToXfer = (numOutFramesReady < numInFramesReady) ? numOutFramesReady : numInFramesReady;
-    }
-
-    if( framesToXfer > 0 )
-    {
-
-        PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-    /* The outputBufferDacTime parameter should indicates the time at which
-        the first sample of the output buffer is heard at the DACs. */
-        timeInfo.currentTime = PaUtil_GetTime();
-        timeInfo.outputBufferDacTime = timeInfo.currentTime + outputLatency;
-
-
-        PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, stream->callbackFlags );
-        stream->callbackFlags = 0;
-        
-    /* Input */
-        if( stream->bufferProcessor.inputChannelCount > 0 )
-        {
-            bytesToXfer = framesToXfer * stream->bytesPerInputFrame;
-            hresult = IDirectSoundCaptureBuffer_Lock ( stream->pDirectSoundInputBuffer,
-                stream->readOffset, bytesToXfer,
-                (void **) &lpInBuf1, &dwInSize1,
-                (void **) &lpInBuf2, &dwInSize2, 0);
-            if (hresult != DS_OK)
-            {
-                ERR_RPT(("DirectSound IDirectSoundCaptureBuffer_Lock failed, hresult = 0x%x\n",hresult));
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hresult );
-                goto error2;
-            }
-
-            numFrames = dwInSize1 / stream->bytesPerInputFrame;
-            PaUtil_SetInputFrameCount( &stream->bufferProcessor, numFrames );
-            PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, lpInBuf1, 0 );
-        /* Is input split into two regions. */
-            if( dwInSize2 > 0 )
-            {
-                numFrames = dwInSize2 / stream->bytesPerInputFrame;
-                PaUtil_Set2ndInputFrameCount( &stream->bufferProcessor, numFrames );
-                PaUtil_Set2ndInterleavedInputChannels( &stream->bufferProcessor, 0, lpInBuf2, 0 );
-            }
-        }
-
-    /* Output */
-        if( stream->bufferProcessor.outputChannelCount > 0 )
-        {
-            bytesToXfer = framesToXfer * stream->bytesPerOutputFrame;
-            hresult = IDirectSoundBuffer_Lock ( stream->pDirectSoundOutputBuffer,
-                stream->outputBufferWriteOffsetBytes, bytesToXfer,
-                (void **) &lpOutBuf1, &dwOutSize1,
-                (void **) &lpOutBuf2, &dwOutSize2, 0);
-            if (hresult != DS_OK)
-            {
-                ERR_RPT(("DirectSound IDirectSoundBuffer_Lock failed, hresult = 0x%x\n",hresult));
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hresult );
-                goto error1;
-            }
-
-            numFrames = dwOutSize1 / stream->bytesPerOutputFrame;
-            PaUtil_SetOutputFrameCount( &stream->bufferProcessor, numFrames );
-            PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, lpOutBuf1, 0 );
-
-        /* Is output split into two regions. */
-            if( dwOutSize2 > 0 )
-            {
-                numFrames = dwOutSize2 / stream->bytesPerOutputFrame;
-                PaUtil_Set2ndOutputFrameCount( &stream->bufferProcessor, numFrames );
-                PaUtil_Set2ndInterleavedOutputChannels( &stream->bufferProcessor, 0, lpOutBuf2, 0 );
-            }
-        }
-
-        result = paContinue;
-        numFrames = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &result );
-        stream->framesWritten += numFrames;
-        
-        if( stream->bufferProcessor.outputChannelCount > 0 )
-        {
-        /* FIXME: an underflow could happen here */
-
-        /* Update our buffer offset and unlock sound buffer */
-            bytesProcessed = numFrames * stream->bytesPerOutputFrame;
-            stream->outputBufferWriteOffsetBytes = (stream->outputBufferWriteOffsetBytes + bytesProcessed) % stream->outputBufferSizeBytes;
-            IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, lpOutBuf1, dwOutSize1, lpOutBuf2, dwOutSize2);
-            stream->dsw_framesWritten += numFrames;
-        }
-
-error1:
-        if( stream->bufferProcessor.inputChannelCount > 0 )
-        {
-        /* FIXME: an overflow could happen here */
-
-        /* Update our buffer offset and unlock sound buffer */
-            bytesProcessed = numFrames * stream->bytesPerInputFrame;
-            stream->readOffset = (stream->readOffset + bytesProcessed) % stream->inputSize;
-            IDirectSoundCaptureBuffer_Unlock( stream->pDirectSoundInputBuffer, lpInBuf1, dwInSize1, lpInBuf2, dwInSize2);
-        }
-error2:
-
-        PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, numFrames );
-
-    }
-    
-    return result;
-}
-/*******************************************************************/
-
-static HRESULT ZeroAvailableOutputSpace( PaWinDsStream *stream )
-{
-    HRESULT hr;
-    LPBYTE lpbuf1 = NULL;
-    LPBYTE lpbuf2 = NULL;
-    DWORD dwsize1 = 0;
-    DWORD dwsize2 = 0;
-    long  bytesEmpty;
-    hr = QueryOutputSpace( stream, &bytesEmpty ); // updates framesPlayed
-    if (hr != DS_OK) return hr;
-    if( bytesEmpty == 0 ) return DS_OK;
-    // Lock free space in the DS
-    hr = IDirectSoundBuffer_Lock( stream->pDirectSoundOutputBuffer, stream->outputBufferWriteOffsetBytes,
-                                    bytesEmpty, (void **) &lpbuf1, &dwsize1,
-                                    (void **) &lpbuf2, &dwsize2, 0);
-    if (hr == DS_OK)
-    {
-        // Copy the buffer into the DS
-        ZeroMemory(lpbuf1, dwsize1);
-        if(lpbuf2 != NULL)
-        {
-            ZeroMemory(lpbuf2, dwsize2);
-        }
-        // Update our buffer offset and unlock sound buffer
-        stream->outputBufferWriteOffsetBytes = (stream->outputBufferWriteOffsetBytes + dwsize1 + dwsize2) % stream->outputBufferSizeBytes;
-        IDirectSoundBuffer_Unlock( stream->pDirectSoundOutputBuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
-        stream->dsw_framesWritten += bytesEmpty / stream->bytesPerOutputFrame;
-    }
-    return hr;
-}
-
-
-static void CALLBACK Pa_TimerCallback(UINT uID, UINT uMsg, DWORD_PTR dwUser, DWORD dw1, DWORD dw2)
-{
-    PaWinDsStream *stream;
-
-    /* suppress unused variable warnings */
-    (void) uID;
-    (void) uMsg;
-    (void) dw1;
-    (void) dw2;
-    
-    stream = (PaWinDsStream *) dwUser;
-    if( stream == NULL ) return;
-
-    if( stream->isActive )
-    {
-        if( stream->abortProcessing )
-        {
-            stream->isActive = 0;
-        }
-        else if( stream->stopProcessing )
-        {
-            if( stream->bufferProcessor.outputChannelCount > 0 )
-            {
-                ZeroAvailableOutputSpace( stream );
-                /* clear isActive when all sound played */
-                if( stream->framesPlayed >= stream->framesWritten )
-                {
-                    stream->isActive = 0;
-                }
-            }
-            else
-            {
-                stream->isActive = 0;
-            }
-        }
-        else
-        {
-            if( Pa_TimeSlice( stream ) != 0)  /* Call time slice independant of timing method. */
-            {
-                /* FIXME implement handling of paComplete and paAbort if possible */
-                stream->stopProcessing = 1;
-            }
-        }
-
-        if( !stream->isActive )
-        {
-            if( stream->streamRepresentation.streamFinishedCallback != 0 )
-                stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-        }
-    }
-}
-
-/***********************************************************************************
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    // Cleanup the sound buffers
-    if( stream->pDirectSoundOutputBuffer )
-    {
-        IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
-        IDirectSoundBuffer_Release( stream->pDirectSoundOutputBuffer );
-        stream->pDirectSoundOutputBuffer = NULL;
-    }
-
-    if( stream->pDirectSoundInputBuffer )
-    {
-        IDirectSoundCaptureBuffer_Stop( stream->pDirectSoundInputBuffer );
-        IDirectSoundCaptureBuffer_Release( stream->pDirectSoundInputBuffer );
-        stream->pDirectSoundInputBuffer = NULL;
-    }
-
-    if( stream->pDirectSoundCapture )
-    {
-        IDirectSoundCapture_Release( stream->pDirectSoundCapture );
-        stream->pDirectSoundCapture = NULL;
-    }
-
-    if( stream->pDirectSound )
-    {
-        IDirectSound_Release( stream->pDirectSound );
-        stream->pDirectSound = NULL;
-    }
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-/***********************************************************************************/
-static PaError StartStream( PaStream *s )
-{
-    PaError          result = paNoError;
-    PaWinDsStream   *stream = (PaWinDsStream*)s;
-    HRESULT          hr;
-
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-    
-    if( stream->bufferProcessor.inputChannelCount > 0 )
-    {
-        // Start the buffer playback
-        if( stream->pDirectSoundInputBuffer != NULL ) // FIXME: not sure this check is necessary
-        {
-            hr = IDirectSoundCaptureBuffer_Start( stream->pDirectSoundInputBuffer, DSCBSTART_LOOPING );
-        }
-
-        DBUG(("StartStream: DSW_StartInput returned = 0x%X.\n", hr));
-        if( hr != DS_OK )
-        {
-            result = paUnanticipatedHostError;
-            PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-            goto error;
-        }
-    }
-
-    stream->framesWritten = 0;
-    stream->callbackFlags = 0;
-
-    stream->abortProcessing = 0;
-    stream->stopProcessing = 0;
-    stream->isActive = 1;
-
-    if( stream->bufferProcessor.outputChannelCount > 0 )
-    {
-        /* Give user callback a chance to pre-fill buffer. REVIEW - i thought we weren't pre-filling, rb. */
-        result = Pa_TimeSlice( stream );
-        if( result != paNoError ) return result; // FIXME - what if finished?
-
-        QueryPerformanceCounter( &stream->previousPlayTime );
-        stream->previousPlayCursor = 0;
-        stream->framesPlayed = 0;
-        hr = IDirectSoundBuffer_SetCurrentPosition( stream->pDirectSoundOutputBuffer, 0 );
-        DBUG(("PaHost_StartOutput: IDirectSoundBuffer_SetCurrentPosition returned = 0x%X.\n", hr));
-        if( hr != DS_OK )
-        {
-            result = paUnanticipatedHostError;
-            PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-            goto error;
-        }
-
-        // Start the buffer playback in a loop.
-        if( stream->pDirectSoundOutputBuffer != NULL ) // FIXME: not sure this needs to be checked here
-        {
-            hr = IDirectSoundBuffer_Play( stream->pDirectSoundOutputBuffer, 0, 0, DSBPLAY_LOOPING );
-            DBUG(("PaHost_StartOutput: IDirectSoundBuffer_Play returned = 0x%X.\n", hr));
-            if( hr != DS_OK )
-            {
-                result = paUnanticipatedHostError;
-                PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-                goto error;
-            }
-            stream->outputIsRunning = TRUE;
-        }
-    }
-
-
-    /* Create timer that will wake us up so we can fill the DSound buffer. */
-    {
-        int resolution;
-        int framesPerWakeup = stream->framesPerDSBuffer / 4;
-        int msecPerWakeup = MSEC_PER_SECOND * framesPerWakeup / (int) stream->streamRepresentation.streamInfo.sampleRate;
-        if( msecPerWakeup < 10 ) msecPerWakeup = 10;
-        else if( msecPerWakeup > 100 ) msecPerWakeup = 100;
-        resolution = msecPerWakeup/4;
-        stream->timerID = timeSetEvent( msecPerWakeup, resolution, (LPTIMECALLBACK) Pa_TimerCallback,
-                                             (DWORD_PTR) stream, TIME_PERIODIC );
-    }
-    if( stream->timerID == 0 )
-    {
-        stream->isActive = 0;
-        result = paUnanticipatedHostError;
-        PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr );
-        goto error;
-    }
-
-    stream->isStarted = TRUE;
-
-error:
-    return result;
-}
-
-
-/***********************************************************************************/
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-    HRESULT          hr;
-    int timeoutMsec;
-
-    stream->stopProcessing = 1;
-    /* Set timeout at 20% beyond maximum time we might wait. */
-    timeoutMsec = (int) (1200.0 * stream->framesPerDSBuffer / stream->streamRepresentation.streamInfo.sampleRate);
-    while( stream->isActive && (timeoutMsec > 0)  )
-    {
-        Sleep(10);
-        timeoutMsec -= 10;
-    }
-    if( stream->timerID != 0 )
-    {
-        timeKillEvent(stream->timerID);  /* Stop callback timer. */
-        stream->timerID = 0;
-    }
-
-
-    if( stream->bufferProcessor.outputChannelCount > 0 )
-    {
-        // Stop the buffer playback
-        if( stream->pDirectSoundOutputBuffer != NULL )
-        {
-            stream->outputIsRunning = FALSE;
-            // FIXME: what happens if IDirectSoundBuffer_Stop returns an error?
-            hr = IDirectSoundBuffer_Stop( stream->pDirectSoundOutputBuffer );
-        }
-    }
-
-    if( stream->bufferProcessor.inputChannelCount > 0 )
-    {
-        // Stop the buffer capture
-        if( stream->pDirectSoundInputBuffer != NULL )
-        {
-            // FIXME: what happens if IDirectSoundCaptureBuffer_Stop returns an error?
-            hr = IDirectSoundCaptureBuffer_Stop( stream->pDirectSoundInputBuffer );
-        }
-    }
-
-    stream->isStarted = FALSE;
-
-    return result;
-}
-
-
-/***********************************************************************************/
-static PaError AbortStream( PaStream *s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    stream->abortProcessing = 1;
-    return StopStream( s );
-}
-
-
-/***********************************************************************************/
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    return !stream->isStarted;
-}
-
-
-/***********************************************************************************/
-static PaError IsStreamActive( PaStream *s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    return stream->isActive;
-}
-
-/***********************************************************************************/
-static PaTime GetStreamTime( PaStream *s )
-{
-    /* suppress unused variable warnings */
-    (void) s;
-
-    return PaUtil_GetTime();
-}
-
-
-/***********************************************************************************/
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/***********************************************************************************
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-/***********************************************************************************/
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-/***********************************************************************************/
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-/***********************************************************************************/
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaWinDsStream *stream = (PaWinDsStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-    
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-
diff --git a/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
deleted file mode 100644
index 6fdfd9acce..0000000000
--- a/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Interface for dynamically loading directsound and providing a dummy
- * implementation if it isn't present.
- *
- * Author: Ross Bencina (some portions Phil Burk & Robert Marsanyi)
- *
- * For PortAudio Portable Real-Time Audio Library
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2006 Phil Burk, Robert Marsanyi and Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostaip_src
-*/
-
-#include "pa_win_ds_dynlink.h"
-
-PaWinDsDSoundEntryPoints paWinDsDSoundEntryPoints = { 0, 0, 0, 0, 0, 0, 0 };
-
-
-static HRESULT WINAPI DummyDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
-    (void)rclsid; /* unused parameter */
-    (void)riid; /* unused parameter */
-    (void)ppv; /* unused parameter */
-    return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-static HRESULT WINAPI DummyDirectSoundCreate(LPGUID lpcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter)
-{
-    (void)lpcGuidDevice; /* unused parameter */
-    (void)ppDS; /* unused parameter */
-    (void)pUnkOuter; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI DummyDirectSoundEnumerateW(LPDSENUMCALLBACKW lpDSEnumCallback, LPVOID lpContext)
-{
-    (void)lpDSEnumCallback; /* unused parameter */
-    (void)lpContext; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI DummyDirectSoundEnumerateA(LPDSENUMCALLBACKA lpDSEnumCallback, LPVOID lpContext)
-{
-    (void)lpDSEnumCallback; /* unused parameter */
-    (void)lpContext; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI DummyDirectSoundCaptureCreate(LPGUID lpcGUID, LPDIRECTSOUNDCAPTURE *lplpDSC, LPUNKNOWN pUnkOuter)
-{
-    (void)lpcGUID; /* unused parameter */
-    (void)lplpDSC; /* unused parameter */
-    (void)pUnkOuter; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI DummyDirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW lpDSCEnumCallback, LPVOID lpContext)
-{
-    (void)lpDSCEnumCallback; /* unused parameter */
-    (void)lpContext; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI DummyDirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA lpDSCEnumCallback, LPVOID lpContext)
-{
-    (void)lpDSCEnumCallback; /* unused parameter */
-    (void)lpContext; /* unused parameter */
-    return E_NOTIMPL;
-}
-
-
-void PaWinDs_InitializeDSoundEntryPoints(void)
-{
-    paWinDsDSoundEntryPoints.hInstance_ = LoadLibrary("dsound.dll");
-    if( paWinDsDSoundEntryPoints.hInstance_ != NULL )
-    {
-        paWinDsDSoundEntryPoints.DllGetClassObject =
-                (HRESULT (WINAPI *)(REFCLSID, REFIID , LPVOID *))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DllGetClassObject" );
-        if( paWinDsDSoundEntryPoints.DllGetClassObject == NULL )
-            paWinDsDSoundEntryPoints.DllGetClassObject = DummyDllGetClassObject;
-
-        paWinDsDSoundEntryPoints.DirectSoundCreate =
-                (HRESULT (WINAPI *)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCreate" );
-        if( paWinDsDSoundEntryPoints.DirectSoundCreate == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundCreate = DummyDirectSoundCreate;
-
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateW =
-                (HRESULT (WINAPI *)(LPDSENUMCALLBACKW, LPVOID))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundEnumerateW" );
-        if( paWinDsDSoundEntryPoints.DirectSoundEnumerateW == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundEnumerateW = DummyDirectSoundEnumerateW;
-
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateA =
-                (HRESULT (WINAPI *)(LPDSENUMCALLBACKA, LPVOID))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundEnumerateA" );
-        if( paWinDsDSoundEntryPoints.DirectSoundEnumerateA == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundEnumerateA = DummyDirectSoundEnumerateA;
-
-        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate =
-                (HRESULT (WINAPI *)(LPGUID, LPDIRECTSOUNDCAPTURE *, LPUNKNOWN))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureCreate" );
-        if( paWinDsDSoundEntryPoints.DirectSoundCaptureCreate == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = DummyDirectSoundCaptureCreate;
-
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW =
-                (HRESULT (WINAPI *)(LPDSENUMCALLBACKW, LPVOID))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureEnumerateW" );
-        if( paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = DummyDirectSoundCaptureEnumerateW;
-
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA =
-                (HRESULT (WINAPI *)(LPDSENUMCALLBACKA, LPVOID))
-                GetProcAddress( paWinDsDSoundEntryPoints.hInstance_, "DirectSoundCaptureEnumerateA" );
-        if( paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA == NULL )
-            paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = DummyDirectSoundCaptureEnumerateA;
-    }
-    else
-    {
-        /* initialize with dummy entry points to make live easy when ds isn't present */
-        paWinDsDSoundEntryPoints.DirectSoundCreate = DummyDirectSoundCreate;
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateW = DummyDirectSoundEnumerateW;
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateA = DummyDirectSoundEnumerateA;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = DummyDirectSoundCaptureCreate;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = DummyDirectSoundCaptureEnumerateW;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = DummyDirectSoundCaptureEnumerateA;
-    }
-}
-
-
-void PaWinDs_TerminateDSoundEntryPoints(void)
-{
-    if( paWinDsDSoundEntryPoints.hInstance_ != NULL )
-    {
-        /* ensure that we crash reliably if the entry points arent initialised */
-        paWinDsDSoundEntryPoints.DirectSoundCreate = 0;
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateW = 0;
-        paWinDsDSoundEntryPoints.DirectSoundEnumerateA = 0;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureCreate = 0;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateW = 0;
-        paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA = 0;
-
-        FreeLibrary( paWinDsDSoundEntryPoints.hInstance_ );
-        paWinDsDSoundEntryPoints.hInstance_ = NULL;
-    }
-}
\ No newline at end of file
diff --git a/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
deleted file mode 100644
index 11d35da2c1..0000000000
--- a/libs/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Interface for dynamically loading directsound and providing a dummy
- * implementation if it isn't present.
- *
- * Author: Ross Bencina (some portions Phil Burk & Robert Marsanyi)
- *
- * For PortAudio Portable Real-Time Audio Library
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2006 Phil Burk, Robert Marsanyi and Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/**
- @file
- @ingroup hostaip_src
-*/
-
-#ifndef INCLUDED_PA_DSOUND_DYNLINK_H
-#define INCLUDED_PA_DSOUND_DYNLINK_H
-
-/* on Borland compilers, WIN32 doesn't seem to be defined by default, which
-    breaks dsound.h. Adding the define here fixes the problem. - rossb. */
-#ifdef __BORLANDC__
-#if !defined(WIN32)
-#define WIN32
-#endif
-#endif
-
-/*
-  We are only using DX3 in here, no need to polute the namespace - davidv
-*/
-#define DIRECTSOUND_VERSION 0x0300
-#include <dsound.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-typedef struct
-{
-    HINSTANCE hInstance_;
-    
-    HRESULT (WINAPI *DllGetClassObject)(REFCLSID , REFIID , LPVOID *);
-
-    HRESULT (WINAPI *DirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
-    HRESULT (WINAPI *DirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
-    HRESULT (WINAPI *DirectSoundEnumerateA)(LPDSENUMCALLBACKA, LPVOID);
-
-    HRESULT (WINAPI *DirectSoundCaptureCreate)(LPGUID, LPDIRECTSOUNDCAPTURE *, LPUNKNOWN);
-    HRESULT (WINAPI *DirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
-    HRESULT (WINAPI *DirectSoundCaptureEnumerateA)(LPDSENUMCALLBACKA, LPVOID);
-}PaWinDsDSoundEntryPoints;
-
-extern PaWinDsDSoundEntryPoints paWinDsDSoundEntryPoints;
-
-void PaWinDs_InitializeDSoundEntryPoints(void);
-void PaWinDs_TerminateDSoundEntryPoints(void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* INCLUDED_PA_DSOUND_DYNLINK_H */
diff --git a/libs/portaudio/src/hostapi/jack/pa_jack.c b/libs/portaudio/src/hostapi/jack/pa_jack.c
deleted file mode 100644
index 0793a17659..0000000000
--- a/libs/portaudio/src/hostapi/jack/pa_jack.c
+++ /dev/null
@@ -1,1761 +0,0 @@
-/*
- * $Id: pa_jack.c 1306 2007-11-27 19:33:53Z aknudsen $
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- * JACK Implementation by Joshua Haberman
- *
- * Copyright (c) 2004 Stefan Westerfeld <stefan@space.twc.de>
- * Copyright (c) 2004 Arve Knudsen <aknuds-1@broadpark.no>
- * Copyright (c) 2002 Joshua Haberman <joshua@haberman.com>
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/**
- @file
- @ingroup hostapi_src
-*/
-
-#include <string.h>
-#include <regex.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>  /* EBUSY */
-#include <signal.h> /* sig_atomic_t */
-#include <math.h>
-#include <semaphore.h>
-
-#include <jack/types.h>
-#include <jack/jack.h>
-
-#include "pa_util.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_process.h"
-#include "pa_allocation.h"
-#include "pa_cpuload.h"
-#include "pa_ringbuffer.h"
-#include "pa_debugprint.h"
-
-static int aErr_;
-static PaError paErr_;     /* For use with ENSURE_PA */
-static pthread_t mainThread_;
-static char *jackErr_ = NULL;
-static const char* clientName_ = "PortAudio";
-
-#define STRINGIZE_HELPER(expr) #expr
-#define STRINGIZE(expr) STRINGIZE_HELPER(expr)
-
-/* Check PaError */
-#define ENSURE_PA(expr) \
-    do { \
-        if( (paErr_ = (expr)) < paNoError ) \
-        { \
-            if( (paErr_) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
-            { \
-                if (! jackErr_ ) jackErr_ = "unknown error";\
-                PaUtil_SetLastHostErrorInfo( paJACK, -1, jackErr_ ); \
-            } \
-            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = paErr_; \
-            goto error; \
-        } \
-    } while( 0 )
-
-#define UNLESS(expr, code) \
-    do { \
-        if( (expr) == 0 ) \
-        { \
-            if( (code) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
-            { \
-                if (!jackErr_) jackErr_ = "unknown error";\
-                PaUtil_SetLastHostErrorInfo( paJACK, -1, jackErr_ ); \
-            } \
-            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = (code); \
-            goto error; \
-        } \
-    } while( 0 )
-
-#define ASSERT_CALL(expr, success) \
-    aErr_ = (expr); \
-    assert( aErr_ == success );
-
-/*
- * Functions that directly map to the PortAudio stream interface
- */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-/*static PaTime GetStreamInputLatency( PaStream *stream );*/
-/*static PaTime GetStreamOutputLatency( PaStream *stream );*/
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-
-
-/*
- * Data specific to this API
- */
-
-struct PaJackStream;
-
-typedef struct
-{
-    PaUtilHostApiRepresentation commonHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *deviceInfoMemory;
-
-    jack_client_t *jack_client;
-    int jack_buffer_size;
-    PaHostApiIndex hostApiIndex;
-
-    pthread_mutex_t mtx;
-    pthread_cond_t cond;
-    unsigned long inputBase, outputBase;
-
-    /* For dealing with the process thread */
-    volatile int xrun;     /* Received xrun notification from JACK? */
-    struct PaJackStream * volatile toAdd, * volatile toRemove;
-    struct PaJackStream *processQueue;
-    volatile sig_atomic_t jackIsDown;
-}
-PaJackHostApiRepresentation;
-
-/* PaJackStream - a stream data structure specifically for this implementation */
-
-typedef struct PaJackStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilBufferProcessor bufferProcessor;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaJackHostApiRepresentation *hostApi;
-
-    /* our input and output ports */
-    jack_port_t **local_input_ports;
-    jack_port_t **local_output_ports;
-
-    /* the input and output ports of the client we are connecting to */
-    jack_port_t **remote_input_ports;
-    jack_port_t **remote_output_ports;
-
-    int num_incoming_connections;
-    int num_outgoing_connections;
-
-    jack_client_t *jack_client;
-
-    /* The stream is running if it's still producing samples.
-     * The stream is active if samples it produced are still being heard.
-     */
-    volatile sig_atomic_t is_running;
-    volatile sig_atomic_t is_active;
-    /* Used to signal processing thread that stream should start or stop, respectively */
-    volatile sig_atomic_t doStart, doStop, doAbort;
-
-    jack_nframes_t t0;
-
-    PaUtilAllocationGroup *stream_memory;
-
-    /* These are useful in the process callback */
-
-    int callbackResult;
-    int isSilenced;
-    int xrun;
-
-    /* These are useful for the blocking API */
-
-    int                     isBlockingStream;
-    PaUtilRingBuffer        inFIFO;
-    PaUtilRingBuffer        outFIFO;
-    volatile sig_atomic_t   data_available;
-    sem_t                   data_semaphore;
-    int                     bytesPerFrame;
-    int                     samplesPerFrame;
-
-    struct PaJackStream *next;
-}
-PaJackStream;
-
-#define TRUE 1
-#define FALSE 0
-
-/*
- * Functions specific to this API
- */
-
-static int JackCallback( jack_nframes_t frames, void *userData );
-
-
-/*
- *
- * Implementation
- *
- */
-
-/* ---- blocking emulation layer ---- */
-
-/* Allocate buffer. */
-static PaError BlockingInitFIFO( PaUtilRingBuffer *rbuf, long numFrames, long bytesPerFrame )
-{
-    long numBytes = numFrames * bytesPerFrame;
-    char *buffer = (char *) malloc( numBytes );
-    if( buffer == NULL ) return paInsufficientMemory;
-    memset( buffer, 0, numBytes );
-    return (PaError) PaUtil_InitializeRingBuffer( rbuf, numBytes, buffer );
-}
-
-/* Free buffer. */
-static PaError BlockingTermFIFO( PaUtilRingBuffer *rbuf )
-{
-    if( rbuf->buffer ) free( rbuf->buffer );
-    rbuf->buffer = NULL;
-    return paNoError;
-}
-
-static int
-BlockingCallback( const void                      *inputBuffer,
-                  void                            *outputBuffer,
-		  unsigned long                    framesPerBuffer,
-		  const PaStreamCallbackTimeInfo*  timeInfo,
-		  PaStreamCallbackFlags            statusFlags,
-		  void                             *userData )
-{
-    struct PaJackStream *stream = (PaJackStream *)userData;
-    long numBytes = stream->bytesPerFrame * framesPerBuffer;
-
-    /* This may get called with NULL inputBuffer during initial setup. */
-    if( inputBuffer != NULL )
-    {
-        PaUtil_WriteRingBuffer( &stream->inFIFO, inputBuffer, numBytes );
-    }
-    if( outputBuffer != NULL )
-    {
-        int numRead = PaUtil_ReadRingBuffer( &stream->outFIFO, outputBuffer, numBytes );
-        /* Zero out remainder of buffer if we run out of data. */
-        memset( (char *)outputBuffer + numRead, 0, numBytes - numRead );
-    }
-
-    if( !stream->data_available )
-    {
-        stream->data_available = 1;
-        sem_post( &stream->data_semaphore );
-    }
-    return paContinue;
-}
-
-static PaError
-BlockingBegin( PaJackStream *stream, int minimum_buffer_size )
-{
-    long    doRead = 0;
-    long    doWrite = 0;
-    PaError result = paNoError;
-    long    numFrames;
-
-    doRead = stream->local_input_ports != NULL;
-    doWrite = stream->local_output_ports != NULL;
-    /* <FIXME> */
-    stream->samplesPerFrame = 2;
-    stream->bytesPerFrame = sizeof(float) * stream->samplesPerFrame;
-    /* </FIXME> */
-    numFrames = 32;
-    while (numFrames < minimum_buffer_size)
-        numFrames *= 2;
-
-    if( doRead )
-    {
-        ENSURE_PA( BlockingInitFIFO( &stream->inFIFO, numFrames, stream->bytesPerFrame ) );
-    }
-    if( doWrite )
-    {
-        long numBytes;
-
-        ENSURE_PA( BlockingInitFIFO( &stream->outFIFO, numFrames, stream->bytesPerFrame ) );
-
-        /* Make Write FIFO appear full initially. */
-        numBytes = PaUtil_GetRingBufferWriteAvailable( &stream->outFIFO );
-        PaUtil_AdvanceRingBufferWriteIndex( &stream->outFIFO, numBytes );
-    }
-
-    stream->data_available = 0;
-    sem_init( &stream->data_semaphore, 0, 0 );
-
-error:
-    return result;
-}
-
-static void
-BlockingEnd( PaJackStream *stream )
-{
-    BlockingTermFIFO( &stream->inFIFO );
-    BlockingTermFIFO( &stream->outFIFO );
-
-    sem_destroy( &stream->data_semaphore );
-}
-
-static PaError BlockingReadStream( PaStream* s, void *data, unsigned long numFrames )
-{
-    PaError result = paNoError;
-    PaJackStream *stream = (PaJackStream *)s;
-
-    long bytesRead;
-    char *p = (char *) data;
-    long numBytes = stream->bytesPerFrame * numFrames;
-    while( numBytes > 0 )
-    {
-        bytesRead = PaUtil_ReadRingBuffer( &stream->inFIFO, p, numBytes );
-        numBytes -= bytesRead;
-        p += bytesRead;
-        if( numBytes > 0 )
-        {
-            /* see write for an explanation */
-            if( stream->data_available )
-                stream->data_available = 0;
-            else
-                sem_wait( &stream->data_semaphore );
-        }
-    }
-
-    return result;
-}
-
-static PaError BlockingWriteStream( PaStream* s, const void *data, unsigned long numFrames )
-{
-    PaError result = paNoError;
-    PaJackStream *stream = (PaJackStream *)s;
-    long bytesWritten;
-    char *p = (char *) data;
-    long numBytes = stream->bytesPerFrame * numFrames;
-    while( numBytes > 0 )
-    {
-        bytesWritten = PaUtil_WriteRingBuffer( &stream->outFIFO, p, numBytes );
-        numBytes -= bytesWritten;
-        p += bytesWritten;
-        if( numBytes > 0 )
-        {
-            /* we use the following algorithm:
-             *   (1) write data
-             *   (2) if some data didn't fit into the ringbuffer, set data_available to 0
-             *       to indicate to the audio that if space becomes available, we want to know
-             *   (3) retry to write data (because it might be that between (1) and (2)
-             *       new space in the buffer became available)
-             *   (4) if this failed, we are sure that the buffer is really empty and
-             *       we will definitely receive a notification when it becomes available
-             *       thus we can safely sleep
-             *
-             * if the algorithm bailed out in step (3) before, it leaks a count of 1
-             * on the semaphore; however, it doesn't matter, because if we block in (4),
-             * we also do it in a loop
-             */
-            if( stream->data_available )
-                stream->data_available = 0;
-            else
-                sem_wait( &stream->data_semaphore );
-        }
-    }
-
-    return result;
-}
-
-static signed long
-BlockingGetStreamReadAvailable( PaStream* s )
-{
-    PaJackStream *stream = (PaJackStream *)s;
-
-    int bytesFull = PaUtil_GetRingBufferReadAvailable( &stream->inFIFO );
-    return bytesFull / stream->bytesPerFrame;
-}
-
-static signed long
-BlockingGetStreamWriteAvailable( PaStream* s )
-{
-    PaJackStream *stream = (PaJackStream *)s;
-
-    int bytesEmpty = PaUtil_GetRingBufferWriteAvailable( &stream->outFIFO );
-    return bytesEmpty / stream->bytesPerFrame;
-}
-
-static PaError
-BlockingWaitEmpty( PaStream *s )
-{
-    PaJackStream *stream = (PaJackStream *)s;
-
-    while( PaUtil_GetRingBufferReadAvailable( &stream->outFIFO ) > 0 )
-    {
-        stream->data_available = 0;
-        sem_wait( &stream->data_semaphore );
-    }
-    return 0;
-}
-
-/* ---- jack driver ---- */
-
-/* BuildDeviceList():
- *
- * The process of determining a list of PortAudio "devices" from
- * JACK's client/port system is fairly involved, so it is separated
- * into its own routine.
- */
-
-static PaError BuildDeviceList( PaJackHostApiRepresentation *jackApi )
-{
-    /* Utility macros for the repetitive process of allocating memory */
-
-    /* JACK has no concept of a device.  To JACK, there are clients
-     * which have an arbitrary number of ports.  To make this
-     * intelligible to PortAudio clients, we will group each JACK client
-     * into a device, and make each port of that client a channel */
-
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *commonApi = &jackApi->commonHostApiRep;
-
-    const char **jack_ports = NULL;
-    char **client_names = NULL;
-    char *regex_pattern = NULL;
-    int port_index, client_index, i;
-    double globalSampleRate;
-    regex_t port_regex;
-    unsigned long numClients = 0, numPorts = 0;
-    char *tmp_client_name = NULL;
-
-    commonApi->info.defaultInputDevice = paNoDevice;
-    commonApi->info.defaultOutputDevice = paNoDevice;
-    commonApi->info.deviceCount = 0;
-
-    /* Parse the list of ports, using a regex to grab the client names */
-    ASSERT_CALL( regcomp( &port_regex, "^[^:]*", REG_EXTENDED ), 0 );
-
-    /* since we are rebuilding the list of devices, free all memory
-     * associated with the previous list */
-    PaUtil_FreeAllAllocations( jackApi->deviceInfoMemory );
-
-    regex_pattern = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, jack_client_name_size() + 3 );
-    tmp_client_name = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, jack_client_name_size() );
-
-    /* We can only retrieve the list of clients indirectly, by first
-     * asking for a list of all ports, then parsing the port names
-     * according to the client_name:port_name convention (which is
-     * enforced by jackd)
-     * A: If jack_get_ports returns NULL, there's nothing for us to do */
-    UNLESS( (jack_ports = jack_get_ports( jackApi->jack_client, "", "", 0 )) && jack_ports[0], paNoError );
-    /* Find number of ports */
-    while( jack_ports[numPorts] )
-        ++numPorts;
-    /* At least there will be one port per client :) */
-    UNLESS( client_names = PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory, numPorts *
-                sizeof (char *) ), paInsufficientMemory );
-
-    /* Build a list of clients from the list of ports */
-    for( numClients = 0, port_index = 0; jack_ports[port_index] != NULL; port_index++ )
-    {
-        int client_seen = FALSE;
-        regmatch_t match_info;
-        const char *port = jack_ports[port_index];
-
-        /* extract the client name from the port name, using a regex
-         * that parses the clientname:portname syntax */
-        UNLESS( !regexec( &port_regex, port, 1, &match_info, 0 ), paInternalError );
-        assert(match_info.rm_eo - match_info.rm_so < jack_client_name_size());
-        memcpy( tmp_client_name, port + match_info.rm_so,
-                match_info.rm_eo - match_info.rm_so );
-        tmp_client_name[match_info.rm_eo - match_info.rm_so] = '\0';
-
-        /* do we know about this port's client yet? */
-        for( i = 0; i < numClients; i++ )
-        {
-            if( strcmp( tmp_client_name, client_names[i] ) == 0 )
-                client_seen = TRUE;
-        }
-
-        if (client_seen)
-            continue;   /* A: Nothing to see here, move along */
-
-        UNLESS( client_names[numClients] = (char*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
-                    strlen(tmp_client_name) + 1), paInsufficientMemory );
-
-        /* The alsa_pcm client should go in spot 0.  If this
-         * is the alsa_pcm client AND we are NOT about to put
-         * it in spot 0 put it in spot 0 and move whatever
-         * was already in spot 0 to the end. */
-        if( strcmp( "alsa_pcm", tmp_client_name ) == 0 && numClients > 0 )
-        {
-            /* alsa_pcm goes in spot 0 */
-            strcpy( client_names[ numClients ], client_names[0] );
-            strcpy( client_names[0], tmp_client_name );
-        }
-        else
-        {
-            /* put the new client at the end of the client list */
-            strcpy( client_names[ numClients ], tmp_client_name );
-        }
-        ++numClients;
-    }
-
-    /* Now we have a list of clients, which will become the list of
-     * PortAudio devices. */
-
-    /* there is one global sample rate all clients must conform to */
-
-    globalSampleRate = jack_get_sample_rate( jackApi->jack_client );
-    UNLESS( commonApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
-                sizeof(PaDeviceInfo*) * numClients ), paInsufficientMemory );
-
-    assert( commonApi->info.deviceCount == 0 );
-
-    /* Create a PaDeviceInfo structure for every client */
-    for( client_index = 0; client_index < numClients; client_index++ )
-    {
-        PaDeviceInfo *curDevInfo;
-        const char **clientPorts = NULL;
-
-        UNLESS( curDevInfo = (PaDeviceInfo*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
-                    sizeof(PaDeviceInfo) ), paInsufficientMemory );
-        UNLESS( curDevInfo->name = (char*)PaUtil_GroupAllocateMemory( jackApi->deviceInfoMemory,
-                    strlen(client_names[client_index]) + 1 ), paInsufficientMemory );
-        strcpy( (char *)curDevInfo->name, client_names[client_index] );
-
-        curDevInfo->structVersion = 2;
-        curDevInfo->hostApi = jackApi->hostApiIndex;
-
-        /* JACK is very inflexible: there is one sample rate the whole
-         * system must run at, and all clients must speak IEEE float. */
-        curDevInfo->defaultSampleRate = globalSampleRate;
-
-        /* To determine how many input and output channels are available,
-         * we re-query jackd with more specific parameters. */
-
-        sprintf( regex_pattern, "%s:.*", client_names[client_index] );
-
-        /* ... what are your output ports (that we could input from)? */
-        clientPorts = jack_get_ports( jackApi->jack_client, regex_pattern,
-                                     NULL, JackPortIsOutput);
-        curDevInfo->maxInputChannels = 0;
-        curDevInfo->defaultLowInputLatency = 0.;
-        curDevInfo->defaultHighInputLatency = 0.;
-        if( clientPorts )
-        {
-            jack_port_t *p = jack_port_by_name( jackApi->jack_client, clientPorts[0] );
-            curDevInfo->defaultLowInputLatency = curDevInfo->defaultHighInputLatency =
-                jack_port_get_latency( p ) / globalSampleRate;
-
-            for( i = 0; clientPorts[i] != NULL; i++)
-            {
-                /* The number of ports returned is the number of output channels.
-                 * We don't care what they are, we just care how many */
-                curDevInfo->maxInputChannels++;
-            }
-            free(clientPorts);
-        }
-
-        /* ... what are your input ports (that we could output to)? */
-        clientPorts = jack_get_ports( jackApi->jack_client, regex_pattern,
-                                     NULL, JackPortIsInput);
-        curDevInfo->maxOutputChannels = 0;
-        curDevInfo->defaultLowOutputLatency = 0.;
-        curDevInfo->defaultHighOutputLatency = 0.;
-        if( clientPorts )
-        {
-            jack_port_t *p = jack_port_by_name( jackApi->jack_client, clientPorts[0] );
-            curDevInfo->defaultLowOutputLatency = curDevInfo->defaultHighOutputLatency =
-                jack_port_get_latency( p ) / globalSampleRate;
-
-            for( i = 0; clientPorts[i] != NULL; i++)
-            {
-                /* The number of ports returned is the number of input channels.
-                 * We don't care what they are, we just care how many */
-                curDevInfo->maxOutputChannels++;
-            }
-            free(clientPorts);
-        }
-
-        /* Add this client to the list of devices */
-        commonApi->deviceInfos[client_index] = curDevInfo;
-        ++commonApi->info.deviceCount;
-        if( commonApi->info.defaultInputDevice == paNoDevice && curDevInfo->maxInputChannels > 0 )
-            commonApi->info.defaultInputDevice = client_index;
-        if( commonApi->info.defaultOutputDevice == paNoDevice && curDevInfo->maxOutputChannels > 0 )
-            commonApi->info.defaultOutputDevice = client_index;
-    }
-
-error:
-    regfree( &port_regex );
-    free( jack_ports );
-    return result;
-}
-
-static void UpdateSampleRate( PaJackStream *stream, double sampleRate )
-{
-    /* XXX: Maybe not the cleanest way of going about this? */
-    stream->cpuLoadMeasurer.samplingPeriod = stream->bufferProcessor.samplePeriod = 1. / sampleRate;
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-}
-
-static void JackErrorCallback( const char *msg )
-{
-    if( pthread_self() == mainThread_ )
-    {
-        assert( msg );
-        jackErr_ = realloc( jackErr_, strlen( msg ) + 1 );
-        strcpy( jackErr_, msg );
-    }
-}
-
-static void JackOnShutdown( void *arg )
-{
-    PaJackHostApiRepresentation *jackApi = (PaJackHostApiRepresentation *)arg;
-    PaJackStream *stream = jackApi->processQueue;
-
-    PA_DEBUG(( "%s: JACK server is shutting down\n", __FUNCTION__ ));
-    for( ; stream; stream = stream->next )
-    {
-        stream->is_active = 0;
-    }
-
-    /* Make sure that the main thread doesn't get stuck waiting on the condition */
-    ASSERT_CALL( pthread_mutex_lock( &jackApi->mtx ), 0 );
-    jackApi->jackIsDown = 1;
-    ASSERT_CALL( pthread_cond_signal( &jackApi->cond ), 0 );
-    ASSERT_CALL( pthread_mutex_unlock( &jackApi->mtx ), 0 );
-
-}
-
-static int JackSrCb( jack_nframes_t nframes, void *arg )
-{
-    PaJackHostApiRepresentation *jackApi = (PaJackHostApiRepresentation *)arg;
-    double sampleRate = (double)nframes;
-    PaJackStream *stream = jackApi->processQueue;
-
-    /* Update all streams in process queue */
-    PA_DEBUG(( "%s: Acting on change in JACK samplerate: %f\n", __FUNCTION__, sampleRate ));
-    for( ; stream; stream = stream->next )
-    {
-        if( stream->streamRepresentation.streamInfo.sampleRate != sampleRate )
-        {
-            PA_DEBUG(( "%s: Updating samplerate\n", __FUNCTION__ ));
-            UpdateSampleRate( stream, sampleRate );
-        }
-    }
-
-    return 0;
-}
-
-static int JackXRunCb(void *arg) {
-    PaJackHostApiRepresentation *hostApi = (PaJackHostApiRepresentation *)arg;
-    assert( hostApi );
-    hostApi->xrun = TRUE;
-    PA_DEBUG(( "%s: JACK signalled xrun\n", __FUNCTION__ ));
-    return 0;
-}
-
-PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi,
-                           PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation *jackHostApi;
-    int activated = 0;
-    jack_status_t jackStatus = 0;
-    *hostApi = NULL;    /* Initialize to NULL */
-
-    UNLESS( jackHostApi = (PaJackHostApiRepresentation*)
-        PaUtil_AllocateMemory( sizeof(PaJackHostApiRepresentation) ), paInsufficientMemory );
-    UNLESS( jackHostApi->deviceInfoMemory = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
-
-    mainThread_ = pthread_self();
-    ASSERT_CALL( pthread_mutex_init( &jackHostApi->mtx, NULL ), 0 );
-    ASSERT_CALL( pthread_cond_init( &jackHostApi->cond, NULL ), 0 );
-
-    /* Try to become a client of the JACK server.  If we cannot do
-     * this, then this API cannot be used.
-     *
-     * Without the JackNoStartServer option, the jackd server is started
-     * automatically which we do not want.
-     */
-
-    jackHostApi->jack_client = jack_client_open( clientName_, JackNoStartServer, &jackStatus );
-    if( !jackHostApi->jack_client )
-    {
-        /* the V19 development docs say that if an implementation
-         * detects that it cannot be used, it should return a NULL
-         * interface and paNoError */
-        PA_DEBUG(( "%s: Couldn't connect to JACK, status: %d\n", __FUNCTION__, jackStatus ));
-        result = paNoError;
-        goto error;
-    }
-
-    jackHostApi->hostApiIndex = hostApiIndex;
-
-    *hostApi = &jackHostApi->commonHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paJACK;
-    (*hostApi)->info.name = "JACK Audio Connection Kit";
-
-    /* Build a device list by querying the JACK server */
-    ENSURE_PA( BuildDeviceList( jackHostApi ) );
-
-    /* Register functions */
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &jackHostApi->callbackStreamInterface,
-                                      CloseStream, StartStream,
-                                      StopStream, AbortStream,
-                                      IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable,
-                                      PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &jackHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      BlockingReadStream, BlockingWriteStream,
-                                      BlockingGetStreamReadAvailable, BlockingGetStreamWriteAvailable );
-
-    jackHostApi->inputBase = jackHostApi->outputBase = 0;
-    jackHostApi->xrun = 0;
-    jackHostApi->toAdd = jackHostApi->toRemove = NULL;
-    jackHostApi->processQueue = NULL;
-    jackHostApi->jackIsDown = 0;
-
-    jack_on_shutdown( jackHostApi->jack_client, JackOnShutdown, jackHostApi );
-    jack_set_error_function( JackErrorCallback );
-    jackHostApi->jack_buffer_size = jack_get_buffer_size ( jackHostApi->jack_client );
-    /* Don't check for error, may not be supported (deprecated in at least jackdmp) */
-    jack_set_sample_rate_callback( jackHostApi->jack_client, JackSrCb, jackHostApi );
-    UNLESS( !jack_set_xrun_callback( jackHostApi->jack_client, JackXRunCb, jackHostApi ), paUnanticipatedHostError );
-    UNLESS( !jack_set_process_callback( jackHostApi->jack_client, JackCallback, jackHostApi ), paUnanticipatedHostError );
-    UNLESS( !jack_activate( jackHostApi->jack_client ), paUnanticipatedHostError );
-    activated = 1;
-
-    return result;
-
-error:
-    if( activated )
-        ASSERT_CALL( jack_deactivate( jackHostApi->jack_client ), 0 );
-
-    if( jackHostApi )
-    {
-        if( jackHostApi->jack_client )
-            ASSERT_CALL( jack_client_close( jackHostApi->jack_client ), 0 );
-
-        if( jackHostApi->deviceInfoMemory )
-        {
-            PaUtil_FreeAllAllocations( jackHostApi->deviceInfoMemory );
-            PaUtil_DestroyAllocationGroup( jackHostApi->deviceInfoMemory );
-        }
-
-        PaUtil_FreeMemory( jackHostApi );
-    }
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaJackHostApiRepresentation *jackHostApi = (PaJackHostApiRepresentation*)hostApi;
-
-    /* note: this automatically disconnects all ports, since a deactivated
-     * client is not allowed to have any ports connected */
-    ASSERT_CALL( jack_deactivate( jackHostApi->jack_client ), 0 );
-
-    ASSERT_CALL( pthread_mutex_destroy( &jackHostApi->mtx ), 0 );
-    ASSERT_CALL( pthread_cond_destroy( &jackHostApi->cond ), 0 );
-
-    ASSERT_CALL( jack_client_close( jackHostApi->jack_client ), 0 );
-
-    if( jackHostApi->deviceInfoMemory )
-    {
-        PaUtil_FreeAllAllocations( jackHostApi->deviceInfoMemory );
-        PaUtil_DestroyAllocationGroup( jackHostApi->deviceInfoMemory );
-    }
-
-    PaUtil_FreeMemory( jackHostApi );
-
-    free( jackErr_ );
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    int inputChannelCount = 0, outputChannelCount = 0;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-    /*
-        The following check is not necessary for JACK.
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-
-        Because the buffer adapter handles conversion between all standard
-        sample formats, the following checks are only required if paCustomFormat
-        is implemented, or under some other unusual conditions.
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-    */
-
-    /* check that the device supports sampleRate */
-
-#define ABS(x) ( (x) > 0 ? (x) : -(x) )
-    if( ABS(sampleRate - jack_get_sample_rate(((PaJackHostApiRepresentation *) hostApi)->jack_client )) > 1 )
-       return paInvalidSampleRate;
-#undef ABS
-
-    return paFormatIsSupported;
-}
-
-/* Basic stream initialization */
-static PaError InitializeStream( PaJackStream *stream, PaJackHostApiRepresentation *hostApi, int numInputChannels,
-        int numOutputChannels )
-{
-    PaError result = paNoError;
-    assert( stream );
-
-    memset( stream, 0, sizeof (PaJackStream) );
-    UNLESS( stream->stream_memory = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
-    stream->jack_client = hostApi->jack_client;
-    stream->hostApi = hostApi;
-
-    if( numInputChannels > 0 )
-    {
-        UNLESS( stream->local_input_ports =
-                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numInputChannels ),
-                paInsufficientMemory );
-        memset( stream->local_input_ports, 0, sizeof(jack_port_t*) * numInputChannels );
-        UNLESS( stream->remote_output_ports =
-                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numInputChannels ),
-                paInsufficientMemory );
-        memset( stream->remote_output_ports, 0, sizeof(jack_port_t*) * numInputChannels );
-    }
-    if( numOutputChannels > 0 )
-    {
-        UNLESS( stream->local_output_ports =
-                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numOutputChannels ),
-                paInsufficientMemory );
-        memset( stream->local_output_ports, 0, sizeof(jack_port_t*) * numOutputChannels );
-        UNLESS( stream->remote_input_ports =
-                (jack_port_t**) PaUtil_GroupAllocateMemory( stream->stream_memory, sizeof(jack_port_t*) * numOutputChannels ),
-                paInsufficientMemory );
-        memset( stream->remote_input_ports, 0, sizeof(jack_port_t*) * numOutputChannels );
-    }
-
-    stream->num_incoming_connections = numInputChannels;
-    stream->num_outgoing_connections = numOutputChannels;
-
-error:
-    return result;
-}
-
-/*!
- * Free resources associated with stream, and eventually stream itself.
- *
- * Frees allocated memory, and closes opened pcms.
- */
-static void CleanUpStream( PaJackStream *stream, int terminateStreamRepresentation, int terminateBufferProcessor )
-{
-    int i;
-    assert( stream );
-
-    if( stream->isBlockingStream )
-        BlockingEnd( stream );
-
-    for( i = 0; i < stream->num_incoming_connections; ++i )
-    {
-        if( stream->local_input_ports[i] )
-            ASSERT_CALL( jack_port_unregister( stream->jack_client, stream->local_input_ports[i] ), 0 );
-    }
-    for( i = 0; i < stream->num_outgoing_connections; ++i )
-    {
-        if( stream->local_output_ports[i] )
-            ASSERT_CALL( jack_port_unregister( stream->jack_client, stream->local_output_ports[i] ), 0 );
-    }
-
-    if( terminateStreamRepresentation )
-        PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    if( terminateBufferProcessor )
-        PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-
-    if( stream->stream_memory )
-    {
-        PaUtil_FreeAllAllocations( stream->stream_memory );
-        PaUtil_DestroyAllocationGroup( stream->stream_memory );
-    }
-    PaUtil_FreeMemory( stream );
-}
-
-static PaError WaitCondition( PaJackHostApiRepresentation *hostApi )
-{
-    PaError result = paNoError;
-    int err = 0;
-    PaTime pt = PaUtil_GetTime();
-    struct timespec ts;
-
-    ts.tv_sec = (time_t) floor( pt + 1 );
-    ts.tv_nsec = (long) ((pt - floor( pt )) * 1000000000);
-    /* XXX: Best enclose in loop, in case of spurious wakeups? */
-    err = pthread_cond_timedwait( &hostApi->cond, &hostApi->mtx, &ts );
-
-    /* Make sure we didn't time out */
-    UNLESS( err != ETIMEDOUT, paTimedOut );
-    UNLESS( !err, paInternalError );
-
-error:
-    return result;
-}
-
-static PaError AddStream( PaJackStream *stream )
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation *hostApi = stream->hostApi;
-    /* Add to queue of streams that should be processed */
-    ASSERT_CALL( pthread_mutex_lock( &hostApi->mtx ), 0 );
-    if( !hostApi->jackIsDown )
-    {
-        hostApi->toAdd = stream;
-        /* Unlock mutex and await signal from processing thread */
-        result = WaitCondition( stream->hostApi );
-    }
-    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
-    ENSURE_PA( result );
-
-    UNLESS( !hostApi->jackIsDown, paDeviceUnavailable );
-
-error:
-    return result;
-}
-
-/* Remove stream from processing queue */
-static PaError RemoveStream( PaJackStream *stream )
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation *hostApi = stream->hostApi;
-
-    /* Add to queue over streams that should be processed */
-    ASSERT_CALL( pthread_mutex_lock( &hostApi->mtx ), 0 );
-    if( !hostApi->jackIsDown )
-    {
-        hostApi->toRemove = stream;
-        /* Unlock mutex and await signal from processing thread */
-        result = WaitCondition( stream->hostApi );
-    }
-    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
-    ENSURE_PA( result );
-
-error:
-    return result;
-}
-
-/* Add stream to JACK callback processing queue */
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation *jackHostApi = (PaJackHostApiRepresentation*)hostApi;
-    PaJackStream *stream = NULL;
-    char *port_string = PaUtil_GroupAllocateMemory( jackHostApi->deviceInfoMemory, jack_port_name_size() );
-    unsigned long regexSz = jack_client_name_size() + 3;
-    char *regex_pattern = PaUtil_GroupAllocateMemory( jackHostApi->deviceInfoMemory, regexSz );
-    const char **jack_ports = NULL;
-    /* int jack_max_buffer_size = jack_get_buffer_size( jackHostApi->jack_client ); */
-    int i;
-    int inputChannelCount, outputChannelCount;
-    const double jackSr = jack_get_sample_rate( jackHostApi->jack_client );
-    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0;
-    int bpInitialized = 0, srInitialized = 0;   /* Initialized buffer processor and stream representation? */
-    unsigned long ofs;
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-    if( (streamFlags & paPrimeOutputBuffersUsingStreamCallback) != 0 )
-    {
-        streamFlags &= ~paPrimeOutputBuffersUsingStreamCallback;
-        /*return paInvalidFlag;*/   /* This implementation does not support buffer priming */
-    }
-
-    if( framesPerBuffer != paFramesPerBufferUnspecified )
-    {
-        /* Jack operates with power of two buffers, and we don't support non-integer buffer adaption (yet) */
-        /*UNLESS( !(framesPerBuffer & (framesPerBuffer - 1)), paBufferTooBig );*/  /* TODO: Add descriptive error code? */
-    }
-
-    /* Preliminary checks */
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-    /* ... check that the sample rate exactly matches the ONE acceptable rate
-     * A: This rate isn't necessarily constant though? */
-
-#define ABS(x) ( (x) > 0 ? (x) : -(x) )
-    if( ABS(sampleRate - jackSr) > 1 )
-       return paInvalidSampleRate;
-#undef ABS
-
-    UNLESS( stream = (PaJackStream*)PaUtil_AllocateMemory( sizeof(PaJackStream) ), paInsufficientMemory );
-    ENSURE_PA( InitializeStream( stream, jackHostApi, inputChannelCount, outputChannelCount ) );
-
-    /* the blocking emulation, if necessary */
-    stream->isBlockingStream = !streamCallback;
-    if( stream->isBlockingStream )
-    {
-        float latency = 0.001; /* 1ms is the absolute minimum we support */
-        int   minimum_buffer_frames = 0;
-
-        if( inputParameters && inputParameters->suggestedLatency > latency )
-            latency = inputParameters->suggestedLatency;
-        else if( outputParameters && outputParameters->suggestedLatency > latency )
-            latency = outputParameters->suggestedLatency;
-
-        /* the latency the user asked for indicates the minimum buffer size in frames */
-        minimum_buffer_frames = (int) (latency * jack_get_sample_rate( jackHostApi->jack_client ));
-
-        /* we also need to be able to store at least three full jack buffers to avoid dropouts */
-        if( jackHostApi->jack_buffer_size * 3 > minimum_buffer_frames )
-            minimum_buffer_frames = jackHostApi->jack_buffer_size * 3;
-
-        /* setup blocking API data structures (FIXME: can fail) */
-	BlockingBegin( stream, minimum_buffer_frames );
-
-        /* install our own callback for the blocking API */
-        streamCallback = BlockingCallback;
-        userData = stream;
-
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &jackHostApi->blockingStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &jackHostApi->callbackStreamInterface, streamCallback, userData );
-    }
-    srInitialized = 1;
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, jackSr );
-
-    /* create the JACK ports.  We cannot connect them until audio
-     * processing begins */
-
-    /* Register a unique set of ports for this stream
-     * TODO: Robust allocation of new port names */
-
-    ofs = jackHostApi->inputBase;
-    for( i = 0; i < inputChannelCount; i++ )
-    {
-        snprintf( port_string, jack_port_name_size(), "in_%lu", ofs + i );
-        UNLESS( stream->local_input_ports[i] = jack_port_register(
-              jackHostApi->jack_client, port_string,
-              JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0 ), paInsufficientMemory );
-    }
-    jackHostApi->inputBase += inputChannelCount;
-
-    ofs = jackHostApi->outputBase;
-    for( i = 0; i < outputChannelCount; i++ )
-    {
-        snprintf( port_string, jack_port_name_size(), "out_%lu", ofs + i );
-        UNLESS( stream->local_output_ports[i] = jack_port_register(
-             jackHostApi->jack_client, port_string,
-             JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ), paInsufficientMemory );
-    }
-    jackHostApi->outputBase += outputChannelCount;
-
-    /* look up the jack_port_t's for the remote ports.  We could do
-     * this at stream start time, but doing it here ensures the
-     * name lookup only happens once. */
-
-    if( inputChannelCount > 0 )
-    {
-        int err = 0;
-
-        /* Get output ports of our capture device */
-        snprintf( regex_pattern, regexSz, "%s:.*", hostApi->deviceInfos[ inputParameters->device ]->name );
-        UNLESS( jack_ports = jack_get_ports( jackHostApi->jack_client, regex_pattern,
-                                     NULL, JackPortIsOutput ), paUnanticipatedHostError );
-        for( i = 0; i < inputChannelCount && jack_ports[i]; i++ )
-        {
-            if( (stream->remote_output_ports[i] = jack_port_by_name(
-                 jackHostApi->jack_client, jack_ports[i] )) == NULL )
-            {
-                err = 1;
-                break;
-            }
-        }
-        free( jack_ports );
-        UNLESS( !err, paInsufficientMemory );
-
-        /* Fewer ports than expected? */
-        UNLESS( i == inputChannelCount, paInternalError );
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        int err = 0;
-
-        /* Get input ports of our playback device */
-        snprintf( regex_pattern, regexSz, "%s:.*", hostApi->deviceInfos[ outputParameters->device ]->name );
-        UNLESS( jack_ports = jack_get_ports( jackHostApi->jack_client, regex_pattern,
-                                     NULL, JackPortIsInput ), paUnanticipatedHostError );
-        for( i = 0; i < outputChannelCount && jack_ports[i]; i++ )
-        {
-            if( (stream->remote_input_ports[i] = jack_port_by_name(
-                 jackHostApi->jack_client, jack_ports[i] )) == 0 )
-            {
-                err = 1;
-                break;
-            }
-        }
-        free( jack_ports );
-        UNLESS( !err , paInsufficientMemory );
-
-        /* Fewer ports than expected? */
-        UNLESS( i == outputChannelCount, paInternalError );
-    }
-
-    ENSURE_PA( PaUtil_InitializeBufferProcessor(
-                  &stream->bufferProcessor,
-                  inputChannelCount,
-                  inputSampleFormat,
-                  paFloat32,            /* hostInputSampleFormat */
-                  outputChannelCount,
-                  outputSampleFormat,
-                  paFloat32,            /* hostOutputSampleFormat */
-                  jackSr,
-                  streamFlags,
-                  framesPerBuffer,
-                  0,                            /* Ignored */
-                  paUtilUnknownHostBufferSize,  /* Buffer size may vary on JACK's discretion */
-                  streamCallback,
-                  userData ) );
-    bpInitialized = 1;
-
-    if( stream->num_incoming_connections > 0 )
-        stream->streamRepresentation.streamInfo.inputLatency = (jack_port_get_latency( stream->remote_output_ports[0] )
-                - jack_get_buffer_size( jackHostApi->jack_client )  /* One buffer is not counted as latency */
-            + PaUtil_GetBufferProcessorInputLatency( &stream->bufferProcessor )) / sampleRate;
-    if( stream->num_outgoing_connections > 0 )
-        stream->streamRepresentation.streamInfo.outputLatency = (jack_port_get_latency( stream->remote_input_ports[0] )
-                - jack_get_buffer_size( jackHostApi->jack_client )  /* One buffer is not counted as latency */
-            + PaUtil_GetBufferProcessorOutputLatency( &stream->bufferProcessor )) / sampleRate;
-
-    stream->streamRepresentation.streamInfo.sampleRate = jackSr;
-    stream->t0 = jack_frame_time( jackHostApi->jack_client );   /* A: Time should run from Pa_OpenStream */
-
-    /* Add to queue of opened streams */
-    ENSURE_PA( AddStream( stream ) );
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    if( stream )
-        CleanUpStream( stream, srInitialized, bpInitialized );
-
-    return result;
-}
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaJackStream *stream = (PaJackStream*)s;
-
-    /* Remove this stream from the processing queue */
-    ENSURE_PA( RemoveStream( stream ) );
-
-error:
-    CleanUpStream( stream, 1, 1 );
-    return result;
-}
-
-static PaError RealProcess( PaJackStream *stream, jack_nframes_t frames )
-{
-    PaError result = paNoError;
-    PaStreamCallbackTimeInfo timeInfo = {0,0,0};
-    int chn;
-    int framesProcessed;
-    const double sr = jack_get_sample_rate( stream->jack_client );    /* Shouldn't change during the process callback */
-    PaStreamCallbackFlags cbFlags = 0;
-
-    /* If the user has returned !paContinue from the callback we'll want to flush the internal buffers,
-     * when these are empty we can finally mark the stream as inactive */
-    if( stream->callbackResult != paContinue &&
-            PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
-    {
-        stream->is_active = 0;
-        if( stream->streamRepresentation.streamFinishedCallback )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-        PA_DEBUG(( "%s: Callback finished\n", __FUNCTION__ ));
-
-        goto end;
-    }
-
-    timeInfo.currentTime = (jack_frame_time( stream->jack_client ) - stream->t0) / sr;
-    if( stream->num_incoming_connections > 0 )
-        timeInfo.inputBufferAdcTime = timeInfo.currentTime - jack_port_get_latency( stream->remote_output_ports[0] )
-            / sr;
-    if( stream->num_outgoing_connections > 0 )
-        timeInfo.outputBufferDacTime = timeInfo.currentTime + jack_port_get_latency( stream->remote_input_ports[0] )
-            / sr;
-
-    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-    if( stream->xrun )
-    {
-        /* XXX: Any way to tell which of these occurred? */
-        cbFlags = paOutputUnderflow | paInputOverflow;
-        stream->xrun = FALSE;
-    }
-    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo,
-            cbFlags );
-
-    if( stream->num_incoming_connections > 0 )
-        PaUtil_SetInputFrameCount( &stream->bufferProcessor, frames );
-    if( stream->num_outgoing_connections > 0 )
-        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, frames );
-
-    for( chn = 0; chn < stream->num_incoming_connections; chn++ )
-    {
-        jack_default_audio_sample_t *channel_buf = (jack_default_audio_sample_t*)
-            jack_port_get_buffer( stream->local_input_ports[chn],
-                    frames );
-
-        PaUtil_SetNonInterleavedInputChannel( &stream->bufferProcessor,
-                chn,
-                channel_buf );
-    }
-
-    for( chn = 0; chn < stream->num_outgoing_connections; chn++ )
-    {
-        jack_default_audio_sample_t *channel_buf = (jack_default_audio_sample_t*)
-            jack_port_get_buffer( stream->local_output_ports[chn],
-                    frames );
-
-        PaUtil_SetNonInterleavedOutputChannel( &stream->bufferProcessor,
-                chn,
-                channel_buf );
-    }
-
-    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor,
-            &stream->callbackResult );
-    /* We've specified a host buffer size mode where every frame should be consumed by the buffer processor */
-    assert( framesProcessed == frames );
-
-    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-
-end:
-    return result;
-}
-
-/* Update the JACK callback's stream processing queue. */
-static PaError UpdateQueue( PaJackHostApiRepresentation *hostApi )
-{
-    PaError result = paNoError;
-    int queueModified = 0;
-    const double jackSr = jack_get_sample_rate( hostApi->jack_client );
-    int err;
-
-    if( (err = pthread_mutex_trylock( &hostApi->mtx )) != 0 )
-    {
-        assert( err == EBUSY );
-        return paNoError;
-    }
-
-    if( hostApi->toAdd )
-    {
-        if( hostApi->processQueue )
-        {
-            PaJackStream *node = hostApi->processQueue;
-            /* Advance to end of queue */
-            while( node->next )
-                node = node->next;
-
-            node->next = hostApi->toAdd;
-        }
-        else
-        {
-            /* The only queue entry. */
-            hostApi->processQueue = (PaJackStream *)hostApi->toAdd;
-        }
-
-        /* If necessary, update stream state */
-        if( hostApi->toAdd->streamRepresentation.streamInfo.sampleRate != jackSr )
-            UpdateSampleRate( hostApi->toAdd, jackSr );
-
-        hostApi->toAdd = NULL;
-        queueModified = 1;
-    }
-    if( hostApi->toRemove )
-    {
-        int removed = 0;
-        PaJackStream *node = hostApi->processQueue, *prev = NULL;
-        assert( hostApi->processQueue );
-
-        while( node )
-        {
-            if( node == hostApi->toRemove )
-            {
-                if( prev )
-                    prev->next = node->next;
-                else
-                    hostApi->processQueue = (PaJackStream *)node->next;
-
-                removed = 1;
-                break;
-            }
-
-            prev = node;
-            node = node->next;
-        }
-        UNLESS( removed, paInternalError );
-        hostApi->toRemove = NULL;
-        PA_DEBUG(( "%s: Removed stream from processing queue\n", __FUNCTION__ ));
-        queueModified = 1;
-    }
-
-    if( queueModified )
-    {
-        /* Signal that we've done what was asked of us */
-        ASSERT_CALL( pthread_cond_signal( &hostApi->cond ), 0 );
-    }
-
-error:
-    ASSERT_CALL( pthread_mutex_unlock( &hostApi->mtx ), 0 );
-
-    return result;
-}
-
-/* Audio processing callback invoked periodically from JACK. */
-static int JackCallback( jack_nframes_t frames, void *userData )
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation *hostApi = (PaJackHostApiRepresentation *)userData;
-    PaJackStream *stream = NULL;
-    int xrun = hostApi->xrun;
-    hostApi->xrun = 0;
-
-    assert( hostApi );
-
-    ENSURE_PA( UpdateQueue( hostApi ) );
-
-    /* Process each stream */
-    stream = hostApi->processQueue;
-    for( ; stream; stream = stream->next )
-    {
-        if( xrun )  /* Don't override if already set */
-            stream->xrun = 1;
-
-        /* See if this stream is to be started */
-        if( stream->doStart )
-        {
-            /* If we can't obtain a lock, we'll try next time */
-            int err = pthread_mutex_trylock( &stream->hostApi->mtx );
-            if( !err )
-            {
-                if( stream->doStart )   /* Could potentially change before obtaining the lock */
-                {
-                    stream->is_active = 1;
-                    stream->doStart = 0;
-                    PA_DEBUG(( "%s: Starting stream\n", __FUNCTION__ ));
-                    ASSERT_CALL( pthread_cond_signal( &stream->hostApi->cond ), 0 );
-                    stream->callbackResult = paContinue;
-                    stream->isSilenced = 0;
-                }
-
-                ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
-            }
-            else
-                assert( err == EBUSY );
-        }
-        else if( stream->doStop || stream->doAbort )    /* Should we stop/abort stream? */
-        {
-            if( stream->callbackResult == paContinue )     /* Ok, make it stop */
-            {
-                PA_DEBUG(( "%s: Stopping stream\n", __FUNCTION__ ));
-                stream->callbackResult = stream->doStop ? paComplete : paAbort;
-            }
-        }
-
-        if( stream->is_active )
-            ENSURE_PA( RealProcess( stream, frames ) );
-        /* If we have just entered inactive state, silence output */
-        if( !stream->is_active && !stream->isSilenced )
-        {
-            int i;
-
-            /* Silence buffer after entering inactive state */
-            PA_DEBUG(( "Silencing the output\n" ));
-            for( i = 0; i < stream->num_outgoing_connections; ++i )
-            {
-                jack_default_audio_sample_t *buffer = jack_port_get_buffer( stream->local_output_ports[i], frames );
-                memset( buffer, 0, sizeof (jack_default_audio_sample_t) * frames );
-            }
-
-            stream->isSilenced = 1;
-        }
-
-        if( stream->doStop || stream->doAbort )
-        {
-            /* See if RealProcess has acted on the request */
-            if( !stream->is_active )   /* Ok, signal to the main thread that we've carried out the operation */
-            {
-                /* If we can't obtain a lock, we'll try next time */
-                int err = pthread_mutex_trylock( &stream->hostApi->mtx );
-                if( !err )
-                {
-                    stream->doStop = stream->doAbort = 0;
-                    ASSERT_CALL( pthread_cond_signal( &stream->hostApi->cond ), 0 );
-                    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
-                }
-                else
-                    assert( err == EBUSY );
-            }
-        }
-    }
-
-    return 0;
-error:
-    return -1;
-}
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaJackStream *stream = (PaJackStream*)s;
-    int i;
-
-    /* Ready the processor */
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-
-    /* Connect the ports. Note that the ports may already have been connected by someone else in
-     * the meantime, in which case JACK returns EEXIST. */
-
-    if( stream->num_incoming_connections > 0 )
-    {
-        for( i = 0; i < stream->num_incoming_connections; i++ )
-        {
-            int r = jack_connect( stream->jack_client, jack_port_name( stream->remote_output_ports[i] ),
-                    jack_port_name( stream->local_input_ports[i] ) );
-           UNLESS( 0 == r || EEXIST == r, paUnanticipatedHostError );
-        }
-    }
-
-    if( stream->num_outgoing_connections > 0 )
-    {
-        for( i = 0; i < stream->num_outgoing_connections; i++ )
-        {
-            int r = jack_connect( stream->jack_client, jack_port_name( stream->local_output_ports[i] ),
-                    jack_port_name( stream->remote_input_ports[i] ) );
-           UNLESS( 0 == r || EEXIST == r, paUnanticipatedHostError );
-        }
-    }
-
-    stream->xrun = FALSE;
-
-    /* Enable processing */
-
-    ASSERT_CALL( pthread_mutex_lock( &stream->hostApi->mtx ), 0 );
-    stream->doStart = 1;
-
-    /* Wait for stream to be started */
-    result = WaitCondition( stream->hostApi );
-    /*
-    do
-    {
-        err = pthread_cond_timedwait( &stream->hostApi->cond, &stream->hostApi->mtx, &ts );
-    } while( !stream->is_active && !err );
-    */
-    if( result != paNoError )   /* Something went wrong, call off the stream start */
-    {
-        stream->doStart = 0;
-        stream->is_active = 0;  /* Cancel any processing */
-    }
-    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
-
-    ENSURE_PA( result );
-
-    stream->is_running = TRUE;
-    PA_DEBUG(( "%s: Stream started\n", __FUNCTION__ ));
-
-error:
-    return result;
-}
-
-static PaError RealStop( PaJackStream *stream, int abort )
-{
-    PaError result = paNoError;
-    int i;
-
-    if( stream->isBlockingStream )
-        BlockingWaitEmpty ( stream );
-
-    ASSERT_CALL( pthread_mutex_lock( &stream->hostApi->mtx ), 0 );
-    if( abort )
-        stream->doAbort = 1;
-    else
-        stream->doStop = 1;
-
-    /* Wait for stream to be stopped */
-    result = WaitCondition( stream->hostApi );
-    ASSERT_CALL( pthread_mutex_unlock( &stream->hostApi->mtx ), 0 );
-    ENSURE_PA( result );
-
-    UNLESS( !stream->is_active, paInternalError );
-
-    PA_DEBUG(( "%s: Stream stopped\n", __FUNCTION__ ));
-
-error:
-    stream->is_running = FALSE;
-
-    /* Disconnect ports belonging to this stream */
-
-    if( !stream->hostApi->jackIsDown )  /* XXX: Well? */
-    {
-        for( i = 0; i < stream->num_incoming_connections; i++ )
-        {
-            if( jack_port_connected( stream->local_input_ports[i] ) )
-            {
-                UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ),
-                        paUnanticipatedHostError );
-            }
-        }
-        for( i = 0; i < stream->num_outgoing_connections; i++ )
-        {
-            if( jack_port_connected( stream->local_output_ports[i] ) )
-            {
-                UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ),
-                        paUnanticipatedHostError );
-            }
-        }
-    }
-
-    return result;
-}
-
-static PaError StopStream( PaStream *s )
-{
-    assert(s);
-    return RealStop( (PaJackStream *)s, 0 );
-}
-
-static PaError AbortStream( PaStream *s )
-{
-    assert(s);
-    return RealStop( (PaJackStream *)s, 1 );
-}
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaJackStream *stream = (PaJackStream*)s;
-    return !stream->is_running;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaJackStream *stream = (PaJackStream*)s;
-    return stream->is_active;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    PaJackStream *stream = (PaJackStream*)s;
-
-    /* A: Is this relevant?? --> TODO: what if we're recording-only? */
-    return (jack_frame_time( stream->jack_client ) - stream->t0) / (PaTime)jack_get_sample_rate( stream->jack_client );
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaJackStream *stream = (PaJackStream*)s;
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-PaError PaJack_SetClientName( const char* name )
-{
-    if( strlen( name ) > jack_client_name_size() )
-    {
-        /* OK, I don't know any better error code */
-        return paInvalidFlag;
-    }
-    clientName_ = name;
-    return paNoError;
-}
-
-PaError PaJack_GetClientName(const char** clientName)
-{
-    PaError result = paNoError;
-    PaJackHostApiRepresentation* jackHostApi = NULL;
-    PaJackHostApiRepresentation** ref = &jackHostApi;
-    ENSURE_PA( PaUtil_GetHostApiRepresentation( (PaUtilHostApiRepresentation**)ref, paJACK ) );
-    *clientName = jack_get_client_name( jackHostApi->jack_client );
-
-error:
-    return result;
-}
diff --git a/libs/portaudio/src/hostapi/oss/low_latency_tip.txt b/libs/portaudio/src/hostapi/oss/low_latency_tip.txt
deleted file mode 100644
index 2d982b79baa6d943c1fae0c7122d190ebf46c6f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3111
zcmb_e+in}l5zX^_MZtMka>JV_VPg}vVp<oQ+4XuOD#$|+2+f%qPOoOVCw<|FUL@a}
z{6$Xnkd%VF1V{uyB4@g*Pn|las&Acb7WC=^8)IqB#u|37=&j$#gZEqI3N~tDI9z7;
zc0q5O=yg6WeEZ&4_R&sqRVx?#go}8Yt>flr&clN4ctL+YE&U7Sw$Nrvj#V9W!?cY$
zC`VjAku{{~Rhz%cu2sOcwF=P{YCodiN5gbJ8_|3=JEPZ&vp2N-oMqY46z(6RY;Pke
z$K-9jli>L7sC9Nzb3>tG>YT;nPVE<Itzj-GSc;x;qQ{n+u@0CDyg-x~G{AI~&MPV`
zd%V<sk!54@98yFT3vFpN{X(sBs^P#6t1MCJ)Yio2-9`V=>#zLoZ2p=y`+zuucjt4j
znzm*?BwZ#ng2H1zTe6N`Z2Ruw#V&fWO%hDt8*A(&%LaudV*{1eZ3Uktl?S~8iB!hA
z4iV=)QKv(NT|$s>@^F8*`uOqY?g59#vK(duiF%}_blL|h_!Ov5SQ!vkvB4hHI>iZ2
zZ@277mB=AIxn5q8_F3z=)O8I;2cDTWT-$Cq%(8oM2{3g{TfO6yivs4LYSN~S3BQd&
zKGjIU<a@FuT|Ax7j~rz0NGLrpa;TFEba62`d;Ihj8gq_)YXz*O`Q%OGIX?yiU&eN+
zkVl>5>{Id9SD$XKA8uE-U#Q32C}f&fTs)xe=|im9A&2K=wb4PVT7OkZGbtoAj*?b3
z)&=B4jfFNtg;*&23oUg{2ObQGF6fD#vlGlxpq}xv04oqiA>>-9I+1$hd6NAJRRvpk
z09K`fJ+qKO;cSaH9tlIqH4n~)^h-u!y#lAcIIx8CX?cBxmn}P}sCj^`ACfMx5>^mA
z&l|Ari2eB?2|Sb@FaMThtMVjLMJW7{eR^bPxF!)&tM;S<Dx8?ZZUs%qN$Frx8@uC?
zJTS>8r^KAiAH}7*pz{}%)#9(Vj-Ggjm=Su)t=X{?UG_?nC7T#B#1!kJEZ|m7JR8qb
zB&W=lX?eR`eLn<me@t#^B3czJgq6abrxCTfMJNvW2<+5*90X769CA%Xz<IjF0Z7uq
z7KR%2$Uf77bkkbzH9C{frSeJxtUv&sXPQ`wc6Vrz(_RSZXIpfdM*NFXi{GIrR(?-G
z`A2|C5)f}yd(_bi;&ggeDh*;SrRIQa3-;Q<moN!Z>-j=A5*XT1g-+ikZoEJmA5EC6
zRslDV-6O`az2ZDbyKe=hHX!}DzTlP(*gDAP6jnrvo;Q*zkZOD0q~9Kz3t5N|ZbF`Z
zkH*;GM0gMlc9f;zgzr@d?P5CZx^7Zy6Q2@A1@9*4fJB1tlf`gB-}pgZ(=xT|Yj9oL
zwt+e@Jmlw#kts96Y>^q0#>=R8k+T><*(G6x44v`pyYc)D&CeF+ujw~4JQ~rzO-h+D
z{SIuxw)J{?>(KV#S0tO-OFwR;%D)z5GATU$E-g=g?!n_X9uukAhiZaH_+3#2I!Kh`
zC$tz3`^S=DiQX(qNc3x)hkCI7@%rlihllI+PY>&x``f$a$ImxE-Ve#gJjcwFwi_x$
z*r_@KlS&1~fwQNx*=+V(8ery2YaM?`=!B@D7)F$Fsw-OiB`hipywcl>a8ro*2Yqdr
z@|u-{As|nkv*=}X=+8c4On9hG@FIeiT))Lk{<e2I&8O$oAW4)DS>ZQHf-KH<orXVj
z0Yx|B8N&#`e~r3rA>%aI6s<qdPgg5}f8g!|fH!InROu|}p{pzoEo{;j1Oms%y+CdU
z6Iy)(CvF&S&7pn_PMm?HN_3P8`O3WCU{K1S$DEd8M$<n42Du3g`ldJ^_MEM-AIHN_
zh+Cr}`_qYBV>h~q5O)B3i<tbBt_CBylH{o?;L}z-1-HqN60}E`$cf_8LTa|z3)s$5
zp#>r8h8i1`NFBGL+-OowG}5Ic&Q9Z<w6T$>3qTP8RN+1(124i>TSCJz5w|)W&`}Qe
zslm<U<0J{<(8@8zWi85t2<b-DgGH!x!}Dm2EIrxnVI`Cpoi%BDJQjs7afkaSeO5nX
zO4jsNHT|de0j-VQq;!{9^uq6_=hMF**G~I*MQnYiTA6!<*rM6f#S;nYlu|AC8sV_x
zjmP|5z#JQ&JKd%!q)ll@2zR^u1ImDVB%r5pt{ikH^QaGS{I;?75gy-Z?m#4_Cf=Jz
gamWGkf833y2@_UMGa(?${(rFlSJ3|j<m^}f0x-@VYXATM

diff --git a/libs/portaudio/src/hostapi/oss/pa_unix_oss.c b/libs/portaudio/src/hostapi/oss/pa_unix_oss.c
deleted file mode 100644
index 942f15cdc5..0000000000
--- a/libs/portaudio/src/hostapi/oss/pa_unix_oss.c
+++ /dev/null
@@ -1,1955 +0,0 @@
-/*
- * $Id: pa_unix_oss.c 1296 2007-10-28 22:43:50Z aknudsen $
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- * OSS implementation by:
- *   Douglas Repetto
- *   Phil Burk
- *   Dominic Mazzoni
- *   Arve Knudsen
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/**
- @file
- @ingroup hostapi_src
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/poll.h>
-#include <limits.h>
-#include <semaphore.h>
-
-#ifdef HAVE_SYS_SOUNDCARD_H
-# include <sys/soundcard.h>
-# define DEVICE_NAME_BASE            "/dev/dsp"
-#elif defined(HAVE_LINUX_SOUNDCARD_H)
-# include <linux/soundcard.h>
-# define DEVICE_NAME_BASE            "/dev/dsp"
-#elif defined(HAVE_MACHINE_SOUNDCARD_H)
-# include <machine/soundcard.h> /* JH20010905 */
-# define DEVICE_NAME_BASE            "/dev/audio"
-#else
-# error No sound card header file
-#endif
-
-#include "portaudio.h"
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_unix_util.h"
-#include "pa_debugprint.h"
-
-static int sysErr_;
-static pthread_t mainThread_;
-
-/* Check return value of system call, and map it to PaError */
-#define ENSURE_(expr, code) \
-    do { \
-        if( UNLIKELY( (sysErr_ = (expr)) < 0 ) ) \
-        { \
-            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
-            if( (code) == paUnanticipatedHostError && pthread_self() == mainThread_ ) \
-            { \
-                PaUtil_SetLastHostErrorInfo( paALSA, sysErr_, strerror( errno ) ); \
-            } \
-            \
-            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = (code); \
-            goto error; \
-        } \
-    } while( 0 );
-
-#ifndef AFMT_S16_NE
-#define AFMT_S16_NE  Get_AFMT_S16_NE()
-/*********************************************************************
- * Some versions of OSS do not define AFMT_S16_NE. So check CPU.
- * PowerPC is Big Endian. X86 is Little Endian.
- */
-static int Get_AFMT_S16_NE( void )
-{
-    long testData = 1;
-    char *ptr = (char *) &testData;
-    int isLittle = ( *ptr == 1 ); /* Does address point to least significant byte? */
-    return isLittle ? AFMT_S16_LE : AFMT_S16_BE;
-}
-#endif
-
-/* PaOSSHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    PaHostApiIndex hostApiIndex;
-}
-PaOSSHostApiRepresentation;
-
-/** Per-direction structure for PaOssStream.
- *
- * Aspect StreamChannels: In case the user requests to open the same device for both capture and playback,
- * but with different number of channels we will have to adapt between the number of user and host
- * channels for at least one direction, since the configuration space is the same for both directions
- * of an OSS device.
- */
-typedef struct
-{
-    int fd;
-    const char *devName;
-    int userChannelCount, hostChannelCount;
-    int userInterleaved;
-    void *buffer;
-    PaSampleFormat userFormat, hostFormat;
-    double latency;
-    unsigned long hostFrames, numBufs;
-    void **userBuffers; /* For non-interleaved blocking */
-} PaOssStreamComponent;
-
-/** Implementation specific representation of a PaStream.
- *
- */
-typedef struct PaOssStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    PaUtilThreading threading;
-
-    int sharedDevice;
-    unsigned long framesPerHostBuffer;
-    int triggered;  /* Have the devices been triggered yet (first start) */
-
-    int isActive;
-    int isStopped;
-
-    int lastPosPtr;
-    double lastStreamBytes;
-
-    int framesProcessed;
-
-    double sampleRate;
-
-    int callbackMode;
-    int callbackStop, callbackAbort;
-
-    PaOssStreamComponent *capture, *playback;
-    unsigned long pollTimeout;
-    sem_t semaphore;
-}
-PaOssStream;
-
-typedef enum {
-    StreamMode_In,
-    StreamMode_Out
-} StreamMode;
-
-/* prototypes for functions declared in this file */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-static PaError BuildDeviceList( PaOSSHostApiRepresentation *hostApi );
-
-
-/** Initialize the OSS API implementation.
- *
- * This function will initialize host API datastructures and query host devices for information.
- *
- * Aspect DeviceCapabilities: Enumeration of host API devices is initiated from here
- *
- * Aspect FreeResources: If an error is encountered under way we have to free each resource allocated in this function,
- * this happens with the usual "error" label.
- */
-PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    PaOSSHostApiRepresentation *ossHostApi = NULL;
-
-    PA_UNLESS( ossHostApi = (PaOSSHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaOSSHostApiRepresentation) ),
-            paInsufficientMemory );
-    PA_UNLESS( ossHostApi->allocations = PaUtil_CreateAllocationGroup(), paInsufficientMemory );
-    ossHostApi->hostApiIndex = hostApiIndex;
-
-    /* Initialize host API structure */
-    *hostApi = &ossHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paOSS;
-    (*hostApi)->info.name = "OSS";
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PA_ENSURE( BuildDeviceList( ossHostApi ) );
-
-    PaUtil_InitializeStreamInterface( &ossHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable,
-                                      PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &ossHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    mainThread_ = pthread_self();
-
-    return result;
-
-error:
-    if( ossHostApi )
-    {
-        if( ossHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( ossHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( ossHostApi->allocations );
-        }
-
-        PaUtil_FreeMemory( ossHostApi );
-    }
-    return result;
-}
-
-PaError PaUtil_InitializeDeviceInfo( PaDeviceInfo *deviceInfo, const char *name, PaHostApiIndex hostApiIndex, int maxInputChannels,
-        int maxOutputChannels, PaTime defaultLowInputLatency, PaTime defaultLowOutputLatency, PaTime defaultHighInputLatency,
-        PaTime defaultHighOutputLatency, double defaultSampleRate, PaUtilAllocationGroup *allocations  )
-{
-    PaError result = paNoError;
-
-    deviceInfo->structVersion = 2;
-    if( allocations )
-    {
-        size_t len = strlen( name ) + 1;
-        PA_UNLESS( deviceInfo->name = PaUtil_GroupAllocateMemory( allocations, len ), paInsufficientMemory );
-        strncpy( (char *)deviceInfo->name, name, len );
-    }
-    else
-        deviceInfo->name = name;
-
-    deviceInfo->hostApi = hostApiIndex;
-    deviceInfo->maxInputChannels = maxInputChannels;
-    deviceInfo->maxOutputChannels = maxOutputChannels;
-    deviceInfo->defaultLowInputLatency = defaultLowInputLatency;
-    deviceInfo->defaultLowOutputLatency = defaultLowOutputLatency;
-    deviceInfo->defaultHighInputLatency = defaultHighInputLatency;
-    deviceInfo->defaultHighOutputLatency = defaultHighOutputLatency;
-    deviceInfo->defaultSampleRate = defaultSampleRate;
-
-error:
-    return result;
-}
-
-static PaError QueryDirection( const char *deviceName, StreamMode mode, double *defaultSampleRate, int *maxChannelCount,
-        double *defaultLowLatency, double *defaultHighLatency )
-{
-    PaError result = paNoError;
-    int numChannels, maxNumChannels;
-    int busy = 0;
-    int devHandle = -1;
-    int sr;
-    *maxChannelCount = 0;  /* Default value in case this fails */
-
-    if ( (devHandle = open( deviceName, (mode == StreamMode_In ? O_RDONLY : O_WRONLY) | O_NONBLOCK ))  < 0 )
-    {
-        if( errno == EBUSY || errno == EAGAIN )
-        {
-            PA_DEBUG(( "%s: Device %s busy\n", __FUNCTION__, deviceName ));
-        }
-        else
-        {
-            PA_DEBUG(( "%s: Can't access device: %s\n", __FUNCTION__, strerror( errno ) ));
-        }
-
-        return paDeviceUnavailable;
-    }
-
-    /* Negotiate for the maximum number of channels for this device. PLB20010927
-     * Consider up to 16 as the upper number of channels.
-     * Variable maxNumChannels should contain the actual upper limit after the call.
-     * Thanks to John Lazzaro and Heiko Purnhagen for suggestions.
-     */
-    maxNumChannels = 0;
-    for( numChannels = 1; numChannels <= 16; numChannels++ )
-    {
-        int temp = numChannels;
-        if( ioctl( devHandle, SNDCTL_DSP_CHANNELS, &temp ) < 0 )
-        {
-            busy = EAGAIN == errno || EBUSY == errno;
-            /* ioctl() failed so bail out if we already have stereo */
-            if( maxNumChannels >= 2 )
-                break;
-        }
-        else
-        {
-            /* ioctl() worked but bail out if it does not support numChannels.
-             * We don't want to leave gaps in the numChannels supported.
-             */
-            if( (numChannels > 2) && (temp != numChannels) )
-                break;
-            if( temp > maxNumChannels )
-                maxNumChannels = temp; /* Save maximum. */
-        }
-    }
-    /* A: We're able to open a device for capture if it's busy playing back and vice versa,
-     * but we can't configure anything */
-    if( 0 == maxNumChannels && busy )
-    {
-        result = paDeviceUnavailable;
-        goto error;
-    }
-
-    /* The above negotiation may fail for an old driver so try this older technique. */
-    if( maxNumChannels < 1 )
-    {
-        int stereo = 1;
-        if( ioctl( devHandle, SNDCTL_DSP_STEREO, &stereo ) < 0 )
-        {
-            maxNumChannels = 1;
-        }
-        else
-        {
-            maxNumChannels = (stereo) ? 2 : 1;
-        }
-        PA_DEBUG(( "%s: use SNDCTL_DSP_STEREO, maxNumChannels = %d\n", __FUNCTION__, maxNumChannels ));
-    }
-
-    /* During channel negotiation, the last ioctl() may have failed. This can
-     * also cause sample rate negotiation to fail. Hence the following, to return
-     * to a supported number of channels. SG20011005 */
-    {
-        /* use most reasonable default value */
-        int temp = PA_MIN( maxNumChannels, 2 );
-        ENSURE_( ioctl( devHandle, SNDCTL_DSP_CHANNELS, &temp ), paUnanticipatedHostError );
-    }
-
-    /* Get supported sample rate closest to 44100 Hz */
-    if( *defaultSampleRate < 0 )
-    {
-        sr = 44100;
-        if( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ) < 0 )
-        {
-            result = paUnanticipatedHostError;
-            goto error;
-        }
-
-        *defaultSampleRate = sr;
-    }
-
-    *maxChannelCount = maxNumChannels;
-    /* TODO */
-    *defaultLowLatency = 512. / *defaultSampleRate;
-    *defaultHighLatency = 2048. / *defaultSampleRate;
-
-error:
-    if( devHandle >= 0 )
-        close( devHandle );
-
-    return result;
-}
-
-/** Query OSS device.
- *
- * This is where PaDeviceInfo objects are constructed and filled in with relevant information.
- *
- * Aspect DeviceCapabilities: The inferred device capabilities are recorded in a PaDeviceInfo object that is constructed
- * in place.
- */
-static PaError QueryDevice( char *deviceName, PaOSSHostApiRepresentation *ossApi, PaDeviceInfo **deviceInfo )
-{
-    PaError result = paNoError;
-    double sampleRate = -1.;
-    int maxInputChannels, maxOutputChannels;
-    PaTime defaultLowInputLatency, defaultLowOutputLatency, defaultHighInputLatency, defaultHighOutputLatency;
-    PaError tmpRes = paNoError;
-    int busy = 0;
-    *deviceInfo = NULL;
-
-    /* douglas:
-       we have to do this querying in a slightly different order. apparently
-       some sound cards will give you different info based on their settins.
-       e.g. a card might give you stereo at 22kHz but only mono at 44kHz.
-       the correct order for OSS is: format, channels, sample rate
-    */
-
-    /* Aspect StreamChannels: The number of channels supported for a device may depend on the mode it is
-     * opened in, it may have more channels available for capture than playback and vice versa. Therefore
-     * we will open the device in both read- and write-only mode to determine the supported number.
-     */
-    if( (tmpRes = QueryDirection( deviceName, StreamMode_In, &sampleRate, &maxInputChannels, &defaultLowInputLatency,
-                &defaultHighInputLatency )) != paNoError )
-    {
-        if( tmpRes != paDeviceUnavailable )
-        {
-            PA_DEBUG(( "%s: Querying device %s for capture failed!\n", __FUNCTION__, deviceName ));
-            /* PA_ENSURE( tmpRes ); */
-        }
-        ++busy;
-    }
-    if( (tmpRes = QueryDirection( deviceName, StreamMode_Out, &sampleRate, &maxOutputChannels, &defaultLowOutputLatency,
-                &defaultHighOutputLatency )) != paNoError )
-    {
-        if( tmpRes != paDeviceUnavailable )
-        {
-            PA_DEBUG(( "%s: Querying device %s for playback failed!\n", __FUNCTION__, deviceName ));
-            /* PA_ENSURE( tmpRes ); */
-        }
-        ++busy;
-    }
-    assert( 0 <= busy && busy <= 2 );
-    if( 2 == busy )     /* Both directions are unavailable to us */
-    {
-        result = paDeviceUnavailable;
-        goto error;
-    }
-
-    PA_UNLESS( *deviceInfo = PaUtil_GroupAllocateMemory( ossApi->allocations, sizeof (PaDeviceInfo) ), paInsufficientMemory );
-    PA_ENSURE( PaUtil_InitializeDeviceInfo( *deviceInfo, deviceName, ossApi->hostApiIndex, maxInputChannels, maxOutputChannels,
-                defaultLowInputLatency, defaultLowOutputLatency, defaultHighInputLatency, defaultHighOutputLatency, sampleRate,
-                ossApi->allocations ) );
-
-error:
-    return result;
-}
-
-/** Query host devices.
- *
- * Loop over host devices and query their capabilitiesu
- *
- * Aspect DeviceCapabilities: This function calls QueryDevice on each device entry and receives a filled in PaDeviceInfo object
- * per device, these are placed in the host api representation's deviceInfos array.
- */
-static PaError BuildDeviceList( PaOSSHostApiRepresentation *ossApi )
-{
-    PaError result = paNoError;
-    PaUtilHostApiRepresentation *commonApi = &ossApi->inheritedHostApiRep;
-    int i;
-    int numDevices = 0, maxDeviceInfos = 1;
-    PaDeviceInfo **deviceInfos = NULL;
-
-    /* These two will be set to the first working input and output device, respectively */
-    commonApi->info.defaultInputDevice = paNoDevice;
-    commonApi->info.defaultOutputDevice = paNoDevice;
-
-    /* Find devices by calling QueryDevice on each
-     * potential device names.  When we find a valid one,
-     * add it to a linked list.
-     * A: Set an arbitrary of 100 devices, should probably be a smarter way. */
-
-    for( i = 0; i < 100; i++ )
-    {
-       char deviceName[32];
-       PaDeviceInfo *deviceInfo;
-       int testResult;
-       struct stat stbuf;
-
-       if( i == 0 )
-          snprintf(deviceName, sizeof (deviceName), "%s", DEVICE_NAME_BASE);
-       else
-          snprintf(deviceName, sizeof (deviceName), "%s%d", DEVICE_NAME_BASE, i);
-
-       /* PA_DEBUG(("PaOSS BuildDeviceList: trying device %s\n", deviceName )); */
-       if( stat( deviceName, &stbuf ) < 0 )
-       {
-           if( ENOENT != errno )
-               PA_DEBUG(( "%s: Error stat'ing %s: %s\n", __FUNCTION__, deviceName, strerror( errno ) ));
-           continue;
-       }
-       if( (testResult = QueryDevice( deviceName, ossApi, &deviceInfo )) != paNoError )
-       {
-           if( testResult != paDeviceUnavailable )
-               PA_ENSURE( testResult );
-
-           continue;
-       }
-
-       ++numDevices;
-       if( !deviceInfos || numDevices > maxDeviceInfos )
-       {
-           maxDeviceInfos *= 2;
-           PA_UNLESS( deviceInfos = (PaDeviceInfo **) realloc( deviceInfos, maxDeviceInfos * sizeof (PaDeviceInfo *) ),
-                   paInsufficientMemory );
-       }
-       {
-           int devIdx = numDevices - 1;
-           deviceInfos[devIdx] = deviceInfo;
-
-           if( commonApi->info.defaultInputDevice == paNoDevice && deviceInfo->maxInputChannels > 0 )
-               commonApi->info.defaultInputDevice = devIdx;
-           if( commonApi->info.defaultOutputDevice == paNoDevice && deviceInfo->maxOutputChannels > 0 )
-               commonApi->info.defaultOutputDevice = devIdx;
-       }
-    }
-
-    /* Make an array of PaDeviceInfo pointers out of the linked list */
-
-    PA_DEBUG(("PaOSS %s: Total number of devices found: %d\n", __FUNCTION__, numDevices));
-
-    commonApi->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-        ossApi->allocations, sizeof(PaDeviceInfo*) * numDevices );
-    memcpy( commonApi->deviceInfos, deviceInfos, numDevices * sizeof (PaDeviceInfo *) );
-
-    commonApi->info.deviceCount = numDevices;
-
-error:
-    free( deviceInfos );
-
-    return result;
-}
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaOSSHostApiRepresentation *ossHostApi = (PaOSSHostApiRepresentation*)hostApi;
-
-    if( ossHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( ossHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( ossHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( ossHostApi );
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaError result = paNoError;
-    PaDeviceIndex device;
-    PaDeviceInfo *deviceInfo;
-    char *deviceName;
-    int inputChannelCount, outputChannelCount;
-    int tempDevHandle = -1;
-    int flags;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-    if (inputChannelCount == 0 && outputChannelCount == 0)
-        return paInvalidChannelCount;
-
-    /* if full duplex, make sure that they're the same device */
-
-    if (inputChannelCount > 0 && outputChannelCount > 0 &&
-        inputParameters->device != outputParameters->device)
-        return paInvalidDevice;
-
-    /* if full duplex, also make sure that they're the same number of channels */
-
-    if (inputChannelCount > 0 && outputChannelCount > 0 &&
-        inputChannelCount != outputChannelCount)
-       return paInvalidChannelCount;
-
-    /* open the device so we can do more tests */
-
-    if( inputChannelCount > 0 )
-    {
-        result = PaUtil_DeviceIndexToHostApiDeviceIndex(&device, inputParameters->device, hostApi);
-        if (result != paNoError)
-            return result;
-    }
-    else
-    {
-        result = PaUtil_DeviceIndexToHostApiDeviceIndex(&device, outputParameters->device, hostApi);
-        if (result != paNoError)
-            return result;
-    }
-
-    deviceInfo = hostApi->deviceInfos[device];
-    deviceName = (char *)deviceInfo->name;
-
-    flags = O_NONBLOCK;
-    if (inputChannelCount > 0 && outputChannelCount > 0)
-       flags |= O_RDWR;
-    else if (inputChannelCount > 0)
-       flags |= O_RDONLY;
-    else
-       flags |= O_WRONLY;
-
-    ENSURE_( tempDevHandle = open( deviceInfo->name, flags ), paDeviceUnavailable );
-
-    /* PaOssStream_Configure will do the rest of the checking for us */
-    /* PA_ENSURE( PaOssStream_Configure( tempDevHandle, deviceName, outputChannelCount, &sampleRate ) ); */
-
-    /* everything succeeded! */
-
- error:
-    if( tempDevHandle >= 0 )
-        close( tempDevHandle );
-
-    return result;
-}
-
-/** Validate stream parameters.
- *
- * Aspect StreamChannels: We verify that the number of channels is within the allowed range for the device
- */
-static PaError ValidateParameters( const PaStreamParameters *parameters, const PaDeviceInfo *deviceInfo, StreamMode mode )
-{
-    int maxChans;
-
-    assert( parameters );
-
-    if( parameters->device == paUseHostApiSpecificDeviceSpecification )
-    {
-        return paInvalidDevice;
-    }
-
-    maxChans = (mode == StreamMode_In ? deviceInfo->maxInputChannels :
-        deviceInfo->maxOutputChannels);
-    if( parameters->channelCount > maxChans )
-    {
-        return paInvalidChannelCount;
-    }
-
-    return paNoError;
-}
-
-static PaError PaOssStreamComponent_Initialize( PaOssStreamComponent *component, const PaStreamParameters *parameters,
-        int callbackMode, int fd, const char *deviceName )
-{
-    PaError result = paNoError;
-    assert( component );
-
-    memset( component, 0, sizeof (PaOssStreamComponent) );
-
-    component->fd = fd;
-    component->devName = deviceName;
-    component->userChannelCount = parameters->channelCount;
-    component->userFormat = parameters->sampleFormat;
-    component->latency = parameters->suggestedLatency;
-    component->userInterleaved = !(parameters->sampleFormat & paNonInterleaved);
-
-    if( !callbackMode && !component->userInterleaved )
-    {
-        /* Pre-allocate non-interleaved user provided buffers */
-        PA_UNLESS( component->userBuffers = PaUtil_AllocateMemory( sizeof (void *) * component->userChannelCount ),
-                paInsufficientMemory );
-    }
-
-error:
-    return result;
-}
-
-static void PaOssStreamComponent_Terminate( PaOssStreamComponent *component )
-{
-    assert( component );
-
-    if( component->fd >= 0 )
-        close( component->fd );
-    if( component->buffer )
-        PaUtil_FreeMemory( component->buffer );
-
-    if( component->userBuffers )
-        PaUtil_FreeMemory( component->userBuffers );
-
-    PaUtil_FreeMemory( component );
-}
-
-static PaError ModifyBlocking( int fd, int blocking )
-{
-    PaError result = paNoError;
-    int fflags;
-
-    ENSURE_( fflags = fcntl( fd, F_GETFL ), paUnanticipatedHostError );
-
-    if( blocking )
-        fflags &= ~O_NONBLOCK;
-    else
-        fflags |= O_NONBLOCK;
-
-    ENSURE_( fcntl( fd, F_SETFL, fflags ), paUnanticipatedHostError );
-
-error:
-    return result;
-}
-
-static PaError OpenDevices( const char *idevName, const char *odevName, int *idev, int *odev )
-{
-    PaError result = paNoError;
-    int flags = O_NONBLOCK, duplex = 0;
-    int enableBits = 0;
-    *idev = *odev = -1;
-
-    if( idevName && odevName )
-    {
-        duplex = 1;
-        flags |= O_RDWR;
-    }
-    else if( idevName )
-        flags |= O_RDONLY;
-    else
-        flags |= O_WRONLY;
-
-    /* open first in nonblocking mode, in case it's busy...
-     * A: then unset the non-blocking attribute */
-    assert( flags & O_NONBLOCK );
-    if( idevName )
-    {
-        ENSURE_( *idev = open( idevName, flags ), paDeviceUnavailable );
-        PA_ENSURE( ModifyBlocking( *idev, 1 ) ); /* Blocking */
-
-        /* Initially disable */
-        enableBits = ~PCM_ENABLE_INPUT;
-        ENSURE_( ioctl( *idev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
-    }
-    if( odevName )
-    {
-        if( !idevName )
-        {
-            ENSURE_( *odev = open( odevName, flags ), paDeviceUnavailable );
-            PA_ENSURE( ModifyBlocking( *odev, 1 ) ); /* Blocking */
-
-            /* Initially disable */
-            enableBits = ~PCM_ENABLE_OUTPUT;
-            ENSURE_( ioctl( *odev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
-        }
-        else
-        {
-            ENSURE_( *odev = dup( *idev ), paUnanticipatedHostError );
-        }
-    }
-
-error:
-    return result;
-}
-
-static PaError PaOssStream_Initialize( PaOssStream *stream, const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters,
-        PaStreamCallback callback, void *userData, PaStreamFlags streamFlags,
-        PaOSSHostApiRepresentation *ossApi )
-{
-    PaError result = paNoError;
-    int idev, odev;
-    PaUtilHostApiRepresentation *hostApi = &ossApi->inheritedHostApiRep;
-    const char *idevName = NULL, *odevName = NULL;
-
-    assert( stream );
-
-    memset( stream, 0, sizeof (PaOssStream) );
-    stream->isStopped = 1;
-
-    PA_ENSURE( PaUtil_InitializeThreading( &stream->threading ) );
-
-    if( inputParameters && outputParameters )
-    {
-        if( inputParameters->device == outputParameters->device )
-            stream->sharedDevice = 1;
-    }
-
-    if( inputParameters )
-        idevName = hostApi->deviceInfos[inputParameters->device]->name;
-    if( outputParameters )
-        odevName = hostApi->deviceInfos[outputParameters->device]->name;
-    PA_ENSURE( OpenDevices( idevName, odevName, &idev, &odev ) );
-    if( inputParameters )
-    {
-        PA_UNLESS( stream->capture = PaUtil_AllocateMemory( sizeof (PaOssStreamComponent) ), paInsufficientMemory );
-        PA_ENSURE( PaOssStreamComponent_Initialize( stream->capture, inputParameters, callback != NULL, idev, idevName ) );
-    }
-    if( outputParameters )
-    {
-        PA_UNLESS( stream->playback = PaUtil_AllocateMemory( sizeof (PaOssStreamComponent) ), paInsufficientMemory );
-        PA_ENSURE( PaOssStreamComponent_Initialize( stream->playback, outputParameters, callback != NULL, odev, odevName ) );
-    }
-
-    if( callback != NULL )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &ossApi->callbackStreamInterface, callback, userData );
-        stream->callbackMode = 1;
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &ossApi->blockingStreamInterface, callback, userData );
-    }
-
-    ENSURE_( sem_init( &stream->semaphore, 0, 0 ), paInternalError );
-
-error:
-    return result;
-}
-
-static void PaOssStream_Terminate( PaOssStream *stream )
-{
-    assert( stream );
-
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    PaUtil_TerminateThreading( &stream->threading );
-
-    if( stream->capture )
-        PaOssStreamComponent_Terminate( stream->capture );
-    if( stream->playback )
-        PaOssStreamComponent_Terminate( stream->playback );
-
-    sem_destroy( &stream->semaphore );
-
-    PaUtil_FreeMemory( stream );
-}
-
-/** Translate from PA format to OSS native.
- *
- */
-static PaError Pa2OssFormat( PaSampleFormat paFormat, int *ossFormat )
-{
-    switch( paFormat )
-    {
-        case paUInt8:
-            *ossFormat = AFMT_U8;
-            break;
-        case paInt8:
-            *ossFormat = AFMT_S8;
-            break;
-        case paInt16:
-            *ossFormat = AFMT_S16_NE;
-            break;
-        default:
-            return paInternalError;     /* This shouldn't happen */
-    }
-
-    return paNoError;
-}
-
-/** Return the PA-compatible formats that this device can support.
- *
- */
-static PaError GetAvailableFormats( PaOssStreamComponent *component, PaSampleFormat *availableFormats )
-{
-    PaError result = paNoError;
-    int mask = 0;
-    PaSampleFormat frmts = 0;
-
-    ENSURE_( ioctl( component->fd, SNDCTL_DSP_GETFMTS, &mask ), paUnanticipatedHostError );
-    if( mask & AFMT_U8 )
-        frmts |= paUInt8;
-    if( mask & AFMT_S8 )
-        frmts |= paInt8;
-    if( mask & AFMT_S16_NE )
-        frmts |= paInt16;
-    else
-        result = paSampleFormatNotSupported;
-
-    *availableFormats = frmts;
-
-error:
-    return result;
-}
-
-static unsigned int PaOssStreamComponent_FrameSize( PaOssStreamComponent *component )
-{
-    return Pa_GetSampleSize( component->hostFormat ) * component->hostChannelCount;
-}
-
-/** Buffer size in bytes.
- *
- */
-static unsigned long PaOssStreamComponent_BufferSize( PaOssStreamComponent *component )
-{
-    return PaOssStreamComponent_FrameSize( component ) * component->hostFrames * component->numBufs;
-}
-
-static int CalcHigherLogTwo( int n )
-{
-    int log2 = 0;
-    while( (1<<log2) < n ) log2++;
-    return log2;
-}
-
-static PaError PaOssStreamComponent_Configure( PaOssStreamComponent *component, double sampleRate, unsigned long
-        framesPerBuffer, StreamMode streamMode, PaOssStreamComponent *master )
-{
-    PaError result = paNoError;
-    int temp, nativeFormat;
-    int sr = (int)sampleRate;
-    PaSampleFormat availableFormats = 0, hostFormat = 0;
-    int chans = component->userChannelCount;
-    int frgmt;
-    int numBufs;
-    int bytesPerBuf;
-    unsigned long bufSz;
-    unsigned long fragSz;
-    audio_buf_info bufInfo;
-
-    /* We may have a situation where only one component (the master) is configured, if both point to the same device.
-     * In that case, the second component will copy settings from the other */
-    if( !master )
-    {
-        /* Aspect BufferSettings: If framesPerBuffer is unspecified we have to infer a suitable fragment size.
-         * The hardware need not respect the requested fragment size, so we may have to adapt.
-         */
-        if( framesPerBuffer == paFramesPerBufferUnspecified )
-        {
-            bufSz = (unsigned long)(component->latency * sampleRate);
-            fragSz = bufSz / 4;
-        }
-        else
-        {
-            fragSz = framesPerBuffer;
-            bufSz = (unsigned long)(component->latency * sampleRate) + fragSz; /* Latency + 1 buffer */
-        }
-
-        PA_ENSURE( GetAvailableFormats( component, &availableFormats ) );
-        hostFormat = PaUtil_SelectClosestAvailableFormat( availableFormats, component->userFormat );
-
-        /* OSS demands at least 2 buffers, and 16 bytes per buffer */
-        numBufs = (int)PA_MAX( bufSz / fragSz, 2 );
-        bytesPerBuf = PA_MAX( fragSz * Pa_GetSampleSize( hostFormat ) * chans, 16 );
-
-        /* The fragment parameters are encoded like this:
-         * Most significant byte: number of fragments
-         * Least significant byte: exponent of fragment size (i.e., for 256, 8)
-         */
-        frgmt = (numBufs << 16) + (CalcHigherLogTwo( bytesPerBuf ) & 0xffff);
-        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SETFRAGMENT, &frgmt ), paUnanticipatedHostError );
-
-        /* A: according to the OSS programmer's guide parameters should be set in this order:
-         * format, channels, rate */
-
-        /* This format should be deemed good before we get this far */
-        PA_ENSURE( Pa2OssFormat( hostFormat, &temp ) );
-        nativeFormat = temp;
-        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SETFMT, &temp ), paUnanticipatedHostError );
-        PA_UNLESS( temp == nativeFormat, paInternalError );
-
-        /* try to set the number of channels */
-        ENSURE_( ioctl( component->fd, SNDCTL_DSP_CHANNELS, &chans ), paSampleFormatNotSupported );   /* XXX: Should be paInvalidChannelCount? */
-        /* It's possible that the minimum number of host channels is greater than what the user requested */
-        PA_UNLESS( chans >= component->userChannelCount, paInvalidChannelCount );
-
-        /* try to set the sample rate */
-        ENSURE_( ioctl( component->fd, SNDCTL_DSP_SPEED, &sr ), paInvalidSampleRate );
-
-        /* reject if there's no sample rate within 1% of the one requested */
-        if( (fabs( sampleRate - sr ) / sampleRate) > 0.01 )
-        {
-            PA_DEBUG(("%s: Wanted %f, closest sample rate was %d\n", __FUNCTION__, sampleRate, sr ));
-            PA_ENSURE( paInvalidSampleRate );
-        }
-
-        ENSURE_( ioctl( component->fd, streamMode == StreamMode_In ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &bufInfo ),
-                paUnanticipatedHostError );
-        component->numBufs = bufInfo.fragstotal;
-
-        /* This needs to be the last ioctl call before the first read/write, according to the OSS programmer's guide */
-        ENSURE_( ioctl( component->fd, SNDCTL_DSP_GETBLKSIZE, &bytesPerBuf ), paUnanticipatedHostError );
-
-        component->hostFrames = bytesPerBuf / Pa_GetSampleSize( hostFormat ) / chans;
-        component->hostChannelCount = chans;
-        component->hostFormat = hostFormat;
-    }
-    else
-    {
-        component->hostFormat = master->hostFormat;
-        component->hostFrames = master->hostFrames;
-        component->hostChannelCount = master->hostChannelCount;
-        component->numBufs = master->numBufs;
-    }
-
-    PA_UNLESS( component->buffer = PaUtil_AllocateMemory( PaOssStreamComponent_BufferSize( component ) ),
-            paInsufficientMemory );
-
-error:
-    return result;
-}
-
-static PaError PaOssStreamComponent_Read( PaOssStreamComponent *component, unsigned long *frames )
-{
-    PaError result = paNoError;
-    size_t len = *frames * PaOssStreamComponent_FrameSize( component );
-    ssize_t bytesRead;
-
-    ENSURE_( bytesRead = read( component->fd, component->buffer, len ), paUnanticipatedHostError );
-    *frames = bytesRead / PaOssStreamComponent_FrameSize( component );
-    /* TODO: Handle condition where number of frames read doesn't equal number of frames requested */
-
-error:
-    return result;
-}
-
-static PaError PaOssStreamComponent_Write( PaOssStreamComponent *component, unsigned long *frames )
-{
-    PaError result = paNoError;
-    size_t len = *frames * PaOssStreamComponent_FrameSize( component );
-    ssize_t bytesWritten;
-
-    ENSURE_( bytesWritten = write( component->fd, component->buffer, len ), paUnanticipatedHostError );
-    *frames = bytesWritten / PaOssStreamComponent_FrameSize( component );
-    /* TODO: Handle condition where number of frames written doesn't equal number of frames requested */
-
-error:
-    return result;
-}
-
-/** Configure the stream according to input/output parameters.
- *
- * Aspect StreamChannels: The minimum number of channels supported by the device may exceed that requested by
- * the user, if so we'll record the actual number of host channels and adapt later.
- */
-static PaError PaOssStream_Configure( PaOssStream *stream, double sampleRate, unsigned long framesPerBuffer,
-        double *inputLatency, double *outputLatency )
-{
-    PaError result = paNoError;
-    int duplex = stream->capture && stream->playback;
-    unsigned long framesPerHostBuffer = 0;
-
-    /* We should request full duplex first thing after opening the device */
-    if( duplex && stream->sharedDevice )
-        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETDUPLEX, 0 ), paUnanticipatedHostError );
-
-    if( stream->capture )
-    {
-        PaOssStreamComponent *component = stream->capture;
-        PA_ENSURE( PaOssStreamComponent_Configure( component, sampleRate, framesPerBuffer, StreamMode_In,
-                    NULL ) );
-
-        assert( component->hostChannelCount > 0 );
-        assert( component->hostFrames > 0 );
-
-        *inputLatency = component->hostFrames * (component->numBufs - 1) / sampleRate;
-    }
-    if( stream->playback )
-    {
-        PaOssStreamComponent *component = stream->playback, *master = stream->sharedDevice ? stream->capture : NULL;
-        PA_ENSURE( PaOssStreamComponent_Configure( component, sampleRate, framesPerBuffer, StreamMode_Out,
-                    master ) );
-
-        assert( component->hostChannelCount > 0 );
-        assert( component->hostFrames > 0 );
-
-        *outputLatency = component->hostFrames * (component->numBufs - 1) / sampleRate;
-    }
-
-    if( duplex )
-        framesPerHostBuffer = PA_MIN( stream->capture->hostFrames, stream->playback->hostFrames );
-    else if( stream->capture )
-        framesPerHostBuffer = stream->capture->hostFrames;
-    else if( stream->playback )
-        framesPerHostBuffer = stream->playback->hostFrames;
-
-    stream->framesPerHostBuffer = framesPerHostBuffer;
-    stream->pollTimeout = (int) ceil( 1e6 * framesPerHostBuffer / sampleRate );    /* Period in usecs, rounded up */
-
-    stream->sampleRate = stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-error:
-    return result;
-}
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-
-/** Open a PA OSS stream.
- *
- * Aspect StreamChannels: The number of channels is specified per direction (in/out), and can differ between the
- * two. However, OSS doesn't support separate configuration spaces for capture and playback so if both
- * directions are the same device we will demand the same number of channels. The number of channels can range
- * from 1 to the maximum supported by the device.
- *
- * Aspect BufferSettings: If framesPerBuffer != paFramesPerBufferUnspecified the number of frames per callback
- * must reflect this, in addition the host latency per device should approximate the corresponding
- * suggestedLatency. Based on these constraints we need to determine a number of frames per host buffer that
- * both capture and playback can agree on (they can be different devices), the buffer processor can adapt
- * between host and user buffer size, but the ratio should preferably be integral.
- */
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaOSSHostApiRepresentation *ossHostApi = (PaOSSHostApiRepresentation*)hostApi;
-    PaOssStream *stream = NULL;
-    int inputChannelCount = 0, outputChannelCount = 0;
-    PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0, inputHostFormat = 0, outputHostFormat = 0;
-    const PaDeviceInfo *inputDeviceInfo = 0, *outputDeviceInfo = 0;
-    int bpInitialized = 0;
-    double inLatency = 0., outLatency = 0.;
-    int i = 0;
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-    if( inputParameters )
-    {
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-        inputDeviceInfo = hostApi->deviceInfos[inputParameters->device];
-        PA_ENSURE( ValidateParameters( inputParameters, inputDeviceInfo, StreamMode_In ) );
-
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-    }
-    if( outputParameters )
-    {
-        outputDeviceInfo = hostApi->deviceInfos[outputParameters->device];
-        PA_ENSURE( ValidateParameters( outputParameters, outputDeviceInfo, StreamMode_Out ) );
-
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-    }
-
-    /* Aspect StreamChannels: We currently demand that number of input and output channels are the same, if the same
-     * device is opened for both directions
-     */
-    if( inputChannelCount > 0 && outputChannelCount > 0 )
-    {
-        if( inputParameters->device == outputParameters->device )
-        {
-            if( inputParameters->channelCount != outputParameters->channelCount )
-                return paInvalidChannelCount;
-        }
-    }
-
-    /* Round framesPerBuffer to the next power-of-two to make OSS happy. */
-    if( framesPerBuffer != paFramesPerBufferUnspecified )
-    {
-        framesPerBuffer &= INT_MAX;
-        for (i = 1; framesPerBuffer > i; i <<= 1) ;
-        framesPerBuffer = i;
-    }
-
-    /* allocate and do basic initialization of the stream structure */
-    PA_UNLESS( stream = (PaOssStream*)PaUtil_AllocateMemory( sizeof(PaOssStream) ), paInsufficientMemory );
-    PA_ENSURE( PaOssStream_Initialize( stream, inputParameters, outputParameters, streamCallback, userData, streamFlags, ossHostApi ) );
-
-    PA_ENSURE( PaOssStream_Configure( stream, sampleRate, framesPerBuffer, &inLatency, &outLatency ) );
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-    if( inputParameters )
-    {
-        inputHostFormat = stream->capture->hostFormat;
-        stream->streamRepresentation.streamInfo.inputLatency = inLatency +
-            PaUtil_GetBufferProcessorInputLatency( &stream->bufferProcessor ) / sampleRate;
-    }
-    if( outputParameters )
-    {
-        outputHostFormat = stream->playback->hostFormat;
-        stream->streamRepresentation.streamInfo.outputLatency = outLatency +
-            PaUtil_GetBufferProcessorOutputLatency( &stream->bufferProcessor ) / sampleRate;
-    }
-
-    /* Initialize buffer processor with fixed host buffer size.
-     * Aspect StreamSampleFormat: Here we commit the user and host sample formats, PA infrastructure will
-     * convert between the two.
-     */
-    PA_ENSURE( PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-              inputChannelCount, inputSampleFormat, inputHostFormat, outputChannelCount, outputSampleFormat,
-              outputHostFormat, sampleRate, streamFlags, framesPerBuffer, stream->framesPerHostBuffer,
-              paUtilFixedHostBufferSize, streamCallback, userData ) );
-    bpInitialized = 1;
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-    if( bpInitialized )
-        PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    if( stream )
-        PaOssStream_Terminate( stream );
-
-    return result;
-}
-
-/*! Poll on I/O filedescriptors.
-
-  Poll till we've determined there's data for read or write. In the full-duplex case,
-  we don't want to hang around forever waiting for either input or output frames, so
-  whenever we have a timed out filedescriptor we check if we're nearing under/overrun
-  for the other direction (critical limit set at one buffer). If so, we exit the waiting
-  state, and go on with what we got. We align the number of frames on a host buffer
-  boundary because it is possible that the buffer size differs for the two directions and
-  the host buffer size is a compromise between the two.
-  */
-static PaError PaOssStream_WaitForFrames( PaOssStream *stream, unsigned long *frames )
-{
-    PaError result = paNoError;
-    int pollPlayback = 0, pollCapture = 0;
-    int captureAvail = INT_MAX, playbackAvail = INT_MAX, commonAvail;
-    audio_buf_info bufInfo;
-    /* int ofs = 0, nfds = stream->nfds; */
-    fd_set readFds, writeFds;
-    int nfds = 0;
-    struct timeval selectTimeval = {0, 0};
-    unsigned long timeout = stream->pollTimeout;    /* In usecs */
-    int captureFd = -1, playbackFd = -1;
-
-    assert( stream );
-    assert( frames );
-
-    if( stream->capture )
-    {
-        pollCapture = 1;
-        captureFd = stream->capture->fd;
-        /* stream->capture->pfd->events = POLLIN; */
-    }
-    if( stream->playback )
-    {
-        pollPlayback = 1;
-        playbackFd = stream->playback->fd;
-        /* stream->playback->pfd->events = POLLOUT; */
-    }
-
-    FD_ZERO( &readFds );
-    FD_ZERO( &writeFds );
-
-    while( pollPlayback || pollCapture )
-    {
-        pthread_testcancel();
-
-        /* select may modify the timeout parameter */
-        selectTimeval.tv_usec = timeout;
-        nfds = 0;
-
-        if( pollCapture )
-        {
-            FD_SET( captureFd, &readFds );
-            nfds = captureFd + 1;
-        }
-        if( pollPlayback )
-        {
-            FD_SET( playbackFd, &writeFds );
-            nfds = PA_MAX( nfds, playbackFd + 1 );
-        }
-        ENSURE_( select( nfds, &readFds, &writeFds, NULL, &selectTimeval ), paUnanticipatedHostError );
-        /*
-        if( poll( stream->pfds + ofs, nfds, stream->pollTimeout ) < 0 )
-        {
-
-            ENSURE_( -1, paUnanticipatedHostError );
-        }
-        */
-        pthread_testcancel();
-
-        if( pollCapture )
-        {
-            if( FD_ISSET( captureFd, &readFds ) )
-            {
-                FD_CLR( captureFd, &readFds );
-                pollCapture = 0;
-            }
-            /*
-            if( stream->capture->pfd->revents & POLLIN )
-            {
-                --nfds;
-                ++ofs;
-                pollCapture = 0;
-            }
-            */
-            else if( stream->playback ) /* Timed out, go on with playback? */
-            {
-                /*PA_DEBUG(( "%s: Trying to poll again for capture frames, pollTimeout: %d\n",
-                            __FUNCTION__, stream->pollTimeout ));*/
-            }
-        }
-        if( pollPlayback )
-        {
-            if( FD_ISSET( playbackFd, &writeFds ) )
-            {
-                FD_CLR( playbackFd, &writeFds );
-                pollPlayback = 0;
-            }
-            /*
-            if( stream->playback->pfd->revents & POLLOUT )
-            {
-                --nfds;
-                pollPlayback = 0;
-            }
-            */
-            else if( stream->capture )  /* Timed out, go on with capture? */
-            {
-                /*PA_DEBUG(( "%s: Trying to poll again for playback frames, pollTimeout: %d\n\n",
-                            __FUNCTION__, stream->pollTimeout ));*/
-            }
-        }
-    }
-
-    if( stream->capture )
-    {
-        ENSURE_( ioctl( captureFd, SNDCTL_DSP_GETISPACE, &bufInfo ), paUnanticipatedHostError );
-        captureAvail = bufInfo.fragments * stream->capture->hostFrames;
-        if( !captureAvail )
-            PA_DEBUG(( "%s: captureAvail: 0\n", __FUNCTION__ ));
-
-        captureAvail = captureAvail == 0 ? INT_MAX : captureAvail;      /* Disregard if zero */
-    }
-    if( stream->playback )
-    {
-        ENSURE_( ioctl( playbackFd, SNDCTL_DSP_GETOSPACE, &bufInfo ), paUnanticipatedHostError );
-        playbackAvail = bufInfo.fragments * stream->playback->hostFrames;
-        if( !playbackAvail )
-        {
-            PA_DEBUG(( "%s: playbackAvail: 0\n", __FUNCTION__ ));
-        }
-
-        playbackAvail = playbackAvail == 0 ? INT_MAX : playbackAvail;      /* Disregard if zero */
-    }
-
-    commonAvail = PA_MIN( captureAvail, playbackAvail );
-    if( commonAvail == INT_MAX )
-        commonAvail = 0;
-    commonAvail -= commonAvail % stream->framesPerHostBuffer;
-
-    assert( commonAvail != INT_MAX );
-    assert( commonAvail >= 0 );
-    *frames = commonAvail;
-
-error:
-    return result;
-}
-
-/** Prepare stream for capture/playback.
- *
- * In order to synchronize capture and playback properly we use the SETTRIGGER command.
- */
-static PaError PaOssStream_Prepare( PaOssStream *stream )
-{
-    PaError result = paNoError;
-    int enableBits = 0;
-
-    if( stream->triggered )
-        return result;
-
-    if( stream->playback )
-    {
-        size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
-        memset( stream->playback->buffer, 0, bufSz );
-
-        /* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
-         * OSS will complain. */
-        PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
-        while (1)
-        {
-            if( write( stream->playback->fd, stream->playback->buffer, bufSz ) < 0 )
-                break;
-        }
-        PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) );
-    }
-
-    if( stream->sharedDevice )
-    {
-        enableBits = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT;
-        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
-    }
-    else
-    {
-        if( stream->capture )
-        {
-            enableBits = PCM_ENABLE_INPUT;
-            ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
-        }
-        if( stream->playback )
-        {
-            enableBits = PCM_ENABLE_OUTPUT;
-            ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
-        }
-    }
-
-    /* Ok, we have triggered the stream */
-    stream->triggered = 1;
-
-error:
-    return result;
-}
-
-/** Stop audio processing
- *
- */
-static PaError PaOssStream_Stop( PaOssStream *stream, int abort )
-{
-    PaError result = paNoError;
-
-    /* Looks like the only safe way to stop audio without reopening the device is SNDCTL_DSP_POST.
-     * Also disable capture/playback till the stream is started again */
-    if( stream->capture )
-    {
-        ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_POST, 0 ), paUnanticipatedHostError );
-    }
-    if( stream->playback && !stream->sharedDevice )
-    {
-        ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_POST, 0 ), paUnanticipatedHostError );
-    }
-
-error:
-    return result;
-}
-
-/** Clean up after thread exit.
- *
- * Aspect StreamState: If the user has registered a streamFinishedCallback it will be called here
- */
-static void OnExit( void *data )
-{
-    PaOssStream *stream = (PaOssStream *) data;
-    assert( data );
-
-    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
-
-    PaOssStream_Stop( stream, stream->callbackAbort );
-
-    PA_DEBUG(( "OnExit: Stoppage\n" ));
-
-    /* Eventually notify user all buffers have played */
-    if( stream->streamRepresentation.streamFinishedCallback )
-        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-
-    stream->callbackAbort = 0;      /* Clear state */
-    stream->isActive = 0;
-}
-
-static PaError SetUpBuffers( PaOssStream *stream, unsigned long framesAvail )
-{
-    PaError result = paNoError;
-
-    if( stream->capture )
-    {
-        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, stream->capture->buffer,
-                stream->capture->hostChannelCount );
-        PaUtil_SetInputFrameCount( &stream->bufferProcessor, framesAvail );
-    }
-    if( stream->playback )
-    {
-        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, stream->playback->buffer,
-                stream->playback->hostChannelCount );
-        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, framesAvail );
-    }
-
-    return result;
-}
-
-/** Thread procedure for callback processing.
- *
- * Aspect StreamState: StartStream will wait on this to initiate audio processing, useful in case the
- * callback should be used for buffer priming. When the stream is cancelled a separate function will
- * take care of the transition to the Callback Finished state (the stream isn't considered Stopped
- * before StopStream() or AbortStream() are called).
- */
-static void *PaOSS_AudioThreadProc( void *userData )
-{
-    PaError result = paNoError;
-    PaOssStream *stream = (PaOssStream*)userData;
-    unsigned long framesAvail = 0, framesProcessed = 0;
-    int callbackResult = paContinue;
-    int triggered = stream->triggered;  /* See if SNDCTL_DSP_TRIGGER has been issued already */
-    int initiateProcessing = triggered;    /* Already triggered? */
-    PaStreamCallbackFlags cbFlags = 0;  /* We might want to keep state across iterations */
-    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /* TODO: IMPLEMENT ME */
-
-    /*
-#if ( SOUND_VERSION > 0x030904 )
-        audio_errinfo errinfo;
-#endif
-*/
-
-    assert( stream );
-
-    pthread_cleanup_push( &OnExit, stream );	/* Execute OnExit when exiting */
-
-    /* The first time the stream is started we use SNDCTL_DSP_TRIGGER to accurately start capture and
-     * playback in sync, when the stream is restarted after being stopped we simply start by reading/
-     * writing.
-     */
-    PA_ENSURE( PaOssStream_Prepare( stream ) );
-
-    /* If we are to initiate processing implicitly by reading/writing data, we start off in blocking mode */
-    if( initiateProcessing )
-    {
-        /* Make sure devices are in blocking mode */
-        if( stream->capture )
-            ModifyBlocking( stream->capture->fd, 1 );
-        if( stream->playback )
-            ModifyBlocking( stream->playback->fd, 1 );
-    }
-
-    while( 1 )
-    {
-        pthread_testcancel();
-
-        if( stream->callbackStop && callbackResult == paContinue )
-        {
-            PA_DEBUG(( "Setting callbackResult to paComplete\n" ));
-            callbackResult = paComplete;
-        }
-
-        /* Aspect StreamState: Because of the messy OSS scheme we can't explicitly trigger device start unless
-         * the stream has been recently started, we will have to go right ahead and read/write in blocking
-         * fashion to trigger operation. Therefore we begin with processing one host buffer before we switch
-         * to non-blocking mode.
-         */
-        if( !initiateProcessing )
-        {
-            /* Wait on available frames */
-            PA_ENSURE( PaOssStream_WaitForFrames( stream, &framesAvail ) );
-            assert( framesAvail % stream->framesPerHostBuffer == 0 );
-        }
-        else
-        {
-            framesAvail = stream->framesPerHostBuffer;
-        }
-
-        while( framesAvail > 0 )
-        {
-            unsigned long frames = framesAvail;
-
-            pthread_testcancel();
-
-            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-            /* Read data */
-            if ( stream->capture )
-            {
-                PA_ENSURE( PaOssStreamComponent_Read( stream->capture, &frames ) );
-                if( frames < framesAvail )
-                {
-                    PA_DEBUG(( "Read %lu less frames than requested\n", framesAvail - frames ));
-                    framesAvail = frames;
-                }
-            }
-
-#if ( SOUND_VERSION >= 0x030904 )
-            /*
-               Check with OSS to see if there have been any under/overruns
-               since last time we checked.
-               */
-            /*
-            if( ioctl( stream->deviceHandle, SNDCTL_DSP_GETERROR, &errinfo ) >= 0 )
-            {
-                if( errinfo.play_underruns )
-                    cbFlags |= paOutputUnderflow ;
-                if( errinfo.record_underruns )
-                    cbFlags |= paInputUnderflow ;
-            }
-            else
-                PA_DEBUG(( "SNDCTL_DSP_GETERROR command failed: %s\n", strerror( errno ) ));
-                */
-#endif
-
-            PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo,
-                    cbFlags );
-            cbFlags = 0;
-            PA_ENSURE( SetUpBuffers( stream, framesAvail ) );
-
-            framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor,
-                    &callbackResult );
-            assert( framesProcessed == framesAvail );
-            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-
-            if ( stream->playback )
-            {
-                frames = framesAvail;
-
-                PA_ENSURE( PaOssStreamComponent_Write( stream->playback, &frames ) );
-                if( frames < framesAvail )
-                {
-                    /* TODO: handle bytesWritten != bytesRequested (slippage?) */
-                    PA_DEBUG(( "Wrote %lu less frames than requested\n", framesAvail - frames ));
-                }
-            }
-
-            framesAvail -= framesProcessed;
-            stream->framesProcessed += framesProcessed;
-
-            if( callbackResult != paContinue )
-                break;
-        }
-
-        if( initiateProcessing || !triggered )
-        {
-            /* Non-blocking */
-            if( stream->capture )
-                PA_ENSURE( ModifyBlocking( stream->capture->fd, 0 ) );
-            if( stream->playback && !stream->sharedDevice )
-                PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
-
-            initiateProcessing = 0;
-            sem_post( &stream->semaphore );
-        }
-
-        if( callbackResult != paContinue )
-        {
-            stream->callbackAbort = callbackResult == paAbort;
-            if( stream->callbackAbort || PaUtil_IsBufferProcessorOutputEmpty( &stream->bufferProcessor ) )
-                break;
-        }
-    }
-
-    pthread_cleanup_pop( 1 );
-
-error:
-    pthread_exit( NULL );
-}
-
-/** Close the stream.
- *
- */
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaOssStream *stream = (PaOssStream*)s;
-
-    assert( stream );
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaOssStream_Terminate( stream );
-
-    return result;
-}
-
-/** Start the stream.
- *
- * Aspect StreamState: After returning, the stream shall be in the Active state, implying that an eventual
- * callback will be repeatedly called in a separate thread. If a separate thread is started this function
- * will block untill it has started processing audio, otherwise audio processing is started directly.
- */
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaOssStream *stream = (PaOssStream*)s;
-
-    stream->isActive = 1;
-    stream->isStopped = 0;
-    stream->lastPosPtr = 0;
-    stream->lastStreamBytes = 0;
-    stream->framesProcessed = 0;
-
-    /* only use the thread for callback streams */
-    if( stream->bufferProcessor.streamCallback )
-    {
-        PA_ENSURE( PaUtil_StartThreading( &stream->threading, &PaOSS_AudioThreadProc, stream ) );
-        sem_wait( &stream->semaphore );
-    }
-    else
-        PA_ENSURE( PaOssStream_Prepare( stream ) );
-
-error:
-    return result;
-}
-
-static PaError RealStop( PaOssStream *stream, int abort )
-{
-    PaError result = paNoError;
-
-    if( stream->callbackMode )
-    {
-        if( abort )
-            stream->callbackAbort = 1;
-        else
-            stream->callbackStop = 1;
-
-        PA_ENSURE( PaUtil_CancelThreading( &stream->threading, !abort, NULL ) );
-
-        stream->callbackStop = stream->callbackAbort = 0;
-    }
-    else
-        PA_ENSURE( PaOssStream_Stop( stream, abort ) );
-
-    stream->isStopped = 1;
-
-error:
-    return result;
-}
-
-/** Stop the stream.
- *
- * Aspect StreamState: This will cause the stream to transition to the Stopped state, playing all enqueued
- * buffers.
- */
-static PaError StopStream( PaStream *s )
-{
-    return RealStop( (PaOssStream *)s, 0 );
-}
-
-/** Abort the stream.
- *
- * Aspect StreamState: This will cause the stream to transition to the Stopped state, discarding all enqueued
- * buffers. Note that the buffers are not currently correctly discarded, this is difficult without closing
- * the OSS device.
- */
-static PaError AbortStream( PaStream *s )
-{
-    return RealStop( (PaOssStream *)s, 1 );
-}
-
-/** Is the stream in the Stopped state.
- *
- */
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-
-    return (stream->isStopped);
-}
-
-/** Is the stream in the Active state.
- *
- */
-static PaError IsStreamActive( PaStream *s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-
-    return (stream->isActive);
-}
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-    count_info info;
-    int delta;
-
-    if( stream->playback ) {
-        if( ioctl( stream->playback->fd, SNDCTL_DSP_GETOPTR, &info) == 0 ) {
-            delta = ( info.bytes - stream->lastPosPtr ) /* & 0x000FFFFF*/;
-            return (float)(stream->lastStreamBytes + delta) / PaOssStreamComponent_FrameSize( stream->playback ) / stream->sampleRate;
-        }
-    }
-    else {
-        if (ioctl( stream->capture->fd, SNDCTL_DSP_GETIPTR, &info) == 0) {
-            delta = (info.bytes - stream->lastPosPtr) /*& 0x000FFFFF*/;
-            return (float)(stream->lastStreamBytes + delta) / PaOssStreamComponent_FrameSize( stream->capture ) / stream->sampleRate;
-        }
-    }
-
-    /* the ioctl failed, but we can still give a coarse estimate */
-
-    return stream->framesProcessed / stream->sampleRate;
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-    int bytesRequested, bytesRead;
-    unsigned long framesRequested;
-    void *userBuffer;
-
-    /* If user input is non-interleaved, PaUtil_CopyInput will manipulate the channel pointers,
-     * so we copy the user provided pointers */
-    if( stream->bufferProcessor.userInputIsInterleaved )
-        userBuffer = buffer;
-    else /* Copy channels into local array */
-    {
-        userBuffer = stream->capture->userBuffers;
-        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->capture->userChannelCount );
-    }
-
-    while( frames )
-    {
-        framesRequested = PA_MIN( frames, stream->capture->hostFrames );
-
-	bytesRequested = framesRequested * PaOssStreamComponent_FrameSize( stream->capture );
-	bytesRead = read( stream->capture->fd, stream->capture->buffer, bytesRequested );
-	if ( bytesRequested != bytesRead )
-	    return paUnanticipatedHostError;
-
-	PaUtil_SetInputFrameCount( &stream->bufferProcessor, stream->capture->hostFrames );
-	PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, 0, stream->capture->buffer, stream->capture->hostChannelCount );
-        PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, framesRequested );
-	frames -= framesRequested;
-    }
-    return paNoError;
-}
-
-
-static PaError WriteStream( PaStream *s, const void *buffer, unsigned long frames )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-    int bytesRequested, bytesWritten;
-    unsigned long framesConverted;
-    const void *userBuffer;
-
-    /* If user output is non-interleaved, PaUtil_CopyOutput will manipulate the channel pointers,
-     * so we copy the user provided pointers */
-    if( stream->bufferProcessor.userOutputIsInterleaved )
-        userBuffer = buffer;
-    else
-    {
-        /* Copy channels into local array */
-        userBuffer = stream->playback->userBuffers;
-        memcpy( (void *)userBuffer, buffer, sizeof (void *) * stream->playback->userChannelCount );
-    }
-
-    while( frames )
-    {
-	PaUtil_SetOutputFrameCount( &stream->bufferProcessor, stream->playback->hostFrames );
-	PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, 0, stream->playback->buffer, stream->playback->hostChannelCount );
-
-	framesConverted = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, frames );
-	frames -= framesConverted;
-
-	bytesRequested = framesConverted * PaOssStreamComponent_FrameSize( stream->playback );
-	bytesWritten = write( stream->playback->fd, stream->playback->buffer, bytesRequested );
-
-	if ( bytesRequested != bytesWritten )
-	    return paUnanticipatedHostError;
-    }
-    return paNoError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-    audio_buf_info info;
-
-    if( ioctl( stream->capture->fd, SNDCTL_DSP_GETISPACE, &info ) < 0 )
-        return paUnanticipatedHostError;
-    return info.fragments * stream->capture->hostFrames;
-}
-
-
-/* TODO: Compute number of allocated bytes somewhere else, can we use ODELAY with capture */
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaOssStream *stream = (PaOssStream*)s;
-    int delay = 0;
-
-    if( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ) < 0 )
-        return paUnanticipatedHostError;
-
-    return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
-}
-
diff --git a/libs/portaudio/src/hostapi/oss/recplay.c b/libs/portaudio/src/hostapi/oss/recplay.c
deleted file mode 100644
index 9d4c78cfa3..0000000000
--- a/libs/portaudio/src/hostapi/oss/recplay.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * recplay.c
- * Phil Burk
- * Minimal record and playback test.
- * 
- */
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#ifndef __STDC__
-/* #include <getopt.h> */
-#endif /* __STDC__ */
-#include <fcntl.h>
-#ifdef __STDC__
-#include <string.h>
-#else /* __STDC__ */
-#include <strings.h>
-#endif /* __STDC__ */
-#include <sys/soundcard.h>
-
-#define NUM_BYTES   (64*1024)
-#define BLOCK_SIZE   (4*1024)
-
-#define AUDIO "/dev/dsp"
-
-char buffer[NUM_BYTES];
-
-int audioDev = 0;
-
-main (int argc, char *argv[])
-{
-    int   numLeft;
-    char *ptr;
-    int   num;
-    int   samplesize;
-
-    /********** RECORD ********************/
-    /* Open audio device. */
-    audioDev = open (AUDIO, O_RDONLY, 0);
-    if (audioDev == -1)
-    {
-        perror (AUDIO);
-        exit (-1);
-    }
-
-    /* Set to 16 bit samples. */
-    samplesize = 16;
-    ioctl(audioDev, SNDCTL_DSP_SAMPLESIZE, &samplesize);
-    if (samplesize != 16)
-    {
-        perror("Unable to set the sample size.");
-        exit(-1);
-    }
-
-    /* Record in blocks */
-    printf("Begin recording.\n");
-    numLeft = NUM_BYTES;
-    ptr = buffer;
-    while( numLeft >= BLOCK_SIZE )
-    {
-        if ( (num = read (audioDev, ptr, BLOCK_SIZE)) < 0 )
-        {
-            perror (AUDIO);
-            exit (-1);
-        }
-        else
-        {
-            printf("Read %d bytes\n", num);
-            ptr += num;
-            numLeft -= num;
-        }
-    }
-
-    close( audioDev );
-
-    /********** PLAYBACK ********************/
-    /* Open audio device for writing. */
-    audioDev = open (AUDIO, O_WRONLY, 0);
-    if (audioDev == -1)
-    {
-        perror (AUDIO);
-        exit (-1);
-    }
-
-    /* Set to 16 bit samples. */
-    samplesize = 16;
-    ioctl(audioDev, SNDCTL_DSP_SAMPLESIZE, &samplesize);
-    if (samplesize != 16)
-    {
-        perror("Unable to set the sample size.");
-        exit(-1);
-    }
-
-    /* Play in blocks */
-    printf("Begin playing.\n");
-    numLeft = NUM_BYTES;
-    ptr = buffer;
-    while( numLeft >= BLOCK_SIZE )
-    {
-        if ( (num = write (audioDev, ptr, BLOCK_SIZE)) < 0 )
-        {
-            perror (AUDIO);
-            exit (-1);
-        }
-        else
-        {
-            printf("Wrote %d bytes\n", num);
-            ptr += num;
-            numLeft -= num;
-        }
-    }
-
-    close( audioDev );
-}
diff --git a/libs/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp b/libs/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
deleted file mode 100644
index 3c3ea0001e..0000000000
--- a/libs/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
+++ /dev/null
@@ -1,1911 +0,0 @@
-/*
- * Portable Audio I/O Library WASAPI implementation
- * Copyright (c) 2006-2007 David Viens
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup hostaip_src
- @brief WASAPI implementation of support for a host API.
-
- @note pa_wasapi currently requires VC 2005, and the latest Vista SDK
-*/
-
-#if _MSC_VER >= 1400
-#include <windows.h>
-#include <MMReg.h>  //must be before other Wasapi headers
-#include <strsafe.h>
-#include <mmdeviceapi.h>
-#include <Avrt.h>
-#include <audioclient.h>
-#include <Endpointvolume.h>
-
-#include <KsMedia.h>
-#include <functiondiscoverykeys.h>  // PKEY_Device_FriendlyName
-#endif
-
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_debugprint.h"
-
-
-/*
-  davidv : work in progress. try using with 48000 , then 44100
-  and shared mode FIRST.
- */
-
-#define PORTAUDIO_SHAREMODE     AUDCLNT_SHAREMODE_SHARED
-//#define PORTAUDIO_SHAREMODE   AUDCLNT_SHAREMODE_EXCLUSIVE
-
-
-
-/* prototypes for functions declared in this file */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaWinWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-
-/* IMPLEMENT ME: a macro like the following one should be used for reporting
- host errors */
-#define PA_SKELETON_SET_LAST_HOST_ERROR( errorCode, errorText ) \
-    PaUtil_SetLastHostErrorInfo( paInDevelopment, errorCode, errorText )
-
-/* PaWinWasapiHostApiRepresentation - host api datastructure specific to this implementation */
-
-
-
-//dummy entry point for other compilers and sdks
-//currently built using RC1 SDK (5600)
-#if _MSC_VER < 1400
-
-PaError PaWinWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex ){
-    return paNoError;
-}
-
-#else
-
-
-
-
-#define MAX_STR_LEN 512
-
-/*
- These are fields that can be gathered from IDevice
- and IAudioDevice PRIOR to Initialize, and done in first pass
- i assume that neither of these will cause the Driver to "load",
- but again, who knows how they implement their stuff
- */
-typedef struct PaWinWasapiDeviceInfo
-{
-    //hmm is it wise to keep a reference until Terminate?
-    //TODO Check if that interface requires the driver to be loaded!
-    IMMDevice * device;
-
-    //Fields filled from IDevice
-    //from GetId
-    WCHAR szDeviceID[MAX_STR_LEN];
-    //from GetState
-    DWORD state;
-
-    //Fields filled from IMMEndpoint'sGetDataFlow
-    EDataFlow  flow;
-
-    //Fields filled from IAudioDevice (_prior_ to Initialize)
-    //from GetDevicePeriod(
-    REFERENCE_TIME  DefaultDevicePeriod;
-    REFERENCE_TIME  MinimumDevicePeriod;
-    //from GetMixFormat
-    WAVEFORMATEX   *MixFormat;//needs to be CoTaskMemFree'd after use!
-
-} PaWinWasapiDeviceInfo;
-
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-
-    /* implementation specific data goes here */
-
-    //in case we later need the synch
-    IMMDeviceEnumerator * enumerator;
-
-    //this is the REAL number of devices, whether they are usefull to PA or not!
-    UINT deviceCount;
-
-    WCHAR defaultRenderer [MAX_STR_LEN];
-    WCHAR defaultCapturer [MAX_STR_LEN];
-
-    PaWinWasapiDeviceInfo   *devInfo;
-}PaWinWasapiHostApiRepresentation;
-
-
-/* PaWinWasapiStream - a stream data structure specifically for this implementation */
-
-typedef struct PaWinWasapiSubStream{
-    IAudioClient        *client;
-    WAVEFORMATEXTENSIBLE wavex;
-    UINT32               bufferSize;
-    REFERENCE_TIME       latency;
-    REFERENCE_TIME       period;
-    unsigned long framesPerHostCallback; /* just an example */
-}PaWinWasapiSubStream;
-
-typedef struct PaWinWasapiStream
-{ /* IMPLEMENT ME: rename this */
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    /* IMPLEMENT ME:
-            - implementation specific data goes here
-    */
-
-
-    //input
-	PaWinWasapiSubStream in;
-    IAudioCaptureClient *cclient;
-    IAudioEndpointVolume *inVol;
-	//output
-	PaWinWasapiSubStream out;
-    IAudioRenderClient  *rclient;
-	IAudioEndpointVolume *outVol;
-
-    bool running;
-    bool closeRequest;
-
-    DWORD dwThreadId;
-    HANDLE hThread;
-	HANDLE hNotificationEvent; 
-
-    GUID  session;
-
-}PaWinWasapiStream;
-
-#define PRINT(x) PA_DEBUG(x);
-
-void
-logAUDCLNT_E(HRESULT res){
-
-    char *text = 0;
-    switch(res){
-        case S_OK: return; break;
-        case E_POINTER                              :text ="E_POINTER"; break;
-        case E_INVALIDARG                           :text ="E_INVALIDARG"; break;
-
-        case AUDCLNT_E_NOT_INITIALIZED              :text ="AUDCLNT_E_NOT_INITIALIZED"; break;
-        case AUDCLNT_E_ALREADY_INITIALIZED          :text ="AUDCLNT_E_ALREADY_INITIALIZED"; break;
-        case AUDCLNT_E_WRONG_ENDPOINT_TYPE          :text ="AUDCLNT_E_WRONG_ENDPOINT_TYPE"; break;
-        case AUDCLNT_E_DEVICE_INVALIDATED           :text ="AUDCLNT_E_DEVICE_INVALIDATED"; break;
-        case AUDCLNT_E_NOT_STOPPED                  :text ="AUDCLNT_E_NOT_STOPPED"; break;
-        case AUDCLNT_E_BUFFER_TOO_LARGE             :text ="AUDCLNT_E_BUFFER_TOO_LARGE"; break;
-        case AUDCLNT_E_OUT_OF_ORDER                 :text ="AUDCLNT_E_OUT_OF_ORDER"; break;
-        case AUDCLNT_E_UNSUPPORTED_FORMAT           :text ="AUDCLNT_E_UNSUPPORTED_FORMAT"; break;
-        case AUDCLNT_E_INVALID_SIZE                 :text ="AUDCLNT_E_INVALID_SIZE"; break;
-        case AUDCLNT_E_DEVICE_IN_USE                :text ="AUDCLNT_E_DEVICE_IN_USE"; break;
-        case AUDCLNT_E_BUFFER_OPERATION_PENDING     :text ="AUDCLNT_E_BUFFER_OPERATION_PENDING"; break;
-        case AUDCLNT_E_THREAD_NOT_REGISTERED        :text ="AUDCLNT_E_THREAD_NOT_REGISTERED"; break;      
-		case AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED   :text ="AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED"; break;
-        case AUDCLNT_E_ENDPOINT_CREATE_FAILED       :text ="AUDCLNT_E_ENDPOINT_CREATE_FAILED"; break;
-        case AUDCLNT_E_SERVICE_NOT_RUNNING          :text ="AUDCLNT_E_SERVICE_NOT_RUNNING"; break;
-     //  case AUDCLNT_E_CPUUSAGE_EXCEEDED            :text ="AUDCLNT_E_CPUUSAGE_EXCEEDED"; break;
-     //Header error?
-        case AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED     :text ="AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED"; break;
-        case AUDCLNT_E_EXCLUSIVE_MODE_ONLY          :text ="AUDCLNT_E_EXCLUSIVE_MODE_ONLY"; break;
-        case AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL :text ="AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL"; break;
-        case AUDCLNT_E_EVENTHANDLE_NOT_SET          :text ="AUDCLNT_E_EVENTHANDLE_NOT_SET"; break;
-        case AUDCLNT_E_INCORRECT_BUFFER_SIZE        :text ="AUDCLNT_E_INCORRECT_BUFFER_SIZE"; break;
-        case AUDCLNT_E_BUFFER_SIZE_ERROR            :text ="AUDCLNT_E_BUFFER_SIZE_ERROR"; break;
-        case AUDCLNT_S_BUFFER_EMPTY                 :text ="AUDCLNT_S_BUFFER_EMPTY"; break;
-        case AUDCLNT_S_THREAD_ALREADY_REGISTERED    :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break;
-        default:
-            text =" dunno!";
-            return ;
-        break;
-
-    }
-    PRINT(("WASAPI ERROR HRESULT: 0x%X : %s\n",res,text));
-}
-
-inline double
-nano100ToMillis(const REFERENCE_TIME &ref){
-    //  1 nano = 0.000000001 seconds
-    //100 nano = 0.0000001   seconds
-    //100 nano = 0.0001   milliseconds
-    return ((double)ref)*0.0001;
-}
-
-inline double
-nano100ToSeconds(const REFERENCE_TIME &ref){
-    //  1 nano = 0.000000001 seconds
-    //100 nano = 0.0000001   seconds
-    //100 nano = 0.0001   milliseconds
-    return ((double)ref)*0.0000001;
-}
-
-#ifndef IF_FAILED_JUMP
-#define IF_FAILED_JUMP(hr, label) if(FAILED(hr)) goto label;
-#endif
-
-
-
-//AVRT is the new "multimedia schedulling stuff"
-
-typedef BOOL   (WINAPI *FAvRtCreateThreadOrderingGroup) (PHANDLE,PLARGE_INTEGER,GUID*,PLARGE_INTEGER);
-typedef BOOL   (WINAPI *FAvRtDeleteThreadOrderingGroup) (HANDLE);
-typedef BOOL   (WINAPI *FAvRtWaitOnThreadOrderingGroup) (HANDLE);
-typedef HANDLE (WINAPI *FAvSetMmThreadCharacteristics)  (LPCTSTR,LPDWORD);
-typedef BOOL   (WINAPI *FAvSetMmThreadPriority)         (HANDLE,AVRT_PRIORITY);
-
-HMODULE  hDInputDLL = 0;
-FAvRtCreateThreadOrderingGroup pAvRtCreateThreadOrderingGroup=0;
-FAvRtDeleteThreadOrderingGroup pAvRtDeleteThreadOrderingGroup=0;
-FAvRtWaitOnThreadOrderingGroup pAvRtWaitOnThreadOrderingGroup=0;
-FAvSetMmThreadCharacteristics  pAvSetMmThreadCharacteristics=0;
-FAvSetMmThreadPriority         pAvSetMmThreadPriority=0;
-
-
-
-#define setupPTR(fun, type, name)  {                                                        \
-                                        fun = (type) GetProcAddress(hDInputDLL,name);       \
-                                        if(fun == NULL) {                                   \
-                                            PRINT(("GetProcAddr failed for %s" ,name));     \
-                                            return false;                                   \
-                                        }                                                   \
-                                    }                                                       \
-
-bool
-setupAVRT(){
-
-    hDInputDLL = LoadLibraryA("avrt.dll");
-    if(hDInputDLL == NULL)
-        return false;
-
-    setupPTR(pAvRtCreateThreadOrderingGroup, FAvRtCreateThreadOrderingGroup, "AvRtCreateThreadOrderingGroup");
-    setupPTR(pAvRtDeleteThreadOrderingGroup, FAvRtDeleteThreadOrderingGroup, "AvRtDeleteThreadOrderingGroup");
-    setupPTR(pAvRtWaitOnThreadOrderingGroup, FAvRtWaitOnThreadOrderingGroup, "AvRtWaitOnThreadOrderingGroup");
-    setupPTR(pAvSetMmThreadCharacteristics,  FAvSetMmThreadCharacteristics,  "AvSetMmThreadCharacteristicsA");
-    setupPTR(pAvSetMmThreadPriority,         FAvSetMmThreadPriority,         "AvSetMmThreadPriority");
-
-    return true;
-}
-
-
-
-PaError PaWinWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    if (!setupAVRT()){
-        PRINT(("Windows WASAPI : No AVRT! (not VISTA?)"));
-        return paNoError;
-    }
-
-    CoInitialize(NULL);
-
-    PaError result = paNoError;
-    PaWinWasapiHostApiRepresentation *paWasapi;
-    PaDeviceInfo *deviceInfoArray;
-
-    paWasapi = (PaWinWasapiHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinWasapiHostApiRepresentation) );
-    if( !paWasapi ){
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    paWasapi->allocations = PaUtil_CreateAllocationGroup();
-    if( !paWasapi->allocations ){
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    *hostApi = &paWasapi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paWASAPI;
-    (*hostApi)->info.name = "Windows WASAPI";
-    (*hostApi)->info.deviceCount = 0;   //so far, we must investigate each
-    (*hostApi)->info.defaultInputDevice  = paNoDevice;  /* IMPLEMENT ME */
-    (*hostApi)->info.defaultOutputDevice = paNoDevice; /* IMPLEMENT ME */
-
-
-    HRESULT hResult = S_OK;
-    IMMDeviceCollection* spEndpoints=0;
-    paWasapi->enumerator = 0;
-
-    hResult = CoCreateInstance(
-             __uuidof(MMDeviceEnumerator), NULL,CLSCTX_INPROC_SERVER,
-             __uuidof(IMMDeviceEnumerator),
-             (void**)&paWasapi->enumerator);
-
-    IF_FAILED_JUMP(hResult, error);
-
-    //getting default device ids in the eMultimedia "role"
-    {
-        {
-            IMMDevice* defaultRenderer=0;
-            hResult = paWasapi->enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &defaultRenderer);
-            IF_FAILED_JUMP(hResult, error);
-            WCHAR* pszDeviceId = NULL;
-            hResult = defaultRenderer->GetId(&pszDeviceId);
-            IF_FAILED_JUMP(hResult, error);
-            StringCchCopyW(paWasapi->defaultRenderer, MAX_STR_LEN-1, pszDeviceId);
-            CoTaskMemFree(pszDeviceId);
-            defaultRenderer->Release();
-        }
-
-        {
-            IMMDevice* defaultCapturer=0;
-            hResult = paWasapi->enumerator->GetDefaultAudioEndpoint(eCapture, eMultimedia, &defaultCapturer);
-            IF_FAILED_JUMP(hResult, error);
-            WCHAR* pszDeviceId = NULL;
-            hResult = defaultCapturer->GetId(&pszDeviceId);
-            IF_FAILED_JUMP(hResult, error);
-            StringCchCopyW(paWasapi->defaultCapturer, MAX_STR_LEN-1, pszDeviceId);
-            CoTaskMemFree(pszDeviceId);
-            defaultCapturer->Release();
-        }
-    }
-
-
-    hResult = paWasapi->enumerator->EnumAudioEndpoints(eAll, DEVICE_STATE_ACTIVE, &spEndpoints);
-    IF_FAILED_JUMP(hResult, error);
-
-    hResult = spEndpoints->GetCount(&paWasapi->deviceCount);
-    IF_FAILED_JUMP(hResult, error);
-
-    paWasapi->devInfo = new PaWinWasapiDeviceInfo[paWasapi->deviceCount];
-    {
-        for (size_t step=0;step<paWasapi->deviceCount;++step)
-            memset(&paWasapi->devInfo[step],0,sizeof(PaWinWasapiDeviceInfo));
-    }
-
-
-
-    if( paWasapi->deviceCount > 0 )
-    {
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                paWasapi->allocations, sizeof(PaDeviceInfo*) * paWasapi->deviceCount );
-        if( !(*hostApi)->deviceInfos ){
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaDeviceInfo*)PaUtil_GroupAllocateMemory(
-                paWasapi->allocations, sizeof(PaDeviceInfo) * paWasapi->deviceCount );
-        if( !deviceInfoArray ){
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( UINT i=0; i < paWasapi->deviceCount; ++i ){
-
-			PA_DEBUG(("i:%d\n",i));
-            PaDeviceInfo *deviceInfo = &deviceInfoArray[i];
-            deviceInfo->structVersion = 2;
-            deviceInfo->hostApi = hostApiIndex;
-
-            hResult = spEndpoints->Item(i, &paWasapi->devInfo[i].device);
-            IF_FAILED_JUMP(hResult, error);
-
-            //getting ID
-            {
-                WCHAR* pszDeviceId = NULL;
-                hResult = paWasapi->devInfo[i].device->GetId(&pszDeviceId);
-                IF_FAILED_JUMP(hResult, error);
-                StringCchCopyW(paWasapi->devInfo[i].szDeviceID, MAX_STR_LEN-1, pszDeviceId);
-                CoTaskMemFree(pszDeviceId);
-
-                if (lstrcmpW(paWasapi->devInfo[i].szDeviceID, paWasapi->defaultCapturer)==0){
-                    //we found the default input!
-                    (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
-                }
-                if (lstrcmpW(paWasapi->devInfo[i].szDeviceID, paWasapi->defaultRenderer)==0){
-                    //we found the default output!
-                    (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
-                }
-            }
-
-            DWORD state=0;
-            hResult = paWasapi->devInfo[i].device->GetState(&paWasapi->devInfo[i].state);
-            IF_FAILED_JUMP(hResult, error);
-
-            if (paWasapi->devInfo[i].state != DEVICE_STATE_ACTIVE){
-                PRINT(("WASAPI device:%d is not currently available (state:%d)\n",i,state));
-                //spDevice->Release();
-                //continue;
-            }
-
-            {
-                IPropertyStore* spProperties;
-                hResult = paWasapi->devInfo[i].device->OpenPropertyStore(STGM_READ, &spProperties);
-                IF_FAILED_JUMP(hResult, error);
-
-                //getting "Friendly" Name
-                {
-                    PROPVARIANT value;
-                    PropVariantInit(&value);
-                    hResult = spProperties->GetValue(PKEY_Device_FriendlyName, &value);
-                    IF_FAILED_JUMP(hResult, error);
-                    deviceInfo->name = 0;
-                    char* deviceName = (char*)PaUtil_GroupAllocateMemory( paWasapi->allocations, MAX_STR_LEN + 1 );
-                    if( !deviceName ){
-                        result = paInsufficientMemory;
-                        goto error;
-                    }
-					if (value.pwszVal)
-						wcstombs(deviceName,   value.pwszVal,MAX_STR_LEN-1); //todo proper size	
-					else{
-						sprintf(deviceName,"baddev%d",i);
-					}
-
-                    deviceInfo->name = deviceName;
-                    PropVariantClear(&value);
-                }
-
-#if 0
-                DWORD numProps = 0;
-                hResult = spProperties->GetCount(&numProps);
-                IF_FAILED_JUMP(hResult, error);
-                {
-                    for (DWORD i=0;i<numProps;++i){
-                        PROPERTYKEY pkey;
-                        hResult = spProperties->GetAt(i,&pkey);
-
-                        PROPVARIANT value;
-                        PropVariantInit(&value);
-                        hResult = spProperties->GetValue(pkey, &value);
-
-                        switch(value.vt){
-                            case 11:
-                                PRINT(("property*%u*\n",value.ulVal));
-                            break;
-                            case 19:
-                                PRINT(("property*%d*\n",value.boolVal));
-                            break;
-                            case 31:
-                            {
-                                char temp[512];
-                                wcstombs(temp,    value.pwszVal,MAX_STR_LEN-1);
-                                PRINT(("property*%s*\n",temp));
-                            }
-                            break;
-                            default:break;
-                        }
-
-                        PropVariantClear(&value);
-                    }
-                }
-#endif
-
-                /*  These look interresting... but they are undocumented
-                PKEY_AudioEndpoint_FormFactor
-                PKEY_AudioEndpoint_ControlPanelPageProvider
-                PKEY_AudioEndpoint_Association
-                PKEY_AudioEndpoint_PhysicalSpeakerConfig
-                PKEY_AudioEngine_DeviceFormat
-                */
-                spProperties->Release();
-            }
-
-
-            //getting the Endpoint data
-            {
-                IMMEndpoint *endpoint=0;
-                hResult = paWasapi->devInfo[i].device->QueryInterface(__uuidof(IMMEndpoint),(void **)&endpoint);
-                if (SUCCEEDED(hResult)){
-                    hResult = endpoint->GetDataFlow(&paWasapi->devInfo[i].flow);
-                    endpoint->Release();
-                }
-            }
-
-            //Getting a temporary IAudioDevice for more fields
-            //we make sure NOT to call Initialize yet!
-            {
-                IAudioClient *myClient=0;
-
-                hResult = paWasapi->devInfo[i].device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL, (void**)&myClient);
-                IF_FAILED_JUMP(hResult, error);
-
-                hResult = myClient->GetDevicePeriod(
-                    &paWasapi->devInfo[i].DefaultDevicePeriod,
-                    &paWasapi->devInfo[i].MinimumDevicePeriod);
-                IF_FAILED_JUMP(hResult, error);
-
-                hResult = myClient->GetMixFormat(&paWasapi->devInfo[i].MixFormat);
-
-				if (hResult != S_OK){
-					/*davidv: this happened with my hardware, previously for that same device in DirectSound:
-					  Digital Output (Realtek AC'97 Audio)'s GUID: {0x38f2cf50,0x7b4c,0x4740,0x86,0xeb,0xd4,0x38,0x66,0xd8,0xc8, 0x9f} 
-					  so something must be _really_ wrong with this device, TODO handle this better. We kind of need GetMixFormat*/
-					logAUDCLNT_E(hResult);
-					goto error;
-				}
-
-                myClient->Release();
-            }
-
-            //we can now fill in portaudio device data
-            deviceInfo->maxInputChannels  = 0;  //for now
-            deviceInfo->maxOutputChannels = 0;  //for now
-
-            switch(paWasapi->devInfo[i].flow){
-                case eRender:
-                    //hum not exaclty maximum, more like "default"
-                    deviceInfo->maxOutputChannels = paWasapi->devInfo[i].MixFormat->nChannels;
-
-                    deviceInfo->defaultHighOutputLatency = nano100ToSeconds(paWasapi->devInfo[i].DefaultDevicePeriod);
-                    deviceInfo->defaultLowOutputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);
-                break;
-                case eCapture:
-                    //hum not exaclty maximum, more like "default"
-                    deviceInfo->maxInputChannels  = paWasapi->devInfo[i].MixFormat->nChannels;
-
-                    deviceInfo->defaultHighInputLatency = nano100ToSeconds(paWasapi->devInfo[i].DefaultDevicePeriod);
-                    deviceInfo->defaultLowInputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);
-                break;
-                default:
-                    PRINT(("WASAPI device:%d bad Data FLow! \n",i));
-                    goto error;
-                break;
-            }
-
-            deviceInfo->defaultSampleRate = (double)paWasapi->devInfo[i].MixFormat->nSamplesPerSec;
-
-            (*hostApi)->deviceInfos[i] = deviceInfo;
-            ++(*hostApi)->info.deviceCount;
-        }
-    }
-
-    spEndpoints->Release();
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &paWasapi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &paWasapi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    return result;
-
-error:
-
-    if (spEndpoints)
-        spEndpoints->Release();
-
-    if (paWasapi->enumerator)
-        paWasapi->enumerator->Release();
-
-    if( paWasapi )
-    {
-        if( paWasapi->allocations )
-        {
-            PaUtil_FreeAllAllocations( paWasapi->allocations );
-            PaUtil_DestroyAllocationGroup( paWasapi->allocations );
-        }
-
-        PaUtil_FreeMemory( paWasapi );
-    }
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaWinWasapiHostApiRepresentation *paWasapi = (PaWinWasapiHostApiRepresentation*)hostApi;
-
-    paWasapi->enumerator->Release();
-
-    for (UINT i=0;i<paWasapi->deviceCount;++i){
-        PaWinWasapiDeviceInfo *info = &paWasapi->devInfo[i];
-
-        if (info->device)
-            info->device->Release();
-
-        if (info->MixFormat)
-            CoTaskMemFree(info->MixFormat);
-    }
-    delete [] paWasapi->devInfo;
-
-    CoUninitialize();
-
-    if( paWasapi->allocations ){
-        PaUtil_FreeAllAllocations( paWasapi->allocations );
-        PaUtil_DestroyAllocationGroup( paWasapi->allocations );
-    }
-
-    PaUtil_FreeMemory( paWasapi );
-}
-
-static void
-LogWAVEFORMATEXTENSIBLE(const WAVEFORMATEXTENSIBLE *in){
-
-    const WAVEFORMATEX *old = (WAVEFORMATEX *)in;
-
-	switch (old->wFormatTag){
-		case WAVE_FORMAT_EXTENSIBLE:{
-
-			PRINT(("wFormatTag=WAVE_FORMAT_EXTENSIBLE\n"));
-
-			if (in->SubFormat == KSDATAFORMAT_SUBTYPE_IEEE_FLOAT){
-				PRINT(("SubFormat=KSDATAFORMAT_SUBTYPE_IEEE_FLOAT\n"));
-			}
-			else if (in->SubFormat == KSDATAFORMAT_SUBTYPE_PCM){
-				PRINT(("SubFormat=KSDATAFORMAT_SUBTYPE_PCM\n"));
-			}
-			else{
-				PRINT(("SubFormat=CUSTOM GUID{%d:%d:%d:%d%d%d%d%d%d%d%d}\n",	
-											in->SubFormat.Data1,
-											in->SubFormat.Data2,
-											in->SubFormat.Data3,
-											(int)in->SubFormat.Data4[0],
-											(int)in->SubFormat.Data4[1],
-											(int)in->SubFormat.Data4[2],
-											(int)in->SubFormat.Data4[3],
-											(int)in->SubFormat.Data4[4],
-											(int)in->SubFormat.Data4[5],
-											(int)in->SubFormat.Data4[6],
-											(int)in->SubFormat.Data4[7]));
-			}
-			PRINT(("Samples.wValidBitsPerSample=%d\n",  in->Samples.wValidBitsPerSample));
-			PRINT(("dwChannelMask=0x%X\n",in->dwChannelMask));
-		}break;
-		
-		case WAVE_FORMAT_PCM:        PRINT(("wFormatTag=WAVE_FORMAT_PCM\n")); break;
-		case WAVE_FORMAT_IEEE_FLOAT: PRINT(("wFormatTag=WAVE_FORMAT_IEEE_FLOAT\n")); break;
-		default : PRINT(("wFormatTag=UNKNOWN(%d)\n",old->wFormatTag)); break;
-	}
-
-	PRINT(("nChannels      =%d\n",old->nChannels)); 
-	PRINT(("nSamplesPerSec =%d\n",old->nSamplesPerSec));  
-	PRINT(("nAvgBytesPerSec=%d\n",old->nAvgBytesPerSec));  
-	PRINT(("nBlockAlign    =%d\n",old->nBlockAlign));  
-	PRINT(("wBitsPerSample =%d\n",old->wBitsPerSample));  
-	PRINT(("cbSize         =%d\n",old->cbSize));  
-}
-
-
-
-/*
- WAVEFORMATXXX is always interleaved
- */
-static PaSampleFormat
-waveformatToPaFormat(const WAVEFORMATEXTENSIBLE *in){
-
-    const WAVEFORMATEX *old = (WAVEFORMATEX*)in;
-
-    switch (old->wFormatTag){
-
-        case WAVE_FORMAT_EXTENSIBLE:
-        {
-            if (in->SubFormat == KSDATAFORMAT_SUBTYPE_IEEE_FLOAT){
-                if (in->Samples.wValidBitsPerSample == 32)
-                    return paFloat32;
-                else
-                    return paCustomFormat;
-            }
-            else if (in->SubFormat == KSDATAFORMAT_SUBTYPE_PCM){
-                switch (old->wBitsPerSample){
-                    case 32: return paInt32; break;
-                    case 24: return paInt24;break;
-                    case  8: return paUInt8;break;
-                    case 16: return paInt16;break;
-                    default: return paCustomFormat;break;
-                }
-            }
-            else
-                return paCustomFormat;
-        }
-        break;
-
-        case WAVE_FORMAT_IEEE_FLOAT:
-            return paFloat32;
-        break;
-
-        case WAVE_FORMAT_PCM:
-        {
-            switch (old->wBitsPerSample){
-                case 32: return paInt32; break;
-                case 24: return paInt24;break;
-                case  8: return paUInt8;break;
-                case 16: return paInt16;break;
-                default: return paCustomFormat;break;
-            }
-        }
-        break;
-
-        default:
-            return paCustomFormat;
-        break;
-    }
-
-    return paCustomFormat;
-}
-
-
-
-static PaError
-waveformatFromParams(WAVEFORMATEXTENSIBLE*wavex,
-                          const PaStreamParameters * params,
-                          double sampleRate){
-
-    size_t bytesPerSample = 0;
-    switch( params->sampleFormat & ~paNonInterleaved ){
-        case paFloat32:
-        case paInt32: bytesPerSample=4;break;
-        case paInt16: bytesPerSample=2;break;
-        case paInt24: bytesPerSample=3;break;
-        case paInt8:
-        case paUInt8: bytesPerSample=1;break;
-        case paCustomFormat:
-        default: return paSampleFormatNotSupported;break;
-    }
-
-    memset(wavex,0,sizeof(WAVEFORMATEXTENSIBLE));
-
-    WAVEFORMATEX *old    = (WAVEFORMATEX *)wavex;
-    old->nChannels       = (WORD)params->channelCount;
-    old->nSamplesPerSec  = (DWORD)sampleRate;
-    old->wBitsPerSample  = (WORD)(bytesPerSample*8);
-    old->nAvgBytesPerSec = (DWORD)(old->nSamplesPerSec * old->nChannels * bytesPerSample);
-    old->nBlockAlign     = (WORD)(old->nChannels * bytesPerSample);
-
-    //WAVEFORMATEX
-    if (params->channelCount <=2 && (bytesPerSample == 2 || bytesPerSample == 1)){
-        old->cbSize          = 0;
-        old->wFormatTag      = WAVE_FORMAT_PCM;
-    }
-    //WAVEFORMATEXTENSIBLE
-    else{
-        old->wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-
-        old->cbSize = sizeof (WAVEFORMATEXTENSIBLE) - sizeof (WAVEFORMATEX);
-
-        if ((params->sampleFormat & ~paNonInterleaved) == paFloat32)
-            wavex->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
-        else
-            wavex->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-
-        wavex->Samples.wValidBitsPerSample = old->wBitsPerSample; //no extra padding!
-
-        switch(params->channelCount){
-            case 1:  wavex->dwChannelMask = SPEAKER_FRONT_CENTER; break;
-            case 2:  wavex->dwChannelMask = 0x1 | 0x2; break;
-            case 4:  wavex->dwChannelMask = 0x1 | 0x2 | 0x10 | 0x20; break;
-            case 6:  wavex->dwChannelMask = 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20; break;
-            case 8:  wavex->dwChannelMask = 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40 | 0x80; break;
-            default: wavex->dwChannelMask = 0; break;
-        }
-    }
-
-    return paNoError;
-}
-
-
-
-
-
-
-/*
-#define paFloat32        ((PaSampleFormat) 0x00000001) 
-#define paInt32          ((PaSampleFormat) 0x00000002)
-#define paInt24          ((PaSampleFormat) 0x00000004) 
-#define paInt16          ((PaSampleFormat) 0x00000008) 
-*/
-//lifted from pa_wdmks
-static void wasapiFillWFEXT( WAVEFORMATEXTENSIBLE* pwfext, PaSampleFormat sampleFormat, double sampleRate, int channelCount)
-{
-    PA_DEBUG(( "sampleFormat = %lx\n" , sampleFormat ));
-    PA_DEBUG(( "sampleRate = %f\n" , sampleRate ));
-    PA_DEBUG(( "chanelCount = %d\n", channelCount ));
-
-    pwfext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-    pwfext->Format.nChannels = channelCount;
-    pwfext->Format.nSamplesPerSec = (int)sampleRate;
-    if(channelCount == 1)
-        pwfext->dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT;
-    else
-        pwfext->dwChannelMask = KSAUDIO_SPEAKER_STEREO;
-    if(sampleFormat == paFloat32)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 4;
-        pwfext->Format.wBitsPerSample = 32;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 32;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
-    }
-    else if(sampleFormat == paInt32)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 4;
-        pwfext->Format.wBitsPerSample = 32;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 32;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    else if(sampleFormat == paInt24)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 3;
-        pwfext->Format.wBitsPerSample = 24;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 24;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    else if(sampleFormat == paInt16)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 2;
-        pwfext->Format.wBitsPerSample = 16;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 16;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    pwfext->Format.nAvgBytesPerSec = pwfext->Format.nSamplesPerSec * pwfext->Format.nBlockAlign;
-}
-
-
-
-/*
-#define FORMATTESTS 4
-const int BestToWorst[FORMATTESTS]={paFloat32,paInt32,paInt24,paInt16};
-*/
-
-#define FORMATTESTS 3
-const int BestToWorst[FORMATTESTS]={paFloat32,paInt24,paInt16};
-
-
-static PaError
-GetClosestFormat(IAudioClient * myClient, double sampleRate,const  PaStreamParameters * params, 
-				 AUDCLNT_SHAREMODE *shareMode, WAVEFORMATEXTENSIBLE *outWavex)
-{
-	//TODO we should try exclusive first and shared after
-	*shareMode = PORTAUDIO_SHAREMODE;
-
-	PaError answer = paInvalidSampleRate;
-
-    waveformatFromParams(outWavex,params,sampleRate);
-	WAVEFORMATEX *sharedClosestMatch=0;
-	HRESULT hResult=!S_OK;
-
-	if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
-		hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)outWavex,NULL);
-	else
-		hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&outWavex,&sharedClosestMatch);
-
-	if (hResult == S_OK)
-		answer = paFormatIsSupported;
-    else if (sharedClosestMatch){
-        WAVEFORMATEXTENSIBLE* ext = (WAVEFORMATEXTENSIBLE*)sharedClosestMatch;
-		
-		int closestMatchSR = (int)sharedClosestMatch->nSamplesPerSec;
-
-		if (sharedClosestMatch->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
-			memcpy(outWavex,sharedClosestMatch,sizeof(WAVEFORMATEXTENSIBLE));
-		else
-			memcpy(outWavex,sharedClosestMatch,sizeof(WAVEFORMATEX));
-
-        CoTaskMemFree(sharedClosestMatch);
-
-		if ((int)sampleRate == closestMatchSR)
-		answer = paFormatIsSupported;
-		else
-			answer = paInvalidSampleRate;
-	
-	}else {
-
-		//it doesnt suggest anything?? ok lets show it the MENU!
-
-		//ok fun time as with pa_win_mme, we know only a refusal of the user-requested
-		//sampleRate+num Channel is disastrous, as the portaudio buffer processor converts between anything
-		//so lets only use the number 
-		for (int i=0;i<FORMATTESTS;++i){
-			WAVEFORMATEXTENSIBLE ext;
-			wasapiFillWFEXT(&ext,BestToWorst[i],sampleRate,params->channelCount);		
-			if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
-				hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&ext,NULL);
-			else
-				hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&ext,&sharedClosestMatch);
-
-			if (hResult == S_OK){
-				memcpy(outWavex,&ext,sizeof(WAVEFORMATEXTENSIBLE));
-				answer = paFormatIsSupported;
-				break;
-			}
-		}
-
-		if (answer!=paFormatIsSupported) {
-			//try MIX format?
-			//why did it HAVE to come to this ....
-			WAVEFORMATEX pcm16WaveFormat;
-			memset(&pcm16WaveFormat,0,sizeof(WAVEFORMATEX));
-			pcm16WaveFormat.wFormatTag = WAVE_FORMAT_PCM; 
-			pcm16WaveFormat.nChannels = 2; 
-			pcm16WaveFormat.nSamplesPerSec = (DWORD)sampleRate; 
-			pcm16WaveFormat.nBlockAlign = 4; 
-			pcm16WaveFormat.nAvgBytesPerSec = pcm16WaveFormat.nSamplesPerSec*pcm16WaveFormat.nBlockAlign; 
-			pcm16WaveFormat.wBitsPerSample = 16; 
-			pcm16WaveFormat.cbSize = 0;
-
-			if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)
-				hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&pcm16WaveFormat,NULL);
-			else
-				hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&pcm16WaveFormat,&sharedClosestMatch);
-
-			if (hResult == S_OK){
-				memcpy(outWavex,&pcm16WaveFormat,sizeof(WAVEFORMATEX));
-				answer = paFormatIsSupported;
-			}
-		}
-
-		logAUDCLNT_E(hResult);
-	}
-
-	return answer;
-}
-
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const  PaStreamParameters *inputParameters,
-                                  const  PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-
-        PaWinWasapiHostApiRepresentation *paWasapi = (PaWinWasapiHostApiRepresentation*)hostApi;
-
-
-		IAudioClient *myClient=0;
-		HRESULT hResult = paWasapi->devInfo[inputParameters->device].device->Activate(
-			__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL, (void**)&myClient);
-		if (hResult != S_OK){
-			logAUDCLNT_E(hResult);
-			return paInvalidDevice;
-		}
-
-        WAVEFORMATEXTENSIBLE wavex;
-		AUDCLNT_SHAREMODE shareMode;
-		PaError answer = GetClosestFormat(myClient,sampleRate,inputParameters,&shareMode,&wavex);
-		myClient->Release();
-
-		if (answer !=paFormatIsSupported)
-			return answer;
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support outputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-
-        PaWinWasapiHostApiRepresentation *paWasapi = (PaWinWasapiHostApiRepresentation*)hostApi;
-
-		IAudioClient *myClient=0;
-		HRESULT hResult = paWasapi->devInfo[outputParameters->device].device->Activate(
-			__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL, (void**)&myClient);
-		if (hResult != S_OK){
-			logAUDCLNT_E(hResult);
-			return paInvalidDevice;
-		}
-
-        WAVEFORMATEXTENSIBLE wavex;
-		AUDCLNT_SHAREMODE shareMode;
-		PaError answer = GetClosestFormat(myClient,sampleRate,outputParameters,&shareMode,&wavex);
-		myClient->Release();
-
-		if (answer !=paFormatIsSupported)
-			return answer;		
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-
-    return paFormatIsSupported;
-}
-
-
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaWinWasapiHostApiRepresentation *paWasapi = (PaWinWasapiHostApiRepresentation*)hostApi;
-    PaWinWasapiStream *stream = 0;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-
-
-    stream = (PaWinWasapiStream*)PaUtil_AllocateMemory( sizeof(PaWinWasapiStream) );
-    if( !stream ){
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-
-        PaWinWasapiDeviceInfo &info = paWasapi->devInfo[inputParameters->device];
-
-        HRESULT hResult = info.device->Activate(
-            __uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
-            (void**)&stream->in.client);
-
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-        hResult = info.device->Activate(
-            __uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL,
-            (void**)&stream->inVol);
-
-        if (hResult != S_OK)
-            return paInvalidDevice;
-	
-		AUDCLNT_SHAREMODE shareMode;
-		PaError answer = GetClosestFormat(stream->in.client,sampleRate,inputParameters,&shareMode,&stream->in.wavex);
-		
-		if (answer !=paFormatIsSupported)
-			return answer;
-
-        //stream->out.period = info.DefaultDevicePeriod;
-        stream->in.period = info.MinimumDevicePeriod;
-
-        hResult = stream->in.client->Initialize(
-            shareMode,
-            0,  //no flags
-            stream->in.period,
-            0,//stream->out.period,
-            (WAVEFORMATEX*)&stream->in.wavex,
-            &stream->session
-            );
-
-        if (hResult != S_OK){
-            logAUDCLNT_E(hResult);
-            return paInvalidDevice;
-        }
-
-        hResult = stream->in.client->GetBufferSize(&stream->in.bufferSize);
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-        hResult = stream->in.client->GetStreamLatency(&stream->in.latency);
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-        double periodsPerSecond = 1.0/nano100ToSeconds(stream->in.period);
-        double samplesPerPeriod = (double)(stream->in.wavex.Format.nSamplesPerSec)/periodsPerSecond;
-
-        //this is the number of samples that are required at each period
-        stream->in.framesPerHostCallback = (unsigned long)samplesPerPeriod;//unrelated to channels
-
-        /* IMPLEMENT ME - establish which  host formats are available */
-        hostInputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( waveformatToPaFormat(&stream->in.wavex), inputSampleFormat );
-	}
-    else
-    {
-        inputChannelCount = 0;
-        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support inputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-
-        PaWinWasapiDeviceInfo &info = paWasapi->devInfo[outputParameters->device];
-
-        HRESULT hResult = info.device->Activate(
-            __uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
-            (void**)&stream->out.client);
-
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-		AUDCLNT_SHAREMODE shareMode;
-		PaError answer = GetClosestFormat(stream->out.client,sampleRate,outputParameters,&shareMode,&stream->out.wavex);
-		
-		if (answer !=paFormatIsSupported)
-			return answer;
-		LogWAVEFORMATEXTENSIBLE(&stream->out.wavex);
-
-       // stream->out.period = info.DefaultDevicePeriod;
-        stream->out.period = info.MinimumDevicePeriod;
-
-		/*For an exclusive-mode stream that uses event-driven buffering, 
-		the caller must specify nonzero values for hnsPeriodicity and hnsBufferDuration, 
-		and the values of these two parameters must be equal */
-		if (shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE){
-			hResult = stream->out.client->Initialize(
-				shareMode,
-				AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 
-				stream->out.period,
-				stream->out.period,
-				(WAVEFORMATEX*)&stream->out.wavex,
-				&stream->session
-				);
-		}
-		else{
-			hResult = stream->out.client->Initialize(
-				shareMode,
-				AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 
-				0,
-				0,
-				(WAVEFORMATEX*)&stream->out.wavex,
-				&stream->session
-				);
-		}
-	
-
-        if (hResult != S_OK){
-            logAUDCLNT_E(hResult);
-            return paInvalidDevice;
-        }
-
-        hResult = info.device->Activate(
-            __uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL,
-            (void**)&stream->outVol);
-
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-        hResult = stream->out.client->GetBufferSize(&stream->out.bufferSize);
-        if (hResult != S_OK)
-            return paInvalidDevice;
-
-        hResult = stream->out.client->GetStreamLatency(&stream->out.latency);
-        if (hResult != S_OK)
-            return paInvalidDevice;
-		
-        double periodsPerSecond = 1.0/nano100ToSeconds(stream->out.period);
-        double samplesPerPeriod = (double)(stream->out.wavex.Format.nSamplesPerSec)/periodsPerSecond;
-
-        //this is the number of samples that are required at each period
-        stream->out.framesPerHostCallback = stream->out.bufferSize; //(unsigned long)samplesPerPeriod;//unrelated to channels
-
-        /* IMPLEMENT ME - establish which  host formats are available */
-        hostOutputSampleFormat = PaUtil_SelectClosestAvailableFormat( waveformatToPaFormat(&stream->out.wavex), outputSampleFormat );
-    }
-    else
-    {
-        outputChannelCount = 0;
-        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
-    }
-
-
-
-    /*
-        IMPLEMENT ME:
-
-        ( the following two checks are taken care of by PaUtil_InitializeBufferProcessor() FIXME - checks needed? )
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-            - check that the device supports sampleRate
-
-            - alter sampleRate to a close allowable rate if possible / necessary
-
-            - validate suggestedInputLatency and suggestedOutputLatency parameters,
-                use default values where necessary
-    */
-
-
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-
-
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &paWasapi->callbackStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &paWasapi->blockingStreamInterface, streamCallback, userData );
-    }
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-
-	if (outputParameters && inputParameters){
-
-		//serious problem #1
-		if (stream->in.period != stream->out.period){
-			PRINT(("OpenStream: period discrepancy\n"));
-			goto error;
-		}
-
-		//serious problem #2
-		if (stream->out.framesPerHostCallback != stream->in.framesPerHostCallback){
-			PRINT(("OpenStream: framesPerHostCallback discrepancy\n"));
-			goto error;
-		}
-	}
-
-	unsigned long framesPerHostCallback = (outputParameters)?
-		stream->out.framesPerHostCallback: 
-		stream->in.framesPerHostCallback;
-
-    /* we assume a fixed host buffer size in this example, but the buffer processor
-        can also support bounded and unknown host buffer sizes by passing
-        paUtilBoundedHostBufferSize or paUtilUnknownHostBufferSize instead of
-        paUtilFixedHostBufferSize below. */
-
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-              inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-              outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-              sampleRate, streamFlags, framesPerBuffer,
-              framesPerHostCallback, paUtilFixedHostBufferSize,
-              streamCallback, userData );
-    if( result != paNoError )
-        goto error;
-
-
-    /*
-        IMPLEMENT ME: initialise the following fields with estimated or actual
-        values.
-    */
-    stream->streamRepresentation.streamInfo.inputLatency =
-            PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor)
-			+ ((inputParameters)?nano100ToSeconds(stream->in.latency) :0);
-
-    stream->streamRepresentation.streamInfo.outputLatency =
-            PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor)
-			+ ((outputParameters)?nano100ToSeconds(stream->out.latency) :0);
-
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-
-    *s = (PaStream*)stream;
-
-
-    return result;
-
-error:
-    if( stream )
-        PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-
-#define SAFE_RELEASE(punk)  \
-              if ((punk) != NULL)  \
-                { (punk)->Release(); (punk) = NULL; }
-
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /*
-        IMPLEMENT ME:
-            - additional stream closing + cleanup
-    */
-
-    SAFE_RELEASE(stream->out.client);
-    SAFE_RELEASE(stream->in.client);
-    SAFE_RELEASE(stream->cclient);
-    SAFE_RELEASE(stream->rclient);
-	SAFE_RELEASE(stream->inVol);
-	SAFE_RELEASE(stream->outVol);
-    CloseHandle(stream->hThread);
-	CloseHandle(stream->hNotificationEvent);
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    PaUtil_FreeMemory( stream );
-
-    return result;
-}
-
-DWORD WINAPI ProcThread(void *client);
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-	
-	HRESULT hResult=S_OK;
-
-	if (stream->out.client){
-		hResult = stream->out.client->GetService(__uuidof(IAudioRenderClient),(void**)&stream->rclient);
-		logAUDCLNT_E(hResult);
-		if (hResult!=S_OK)
-			return paUnanticipatedHostError;
-	}
-	
-	if (stream->in.client){
-	 hResult = stream->in.client->GetService(__uuidof(IAudioCaptureClient),(void**)&stream->cclient);
-		logAUDCLNT_E(hResult);
-		if (hResult!=S_OK)
-			return paUnanticipatedHostError;
-	}
-
-    // Create a thread for this client.
-    stream->hThread = CreateThread(
-        NULL,              // no security attribute
-        0,                 // default stack size
-        ProcThread,
-        (LPVOID) stream,    // thread parameter
-        0,                 // not suspended
-        &stream->dwThreadId);      // returns thread ID
-
-    if (stream->hThread == NULL)
-        return paUnanticipatedHostError;
-
-    return paNoError;
-}
-
-
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    stream->closeRequest = true;
-    //todo something MUCH better than this
-    while(stream->closeRequest)
-        Sleep(100);
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    stream->running = false;
-
-    return result;
-}
-
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    stream->closeRequest = true;
-    //todo something MUCH better than this
-    while(stream->closeRequest)
-        Sleep(100);
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior */
-
-    return result;
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    return !stream->running;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-    return stream->running;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-	//this is lame ds and mme does the same thing, quite useless method imho
-	//why dont we fetch the time in the pa callbacks?
-	//at least its doing to be clocked to something
-    return PaUtil_GetTime();
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return paNoError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)s;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-
-    return 0;
-}
-
-
-
-/*
-    ExampleHostProcessingLoop() illustrates the kind of processing which may
-    occur in a host implementation.
-
-*/
-static void WaspiHostProcessingLoop( void *inputBuffer,  long inputFrames,
-                                     void *outputBuffer, long outputFrames,
-                                     void *userData )
-{
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)userData;
-    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /* IMPLEMENT ME */
-    int callbackResult;
-    unsigned long framesProcessed;
-
-    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-
-    /*
-        IMPLEMENT ME:
-            - generate timing information
-            - handle buffer slips
-    */
-
-    /*
-        If you need to byte swap or shift inputBuffer to convert it into a
-        portaudio format, do it here.
-    */
-
-
-
-    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, 0 /* IMPLEMENT ME: pass underflow/overflow flags when necessary */ );
-
-    /*
-        depending on whether the host buffers are interleaved, non-interleaved
-        or a mixture, you will want to call PaUtil_SetInterleaved*Channels(),
-        PaUtil_SetNonInterleaved*Channel() or PaUtil_Set*Channel() here.
-    */
-
-    if( stream->bufferProcessor.inputChannelCount > 0 )
-    {
-        PaUtil_SetInputFrameCount( &stream->bufferProcessor, inputFrames );
-        PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor,
-            0, /* first channel of inputBuffer is channel 0 */
-            inputBuffer,
-            0 ); /* 0 - use inputChannelCount passed to init buffer processor */
-    }
-
-    if( stream->bufferProcessor.outputChannelCount > 0 )
-    {
-        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, outputFrames);
-        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor,
-            0, /* first channel of outputBuffer is channel 0 */
-            outputBuffer,
-            0 ); /* 0 - use outputChannelCount passed to init buffer processor */
-    }
-
-    /* you must pass a valid value of callback result to PaUtil_EndBufferProcessing()
-        in general you would pass paContinue for normal operation, and
-        paComplete to drain the buffer processor's internal output buffer.
-        You can check whether the buffer processor's output buffer is empty
-        using PaUtil_IsBufferProcessorOuputEmpty( bufferProcessor )
-    */
-    callbackResult = paContinue;
-    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-
-
-    /*
-        If you need to byte swap or shift outputBuffer to convert it to
-        host format, do it here.
-    */
-
-    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-
-
-    if( callbackResult == paContinue )
-    {
-        /* nothing special to do */
-    }
-    else if( callbackResult == paAbort )
-    {
-        /* IMPLEMENT ME - finish playback immediately  */
-
-        /* once finished, call the finished callback */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-    else
-    {
-        /* User callback has asked us to stop with paComplete or other non-zero value */
-
-        /* IMPLEMENT ME - finish playback once currently queued audio has completed  */
-
-        /* once finished, call the finished callback */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-}
-
-
-void 
-MMCSS_activate(){
-
-    DWORD stuff=0;
-    HANDLE thCarac = pAvSetMmThreadCharacteristics("Pro Audio",&stuff);
-    if (!thCarac){
-        PRINT(("AvSetMmThreadCharacteristics failed!\n"));
-    }
-
-    BOOL prio = pAvSetMmThreadPriority(thCarac,AVRT_PRIORITY_NORMAL);
-    if (!prio){
-        PRINT(("AvSetMmThreadPriority failed!\n"));
-    }
-
-	//debug
-    {
-        HANDLE hh       = GetCurrentThread();
-        int  currprio   = GetThreadPriority(hh);
-        DWORD currclass = GetPriorityClass(GetCurrentProcess());
-        PRINT(("currprio 0x%X currclass 0x%X\n",currprio,currclass));
-    }
-}
-
-
-DWORD WINAPI
-ProcThread(void* param){
-	HRESULT hResult;
-	MMCSS_activate();
-
-    PaWinWasapiStream *stream = (PaWinWasapiStream*)param;
-
-	stream->hNotificationEvent = CreateEvent(NULL, 
-	                                         FALSE,  //bManualReset are we sure??
-											 FALSE, 
-											 "PAWASA");
-	hResult = stream->out.client->SetEventHandle(stream->hNotificationEvent);
-	if (hResult != S_OK)
-		logAUDCLNT_E(hResult);
-
-	if (stream->out.client){
-		hResult = stream->out.client->Start();
-		if (hResult != S_OK)
-			logAUDCLNT_E(hResult);
-	}
-
-	stream->running = true;
-	bool bOne = false;
-
-	while( !stream->closeRequest ) 
-    { 
-	    //lets wait but have a 1 second timeout
-        DWORD dwResult = WaitForSingleObject(stream->hNotificationEvent, 1000);
-        switch( dwResult ) {
-		case WAIT_OBJECT_0: {
-
-			unsigned long usingBS = stream->out.framesPerHostCallback;
-
-			BYTE* indata  = 0;
-			BYTE* outdata = 0;
-
-			hResult = stream->rclient->GetBuffer(usingBS, &outdata);
-
-			if (hResult != S_OK || !outdata) {
-				//logAUDCLNT_E(hResult);
-				//most probably shared mode and hResult=AUDCLNT_E_BUFFER_TOO_LARGE
-				UINT32 padding = 0;
-				hResult = stream->out.client->GetCurrentPadding(&padding);
-				if (padding == 0)
-					break;	
-				usingBS = usingBS-padding;
-				if (usingBS == 0)
-					break;//huh?
-				hResult = stream->rclient->GetBuffer(usingBS, &outdata);
-				if (hResult != S_OK)//what can we do NOW??
-					break;
-				//logAUDCLNT_E(hResult);			
-			}
-	
-			WaspiHostProcessingLoop(indata, usingBS ,outdata, usingBS, stream);
-
-			hResult = stream->rclient->ReleaseBuffer(usingBS, 0);
-			if (hResult != S_OK)
-				logAUDCLNT_E(hResult);
-
-			 /*	This was suggested, but in my tests it doesnt seem to improve the 
-                locking behaviour some drivers have running in exclusive mode.
-                if(!ResetEvent(stream->hNotificationEvent)){
-					logAUDCLNT_E(hResult);
-				}
-             */
-
-		} 
-		break;
-
-        }
-    }
-	stream->out.client->Stop();
-    stream->closeRequest = false;
-    
-	return 0; 
-}
-
-
-
-
-#endif //VC 2005
-
-
-
-
-#if 0
-			if(bFirst) {			
-				float masteur;
-				hResult = stream->outVol->GetMasterVolumeLevelScalar(&masteur);
-				if (hResult != S_OK)
-					logAUDCLNT_E(hResult);
-				float chan1, chan2;
-				hResult = stream->outVol->GetChannelVolumeLevelScalar(0, &chan1);
-				if (hResult != S_OK)
-					logAUDCLNT_E(hResult);
-				hResult = stream->outVol->GetChannelVolumeLevelScalar(1, &chan2);
-				if (hResult != S_OK)
-					logAUDCLNT_E(hResult);
-
-				BOOL bMute;
-				hResult = stream->outVol->GetMute(&bMute);
-				if (hResult != S_OK)
-					logAUDCLNT_E(hResult);
-
-				stream->outVol->SetMasterVolumeLevelScalar(0.5, NULL);
-				stream->outVol->SetChannelVolumeLevelScalar(0, 0.5, NULL);
-				stream->outVol->SetChannelVolumeLevelScalar(1, 0.5, NULL);
-				stream->outVol->SetMute(FALSE, NULL);
-				bFirst = false;
-			}
-#endif
\ No newline at end of file
diff --git a/libs/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/libs/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
deleted file mode 100644
index 6e2f214b94..0000000000
--- a/libs/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
+++ /dev/null
@@ -1,3283 +0,0 @@
-/*
- * $Id: pa_win_wdmks.c 1263 2007-08-27 22:59:09Z rossb $
- * PortAudio Windows WDM-KS interface
- *
- * Author: Andrew Baldwin
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2004 Andrew Baldwin, Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup hostaip_src
- @brief Portaudio WDM-KS host API.
-
- @note This is the implementation of the Portaudio host API using the
- Windows WDM/Kernel Streaming API in order to enable very low latency
- playback and recording on all modern Windows platforms (e.g. 2K, XP)
- Note: This API accesses the device drivers below the usual KMIXER
- component which is normally used to enable multi-client mixing and
- format conversion. That means that it will lock out all other users
- of a device for the duration of active stream using those devices
-*/
-
-#include <stdio.h>
-
-/* Debugging/tracing support */
-
-#define PA_LOGE_
-#define PA_LOGL_
-
-#ifdef __GNUC__
-    #include <initguid.h>
-    #define _WIN32_WINNT 0x0501
-    #define WINVER 0x0501
-#endif
-
-#include <string.h> /* strlen() */
-#include <assert.h>
-
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "portaudio.h"
-#include "pa_debugprint.h"
-
-#include <windows.h>
-#include <winioctl.h>
-
-
-#ifdef __GNUC__
-    #undef PA_LOGE_
-    #define PA_LOGE_ PA_DEBUG(("%s {\n",__FUNCTION__))
-    #undef PA_LOGL_
-    #define PA_LOGL_ PA_DEBUG(("} %s\n",__FUNCTION__))
-    /* These defines are set in order to allow the WIndows DirectX
-     * headers to compile with a GCC compiler such as MinGW
-     * NOTE: The headers may generate a few warning in GCC, but
-     * they should compile */
-    #define _INC_MMSYSTEM
-    #define _INC_MMREG
-    #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
-    #define DEFINE_GUID_THUNK(name,guid) DEFINE_GUID(name,guid)
-    #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK( n, STATIC_##n )
-    #if !defined( DEFINE_WAVEFORMATEX_GUID )
-        #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
-    #endif
-    #define  WAVE_FORMAT_ADPCM      0x0002
-    #define  WAVE_FORMAT_IEEE_FLOAT 0x0003
-    #define  WAVE_FORMAT_ALAW       0x0006
-    #define  WAVE_FORMAT_MULAW      0x0007
-    #define  WAVE_FORMAT_MPEG       0x0050
-    #define  WAVE_FORMAT_DRM        0x0009
-    #define DYNAMIC_GUID_THUNK(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-    #define DYNAMIC_GUID(data) DYNAMIC_GUID_THUNK(data)
-#endif
-
-#ifdef _MSC_VER
-    #define DYNAMIC_GUID(data) {data}
-    #define _INC_MMREG
-    #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
-    #undef DEFINE_GUID
-    #define DEFINE_GUID(n,data) EXTERN_C const GUID n = {data}
-    #define DEFINE_GUID_THUNK(n,data) DEFINE_GUID(n,data)
-    #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
-    #if !defined( DEFINE_WAVEFORMATEX_GUID )
-        #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
-    #endif
-    #define  WAVE_FORMAT_ADPCM      0x0002
-    #define  WAVE_FORMAT_IEEE_FLOAT 0x0003
-    #define  WAVE_FORMAT_ALAW       0x0006
-    #define  WAVE_FORMAT_MULAW      0x0007
-    #define  WAVE_FORMAT_MPEG       0x0050
-    #define  WAVE_FORMAT_DRM        0x0009
-#endif
-
-#include <ks.h>
-#include <ksmedia.h>
-#include <tchar.h>
-#include <assert.h>
-#include <stdio.h>
-
-/* These next definitions allow the use of the KSUSER DLL */
-typedef KSDDKAPI DWORD WINAPI KSCREATEPIN(HANDLE, PKSPIN_CONNECT, ACCESS_MASK, PHANDLE);
-extern HMODULE      DllKsUser;
-extern KSCREATEPIN* FunctionKsCreatePin;
-
-/* Forward definition to break circular type reference between pin and filter */
-struct __PaWinWdmFilter;
-typedef struct __PaWinWdmFilter PaWinWdmFilter;
-
-/* The Pin structure
- * A pin is an input or output node, e.g. for audio flow */
-typedef struct __PaWinWdmPin
-{
-    HANDLE                      handle;
-    PaWinWdmFilter*             parentFilter;
-    unsigned long               pinId;
-    KSPIN_CONNECT*              pinConnect;
-    unsigned long               pinConnectSize;
-    KSDATAFORMAT_WAVEFORMATEX*  ksDataFormatWfx;
-    KSPIN_COMMUNICATION         communication;
-    KSDATARANGE*                dataRanges;
-    KSMULTIPLE_ITEM*            dataRangesItem;
-    KSPIN_DATAFLOW              dataFlow;
-    KSPIN_CINSTANCES            instances;
-    unsigned long               frameSize;
-    int                         maxChannels;
-    unsigned long               formats;
-    int                         bestSampleRate;
-}
-PaWinWdmPin;
-
-/* The Filter structure
- * A filter has a number of pins and a "friendly name" */
-struct __PaWinWdmFilter
-{
-    HANDLE         handle;
-    int            pinCount;
-    PaWinWdmPin**  pins;
-    TCHAR          filterName[MAX_PATH];
-    TCHAR          friendlyName[MAX_PATH];
-    int            maxInputChannels;
-    int            maxOutputChannels;
-    unsigned long  formats;
-    int            usageCount;
-    int            bestSampleRate;
-};
-
-/* PaWinWdmHostApiRepresentation - host api datastructure specific to this implementation */
-typedef struct __PaWinWdmHostApiRepresentation
-{
-    PaUtilHostApiRepresentation  inheritedHostApiRep;
-    PaUtilStreamInterface        callbackStreamInterface;
-    PaUtilStreamInterface        blockingStreamInterface;
-
-    PaUtilAllocationGroup*       allocations;
-    PaWinWdmFilter**             filters;
-    int                          filterCount;
-}
-PaWinWdmHostApiRepresentation;
-
-typedef struct __PaWinWdmDeviceInfo
-{
-    PaDeviceInfo     inheritedDeviceInfo;
-    PaWinWdmFilter*  filter;
-}
-PaWinWdmDeviceInfo;
-
-typedef struct __DATAPACKET
-{
-    KSSTREAM_HEADER  Header;
-    OVERLAPPED       Signal;
-} DATAPACKET;
-
-/* PaWinWdmStream - a stream data structure specifically for this implementation */
-typedef struct __PaWinWdmStream
-{
-    PaUtilStreamRepresentation  streamRepresentation;
-    PaUtilCpuLoadMeasurer       cpuLoadMeasurer;
-    PaUtilBufferProcessor       bufferProcessor;
-
-    PaWinWdmPin*                recordingPin;
-    PaWinWdmPin*                playbackPin;
-    char*                       hostBuffer;
-    unsigned long               framesPerHostIBuffer;
-    unsigned long               framesPerHostOBuffer;
-    int                         bytesPerInputFrame;
-    int                         bytesPerOutputFrame;
-    int                         streamStarted;
-    int                         streamActive;
-    int                         streamStop;
-    int                         streamAbort;
-    int                         oldProcessPriority;
-    HANDLE                      streamThread;
-    HANDLE                      events[5];  /* 2 play + 2 record packets + abort events */
-    DATAPACKET                  packets[4]; /* 2 play + 2 record */
-    PaStreamFlags               streamFlags;
-    /* These values handle the case where the user wants to use fewer
-     * channels than the device has */
-    int                         userInputChannels;
-    int                         deviceInputChannels;
-    int                         userOutputChannels;
-    int                         deviceOutputChannels;
-    int                         inputSampleSize;
-    int                         outputSampleSize;
-}
-PaWinWdmStream;
-
-#include <setupapi.h>
-
-HMODULE      DllKsUser = NULL;
-KSCREATEPIN* FunctionKsCreatePin = NULL;
-
-/* prototypes for functions declared in this file */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-/* Low level I/O functions */
-static PaError WdmSyncIoctl(HANDLE handle,
-    unsigned long ioctlNumber,
-    void* inBuffer,
-    unsigned long inBufferCount,
-    void* outBuffer,
-    unsigned long outBufferCount,
-    unsigned long* bytesReturned);
-static PaError WdmGetPropertySimple(HANDLE handle,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount,
-    void* instance,
-    unsigned long instanceCount);
-static PaError WdmSetPropertySimple(HANDLE handle,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount,
-    void* instance,
-    unsigned long instanceCount);
-static PaError WdmGetPinPropertySimple(HANDLE  handle,
-    unsigned long pinId,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount);
-static PaError WdmGetPinPropertyMulti(HANDLE  handle,
-    unsigned long pinId,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    KSMULTIPLE_ITEM** ksMultipleItem);
-
-/** Pin management functions */
-static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, PaError* error);
-static void PinFree(PaWinWdmPin* pin);
-static void PinClose(PaWinWdmPin* pin);
-static PaError PinInstantiate(PaWinWdmPin* pin);
-/*static PaError PinGetState(PaWinWdmPin* pin, KSSTATE* state); NOT USED */
-static PaError PinSetState(PaWinWdmPin* pin, KSSTATE state);
-static PaError PinSetFormat(PaWinWdmPin* pin, const WAVEFORMATEX* format);
-static PaError PinIsFormatSupported(PaWinWdmPin* pin, const WAVEFORMATEX* format);
-
-/* Filter management functions */
-static PaWinWdmFilter* FilterNew(
-    TCHAR* filterName,
-    TCHAR* friendlyName,
-    PaError* error);
-static void FilterFree(PaWinWdmFilter* filter);
-static PaWinWdmPin* FilterCreateRenderPin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error);
-static PaWinWdmPin* FilterFindViableRenderPin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error);
-static PaError FilterCanCreateRenderPin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex);
-static PaWinWdmPin* FilterCreateCapturePin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error);
-static PaWinWdmPin* FilterFindViableCapturePin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error);
-static PaError FilterCanCreateCapturePin(
-    PaWinWdmFilter* filter,
-    const WAVEFORMATEX* pwfx);
-static PaError FilterUse(
-    PaWinWdmFilter* filter);
-static void FilterRelease(
-    PaWinWdmFilter* filter);
-
-/* Interface functions */
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError IsFormatSupported(
-    struct PaUtilHostApiRepresentation *hostApi,
-    const PaStreamParameters *inputParameters,
-    const PaStreamParameters *outputParameters,
-    double sampleRate );
-static PaError OpenStream(
-    struct PaUtilHostApiRepresentation *hostApi,
-    PaStream** s,
-    const PaStreamParameters *inputParameters,
-    const PaStreamParameters *outputParameters,
-    double sampleRate,
-    unsigned long framesPerBuffer,
-    PaStreamFlags streamFlags,
-    PaStreamCallback *streamCallback,
-    void *userData );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream(
-    PaStream* stream,
-    void *buffer,
-    unsigned long frames );
-static PaError WriteStream(
-    PaStream* stream,
-    const void *buffer,
-    unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-/* Utility functions */
-static unsigned long GetWfexSize(const WAVEFORMATEX* wfex);
-static PaError BuildFilterList(PaWinWdmHostApiRepresentation* wdmHostApi);
-static BOOL PinWrite(HANDLE h, DATAPACKET* p);
-static BOOL PinRead(HANDLE h, DATAPACKET* p);
-static void DuplicateFirstChannelInt16(void* buffer, int channels, int samples);
-static void DuplicateFirstChannelInt24(void* buffer, int channels, int samples);
-static DWORD WINAPI ProcessingThread(LPVOID pParam);
-
-/* Function bodies */
-
-static unsigned long GetWfexSize(const WAVEFORMATEX* wfex)
-{
-    if( wfex->wFormatTag == WAVE_FORMAT_PCM )
-    {
-        return sizeof( WAVEFORMATEX );
-    }
-    else
-    {
-        return (sizeof( WAVEFORMATEX ) + wfex->cbSize);
-    }
-}
-
-/*
-Low level pin/filter access functions
-*/
-static PaError WdmSyncIoctl(
-    HANDLE handle,
-    unsigned long ioctlNumber,
-    void* inBuffer,
-    unsigned long inBufferCount,
-    void* outBuffer,
-    unsigned long outBufferCount,
-    unsigned long* bytesReturned)
-{
-    PaError result = paNoError;
-    OVERLAPPED overlapped;
-    int boolResult;
-    unsigned long dummyBytesReturned;
-    unsigned long error;
-
-    if( !bytesReturned )
-    {
-        /* User a dummy as the caller hasn't supplied one */
-        bytesReturned = &dummyBytesReturned;
-    }
-
-    FillMemory((void *)&overlapped,sizeof(overlapped),0);
-    overlapped.hEvent = CreateEvent(NULL,FALSE,FALSE,NULL);
-    if( !overlapped.hEvent )
-    {
-          result = paInsufficientMemory;
-        goto error;
-    }
-    overlapped.hEvent = (HANDLE)((DWORD_PTR)overlapped.hEvent | 0x1);
-
-    boolResult = DeviceIoControl(handle, ioctlNumber, inBuffer, inBufferCount,
-        outBuffer, outBufferCount, bytesReturned, &overlapped);
-    if( !boolResult )
-    {
-        error = GetLastError();
-        if( error == ERROR_IO_PENDING )
-        {
-            error = WaitForSingleObject(overlapped.hEvent,INFINITE);
-            if( error != WAIT_OBJECT_0 )
-            {
-                result = paUnanticipatedHostError;
-                goto error;
-            }
-        }
-        else if((( error == ERROR_INSUFFICIENT_BUFFER ) ||
-                  ( error == ERROR_MORE_DATA )) &&
-                  ( ioctlNumber == IOCTL_KS_PROPERTY ) &&
-                  ( outBufferCount == 0 ))
-        {
-            boolResult = TRUE;
-        }
-        else
-        {
-            result = paUnanticipatedHostError;
-        }
-    }
-    if( !boolResult )
-        *bytesReturned = 0;
-
-error:
-    if( overlapped.hEvent )
-    {
-            CloseHandle( overlapped.hEvent );
-    }
-    return result;
-}
-
-static PaError WdmGetPropertySimple(HANDLE handle,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount,
-    void* instance,
-    unsigned long instanceCount)
-{
-    PaError result;
-    KSPROPERTY* ksProperty;
-    unsigned long propertyCount;
-
-    propertyCount = sizeof(KSPROPERTY) + instanceCount;
-    ksProperty = (KSPROPERTY*)PaUtil_AllocateMemory( propertyCount );
-    if( !ksProperty )
-    {
-        return paInsufficientMemory;
-    }
-
-    FillMemory((void*)ksProperty,sizeof(ksProperty),0);
-    ksProperty->Set = *guidPropertySet;
-    ksProperty->Id = property;
-    ksProperty->Flags = KSPROPERTY_TYPE_GET;
-
-    if( instance )
-    {
-        memcpy( (void*)(((char*)ksProperty)+sizeof(KSPROPERTY)), instance, instanceCount );
-    }
-
-    result = WdmSyncIoctl(
-                handle,
-                IOCTL_KS_PROPERTY,
-                ksProperty,
-                propertyCount,
-                value,
-                valueCount,
-                NULL);
-
-    PaUtil_FreeMemory( ksProperty );
-    return result;
-}
-
-static PaError WdmSetPropertySimple(
-    HANDLE handle,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount,
-    void* instance,
-    unsigned long instanceCount)
-{
-    PaError result;
-    KSPROPERTY* ksProperty;
-    unsigned long propertyCount  = 0;
-
-    propertyCount = sizeof(KSPROPERTY) + instanceCount;
-    ksProperty = (KSPROPERTY*)PaUtil_AllocateMemory( propertyCount );
-    if( !ksProperty )
-    {
-        return paInsufficientMemory;
-    }
-
-    ksProperty->Set = *guidPropertySet;
-    ksProperty->Id = property;
-    ksProperty->Flags = KSPROPERTY_TYPE_SET;
-
-    if( instance )
-    {
-        memcpy((void*)((char*)ksProperty + sizeof(KSPROPERTY)), instance, instanceCount);
-    }
-
-    result = WdmSyncIoctl(
-                handle,
-                IOCTL_KS_PROPERTY,
-                ksProperty,
-                propertyCount,
-                value,
-                valueCount,
-                NULL);
-
-    PaUtil_FreeMemory( ksProperty );
-    return result;
-}
-
-static PaError WdmGetPinPropertySimple(
-    HANDLE  handle,
-    unsigned long pinId,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    void* value,
-    unsigned long valueCount)
-{
-    PaError result;
-
-    KSP_PIN ksPProp;
-    ksPProp.Property.Set = *guidPropertySet;
-    ksPProp.Property.Id = property;
-    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
-    ksPProp.PinId = pinId;
-    ksPProp.Reserved = 0;
-
-    result = WdmSyncIoctl(
-                handle,
-                IOCTL_KS_PROPERTY,
-                &ksPProp,
-                sizeof(KSP_PIN),
-                value,
-                valueCount,
-                NULL);
-
-    return result;
-}
-
-static PaError WdmGetPinPropertyMulti(
-    HANDLE handle,
-    unsigned long pinId,
-    const GUID* const guidPropertySet,
-    unsigned long property,
-    KSMULTIPLE_ITEM** ksMultipleItem)
-{
-    PaError result;
-    unsigned long multipleItemSize = 0;
-    KSP_PIN ksPProp;
-
-    ksPProp.Property.Set = *guidPropertySet;
-    ksPProp.Property.Id = property;
-    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
-    ksPProp.PinId = pinId;
-    ksPProp.Reserved = 0;
-
-    result = WdmSyncIoctl(
-                handle,
-                IOCTL_KS_PROPERTY,
-                &ksPProp.Property,
-                sizeof(KSP_PIN),
-                NULL,
-                0,
-                &multipleItemSize);
-    if( result != paNoError )
-    {
-        return result;
-    }
-
-    *ksMultipleItem = (KSMULTIPLE_ITEM*)PaUtil_AllocateMemory( multipleItemSize );
-    if( !*ksMultipleItem )
-    {
-        return paInsufficientMemory;
-    }
-
-    result = WdmSyncIoctl(
-                handle,
-                IOCTL_KS_PROPERTY,
-                &ksPProp,
-                sizeof(KSP_PIN),
-                (void*)*ksMultipleItem,
-                multipleItemSize,
-                NULL);
-
-    if( result != paNoError )
-    {
-        PaUtil_FreeMemory( ksMultipleItem );
-    }
-
-    return result;
-}
-
-
-/*
-Create a new pin object belonging to a filter
-The pin object holds all the configuration information about the pin
-before it is opened, and then the handle of the pin after is opened
-*/
-static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, PaError* error)
-{
-    PaWinWdmPin* pin;
-    PaError result;
-    unsigned long i;
-    KSMULTIPLE_ITEM* item = NULL;
-    KSIDENTIFIER* identifier;
-    KSDATARANGE* dataRange;
-
-    PA_LOGE_;
-    PA_DEBUG(("Creating pin %d:\n",pinId));
-
-    /* Allocate the new PIN object */
-    pin = (PaWinWdmPin*)PaUtil_AllocateMemory( sizeof(PaWinWdmPin) );
-    if( !pin )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    /* Zero the pin object */
-    /* memset( (void*)pin, 0, sizeof(PaWinWdmPin) ); */
-
-    pin->parentFilter = parentFilter;
-    pin->pinId = pinId;
-
-    /* Allocate a connect structure */
-    pin->pinConnectSize = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX);
-    pin->pinConnect = (KSPIN_CONNECT*)PaUtil_AllocateMemory( pin->pinConnectSize );
-    if( !pin->pinConnect )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    /* Configure the connect structure with default values */
-    pin->pinConnect->Interface.Set               = KSINTERFACESETID_Standard;
-    pin->pinConnect->Interface.Id                = KSINTERFACE_STANDARD_STREAMING;
-    pin->pinConnect->Interface.Flags             = 0;
-    pin->pinConnect->Medium.Set                  = KSMEDIUMSETID_Standard;
-    pin->pinConnect->Medium.Id                   = KSMEDIUM_TYPE_ANYINSTANCE;
-    pin->pinConnect->Medium.Flags                = 0;
-    pin->pinConnect->PinId                       = pinId;
-    pin->pinConnect->PinToHandle                 = NULL;
-    pin->pinConnect->Priority.PriorityClass      = KSPRIORITY_NORMAL;
-    pin->pinConnect->Priority.PrioritySubClass   = 1;
-    pin->ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX*)(pin->pinConnect + 1);
-    pin->ksDataFormatWfx->DataFormat.FormatSize  = sizeof(KSDATAFORMAT_WAVEFORMATEX);
-    pin->ksDataFormatWfx->DataFormat.Flags       = 0;
-    pin->ksDataFormatWfx->DataFormat.Reserved    = 0;
-    pin->ksDataFormatWfx->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO;
-    pin->ksDataFormatWfx->DataFormat.SubFormat   = KSDATAFORMAT_SUBTYPE_PCM;
-    pin->ksDataFormatWfx->DataFormat.Specifier   = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX;
-
-    pin->frameSize = 0; /* Unknown until we instantiate pin */
-
-    /* Get the COMMUNICATION property */
-    result = WdmGetPinPropertySimple(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_COMMUNICATION,
-        &pin->communication,
-        sizeof(KSPIN_COMMUNICATION));
-    if( result != paNoError )
-        goto error;
-
-    if( /*(pin->communication != KSPIN_COMMUNICATION_SOURCE) &&*/
-         (pin->communication != KSPIN_COMMUNICATION_SINK) &&
-         (pin->communication != KSPIN_COMMUNICATION_BOTH) )
-    {
-        PA_DEBUG(("Not source/sink\n"));
-        result = paInvalidDevice;
-        goto error;
-    }
-
-    /* Get dataflow information */
-    result = WdmGetPinPropertySimple(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_DATAFLOW,
-        &pin->dataFlow,
-        sizeof(KSPIN_DATAFLOW));
-
-    if( result != paNoError )
-        goto error;
-
-    /* Get the INTERFACE property list */
-    result = WdmGetPinPropertyMulti(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_INTERFACES,
-        &item);
-
-    if( result != paNoError )
-        goto error;
-
-    identifier = (KSIDENTIFIER*)(item+1);
-
-    /* Check that at least one interface is STANDARD_STREAMING */
-    result = paUnanticipatedHostError;
-    for( i = 0; i < item->Count; i++ )
-    {
-        if( !memcmp( (void*)&identifier[i].Set, (void*)&KSINTERFACESETID_Standard, sizeof( GUID ) ) &&
-            ( identifier[i].Id == KSINTERFACE_STANDARD_STREAMING ) )
-        {
-            result = paNoError;
-            break;
-        }
-    }
-
-    if( result != paNoError )
-    {
-        PA_DEBUG(("No standard streaming\n"));
-        goto error;
-    }
-
-    /* Don't need interfaces any more */
-    PaUtil_FreeMemory( item );
-    item = NULL;
-
-    /* Get the MEDIUM properties list */
-    result = WdmGetPinPropertyMulti(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_MEDIUMS,
-        &item);
-
-    if( result != paNoError )
-        goto error;
-
-    identifier = (KSIDENTIFIER*)(item+1); /* Not actually necessary... */
-
-    /* Check that at least one medium is STANDARD_DEVIO */
-    result = paUnanticipatedHostError;
-    for( i = 0; i < item->Count; i++ )
-    {
-        if( !memcmp( (void*)&identifier[i].Set, (void*)&KSMEDIUMSETID_Standard, sizeof( GUID ) ) &&
-           ( identifier[i].Id == KSMEDIUM_STANDARD_DEVIO ) )
-        {
-            result = paNoError;
-            break;
-        }
-    }
-
-    if( result != paNoError )
-    {
-        PA_DEBUG(("No standard devio\n"));
-        goto error;
-    }
-    /* Don't need mediums any more */
-    PaUtil_FreeMemory( item );
-    item = NULL;
-
-    /* Get DATARANGES */
-    result = WdmGetPinPropertyMulti(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_DATARANGES,
-        &pin->dataRangesItem);
-
-    if( result != paNoError )
-        goto error;
-
-    pin->dataRanges = (KSDATARANGE*)(pin->dataRangesItem +1);
-
-    /* Check that at least one datarange supports audio */
-    result = paUnanticipatedHostError;
-    dataRange = pin->dataRanges;
-    pin->maxChannels = 0;
-    pin->bestSampleRate = 0;
-    pin->formats = 0;
-    for( i = 0; i <pin->dataRangesItem->Count; i++)
-    {
-        PA_DEBUG(("DR major format %x\n",*(unsigned long*)(&(dataRange->MajorFormat))));
-        /* Check that subformat is WAVEFORMATEX, PCM or WILDCARD */
-        if( IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat) ||
-            !memcmp((void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_PCM, sizeof ( GUID ) ) ||
-            ( !memcmp((void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof ( GUID ) ) &&
-            ( !memcmp((void*)&dataRange->MajorFormat, (void*)&KSDATAFORMAT_TYPE_AUDIO, sizeof ( GUID ) ) ) ) )
-        {
-            result = paNoError;
-            /* Record the maximum possible channels with this pin */
-            PA_DEBUG(("MaxChannel: %d\n",pin->maxChannels));
-            if( (int)((KSDATARANGE_AUDIO*)dataRange)->MaximumChannels > pin->maxChannels )
-            {
-                pin->maxChannels = ((KSDATARANGE_AUDIO*)dataRange)->MaximumChannels;
-                /*PA_DEBUG(("MaxChannel: %d\n",pin->maxChannels));*/
-            }
-            /* Record the formats (bit depths) that are supported */
-            if( ((KSDATARANGE_AUDIO*)dataRange)->MinimumBitsPerSample <= 16 )
-            {
-                pin->formats |= paInt16;
-                PA_DEBUG(("Format 16 bit supported\n"));
-            }
-            if( ((KSDATARANGE_AUDIO*)dataRange)->MaximumBitsPerSample >= 24 )
-            {
-                pin->formats |= paInt24;
-                PA_DEBUG(("Format 24 bit supported\n"));
-            }
-            if( ( pin->bestSampleRate != 48000) &&
-                (((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency >= 48000) &&
-                (((KSDATARANGE_AUDIO*)dataRange)->MinimumSampleFrequency <= 48000) )
-            {
-                pin->bestSampleRate = 48000;
-                PA_DEBUG(("48kHz supported\n"));
-            }
-            else if(( pin->bestSampleRate != 48000) && ( pin->bestSampleRate != 44100 ) &&
-                (((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency >= 44100) &&
-                (((KSDATARANGE_AUDIO*)dataRange)->MinimumSampleFrequency <= 44100) )
-            {
-                pin->bestSampleRate = 44100;
-                PA_DEBUG(("44.1kHz supported\n"));
-            }
-            else
-            {
-                pin->bestSampleRate = ((KSDATARANGE_AUDIO*)dataRange)->MaximumSampleFrequency;
-            }
-        }
-        dataRange = (KSDATARANGE*)( ((char*)dataRange) + dataRange->FormatSize);
-    }
-
-    if( result != paNoError )
-        goto error;
-
-    /* Get instance information */
-    result = WdmGetPinPropertySimple(
-        parentFilter->handle,
-        pinId,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_CINSTANCES,
-        &pin->instances,
-        sizeof(KSPIN_CINSTANCES));
-
-    if( result != paNoError )
-        goto error;
-
-    /* Success */
-    *error = paNoError;
-    PA_DEBUG(("Pin created successfully\n"));
-    PA_LOGL_;
-    return pin;
-
-error:
-    /*
-    Error cleanup
-    */
-    PaUtil_FreeMemory( item );
-    if( pin )
-    {
-        PaUtil_FreeMemory( pin->pinConnect );
-        PaUtil_FreeMemory( pin->dataRangesItem );
-        PaUtil_FreeMemory( pin );
-    }
-    *error = result;
-    PA_LOGL_;
-    return NULL;
-}
-
-/*
-Safely free all resources associated with the pin
-*/
-static void PinFree(PaWinWdmPin* pin)
-{
-    PA_LOGE_;
-    if( pin )
-    {
-        PinClose(pin);
-        if( pin->pinConnect )
-        {
-            PaUtil_FreeMemory( pin->pinConnect );
-        }
-        if( pin->dataRangesItem )
-        {
-            PaUtil_FreeMemory( pin->dataRangesItem );
-        }
-        PaUtil_FreeMemory( pin );
-    }
-    PA_LOGL_;
-}
-
-/*
-If the pin handle is open, close it
-*/
-static void PinClose(PaWinWdmPin* pin)
-{
-    PA_LOGE_;
-    if( pin == NULL )
-    {
-        PA_DEBUG(("Closing NULL pin!"));
-        PA_LOGL_;
-        return;
-    }
-    if( pin->handle != NULL )
-    {
-        PinSetState( pin, KSSTATE_PAUSE );
-        PinSetState( pin, KSSTATE_STOP );
-        CloseHandle( pin->handle );
-        pin->handle = NULL;
-        FilterRelease(pin->parentFilter);
-    }
-    PA_LOGL_;
-}
-
-/*
-Set the state of this (instantiated) pin
-*/
-static PaError PinSetState(PaWinWdmPin* pin, KSSTATE state)
-{
-    PaError result;
-
-    PA_LOGE_;
-    if( pin == NULL )
-        return paInternalError;
-    if( pin->handle == NULL )
-        return paInternalError;
-
-    result = WdmSetPropertySimple(
-        pin->handle,
-        &KSPROPSETID_Connection,
-        KSPROPERTY_CONNECTION_STATE,
-        &state,
-        sizeof(state),
-        NULL,
-        0);
-    PA_LOGL_;
-    return result;
-}
-
-static PaError PinInstantiate(PaWinWdmPin* pin)
-{
-    PaError result;
-    unsigned long createResult;
-    KSALLOCATOR_FRAMING ksaf;
-    KSALLOCATOR_FRAMING_EX ksafex;
-
-    PA_LOGE_;
-
-    if( pin == NULL )
-        return paInternalError;
-    if(!pin->pinConnect)
-        return paInternalError;
-
-    FilterUse(pin->parentFilter);
-
-    createResult = FunctionKsCreatePin(
-        pin->parentFilter->handle,
-        pin->pinConnect,
-        GENERIC_WRITE | GENERIC_READ,
-        &pin->handle
-        );
-
-    PA_DEBUG(("Pin create result = %x\n",createResult));
-    if( createResult != ERROR_SUCCESS )
-    {
-        FilterRelease(pin->parentFilter);
-        pin->handle = NULL;
-        return paInvalidDevice;
-    }
-
-    result = WdmGetPropertySimple(
-        pin->handle,
-        &KSPROPSETID_Connection,
-        KSPROPERTY_CONNECTION_ALLOCATORFRAMING,
-        &ksaf,
-        sizeof(ksaf),
-        NULL,
-        0);
-
-    if( result != paNoError )
-    {
-        result = WdmGetPropertySimple(
-            pin->handle,
-            &KSPROPSETID_Connection,
-            KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX,
-            &ksafex,
-            sizeof(ksafex),
-            NULL,
-            0);
-        if( result == paNoError )
-        {
-            pin->frameSize = ksafex.FramingItem[0].FramingRange.Range.MinFrameSize;
-        }
-    }
-    else
-    {
-        pin->frameSize = ksaf.FrameSize;
-    }
-
-    PA_LOGL_;
-
-    return paNoError;
-}
-
-/* NOT USED
-static PaError PinGetState(PaWinWdmPin* pin, KSSTATE* state)
-{
-    PaError result;
-
-    if( state == NULL )
-        return paInternalError;
-    if( pin == NULL )
-        return paInternalError;
-    if( pin->handle == NULL )
-        return paInternalError;
-
-    result = WdmGetPropertySimple(
-        pin->handle,
-        KSPROPSETID_Connection,
-        KSPROPERTY_CONNECTION_STATE,
-        state,
-        sizeof(KSSTATE),
-        NULL,
-        0);
-
-    return result;
-}
-*/
-static PaError PinSetFormat(PaWinWdmPin* pin, const WAVEFORMATEX* format)
-{
-    unsigned long size;
-    void* newConnect;
-
-    PA_LOGE_;
-
-    if( pin == NULL )
-        return paInternalError;
-    if( format == NULL )
-        return paInternalError;
-
-    size = GetWfexSize(format) + sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX) - sizeof(WAVEFORMATEX);
-
-    if( pin->pinConnectSize != size )
-    {
-        newConnect = PaUtil_AllocateMemory( size );
-        if( newConnect == NULL )
-            return paInsufficientMemory;
-        memcpy( newConnect, (void*)pin->pinConnect, min(pin->pinConnectSize,size) );
-        PaUtil_FreeMemory( pin->pinConnect );
-        pin->pinConnect = (KSPIN_CONNECT*)newConnect;
-        pin->pinConnectSize = size;
-        pin->ksDataFormatWfx = (KSDATAFORMAT_WAVEFORMATEX*)((KSPIN_CONNECT*)newConnect + 1);
-        pin->ksDataFormatWfx->DataFormat.FormatSize = size - sizeof(KSPIN_CONNECT);
-    }
-
-    memcpy( (void*)&(pin->ksDataFormatWfx->WaveFormatEx), format, GetWfexSize(format) );
-    pin->ksDataFormatWfx->DataFormat.SampleSize = (unsigned short)(format->nChannels * (format->wBitsPerSample / 8));
-
-    PA_LOGL_;
-
-    return paNoError;
-}
-
-static PaError PinIsFormatSupported(PaWinWdmPin* pin, const WAVEFORMATEX* format)
-{
-    KSDATARANGE_AUDIO* dataRange;
-    unsigned long count;
-    GUID guid = DYNAMIC_GUID( DEFINE_WAVEFORMATEX_GUID(format->wFormatTag) );
-    PaError result = paInvalidDevice;
-
-    PA_LOGE_;
-
-    if( format->wFormatTag == WAVE_FORMAT_EXTENSIBLE )
-    {
-        guid = ((WAVEFORMATEXTENSIBLE*)format)->SubFormat;
-    }
-    dataRange = (KSDATARANGE_AUDIO*)pin->dataRanges;
-    for(count = 0; count<pin->dataRangesItem->Count; count++)
-    {
-        if(( !memcmp(&(dataRange->DataRange.MajorFormat),&KSDATAFORMAT_TYPE_AUDIO,sizeof(GUID)) ) ||
-           ( !memcmp(&(dataRange->DataRange.MajorFormat),&KSDATAFORMAT_TYPE_WILDCARD,sizeof(GUID)) ))
-        {
-            /* This is an audio or wildcard datarange... */
-            if(( !memcmp(&(dataRange->DataRange.SubFormat),&KSDATAFORMAT_SUBTYPE_WILDCARD,sizeof(GUID)) ) ||
-                ( !memcmp(&(dataRange->DataRange.SubFormat),&guid,sizeof(GUID)) ))
-            {
-                if(( !memcmp(&(dataRange->DataRange.Specifier),&KSDATAFORMAT_SPECIFIER_WILDCARD,sizeof(GUID)) ) ||
-                  ( !memcmp(&(dataRange->DataRange.Specifier),&KSDATAFORMAT_SPECIFIER_WAVEFORMATEX,sizeof(GUID) )))
-                {
-
-                    PA_DEBUG(("Pin:%x, DataRange:%d\n",(void*)pin,count));
-                    PA_DEBUG(("\tFormatSize:%d, SampleSize:%d\n",dataRange->DataRange.FormatSize,dataRange->DataRange.SampleSize));
-                    PA_DEBUG(("\tMaxChannels:%d\n",dataRange->MaximumChannels));
-                    PA_DEBUG(("\tBits:%d-%d\n",dataRange->MinimumBitsPerSample,dataRange->MaximumBitsPerSample));
-                    PA_DEBUG(("\tSampleRate:%d-%d\n",dataRange->MinimumSampleFrequency,dataRange->MaximumSampleFrequency));
-
-                    if( dataRange->MaximumChannels < format->nChannels )
-                    {
-                        result = paInvalidChannelCount;
-                        continue;
-                    }
-                    if( dataRange->MinimumBitsPerSample > format->wBitsPerSample )
-                    {
-                        result = paSampleFormatNotSupported;
-                        continue;
-                    }
-                    if( dataRange->MaximumBitsPerSample < format->wBitsPerSample )
-                    {
-                        result = paSampleFormatNotSupported;
-                        continue;
-                    }
-                    if( dataRange->MinimumSampleFrequency > format->nSamplesPerSec )
-                    {
-                        result = paInvalidSampleRate;
-                        continue;
-                    }
-                    if( dataRange->MaximumSampleFrequency < format->nSamplesPerSec )
-                    {
-                        result = paInvalidSampleRate;
-                        continue;
-                    }
-                    /* Success! */
-                    PA_LOGL_;
-                    return paNoError;
-                }
-            }
-        }
-        dataRange = (KSDATARANGE_AUDIO*)( ((char*)dataRange) + dataRange->DataRange.FormatSize);
-    }
-
-    PA_LOGL_;
-
-    return result;
-}
-
-/**
- * Create a new filter object
- */
-static PaWinWdmFilter* FilterNew(TCHAR* filterName, TCHAR* friendlyName, PaError* error)
-{
-    PaWinWdmFilter* filter;
-    PaError result;
-    int pinId;
-    int valid;
-
-
-    /* Allocate the new filter object */
-    filter = (PaWinWdmFilter*)PaUtil_AllocateMemory( sizeof(PaWinWdmFilter) );
-    if( !filter )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    /* Zero the filter object - done by AllocateMemory */
-    /* memset( (void*)filter, 0, sizeof(PaWinWdmFilter) ); */
-
-    /* Copy the filter name */
-    _tcsncpy(filter->filterName, filterName, MAX_PATH);
-
-    /* Copy the friendly name */
-    _tcsncpy(filter->friendlyName, friendlyName, MAX_PATH);
-
-    /* Open the filter handle */
-    result = FilterUse(filter);
-    if( result != paNoError )
-    {
-        goto error;
-    }
-
-    /* Get pin count */
-    result = WdmGetPinPropertySimple
-        (
-        filter->handle,
-        0,
-        &KSPROPSETID_Pin,
-        KSPROPERTY_PIN_CTYPES,
-        &filter->pinCount,
-        sizeof(filter->pinCount)
-        );
-
-    if( result != paNoError)
-    {
-        goto error;
-    }
-
-    /* Allocate pointer array to hold the pins */
-    filter->pins = (PaWinWdmPin**)PaUtil_AllocateMemory( sizeof(PaWinWdmPin*) * filter->pinCount );
-    if( !filter->pins )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    /* Create all the pins we can */
-    filter->maxInputChannels = 0;
-    filter->maxOutputChannels = 0;
-    filter->bestSampleRate = 0;
-
-    valid = 0;
-    for(pinId = 0; pinId < filter->pinCount; pinId++)
-    {
-        /* Create the pin with this Id */
-        PaWinWdmPin* newPin;
-        newPin = PinNew(filter, pinId, &result);
-        if( result == paInsufficientMemory )
-            goto error;
-        if( newPin != NULL )
-        {
-            filter->pins[pinId] = newPin;
-            valid = 1;
-
-            /* Get the max output channel count */
-            if(( newPin->dataFlow == KSPIN_DATAFLOW_IN ) &&
-                (( newPin->communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( newPin->communication == KSPIN_COMMUNICATION_BOTH)))
-            {
-                if(newPin->maxChannels > filter->maxOutputChannels)
-                    filter->maxOutputChannels = newPin->maxChannels;
-                filter->formats |= newPin->formats;
-            }
-            /* Get the max input channel count */
-            if(( newPin->dataFlow == KSPIN_DATAFLOW_OUT ) &&
-                (( newPin->communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( newPin->communication == KSPIN_COMMUNICATION_BOTH)))
-            {
-                if(newPin->maxChannels > filter->maxInputChannels)
-                    filter->maxInputChannels = newPin->maxChannels;
-                filter->formats |= newPin->formats;
-            }
-
-            if(newPin->bestSampleRate > filter->bestSampleRate)
-            {
-                filter->bestSampleRate = newPin->bestSampleRate;
-            }
-        }
-    }
-
-    if(( filter->maxInputChannels == 0) && ( filter->maxOutputChannels == 0))
-    {
-        /* No input or output... not valid */
-        valid = 0;
-    }
-
-    if( !valid )
-    {
-        /* No valid pin was found on this filter so we destroy it */
-        result = paDeviceUnavailable;
-        goto error;
-    }
-
-    /* Close the filter handle for now
-     * It will be opened later when needed */
-    FilterRelease(filter);
-
-    *error = paNoError;
-    return filter;
-
-error:
-    /*
-    Error cleanup
-    */
-    if( filter )
-    {
-        for( pinId = 0; pinId < filter->pinCount; pinId++ )
-            PinFree(filter->pins[pinId]);
-        PaUtil_FreeMemory( filter->pins );
-        if( filter->handle )
-            CloseHandle( filter->handle );
-        PaUtil_FreeMemory( filter );
-    }
-    *error = result;
-    return NULL;
-}
-
-/**
- * Free a previously created filter
- */
-static void FilterFree(PaWinWdmFilter* filter)
-{
-    int pinId;
-    PA_LOGL_;
-    if( filter )
-    {
-        for( pinId = 0; pinId < filter->pinCount; pinId++ )
-            PinFree(filter->pins[pinId]);
-        PaUtil_FreeMemory( filter->pins );
-        if( filter->handle )
-            CloseHandle( filter->handle );
-        PaUtil_FreeMemory( filter );
-    }
-    PA_LOGE_;
-}
-
-/**
- * Reopen the filter handle if necessary so it can be used
- **/
-static PaError FilterUse(PaWinWdmFilter* filter)
-{
-    assert( filter );
-
-    PA_LOGE_;
-    if( filter->handle == NULL )
-    {
-        /* Open the filter */
-        filter->handle = CreateFile(
-            filter->filterName,
-            GENERIC_READ | GENERIC_WRITE,
-            0,
-            NULL,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
-            NULL);
-
-        if( filter->handle == NULL )
-        {
-            return paDeviceUnavailable;
-        }
-    }
-    filter->usageCount++;
-    PA_LOGL_;
-    return paNoError;
-}
-
-/**
- * Release the filter handle if nobody is using it
- **/
-static void FilterRelease(PaWinWdmFilter* filter)
-{
-    assert( filter );
-    assert( filter->usageCount > 0 );
-
-    PA_LOGE_;
-    filter->usageCount--;
-    if( filter->usageCount == 0 )
-    {
-        if( filter->handle != NULL )
-        {
-            CloseHandle( filter->handle );
-            filter->handle = NULL;
-        }
-    }
-    PA_LOGL_;
-}
-
-/**
- * Create a render (playback) Pin using the supplied format
- **/
-static PaWinWdmPin* FilterCreateRenderPin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error)
-{
-    PaError result;
-    PaWinWdmPin* pin;
-
-    assert( filter );
-
-    pin = FilterFindViableRenderPin(filter,wfex,&result);
-    if(!pin)
-    {
-        goto error;
-    }
-    result = PinSetFormat(pin,wfex);
-    if( result != paNoError )
-    {
-        goto error;
-    }
-    result = PinInstantiate(pin);
-    if( result != paNoError )
-    {
-        goto error;
-    }
-
-    *error = paNoError;
-    return pin;
-
-error:
-    *error = result;
-    return NULL;
-}
-
-/**
- * Find a pin that supports the given format
- **/
-static PaWinWdmPin* FilterFindViableRenderPin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error)
-{
-    int pinId;
-    PaWinWdmPin*  pin;
-    PaError result = paDeviceUnavailable;
-    *error = paNoError;
-
-    assert( filter );
-
-    for( pinId = 0; pinId<filter->pinCount; pinId++ )
-    {
-        pin = filter->pins[pinId];
-        if( pin != NULL )
-        {
-            if(( pin->dataFlow == KSPIN_DATAFLOW_IN ) &&
-                (( pin->communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( pin->communication == KSPIN_COMMUNICATION_BOTH)))
-            {
-                result = PinIsFormatSupported( pin, wfex );
-                if( result == paNoError )
-                {
-                    return pin;
-                }
-            }
-        }
-    }
-
-    *error = result;
-    return NULL;
-}
-
-/**
- * Check if there is a pin that should playback
- * with the supplied format
- **/
-static PaError FilterCanCreateRenderPin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex)
-{
-    PaWinWdmPin* pin;
-    PaError result;
-
-    assert ( filter );
-
-    pin = FilterFindViableRenderPin(filter,wfex,&result);
-    /* result will be paNoError if pin found
-     * or else an error code indicating what is wrong with the format
-     **/
-    return result;
-}
-
-/**
- * Create a capture (record) Pin using the supplied format
- **/
-static PaWinWdmPin* FilterCreateCapturePin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error)
-{
-    PaError result;
-    PaWinWdmPin* pin;
-
-    assert( filter );
-
-    pin = FilterFindViableCapturePin(filter,wfex,&result);
-    if(!pin)
-    {
-        goto error;
-    }
-
-    result = PinSetFormat(pin,wfex);
-    if( result != paNoError )
-    {
-        goto error;
-    }
-
-    result = PinInstantiate(pin);
-    if( result != paNoError )
-    {
-        goto error;
-    }
-
-    *error = paNoError;
-    return pin;
-
-error:
-    *error = result;
-    return NULL;
-}
-
-/**
- * Find a capture pin that supports the given format
- **/
-static PaWinWdmPin* FilterFindViableCapturePin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex,
-    PaError* error)
-{
-    int pinId;
-    PaWinWdmPin*  pin;
-    PaError result = paDeviceUnavailable;
-    *error = paNoError;
-
-    assert( filter );
-
-    for( pinId = 0; pinId<filter->pinCount; pinId++ )
-    {
-        pin = filter->pins[pinId];
-        if( pin != NULL )
-        {
-            if(( pin->dataFlow == KSPIN_DATAFLOW_OUT ) &&
-                (( pin->communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( pin->communication == KSPIN_COMMUNICATION_BOTH)))
-            {
-                result = PinIsFormatSupported( pin, wfex );
-                if( result == paNoError )
-                {
-                    return pin;
-                }
-            }
-        }
-    }
-
-    *error = result;
-    return NULL;
-}
-
-/**
- * Check if there is a pin that should playback
- * with the supplied format
- **/
-static PaError FilterCanCreateCapturePin(PaWinWdmFilter* filter,
-    const WAVEFORMATEX* wfex)
-{
-    PaWinWdmPin* pin;
-    PaError result;
-
-    assert ( filter );
-
-    pin = FilterFindViableCapturePin(filter,wfex,&result);
-    /* result will be paNoError if pin found
-     * or else an error code indicating what is wrong with the format
-     **/
-    return result;
-}
-
-/**
- * Build the list of available filters
- * Use the SetupDi API to enumerate all devices in the KSCATEGORY_AUDIO which 
- * have a KSCATEGORY_RENDER or KSCATEGORY_CAPTURE alias. For each of these 
- * devices initialise a PaWinWdmFilter structure by calling our NewFilter() 
- * function. We enumerate devices twice, once to count how many there are, 
- * and once to initialize the PaWinWdmFilter structures.
- */
-static PaError BuildFilterList(PaWinWdmHostApiRepresentation* wdmHostApi)
-{
-    PaError result = paNoError;
-    HDEVINFO handle = NULL;
-    int device;
-    int invalidDevices;
-    int slot;
-    SP_DEVICE_INTERFACE_DATA interfaceData;
-    SP_DEVICE_INTERFACE_DATA aliasData;
-    SP_DEVINFO_DATA devInfoData;
-    int noError;
-    const int sizeInterface = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + (MAX_PATH * sizeof(WCHAR));
-    unsigned char interfaceDetailsArray[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + (MAX_PATH * sizeof(WCHAR))];
-    SP_DEVICE_INTERFACE_DETAIL_DATA* devInterfaceDetails = (SP_DEVICE_INTERFACE_DETAIL_DATA*)interfaceDetailsArray;
-    TCHAR friendlyName[MAX_PATH];
-    HKEY hkey;
-    DWORD sizeFriendlyName;
-    DWORD type;
-    PaWinWdmFilter* newFilter;
-    GUID* category = (GUID*)&KSCATEGORY_AUDIO;
-    GUID* alias_render = (GUID*)&KSCATEGORY_RENDER;
-    GUID* alias_capture = (GUID*)&KSCATEGORY_CAPTURE;
-    DWORD hasAlias;
-
-    PA_LOGE_;
-
-    devInterfaceDetails->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-
-    /* Open a handle to search for devices (filters) */
-    handle = SetupDiGetClassDevs(category,NULL,NULL,DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-    if( handle == NULL )
-    {
-        return paUnanticipatedHostError;
-    }
-    PA_DEBUG(("Setup called\n"));
-
-    /* First let's count the number of devices so we can allocate a list */
-    invalidDevices = 0;
-    for( device = 0;;device++ )
-    {
-        interfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-        interfaceData.Reserved = 0;
-        aliasData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-        aliasData.Reserved = 0;
-        noError = SetupDiEnumDeviceInterfaces(handle,NULL,category,device,&interfaceData);
-        PA_DEBUG(("Enum called\n"));
-        if( !noError )
-            break; /* No more devices */
-
-        /* Check this one has the render or capture alias */
-        hasAlias = 0;
-        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_render,&aliasData);
-        PA_DEBUG(("noError = %d\n",noError));
-        if(noError)
-        {
-            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
-            {
-                PA_DEBUG(("Device %d has render alias\n",device));
-                hasAlias |= 1; /* Has render alias */
-            }
-            else
-            {
-                PA_DEBUG(("Device %d has no render alias\n",device));
-            }
-        }
-        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_capture,&aliasData);
-        if(noError)
-        {
-            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
-            {
-                PA_DEBUG(("Device %d has capture alias\n",device));
-                hasAlias |= 2; /* Has capture alias */
-            }
-            else
-            {
-                PA_DEBUG(("Device %d has no capture alias\n",device));
-            }
-        }
-        if(!hasAlias)
-            invalidDevices++; /* This was not a valid capture or render audio device */
-
-    }
-    /* Remember how many there are */
-    wdmHostApi->filterCount = device-invalidDevices;
-
-    PA_DEBUG(("Interfaces found: %d\n",device-invalidDevices));
-
-    /* Now allocate the list of pointers to devices */
-    wdmHostApi->filters  = (PaWinWdmFilter**)PaUtil_AllocateMemory( sizeof(PaWinWdmFilter*) * device );
-    if( !wdmHostApi->filters )
-    {
-        if(handle != NULL)
-            SetupDiDestroyDeviceInfoList(handle);
-        return paInsufficientMemory;
-    }
-
-    /* Now create filter objects for each interface found */
-    slot = 0;
-    for( device = 0;;device++ )
-    {
-        interfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-        interfaceData.Reserved = 0;
-        aliasData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
-        aliasData.Reserved = 0;
-        devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
-        devInfoData.Reserved = 0;
-
-        noError = SetupDiEnumDeviceInterfaces(handle,NULL,category,device,&interfaceData);
-        if( !noError )
-            break; /* No more devices */
-
-        /* Check this one has the render or capture alias */
-        hasAlias = 0;
-        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_render,&aliasData);
-        if(noError)
-        {
-            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
-            {
-                PA_DEBUG(("Device %d has render alias\n",device));
-                hasAlias |= 1; /* Has render alias */
-            }
-        }
-        noError = SetupDiGetDeviceInterfaceAlias(handle,&interfaceData,alias_capture,&aliasData);
-        if(noError)
-        {
-            if(aliasData.Flags && (!(aliasData.Flags & SPINT_REMOVED)))
-            {
-                PA_DEBUG(("Device %d has capture alias\n",device));
-                hasAlias |= 2; /* Has capture alias */
-            }
-        }
-        if(!hasAlias)
-            continue; /* This was not a valid capture or render audio device */
-
-        noError = SetupDiGetDeviceInterfaceDetail(handle,&interfaceData,devInterfaceDetails,sizeInterface,NULL,&devInfoData);
-        if( noError )
-        {
-            /* Try to get the "friendly name" for this interface */
-            sizeFriendlyName = sizeof(friendlyName);
-            /* Fix contributed by Ben Allison
-             * Removed KEY_SET_VALUE from flags on following call
-             * as its causes failure when running without admin rights
-             * and it was not required */
-            hkey=SetupDiOpenDeviceInterfaceRegKey(handle,&interfaceData,0,KEY_QUERY_VALUE);
-            if(hkey!=INVALID_HANDLE_VALUE)
-            {
-                noError = RegQueryValueEx(hkey,TEXT("FriendlyName"),0,&type,(BYTE*)friendlyName,&sizeFriendlyName);
-                if( noError == ERROR_SUCCESS )
-                {
-                    PA_DEBUG(("Interface %d, Name: %s\n",device,friendlyName));
-                    RegCloseKey(hkey);
-                }
-                else
-                {
-                    friendlyName[0] = 0;
-                }
-            }
-            newFilter = FilterNew(devInterfaceDetails->DevicePath,friendlyName,&result);
-            if( result == paNoError )
-            {
-                PA_DEBUG(("Filter created\n"));
-                wdmHostApi->filters[slot] = newFilter;
-                slot++;
-            }
-            else
-            {
-                PA_DEBUG(("Filter NOT created\n"));
-                /* As there are now less filters than we initially thought
-                 * we must reduce the count by one */
-                wdmHostApi->filterCount--;
-            }
-        }
-    }
-
-    /* Clean up */
-    if(handle != NULL)
-        SetupDiDestroyDeviceInfoList(handle);
-
-    return paNoError;
-}
-
-PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i, deviceCount;
-    PaWinWdmHostApiRepresentation *wdmHostApi;
-    PaWinWdmDeviceInfo *deviceInfoArray;
-    PaWinWdmFilter* pFilter;
-    PaWinWdmDeviceInfo *wdmDeviceInfo;
-    PaDeviceInfo *deviceInfo;
-
-    PA_LOGE_;
-
-    /*
-    Attempt to load the KSUSER.DLL without which we cannot create pins
-    We will unload this on termination
-    */
-    if(DllKsUser == NULL)
-    {
-        DllKsUser = LoadLibrary(TEXT("ksuser.dll"));
-        if(DllKsUser == NULL)
-            goto error;
-    }
-
-    FunctionKsCreatePin = (KSCREATEPIN*)GetProcAddress(DllKsUser, "KsCreatePin");
-    if(FunctionKsCreatePin == NULL)
-        goto error;
-
-    wdmHostApi = (PaWinWdmHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinWdmHostApiRepresentation) );
-    if( !wdmHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    wdmHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !wdmHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    result = BuildFilterList( wdmHostApi );
-    if( result != paNoError )
-    {
-        goto error;
-    }
-    deviceCount = wdmHostApi->filterCount;
-
-    *hostApi = &wdmHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paWDMKS;
-    (*hostApi)->info.name = "Windows WDM-KS";
-    (*hostApi)->info.defaultInputDevice = paNoDevice;
-    (*hostApi)->info.defaultOutputDevice = paNoDevice;
-
-    if( deviceCount > 0 )
-    {
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-               wdmHostApi->allocations, sizeof(PaWinWdmDeviceInfo*) * deviceCount );
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaWinWdmDeviceInfo*)PaUtil_GroupAllocateMemory(
-                wdmHostApi->allocations, sizeof(PaWinWdmDeviceInfo) * deviceCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( i=0; i < deviceCount; ++i )
-        {
-            wdmDeviceInfo = &deviceInfoArray[i];
-            deviceInfo = &wdmDeviceInfo->inheritedDeviceInfo;
-            pFilter = wdmHostApi->filters[i];
-            if( pFilter == NULL )
-                continue;
-            wdmDeviceInfo->filter = pFilter;
-            deviceInfo->structVersion = 2;
-            deviceInfo->hostApi = hostApiIndex;
-            deviceInfo->name = (char*)pFilter->friendlyName;
-            PA_DEBUG(("Device found name: %s\n",(char*)pFilter->friendlyName));
-            deviceInfo->maxInputChannels = pFilter->maxInputChannels;
-            if(deviceInfo->maxInputChannels > 0)
-            {
-                /* Set the default input device to the first device we find with
-                 * more than zero input channels
-                 **/
-                if((*hostApi)->info.defaultInputDevice == paNoDevice)
-                {
-                    (*hostApi)->info.defaultInputDevice = i;
-                }
-            }
-
-            deviceInfo->maxOutputChannels = pFilter->maxOutputChannels;
-            if(deviceInfo->maxOutputChannels > 0)
-            {
-                /* Set the default output device to the first device we find with
-                 * more than zero output channels
-                 **/
-                if((*hostApi)->info.defaultOutputDevice == paNoDevice)
-                {
-                    (*hostApi)->info.defaultOutputDevice = i;
-                }
-            }
-
-            /* These low values are not very useful because
-             * a) The lowest latency we end up with can depend on many factors such
-             *    as the device buffer sizes/granularities, sample rate, channels and format
-             * b) We cannot know the device buffer sizes until we try to open/use it at
-             *    a particular setting
-             * So: we give 512x48000Hz frames as the default low input latency
-             **/
-            deviceInfo->defaultLowInputLatency = (512.0/48000.0);
-            deviceInfo->defaultLowOutputLatency = (512.0/48000.0);
-            deviceInfo->defaultHighInputLatency = (4096.0/48000.0);
-            deviceInfo->defaultHighOutputLatency = (4096.0/48000.0);
-            deviceInfo->defaultSampleRate = (double)(pFilter->bestSampleRate);
-
-            (*hostApi)->deviceInfos[i] = deviceInfo;
-        }
-    }
-
-    (*hostApi)->info.deviceCount = deviceCount;
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &wdmHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &wdmHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    PA_LOGL_;
-    return result;
-
-error:
-    if( DllKsUser != NULL )
-    {
-        FreeLibrary( DllKsUser );
-        DllKsUser = NULL;
-    }
-
-    if( wdmHostApi )
-    {
-        PaUtil_FreeMemory( wdmHostApi->filters );
-        if( wdmHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( wdmHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( wdmHostApi->allocations );
-        }
-        PaUtil_FreeMemory( wdmHostApi );
-    }
-    PA_LOGL_;
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
-    int i;
-    PA_LOGE_;
-
-    if( wdmHostApi->filters )
-    {
-        for( i=0; i<wdmHostApi->filterCount; i++)
-        {
-            if( wdmHostApi->filters[i] != NULL )
-            {
-                FilterFree( wdmHostApi->filters[i] );
-                wdmHostApi->filters[i] = NULL;
-            }
-        }
-    }
-    PaUtil_FreeMemory( wdmHostApi->filters );
-    if( wdmHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( wdmHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( wdmHostApi->allocations );
-    }
-    PaUtil_FreeMemory( wdmHostApi );
-    PA_LOGL_;
-}
-
-static void FillWFEXT( WAVEFORMATEXTENSIBLE* pwfext, PaSampleFormat sampleFormat, double sampleRate, int channelCount)
-{
-    PA_LOGE_;
-    PA_DEBUG(( "sampleFormat = %lx\n" , sampleFormat ));
-    PA_DEBUG(( "sampleRate = %f\n" , sampleRate ));
-    PA_DEBUG(( "chanelCount = %d\n", channelCount ));
-
-    pwfext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-    pwfext->Format.nChannels = channelCount;
-    pwfext->Format.nSamplesPerSec = (int)sampleRate;
-    if(channelCount == 1)
-        pwfext->dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT;
-    else
-        pwfext->dwChannelMask = KSAUDIO_SPEAKER_STEREO;
-    if(sampleFormat == paFloat32)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 4;
-        pwfext->Format.wBitsPerSample = 32;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 32;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
-    }
-    else if(sampleFormat == paInt32)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 4;
-        pwfext->Format.wBitsPerSample = 32;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 32;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    else if(sampleFormat == paInt24)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 3;
-        pwfext->Format.wBitsPerSample = 24;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 24;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    else if(sampleFormat == paInt16)
-    {
-        pwfext->Format.nBlockAlign = channelCount * 2;
-        pwfext->Format.wBitsPerSample = 16;
-        pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
-        pwfext->Samples.wValidBitsPerSample = 16;
-        pwfext->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-    }
-    pwfext->Format.nAvgBytesPerSec = pwfext->Format.nSamplesPerSec * pwfext->Format.nBlockAlign;
-
-    PA_LOGL_;
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
-    PaWinWdmFilter* pFilter;
-    int result = paFormatIsSupported;
-    WAVEFORMATEXTENSIBLE wfx;
-
-    PA_LOGE_;
-
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support inputChannelCount */
-        if( inputChannelCount > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-        /* Check that the input format is supported */
-        FillWFEXT(&wfx,paInt16,sampleRate,inputChannelCount);
-
-        pFilter = wdmHostApi->filters[inputParameters->device];
-        result = FilterCanCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx);
-        if( result != paNoError )
-        {
-            /* Try a WAVE_FORMAT_PCM instead */
-            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-            wfx.Format.cbSize = 0;
-            wfx.Samples.wValidBitsPerSample = 0;
-            wfx.dwChannelMask = 0;
-            wfx.SubFormat = GUID_NULL;
-            result = FilterCanCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx);
-            if( result != paNoError )
-                 return result;
-        }
-    }
-    else
-    {
-        inputChannelCount = 0;
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support outputChannelCount */
-        if( outputChannelCount > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-        /* Check that the output format is supported */
-        FillWFEXT(&wfx,paInt16,sampleRate,outputChannelCount);
-
-        pFilter = wdmHostApi->filters[outputParameters->device];
-        result = FilterCanCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx);
-        if( result != paNoError )
-        {
-            /* Try a WAVE_FORMAT_PCM instead */
-            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-            wfx.Format.cbSize = 0;
-            wfx.Samples.wValidBitsPerSample = 0;
-            wfx.dwChannelMask = 0;
-            wfx.SubFormat = GUID_NULL;
-            result = FilterCanCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx);
-            if( result != paNoError )
-                 return result;
-        }
-
-    }
-    else
-    {
-        outputChannelCount = 0;
-    }
-
-    /*
-        IMPLEMENT ME:
-
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported if necessary
-
-            - check that the device supports sampleRate
-
-        Because the buffer adapter handles conversion between all standard
-        sample formats, the following checks are only required if paCustomFormat
-        is implemented, or under some other unusual conditions.
-
-            - check that input device can support inputSampleFormat, or that
-                we have the capability to convert from inputSampleFormat to
-                a native format
-
-            - check that output device can support outputSampleFormat, or that
-                we have the capability to convert from outputSampleFormat to
-                a native format
-    */
-    if((inputChannelCount == 0)&&(outputChannelCount == 0))
-            result = paSampleFormatNotSupported; /* Not right error */
-
-    PA_LOGL_;
-    return result;
-}
-
-/* see pa_hostapi.h for a list of validity guarantees made about OpenStream parameters */
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result = paNoError;
-    PaWinWdmHostApiRepresentation *wdmHostApi = (PaWinWdmHostApiRepresentation*)hostApi;
-    PaWinWdmStream *stream = 0;
-    /* unsigned long framesPerHostBuffer; these may not be equivalent for all implementations */
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-    int userInputChannels,userOutputChannels;
-    int size;
-    PaWinWdmFilter* pFilter;
-    WAVEFORMATEXTENSIBLE wfx;
-
-    PA_LOGE_;
-    PA_DEBUG(("OpenStream:sampleRate = %f\n",sampleRate));
-    PA_DEBUG(("OpenStream:framesPerBuffer = %lu\n",framesPerBuffer));
-
-    if( inputParameters )
-    {
-        userInputChannels = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that input device can support stream->userInputChannels */
-        if( userInputChannels > hostApi->deviceInfos[ inputParameters->device ]->maxInputChannels )
-            return paInvalidChannelCount;
-
-        /* validate inputStreamInfo */
-        if( inputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-    }
-    else
-    {
-        userInputChannels = 0;
-        inputSampleFormat = hostInputSampleFormat = paInt16; /* Surpress 'uninitialised var' warnings. */
-    }
-
-    if( outputParameters )
-    {
-        userOutputChannels = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-
-        /* unless alternate device specification is supported, reject the use of
-            paUseHostApiSpecificDeviceSpecification */
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification )
-            return paInvalidDevice;
-
-        /* check that output device can support stream->userInputChannels */
-        if( userOutputChannels > hostApi->deviceInfos[ outputParameters->device ]->maxOutputChannels )
-            return paInvalidChannelCount;
-
-        /* validate outputStreamInfo */
-        if( outputParameters->hostApiSpecificStreamInfo )
-            return paIncompatibleHostApiSpecificStreamInfo; /* this implementation doesn't use custom stream info */
-
-    }
-    else
-    {
-        userOutputChannels = 0;
-        outputSampleFormat = hostOutputSampleFormat = paInt16; /* Surpress 'uninitialized var' warnings. */
-    }
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-    stream = (PaWinWdmStream*)PaUtil_AllocateMemory( sizeof(PaWinWdmStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    /* Zero the stream object */
-    /* memset((void*)stream,0,sizeof(PaWinWdmStream)); */
-
-    if( streamCallback )
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &wdmHostApi->callbackStreamInterface, streamCallback, userData );
-    }
-    else
-    {
-        PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                               &wdmHostApi->blockingStreamInterface, streamCallback, userData );
-    }
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-    /* Instantiate the input pin if necessary */
-    if(userInputChannels > 0)
-    {
-        result = paSampleFormatNotSupported;
-        pFilter = wdmHostApi->filters[inputParameters->device];
-        stream->userInputChannels = userInputChannels;
-
-        if(((inputSampleFormat & ~paNonInterleaved) & pFilter->formats) != 0)
-        {   /* inputSampleFormat is supported, so try to use it */
-            hostInputSampleFormat = inputSampleFormat;
-            FillWFEXT(&wfx, hostInputSampleFormat, sampleRate, stream->userInputChannels);
-            stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
-            stream->recordingPin = FilterCreateCapturePin(pFilter, (const WAVEFORMATEX*)&wfx, &result);
-            stream->deviceInputChannels = stream->userInputChannels;
-        }
-        
-        if(result != paNoError)
-        {   /* Search through all PaSampleFormats to find one that works */
-            hostInputSampleFormat = paFloat32;
-
-            do {
-                FillWFEXT(&wfx, hostInputSampleFormat, sampleRate, stream->userInputChannels);
-                stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
-                stream->recordingPin = FilterCreateCapturePin(pFilter, (const WAVEFORMATEX*)&wfx, &result);
-                stream->deviceInputChannels = stream->userInputChannels;
-                
-                if(stream->recordingPin == NULL) result = paSampleFormatNotSupported;
-                if(result != paNoError)    hostInputSampleFormat <<= 1;
-            }
-            while(result != paNoError && hostInputSampleFormat <= paUInt8);
-        }
-
-        if(result != paNoError)
-        {    /* None of the PaSampleFormats worked.  Set the hostInputSampleFormat to the best fit
-             * and try a PCM format.
-             **/
-            hostInputSampleFormat =
-                PaUtil_SelectClosestAvailableFormat( pFilter->formats, inputSampleFormat );
-
-            /* Try a WAVE_FORMAT_PCM instead */
-            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-            wfx.Format.cbSize = 0;
-            wfx.Samples.wValidBitsPerSample = 0;
-            wfx.dwChannelMask = 0;
-            wfx.SubFormat = GUID_NULL;
-            stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
-            if(stream->recordingPin == NULL) result = paSampleFormatNotSupported;
-        }
-
-        if( result != paNoError )
-        {
-            /* Some or all KS devices can only handle the exact number of channels
-             * they specify. But PortAudio clients expect to be able to
-             * at least specify mono I/O on a multi-channel device
-             * If this is the case, then we will do the channel mapping internally
-             **/
-            if( stream->userInputChannels < pFilter->maxInputChannels )
-            {
-                FillWFEXT(&wfx,hostInputSampleFormat,sampleRate,pFilter->maxInputChannels);
-                stream->bytesPerInputFrame = wfx.Format.nBlockAlign;
-                stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
-                stream->deviceInputChannels = pFilter->maxInputChannels;
-
-                if( result != paNoError )
-                {
-                    /* Try a WAVE_FORMAT_PCM instead */
-                    wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-                    wfx.Format.cbSize = 0;
-                    wfx.Samples.wValidBitsPerSample = 0;
-                    wfx.dwChannelMask = 0;
-                    wfx.SubFormat = GUID_NULL;
-                    stream->recordingPin = FilterCreateCapturePin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
-                }
-            }
-        }
-
-        if(stream->recordingPin == NULL)
-        {
-            goto error;
-        }
-
-        switch(hostInputSampleFormat)
-        {
-            case paInt16: stream->inputSampleSize = 2; break;
-            case paInt24: stream->inputSampleSize = 3; break;
-            case paInt32:
-            case paFloat32:    stream->inputSampleSize = 4; break;
-        }
-
-        stream->recordingPin->frameSize /= stream->bytesPerInputFrame;
-        PA_DEBUG(("Pin output frames: %d\n",stream->recordingPin->frameSize));
-    }
-    else
-    {
-        stream->recordingPin = NULL;
-        stream->bytesPerInputFrame = 0;
-    }
-
-    /* Instantiate the output pin if necessary */
-    if(userOutputChannels > 0)
-    {
-        result = paSampleFormatNotSupported;
-        pFilter = wdmHostApi->filters[outputParameters->device];
-        stream->userOutputChannels = userOutputChannels;
-
-        if(((outputSampleFormat & ~paNonInterleaved) & pFilter->formats) != 0)
-        {
-            hostOutputSampleFormat = outputSampleFormat;
-            FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,stream->userOutputChannels);
-            stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
-            stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
-            stream->deviceOutputChannels = stream->userOutputChannels;
-        }
-
-        if(result != paNoError)
-        {
-            hostOutputSampleFormat = paFloat32;
-
-            do {
-                FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,stream->userOutputChannels);
-                stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
-                stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
-                stream->deviceOutputChannels = stream->userOutputChannels;
-
-                if(stream->playbackPin == NULL) result = paSampleFormatNotSupported;
-                if(result != paNoError)    hostOutputSampleFormat <<= 1;
-            }
-            while(result != paNoError && hostOutputSampleFormat <= paUInt8);
-        }
-
-        if(result != paNoError)
-        {
-            hostOutputSampleFormat =
-                PaUtil_SelectClosestAvailableFormat( pFilter->formats, outputSampleFormat );
-       
-            /* Try a WAVE_FORMAT_PCM instead */
-            wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-            wfx.Format.cbSize = 0;
-            wfx.Samples.wValidBitsPerSample = 0;
-            wfx.dwChannelMask = 0;
-            wfx.SubFormat = GUID_NULL;
-            stream->playbackPin = FilterCreateRenderPin(pFilter,(WAVEFORMATEX*)&wfx,&result);
-            if(stream->playbackPin == NULL) result = paSampleFormatNotSupported;
-        }
-            
-        if( result != paNoError )
-        {
-            /* Some or all KS devices can only handle the exact number of channels
-             * they specify. But PortAudio clients expect to be able to
-             * at least specify mono I/O on a multi-channel device
-             * If this is the case, then we will do the channel mapping internally
-             **/
-            if( stream->userOutputChannels < pFilter->maxOutputChannels )
-            {
-                FillWFEXT(&wfx,hostOutputSampleFormat,sampleRate,pFilter->maxOutputChannels);
-                stream->bytesPerOutputFrame = wfx.Format.nBlockAlign;
-                stream->playbackPin = FilterCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
-                stream->deviceOutputChannels = pFilter->maxOutputChannels;
-                if( result != paNoError )
-                {
-                    /* Try a WAVE_FORMAT_PCM instead */
-                    wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
-                    wfx.Format.cbSize = 0;
-                    wfx.Samples.wValidBitsPerSample = 0;
-                    wfx.dwChannelMask = 0;
-                    wfx.SubFormat = GUID_NULL;
-                    stream->playbackPin = FilterCreateRenderPin(pFilter,(const WAVEFORMATEX*)&wfx,&result);
-                }
-            }
-        }
-
-        if(stream->playbackPin == NULL)
-        {
-            goto error;
-        }
-
-        switch(hostOutputSampleFormat)
-        {
-            case paInt16: stream->outputSampleSize = 2; break;
-            case paInt24: stream->outputSampleSize = 3; break;
-            case paInt32:
-            case paFloat32: stream->outputSampleSize = 4; break;
-        }
-
-        stream->playbackPin->frameSize /= stream->bytesPerOutputFrame;
-        PA_DEBUG(("Pin output frames: %d\n",stream->playbackPin->frameSize));
-    }
-    else
-    {
-        stream->playbackPin = NULL;
-        stream->bytesPerOutputFrame = 0;
-    }
-
-    /* Calculate the framesPerHostXxxxBuffer size based upon the suggested latency values */
-
-    /* Record the buffer length */
-    if(inputParameters)
-    {
-        /* Calculate the frames from the user's value - add a bit to round up */
-            stream->framesPerHostIBuffer = (unsigned long)((inputParameters->suggestedLatency*sampleRate)+0.0001);
-        if(stream->framesPerHostIBuffer > (unsigned long)sampleRate)
-        { /* Upper limit is 1 second */
-              stream->framesPerHostIBuffer = (unsigned long)sampleRate;
-        }
-        else if(stream->framesPerHostIBuffer < stream->recordingPin->frameSize)
-        {
-              stream->framesPerHostIBuffer = stream->recordingPin->frameSize;
-        }
-        PA_DEBUG(("Input frames chosen:%ld\n",stream->framesPerHostIBuffer));
-    }
-
-    if(outputParameters)
-    {
-        /* Calculate the frames from the user's value - add a bit to round up */
-        stream->framesPerHostOBuffer = (unsigned long)((outputParameters->suggestedLatency*sampleRate)+0.0001);
-        if(stream->framesPerHostOBuffer > (unsigned long)sampleRate)
-        { /* Upper limit is 1 second */
-                  stream->framesPerHostOBuffer = (unsigned long)sampleRate;
-        }
-        else if(stream->framesPerHostOBuffer < stream->playbackPin->frameSize)
-        {
-              stream->framesPerHostOBuffer = stream->playbackPin->frameSize;
-        }
-        PA_DEBUG(("Output frames chosen:%ld\n",stream->framesPerHostOBuffer));
-    }
-
-    /* Host buffer size is bounded to the largest of the input and output
-    frame sizes */
-
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-              stream->userInputChannels, inputSampleFormat, hostInputSampleFormat,
-              stream->userOutputChannels, outputSampleFormat, hostOutputSampleFormat,
-              sampleRate, streamFlags, framesPerBuffer,
-              max(stream->framesPerHostOBuffer,stream->framesPerHostIBuffer),
-              paUtilBoundedHostBufferSize,
-              streamCallback, userData );
-    if( result != paNoError )
-        goto error;
-
-    stream->streamRepresentation.streamInfo.inputLatency =
-            ((double)stream->framesPerHostIBuffer) / sampleRate;
-    stream->streamRepresentation.streamInfo.outputLatency =
-            ((double)stream->framesPerHostOBuffer) / sampleRate;
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-      PA_DEBUG(("BytesPerInputFrame = %d\n",stream->bytesPerInputFrame));
-      PA_DEBUG(("BytesPerOutputFrame = %d\n",stream->bytesPerOutputFrame));
-
-    /* Allocate all the buffers for host I/O */
-    size = 2 * (stream->framesPerHostIBuffer*stream->bytesPerInputFrame +  stream->framesPerHostOBuffer*stream->bytesPerOutputFrame);
-    PA_DEBUG(("Buffer size = %d\n",size));
-    stream->hostBuffer = (char*)PaUtil_AllocateMemory(size);
-    PA_DEBUG(("Buffer allocated\n"));
-    if( !stream->hostBuffer )
-    {
-        PA_DEBUG(("Cannot allocate host buffer!\n"));
-        result = paInsufficientMemory;
-        goto error;
-    }
-    PA_DEBUG(("Buffer start = %p\n",stream->hostBuffer));
-    /* memset(stream->hostBuffer,0,size); */
-
-    /* Set up the packets */
-    stream->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    ResetEvent(stream->events[0]); /* Record buffer 1 */
-    stream->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    ResetEvent(stream->events[1]); /* Record buffer 2 */
-    stream->events[2] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    ResetEvent(stream->events[2]); /* Play buffer 1 */
-    stream->events[3] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    ResetEvent(stream->events[3]); /* Play buffer 2 */
-    stream->events[4] = CreateEvent(NULL, FALSE, FALSE, NULL);
-    ResetEvent(stream->events[4]); /* Abort event */
-    if(stream->userInputChannels > 0)
-    {
-        DATAPACKET *p = &(stream->packets[0]);
-        p->Signal.hEvent = stream->events[0];
-        p->Header.Data = stream->hostBuffer;
-        p->Header.FrameExtent = stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
-        p->Header.DataUsed = 0;
-        p->Header.Size = sizeof(p->Header);
-        p->Header.PresentationTime.Numerator = 1;
-        p->Header.PresentationTime.Denominator = 1;
-
-        p = &(stream->packets[1]);
-        p->Signal.hEvent = stream->events[1];
-        p->Header.Data = stream->hostBuffer + stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
-        p->Header.FrameExtent = stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
-        p->Header.DataUsed = 0;
-        p->Header.Size = sizeof(p->Header);
-        p->Header.PresentationTime.Numerator = 1;
-        p->Header.PresentationTime.Denominator = 1;
-    }
-    if(stream->userOutputChannels > 0)
-    {
-        DATAPACKET *p = &(stream->packets[2]);
-        p->Signal.hEvent = stream->events[2];
-        p->Header.Data = stream->hostBuffer + 2*stream->framesPerHostIBuffer*stream->bytesPerInputFrame;
-        p->Header.FrameExtent = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
-        p->Header.DataUsed = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
-        p->Header.Size = sizeof(p->Header);
-        p->Header.PresentationTime.Numerator = 1;
-        p->Header.PresentationTime.Denominator = 1;
-    
-        p = &(stream->packets[3]);
-        p->Signal.hEvent = stream->events[3];
-        p->Header.Data = stream->hostBuffer + 2*stream->framesPerHostIBuffer*stream->bytesPerInputFrame + stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
-        p->Header.FrameExtent = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
-        p->Header.DataUsed = stream->framesPerHostOBuffer*stream->bytesPerOutputFrame;
-        p->Header.Size = sizeof(p->Header);
-        p->Header.PresentationTime.Numerator = 1;
-        p->Header.PresentationTime.Denominator = 1;
-    }
-
-    stream->streamStarted = 0;
-    stream->streamActive = 0;
-    stream->streamStop = 0;
-    stream->streamAbort = 0;
-    stream->streamFlags = streamFlags;
-    stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
-
-    *s = (PaStream*)stream;
-
-    PA_LOGL_;
-    return result;
-
-error:
-    size = 5;
-    while(size--)
-    {
-        if(stream->events[size] != NULL)
-        {
-            CloseHandle(stream->events[size]);
-            stream->events[size] = NULL;
-        }
-    }
-    if(stream->hostBuffer)
-        PaUtil_FreeMemory( stream->hostBuffer );
-
-    if(stream->playbackPin)
-        PinClose(stream->playbackPin);
-    if(stream->recordingPin)
-        PinClose(stream->recordingPin);
-
-    if( stream )
-        PaUtil_FreeMemory( stream );
-
-    PA_LOGL_;
-    return result;
-}
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result = paNoError;
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    int size;
-
-    PA_LOGE_;
-
-    assert(!stream->streamStarted);
-    assert(!stream->streamActive);
-
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    size = 5;
-    while(size--)
-    {
-        if(stream->events[size] != NULL)
-        {
-            CloseHandle(stream->events[size]);
-            stream->events[size] = NULL;
-        }
-    }
-    if(stream->hostBuffer)
-        PaUtil_FreeMemory( stream->hostBuffer );
-
-    if(stream->playbackPin)
-        PinClose(stream->playbackPin);
-    if(stream->recordingPin)
-        PinClose(stream->recordingPin);
-
-    PaUtil_FreeMemory( stream );
-
-    PA_LOGL_;
-    return result;
-}
-
-/*
-Write the supplied packet to the pin
-Asynchronous
-Should return false on success
-*/
-static BOOL PinWrite(HANDLE h, DATAPACKET* p)
-{
-    unsigned long cbReturned = 0;
-    return DeviceIoControl(h,IOCTL_KS_WRITE_STREAM,NULL,0,
-                            &p->Header,p->Header.Size,&cbReturned,&p->Signal);
-}
-
-/*
-Read to the supplied packet from the pin
-Asynchronous
-Should return false on success
-*/
-static BOOL PinRead(HANDLE h, DATAPACKET* p)
-{
-    unsigned long cbReturned = 0;
-    return DeviceIoControl(h,IOCTL_KS_READ_STREAM,NULL,0,
-                            &p->Header,p->Header.Size,&cbReturned,&p->Signal);
-}
-
-/*
-Copy the first interleaved channel of 16 bit data to the other channels
-*/
-static void DuplicateFirstChannelInt16(void* buffer, int channels, int samples)
-{
-    unsigned short* data = (unsigned short*)buffer;
-    int channel;
-    unsigned short sourceSample;
-    while( samples-- )
-    {
-        sourceSample = *data++;
-        channel = channels-1;
-        while( channel-- )
-        {
-            *data++ = sourceSample;
-        }
-    }
-}
-
-/*
-Copy the first interleaved channel of 24 bit data to the other channels
-*/
-static void DuplicateFirstChannelInt24(void* buffer, int channels, int samples)
-{
-    unsigned char* data = (unsigned char*)buffer;
-    int channel;
-    unsigned char sourceSample[3];
-    while( samples-- )
-    {
-        sourceSample[0] = data[0];
-        sourceSample[1] = data[1];
-        sourceSample[2] = data[2];
-        data += 3;
-        channel = channels-1;
-        while( channel-- )
-        {
-            data[0] = sourceSample[0];
-            data[1] = sourceSample[1];
-            data[2] = sourceSample[2];
-            data += 3;
-        }
-    }
-}
-
-/*
-Copy the first interleaved channel of 32 bit data to the other channels
-*/
-static void DuplicateFirstChannelInt32(void* buffer, int channels, int samples)
-{
-    unsigned long* data = (unsigned long*)buffer;
-    int channel;
-    unsigned long sourceSample;
-    while( samples-- )
-    {
-        sourceSample = *data++;
-        channel = channels-1;
-        while( channel-- )
-        {
-            *data++ = sourceSample;
-        }
-    }
-}
-
-static DWORD WINAPI ProcessingThread(LPVOID pParam)
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)pParam;
-    PaStreamCallbackTimeInfo ti;
-    int cbResult = paContinue;
-    int inbuf = 0;
-    int outbuf = 0;
-    int pending = 0;
-    PaError result;
-    unsigned long wait;
-    unsigned long eventSignaled;
-    int fillPlaybuf = 0;
-    int emptyRecordbuf = 0;
-    int framesProcessed;
-    unsigned long timeout;
-    int i;
-    int doChannelCopy;
-    int priming = 0;
-    PaStreamCallbackFlags underover = 0;
-
-    PA_LOGE_;
-
-    ti.inputBufferAdcTime = 0.0;
-    ti.currentTime = 0.0;
-    ti.outputBufferDacTime = 0.0;
-
-    /* Get double buffering going */
-
-    /* Submit buffers */
-    if(stream->playbackPin)
-    {
-        result = PinSetState(stream->playbackPin, KSSTATE_RUN);
-
-        PA_DEBUG(("play state run = %d;",(int)result));
-        SetEvent(stream->events[outbuf+2]);
-        outbuf = (outbuf+1)&1;
-        SetEvent(stream->events[outbuf+2]);
-        outbuf = (outbuf+1)&1;
-        pending += 2;
-        priming += 4;
-    }
-    if(stream->recordingPin)
-    {
-        result = PinSetState(stream->recordingPin, KSSTATE_RUN);
-
-        PA_DEBUG(("recording state run = %d;",(int)result));
-        PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
-        inbuf = (inbuf+1)&1; /* Increment and wrap */
-        PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
-        inbuf = (inbuf+1)&1; /* Increment and wrap */
-        /* FIXME - do error checking */
-        pending += 2;
-    }
-    PA_DEBUG(("Out buffer len:%f\n",(2000*stream->framesPerHostOBuffer) / stream->streamRepresentation.streamInfo.sampleRate));
-    PA_DEBUG(("In buffer len:%f\n",(2000*stream->framesPerHostIBuffer) / stream->streamRepresentation.streamInfo.sampleRate));
-    timeout = max(
-       ((2000*(DWORD)stream->framesPerHostOBuffer) / (DWORD)stream->streamRepresentation.streamInfo.sampleRate),
-       ((2000*(DWORD)stream->framesPerHostIBuffer) / (DWORD)stream->streamRepresentation.streamInfo.sampleRate));
-    timeout = max(timeout,1);
-    PA_DEBUG(("Timeout = %ld\n",timeout));
-
-    while(!stream->streamAbort)
-    {
-        fillPlaybuf = 0;
-        emptyRecordbuf = 0;
-
-        /* Wait for next input or output buffer to be finished with*/
-        assert(pending>0);
-
-        if(stream->streamStop)
-        {
-            PA_DEBUG(("ss1:pending=%d ",pending));
-        }
-        wait = WaitForMultipleObjects(5, stream->events, FALSE, 0);
-        if( wait == WAIT_TIMEOUT )
-        {
-            /* No (under|over)flow has ocurred */
-            wait = WaitForMultipleObjects(5, stream->events, FALSE, timeout);
-            eventSignaled = wait - WAIT_OBJECT_0;
-        }
-        else
-        {
-            eventSignaled = wait - WAIT_OBJECT_0;
-            if( eventSignaled < 2 )
-            {
-                underover |= paInputOverflow;
-                PA_DEBUG(("Input overflow\n"));
-            }
-            else if(( eventSignaled < 4 )&&(!priming))
-            {
-                underover |= paOutputUnderflow;
-                PA_DEBUG(("Output underflow\n"));
-            }
-        }
-
-        if(stream->streamStop)
-        {
-            PA_DEBUG(("ss2:wait=%ld",wait));
-        }
-        if(wait == WAIT_FAILED)
-        {
-            PA_DEBUG(("Wait fail = %ld! ",wait));
-            break;
-        }
-        if(wait == WAIT_TIMEOUT)
-        {
-            continue;
-        }
-
-        if(eventSignaled < 2)
-        { /* Recording input buffer has been filled */
-            if(stream->playbackPin)
-            {
-                /* First check if also the next playback buffer has been signaled */
-                wait = WaitForSingleObject(stream->events[outbuf+2],0);
-                if(wait == WAIT_OBJECT_0)
-                {
-                    /* Yes, so do both buffers at same time */
-                    fillPlaybuf = 1;
-                    pending--;
-                    /* Was this an underflow situation? */
-                    if( underover )
-                        underover |= paOutputUnderflow; /* Yes! */
-                }
-            }
-            emptyRecordbuf = 1;
-            pending--;
-        }
-        else if(eventSignaled < 4)
-        { /* Playback output buffer has been emptied */
-            if(stream->recordingPin)
-            {
-                /* First check if also the next recording buffer has been signaled */
-                wait = WaitForSingleObject(stream->events[inbuf],0);
-                if(wait == WAIT_OBJECT_0)
-                { /* Yes, so do both buffers at same time */
-                    emptyRecordbuf = 1;
-                    pending--;
-                    /* Was this an overflow situation? */
-                    if( underover )
-                        underover |= paInputOverflow; /* Yes! */
-                }
-            }
-            fillPlaybuf = 1;
-            pending--;
-        }
-        else
-        {
-            /* Abort event! */
-            assert(stream->streamAbort); /* Should have been set */
-            PA_DEBUG(("ABORTING "));
-            break;
-        }
-        ResetEvent(stream->events[eventSignaled]);
-
-        if(stream->streamStop)
-        {
-            PA_DEBUG(("Stream stop! pending=%d",pending));
-            cbResult = paComplete; /* Stop, but play remaining buffers */
-        }
-
-        /* Do necessary buffer processing (which will invoke user callback if necessary */
-        doChannelCopy = 0;
-        if(cbResult==paContinue)
-        {
-            PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-            if((stream->bufferProcessor.hostInputFrameCount[0] + stream->bufferProcessor.hostInputFrameCount[1]) ==
-                (stream->bufferProcessor.hostOutputFrameCount[0] + stream->bufferProcessor.hostOutputFrameCount[1]) )
-                PaUtil_BeginBufferProcessing(&stream->bufferProcessor,&ti,underover);
-            underover = 0; /* Reset the (under|over)flow status */
-            if(fillPlaybuf)
-            {
-                PaUtil_SetOutputFrameCount(&stream->bufferProcessor,0);
-                if( stream->userOutputChannels == 1 )
-                {
-                    /* Write the single user channel to the first interleaved block */
-                    PaUtil_SetOutputChannel(&stream->bufferProcessor,0,stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels);
-                    /* We will do a copy to the other channels after the data has been written */
-                    doChannelCopy = 1;
-                }
-                else
-                {
-                    for(i=0;i<stream->userOutputChannels;i++)
-                    {
-                        /* Only write the user output channels. Leave the rest blank */
-                        PaUtil_SetOutputChannel(&stream->bufferProcessor,i,((unsigned char*)(stream->packets[outbuf+2].Header.Data))+(i*stream->outputSampleSize),stream->deviceOutputChannels);
-                    }
-                }
-            }
-            if(emptyRecordbuf)
-            {
-                PaUtil_SetInputFrameCount(&stream->bufferProcessor,stream->packets[inbuf].Header.DataUsed/stream->bytesPerInputFrame);
-                for(i=0;i<stream->userInputChannels;i++)
-                {
-                    /* Only read as many channels as the user wants */
-                    PaUtil_SetInputChannel(&stream->bufferProcessor,i,((unsigned char*)(stream->packets[inbuf].Header.Data))+(i*stream->inputSampleSize),stream->deviceInputChannels);
-                }
-            }
-            /* Only call the EndBufferProcessing function is the total input frames == total output frames */
-            if((stream->bufferProcessor.hostInputFrameCount[0] + stream->bufferProcessor.hostInputFrameCount[1]) ==
-                (stream->bufferProcessor.hostOutputFrameCount[0] + stream->bufferProcessor.hostOutputFrameCount[1]) )
-                framesProcessed = PaUtil_EndBufferProcessing(&stream->bufferProcessor,&cbResult);
-            else framesProcessed = 0;
-            if( doChannelCopy )
-            {
-                /* Copy the first output channel to the other channels */
-                switch(stream->outputSampleSize)
-                {
-                    case 2:
-                        DuplicateFirstChannelInt16(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
-                        break;
-                    case 3:
-                        DuplicateFirstChannelInt24(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
-                        break;
-                    case 4:
-                        DuplicateFirstChannelInt32(stream->packets[outbuf+2].Header.Data,stream->deviceOutputChannels,stream->framesPerHostOBuffer);
-                        break;
-                    default:
-                        assert(0); /* Unsupported format! */
-                        break;
-                }
-            }
-            PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-        }
-        else
-        {
-            fillPlaybuf = 0;
-            emptyRecordbuf = 0;
-        }
-            
-        /*
-        if(cbResult != paContinue)
-        {
-            PA_DEBUG(("cbResult=%d, pending=%d:",cbResult,pending));
-        }
-        */
-        /* Submit buffers */
-        if((fillPlaybuf)&&(cbResult!=paAbort))
-        {
-            if(!PinWrite(stream->playbackPin->handle,&stream->packets[outbuf+2]))
-                outbuf = (outbuf+1)&1; /* Increment and wrap */
-            pending++;
-            if( priming )
-                priming--; /* Have to prime twice */
-        }
-        if((emptyRecordbuf)&&(cbResult==paContinue))
-        {
-            stream->packets[inbuf].Header.DataUsed = 0; /* Reset for reuse */
-            PinRead(stream->recordingPin->handle,&stream->packets[inbuf]);
-            inbuf = (inbuf+1)&1; /* Increment and wrap */
-            pending++;
-        }
-        if(pending==0)
-        {
-            PA_DEBUG(("pending==0 finished...;"));
-            break;
-        }
-        if((!stream->playbackPin)&&(cbResult!=paContinue))
-        {
-            PA_DEBUG(("record only cbResult=%d...;",cbResult));
-            break;
-        }
-    }
-
-    PA_DEBUG(("Finished thread"));
-
-    /* Finished, either normally or aborted */
-    if(stream->playbackPin)
-    {
-        result = PinSetState(stream->playbackPin, KSSTATE_PAUSE);
-        result = PinSetState(stream->playbackPin, KSSTATE_STOP);
-    }
-    if(stream->recordingPin)
-    {
-        result = PinSetState(stream->recordingPin, KSSTATE_PAUSE);
-        result = PinSetState(stream->recordingPin, KSSTATE_STOP);
-    }
-
-    stream->streamActive = 0;
-
-    if((!stream->streamStop)&&(!stream->streamAbort))
-    {
-          /* Invoke the user stream finished callback */
-          /* Only do it from here if not being stopped/aborted by user */
-          if( stream->streamRepresentation.streamFinishedCallback != 0 )
-              stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-    stream->streamStop = 0;
-    stream->streamAbort = 0;
-
-    /* Reset process priority if necessary */
-    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
-    {
-        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
-        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
-    }
-
-    PA_LOGL_;
-    ExitThread(0);
-    return 0;
-}
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    DWORD dwID;
-    BOOL ret;
-    int size;
-
-    PA_LOGE_;
-
-    stream->streamStop = 0;
-    stream->streamAbort = 0;
-    size = 5;
-    while(size--)
-    {
-        if(stream->events[size] != NULL)
-        {
-            ResetEvent(stream->events[size]);
-        }
-    }
-
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-
-    stream->oldProcessPriority = GetPriorityClass(GetCurrentProcess());
-    /* Uncomment the following line to enable dynamic boosting of the process
-     * priority to real time for best low latency support
-     * Disabled by default because RT processes can easily block the OS */
-    /*ret = SetPriorityClass(GetCurrentProcess(),REALTIME_PRIORITY_CLASS);
-      PA_DEBUG(("Class ret = %d;",ret));*/
-
-    stream->streamStarted = 1;
-    stream->streamThread = CreateThread(NULL, 0, ProcessingThread, stream, 0, &dwID);
-    if(stream->streamThread == NULL)
-    {
-        stream->streamStarted = 0;
-        result = paInsufficientMemory;
-        goto end;
-    }
-    ret = SetThreadPriority(stream->streamThread,THREAD_PRIORITY_TIME_CRITICAL);
-    PA_DEBUG(("Priority ret = %d;",ret));
-    /* Make the stream active */
-    stream->streamActive = 1;
-
-end:
-    PA_LOGL_;
-    return result;
-}
-
-
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    int doCb = 0;
-
-    PA_LOGE_;
-
-    if(stream->streamActive)
-    {
-        doCb = 1;
-        stream->streamStop = 1;
-        while(stream->streamActive)
-        {
-            PA_DEBUG(("W."));
-            Sleep(10); /* Let thread sleep for 10 msec */
-        }
-    }
-
-    PA_DEBUG(("Terminating thread"));
-    if(stream->streamStarted && stream->streamThread)
-    {
-        TerminateThread(stream->streamThread,0);
-        stream->streamThread = NULL;
-    }
-
-    stream->streamStarted = 0;
-
-    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
-    {
-        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
-        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
-    }
-
-    if(doCb)
-    {
-        /* Do user callback now after all state has been reset */
-        /* This means it should be safe for the called function */
-        /* to invoke e.g. StartStream */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-             stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-
-    PA_LOGL_;
-    return result;
-}
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    int doCb = 0;
-
-    PA_LOGE_;
-
-    if(stream->streamActive)
-    {
-        doCb = 1;
-        stream->streamAbort = 1;
-        SetEvent(stream->events[4]); /* Signal immediately */
-        while(stream->streamActive)
-        {
-            Sleep(10);
-        }
-    }
-
-    if(stream->streamStarted && stream->streamThread)
-    {
-        TerminateThread(stream->streamThread,0);
-        stream->streamThread = NULL;
-    }
-
-    stream->streamStarted = 0;
-
-    if(stream->oldProcessPriority != REALTIME_PRIORITY_CLASS)
-    {
-        SetPriorityClass(GetCurrentProcess(),stream->oldProcessPriority);
-        stream->oldProcessPriority = REALTIME_PRIORITY_CLASS;
-    }
-
-    if(doCb)
-    {
-        /* Do user callback now after all state has been reset */
-        /* This means it should be safe for the called function */
-        /* to invoke e.g. StartStream */
-        if( stream->streamRepresentation.streamFinishedCallback != 0 )
-            stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-    }
-
-    stream->streamActive = 0;
-    stream->streamStarted = 0;
-
-    PA_LOGL_;
-    return result;
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    int result = 0;
-
-    PA_LOGE_;
-
-    if(!stream->streamStarted)
-        result = 1;
-
-    PA_LOGL_;
-    return result;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    int result = 0;
-
-    PA_LOGE_;
-
-    if(stream->streamActive)
-        result = 1;
-
-    PA_LOGL_;
-    return result;
-}
-
-
-static PaTime GetStreamTime( PaStream* s )
-{
-    PA_LOGE_;
-    PA_LOGL_;
-    (void)s;
-    return PaUtil_GetTime();
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-    double result;
-    PA_LOGE_;
-    result = PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-    PA_LOGL_;
-    return result;
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-
-    PA_LOGE_;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    PA_LOGL_;
-    return paNoError;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-
-    PA_LOGE_;
-
-    /* suppress unused variable warnings */
-    (void) buffer;
-    (void) frames;
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    PA_LOGL_;
-    return paNoError;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-
-    PA_LOGE_;
-
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    PA_LOGL_;
-    return 0;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaWinWdmStream *stream = (PaWinWdmStream*)s;
-
-    PA_LOGE_;
-    /* suppress unused variable warnings */
-    (void) stream;
-
-    /* IMPLEMENT ME, see portaudio.h for required behavior*/
-    PA_LOGL_;
-    return 0;
-}
\ No newline at end of file
diff --git a/libs/portaudio/src/hostapi/wdmks/readme.txt b/libs/portaudio/src/hostapi/wdmks/readme.txt
deleted file mode 100644
index 1a381fe79f..0000000000
--- a/libs/portaudio/src/hostapi/wdmks/readme.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Notes about WDM-KS host API
----------------------------
-
-Status history
---------------
-10th November 2005:
-Made following changes:
- * OpenStream: Try all PaSampleFormats internally if the the chosen
-     format is not supported natively.  This fixed several problems
-     with soundcards that soundcards that did not take kindly to
-     using 24-bit 3-byte formats.
- * OpenStream: Make the minimum framesPerHostIBuffer (and framesPerHostOBuffer)
-     the default frameSize for the playback/recording pin.
- * ProcessingThread: Added a switch to only call PaUtil_EndBufferProcessing
-     if the total input frames equals the total output frames
-
-5th September 2004:
-This is the first public version of the code. It should be considered
-an alpha release with zero guarantee not to crash on any particular 
-system. So far it has only been tested in the author's development
-environment, which means a Win2k/SP2 PIII laptop with integrated 
-SoundMAX driver and USB Tascam US-428 compiled with both MinGW
-(GCC 3.3) and MSVC++6 using the MS DirectX 9 SDK.
-It has been most widely tested with the MinGW build, with most of the
-test programs (particularly paqa_devs and paqa_errs) passing.
-There are some notable failures: patest_out_underflow and both of the
-blocking I/O tests (as blocking I/O is not implemented).
-At this point the code needs to be tested with a much wider variety 
-of configurations and feedback provided from testers regarding
-both working and failing cases.
-
-What is the WDM-KS host API?
-----------------------------
-PortAudio for Windows currently has 3 functional host implementations.
-MME uses the oldest Windows audio API which does not offer good
-play/record latency. 
-DirectX improves this, but still imposes a penalty
-of 10s of milliseconds due to the system mixing of streams from
-multiple applications. 
-ASIO offers very good latency, but requires special drivers which are
-not always available for cheaper audio hardware. Also, when ASIO 
-drivers are available, they are not always so robust because they 
-bypass all of the standardised Windows device driver architecture 
-and hit the hardware their own way.
-Alternatively there are a couple of free (but closed source) ASIO 
-implementations which connect to the lower level Windows 
-"Kernel Streaming" API, but again these require special installation 
-by the user, and can be limited in functionality or difficult to use. 
-
-This is where the PortAudio "WDM-KS" host implementation comes in.
-It directly connects PortAudio to the same Kernel Streaming API which
-those ASIO bridges use. This avoids the mixing penatly of DirectX, 
-giving at least as good latency as any ASIO driver, but it has the
-advantage of working with ANY Windows audio hardware which is available
-through the normal MME/DirectX routes without the user requiring 
-any additional device drivers to be installed, and allowing all 
-device selection to be done through the normal PortAudio API.
-
-Note that in general you should only be using this host API if your 
-application has a real requirement for very low latency audio (<20ms), 
-either because you are generating sounds in real-time based upon 
-user input, or you a processing recorded audio in real time.
-
-The only thing to be aware of is that using the KS interface will
-block that device from being used by the rest of system through
-the higher level APIs, or conversely, if the system is using
-a device, the KS API will not be able to use it. MS recommend that
-you should keep the device open only when your application has focus.
-In PortAudio terms, this means having a stream Open on a WDMKS device.
-
-Usage
------
-To add the WDMKS backend to your program which is already using 
-PortAudio, you must undefine PA_NO_WDMKS from your build file,
-and include the pa_win_wdmks\pa_win_wdmks.c into your build.
-The file should compile in both C and C++.
-You will need a DirectX SDK installed on your system for the
-ks.h and ksmedia.h header files.
-You will need to link to the system "setupapi" library.
-Note that if you use MinGW, you will get more warnings from 
-the DX header files when using GCC(C), and still a few warnings
-with G++(CPP).
\ No newline at end of file
diff --git a/libs/portaudio/src/hostapi/wmme/pa_win_wmme.c b/libs/portaudio/src/hostapi/wmme/pa_win_wmme.c
deleted file mode 100644
index efb82341c8..0000000000
--- a/libs/portaudio/src/hostapi/wmme/pa_win_wmme.c
+++ /dev/null
@@ -1,3900 +0,0 @@
-/*
- * $Id: pa_win_wmme.c 1286 2007-09-26 21:34:23Z rossb $
- * pa_win_wmme.c
- * Implementation of PortAudio for Windows MultiMedia Extensions (WMME)       
- *                                                                                         
- * PortAudio Portable Real-Time Audio Library
- * Latest Version at: http://www.portaudio.com
- *
- * Authors: Ross Bencina and Phil Burk
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/* Modification History:
- PLB = Phil Burk
- JM = Julien Maillard
- RDB = Ross Bencina
- PLB20010402 - sDevicePtrs now allocates based on sizeof(pointer)
- PLB20010413 - check for excessive numbers of channels
- PLB20010422 - apply Mike Berry's changes for CodeWarrior on PC
-               including conditional inclusion of memory.h,
-               and explicit typecasting on memory allocation
- PLB20010802 - use GlobalAlloc for sDevicesPtr instead of PaHost_AllocFastMemory
- PLB20010816 - pass process instead of thread to SetPriorityClass()
- PLB20010927 - use number of frames instead of real-time for CPULoad calculation.
- JM20020118 - prevent hung thread when buffers underflow.
- PLB20020321 - detect Win XP versus NT, 9x; fix DBUG typo; removed init of CurrentCount
- RDB20020411 - various renaming cleanups, factored streamData alloc and cpu usage init
- RDB20020417 - stopped counting WAVE_MAPPER when there were no real devices
-               refactoring, renaming and fixed a few edge case bugs
- RDB20020531 - converted to V19 framework
- ** NOTE  maintanance history is now stored in CVS **
-*/
-
-/** @file
-	@ingroup hostaip_src
-
-	@todo Fix buffer catch up code, can sometimes get stuck (perhaps fixed now,
-            needs to be reviewed and tested.)
-
-    @todo implement paInputUnderflow, paOutputOverflow streamCallback statusFlags, paNeverDropInput.
-
-    @todo BUG: PA_MME_SET_LAST_WAVEIN/OUT_ERROR is used in functions which may
-                be called asynchronously from the callback thread. this is bad.
-
-    @todo implement inputBufferAdcTime in callback thread
-
-    @todo review/fix error recovery and cleanup in marked functions
-
-    @todo implement timeInfo for stream priming
-
-    @todo handle the case where the callback returns paAbort or paComplete during stream priming.
-
-    @todo review input overflow and output underflow handling in ReadStream and WriteStream
-
-Non-critical stuff for the future:
-
-    @todo Investigate supporting host buffer formats > 16 bits
-    
-    @todo define UNICODE and _UNICODE in the project settings and see what breaks
-
-    @todo refactor conversion of MMSYSTEM errors into PA arrors into a single function.
-
-    @todo cleanup WAVEFORMATEXTENSIBLE retry in InitializeWaveHandles to not use a for loop
-
-*/
-
-/*
-    How it works:
-
-    For both callback and blocking read/write streams we open the MME devices
-    in CALLBACK_EVENT mode. In this mode, MME signals an Event object whenever
-    it has finished with a buffer (either filled it for input, or played it
-    for output). Where necessary we block waiting for Event objects using
-    WaitMultipleObjects().
-
-    When implementing a PA callback stream, we set up a high priority thread
-    which waits on the MME buffer Events and drains/fills the buffers when
-    they are ready.
-
-    When implementing a PA blocking read/write stream, we simply wait on these
-    Events (when necessary) inside the ReadStream() and WriteStream() functions.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <windows.h>
-#include <mmsystem.h>
-#ifndef UNDER_CE
-#include <process.h>
-#endif
-#include <assert.h>
-/* PLB20010422 - "memory.h" doesn't work on CodeWarrior for PC. Thanks Mike Berry for the mod. */
-#ifndef __MWERKS__
-#include <malloc.h>
-#include <memory.h>
-#endif /* __MWERKS__ */
-
-#include "portaudio.h"
-#include "pa_trace.h"
-#include "pa_util.h"
-#include "pa_allocation.h"
-#include "pa_hostapi.h"
-#include "pa_stream.h"
-#include "pa_cpuload.h"
-#include "pa_process.h"
-#include "pa_debugprint.h"
-
-#include "pa_win_wmme.h"
-#include "pa_win_waveformat.h"
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-#include "pa_win_wdmks_utils.h"
-#ifndef DRV_QUERYDEVICEINTERFACE
-#define DRV_QUERYDEVICEINTERFACE     (DRV_RESERVED + 12)
-#endif
-#ifndef DRV_QUERYDEVICEINTERFACESIZE
-#define DRV_QUERYDEVICEINTERFACESIZE (DRV_RESERVED + 13)
-#endif
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-#if (defined(UNDER_CE))
-#pragma comment(lib, "Coredll.lib")
-#elif (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
-#pragma comment(lib, "winmm.lib")
-#endif
-
-/*
- provided in newer platform sdks
- */
-#ifndef DWORD_PTR
-#define DWORD_PTR DWORD
-#endif
-
-/************************************************* Constants ********/
-
-#define PA_MME_USE_HIGH_DEFAULT_LATENCY_    (0)  /* For debugging glitches. */
-
-#if PA_MME_USE_HIGH_DEFAULT_LATENCY_
- #define PA_MME_WIN_9X_DEFAULT_LATENCY_                     (0.4)
- #define PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_               (4)
- #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_	(4)
- #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_	(4)
- #define PA_MME_MIN_HOST_BUFFER_FRAMES_WHEN_UNSPECIFIED_	(16)
- #define PA_MME_MAX_HOST_BUFFER_SECS_				        (0.3)       /* Do not exceed unless user buffer exceeds */
- #define PA_MME_MAX_HOST_BUFFER_BYTES_				        (32 * 1024) /* Has precedence over PA_MME_MAX_HOST_BUFFER_SECS_, some drivers are known to crash with buffer sizes > 32k */
-#else
- #define PA_MME_WIN_9X_DEFAULT_LATENCY_                     (0.2)
- #define PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_               (2)
- #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_	(3)
- #define PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_	(2)
- #define PA_MME_MIN_HOST_BUFFER_FRAMES_WHEN_UNSPECIFIED_	(16)
- #define PA_MME_MAX_HOST_BUFFER_SECS_				        (0.1)       /* Do not exceed unless user buffer exceeds */
- #define PA_MME_MAX_HOST_BUFFER_BYTES_				        (32 * 1024) /* Has precedence over PA_MME_MAX_HOST_BUFFER_SECS_, some drivers are known to crash with buffer sizes > 32k */
-#endif
-
-/* Use higher latency for NT because it is even worse at real-time
-   operation than Win9x.
-*/
-#define PA_MME_WIN_NT_DEFAULT_LATENCY_      (PA_MME_WIN_9X_DEFAULT_LATENCY_ * 2)
-#define PA_MME_WIN_WDM_DEFAULT_LATENCY_     (PA_MME_WIN_9X_DEFAULT_LATENCY_)
-
-
-#define PA_MME_MIN_TIMEOUT_MSEC_        (1000)
-
-static const char constInputMapperSuffix_[] = " - Input";
-static const char constOutputMapperSuffix_[] = " - Output";
-
-/********************************************************************/
-
-typedef struct PaWinMmeStream PaWinMmeStream;     /* forward declaration */
-
-/* prototypes for functions declared in this file */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi );
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** stream,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData );
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate );
-static PaError CloseStream( PaStream* stream );
-static PaError StartStream( PaStream *stream );
-static PaError StopStream( PaStream *stream );
-static PaError AbortStream( PaStream *stream );
-static PaError IsStreamStopped( PaStream *s );
-static PaError IsStreamActive( PaStream *stream );
-static PaTime GetStreamTime( PaStream *stream );
-static double GetStreamCpuLoad( PaStream* stream );
-static PaError ReadStream( PaStream* stream, void *buffer, unsigned long frames );
-static PaError WriteStream( PaStream* stream, const void *buffer, unsigned long frames );
-static signed long GetStreamReadAvailable( PaStream* stream );
-static signed long GetStreamWriteAvailable( PaStream* stream );
-
-
-/* macros for setting last host error information */
-
-#ifdef UNICODE
-
-#define PA_MME_SET_LAST_WAVEIN_ERROR( mmresult ) \
-    {                                                                   \
-        wchar_t mmeErrorTextWide[ MAXERRORLENGTH ];                     \
-        char mmeErrorText[ MAXERRORLENGTH ];                            \
-        waveInGetErrorText( mmresult, mmeErrorTextWide, MAXERRORLENGTH );   \
-        WideCharToMultiByte( CP_ACP, WC_COMPOSITECHECK | WC_DEFAULTCHAR,\
-            mmeErrorTextWide, -1, mmeErrorText, MAXERRORLENGTH, NULL, NULL );  \
-        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
-    }
-
-#define PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult ) \
-    {                                                                   \
-        wchar_t mmeErrorTextWide[ MAXERRORLENGTH ];                     \
-        char mmeErrorText[ MAXERRORLENGTH ];                            \
-        waveOutGetErrorText( mmresult, mmeErrorTextWide, MAXERRORLENGTH );  \
-        WideCharToMultiByte( CP_ACP, WC_COMPOSITECHECK | WC_DEFAULTCHAR,\
-            mmeErrorTextWide, -1, mmeErrorText, MAXERRORLENGTH, NULL, NULL );  \
-        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
-    }
-    
-#else /* !UNICODE */
-
-#define PA_MME_SET_LAST_WAVEIN_ERROR( mmresult ) \
-    {                                                                   \
-        char mmeErrorText[ MAXERRORLENGTH ];                            \
-        waveInGetErrorText( mmresult, mmeErrorText, MAXERRORLENGTH );   \
-        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
-    }
-
-#define PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult ) \
-    {                                                                   \
-        char mmeErrorText[ MAXERRORLENGTH ];                            \
-        waveOutGetErrorText( mmresult, mmeErrorText, MAXERRORLENGTH );  \
-        PaUtil_SetLastHostErrorInfo( paMME, mmresult, mmeErrorText );   \
-    }
-
-#endif /* UNICODE */
-
-
-static void PaMme_SetLastSystemError( DWORD errorCode )
-{
-    char *lpMsgBuf;
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-        NULL,
-        errorCode,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR) &lpMsgBuf,
-        0,
-        NULL
-    );
-    PaUtil_SetLastHostErrorInfo( paMME, errorCode, lpMsgBuf );
-    LocalFree( lpMsgBuf );
-}
-
-#define PA_MME_SET_LAST_SYSTEM_ERROR( errorCode ) \
-    PaMme_SetLastSystemError( errorCode )
-
-
-/* PaError returning wrappers for some commonly used win32 functions
-    note that we allow passing a null ptr to have no effect.
-*/
-
-static PaError CreateEventWithPaError( HANDLE *handle,
-        LPSECURITY_ATTRIBUTES lpEventAttributes,
-        BOOL bManualReset,
-        BOOL bInitialState,
-        LPCTSTR lpName )
-{
-    PaError result = paNoError;
-
-    *handle = NULL;
-    
-    *handle = CreateEvent( lpEventAttributes, bManualReset, bInitialState, lpName );
-    if( *handle == NULL )
-    {
-        result = paUnanticipatedHostError;
-        PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
-    }
-
-    return result;
-}
-
-
-static PaError ResetEventWithPaError( HANDLE handle )
-{
-    PaError result = paNoError;
-
-    if( handle )
-    {
-        if( ResetEvent( handle ) == 0 )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
-        }
-    }
-
-    return result;
-}
-
-
-static PaError CloseHandleWithPaError( HANDLE handle )
-{
-    PaError result = paNoError;
-    
-    if( handle )
-    {
-        if( CloseHandle( handle ) == 0 )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
-        }
-    }
-    
-    return result;
-}
-
-
-/* PaWinMmeHostApiRepresentation - host api datastructure specific to this implementation */
-
-typedef struct
-{
-    PaUtilHostApiRepresentation inheritedHostApiRep;
-    PaUtilStreamInterface callbackStreamInterface;
-    PaUtilStreamInterface blockingStreamInterface;
-
-    PaUtilAllocationGroup *allocations;
-    
-    int inputDeviceCount, outputDeviceCount;
-
-    /** winMmeDeviceIds is an array of WinMme device ids.
-        fields in the range [0, inputDeviceCount) are input device ids,
-        and [inputDeviceCount, inputDeviceCount + outputDeviceCount) are output
-        device ids.
-     */ 
-    UINT *winMmeDeviceIds;
-}
-PaWinMmeHostApiRepresentation;
-
-
-typedef struct
-{
-    PaDeviceInfo inheritedDeviceInfo;
-    DWORD dwFormats; /**<< standard formats bitmask from the WAVEINCAPS and WAVEOUTCAPS structures */
-    char deviceInputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
-    char deviceOutputChannelCountIsKnown; /**<< if the system returns 0xFFFF then we don't really know the number of supported channels (1=>known, 0=>unknown)*/
-}
-PaWinMmeDeviceInfo;
-
-
-/*************************************************************************
- * Returns recommended device ID.
- * On the PC, the recommended device can be specified by the user by
- * setting an environment variable. For example, to use device #1.
- *
- *    set PA_RECOMMENDED_OUTPUT_DEVICE=1
- *
- * The user should first determine the available device ID by using
- * the supplied application "pa_devs".
- */
-#define PA_ENV_BUF_SIZE_  (32)
-#define PA_REC_IN_DEV_ENV_NAME_  ("PA_RECOMMENDED_INPUT_DEVICE")
-#define PA_REC_OUT_DEV_ENV_NAME_  ("PA_RECOMMENDED_OUTPUT_DEVICE")
-static PaDeviceIndex GetEnvDefaultDeviceID( char *envName )
-{
-    PaDeviceIndex recommendedIndex = paNoDevice;
-    DWORD   hresult;
-    char    envbuf[PA_ENV_BUF_SIZE_];
-
-#ifndef WIN32_PLATFORM_PSPC /* no GetEnvironmentVariable on PocketPC */
-
-    /* Let user determine default device by setting environment variable. */
-    hresult = GetEnvironmentVariable( envName, envbuf, PA_ENV_BUF_SIZE_ );
-    if( (hresult > 0) && (hresult < PA_ENV_BUF_SIZE_) )
-    {
-        recommendedIndex = atoi( envbuf );
-    }
-#endif
-
-    return recommendedIndex;
-}
-
-
-static void InitializeDefaultDeviceIdsFromEnv( PaWinMmeHostApiRepresentation *hostApi )
-{
-    PaDeviceIndex device;
-
-    /* input */
-    device = GetEnvDefaultDeviceID( PA_REC_IN_DEV_ENV_NAME_ );
-    if( device != paNoDevice &&
-            ( device >= 0 && device < hostApi->inheritedHostApiRep.info.deviceCount ) &&
-            hostApi->inheritedHostApiRep.deviceInfos[ device ]->maxInputChannels > 0 )
-    {
-        hostApi->inheritedHostApiRep.info.defaultInputDevice = device;
-    }
-
-    /* output */
-    device = GetEnvDefaultDeviceID( PA_REC_OUT_DEV_ENV_NAME_ );
-    if( device != paNoDevice &&
-            ( device >= 0 && device < hostApi->inheritedHostApiRep.info.deviceCount ) &&
-            hostApi->inheritedHostApiRep.deviceInfos[ device ]->maxOutputChannels > 0 )
-    {
-        hostApi->inheritedHostApiRep.info.defaultOutputDevice = device;
-    }
-}
-
-
-/** Convert external PA ID to a windows multimedia device ID
-*/
-static UINT LocalDeviceIndexToWinMmeDeviceId( PaWinMmeHostApiRepresentation *hostApi, PaDeviceIndex device )
-{
-    assert( device >= 0 && device < hostApi->inputDeviceCount + hostApi->outputDeviceCount );
-
-	return hostApi->winMmeDeviceIds[ device ];
-}
-
-
-static PaError QueryInputWaveFormatEx( int deviceId, WAVEFORMATEX *waveFormatEx )
-{
-    MMRESULT mmresult;
-    
-    switch( mmresult = waveInOpen( NULL, deviceId, waveFormatEx, 0, 0, WAVE_FORMAT_QUERY ) )
-    {
-        case MMSYSERR_NOERROR:
-            return paNoError;
-        case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
-            return paDeviceUnavailable;
-        case MMSYSERR_NODRIVER:	    /* No device driver is present. */
-            return paDeviceUnavailable;
-        case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
-            return paInsufficientMemory;
-        case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
-            return paSampleFormatNotSupported;
-                    
-        case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
-            /* falls through */
-        default:
-            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-            return paUnanticipatedHostError;
-    }
-}
-
-
-static PaError QueryOutputWaveFormatEx( int deviceId, WAVEFORMATEX *waveFormatEx )
-{
-    MMRESULT mmresult;
-    
-    switch( mmresult = waveOutOpen( NULL, deviceId, waveFormatEx, 0, 0, WAVE_FORMAT_QUERY ) )
-    {
-        case MMSYSERR_NOERROR:
-            return paNoError;
-        case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
-            return paDeviceUnavailable;
-        case MMSYSERR_NODRIVER:	    /* No device driver is present. */
-            return paDeviceUnavailable;
-        case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
-            return paInsufficientMemory;
-        case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
-            return paSampleFormatNotSupported;
-                    
-        case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
-            /* falls through */
-        default:
-            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-            return paUnanticipatedHostError;
-    }
-}
-
-
-static PaError QueryFormatSupported( PaDeviceInfo *deviceInfo,
-        PaError (*waveFormatExQueryFunction)(int, WAVEFORMATEX*),
-        int winMmeDeviceId, int channels, double sampleRate )
-{
-    PaWinMmeDeviceInfo *winMmeDeviceInfo = (PaWinMmeDeviceInfo*)deviceInfo;
-    PaWinWaveFormat waveFormat;
-    
-    if( sampleRate == 11025.0
-        && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_1M16))
-            || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_1S16)) ) ){
-
-        return paNoError;
-    }
-
-    if( sampleRate == 22050.0
-        && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_2M16))
-            || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_2S16)) ) ){
-
-        return paNoError;
-    }
-
-    if( sampleRate == 44100.0
-        && ( (channels == 1 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_4M16))
-            || (channels == 2 && (winMmeDeviceInfo->dwFormats & WAVE_FORMAT_4S16)) ) ){
-
-        return paNoError;
-    }
-
-    /* first, attempt to query the device using WAVEFORMATEXTENSIBLE, 
-       if this fails we fall back to WAVEFORMATEX */
-
-    /* @todo at the moment we only query with 16 bit sample format and directout speaker config*/
-    PaWin_InitializeWaveFormatExtensible( &waveFormat, channels, 
-            paInt16, sampleRate, PAWIN_SPEAKER_DIRECTOUT );
-
-    if( waveFormatExQueryFunction( winMmeDeviceId, (WAVEFORMATEX*)&waveFormat ) == paNoError )
-        return paNoError;
-
-    PaWin_InitializeWaveFormatEx( &waveFormat, channels, paInt16, sampleRate );
-
-    return waveFormatExQueryFunction( winMmeDeviceId, (WAVEFORMATEX*)&waveFormat );
-}
-
-
-#define PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_  (13) /* must match array length below */
-static double defaultSampleRateSearchOrder_[] =
-    { 44100.0, 48000.0, 32000.0, 24000.0, 22050.0, 88200.0, 96000.0, 192000.0,
-        16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
-
-static void DetectDefaultSampleRate( PaWinMmeDeviceInfo *winMmeDeviceInfo, int winMmeDeviceId,
-        PaError (*waveFormatExQueryFunction)(int, WAVEFORMATEX*), int maxChannels )
-{
-    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
-    int i;
-    
-    deviceInfo->defaultSampleRate = 0.;
-
-    for( i=0; i < PA_DEFAULTSAMPLERATESEARCHORDER_COUNT_; ++i )
-    {
-        double sampleRate = defaultSampleRateSearchOrder_[ i ]; 
-        PaError paerror = QueryFormatSupported( deviceInfo, waveFormatExQueryFunction, winMmeDeviceId, maxChannels, sampleRate );
-        if( paerror == paNoError )
-        {
-            deviceInfo->defaultSampleRate = sampleRate;
-            break;
-        }
-    }
-}
-
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-static int QueryWaveInKSFilterMaxChannels( int waveInDeviceId, int *maxChannels )
-{
-    void *devicePath;
-    DWORD devicePathSize;
-    int result = 0;
-
-    if( waveInMessage((HWAVEIN)waveInDeviceId, DRV_QUERYDEVICEINTERFACESIZE,
-            (DWORD_PTR)&devicePathSize, 0 ) != MMSYSERR_NOERROR )
-        return 0;
-
-    devicePath = PaUtil_AllocateMemory( devicePathSize );
-    if( !devicePath )
-        return 0;
-
-    /* apparently DRV_QUERYDEVICEINTERFACE returns a unicode interface path, although this is undocumented */
-    if( waveInMessage((HWAVEIN)waveInDeviceId, DRV_QUERYDEVICEINTERFACE,
-            (DWORD_PTR)devicePath, devicePathSize ) == MMSYSERR_NOERROR )
-    {
-        int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( devicePath, /* isInput= */ 1  );
-        if( count > 0 )
-        {
-            *maxChannels = count;
-            result = 1;
-        }
-    }
-
-    PaUtil_FreeMemory( devicePath );
-
-    return result;
-}
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-
-static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeHostApi,
-        PaWinMmeDeviceInfo *winMmeDeviceInfo, UINT winMmeInputDeviceId, int *success )
-{
-    PaError result = paNoError;
-    char *deviceName; /* non-const ptr */
-    MMRESULT mmresult;
-    WAVEINCAPS wic;
-    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
-    
-    *success = 0;
-
-    mmresult = waveInGetDevCaps( winMmeInputDeviceId, &wic, sizeof( WAVEINCAPS ) );
-    if( mmresult == MMSYSERR_NOMEM )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    else if( mmresult != MMSYSERR_NOERROR )
-    {
-        /* instead of returning paUnanticipatedHostError we return
-            paNoError, but leave success set as 0. This allows
-            Pa_Initialize to just ignore this device, without failing
-            the entire initialisation process.
-        */
-        return paNoError;
-    }           
-
-    if( winMmeInputDeviceId == WAVE_MAPPER )
-    {
-        /* Append I/O suffix to WAVE_MAPPER device. */
-        deviceName = (char *)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, strlen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_) );
-        if( !deviceName )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-        strcpy( deviceName, wic.szPname );
-        strcat( deviceName, constInputMapperSuffix_ );
-    }
-    else
-    {
-        deviceName = (char*)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, strlen( wic.szPname ) + 1 );
-        if( !deviceName )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-        strcpy( deviceName, wic.szPname  );
-    }
-    deviceInfo->name = deviceName;
-
-    if( wic.wChannels == 0xFFFF || wic.wChannels < 1 || wic.wChannels > 255 ){
-        /* For Windows versions using WDM (possibly Windows 98 ME and later)
-         * the kernel mixer sits between the application and the driver. As a result,
-         * wave*GetDevCaps often kernel mixer channel counts, which are unlimited.
-         * When this happens we assume the device is stereo and set a flag
-         * so that other channel counts can be tried with OpenStream -- i.e. when
-         * device*ChannelCountIsKnown is false, OpenStream will try whatever
-         * channel count you supply.
-         * see also InitializeOutputDeviceInfo() below.
-     */
-
-        PA_DEBUG(("Pa_GetDeviceInfo: Num input channels reported as %d! Changed to 2.\n", wic.wChannels ));
-        deviceInfo->maxInputChannels = 2;
-        winMmeDeviceInfo->deviceInputChannelCountIsKnown = 0;
-    }else{
-        deviceInfo->maxInputChannels = wic.wChannels;
-        winMmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
-    }
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-    winMmeDeviceInfo->deviceInputChannelCountIsKnown = 
-            QueryWaveInKSFilterMaxChannels( winMmeInputDeviceId, &deviceInfo->maxInputChannels );
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-    winMmeDeviceInfo->dwFormats = wic.dwFormats;
-
-    DetectDefaultSampleRate( winMmeDeviceInfo, winMmeInputDeviceId,
-            QueryInputWaveFormatEx, deviceInfo->maxInputChannels );
-
-    *success = 1;
-    
-error:
-    return result;
-}
-
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-static int QueryWaveOutKSFilterMaxChannels( int waveOutDeviceId, int *maxChannels )
-{
-    void *devicePath;
-    DWORD devicePathSize;
-    int result = 0;
-
-    if( waveOutMessage((HWAVEOUT)waveOutDeviceId, DRV_QUERYDEVICEINTERFACESIZE,
-            (DWORD_PTR)&devicePathSize, 0 ) != MMSYSERR_NOERROR )
-        return 0;
-
-    devicePath = PaUtil_AllocateMemory( devicePathSize );
-    if( !devicePath )
-        return 0;
-
-    /* apparently DRV_QUERYDEVICEINTERFACE returns a unicode interface path, although this is undocumented */
-    if( waveOutMessage((HWAVEOUT)waveOutDeviceId, DRV_QUERYDEVICEINTERFACE,
-            (DWORD_PTR)devicePath, devicePathSize ) == MMSYSERR_NOERROR )
-    {
-        int count = PaWin_WDMKS_QueryFilterMaximumChannelCount( devicePath, /* isInput= */ 0  );
-        if( count > 0 )
-        {
-            *maxChannels = count;
-            result = 1;
-        }
-    }
-
-    PaUtil_FreeMemory( devicePath );
-
-    return result;
-}
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-
-static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeHostApi,
-        PaWinMmeDeviceInfo *winMmeDeviceInfo, UINT winMmeOutputDeviceId, int *success )
-{
-    PaError result = paNoError;
-    char *deviceName; /* non-const ptr */
-    MMRESULT mmresult;
-    WAVEOUTCAPS woc;
-    PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo;
-
-    *success = 0;
-
-    mmresult = waveOutGetDevCaps( winMmeOutputDeviceId, &woc, sizeof( WAVEOUTCAPS ) );
-    if( mmresult == MMSYSERR_NOMEM )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    else if( mmresult != MMSYSERR_NOERROR )
-    {
-        /* instead of returning paUnanticipatedHostError we return
-            paNoError, but leave success set as 0. This allows
-            Pa_Initialize to just ignore this device, without failing
-            the entire initialisation process.
-        */
-        return paNoError;
-    }
-
-    if( winMmeOutputDeviceId == WAVE_MAPPER )
-    {
-        /* Append I/O suffix to WAVE_MAPPER device. */
-        deviceName = (char *)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, strlen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_) );
-        if( !deviceName )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-        strcpy( deviceName, woc.szPname );
-        strcat( deviceName, constOutputMapperSuffix_ );
-    }
-    else
-    {
-        deviceName = (char*)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, strlen( woc.szPname ) + 1 );
-        if( !deviceName )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-        strcpy( deviceName, woc.szPname  );
-    }
-    deviceInfo->name = deviceName;
-
-    if( woc.wChannels == 0xFFFF || woc.wChannels < 1 || woc.wChannels > 255 ){
-        /* For Windows versions using WDM (possibly Windows 98 ME and later)
-         * the kernel mixer sits between the application and the driver. As a result,
-         * wave*GetDevCaps often kernel mixer channel counts, which are unlimited.
-         * When this happens we assume the device is stereo and set a flag
-         * so that other channel counts can be tried with OpenStream -- i.e. when
-         * device*ChannelCountIsKnown is false, OpenStream will try whatever
-         * channel count you supply.
-         * see also InitializeInputDeviceInfo() above.
-     */
-
-        PA_DEBUG(("Pa_GetDeviceInfo: Num output channels reported as %d! Changed to 2.\n", woc.wChannels ));
-        deviceInfo->maxOutputChannels = 2;
-        winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 0;
-    }else{
-        deviceInfo->maxOutputChannels = woc.wChannels;
-        winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-    }
-
-#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
-    winMmeDeviceInfo->deviceOutputChannelCountIsKnown = 
-            QueryWaveOutKSFilterMaxChannels( winMmeOutputDeviceId, &deviceInfo->maxOutputChannels );
-#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
-
-    winMmeDeviceInfo->dwFormats = woc.dwFormats;
-
-    DetectDefaultSampleRate( winMmeDeviceInfo, winMmeOutputDeviceId,
-            QueryOutputWaveFormatEx, deviceInfo->maxOutputChannels );
-
-    *success = 1;
-    
-error:
-    return result;
-}
-
-
-static void GetDefaultLatencies( PaTime *defaultLowLatency, PaTime *defaultHighLatency )
-{
-    OSVERSIONINFO osvi;
-    osvi.dwOSVersionInfoSize = sizeof( osvi );
-	GetVersionEx( &osvi );
-
-    /* Check for NT */
-    if( (osvi.dwMajorVersion == 4) && (osvi.dwPlatformId == 2) )
-    {
-        *defaultLowLatency = PA_MME_WIN_NT_DEFAULT_LATENCY_;
-    }
-    else if(osvi.dwMajorVersion >= 5)
-    {
-        *defaultLowLatency  = PA_MME_WIN_WDM_DEFAULT_LATENCY_;
-    }
-    else
-    {
-        *defaultLowLatency  = PA_MME_WIN_9X_DEFAULT_LATENCY_;
-    }     
-
-    *defaultHighLatency = *defaultLowLatency * 2;
-}
-
-
-PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
-{
-    PaError result = paNoError;
-    int i;
-    PaWinMmeHostApiRepresentation *winMmeHostApi;
-    int inputDeviceCount, outputDeviceCount, maximumPossibleDeviceCount;
-    PaWinMmeDeviceInfo *deviceInfoArray;
-    int deviceInfoInitializationSucceeded;
-    PaTime defaultLowLatency, defaultHighLatency;
-    DWORD waveInPreferredDevice, waveOutPreferredDevice;
-    DWORD preferredDeviceStatusFlags;
-
-    winMmeHostApi = (PaWinMmeHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinMmeHostApiRepresentation) );
-    if( !winMmeHostApi )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    winMmeHostApi->allocations = PaUtil_CreateAllocationGroup();
-    if( !winMmeHostApi->allocations )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    *hostApi = &winMmeHostApi->inheritedHostApiRep;
-    (*hostApi)->info.structVersion = 1;
-    (*hostApi)->info.type = paMME;
-    (*hostApi)->info.name = "MME";
-
-    
-    /* initialise device counts and default devices under the assumption that
-        there are no devices. These values are incremented below if and when
-        devices are successfully initialized.
-    */
-    (*hostApi)->info.deviceCount = 0;
-    (*hostApi)->info.defaultInputDevice = paNoDevice;
-    (*hostApi)->info.defaultOutputDevice = paNoDevice;
-    winMmeHostApi->inputDeviceCount = 0;
-    winMmeHostApi->outputDeviceCount = 0;
-
-#if !defined(DRVM_MAPPER_PREFERRED_GET)
-/* DRVM_MAPPER_PREFERRED_GET is defined in mmddk.h but we avoid a dependency on the DDK by defining it here */
-#define DRVM_MAPPER_PREFERRED_GET    (0x2000+21)
-#endif
-
-    /* the following calls assume that if wave*Message fails the preferred device parameter won't be modified */
-    preferredDeviceStatusFlags = 0;
-    waveInPreferredDevice = -1;
-    waveInMessage( (HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD)&waveInPreferredDevice, (DWORD)&preferredDeviceStatusFlags );
-
-    preferredDeviceStatusFlags = 0;
-    waveOutPreferredDevice = -1;
-    waveOutMessage( (HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD)&waveOutPreferredDevice, (DWORD)&preferredDeviceStatusFlags );
-
-    maximumPossibleDeviceCount = 0;
-
-    inputDeviceCount = waveInGetNumDevs();
-    if( inputDeviceCount > 0 )
-    	maximumPossibleDeviceCount += inputDeviceCount + 1;	/* assume there is a WAVE_MAPPER */
-
-    outputDeviceCount = waveOutGetNumDevs();
-    if( outputDeviceCount > 0 )
-	    maximumPossibleDeviceCount += outputDeviceCount + 1;	/* assume there is a WAVE_MAPPER */
-
-
-    if( maximumPossibleDeviceCount > 0 ){
-
-        (*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
-                winMmeHostApi->allocations, sizeof(PaDeviceInfo*) * maximumPossibleDeviceCount );
-        if( !(*hostApi)->deviceInfos )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        /* allocate all device info structs in a contiguous block */
-        deviceInfoArray = (PaWinMmeDeviceInfo*)PaUtil_GroupAllocateMemory(
-                winMmeHostApi->allocations, sizeof(PaWinMmeDeviceInfo) * maximumPossibleDeviceCount );
-        if( !deviceInfoArray )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        winMmeHostApi->winMmeDeviceIds = (UINT*)PaUtil_GroupAllocateMemory(
-                winMmeHostApi->allocations, sizeof(int) * maximumPossibleDeviceCount );
-        if( !winMmeHostApi->winMmeDeviceIds )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        GetDefaultLatencies( &defaultLowLatency, &defaultHighLatency );
-
-        if( inputDeviceCount > 0 ){
-            /* -1 is the WAVE_MAPPER */
-            for( i = -1; i < inputDeviceCount; ++i ){
-                UINT winMmeDeviceId = (UINT)((i==-1) ? WAVE_MAPPER : i);
-                PaWinMmeDeviceInfo *wmmeDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
-                PaDeviceInfo *deviceInfo = &wmmeDeviceInfo->inheritedDeviceInfo;
-                deviceInfo->structVersion = 2;
-                deviceInfo->hostApi = hostApiIndex;
-
-                deviceInfo->maxInputChannels = 0;
-                wmmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
-                deviceInfo->maxOutputChannels = 0;
-                wmmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-
-                deviceInfo->defaultLowInputLatency = defaultLowLatency;
-                deviceInfo->defaultLowOutputLatency = defaultLowLatency;
-                deviceInfo->defaultHighInputLatency = defaultHighLatency;
-                deviceInfo->defaultHighOutputLatency = defaultHighLatency;
-
-                result = InitializeInputDeviceInfo( winMmeHostApi, wmmeDeviceInfo,
-                        winMmeDeviceId, &deviceInfoInitializationSucceeded );
-                if( result != paNoError )
-                    goto error;
-
-                if( deviceInfoInitializationSucceeded ){
-                    if( (*hostApi)->info.defaultInputDevice == paNoDevice ){
-                        /* if there is currently no default device, use the first one available */
-                        (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
-                    
-                    }else if( winMmeDeviceId == waveInPreferredDevice ){
-                        /* set the default device to the system preferred device */
-                        (*hostApi)->info.defaultInputDevice = (*hostApi)->info.deviceCount;
-                    }
-
-                    winMmeHostApi->winMmeDeviceIds[ (*hostApi)->info.deviceCount ] = winMmeDeviceId;
-                    (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
-
-                    winMmeHostApi->inputDeviceCount++;
-                    (*hostApi)->info.deviceCount++;
-                }
-            }
-        }
-
-        if( outputDeviceCount > 0 ){
-            /* -1 is the WAVE_MAPPER */
-            for( i = -1; i < outputDeviceCount; ++i ){
-                UINT winMmeDeviceId = (UINT)((i==-1) ? WAVE_MAPPER : i);
-                PaWinMmeDeviceInfo *wmmeDeviceInfo = &deviceInfoArray[ (*hostApi)->info.deviceCount ];
-                PaDeviceInfo *deviceInfo = &wmmeDeviceInfo->inheritedDeviceInfo;
-                deviceInfo->structVersion = 2;
-                deviceInfo->hostApi = hostApiIndex;
-
-                deviceInfo->maxInputChannels = 0;
-                wmmeDeviceInfo->deviceInputChannelCountIsKnown = 1;
-                deviceInfo->maxOutputChannels = 0;
-                wmmeDeviceInfo->deviceOutputChannelCountIsKnown = 1;
-
-                deviceInfo->defaultLowInputLatency = defaultLowLatency;
-                deviceInfo->defaultLowOutputLatency = defaultLowLatency;
-                deviceInfo->defaultHighInputLatency = defaultHighLatency;
-                deviceInfo->defaultHighOutputLatency = defaultHighLatency; 
-
-                result = InitializeOutputDeviceInfo( winMmeHostApi, wmmeDeviceInfo,
-                        winMmeDeviceId, &deviceInfoInitializationSucceeded );
-                if( result != paNoError )
-                    goto error;
-
-                if( deviceInfoInitializationSucceeded ){
-                    if( (*hostApi)->info.defaultOutputDevice == paNoDevice ){
-                        /* if there is currently no default device, use the first one available */
-                        (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
-
-                    }else if( winMmeDeviceId == waveOutPreferredDevice ){
-                        /* set the default device to the system preferred device */
-                        (*hostApi)->info.defaultOutputDevice = (*hostApi)->info.deviceCount;
-                    }
-
-                    winMmeHostApi->winMmeDeviceIds[ (*hostApi)->info.deviceCount ] = winMmeDeviceId;
-                    (*hostApi)->deviceInfos[ (*hostApi)->info.deviceCount ] = deviceInfo;
-
-                    winMmeHostApi->outputDeviceCount++;
-                    (*hostApi)->info.deviceCount++;
-                }
-            }
-        }
-    }
-    
-    InitializeDefaultDeviceIdsFromEnv( winMmeHostApi );
-
-    (*hostApi)->Terminate = Terminate;
-    (*hostApi)->OpenStream = OpenStream;
-    (*hostApi)->IsFormatSupported = IsFormatSupported;
-
-    PaUtil_InitializeStreamInterface( &winMmeHostApi->callbackStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, GetStreamCpuLoad,
-                                      PaUtil_DummyRead, PaUtil_DummyWrite,
-                                      PaUtil_DummyGetReadAvailable, PaUtil_DummyGetWriteAvailable );
-
-    PaUtil_InitializeStreamInterface( &winMmeHostApi->blockingStreamInterface, CloseStream, StartStream,
-                                      StopStream, AbortStream, IsStreamStopped, IsStreamActive,
-                                      GetStreamTime, PaUtil_DummyGetCpuLoad,
-                                      ReadStream, WriteStream, GetStreamReadAvailable, GetStreamWriteAvailable );
-
-    return result;
-
-error:
-    if( winMmeHostApi )
-    {
-        if( winMmeHostApi->allocations )
-        {
-            PaUtil_FreeAllAllocations( winMmeHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( winMmeHostApi->allocations );
-        }
-        
-        PaUtil_FreeMemory( winMmeHostApi );
-    }
-
-    return result;
-}
-
-
-static void Terminate( struct PaUtilHostApiRepresentation *hostApi )
-{
-    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
-
-    if( winMmeHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( winMmeHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( winMmeHostApi->allocations );
-    }
-
-    PaUtil_FreeMemory( winMmeHostApi );
-}
-
-
-static PaError IsInputChannelCountSupported( PaWinMmeDeviceInfo* deviceInfo, int channelCount )
-{
-    PaError result = paNoError;
-
-    if( channelCount > 0
-            && deviceInfo->deviceInputChannelCountIsKnown
-            && channelCount > deviceInfo->inheritedDeviceInfo.maxInputChannels ){
-
-        result = paInvalidChannelCount; 
-    }
-
-    return result;
-}
-
-static PaError IsOutputChannelCountSupported( PaWinMmeDeviceInfo* deviceInfo, int channelCount )
-{
-    PaError result = paNoError;
-
-    if( channelCount > 0
-            && deviceInfo->deviceOutputChannelCountIsKnown
-            && channelCount > deviceInfo->inheritedDeviceInfo.maxOutputChannels ){
-
-        result = paInvalidChannelCount; 
-    }
-
-    return result;
-}
-
-static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
-                                  const PaStreamParameters *inputParameters,
-                                  const PaStreamParameters *outputParameters,
-                                  double sampleRate )
-{
-    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
-    PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo;
-    int inputChannelCount, outputChannelCount;
-    int inputMultipleDeviceChannelCount, outputMultipleDeviceChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    PaWinMmeStreamInfo *inputStreamInfo, *outputStreamInfo;
-    UINT winMmeInputDeviceId, winMmeOutputDeviceId;
-    unsigned int i;
-    PaError paerror;
-
-    /* The calls to QueryFormatSupported below are intended to detect invalid
-        sample rates. If we assume that the channel count and format are OK,
-        then the only thing that could fail is the sample rate. This isn't
-        strictly true, but I can't think of a better way to test that the
-        sample rate is valid.
-    */  
-    
-    if( inputParameters )
-    {
-        inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-        inputStreamInfo = inputParameters->hostApiSpecificStreamInfo;
-        
-        /* all standard sample formats are supported by the buffer adapter,
-             this implementation doesn't support any custom sample formats */
-        if( inputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        if( inputParameters->device == paUseHostApiSpecificDeviceSpecification
-                && inputStreamInfo && (inputStreamInfo->flags & paWinMmeUseMultipleDevices) )
-        {
-            inputMultipleDeviceChannelCount = 0;
-            for( i=0; i< inputStreamInfo->deviceCount; ++i )
-            {
-                inputMultipleDeviceChannelCount += inputStreamInfo->devices[i].channelCount;
-                    
-                inputDeviceInfo = hostApi->deviceInfos[ inputStreamInfo->devices[i].device ];
-
-                /* check that input device can support inputChannelCount */
-                if( inputStreamInfo->devices[i].channelCount < 1 )
-                    return paInvalidChannelCount;
-
-                paerror = IsInputChannelCountSupported( (PaWinMmeDeviceInfo*)inputDeviceInfo, 
-                        inputStreamInfo->devices[i].channelCount );
-                if( paerror != paNoError )
-                    return paerror;
-
-                /* test for valid sample rate, see comment above */
-                winMmeInputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, inputStreamInfo->devices[i].device );
-                paerror = QueryFormatSupported( inputDeviceInfo, QueryInputWaveFormatEx, winMmeInputDeviceId, inputStreamInfo->devices[i].channelCount, sampleRate );
-                if( paerror != paNoError )
-                    return paInvalidSampleRate;
-            }
-                
-            if( inputMultipleDeviceChannelCount != inputChannelCount )
-                return paIncompatibleHostApiSpecificStreamInfo;                  
-        }
-        else
-        {
-            if( inputStreamInfo && (inputStreamInfo->flags & paWinMmeUseMultipleDevices) )
-                return paIncompatibleHostApiSpecificStreamInfo; /* paUseHostApiSpecificDeviceSpecification was not supplied as the input device */
-
-            inputDeviceInfo = hostApi->deviceInfos[ inputParameters->device ];
-
-            /* check that input device can support inputChannelCount */
-            paerror = IsInputChannelCountSupported( (PaWinMmeDeviceInfo*)inputDeviceInfo, inputChannelCount );
-            if( paerror != paNoError )
-                return paerror;
-
-            /* test for valid sample rate, see comment above */
-            winMmeInputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, inputParameters->device );
-            paerror = QueryFormatSupported( inputDeviceInfo, QueryInputWaveFormatEx, winMmeInputDeviceId, inputChannelCount, sampleRate );
-            if( paerror != paNoError )
-                return paInvalidSampleRate;
-        }
-    }
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        outputStreamInfo = outputParameters->hostApiSpecificStreamInfo;
-
-        /* all standard sample formats are supported by the buffer adapter,
-            this implementation doesn't support any custom sample formats */
-        if( outputSampleFormat & paCustomFormat )
-            return paSampleFormatNotSupported;
-
-        if( outputParameters->device == paUseHostApiSpecificDeviceSpecification
-                && outputStreamInfo && (outputStreamInfo->flags & paWinMmeUseMultipleDevices) )
-        {
-            outputMultipleDeviceChannelCount = 0;
-            for( i=0; i< outputStreamInfo->deviceCount; ++i )
-            {
-                outputMultipleDeviceChannelCount += outputStreamInfo->devices[i].channelCount;
-                    
-                outputDeviceInfo = hostApi->deviceInfos[ outputStreamInfo->devices[i].device ];
-
-                /* check that output device can support outputChannelCount */
-                if( outputStreamInfo->devices[i].channelCount < 1 )
-                    return paInvalidChannelCount;
-
-                paerror = IsOutputChannelCountSupported( (PaWinMmeDeviceInfo*)outputDeviceInfo, 
-                        outputStreamInfo->devices[i].channelCount );
-                if( paerror != paNoError )
-                    return paerror;
-
-                /* test for valid sample rate, see comment above */
-                winMmeOutputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, outputStreamInfo->devices[i].device );
-                paerror = QueryFormatSupported( outputDeviceInfo, QueryOutputWaveFormatEx, winMmeOutputDeviceId, outputStreamInfo->devices[i].channelCount, sampleRate );
-                if( paerror != paNoError )
-                    return paInvalidSampleRate;
-            }
-                
-            if( outputMultipleDeviceChannelCount != outputChannelCount )
-                return paIncompatibleHostApiSpecificStreamInfo;            
-        }
-        else
-        {
-            if( outputStreamInfo && (outputStreamInfo->flags & paWinMmeUseMultipleDevices) )
-                return paIncompatibleHostApiSpecificStreamInfo; /* paUseHostApiSpecificDeviceSpecification was not supplied as the output device */
-
-            outputDeviceInfo = hostApi->deviceInfos[ outputParameters->device ];
-
-            /* check that output device can support outputChannelCount */
-            paerror = IsOutputChannelCountSupported( (PaWinMmeDeviceInfo*)outputDeviceInfo, outputChannelCount );
-            if( paerror != paNoError )
-                return paerror;
-
-            /* test for valid sample rate, see comment above */
-            winMmeOutputDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, outputParameters->device );
-            paerror = QueryFormatSupported( outputDeviceInfo, QueryOutputWaveFormatEx, winMmeOutputDeviceId, outputChannelCount, sampleRate );
-            if( paerror != paNoError )
-                return paInvalidSampleRate;
-        }
-    }
-    
-    /*
-            - if a full duplex stream is requested, check that the combination
-                of input and output parameters is supported
-
-            - check that the device supports sampleRate
-
-            for mme all we can do is test that the input and output devices
-            support the requested sample rate and number of channels. we
-            cannot test for full duplex compatibility.
-    */                                             
-
-    return paFormatIsSupported;
-}
-
-
-
-static void SelectBufferSizeAndCount( unsigned long baseBufferSize,
-    unsigned long requestedLatency,
-    unsigned long baseBufferCount, unsigned long minimumBufferCount,
-    unsigned long maximumBufferSize, unsigned long *hostBufferSize,
-    unsigned long *hostBufferCount )
-{
-    unsigned long sizeMultiplier, bufferCount, latency;
-    unsigned long nextLatency, nextBufferSize;
-    int baseBufferSizeIsPowerOfTwo;
-    
-    sizeMultiplier = 1;
-    bufferCount = baseBufferCount;
-
-    /* count-1 below because latency is always determined by one less
-        than the total number of buffers.
-    */
-    latency = (baseBufferSize * sizeMultiplier) * (bufferCount-1);
-
-    if( latency > requestedLatency )
-    {
-
-        /* reduce number of buffers without falling below suggested latency */
-
-        nextLatency = (baseBufferSize * sizeMultiplier) * (bufferCount-2);
-        while( bufferCount > minimumBufferCount && nextLatency >= requestedLatency )
-        {
-            --bufferCount;
-            nextLatency = (baseBufferSize * sizeMultiplier) * (bufferCount-2);
-        }
-
-    }else if( latency < requestedLatency ){
-
-        baseBufferSizeIsPowerOfTwo = (! (baseBufferSize & (baseBufferSize - 1)));
-        if( baseBufferSizeIsPowerOfTwo ){
-
-            /* double size of buffers without exceeding requestedLatency */
-
-            nextBufferSize = (baseBufferSize * (sizeMultiplier*2));
-            nextLatency = nextBufferSize * (bufferCount-1);
-            while( nextBufferSize <= maximumBufferSize
-                    && nextLatency < requestedLatency )
-            {
-                sizeMultiplier *= 2;
-                nextBufferSize = (baseBufferSize * (sizeMultiplier*2));
-                nextLatency = nextBufferSize * (bufferCount-1);
-            }   
-
-        }else{
-
-            /* increase size of buffers upto first excess of requestedLatency */
-
-            nextBufferSize = (baseBufferSize * (sizeMultiplier+1));
-            nextLatency = nextBufferSize * (bufferCount-1);
-            while( nextBufferSize <= maximumBufferSize
-                    && nextLatency < requestedLatency )
-            {
-                ++sizeMultiplier;
-                nextBufferSize = (baseBufferSize * (sizeMultiplier+1));
-                nextLatency = nextBufferSize * (bufferCount-1);
-            }
-
-            if( nextLatency < requestedLatency )
-                ++sizeMultiplier;            
-        }
-
-        /* increase number of buffers until requestedLatency is reached */
-
-        latency = (baseBufferSize * sizeMultiplier) * (bufferCount-1);
-        while( latency < requestedLatency )
-        {
-            ++bufferCount;
-            latency = (baseBufferSize * sizeMultiplier) * (bufferCount-1);
-        }
-    }
-
-    *hostBufferSize = baseBufferSize * sizeMultiplier;
-    *hostBufferCount = bufferCount;
-}
-
-
-static void ReselectBufferCount( unsigned long bufferSize,
-    unsigned long requestedLatency,
-    unsigned long baseBufferCount, unsigned long minimumBufferCount,
-    unsigned long *hostBufferCount )
-{
-    unsigned long bufferCount, latency;
-    unsigned long nextLatency;
-
-    bufferCount = baseBufferCount;
-
-    /* count-1 below because latency is always determined by one less
-        than the total number of buffers.
-    */
-    latency = bufferSize * (bufferCount-1);
-
-    if( latency > requestedLatency )
-    {
-        /* reduce number of buffers without falling below suggested latency */
-
-        nextLatency = bufferSize * (bufferCount-2);
-        while( bufferCount > minimumBufferCount && nextLatency >= requestedLatency )
-        {
-            --bufferCount;
-            nextLatency = bufferSize * (bufferCount-2);
-        }
-
-    }else if( latency < requestedLatency ){
-
-        /* increase number of buffers until requestedLatency is reached */
-
-        latency = bufferSize * (bufferCount-1);
-        while( latency < requestedLatency )
-        {
-            ++bufferCount;
-            latency = bufferSize * (bufferCount-1);
-        }                                                         
-    }
-
-    *hostBufferCount = bufferCount;
-}
-
-
-/* CalculateBufferSettings() fills the framesPerHostInputBuffer, hostInputBufferCount,
-   framesPerHostOutputBuffer and hostOutputBufferCount parameters based on the values
-   of the other parameters.
-*/
-
-static PaError CalculateBufferSettings(
-        unsigned long *framesPerHostInputBuffer, unsigned long *hostInputBufferCount,
-        unsigned long *framesPerHostOutputBuffer, unsigned long *hostOutputBufferCount,
-        int inputChannelCount, PaSampleFormat hostInputSampleFormat,
-        PaTime suggestedInputLatency, PaWinMmeStreamInfo *inputStreamInfo,
-        int outputChannelCount, PaSampleFormat hostOutputSampleFormat,
-        PaTime suggestedOutputLatency, PaWinMmeStreamInfo *outputStreamInfo,
-        double sampleRate, unsigned long framesPerBuffer )
-{
-    PaError result = paNoError;
-    int effectiveInputChannelCount, effectiveOutputChannelCount;
-    int hostInputFrameSize = 0;
-    unsigned int i;
-    
-    if( inputChannelCount > 0 )
-    {
-        int hostInputSampleSize = Pa_GetSampleSize( hostInputSampleFormat );
-        if( hostInputSampleSize < 0 )
-        {
-            result = hostInputSampleSize;
-            goto error;
-        }
-
-        if( inputStreamInfo
-                && ( inputStreamInfo->flags & paWinMmeUseMultipleDevices ) )
-        {
-            /* set effectiveInputChannelCount to the largest number of
-                channels on any one device.
-            */
-            effectiveInputChannelCount = 0;
-            for( i=0; i< inputStreamInfo->deviceCount; ++i )
-            {
-                if( inputStreamInfo->devices[i].channelCount > effectiveInputChannelCount )
-                    effectiveInputChannelCount = inputStreamInfo->devices[i].channelCount;
-            }
-        }
-        else
-        {
-            effectiveInputChannelCount = inputChannelCount;
-        }
-
-        hostInputFrameSize = hostInputSampleSize * effectiveInputChannelCount;
-
-        if( inputStreamInfo
-                && ( inputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
-        {
-            if( inputStreamInfo->bufferCount <= 0
-                    || inputStreamInfo->framesPerBuffer <= 0 )
-            {
-                result = paIncompatibleHostApiSpecificStreamInfo;
-                goto error;
-            }
-
-            *framesPerHostInputBuffer = inputStreamInfo->framesPerBuffer;
-            *hostInputBufferCount = inputStreamInfo->bufferCount;
-        }
-        else
-        {
-            unsigned long hostBufferSizeBytes, hostBufferCount;
-            unsigned long minimumBufferCount = (outputChannelCount > 0)
-                    ? PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_
-                    : PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_HALF_DUPLEX_;
-
-            unsigned long maximumBufferSize = (long) ((PA_MME_MAX_HOST_BUFFER_SECS_ * sampleRate) * hostInputFrameSize);
-            if( maximumBufferSize > PA_MME_MAX_HOST_BUFFER_BYTES_ )
-                maximumBufferSize = PA_MME_MAX_HOST_BUFFER_BYTES_;
-
-            /* compute the following in bytes, then convert back to frames */
-
-            SelectBufferSizeAndCount(
-                ((framesPerBuffer == paFramesPerBufferUnspecified)
-                    ? PA_MME_MIN_HOST_BUFFER_FRAMES_WHEN_UNSPECIFIED_
-                    : framesPerBuffer ) * hostInputFrameSize, /* baseBufferSize */
-                ((unsigned long)(suggestedInputLatency * sampleRate)) * hostInputFrameSize, /* suggestedLatency */
-                4, /* baseBufferCount */
-                minimumBufferCount, maximumBufferSize,
-                &hostBufferSizeBytes, &hostBufferCount );
-
-            *framesPerHostInputBuffer = hostBufferSizeBytes / hostInputFrameSize;
-            *hostInputBufferCount = hostBufferCount;
-        }
-    }
-    else
-    {
-        *framesPerHostInputBuffer = 0;
-        *hostInputBufferCount = 0;
-    }
-
-    if( outputChannelCount > 0 )
-    {
-        if( outputStreamInfo
-                && ( outputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
-        {
-            if( outputStreamInfo->bufferCount <= 0
-                    || outputStreamInfo->framesPerBuffer <= 0 )
-            {
-                result = paIncompatibleHostApiSpecificStreamInfo;
-                goto error;
-            }
-
-            *framesPerHostOutputBuffer = outputStreamInfo->framesPerBuffer;
-            *hostOutputBufferCount = outputStreamInfo->bufferCount;
-
-            
-            if( inputChannelCount > 0 ) /* full duplex */
-            {
-                if( *framesPerHostInputBuffer != *framesPerHostOutputBuffer )
-                {
-                    if( inputStreamInfo
-                            && ( inputStreamInfo->flags & paWinMmeUseLowLevelLatencyParameters ) )
-                    { 
-                        /* a custom StreamInfo was used for specifying both input
-                            and output buffer sizes, the larger buffer size
-                            must be a multiple of the smaller buffer size */
-
-                        if( *framesPerHostInputBuffer < *framesPerHostOutputBuffer )
-                        {
-                            if( *framesPerHostOutputBuffer % *framesPerHostInputBuffer != 0 )
-                            {
-                                result = paIncompatibleHostApiSpecificStreamInfo;
-                                goto error;
-                            }
-                        }
-                        else
-                        {
-                            assert( *framesPerHostInputBuffer > *framesPerHostOutputBuffer );
-                            if( *framesPerHostInputBuffer % *framesPerHostOutputBuffer != 0 )
-                            {
-                                result = paIncompatibleHostApiSpecificStreamInfo;
-                                goto error;
-                            }
-                        }                        
-                    }
-                    else
-                    {
-                        /* a custom StreamInfo was not used for specifying the input buffer size,
-                            so use the output buffer size, and approximately the same latency. */
-
-                        *framesPerHostInputBuffer = *framesPerHostOutputBuffer;
-                        *hostInputBufferCount = (((unsigned long)(suggestedInputLatency * sampleRate)) / *framesPerHostInputBuffer) + 1;
-
-                        if( *hostInputBufferCount < PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_ )
-                            *hostInputBufferCount = PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_;
-                    }
-                }
-            }
-        }
-        else
-        {
-            unsigned long hostBufferSizeBytes, hostBufferCount;
-            unsigned long minimumBufferCount = PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_;
-            unsigned long maximumBufferSize;
-            int hostOutputFrameSize;
-            int hostOutputSampleSize;
-
-            hostOutputSampleSize = Pa_GetSampleSize( hostOutputSampleFormat );
-            if( hostOutputSampleSize < 0 )
-            {
-                result = hostOutputSampleSize;
-                goto error;
-            }
-
-            if( outputStreamInfo
-                && ( outputStreamInfo->flags & paWinMmeUseMultipleDevices ) )
-            {
-                /* set effectiveOutputChannelCount to the largest number of
-                    channels on any one device.
-                */
-                effectiveOutputChannelCount = 0;
-                for( i=0; i< outputStreamInfo->deviceCount; ++i )
-                {
-                    if( outputStreamInfo->devices[i].channelCount > effectiveOutputChannelCount )
-                        effectiveOutputChannelCount = outputStreamInfo->devices[i].channelCount;
-                }
-            }
-            else
-            {
-                effectiveOutputChannelCount = outputChannelCount;
-            }
-
-            hostOutputFrameSize = hostOutputSampleSize * effectiveOutputChannelCount;
-            
-            maximumBufferSize = (long) ((PA_MME_MAX_HOST_BUFFER_SECS_ * sampleRate) * hostOutputFrameSize);
-            if( maximumBufferSize > PA_MME_MAX_HOST_BUFFER_BYTES_ )
-                maximumBufferSize = PA_MME_MAX_HOST_BUFFER_BYTES_;
-
-
-            /* compute the following in bytes, then convert back to frames */
-
-            SelectBufferSizeAndCount(
-                ((framesPerBuffer == paFramesPerBufferUnspecified)
-                    ? PA_MME_MIN_HOST_BUFFER_FRAMES_WHEN_UNSPECIFIED_
-                    : framesPerBuffer ) * hostOutputFrameSize, /* baseBufferSize */
-                ((unsigned long)(suggestedOutputLatency * sampleRate)) * hostOutputFrameSize, /* suggestedLatency */
-                4, /* baseBufferCount */
-                minimumBufferCount,
-                maximumBufferSize,
-                &hostBufferSizeBytes, &hostBufferCount );
-
-            *framesPerHostOutputBuffer = hostBufferSizeBytes / hostOutputFrameSize;
-            *hostOutputBufferCount = hostBufferCount;
-
-
-            if( inputChannelCount > 0 )
-            {
-                /* ensure that both input and output buffer sizes are the same.
-                    if they don't match at this stage, choose the smallest one
-                    and use that for input and output
-                */
-
-                if( *framesPerHostOutputBuffer != *framesPerHostInputBuffer )
-                {
-                    if( framesPerHostInputBuffer < framesPerHostOutputBuffer )
-                    {
-                        unsigned long framesPerHostBuffer = *framesPerHostInputBuffer;
-                        
-                        minimumBufferCount = PA_MME_MIN_HOST_OUTPUT_BUFFER_COUNT_;
-                        ReselectBufferCount(
-                            framesPerHostBuffer * hostOutputFrameSize, /* bufferSize */
-                            ((unsigned long)(suggestedOutputLatency * sampleRate)) * hostOutputFrameSize, /* suggestedLatency */
-                            4, /* baseBufferCount */
-                            minimumBufferCount,
-                            &hostBufferCount );
-
-                        *framesPerHostOutputBuffer = framesPerHostBuffer;
-                        *hostOutputBufferCount = hostBufferCount;
-                    }
-                    else
-                    {
-                        unsigned long framesPerHostBuffer = *framesPerHostOutputBuffer;
-                        
-                        minimumBufferCount = PA_MME_MIN_HOST_INPUT_BUFFER_COUNT_FULL_DUPLEX_;
-                        ReselectBufferCount(
-                            framesPerHostBuffer * hostInputFrameSize, /* bufferSize */
-                            ((unsigned long)(suggestedInputLatency * sampleRate)) * hostInputFrameSize, /* suggestedLatency */
-                            4, /* baseBufferCount */
-                            minimumBufferCount,
-                            &hostBufferCount );
-
-                        *framesPerHostInputBuffer = framesPerHostBuffer;
-                        *hostInputBufferCount = hostBufferCount;
-                    }
-                }   
-            }
-        }
-    }
-    else
-    {
-        *framesPerHostOutputBuffer = 0;
-        *hostOutputBufferCount = 0;
-    }
-
-error:
-    return result;
-}
-
-
-typedef struct
-{
-    HANDLE bufferEvent;
-    void *waveHandles;
-    unsigned int deviceCount;
-    /* unsigned int channelCount; */
-    WAVEHDR **waveHeaders;                  /* waveHeaders[device][buffer] */
-    unsigned int bufferCount;
-    unsigned int currentBufferIndex;
-    unsigned int framesPerBuffer;
-    unsigned int framesUsedInCurrentBuffer;
-}PaWinMmeSingleDirectionHandlesAndBuffers;
-
-/* prototypes for functions operating on PaWinMmeSingleDirectionHandlesAndBuffers */
-
-static void InitializeSingleDirectionHandlesAndBuffers( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers );
-static PaError InitializeWaveHandles( PaWinMmeHostApiRepresentation *winMmeHostApi,
-        PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
-        unsigned long bytesPerHostSample,
-        double sampleRate, PaWinMmeDeviceAndChannelCount *devices,
-        unsigned int deviceCount, PaWinWaveFormatChannelMask channelMask, int isInput );
-static PaError TerminateWaveHandles( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput, int currentlyProcessingAnError );
-static PaError InitializeWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
-        unsigned long hostBufferCount,
-        PaSampleFormat hostSampleFormat,
-        unsigned long framesPerHostBuffer,
-        PaWinMmeDeviceAndChannelCount *devices,
-        int isInput );
-static void TerminateWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput );
-
-
-static void InitializeSingleDirectionHandlesAndBuffers( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
-{
-    handlesAndBuffers->bufferEvent = 0;
-    handlesAndBuffers->waveHandles = 0;
-    handlesAndBuffers->deviceCount = 0;
-    handlesAndBuffers->waveHeaders = 0;
-    handlesAndBuffers->bufferCount = 0;
-}    
-
-static PaError InitializeWaveHandles( PaWinMmeHostApiRepresentation *winMmeHostApi,
-        PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
-        unsigned long bytesPerHostSample,
-        double sampleRate, PaWinMmeDeviceAndChannelCount *devices,
-        unsigned int deviceCount, PaWinWaveFormatChannelMask channelMask, int isInput )
-{
-    PaError result;
-    MMRESULT mmresult;
-    signed int i, j;
-
-    /* for error cleanup we expect that InitializeSingleDirectionHandlesAndBuffers()
-        has already been called to zero some fields */       
-
-    result = CreateEventWithPaError( &handlesAndBuffers->bufferEvent, NULL, FALSE, FALSE, NULL );
-    if( result != paNoError ) goto error;
-
-    if( isInput )
-        handlesAndBuffers->waveHandles = (void*)PaUtil_AllocateMemory( sizeof(HWAVEIN) * deviceCount );
-    else
-        handlesAndBuffers->waveHandles = (void*)PaUtil_AllocateMemory( sizeof(HWAVEOUT) * deviceCount );
-    if( !handlesAndBuffers->waveHandles )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    handlesAndBuffers->deviceCount = deviceCount;
-
-    for( i = 0; i < (signed int)deviceCount; ++i )
-    {
-        if( isInput )
-            ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] = 0;
-        else
-            ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] = 0;
-    }
-
-    for( i = 0; i < (signed int)deviceCount; ++i )
-    {
-        PaWinWaveFormat waveFormat;
-        UINT winMmeDeviceId = LocalDeviceIndexToWinMmeDeviceId( winMmeHostApi, devices[i].device );
-    
-        /* @todo: consider providing a flag or #define to not try waveformat extensible 
-           this could just initialize j to 1 the first time round. */
-
-        for( j = 0; j < 2; ++j )
-        {
-            if( j == 0 )
-            { 
-                /* first, attempt to open the device using WAVEFORMATEXTENSIBLE, 
-                    if this fails we fall back to WAVEFORMATEX */
-
-                /* @todo at the moment we only use 16 bit sample format */
-                PaWin_InitializeWaveFormatExtensible( &waveFormat, devices[i].channelCount, 
-                        paInt16, sampleRate, channelMask );
-
-            }
-            else
-            {
-                /* retry with WAVEFORMATEX */
-
-                PaWin_InitializeWaveFormatEx( &waveFormat, devices[i].channelCount, paInt16, sampleRate );
-            }
-
-            /* REVIEW: consider not firing an event for input when a full duplex
-                stream is being used. this would probably depend on the
-                neverDropInput flag. */
-
-            if( isInput )
-            {
-                mmresult = waveInOpen( &((HWAVEIN*)handlesAndBuffers->waveHandles)[i], winMmeDeviceId, 
-                                    (WAVEFORMATEX*)&waveFormat,
-                               (DWORD_PTR)handlesAndBuffers->bufferEvent, (DWORD_PTR)0, CALLBACK_EVENT );
-            }
-            else
-            {
-                mmresult = waveOutOpen( &((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], winMmeDeviceId, 
-                                    (WAVEFORMATEX*)&waveFormat,
-                                (DWORD_PTR)handlesAndBuffers->bufferEvent, (DWORD_PTR)0, CALLBACK_EVENT );
-            }
-
-            if( mmresult == MMSYSERR_NOERROR )
-            {
-                break; /* success */
-            }
-            else if( j == 0 )
-            {
-                continue; /* try again with WAVEFORMATEX */
-            }
-            else
-            {
-                switch( mmresult )
-                {
-                    case MMSYSERR_ALLOCATED:    /* Specified resource is already allocated. */
-                        result = paDeviceUnavailable;
-                        break;
-                    case MMSYSERR_NODRIVER:	    /* No device driver is present. */
-                        result = paDeviceUnavailable;
-                        break;
-                    case MMSYSERR_NOMEM:	    /* Unable to allocate or lock memory. */
-                        result = paInsufficientMemory;
-                        break;
-
-                    case MMSYSERR_BADDEVICEID:	/* Specified device identifier is out of range. */
-                        /* falls through */
-
-                    case WAVERR_BADFORMAT:      /* Attempted to open with an unsupported waveform-audio format. */
-                                                    /* This can also occur if we try to open the device with an unsupported
-                                                     * number of channels. This is attempted when device*ChannelCountIsKnown is
-                                                     * set to 0. 
-                                                     */
-                        /* falls through */
-                    default:
-                        result = paUnanticipatedHostError;
-                        if( isInput )
-                        {
-                            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                        }
-                        else
-                        {
-                            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                        }
-                }
-                goto error;
-            }
-        }
-    }
-
-    return result;
-
-error:
-    TerminateWaveHandles( handlesAndBuffers, isInput, 1 /* currentlyProcessingAnError */ );
-
-    return result;
-}
-
-
-static PaError TerminateWaveHandles( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput, int currentlyProcessingAnError )
-{
-    PaError result = paNoError;
-    MMRESULT mmresult;
-    signed int i;
-    
-    if( handlesAndBuffers->waveHandles )
-    {
-        for( i = handlesAndBuffers->deviceCount-1; i >= 0; --i )
-        {
-            if( isInput )
-            {
-                if( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] )
-                    mmresult = waveInClose( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i] );
-                else
-                    mmresult = MMSYSERR_NOERROR;
-            }
-            else
-            {
-                if( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] )
-                    mmresult = waveOutClose( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i] );
-                else
-                    mmresult = MMSYSERR_NOERROR;
-            }
-
-            if( mmresult != MMSYSERR_NOERROR &&
-                !currentlyProcessingAnError ) /* don't update the error state if we're already processing an error */
-            {
-                result = paUnanticipatedHostError;
-                if( isInput )
-                {
-                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                }
-                else
-                {
-                    PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                }
-                /* note that we don't break here, we try to continue closing devices */
-            }
-        }
-
-        PaUtil_FreeMemory( handlesAndBuffers->waveHandles );
-        handlesAndBuffers->waveHandles = 0;
-    }
-
-    if( handlesAndBuffers->bufferEvent )
-    {
-        result = CloseHandleWithPaError( handlesAndBuffers->bufferEvent );
-        handlesAndBuffers->bufferEvent = 0;
-    }
-    
-    return result;
-}
-
-
-static PaError InitializeWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers,
-        unsigned long hostBufferCount,
-        PaSampleFormat hostSampleFormat,
-        unsigned long framesPerHostBuffer,
-        PaWinMmeDeviceAndChannelCount *devices,
-        int isInput )
-{
-    PaError result = paNoError;
-    MMRESULT mmresult;
-    WAVEHDR *deviceWaveHeaders;
-    signed int i, j;
-
-    /* for error cleanup we expect that InitializeSingleDirectionHandlesAndBuffers()
-        has already been called to zero some fields */
-        
-
-    /* allocate an array of pointers to arrays of wave headers, one array of
-        wave headers per device */
-    handlesAndBuffers->waveHeaders = (WAVEHDR**)PaUtil_AllocateMemory( sizeof(WAVEHDR*) * handlesAndBuffers->deviceCount );
-    if( !handlesAndBuffers->waveHeaders )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-    
-    for( i = 0; i < (signed int)handlesAndBuffers->deviceCount; ++i )
-        handlesAndBuffers->waveHeaders[i] = 0;
-
-    handlesAndBuffers->bufferCount = hostBufferCount;
-
-    for( i = 0; i < (signed int)handlesAndBuffers->deviceCount; ++i )
-    {
-        int bufferBytes = Pa_GetSampleSize( hostSampleFormat ) *
-                framesPerHostBuffer * devices[i].channelCount;
-        if( bufferBytes < 0 )
-        {
-            result = paInternalError;
-            goto error;
-        }
-
-        /* Allocate an array of wave headers for device i */
-        deviceWaveHeaders = (WAVEHDR *) PaUtil_AllocateMemory( sizeof(WAVEHDR)*hostBufferCount );
-        if( !deviceWaveHeaders )
-        {
-            result = paInsufficientMemory;
-            goto error;
-        }
-
-        for( j=0; j < (signed int)hostBufferCount; ++j )
-            deviceWaveHeaders[j].lpData = 0;
-
-        handlesAndBuffers->waveHeaders[i] = deviceWaveHeaders;
-
-        /* Allocate a buffer for each wave header */
-        for( j=0; j < (signed int)hostBufferCount; ++j )
-        {
-            deviceWaveHeaders[j].lpData = (char *)PaUtil_AllocateMemory( bufferBytes );
-            if( !deviceWaveHeaders[j].lpData )
-            {
-                result = paInsufficientMemory;
-                goto error;
-            }
-            deviceWaveHeaders[j].dwBufferLength = bufferBytes;
-            deviceWaveHeaders[j].dwUser = 0xFFFFFFFF; /* indicates that *PrepareHeader() has not yet been called, for error clean up code */
-
-            if( isInput )
-            {
-                mmresult = waveInPrepareHeader( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
-                if( mmresult != MMSYSERR_NOERROR )
-                {
-                    result = paUnanticipatedHostError;
-                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                    goto error;
-                }
-            }
-            else /* output */
-            {
-                mmresult = waveOutPrepareHeader( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
-                if( mmresult != MMSYSERR_NOERROR )
-                {
-                    result = paUnanticipatedHostError;
-                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                    goto error;
-                }
-            }
-            deviceWaveHeaders[j].dwUser = devices[i].channelCount;
-        }
-    }
-
-    return result;
-
-error:
-    TerminateWaveHeaders( handlesAndBuffers, isInput );
-    
-    return result;
-}
-
-
-static void TerminateWaveHeaders( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers, int isInput )
-{
-    signed int i, j;
-    WAVEHDR *deviceWaveHeaders;
-    
-    if( handlesAndBuffers->waveHeaders )
-    {
-        for( i = handlesAndBuffers->deviceCount-1; i >= 0 ; --i )
-        {
-            deviceWaveHeaders = handlesAndBuffers->waveHeaders[i];  /* wave headers for device i */
-            if( deviceWaveHeaders )
-            {
-                for( j = handlesAndBuffers->bufferCount-1; j >= 0; --j )
-                {
-                    if( deviceWaveHeaders[j].lpData )
-                    {
-                        if( deviceWaveHeaders[j].dwUser != 0xFFFFFFFF )
-                        {
-                            if( isInput )
-                                waveInUnprepareHeader( ((HWAVEIN*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
-                            else
-                                waveOutUnprepareHeader( ((HWAVEOUT*)handlesAndBuffers->waveHandles)[i], &deviceWaveHeaders[j], sizeof(WAVEHDR) );
-                        }
-
-                        PaUtil_FreeMemory( deviceWaveHeaders[j].lpData );
-                    }
-                }
-
-                PaUtil_FreeMemory( deviceWaveHeaders );
-            }
-        }
-
-        PaUtil_FreeMemory( handlesAndBuffers->waveHeaders );
-        handlesAndBuffers->waveHeaders = 0;
-    }
-}
-
-
-
-/* PaWinMmeStream - a stream data structure specifically for this implementation */
-/* note that struct PaWinMmeStream is typedeffed to PaWinMmeStream above. */
-struct PaWinMmeStream
-{
-    PaUtilStreamRepresentation streamRepresentation;
-    PaUtilCpuLoadMeasurer cpuLoadMeasurer;
-    PaUtilBufferProcessor bufferProcessor;
-
-    int primeStreamUsingCallback;
-
-    PaWinMmeSingleDirectionHandlesAndBuffers input;
-    PaWinMmeSingleDirectionHandlesAndBuffers output;
-
-    /* Processing thread management -------------- */
-    HANDLE abortEvent;
-    HANDLE processingThread;
-    DWORD processingThreadId;
-
-    char throttleProcessingThreadOnOverload; /* 0 -> don't throtte, non-0 -> throttle */
-    int processingThreadPriority;
-    int highThreadPriority;
-    int throttledThreadPriority;
-    unsigned long throttledSleepMsecs;
-
-    int isStopped;
-    volatile int isActive;
-    volatile int stopProcessing; /* stop thread once existing buffers have been returned */
-    volatile int abortProcessing; /* stop thread immediately */
-
-    DWORD allBuffersDurationMs; /* used to calculate timeouts */
-};
-
-/* updates deviceCount if PaWinMmeUseMultipleDevices is used */
-
-static PaError ValidateWinMmeSpecificStreamInfo(
-        const PaStreamParameters *streamParameters,
-        const PaWinMmeStreamInfo *streamInfo,
-        char *throttleProcessingThreadOnOverload,
-        unsigned long *deviceCount )
-{
-	if( streamInfo )
-	{
-	    if( streamInfo->size != sizeof( PaWinMmeStreamInfo )
-	            || streamInfo->version != 1 )
-	    {
-	        return paIncompatibleHostApiSpecificStreamInfo;
-	    }
-
-	    if( streamInfo->flags & paWinMmeDontThrottleOverloadedProcessingThread )
-	        *throttleProcessingThreadOnOverload = 0;
-            
-	    if( streamInfo->flags & paWinMmeUseMultipleDevices )
-	    {
-	        if( streamParameters->device != paUseHostApiSpecificDeviceSpecification )
-	            return paInvalidDevice;
-	
-			*deviceCount = streamInfo->deviceCount;
-		}	
-	}
-
-	return paNoError;
-}
-
-static PaError RetrieveDevicesFromStreamParameters(
-        struct PaUtilHostApiRepresentation *hostApi,
-        const PaStreamParameters *streamParameters,
-        const PaWinMmeStreamInfo *streamInfo,
-        PaWinMmeDeviceAndChannelCount *devices,
-        unsigned long deviceCount )
-{
-    PaError result = paNoError;
-    unsigned int i;
-    int totalChannelCount;
-    PaDeviceIndex hostApiDevice;
-    
-	if( streamInfo && streamInfo->flags & paWinMmeUseMultipleDevices )
-	{
-		totalChannelCount = 0;
-	    for( i=0; i < deviceCount; ++i )
-	    {
-	        /* validate that the device number is within range */
-	        result = PaUtil_DeviceIndexToHostApiDeviceIndex( &hostApiDevice,
-	                        streamInfo->devices[i].device, hostApi );
-	        if( result != paNoError )
-	            return result;
-	        
-	        devices[i].device = hostApiDevice;
-	        devices[i].channelCount = streamInfo->devices[i].channelCount;
-	
-	        totalChannelCount += devices[i].channelCount;
-	    }
-	
-	    if( totalChannelCount != streamParameters->channelCount )
-	    {
-	        /* channelCount must match total channels specified by multiple devices */
-	        return paInvalidChannelCount; /* REVIEW use of this error code */
-	    }
-	}	
-	else
-	{		
-	    devices[0].device = streamParameters->device;
-	    devices[0].channelCount = streamParameters->channelCount;
-	}
-
-    return result;
-}
-
-static PaError ValidateInputChannelCounts(
-        struct PaUtilHostApiRepresentation *hostApi,
-        PaWinMmeDeviceAndChannelCount *devices,
-        unsigned long deviceCount )
-{
-    unsigned int i;
-    PaWinMmeDeviceInfo *inputDeviceInfo;
-    PaError paerror;
-
-	for( i=0; i < deviceCount; ++i )
-	{
-        if( devices[i].channelCount < 1 )
-        	return paInvalidChannelCount;
-
-        inputDeviceInfo = 
-                (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ];
-
-        paerror = IsInputChannelCountSupported( inputDeviceInfo, devices[i].channelCount );
-        if( paerror != paNoError )
-            return paerror;
-	}
-
-    return paNoError;
-}
-
-static PaError ValidateOutputChannelCounts(
-        struct PaUtilHostApiRepresentation *hostApi,
-        PaWinMmeDeviceAndChannelCount *devices,
-        unsigned long deviceCount )
-{
-    unsigned int i;
-    PaWinMmeDeviceInfo *outputDeviceInfo;
-    PaError paerror;
-
-	for( i=0; i < deviceCount; ++i )
-	{
-        if( devices[i].channelCount < 1 )
-        	return paInvalidChannelCount;
-
-        outputDeviceInfo = 
-                (PaWinMmeDeviceInfo*)hostApi->deviceInfos[ devices[i].device ];
-
-        paerror = IsOutputChannelCountSupported( outputDeviceInfo, devices[i].channelCount );
-        if( paerror != paNoError )
-            return paerror;
-	}
-
-    return paNoError;
-}
-
-
-/* the following macros are intended to improve the readability of the following code */
-#define PA_IS_INPUT_STREAM_( stream ) ( stream ->input.waveHandles )
-#define PA_IS_OUTPUT_STREAM_( stream ) ( stream ->output.waveHandles )
-#define PA_IS_FULL_DUPLEX_STREAM_( stream ) ( stream ->input.waveHandles && stream ->output.waveHandles )
-#define PA_IS_HALF_DUPLEX_STREAM_( stream ) ( !(stream ->input.waveHandles && stream ->output.waveHandles) )
-
-static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
-                           PaStream** s,
-                           const PaStreamParameters *inputParameters,
-                           const PaStreamParameters *outputParameters,
-                           double sampleRate,
-                           unsigned long framesPerBuffer,
-                           PaStreamFlags streamFlags,
-                           PaStreamCallback *streamCallback,
-                           void *userData )
-{
-    PaError result;
-    PaWinMmeHostApiRepresentation *winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
-    PaWinMmeStream *stream = 0;
-    int bufferProcessorIsInitialized = 0;
-    int streamRepresentationIsInitialized = 0;
-    PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat;
-    int inputChannelCount, outputChannelCount;
-    PaSampleFormat inputSampleFormat, outputSampleFormat;
-    double suggestedInputLatency, suggestedOutputLatency;
-    PaWinMmeStreamInfo *inputStreamInfo, *outputStreamInfo;
-    PaWinWaveFormatChannelMask inputChannelMask, outputChannelMask;
-    unsigned long framesPerHostInputBuffer;
-    unsigned long hostInputBufferCount;
-    unsigned long framesPerHostOutputBuffer;
-    unsigned long hostOutputBufferCount;
-    unsigned long framesPerBufferProcessorCall;
-    PaWinMmeDeviceAndChannelCount *inputDevices = 0;  /* contains all devices and channel counts as local host api ids, even when PaWinMmeUseMultipleDevices is not used */
-    unsigned long inputDeviceCount = 0;            
-    PaWinMmeDeviceAndChannelCount *outputDevices = 0;
-    unsigned long outputDeviceCount = 0;                /* contains all devices and channel counts as local host api ids, even when PaWinMmeUseMultipleDevices is not used */
-    char throttleProcessingThreadOnOverload = 1;
-
-    
-    if( inputParameters )
-    {
-		inputChannelCount = inputParameters->channelCount;
-        inputSampleFormat = inputParameters->sampleFormat;
-        suggestedInputLatency = inputParameters->suggestedLatency;
-
-      	inputDeviceCount = 1;
-
-		/* validate input hostApiSpecificStreamInfo */
-        inputStreamInfo = (PaWinMmeStreamInfo*)inputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinMmeSpecificStreamInfo( inputParameters, inputStreamInfo,
-				&throttleProcessingThreadOnOverload,
-				&inputDeviceCount );
-		if( result != paNoError ) return result;
-
-		inputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * inputDeviceCount );
-        if( !inputDevices ) return paInsufficientMemory;
-
-		result = RetrieveDevicesFromStreamParameters( hostApi, inputParameters, inputStreamInfo, inputDevices, inputDeviceCount );
-		if( result != paNoError ) return result;
-
-		result = ValidateInputChannelCounts( hostApi, inputDevices, inputDeviceCount );
-		if( result != paNoError ) return result;
-
-        hostInputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, inputSampleFormat );
-
-        if( inputDeviceCount != 1 ){
-            /* always use direct speakers when using multi-device multichannel mode */
-            inputChannelMask = PAWIN_SPEAKER_DIRECTOUT;           
-        }
-        else
-        {
-            if( inputStreamInfo && inputStreamInfo->flags & paWinMmeUseChannelMask )
-                inputChannelMask = inputStreamInfo->channelMask;
-            else
-                inputChannelMask = PaWin_DefaultChannelMask( inputDevices[0].channelCount );
-        }
-	}
-    else
-    {
-        inputChannelCount = 0;
-        inputSampleFormat = 0;
-        suggestedInputLatency = 0.;
-        inputStreamInfo = 0;
-        hostInputSampleFormat = 0;
-    }
-
-
-    if( outputParameters )
-    {
-        outputChannelCount = outputParameters->channelCount;
-        outputSampleFormat = outputParameters->sampleFormat;
-        suggestedOutputLatency = outputParameters->suggestedLatency;
-
-        outputDeviceCount = 1;
-
-		/* validate output hostApiSpecificStreamInfo */
-        outputStreamInfo = (PaWinMmeStreamInfo*)outputParameters->hostApiSpecificStreamInfo;
-		result = ValidateWinMmeSpecificStreamInfo( outputParameters, outputStreamInfo,
-				&throttleProcessingThreadOnOverload,
-				&outputDeviceCount );
-		if( result != paNoError ) return result;
-
-		outputDevices = (PaWinMmeDeviceAndChannelCount*)alloca( sizeof(PaWinMmeDeviceAndChannelCount) * outputDeviceCount );
-        if( !outputDevices ) return paInsufficientMemory;
-
-		result = RetrieveDevicesFromStreamParameters( hostApi, outputParameters, outputStreamInfo, outputDevices, outputDeviceCount );
-		if( result != paNoError ) return result;
-
-		result = ValidateOutputChannelCounts( hostApi, outputDevices, outputDeviceCount );
-		if( result != paNoError ) return result;
-
-        hostOutputSampleFormat =
-            PaUtil_SelectClosestAvailableFormat( paInt16 /* native formats */, outputSampleFormat );
-
-        if( outputDeviceCount != 1 ){
-            /* always use direct speakers when using multi-device multichannel mode */
-            outputChannelMask = PAWIN_SPEAKER_DIRECTOUT;           
-        }
-        else
-        {
-            if( outputStreamInfo && outputStreamInfo->flags & paWinMmeUseChannelMask )
-                outputChannelMask = outputStreamInfo->channelMask;
-            else
-                outputChannelMask = PaWin_DefaultChannelMask( outputDevices[0].channelCount );
-        }
-    }
-    else
-    {
-        outputChannelCount = 0;
-        outputSampleFormat = 0;
-        outputStreamInfo = 0;
-        hostOutputSampleFormat = 0;
-        suggestedOutputLatency = 0.;
-    }
-
-
-    /*
-        IMPLEMENT ME:
-            - alter sampleRate to a close allowable rate if possible / necessary
-    */
-
-
-    /* validate platform specific flags */
-    if( (streamFlags & paPlatformSpecificFlags) != 0 )
-        return paInvalidFlag; /* unexpected platform specific flag */
-
-
-    result = CalculateBufferSettings( &framesPerHostInputBuffer, &hostInputBufferCount,
-                &framesPerHostOutputBuffer, &hostOutputBufferCount,
-                inputChannelCount, hostInputSampleFormat, suggestedInputLatency, inputStreamInfo,
-                outputChannelCount, hostOutputSampleFormat, suggestedOutputLatency, outputStreamInfo,
-                sampleRate, framesPerBuffer );
-    if( result != paNoError ) goto error;
-
-
-    stream = (PaWinMmeStream*)PaUtil_AllocateMemory( sizeof(PaWinMmeStream) );
-    if( !stream )
-    {
-        result = paInsufficientMemory;
-        goto error;
-    }
-
-    InitializeSingleDirectionHandlesAndBuffers( &stream->input );
-    InitializeSingleDirectionHandlesAndBuffers( &stream->output );
-
-    stream->abortEvent = 0;
-    stream->processingThread = 0;
-
-    stream->throttleProcessingThreadOnOverload = throttleProcessingThreadOnOverload;
-
-    PaUtil_InitializeStreamRepresentation( &stream->streamRepresentation,
-                                           ( (streamCallback)
-                                            ? &winMmeHostApi->callbackStreamInterface
-                                            : &winMmeHostApi->blockingStreamInterface ),
-                                           streamCallback, userData );
-    streamRepresentationIsInitialized = 1;
-
-    PaUtil_InitializeCpuLoadMeasurer( &stream->cpuLoadMeasurer, sampleRate );
-
-
-    if( inputParameters && outputParameters ) /* full duplex */
-    {
-        if( framesPerHostInputBuffer < framesPerHostOutputBuffer )
-        {
-            assert( (framesPerHostOutputBuffer % framesPerHostInputBuffer) == 0 ); /* CalculateBufferSettings() should guarantee this condition */
-
-            framesPerBufferProcessorCall = framesPerHostInputBuffer;
-        }
-        else
-        {
-            assert( (framesPerHostInputBuffer % framesPerHostOutputBuffer) == 0 ); /* CalculateBufferSettings() should guarantee this condition */
-            
-            framesPerBufferProcessorCall = framesPerHostOutputBuffer;
-        }
-    }
-    else if( inputParameters )
-    {
-        framesPerBufferProcessorCall = framesPerHostInputBuffer;
-    }
-    else if( outputParameters )
-    {
-        framesPerBufferProcessorCall = framesPerHostOutputBuffer;
-    }
-
-    stream->input.framesPerBuffer = framesPerHostInputBuffer;
-    stream->output.framesPerBuffer = framesPerHostOutputBuffer;
-
-    result =  PaUtil_InitializeBufferProcessor( &stream->bufferProcessor,
-                    inputChannelCount, inputSampleFormat, hostInputSampleFormat,
-                    outputChannelCount, outputSampleFormat, hostOutputSampleFormat,
-                    sampleRate, streamFlags, framesPerBuffer,
-                    framesPerBufferProcessorCall, paUtilFixedHostBufferSize,
-                    streamCallback, userData );
-    if( result != paNoError ) goto error;
-    
-    bufferProcessorIsInitialized = 1;
-
-    stream->streamRepresentation.streamInfo.inputLatency =
-            (double)(PaUtil_GetBufferProcessorInputLatency(&stream->bufferProcessor)
-                +(framesPerHostInputBuffer * (hostInputBufferCount-1))) / sampleRate;
-    stream->streamRepresentation.streamInfo.outputLatency =
-            (double)(PaUtil_GetBufferProcessorOutputLatency(&stream->bufferProcessor)
-                +(framesPerHostOutputBuffer * (hostOutputBufferCount-1))) / sampleRate;
-    stream->streamRepresentation.streamInfo.sampleRate = sampleRate;
-
-    stream->primeStreamUsingCallback = ( (streamFlags&paPrimeOutputBuffersUsingStreamCallback) && streamCallback ) ? 1 : 0;
-
-    /* time to sleep when throttling due to >100% cpu usage.
-        -a quater of a buffer's duration */
-    stream->throttledSleepMsecs =
-            (unsigned long)(stream->bufferProcessor.framesPerHostBuffer *
-             stream->bufferProcessor.samplePeriod * .25 * 1000);
-
-    stream->isStopped = 1;
-    stream->isActive = 0;
-
-
-    /* for maximum compatibility with multi-device multichannel drivers,
-        we first open all devices, then we prepare all buffers, finally
-        we start all devices ( in StartStream() ). teardown in reverse order.
-    */
-
-    if( inputParameters )
-    {
-        result = InitializeWaveHandles( winMmeHostApi, &stream->input,
-                stream->bufferProcessor.bytesPerHostInputSample, sampleRate,
-                inputDevices, inputDeviceCount, inputChannelMask, 1 /* isInput */ );
-        if( result != paNoError ) goto error;
-    }
-    
-    if( outputParameters )
-    {
-        result = InitializeWaveHandles( winMmeHostApi, &stream->output,
-                stream->bufferProcessor.bytesPerHostOutputSample, sampleRate,
-                outputDevices, outputDeviceCount, outputChannelMask, 0 /* isInput */ );
-        if( result != paNoError ) goto error;
-    }
-
-    if( inputParameters )
-    {
-        result = InitializeWaveHeaders( &stream->input, hostInputBufferCount,
-                hostInputSampleFormat, framesPerHostInputBuffer, inputDevices, 1 /* isInput */ );
-        if( result != paNoError ) goto error;
-    }
-
-    if( outputParameters )
-    {
-        result = InitializeWaveHeaders( &stream->output, hostOutputBufferCount,
-                hostOutputSampleFormat, framesPerHostOutputBuffer, outputDevices, 0 /* not isInput */ );
-        if( result != paNoError ) goto error;
-
-        stream->allBuffersDurationMs = (DWORD) (1000.0 * (framesPerHostOutputBuffer * stream->output.bufferCount) / sampleRate);
-    }
-    else
-    {
-        stream->allBuffersDurationMs = (DWORD) (1000.0 * (framesPerHostInputBuffer * stream->input.bufferCount) / sampleRate);
-    }
-
-    
-    if( streamCallback )
-    {
-        /* abort event is only needed for callback streams */
-        result = CreateEventWithPaError( &stream->abortEvent, NULL, TRUE, FALSE, NULL );
-        if( result != paNoError ) goto error;
-    }
-
-    *s = (PaStream*)stream;
-
-    return result;
-
-error:
-
-    if( stream )
-    {
-        if( stream->abortEvent )
-            CloseHandle( stream->abortEvent );
-            
-        TerminateWaveHeaders( &stream->output, 0 /* not isInput */ );
-        TerminateWaveHeaders( &stream->input, 1 /* isInput */ );
-
-        TerminateWaveHandles( &stream->output, 0 /* not isInput */, 1 /* currentlyProcessingAnError */ );
-        TerminateWaveHandles( &stream->input, 1 /* isInput */, 1 /* currentlyProcessingAnError */ );
-
-        if( bufferProcessorIsInitialized )
-            PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-
-        if( streamRepresentationIsInitialized )
-            PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-
-        PaUtil_FreeMemory( stream );
-    }
-
-    return result;
-}
-
-
-/* return non-zero if all current buffers are done */
-static int BuffersAreDone( WAVEHDR **waveHeaders, unsigned int deviceCount, int bufferIndex )
-{
-    unsigned int i;
-    
-    for( i=0; i < deviceCount; ++i )
-    {
-        if( !(waveHeaders[i][ bufferIndex ].dwFlags & WHDR_DONE) )
-        {
-            return 0;
-        }         
-    }
-
-    return 1;
-}
-
-static int CurrentInputBuffersAreDone( PaWinMmeStream *stream )
-{
-    return BuffersAreDone( stream->input.waveHeaders, stream->input.deviceCount, stream->input.currentBufferIndex );
-}
-
-static int CurrentOutputBuffersAreDone( PaWinMmeStream *stream )
-{
-    return BuffersAreDone( stream->output.waveHeaders, stream->output.deviceCount, stream->output.currentBufferIndex );
-}
-
-
-/* return non-zero if any buffers are queued */
-static int NoBuffersAreQueued( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
-{
-    unsigned int i, j;
-
-    if( handlesAndBuffers->waveHandles )
-    {
-        for( i=0; i < handlesAndBuffers->bufferCount; ++i )
-        {
-            for( j=0; j < handlesAndBuffers->deviceCount; ++j )
-            {
-                if( !( handlesAndBuffers->waveHeaders[ j ][ i ].dwFlags & WHDR_DONE) )
-                {
-                    return 0;
-                }
-            }
-        }
-    }
-
-    return 1;
-}
-
-
-#define PA_CIRCULAR_INCREMENT_( current, max )\
-    ( (((current) + 1) >= (max)) ? (0) : (current+1) )
-
-#define PA_CIRCULAR_DECREMENT_( current, max )\
-    ( ((current) == 0) ? ((max)-1) : (current-1) )
-    
-
-static signed long GetAvailableFrames( PaWinMmeSingleDirectionHandlesAndBuffers *handlesAndBuffers )
-{
-    signed long result = 0;
-    unsigned int i;
-    
-    if( BuffersAreDone( handlesAndBuffers->waveHeaders, handlesAndBuffers->deviceCount, handlesAndBuffers->currentBufferIndex ) )
-    {
-        /* we could calculate the following in O(1) if we kept track of the
-            last done buffer */
-        result = handlesAndBuffers->framesPerBuffer - handlesAndBuffers->framesUsedInCurrentBuffer;
-
-        i = PA_CIRCULAR_INCREMENT_( handlesAndBuffers->currentBufferIndex, handlesAndBuffers->bufferCount );
-        while( i != handlesAndBuffers->currentBufferIndex )
-        {
-            if( BuffersAreDone( handlesAndBuffers->waveHeaders, handlesAndBuffers->deviceCount, i ) )
-            {
-                result += handlesAndBuffers->framesPerBuffer;
-                i = PA_CIRCULAR_INCREMENT_( i, handlesAndBuffers->bufferCount );
-            }
-            else
-                break;
-        }
-    }
-
-    return result;
-}
-
-
-static PaError AdvanceToNextInputBuffer( PaWinMmeStream *stream )
-{
-    PaError result = paNoError;
-    MMRESULT mmresult;
-    unsigned int i;
-
-    for( i=0; i < stream->input.deviceCount; ++i )
-    {
-        stream->input.waveHeaders[i][ stream->input.currentBufferIndex ].dwFlags &= ~WHDR_DONE;
-        mmresult = waveInAddBuffer( ((HWAVEIN*)stream->input.waveHandles)[i],
-                                    &stream->input.waveHeaders[i][ stream->input.currentBufferIndex ],
-                                    sizeof(WAVEHDR) );
-        if( mmresult != MMSYSERR_NOERROR )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-        }
-    }
-
-    stream->input.currentBufferIndex =
-            PA_CIRCULAR_INCREMENT_( stream->input.currentBufferIndex, stream->input.bufferCount );
-
-    stream->input.framesUsedInCurrentBuffer = 0;
-
-    return result;
-}
-
-
-static PaError AdvanceToNextOutputBuffer( PaWinMmeStream *stream )
-{
-    PaError result = paNoError;
-    MMRESULT mmresult;
-    unsigned int i;
-
-    for( i=0; i < stream->output.deviceCount; ++i )
-    {
-        mmresult = waveOutWrite( ((HWAVEOUT*)stream->output.waveHandles)[i],
-                                 &stream->output.waveHeaders[i][ stream->output.currentBufferIndex ],
-                                 sizeof(WAVEHDR) );
-        if( mmresult != MMSYSERR_NOERROR )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-        }
-    }
-
-    stream->output.currentBufferIndex =
-            PA_CIRCULAR_INCREMENT_( stream->output.currentBufferIndex, stream->output.bufferCount );
-
-    stream->output.framesUsedInCurrentBuffer = 0;
-    
-    return result;
-}
-
-
-/* requeue all but the most recent input with the driver. Used for catching
-    up after a total input buffer underrun */
-static PaError CatchUpInputBuffers( PaWinMmeStream *stream )
-{
-    PaError result = paNoError;
-    unsigned int i;
-    
-    for( i=0; i < stream->input.bufferCount - 1; ++i )
-    {
-        result = AdvanceToNextInputBuffer( stream );
-        if( result != paNoError )
-            break;
-    }
-
-    return result;
-}
-
-
-/* take the most recent output and duplicate it to all other output buffers
-    and requeue them. Used for catching up after a total output buffer underrun.
-*/
-static PaError CatchUpOutputBuffers( PaWinMmeStream *stream )
-{
-    PaError result = paNoError;
-    unsigned int i, j;
-    unsigned int previousBufferIndex =
-            PA_CIRCULAR_DECREMENT_( stream->output.currentBufferIndex, stream->output.bufferCount );
-
-    for( i=0; i < stream->output.bufferCount - 1; ++i )
-    {
-        for( j=0; j < stream->output.deviceCount; ++j )
-        {
-            if( stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].lpData
-                    != stream->output.waveHeaders[j][ previousBufferIndex ].lpData )
-            {
-                CopyMemory( stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].lpData,
-                            stream->output.waveHeaders[j][ previousBufferIndex ].lpData,
-                            stream->output.waveHeaders[j][ stream->output.currentBufferIndex ].dwBufferLength );
-            }
-        }
-
-        result = AdvanceToNextOutputBuffer( stream );
-        if( result != paNoError )
-            break;
-    }
-
-    return result;
-}
-
-
-static DWORD WINAPI ProcessingThreadProc( void *pArg )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream *)pArg;
-    HANDLE events[3];
-    int eventCount = 0;
-    DWORD result = paNoError;
-    DWORD waitResult;
-    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
-    int hostBuffersAvailable;
-    signed int hostInputBufferIndex, hostOutputBufferIndex;
-    PaStreamCallbackFlags statusFlags;
-    int callbackResult;
-    int done = 0;
-    unsigned int channel, i;
-    unsigned long framesProcessed;
-    
-    /* prepare event array for call to WaitForMultipleObjects() */
-    if( stream->input.bufferEvent )
-        events[eventCount++] = stream->input.bufferEvent;
-    if( stream->output.bufferEvent )
-        events[eventCount++] = stream->output.bufferEvent;
-    events[eventCount++] = stream->abortEvent;
-
-    statusFlags = 0; /** @todo support paInputUnderflow, paOutputOverflow and paNeverDropInput */
-    
-    /* loop until something causes us to stop */
-    do{
-        /* wait for MME to signal that a buffer is available, or for
-            the PA abort event to be signaled.
-
-          When this indicates that one or more buffers are available
-          NoBuffersAreQueued() and Current*BuffersAreDone are used below to
-          poll for additional done buffers. NoBuffersAreQueued() will fail
-          to identify an underrun/overflow if the driver doesn't mark all done
-          buffers prior to signalling the event. Some drivers do this
-          (eg RME Digi96, and others don't eg VIA PC 97 input). This isn't a
-          huge problem, it just means that we won't always be able to detect
-          underflow/overflow.
-        */
-        waitResult = WaitForMultipleObjects( eventCount, events, FALSE /* wait all = FALSE */, timeout );
-        if( waitResult == WAIT_FAILED )
-        {
-            result = paUnanticipatedHostError;
-            /** @todo FIXME/REVIEW: can't return host error info from an asyncronous thread */
-            done = 1;
-        }
-        else if( waitResult == WAIT_TIMEOUT )
-        {
-            /* if a timeout is encountered, continue */
-        }
-
-        if( stream->abortProcessing )
-        {
-            /* Pa_AbortStream() has been called, stop processing immediately */
-            done = 1;
-        }
-        else if( stream->stopProcessing )
-        {
-            /* Pa_StopStream() has been called or the user callback returned
-                non-zero, processing will continue until all output buffers
-                are marked as done. The stream will stop immediately if it
-                is input-only.
-            */
-
-            if( PA_IS_OUTPUT_STREAM_(stream) )
-            {
-                if( NoBuffersAreQueued( &stream->output ) )
-                    done = 1; /* Will cause thread to return. */
-            }
-            else
-            {
-                /* input only stream */
-                done = 1; /* Will cause thread to return. */
-            }
-        }
-        else
-        {
-            hostBuffersAvailable = 1;
-
-            /* process all available host buffers */
-            do
-            {
-                hostInputBufferIndex = -1;
-                hostOutputBufferIndex = -1;
-                
-                if( PA_IS_INPUT_STREAM_(stream) )
-                {
-                    if( CurrentInputBuffersAreDone( stream ) )
-                    {
-                        if( NoBuffersAreQueued( &stream->input ) )
-                        {
-                            /** @todo
-                               if all of the other buffers are also ready then
-                               we discard all but the most recent. This is an
-                               input buffer overflow. FIXME: these buffers should
-                               be passed to the callback in a paNeverDropInput
-                               stream.
-
-                               note that it is also possible for an input overflow
-                               to happen while the callback is processing a buffer.
-                               that is handled further down.
-                            */
-                            result = CatchUpInputBuffers( stream );
-                            if( result != paNoError )
-                                done = 1;
-
-                            statusFlags |= paInputOverflow;
-                        }
-
-                        hostInputBufferIndex = stream->input.currentBufferIndex;
-                    }
-                }
-
-                if( PA_IS_OUTPUT_STREAM_(stream) )
-                {
-                    if( CurrentOutputBuffersAreDone( stream ) )
-                    {
-                        /* ok, we have an output buffer */
-                        
-                        if( NoBuffersAreQueued( &stream->output ) )
-                        {
-                            /*
-                            if all of the other buffers are also ready, catch up by copying
-                            the most recently generated buffer into all but one of the output
-                            buffers.
-
-                            note that this catch up code only handles the case where all
-                            buffers have been played out due to this thread not having
-                            woken up at all. a more common case occurs when this thread
-                            is woken up, processes one buffer, but takes too long, and as
-                            a result all the other buffers have become un-queued. that
-                            case is handled further down.
-                            */
-
-                            result = CatchUpOutputBuffers( stream );
-                            if( result != paNoError )
-                                done = 1;
-
-                            statusFlags |= paOutputUnderflow;
-                        }
-
-                        hostOutputBufferIndex = stream->output.currentBufferIndex;
-                    }
-                }
-
-               
-                if( (PA_IS_FULL_DUPLEX_STREAM_(stream) && hostInputBufferIndex != -1 && hostOutputBufferIndex != -1) ||
-                        (PA_IS_HALF_DUPLEX_STREAM_(stream) && ( hostInputBufferIndex != -1 || hostOutputBufferIndex != -1 ) ) )
-                {
-                    PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement inputBufferAdcTime */
-
-
-                    if( PA_IS_OUTPUT_STREAM_(stream) )
-                    {
-                        /* set timeInfo.currentTime and calculate timeInfo.outputBufferDacTime
-                            from the current wave out position */
-                        MMTIME mmtime;
-                        double timeBeforeGetPosition, timeAfterGetPosition;
-                        double time;
-                        long framesInBufferRing; 		
-                        long writePosition;
-                        long playbackPosition;
-                        HWAVEOUT firstWaveOutDevice = ((HWAVEOUT*)stream->output.waveHandles)[0];
-                        
-                        mmtime.wType = TIME_SAMPLES;
-                        timeBeforeGetPosition = PaUtil_GetTime();
-                        waveOutGetPosition( firstWaveOutDevice, &mmtime, sizeof(MMTIME) );
-                        timeAfterGetPosition = PaUtil_GetTime();
-
-                        timeInfo.currentTime = timeAfterGetPosition;
-
-                        /* approximate time at which wave out position was measured
-                            as half way between timeBeforeGetPosition and timeAfterGetPosition */
-                        time = timeBeforeGetPosition + (timeAfterGetPosition - timeBeforeGetPosition) * .5;
-                        
-                        framesInBufferRing = stream->output.bufferCount * stream->bufferProcessor.framesPerHostBuffer;
-                        playbackPosition = mmtime.u.sample % framesInBufferRing;
-
-                        writePosition = stream->output.currentBufferIndex * stream->bufferProcessor.framesPerHostBuffer
-                                + stream->output.framesUsedInCurrentBuffer;
-                       
-                        if( playbackPosition >= writePosition ){
-                            timeInfo.outputBufferDacTime =
-                                    time + ((double)( writePosition + (framesInBufferRing - playbackPosition) ) * stream->bufferProcessor.samplePeriod );
-                        }else{
-                            timeInfo.outputBufferDacTime =
-                                    time + ((double)( writePosition - playbackPosition ) * stream->bufferProcessor.samplePeriod );
-                        }
-                    }
-
-
-                    PaUtil_BeginCpuLoadMeasurement( &stream->cpuLoadMeasurer );
-
-                    PaUtil_BeginBufferProcessing( &stream->bufferProcessor, &timeInfo, statusFlags  );
-
-                    /* reset status flags once they have been passed to the buffer processor */
-                    statusFlags = 0;
-
-                    if( PA_IS_INPUT_STREAM_(stream) )
-                    {
-                        PaUtil_SetInputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
-
-                        channel = 0;
-                        for( i=0; i<stream->input.deviceCount; ++i )
-                        {
-                             /* we have stored the number of channels in the buffer in dwUser */
-                            int channelCount = (int)stream->input.waveHeaders[i][ hostInputBufferIndex ].dwUser;
-                            
-                            PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, channel,
-                                    stream->input.waveHeaders[i][ hostInputBufferIndex ].lpData +
-                                        stream->input.framesUsedInCurrentBuffer * channelCount *
-                                        stream->bufferProcessor.bytesPerHostInputSample,
-                                    channelCount );
-                                    
-
-                            channel += channelCount;
-                        }
-                    }
-
-                    if( PA_IS_OUTPUT_STREAM_(stream) )
-                    {
-                        PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
-                        
-                        channel = 0;
-                        for( i=0; i<stream->output.deviceCount; ++i )
-                        {
-                            /* we have stored the number of channels in the buffer in dwUser */
-                            int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
-
-                            PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
-                                    stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
-                                        stream->output.framesUsedInCurrentBuffer * channelCount *
-                                        stream->bufferProcessor.bytesPerHostOutputSample,
-                                    channelCount );
-
-                            channel += channelCount;
-                        }
-                    }
-
-                    callbackResult = paContinue;
-                    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-
-                    stream->input.framesUsedInCurrentBuffer += framesProcessed;
-                    stream->output.framesUsedInCurrentBuffer += framesProcessed;
-
-                    PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
-
-                    if( callbackResult == paContinue )
-                    {
-                        /* nothing special to do */
-                    }
-                    else if( callbackResult == paAbort )
-                    {
-                        stream->abortProcessing = 1;
-                        done = 1;
-                        /** @todo FIXME: should probably reset the output device immediately once the callback returns paAbort */
-                        result = paNoError;
-                    }
-                    else
-                    {
-                        /* User callback has asked us to stop with paComplete or other non-zero value */
-                        stream->stopProcessing = 1; /* stop once currently queued audio has finished */
-                        result = paNoError;
-                    }
-
-
-                    if( PA_IS_INPUT_STREAM_(stream)
-                            && stream->stopProcessing == 0 && stream->abortProcessing == 0
-                            && stream->input.framesUsedInCurrentBuffer == stream->input.framesPerBuffer )
-                    {
-                        if( NoBuffersAreQueued( &stream->input ) )
-                        {
-                            /** @todo need to handle PaNeverDropInput here where necessary */
-                            result = CatchUpInputBuffers( stream );
-                            if( result != paNoError )
-                                done = 1;
-
-                            statusFlags |= paInputOverflow;
-                        }
-
-                        result = AdvanceToNextInputBuffer( stream );
-                        if( result != paNoError )
-                            done = 1;
-                    }
-
-                    
-                    if( PA_IS_OUTPUT_STREAM_(stream) && !stream->abortProcessing )
-                    {
-                        if( stream->stopProcessing &&
-                                stream->output.framesUsedInCurrentBuffer < stream->output.framesPerBuffer )
-                        {
-                            /* zero remaining samples in output output buffer and flush */
-
-                            stream->output.framesUsedInCurrentBuffer += PaUtil_ZeroOutput( &stream->bufferProcessor,
-                                    stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
-
-                            /* we send the entire buffer to the output devices, but we could
-                                just send a partial buffer, rather than zeroing the unused
-                                samples.
-                            */
-                        }
-
-                        if( stream->output.framesUsedInCurrentBuffer == stream->output.framesPerBuffer )
-                        {
-                            /* check for underflow before enquing the just-generated buffer,
-                                but recover from underflow after enquing it. This ensures
-                                that the most recent audio segment is repeated */
-                            int outputUnderflow = NoBuffersAreQueued( &stream->output );
-
-                            result = AdvanceToNextOutputBuffer( stream );
-                            if( result != paNoError )
-                                done = 1;
-
-                            if( outputUnderflow && !done && !stream->stopProcessing )
-                            {
-                                /* Recover from underflow in the case where the
-                                    underflow occured while processing the buffer
-                                    we just finished */
-
-                                result = CatchUpOutputBuffers( stream );
-                                if( result != paNoError )
-                                    done = 1;
-
-                                statusFlags |= paOutputUnderflow;
-                            }
-                        }
-                    }
-                    
-                    if( stream->throttleProcessingThreadOnOverload != 0 )
-                    {
-                        if( stream->stopProcessing || stream->abortProcessing )
-                        {
-                            if( stream->processingThreadPriority != stream->highThreadPriority )
-                            {
-                                SetThreadPriority( stream->processingThread, stream->highThreadPriority );
-                                stream->processingThreadPriority = stream->highThreadPriority;
-                            }
-                        }
-                        else if( PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer ) > 1. )
-                        {
-                            if( stream->processingThreadPriority != stream->throttledThreadPriority )
-                            {
-                                SetThreadPriority( stream->processingThread, stream->throttledThreadPriority );
-                                stream->processingThreadPriority = stream->throttledThreadPriority;
-                            }
-
-                            /* sleep to give other processes a go */
-                            Sleep( stream->throttledSleepMsecs );
-                        }
-                        else
-                        {
-                            if( stream->processingThreadPriority != stream->highThreadPriority )
-                            {
-                                SetThreadPriority( stream->processingThread, stream->highThreadPriority );
-                                stream->processingThreadPriority = stream->highThreadPriority;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    hostBuffersAvailable = 0;
-                }
-            }
-            while( hostBuffersAvailable &&
-                    stream->stopProcessing == 0 &&
-                    stream->abortProcessing == 0 &&
-                    !done );
-        }
-    }
-    while( !done );
-
-    stream->isActive = 0;
-
-    if( stream->streamRepresentation.streamFinishedCallback != 0 )
-        stream->streamRepresentation.streamFinishedCallback( stream->streamRepresentation.userData );
-
-    PaUtil_ResetCpuLoadMeasurer( &stream->cpuLoadMeasurer );
-    
-    return result;
-}
-
-
-/*
-    When CloseStream() is called, the multi-api layer ensures that
-    the stream has already been stopped or aborted.
-*/
-static PaError CloseStream( PaStream* s )
-{
-    PaError result;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-
-    result = CloseHandleWithPaError( stream->abortEvent );
-    if( result != paNoError ) goto error;
-    
-    TerminateWaveHeaders( &stream->output, 0 /* not isInput */ );
-    TerminateWaveHeaders( &stream->input, 1 /* isInput */ );
-
-    TerminateWaveHandles( &stream->output, 0 /* not isInput */, 0 /* not currentlyProcessingAnError */ );
-    TerminateWaveHandles( &stream->input, 1 /* isInput */, 0 /* not currentlyProcessingAnError */ );
-    
-    PaUtil_TerminateBufferProcessor( &stream->bufferProcessor );
-    PaUtil_TerminateStreamRepresentation( &stream->streamRepresentation );
-    PaUtil_FreeMemory( stream );
-
-error:
-    /** @todo REVIEW: what is the best way to clean up a stream if an error is detected? */
-    return result;
-}
-
-
-static PaError StartStream( PaStream *s )
-{
-    PaError result;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    MMRESULT mmresult;
-    unsigned int i, j;
-    int callbackResult;
-	unsigned int channel;
- 	unsigned long framesProcessed;
-	PaStreamCallbackTimeInfo timeInfo = {0,0,0}; /** @todo implement this for stream priming */
-    
-    PaUtil_ResetBufferProcessor( &stream->bufferProcessor );
-    
-    if( PA_IS_INPUT_STREAM_(stream) )
-    {
-        for( i=0; i<stream->input.bufferCount; ++i )
-        {
-            for( j=0; j<stream->input.deviceCount; ++j )
-            {
-                stream->input.waveHeaders[j][i].dwFlags &= ~WHDR_DONE;
-                mmresult = waveInAddBuffer( ((HWAVEIN*)stream->input.waveHandles)[j], &stream->input.waveHeaders[j][i], sizeof(WAVEHDR) );
-                if( mmresult != MMSYSERR_NOERROR )
-                {
-                    result = paUnanticipatedHostError;
-                    PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                    goto error;
-                }
-            }
-        }
-        stream->input.currentBufferIndex = 0;
-        stream->input.framesUsedInCurrentBuffer = 0;
-    }
-
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-    {
-        for( i=0; i<stream->output.deviceCount; ++i )
-        {
-            if( (mmresult = waveOutPause( ((HWAVEOUT*)stream->output.waveHandles)[i] )) != MMSYSERR_NOERROR )
-            {
-                result = paUnanticipatedHostError;
-                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                goto error;
-            }
-        }
-
-        for( i=0; i<stream->output.bufferCount; ++i )
-        {
-            if( stream->primeStreamUsingCallback )
-            {
-
-                stream->output.framesUsedInCurrentBuffer = 0;
-                do{
-
-                    PaUtil_BeginBufferProcessing( &stream->bufferProcessor,
-                            &timeInfo,
-                            paPrimingOutput | ((stream->input.bufferCount > 0 ) ? paInputUnderflow : 0));
-
-                    if( stream->input.bufferCount > 0 )
-                        PaUtil_SetNoInput( &stream->bufferProcessor );
-
-                    PaUtil_SetOutputFrameCount( &stream->bufferProcessor, 0 /* default to host buffer size */ );
-
-                    channel = 0;
-                    for( j=0; j<stream->output.deviceCount; ++j )
-                    {
-                        /* we have stored the number of channels in the buffer in dwUser */
-                        int channelCount = (int)stream->output.waveHeaders[j][i].dwUser;
-
-                        PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
-                                stream->output.waveHeaders[j][i].lpData +
-                                stream->output.framesUsedInCurrentBuffer * channelCount *
-                                stream->bufferProcessor.bytesPerHostOutputSample,
-                                channelCount );
-
-                        /* we have stored the number of channels in the buffer in dwUser */
-                        channel += channelCount;
-                    }
-
-                    callbackResult = paContinue;
-                    framesProcessed = PaUtil_EndBufferProcessing( &stream->bufferProcessor, &callbackResult );
-                    stream->output.framesUsedInCurrentBuffer += framesProcessed;
-
-                    if( callbackResult != paContinue )
-                    {
-                        /** @todo fix this, what do we do if callback result is non-zero during stream
-                            priming?
-
-                            for complete: play out primed waveHeaders as usual
-                            for abort: clean up immediately.
-                       */
-                    }
-
-                }while( stream->output.framesUsedInCurrentBuffer != stream->output.framesPerBuffer );
-
-            }
-            else
-            {
-                for( j=0; j<stream->output.deviceCount; ++j )
-                {
-                    ZeroMemory( stream->output.waveHeaders[j][i].lpData, stream->output.waveHeaders[j][i].dwBufferLength );
-                }
-            }   
-
-            /* we queue all channels of a single buffer frame (accross all
-                devices, because some multidevice multichannel drivers work
-                better this way */
-            for( j=0; j<stream->output.deviceCount; ++j )
-            {
-                mmresult = waveOutWrite( ((HWAVEOUT*)stream->output.waveHandles)[j], &stream->output.waveHeaders[j][i], sizeof(WAVEHDR) );
-                if( mmresult != MMSYSERR_NOERROR )
-                {
-                    result = paUnanticipatedHostError;
-                    PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                    goto error;
-                }
-            }
-        }
-        stream->output.currentBufferIndex = 0;
-        stream->output.framesUsedInCurrentBuffer = 0;
-    }
-
-
-    stream->isStopped = 0;
-    stream->isActive = 1;
-    stream->stopProcessing = 0;
-    stream->abortProcessing = 0;
-
-    result = ResetEventWithPaError( stream->input.bufferEvent );
-    if( result != paNoError ) goto error;
-
-    result = ResetEventWithPaError( stream->output.bufferEvent );
-    if( result != paNoError ) goto error;
-    
-    
-    if( stream->streamRepresentation.streamCallback )
-    {
-        /* callback stream */
-
-        result = ResetEventWithPaError( stream->abortEvent );
-        if( result != paNoError ) goto error;
-
-        /* Create thread that waits for audio buffers to be ready for processing. */
-        stream->processingThread = CreateThread( 0, 0, ProcessingThreadProc, stream, 0, &stream->processingThreadId );
-        if( !stream->processingThread )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
-            goto error;
-        }
-
-        /** @todo could have mme specific stream parameters to allow the user
-            to set the callback thread priorities */
-        stream->highThreadPriority = THREAD_PRIORITY_TIME_CRITICAL;
-        stream->throttledThreadPriority = THREAD_PRIORITY_NORMAL;
-
-        if( !SetThreadPriority( stream->processingThread, stream->highThreadPriority ) )
-        {
-            result = paUnanticipatedHostError;
-            PA_MME_SET_LAST_SYSTEM_ERROR( GetLastError() );
-            goto error;
-        }
-        stream->processingThreadPriority = stream->highThreadPriority;
-    }
-    else
-    {
-        /* blocking read/write stream */
-
-    }
-
-    if( PA_IS_INPUT_STREAM_(stream) )
-    {
-        for( i=0; i < stream->input.deviceCount; ++i )
-        {
-            mmresult = waveInStart( ((HWAVEIN*)stream->input.waveHandles)[i] );
-            PA_DEBUG(("Pa_StartStream: waveInStart returned = 0x%X.\n", mmresult));
-            if( mmresult != MMSYSERR_NOERROR )
-            {
-                result = paUnanticipatedHostError;
-                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                goto error;
-            }
-        }
-    }
-
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-    {
-        for( i=0; i < stream->output.deviceCount; ++i )
-        {
-            if( (mmresult = waveOutRestart( ((HWAVEOUT*)stream->output.waveHandles)[i] )) != MMSYSERR_NOERROR )
-            {
-                result = paUnanticipatedHostError;
-                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                goto error;
-            }
-        }
-    }
-
-    return result;
-
-error:
-    /** @todo FIXME: implement recovery as best we can
-    This should involve rolling back to a state as-if this function had never been called
-    */
-    return result;
-}
-
-
-static PaError StopStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    int timeout;
-    DWORD waitResult;
-    MMRESULT mmresult;
-    signed int hostOutputBufferIndex;
-    unsigned int channel, waitCount, i;                  
-    
-    /** @todo
-        REVIEW: the error checking in this function needs review. the basic
-        idea is to return from this function in a known state - for example
-        there is no point avoiding calling waveInReset just because
-        the thread times out.
-    */
-
-    if( stream->processingThread )
-    {
-        /* callback stream */
-
-        /* Tell processing thread to stop generating more data and to let current data play out. */
-        stream->stopProcessing = 1;
-
-        /* Calculate timeOut longer than longest time it could take to return all buffers. */
-        timeout = (int)(stream->allBuffersDurationMs * 1.5);
-        if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
-            timeout = PA_MME_MIN_TIMEOUT_MSEC_;
-
-        PA_DEBUG(("WinMME StopStream: waiting for background thread.\n"));
-
-        waitResult = WaitForSingleObject( stream->processingThread, timeout );
-        if( waitResult == WAIT_TIMEOUT )
-        {
-            /* try to abort */
-            stream->abortProcessing = 1;
-            SetEvent( stream->abortEvent );
-            waitResult = WaitForSingleObject( stream->processingThread, timeout );
-            if( waitResult == WAIT_TIMEOUT )
-            {
-                PA_DEBUG(("WinMME StopStream: timed out while waiting for background thread to finish.\n"));
-                result = paTimedOut;
-            }
-        }
-
-        CloseHandle( stream->processingThread );
-        stream->processingThread = NULL;
-    }
-    else
-    {
-        /* blocking read / write stream */
-
-        if( PA_IS_OUTPUT_STREAM_(stream) )
-        {
-            if( stream->output.framesUsedInCurrentBuffer > 0 )
-            {
-                /* there are still unqueued frames in the current buffer, so flush them */
-
-                hostOutputBufferIndex = stream->output.currentBufferIndex;
-
-                PaUtil_SetOutputFrameCount( &stream->bufferProcessor,
-                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
-                
-                channel = 0;
-                for( i=0; i<stream->output.deviceCount; ++i )
-                {
-                    /* we have stored the number of channels in the buffer in dwUser */
-                    int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
-
-                    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
-                            stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
-                                stream->output.framesUsedInCurrentBuffer * channelCount *
-                                stream->bufferProcessor.bytesPerHostOutputSample,
-                            channelCount );
-
-                    channel += channelCount;
-                }
-
-                PaUtil_ZeroOutput( &stream->bufferProcessor,
-                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
-
-                /* we send the entire buffer to the output devices, but we could
-                    just send a partial buffer, rather than zeroing the unused
-                    samples.
-                */
-                AdvanceToNextOutputBuffer( stream );
-            }
-            
-
-            timeout = (stream->allBuffersDurationMs / stream->output.bufferCount) + 1;
-            if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
-                timeout = PA_MME_MIN_TIMEOUT_MSEC_;
-
-            waitCount = 0;
-            while( !NoBuffersAreQueued( &stream->output ) && waitCount <= stream->output.bufferCount )
-            {
-                /* wait for MME to signal that a buffer is available */
-                waitResult = WaitForSingleObject( stream->output.bufferEvent, timeout );
-                if( waitResult == WAIT_FAILED )
-                {
-                    break;
-                }
-                else if( waitResult == WAIT_TIMEOUT )
-                {
-                    /* keep waiting */
-                }
-
-                ++waitCount;
-            }
-        }
-    }
-
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-    {
-        for( i =0; i < stream->output.deviceCount; ++i )
-        {
-            mmresult = waveOutReset( ((HWAVEOUT*)stream->output.waveHandles)[i] );
-            if( mmresult != MMSYSERR_NOERROR )
-            {
-                result = paUnanticipatedHostError;
-                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-            }
-        }
-    }
-
-    if( PA_IS_INPUT_STREAM_(stream) )
-    {
-        for( i=0; i < stream->input.deviceCount; ++i )
-        {
-            mmresult = waveInReset( ((HWAVEIN*)stream->input.waveHandles)[i] );
-            if( mmresult != MMSYSERR_NOERROR )
-            {
-                result = paUnanticipatedHostError;
-                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-            }
-        }
-    }
-
-    stream->isStopped = 1;
-    stream->isActive = 0;
-
-    return result;
-}
-
-
-static PaError AbortStream( PaStream *s )
-{
-    PaError result = paNoError;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    int timeout;
-    DWORD waitResult;
-    MMRESULT mmresult;
-    unsigned int i;
-    
-    /** @todo
-        REVIEW: the error checking in this function needs review. the basic
-        idea is to return from this function in a known state - for example
-        there is no point avoiding calling waveInReset just because
-        the thread times out.
-    */
-
-    if( stream->processingThread )
-    {
-        /* callback stream */
-        
-        /* Tell processing thread to abort immediately */
-        stream->abortProcessing = 1;
-        SetEvent( stream->abortEvent );
-    }
-
-
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-    {
-        for( i =0; i < stream->output.deviceCount; ++i )
-        {
-            mmresult = waveOutReset( ((HWAVEOUT*)stream->output.waveHandles)[i] );
-            if( mmresult != MMSYSERR_NOERROR )
-            {
-                PA_MME_SET_LAST_WAVEOUT_ERROR( mmresult );
-                return paUnanticipatedHostError;
-            }
-        }
-    }
-
-    if( PA_IS_INPUT_STREAM_(stream) )
-    {
-        for( i=0; i < stream->input.deviceCount; ++i )
-        {
-            mmresult = waveInReset( ((HWAVEIN*)stream->input.waveHandles)[i] );
-            if( mmresult != MMSYSERR_NOERROR )
-            {
-                PA_MME_SET_LAST_WAVEIN_ERROR( mmresult );
-                return paUnanticipatedHostError;
-            }
-        }
-    }
-
-
-    if( stream->processingThread )
-    {
-        /* callback stream */
-        
-        PA_DEBUG(("WinMME AbortStream: waiting for background thread.\n"));
-
-        /* Calculate timeOut longer than longest time it could take to return all buffers. */
-        timeout = (int)(stream->allBuffersDurationMs * 1.5);
-        if( timeout < PA_MME_MIN_TIMEOUT_MSEC_ )
-            timeout = PA_MME_MIN_TIMEOUT_MSEC_;
-            
-        waitResult = WaitForSingleObject( stream->processingThread, timeout );
-        if( waitResult == WAIT_TIMEOUT )
-        {
-            PA_DEBUG(("WinMME AbortStream: timed out while waiting for background thread to finish.\n"));
-            return paTimedOut;
-        }
-
-        CloseHandle( stream->processingThread );
-        stream->processingThread = NULL;
-    }
-
-    stream->isStopped = 1;
-    stream->isActive = 0;
-
-    return result;
-}
-
-
-static PaError IsStreamStopped( PaStream *s )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-
-    return stream->isStopped;
-}
-
-
-static PaError IsStreamActive( PaStream *s )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-
-    return stream->isActive;
-}
-
-
-static PaTime GetStreamTime( PaStream *s )
-{
-    (void) s; /* unused parameter */
-    
-    return PaUtil_GetTime();
-}
-
-
-static double GetStreamCpuLoad( PaStream* s )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-
-    return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
-}
-
-
-/*
-    As separate stream interfaces are used for blocking and callback
-    streams, the following functions can be guaranteed to only be called
-    for blocking streams.
-*/
-
-static PaError ReadStream( PaStream* s,
-                           void *buffer,
-                           unsigned long frames )
-{
-    PaError result = paNoError;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    void *userBuffer;
-    unsigned long framesRead = 0;
-    unsigned long framesProcessed;
-    signed int hostInputBufferIndex;
-    DWORD waitResult;
-    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
-    unsigned int channel, i;
-    
-    if( PA_IS_INPUT_STREAM_(stream) )
-    {
-        /* make a local copy of the user buffer pointer(s). this is necessary
-            because PaUtil_CopyInput() advances these pointers every time
-            it is called.
-        */
-        if( stream->bufferProcessor.userInputIsInterleaved )
-        {
-            userBuffer = buffer;
-        }
-        else
-        {
-            userBuffer = alloca( sizeof(void*) * stream->bufferProcessor.inputChannelCount );
-            if( !userBuffer )
-                return paInsufficientMemory;
-            for( i = 0; i<stream->bufferProcessor.inputChannelCount; ++i )
-                ((void**)userBuffer)[i] = ((void**)buffer)[i];
-        }
-        
-        do{
-            if( CurrentInputBuffersAreDone( stream ) )
-            {
-                if( NoBuffersAreQueued( &stream->input ) )
-                {
-                    /** @todo REVIEW: consider what to do if the input overflows.
-                        do we requeue all of the buffers? should we be running
-                        a thread to make sure they are always queued? */
-
-                    result = paInputOverflowed;
-                }
-
-                hostInputBufferIndex = stream->input.currentBufferIndex;
-
-                PaUtil_SetInputFrameCount( &stream->bufferProcessor,
-                        stream->input.framesPerBuffer - stream->input.framesUsedInCurrentBuffer );
-                
-                channel = 0;
-                for( i=0; i<stream->input.deviceCount; ++i )
-                {
-                    /* we have stored the number of channels in the buffer in dwUser */
-                    int channelCount = (int)stream->input.waveHeaders[i][ hostInputBufferIndex ].dwUser;
-
-                    PaUtil_SetInterleavedInputChannels( &stream->bufferProcessor, channel,
-                            stream->input.waveHeaders[i][ hostInputBufferIndex ].lpData +
-                                stream->input.framesUsedInCurrentBuffer * channelCount *
-                                stream->bufferProcessor.bytesPerHostInputSample,
-                            channelCount );
-
-                    channel += channelCount;
-                }
-                
-                framesProcessed = PaUtil_CopyInput( &stream->bufferProcessor, &userBuffer, frames - framesRead );
-
-                stream->input.framesUsedInCurrentBuffer += framesProcessed;
-                if( stream->input.framesUsedInCurrentBuffer == stream->input.framesPerBuffer )
-                {
-                    result = AdvanceToNextInputBuffer( stream );
-                    if( result != paNoError )
-                        break;
-                }
-
-                framesRead += framesProcessed;      
-
-            }else{
-                /* wait for MME to signal that a buffer is available */
-                waitResult = WaitForSingleObject( stream->input.bufferEvent, timeout );
-                if( waitResult == WAIT_FAILED )
-                {
-                    result = paUnanticipatedHostError;
-                    break;
-                }
-                else if( waitResult == WAIT_TIMEOUT )
-                {
-                    /* if a timeout is encountered, continue,
-                        perhaps we should give up eventually
-                    */
-                }         
-            }
-        }while( framesRead < frames );
-    }
-    else
-    {
-        result = paCanNotReadFromAnOutputOnlyStream;
-    }
-
-    return result;
-}
-
-
-static PaError WriteStream( PaStream* s,
-                            const void *buffer,
-                            unsigned long frames )
-{
-    PaError result = paNoError;
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    const void *userBuffer;
-    unsigned long framesWritten = 0;
-    unsigned long framesProcessed;
-    signed int hostOutputBufferIndex;
-    DWORD waitResult;
-    DWORD timeout = (unsigned long)(stream->allBuffersDurationMs * 0.5);
-    unsigned int channel, i;
-
-        
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-    {
-        /* make a local copy of the user buffer pointer(s). this is necessary
-            because PaUtil_CopyOutput() advances these pointers every time
-            it is called.
-        */
-        if( stream->bufferProcessor.userOutputIsInterleaved )
-        {
-            userBuffer = buffer;
-        }
-        else
-        {
-            userBuffer = alloca( sizeof(void*) * stream->bufferProcessor.outputChannelCount );
-            if( !userBuffer )
-                return paInsufficientMemory;
-            for( i = 0; i<stream->bufferProcessor.outputChannelCount; ++i )
-                ((const void**)userBuffer)[i] = ((const void**)buffer)[i];
-        }
-
-        do{
-            if( CurrentOutputBuffersAreDone( stream ) )
-            {
-                if( NoBuffersAreQueued( &stream->output ) )
-                {
-                    /** @todo REVIEW: consider what to do if the output
-                    underflows. do we requeue all the existing buffers with
-                    zeros? should we run a separate thread to keep the buffers
-                    enqueued at all times? */
-
-                    result = paOutputUnderflowed;
-                }
-
-                hostOutputBufferIndex = stream->output.currentBufferIndex;
-
-                PaUtil_SetOutputFrameCount( &stream->bufferProcessor,
-                        stream->output.framesPerBuffer - stream->output.framesUsedInCurrentBuffer );
-                
-                channel = 0;
-                for( i=0; i<stream->output.deviceCount; ++i )
-                {
-                    /* we have stored the number of channels in the buffer in dwUser */
-                    int channelCount = (int)stream->output.waveHeaders[i][ hostOutputBufferIndex ].dwUser;
-
-                    PaUtil_SetInterleavedOutputChannels( &stream->bufferProcessor, channel,
-                            stream->output.waveHeaders[i][ hostOutputBufferIndex ].lpData +
-                                stream->output.framesUsedInCurrentBuffer * channelCount *
-                                stream->bufferProcessor.bytesPerHostOutputSample,
-                            channelCount );
-
-                    channel += channelCount;
-                }
-                
-                framesProcessed = PaUtil_CopyOutput( &stream->bufferProcessor, &userBuffer, frames - framesWritten );
-
-                stream->output.framesUsedInCurrentBuffer += framesProcessed;
-                if( stream->output.framesUsedInCurrentBuffer == stream->output.framesPerBuffer )
-                {
-                    result = AdvanceToNextOutputBuffer( stream );
-                    if( result != paNoError )
-                        break;
-                }
-
-                framesWritten += framesProcessed;
-            }
-            else
-            {
-                /* wait for MME to signal that a buffer is available */
-                waitResult = WaitForSingleObject( stream->output.bufferEvent, timeout );
-                if( waitResult == WAIT_FAILED )
-                {
-                    result = paUnanticipatedHostError;
-                    break;
-                }
-                else if( waitResult == WAIT_TIMEOUT )
-                {
-                    /* if a timeout is encountered, continue,
-                        perhaps we should give up eventually
-                    */
-                }             
-            }        
-        }while( framesWritten < frames );
-    }
-    else
-    {
-        result = paCanNotWriteToAnInputOnlyStream;
-    }
-    
-    return result;
-}
-
-
-static signed long GetStreamReadAvailable( PaStream* s )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    
-    if( PA_IS_INPUT_STREAM_(stream) )
-        return GetAvailableFrames( &stream->input );
-    else
-        return paCanNotReadFromAnOutputOnlyStream;
-}
-
-
-static signed long GetStreamWriteAvailable( PaStream* s )
-{
-    PaWinMmeStream *stream = (PaWinMmeStream*)s;
-    
-    if( PA_IS_OUTPUT_STREAM_(stream) )
-        return GetAvailableFrames( &stream->output );
-    else
-        return paCanNotWriteToAnInputOnlyStream;
-}
-
-
-/* NOTE: the following functions are MME-stream specific, and are called directly
-    by client code. We need to check for many more error conditions here because
-    we don't have the benefit of pa_front.c's parameter checking.
-*/
-
-static PaError GetWinMMEStreamPointer( PaWinMmeStream **stream, PaStream *s )
-{
-    PaError result;
-    PaUtilHostApiRepresentation *hostApi;
-    PaWinMmeHostApiRepresentation *winMmeHostApi;
-    
-    result = PaUtil_ValidateStreamPointer( s );
-    if( result != paNoError )
-        return result;
-
-    result = PaUtil_GetHostApiRepresentation( &hostApi, paMME );
-    if( result != paNoError )
-        return result;
-
-    winMmeHostApi = (PaWinMmeHostApiRepresentation*)hostApi;
-    
-    /* note, the following would be easier if there was a generic way of testing
-        that a stream belongs to a specific host API */
-    
-    if( PA_STREAM_REP( s )->streamInterface == &winMmeHostApi->callbackStreamInterface
-            || PA_STREAM_REP( s )->streamInterface == &winMmeHostApi->blockingStreamInterface )
-    {
-        /* s is a WinMME stream */
-        *stream = (PaWinMmeStream *)s;
-        return paNoError;
-    }
-    else
-    {
-        return paIncompatibleStreamHostApi;
-    }
-}
-
-
-int PaWinMME_GetStreamInputHandleCount( PaStream* s )
-{
-    PaWinMmeStream *stream;
-    PaError result = GetWinMMEStreamPointer( &stream, s );
-
-    if( result == paNoError )
-        return (PA_IS_INPUT_STREAM_(stream)) ? stream->input.deviceCount : 0;
-    else
-        return result;
-}
-
-
-HWAVEIN PaWinMME_GetStreamInputHandle( PaStream* s, int handleIndex )
-{
-    PaWinMmeStream *stream;
-    PaError result = GetWinMMEStreamPointer( &stream, s );
-
-    if( result == paNoError
-            && PA_IS_INPUT_STREAM_(stream)
-            && handleIndex >= 0
-            && (unsigned int)handleIndex < stream->input.deviceCount )
-        return ((HWAVEIN*)stream->input.waveHandles)[handleIndex];
-    else
-        return 0;
-}
-
-
-int PaWinMME_GetStreamOutputHandleCount( PaStream* s)
-{
-    PaWinMmeStream *stream;
-    PaError result = GetWinMMEStreamPointer( &stream, s );
-
-    if( result == paNoError )
-        return (PA_IS_OUTPUT_STREAM_(stream)) ? stream->output.deviceCount : 0;
-    else
-        return result;
-}
-
-
-HWAVEOUT PaWinMME_GetStreamOutputHandle( PaStream* s, int handleIndex )
-{
-    PaWinMmeStream *stream;
-    PaError result = GetWinMMEStreamPointer( &stream, s );
-
-    if( result == paNoError
-            && PA_IS_OUTPUT_STREAM_(stream)
-            && handleIndex >= 0
-            && (unsigned int)handleIndex < stream->output.deviceCount )
-        return ((HWAVEOUT*)stream->output.waveHandles)[handleIndex];
-    else
-        return 0;
-}
-
-
-
-
-
diff --git a/libs/portaudio/src/os/mac_osx/pa_mac_hostapis.c b/libs/portaudio/src/os/mac_osx/pa_mac_hostapis.c
deleted file mode 100644
index eee36bfaf4..0000000000
--- a/libs/portaudio/src/os/mac_osx/pa_mac_hostapis.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id: pa_mac_hostapis.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library Macintosh initialization table
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup macosx_src
-Mac OS host API initialization function table.
-*/
-
-
-#include "pa_hostapi.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-    
-    PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    PaError PaMacSm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    PaError PaMacAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-    
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-PaUtilHostApiInitializer *paHostApiInitializers[] =
-{
-#ifdef PA_USE_COREAUDIO
-    PaMacCore_Initialize,
-#endif
-    
-#ifdef PA_USE_SM
-    PaMacSm_Initialize,
-#endif
-    
-#ifdef PA_USE_JACK
-    PaJack_Initialize,
-#endif
-
-#ifdef PA_USE_ASIO
-    PaMacAsio_Initialize,
-#endif
-    
-    PaSkeleton_Initialize, /* just for testing */
-    
-    0   /* NULL terminated array */
-};
-
-
-int paDefaultHostApiIndex = 0;
diff --git a/libs/portaudio/src/os/unix/pa_unix_hostapis.c b/libs/portaudio/src/os/unix/pa_unix_hostapis.c
deleted file mode 100644
index d695e1b193..0000000000
--- a/libs/portaudio/src/os/unix/pa_unix_hostapis.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * $Id: pa_unix_hostapis.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library UNIX initialization table
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup unix_src
-*/
-
-#include "pa_hostapi.h"
-
-PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaAlsa_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-/* Added for IRIX, Pieter, oct 2, 2003: */
-PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-/* Linux AudioScience HPI */
-PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-
-PaUtilHostApiInitializer *paHostApiInitializers[] =
-    {
-#ifdef PA_USE_OSS
-        PaOSS_Initialize,
-#endif
-
-#ifdef PA_USE_ALSA
-        PaAlsa_Initialize,
-#endif
-
-#ifdef PA_USE_JACK
-        PaJack_Initialize,
-#endif
-                    /* Added for IRIX, Pieter, oct 2, 2003: */
-#ifdef PA_USE_SGI 
-        PaSGI_Initialize,
-#endif
-
-#ifdef PA_USE_ASIHPI
-        PaAsiHpi_Initialize,
-#endif
-        0   /* NULL terminated array */
-    };
-
-int paDefaultHostApiIndex = 0;
diff --git a/libs/portaudio/src/os/unix/pa_unix_util.c b/libs/portaudio/src/os/unix/pa_unix_util.c
deleted file mode 100644
index 1cb838752c..0000000000
--- a/libs/portaudio/src/os/unix/pa_unix_util.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * $Id: pa_unix_util.c 1232 2007-06-16 14:49:43Z rossb $
- * Portable Audio I/O Library
- * UNIX platform-specific support functions
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2000 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup unix_src
-*/
- 
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <string.h> /* For memset */
-#include <math.h>
-#include <errno.h>
-
-#include "pa_util.h"
-#include "pa_unix_util.h"
-#include "pa_debugprint.h"
-
-/*
-   Track memory allocations to avoid leaks.
- */
-
-#if PA_TRACK_MEMORY
-static int numAllocations_ = 0;
-#endif
-
-
-void *PaUtil_AllocateMemory( long size )
-{
-    void *result = malloc( size );
-
-#if PA_TRACK_MEMORY
-    if( result != NULL ) numAllocations_ += 1;
-#endif
-    return result;
-}
-
-
-void PaUtil_FreeMemory( void *block )
-{
-    if( block != NULL )
-    {
-        free( block );
-#if PA_TRACK_MEMORY
-        numAllocations_ -= 1;
-#endif
-
-    }
-}
-
-
-int PaUtil_CountCurrentlyAllocatedBlocks( void )
-{
-#if PA_TRACK_MEMORY
-    return numAllocations_;
-#else
-    return 0;
-#endif
-}
-
-
-void Pa_Sleep( long msec )
-{
-#ifdef HAVE_NANOSLEEP
-    struct timespec req = {0}, rem = {0};
-    PaTime time = msec / 1.e3;
-    req.tv_sec = (time_t)time;
-    assert(time - req.tv_sec < 1.0);
-    req.tv_nsec = (long)((time - req.tv_sec) * 1.e9);
-    nanosleep(&req, &rem);
-    /* XXX: Try sleeping the remaining time (contained in rem) if interrupted by a signal? */
-#else
-    while( msec > 999 )     /* For OpenBSD and IRIX, argument */
-        {                   /* to usleep must be < 1000000.   */
-        usleep( 999000 );
-        msec -= 999;
-        }
-    usleep( msec * 1000 );
-#endif
-}
-
-/*            *** NOT USED YET: ***
-static int usePerformanceCounter_;
-static double microsecondsPerTick_;
-*/
-
-void PaUtil_InitializeClock( void )
-{
-    /* TODO */
-}
-
-
-PaTime PaUtil_GetTime( void )
-{
-#ifdef HAVE_CLOCK_GETTIME
-    struct timespec tp;
-    clock_gettime(CLOCK_REALTIME, &tp);
-    return (PaTime)(tp.tv_sec + tp.tv_nsec / 1.e9);
-#else
-    struct timeval tv;
-    gettimeofday( &tv, NULL );
-    return (PaTime) tv.tv_usec / 1000000. + tv.tv_sec;
-#endif
-}
-
-PaError PaUtil_InitializeThreading( PaUtilThreading *threading )
-{
-    (void) paUtilErr_;
-    return paNoError;
-}
-
-void PaUtil_TerminateThreading( PaUtilThreading *threading )
-{
-}
-
-PaError PaUtil_StartThreading( PaUtilThreading *threading, void *(*threadRoutine)(void *), void *data )
-{
-    pthread_create( &threading->callbackThread, NULL, threadRoutine, data );
-    return paNoError;
-}
-
-PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *exitResult )
-{
-    PaError result = paNoError;
-    void *pret;
-
-    if( exitResult )
-        *exitResult = paNoError;
-
-    /* Only kill the thread if it isn't in the process of stopping (flushing adaptation buffers) */
-    if( !wait )
-        pthread_cancel( threading->callbackThread );   /* XXX: Safe to call this if the thread has exited on its own? */
-    pthread_join( threading->callbackThread, &pret );
-
-#ifdef PTHREAD_CANCELED
-    if( pret && PTHREAD_CANCELED != pret )
-#else
-    /* !wait means the thread may have been canceled */
-    if( pret && wait )
-#endif
-    {
-        if( exitResult )
-            *exitResult = *(PaError *) pret;
-        free( pret );
-    }
-
-    return result;
-}
-
-/* Threading */
-/* paUnixMainThread 
- * We have to be a bit careful with defining this global variable,
- * as explained below. */
-#ifdef __apple__
-/* apple/gcc has a "problem" with global vars and dynamic libs.
-   Initializing it seems to fix the problem.
-   Described a bit in this thread:
-   http://gcc.gnu.org/ml/gcc/2005-06/msg00179.html
-*/
-pthread_t paUnixMainThread = 0;
-#else
-/*pthreads are opaque. We don't know that asigning it an int value
-  always makes sense, so we don't initialize it unless we have to.*/
-pthread_t paUnixMainThread = 0;
-#endif
-
-PaError PaUnixThreading_Initialize()
-{
-    paUnixMainThread = pthread_self();
-    return paNoError;
-}
-
-static PaError BoostPriority( PaUnixThread* self )
-{
-    PaError result = paNoError;
-    struct sched_param spm = { 0 };
-    /* Priority should only matter between contending FIFO threads? */
-    spm.sched_priority = 1;
-
-    assert( self );
-
-    if( pthread_setschedparam( self->thread, SCHED_FIFO, &spm ) != 0 )
-    {
-        PA_UNLESS( errno == EPERM, paInternalError );  /* Lack permission to raise priority */
-        PA_DEBUG(( "Failed bumping priority\n" ));
-        result = 0;
-    }
-    else
-    {
-        result = 1; /* Success */
-    }
-error:
-    return result;
-}
-
-PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void* threadArg, PaTime waitForChild,
-        int rtSched )
-{
-    PaError result = paNoError;
-    pthread_attr_t attr;
-    int started = 0;
-
-    memset( self, 0, sizeof (PaUnixThread) );
-    PaUnixMutex_Initialize( &self->mtx );
-    PA_ASSERT_CALL( pthread_cond_init( &self->cond, NULL ), 0 );
-
-    self->parentWaiting = 0 != waitForChild;
-
-    /* Spawn thread */
-
-/* Temporarily disabled since we should test during configuration for presence of required mman.h header */
-#if 0
-#if defined _POSIX_MEMLOCK && (_POSIX_MEMLOCK != -1)
-    if( rtSched )
-    {
-        if( mlockall( MCL_CURRENT | MCL_FUTURE ) < 0 )
-        {
-            int savedErrno = errno;             /* In case errno gets overwritten */
-            assert( savedErrno != EINVAL );     /* Most likely a programmer error */
-            PA_UNLESS( (savedErrno == EPERM), paInternalError );
-            PA_DEBUG(( "%s: Failed locking memory\n", __FUNCTION__ ));
-        }
-        else
-            PA_DEBUG(( "%s: Successfully locked memory\n", __FUNCTION__ ));
-    }
-#endif
-#endif
-
-    PA_UNLESS( !pthread_attr_init( &attr ), paInternalError );
-    /* Priority relative to other processes */
-    PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError );   
-
-    PA_UNLESS( !pthread_create( &self->thread, &attr, threadFunc, threadArg ), paInternalError );
-    started = 1;
-
-    if( rtSched )
-    {
-#if 0
-        if( self->useWatchdog )
-        {
-            int err;
-            struct sched_param wdSpm = { 0 };
-            /* Launch watchdog, watchdog sets callback thread priority */
-            int prio = PA_MIN( self->rtPrio + 4, sched_get_priority_max( SCHED_FIFO ) );
-            wdSpm.sched_priority = prio;
-
-            PA_UNLESS( !pthread_attr_init( &attr ), paInternalError );
-            PA_UNLESS( !pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ), paInternalError );
-            PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError );
-            PA_UNLESS( !pthread_attr_setschedpolicy( &attr, SCHED_FIFO ), paInternalError );
-            PA_UNLESS( !pthread_attr_setschedparam( &attr, &wdSpm ), paInternalError );
-            if( (err = pthread_create( &self->watchdogThread, &attr, &WatchdogFunc, self )) )
-            {
-                PA_UNLESS( err == EPERM, paInternalError );
-                /* Permission error, go on without realtime privileges */
-                PA_DEBUG(( "Failed bumping priority\n" ));
-            }
-            else
-            {
-                int policy;
-                self->watchdogRunning = 1;
-                PA_ENSURE_SYSTEM( pthread_getschedparam( self->watchdogThread, &policy, &wdSpm ), 0 );
-                /* Check if priority is right, policy could potentially differ from SCHED_FIFO (but that's alright) */
-                if( wdSpm.sched_priority != prio )
-                {
-                    PA_DEBUG(( "Watchdog priority not set correctly (%d)\n", wdSpm.sched_priority ));
-                    PA_ENSURE( paInternalError );
-                }
-            }
-        }
-        else
-#endif
-            PA_ENSURE( BoostPriority( self ) );
-
-        {
-            int policy;
-            struct sched_param spm;
-            pthread_getschedparam(self->thread, &policy, &spm);
-        }
-    }
-    
-    if( self->parentWaiting )
-    {
-        PaTime till;
-        struct timespec ts;
-        int res = 0;
-        PaTime now;
-
-        PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
-
-        /* Wait for stream to be started */
-        now = PaUtil_GetTime();
-        till = now + waitForChild;
-
-        while( self->parentWaiting && !res )
-        {
-            if( waitForChild > 0 )
-            {
-                ts.tv_sec = (time_t) floor( till );
-                ts.tv_nsec = (long) ((till - floor( till )) * 1e9);
-                res = pthread_cond_timedwait( &self->cond, &self->mtx.mtx, &ts );
-            }
-            else
-            {
-                res = pthread_cond_wait( &self->cond, &self->mtx.mtx );
-            }
-        }
-
-        PA_ENSURE( PaUnixMutex_Unlock( &self->mtx ) );
-
-        PA_UNLESS( !res || ETIMEDOUT == res, paInternalError );
-        PA_DEBUG(( "%s: Waited for %g seconds for stream to start\n", __FUNCTION__, PaUtil_GetTime() - now ));
-        if( ETIMEDOUT == res )
-        {
-            PA_ENSURE( paTimedOut );
-        }
-    }
-
-end:
-    return result;
-error:
-    if( started )
-    {
-        PaUnixThread_Terminate( self, 0, NULL );
-    }
-
-    goto end;
-}
-
-PaError PaUnixThread_Terminate( PaUnixThread* self, int wait, PaError* exitResult )
-{
-    PaError result = paNoError;
-    void* pret;
-
-    if( exitResult )
-    {
-        *exitResult = paNoError;
-    }
-#if 0
-    if( watchdogExitResult )
-        *watchdogExitResult = paNoError;
-
-    if( th->watchdogRunning )
-    {
-        pthread_cancel( th->watchdogThread );
-        PA_ENSURE_SYSTEM( pthread_join( th->watchdogThread, &pret ), 0 );
-
-        if( pret && pret != PTHREAD_CANCELED )
-        {
-            if( watchdogExitResult )
-                *watchdogExitResult = *(PaError *) pret;
-            free( pret );
-        }
-    }
-#endif
-
-    /* Only kill the thread if it isn't in the process of stopping (flushing adaptation buffers) */
-    /* TODO: Make join time out */
-    self->stopRequested = wait;
-    if( !wait )
-    {
-        PA_DEBUG(( "%s: Canceling thread %d\n", __FUNCTION__, self->thread ));
-        /* XXX: Safe to call this if the thread has exited on its own? */
-        pthread_cancel( self->thread );
-    }
-    PA_DEBUG(( "%s: Joining thread %d\n", __FUNCTION__, self->thread ));
-    PA_ENSURE_SYSTEM( pthread_join( self->thread, &pret ), 0 );
-
-    if( pret && PTHREAD_CANCELED != pret )
-    {
-        if( exitResult )
-        {
-            *exitResult = *(PaError*)pret;
-        }
-        free( pret );
-    }
-
-error:
-    PA_ASSERT_CALL( PaUnixMutex_Terminate( &self->mtx ), paNoError );
-    PA_ASSERT_CALL( pthread_cond_destroy( &self->cond ), 0 );
-
-    return result;
-}
-
-PaError PaUnixThread_PrepareNotify( PaUnixThread* self )
-{
-    PaError result = paNoError;
-    PA_UNLESS( self->parentWaiting, paInternalError );
-
-    PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
-    self->locked = 1;
-
-error:
-    return result;
-}
-
-PaError PaUnixThread_NotifyParent( PaUnixThread* self )
-{
-    PaError result = paNoError;
-    PA_UNLESS( self->parentWaiting, paInternalError );
-
-    if( !self->locked )
-    {
-        PA_ENSURE( PaUnixMutex_Lock( &self->mtx ) );
-        self->locked = 1;
-    }
-    self->parentWaiting = 0;
-    pthread_cond_signal( &self->cond );
-    PA_ENSURE( PaUnixMutex_Unlock( &self->mtx ) );
-    self->locked = 0;
-
-error:
-    return result;
-}
-
-int PaUnixThread_StopRequested( PaUnixThread* self )
-{
-    return self->stopRequested;
-}
-
-PaError PaUnixMutex_Initialize( PaUnixMutex* self )
-{
-    PaError result = paNoError;
-    PA_ASSERT_CALL( pthread_mutex_init( &self->mtx, NULL ), 0 );
-    return result;
-}
-
-PaError PaUnixMutex_Terminate( PaUnixMutex* self )
-{
-    PaError result = paNoError;
-    PA_ASSERT_CALL( pthread_mutex_destroy( &self->mtx ), 0 );
-    return result;
-}
-
-/** Lock mutex.
- *
- * We're disabling thread cancellation while the thread is holding a lock, so mutexes are 
- * properly unlocked at termination time.
- */
-PaError PaUnixMutex_Lock( PaUnixMutex* self )
-{
-    PaError result = paNoError;
-    int oldState;
-    
-    PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &oldState ), 0 );
-    PA_ENSURE_SYSTEM( pthread_mutex_lock( &self->mtx ), 0 );
-
-error:
-    return result;
-}
-
-/** Unlock mutex.
- *
- * Thread cancellation is enabled again after the mutex is properly unlocked.
- */
-PaError PaUnixMutex_Unlock( PaUnixMutex* self )
-{
-    PaError result = paNoError;
-    int oldState;
-
-    PA_ENSURE_SYSTEM( pthread_mutex_unlock( &self->mtx ), 0 );
-    PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &oldState ), 0 );
-
-error:
-    return result;
-}
-
-
-#if 0
-static void OnWatchdogExit( void *userData )
-{
-    PaAlsaThreading *th = (PaAlsaThreading *) userData;
-    struct sched_param spm = { 0 };
-    assert( th );
-
-    PA_ASSERT_CALL( pthread_setschedparam( th->callbackThread, SCHED_OTHER, &spm ), 0 );    /* Lower before exiting */
-    PA_DEBUG(( "Watchdog exiting\n" ));
-}
-
-static void *WatchdogFunc( void *userData )
-{
-    PaError result = paNoError, *pres = NULL;
-    int err;
-    PaAlsaThreading *th = (PaAlsaThreading *) userData;
-    unsigned intervalMsec = 500;
-    const PaTime maxSeconds = 3.;   /* Max seconds between callbacks */
-    PaTime timeThen = PaUtil_GetTime(), timeNow, timeElapsed, cpuTimeThen, cpuTimeNow, cpuTimeElapsed;
-    double cpuLoad, avgCpuLoad = 0.;
-    int throttled = 0;
-
-    assert( th );
-
-    /* Execute OnWatchdogExit when exiting */
-    pthread_cleanup_push( &OnWatchdogExit, th );
-
-    /* Boost priority of callback thread */
-    PA_ENSURE( result = BoostPriority( th ) );
-    if( !result )
-    {
-        /* Boost failed, might as well exit */
-        pthread_exit( NULL );
-    }
-
-    cpuTimeThen = th->callbackCpuTime;
-    {
-        int policy;
-        struct sched_param spm = { 0 };
-        pthread_getschedparam( pthread_self(), &policy, &spm );
-        PA_DEBUG(( "%s: Watchdog priority is %d\n", __FUNCTION__, spm.sched_priority ));
-    }
-
-    while( 1 )
-    {
-        double lowpassCoeff = 0.9, lowpassCoeff1 = 0.99999 - lowpassCoeff;
-        
-        /* Test before and after in case whatever underlying sleep call isn't interrupted by pthread_cancel */
-        pthread_testcancel();
-        Pa_Sleep( intervalMsec );
-        pthread_testcancel();
-
-        if( PaUtil_GetTime() - th->callbackTime > maxSeconds )
-        {
-            PA_DEBUG(( "Watchdog: Terminating callback thread\n" ));
-            /* Tell thread to terminate */
-            err = pthread_kill( th->callbackThread, SIGKILL );
-            pthread_exit( NULL );
-        }
-
-        PA_DEBUG(( "%s: PortAudio reports CPU load: %g\n", __FUNCTION__, PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) ));
-
-        /* Check if we should throttle, or unthrottle :P */
-        cpuTimeNow = th->callbackCpuTime;
-        cpuTimeElapsed = cpuTimeNow - cpuTimeThen;
-        cpuTimeThen = cpuTimeNow;
-
-        timeNow = PaUtil_GetTime();
-        timeElapsed = timeNow - timeThen;
-        timeThen = timeNow;
-        cpuLoad = cpuTimeElapsed / timeElapsed;
-        avgCpuLoad = avgCpuLoad * lowpassCoeff + cpuLoad * lowpassCoeff1;
-        /*
-        if( throttled )
-            PA_DEBUG(( "Watchdog: CPU load: %g, %g\n", avgCpuLoad, cpuTimeElapsed ));
-            */
-        if( PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) > .925 )
-        {
-            static int policy;
-            static struct sched_param spm = { 0 };
-            static const struct sched_param defaultSpm = { 0 };
-            PA_DEBUG(( "%s: Throttling audio thread, priority %d\n", __FUNCTION__, spm.sched_priority ));
-
-            pthread_getschedparam( th->callbackThread, &policy, &spm );
-            if( !pthread_setschedparam( th->callbackThread, SCHED_OTHER, &defaultSpm ) )
-            {
-                throttled = 1;
-            }
-            else
-                PA_DEBUG(( "Watchdog: Couldn't lower priority of audio thread: %s\n", strerror( errno ) ));
-
-            /* Give other processes a go, before raising priority again */
-            PA_DEBUG(( "%s: Watchdog sleeping for %lu msecs before unthrottling\n", __FUNCTION__, th->throttledSleepTime ));
-            Pa_Sleep( th->throttledSleepTime );
-
-            /* Reset callback priority */
-            if( pthread_setschedparam( th->callbackThread, SCHED_FIFO, &spm ) != 0 )
-            {
-                PA_DEBUG(( "%s: Couldn't raise priority of audio thread: %s\n", __FUNCTION__, strerror( errno ) ));
-            }
-
-            if( PaUtil_GetCpuLoad( th->cpuLoadMeasurer ) >= .99 )
-                intervalMsec = 50;
-            else
-                intervalMsec = 100;
-
-            /*
-            lowpassCoeff = .97;
-            lowpassCoeff1 = .99999 - lowpassCoeff;
-            */
-        }
-        else if( throttled && avgCpuLoad < .8 )
-        {
-            intervalMsec = 500;
-            throttled = 0;
-
-            /*
-            lowpassCoeff = .9;
-            lowpassCoeff1 = .99999 - lowpassCoeff;
-            */
-        }
-    }
-
-    pthread_cleanup_pop( 1 );   /* Execute cleanup on exit */
-
-error:
-    /* Shouldn't get here in the normal case */
-
-    /* Pass on error code */
-    pres = malloc( sizeof (PaError) );
-    *pres = result;
-    
-    pthread_exit( pres );
-}
-
-static void CallbackUpdate( PaAlsaThreading *th )
-{
-    th->callbackTime = PaUtil_GetTime();
-    th->callbackCpuTime = PaUtil_GetCpuLoad( th->cpuLoadMeasurer );
-}
-
-/*
-static void *CanaryFunc( void *userData )
-{
-    const unsigned intervalMsec = 1000;
-    PaUtilThreading *th = (PaUtilThreading *) userData;
-
-    while( 1 )
-    {
-        th->canaryTime = PaUtil_GetTime();
-
-        pthread_testcancel();
-        Pa_Sleep( intervalMsec );
-    }
-
-    pthread_exit( NULL );
-}
-*/
-#endif
diff --git a/libs/portaudio/src/os/unix/pa_unix_util.h b/libs/portaudio/src/os/unix/pa_unix_util.h
deleted file mode 100644
index e900f87726..0000000000
--- a/libs/portaudio/src/os/unix/pa_unix_util.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * $Id: pa_unix_util.h 1241 2007-07-23 20:08:31Z aknudsen $
- * Portable Audio I/O Library
- * UNIX platform-specific support functions
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2000 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup unix_src
-*/
-
-#ifndef PA_UNIX_UTIL_H
-#define PA_UNIX_UTIL_H
-
-#include "pa_cpuload.h"
-#include <assert.h>
-#include <pthread.h>
-#include <signal.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#define PA_MIN(x,y) ( (x) < (y) ? (x) : (y) )
-#define PA_MAX(x,y) ( (x) > (y) ? (x) : (y) )
-
-/* Utilize GCC branch prediction for error tests */
-#if defined __GNUC__ && __GNUC__ >= 3
-#define UNLIKELY(expr) __builtin_expect( (expr), 0 )
-#else
-#define UNLIKELY(expr) (expr)
-#endif
-
-#define STRINGIZE_HELPER(expr) #expr
-#define STRINGIZE(expr) STRINGIZE_HELPER(expr)
-
-#define PA_UNLESS(expr, code) \
-    do { \
-        if( UNLIKELY( (expr) == 0 ) ) \
-        { \
-            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = (code); \
-            goto error; \
-        } \
-    } while (0);
-
-static PaError paUtilErr_;          /* Used with PA_ENSURE */
-
-/* Check PaError */
-#define PA_ENSURE(expr) \
-    do { \
-        if( UNLIKELY( (paUtilErr_ = (expr)) < paNoError ) ) \
-        { \
-            PaUtil_DebugPrint(( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" )); \
-            result = paUtilErr_; \
-            goto error; \
-        } \
-    } while (0);
-
-#define PA_ASSERT_CALL(expr, success) \
-    paUtilErr_ = (expr); \
-    assert( success == paUtilErr_ );
-
-#define PA_ENSURE_SYSTEM(expr, success) \
-    do { \
-        if( UNLIKELY( (paUtilErr_ = (expr)) != success ) ) \
-        { \
-            /* PaUtil_SetLastHostErrorInfo should only be used in the main thread */ \
-            if( pthread_equal(pthread_self(), paUnixMainThread) ) \
-            { \
-                PaUtil_SetLastHostErrorInfo( paALSA, paUtilErr_, strerror( paUtilErr_ ) ); \
-            } \
-            PaUtil_DebugPrint( "Expression '" #expr "' failed in '" __FILE__ "', line: " STRINGIZE( __LINE__ ) "\n" ); \
-            result = paUnanticipatedHostError; \
-            goto error; \
-        } \
-    } while( 0 );
-
-typedef struct {
-    pthread_t callbackThread;
-} PaUtilThreading;
-
-PaError PaUtil_InitializeThreading( PaUtilThreading *threading );
-void PaUtil_TerminateThreading( PaUtilThreading *threading );
-PaError PaUtil_StartThreading( PaUtilThreading *threading, void *(*threadRoutine)(void *), void *data );
-PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *exitResult );
-
-/* State accessed by utility functions */
-
-/*
-void PaUnix_SetRealtimeScheduling( int rt );
-
-void PaUtil_InitializeThreading( PaUtilThreading *th, PaUtilCpuLoadMeasurer *clm );
-
-PaError PaUtil_CreateCallbackThread( PaUtilThreading *th, void *(*CallbackThreadFunc)( void * ), PaStream *s );
-
-PaError PaUtil_KillCallbackThread( PaUtilThreading *th, PaError *exitResult );
-
-void PaUtil_CallbackUpdate( PaUtilThreading *th );
-*/
-
-extern pthread_t paUnixMainThread;
-
-typedef struct
-{
-    pthread_mutex_t mtx;
-} PaUnixMutex;
-
-PaError PaUnixMutex_Initialize( PaUnixMutex* self );
-PaError PaUnixMutex_Terminate( PaUnixMutex* self );
-PaError PaUnixMutex_Lock( PaUnixMutex* self );
-PaError PaUnixMutex_Unlock( PaUnixMutex* self );
-
-typedef struct
-{
-    pthread_t thread;
-    int parentWaiting;
-    int stopRequested;
-    int locked;
-    PaUnixMutex mtx;
-    pthread_cond_t cond;
-    volatile sig_atomic_t stopRequest;
-} PaUnixThread;
-
-/** Initialize global threading state.
- */
-PaError PaUnixThreading_Initialize();
-
-/** Perish, passing on eventual error code.
- *
- * A thin wrapper around pthread_exit, will automatically pass on any error code to the joining thread.
- * If the result indicates an error, i.e. it is not equal to paNoError, this function will automatically
- * allocate a pointer so the error is passed on with pthread_exit. If the result indicates that all is
- * well however, only a NULL pointer will be handed to pthread_exit. Thus, the joining thread should
- * check whether a non-NULL result pointer is obtained from pthread_join and make sure to free it.
- * @param result: The error code to pass on to the joining thread.
- */
-#define PaUnixThreading_EXIT(result) \
-    do { \
-        PaError* pres = NULL; \
-        if( paNoError != (result) ) \
-        { \
-            pres = malloc( sizeof (PaError) ); \
-            *pres = (result); \
-        } \
-        pthread_exit( pres ); \
-    } while (0);
-
-/** Spawn a thread.
- *
- * Intended for spawning the callback thread from the main thread. This function can even block (for a certain
- * time or indefinitely) untill notified by the callback thread (using PaUnixThread_NotifyParent), which can be
- * useful in order to make sure that callback has commenced before returning from Pa_StartStream.
- * @param threadFunc: The function to be executed in the child thread.
- * @param waitForChild: If not 0, wait for child thread to call PaUnixThread_NotifyParent. Less than 0 means
- * wait for ever, greater than 0 wait for the specified time.
- * @param rtSched: Enable realtime scheduling?
- * @return: If timed out waiting on child, paTimedOut.
- */
-PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void* threadArg, PaTime waitForChild,
-        int rtSched );
-
-/** Terminate thread.
- *
- * @param wait: If true, request that background thread stop and wait untill it does, else cancel it.
- * @param exitResult: If non-null this will upon return contain the exit status of the thread.
- */
-PaError PaUnixThread_Terminate( PaUnixThread* self, int wait, PaError* exitResult );
-
-/** Prepare to notify waiting parent thread.
- *
- * An internal lock must be held before the parent is notified in PaUnixThread_NotifyParent, call this to
- * acquire it beforehand.
- * @return: If parent is not waiting, paInternalError.
- */
-PaError PaUnixThread_PrepareNotify( PaUnixThread* self );
-
-/** Notify waiting parent thread.
- *
- * @return: If parent timed out waiting, paTimedOut. If parent was never waiting, paInternalError.
- */
-PaError PaUnixThread_NotifyParent( PaUnixThread* self );
-
-/** Has the parent thread requested this thread to stop?
- */
-int PaUnixThread_StopRequested( PaUnixThread* self );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif
diff --git a/libs/portaudio/src/os/win/pa_win_hostapis.c b/libs/portaudio/src/os/win/pa_win_hostapis.c
deleted file mode 100644
index 83f1e91413..0000000000
--- a/libs/portaudio/src/os/win/pa_win_hostapis.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * $Id: pa_win_hostapis.c 1097 2006-08-26 08:27:53Z rossb $
- * Portable Audio I/O Library Windows initialization table
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup win_src
-
-    Win32 host API initialization function table.
-
-    @todo Consider using PA_USE_WMME etc instead of PA_NO_WMME. This is what
-    the Unix version does, we should consider being consistent.
-*/
-
-
-#include "pa_hostapi.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-PaError PaSkeleton_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaWinWdm_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-PaError PaWinWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-PaUtilHostApiInitializer *paHostApiInitializers[] =
-    {
-
-#ifndef PA_NO_WMME
-        PaWinMme_Initialize,
-#endif
-
-#ifndef PA_NO_DS
-        PaWinDs_Initialize,
-#endif
-
-#ifndef PA_NO_ASIO
-        PaAsio_Initialize,
-#endif
-
-/*
-#ifndef PA_NO_WASAPI
-		PaWinWasapi_Initialize,
-#endif
-
-#ifndef PA_NO_WDMKS
-       PaWinWdm_Initialize,
-#endif
-*/
-
-        PaSkeleton_Initialize, /* just for testing */
-
-        0   /* NULL terminated array */
-    };
-
-
-int paDefaultHostApiIndex = 0;
-
diff --git a/libs/portaudio/src/os/win/pa_win_util.c b/libs/portaudio/src/os/win/pa_win_util.c
deleted file mode 100644
index 2f0cdf343f..0000000000
--- a/libs/portaudio/src/os/win/pa_win_util.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * $Id: pa_win_util.c 1197 2007-05-04 13:07:10Z gordon_gidluck $
- * Portable Audio I/O Library
- * Win32 platform-specific support functions
- *
- * Based on the Open Source API proposed by Ross Bencina
- * Copyright (c) 1999-2000 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup win_src
-
- Win32 platform-specific support functions.
-
-    @todo Implement workaround for QueryPerformanceCounter() skipping forward
-    bug. (see msdn kb Q274323).
-*/
- 
-#include <windows.h>
-#include <mmsystem.h> /* for timeGetTime() */
-
-#include "pa_util.h"
-
-
-/*
-   Track memory allocations to avoid leaks.
- */
-
-#if PA_TRACK_MEMORY
-static int numAllocations_ = 0;
-#endif
-
-
-void *PaUtil_AllocateMemory( long size )
-{
-    void *result = GlobalAlloc( GPTR, size );
-
-#if PA_TRACK_MEMORY
-    if( result != NULL ) numAllocations_ += 1;
-#endif
-    return result;
-}
-
-
-void PaUtil_FreeMemory( void *block )
-{
-    if( block != NULL )
-    {
-        GlobalFree( block );
-#if PA_TRACK_MEMORY
-        numAllocations_ -= 1;
-#endif
-
-    }
-}
-
-
-int PaUtil_CountCurrentlyAllocatedBlocks( void )
-{
-#if PA_TRACK_MEMORY
-    return numAllocations_;
-#else
-    return 0;
-#endif
-}
-
-
-void Pa_Sleep( long msec )
-{
-    Sleep( msec );
-}
-
-static int usePerformanceCounter_;
-static double secondsPerTick_;
-
-void PaUtil_InitializeClock( void )
-{
-    LARGE_INTEGER ticksPerSecond;
-
-    if( QueryPerformanceFrequency( &ticksPerSecond ) != 0 )
-    {
-        usePerformanceCounter_ = 1;
-        secondsPerTick_ = 1.0 / (double)ticksPerSecond.QuadPart;
-    }
-    else
-    {
-        usePerformanceCounter_ = 0;
-    }
-}
-
-
-double PaUtil_GetTime( void )
-{
-    LARGE_INTEGER time;
-
-    if( usePerformanceCounter_ )
-    {
-        /* FIXME:
-            according to this knowledge-base article, QueryPerformanceCounter
-            can skip forward by seconds!
-            http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q274323&
-
-            it may be better to use the rtdsc instruction using inline asm,
-            however then a method is needed to calculate a ticks/seconds ratio.
-        */
-        QueryPerformanceCounter( &time );
-        return time.QuadPart * secondsPerTick_;
-    }
-    else
-    {
-#ifndef UNDER_CE    	
-        return timeGetTime() * .001;
-#else
-        return GetTickCount() * .001;
-#endif                
-    }
-}
diff --git a/libs/portaudio/src/os/win/pa_win_waveformat.c b/libs/portaudio/src/os/win/pa_win_waveformat.c
deleted file mode 100644
index 6b91ebd984..0000000000
--- a/libs/portaudio/src/os/win/pa_win_waveformat.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * PortAudio Portable Real-Time Audio Library
- * Windows WAVEFORMAT* data structure utilities
- * portaudio.h should be included before this file.
- *
- * Copyright (c) 2007 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <windows.h>
-#include <mmsystem.h>
-
-#include "portaudio.h"
-#include "pa_win_waveformat.h"
-
-
-#if !defined(WAVE_FORMAT_EXTENSIBLE)
-#define  WAVE_FORMAT_EXTENSIBLE         0xFFFE
-#endif
-
-#if !defined(WAVE_FORMAT_IEEE_FLOAT)
-#define  WAVE_FORMAT_IEEE_FLOAT         0x0003
-#endif
-
-static GUID pawin_ksDataFormatSubtypePcm = 
-	{ (USHORT)(WAVE_FORMAT_PCM), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
-
-static GUID pawin_ksDataFormatSubtypeIeeeFloat = 
-	{ (USHORT)(WAVE_FORMAT_IEEE_FLOAT), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
-
-
-
-void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, 
-		int numChannels, PaSampleFormat sampleFormat, double sampleRate )
-{
-	WAVEFORMATEX *waveFormatEx = (WAVEFORMATEX*)waveFormat;
-    int bytesPerSample = Pa_GetSampleSize(sampleFormat);
-	unsigned long bytesPerFrame = numChannels * bytesPerSample;
-
-    if( sampleFormat == paFloat32 )
-        waveFormatEx->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
-    else
-        waveFormatEx->wFormatTag = WAVE_FORMAT_PCM;
-	
-	waveFormatEx->nChannels = (WORD)numChannels;
-	waveFormatEx->nSamplesPerSec = (DWORD)sampleRate;
-	waveFormatEx->nAvgBytesPerSec = waveFormatEx->nSamplesPerSec * bytesPerFrame;
-	waveFormatEx->nBlockAlign = (WORD)bytesPerFrame;
-	waveFormatEx->wBitsPerSample = bytesPerSample * 8;
-	waveFormatEx->cbSize = 0;
-}
-
-
-void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, 
-		int numChannels, PaSampleFormat sampleFormat, double sampleRate,
-		PaWinWaveFormatChannelMask channelMask )
-{
-	WAVEFORMATEX *waveFormatEx = (WAVEFORMATEX*)waveFormat;
-    int bytesPerSample = Pa_GetSampleSize(sampleFormat);
-	unsigned long bytesPerFrame = numChannels * bytesPerSample;
-
-	waveFormatEx->wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-	waveFormatEx->nChannels = (WORD)numChannels;
-	waveFormatEx->nSamplesPerSec = (DWORD)sampleRate;
-	waveFormatEx->nAvgBytesPerSec = waveFormatEx->nSamplesPerSec * bytesPerFrame;
-	waveFormatEx->nBlockAlign = (WORD)bytesPerFrame;
-	waveFormatEx->wBitsPerSample = bytesPerSample * 8;
-	waveFormatEx->cbSize = 22;
-
-	*((WORD*)&waveFormat->fields[PAWIN_INDEXOF_WVALIDBITSPERSAMPLE]) =
-			waveFormatEx->wBitsPerSample;
-
-	*((DWORD*)&waveFormat->fields[PAWIN_INDEXOF_DWCHANNELMASK]) = channelMask;
-			
-    if( sampleFormat == paFloat32 )
-        *((GUID*)&waveFormat->fields[PAWIN_INDEXOF_SUBFORMAT]) =
-            pawin_ksDataFormatSubtypeIeeeFloat;
-    else
-        *((GUID*)&waveFormat->fields[PAWIN_INDEXOF_SUBFORMAT]) =
-            pawin_ksDataFormatSubtypePcm;
-}
-
-
-PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels )
-{
-	switch( numChannels ){
-		case 1:
-			return PAWIN_SPEAKER_MONO;
-		case 2:
-			return PAWIN_SPEAKER_STEREO; 
-		case 3:
-            return PAWIN_SPEAKER_FRONT_LEFT | PAWIN_SPEAKER_FRONT_CENTER | PAWIN_SPEAKER_FRONT_RIGHT;
-		case 4:
-			return PAWIN_SPEAKER_QUAD;
-		case 5:
-            return PAWIN_SPEAKER_QUAD | PAWIN_SPEAKER_FRONT_CENTER;
-		case 6:
-            /* The meaning of the PAWIN_SPEAKER_5POINT1 flag has changed over time:
-                http://msdn2.microsoft.com/en-us/library/aa474707.aspx
-               We use PAWIN_SPEAKER_5POINT1 (not PAWIN_SPEAKER_5POINT1_SURROUND)
-               because on some cards (eg Audigy) PAWIN_SPEAKER_5POINT1_SURROUND 
-               results in a virtual mixdown placing the rear output in the 
-               front _and_ rear speakers.
-            */
-			return PAWIN_SPEAKER_5POINT1; 
-        /* case 7: */
-		case 8:
-			return PAWIN_SPEAKER_7POINT1;
-	}
-
-    /* Apparently some Audigy drivers will output silence 
-       if the direct-out constant (0) is used. So this is not ideal.    
-    */
-	return  PAWIN_SPEAKER_DIRECTOUT;
-
-    /* Note that Alec Rogers proposed the following as an alternate method to 
-        generate the default channel mask, however it doesn't seem to be an improvement
-        over the above, since some drivers will matrix outputs mapping to non-present
-        speakers accross multiple physical speakers.
-
-        if(nChannels==1) {
-            pwfFormat->dwChannelMask = SPEAKER_FRONT_CENTER;
-        }
-        else {
-            pwfFormat->dwChannelMask = 0;
-            for(i=0; i<nChannels; i++)
-                pwfFormat->dwChannelMask = (pwfFormat->dwChannelMask << 1) | 0x1;
-        }
-    */
-}
diff --git a/libs/portaudio/src/os/win/pa_win_wdmks_utils.c b/libs/portaudio/src/os/win/pa_win_wdmks_utils.c
deleted file mode 100644
index 5a7fd973b1..0000000000
--- a/libs/portaudio/src/os/win/pa_win_wdmks_utils.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * PortAudio Portable Real-Time Audio Library
- * Windows WDM KS utilities
- *
- * Copyright (c) 1999 - 2007 Andrew Baldwin, Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <windows.h>
-#include <mmreg.h>
-#include <ks.h>
-#include <ksmedia.h>
-#include <stdio.h>              // just for some development printfs
-
-#include "portaudio.h"
-#include "pa_util.h"
-#include "pa_win_wdmks_utils.h"
-
-
-static PaError WdmGetPinPropertySimple(
-    HANDLE  handle,
-    unsigned long pinId,
-    unsigned long property,
-    void* value,
-    unsigned long valueSize )
-{
-    DWORD bytesReturned;
-    KSP_PIN ksPProp;
-    ksPProp.Property.Set = KSPROPSETID_Pin;
-    ksPProp.Property.Id = property;
-    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
-    ksPProp.PinId = pinId;
-    ksPProp.Reserved = 0;
-
-    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp, sizeof(KSP_PIN),
-            value, valueSize, &bytesReturned, NULL ) == 0 || bytesReturned != valueSize )
-    {
-        return paUnanticipatedHostError;
-    }
-    else
-    {
-        return paNoError;
-    }
-}
-
-
-static PaError WdmGetPinPropertyMulti(
-    HANDLE handle,
-    unsigned long pinId,
-    unsigned long property,
-    KSMULTIPLE_ITEM** ksMultipleItem)
-{
-    unsigned long multipleItemSize = 0;
-    KSP_PIN ksPProp;
-    DWORD bytesReturned;
-
-    *ksMultipleItem = 0;
-
-    ksPProp.Property.Set = KSPROPSETID_Pin;
-    ksPProp.Property.Id = property;
-    ksPProp.Property.Flags = KSPROPERTY_TYPE_GET;
-    ksPProp.PinId = pinId;
-    ksPProp.Reserved = 0;
-
-    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp.Property,
-            sizeof(KSP_PIN), NULL, 0, &multipleItemSize, NULL ) == 0 && GetLastError() != ERROR_MORE_DATA )
-    {
-        return paUnanticipatedHostError;
-    }
-
-    *ksMultipleItem = (KSMULTIPLE_ITEM*)PaUtil_AllocateMemory( multipleItemSize );
-    if( !*ksMultipleItem )
-    {
-        return paInsufficientMemory;
-    }
-
-    if( DeviceIoControl( handle, IOCTL_KS_PROPERTY, &ksPProp, sizeof(KSP_PIN),
-            (void*)*ksMultipleItem,  multipleItemSize, &bytesReturned, NULL ) == 0 || bytesReturned != multipleItemSize )
-    {
-        PaUtil_FreeMemory( ksMultipleItem );
-        return paUnanticipatedHostError;
-    }
-
-    return paNoError;
-}
-
-
-static int GetKSFilterPinCount( HANDLE deviceHandle )
-{
-    DWORD result;
-
-    if( WdmGetPinPropertySimple( deviceHandle, 0, KSPROPERTY_PIN_CTYPES, &result, sizeof(result) ) == paNoError ){
-        return result;
-    }else{
-        return 0;
-    }
-}
-
-
-static KSPIN_COMMUNICATION GetKSFilterPinPropertyCommunication( HANDLE deviceHandle, int pinId )
-{
-    KSPIN_COMMUNICATION result;
-
-    if( WdmGetPinPropertySimple( deviceHandle, pinId, KSPROPERTY_PIN_COMMUNICATION, &result, sizeof(result) ) == paNoError ){
-        return result;
-    }else{
-        return KSPIN_COMMUNICATION_NONE;
-    }
-}
-
-
-static KSPIN_DATAFLOW GetKSFilterPinPropertyDataflow( HANDLE deviceHandle, int pinId )
-{
-    KSPIN_DATAFLOW result;
-
-    if( WdmGetPinPropertySimple( deviceHandle, pinId, KSPROPERTY_PIN_DATAFLOW, &result, sizeof(result) ) == paNoError ){
-        return result;
-    }else{
-        return (KSPIN_DATAFLOW)0;
-    }
-}
-
-
-static int KSFilterPinPropertyIdentifiersInclude( 
-        HANDLE deviceHandle, int pinId, unsigned long property, const GUID *identifierSet, unsigned long identifierId  )
-{
-    KSMULTIPLE_ITEM* item = NULL;
-    KSIDENTIFIER* identifier;
-    int i;
-    int result = 0;
-
-    if( WdmGetPinPropertyMulti( deviceHandle, pinId, property, &item) != paNoError )
-        return 0;
-    
-    identifier = (KSIDENTIFIER*)(item+1);
-
-    for( i = 0; i < (int)item->Count; i++ )
-    {
-        if( !memcmp( (void*)&identifier[i].Set, (void*)identifierSet, sizeof( GUID ) ) &&
-           ( identifier[i].Id == identifierId ) )
-        {
-            result = 1;
-            break;
-        }
-    }
-
-    PaUtil_FreeMemory( item );
-
-    return result;
-}
-
-
-/* return the maximum channel count supported by any pin on the device. 
-   if isInput is non-zero we query input pins, otherwise output pins.
-*/
-int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInput )
-{
-    HANDLE deviceHandle;
-    int pinCount, pinId;
-	ULONG i;
-    int result = 0;
-    KSPIN_DATAFLOW requiredDataflowDirection = (isInput ? KSPIN_DATAFLOW_OUT : KSPIN_DATAFLOW_IN );
-    
-    if( !wcharDevicePath )
-        return 0;
-
-    deviceHandle = CreateFileW( (LPCWSTR)wcharDevicePath, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL );
-    if( deviceHandle == INVALID_HANDLE_VALUE )
-        return 0;
-
-    pinCount = GetKSFilterPinCount( deviceHandle );
-    for( pinId = 0; pinId < pinCount; ++pinId )
-    {
-        KSPIN_COMMUNICATION communication = GetKSFilterPinPropertyCommunication( deviceHandle, pinId );
-        KSPIN_DATAFLOW dataflow = GetKSFilterPinPropertyDataflow( deviceHandle, pinId );
-        if( ( dataflow == requiredDataflowDirection ) &&
-                (( communication == KSPIN_COMMUNICATION_SINK) ||
-                 ( communication == KSPIN_COMMUNICATION_BOTH)) 
-             && ( KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_STREAMING )
-                || KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_INTERFACES, &KSINTERFACESETID_Standard, KSINTERFACE_STANDARD_LOOPED_STREAMING ) )
-             && KSFilterPinPropertyIdentifiersInclude( deviceHandle, pinId, 
-                    KSPROPERTY_PIN_MEDIUMS, &KSMEDIUMSETID_Standard, KSMEDIUM_STANDARD_DEVIO ) )
-         {
-            KSMULTIPLE_ITEM* item = NULL;
-            if( WdmGetPinPropertyMulti( deviceHandle, pinId, KSPROPERTY_PIN_DATARANGES, &item ) == paNoError )
-            {
-                KSDATARANGE *dataRange = (KSDATARANGE*)(item+1);
-
-                for( i=0; i < item->Count; ++i ){
-
-                    if( IS_VALID_WAVEFORMATEX_GUID(&dataRange->SubFormat)
-                            || memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID) ) == 0
-                            || memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID) ) == 0
-                            || ( ( memcmp( (void*)&dataRange->MajorFormat, (void*)&KSDATAFORMAT_TYPE_AUDIO, sizeof(GUID) ) == 0 )
-                                && ( memcmp( (void*)&dataRange->SubFormat, (void*)&KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID) ) == 0 ) ) )
-                    {
-                        KSDATARANGE_AUDIO *dataRangeAudio = (KSDATARANGE_AUDIO*)dataRange;
-                        
-                        /*
-                        printf( ">>> %d %d %d %d %S\n", isInput, dataflow, communication, dataRangeAudio->MaximumChannels, devicePath );
-                       
-                        if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, sizeof(GUID) ) == 0 )
-                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\n" );
-                        else if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_DSOUND, sizeof(GUID) ) == 0 )
-                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_DSOUND\n" );
-                        else if( memcmp((void*)&dataRange->Specifier, (void*)&KSDATAFORMAT_SPECIFIER_WILDCARD, sizeof(GUID) ) == 0 )
-                            printf( "\tspecifier: KSDATAFORMAT_SPECIFIER_WILDCARD\n" );
-                        else
-                            printf( "\tspecifier: ?\n" );
-                        */
-
-                        /*
-                            We assume that very high values for MaximumChannels are not useful and indicate
-                            that the driver isn't prepared to tell us the real number of channels which it supports.
-                        */
-                        if( dataRangeAudio->MaximumChannels  < 0xFFFFUL && (int)dataRangeAudio->MaximumChannels > result )
-                            result = (int)dataRangeAudio->MaximumChannels;
-                    }
-                    
-                    dataRange = (KSDATARANGE*)( ((char*)dataRange) + dataRange->FormatSize);
-                }
-
-                PaUtil_FreeMemory( item );
-            }
-        }
-    }
-    
-    CloseHandle( deviceHandle );
-    return result;
-}
diff --git a/libs/portaudio/src/os/win/pa_win_wdmks_utils.h b/libs/portaudio/src/os/win/pa_win_wdmks_utils.h
deleted file mode 100644
index f54035f451..0000000000
--- a/libs/portaudio/src/os/win/pa_win_wdmks_utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef PA_WIN_WDMKS_UTILS_H
-#define PA_WIN_WDMKS_UTILS_H
-
-/*
- * PortAudio Portable Real-Time Audio Library
- * Windows WDM KS utilities
- *
- * Copyright (c) 1999 - 2007 Ross Bencina, Andrew Baldwin
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @brief Utilities for working with the Windows WDM KS API
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
-    Query for the maximum number of channels supported by any pin of the
-    specified device. Returns 0 if the query fails for any reason.
-
-    @param wcharDevicePath A system level PnP interface path, supplied as a WCHAR unicode string.
-    Declard as void* to avoid introducing a dependency on wchar_t here.
-
-    @param isInput A flag specifying whether to query for input (non-zero) or output (zero) channels.
-*/
-int PaWin_WDMKS_QueryFilterMaximumChannelCount( void *wcharDevicePath, int isInput );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PA_WIN_WDMKS_UTILS_H */
\ No newline at end of file
diff --git a/libs/portaudio/src/os/win/pa_x86_plain_converters.c b/libs/portaudio/src/os/win/pa_x86_plain_converters.c
deleted file mode 100644
index f18c009c25..0000000000
--- a/libs/portaudio/src/os/win/pa_x86_plain_converters.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/*
- * Plain Intel IA32 assembly implementations of PortAudio sample converter functions.
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup win_src
-*/
-
-#include "pa_x86_plain_converters.h"
-
-#include "pa_converters.h"
-#include "pa_dither.h"
-
-/*
-    the main reason these versions are faster than the equivalent C versions
-    is that float -> int casting is expensive in C on x86 because the rounding
-    mode needs to be changed for every cast. these versions only set
-    the rounding mode once outside the loop.
-
-    small additional speed gains are made by the way that clamping is
-    implemented.
-
-TODO:
-    o- inline dither code
-    o- implement Dither only (no-clip) versions
-    o- implement int8 and uint8 versions
-    o- test thouroughly
-
-    o- the packed 24 bit functions could benefit from unrolling and avoiding
-        byte and word sized register access.
-*/
-
-/* -------------------------------------------------------------------------- */
-
-/*
-#define PA_CLIP_( val, min, max )\
-    { val = ((val) < (min)) ? (min) : (((val) > (max)) ? (max) : (val)); }
-*/
-
-/*
-    the following notes were used to determine whether a floating point
-    value should be saturated (ie >1 or <-1) by loading it into an integer
-    register. these should be rewritten so that they make sense.
-
-    an ieee floating point value
-
-    1.xxxxxxxxxxxxxxxxxxxx?
-
-
-    is less than  or equal to 1 and greater than or equal to -1 either:
-
-        if the mantissa is 0 and the unbiased exponent is 0
-
-        OR
-
-        if the unbiased exponent < 0
-
-    this translates to:
-
-        if the mantissa is 0 and the biased exponent is 7F
-
-        or
-
-        if the biased exponent is less than 7F
-
-
-    therefore the value is greater than 1 or less than -1 if
-
-        the mantissa is not 0 and the biased exponent is 7F
-
-        or
-
-        if the biased exponent is greater than 7F
-
-
-    in other words, if we mask out the sign bit, the value is
-    greater than 1 or less than -1 if its integer representation is greater than:
-
-    0 01111111 0000 0000 0000 0000 0000 000
-
-    0011 1111 1000 0000 0000 0000 0000 0000 => 0x3F800000
-*/
-
-/* -------------------------------------------------------------------------- */
-
-static const short fpuControlWord_ = 0x033F; /*round to nearest, 64 bit precision, all exceptions masked*/
-static const double int32Scaler_ = 0x7FFFFFFF;
-static const double ditheredInt32Scaler_ = 0x7FFFFFFE;
-static const double int24Scaler_ = 0x7FFFFF;
-static const double ditheredInt24Scaler_ = 0x7FFFFE;
-static const double int16Scaler_ = 0x7FFF;
-static const double ditheredInt16Scaler_ = 0x7FFE;
-
-#define PA_DITHER_BITS_   (15)
-/* Multiply by PA_FLOAT_DITHER_SCALE_ to get a float between -2.0 and +1.99999 */
-#define PA_FLOAT_DITHER_SCALE_  (1.0f / ((1<<PA_DITHER_BITS_)-1))
-static const float const_float_dither_scale_ = PA_FLOAT_DITHER_SCALE_;
-#define PA_DITHER_SHIFT_  ((32 - PA_DITHER_BITS_) + 1)
-
-/* -------------------------------------------------------------------------- */
-
-#ifdef _WIN64
-
-/*
-	-EMT64/AMD64 uses different asm
-	-VC2005 doesnt allow _WIN64 with inline assembly either!
- */
-void PaUtil_InitializeX86PlainConverters( void )
-{
-}
-
-#else
-
-
-static void Float32_To_Int32(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    signed long *dest =  (signed long*)destinationBuffer;
-    (void)ditherGenerator; // unused parameter
-
-    while( count-- )
-    {
-        // REVIEW
-        double scaled = *src * 0x7FFFFFFF;
-        *dest = (signed long) scaled;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-*/
-
-    short savedFpuControlWord;
-
-    (void) ditherGenerator; /* unused parameter */
-
-
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32 and int32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-    
-        mov     edi, destinationBuffer
-        
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int32Scaler_             // stack:  (int)0x7FFFFFFF
-
-    Float32_To_Int32_loop:
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFFFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFFFF, (int)0x7FFFFFFF
-        /*
-            note: we could store to a temporary qword here which would cause
-            wraparound distortion instead of int indefinite 0x10. that would
-            be more work, and given that not enabling clipping is only advisable
-            when you know that your signal isn't going to clip it isn't worth it.
-        */
-        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  (int)0x7FFFFFFF
-
-        add     edi, ebx                // increment destination ptr
-        //lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int32_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    signed long *dest =  (signed long*)destinationBuffer;
-    (void) ditherGenerator; // unused parameter
-
-    while( count-- )
-    {
-        // REVIEW
-        double scaled = *src * 0x7FFFFFFF;
-        PA_CLIP_( scaled, -2147483648., 2147483647.  );
-        *dest = (signed long) scaled;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-*/
-
-    short savedFpuControlWord;
-
-    (void) ditherGenerator; /* unused parameter */
-
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32 and int32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-    
-        mov     edi, destinationBuffer
-        
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int32Scaler_             // stack:  (int)0x7FFFFFFF
-
-    Float32_To_Int32_Clip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int32_Clip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFFFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFFFF, (int)0x7FFFFFFF
-        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  (int)0x7FFFFFFF
-        jmp     Float32_To_Int32_Clip_stored
-    
-    Float32_To_Int32_Clip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     edx, 0x7FFFFFFF         // convert to maximum range integers
-        mov     dword ptr [edi], edx
-
-    Float32_To_Int32_Clip_stored:
-
-        //add     edi, ebx                // increment destination ptr
-        lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int32_Clip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int32_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-    /*
-    float *src = (float*)sourceBuffer;
-    signed long *dest =  (signed long*)destinationBuffer;
-
-    while( count-- )
-    {
-        // REVIEW
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        // use smaller scaler to prevent overflow when we add the dither
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        PA_CLIP_( dithered, -2147483648., 2147483647.  );
-        *dest = (signed long) dithered;
-
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-    */
-
-    short savedFpuControlWord;
-
-    // spill storage:
-    signed long sourceByteStride;
-    signed long highpassedDither;
-
-    // dither state:
-    unsigned long ditherPrevious = ditherGenerator->previous;
-    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
-    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
-                    
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32 and int32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-    
-        mov     edi, destinationBuffer
-        
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     ditheredInt32Scaler_    // stack:  int scaler
-
-    Float32_To_Int32_DitherClip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int32_DitherClip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, int scaler
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
-
-        /*
-        // call PaUtil_GenerateFloatTriangularDither with C calling convention
-        mov     sourceByteStride, eax   // save eax
-        mov     sourceEnd, ecx          // save ecx
-        push    ditherGenerator         // pass ditherGenerator parameter on stack
-	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
-	    pop     edx                     // clear parameter off stack
-        mov     ecx, sourceEnd          // restore ecx
-        mov     eax, sourceByteStride   // restore eax
-        */
-
-    // generate dither
-        mov     sourceByteStride, eax   // save eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed1
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     ditherRandSeed1, eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed2
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     edx, ditherRandSeed1
-        shr     edx, PA_DITHER_SHIFT_
-        mov     ditherRandSeed2, eax
-        shr     eax, PA_DITHER_SHIFT_
-        //add     eax, edx                // eax -> current
-        lea     eax, [eax+edx]
-        mov     edx, ditherPrevious
-        neg     edx
-        lea     edx, [eax+edx]          // highpass = current - previous
-        mov     highpassedDither, edx
-        mov     ditherPrevious, eax     // previous = current
-        mov     eax, sourceByteStride   // restore eax
-        fild    highpassedDither
-        fmul    const_float_dither_scale_
-    // end generate dither, dither signal in st(0)
-    
-        faddp   st(1), st(0)            // stack: dither + value*(int scaler), int scaler
-        fistp   dword ptr [edi]         // pop st(0) into dest, stack:  int scaler
-        jmp     Float32_To_Int32_DitherClip_stored
-    
-    Float32_To_Int32_DitherClip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     edx, 0x7FFFFFFF         // convert to maximum range integers
-        mov     dword ptr [edi], edx
-
-    Float32_To_Int32_DitherClip_stored:
-
-        //add     edi, ebx              // increment destination ptr
-        lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int32_DitherClip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-
-    ditherGenerator->previous = ditherPrevious;
-    ditherGenerator->randSeed1 = ditherRandSeed1;
-    ditherGenerator->randSeed2 = ditherRandSeed2;
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    signed long temp;
-
-    (void) ditherGenerator; // unused parameter
-    
-    while( count-- )
-    {
-        // convert to 32 bit and drop the low 8 bits
-        double scaled = *src * 0x7FFFFFFF;
-        temp = (signed long) scaled;
-
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-*/
-
-    short savedFpuControlWord;
-    
-    signed long tempInt32;
-
-    (void) ditherGenerator; /* unused parameter */
-                 
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 3                  // sizeof int24
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int24Scaler_             // stack:  (int)0x7FFFFF
-
-    Float32_To_Int24_loop:
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFF, (int)0x7FFFFF
-        fistp   tempInt32               // pop st(0) into tempInt32, stack:  (int)0x7FFFFF
-        mov     edx, tempInt32
-
-        mov     byte ptr [edi], DL
-        shr     edx, 8
-        //mov     byte ptr [edi+1], DL
-        //mov     byte ptr [edi+2], DH
-        mov     word ptr [edi+1], DX
-
-        //add     edi, ebx                // increment destination ptr
-        lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int24_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    signed long temp;
-
-    (void) ditherGenerator; // unused parameter
-    
-    while( count-- )
-    {
-        // convert to 32 bit and drop the low 8 bits
-        double scaled = *src * 0x7FFFFFFF;
-        PA_CLIP_( scaled, -2147483648., 2147483647.  );
-        temp = (signed long) scaled;
-
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-*/
-
-    short savedFpuControlWord;
-    
-    signed long tempInt32;
-
-    (void) ditherGenerator; /* unused parameter */
-                 
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 3                  // sizeof int24
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int24Scaler_             // stack:  (int)0x7FFFFF
-
-    Float32_To_Int24_Clip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int24_Clip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFFFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFFFF, (int)0x7FFFFF
-        fistp   tempInt32               // pop st(0) into tempInt32, stack:  (int)0x7FFFFF
-        mov     edx, tempInt32
-        jmp     Float32_To_Int24_Clip_store
-    
-    Float32_To_Int24_Clip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     edx, 0x7FFFFF           // convert to maximum range integers
-
-    Float32_To_Int24_Clip_store:
-
-        mov     byte ptr [edi], DL
-        shr     edx, 8
-        //mov     byte ptr [edi+1], DL
-        //mov     byte ptr [edi+2], DH
-        mov     word ptr [edi+1], DX
-
-        //add     edi, ebx                // increment destination ptr
-        lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int24_Clip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int24_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    unsigned char *dest = (unsigned char*)destinationBuffer;
-    signed long temp;
-    
-    while( count-- )
-    {
-        // convert to 32 bit and drop the low 8 bits
-
-        // FIXME: the dither amplitude here appears to be too small by 8 bits
-        double dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        // use smaller scaler to prevent overflow when we add the dither
-        double dithered = ((double)*src * (2147483646.0)) + dither;
-        PA_CLIP_( dithered, -2147483648., 2147483647.  );
-        
-        temp = (signed long) dithered;
-
-        dest[0] = (unsigned char)(temp >> 8);
-        dest[1] = (unsigned char)(temp >> 16);
-        dest[2] = (unsigned char)(temp >> 24);
-
-        src += sourceStride;
-        dest += destinationStride * 3;
-    }
-*/
-
-    short savedFpuControlWord;
-
-    // spill storage:
-    signed long sourceByteStride;
-    signed long highpassedDither;
-
-    // dither state:
-    unsigned long ditherPrevious = ditherGenerator->previous;
-    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
-    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
-    
-    signed long tempInt32;
-                 
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 3                  // sizeof int24
-        mov     ebx, destinationStride
-        imul    ebx, edx
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     ditheredInt24Scaler_    // stack:  int scaler
-
-    Float32_To_Int24_DitherClip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int24_DitherClip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, int scaler
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
-
-    /*
-        // call PaUtil_GenerateFloatTriangularDither with C calling convention
-        mov     sourceByteStride, eax   // save eax
-        mov     sourceEnd, ecx          // save ecx
-        push    ditherGenerator         // pass ditherGenerator parameter on stack
-	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
-	    pop     edx                     // clear parameter off stack
-        mov     ecx, sourceEnd          // restore ecx
-        mov     eax, sourceByteStride   // restore eax
-    */
-    
-    // generate dither
-        mov     sourceByteStride, eax   // save eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed1
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     ditherRandSeed1, eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed2
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     edx, ditherRandSeed1
-        shr     edx, PA_DITHER_SHIFT_
-        mov     ditherRandSeed2, eax
-        shr     eax, PA_DITHER_SHIFT_
-        //add     eax, edx                // eax -> current
-        lea     eax, [eax+edx]
-        mov     edx, ditherPrevious
-        neg     edx
-        lea     edx, [eax+edx]          // highpass = current - previous
-        mov     highpassedDither, edx
-        mov     ditherPrevious, eax     // previous = current
-        mov     eax, sourceByteStride   // restore eax
-        fild    highpassedDither
-        fmul    const_float_dither_scale_
-    // end generate dither, dither signal in st(0)
-
-        faddp   st(1), st(0)            // stack: dither * value*(int scaler), int scaler
-        fistp   tempInt32               // pop st(0) into tempInt32, stack:  int scaler
-        mov     edx, tempInt32
-        jmp     Float32_To_Int24_DitherClip_store
-    
-    Float32_To_Int24_DitherClip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     edx, 0x7FFFFF           // convert to maximum range integers
-
-    Float32_To_Int24_DitherClip_store:
-
-        mov     byte ptr [edi], DL
-        shr     edx, 8
-        //mov     byte ptr [edi+1], DL
-        //mov     byte ptr [edi+2], DH
-        mov     word ptr [edi+1], DX
-
-        //add     edi, ebx                // increment destination ptr
-        lea     edi, [edi+ebx]
-
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int24_DitherClip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-
-    ditherGenerator->previous = ditherPrevious;
-    ditherGenerator->randSeed1 = ditherRandSeed1;
-    ditherGenerator->randSeed2 = ditherRandSeed2;
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    signed short *dest =  (signed short*)destinationBuffer;
-    (void)ditherGenerator; // unused parameter
-
-    while( count-- )
-    {
-
-        short samp = (short) (*src * (32767.0f));
-        *dest = samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-*/
-
-    short savedFpuControlWord;
-   
-    (void) ditherGenerator; /* unused parameter */
-
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx                // source byte stride
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 2                  // sizeof int16
-        mov     ebx, destinationStride
-        imul    ebx, edx                // destination byte stride
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int16Scaler_            // stack:  (int)0x7FFF
-
-    Float32_To_Int16_loop:
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFF, (int)0x7FFF
-        fistp   word ptr [edi]          // store scaled int into dest, stack:  (int)0x7FFF
-
-        add     edi, ebx                // increment destination ptr
-        //lea     edi, [edi+ebx]
-        
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int16_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16_Clip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    signed short *dest =  (signed short*)destinationBuffer;
-    (void)ditherGenerator; // unused parameter
-
-    while( count-- )
-    {
-        long samp = (signed long) (*src * (32767.0f));
-        PA_CLIP_( samp, -0x8000, 0x7FFF );
-        *dest = (signed short) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-*/
-
-    short savedFpuControlWord;
-   
-    (void) ditherGenerator; /* unused parameter */
-
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx                // source byte stride
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 2                  // sizeof int16
-        mov     ebx, destinationStride
-        imul    ebx, edx                // destination byte stride
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     int16Scaler_            // stack:  (int)0x7FFF
-
-    Float32_To_Int16_Clip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int16_Clip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, (int)0x7FFF
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*0x7FFF, (int)0x7FFF
-        fistp   word ptr [edi]          // store scaled int into dest, stack:  (int)0x7FFF
-        jmp     Float32_To_Int16_Clip_stored
-    
-    Float32_To_Int16_Clip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     dx, 0x7FFF              // convert to maximum range integers
-        mov     word ptr [edi], dx      // store clamped into into dest
-
-    Float32_To_Int16_Clip_stored:
-
-        add     edi, ebx                // increment destination ptr
-        //lea     edi, [edi+ebx]
-        
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int16_Clip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-
-static void Float32_To_Int16_DitherClip(
-    void *destinationBuffer, signed int destinationStride,
-    void *sourceBuffer, signed int sourceStride,
-    unsigned int count, PaUtilTriangularDitherGenerator *ditherGenerator )
-{
-/*
-    float *src = (float*)sourceBuffer;
-    signed short *dest =  (signed short*)destinationBuffer;
-    (void)ditherGenerator; // unused parameter
-
-    while( count-- )
-    {
-
-        float dither  = PaUtil_GenerateFloatTriangularDither( ditherGenerator );
-        // use smaller scaler to prevent overflow when we add the dither 
-        float dithered = (*src * (32766.0f)) + dither;
-        signed long samp = (signed long) dithered;
-        PA_CLIP_( samp, -0x8000, 0x7FFF );
-        *dest = (signed short) samp;
-
-        src += sourceStride;
-        dest += destinationStride;
-    }
-*/
-
-    short savedFpuControlWord;
-
-    // spill storage:
-    signed long sourceByteStride;
-    signed long highpassedDither;
-
-    // dither state:
-    unsigned long ditherPrevious = ditherGenerator->previous;
-    unsigned long ditherRandSeed1 = ditherGenerator->randSeed1;
-    unsigned long ditherRandSeed2 = ditherGenerator->randSeed2;
-
-    __asm{
-        // esi -> source ptr
-        // eax -> source byte stride
-        // edi -> destination ptr
-        // ebx -> destination byte stride
-        // ecx -> source end ptr
-        // edx -> temp
-
-        mov     esi, sourceBuffer
-
-        mov     edx, 4                  // sizeof float32
-        mov     eax, sourceStride
-        imul    eax, edx                // source byte stride
-
-        mov     ecx, count
-        imul    ecx, eax
-        add     ecx, esi                // source end ptr = count * source byte stride + source ptr
-
-        mov     edi, destinationBuffer
-
-        mov     edx, 2                  // sizeof int16
-        mov     ebx, destinationStride
-        imul    ebx, edx                // destination byte stride
-
-        fwait
-        fstcw   savedFpuControlWord
-        fldcw   fpuControlWord_
-
-        fld     ditheredInt16Scaler_    // stack:  int scaler
-
-    Float32_To_Int16_DitherClip_loop:
-
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-
-        and     edx, 0x7FFFFFFF         // mask off sign
-        cmp     edx, 0x3F800000         // greater than 1.0 or less than -1.0
-
-        jg      Float32_To_Int16_DitherClip_clamp
-
-        // load unscaled value into st(0)
-        fld     dword ptr [esi]         // stack:  value, int scaler
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        fmul    st(0), st(1)            // st(0) *= st(1), stack:  value*(int scaler), int scaler
-
-        /*
-        // call PaUtil_GenerateFloatTriangularDither with C calling convention
-        mov     sourceByteStride, eax   // save eax
-        mov     sourceEnd, ecx          // save ecx
-        push    ditherGenerator         // pass ditherGenerator parameter on stack
-	    call    PaUtil_GenerateFloatTriangularDither  // stack:  dither, value*(int scaler), int scaler
-	    pop     edx                     // clear parameter off stack
-        mov     ecx, sourceEnd          // restore ecx
-        mov     eax, sourceByteStride   // restore eax
-        */
-
-    // generate dither
-        mov     sourceByteStride, eax   // save eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed1
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     ditherRandSeed1, eax
-        mov     edx, 196314165
-        mov     eax, ditherRandSeed2
-        mul     edx                     // eax:edx = eax * 196314165
-        //add     eax, 907633515
-        lea     eax, [eax+907633515]
-        mov     edx, ditherRandSeed1
-        shr     edx, PA_DITHER_SHIFT_
-        mov     ditherRandSeed2, eax
-        shr     eax, PA_DITHER_SHIFT_
-        //add     eax, edx                // eax -> current
-        lea     eax, [eax+edx]            // current = randSeed1>>x + randSeed2>>x
-        mov     edx, ditherPrevious
-        neg     edx
-        lea     edx, [eax+edx]          // highpass = current - previous
-        mov     highpassedDither, edx
-        mov     ditherPrevious, eax     // previous = current
-        mov     eax, sourceByteStride   // restore eax
-        fild    highpassedDither
-        fmul    const_float_dither_scale_
-    // end generate dither, dither signal in st(0)
-        
-        faddp   st(1), st(0)            // stack: dither * value*(int scaler), int scaler
-        fistp   word ptr [edi]          // store scaled int into dest, stack:  int scaler
-        jmp     Float32_To_Int16_DitherClip_stored
-    
-    Float32_To_Int16_DitherClip_clamp:
-        mov     edx, dword ptr [esi]    // load floating point value into integer register
-        shr     edx, 31                 // move sign bit into bit 0
-        add     esi, eax                // increment source ptr
-        //lea     esi, [esi+eax]
-        add     dx, 0x7FFF              // convert to maximum range integers
-        mov     word ptr [edi], dx      // store clamped into into dest
-
-    Float32_To_Int16_DitherClip_stored:
-
-        add     edi, ebx                // increment destination ptr
-        //lea     edi, [edi+ebx]
-        
-        cmp     esi, ecx                // has src ptr reached end?
-        jne     Float32_To_Int16_DitherClip_loop
-
-        ffree   st(0)
-        fincstp
-
-        fwait
-        fnclex
-        fldcw   savedFpuControlWord
-    }
-
-    ditherGenerator->previous = ditherPrevious;
-    ditherGenerator->randSeed1 = ditherRandSeed1;
-    ditherGenerator->randSeed2 = ditherRandSeed2;
-}
-
-/* -------------------------------------------------------------------------- */
-
-void PaUtil_InitializeX86PlainConverters( void )
-{
-    paConverters.Float32_To_Int32 = Float32_To_Int32;
-    paConverters.Float32_To_Int32_Clip = Float32_To_Int32_Clip;
-    paConverters.Float32_To_Int32_DitherClip = Float32_To_Int32_DitherClip;
-
-    paConverters.Float32_To_Int24 = Float32_To_Int24;
-    paConverters.Float32_To_Int24_Clip = Float32_To_Int24_Clip;
-    paConverters.Float32_To_Int24_DitherClip = Float32_To_Int24_DitherClip;
-    
-    paConverters.Float32_To_Int16 = Float32_To_Int16;
-    paConverters.Float32_To_Int16_Clip = Float32_To_Int16_Clip;
-    paConverters.Float32_To_Int16_DitherClip = Float32_To_Int16_DitherClip;
-}
-
-#endif
-
-/* -------------------------------------------------------------------------- */
diff --git a/libs/portaudio/src/os/win/pa_x86_plain_converters.h b/libs/portaudio/src/os/win/pa_x86_plain_converters.h
deleted file mode 100644
index 96b41b8570..0000000000
--- a/libs/portaudio/src/os/win/pa_x86_plain_converters.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Plain Intel IA32 assembly implementations of PortAudio sample converter functions.
- * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-/** @file
- @ingroup win_src
-*/
-
-#ifndef PA_X86_PLAIN_CONVERTERS_H
-#define PA_X86_PLAIN_CONVERTERS_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-/**
- @brief Install optimised converter functions suitable for all IA32 processors
-
- It is recommended to call PaUtil_InitializeX86PlainConverters prior to calling Pa_Initialize
-*/
-void PaUtil_InitializeX86PlainConverters( void );
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* PA_X86_PLAIN_CONVERTERS_H */
diff --git a/libs/portaudio/test/README.txt b/libs/portaudio/test/README.txt
deleted file mode 100644
index f3a0b82264..0000000000
--- a/libs/portaudio/test/README.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-This directory contains various programs to test PortAudio. The files 
-named patest_* are tests, the files named debug_* are just scratch 
-files that may or may not work.
-
-All following tests are up to date with the V19 API. They should all compile
-(without any warnings on GCC 3.3). Note that this does not necissarily mean that 
-the tests pass, just that they compile.
-
-    x- paqa_devs.c 
-    x- paqa_errs.c   (needs reviewing)
-    x- patest1.c
-    x- patest_buffer.c
-    x- patest_callbackstop.c
-    x- patest_clip.c (last test fails, dither doesn't currently force clip in V19)
-    x- patest_dither.c
-    x- patest_hang.c
-    x- patest_latency.c
-    x- patest_leftright.c
-    x- patest_longsine.c
-    x- patest_many.c
-    x- patest_maxsines.c
-	o- patest_mono.c
-    x- patest_multi_sine.c
-    x- patest_pink.c
-    x- patest_prime.c
-    x- patest_read_record.c
-    x- patest_record.c
-    x- patest_ringmix.c
-    x- patest_saw.c
-    x- patest_sine.c
-    x- patest_sine8.c
-    x- patest_sine_formats.c
-    x- patest_sine_time.c
-    x- patest_start_stop.c
-    x- patest_stop.c
-    x- patest_sync.c
-    x- patest_toomanysines.c
-	o- patest_two_rates.c
-    x- patest_underflow.c
-    x- patest_wire.c
-    x- patest_write_sine.c
-    x- pa_devs.c
-    x- pa_fuzz.c
-    x- pa_minlat.c
-
-The debug_ files are still in V18 format and may need some V19 adaption.
-Feel free to fix them, most simply require adjusting to the new API.
-
-o- pa_tests/debug_convert.c
-o- pa_tests/debug_dither_calc.c
-o- pa_tests/debug_dual.c
-o- pa_tests/debug_multi_in.c
-o- pa_tests/debug_multi_out.c
-o- pa_tests/debug_record.c
-o- pa_tests/debug_record_reuse.c
-o- pa_tests/debug_sine.c
-o- pa_tests/debug_sine_amp.c
-o- pa_tests/debug_sine_formats.c
-o- pa_tests/debug_srate.c
-o- pa_tests/debug_test1.c
diff --git a/libs/portaudio/test/debug_convert.c b/libs/portaudio/test/debug_convert.c
deleted file mode 100644
index 7ae38897c7..0000000000
--- a/libs/portaudio/test/debug_convert.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * $Id: debug_convert.c 1083 2006-08-23 07:30:49Z rossb $
- * Convert tagged values.
- *
- * Author: Phil Burk <philburk@softsynth.com>
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-//#define OUTPUT_DEVICE       (11)
-#define NUM_SECONDS         (8)
-#define SLEEP_DUR           (800)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-
-#define NUM_BUFFERS         (0)
-
-typedef struct
-{
-    unsigned int framesToGo;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    short *out = (short*)outputBuffer;
-    int i;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    if( data->framesToGo < framesPerBuffer )  finished = 1;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = 0x0000 + i;  /* left */
-        *out++ = 0x1000 + i;  /* right */
-    }
-    return finished;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int totalSamps;
-    printf("PortAudio Test: output debug values\n" );
-    data.framesToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    printf("totalSamps = %d\n", totalSamps );
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    printf("PortAudio Test: output device = %d\n", OUTPUT_DEVICE );
-    
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice,
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              2,              /* stereo output */
-              paInt16,      /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              NUM_BUFFERS,    /* number of buffers, if zero then use default minimum */
-              paClipOff|paDitherOff, /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Is callback being called?\n");
-    for( i=0; i<((NUM_SECONDS+1)*1000); i+=SLEEP_DUR )
-    {
-        printf("data.framesToGo = %d\n", data.framesToGo ); fflush(stdout);
-        Pa_Sleep( SLEEP_DUR );
-    }
-    /* Stop sound until ENTER hit. */
-    printf("Call Pa_StopStream()\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_dither_calc.c b/libs/portaudio/test/debug_dither_calc.c
deleted file mode 100644
index 96ae1a02b7..0000000000
--- a/libs/portaudio/test/debug_dither_calc.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $Id: debug_dither_calc.c 1083 2006-08-23 07:30:49Z rossb $
- * Test Dither calculations.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_host.h"
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    long max,min;
-    int   i;
-    
-    for( i=0; i<10000; i++ )
-    {
-        long dither = PaConvert_TriangularDither();
-        // printf("dither = 0x%08X\n", dither );
-        if( dither < min ) min = dither;
-        else if( dither > max ) max = dither;
-    }
-    printf("min = 0x%08X = %d, max = 0x%08X = %d\n", min, min, max, max );
-}
diff --git a/libs/portaudio/test/debug_dual.c b/libs/portaudio/test/debug_dual.c
deleted file mode 100644
index 0861e1dd55..0000000000
--- a/libs/portaudio/test/debug_dual.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * $Id: debug_dual.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_dual.c
- * Try to open TWO streams on separate cards.
- * Play a sine sweep using the Portable Audio api for several seconds.
- * Hacked test for debugging PA.
- *
- * Author: Phil Burk <philburk@softsynth.com>
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#define DEV_ID_1            (13)
-#define DEV_ID_2            (15)
-#define NUM_SECONDS         (8)
-#define SLEEP_DUR           (800)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-#if 0
-#define MIN_LATENCY_MSEC    (200)
-#define NUM_BUFFERS         ((MIN_LATENCY_MSEC * SAMPLE_RATE) / (FRAMES_PER_BUFFER * 1000))
-#else
-#define NUM_BUFFERS         (0)
-#endif
-#define MIN_FREQ            (100.0f)
-#define MAX_FREQ            (4000.0f)
-#define FREQ_SCALAR         (1.00002f)
-#define CalcPhaseIncrement(freq)  (freq/SAMPLE_RATE)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (400)
-typedef struct
-{
-    float sine[TABLE_SIZE + 1]; // add one for guard point for interpolation
-    float phase_increment;
-    float left_phase;
-    float right_phase;
-}
-paTestData;
-/* Convert phase between and 1.0 to sine value
- * using linear interpolation.
- */
-float LookupSine( paTestData *data, float phase );
-float LookupSine( paTestData *data, float phase )
-{
-    float fIndex = phase*TABLE_SIZE;
-    int   index = (int) fIndex;
-    float fract = fIndex - index;
-    float lo = data->sine[index];
-    float hi = data->sine[index+1];
-    float val = lo + fract*(hi-lo);
-    return val;
-}
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = LookupSine(data, data->left_phase);  /* left */
-        *out++ = LookupSine(data, data->right_phase);  /* right */
-        data->left_phase += data->phase_increment;
-        if( data->left_phase >= 1.0f ) data->left_phase -= 1.0f;
-        data->right_phase += (data->phase_increment * 1.5f); /* fifth above */
-        if( data->right_phase >= 1.0f ) data->right_phase -= 1.0f;
-        /* sweep frequency then start over. */
-        data->phase_increment *= FREQ_SCALAR;
-        if( data->phase_increment > CalcPhaseIncrement(MAX_FREQ) ) data->phase_increment = CalcPhaseIncrement(MIN_FREQ);
-    }
-    return 0;
-}
-
-PaError TestStart( PortAudioStream **streamPtr, PaDeviceID devID,
-                   paTestData *data );
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream1, *stream2;
-    PaError err;
-    paTestData DATA1, DATA2;
-    printf("PortAudio Test: DUAL sine sweep. ask for %d buffers\n", NUM_BUFFERS );
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    err = TestStart( &stream1, DEV_ID_1, &DATA1 );
-    if( err != paNoError ) goto error;
-    err = TestStart( &stream2, DEV_ID_2, &DATA2 );
-    if( err != paNoError ) goto error;
-    printf("Hit ENTER\n");
-    getchar();
-    err = Pa_StopStream( stream1 );
-    if( err != paNoError ) goto error;
-    err = Pa_StopStream( stream2 );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
-PaError TestStart( PortAudioStream **streamPtr, PaDeviceID devID, paTestData *data )
-{
-    PortAudioStream *stream;
-    PaError err;
-    int i;
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data->sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data->sine[TABLE_SIZE] = data->sine[0]; // set guard point
-    data->left_phase = data->right_phase = 0.0;
-    data->phase_increment = CalcPhaseIncrement(MIN_FREQ);
-    printf("PortAudio Test: output device = %d\n", devID );
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice,
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              devID,
-              2,              /* stereo output */
-              paFloat32,      /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              NUM_BUFFERS,    /* number of buffers, if zero then use default minimum */
-              paClipOff|paDitherOff, /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              data );
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    *streamPtr = stream;
-    return 0;
-error:
-    return err;
-}
diff --git a/libs/portaudio/test/debug_multi_in.c b/libs/portaudio/test/debug_multi_in.c
deleted file mode 100644
index 521bf926eb..0000000000
--- a/libs/portaudio/test/debug_multi_in.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * $Id: debug_multi_in.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_multi_in.c
- * Pass output from each of multiple channels
- * to a stereo output using the Portable Audio api.
- * Hacked test for debugging PA.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include "portaudio.h"
-//#define INPUT_DEVICE_NAME   ("EWS88 MT Interleaved Rec")
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-//#define OUTPUT_DEVICE       (18)
-#define SAMPLE_RATE         (22050)
-#define FRAMES_PER_BUFFER   (256)
-#define MIN_LATENCY_MSEC    (400)
-#define NUM_BUFFERS         ((MIN_LATENCY_MSEC * SAMPLE_RATE) / (FRAMES_PER_BUFFER * 1000))
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-typedef struct
-{
-    int      liveChannel;
-    int      numChannels;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    float *in = (float*)inputBuffer;
-    int i;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    if( in == NULL ) return 0;
-    for( i=0; i<(int)framesPerBuffer; i++ )
-    {
-        /* Copy one channel of input to output. */
-        *out++ = in[data->liveChannel];
-        *out++ = in[data->liveChannel];
-        in += data->numChannels;
-    }
-    return 0;
-}
-/*******************************************************************/
-int PaFindDeviceByName( const char *name )
-{
-    int   i;
-    int   numDevices;
-    const PaDeviceInfo *pdi;
-    int   len = strlen( name );
-    PaDeviceID   result = paNoDevice;
-    numDevices = Pa_CountDevices();
-    for( i=0; i<numDevices; i++ )
-    {
-        pdi = Pa_GetDeviceInfo( i );
-        if( strncmp( name, pdi->name, len ) == 0 )
-        {
-            result = i;
-            break;
-        }
-    }
-    return result;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    PaDeviceID inputDevice;
-    const PaDeviceInfo *pdi;
-    printf("PortAudio Test: input signal from each channel. %d buffers\n", NUM_BUFFERS );
-    data.liveChannel = 0;
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-#ifdef INPUT_DEVICE_NAME
-    printf("Try to use device: %s\n", INPUT_DEVICE_NAME );
-    inputDevice = PaFindDeviceByName(INPUT_DEVICE_NAME);
-    if( inputDevice == paNoDevice )
-    {
-        printf("Could not find %s. Using default instead.\n", INPUT_DEVICE_NAME );
-        inputDevice = Pa_GetDefaultInputDeviceID();
-    }
-#else
-    printf("Using default input device.\n");
-    inputDevice = Pa_GetDefaultInputDeviceID();
-#endif
-    pdi = Pa_GetDeviceInfo( inputDevice );
-    if( pdi == NULL )
-    {
-        printf("Could not get device info!\n");
-        goto error;
-    }
-    data.numChannels = pdi->maxInputChannels;
-    printf("Input Device name is %s\n", pdi->name );
-    printf("Input Device has %d channels.\n", pdi->maxInputChannels);
-    err = Pa_OpenStream(
-              &stream,
-              inputDevice,
-              pdi->maxInputChannels,
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              2,
-              paFloat32,  /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,  /* frames per buffer */
-              NUM_BUFFERS,    /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-    data.liveChannel = 0;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    for( i=0; i<data.numChannels; i++ )
-    {
-        data.liveChannel = i;
-        printf("Channel %d being sent to output. Hit ENTER for next channel.", i );
-        fflush(stdout);
-        getchar();
-    }
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_multi_out.c b/libs/portaudio/test/debug_multi_out.c
deleted file mode 100644
index 76fafae8f3..0000000000
--- a/libs/portaudio/test/debug_multi_out.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * $Id: debug_multi_out.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_multi_out.c
- * Play a different sine wave on each channels,
- * using the Portable Audio api.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-#define FREQ_INCR           (300.0 / SAMPLE_RATE)
-#define MAX_CHANNELS        (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-typedef struct
-{
-    int      numChannels;
-    double   phases[MAX_CHANNELS];
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    int frameIndex, channelIndex;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
-    {
-        for( channelIndex=0; channelIndex<data->numChannels; channelIndex++ )
-        {
-            /* Output sine wave on every channel. */
-            *out++ = (float) sin(data->phases[channelIndex]);
-
-            /* Play each channel at a higher frequency. */
-            data->phases[channelIndex] += FREQ_INCR * (4 + channelIndex);
-            if( data->phases[channelIndex] >= (2.0 * M_PI) ) data->phases[channelIndex] -= (2.0 * M_PI);
-        }
-    }
-
-    return 0;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream;
-    PaError err;
-    const PaDeviceInfo *pdi;
-    paTestData data = {0};
-    printf("PortAudio Test: output sine wave on each channel.\n" );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    pdi = Pa_GetDeviceInfo( OUTPUT_DEVICE );
-    data.numChannels = pdi->maxOutputChannels;
-    if( data.numChannels > MAX_CHANNELS ) data.numChannels = MAX_CHANNELS;
-    printf("Number of Channels = %d\n", data.numChannels );
-    
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice, /* default input device */
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              data.numChannels,
-              paFloat32,  /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,  /* frames per buffer */
-              0,    /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Hit ENTER to stop sound.\n");
-    fflush(stdout);
-    getchar();
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_CloseStream( stream );
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_record.c b/libs/portaudio/test/debug_record.c
deleted file mode 100644
index b21f165af5..0000000000
--- a/libs/portaudio/test/debug_record.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * $Id: debug_record.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_record.c
- * Record input into an array.
- * Save array to a file.
- * Based on patest_record.c but with various ugly debug hacks thrown in.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include "portaudio.h"
-#define SAMPLE_RATE     (22050)
-#define NUM_SECONDS     (10)
-#define SLEEP_DUR_MSEC  (200)
-#define FRAMES_PER_BUFFER  (1<<10)
-#define NUM_REC_BUFS    (0)
-
-#if 1
-#define PA_SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#else
-#define PA_SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#endif
-
-typedef struct
-{
-    long         frameIndex;  /* Index into sample array. */
-    long         maxFrameIndex;
-    long         samplesPerFrame;
-    long         numSamples;
-    SAMPLE      *recordedSamples;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int recordCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE *rptr = (SAMPLE*)inputBuffer;
-    SAMPLE *wptr = &data->recordedSamples[data->frameIndex * data->samplesPerFrame];
-    long framesToCalc;
-    unsigned long i;
-    int finished;
-    unsigned long framesLeft = data->maxFrameIndex - data->frameIndex;
-
-    (void) outputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        framesToCalc = framesLeft;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        finished = 0;
-    }
-    if( inputBuffer == NULL )
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = 0;  /* left */
-            *wptr++ = 0;  /* right */
-        }
-    }
-    else
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-    }
-    data->frameIndex += framesToCalc;
-    return finished;
-}
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int playCallback( void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE *rptr = &data->recordedSamples[data->frameIndex * data->samplesPerFrame];
-    SAMPLE *wptr = (SAMPLE*)outputBuffer;
-    unsigned long i;
-    int finished;
-    unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
-    if( outputBuffer == NULL ) return 0;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        /* final buffer... */
-        for( i=0; i<framesLeft; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-        for( ; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = 0;  /* left */
-            *wptr++ = 0;  /* right */
-        }
-        data->frameIndex += framesLeft;
-        finished = 1;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-        data->frameIndex += framesPerBuffer;
-        finished = 0;
-    }
-    return finished;
-}
-
-/****************************************************************/
-PaError TestRecording( paTestData *dataPtr )
-{
-    PortAudioStream *stream;
-    PaError    err;
-    int        i;
-
-    /* Record some audio. */
-    err = Pa_OpenStream(
-              &stream,
-              Pa_GetDefaultInputDeviceID(),
-              dataPtr->samplesPerFrame,               /* stereo input */
-              PA_SAMPLE_TYPE,
-              NULL,
-              paNoDevice,
-              0,
-              PA_SAMPLE_TYPE,
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              NUM_REC_BUFS,               /* number of buffers, if zero then use default minimum */
-              paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-              recordCallback,
-              dataPtr );
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Now recording!\n"); fflush(stdout);
-    for( i=0; i<(NUM_SECONDS*1000/SLEEP_DUR_MSEC); i++ )
-    {
-        if( Pa_StreamActive( stream ) <= 0)
-        {
-            printf("Stream inactive!\n");
-            break;
-        }
-        if( dataPtr->maxFrameIndex <= dataPtr->frameIndex )
-        {
-            printf("Buffer recording complete.\n");
-            break;
-        }
-        Pa_Sleep(100);
-        printf("index = %d\n", dataPtr->frameIndex ); fflush(stdout);
-    }
-
-    printf("Finished loop. Close stream.\n"); fflush(stdout);
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Done.\n"); fflush(stdout);
-    {
-        SAMPLE max = 0;
-        SAMPLE posVal;
-        int i;
-        for( i=0; i<dataPtr->numSamples; i++ )
-        {
-            posVal = dataPtr->recordedSamples[i];
-            if( posVal < 0 ) posVal = -posVal;
-            if( posVal > max ) max = posVal;
-        }
-        printf("Largest recorded sample = %d\n", max );
-    }
-    /* Write recorded data to a file. */
-#if 0
-    {
-        FILE  *fid;
-        fid = fopen("recorded.raw", "wb");
-        if( fid == NULL )
-        {
-            printf("Could not open file.");
-        }
-        else
-        {
-            fwrite( dataPtr->recordedSamples, dataPtr->samplesPerFrame * sizeof(SAMPLE), totalFrames, fid );
-            fclose( fid );
-            printf("Wrote data to 'recorded.raw'\n");
-        }
-    }
-#endif
-
-error:
-    return err;
-}
-
-/****************************************************************/
-PaError TestPlayback( paTestData *dataPtr )
-{
-    PortAudioStream *stream;
-    PaError    err;
-    int        i;
-
-    /* Playback recorded data. */
-    dataPtr->frameIndex = 0;
-    printf("Begin playback.\n"); fflush(stdout);
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice,
-              0,               /* NO input */
-              PA_SAMPLE_TYPE,
-              NULL,
-              Pa_GetDefaultOutputDeviceID(),
-              dataPtr->samplesPerFrame,               /* stereo output */
-              PA_SAMPLE_TYPE,
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              0,               /* number of buffers, if zero then use default minimum */
-              paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-              playCallback,
-              dataPtr );
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Waiting for playback to finish.\n"); fflush(stdout);
-    for( i=0; i<(NUM_SECONDS*1000/SLEEP_DUR_MSEC); i++ )
-    {
-        Pa_Sleep(100);
-        printf("index = %d\n", dataPtr->frameIndex );
-    }
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-error:
-    return err;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError    err;
-    paTestData data;
-    long       totalFrames;
-    long       numBytes;
-    long       i;
-    printf("patest_record.c\n"); fflush(stdout);
-
-    data.frameIndex = 0;
-    data.samplesPerFrame = 2;
-    data.maxFrameIndex = totalFrames = NUM_SECONDS*SAMPLE_RATE;
-
-    printf("totalFrames = %d\n", totalFrames ); fflush(stdout);
-    data.numSamples = totalFrames * data.samplesPerFrame;
-
-    numBytes = data.numSamples * sizeof(SAMPLE);
-    data.recordedSamples = (SAMPLE *) malloc( numBytes );
-    if( data.recordedSamples == NULL )
-    {
-        printf("Could not allocate record array.\n");
-        exit(1);
-    }
-    for( i=0; i<data.numSamples; i++ ) data.recordedSamples[i] = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    for( i=0; i<2; i++ )
-    {
-        err = TestRecording( &data );
-        if( err != paNoError ) goto error;
-
-        err = TestPlayback( &data );
-        if( err != paNoError ) goto error;
-    }
-
-    free( data.recordedSamples );
-    Pa_Terminate();
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    if( err == paHostError )
-    {
-        fprintf( stderr, "Host Error number: %d\n", Pa_GetHostError() );
-    }
-    return -1;
-}
diff --git a/libs/portaudio/test/debug_record_reuse.c b/libs/portaudio/test/debug_record_reuse.c
deleted file mode 100644
index 8c0310095e..0000000000
--- a/libs/portaudio/test/debug_record_reuse.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * $Id: debug_record_reuse.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_record_reuse.c
- * Record input into an array.
- * Save array to a file.
- * Based on patest_record.c but with various ugly debug hacks thrown in.
- * Loop twice and reuse same streams.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include "portaudio.h"
-#define SAMPLE_RATE     (22050)
-#define NUM_SECONDS     (4)
-#define SLEEP_DUR_MSEC  (200)
-#define FRAMES_PER_BUFFER  (256)
-#define NUM_REC_BUFS    (0)
-
-#if 1
-#define PA_SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#else
-#define PA_SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#endif
-
-typedef struct
-{
-    long         frameIndex;  /* Index into sample array. */
-    long         maxFrameIndex;
-    long         samplesPerFrame;
-    long         numSamples;
-    PortAudioStream *outputStream;
-    PortAudioStream *inputStream;
-    SAMPLE      *recordedSamples;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int recordCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE *rptr = (SAMPLE*)inputBuffer;
-    SAMPLE *wptr = &data->recordedSamples[data->frameIndex * data->samplesPerFrame];
-    long framesToCalc;
-    unsigned long i;
-    int finished;
-    unsigned long framesLeft = data->maxFrameIndex - data->frameIndex;
-
-    (void) outputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        framesToCalc = framesLeft;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        finished = 0;
-    }
-    if( inputBuffer == NULL )
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = 0;  /* left */
-            *wptr++ = 0;  /* right */
-        }
-    }
-    else
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-    }
-    data->frameIndex += framesToCalc;
-    return finished;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int playCallback( void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE *rptr = &data->recordedSamples[data->frameIndex * data->samplesPerFrame];
-    SAMPLE *wptr = (SAMPLE*)outputBuffer;
-    unsigned long i;
-    int finished;
-    unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
-    if( outputBuffer == NULL ) return 0;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        /* final buffer... */
-        for( i=0; i<framesLeft; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-        for( ; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = 0;  /* left */
-            *wptr++ = 0;  /* right */
-        }
-        data->frameIndex += framesLeft;
-        finished = 1;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            *wptr++ = *rptr++;  /* right */
-        }
-        data->frameIndex += framesPerBuffer;
-        finished = 0;
-    }
-    return finished;
-}
-
-/****************************************************************/
-PaError TestRecording( paTestData *dataPtr )
-{
-    PaError    err;
-    int        i;
-    int        lastIndex = 0;
-
-/* Open input stream if not already open. */
-    if( dataPtr->inputStream == NULL )
-    {
-        /* Record some audio. */
-        err = Pa_OpenStream(
-                  &dataPtr->inputStream,
-                  Pa_GetDefaultInputDeviceID(),
-                  dataPtr->samplesPerFrame,               /* stereo input */
-                  PA_SAMPLE_TYPE,
-                  NULL,
-                  paNoDevice,
-                  0,
-                  PA_SAMPLE_TYPE,
-                  NULL,
-                  SAMPLE_RATE,
-                  FRAMES_PER_BUFFER,            /* frames per buffer */
-                  NUM_REC_BUFS,               /* number of buffers, if zero then use default minimum */
-                  paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-                  recordCallback,
-                  dataPtr );
-        if( err != paNoError ) goto error;
-    }
-
-    dataPtr->frameIndex = 0;
-
-    err = Pa_StartStream( dataPtr->inputStream );
-    if( err != paNoError ) goto error;
-
-    printf("Now recording!\n"); fflush(stdout);
-    for( i=0; i<(NUM_SECONDS*1000/SLEEP_DUR_MSEC); i++ )
-    {
-        int frameIndex, delta;
-        Pa_Sleep(SLEEP_DUR_MSEC);
-
-        frameIndex = dataPtr->frameIndex;
-        if( Pa_StreamActive( dataPtr->inputStream ) <= 0)
-        {
-            printf("Stream inactive!\n");
-            break;
-        }
-        if( dataPtr->maxFrameIndex <= frameIndex )
-        {
-            printf("Buffer recording complete.\n");
-            break;
-        }
-
-        delta = frameIndex - lastIndex;
-        lastIndex = frameIndex;
-        printf("index = %d, delta = %d\n", frameIndex, delta ); fflush(stdout);
-    }
-
-    err = Pa_StopStream( dataPtr->inputStream );
-    if( err != paNoError ) goto error;
-
-    printf("Done.\n"); fflush(stdout);
-
-error:
-    return err;
-}
-
-/****************************************************************/
-PaError TestPlayback( paTestData *dataPtr )
-{
-    PaError    err;
-    int        i;
-    int        lastIndex = 0;
-
-    /* Playback recorded data. */
-    dataPtr->frameIndex = 0;
-    printf("Begin playback.\n"); fflush(stdout);
-
-/* Open output stream if not already open. */
-    if( dataPtr->outputStream == NULL )
-    {
-        err = Pa_OpenStream(
-                  &dataPtr->outputStream,
-                  paNoDevice,
-                  0,               /* NO input */
-                  PA_SAMPLE_TYPE,
-                  NULL,
-                  Pa_GetDefaultOutputDeviceID(),
-                  dataPtr->samplesPerFrame,               /* stereo output */
-                  PA_SAMPLE_TYPE,
-                  NULL,
-                  SAMPLE_RATE,
-                  FRAMES_PER_BUFFER,            /* frames per buffer */
-                  0,               /* number of buffers, if zero then use default minimum */
-                  paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-                  playCallback,
-                  dataPtr );
-        if( err != paNoError ) goto error;
-    }
-
-    err = Pa_StartStream( dataPtr->outputStream );
-    if( err != paNoError ) goto error;
-
-    printf("Waiting for playback to finish.\n"); fflush(stdout);
-    for( i=0; i<(NUM_SECONDS*1000/SLEEP_DUR_MSEC); i++ )
-    {
-        int frameIndex, delta;
-        Pa_Sleep(SLEEP_DUR_MSEC);
-        frameIndex = dataPtr->frameIndex;
-        delta = frameIndex - lastIndex;
-        lastIndex = frameIndex;
-        printf("index = %d, delta = %d\n", frameIndex, delta ); fflush(stdout);
-    }
-
-    err = Pa_StopStream( dataPtr->outputStream );
-    if( err != paNoError ) goto error;
-    
-error:
-    return err;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError    err;
-    paTestData data = { 0 };
-    long       totalFrames;
-    long       numBytes;
-    long       i;
-    printf("patest_record.c\n"); fflush(stdout);
-
-/* Set up test data structure and sample array. */
-    data.frameIndex = 0;
-    data.samplesPerFrame = 2;
-    data.maxFrameIndex = totalFrames = NUM_SECONDS*SAMPLE_RATE;
-
-    printf("totalFrames = %d\n", totalFrames ); fflush(stdout);
-    data.numSamples = totalFrames * data.samplesPerFrame;
-
-    numBytes = data.numSamples * sizeof(SAMPLE);
-    data.recordedSamples = (SAMPLE *) malloc( numBytes );
-    if( data.recordedSamples == NULL )
-    {
-        printf("Could not allocate record array.\n");
-        exit(1);
-    }
-    for( i=0; i<data.numSamples; i++ ) data.recordedSamples[i] = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-/* Record and playback multiple times. */
-    for( i=0; i<2; i++ )
-    {
-        err = TestRecording( &data );
-        if( err != paNoError ) goto error;
-
-        err = TestPlayback( &data );
-        if( err != paNoError ) goto error;
-    }
-
-/* Clean up. */
-    err = Pa_CloseStream( data.inputStream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( data.outputStream );
-    if( err != paNoError ) goto error;
-
-    if( err != paNoError ) goto error;
-
-    free( data.recordedSamples );
-    Pa_Terminate();
-    
-    printf("Test complete.\n"); fflush(stdout);
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    if( err == paHostError )
-    {
-        fprintf( stderr, "Host Error number: %d\n", Pa_GetHostError() );
-    }
-    return -1;
-}
diff --git a/libs/portaudio/test/debug_sine.c b/libs/portaudio/test/debug_sine.c
deleted file mode 100644
index f7e00135d6..0000000000
--- a/libs/portaudio/test/debug_sine.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * $Id: debug_sine.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_sine.c
- * Play a sine sweep using the Portable Audio api for several seconds.
- * Hacked test for debugging PA.
- *
- * Author: Phil Burk <philburk@softsynth.com>
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-//#define OUTPUT_DEVICE       (11)
-#define NUM_SECONDS         (8)
-#define SLEEP_DUR           (800)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-#if 0
-#define MIN_LATENCY_MSEC    (200)
-#define NUM_BUFFERS         ((MIN_LATENCY_MSEC * SAMPLE_RATE) / (FRAMES_PER_BUFFER * 1000))
-#else
-#define NUM_BUFFERS         (0)
-#endif
-#define MIN_FREQ            (100.0f)
-#define MAX_FREQ            (4000.0f)
-#define FREQ_SCALAR         (1.00002f)
-#define CalcPhaseIncrement(freq)  (freq/SAMPLE_RATE)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (400)
-typedef struct
-{
-    float sine[TABLE_SIZE + 1]; // add one for guard point for interpolation
-    float phase_increment;
-    float left_phase;
-    float right_phase;
-    unsigned int framesToGo;
-}
-paTestData;
-/* Convert phase between and 1.0 to sine value
- * using linear interpolation.
- */
-float LookupSine( paTestData *data, float phase );
-float LookupSine( paTestData *data, float phase )
-{
-    float fIndex = phase*TABLE_SIZE;
-    int   index = (int) fIndex;
-    float fract = fIndex - index;
-    float lo = data->sine[index];
-    float hi = data->sine[index+1];
-    float val = lo + fract*(hi-lo);
-    return val;
-}
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    int      framesToCalc;
-    int i;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    if( data->framesToGo < framesPerBuffer )
-    {
-        framesToCalc = data->framesToGo;
-        data->framesToGo = 0;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        data->framesToGo -= framesPerBuffer;
-    }
-
-    for( i=0; i<framesToCalc; i++ )
-    {
-        *out++ = LookupSine(data, data->left_phase);  /* left */
-        *out++ = LookupSine(data, data->right_phase);  /* right */
-        data->left_phase += data->phase_increment;
-        if( data->left_phase >= 1.0f ) data->left_phase -= 1.0f;
-        data->right_phase += (data->phase_increment * 1.5f); /* fifth above */
-        if( data->right_phase >= 1.0f ) data->right_phase -= 1.0f;
-        /* sweep frequency then start over. */
-        data->phase_increment *= FREQ_SCALAR;
-        if( data->phase_increment > CalcPhaseIncrement(MAX_FREQ) ) data->phase_increment = CalcPhaseIncrement(MIN_FREQ);
-    }
-    /* zero remainder of final buffer */
-    for( ; i<(int)framesPerBuffer; i++ )
-    {
-        *out++ = 0; /* left */
-        *out++ = 0; /* right */
-    }
-    return finished;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int totalSamps;
-    printf("PortAudio Test: output sine sweep. ask for %d buffers\n", NUM_BUFFERS );
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.sine[TABLE_SIZE] = data.sine[0]; // set guard point
-    data.left_phase = data.right_phase = 0.0;
-    data.phase_increment = CalcPhaseIncrement(MIN_FREQ);
-    data.framesToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    printf("totalSamps = %d\n", totalSamps );
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    printf("PortAudio Test: output device = %d\n", OUTPUT_DEVICE );
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice,
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              2,              /* stereo output */
-              paFloat32,      /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              NUM_BUFFERS,    /* number of buffers, if zero then use default minimum */
-              paClipOff|paDitherOff, /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Is callback being called?\n");
-    for( i=0; i<((NUM_SECONDS+1)*1000); i+=SLEEP_DUR )
-    {
-        printf("data.framesToGo = %d\n", data.framesToGo ); fflush(stdout);
-        Pa_Sleep( SLEEP_DUR );
-    }
-    /* Stop sound until ENTER hit. */
-    printf("Call Pa_StopStream()\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_sine_amp.c b/libs/portaudio/test/debug_sine_amp.c
deleted file mode 100644
index c374ac7f52..0000000000
--- a/libs/portaudio/test/debug_sine_amp.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * $Id: debug_sine_amp.c 1083 2006-08-23 07:30:49Z rossb $
- * Play a different sine wave on each channels,
- * using the Portable Audio api.
- * Allos amplitude to be set interactively.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-#define FREQ_INCR           (300.0 / SAMPLE_RATE)
-#define MAX_CHANNELS        (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-typedef struct
-{
-    int      numChannels;
-    double   phases[MAX_CHANNELS];
-    float    amplitude;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    int frameIndex, channelIndex;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
-    {
-        for( channelIndex=0; channelIndex<data->numChannels; channelIndex++ )
-        {
-            /* Output sine wave on every channel. */
-            *out++ = (float) ( data->amplitude * sin(data->phases[channelIndex]) );
-
-            /* Play each channel at a higher frequency. */
-            data->phases[channelIndex] += FREQ_INCR * (4 + channelIndex);
-            if( data->phases[channelIndex] >= (2.0 * M_PI) ) data->phases[channelIndex] -= (2.0 * M_PI);
-        }
-    }
-
-    return 0;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    char  pad[256];
-    PortAudioStream *stream;
-    PaError err;
-    const PaDeviceInfo *pdi;
-    paTestData data = {0};
-    printf("PortAudio Test: output sine wave on each channel.\n" );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    pdi = Pa_GetDeviceInfo( OUTPUT_DEVICE );
-    data.numChannels = pdi->maxOutputChannels;
-    if( data.numChannels > MAX_CHANNELS ) data.numChannels = MAX_CHANNELS;
-    printf("Number of Channels = %d\n", data.numChannels );
-    data.amplitude = 1.0;
-    
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice, /* default input device */
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              data.numChannels,
-              paFloat32,  /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,  /* frames per buffer */
-              0,    /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    do
-    {
-        printf("Current amplitude = %f\n", data.amplitude );
-        printf("Enter new amplitude or 'q' to quit.\n");
-        fflush(stdout);
-        gets( pad );
-        if( pad[0] != 'q' )
-        {
-        // I tried to use atof but it seems to be broken on Mac OS X 10.1
-            float amp;
-            sscanf( pad, "%f", &amp );
-            data.amplitude = amp;
-        }
-    } while( pad[0] != 'q' );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_CloseStream( stream );
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_sine_formats.c b/libs/portaudio/test/debug_sine_formats.c
deleted file mode 100644
index 272294a289..0000000000
--- a/libs/portaudio/test/debug_sine_formats.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * $Id: debug_sine_formats.c 1083 2006-08-23 07:30:49Z rossb $
- * patest_sine_formats.c
- * Play a sine wave using the Portable Audio api for several seconds.
- * Test various data formats.
- *
- * Author: Phil Burk
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS        (10)
-#define SAMPLE_RATE        (44100)
-#define FRAMES_PER_BUFFER  (256)
-
-#define LEFT_FREQ          (SAMPLE_RATE/512.0)  /* So we hit 1.0 */
-#define RIGHT_FREQ         (500.0)
-
-#define AMPLITUDE          (1.0)
-
-/* Select ONE format for testing. */
-#define TEST_UINT8    (1)
-#define TEST_INT8     (0)
-#define TEST_INT16    (0)
-#define TEST_FLOAT32  (0)
-
-#if TEST_UINT8
-#define TEST_FORMAT         paUInt8
-typedef unsigned char       SAMPLE_t;
-#define SAMPLE_ZERO         (0x80)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(127.0 * (x)))
-#define FORMAT_NAME         "Unsigned 8 Bit"
-
-#elif TEST_INT8
-#define TEST_FORMAT         paInt8
-typedef char                SAMPLE_t;
-#define SAMPLE_ZERO         (0)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(127.0 * (x)))
-#define FORMAT_NAME         "Signed 8 Bit"
-
-#elif TEST_INT16
-#define TEST_FORMAT         paInt16
-typedef short               SAMPLE_t;
-#define SAMPLE_ZERO         (0)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(32767 * (x)))
-#define FORMAT_NAME         "Signed 16 Bit"
-
-#elif TEST_FLOAT32
-#define TEST_FORMAT         paFloat32
-typedef float               SAMPLE_t;
-#define SAMPLE_ZERO         (0.0)
-#define DOUBLE_TO_SAMPLE(x) ((SAMPLE_t)(x))
-#define FORMAT_NAME         "Float 32 Bit"
-#endif
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-
-typedef struct
-{
-    double left_phase;
-    double right_phase;
-    unsigned int framesToGo;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE_t *out = (SAMPLE_t *)outputBuffer;
-    SAMPLE_t sample;
-    int i;
-    int framesToCalc;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    if( data->framesToGo < framesPerBuffer )
-    {
-        framesToCalc = data->framesToGo;
-        data->framesToGo = 0;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        data->framesToGo -= framesPerBuffer;
-    }
-
-    for( i=0; i<framesToCalc; i++ )
-    {
-        data->left_phase += (LEFT_FREQ / SAMPLE_RATE);
-        if( data->left_phase > 1.0) data->left_phase -= 1.0;
-        sample = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->left_phase * M_PI * 2. ))); /**/
-        *out++ = sample;
-/*        *out++ = sample; /**/
-/*        *out++ = 0;  /**/
-
-        data->right_phase += (RIGHT_FREQ / SAMPLE_RATE);
-        if( data->right_phase > 1.0) data->right_phase -= 1.0;
-        *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->right_phase * M_PI * 2. ))); /**/
-/*        *out++ = 0;  /* */
-    }
-    /* zero remainder of final buffer */
-    for( ; i<(int)framesPerBuffer; i++ )
-    {
-        *out++ = SAMPLE_ZERO; /* left */
-        *out++ = SAMPLE_ZERO; /* right */
-    }
-    return finished;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PortAudioStream *stream;
-    PaError err;
-    paTestData data;
-    int totalSamps;
-
-    printf("PortAudio Test: output " FORMAT_NAME "\n");
-
-
-    data.left_phase = data.right_phase = 0.0;
-    data.framesToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    err = Pa_OpenStream(
-              &stream,
-              paNoDevice,/* default input device */
-              0,              /* no input */
-              TEST_FORMAT,
-              NULL,
-              Pa_GetDefaultOutputDeviceID(), /* default output device */
-              2,          /* stereo output */
-              TEST_FORMAT,
-              NULL,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              0,              /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Waiting %d seconds for sound to finish.\n", NUM_SECONDS );
-    while( Pa_StreamActive( stream ) ) Pa_Sleep(10);
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-
-    printf("PortAudio Test Finished: " FORMAT_NAME "\n");
-
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/debug_srate.c b/libs/portaudio/test/debug_srate.c
deleted file mode 100644
index 9376ed4bc2..0000000000
--- a/libs/portaudio/test/debug_srate.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * $Id: debug_srate.c 1083 2006-08-23 07:30:49Z rossb $
- * debug_record_reuse.c
- * Record input into an array.
- * Save array to a file.
- * Based on patest_record.c but with various ugly debug hacks thrown in.
- * Loop twice and reuse same streams.
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include "portaudio.h"
-
-#define EWS88MT_12_REC     (1)
-#define EWS88MT_12_PLAY   (10)
-#define SBLIVE_REC         (2)
-#define SBLIVE_PLAY       (11)
-
-#if 0
-#define INPUT_DEVICE_ID    Pa_GetDefaultInputDeviceID()
-#define OUTPUT_DEVICE_ID   Pa_GetDefaultOutputDeviceID()
-#else
-#define INPUT_DEVICE_ID    (EWS88MT_12_REC)
-#define OUTPUT_DEVICE_ID   (SBLIVE_PLAY)
-#endif
-
-#define INPUT_SAMPLE_RATE     (22050.0)
-#define OUTPUT_SAMPLE_RATE    (22050.0)
-#define NUM_SECONDS               (4)
-#define SLEEP_DUR_MSEC         (1000)
-#define FRAMES_PER_BUFFER        (64)
-#define NUM_REC_BUFS              (0)
-#define SAMPLES_PER_FRAME         (2)
-
-#define PA_SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-
-typedef struct
-{
-    long             frameIndex;  /* Index into sample array. */
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int recordCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData *) userData;
-    (void) outputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( inputBuffer != NULL )
-    {
-        data->frameIndex += framesPerBuffer;
-    }
-    return 0;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int playCallback( void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData *) userData;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) outTime;
-
-    if( outputBuffer != NULL )
-    {
-        data->frameIndex += framesPerBuffer;
-    }
-    return 0;
-}
-
-/****************************************************************/
-PaError MeasureStreamRate( PortAudioStream *stream, paTestData *dataPtr, double *ratePtr )
-{
-    PaError    err;
-    int        i;
-    int        totalFrames = 0;
-    int        totalMSec = 0;
-
-    dataPtr->frameIndex = 0;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    for( i=0; i<(NUM_SECONDS*1000/SLEEP_DUR_MSEC); i++ )
-    {
-        int delta, endIndex;
-
-        int startIndex = dataPtr->frameIndex;
-        Pa_Sleep(SLEEP_DUR_MSEC);
-        endIndex = dataPtr->frameIndex;
-
-        delta = endIndex - startIndex;
-        totalFrames += delta;
-        totalMSec += SLEEP_DUR_MSEC;
-
-        printf("index = %d, delta = %d\n", endIndex, delta ); fflush(stdout);
-    }
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    *ratePtr = (totalFrames * 1000.0) / totalMSec;
-
-error:
-    return err;
-}
-
-void ReportRate( double measuredRate, double expectedRate )
-{
-    double error;
-
-    error = (measuredRate - expectedRate) / expectedRate;
-    error = (error < 0 ) ? -error : error;
-
-    printf("Measured rate = %6.1f, expected rate = %6.1f\n",
-            measuredRate, expectedRate );
-    if( error > 0.1 )
-    {
-        printf("ERROR: unexpected rate! ---------------------   ERROR!\n");
-    }
-    else
-    {
-        printf("SUCCESS: rate within tolerance!\n");
-    }
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError    err;
-    paTestData data = { 0 };
-    long       i;
-    double     rate;
-    const    PaDeviceInfo *pdi;
-
-    PortAudioStream *outputStream;
-    PortAudioStream *inputStream;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-
-    pdi = Pa_GetDeviceInfo( INPUT_DEVICE_ID );
-    printf("Input device  = %s\n", pdi->name );
-    pdi = Pa_GetDeviceInfo( OUTPUT_DEVICE_ID );
-    printf("Output device = %s\n", pdi->name );
-
-/* Open input stream. */
-    err = Pa_OpenStream(
-              &inputStream,
-              INPUT_DEVICE_ID,
-              SAMPLES_PER_FRAME,               /* stereo input */
-              PA_SAMPLE_TYPE,
-              NULL,
-              paNoDevice,
-              0,
-              PA_SAMPLE_TYPE,
-              NULL,
-              INPUT_SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              NUM_REC_BUFS,               /* number of buffers, if zero then use default minimum */
-              paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-              recordCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_OpenStream(
-              &outputStream,
-              paNoDevice,
-              0,               /* NO input */
-              PA_SAMPLE_TYPE,
-              NULL,
-              OUTPUT_DEVICE_ID,
-              SAMPLES_PER_FRAME,               /* stereo output */
-              PA_SAMPLE_TYPE,
-              NULL,
-              OUTPUT_SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              0,               /* number of buffers, if zero then use default minimum */
-              paClipOff,       /* we won't output out of range samples so don't bother clipping them */
-              playCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-/* Record and playback multiple times. */
-    for( i=0; i<2; i++ )
-    {
-        printf("Measuring INPUT ------------------------- \n");
-        err = MeasureStreamRate( inputStream, &data, &rate );
-        if( err != paNoError ) goto error;
-        ReportRate( rate, INPUT_SAMPLE_RATE );
-
-        printf("Measuring OUTPUT ------------------------- \n");
-        err = MeasureStreamRate( outputStream, &data, &rate );
-        if( err != paNoError ) goto error;
-        ReportRate( rate, OUTPUT_SAMPLE_RATE );
-    }
-
-/* Clean up. */
-    err = Pa_CloseStream( inputStream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( outputStream );
-    if( err != paNoError ) goto error;
-
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    
-    printf("Test complete.\n"); fflush(stdout);
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    if( err == paHostError )
-    {
-        fprintf( stderr, "Host Error number: %d\n", Pa_GetHostError() );
-    }
-    return -1;
-}
diff --git a/libs/portaudio/test/debug_test1.c b/libs/portaudio/test/debug_test1.c
deleted file mode 100644
index 93767ded70..0000000000
--- a/libs/portaudio/test/debug_test1.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * $Id: debug_test1.c 178 2002-06-04 23:07:01Z  $
- patest1.c
- Ring modulate the audio input with a 441hz sine wave for 20 seconds
-    using the Portable Audio api
-    Author: Ross Bencina <rossb@audiomulch.com>
-    Modifications:
- April 5th, 2001 - PLB - Check for NULL inputBuffer.
-*/
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-typedef struct
-{
-    float sine[100];
-    int phase;
-    int sampsToGo;
-}
-patest1data;
-static int patest1Callback( void *inputBuffer, void *outputBuffer,
-                            unsigned long bufferFrames,
-                            PaTimestamp outTime, void *userData )
-{
-    patest1data *data = (patest1data*)userData;
-    float *in = (float*)inputBuffer;
-    float *out = (float*)outputBuffer;
-    int framesToCalc = bufferFrames;
-    unsigned long i;
-    int finished = 0;
-    if(inputBuffer == NULL) return 0;
-    if( data->sampsToGo < bufferFrames )
-    {
-        finished = 1;
-    }
-    for( i=0; i<bufferFrames; i++ )
-    {
-        *out++ = *in++;
-        *out++ = *in++;
-        if( data->phase >= 100 )
-            data->phase = 0;
-    }
-    data->sampsToGo -= bufferFrames;
-    /* zero remainder of final buffer if not already done */
-    for( ; i<bufferFrames; i++ )
-    {
-        *out++ = 0; /* left */
-        *out++ = 0; /* right */
-    }
-    return finished;
-}
-int main(int argc, char* argv[]);
-int main(int argc, char* argv[])
-{
-    PaStream *stream;
-    PaError err;
-    patest1data data;
-    int i;
-    int inputDevice = Pa_GetDefaultInputDeviceID();
-    int outputDevice = Pa_GetDefaultOutputDeviceID();
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<100; i++ )
-        data.sine[i] = sin( ((double)i/100.) * M_PI * 2. );
-    data.phase = 0;
-    data.sampsToGo = 44100 * 4;   // 20 seconds
-    /* initialise portaudio subsytem */
-    Pa_Initialize();
-    err = Pa_OpenStream(
-              &stream,
-              inputDevice,
-              2,              /* stereo input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              outputDevice,
-              2,              /* stereo output */
-              paFloat32,      /* 32 bit floating point output */
-              NULL,
-              44100.,
-              //    22050,          /* half second buffers */
-              //    4,              /* four buffers */
-              512,          /* half second buffers */
-              0,              /* four buffers */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patest1Callback,
-              &data );
-    if( err == paNoError )
-    {
-        err = Pa_StartStream( stream );
-        //       printf( "Press any key to end.\n" );
-        //       getc( stdin ); //wait for input before exiting
-        //       Pa_AbortStream( stream );
-
-        printf( "Waiting for stream to complete...\n" );
-
-        while( Pa_StreamActive( stream ) )
-            Pa_Sleep(1000); /* sleep until playback has finished */
-
-        err = Pa_CloseStream( stream );
-    }
-    else
-    {
-        fprintf( stderr, "An error occured while opening the portaudio stream\n" );
-        if( err == paHostError )
-            fprintf( stderr, "Host error number: %d\n", Pa_GetHostError() );
-        else
-            fprintf( stderr, "Error number: %d\n", err );
-    }
-    Pa_Terminate();
-    printf( "bye\n" );
-
-    return 0;
-}
diff --git a/libs/portaudio/test/pa_devs.c b/libs/portaudio/test/pa_devs.c
deleted file mode 100644
index 73a67cfda6..0000000000
--- a/libs/portaudio/test/pa_devs.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/** @file pa_devs.c
-	@ingroup test_src
-    @brief List available devices, including device information.
-	@author Phil Burk http://www.softsynth.com
-
-    @note Define PA_NO_ASIO to compile this code on Windows without
-        ASIO support.
-*/
-/*
- * $Id: pa_devs.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#ifdef WIN32
-#ifndef PA_NO_ASIO
-#include "pa_asio.h"
-#endif
-#endif
-
-/*******************************************************************/
-static void PrintSupportedStandardSampleRates(
-        const PaStreamParameters *inputParameters,
-        const PaStreamParameters *outputParameters )
-{
-    static double standardSampleRates[] = {
-        8000.0, 9600.0, 11025.0, 12000.0, 16000.0, 22050.0, 24000.0, 32000.0,
-        44100.0, 48000.0, 88200.0, 96000.0, 192000.0, -1 /* negative terminated  list */
-    };
-    int     i, printCount;
-    PaError err;
-
-    printCount = 0;
-    for( i=0; standardSampleRates[i] > 0; i++ )
-    {
-        err = Pa_IsFormatSupported( inputParameters, outputParameters, standardSampleRates[i] );
-        if( err == paFormatIsSupported )
-        {
-            if( printCount == 0 )
-            {
-                printf( "\t%8.2f", standardSampleRates[i] );
-                printCount = 1;
-            }
-            else if( printCount == 4 )
-            {
-                printf( ",\n\t%8.2f", standardSampleRates[i] );
-                printCount = 1;
-            }
-            else
-            {
-                printf( ", %8.2f", standardSampleRates[i] );
-                ++printCount;
-            }
-        }
-    }
-    if( !printCount )
-        printf( "None\n" );
-    else
-        printf( "\n" );
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    int     i, numDevices, defaultDisplayed;
-    const   PaDeviceInfo *deviceInfo;
-    PaStreamParameters inputParameters, outputParameters;
-    PaError err;
-
-    
-    Pa_Initialize();
-
-    printf( "PortAudio version number = %d\nPortAudio version text = '%s'\n",
-            Pa_GetVersion(), Pa_GetVersionText() );
-
-            
-    numDevices = Pa_GetDeviceCount();
-    if( numDevices < 0 )
-    {
-        printf( "ERROR: Pa_CountDevices returned 0x%x\n", numDevices );
-        err = numDevices;
-        goto error;
-    }
-    
-    printf( "Number of devices = %d\n", numDevices );
-    for( i=0; i<numDevices; i++ )
-    {
-        deviceInfo = Pa_GetDeviceInfo( i );
-        printf( "--------------------------------------- device #%d\n", i );
-                
-    /* Mark global and API specific default devices */
-        defaultDisplayed = 0;
-        if( i == Pa_GetDefaultInputDevice() )
-        {
-            printf( "[ Default Input" );
-            defaultDisplayed = 1;
-        }
-        else if( i == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultInputDevice )
-        {
-            const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
-            printf( "[ Default %s Input", hostInfo->name );
-            defaultDisplayed = 1;
-        }
-        
-        if( i == Pa_GetDefaultOutputDevice() )
-        {
-            printf( (defaultDisplayed ? "," : "[") );
-            printf( " Default Output" );
-            defaultDisplayed = 1;
-        }
-        else if( i == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultOutputDevice )
-        {
-            const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
-            printf( (defaultDisplayed ? "," : "[") );                
-            printf( " Default %s Output", hostInfo->name );
-            defaultDisplayed = 1;
-        }
-
-        if( defaultDisplayed )
-            printf( " ]\n" );
-
-    /* print device info fields */
-        printf( "Name                        = %s\n", deviceInfo->name );
-        printf( "Host API                    = %s\n",  Pa_GetHostApiInfo( deviceInfo->hostApi )->name );
-        printf( "Max inputs = %d", deviceInfo->maxInputChannels  );
-        printf( ", Max outputs = %d\n", deviceInfo->maxOutputChannels  );
-
-        printf( "Default low input latency   = %8.3f\n", deviceInfo->defaultLowInputLatency  );
-        printf( "Default low output latency  = %8.3f\n", deviceInfo->defaultLowOutputLatency  );
-        printf( "Default high input latency  = %8.3f\n", deviceInfo->defaultHighInputLatency  );
-        printf( "Default high output latency = %8.3f\n", deviceInfo->defaultHighOutputLatency  );
-
-#ifdef WIN32
-#ifndef PA_NO_ASIO
-/* ASIO specific latency information */
-        if( Pa_GetHostApiInfo( deviceInfo->hostApi )->type == paASIO ){
-            long minLatency, maxLatency, preferredLatency, granularity;
-
-            err = PaAsio_GetAvailableLatencyValues( i,
-		            &minLatency, &maxLatency, &preferredLatency, &granularity );
-
-            printf( "ASIO minimum buffer size    = %ld\n", minLatency  );
-            printf( "ASIO maximum buffer size    = %ld\n", maxLatency  );
-            printf( "ASIO preferred buffer size  = %ld\n", preferredLatency  );
-
-            if( granularity == -1 )
-                printf( "ASIO buffer granularity     = power of 2\n" );
-            else
-                printf( "ASIO buffer granularity     = %ld\n", granularity  );
-        }
-#endif /* !PA_NO_ASIO */
-#endif /* WIN32 */
-
-        printf( "Default sample rate         = %8.2f\n", deviceInfo->defaultSampleRate );
-
-    /* poll for standard sample rates */
-        inputParameters.device = i;
-        inputParameters.channelCount = deviceInfo->maxInputChannels;
-        inputParameters.sampleFormat = paInt16;
-        inputParameters.suggestedLatency = 0; /* ignored by Pa_IsFormatSupported() */
-        inputParameters.hostApiSpecificStreamInfo = NULL;
-        
-        outputParameters.device = i;
-        outputParameters.channelCount = deviceInfo->maxOutputChannels;
-        outputParameters.sampleFormat = paInt16;
-        outputParameters.suggestedLatency = 0; /* ignored by Pa_IsFormatSupported() */
-        outputParameters.hostApiSpecificStreamInfo = NULL;
-
-        if( inputParameters.channelCount > 0 )
-        {
-            printf("Supported standard sample rates\n for half-duplex 16 bit %d channel input = \n",
-                    inputParameters.channelCount );
-            PrintSupportedStandardSampleRates( &inputParameters, NULL );
-        }
-
-        if( outputParameters.channelCount > 0 )
-        {
-            printf("Supported standard sample rates\n for half-duplex 16 bit %d channel output = \n",
-                    outputParameters.channelCount );
-            PrintSupportedStandardSampleRates( NULL, &outputParameters );
-        }
-
-        if( inputParameters.channelCount > 0 && outputParameters.channelCount > 0 )
-        {
-            printf("Supported standard sample rates\n for full-duplex 16 bit %d channel input, %d channel output = \n",
-                    inputParameters.channelCount, outputParameters.channelCount );
-            PrintSupportedStandardSampleRates( &inputParameters, &outputParameters );
-        }
-    }
-
-    Pa_Terminate();
-
-    printf("----------------------------------------------\n");
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/pa_fuzz.c b/libs/portaudio/test/pa_fuzz.c
deleted file mode 100644
index e1d10f0da7..0000000000
--- a/libs/portaudio/test/pa_fuzz.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/** @file pa_fuzz.c
-	@ingroup test_src
-    @brief Distort input like a fuzz box.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: pa_fuzz.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-/*
-** Note that many of the older ISA sound cards on PCs do NOT support
-** full duplex audio (simultaneous record and playback).
-** And some only support full duplex at lower sample rates.
-*/
-#define SAMPLE_RATE         (44100)
-#define PA_SAMPLE_TYPE      paFloat32
-#define FRAMES_PER_BUFFER   (64)
-
-typedef float SAMPLE;
-
-float CubicAmplifier( float input );
-static int fuzzCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         const PaStreamCallbackTimeInfo* timeInfo,
-                         PaStreamCallbackFlags statusFlags,
-                         void *userData );
-
-/* Non-linear amplifier with soft distortion curve. */
-float CubicAmplifier( float input )
-{
-    float output, temp;
-    if( input < 0.0 )
-    {
-        temp = input + 1.0f;
-        output = (temp * temp * temp) - 1.0f;
-    }
-    else
-    {
-        temp = input - 1.0f;
-        output = (temp * temp * temp) + 1.0f;
-    }
-
-    return output;
-}
-#define FUZZ(x) CubicAmplifier(CubicAmplifier(CubicAmplifier(CubicAmplifier(x))))
-
-static int gNumNoInputs = 0;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int fuzzCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         const PaStreamCallbackTimeInfo* timeInfo,
-                         PaStreamCallbackFlags statusFlags,
-                         void *userData )
-{
-    SAMPLE *out = (SAMPLE*)outputBuffer;
-    const SAMPLE *in = (const SAMPLE*)inputBuffer;
-    unsigned int i;
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) userData;
-
-    if( inputBuffer == NULL )
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *out++ = 0;  /* left - silent */
-            *out++ = 0;  /* right - silent */
-        }
-        gNumNoInputs += 1;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *out++ = FUZZ(*in++);  /* left - distorted */
-            *out++ = *in++;          /* right - clean */
-        }
-    }
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters inputParameters, outputParameters;
-    PaStream *stream;
-    PaError err;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-
-    inputParameters.device = Pa_GetDefaultInputDevice(); /* default input device */
-    inputParameters.channelCount = 2;       /* stereo input */
-    inputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              0, /* paClipOff, */  /* we won't output out of range samples so don't bother clipping them */
-              fuzzCallback,
-              NULL );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Hit ENTER to stop program.\n");
-    getchar();
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Finished. gNumNoInputs = %d\n", gNumNoInputs );
-    Pa_Terminate();
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
diff --git a/libs/portaudio/test/pa_minlat.c b/libs/portaudio/test/pa_minlat.c
deleted file mode 100644
index 6600ad9d53..0000000000
--- a/libs/portaudio/test/pa_minlat.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/** @file pa_minlat.c
-	@ingroup test_src
-    @brief Experiment with different numbers of buffers to determine the
-	minimum latency for a computer.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: pa_minlat.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "portaudio.h"
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-#define DEFAULT_BUFFER_SIZE   (32)
-
-typedef struct
-{
-    double left_phase;
-    double right_phase;
-}
-paTestData;
-
-/* Very simple synthesis routine to generate two sine waves. */
-static int paminlatCallback( const void *inputBuffer, void *outputBuffer,
-                             unsigned long framesPerBuffer,
-                             const PaStreamCallbackTimeInfo* timeInfo,
-                             PaStreamCallbackFlags statusFlags,
-                             void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-    double left_phaseInc = 0.02;
-    double right_phaseInc = 0.06;
-
-    double left_phase = data->left_phase;
-    double right_phase = data->right_phase;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        left_phase += left_phaseInc;
-        if( left_phase > TWOPI ) left_phase -= TWOPI;
-        *out++ = (float) sin( left_phase );
-
-        right_phase += right_phaseInc;
-        if( right_phase > TWOPI ) right_phase -= TWOPI;
-        *out++ = (float) sin( right_phase );
-    }
-
-    data->left_phase = left_phase;
-    data->right_phase = right_phase;
-    return 0;
-}
-
-int main( int argc, char **argv );
-int main( int argc, char **argv )
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int    go;
-    int    outLatency = 0;
-    int    minLatency = DEFAULT_BUFFER_SIZE * 2;
-    int    framesPerBuffer;
-    double sampleRate = 44100.0;
-    char   str[256];
-
-    printf("pa_minlat - Determine minimum latency for your computer.\n");
-    printf("  usage:         pa_minlat {userBufferSize}\n");
-    printf("  for example:   pa_minlat 64\n");
-    printf("Adjust your stereo until you hear a smooth tone in each speaker.\n");
-    printf("Then try to find the smallest number of frames that still sounds smooth.\n");
-    printf("Note that the sound will stop momentarily when you change the number of buffers.\n");
-
-    /* Get bufferSize from command line. */
-    framesPerBuffer = ( argc > 1 ) ? atol( argv[1] ) : DEFAULT_BUFFER_SIZE;
-    printf("Frames per buffer = %d\n", framesPerBuffer );
-
-    data.left_phase = data.right_phase = 0.0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outLatency = sampleRate * 200.0 / 1000.0; /* 200 msec. */
-
-    /* Try different numBuffers in a loop. */
-    go = 1;
-    while( go )
-    {
-        outputParameters.device                    = Pa_GetDefaultOutputDevice(); /* Default output device. */
-        outputParameters.channelCount              = 2;                           /* Stereo output */
-        outputParameters.sampleFormat              = paFloat32;                   /* 32 bit floating point output. */
-        outputParameters.suggestedLatency          = (double)outLatency / sampleRate; /* In seconds. */
-        outputParameters.hostApiSpecificStreamInfo = NULL;
-        
-        printf("Latency = %d frames = %6.1f msec.\n", outLatency, outputParameters.suggestedLatency * 1000.0 );
-
-        err = Pa_OpenStream(
-                  &stream,
-                  NULL, /* no input */
-                  &outputParameters,
-                  sampleRate,
-                  framesPerBuffer,
-                  paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-                  paminlatCallback,
-                  &data );
-        if( err != paNoError ) goto error;
-        if( stream == NULL ) goto error;
-
-        /* Start audio. */
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto error;
-
-        /* Ask user for a new nlatency. */
-        printf("\nMove windows around to see if the sound glitches.\n");
-        printf("Latency now %d, enter new number of frames, or 'q' to quit: ", outLatency );
-        fgets( str, 256, stdin );
-        {
-            /* Get rid of newline */
-            size_t l = strlen( str ) - 1;
-            if( str[ l ] == '\n')
-                str[ l ] = '\0';
-        }
-        if( str[0] == 'q' ) go = 0;
-        else
-        {
-            outLatency = atol( str );
-            if( outLatency < minLatency )
-            {
-                printf( "Latency below minimum of %d! Set to minimum!!!\n", minLatency );
-                outLatency = minLatency;
-            }
-        }
-        /* Stop sound until ENTER hit. */
-        err = Pa_StopStream( stream );
-        if( err != paNoError ) goto error;
-        err = Pa_CloseStream( stream );
-        if( err != paNoError ) goto error;
-    }
-    printf("A good setting for latency would be somewhat higher than\n");
-    printf("the minimum latency that worked.\n");
-    printf("PortAudio: Test finished.\n");
-    Pa_Terminate();
-    return 0;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return 1;
-}
diff --git a/libs/portaudio/test/paqa_devs.c b/libs/portaudio/test/paqa_devs.c
deleted file mode 100644
index 033d6f9dfd..0000000000
--- a/libs/portaudio/test/paqa_devs.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/** @file paqa_devs.c
-	@ingroup test_src
-    @brief Self Testing Quality Assurance app for PortAudio
- 	Try to open each device and run through all the
- 	possible configurations.
-
-	@author Phil Burk  http://www.softsynth.com
-    
-    Pieter adapted to V19 API. Test now relies heavily on 
-    Pa_IsFormatSupported(). Uses same 'standard' sample rates
-    as in test pa_devs.c.
-*/
-/*
- * $Id: paqa_devs.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_trace.h"
-
-/****************************************** Definitions ***********/
-#define MODE_INPUT      (0)
-#define MODE_OUTPUT     (1)
-
-typedef struct PaQaData
-{
-    unsigned long  framesLeft;
-    int            numChannels;
-    int            bytesPerSample;
-    int            mode;
-    short          sawPhase;
-    PaSampleFormat format;
-}
-PaQaData;
-
-/****************************************** Prototypes ***********/
-static void TestDevices( int mode );
-static void TestFormats( int mode, PaDeviceIndex deviceID, double sampleRate,
-                         int numChannels );
-static int TestAdvance( int mode, PaDeviceIndex deviceID, double sampleRate,
-                        int numChannels, PaSampleFormat format );
-static int QaCallback( const void *inputBuffer, void *outputBuffer,
-                       unsigned long framesPerBuffer,
-                       const PaStreamCallbackTimeInfo* timeInfo,
-                       PaStreamCallbackFlags statusFlags,
-                       void *userData );
-
-/****************************************** Globals ***********/
-static int gNumPassed = 0;
-static int gNumFailed = 0;
-
-/****************************************** Macros ***********/
-/* Print ERROR if it fails. Tally success or failure. */
-/* Odd do-while wrapper seems to be needed for some compilers. */
-#define EXPECT(_exp) \
-    do \
-    { \
-        if ((_exp)) {\
-            /* printf("SUCCESS for %s\n", #_exp ); */ \
-            gNumPassed++; \
-        } \
-        else { \
-            printf("ERROR - 0x%x - %s for %s\n", result, \
-                   ((result == 0) ? "-" : Pa_GetErrorText(result)), \
-                   #_exp ); \
-            gNumFailed++; \
-            goto error; \
-        } \
-    } while(0)
-
-/*******************************************************************/
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int QaCallback( const void *inputBuffer, void *outputBuffer,
-                       unsigned long framesPerBuffer,
-                       const PaStreamCallbackTimeInfo* timeInfo,
-                       PaStreamCallbackFlags statusFlags,
-                       void *userData )
-{
-    unsigned long  i;
-    short          phase;
-    PaQaData *data = (PaQaData *) userData;
-    (void) inputBuffer;
-
-    /* Play simle sawtooth wave. */
-    if( data->mode == MODE_OUTPUT )
-    {
-        phase = data->sawPhase;
-        switch( data->format )
-        {
-        case paFloat32:
-            {
-                float *out =  (float *) outputBuffer;
-                for( i=0; i<framesPerBuffer; i++ )
-                {
-                    phase += 0x123;
-                    *out++ = (float) (phase * (1.0 / 32768.0));
-                    if( data->numChannels == 2 )
-                    {
-                        *out++ = (float) (phase * (1.0 / 32768.0));
-                    }
-                }
-            }
-            break;
-
-        case paInt32:
-            {
-                int *out =  (int *) outputBuffer;
-                for( i=0; i<framesPerBuffer; i++ )
-                {
-                    phase += 0x123;
-                    *out++ = ((int) phase ) << 16;
-                    if( data->numChannels == 2 )
-                    {
-                        *out++ = ((int) phase ) << 16;
-                    }
-                }
-            }
-            break;
-        case paInt16:
-            {
-                short *out =  (short *) outputBuffer;
-                for( i=0; i<framesPerBuffer; i++ )
-                {
-                    phase += 0x123;
-                    *out++ = phase;
-                    if( data->numChannels == 2 )
-                    {
-                        *out++ = phase;
-                    }
-                }
-            }
-            break;
-
-        default:
-            {
-                unsigned char *out =  (unsigned char *) outputBuffer;
-                unsigned long numBytes = framesPerBuffer * data->numChannels * data->bytesPerSample;
-                for( i=0; i<numBytes; i++ )
-                {
-                    *out++ = 0;
-                }
-            }
-            break;
-        }
-        data->sawPhase = phase;
-    }
-    /* Are we through yet? */
-    if( data->framesLeft > framesPerBuffer )
-    {
-        PaUtil_AddTraceMessage("QaCallback: running. framesLeft", data->framesLeft );
-        data->framesLeft -= framesPerBuffer;
-        return 0;
-    }
-    else
-    {
-        PaUtil_AddTraceMessage("QaCallback: DONE! framesLeft", data->framesLeft );
-        data->framesLeft = 0;
-        return 1;
-    }
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError result;
-    EXPECT( ((result=Pa_Initialize()) == 0) );
-    printf("Test OUTPUT ---------------\n");
-    TestDevices( MODE_OUTPUT );
-    printf("Test INPUT ---------------\n");
-    TestDevices( MODE_INPUT );
-error:
-    Pa_Terminate();
-    printf("QA Report: %d passed, %d failed.\n", gNumPassed, gNumFailed );
-    return 0;
-}
-
-/*******************************************************************
-* Try each output device, through its full range of capabilities. */
-static void TestDevices( int mode )
-{
-    int id, jc, i;
-    int maxChannels;
-    const PaDeviceInfo *pdi;
-    static double standardSampleRates[] = {  8000.0,  9600.0, 11025.0, 12000.0,
-                                            16000.0,          22050.0, 24000.0,
-                                            32000.0,          44100.0, 48000.0,
-                                                              88200.0, 96000.0,
-                                               -1.0 }; /* Negative terminated list. */
-    int numDevices = Pa_GetDeviceCount();
-    for( id=0; id<numDevices; id++ )            /* Iterate through all devices. */
-    {
-        pdi = Pa_GetDeviceInfo( id );
-        /* Try 1 to maxChannels on each device. */
-        maxChannels = (( mode == MODE_INPUT ) ? pdi->maxInputChannels : pdi->maxOutputChannels);
-        
-        for( jc=1; jc<=maxChannels; jc++ )
-        {
-            printf("Name         = %s\n", pdi->name );
-            /* Try each standard sample rate. */
-            for( i=0; standardSampleRates[i] > 0; i++ )
-            {
-                TestFormats( mode, (PaDeviceIndex)id, standardSampleRates[i], jc );
-            }
-        }
-    }
-}
-
-/*******************************************************************/
-static void TestFormats( int mode, PaDeviceIndex deviceID, double sampleRate,
-                         int numChannels )
-{
-    TestAdvance( mode, deviceID, sampleRate, numChannels, paFloat32 );
-    TestAdvance( mode, deviceID, sampleRate, numChannels, paInt16 );
-    TestAdvance( mode, deviceID, sampleRate, numChannels, paInt32 );
-    /* TestAdvance( mode, deviceID, sampleRate, numChannels, paInt24 ); */
-}
-
-/*******************************************************************/
-static int TestAdvance( int mode, PaDeviceIndex deviceID, double sampleRate,
-                        int numChannels, PaSampleFormat format )
-{
-    PaStreamParameters inputParameters, outputParameters, *ipp, *opp;
-    PaStream *stream = NULL;
-    PaError result = paNoError;
-    PaQaData myData;
-    #define FRAMES_PER_BUFFER  (64)
-    
-    /* Setup data for synthesis thread. */
-    myData.framesLeft = (unsigned long) (sampleRate * 100); /* 100 seconds */
-    myData.numChannels = numChannels;
-    myData.mode = mode;
-    myData.format = format;
-    switch( format )
-    {
-    case paFloat32:
-    case paInt32:
-    case paInt24:
-        myData.bytesPerSample = 4;
-        break;
-/*  case paPackedInt24:
-        myData.bytesPerSample = 3;
-        break; */
-    default:
-        myData.bytesPerSample = 2;
-        break;
-    }
-
-    if( mode == MODE_INPUT )
-    {
-        inputParameters.device       = deviceID;
-        inputParameters.channelCount = numChannels;
-        inputParameters.sampleFormat = format;
-        inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-        inputParameters.hostApiSpecificStreamInfo = NULL;
-        ipp = &inputParameters;
-    }
-    else
-        ipp = NULL;
-    if( mode == MODE_OUTPUT )           /* Pa_GetDeviceInfo(paNoDevice) COREDUMPS!!! */
-    {
-        outputParameters.device       = deviceID;
-        outputParameters.channelCount = numChannels;
-        outputParameters.sampleFormat = format;
-        outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-        outputParameters.hostApiSpecificStreamInfo = NULL;
-        opp = &outputParameters;
-    }
-    else
-        opp = NULL;
-
-    if(paFormatIsSupported == Pa_IsFormatSupported( ipp, opp, sampleRate ))
-    {
-        printf("------ TestAdvance: %s, device = %d, rate = %g, numChannels = %d, format = %lu -------\n",
-                ( mode == MODE_INPUT ) ? "INPUT" : "OUTPUT",
-                deviceID, sampleRate, numChannels, (unsigned long)format);
-        EXPECT( ((result = Pa_OpenStream( &stream,
-                                          ipp,
-                                          opp,
-                                          sampleRate,
-                                          FRAMES_PER_BUFFER,
-                                          paClipOff,  /* we won't output out of range samples so don't bother clipping them */
-                                          QaCallback,
-                                          &myData ) ) == 0) );
-        if( stream )
-        {
-            PaTime oldStamp, newStamp;
-            unsigned long oldFrames;
-            int minDelay = ( mode == MODE_INPUT ) ? 1000 : 400;
-            /* Was:
-            int minNumBuffers = Pa_GetMinNumBuffers( FRAMES_PER_BUFFER, sampleRate );
-            int msec = (int) ((minNumBuffers * 3 * 1000.0 * FRAMES_PER_BUFFER) / sampleRate);
-            */
-            int msec = (int)( 3.0 *
-                       (( mode == MODE_INPUT ) ? inputParameters.suggestedLatency : outputParameters.suggestedLatency ));
-            if( msec < minDelay ) msec = minDelay;
-            printf("msec = %d\n", msec);  /**/
-            EXPECT( ((result=Pa_StartStream( stream )) == 0) );
-            /* Check to make sure PortAudio is advancing timeStamp. */
-            oldStamp = Pa_GetStreamTime(stream);
-            Pa_Sleep(msec);
-            newStamp = Pa_GetStreamTime(stream);
-            printf("oldStamp = %g,newStamp = %g\n", oldStamp, newStamp ); /**/
-            EXPECT( (oldStamp < newStamp) );
-            /* Check to make sure callback is decrementing framesLeft. */
-            oldFrames = myData.framesLeft;
-            Pa_Sleep(msec);
-            printf("oldFrames = %lu, myData.framesLeft = %lu\n", oldFrames,  myData.framesLeft ); /**/
-            EXPECT( (oldFrames > myData.framesLeft) );
-            EXPECT( ((result=Pa_CloseStream( stream )) == 0) );
-            stream = NULL;
-        }
-    }
-error:
-    if( stream != NULL ) Pa_CloseStream( stream );
-    return result;
-}
diff --git a/libs/portaudio/test/paqa_errs.c b/libs/portaudio/test/paqa_errs.c
deleted file mode 100644
index 8405c22f35..0000000000
--- a/libs/portaudio/test/paqa_errs.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/** @file paqa_errs.c
-	@ingroup test_src
-	@brief Self Testing Quality Assurance app for PortAudio
-	Do lots of bad things to test error reporting.
-	@author Phil Burk  http://www.softsynth.com
-    Pieter Suurmond adapted to V19 API.
-*/
-/*
- * $Id: paqa_errs.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
- 
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-
-/*--------- Definitions ---------*/
-#define MODE_INPUT        (0)
-#define MODE_OUTPUT       (1)
-#define FRAMES_PER_BUFFER (64)
-#define SAMPLE_RATE       (44100.0)
-
-typedef struct PaQaData
-{
-    unsigned long  framesLeft;
-    int            numChannels;
-    int            bytesPerSample;
-    int            mode;
-}
-PaQaData;
-
-static int gNumPassed = 0; /* Two globals */
-static int gNumFailed = 0;
-
-/*------------------- Macros ------------------------------*/
-/* Print ERROR if it fails. Tally success or failure. Odd  */
-/* do-while wrapper seems to be needed for some compilers. */
-
-#define EXPECT(_exp) \
-    do \
-    { \
-        if ((_exp)) {\
-            gNumPassed++; \
-        } \
-        else { \
-            printf("\nERROR - 0x%x - %s for %s\n", result, Pa_GetErrorText(result), #_exp ); \
-            gNumFailed++; \
-            goto error; \
-        } \
-    } while(0)
-
-#define HOPEFOR(_exp) \
-    do \
-    { \
-        if ((_exp)) {\
-            gNumPassed++; \
-        } \
-        else { \
-            printf("\nERROR - 0x%x - %s for %s\n", result, Pa_GetErrorText(result), #_exp ); \
-            gNumFailed++; \
-        } \
-    } while(0)
-
-/*-------------------------------------------------------------------------*/
-/* This routine will be called by the PortAudio engine when audio is needed.
-   It may be called at interrupt level on some machines so don't do anything
-   that could mess up the system like calling malloc() or free().
-*/
-static int QaCallback( const void*                      inputBuffer,
-                       void*                            outputBuffer,
-                       unsigned long                    framesPerBuffer,
-			           const PaStreamCallbackTimeInfo*  timeInfo,
-			           PaStreamCallbackFlags            statusFlags,
-                       void*                            userData )
-{
-    unsigned long   i;
-    unsigned char*  out = (unsigned char *) outputBuffer;
-    PaQaData*       data = (PaQaData *) userData;
-    
-    (void)inputBuffer; /* Prevent "unused variable" warnings. */
-
-    /* Zero out buffer so we don't hear terrible noise. */
-    if( data->mode == MODE_OUTPUT )
-    {
-        unsigned long numBytes = framesPerBuffer * data->numChannels * data->bytesPerSample;
-        for( i=0; i<numBytes; i++ )
-        {
-            *out++ = 0;
-        }
-    }
-    /* Are we through yet? */
-    if( data->framesLeft > framesPerBuffer )
-    {
-        data->framesLeft -= framesPerBuffer;
-        return 0;
-    }
-    else
-    {
-        data->framesLeft = 0;
-        return 1;
-    }
-}
-
-static PaDeviceIndex FindInputOnlyDevice(void)
-{
-    PaDeviceIndex result = Pa_GetDefaultInputDevice();
-    if( result != paNoDevice && Pa_GetDeviceInfo(result)->maxOutputChannels == 0 )
-        return result;
-
-    for( result = 0; result < Pa_GetDeviceCount(); ++result )
-    {
-        if( Pa_GetDeviceInfo(result)->maxOutputChannels == 0 )
-            return result;
-    }
-
-    return paNoDevice;
-}
-
-static PaDeviceIndex FindOutputOnlyDevice(void)
-{
-    PaDeviceIndex result = Pa_GetDefaultOutputDevice();
-    if( result != paNoDevice && Pa_GetDeviceInfo(result)->maxInputChannels == 0 )
-        return result;
-
-    for( result = 0; result < Pa_GetDeviceCount(); ++result )
-    {
-        if( Pa_GetDeviceInfo(result)->maxInputChannels == 0 )
-            return result;
-    }
-
-    return paNoDevice;
-}
-
-/*-------------------------------------------------------------------------------------------------*/
-static int TestBadOpens( void )
-{
-    PaStream*           stream = NULL;
-    PaError             result;
-    PaQaData            myData;
-    PaStreamParameters  ipp, opp;
-    
-    /* Setup data for synthesis thread. */
-    myData.framesLeft = (unsigned long) (SAMPLE_RATE * 100); /* 100 seconds */
-    myData.numChannels = 1;
-    myData.mode = MODE_OUTPUT;
-
-    /*----------------------------- No devices specified: */
-    ipp.device                    = opp.device                    = paNoDevice;
-    ipp.channelCount              = opp.channelCount              = 0; /* Also no channels. */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    /* Take the low latency of the default device for all subsequent tests. */
-    ipp.suggestedLatency          = Pa_GetDeviceInfo(Pa_GetDefaultInputDevice())->defaultLowInputLatency;
-    opp.suggestedLatency          = Pa_GetDeviceInfo(Pa_GetDefaultOutputDevice())->defaultLowOutputLatency;
-    HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- No devices specified #2: */
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, NULL,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- Out of range input device specified: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = Pa_GetDeviceCount(); /* And no output device, and no channels. */
-    opp.channelCount = 0;           opp.device = paNoDevice;
-    HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, NULL,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- Out of range output device specified: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice; /* And no input device, and no channels. */
-    opp.channelCount = 0;           opp.device = Pa_GetDeviceCount();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- Zero input channels: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = Pa_GetDefaultInputDevice();
-    opp.channelCount = 0;           opp.device = paNoDevice;    /* And no output device, and no output channels. */   
-    HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, NULL,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidChannelCount));
-
-    /*----------------------------- Zero output channels: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice; /* And no input device, and no input channels. */
-    opp.channelCount = 0;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidChannelCount));
-
-    /*----------------------------- Nonzero input and output channels but no output device: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 2;           ipp.device = Pa_GetDefaultInputDevice();        /* Both stereo. */
-    opp.channelCount = 2;           opp.device = paNoDevice;
-    HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- Nonzero input and output channels but no input device: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 2;           ipp.device = paNoDevice;
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paInvalidDevice));
-
-    /*----------------------------- NULL stream pointer: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice;           /* Output is more likely than input. */
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();    /* Only 2 output channels. */
-    HOPEFOR(((result = Pa_OpenStream(NULL, &ipp, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paBadStreamPtr));
-
-    /*----------------------------- Low sample rate: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice;
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     1.0, FRAMES_PER_BUFFER, /* 1 cycle per second (1 Hz) is too low. */
-                                     paClipOff, QaCallback, &myData )) == paInvalidSampleRate));
-
-    /*----------------------------- High sample rate: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice;
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     10000000.0, FRAMES_PER_BUFFER, /* 10^6 cycles per second (10 MHz) is too high. */
-                                     paClipOff, QaCallback, &myData )) == paInvalidSampleRate));
-
-    /*----------------------------- NULL callback: */
-    /* NULL callback is valid in V19 -- it means use blocking read/write stream
-    
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice;
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff,
-                                     NULL,
-                                     &myData )) == paNullCallback));
-    */
-
-    /*----------------------------- Bad flag: */
-    ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-    ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-    ipp.channelCount = 0;           ipp.device = paNoDevice;
-    opp.channelCount = 2;           opp.device = Pa_GetDefaultOutputDevice();
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     255,                      /* Is 8 maybe legal V19 API? */
-                                     QaCallback, &myData )) == paInvalidFlag));
-
-    /*----------------------------- using input device as output device: */
-    if( FindInputOnlyDevice() != paNoDevice )
-    {
-        ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-        ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-        ipp.channelCount = 0;           ipp.device = paNoDevice; /* And no input device, and no channels. */
-        opp.channelCount = 2;           opp.device = FindInputOnlyDevice();
-        HOPEFOR(((result = Pa_OpenStream(&stream, NULL, &opp,
-                                         SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                         paClipOff, QaCallback, &myData )) == paInvalidChannelCount));
-    }
-
-    /*----------------------------- using output device as input device: */
-    if( FindOutputOnlyDevice() != paNoDevice )
-    {
-        ipp.hostApiSpecificStreamInfo = opp.hostApiSpecificStreamInfo = NULL;
-        ipp.sampleFormat              = opp.sampleFormat              = paFloat32;
-        ipp.channelCount = 2;           ipp.device = FindOutputOnlyDevice();
-        opp.channelCount = 0;           opp.device = paNoDevice;  /* And no output device, and no channels. */
-        HOPEFOR(((result = Pa_OpenStream(&stream, &ipp, NULL,
-                                         SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                         paClipOff, QaCallback, &myData )) == paInvalidChannelCount));
-
-    }
-
-    if( stream != NULL ) Pa_CloseStream( stream );
-    return result;
-}
-
-/*-----------------------------------------------------------------------------------------*/
-static int TestBadActions( void )
-{
-    PaStream*           stream = NULL;
-    PaError             result;
-    PaQaData            myData;
-    PaStreamParameters  opp;
-
-    /* Setup data for synthesis thread. */
-    myData.framesLeft = (unsigned long)(SAMPLE_RATE * 100); /* 100 seconds */
-    myData.numChannels = 1;
-    myData.mode = MODE_OUTPUT;
-
-    opp.device                    = Pa_GetDefaultOutputDevice(); /* Default output. */
-    opp.channelCount              = 2;                           /* Stereo output.  */
-    opp.hostApiSpecificStreamInfo = NULL;
-    opp.sampleFormat              = paFloat32;
-    opp.suggestedLatency          = Pa_GetDeviceInfo(opp.device)->defaultLowOutputLatency;
-
-    HOPEFOR(((result = Pa_OpenStream(&stream, NULL, /* Take NULL as input parame-     */
-                                     &opp,          /* ters, meaning try only output. */
-                                     SAMPLE_RATE, FRAMES_PER_BUFFER,
-                                     paClipOff, QaCallback, &myData )) == paNoError));
-
-    HOPEFOR(((result = Pa_StartStream(NULL))    == paBadStreamPtr));
-    HOPEFOR(((result = Pa_StopStream(NULL))     == paBadStreamPtr));
-    HOPEFOR(((result = Pa_IsStreamStopped(NULL)) == paBadStreamPtr));
-    HOPEFOR(((result = Pa_IsStreamActive(NULL)) == paBadStreamPtr));
-    HOPEFOR(((result = Pa_CloseStream(NULL))    == paBadStreamPtr));
-    HOPEFOR(((result = Pa_SetStreamFinishedCallback(NULL, NULL)) == paBadStreamPtr));
-    HOPEFOR(((result = !Pa_GetStreamInfo(NULL))));
-    HOPEFOR(((result = Pa_GetStreamTime(NULL))  == 0.0));
-    HOPEFOR(((result = Pa_GetStreamCpuLoad(NULL))  == 0.0));
-    HOPEFOR(((result = Pa_ReadStream(NULL, NULL, 0))  == paBadStreamPtr));
-    HOPEFOR(((result = Pa_WriteStream(NULL, NULL, 0))  == paBadStreamPtr));
-
-    /** @todo test Pa_GetStreamReadAvailable and Pa_GetStreamWriteAvailable */
-
-    if (stream != NULL) Pa_CloseStream(stream);
-    return result;
-}
-
-/*---------------------------------------------------------------------*/
-int main(void);
-int main(void)
-{
-    PaError result;
-    
-    EXPECT(((result = Pa_Initialize()) == paNoError));
-    TestBadOpens();
-    TestBadActions();
-error:
-    Pa_Terminate();
-    printf("QA Report: %d passed, %d failed.\n", gNumPassed, gNumFailed);
-    return 0;
-}
diff --git a/libs/portaudio/test/patest1.c b/libs/portaudio/test/patest1.c
deleted file mode 100644
index 0d42f17a6e..0000000000
--- a/libs/portaudio/test/patest1.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/** @file patest1.c
-	@ingroup test_src
-	@brief Ring modulate the audio input with a sine wave for 20 seconds.
-	@author Ross Bencina <rossb@audiomulch.com>
-*/
-/*
- * $Id: patest1.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#ifndef M_PI
-#define M_PI (3.14159265)
-#endif
-
-#define SAMPLE_RATE (44100)
-
-typedef struct
-{
-    float sine[100];
-    int phase;
-    int sampsToGo;
-}
-patest1data;
-
-static int patest1Callback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    patest1data *data = (patest1data*)userData;
-    float *in = (float*)inputBuffer;
-    float *out = (float*)outputBuffer;
-    int framesToCalc = framesPerBuffer;
-    unsigned long i = 0;
-    int finished;
-
-    if( data->sampsToGo < framesPerBuffer )
-    {
-        framesToCalc = data->sampsToGo;
-        finished = paComplete;
-    }
-    else
-    {
-        finished = paContinue;
-    }
-
-    for( ; i<framesToCalc; i++ )
-    {
-        *out++ = *in++ * data->sine[data->phase];  /* left */
-        *out++ = *in++ * data->sine[data->phase++];  /* right */
-        if( data->phase >= 100 )
-            data->phase = 0;
-    }
-
-    data->sampsToGo -= framesToCalc;
-
-    /* zero remainder of final buffer if not already done */
-    for( ; i<framesPerBuffer; i++ )
-    {
-        *out++ = 0; /* left */
-        *out++ = 0; /* right */
-    }
-    
-    return finished;
-}
-
-int main(int argc, char* argv[]);
-int main(int argc, char* argv[])
-{
-    PaStream                *stream;
-    PaError                 err;
-    patest1data             data;
-    int                     i;
-    PaStreamParameters      inputParameters, outputParameters;
-    const PaHostErrorInfo*  herr;
-
-    printf("patest1.c\n"); fflush(stdout);
-    printf("Ring modulate input for 20 seconds.\n"); fflush(stdout);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<100; i++ )
-        data.sine[i] = sin( ((double)i/100.) * M_PI * 2. );
-    data.phase = 0;
-    data.sampsToGo = SAMPLE_RATE * 20;        /* 20 seconds. */
-
-    /* initialise portaudio subsytem */
-    err = Pa_Initialize();
-
-    inputParameters.device = Pa_GetDefaultInputDevice();    /* default input device */
-    inputParameters.channelCount = 2;                       /* stereo input */
-    inputParameters.sampleFormat = paFloat32;               /* 32 bit floating point input */
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* default output device */
-    outputParameters.channelCount = 2;                      /* stereo output */
-    outputParameters.sampleFormat = paFloat32;              /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-                        &stream,
-                        &inputParameters,
-                        &outputParameters,
-                        (double)SAMPLE_RATE, /* Samplerate in Hertz. */
-                        512,                 /* Small buffers */
-                        paClipOff,           /* We won't output out of range samples so don't bother clipping them. */
-                        patest1Callback,
-                        &data );
-    if( err != paNoError ) goto done;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto done;
-    
-    printf( "Press any key to end.\n" ); fflush(stdout);
-         
-    getc( stdin ); /* wait for input before exiting */
-
-    err = Pa_AbortStream( stream );
-    if( err != paNoError ) goto done;
-    
-    printf( "Waiting for stream to complete...\n" );
-
-    /* sleep until playback has finished */
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 ) Pa_Sleep(1000);
-    if( err < 0 ) goto done;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto done;
-
-done:
-    Pa_Terminate();
-
-    if( err != paNoError )
-    {
-        fprintf( stderr, "An error occured while using portaudio\n" );
-        if( err == paUnanticipatedHostError )
-        {
-            fprintf( stderr, " unanticipated host error.\n");
-            herr = Pa_GetLastHostErrorInfo();
-            if (herr)
-            {
-                fprintf( stderr, " Error number: %ld\n", herr->errorCode );
-                if (herr->errorText)
-                    fprintf( stderr, " Error text: %s\n", herr->errorText );
-            }
-            else
-                fprintf( stderr, " Pa_GetLastHostErrorInfo() failed!\n" );
-        }
-        else
-        {
-            fprintf( stderr, " Error number: %d\n", err );
-            fprintf( stderr, " Error text: %s\n", Pa_GetErrorText( err ) );
-        }
-
-        err = 1;          /* Always return 0 or 1, but no other return codes. */
-    }
-
-    printf( "bye\n" );
-
-    return err;
-}
diff --git a/libs/portaudio/test/patest_buffer.c b/libs/portaudio/test/patest_buffer.c
deleted file mode 100644
index 70b2be76f8..0000000000
--- a/libs/portaudio/test/patest_buffer.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/** @file patest_buffer.c
-	@ingroup test_src
-	@brief Test opening streams with different buffer sizes.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_buffer.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "portaudio.h"
-#define NUM_SECONDS   (3)
-#define SAMPLE_RATE   (44100)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (200)
-
-#define BUFFER_TABLE  14
-long buffer_table[] = {paFramesPerBufferUnspecified,16,32,64,128,200,256,500,512,600,723,1000,1024,2345};
-
-typedef struct
-{
-    short sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    unsigned int sampsToGo;
-}
-paTestData;
-PaError TestOnce( int buffersize, PaDeviceIndex );
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patest1Callback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    short *out = (short*)outputBuffer;
-    unsigned int i;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent "unused variable" warnings. */
-
-    if( data->sampsToGo < framesPerBuffer )
-    {
-        /* final buffer... */
-
-        for( i=0; i<data->sampsToGo; i++ )
-        {
-            *out++ = data->sine[data->left_phase];  /* left */
-            *out++ = data->sine[data->right_phase];  /* right */
-            data->left_phase += 1;
-            if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-            data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-            if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-        }
-        /* zero remainder of final buffer */
-        for( ; i<framesPerBuffer; i++ )
-        {
-            *out++ = 0; /* left */
-            *out++ = 0; /* right */
-        }
-
-        finished = 1;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *out++ = data->sine[data->left_phase];  /* left */
-            *out++ = data->sine[data->right_phase];  /* right */
-            data->left_phase += 1;
-            if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-            data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-            if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-        }
-        data->sampsToGo -= framesPerBuffer;
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(int argc, char **args);
-int main(int argc, char **args)
-{
-    int i;
-    int device = -1;
-    PaError err;
-    printf("Test opening streams with different buffer sizes\n");
-    if( argc > 1 ) {
-       device=atoi( args[1] );
-       printf("Using device number %d.\n\n", device );
-    } else {
-       printf("Using default device.\n\n" );
-    }
-
-    for (i = 0 ; i < BUFFER_TABLE; i++)
-    {
-        printf("Buffer size %ld\n", buffer_table[i]);
-        err = TestOnce(buffer_table[i], device);
-        if( err < 0 ) return 0;
-
-    }
-    return 0;
-}
-
-
-PaError TestOnce( int buffersize, PaDeviceIndex device )
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int totalSamps;
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (short) (32767.0 * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. ));
-    }
-    data.left_phase = data.right_phase = 0;
-    data.sampsToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    if( device == -1 )
-        outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    else
-        outputParameters.device = device ;
-    outputParameters.channelCount = 2;                      /* stereo output */
-    outputParameters.sampleFormat = paInt16;                /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    err = Pa_OpenStream(
-              &stream,
-              NULL,                         /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              buffersize,                   /* frames per buffer */
-              (paClipOff | paDitherOff),
-              patest1Callback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Waiting for sound to finish.\n");
-    Pa_Sleep(1000*NUM_SECONDS);
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    return paNoError;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    fprintf( stderr, "Host Error message: %s\n", Pa_GetLastHostErrorInfo()->errorText );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_callbackstop.c b/libs/portaudio/test/patest_callbackstop.c
deleted file mode 100644
index 58fa7d04a9..0000000000
--- a/libs/portaudio/test/patest_callbackstop.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/** @file patest_callbackstop.c
-	@ingroup test_src
-	@brief Test the paComplete callback result code.
-	@author Ross Bencina <rossb@audiomulch.com>
-*/
-/*
- * $Id: patest_callbackstop.c 1294 2007-10-24 20:51:22Z bjornroche $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (5)
-#define NUM_LOOPS     (4)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (67)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int phase;
-    unsigned long generatedFramesCount;
-    volatile int callbackReturnedPaComplete;
-    volatile int callbackInvokedAfterReturningPaComplete;
-    char message[100];
-}
-TestData;
-
-/*
-   This routine will be called by the PortAudio stream when audio is needed.
-   It may be called at interrupt level on some machines so don't do anything
-   that could mess up the system like calling malloc() or free().
-*/
-static int TestCallback( const void *input, void *output,
-                            unsigned long frameCount,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    TestData *data = (TestData*)userData;
-    float *out = (float*)output;
-    unsigned long i;
-    float x;
-
-    (void) input;       /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-
-    
-    if( data->callbackReturnedPaComplete )
-        data->callbackInvokedAfterReturningPaComplete = 1;
-
-    for( i=0; i<frameCount; i++ )
-    {
-        /* generate tone */
-        
-        x = data->sine[ data->phase++ ];
-        if( data->phase >= TABLE_SIZE )
-            data->phase -= TABLE_SIZE;
-        
-        *out++ = x;  /* left */
-        *out++ = x;  /* right */
-    }
-
-    data->generatedFramesCount += frameCount;
-    if( data->generatedFramesCount >= (NUM_SECONDS * SAMPLE_RATE) )
-    {
-        data->callbackReturnedPaComplete = 1;
-        return paComplete;
-    }
-    else
-    {
-        return paContinue;
-    }
-}
-
-/*
- * This routine is called by portaudio when playback is done.
- */
-static void StreamFinished( void* userData )
-{
-   TestData *data = (TestData *) userData;
-   printf( "Stream Completed: %s\n", data->message );
-}
-
-
-/*----------------------------------------------------------------------------*/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    TestData data;
-    int i, j;
-
-    
-    printf( "PortAudio Test: output sine wave. SR = %d, BufSize = %d\n",
-            SAMPLE_RATE, FRAMES_PER_BUFFER );
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device                    = Pa_GetDefaultOutputDevice();
-    outputParameters.channelCount              = 2;               /* stereo output */
-    outputParameters.sampleFormat              = paFloat32;       /* 32 bit floating point output */
-    outputParameters.suggestedLatency          = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* output will be in-range, so no need to clip */
-              TestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    sprintf( data.message, "Loop: XX" );
-    err = Pa_SetStreamFinishedCallback( stream, &StreamFinished );
-    if( err != paNoError ) goto error;
-
-    printf("Repeating test %d times.\n", NUM_LOOPS );
-    
-    for( i=0; i < NUM_LOOPS; ++i )
-    {
-        data.phase = 0;
-        data.generatedFramesCount = 0;
-        data.callbackReturnedPaComplete = 0;
-        data.callbackInvokedAfterReturningPaComplete = 0;
-        sprintf( data.message, "Loop: %d", i );
-
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto error;
-
-        printf("Play for %d seconds.\n", NUM_SECONDS );
-
-        /* wait for the callback to complete generating NUM_SECONDS of tone */
-
-        do
-        {
-            Pa_Sleep( 500 );
-        }
-        while( !data.callbackReturnedPaComplete );
-
-        printf( "Callback returned paComplete.\n" );
-        printf( "Waiting for buffers to finish playing...\n" );
-
-        /* wait for stream to become inactive,
-           or for a timeout of approximately NUM_SECONDS
-         */
-     
-        j = 0;
-        while( (err = Pa_IsStreamActive( stream )) == 1 && j < NUM_SECONDS * 2 )
-        {
-            printf(".\n" );
-            Pa_Sleep( 500 );
-            ++j;
-        }
-
-        if( err < 0 )
-        {
-            goto error;
-        }
-        else if( err == 1 )
-        {
-            printf( "TEST FAILED: Timed out waiting for buffers to finish playing.\n" );
-        }
-        else
-        {
-            printf("Buffers finished.\n" );
-        }
-
-        if( data.callbackInvokedAfterReturningPaComplete )
-        {
-            printf( "TEST FAILED: Callback was invoked after returning paComplete.\n" );
-        }
-
-
-        err = Pa_StopStream( stream );
-        if( err != paNoError ) goto error;
-
-        printf( "sleeping for 1 second...\n" );
-        Pa_Sleep( 1000 );
-    }
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_clip.c b/libs/portaudio/test/patest_clip.c
deleted file mode 100644
index 4580ed0c4b..0000000000
--- a/libs/portaudio/test/patest_clip.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/** @file patest_clip.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds at an amplitude 
-	that would require clipping.
-
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_clip.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (4)
-#define SAMPLE_RATE   (44100)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (200)
-
-typedef struct paTestData
-{
-    float sine[TABLE_SIZE];
-    float amplitude;
-    int left_phase;
-    int right_phase;
-}
-paTestData;
-
-PaError PlaySine( paTestData *data, unsigned long flags, float amplitude );
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int sineCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    float amplitude = data->amplitude;
-    unsigned int i;
-    (void) inputBuffer; /* Prevent "unused variable" warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = amplitude * data->sine[data->left_phase];  /* left */
-        *out++ = amplitude * data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    return 0;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError err;
-    paTestData data;
-    int i;
-
-    printf("PortAudio Test: output sine wave with and without clipping.\n");
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-
-    printf("\nHalf amplitude. Should sound like sine wave.\n"); fflush(stdout);
-    err = PlaySine( &data, paClipOff | paDitherOff, 0.5f );
-    if( err < 0 ) goto error;
-
-    printf("\nFull amplitude. Should sound like sine wave.\n"); fflush(stdout);
-    err = PlaySine( &data, paClipOff | paDitherOff, 0.999f );
-    if( err < 0 ) goto error;
-
-    printf("\nOver range with clipping and dithering turned OFF. Should sound very nasty.\n");
-    fflush(stdout);
-    err = PlaySine( &data, paClipOff | paDitherOff, 1.1f );
-    if( err < 0 ) goto error;
-
-    printf("\nOver range with clipping and dithering turned ON.  Should sound smoother than previous.\n");
-    fflush(stdout);
-    err = PlaySine( &data, paNoFlag, 1.1f );
-    if( err < 0 ) goto error;
-
-    printf("\nOver range with paClipOff but dithering ON.\n"
-           "That forces clipping ON so it should sound the same as previous.\n");
-    fflush(stdout);
-    err = PlaySine( &data, paClipOff, 1.1f );
-    if( err < 0 ) goto error;
-    
-    return 0;
-error:
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return 1;
-}
-/*****************************************************************************/
-PaError PlaySine( paTestData *data, unsigned long flags, float amplitude )
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-
-    data->left_phase = data->right_phase = 0;
-    data->amplitude = amplitude;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              1024,
-              flags,
-              sineCallback,
-              data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( NUM_SECONDS * 1000 );
-    printf("CPULoad = %8.6f\n", Pa_GetStreamCpuLoad( stream ) );
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-    return paNoError;
-error:
-    return err;
-}
diff --git a/libs/portaudio/test/patest_dither.c b/libs/portaudio/test/patest_dither.c
deleted file mode 100644
index 0a97ec945f..0000000000
--- a/libs/portaudio/test/patest_dither.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/** @file patest_dither.c
-	@ingroup test_src
-	@brief Attempt to hear difference between dithered and non-dithered signal.
-
-	This only has an effect if the native format is 16 bit.
-
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_dither.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-
-#define NUM_SECONDS   (5)
-#define SAMPLE_RATE   (44100)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (200)
-
-typedef struct paTestData
-{
-    float sine[TABLE_SIZE];
-    float amplitude;
-    int   left_phase;
-    int   right_phase;
-}
-paTestData;
-                         
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int sineCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-			             const PaStreamCallbackTimeInfo *timeInfo,
-			             PaStreamCallbackFlags statusFlags, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    float amplitude = data->amplitude;
-    unsigned int i;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = amplitude * data->sine[data->left_phase];  /* left */
-        *out++ = amplitude * data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-/*
-    V18 version did not call Pa_Terminate() if Pa_Initialize() failed.
-    This V19 version ALWAYS calls Pa_Terminate(). PS.
-*/
-PaError PlaySine( paTestData *data, PaStreamFlags flags, float amplitude );
-PaError PlaySine( paTestData *data, PaStreamFlags flags, float amplitude )
-{
-    PaStream*           stream;
-    PaStreamParameters  outputParameters;
-    PaError             err;
-
-    data->left_phase = data->right_phase = 0;
-    data->amplitude  = amplitude;
-
-    err = Pa_Initialize();
-    if (err != paNoError)
-        goto done;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* default output device */
-    outputParameters.channelCount = 2;                      /* stereo output */
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.sampleFormat = paFloat32;      /* 32 bit floating point output. */
-                                                    /* When you change this, also    */
-                                                    /* adapt the callback routine!   */ 
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )
-                                        ->defaultLowOutputLatency;   /* Low latency. */
-    err = Pa_OpenStream( &stream,
-                         NULL,                              /* No input. */
-                         &outputParameters,
-                         SAMPLE_RATE,
-                         1024,                              /* frames per buffer */
-                         flags,
-                         sineCallback,
-                         (void*)data );
-    if (err != paNoError)
-        goto done;
-
-    err = Pa_StartStream( stream );
-    if (err != paNoError)
-        goto done;
-
-    Pa_Sleep( NUM_SECONDS * 1000 );
-    printf("CPULoad = %8.6f\n", Pa_GetStreamCpuLoad(stream));
-    
-    err = Pa_CloseStream( stream );
-done:
-    Pa_Sleep( 250 );  /* Just a small silence. */
-    Pa_Terminate();
-    return err;
-}
-
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError     err;
-    paTestData  DATA;
-    int         i;
-    float       amplitude = 4.0 / (1<<15);
-    
-    printf("PortAudio Test: output EXTREMELY QUIET sine wave with and without dithering.\n");
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        DATA.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    printf("\nNo treatment..\n"); fflush(stdout);
-    err = PlaySine( &DATA, paClipOff | paDitherOff, amplitude );
-    if( err < 0 ) goto done;
-
-    printf("\nClip..\n");
-    fflush(stdout);
-    err = PlaySine( &DATA, paDitherOff, amplitude );
-    if( err < 0 ) goto done;
-
-    printf("\nClip and Dither..\n");
-    fflush(stdout);
-    err = PlaySine( &DATA, paNoFlag, amplitude );
-done:
-    if (err)
-        {
-        fprintf( stderr, "An error occured while using the portaudio stream\n" );
-        fprintf( stderr, "Error number: %d\n", err );
-        fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-        err = 1; /* Though PlaySine() already called Pa_Terminate(), */
-        }        /* we may still call Pa_GetErrorText().             */
-    else
-        printf("\n(Don't forget to turn the VOLUME DOWN after listening so carefully.)\n");
-    return err;  /* 0 or 1. */
-}
diff --git a/libs/portaudio/test/patest_dsound_surround.c b/libs/portaudio/test/patest_dsound_surround.c
deleted file mode 100644
index 4536529419..0000000000
--- a/libs/portaudio/test/patest_dsound_surround.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * $Id: $
- * Portable Audio I/O Library
- * Windows DirectSound surround sound output test
- *
- * Copyright (c) 2007 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-
-#include <windows.h>    /* required when using pa_win_wmme.h */
-#include <mmsystem.h>   /* required when using pa_win_wmme.h */
-
-#include "portaudio.h"
-#include "pa_win_ds.h"
-
-#define NUM_SECONDS         (12)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE          (100)
-
-#define CHANNEL_COUNT       (6)
-
-
-
-typedef struct
-{
-    float sine[TABLE_SIZE];
-	int phase;
-	int currentChannel;
-	int cycleCount;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i,j;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-		for( j = 0; j < CHANNEL_COUNT; ++j ){
-			if( j == data->currentChannel && data->cycleCount < 4410 ){
-				*out++ = data->sine[data->phase];
-				data->phase += 1 + j;	// play each channel at a different pitch so they can be distinguished
-				if( data->phase >= TABLE_SIZE ){
-					data->phase -= TABLE_SIZE;
-				}
-			}else{
-				*out++ = 0;
-			}
-		}
-    
-		data->cycleCount++;
-		if( data->cycleCount > 44100 ){
-			data->cycleCount = 0;
-
-			++data->currentChannel;
-			if( data->currentChannel >= CHANNEL_COUNT )
-				data->currentChannel -= CHANNEL_COUNT;
-		}
-	}
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(int argc, char* argv[])
-{
-    PaStreamParameters outputParameters;
-    PaWinDirectSoundStreamInfo directSoundStreamInfo;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int deviceIndex;
-
-    printf("PortAudio Test: output a sine blip on each channel. SR = %d, BufSize = %d, Chans = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER, CHANNEL_COUNT);
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-	deviceIndex = Pa_GetHostApiInfo( Pa_HostApiTypeIdToHostApiIndex( paDirectSound ) )->defaultOutputDevice;
-	if( argc == 2 ){
-		sscanf( argv[1], "%d", &deviceIndex );
-	}
-
-	printf( "using device id %d (%s)\n", deviceIndex, Pa_GetDeviceInfo(deviceIndex)->name );
-
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-
-	data.phase = 0;
-	data.currentChannel = 0;
-	data.cycleCount = 0;
-
-    outputParameters.device = deviceIndex;
-    outputParameters.channelCount = CHANNEL_COUNT;
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point processing */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* it's not strictly necessary to provide a channelMask for surround sound
-       output. But if you want to be sure which channel mask PortAudio will use
-       then you should supply one */
-    directSoundStreamInfo.size = sizeof(PaWinDirectSoundStreamInfo);
-    directSoundStreamInfo.hostApiType = paDirectSound; 
-    directSoundStreamInfo.version = 1;
-    directSoundStreamInfo.flags = paWinDirectSoundUseChannelMask;
-    directSoundStreamInfo.channelMask = PAWIN_SPEAKER_5POINT1; /* request 5.1 output format */
-    outputParameters.hostApiSpecificStreamInfo = &directSoundStreamInfo;
-
-	if( Pa_IsFormatSupported( 0, &outputParameters, SAMPLE_RATE ) == paFormatIsSupported  ){
-		printf( "Pa_IsFormatSupported reports device will support %d channels.\n", CHANNEL_COUNT );
-	}else{
-		printf( "Pa_IsFormatSupported reports device will not support %d channels.\n", CHANNEL_COUNT );
-	}
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
-
diff --git a/libs/portaudio/test/patest_hang.c b/libs/portaudio/test/patest_hang.c
deleted file mode 100644
index 8667bc6b4d..0000000000
--- a/libs/portaudio/test/patest_hang.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/** @file patest_hang.c
-	@ingroup test_src
-	@brief Play a sine then hang audio callback to test watchdog.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_hang.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-
-#define SAMPLE_RATE       (44100)
-#define FRAMES_PER_BUFFER (1024)
-#ifndef M_PI
-#define M_PI              (3.14159265)
-#endif
-#define TWOPI             (M_PI * 2.0)
-
-typedef struct paTestData
-{
-    int    sleepFor;
-    double phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    double phaseInc = 0.02;
-    double phase = data->phase;
-    
-    (void) inputBuffer; /* Prevent unused argument warning. */
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        phase += phaseInc;
-        if( phase > TWOPI ) phase -= TWOPI;
-        /* This is not a very efficient way to calc sines. */
-        *out++ = (float) sin( phase ); /* mono */
-    }
-    
-    if( data->sleepFor > 0 )
-    {
-        Pa_Sleep( data->sleepFor );
-    }
-    
-    data->phase = phase;
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream*           stream;
-    PaStreamParameters  outputParameters;
-    PaError             err;
-    int                 i;
-    paTestData          data = {0};
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n",
-        SAMPLE_RATE, FRAMES_PER_BUFFER );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* Default output device. */
-    outputParameters.channelCount = 1;                     /* Mono output. */
-    outputParameters.sampleFormat = paFloat32;             /* 32 bit floating point. */
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.suggestedLatency          = Pa_GetDeviceInfo(outputParameters.device)
-                                                 ->defaultLowOutputLatency;
-    err = Pa_OpenStream(&stream,
-                        NULL,                    /* No input. */
-                        &outputParameters,
-                        SAMPLE_RATE,
-                        FRAMES_PER_BUFFER,
-                        paClipOff,               /* No out of range samples. */
-                        patestCallback,
-                        &data);
-    if (err != paNoError) goto error;
-    
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    /* Gradually increase sleep time. */
-    /* Was: for( i=0; i<10000; i+= 1000 ) */
-    for(i=0; i <= 1000; i += 100)
-    {
-        printf("Sleep for %d milliseconds in audio callback.\n", i );
-        data.sleepFor = i;
-        Pa_Sleep( ((i<1000) ? 1000 : i) );
-    }
-    
-    printf("Suffer for 10 seconds.\n");
-    Pa_Sleep( 10000 );
-    
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_in_overflow.c b/libs/portaudio/test/patest_in_overflow.c
deleted file mode 100644
index aa5be523fd..0000000000
--- a/libs/portaudio/test/patest_in_overflow.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/** @file patest_in_overflow.c
-	@ingroup test_src
-	@brief Count input overflows (using paInputOverflow flag) under 
-	overloaded and normal conditions.
-    This test uses the same method to overload the stream as does
-    patest_out_underflow.c -- it generates sine waves until the cpu load
-    exceeds a certain level. However this test is only concerned with
-    input and so doesn't ouput any sound.
-    
-    @author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_in_overflow.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2004 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define MAX_SINES     (500)
-#define MAX_LOAD      (1.2)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (512)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-typedef struct paTestData
-{
-    int sineCount;
-    double phases[MAX_SINES];
-    int countOverflows;
-    int inputOverflowCount;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float out;          /* variable to hold dummy output */
-    unsigned long i;
-    int j;
-    int finished = paContinue;
-    (void) timeInfo;    /* Prevent unused variable warning. */
-    (void) inputBuffer; /* Prevent unused variable warning. */
-    (void) outputBuffer; /* Prevent unused variable warning. */
-
-    if( data->countOverflows && (statusFlags & paInputOverflow) )
-        data->inputOverflowCount++;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        float output = 0.0;
-        double phaseInc = 0.02;
-        double phase;
-
-        for( j=0; j<data->sineCount; j++ )
-        {
-            /* Advance phase of next oscillator. */
-            phase = data->phases[j];
-            phase += phaseInc;
-            if( phase > TWOPI ) phase -= TWOPI;
-
-            phaseInc *= 1.02;
-            if( phaseInc > 0.5 ) phaseInc *= 0.5;
-
-            /* This is not a very efficient way to calc sines. */
-            output += (float) sin( phase );
-            data->phases[j] = phase;
-        }
-        /* this is an input-only stream so we don't actually use the output */
-        out = (float) (output / data->sineCount);
-        (void) out; /* suppress unused variable warning*/
-    }
-
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters inputParameters;
-    PaStream *stream;
-    PaError err;
-    int safeSineCount, stressedSineCount;
-    int safeOverflowCount, stressedOverflowCount;
-    paTestData data = {0};
-    double load;
-
-
-    printf("PortAudio Test: input only, no sound output. Load callback by performing calculations, count input overflows. SR = %d, BufSize = %d. MAX_LOAD = %f\n",
-        SAMPLE_RATE, FRAMES_PER_BUFFER, (float)MAX_LOAD );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    inputParameters.device = Pa_GetDefaultInputDevice();  /* default input device */
-    inputParameters.channelCount = 1;                      /* mono output */
-    inputParameters.sampleFormat = paFloat32;              /* 32 bit floating point output */
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              NULL,    /* no output */
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,    /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );    
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Establishing load conditions...\n" );
-
-    /* Determine number of sines required to get to 50% */
-    do
-    {
-        data.sineCount++;
-        Pa_Sleep( 100 );
-
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("sineCount = %d, CPU load = %f\n", data.sineCount, load );
-    }
-    while( load < 0.5 && data.sineCount < (MAX_SINES-1));
-
-    safeSineCount = data.sineCount;
-
-    /* Calculate target stress value then ramp up to that level*/
-    stressedSineCount = (int) (2.0 * data.sineCount * MAX_LOAD );
-    if( stressedSineCount > MAX_SINES )
-        stressedSineCount = MAX_SINES;
-    for( ; data.sineCount < stressedSineCount; data.sineCount++ )
-    {
-        Pa_Sleep( 100 );
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("STRESSING: sineCount = %d, CPU load = %f\n", data.sineCount, load );
-    }
-    
-    printf("Counting overflows for 5 seconds.\n");
-    data.countOverflows = 1;
-    Pa_Sleep( 5000 );
-
-    stressedOverflowCount = data.inputOverflowCount;
-
-    data.countOverflows = 0;
-    data.sineCount = safeSineCount;
-
-    printf("Resuming safe load...\n");
-    Pa_Sleep( 1500 );
-    data.inputOverflowCount = 0;
-    Pa_Sleep( 1500 );
-    load = Pa_GetStreamCpuLoad( stream );
-    printf("sineCount = %d, CPU load = %f\n", data.sineCount, load );
-
-    printf("Counting overflows for 5 seconds.\n");
-    data.countOverflows = 1;
-    Pa_Sleep( 5000 );
-
-    safeOverflowCount = data.inputOverflowCount;
-    
-    printf("Stop stream.\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-
-    if( stressedOverflowCount == 0 )
-        printf("Test failed, no input overflows detected under stress.\n");
-    else if( safeOverflowCount != 0 )
-        printf("Test failed, %d unexpected overflows detected under safe load.\n", safeOverflowCount);
-    else
-        printf("Test passed, %d expected input overflows detected under stress, 0 unexpected overflows detected under safe load.\n", stressedOverflowCount );
-
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_latency.c b/libs/portaudio/test/patest_latency.c
deleted file mode 100644
index 23331f80bf..0000000000
--- a/libs/portaudio/test/patest_latency.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/** @file
-	@ingroup test_src
-	@brief Hear the latency caused by big buffers.
-	Play a sine wave and change frequency based on letter input.
-	@author Phil Burk <philburk@softsynth.com>, and Darren Gibbs
-*/
-/*
- * $Id: patest_latency.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDevice())
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (64)
-
-#define MIN_FREQ            (100.0f)
-#define CalcPhaseIncrement(freq)  ((freq)/SAMPLE_RATE)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (400)
-
-typedef struct
-{
-    float sine[TABLE_SIZE + 1]; /* add one for guard point for interpolation */
-    float phase_increment;
-    float left_phase;
-    float right_phase;
-}
-paTestData;
-
-float LookupSine( paTestData *data, float phase );
-/* Convert phase between and 1.0 to sine value
- * using linear interpolation.
- */
-float LookupSine( paTestData *data, float phase )
-{
-    float fIndex = phase*TABLE_SIZE;
-    int   index = (int) fIndex;
-    float fract = fIndex - index;
-    float lo = data->sine[index];
-    float hi = data->sine[index+1];
-    float val = lo + fract*(hi-lo);
-    return val;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    int i;
-
-    (void) inputBuffer; /* Prevent unused variable warning. */
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = LookupSine(data, data->left_phase);  /* left */
-        *out++ = LookupSine(data, data->right_phase);  /* right */
-        data->left_phase += data->phase_increment;
-        if( data->left_phase >= 1.0f ) data->left_phase -= 1.0f;
-        data->right_phase += (data->phase_increment * 1.5f); /* fifth above */
-        if( data->right_phase >= 1.0f ) data->right_phase -= 1.0f;
-    }
-    return 0;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream *stream;
-    PaStreamParameters outputParameters;
-    PaError err;
-    paTestData data;
-    int i;
-    int done = 0;
-
-    printf("PortAudio Test: enter letter then hit ENTER.\n" );
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = 0.90f * (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.sine[TABLE_SIZE] = data.sine[0]; /* set guard point. */
-    data.left_phase = data.right_phase = 0.0;
-    data.phase_increment = CalcPhaseIncrement(MIN_FREQ);
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    printf("PortAudio Test: output device = %d\n", OUTPUT_DEVICE );
-
-    outputParameters.device = OUTPUT_DEVICE;
-    outputParameters.channelCount = 2;         /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    
-    printf("Requested output latency = %.4f seconds.\n", outputParameters.suggestedLatency );
-    printf("%d frames per buffer.\n.", FRAMES_PER_BUFFER );
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff|paDitherOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Play ASCII keyboard. Hit 'q' to stop. (Use RETURN key on Mac)\n");
-    fflush(stdout);
-    while ( !done )
-    {
-        float  freq;
-        int index;
-        char c;
-        do
-        {
-            c = getchar();
-        }
-        while( c < ' '); /* Strip white space and control chars. */
-
-        if( c == 'q' ) done = 1;
-        index = c % 26;
-        freq = MIN_FREQ + (index * 40.0);
-        data.phase_increment = CalcPhaseIncrement(freq);
-    }
-    printf("Call Pa_StopStream()\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_leftright.c b/libs/portaudio/test/patest_leftright.c
deleted file mode 100644
index 52ecc2ea1b..0000000000
--- a/libs/portaudio/test/patest_leftright.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/** @file patest_leftright.c
-	@ingroup test_src
-	@brief Play different tone sine waves that 
-		alternate between left and right channel.
-
-	The low tone should be on the left channel.
-
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_leftright.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (8)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (512)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    int toggle;
-    int countDown;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer,
-                           void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        if( data->toggle )
-        {
-            *out++ = data->sine[data->left_phase];  /* left */
-            *out++ = 0;  /* right */
-        }
-        else
-        {
-            *out++ = 0;  /* left */
-            *out++ = data->sine[data->right_phase];  /* right */
-        }
-
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-
-    if( data->countDown < 0 )
-    {
-        data->countDown = SAMPLE_RATE;
-        data->toggle = !data->toggle;
-    }
-    data->countDown -= framesPerBuffer;
-
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream *stream;
-    PaStreamParameters outputParameters;
-    PaError err;
-    paTestData data;
-    int i;
-    int timeout;
-    
-    printf("Play different tone sine waves that alternate between left and right channel.\n");
-    printf("The low tone should be on the left channel.\n");
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = data.toggle = 0;
-    data.countDown = SAMPLE_RATE;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream( &stream,
-                         NULL,                  /* No input. */
-                         &outputParameters,     /* As above. */
-                         SAMPLE_RATE,
-                         FRAMES_PER_BUFFER,
-                         paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-                         patestCallback,
-                         &data );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    
-    printf("Play for several seconds.\n");
-    timeout = NUM_SECONDS * 4;
-    while( timeout > 0 )
-    {
-        Pa_Sleep( 300 );        /*(Irix very much likes sleeps <= 1000 ms.)*/
-        timeout -= 1;
-    }
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_longsine.c b/libs/portaudio/test/patest_longsine.c
deleted file mode 100644
index 8eab4c8ddd..0000000000
--- a/libs/portaudio/test/patest_longsine.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/** @file patest_longsine.c
-	@ingroup test_src
-	@brief Play a sine wave until ENTER hit.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_longsine.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
- 
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-
-#define SAMPLE_RATE   (44100)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback(const void*                     inputBuffer,
-                          void*                           outputBuffer,
-                          unsigned long                   framesPerBuffer,
-                          const PaStreamCallbackTimeInfo* timeInfo,
-                          PaStreamCallbackFlags           statusFlags,
-                          void*                           userData)
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-    (void) inputBuffer; /* Prevent unused argument warning. */
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    return 0;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    printf("PortAudio Test: output sine wave.\n");
-
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;                     /* stereo output */
-    outputParameters.sampleFormat = paFloat32;             /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream( &stream,
-                         NULL,              /* No input. */
-                         &outputParameters, /* As above. */
-                         SAMPLE_RATE,
-                         256,               /* Frames per buffer. */
-                         paClipOff,         /* No out of range samples expected. */
-                         patestCallback,
-                         &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Hit ENTER to stop program.\n");
-    getchar();
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-
-    printf("Test finished.\n");
-    return err;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_many.c b/libs/portaudio/test/patest_many.c
deleted file mode 100644
index eb2be4f9a6..0000000000
--- a/libs/portaudio/test/patest_many.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/** @file patest_many.c
-	@ingroup test_src
-	@brief Start and stop the PortAudio Driver multiple times.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_many.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "portaudio.h"
-#define NUM_SECONDS   (1)
-#define SAMPLE_RATE   (44100)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    short sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    unsigned int sampsToGo;
-}
-paTestData;
-PaError TestOnce( void );
-static int patest1Callback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData );
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patest1Callback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    short *out = (short*)outputBuffer;
-    unsigned int i;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent "unused variable" warnings. */
-
-    if( data->sampsToGo < framesPerBuffer )
-    {
-        /* final buffer... */
-
-        for( i=0; i<data->sampsToGo; i++ )
-        {
-            *out++ = data->sine[data->left_phase];  /* left */
-            *out++ = data->sine[data->right_phase];  /* right */
-            data->left_phase += 1;
-            if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-            data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-            if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-        }
-        /* zero remainder of final buffer */
-        for( ; i<framesPerBuffer; i++ )
-        {
-            *out++ = 0; /* left */
-            *out++ = 0; /* right */
-        }
-
-        finished = 1;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *out++ = data->sine[data->left_phase];  /* left */
-            *out++ = data->sine[data->right_phase];  /* right */
-            data->left_phase += 1;
-            if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-            data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-            if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-        }
-        data->sampsToGo -= framesPerBuffer;
-    }
-    return finished;
-}
-/*******************************************************************/
-#ifdef MACINTOSH
-int main(void);
-int main(void)
-{
-    int i;
-    PaError err;
-    int numLoops = 10;
-    printf("Loop %d times.\n", numLoops );
-    for( i=0; i<numLoops; i++ )
-    {
-        printf("Loop %d out of %d.\n", i+1, numLoops );
-        err = TestOnce();
-        if( err < 0 ) return 0;
-    }
-}
-#else
-int main(int argc, char **argv);
-int main(int argc, char **argv)
-{
-    PaError err;
-    int i, numLoops = 10;
-    if( argc > 1 )
-    {
-        numLoops = atoi(argv[1]);
-    }
-    for( i=0; i<numLoops; i++ )
-    {
-        printf("Loop %d out of %d.\n", i+1, numLoops );
-        err = TestOnce();
-        if( err < 0 ) return 1;
-    }
-    printf("Test complete.\n");
-    return 0;
-}
-#endif
-PaError TestOnce( void )
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int totalSamps;
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (short) (32767.0 * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. ));
-    }
-    data.left_phase = data.right_phase = 0;
-    data.sampsToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* default output device */
-    outputParameters.channelCount = 2;                      /* stereo output */
-    outputParameters.sampleFormat = paInt16;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    err = Pa_OpenStream(
-              &stream,
-              NULL,         /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              1024,         /* frames per buffer */
-              paClipOff,    /* we won't output out of range samples so don't bother clipping them */
-              patest1Callback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Waiting for sound to finish.\n");
-    Pa_Sleep(1000);
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    return paNoError;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_maxsines.c b/libs/portaudio/test/patest_maxsines.c
deleted file mode 100644
index 79e7de03f1..0000000000
--- a/libs/portaudio/test/patest_maxsines.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/** @file patest_maxsines.c
-	@ingroup test_src
-	@brief How many sine waves can we calculate and play in less than 80% CPU Load.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_maxsines.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define MAX_SINES     (500)
-#define MAX_USAGE     (0.8)
-#define SAMPLE_RATE   (44100)
-#define FREQ_TO_PHASE_INC(freq)   (freq/(float)SAMPLE_RATE)
-
-#define MIN_PHASE_INC  FREQ_TO_PHASE_INC(200.0f)
-#define MAX_PHASE_INC  (MIN_PHASE_INC * (1 << 5))
-
-#define FRAMES_PER_BUFFER  (512)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-#define TABLE_SIZE   (512)
-
-typedef struct paTestData
-{
-    int numSines;
-    float sine[TABLE_SIZE + 1]; /* add one for guard point for interpolation */
-    float phases[MAX_SINES];
-}
-paTestData;
-
-/* Convert phase between and 1.0 to sine value
- * using linear interpolation.
- */
-float LookupSine( paTestData *data, float phase );
-float LookupSine( paTestData *data, float phase )
-{
-    float fIndex = phase*TABLE_SIZE;
-    int   index = (int) fIndex;
-    float fract = fIndex - index;
-    float lo = data->sine[index];
-    float hi = data->sine[index+1];
-    float val = lo + fract*(hi-lo);
-    return val;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback(const void*                     inputBuffer,
-                          void*                           outputBuffer,
-                          unsigned long                   framesPerBuffer,
-                          const PaStreamCallbackTimeInfo* timeInfo,
-                          PaStreamCallbackFlags           statusFlags,
-                          void*                           userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    float outSample;
-    float scaler;
-    int numForScale;
-    unsigned long i;
-    int j;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent unused argument warning. */
-
-    /* Determine amplitude scaling factor */
-    numForScale = data->numSines;
-    if( numForScale < 8 ) numForScale = 8;  /* prevent pops at beginning */
-    scaler = 1.0f / numForScale;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        float output = 0.0;
-        float phaseInc = MIN_PHASE_INC;
-        float phase;
-        for( j=0; j<data->numSines; j++ )
-        {
-            /* Advance phase of next oscillator. */
-            phase = data->phases[j];
-            phase += phaseInc;
-            if( phase >= 1.0 ) phase -= 1.0;
-
-            output += LookupSine(data, phase); 
-            data->phases[j] = phase;
-            
-            phaseInc *= 1.02f;
-            if( phaseInc > MAX_PHASE_INC ) phaseInc = MIN_PHASE_INC;
-        }
-
-        outSample = (float) (output * scaler);
-        *out++ = outSample; /* Left */
-        *out++ = outSample; /* Right */
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-	int                 i;
-    PaStream*           stream;
-    PaStreamParameters  outputParameters;
-    PaError             err;
-    paTestData          data = {0};
-    double              load;
-
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.sine[TABLE_SIZE] = data.sine[0]; /* set guard point */
-
-    err = Pa_Initialize();
-    if( err != paNoError )
-        goto error;
-    outputParameters.device                    = Pa_GetDefaultOutputDevice(); /* Default output device. */
-    outputParameters.channelCount              = 2;                           /* Stereo output. */
-    outputParameters.sampleFormat              = paFloat32;                   /* 32 bit floating point output. */
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.suggestedLatency          = Pa_GetDeviceInfo(outputParameters.device)
-                                                 ->defaultHighOutputLatency;
-    err = Pa_OpenStream(&stream,
-                        NULL,               /* no input */
-                        &outputParameters,
-                        SAMPLE_RATE,
-                        FRAMES_PER_BUFFER,
-                        paClipOff,          /* No out of range samples should occur. */
-                        patestCallback,
-                        &data);
-    if( err != paNoError )
-        goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    /* Play an increasing number of sine waves until we hit MAX_USAGE */
-    do  {
-        data.numSines++;
-        Pa_Sleep(200);
-        load = Pa_GetStreamCpuLoad(stream);
-        printf("numSines = %d, CPU load = %f\n", data.numSines, load );
-        fflush(stdout);
-        } while((load < MAX_USAGE) && (data.numSines < MAX_SINES));
-
-    Pa_Sleep(2000);     /* Stay for 2 seconds around 80% CPU. */
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_mono.c b/libs/portaudio/test/patest_mono.c
deleted file mode 100644
index f55d4f4855..0000000000
--- a/libs/portaudio/test/patest_mono.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/** @file patest_mono.c
-	@ingroup test_src
-	@brief Play a monophonic sine wave using the Portable Audio api for several seconds.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_mono.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * Authors:
- *    Ross Bencina <rossb@audiomulch.com>
- *    Phil Burk <philburk@softsynth.com>
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (10)
-#define SAMPLE_RATE   (44100)
-#define AMPLITUDE     (0.8)
-#define FRAMES_PER_BUFFER  (64)
-#define OUTPUT_DEVICE Pa_GetDefaultOutputDevice()
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    /* avoid unused variable warnings */
-    (void) inputBuffer;
-    (void) timeInfo;
-    (void) statusFlags;
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->phase];  /* left */
-        data->phase += 1;
-        if( data->phase >= TABLE_SIZE ) data->phase -= TABLE_SIZE;
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    printf("PortAudio Test: output MONO sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) (AMPLITUDE * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. ));
-    }
-    data.phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = OUTPUT_DEVICE;
-    outputParameters.channelCount = 1;       /* MONO output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    
-    printf("Play for %d seconds.\n", NUM_SECONDS ); fflush(stdout);
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
\ No newline at end of file
diff --git a/libs/portaudio/test/patest_mono_asio_channel_select.c b/libs/portaudio/test/patest_mono_asio_channel_select.c
deleted file mode 100644
index 3baeaac1ff..0000000000
--- a/libs/portaudio/test/patest_mono_asio_channel_select.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/** @file pa_test_mono_asio_channel_select.c
-	@ingroup test_src
-	@brief Play a monophonic sine wave on a specific ASIO channel.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_mono_asio_channel_select.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * Authors:
- *    Ross Bencina <rossb@audiomulch.com>
- *    Phil Burk <philburk@softsynth.com>
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_asio.h"
-
-#define NUM_SECONDS   (10)
-#define SAMPLE_RATE   (44100)
-#define AMPLITUDE     (0.8)
-#define FRAMES_PER_BUFFER  (64)
-#define OUTPUT_DEVICE Pa_GetDefaultOutputDevice()
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    /* avoid unused variable warnings */
-    (void) inputBuffer;
-    (void) timeInfo;
-    (void) statusFlags;
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->phase];  /* left */
-        data->phase += 1;
-        if( data->phase >= TABLE_SIZE ) data->phase -= TABLE_SIZE;
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaAsioStreamInfo asioOutputInfo;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int outputChannelSelectors[1];
-    int i;
-    printf("PortAudio Test: output MONO sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) (AMPLITUDE * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. ));
-    }
-    data.phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = OUTPUT_DEVICE;
-    outputParameters.channelCount = 1;       /* MONO output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-
-    asioOutputInfo.size = sizeof(PaAsioStreamInfo);
-    asioOutputInfo.hostApiType = paASIO;
-    asioOutputInfo.version = 1;
-    asioOutputInfo.flags = paAsioUseChannelSelectors;
-    outputChannelSelectors[0] = 1; /* select the second (right) ASIO device channel */
-    asioOutputInfo.channelSelectors = outputChannelSelectors;
-    outputParameters.hostApiSpecificStreamInfo = &asioOutputInfo;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    
-    printf("Play for %d seconds.\n", NUM_SECONDS ); fflush(stdout);
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_multi_sine.c b/libs/portaudio/test/patest_multi_sine.c
deleted file mode 100644
index c1165a774b..0000000000
--- a/libs/portaudio/test/patest_multi_sine.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/** @file patest_multi_sine.c
-	@ingroup test_src
-	@brief Play a different sine wave on each channel.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_multi_sine.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
- 
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-
-#define SAMPLE_RATE       (44100)
-#define FRAMES_PER_BUFFER (256)
-#define FREQ_INCR         (300.0 / SAMPLE_RATE)
-#define MAX_CHANNELS      (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-typedef struct
-{
-    short   interleaved;          /* Nonzero for interleaved / zero for non-interleaved. */
-    int     numChannels;          /* Actually used. */
-    double  phases[MAX_CHANNELS]; /* Each channel gets its' own frequency. */
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback(const void*                     inputBuffer,
-                          void*                           outputBuffer,
-                          unsigned long                   framesPerBuffer,
-                          const PaStreamCallbackTimeInfo* timeInfo,
-                          PaStreamCallbackFlags           statusFlags,
-                          void*                           userData)
-{
-    int         frameIndex, channelIndex;
-    float**     outputs = (float**)outputBuffer;
-    paTestData* data    = (paTestData*)userData;
-
-    (void) inputBuffer;     /* Prevent unused arg warning. */
-    if (data->interleaved)
-        {
-        float *out = (float*)outputBuffer;      /* interleaved version */
-        for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
-            {
-            for( channelIndex=0; channelIndex<data->numChannels; channelIndex++ )
-                {
-                /* Output sine wave on every channel. */
-                *out++ = (float) sin(data->phases[channelIndex]);
-
-                /* Play each channel at a higher frequency. */
-                data->phases[channelIndex] += FREQ_INCR * (4 + channelIndex);
-                if( data->phases[channelIndex] >= (2.0 * M_PI) ) data->phases[channelIndex] -= (2.0 * M_PI);
-                }
-            }
-        }
-    else
-        {
-        for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
-            {
-            for( channelIndex=0; channelIndex<data->numChannels; channelIndex++ )
-                {
-                /* Output sine wave on every channel. */
-                outputs[channelIndex][frameIndex] = (float) sin(data->phases[channelIndex]);
-
-                /* Play each channel at a higher frequency. */
-                data->phases[channelIndex] += FREQ_INCR * (4 + channelIndex);
-                if( data->phases[channelIndex] >= (2.0 * M_PI) ) data->phases[channelIndex] -= (2.0 * M_PI);
-                }
-            }
-        }
-    return 0;
-}
-
-/*******************************************************************/
-int test(short interleaved)
-{
-    PaStream*           stream;
-    PaStreamParameters  outputParameters;
-    PaError             err;
-    const PaDeviceInfo* pdi;
-    paTestData          data;
-    short               n;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* Default output device, max channels. */
-    pdi = Pa_GetDeviceInfo(outputParameters.device);
-    outputParameters.channelCount = pdi->maxOutputChannels;
-    if (outputParameters.channelCount > MAX_CHANNELS)
-        outputParameters.channelCount = MAX_CHANNELS;
-    outputParameters.sampleFormat = paFloat32;              /* 32 bit floating point output */
-    outputParameters.suggestedLatency = pdi->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    
-    data.interleaved = interleaved;
-    data.numChannels = outputParameters.channelCount;
-    for (n = 0; n < data.numChannels; n++)
-        data.phases[n] = 0.0; /* Phases wrap and maybe don't need initialisation. */
-    printf("%d ", data.numChannels);
-    if (interleaved)
-        printf("interleaved ");
-    else
-        {
-        printf(" non-interleaved ");
-        outputParameters.sampleFormat |= paNonInterleaved;
-        }
-    printf("channels.\n");
-
-    err = Pa_OpenStream(&stream,
-                        NULL,               /* No input. */
-                        &outputParameters,
-                        SAMPLE_RATE,        /* Sample rate. */
-                        FRAMES_PER_BUFFER,  /* Frames per buffer. */
-                        paClipOff,          /* Samples never out of range, no clipping. */
-                        patestCallback,
-                        &data);
-    if (err == paNoError)
-        {
-        err = Pa_StartStream(stream);
-        if (err == paNoError)
-            {
-            printf("Hit ENTER to stop this test.\n");
-            getchar();
-            err = Pa_StopStream(stream);
-            }
-        Pa_CloseStream( stream );
-        }
-    return err;    
-}
-
-
-/*******************************************************************/
-int main(void)
-{
-    PaError err;
-
-    printf("PortAudio Test: output sine wave on each channel.\n" );
-
-    err = Pa_Initialize();
-    if (err != paNoError)
-        goto done;
-
-    err = test(1);          /* 1 means interleaved. */
-    if (err != paNoError)
-        goto done;
-
-    err = test(0);          /* 0 means not interleaved. */
-    if (err != paNoError)
-        goto done;
-
-    printf("Test finished.\n");
-done:
-    if (err)
-        {
-        fprintf(stderr, "An error occured while using the portaudio stream\n");
-        fprintf(stderr, "Error number: %d\n", err );
-        fprintf(stderr, "Error message: %s\n", Pa_GetErrorText(err));
-        }
-    Pa_Terminate();
-    return 0;
-}
diff --git a/libs/portaudio/test/patest_out_underflow.c b/libs/portaudio/test/patest_out_underflow.c
deleted file mode 100644
index e4b01be6e5..0000000000
--- a/libs/portaudio/test/patest_out_underflow.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/** @file patest_out_underflow.c
-	@ingroup test_src
-	@brief Count output underflows (using paOutputUnderflow flag) 
-	under overloaded and normal conditions.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_out_underflow.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2004 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define MAX_SINES     (500)
-#define MAX_LOAD      (1.2)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (512)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-typedef struct paTestData
-{
-    int sineCount;
-    double phases[MAX_SINES];
-    int countUnderflows;
-    int outputUnderflowCount;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int j;
-    int finished = paContinue;
-    (void) timeInfo;    /* Prevent unused variable warning. */
-    (void) inputBuffer; /* Prevent unused variable warning. */
-
-
-    if( data->countUnderflows && (statusFlags & paOutputUnderflow) )
-        data->outputUnderflowCount++;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        float output = 0.0;
-        double phaseInc = 0.02;
-        double phase;
-
-        for( j=0; j<data->sineCount; j++ )
-        {
-            /* Advance phase of next oscillator. */
-            phase = data->phases[j];
-            phase += phaseInc;
-            if( phase > TWOPI ) phase -= TWOPI;
-
-            phaseInc *= 1.02;
-            if( phaseInc > 0.5 ) phaseInc *= 0.5;
-
-            /* This is not a very efficient way to calc sines. */
-            output += (float) sin( phase );
-            data->phases[j] = phase;
-        }
-        *out++ = (float) (output / data->sineCount);
-    }
-
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    int safeSineCount, stressedSineCount;
-    int safeUnderflowCount, stressedUnderflowCount;
-    paTestData data = {0};
-    double load;
-
-
-    printf("PortAudio Test: output sine waves, count underflows. SR = %d, BufSize = %d. MAX_LOAD = %f\n",
-        SAMPLE_RATE, FRAMES_PER_BUFFER, (float)MAX_LOAD );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* default output device */
-    outputParameters.channelCount = 1;                      /* mono output */
-    outputParameters.sampleFormat = paFloat32;              /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL,         /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,    /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );    
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Establishing load conditions...\n" );
-
-    /* Determine number of sines required to get to 50% */
-    do
-    {
-        data.sineCount++;
-        Pa_Sleep( 100 );
-
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("sineCount = %d, CPU load = %f\n", data.sineCount, load );
-    }
-    while( load < 0.5 && data.sineCount < (MAX_SINES-1));
-
-    safeSineCount = data.sineCount;
-
-    /* Calculate target stress value then ramp up to that level*/
-    stressedSineCount = (int) (2.0 * data.sineCount * MAX_LOAD );
-    if( stressedSineCount > MAX_SINES )
-        stressedSineCount = MAX_SINES;
-    for( ; data.sineCount < stressedSineCount; data.sineCount++ )
-    {
-        Pa_Sleep( 100 );
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("STRESSING: sineCount = %d, CPU load = %f\n", data.sineCount, load );
-    }
-    
-    printf("Counting underflows for 5 seconds.\n");
-    data.countUnderflows = 1;
-    Pa_Sleep( 5000 );
-
-    stressedUnderflowCount = data.outputUnderflowCount;
-
-    data.countUnderflows = 0;
-    data.sineCount = safeSineCount;
-
-    printf("Resuming safe load...\n");
-    Pa_Sleep( 1500 );
-    data.outputUnderflowCount = 0;
-    Pa_Sleep( 1500 );
-    load = Pa_GetStreamCpuLoad( stream );
-    printf("sineCount = %d, CPU load = %f\n", data.sineCount, load );
-
-    printf("Counting underflows for 5 seconds.\n");
-    data.countUnderflows = 1;
-    Pa_Sleep( 5000 );
-
-    safeUnderflowCount = data.outputUnderflowCount;
-    
-    printf("Stop stream.\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-
-    if( stressedUnderflowCount == 0 )
-        printf("Test failed, no output underflows detected under stress.\n");
-    else if( safeUnderflowCount != 0 )
-        printf("Test failed, %d unexpected underflows detected under safe load.\n", safeUnderflowCount);
-    else
-        printf("Test passed, %d expected output underflows detected under stress, 0 unexpected underflows detected under safe load.\n", stressedUnderflowCount );
-
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_pink.c b/libs/portaudio/test/patest_pink.c
deleted file mode 100644
index e6e26250b5..0000000000
--- a/libs/portaudio/test/patest_pink.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/** @file patest_pink.c
-	@ingroup test_src
-	@brief Generate Pink Noise using Gardner method.
-
-	Optimization suggested by James McCartney uses a tree
-	to select which random value to replace.
-<pre>
-	x x x x x x x x x x x x x x x x 
-	x   x   x   x   x   x   x   x   
-	x       x       x       x       
-	 x               x               
-	   x   
-</pre>                            
-	Tree is generated by counting trailing zeros in an increasing index.
-	When the index is zero, no random number is selected.
-
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_pink.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define PINK_MAX_RANDOM_ROWS   (30)
-#define PINK_RANDOM_BITS       (24)
-#define PINK_RANDOM_SHIFT      ((sizeof(long)*8)-PINK_RANDOM_BITS)
-
-typedef struct
-{
-    long      pink_Rows[PINK_MAX_RANDOM_ROWS];
-    long      pink_RunningSum;   /* Used to optimize summing of generators. */
-    int       pink_Index;        /* Incremented each sample. */
-    int       pink_IndexMask;    /* Index wrapped by ANDing with this mask. */
-    float     pink_Scalar;       /* Used to scale within range of -1.0 to +1.0 */
-}
-PinkNoise;
-
-/* Prototypes */
-static unsigned long GenerateRandomNumber( void );
-void InitializePinkNoise( PinkNoise *pink, int numRows );
-float GeneratePinkNoise( PinkNoise *pink );
-
-/************************************************************/
-/* Calculate pseudo-random 32 bit number based on linear congruential method. */
-static unsigned long GenerateRandomNumber( void )
-{
-    /* Change this seed for different random sequences. */
-    static unsigned long randSeed = 22222;
-    randSeed = (randSeed * 196314165) + 907633515;
-    return randSeed;
-}
-
-/************************************************************/
-/* Setup PinkNoise structure for N rows of generators. */
-void InitializePinkNoise( PinkNoise *pink, int numRows )
-{
-    int i;
-    long pmax;
-    pink->pink_Index = 0;
-    pink->pink_IndexMask = (1<<numRows) - 1;
-    /* Calculate maximum possible signed random value. Extra 1 for white noise always added. */
-    pmax = (numRows + 1) * (1<<(PINK_RANDOM_BITS-1));
-    pink->pink_Scalar = 1.0f / pmax;
-    /* Initialize rows. */
-    for( i=0; i<numRows; i++ ) pink->pink_Rows[i] = 0;
-    pink->pink_RunningSum = 0;
-}
-
-#define PINK_MEASURE
-#ifdef PINK_MEASURE
-float pinkMax = -999.0;
-float pinkMin =  999.0;
-#endif
-
-/* Generate Pink noise values between -1.0 and +1.0 */
-float GeneratePinkNoise( PinkNoise *pink )
-{
-    long newRandom;
-    long sum;
-    float output;
-    /* Increment and mask index. */
-    pink->pink_Index = (pink->pink_Index + 1) & pink->pink_IndexMask;
-    /* If index is zero, don't update any random values. */
-    if( pink->pink_Index != 0 )
-    {
-        /* Determine how many trailing zeros in PinkIndex. */
-        /* This algorithm will hang if n==0 so test first. */
-        int numZeros = 0;
-        int n = pink->pink_Index;
-        while( (n & 1) == 0 )
-        {
-            n = n >> 1;
-            numZeros++;
-        }
-        /* Replace the indexed ROWS random value.
-         * Subtract and add back to RunningSum instead of adding all the random
-         * values together. Only one changes each time.
-         */
-        pink->pink_RunningSum -= pink->pink_Rows[numZeros];
-        newRandom = ((long)GenerateRandomNumber()) >> PINK_RANDOM_SHIFT;
-        pink->pink_RunningSum += newRandom;
-        pink->pink_Rows[numZeros] = newRandom;
-    }
-
-    /* Add extra white noise value. */
-    newRandom = ((long)GenerateRandomNumber()) >> PINK_RANDOM_SHIFT;
-    sum = pink->pink_RunningSum + newRandom;
-    /* Scale to range of -1.0 to 0.9999. */
-    output = pink->pink_Scalar * sum;
-#ifdef PINK_MEASURE
-    /* Check Min/Max */
-    if( output > pinkMax ) pinkMax = output;
-    else if( output < pinkMin ) pinkMin = output;
-#endif
-    return output;
-}
-
-/*******************************************************************/
-#define PINK_TEST
-#ifdef PINK_TEST
-
-/* Context for callback routine. */
-typedef struct
-{
-    PinkNoise   leftPink;
-    PinkNoise   rightPink;
-    unsigned int sampsToGo;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback(const void*                     inputBuffer,
-                          void*                           outputBuffer,
-                          unsigned long                   framesPerBuffer,
-			              const PaStreamCallbackTimeInfo* timeInfo,
-			              PaStreamCallbackFlags           statusFlags,
-                          void*                           userData)
-{
-    int finished;
-    int i;
-    int numFrames;
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    (void) inputBuffer; /* Prevent "unused variable" warnings. */
-
-    /* Are we almost at end. */
-    if( data->sampsToGo < framesPerBuffer )
-    {
-        numFrames = data->sampsToGo;
-        finished = 1;
-    }
-    else
-    {
-        numFrames = framesPerBuffer;
-        finished = 0;
-    }
-    for( i=0; i<numFrames; i++ )
-    {
-        *out++ = GeneratePinkNoise( &data->leftPink );
-        *out++ = GeneratePinkNoise( &data->rightPink );
-    }
-    data->sampsToGo -= numFrames;
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream*           stream;
-    PaError             err;
-    paTestData          data;
-    PaStreamParameters  outputParameters;
-    int                 totalSamps;
-    static const double SR  = 44100.0;
-    static const int    FPB = 2048; /* Frames per buffer: 46 ms buffers. */
-    
-    /* Initialize two pink noise signals with different numbers of rows. */
-    InitializePinkNoise( &data.leftPink,  12 );
-    InitializePinkNoise( &data.rightPink, 16 );
-
-    /* Look at a few values. */
-    {
-        int i;
-        float pink;
-        for( i=0; i<20; i++ )
-        {
-            pink = GeneratePinkNoise( &data.leftPink );
-            printf("Pink = %f\n", pink );
-        }
-    }
-
-    data.sampsToGo = totalSamps = (int)(60.0 * SR);   /* Play a whole minute. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    /* Open a stereo PortAudio stream so we can hear the result. */
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* Take the default output device. */
-    outputParameters.channelCount = 2;                     /* Stereo output, most likely supported. */
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.sampleFormat = paFloat32;             /* 32 bit floating point output. */
-    outputParameters.suggestedLatency =
-                     Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-    err = Pa_OpenStream(&stream,
-                        NULL,                              /* No input. */
-                        &outputParameters,
-                        SR,                                /* Sample rate. */
-                        FPB,                               /* Frames per buffer. */
-                        paClipOff, /* we won't output out of range samples so don't bother clipping them */
-                        patestCallback,
-                        &data);
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Stereo pink noise for one minute...\n");
-
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 ) Pa_Sleep(100);
-    if( err < 0 ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-#ifdef PINK_MEASURE
-    printf("Pink min = %f, max = %f\n", pinkMin, pinkMax );
-#endif
-    Pa_Terminate();
-    return 0;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return 0;
-}
-#endif /* PINK_TEST */
diff --git a/libs/portaudio/test/patest_prime.c b/libs/portaudio/test/patest_prime.c
deleted file mode 100644
index 23545e5df7..0000000000
--- a/libs/portaudio/test/patest_prime.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/** @file patest_prime.c
-	@ingroup test_src
-	@brief Test stream priming mode.
-	@author Ross Bencina http://www.audiomulch.com/~rossb
-*/
-
-/*
- * $Id: patest_prime.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
- 
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_util.h"
-
-#define NUM_BEEPS           (3)
-#define SAMPLE_RATE         (44100)
-#define SAMPLE_PERIOD       (1.0/44100.0)
-#define FRAMES_PER_BUFFER   (256)
-#define BEEP_DURATION       (400)
-#define IDLE_DURATION       (SAMPLE_RATE*2)      /* 2 seconds */
-#define SLEEP_MSEC          (50)
-
-#define STATE_BKG_IDLE      (0)
-#define STATE_BKG_BEEPING   (1)
-
-typedef struct
-{
-    float        leftPhase;
-    float        rightPhase;
-    int          state;
-    int          beepCountdown;
-    int          idleCountdown;
-}
-paTestData;
-
-static void InitializeTestData( paTestData *testData )
-{
-    testData->leftPhase = 0;
-    testData->rightPhase = 0;
-    testData->state = STATE_BKG_BEEPING;
-    testData->beepCountdown = BEEP_DURATION;
-    testData->idleCountdown = IDLE_DURATION;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-			               const PaStreamCallbackTimeInfo *timeInfo,
-			               PaStreamCallbackFlags statusFlags, void *userData )
-{
-    /* Cast data passed through stream to our structure. */
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-    int result = paContinue;
-
-    /* supress unused parameter warnings */
-    (void) inputBuffer;
-    (void) timeInfo;
-    (void) statusFlags;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        switch( data->state )
-        {
-        case STATE_BKG_IDLE:
-            *out++ = 0.0;  /* left */
-            *out++ = 0.0;  /* right */
-            --data->idleCountdown;
-            
-            if( data->idleCountdown <= 0 ) result = paComplete;
-            break;
-
-        case STATE_BKG_BEEPING:
-            if( data->beepCountdown <= 0 )
-            {
-                data->state = STATE_BKG_IDLE;
-                *out++ = 0.0;  /* left */
-                *out++ = 0.0;  /* right */
-            }
-            else
-            {
-                /* Play sawtooth wave. */
-                *out++ = data->leftPhase;  /* left */
-                *out++ = data->rightPhase;  /* right */
-                /* Generate simple sawtooth phaser that ranges between -1.0 and 1.0. */
-                data->leftPhase += 0.01f;
-                /* When signal reaches top, drop back down. */
-                if( data->leftPhase >= 1.0f ) data->leftPhase -= 2.0f;
-                /* higher pitch so we can distinguish left and right. */
-                data->rightPhase += 0.03f;
-                if( data->rightPhase >= 1.0f ) data->rightPhase -= 2.0f;
-            }
-            --data->beepCountdown;
-            break;
-        }
-    }
-    
-    return result;
-}
-
-/*******************************************************************/
-static PaError DoTest( int flags )
-{
-    PaStream *stream;
-    PaError    err;
-    paTestData data;
-    PaStreamParameters outputParameters;
-
-    InitializeTestData( &data );       
-
-    outputParameters.device = Pa_GetDefaultOutputDevice();
-    outputParameters.channelCount = 2;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.sampleFormat = paFloat32;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;
-
-    /* Open an audio I/O stream. */
-    err = Pa_OpenStream(
-        &stream,
-        NULL,                         /* no input */
-        &outputParameters,
-        SAMPLE_RATE,
-        FRAMES_PER_BUFFER,            /* frames per buffer */
-        paClipOff | flags,      /* we won't output out of range samples so don't bother clipping them */
-        patestCallback,
-        &data );
-    if( err != paNoError ) goto error;
-
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("hear \"BEEP\"\n" );
-    fflush(stdout);
-
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 ) Pa_Sleep(SLEEP_MSEC);
-    if( err < 0 ) goto error;
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    return err;
-error:
-    return err;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError    err = paNoError;
-    int        i;
-
-    /* Initialize library before making any other calls. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    printf("PortAudio Test: Testing stream playback with no priming.\n");
-    printf("PortAudio Test: you should see BEEP before you hear it.\n");
-    printf("BEEP %d times.\n", NUM_BEEPS );
-
-    for( i=0; i< NUM_BEEPS; ++i )
-    {
-        err = DoTest( 0 );
-        if( err != paNoError )
-            goto error;
-    }
-
-    printf("PortAudio Test: Testing stream playback with priming.\n");
-    printf("PortAudio Test: you should see BEEP around the same time you hear it.\n");
-    for( i=0; i< NUM_BEEPS; ++i )
-    {
-        err = DoTest( paPrimeOutputBuffersUsingStreamCallback );
-        if( err != paNoError )
-            goto error;
-    }
-
-    printf("Test finished.\n");
-
-    Pa_Terminate();
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_read_record.c b/libs/portaudio/test/patest_read_record.c
deleted file mode 100644
index 6114843496..0000000000
--- a/libs/portaudio/test/patest_read_record.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/** @file patest_read_record.c
-	@ingroup test_src
-	@brief Record input into an array; Save array to a file; Playback recorded
-    data. Implemented using the blocking API (Pa_ReadStream(), Pa_WriteStream() )
-	@author Phil Burk  http://www.softsynth.com
-    @author Ross Bencina rossb@audiomulch.com
-*/
-/*
- * $Id: patest_read_record.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "portaudio.h"
-
-/* #define SAMPLE_RATE  (17932) // Test failure to open with this value. */
-#define SAMPLE_RATE  (44100)
-#define FRAMES_PER_BUFFER (1024)
-#define NUM_SECONDS     (5)
-#define NUM_CHANNELS    (2)
-/* #define DITHER_FLAG     (paDitherOff)  */
-#define DITHER_FLAG     (0) /**/
-
-/* Select sample format. */
-#if 1
-#define PA_SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#define SAMPLE_SILENCE  (0.0f)
-#define PRINTF_S_FORMAT "%.8f"
-#elif 1
-#define PA_SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#define SAMPLE_SILENCE  (0)
-#define PRINTF_S_FORMAT "%d"
-#elif 0
-#define PA_SAMPLE_TYPE  paInt8
-typedef char SAMPLE;
-#define SAMPLE_SILENCE  (0)
-#define PRINTF_S_FORMAT "%d"
-#else
-#define PA_SAMPLE_TYPE  paUInt8
-typedef unsigned char SAMPLE;
-#define SAMPLE_SILENCE  (128)
-#define PRINTF_S_FORMAT "%d"
-#endif
-
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters inputParameters, outputParameters;
-    PaStream *stream;
-    PaError err;
-    SAMPLE *recordedSamples;
-    int i;
-    int totalFrames;
-    int numSamples;
-    int numBytes;
-    SAMPLE max, average, val;
-    
-    
-    printf("patest_read_record.c\n"); fflush(stdout);
-
-    totalFrames = NUM_SECONDS * SAMPLE_RATE; /* Record for a few seconds. */
-    numSamples = totalFrames * NUM_CHANNELS;
-
-    numBytes = numSamples * sizeof(SAMPLE);
-    recordedSamples = (SAMPLE *) malloc( numBytes );
-    if( recordedSamples == NULL )
-    {
-        printf("Could not allocate record array.\n");
-        exit(1);
-    }
-    for( i=0; i<numSamples; i++ ) recordedSamples[i] = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    inputParameters.device = Pa_GetDefaultInputDevice(); /* default input device */
-    inputParameters.channelCount = NUM_CHANNELS;
-    inputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* Record some audio. -------------------------------------------- */
-    err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              NULL,                  /* &outputParameters, */
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Now recording!!\n"); fflush(stdout);
-
-    err = Pa_ReadStream( stream, recordedSamples, totalFrames );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    /* Measure maximum peak amplitude. */
-    max = 0;
-    average = 0;
-    for( i=0; i<numSamples; i++ )
-    {
-        val = recordedSamples[i];
-        if( val < 0 ) val = -val; /* ABS */
-        if( val > max )
-        {
-            max = val;
-        }
-        average += val;
-    }
-
-    average = average / numSamples;
-
-    printf("Sample max amplitude = "PRINTF_S_FORMAT"\n", max );
-    printf("Sample average = "PRINTF_S_FORMAT"\n", average );
-/*  Was as below. Better choose at compile time because this
-    keeps generating compiler-warnings:
-    if( PA_SAMPLE_TYPE == paFloat32 )
-    {
-        printf("sample max amplitude = %f\n", max );
-        printf("sample average = %f\n", average );
-    }
-    else
-    {
-        printf("sample max amplitude = %d\n", max );
-        printf("sample average = %d\n", average );
-    }
-*/
-    /* Write recorded data to a file. */
-#if 0
-    {
-        FILE  *fid;
-        fid = fopen("recorded.raw", "wb");
-        if( fid == NULL )
-        {
-            printf("Could not open file.");
-        }
-        else
-        {
-            fwrite( recordedSamples, NUM_CHANNELS * sizeof(SAMPLE), totalFrames, fid );
-            fclose( fid );
-            printf("Wrote data to 'recorded.raw'\n");
-        }
-    }
-#endif
-
-    /* Playback recorded data.  -------------------------------------------- */
-    
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = NUM_CHANNELS;
-    outputParameters.sampleFormat =  PA_SAMPLE_TYPE;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    printf("Begin playback.\n"); fflush(stdout);
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-    if( stream )
-    {
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto error;
-        printf("Waiting for playback to finish.\n"); fflush(stdout);
-
-        err = Pa_WriteStream( stream, recordedSamples, totalFrames );
-        if( err != paNoError ) goto error;
-
-        err = Pa_CloseStream( stream );
-        if( err != paNoError ) goto error;
-        printf("Done.\n"); fflush(stdout);
-    }
-    free( recordedSamples );
-
-    Pa_Terminate();
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
-
diff --git a/libs/portaudio/test/patest_read_write_wire.c b/libs/portaudio/test/patest_read_write_wire.c
deleted file mode 100644
index 8ecbdc4d9b..0000000000
--- a/libs/portaudio/test/patest_read_write_wire.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/** @file patest_read_write_wire.c
-	@ingroup test_src
-	@brief Tests full duplex blocking I/O by passing input straight to output.
-	@author Bjorn Roche. XO Audio LLC for Z-Systems Engineering.
-    @author based on code by: Phil Burk  http://www.softsynth.com
-    @author based on code by: Ross Bencina rossb@audiomulch.com
-*/
-/*
- * $Id: patest_read_record.c 757 2004-02-13 07:48:10Z rossbencina $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include "portaudio.h"
-
-/* #define SAMPLE_RATE  (17932) // Test failure to open with this value. */
-#define SAMPLE_RATE  (44100)
-#define FRAMES_PER_BUFFER (1024)
-#define NUM_CHANNELS    (2)
-/* #define DITHER_FLAG     (paDitherOff)  */
-#define DITHER_FLAG     (0) /**/
-
-/* Select sample format. */
-#if 0
-#define PA_SAMPLE_TYPE  paFloat32
-#define SAMPLE_SIZE (4)
-#define SAMPLE_SILENCE  (0.0f)
-#define CLEAR(a) bzero( (a),  FRAMES_PER_BUFFER * NUM_CHANNELS * SAMPLE_SIZE )
-#define PRINTF_S_FORMAT "%.8f"
-#elif 0
-#define PA_SAMPLE_TYPE  paInt16
-#define SAMPLE_SIZE (2)
-#define SAMPLE_SILENCE  (0)
-#define CLEAR(a) bzero( (a),  FRAMES_PER_BUFFER * NUM_CHANNELS * SAMPLE_SIZE )
-#define PRINTF_S_FORMAT "%d"
-#elif 1
-#define PA_SAMPLE_TYPE  paInt24
-#define SAMPLE_SIZE (3)
-#define SAMPLE_SILENCE  (0)
-#define CLEAR(a) bzero( (a),  FRAMES_PER_BUFFER * NUM_CHANNELS * SAMPLE_SIZE )
-#define PRINTF_S_FORMAT "%d"
-#elif 0
-#define PA_SAMPLE_TYPE  paInt8
-#define SAMPLE_SIZE (1)
-#define SAMPLE_SILENCE  (0)
-#define CLEAR(a) bzero( (a),  FRAMES_PER_BUFFER * NUM_CHANNELS * SAMPLE_SIZE )
-#define PRINTF_S_FORMAT "%d"
-#else
-#define PA_SAMPLE_TYPE  paUInt8
-#define SAMPLE_SIZE (1)
-#define SAMPLE_SILENCE  (128)
-#define CLEAR( a ) { \
-    int i; \
-    for( i=0; i<FRAMES_PER_BUFFER*NUM_CHANNELS; i++ ) \
-        ((unsigned char *)a)[i] = (SAMPLE_SILENCE); \
-}
-#define PRINTF_S_FORMAT "%d"
-#endif
-
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters inputParameters, outputParameters;
-    PaStream *stream = NULL;
-    PaError err;
-    char *sampleBlock;
-    int i;
-    int numBytes;
-    
-    
-    printf("patest_read_write_wire.c\n"); fflush(stdout);
-
-    numBytes = FRAMES_PER_BUFFER * NUM_CHANNELS * SAMPLE_SIZE ;
-    sampleBlock = (char *) malloc( numBytes );
-    if( sampleBlock == NULL )
-    {
-        printf("Could not allocate record array.\n");
-        exit(1);
-    }
-    CLEAR( sampleBlock );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    inputParameters.device = Pa_GetDefaultInputDevice(); /* default input device */
-    printf( "Input device # %d.\n", inputParameters.device );
-    printf( "Input LL: %g s\n", Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency );
-    printf( "Input HL: %g s\n", Pa_GetDeviceInfo( inputParameters.device )->defaultHighInputLatency );
-    inputParameters.channelCount = NUM_CHANNELS;
-    inputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultHighInputLatency ;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    printf( "Output device # %d.\n", outputParameters.device );
-    printf( "Output LL: %g s\n", Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency );
-    printf( "Output HL: %g s\n", Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency );
-    outputParameters.channelCount = NUM_CHANNELS;
-    outputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* -- setup -- */
-
-   err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Wire on. Will run one minute.\n"); fflush(stdout);
-
-    for( i=0; i<(60*SAMPLE_RATE)/FRAMES_PER_BUFFER; ++i )
-    {
-       err = Pa_WriteStream( stream, sampleBlock, FRAMES_PER_BUFFER );
-       if( err ) goto xrun;
-       err = Pa_ReadStream( stream, sampleBlock, FRAMES_PER_BUFFER );
-       if( err ) goto xrun;
-    }
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    CLEAR( sampleBlock );
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    printf("Wire on. Interrupt to stop.\n"); fflush(stdout);
-
-    while( 1 )
-    {
-       err = Pa_WriteStream( stream, sampleBlock, FRAMES_PER_BUFFER );
-       if( err ) goto xrun;
-       err = Pa_ReadStream( stream, sampleBlock, FRAMES_PER_BUFFER );
-       if( err ) goto xrun;
-    }
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_CloseStream( stream );
-
-    free( sampleBlock );
-
-    Pa_Terminate();
-    return 0;
-
-xrun:
-    if( stream ) {
-       Pa_AbortStream( stream );
-       Pa_CloseStream( stream );
-    }
-    free( sampleBlock );
-    Pa_Terminate();
-    if( err & paInputOverflow )
-       fprintf( stderr, "Input Overflow.\n" );
-    if( err & paOutputUnderflow )
-       fprintf( stderr, "Output Underflow.\n" );
-    return -2;
-
-error:
-    if( stream ) {
-       Pa_AbortStream( stream );
-       Pa_CloseStream( stream );
-    }
-    free( sampleBlock );
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return -1;
-}
-
diff --git a/libs/portaudio/test/patest_record.c b/libs/portaudio/test/patest_record.c
deleted file mode 100644
index f93928eae5..0000000000
--- a/libs/portaudio/test/patest_record.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/** @file patest_record.c
-	@ingroup test_src
-	@brief Record input into an array; Save array to a file; Playback recorded data.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_record.c 1281 2007-09-16 11:06:51Z aknudsen $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "portaudio.h"
-
-/* #define SAMPLE_RATE  (17932) // Test failure to open with this value. */
-#define SAMPLE_RATE  (44100)
-#define FRAMES_PER_BUFFER (1024)
-#define NUM_SECONDS     (5)
-#define NUM_CHANNELS    (2)
-/* #define DITHER_FLAG     (paDitherOff) */
-#define DITHER_FLAG     (0) /**/
-
-/* Select sample format. */
-#if 1
-#define PA_SAMPLE_TYPE  paFloat32
-typedef float SAMPLE;
-#define SAMPLE_SILENCE  (0.0f)
-#define PRINTF_S_FORMAT "%.8f"
-#elif 1
-#define PA_SAMPLE_TYPE  paInt16
-typedef short SAMPLE;
-#define SAMPLE_SILENCE  (0)
-#define PRINTF_S_FORMAT "%d"
-#elif 0
-#define PA_SAMPLE_TYPE  paInt8
-typedef char SAMPLE;
-#define SAMPLE_SILENCE  (0)
-#define PRINTF_S_FORMAT "%d"
-#else
-#define PA_SAMPLE_TYPE  paUInt8
-typedef unsigned char SAMPLE;
-#define SAMPLE_SILENCE  (128)
-#define PRINTF_S_FORMAT "%d"
-#endif
-
-typedef struct
-{
-    int          frameIndex;  /* Index into sample array. */
-    int          maxFrameIndex;
-    SAMPLE      *recordedSamples;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int recordCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    const SAMPLE *rptr = (const SAMPLE*)inputBuffer;
-    SAMPLE *wptr = &data->recordedSamples[data->frameIndex * NUM_CHANNELS];
-    long framesToCalc;
-    long i;
-    int finished;
-    unsigned long framesLeft = data->maxFrameIndex - data->frameIndex;
-
-    (void) outputBuffer; /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-    (void) userData;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        framesToCalc = framesLeft;
-        finished = paComplete;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        finished = paContinue;
-    }
-
-    if( inputBuffer == NULL )
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = SAMPLE_SILENCE;  /* left */
-            if( NUM_CHANNELS == 2 ) *wptr++ = SAMPLE_SILENCE;  /* right */
-        }
-    }
-    else
-    {
-        for( i=0; i<framesToCalc; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            if( NUM_CHANNELS == 2 ) *wptr++ = *rptr++;  /* right */
-        }
-    }
-    data->frameIndex += framesToCalc;
-    return finished;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int playCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         const PaStreamCallbackTimeInfo* timeInfo,
-                         PaStreamCallbackFlags statusFlags,
-                         void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE *rptr = &data->recordedSamples[data->frameIndex * NUM_CHANNELS];
-    SAMPLE *wptr = (SAMPLE*)outputBuffer;
-    unsigned int i;
-    int finished;
-    unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
-
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-    (void) userData;
-
-    if( framesLeft < framesPerBuffer )
-    {
-        /* final buffer... */
-        for( i=0; i<framesLeft; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            if( NUM_CHANNELS == 2 ) *wptr++ = *rptr++;  /* right */
-        }
-        for( ; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = 0;  /* left */
-            if( NUM_CHANNELS == 2 ) *wptr++ = 0;  /* right */
-        }
-        data->frameIndex += framesLeft;
-        finished = paComplete;
-    }
-    else
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *wptr++ = *rptr++;  /* left */
-            if( NUM_CHANNELS == 2 ) *wptr++ = *rptr++;  /* right */
-        }
-        data->frameIndex += framesPerBuffer;
-        finished = paContinue;
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters  inputParameters,
-                        outputParameters;
-    PaStream*           stream;
-    PaError             err = paNoError;
-    paTestData          data;
-    int                 i;
-    int                 totalFrames;
-    int                 numSamples;
-    int                 numBytes;
-    SAMPLE              max, val;
-    double              average;
-
-    printf("patest_record.c\n"); fflush(stdout);
-
-    data.maxFrameIndex = totalFrames = NUM_SECONDS * SAMPLE_RATE; /* Record for a few seconds. */
-    data.frameIndex = 0;
-    numSamples = totalFrames * NUM_CHANNELS;
-    numBytes = numSamples * sizeof(SAMPLE);
-    data.recordedSamples = (SAMPLE *) malloc( numBytes ); /* From now on, recordedSamples is initialised. */
-    if( data.recordedSamples == NULL )
-    {
-        printf("Could not allocate record array.\n");
-        goto done;
-    }
-    for( i=0; i<numSamples; i++ ) data.recordedSamples[i] = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto done;
-
-    inputParameters.device = Pa_GetDefaultInputDevice(); /* default input device */
-    inputParameters.channelCount = 2;                    /* stereo input */
-    inputParameters.sampleFormat = PA_SAMPLE_TYPE;
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* Record some audio. -------------------------------------------- */
-    err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              NULL,                  /* &outputParameters, */
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              recordCallback,
-              &data );
-    if( err != paNoError ) goto done;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto done;
-    printf("Now recording!!\n"); fflush(stdout);
-
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 )
-    {
-        Pa_Sleep(1000);
-        printf("index = %d\n", data.frameIndex ); fflush(stdout);
-    }
-    if( err < 0 ) goto done;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto done;
-
-    /* Measure maximum peak amplitude. */
-    max = 0;
-    average = 0.0;
-    for( i=0; i<numSamples; i++ )
-    {
-        val = data.recordedSamples[i];
-        if( val < 0 ) val = -val; /* ABS */
-        if( val > max )
-        {
-            max = val;
-        }
-        average += val;
-    }
-
-    average = average / (double)numSamples;
-
-    printf("sample max amplitude = "PRINTF_S_FORMAT"\n", max );
-    printf("sample average = %lf\n", average );
-
-    /* Write recorded data to a file. */
-#if 0
-    {
-        FILE  *fid;
-        fid = fopen("recorded.raw", "wb");
-        if( fid == NULL )
-        {
-            printf("Could not open file.");
-        }
-        else
-        {
-            fwrite( data.recordedSamples, NUM_CHANNELS * sizeof(SAMPLE), totalFrames, fid );
-            fclose( fid );
-            printf("Wrote data to 'recorded.raw'\n");
-        }
-    }
-#endif
-
-    /* Playback recorded data.  -------------------------------------------- */
-    data.frameIndex = 0;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;                     /* stereo output */
-    outputParameters.sampleFormat =  PA_SAMPLE_TYPE;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    printf("Begin playback.\n"); fflush(stdout);
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              playCallback,
-              &data );
-    if( err != paNoError ) goto done;
-
-    if( stream )
-    {
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto done;
-        
-        printf("Waiting for playback to finish.\n"); fflush(stdout);
-
-        while( ( err = Pa_IsStreamActive( stream ) ) == 1 ) Pa_Sleep(100);
-        if( err < 0 ) goto done;
-        
-        err = Pa_CloseStream( stream );
-        if( err != paNoError ) goto done;
-        
-        printf("Done.\n"); fflush(stdout);
-    }
-
-done:
-    Pa_Terminate();
-    if( data.recordedSamples )       /* Sure it is NULL or valid. */
-        free( data.recordedSamples );
-    if( err != paNoError )
-    {
-        fprintf( stderr, "An error occured while using the portaudio stream\n" );
-        fprintf( stderr, "Error number: %d\n", err );
-        fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-        err = 1;          /* Always return 0 or 1, but no other return codes. */
-    }
-    return err;
-}
-
diff --git a/libs/portaudio/test/patest_ringmix.c b/libs/portaudio/test/patest_ringmix.c
deleted file mode 100644
index 6f1432e9dd..0000000000
--- a/libs/portaudio/test/patest_ringmix.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/** @file patest_ringmix.c
-	@ingroup test_src
-	@brief Ring modulate inputs to left output, mix inputs to right output.
-*/
-/*
- * $Id: patest_ringmix.c 1097 2006-08-26 08:27:53Z rossb $ 
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-
-#include "stdio.h"
-#include "portaudio.h"
-/* This will be called asynchronously by the PortAudio engine. */
-static int myCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    const float *in  = (const float *) inputBuffer;
-	float *out = (float *) outputBuffer;    
-    float leftInput, rightInput;
-    unsigned int i;
-
-    /* Read input buffer, process data, and fill output buffer. */
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        leftInput = *in++;      /* Get interleaved samples from input buffer. */
-        rightInput = *in++;
-        *out++ = leftInput * rightInput;            /* ring modulation */
-        *out++ = 0.5f * (leftInput + rightInput);   /* mix */
-    }
-    return 0;
-}
-
-/* Open a PortAudioStream to input and output audio data. */
-int main(void)
-{
-    PaStream *stream;
-    Pa_Initialize();
-    Pa_OpenDefaultStream(
-        &stream,
-        2, 2,               /* stereo input and output */
-        paFloat32,  44100.0,
-        64,                 /* 64 frames per buffer */
-        myCallback, NULL );
-    Pa_StartStream( stream );
-    Pa_Sleep( 10000 );    /* Sleep for 10 seconds while processing. */
-    Pa_StopStream( stream );
-    Pa_CloseStream( stream );
-    Pa_Terminate();
-    return 0;
-}
diff --git a/libs/portaudio/test/patest_saw.c b/libs/portaudio/test/patest_saw.c
deleted file mode 100644
index 135bfc0b11..0000000000
--- a/libs/portaudio/test/patest_saw.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/** @file patest_saw.c
-	@ingroup test_src
-	@brief Play a simple (aliasing) sawtooth wave.
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_saw.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#define NUM_SECONDS   (4)
-#define SAMPLE_RATE   (44100)
-
-typedef struct
-{
-    float left_phase;
-    float right_phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    /* Cast data passed through stream to our structure. */
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-    (void) inputBuffer; /* Prevent unused variable warning. */
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->left_phase;  /* left */
-        *out++ = data->right_phase;  /* right */
-        /* Generate simple sawtooth phaser that ranges between -1.0 and 1.0. */
-        data->left_phase += 0.01f;
-        /* When signal reaches top, drop back down. */
-        if( data->left_phase >= 1.0f ) data->left_phase -= 2.0f;
-        /* higher pitch so we can distinguish left and right. */
-        data->right_phase += 0.03f;
-        if( data->right_phase >= 1.0f ) data->right_phase -= 2.0f;
-    }
-    return 0;
-}
-
-/*******************************************************************/
-static paTestData data;
-int main(void);
-int main(void)
-{
-    PaStream *stream;
-    PaError err;
-    
-    printf("PortAudio Test: output sawtooth wave.\n");
-    /* Initialize our data for use by callback. */
-    data.left_phase = data.right_phase = 0.0;
-    /* Initialize library before making any other calls. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    /* Open an audio I/O stream. */
-    err = Pa_OpenDefaultStream( &stream,
-                                0,          /* no input channels */
-                                2,          /* stereo output */
-                                paFloat32,  /* 32 bit floating point output */
-                                SAMPLE_RATE,
-                                256,        /* frames per buffer */
-                                patestCallback,
-                                &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    /* Sleep for several seconds. */
-    Pa_Sleep(NUM_SECONDS*1000);
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sine.c b/libs/portaudio/test/patest_sine.c
deleted file mode 100644
index 70eebc5d5b..0000000000
--- a/libs/portaudio/test/patest_sine.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/** @file patest_sine.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds.
-	@author Ross Bencina <rossb@audiomulch.com>
-    @author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_sine.c 1294 2007-10-24 20:51:22Z bjornroche $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (5)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    char message[20];
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    
-    return paContinue;
-}
-
-/*
- * This routine is called by portaudio when playback is done.
- */
-static void StreamFinished( void* userData )
-{
-   paTestData *data = (paTestData *) userData;
-   printf( "Stream Completed: %s\n", data->message );
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    sprintf( data.message, "No Message" );
-    err = Pa_SetStreamFinishedCallback( stream, &StreamFinished );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sine8.c b/libs/portaudio/test/patest_sine8.c
deleted file mode 100644
index 171d2ef3d8..0000000000
--- a/libs/portaudio/test/patest_sine8.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/** @file patest_sine8.c
-	@ingroup test_src
-	@brief Test 8 bit data: play a sine wave for several seconds.
-	@author Ross Bencina <rossb@audiomulch.com>
-*/
-/*
- * $Id: patest_sine8.c 1162 2006-12-18 20:40:35Z bjornroche $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (8)
-#define SAMPLE_RATE   (44100)
-#define TABLE_SIZE    (200)
-#define TEST_UNSIGNED (0)
-
-#if TEST_UNSIGNED
-#define TEST_FORMAT   paUInt8
-#else
-#define TEST_FORMAT   paInt8
-#endif
-
-#ifndef M_PI
-#define M_PI (3.14159265)
-#endif
-
-typedef struct
-{
-#if TEST_UNSIGNED
-    unsigned char sine[TABLE_SIZE];
-#else
-    char sine[TABLE_SIZE];
-#endif
-    int left_phase;
-    int right_phase;
-    unsigned int framesToGo;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    char *out = (char*)outputBuffer;
-    int i;
-    int framesToCalc;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-
-    if( data->framesToGo < framesPerBuffer )
-    {
-        framesToCalc = data->framesToGo;
-        data->framesToGo = 0;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        data->framesToGo -= framesPerBuffer;
-    }
-
-    for( i=0; i<framesToCalc; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    /* zero remainder of final buffer */
-    for( ; i<(int)framesPerBuffer; i++ )
-    {
-#if TEST_UNSIGNED
-        *out++ = (unsigned char) 0x80; /* left */
-        *out++ = (unsigned char) 0x80; /* right */
-#else
-        *out++ = 0; /* left */
-        *out++ = 0; /* right */
-#endif
-
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters  outputParameters;
-    PaStream*           stream;
-    PaError             err;
-    paTestData          data;
-    PaTime              streamOpened;
-    int                 i, totalSamps;
-
-#if TEST_UNSIGNED
-    printf("PortAudio Test: output UNsigned 8 bit sine wave.\n");
-#else
-    printf("PortAudio Test: output signed 8 bit sine wave.\n");
-#endif
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (char) (127.0 * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. ));
-#if TEST_UNSIGNED
-        data.sine[i] += (unsigned char) 0x80;
-#endif
-    }
-    data.left_phase = data.right_phase = 0;
-    data.framesToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-
-    err = Pa_Initialize();
-    if( err != paNoError )
-        goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* Default output device. */
-    outputParameters.channelCount = 2;                     /* Stereo output. */
-    outputParameters.sampleFormat = TEST_FORMAT;
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    err = Pa_OpenStream( &stream,
-                         NULL,      /* No input. */
-                         &outputParameters,
-                         SAMPLE_RATE,
-                         256,       /* Frames per buffer. */
-                         paClipOff, /* We won't output out of range samples so don't bother clipping them. */
-                         patestCallback,
-                         &data );
-    if( err != paNoError )
-        goto error;
-
-    streamOpened = Pa_GetStreamTime( stream ); /* Time in seconds when stream was opened (approx). */
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    /* Watch until sound is halfway finished. */
-    /* (Was ( Pa_StreamTime( stream ) < (totalSamps/2) ) in V18. */
-    while( (Pa_GetStreamTime( stream ) - streamOpened) < (PaTime)NUM_SECONDS / 2.0 )
-        Pa_Sleep(10);
-
-    /* Stop sound. */
-    printf("Stopping Stream.\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    printf("Pause for 2 seconds.\n");
-    Pa_Sleep( 2000 );
-
-    printf("Starting again.\n");
-    err = Pa_StartStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    printf("Waiting for sound to finish.\n");
-
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 )
-        Pa_Sleep(100);
-    if( err < 0 )
-        goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError )
-        goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sine_channelmaps.c b/libs/portaudio/test/patest_sine_channelmaps.c
deleted file mode 100644
index 4de40fe20a..0000000000
--- a/libs/portaudio/test/patest_sine_channelmaps.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/** @file patest_sine.c
-	@ingroup test_src
-	@brief Plays sine waves using sme simple channel maps.
-          Designed for use with COreAudio, but should made to work with other APIs
-	@author Bjorn Roche <bjorn@xowave.com>
-   @author Ross Bencina <rossb@audiomulch.com>
-   @author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_sine.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#ifdef __APPLE__
-#include "pa_mac_core.h"
-#endif
-
-#define NUM_SECONDS   (5)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-#ifdef __APPLE__
-    PaMacCoreStreamInfo macInfo;
-    const SInt32 channelMap[4] = { -1, -1, 0, 1 };
-#endif
-    int i;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    printf("Output will be mapped to channels 2 and 3 instead of 0 and 1.\n");
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    /** setup host specific info */
-#ifdef __APPLE__
-    PaMacCore_SetupStreamInfo( &macInfo, paMacCorePlayNice );
-    PaMacCore_SetupChannelMap( &macInfo, channelMap, 4 );
-
-    for( i=0; i<4; ++i )
-       printf( "channel %d name: %s\n", i, PaMacCore_GetChannelName( Pa_GetDefaultOutputDevice(), i, false ) );
-#else
-    printf( "Channel mapping not supported on this platform. Reverting to normal sine test.\n" );
-#endif
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-#ifdef __APPLE__
-    outputParameters.hostApiSpecificStreamInfo = &macInfo;
-#else
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-#endif
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sine_formats.c b/libs/portaudio/test/patest_sine_formats.c
deleted file mode 100644
index 22bfa594f5..0000000000
--- a/libs/portaudio/test/patest_sine_formats.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/** @file patest_sine_formats.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds. Test various data formats.
-	@author Phil Burk
-*/
-/*
- * $Id: patest_sine_formats.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS        (10)
-#define SAMPLE_RATE        (44100)
-#define FRAMES_PER_BUFFER  (512)
-#define LEFT_FREQ          (SAMPLE_RATE/256.0)  /* So we hit 1.0 */
-#define RIGHT_FREQ         (500.0)
-#define AMPLITUDE          (1.0)
-
-/* Select ONE format for testing. */
-#define TEST_UINT8    (0)
-#define TEST_INT8     (0)
-#define TEST_INT16    (1)
-#define TEST_FLOAT32  (0)
-
-#if TEST_UINT8
-#define TEST_FORMAT         paUInt8
-typedef unsigned char       SAMPLE_t;
-#define SAMPLE_ZERO         (0x80)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(127.0 * (x)))
-#define FORMAT_NAME         "Unsigned 8 Bit"
-
-#elif TEST_INT8
-#define TEST_FORMAT         paInt8
-typedef char                SAMPLE_t;
-#define SAMPLE_ZERO         (0)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(127.0 * (x)))
-#define FORMAT_NAME         "Signed 8 Bit"
-
-#elif TEST_INT16
-#define TEST_FORMAT         paInt16
-typedef short               SAMPLE_t;
-#define SAMPLE_ZERO         (0)
-#define DOUBLE_TO_SAMPLE(x) (SAMPLE_ZERO + (SAMPLE_t)(32767 * (x)))
-#define FORMAT_NAME         "Signed 16 Bit"
-
-#elif TEST_FLOAT32
-#define TEST_FORMAT         paFloat32
-typedef float               SAMPLE_t;
-#define SAMPLE_ZERO         (0.0)
-#define DOUBLE_TO_SAMPLE(x) ((SAMPLE_t)(x))
-#define FORMAT_NAME         "Float 32 Bit"
-#endif
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-
-typedef struct
-{
-    double left_phase;
-    double right_phase;
-    unsigned int framesToGo;
-}
-paTestData;
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer,
-                           void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    SAMPLE_t *out = (SAMPLE_t *)outputBuffer;
-    int i;
-    int framesToCalc;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-
-    if( data->framesToGo < framesPerBuffer )
-    {
-        framesToCalc = data->framesToGo;
-        data->framesToGo = 0;
-        finished = 1;
-    }
-    else
-    {
-        framesToCalc = framesPerBuffer;
-        data->framesToGo -= framesPerBuffer;
-    }
-
-    for( i=0; i<framesToCalc; i++ )
-    {
-        data->left_phase += (LEFT_FREQ / SAMPLE_RATE);
-        if( data->left_phase > 1.0) data->left_phase -= 1.0;
-        *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->left_phase * M_PI * 2. )));
-
-        data->right_phase += (RIGHT_FREQ / SAMPLE_RATE);
-        if( data->right_phase > 1.0) data->right_phase -= 1.0;
-        *out++ = DOUBLE_TO_SAMPLE( AMPLITUDE * sin( (data->right_phase * M_PI * 2. )));
-    }
-    /* zero remainder of final buffer */
-    for( ; i<(int)framesPerBuffer; i++ )
-    {
-        *out++ = SAMPLE_ZERO; /* left */
-        *out++ = SAMPLE_ZERO; /* right */
-    }
-    return finished;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream *stream;
-    PaStreamParameters outputParameters;
-    PaError err;
-    paTestData data;
-    int totalSamps;
-
-    printf("PortAudio Test: output " FORMAT_NAME "\n");
-
-    data.left_phase = data.right_phase = 0.0;
-    data.framesToGo = totalSamps =  NUM_SECONDS * SAMPLE_RATE; /* Play for a few seconds. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-
-    outputParameters.device           = Pa_GetDefaultOutputDevice(); /* Default output device. */
-    outputParameters.channelCount     = 2;                           /* Stereo output */
-    outputParameters.sampleFormat     = TEST_FORMAT;                 /* Selected above. */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    err = Pa_OpenStream( &stream,
-                         NULL,                  /* No input. */
-                         &outputParameters,     /* As above. */
-                         SAMPLE_RATE,
-                         FRAMES_PER_BUFFER,
-                         paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-                         patestCallback,
-                         &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Waiting %d seconds for sound to finish.\n", NUM_SECONDS );
-
-    while( ( err = Pa_IsStreamActive( stream ) ) == 1 ) Pa_Sleep(100);
-    if( err < 0 ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-
-    printf("PortAudio Test Finished: " FORMAT_NAME "\n");
-
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sine_time.c b/libs/portaudio/test/patest_sine_time.c
deleted file mode 100644
index e095111155..0000000000
--- a/libs/portaudio/test/patest_sine_time.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/** @file patest_sine_time.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds, pausing in the middle.
-	Uses the Pa_GetStreamTime() call.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_sine_time.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-
-#include "portaudio.h"
-#include "pa_util.h"
-
-#define NUM_SECONDS   (8)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-#define TABLE_SIZE   (200)
-
-typedef struct
-{
-    double           left_phase;
-    double           right_phase;
-    volatile PaTime  outTime;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-
-    double left_phaseInc = 0.02;
-    double right_phaseInc = 0.06;
-
-    double left_phase = data->left_phase;
-    double right_phase = data->right_phase;
-
-    (void) statusFlags; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    data->outTime = timeInfo->outputBufferDacTime;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        left_phase += left_phaseInc;
-        if( left_phase > TWOPI ) left_phase -= TWOPI;
-        *out++ = (float) sin( left_phase );
-
-        right_phase += right_phaseInc;
-        if( right_phase > TWOPI ) right_phase -= TWOPI;
-        *out++ = (float) sin( right_phase );
-    }
-
-    data->left_phase = left_phase;
-    data->right_phase = right_phase;
-
-    return paContinue;
-}
-
-/*******************************************************************/
-static void ReportStreamTime( PaStream *stream, paTestData *data );
-static void ReportStreamTime( PaStream *stream, paTestData *data )
-{
-    PaTime  streamTime, latency, outTime;
-    
-    streamTime = Pa_GetStreamTime( stream );
-    outTime = data->outTime;
-    if( outTime < 0.0 )
-    {
-        printf("Stream time = %8.1f\n", streamTime );
-    }
-    else
-    {
-        latency = outTime - streamTime;
-        printf("Stream time = %8.4f, outTime = %8.4f, latency = %8.4f\n",
-            streamTime, outTime, latency );
-    }
-    fflush(stdout);
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    PaTime startTime;
-
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-
-    data.left_phase = data.right_phase = 0;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-          
-    /* Watch until sound is halfway finished. */
-    printf("Play for %d seconds.\n", NUM_SECONDS/2 ); fflush(stdout);
-
-    data.outTime = -1.0; /* mark time for callback as undefined */
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    startTime = Pa_GetStreamTime( stream );
-
-    do
-    {
-        ReportStreamTime( stream, &data );
-        Pa_Sleep(100);
-    } while( (Pa_GetStreamTime( stream ) - startTime) < (NUM_SECONDS/2) );
-    
-    /* Stop sound for 2 seconds. */
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    printf("Pause for 2 seconds.\n"); fflush(stdout);
-    Pa_Sleep( 2000 );
-
-    data.outTime = -1.0; /* mark time for callback as undefined */
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    startTime = Pa_GetStreamTime( stream );
-    
-    printf("Play until sound is finished.\n"); fflush(stdout);
-    do
-    {
-        ReportStreamTime( stream, &data );
-        Pa_Sleep(100);
-    } while( (Pa_GetStreamTime( stream ) - startTime) < (NUM_SECONDS/2) );
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-    
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_start_stop.c b/libs/portaudio/test/patest_start_stop.c
deleted file mode 100644
index 8c3bb0641e..0000000000
--- a/libs/portaudio/test/patest_start_stop.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/** @file patest_start_stop.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds. Start and stop the stream multiple times.
-        
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_start_stop.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE Pa_GetDefaultOutputDevice()   /* default output device */
-
-#define NUM_SECONDS   (3)
-#define NUM_LOOPS     (4)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (400)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = OUTPUT_DEVICE;
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    for( i=0; i<NUM_LOOPS; i++ )
-    {
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto error;
-
-        printf("Play for %d seconds.\n", NUM_SECONDS );
-        Pa_Sleep( NUM_SECONDS * 1000 );
-
-        err = Pa_StopStream( stream );
-        if( err != paNoError ) goto error;
-
-        printf("Stopped.\n" );
-        Pa_Sleep( 1000 );
-    }
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_stop.c b/libs/portaudio/test/patest_stop.c
deleted file mode 100644
index ca80ee304a..0000000000
--- a/libs/portaudio/test/patest_stop.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/** @file patest_stop.c
-	@ingroup test_src
-	@brief Test different ways of stopping audio.
-
-	Test the three ways of stopping audio:
-		- calling Pa_StopStream(),
-		- calling Pa_AbortStream(),
-		- and returning a 1 from the callback function.
-
-	A long latency is set up so that you can hear the difference.
-	Then a simple 8 note sequence is repeated twice.
-	The program will print what you should hear.
-
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_stop.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDevice())
-#define SLEEP_DUR           (200)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (256)
-#define LATENCY_SECONDS     (3.f)
-#define FRAMES_PER_NOTE     (SAMPLE_RATE/2)
-#define MAX_REPEATS         (2)
-#define FUNDAMENTAL         (400.0f / SAMPLE_RATE)
-#define NOTE_0              (FUNDAMENTAL * 1.0f / 1.0f)
-#define NOTE_1              (FUNDAMENTAL * 5.0f / 4.0f)
-#define NOTE_2              (FUNDAMENTAL * 4.0f / 3.0f)
-#define NOTE_3              (FUNDAMENTAL * 3.0f / 2.0f)
-#define NOTE_4              (FUNDAMENTAL * 2.0f / 1.0f)
-#define MODE_FINISH    (0)
-#define MODE_STOP      (1)
-#define MODE_ABORT     (2)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TABLE_SIZE   (400)
-
-typedef struct
-{
-    float  waveform[TABLE_SIZE + 1]; /* Add one for guard point for interpolation. */
-    float  phase_increment;
-    float  phase;
-    float *tune;
-    int    notesPerTune;
-    int    frameCounter;
-    int    noteCounter;
-    int    repeatCounter;
-    PaTime outTime;
-    int    stopMode;
-    int    done;
-}
-paTestData;
-
-/************* Prototypes *****************************/
-int TestStopMode( paTestData *data );
-float LookupWaveform( paTestData *data, float phase );
-
-/******************************************************
- * Convert phase between 0.0 and 1.0 to waveform value 
- * using linear interpolation.
- */
-float LookupWaveform( paTestData *data, float phase )
-{
-    float fIndex = phase*TABLE_SIZE;
-    int   index = (int) fIndex;
-    float fract = fIndex - index;
-    float lo = data->waveform[index];
-    float hi = data->waveform[index+1];
-    float val = lo + fract*(hi-lo);
-    return val;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    float value;
-    unsigned int i = 0;
-    int finished = paContinue;
-
-    (void) inputBuffer;     /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-
-
-    /* data->outTime = outTime; */
-    
-    if( !data->done )
-    {
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            /* Are we done with this note? */
-            if( data->frameCounter >= FRAMES_PER_NOTE )
-            {
-                data->noteCounter += 1;
-                data->frameCounter = 0;
-                /* Are we done with this tune? */
-                if( data->noteCounter >= data->notesPerTune )
-                {
-                    data->noteCounter = 0;
-                    data->repeatCounter += 1;
-                    /* Are we totally done? */
-                    if( data->repeatCounter >= MAX_REPEATS )
-                    {
-                        data->done = 1;
-                        if( data->stopMode == MODE_FINISH )
-                        {
-                            finished = paComplete;
-                            break;
-                        }
-                    }
-                }
-                data->phase_increment = data->tune[data->noteCounter];
-            }
-            value = LookupWaveform(data, data->phase);
-            *out++ = value;  /* left */
-            *out++ = value;  /* right */
-            data->phase += data->phase_increment;
-            if( data->phase >= 1.0f ) data->phase -= 1.0f;
-
-            data->frameCounter += 1;
-        }
-    }
-    /* zero remainder of final buffer */
-    for( ; i<framesPerBuffer; i++ )
-    {
-        *out++ = 0; /* left */
-        *out++ = 0; /* right */
-    }
-    return finished;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    paTestData data;
-    int i;
-    float simpleTune[] = { NOTE_0, NOTE_1, NOTE_2, NOTE_3, NOTE_4, NOTE_3, NOTE_2, NOTE_1 };
-    
-    printf("PortAudio Test: play song and test stopping. ask for %f seconds latency\n", LATENCY_SECONDS );
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.waveform[i] = (float) (
-                               (0.2 * sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. )) +
-                               (0.2 * sin( ((double)(3*i)/(double)TABLE_SIZE) * M_PI * 2. )) +
-                               (0.1 * sin( ((double)(5*i)/(double)TABLE_SIZE) * M_PI * 2. ))
-                           );
-    }
-    data.waveform[TABLE_SIZE] = data.waveform[0]; /* Set guard point. */
-    data.tune = &simpleTune[0];
-    data.notesPerTune = sizeof(simpleTune) / sizeof(float);
-
-    printf("Test MODE_FINISH - callback returns 1.\n");
-    printf("Should hear entire %d note tune repeated twice.\n", data.notesPerTune);
-    data.stopMode = MODE_FINISH;
-    if( TestStopMode( &data ) != paNoError )
-    {
-        printf("Test of MODE_FINISH failed!\n");
-        goto error;
-    }
-
-    printf("Test MODE_STOP - stop when song is done.\n");
-    printf("Should hear entire %d note tune repeated twice.\n", data.notesPerTune);
-    data.stopMode = MODE_STOP;
-    if( TestStopMode( &data ) != paNoError )
-    {
-        printf("Test of MODE_STOP failed!\n");
-        goto error;
-    }
-
-    printf("Test MODE_ABORT - abort immediately.\n");
-    printf("Should hear last repetition cut short by %f seconds.\n", LATENCY_SECONDS);
-    data.stopMode = MODE_ABORT;
-    if( TestStopMode( &data ) != paNoError )
-    {
-        printf("Test of MODE_ABORT failed!\n");
-        goto error;
-    }
-
-    return 0;
-
-error:
-    return 1;
-}
-
-int TestStopMode( paTestData *data )
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    
-    data->done = 0;
-    data->phase = 0.0;
-    data->frameCounter = 0;
-    data->noteCounter = 0;
-    data->repeatCounter = 0;
-    data->phase_increment = data->tune[data->noteCounter];
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = OUTPUT_DEVICE;
-    outputParameters.channelCount = 2;          /* stereo output */
-    outputParameters.sampleFormat = paFloat32;  /* 32 bit floating point output */
-    outputParameters.suggestedLatency = LATENCY_SECONDS;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    if( data->stopMode == MODE_FINISH )
-    {
-        while( ( err = Pa_IsStreamActive( stream ) ) == 1 )
-        {
-            /*printf("outTime = %g, note# = %d, repeat# = %d\n", data->outTime,
-             data->noteCounter, data->repeatCounter  );
-            fflush(stdout); */
-            Pa_Sleep( SLEEP_DUR );
-        }
-        if( err < 0 ) goto error;
-    }
-    else
-    {
-        while( data->repeatCounter < MAX_REPEATS )
-        {
-            /*printf("outTime = %g, note# = %d, repeat# = %d\n", data->outTime,
-             data->noteCounter, data->repeatCounter  );
-            fflush(stdout); */
-            Pa_Sleep( SLEEP_DUR );
-        }
-    }
-
-    if( data->stopMode == MODE_ABORT )
-    {
-        printf("Call Pa_AbortStream()\n");
-        err = Pa_AbortStream( stream );
-    }
-    else
-    {
-        printf("Call Pa_StopStream()\n");
-        err = Pa_StopStream( stream );
-    }
-    if( err != paNoError ) goto error;
-
-    printf("Call Pa_CloseStream()\n"); fflush(stdout);
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-
-    return err;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_stop_playout.c b/libs/portaudio/test/patest_stop_playout.c
deleted file mode 100644
index e35905a272..0000000000
--- a/libs/portaudio/test/patest_stop_playout.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/** @file patest_stop_playout.c
-	@ingroup test_src
-	@brief Test whether all queued samples are played when Pa_StopStream()
-            is used with a callback or read/write stream, or when the callback
-            returns paComplete.
-	@author Ross Bencina <rossb@audiomulch.com>
-*/
-/*
- * $Id: patest_stop_playout.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2004 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (1024)
-
-#define TONE_SECONDS        (1)      /* long tone */
-#define TONE_FADE_SECONDS   (.04)    /* fades at start and end of long tone */
-#define GAP_SECONDS         (.25)     /* gap between long tone and blip */
-#define BLIP_SECONDS        (.035)   /* short blip */
-
-#define NUM_REPEATS         (3)
-
-#ifndef M_PI
-#define M_PI (3.14159265)
-#endif
-
-#define TABLE_SIZE          (2048)
-typedef struct
-{
-    float sine[TABLE_SIZE+1];
-
-    int repeatCount;
-    
-    double phase;
-    double lowIncrement, highIncrement;
-    
-    int gap1Length, toneLength, toneFadesLength, gap2Length, blipLength;
-    int gap1Countdown, toneCountdown, gap2Countdown, blipCountdown;
-}
-TestData;
-
-
-static void RetriggerTestSignalGenerator( TestData *data )
-{
-    data->phase = 0.;
-    data->gap1Countdown = data->gap1Length;
-    data->toneCountdown = data->toneLength;
-    data->gap2Countdown = data->gap2Length;
-    data->blipCountdown = data->blipLength;
-}
-
-
-static void ResetTestSignalGenerator( TestData *data )
-{
-    data->repeatCount = 0;
-    RetriggerTestSignalGenerator( data );
-}
-
-
-static void InitTestSignalGenerator( TestData *data )
-{
-    int signalLengthModBufferLength, i;
-
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data->sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data->sine[TABLE_SIZE] = data->sine[0]; /* guard point for linear interpolation */
-
-
-    
-    data->lowIncrement = (330. / SAMPLE_RATE) * TABLE_SIZE;
-    data->highIncrement = (1760. / SAMPLE_RATE) * TABLE_SIZE;
-
-    data->gap1Length = GAP_SECONDS * SAMPLE_RATE;
-    data->toneLength = TONE_SECONDS * SAMPLE_RATE;
-    data->toneFadesLength = TONE_FADE_SECONDS * SAMPLE_RATE;
-    data->gap2Length = GAP_SECONDS * SAMPLE_RATE;
-    data->blipLength = BLIP_SECONDS * SAMPLE_RATE;
-
-    /* adjust signal length to be a multiple of the buffer length */
-    signalLengthModBufferLength = (data->gap1Length + data->toneLength + data->gap2Length + data->blipLength) % FRAMES_PER_BUFFER;
-    if( signalLengthModBufferLength > 0 )
-        data->toneLength += signalLengthModBufferLength;
-
-    ResetTestSignalGenerator( data );
-}
-
-
-#define MIN( a, b ) (((a)<(b))?(a):(b))
-
-static void GenerateTestSignal( TestData *data, float *stereo, int frameCount )
-{
-    int framesGenerated = 0;
-    float output;
-    long index;
-    float fraction;
-    int count, i;
-
-    while( framesGenerated < frameCount && data->repeatCount < NUM_REPEATS )
-    {
-        if( framesGenerated < frameCount && data->gap1Countdown > 0 ){
-            count = MIN( frameCount - framesGenerated, data->gap1Countdown );
-            for( i=0; i < count; ++i )
-            {
-                *stereo++ = 0.f;
-                *stereo++ = 0.f;
-            }
-
-            data->gap1Countdown -= count;
-            framesGenerated += count;
-        }
-    
-        if( framesGenerated < frameCount && data->toneCountdown > 0 ){
-            count = MIN( frameCount - framesGenerated, data->toneCountdown );
-            for( i=0; i < count; ++i )
-            {
-                /* tone with data->lowIncrement phase increment */
-                index = (long)data->phase;
-                fraction = data->phase - index;
-                output = data->sine[ index ] + (data->sine[ index + 1 ] - data->sine[ index ]) * fraction;
-
-                data->phase += data->lowIncrement;
-                while( data->phase >= TABLE_SIZE )
-                    data->phase -= TABLE_SIZE;
-
-                /* apply fade to ends */
-
-                if( data->toneCountdown < data->toneFadesLength )
-                {
-                    /* cosine-bell fade out at end */
-                    output *= (-cos(((float)data->toneCountdown / (float)data->toneFadesLength) * M_PI) + 1.) * .5;
-                }
-                else if( data->toneCountdown > data->toneLength - data->toneFadesLength ) 
-                {
-                    /* cosine-bell fade in at start */
-                    output *= (cos(((float)(data->toneCountdown - (data->toneLength - data->toneFadesLength)) / (float)data->toneFadesLength) * M_PI) + 1.) * .5;
-                }
-
-                output *= .5; /* play tone half as loud as blip */
-            
-                *stereo++ = output;
-                *stereo++ = output;
-
-                data->toneCountdown--;
-            }                         
-
-            framesGenerated += count;
-        }
-
-        if( framesGenerated < frameCount && data->gap2Countdown > 0 ){
-            count = MIN( frameCount - framesGenerated, data->gap2Countdown );
-            for( i=0; i < count; ++i )
-            {
-                *stereo++ = 0.f;
-                *stereo++ = 0.f;
-            }
-
-            data->gap2Countdown -= count;
-            framesGenerated += count;
-        }
-
-        if( framesGenerated < frameCount && data->blipCountdown > 0 ){
-            count = MIN( frameCount - framesGenerated, data->blipCountdown );
-            for( i=0; i < count; ++i )
-            {
-                /* tone with data->highIncrement phase increment */
-                index = (long)data->phase;
-                fraction = data->phase - index;
-                output = data->sine[ index ] + (data->sine[ index + 1 ] - data->sine[ index ]) * fraction;
-
-                data->phase += data->highIncrement;
-                while( data->phase >= TABLE_SIZE )
-                    data->phase -= TABLE_SIZE;
-
-                /* cosine-bell envelope over whole blip */
-                output *= (-cos( ((float)data->blipCountdown / (float)data->blipLength) * 2. * M_PI) + 1.) * .5;
-                
-                *stereo++ = output;
-                *stereo++ = output;
-
-                data->blipCountdown--;
-            }
-
-            framesGenerated += count;
-        }
-
-
-        if( data->blipCountdown == 0 )
-        {
-            RetriggerTestSignalGenerator( data );
-            data->repeatCount++;
-        }        
-    }
-
-    if( framesGenerated < frameCount )
-    {
-        count = frameCount - framesGenerated;
-        for( i=0; i < count; ++i )
-        {
-            *stereo++ = 0.f;
-            *stereo++ = 0.f;
-        }
-    }
-}
-
-
-static int IsTestSignalFinished( TestData *data )
-{
-    if( data->repeatCount >= NUM_REPEATS )
-        return 1;
-    else
-        return 0;
-}
-
-
-static int TestCallback1( const void *inputBuffer, void *outputBuffer,
-                            unsigned long frameCount,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-
-    GenerateTestSignal( (TestData*)userData, (float*)outputBuffer, frameCount );
-
-    if( IsTestSignalFinished( (TestData*)userData ) )
-        return paComplete;
-    else
-        return paContinue;
-}
-
-
-volatile int testCallback2Finished = 0;
-
-static int TestCallback2( const void *inputBuffer, void *outputBuffer,
-                            unsigned long frameCount,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    (void) timeInfo;
-    (void) statusFlags;
-
-    GenerateTestSignal( (TestData*)userData, (float*)outputBuffer, frameCount );
-
-    if( IsTestSignalFinished( (TestData*)userData ) )
-        testCallback2Finished = 1;
-   
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    TestData data;
-    float writeBuffer[ FRAMES_PER_BUFFER * 2 ];
-    
-    printf("PortAudio Test: check that stopping stream plays out all queued samples. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-
-    InitTestSignalGenerator( &data );
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-/* test paComplete ---------------------------------------------------------- */
-
-    ResetTestSignalGenerator( &data );
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              TestCallback1,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-
-    printf("\nPlaying 'tone-blip' %d times using callback, stops by returning paComplete from callback.\n", NUM_REPEATS );
-    printf("If final blip is not intact, callback+paComplete implementation may be faulty.\n\n" );
-
-    while( (err = Pa_IsStreamActive( stream )) == 1 )
-        Pa_Sleep( 5 );
-
-    if( err != 0 ) goto error;
-
-    
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( 500 );
-
-/* test Pa_StopStream() with callback --------------------------------------- */
-
-    ResetTestSignalGenerator( &data );
-
-    testCallback2Finished = 0;
-    
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              TestCallback2,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-
-    printf("\nPlaying 'tone-blip' %d times using callback, stops by calling Pa_StopStream.\n", NUM_REPEATS );
-    printf("If final blip is not intact, callback+Pa_StopStream implementation may be faulty.\n\n" );
-
-    /* note that polling a volatile flag is not a good way to synchronise with
-        the callback, but it's the best we can do portably. */
-    while( !testCallback2Finished )
-        Pa_Sleep( 2 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( 500 );
-
-/* test Pa_StopStream() with Pa_WriteStream --------------------------------- */
-
-    ResetTestSignalGenerator( &data );
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-
-    printf("\nPlaying 'tone-blip' %d times using Pa_WriteStream, stops by calling Pa_StopStream.\n", NUM_REPEATS );
-    printf("If final blip is not intact, Pa_WriteStream+Pa_StopStream implementation may be faulty.\n\n" );
-
-    do{
-        GenerateTestSignal( &data, writeBuffer, FRAMES_PER_BUFFER );
-        err = Pa_WriteStream( stream, writeBuffer, FRAMES_PER_BUFFER );
-        if( err != paNoError ) goto error;
-        
-    }while( !IsTestSignalFinished( &data ) );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-/* -------------------------------------------------------------------------- */
-    
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-    
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_sync.c b/libs/portaudio/test/patest_sync.c
deleted file mode 100644
index 51bbf94f4e..0000000000
--- a/libs/portaudio/test/patest_sync.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/** @file patest_sync.c
-	@ingroup test_src
-	@brief Test time stamping and synchronization of audio and video.
-
-	A high latency is used so we can hear the difference in time.
-	Random durations are used so we know we are hearing the right beep
-	and not the one before or after.
-
-	Sequence of events:
-		-# Foreground requests a beep.
-		-# Background randomly schedules a beep.
-		-# Foreground waits for the beep to be heard based on PaUtil_GetTime().
-		-# Foreground outputs video (printf) in sync with audio.
-		-# Repeat.
-	
-	@author Phil Burk  http://www.softsynth.com
-*/
-/*
- * $Id: patest_sync.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-#include "pa_util.h"
-#define NUM_BEEPS           (6)
-#define SAMPLE_RATE         (44100)
-#define SAMPLE_PERIOD       (1.0/44100.0)
-#define FRAMES_PER_BUFFER   (256)
-#define BEEP_DURATION       (400)
-#define LATENCY_MSEC        (2000)
-#define SLEEP_MSEC          (10)
-#define TIMEOUT_MSEC        (15000)
-
-#define STATE_BKG_IDLE      (0)
-#define STATE_BKG_PENDING   (1)
-#define STATE_BKG_BEEPING   (2)
-typedef struct
-{
-    float        left_phase;
-    float        right_phase;
-    int          state;
-    volatile int requestBeep;  /* Set by foreground, cleared by background. */
-    PaTime       beepTime;
-    int          beepCount;
-    double       latency;    /* For debugging. */
-}
-paTestData;
-
-static unsigned long GenerateRandomNumber( void );
-/************************************************************/
-/* Calculate pseudo-random 32 bit number based on linear congruential method. */
-static unsigned long GenerateRandomNumber( void )
-{
-    static unsigned long randSeed = 99887766;  /* Change this for different random sequences. */
-    randSeed = (randSeed * 196314165) + 907633515;
-    return randSeed;
-}
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-			   const PaStreamCallbackTimeInfo *timeInfo,
-			   PaStreamCallbackFlags statusFlags, void *userData )
-{
-    /* Cast data passed through stream to our structure. */
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned int i;
-    (void) inputBuffer;
-
-    data->latency = timeInfo->outputBufferDacTime - timeInfo->currentTime;
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        switch( data->state )
-        {
-        case STATE_BKG_IDLE:
-            /* Schedule beep at some random time in the future. */
-            if( data->requestBeep )
-            {
-                int random = GenerateRandomNumber() >> 14;
-                data->beepTime = timeInfo->outputBufferDacTime + (( (double)(random + SAMPLE_RATE)) * SAMPLE_PERIOD );
-                data->state = STATE_BKG_PENDING;
-            }
-            *out++ = 0.0;  /* left */
-            *out++ = 0.0;  /* right */
-            break;
-
-        case STATE_BKG_PENDING:
-            if( (timeInfo->outputBufferDacTime + (i*SAMPLE_PERIOD)) >= data->beepTime )
-            {
-                data->state = STATE_BKG_BEEPING;
-                data->beepCount = BEEP_DURATION;
-                data->left_phase = data->right_phase = 0.0;
-            }
-            *out++ = 0.0;  /* left */
-            *out++ = 0.0;  /* right */
-            break;
-
-        case STATE_BKG_BEEPING:
-            if( data->beepCount <= 0 )
-            {
-                data->state = STATE_BKG_IDLE;
-                data->requestBeep = 0;
-                *out++ = 0.0;  /* left */
-                *out++ = 0.0;  /* right */
-            }
-            else
-            {
-                /* Play sawtooth wave. */
-                *out++ = data->left_phase;  /* left */
-                *out++ = data->right_phase;  /* right */
-                /* Generate simple sawtooth phaser that ranges between -1.0 and 1.0. */
-                data->left_phase += 0.01f;
-                /* When signal reaches top, drop back down. */
-                if( data->left_phase >= 1.0f ) data->left_phase -= 2.0f;
-                /* higher pitch so we can distinguish left and right. */
-                data->right_phase += 0.03f;
-                if( data->right_phase >= 1.0f ) data->right_phase -= 2.0f;
-            }
-            data->beepCount -= 1;
-            break;
-
-        default:
-            data->state = STATE_BKG_IDLE;
-            break;
-        }
-    }
-    return 0;
-}
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStream *stream;
-    PaError    err;
-    paTestData DATA;
-    int        i, timeout;
-    PaTime     previousTime;
-    PaStreamParameters outputParameters;
-    printf("PortAudio Test: you should see BEEP at the same time you hear it.\n");
-    printf("Wait for a few seconds random delay between BEEPs.\n");
-    printf("BEEP %d times.\n", NUM_BEEPS );
-    /* Initialize our DATA for use by callback. */
-    DATA.left_phase = DATA.right_phase = 0.0;
-    DATA.state = STATE_BKG_IDLE;
-    DATA.requestBeep = 0;
-    /* Initialize library before making any other calls. */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    outputParameters.device = Pa_GetDefaultOutputDevice();
-    outputParameters.channelCount = 2;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    outputParameters.sampleFormat = paFloat32;
-    outputParameters.suggestedLatency = (double)LATENCY_MSEC / 1000;
-
-    /* Open an audio I/O stream. */
-     err = Pa_OpenStream(
-              &stream,
-	      NULL,                         /* no input */
-	      &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,            /* frames per buffer */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &DATA );
-   if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("started\n");
-    fflush(stdout);
-
-    previousTime = Pa_GetStreamTime( stream );
-    for( i=0; i<NUM_BEEPS; i++ )
-    {
-        /* Request a beep from background. */
-        DATA.requestBeep = 1;
-
-        /* Wait for background to acknowledge request. */
-        timeout = TIMEOUT_MSEC;
-        while( (DATA.requestBeep == 1) && (timeout-- > 0 ) ) Pa_Sleep(SLEEP_MSEC);
-        if( timeout <= 0 )
-        {
-            fprintf( stderr, "Timed out waiting for background to acknowledge request.\n" );
-            goto error;
-        }
-        printf("calc beep for %9.3f, latency = %6.3f\n", DATA.beepTime, DATA.latency );
-        fflush(stdout);
-
-        /* Wait for scheduled beep time. */
-        timeout =  TIMEOUT_MSEC + (10000/SLEEP_MSEC);
-        while( (Pa_GetStreamTime( stream ) < DATA.beepTime) && (timeout-- > 0 ) )
-        {
-            Pa_Sleep(SLEEP_MSEC);
-        }
-        if( timeout <= 0 )
-        {
-            fprintf( stderr, "Timed out waiting for time. Now = %9.3f, Beep for %9.3f.\n",
-                     PaUtil_GetTime(), DATA.beepTime );
-            goto error;
-        }
-
-        /* Beep should be sounding now so print synchronized BEEP. */
-        printf("hear \"BEEP\" at %9.3f, delta = %9.3f\n",
-               Pa_GetStreamTime( stream ), (DATA.beepTime - previousTime) );
-        fflush(stdout);
-
-        previousTime = DATA.beepTime;
-    }
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_timing.c b/libs/portaudio/test/patest_timing.c
deleted file mode 100644
index 9f798c5f99..0000000000
--- a/libs/portaudio/test/patest_timing.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/** @file patest_timing.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds, and spits out a ton of timing info while it's at it. Based on patet_sine.c
-	@author Bjorn Roche
-	@author Ross Bencina <rossb@audiomulch.com>
-    @author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_sine.c 578 2003-09-02 04:17:38Z rossbencina $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (5)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    PaStream *stream;
-    PaTime start;
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-
-    printf( "Timing info given to callback: Adc: %g, Current: %g, Dac: %g\n",
-            timeInfo->inputBufferAdcTime,
-            timeInfo->currentTime,
-            timeInfo->outputBufferDacTime );
-
-    printf( "getStreamTime() returns: %g\n", Pa_GetStreamTime(data->stream)-data->start );
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = 0;
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    data.stream = stream;
-    data.start = Pa_GetStreamTime(stream);
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    data.start = Pa_GetStreamTime(stream);
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    printf("The tone should have been heard for about 5 seconds and all the timing info above should report that about 5 seconds elapsed (except Adc, which is undefined since there was no input device opened).\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_toomanysines.c b/libs/portaudio/test/patest_toomanysines.c
deleted file mode 100644
index 0ab8cc39e7..0000000000
--- a/libs/portaudio/test/patest_toomanysines.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/** @file patest_toomanysines.c
-	@ingroup test_src
-	@brief Play more sine waves than we can handle in real time as a stress test.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_toomanysines.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define MAX_SINES     (500)
-#define MAX_LOAD      (1.2)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (512)
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-#define TWOPI (M_PI * 2.0)
-
-typedef struct paTestData
-{
-    int numSines;
-    double phases[MAX_SINES];
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int j;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent unused variable warning. */
-
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        float output = 0.0;
-        double phaseInc = 0.02;
-        double phase;
-        for( j=0; j<data->numSines; j++ )
-        {
-            /* Advance phase of next oscillator. */
-            phase = data->phases[j];
-            phase += phaseInc;
-            if( phase > TWOPI ) phase -= TWOPI;
-
-            phaseInc *= 1.02;
-            if( phaseInc > 0.5 ) phaseInc *= 0.5;
-
-            /* This is not a very efficient way to calc sines. */
-            output += (float) sin( phase );
-            data->phases[j] = phase;
-        }
-        *out++ = (float) (output / data->numSines);
-    }
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    int numStress;
-    paTestData data = {0};
-    double load;
-
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d. MAX_LOAD = %f\n",
-        SAMPLE_RATE, FRAMES_PER_BUFFER, MAX_LOAD );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    outputParameters.device = Pa_GetDefaultOutputDevice();  /* default output device */
-    outputParameters.channelCount = 1;                      /* mono output */
-    outputParameters.sampleFormat = paFloat32;              /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL,         /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,    /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );    
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    /* Determine number of sines required to get to 50% */
-    do
-    {
-        data.numSines++;
-        Pa_Sleep( 100 );
-
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("numSines = %d, CPU load = %f\n", data.numSines, load );
-    }
-    while( load < 0.5 );
-    
-    /* Calculate target stress value then ramp up to that level*/
-    numStress = (int) (2.0 * data.numSines * MAX_LOAD );
-    for( ; data.numSines < numStress; data.numSines++ )
-    {
-        Pa_Sleep( 200 );
-        load = Pa_GetStreamCpuLoad( stream );
-        printf("STRESSING: numSines = %d, CPU load = %f\n", data.numSines, load );
-    }
-    
-    printf("Suffer for 5 seconds.\n");
-    Pa_Sleep( 5000 );
-    
-    printf("Stop stream.\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_two_rates.c b/libs/portaudio/test/patest_two_rates.c
deleted file mode 100644
index 3239fd0bea..0000000000
--- a/libs/portaudio/test/patest_two_rates.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/** @file patest_two_rates.c
-	@ingroup test_src
-	@brief Play two streams at different rates to make sure they don't interfere.
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_two_rates.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * Author: Phil Burk  http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define OUTPUT_DEVICE       (Pa_GetDefaultOutputDeviceID())
-#define SAMPLE_RATE_1       (44100)
-#define SAMPLE_RATE_2       (44100)
-#define FRAMES_PER_BUFFER   (256)
-#define FREQ_INCR           (0.1)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-typedef struct
-{
-    double phase;
-    double numFrames;
-} paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           PaTimestamp outTime, void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    int frameIndex, channelIndex;
-    int finished = 0;
-    (void) outTime; /* Prevent unused variable warnings. */
-    (void) inputBuffer;
-
-    for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
-    {
-        /* Generate sine wave. */
-        float value = (float) 0.3 * sin(data->phase);
-        /* Stereo - two channels. */
-        *out++ = value;
-        *out++ = value;
-
-        data->phase += FREQ_INCR;
-        if( data->phase >= (2.0 * M_PI) ) data->phase -= (2.0 * M_PI);
-    }
-
-    return 0;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError err;
-    PortAudioStream *stream1;
-    PortAudioStream *stream2;
-    paTestData data1 = {0};
-    paTestData data2 = {0};
-    printf("PortAudio Test: two rates.\n" );
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    /* Start first stream. **********************/
-    err = Pa_OpenStream(
-              &stream1,
-              paNoDevice, /* default input device */
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              2,          /* Stereo */
-              paFloat32,  /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE_1,
-              FRAMES_PER_BUFFER,  /* frames per buffer */
-              0,    /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data1 );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream1 );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( 3 * 1000 );
-
-    /* Start second stream. **********************/
-    err = Pa_OpenStream(
-              &stream2,
-              paNoDevice, /* default input device */
-              0,              /* no input */
-              paFloat32,  /* 32 bit floating point input */
-              NULL,
-              OUTPUT_DEVICE,
-              2,          /* Stereo */
-              paFloat32,  /* 32 bit floating point output */
-              NULL,
-              SAMPLE_RATE_2,
-              FRAMES_PER_BUFFER,  /* frames per buffer */
-              0,    /* number of buffers, if zero then use default minimum */
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data2 );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream2 );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( 3 * 1000 );
-    
-    err = Pa_StopStream( stream2 );
-    if( err != paNoError ) goto error;
-
-    Pa_Sleep( 3 * 1000 );
-    
-    err = Pa_StopStream( stream1 );
-    if( err != paNoError ) goto error;
-
-    Pa_CloseStream( stream2 );
-    Pa_CloseStream( stream1 );
-    
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_underflow.c b/libs/portaudio/test/patest_underflow.c
deleted file mode 100644
index f5c13d63e4..0000000000
--- a/libs/portaudio/test/patest_underflow.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/** @file patest_underflow.c
-	@ingroup test_src
-	@brief Simulate an output buffer underflow condition.
-	Tests whether the stream can be stopped when underflowing buffers.
-	@author Ross Bencina <rossb@audiomulch.com>
-	@author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_underflow.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS   (20)
-#define SAMPLE_RATE   (44100)
-#define FRAMES_PER_BUFFER  (2048)
-#define MSEC_PER_BUFFER  ( (FRAMES_PER_BUFFER * 1000) / SAMPLE_RATE )
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-typedef struct
-{
-    float sine[TABLE_SIZE];
-    int left_phase;
-    int right_phase;
-    int sleepTime;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                           unsigned long framesPerBuffer,
-                           const PaStreamCallbackTimeInfo* timeInfo,
-                           PaStreamCallbackFlags statusFlags,
-                           void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i;
-    int finished = 0;
-    (void) inputBuffer; /* Prevent unused variable warnings. */
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-        *out++ = data->sine[data->left_phase];  /* left */
-        *out++ = data->sine[data->right_phase];  /* right */
-        data->left_phase += 1;
-        if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
-        data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
-        if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
-    }
-
-    /* Cause underflow to occur. */
-    if( data->sleepTime > 0 ) Pa_Sleep( data->sleepTime );
-    data->sleepTime += 1;
-
-    return finished;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-    data.left_phase = data.right_phase = data.sleepTime = 0;
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-    
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    while( data.sleepTime < (2 * MSEC_PER_BUFFER) )
-    {
-        printf("SleepTime = %d\n", data.sleepTime );
-        Pa_Sleep( data.sleepTime );
-    }
-
-    printf("Try to stop stream.\n");
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-    Pa_Terminate();
-    printf("Test finished.\n");
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_wire.c b/libs/portaudio/test/patest_wire.c
deleted file mode 100644
index 82e3715c98..0000000000
--- a/libs/portaudio/test/patest_wire.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/** @file patest_wire.c
-	@ingroup test_src
-	@brief Pass input directly to output.
-
-	Note that some HW devices, for example many ISA audio cards
-	on PCs, do NOT support full duplex! For a PC, you normally need
-	a PCI based audio card such as the SBLive.
-
-	@author Phil Burk  http://www.softsynth.com
-    
- While adapting to V19-API, I excluded configs with framesPerCallback=0
- because of an assert in file pa_common/pa_process.c. Pieter, Oct 9, 2003.
-
-*/
-/*
- * $Id: patest_wire.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define SAMPLE_RATE            (44100)
-
-typedef struct WireConfig_s
-{
-    int isInputInterleaved;
-    int isOutputInterleaved;
-    int numInputChannels;
-    int numOutputChannels;
-    int framesPerCallback;
-} WireConfig_t;
-
-#define USE_FLOAT_INPUT        (1)
-#define USE_FLOAT_OUTPUT       (1)
-
-/* Latencies set to defaults. */
-
-#if USE_FLOAT_INPUT
-    #define INPUT_FORMAT  paFloat32
-    typedef float INPUT_SAMPLE;
-#else
-    #define INPUT_FORMAT  paInt16
-    typedef short INPUT_SAMPLE;
-#endif
-
-#if USE_FLOAT_OUTPUT
-    #define OUTPUT_FORMAT  paFloat32
-    typedef float OUTPUT_SAMPLE;
-#else
-    #define OUTPUT_FORMAT  paInt16
-    typedef short OUTPUT_SAMPLE;
-#endif
-
-double gInOutScaler = 1.0;
-#define CONVERT_IN_TO_OUT(in)  ((OUTPUT_SAMPLE) ((in) * gInOutScaler))
-
-#define INPUT_DEVICE           (Pa_GetDefaultInputDevice())
-#define OUTPUT_DEVICE          (Pa_GetDefaultOutputDevice())
-
-static PaError TestConfiguration( WireConfig_t *config );
-
-static int wireCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         const PaStreamCallbackTimeInfo* timeInfo,
-                         PaStreamCallbackFlags statusFlags,
-                         void *userData );
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may be called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-
-static int wireCallback( const void *inputBuffer, void *outputBuffer,
-                         unsigned long framesPerBuffer,
-                         const PaStreamCallbackTimeInfo* timeInfo,
-                         PaStreamCallbackFlags statusFlags,
-                         void *userData )
-{
-    INPUT_SAMPLE *in;
-    OUTPUT_SAMPLE *out;
-    int inStride;
-    int outStride;
-    int inDone = 0;
-    int outDone = 0;
-    WireConfig_t *config = (WireConfig_t *) userData;
-    unsigned int i;
-    int inChannel, outChannel;
-
-    /* This may get called with NULL inputBuffer during initial setup. */
-    if( inputBuffer == NULL) return 0;
-
-    inChannel=0, outChannel=0;
-    while( !(inDone && outDone) )
-    {
-        if( config->isInputInterleaved )
-        {
-            in = ((INPUT_SAMPLE*)inputBuffer) + inChannel;
-            inStride = config->numInputChannels;
-        }
-        else
-        {
-            in = ((INPUT_SAMPLE**)inputBuffer)[inChannel];
-            inStride = 1;
-        }
-
-        if( config->isOutputInterleaved )
-        {
-            out = ((OUTPUT_SAMPLE*)outputBuffer) + outChannel;
-            outStride = config->numOutputChannels;
-        }
-        else
-        {
-            out = ((OUTPUT_SAMPLE**)outputBuffer)[outChannel];
-            outStride = 1;
-        }
-
-        for( i=0; i<framesPerBuffer; i++ )
-        {
-            *out = CONVERT_IN_TO_OUT( *in );
-            out += outStride;
-            in += inStride;
-        }
-
-        if(inChannel < (config->numInputChannels - 1)) inChannel++;
-        else inDone = 1;
-        if(outChannel < (config->numOutputChannels - 1)) outChannel++;
-        else outDone = 1;
-    }
-    return 0;
-}
-
-/*******************************************************************/
-int main(void);
-int main(void)
-{
-    PaError err;
-    WireConfig_t CONFIG;
-    WireConfig_t *config = &CONFIG;
-    int configIndex = 0;;
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    printf("Please connect audio signal to input and listen for it on output!\n");
-    printf("input format = %lu\n", INPUT_FORMAT );
-    printf("output format = %lu\n", OUTPUT_FORMAT );
-    printf("input device ID  = %d\n", INPUT_DEVICE );
-    printf("output device ID = %d\n", OUTPUT_DEVICE );
-
-    if( INPUT_FORMAT == OUTPUT_FORMAT )
-    {
-        gInOutScaler = 1.0;
-    }
-    else if( (INPUT_FORMAT == paInt16) && (OUTPUT_FORMAT == paFloat32) )
-    {
-        gInOutScaler = 1.0/32768.0;
-    }
-    else if( (INPUT_FORMAT == paFloat32) && (OUTPUT_FORMAT == paInt16) )
-    {
-        gInOutScaler = 32768.0;
-    }
-
-    for( config->isInputInterleaved = 0; config->isInputInterleaved < 2; config->isInputInterleaved++ )
-    {
-        for( config->isOutputInterleaved = 0; config->isOutputInterleaved < 2; config->isOutputInterleaved++ )
-        {
-            for( config->numInputChannels = 1; config->numInputChannels < 3; config->numInputChannels++ )
-            {
-                for( config->numOutputChannels = 1; config->numOutputChannels < 3; config->numOutputChannels++ )
-                {
-                           /* If framesPerCallback = 0, assertion fails in file pa_common/pa_process.c, line 1413: EX. */
-                    for( config->framesPerCallback = 64; config->framesPerCallback < 129; config->framesPerCallback += 64 )
-                    {
-                        printf("-----------------------------------------------\n" );
-                        printf("Configuration #%d\n", configIndex++ );
-                        err = TestConfiguration( config );
-                        /* Give user a chance to bail out. */
-                        if( err == 1 )
-                        {
-                            err = paNoError;
-                            goto done;
-                        }
-                        else if( err != paNoError ) goto error;
-                    }
-               }
-            }
-        }
-    }
-
-done:
-    Pa_Terminate();
-    printf("Full duplex sound test complete.\n"); fflush(stdout);
-    printf("Hit ENTER to quit.\n");  fflush(stdout);
-    getchar();
-    return 0;
-
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    printf("Hit ENTER to quit.\n");  fflush(stdout);
-    getchar();
-    return -1;
-}
-
-static PaError TestConfiguration( WireConfig_t *config )
-{
-    int c;
-    PaError err;
-    PaStream *stream;
-    PaStreamParameters inputParameters, outputParameters;
-    
-    printf("input %sinterleaved!\n", (config->isInputInterleaved ? " " : "NOT ") );
-    printf("output %sinterleaved!\n", (config->isOutputInterleaved ? " " : "NOT ") );
-    printf("input channels = %d\n", config->numInputChannels );
-    printf("output channels = %d\n", config->numOutputChannels );
-    printf("framesPerCallback = %d\n", config->framesPerCallback );
-
-    inputParameters.device = INPUT_DEVICE;              /* default input device */
-    inputParameters.channelCount = config->numInputChannels;
-    inputParameters.sampleFormat = INPUT_FORMAT | (config->isInputInterleaved ? 0 : paNonInterleaved);
-    inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
-    inputParameters.hostApiSpecificStreamInfo = NULL;
-
-    outputParameters.device = OUTPUT_DEVICE;            /* default output device */
-    outputParameters.channelCount = config->numOutputChannels;
-    outputParameters.sampleFormat = OUTPUT_FORMAT | (config->isOutputInterleaved ? 0 : paNonInterleaved);
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              &inputParameters,
-              &outputParameters,
-              SAMPLE_RATE,
-              config->framesPerCallback, /* frames per buffer */
-              paClipOff, /* we won't output out of range samples so don't bother clipping them */
-              wireCallback,
-              config );
-    if( err != paNoError ) goto error;
-    
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-    
-    printf("Hit ENTER for next configuration, or 'q' to quit.\n");  fflush(stdout);
-    c = getchar();
-    
-    printf("Closing stream.\n");
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    if( c == 'q' ) return 1;
-
-error:
-    return err;
-}
diff --git a/libs/portaudio/test/patest_wmme_surround.c b/libs/portaudio/test/patest_wmme_surround.c
deleted file mode 100644
index bed94ea168..0000000000
--- a/libs/portaudio/test/patest_wmme_surround.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * $Id: $
- * Portable Audio I/O Library
- * Windows MME surround sound output test
- *
- * Copyright (c) 2007 Ross Bencina
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-
-#include <windows.h>    /* required when using pa_win_wmme.h */
-#include <mmsystem.h>   /* required when using pa_win_wmme.h */
-
-#include "portaudio.h"
-#include "pa_win_wmme.h"
-
-#define NUM_SECONDS         (12)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (64)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE          (100)
-
-#define CHANNEL_COUNT       (6)
-
-
-
-typedef struct
-{
-    float sine[TABLE_SIZE];
-	int phase;
-	int currentChannel;
-	int cycleCount;
-}
-paTestData;
-
-/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int patestCallback( const void *inputBuffer, void *outputBuffer,
-                            unsigned long framesPerBuffer,
-                            const PaStreamCallbackTimeInfo* timeInfo,
-                            PaStreamCallbackFlags statusFlags,
-                            void *userData )
-{
-    paTestData *data = (paTestData*)userData;
-    float *out = (float*)outputBuffer;
-    unsigned long i,j;
-
-    (void) timeInfo; /* Prevent unused variable warnings. */
-    (void) statusFlags;
-    (void) inputBuffer;
-    
-    for( i=0; i<framesPerBuffer; i++ )
-    {
-		for( j = 0; j < CHANNEL_COUNT; ++j ){
-			if( j == data->currentChannel && data->cycleCount < 4410 ){
-				*out++ = data->sine[data->phase];
-				data->phase += 1 + j;	// play each channel at a different pitch so they can be distinguished
-				if( data->phase >= TABLE_SIZE ){
-					data->phase -= TABLE_SIZE;
-				}
-			}else{
-				*out++ = 0;
-			}
-		}
-    
-		data->cycleCount++;
-		if( data->cycleCount > 44100 ){
-			data->cycleCount = 0;
-
-			++data->currentChannel;
-			if( data->currentChannel >= CHANNEL_COUNT )
-				data->currentChannel -= CHANNEL_COUNT;
-		}
-	}
-    
-    return paContinue;
-}
-
-/*******************************************************************/
-int main(int argc, char* argv[])
-{
-    PaStreamParameters outputParameters;
-    PaWinMmeStreamInfo wmmeStreamInfo;
-    PaStream *stream;
-    PaError err;
-    paTestData data;
-    int i;
-    int deviceIndex;
-
-    printf("PortAudio Test: output a sine blip on each channel. SR = %d, BufSize = %d, Chans = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER, CHANNEL_COUNT);
-
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-	deviceIndex = Pa_GetHostApiInfo( Pa_HostApiTypeIdToHostApiIndex( paMME ) )->defaultOutputDevice;
-	if( argc == 2 ){
-		sscanf( argv[1], "%d", &deviceIndex );
-	}
-
-	printf( "using device id %d (%s)\n", deviceIndex, Pa_GetDeviceInfo(deviceIndex)->name );
-
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        data.sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-
-	data.phase = 0;
-	data.currentChannel = 0;
-	data.cycleCount = 0;
-
-    outputParameters.device = deviceIndex;
-    outputParameters.channelCount = CHANNEL_COUNT;
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point processing */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* it's not strictly necessary to provide a channelMask for surround sound
-       output. But if you want to be sure which channel mask PortAudio will use
-       then you should supply one */
-    wmmeStreamInfo.size = sizeof(PaWinMmeStreamInfo);
-    wmmeStreamInfo.hostApiType = paMME; 
-    wmmeStreamInfo.version = 1;
-    wmmeStreamInfo.flags = paWinMmeUseChannelMask;
-    wmmeStreamInfo.channelMask = PAWIN_SPEAKER_5POINT1; /* request 5.1 output format */
-    outputParameters.hostApiSpecificStreamInfo = &wmmeStreamInfo;
-
-
-	if( Pa_IsFormatSupported( 0, &outputParameters, SAMPLE_RATE ) == paFormatIsSupported  ){
-		printf( "Pa_IsFormatSupported reports device will support %d channels.\n", CHANNEL_COUNT );
-	}else{
-		printf( "Pa_IsFormatSupported reports device will not support %d channels.\n", CHANNEL_COUNT );
-	}
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              patestCallback,
-              &data );
-    if( err != paNoError ) goto error;
-
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Play for %d seconds.\n", NUM_SECONDS );
-    Pa_Sleep( NUM_SECONDS * 1000 );
-
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
-
diff --git a/libs/portaudio/test/patest_write_sine.c b/libs/portaudio/test/patest_write_sine.c
deleted file mode 100644
index a2c7544f35..0000000000
--- a/libs/portaudio/test/patest_write_sine.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/** @file patest_write_sine.c
-	@ingroup test_src
-	@brief Play a sine wave for several seconds using the blocking API (Pa_WriteStream())
-	@author Ross Bencina <rossb@audiomulch.com>
-    @author Phil Burk <philburk@softsynth.com>
-*/
-/*
- * $Id: patest_write_sine.c 1097 2006-08-26 08:27:53Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS         (5)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (1024)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-
-
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    float buffer[FRAMES_PER_BUFFER][2]; /* stereo output buffer */
-    float sine[TABLE_SIZE]; /* sine wavetable */
-    int left_phase = 0;
-    int right_phase = 0;
-    int left_inc = 1;
-    int right_inc = 3; /* higher pitch so we can distinguish left and right. */
-    int i, j, k;
-    int bufferCount;
-
-    
-    printf("PortAudio Test: output sine wave. SR = %d, BufSize = %d\n", SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-
-    printf( "Play 3 times, higher each time.\n" );
-    
-    for( k=0; k < 3; ++k )
-    {
-        err = Pa_StartStream( stream );
-        if( err != paNoError ) goto error;
-
-        printf("Play for %d seconds.\n", NUM_SECONDS );
-
-        bufferCount = ((NUM_SECONDS * SAMPLE_RATE) / FRAMES_PER_BUFFER);
-
-        for( i=0; i < bufferCount; i++ )
-        {
-            for( j=0; j < FRAMES_PER_BUFFER; j++ )
-            {
-                buffer[j][0] = sine[left_phase];  /* left */
-                buffer[j][1] = sine[right_phase];  /* right */
-                left_phase += left_inc;
-                if( left_phase >= TABLE_SIZE ) left_phase -= TABLE_SIZE;
-                right_phase += right_inc;
-                if( right_phase >= TABLE_SIZE ) right_phase -= TABLE_SIZE;
-            }
-
-            err = Pa_WriteStream( stream, buffer, FRAMES_PER_BUFFER );
-            if( err != paNoError ) goto error;
-        }   
-
-        err = Pa_StopStream( stream );
-        if( err != paNoError ) goto error;
-
-        ++left_inc;
-        ++right_inc;
-
-        Pa_Sleep( 1000 );
-    }
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/test/patest_write_stop.c b/libs/portaudio/test/patest_write_stop.c
deleted file mode 100644
index 7b051653c4..0000000000
--- a/libs/portaudio/test/patest_write_stop.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/** @file patest_write_stop.c
-	@brief Play a few seconds of silence followed by a few cycles of a sine wave. Tests to make sure that pa_StopStream() completes playback in blocking I/O
-	@author Bjorn Roche of XO Audio (www.xoaudio.com)
-	@author Ross Bencina
-	@author Phil Burk
-*/
-/*
- * $Id: patest_write_stop.c 1083 2006-08-23 07:30:49Z rossb $
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com/
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however, 
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also 
- * requested that these non-binding requests be included along with the 
- * license above.
- */
-
-#include <stdio.h>
-#include <math.h>
-#include "portaudio.h"
-
-#define NUM_SECONDS         (5)
-#define SAMPLE_RATE         (44100)
-#define FRAMES_PER_BUFFER   (1024)
-
-#ifndef M_PI
-#define M_PI  (3.14159265)
-#endif
-
-#define TABLE_SIZE   (200)
-
-
-int main(void);
-int main(void)
-{
-    PaStreamParameters outputParameters;
-    PaStream *stream;
-    PaError err;
-    float buffer[FRAMES_PER_BUFFER][2]; /* stereo output buffer */
-    float sine[TABLE_SIZE]; /* sine wavetable */
-    int left_phase = 0;
-    int right_phase = 0;
-    int left_inc = 1;
-    int right_inc = 3; /* higher pitch so we can distinguish left and right. */
-    int i, j;
-    int bufferCount;
-    const int   framesBy2  = FRAMES_PER_BUFFER >> 1;
-    const float framesBy2f = (float) framesBy2 ;
-
-    
-    printf( "PortAudio Test: output silence, followed by one buffer of a ramped sine wave. SR = %d, BufSize = %d\n",
-            SAMPLE_RATE, FRAMES_PER_BUFFER);
-    
-    /* initialise sinusoidal wavetable */
-    for( i=0; i<TABLE_SIZE; i++ )
-    {
-        sine[i] = (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
-    }
-
-    
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
-
-    outputParameters.device = Pa_GetDefaultOutputDevice(); /* default output device */
-    outputParameters.channelCount = 2;       /* stereo output */
-    outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output */
-    outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency * 5;
-    outputParameters.hostApiSpecificStreamInfo = NULL;
-
-    /* open the stream */
-    err = Pa_OpenStream(
-              &stream,
-              NULL, /* no input */
-              &outputParameters,
-              SAMPLE_RATE,
-              FRAMES_PER_BUFFER,
-              paClipOff,      /* we won't output out of range samples so don't bother clipping them */
-              NULL, /* no callback, use blocking API */
-              NULL ); /* no callback, so no callback userData */
-    if( err != paNoError ) goto error;
-
-    /* start the stream */
-    err = Pa_StartStream( stream );
-    if( err != paNoError ) goto error;
-
-    printf("Playing %d seconds of silence followed by one buffer of a ramped sinusoid.\n", NUM_SECONDS );
-
-    bufferCount = ((NUM_SECONDS * SAMPLE_RATE) / FRAMES_PER_BUFFER);
-
-    /* clear buffer */
-    for( j=0; j < FRAMES_PER_BUFFER; j++ )
-    {
-        buffer[j][0] = 0;  /* left */
-        buffer[j][1] = 0;  /* right */
-    }
-    /* play the silent buffer a bunch o' times */
-    for( i=0; i < bufferCount; i++ )
-    {
-        err = Pa_WriteStream( stream, buffer, FRAMES_PER_BUFFER );
-        if( err != paNoError ) goto error;
-    }   
-    /* play a non-silent buffer once */
-    for( j=0; j < FRAMES_PER_BUFFER; j++ )
-    {
-        float ramp = 1;
-        if( j < framesBy2 )
-           ramp = j / framesBy2f;
-        else
-           ramp = (FRAMES_PER_BUFFER - j) / framesBy2f ;
-
-        buffer[j][0] = sine[left_phase] * ramp;  /* left */
-        buffer[j][1] = sine[right_phase] * ramp;  /* right */
-        left_phase += left_inc;
-        if( left_phase >= TABLE_SIZE ) left_phase -= TABLE_SIZE;
-        right_phase += right_inc;
-        if( right_phase >= TABLE_SIZE ) right_phase -= TABLE_SIZE;
-    }
-    err = Pa_WriteStream( stream, buffer, FRAMES_PER_BUFFER );
-    if( err != paNoError ) goto error;
-
-    /* stop stream, close, and terminate */
-    err = Pa_StopStream( stream );
-    if( err != paNoError ) goto error;
-
-    err = Pa_CloseStream( stream );
-    if( err != paNoError ) goto error;
-
-    Pa_Terminate();
-    printf("Test finished.\n");
-    
-    return err;
-error:
-    Pa_Terminate();
-    fprintf( stderr, "An error occured while using the portaudio stream\n" );
-    fprintf( stderr, "Error number: %d\n", err );
-    fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
-    return err;
-}
diff --git a/libs/portaudio/testcvs/changeme.txt b/libs/portaudio/testcvs/changeme.txt
deleted file mode 100644
index c88c26a6a7..0000000000
--- a/libs/portaudio/testcvs/changeme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This is just a dopy little file used to test the CVS repository.
-Feel free to trash this file.
-Minor change.
-Another tweak.
-philburk tweak
-stephane test
-Phil changed this again on 2/21/02. Yawn...
-Bjorn test3!
diff --git a/src/mod/endpoints/mod_portaudio/Makefile.am b/src/mod/endpoints/mod_portaudio/Makefile.am
index 4f78946963..06ba6f6c92 100644
--- a/src/mod/endpoints/mod_portaudio/Makefile.am
+++ b/src/mod/endpoints/mod_portaudio/Makefile.am
@@ -1,25 +1,19 @@
-LIBS+=$(PA_LIBS)
 include $(top_srcdir)/build/modmake.rulesam
-
 MODNAME=mod_portaudio
-PA_DIR=$(switch_srcdir)/libs/portaudio
-PALA=$(switch_builddir)/libs/portaudio/lib/libportaudio.la
 
+if HAVE_PORTAUDIO
 mod_LTLIBRARIES = mod_portaudio.la
 mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
-mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS)
-mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
-mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
-
+mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
+mod_portaudio_la_CPPFLAGS = -I. $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
+mod_portaudio_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
+mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared
 if ISMAC
 mod_portaudio_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
 endif
-
-BUILT_SOURCES = $(PALA)
-
-$(mod_portaudio_la_SOURCES) : $(BUILT_SOURCES)
-
-$(PALA): $(PA_DIR) $(PA_DIR)/.update
-	cd $(switch_builddir)/libs/portaudio && $(MAKE) PORTAUDIO_CFLAGS="$(SWITCH_AM_CFLAGS)"
-	$(TOUCH_TARGET)
-
+else
+install: error
+all: error
+error:
+	$(error You must install portaudio19-dev to build $(MODNAME))
+endif
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 8f19bacf81..4329be4cd3 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -37,8 +37,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "pablio.h"
 #include <string.h>
+#include "pablio.h"
 
 #define MY_EVENT_RINGING "portaudio::ringing"
 #define MY_EVENT_MAKE_CALL "portaudio::makecall"
diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
index b632c06084..f48a7e06c9 100644
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
+++ b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
@@ -53,8 +53,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "pa_ringbuffer.h"
 #include <string.h>
+#include "pa_ringbuffer.h"
 
 /****************
  * First, we'll define some memory barrier primitives based on the system.
diff --git a/src/mod/endpoints/mod_portaudio/pablio.c b/src/mod/endpoints/mod_portaudio/pablio.c
index 0aebc7c7ab..cb7ae53ab3 100644
--- a/src/mod/endpoints/mod_portaudio/pablio.c
+++ b/src/mod/endpoints/mod_portaudio/pablio.c
@@ -44,12 +44,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "portaudio.h"
-#include "pa_ringbuffer.h"
-#include "pablio.h"
 #include <string.h>
 #include <time.h>
-
+#include <portaudio.h>
+#include "pa_ringbuffer.h"
+#include "pablio.h"
 
 /************************************************************************/
 /******** Prototypes ****************************************************/
diff --git a/src/mod/endpoints/mod_portaudio/pablio.h b/src/mod/endpoints/mod_portaudio/pablio.h
index 435e4b0ca7..2202d849ec 100644
--- a/src/mod/endpoints/mod_portaudio/pablio.h
+++ b/src/mod/endpoints/mod_portaudio/pablio.h
@@ -51,10 +51,9 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "pa_ringbuffer.h"
-#include "portaudio.h"
-
 #include <string.h>
+#include <portaudio.h>
+#include "pa_ringbuffer.h"
 
 /*! Maximum number of channels per stream */
 #define MAX_IO_CHANNELS 2
diff --git a/src/mod/formats/mod_portaudio_stream/Makefile.am b/src/mod/formats/mod_portaudio_stream/Makefile.am
index 4ca5d80757..207a1b792f 100644
--- a/src/mod/formats/mod_portaudio_stream/Makefile.am
+++ b/src/mod/formats/mod_portaudio_stream/Makefile.am
@@ -1,25 +1,20 @@
 include $(top_srcdir)/build/modmake.rulesam
-
 MODNAME=mod_portaudio_stream
-PA_DIR=$(switch_srcdir)/libs/portaudio
-PALA=$(switch_builddir)/libs/portaudio/lib/libportaudio.la
 MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio
 
+if HAVE_PORTAUDIO
 mod_LTLIBRARIES = mod_portaudio_stream.la
 mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c ../../endpoints/mod_portaudio/pablio.c ../../endpoints/mod_portaudio/pa_ringbuffer.c
-mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS)
-mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
-mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
-
+mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
+mod_portaudio_stream_la_CPPFLAGS = -I. -I$(MODPA_DIR) $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
+mod_portaudio_stream_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
+mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared
 if ISMAC
 mod_portaudio_stream_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
 endif
-
-BUILT_SOURCES = $(PALA)
-
-$(mod_portaudio_stream_la_SOURCES) : $(BUILT_SOURCES)
-
-$(PALA): $(PA_DIR) $(PA_DIR)/.update
-	cd $(switch_builddir)/libs/portaudio && $(MAKE) PORTAUDIO_CFLAGS="$(SWITCH_AM_CFLAGS)"
-	$(TOUCH_TARGET)
-
+else
+install: error
+all: error
+error:
+	$(error You must install portaudio19-dev to build $(MODNAME))
+endif
diff --git a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
index 005a9cbb6e..29137754b2 100644
--- a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
+++ b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
@@ -30,8 +30,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "pablio.h"
 #include <string.h>
+#include "pablio.h"
 
 #define DEFAULT_PREBUFFER_SIZE 1024 * 64
 #define SAMPLE_TYPE  paInt16

From 71805130fbf2cdec14d88d84eca28accb0ce513a Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 17 Jul 2014 21:02:00 -0500
Subject: [PATCH 032/130] FS-6542 add missing download to windows build

---
 Freeswitch.2012.sln | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index 9386d5d8cc..3cf6c57149 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -4151,11 +4151,13 @@ Global
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.Build.0 = Debug|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.Build.0 = Debug|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64 Setup.ActiveCfg = Debug|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.ActiveCfg = Release|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.Build.0 = Release|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.Build.0 = Release|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x86 Setup.ActiveCfg = Release|Win32
 	EndGlobalSection

From 33a4adba62eb7286cb1bffd6347da47c86c39aea Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Fri, 18 Jul 2014 10:29:23 +0800
Subject: [PATCH 033/130] Better handling of bad HDLC frames in T.38 gateway
 operation.

---
 libs/spandsp/src/t38_gateway.c    | 17 +++++++++++++----
 libs/spandsp/tests/fax_tests.c    |  3 +--
 libs/spandsp/tests/v22bis_tests.c |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/libs/spandsp/src/t38_gateway.c b/libs/spandsp/src/t38_gateway.c
index 2a9e41b74c..bb3d02e902 100644
--- a/libs/spandsp/src/t38_gateway.c
+++ b/libs/spandsp/src/t38_gateway.c
@@ -1914,7 +1914,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     }
     /*endif*/
     t->num_bits++;
-    if (!t->framing_ok_announced)
+    if (t->flags_seen < t->framing_ok_threshold)
         return;
     /*endif*/
     t->byte_in_progress = (t->byte_in_progress >> 1) | ((t->raw_bit_stream & 0x01) << 7);
@@ -1922,17 +1922,26 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
         return;
     /*endif*/
     t->num_bits = 0;
+    s = (t38_gateway_state_t *) t->frame_user_data;
+    u = &s->core.to_t38;
     if (t->len >= (int) sizeof(t->buffer))
     {
         /* This is too long. Abandon the frame, and wait for the next flag octet. */
+        if ((t->len + 2) >= u->octets_per_data_packet)
+        {
+            /* We will have sent some of this frame already, so we need to send termination of this bad HDLC frame. */
+            category = (s->t38x.current_tx_data_type == T38_DATA_V21)  ?  T38_PACKET_CATEGORY_CONTROL_DATA  :  T38_PACKET_CATEGORY_IMAGE_DATA;
+            if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_FCS_BAD, NULL, 0, category) < 0)
+                span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");
+            /*endif*/
+        }
+        /*endif*/
         t->rx_length_errors++;
         t->flags_seen = t->framing_ok_threshold - 1;
         t->len = 0;
         return;
     }
     /*endif*/
-    s = (t38_gateway_state_t *) t->frame_user_data;
-    u = &s->core.to_t38;
     t->buffer[t->len] = (uint8_t) t->byte_in_progress;
     if (t->len == 1)
     {
@@ -1969,7 +1978,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     }
     if (++u->data_ptr >= u->octets_per_data_packet)
     {
-        bit_reverse(u->data, t->buffer + t->len - 2 - u->data_ptr, u->data_ptr);
+        bit_reverse(u->data, &t->buffer[t->len - 2 - u->data_ptr], u->data_ptr);
         category = (s->t38x.current_tx_data_type == T38_DATA_V21)  ?  T38_PACKET_CATEGORY_CONTROL_DATA  :  T38_PACKET_CATEGORY_IMAGE_DATA;
         if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_DATA, u->data, u->data_ptr, category) < 0)
             span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");
diff --git a/libs/spandsp/tests/fax_tests.c b/libs/spandsp/tests/fax_tests.c
index 9dbf6ce4e6..f3b34b91a3 100644
--- a/libs/spandsp/tests/fax_tests.c
+++ b/libs/spandsp/tests/fax_tests.c
@@ -420,8 +420,7 @@ static void set_t30_callbacks(t30_state_t *t30, int chan)
 }
 /*- End of function --------------------------------------------------------*/
 
-static void real_time_gateway_frame_handler(t38_gateway_state_t *s,
-                                            void *user_data,
+static void real_time_gateway_frame_handler(void *user_data,
                                             bool incoming,
                                             const uint8_t *msg,
                                             int len)
diff --git a/libs/spandsp/tests/v22bis_tests.c b/libs/spandsp/tests/v22bis_tests.c
index d42b2f4f4d..f3c0532e92 100644
--- a/libs/spandsp/tests/v22bis_tests.c
+++ b/libs/spandsp/tests/v22bis_tests.c
@@ -263,11 +263,11 @@ int main(int argc, char *argv[])
     int j;
     int test_bps;
     int line_model_no;
+    int channel_codec;
+    int rbs_pattern;
     int bits_per_test;
     int noise_level;
     int signal_level;
-    int channel_codec;
-    int rbs_pattern;
     int guard_tone_option;
     int opt;
     bool log_audio;

From 3ce4ae962b8fe8d9b127410e42db402e3adc86d4 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 17 Jul 2014 22:35:04 -0500
Subject: [PATCH 034/130] FS-6540 #comment please test this patch for the added
 notify functionality

---
 src/mod/endpoints/mod_sofia/mod_sofia.c | 16 ++++++++++++++--
 src/mod/endpoints/mod_sofia/sofia.c     | 21 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index a1cff0d006..0dca2d700f 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1180,10 +1180,22 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 		break;
 	case SWITCH_MESSAGE_INDICATE_BLIND_TRANSFER_RESPONSE:
 		{
-			const char *event = switch_channel_get_variable(channel, "sip_blind_transfer_event");
-			const char *uuid = switch_channel_get_variable(channel, "blind_transfer_uuid");
+			const char *event;
+			const char *uuid;
 			char *xdest;
 
+			if (msg->string_arg) {
+				nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag;version=2.0"),
+						   NUTAG_SUBSTATE(nua_substate_terminated),
+						   SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=noresource"),
+						   SIPTAG_PAYLOAD_STR(msg->string_arg),
+						   SIPTAG_EVENT_STR("refer"), TAG_END());
+				goto end;
+			}
+
+			event = switch_channel_get_variable(channel, "sip_blind_transfer_event");
+			uuid = switch_channel_get_variable(channel, "blind_transfer_uuid");
+
 			if (event && uuid) {
 				char payload_str[255] = "SIP/2.0 403 Forbidden\r\n";
 				if (msg->numeric_arg) {
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 390c8886a9..acb10c4f9d 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -550,6 +550,27 @@ void sofia_handle_sip_i_notify(switch_core_session_t *session, int status,
 		switch_assert(tech_pvt != NULL);
 	}
 
+
+	if (sofia_test_pflag(profile, PFLAG_PROXY_REFER) && sip->sip_payload && sip->sip_payload->pl_data &&
+		sip->sip_content_type && sip->sip_content_type->c_type && 
+		switch_stristr("sipfrag", sip->sip_content_type->c_type)) {
+		switch_core_session_t *other_session;
+		if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
+			switch_core_session_message_t *msg;
+			
+			msg = switch_core_session_alloc(other_session, sizeof(*msg));
+			MESSAGE_STAMP_FFL(msg);
+			msg->message_id = SWITCH_MESSAGE_INDICATE_BLIND_TRANSFER_RESPONSE;
+			msg->string_arg = switch_core_session_strdup(other_session, sip->sip_payload->pl_data);
+			msg->from = __FILE__;
+			switch_core_session_queue_message(other_session, msg);
+			switch_core_session_rwunlock(other_session);
+			
+			nua_respond(nh, SIP_202_ACCEPTED, NUTAG_WITH_THIS_MSG(de->data->e_msg), TAG_END());
+			goto end;
+		}
+	}
+
 	/* For additional NOTIFY event packages see http://www.iana.org/assignments/sip-events. */
 	if (sip->sip_content_type &&
 		sip->sip_content_type->c_type && sip->sip_payload && sip->sip_payload->pl_data && !strcasecmp(sip->sip_event->o_type, "refer")) {

From 3cababdf33efca6babf4f43b53493317a8dbf74d Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 17 Jul 2014 23:51:29 -0500
Subject: [PATCH 035/130] FS-6542 part 2 windows

---
 Freeswitch.2010.sln                           | 22 ++++++++++++++-
 libs/win32/portaudio/portaudio.2010.vcxproj   | 28 ++++++-------------
 .../portaudio/portaudio.2010.vcxproj.filters  | 15 ++++++----
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 0c191c65e9..207637350d 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -275,7 +275,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2010.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.2010.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\win32\portaudio\portaudio.2010.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2010.vcxproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}"
 EndProject
@@ -609,6 +609,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SQLITE", "libs\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LDNS", "libs\win32\Download LDNS.2010.vcxproj", "{5BE9A596-F11F-4379-928C-412F81AE182B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.2010.vcxproj", "{C0779BCC-C037-4F58-B890-EF37BA956B3C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -4139,6 +4141,23 @@ Global
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.ActiveCfg = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x86 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.Build.0 = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x64.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x64 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x86 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.Build.0 = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.Build.0 = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x86 Setup.ActiveCfg = Debug|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.Build.0 = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.Build.0 = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64 Setup.ActiveCfg = Release|Win32
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x86 Setup.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4307,6 +4326,7 @@ Global
 		{1BDAB935-27DC-47E3-95EA-17E024D39C31} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{97D25665-34CD-4E0C-96E7-88F0795B8883} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{5BE9A596-F11F-4379-928C-412F81AE182B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{C0779BCC-C037-4F58-B890-EF37BA956B3C} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
 		{5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
 		{FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
diff --git a/libs/win32/portaudio/portaudio.2010.vcxproj b/libs/win32/portaudio/portaudio.2010.vcxproj
index 188e5afe12..0ba036dc46 100644
--- a/libs/win32/portaudio/portaudio.2010.vcxproj
+++ b/libs/win32/portaudio/portaudio.2010.vcxproj
@@ -227,7 +227,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -252,7 +252,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;PAWIN_WDMKS_NO_KSGUID_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -446,24 +446,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_skeleton.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -793,6 +775,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c" />
     <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -853,6 +836,11 @@
   <ItemGroup>
     <None Include="portaudio.def" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Download PORTAUDIO.2010.vcxproj">
+      <Project>{c0779bcc-c037-4f58-b890-ef37ba956b3c}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/libs/win32/portaudio/portaudio.2010.vcxproj.filters b/libs/win32/portaudio/portaudio.2010.vcxproj.filters
index 27e3520845..3f126704a6 100644
--- a/libs/win32/portaudio/portaudio.2010.vcxproj.filters
+++ b/libs/win32/portaudio/portaudio.2010.vcxproj.filters
@@ -63,9 +63,6 @@
     <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
       <Filter>Source Files\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_skeleton.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
       <Filter>Source Files\common</Filter>
     </ClCompile>
@@ -105,9 +102,6 @@
     <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
       <Filter>Source Files\hostapi\wmme</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.cpp">
-      <Filter>Source Files\hostapi\wasapi</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
       <Filter>Source Files\os\win</Filter>
     </ClCompile>
@@ -123,6 +117,15 @@
     <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
       <Filter>Source Files\os\win</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="portaudio.def">

From f781ec9a5abfcc939144b712bc218bd6059217f2 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 17 Jul 2014 23:54:34 -0500
Subject: [PATCH 036/130] FS-6542 missed file

---
 src/mod/endpoints/mod_portaudio/mod_PortAudio.2010.vcxproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2010.vcxproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2010.vcxproj
index bf32b949e2..f8ffdef418 100644
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2010.vcxproj
+++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2010.vcxproj
@@ -148,14 +148,13 @@
     <ClInclude Include="pablio.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\portaudio\build\msvc\portaudio.2010.vcxproj">
-      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2010.vcxproj">
       <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\libs\win32\portaudio\portaudio.2010.vcxproj">
+      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

From 6a3bf7c4a775fc05a978c280e7a6ef93fc2f311f Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Fri, 18 Jul 2014 16:08:59 +0800
Subject: [PATCH 037/130] Further improvements to FAX CTC message handling

---
 libs/spandsp/src/t30.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/spandsp/src/t30.c b/libs/spandsp/src/t30.c
index f601ad5583..784a146c1c 100644
--- a/libs/spandsp/src/t30.c
+++ b/libs/spandsp/src/t30.c
@@ -3100,6 +3100,7 @@ static void process_rx_ppr(t30_state_t *s, const uint8_t *msg, int len)
         terminate_call(s);
         return;
     }
+    s->retries = 0;
     /* Check which frames are OK, and mark them as OK. */
     for (i = 0;  i < 32;  i++)
     {

From 86f9029b9845e311e2d4b8f86be626c546af26cb Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 18 Jul 2014 07:52:26 -0500
Subject: [PATCH 038/130] Revert changes from FS-5719, You'll have to make
 these changes yourself locally if you want these types of certificates

---
 scripts/gentls_cert.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/gentls_cert.in b/scripts/gentls_cert.in
index f2e4cd5a99..49b3940d5d 100644
--- a/scripts/gentls_cert.in
+++ b/scripts/gentls_cert.in
@@ -87,9 +87,8 @@ setup_ca() {
 		"${CONFDIR}/CA/config.tpl" \
 			> "${TMPFILE}.cfg" || exit 1
 
-	openssl ecparam -name secp160r2 -out CA_CURVE.pem
 	openssl req -out "${CONFDIR}/CA/cacert.pem" \
-	        -new -x509 -keyout "${CONFDIR}/CA/cakey.pem" -newkey ec:CA_CURVE.pem \
+		-new -x509 -keyout "${CONFDIR}/CA/cakey.pem" \
 		-config "${TMPFILE}.cfg" -nodes -days ${DAYS} -sha1 >/dev/null || exit 1
 	cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem"
 	cp $TMPFILE.cfg /tmp/ssl.cfg
@@ -131,7 +130,7 @@ generate_cert() {
 			> "${TMPFILE}.cfg" || exit 1
 
 	openssl req -new -out "${TMPFILE}.req" \
-	        -newkey ec:CA_CURVE.pem -keyout "${TMPFILE}.key" \
+		-newkey rsa:${KEY_SIZE} -keyout "${TMPFILE}.key" \
 		-config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1
 
 	openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \
@@ -157,6 +156,7 @@ remove_ca() {
 }
 OUTFILESET="0"
 command="$1"
+shift
 
 while [ $# -gt 0 ]; do
 	case $1 in

From 835fae422744c23ffb341e499950a685507745fc Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 18 Jul 2014 09:10:15 -0500
Subject: [PATCH 039/130] Any browser (Firefox, Chrome, Opera) that can run
 Verto can do TLS1.2, We shouldn't lower the bar when we don't need too.

---
 src/mod/endpoints/mod_verto/mod_verto.c | 11 +++++++++++
 src/mod/endpoints/mod_verto/ws.c        | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index a5897fbbb6..1b3d48f2dd 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -150,6 +150,17 @@ static void verto_init_ssl(verto_profile_t *profile)
 	profile->ssl_ready = 1;
 	assert(profile->ssl_ctx);
 
+	/* Disable SSLv2 */
+	SSL_CTX_set_options(profile->ssl_ctx, SSL_OP_NO_SSLv2);
+	/* Disable SSLv3 */
+	SSL_CTX_set_options(profile->ssl_ctx, SSL_OP_NO_SSLv3);
+	/* Disable TLSv1 */
+	SSL_CTX_set_options(profile->ssl_ctx, SSL_OP_NO_TLSv1);
+	/* Disable TLSv1_1 */
+	SSL_CTX_set_options(profile->ssl_ctx, SSL_OP_NO_TLSv1_1);
+	/* Disable Compression CRIME (Compression Ratio Info-leak Made Easy) */
+	SSL_CTX_set_options(profile->ssl_ctx, SSL_OP_NO_COMPRESSION);
+
 	/* set the local certificate from CertFile */
 	if (!zstr(profile->chain)) {
 		SSL_CTX_use_certificate_chain_file(profile->ssl_ctx, profile->chain);
diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index 3b152e4fec..e9100e2977 100644
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -92,10 +92,20 @@ void init_ssl(void) {
 
 	OpenSSL_add_all_algorithms();   /* load & register cryptos */
 	SSL_load_error_strings();     /* load all error messages */
-	ws_globals.ssl_method = TLSv1_server_method();   /* create server instance */
+	ws_globals.ssl_method = SSLv23_server_method();   /* create server instance */
 	ws_globals.ssl_ctx = SSL_CTX_new(ws_globals.ssl_method);         /* create context */
 	assert(ws_globals.ssl_ctx);
-	
+
+	/* Disable SSLv2 */
+	SSL_CTX_set_options(globals.ssl_ctx, SSL_OP_NO_SSLv2);
+	/* Disable SSLv3 */
+	SSL_CTX_set_options(globals.ssl_ctx, SSL_OP_NO_SSLv3);
+	/* Disable TLSv1 */
+	SSL_CTX_set_options(globals.ssl_ctx, SSL_OP_NO_TLSv1);
+	/* Disable TLSv1_1 */
+	SSL_CTX_set_options(globals.ssl_ctx, SSL_OP_NO_TLSv1_1);
+	/* Disable Compression CRIME (Compression Ratio Info-leak Made Easy) */
+	SSL_CTX_set_options(globals.ssl_ctx, SSL_OP_NO_COMPRESSION);
 	/* set the local certificate from CertFile */
 	SSL_CTX_use_certificate_file(ws_globals.ssl_ctx, ws_globals.cert, SSL_FILETYPE_PEM);
 	/* set the private key from KeyFile */

From 2d0bb59cf551fd53803dbafb33966e6a928d6811 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 18 Jul 2014 00:30:53 -0500
Subject: [PATCH 040/130] vs2010 fix ldns download if x64 built first

---
 Freeswitch.2010.sln | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 207637350d..e6618c04f4 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -4134,11 +4134,13 @@ Global
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|Win32.Build.0 = Debug|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x64.ActiveCfg = Debug|Win32
+		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x64.Build.0 = Debug|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x64 Setup.ActiveCfg = Debug|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|Win32.ActiveCfg = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|Win32.Build.0 = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.ActiveCfg = Release|Win32
+		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.Build.0 = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.ActiveCfg = Release|Win32

From b186ca9f74241b18411b1f4166e711bd20bb83eb Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 18 Jul 2014 12:53:54 -0400
Subject: [PATCH 041/130] FS-6542: add pkg_config path for portaudio on mac via
 homebrew

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index d80875c376..9c42da5c82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1127,6 +1127,7 @@ case $host in
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/sqlite/lib/pkgconfig/
         path_push_unique PKG_CONFIG_PATH /usr/local/opt/ldns/lib/pkgconfig/
+        path_push_unique PKG_CONFIG_PATH /usr/local/opt/portaudio/lib/pkgconfig/
        ;;
 esac
 

From e7700c0ac4597af86ece74b88505a2fa7ae3297a Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 22:05:07 +0500
Subject: [PATCH 042/130] FS-6665 #resolve #comment This should fix it

---
 html5/verto/demo/js/verto-min.js        |  3 +-
 html5/verto/demo/verto.js               |  4 ++-
 html5/verto/js/src/jquery.verto.js      |  2 ++
 src/mod/endpoints/mod_verto/mod_verto.c | 40 +++++++++++++++++++++++--
 src/switch_core_media.c                 |  2 +-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index d56d60da55..d17c6097c5 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -210,7 +210,8 @@ if(dialog.state.val>$.verto.enum.state.new.val&&dialog.state.val<$.verto.enum.st
 dialog.rtc.useVideo(dialog.videoStream);};$.verto.dialog.prototype.useStereo=function(on){var dialog=this;dialog.params.useStereo=on;dialog.rtc.useStereo(on);};$.verto.dialog.prototype.dtmf=function(digits){var dialog=this;if(digits){dialog.sendMethod("verto.info",{dtmf:digits});}};$.verto.dialog.prototype.transfer=function(dest,params){var dialog=this;if(dest){cur_call.sendMethod("verto.modify",{action:"transfer",destination:dest,params:params});}};$.verto.dialog.prototype.hold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"hold",params:params});};$.verto.dialog.prototype.unhold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"unhold",params:params});};$.verto.dialog.prototype.toggleHold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"toggleHold",params:params});};$.verto.dialog.prototype.message=function(msg){var dialog=this;var err=0;if(!msg.to){console.error("Missing To");err++;}
 if(!msg.body){console.error("Missing Body");err++;}
 if(err){return false;}
-dialog.sendMethod("verto.info",{msg:msg});return true;};$.verto.dialog.prototype.answer=function(params){var dialog=this;if(!dialog.answered){if(params){if(params.useVideo){dialog.useVideo(true);}}
+dialog.sendMethod("verto.info",{msg:msg});return true;};$.verto.dialog.prototype.answer=function(params){var dialog=this;if(!dialog.answered){if(params){if(params.useVideo){dialog.useVideo(true);}
+dialog.params.callee_id_name=params.callee_id_name;dialog.params.callee_id_number=params.callee_id_number;}
 dialog.rtc.createAnswer(dialog.params.sdp);dialog.answered=true;}};$.verto.dialog.prototype.handleAnswer=function(params){var dialog=this;if(dialog.state.val>=$.verto.enum.state.active.val){return;}
 if(dialog.state.val>=$.verto.enum.state.early.val){dialog.setState($.verto.enum.state.active);}else{dialog.rtc.answer(params.sdp,function(){dialog.setState($.verto.enum.state.active);},function(e){console.error(e);dialog.hangup();});console.log("ANSWER SDP",params.sdp);}};$.verto.dialog.prototype.cidString=function(enc){var dialog=this;var party=dialog.params.remote_caller_id_name+(enc?" &lt;":" <")+dialog.params.remote_caller_id_number+(enc?"&gt;":">");return party;};$.verto.dialog.prototype.sendMessage=function(msg,params){var dialog=this;if(dialog.callbacks.onMessage){dialog.callbacks.onMessage(dialog.verto,dialog,msg,params);}};$.verto.dialog.prototype.handleInfo=function(params){var dialog=this;dialog.sendMessage($.verto.enum.message.info,params.msg);};$.verto.dialog.prototype.handleDisplay=function(params){var dialog=this;if(params.display_name){dialog.params.remote_caller_id_name=params.display_name;}
 if(params.display_number){dialog.params.remote_caller_id_number=params.display_number;}
diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index af9392bbfa..0f72f28f9a 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -111,7 +111,9 @@ var callbacks = {
 
             $("#ansbtn").click(function() {
                 cur_call.answer({
-		    useStereo: $("#use_stereo").is(':checked')
+		    useStereo: $("#use_stereo").is(':checked'),
+		    callee_id_name: $("#name").val(),
+		    callee_id_number: $("#cid").val(),
 		});
                 $('#dialog-incoming-call').dialog('close');
             });
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 029afc32a1..d29cb7584b 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1779,6 +1779,8 @@
                 if (params.useVideo) {
                     dialog.useVideo(true);
                 }
+		dialog.params.callee_id_name = params.callee_id_name;
+		dialog.params.callee_id_number = params.callee_id_number;
             }
             dialog.rtc.createAnswer(dialog.params.sdp);
             dialog.answered = true;
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 1b3d48f2dd..335e3e0c06 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -934,7 +934,7 @@ static void set_call_params(cJSON *params, verto_pvt_t *tech_pvt) {
 		caller_id_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name");
 		caller_id_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number");
 	}
-	
+
 	if (zstr(caller_id_name)) {
 		caller_id_name = "Outbound Call";
 	}
@@ -1924,7 +1924,8 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
 	cJSON *dialog = NULL;
 	const char *call_id = NULL, *sdp = NULL;
 	int err = 0;
-	
+	const char *callee_id_name = NULL, *callee_id_number = NULL;
+
 	*response = obj;
 
 	if (!(dialog = cJSON_GetObjectItem(params, "dialogParams"))) {
@@ -1942,6 +1943,9 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
 		err = 1; goto cleanup;
 	}
 
+	callee_id_name = cJSON_GetObjectCstr(dialog, "callee_id_name");
+	callee_id_number = cJSON_GetObjectCstr(dialog, "callee_id_number");
+
 
 	if ((session = switch_core_session_locate(call_id))) {
 		verto_pvt_t *tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY);
@@ -1968,6 +1972,12 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock
 		}
 		
 		if (!err) {
+			if (callee_id_name) {
+				switch_channel_set_profile_var(tech_pvt->channel, "callee_id_name", callee_id_name);
+			}
+			if (callee_id_number) {
+				switch_channel_set_profile_var(tech_pvt->channel, "callee_id_number", callee_id_number);
+			}
 			switch_channel_mark_answered(tech_pvt->channel);
 		}
 
@@ -3855,7 +3865,7 @@ static switch_call_cause_t verto_outgoing_channel(switch_core_session_t *session
 	if (!zstr(outbound_profile->destination_number)) {
 		dest = strdup(outbound_profile->destination_number);
 	}
-	
+
 	if (zstr(dest)) {
 		goto end;
 	}
@@ -3863,6 +3873,15 @@ static switch_call_cause_t verto_outgoing_channel(switch_core_session_t *session
 	if (!switch_stristr("u:", dest)) {
 		char *dial_str = verto_get_dial_string(dest, NULL);
 
+		switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "verto_orig_dest", dest);
+		if (zstr(switch_event_get_header(var_event, "origination_callee_id_number"))) {
+			char *trimmed_dest = strdup(dest);
+			char *p = strchr(trimmed_dest, '@');
+			if (p) *p = '\0';
+			switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_callee_id_number", trimmed_dest);
+			free(trimmed_dest);
+		}
+
 		cause = SWITCH_CAUSE_USER_NOT_REGISTERED;
 
 		if (dial_str) {
@@ -3885,6 +3904,21 @@ static switch_call_cause_t verto_outgoing_channel(switch_core_session_t *session
 		}
 
 		return cause;
+	} else {
+		const char *dialed_user = switch_event_get_header(var_event, "dialed_user");
+		const char *dialed_domain = switch_event_get_header(var_event, "dialed_domain");
+		
+		if (dialed_user) {
+			if (dialed_domain) {
+				switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, "verto_orig_dest", "%s@%s", dialed_user, dialed_domain);
+			} else {
+				switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "verto_orig_dest", dialed_user);
+			}
+			if (zstr(switch_event_get_header(var_event, "origination_callee_id_number"))) {
+				switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_callee_id_number", dialed_user);
+				outbound_profile->callee_id_number = switch_sanitize_number(switch_core_strdup(outbound_profile->pool, dialed_user));
+			}
+		}
 	}
 
 	if ((cause = switch_core_session_outgoing_channel(session, var_event, "rtc",
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index a6a846dad5..ab98003c11 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -3502,7 +3502,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
 											  "Bah HUMBUG! Sticking with %s@%uh@%ui\n",
 											  imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
-						} else if ((ptime && codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || remote_codec_rate != codec_rate || map_channels != imp->number_of_channels) {
+						} else if ((ptime && codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || remote_codec_rate != codec_rate) {
 							/* ptime does not match */
 							match = 0;
 							

From a907bfc34a345dacc8219b4dec783bd4c3f42c2d Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 22:07:46 +0500
Subject: [PATCH 043/130] test

---
 html5/verto/js/src/jquery.verto.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index d29cb7584b..39c96dd4dd 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1,3 +1,4 @@
+
 /*
  * Verto HTML5/Javascript Telephony Signaling and Control Protocol Stack for FreeSWITCH
  * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>

From b820d5e90c774004bd4ef785d74d538c1b079afa Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 22:08:08 +0500
Subject: [PATCH 044/130] FS-6665 #resolve #comment fixed

---
 html5/verto/js/src/jquery.verto.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 39c96dd4dd..d29cb7584b 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1,4 +1,3 @@
-
 /*
  * Verto HTML5/Javascript Telephony Signaling and Control Protocol Stack for FreeSWITCH
  * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>

From 8a10763b34ca3179e426ce9721603fef0c129abd Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 22:09:57 +0500
Subject: [PATCH 045/130] test

---
 html5/verto/js/src/jquery.verto.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index d29cb7584b..39c96dd4dd 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1,3 +1,4 @@
+
 /*
  * Verto HTML5/Javascript Telephony Signaling and Control Protocol Stack for FreeSWITCH
  * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>

From b85da6d9f7b05ea72c94b53eb4712c9c5e4061cb Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Jul 2014 22:10:01 +0500
Subject: [PATCH 046/130] FS-6665 #resolve #comment fixed

---
 html5/verto/js/src/jquery.verto.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 39c96dd4dd..d29cb7584b 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1,4 +1,3 @@
-
 /*
  * Verto HTML5/Javascript Telephony Signaling and Control Protocol Stack for FreeSWITCH
  * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>

From aa434fd460605c19d2da09cd0dc9779e446212f6 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 18 Jul 2014 13:25:28 -0400
Subject: [PATCH 047/130] FS-6665 #comment fixed #resolve

---
 html5/verto/js/src/jquery.verto.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index d29cb7584b..39c96dd4dd 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1,3 +1,4 @@
+
 /*
  * Verto HTML5/Javascript Telephony Signaling and Control Protocol Stack for FreeSWITCH
  * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>

From d3a459beb18a20e20483c20c29233741b6617bdb Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@freeswitch.org>
Date: Fri, 18 Jul 2014 12:24:03 -0500
Subject: [PATCH 048/130] FS-6665 #comment test commit

---
 docs/AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/AUTHORS b/docs/AUTHORS
index 93964dc388..495889c269 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -27,7 +27,7 @@ that much better:
  Stefan Knoblich - Sofia TLS, various patches and support.  Thanks.
  Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! 
  Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> 
- Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there.
+ Ken Rice - <krice AT freeswitch.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there.
  Travis Cross <tc@traviscross.com> - git migration, Debian packaging, ZRTP integration, and many other improvements
  Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks.
  Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups.

From 6706378b3841079ea63afc94e8f2dd8552ff6b36 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 18 Jul 2014 14:14:26 -0400
Subject: [PATCH 049/130] we have already removed the module from tree, no need
 to bootstrap/configure the lib still, or to have it in tree at all for that
 matter

---
 bootstrap.sh                                  |    2 +-
 configure.ac                                  |    2 -
 libs/js/.update                               |    1 -
 libs/js/AUTHORS                               |   17 -
 libs/js/ChangeLog                             |  165 -
 libs/js/LINKS                                 |   28 -
 libs/js/Makefile.in                           |  233 -
 libs/js/README                                |   73 -
 libs/js/THANKS                                |   18 -
 libs/js/TODO                                  |   17 -
 libs/js/VERSION                               |    6 -
 libs/js/acsite.m4                             |  226 -
 libs/js/config.hw                             |  114 -
 libs/js/configure.ac                          |  236 -
 libs/js/configure.gnu                         |    4 -
 libs/js/js-config.1                           |   67 -
 libs/js/js-config.sh.in                       |  138 -
 libs/js/js.1                                  |  167 -
 libs/js/js.3                                  |   46 -
 libs/js/js.pc.in                              |   10 -
 libs/js/jslint.js                             | 2542 ------
 libs/js/libtool.m4                            | 6397 -------------
 libs/js/nsprpub/.cvsignore                    |    5 -
 libs/js/nsprpub/.update                       |    1 -
 libs/js/nsprpub/Makefile.in                   |  151 -
 libs/js/nsprpub/admin/explode.pl              |   75 -
 libs/js/nsprpub/admin/makeTargetDirs.sh       |   79 -
 libs/js/nsprpub/admin/repackage.sh            |  215 -
 libs/js/nsprpub/admin/symlinks.sh             |   75 -
 libs/js/nsprpub/build/autoconf/.empty         |    0
 libs/js/nsprpub/build/cygwin-wrapper          |   75 -
 libs/js/nsprpub/config/.cvsignore             |   11 -
 libs/js/nsprpub/config/Makefile.in            |  160 -
 libs/js/nsprpub/config/autoconf.mk.in         |  129 -
 libs/js/nsprpub/config/config.mk              |  164 -
 libs/js/nsprpub/config/gcc_hidden.h           |    2 -
 libs/js/nsprpub/config/libc_r.h               |  158 -
 .../js/nsprpub/config/make-system-wrappers.pl |   59 -
 libs/js/nsprpub/config/nfspwd.pl              |   50 -
 libs/js/nsprpub/config/now.c                  |  142 -
 libs/js/nsprpub/config/nsinstall.c            |  602 --
 libs/js/nsprpub/config/nspr-config.in         |  143 -
 libs/js/nsprpub/config/nspr.m4                |   67 -
 libs/js/nsprpub/config/nsprincl.mk.in         |    5 -
 libs/js/nsprpub/config/nsprincl.sh.in         |    5 -
 libs/js/nsprpub/config/pathsub.h              |   78 -
 libs/js/nsprpub/config/prdepend.h             |   44 -
 libs/js/nsprpub/config/prmkdir.bat            |   38 -
 libs/js/nsprpub/config/rules.mk               |  515 --
 libs/js/nsprpub/config/system-headers         |  172 -
 libs/js/nsprpub/configure.gnu                 |    4 -
 libs/js/nsprpub/configure.in                  | 2836 ------
 libs/js/nsprpub/include/.empty                |    0
 libs/js/nsprpub/lib/.cvsignore                |    1 -
 libs/js/nsprpub/lib/Makefile.in               |   56 -
 libs/js/nsprpub/lib/ds/.cvsignore             |    2 -
 libs/js/nsprpub/lib/ds/MANIFEST               |    7 -
 libs/js/nsprpub/lib/ds/Makefile.in            |  202 -
 libs/js/nsprpub/lib/ds/plarena.c              |  432 -
 libs/js/nsprpub/lib/ds/plarena.h              |  213 -
 libs/js/nsprpub/lib/ds/plarenas.h             |  115 -
 libs/js/nsprpub/lib/ds/plds.def               |   81 -
 libs/js/nsprpub/lib/ds/plds.rc                |  102 -
 libs/js/nsprpub/lib/ds/plds_symvec.opt        |   37 -
 libs/js/nsprpub/lib/ds/plhash.c               |  541 --
 libs/js/nsprpub/lib/ds/plhash.h               |  165 -
 libs/js/nsprpub/lib/ds/plvrsion.c             |  125 -
 libs/js/nsprpub/lib/libc/.cvsignore           |    1 -
 libs/js/nsprpub/lib/libc/Makefile.in          |   56 -
 libs/js/nsprpub/lib/libc/README               |   20 -
 libs/js/nsprpub/lib/libc/include/.cvsignore   |    1 -
 libs/js/nsprpub/lib/libc/include/MANIFEST     |    9 -
 libs/js/nsprpub/lib/libc/include/Makefile.in  |   61 -
 libs/js/nsprpub/lib/libc/include/README       |    7 -
 libs/js/nsprpub/lib/libc/include/plbase64.h   |   98 -
 libs/js/nsprpub/lib/libc/include/plerror.h    |   66 -
 libs/js/nsprpub/lib/libc/include/plgetopt.h   |   81 -
 libs/js/nsprpub/lib/libc/include/plresolv.h   |  108 -
 libs/js/nsprpub/lib/libc/include/plstr.h      |  470 -
 libs/js/nsprpub/lib/libc/src/.cvsignore       |    2 -
 libs/js/nsprpub/lib/libc/src/Makefile.in      |  202 -
 libs/js/nsprpub/lib/libc/src/README           |   20 -
 libs/js/nsprpub/lib/libc/src/base64.c         |  428 -
 libs/js/nsprpub/lib/libc/src/plc.def          |   97 -
 libs/js/nsprpub/lib/libc/src/plc.rc           |  103 -
 libs/js/nsprpub/lib/libc/src/plc_symvec.opt   |   53 -
 libs/js/nsprpub/lib/libc/src/plerror.c        |  169 -
 libs/js/nsprpub/lib/libc/src/plgetopt.c       |  184 -
 libs/js/nsprpub/lib/libc/src/plvrsion.c       |  125 -
 libs/js/nsprpub/lib/libc/src/strcat.c         |   81 -
 libs/js/nsprpub/lib/libc/src/strccmp.c        |  115 -
 libs/js/nsprpub/lib/libc/src/strchr.c         |   88 -
 libs/js/nsprpub/lib/libc/src/strcmp.c         |   57 -
 libs/js/nsprpub/lib/libc/src/strcpy.c         |   84 -
 libs/js/nsprpub/lib/libc/src/strcstr.c        |  123 -
 libs/js/nsprpub/lib/libc/src/strdup.c         |   85 -
 libs/js/nsprpub/lib/libc/src/strlen.c         |   71 -
 libs/js/nsprpub/lib/libc/src/strpbrk.c        |  100 -
 libs/js/nsprpub/lib/libc/src/strstr.c         |  117 -
 libs/js/nsprpub/lib/libc/src/strtok.c         |   89 -
 libs/js/nsprpub/lib/msgc/.cvsignore           |    1 -
 libs/js/nsprpub/lib/msgc/Makefile.in          |   52 -
 libs/js/nsprpub/lib/msgc/include/.cvsignore   |    1 -
 libs/js/nsprpub/lib/msgc/include/MANIFEST     |    5 -
 libs/js/nsprpub/lib/msgc/include/Makefile.in  |   61 -
 libs/js/nsprpub/lib/msgc/include/gcint.h      |  129 -
 libs/js/nsprpub/lib/msgc/include/prgc.h       |  419 -
 libs/js/nsprpub/lib/msgc/src/.cvsignore       |    1 -
 libs/js/nsprpub/lib/msgc/src/Makefile.in      |  103 -
 libs/js/nsprpub/lib/msgc/src/macgc.c          |   75 -
 libs/js/nsprpub/lib/msgc/src/os2gc.c          |   83 -
 libs/js/nsprpub/lib/msgc/src/prgcapi.c        |  351 -
 libs/js/nsprpub/lib/msgc/src/prmsgc.c         | 3514 -------
 libs/js/nsprpub/lib/msgc/src/unixgc.c         |  155 -
 libs/js/nsprpub/lib/msgc/src/win16gc.c        |   77 -
 libs/js/nsprpub/lib/msgc/src/win32gc.c        |  129 -
 libs/js/nsprpub/lib/msgc/tests/.cvsignore     |    1 -
 libs/js/nsprpub/lib/msgc/tests/Makefile.in    |  314 -
 libs/js/nsprpub/lib/msgc/tests/gc1.c          |  257 -
 libs/js/nsprpub/lib/msgc/tests/thrashgc.c     |  274 -
 libs/js/nsprpub/lib/prstreams/.cvsignore      |    1 -
 libs/js/nsprpub/lib/prstreams/Makefile.in     |  207 -
 libs/js/nsprpub/lib/prstreams/plvrsion.c      |  125 -
 libs/js/nsprpub/lib/prstreams/prstrms.cpp     |  550 --
 libs/js/nsprpub/lib/prstreams/prstrms.h       |  153 -
 libs/js/nsprpub/lib/prstreams/prstrms.rc      |  102 -
 .../lib/prstreams/tests/testprstrm/.cvsignore |    1 -
 .../prstreams/tests/testprstrm/Makefile.in    |  254 -
 .../prstreams/tests/testprstrm/testprstrm.cpp |  204 -
 libs/js/nsprpub/lib/tests/.cvsignore          |    1 -
 libs/js/nsprpub/lib/tests/Makefile.in         |  259 -
 libs/js/nsprpub/lib/tests/arena.c             |  401 -
 libs/js/nsprpub/lib/tests/base64t.c           | 3047 -------
 libs/js/nsprpub/lib/tests/string.c            | 3116 -------
 libs/js/nsprpub/lib/tests/windows/makefile    |   84 -
 libs/js/nsprpub/lib/tests/windows/readme.1st  |   37 -
 libs/js/nsprpub/lib/tests/windows/winevent.c  |  348 -
 libs/js/nsprpub/macbuild/.empty               |    0
 libs/js/nsprpub/pkg/Makefile.in               |   61 -
 libs/js/nsprpub/pkg/linux/Makefile.in         |  111 -
 libs/js/nsprpub/pkg/linux/sun-nspr.spec       |   81 -
 libs/js/nsprpub/pkg/solaris/Makefile-devl.com |   66 -
 .../js/nsprpub/pkg/solaris/Makefile-devl.targ |   66 -
 libs/js/nsprpub/pkg/solaris/Makefile.com      |   69 -
 libs/js/nsprpub/pkg/solaris/Makefile.in       |  121 -
 libs/js/nsprpub/pkg/solaris/Makefile.targ     |   64 -
 libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty   |    0
 libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty  |    0
 .../js/nsprpub/pkg/solaris/SUNWpr-devl/.empty |    0
 .../js/nsprpub/pkg/solaris/SUNWpr/Makefile.in |   58 -
 libs/js/nsprpub/pkg/solaris/SUNWpr/depend     |   64 -
 .../nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl   |   70 -
 .../nsprpub/pkg/solaris/SUNWpr/prototype_com  |   71 -
 .../nsprpub/pkg/solaris/SUNWpr/prototype_i386 |   77 -
 .../pkg/solaris/SUNWpr/prototype_sparc        |   83 -
 .../nsprpub/pkg/solaris/SUNWprd/Makefile.in   |   58 -
 libs/js/nsprpub/pkg/solaris/SUNWprd/depend    |   59 -
 .../nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl  |   70 -
 libs/js/nsprpub/pkg/solaris/SUNWprd/prototype |  114 -
 libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty   |    0
 .../nsprpub/pkg/solaris/SUNWprx-devl/.empty   |    0
 libs/js/nsprpub/pkg/solaris/SUNWprx/.empty    |    0
 .../nsprpub/pkg/solaris/bld_awk_pkginfo.ksh   |  141 -
 .../pkg/solaris/common_files/copyright        |   36 -
 libs/js/nsprpub/pkg/solaris/proto64.mk        |   50 -
 libs/js/nsprpub/pr/.cvsignore                 |    1 -
 libs/js/nsprpub/pr/Makefile.in                |   49 -
 libs/js/nsprpub/pr/include/.cvsignore         |    1 -
 libs/js/nsprpub/pr/include/MANIFEST           |   52 -
 libs/js/nsprpub/pr/include/Makefile.in        |   59 -
 libs/js/nsprpub/pr/include/gencfg.c           |  309 -
 libs/js/nsprpub/pr/include/md/.cvsignore      |    1 -
 libs/js/nsprpub/pr/include/md/Makefile.in     |   81 -
 libs/js/nsprpub/pr/include/md/_aix.h          |  254 -
 libs/js/nsprpub/pr/include/md/_aix32.cfg      |  145 -
 libs/js/nsprpub/pr/include/md/_aix64.cfg      |  146 -
 libs/js/nsprpub/pr/include/md/_beos.cfg       |  147 -
 libs/js/nsprpub/pr/include/md/_beos.h         |  613 --
 libs/js/nsprpub/pr/include/md/_bsdi.cfg       |  198 -
 libs/js/nsprpub/pr/include/md/_bsdi.h         |  214 -
 libs/js/nsprpub/pr/include/md/_darwin.cfg     |  145 -
 libs/js/nsprpub/pr/include/md/_darwin.h       |  287 -
 libs/js/nsprpub/pr/include/md/_dgux.cfg       |  138 -
 libs/js/nsprpub/pr/include/md/_dgux.h         |  221 -
 libs/js/nsprpub/pr/include/md/_freebsd.cfg    |  338 -
 libs/js/nsprpub/pr/include/md/_freebsd.h      |  283 -
 libs/js/nsprpub/pr/include/md/_hpux.h         |  273 -
 libs/js/nsprpub/pr/include/md/_hpux32.cfg     |  142 -
 libs/js/nsprpub/pr/include/md/_hpux64.cfg     |  143 -
 libs/js/nsprpub/pr/include/md/_irix.h         |  470 -
 libs/js/nsprpub/pr/include/md/_irix32.cfg     |  149 -
 libs/js/nsprpub/pr/include/md/_irix64.cfg     |  148 -
 libs/js/nsprpub/pr/include/md/_linux.cfg      |  712 --
 libs/js/nsprpub/pr/include/md/_linux.h        |  559 --
 libs/js/nsprpub/pr/include/md/_macos.h        |  725 --
 libs/js/nsprpub/pr/include/md/_ncr.cfg        |  140 -
 libs/js/nsprpub/pr/include/md/_ncr.h          |  230 -
 libs/js/nsprpub/pr/include/md/_nec.cfg        |  140 -
 libs/js/nsprpub/pr/include/md/_nec.h          |  196 -
 libs/js/nsprpub/pr/include/md/_netbsd.cfg     |  289 -
 libs/js/nsprpub/pr/include/md/_netbsd.h       |  322 -
 libs/js/nsprpub/pr/include/md/_nextstep.cfg   |  255 -
 libs/js/nsprpub/pr/include/md/_nextstep.h     |  299 -
 libs/js/nsprpub/pr/include/md/_nspr_pthread.h |  283 -
 libs/js/nsprpub/pr/include/md/_nto.cfg        |  150 -
 libs/js/nsprpub/pr/include/md/_nto.h          |  221 -
 libs/js/nsprpub/pr/include/md/_openbsd.cfg    |  387 -
 libs/js/nsprpub/pr/include/md/_openbsd.h      |  238 -
 libs/js/nsprpub/pr/include/md/_openvms.cfg    |  146 -
 libs/js/nsprpub/pr/include/md/_openvms.h      |  332 -
 libs/js/nsprpub/pr/include/md/_os2.cfg        |  151 -
 libs/js/nsprpub/pr/include/md/_os2.h          |  594 --
 libs/js/nsprpub/pr/include/md/_os2_errors.h   |  162 -
 libs/js/nsprpub/pr/include/md/_osf1.cfg       |  146 -
 libs/js/nsprpub/pr/include/md/_osf1.h         |  255 -
 libs/js/nsprpub/pr/include/md/_pcos.h         |   89 -
 libs/js/nsprpub/pr/include/md/_pth.h          |  311 -
 libs/js/nsprpub/pr/include/md/_qnx.cfg        |   96 -
 libs/js/nsprpub/pr/include/md/_qnx.h          |  215 -
 .../js/nsprpub/pr/include/md/_reliantunix.cfg |  145 -
 libs/js/nsprpub/pr/include/md/_reliantunix.h  |  270 -
 libs/js/nsprpub/pr/include/md/_rhapsody.cfg   |  148 -
 libs/js/nsprpub/pr/include/md/_rhapsody.h     |  225 -
 libs/js/nsprpub/pr/include/md/_riscos.cfg     |  141 -
 libs/js/nsprpub/pr/include/md/_riscos.h       |  209 -
 libs/js/nsprpub/pr/include/md/_scoos.cfg      |  140 -
 libs/js/nsprpub/pr/include/md/_scoos.h        |  204 -
 libs/js/nsprpub/pr/include/md/_solaris.cfg    |  201 -
 libs/js/nsprpub/pr/include/md/_solaris.h      |  806 --
 libs/js/nsprpub/pr/include/md/_sony.cfg       |  140 -
 libs/js/nsprpub/pr/include/md/_sony.h         |  204 -
 libs/js/nsprpub/pr/include/md/_sunos4.cfg     |  138 -
 libs/js/nsprpub/pr/include/md/_sunos4.h       |  236 -
 libs/js/nsprpub/pr/include/md/_unix_errors.h  |  171 -
 libs/js/nsprpub/pr/include/md/_unixos.h       |  633 --
 libs/js/nsprpub/pr/include/md/_unixware.cfg   |  140 -
 libs/js/nsprpub/pr/include/md/_unixware.h     |  219 -
 libs/js/nsprpub/pr/include/md/_unixware7.cfg  |  142 -
 libs/js/nsprpub/pr/include/md/_win16.cfg      |  177 -
 libs/js/nsprpub/pr/include/md/_win16.h        |  568 --
 libs/js/nsprpub/pr/include/md/_win32_errors.h |  154 -
 libs/js/nsprpub/pr/include/md/_win95.cfg      |  298 -
 libs/js/nsprpub/pr/include/md/_win95.h        |  557 --
 libs/js/nsprpub/pr/include/md/_winnt.cfg      |  298 -
 libs/js/nsprpub/pr/include/md/_winnt.h        |  620 --
 libs/js/nsprpub/pr/include/md/prosdep.h       |  169 -
 libs/js/nsprpub/pr/include/md/sunos4.h        |  164 -
 libs/js/nsprpub/pr/include/nspr.h             |   75 -
 .../js/nsprpub/pr/include/obsolete/.cvsignore |    1 -
 .../nsprpub/pr/include/obsolete/Makefile.in   |   60 -
 libs/js/nsprpub/pr/include/obsolete/pralarm.h |  194 -
 .../js/nsprpub/pr/include/obsolete/probslet.h |  185 -
 .../js/nsprpub/pr/include/obsolete/protypes.h |  252 -
 libs/js/nsprpub/pr/include/obsolete/prsem.h   |   96 -
 libs/js/nsprpub/pr/include/pratom.h           |  161 -
 libs/js/nsprpub/pr/include/prbit.h            |  111 -
 libs/js/nsprpub/pr/include/prclist.h          |  140 -
 libs/js/nsprpub/pr/include/prcmon.h           |   98 -
 libs/js/nsprpub/pr/include/prcountr.h         |  557 --
 libs/js/nsprpub/pr/include/prcvar.h           |  126 -
 libs/js/nsprpub/pr/include/prdtoa.h           |   90 -
 libs/js/nsprpub/pr/include/prenv.h            |  157 -
 libs/js/nsprpub/pr/include/prerr.h            |  278 -
 libs/js/nsprpub/pr/include/prerror.h          |  326 -
 libs/js/nsprpub/pr/include/prinet.h           |  122 -
 libs/js/nsprpub/pr/include/prinit.h           |  242 -
 libs/js/nsprpub/pr/include/prinrval.h         |  175 -
 libs/js/nsprpub/pr/include/prio.h             | 2030 -----
 libs/js/nsprpub/pr/include/pripcsem.h         |  133 -
 libs/js/nsprpub/pr/include/private/.cvsignore |    1 -
 .../js/nsprpub/pr/include/private/Makefile.in |   61 -
 libs/js/nsprpub/pr/include/private/pprio.h    |  271 -
 libs/js/nsprpub/pr/include/private/pprmwait.h |  135 -
 libs/js/nsprpub/pr/include/private/pprthred.h |  373 -
 libs/js/nsprpub/pr/include/private/primpl.h   | 2152 -----
 libs/js/nsprpub/pr/include/private/prpriv.h   |   53 -
 libs/js/nsprpub/pr/include/prlink.h           |  255 -
 libs/js/nsprpub/pr/include/prlock.h           |  121 -
 libs/js/nsprpub/pr/include/prlog.h            |  256 -
 libs/js/nsprpub/pr/include/prlong.h           |  445 -
 libs/js/nsprpub/pr/include/prmem.h            |  158 -
 libs/js/nsprpub/pr/include/prmon.h            |  113 -
 libs/js/nsprpub/pr/include/prmwait.h          |  412 -
 libs/js/nsprpub/pr/include/prnetdb.h          |  499 -
 libs/js/nsprpub/pr/include/prolock.h          |  210 -
 libs/js/nsprpub/pr/include/prpdce.h           |  118 -
 libs/js/nsprpub/pr/include/prprf.h            |  154 -
 libs/js/nsprpub/pr/include/prproces.h         |  118 -
 libs/js/nsprpub/pr/include/prrng.h            |  107 -
 libs/js/nsprpub/pr/include/prrwlock.h         |  120 -
 libs/js/nsprpub/pr/include/prshm.h            |  289 -
 libs/js/nsprpub/pr/include/prshma.h           |  271 -
 libs/js/nsprpub/pr/include/prsystem.h         |  140 -
 libs/js/nsprpub/pr/include/prthread.h         |  286 -
 libs/js/nsprpub/pr/include/prtime.h           |  298 -
 libs/js/nsprpub/pr/include/prtpool.h          |  115 -
 libs/js/nsprpub/pr/include/prtrace.h          |  678 --
 libs/js/nsprpub/pr/include/prtypes.h          |  558 --
 libs/js/nsprpub/pr/include/prvrsion.h         |  137 -
 libs/js/nsprpub/pr/include/prwin16.h          |  196 -
 libs/js/nsprpub/pr/src/.cvsignore             |    2 -
 libs/js/nsprpub/pr/src/Makefile.in            |  400 -
 libs/js/nsprpub/pr/src/bthreads/.cvsignore    |    1 -
 libs/js/nsprpub/pr/src/bthreads/Makefile.in   |   63 -
 libs/js/nsprpub/pr/src/bthreads/bsrcs.mk      |   49 -
 libs/js/nsprpub/pr/src/bthreads/btcvar.c      |  276 -
 libs/js/nsprpub/pr/src/bthreads/btlocks.c     |  116 -
 libs/js/nsprpub/pr/src/bthreads/btmisc.c      |  104 -
 libs/js/nsprpub/pr/src/bthreads/btmon.c       |  219 -
 libs/js/nsprpub/pr/src/bthreads/btsem.c       |  130 -
 libs/js/nsprpub/pr/src/bthreads/btthread.c    |  694 --
 libs/js/nsprpub/pr/src/bthreads/objs.mk       |   43 -
 libs/js/nsprpub/pr/src/cplus/.cvsignore       |    1 -
 libs/js/nsprpub/pr/src/cplus/Makefile.in      |   75 -
 libs/js/nsprpub/pr/src/cplus/rcascii.h        |  175 -
 libs/js/nsprpub/pr/src/cplus/rcbase.cpp       |   55 -
 libs/js/nsprpub/pr/src/cplus/rcbase.h         |   83 -
 libs/js/nsprpub/pr/src/cplus/rccv.cpp         |   97 -
 libs/js/nsprpub/pr/src/cplus/rccv.h           |   96 -
 libs/js/nsprpub/pr/src/cplus/rcfileio.cpp     |  199 -
 libs/js/nsprpub/pr/src/cplus/rcfileio.h       |  161 -
 libs/js/nsprpub/pr/src/cplus/rcinrval.cpp     |   69 -
 libs/js/nsprpub/pr/src/cplus/rcinrval.h       |  169 -
 libs/js/nsprpub/pr/src/cplus/rcio.cpp         |   46 -
 libs/js/nsprpub/pr/src/cplus/rcio.h           |  148 -
 libs/js/nsprpub/pr/src/cplus/rclock.cpp       |   72 -
 libs/js/nsprpub/pr/src/cplus/rclock.h         |   98 -
 libs/js/nsprpub/pr/src/cplus/rcmon.h          |   79 -
 libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp      |  232 -
 libs/js/nsprpub/pr/src/cplus/rcnetdb.h        |  129 -
 libs/js/nsprpub/pr/src/cplus/rcnetio.cpp      |  195 -
 libs/js/nsprpub/pr/src/cplus/rcnetio.h        |  126 -
 libs/js/nsprpub/pr/src/cplus/rcthread.cpp     |  220 -
 libs/js/nsprpub/pr/src/cplus/rcthread.h       |  227 -
 libs/js/nsprpub/pr/src/cplus/rctime.cpp       |   66 -
 libs/js/nsprpub/pr/src/cplus/rctime.h         |  138 -
 libs/js/nsprpub/pr/src/cplus/tests/.cvsignore |    1 -
 .../js/nsprpub/pr/src/cplus/tests/Makefile.in |  288 -
 libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp |   65 -
 .../nsprpub/pr/src/cplus/tests/interval.cpp   |  133 -
 .../js/nsprpub/pr/src/cplus/tests/ranfile.cpp |  432 -
 libs/js/nsprpub/pr/src/cplus/tests/switch.cpp |  266 -
 libs/js/nsprpub/pr/src/cplus/tests/thread.cpp |  140 -
 libs/js/nsprpub/pr/src/cplus/tests/time.cpp   |   61 -
 libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp    |  368 -
 libs/js/nsprpub/pr/src/cthreads/.empty        |    0
 libs/js/nsprpub/pr/src/io/.cvsignore          |    1 -
 libs/js/nsprpub/pr/src/io/Makefile.in         |   93 -
 libs/js/nsprpub/pr/src/io/prdir.c             |  164 -
 libs/js/nsprpub/pr/src/io/prfdcach.c          |  311 -
 libs/js/nsprpub/pr/src/io/prfile.c            |  846 --
 libs/js/nsprpub/pr/src/io/prio.c              |  202 -
 libs/js/nsprpub/pr/src/io/priometh.c          |  628 --
 libs/js/nsprpub/pr/src/io/pripv6.c            |  371 -
 libs/js/nsprpub/pr/src/io/prlayer.c           |  768 --
 libs/js/nsprpub/pr/src/io/prlog.c             |  547 --
 libs/js/nsprpub/pr/src/io/prmapopt.c          |  517 --
 libs/js/nsprpub/pr/src/io/prmmap.c            |   93 -
 libs/js/nsprpub/pr/src/io/prmwait.c           | 1491 ---
 libs/js/nsprpub/pr/src/io/prpolevt.c          |  530 --
 libs/js/nsprpub/pr/src/io/prprf.c             | 1228 ---
 libs/js/nsprpub/pr/src/io/prscanf.c           |  669 --
 libs/js/nsprpub/pr/src/io/prsocket.c          | 1843 ----
 libs/js/nsprpub/pr/src/io/prstdio.c           |  103 -
 libs/js/nsprpub/pr/src/linking/.cvsignore     |    1 -
 libs/js/nsprpub/pr/src/linking/Makefile.in    |   75 -
 libs/js/nsprpub/pr/src/linking/prlink.c       | 1742 ----
 libs/js/nsprpub/pr/src/malloc/.cvsignore      |    1 -
 libs/js/nsprpub/pr/src/malloc/Makefile.in     |   67 -
 libs/js/nsprpub/pr/src/malloc/prmalloc.c      | 1174 ---
 libs/js/nsprpub/pr/src/malloc/prmem.c         |  707 --
 libs/js/nsprpub/pr/src/md/.cvsignore          |    1 -
 libs/js/nsprpub/pr/src/md/Makefile.in         |   64 -
 libs/js/nsprpub/pr/src/md/beos/.cvsignore     |    1 -
 libs/js/nsprpub/pr/src/md/beos/Makefile.in    |   60 -
 libs/js/nsprpub/pr/src/md/beos/bcpu.c         |   55 -
 libs/js/nsprpub/pr/src/md/beos/beos.c         |  264 -
 libs/js/nsprpub/pr/src/md/beos/beos_errors.c  | 1526 ----
 libs/js/nsprpub/pr/src/md/beos/bfile.c        |  902 --
 libs/js/nsprpub/pr/src/md/beos/bmemory.c      |   42 -
 libs/js/nsprpub/pr/src/md/beos/bmisc.c        |  123 -
 libs/js/nsprpub/pr/src/md/beos/bmmap.c        |   73 -
 libs/js/nsprpub/pr/src/md/beos/bnet.c         |  929 --
 libs/js/nsprpub/pr/src/md/beos/bproc.c        |  237 -
 libs/js/nsprpub/pr/src/md/beos/brng.c         |   69 -
 libs/js/nsprpub/pr/src/md/beos/bseg.c         |   54 -
 libs/js/nsprpub/pr/src/md/beos/bsrcs.mk       |   54 -
 libs/js/nsprpub/pr/src/md/beos/btime.c        |   75 -
 libs/js/nsprpub/pr/src/md/beos/objs.mk        |   43 -
 libs/js/nsprpub/pr/src/md/mac/MANIFEST        |    7 -
 .../nsprpub/pr/src/md/mac/MacErrorHandling.h  |  668 --
 libs/js/nsprpub/pr/src/md/mac/macdll.c        |  587 --
 libs/js/nsprpub/pr/src/md/mac/macdll.h        |   57 -
 libs/js/nsprpub/pr/src/md/mac/macio.c         | 1949 ----
 libs/js/nsprpub/pr/src/md/mac/macio.h         |   51 -
 libs/js/nsprpub/pr/src/md/mac/macrng.c        |   52 -
 libs/js/nsprpub/pr/src/md/mac/macsocket.h     |  238 -
 libs/js/nsprpub/pr/src/md/mac/macsockotpt.c   | 2321 -----
 libs/js/nsprpub/pr/src/md/mac/macthr.c        |  721 --
 libs/js/nsprpub/pr/src/md/mac/mactime.c       |  253 -
 libs/js/nsprpub/pr/src/md/mac/mactime.h       |   51 -
 .../nsprpub/pr/src/md/mac/mdcriticalregion.c  |  173 -
 .../nsprpub/pr/src/md/mac/mdcriticalregion.h  |   59 -
 libs/js/nsprpub/pr/src/md/mac/mdmac.c         |  776 --
 libs/js/nsprpub/pr/src/md/mac/mdmac.h         |   51 -
 libs/js/nsprpub/pr/src/md/mac/prcpucfg.h      |  136 -
 libs/js/nsprpub/pr/src/md/os2/.cvsignore      |    1 -
 libs/js/nsprpub/pr/src/md/os2/Makefile.in     |   85 -
 libs/js/nsprpub/pr/src/md/os2/objs.mk         |   65 -
 libs/js/nsprpub/pr/src/md/os2/os2_errors.c    | 1129 ---
 libs/js/nsprpub/pr/src/md/os2/os2cv.c         |  432 -
 libs/js/nsprpub/pr/src/md/os2/os2emx.s        |  110 -
 libs/js/nsprpub/pr/src/md/os2/os2gc.c         |   90 -
 libs/js/nsprpub/pr/src/md/os2/os2inrval.c     |  112 -
 libs/js/nsprpub/pr/src/md/os2/os2io.c         |  983 --
 libs/js/nsprpub/pr/src/md/os2/os2misc.c       |  566 --
 libs/js/nsprpub/pr/src/md/os2/os2poll.c       |  382 -
 libs/js/nsprpub/pr/src/md/os2/os2rng.c        |  110 -
 libs/js/nsprpub/pr/src/md/os2/os2sem.c        |   93 -
 libs/js/nsprpub/pr/src/md/os2/os2sock.c       |  684 --
 libs/js/nsprpub/pr/src/md/os2/os2thred.c      |  407 -
 libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s  |   74 -
 libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm    |  266 -
 libs/js/nsprpub/pr/src/md/prosdep.c           |  115 -
 libs/js/nsprpub/pr/src/md/unix/.cvsignore     |    1 -
 libs/js/nsprpub/pr/src/md/unix/Makefile.in    |  133 -
 libs/js/nsprpub/pr/src/md/unix/aix.c          |  333 -
 libs/js/nsprpub/pr/src/md/unix/aixwrap.c      |   65 -
 libs/js/nsprpub/pr/src/md/unix/bsdi.c         |  119 -
 libs/js/nsprpub/pr/src/md/unix/darwin.c       |  110 -
 libs/js/nsprpub/pr/src/md/unix/dgux.c         |  109 -
 libs/js/nsprpub/pr/src/md/unix/freebsd.c      |  119 -
 libs/js/nsprpub/pr/src/md/unix/hpux.c         |  261 -
 libs/js/nsprpub/pr/src/md/unix/irix.c         | 1680 ----
 libs/js/nsprpub/pr/src/md/unix/linux.c        |  123 -
 libs/js/nsprpub/pr/src/md/unix/ncr.c          |  395 -
 libs/js/nsprpub/pr/src/md/unix/nec.c          |  100 -
 libs/js/nsprpub/pr/src/md/unix/netbsd.c       |  121 -
 libs/js/nsprpub/pr/src/md/unix/nextstep.c     |  284 -
 libs/js/nsprpub/pr/src/md/unix/nto.c          |   66 -
 libs/js/nsprpub/pr/src/md/unix/objs.mk        |   61 -
 libs/js/nsprpub/pr/src/md/unix/openbsd.c      |  121 -
 libs/js/nsprpub/pr/src/md/unix/openvms.c      |  286 -
 libs/js/nsprpub/pr/src/md/unix/os_AIX.s       |  119 -
 libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s |   71 -
 .../js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s |   92 -
 .../js/nsprpub/pr/src/md/unix/os_Darwin_x86.s |  105 -
 libs/js/nsprpub/pr/src/md/unix/os_HPUX.s      |   54 -
 libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s |  108 -
 libs/js/nsprpub/pr/src/md/unix/os_Irix.s      |  163 -
 .../js/nsprpub/pr/src/md/unix/os_Linux_ia64.s |   99 -
 libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s |  113 -
 .../nsprpub/pr/src/md/unix/os_Linux_x86_64.s  |   94 -
 .../nsprpub/pr/src/md/unix/os_ReliantUNIX.s   |  125 -
 libs/js/nsprpub/pr/src/md/unix/os_SunOS.s     |   68 -
 .../nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s |  201 -
 .../pr/src/md/unix/os_SunOS_ultrasparc.s      |  201 -
 libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s |  154 -
 .../nsprpub/pr/src/md/unix/os_SunOS_x86_64.s  |   91 -
 libs/js/nsprpub/pr/src/md/unix/osf1.c         |  107 -
 .../js/nsprpub/pr/src/md/unix/pthreads_user.c |  480 -
 libs/js/nsprpub/pr/src/md/unix/qnx.c          |  102 -
 libs/js/nsprpub/pr/src/md/unix/reliantunix.c  |  133 -
 libs/js/nsprpub/pr/src/md/unix/rhapsody.c     |  137 -
 libs/js/nsprpub/pr/src/md/unix/riscos.c       |  120 -
 libs/js/nsprpub/pr/src/md/unix/scoos.c        |  181 -
 libs/js/nsprpub/pr/src/md/unix/solaris.c      |  889 --
 libs/js/nsprpub/pr/src/md/unix/sony.c         |  109 -
 libs/js/nsprpub/pr/src/md/unix/sunos4.c       |   96 -
 libs/js/nsprpub/pr/src/md/unix/unix.c         | 3731 --------
 libs/js/nsprpub/pr/src/md/unix/unix_errors.c  |  863 --
 libs/js/nsprpub/pr/src/md/unix/unixware.c     |  583 --
 libs/js/nsprpub/pr/src/md/unix/uxpoll.c       |  708 --
 libs/js/nsprpub/pr/src/md/unix/uxproces.c     |  991 --
 libs/js/nsprpub/pr/src/md/unix/uxrng.c        |  341 -
 libs/js/nsprpub/pr/src/md/unix/uxshm.c        |  658 --
 libs/js/nsprpub/pr/src/md/unix/uxwrap.c       |  548 --
 libs/js/nsprpub/pr/src/md/windows/.cvsignore  |    1 -
 libs/js/nsprpub/pr/src/md/windows/Makefile.in |  121 -
 libs/js/nsprpub/pr/src/md/windows/ntdllmn.c   |   88 -
 libs/js/nsprpub/pr/src/md/windows/ntgc.c      |  130 -
 libs/js/nsprpub/pr/src/md/windows/ntinrval.c  |   60 -
 libs/js/nsprpub/pr/src/md/windows/ntio.c      | 4698 ----------
 libs/js/nsprpub/pr/src/md/windows/ntmisc.c    |  862 --
 libs/js/nsprpub/pr/src/md/windows/ntsec.c     |  279 -
 libs/js/nsprpub/pr/src/md/windows/ntsem.c     |   84 -
 libs/js/nsprpub/pr/src/md/windows/ntthread.c  |  560 --
 libs/js/nsprpub/pr/src/md/windows/objs.mk     |   94 -
 libs/js/nsprpub/pr/src/md/windows/w16callb.c  |  262 -
 libs/js/nsprpub/pr/src/md/windows/w16error.c  |  252 -
 libs/js/nsprpub/pr/src/md/windows/w16fmem.c   |   85 -
 libs/js/nsprpub/pr/src/md/windows/w16gc.c     |   86 -
 libs/js/nsprpub/pr/src/md/windows/w16io.c     |  855 --
 libs/js/nsprpub/pr/src/md/windows/w16mem.c    |   84 -
 libs/js/nsprpub/pr/src/md/windows/w16null.c   |  116 -
 libs/js/nsprpub/pr/src/md/windows/w16proc.c   |   77 -
 libs/js/nsprpub/pr/src/md/windows/w16sock.c   | 1170 ---
 libs/js/nsprpub/pr/src/md/windows/w16stdio.c  |  169 -
 libs/js/nsprpub/pr/src/md/windows/w16thred.c  |  426 -
 libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c |  227 -
 libs/js/nsprpub/pr/src/md/windows/w32poll.c   |  351 -
 libs/js/nsprpub/pr/src/md/windows/w32rng.c    |  107 -
 libs/js/nsprpub/pr/src/md/windows/w32shm.c    |  355 -
 libs/js/nsprpub/pr/src/md/windows/w95cv.c     |  347 -
 .../js/nsprpub/pr/src/md/windows/w95dllmain.c |   71 -
 libs/js/nsprpub/pr/src/md/windows/w95io.c     | 1492 ---
 libs/js/nsprpub/pr/src/md/windows/w95sock.c   |  659 --
 libs/js/nsprpub/pr/src/md/windows/w95thred.c  |  304 -
 .../nsprpub/pr/src/md/windows/win32_errors.c  |  565 --
 libs/js/nsprpub/pr/src/memory/.cvsignore      |    1 -
 libs/js/nsprpub/pr/src/memory/Makefile.in     |   69 -
 libs/js/nsprpub/pr/src/memory/prgcleak.c      |  122 -
 libs/js/nsprpub/pr/src/memory/prseg.c         |   93 -
 libs/js/nsprpub/pr/src/memory/prshm.c         |  156 -
 libs/js/nsprpub/pr/src/memory/prshma.c        |  142 -
 libs/js/nsprpub/pr/src/misc/.cvsignore        |    1 -
 libs/js/nsprpub/pr/src/misc/Makefile.in       |   92 -
 libs/js/nsprpub/pr/src/misc/compile-et.pl     |  140 -
 libs/js/nsprpub/pr/src/misc/pralarm.c         |  282 -
 libs/js/nsprpub/pr/src/misc/pratom.c          |  453 -
 libs/js/nsprpub/pr/src/misc/prcountr.c        |  506 --
 libs/js/nsprpub/pr/src/misc/prdtoa.c          | 3515 -------
 libs/js/nsprpub/pr/src/misc/prenv.c           |  109 -
 libs/js/nsprpub/pr/src/misc/prerr.c           |  128 -
 libs/js/nsprpub/pr/src/misc/prerr.et          |  139 -
 libs/js/nsprpub/pr/src/misc/prerr.properties  |  116 -
 libs/js/nsprpub/pr/src/misc/prerror.c         |  107 -
 libs/js/nsprpub/pr/src/misc/prerrortable.c    |  240 -
 libs/js/nsprpub/pr/src/misc/prinit.c          |  755 --
 libs/js/nsprpub/pr/src/misc/prinrval.c        |  157 -
 libs/js/nsprpub/pr/src/misc/pripc.c           |  132 -
 libs/js/nsprpub/pr/src/misc/pripcsem.c        |  130 -
 libs/js/nsprpub/pr/src/misc/prlog2.c          |   81 -
 libs/js/nsprpub/pr/src/misc/prlong.c          |  282 -
 libs/js/nsprpub/pr/src/misc/prnetdb.c         | 2198 -----
 libs/js/nsprpub/pr/src/misc/prolock.c         |  100 -
 libs/js/nsprpub/pr/src/misc/prrng.c           |   76 -
 libs/js/nsprpub/pr/src/misc/prsystem.c        |  366 -
 libs/js/nsprpub/pr/src/misc/prthinfo.c        |  247 -
 libs/js/nsprpub/pr/src/misc/prtime.c          | 1961 ----
 libs/js/nsprpub/pr/src/misc/prtpool.c         | 1219 ---
 libs/js/nsprpub/pr/src/misc/prtrace.c         |  922 --
 libs/js/nsprpub/pr/src/nspr.def               |  346 -
 libs/js/nsprpub/pr/src/nspr.rc                |  102 -
 libs/js/nsprpub/pr/src/nspr_symvec.opt        |  503 -
 libs/js/nsprpub/pr/src/os2extra.def           |   16 -
 libs/js/nsprpub/pr/src/prvrsion.c             |  127 -
 libs/js/nsprpub/pr/src/pthreads/.cvsignore    |    1 -
 libs/js/nsprpub/pr/src/pthreads/Makefile.in   |   74 -
 libs/js/nsprpub/pr/src/pthreads/ptio.c        | 4861 ----------
 libs/js/nsprpub/pr/src/pthreads/ptmisc.c      |   71 -
 libs/js/nsprpub/pr/src/pthreads/ptsynch.c     | 1139 ---
 libs/js/nsprpub/pr/src/pthreads/ptthread.c    | 1545 ----
 libs/js/nsprpub/pr/src/threads/.cvsignore     |    1 -
 libs/js/nsprpub/pr/src/threads/Makefile.in    |   85 -
 .../pr/src/threads/combined/.cvsignore        |    1 -
 .../pr/src/threads/combined/Makefile.in       |   79 -
 .../js/nsprpub/pr/src/threads/combined/README |   62 -
 .../nsprpub/pr/src/threads/combined/prucpu.c  |  440 -
 .../nsprpub/pr/src/threads/combined/prucv.c   |  681 --
 .../nsprpub/pr/src/threads/combined/prulock.c |  463 -
 .../pr/src/threads/combined/prustack.c        |  206 -
 .../nsprpub/pr/src/threads/combined/pruthr.c  | 1918 ----
 libs/js/nsprpub/pr/src/threads/prcmon.c       |  410 -
 libs/js/nsprpub/pr/src/threads/prcthr.c       |  438 -
 libs/js/nsprpub/pr/src/threads/prdump.c       |  153 -
 libs/js/nsprpub/pr/src/threads/prmon.c        |  222 -
 libs/js/nsprpub/pr/src/threads/prrwlock.c     |  512 --
 libs/js/nsprpub/pr/src/threads/prsem.c        |  174 -
 libs/js/nsprpub/pr/src/threads/prtpd.c        |  280 -
 libs/js/nsprpub/pr/tests/.cvsignore           |    1 -
 libs/js/nsprpub/pr/tests/Makefile.in          |  567 --
 libs/js/nsprpub/pr/tests/README.TXT           |  434 -
 libs/js/nsprpub/pr/tests/accept.c             |  524 --
 libs/js/nsprpub/pr/tests/acceptread.c         |  272 -
 libs/js/nsprpub/pr/tests/acceptreademu.c      |  302 -
 libs/js/nsprpub/pr/tests/addrstr.c            |  114 -
 libs/js/nsprpub/pr/tests/affinity.c           |  124 -
 libs/js/nsprpub/pr/tests/alarm.c              |  569 --
 libs/js/nsprpub/pr/tests/anonfm.c             |  343 -
 libs/js/nsprpub/pr/tests/append.c             |  158 -
 libs/js/nsprpub/pr/tests/atomic.c             |  126 -
 libs/js/nsprpub/pr/tests/attach.c             |  392 -
 libs/js/nsprpub/pr/tests/bigfile.c            |  318 -
 libs/js/nsprpub/pr/tests/bigfile2.c           |  127 -
 libs/js/nsprpub/pr/tests/bigfile3.c           |  126 -
 libs/js/nsprpub/pr/tests/bug1test.c           |  257 -
 libs/js/nsprpub/pr/tests/cleanup.c            |  131 -
 libs/js/nsprpub/pr/tests/cltsrv.c             | 1226 ---
 libs/js/nsprpub/pr/tests/concur.c             |  193 -
 libs/js/nsprpub/pr/tests/cvar.c               |  334 -
 libs/js/nsprpub/pr/tests/cvar2.c              | 1008 ---
 libs/js/nsprpub/pr/tests/dbmalloc.c           |  347 -
 libs/js/nsprpub/pr/tests/dbmalloc1.c          |  141 -
 libs/js/nsprpub/pr/tests/dceemu.c             |  132 -
 libs/js/nsprpub/pr/tests/depend.c             |  153 -
 libs/js/nsprpub/pr/tests/dll/.cvsignore       |    1 -
 libs/js/nsprpub/pr/tests/dll/Makefile.in      |  121 -
 libs/js/nsprpub/pr/tests/dll/my.def           |   58 -
 libs/js/nsprpub/pr/tests/dll/mygetval.c       |   58 -
 libs/js/nsprpub/pr/tests/dll/mysetval.c       |   45 -
 libs/js/nsprpub/pr/tests/dlltest.c            |  221 -
 libs/js/nsprpub/pr/tests/dtoa.c               |  217 -
 libs/js/nsprpub/pr/tests/env.c                |  222 -
 libs/js/nsprpub/pr/tests/errcodes.c           |  167 -
 libs/js/nsprpub/pr/tests/errset.c             |  186 -
 libs/js/nsprpub/pr/tests/exit.c               |  137 -
 libs/js/nsprpub/pr/tests/fdcach.c             |  259 -
 libs/js/nsprpub/pr/tests/fileio.c             |  250 -
 libs/js/nsprpub/pr/tests/foreign.c            |  414 -
 libs/js/nsprpub/pr/tests/forktest.c           |  346 -
 libs/js/nsprpub/pr/tests/formattm.c           |   59 -
 libs/js/nsprpub/pr/tests/freeif.c             |   75 -
 libs/js/nsprpub/pr/tests/fsync.c              |  155 -
 libs/js/nsprpub/pr/tests/getai.c              |   64 -
 libs/js/nsprpub/pr/tests/gethost.c            |  291 -
 libs/js/nsprpub/pr/tests/getproto.c           |  114 -
 libs/js/nsprpub/pr/tests/i2l.c                |  133 -
 libs/js/nsprpub/pr/tests/initclk.c            |  109 -
 libs/js/nsprpub/pr/tests/inrval.c             |  242 -
 libs/js/nsprpub/pr/tests/instrumt.c           |  507 --
 libs/js/nsprpub/pr/tests/intrio.c             |  169 -
 libs/js/nsprpub/pr/tests/intrupt.c            |  373 -
 libs/js/nsprpub/pr/tests/io_timeout.c         |  299 -
 libs/js/nsprpub/pr/tests/io_timeoutk.c        |  233 -
 libs/js/nsprpub/pr/tests/io_timeoutu.c        |  234 -
 libs/js/nsprpub/pr/tests/ioconthr.c           |  146 -
 libs/js/nsprpub/pr/tests/ipv6.c               |  248 -
 libs/js/nsprpub/pr/tests/join.c               |  264 -
 libs/js/nsprpub/pr/tests/joinkk.c             |  193 -
 libs/js/nsprpub/pr/tests/joinku.c             |  199 -
 libs/js/nsprpub/pr/tests/joinuk.c             |  195 -
 libs/js/nsprpub/pr/tests/joinuu.c             |  197 -
 libs/js/nsprpub/pr/tests/layer.c              |  466 -
 libs/js/nsprpub/pr/tests/lazyinit.c           |  139 -
 libs/js/nsprpub/pr/tests/libfilename.c        |  129 -
 libs/js/nsprpub/pr/tests/lltest.c             |  859 --
 libs/js/nsprpub/pr/tests/lock.c               |  547 --
 libs/js/nsprpub/pr/tests/lockfile.c           |  276 -
 libs/js/nsprpub/pr/tests/logger.c             |  167 -
 libs/js/nsprpub/pr/tests/macbuild/.empty      |    0
 libs/js/nsprpub/pr/tests/makedir.c            |   99 -
 libs/js/nsprpub/pr/tests/many_cv.c            |  150 -
 libs/js/nsprpub/pr/tests/mbcs.c               |  187 -
 libs/js/nsprpub/pr/tests/multiacc.c           |  252 -
 libs/js/nsprpub/pr/tests/multiwait.c          |  725 --
 libs/js/nsprpub/pr/tests/nameshm1.c           |  599 --
 libs/js/nsprpub/pr/tests/nbconn.c             |  592 --
 libs/js/nsprpub/pr/tests/nblayer.c            |  707 --
 libs/js/nsprpub/pr/tests/nonblock.c           |  273 -
 libs/js/nsprpub/pr/tests/ntioto.c             |  318 -
 libs/js/nsprpub/pr/tests/ntoh.c               |  125 -
 libs/js/nsprpub/pr/tests/obsints.c            |   83 -
 libs/js/nsprpub/pr/tests/op_2long.c           |  117 -
 libs/js/nsprpub/pr/tests/op_excl.c            |  156 -
 libs/js/nsprpub/pr/tests/op_filnf.c           |   96 -
 libs/js/nsprpub/pr/tests/op_filok.c           |  110 -
 libs/js/nsprpub/pr/tests/op_noacc.c           |   94 -
 libs/js/nsprpub/pr/tests/op_nofil.c           |   99 -
 libs/js/nsprpub/pr/tests/openfile.c           |  145 -
 libs/js/nsprpub/pr/tests/parent.c             |  157 -
 libs/js/nsprpub/pr/tests/peek.c               |  392 -
 libs/js/nsprpub/pr/tests/perf.c               |  485 -
 libs/js/nsprpub/pr/tests/pipeping.c           |  190 -
 libs/js/nsprpub/pr/tests/pipeping2.c          |  192 -
 libs/js/nsprpub/pr/tests/pipepong.c           |   92 -
 libs/js/nsprpub/pr/tests/pipepong2.c          |  130 -
 libs/js/nsprpub/pr/tests/pipeself.c           |  260 -
 libs/js/nsprpub/pr/tests/poll_er.c            |  244 -
 libs/js/nsprpub/pr/tests/poll_nm.c            |  399 -
 libs/js/nsprpub/pr/tests/poll_to.c            |  216 -
 libs/js/nsprpub/pr/tests/pollable.c           |  293 -
 libs/js/nsprpub/pr/tests/prftest.c            |   97 -
 libs/js/nsprpub/pr/tests/prftest1.c           |  152 -
 libs/js/nsprpub/pr/tests/prftest2.c           |  129 -
 libs/js/nsprpub/pr/tests/primblok.c           |  148 -
 libs/js/nsprpub/pr/tests/priotest.c           |  233 -
 libs/js/nsprpub/pr/tests/provider.c           | 1445 ---
 libs/js/nsprpub/pr/tests/prpoll.c             |  378 -
 libs/js/nsprpub/pr/tests/prpollml.c           |  162 -
 libs/js/nsprpub/pr/tests/prselect.c           |  372 -
 libs/js/nsprpub/pr/tests/prttools.h           |   43 -
 libs/js/nsprpub/pr/tests/randseed.c           |  163 -
 libs/js/nsprpub/pr/tests/ranfile.c            |  433 -
 libs/js/nsprpub/pr/tests/rmdir.c              |  127 -
 libs/js/nsprpub/pr/tests/runtests.ksh         |  292 -
 libs/js/nsprpub/pr/tests/runtests.sh          |  292 -
 libs/js/nsprpub/pr/tests/runy2ktests.ksh      |  269 -
 libs/js/nsprpub/pr/tests/rwlocktest.c         |  241 -
 libs/js/nsprpub/pr/tests/sel_spd.c            |  567 --
 libs/js/nsprpub/pr/tests/selct_er.c           |  234 -
 libs/js/nsprpub/pr/tests/selct_nm.c           |  320 -
 libs/js/nsprpub/pr/tests/selct_to.c           |  208 -
 libs/js/nsprpub/pr/tests/select2.c            |  354 -
 libs/js/nsprpub/pr/tests/selintr.c            |   81 -
 libs/js/nsprpub/pr/tests/sem.c                |  253 -
 libs/js/nsprpub/pr/tests/sema.c               |  180 -
 libs/js/nsprpub/pr/tests/semaerr.c            |  142 -
 libs/js/nsprpub/pr/tests/semaerr1.c           |  137 -
 libs/js/nsprpub/pr/tests/semaping.c           |  203 -
 libs/js/nsprpub/pr/tests/semapong.c           |  147 -
 libs/js/nsprpub/pr/tests/sendzlf.c            |  246 -
 libs/js/nsprpub/pr/tests/server_test.c        |  635 --
 libs/js/nsprpub/pr/tests/servr_kk.c           |  614 --
 libs/js/nsprpub/pr/tests/servr_ku.c           |  594 --
 libs/js/nsprpub/pr/tests/servr_uk.c           |  596 --
 libs/js/nsprpub/pr/tests/servr_uu.c           |  594 --
 libs/js/nsprpub/pr/tests/short_thread.c       |   90 -
 libs/js/nsprpub/pr/tests/sigpipe.c            |  131 -
 libs/js/nsprpub/pr/tests/sleep.c              |  134 -
 libs/js/nsprpub/pr/tests/socket.c             | 2354 -----
 libs/js/nsprpub/pr/tests/sockopt.c            |  213 -
 libs/js/nsprpub/pr/tests/sockping.c           |  164 -
 libs/js/nsprpub/pr/tests/sockpong.c           |  115 -
 libs/js/nsprpub/pr/tests/sprintf.c            |  454 -
 libs/js/nsprpub/pr/tests/sproc_ch.c           |  119 -
 libs/js/nsprpub/pr/tests/sproc_p.c            |  101 -
 libs/js/nsprpub/pr/tests/stack.c              |  310 -
 libs/js/nsprpub/pr/tests/stat.c               |  119 -
 libs/js/nsprpub/pr/tests/stdio.c              |   83 -
 libs/js/nsprpub/pr/tests/str2addr.c           |   82 -
 libs/js/nsprpub/pr/tests/strod.c              |  106 -
 libs/js/nsprpub/pr/tests/suspend.c            |  231 -
 libs/js/nsprpub/pr/tests/switch.c             |  274 -
 libs/js/nsprpub/pr/tests/system.c             |   83 -
 libs/js/nsprpub/pr/tests/testbit.c            |  129 -
 libs/js/nsprpub/pr/tests/testfile.c           | 1008 ---
 libs/js/nsprpub/pr/tests/threads.c            |  249 -
 libs/js/nsprpub/pr/tests/thrpool_client.c     |  392 -
 libs/js/nsprpub/pr/tests/thrpool_server.c     |  607 --
 libs/js/nsprpub/pr/tests/thruput.c            |  412 -
 libs/js/nsprpub/pr/tests/time.c               |  201 -
 libs/js/nsprpub/pr/tests/timemac.c            |  153 -
 libs/js/nsprpub/pr/tests/timetest.c           |  782 --
 libs/js/nsprpub/pr/tests/tmoacc.c             |  333 -
 libs/js/nsprpub/pr/tests/tmocon.c             |  401 -
 libs/js/nsprpub/pr/tests/tpd.c                |  334 -
 libs/js/nsprpub/pr/tests/udpsrv.c             |  566 --
 libs/js/nsprpub/pr/tests/ut_ttools.h          |   43 -
 libs/js/nsprpub/pr/tests/vercheck.c           |  109 -
 libs/js/nsprpub/pr/tests/version.c            |  123 -
 libs/js/nsprpub/pr/tests/w16gui/.cvsignore    |    1 -
 libs/js/nsprpub/pr/tests/w16gui/Makefile.in   |   99 -
 libs/js/nsprpub/pr/tests/w16gui/popfile.c     |  167 -
 libs/js/nsprpub/pr/tests/w16gui/popfind.c     |  149 -
 libs/js/nsprpub/pr/tests/w16gui/popfont.c     |   94 -
 libs/js/nsprpub/pr/tests/w16gui/poppad.c      |  672 --
 libs/js/nsprpub/pr/tests/w16gui/poppad.h      |   66 -
 libs/js/nsprpub/pr/tests/w16gui/poppad.ico    |  Bin 326 -> 0 bytes
 libs/js/nsprpub/pr/tests/w16gui/poppad.rc     |  121 -
 libs/js/nsprpub/pr/tests/w16gui/popprnt0.c    |   49 -
 libs/js/nsprpub/pr/tests/w16gui/readme.1st    |   37 -
 libs/js/nsprpub/pr/tests/writev.c             |  234 -
 libs/js/nsprpub/pr/tests/xnotify.c            |  389 -
 libs/js/nsprpub/pr/tests/y2k.c                |  840 --
 libs/js/nsprpub/pr/tests/y2ktmo.c             |  546 --
 libs/js/nsprpub/pr/tests/yield.c              |   88 -
 libs/js/nsprpub/pr/tests/zerolen.c            |  282 -
 libs/js/nsprpub/tools/.cvsignore              |    1 -
 libs/js/nsprpub/tools/Makefile.in             |  249 -
 libs/js/nsprpub/tools/httpget.c               |  466 -
 libs/js/nsprpub/tools/tail.c                  |  166 -
 libs/js/shtool                                | 3990 --------
 libs/js/src/fdlibm/e_acos.c                   |  147 -
 libs/js/src/fdlibm/e_acosh.c                  |  105 -
 libs/js/src/fdlibm/e_asin.c                   |  156 -
 libs/js/src/fdlibm/e_atan2.c                  |  165 -
 libs/js/src/fdlibm/e_atanh.c                  |  110 -
 libs/js/src/fdlibm/e_cosh.c                   |  133 -
 libs/js/src/fdlibm/e_exp.c                    |  202 -
 libs/js/src/fdlibm/e_fmod.c                   |  184 -
 libs/js/src/fdlibm/e_gamma.c                  |   71 -
 libs/js/src/fdlibm/e_gamma_r.c                |   70 -
 libs/js/src/fdlibm/e_hypot.c                  |  173 -
 libs/js/src/fdlibm/e_j0.c                     |  524 --
 libs/js/src/fdlibm/e_j1.c                     |  523 --
 libs/js/src/fdlibm/e_jn.c                     |  315 -
 libs/js/src/fdlibm/e_lgamma.c                 |   71 -
 libs/js/src/fdlibm/e_lgamma_r.c               |  347 -
 libs/js/src/fdlibm/e_log.c                    |  184 -
 libs/js/src/fdlibm/e_log10.c                  |  134 -
 libs/js/src/fdlibm/e_pow.c                    |  386 -
 libs/js/src/fdlibm/e_rem_pio2.c               |  222 -
 libs/js/src/fdlibm/e_remainder.c              |  120 -
 libs/js/src/fdlibm/e_scalb.c                  |   89 -
 libs/js/src/fdlibm/e_sinh.c                   |  122 -
 libs/js/src/fdlibm/e_sqrt.c                   |  497 -
 libs/js/src/fdlibm/fdlibm.h                   |  364 -
 libs/js/src/fdlibm/k_cos.c                    |  135 -
 libs/js/src/fdlibm/k_rem_pio2.c               |  354 -
 libs/js/src/fdlibm/k_sin.c                    |  114 -
 libs/js/src/fdlibm/k_standard.c               |  785 --
 libs/js/src/fdlibm/k_tan.c                    |  170 -
 libs/js/src/fdlibm/s_asinh.c                  |  101 -
 libs/js/src/fdlibm/s_atan.c                   |  175 -
 libs/js/src/fdlibm/s_cbrt.c                   |  133 -
 libs/js/src/fdlibm/s_ceil.c                   |  120 -
 libs/js/src/fdlibm/s_copysign.c               |   72 -
 libs/js/src/fdlibm/s_cos.c                    |  118 -
 libs/js/src/fdlibm/s_erf.c                    |  356 -
 libs/js/src/fdlibm/s_expm1.c                  |  267 -
 libs/js/src/fdlibm/s_fabs.c                   |   70 -
 libs/js/src/fdlibm/s_finite.c                 |   71 -
 libs/js/src/fdlibm/s_floor.c                  |  121 -
 libs/js/src/fdlibm/s_frexp.c                  |   99 -
 libs/js/src/fdlibm/s_ilogb.c                  |   85 -
 libs/js/src/fdlibm/s_isnan.c                  |   74 -
 libs/js/src/fdlibm/s_ldexp.c                  |   66 -
 libs/js/src/fdlibm/s_lib_version.c            |   73 -
 libs/js/src/fdlibm/s_log1p.c                  |  211 -
 libs/js/src/fdlibm/s_logb.c                   |   79 -
 libs/js/src/fdlibm/s_matherr.c                |   64 -
 libs/js/src/fdlibm/s_modf.c                   |  132 -
 libs/js/src/fdlibm/s_nextafter.c              |  124 -
 libs/js/src/fdlibm/s_rint.c                   |  131 -
 libs/js/src/fdlibm/s_scalbn.c                 |  107 -
 libs/js/src/fdlibm/s_signgam.c                |   40 -
 libs/js/src/fdlibm/s_significand.c            |   68 -
 libs/js/src/fdlibm/s_sin.c                    |  118 -
 libs/js/src/fdlibm/s_tan.c                    |  112 -
 libs/js/src/fdlibm/s_tanh.c                   |  122 -
 libs/js/src/fdlibm/w_acos.c                   |   78 -
 libs/js/src/fdlibm/w_acosh.c                  |   78 -
 libs/js/src/fdlibm/w_asin.c                   |   80 -
 libs/js/src/fdlibm/w_atan2.c                  |   79 -
 libs/js/src/fdlibm/w_atanh.c                  |   81 -
 libs/js/src/fdlibm/w_cosh.c                   |   77 -
 libs/js/src/fdlibm/w_exp.c                    |   88 -
 libs/js/src/fdlibm/w_fmod.c                   |   78 -
 libs/js/src/fdlibm/w_gamma.c                  |   85 -
 libs/js/src/fdlibm/w_gamma_r.c                |   81 -
 libs/js/src/fdlibm/w_hypot.c                  |   78 -
 libs/js/src/fdlibm/w_j0.c                     |  105 -
 libs/js/src/fdlibm/w_j1.c                     |  106 -
 libs/js/src/fdlibm/w_jn.c                     |  128 -
 libs/js/src/fdlibm/w_lgamma.c                 |   85 -
 libs/js/src/fdlibm/w_lgamma_r.c               |   81 -
 libs/js/src/fdlibm/w_log.c                    |   78 -
 libs/js/src/fdlibm/w_log10.c                  |   81 -
 libs/js/src/fdlibm/w_pow.c                    |   99 -
 libs/js/src/fdlibm/w_remainder.c              |   77 -
 libs/js/src/fdlibm/w_scalb.c                  |   95 -
 libs/js/src/fdlibm/w_sinh.c                   |   77 -
 libs/js/src/fdlibm/w_sqrt.c                   |   77 -
 libs/js/src/js.c                              | 2639 ------
 libs/js/src/js.msg                            |  287 -
 libs/js/src/jsapi.c                           | 4860 ----------
 libs/js/src/jsapi.h                           | 2030 -----
 libs/js/src/jsarena.c                         |  574 --
 libs/js/src/jsarena.h                         |  311 -
 libs/js/src/jsarray.c                         | 1829 ----
 libs/js/src/jsarray.h                         |   81 -
 libs/js/src/jsatom.c                          |  992 --
 libs/js/src/jsatom.h                          |  471 -
 libs/js/src/jsautocfg.hw                      |   52 -
 libs/js/src/jsbit.h                           |  113 -
 libs/js/src/jsbool.c                          |  215 -
 libs/js/src/jsbool.h                          |   64 -
 libs/js/src/jsclist.h                         |  139 -
 libs/js/src/jscntxt.c                         | 1091 ---
 libs/js/src/jscntxt.h                         |  726 --
 libs/js/src/jscompat.h                        |   57 -
 libs/js/src/jsconfig.h                        |  563 --
 libs/js/src/jscpucfg.c                        |  375 -
 libs/js/src/jscpucfg.h                        |  212 -
 libs/js/src/jsdate.c                          | 2386 -----
 libs/js/src/jsdate.h                          |  118 -
 libs/js/src/jsdbgapi.c                        | 1343 ---
 libs/js/src/jsdbgapi.h                        |  399 -
 libs/js/src/jsdhash.c                         |  767 --
 libs/js/src/jsdhash.h                         |  579 --
 libs/js/src/jsdso.c                           |  247 -
 libs/js/src/jsdso.h                           |   51 -
 libs/js/src/jsdtoa.c                          | 3132 -------
 libs/js/src/jsdtoa.h                          |  130 -
 libs/js/src/jsemit.c                          | 5360 -----------
 libs/js/src/jsemit.h                          |  592 --
 libs/js/src/jsexn.c                           | 1165 ---
 libs/js/src/jsexn.h                           |  105 -
 libs/js/src/jsfile.c                          | 3109 -------
 libs/js/src/jsfile.h                          |   50 -
 libs/js/src/jsfile.msg                        |   90 -
 libs/js/src/jsfun.c                           | 2157 -----
 libs/js/src/jsfun.h                           |  164 -
 libs/js/src/jsgc.c                            | 1968 ----
 libs/js/src/jsgc.h                            |  269 -
 libs/js/src/jshash.c                          |  471 -
 libs/js/src/jshash.h                          |  152 -
 libs/js/src/jsinterp.c                        | 5511 -----------
 libs/js/src/jsinterp.h                        |  322 -
 libs/js/src/jslibmath.h                       |  318 -
 libs/js/src/jslock.c                          | 1261 ---
 libs/js/src/jslock.h                          |  261 -
 libs/js/src/jslog2.c                          |   83 -
 libs/js/src/jslong.c                          |  281 -
 libs/js/src/jslong.h                          |  444 -
 libs/js/src/jsmath.c                          |  469 -
 libs/js/src/jsmath.h                          |   55 -
 libs/js/src/jsnum.c                           | 1145 ---
 libs/js/src/jsnum.h                           |  268 -
 libs/js/src/jsobj.c                           | 4426 ---------
 libs/js/src/jsobj.h                           |  499 -
 libs/js/src/jsopcode.c                        | 3142 -------
 libs/js/src/jsopcode.h                        |  301 -
 libs/js/src/jsopcode.tbl                      |  394 -
 libs/js/src/jsosdep.h                         |  112 -
 libs/js/src/jsotypes.h                        |  202 -
 libs/js/src/jsparse.c                         | 4864 ----------
 libs/js/src/jsparse.h                         |  414 -
 libs/js/src/jsprf.c                           | 1269 ---
 libs/js/src/jsprf.h                           |  150 -
 libs/js/src/jsprvtd.h                         |  203 -
 libs/js/src/jspubtd.h                         |  635 --
 libs/js/src/jsregexp.c                        | 4173 ---------
 libs/js/src/jsregexp.h                        |  180 -
 libs/js/src/jsscan.c                          | 2132 -----
 libs/js/src/jsscan.h                          |  363 -
 libs/js/src/jsscope.c                         | 1642 ----
 libs/js/src/jsscope.h                         |  394 -
 libs/js/src/jsscript.c                        | 1473 ---
 libs/js/src/jsscript.h                        |  209 -
 libs/js/src/jsshell.msg                       |   50 -
 libs/js/src/jsstddef.h                        |   83 -
 libs/js/src/jsstr.c                           | 4849 ----------
 libs/js/src/jsstr.h                           |  482 -
 libs/js/src/jstypes.h                         |  472 -
 libs/js/src/jsutil.c                          |  191 -
 libs/js/src/jsutil.h                          |   94 -
 libs/js/src/jsxdrapi.c                        |  686 --
 libs/js/src/jsxdrapi.h                        |  193 -
 libs/js/src/jsxml.c                           | 8062 -----------------
 libs/js/src/jsxml.h                           |  328 -
 libs/js/src/perlconnect/JS.pm                 |  318 -
 libs/js/src/perlconnect/JS.xs                 | 1055 ---
 libs/js/src/perlconnect/MANIFEST              |   11 -
 libs/js/src/perlconnect/Makefile.PL.in        |   11 -
 libs/js/src/perlconnect/PerlConnect.pm        |  126 -
 libs/js/src/perlconnect/jsperl.c              | 1100 ---
 libs/js/src/perlconnect/jsperl.h              |   52 -
 libs/js/src/perlconnect/jsperlpvt.h           |   57 -
 libs/js/src/perlconnect/typemap               |  121 -
 libs/js/src/prmjtime.c                        |  440 -
 libs/js/src/prmjtime.h                        |  103 -
 943 files changed, 1 insertion(+), 343076 deletions(-)
 delete mode 100644 libs/js/.update
 delete mode 100644 libs/js/AUTHORS
 delete mode 100644 libs/js/ChangeLog
 delete mode 100644 libs/js/LINKS
 delete mode 100644 libs/js/Makefile.in
 delete mode 100644 libs/js/README
 delete mode 100644 libs/js/THANKS
 delete mode 100644 libs/js/TODO
 delete mode 100644 libs/js/VERSION
 delete mode 100644 libs/js/acsite.m4
 delete mode 100644 libs/js/config.hw
 delete mode 100644 libs/js/configure.ac
 delete mode 100644 libs/js/configure.gnu
 delete mode 100644 libs/js/js-config.1
 delete mode 100644 libs/js/js-config.sh.in
 delete mode 100644 libs/js/js.1
 delete mode 100644 libs/js/js.3
 delete mode 100644 libs/js/js.pc.in
 delete mode 100644 libs/js/jslint.js
 delete mode 100644 libs/js/libtool.m4
 delete mode 100644 libs/js/nsprpub/.cvsignore
 delete mode 100644 libs/js/nsprpub/.update
 delete mode 100644 libs/js/nsprpub/Makefile.in
 delete mode 100644 libs/js/nsprpub/admin/explode.pl
 delete mode 100755 libs/js/nsprpub/admin/makeTargetDirs.sh
 delete mode 100755 libs/js/nsprpub/admin/repackage.sh
 delete mode 100755 libs/js/nsprpub/admin/symlinks.sh
 delete mode 100644 libs/js/nsprpub/build/autoconf/.empty
 delete mode 100755 libs/js/nsprpub/build/cygwin-wrapper
 delete mode 100644 libs/js/nsprpub/config/.cvsignore
 delete mode 100644 libs/js/nsprpub/config/Makefile.in
 delete mode 100644 libs/js/nsprpub/config/autoconf.mk.in
 delete mode 100644 libs/js/nsprpub/config/config.mk
 delete mode 100644 libs/js/nsprpub/config/gcc_hidden.h
 delete mode 100644 libs/js/nsprpub/config/libc_r.h
 delete mode 100644 libs/js/nsprpub/config/make-system-wrappers.pl
 delete mode 100644 libs/js/nsprpub/config/nfspwd.pl
 delete mode 100644 libs/js/nsprpub/config/now.c
 delete mode 100644 libs/js/nsprpub/config/nsinstall.c
 delete mode 100755 libs/js/nsprpub/config/nspr-config.in
 delete mode 100644 libs/js/nsprpub/config/nspr.m4
 delete mode 100644 libs/js/nsprpub/config/nsprincl.mk.in
 delete mode 100644 libs/js/nsprpub/config/nsprincl.sh.in
 delete mode 100644 libs/js/nsprpub/config/pathsub.h
 delete mode 100644 libs/js/nsprpub/config/prdepend.h
 delete mode 100755 libs/js/nsprpub/config/prmkdir.bat
 delete mode 100644 libs/js/nsprpub/config/rules.mk
 delete mode 100644 libs/js/nsprpub/config/system-headers
 delete mode 100644 libs/js/nsprpub/configure.gnu
 delete mode 100644 libs/js/nsprpub/configure.in
 delete mode 100644 libs/js/nsprpub/include/.empty
 delete mode 100644 libs/js/nsprpub/lib/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/ds/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/ds/MANIFEST
 delete mode 100644 libs/js/nsprpub/lib/ds/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/ds/plarena.c
 delete mode 100644 libs/js/nsprpub/lib/ds/plarena.h
 delete mode 100644 libs/js/nsprpub/lib/ds/plarenas.h
 delete mode 100644 libs/js/nsprpub/lib/ds/plds.def
 delete mode 100644 libs/js/nsprpub/lib/ds/plds.rc
 delete mode 100644 libs/js/nsprpub/lib/ds/plds_symvec.opt
 delete mode 100644 libs/js/nsprpub/lib/ds/plhash.c
 delete mode 100644 libs/js/nsprpub/lib/ds/plhash.h
 delete mode 100644 libs/js/nsprpub/lib/ds/plvrsion.c
 delete mode 100644 libs/js/nsprpub/lib/libc/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/libc/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/libc/README
 delete mode 100644 libs/js/nsprpub/lib/libc/include/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/libc/include/MANIFEST
 delete mode 100644 libs/js/nsprpub/lib/libc/include/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/libc/include/README
 delete mode 100644 libs/js/nsprpub/lib/libc/include/plbase64.h
 delete mode 100644 libs/js/nsprpub/lib/libc/include/plerror.h
 delete mode 100644 libs/js/nsprpub/lib/libc/include/plgetopt.h
 delete mode 100644 libs/js/nsprpub/lib/libc/include/plresolv.h
 delete mode 100644 libs/js/nsprpub/lib/libc/include/plstr.h
 delete mode 100644 libs/js/nsprpub/lib/libc/src/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/libc/src/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/libc/src/README
 delete mode 100644 libs/js/nsprpub/lib/libc/src/base64.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plc.def
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plc.rc
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plc_symvec.opt
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plerror.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plgetopt.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/plvrsion.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strcat.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strccmp.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strchr.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strcmp.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strcpy.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strcstr.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strdup.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strlen.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strpbrk.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strstr.c
 delete mode 100644 libs/js/nsprpub/lib/libc/src/strtok.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/msgc/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/msgc/include/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/msgc/include/MANIFEST
 delete mode 100644 libs/js/nsprpub/lib/msgc/include/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/msgc/include/gcint.h
 delete mode 100644 libs/js/nsprpub/lib/msgc/include/prgc.h
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/macgc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/os2gc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/prgcapi.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/prmsgc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/unixgc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/win16gc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/src/win32gc.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/tests/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/msgc/tests/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/msgc/tests/gc1.c
 delete mode 100644 libs/js/nsprpub/lib/msgc/tests/thrashgc.c
 delete mode 100644 libs/js/nsprpub/lib/prstreams/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/prstreams/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/prstreams/plvrsion.c
 delete mode 100644 libs/js/nsprpub/lib/prstreams/prstrms.cpp
 delete mode 100644 libs/js/nsprpub/lib/prstreams/prstrms.h
 delete mode 100644 libs/js/nsprpub/lib/prstreams/prstrms.rc
 delete mode 100644 libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp
 delete mode 100644 libs/js/nsprpub/lib/tests/.cvsignore
 delete mode 100644 libs/js/nsprpub/lib/tests/Makefile.in
 delete mode 100644 libs/js/nsprpub/lib/tests/arena.c
 delete mode 100644 libs/js/nsprpub/lib/tests/base64t.c
 delete mode 100644 libs/js/nsprpub/lib/tests/string.c
 delete mode 100644 libs/js/nsprpub/lib/tests/windows/makefile
 delete mode 100644 libs/js/nsprpub/lib/tests/windows/readme.1st
 delete mode 100644 libs/js/nsprpub/lib/tests/windows/winevent.c
 delete mode 100644 libs/js/nsprpub/macbuild/.empty
 delete mode 100644 libs/js/nsprpub/pkg/Makefile.in
 delete mode 100644 libs/js/nsprpub/pkg/linux/Makefile.in
 delete mode 100644 libs/js/nsprpub/pkg/linux/sun-nspr.spec
 delete mode 100755 libs/js/nsprpub/pkg/solaris/Makefile-devl.com
 delete mode 100755 libs/js/nsprpub/pkg/solaris/Makefile-devl.targ
 delete mode 100644 libs/js/nsprpub/pkg/solaris/Makefile.com
 delete mode 100644 libs/js/nsprpub/pkg/solaris/Makefile.in
 delete mode 100644 libs/js/nsprpub/pkg/solaris/Makefile.targ
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/depend
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc
 delete mode 100755 libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in
 delete mode 100755 libs/js/nsprpub/pkg/solaris/SUNWprd/depend
 delete mode 100755 libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl
 delete mode 100755 libs/js/nsprpub/pkg/solaris/SUNWprd/prototype
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprx/.empty
 delete mode 100644 libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh
 delete mode 100644 libs/js/nsprpub/pkg/solaris/common_files/copyright
 delete mode 100644 libs/js/nsprpub/pkg/solaris/proto64.mk
 delete mode 100644 libs/js/nsprpub/pr/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/include/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/include/MANIFEST
 delete mode 100644 libs/js/nsprpub/pr/include/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/include/gencfg.c
 delete mode 100644 libs/js/nsprpub/pr/include/md/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/include/md/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/include/md/_aix.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_aix32.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_aix64.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_beos.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_beos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_bsdi.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_bsdi.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_darwin.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_darwin.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_dgux.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_dgux.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_freebsd.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_freebsd.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_hpux.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_hpux32.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_hpux64.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_irix.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_irix32.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_irix64.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_linux.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_linux.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_macos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_ncr.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_ncr.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nec.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nec.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_netbsd.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_netbsd.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nextstep.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nextstep.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nspr_pthread.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nto.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_nto.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_openbsd.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_openbsd.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_openvms.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_openvms.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_os2.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_os2.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_os2_errors.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_osf1.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_osf1.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_pcos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_pth.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_qnx.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_qnx.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_reliantunix.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_reliantunix.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_rhapsody.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_rhapsody.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_riscos.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_riscos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_scoos.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_scoos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_solaris.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_solaris.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_sony.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_sony.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_sunos4.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_sunos4.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_unix_errors.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_unixos.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_unixware.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_unixware.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_unixware7.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_win16.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_win16.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_win32_errors.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_win95.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_win95.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/_winnt.cfg
 delete mode 100644 libs/js/nsprpub/pr/include/md/_winnt.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/prosdep.h
 delete mode 100644 libs/js/nsprpub/pr/include/md/sunos4.h
 delete mode 100644 libs/js/nsprpub/pr/include/nspr.h
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/pralarm.h
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/probslet.h
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/protypes.h
 delete mode 100644 libs/js/nsprpub/pr/include/obsolete/prsem.h
 delete mode 100644 libs/js/nsprpub/pr/include/pratom.h
 delete mode 100644 libs/js/nsprpub/pr/include/prbit.h
 delete mode 100644 libs/js/nsprpub/pr/include/prclist.h
 delete mode 100644 libs/js/nsprpub/pr/include/prcmon.h
 delete mode 100644 libs/js/nsprpub/pr/include/prcountr.h
 delete mode 100644 libs/js/nsprpub/pr/include/prcvar.h
 delete mode 100644 libs/js/nsprpub/pr/include/prdtoa.h
 delete mode 100644 libs/js/nsprpub/pr/include/prenv.h
 delete mode 100644 libs/js/nsprpub/pr/include/prerr.h
 delete mode 100644 libs/js/nsprpub/pr/include/prerror.h
 delete mode 100644 libs/js/nsprpub/pr/include/prinet.h
 delete mode 100644 libs/js/nsprpub/pr/include/prinit.h
 delete mode 100644 libs/js/nsprpub/pr/include/prinrval.h
 delete mode 100644 libs/js/nsprpub/pr/include/prio.h
 delete mode 100644 libs/js/nsprpub/pr/include/pripcsem.h
 delete mode 100644 libs/js/nsprpub/pr/include/private/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/include/private/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/include/private/pprio.h
 delete mode 100644 libs/js/nsprpub/pr/include/private/pprmwait.h
 delete mode 100644 libs/js/nsprpub/pr/include/private/pprthred.h
 delete mode 100644 libs/js/nsprpub/pr/include/private/primpl.h
 delete mode 100644 libs/js/nsprpub/pr/include/private/prpriv.h
 delete mode 100644 libs/js/nsprpub/pr/include/prlink.h
 delete mode 100644 libs/js/nsprpub/pr/include/prlock.h
 delete mode 100644 libs/js/nsprpub/pr/include/prlog.h
 delete mode 100644 libs/js/nsprpub/pr/include/prlong.h
 delete mode 100644 libs/js/nsprpub/pr/include/prmem.h
 delete mode 100644 libs/js/nsprpub/pr/include/prmon.h
 delete mode 100644 libs/js/nsprpub/pr/include/prmwait.h
 delete mode 100644 libs/js/nsprpub/pr/include/prnetdb.h
 delete mode 100644 libs/js/nsprpub/pr/include/prolock.h
 delete mode 100644 libs/js/nsprpub/pr/include/prpdce.h
 delete mode 100644 libs/js/nsprpub/pr/include/prprf.h
 delete mode 100644 libs/js/nsprpub/pr/include/prproces.h
 delete mode 100644 libs/js/nsprpub/pr/include/prrng.h
 delete mode 100644 libs/js/nsprpub/pr/include/prrwlock.h
 delete mode 100644 libs/js/nsprpub/pr/include/prshm.h
 delete mode 100644 libs/js/nsprpub/pr/include/prshma.h
 delete mode 100644 libs/js/nsprpub/pr/include/prsystem.h
 delete mode 100644 libs/js/nsprpub/pr/include/prthread.h
 delete mode 100644 libs/js/nsprpub/pr/include/prtime.h
 delete mode 100644 libs/js/nsprpub/pr/include/prtpool.h
 delete mode 100644 libs/js/nsprpub/pr/include/prtrace.h
 delete mode 100644 libs/js/nsprpub/pr/include/prtypes.h
 delete mode 100644 libs/js/nsprpub/pr/include/prvrsion.h
 delete mode 100644 libs/js/nsprpub/pr/include/prwin16.h
 delete mode 100644 libs/js/nsprpub/pr/src/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/bsrcs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btcvar.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btlocks.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btmisc.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btmon.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btsem.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/btthread.c
 delete mode 100644 libs/js/nsprpub/pr/src/bthreads/objs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcascii.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcbase.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcbase.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rccv.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rccv.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcfileio.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcfileio.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcinrval.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcinrval.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcio.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcio.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rclock.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rclock.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcmon.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcnetdb.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcnetio.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcnetio.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcthread.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rcthread.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rctime.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/rctime.h
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/interval.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/switch.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/thread.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/time.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp
 delete mode 100644 libs/js/nsprpub/pr/src/cthreads/.empty
 delete mode 100644 libs/js/nsprpub/pr/src/io/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/io/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/io/prdir.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prfdcach.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prfile.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prio.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/priometh.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/pripv6.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prlayer.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prlog.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prmapopt.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prmmap.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prmwait.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prpolevt.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prprf.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prscanf.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prsocket.c
 delete mode 100644 libs/js/nsprpub/pr/src/io/prstdio.c
 delete mode 100644 libs/js/nsprpub/pr/src/linking/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/linking/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/linking/prlink.c
 delete mode 100644 libs/js/nsprpub/pr/src/malloc/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/malloc/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/malloc/prmalloc.c
 delete mode 100644 libs/js/nsprpub/pr/src/malloc/prmem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/md/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bcpu.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/beos.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/beos_errors.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bfile.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bmemory.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bmisc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bmmap.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bnet.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bproc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/brng.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bseg.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/bsrcs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/btime.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/beos/objs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/MANIFEST
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macdll.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macdll.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macio.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macio.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macrng.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macsocket.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macsockotpt.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/macthr.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mactime.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mactime.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mdmac.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/mdmac.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/mac/prcpucfg.h
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/objs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2_errors.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2cv.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2emx.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2gc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2inrval.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2io.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2misc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2poll.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2rng.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2sem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2sock.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2thred.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm
 delete mode 100644 libs/js/nsprpub/pr/src/md/prosdep.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/aix.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/aixwrap.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/bsdi.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/darwin.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/dgux.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/freebsd.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/hpux.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/irix.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/linux.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/ncr.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/nec.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/netbsd.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/nextstep.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/nto.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/objs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/openbsd.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/openvms.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_AIX.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_HPUX.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Irix.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_SunOS.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/osf1.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/pthreads_user.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/qnx.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/reliantunix.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/rhapsody.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/riscos.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/scoos.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/solaris.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/sony.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/sunos4.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/unix.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/unix_errors.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/unixware.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/uxpoll.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/uxproces.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/uxrng.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/uxshm.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/unix/uxwrap.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntdllmn.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntgc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntinrval.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntio.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntmisc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntsec.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntsem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/ntthread.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/objs.mk
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16callb.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16error.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16fmem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16gc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16io.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16mem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16null.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16proc.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16sock.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16stdio.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w16thred.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w32poll.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w32rng.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w32shm.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w95cv.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w95dllmain.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w95io.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w95sock.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/w95thred.c
 delete mode 100644 libs/js/nsprpub/pr/src/md/windows/win32_errors.c
 delete mode 100644 libs/js/nsprpub/pr/src/memory/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/memory/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/memory/prgcleak.c
 delete mode 100644 libs/js/nsprpub/pr/src/memory/prseg.c
 delete mode 100644 libs/js/nsprpub/pr/src/memory/prshm.c
 delete mode 100644 libs/js/nsprpub/pr/src/memory/prshma.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/misc/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/misc/compile-et.pl
 delete mode 100644 libs/js/nsprpub/pr/src/misc/pralarm.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/pratom.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prcountr.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prdtoa.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prenv.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prerr.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prerr.et
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prerr.properties
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prerror.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prerrortable.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prinit.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prinrval.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/pripc.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/pripcsem.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prlog2.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prlong.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prnetdb.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prolock.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prrng.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prsystem.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prthinfo.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prtime.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prtpool.c
 delete mode 100644 libs/js/nsprpub/pr/src/misc/prtrace.c
 delete mode 100644 libs/js/nsprpub/pr/src/nspr.def
 delete mode 100644 libs/js/nsprpub/pr/src/nspr.rc
 delete mode 100644 libs/js/nsprpub/pr/src/nspr_symvec.opt
 delete mode 100644 libs/js/nsprpub/pr/src/os2extra.def
 delete mode 100644 libs/js/nsprpub/pr/src/prvrsion.c
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/ptio.c
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/ptmisc.c
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/ptsynch.c
 delete mode 100644 libs/js/nsprpub/pr/src/pthreads/ptthread.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/threads/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/README
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/prucpu.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/prucv.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/prulock.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/prustack.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/combined/pruthr.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prcmon.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prcthr.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prdump.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prmon.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prrwlock.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prsem.c
 delete mode 100644 libs/js/nsprpub/pr/src/threads/prtpd.c
 delete mode 100644 libs/js/nsprpub/pr/tests/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/tests/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/tests/README.TXT
 delete mode 100644 libs/js/nsprpub/pr/tests/accept.c
 delete mode 100644 libs/js/nsprpub/pr/tests/acceptread.c
 delete mode 100644 libs/js/nsprpub/pr/tests/acceptreademu.c
 delete mode 100644 libs/js/nsprpub/pr/tests/addrstr.c
 delete mode 100644 libs/js/nsprpub/pr/tests/affinity.c
 delete mode 100644 libs/js/nsprpub/pr/tests/alarm.c
 delete mode 100644 libs/js/nsprpub/pr/tests/anonfm.c
 delete mode 100644 libs/js/nsprpub/pr/tests/append.c
 delete mode 100644 libs/js/nsprpub/pr/tests/atomic.c
 delete mode 100644 libs/js/nsprpub/pr/tests/attach.c
 delete mode 100644 libs/js/nsprpub/pr/tests/bigfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/bigfile2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/bigfile3.c
 delete mode 100644 libs/js/nsprpub/pr/tests/bug1test.c
 delete mode 100644 libs/js/nsprpub/pr/tests/cleanup.c
 delete mode 100644 libs/js/nsprpub/pr/tests/cltsrv.c
 delete mode 100644 libs/js/nsprpub/pr/tests/concur.c
 delete mode 100644 libs/js/nsprpub/pr/tests/cvar.c
 delete mode 100644 libs/js/nsprpub/pr/tests/cvar2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dbmalloc.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dbmalloc1.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dceemu.c
 delete mode 100644 libs/js/nsprpub/pr/tests/depend.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dll/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/tests/dll/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/tests/dll/my.def
 delete mode 100644 libs/js/nsprpub/pr/tests/dll/mygetval.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dll/mysetval.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dlltest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/dtoa.c
 delete mode 100644 libs/js/nsprpub/pr/tests/env.c
 delete mode 100644 libs/js/nsprpub/pr/tests/errcodes.c
 delete mode 100644 libs/js/nsprpub/pr/tests/errset.c
 delete mode 100644 libs/js/nsprpub/pr/tests/exit.c
 delete mode 100644 libs/js/nsprpub/pr/tests/fdcach.c
 delete mode 100644 libs/js/nsprpub/pr/tests/fileio.c
 delete mode 100644 libs/js/nsprpub/pr/tests/foreign.c
 delete mode 100644 libs/js/nsprpub/pr/tests/forktest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/formattm.c
 delete mode 100644 libs/js/nsprpub/pr/tests/freeif.c
 delete mode 100644 libs/js/nsprpub/pr/tests/fsync.c
 delete mode 100644 libs/js/nsprpub/pr/tests/getai.c
 delete mode 100644 libs/js/nsprpub/pr/tests/gethost.c
 delete mode 100644 libs/js/nsprpub/pr/tests/getproto.c
 delete mode 100644 libs/js/nsprpub/pr/tests/i2l.c
 delete mode 100644 libs/js/nsprpub/pr/tests/initclk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/inrval.c
 delete mode 100644 libs/js/nsprpub/pr/tests/instrumt.c
 delete mode 100644 libs/js/nsprpub/pr/tests/intrio.c
 delete mode 100644 libs/js/nsprpub/pr/tests/intrupt.c
 delete mode 100644 libs/js/nsprpub/pr/tests/io_timeout.c
 delete mode 100644 libs/js/nsprpub/pr/tests/io_timeoutk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/io_timeoutu.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ioconthr.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ipv6.c
 delete mode 100644 libs/js/nsprpub/pr/tests/join.c
 delete mode 100644 libs/js/nsprpub/pr/tests/joinkk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/joinku.c
 delete mode 100644 libs/js/nsprpub/pr/tests/joinuk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/joinuu.c
 delete mode 100644 libs/js/nsprpub/pr/tests/layer.c
 delete mode 100644 libs/js/nsprpub/pr/tests/lazyinit.c
 delete mode 100644 libs/js/nsprpub/pr/tests/libfilename.c
 delete mode 100644 libs/js/nsprpub/pr/tests/lltest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/lock.c
 delete mode 100644 libs/js/nsprpub/pr/tests/lockfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/logger.c
 delete mode 100644 libs/js/nsprpub/pr/tests/macbuild/.empty
 delete mode 100644 libs/js/nsprpub/pr/tests/makedir.c
 delete mode 100644 libs/js/nsprpub/pr/tests/many_cv.c
 delete mode 100644 libs/js/nsprpub/pr/tests/mbcs.c
 delete mode 100644 libs/js/nsprpub/pr/tests/multiacc.c
 delete mode 100644 libs/js/nsprpub/pr/tests/multiwait.c
 delete mode 100644 libs/js/nsprpub/pr/tests/nameshm1.c
 delete mode 100644 libs/js/nsprpub/pr/tests/nbconn.c
 delete mode 100644 libs/js/nsprpub/pr/tests/nblayer.c
 delete mode 100644 libs/js/nsprpub/pr/tests/nonblock.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ntioto.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ntoh.c
 delete mode 100644 libs/js/nsprpub/pr/tests/obsints.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_2long.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_excl.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_filnf.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_filok.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_noacc.c
 delete mode 100644 libs/js/nsprpub/pr/tests/op_nofil.c
 delete mode 100644 libs/js/nsprpub/pr/tests/openfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/parent.c
 delete mode 100644 libs/js/nsprpub/pr/tests/peek.c
 delete mode 100644 libs/js/nsprpub/pr/tests/perf.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pipeping.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pipeping2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pipepong.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pipepong2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pipeself.c
 delete mode 100755 libs/js/nsprpub/pr/tests/poll_er.c
 delete mode 100644 libs/js/nsprpub/pr/tests/poll_nm.c
 delete mode 100644 libs/js/nsprpub/pr/tests/poll_to.c
 delete mode 100644 libs/js/nsprpub/pr/tests/pollable.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prftest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prftest1.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prftest2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/primblok.c
 delete mode 100644 libs/js/nsprpub/pr/tests/priotest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/provider.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prpoll.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prpollml.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prselect.c
 delete mode 100644 libs/js/nsprpub/pr/tests/prttools.h
 delete mode 100644 libs/js/nsprpub/pr/tests/randseed.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ranfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/rmdir.c
 delete mode 100755 libs/js/nsprpub/pr/tests/runtests.ksh
 delete mode 100755 libs/js/nsprpub/pr/tests/runtests.sh
 delete mode 100644 libs/js/nsprpub/pr/tests/runy2ktests.ksh
 delete mode 100644 libs/js/nsprpub/pr/tests/rwlocktest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sel_spd.c
 delete mode 100755 libs/js/nsprpub/pr/tests/selct_er.c
 delete mode 100644 libs/js/nsprpub/pr/tests/selct_nm.c
 delete mode 100644 libs/js/nsprpub/pr/tests/selct_to.c
 delete mode 100644 libs/js/nsprpub/pr/tests/select2.c
 delete mode 100644 libs/js/nsprpub/pr/tests/selintr.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sem.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sema.c
 delete mode 100644 libs/js/nsprpub/pr/tests/semaerr.c
 delete mode 100644 libs/js/nsprpub/pr/tests/semaerr1.c
 delete mode 100644 libs/js/nsprpub/pr/tests/semaping.c
 delete mode 100644 libs/js/nsprpub/pr/tests/semapong.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sendzlf.c
 delete mode 100644 libs/js/nsprpub/pr/tests/server_test.c
 delete mode 100644 libs/js/nsprpub/pr/tests/servr_kk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/servr_ku.c
 delete mode 100644 libs/js/nsprpub/pr/tests/servr_uk.c
 delete mode 100644 libs/js/nsprpub/pr/tests/servr_uu.c
 delete mode 100644 libs/js/nsprpub/pr/tests/short_thread.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sigpipe.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sleep.c
 delete mode 100644 libs/js/nsprpub/pr/tests/socket.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sockopt.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sockping.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sockpong.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sprintf.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sproc_ch.c
 delete mode 100644 libs/js/nsprpub/pr/tests/sproc_p.c
 delete mode 100644 libs/js/nsprpub/pr/tests/stack.c
 delete mode 100644 libs/js/nsprpub/pr/tests/stat.c
 delete mode 100644 libs/js/nsprpub/pr/tests/stdio.c
 delete mode 100644 libs/js/nsprpub/pr/tests/str2addr.c
 delete mode 100644 libs/js/nsprpub/pr/tests/strod.c
 delete mode 100644 libs/js/nsprpub/pr/tests/suspend.c
 delete mode 100644 libs/js/nsprpub/pr/tests/switch.c
 delete mode 100644 libs/js/nsprpub/pr/tests/system.c
 delete mode 100644 libs/js/nsprpub/pr/tests/testbit.c
 delete mode 100644 libs/js/nsprpub/pr/tests/testfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/threads.c
 delete mode 100644 libs/js/nsprpub/pr/tests/thrpool_client.c
 delete mode 100644 libs/js/nsprpub/pr/tests/thrpool_server.c
 delete mode 100644 libs/js/nsprpub/pr/tests/thruput.c
 delete mode 100644 libs/js/nsprpub/pr/tests/time.c
 delete mode 100644 libs/js/nsprpub/pr/tests/timemac.c
 delete mode 100644 libs/js/nsprpub/pr/tests/timetest.c
 delete mode 100644 libs/js/nsprpub/pr/tests/tmoacc.c
 delete mode 100644 libs/js/nsprpub/pr/tests/tmocon.c
 delete mode 100644 libs/js/nsprpub/pr/tests/tpd.c
 delete mode 100644 libs/js/nsprpub/pr/tests/udpsrv.c
 delete mode 100644 libs/js/nsprpub/pr/tests/ut_ttools.h
 delete mode 100644 libs/js/nsprpub/pr/tests/vercheck.c
 delete mode 100644 libs/js/nsprpub/pr/tests/version.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/.cvsignore
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/Makefile.in
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/popfile.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/popfind.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/popfont.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/poppad.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/poppad.h
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/poppad.ico
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/poppad.rc
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/popprnt0.c
 delete mode 100644 libs/js/nsprpub/pr/tests/w16gui/readme.1st
 delete mode 100644 libs/js/nsprpub/pr/tests/writev.c
 delete mode 100644 libs/js/nsprpub/pr/tests/xnotify.c
 delete mode 100644 libs/js/nsprpub/pr/tests/y2k.c
 delete mode 100644 libs/js/nsprpub/pr/tests/y2ktmo.c
 delete mode 100644 libs/js/nsprpub/pr/tests/yield.c
 delete mode 100644 libs/js/nsprpub/pr/tests/zerolen.c
 delete mode 100644 libs/js/nsprpub/tools/.cvsignore
 delete mode 100644 libs/js/nsprpub/tools/Makefile.in
 delete mode 100644 libs/js/nsprpub/tools/httpget.c
 delete mode 100644 libs/js/nsprpub/tools/tail.c
 delete mode 100755 libs/js/shtool
 delete mode 100644 libs/js/src/fdlibm/e_acos.c
 delete mode 100644 libs/js/src/fdlibm/e_acosh.c
 delete mode 100644 libs/js/src/fdlibm/e_asin.c
 delete mode 100644 libs/js/src/fdlibm/e_atan2.c
 delete mode 100644 libs/js/src/fdlibm/e_atanh.c
 delete mode 100644 libs/js/src/fdlibm/e_cosh.c
 delete mode 100644 libs/js/src/fdlibm/e_exp.c
 delete mode 100644 libs/js/src/fdlibm/e_fmod.c
 delete mode 100644 libs/js/src/fdlibm/e_gamma.c
 delete mode 100644 libs/js/src/fdlibm/e_gamma_r.c
 delete mode 100644 libs/js/src/fdlibm/e_hypot.c
 delete mode 100644 libs/js/src/fdlibm/e_j0.c
 delete mode 100644 libs/js/src/fdlibm/e_j1.c
 delete mode 100644 libs/js/src/fdlibm/e_jn.c
 delete mode 100644 libs/js/src/fdlibm/e_lgamma.c
 delete mode 100644 libs/js/src/fdlibm/e_lgamma_r.c
 delete mode 100644 libs/js/src/fdlibm/e_log.c
 delete mode 100644 libs/js/src/fdlibm/e_log10.c
 delete mode 100644 libs/js/src/fdlibm/e_pow.c
 delete mode 100644 libs/js/src/fdlibm/e_rem_pio2.c
 delete mode 100644 libs/js/src/fdlibm/e_remainder.c
 delete mode 100644 libs/js/src/fdlibm/e_scalb.c
 delete mode 100644 libs/js/src/fdlibm/e_sinh.c
 delete mode 100644 libs/js/src/fdlibm/e_sqrt.c
 delete mode 100644 libs/js/src/fdlibm/fdlibm.h
 delete mode 100644 libs/js/src/fdlibm/k_cos.c
 delete mode 100644 libs/js/src/fdlibm/k_rem_pio2.c
 delete mode 100644 libs/js/src/fdlibm/k_sin.c
 delete mode 100644 libs/js/src/fdlibm/k_standard.c
 delete mode 100644 libs/js/src/fdlibm/k_tan.c
 delete mode 100644 libs/js/src/fdlibm/s_asinh.c
 delete mode 100644 libs/js/src/fdlibm/s_atan.c
 delete mode 100644 libs/js/src/fdlibm/s_cbrt.c
 delete mode 100644 libs/js/src/fdlibm/s_ceil.c
 delete mode 100644 libs/js/src/fdlibm/s_copysign.c
 delete mode 100644 libs/js/src/fdlibm/s_cos.c
 delete mode 100644 libs/js/src/fdlibm/s_erf.c
 delete mode 100644 libs/js/src/fdlibm/s_expm1.c
 delete mode 100644 libs/js/src/fdlibm/s_fabs.c
 delete mode 100644 libs/js/src/fdlibm/s_finite.c
 delete mode 100644 libs/js/src/fdlibm/s_floor.c
 delete mode 100644 libs/js/src/fdlibm/s_frexp.c
 delete mode 100644 libs/js/src/fdlibm/s_ilogb.c
 delete mode 100644 libs/js/src/fdlibm/s_isnan.c
 delete mode 100644 libs/js/src/fdlibm/s_ldexp.c
 delete mode 100644 libs/js/src/fdlibm/s_lib_version.c
 delete mode 100644 libs/js/src/fdlibm/s_log1p.c
 delete mode 100644 libs/js/src/fdlibm/s_logb.c
 delete mode 100644 libs/js/src/fdlibm/s_matherr.c
 delete mode 100644 libs/js/src/fdlibm/s_modf.c
 delete mode 100644 libs/js/src/fdlibm/s_nextafter.c
 delete mode 100644 libs/js/src/fdlibm/s_rint.c
 delete mode 100644 libs/js/src/fdlibm/s_scalbn.c
 delete mode 100644 libs/js/src/fdlibm/s_signgam.c
 delete mode 100644 libs/js/src/fdlibm/s_significand.c
 delete mode 100644 libs/js/src/fdlibm/s_sin.c
 delete mode 100644 libs/js/src/fdlibm/s_tan.c
 delete mode 100644 libs/js/src/fdlibm/s_tanh.c
 delete mode 100644 libs/js/src/fdlibm/w_acos.c
 delete mode 100644 libs/js/src/fdlibm/w_acosh.c
 delete mode 100644 libs/js/src/fdlibm/w_asin.c
 delete mode 100644 libs/js/src/fdlibm/w_atan2.c
 delete mode 100644 libs/js/src/fdlibm/w_atanh.c
 delete mode 100644 libs/js/src/fdlibm/w_cosh.c
 delete mode 100644 libs/js/src/fdlibm/w_exp.c
 delete mode 100644 libs/js/src/fdlibm/w_fmod.c
 delete mode 100644 libs/js/src/fdlibm/w_gamma.c
 delete mode 100644 libs/js/src/fdlibm/w_gamma_r.c
 delete mode 100644 libs/js/src/fdlibm/w_hypot.c
 delete mode 100644 libs/js/src/fdlibm/w_j0.c
 delete mode 100644 libs/js/src/fdlibm/w_j1.c
 delete mode 100644 libs/js/src/fdlibm/w_jn.c
 delete mode 100644 libs/js/src/fdlibm/w_lgamma.c
 delete mode 100644 libs/js/src/fdlibm/w_lgamma_r.c
 delete mode 100644 libs/js/src/fdlibm/w_log.c
 delete mode 100644 libs/js/src/fdlibm/w_log10.c
 delete mode 100644 libs/js/src/fdlibm/w_pow.c
 delete mode 100644 libs/js/src/fdlibm/w_remainder.c
 delete mode 100644 libs/js/src/fdlibm/w_scalb.c
 delete mode 100644 libs/js/src/fdlibm/w_sinh.c
 delete mode 100644 libs/js/src/fdlibm/w_sqrt.c
 delete mode 100644 libs/js/src/js.c
 delete mode 100644 libs/js/src/js.msg
 delete mode 100644 libs/js/src/jsapi.c
 delete mode 100644 libs/js/src/jsapi.h
 delete mode 100644 libs/js/src/jsarena.c
 delete mode 100644 libs/js/src/jsarena.h
 delete mode 100644 libs/js/src/jsarray.c
 delete mode 100644 libs/js/src/jsarray.h
 delete mode 100644 libs/js/src/jsatom.c
 delete mode 100644 libs/js/src/jsatom.h
 delete mode 100644 libs/js/src/jsautocfg.hw
 delete mode 100644 libs/js/src/jsbit.h
 delete mode 100644 libs/js/src/jsbool.c
 delete mode 100644 libs/js/src/jsbool.h
 delete mode 100644 libs/js/src/jsclist.h
 delete mode 100644 libs/js/src/jscntxt.c
 delete mode 100644 libs/js/src/jscntxt.h
 delete mode 100644 libs/js/src/jscompat.h
 delete mode 100644 libs/js/src/jsconfig.h
 delete mode 100644 libs/js/src/jscpucfg.c
 delete mode 100644 libs/js/src/jscpucfg.h
 delete mode 100644 libs/js/src/jsdate.c
 delete mode 100644 libs/js/src/jsdate.h
 delete mode 100644 libs/js/src/jsdbgapi.c
 delete mode 100644 libs/js/src/jsdbgapi.h
 delete mode 100644 libs/js/src/jsdhash.c
 delete mode 100644 libs/js/src/jsdhash.h
 delete mode 100644 libs/js/src/jsdso.c
 delete mode 100644 libs/js/src/jsdso.h
 delete mode 100644 libs/js/src/jsdtoa.c
 delete mode 100644 libs/js/src/jsdtoa.h
 delete mode 100644 libs/js/src/jsemit.c
 delete mode 100644 libs/js/src/jsemit.h
 delete mode 100644 libs/js/src/jsexn.c
 delete mode 100644 libs/js/src/jsexn.h
 delete mode 100644 libs/js/src/jsfile.c
 delete mode 100644 libs/js/src/jsfile.h
 delete mode 100644 libs/js/src/jsfile.msg
 delete mode 100644 libs/js/src/jsfun.c
 delete mode 100644 libs/js/src/jsfun.h
 delete mode 100644 libs/js/src/jsgc.c
 delete mode 100644 libs/js/src/jsgc.h
 delete mode 100644 libs/js/src/jshash.c
 delete mode 100644 libs/js/src/jshash.h
 delete mode 100644 libs/js/src/jsinterp.c
 delete mode 100644 libs/js/src/jsinterp.h
 delete mode 100644 libs/js/src/jslibmath.h
 delete mode 100644 libs/js/src/jslock.c
 delete mode 100644 libs/js/src/jslock.h
 delete mode 100644 libs/js/src/jslog2.c
 delete mode 100644 libs/js/src/jslong.c
 delete mode 100644 libs/js/src/jslong.h
 delete mode 100644 libs/js/src/jsmath.c
 delete mode 100644 libs/js/src/jsmath.h
 delete mode 100644 libs/js/src/jsnum.c
 delete mode 100644 libs/js/src/jsnum.h
 delete mode 100644 libs/js/src/jsobj.c
 delete mode 100644 libs/js/src/jsobj.h
 delete mode 100644 libs/js/src/jsopcode.c
 delete mode 100644 libs/js/src/jsopcode.h
 delete mode 100644 libs/js/src/jsopcode.tbl
 delete mode 100644 libs/js/src/jsosdep.h
 delete mode 100644 libs/js/src/jsotypes.h
 delete mode 100644 libs/js/src/jsparse.c
 delete mode 100644 libs/js/src/jsparse.h
 delete mode 100644 libs/js/src/jsprf.c
 delete mode 100644 libs/js/src/jsprf.h
 delete mode 100644 libs/js/src/jsprvtd.h
 delete mode 100644 libs/js/src/jspubtd.h
 delete mode 100644 libs/js/src/jsregexp.c
 delete mode 100644 libs/js/src/jsregexp.h
 delete mode 100644 libs/js/src/jsscan.c
 delete mode 100644 libs/js/src/jsscan.h
 delete mode 100644 libs/js/src/jsscope.c
 delete mode 100644 libs/js/src/jsscope.h
 delete mode 100644 libs/js/src/jsscript.c
 delete mode 100644 libs/js/src/jsscript.h
 delete mode 100644 libs/js/src/jsshell.msg
 delete mode 100644 libs/js/src/jsstddef.h
 delete mode 100644 libs/js/src/jsstr.c
 delete mode 100644 libs/js/src/jsstr.h
 delete mode 100644 libs/js/src/jstypes.h
 delete mode 100644 libs/js/src/jsutil.c
 delete mode 100644 libs/js/src/jsutil.h
 delete mode 100644 libs/js/src/jsxdrapi.c
 delete mode 100644 libs/js/src/jsxdrapi.h
 delete mode 100644 libs/js/src/jsxml.c
 delete mode 100644 libs/js/src/jsxml.h
 delete mode 100644 libs/js/src/perlconnect/JS.pm
 delete mode 100644 libs/js/src/perlconnect/JS.xs
 delete mode 100644 libs/js/src/perlconnect/MANIFEST
 delete mode 100644 libs/js/src/perlconnect/Makefile.PL.in
 delete mode 100644 libs/js/src/perlconnect/PerlConnect.pm
 delete mode 100644 libs/js/src/perlconnect/jsperl.c
 delete mode 100644 libs/js/src/perlconnect/jsperl.h
 delete mode 100644 libs/js/src/perlconnect/jsperlpvt.h
 delete mode 100644 libs/js/src/perlconnect/typemap
 delete mode 100644 libs/js/src/prmjtime.c
 delete mode 100644 libs/js/src/prmjtime.h

diff --git a/bootstrap.sh b/bootstrap.sh
index 0f19936230..90edbbae22 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -9,7 +9,7 @@ VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
 SUBDIRS="apr \
-  libzrtp ilbc iksemel js js/nsprpub libdingaling libsndfile sofia-sip \
+  libzrtp ilbc iksemel libdingaling libsndfile sofia-sip \
   speex srtp freetdm spandsp libg722_1 unimrcp tiff-4.0.2 broadvoice silk libcodec2 \
   fs";
 
diff --git a/configure.ac b/configure.ac
index 9c42da5c82..fcd0161870 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1659,8 +1659,6 @@ if test "$use_system_aprutil" != "yes"; then
 fi
 AC_CONFIG_SUBDIRS([libs/ilbc])
 AC_CONFIG_SUBDIRS([libs/iksemel])
-AC_CONFIG_SUBDIRS([libs/js/nsprpub])
-AC_CONFIG_SUBDIRS([libs/js])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
 AC_CONFIG_SUBDIRS([libs/libsndfile])
 AC_CONFIG_SUBDIRS([libs/sofia-sip])
diff --git a/libs/js/.update b/libs/js/.update
deleted file mode 100644
index 710ab7e1f1..0000000000
--- a/libs/js/.update
+++ /dev/null
@@ -1 +0,0 @@
-Tue Jan 19 13:09:35 EST 2010
diff --git a/libs/js/AUTHORS b/libs/js/AUTHORS
deleted file mode 100644
index 4e5a751799..0000000000
--- a/libs/js/AUTHORS
+++ /dev/null
@@ -1,17 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-
-  LINKS
-
-  Brendan Eich <brendan@mozilla.org> et al
-      - Mozilla JavaScript implementation
-
-  Ralf S. Engelschall <rse@engelschall.com>
-      - OSSP js distribution of Mozilla JavaScript
-
diff --git a/libs/js/ChangeLog b/libs/js/ChangeLog
deleted file mode 100644
index 233e4877d2..0000000000
--- a/libs/js/ChangeLog
+++ /dev/null
@@ -1,165 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-
-  CHANGELOG
-
-  This is a list of all changes to OSSP js.
-
-  Changes between 1.6.20060803 and 1.6.20060820 (2006-08-03 to 2006-08-20)
-
-   o Add support for UTF-8 C strings in the API and internally by
-     adding a --with-utf8 build-time options which builds the code
-     with JS_C_STRINGS_ARE_UTF8.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Upgrade to upstream sources as of 2006-08-20.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between 1.6.20060731 and 1.6.20060803 (2006-07-31 to 2006-08-03)
-
-   o Add optional Dynamic Shared Object (DSO) support (see src/jsdso.[ch]).
-     This comes in two flavors:
-
-     1. Provide two public C API functions...
-        JSBool JS_DSOLoad   (JSContext *cx, int *id, const char *filename);
-        JSBool JS_DSOUnload (JSContext *cx, int  id);
-        ...as an ultra-thin wrapper around the POSIX dlopen(3) API. It
-        especially mimics the BSD RTLD behaviour of calling pre-defined
-        functions (mandatory "js_DSO_load" and optional "js_DSO_unload")
-        inside the DSO after/before the dlopen/dlclose calls. This
-        allows the DSOs to perform their init/shutdown actions.
-
-     2. Provide a small JavaScript global object "DSO" which binds
-        the two public DSO C API functions into the JavaScript language
-        as "DSO.load" and "DSO.unload". The "DSO" object can be created
-        by the friend C API function js_InitDSOClass(). This function is
-        used by the command-linne interface "js" by default.
-
-     As a result the OSSP Mozilla JavaScript engine is now able to
-     dynamically load C extensions similar to what other programming
-     languages provide since a longer time.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Be more clean and replace weak "#if JS_HAS_FILE_OBJECT" constructs
-     with the stronger "#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0)"
-     as the JS_HAS_FILE_OBJECT can be not defined at all (in contrast to
-     other JS_HAS_XXXX defines which are all listed in src/jsconfig.h)
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Fix a bunch of compiler warnings.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Change from -O2 to -O0 and without -Wshadow under --enable-debug.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between 1.6.20060730 and 1.6.20060731 (2006-07-30 to 2006-07-31)
-
-   o Fix "make distclean": src/perlconnect/Makefile.PL is always generated
-     and hence has to be always deleted.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Fix "devtool dist" command: "make man" does not exist.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Fix "make install": the executable "js" was not installed via GNU
-     libtool and this way under --enable-shared the wrapper script was
-     installed only.
-     [Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>]
-
-   o Add a src/perlconnect/MANIFEST file to make ExtUtils::MakeMaker more happy.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Fix "make install": js-config.1 was not installed.
-     [Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>]
-
-   o Use Autoconf macros AC_CANONICAL_BUILD and AC_CANONICAL_HOST to
-     make sure that the host identification is really available.
-     [Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>]
-
-   o Upgrade to upstream sources as of 2006-07-31.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between 1.6.20060729 and 1.6.20060730 (2006-07-29 to 2006-07-30)
-
-   o Add support for Windows CygWin and MinGW environments.
-     [Ralf S. Engelschall <rse@engelschall.com>,
-      Andrew Vajoczki <vajoczki@yahoo.com>]
-
-   o Upgrade to upstream sources as of 2006-07-30.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between 1.6.20060724 and 1.6.20060729 (2006-07-24 to 2006-07-29)
-
-   o Upgrade to upstream sources as of 2006-07-29.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Changed GNU libtool shared library versioning from 0:0 to 1:6.
-     [Ralf S. Engelschall <rse@engelschall.com>,
-      Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>]
-
-   o Increase portability by gracefully downgrading the stat(2) use of
-     st_birthtime to st_birthtimensec or even st_ctime.
-     [Ralf S. Engelschall <rse@engelschall.com>,
-      Andrew Vajoczki <vajoczki@yahoo.com>]
-
-   o Apply a few more upstream fixes to jsfile.c.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between 1.6.20060722 and 1.6.20060724 (2006-07-22 to 2006-07-24)
-
-   o Apply multiple code cleanups and bugfixes.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Move definitions of XP_UNIX and EXPORT_JS_API back from jstypes.h
-     to configure.ac (and this way the command-line) to not break the
-     use of jstypes.h as a regular API header in JS based applications.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Consistently mark all OSSP bugfixes with a "/* BUGFIX */" tag on
-     the "#ifdef OSSP" line. This way one can more easily see what
-     are specific OSSP specific changes what should be taken over by
-     upstream vendor.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Fix an incorrect argument type bug in jsfile.c related to a call to
-     js_InflateString(). A "size_t *" has to be passed, not a "size_t".
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Upgrade from (the Mozilla Firefox 1.5 pinned version) SpiderMonkey
-     1.6.20060722 to the (SPIDERMONKEY_1_6_0_BRANCH based) 1.6.20060724
-     upstream version.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Added jslint (see http://www.jslint.com/) together with some
-     home-brewn option parser. The result is installed as
-     a stand-alone "jslint" program.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Install all src/js*.h headers during "make install" to allow
-     applications to at least optionally poke around in the internals.
-     This also allows an application to call js_InitFileClass() from
-     <jsfile.h> without us having to really call this function in the
-     standard API function JS_InitStandardClasses().
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-   o Change the default of the --with-file/--without from --without-file
-     to --with-file (enable the File object by default), but activate
-     it only in the CLI (where it doesn't hurt and where it is actually
-     really required to get something useful running there in practice)
-     but explicitly _NOT_ in JS_InitStandardClasses() (as this is
-     what would hurt the security in applications which assume that
-     JS_InitStandardClasses() initialized only really the standard
-     classes).
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
-  Changes between *GENESIS* and 1.6.20060722 (2006-06-XX to 2006-07-22)
-   
-   o Initial OSSP js distribution of Mozilla JavaScript 1.6 as of 2006-07-22.
-     [Ralf S. Engelschall <rse@engelschall.com>]
-
diff --git a/libs/js/LINKS b/libs/js/LINKS
deleted file mode 100644
index 2ca3e88830..0000000000
--- a/libs/js/LINKS
+++ /dev/null
@@ -1,28 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-
-  LINKS
-
-  o http://www.mozilla.org/js/
-  o http://www.mozilla.org/js/language/
-  o http://www.mozilla.org/js/spidermonkey/
-  o http://www.ecma-international.org/publications/standards/Ecma-262.htm
-  o http://developer.mozilla.org/en/docs/JavaScript_C_Engine_Embedder's_Guide
-  o http://developer.mozilla.org/en/docs/JSAPI_Reference
-  o http://lxr.mozilla.org/mozilla/source/js/src
-  o http://lxr.mozilla.org/mozilla/source/js/src/README.html
-  o http://www.jibbering.com/faq/
-  o http://www.faqts.com/knowledge_base/index.phtml/fid/53/
-  o http://users.skynet.be/saw/SpiderMonkey.htm
-  o http://groups.google.com/group/mozilla.dev.tech.js-engine
-  o http://groups.google.com/group/netscape.public.mozilla.jseng
-  o http://groups.google.com/group/comp.lang.javascript
-  o http://burstproject.org/build/doc/shells.html
-  o http://developer.mozilla.org/es4/
-
diff --git a/libs/js/Makefile.in b/libs/js/Makefile.in
deleted file mode 100644
index 55e7f2d655..0000000000
--- a/libs/js/Makefile.in
+++ /dev/null
@@ -1,233 +0,0 @@
-##
-##  OSSP js - JavaScript Engine
-##  Copyright (c) 1998-2006 Mozilla <http://www.mozilla.org/>
-##
-##  This file is part of OSSP js, a distribution of the Mozilla JavaScript
-##  reference implementation, which can found at http://www.ossp.org/pkg/lib/js/
-##
-##  Permission to use, copy, modify, and distribute this software for
-##  any purpose with or without fee is hereby granted, provided that
-##  the above copyright notice and this permission notice appear in all
-##  copies.
-##
-##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-##  SUCH DAMAGE.
-##
-##  Makefile.in: make(1) build procedure
-##
-
-@SET_MAKE@
-
-VPATH        = @srcdir@
-srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@
-
-prefix       = @prefix@
-exec_prefix  = @exec_prefix@
-datarootdir  = @datarootdir@
-bindir       = @bindir@
-libdir       = @libdir@
-includedir   = @includedir@
-mandir       = @mandir@
-
-CC           = @CC@
-CPPFLAGS     = @CPPFLAGS@ @DEFS@ -Isrc
-CFLAGS       = @CFLAGS@
-LDFLAGS      = @LDFLAGS@
-LIBS         = @LIBS@
-
-CLI_CFLAGS   = @CLI_CFLAGS@
-CLI_CPPFLAGS = @CLI_CPPFLAGS@
-CLI_LDFLAGS  = @CLI_LDFLAGS@
-CLI_LIBS     = @CLI_LIBS@
-LIBPATH      = @LIBPATH@
-
-RM           = rm -f
-CP           = cp
-RMDIR        = rmdir
-SHTOOL       = ./shtool
-LIBTOOL      = ./libtool
-PERL         = @PERL@
-TRUE         = true
-
-LIB_OBJS     = src/jsapi.lo                \
-               src/jsarena.lo              \
-               src/jsarray.lo              \
-               src/jsatom.lo               \
-               src/jsbool.lo               \
-               src/jscntxt.lo              \
-               src/jsdate.lo               \
-               src/jsdbgapi.lo             \
-               src/jsdhash.lo              \
-               src/jsdtoa.lo               \
-               src/jsemit.lo               \
-               src/jsexn.lo                \
-               src/jsfile.lo               \
-               src/jsfun.lo                \
-               src/jsgc.lo                 \
-               src/jshash.lo               \
-               src/jsinterp.lo             \
-               src/jslock.lo               \
-               src/jslog2.lo               \
-               src/jslong.lo               \
-               src/jsmath.lo               \
-               src/jsnum.lo                \
-               src/jsobj.lo                \
-               src/jsopcode.lo             \
-               src/jsparse.lo              \
-               src/jsprf.lo                \
-               src/jsregexp.lo             \
-               src/jsscan.lo               \
-               src/jsscope.lo              \
-               src/jsscript.lo             \
-               src/jsstr.lo                \
-               src/jsutil.lo               \
-               src/jsxdrapi.lo             \
-               src/jsxml.lo                \
-               src/prmjtime.lo             \
-               src/jsdso.lo                \
-               src/fdlibm/e_acos.lo        \
-               src/fdlibm/e_asin.lo        \
-               src/fdlibm/e_atan2.lo       \
-               src/fdlibm/e_exp.lo         \
-               src/fdlibm/e_fmod.lo        \
-               src/fdlibm/e_log.lo         \
-               src/fdlibm/e_pow.lo         \
-               src/fdlibm/e_rem_pio2.lo    \
-               src/fdlibm/s_scalbn.lo      \
-               src/fdlibm/e_sqrt.lo        \
-               src/fdlibm/k_cos.lo         \
-               src/fdlibm/k_sin.lo         \
-               src/fdlibm/k_rem_pio2.lo    \
-               src/fdlibm/k_tan.lo         \
-               src/fdlibm/s_atan.lo        \
-               src/fdlibm/s_ceil.lo        \
-               src/fdlibm/s_copysign.lo    \
-               src/fdlibm/s_cos.lo         \
-               src/fdlibm/s_fabs.lo        \
-               src/fdlibm/s_finite.lo      \
-               src/fdlibm/s_floor.lo       \
-               src/fdlibm/s_isnan.lo       \
-               src/fdlibm/s_lib_version.lo \
-               src/fdlibm/s_sin.lo         \
-               src/fdlibm/s_tan.lo         \
-               src/fdlibm/w_acos.lo        \
-               src/fdlibm/w_asin.lo        \
-               src/fdlibm/w_atan2.lo       \
-               src/fdlibm/w_exp.lo         \
-               src/fdlibm/w_fmod.lo        \
-               src/fdlibm/w_log.lo         \
-               src/fdlibm/w_pow.lo         \
-               src/fdlibm/w_sqrt.lo
-
-LIB_NAME     = libjs.la
-
-CLI_OBJS     = src/js.o @CLI_OBJS@
-CLI_NAME     = js
-
-WITH_PERL    = @WITH_PERL@
-
-TARGETS      = $(LIB_NAME) $(CLI_NAME)
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-
-all: $(TARGETS) subdirs
-
-subdirs:
-	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
-	    (cd src/perlconnect; $(PERL) Makefile.PL; $(MAKE) $(MFLAGS)); \
-	fi
-
-.c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-
-.c.lo:
-	@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-
-$(LIB_NAME): $(LIB_OBJS)
-	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6
-
-$(CLI_NAME): $(CLI_OBJS) $(LIB_NAME)
-	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)
-src/js.o: src/js.c
-	$(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $<
-src/perlconnect/jsperl.o: src/perlconnect/jsperl.c
-	$(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $<
-
-src/js.c: src/jstypes.h
-src/jstypes.h: src/jsautocfg.h
-$(LIB_OBJS): src/jsautocfg.h
-src/jsautocfg.h: jscpucfg
-	-rm -f $@ src/jsautocfg.h
-	$(LIBPATH) $(LIBTOOL) --mode=execute ./jscpucfg >src/jsautocfg.h
-jscpucfg.o: src/jscpucfg.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-jscpucfg: jscpucfg.o
-	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o jscpucfg jscpucfg.o $(LIBS) $(CLI_LIBS)
-src/jsopcode.h src/jsopcode.c: src/jsopcode.tbl
-
-.PHONY: install
-install: all
-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
-#	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
-#	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
-#	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
-#	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js
-#	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig
-#	$(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/
-#	$(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/
-#	$(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/
-#	$(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/
-#	$(SHTOOL) install -c -m 644 src/jsopcode.tbl $(DESTDIR)$(includedir)/js/
-#	$(SHTOOL) install -c -m 644 src/js.msg $(DESTDIR)$(includedir)/js/
-	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
-#	$(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/
-#	$(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config
-#	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
-#	$(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint
-#	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
-#	    (cd src/perlconnect; $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
-#	fi
-
-.PHONY: clean
-clean:
-	-$(RM) jscpucfg $(LIB_NAME) $(LIB_OBJS)
-	-$(RM) js src/js.o
-	-$(RM) -r .libs >/dev/null 2>&1 || $(TRUE)
-	-$(RM) -r src/.libs src/fdlibm/.libs >/dev/null 2>&1 || $(TRUE)
-	-$(RM) *.o *.lo
-	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
-	    ( cd src/perlconnect; \
-	      if [ -f Makefile ]; then $(MAKE) $(MFLAGS) clean || $(TRUE); fi; \
-	      if [ -f Makefile.old ]; then mv Makefile.old Makefile; fi; \
-	    ); \
-	fi
-
-distclean: clean
-	-$(RM) config.log config.status config.cache
-	-$(RM) Makefile config.h js.pc js-config.sh
-	-$(RM) libtool
-	-$(RM) src/perlconnect/Makefile.PL
-	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
-	    ( cd src/perlconnect; \
-	      if [ -f Makefile ]; then $(MAKE) $(MFLAGS) distclean || $(TRUE); fi; \
-	      $(RM) -f Makefile Makefile.old || $(TRUE); \
-	    ); \
-	fi
-
-realclean: distclean
-	-$(RM) configure config.h.in config.h.in~
-	-$(RM) shtool
-	-$(RM) ltmain.sh libtool.m4 config.guess config.sub
-
diff --git a/libs/js/README b/libs/js/README
deleted file mode 100644
index d7b3759f5e..0000000000
--- a/libs/js/README
+++ /dev/null
@@ -1,73 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-  Version 1.6.20060820 (20-Aug-2006)
-
-  ABSTRACT
-
-  OSSP js is a stand-alone distribution of the JavaScript (JS)
-  programming language reference implementation from Mozilla -- aka
-  "JSRef" or "SpiderMonkey". This distribution provides a smart,
-  stand-alone and portable distribution of Mozilla JavaScript through a
-  build environment based on GNU autoconf, GNU libtool and GNU shtool,
-  including support for easy JavaScript build-time feature set selection
-  (ECMA-3, JS-1.5, JS-1.6), optional CLI line editing support, optional
-  "stdio" based File object support and JS/Perl bindings. Additionally,
-  the C API in "libjs" contains both the JavaScript engine and the
-  required Sun math library ("fdlibm") and with all internal symbols
-  carefully protected under the "js" namespace. Finally, a js-config(1)
-  utility and a pkg-config(1) specification is provided to allow
-  applications to easily build with the JavaScript C API.
-
-  JUSTIFICATION
-
-  OSSP js was created because for OSSP and similar pedantic C coding
-  projects a smart, stand-alone, portable, clean, powerful and
-  robust scripting language engine is required. JavaScript is a
-  great programming language and Mozilla JavaScript "SpiderMonkey"
-  definitely is an acceptable clean, powerful and robust implementation.
-  Unfortunately there is just a stand-alone distribution released from
-  time to time by Mozilla and it is far away from really being smart,
-  stand-alone and portable. At least for OSSP it was not acceptable
-  having to tell the community that for small and stand-alone C
-  components like the OSSP components they either have to install the
-  great but large Mozilla Firefox application (where Mozilla JavaScript
-  is included) or have to fiddle around theirself with an older
-  stand-alone JavaScript distribution and its weak build environment.
-  OSSP js combines the best from two worlds: the 1:1 repackaged
-  JavaScript code base from Mozilla and the usual amount of GNU
-  autoconf, GNU libtool and GNU shtool wrappers as always used by OSSP.
-  Additionally, stand-alone ("stdio" instead of NSPR based) File object
-  support was required.
-
-  VERSIONING
-
-  The version of OSSP js is M.N.YYYYMMDD where M.N is the JavaScript
-  branch and YYYYMMDD is the date where the JavaScript code was
-  extracted from the Mozilla CVS repository.
-
-  COPYRIGHT AND LICENSE
-
-  Copyright (c) 1998-2006 Mozilla <http://www.mozilla.org/>
-
-  This file is part of OSSP js, a repackaging of the Mozilla JavaScript
-  reference implementation, which can found at http://www.ossp.org/pkg/lib/js/
-
-  The content of this distribution is licensed under the Mozilla
-  Public License (MPL) 1.1 (see http://www.mozilla.org/MPL/) or
-  alternatively the GNU General Public License (GPL) 2.0 (see
-  http://www.gnu.org/licenses/gpl.html) or the GNU Lesser General Public
-  License (LGPL) 2.1 (see http://www.gnu.org/licenses/lgpl.html).
-
-  HOME
-
-  The latest release can be found on
-
-  o http://www.ossp.org/pkg/lib/js/
-  o  ftp://ftp.ossp.org/pkg/lib/js/
-
diff --git a/libs/js/THANKS b/libs/js/THANKS
deleted file mode 100644
index 4c443a6518..0000000000
--- a/libs/js/THANKS
+++ /dev/null
@@ -1,18 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-
-  THANKS
-
-  Credit has to be given to the following people who contributed ideas,
-  bugfixes, hints, gave platform feedback, etc. (in alphabetical order):
-
-    o  Thomas Lotterer             <thomas@lotterer.net>
-    o  Alfred Reibenschuh          <alfred.reibenschuh@it-austria.com>
-    o  Andrew Vajoczki             <vajoczki@yahoo.com>
-
diff --git a/libs/js/TODO b/libs/js/TODO
deleted file mode 100644
index 1930a6fdcc..0000000000
--- a/libs/js/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-   _        ___  ____ ____  ____     _      
-  |_|_ _   / _ \/ ___/ ___||  _ \   (_)___  
-  _|_||_| | | | \___ \___ \| |_) |  | / __| 
- |_||_|_| | |_| |___) |__) |  __/   | \__ \ 
-  |_|_|_|  \___/|____/____/|_|     _/ |___/ 
-                                  |__/      
-
-  OSSP js - Mozilla JavaScript Engine
-
-  TODO
-
-  - nothing known at this point.
-
-  CANDO
-
-  - nothing known at this point.
-
diff --git a/libs/js/VERSION b/libs/js/VERSION
deleted file mode 100644
index abad13c824..0000000000
--- a/libs/js/VERSION
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  VERSION -- Version Information for OSSP js (syntax: Text)
-  [automatically generated and maintained by GNU shtool]
-
-  This is OSSP js, Version 1.6.20060820 (20-Aug-2006)
-
diff --git a/libs/js/acsite.m4 b/libs/js/acsite.m4
deleted file mode 100644
index 2ca6048848..0000000000
--- a/libs/js/acsite.m4
+++ /dev/null
@@ -1,226 +0,0 @@
-dnl ##
-dnl ##  SA - OSSP Socket Abstraction Library
-dnl ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
-dnl ##  Copyright (c) 2001-2003 The OSSP Project <http://www.ossp.org/>
-dnl ##  Copyright (c) 2001-2003 Cable & Wireless Deutschland <http://www.cw.com/de/>
-dnl ##
-dnl ##  This file is part of OSSP SA, a socket abstraction library which
-dnl ##  can be found at http://www.ossp.org/pkg/sa/.
-dnl ##
-dnl ##  Permission to use, copy, modify, and distribute this software for
-dnl ##  any purpose with or without fee is hereby granted, provided that
-dnl ##  the above copyright notice and this permission notice appear in all
-dnl ##  copies.
-dnl ##
-dnl ##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-dnl ##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-dnl ##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-dnl ##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-dnl ##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl ##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl ##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-dnl ##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-dnl ##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-dnl ##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-dnl ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-dnl ##  SUCH DAMAGE.
-dnl ##
-dnl ##  aclocal.m4: GNU Autoconf local macro definitions
-dnl ##
-
-dnl ##
-dnl ##  Check whether compiler option works
-dnl ##
-dnl ##  configure.in:
-dnl ##    AC_COMPILER_OPTION(<name>, <display>, <option>,
-dnl ##                       <action-success>, <action-failure>)
-dnl ##
-
-AC_DEFUN(AC_COMPILER_OPTION,[dnl
-AC_MSG_CHECKING(whether compiler option(s) $2 work)
-AC_CACHE_VAL(ac_cv_compiler_option_$1,[
-SAVE_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $3"
-AC_TRY_COMPILE([],[], ac_cv_compiler_option_$1=yes, ac_cv_compiler_option_$1=no)
-CFLAGS="$SAVE_CFLAGS"
-])dnl
-if test ".$ac_cv_compiler_option_$1" = .yes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-AC_MSG_RESULT([$ac_cv_compiler_option_$1])
-])dnl
-
-dnl ##
-dnl ##  Debugging Support
-dnl ##
-dnl ##  configure.in:
-dnl ##    AC_CHECK_DEBUGGING
-dnl ##
-
-AC_DEFUN(AC_CHECK_DEBUGGING,[dnl
-AC_ARG_ENABLE(debug,dnl
-[  --enable-debug          build for debugging (default=no)],
-[dnl
-if test ".$ac_cv_prog_gcc" = ".yes"; then
-    case "$CFLAGS" in
-        *-O* ) ;;
-           * ) CFLAGS="$CFLAGS -O0" ;;
-    esac
-    case "$CFLAGS" in
-        *-g* ) ;;
-           * ) CFLAGS="$CFLAGS -g" ;;
-    esac
-    case "$CFLAGS" in
-        *-pipe* ) ;;
-              * ) AC_COMPILER_OPTION(pipe, -pipe, -pipe, CFLAGS="$CFLAGS -pipe") ;;
-    esac
-    AC_COMPILER_OPTION(defdbg, -DDEBUG, -DDEBUG, CFLAGS="$CFLAGS -DDEBUG")
-    CFLAGS="$CFLAGS -pedantic"
-    CFLAGS="$CFLAGS -Wall"
-    WMORE="-Wpointer-arith -Wcast-align -Winline"
-    WMORE="$WMORE -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
-    AC_COMPILER_OPTION(wmore, -W<xxx>, $WMORE, CFLAGS="$CFLAGS $WMORE")
-    AC_COMPILER_OPTION(wnolonglong, -Wno-long-long, -Wno-long-long, CFLAGS="$CFLAGS -Wno-long-long")
-else
-    case "$CFLAGS" in
-        *-g* ) ;;
-           * ) CFLAGS="$CFLAGS -g" ;;
-    esac
-fi
-msg="enabled"
-],[
-AC_COMPILER_OPTION(defnodbg, -DNDEBUG, -DNDEBUG, CFLAGS="$CFLAGS -DNDEBUG")
-if test ".$ac_cv_prog_gcc" = ".yes"; then
-case "$CFLAGS" in
-    *-pipe* ) ;;
-          * ) AC_COMPILER_OPTION(pipe, -pipe, -pipe, CFLAGS="$CFLAGS -pipe") ;;
-esac
-fi
-case "$CFLAGS" in
-    *-g* ) CFLAGS=`echo "$CFLAGS" |\
-                   sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;;
-esac
-case "$CXXFLAGS" in
-    *-g* ) CXXFLAGS=`echo "$CXXFLAGS" |\
-                     sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;;
-esac
-msg=disabled
-])dnl
-AC_MSG_CHECKING(for compilation debug mode)
-AC_MSG_RESULT([$msg])
-if test ".$msg" = .enabled; then
-    enable_shared=no
-fi
-])
-
-dnl ##
-dnl ##  Check for C99 va_copy() implementation
-dnl ##  (and provide fallback implementation if neccessary)
-dnl ##
-dnl ##  configure.in:
-dnl ##    AC_CHECK_VA_COPY
-dnl ##  foo.c:
-dnl ##    #include "config.h"
-dnl ##    [...]
-dnl ##    va_copy(d,s)
-dnl ##
-dnl ##  This check is rather complex: first because we really have to
-dnl ##  try various possible implementations in sequence and second, we
-dnl ##  cannot define a macro in config.h with parameters directly.
-dnl ##
-
-dnl #   test program for va_copy() implementation
-changequote(<<,>>)
-m4_define(__va_copy_test, <<[
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#define DO_VA_COPY(d, s) $1
-void test(char *str, ...)
-{
-    va_list ap, ap2;
-    int i;
-    va_start(ap, str);
-    DO_VA_COPY(ap2, ap);
-    for (i = 1; i <= 9; i++) {
-        int k = (int)va_arg(ap, int);
-        if (k != i)
-            abort();
-    }
-    DO_VA_COPY(ap, ap2);
-    for (i = 1; i <= 9; i++) {
-        int k = (int)va_arg(ap, int);
-        if (k != i)
-            abort();
-    }
-    va_end(ap);
-}
-int main(int argc, char *argv[])
-{
-    test("test", 1, 2, 3, 4, 5, 6, 7, 8, 9);
-    exit(0);
-}
-]>>)
-changequote([,])
-
-dnl #   test driver for va_copy() implementation
-m4_define(__va_copy_check, [
-    AH_VERBATIM($1,
-[/* Predefined possible va_copy() implementation (id: $1) */
-#define __VA_COPY_USE_$1(d, s) $2])
-    if test ".$ac_cv_va_copy" = .; then
-        AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
-    fi
-])
-
-dnl #   Autoconf check for va_copy() implementation checking
-AC_DEFUN(AC_CHECK_VA_COPY,[
-  dnl #   provide Autoconf display check message
-  AC_MSG_CHECKING(for va_copy() function)
-  dnl #   check for various implementations in priorized sequence   
-  AC_CACHE_VAL(ac_cv_va_copy, [
-    ac_cv_va_copy=""
-    dnl #   1. check for standardized C99 macro
-    __va_copy_check(C99, [va_copy((d), (s))])
-    dnl #   2. check for alternative/deprecated GCC macro
-    __va_copy_check(GCM, [VA_COPY((d), (s))])
-    dnl #   3. check for internal GCC macro (high-level define)
-    __va_copy_check(GCH, [__va_copy((d), (s))])
-    dnl #   4. check for internal GCC macro (built-in function)
-    __va_copy_check(GCB, [__builtin_va_copy((d), (s))])
-    dnl #   5. check for assignment approach (assuming va_list is a struct)
-    __va_copy_check(ASS, [do { (d) = (s); } while (0)])
-    dnl #   6. check for assignment approach (assuming va_list is a pointer)
-    __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
-    dnl #   7. check for memory copying approach (assuming va_list is a struct)
-    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
-    dnl #   8. check for memory copying approach (assuming va_list is a pointer)
-    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
-    if test ".$ac_cv_va_copy" = .; then
-        AC_ERROR([no working implementation found])
-    fi
-  ])
-  dnl #   optionally activate the fallback implementation
-  if test ".$ac_cv_va_copy" = ".C99"; then
-      AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy() macro exists (and no fallback implementation is required)])
-  fi
-  dnl #   declare which fallback implementation to actually use
-  AC_DEFINE_UNQUOTED([__VA_COPY_USE], [__VA_COPY_USE_$ac_cv_va_copy],
-      [Define to id of used va_copy() implementation])
-  dnl #   provide activation hook for fallback implementation
-  AH_VERBATIM([__VA_COPY_ACTIVATION],
-[/* Optional va_copy() implementation activation */
-#ifndef HAVE_VA_COPY
-#define va_copy(d, s) __VA_COPY_USE(d, s)
-#endif
-])
-  dnl #   provide Autoconf display result message
-  if test ".$ac_cv_va_copy" = ".C99"; then
-      AC_MSG_RESULT([yes])
-  else
-      AC_MSG_RESULT([no (using fallback implementation)])
-  fi
-])
-
diff --git a/libs/js/config.hw b/libs/js/config.hw
deleted file mode 100644
index a1ac13ada0..0000000000
--- a/libs/js/config.hw
+++ /dev/null
@@ -1,114 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Predefined possible va_copy() implementation (id: ASP) */
-#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0)
-
-/* Predefined possible va_copy() implementation (id: ASS) */
-#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0)
-
-/* Predefined possible va_copy() implementation (id: C99) */
-#define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
-
-/* Predefined possible va_copy() implementation (id: CPP) */
-#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
-
-/* Predefined possible va_copy() implementation (id: CPS) */
-#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s)), sizeof((s))
-
-/* Predefined possible va_copy() implementation (id: GCB) */
-#define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
-
-/* Predefined possible va_copy() implementation (id: GCH) */
-#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s))
-
-/* Predefined possible va_copy() implementation (id: GCM) */
-#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s))
-
-/* Define to 1 if you have the `dlclose' function. */
-/* #undef HAVE_DLCLOSE */
-
-/* Define to 1 if you have the `dlerror' function. */
-/* #undef HAVE_DLERROR */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the `dlopen' function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-/* #undef HAVE_LIBDL */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef HAVE_STDLIB_H */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef HAVE_STRING_H */
-
-/* Define to 1 if `st_birthtime' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */
-
-/* Define to 1 if `st_birthtimensec' is member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef HAVE_SYS_STAT_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define if va_copy() macro exists (and no fallback implementation is
-   required) */
-/* #undef HAVE_VA_COPY */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* Optional va_copy() implementation activation */
-#ifndef HAVE_VA_COPY
-#define va_copy(d, s) __VA_COPY_USE(d, s)
-#endif
-
-
-/* Define to id of used va_copy() implementation */
-#define __VA_COPY_USE __VA_COPY_USE_ASS
diff --git a/libs/js/configure.ac b/libs/js/configure.ac
deleted file mode 100644
index 98fdbe985b..0000000000
--- a/libs/js/configure.ac
+++ /dev/null
@@ -1,236 +0,0 @@
-##
-dnl ##  OSSP js - JavaScript Engine
-dnl ##  Copyright (c) 1998-2006 Mozilla <http://www.mozilla.org/>
-dnl ##
-dnl ##  This file is part of OSSP js, a distribution of the Mozilla JavaScript
-dnl ##  reference implementation, which can found at http://www.ossp.org/pkg/lib/js/
-dnl ##
-dnl ##  Permission to use, copy, modify, and distribute this software for
-dnl ##  any purpose with or without fee is hereby granted, provided that
-dnl ##  the above copyright notice and this permission notice appear in all
-dnl ##  copies.
-dnl ##
-dnl ##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-dnl ##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-dnl ##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-dnl ##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-dnl ##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl ##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-dnl ##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-dnl ##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-dnl ##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-dnl ##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-dnl ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-dnl ##  SUCH DAMAGE.
-dnl ##
-dnl ##  configure.ac: GNU Autoconf source script
-dnl ##
-
-AC_PREREQ(2.59)
-AC_INIT
-JS_VERSION=`./shtool version -l txt -d short VERSION`
-$ac_confdir/shtool echo -e \
-    "Configuring %BOSSP js%b (Mozilla JavaScript Engine), version %B${JS_VERSION}%b"
-AC_SUBST(JS_VERSION)
-
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS -lm"
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_CHECK_DEBUGGING
-AC_CHECK_VA_COPY
-AC_PROG_LIBTOOL
-
-OLD_CFLAGS="$CFLAGS"
-CFLAGS=""
-AC_CHECK_LIB(nsl, gethostname)
-if test ".`echo $LIBS | grep nsl`" = .; then
-    AC_CHECK_LIB(nsl, gethostbyname)
-fi
-AC_CHECK_LIB(socket, accept)
-AC_CHECK_LIB(m, floor)
-CFLAGS="$OLD_CFLAGS"
-
-AC_CHECK_MEMBERS([struct stat.st_birthtime, struct stat.st_birthtimensec],,, [#include <sys/stat.h>])
-
-CPPFLAGS="$CPPFLAGS -DOSSP"
-case "${host}" in
-    *mingw* | *windows* | *winnt* ) CPPFLAGS="$CPPFLAGS -DXP_WIN"  ;;
-    *                             ) CPPFLAGS="$CPPFLAGS -DXP_UNIX" ;;
-esac
-CPPFLAGS="$CPPFLAGS -DEXPORT_JS_API"
-
-dnl #   configure option --with-version
-AC_ARG_WITH([version],
-    AC_HELP_STRING([--with-version], [build the run-time engine with JavaScript features only. Available versions are: ECMA-3, JS-1.5, JS-1.6 (default)]),
-    [ac_cv_with_version=$withval], [ac_cv_with_version=no])
-AC_CACHE_CHECK([whether to build the run-time engine with JavaScript features only],
-    [ac_cv_with_version], [ac_cv_with_version=no])
-case "$ac_cv_with_version" in
-    dnl JS-1.0 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=100" ;;
-    dnl JS-1.1 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=110" ;;
-    dnl JS-1.2 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=120" ;;
-    dnl JS-1.3 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=130" ;;
-    dnl JS-1.4 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=140" ;;
-    ECMA-3 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=148" ;;
-    JS-1.5 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=150" ;;
-    JS-1.6 ) CPPFLAGS="$CPPFLAGS -DJS_VERSION=160" ;;
-esac
-
-CLI_CPPFLAGS=""
-CLI_CFLAGS=""
-CLI_LDFLAGS=""
-CLI_LIBS=""
-CLI_OBJS=""
-
-dnl #   configure option --with-editline[=path]
-AC_ARG_WITH([editline],
-    AC_HELP_STRING([--with-editline], [build command line interface with line editing support via editline, libedit or GNU readline]),
-    [ac_cv_with_editline=$withval], [ac_cv_with_editline=no])
-AC_CACHE_CHECK([whether to build command line interface with line editing support],
-    [ac_cv_with_editline], [ac_cv_with_editline=no])
-if test ".$ac_cv_with_editline" != ".no"; then
-    CLI_CPPFLAGS="$CLI_CPPFLAGS -DEDITLINE"
-    case "$ac_cv_with_editline" in
-        /* ) CLI_LDFLAGS="-L$ac_cv_with_editline" ;;
-    esac
-    OLD_LDFLAGS="$LDFLAGS";
-    OLD_LIBS="$LIBS";
-    LDFLAGS="$LDFLAGS $CLI_LDFLAGS"
-    LIBS=""
-    AC_SEARCH_LIBS(tcgetattr, termcap termlib curses ncurses)
-    AC_SEARCH_LIBS(tputs, termcap termlib curses ncurses)
-    TERM_LIBS="$LIBS"
-    AC_SEARCH_LIBS(readline, editline edit readline,,, [$TERM_LIBS])
-    CLI_LIBS="$LIBS"
-    LDFLAGS="$OLD_LDFLAGS"
-    LIBS="$OLD_LIBS"
-fi
-
-dnl #   configure option --with-perl
-AC_ARG_WITH([perl],
-	AS_HELP_STRING([--with-perl], [build Perl-to-JS and JS-to-Perl bindings]),
-	[ac_cv_with_perl=$withval], [ac_cv_with_perl=no])
-AC_CACHE_CHECK([whether to build Perl-to-JS and JS-to-Perl bindings], [ac_cv_with_perl], [ac_cv_with_perl=no])
-if test ".$ac_cv_with_perl" != ".no"; then
-	WITH_PERL="yes"
-	CLI_OBJS="$CLI_OBJS src/perlconnect/jsperl.o"
-	CLI_CPPFLAGS="$CLI_CPPFLAGS -DPERLCONNECT"
-else
-	WITH_PERL="no"
-fi
-AC_SUBST(WITH_PERL)
-case "$ac_cv_with_perl" in
-    /* ) PERL="$ac_cv_with_perl" ;;
-esac
-AC_PATH_PROG(PERL, perl, NA)
-if test ".$ac_cv_with_perl" = ".yes" -a ".$PERL" = ".NA"; then
-	AC_ERROR([required Perl interpreter not found in \$PATH])
-fi
-if test ".$ac_cv_with_perl" != ".no"; then
-    CLI_CFLAGS="$CLI_CFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
-    CLI_LIBS="$CLI_LIBS `$PERL -MExtUtils::Embed -e ldopts`"
-fi
-
-dnl #   configure option --without-file
-AC_ARG_WITH([file],
-	AS_HELP_STRING([--without-file], [build without File object (grants access to the filesystem)]),
-	[ac_cv_with_file=$withval], [ac_cv_with_file=yes])
-AC_CACHE_CHECK([whether to build with the File object], [ac_cv_with_file], [ac_cv_with_file=yes])
-if test ".$ac_cv_with_file" = ".yes"; then
-    CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1"
-fi
-
-dnl #   configure option --without-xml
-AC_ARG_WITH([xml],
-	AS_HELP_STRING([--without-xml], [build without XML object]),
-	[ac_cv_with_xml=$withval], [ac_cv_with_xml=yes])
-AC_CACHE_CHECK([whether to build with the XML object], [ac_cv_with_xml], [ac_cv_with_xml=yes])
-if test ".$ac_cv_with_xml" = ".yes"; then
-    CPPFLAGS="$CPPFLAGS -DJS_HAS_XML_SUPPORT=1"
-fi
-
-dnl #   configure option --with-dso
-AC_ARG_WITH([dso],
-	AS_HELP_STRING([--with-dso], [build without DSO object (allows run-time process extending)]),
-	[ac_cv_with_dso=$withval], [ac_cv_with_dso=no])
-AC_CACHE_CHECK([whether to build with the DSO object], [ac_cv_with_dso], [ac_cv_with_dso=no])
-if test ".$ac_cv_with_dso" = ".yes"; then
-    AC_CHECK_LIB(dl, dlopen)
-    AC_CHECK_HEADER(dlfcn.h, , AC_ERROR([dlopen(3) header <dlfcn.h> required]))
-    AC_CHECK_FUNCS(dlopen dlclose dlerror, , AC_ERROR([dlopen(3) API functions dlopen/dlclose/dlerror required]))
-    CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1"
-    CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic"
-fi
-
-dnl #   configure option --with-utf8
-AC_ARG_WITH([utf8],
-	AS_HELP_STRING([--with-utf8], [build with exclusive UTF-8 C strings (uses Unicode UTF-8 encoded C strings only)]),
-	[ac_cv_with_utf8=$withval], [ac_cv_with_utf8=no])
-AC_CACHE_CHECK([whether to build with exclusive UTF-8 C string], [ac_cv_with_utf8], [ac_cv_with_utf8=no])
-if test ".$ac_cv_with_utf8" = ".yes"; then
-    CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1"
-fi
-
-AC_ARG_WITH(nspr,
-	AS_HELP_STRING([--with-nspr], [build with NSPR for thread safety]),
-	[ac_cv_with_nspr=$withval], [ac_cv_with_nspr=no])
-AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no])
-if test ".$ac_cv_with_nspr" = ".yes"; then
-    sinclude(nsprpub/config/nspr.m4)
-
-    AC_CHECK_LIB(pthread, pthread_create, [CLI_LIBS="$CLI_LIBS -lpthread"])
-
-    CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include"
-    LDFLAGS="$LDFLAGS  -L./nsprpub/dist/lib"
-    LIBS="$LIBS -lnspr4"
-    LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" 
-fi
-
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
-  # note: don't check for gcc first since some other compilers define __GNUC__
-  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
-    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
-      thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
-  done
- ])
-])
-
-AX_COMPILER_VENDOR
-
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
-
-if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-    if test "${enable_64}" = "yes"; then
-        CFLAGS="$CFLAGS -m64"
-        CXXFLAGS="$CXXFLAGS -m64"
-    fi
-fi
-
-AC_SUBST(CLI_CFLAGS)
-AC_SUBST(CLI_CPPFLAGS)
-AC_SUBST(CLI_LDFLAGS)
-AC_SUBST(CLI_LIBS)
-AC_SUBST(CLI_OBJS)
-AC_SUBST(LIBPATH)
-
-with_tags=""
-
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_FILES([Makefile js.pc js-config.sh src/perlconnect/Makefile.PL])
-AC_OUTPUT
-
diff --git a/libs/js/configure.gnu b/libs/js/configure.gnu
deleted file mode 100644
index 8ac095bc0a..0000000000
--- a/libs/js/configure.gnu
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
-$srcpath/configure "$@" --with-pic --with-nspr=yes
-
diff --git a/libs/js/js-config.1 b/libs/js/js-config.1
deleted file mode 100644
index 1c0e9eb836..0000000000
--- a/libs/js/js-config.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH JS-CONFIG 1 "22 July 2006"
-.SH NAME
-.BR js-config " - Mozilla JavaScript C API Configuration Query Utility"
-.SH SYNOPSIS
-.B js-config
-.RB [ --help ]
-.RB [ --version ]
-.RB [ --prefix ]
-.RB [ --exec-prefix ]
-.RB [ --bindir ]
-.RB [ --libdir ]
-.RB [ --includedir ]
-.RB [ --mandir ]
-.RB [ --datadir ]
-.RB [ --acdir ]
-.RB [ --cppflags ]
-.RB [ --cflags ]
-.RB [ --ldflags ]
-.RB [ --libs ]
-.SH DESCRIPTION
-The Mozilla JavaScript C API Configuration Query Utility
-.B js-config
-is a command line utility
-for querying various build-time parameters when
-linking the
-.B Mozilla JavaScript
-language engine ("SpiderMonkey"),
-as provided by the
-.B OSSP js
-distribution, into own applications.
-.PP
-For platforms where
-.BR pkg-config ( 1 )
-is available one can use this as an alternative, too.
-The advantage of
-.BR js-config ( 1 )
-is that it is a stand-alone shell script without
-any dependencies and already ships with the
-.B OSSP js
-distribution.
-.SH EXAMPLES
-.RS 0
-cc `js-config --cppflags` -o foo foo.c `js-config --ldflags --libs`
-.RE
-.SH SEE ALSO
-.BR js ( 1 ),
-.BR js ( 3 )
-.PP
-.RS 0
-http://www.mozilla.org/js/spidermonkey/
-.RE
-.RS 0
-http://www.ossp.org/pkg/lib/js/
-.RE
-.SH AUTHOR
-The author of the 
-.B Mozilla JavaScript
-language implementation ("SpiderMonkey") is
-.I Brendan Eich
-from the 
-.IR "Mozilla Foundation" .
-This manual page was written by 
-.I Ralf S. Engelschall
-for the 
-.B OSSP js
-distribution of 
-.BR "Mozilla JavaScript" .
diff --git a/libs/js/js-config.sh.in b/libs/js/js-config.sh.in
deleted file mode 100644
index a1fd932651..0000000000
--- a/libs/js/js-config.sh.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-##
-##  OSSP js - JavaScript Engine
-##  Copyright (c) 1998-2006 Mozilla <http://www.mozilla.org/>
-##
-##  This file is part of OSSP js, a distribution of the Mozilla JavaScript
-##  reference implementation, which can found at http://www.ossp.org/pkg/lib/js/
-##
-##  Permission to use, copy, modify, and distribute this software for
-##  any purpose with or without fee is hereby granted, provided that
-##  the above copyright notice and this permission notice appear in all
-##  copies.
-##
-##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-##  SUCH DAMAGE.
-##
-##  js-config.in: library build utility
-##
-
-DIFS=' 
-'
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
-js_prefix="$prefix"
-js_exec_prefix="$exec_prefix"
-js_datarootdir="@datarootdir@"
-js_bindir="@bindir@"
-js_libdir="@libdir@"
-js_includedir="@includedir@"
-js_mandir="@mandir@"
-js_datadir="@datadir@"
-js_acdir="@datadir@/aclocal"
-js_libs="@LIBS@"
-js_version="@JS_VERSION@"
-
-help=no
-version=no
-
-usage="js-config"
-usage="$usage [--help] [--version]"
-usage="$usage [--prefix] [--exec-prefix] [--bindir] [--libdir] [--includedir] [--mandir] [--datadir] [--acdir]"
-usage="$usage [--cppflags] [--cflags] [--ldflags] [--libs]"
-if [ $# -eq 0 ]; then
-    echo "js-config:Error: Invalid option" 1>&2
-    echo "js-config:Usage: $usage" 1>&2
-    exit 1
-fi
-output=''
-all=no
-prev=''
-OIFS="$IFS" IFS="$DIFS"
-for option
-do
-    if [ ".$prev" != . ]; then
-        eval "$prev=\$option"
-        prev=''
-        continue
-    fi
-    case "$option" in
-        -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-           *) optarg='' ;;
-    esac
-    case "$option" in
-        --help|-h)
-            echo "Usage: $usage"
-            exit 0
-            ;;
-        --version|-v)
-            echo "OSSP js $js_version"
-            exit 0
-            ;;
-        --all)
-            all=yes
-            ;;
-        --prefix)
-            output="$output $js_prefix"
-            ;;
-        --exec-prefix)
-            output="$output $js_exec_prefix"
-            ;;
-        --bindir)
-            output="$output $js_bindir"
-            ;;
-        --libdir)
-            output="$output $js_libdir"
-            ;;
-        --includedir)
-            output="$output $js_includedir"
-            ;;
-        --mandir)
-            output="$output $js_mandir"
-            ;;
-        --datadir)
-            output="$output $js_datadir"
-            ;;
-        --acdir)
-            output="$output $js_acdir"
-            ;;
-        --cppflags)
-            output="$output -DOSSP -DXP_UNIX -I$js_includedir/js"
-            ;;
-        --cflags)
-            : # none
-            ;;
-        --ldflags)
-            output="$output -L$js_libdir"
-            ;;
-        --libs)
-            output="$output -ljs $js_libs"
-            ;;
-        * )
-            echo "js-config:Error: Invalid option" 1>&2
-            echo "js-config:Usage: $usage" 1>&2
-            exit 1;
-            ;;
-    esac
-done
-IFS="$OIFS"
-if [ ".$prev" != . ]; then
-    echo "js-config:Error: missing argument to --`echo $prev | sed 's/_/-/g'`" 1>&2
-    exit 1
-fi
-if [ ".$output" != . ]; then
-    echo $output
-fi
-
diff --git a/libs/js/js.1 b/libs/js/js.1
deleted file mode 100644
index 9aad2397b6..0000000000
--- a/libs/js/js.1
+++ /dev/null
@@ -1,167 +0,0 @@
-.TH JS 1 "22 July 2006"
-.SH NAME
-.BR js " - Mozilla JavaScript Shell"
-.SH SYNOPSIS
-.B js
-.RB [ -w ]
-.RB [ -W ]
-.RB [ -S ]
-.RB [ -x ]
-.RB [ -C ]
-.RB [ -c
-.IR stackchunksize ]
-.RB [ -S
-.IR maxstacksize ]
-.RB [ -b
-.IR maxbranches ]
-.RB [ -P ]
-.RB [ -v
-.IR version ]
-.RB [ -e
-.IR script ]
-.RB [ -f
-.IR scriptfile ]
-.RI [ scriptfile ]
-.RI [ scriptarg " ..." "" ]
-.SH DESCRIPTION
-The Mozilla JavaScript Shell
-.B js
-is a command line interface to the 
-.B Mozilla JavaScript
-language engine ("SpiderMonkey"),
-as provided by the
-.B OSSP js
-distribution.
-The
-.B js
-program provides a test vehicle for easily evaluating JavaScript scripts, calling JavaScript functions,
-trying out debugger primitives, etc.
-.SH OPTIONS
-.SS Compile-Time Options
-.TP 8
-.B -w
-Disable the printing of warnings.
-.TP 8
-.B -W
-Enable the printing of warnings.
-.TP 8
-.B -s
-Enable strict language parsing during compile-time.
-This will print warnings on dubious JavaScript programming practices. 
-.TP 8
-.B -x
-Enable ECMAScript for XML (E4X) support during compile-time.
-.TP 8
-.B -C
-Compile only. This compiles the script but does not
-execute it.
-.SS Run-Time Options
-.TP 8
-.BI -c " stackchunksize"
-Set the stack chunk size to
-.I stackchunksize
-bytes. The default is
-.BR 8192 .
-.TP 8
-.BI -S " maxstacksize"
-Set a maximum stack size limit to
-.I maxstacksize
-bytes in order to restruct script resource consumption.
-The default is a stack of unlimited size.
-.TP 8
-.BI -b " maxbranches"
-Set a maximum branch number limit to
-.I maxbranches
-in order to restrict script resource consumption. The default is an
-unlimited number of branches.
-.TP 8
-.B -P
-In case the prototype object of the (potentially changed) global object
-is no longer connected to the global class, create a new global object
-(which is again connected to the global class) and set its prototype
-object to the old global object.
-.TP 8
-.BI -v " version"
-override the numerical JavaScript version number, which the JavaScript
-.B version()
-function returns, with the value
-.IR version .
-The argument
-.I version
-usually is one of the following integer values:
-.B 0
-(default),
-.B 100
-(JS 1.0),
-.B 110
-(JS 1.1),
-.B 120
-(JS 1.2),
-.B 130
-(JS 1.3),
-.B 140
-(JS 1.4),
-.B 148
-(ECMA-3),
-.B 150
-(JS 1.5),
-.B 160
-(JS 1.6).
-.SS Script Execution
-.TP 8
-.BI -e " script"
-Command-line passed JavaScript script to execute.
-This is executed immediately during command
-line parsing, so specify it after
-.B "Compile-Time Options"
-and
-.BR "Run-Time Options" .
-.TP 7
-.BI -f " scriptfile"
-Externally passed JavaScript script to execute.
-This is executed immediately during command
-line parsing, so specify it after
-.B "Compile-Time Options"
-and
-.BR "Run-Time Options" .
-.SH ARGUMENTS
-.TP 8
-.RI scriptfile
-Externally passed JavaScript script to execute.
-This is executed after command line parsing
-(and this way after scripts of options
-.BR -e " and " -f
-were executed.
-This additional way of executing an external JavaScript
-script exists to especially support Unix "shebang"
-style scripts.
-.TP 8
-.IR scriptarg
-Zero or more arguments which are passed to the executed
-.IR scriptfile .
-They are available in the script through the global
-array object
-.BR arguments .
-.SH SEE ALSO
-.BR js ( 3 ),
-.BR js-config ( 1 )
-.PP
-.RS 0
-http://www.mozilla.org/js/spidermonkey/
-.RE
-.RS 0
-http://www.ossp.org/pkg/lib/js/
-.RE
-.SH AUTHOR
-The author of the 
-.B Mozilla JavaScript
-language implementation ("SpiderMonkey") is
-.I Brendan Eich
-from the 
-.IR "Mozilla Foundation" .
-This manual page was written by 
-.I Ralf S. Engelschall
-for the 
-.B OSSP js
-distribution of 
-.BR "Mozilla JavaScript" .
diff --git a/libs/js/js.3 b/libs/js/js.3
deleted file mode 100644
index 61cdb081eb..0000000000
--- a/libs/js/js.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH JS 3 "22 July 2006"
-.SH NAME
-.BR libjs " - Mozilla JavaScript C API"
-.SH SYNOPSIS
-.RS 0
-.B cc `js-config --cppflags` -o foo foo.c `js-config --ldflags --libs`
-.RE
-.RS 0
-.B cc `pkg-config --cflags js` -o foo foo.c `pkg-config --libs js`
-.RE
-.SH DESCRIPTION
-The Mozilla JavaScript C API
-is the programmatic interface to the 
-.B Mozilla JavaScript
-language engine ("SpiderMonkey").
-For the complete reference documentation of the Mozilla JavaScript C API please see
-the following online documents:
-.TP 8
-.I JS Embedder's Guide
-http://www.mozilla.org/js/spidermonkey/apidoc/jsguide.html
-.TP 8
-.I JS Embedder's Reference
-http://www.mozilla.org/js/spidermonkey/apidoc/complete-frameset.html
-.SH SEE ALSO
-.BR js-config ( 1 ),
-.BR js ( 1 )
-.PP
-.RS 0
-http://www.mozilla.org/js/spidermonkey/
-.RE
-.RS 0
-http://www.ossp.org/pkg/lib/js/
-.RE
-.SH AUTHOR
-The author of the 
-.B Mozilla JavaScript
-language implementation ("SpiderMonkey") is
-.I Brendan Eich
-from the 
-.IR "Mozilla Foundation" .
-This manual page was written by 
-.I Ralf S. Engelschall
-for the 
-.B OSSP js
-distribution of 
-.BR "Mozilla JavaScript" .
diff --git a/libs/js/js.pc.in b/libs/js/js.pc.in
deleted file mode 100644
index f4be411bbc..0000000000
--- a/libs/js/js.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: OSSP js
-Description: Mozilla JavaScript Engine
-Version: @JS_VERSION@
-Libs: -L${libdir} -ljs @LIBS@
-Cflags: -DOSSP -DXP_UNIX -I${includedir}/js
diff --git a/libs/js/jslint.js b/libs/js/jslint.js
deleted file mode 100644
index b219d44c4d..0000000000
--- a/libs/js/jslint.js
+++ /dev/null
@@ -1,2542 +0,0 @@
-#!./js
-
-/* ============================================================== */
-
-// jslint.js
-// 2006-06-12
-/*
-Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-
-/*
-    jslint is a function. It takes two parameters.
-
-        var myResult = jslint(source, option);
-
-    The first parameter is either a string or an array of strings. If it is a
-    string, it will be split on '\n' or '\r'. If it is an array of strings, it
-    is assumed that each string represents one line. The source can be a
-    JavaScript text, or HTML text, or a Konfabulator text.
-
-    The second parameter is an optional object of options which control the
-    operation of jslint. All of the options are booleans. All are optional and
-    have a default value of false.
-
-    {
-        browser    : true if the standard browser globals should be predefined
-        cap        : true if upper case HTML should be allowed
-        debug      : true if debugger statements should be allowed
-        evil       : true if eval should be allowed
-        jscript    : true if jscript deviations should be allowed
-        laxLineEnd : true if line breaks should not be checked
-        passfail   : true if the scan should stop on first error
-        plusplus   : true if post increment should not be allowed
-        undef      : true if undefined variables are errors
-    }
-
-    If it checks out, jslint returns true. Otherwise, it returns false.
-
-    If false, you can inspect jslint.errors to find out the problems.
-    jslint.errors is an array of objects containing these members:
-
-    {
-        line      : The line (relative to 0) at which the lint was found
-        character : The character (relative to 0) at which the lint was found
-        reason    : The problem
-        evidence  : The text line in which the problem occurred
-    }
-
-    If a fatal error was found, a null will be the last element of the
-    jslint.errors array.
-
-    You can request a Function Report, which shows all of the functions
-    and the parameters and vars that they use. This can be used to find
-    implied global variables and other problems. The report is in HTML and
-    can be inserted in a <body>.
-
-        var myReport = jslint.report(option);
-
-    If the option is true, then the report will be limited to only errors.
-*/
-
-String.prototype.entityify = function () {
-    return this.
-        replace(/&/g, '&amp;').
-        replace(/</g, '&lt;').
-        replace(/>/g, '&gt;');
-};
-
-String.prototype.isAlpha = function () {
-    return (this >= 'a' && this <= 'z\uffff') ||
-        (this >= 'A' && this <= 'Z\uffff');
-};
-
-
-String.prototype.isDigit = function () {
-    return (this >= '0' && this <= '9');
-};
-
-
-// We build the application inside a function so that we produce only a single
-// global variable. The function will be invoked, its return value is the JSLint
-// function itself.
-
-var jslint;
-jslint = function () {
-
-    var anonname,
-
-// browser contains a set of global names which are commonly provided by a
-// web browser environment.
-
-        browser = {
-            alert: true,
-            blur: true,
-            clearInterval: true,
-            clearTimeout: true,
-            close: true,
-            closed: true,
-            confirm: true,
-            defaultStatus: true,
-            document: true,
-            event: true,
-            focus: true,
-            frames: true,
-            history: true,
-            Image: true,
-            length: true,
-            location: true,
-            moveBy: true,
-            moveTo: true,
-            name: true,
-            navigator: true,
-            onblur: true,
-            onerror: true,
-            onfocus: true,
-            onload: true,
-            onresize: true,
-            onunload: true,
-            open: true,
-            opener: true,
-            parent: true,
-            print: true,
-            prompt: true,
-            resizeBy: true,
-            resizeTo: true,
-            screen: true,
-            scroll: true,
-            scrollBy: true,
-            scrollTo: true,
-            self: true,
-            setInterval: true,
-            setTimeout: true,
-            status: true,
-            top: true,
-            window: true,
-            XMLHttpRequest: true
-        },
-        funlab, funstack, functions, globals,
-
-// konfab contains the global names which are provided to a Konfabulator widget.
-
-        konfab = {
-            alert: true,
-            animator: true,
-            appleScript: true,
-            beep: true,
-            bytesToUIString: true,
-            chooseColor: true,
-            chooseFile: true,
-            chooseFolder: true,
-            convertPathToHFS: true,
-            convertPathToPlatform: true,
-            closeWidget: true,
-            CustomAnimation: true,
-            escape: true,
-            FadeAnimation: true,
-            focusWidget: true,
-            form: true,
-            include: true,
-            isApplicationRunning: true,
-            iTunes: true,
-            konfabulatorVersion: true,
-            log: true,
-            MoveAnimation: true,
-            openURL: true,
-            play: true,
-            popupMenu: true,
-            print: true,
-            prompt: true,
-            reloadWidget: true,
-            resolvePath: true,
-            resumeUpdates: true,
-            RotateAnimation: true,
-            runCommand: true,
-            runCommandInBg: true,
-            saveAs: true,
-            savePreferences: true,
-            showWidgetPreferences: true,
-            sleep: true,
-            speak: true,
-            suppressUpdates: true,
-            tellWidget: true,
-            unescape: true,
-            updateNow: true,
-            yahooCheckLogin: true,
-            yahooLogin: true,
-            yahooLogout: true,
-            COM: true,
-            filesystem: true,
-            preferenceGroups: true,
-            preferences: true,
-            screen: true,
-            system: true,
-            URL: true,
-            XMLDOM: true,
-            XMLHttpRequest: true
-        },
-        lines, lookahead, member, noreach, option, prevtoken, stack,
-
-// standard contains the global names that are provided by standard JavaScript.
-
-        standard = {
-            Array: true,
-            Boolean: true,
-            Date: true,
-            decodeURI: true,
-            decodeURIComponent: true,
-            encodeURI: true,
-            encodeURIComponent: true,
-            Error: true,
-            escape: true,
-            eval: true,
-            EvalError: true,
-            Function: true,
-            isFinite: true,
-            isNaN: true,
-            Math: true,
-            Number: true,
-            Object: true,
-            parseInt: true,
-            parseFloat: true,
-            RangeError: true,
-            ReferenceError: true,
-            RegExp: true,
-            String: true,
-            SyntaxError: true,
-            TypeError: true,
-            unescape: true,
-            URIError: true
-        },
-        syntax = {}, token, verb,
-/*
-    xmode is used to adapt to the exceptions in XML parsing. It can have these
-    states:
-        false   .js script file
-        "       A " attribute
-        '       A ' attribute
-        content The content of a script tag
-        CDATA   A CDATA block
-*/
-        xmode,
-/*
-    xtype identifies the type of document being analyzed. It can have these
-    states:
-        false   .js script file
-        html    .html file
-        widget  .kon Konfabulator file
-*/
-        xtype,
-// token
-        tx = /^([(){}[.,:;'"~]|\](\]>)?|\?>?|==?=?|\/(\*(global|extern)*|=|)|\*[\/=]?|\+[+=]?|-[-=]?|%[=>]?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=%\?]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+-]?[0-9]+)?)/,
-// string ending in single quote
-        sx = /^((\\[^\x00-\x1f]|[^\x00-\x1f'\\])*)'/,
-        sxx = /^(([^\x00-\x1f'])*)'/,
-// string ending in double quote
-        qx = /^((\\[^\x00-\x1f]|[^\x00-\x1f"\\])*)"/,
-        qxx = /^(([^\x00-\x1f"])*)"/,
-// regular expression
-        rx = /^(\\[^\x00-\x1f]|\[(\\[^\x00-\x1f]|[^\x00-\x1f\\\/])*\]|[^\x00-\x1f\\\/\[])+\/[gim]*/,
-// star slash
-        lx = /\*\/|\/\*/,
-// global identifier
-        gx = /^([a-zA-Z_$][a-zA-Z0-9_$]*)/,
-// identifier
-        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*$)/,
-// global separators
-        hx = /^[\x00-\x20,]*(\*\/)?/,
-// whitespace
-        wx = /^\s*(\/\/.*\r*$)?/;
-
-// Make a new object that inherits from an existing object.
-
-    function object(o) {
-        function f() {}
-        f.prototype = o;
-        return new f();
-    }
-
-// Produce an error warning.
-
-    function warning(m, x, y) {
-        var l, c, t = typeof x === 'object' ? x : token;
-        if (typeof x === 'number') {
-            l = x;
-            c = y || 0;
-        } else {
-            if (t.id === '(end)') {
-                t = prevtoken;
-            }
-            l = t.line || 0;
-            c = t.from || 0;
-        }
-        jslint.errors.push({
-            id: '(error)',
-            reason: m,
-            evidence: lines[l] || '',
-            line: l,
-            character: c
-        });
-        if (option.passfail) {
-            jslint.errors.push(null);
-            throw null;
-        }
-    }
-
-    function error(m, x, y) {
-        warning(m, x, y);
-        jslint.errors.push(null);
-        throw null;
-    }
-
-
-// lexical analysis
-
-    var lex = function () {
-        var character, from, line, s;
-
-// Private lex methods
-
-        function nextLine() {
-            line += 1;
-            if (line >= lines.length) {
-                return false;
-            }
-            character = 0;
-            s = lines[line];
-            return true;
-        }
-
-// Produce a token object.  The token inherits from a syntax symbol.
-
-        function it(type, value) {
-            var t;
-            if (type === '(punctuator)') {
-                t = syntax[value];
-            } else if (type === '(identifier)') {
-                t = syntax[value];
-                if (!t || typeof t != 'object') {
-                    t = syntax[type];
-                }
-            } else {
-                t = syntax[type];
-            }
-            if (!t || typeof t != 'object') {
-                error("Unrecognized symbol: '" + value + "' " + type);
-            }
-            t = object(t);
-            if (value || type === '(string)') {
-                t.value = value;
-            }
-            t.line = line;
-            t.character = character;
-            t.from = from;
-            return t;
-        }
-
-// Public lex methods
-
-        return {
-            init: function (source) {
-                if (typeof source === 'string') {
-                    lines = source.split('\n');
-                    if (lines.length == 1) {
-                        lines = lines[0].split('\r');
-                    }
-                } else {
-                    lines = source;
-                }
-                line = 0;
-                character = 0;
-                from = 0;
-                s = lines[0];
-            },
-
-// token -- this is called by advance to get the next token.
-
-            token: function () {
-                var c, i, l, r, t;
-
-                function string(x) {
-                    r = x.exec(s);
-                    if (r) {
-                        t = r[1];
-                        l = r[0].length;
-                        s = s.substr(l);
-                        character += l;
-                        if (xmode == 'script') {
-                            if (t.indexOf('<\/') >= 0) {
-                                warning(
-    'Expected "...<\\/..." and instead saw "...<\/...".', token);
-                            }
-                        }
-                        return it('(string)', r[1]);
-                    } else {
-                        for (var j = 0; j < s.length; j += 1) {
-                            var c = s.charAt(j);
-                            if (c < ' ') {
-                                if (c === '\n' || c === '\r') {
-                                    break;
-                                }
-                                error("Control character in string: " +
-                                    s.substring(0, j), line, character + j);
-                            }
-                        }
-                        error("Unclosed string: " + s, line, character);
-                    }
-                }
-
-                for (;;) {
-                    if (!s) {
-                        return it(nextLine() ? '(endline)' : '(end)', '');
-                    }
-                    r = wx.exec(s);
-                    if (!r || !r[0]) {
-                        break;
-                    }
-                    l = r[0].length;
-                    s = s.substr(l);
-                    character += l;
-                    if (s) {
-                        break;
-                    }
-                }
-                from = character;
-                r = tx.exec(s);
-                if (r) {
-                    t = r[0];
-                    l = t.length;
-                    s = s.substr(l);
-                    character += l;
-                    c = t.substr(0, 1);
-
-//      identifier
-
-                    if (c.isAlpha() || c === '_' || c === '$') {
-                        return it('(identifier)', t);
-                    }
-
-//      number
-
-                    if (c.isDigit()) {
-                        if (token.id === '.') {
-                            warning(
-            "A decimal fraction should have a zero before the decimal point.",
-                                token);
-                        }
-                        if (!isFinite(Number(t))) {
-                            warning("Bad number: '" + t + "'.",
-                                line, character);
-                        }
-                        if (s.substr(0, 1).isAlpha()) {
-                            error("Space is required after a number: '" +
-                                t + "'.", line, character);
-                        }
-                        if (c === '0' && t.substr(1,1).isDigit()) {
-                            warning("Don't use extra leading zeros: '" +
-                                t + "'.", line, character);
-                        }
-                        if (t.substr(t.length - 1) === '.') {
-                            warning(
-    "A trailing decimal point can be confused with a dot: '" + t + "'.",
-                                line, character);
-                        }
-                        return it('(number)', t);
-                    }
-
-//      string
-
-                    if (t === '"') {
-                        return (xmode === '"' ||  xmode === 'string') ?
-                            it('(punctuator)', t) :
-                            string(xmode === 'xml' ? qxx : qx);
-                    }
-                    if (t === "'") {
-                        return (xmode === "'" ||  xmode === 'string') ?
-                            it('(punctuator)', t) :
-                            string(xmode === 'xml' ? sxx : sx);
-                    }
-
-//      unbegun comment
-
-                    if (t === '/*') {
-                        for (;;) {
-                            i = s.search(lx);
-                            if (i >= 0) {
-                                break;
-                            }
-                            if (!nextLine()) {
-                                error("Unclosed comment.", token);
-                            }
-                        }
-                        character += i + 2;
-                        if (s.substr(i, 1) === '/') {
-                            error("Nested comment.");
-                        }
-                        s = s.substr(i + 2);
-                        return this.token();
-                    }
-
-//      /*extern
-
-                    if (t === '/*extern' || t === '/*global') {
-                        for (;;) {
-                            r = hx.exec(s);
-                            if (r) {
-                                l = r[0].length;
-                                s = s.substr(l);
-                                character += l;
-                                if (r[1] === '*/') {
-                                    return this.token();
-                                }
-                            }
-                            if (s) {
-                                r = gx.exec(s);
-                                if (r) {
-                                    l = r[0].length;
-                                    s = s.substr(l);
-                                    character += l;
-                                    globals[r[1]] = true;
-                                } else {
-                                    error("Bad extern identifier: '" +
-                                        s + "'.", line, character);
-                                }
-                             } else if (!nextLine()) {
-                                error("Unclosed comment.");
-                            }
-                        }
-                    }
-
-//      punctuator
-
-                    return it('(punctuator)', t);
-                }
-                error("Unexpected token: " + (t || s.substr(0, 1)),
-                    line, character);
-            },
-
-// skip -- skip past the next occurrence of a particular string.
-// If the argument is empty, skip to just before the next '<' character.
-// This is used to ignore HTML content. Return false if it isn't found.
-
-            skip: function (to) {
-                if (token.id) {
-                    if (!to) {
-                        to = '';
-                        if (token.id.substr(0, 1) === '<') {
-                            lookahead.push(token);
-                            return true;
-                        }
-                    } else if (token.id.indexOf(to) >= 0) {
-                        return true;
-                    }
-                }
-                prevtoken = token;
-                token = syntax['(error)'];
-                for (;;) {
-                    var i = s.indexOf(to || '<');
-                    if (i >= 0) {
-                        character += i + to.length;
-                        s = s.substr(i + to.length);
-                        return true;
-                    }
-                    if (!nextLine()) {
-                        break;
-                    }
-                }
-                return false;
-            },
-
-// regex -- this is called by parse when it sees '/' being used as a prefix.
-
-            regex: function () {
-                var l, r = rx.exec(s), x;
-                if (r) {
-                    l = r[0].length;
-                    character += l;
-                    s = s.substr(l);
-                    x = r[1];
-                    return it('(regex)', x);
-                }
-                error("Bad regular expression: " + s);
-            }
-        };
-    }();
-
-    function builtin(name) {
-        return standard[name] === true ||
-               globals[name] === true ||
-               (xtype === 'widget' && konfab[name] === true) ||
-               ((xtype === 'html' || option.browser) && browser[name] === true);
-    }
-
-    function addlabel(t, type) {
-        if (t) {
-            if (typeof funlab[t] === 'string') {
-                switch (funlab[t]) {
-                case 'var':
-                case 'var*':
-                    if (type === 'global') {
-                        funlab[t] = 'var*';
-                        return;
-                    }
-                    break;
-                case 'global':
-                    if (type === 'var') {
-                        warning('Var ' + t +
-                            ' was used before it was declared.', prevtoken);
-                    }
-                    if (type === 'var*' || type === 'global') {
-                        return;
-                    }
-                    break;
-                case 'function':
-                case 'parameter':
-                    if (type === 'global') {
-                        return;
-                    }
-                    break;
-                }
-                warning("Identifier '" + t + "' already declared as " +
-                    funlab[t], prevtoken);
-            }
-            funlab[t] = type;
-        }
-    }
-
-
-// We need a peek function. If it has an argument, it peeks that much farther
-// ahead. It is used to distinguish
-//     for ( var i in ...
-// from
-//     for ( var i = ...
-
-    function peek(i) {
-        var j = 0, t;
-        if (token == syntax['(error)']) {
-            return token;
-        }
-        if (typeof i === 'undefined') {
-            i = 0;
-        }
-        while (j <= i) {
-            t = lookahead[j];
-            if (!t) {
-                t = lookahead[j] = lex.token();
-            }
-            j += 1;
-        }
-        return t;
-    }
-
-
-    var badbreak = {')': true, ']': true, '++': true, '--': true};
-
-// Produce the next token. It looks for programming errors.
-
-    function advance(id, t) {
-        var l;
-        switch (prevtoken.id) {
-        case '(number)':
-            if (token.id === '.') {
-                warning(
-"A dot following a number can be confused with a decimal point.", prevtoken);
-            }
-            break;
-        case '-':
-            if (token.id === '-' || token.id === '--') {
-                warning("Confusing minusses.");
-            }
-            break;
-        case '+':
-            if (token.id === '+' || token.id === '++') {
-                warning("Confusing plusses.");
-            }
-            break;
-        }
-        if (prevtoken.type === '(string)' || prevtoken.identifier) {
-            anonname = prevtoken.value;
-        }
-
-        if (id && token.value != id) {
-            if (t) {
-                if (token.id === '(end)') {
-                    warning("Unmatched '" + t.id + "'.", t);
-                } else {
-                    warning("Expected '" + id + "' to match '" +
-                        t.id + "' from line " + (t.line + 1) +
-                        " and instead saw '" + token.value + "'.");
-                }
-            } else {
-                warning("Expected '" + id + "' and instead saw '" +
-                    token.value + "'.");
-            }
-        }
-        prevtoken = token;
-        for (;;) {
-            token = lookahead.shift() || lex.token();
-            if (token.id === '<![') {
-                if (xtype === 'html') {
-                    error("Unexpected token '<!['");
-                }
-                if (xmode === 'script') {
-                    token = lex.token();
-                    if (token.value !== 'CDATA') {
-                        error("Expected 'CDATA'");
-                    }
-                    token = lex.token();
-                    if (token.id !== '[') {
-                        error("Expected '['");
-                    }
-                    xmode = 'CDATA';
-                } else if (xmode === 'xml') {
-                    lex.skip(']]>');
-                } else {
-                    error("Unexpected token '<!['");
-                }
-            } else if (token.id === ']]>') {
-                if (xmode === 'CDATA') {
-                    xmode = 'script';
-                } else {
-                    error("Unexpected token ']]>");
-                }
-            } else if (token.id !== '(endline)') {
-                break;
-            }
-            if (xmode === '"' || xmode === "'") {
-                error("Missing '" + xmode + "'.", prevtoken);
-            }
-            l = !xmode && !option.laxLineEnd &&
-                (prevtoken.type == '(string)' || prevtoken.type == '(number)' ||
-                prevtoken.type == '(identifier)' || badbreak[prevtoken.id]);
-        }
-        if (l && token.id != '{' && token.id != '}' && token.id != ']') {
-            warning(
-                "Strict line ending error: '" +
-                prevtoken.value + "'.", prevtoken);
-        }
-        if (xtype === 'widget' && xmode === 'script' && token.id) {
-            l = token.id.charAt(0);
-            if (l === '<' || l === '&') {
-                token.nud = token.led = null;
-                token.lbp = 0;
-                token.reach = true;
-            }
-        }
-    }
-
-
-    function advanceregex() {
-        token = lex.regex();
-    }
-
-
-    function beginfunction(i) {
-        var f = {'(name)': i, '(line)': token.line + 1, '(context)': funlab};
-        funstack.push(funlab);
-        funlab = f;
-        functions.push(funlab);
-    }
-
-
-    function endfunction() {
-        funlab = funstack.pop();
-    }
-
-
-// This is the heart of JSLint, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
-// like nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define JavaScript. I retained Pratt's
-// nomenclature, even though it isn't very descriptive.
-
-// .nud     Null denotation
-// .fud     First null denotation
-// .led     Left denotation
-//  lbp     Left binding power
-//  rbp     Right binding power
-
-// They are key to the parsing method called Top Down Operator Precedence.
-
-    function parse(rbp, initial) {
-        var l, left, o;
-        if (token.id && token.id === '/') {
-            if (prevtoken.id != '(' && prevtoken.id != '=' &&
-                    prevtoken.id != ':' && prevtoken.id != ',' &&
-                    prevtoken.id != '=') {
-                warning(
-"Expected to see a '(' or '=' or ':' or ',' preceding a regular expression literal, and instead saw '" +
-                    prevtoken.value + "'.", prevtoken);
-            }
-            advanceregex();
-        }
-        if (token.id === '(end)') {
-            warning("Unexpected early end of program", prevtoken);
-        }
-        advance();
-        if (initial) {
-            anonname = 'anonymous';
-            verb = prevtoken.value;
-        }
-        if (initial && prevtoken.fud) {
-            prevtoken.fud();
-        } else {
-            if (prevtoken.nud) {
-                o = prevtoken.exps;
-                left = prevtoken.nud();
-            } else {
-                if (token.type === '(number)' && prevtoken.id === '.') {
-                    warning(
-"A leading decimal point can be confused with a dot: ." + token.value,
-                        prevtoken);
-                }
-                error("Expected an identifier and instead saw '" +
-                    prevtoken.id + "'.", prevtoken);
-            }
-            while (rbp < token.lbp) {
-                o = token.exps;
-                advance();
-                if (prevtoken.led) {
-                    left = prevtoken.led(left);
-                } else {
-                    error("Expected an operator and instead saw '" +
-                        prevtoken.id + "'.");
-                }
-            }
-            if (initial && !o) {
-                warning(
-"Expected an assignment or function call and instead saw an expression.",
-                    prevtoken);
-            }
-        }
-        if (l) {
-            funlab[l] = 'label';
-        }
-        return left;
-    }
-
-
-// Parasitic constructors for making the symbols that will be inherited by
-// tokens.
-
-    function symbol(s, p) {
-        return syntax[s] || (syntax[s] = {id: s, lbp: p, value: s});
-    }
-
-
-    function delim(s) {
-        return symbol(s, 0);
-    }
-
-
-    function stmt(s, f) {
-        var x = delim(s);
-        x.identifier = x.reserved = true;
-        x.fud = f;
-        return x;
-    }
-
-
-    function blockstmt(s, f) {
-        var x = stmt(s, f);
-        x.block = true;
-        return x;
-    }
-
-
-    function prefix(s, f) {
-        var x = symbol(s, 150);
-        x.nud = (typeof f === 'function') ? f : function () {
-            parse(150);
-            return this;
-        };
-        return x;
-    }
-
-
-    function prefixname(s, f) {
-        var x = prefix(s, f);
-        x.identifier = x.reserved = true;
-        return x;
-    }
-
-
-    function type(s, f) {
-        var x = delim(s);
-        x.type = s;
-        x.nud = f;
-        return x;
-    }
-
-
-    function reserve(s, f) {
-        var x = type(s, f);
-        x.identifier = x.reserved = true;
-        return x;
-    }
-
-
-    function reservevar(s) {
-        return reserve(s, function () {
-            return this;
-        });
-    }
-
-
-    function infix(s, f, p) {
-        var x = symbol(s, p);
-        x.led = (typeof f === 'function') ? f : function (left) {
-            return [f, left, parse(p)];
-        };
-        return x;
-    }
-
-
-    function assignop(s, f) {
-        symbol(s, 20).exps = true;
-        return infix(s, function (left) {
-            if (left) {
-                if (left.id === '.' || left.id === '[' ||
-                        (left.identifier && !left.reserved)) {
-                    parse(19);
-                    return left;
-                }
-                if (left == syntax['function']) {
-                    if (option.jscript) {
-                        parse(19);
-                        return left;
-                    } else {
-                        warning(
-"Expected an identifier in an assignment, and instead saw a function invocation.",
-                            prevtoken);
-                    }
-                }
-            }
-            error("Bad assignment.", this);
-        }, 20);
-    }
-
-
-    function suffix(s, f) {
-        var x = symbol(s, 150);
-        x.led = function (left) {
-            if (option.plusplus) {
-                warning(this.id + " is considered harmful.", this);
-            }
-            return [f, left];
-        };
-        return x;
-    }
-
-
-    function optionalidentifier() {
-        if (token.reserved) {
-            warning("Expected an identifier and instead saw '" +
-                token.id + "' (a reserved word).");
-        }
-        if (token.identifier) {
-            advance();
-            return prevtoken.value;
-        }
-    }
-
-
-    function identifier() {
-        var i = optionalidentifier();
-        if (i) {
-            return i;
-        }
-        if (prevtoken.id === 'function' && token.id === '(') {
-            warning("Missing name in function statement.");
-        } else {
-            error("Expected an identifier and instead saw '" +
-                    token.value + "'.", token);
-        }
-    }
-
-
-    function reachable(s) {
-        var i = 0, t;
-        if (token.id != ';' || noreach) {
-            return;
-        }
-        for (;;) {
-            t = peek(i);
-            if (t.reach) {
-                return;
-            }
-            if (t.id != '(endline)') {
-                if (t.id === 'function') {
-                    warning(
-"Inner functions should be listed at the top of the outer function.", t);
-                    break;
-                }
-                warning("Unreachable '" + t.value + "' after '" + s +
-                    "'.", t);
-                break;
-            }
-            i += 1;
-        }
-    }
-
-
-    function statement() {
-        var t = token;
-        while (t.id === ';') {
-            warning("Unnecessary semicolon", t);
-            advance(';');
-            t = token;
-            if (t.id === '}') {
-                return;
-            }
-        }
-        if (t.identifier && !t.reserved && peek().id === ':') {
-            advance();
-            advance(':');
-            addlabel(t.value, 'live*');
-            if (!token.labelled) {
-                warning("Label '" + t.value +
-                    "' on unlabelable statement '" + token.value + "'.",
-                    token);
-            }
-            if (t.value.toLowerCase() == 'javascript') {
-                warning("Label '" + t.value +
-                    "' looks like a javascript url.",
-                    token);
-            }
-            token.label = t.value;
-            t = token;
-        }
-        parse(0, true);
-        if (!t.block) {
-            if (token.id != ';') {
-                warning("Missing ';'", prevtoken.line,
-                    prevtoken.from + prevtoken.value.length);
-            } else {
-                advance(';');
-            }
-        }
-    }
-
-
-    function statements() {
-        while (!token.reach) {
-            statement();
-        }
-    }
-
-
-    function block() {
-        var t = token;
-        if (token.id === '{') {
-            advance('{');
-            statements();
-            advance('}', t);
-        } else {
-            warning("Missing '{' before '" + token.value + "'.");
-            noreach = true;
-            statement();
-            noreach = false;
-        }
-        verb = null;
-    }
-
-
-// An identity function, used by string and number tokens.
-
-    function idValue() {
-        return this;
-    }
-
-
-    function countMember(m) {
-        if (typeof member[m] === 'number') {
-            member[m] += 1;
-        } else {
-            member[m] = 1;
-        }
-    }
-
-
-// Common HTML attributes that carry scripts.
-
-    var scriptstring = {
-        onblur:      true,
-        onchange:    true,
-        onclick:     true,
-        ondblclick:  true,
-        onfocus:     true,
-        onkeydown:   true,
-        onkeypress:  true,
-        onkeyup:     true,
-        onload:      true,
-        onmousedown: true,
-        onmousemove: true,
-        onmouseout:  true,
-        onmouseover: true,
-        onmouseup:   true,
-        onreset:     true,
-        onselect:    true,
-        onsubmit:    true,
-        onunload:    true
-    };
-
-
-// XML types. Currently we support html and widget.
-
-    var xmltype = {
-        HTML: {
-            doBegin: function (n) {
-                if (!option.cap) {
-                    warning("HTML case error.");
-                }
-                xmltype.html.doBegin();
-            }
-        },
-        html: {
-            doBegin: function (n) {
-                xtype = 'html';
-                xmltype.html.script = false;
-            },
-            doTagName: function (n, p) {
-                var i, t = xmltype.html.tag[n], x;
-                if (!t) {
-                    error('Unrecognized tag: <' + n + '>. ' +
-                        (n === n.toLowerCase() ?
-                        'Did you mean <' + n.toLowerCase() + '>?' : ''));
-                }
-                x = t.parent;
-                if (x) {
-                    if (x.indexOf(' ' + p + ' ') < 0) {
-                        error('A <' + n + '> must be within <' + x + '>',
-                            prevtoken);
-                    }
-                } else {
-                    i = stack.length;
-                    do {
-                        if (i <= 0) {
-                            error('A <' + n + '> must be within the body',
-                                prevtoken);
-                        }
-                        i -= 1;
-                    } while (stack[i].name !== 'body');
-                }
-                xmltype.html.script = n === 'script';
-                return t.simple;
-            },
-            doAttribute: function (n, a) {
-                if (n === 'script') {
-                    if (a === 'src') {
-                        xmltype.html.script = false;
-                        return 'string';
-                    } else if (a === 'language') {
-                        warning("The 'language' attribute is deprecated",
-                            prevtoken);
-                        return false;
-                    }
-                }
-                return scriptstring[a] && 'script';
-            },
-            doIt: function (n) {
-                return xmltype.html.script ? 'script' :
-                    n !== 'html' && xmltype.html.tag[n].special && 'special';
-            },
-            tag: {
-                a:        {},
-                abbr:     {},
-                acronym:  {},
-                address:  {},
-                applet:   {},
-                area:     {simple: true, parent: ' map '},
-                b:        {},
-                base:     {simple: true, parent: ' head '},
-                bdo:      {},
-                big:      {},
-                blockquote: {},
-                body:     {parent: ' html noframes '},
-                br:       {simple: true},
-                button:   {},
-                caption:  {parent: ' table '},
-                center:   {},
-                cite:     {},
-                code:     {},
-                col:      {simple: true, parent: ' table colgroup '},
-                colgroup: {parent: ' table '},
-                dd:       {parent: ' dl '},
-                del:      {},
-                dfn:      {},
-                dir:      {},
-                div:      {},
-                dl:       {},
-                dt:       {parent: ' dl '},
-                em:       {},
-                embed:    {},
-                fieldset: {},
-                font:     {},
-                form:     {},
-                frame:    {simple: true, parent: ' frameset '},
-                frameset: {parent: ' html frameset '},
-                h1:       {},
-                h2:       {},
-                h3:       {},
-                h4:       {},
-                h5:       {},
-                h6:       {},
-                head:     {parent: ' html '},
-                html:     {},
-                hr:       {simple: true},
-                i:        {},
-                iframe:   {},
-                img:      {simple: true},
-                input:    {simple: true},
-                ins:      {},
-                kbd:      {},
-                label:    {},
-                legend:   {parent: ' fieldset '},
-                li:       {parent: ' dir menu ol ul '},
-                link:     {simple: true, parent: ' head '},
-                map:      {},
-                menu:     {},
-                meta:     {simple: true, parent: ' head noscript '},
-                noframes: {parent: ' html body '},
-                noscript: {parent: ' html head body frameset '},
-                object:   {},
-                ol:       {},
-                optgroup: {parent: ' select '},
-                option:   {parent: ' optgroup select '},
-                p:        {},
-                param:    {simple: true, parent: ' applet object '},
-                pre:      {},
-                q:        {},
-                samp:     {},
-                script:   {parent:
-' head body p div span abbr acronym address bdo blockquote cite code del dfn em ins kbd pre samp strong th td var '},
-                select:   {},
-                small:    {},
-                span:     {},
-                strong:   {},
-                style:    {parent: ' head ', special: true},
-                sub:      {},
-                sup:      {},
-                table:    {},
-                tbody:    {parent: ' table '},
-                td:       {parent: ' tr '},
-                textarea: {},
-                tfoot:    {parent: ' table '},
-                th:       {parent: ' tr '},
-                thead:    {parent: ' table '},
-                title:    {parent: ' head '},
-                tr:       {parent: ' table tbody thead tfoot '},
-                tt:       {},
-                u:        {},
-                ul:       {},
-                'var':    {}
-            }
-        },
-        widget: {
-            doBegin: function (n) {
-                xtype = 'widget';
-            },
-            doTagName: function (n, p) {
-                var t = xmltype.widget.tag[n];
-                if (!t) {
-                    error('Unrecognized tag: <' + n + '>. ');
-                }
-                var x = t.parent;
-                if (x.indexOf(' ' + p + ' ') < 0) {
-                    error('A <' + n + '> must be within <' + x + '>', prevtoken);
-                }
-            },
-            doAttribute: function (n, a) {
-                var t = xmltype.widget.tag[a];
-                if (!t) {
-                    error('Unrecognized attribute: <' + n + ' ' + a + '>. ');
-                }
-                var x = t.parent;
-                if (x.indexOf(' ' + n + ' ') < 0) {
-                    error('Attribute ' + a + ' does not belong in <' +
-                        n + '>');
-                }
-                return t.script ? 'script' : a === 'name' ? 'define' : 'string';
-            },
-            doIt: function (n) {
-                var x = xmltype.widget.tag[n];
-                return x && x.script && 'script';
-            },
-            tag: {
-                "about-box": {parent: ' widget '},
-                "about-image": {parent: ' about-box '},
-                "about-text": {parent: ' about-box '},
-                "about-version": {parent: ' about-box '},
-                action: {parent: ' widget ', script: true},
-                alignment: {parent: ' image text textarea window '},
-                author: {parent: ' widget '},
-                autoHide: {parent: ' scrollbar '},
-                bgColor: {parent: ' text textarea '},
-                bgOpacity: {parent: ' text textarea '},
-                checked: {parent: ' image '},
-                clipRect: {parent: ' image '},
-                color: {parent: ' about-text about-version shadow text textarea '},
-                contextMenuItems: {parent: ' frame image text textarea window '},
-                colorize: {parent: ' image '},
-                columns: {parent: ' textarea '},
-                company: {parent: ' widget '},
-                copyright: {parent: ' widget '},
-                data: {parent: ' about-text about-version text textarea '},
-                debug: {parent: ' widget '},
-                defaultValue: {parent: ' preference '},
-                defaultTracking: {parent: ' widget '},
-                description: {parent: ' preference '},
-                directory: {parent: ' preference '},
-                editable: {parent: ' textarea '},
-                enabled: {parent: ' menuItem '},
-                extension: {parent: ' preference '},
-                file: {parent: ' action preference '},
-                fillMode: {parent: ' image '},
-                font: {parent: ' about-text about-version text textarea '},
-                frame: {parent: ' frame window '},
-                group: {parent: ' preference '},
-                hAlign: {parent: ' frame image scrollbar text textarea '},
-                height: {parent: ' frame image scrollbar text textarea window '},
-                hidden: {parent: ' preference '},
-                hLineSize: {parent: ' frame '},
-                hOffset: {parent: ' about-text about-version frame image scrollbar shadow text textarea window '},
-                hotkey: {parent: ' widget '},
-                hRegistrationPoint: {parent: ' image '},
-                hslAdjustment: {parent: ' image '},
-                hslTinting: {parent: ' image '},
-                hScrollBar: {parent: ' frame '},
-                icon: {parent: ' preferenceGroup '},
-                image: {parent: ' about-box frame window widget '},
-                interval: {parent: ' action timer '},
-                key: {parent: ' hotkey '},
-                kind: {parent: ' preference '},
-                level: {parent: ' window '},
-                lines: {parent: ' textarea '},
-                loadingSrc: {parent: ' image '},
-                max: {parent: ' scrollbar '},
-                maxLength: {parent: ' preference '},
-                menuItem: {parent: ' contextMenuItems '},
-                min: {parent: ' scrollbar '},
-                minimumVersion: {parent: ' widget '},
-                minLength: {parent: ' preference '},
-                missingSrc: {parent: ' image '},
-                modifier: {parent: ' hotkey '},
-                name: {parent: ' hotkey image preference preferenceGroup text textarea timer window '},
-                notSaved: {parent: ' preference '},
-                onContextMenu: {parent: ' frame image text textarea window ', script: true},
-                onDragDrop: {parent: ' frame image text textarea ', script: true},
-                onDragEnter: {parent: ' frame image text textarea ', script: true},
-                onDragExit: {parent: ' frame image text textarea ', script: true},
-                onFirstDisplay: {parent: ' window ', script: true},
-                onGainFocus: {parent: ' textarea window ', script: true},
-                onKeyDown: {parent: ' hotkey text textarea ', script: true},
-                onKeyPress: {parent: ' textarea ', script: true},
-                onKeyUp: {parent: ' hotkey text textarea ', script: true},
-                onImageLoaded: {parent: ' image ', script: true},
-                onLoseFocus: {parent: ' textarea window ', script: true},
-                onMouseDown: {parent: ' frame image text textarea ', script: true},
-                onMouseEnter: {parent: ' frame image text textarea ', script: true},
-                onMouseExit: {parent: ' frame image text textarea ', script: true},
-                onMouseMove: {parent: ' frame image text ', script: true},
-                onMouseUp: {parent: ' frame image text textarea ', script: true},
-                onMouseWheel: {parent: ' frame ', script: true},
-                onMultiClick: {parent: ' frame image text textarea window ', script: true},
-                onSelect: {parent: ' menuItem ', script: true},
-                onTimerFired: {parent: ' timer ', script: true},
-                onValueChanged: {parent: ' scrollbar ', script: true},
-                opacity: {parent: ' frame image scrollbar shadow text textarea window '},
-                option: {parent: ' preference widget '},
-                optionValue: {parent: ' preference '},
-                order: {parent: ' preferenceGroup '},
-                orientation: {parent: ' scrollbar '},
-                pageSize: {parent: ' scrollbar '},
-                preference: {parent: ' widget '},
-                preferenceGroup: {parent: ' widget '},
-                remoteAsync: {parent: ' image '},
-                requiredPlatform: {parent: ' widget '},
-                rotation: {parent: ' image '},
-                scrollX: {parent: ' frame '},
-                scrollY: {parent: ' frame '},
-                secure: {parent: ' preference textarea '},
-                scrollbar: {parent: ' text textarea '},
-                shadow: {parent: ' about-text text window '},
-                size: {parent: ' about-text about-version text textarea '},
-                spellcheck: {parent: ' textarea '},
-                src: {parent: ' image '},
-                srcHeight: {parent: ' image '},
-                srcWidth: {parent: ' image '},
-                style: {parent: ' about-text about-version preference text textarea '},
-                text: {parent: ' frame window '},
-                textarea: {parent: ' frame window '},
-                timer: {parent: ' widget '},
-                thumbColor: {parent: ' scrollbar '},
-                ticking: {parent: ' timer '},
-                ticks: {parent: ' preference '},
-                tickLabel: {parent: ' preference '},
-                tileOrigin: {parent: ' image '},
-                title: {parent: ' menuItem preference preferenceGroup window '},
-                tooltip: {parent: ' image text textarea '},
-                truncation: {parent: ' text '},
-                tracking: {parent: ' image '},
-                trigger: {parent: ' action '},
-                truncation: {parent: ' text textarea '},
-                type: {parent: ' preference '},
-                useFileIcon: {parent: ' image '},
-                vAlign: {parent: ' frame image scrollbar text textarea '},
-                value: {parent: ' preference scrollbar '},
-                version: {parent: ' widget '},
-                visible: {parent: ' frame image scrollbar text textarea window '},
-                vLineSize: {parent: ' frame '},
-                vOffset: {parent: ' about-text about-version frame image scrollbar shadow text textarea window '},
-                vRegistrationPoint: {parent: ' image '},
-                vScrollBar: {parent: ' frame '},
-                width: {parent: ' frame image scrollbar text textarea window '},
-                window: {parent: ' widget '},
-                zOrder: {parent: ' frame image scrollbar text textarea '}
-            }
-        }
-    };
-
-    function xmlword(tag) {
-        var w = token.value;
-        if (!token.identifier) {
-            if (token.id === '<') {
-                error(tag ? "Expected &lt; and saw '<'" : "Missing '>'",
-                    prevtoken);
-            } else {
-                warning("Missing quotes", prevtoken);
-            }
-        }
-        advance();
-        while (token.id === '-' || token.id === ':') {
-            w += token.id;
-            advance();
-            if (!token.identifier) {
-                error('Bad name: ' + w + token.value);
-            }
-            w += token.value;
-            advance();
-        }
-        return w;
-    }
-
-    function xml() {
-        var a, e, n, q, t;
-        xmode = 'xml';
-        stack = [];
-        for (;;) {
-            switch (token.value) {
-            case '<':
-                advance('<');
-                t = token;
-                n = xmlword(true);
-                t.name = n;
-                if (!xtype) {
-                    if (xmltype[n]) {
-                        xmltype[n].doBegin();
-                        n = xtype;
-                        e = false;
-                    } else {
-                        error("Unrecognized <" + n + ">");
-                    }
-                } else {
-                    if (option.cap && xtype === 'html') {
-                        n = n.toLowerCase();
-                    }
-                    e = xmltype[xtype].doTagName(n, stack[stack.length - 1].type);
-                }
-                t.type = n;
-                for (;;) {
-                    if (token.id === '/') {
-                        advance('/');
-                        e = true;
-                        break;
-                    }
-                    if (token.id && token.id.substr(0, 1) === '>') {
-                        break;
-                    }
-                    a = xmlword();
-                    switch (xmltype[xtype].doAttribute(n, a)) {
-                    case 'script':
-                        xmode = 'string';
-                        advance('=');
-                        q = token.id;
-                        if (q !== '"' && q !== "'") {
-                            error('Missing quote.');
-                        }
-                        xmode = q;
-                        advance(q);
-                        statements();
-                        if (token.id !== q) {
-                            error(
-                              'Missing close quote on script attribute');
-                        }
-                        xmode = 'xml';
-                        advance(q);
-                        break;
-                    case 'value':
-                        advance('=');
-                        if (!token.identifier &&
-                                token.type != '(string)' &&
-                                token.type != '(number)') {
-                            error('Bad value: ' + token.value);
-                        }
-                        advance();
-                        break;
-                    case 'string':
-                        advance('=');
-                        if (token.type !== '(string)') {
-                            error('Bad value: ' + token.value);
-                        }
-                        advance();
-                        break;
-                    case 'define':
-                        advance('=');
-                        if (token.type !== '(string)') {
-                            error('Bad value: ' + token.value);
-                        }
-                        addlabel(token.value, 'global');
-                        advance();
-                        break;
-                    default:
-                        if (token.id === '=') {
-                            advance('=');
-                            if (!token.identifier &&
-                                    token.type != '(string)' &&
-                                    token.type != '(number)') {
-                            }
-                            advance();
-                        }
-                    }
-                }
-                switch (xmltype[xtype].doIt(n)) {
-                case 'script':
-                    xmode = 'script';
-                    advance('>');
-                    statements();
-                    xmode = 'xml';
-                    break;
-                case 'special':
-                    e = true;
-                    n = '</' + t.name + '>';
-                    if (!lex.skip(n)) {
-                        error("Missing " + n, t);
-                    }
-                    break;
-                default:
-                    lex.skip('>');
-                }
-                if (!e) {
-                    stack.push(t);
-                }
-                break;
-            case '</':
-                advance('</');
-                n = xmlword(true);
-                t = stack.pop();
-                if (!t) {
-                    error('Unexpected close tag: </' + n + '>');
-                }
-                if (t.name != n) {
-                    error('Expected </' + t.name +
-                        '> and instead saw </' + n + '>');
-                }
-                if (token.id !== '>') {
-                    error("Expected '>'");
-                }
-                lex.skip('>');
-                break;
-            case '<!':
-                for (;;) {
-                    advance();
-                    if (token.id === '>') {
-                        break;
-                    }
-                    if (token.id === '<' || token.id === '(end)') {
-                        error("Missing '>'.", prevtoken);
-                    }
-                }
-                lex.skip('>');
-                break;
-            case '<!--':
-                lex.skip('-->');
-                break;
-            case '<%':
-                lex.skip('%>');
-                break;
-            case '<?':
-                for (;;) {
-                    advance();
-                    if (token.id === '?>') {
-                        break;
-                    }
-                    if (token.id === '<?' || token.id === '<' ||
-                            token.id === '>' || token.id === '(end)') {
-                        error("Missing '?>'.", prevtoken);
-                    }
-                }
-                lex.skip('?>');
-                break;
-            case '<=':
-            case '<<':
-            case '<<=':
-                error("Expected '&lt;'.");
-                break;
-            case '(end)':
-                return;
-            }
-            if (!lex.skip('')) {
-                if (stack.length) {
-                    t = stack.pop();
-                    error('Missing </' + t.name + '>', t);
-                }
-                return;
-            }
-            advance();
-        }
-    }
-
-
-// Build the syntax table by declaring the syntactic elements of the language.
-
-    type('(number)', idValue);
-    type('(string)', idValue);
-
-    syntax['(identifier)'] = {
-        type: '(identifier)',
-        lbp: 0,
-        identifier: true,
-        nud: function () {
-            if (option.undef && !builtin(this.value) &&
-                    xmode !== '"' && xmode !== "'") {
-                var c = funlab;
-                while (!c[this.value]) {
-                    c = c['(context)'];
-                    if (!c) {
-                        warning("Undefined variable: " + this.value,
-                            prevtoken);
-                        break;
-                    }
-                }
-            }
-            addlabel(this.value, 'global');
-            return this;
-        },
-        led: function () {
-            error("Expected an operator and instead saw '" +
-                token.value + "'.");
-        }
-    };
-
-    type('(regex)', function () {
-        return [this.id, this.value, this.flags];
-    });
-
-    delim('(endline)');
-    delim('(begin)');
-    delim('(end)').reach = true;
-    delim('</').reach = true;
-    delim('<![').reach = true;
-    delim('<%');
-    delim('<?');
-    delim('<!');
-    delim('<!--');
-    delim('%>');
-    delim('?>');
-    delim('(error)').reach = true;
-    delim('}').reach = true;
-    delim(')');
-    delim(']');
-    delim(']]>').reach = true;
-    delim('"').reach = true;
-    delim("'").reach = true;
-    delim(';');
-    delim(':').reach = true;
-    delim(',');
-    reserve('else');
-    reserve('case').reach = true;
-    reserve('default').reach = true;
-    reserve('catch');
-    reserve('finally');
-    reservevar('arguments');
-    reservevar('false');
-    reservevar('Infinity');
-    reservevar('NaN');
-    reservevar('null');
-    reservevar('this');
-    reservevar('true');
-    reservevar('undefined');
-    assignop('=', 'assign', 20);
-    assignop('+=', 'assignadd', 20);
-    assignop('-=', 'assignsub', 20);
-    assignop('*=', 'assignmult', 20);
-    assignop('/=', 'assigndiv', 20).nud = function () {
-        warning(
-            "A regular expression literal can be confused with '/='.");
-    };
-    assignop('%=', 'assignmod', 20);
-    assignop('&=', 'assignbitand', 20);
-    assignop('|=', 'assignbitor', 20);
-    assignop('^=', 'assignbitxor', 20);
-    assignop('<<=', 'assignshiftleft', 20);
-    assignop('>>=', 'assignshiftright', 20);
-    assignop('>>>=', 'assignshiftrightunsigned', 20);
-    infix('?', function (left) {
-        parse(10);
-        advance(':');
-        parse(10);
-    }, 30);
-
-    infix('||', 'or', 40);
-    infix('&&', 'and', 50);
-    infix('|', 'bitor', 70);
-    infix('^', 'bitxor', 80);
-    infix('&', 'bitand', 90);
-    infix('==', function (left) {
-        var t = token;
-        if (    (t.type === '(number)' && !+t.value) ||
-                (t.type === '(string)' && !t.value) ||
-                t.type === 'true' || t.type === 'false' ||
-                t.type === 'undefined' || t.type === 'null') {
-            warning("Use '===' to compare with '" + t.value + "'.", t);
-        }
-        return ['==', left, parse(100)];
-    }, 100);
-    infix('===', 'equalexact', 100);
-    infix('!=', function (left) {
-        var t = token;
-        if (    (t.type === '(number)' && !+t.value) ||
-                (t.type === '(string)' && !t.value) ||
-                t.type === 'true' || t.type === 'false' ||
-                t.type === 'undefined' || t.type === 'null') {
-            warning("Use '!==' to compare with '" + t.value + "'.", t);
-        }
-        return ['!=', left, parse(100)];
-    }, 100);
-    infix('!==', 'notequalexact', 100);
-    infix('<', 'less', 110);
-    infix('>', 'greater', 110);
-    infix('<=', 'lessequal', 110);
-    infix('>=', 'greaterequal', 110);
-    infix('<<', 'shiftleft', 120);
-    infix('>>', 'shiftright', 120);
-    infix('>>>', 'shiftrightunsigned', 120);
-    infix('in', 'in', 120);
-    infix('instanceof', 'instanceof', 120);
-    infix('+', 'addconcat', 130);
-    prefix('+', 'num');
-    infix('-', 'sub', 130);
-    prefix('-', 'neg');
-    infix('*', 'mult', 140);
-    infix('/', 'div', 140);
-    infix('%', 'mod', 140);
-
-    suffix('++', 'postinc');
-    prefix('++', 'preinc');
-    syntax['++'].exps = true;
-
-    suffix('--', 'postdec');
-    prefix('--', 'predec');
-    syntax['--'].exps = true;
-    prefixname('delete', function () {
-        parse(0);
-    }).exps = true;
-
-
-    prefix('~', 'bitnot');
-    prefix('!', 'not');
-    prefixname('typeof', 'typeof');
-    prefixname('new', function () {
-        var c = parse(155);
-        if (c) {
-            if (c.identifier) {
-                switch (c.value) {
-                case 'Object':
-                    warning('Use the object literal notation {}.', prevtoken);
-                    break;
-                case 'Array':
-                    warning('Use the array literal notation [].', prevtoken);
-                    break;
-                case 'Number':
-                case 'String':
-                case 'Boolean':
-                    warning("Do not use the " + c.value +
-                        " function as a constructor.", prevtoken);
-                    break;
-                case 'Function':
-                    if (!option.evil) {
-                        warning('The Function constructor is eval.');
-                    }
-                }
-            } else {
-                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
-                    warning('Bad constructor', prevtoken);
-                }
-            }
-        } else {
-            warning('Weird construction.', this);
-        }
-        if (token.id === '(') {
-            advance('(');
-            if (token.id !== ')') {
-                for (;;) {
-                    parse(10);
-                    if (token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance(')');
-        } else {
-            warning("Missing '()' invoking a constructor.");
-        }
-        return syntax['function'];
-    });
-    syntax['new'].exps = true;
-
-    infix('.', function (left) {
-        var m = identifier();
-        if (typeof m === 'string') {
-            countMember(m);
-        }
-        if (!option.evil && left && left.value === 'document' &&
-                (m === 'write' || m === 'writeln')) {
-            warning("document.write can be a form of eval.", left);
-        }
-        this.left = left;
-        this.right = m;
-        return this;
-    }, 160);
-
-    infix('(', function (left) {
-        var n = 0, p = [];
-        if (token.id !== ')') {
-            for (;;) {
-                p[p.length] = parse(10);
-                n += 1;
-                if (token.id !== ',') {
-                    break;
-                }
-                advance(',');
-            }
-        }
-        advance(')');
-        if (typeof left === 'object') {
-            if (left.value == 'parseInt' && n == 1) {
-                warning("Missing radix parameter", left);
-            }
-            if (!option.evil) {
-                if (left.value == 'eval' || left.value == 'Function') {
-                    warning("eval is evil", left);
-                } else if (p[0] && p[0].id === '(string)' &&
-                       (left.value === 'setTimeout' ||
-                        left.value === 'setInterval')) {
-                    warning(
-    "Implied eval is evil. Use a function argument instead of a string", left);
-                }
-            }
-            if (!left.identifier && left.id !== '.' &&
-                    left.id !== '[' && left.id !== '(') {
-                warning('Bad invocation.', left);
-            }
-
-        }
-        return syntax['function'];
-    }, 155).exps = true;
-
-    prefix('(', function () {
-        parse(0);
-        advance(')', this);
-    });
-
-    infix('[', function (left) {
-        var e = parse(0);
-        if (e && e.type === '(string)') {
-            countMember(e.value);
-            if (ix.test(e.value)) {
-                var s = syntax[e.value];
-                if (!s || !s.reserved) {
-                    warning("This is better written in dot notation.", e);
-                }
-            }
-        }
-        advance(']', this);
-        this.left = left;
-        this.right = e;
-        return this;
-    }, 160);
-
-    prefix('[', function () {
-        if (token.id === ']') {
-            advance(']');
-            return;
-        }
-        for (;;) {
-            parse(10);
-            if (token.id === ',') {
-                advance(',');
-                if (token.id === ']' || token.id === ',') {
-                    warning('Extra comma.', prevtoken);
-                }
-            } else {
-                advance(']', this);
-                return;
-            }
-        }
-    }, 160);
-
-    (function (x) {
-        x.nud = function () {
-            var i;
-            if (token.id === '}') {
-                advance('}');
-                return;
-            }
-            for (;;) {
-                i = optionalidentifier(true);
-                if (!i && (token.id === '(string)' || token.id === '(number)')) {
-                    i = token.id;
-                    advance();
-                }
-                if (!i) {
-                    error("Expected an identifier and instead saw '" +
-                        token.value + "'.");
-                }
-                if (typeof i.value === 'string') {
-                    countMember(i.value);
-                }
-                advance(':');
-                parse(10);
-                if (token.id === ',') {
-                    advance(',');
-                    if (token.id === ',' || token.id === '}') {
-                        warning("Extra comma.");
-                    }
-                } else {
-                    advance('}', this);
-                    return;
-                }
-            }
-        };
-        x.fud = function () {
-            error(
-                "Expected to see a statement and instead saw a block.");
-        };
-    })(delim('{'));
-
-
-    function varstatement() {
-        for (;;) {
-            addlabel(identifier(), 'var');
-            if (token.id === '=') {
-                advance('=');
-                parse(20);
-            }
-            if (token.id === ',') {
-                advance(',');
-            } else {
-                return;
-            }
-        }
-    }
-
-
-    stmt('var', varstatement);
-
-
-    function functionparams() {
-        var t = token;
-        advance('(');
-        if (token.id === ')') {
-            advance(')');
-            return;
-        }
-        for (;;) {
-            addlabel(identifier(), 'parameter');
-            if (token.id === ',') {
-                advance(',');
-            } else {
-                advance(')', t);
-                return;
-            }
-        }
-    }
-
-
-    blockstmt('function', function () {
-        var i = identifier();
-        addlabel(i, 'var*');
-        beginfunction(i);
-        addlabel(i, 'function');
-        functionparams();
-        block();
-        endfunction();
-    });
-
-    prefixname('function', function () {
-        var i = optionalidentifier() || ('"' + anonname + '"');
-        beginfunction(i);
-        addlabel(i, 'function');
-        functionparams();
-        block();
-        endfunction();
-    });
-
-    blockstmt('if', function () {
-        var t = token;
-        advance('(');
-        parse(20);
-        advance(')', t);
-        block();
-        if (token.id === 'else') {
-            advance('else');
-            if (token.id === 'if' || token.id === 'switch') {
-                statement();
-            } else {
-                block();
-            }
-        }
-    });
-
-    blockstmt('try', function () {
-        var b;
-        block();
-        if (token.id === 'catch') {
-            advance('catch');
-            beginfunction('"catch"');
-            functionparams();
-            block();
-            endfunction();
-            b = true;
-        }
-        if (token.id === 'finally') {
-            advance('finally');
-            beginfunction('"finally"');
-            block();
-            endfunction();
-            return;
-        } else if (!b) {
-            error("Expected 'catch' or 'finally' and instead saw '" +
-                token.value + "'.");
-        }
-    });
-
-    blockstmt('while', function () {
-        var t= token;
-        advance('(');
-        parse(20);
-        advance(')', t);
-        block();
-    }).labelled = true;
-
-    reserve('with');
-
-    blockstmt('switch', function () {
-        var t = token;
-        advance('(');
-        var g = false;
-        parse(20);
-        advance(')', t);
-        t = token;
-        advance('{');
-        for (;;) {
-            switch (token.id) {
-            case 'case':
-                switch (verb) {
-                case 'break':
-                case 'case':
-                case 'continue':
-                case 'return':
-                case 'switch':
-                case 'throw':
-                    break;
-                default:
-                    warning(
-                        "Expected a 'break' statement before 'case'.",
-                        prevtoken);
-                }
-                advance('case');
-                parse(20);
-                g = true;
-                advance(':');
-                verb = 'case';
-                break;
-            case 'default':
-                switch (verb) {
-                case 'break':
-                case 'continue':
-                case 'return':
-                case 'throw':
-                    break;
-                default:
-                    warning(
-                        "Expected a 'break' statement before 'default'.",
-                        prevtoken);
-                }
-                advance('default');
-                g = true;
-                advance(':');
-                break;
-            case '}':
-                advance('}', t);
-                return;
-            default:
-                if (g) {
-                    statements();
-                } else {
-                    error("Expected to see 'case' and instead saw '" +
-                        token.value + "'.");
-                }
-            }
-        }
-    }).labelled = true;
-
-    stmt('debugger', function () {
-        if (!option.debug) {
-            warning("All debugger statements should be removed.");
-        }
-    });
-
-    stmt('do', function () {
-        block();
-        advance('while');
-        var t = token;
-        advance('(');
-        parse(20);
-        advance(')', t);
-    }).labelled = true;
-
-    blockstmt('for', function () {
-        var t = token;
-        advance('(');
-        if (peek(token.id === 'var' ? 1 : 0).id === 'in') {
-            if (token.id === 'var') {
-                advance('var');
-                addlabel(identifier(), 'var');
-            } else {
-                advance();
-            }
-            advance('in');
-            parse(20);
-            advance(')', t);
-            block();
-            return;
-        } else {
-            if (token.id != ';') {
-                if (token.id === 'var') {
-                    advance('var');
-                    varstatement();
-                } else {
-                    for (;;) {
-                        parse(0);
-                        if (token.id !== ',') {
-                            break;
-                        }
-                        advance(',');
-                    }
-                }
-            }
-            advance(';');
-            if (token.id != ';') {
-                parse(20);
-            }
-            advance(';');
-            if (token.id === ';') {
-                error("Expected to see ')' and instead saw ';'");
-            }
-            if (token.id != ')') {
-                for (;;) {
-                    parse(0);
-                    if (token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance(')', t);
-            block();
-        }
-    }).labelled = true;
-
-
-    function nolinebreak(t) {
-        if (t.line !== token.line) {
-            warning("Statement broken badly.", t);
-        }
-    }
-
-
-    stmt('break', function () {
-        nolinebreak(this);
-        if (funlab[token.value] === 'live*') {
-            advance();
-        }
-        reachable('break');
-    });
-
-
-    stmt('continue', function () {
-        nolinebreak(this);
-        if (funlab[token.id] === 'live*') {
-            advance();
-        }
-        reachable('continue');
-    });
-
-
-    stmt('return', function () {
-        nolinebreak(this);
-        if (token.id != ';' && !token.reach) {
-            parse(20);
-        }
-        reachable('return');
-    });
-
-
-    stmt('throw', function () {
-        nolinebreak(this);
-        parse(20);
-        reachable('throw');
-    });
-
-
-//  Superfluous reserved words
-
-    reserve('abstract');
-    reserve('boolean');
-    reserve('byte');
-    reserve('char');
-    reserve('class');
-    reserve('const');
-    reserve('double');
-    reserve('enum');
-    reserve('export');
-    reserve('extends');
-    reserve('final');
-    reserve('float');
-    reserve('goto');
-    reserve('implements');
-    reserve('import');
-    reserve('int');
-    reserve('interface');
-    reserve('long');
-    reserve('native');
-    reserve('package');
-    reserve('private');
-    reserve('protected');
-    reserve('public');
-    reserve('short');
-    reserve('static');
-    reserve('super');
-    reserve('synchronized');
-    reserve('throws');
-    reserve('transient');
-    reserve('void');
-    reserve('volatile');
-
-
-// The actual jslint function itself.
-
-    var j = function (s, o) {
-        option = o;
-        if (!o) {
-            option = {};
-        }
-        jslint.errors = [];
-        globals = {};
-        functions = [];
-        xmode = false;
-        xtype = '';
-        stack = null;
-        funlab = {};
-        member = {};
-        funstack = [];
-        lookahead = [];
-        lex.init(s);
-
-        prevtoken = token = syntax['(begin)'];
-        try {
-            advance();
-            if (token.value.charAt(0) === '<') {
-                xml();
-            } else {
-                statements();
-                advance('(end)');
-            }
-        } catch (e) {
-            if (e) {
-                jslint.errors.push({
-                    reason: "JSLint error: " + e.description,
-                    line: token.line,
-                    character: token.from,
-                    evidence: token.value
-                });
-            }
-        }
-        return jslint.errors.length === 0;
-    };
-
-
-// Report generator.
-
-    j.report = function (option) {
-        var a = [], c, cc, f, i, k, o = [], s;
-
-        function detail(h) {
-            if (s.length) {
-                o.push('<div>' + h + ':&nbsp; ' + s.sort().join(', ') +
-                    '</div>');
-            }
-        }
-
-        k = jslint.errors.length;
-        if (k) {
-            o.push(
-                '<div style="background-color: mistyrose;">Error:<blockquote>');
-            for (i = 0; i < k; i += 1) {
-                c = jslint.errors[i];
-                if (c) {
-                    o.push('<p>Problem at line ' + (c.line + 1) +
-                        ' character ' + (c.character + 1) +
-                        ': ' + c.reason.entityify() +
-                        '</p><p><tt>' + c.evidence.entityify() +
-                        '</tt></p>');
-                }
-            }
-            o.push('</blockquote></div>');
-            if (!c) {
-                return o.join('');
-            }
-        }
-
-        if (!option) {
-            for (k in member) {
-                a.push(k);
-            }
-            if (a.length) {
-                a = a.sort();
-                o.push(
-                 '<table><tbody><tr><th>Members</th><th>Occurrences</th></tr>');
-                for (i = 0; i < a.length; i += 1) {
-                    o.push('<tr><td><tt>', a[i], '</tt></td><td>', member[a[i]],
-                        '</td></tr>');
-                }
-                o.push('</tbody></table>');
-            }
-            for (i = 0; i < functions.length; ++i) {
-                f = functions[i];
-                for (k in f) {
-                    if (f[k] === 'global') {
-                        c = f['(context)'];
-                        for (;;) {
-                            cc = c['(context)'];
-                            if (!cc) {
-                                if ((!funlab[k] || funlab[k] === 'var?') &&
-                                        !builtin(k)) {
-                                    funlab[k] = 'var?';
-                                    f[k] = 'global?';
-                                }
-                                break;
-                            }
-                            if (c[k] === 'parameter!' || c[k] === 'var!') {
-                                f[k] = 'var.';
-                                break;
-                            }
-                            if (c[k] === 'var' || c[k] === 'var*' ||
-                                    c[k] === 'var!') {
-                                f[k] = 'var.';
-                                c[k] = 'var!';
-                                break;
-                            }
-                            if (c[k] === 'parameter') {
-                                f[k] = 'var.';
-                                c[k] = 'parameter!';
-                                break;
-                            }
-                            c = cc;
-                        }
-                    }
-                }
-            }
-            s = [];
-            for (k in funlab) {
-                c = funlab[k];
-                if (typeof c === 'string' && c.substr(0, 3) === 'var') {
-                    if (c === 'var?') {
-                        s.push('<tt>' + k + '</tt><small>&nbsp;(?)</small>');
-                    } else {
-                        s.push('<tt>' + k + '</tt>');
-                    }
-                }
-            }
-            detail('Global');
-            if (functions.length) {
-                o.push('<br>Function:<ol style="padding-left:0.5in">');
-            }
-            for (i = 0; i < functions.length; i += 1) {
-                f = functions[i];
-                o.push('<li value=' +
-                    f['(line)'] + '><tt>' + (f['(name)'] || '') + '</tt>');
-                s = [];
-                for (k in f) {
-                    if (k.charAt(0) != '(') {
-                        switch (f[k]) {
-                        case 'parameter':
-                            s.push('<tt>' + k + '</tt>');
-                            break;
-                        case 'parameter!':
-                            s.push('<tt>' + k +
-                                '</tt><small>&nbsp;(closure)</small>');
-                            break;
-                        }
-                    }
-                }
-                detail('Parameter');
-                s = [];
-                for (k in f) {
-                    if (k.charAt(0) != '(') {
-                        switch(f[k]) {
-                        case 'var':
-                            s.push('<tt>' + k +
-                                '</tt><small>&nbsp;(unused)</small>');
-                            break;
-                        case 'var*':
-                            s.push('<tt>' + k + '</tt>');
-                            break;
-                        case 'var!':
-                            s.push('<tt>' + k +
-                                '</tt><small>&nbsp;(closure)</small>');
-                            break;
-                        case 'var.':
-                            s.push('<tt>' + k +
-                                '</tt><small>&nbsp;(outer)</small>');
-                            break;
-                        }
-                    }
-                }
-                detail('Var');
-                s = [];
-                c = f['(context)'];
-                for (k in f) {
-                    if (k.charAt(0) != '(' && f[k].substr(0, 6) === 'global') {
-                        if (f[k] === 'global?') {
-                            s.push('<tt>' + k + '</tt><small>&nbsp;(?)</small>');
-                        } else {
-                            s.push('<tt>' + k + '</tt>');
-                        }
-                    }
-                }
-                detail('Global');
-                s = [];
-                for (k in f) {
-                    if (k.charAt(0) != '(' && f[k] === 'label') {
-                       s.push(k);
-                    }
-                }
-                detail('Label');
-                o.push('</li>');
-            }
-            if (functions.length) {
-                o.push('</ol>');
-            }
-        }
-        return o.join('');
-    };
-
-    return j;
-
-}();
-
-/* ============================================================== */
-
-var options = {
-    "browser"    : false,
-    "cap"        : false,
-    "debug"      : false,
-    "evil"       : false,
-    "jscript"    : false,
-    "laxLineEnd" : false,
-    "passfail"   : false,
-    "plusplus"   : false,
-    "undef"      : false
-};
-
-function die(str) {
-    print("jslint:ERROR: " + str);
-    quit();
-}
-
-function usage() {
-    print("jslint:USAGE: jslint file.js");
-    quit();
-}
-
-var i;
-for (i = 0; i < arguments.length; i++) {
-    if (   arguments[i].substring(0, 1) != '-'
-        && arguments[i].substring(0, 1) != '+')
-        break;
-    if (options[arguments[i].substring(1)] == undefined)
-        die("invalid command line option \"" + arguments[i] + "\"");
-    options[arguments[i].substring(1)] =
-        (arguments[i].substring(0, 1) == "-" ? true : false);
-}
-if (arguments[i] == undefined) {
-    usage()
-}
-
-var file = new File(arguments[i]);
-file.open("read");
-var script = file.readAll();
-file.close();
-
-if (!jslint(script, { passfail: true })) {
-    var e = jslint.errors[0];
-    print('jslint: line ' + (e.line + 1) + ' character ' + (e.character + 1) + ': ' + e.reason);
-    print((e.evidence || ''). replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
-    quit();
-}
-
diff --git a/libs/js/libtool.m4 b/libs/js/libtool.m4
deleted file mode 100644
index 0f53cb592e..0000000000
--- a/libs/js/libtool.m4
+++ /dev/null
@@ -1,6397 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This file is free software; the Free Software Foundation gives
-## unlimited permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
-
-# serial 48 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix3*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix3*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_MSG_RESULT([$SED])
-])
diff --git a/libs/js/nsprpub/.cvsignore b/libs/js/nsprpub/.cvsignore
deleted file mode 100644
index 5a12c76549..0000000000
--- a/libs/js/nsprpub/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-config-defs.h
-config.cache
-config.log
-config.status
diff --git a/libs/js/nsprpub/.update b/libs/js/nsprpub/.update
deleted file mode 100644
index c6e647b6d5..0000000000
--- a/libs/js/nsprpub/.update
+++ /dev/null
@@ -1 +0,0 @@
-Fri Mar 16 17:16:13 EDT 2007
diff --git a/libs/js/nsprpub/Makefile.in b/libs/js/nsprpub/Makefile.in
deleted file mode 100644
index 9273b16db2..0000000000
--- a/libs/js/nsprpub/Makefile.in
+++ /dev/null
@@ -1,151 +0,0 @@
-#! gmake
-
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-MOD_DEPTH	= .
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-MAKE := $(patsubst -j%,,$(MAKE)) -j1
-
-DIRS = config pr lib
-
-ifdef MOZILLA_CLIENT
-# Make nsinstall use absolute symlinks by default for Mozilla OSX builds
-# http://bugzilla.mozilla.org/show_bug.cgi?id=193164
-ifeq ($(OS_ARCH),Darwin)
-ifndef NSDISTMODE
-NSDISTMODE=absolute_symlink
-export NSDISTMODE
-endif
-endif
-endif
-
-DIST_GARBAGE = config.cache config.log config.status
-
-all:: config.status export
-
-include $(topsrcdir)/config/rules.mk
-
-config.status:: configure
-ifeq ($(OS_ARCH),WINNT)
-	sh $(srcdir)/configure --no-create --no-recursion
-else
-	./config.status --recheck && ./config.status
-endif
-
-#
-# The -ll option of zip converts CR LF to LF.
-#
-ifeq ($(OS_ARCH),WINNT)
-ZIP_ASCII_OPT = -ll
-endif
-
-# Delete config/autoconf.mk last because it is included by every makefile.
-distclean::
-	@echo "cd pr/tests; $(MAKE) $@"
-	@$(MAKE) -C pr/tests $@
-	rm -f config/autoconf.mk
-
-release::
-	echo $(BUILD_NUMBER) > $(RELEASE_DIR)/$(BUILD_NUMBER)/version.df
-	@if test -f imports.df; then \
-	    echo "cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
-	    cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
-	else \
-	    echo "echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
-	    echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
-	fi
-	cd $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
-	rm -rf META-INF; mkdir META-INF; cd META-INF; \
-	echo "Manifest-Version: 1.0" > MANIFEST.MF; \
-	echo "" >> MANIFEST.MF; \
-	cd ..; rm -f mdbinary.jar; zip -r mdbinary.jar META-INF bin lib; \
-	rm -rf META-INF; \
-	cd include; \
-	rm -rf META-INF; mkdir META-INF; cd META-INF; \
-	echo "Manifest-Version: 1.0" > MANIFEST.MF; \
-	echo "" >> MANIFEST.MF; \
-	cd ..; rm -f mdheader.jar; zip $(ZIP_ASCII_OPT) -r mdheader.jar *; \
-	rm -rf META-INF
-ifeq ($(OS_ARCH),WINNT)
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)"; \
-		$(topsrcdir)/config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER); \
-	fi
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)"; \
-		$(topsrcdir)/config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER)\\$(RELEASE_OBJDIR_NAME); \
-	fi
-else
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)"; \
-		$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-	fi
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)"; \
-		$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	fi
-endif
-	cd $(RELEASE_DIR)/$(BUILD_NUMBER); \
-	cp -f version.df imports.df $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/version.df; \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/imports.df; \
-	cd $(OBJDIR_NAME); \
-	cp -f mdbinary.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)/mdbinary.jar; \
-	cd include; \
-	cp -f mdheader.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)/mdheader.jar
-
-package:
-	@echo "cd pkg; $(MAKE) publish"
-	$(MAKE) -C pkg publish
-
-depend:
-	@echo "NSPR20 has no dependencies.  Skipped."
diff --git a/libs/js/nsprpub/admin/explode.pl b/libs/js/nsprpub/admin/explode.pl
deleted file mode 100644
index 881f21b9bf..0000000000
--- a/libs/js/nsprpub/admin/explode.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/perl
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# -----------------------------------------------------------------
-#
-# explode.pl -- Unpack .jar files into bin, lib, include directories
-#
-# syntax: perl explode.pl
-#
-# Description:
-# explode.pl unpacks the .jar files created by the NSPR build   
-# procedure. 
-#
-# Suggested use: After copying the platform directories to
-# /s/b/c/nspr20/<release>. CD to /s/b/c/nspr20/<release> and
-# run explode.pl. This will unpack the jar files into bin, lib,
-# include directories.
-#
-# -----------------------------------------------------------------
-
-@dirs = `ls -d *.OBJ*`;
-
-foreach $dir (@dirs) {
-    chop($dir);
-    if (-l $dir) {
-        print "Skipping symbolic link $dir\n";
-        next;
-    }
-    print "Unzipping $dir/mdbinary.jar\n";
-    system ("unzip", "-o", "$dir/mdbinary.jar",
-            "-d", "$dir");
-    system ("rm", "-rf", "$dir/META-INF");
-    mkdir "$dir/include", 0755;
-    print "Unzipping $dir/mdheader.jar\n";
-    system ("unzip", "-o", "-aa",
-            "$dir/mdheader.jar",
-            "-d", "$dir/include");
-    system ("rm", "-rf", "$dir/include/META-INF");
-}
-# --- end explode.pl ----------------------------------------------
diff --git a/libs/js/nsprpub/admin/makeTargetDirs.sh b/libs/js/nsprpub/admin/makeTargetDirs.sh
deleted file mode 100755
index 4250ce4a0b..0000000000
--- a/libs/js/nsprpub/admin/makeTargetDirs.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# -----------------------------------------------------------------
-# makeTargetDirs.sh -- Create target directories for building NSPR
-#
-# syntax: makeTargetDirs.sh
-#
-# Description:
-# makeTargetDirs.sh creates a set of directories intended for use
-# with NSPR's autoconf based build system.
-#     
-# The enumerated directories are the same as those built for NSPR
-# 4.1.1. Adjust as needed.
-#
-# -----------------------------------------------------------------
-
-mkdir  AIX4.3_64_DBG.OBJ
-mkdir  AIX4.3_64_OPT.OBJ
-mkdir  AIX4.3_DBG.OBJ
-mkdir  AIX4.3_OPT.OBJ
-mkdir  HP-UXB.11.00_64_DBG.OBJ
-mkdir  HP-UXB.11.00_64_OPT.OBJ
-mkdir  HP-UXB.11.00_DBG.OBJ
-mkdir  HP-UXB.11.00_OPT.OBJ
-mkdir  IRIX6.5_n32_PTH_DBG.OBJ
-mkdir  IRIX6.5_n32_PTH_OPT.OBJ
-mkdir  Linux2.2_x86_glibc_PTH_DBG.OBJ
-mkdir  Linux2.2_x86_glibc_PTH_OPT.OBJ
-mkdir  Linux2.4_x86_glibc_PTH_DBG.OBJ
-mkdir  Linux2.4_x86_glibc_PTH_OPT.OBJ
-mkdir  OSF1V4.0D_DBG.OBJ
-mkdir  OSF1V4.0D_OPT.OBJ
-mkdir  SunOS5.6_DBG.OBJ
-mkdir  SunOS5.6_OPT.OBJ
-mkdir  SunOS5.7_64_DBG.OBJ
-mkdir  SunOS5.7_64_OPT.OBJ
-mkdir  WIN954.0_DBG.OBJ
-mkdir  WIN954.0_DBG.OBJD
-mkdir  WIN954.0_OPT.OBJ
-mkdir  WINNT4.0_DBG.OBJ
-mkdir  WINNT4.0_DBG.OBJD
-mkdir  WINNT4.0_OPT.OBJ
-# --- end makeTargetDirs.sh ---------------------------------------
diff --git a/libs/js/nsprpub/admin/repackage.sh b/libs/js/nsprpub/admin/repackage.sh
deleted file mode 100755
index c41fde4270..0000000000
--- a/libs/js/nsprpub/admin/repackage.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# ------------------------------------------------------------------
-# repackage.sh -- Repackage NSPR from /s/b/c to mozilla.org format
-#
-# syntax: repackage.sh
-#
-# Description:
-# repackage.sh creates NSPR binary distributions for mozilla.org from
-# the internal binary distributions in /share/builds/components/nspr20.
-# There are reasons why we can't just push the internal binary distributions
-# to mozilla.org. External developers prefer to use the common archive 
-# file format for their platforms, rather than the jar files we use internally.
-#
-# On Unix, we create a tar.gz file.  On Windows, we create a zip file.
-# For example: NSPR 4.1.1, these would be nspr-4.1.1.tar.gz and nspr-4.1.1.zip.
-#
-# When unpacked, nspr-4.1.1.tar.gz or nspr-4.1.1.zip should expand to a
-# nspr-4.1.1 directory that contains three subdirectories: include, lib,
-# and bin.  The header files, with the correct line endings for the
-# platform, are in nspr-4.1.1/include.  The libraries are in nspr-4.1.1/lib.
-# The executable programs are in nspr-4.1.1/bin.
-# 
-# Note! Files written with Gnu tar are not readable by some non-Gnu
-# versions. Sun, in particular.
-# 
-# 
-# 
-# 
-# ------------------------------------------------------------------
-
-FROMTOP=/share/builds/components/nspr20/v4.7
-TOTOP=./v4.7
-NSPRDIR=nspr-4.7
-SOURCETAG=NSPR_4_7_RTM
-
-#
-# enumerate Unix object directories on /s/b/c
-UNIX_OBJDIRS="
-AIX4.3_64_DBG.OBJ
-AIX4.3_64_OPT.OBJ
-AIX4.3_DBG.OBJ
-AIX4.3_OPT.OBJ
-HP-UXB.11.00_64_DBG.OBJ
-HP-UXB.11.00_64_OPT.OBJ
-HP-UXB.11.00_DBG.OBJ
-HP-UXB.11.00_OPT.OBJ
-IRIX6.5_n32_PTH_DBG.OBJ
-IRIX6.5_n32_PTH_OPT.OBJ
-Linux2.2_x86_glibc_PTH_DBG.OBJ
-Linux2.2_x86_glibc_PTH_OPT.OBJ
-Linux2.4_x86_glibc_PTH_DBG.OBJ
-Linux2.4_x86_glibc_PTH_OPT.OBJ
-OSF1V5.0_DBG.OBJ
-OSF1V5.0_OPT.OBJ
-SunOS5.6_DBG.OBJ
-SunOS5.6_OPT.OBJ
-SunOS5.8_64_DBG.OBJ
-SunOS5.8_64_OPT.OBJ
-SunOS5.8_DBG.OBJ
-SunOS5.8_OPT.OBJ
-"
-#
-# enumerate Windows object directories on /s/b/c
-WIN_OBJDIRS="
-WIN954.0_DBG.OBJ
-WIN954.0_DBG.OBJD
-WIN954.0_OPT.OBJ
-WINNT4.0_DBG.OBJ
-WINNT4.0_DBG.OBJD
-WINNT4.0_OPT.OBJ
-"
-
-#
-# Create the destination directory.
-#
-echo "removing directory $TOTOP"
-rm -rf $TOTOP
-echo "creating directory $TOTOP"
-mkdir -p $TOTOP
-
-#
-# Generate the tar.gz files for Unix platforms.
-#
-for OBJDIR in $UNIX_OBJDIRS; do
-    echo "removing directory $NSPRDIR"
-    rm -rf $NSPRDIR
-    echo "creating directory $NSPRDIR"
-    mkdir $NSPRDIR
-
-    echo "creating directory $NSPRDIR/include"
-    mkdir $NSPRDIR/include
-    echo "copying $FROMTOP/$OBJDIR/include"
-    cp -r $FROMTOP/$OBJDIR/include $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/lib"
-    cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/bin"
-    cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR
-
-    echo "creating directory $TOTOP/$OBJDIR"
-    mkdir $TOTOP/$OBJDIR
-    echo "creating $TOTOP/$OBJDIR/$NSPRDIR.tar"
-    tar cvf $TOTOP/$OBJDIR/$NSPRDIR.tar $NSPRDIR
-    echo "gzipping $TOTOP/$OBJDIR/$NSPRDIR.tar"
-    gzip $TOTOP/$OBJDIR/$NSPRDIR.tar
-done
-
-#
-# Generate the zip files for Windows platforms.
-#
-for OBJDIR in $WIN_OBJDIRS; do
-    echo "removing directory $NSPRDIR"
-    rm -rf $NSPRDIR
-    echo "creating directory $NSPRDIR"
-    mkdir $NSPRDIR
-
-    echo "creating directory $NSPRDIR/include"
-    mkdir $NSPRDIR/include
-    echo "creating directory $NSPRDIR/include/private"
-    mkdir $NSPRDIR/include/private
-    echo "creating directory $NSPRDIR/include/obsolete"
-    mkdir $NSPRDIR/include/obsolete
-
-    # copy headers and adjust unix line-end to Windows line-end
-    # Note: Watch out for the "sed" command line.
-    # when editing the command, take care to preserve the "^M" as the literal
-    # cntl-M character! in vi, use "cntl-v cntl-m" to enter it!
-    #
-    headers=`ls $FROMTOP/$OBJDIR/include/*.h`
-    for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/`basename $header`
-    done
-    headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h`
-    for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/obsolete/`basename $header`
-    done
-    headers=`ls $FROMTOP/$OBJDIR/include/private/*.h`
-    for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/private/`basename $header`
-    done
-
-    echo "copying $FROMTOP/$OBJDIR/lib"
-    cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/bin"
-    cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR
-
-    echo "creating directory $TOTOP/$OBJDIR"
-    mkdir $TOTOP/$OBJDIR
-    echo "creating $TOTOP/$OBJDIR/$NSPRDIR.zip"
-    zip -r $TOTOP/$OBJDIR/$NSPRDIR.zip $NSPRDIR
-done
-
-#
-# package the source from CVS
-#
-echo "Packaging source"
-echo "removing directory $NSPRDIR"
-rm -rf $NSPRDIR
-echo "creating directory $NSPRDIR"
-mkdir $NSPRDIR
-myWD=`pwd`
-cd $NSPRDIR
-echo "Pulling source from CVS with tag $SOURCETAG"
-cvs co -r $SOURCETAG mozilla/nsprpub
-cd $myWD
-mkdir $TOTOP/src
-echo "Creating source tar file: $TOTOP/src/$NSPRDIR.tar"
-tar cvf $TOTOP/src/$NSPRDIR.tar $NSPRDIR
-echo "gzip $TOTOP/src/$NSPRDIR.tar"
-gzip $TOTOP/src/$NSPRDIR.tar
-
-#
-# Remove the working directory.
-#
-echo "removing directory $NSPRDIR"
-rm -rf $NSPRDIR
-# --- end repackage.sh ---------------------------------------------
diff --git a/libs/js/nsprpub/admin/symlinks.sh b/libs/js/nsprpub/admin/symlinks.sh
deleted file mode 100755
index f90582e2d3..0000000000
--- a/libs/js/nsprpub/admin/symlinks.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# -----------------------------------------------------------------
-# symlinks.sh -- create links from NSPR builds
-#
-# syntax: symlinks.sh
-# 
-# Description:
-# symlinks.sh creates some symbolic links for NSPR build targets
-# that are not actually build, but for which there are NSPR
-# binaries suitable for running on the intended target. ... got
-# that?
-# 
-# Suggested use: After copying NSPR binaries to
-# /s/b/c/nspr20/<platform> run symlinks.sh to create the links
-# for all supported platforms.
-#
-# The symlinks in this script correspond to the NSPR 4.1.1
-# release. Adjust as necessary.
-#
-# -----------------------------------------------------------------
-
-ln -s SunOS5.6_DBG.OBJ SunOS5.7_DBG.OBJ
-ln -s SunOS5.6_OPT.OBJ SunOS5.7_OPT.OBJ
-
-ln -s SunOS5.6_DBG.OBJ SunOS5.8_DBG.OBJ
-ln -s SunOS5.6_OPT.OBJ SunOS5.8_OPT.OBJ
-
-ln -s SunOS5.7_64_DBG.OBJ SunOS5.8_64_DBG.OBJ
-ln -s SunOS5.7_64_OPT.OBJ SunOS5.8_64_OPT.OBJ
-
-ln -s OSF1V4.0D_DBG.OBJ OSF1V5.0_DBG.OBJ
-ln -s OSF1V4.0D_OPT.OBJ OSF1V5.0_OPT.OBJ
-
-ln -s WINNT4.0_DBG.OBJ WINNT5.0_DBG.OBJ
-ln -s WINNT4.0_DBG.OBJD WINNT5.0_DBG.OBJD
-ln -s WINNT4.0_OPT.OBJ WINNT5.0_OPT.OBJ
-# --- end symlinks.sh ---------------------------------------------
-
diff --git a/libs/js/nsprpub/build/autoconf/.empty b/libs/js/nsprpub/build/autoconf/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/build/cygwin-wrapper b/libs/js/nsprpub/build/cygwin-wrapper
deleted file mode 100755
index 679f0a1100..0000000000
--- a/libs/js/nsprpub/build/cygwin-wrapper
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Stupid wrapper to avoid win32 dospath/cygdrive issues
-# Try not to spawn programs from within this file. If the stuff in here looks royally 
-# confusing, see bug: http://bugzilla.mozilla.org/show_bug.cgi?id=206643
-# and look at the older versions of this file that are easier to read, but
-# do basically the same thing
-#
-
-prog=$1
-shift
-if test -z "$prog"; then
-    exit 0
-fi
-
-# If $CYGDRIVE_MOUNT was not set in configure, give $mountpoint the results of mount -p
-mountpoint=$CYGDRIVE_MOUNT
-if test -z "$mountpoint"; then
-    mountpoint=`mount -p`
-    if test -z "$mountpoint"; then
-       print "Cannot determine cygwin mount points. Exiting"
-       exit 1
-    fi
-fi
-
-# Delete everything but "/cygdrive" (or other mountpoint) from mount=`mount -p`
-mountpoint=${mountpoint#*/}
-mountpoint=/${mountpoint%%[!A-Za-z0-9_]*}
-mountpoint=${mountpoint%/}
-
-args=""
-up=""
-if test "${prog}" = "-up"; then
-    up=1
-    prog=${1}
-    shift
-fi
-
-process=1
-
-# Convert the mountpoint in parameters to Win32 filenames
-# For instance: /cygdrive/c/foo -> c:/foo
-for i in "${@}"
-do
-    if test "${i}" = "-wrap"; then
-        process=1
-    else
-        if test "${i}" = "-nowrap"; then
-            process=
-        else
-            if test -n "${process}"; then
-                if test -n "${up}"; then
-                    pathname=${i#-I[a-zA-Z]:/}
-                    if ! test "${pathname}" = "${i}"; then
-                        no_i=${i#-I}
-                        driveletter=${no_i%%:*}
-                        i=-I${mountpoint}/${driveletter}/${pathname}
-                    fi
-                else
-                    eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
-                    if ! test "${leader}" = "${i}"; then
-                        eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
-                        eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
-                        driveletter=${no_mountpoint%%/*}
-                        i=${leader}${driveletter}:/${pathname}
-                    fi
-                fi
-            fi
-
-            args="${args} ${i}"
-        fi
-    fi
-done
-
-exec $prog $args
diff --git a/libs/js/nsprpub/config/.cvsignore b/libs/js/nsprpub/config/.cvsignore
deleted file mode 100644
index bb3ee4bcc9..0000000000
--- a/libs/js/nsprpub/config/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-nfspwd
-revdepth
-my_config.mk
-my_overrides.mk
-autoconf.mk
-nsprincl.mk
-nsprincl.sh
-now
-Makefile
-nsinstall
-nspr-config
diff --git a/libs/js/nsprpub/config/Makefile.in b/libs/js/nsprpub/config/Makefile.in
deleted file mode 100644
index ee7a5d67ea..0000000000
--- a/libs/js/nsprpub/config/Makefile.in
+++ /dev/null
@@ -1,160 +0,0 @@
-#! gmake
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-# Indicate that this directory builds build tools.
-INTERNAL_TOOLS	= 1
-
-# For sanity's sake, we compile nsinstall without the wrapped system
-# headers, so that we can use it to set up the wrapped system headers.
-VISIBILITY_FLAGS =
-
-# autoconf.mk must be deleted last (from the top-level directory)
-# because it is included by every makefile.
-DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
-
-RELEASE_BINS	= nspr-config
-
-include $(topsrcdir)/config/config.mk
-
-CSRCS	= now.c
-
-# This version hasn't been ported for us; the one in mozilla/config has
-ifneq ($(OS_ARCH),OS2)
-CSRCS  += nsinstall.c
- 
-PLSRCS	= nfspwd.pl
-endif
-
-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-# Temporary workaround to disable the generation of
-# library build time because now.c uses the 'long long'
-# data type that's not available on some platforms.
-ifeq (,$(filter-out NEC NEXTSTEP QNX SCOOS UNIXWARE,$(OS_ARCH)))
-DEFINES += -DOMIT_LIB_BUILD_TIME
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-    ifeq ($(basename $(OS_RELEASE)),6)
-        ifndef NS_USE_GCC
-            ifeq ($(USE_N32),1)
-                XLDOPTS += -n32 -Wl,-woff,85
-            else
-                ifeq ($(USE_64),1)
-                    XLDOPTS += -64
-                else
-                    XLDOPTS += -32
-                endif
-            endif
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-    ifeq ($(USE_64),1)
-        XLDOPTS += +DD64
-    endif
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),EMX)
-XCFLAGS = $(OS_CFLAGS)
-ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
-XLDOPTS = -Zlinker /PM:VIO
-endif
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),PGCC)
-XCFLAGS = $(OS_CFLAGS)
-XLDOPTS = -Zlinker /PM:VIO
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
-
-ifeq (,$(CROSS_COMPILE)$(filter-out OS2 WINNT,$(OS_ARCH)))
-TARGETS = $(PROGS)
-else
-PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
-TARGETS = $(PROGS) $(PLSRCS:.pl=)
-endif
-
-OUTOPTION = -o # end of the line
-ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
-ifndef NS_USE_GCC
-OUTOPTION = -Fe
-endif
-endif
-
-# Redefine MAKE_OBJDIR for just this directory
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
-endef
-
-export:: $(TARGETS)
-	rm -f $(dist_bindir)/nspr-config
-
-ifdef WRAP_SYSTEM_INCLUDES
-export::
-	if test ! -d system_wrappers; then mkdir system_wrappers; fi
-	$(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers < $(srcdir)/system-headers
-	$(INSTALL) system_wrappers $(dist_includedir)
-endif
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LD) $(EXEFLAGS) $<
-else
-	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
-endif
-
-install:: nspr.m4
-#	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
-#	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
diff --git a/libs/js/nsprpub/config/autoconf.mk.in b/libs/js/nsprpub/config/autoconf.mk.in
deleted file mode 100644
index 687adbc7c8..0000000000
--- a/libs/js/nsprpub/config/autoconf.mk.in
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- Mode: Makefile -*-
-
-INCLUDED_AUTOCONF_MK = 1
-USE_AUTOCONF	= 1
-@SHELL_OVERRIDE@
-MOZILLA_CLIENT	= @MOZILLA_CLIENT@
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-bindir		= @bindir@
-includedir	= @includedir@
-libdir		= @libdir@
-datadir		= @datadir@
-
-dist_prefix	= @dist_prefix@
-dist_bindir	= @dist_bindir@
-dist_includedir = @dist_includedir@
-dist_libdir	= @dist_libdir@
-
-DIST		= $(dist_prefix)
-
-RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
-OBJDIR_NAME	= @OBJDIR_NAME@
-OBJDIR		= @OBJDIR@
-OBJ_SUFFIX	= @OBJ_SUFFIX@
-LIB_SUFFIX	= @LIB_SUFFIX@
-DLL_SUFFIX	= @DLL_SUFFIX@
-ASM_SUFFIX	= @ASM_SUFFIX@
-MOD_NAME	= @NSPR_MODNAME@
-
-MOD_MAJOR_VERSION = @MOD_MAJOR_VERSION@
-MOD_MINOR_VERSION = @MOD_MINOR_VERSION@
-MOD_PATCH_VERSION = @MOD_PATCH_VERSION@
-
-LIBNSPR		= @LIBNSPR@
-LIBPLC		= @LIBPLC@
-
-CROSS_COMPILE	= @CROSS_COMPILE@
-BUILD_OPT	= @MOZ_OPTIMIZE@
-
-USE_CPLUS	= @USE_CPLUS@
-USE_IPV6	= @USE_IPV6@
-USE_N32		= @USE_N32@
-USE_64		= @USE_64@
-GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@
-ENABLE_STRIP	= @ENABLE_STRIP@
-
-USE_PTHREADS	= @USE_PTHREADS@
-USE_BTHREADS	= @USE_BTHREADS@
-PTHREADS_USER	= @USE_USER_PTHREADS@
-CLASSIC_NSPR	= @USE_NSPR_THREADS@
-
-AS		= @AS@
-ASFLAGS		= @ASFLAGS@
-CC		= @CC@
-CCC		= @CXX@
-NS_USE_GCC	= @GNU_CC@
-GCC_USE_GNU_LD	= @GCC_USE_GNU_LD@
-MSC_VER		= @MSC_VER@
-AR		= @AR@
-AR_FLAGS	= @AR_FLAGS@
-LD		= @LD@
-RANLIB		= @RANLIB@
-PERL		= @PERL@
-RC		= @RC@
-RCFLAGS		= @RCFLAGS@
-STRIP		= @STRIP@
-NSINSTALL	= @NSINSTALL@
-FILTER		= @FILTER@
-IMPLIB		= @IMPLIB@
-CYGWIN_WRAPPER	= @CYGWIN_WRAPPER@
-
-OS_CPPFLAGS	= @CPPFLAGS@
-OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@ $(DSO_CFLAGS)
-OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@ $(DSO_CFLAGS)
-OS_LIBS         = @OS_LIBS@
-OS_LDFLAGS	= @LDFLAGS@
-OS_DLLFLAGS	= @OS_DLLFLAGS@
-DLLFLAGS	= @DLLFLAGS@
-EXEFLAGS  = @EXEFLAGS@
-OPTIMIZER	= @OPTIMIZER@
-
-MKSHLIB		= @MKSHLIB@
-DSO_CFLAGS	= @DSO_CFLAGS@
-DSO_LDOPTS	= @DSO_LDOPTS@
-
-RESOLVE_LINK_SYMBOLS = @RESOLVE_LINK_SYMBOLS@
-
-HOST_CC		= @HOST_CC@
-HOST_CFLAGS	= @HOST_CFLAGS@
-HOST_LDFLAGS	= @HOST_LDFLAGS@
-
-DEFINES		= @DEFINES@ @DEFS@
-
-MDCPUCFG_H	= @MDCPUCFG_H@
-PR_MD_CSRCS	= @PR_MD_CSRCS@
-PR_MD_ASFILES	= @PR_MD_ASFILES@
-PR_MD_ARCH_DIR	= @PR_MD_ARCH_DIR@
-CPU_ARCH	= @CPU_ARCH@
-
-OS_TARGET	= @OS_TARGET@
-OS_ARCH		= @OS_ARCH@
-OS_RELEASE	= @OS_RELEASE@
-OS_TEST		= @OS_TEST@
-
-NOSUCHFILE	= @NOSUCHFILE@
-AIX_LINK_OPTS	= @AIX_LINK_OPTS@
-MOZ_OBJFORMAT	= @MOZ_OBJFORMAT@
-ULTRASPARC_LIBRARY = @ULTRASPARC_LIBRARY@
-
-OBJECT_MODE	= @OBJECT_MODE@
-ifdef OBJECT_MODE
-export OBJECT_MODE
-endif
-
-VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
-WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@
-
-MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
-ifdef MACOSX_DEPLOYMENT_TARGET
-export MACOSX_DEPLOYMENT_TARGET
-endif
-
-MACOS_SDK_DIR	= @MACOS_SDK_DIR@
-
-NEXT_ROOT	= @NEXT_ROOT@
-ifdef NEXT_ROOT
-export NEXT_ROOT
-endif
diff --git a/libs/js/nsprpub/config/config.mk b/libs/js/nsprpub/config/config.mk
deleted file mode 100644
index 10ebfdab13..0000000000
--- a/libs/js/nsprpub/config/config.mk
+++ /dev/null
@@ -1,164 +0,0 @@
-#! gmake
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# Configuration information for building in the NSPR source module
-
-# Define an include-at-most-once-flag
-NSPR_CONFIG_MK	= 1
-
-#
-# The variable definitions in this file are inputs to NSPR's
-# build system.  This file, if present, is included at the
-# beginning of config.mk.
-#
-# For example:
-#
-# BUILD_OPT=1
-# USE_PTHREADS=1
-# NS_USE_GCC=
-#
-ifndef topsrcdir
-topsrcdir=$(MOD_DEPTH)
-endif
-
-ifndef srcdir
-srcdir=.
-endif
-
-NFSPWD		= $(MOD_DEPTH)/config/nfspwd
-
-CFLAGS		= $(VISIBILITY_FLAGS) $(CC_ONLY_FLAGS) $(OPTIMIZER)\
-		  $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-CCCFLAGS	= $(VISIBILITY_FLAGS) $(CCC_ONLY_FLAGS) $(OPTIMIZER)\
-		  $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-# For purify
-NOMD_CFLAGS	= $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
-		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-NOMD_CCFLAGS	= $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
-		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
-LDFLAGS		= $(OS_LDFLAGS)
-
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
-endef
-
-LINK_DLL	= $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
-
-ifeq ($(OS_ARCH),Darwin)
-PWD := $(shell pwd)
-endif
-
-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
-INSTALL		= $(NSINSTALL)
-else
-ifeq ($(NSDISTMODE),copy)
-# copy files, but preserve source mtime
-INSTALL		= $(NSINSTALL) -t
-else
-ifeq ($(NSDISTMODE),absolute_symlink)
-# install using absolute symbolic links
-ifeq ($(OS_ARCH),Darwin)
-INSTALL		= $(NSINSTALL) -L $(PWD)
-else
-INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
-endif
-else
-# install using relative symbolic links
-INSTALL		= $(NSINSTALL) -R
-endif
-endif
-endif # (WINNT || OS2) && !CROSS_COMPILE
-
-DEPENDENCIES	= $(OBJDIR)/.md
-
-ifdef BUILD_DEBUG_GC
-DEFINES		+= -DDEBUG_GC
-endif
-
-GARBAGE		+= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
-
-DIST_GARBAGE += Makefile
-
-####################################################################
-#
-# The NSPR-specific configuration
-#
-####################################################################
-
-DEFINES += -DFORCE_PR_LOG
-
-ifeq ($(_PR_NO_CLOCK_TIMER),1)
-DEFINES += -D_PR_NO_CLOCK_TIMER
-endif
-
-ifeq ($(USE_PTHREADS), 1)
-DEFINES += -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM
-endif
-
-ifeq ($(PTHREADS_USER), 1)
-DEFINES += -DPTHREADS_USER -UHAVE_CVAR_BUILT_ON_SEM
-endif
-
-ifeq ($(USE_IPV6),1)
-DEFINES += -D_PR_INET6
-endif
-
-ifeq ($(MOZ_UNICODE),1)
-DEFINES += -DMOZ_UNICODE
-endif
-
-####################################################################
-#
-# Configuration for the release process
-#
-####################################################################
-
-MDIST = /m/dist
-ifeq ($(OS_ARCH),WINNT)
-MDIST = //helium/dist
-MDIST_DOS = $(subst /,\\,$(MDIST))
-endif
-
-# RELEASE_DIR is ns/dist/<module name>
-
-RELEASE_DIR = $(MOD_DEPTH)/dist/release/$(MOD_NAME)
-
-RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
-RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
-RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
diff --git a/libs/js/nsprpub/config/gcc_hidden.h b/libs/js/nsprpub/config/gcc_hidden.h
deleted file mode 100644
index 58140c1572..0000000000
--- a/libs/js/nsprpub/config/gcc_hidden.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Begin all files as hidden visibility */
-#pragma GCC visibility push(hidden)
diff --git a/libs/js/nsprpub/config/libc_r.h b/libs/js/nsprpub/config/libc_r.h
deleted file mode 100644
index 0f66d1270d..0000000000
--- a/libs/js/nsprpub/config/libc_r.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* libc_r.h  --  macros, defines, etc. to make using reentrant libc calls */
-/*               a bit easier.  This was initially done for AIX pthreads, */
-/*               but should be usable for anyone...                       */
-
-/* Most of these use locally defined space instead of static library space. */
-/* Because of this, we use the _INIT_R to declare/allocate space (stack),   */
-/* and the plain routines to actually do it..._WARNING_: avoid allocating   */
-/* memory wherever possible.  Memory allocation is fairly expensive, at     */
-/* least on AIX...use arrays instead (which allocate from the stack.)       */
-/* I know the names are a bit strange, but I wanted to be fairly certain    */
-/* that we didn't have any namespace corruption...in general, the inits are */
-/* R_<name>_INIT_R(), and the actual calls are R_<name>_R().                */
-
-#ifndef _LIBC_R_H
-#define _LIBC_R_H
-
-/************/
-/*  strtok  */
-/************/
-#define R_STRTOK_INIT_R() \
-    char *r_strtok_r=NULL
-
-#define R_STRTOK_R(return,source,delim) \     
-    return=strtok_r(source,delim,&r_strtok_r)
-
-#define R_STRTOK_NORET_R(source,delim) \
-    strtok_r(source,delim,&r_strtok_r)
-
-/**************/
-/*  strerror  */
-/**************/
-#define R_MAX_STRERROR_LEN_R 8192     /* Straight from limits.h */
-
-#define R_STRERROR_INIT_R() \
-    char r_strerror_r[R_MAX_STRERROR_LEN_R]
-
-#define R_STRERROR_R(val) \
-    strerror_r(val,r_strerror_r,R_MAX_STRERROR_LEN_R)
-
-/*****************/
-/*  time things  */
-/*****************/
-#define R_ASCTIME_INIT_R() \
-    char r_asctime_r[26]
-
-#define R_ASCTIME_R(val) \
-    asctime_r(val,r_asctime_r)
-
-#define R_CTIME_INIT_R() \
-    char r_ctime_r[26]
-
-#define R_CTIME_R(val) \
-    ctime_r(val,r_ctime_r)
-
-#define R_GMTIME_INIT_R() \
-    struct tm r_gmtime_r
-
-#define R_GMTIME_R(time) \
-    gmtime_r(time,&r_gmtime_r)
-
-#define R_LOCALTIME_INIT_R() \
-   struct tm r_localtime_r
-
-#define R_LOCALTIME_R(val) \
-   localtime_r(val,&r_localtime_r)
-    
-/***********/
-/*  crypt  */
-/***********/
-#include <crypt.h>
-#define R_CRYPT_INIT_R() \
-    CRYPTD r_cryptd_r; \
-    bzero(&r_cryptd_r,sizeof(CRYPTD)) 
-
-#define R_CRYPT_R(pass,salt) \
-    crypt_r(pass,salt,&r_cryptd_r)
-
-/**************/
-/*  pw stuff  */
-/**************/
-#define R_MAX_PW_LEN_R 1024
-/* The following must be after the last declaration, but */
-/* before the first bit of code...                       */
-#define R_GETPWNAM_INIT_R(pw_ptr) \
-    struct passwd r_getpwnam_pw_r; \
-    char r_getpwnam_line_r[R_MAX_PW_LEN_R]; \
-    pw_ptr = &r_getpwnam_pw_r
-
-#define R_GETPWNAM_R(name) \
-    getpwnam_r(name,&r_getpwnam_pw_r,r_getpwnam_line_r,R_MAX_PW_LEN_R)
-
-/*******************/
-/*  gethost stuff  */
-/*******************/
-#define R_GETHOSTBYADDR_INIT_R() \
-    struct hostent r_gethostbyaddr_r; \
-    struct hostent_data r_gethostbyaddr_data_r
-
-#define R_GETHOSTBYADDR_R(addr,len,type,xptr_ent) \
-    bzero(&r_gethostbyaddr_r,sizeof(struct hostent)); \
-    bzero(&r_gethostbyaddr_data_r,sizeof(struct hostent_data)); \
-    xptr_ent = &r_gethostbyaddr_r; \
-    if (gethostbyaddr_r(addr,len,type, \
-       &r_gethostbyaddr_r,&r_gethostbyaddr_data_r) == -1) { \
-           xptr_ent = NULL; \
-    }
-
-#define R_GETHOSTBYNAME_INIT_R() \
-    struct hostent r_gethostbyname_r; \
-    struct hostent_data r_gethostbyname_data_r
-
-#define R_GETHOSTBYNAME_R(name,xptr_ent) \
-    bzero(&r_gethostbyname_r,sizeof(struct hostent)); \
-    bzero(&r_gethostbyname_data_r,sizeof(struct hostent_data)); \
-    xptr_ent = &r_gethostbyname_r; \
-    if (gethostbyname_r(name, \
-       &r_gethostbyname_r,&r_gethostbyname_data_r) == -1) { \
-          xptr_ent = NULL; \
-    }
-
-#endif /* _LIBC_R_H */
diff --git a/libs/js/nsprpub/config/make-system-wrappers.pl b/libs/js/nsprpub/config/make-system-wrappers.pl
deleted file mode 100644
index 31c9af4a55..0000000000
--- a/libs/js/nsprpub/config/make-system-wrappers.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# IBM Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Brian Ryner <bryner@brianryner.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-$output_dir = shift;
-
-while (<STDIN>) {
-    chomp;
-    if (-e "$output_dir/$_") {
-	next;
-    }
-
-    if (/(.*)\/[^\/*]/) {
-	mkdir "$output_dir/$1";
-    }
-
-    open OUT, ">$output_dir/$_";
-    print OUT "#pragma GCC system_header\n";  # suppress include_next warning
-    print OUT "#pragma GCC visibility push(default)\n";
-    print OUT "#include_next \<$_\>\n";
-    print OUT "#pragma GCC visibility pop\n";
-    close OUT;
-}
-
diff --git a/libs/js/nsprpub/config/nfspwd.pl b/libs/js/nsprpub/config/nfspwd.pl
deleted file mode 100644
index 947b822ae5..0000000000
--- a/libs/js/nsprpub/config/nfspwd.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#! perl
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-require "fastcwd.pl";
-
-$_ = &fastcwd;
-if (m@^/[uh]/@o || s@^/tmp_mnt/@/@o) {
-    print("$_\n");
-} elsif ((($user, $rest) = m@^/usr/people/(\w+)/(.*)@o)
-      && readlink("/u/$user") eq "/usr/people/$user") {
-    print("/u/$user/$rest\n");
-} else {
-    chop($host = `hostname`);
-    print("/h/$host$_\n");
-}
diff --git a/libs/js/nsprpub/config/now.c b/libs/js/nsprpub/config/now.c
deleted file mode 100644
index f797ef8441..0000000000
--- a/libs/js/nsprpub/config/now.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(VMS)
-#include <sys/timeb.h>
-#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
-#include <sys/time.h>
-#elif defined(WIN32)
-#include <windows.h>
-#elif defined(XP_OS2_VACPP)
-#include <sys/timeb.h>
-#else
-#error "Architecture not supported"
-#endif
-
-
-int main(int argc, char **argv)
-{
-#if defined(OMIT_LIB_BUILD_TIME)
-    /*
-     * Some platforms don't have any 64-bit integer type
-     * such as 'long long'.  Because we can't use NSPR's
-     * PR_snprintf in this program, it is difficult to
-     * print a static initializer for PRInt64 (a struct).
-     * So we print nothing.  The makefiles that build the
-     * shared libraries will detect the empty output string
-     * of this program and omit the library build time
-     * in PRVersionDescription.
-     */
-#elif defined(VMS)
-    long long now;
-    struct timeb b;
-    ftime(&b);
-    now = b.time;
-    now *= 1000000;
-    now += (1000 * b.millitm);
-    fprintf(stdout, "%Ld", now);
-#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
-    long long now;
-    struct timeval tv;
-#ifdef HAVE_SVID_GETTOD
-    gettimeofday(&tv);
-#else
-    gettimeofday(&tv, NULL);
-#endif
-    now = ((1000000LL) * tv.tv_sec) + (long long)tv.tv_usec;
-#if defined(OSF1)
-    fprintf(stdout, "%ld", now);
-#elif defined(BEOS) && defined(__POWERPC__)
-    fprintf(stdout, "%Ld", now);  /* Metroworks on BeOS PPC */
-#else
-    fprintf(stdout, "%lld", now);
-#endif
-
-#elif defined(WIN32)
-    __int64 now;
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    CopyMemory(&now, &ft, sizeof(now));
-    /*
-     * 116444736000000000 is the number of 100-nanosecond intervals
-     * between Jan. 1, 1601 and Jan. 1, 1970.
-     */
-#ifdef __GNUC__
-    now = (now - 116444736000000000LL) / 10LL;
-    fprintf(stdout, "%lld", now);
-#else
-    now = (now - 116444736000000000i64) / 10i64;
-    fprintf(stdout, "%I64d", now);
-#endif
-
-#elif defined(XP_OS2_VACPP)
-/* no long long or i64 so we use a string */
-#include <string.h>
-  char buf[24];
-  char tbuf[7];
-  time_t now;
-  long mtime;
-  int i;
-
-  struct timeb b;
-  ftime(&b);
-  now = b.time;
-  _ltoa(now, buf, 10);
-
-  mtime = b.millitm * 1000;
-  if (mtime == 0){
-    ++now;
-    strcat(buf, "000000");
-  } else {
-     _ltoa(mtime, tbuf, 10);
-     for (i = strlen(tbuf); i < 6; ++i)
-       strcat(buf, "0");
-     strcat(buf, tbuf);
-  }
-  fprintf(stdout, "%s", buf);
-
-#else
-#error "Architecture not supported"
-#endif
-
-    return 0;
-}  /* main */
-
-/* now.c */
diff --git a/libs/js/nsprpub/config/nsinstall.c b/libs/js/nsprpub/config/nsinstall.c
deleted file mode 100644
index e9f1aebda0..0000000000
--- a/libs/js/nsprpub/config/nsinstall.c
+++ /dev/null
@@ -1,602 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Netscape portable install command.
-**
-** Brendan Eich, 7/20/95
-*/
-#include <stdio.h>  /* OSF/1 requires this before grp.h, so put it first */
-#include <assert.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utime.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdarg.h>
-#ifdef USE_REENTRANT_LIBC
-#include "libc_r.h"
-#endif /* USE_REENTRANT_LIBC */
-
-#include "pathsub.h"
-
-#define HAVE_FCHMOD
-
-#if defined(BEOS)
-#undef HAVE_FCHMOD
-#endif
-
-/*
- * Does getcwd() take NULL as the first argument and malloc
- * the result buffer?
- */
-#if !defined(DARWIN) && !defined(NEXTSTEP) && !defined(VMS)
-#define GETCWD_CAN_MALLOC
-#endif
-
-#ifdef NEXTSTEP
-#include <bsd/libc.h>
-
-/*
-** balazs.pataki@sztaki.hu: The getcwd is broken in NEXTSTEP (returns 0),
-** when called on a mounted fs. Did anyone notice this? Here's an ugly
-** workaround ...
-*/
-#define getcwd(b,s)   my_getcwd(b,s)
-
-static char *
-my_getcwd (char *buf, size_t size)
-{
-    FILE *pwd = popen("pwd", "r");
-    char *result = fgets(buf, size, pwd);
-
-    if (result) {
-        buf[strlen(buf)-1] = '\0';
-    }
-    pclose (pwd);
-    return buf;
-}
-#endif /* NEXTSTEP */
-
-#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) 
-#include <getopt.h>
-#endif
-
-#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(NEXTSTEP)
-#if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(a)	(((a) & S_IFMT) == S_IFLNK)
-#endif
-#endif
-
-#if defined(SNI)
-extern int fchmod(int fildes, mode_t mode);
-#endif
-
-#ifdef QNX
-#define d_ino d_stat.st_ino
-#endif
-
-static void
-usage(void)
-{
-    fprintf(stderr,
-	"usage: %s [-C cwd] [-L linkprefix] [-m mode] [-o owner] [-g group]\n"
-	"       %*s [-DdltR] file [file ...] directory\n",
-	program, (int)strlen(program), "");
-    exit(2);
-}
-
-static int
-mkdirs(char *path, mode_t mode)
-{
-    char *cp;
-    struct stat sb;
-    int res;
-    
-    while (*path == '/' && path[1] == '/')
-	path++;
-    while ((cp = strrchr(path, '/')) && cp[1] == '\0')
-	*cp = '\0';
-    if (cp && cp != path) {
-	*cp = '\0';
-	if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
-	    mkdirs(path, mode) < 0) {
-	    return -1;
-	}
-	*cp = '/';
-    }
-    res = mkdir(path, mode);
-    if ((res != 0) && (errno == EEXIST))
-	return 0;
-     else
-	return res;
-}
-
-static uid_t
-touid(char *owner)
-{
-    struct passwd *pw;
-    uid_t uid;
-    char *cp;
-
-    pw = getpwnam(owner);
-    if (pw)
-	return pw->pw_uid;
-    uid = strtol(owner, &cp, 0);
-    if (uid == 0 && cp == owner)
-	fail("cannot find uid for %s", owner);
-    return uid;
-}
-
-static gid_t
-togid(char *group)
-{
-    struct group *gr;
-    gid_t gid;
-    char *cp;
-
-    gr = getgrnam(group);
-    if (gr)
-	return gr->gr_gid;
-    gid = strtol(group, &cp, 0);
-    if (gid == 0 && cp == group)
-	fail("cannot find gid for %s", group);
-    return gid;
-}
-
-int
-main(int argc, char **argv)
-{
-    int onlydir, dodir, dolink, dorelsymlink, dotimes, opt, len, lplen, tdlen, bnlen, exists, fromfd, tofd, cc, wc;
-    mode_t mode = 0755;
-    char *linkprefix, *owner, *group, *cp, *cwd, *todir, *toname, *name, *base, *linkname, *bp, buf[BUFSIZ];
-    uid_t uid;
-    gid_t gid;
-    struct stat sb, tosb;
-    struct utimbuf utb;
-
-    program = argv[0];
-    cwd = linkname = linkprefix = owner = group = 0;
-    onlydir = dodir = dolink = dorelsymlink = dotimes = lplen = 0;
-
-    while ((opt = getopt(argc, argv, "C:DdlL:Rm:o:g:t")) != EOF) {
-	switch (opt) {
-	  case 'C':
-	    cwd = optarg;
-	    break;
-	  case 'D':
-	    onlydir = 1;
-	    break;
-	  case 'd':
-	    dodir = 1;
-	    break;
-	  case 'l':
-	    dolink = 1;
-	    break;
-	  case 'L':
-	    linkprefix = optarg;
-	    lplen = strlen(linkprefix);
-	    dolink = 1;
-	    break;
-	  case 'R':
-	    dolink = dorelsymlink = 1;
-	    break;
-	  case 'm':
-	    mode = strtoul(optarg, &cp, 8);
-	    if (mode == 0 && cp == optarg)
-		usage();
-	    break;
-	  case 'o':
-	    owner = optarg;
-	    break;
-	  case 'g':
-	    group = optarg;
-	    break;
-	  case 't':
-	    dotimes = 1;
-	    break;
-	  default:
-	    usage();
-	}
-    }
-
-    argc -= optind;
-    argv += optind;
-    if (argc < 2 - onlydir)
-	usage();
-
-    todir = argv[argc-1];
-    if ((stat(todir, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
-	mkdirs(todir, 0777) < 0) {
-	fail("cannot make directory %s", todir);
-    }
-    if (onlydir)
-	return 0;
-
-    if (!cwd) {
-#ifdef GETCWD_CAN_MALLOC
-	cwd = getcwd(0, PATH_MAX);
-#else
-	cwd = malloc(PATH_MAX + 1);
-	cwd = getcwd(cwd, PATH_MAX);
-#endif
-    }
-    xchdir(todir);
-#ifdef GETCWD_CAN_MALLOC
-    todir = getcwd(0, PATH_MAX);
-#else
-    todir = malloc(PATH_MAX + 1);
-    todir = getcwd(todir, PATH_MAX);
-#endif
-    tdlen = strlen(todir);
-    xchdir(cwd);
-    tdlen = strlen(todir);
-
-    uid = owner ? touid(owner) : -1;
-    gid = group ? togid(group) : -1;
-
-    while (--argc > 0) {
-	name = *argv++;
-	len = strlen(name);
-	base = xbasename(name);
-	bnlen = strlen(base);
-	toname = (char*)xmalloc(tdlen + 1 + bnlen + 1);
-	sprintf(toname, "%s/%s", todir, base);
-	exists = (lstat(toname, &tosb) == 0);
-
-	if (dodir) {
-	    /* -d means create a directory, always */
-	    if (exists && !S_ISDIR(tosb.st_mode)) {
-		(void) unlink(toname);
-		exists = 0;
-	    }
-	    if (!exists && mkdir(toname, mode) < 0)
-		fail("cannot make directory %s", toname);
-	    if ((owner || group) && chown(toname, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
-	} else if (dolink) {
-	    if (*name == '/') {
-		/* source is absolute pathname, link to it directly */
-		linkname = 0;
-	    } else {
-		if (linkprefix) {
-		    /* -L implies -l and prefixes names with a $cwd arg. */
-		    len += lplen + 1;
-		    linkname = (char*)xmalloc(len + 1);
-		    sprintf(linkname, "%s/%s", linkprefix, name);
-		} else if (dorelsymlink) {
-		    /* Symlink the relative path from todir to source name. */
-		    linkname = (char*)xmalloc(PATH_MAX);
-
-		    if (*todir == '/') {
-			/* todir is absolute: skip over common prefix. */
-			lplen = relatepaths(todir, cwd, linkname);
-			strcpy(linkname + lplen, name);
-		    } else {
-			/* todir is named by a relative path: reverse it. */
-			reversepath(todir, name, len, linkname);
-			xchdir(cwd);
-		    }
-
-		    len = strlen(linkname);
-		}
-		name = linkname;
-	    }
-
-	    /* Check for a pre-existing symlink with identical content. */
-	    if (exists &&
-		(!S_ISLNK(tosb.st_mode) ||
-		 readlink(toname, buf, sizeof buf) != len ||
-		 strncmp(buf, name, len) != 0)) {
-		(void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
-		exists = 0;
-	    }
-	    if (!exists && symlink(name, toname) < 0)
-		fail("cannot make symbolic link %s", toname);
-#ifdef HAVE_LCHOWN
-	    if ((owner || group) && lchown(toname, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
-#endif
-
-	    if (linkname) {
-		free(linkname);
-		linkname = 0;
-	    }
-	} else {
-	    /* Copy from name to toname, which might be the same file. */
-	    fromfd = open(name, O_RDONLY);
-	    if (fromfd < 0 || fstat(fromfd, &sb) < 0)
-		fail("cannot access %s", name);
-	    if (exists && (!S_ISREG(tosb.st_mode) || access(toname, W_OK) < 0))
-		(void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
-	    tofd = open(toname, O_CREAT | O_WRONLY, 0666);
-	    if (tofd < 0)
-		fail("cannot create %s", toname);
-
-	    bp = buf;
-	    while ((cc = read(fromfd, bp, sizeof buf)) > 0) {
-		while ((wc = write(tofd, bp, cc)) > 0) {
-		    if ((cc -= wc) == 0)
-			break;
-		    bp += wc;
-		}
-		if (wc < 0)
-		    fail("cannot write to %s", toname);
-	    }
-	    if (cc < 0)
-		fail("cannot read from %s", name);
-
-	    if (ftruncate(tofd, sb.st_size) < 0)
-		fail("cannot truncate %s", toname);
-	    /*
-	    ** On OpenVMS we can't chmod() until the file is closed, and we
-	    ** have to utime() last since fchown/chmod alter the timestamps.
-	    */
-#ifndef VMS
-	    if (dotimes) {
-		utb.actime = sb.st_atime;
-		utb.modtime = sb.st_mtime;
-		if (utime(toname, &utb) < 0)
-		    fail("cannot set times of %s", toname);
-	    }
-#ifdef HAVE_FCHMOD
-	    if (fchmod(tofd, mode) < 0)
-#else
-	    if (chmod(toname, mode) < 0)
-#endif
-		fail("cannot change mode of %s", toname);
-#endif
-	    if ((owner || group) && fchown(tofd, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
-
-	    /* Must check for delayed (NFS) write errors on close. */
-	    if (close(tofd) < 0)
-		fail("cannot write to %s", toname);
-	    close(fromfd);
-#ifdef VMS
-	    if (chmod(toname, mode) < 0)
-		fail("cannot change mode of %s", toname);
-	    if (dotimes) {
-		utb.actime = sb.st_atime;
-		utb.modtime = sb.st_mtime;
-		if (utime(toname, &utb) < 0)
-		    fail("cannot set times of %s", toname);
-	    }
-#endif
-	}
-
-	free(toname);
-    }
-
-    free(cwd);
-    free(todir);
-    return 0;
-}
-
-/*
-** Pathname subroutines.
-**
-** Brendan Eich, 8/29/95
-*/
-
-char *program;
-
-void
-fail(char *format, ...)
-{
-    int error;
-    va_list ap;
-
-#ifdef USE_REENTRANT_LIBC
-    R_STRERROR_INIT_R();
-#endif
-
-    error = errno;
-    fprintf(stderr, "%s: ", program);
-    va_start(ap, format);
-    vfprintf(stderr, format, ap);
-    va_end(ap);
-    if (error)
-
-#ifdef USE_REENTRANT_LIBC
-    R_STRERROR_R(errno);
-	fprintf(stderr, ": %s", r_strerror_r);
-#else
-	fprintf(stderr, ": %s", strerror(errno));
-#endif
-
-    putc('\n', stderr);
-    exit(1);
-}
-
-char *
-getcomponent(char *path, char *name)
-{
-    if (*path == '\0')
-	return 0;
-    if (*path == '/') {
-	*name++ = '/';
-    } else {
-	do {
-	    *name++ = *path++;
-	} while (*path != '/' && *path != '\0');
-    }
-    *name = '\0';
-    while (*path == '/')
-	path++;
-    return path;
-}
-
-#ifdef UNIXWARE_READDIR_BUFFER_TOO_SMALL
-/* Sigh.  The static buffer in Unixware's readdir is too small. */
-struct dirent * readdir(DIR *d)
-{
-        static struct dirent *buf = NULL;
-#define MAX_PATH_LEN 1024
-
-
-        if(buf == NULL)
-                buf = (struct dirent *) malloc(sizeof(struct dirent) + MAX_PATH_LEN)
-;
-        return(readdir_r(d, buf));
-}
-#endif
-
-char *
-ino2name(ino_t ino, char *dir)
-{
-    DIR *dp;
-    struct dirent *ep;
-    char *name;
-
-    dp = opendir("..");
-    if (!dp)
-	fail("cannot read parent directory");
-    for (;;) {
-	if (!(ep = readdir(dp)))
-	    fail("cannot find current directory");
-	if (ep->d_ino == ino)
-	    break;
-    }
-    name = xstrdup(ep->d_name);
-    closedir(dp);
-    return name;
-}
-
-void *
-xmalloc(size_t size)
-{
-    void *p = malloc(size);
-    if (!p)
-	fail("cannot allocate %u bytes", size);
-    return p;
-}
-
-char *
-xstrdup(char *s)
-{
-    return strcpy((char*)xmalloc(strlen(s) + 1), s);
-}
-
-char *
-xbasename(char *path)
-{
-    char *cp;
-
-    while ((cp = strrchr(path, '/')) && cp[1] == '\0')
-	*cp = '\0';
-    if (!cp) return path;
-    return cp + 1;
-}
-
-void
-xchdir(char *dir)
-{
-    if (chdir(dir) < 0)
-	fail("cannot change directory to %s", dir);
-}
-
-int
-relatepaths(char *from, char *to, char *outpath)
-{
-    char *cp, *cp2;
-    int len;
-    char buf[NAME_MAX];
-
-    assert(*from == '/' && *to == '/');
-    for (cp = to, cp2 = from; *cp == *cp2; cp++, cp2++)
-	if (*cp == '\0')
-	    break;
-    while (cp[-1] != '/')
-	cp--, cp2--;
-    if (cp - 1 == to) {
-	/* closest common ancestor is /, so use full pathname */
-	len = strlen(strcpy(outpath, to));
-	if (outpath[len] != '/') {
-	    outpath[len++] = '/';
-	    outpath[len] = '\0';
-	}
-    } else {
-	len = 0;
-	while ((cp2 = getcomponent(cp2, buf)) != 0) {
-	    strcpy(outpath + len, "../");
-	    len += 3;
-	}
-	while ((cp = getcomponent(cp, buf)) != 0) {
-	    sprintf(outpath + len, "%s/", buf);
-	    len += strlen(outpath + len);
-	}
-    }
-    return len;
-}
-
-void
-reversepath(char *inpath, char *name, int len, char *outpath)
-{
-    char *cp, *cp2;
-    char buf[NAME_MAX];
-    struct stat sb;
-
-    cp = strcpy(outpath + PATH_MAX - (len + 1), name);
-    cp2 = inpath;
-    while ((cp2 = getcomponent(cp2, buf)) != 0) {
-	if (strcmp(buf, ".") == 0)
-	    continue;
-	if (strcmp(buf, "..") == 0) {
-	    if (stat(".", &sb) < 0)
-		fail("cannot stat current directory");
-	    name = ino2name(sb.st_ino, "..");
-	    len = strlen(name);
-	    cp -= len + 1;
-	    strcpy(cp, name);
-	    cp[len] = '/';
-	    free(name);
-	    xchdir("..");
-	} else {
-	    cp -= 3;
-	    strncpy(cp, "../", 3);
-	    xchdir(buf);
-	}
-    }
-    strcpy(outpath, cp);
-}
diff --git a/libs/js/nsprpub/config/nspr-config.in b/libs/js/nsprpub/config/nspr-config.in
deleted file mode 100755
index a7d2b4fc39..0000000000
--- a/libs/js/nsprpub/config/nspr-config.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nspr-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Libraries:
-	nspr
-	plc
-	plds
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_nspr=yes
-lib_plc=yes
-lib_plds=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    nspr)
-      lib_nspr=yes
-      ;;
-    plc)
-      lib_plc=yes
-      ;;
-    plds)
-      lib_plds=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=@exec_prefix@
-fi
-if test -z "$includedir"; then
-    includedir=@includedir@
-fi
-if test -z "$libdir"; then
-    libdir=@libdir@
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs=-L$libdir
-      if test -n "$lib_plds"; then
-	libdirs="$libdirs -lplds${major_version}"
-      fi
-      if test -n "$lib_plc"; then
-	libdirs="$libdirs -lplc${major_version}"
-      fi
-      if test -n "$lib_nspr"; then
-	libdirs="$libdirs -lnspr${major_version}"
-      fi
-      os_ldflags="@LDFLAGS@"
-      for i in $os_ldflags ; do
-	if echo $i | grep \^-L >/dev/null; then
-	  libdirs="$libdirs $i"
-        fi
-      done
-      echo $libdirs @OS_LIBS@
-fi      
-
diff --git a/libs/js/nsprpub/config/nspr.m4 b/libs/js/nsprpub/config/nspr.m4
deleted file mode 100644
index 85cfe2c595..0000000000
--- a/libs/js/nsprpub/config/nspr.m4
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- tab-width: 4; -*-
-# Configure paths for NSPR
-# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
-# Based upon gtk.m4 (also PD) by Owen Taylor
-
-dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN([AM_PATH_NSPR],
-[dnl
-
-AC_ARG_WITH(nspr-prefix,
-	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
-	nspr_config_prefix="$withval",
-	nspr_config_prefix="")
-
-AC_ARG_WITH(nspr-exec-prefix,
-	[  --with-nspr-exec-prefix=PFX
-                          Exec prefix where NSPR is installed],
-	nspr_config_exec_prefix="$withval",
-	nspr_config_exec_prefix="")
-
-	if test -n "$nspr_config_exec_prefix"; then
-		nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix"
-		if test -z "$NSPR_CONFIG"; then
-			NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config
-		fi
-	fi
-	if test -n "$nspr_config_prefix"; then
-		nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix"
-		if test -z "$NSPR_CONFIG"; then
-			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
-		fi
-	fi
-
-	unset ac_cv_path_NSPR_CONFIG
-	AC_PATH_PROG(NSPR_CONFIG, nspr-config, no)
-	min_nspr_version=ifelse([$1], ,4.0.0,$1)
-	AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version (skipping))
-
-	no_nspr=""
-	if test "$NSPR_CONFIG" = "no"; then
-		no_nspr="yes"
-	else
-		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
-		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
-
-		dnl Skip version check for now
-		nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	fi
-
-	if test -z "$no_nspr"; then
-		AC_MSG_RESULT(yes)
-		ifelse([$2], , :, [$2])     
-	else
-		AC_MSG_RESULT(no)
-	fi
-
-
-	AC_SUBST(NSPR_CFLAGS)
-	AC_SUBST(NSPR_LIBS)
-
-])
diff --git a/libs/js/nsprpub/config/nsprincl.mk.in b/libs/js/nsprpub/config/nsprincl.mk.in
deleted file mode 100644
index d56cc0248b..0000000000
--- a/libs/js/nsprpub/config/nsprincl.mk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include in Makefiles to define NSPR variables
-
-NSPR_VERSION    = @NSPR_VERSION@
-NSPR_LIB        = -lnspr@NSPR_VERSION@
-NSPR_EXTRA_LIBS = @EXTRA_LIBS@
diff --git a/libs/js/nsprpub/config/nsprincl.sh.in b/libs/js/nsprpub/config/nsprincl.sh.in
deleted file mode 100644
index be4e1450ca..0000000000
--- a/libs/js/nsprpub/config/nsprincl.sh.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include in shell scripts to define NSPR variables
-
-NSPR_VERSION=@NSPR_VERSION@
-NSPR_LIB=-lnspr$NSPR_VERSION
-NSPR_EXTRA_LIBS="@EXTRA_LIBS@"
diff --git a/libs/js/nsprpub/config/pathsub.h b/libs/js/nsprpub/config/pathsub.h
deleted file mode 100644
index bf3fca3131..0000000000
--- a/libs/js/nsprpub/config/pathsub.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef pathsub_h___
-#define pathsub_h___
-/*
-** Pathname subroutines.
-**
-** Brendan Eich, 8/29/95
-*/
-#include <limits.h>
-#include <sys/types.h>
-
-#if SUNOS4
-#include "../pr/include/md/sunos4.h"
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-/*
- * Just prevent stupidity
- */
-#undef NAME_MAX
-#define NAME_MAX 256
-
-extern char *program;
-
-extern void fail(char *format, ...);
-extern char *getcomponent(char *path, char *name);
-extern char *ino2name(ino_t ino, char *dir);
-extern void *xmalloc(size_t size);
-extern char *xstrdup(char *s);
-extern char *xbasename(char *path);
-extern void xchdir(char *dir);
-
-/* Relate absolute pathnames from and to returning the result in outpath. */
-extern int relatepaths(char *from, char *to, char *outpath);
-
-/* XXX changes current working directory -- caveat emptor */
-extern void reversepath(char *inpath, char *name, int len, char *outpath);
-
-#endif /* pathsub_h___ */
diff --git a/libs/js/nsprpub/config/prdepend.h b/libs/js/nsprpub/config/prdepend.h
deleted file mode 100644
index df72c56882..0000000000
--- a/libs/js/nsprpub/config/prdepend.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A dummy header file that is a dependency for all the object files.
- * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
- * depend builds.  See comments in rules.mk.
- */
-
-#error "Do not include this header file."
diff --git a/libs/js/nsprpub/config/prmkdir.bat b/libs/js/nsprpub/config/prmkdir.bat
deleted file mode 100755
index 9bea8553b5..0000000000
--- a/libs/js/nsprpub/config/prmkdir.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-REM 
-REM ***** BEGIN LICENSE BLOCK *****
-REM Version: MPL 1.1/GPL 2.0/LGPL 2.1
-REM
-REM The contents of this file are subject to the Mozilla Public License Version
-REM 1.1 (the "License"); you may not use this file except in compliance with
-REM the License. You may obtain a copy of the License at
-REM http://www.mozilla.org/MPL/
-REM
-REM Software distributed under the License is distributed on an "AS IS" basis,
-REM WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-REM for the specific language governing rights and limitations under the
-REM License.
-REM
-REM The Original Code is the Netscape Portable Runtime (NSPR).
-REM
-REM The Initial Developer of the Original Code is
-REM Netscape Communications Corporation.
-REM Portions created by the Initial Developer are Copyright (C) 1998-2000
-REM the Initial Developer. All Rights Reserved.
-REM
-REM Contributor(s):
-REM
-REM Alternatively, the contents of this file may be used under the terms of
-REM either the GNU General Public License Version 2 or later (the "GPL"), or
-REM the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-REM in which case the provisions of the GPL or the LGPL are applicable instead
-REM of those above. If you wish to allow use of your version of this file only
-REM under the terms of either the GPL or the LGPL, and not to allow others to
-REM use your version of this file under the terms of the MPL, indicate your
-REM decision by deleting the provisions above and replace them with the notice
-REM and other provisions required by the GPL or the LGPL. If you do not delete
-REM the provisions above, a recipient may use your version of this file under
-REM the terms of any one of the MPL, the GPL or the LGPL.
-REM
-REM ***** END LICENSE BLOCK *****
-
-mkdir %1
diff --git a/libs/js/nsprpub/config/rules.mk b/libs/js/nsprpub/config/rules.mk
deleted file mode 100644
index be5374dfc8..0000000000
--- a/libs/js/nsprpub/config/rules.mk
+++ /dev/null
@@ -1,515 +0,0 @@
-#! gmake
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-################################################################################
-# We used to have a 4 pass build process.  Now we do everything in one pass.
-#
-# export - Create generated headers and stubs. Publish public headers to
-#          dist/<arch>/include.
-#          Create libraries. Publish libraries to dist/<arch>/lib.
-#          Create programs. 
-#
-# libs - obsolete.  Now a synonym of "export".
-#
-# all - the default makefile target.  Now a synonym of "export".
-#
-# install - Install headers, libraries, and programs on the system.
-#
-# Parameters to this makefile (set these before including):
-#
-# a)
-#	TARGETS	-- the target to create 
-#			(defaults to $LIBRARY $PROGRAM)
-# b)
-#	DIRS	-- subdirectories for make to recurse on
-#			(the 'all' rule builds $TARGETS $DIRS)
-# c)
-#	CSRCS   -- .c files to compile
-#			(used to define $OBJS)
-# d)
-#	PROGRAM	-- the target program name to create from $OBJS
-#			($OBJDIR automatically prepended to it)
-# e)
-#	LIBRARY	-- the target library name to create from $OBJS
-#			($OBJDIR automatically prepended to it)
-#
-################################################################################
-
-ifndef topsrcdir
-topsrcdir=$(MOD_DEPTH)
-endif
-
-ifndef srcdir
-srcdir=.
-endif
-
-ifndef NSPR_CONFIG_MK
-include $(topsrcdir)/config/config.mk
-endif
-
-ifdef USE_AUTOCONF
-ifdef CROSS_COMPILE
-ifdef INTERNAL_TOOLS
-CC=$(HOST_CC)
-CCC=$(HOST_CXX)
-CFLAGS=$(HOST_CFLAGS)
-CXXFLAGS=$(HOST_CXXFLAGS)
-LDFLAGS=$(HOST_LDFLAGS)
-endif
-endif
-endif
-
-#
-# This makefile contains rules for building the following kinds of
-# libraries:
-# - LIBRARY: a static (archival) library
-# - SHARED_LIBRARY: a shared (dynamic link) library
-# - IMPORT_LIBRARY: an import library, used only on Windows and OS/2
-#
-# The names of these libraries can be generated by simply specifying
-# LIBRARY_NAME and LIBRARY_VERSION.
-#
-
-ifdef LIBRARY_NAME
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-
-#
-# Win95, Win16, and OS/2 require library names conforming to the 8.3 rule.
-# other platforms do not.
-#
-ifeq (,$(filter-out WIN95 OS2,$(OS_TARGET)))
-LIBRARY		= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
-SHARED_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-SHARED_LIB_PDB	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
-else
-LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
-SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-IMPORT_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-SHARED_LIB_PDB	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
-endif
-
-else
-
-LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
-SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a
-else
-ifdef MKSHLIB
-SHARED_LIBRARY	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-endif
-endif
-
-endif
-endif
-
-ifndef TARGETS
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-TARGETS		= $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-ifndef BUILD_OPT
-ifdef MSC_VER
-ifneq (,$(filter-out 1100 1200,$(MSC_VER)))
-TARGETS		+= $(SHARED_LIB_PDB)
-endif
-endif
-endif
-else
-TARGETS		= $(LIBRARY) $(SHARED_LIBRARY)
-endif
-endif
-
-#
-# OBJS is the list of object files.  It can be constructed by
-# specifying CSRCS (list of C source files) and ASFILES (list
-# of assembly language source files).
-#
-
-ifndef OBJS
-OBJS		= $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \
-		  $(addprefix $(OBJDIR)/,$(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX)))
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-EXTRA_LIBS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_LIBS))
-endif
-
-ALL_TRASH		= $(TARGETS) $(OBJS) $(RES) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
-			  $(NOSUCHFILE) \
-			  so_locations
-
-ifeq ($(OS_ARCH),OpenVMS)
-ALL_TRASH		+= $(wildcard *.c*_defines)
-ifdef SHARED_LIBRARY
-VMS_SYMVEC_FILE		= $(SHARED_LIBRARY:.$(DLL_SUFFIX)=_symvec.opt)
-VMS_SYMVEC_FILE_MODULE	= $(srcdir)/$(LIBRARY_NAME)_symvec.opt
-ALL_TRASH		+= $(VMS_SYMVEC_FILE)
-endif
-endif
-
-ifndef RELEASE_LIBS_DEST
-RELEASE_LIBS_DEST	= $(RELEASE_LIB_DIR)
-endif
-
-ifdef DIRS
-LOOP_OVER_DIRS		=					\
-	@for d in $(DIRS); do					\
-		if test -d $$d; then				\
-			set -e;					\
-			echo "cd $$d; $(MAKE) $@";		\
-			$(MAKE) -C $$d $@;			\
-			set +e;					\
-		else						\
-			echo "Skipping non-directory $$d...";	\
-		fi;						\
-	done
-endif
-
-################################################################################
-
-all:: export
-
-export::
-	+$(LOOP_OVER_DIRS)
-
-libs:: export
-
-clean::
-	rm -rf $(OBJS) $(RES) so_locations $(NOSUCHFILE) $(GARBAGE)
-	+$(LOOP_OVER_DIRS)
-
-clobber::
-	rm -rf $(OBJS) $(RES) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
-	+$(LOOP_OVER_DIRS)
-
-realclean clobber_all::
-	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH)
-	+$(LOOP_OVER_DIRS)
-
-distclean::
-	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
-	+$(LOOP_OVER_DIRS)
-
-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-#ifdef RELEASE_BINS
-#	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
-#endif
-#ifdef RELEASE_HEADERS
-#	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
-#endif
-ifdef RELEASE_LIBS
-	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
-endif
-	+$(LOOP_OVER_DIRS)
-
-release:: export
-ifdef RELEASE_BINS
-	@echo "Copying executable programs and scripts to release directory"
-	@if test -z "$(BUILD_NUMBER)"; then \
-		echo "BUILD_NUMBER must be defined"; \
-		false; \
-	else \
-		true; \
-	fi
-	@if test ! -d $(RELEASE_BIN_DIR); then \
-		rm -rf $(RELEASE_BIN_DIR); \
-		$(NSINSTALL) -D $(RELEASE_BIN_DIR);\
-	else \
-		true; \
-	fi
-	cp $(RELEASE_BINS) $(RELEASE_BIN_DIR)
-endif
-ifdef RELEASE_LIBS
-	@echo "Copying libraries to release directory"
-	@if test -z "$(BUILD_NUMBER)"; then \
-		echo "BUILD_NUMBER must be defined"; \
-		false; \
-	else \
-		true; \
-	fi
-	@if test ! -d $(RELEASE_LIBS_DEST); then \
-		rm -rf $(RELEASE_LIBS_DEST); \
-		$(NSINSTALL) -D $(RELEASE_LIBS_DEST);\
-	else \
-		true; \
-	fi
-	cp $(RELEASE_LIBS) $(RELEASE_LIBS_DEST)
-endif
-ifdef RELEASE_HEADERS
-	@echo "Copying header files to release directory"
-	@if test -z "$(BUILD_NUMBER)"; then \
-		echo "BUILD_NUMBER must be defined"; \
-		false; \
-	else \
-		true; \
-	fi
-	@if test ! -d $(RELEASE_HEADERS_DEST); then \
-		rm -rf $(RELEASE_HEADERS_DEST); \
-		$(NSINSTALL) -D $(RELEASE_HEADERS_DEST);\
-	else \
-		true; \
-	fi
-	cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
-endif
-	+$(LOOP_OVER_DIRS)
-
-alltags:
-	rm -f TAGS tags
-	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs etags -a
-	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs ctags -a
-
-$(NFSPWD):
-	cd $(@D); $(MAKE) $(@F)
-
-$(PROGRAM): $(OBJS)
-	@$(MAKE_OBJDIR)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
-else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(CC) $(OBJS) -Fe$@ $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
-else
-	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
-endif
-endif
-ifdef ENABLE_STRIP
-	$(STRIP) $@
-endif
-
-$(LIBRARY): $(OBJS)
-	@$(MAKE_OBJDIR)
-	rm -f $@
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(AR) $(subst /,\\,$(OBJS)) $(AR_FLAGS)
-else
-	$(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS)
-endif
-	$(RANLIB) $@
-
-ifeq ($(OS_TARGET), OS2)
-$(IMPORT_LIBRARY): $(MAPFILE)
-	rm -f $@
-	$(IMPLIB) $@ $(MAPFILE)
-endif
-
-$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE)
-	@$(MAKE_OBJDIR)
-	rm -f $@
-ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
-	echo "#!" > $(OBJDIR)/lib$(LIBRARY_NAME)_syms
-	nm -B -C -g $(OBJS) \
-		| awk '/ [T,D] / {print $$3}' \
-		| sed -e 's/^\.//' \
-		| sort -u >> $(OBJDIR)/lib$(LIBRARY_NAME)_syms
-	$(LD) $(XCFLAGS) -o $@ $(OBJS) -bE:$(OBJDIR)/lib$(LIBRARY_NAME)_syms \
-		-bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS)
-else	# AIX 4.1
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(LINK_DLL) -MAP $(DLLBASE) $(DLL_LIBS) $(EXTRA_LIBS) $(OBJS) $(RES)
-else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LINK_DLL) $(DLLBASE) $(OBJS) $(OS_LIBS) $(EXTRA_LIBS) $(MAPFILE)
-else	# !os2 vacpp
-ifeq ($(OS_TARGET), OpenVMS)
-	@if test ! -f $(VMS_SYMVEC_FILE); then \
-	  if test -f $(VMS_SYMVEC_FILE_MODULE); then \
-	    echo Creating component options file $(VMS_SYMVEC_FILE); \
-	    cp $(VMS_SYMVEC_FILE_MODULE) $(VMS_SYMVEC_FILE); \
-	  fi; \
-	fi
-endif	# OpenVMS
-	$(MKSHLIB) $(OBJS) $(RES) $(EXTRA_LIBS)
-endif   # OS2 vacpp
-endif	# WINNT
-endif	# AIX 4.1
-ifdef ENABLE_STRIP
-	$(STRIP) $@
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-$(RES): $(RESNAME)
-	@$(MAKE_OBJDIR)
-# The resource compiler does not understand the -U option.
-ifdef NS_USE_GCC
-	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
-else
-	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-endif # GCC
-	@echo $(RES) finished
-endif
-
-$(MAPFILE): $(LIBRARY_NAME).def
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH),SunOS)
-	grep -v ';-' $< | \
-	sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-endif
-ifeq ($(OS_ARCH),OS2)
-	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@
-	echo PROTMODE >> $@
-	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@
-	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
-	echo EXPORTS >> $@
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	grep -v ';+' $< | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@
-else
-	grep -v ';+' $< | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,\([\t ]*\),\1_,' | \
-	awk 'BEGIN {ord=1;} { print($$0 " @" ord " RESIDENTNAME"); ord++;}'	>> $@
-	$(ADD_TO_DEF_FILE)
-endif
-endif
-
-#
-# Translate source filenames to absolute paths. This is required for
-# debuggers under Windows and OS/2 to find source files automatically.
-#
-
-ifeq (,$(filter-out AIX OS2,$(OS_ARCH)))
-NEED_ABSOLUTE_PATH = 1
-endif
-
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-NEED_ABSOLUTE_PATH = 1
-endif
-
-ifdef NEED_ABSOLUTE_PATH
-PWD := $(shell pwd)
-abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
-endif
-
-$(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
-	@$(MAKE_OBJDIR)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CCC) -Fo$@ -c $(CCCFLAGS) $(call abspath,$<)
-else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(CCC) -Fo$@ -c $(CCCFLAGS) $(call abspath,$<)
-else
-ifdef NEED_ABSOLUTE_PATH
-	$(CCC) -o $@ -c $(CCCFLAGS) $(call abspath,$<)
-else
-	$(CCC) -o $@ -c $(CCCFLAGS) $<
-endif
-endif
-endif
-
-WCCFLAGS1 = $(subst /,\\,$(CFLAGS))
-WCCFLAGS2 = $(subst -I,-i=,$(WCCFLAGS1))
-WCCFLAGS3 = $(subst -D,-d,$(WCCFLAGS2))
-$(OBJDIR)/%.$(OBJ_SUFFIX): %.c
-	@$(MAKE_OBJDIR)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
-else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
-else
-ifdef NEED_ABSOLUTE_PATH
-	$(CC) -o $@ -c $(CFLAGS) $(call abspath,$<)
-else
-	$(CC) -o $@ -c $(CFLAGS) $<
-endif
-endif
-endif
-
-
-$(OBJDIR)/%.$(OBJ_SUFFIX): %.s
-	@$(MAKE_OBJDIR)
-	$(AS) -o $@ $(ASFLAGS) -c $<
-
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-$(OBJDIR)/%.$(OBJ_SUFFIX): %.asm
-	@$(MAKE_OBJDIR)
-	$(AS) -Fdo:./$(OBJDIR) $(ASFLAGS) $<
-endif
-
-%.i: %.c
-	$(CC) -C -E $(CFLAGS) $< > $*.i
-
-%: %.pl
-	rm -f $@; cp $< $@; chmod +x $@
-
-#
-# HACK ALERT
-#
-# The only purpose of this rule is to pass Mozilla's Tinderbox depend
-# builds (http://tinderbox.mozilla.org/showbuilds.cgi).  Mozilla's
-# Tinderbox builds NSPR continuously as part of the Mozilla client.
-# Because NSPR's make depend is not implemented, whenever we change
-# an NSPR header file, the depend build does not recompile the NSPR
-# files that depend on the header.
-#
-# This rule makes all the objects depend on a dummy header file.
-# Touch this dummy header file to force the depend build to recompile
-# everything.
-#
-# This rule should be removed when make depend is implemented.
-#
-
-DUMMY_DEPEND_H = $(topsrcdir)/config/prdepend.h
-
-$(filter $(OBJDIR)/%.$(OBJ_SUFFIX),$(OBJS)): $(OBJDIR)/%.$(OBJ_SUFFIX): $(DUMMY_DEPEND_H)
-
-# END OF HACK
-
-################################################################################
-# Special gmake rules.
-################################################################################
-
-#
-# Re-define the list of default suffixes, so gmake won't have to churn through
-# hundreds of built-in suffix rules for stuff we don't need.
-#
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJ_SUFFIX) .c .cpp .s .h .i .pl
-
-#
-# Fake targets.  Always run these rules, even if a file/directory with that
-# name already exists.
-#
-.PHONY: all alltags clean export install libs realclean release
-
-#
-# List the target pattern of an implicit rule as a dependency of the
-# special target .PRECIOUS to preserve intermediate files made by
-# implicit rules whose target patterns match that file's name.
-# (See GNU Make documentation, Edition 0.51, May 1996, Sec. 10.4,
-# p. 107.)
-#
-.PRECIOUS: $(OBJDIR)/%.$(OBJ_SUFFIX)
diff --git a/libs/js/nsprpub/config/system-headers b/libs/js/nsprpub/config/system-headers
deleted file mode 100644
index cf0f11498f..0000000000
--- a/libs/js/nsprpub/config/system-headers
+++ /dev/null
@@ -1,172 +0,0 @@
-Aliases.h
-arpa/inet.h
-assert.h
-bsd/libc.h
-bsd/syscall.h
-bstring.h
-builtin.h
-c_asm.h
-cf.h
-CFBundle.h
-CFData.h
-CFDictionary.h
-CFString.h
-CFURL.h
-CodeFragments.h
-commdlg.h
-crt_externs.h
-crypt.h
-ctype.h
-descrip.h
-Devices.h
-direct.h
-dirent.h
-dlfcn.h
-dl.h
-DriverServices.h
-dvidef.h
-errno.h
-Errors.h
-Events.h
-fcntl.h
-fibdef.h
-files.h
-Files.h
-float.h
-Folders.h
-Gestalt.h
-getopt.h
-grp.h
-ia64/sys/inline.h
-ifaddrs.h
-image.h
-ints.h
-iodef.h
-io.h
-iostream.h
-kernel/OS.h
-lib$routines.h
-limits.h
-loader.h
-locale.h
-LowMem.h
-MacErrors.h
-machine/builtins.h
-machine/clock.h
-machine/endian.h
-machine/inline.h
-mach/mach_init.h
-mach/mach_host.h
-mach-o/dyld.h
-MacTypes.h
-Math64.h
-math.h
-mbstring.h
-memory.h
-MixedMode.h
-model.h
-mswsock.h
-Multiprocessing.h
-mutex.h
-netdb.h
-net/if.h
-netinet/in.h
-netinet/in_systm.h
-netinet/tcp.h
-OpenTptInternet.h
-OpenTransport.h
-os2.h
-OS.h
-osreldate.h
-OSUtils.h
-poll.h
-PPCToolbox.h
-Processes.h
-process.h
-pthread.h
-pwd.h
-QDOffscreen.h
-Resources.h
-rld_interface.h
-rpc/types.h
-semaphore.h
-setjmp.h
-share.h
-signal.h
-ssdef.h
-starlet.h
-stat.h
-stdarg.h
-stddef.h
-stdio.h
-stdlib.h
-string.h
-stropts.h
-stsdef.h
-support/SupportDefs.h
-support/TLS.h
-synch.h
-sys/atomic_op.h
-syscall.h
-sys/cfgodm.h
-sys/file.h
-sys/filio.h
-sys/immu.h
-sys/ioctl.h
-sys/ipc.h
-sys/ldr.h
-sys/locking.h
-sys/lwp.h
-sys/mman.h
-sys/mpctl.h
-sys/param.h
-sys/pda.h
-sys/poll.h
-sys/prctl.h
-sys/priv.h
-sys/procfs.h
-sys/pstat.h
-sys/regset.h
-sys/resource.h
-sys/sched.h
-sys/select.h
-sys/sem.h
-sys/sendfile.h
-sys/shm.h
-sys/socket.h
-sys/stack.h
-sys/stat.h
-sys/statvfs.h
-sys/syscall.h
-sys/sysctl.h
-sys/sysmp.h
-sys/syssgi.h
-sys/systeminfo.h
-sys/timeb.h
-sys/time.h
-sys/times.h
-sys/types.h
-sys/ucontext.h
-sys/uio.h
-sys/utsname.h
-sys/wait.h
-task.h
-TextUtils.h
-thread.h
-time.h
-Timer.h
-types.h
-Types.h
-ucontext.h
-ucx$inetdef.h
-ulocks.h
-unistd.h
-unix.h
-unixlib.h
-utime.h
-wchar.h
-winbase.h
-win/compobj.h
-windef.h
-windows.h
-winsock.h
diff --git a/libs/js/nsprpub/configure.gnu b/libs/js/nsprpub/configure.gnu
deleted file mode 100644
index 002d5eab53..0000000000
--- a/libs/js/nsprpub/configure.gnu
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
-$srcpath/configure "$@" --with-pic
-
diff --git a/libs/js/nsprpub/configure.in b/libs/js/nsprpub/configure.in
deleted file mode 100644
index 7ac45ed9fc..0000000000
--- a/libs/js/nsprpub/configure.in
+++ /dev/null
@@ -1,2836 +0,0 @@
-dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
-dnl 
-dnl The contents of this file are subject to the Mozilla Public
-dnl License Version 1.1 (the "License"); you may not use this file
-dnl except in compliance with the License. You may obtain a copy of
-dnl the License at http://www.mozilla.org/MPL/
-dnl 
-dnl Software distributed under the License is distributed on an "AS
-dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-dnl implied. See the License for the specific language governing
-dnl rights and limitations under the License.
-dnl 
-dnl The Original Code is the Netscape Portable Runtime (NSPR).
-dnl 
-dnl The Initial Developer of the Original Code is Netscape
-dnl Communications Corporation.  Portions created by Netscape are 
-dnl Copyright (C) 1998o-2000 Netscape Communications Corporation.  All
-dnl Rights Reserved.
-dnl 
-dnl Contributor(s):
-dnl     Christopher Seawood <cls@seawood.org>
-dnl     Howard Chu <hyc@symas.com>
-dnl     Mark Mentovai <mark@moxienet.com>
-dnl 
-dnl Alternatively, the contents of this file may be used under the
-dnl terms of the GNU General Public License Version 2 or later (the
-dnl "GPL"), in which case the provisions of the GPL are applicable 
-dnl instead of those above.  If you wish to allow use of your 
-dnl version of this file only under the terms of the GPL and not to
-dnl allow others to use your version of this file under the MPL,
-dnl indicate your decision by deleting the provisions above and
-dnl replace them with the notice and other provisions required by
-dnl the GPL.  If you do not delete the provisions above, a recipient
-dnl may use your version of this file under either the MPL or the
-dnl GPL.
-dnl 
-
-AC_PREREQ(2.59)
-AC_INIT(config/libc_r.h)
-
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
-
-AC_CONFIG_AUX_DIR(build/autoconf)
-AC_CANONICAL_SYSTEM
-
-dnl ========================================================
-dnl = Defaults
-dnl ========================================================
-MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=0
-NSPR_MODNAME=nspr20
-_HAVE_PTHREADS=
-USE_PTHREADS=
-USE_USER_PTHREADS=
-USE_NSPR_THREADS=
-USE_N32=
-USE_64=
-USE_CPLUS=
-USE_IPV6=
-USE_MDUPDATE=
-_MACOSX_DEPLOYMENT_TARGET=
-_OPTIMIZE_FLAGS=-O
-_DEBUG_FLAGS=-g
-MOZ_DEBUG=1
-MOZ_OPTIMIZE=
-OBJDIR='$(OBJDIR_NAME)'
-OBJDIR_NAME=.
-OBJDIR_SUFFIX=OBJ
-NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
-NOSUCHFILE=/no-such-file
-LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
-LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
-CYGWIN_WRAPPER=
-MACOS_SDK_DIR=
-NEXT_ROOT=
-
-dnl Link in libraries necessary to resolve all symbols for shared libs
-RESOLVE_LINK_SYMBOLS=
-
-dnl ========================================================
-dnl =
-dnl = Dont change the following lines.  Doing so breaks:
-dnl =
-dnl = CFLAGS="-foo" ./configure
-dnl =
-dnl ========================================================
-CFLAGS="${CFLAGS=}"
-CXXFLAGS="${CXXFLAGS=}"
-LDFLAGS="${LDFLAGS=}"
-HOST_CFLAGS="${HOST_CFLAGS=}"
-HOST_LDFLAGS="${HOST_LDFLAGS=}"
-
-case "$target" in
-*-cygwin*|*-mingw*)
-    # Check to see if we are really running in a msvc environemnt
-    _WIN32_MSVC=
-    AC_CHECK_PROGS(CC, cl)
-    if test "$CC" = "cl"; then
-        echo 'main() { return 0; }' > dummy.c
-        ${CC} -o dummy dummy.c >/dev/null 2>&1
-        if test $? = 0; then
-            _WIN32_MSVC=1
-            CXX=$CC
-        else
-            AC_MSG_WARN([$(CC) test failed.  Using normal feature tests])
-        fi
-        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
-    fi
-    ;;
-*-msvc*)
-    _WIN32_MSVC=1
-    ;;
-*-mks*)
-    _WIN32_MSVC=1
-    ;;
-esac
-
-if test -n "$_WIN32_MSVC"; then
-    SKIP_PATH_CHECKS=1
-    SKIP_COMPILER_CHECKS=1
-    SKIP_LIBRARY_CHECKS=1
-fi
-
-dnl ========================================================
-dnl =
-dnl = Check options that may affect the compiler
-dnl =
-dnl ========================================================
-dist_prefix='${MOD_DEPTH}/dist'
-dist_bindir='${dist_prefix}/bin'
-dist_includedir='${dist_prefix}/include/nspr'
-dist_libdir='${dist_prefix}/lib'
-if test "${includedir}" = '${prefix}/include'; then
-    includedir='${prefix}/include/nspr'
-fi
-
-AC_ARG_WITH(dist-prefix,
-    [  --with-dist-prefix=DIST_PREFIX
-                          place build files in DIST_PREFIX [dist]],
-    dist_prefix=$withval)
-
-AC_ARG_WITH(dist-bindir,
-    [  --with-dist-bindir=DIR  build execuatables in DIR [DIST_PREFIX/bin]],
-    dist_bindir=$withval)
-
-AC_ARG_WITH(dist-includedir,
-    [  --with-dist-includedir=DIR
-                          build include files in DIR [DIST_PREFIX/include/nspr]],
-    dist_includedir=$withval)
-
-AC_ARG_WITH(dist-libdir,
-    [  --with-dist-libdir=DIR  build library files in DIR [DIST_PREFIX/lib]],
-    dist_libdir=$withval)
-
-AC_SUBST(dist_prefix)
-AC_SUBST(dist_bindir)
-AC_SUBST(dist_includedir)
-AC_SUBST(dist_libdir)
-
-dnl Check if NSPR is being compiled for Mozilla
-dnl Let --with-arg override environment setting
-dnl
-AC_ARG_WITH(mozilla,
-    [  --with-mozilla          Compile NSPR with Mozilla support],
-    [   if test "$withval" = "yes"; then
-            AC_DEFINE(MOZILLA_CLIENT)
-            MOZILLA_CLIENT=1
-	    else
-	        MOZILLA_CLIENT=
-	    fi],
-    [	if test -n "$MOZILLA_CLIENT"; then
-	        AC_DEFINE(MOZILLA_CLIENT)
-	    fi])
-
-AC_ARG_ENABLE(optimize,
-    [  --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
-    [ if test "$enableval" != "no"; then
-        MOZ_OPTIMIZE=1
-        if test -n "$enableval" && test "$enableval" != "yes"; then
-    	    _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
-            _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
-        fi
-      else
-        MOZ_OPTIMIZE=
-    fi ])
-
-AC_ARG_ENABLE(debug,
-    [  --disable-debug         Do not compile in debugging symbols
-  --enable-debug(=val)    Enable debugging (debug flags val)],
-    [	if test "$enableval" = "no"; then
-    	    MOZ_DEBUG=
-        else
-            MOZ_DEBUG=1
-            if test -n "$enableval" && test "$enableval" != "yes"; then
-                _DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
-                _SAVE_DEBUG_FLAGS=$_DEBUG_FLAGS
-            fi
-        fi])
-
-AC_ARG_ENABLE(win32-target,
-    [  --enable-win32-target=\$t
-                          Specify win32 flavor. (WIN95 or WINNT)],
-    OS_TARGET=`echo $enableval | tr a-z A-Z`,
-    OS_TARGET=)
-
-AC_ARG_ENABLE(debug-rtl,
-    [  --enable-debug-rtl      Use the MSVC debug runtime library],
-    [ if test "$enableval" = "yes"; then
-	    USE_DEBUG_RTL=1
-      fi ])
-
-AC_ARG_ENABLE(n32,
-    [  --enable-n32            Enable n32 ABI support (IRIX only)],
-    [ if test "$enableval" = "yes"; then
-	USE_N32=1
-      else if test "$enableval" = "no"; then
-	USE_N32=
-      fi
-    fi ])
-
-AC_ARG_ENABLE(64bit,
-    [  --enable-64bit          Enable 64-bit support (on certain platforms)],
-    [ if test "$enableval" = "yes"; then
-	    USE_64=1
-      fi ])
-
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
-
-if test "${enable_64}" = "yes"; then
-    USE_64=1
-fi
-
-AC_ARG_ENABLE(mdupdate,
-    [  --enable-mdupdate       Enable use of certain compilers' mdupdate feature],
-    [ if test "$enableval" = "yes"; then
-	    USE_MDUPDATE=1
-      fi ])
-
-dnl ========================================================
-dnl = Mac OS X SDK support
-dnl ========================================================
-AC_ARG_WITH(macos-sdk,
-    [  --with-macos-sdk=dir    Location of platform SDK to use (Mac OS X only)],
-    MACOS_SDK_DIR=$withval)
-
-AC_ARG_ENABLE(macos-target,
-             [  --enable-macos-target=VER
-                          Set the minimum MacOS version needed at runtime
-                          [10.1 for ppc, 10.4 for x86]],
-             [_MACOSX_DEPLOYMENT_TARGET=$enableval])
-
-dnl ========================================================
-dnl =
-dnl = Set the threading model
-dnl =
-dnl ========================================================
-case "$target" in
-
-*-aix*)
-    case "${target_os}" in
-    aix3.2*)
-        USE_NSPR_THREADS=1
-        ;;
-    *)
-        USE_PTHREADS=1
-        ;;
-    esac
-    ;;
-
-esac
-
-dnl ========================================================
-dnl =
-dnl = Set the default C compiler
-dnl =
-dnl ========================================================
-if test -z "$CC"; then
-    case "$target" in
-
-    *-aix*)
-        if test -z "$USE_NSPR_THREADS"; then
-            CC=xlc_r
-        else
-            CC=xlc
-        fi
-    ;;
-
-    *-hpux*)
-        CC=cc
-    ;;
-
-    *-irix*)
-        CC=cc
-    ;;
-
-    *-openvms*)
-        CC=cc
-    ;;
-
-    *-osf*)
-        CC=cc
-    ;;
-
-    *-solaris*)
-        CC=cc
-    ;;
-
-    esac
-fi
-
-dnl ========================================================
-dnl =
-dnl = Set the default C++ compiler
-dnl =
-dnl ========================================================
-if test -z "$CXX"; then
-    case "$target" in
-
-    *-aix*)
-        if test -z "$USE_NSPR_THREADS"; then
-            CXX=xlC_r
-        else
-            CXX=xlC
-        fi
-    ;;
-
-    *-hpux*)
-        case "${target_os}" in
-        hpux10.30)
-            CXX=aCC
-            ;;
-        hpux11.*)
-            CXX=aCC
-            ;;
-        *)
-            CXX=CC
-            ;;
-        esac
-    ;;
-
-    *-irix*)
-        CXX=CC
-    ;;
-
-    *-openvms*)
-        CXX=cxx
-    ;;
-
-    *-osf*)
-        CXX=cxx
-    ;;
-
-    *-solaris*)
-        CXX=CC
-    ;;
-
-    esac
-fi
-
-if test -z "$SKIP_PATH_CHECKS"; then
-    AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami)
-fi
-
-if test -n "$MOZ_DEBUG"; then
-    AC_DEFINE(DEBUG)
-    DEFINES="$DEFINES -UNDEBUG"
-
-    case "${target_os}" in
-    beos*)
-        DEFINES="$DEFINES -DDEBUG_${USER}"
-        ;;
-    msvc*|mks*|cygwin*|mingw*|os2*)
-        DEFINES="$DEFINES -DDEBUG_`echo ${USERNAME} | sed -e 's| |_|g'`"
-        ;;
-    *) 
-        DEFINES="$DEFINES -DDEBUG_`$WHOAMI`"
-        ;;
-    esac
-else
-    AC_DEFINE(NDEBUG)
-    DEFINES="$DEFINES -UDEBUG"
-fi
-
-if test -z "$SKIP_COMPILER_CHECKS"; then
-dnl ========================================================
-dnl Checks for compilers.
-dnl ========================================================
-if test "$target" != "$host"; then
-    echo "cross compiling from $host to $target"
-    cross_compiling=yes
-
-    _SAVE_CC="$CC"
-    _SAVE_CFLAGS="$CFLAGS"
-    _SAVE_LDFLAGS="$LDFLAGS"
-
-    AC_MSG_CHECKING([for $host compiler])
-    AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc, "")
-    if test -z "$HOST_CC"; then
-        AC_MSG_ERROR([no acceptable cc found in \$PATH])
-    fi
-    AC_MSG_RESULT([$HOST_CC])
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-    if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
-    fi
-
-    CC="$HOST_CC"
-    CFLAGS="$HOST_CFLAGS"
-    LDFLAGS="$HOST_LDFLAGS"
-
-    AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-    AC_TRY_COMPILE([], [return(0);], 
-        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-        [AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.])] )
-
-    CC=$_SAVE_CC
-    CFLAGS=$_SAVE_CFLAGS
-    LDFLAGS=$_SAVE_LDFLAGS
-
-    case "$build:$target" in 
-      powerpc-apple-darwin8*:*86-apple-darwin*)
-        dnl The Darwin cross compiler doesn't necessarily point itself at a
-        dnl root that has libraries for the proper architecture, it defaults
-        dnl to the system root.  The libraries in the system root on current
-        dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
-        dnl checks will fail.  Fake a working SDK in that case.
-        _SAVE_CFLAGS=$CFLAGS 
-        _SAVE_CXXFLAGS=$CXXLAGS
-        CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
-        CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
-        ;;        
-    esac            
-
-    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
-    unset ac_cv_prog_CC
-    AC_PROG_CC
-    AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", echo)
-    unset ac_cv_prog_CXX
-    AC_PROG_CXX
-
-    case "$build:$target" in
-      powerpc-apple-darwin8*:*86-apple-darwin*)
-        dnl Revert the changes made above.  From this point on, the target
-        dnl compiler will never be used without applying the SDK to CFLAGS
-        dnl (see --with-macos-sdk below).
-        CFLAGS=$_SAVE_CFLAGS
-        CXXFLAGS=$_SAVE_CXXFLAGS
-        ;;
-    esac
-
-    AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", echo)
-    AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", echo)
-    AC_CHECK_PROGS(AS, $AS "${target_alias}-as" "${target}-as", echo)
-    AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", echo)
-    AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
-    AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
-
-else
-    AC_PROG_CXX
-    if test "$CXX" = "cl" -a -z "$CC"; then
-        CC=$CXX
-    else        
-        AC_PROG_CC
-    fi
-    AC_PROG_CPP
-    AC_PROG_RANLIB
-    AC_PATH_PROGS(AS, as, $CC)
-    AC_PATH_PROGS(AR, ar, echo not_ar)
-    AC_PATH_PROGS(LD, ld link, echo not_ld)
-    AC_PATH_PROGS(STRIP, strip, echo not_strip)
-    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
-    if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
-    fi
-    if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
-    fi
-fi
-
-if test "$GCC" = "yes"; then
-    GNU_CC=1
-fi
-if test "$GXX" = "yes"; then
-    GNU_CXX=1
-fi
-if test "`echo | $AS -v 2>&1 | grep -c GNU`" != "0"; then
-    GNU_AS=1
-fi
-rm -f a.out
-
-case "$build:$target" in
-    *86-apple-darwin*:powerpc-apple-darwin*)
-        dnl cross_compiling will have erroneously been set to "no" in this
-        dnl case, because the x86 build host is able to run ppc code in a
-        dnl translated environment, making a cross compiler appear native.
-        cross_compiling=yes
-        ;;
-esac
-
-if test "$cross_compiling"  = "yes"; then
-    CROSS_COMPILE=1
-else
-    CROSS_COMPILE=
-fi
-
-dnl ========================================================
-dnl Check for gcc -pipe support
-dnl ========================================================
-AC_MSG_CHECKING([for gcc -pipe support])
-if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
-    echo '#include <stdio.h>' > dummy-hello.c
-    echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c
-    ${CC} -S dummy-hello.c -o dummy-hello.s 2>&5
-    cat dummy-hello.s | ${AS} -o dummy-hello.S - 2>&5
-    if test $? = 0; then
-        _res_as_stdin="yes"
-    else
-        _res_as_stdin="no"
-    fi
-    if test "$_res_as_stdin" = "yes"; then
-        _SAVE_CFLAGS=$CFLAGS
-        CFLAGS="$CFLAGS -pipe"
-        AC_TRY_COMPILE( [ #include <stdio.h> ],
-            [printf("Hello World\n");],
-            [_res_gcc_pipe="yes"],
-            [_res_gcc_pipe="no"] )
-        CFLAGS=$_SAVE_CFLAGS
-    fi
-    if test "$_res_as_stdin" = "yes" && test "$_res_gcc_pipe" = "yes"; then
-        _res="yes";
-        CFLAGS="$CFLAGS -pipe"
-        CXXFLAGS="$CXXFLAGS -pipe"
-    else
-        _res="no"
-    fi
-    rm -f dummy-hello.c dummy-hello.s dummy-hello.S dummy-hello a.out
-    AC_MSG_RESULT([$_res])
-else
-    AC_MSG_RESULT([no])
-fi
-
-dnl ===============================================================
-dnl Check for .hidden assembler directive and visibility attribute.
-dnl Borrowed from glibc configure.in
-dnl ===============================================================
-if test "$GNU_CC"; then
-    AC_CACHE_CHECK(for visibility(hidden) attribute,
-        ac_cv_visibility_hidden,
-        [cat > conftest.c <<EOF
-        int foo __attribute__ ((visibility ("hidden"))) = 1;
-EOF
-        ac_cv_visibility_hidden=no
-        if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-            if grep '\.hidden.*foo' conftest.s >/dev/null; then
-                ac_cv_visibility_hidden=yes
-            fi
-        fi
-        rm -f conftest.[cs]
-        ])
-    if test "$ac_cv_visibility_hidden" = "yes"; then
-        AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-        AC_CACHE_CHECK(for visibility pragma support,
-            ac_cv_visibility_pragma,
-            [cat > conftest.c <<EOF
-#pragma GCC visibility push(hidden)
-            int foo_hidden = 1;
-#pragma GCC visibility push(default)
-            int foo_default = 1;
-EOF
-            ac_cv_visibility_pragma=no
-            if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then
-                    if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then
-                        ac_cv_visibility_pragma=yes
-                    fi
-                fi
-            fi
-            rm -f conftest.[cs]
-            ])
-        if test "$ac_cv_visibility_pragma" = "yes"; then
-            AC_DEFINE(HAVE_VISIBILITY_PRAGMA)
-            # To work around a build problem on Linux x86-64 (Bugzilla bug
-            # 293438), we use the -fvisibility=hidden flag.  This flag is less
-            # optimal than #pragma GCC visibility push(hidden) because the flag
-            # assumes that symbols defined outside the current source file have
-            # the default visibility.  This has the advantage that we don't need
-            # to wrap system header files, but has the disadvantage that calls
-            # to hidden symbols defined in other source files cannot be
-            # optimized by the compiler.  The -fvisibility=hidden flag does
-            # hide and export symbols correctly.
-            #VISIBILITY_FLAGS='-I$(dist_includedir)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-            #WRAP_SYSTEM_INCLUDES=1
-            VISIBILITY_FLAGS="-fvisibility=hidden"
-            WRAP_SYSTEM_INCLUDES=
-        fi
-    fi
-fi # GNU_CC
-
-fi # SKIP_COMPILER_CHECKS
-
-dnl ========================================================
-dnl Checks for programs.
-dnl ========================================================
-if test -z "$SKIP_PATH_CHECKS"; then
-    AC_PATH_PROGS(PERL, perl5 perl, echo not_perl)
-elif test -z "$PERL"; then
-    PERL=perl
-fi
-
-dnl ========================================================
-dnl Default platform specific options
-dnl ========================================================
-OBJ_SUFFIX=o
-LIB_SUFFIX=a
-DLL_SUFFIX=so
-ASM_SUFFIX=s
-MKSHLIB='$(LD) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-PR_MD_ASFILES=
-PR_MD_CSRCS=
-PR_MD_ARCH_DIR=unix
-AR_FLAGS='cr $@'
-AS='$(CC)'
-ASFLAGS='$(CFLAGS)'
-
-if test -n "$CROSS_COMPILE"; then
-    OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
-    OS_RELEASE=
-    OS_TEST="${target_cpu}"
-    case "${target_os}" in
-        linux*)       OS_ARCH=Linux ;;
-        solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
-        mingw*)       OS_ARCH=WINNT ;;
-        darwin*)      OS_ARCH=Darwin ;;
-    esac
-else
-    OS_ARCH=`uname -s | sed -e 's|/|_|g'`
-    OS_RELEASE=`uname -r`
-    OS_TEST=`uname -m`
-fi
-
-if test "$OS_ARCH" = "IRIX64"; then
-    OS_ARCH=IRIX
-fi
-
-if test "$OS_ARCH" = "AIX"; then
-    OS_RELEASE=`uname -v`.`uname -r`
-fi
-
-if test "$OS_ARCH" = "FreeBSD"; then
-    OS_RELEASE=`echo $OS_RELEASE | sed 's/-.*//'`
-fi
-
-if test "$OS_ARCH" = "Linux"; then
-    OS_RELEASE=`echo $OS_RELEASE | sed 's/-.*//'`
-    OS_RELEASE=`echo $OS_RELEASE | awk -F\. '{ print $1 "." $2 }'`
-fi
-
-if test "$OS_ARCH" = "OpenVMS"; then
-    OS_RELEASE=`uname -v`
-fi
-
-#######################################################################
-# Master "Core Components" macros for getting the OS target           #
-#######################################################################
-
-#
-# Note: OS_TARGET should be specified on the command line for gmake.
-# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built.
-# The difference between the Win95 target and the WinNT target is that
-# the WinNT target uses Windows NT specific features not available
-# in Windows 95. The Win95 target will run on Windows NT, but (supposedly)
-# at lesser performance (the Win95 target uses threads; the WinNT target
-# uses fibers).
-#
-# When OS_TARGET=WIN16 is specified, then a Windows 3.11 (16bit) target
-# is built. See: win16_3.11.mk for lots more about the Win16 target.
-#
-# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no
-# cross-compilation.
-#
-
-#
-# The following hack allows one to build on a WIN95 machine (as if
-# s/he were cross-compiling on a WINNT host for a WIN95 target).
-# It also accomodates for MKS's uname.exe.  If you never intend
-# to do development on a WIN95 machine, you don't need this hack.
-#
-case "$OS_ARCH" in
-WIN95)
-    OS_ARCH=WINNT
-    OS_TARGET=WIN95
-    ;;
-Windows_95)
-    OS_ARCH=Windows_NT
-    OS_TARGET=WIN95
-    ;;
-Windows_98)
-    OS_ARCH=Windows_NT
-    OS_TARGET=WIN95
-    ;;
-CYGWIN_9*|CYGWIN_ME*)
-    OS_ARCH='CYGWIN_NT-4.0'
-    OS_TARGET=WIN95
-    ;;
-OS_2)
-    OS_ARCH=OS2
-    OS_TARGET=OS2
-    ;;
-esac
-
-#
-# On WIN32, we also define the variable CPU_ARCH.
-#
-
-case "$OS_ARCH" in
-WINNT)
-    CPU_ARCH=`uname -p`
-    if test "$CPU_ARCH" = "I386"; then
-        CPU_ARCH=x86
-    fi
-    ;;
-Windows_NT)
-#
-# If uname -s returns "Windows_NT", we assume that we are using
-# the uname.exe in MKS toolkit.
-#
-# The -r option of MKS uname only returns the major version number.
-# So we need to use its -v option to get the minor version number.
-# Moreover, it doesn't have the -p option, so we need to use uname -m.
-#
-    OS_ARCH=WINNT
-    OS_MINOR_RELEASE=`uname -v`
-    if test "$OS_MINOR_RELEASE" = "00"; then
-        OS_MINOR_RELEASE=0
-    fi
-    OS_RELEASE="${OS_RELEASE}.${OS_MINOR_RELEASE}"
-    CPU_ARCH=`uname -m`
-    #
-    # MKS's uname -m returns "586" on a Pentium machine.
-    #
-    if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then
-        CPU_ARCH=x86
-    fi
-    ;;
-CYGWIN_NT*|MINGW*_NT*)
-#
-# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using
-# the uname.exe in the Cygwin tools.
-# If uname -s returns MINGW32_NT-5.1, we assume that we are using
-# the uname.exe in the MSYS tools.
-#
-    OS_RELEASE=`expr $OS_ARCH : '.*NT-\(.*\)'`
-    OS_ARCH=WINNT
-    CPU_ARCH=`uname -m`
-    #
-    # Cygwin's uname -m returns "i686" on a Pentium Pro machine.
-    #
-    if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then
-        CPU_ARCH=x86
-    fi
-    ;;
-esac
-
-if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then
-    OS_TARGET=WIN95
-    if test -n "$MOZ_DEBUG"; then
-        USE_DEBUG_RTL=1
-    fi
-fi
-if test -z "$OS_TARGET"; then
-    OS_TARGET=$OS_ARCH
-fi
-if test "$OS_TARGET" = "WIN95"; then
-    OS_RELEASE="4.0"
-fi
-if test "$OS_TARGET" = "WIN16"; then
-    OS_RELEASE=
-fi
-OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
-
-dnl ========================================================
-
-dnl ========================================================
-dnl Override of system specific host options
-dnl ========================================================
-case "$host" in
-*-mingw*)
-    NSINSTALL=nsinstall
-    ;;
-*-cygwin*|*-msvc*|*-mks*)
-    NSINSTALL='$(CYGWIN_WRAPPER) nsinstall'
-    if test `echo "${PATH}" | grep -c \;` = 0; then
-        CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper'
-    fi
-    ;;
-*-beos*)
-    HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE"
-    ;;
-*os2*)
-    ;;
-*)
-    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-    ;;
-esac
-
-dnl ========================================================
-dnl Override of system specific target options
-dnl ========================================================
-case "$target" in
-
-*-aix*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(AIX)
-    AC_DEFINE(SYSV)
-    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
-    AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
-    case "${target_os}" in
-    aix3.2*)
-        AC_DEFINE(AIX_RENAME_SELECT)
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-        AIX_LINK_OPTS='-bnso -berok'
-        PR_MD_ASFILES=os_AIX.s
-        ;;
-    aix4.1*)
-        AC_DEFINE(AIX_TIMERS)
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-        AC_DEFINE(AIX4_1)
-        MKSHLIB=
-        DSO_LDOPTS=
-        AIX_LINK_OPTS='-bnso -berok'
-        LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)_shr'
-        LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)_shr'
-        ;;
-    aix4.2*)
-        AC_DEFINE(AIX_TIMERS)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        AIX_LINK_OPTS='-brtl -bnso -berok'
-        ;;
-    aix4.3*)
-        AC_DEFINE(AIX_TIMERS)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        AC_DEFINE(AIX4_3_PLUS)
-        AC_DEFINE(HAVE_SOCKLEN_T)
-        AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-        USE_IPV6=1
-        AIX_LINK_OPTS='-brtl -bnso -berok'
-        ;;
-    *)
-        AC_DEFINE(AIX_TIMERS)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        AC_DEFINE(AIX4_3_PLUS)
-        AC_DEFINE(HAVE_SOCKLEN_T)
-        AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-        USE_IPV6=1
-        AIX_LINK_OPTS='-brtl -bnso -berok'
-        ;;
-    esac
-    CFLAGS="$CFLAGS -qro -qroconst"
-    AIX_WRAP='$(DIST)/lib/aixwrap.o'
-    AIX_TMP='./_aix_tmp.o'
-    if test -n "$USE_64"; then
-        MDCPUCFG_H=_aix64.cfg
-        OBJECT_MODE=64
-    else
-        MDCPUCFG_H=_aix32.cfg
-    fi
-    PR_MD_CSRCS=aix.c
-    RESOLVE_LINK_SYMBOLS=1
-    ;;
-        
-*-beos*)
-    AC_DEFINE(XP_BEOS)
-    AC_DEFINE(BeOS)
-    AC_DEFINE(BEOS)
-    AC_DEFINE(_POSIX_SOURCE)
-    DSO_LDOPTS=-nostart
-    MDCPUCFG_H=_beos.cfg
-    USE_BTHREADS=1
-    PR_MD_ARCH_DIR=beos
-    RESOLVE_LINK_SYMBOLS=1
-    case "${target_cpu}" in
-    i*86)
-        _OPTIMIZE_FLAGS=-O2
-        _DEBUG_FLAGS='-gdwarf-2 -O0'
-        MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
-        AC_CHECK_LIB(bind, gethostbyaddr, [OS_LIBS="$OS_LIBS -lbind -lsocket"])
-        ;;
-    powerpc)
-        CC=mwcc
-        CCC=mwcc
-        LD=mwld
-        DSO_LDOPTS='-xms -export pragma -init _init_routine_ -term _term_routine_ -lroot -lnet /boot/develop/lib/ppc/glue-noinit.a /boot/develop/lib/ppc/init_term_dyn.o /boot/develop/lib/ppc/start_dyn.o'
-        _OPTIMIZE_FLAGS=-O2    
-        _DEBUG_FLAGS='-g -O0'
-        ;;
-    esac
-    ;;
-
-*-bsdi*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(BSDI)
-    AC_DEFINE(NEED_BSDREGEX)
-
-    CFLAGS="$CFLAGS -Wall -Wno-format"
-    CXXFLAGS="$CXXFLAGS -Wall -Wno-format"
-
-    if echo "$OS_TEST" | grep -c 86 >/dev/null; then
-        CPU_ARCH=x86
-    elif echo "$OS_TEST" | grep -c sparc >/dev/null; then 
-        CPU_ARCH=sparc
-    fi
-
-    MDCPUCFG_H=_bsdi.cfg
-    PR_MD_CSRCS=bsdi.c
-
-    DSO_LDOPTS=-r
-
-    case "$target_os" in
-    bsdi1.1*)
-        AC_DEFINE(_PR_BSDI_JMPBUF_IS_ARRAY)
-        AC_DEFINE(_PR_STAT_HAS_ONLY_ST_ATIME)
-        AC_DEFINE(_PR_NEED_H_ERRNO)
-        MKSHLIB=
-        DSO_CFLAGS=
-        DSO_LDOPTS=
-        ;;
-
-    bsdi2.1*)
-        AC_DEFINE(_PR_TIMESPEC_HAS_TS_SEC)
-        AC_DEFINE(_PR_BSDI_JMPBUF_IS_ARRAY)
-        AC_DEFINE(HAVE_DLL)
-        AC_DEFINE(USE_DLFCN)
-        AC_DEFINE(_PR_STAT_HAS_ST_ATIMESPEC)
-        PR_MD_ASFILES=os_BSD_OS_386_2.s
-        ;;
-
-    bsdi4.* | bsdi5.*)
-        AC_DEFINE(_PR_SELECT_CONST_TIMEVAL)
-        AC_DEFINE(_PR_BSDI_JMPBUF_IS_STRUCT)
-        AC_DEFINE(HAVE_DLL)
-        AC_DEFINE(USE_DLFCN)
-        AC_DEFINE(_PR_STAT_HAS_ST_ATIMESPEC)
-        MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS)'
-        DSO_CFLAGS=-fPIC
-        DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)'
-        STRIP="$STRIP -d"
-        case "$target_os" in
-        bsdi4.2* | bsdi4.3* | bsdi5.*)
-            AC_DEFINE(_PR_HAVE_GETPROTO_R)
-            AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER)
-            ;;
-        esac
-        ;;
-    *)
-        AC_DEFINE(_PR_SELECT_CONST_TIMEVAL)
-        AC_DEFINE(_PR_BSDI_JMPBUF_IS_STRUCT)
-        AC_DEFINE(HAVE_DLL)
-        AC_DEFINE(USE_DLFCN)
-        AC_DEFINE(_PR_STAT_HAS_ST_ATIMESPEC)
-        ;;
-    esac
-
-    ;;
-
-*-darwin*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(DARWIN)
-    AC_DEFINE(HAVE_BSD_FLOCK)
-    CFLAGS="$CFLAGS -Wmost -fno-common"
-    case "${target_cpu}" in
-        *86*)
-            AC_DEFINE(i386)
-            CPU_ARCH=i386
-            PR_MD_ASFILES=os_Darwin_x86.s
-            ;;
-        *)
-            AC_DEFINE(ppc)
-            CPU_ARCH=ppc
-            PR_MD_ASFILES=os_Darwin_ppc.s
-            ;;
-    esac
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name ${prefix}/lib/$@ -headerpad_max_install_names'
-    # Use the standard preprocessor (cpp)
-    CFLAGS="$CFLAGS -no-cpp-precomp"
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-    STRIP="$STRIP -x -S"
-    DLL_SUFFIX=dylib
-    USE_PTHREADS=1
-    MDCPUCFG_H=_darwin.cfg
-    PR_MD_CSRCS=darwin.c
-
-    # Add Mac OS X support for loading CFM & CFBundle plugins
-    if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
-        AC_DEFINE(XP_MACOSX)
-        OS_TARGET=MacOSX
-
-        if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
-            dnl Use the specified value
-            export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
-        elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
-            dnl No value specified on the command line or in the environment,
-            dnl use the lesser of the library's minimum or the architecture's
-            dnl minimum.
-            case "${target_cpu}" in
-                powerpc*)
-                    dnl Architecture minimum 10.1
-                    export MACOSX_DEPLOYMENT_TARGET=10.1
-                    ;;
-                *86*)
-                    dnl Architecture minimum 10.4
-                    export MACOSX_DEPLOYMENT_TARGET=10.4
-                    ;;
-            esac
-        fi
-
-        dnl MACOS_SDK_DIR will be set to the SDK location whenever one is
-        dnl in use.  NEXT_ROOT will be set and exported if it's needed for
-        dnl ld.
-
-        if test "$MACOS_SDK_DIR"; then
-            dnl Sync this section with the one in Mozilla's top level.
-
-            if test ! -d "$MACOS_SDK_DIR"; then
-                AC_MSG_ERROR([SDK not found.  When using --with-macos-sdk, you must
-specify a valid SDK.  SDKs are installed when the optional cross-development
-tools are selected during the Xcode/Developer Tools installation.])
-            fi
-
-            changequote(,)
-            CC_VERSION=`$CC -v 2>&1 | grep 'gcc version'`
-            GCC_VERSION_FULL=`echo $CC_VERSION | $PERL -pe 's/^.*gcc version ([^ ]*).*/$1/'`
-            GCC_VERSION=`echo $GCC_VERSION_FULL | $PERL -pe '(split(/\./))[0]>=4&&s/(^\d*\.\d*).*/$1/;'`
-            changequote([,])
-            GCC_VERSION_MAJOR=`echo $GCC_VERSION_FULL | $PERL -pe 's/(^\d*).*/$1/;'`
-            if test "$GCC_VERSION_MAJOR" -lt "4" ; then
-                SDK_C_FRAMEWORK="-F${MACOS_SDK_DIR}/System/Library/Frameworks"
-                if test -d "${MACOS_SDK_DIR}/Library/Frameworks" ; then
-                    SDK_C_FRAMEWORK="$SDK_C_FRAMEWORK -F${MACOS_SDK_DIR}/Library/Frameworks"
-                fi
-
-                SDK_C_INCLUDE="-isystem ${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOS_SDK_DIR}/usr/include ${SDK_C_FRAMEWORK}"
-
-                CFLAGS="$CFLAGS -nostdinc ${SDK_C_INCLUDE}"
-
-                dnl CPP needs to be set for AC_CHECK_HEADER.
-                CPP="$CPP -nostdinc ${SDK_C_INCLUDE}"
-
-                dnl ld support for -syslibroot is compiler-agnostic, but only
-                dnl available on Tiger.  Although it's possible to switch on
-                dnl the build host's OS release to use ld -syslibroot when
-                dnl available, ld -syslibroot cause warnings as long as
-                dnl NEXT_ROOT is set.  NEXT_ROOT should be set because both
-                dnl both the compiler and linker use it.
-                dnl
-                dnl LDFLAGS is for the utilities built in config (now and
-                dnl nsinstall).  DSO_LDOPTS is used when linking shared
-                dnl libraries.
-                MACOS_SDK_LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin -L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION_FULL} -L${MACOS_SDK_DIR}/usr/lib ${SDK_C_FRAMEWORK}"
-                LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
-                DSO_LDOPTS="${MACOS_SDK_LIBS} $DSO_LDOPTS"
-                export NEXT_ROOT=$MACOS_SDK_DIR
-
-                if test -n "$CROSS_COMPILE" ; then
-                    dnl NEXT_ROOT will be in the environment, but it
-                    dnl shouldn't be set for the build host.  HOST_CXX is
-                    dnl presently unused.
-                    HOST_CC="NEXT_ROOT= $HOST_CC"
-                    HOST_CXX="NEXT_ROOT= $HOST_CXX"
-                fi
-            else
-                dnl gcc >= 4.0 uses different paths than above, but knows
-                dnl how to find them itself.
-                CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}"
-
-                dnl CPP needs to be set for AC_CHECK_HEADER.
-                CPP="$CPP -isysroot ${MACOS_SDK_DIR}"
-
-                dnl If gcc >= 4.0.0, we're guaranteed to be on Tiger, which
-                dnl has an ld that supports -syslibroot.  Don't set
-                dnl NEXT_ROOT because it will be ignored and cause
-                dnl warnings when -syslibroot is specified.
-                dnl
-                dnl Both LDFLAGS and DSO_LDOPTS are set here, see the
-                dnl gcc < 4.0 case for the explanation.
-                if test "$GCC_VERSION_FULL" != "4.0.0" ; then
-                    dnl gcc > 4.0.0 will pass -syslibroot to ld automatically
-                    dnl based on the -isysroot it receives.
-                    LDFLAGS="$LDFLAGS -isysroot ${MACOS_SDK_DIR}"
-                    DSO_LDOPTS="$DSO_LDOPTS -isysroot ${MACOS_SDK_DIR}"
-                else
-                    dnl gcc 4.0.0 doesn't pass -syslibroot to ld, it needs
-                    dnl to be explicit.
-                    LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
-                    DSO_LDOPTS="$DSO_LDOPTS -Wl,-syslibroot,${MACOS_SDK_DIR}"
-                fi
-            fi
-        fi
-    fi
-    ;;
-
-*-dgux*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(SYSV)
-    AC_DEFINE(DGUX)
-    AC_DEFINE(_DGUX_SOURCE)
-    AC_DEFINE(_POSIX4A_DRAFT6_SOURCE)
-    DSO_LDOPTS=-G
-    _OPTIMIZE_FLAGS=-O2
-    _DEBUG_FLAGS=
-    MDCPUCFG_H=_dgux.cfg
-    PR_MD_CSRCS=dgux.c
-    ;;
-
-*-freebsd*)
-    if test -z "$USE_NSPR_THREADS"; then
-        USE_PTHREADS=1
-    fi
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(FREEBSD)
-    AC_DEFINE(HAVE_BSD_FLOCK)
-    AC_DEFINE(HAVE_SOCKLEN_T)
-    CFLAGS="$CFLAGS -ansi -Wall"
-    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-    if test "$MOZ_OBJFORMAT" = "elf"; then
-        DLL_SUFFIX=so
-    else
-        DLL_SUFFIX=so.1
-    fi
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-    MDCPUCFG_H=_freebsd.cfg
-    PR_MD_CSRCS=freebsd.c
-   ;;
-
-*-hpux*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(HPUX)
-    AC_DEFINE(_HPUX_SOURCE)
-    # OSF1 and HPUX report the POLLHUP event for a socket when the
-    # shutdown(SHUT_WR) operation is called for the remote end, even though
-    # the socket is still writeable. Use select(), instead of poll(), to
-    # workaround this problem.
-    AC_DEFINE(_PR_POLL_WITH_SELECT)
-    AC_DEFINE(_USE_BIG_FDS)
-    DSO_LDOPTS='-b +h $(notdir $@)'
-    PR_MD_CSRCS=hpux.c
-    if test "$OS_TEST" = "ia64"; then
-        DLL_SUFFIX=so
-        DSO_LDOPTS="$DSO_LDOPTS +b '\$\$ORIGIN'"
-        CPU_ARCH_TAG=_$OS_TEST 
-        if test -z "$USE_64"; then
-            COMPILER_TAG=_32
-        fi
-        PR_MD_ASFILES=os_HPUX_ia64.s
-    else
-        AC_DEFINE(hppa)
-        DLL_SUFFIX=sl
-        PR_MD_ASFILES=os_HPUX.s
-    fi
-    if test -n "$USE_64"; then
-        MDCPUCFG_H=_hpux64.cfg
-    else
-        MDCPUCFG_H=_hpux32.cfg
-    fi
-    if test -z "$GNU_CC"; then
-        CC="$CC -Ae"
-        CXX="$CXX -ext"
-        DSO_CFLAGS=+Z
-    else
-        DSO_CFLAGS=-fPIC
-    fi
-
-    if test -n "$MOZILLA_CLIENT"; then
-        DEFAULT_IMPL_STRATEGY=_EMU
-    fi
-
-    if echo "$OS_RELEASE" | grep ^A.09 >/dev/null; then
-        AC_DEFINE(_PR_NEED_H_ERRNO)
-        AC_DEFINE(HPUX9)
-        DEFAULT_IMPL_STRATEGY=_EMU
-    	USE_NSPR_THREADS=1
-    fi
-
-    if echo "$OS_RELEASE" | egrep '^(A.09|B.10)' >/dev/null; then
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-    fi
-
-    if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then
-        AC_DEFINE(_PR_NEED_H_ERRNO)
-    fi
-
-    if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then
-        AC_DEFINE(HAVE_INT_LOCALTIME_R)
-    fi
-
-    if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11)' >/dev/null; then
-        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-    fi
-
-    # HP-UX 11i (B.11.11) or higher
-    changequote(<<,>>)
-    case "$OS_RELEASE" in
-    [C-Z]*|B.[2-9]*|B.1[2-9]*|B.11.[2-9]*|B.11.1[1-9]*)
-        USE_IPV6=1
-        ;;
-    esac
-    changequote([,])
-
-    if test "$OS_RELEASE" = "B.10.01"; then
-        AC_DEFINE(HPUX10)
-        DEFAULT_IMPL_STRATEGY=_EMU
-    fi
-
-    if test "$OS_RELEASE" = "B.10.10"; then
-        AC_DEFINE(HPUX10)
-        AC_DEFINE(HPUX10_10)
-        DEFAULT_IMPL_STRATEGY=_PTH
-    fi
-
-    if test "$OS_RELEASE" = "B.10.20"; then
-        AC_DEFINE(HPUX10)
-        AC_DEFINE(HPUX10_20)
-        if test -z "$GNU_CC"; then
-            CFLAGS="$CFLAGS +DAportable +DS1.1"
-            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
-        fi
-        DEFAULT_IMPL_STRATEGY=_PTH
-    fi
-
-    if test "$OS_RELEASE" = "B.10.30"; then
-        AC_DEFINE(HPUX10)
-        AC_DEFINE(HPUX10_30)
-        if test -z "$GNU_CC"; then
-            CFLAGS="$CFLAGS +DAportable +DS1.1"
-            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
-        fi
-        DEFAULT_IMPL_STRATEGY=_PTH
-    fi
-
-    if echo "$OS_RELEASE" | grep ^B.11 >/dev/null; then
-        AC_DEFINE(HPUX10)
-        AC_DEFINE(HPUX11)
-        AC_DEFINE(_LARGEFILE64_SOURCE)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-        if test -z "$GNU_CC"; then
-            if test -z "$USE_64"; then
-                if test "$OS_TEST" = "ia64"; then
-                    CFLAGS="$CFLAGS +DD32"
-                    CXXFLAGS="$CXXFLAGS +DD32"
-                else
-                    CFLAGS="$CFLAGS +DAportable +DS2.0"
-                    CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
-                fi
-            else
-                if test "$OS_TEST" = "ia64"; then
-                    CFLAGS="$CFLAGS +DD64"
-                    CXXFLAGS="$CXXFLAGS +DD64"
-                else
-                    CFLAGS="$CFLAGS +DA2.0W +DS2.0"
-                    CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
-                fi
-            fi
-        fi
-        DEFAULT_IMPL_STRATEGY=_PTH
-    fi
-
-    if test "$DEFAULT_IMPL_STRATEGY" = "_EMU"; then
-        USE_NSPR_THREADS=1
-        USE_PTHREADS=
-        USE_USER_THREADS=
-    elif test "$DEFAULT_IMPL_STRATEGY" = "_PTH"; then
-        USE_PTHREADS=1
-        if test "$USE_NSPR_THREADS"; then
-            USE_PTHREADS=
-        fi
-        if test "$USE_USER_PTHREADS"; then
-            USE_PTHREADS=
-        fi
-    fi
-    ;;
-
-*-irix*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(IRIX)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(_SGI_MP_SOURCE)
-    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-    PR_MD_CSRCS=irix.c
-    PR_MD_ASFILES=os_Irix.s
-    MKSHLIB='$(LD) $(DSO_LDOPTS) -rdata_shared -shared -soname $(notdir $@) -o $@'
-    STRIP="$STRIP -f"
-    RESOLVE_LINK_SYMBOLS=1
-    if test -n "$USE_64"; then
-        MDCPUCFG_H=_irix64.cfg
-    else
-        MDCPUCFG_H=_irix32.cfg
-    fi
-    case "${target_os}" in
-    irix6*)
-        AC_DEFINE(IRIX6)
-        USE_PTHREADS=1
-        USE_N32=1
-        COMPILER_TAG=_n32
-        IMPL_STRATEGY=_PTH
-        ;;
-    irix5*)
-        AC_DEFINE(IRIX5)
-        USE_NSPR_THREADS=1
-        ;;
-    *)
-        USE_PTHREADS=1
-        USE_N32=1
-        ;;
-    esac
-    if test "$GNU_CC"; then
-        dnl
-        dnl If we are using gcc with native binutils, we need to
-        dnl suppress the
-        dnl #lineno "filename" num num
-        dnl lines, which confuse IRIX native as.  Add -Wp,-P to the
-        dnl gcc command line, which passes -P to the preprocessor.
-        dnl
-	    AS='$(CC) -Wp,-P -x assembler-with-cpp -D_ASM -mips2 $(INCLUDES)'
-	    CFLAGS="$CFLAGS -Wall -Wno-format"
-	    _OPTIMIZE_FLAGS="-O6"
-    else
-	    if test -n "$USE_N32"; then
-		AS='as -D_ASM $(INCLUDES) -n32'
-	    else
-		AS='as -D_ASM $(INCLUDES)'
-	    fi
-	    CFLAGS="$CFLAGS -fullwarn -xansi"
-	    if test "$USE_N32"; then
-	        _OPTIMIZE_FLAGS="-O -OPT:Olimit=4000"
-	    else
-	        _OPTIMIZE_FLAGS="-O -Olimit 4000"
-	    fi
-	    if test "$USE_MDUPDATE"; then
-                CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
-	    fi
-	    case "${target}" in
-	    *-irix6.*)
-	        CFLAGS="$CFLAGS -multigot"
-	        DSO_LDOPTS="-no_unresolved"
-	        if test "$USE_N32"; then
-		        CFLAGS="$CFLAGS -n32 -woff 1209"
-		        DSO_LDOPTS="$DSO_LDOPTS -n32"
-	        else
-		        if test "$USE_64"; then
-		            CFLAGS="$CFLAGS -64"
-		        else
-		            CFLAGS="$CFLAGS -32"
-		        fi
-	        fi
-	        ;;
-	    *)
-	        CFLAGS="$CFLAGS -xgot"
-	        ;;
-	    esac
-    fi
-    if test "${target_os}" = "irix5.3"; then
-	    AC_DEFINE(IRIX5_3)
-    fi
-    case "${target_os}" in
-	irix6.5)
-	    if test -z "$GNU_CC"; then
-		    CFLAGS="$CFLAGS -mips3"
-	    fi
-	    AC_DEFINE(_PR_HAVE_GETPROTO_R)
-	    AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER)
-	    AC_DEFINE(_PR_HAVE_SGI_PRDA_PROCMASK)
-	    ;;
-	irix5*)
-	    ;;
-	*)
-	    AC_DEFINE(_PR_HAVE_SGI_PRDA_PROCMASK)
-	    ;;
-	esac
-    ;;
-
-*-linux*|*-gnu*|*-k*bsd*-gnu)
-    if test -z "$USE_NSPR_THREADS"; then
-        USE_PTHREADS=1
-        IMPL_STRATEGY=_PTH
-    fi
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(_GNU_SOURCE)
-    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-    case "${target_os}" in
-    linux*)
-        AC_DEFINE(LINUX)
-        ;;
-    esac
-    MDCPUCFG_H=_linux.cfg
-    PR_MD_CSRCS=linux.c
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-    _OPTIMIZE_FLAGS=-O2
-    _DEBUG_FLAGS="-g"  # most people on linux use gcc/gdb, and that
-                                   # combo is not yet good at debugging inlined
-                                   # functions (even when using DWARF2 as the
-                                   # debugging format)
-    COMPILER_TAG=_glibc
-    if echo "$OS_TEST" | grep -c 86 >/dev/null; then
-        CPU_ARCH=x86
-    else
-        CPU_ARCH=$OS_TEST
-    fi
-    CPU_ARCH_TAG=_${CPU_ARCH}
-    case "${target_cpu}" in
-    alpha)
-        AC_DEFINE(_ALPHA_)
-        AC_DEFINE(__alpha)
-        CFLAGS="$CFLAGS -mieee"
-        CXXFLAGS="$CXXFLAGS -mieee"
-        ;;
-    i*86)
-        AC_DEFINE(i386)
-        PR_MD_ASFILES=os_Linux_x86.s
-        ;;
-    ia64)
-        PR_MD_ASFILES=os_Linux_ia64.s
-        ;;
-    x86_64)
-            PR_MD_ASFILES=os_Linux_x86_64.s
-        ;;
-    powerpc64)
-            CC="$CC -m64"
-            CXX="$CXX -m64"
-        ;;
-    m68k)
-        CFLAGS="$CFLAGS -m68020-60"
-        CXXFLAGS="$CXXFLAGS -m68020-60"
-        ;;
-    esac    
-    ;;
-
-*-mingw*|*-cygwin*|*-msvc*|*-mks*)
-    AC_DEFINE(XP_PC)
-    AC_DEFINE(WIN32)
-    PR_MD_ARCH_DIR=windows
-    RESOLVE_LINK_SYMBOLS=1
-
-    if test -n "$GNU_CC"; then
-        CC="$CC -mno-cygwin"
-        CXX="$CXX -mno-cygwin"
-        DLL_SUFFIX=dll
-        MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))'
-        RC=$WINDRES
-        # Use temp file for windres (bug 213281)
-        RCFLAGS='-O coff --use-temp-file'
-    else
-        CC=cl
-        CXX=cl
-        LD=link
-        AR='lib -NOLOGO -OUT:"$@"'
-        AR_FLAGS=
-        RANLIB='echo not_ranlib'
-        STRIP='echo not_strip'
-        RC=rc.exe
-        GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
-        OBJ_SUFFIX=obj
-        LIB_SUFFIX=lib
-        DLL_SUFFIX=dll
-
-        # Determine compiler version
-        CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'`
-        _CC_MAJOR_VERSION=`echo $CC_VERSION | awk -F\. '{ print $1 }'`
-        _CC_MINOR_VERSION=`echo $CC_VERSION | awk -F\. '{ print $2 }'`
-        MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
-        
-        CFLAGS="$CFLAGS -W3 -nologo -GF -Gy"
-        DLLFLAGS='-OUT:"$@"'
-        _DEBUG_FLAGS=-Z7
-        _OPTIMIZE_FLAGS=-O2
-        if test -z "$MOZ_OPTIMIZE"; then
-            CFLAGS="$CFLAGS -Od"
-        fi
-
-        if test -n "$USE_DEBUG_RTL"; then
-            CFLAGS="$CFLAGS -MDd"
-        else
-            CFLAGS="$CFLAGS -MD"
-        fi
-
-        if test -n "$MOZ_DEBUG"; then
-            AC_DEFINE(_DEBUG)
-        else
-            DEFINES="$DEFINES -U_DEBUG"
-        fi
-
-        if test -n "$MOZ_OPTIMIZE"; then
-            if test -n "$MOZ_PROFILE"; then
-                _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Z7"
-            fi
-            if test -n "$MOZ_DEBUG_SYMBOLS"; then
-                _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Zi"
-            fi
-            if test -n "$MOZ_PROFILE" -o -n "$MOZ_DEBUG_SYMBOLS"; then
-                DLLFLAGS="$DLLFLAGS -DEBUG -OPT:REF"
-                LDFLAGS="$LDFLAGS -DEBUG -OPT:REF"
-            fi
-        fi
-
-        if test -n "$MOZ_DEBUG"; then
-            DLLFLAGS="$DLLFLAGS -DEBUG"
-            LDFLAGS="$LDFLAGS -DEBUG"
-        fi
-
-        OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS"
-        if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
-            OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE"
-        fi
-        
-        if test "$OS_TARGET" = "WINNT"; then
-            CFLAGS="$CFLAGS -GT"
-            if test "$CPU_ARCH" = "x86"; then
-                CFLAGS="$CFLAGS -G5"
-            fi
-            LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-            LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-        else
-            LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-            LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-        fi
-    fi # GNU_CC
-
-    if test -n "$USE_STATIC_TLS"; then
-        AC_DEFINE(_PR_USE_STATIC_TLS)
-    fi
-
-    if test "$OS_TARGET" = "WINNT"; then
-        AC_DEFINE(WINNT)
-    else
-        AC_DEFINE(WIN95)
-        # undefine WINNT as some versions of mingw gcc define it by default
-        DEFINES="$DEFINES -UWINNT"
-        AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
-    fi
-
-    if test "$CPU_ARCH" = "x86"; then
-        CPU_ARCH_TAG=
-    else
-        CPU_ARCH_TAG=$CPU_ARCH
-    fi
-
-    if test -n "$USE_DEBUG_RTL"; then
-        OBJDIR_SUFFIX=OBJD
-    fi
-
-    case "$OS_TARGET" in
-    WINNT)
-	    MDCPUCFG_H=_winnt.cfg
-	    ;;
-    WIN95)
-	    MDCPUCFG_H=_win95.cfg
-	    ;;
-    WIN16)
-	    MDCPUCFG_H=_win16.cfg
-	    ;;
-    *)
-	    AC_MSG_ERROR([Missing OS_TARGET for ${target}.  Use --enable-win32-target to set.])
-   	;;
-    esac
-
-    case "$target_cpu" in
-    i*86)
-	if test -n "$USE_64"; then
-	    AC_DEFINE(_AMD64_)
-	    AC_DEFINE(_M_AMD64)    
-	else		
-	    AC_DEFINE(_X86_)
-	fi
-        ;;
-    alpha)
-	    AC_DEFINE(_ALPHA_)
-   	    ;;
-    mips)
-	    AC_DEFINE(_MIPS_)
-	    ;;
-    x86_64)
-	    AC_DEFINE(_AMD64_)
-	    AC_DEFINE(_M_AMD64)
-	    USE_64=1
-	    ;;
-    ia64)
-	    AC_DEFINE(_IA64_)
-	    AC_DEFINE(_M_IA64)
-	    USE_64=1
-	    ;;
-    *)
-	    AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
-	    ;;
-    esac
-
-    if test "$USE_64"; then
-        AC_DEFINE(_WIN64)
-    fi
-
-    ;;
-
-*-ncr-sysv*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(SYSV)
-    AC_DEFINE(NCR)
-    USE_NSPR_THREADS=1
-    if test "$OS_RELEASE" = "2.03"; then
-        AC_DEFINE(_PR_STAT_HAS_ST_ATIM)
-    else
-        AC_DEFINE(_PR_STAT_HAS_ST_ATIM_UNION)
-    fi
-
-    if test -z "$GNU_CC"; then
-        CFLAGS="$CFLAGS -Hnocopyr"
-        CXXFLAGS="$CXXFLAGS -Hnocopyr"
-    else
-        CFLAGS="$CFLAGS -fPIC -Wall"
-        CXXFLAGS="$CXXFLAGS -fPIC -Wall"
-        DSO_LDOPTS=-G
-    fi
-    MDCPUCFG_H=_ncr.cfg
-    PR_MD_CSRCS=ncr.c
-    ;;
-
-mips-nec-sysv*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(__SVR4)
-    AC_DEFINE(NEC)
-    AC_DEFINE(nec_ews)
-    USE_NSPR_THREADS=1
-    if test -z "$GNU_CC"; then
-        CC='$(NSDEPTH)/build/hcc cc -Xa -KGnum=0 -KOlimit=4000'
-        CXX=g++
-    fi
-    OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl"
-    DSO_LDOPTS=-G
-    MDCPUCFG_H=_nec.cfg
-    PR_MD_CSRCS=nec.c
-    ;;
-
-*-netbsd*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(NETBSD)
-    AC_DEFINE(HAVE_BSD_FLOCK)
-    USE_NSPR_THREADS=1
-    MDCPUCFG_H=_netbsd.cfg
-    PR_MD_CSRCS=netbsd.c
-
-    DSO_CFLAGS='-fPIC -DPIC'
-    CFLAGS="$CFLAGS -ansi -Wall"
-    CXXFLAGS="$CXXFLAGS -ansi -Wall"
-    MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS) $(OS_LDFLAGS) '
-
-    if test -z "$OBJECT_FMT"; then
-        if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then
-            OBJECT_FMT=a.out
-            DLL_SUFFIX=so.1.0
-            DSO_LDOPTS='-shared'
-        else
-            OBJECT_FMT=ELF
-            DLL_SUFFIX=so
-            DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
-        fi
-    fi
-
-    if test "$LIBRUNPATH"; then
-        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-    fi
-    ;;
-
-mips-sony-newsos*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SONY)
-    AC_DEFINE(SYSV)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(__svr4)
-    AC_DEFINE(__svr4__)
-    AC_DEFINE(HAVE_SVID_GETTOD)
-    USE_NSPR_THREADS=1
-    CFLAGS="$CFLAGS -Xa -fullwarn"
-    CXXFLAGS="$CXXFLAGS -Xa -fullwarn"
-    DSO_LDOPTS=-G
-    MDCPUCFG_H=_sony.cfg
-    PR_MD_CSRCS=sony.c
-    ;;
-
-*-nextstep*|*-openstep*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(NEXTSTEP)
-    AC_DEFINE(HAVE_BSD_FLOCK)
-    AC_DEFINE(_POSIX_SOURCE)
-    CFLAGS="$CFLAGS -Wall -fno-common -traditional-cpp -posix"
-    CXXFLAGS="$CXXFLAGS -Wall -fno-common -traditional-cpp -posix"
-    USE_NSPR_THREADS=1
-    DLL_SUFFIX=dylib
-    MDCPUCFG_H=_nextstep.cfg
-    PR_MD_CSRCS=nextstep.c
-    ;;
-
-
-*-nto*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(NTO)
-    AC_DEFINE(_QNX_SOURCE)
-    AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-    MDCPUCFG_H=_nto.cfg
-    PR_MD_CSRCS=nto.c
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(notdir $@) -o $@'
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS=-shared
-    OS_LIBS="$OS_LIBS -lsocket"
-    _OPTIMIZE_FLAGS="-O1"
-    _DEBUG_FLAGS="-gstabs"
-	;;
-
-*-openbsd*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(OPENBSD)
-    AC_DEFINE(HAVE_BSD_FLOCK)
-    AC_DEFINE(HAVE_SOCKLEN_T)
-    AC_DEFINE(_PR_HAVE_GETPROTO_R)
-    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
-    CFLAGS="$CFLAGS -ansi -Wall"
-    CXXFLAGS="$CXXFLAGS -ansi -Wall"
-    DLL_SUFFIX=so.1.0
-    DSO_CFLAGS=-fPIC
-    MDCPUCFG_H=_openbsd.cfg
-    PR_MD_CSRCS=openbsd.c
-    if test -z "$USE_NSPR_THREADS"; then
-        USE_PTHREADS=1
-    fi
-    DSO_LDOPTS='-shared -fPIC'
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-    ;;
-
-*-openvms*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(VMS)
-    AC_DEFINE(PR_GETIPNODE_NOT_THREADSAFE)
-    RESOLVE_LINK_SYMBOLS=1
-    AR_FLAGS='c $@'
-    MDCPUCFG_H=_openvms.cfg
-    PR_MD_CSRCS=openvms.c
-    DSO_LDOPTS='-shared -auto_symvec $(LDFLAGS)'
-    if test -n "$MOZ_DEBUG"; then
-      DSO_LDOPTS="$DSO_LDOPTS $_DEBUG_FLAGS"
-    else
-      DSO_LDOPTS="$DSO_LDOPTS $_OPTIMIZE_FLAGS"
-    fi
-    ;;
-
-*-osf*)
-    SHELL_OVERRIDE="SHELL		= /usr/bin/ksh"
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(OSF1)
-    AC_DEFINE(_REENTRANT)
-    # OSF1 and HPUX report the POLLHUP event for a socket when the
-    # shutdown(SHUT_WR) operation is called for the remote end, even though
-    # the socket is still writeable. Use select(), instead of poll(), to
-    # workaround this problem.
-    AC_DEFINE(_PR_POLL_WITH_SELECT)
-
-    if echo "$OS_RELEASE" | egrep -c '(V2.0|V3.2)' 2>/dev/null ; then
-        USE_NSPR_THREADS=1
-    fi
-
-    if test -z "$GNU_CC"; then
-        CC="$CC -std1 -ieee_with_inexact"
-        if test "$OS_RELEASE" != "V2.0"; then
-            CC="$CC -readonly_strings"
-        fi
-        _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
-        AC_CHECK_HEADER(machine/builtins.h, AC_DEFINE(OSF1_HAVE_MACHINE_BUILTINS_H))
-    else
-        CFLAGS="$CFLAGS -mieee"
-        CXXFLAGS="$CXXFLAGS -mieee"
-    fi
-
-    if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then
-        AC_DEFINE(HAVE_INT_LOCALTIME_R)
-    else
-        AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-    fi
-    if echo $OS_RELEASE | grep -c V4.0 >/dev/null; then
-        AC_DEFINE(OSF1V4_MAP_PRIVATE_BUG)
-    fi
-    DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)'
-    MDCPUCFG_H=_osf1.cfg
-    PR_MD_CSRCS=osf1.c
-    ;;
-
-*-qnx*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(QNX)
-    AC_DEFINE(_PR_NEED_H_ERRNO)
-    USE_NSPR_THREADS=1
-    MDCPUCFG_H=_qnx.cfg
-    PR_MD_CSRCS=qnx.c
-    ;;
-
-*-riscos*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(RISCOS)
-    AC_DEFINE(_PR_NEED_H_ERRNO)
-    USE_PTHREADS=1
-    MDCPUCFG_H=_riscos.cfg
-    PR_MD_CSRCS=riscos.c
-    DLL_SUFFIX=a
-    LD="/home/riscos/env/ro-ar cr"
-    ;;
-
-*-*-sco*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SCO)
-    AC_DEFINE(sco)
-    AC_DEFINE(SYSV)
-    AC_DEFINE(_SVID3)
-    AC_DEFINE(_PR_NEED_H_ERRNO)
-    CC='cc -b elf -KPIC'
-    CXX='$(NSDEPTH)/build/hcpp CC +.cpp +w'
-    USE_NSPR_THREADS=1
-    CPU_ARCH=x86
-    DSO_LDOPTS='-b elf -G'
-    MDCPUCFG_H=_scoos.cfg
-    PR_MD_SRCS=scoos.c
-    ;;
-
-*-sinix*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(SNI)
-    AC_DEFINE(RELIANTUNIX)
-    AC_DEFINE(sinix)
-    AC_DEFINE(HAVE_SVID_GETTOD)
-    if echo "$OS_TEST" | grep -c 86 2>/dev/null; then
-        AC_DEFINE(i386)
-        CPU_ARCH=x86
-    else
-        CPU_ARCH=mips
-    fi
-
-    if test "$GNU_CC"; then
-        AS='$(CC) -x assembler-with-cpp'
-        if test "$CPU_ARCH" = "mips"; then
-            LD=gld
-        fi
-        CFLAGS="$CFLAGS -Wall -Wno-format"
-    else
-        AS='/usr/bin/cc'
-        _OPTIMIZE_FLAGS='-O -F Olimit,4000'
-    fi
-
-    DSO_LDOPTS='-G -z defs -h $(@:$(OBJDIR)/%.so=%.so)'
-
-    if test "$OS_RELEASE" = "5.43"; then
-        AC_DEFINE(IP_MULTICAST)
-    fi
-
-    OS_LIBS="$OS_LIBS -lsocket -lnsl -lresolv -ldl -lc"
-    USE_NSPR_THREADS=1
-    MDCPUCFG_H=_reliantunix.cfg
-    PR_MD_CSRCS=reliantunix.c
-    if test "${OS_ARCH}" = "mips"; then
-        PR_MD_ASFILES=os_ReliantUNIX.s
-    fi
-    ;;
-
-*-sunos*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SUNOS4)
-#    CFLAGS="$CFLAGS -Wall -Wno-format"
-    if test "$USE_MDUPDATE"; then
-        CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
-    fi
-    CPU_ARCH=sparc
-    DLL_SUFFIX=so.1.0
-    DSO_LDOPTS=
-    DSO_CFLAGS=-fPIC
-    USE_NSPR_THREADS=1
-    if test "$OS_RELEASE" = "4.1.3_U1"; then
-        _OPTIMIZE_FLAGS=
-        OS_LIBS="$OS_LIBS -lm"
-    fi
-    MDCPUCFG_H=_sunos4.cfg
-    PR_MD_CSRCS=sunos4.c
-    ;;
-
-*-solaris*)
-    if test -z "$USE_USER_THREADS" && test -z "$USE_NATIVE_THREADS"; then
-        USE_PTHREADS=1
-    fi
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(SYSV)
-    AC_DEFINE(__svr4)
-    AC_DEFINE(__svr4__)
-    AC_DEFINE(SOLARIS)
-    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-    MDCPUCFG_H=_solaris.cfg
-    PR_MD_CSRCS=solaris.c
-    LD=/usr/ccs/bin/ld
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
-    RESOLVE_LINK_SYMBOLS=1
-    if test -n "$GNU_CC"; then
-        DSO_CFLAGS=-fPIC
-        if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
-            GCC_USE_GNU_LD=1
-        fi
-        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
-    else
-        DSO_CFLAGS=-KPIC
-        DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
-    fi
-    if test -n "$GNU_CC"; then
-        CFLAGS="$CFLAGS -Wall"
-        CXXFLAGS="$CXXFLAGS -Wall"
-        if test -n "$USE_MDUPDATE"; then
-            CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
-            CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
-        fi
-        GCC_AS=`$CC -print-prog-name=as`
-        if test "`echo | $GCC_AS -v 2>&1 | grep -c GNU`" != "0"; then
-            GNU_AS=1
-        fi
-    else
-        CFLAGS="$CFLAGS -xstrconst"
-        CXXFLAGS="$CXXFLAGS -Qoption cg -xstrconst -features=tmplife"
-        if test -z "$MOZ_OPTIMIZE"; then
-            CFLAGS="$CFLAGS -xs"
-            CXXFLAGS="$CXXFLAGS -xs"
-        fi
-        _OPTIMIZE_FLAGS=-xO4
-    fi
-    if test -z "$GNU_AS"; then
-        ASFLAGS="$ASFLAGS -Wa,-P"
-    fi
-    if test -n "$USE_64"; then
-        if test -n "$GNU_CC"; then
-            CC="$CC -m64"
-            CXX="$CXX -m64"
-        else
-            if test "$OS_TEST" = "i86pc"; then
-                CC="$CC -xarch=amd64"
-                CXX="$CXX -xarch=amd64"
-            else
-                CC="$CC -xarch=v9"
-                CXX="$CXX -xarch=v9"
-            fi
-        fi
-    fi
-    if test "$OS_TEST" = "i86pc"; then
-        if test -z "$USE_64"; then
-            AC_DEFINE(i386)
-        fi
-        CPU_ARCH_TAG=_$OS_TEST
-        # The default debug format, DWARF (-g), is not supported by gcc
-        # on i386-ANY-sysv4/solaris, but the stabs format is.  It is
-        # assumed that the Solaris assembler /usr/ccs/bin/as is used.
-        # If your gcc uses GNU as, you do not need the -Wa,-s option.
-        if test -n "$MOZ_DEBUG" && test -n "$GNU_CC"; then
-            _DEBUG_FLAGS=-gstabs
-            if test -z "$GNU_AS"; then
-                _DEBUG_FLAGS="$_DEBUG_FLAGS -Wa,-s"
-            fi
-        fi
-    fi
-    case "${target_os}" in
-    solaris2.3*)
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-        ;;
-    solaris2.4*)
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-        ;;
-    solaris2.5*)
-        AC_DEFINE(SOLARIS2_5)    
-        ;;
-    *)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        # The lfcompile64(5) man page on Solaris 2.6 says:
-        #     For applications that do not wish to conform to the POSIX or
-        #     X/Open  specifications,  the  64-bit transitional interfaces
-        #     are available by default.  No compile-time flags need to  be
-        #     set.
-        # But gcc 2.7.2.x fails to define _LARGEFILE64_SOURCE by default.
-        # The native compiler, gcc 2.8.x, and egcs don't have this problem.
-        if test -n "$GNU_CC"; then
-            AC_DEFINE(_LARGEFILE64_SOURCE)
-        fi
-        ;;
-    esac
-    case "${target_os}" in
-    solaris2.3*)
-        ;;
-    solaris2.4*)
-        ;;
-    solaris2.5*)
-        ;;
-    solaris2.6*)
-        ;;
-    solaris2.7*)
-        ;;
-    *)
-        # Solaris 8 or higher has IPv6.
-        AC_DEFINE(_PR_INET6)
-        ;;
-    esac
-    if test "$OS_TEST" = "sun4u"; then
-        # 64-bit Solaris requires SPARC V9 architecture, so the following
-        # is not needed.
-        if test -z "$USE_64"; then
-            ULTRASPARC_LIBRARY=nspr_flt
-        fi
-    fi
-    # Purify requires that binaries linked against nspr also
-    # be linked against -lrt (or -lposix4) so add it to OS_LIBS
-    _rev=`uname -r`
-    _librt=`echo $_rev 5.6 | awk '{ if ($1 > $2) print "-lrt"; else print "-lposix4" }'`
-    OS_LIBS="$OS_LIBS $_librt"
-    ;;
-
-*-sco-sysv5*)
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(UNIXWARE)
-    AC_DEFINE(SVR4)
-    AC_DEFINE(SYSV)
-    USE_NSPR_THREADS=1
-    if echo $OS_RELEASE | grep -c 2.1 2>/dev/null; then
-        AC_DEFINE(_PR_NO_LARGE_FILES)
-        CC='$(NSDEPTH)/build/hcc cc'
-        CXX='$(NSDEPTH)/build/hcpp CC'
-        MDCPUCFG_H=_unixware.cfg
-    else
-        AC_DEFINE(_LARGEFILE64_SOURCE)
-        AC_DEFINE(_PR_HAVE_OFF64_T)
-        AC_DEFINE(_PR_HAVE_SOCKADDR_LEN)
-        MDCPUCFG_H=_unixware7.cfg
-    fi
-    PR_MD_CSRCS=unixware.c
-    DSO_LDOPTS=-G
-    CPU_ARCH=x86
-    ;;
-
-*-os2*)
-    AC_DEFINE(XP_OS2)
-    AC_DEFINE(XP_PC)
-    AC_DEFINE(BSD_SELECT)
-    AC_DEFINE(TCPV40HDRS)
-    LIB_SUFFIX=lib
-    DLL_SUFFIX=dll
-    RC=rc.exe
-    PR_MD_ARCH_DIR=os2
-    PROG_SUFFIX=.exe
-    NSINSTALL=nsinstall
-    MDCPUCFG_H=_os2.cfg
-    RESOLVE_LINK_SYMBOLS=1
-
-    # EMX/GCC build
-    if test -n "$GNU_CC"; then
-        AC_DEFINE(XP_OS2_EMX)
-        AC_DEFINE(OS2)
-        AR=emxomfar
-        AR_FLAGS='r $@'
-        CFLAGS="$CFLAGS -Wall -Zomf"
-        CXXFLAGS="$CFLAGS -Wall -Zomf"
-        MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-        DSO_CFLAGS=
-        DSO_LDOPTS='-Zomf -Zdll -Zmap'
-        LDFLAGS='-Zmap'
-        _OPTIMIZE_FLAGS="-O2 -s"
-        _DEBUG_FLAGS="-g -fno-inline"
-        if test -n "$MOZ_OPTIMIZE"; then
-          DSO_LDOPTS="$DSO_LDOPTS -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
-        fi
-        OS_LIBS="-lsocket"
-        IMPLIB='emximp -o'
-        FILTER='emxexp -o'
-
-        # GCC for OS/2 currently predefines these, but we don't want them
-        DEFINES="$DEFINES -Uunix -U__unix -U__unix__"
-
-    # Visual Age C++ build
-    elif test "$VACPP" = "yes"; then
-        AC_DEFINE(XP_OS2_VACPP)
-        AC_DEFINE(OS2,4)
-        AC_DEFINE(_X86_)
-        OBJ_SUFFIX=obj
-        AS=alp
-        ASFLAGS='-Mb'
-        ASM_SUFFIX=asm
-        AR=-ilib
-        AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)'
-        CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
-        HOST_CFLAGS="$CFLAGS"
-        OS_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
-        OS_EXE_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
-        CXXFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
-        OS_LIBS='so32dll.lib tcp32dll.lib'
-        LD='-ilink'
-        MKSHLIB='$(LD) $(DSO_LDOPTS)'
-        IMPLIB='implib -nologo -noignorecase'
-        FILTER='cppfilt -q -B -P'
-        _OPTIMIZE_FLAGS='/O+ /Gl+ /qtune=pentium /qarch=pentium'
-        _DEBUG_FLAGS='/Ti+ '
-        LDFLAGS='/NOL /M /L'
-        DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /L /NOL'
-        EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /L /NOL'
-        if test -n "$MOZ_DEBUG"; then
-          LDFLAGS="$LDFLAGS /DE"
-          DLLFLAGS="$DLLFLAGS /DE"
-          EXEFLAGS="$EXEFLAGS /DE"
-        fi
-        if test -n "$MOZ_OPTIMIZE"; then
-          LDFLAGS="$LDFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
-          DLLFLAGS="$DLLFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
-          EXEFLAGS="$EXEFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
-        fi
-        LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-        LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-    fi
-    ;;
-
-*)
-    AC_DEFINE(XP_UNIX)
-    ;;
-   
-esac
-
-if test -z "$SKIP_LIBRARY_CHECKS"; then
-dnl ========================================================
-dnl Check for system libraries
-dnl ========================================================
-dnl AC_CHECK_LIB(C, main)
-dnl AC_CHECK_LIB(C_r, main)
-dnl AC_CHECK_LIB(c, main)
-dnl AC_CHECK_LIB(c_r, main)
-dnl AC_CHECK_LIB(dce, main)
-dnl AC_CHECK_LIB(dl, main)
-dnl AC_CHECK_LIB(dld, main)
-dnl AC_CHECK_LIB(gen, main)
-dnl AC_CHECK_LIB(ip6, main)
-dnl AC_CHECK_LIB(l, main)
-dnl AC_CHECK_LIB(m, main)
-dnl AC_CHECK_LIB(nsl, main)
-dnl AC_CHECK_LIB(posix4, main)
-dnl AC_CHECK_LIB(prstrms, main)
-dnl AC_CHECK_LIB(prstrms_shr, main)
-dnl AC_CHECK_LIB(pthread, main)
-dnl AC_CHECK_LIB(pthreads, main)
-dnl AC_CHECK_LIB(resolv, main)
-dnl AC_CHECK_LIB(rt, main)
-dnl AC_CHECK_LIB(socket, main)
-dnl AC_CHECK_LIB(svld, main)
-dnl AC_CHECK_LIB(thread, main)
-dnl AC_CHECK_LIB(vms_jackets, main)
-
-
-dnl We don't want anything to link with libdl even if it's present on OS X, 
-dnl since it's not used and not part of the default installation.
-dnl The same goes for BeOS.
-
-case $target in
-*-darwin*|*-beos*)
-    ;;
-*)
-    AC_CHECK_LIB(dl, dlopen,
-        [AC_CHECK_HEADER(dlfcn.h, OS_LIBS="-ldl $OS_LIBS")])
-    ;;
-esac
-
-
-dnl ========================================================
-dnl Check for system header files.
-dnl ========================================================
-dnl AC_HEADER_DIRENT
-dnl AC_HEADER_STDC
-dnl AC_HEADER_SYS_WAIT
-dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
-
-dnl ========================================================
-dnl Check for typedefs and structs
-dnl ========================================================
-dnl AC_C_CONST
-dnl AC_TYPE_UID_T
-dnl AC_TYPE_MODE_T
-dnl AC_TYPE_OFF_T
-dnl AC_TYPE_PID_T
-dnl AC_TYPE_SIZE_T
-dnl AC_STRUCT_ST_BLKSIZE
-dnl AC_STRUCT_ST_BLOCKS
-dnl AC_STRUCT_ST_RDEV
-dnl AC_HEADER_TIME
-dnl AC_STRUCT_TM
-
-dnl ========================================================
-dnl Checks for library functions.
-dnl ========================================================
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_CHECK_FUNCS(lchown strerror)
-
-dnl AC_FUNC_MEMCMP
-dnl AC_FUNC_MMAP
-dnl AC_FUNC_SETVBUF_REVERSED
-dnl AC_FUNC_STRCOLL
-dnl AC_FUNC_STRFTIME
-dnl AC_FUNC_UTIME_NULL
-dnl AC_FUNC_VPRINTF
-dnl AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strerror strstr strtol strtoul uname)
-
-dnl ========================================================
-dnl Check options
-dnl ========================================================
-
-dnl ========================================================
-dnl =
-dnl = --enable-strip
-dnl = 
-dnl = Enable stripping of libs and executables
-dnl = 
-dnl ========================================================
-AC_ARG_ENABLE(strip,
-    [  --enable-strip          Enable stripping of shared libs and programs],
-    [ if test "$enableval" = "yes"; then
-	    ENABLE_STRIP=1
-      fi ])
-
-dnl Check for hpux options
-case "${target_os}" in
-hpux*)
-if test -z "$GNU_CC"; then
-
-    AC_CACHE_CHECK(for +Olit support,
-        ac_cv_hpux_usable_olit_option,
-        dnl since aCC doesn't throw an error on invalid options,
-        dnl we have to test this the hard way
-        [ac_cv_hpux_usable_olit_option=no
-        rm -f conftest*
-        echo 'int main() { return 0; }' | cat > conftest.c
-        ${CC-cc} ${CFLAGS} +Olit=all -o conftest conftest.c > conftest.out 2>&1
-        if test $? -eq 0; then
-            if test -z "`egrep -i '(unrecognize|unknown)' conftest.out`"; then
-                ac_cv_hpux_usable_olit_option=yes
-            fi
-        fi
-        rm -f conftest*
-        ])
-
-    if test "$ac_cv_hpux_usable_olit_option" = "yes"; then
-        CFLAGS="$CFLAGS +Olit=all"
-        CXXFLAGS="$CXXFLAGS +Olit=all"
-    else
-        CFLAGS="$CFLAGS +ESlit"
-        CXXFLAGS="$CXXFLAGS +ESlit"
-    fi
-fi
-;;
-esac
-
-dnl
-dnl Apparently, some systems cannot properly check for the pthread
-dnl library unless <pthread.h> is included so we need to test
-dnl using it
-dnl
-dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN([MOZ_CHECK_PTHREADS],
-[
-AC_MSG_CHECKING([for pthread_create in -l$1])
-echo "
-    #include <pthread.h> 
-    void *foo(void *v) { return v; } 
-    int main() { 
-        pthread_t t;
-        if (!pthread_create(&t, 0, &foo, 0)) {
-            pthread_join(t, 0);
-        }
-        return 0;
-    }" > dummy.c ;
-    echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS" 1>&5;
-    ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS 2>&5;
-    _res=$? ;
-    rm -f dummy.c dummy${ac_exeext} ;
-    if test "$_res" = "0"; then
-        AC_MSG_RESULT([yes])
-        [$2]
-    else
-        AC_MSG_RESULT([no])
-        [$3]
-    fi
-])
-
-case "$target_os" in
-darwin*)
-    _HAVE_PTHREADS=1
-    ;;
-*)
-    MOZ_CHECK_PTHREADS(pthread,
-        _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-        MOZ_CHECK_PTHREADS(pthreads,
-            _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-            MOZ_CHECK_PTHREADS(c_r,
-                _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-                MOZ_CHECK_PTHREADS(c,
-                    _HAVE_PTHREADS=1
-                )
-            )
-        )
-    )
-    ;;
-esac
-
-AC_ARG_WITH(pthreads,
-    [  --with-pthreads         Use system pthreads library as thread subsystem],
-    [ if test "$withval" = "yes"; then
-	    if test -n "$_HAVE_PTHREADS"; then
-		    USE_PTHREADS=1 
-		    USE_USER_PTHREADS=
-		    USE_NSPR_THREADS=
-	    else
-		    AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]);
-	    fi
-	  else
-	    USE_PTHREADS=
-	    _PTHREAD_LDFLAGS=
-	  fi],
-	[ if test -n "$_HAVE_PTHREADS" && test -z "$USE_USER_PTHREADS" && test -z "$USE_NSPR_THREADS"; then
-	    USE_PTHREADS=1
-	    USE_USER_PTHREADS=
-	    USE_NSPR_THREADS=
-	  fi])
-
-AC_ARG_ENABLE(user-pthreads,
-    [  --enable-user-pthreads  Build using userland pthreads],
-    [ if test "$enableval" = "yes"; then
-        if test -n "$_HAVE_PTHREADS"; then
-		    USE_PTHREADS=
-		    USE_USER_PTHREADS=1
-		    USE_NSPR_THREADS=
-	    else
-		    AC_MSG_ERROR([ --enable-user-pthreads specified for a system without pthread support ]);
-	    fi
-	  fi])
-
-AC_ARG_ENABLE(nspr-threads,
-    [  --enable-nspr-threads   Build using classic nspr threads],
-    [ if test "$enableval" = "yes"; then
-	    USE_PTHREADS=
-	    USE_USER_PTHREADS=
-	    USE_NSPR_THREADS=1
-	  fi])
-
-case "$target" in
-*-beos*)
-    AC_ARG_WITH(bthreads,
-    [  --with-bthreads         Use system bthreads library as thread subsystem
-                          (BeOS only)],
-    [	if test "$withval" = "yes"; then
-    	    USE_BTHREADS=1
-	        USE_USER_PTHREADS=
-	        USE_PTHREADS=
-	    fi])
-    ;;
-
-*-solaris*)
-    AC_ARG_WITH(native-threads,
-    [  --with-native-threads   Use native system threads as thread subsystem
-                          (Solaris only)],
-    [ if test "$withval" = "yes"; then
-	    USE_NATIVE_THREADS=1
-	    USE_USER_PTHREADS=
-	    USE_PTHREADS=
-	  fi])
-    ;;
-esac
-
-fi # SKIP_LIBRARY_CHECKS
-
-AC_ARG_ENABLE(cplus,
-    [  --enable-cplus          Enable some c++ api routines],
-    [ if test "$enableval" = "yes"; then
-	    USE_CPLUS=1
-      fi]) 
-
-AC_ARG_ENABLE(ipv6,
-    [  --enable-ipv6           Compile ipv6 support],
-    [ if test "$enableval" = "yes"; then
-	    USE_IPV6=1
-      else
-	    USE_IPV6=
-      fi])
-
-
-AC_ARG_ENABLE(boehm,
-    [  --enable-boehm          Enable the Boehm Garbage Collector],
-    [ if test "$enableval" = "yes"; then
-        AC_DEFINE(GC_LEAK_DETECTOR)
-        GC_LEAK_DETECTOR=1
-    fi])
-
-if test -n "$USE_PTHREADS"; then
-   dnl See if -pthread is supported.
-   rm -f conftest*
-   ac_cv_have_dash_pthread=no
-   AC_MSG_CHECKING(whether ${CC-cc} accepts -pthread)
-   echo 'int main() { return 0; }' | cat > conftest.c
-   ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
-   if test $? -eq 0; then
-	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-	    ac_cv_have_dash_pthread=yes
-		case "$target_os" in
-	    freebsd*)
-# Freebsd doesn't use -pthread for compiles, it uses them for linking
-            ;;
-	    *)
-            CFLAGS="$CFLAGS -pthread"
-            CXXFLAGS="$CXXFLAGS -pthread"
-            ;;
-        esac
-	fi
-    fi
-    rm -f conftest*
-    AC_MSG_RESULT($ac_cv_have_dash_pthread)
-
-	dnl
-	dnl See if -pthreads is supported.
-	dnl
-    ac_cv_have_dash_pthreads=no
-    if test "$ac_cv_have_dash_pthread" = "no"; then
-	    AC_MSG_CHECKING(whether ${CC-cc} accepts -pthreads)
-    	echo 'int main() { return 0; }' | cat > conftest.c
-	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
-    	if test $? -eq 0; then
-	    	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-			    ac_cv_have_dash_pthreads=yes
-			    CFLAGS="$CFLAGS -pthreads"
-			    CXXFLAGS="$CXXFLAGS -pthreads"
-		    fi
-	    fi
-	    rm -f conftest*
-    	AC_MSG_RESULT($ac_cv_have_dash_pthreads)
-    fi
-
-    case "$target" in
-    *-solaris*)
-        if test "$ac_cv_have_dash_pthreads" = "yes"; then
-            _PTHREAD_LDFLAGS=
-        fi
-	    ;;
-    *-freebsd*)
-	    AC_DEFINE(_REENTRANT)
-	    AC_DEFINE(_THREAD_SAFE)
-	    ;;
-    *-netbsd*)
-	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-	        _PTHREAD_LDFLAGS="-pthread"
-	    fi
-	    ;;
-    *-bsdi*)
-	    AC_DEFINE(_THREAD_SAFE)
-	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-	        _PTHREAD_LDFLAGS=
-	    fi
-	    ;;
-    *-openbsd*)
-        if test "$ac_cv_have_dash_pthread" = "yes"; then
-            _PTHREAD_LDFLAGS=-pthread
-        fi
-        ;;
-    *-linux*|*-gnu*|*-k*bsd*-gnu)
-        AC_DEFINE(_REENTRANT)
-        ;;
-    esac
-
-else 
-    if test -n "$USE_USER_PTHREADS"; then
-	    USE_PTHREADS=
-	    USE_NSPR_THREADS=
-    else
-        _PTHREAD_LDFLAGS=
-    fi
-fi
-dnl Special thread exceptions
-
-case "$target" in
-*-aix*)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi
-    case "$target_os" in
-    aix4.1*)
-        if test -z "$USE_PTHREADS"; then
-            AC_DEFINE(AIX_RENAME_SELECT)
-        fi
-        ;;
-    aix4.2*)
-        if test -z "$USE_NSPR_THREADS"; then
-            AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-        fi
-        ;;
-    aix4.3*)
-        if test -z "$USE_NSPR_THREADS"; then
-            AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-        fi
-        if test -n "$USE_PTHREADS"; then
-            AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST)
-        fi
-        ;;
-    *)
-        if test -z "$USE_NSPR_THREADS"; then
-            AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-        fi
-        if test -n "$USE_PTHREADS"; then
-            AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST)
-        fi
-        ;;
-    esac
-    ;;
-*-bsdi*)
-    if test -n "$USE_PTHREADS"; then
-        AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-    fi
-    ;;
-*-freebsd*)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi
-    ;;
-*-hpux*)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi 
-    if test "$USE_PTHREADS"; then
-        if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then
-            AC_DEFINE(_REENTRANT)
-            AC_DEFINE(_PR_DCETHREADS)
-        else
-            AC_DEFINE_UNQUOTED(_POSIX_C_SOURCE,199506L)
-            AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST)
-        fi
-    fi
-    if test "$USE_USER_PTHREADS"; then
-        AC_DEFINE_UNQUOTED(_POSIX_C_SOURCE,199506L)
-    fi
-    ;;
-*-irix*)
-    if test "${target_os}" = "irix6.5"; then
-        if test -n "$USE_PTHREADS"; then
-            AC_DEFINE(_PR_HAVE_GETHOST_R)
-            AC_DEFINE(_PR_HAVE_GETHOST_R_POINTER)
-        fi
-    fi
-    ;;
-*-linux*|*-gnu*|*-k*bsd*-gnu)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi
-    ;;
-*-mingw*|*-cygwin*|*-msvc*|*-mks*|*-os2*|*-beos*)
-    dnl win32, os2 & beos cannot use pthreads
-    USE_PTHREADS=
-    _PTHREAD_LDFLAGS=
-    USE_USER_PTHREADS=
-    ;;
-*-netbsd*|*-openbsd*)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi
-    ;;
-*-osf*)
-    if test -n "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-    fi
-    if test -n "$USE_PTHREADS"; then
-        if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then
-            :
-        else
-            AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST)
-        fi
-    fi
-    ;;
-*-solaris*)
-    if test -n "$USE_NATIVE_THREADS"; then
-        AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
-    else
-        if test -n "$USE_NSPR_THREADS"; then
-            AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-        fi
-    fi
-    if test -z "$USE_NSPR_THREADS"; then
-        AC_DEFINE(_REENTRANT)
-        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
-        if test "$OS_TEST" = "i86pc"; then
-            if test -n "$USE_64"; then
-               PR_MD_ASFILES=os_SunOS_x86_64.s
-            else
-               PR_MD_ASFILES=os_SunOS_x86.s
-            fi
-        else
-            if test -n "$USE_64"; then
-                PR_MD_ASFILES=os_SunOS_sparcv9.s
-            fi
-            if test -n "$USE_NATIVE_THREADS"; then
-                PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS.s"
-            fi
-        fi
-    fi
-    ;;
-*-nto*)
-    if test -n "$USE_PTHREADS"; then
-        AC_DEFINE(_PR_HAVE_GETHOST_R)
-        AC_DEFINE(_PR_HAVE_GETHOST_R_POINTER)
-    fi
-    ;;
-esac
-
-OS_LIBS="$_PTHREAD_LDFLAGS $OS_LIBS"
-
-dnl If the user passed in arg to --enable-optimize or --enable-debug,
-dnl make sure that we use it.
-if test -n "$_SAVE_OPTIMIZE_FLAGS"; then
-    _OPTIMIZE_FLAGS="$_SAVE_OPTIMIZE_FLAGS"
-fi
-
-if test -n "$_SAVE_DEBUG_FLAGS"; then
-    _DEBUG_FLAGS="$_SAVE_DEBUG_FLAGS"
-fi
-
-if test -n "$MOZ_OPTIMIZE"; then
-    CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS"
-    CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS"
-fi
-
-if test -n "$MOZ_DEBUG"; then
-    CFLAGS="$CFLAGS $_DEBUG_FLAGS"
-    CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS"
-fi
-
-if test -n "$MOZ_OPTIMIZE"; then
-    OBJDIR_TAG=_OPT
-else
-    OBJDIR_TAG=_DBG
-fi
-
-if test -n "$USE_64"; then
-    COMPILER_TAG=_64
-fi
-
-RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
-
-dnl ========================================================
-dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
-dnl ========================================================
-case "$target_os" in
-cygwin*|msvc*|mks*)
-    CC="\$(CYGWIN_WRAPPER) $CC"
-    CXX="\$(CYGWIN_WRAPPER) $CXX"
-    RC="\$(CYGWIN_WRAPPER) $RC"
-    ;;
-esac
-
-
-dnl ========================================================
-dnl Substitution of found variables.
-dnl ========================================================
-AC_SUBST(SHELL_OVERRIDE)
-
-AC_SUBST(MOZILLA_CLIENT)
-AC_SUBST(CC)
-AC_SUBST(CXX)
-AC_SUBST(CFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(HOST_CC)
-AC_SUBST(HOST_CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(HOST_LDFLAGS)
-AC_SUBST(GNU_CC)
-AC_SUBST(GCC_USE_GNU_LD)
-AC_SUBST(MSC_VER)
-AC_SUBST(CROSS_COMPILE)
-
-AC_SUBST(MOZ_OPTIMIZE)
-
-AC_SUBST(USE_CPLUS)
-AC_SUBST(USE_IPV6)
-AC_SUBST(USE_N32)
-AC_SUBST(USE_64)
-AC_SUBST(OBJECT_MODE)
-AC_SUBST(GC_LEAK_DETECTOR)
-AC_SUBST(ENABLE_STRIP)
-
-AC_SUBST(USE_PTHREADS)
-AC_SUBST(USE_BTHREADS)
-AC_SUBST(USE_USER_PTHREADS)
-AC_SUBST(USE_NATIVE_THREADS)
-AC_SUBST(USE_NSPR_THREADS)
-
-AC_SUBST(LIBNSPR)
-AC_SUBST(LIBPLC)
-
-AC_SUBST(MOD_MAJOR_VERSION)
-AC_SUBST(MOD_MINOR_VERSION)
-AC_SUBST(MOD_PATCH_VERSION)
-AC_SUBST(NSPR_MODNAME)
-AC_SUBST(MDCPUCFG_H)
-AC_SUBST(PR_MD_CSRCS)
-AC_SUBST(PR_MD_ASFILES)
-AC_SUBST(PR_MD_ARCH_DIR)
-AC_SUBST(CPU_ARCH)
-
-AC_SUBST(OBJ_SUFFIX)
-AC_SUBST(LIB_SUFFIX)
-AC_SUBST(DLL_SUFFIX)
-AC_SUBST(ASM_SUFFIX)
-AC_SUBST(MKSHLIB)
-AC_SUBST(DSO_CFLAGS)
-AC_SUBST(DSO_LDOPTS)
-
-AC_SUBST(OS_TARGET)
-AC_SUBST(OS_ARCH)
-AC_SUBST(OS_RELEASE)
-AC_SUBST(OS_TEST)
-AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
-
-AC_SUBST(DEFINES)
-AC_SUBST(DEFS)
-AC_SUBST(AR)
-AC_SUBST(AR_FLAGS)
-AC_SUBST(AS)
-AC_SUBST(ASFLAGS)
-AC_SUBST(LD)
-AC_SUBST(RANLIB)
-AC_SUBST(PERL)
-AC_SUBST(STRIP)
-AC_SUBST(FILTER)
-AC_SUBST(IMPLIB)
-
-AC_SUBST(OS_LIBS)
-AC_SUBST(RESOLVE_LINK_SYMBOLS)
-AC_SUBST(AIX_LINK_OPTS)
-AC_SUBST(NOSUCHFILE)
-AC_SUBST(MOZ_OBJFORMAT)
-AC_SUBST(ULTRASPARC_LIBRARY)
-
-AC_SUBST(OBJDIR)
-AC_SUBST(OBJDIR_NAME)
-AC_SUBST(RELEASE_OBJDIR_NAME)
-AC_SUBST(NSINSTALL)
-AC_SUBST(OPTIMIZER)
-AC_SUBST(RC)
-AC_SUBST(RCFLAGS)
-AC_SUBST(DLLFLAGS)
-AC_SUBST(EXEFLAGS)
-AC_SUBST(OS_DLLFLAGS)
-AC_SUBST(CYGWIN_WRAPPER)
-AC_SUBST(VISIBILITY_FLAGS)
-AC_SUBST(WRAP_SYSTEM_INCLUDES)
-AC_SUBST(MACOS_SDK_DIR)
-AC_SUBST(NEXT_ROOT)
-
-dnl ========================================================
-dnl Generate output files.
-dnl ========================================================
-MAKEFILES="
-Makefile 
-config/Makefile
-config/autoconf.mk
-config/nsprincl.mk
-config/nsprincl.sh
-config/nspr-config
-lib/Makefile 
-lib/ds/Makefile 
-lib/libc/Makefile 
-lib/libc/include/Makefile 
-lib/libc/src/Makefile 
-lib/tests/Makefile
-pkg/Makefile
-pkg/linux/Makefile
-pkg/solaris/Makefile
-pkg/solaris/SUNWpr/Makefile
-pkg/solaris/SUNWprd/Makefile
-pr/Makefile 
-pr/include/Makefile 
-pr/include/md/Makefile 
-pr/include/obsolete/Makefile 
-pr/include/private/Makefile 
-pr/src/Makefile 
-pr/src/io/Makefile 
-pr/src/linking/Makefile 
-pr/src/malloc/Makefile 
-pr/src/md/Makefile 
-pr/src/md/${PR_MD_ARCH_DIR}/Makefile 
-pr/src/memory/Makefile 
-pr/src/misc/Makefile 
-pr/src/threads/Makefile 
-pr/tests/Makefile 
-pr/tests/dll/Makefile 
-"
-
-dnl lib/tests/Makefile
-dnl pr/tests/w16gui/Makefile
-dnl tools/Makefile
-
-if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
-    MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
-elif test -n "$USE_PTHREADS"; then
-    MAKEFILES="$MAKEFILES pr/src/pthreads/Makefile"
-elif test -n "$USE_BTHREADS"; then
-    MAKEFILES="$MAKEFILES pr/src/bthreads/Makefile"
-fi
-
-if test -n "$USE_CPLUS"; then
-    MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
-fi
-
-# mmkay, this fixes things on FreeBSD-7.1(-rc1)...
-MAKEFILES="`echo $MAKEFILES | tr -d '\n'`"
-
-AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
diff --git a/libs/js/nsprpub/include/.empty b/libs/js/nsprpub/include/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/lib/.cvsignore b/libs/js/nsprpub/lib/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/Makefile.in b/libs/js/nsprpub/lib/Makefile.in
deleted file mode 100644
index 9bdc078e9c..0000000000
--- a/libs/js/nsprpub/lib/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-export NSPR20=1
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = ds libc
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/lib/ds/.cvsignore b/libs/js/nsprpub/lib/ds/.cvsignore
deleted file mode 100644
index bcab60f5aa..0000000000
--- a/libs/js/nsprpub/lib/ds/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pl_bld.h
diff --git a/libs/js/nsprpub/lib/ds/MANIFEST b/libs/js/nsprpub/lib/ds/MANIFEST
deleted file mode 100644
index ceda33b7bf..0000000000
--- a/libs/js/nsprpub/lib/ds/MANIFEST
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-plarenas.h
-plarena.h
-plhash.h
diff --git a/libs/js/nsprpub/lib/ds/Makefile.in b/libs/js/nsprpub/lib/ds/Makefile.in
deleted file mode 100644
index 2916ab7098..0000000000
--- a/libs/js/nsprpub/lib/ds/Makefile.in
+++ /dev/null
@@ -1,202 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include
-
-CSRCS = \
-	plarena.c \
-	plhash.c \
-	plvrsion.c \
-	$(NULL)
-
-HEADERS = \
-	plarenas.h \
-	plarena.h \
-	plhash.h \
-	$(NULL)
-
-HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
-
-ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
-RES=$(OBJDIR)/plds.res
-RESNAME=plds.rc
-endif # WINNT
-
-ifeq ($(OS_ARCH), AIX)
-ifeq ($(CLASSIC_NSPR),1)
-OS_LIBS = -lc
-else
-OS_LIBS = -lc_r
-endif
-endif
-
-ifeq ($(OS_ARCH),IRIX)
-OS_LIBS = -lc
-endif
-
-ifeq ($(OS_ARCH),SunOS)
-OS_LIBS = -lc
-MAPFILE = $(OBJDIR)/pldsmap.sun
-GARBAGE += $(MAPFILE)
-ifdef NS_USE_GCC
-ifdef GCC_USE_GNU_LD
-MKSHLIB += -Wl,--version-script,$(MAPFILE)
-else
-MKSHLIB += -Wl,-M,$(MAPFILE)
-endif
-else
-MKSHLIB += -M $(MAPFILE)
-endif
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
-ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
-GARBAGE += $(MAPFILE)
-MKSHLIB += $(MAPFILE)
-endif
-
-EXTRA_LIBS = $(LIBNSPR)
-
-# On NCR and SCOOS, we can't link with extra libraries when
-# we build a shared library.  If we do so, the linker doesn't
-# complain, but we would run into weird problems at run-time.
-# Therefore on these platforms, we link just the .o files.
-ifeq ($(OS_ARCH),NCR)
-EXTRA_LIBS =
-endif
-ifeq ($(OS_ARCH),SCOOS)
-EXTRA_LIBS =
-endif
-
-ifdef RESOLVE_LINK_SYMBOLS
-EXTRA_LIBS += $(OS_LIBS)
-endif
-
-LIBRARY_NAME	= plds
-LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
-
-RELEASE_HEADERS = $(HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
-RELEASE_LIBS	= $(TARGETS)
-
-include $(topsrcdir)/config/rules.mk
-
-#
-# Version information generation (begin)
-#
-ECHO = echo
-TINC = $(OBJDIR)/_pl_bld.h
-PROD = $(notdir $(SHARED_LIBRARY))
-NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
-
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	SUF = i64
-else
-	SUF = LL
-endif
-
-GARBAGE += $(TINC)
-
-$(TINC):
-	@$(MAKE_OBJDIR)
-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
-	@if test ! -z "$(SH_NOW)"; then \
-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
-	else \
-	    true; \
-	fi
-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-
-
-$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-ifeq ($(MOZ_OS2_TOOLS), VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
-endif
-endif
-#
-# Version information generation (end)
-#
-
-#
-# The Client build wants the shared libraries in $(dist_bindir),
-# so we also install them there.
-#
-
-export:: $(TARGETS)
-	$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-ifdef SHARED_LIBRARY
-ifeq ($(OS_ARCH),HP-UX)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
-else
-	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
-endif
-endif
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
-endif
-
-
diff --git a/libs/js/nsprpub/lib/ds/plarena.c b/libs/js/nsprpub/lib/ds/plarena.c
deleted file mode 100644
index d346edd200..0000000000
--- a/libs/js/nsprpub/lib/ds/plarena.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- */
-
-/*
- * Lifetime-based fast allocation, inspired by much prior art, including
- * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
- */
-#include <stdlib.h>
-#include <string.h>
-#include "plarena.h"
-#include "prmem.h"
-#include "prbit.h"
-#include "prlog.h"
-#include "prlock.h"
-#include "prinit.h"
-
-static PLArena *arena_freelist;
-
-#ifdef PL_ARENAMETER
-static PLArenaStats *arena_stats_list;
-
-#define COUNT(pool,what)  (pool)->stats.what++
-#else
-#define COUNT(pool,what)  /* nothing */
-#endif
-
-#define PL_ARENA_DEFAULT_ALIGN  sizeof(double)
-
-static PRLock    *arenaLock;
-static PRCallOnceType once;
-
-/*
-** InitializeArenas() -- Initialize arena operations.
-**
-** InitializeArenas() is called exactly once and only once from 
-** LockArena(). This function creates the arena protection 
-** lock: arenaLock.
-**
-** Note: If the arenaLock cannot be created, InitializeArenas()
-** fails quietly, returning only PR_FAILURE. This percolates up
-** to the application using the Arena API. He gets no arena
-** from PL_ArenaAllocate(). It's up to him to fail gracefully
-** or recover.
-**
-*/
-static PRStatus InitializeArenas( void )
-{
-    PR_ASSERT( arenaLock == NULL );
-    arenaLock = PR_NewLock();
-    if ( arenaLock == NULL )
-        return PR_FAILURE;
-    else
-        return PR_SUCCESS;
-} /* end ArenaInitialize() */
-
-static PRStatus LockArena( void )
-{
-    PRStatus rc = PR_CallOnce( &once, InitializeArenas );
-
-    if ( PR_FAILURE != rc )
-        PR_Lock( arenaLock );
-    return(rc);
-} /* end LockArena() */
-
-static void UnlockArena( void )
-{
-    PR_Unlock( arenaLock );
-    return;
-} /* end UnlockArena() */
-#if 0
-PR_IMPLEMENT(void) PL_InitArenaPool(
-    PLArenaPool *pool, const char *name, PRUint32 size, PRUint32 align)
-{
-#if defined(XP_MAC)
-#pragma unused (name)
-#endif
-
-    if (align == 0)
-        align = PL_ARENA_DEFAULT_ALIGN;
-    pool->mask = PR_BITMASK(PR_CeilingLog2(align));
-    pool->first.next = NULL;
-    pool->first.base = pool->first.avail = pool->first.limit =
-        (PRUword)PL_ARENA_ALIGN(pool, &pool->first + 1);
-    pool->current = &pool->first;
-    pool->arenasize = size;                                  
-#ifdef PL_ARENAMETER
-    memset(&pool->stats, 0, sizeof pool->stats);
-    pool->stats.name = strdup(name);
-    pool->stats.next = arena_stats_list;
-    arena_stats_list = &pool->stats;
-#endif
-}
-#endif
-
-/*
-** PL_ArenaAllocate() -- allocate space from an arena pool
-** 
-** Description: PL_ArenaAllocate() allocates space from an arena
-** pool. 
-**
-** First, try to satisfy the request from arenas starting at
-** pool->current.
-**
-** If there is not enough space in the arena pool->current, try
-** to claim an arena, on a first fit basis, from the global
-** freelist (arena_freelist).
-** 
-** If no arena in arena_freelist is suitable, then try to
-** allocate a new arena from the heap.
-**
-** Returns: pointer to allocated space or NULL
-** 
-** Notes: The original implementation had some difficult to
-** solve bugs; the code was difficult to read. Sometimes it's
-** just easier to rewrite it. I did that. larryh.
-**
-** See also: bugzilla: 45343.
-**
-*/
-
-PR_IMPLEMENT(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb)
-{
-    PLArena *a;   
-    char *rp;     /* returned pointer */
-
-    PR_ASSERT((nb & pool->mask) == 0);
-    
-    nb = (PRUword)PL_ARENA_ALIGN(pool, nb); /* force alignment */
-
-    /* attempt to allocate from arenas at pool->current */
-    {
-        a = pool->current;
-        do {
-            if ( a->avail +nb <= a->limit )  {
-                pool->current = a;
-                rp = (char *)a->avail;
-                a->avail += nb;
-                return rp;
-            }
-        } while( NULL != (a = a->next) );
-    }
-
-    /* attempt to allocate from arena_freelist */
-    {
-        PLArena *p; /* previous pointer, for unlinking from freelist */
-
-        /* lock the arena_freelist. Make access to the freelist MT-Safe */
-        if ( PR_FAILURE == LockArena())
-            return(0);
-
-        for ( a = arena_freelist, p = NULL; a != NULL ; p = a, a = a->next ) {
-            if ( a->base +nb <= a->limit )  {
-                if ( p == NULL )
-                    arena_freelist = a->next;
-                else
-                    p->next = a->next;
-                UnlockArena();
-                a->avail = a->base;
-                rp = (char *)a->avail;
-                a->avail += nb;
-                /* the newly allocated arena is linked after pool->current 
-                *  and becomes pool->current */
-                a->next = pool->current->next;
-                pool->current->next = a;
-                pool->current = a;
-                if ( NULL == pool->first.next )
-                    pool->first.next = a;
-                return(rp);
-            }
-        }
-        UnlockArena();
-    }
-
-    /* attempt to allocate from the heap */ 
-    {  
-        PRUint32 sz = PR_MAX(pool->arenasize, nb);
-        sz += sizeof *a + pool->mask;  /* header and alignment slop */
-        a = (PLArena*)PR_MALLOC(sz);
-        if ( NULL != a )  {
-            a->limit = (PRUword)a + sz;
-            a->base = a->avail = (PRUword)PL_ARENA_ALIGN(pool, a + 1);
-            rp = (char *)a->avail;
-            a->avail += nb;
-            /* the newly allocated arena is linked after pool->current 
-            *  and becomes pool->current */
-            a->next = pool->current->next;
-            pool->current->next = a;
-            pool->current = a;
-            if ( NULL == pool->first.next )
-                pool->first.next = a;
-            PL_COUNT_ARENA(pool,++);
-            COUNT(pool, nmallocs);
-            return(rp);
-        }
-    }
-
-    /* we got to here, and there's no memory to allocate */
-    return(NULL);
-} /* --- end PL_ArenaAllocate() --- */
-
-PR_IMPLEMENT(void *) PL_ArenaGrow(
-    PLArenaPool *pool, void *p, PRUint32 size, PRUint32 incr)
-{
-    void *newp;
-
-    PL_ARENA_ALLOCATE(newp, pool, size + incr);
-    if (newp)
-        memcpy(newp, p, size);
-    return newp;
-}
-
-/*
- * Free tail arenas linked after head, which may not be the true list head.
- * Reset pool->current to point to head in case it pointed at a tail arena.
- */
-static void FreeArenaList(PLArenaPool *pool, PLArena *head, PRBool reallyFree)
-{
-    PLArena **ap, *a;
-
-    ap = &head->next;
-    a = *ap;
-    if (!a)
-        return;
-
-#ifdef DEBUG
-    do {
-        PR_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-        a->avail = a->base;
-        PL_CLEAR_UNUSED(a);
-    } while ((a = a->next) != 0);
-    a = *ap;
-#endif
-
-    if (reallyFree) {
-        do {
-            *ap = a->next;
-            PL_CLEAR_ARENA(a);
-            PL_COUNT_ARENA(pool,--);
-            PR_DELETE(a);
-        } while ((a = *ap) != 0);
-    } else {
-        /* Insert the whole arena chain at the front of the freelist. */
-        do {
-            ap = &(*ap)->next;
-        } while (*ap);
-        LockArena();
-        *ap = arena_freelist;
-        arena_freelist = a;
-        head->next = 0;
-        UnlockArena();
-    }
-
-    pool->current = head;
-}
-
-PR_IMPLEMENT(void) PL_ArenaRelease(PLArenaPool *pool, char *mark)
-{
-    PLArena *a;
-
-    for (a = pool->first.next; a; a = a->next) {
-        if (PR_UPTRDIFF(mark, a->base) < PR_UPTRDIFF(a->avail, a->base)) {
-            a->avail = (PRUword)PL_ARENA_ALIGN(pool, mark);
-            FreeArenaList(pool, a, PR_FALSE);
-            return;
-        }
-    }
-}
-
-PR_IMPLEMENT(void) PL_FreeArenaPool(PLArenaPool *pool)
-{
-    FreeArenaList(pool, &pool->first, PR_FALSE);
-    COUNT(pool, ndeallocs);
-}
-
-PR_IMPLEMENT(void) PL_FinishArenaPool(PLArenaPool *pool)
-{
-    FreeArenaList(pool, &pool->first, PR_TRUE);
-#ifdef PL_ARENAMETER
-    {
-        PLArenaStats *stats, **statsp;
-
-        if (pool->stats.name)
-            PR_DELETE(pool->stats.name);
-        for (statsp = &arena_stats_list; (stats = *statsp) != 0;
-             statsp = &stats->next) {
-            if (stats == &pool->stats) {
-                *statsp = stats->next;
-                return;
-            }
-        }
-    }
-#endif
-}
-
-PR_IMPLEMENT(void) PL_CompactArenaPool(PLArenaPool *ap)
-{
-#if XP_MAC
-#pragma unused (ap)
-#if 0
-    PRArena *curr = &(ap->first);
-    while (curr) {
-        reallocSmaller(curr, curr->avail - (uprword_t)curr);
-        curr->limit = curr->avail;
-        curr = curr->next;
-    }
-#endif
-#endif
-}
-
-PR_IMPLEMENT(void) PL_ArenaFinish(void)
-{
-    PLArena *a, *next;
-
-    for (a = arena_freelist; a; a = next) {
-        next = a->next;
-        PR_DELETE(a);
-    }
-    arena_freelist = NULL;
-
-    if (arenaLock) {
-        PR_DestroyLock(arenaLock);
-        arenaLock = NULL;
-    }
-}
-
-#ifdef PL_ARENAMETER
-PR_IMPLEMENT(void) PL_ArenaCountAllocation(PLArenaPool *pool, PRUint32 nb)
-{
-    pool->stats.nallocs++;
-    pool->stats.nbytes += nb;
-    if (nb > pool->stats.maxalloc)
-        pool->stats.maxalloc = nb;
-    pool->stats.variance += nb * nb;
-}
-
-PR_IMPLEMENT(void) PL_ArenaCountInplaceGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr)
-{
-    pool->stats.ninplace++;
-}
-
-PR_IMPLEMENT(void) PL_ArenaCountGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr)
-{
-    pool->stats.ngrows++;
-    pool->stats.nbytes += incr;
-    pool->stats.variance -= size * size;
-    size += incr;
-    if (size > pool->stats.maxalloc)
-        pool->stats.maxalloc = size;
-    pool->stats.variance += size * size;
-}
-
-PR_IMPLEMENT(void) PL_ArenaCountRelease(PLArenaPool *pool, char *mark)
-{
-    pool->stats.nreleases++;
-}
-
-PR_IMPLEMENT(void) PL_ArenaCountRetract(PLArenaPool *pool, char *mark)
-{
-    pool->stats.nfastrels++;
-}
-
-#include <math.h>
-#include <stdio.h>
-
-PR_IMPLEMENT(void) PL_DumpArenaStats(FILE *fp)
-{
-    PLArenaStats *stats;
-    double mean, variance;
-
-    for (stats = arena_stats_list; stats; stats = stats->next) {
-        if (stats->nallocs != 0) {
-            mean = (double)stats->nbytes / stats->nallocs;
-            variance = fabs(stats->variance / stats->nallocs - mean * mean);
-        } else {
-            mean = variance = 0;
-        }
-
-        fprintf(fp, "\n%s allocation statistics:\n", stats->name);
-        fprintf(fp, "              number of arenas: %u\n", stats->narenas);
-        fprintf(fp, "         number of allocations: %u\n", stats->nallocs);
-        fprintf(fp, " number of free arena reclaims: %u\n", stats->nreclaims);
-        fprintf(fp, "        number of malloc calls: %u\n", stats->nmallocs);
-        fprintf(fp, "       number of deallocations: %u\n", stats->ndeallocs);
-        fprintf(fp, "  number of allocation growths: %u\n", stats->ngrows);
-        fprintf(fp, "    number of in-place growths: %u\n", stats->ninplace);
-        fprintf(fp, "number of released allocations: %u\n", stats->nreleases);
-        fprintf(fp, "       number of fast releases: %u\n", stats->nfastrels);
-        fprintf(fp, "         total bytes allocated: %u\n", stats->nbytes);
-        fprintf(fp, "          mean allocation size: %g\n", mean);
-        fprintf(fp, "            standard deviation: %g\n", sqrt(variance));
-        fprintf(fp, "       maximum allocation size: %u\n", stats->maxalloc);
-    }
-}
-#endif /* PL_ARENAMETER */
diff --git a/libs/js/nsprpub/lib/ds/plarena.h b/libs/js/nsprpub/lib/ds/plarena.h
deleted file mode 100644
index 38f3e3990a..0000000000
--- a/libs/js/nsprpub/lib/ds/plarena.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- */
-
-#ifndef plarena_h___
-#define plarena_h___
-/*
- * Lifetime-based fast allocation, inspired by much prior art, including
- * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
- *
- * Also supports LIFO allocation (PL_ARENA_MARK/PL_ARENA_RELEASE).
- */
-#include "prtypes.h"
-#include "plarenas.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLArena          PLArena;
-
-struct PLArena {
-    PLArena     *next;          /* next arena for this lifetime */
-    PRUword     base;           /* aligned base address, follows this header */
-    PRUword     limit;          /* one beyond last byte in arena */
-    PRUword     avail;          /* points to next available byte */
-};
-
-#ifdef PL_ARENAMETER
-typedef struct PLArenaStats PLArenaStats;
-
-struct PLArenaStats {
-    PLArenaStats  *next;        /* next in arenaStats list */
-    char          *name;        /* name for debugging */
-    PRUint32      narenas;      /* number of arenas in pool */
-    PRUint32      nallocs;      /* number of PL_ARENA_ALLOCATE() calls */
-    PRUint32      nreclaims;    /* number of reclaims from freeArenas */
-    PRUint32      nmallocs;     /* number of malloc() calls */
-    PRUint32      ndeallocs;    /* number of lifetime deallocations */
-    PRUint32      ngrows;       /* number of PL_ARENA_GROW() calls */
-    PRUint32      ninplace;     /* number of in-place growths */
-    PRUint32      nreleases;    /* number of PL_ARENA_RELEASE() calls */
-    PRUint32      nfastrels;    /* number of "fast path" releases */
-    PRUint32      nbytes;       /* total bytes allocated */
-    PRUint32      maxalloc;     /* maximum allocation size in bytes */
-    PRFloat64     variance;     /* size variance accumulator */
-};
-#endif
-
-struct PLArenaPool {
-    PLArena     first;          /* first arena in pool list */
-    PLArena     *current;       /* arena from which to allocate space */
-    PRUint32    arenasize;      /* net exact size of a new arena */
-    PRUword     mask;           /* alignment mask (power-of-2 - 1) */
-#ifdef PL_ARENAMETER
-    PLArenaStats stats;
-#endif
-};
-
-/*
- * If the including .c file uses only one power-of-2 alignment, it may define
- * PL_ARENA_CONST_ALIGN_MASK to the alignment mask and save a few instructions
- * per ALLOCATE and GROW.
- */
-#ifdef PL_ARENA_CONST_ALIGN_MASK
-#define PL_ARENA_ALIGN(pool, n) (((PRUword)(n) + PL_ARENA_CONST_ALIGN_MASK) \
-                                & ~PL_ARENA_CONST_ALIGN_MASK)
-
-#define PL_INIT_ARENA_POOL(pool, name, size) \
-        PL_InitArenaPool(pool, name, size, PL_ARENA_CONST_ALIGN_MASK + 1)
-#else
-#define PL_ARENA_ALIGN(pool, n) (((PRUword)(n) + (pool)->mask) & ~(pool)->mask)
-#endif
-
-#define PL_ARENA_ALLOCATE(p, pool, nb) \
-    PR_BEGIN_MACRO \
-        PLArena *_a = (pool)->current; \
-        PRUint32 _nb = PL_ARENA_ALIGN(pool, nb); \
-        PRUword _p = _a->avail; \
-        PRUword _q = _p + _nb; \
-        if (_q > _a->limit) \
-            _p = (PRUword)PL_ArenaAllocate(pool, _nb); \
-        else \
-            _a->avail = _q; \
-        p = (void *)_p; \
-        PL_ArenaCountAllocation(pool, nb); \
-    PR_END_MACRO
-
-#define PL_ARENA_GROW(p, pool, size, incr) \
-    PR_BEGIN_MACRO \
-        PLArena *_a = (pool)->current; \
-        PRUint32 _incr = PL_ARENA_ALIGN(pool, incr); \
-        PRUword _p = _a->avail; \
-        PRUword _q = _p + _incr; \
-        if (_p == (PRUword)(p) + PL_ARENA_ALIGN(pool, size) && \
-            _q <= _a->limit) { \
-            _a->avail = _q; \
-            PL_ArenaCountInplaceGrowth(pool, size, incr); \
-        } else { \
-            p = PL_ArenaGrow(pool, p, size, incr); \
-        } \
-        PL_ArenaCountGrowth(pool, size, incr); \
-    PR_END_MACRO
-
-#define PL_ARENA_MARK(pool) ((void *) (pool)->current->avail)
-#define PR_UPTRDIFF(p,q) ((PRUword)(p) - (PRUword)(q))
-
-#ifdef DEBUG
-#define PL_FREE_PATTERN 0xDA
-#define PL_CLEAR_UNUSED(a) (PR_ASSERT((a)->avail <= (a)->limit), \
-                           memset((void*)(a)->avail, PL_FREE_PATTERN, \
-                           (a)->limit - (a)->avail))
-#define PL_CLEAR_ARENA(a)  memset((void*)(a), PL_FREE_PATTERN, \
-                           (a)->limit - (PRUword)(a))
-#else
-#define PL_CLEAR_UNUSED(a)
-#define PL_CLEAR_ARENA(a)
-#endif
-
-#define PL_ARENA_RELEASE(pool, mark) \
-    PR_BEGIN_MACRO \
-        char *_m = (char *)(mark); \
-        PLArena *_a = (pool)->current; \
-        if (PR_UPTRDIFF(_m, _a->base) <= PR_UPTRDIFF(_a->avail, _a->base)) { \
-            _a->avail = (PRUword)PL_ARENA_ALIGN(pool, _m); \
-            PL_CLEAR_UNUSED(_a); \
-            PL_ArenaCountRetract(pool, _m); \
-        } else { \
-            PL_ArenaRelease(pool, _m); \
-        } \
-        PL_ArenaCountRelease(pool, _m); \
-    PR_END_MACRO
-
-#ifdef PL_ARENAMETER
-#define PL_COUNT_ARENA(pool,op) ((pool)->stats.narenas op)
-#else
-#define PL_COUNT_ARENA(pool,op)
-#endif
-
-#define PL_ARENA_DESTROY(pool, a, pnext) \
-    PR_BEGIN_MACRO \
-        PL_COUNT_ARENA(pool,--); \
-        if ((pool)->current == (a)) (pool)->current = &(pool)->first; \
-        *(pnext) = (a)->next; \
-        PL_CLEAR_ARENA(a); \
-        free(a); \
-        (a) = 0; \
-    PR_END_MACRO
-
-#ifdef PL_ARENAMETER
-
-#include <stdio.h>
-
-PR_EXTERN(void) PL_ArenaCountAllocation(PLArenaPool *pool, PRUint32 nb);
-
-PR_EXTERN(void) PL_ArenaCountInplaceGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaCountGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaCountRelease(PLArenaPool *pool, char *mark);
-
-PR_EXTERN(void) PL_ArenaCountRetract(PLArenaPool *pool, char *mark);
-
-PR_EXTERN(void) PL_DumpArenaStats(FILE *fp);
-
-#else  /* !PL_ARENAMETER */
-
-#define PL_ArenaCountAllocation(ap, nb)                 /* nothing */
-#define PL_ArenaCountInplaceGrowth(ap, size, incr)      /* nothing */
-#define PL_ArenaCountGrowth(ap, size, incr)             /* nothing */
-#define PL_ArenaCountRelease(ap, mark)                  /* nothing */
-#define PL_ArenaCountRetract(ap, mark)                  /* nothing */
-
-#endif /* !PL_ARENAMETER */
-
-PR_END_EXTERN_C
-
-#endif /* plarena_h___ */
diff --git a/libs/js/nsprpub/lib/ds/plarenas.h b/libs/js/nsprpub/lib/ds/plarenas.h
deleted file mode 100644
index e3eca358b4..0000000000
--- a/libs/js/nsprpub/lib/ds/plarenas.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if defined(PLARENAS_H)
-#else  /* defined(PLARENAS_H) */
-#define PLARENAS_H
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLArenaPool      PLArenaPool;
-
-/*
-** Allocate an arena pool as specified by the parameters.
-**
-** This is equivelant to allocating the space yourself and then
-** calling PL_InitArenaPool().
-**
-** This function may fail (and return a NULL) for a variety of
-** reasons. The reason for a particular failure can be discovered
-** by calling PR_GetError().
-*/
-#if 0  /* Not implemented */
-PR_EXTERN(PLArenaPool*) PL_AllocArenaPool(
-    const char *name, PRUint32 size, PRUint32 align);
-#endif
-
-/*
-** Destroy an arena pool previously allocated by PL_AllocArenaPool().
-**
-** This function may fail if the arena is not empty and the caller
-** wishes to check for empty upon descruction.
-*/
-#if 0  /* Not implemented */
-PR_EXTERN(PRStatus) PL_DestroyArenaPool(PLArenaPool *pool, PRBool checkEmpty);
-#endif
-
-
-/*
-** Initialize an arena pool with the given name for debugging and metering,
-** with a minimum size per arena of size bytes.
-**/
-PR_EXTERN(void) PL_InitArenaPool(
-    PLArenaPool *pool, const char *name, PRUint32 size, PRUint32 align);
-
-/*
-** Finish using arenas, freeing all memory associated with them.
-**/
-PR_EXTERN(void) PL_ArenaFinish(void);
-
-/*
-** Free the arenas in pool.  The user may continue to allocate from pool
-** after calling this function.  There is no need to call PL_InitArenaPool()
-** again unless PL_FinishArenaPool(pool) has been called.
-**/
-PR_EXTERN(void) PL_FreeArenaPool(PLArenaPool *pool);
-
-/*
-** Free the arenas in pool and finish using it altogether.
-**/
-PR_EXTERN(void) PL_FinishArenaPool(PLArenaPool *pool);
-
-/*
-** Compact all of the arenas in a pool so that no space is wasted.
-**/
-PR_EXTERN(void) PL_CompactArenaPool(PLArenaPool *pool);
-
-/*
-** Friend functions used by the PL_ARENA_*() macros.
-**/
-PR_EXTERN(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb);
-
-PR_EXTERN(void *) PL_ArenaGrow(
-    PLArenaPool *pool, void *p, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaRelease(PLArenaPool *pool, char *mark);
-
-PR_END_EXTERN_C
-
-#endif /* defined(PLARENAS_H) */
-
-/* plarenas */
diff --git a/libs/js/nsprpub/lib/ds/plds.def b/libs/js/nsprpub/lib/ds/plds.def
deleted file mode 100644
index c38f4d6468..0000000000
--- a/libs/js/nsprpub/lib/ds/plds.def
+++ /dev/null
@@ -1,81 +0,0 @@
-;+#
-;+# ***** BEGIN LICENSE BLOCK *****
-;+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;+#
-;+# The contents of this file are subject to the Mozilla Public License Version
-;+# 1.1 (the "License"); you may not use this file except in compliance with
-;+# the License. You may obtain a copy of the License at
-;+# http://www.mozilla.org/MPL/
-;+#
-;+# Software distributed under the License is distributed on an "AS IS" basis,
-;+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-;+# for the specific language governing rights and limitations under the
-;+# License.
-;+#
-;+# The Original Code is the Netscape Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is
-;+# Netscape Communications Corporation.
-;+# Portions created by the Initial Developer are Copyright (C) 2002-2003
-;+# the Initial Developer. All Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the terms of
-;+# either the GNU General Public License Version 2 or later (the "GPL"), or
-;+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-;+# in which case the provisions of the GPL or the LGPL are applicable instead
-;+# of those above. If you wish to allow use of your version of this file only
-;+# under the terms of either the GPL or the LGPL, and not to allow others to
-;+# use your version of this file under the terms of the MPL, indicate your
-;+# decision by deleting the provisions above and replace them with the notice
-;+# and other provisions required by the GPL or the LGPL. If you do not delete
-;+# the provisions above, a recipient may use your version of this file under
-;+# the terms of any one of the MPL, the GPL or the LGPL.
-;+#
-;+# ***** END LICENSE BLOCK *****
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+NSPR_4.0 {
-;+    global:
-LIBRARY plds4 ;-
-EXPORTS ;-
-PL_ArenaAllocate;
-PL_ArenaFinish;
-PL_ArenaGrow;
-PL_ArenaRelease;
-PL_CompactArenaPool;
-PL_CompareStrings;
-PL_CompareValues;
-PL_FinishArenaPool;
-PL_FreeArenaPool;
-PL_HashString;
-PL_HashTableAdd;
-PL_HashTableDestroy;
-PL_HashTableDump;
-PL_HashTableEnumerateEntries;
-PL_HashTableLookup;
-PL_HashTableRawAdd;
-PL_HashTableRawLookup;
-PL_HashTableRawRemove;
-PL_HashTableRemove;
-libVersionPoint;
-;+    local: *;
-;+};
-;+
-;+NSPR_4.1 {
-;+    global:
-PL_HashTableLookupConst;
-PL_HashTableRawLookupConst;
-;+} NSPR_4.0;
diff --git a/libs/js/nsprpub/lib/ds/plds.rc b/libs/js/nsprpub/lib/ds/plds.rc
deleted file mode 100644
index fa64e192f2..0000000000
--- a/libs/js/nsprpub/lib/ds/plds.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include <winver.h>
-
-#define MY_LIBNAME "plds"
-#define MY_FILEDESCRIPTION "PLDS Library"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define PR_VMAJOR_STR STRINGIZE2(PR_VMAJOR)
-
-#ifdef _DEBUG
-#define MY_DEBUG_STR " (debug)"
-#define MY_FILEFLAGS_1 VS_FF_DEBUG
-#else
-#define MY_DEBUG_STR ""
-#define MY_FILEFLAGS_1 0x0L
-#endif
-#if PR_BETA
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
-#else
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
-#endif
-
-#ifdef WINNT
-#define MY_FILEOS VOS_NT_WINDOWS32
-#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
-#else
-#define MY_FILEOS VOS__WINDOWS32
-#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version-information resource
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS MY_FILEFLAGS_2
- FILEOS MY_FILEOS
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L // not used
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
-        BEGIN
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
-            VALUE "FileVersion", PR_VERSION "\0"
-            VALUE "InternalName", MY_INTERNAL_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \251 1996-2000 Netscape Communications Corporation\0"
-            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
-            VALUE "ProductName", "Netscape Portable Runtime\0"
-            VALUE "ProductVersion", PR_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/libs/js/nsprpub/lib/ds/plds_symvec.opt b/libs/js/nsprpub/lib/ds/plds_symvec.opt
deleted file mode 100644
index 7178454093..0000000000
--- a/libs/js/nsprpub/lib/ds/plds_symvec.opt
+++ /dev/null
@@ -1,37 +0,0 @@
-! Fixed section of symbol vector for LIBPLDS4
-!
-GSMATCH=LEQUAL,2,2
-case_sensitive=YES
-!
-! --------------------------------------------------------------------------
-! Ident 2,2 introduced for Mozilla 1.3
-! Previously this was empty. Now we include everything that's specified in
-! plds.def.
-! --------------------------------------------------------------------------
-!
-! NSPR 4.0
-SYMBOL_VECTOR=(PL_ArenaAllocate=PROCEDURE)
-SYMBOL_VECTOR=(PL_ArenaFinish=PROCEDURE)
-SYMBOL_VECTOR=(PL_ArenaGrow=PROCEDURE)
-SYMBOL_VECTOR=(PL_ArenaRelease=PROCEDURE)
-SYMBOL_VECTOR=(PL_CompactArenaPool=PROCEDURE)
-SYMBOL_VECTOR=(PL_CompareStrings=PROCEDURE)
-SYMBOL_VECTOR=(PL_CompareValues=PROCEDURE)
-SYMBOL_VECTOR=(PL_FinishArenaPool=PROCEDURE)
-SYMBOL_VECTOR=(PL_FreeArenaPool=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashString=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableAdd=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableDestroy=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableDump=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableEnumerateEntries=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableLookup=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableRawAdd=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableRawLookup=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableRawRemove=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableRemove=PROCEDURE)
-SYMBOL_VECTOR=(PL_InitArenaPool=PROCEDURE)
-SYMBOL_VECTOR=(PL_NewHashTable=PROCEDURE)
-SYMBOL_VECTOR=(libVersionPoint=PROCEDURE)
-! NSPR 4.1
-SYMBOL_VECTOR=(PL_HashTableLookupConst=PROCEDURE)
-SYMBOL_VECTOR=(PL_HashTableRawLookupConst=PROCEDURE)
diff --git a/libs/js/nsprpub/lib/ds/plhash.c b/libs/js/nsprpub/lib/ds/plhash.c
deleted file mode 100644
index 3f1e5dcd2a..0000000000
--- a/libs/js/nsprpub/lib/ds/plhash.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PL hash table package.
- */
-#include "plhash.h"
-#include "prbit.h"
-#include "prlog.h"
-#include "prmem.h"
-#include "prtypes.h"
-#include <stdlib.h>
-#include <string.h>
-
-/* Compute the number of buckets in ht */
-#define NBUCKETS(ht)    (1 << (PL_HASH_BITS - (ht)->shift))
-
-/* The smallest table has 16 buckets */
-#define MINBUCKETSLOG2  4
-#define MINBUCKETS      (1 << MINBUCKETSLOG2)
-
-/* Compute the maximum entries given n buckets that we will tolerate, ~90% */
-#define OVERLOADED(n)   ((n) - ((n) >> 3))
-
-/* Compute the number of entries below which we shrink the table by half */
-#define UNDERLOADED(n)  (((n) > MINBUCKETS) ? ((n) >> 2) : 0)
-
-/*
-** Stubs for default hash allocator ops.
-*/
-static void * PR_CALLBACK
-DefaultAllocTable(void *pool, PRSize size)
-{
-#if defined(XP_MAC)
-#pragma unused (pool)
-#endif
-
-    return PR_MALLOC(size);
-}
-
-static void PR_CALLBACK
-DefaultFreeTable(void *pool, void *item)
-{
-#if defined(XP_MAC)
-#pragma unused (pool)
-#endif
-
-    PR_Free(item);
-}
-
-static PLHashEntry * PR_CALLBACK
-DefaultAllocEntry(void *pool, const void *key)
-{
-#if defined(XP_MAC)
-#pragma unused (pool,key)
-#endif
-
-    return PR_NEW(PLHashEntry);
-}
-
-static void PR_CALLBACK
-DefaultFreeEntry(void *pool, PLHashEntry *he, PRUintn flag)
-{
-#if defined(XP_MAC)
-#pragma unused (pool)
-#endif
-
-    if (flag == HT_FREE_ENTRY)
-        PR_Free(he);
-}
-
-static PLHashAllocOps defaultHashAllocOps = {
-    DefaultAllocTable, DefaultFreeTable,
-    DefaultAllocEntry, DefaultFreeEntry
-};
-#if 0
-PR_IMPLEMENT(PLHashTable *)
-PL_NewHashTable(PRUint32 n, PLHashFunction keyHash,
-                PLHashComparator keyCompare, PLHashComparator valueCompare,
-                const PLHashAllocOps *allocOps, void *allocPriv)
-{
-    PLHashTable *ht;
-    PRSize nb;
-
-    if (n <= MINBUCKETS) {
-        n = MINBUCKETSLOG2;
-    } else {
-        n = PR_CeilingLog2(n);
-        if ((PRInt32)n < 0)
-            return 0;
-    }
-
-    if (!allocOps) allocOps = &defaultHashAllocOps;
-
-    ht = (PLHashTable*)((*allocOps->allocTable)(allocPriv, sizeof *ht));
-    if (!ht)
-	return 0;
-    memset(ht, 0, sizeof *ht);
-    ht->shift = PL_HASH_BITS - n;
-    n = 1 << n;
-#if defined(WIN16)
-    if (n > 16000) {
-        (*allocOps->freeTable)(allocPriv, ht);
-        return 0;
-    }
-#endif  /* WIN16 */
-    nb = n * sizeof(PLHashEntry *);
-    ht->buckets = (PLHashEntry**)((*allocOps->allocTable)(allocPriv, nb));
-    if (!ht->buckets) {
-        (*allocOps->freeTable)(allocPriv, ht);
-        return 0;
-    }
-    memset(ht->buckets, 0, nb);
-
-    ht->keyHash = keyHash;
-    ht->keyCompare = keyCompare;
-    ht->valueCompare = valueCompare;
-    ht->allocOps = allocOps;
-    ht->allocPriv = allocPriv;
-    return ht;
-}
-#endif
-PR_IMPLEMENT(void)
-PL_HashTableDestroy(PLHashTable *ht)
-{
-    PRUint32 i, n;
-    PLHashEntry *he, *next;
-    const PLHashAllocOps *allocOps = ht->allocOps;
-    void *allocPriv = ht->allocPriv;
-
-    n = NBUCKETS(ht);
-    for (i = 0; i < n; i++) {
-        for (he = ht->buckets[i]; he; he = next) {
-            next = he->next;
-            (*allocOps->freeEntry)(allocPriv, he, HT_FREE_ENTRY);
-        }
-    }
-#ifdef DEBUG
-    memset(ht->buckets, 0xDB, n * sizeof ht->buckets[0]);
-#endif
-    (*allocOps->freeTable)(allocPriv, ht->buckets);
-#ifdef DEBUG
-    memset(ht, 0xDB, sizeof *ht);
-#endif
-    (*allocOps->freeTable)(allocPriv, ht);
-}
-
-/*
-** Multiplicative hash, from Knuth 6.4.
-*/
-#define GOLDEN_RATIO    0x9E3779B9U  /* 2/(1+sqrt(5))*(2^32) */
-
-PR_IMPLEMENT(PLHashEntry **)
-PL_HashTableRawLookup(PLHashTable *ht, PLHashNumber keyHash, const void *key)
-{
-    PLHashEntry *he, **hep, **hep0;
-    PLHashNumber h;
-
-#ifdef HASHMETER
-    ht->nlookups++;
-#endif
-    h = keyHash * GOLDEN_RATIO;
-    h >>= ht->shift;
-    hep = hep0 = &ht->buckets[h];
-    while ((he = *hep) != 0) {
-        if (he->keyHash == keyHash && (*ht->keyCompare)(key, he->key)) {
-            /* Move to front of chain if not already there */
-            if (hep != hep0) {
-                *hep = he->next;
-                he->next = *hep0;
-                *hep0 = he;
-            }
-            return hep0;
-        }
-        hep = &he->next;
-#ifdef HASHMETER
-        ht->nsteps++;
-#endif
-    }
-    return hep;
-}
-
-/*
-** Same as PL_HashTableRawLookup but doesn't reorder the hash entries.
-*/
-PR_IMPLEMENT(PLHashEntry **)
-PL_HashTableRawLookupConst(PLHashTable *ht, PLHashNumber keyHash,
-                           const void *key)
-{
-    PLHashEntry *he, **hep;
-    PLHashNumber h;
-
-#ifdef HASHMETER
-    ht->nlookups++;
-#endif
-    h = keyHash * GOLDEN_RATIO;
-    h >>= ht->shift;
-    hep = &ht->buckets[h];
-    while ((he = *hep) != 0) {
-        if (he->keyHash == keyHash && (*ht->keyCompare)(key, he->key)) {
-            break;
-        }
-        hep = &he->next;
-#ifdef HASHMETER
-        ht->nsteps++;
-#endif
-    }
-    return hep;
-}
-
-PR_IMPLEMENT(PLHashEntry *)
-PL_HashTableRawAdd(PLHashTable *ht, PLHashEntry **hep,
-                   PLHashNumber keyHash, const void *key, void *value)
-{
-    PRUint32 i, n;
-    PLHashEntry *he, *next, **oldbuckets;
-    PRSize nb;
-
-    /* Grow the table if it is overloaded */
-    n = NBUCKETS(ht);
-    if (ht->nentries >= OVERLOADED(n)) {
-        oldbuckets = ht->buckets;
-#if defined(WIN16)
-        if (2 * n > 16000)
-            return 0;
-#endif  /* WIN16 */
-        nb = 2 * n * sizeof(PLHashEntry *);
-        ht->buckets = (PLHashEntry**)
-            ((*ht->allocOps->allocTable)(ht->allocPriv, nb));
-        if (!ht->buckets) {
-            ht->buckets = oldbuckets;
-            return 0;
-        }
-        memset(ht->buckets, 0, nb);
-#ifdef HASHMETER
-        ht->ngrows++;
-#endif
-        ht->shift--;
-
-        for (i = 0; i < n; i++) {
-            for (he = oldbuckets[i]; he; he = next) {
-                next = he->next;
-                hep = PL_HashTableRawLookup(ht, he->keyHash, he->key);
-                PR_ASSERT(*hep == 0);
-                he->next = 0;
-                *hep = he;
-            }
-        }
-#ifdef DEBUG
-        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
-#endif
-        (*ht->allocOps->freeTable)(ht->allocPriv, oldbuckets);
-        hep = PL_HashTableRawLookup(ht, keyHash, key);
-    }
-
-    /* Make a new key value entry */
-    he = (*ht->allocOps->allocEntry)(ht->allocPriv, key);
-    if (!he)
-	return 0;
-    he->keyHash = keyHash;
-    he->key = key;
-    he->value = value;
-    he->next = *hep;
-    *hep = he;
-    ht->nentries++;
-    return he;
-}
-
-PR_IMPLEMENT(PLHashEntry *)
-PL_HashTableAdd(PLHashTable *ht, const void *key, void *value)
-{
-    PLHashNumber keyHash;
-    PLHashEntry *he, **hep;
-
-    keyHash = (*ht->keyHash)(key);
-    hep = PL_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) != 0) {
-        /* Hit; see if values match */
-        if ((*ht->valueCompare)(he->value, value)) {
-            /* key,value pair is already present in table */
-            return he;
-        }
-        if (he->value)
-            (*ht->allocOps->freeEntry)(ht->allocPriv, he, HT_FREE_VALUE);
-        he->value = value;
-        return he;
-    }
-    return PL_HashTableRawAdd(ht, hep, keyHash, key, value);
-}
-
-PR_IMPLEMENT(void)
-PL_HashTableRawRemove(PLHashTable *ht, PLHashEntry **hep, PLHashEntry *he)
-{
-    PRUint32 i, n;
-    PLHashEntry *next, **oldbuckets;
-    PRSize nb;
-
-    *hep = he->next;
-    (*ht->allocOps->freeEntry)(ht->allocPriv, he, HT_FREE_ENTRY);
-
-    /* Shrink table if it's underloaded */
-    n = NBUCKETS(ht);
-    if (--ht->nentries < UNDERLOADED(n)) {
-        oldbuckets = ht->buckets;
-        nb = n * sizeof(PLHashEntry*) / 2;
-        ht->buckets = (PLHashEntry**)(
-            (*ht->allocOps->allocTable)(ht->allocPriv, nb));
-        if (!ht->buckets) {
-            ht->buckets = oldbuckets;
-            return;
-        }
-        memset(ht->buckets, 0, nb);
-#ifdef HASHMETER
-        ht->nshrinks++;
-#endif
-        ht->shift++;
-
-        for (i = 0; i < n; i++) {
-            for (he = oldbuckets[i]; he; he = next) {
-                next = he->next;
-                hep = PL_HashTableRawLookup(ht, he->keyHash, he->key);
-                PR_ASSERT(*hep == 0);
-                he->next = 0;
-                *hep = he;
-            }
-        }
-#ifdef DEBUG
-        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
-#endif
-        (*ht->allocOps->freeTable)(ht->allocPriv, oldbuckets);
-    }
-}
-
-PR_IMPLEMENT(PRBool)
-PL_HashTableRemove(PLHashTable *ht, const void *key)
-{
-    PLHashNumber keyHash;
-    PLHashEntry *he, **hep;
-
-    keyHash = (*ht->keyHash)(key);
-    hep = PL_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) == 0)
-        return PR_FALSE;
-
-    /* Hit; remove element */
-    PL_HashTableRawRemove(ht, hep, he);
-    return PR_TRUE;
-}
-
-PR_IMPLEMENT(void *)
-PL_HashTableLookup(PLHashTable *ht, const void *key)
-{
-    PLHashNumber keyHash;
-    PLHashEntry *he, **hep;
-
-    keyHash = (*ht->keyHash)(key);
-    hep = PL_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) != 0) {
-        return he->value;
-    }
-    return 0;
-}
-
-/*
-** Same as PL_HashTableLookup but doesn't reorder the hash entries.
-*/
-PR_IMPLEMENT(void *)
-PL_HashTableLookupConst(PLHashTable *ht, const void *key)
-{
-    PLHashNumber keyHash;
-    PLHashEntry *he, **hep;
-
-    keyHash = (*ht->keyHash)(key);
-    hep = PL_HashTableRawLookupConst(ht, keyHash, key);
-    if ((he = *hep) != 0) {
-        return he->value;
-    }
-    return 0;
-}
-
-/*
-** Iterate over the entries in the hash table calling func for each
-** entry found. Stop if "f" says to (return value & PR_ENUMERATE_STOP).
-** Return a count of the number of elements scanned.
-*/
-PR_IMPLEMENT(int)
-PL_HashTableEnumerateEntries(PLHashTable *ht, PLHashEnumerator f, void *arg)
-{
-    PLHashEntry *he, **hep;
-    PRUint32 i, nbuckets;
-    int rv, n = 0;
-    PLHashEntry *todo = 0;
-
-    nbuckets = NBUCKETS(ht);
-    for (i = 0; i < nbuckets; i++) {
-        hep = &ht->buckets[i];
-        while ((he = *hep) != 0) {
-            rv = (*f)(he, n, arg);
-            n++;
-            if (rv & (HT_ENUMERATE_REMOVE | HT_ENUMERATE_UNHASH)) {
-                *hep = he->next;
-                if (rv & HT_ENUMERATE_REMOVE) {
-                    he->next = todo;
-                    todo = he;
-                }
-            } else {
-                hep = &he->next;
-            }
-            if (rv & HT_ENUMERATE_STOP) {
-                goto out;
-            }
-        }
-    }
-
-out:
-    hep = &todo;
-    while ((he = *hep) != 0) {
-        PL_HashTableRawRemove(ht, hep, he);
-    }
-    return n;
-}
-
-#ifdef HASHMETER
-#include <math.h>
-#include <stdio.h>
-
-PR_IMPLEMENT(void)
-PL_HashTableDumpMeter(PLHashTable *ht, PLHashEnumerator dump, FILE *fp)
-{
-    double mean, variance;
-    PRUint32 nchains, nbuckets;
-    PRUint32 i, n, maxChain, maxChainLen;
-    PLHashEntry *he;
-
-    variance = 0;
-    nchains = 0;
-    maxChainLen = 0;
-    nbuckets = NBUCKETS(ht);
-    for (i = 0; i < nbuckets; i++) {
-        he = ht->buckets[i];
-        if (!he)
-            continue;
-        nchains++;
-        for (n = 0; he; he = he->next)
-            n++;
-        variance += n * n;
-        if (n > maxChainLen) {
-            maxChainLen = n;
-            maxChain = i;
-        }
-    }
-    mean = (double)ht->nentries / nchains;
-    variance = fabs(variance / nchains - mean * mean);
-
-    fprintf(fp, "\nHash table statistics:\n");
-    fprintf(fp, "     number of lookups: %u\n", ht->nlookups);
-    fprintf(fp, "     number of entries: %u\n", ht->nentries);
-    fprintf(fp, "       number of grows: %u\n", ht->ngrows);
-    fprintf(fp, "     number of shrinks: %u\n", ht->nshrinks);
-    fprintf(fp, "   mean steps per hash: %g\n", (double)ht->nsteps
-                                                / ht->nlookups);
-    fprintf(fp, "mean hash chain length: %g\n", mean);
-    fprintf(fp, "    standard deviation: %g\n", sqrt(variance));
-    fprintf(fp, " max hash chain length: %u\n", maxChainLen);
-    fprintf(fp, "        max hash chain: [%u]\n", maxChain);
-
-    for (he = ht->buckets[maxChain], i = 0; he; he = he->next, i++)
-        if ((*dump)(he, i, fp) != HT_ENUMERATE_NEXT)
-            break;
-}
-#endif /* HASHMETER */
-
-PR_IMPLEMENT(int)
-PL_HashTableDump(PLHashTable *ht, PLHashEnumerator dump, FILE *fp)
-{
-    int count;
-
-    count = PL_HashTableEnumerateEntries(ht, dump, fp);
-#ifdef HASHMETER
-    PL_HashTableDumpMeter(ht, dump, fp);
-#endif
-    return count;
-}
-
-PR_IMPLEMENT(PLHashNumber)
-PL_HashString(const void *key)
-{
-    PLHashNumber h;
-    const PRUint8 *s;
-
-    h = 0;
-    for (s = (const PRUint8*)key; *s; s++)
-        h = (h >> 28) ^ (h << 4) ^ *s;
-    return h;
-}
-
-PR_IMPLEMENT(int)
-PL_CompareStrings(const void *v1, const void *v2)
-{
-    return strcmp((const char*)v1, (const char*)v2) == 0;
-}
-
-PR_IMPLEMENT(int)
-PL_CompareValues(const void *v1, const void *v2)
-{
-    return v1 == v2;
-}
diff --git a/libs/js/nsprpub/lib/ds/plhash.h b/libs/js/nsprpub/lib/ds/plhash.h
deleted file mode 100644
index 45c9773fa2..0000000000
--- a/libs/js/nsprpub/lib/ds/plhash.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef plhash_h___
-#define plhash_h___
-/*
- * API to portable hash table code.
- */
-#include <stdio.h>
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLHashEntry  PLHashEntry;
-typedef struct PLHashTable  PLHashTable;
-typedef PRUint32 PLHashNumber;
-#define PL_HASH_BITS 32  /* Number of bits in PLHashNumber */
-typedef PLHashNumber (PR_CALLBACK *PLHashFunction)(const void *key);
-typedef PRIntn (PR_CALLBACK *PLHashComparator)(const void *v1, const void *v2);
-
-#if defined(XP_OS2_VACPP) && defined(VACPP_FLIP) /* for nsSpaceManager.cpp */
-PR_END_EXTERN_C                                  /* and nsHTMLDocument.cpp */
-#endif
-typedef PRIntn (PR_CALLBACK *PLHashEnumerator)(PLHashEntry *he, PRIntn i, void *arg);
-
-#if defined(XP_OS2_VACPP) && defined(VACPP_FLIP)
-PR_BEGIN_EXTERN_C
-#endif
-
-/* Flag bits in PLHashEnumerator's return value */
-#define HT_ENUMERATE_NEXT       0       /* continue enumerating entries */
-#define HT_ENUMERATE_STOP       1       /* stop enumerating entries */
-#define HT_ENUMERATE_REMOVE     2       /* remove and free the current entry */
-#define HT_ENUMERATE_UNHASH     4       /* just unhash the current entry */
-
-typedef struct PLHashAllocOps {
-    void *              (PR_CALLBACK *allocTable)(void *pool, PRSize size);
-    void                (PR_CALLBACK *freeTable)(void *pool, void *item);
-    PLHashEntry *       (PR_CALLBACK *allocEntry)(void *pool, const void *key);
-    void                (PR_CALLBACK *freeEntry)(void *pool, PLHashEntry *he, PRUintn flag);
-} PLHashAllocOps;
-
-#define HT_FREE_VALUE   0               /* just free the entry's value */
-#define HT_FREE_ENTRY   1               /* free value and entire entry */
-
-struct PLHashEntry {
-    PLHashEntry         *next;          /* hash chain linkage */
-    PLHashNumber        keyHash;        /* key hash function result */
-    const void          *key;           /* ptr to opaque key */
-    void                *value;         /* ptr to opaque value */
-};
-
-struct PLHashTable {
-    PLHashEntry         **buckets;      /* vector of hash buckets */
-    PRUint32              nentries;       /* number of entries in table */
-    PRUint32              shift;          /* multiplicative hash shift */
-    PLHashFunction      keyHash;        /* key hash function */
-    PLHashComparator    keyCompare;     /* key comparison function */
-    PLHashComparator    valueCompare;   /* value comparison function */
-    const PLHashAllocOps *allocOps;     /* allocation operations */
-    void                *allocPriv;     /* allocation private data */
-#ifdef HASHMETER
-    PRUint32              nlookups;       /* total number of lookups */
-    PRUint32              nsteps;         /* number of hash chains traversed */
-    PRUint32              ngrows;         /* number of table expansions */
-    PRUint32              nshrinks;       /* number of table contractions */
-#endif
-};
-
-/*
- * Create a new hash table.
- * If allocOps is null, use default allocator ops built on top of malloc().
- */
-PR_EXTERN(PLHashTable *)
-PL_NewHashTable(PRUint32 numBuckets, PLHashFunction keyHash,
-                PLHashComparator keyCompare, PLHashComparator valueCompare,
-                const PLHashAllocOps *allocOps, void *allocPriv);
-
-PR_EXTERN(void)
-PL_HashTableDestroy(PLHashTable *ht);
-
-/* Higher level access methods */
-PR_EXTERN(PLHashEntry *)
-PL_HashTableAdd(PLHashTable *ht, const void *key, void *value);
-
-PR_EXTERN(PRBool)
-PL_HashTableRemove(PLHashTable *ht, const void *key);
-
-PR_EXTERN(void *)
-PL_HashTableLookup(PLHashTable *ht, const void *key);
-
-PR_EXTERN(void *)
-PL_HashTableLookupConst(PLHashTable *ht, const void *key);
-
-PR_EXTERN(PRIntn)
-PL_HashTableEnumerateEntries(PLHashTable *ht, PLHashEnumerator f, void *arg);
-
-/* General-purpose C string hash function. */
-PR_EXTERN(PLHashNumber)
-PL_HashString(const void *key);
-
-/* Compare strings using strcmp(), return true if equal. */
-PR_EXTERN(PRIntn)
-PL_CompareStrings(const void *v1, const void *v2);
-
-/* Stub function just returns v1 == v2 */
-PR_EXTERN(PRIntn)
-PL_CompareValues(const void *v1, const void *v2);
-
-/* Low level access methods */
-PR_EXTERN(PLHashEntry **)
-PL_HashTableRawLookup(PLHashTable *ht, PLHashNumber keyHash, const void *key);
-
-PR_EXTERN(PLHashEntry **)
-PL_HashTableRawLookupConst(PLHashTable *ht, PLHashNumber keyHash,
-                           const void *key);
-
-PR_EXTERN(PLHashEntry *)
-PL_HashTableRawAdd(PLHashTable *ht, PLHashEntry **hep, PLHashNumber keyHash,
-                   const void *key, void *value);
-
-PR_EXTERN(void)
-PL_HashTableRawRemove(PLHashTable *ht, PLHashEntry **hep, PLHashEntry *he);
-
-/* This can be trivially implemented using PL_HashTableEnumerateEntries. */
-PR_EXTERN(PRIntn)
-PL_HashTableDump(PLHashTable *ht, PLHashEnumerator dump, FILE *fp);
-
-PR_END_EXTERN_C
-
-#endif /* plhash_h___ */
diff --git a/libs/js/nsprpub/lib/ds/plvrsion.c b/libs/js/nsprpub/lib/ds/plvrsion.c
deleted file mode 100644
index 486a6cb1ff..0000000000
--- a/libs/js/nsprpub/lib/ds/plvrsion.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prvrsion.h"
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-#include "_pl_bld.h"
-#if !defined(_BUILD_TIME)
-#ifdef HAVE_LONG_LONG
-#define _BUILD_TIME 0
-#else
-#define _BUILD_TIME {0, 0}
-#endif
-#endif
-#if !defined(_BUILD_STRING)
-#define _BUILD_STRING ""
-#endif
-#if !defined(_PRODUCTION)
-#define _PRODUCTION ""
-#endif
-#if defined(DEBUG)
-#define _DEBUG_STRING " (debug)"
-#else
-#define _DEBUG_STRING ""
-#endif
-
-/*
- * A trick to expand the PR_VMAJOR macro before concatenation.
- */
-#define CONCAT(x, y) x ## y
-#define CONCAT2(x, y) CONCAT(x, y)
-#define VERSION_DESC_NAME CONCAT2(prVersionDescription_libplds, PR_VMAJOR)
-
-PRVersionDescription VERSION_DESC_NAME =
-{
-    /* version          */  2,                  /* this is the only one supported */
-    /* buildTime        */  _BUILD_TIME,        /* usecs since midnight 1/1/1970 GMT */
-    /* buildTimeString  */  _BUILD_STRING,       /*    ditto, but human readable */
-    /* vMajor           */  PR_VMAJOR,          /* NSPR's version number */
-    /* vMinor           */  PR_VMINOR,          /*  and minor version */
-    /* vPatch           */  PR_VPATCH,          /*  and patch */
-    /* beta             */  PR_BETA,            /* beta build boolean */
-#if defined(DEBUG)
-    /* debug            */  PR_TRUE,            /* a debug build */
-#else
-    /* debug            */  PR_FALSE,           /* an optomized build */
-#endif
-    /* special          */  PR_FALSE,           /* they're all special, but ... */
-    /* filename         */  _PRODUCTION,        /* the produced library name */
-    /* description      */ "Portable runtime",  /* what we are */
-    /* security         */ "N/A",               /* not applicable here */
-    /* copywrite        */  "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
-    /* comment          */  "http://www.mozilla.org/MPL/",
-    /* specialString    */ ""
-};
-
-#ifdef XP_UNIX
-
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING " $";
-static char sccsid[] = "@(#)NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING;
-
-#endif /* XP_UNIX */
-
-PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint()
-{
-#ifdef XP_UNIX
-    /*
-     * Add dummy references to rcsid and sccsid to prevent them
-     * from being optimized away as unused variables.
-     */
-    const char *dummy;
-    
-    dummy = rcsid;
-    dummy = sccsid;
-#endif
-    return &VERSION_DESC_NAME;
-}  /* versionEntryPointType */
-
-/* plvrsion.c */
-
diff --git a/libs/js/nsprpub/lib/libc/.cvsignore b/libs/js/nsprpub/lib/libc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/libc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/libc/Makefile.in b/libs/js/nsprpub/lib/libc/Makefile.in
deleted file mode 100644
index 9755225a3d..0000000000
--- a/libs/js/nsprpub/lib/libc/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-export NSPR20=1
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = include src
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/lib/libc/README b/libs/js/nsprpub/lib/libc/README
deleted file mode 100644
index 74f246907f..0000000000
--- a/libs/js/nsprpub/lib/libc/README
+++ /dev/null
@@ -1,20 +0,0 @@
-NSPR 2.0 libc functions
------------------------
-
-Last edited: AOF 04 March 1997
-
-This directory contains various libc-types of functions. All functions in
-this directory are platform independent, thread friendly (both safe and
-efficient). They are contributed from various sources, though the contri-
-butions are monitored by the NSPR group (mailto:freier).
-
-All API items exported by these functions will contain the same three
-character prefix, "PL_" (Portable Library). Internal function names
-that are not exported (static) are of little concern, though some caution
-must be used on those elements that are 'extern' but not really intended
-to be part of the API. Those should all have a prefix of "_PL_" (is that
-legal?).
-
-The responsibility for contributions in this area are distributed among
-all interested parties.
-
diff --git a/libs/js/nsprpub/lib/libc/include/.cvsignore b/libs/js/nsprpub/lib/libc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/libc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/libc/include/MANIFEST b/libs/js/nsprpub/lib/libc/include/MANIFEST
deleted file mode 100644
index 63e8861de2..0000000000
--- a/libs/js/nsprpub/lib/libc/include/MANIFEST
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-plbase64.h
-plerror.h
-plgetopt.h
-plresolv.h
-plstr.h
diff --git a/libs/js/nsprpub/lib/libc/include/Makefile.in b/libs/js/nsprpub/lib/libc/include/Makefile.in
deleted file mode 100644
index 9d5e2e1866..0000000000
--- a/libs/js/nsprpub/lib/libc/include/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-
-HEADERS = $(wildcard $(srcdir)/*.h)
-
-RELEASE_HEADERS = $(HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(HEADERS)
-	$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
-endif
-
-
diff --git a/libs/js/nsprpub/lib/libc/include/README b/libs/js/nsprpub/lib/libc/include/README
deleted file mode 100644
index 2b85218910..0000000000
--- a/libs/js/nsprpub/lib/libc/include/README
+++ /dev/null
@@ -1,7 +0,0 @@
-NSPR 2.0 libc functions
------------------------
-
-Last edited: AOF 04 March 1997
-
-This directory contains the API for various libc-types of functions.
-
diff --git a/libs/js/nsprpub/lib/libc/include/plbase64.h b/libs/js/nsprpub/lib/libc/include/plbase64.h
deleted file mode 100644
index ac07e83735..0000000000
--- a/libs/js/nsprpub/lib/libc/include/plbase64.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _plbase64_h
-#define _plbase64_h
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PL_Base64Encode
- *
- * This routine encodes the data pointed to by the "src" parameter using the
- * base64 algorithm, and returns a pointer to the result.  If the "srclen"
- * parameter is not zero, it specifies the length of the source data.  If it
- * is zero, the source data is assumed to be null-terminated, and PL_strlen
- * is used to determine the source length.  If the "dest" parameter is not
- * null, it is assumed to point to a buffer of sufficient size (which may be
- * calculated: ((srclen + 2)/3)*4) into which the encoded data is placed 
- * (without any termination).  If the "dest" parameter is null, a buffer is
- * allocated from the heap to hold the encoded data, and the result *will*
- * be terminated with an extra null character.  It is the caller's 
- * responsibility to free the result when it is allocated.  A null is returned 
- * if the allocation fails.
- */
-
-PR_EXTERN(char *)
-PL_Base64Encode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-);
-
-/*
- * PL_Base64Decode
- *
- * This routine decodes the data pointed to by the "src" parameter using
- * the base64 algorithm, and returns a pointer to the result.  The source
- * may either include or exclude any trailing '=' characters.  If the
- * "srclen" parameter is not zero, it specifies the length of the source
- * data.  If it is zero, PL_strlen will be used to determine the source
- * length.  If the "dest" parameter is not null, it is assumed to point to
- * a buffer of sufficient size (which may be calculated: (srclen * 3)/4
- * when srclen includes the '=' characters) into which the decoded data
- * is placed (without any termination).  If the "dest" parameter is null,
- * a buffer is allocated from the heap to hold the decoded data, and the
- * result *will* be terminated with an extra null character.  It is the
- * caller's responsibility to free the result when it is allocated.  A null
- * is retuned if the allocation fails, or if the source is not well-coded.
- */
-
-PR_EXTERN(char *)
-PL_Base64Decode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-);
-
-PR_END_EXTERN_C
-
-#endif /* _plbase64_h */
diff --git a/libs/js/nsprpub/lib/libc/include/plerror.h b/libs/js/nsprpub/lib/libc/include/plerror.h
deleted file mode 100644
index a2b8d0b220..0000000000
--- a/libs/js/nsprpub/lib/libc/include/plerror.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        plerror.h
-** Description: Simple routine to print translate the calling thread's
-**              error numbers and print them.
-*/
-
-#if defined(PLERROR_H)
-#else
-#define PLERROR_H
-
-#include "prio.h"
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-/*
-** Print the messages to "syserr" prepending 'msg' if not NULL.
-*/
-PR_EXTERN(void) PL_PrintError(const char *msg);
-
-/*
-** Print the messages to specified output file prepending 'msg' if not NULL.
-*/
-PR_EXTERN(void) PL_FPrintError(PRFileDesc *output, const char *msg);
-
-PR_END_EXTERN_C
-
-#endif /* defined(PLERROR_H) */
-
-/* plerror.h */
diff --git a/libs/js/nsprpub/lib/libc/include/plgetopt.h b/libs/js/nsprpub/lib/libc/include/plgetopt.h
deleted file mode 100644
index 423feab3a9..0000000000
--- a/libs/js/nsprpub/lib/libc/include/plgetopt.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:          plgetopt.h
-** Description:   utilities to parse argc/argv
-*/
-
-#if defined(PLGETOPT_H_)
-#else
-#define PLGETOPT_H_
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLOptionInternal PLOptionInternal; 
-
-typedef enum
-{
-        PL_OPT_OK,              /* all's well with the option */
-        PL_OPT_EOL,             /* end of options list */
-        PL_OPT_BAD              /* invalid option (and value) */
-} PLOptStatus;
-
-typedef struct PLOptState
-{
-    char option;                /* the name of the option */
-    const char *value;          /* the value of that option | NULL */
-
-    PLOptionInternal *internal; /* private processing state */
-
-} PLOptState;
-
-PR_EXTERN(PLOptState*) PL_CreateOptState(
-        PRIntn argc, char **argv, const char *options);
-
-PR_EXTERN(void) PL_DestroyOptState(PLOptState *opt);
-
-PR_EXTERN(PLOptStatus) PL_GetNextOpt(PLOptState *opt);
-
-PR_END_EXTERN_C
-
-#endif /* defined(PLGETOPT_H_) */
-
-/* plgetopt.h */
-
diff --git a/libs/js/nsprpub/lib/libc/include/plresolv.h b/libs/js/nsprpub/lib/libc/include/plresolv.h
deleted file mode 100644
index 8e8926c6c1..0000000000
--- a/libs/js/nsprpub/lib/libc/include/plresolv.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * plresolv.h - asynchronous name resolution using DNS 
- */
-
-#ifndef _PLRESOLV_H_
-#define _PLRESOLV_H_
-
-/*
-** THIS IS WORK IN PROGRESS. DO NOT ATTEMPT TO USE ANY PORTION OF THIS
-** API UNTIL THIS MESSAGE NO LONGER EXISTS. IF YOU DO, THEN YOU SURRENDER
-** THE RIGHT TO COMPLAIN ABOUT ANY CONTENT.
-*/
-
-#if defined(XP_UNIX)
-
-#include <prtypes.h>
-#include <prnetdb.h>
-
-NSPR_BEGIN_EXTERN_C
-
-#define PL_RESOLVE_MAXHOSTENTBUF        1024
-#define PL_RESOLVE_DEFAULT_TIMEOUT      0
-
-/* Error return codes */
-#define PL_RESOLVE_OK            0
-#define PL_RESOLVE_EWINIT        1           /* Failed to initialize window */
-#define PL_RESOLVE_EMAKE         2           /* Failed to create request */
-#define PL_RESOLVE_ELAUNCH       3           /* Error launching Async request */
-#define PL_RESOLVE_ETIMEDOUT     4           /* Request timed-out */
-#define PL_RESOLVE_EINVAL        5           /* Invalid argument */
-#define PL_RESOLVE_EOVERFLOW     6           /* Buffer Overflow */
-#define PL_RESOLVE_EUNKNOWN      7           /* berserk error */
-
-/* ----------- Function Prototypes ----------------*/
-
-PR_EXTERN(PRStatus) PL_ResolveName(
-    const char *name, unsigned char *buf,
-    PRIntn bufsize, PRIntervalTime timeout,
-    PRHostEnt *hostentry, PRIntervalTime *ttl);
-
-PR_EXTERN(PRStatus) PL_ResolveAddr(
-    const PRNetAddr *address, unsigned char *buf,
-    PRIntn bufsize, PRIntervalTime timeout,
-    PRHostEnt *hostentry, PRIntervalTime *ttl);
-
-typedef struct PLResolveStats {
-    int re_errors;
-    int re_nu_look;
-    int re_na_look;
-    int re_replies;
-    int re_requests;
-    int re_resends;
-    int re_sent;
-    int re_timeouts;
-} PLResolveStats;
-
-typedef struct PLResoveInfo {
-    PRBool enabled;
-    PRUint32 numNameLookups;
-    PRUint32 numAddrLookups;
-    PRUint32 numLookupsInProgress;
-    PLResolveStats stats;
-} PLResoveInfo;
-
-PR_EXTERN(void) PL_ResolveInfo(PLResoveInfo *info);
-
-NSPR_END_EXTERN_C
-
-#endif /* defined(XP_UNIX) */
-
-#endif /* _PLRESOLV_H_ */
diff --git a/libs/js/nsprpub/lib/libc/include/plstr.h b/libs/js/nsprpub/lib/libc/include/plstr.h
deleted file mode 100644
index 4d21cc46ef..0000000000
--- a/libs/js/nsprpub/lib/libc/include/plstr.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roland Mainz <roland mainz@informatik.med.uni-giessen.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _plstr_h
-#define _plstr_h
-
-/*
- * plstr.h
- *
- * This header file exports the API to the NSPR portable library or string-
- * handling functions.  
- * 
- * This API was not designed as an "optimal" or "ideal" string library; it 
- * was based on the good ol' unix string.3 functions, and was written to
- *
- *  1) replace the libc functions, for cross-platform consistency, 
- *  2) complete the API on platforms lacking common functions (e.g., 
- *     strcase*), and
- *  3) to implement some obvious "closure" functions that I've seen
- *     people hacking around in our code.
- *
- * Point number three largely means that most functions have an "strn"
- * limited-length version, and all comparison routines have a non-case-
- * sensitive version available.
- */
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-/*
- * PL_strlen
- *
- * Returns the length of the provided string, not including the trailing '\0'.
- */
-
-PR_EXTERN(PRUint32)
-PL_strlen(const char *str);
-
-/*
- * PL_strnlen
- *
- * Returns the length of the provided string, not including the trailing '\0',
- * up to the indicated maximum.  The string will not be examined beyond the
- * maximum; if no terminating '\0' is found, the maximum will be returned.
- */
-
-PR_EXTERN(PRUint32)
-PL_strnlen(const char *str, PRUint32 max);
-
-/*
- * PL_strcpy
- *
- * Copies the source string, up to and including the trailing '\0', into the
- * destination buffer.  It does not (can not) verify that the destination
- * buffer is large enough.  It returns the "dest" argument.
- */
-
-PR_EXTERN(char *)
-PL_strcpy(char *dest, const char *src);
-
-/*
- * PL_strncpy
- *
- * Copies the source string into the destination buffer, up to and including
- * the trailing '\0' or up to and including the max'th character, whichever
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  If the source string is longer than the maximum length,
- * the result will *not* be null-terminated (JLRU).
- */
-
-PR_EXTERN(char *)
-PL_strncpy(char *dest, const char *src, PRUint32 max);
-
-/*
- * PL_strncpyz
- *
- * Copies the source string into the destination buffer, up to and including 
- * the trailing '\0' or up but not including the max'th character, whichever 
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  The destination string is always terminated with a '\0',
- * unlike the traditional libc implementation.  It returns the "dest" argument.
- *
- * NOTE: If you call this with a source "abcdefg" and a max of 5, the 
- * destination will end up with "abcd\0" (i.e., its strlen length will be 4)!
- *
- * This means you can do this:
- *
- *     char buffer[ SOME_SIZE ];
- *     PL_strncpyz(buffer, src, sizeof(buffer));
- *
- * and the result will be properly terminated.
- */
-
-PR_EXTERN(char *)
-PL_strncpyz(char *dest, const char *src, PRUint32 max);
-
-/*
- * PL_strdup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string.  The size of the allocated extent is one greater
- * than the length of the argument string, because of the terminator.  A
- * null argument, like a zero-length argument, will result in a pointer to
- * a one-byte extent containing the null value.  This routine returns null
- * upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strdup(const char *s);
-
-/*
- * PL_strfree
- *
- * Free memory allocated by PL_strdup
- */
-
-PR_EXTERN(void)
-PL_strfree(char *s);
-
-/*
- * PL_strndup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string, up to the maximum specified.  If the argument
- * string has a length greater than the value of the specified maximum, the
- * return value will be a pointer to an extent of memory of length one
- * greater than the maximum specified.  A null string, a zero-length string,
- * or a zero maximum will all result in a pointer to a one-byte extent
- * containing the null value.  This routine returns null upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strndup(const char *s, PRUint32 max);
-
-/*
- * PL_strcat
- *
- * Appends a copy of the string pointed to by the second argument to the
- * end of the string pointed to by the first.  The destination buffer is
- * not (can not be) checked for sufficient size.  A null destination
- * argument returns null; otherwise, the first argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strcat(char *dst, const char *src);
-
-/*
- * PL_strncat
- *
- * Appends a copy of the string pointed to by the second argument, up to
- * the maximum size specified, to the end of the string pointed to by the
- * first.  The destination buffer is not (can not be) checked for sufficient
- * size.  A null destination argument returns null; otherwise, the first 
- * argument is returned.  If the maximum size limits the copy, then the
- * result will *not* be null-terminated (JLRU).  A null destination
- * returns null; otherwise, the destination argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strncat(char *dst, const char *src, PRUint32 max);
-
-/*
- * PL_strcatn
- *
- * Appends a copy of the string pointed to by the third argument, to the
- * end of the string pointed to by the first.  The second argument specifies
- * the maximum size of the destination buffer, including the null termination.
- * If the existing string in dst is longer than the max, no action is taken.
- * The resulting string will be null-terminated.  A null destination returns
- * null; otherwise, the destination argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strcatn(char *dst, PRUint32 max, const char *src);
-
-/*
- * PL_strcmp
- *
- * Returns an integer, the sign of which -- positive, zero, or negative --
- * reflects the lexical sorting order of the two strings indicated.  The
- * result is positive if the first string comes after the second.  The
- * NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strcmp(const char *a, const char *b);
-
-/*
- * PL_strncmp
- * 
- * Returns an integer, the sign of which -- positive, zero, or negative --
- * reflects the lexical sorting order of the two strings indicated, up to
- * the maximum specified.  The result is positive if the first string comes 
- * after the second.  The NSPR implementation is not i18n.  If the maximum
- * is zero, only the existance or non-existance (pointer is null) of the
- * strings is compared.
- */
-
-PR_EXTERN(PRIntn)
-PL_strncmp(const char *a, const char *b, PRUint32 max);
-
-/*
- * PL_strcasecmp
- *
- * Returns an integer, the sign of which -- positive, zero or negative --
- * reflects the case-insensitive lexical sorting order of the two strings
- * indicated.  The result is positive if the first string comes after the 
- * second.  The NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strcasecmp(const char *a, const char *b);
-
-/*
- * PL_strncasecmp
- *
- * Returns an integer, the sign of which -- positive, zero or negative --
- * reflects the case-insensitive lexical sorting order of the first n characters
- * of the two strings indicated.  The result is positive if the first string comes 
- * after the second.  The NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strncasecmp(const char *a, const char *b, PRUint32 max);
-
-/*
- * PL_strchr
- *
- * Returns a pointer to the first instance of the specified character in the
- * provided string.  It returns null if the character is not found, or if the
- * provided string is null.  The character may be the null character.
- */
-
-PR_EXTERN(char *)
-PL_strchr(const char *s, char c);
-
-/*
- * PL_strrchr
- *
- * Returns a pointer to the last instance of the specified character in the
- * provided string.  It returns null if the character is not found, or if the
- * provided string is null.  The character may be the null character.
- */
-
-PR_EXTERN(char *)
-PL_strrchr(const char *s, char c);
-
-/*
- * PL_strnchr
- * 
- * Returns a pointer to the first instance of the specified character within the
- * first n characters of the provided string.  It returns null if the character
- * is not found, or if the provided string is null.  The character may be the
- * null character.
- */
-
-PR_EXTERN(char *)
-PL_strnchr(const char *s, char c, PRUint32 n);
-
-/*
- * PL_strnrchr
- *
- * Returns a pointer to the last instance of the specified character within the
- * first n characters of the provided string.  It returns null if the character is
- * not found, or if the provided string is null.  The character may be the null
- * character.
- */
-
-PR_EXTERN(char *)
-PL_strnrchr(const char *s, char c, PRUint32 n);
-
-/*
- * NOTE: Looking for strcasechr, strcaserchr, strncasechr, or strncaserchr?
- * Use strpbrk, strprbrk, strnpbrk or strnprbrk.
- */
-
-/*
- * PL_strpbrk
- *
- * Returns a pointer to the first instance in the first string of any character
- * (not including the terminating null character) of the second string.  It returns
- * null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strpbrk(const char *s, const char *list);
-
-/*
- * PL_strprbrk
- *
- * Returns a pointer to the last instance in the first string of any character
- * (not including the terminating null character) of the second string.  It returns
- * null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strprbrk(const char *s, const char *list);
-
-/*
- * PL_strnpbrk
- *
- * Returns a pointer to the first instance (within the first n characters) of any
- * character (not including the terminating null character) of the second string.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strnpbrk(const char *s, const char *list, PRUint32 n);
-
-/*
- * PL_strnprbrk
- *
- * Returns a pointer to the last instance (within the first n characters) of any
- * character (not including the terminating null character) of the second string.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strnprbrk(const char *s, const char *list, PRUint32 n);
-
-/*
- * PL_strstr
- *
- * Returns a pointer to the first instance of the little string within the
- * big one.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strstr(const char *big, const char *little);
-
-/*
- * PL_strrstr
- *
- * Returns a pointer to the last instance of the little string within the big one.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strrstr(const char *big, const char *little);
-
-/*
- * PL_strnstr
- *
- * Returns a pointer to the first instance of the little string within the first
- * n characters of the big one.  It returns null if either string is null.  It
- * returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strnstr(const char *big, const char *little, PRUint32 n);
-
-/*
- * PL_strnrstr
- *
- * Returns a pointer to the last instance of the little string within the first
- * n characters of the big one.  It returns null if either string is null.  It
- * returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strnrstr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strcasestr
- *
- * Returns a pointer to the first instance of the little string within the big one,
- * ignoring case.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strcasestr(const char *big, const char *little);
-
-/*
- * PL_strcaserstr
- *
- * Returns a pointer to the last instance of the little string within the big one,
- * ignoring case.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strcaserstr(const char *big, const char *little);
-
-/*
- * PL_strncasestr
- *
- * Returns a pointer to the first instance of the little string within the first
- * n characters of the big one, ignoring case.  It returns null if either string is 
- * null.  It returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strncasestr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strncaserstr
- *
- * Returns a pointer to the last instance of the little string within the first
- * n characters of the big one, ignoring case.  It returns null if either string is
- * null.  It returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strncaserstr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strtok_r
- *
- * Splits the string s1 into tokens, separated by one or more characters
- * from the separator string s2.  The argument lasts points to a
- * user-supplied char * pointer in which PL_strtok_r stores information
- * for it to continue scanning the same string.
- *
- * In the first call to PL_strtok_r, s1 points to a string and the value
- * of *lasts is ignored.  PL_strtok_r returns a pointer to the first
- * token, writes '\0' into the character following the first token, and
- * updates *lasts.
- *
- * In subsequent calls, s1 is null and lasts must stay unchanged from the
- * previous call.  The separator string s2 may be different from call to
- * call.  PL_strtok_r returns a pointer to the next token in s1.  When no
- * token remains in s1, PL_strtok_r returns null.
- */
-
-PR_EXTERN(char *)
-PL_strtok_r(char *s1, const char *s2, char **lasts);
-
-/*
- * Things not (yet?) included: strspn/strcspn, strsep.
- * memchr, memcmp, memcpy, memccpy, index, rindex, bcmp, bcopy, bzero.
- * Any and all i18n/l10n stuff.
- */
-
-PR_END_EXTERN_C
-
-#endif /* _plstr_h */
diff --git a/libs/js/nsprpub/lib/libc/src/.cvsignore b/libs/js/nsprpub/lib/libc/src/.cvsignore
deleted file mode 100644
index bcab60f5aa..0000000000
--- a/libs/js/nsprpub/lib/libc/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pl_bld.h
diff --git a/libs/js/nsprpub/lib/libc/src/Makefile.in b/libs/js/nsprpub/lib/libc/src/Makefile.in
deleted file mode 100644
index fcdbae60b3..0000000000
--- a/libs/js/nsprpub/lib/libc/src/Makefile.in
+++ /dev/null
@@ -1,202 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-INCLUDES = -I$(dist_includedir)
-
-CSRCS =\
-	plvrsion.c  \
-	strlen.c  \
-	strcpy.c  \
-	strdup.c  \
-	strcat.c  \
-	strcmp.c  \
-	strccmp.c \
-	strchr.c  \
-	strpbrk.c \
-	strstr.c  \
-	strcstr.c \
-	strtok.c  \
-	base64.c \
-	plerror.c \
-	plgetopt.c \
-	$(NULL)
-
-LIBRARY_NAME	= plc
-LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
-
-RELEASE_LIBS = $(TARGETS)
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
-RES=$(OBJDIR)/plc.res
-RESNAME=plc.rc
-endif # WINNT
-
-ifeq ($(OS_ARCH), AIX)
-ifeq ($(CLASSIC_NSPR),1)
-OS_LIBS = -lc
-else
-OS_LIBS = -lc_r
-endif
-endif
-
-ifeq ($(OS_ARCH),IRIX)
-OS_LIBS = -lc
-endif
-
-ifeq ($(OS_ARCH),SunOS)
-OS_LIBS = -lc
-MAPFILE = $(OBJDIR)/plcmap.sun
-GARBAGE += $(MAPFILE)
-ifdef NS_USE_GCC
-ifdef GCC_USE_GNU_LD
-MKSHLIB += -Wl,--version-script,$(MAPFILE)
-else
-MKSHLIB += -Wl,-M,$(MAPFILE)
-endif
-else
-MKSHLIB += -M $(MAPFILE)
-endif
-# The -R '$ORIGIN' linker option instructs this library to search for its
-# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-endif
-
-ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
-GARBAGE += $(MAPFILE)
-MKSHLIB += $(MAPFILE)
-endif
-
-EXTRA_LIBS = $(LIBNSPR)
-
-# On NCR and SCOOS, we can't link with extra libraries when
-# we build a shared library.  If we do so, the linker doesn't
-# complain, but we would run into weird problems at run-time.
-# Therefore on these platforms, we link just the .o files.
-ifeq ($(OS_ARCH),NCR)
-EXTRA_LIBS =
-endif
-ifeq ($(OS_ARCH),SCOOS)
-EXTRA_LIBS =
-endif
-
-ifdef RESOLVE_LINK_SYMBOLS
-EXTRA_LIBS += $(OS_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-#
-# Version information generation (begin)
-#
-ECHO = echo
-TINC = $(OBJDIR)/_pl_bld.h
-PROD = $(notdir $(SHARED_LIBRARY))
-NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
-
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	SUF = i64
-else
-	SUF = LL
-endif
-
-GARBAGE += $(TINC)
-
-$(TINC):
-	@$(MAKE_OBJDIR)
-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
-	@if test ! -z "$(SH_NOW)"; then \
-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
-	else \
-	    true; \
-	fi
-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-
-
-$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-ifeq ($(MOZ_OS2_TOOLS), VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
-endif
-endif
-#
-# Version information generation (end)
-#
-
-#
-# The Client build wants the shared libraries in $(dist_bindir),
-# so we also install them there.
-#
-
-export:: $(TARGETS)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-ifdef SHARED_LIBRARY
-ifeq ($(OS_ARCH),HP-UX)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
-else
-	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
-endif
-endif
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
-endif
-
diff --git a/libs/js/nsprpub/lib/libc/src/README b/libs/js/nsprpub/lib/libc/src/README
deleted file mode 100644
index 74f246907f..0000000000
--- a/libs/js/nsprpub/lib/libc/src/README
+++ /dev/null
@@ -1,20 +0,0 @@
-NSPR 2.0 libc functions
------------------------
-
-Last edited: AOF 04 March 1997
-
-This directory contains various libc-types of functions. All functions in
-this directory are platform independent, thread friendly (both safe and
-efficient). They are contributed from various sources, though the contri-
-butions are monitored by the NSPR group (mailto:freier).
-
-All API items exported by these functions will contain the same three
-character prefix, "PL_" (Portable Library). Internal function names
-that are not exported (static) are of little concern, though some caution
-must be used on those elements that are 'extern' but not really intended
-to be part of the API. Those should all have a prefix of "_PL_" (is that
-legal?).
-
-The responsibility for contributions in this area are distributed among
-all interested parties.
-
diff --git a/libs/js/nsprpub/lib/libc/src/base64.c b/libs/js/nsprpub/lib/libc/src/base64.c
deleted file mode 100644
index 234d60d8fb..0000000000
--- a/libs/js/nsprpub/lib/libc/src/base64.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plbase64.h"
-#include "prlog.h" /* For PR_NOT_REACHED */
-#include "prmem.h" /* for malloc / PR_MALLOC */
-#include "plstr.h" /* for PL_strlen */
-
-static unsigned char *base = (unsigned char *)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static void
-encode3to4
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    PRUint32 b32 = (PRUint32)0;
-    PRIntn i, j = 18;
-
-    for( i = 0; i < 3; i++ )
-    {
-        b32 <<= 8;
-        b32 |= (PRUint32)src[i];
-    }
-
-    for( i = 0; i < 4; i++ )
-    {
-        dest[i] = base[ (PRUint32)((b32>>j) & 0x3F) ];
-        j -= 6;
-    }
-
-    return;
-}
-
-static void
-encode2to4
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    dest[0] = base[ (PRUint32)((src[0]>>2) & 0x3F) ];
-    dest[1] = base[ (PRUint32)(((src[0] & 0x03) << 4) | ((src[1] >> 4) & 0x0F)) ];
-    dest[2] = base[ (PRUint32)((src[1] & 0x0F) << 2) ];
-    dest[3] = (unsigned char)'=';
-    return;
-}
-
-static void
-encode1to4
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    dest[0] = base[ (PRUint32)((src[0]>>2) & 0x3F) ];
-    dest[1] = base[ (PRUint32)((src[0] & 0x03) << 4) ];
-    dest[2] = (unsigned char)'=';
-    dest[3] = (unsigned char)'=';
-    return;
-}
-
-static void
-encode
-(
-    const unsigned char    *src,
-    PRUint32                srclen,
-    unsigned char          *dest
-)
-{
-    while( srclen >= 3 )
-    {
-        encode3to4(src, dest);
-        src += 3;
-        dest += 4;
-        srclen -= 3;
-    }
-
-    switch( srclen )
-    {
-        case 2:
-            encode2to4(src, dest);
-            break;
-        case 1:
-            encode1to4(src, dest);
-            break;
-        case 0:
-            break;
-        default:
-            PR_NOT_REACHED("coding error");
-    }
-
-    return;
-}
-
-/*
- * PL_Base64Encode
- *
- * If the destination argument is NULL, a return buffer is 
- * allocated, and the data therein will be null-terminated.  
- * If the destination argument is not NULL, it is assumed to
- * be of sufficient size, and the contents will not be null-
- * terminated by this routine.
- *
- * Returns null if the allocation fails.
- */
-
-PR_IMPLEMENT(char *)
-PL_Base64Encode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-)
-{
-    if( 0 == srclen )
-    {
-        srclen = PL_strlen(src);
-    }
-
-    if( (char *)0 == dest )
-    {
-        PRUint32 destlen = ((srclen + 2)/3) * 4;
-        dest = (char *)PR_MALLOC(destlen + 1);
-        if( (char *)0 == dest )
-        {
-            return (char *)0;
-        }
-        dest[ destlen ] = (char)0; /* null terminate */
-    }
-
-    encode((const unsigned char *)src, srclen, (unsigned char *)dest);
-    return dest;
-}
-
-static PRInt32
-codetovalue
-(
-    unsigned char c
-)
-{
-    if( (c >= (unsigned char)'A') && (c <= (unsigned char)'Z') )
-    {
-        return (PRInt32)(c - (unsigned char)'A');
-    }
-    else if( (c >= (unsigned char)'a') && (c <= (unsigned char)'z') )
-    {
-        return ((PRInt32)(c - (unsigned char)'a') +26);
-    }
-    else if( (c >= (unsigned char)'0') && (c <= (unsigned char)'9') )
-    {
-        return ((PRInt32)(c - (unsigned char)'0') +52);
-    }
-    else if( (unsigned char)'+' == c )
-    {
-        return (PRInt32)62;
-    }
-    else if( (unsigned char)'/' == c )
-    {
-        return (PRInt32)63;
-    }
-    else
-    {
-        return -1;
-    }
-}
-
-static PRStatus
-decode4to3
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    PRUint32 b32 = (PRUint32)0;
-    PRInt32 bits;
-    PRIntn i;
-
-    for( i = 0; i < 4; i++ )
-    {
-        bits = codetovalue(src[i]);
-        if( bits < 0 )
-        {
-            return PR_FAILURE;
-        }
-
-        b32 <<= 6;
-        b32 |= bits;
-    }
-
-    dest[0] = (unsigned char)((b32 >> 16) & 0xFF);
-    dest[1] = (unsigned char)((b32 >>  8) & 0xFF);
-    dest[2] = (unsigned char)((b32      ) & 0xFF);
-
-    return PR_SUCCESS;
-}
-
-static PRStatus
-decode3to2
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    PRUint32 b32 = (PRUint32)0;
-    PRInt32 bits;
-    PRUint32 ubits;
-
-    bits = codetovalue(src[0]);
-    if( bits < 0 )
-    {
-        return PR_FAILURE;
-    }
-
-    b32 = (PRUint32)bits;
-    b32 <<= 6;
-
-    bits = codetovalue(src[1]);
-    if( bits < 0 )
-    {
-        return PR_FAILURE;
-    }
-
-    b32 |= (PRUint32)bits;
-    b32 <<= 4;
-
-    bits = codetovalue(src[2]);
-    if( bits < 0 )
-    {
-        return PR_FAILURE;
-    }
-
-    ubits = (PRUint32)bits;
-    b32 |= (ubits >> 2);
-
-    dest[0] = (unsigned char)((b32 >> 8) & 0xFF);
-    dest[1] = (unsigned char)((b32     ) & 0xFF);
-
-    return PR_SUCCESS;
-}
-
-static PRStatus
-decode2to1
-(
-    const unsigned char    *src,
-    unsigned char          *dest
-)
-{
-    PRUint32 b32;
-    PRUint32 ubits;
-    PRInt32 bits;
-
-    bits = codetovalue(src[0]);
-    if( bits < 0 )
-    {
-        return PR_FAILURE;
-    }
-
-    ubits = (PRUint32)bits;
-    b32 = (ubits << 2);
-
-    bits = codetovalue(src[1]);
-    if( bits < 0 )
-    {
-        return PR_FAILURE;
-    }
-
-    ubits = (PRUint32)bits;
-    b32 |= (ubits >> 4);
-
-    dest[0] = (unsigned char)b32;
-
-    return PR_SUCCESS;
-}
-
-static PRStatus
-decode
-(
-    const unsigned char    *src,
-    PRUint32                srclen,
-    unsigned char          *dest
-)
-{
-    PRStatus rv;
-
-    while( srclen >= 4 )
-    {
-        rv = decode4to3(src, dest);
-        if( PR_SUCCESS != rv )
-        {
-            return PR_FAILURE;
-        }
-
-        src += 4;
-        dest += 3;
-        srclen -= 4;
-    }
-
-    switch( srclen )
-    {
-        case 3:
-            rv = decode3to2(src, dest);
-            break;
-        case 2:
-            rv = decode2to1(src, dest);
-            break;
-        case 1:
-            rv = PR_FAILURE;
-            break;
-        case 0:
-            rv = PR_SUCCESS;
-            break;
-        default:
-            PR_NOT_REACHED("coding error");
-    }
-
-    return rv;
-}
-
-/*
- * PL_Base64Decode
- *
- * If the destination argument is NULL, a return buffer is
- * allocated and the data therein will be null-terminated.
- * If the destination argument is not null, it is assumed
- * to be of sufficient size, and the data will not be null-
- * terminated by this routine.
- * 
- * Returns null if the allocation fails, or if the source string is 
- * not well-formed.
- */
-
-PR_IMPLEMENT(char *)
-PL_Base64Decode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-)
-{
-    PRStatus status;
-    PRBool allocated = PR_FALSE;
-
-    if( (char *)0 == src )
-    {
-        return (char *)0;
-    }
-
-    if( 0 == srclen )
-    {
-        srclen = PL_strlen(src);
-    }
-
-    if( srclen && (0 == (srclen & 3)) )
-    {
-        if( (char)'=' == src[ srclen-1 ] )
-        {
-            if( (char)'=' == src[ srclen-2 ] )
-            {
-                srclen -= 2;
-            }
-            else
-            {
-                srclen -= 1;
-            }
-        }
-    }
-
-    if( (char *)0 == dest )
-    {
-        PRUint32 destlen = ((srclen * 3) / 4);
-        dest = (char *)PR_MALLOC(destlen + 1);
-        if( (char *)0 == dest )
-        {
-            return (char *)0;
-        }
-        dest[ destlen ] = (char)0; /* null terminate */
-        allocated = PR_TRUE;
-    }
-
-    status = decode((const unsigned char *)src, srclen, (unsigned char *)dest);
-    if( PR_SUCCESS != status )
-    {
-        if( PR_TRUE == allocated )
-        {
-            PR_DELETE(dest);
-        }
-
-        return (char *)0;
-    }
-
-    return dest;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/plc.def b/libs/js/nsprpub/lib/libc/src/plc.def
deleted file mode 100644
index a227db9c99..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plc.def
+++ /dev/null
@@ -1,97 +0,0 @@
-;+#
-;+# ***** BEGIN LICENSE BLOCK *****
-;+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;+#
-;+# The contents of this file are subject to the Mozilla Public License Version
-;+# 1.1 (the "License"); you may not use this file except in compliance with
-;+# the License. You may obtain a copy of the License at
-;+# http://www.mozilla.org/MPL/
-;+#
-;+# Software distributed under the License is distributed on an "AS IS" basis,
-;+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-;+# for the specific language governing rights and limitations under the
-;+# License.
-;+#
-;+# The Original Code is the Netscape Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is
-;+# Netscape Communications Corporation.
-;+# Portions created by the Initial Developer are Copyright (C) 2002-2003
-;+# the Initial Developer. All Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the terms of
-;+# either the GNU General Public License Version 2 or later (the "GPL"), or
-;+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-;+# in which case the provisions of the GPL or the LGPL are applicable instead
-;+# of those above. If you wish to allow use of your version of this file only
-;+# under the terms of either the GPL or the LGPL, and not to allow others to
-;+# use your version of this file under the terms of the MPL, indicate your
-;+# decision by deleting the provisions above and replace them with the notice
-;+# and other provisions required by the GPL or the LGPL. If you do not delete
-;+# the provisions above, a recipient may use your version of this file under
-;+# the terms of any one of the MPL, the GPL or the LGPL.
-;+#
-;+# ***** END LICENSE BLOCK *****
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+NSPR_4.0 {
-;+    global:
-LIBRARY plc4 ;-
-EXPORTS ;-
-PL_Base64Decode;
-PL_Base64Encode;
-PL_CreateOptState;
-PL_DestroyOptState;
-PL_GetNextOpt;
-PL_strcasecmp;
-PL_strcaserstr;
-PL_strcasestr;
-PL_strcat;
-PL_strcatn;
-PL_strchr;
-PL_strcmp;
-PL_strcpy;
-PL_strdup;
-PL_strfree;
-PL_strlen;
-PL_strncasecmp;
-PL_strncaserstr;
-PL_strncasestr;
-PL_strncat;
-PL_strnchr;
-PL_strncmp;
-PL_strncpy;
-PL_strncpyz;
-PL_strndup;
-PL_strnlen;
-PL_strnpbrk;
-PL_strnprbrk;
-PL_strnrchr;
-PL_strnrstr;
-PL_strnstr;
-PL_strpbrk;
-PL_strprbrk;
-PL_strrchr;
-PL_strrstr;
-PL_strstr;
-libVersionPoint;
-;+    local: *;
-;+};
-;+
-;+NSPR_4.2 {
-;+    global:
-PL_strtok_r;
-;+} NSPR_4.0;
diff --git a/libs/js/nsprpub/lib/libc/src/plc.rc b/libs/js/nsprpub/lib/libc/src/plc.rc
deleted file mode 100644
index 15ca10f2a1..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plc.rc
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#include "prinit.h"
-#include <winver.h>
-
-#define MY_LIBNAME "plc"
-#define MY_FILEDESCRIPTION "PLC Library"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define PR_VMAJOR_STR STRINGIZE2(PR_VMAJOR)
-
-#ifdef _DEBUG
-#define MY_DEBUG_STR " (debug)"
-#define MY_FILEFLAGS_1 VS_FF_DEBUG
-#else
-#define MY_DEBUG_STR ""
-#define MY_FILEFLAGS_1 0x0L
-#endif
-#if PR_BETA
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
-#else
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
-#endif
-
-#ifdef WINNT
-#define MY_FILEOS VOS_NT_WINDOWS32
-#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
-#else
-#define MY_FILEOS VOS__WINDOWS32
-#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version-information resource
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS MY_FILEFLAGS_2
- FILEOS MY_FILEOS
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L // not used
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
-        BEGIN
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
-            VALUE "FileVersion", PR_VERSION "\0"
-            VALUE "InternalName", MY_INTERNAL_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \251 1996-2000 Netscape Communications Corporation\0"
-            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
-            VALUE "ProductName", "Netscape Portable Runtime\0"
-            VALUE "ProductVersion", PR_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/libs/js/nsprpub/lib/libc/src/plc_symvec.opt b/libs/js/nsprpub/lib/libc/src/plc_symvec.opt
deleted file mode 100644
index 8bc769e0b4..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plc_symvec.opt
+++ /dev/null
@@ -1,53 +0,0 @@
-! Fixed section of symbol vector for LIBPLC4
-!
-GSMATCH=LEQUAL,2,2
-case_sensitive=YES
-!
-! --------------------------------------------------------------------------
-! Ident 2,2 introduced for Mozilla 1.3
-! Previously this was empty. Now we include everything that's specified in
-! plc.def.
-! --------------------------------------------------------------------------
-!
-! NSPR 4.0
-SYMBOL_VECTOR=(PL_Base64Decode=PROCEDURE)
-SYMBOL_VECTOR=(PL_Base64Encode=PROCEDURE)
-SYMBOL_VECTOR=(PL_CreateOptState=PROCEDURE)
-SYMBOL_VECTOR=(PL_DestroyOptState=PROCEDURE)
-SYMBOL_VECTOR=(PL_FPrintError=PROCEDURE)
-SYMBOL_VECTOR=(PL_GetNextOpt=PROCEDURE)
-SYMBOL_VECTOR=(PL_PrintError=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcasecmp=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcaserstr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcasestr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcat=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcatn=PROCEDURE)
-SYMBOL_VECTOR=(PL_strchr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcmp=PROCEDURE)
-SYMBOL_VECTOR=(PL_strcpy=PROCEDURE)
-SYMBOL_VECTOR=(PL_strdup=PROCEDURE)
-SYMBOL_VECTOR=(PL_strfree=PROCEDURE)
-SYMBOL_VECTOR=(PL_strlen=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncasecmp=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncaserstr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncasestr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncat=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnchr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncmp=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncpy=PROCEDURE)
-SYMBOL_VECTOR=(PL_strncpyz=PROCEDURE)
-SYMBOL_VECTOR=(PL_strndup=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnlen=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnpbrk=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnprbrk=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnrchr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnrstr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strnstr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strpbrk=PROCEDURE)
-SYMBOL_VECTOR=(PL_strprbrk=PROCEDURE)
-SYMBOL_VECTOR=(PL_strrchr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strrstr=PROCEDURE)
-SYMBOL_VECTOR=(PL_strstr=PROCEDURE)
-SYMBOL_VECTOR=(libVersionPoint=PROCEDURE)
-! NSPR 4.2
-SYMBOL_VECTOR=(PL_strtok_r=PROCEDURE)
diff --git a/libs/js/nsprpub/lib/libc/src/plerror.c b/libs/js/nsprpub/lib/libc/src/plerror.c
deleted file mode 100644
index cfad27fb41..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plerror.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:plerror.c
-** Description: Simple routine to print translate the calling thread's
-**  error numbers and print them to "syserr".
-*/
-
-#include "plerror.h"
-
-#include "prprf.h"
-#include "prerror.h"
-
-#if 0
-PR_IMPLEMENT(void) PL_FPrintError(PRFileDesc *fd, const char *msg)
-{
-static const char *tags[] =
-{
-    "PR_OUT_OF_MEMORY_ERROR",
-    "PR_BAD_DESCRIPTOR_ERROR", 
-    "PR_WOULD_BLOCK_ERROR",
-    "PR_ACCESS_FAULT_ERROR", 
-    "PR_INVALID_METHOD_ERROR", 
-    "PR_ILLEGAL_ACCESS_ERROR", 
-    "PR_UNKNOWN_ERROR",
-    "PR_PENDING_INTERRUPT_ERROR",
-    "PR_NOT_IMPLEMENTED_ERROR",
-    "PR_IO_ERROR", 
-    "PR_IO_TIMEOUT_ERROR", 
-    "PR_IO_PENDING_ERROR", 
-    "PR_DIRECTORY_OPEN_ERROR", 
-    "PR_INVALID_ARGUMENT_ERROR", 
-    "PR_ADDRESS_NOT_AVAILABLE_ERROR",
-    "PR_ADDRESS_NOT_SUPPORTED_ERROR",
-    "PR_IS_CONNECTED_ERROR", 
-    "PR_BAD_ADDRESS_ERROR",
-    "PR_ADDRESS_IN_USE_ERROR", 
-    "PR_CONNECT_REFUSED_ERROR",
-    "PR_NETWORK_UNREACHABLE_ERROR",
-    "PR_CONNECT_TIMEOUT_ERROR",
-    "PR_NOT_CONNECTED_ERROR",
-    "PR_LOAD_LIBRARY_ERROR", 
-    "PR_UNLOAD_LIBRARY_ERROR", 
-    "PR_FIND_SYMBOL_ERROR",
-    "PR_INSUFFICIENT_RESOURCES_ERROR", 
-    "PR_DIRECTORY_LOOKUP_ERROR", 
-    "PR_TPD_RANGE_ERROR",
-    "PR_PROC_DESC_TABLE_FULL_ERROR", 
-    "PR_SYS_DESC_TABLE_FULL_ERROR",
-    "PR_NOT_SOCKET_ERROR", 
-    "PR_NOT_TCP_SOCKET_ERROR", 
-    "PR_SOCKET_ADDRESS_IS_BOUND_ERROR",
-    "PR_NO_ACCESS_RIGHTS_ERROR", 
-    "PR_OPERATION_NOT_SUPPORTED_ERROR",
-    "PR_PROTOCOL_NOT_SUPPORTED_ERROR", 
-    "PR_REMOTE_FILE_ERROR",
-    "PR_BUFFER_OVERFLOW_ERROR",
-    "PR_CONNECT_RESET_ERROR",
-    "PR_RANGE_ERROR",
-    "PR_DEADLOCK_ERROR", 
-    "PR_FILE_IS_LOCKED_ERROR", 
-    "PR_FILE_TOO_BIG_ERROR", 
-    "PR_NO_DEVICE_SPACE_ERROR",
-    "PR_PIPE_ERROR", 
-    "PR_NO_SEEK_DEVICE_ERROR", 
-    "PR_IS_DIRECTORY_ERROR", 
-    "PR_LOOP_ERROR", 
-    "PR_NAME_TOO_LONG_ERROR",
-    "PR_FILE_NOT_FOUND_ERROR", 
-    "PR_NOT_DIRECTORY_ERROR",
-    "PR_READ_ONLY_FILESYSTEM_ERROR", 
-    "PR_DIRECTORY_NOT_EMPTY_ERROR",
-    "PR_FILESYSTEM_MOUNTED_ERROR", 
-    "PR_NOT_SAME_DEVICE_ERROR",
-    "PR_DIRECTORY_CORRUPTED_ERROR",
-    "PR_FILE_EXISTS_ERROR",
-    "PR_MAX_DIRECTORY_ENTRIES_ERROR",
-    "PR_INVALID_DEVICE_STATE_ERROR", 
-    "PR_DEVICE_IS_LOCKED_ERROR", 
-    "PR_NO_MORE_FILES_ERROR",
-    "PR_END_OF_FILE_ERROR",
-    "PR_FILE_SEEK_ERROR",
-    "PR_FILE_IS_BUSY_ERROR", 
-    "<unused error code>",
-    "PR_IN_PROGRESS_ERROR",
-    "PR_ALREADY_INITIATED_ERROR",
-    "PR_GROUP_EMPTY_ERROR",
-    "PR_INVALID_STATE_ERROR",
-    "PR_NETWORK_DOWN_ERROR",
-    "PR_SOCKET_SHUTDOWN_ERROR",
-    "PR_CONNECT_ABORTED_ERROR",
-    "PR_HOST_UNREACHABLE_ERROR",
-    "PR_MAX_ERROR"
-};
-
-PRErrorCode error = PR_GetError();
-PRInt32 oserror = PR_GetOSError();
-PRIntn thoseIKnowAbout = sizeof(tags) / sizeof(char*);
-PRIntn lastError = PR_NSPR_ERROR_BASE + thoseIKnowAbout;
-
-	if (NULL != msg) PR_fprintf(fd, "%s: ", msg);
-    if ((error < PR_NSPR_ERROR_BASE) || (error > lastError))
-        PR_fprintf(
-			fd, " (%d)OUT OF RANGE, oserror = %d\n", error, oserror);
-    else
-        PR_fprintf(
-            fd, "%s(%d), oserror = %d\n",
-            tags[error - PR_NSPR_ERROR_BASE], error, oserror);
-}  /* PL_FPrintError */
-
-PR_IMPLEMENT(void) PL_PrintError(const char *msg)
-{
-	static PRFileDesc *fd = NULL;
-	if (NULL == fd) fd = PR_GetSpecialFD(PR_StandardError);
-	PL_FPrintError(fd, msg);
-}  /* PL_PrintError */
-#endif
-#if defined(WIN16)
-/*
-** libmain() is a required function for win16
-**
-*/
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg, 
-  WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-return TRUE;
-}
-#endif /* WIN16 */
-
-
-
-
-
-/* plerror.c */
diff --git a/libs/js/nsprpub/lib/libc/src/plgetopt.c b/libs/js/nsprpub/lib/libc/src/plgetopt.c
deleted file mode 100644
index e2ccfa1b18..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plgetopt.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:          plgetopt.c
-** Description:   utilities to parse argc/argv
-*/
-
-#include "prmem.h"
-#include "prlog.h"
-#include "prerror.h"
-#include "plstr.h"
-#include "plgetopt.h"
-
-#include <string.h>
-
-static char static_Nul = 0;
-
-struct PLOptionInternal
-{
-    const char *options;        /* client options list specification */
-    PRIntn argc;                /* original number of arguments */
-    char **argv;                /* vector of pointers to arguments */
-    PRIntn xargc;               /* which one we're processing now */
-    const char *xargv;          /* where within *argv[xargc] */
-    PRBool minus;               /* do we already have the '-'? */
-};
-
-/*
-** Create the state in which to parse the tokens.
-**
-** argc        the sum of the number of options and their values
-** argv        the options and their values
-** options    vector of single character options w/ | w/o ':
-*/
-PR_IMPLEMENT(PLOptState*) PL_CreateOptState(
-    PRIntn argc, char **argv, const char *options)
-{
-    PLOptState *opt = NULL;
-    if (NULL == options)
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    else
-    {
-        opt = PR_NEWZAP(PLOptState);
-        if (NULL == opt)
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        else
-        {
-            PLOptionInternal *internal = PR_NEW(PLOptionInternal);
-            if (NULL == internal)
-            {
-                PR_DELETE(opt);
-                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            }
-            else
-            {
-				opt->option = 0;
-				opt->value = NULL;
-				opt->internal = internal;
-
-                internal->argc = argc;
-                internal->argv = argv;
-                internal->xargc = 0;
-                internal->xargv = &static_Nul;
-                internal->minus = PR_FALSE;
-                internal->options = options;
-            }
-        }
-    }
-    return opt;
-}  /* PL_CreateOptState */
-
-/*
-** Destroy object created by CreateOptState()
-*/
-PR_IMPLEMENT(void) PL_DestroyOptState(PLOptState *opt)
-{
-    PR_DELETE(opt->internal);
-    PR_DELETE(opt);
-}  /* PL_DestroyOptState */
-
-PR_IMPLEMENT(PLOptStatus) PL_GetNextOpt(PLOptState *opt)
-{
-    PLOptionInternal *internal = opt->internal;
-    PRIntn cop, eoo = PL_strlen(internal->options);
-
-    /*
-    ** If the current xarg points to nul, advance to the next
-    ** element of the argv vector. If the vector index is equal
-    ** to argc, we're out of arguments, so return an EOL.
-	** Note whether the first character of the new argument is
-	** a '-' and skip by it if it is.
-    */
-    while (0 == *internal->xargv)
-    {
-        internal->xargc += 1;
-        if (internal->xargc >= internal->argc)
-		{
-			opt->option = 0;
-			opt->value = NULL;
-			return PL_OPT_EOL;
-		}
-        internal->xargv = internal->argv[internal->xargc];
-		internal->minus = ('-' == *internal->xargv ? PR_TRUE : PR_FALSE);  /* not it */
-		if (internal->minus) internal->xargv += 1;  /* and consume */
-    }
-
-    /*
-    ** If we already have a '-' in hand, xargv points to the next
-    ** option. See if we can find a match in the list of possible
-    ** options supplied.
-    */
-
-    if (internal->minus)
-    {
-        for (cop = 0; cop < eoo; ++cop)
-        {
-            if (internal->options[cop] == *internal->xargv)
-            {
-                opt->option = *internal->xargv;
-                internal->xargv += 1;
-                /*
-                ** if options indicates that there's an associated
-				** value, this argv is finished and the next is the
-				** option's value.
-                */
-                if (':' == internal->options[cop + 1])
-                {
-                    if (0 != *internal->xargv) return PL_OPT_BAD;
-                    opt->value = internal->argv[++(internal->xargc)];
-                    internal->xargv = &static_Nul;
-                    internal->minus = PR_FALSE;
-                }
-				else opt->value = NULL;
-                return PL_OPT_OK;
-            }
-        }
-        internal->xargv += 1;  /* consume that option */
-        return PL_OPT_BAD;
-    }
-    /*
-    ** No '-', so it must be a standalone value. The option is nul.
-    */
-    opt->value = internal->argv[internal->xargc];
-    internal->xargv = &static_Nul;
-    opt->option = 0;
-    return PL_OPT_OK;
-}  /* PL_GetNextOpt */
-
-/* plgetopt.c */
diff --git a/libs/js/nsprpub/lib/libc/src/plvrsion.c b/libs/js/nsprpub/lib/libc/src/plvrsion.c
deleted file mode 100644
index e9903cb717..0000000000
--- a/libs/js/nsprpub/lib/libc/src/plvrsion.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prvrsion.h"
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-#include "_pl_bld.h"
-#if !defined(_BUILD_TIME)
-#ifdef HAVE_LONG_LONG
-#define _BUILD_TIME 0
-#else
-#define _BUILD_TIME {0, 0}
-#endif
-#endif
-#if !defined(_BUILD_STRING)
-#define _BUILD_STRING ""
-#endif
-#if !defined(_PRODUCTION)
-#define _PRODUCTION ""
-#endif
-#if defined(DEBUG)
-#define _DEBUG_STRING " (debug)"
-#else
-#define _DEBUG_STRING ""
-#endif
-
-/*
- * A trick to expand the PR_VMAJOR macro before concatenation.
- */
-#define CONCAT(x, y) x ## y
-#define CONCAT2(x, y) CONCAT(x, y)
-#define VERSION_DESC_NAME CONCAT2(prVersionDescription_libplc, PR_VMAJOR)
-
-PRVersionDescription VERSION_DESC_NAME =
-{
-    /* version          */  2,                  /* this is the only one supported */
-    /* buildTime        */  _BUILD_TIME,        /* usecs since midnight 1/1/1970 GMT */
-    /* buildTimeString  */  _BUILD_STRING,       /*    ditto, but human readable */
-    /* vMajor           */  PR_VMAJOR,          /* NSPR's version number */
-    /* vMinor           */  PR_VMINOR,          /*  and minor version */
-    /* vPatch           */  PR_VPATCH,          /*  and patch */
-    /* beta             */  PR_BETA,            /* beta build boolean */
-#if defined(DEBUG)
-    /* debug            */  PR_TRUE,            /* a debug build */
-#else
-    /* debug            */  PR_FALSE,           /* an optomized build */
-#endif
-    /* special          */  PR_FALSE,           /* they're all special, but ... */
-    /* filename         */  _PRODUCTION,        /* the produced library name */
-    /* description      */ "Portable runtime",  /* what we are */
-    /* security         */ "N/A",               /* not applicable here */
-    /* copywrite        */  "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
-    /* comment          */  "http://www.mozilla.org/MPL/",
-    /* specialString    */ ""
-};
-
-#ifdef XP_UNIX
-
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING " $";
-static char sccsid[] = "@(#)NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING;
-
-#endif /* XP_UNIX */
-
-PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint()
-{
-#ifdef XP_UNIX
-    /*
-     * Add dummy references to rcsid and sccsid to prevent them
-     * from being optimized away as unused variables.
-     */
-    const char *dummy;
-    
-    dummy = rcsid;
-    dummy = sccsid;
-#endif
-    return &VERSION_DESC_NAME;
-}  /* versionEntryPointType */
-
-/* plvrsion.c */
-
diff --git a/libs/js/nsprpub/lib/libc/src/strcat.c b/libs/js/nsprpub/lib/libc/src/strcat.c
deleted file mode 100644
index f71b0974f4..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strcat.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strcat(char *dest, const char *src)
-{
-    if( ((char *)0 == dest) || ((const char *)0 == src) )
-        return dest;
-
-    return strcat(dest, src);
-}
-
-PR_IMPLEMENT(char *)
-PL_strncat(char *dest, const char *src, PRUint32 max)
-{
-    char *rv;
-
-    if( ((char *)0 == dest) || ((const char *)0 == src) || (0 == max) )
-        return dest;
-
-    for( rv = dest; *dest; dest++ )
-        ;
-
-    (void)PL_strncpy(dest, src, max);
-    return rv;
-}
-
-PR_IMPLEMENT(char *)
-PL_strcatn(char *dest, PRUint32 max, const char *src)
-{
-    char *rv;
-    PRUint32 dl;
-
-    if( ((char *)0 == dest) || ((const char *)0 == src) )
-        return dest;
-
-    for( rv = dest, dl = 0; *dest; dest++, dl++ )
-        ;
-
-    if( max <= dl ) return rv;
-    (void)PL_strncpyz(dest, src, max-dl);
-
-    return rv;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strccmp.c b/libs/js/nsprpub/lib/libc/src/strccmp.c
deleted file mode 100644
index ec87748443..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strccmp.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-
-static const unsigned char uc[] =
-{
-    '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-    '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-    '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-    '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-    ' ',    '!',    '"',    '#',    '$',    '%',    '&',    '\'',
-    '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',
-    '0',    '1',    '2',    '3',    '4',    '5',    '6',    '7',
-    '8',    '9',    ':',    ';',    '<',    '=',    '>',    '?',
-    '@',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
-    'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
-    'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
-    'X',    'Y',    'Z',    '[',    '\\',   ']',    '^',    '_',
-    '`',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
-    'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
-    'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
-    'X',    'Y',    'Z',    '{',    '|',    '}',    '~',    '\177',
-    0200,   0201,   0202,   0203,   0204,   0205,   0206,   0207,
-    0210,   0211,   0212,   0213,   0214,   0215,   0216,   0217,
-    0220,   0221,   0222,   0223,   0224,   0225,   0226,   0227,
-    0230,   0231,   0232,   0233,   0234,   0235,   0236,   0237,
-    0240,   0241,   0242,   0243,   0244,   0245,   0246,   0247,
-    0250,   0251,   0252,   0253,   0254,   0255,   0256,   0257,
-    0260,   0261,   0262,   0263,   0264,   0265,   0266,   0267,
-    0270,   0271,   0272,   0273,   0274,   0275,   0276,   0277,
-    0300,   0301,   0302,   0303,   0304,   0305,   0306,   0307,
-    0310,   0311,   0312,   0313,   0314,   0315,   0316,   0317,
-    0320,   0321,   0322,   0323,   0324,   0325,   0326,   0327,
-    0330,   0331,   0332,   0333,   0334,   0335,   0336,   0337,
-    0340,   0341,   0342,   0343,   0344,   0345,   0346,   0347,
-    0350,   0351,   0352,   0353,   0354,   0355,   0356,   0357,
-    0360,   0361,   0362,   0363,   0364,   0365,   0366,   0367,
-    0370,   0371,   0372,   0373,   0374,   0375,   0376,   0377
-};
-
-PR_IMPLEMENT(PRIntn)
-PL_strcasecmp(const char *a, const char *b)
-{
-    const unsigned char *ua = (const unsigned char *)a;
-    const unsigned char *ub = (const unsigned char *)b;
-
-    if( ((const char *)0 == a) || (const char *)0 == b ) 
-        return (PRIntn)(a-b);
-
-    while( (uc[*ua] == uc[*ub]) && ('\0' != *a) )
-    {
-        a++;
-        ua++;
-        ub++;
-    }
-
-    return (PRIntn)(uc[*ua] - uc[*ub]);
-}
-
-PR_IMPLEMENT(PRIntn)
-PL_strncasecmp(const char *a, const char *b, PRUint32 max)
-{
-    const unsigned char *ua = (const unsigned char *)a;
-    const unsigned char *ub = (const unsigned char *)b;
-
-    if( ((const char *)0 == a) || (const char *)0 == b ) 
-        return (PRIntn)(a-b);
-
-    while( max && (uc[*ua] == uc[*ub]) && ('\0' != *a) )
-    {
-        a++;
-        ua++;
-        ub++;
-        max--;
-    }
-
-    if( 0 == max ) return (PRIntn)0;
-
-    return (PRIntn)(uc[*ua] - uc[*ub]);
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strchr.c b/libs/js/nsprpub/lib/libc/src/strchr.c
deleted file mode 100644
index 35ccedcc71..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strchr.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strchr(const char *s, char c)
-{
-    if( (const char *)0 == s ) return (char *)0;
-
-    return strchr(s, c);
-}
-
-PR_IMPLEMENT(char *)
-PL_strrchr(const char *s, char c)
-{
-    if( (const char *)0 == s ) return (char *)0;
-
-    return strrchr(s, c);
-}
-
-PR_IMPLEMENT(char *)
-PL_strnchr(const char *s, char c, PRUint32 n)
-{
-    if( (const char *)0 == s ) return (char *)0;
-
-    for( ; n && *s; s++, n-- )
-        if( *s == c )
-            return (char *)s;
-
-    if( ((char)0 == c) && (n > 0) && ((char)0 == *s) ) return (char *)s;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strnrchr(const char *s, char c, PRUint32 n)
-{
-    const char *p;
-
-    if( (const char *)0 == s ) return (char *)0;
-
-    for( p = s; n && *p; p++, n-- )
-        ;
-
-    if( ((char)0 == c) && (n > 0) && ((char)0 == *p) ) return (char *)p;
-
-    for( p--; p >= s; p-- )
-        if( *p == c )
-            return (char *)p;
-
-    return (char *)0;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strcmp.c b/libs/js/nsprpub/lib/libc/src/strcmp.c
deleted file mode 100644
index 095e178468..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strcmp.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(PRIntn)
-PL_strcmp(const char *a, const char *b)
-{
-    if( ((const char *)0 == a) || (const char *)0 == b ) 
-        return (PRIntn)(a-b);
-
-    return (PRIntn)strcmp(a, b);
-}
-
-PR_IMPLEMENT(PRIntn)
-PL_strncmp(const char *a, const char *b, PRUint32 max)
-{
-    if( ((const char *)0 == a) || (const char *)0 == b ) 
-        return (PRIntn)(a-b);
-
-    return (PRIntn)strncmp(a, b, (size_t)max);
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strcpy.c b/libs/js/nsprpub/lib/libc/src/strcpy.c
deleted file mode 100644
index b576b67779..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strcpy.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strcpy(char *dest, const char *src)
-{
-    if( ((char *)0 == dest) || ((const char *)0 == src) ) return (char *)0;
-
-    return strcpy(dest, src);
-}
-
-PR_IMPLEMENT(char *)
-PL_strncpy(char *dest, const char *src, PRUint32 max)
-{
-    char *rv;
-    
-    if( (char *)0 == dest ) return (char *)0;
-    if( (const char *)0 == src ) return (char *)0;
-
-    for( rv = dest; max && ((*dest = *src) != 0); dest++, src++, max-- )
-        ;
-
-#ifdef JLRU
-    /* XXX I (wtc) think the -- and ++ operators should be postfix. */
-    while( --max )
-        *++dest = '\0';
-#endif /* JLRU */
-
-    return rv;
-}
-
-PR_IMPLEMENT(char *)
-PL_strncpyz(char *dest, const char *src, PRUint32 max)
-{
-    char *rv;
-    
-    if( (char *)0 == dest ) return (char *)0;
-    if( (const char *)0 == src ) return (char *)0;
-    if( 0 == max ) return (char *)0;
-
-    for( rv = dest, max--; max && ((*dest = *src) != 0); dest++, src++, max-- )
-        ;
-
-    *dest = '\0';
-
-    return rv;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strcstr.c b/libs/js/nsprpub/lib/libc/src/strcstr.c
deleted file mode 100644
index cb58778839..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strcstr.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-
-PR_IMPLEMENT(char *)
-PL_strcasestr(const char *big, const char *little)
-{
-    PRUint32 ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = PL_strlen(little);
-
-    for( ; *big; big++ )
-        /* obvious improvement available here */
-            if( 0 == PL_strncasecmp(big, little, ll) )
-                return (char *)big;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strcaserstr(const char *big, const char *little)
-{
-    const char *p;
-    PRUint32 ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = PL_strlen(little);
-    p = &big[ PL_strlen(big) - ll ];
-    if( p < big ) return (char *)0;
-
-    for( ; p >= big; p-- )
-        /* obvious improvement available here */
-            if( 0 == PL_strncasecmp(p, little, ll) )
-                return (char *)p;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strncasestr(const char *big, const char *little, PRUint32 max)
-{
-    PRUint32 ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = PL_strlen(little);
-    if( ll > max ) return (char *)0;
-    max -= ll;
-    max++;
-
-    for( ; max && *big; big++, max-- )
-        /* obvious improvement available here */
-            if( 0 == PL_strncasecmp(big, little, ll) )
-                return (char *)big;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strncaserstr(const char *big, const char *little, PRUint32 max)
-{
-    const char *p;
-    PRUint32 ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = PL_strlen(little);
-
-    for( p = big; max && *p; p++, max-- )
-        ;
-
-    p -= ll;
-    if( p < big ) return (char *)0;
-
-    for( ; p >= big; p-- )
-        /* obvious improvement available here */
-            if( 0 == PL_strncasecmp(p, little, ll) )
-                return (char *)p;
-
-    return (char *)0;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strdup.c b/libs/js/nsprpub/lib/libc/src/strdup.c
deleted file mode 100644
index 27a553c662..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strdup.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include "prmem.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strdup(const char *s)
-{
-    char *rv;
-    size_t n;
-
-    if( (const char *)0 == s )
-        s = "";
-
-    n = strlen(s) + 1;
-
-    rv = (char *)malloc(n);
-    if( (char *)0 == rv ) return rv;
-
-    (void)memcpy(rv, s, n);
-
-    return rv;
-}
-
-PR_IMPLEMENT(void)
-PL_strfree(char *s)
-{
-    free(s);
-}
-
-PR_IMPLEMENT(char *)
-PL_strndup(const char *s, PRUint32 max)
-{
-    char *rv;
-    size_t l;
-
-    if( (const char *)0 == s )
-        s = "";
-
-    l = PL_strnlen(s, max);
-
-    rv = (char *)malloc(l+1);
-    if( (char *)0 == rv ) return rv;
-
-    (void)memcpy(rv, s, l);
-    rv[l] = '\0';
-
-    return rv;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strlen.c b/libs/js/nsprpub/lib/libc/src/strlen.c
deleted file mode 100644
index 6c47677727..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strlen.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include "prtypes.h"
-#include "prlog.h"
-#include <string.h>
-
-PR_IMPLEMENT(PRUint32)
-PL_strlen(const char *str)
-{
-    size_t l;
-
-    if( (const char *)0 == str ) return 0;
-
-    l = strlen(str);
-
-    /* error checking in case we have a 64-bit platform -- make sure
-     * we don't have ultra long strings that overflow an int32
-     */ 
-    if( sizeof(PRUint32) < sizeof(size_t) )
-        PR_ASSERT(l < 2147483647);
-
-    return (PRUint32)l;
-}
-
-PR_IMPLEMENT(PRUint32)
-PL_strnlen(const char *str, PRUint32 max)
-{
-    register const char *s;
-
-    if( (const char *)0 == str ) return 0;
-    for( s = str; max && *s; s++, max-- )
-        ;
-
-    return (PRUint32)(s - str);
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strpbrk.c b/libs/js/nsprpub/lib/libc/src/strpbrk.c
deleted file mode 100644
index afcb4f511b..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strpbrk.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strpbrk(const char *s, const char *list)
-{
-    if( ((const char *)0 == s) || ((const char *)0 == list) ) return (char *)0;
-
-    return strpbrk(s, list);
-}
-
-PR_IMPLEMENT(char *)
-PL_strprbrk(const char *s, const char *list)
-{
-    const char *p;
-    const char *r;
-
-    if( ((const char *)0 == s) || ((const char *)0 == list) ) return (char *)0;
-
-    for( r = s; *r; r++ )
-        ;
-
-    for( r--; r >= s; r-- )
-        for( p = list; *p; p++ )
-            if( *r == *p )
-                return (char *)r;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strnpbrk(const char *s, const char *list, PRUint32 max)
-{
-    const char *p;
-
-    if( ((const char *)0 == s) || ((const char *)0 == list) ) return (char *)0;
-
-    for( ; max && *s; s++, max-- )
-        for( p = list; *p; p++ )
-            if( *s == *p )
-                return (char *)s;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strnprbrk(const char *s, const char *list, PRUint32 max)
-{
-    const char *p;
-    const char *r;
-
-    if( ((const char *)0 == s) || ((const char *)0 == list) ) return (char *)0;
-
-    for( r = s; max && *r; r++, max-- )
-        ;
-
-    for( r--; r >= s; r-- )
-        for( p = list; *p; p++ )
-            if( *r == *p )
-                return (char *)r;
-
-    return (char *)0;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strstr.c b/libs/js/nsprpub/lib/libc/src/strstr.c
deleted file mode 100644
index 6bc03d3708..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strstr.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include <string.h>
-
-PR_IMPLEMENT(char *)
-PL_strstr(const char *big, const char *little)
-{
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    return strstr(big, little);
-}
-
-PR_IMPLEMENT(char *)
-PL_strrstr(const char *big, const char *little)
-{
-    const char *p;
-    size_t ll;
-    size_t bl;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = strlen(little);
-    bl = strlen(big);
-    if( bl < ll ) return (char *)0;
-    p = &big[ bl - ll ];
-
-    for( ; p >= big; p-- )
-        if( *little == *p )
-            if( 0 == strncmp(p, little, ll) )
-                return (char *)p;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strnstr(const char *big, const char *little, PRUint32 max)
-{
-    size_t ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = strlen(little);
-    if( ll > (size_t)max ) return (char *)0;
-    max -= (PRUint32)ll;
-    max++;
-
-    for( ; max && *big; big++, max-- )
-        if( *little == *big )
-            if( 0 == strncmp(big, little, ll) )
-                return (char *)big;
-
-    return (char *)0;
-}
-
-PR_IMPLEMENT(char *)
-PL_strnrstr(const char *big, const char *little, PRUint32 max)
-{
-    const char *p;
-    size_t ll;
-
-    if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
-    if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
-
-    ll = strlen(little);
-
-    for( p = big; max && *p; p++, max-- )
-        ;
-
-    p -= ll;
-    if( p < big ) return (char *)0;
-
-    for( ; p >= big; p-- )
-        if( *little == *p )
-            if( 0 == strncmp(p, little, ll) )
-                return (char *)p;
-
-    return (char *)0;
-}
diff --git a/libs/js/nsprpub/lib/libc/src/strtok.c b/libs/js/nsprpub/lib/libc/src/strtok.c
deleted file mode 100644
index 400e9a4c04..0000000000
--- a/libs/js/nsprpub/lib/libc/src/strtok.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roland Mainz <roland mainz@informatik.med.uni-giessen.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-
-PR_IMPLEMENT(char *)
-PL_strtok_r(char *s1, const char *s2, char **lasts)
-{
-    const char *sepp;
-    int         c, sc;
-    char       *tok;
-
-    if( s1 == NULL )
-    {
-        if( *lasts == NULL )
-            return NULL;
-
-        s1 = *lasts;
-    }
-  
-    for( ; (c = *s1) != 0; s1++ )
-    {
-        for( sepp = s2 ; (sc = *sepp) != 0 ; sepp++ )
-        {
-            if( c == sc )
-                break;
-        }
-        if( sc == 0 )
-            break; 
-    }
-
-    if( c == 0 )
-    {
-        *lasts = NULL;
-        return NULL;
-    }
-  
-    tok = s1++;
-
-    for( ; (c = *s1) != 0; s1++ )
-    {
-        for( sepp = s2; (sc = *sepp) != 0; sepp++ )
-        {
-            if( c == sc )
-            {
-                *s1++ = '\0';
-                *lasts = s1;
-                return tok;
-            }
-        }
-    }
-    *lasts = NULL;
-    return tok;
-}
diff --git a/libs/js/nsprpub/lib/msgc/.cvsignore b/libs/js/nsprpub/lib/msgc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/msgc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/msgc/Makefile.in b/libs/js/nsprpub/lib/msgc/Makefile.in
deleted file mode 100644
index d7299b2bb5..0000000000
--- a/libs/js/nsprpub/lib/msgc/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = include src tests
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/lib/msgc/include/.cvsignore b/libs/js/nsprpub/lib/msgc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/msgc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/msgc/include/MANIFEST b/libs/js/nsprpub/lib/msgc/include/MANIFEST
deleted file mode 100644
index a45ec20ec4..0000000000
--- a/libs/js/nsprpub/lib/msgc/include/MANIFEST
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-prgc.h
diff --git a/libs/js/nsprpub/lib/msgc/include/Makefile.in b/libs/js/nsprpub/lib/msgc/include/Makefile.in
deleted file mode 100644
index 60803a0286..0000000000
--- a/libs/js/nsprpub/lib/msgc/include/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-
-EXPORT_HEADERS = prgc.h
-HEADERS = $(EXPORT_HEADERS) gcint.h
-
-RELEASE_HEADERS = $(EXPORT_HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(EXPORT_HEADERS)
-	$(INSTALL) -m 444 $(EXPORT_HEADERS) $(dist_includedir)
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
-endif
-
diff --git a/libs/js/nsprpub/lib/msgc/include/gcint.h b/libs/js/nsprpub/lib/msgc/include/gcint.h
deleted file mode 100644
index 10048f0689..0000000000
--- a/libs/js/nsprpub/lib/msgc/include/gcint.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef gcint_h___
-#define gcint_h___
-
-#include "prmon.h"
-#include "prgc.h"
-
-extern PRLogModuleInfo *_pr_msgc_lm;
-extern GCInfo _pr_gcData;
-
-#if defined(_WIN32) && !defined(DEBUG)
-#undef INLINE_LOCK
-#endif
-
-#ifdef INLINE_LOCK
-#define LOCK_GC()       EnterCriticalSection(&_pr_gcData.lock->mutexHandle)
-#define UNLOCK_GC()     LeaveCriticalSection(&_pr_gcData.lock->mutexHandle)
-#else
-#define LOCK_GC()       PR_EnterMonitor(_pr_gcData.lock)
-#define UNLOCK_GC()     PR_ExitMonitor (_pr_gcData.lock)
-#define GC_IS_LOCKED()  (PR_GetMonitorEntryCount(_pr_gcData.lock)!=0)
-#endif
-
-#ifdef DEBUG
-#define _GCTRACE(x, y) if (_pr_gcData.flags & x) GCTrace y
-#else
-#define _GCTRACE(x, y)
-#endif
-
-extern GCBeginGCHook *_pr_beginGCHook;
-extern void *_pr_beginGCHookArg;
-extern GCBeginGCHook *_pr_endGCHook;
-extern void *_pr_endGCHookArg;
-
-extern GCBeginFinalizeHook *_pr_beginFinalizeHook;
-extern void *_pr_beginFinalizeHookArg;
-extern GCBeginFinalizeHook *_pr_endFinalizeHook;
-extern void *_pr_endFinalizeHookArg;
-
-extern int _pr_do_a_dump;
-extern FILE *_pr_dump_file;
-
-extern PRLogModuleInfo *_pr_gc_lm;
-
-/*
-** Root finders. Root finders are used by the GC to find pointers into
-** the GC heap that are not contained in the GC heap.
-*/
-typedef struct RootFinderStr RootFinder;
-
-struct RootFinderStr {
-    RootFinder *next;
-    GCRootFinder *func;
-    char *name;
-    void *arg;
-};
-extern RootFinder *_pr_rootFinders;
-
-typedef struct CollectorTypeStr {
-    GCType gctype;
-    PRUint32 flags;
-} CollectorType;
-
-#define GC_MAX_TYPES	256
-extern CollectorType *_pr_collectorTypes;
-
-#define _GC_TYPE_BUSY   0x1
-#define _GC_TYPE_FINAL  0x2
-#define _GC_TYPE_WEAK   0x4
-
-/* Slot in _pr_gcTypes used for free memory */
-#define FREE_MEMORY_TYPEIX 255
-
-extern void _PR_InitGC(PRWord flags);
-extern void _MD_InitGC(void);
-extern void PR_CALLBACK _PR_ScanFinalQueue(void *notused);
-
-/*
-** Grow the GC Heap.
-*/
-extern void *_MD_GrowGCHeap(PRUint32 *sizep);
-
-/*
-** Extend the GC Heap.
-*/
-extern PRBool _MD_ExtendGCHeap(char *base, PRInt32 oldSize, PRInt32 newSize);
-
-/*
-** Free a GC segment.
-*/
-extern void _MD_FreeGCSegment(void *base, PRInt32 len);
-
-#endif /* gcint_h___ */
diff --git a/libs/js/nsprpub/lib/msgc/include/prgc.h b/libs/js/nsprpub/lib/msgc/include/prgc.h
deleted file mode 100644
index 859f7b1c0d..0000000000
--- a/libs/js/nsprpub/lib/msgc/include/prgc.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prgc_h___
-#define prgc_h___
-
-/*
-** API to NSPR gc memory system.
-*/
-#include "prtypes.h"
-#include "prmon.h"
-#include "prthread.h"
-#include <stdio.h>
-
-#if defined(WIN16)
-#define GCPTR __far
-#else
-#define GCPTR
-#endif
-
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Initialize the garbage collector.
-**     "flags" is the trace flags (see below).
-**     "initialHeapSize" is the initial size of the heap and may be zero
-**        if the default is desired.
-**    "segmentSize" is the size of each segment of memory added to the
-**       heap when the heap is grown.
-*/
-PR_EXTERN(void) PR_InitGC(
-    PRWord flags, PRInt32 initialHeapSize, PRInt32 segmentSize, PRThreadScope scope);
-
-/*
-** Shuts down gc and frees up all memory associated with it. 
-*/
-PR_EXTERN(void) PR_ShutdownGC(PRBool finalizeOnExit);
-
-/*
-** This walk function will be called for every gc object in the
-** heap as it is walked. If it returns non-zero, the walk is terminated.
-*/
-typedef PRInt32 (*PRWalkFun)(void GCPTR* obj, void* data);
-
-/*
-** GC Type record. This defines all of the GC operations used on a
-** particular object type. These structures are passed to
-** PR_RegisterType.
-*/
-typedef struct GCType {
-    /*
-    ** Scan an object that is in the GC heap and call GCInfo.livePointer
-    ** on all of the pointers in it. If this slot is null then the object
-    ** won't be scanned (i.e. it has no embedded pointers).
-    */
-    void (PR_CALLBACK *scan)(void GCPTR *obj);
-
-    /*
-    ** Finalize an object that has no references. This is called by the
-    ** GC after it has determined where the object debris is but before
-    ** it has moved the debris to the logical "free list". The object is
-    ** marked alive for this call and removed from the list of objects
-    ** that need finalization (finalization only happens once for an
-    ** object). If this slot is null then the object doesn't need
-    ** finalization.
-    */
-    void (PR_CALLBACK *finalize)(void GCPTR *obj);
-
-    /*
-    ** Dump out an object during a PR_DumpGCHeap(). This is used as a
-    ** debugging tool.
-    */
-    void (PR_CALLBACK *dump)(FILE *out, void GCPTR *obj, PRBool detailed, PRIntn indentLevel);
-
-    /*
-    ** Add object to summary table.
-    */
-    void (PR_CALLBACK *summarize)(void GCPTR *obj, PRUint32 bytes);
-
-    /*
-    ** Free hook called by GC when the object is being freed.
-    */
-    void (PR_CALLBACK *free)(void *obj);
-
-    /* Weak pointer support: If the object has a weak pointer (Note:
-       at most one), this function is used to get the weak link's
-       offset from the start of the body of a gc object */
-    PRUint32 (PR_CALLBACK *getWeakLinkOffset)(void *obj);
-
-    /* Descriptive character for dumping this GCType */
-    char kindChar;
-
-    /*
-    ** Walker routine. This routine should apply fun(obj->ptr, data)
-    ** for every gc pointer within the object.
-    */
-    PRInt32 (PR_CALLBACK *walk)(void GCPTR *obj, PRWalkFun fun, void* data);
-} GCType;
-
-/*
-** This data structure must be added as the hash table passed to 
-** the summarize method of GCType.
-*/ 
-typedef struct PRSummaryEntry {
-    void* clazz;
-    PRInt32 instancesCount;
-    PRInt32 totalSize;
-} PRSummaryEntry;
-
-/*
-** This function pointer must be registered by users of nspr
-** to produce the finally summary after all object in the
-** heap have been visited.
-*/
-typedef void (PR_CALLBACK *PRSummaryPrinter)(FILE *out, void* closure);
-
-PR_EXTERN(void) PR_CALLBACK PR_RegisterSummaryPrinter(PRSummaryPrinter fun, void* closure);
-
-typedef void PR_CALLBACK GCRootFinder(void *arg);
-typedef void PR_CALLBACK GCBeginFinalizeHook(void *arg);
-typedef void PR_CALLBACK GCEndFinalizeHook(void *arg);
-typedef void PR_CALLBACK GCBeginGCHook(void *arg);
-typedef void PR_CALLBACK GCEndGCHook(void *arg);
-
-typedef enum { PR_GCBEGIN, PR_GCEND } GCLockHookArg;
-
-typedef void PR_CALLBACK GCLockHookFunc(GCLockHookArg arg1, void *arg2);
-
-typedef struct GCLockHook GCLockHook;
-
-struct GCLockHook {
-  GCLockHookFunc* func;
-  void* arg;
-  GCLockHook* next;
-  GCLockHook* prev;
-};
-
-
-/*
-** Hooks which are called at the beginning and end of the GC process.
-** The begin hooks are called before the root finding step. The hooks are
-** called with threading disabled, so it is now allowed to re-enter the
-** kernel. The end hooks are called after the gc has finished but before
-** the finalizer has run.
-*/
-PR_EXTERN(void) PR_CALLBACK PR_SetBeginGCHook(GCBeginGCHook *hook, void *arg);
-PR_EXTERN(void) PR_CALLBACK PR_GetBeginGCHook(GCBeginGCHook **hook, void **arg);
-PR_EXTERN(void) PR_CALLBACK PR_SetEndGCHook(GCBeginGCHook *hook, void *arg);
-PR_EXTERN(void) PR_CALLBACK PR_GetEndGCHook(GCEndGCHook **hook, void **arg);
-
-/*
-** Called before SuspendAll is called by dogc, so that GC thread can hold
-** all the locks before hand to avoid any deadlocks
-*/
-
-/*
-PR_EXTERN(void) PR_SetGCLockHook(GCLockHook *hook, void *arg);
-PR_EXTERN(void) PR_GetGCLockHook(GCLockHook **hook, void **arg);
-*/
-
-PR_EXTERN(int) PR_RegisterGCLockHook(GCLockHookFunc *hook, void *arg);
-
-/*
-** Hooks which are called at the beginning and end of the GC finalization
-** process. After the GC has identified all of the dead objects in the
-** heap, it looks for objects that need finalization. Before it calls the
-** first finalization proc (see the GCType structure above) it calls the
-** begin hook. When it has finalized the last object it calls the end
-** hook.
-*/
-PR_EXTERN(void) PR_SetBeginFinalizeHook(GCBeginFinalizeHook *hook, void *arg);
-PR_EXTERN(void) PR_GetBeginFinalizeHook(GCBeginFinalizeHook **hook, void **arg);
-PR_EXTERN(void) PR_SetEndFinalizeHook(GCBeginFinalizeHook *hook, void *arg);
-PR_EXTERN(void) PR_GetEndFinalizeHook(GCEndFinalizeHook **hook, void **arg);
-
-/*
-** Register a GC type. Return's the index into the GC internal type
-** table. The returned value is passed to PR_AllocMemory. After the call,
-** the "type" memory belongs to the GC (the caller must not free it or
-** change it).
-*/
-PR_EXTERN(PRInt32) PR_RegisterType(GCType *type);
-
-/*
-** Register a root finder with the collector. The collector will call
-** these functions to identify all of the roots before collection
-** proceeds. "arg" is passed to the function when it is called.
-*/
-PR_EXTERN(PRStatus) PR_RegisterRootFinder(GCRootFinder func, char *name, void *arg);
-
-/*
-** Allocate some GC'able memory. The object must be at least bytes in
-** size. The type index function for the object is specified. "flags"
-** specifies some control flags. If PR_ALLOC_CLEAN is set then the memory
-** is zero'd before being returned. If PR_ALLOC_DOUBLE is set then the
-** allocated memory is double aligned.
-**
-** Any memory cell that you store a pointer to something allocated by
-** this call must be findable by the GC. Use the PR_RegisterRootFinder to
-** register new places where the GC will look for pointers into the heap.
-** The GC already knows how to scan any NSPR threads or monitors.
-*/
-PR_EXTERN(PRWord GCPTR *)PR_AllocMemory(
-    PRWord bytes, PRInt32 typeIndex, PRWord flags);
-PR_EXTERN(PRWord GCPTR *)PR_AllocSimpleMemory(
-    PRWord bytes, PRInt32 typeIndex);
-
-/*
-** This function can be used to cause PR_AllocMemory to always return
-** NULL. This may be useful in low memory situations when we're trying to
-** shutdown applets.
-*/
-PR_EXTERN(void) PR_EnableAllocation(PRBool yesOrNo);
-
-/* flags bits */
-#define PR_ALLOC_CLEAN 0x1
-#define PR_ALLOC_DOUBLE 0x2
-#define PR_ALLOC_ZERO_HANDLE 0x4              /* XXX yes, it's a hack */
-
-/*
-** Force a garbage collection right now. Return when it completes.
-*/
-PR_EXTERN(void) PR_GC(void);
-
-/*
-** Force a finalization right now. Return when finalization has
-** completed. Finalization completes when there are no more objects
-** pending finalization. This does not mean there are no objects in the
-** gc heap that will need finalization should a collection be done after
-** this call.
-*/
-PR_EXTERN(void) PR_ForceFinalize(void);
-
-/*
-** Dump the GC heap out to the given file. This will stop the system dead
-** in its tracks while it is occuring.
-*/
-PR_EXTERN(void) PR_DumpGCHeap(FILE *out, PRBool detailed);
-
-/*
-** Wrapper for PR_DumpGCHeap
-*/
-PR_EXTERN(void) PR_DumpMemory(PRBool detailed);
-
-/*
-** Dump summary of objects allocated.
-*/
-PR_EXTERN(void) PR_DumpMemorySummary(void);
-
-/*
-** Dump the application heaps.
-*/
-PR_EXTERN(void) PR_DumpApplicationHeaps(void);
-
-/*
-** Helper function used by dump routines to do the indentation in a
-** consistent fashion.
-*/
-PR_EXTERN(void) PR_DumpIndent(FILE *out, PRIntn indent);
-
-/*
-** The GCInfo structure contains all of the GC state...
-**
-** busyMemory:
-**    The amount of GC heap memory that is busy at this instant. Busy
-**    doesn't mean alive, it just means that it has been
-**    allocated. Immediately after a collection busy means how much is
-**    alive.
-**
-** freeMemory:
-**    The amount of GC heap memory that is as yet unallocated.
-**
-** allocMemory:
-**    The sum of free and busy memory in the GC heap.
-**
-** maxMemory:
-**    The maximum size that the GC heap is allowed to grow.
-**
-** lowSeg:
-**    The lowest segment currently used in the GC heap.
-**
-** highSeg:
-**    The highest segment currently used in the GC heap.  
-**    The lowSeg and highSeg members are used for a "quick test" of whether 
-**    a pointer falls within the GC heap. [ see GC_IN_HEAP(...) ]
-**
-** lock:
-**    Monitor used for synchronization within the GC.
-**
-** finalizer:
-**    Thread in which the GC finalizer is running.
-**
-** liveBlock:
-**    Object scanning functions call through this function pointer to
-**    register a potential block of pointers with the collector. (This is
-**    currently not at all different than processRoot.)
-**
-** livePointer:
-**    Object scanning functions call through this function pointer to
-**    register a single pointer with the collector.
-**
-** processRootBlock:
-**    When a root finder identifies a root it should call through this
-**    function pointer so that the GC can process the root. The call takes
-**    a base address and count which the gc will examine for valid heap
-**    pointers.
-**
-** processRootPointer:
-**    When a root finder identifies a root it should call through this
-**    function pointer so that the GC can process the root. The call takes
-**    a single pointer value.
-*/
-typedef struct GCInfoStr {
-    PRWord  flags;         /* trace flags (see below)               */
-    PRWord  busyMemory;    /* memory in use right now               */
-    PRWord  freeMemory;    /* memory free right now                 */
-    PRWord  allocMemory;   /* sum of busy & free memory             */
-    PRWord  maxMemory;     /* max memory we are allowed to allocate */
-    PRWord *lowSeg;        /* lowest segment in the GC heap         */
-    PRWord *highSeg;       /* highest segment in the GC heap         */
-
-    PRMonitor *lock;
-    PRThread  *finalizer;
-
-    void (PR_CALLBACK *liveBlock)(void **base, PRInt32 count);
-    void (PR_CALLBACK *livePointer)(void *ptr);
-    void (PR_CALLBACK *processRootBlock)(void **base, PRInt32 count);
-    void (PR_CALLBACK *processRootPointer)(void *ptr);
-    FILE* dumpOutput;
-#ifdef GCTIMINGHOOK
-    void (*gcTimingHook)(int32 gcTime);
-#endif
-} GCInfo;
-
-PR_EXTERN(GCInfo *) PR_GetGCInfo(void);
-PR_EXTERN(PRBool) PR_GC_In_Heap(void GCPTR *object);
-
-/*
-** Simple bounds check to see if a pointer is anywhere near the GC heap.
-** Used to avoid calls to PR_ProcessRoot and GCInfo.livePointer by object
-** scanning code.
-*/
-#if !defined(XP_PC) || defined(_WIN32)
-#define GC_IN_HEAP(_info, _p) (((PRWord*)(_p) >= (_info)->lowSeg) && \
-                               ((PRWord*)(_p) <  (_info)->highSeg))
-#else
-/*
-** The simple bounds check, above, doesn't work in Win16, because we don't
-** maintain: lowSeg == MIN(all segments) and highSeg == MAX(all segments).
-** So we have to do a little better.
-*/
-#define GC_IN_HEAP(_info, _p) PR_GC_In_Heap(_p)
-#endif
-
-PR_EXTERN(PRWord) PR_GetObjectHeader(void *ptr);
-
-PR_EXTERN(PRWord) PR_SetObjectHeader(void *ptr, PRWord newUserBits);
-
-/************************************************************************/
-
-/* Trace flags (passed to PR_InitGC or in environment GCLOG) */
-#define GC_TRACE    0x0001
-#define GC_ROOTS    0x0002
-#define GC_LIVE     0x0004
-#define GC_ALLOC    0x0008
-#define GC_MARK     0x0010
-#define GC_SWEEP    0x0020
-#define GC_DEBUG    0x0040
-#define GC_FINAL    0x0080
-
-#if defined(DEBUG_kipp) || defined(DEBUG_warren)
-#define GC_CHECK    0x0100
-#endif
-
-#ifdef DEBUG
-#define GCTRACE(x, y) if (PR_GetGCInfo()->flags & x) GCTrace y
-PR_EXTERN(void) GCTrace(char *fmt, ...);
-#else
-#define GCTRACE(x, y)
-#endif
-
-PR_END_EXTERN_C
-
-#endif /* prgc_h___ */
diff --git a/libs/js/nsprpub/lib/msgc/src/.cvsignore b/libs/js/nsprpub/lib/msgc/src/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/msgc/src/Makefile.in b/libs/js/nsprpub/lib/msgc/src/Makefile.in
deleted file mode 100644
index de834cc567..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/Makefile.in
+++ /dev/null
@@ -1,103 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-INCLUDES = -I$(dist_includedir) -I../include
-
-CSRCS = prgcapi.c prmsgc.c
-
-ifeq ($(OS_ARCH),WINNT)
-CSRCS += win32gc.c
-else
-ifeq ($(OS_ARCH),OS2)
-CSRCS += os2gc.c
-else
-CSRCS += unixgc.c
-endif
-endif
-
-NSPR_VERSION = $(MOD_MAJOR_VERSION)
-
-EXTRA_LIBS = $(LIBNSPR)
-
-ifdef RESOLVE_LINK_SYMBOLS
-EXTRA_LIBS += $(OS_LIBS)
-endif
-
-ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
-#RES=$(OBJDIR)/ds.res
-#RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
-#OS_LIBS = user32.lib
-endif # WINNT
-
-LIBRARY_NAME = msgc
-LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
-
-RELEASE_LIBS = $(TARGETS)
-
-include $(topsrcdir)/config/rules.mk
-
-#
-# The Client build wants the shared libraries in $(dist_bindir),
-# so we also install them there.
-#
-
-export:: $(TARGETS)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-ifdef SHARED_LIBRARY
-	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
-endif
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
-endif	
-
diff --git a/libs/js/nsprpub/lib/msgc/src/macgc.c b/libs/js/nsprpub/lib/msgc/src/macgc.c
deleted file mode 100644
index eafc28e849..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/macgc.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include "MacMemAllocator.h"
-
-void _MD_InitGC() {}
-
-void *_MD_GrowGCHeap(size_t *sizep)
-{
-	void			*heapPtr = NULL;
-	size_t			heapSize = *sizep;
-	
-	// In previous versions of this code we tried to allocate GC heaps from the application
-	// heap.  In the 4.0 application, we try to keep our app heap allications to a minimum
-	// and instead go through our own memory allocation routines.
-	heapPtr = malloc(heapSize);
-	
-	if (heapPtr == NULL) {		
-		FreeMemoryStats		stats;
-		
-		memtotal(heapSize, &stats);		// How much can we allcoate?
-		
-		if (stats.maxBlockSize < heapSize)
-			heapSize = stats.maxBlockSize;
-		
-		heapPtr = malloc(heapSize);
-		
-		if (heapPtr == NULL) 			// Now we're hurting
-			heapSize = 0;
-	}
-	
-	*sizep = heapSize;
-	return heapPtr;
-}
-
-
-void _MD_FreeGCSegment(void *base, int32 /* len */)
-{
-	free(base);
-}
diff --git a/libs/js/nsprpub/lib/msgc/src/os2gc.c b/libs/js/nsprpub/lib/msgc/src/os2gc.c
deleted file mode 100644
index f99bb67866..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/os2gc.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * GC related routines
- *
- */
-#include "prlog.h"
-
-#include <stdlib.h>
-
-/* Leave a bit of room for any malloc header bytes... */
-#define MAX_SEGMENT_SIZE    (65536L - 4096L)
-
-/************************************************************************/
-/*
-** Machine dependent GC Heap management routines:
-**    _MD_GrowGCHeap
-*/
-/************************************************************************/
-void _MD_InitGC() {}
-
-void *_MD_GrowGCHeap(PRUint32 *sizep)
-{
-    void *addr;
-
-    if ( *sizep > MAX_SEGMENT_SIZE )
-    {
-        *sizep = MAX_SEGMENT_SIZE;
-    }
-
-    addr = malloc((size_t)*sizep);
-    return addr;
-}
-
-
-PRBool _MD_ExtendGCHeap(char *base, PRInt32 oldSize, PRInt32 newSize) {
-  /* Not sure about this.  Todd?  */
-  return PR_FALSE;
-}
-
-
-void _MD_FreeGCSegment(void *base, PRInt32 len)
-{
-   if (base)
-   {
-       free(base);
-   }
-}
diff --git a/libs/js/nsprpub/lib/msgc/src/prgcapi.c b/libs/js/nsprpub/lib/msgc/src/prgcapi.c
deleted file mode 100644
index 23f7ea5143..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/prgcapi.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include "prenv.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prlog.h"
-#include "prthread.h"
-#if defined(XP_MAC)
-#include "pprthred.h"
-#else
-#include "private/pprthred.h"
-#endif
-#include "gcint.h"
-
-/*
-** Generic GC implementation independent code for the NSPR GC
-*/
-
-RootFinder *_pr_rootFinders;
-
-CollectorType *_pr_collectorTypes;
-
-/* GC State information */
-GCInfo _pr_gcData;
-
-GCBeginGCHook *_pr_beginGCHook;
-void *_pr_beginGCHookArg;
-GCBeginGCHook *_pr_endGCHook;
-void *_pr_endGCHookArg;
-
-GCBeginFinalizeHook *_pr_beginFinalizeHook;
-void *_pr_beginFinalizeHookArg;
-GCBeginFinalizeHook *_pr_endFinalizeHook;
-void *_pr_endFinalizeHookArg;
-
-FILE *_pr_dump_file;
-int _pr_do_a_dump;
-GCLockHook *_pr_GCLockHook;
-
-extern PRLogModuleInfo *_pr_msgc_lm;
-
-/************************************************************************/
-
-static PRStatus PR_CALLBACK
-pr_ScanOneThread(PRThread* t, void** addr, PRUword count, void* closure)
-{
-#if defined(XP_MAC)
-#pragma unused (t, closure)
-#endif
-
-    _pr_gcData.processRootBlock(addr, count);
-    return PR_SUCCESS;
-}
-
-/*
-** Scan all of the threads C stack's and registers, looking for "root"
-** pointers into the GC heap. These are the objects that the GC cannot
-** move and are considered "live" by the GC. Caller has stopped all of
-** the threads from running.
-*/
-static void PR_CALLBACK ScanThreads(void *arg)
-{
-    PR_ScanStackPointers(pr_ScanOneThread, arg);
-}
-
-/************************************************************************/
-
-PR_IMPLEMENT(GCInfo *) PR_GetGCInfo(void)
-{
-    return &_pr_gcData;
-}
-
-
-PR_IMPLEMENT(PRInt32) PR_RegisterType(GCType *t)
-{
-    CollectorType *ct, *ect;
-    int rv = -1;
-
-    LOCK_GC();
-    ct = &_pr_collectorTypes[0];
-    ect = &_pr_collectorTypes[FREE_MEMORY_TYPEIX];
-    for (; ct < ect; ct++) {
-	if (ct->flags == 0) {
-	    ct->gctype = *t;
-	    ct->flags = _GC_TYPE_BUSY;
-	    if (0 != ct->gctype.finalize) {
-		ct->flags |= _GC_TYPE_FINAL;
-	    }
-	    if (0 != ct->gctype.getWeakLinkOffset) {
-		ct->flags |= _GC_TYPE_WEAK;
-	    }
-	    rv = ct - &_pr_collectorTypes[0];
-	    break;
-	}
-    }
-    UNLOCK_GC();
-    return rv;
-}
-
-PR_IMPLEMENT(PRStatus) PR_RegisterRootFinder(
-    GCRootFinder f, char *name, void *arg)
-{
-    RootFinder *rf = PR_NEWZAP(RootFinder);
-    if (rf) {
-	    rf->func = f;
-	    rf->name = name;
-	    rf->arg = arg;
-
-	    LOCK_GC();
-	    rf->next = _pr_rootFinders;
-	    _pr_rootFinders = rf;
-	    UNLOCK_GC();
-	    return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-}
-
-
-PR_IMPLEMENT(int) PR_RegisterGCLockHook(GCLockHookFunc* f, void *arg)
-{
-
-    GCLockHook *rf = 0;
-
-    rf = (GCLockHook*) calloc(1, sizeof(GCLockHook));
-    if (rf) {
-	rf->func = f;
-	rf->arg = arg;
-
-	LOCK_GC();
-        /* first dummy node */
-        if (! _pr_GCLockHook) {
-          _pr_GCLockHook = (GCLockHook*) calloc(1, sizeof(GCLockHook));
-          _pr_GCLockHook->next = _pr_GCLockHook;
-          _pr_GCLockHook->prev = _pr_GCLockHook;
-        }
-
-        rf->next = _pr_GCLockHook;
-        rf->prev = _pr_GCLockHook->prev;
-        _pr_GCLockHook->prev->next = rf;
-        _pr_GCLockHook->prev = rf;
-	UNLOCK_GC();
-	return 0;
-    }
-    return -1;
-}
-
-/*
-PR_IMPLEMENT(void) PR_SetGCLockHook(GCLockHook *hook, void *arg)
-{
-    LOCK_GC();
-    _pr_GCLockHook = hook;
-    _pr_GCLockHookArg2 = arg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_GetGCLockHook(GCLockHook **hook, void **arg)
-{
-    LOCK_GC();
-    *hook = _pr_GCLockHook;
-    *arg = _pr_GCLockHookArg2;
-    UNLOCK_GC();
-}
-*/
-
-  
-PR_IMPLEMENT(void) PR_SetBeginGCHook(GCBeginGCHook *hook, void *arg)
-{
-    LOCK_GC();
-    _pr_beginGCHook = hook;
-    _pr_beginGCHookArg = arg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_GetBeginGCHook(GCBeginGCHook **hook, void **arg)
-{
-    LOCK_GC();
-    *hook = _pr_beginGCHook;
-    *arg = _pr_beginGCHookArg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_SetEndGCHook(GCEndGCHook *hook, void *arg)
-{
-    LOCK_GC();
-    _pr_endGCHook = hook;
-    _pr_endGCHookArg = arg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_GetEndGCHook(GCEndGCHook **hook, void **arg)
-{
-    LOCK_GC();
-    *hook = _pr_endGCHook;
-    *arg = _pr_endGCHookArg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_SetBeginFinalizeHook(GCBeginFinalizeHook *hook, void *arg)
-{
-    LOCK_GC();
-    _pr_beginFinalizeHook = hook;
-    _pr_beginFinalizeHookArg = arg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_GetBeginFinalizeHook(GCBeginFinalizeHook **hook, 
-                                           void **arg)
-{
-    LOCK_GC();
-    *hook = _pr_beginFinalizeHook;
-    *arg = _pr_beginFinalizeHookArg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_SetEndFinalizeHook(GCEndFinalizeHook *hook, void *arg)
-{
-    LOCK_GC();
-    _pr_endFinalizeHook = hook;
-    _pr_endFinalizeHookArg = arg;
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void) PR_GetEndFinalizeHook(GCEndFinalizeHook **hook, void **arg)
-{
-    LOCK_GC();
-    *hook = _pr_endFinalizeHook;
-    *arg = _pr_endFinalizeHookArg;
-    UNLOCK_GC();
-}
-
-#ifdef DEBUG
-#include "prprf.h"
-
-#if defined(WIN16)
-static FILE *tracefile = 0;
-#endif
-
-PR_IMPLEMENT(void) GCTrace(char *fmt, ...)
-{	
-    va_list ap;
-    char buf[400];
-
-    va_start(ap, fmt);
-    PR_vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-#if defined(WIN16)
-    if ( tracefile == 0 )
-    {
-        tracefile = fopen( "xxxGCtr", "w" );
-    }
-    fprintf(tracefile, "%s\n", buf );
-    fflush(tracefile);
-#else
-    PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS, ("%s", buf));
-#endif
-}
-#endif
-
-void _PR_InitGC(PRWord flags)
-{
-    static char firstTime = 1;
-
-    if (!firstTime) return;
-    firstTime = 0;
-
-    _MD_InitGC();
-
-    if (flags == 0) {
-	char *ev = PR_GetEnv("GCLOG");
-	if (ev && ev[0]) {
-	    flags = atoi(ev);
-	}
-    }
-    _pr_gcData.flags = flags;
-
-    _pr_gcData.lock = PR_NewMonitor();
-
-    _pr_collectorTypes = (CollectorType*) PR_CALLOC(256 * sizeof(CollectorType));
-
-    PR_RegisterRootFinder(ScanThreads, "scan threads", 0);
-    PR_RegisterRootFinder(_PR_ScanFinalQueue, "scan final queue", 0);
-}
-
-extern void pr_FinalizeOnExit(void);
-
-#ifdef DEBUG
-#ifdef GC_STATS
-PR_PUBLIC_API(void) PR_PrintGCAllocStats(void);
-#endif 
-#endif 
-  
-PR_IMPLEMENT(void) 
-PR_ShutdownGC(PRBool finalizeOnExit)
-{
-    /* first finalize all the objects in the heap */
-    if (finalizeOnExit) {
-        pr_FinalizeOnExit();
-    }
-
-#ifdef DEBUG
-#ifdef GC_STATS
-    PR_PrintGCAllocStats();
-#endif /* GC_STATS */
-#endif /* DEBUG */
-
-    /* then the chance for any future allocations */
-
-    /* finally delete the gc heap */
-
-    /* write me */
-}
-
-/******************************************************************************/
diff --git a/libs/js/nsprpub/lib/msgc/src/prmsgc.c b/libs/js/nsprpub/lib/msgc/src/prmsgc.c
deleted file mode 100644
index a6fc897ac3..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/prmsgc.c
+++ /dev/null
@@ -1,3514 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <string.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windef.h>
-#include <winbase.h>
-#endif
-
-#include "prclist.h"
-#include "prbit.h"
-
-#include "prtypes.h"
-#include "prenv.h"
-#include "prgc.h"
-#include "prthread.h"
-#include "prlog.h"
-#include "prlong.h"
-#include "prinrval.h"
-#include "prprf.h"
-#include "gcint.h"
-
-#if defined(XP_MAC)
-#include "pprthred.h"
-#else
-#include "private/pprthred.h"
-#endif
-
-typedef void (*PRFileDumper)(FILE *out, PRBool detailed);
-
-PR_EXTERN(void)
-PR_DumpToFile(char* filename, char* msg, PRFileDumper dump, PRBool detailed);
-
-/*
-** Mark&sweep garbage collector. Supports objects that require
-** finalization, objects that can have a single weak link, and special
-** objects that require care during sweeping.
-*/
-
-PRLogModuleInfo *_pr_msgc_lm;
-PRLogModuleInfo* GC;
-
-static PRInt32 _pr_pageShift;
-static PRInt32 _pr_pageSize;
-
-#ifdef DEBUG
-#define GCMETER
-#endif
-#ifdef DEBUG_jwz
-# undef GCMETER
-#endif /* 1 */
-
-#ifdef GCMETER
-#define METER(x) x
-#else
-#define METER(x)
-#endif
-
-/*
-** Make this constant bigger to reduce the amount of recursion during
-** garbage collection.
-*/
-#define MAX_SCAN_Q    100L
-
-#if defined(XP_PC) && !defined(WIN32)
-#define MAX_SEGS            400L
-#define MAX_SEGMENT_SIZE    (65536L - 4096L)
-#define SEGMENT_SIZE        (65536L - 4096L)
-#define MAX_ALLOC_SIZE      (65536L - 4096L)
-#else
-#define MAX_SEGS                    400L
-#define MAX_SEGMENT_SIZE            (2L * 256L * 1024L)
-#define SEGMENT_SIZE                (1L * 256L * 1024L)
-#define MAX_ALLOC_SIZE              (4L * 1024L * 1024L)
-#endif  
-
-/* 
- * The highest value that can fit into a signed integer. This
- * is used to prevent overflow of allocation size in alloc routines.
- */
- 
-#define MAX_INT ((1UL << (PR_BITS_PER_INT - 1)) - 1)
-
-/* 
- * On 32-bit machines, only 22 bits are used in the cibx integer to
- * store size since 8 bits of the integer are used to store type, and
- * of the remainder, 2 are user defined. Max allocation size = 2^22 -1
- */
-
-#define MAX_ALLOC ( (1L << (PR_BYTES_PER_WORD_LOG2 + WORDS_BITS )) -1)
-
-/* The minimum percentage of free heap space after a collection. If
-   the amount of free space doesn't meet this criteria then we will
-   attempt to grow the heap */
-#ifdef XP_MAC
-#define MIN_FREE_THRESHOLD_AFTER_GC 10L
-#else
-#define MIN_FREE_THRESHOLD_AFTER_GC 20L
-#endif
-
-static PRInt32 segmentSize = SEGMENT_SIZE;
-
-static PRInt32 collectorCleanupNeeded;
-
-#ifdef GCMETER
-PRUint32 _pr_gcMeter;
-
-#define _GC_METER_STATS         0x01L
-#define _GC_METER_GROWTH        0x02L
-#define _GC_METER_FREE_LIST     0x04L
-#endif
-
-/************************************************************************/
-
-#define LINEAR_BIN_EXPONENT 5
-#define NUM_LINEAR_BINS ((PRUint32)1 << LINEAR_BIN_EXPONENT)
-#define FIRST_LOG_BIN (NUM_LINEAR_BINS - LINEAR_BIN_EXPONENT)
-
-/* Each free list bin holds a chunk of memory sized from
-   2^n to (2^(n+1))-1 inclusive. */
-#define NUM_BINS        (FIRST_LOG_BIN + 32)
-
-/*
- * Find the bin number for a given size (in bytes). This does not round up as
- * values from 2^n to (2^(n+1))-1 share the same bin.
- */
-#define InlineBinNumber(_bin,_bytes)  \
-{  \
-    PRUint32 _t, _n = (PRUint32) _bytes / 4;  \
-    if (_n < NUM_LINEAR_BINS) {  \
-        _bin = _n;  \
-    } else {  \
-        _bin = FIRST_LOG_BIN;  \
-        if ((_t = (_n >> 16)) != 0) { _bin += 16; _n = _t; }  \
-        if ((_t = (_n >> 8)) != 0)  { _bin += 8; _n = _t; }  \
-        if ((_t = (_n >> 4)) != 0)  { _bin += 4; _n = _t; }  \
-        if ((_t = (_n >> 2)) != 0) { _bin += 2; _n = _t; }  \
-        if ((_n >> 1) != 0) _bin++;  \
-    }  \
-}
-
-#define BIG_ALLOC       16384L
-
-#define MIN_FREE_CHUNK_BYTES    ((PRInt32)sizeof(GCFreeChunk))
-
-/* Note: fix code in PR_AllocMemory if you change the size of GCFreeChunk
-   so that it zeros the right number of words */
-typedef struct GCFreeChunk {
-    struct GCFreeChunk *next;
-    struct GCSeg *segment;
-    PRInt32 chunkSize;
-} GCFreeChunk;
-
-typedef struct GCSegInfo {
-    struct GCSegInfo *next;
-    char *base;
-    char *limit;
-    PRWord *hbits;
-    int fromMalloc;
-} GCSegInfo;
-    
-typedef struct GCSeg {
-    char *base;
-    char *limit;
-    PRWord *hbits;
-    GCSegInfo *info;
-} GCSeg;
-
-#ifdef GCMETER
-typedef struct GCMeter {
-    PRInt32 allocBytes;
-    PRInt32 wastedBytes;
-    PRInt32 numFreeChunks;
-    PRInt32 skippedFreeChunks;
-} GCMeter;
-static GCMeter meter;
-#endif
-
-/*
-** There is one of these for each segment of GC'able memory.
-*/
-static GCSeg segs[MAX_SEGS];
-static GCSegInfo *freeSegs;
-static GCSeg* lastInHeap;
-static int nsegs;
-
-static GCFreeChunk *bins[NUM_BINS];
-static PRInt32 minBin;
-static PRInt32 maxBin;
-
-/*
-** Scan Q used to avoid deep recursion when scanning live objects for
-** heap pointers
-*/
-typedef struct GCScanQStr {
-    PRWord *q[MAX_SCAN_Q];
-    int queued;
-} GCScanQ;
-
-static GCScanQ *pScanQ;
-
-#ifdef GCMETER
-PRInt32 _pr_maxScanDepth;
-PRInt32 _pr_scanDepth;
-#endif
-
-/*
-** Keeps track of the number of bytes allocated via the BigAlloc() 
-** allocator.  When the number of bytes allocated, exceeds the 
-** BIG_ALLOC_GC_SIZE, then a GC will occur before the next allocation
-** is done...
-*/
-#define BIG_ALLOC_GC_SIZE       (4*SEGMENT_SIZE)
-static PRWord bigAllocBytes = 0;
-
-/*
-** There is one GC header word in front of each GC allocated object.  We
-** use it to contain information about the object (what TYPEIX to use for
-** scanning it, how big it is, it's mark status, and if it's a root).
-*/
-#define TYPEIX_BITS    8L
-#define WORDS_BITS    20L
-#define MAX_CBS        (1L << GC_TYPEIX_BITS)
-#define MAX_WORDS    (1L << GC_WORDS_BITS)
-#define TYPEIX_SHIFT    24L
-#define MAX_TYPEIX    ((1L << TYPEIX_BITS) - 1L)
-#define TYPEIX_MASK    PR_BITMASK(TYPEIX_BITS)
-#define WORDS_SHIFT    2L
-#define WORDS_MASK    PR_BITMASK(WORDS_BITS)
-#define MARK_BIT    1L
-#define FINAL_BIT    2L
-
-/* Two bits per object header are reserved for the user of the memory
-   system to store information into. */
-#define GC_USER_BITS_SHIFT 22L
-#define GC_USER_BITS    0x00c00000L
-
-#define MAKE_HEADER(_cbix,_words)              \
-    ((PRWord) (((unsigned long)(_cbix) << TYPEIX_SHIFT) \
-         | ((unsigned long)(_words) << WORDS_SHIFT)))
-
-#define GET_TYPEIX(_h) \
-    (((PRUword)(_h) >> TYPEIX_SHIFT) & 0xff)
-
-#define MARK(_sp,_p) \
-    (((PRWord *)(_p))[0] |= MARK_BIT)
-#define IS_MARKED(_sp,_p) \
-    (((PRWord *)(_p))[0] & MARK_BIT)
-#define OBJ_BYTES(_h) \
-    (((PRInt32) (_h) & 0x003ffffcL) << (PR_BYTES_PER_WORD_LOG2-2L))
-
-#define GC_GET_USER_BITS(_h) (((_h) & GC_USER_BITS) >> GC_USER_BITS_SHIFT)
-
-/************************************************************************/
-
-/*
-** Mark the start of an object in a segment. Note that we mark the header
-** word (which we always have), not the data word (which we may not have
-** for empty objects).
-** XXX tune: put subtract of _sp->base into _sp->hbits pointer?
-*/
-#if !defined(WIN16)
-#define SET_HBIT(_sp,_ph) \
-    SET_BIT((_sp)->hbits, (((PRWord*)(_ph)) - ((PRWord*) (_sp)->base)))
-
-#define CLEAR_HBIT(_sp,_ph) \
-    CLEAR_BIT((_sp)->hbits, (((PRWord*)(_ph)) - ((PRWord*) (_sp)->base)))
-
-#define IS_HBIT(_sp,_ph) \
-    TEST_BIT((_sp)->hbits, (((PRWord*)(_ph)) - ((PRWord*) (_sp)->base)))
-#else
-
-#define SET_HBIT(_sp,_ph) set_hbit(_sp,_ph)
-
-#define CLEAR_HBIT(_sp,_ph) clear_hbit(_sp,_ph)
-
-#define IS_HBIT(_sp,_ph) is_hbit(_sp,_ph)
-
-static void
-set_hbit(GCSeg *sp, PRWord *p)
-{
-    unsigned int distance;
-    unsigned int index;
-    PRWord     mask;
-
-        PR_ASSERT( SELECTOROF(p) == SELECTOROF(sp->base) );
-        PR_ASSERT( OFFSETOF(p)   >= OFFSETOF(sp->base) );
-
-        distance = (OFFSETOF(p) - OFFSETOF(sp->base)) >> 2;
-    index    = distance >> PR_BITS_PER_WORD_LOG2;
-    mask     = 1L << (distance&(PR_BITS_PER_WORD-1));
-
-    sp->hbits[index] |= mask;
-}
-
-static void
-clear_hbit(GCSeg *sp, PRWord *p)
-{
-    unsigned int distance;
-    unsigned int index;
-    PRWord    mask;
-
-        PR_ASSERT( SELECTOROF(p) == SELECTOROF(sp->base) );
-        PR_ASSERT( OFFSETOF(p)   >= OFFSETOF(sp->base) );
-
-        distance = (OFFSETOF(p) - OFFSETOF(sp->base)) >> 2;
-    index    = distance >> PR_BITS_PER_WORD_LOG2;
-    mask     = 1L << (distance&(PR_BITS_PER_WORD-1));
-
-    sp->hbits[index] &= ~mask;
-}
-
-static int
-is_hbit(GCSeg *sp, PRWord *p)
-{
-    unsigned int distance;
-    unsigned int index;
-    PRWord    mask;
-
-        PR_ASSERT( SELECTOROF(p) == SELECTOROF(sp->base) );
-        PR_ASSERT( OFFSETOF(p)   >= OFFSETOF(sp->base) );
-
-        distance = (OFFSETOF(p) - OFFSETOF(sp->base)) >> 2;
-    index    = distance >> PR_BITS_PER_WORD_LOG2;
-    mask     = 1L << (distance&(PR_BITS_PER_WORD-1));
-
-    return ((sp->hbits[index] & mask) != 0);
-}
-
-
-#endif  /* WIN16 */
-
-/*
-** Given a pointer into this segment, back it up until we are at the
-** start of the object the pointer points into. Each heap segment has a
-** bitmap that has one bit for each word of the objects it contains.  The
-** bit's are set for the firstword of an object, and clear for it's other
-** words.
-*/
-static PRWord *FindObject(GCSeg *sp, PRWord *p)
-{
-    PRWord *base;
-    
-    /* Align p to it's proper boundary before we start fiddling with it */
-    p = (PRWord*) ((PRWord)p & ~(PR_BYTES_PER_WORD-1L));
-
-    base = (PRWord *) sp->base;
-#if defined(WIN16)
-    PR_ASSERT( SELECTOROF(p) == SELECTOROF(base));
-#endif
-    do {
-    if (IS_HBIT(sp, p)) {
-        return (p);
-    }
-    p--;
-    } while ( p >= base );
-
-    /* Heap is corrupted! */
-    _GCTRACE(GC_TRACE, ("ERROR: The heap is corrupted!!! aborting now!"));
-    abort();
-    return NULL;
-}
-
-/************************************************************************/
-#if !defined(XP_PC) || defined(XP_OS2)
-#define OutputDebugString(msg)
-#endif 
-
-#if !defined(WIN16)
-#define IN_SEGMENT(_sp, _p)             \
-    ((((char *)(_p)) >= (_sp)->base) &&    \
-     (((char *)(_p)) < (_sp)->limit))
-#else
-#define IN_SEGMENT(_sp, _p)                  \
-    ((((PRWord)(_p)) >= ((PRWord)(_sp)->base)) && \
-     (((PRWord)(_p)) < ((PRWord)(_sp)->limit)))
-#endif
-
-static GCSeg *InHeap(void *p)
-{
-    GCSeg *sp, *esp;
-
-    if (lastInHeap && IN_SEGMENT(lastInHeap, p)) {
-    return lastInHeap;
-    }
-
-    sp = segs;
-    esp = segs + nsegs;
-    for (; sp < esp; sp++) {
-    if (IN_SEGMENT(sp, p)) {
-        lastInHeap = sp;
-        return sp;
-    }
-    }
-    return 0;
-}
-
-/*
-** Grow the heap by allocating another segment. Fudge the requestedSize
-** value to try to pre-account for the HBITS.
-*/
-static GCSeg* DoGrowHeap(PRInt32 requestedSize, PRBool exactly)
-{
-    GCSeg *sp;
-    GCSegInfo *segInfo;
-    GCFreeChunk *cp;
-    char *base;
-    PRWord *hbits;
-    PRInt32 nhbytes, nhbits;
-    PRUint32 allocSize;
-
-    if (nsegs == MAX_SEGS) {
-    /* No room for more segments */
-    return 0;
-    }
-
-    segInfo = (GCSegInfo*) PR_MALLOC(sizeof(GCSegInfo));
-#ifdef DEBUG
-    {
-    char str[256];
-    sprintf(str, "[1] Allocated %ld bytes at %p\n",
-        (long) sizeof(GCSegInfo), segInfo);
-    OutputDebugString(str);
-    }
-#endif
-    if (!segInfo) {
-    return 0;
-    }
-
-#if defined(WIN16)
-    if (requestedSize > segmentSize) {
-    PR_DELETE(segInfo);
-    return 0;
-    }
-#endif
-
-    /* Get more memory from the OS */
-    if (exactly) {
-    allocSize = requestedSize;
-    base = (char *) PR_MALLOC(requestedSize);
-    } else {
-    allocSize = requestedSize;
-    allocSize = (allocSize + _pr_pageSize - 1L) >> _pr_pageShift;
-    allocSize <<= _pr_pageShift;
-    base = (char*)_MD_GrowGCHeap(&allocSize);
-    }
-    if (!base) {
-    PR_DELETE(segInfo);
-    return 0;
-    }
-
-    nhbits = (PRInt32)(
-        (allocSize + PR_BYTES_PER_WORD - 1L) >> PR_BYTES_PER_WORD_LOG2);
-    nhbytes = ((nhbits + PR_BITS_PER_WORD - 1L) >> PR_BITS_PER_WORD_LOG2)
-    * sizeof(PRWord);
-
-    /* Get bitmap memory from malloc heap */
-#if defined(WIN16)
-    PR_ASSERT( nhbytes < MAX_ALLOC_SIZE );
-#endif
-    hbits = (PRWord *) PR_CALLOC((PRUint32)nhbytes);
-    if (!hbits) {
-    /* Loser! */
-    PR_DELETE(segInfo);
-    if (exactly) {
-        PR_DELETE(base);
-    } else {
-      /* XXX do something about this */
-      /* _MD_FreeGCSegment(base, allocSize); */
-    }
-    return 0;
-    }
-
-    /*
-    ** Setup new segment.
-    */
-    sp = &segs[nsegs++];
-    segInfo->base = sp->base = base;
-    segInfo->limit = sp->limit = base + allocSize;
-    segInfo->hbits = sp->hbits = hbits;
-    sp->info = segInfo;
-    segInfo->fromMalloc = exactly;
-    memset(base, 0, allocSize);
-
-#ifdef GCMETER
-    if (_pr_gcMeter & _GC_METER_GROWTH) {
-        fprintf(stderr, "[GC: new segment base=%p size=%ld]\n",
-                sp->base, (long) allocSize);
-    }
-#endif    
-
-    _pr_gcData.allocMemory += allocSize;
-    _pr_gcData.freeMemory  += allocSize;
-
-    if (!exactly) {
-    PRInt32 bin;
-
-        /* Put free memory into a freelist bin */
-        cp = (GCFreeChunk *) base;
-        cp->segment = sp;
-        cp->chunkSize = allocSize;
-        InlineBinNumber(bin, allocSize)
-        cp->next = bins[bin];
-        bins[bin] = cp;
-    if (bin < minBin) minBin = bin;
-    if (bin > maxBin) maxBin = bin;
-    } else {
-        /*
-        ** When exactly allocating the entire segment is given over to a
-        ** single object to prevent fragmentation
-        */
-    }
-
-    if (!_pr_gcData.lowSeg) {
-    _pr_gcData.lowSeg  = (PRWord*) sp->base;
-    _pr_gcData.highSeg = (PRWord*) sp->limit;
-    } else {
-    if ((PRWord*)sp->base < _pr_gcData.lowSeg) {
-        _pr_gcData.lowSeg = (PRWord*) sp->base;
-    }
-    if ((PRWord*)sp->limit > _pr_gcData.highSeg) {
-        _pr_gcData.highSeg = (PRWord*) sp->limit;
-    }
-    }
-
-    /* 
-    ** Get rid of the GC pointer in case it shows up in some uninitialized
-    ** local stack variable later (while scanning the C stack looking for
-    ** roots).
-    */ 
-    memset(&base, 0, sizeof(base));  /* optimizers beware */
-
-    PR_LOG(_pr_msgc_lm, PR_LOG_WARNING, ("grow heap: total gc memory now %d",
-                      _pr_gcData.allocMemory));
-
-    return sp;
-}
-
-#ifdef USE_EXTEND_HEAP
-static PRBool ExtendHeap(PRInt32 requestedSize) {
-  GCSeg* sp;
-  PRUint32 allocSize;
-  PRInt32 oldSize, newSize;
-  PRInt32 newHBits, newHBytes;
-  PRInt32 oldHBits, oldHBytes;
-  PRWord* hbits;
-  GCFreeChunk* cp;
-  PRInt32 bin;
-
-  /* Can't extend nothing */
-  if (nsegs == 0) return PR_FALSE;
-
-  /* Round up requested size to the size of a page */
-  allocSize = (PRUint32) requestedSize;
-  allocSize = (allocSize + _pr_pageSize - 1L) >> _pr_pageShift;
-  allocSize <<= _pr_pageShift;
-
-  /* Malloc some memory for the new hbits array */
-  sp = segs;
-  oldSize = sp->limit - sp->base;
-  newSize = oldSize + allocSize;
-  newHBits = (newSize + PR_BYTES_PER_WORD - 1L) >> PR_BYTES_PER_WORD_LOG2;
-  newHBytes = ((newHBits + PR_BITS_PER_WORD - 1L) >> PR_BITS_PER_WORD_LOG2)
-    * sizeof(PRWord);
-  hbits = (PRWord*) PR_MALLOC(newHBytes);
-  if (0 == hbits) return PR_FALSE;
-
-  /* Attempt to extend the last segment by the desired amount */
-  if (_MD_ExtendGCHeap(sp->base, oldSize, newSize)) {
-    oldHBits = (oldSize + PR_BYTES_PER_WORD - 1L) >> PR_BYTES_PER_WORD_LOG2;
-    oldHBytes = ((oldHBits + PR_BITS_PER_WORD - 1L) >> PR_BITS_PER_WORD_LOG2)
-      * sizeof(PRWord);
-
-    /* Copy hbits from old memory into new memory */
-    memset(hbits, 0, newHBytes);
-    memcpy(hbits, sp->hbits, oldHBytes);
-    PR_DELETE(sp->hbits);
-    memset(sp->base + oldSize, 0, allocSize);
-
-    /* Adjust segment state */
-    sp->limit += allocSize;
-    sp->hbits = hbits;
-    sp->info->limit = sp->limit;
-    sp->info->hbits = hbits;
-
-    /* Put free memory into a freelist bin */
-    cp = (GCFreeChunk *) (sp->base + oldSize);
-    cp->segment = sp;
-    cp->chunkSize = allocSize;
-    InlineBinNumber(bin, allocSize)
-    cp->next = bins[bin];
-    bins[bin] = cp;
-    if (bin < minBin) minBin = bin;
-    if (bin > maxBin) maxBin = bin;
-
-    /* Prevent a pointer that points to the free memory from showing
-       up on the call stack later on */
-    memset(&cp, 0, sizeof(cp));
-
-    /* Update heap brackets and counters */
-    if ((PRWord*)sp->limit > _pr_gcData.highSeg) {
-      _pr_gcData.highSeg = (PRWord*) sp->limit;
-    }
-    _pr_gcData.allocMemory += allocSize;
-    _pr_gcData.freeMemory  += allocSize;
-
-    return PR_TRUE;
-  }
-  PR_DELETE(hbits);
-  return PR_FALSE;
-}
-#endif /* USE_EXTEND_HEAP */
-
-static GCSeg *GrowHeapExactly(PRInt32 requestedSize)
-{
-    GCSeg *sp = DoGrowHeap(requestedSize, PR_TRUE);
-    return sp;
-}
-
-static PRBool GrowHeap(PRInt32 requestedSize)
-{
-  void *p;
-#ifdef USE_EXTEND_HEAP
-  if (ExtendHeap(requestedSize)) {
-    return PR_TRUE;
-  }
-#endif
-  p = DoGrowHeap(requestedSize, PR_FALSE);
-  return (p != NULL ? PR_TRUE : PR_FALSE);
-}
-
-/*
-** Release a segment when it is entirely free.
-*/
-static void ShrinkGCHeap(GCSeg *sp)
-{
-#ifdef GCMETER
-    if (_pr_gcMeter & _GC_METER_GROWTH) {
-        fprintf(stderr, "[GC: free segment base=%p size=%ld]\n",
-                sp->base, (long) (sp->limit - sp->base));
-    }
-#endif    
-
-    /*
-     * Put segment onto free seginfo list (we can't call free right now
-     * because we have the GC lock and all of the other threads are
-     * suspended; if one of them has the malloc lock we would deadlock)
-     */
-    sp->info->next = freeSegs;
-    freeSegs = sp->info;
-    collectorCleanupNeeded = 1;
-    _pr_gcData.allocMemory -= sp->limit - sp->base;
-    if (sp == lastInHeap) lastInHeap = 0;
-
-    /* Squish out disappearing segment from segment table */
-    --nsegs;
-    if ((sp - segs) != nsegs) {
-        *sp = segs[nsegs];
-    } else {
-        sp->base = 0;
-        sp->limit = 0;
-        sp->hbits = 0;
-    sp->info = 0;
-    }
-
-    /* Recalculate the lowSeg and highSeg values */
-    _pr_gcData.lowSeg  = (PRWord*) segs[0].base;
-    _pr_gcData.highSeg = (PRWord*) segs[0].limit;
-    for (sp = segs; sp < &segs[nsegs]; sp++) {
-    if ((PRWord*)sp->base < _pr_gcData.lowSeg) {
-        _pr_gcData.lowSeg = (PRWord*) sp->base;
-    }
-    if ((PRWord*)sp->limit > _pr_gcData.highSeg) {
-        _pr_gcData.highSeg = (PRWord*) sp->limit;
-    }
-    }
-}
-
-static void FreeSegments(void)
-{
-    GCSegInfo *si;
-
-    while (0 != freeSegs) {
-    LOCK_GC();
-    si = freeSegs;
-    if (si) {
-        freeSegs = si->next;
-    }
-    UNLOCK_GC();
-
-    if (!si) {
-        break;
-    }
-    PR_DELETE(si->base);
-    PR_DELETE(si->hbits);
-    PR_DELETE(si);
-    }
-}
-
-/************************************************************************/
-
-void ScanScanQ(GCScanQ *iscan)
-{
-    PRWord *p;
-    PRWord **pp;
-    PRWord **epp;
-    GCScanQ nextQ, *scan, *next, *temp;
-    CollectorType *ct;
-
-    if (!iscan->queued) return;
-
-    _GCTRACE(GC_MARK, ("begin scanQ @ 0x%x (%d)", iscan, iscan->queued));
-    scan = iscan;
-    next = &nextQ;
-    while (scan->queued) {
-	_GCTRACE(GC_MARK, ("continue scanQ @ 0x%x (%d)", scan, scan->queued));
-    /*
-     * Set pointer to current scanQ so that _pr_gcData.livePointer
-     * can find it.
-     */
-    pScanQ = next;
-    next->queued = 0;
-
-    /* Now scan the scan Q */
-    pp = scan->q;
-    epp = &scan->q[scan->queued];
-    scan->queued = 0;
-    while (pp < epp) {
-        p = *pp++;
-        ct = &_pr_collectorTypes[GET_TYPEIX(p[0])];
-        PR_ASSERT(0 != ct->gctype.scan);
-        /* Scan object ... */
-        (*ct->gctype.scan)(p + 1);
-    }
-
-    /* Exchange pointers so that we scan next */
-    temp = scan;
-    scan = next;
-    next = temp;
-    }
-
-    pScanQ = iscan;
-    PR_ASSERT(nextQ.queued == 0);
-    PR_ASSERT(iscan->queued == 0);
-}
-
-/*
-** Called during root finding step to identify "root" pointers into the
-** GC heap. First validate if it is a real heap pointer and then mark the
-** object being pointed to and add it to the scan Q for eventual
-** scanning.
-*/
-static void PR_CALLBACK ProcessRootBlock(void **base, PRInt32 count)
-{
-    GCSeg *sp;
-    PRWord *p0, *p, h, tix, *low, *high, *segBase;
-    CollectorType *ct;
-#ifdef DEBUG
-    void **base0 = base;
-#endif
-
-    low = _pr_gcData.lowSeg;
-    high = _pr_gcData.highSeg;
-    while (--count >= 0) {
-        p0 = (PRWord*) *base++;
-        /*
-        ** XXX:  
-        ** Until Win16 maintains lowSeg and highSeg correctly,
-        ** (ie. lowSeg=MIN(all segs) and highSeg = MAX(all segs))
-        ** Allways scan through the segment list
-        */
-#if !defined(WIN16)
-        if (p0 < low) continue;                  /* below gc heap */
-        if (p0 >= high) continue;                /* above gc heap */
-#endif
-        /* NOTE: inline expansion of InHeap */
-        /* Find segment */
-    sp = lastInHeap;
-        if (!sp || !IN_SEGMENT(sp,p0)) {
-            GCSeg *esp;
-            sp = segs;
-        esp = segs + nsegs;
-            for (; sp < esp; sp++) {
-                if (IN_SEGMENT(sp, p0)) {
-                    lastInHeap = sp;
-                    goto find_object;
-                }
-            }
-            continue;
-        }
-
-      find_object:
-        /* NOTE: Inline expansion of FindObject */
-        /* Align p to it's proper boundary before we start fiddling with it */
-        p = (PRWord*) ((PRWord)p0 & ~(PR_BYTES_PER_WORD-1L));
-        segBase = (PRWord *) sp->base;
-        do {
-            if (IS_HBIT(sp, p)) {
-                goto winner;
-            }
-            p--;
-        } while (p >= segBase);
-
-        /*
-        ** We have a pointer into the heap, but it has no header
-        ** bit. This means that somehow the very first object in the heap
-        ** doesn't have a header. This is impossible so when debugging
-        ** lets abort.
-        */
-#ifdef DEBUG
-        PR_Abort();
-#endif
-
-      winner:
-        h = p[0];
-        if ((h & MARK_BIT) == 0) {
-#ifdef DEBUG
-            _GCTRACE(GC_ROOTS,
-            ("root 0x%p (%d) base0=%p off=%d",
-             p, OBJ_BYTES(h), base0, (base-1) - base0));
-#endif
-
-            /* Mark the root we just found */
-            p[0] = h | MARK_BIT;
-
-            /*
-         * See if object we just found needs scanning. It must
-         * have a scan function to be placed on the scanQ.
-         */
-            tix = (PRWord)GET_TYPEIX(h);
-        ct = &_pr_collectorTypes[tix];
-        if (0 == ct->gctype.scan) {
-        continue;
-        }
-
-            /*
-            ** Put a pointer onto the scan Q. We use the scan Q to avoid
-            ** deep recursion on the C call stack. Objects are added to
-            ** the scan Q until the scan Q fills up. At that point we
-            ** make a call to ScanScanQ which proceeds to scan each of
-            ** the objects in the Q. This limits the recursion level by a
-            ** large amount though the stack frames get larger to hold
-            ** the GCScanQ's.
-            */
-            pScanQ->q[pScanQ->queued++] = p;
-            if (pScanQ->queued == MAX_SCAN_Q) {
-                METER(_pr_scanDepth++);
-                ScanScanQ(pScanQ);
-            }
-        }
-    }
-}
-
-static void PR_CALLBACK ProcessRootPointer(void *ptr)
-{
-  PRWord *p0, *p, h, tix, *segBase;
-  GCSeg* sp;
-  CollectorType *ct;
-
-  p0 = (PRWord*) ptr;
-
-  /*
-  ** XXX:  
-  ** Until Win16 maintains lowSeg and highSeg correctly,
-  ** (ie. lowSeg=MIN(all segs) and highSeg = MAX(all segs))
-  ** Allways scan through the segment list
-  */
-#if !defined(WIN16)
-  if (p0 < _pr_gcData.lowSeg) return;                  /* below gc heap */
-  if (p0 >= _pr_gcData.highSeg) return;                /* above gc heap */
-#endif
-
-  /* NOTE: inline expansion of InHeap */
-  /* Find segment */
-  sp = lastInHeap;
-  if (!sp || !IN_SEGMENT(sp,p0)) {
-    GCSeg *esp;
-    sp = segs;
-    esp = segs + nsegs;
-    for (; sp < esp; sp++) {
-      if (IN_SEGMENT(sp, p0)) {
-    lastInHeap = sp;
-    goto find_object;
-      }
-    }
-    return;
-  }
-
- find_object:
-  /* NOTE: Inline expansion of FindObject */
-  /* Align p to it's proper boundary before we start fiddling with it */
-    p = (PRWord*) ((PRWord)p0 & ~(BYTES_PER_WORD-1L));
-    segBase = (PRWord *) sp->base;
-    do {
-      if (IS_HBIT(sp, p)) {
-    goto winner;
-      }
-      p--;
-    } while (p >= segBase);
-
-    /*
-    ** We have a pointer into the heap, but it has no header
-    ** bit. This means that somehow the very first object in the heap
-    ** doesn't have a header. This is impossible so when debugging
-    ** lets abort.
-    */
-#ifdef DEBUG
-    PR_Abort();
-#endif
-
- winner:
-  h = p[0];
-  if ((h & MARK_BIT) == 0) {
-#ifdef DEBUG
-    _GCTRACE(GC_ROOTS, ("root 0x%p (%d)", p, OBJ_BYTES(h)));
-#endif
-
-    /* Mark the root we just found */
-    p[0] = h | MARK_BIT;
-
-    /*
-     * See if object we just found needs scanning. It must
-     * have a scan function to be placed on the scanQ.
-     */
-    tix = (PRWord)GET_TYPEIX(h);
-    ct = &_pr_collectorTypes[tix];
-    if (0 == ct->gctype.scan) {
-      return;
-    }
-
-    /*
-    ** Put a pointer onto the scan Q. We use the scan Q to avoid
-    ** deep recursion on the C call stack. Objects are added to
-    ** the scan Q until the scan Q fills up. At that point we
-    ** make a call to ScanScanQ which proceeds to scan each of
-    ** the objects in the Q. This limits the recursion level by a
-    ** large amount though the stack frames get larger to hold
-    ** the GCScanQ's.
-    */
-    pScanQ->q[pScanQ->queued++] = p;
-    if (pScanQ->queued == MAX_SCAN_Q) {
-      METER(_pr_scanDepth++);
-      ScanScanQ(pScanQ);
-    }
-  }
-}
-
-/************************************************************************/
-
-/*
-** Empty the freelist for each segment. This is done to make sure that
-** the root finding step works properly (otherwise, if we had a pointer
-** into a free section, we might not find its header word and abort in
-** FindObject)
-*/
-static void EmptyFreelists(void)
-{
-    GCFreeChunk *cp;
-    GCFreeChunk *next;
-    GCSeg *sp;
-    PRWord *p;
-    PRInt32 chunkSize;
-    PRInt32 bin;
-
-    /*
-    ** Run over the freelist and make all of the free chunks look like
-    ** object debris.
-    */
-    for (bin = 0; bin <= NUM_BINS-1; bin++) {
-        cp = bins[bin];
-        while (cp) {
-            next = cp->next;
-            sp = cp->segment;
-            chunkSize = cp->chunkSize >> BYTES_PER_WORD_LOG2;
-            p = (PRWord*) cp;
-            PR_ASSERT(chunkSize != 0);
-            p[0] = MAKE_HEADER(FREE_MEMORY_TYPEIX, chunkSize);
-            SET_HBIT(sp, p);
-            cp = next;
-        }
-        bins[bin] = 0;
-    }
-    minBin = NUM_BINS - 1;
-    maxBin = 0;
-}
-
-typedef struct GCBlockEnd {
-    PRInt32	check;
-#ifdef GC_CHECK
-    PRInt32	requestedBytes;
-#endif
-#ifdef GC_STATS
-    PRInt32	bin;
-    PRInt64	allocTime; 
-#endif
-#ifdef GC_TRACEROOTS
-    PRInt32	traceGeneration;	
-#endif
-} GCBlockEnd;
-
-#define PR_BLOCK_END	0xDEADBEEF
-
-/************************************************************************/
-
-#ifdef GC_STATS
-
-typedef struct GCStat {
-    PRInt32	nallocs;
-    double	allocTime;
-    double	allocTimeVariance;
-    PRInt32	nfrees;
-    double	lifetime;
-    double	lifetimeVariance;
-} GCStat;
-
-#define GCSTAT_BINS	NUM_BINS
-
-GCStat gcstats[GCSTAT_BINS];
-
-#define GCLTFREQ_BINS	NUM_BINS
-
-PRInt32 gcltfreq[GCSTAT_BINS][GCLTFREQ_BINS];
-
-#include <math.h>
-
-static char* 
-pr_GetSizeString(PRUint32 size)
-{
-    char* sizeStr;
-    if (size < 1024)
-	sizeStr = PR_smprintf("<= %ld", size);
-    else if (size < 1024 * 1024)
-	sizeStr = PR_smprintf("<= %ldk", size / 1024);
-    else 
-	sizeStr = PR_smprintf("<= %ldM", size / (1024 * 1024));
-    return sizeStr;
-}
-
-static void
-pr_FreeSizeString(char *sizestr)
-{
-	PR_smprintf_free(sizestr);
-}
-
-
-static void
-pr_PrintGCAllocStats(FILE* out)
-{
-    PRInt32 i, j;
-    _PR_DebugPrint(out, "\n--Allocation-Stats-----------------------------------------------------------");
-    _PR_DebugPrint(out, "\n--Obj-Size----Count-----Avg-Alloc-Time-----------Avg-Lifetime---------%%Freed-\n");
-    for (i = 0; i < GCSTAT_BINS; i++) {
-	GCStat stat = gcstats[i];
-	double allocTimeMean = 0.0, allocTimeVariance = 0.0, lifetimeMean = 0.0, lifetimeVariance = 0.0;
-	PRUint32 maxSize = (1 << i);
-	char* sizeStr;
-	if (stat.nallocs != 0.0) {
-	    allocTimeMean = stat.allocTime / stat.nallocs;
-	    allocTimeVariance = fabs(stat.allocTimeVariance / stat.nallocs - allocTimeMean * allocTimeMean);
-	}
-	if (stat.nfrees != 0.0) {
-	    lifetimeMean = stat.lifetime / stat.nfrees;
-	    lifetimeVariance = fabs(stat.lifetimeVariance / stat.nfrees - lifetimeMean * lifetimeMean);
-	}
-	sizeStr = pr_GetSizeString(maxSize);
-	_PR_DebugPrint(out, "%10s %8lu %10.3f +- %10.3f %10.3f +- %10.3f (%2ld%%)\n",
-		       sizeStr, stat.nallocs,
-		       allocTimeMean, sqrt(allocTimeVariance),
-		       lifetimeMean, sqrt(lifetimeVariance),
-		       (stat.nallocs ? (stat.nfrees * 100 / stat.nallocs) : 0));
-	pr_FreeSizeString(sizeStr);
-    }
-    _PR_DebugPrint(out, "--Lifetime-Frequency-Counts----------------------------------------------------\n");
-    _PR_DebugPrint(out, "size\\cnt");
-    for (j = 0; j < GCLTFREQ_BINS; j++) {
-	_PR_DebugPrint(out, "\t%lu", j);
-    }
-    _PR_DebugPrint(out, "\n");
-    for (i = 0; i < GCSTAT_BINS; i++) {
-	PRInt32* freqs = gcltfreq[i];
-	_PR_DebugPrint(out, "%lu", (1 << i));
-	for (j = 0; j < GCLTFREQ_BINS; j++) {
-	    _PR_DebugPrint(out, "\t%lu", freqs[j]);
-	}
-	_PR_DebugPrint(out, "\n");
-    }
-    _PR_DebugPrint(out, "-------------------------------------------------------------------------------\n");
-}
-
-PR_PUBLIC_API(void)
-PR_PrintGCAllocStats(void)
-{
-    pr_PrintGCAllocStats(stderr);
-}
-
-#endif /* GC_STATS */
-
-/************************************************************************/
-
-/*
-** Sweep a segment, cleaning up all of the debris. Coallese the debris
-** into GCFreeChunk's which are added to the freelist bins.
-*/
-static PRBool SweepSegment(GCSeg *sp)
-{
-    PRWord h, tix;
-    PRWord *p;
-    PRWord *np;
-    PRWord *limit;
-    GCFreeChunk *cp;
-    PRInt32 bytes, chunkSize, segmentSize, totalFree;
-    CollectorType *ct;
-    PRInt32 bin;
-
-    /*
-    ** Now scan over the segment's memory in memory order, coallescing
-    ** all of the debris into a FreeChunk list.
-    */
-    totalFree = 0;
-    segmentSize = sp->limit - sp->base;
-    p = (PRWord *) sp->base;
-    limit = (PRWord *) sp->limit;
-    PR_ASSERT(segmentSize > 0);
-    while (p < limit) {
-    chunkSize = 0;
-    cp = (GCFreeChunk *) p;
-
-    /* Attempt to coallesce any neighboring free objects */
-    for (;;) {
-        PR_ASSERT(IS_HBIT(sp, p) != 0);
-        h = p[0];
-        bytes = OBJ_BYTES(h);
-        PR_ASSERT(bytes != 0);
-        np = (PRWord *) ((char *)p + bytes);
-        tix = (PRWord)GET_TYPEIX(h);
-        if ((h & MARK_BIT) && (tix != FREE_MEMORY_TYPEIX)) {
-#ifdef DEBUG
-        if (tix != FREE_MEMORY_TYPEIX) {
-            PR_ASSERT(_pr_collectorTypes[tix].flags != 0);
-        }
-#endif
-        p[0] = h & ~(MARK_BIT|FINAL_BIT);
-		_GCTRACE(GC_SWEEP, ("busy 0x%x (%d)", p, bytes));
-		break;
-	    }
-	    _GCTRACE(GC_SWEEP, ("free 0x%x (%d)", p, bytes));
-
-	    /* Found a free object */
-#ifdef GC_STATS
-	    {
-		PRInt32 userSize = bytes - sizeof(GCBlockEnd);
-		GCBlockEnd* end = (GCBlockEnd*)((char*)p + userSize);
-		if (userSize >= 0 && end->check == PR_BLOCK_END) {
-		    PRInt64 now = PR_Now();
-		    double nowd, delta;
-		    PRInt32 freq;
-		    LL_L2D(nowd, now);
-		    delta = nowd - end->allocTime;
-		    gcstats[end->bin].nfrees++;
-		    gcstats[end->bin].lifetime += delta;
-		    gcstats[end->bin].lifetimeVariance += delta * delta;
-
-		    InlineBinNumber(freq, delta);
-		    gcltfreq[end->bin][freq]++;
-
-		    end->check = 0;
-		}
-	    }
-#endif
-        CLEAR_HBIT(sp, p);
-        ct = &_pr_collectorTypes[tix];
-        if (0 != ct->gctype.free) {
-                (*ct->gctype.free)(p + 1);
-            }
-        chunkSize = chunkSize + bytes;
-        if (np == limit) {
-        /* Found the end of heap */
-        break;
-        }
-        PR_ASSERT(np < limit);
-        p = np;
-    }
-
-    if (chunkSize) {
-        _GCTRACE(GC_SWEEP, ("free chunk 0x%p to 0x%p (%d)",
-                   cp, (char*)cp + chunkSize - 1, chunkSize));
-        if (chunkSize < MIN_FREE_CHUNK_BYTES) {
-        /* Lost a tiny fragment until (maybe) next time */
-                METER(meter.wastedBytes += chunkSize);
-        p = (PRWord *) cp;
-        chunkSize >>= BYTES_PER_WORD_LOG2;
-        PR_ASSERT(chunkSize != 0);
-        p[0] = MAKE_HEADER(FREE_MEMORY_TYPEIX, chunkSize);
-        SET_HBIT(sp, p);
-        } else {
-                /* See if the chunk constitutes the entire segment */
-                if (chunkSize == segmentSize) {
-                    /* Free up the segment right now */
-            if (sp->info->fromMalloc) {
-                    ShrinkGCHeap(sp);
-                    return PR_TRUE;
-                }
-                }
-
-                /* Put free chunk into the appropriate bin */
-                cp->segment = sp;
-        cp->chunkSize = chunkSize;
-                InlineBinNumber(bin, chunkSize)
-                cp->next = bins[bin];
-                bins[bin] = cp;
-        if (bin < minBin) minBin = bin;
-        if (bin > maxBin) maxBin = bin;
-
-        /* Zero swept memory now */
-        memset(cp+1, 0, chunkSize - sizeof(*cp));
-                METER(meter.numFreeChunks++);
-        totalFree += chunkSize;
-        }
-    }
-
-    /* Advance to next object */
-    p = np;
-    }
-
-    PR_ASSERT(totalFree <= segmentSize);
-
-    _pr_gcData.freeMemory += totalFree;
-    _pr_gcData.busyMemory += (sp->limit - sp->base) - totalFree;
-    return PR_FALSE;
-}
-
-/************************************************************************/
-
-/* This is a list of all the objects that are finalizable. This is not
-   the list of objects that are awaiting finalization because they
-   have been collected. */
-PRCList _pr_finalizeableObjects;
-
-/* This is the list of objects that are awaiting finalization because
-   they have been collected. */
-PRCList _pr_finalQueue;
-
-/* Each object that requires finalization has one of these objects
-   allocated as well. The GCFinal objects are put on the
-   _pr_finalizeableObjects list until the object is collected at which
-   point the GCFinal object is moved to the _pr_finalQueue */
-typedef struct GCFinalStr {
-    PRCList links;
-    PRWord *object;
-} GCFinal;
-
-/* Find pointer to GCFinal struct from the list linkaged embedded in it */
-#define FinalPtr(_qp) \
-    ((GCFinal*) ((char*) (_qp) - offsetof(GCFinal,links)))
-
-static GCFinal *AllocFinalNode(void)
-{
-    return PR_NEWZAP(GCFinal);
-}
-
-static void FreeFinalNode(GCFinal *node)
-{
-    PR_DELETE(node);
-}
-
-/*
-** Prepare for finalization. At this point in the GC cycle we have
-** identified all of the live objects. For each object on the
-** _pr_finalizeableObjects list see if the object is alive or dead. If
-** it's dead, resurrect it and move it from the _pr_finalizeableObjects
-** list to the _pr_finalQueue (object's only get finalized once).
-**
-** Once _pr_finalizeableObjects has been processed we can finish the
-** GC and free up memory and release the threading lock. After that we
-** can invoke the finalization procs for each object that is on the
-** _pr_finalQueue.
-*/
-static void PrepareFinalize(void)
-{
-    PRCList *qp;
-    GCFinal *fp;
-    PRWord h;
-    PRWord *p;
-    void (PR_CALLBACK *livePointer)(void *ptr);
-#ifdef DEBUG
-    CollectorType *ct;
-#endif
-
-    /* This must be done under the same lock that the finalizer uses */
-    PR_ASSERT( GC_IS_LOCKED() );
-
-    /* cache this ptr */
-    livePointer = _pr_gcData.livePointer;
-
-    /*
-     * Pass #1: Identify objects that are to be finalized, set their
-     * FINAL_BIT.
-     */
-    qp = _pr_finalizeableObjects.next;
-    while (qp != &_pr_finalizeableObjects) {
-    fp = FinalPtr(qp);
-    qp = qp->next;
-    h = fp->object[0];        /* Grab header word */
-    if (h & MARK_BIT) {
-        /* Object is already alive */
-        continue;
-    }
-
-#ifdef DEBUG
-    ct = &_pr_collectorTypes[GET_TYPEIX(h)];
-    PR_ASSERT((0 != ct->flags) && (0 != ct->gctype.finalize));
-#endif
-    fp->object[0] |= FINAL_BIT;
-    _GCTRACE(GC_FINAL, ("moving %p (%d) to finalQueue",
-               fp->object, OBJ_BYTES(h)));
-    }
-
-    /*
-     * Pass #2: For each object that is going to be finalized, move it to
-     * the finalization queue and resurrect it
-     */
-    qp = _pr_finalizeableObjects.next;
-    while (qp != &_pr_finalizeableObjects) {
-    fp = FinalPtr(qp);
-    qp = qp->next;
-    h = fp->object[0];        /* Grab header word */
-    if ((h & FINAL_BIT) == 0) {
-        continue;
-    }
-
-    /* Resurrect the object and any objects it refers to */
-        p = &fp->object[1];
-    (*livePointer)(p);
-    PR_REMOVE_LINK(&fp->links);
-    PR_APPEND_LINK(&fp->links, &_pr_finalQueue);
-    }
-}
-
-/*
-** Scan the finalQ, marking each and every object on it live.  This is
-** necessary because we might do a GC before objects that are on the
-** final queue get finalized. Since there are no other references
-** (otherwise they would be on the final queue), we have to scan them.
-** This really only does work if we call the GC before the finalizer
-** has a chance to do its job.
-*/
-extern void PR_CALLBACK _PR_ScanFinalQueue(void *notused)
-{
-#ifdef XP_MAC
-#pragma unused (notused)
-#endif
-    PRCList *qp;
-    GCFinal *fp;
-    PRWord *p;
-    void ( PR_CALLBACK *livePointer)(void *ptr);
-
-    livePointer = _pr_gcData.livePointer;
-    qp = _pr_finalQueue.next;
-    while (qp != &_pr_finalQueue) {
-    fp = FinalPtr(qp);
-	_GCTRACE(GC_FINAL, ("marking 0x%x (on final queue)", fp->object));
-        p = &fp->object[1];
-    (*livePointer)(p);
-    qp = qp->next;
-    }
-}
-
-void PR_CALLBACK FinalizerLoop(void* unused)
-{
-#ifdef XP_MAC
-#pragma unused (unused)
-#endif
-    GCFinal *fp;
-    PRWord *p;
-    PRWord h, tix;
-    CollectorType *ct;
-
-    LOCK_GC();
-    for (;;) {
-	p = 0; h = 0;		/* don't let the gc find these pointers */
-    while (PR_CLIST_IS_EMPTY(&_pr_finalQueue))
-        PR_Wait(_pr_gcData.lock, PR_INTERVAL_NO_TIMEOUT);
-
-    _GCTRACE(GC_FINAL, ("begin finalization"));
-    while (_pr_finalQueue.next != &_pr_finalQueue) {
-        fp = FinalPtr(_pr_finalQueue.next);
-        PR_REMOVE_LINK(&fp->links);
-        p = fp->object;
-
-        h = p[0];        /* Grab header word */
-        tix = (PRWord)GET_TYPEIX(h);
-        ct = &_pr_collectorTypes[tix];
-	    _GCTRACE(GC_FINAL, ("finalize 0x%x (%d)", p, OBJ_BYTES(h)));
-
-        /*
-        ** Give up the GC lock so that other threads can allocate memory
-        ** while this finalization method is running. Get it back
-        ** afterwards so that the list remains thread safe.
-        */
-        UNLOCK_GC();
-        FreeFinalNode(fp);
-        PR_ASSERT(ct->gctype.finalize != 0);
-        (*ct->gctype.finalize)(p + 1);
-        LOCK_GC();
-    }
-    _GCTRACE(GC_FINAL, ("end finalization"));
-    PR_Notify(_pr_gcData.lock);
-    }
-}
-
-static void NotifyFinalizer(void)
-{
-    if (!PR_CLIST_IS_EMPTY(&_pr_finalQueue)) {
-    PR_ASSERT( GC_IS_LOCKED() );
-    PR_Notify(_pr_gcData.lock);
-    }
-}
-
-void _PR_CreateFinalizer(PRThreadScope scope)
-{
-    if (!_pr_gcData.finalizer) {
-    _pr_gcData.finalizer = PR_CreateThreadGCAble(PR_SYSTEM_THREAD,
-                                        FinalizerLoop, 0,
-                                        PR_PRIORITY_LOW, scope,
-                                        PR_UNJOINABLE_THREAD, 0);
-    
-    if (_pr_gcData.finalizer == NULL)
-        /* We are doomed if we can't start the finalizer */
-        PR_Abort();
-
-    }
-}
-
-void pr_FinalizeOnExit(void)
-{
-#ifdef DEBUG_warren
-    OutputDebugString("### Doing finalize-on-exit pass\n");
-#endif
-    PR_ForceFinalize();
-#ifdef DEBUG_warren
-    OutputDebugString("### Finalize-on-exit complete. Dumping object left to memory.out\n");
-    PR_DumpMemorySummary();
-    PR_DumpMemory(PR_TRUE);
-#endif
-}
-
-PR_IMPLEMENT(void) PR_ForceFinalize()
-{
-    LOCK_GC();
-    NotifyFinalizer();
-    while (!PR_CLIST_IS_EMPTY(&_pr_finalQueue)) {
-    PR_ASSERT( GC_IS_LOCKED() );
-    (void) PR_Wait(_pr_gcData.lock, PR_INTERVAL_NO_TIMEOUT);
-    }
-    UNLOCK_GC();
-
-    /* XXX I don't know how to make it wait (yet) */
-}
-
-/************************************************************************/
-
-typedef struct GCWeakStr {
-    PRCList links;
-    PRWord *object;
-} GCWeak;
-
-/*
-** Find pointer to GCWeak struct from the list linkaged embedded in it
-*/
-#define WeakPtr(_qp) \
-    ((GCWeak*) ((char*) (_qp) - offsetof(GCWeak,links)))
-
-PRCList _pr_weakLinks = PR_INIT_STATIC_CLIST(&_pr_weakLinks);
-PRCList _pr_freeWeakLinks = PR_INIT_STATIC_CLIST(&_pr_freeWeakLinks);
-
-#define WEAK_FREELIST_ISEMPTY() (_pr_freeWeakLinks.next == &_pr_freeWeakLinks)
-
-/*
- * Keep objects referred to by weak free list alive until they can be
- * freed
- */
-static void PR_CALLBACK ScanWeakFreeList(void *notused) {
-#ifdef XP_MAC
-#pragma unused (notused)
-#endif
-    PRCList *qp = _pr_freeWeakLinks.next;
-    while (qp != &_pr_freeWeakLinks) {
-    GCWeak *wp = WeakPtr(qp);
-    qp = qp->next;
-    ProcessRootPointer(wp->object);
-    }
-}
-
-/*
- * Empty the list of weak objects. Note that we can't call malloc/free
- * under the cover of the GC's lock (we might deadlock), so transfer the
- * list of free objects to a local list under the cover of the lock, then
- * release the lock and free up the memory.
- */
-static void EmptyWeakFreeList(void) {
-    if (!WEAK_FREELIST_ISEMPTY()) {
-    PRCList *qp, freeLinks;
-
-    PR_INIT_CLIST(&freeLinks);
-
-    /*
-     * Transfer list of free weak links from the global list to a
-     * local list.
-     */
-    LOCK_GC();
-    qp = _pr_freeWeakLinks.next;
-    while (qp != &_pr_freeWeakLinks) {
-        GCWeak *wp = WeakPtr(qp);
-        qp = qp->next;
-        PR_REMOVE_LINK(&wp->links);
-        PR_APPEND_LINK(&wp->links, &freeLinks);
-    }
-    UNLOCK_GC();
-
-    /* Free up storage now */
-    qp = freeLinks.next;
-    while (qp != &freeLinks) {
-        GCWeak *wp = WeakPtr(qp);
-        qp = qp->next;
-        PR_DELETE(wp);
-    }
-    }
-}
-
-/*
- * Allocate a new weak node in the weak objects list
- */
-static GCWeak *AllocWeakNode(void)
-{
-    EmptyWeakFreeList();
-    return PR_NEWZAP(GCWeak);
-}
-
-static void FreeWeakNode(GCWeak *node)
-{
-    PR_DELETE(node);
-}
-
-/*
- * Check the weak links for validity. Note that the list of weak links is
- * itself weak (otherwise we would keep the objects with weak links in
- * them alive forever). As we scan the list check the weak link object
- * itself and if it's not marked then remove it from the weak link list
- */
-static void CheckWeakLinks(void) {
-    PRCList *qp;
-    GCWeak *wp;
-    PRWord *p, h, tix, **weakPtrAddress;
-    CollectorType *ct;
-    PRUint32 offset;
-
-    qp = _pr_weakLinks.next;
-    while (qp != &_pr_weakLinks) {
-    wp = WeakPtr(qp);
-    qp = qp->next;
-    if ((p = wp->object) != 0) {
-        h = p[0];        /* Grab header word */
-        if ((h & MARK_BIT) == 0) {
-        /*
-         * The object that has a weak link is no longer being
-         * referenced; remove it from the chain and let it get
-         * swept away by the GC. Transfer it to the list of
-         * free weak links for later freeing.
-         */
-        PR_REMOVE_LINK(&wp->links);
-        PR_APPEND_LINK(&wp->links, &_pr_freeWeakLinks);
-        collectorCleanupNeeded = 1;
-        continue;
-        }
-        
-	    /* Examine a live object that contains weak links */
-        tix = GET_TYPEIX(h);
-        ct = &_pr_collectorTypes[tix];
-        PR_ASSERT((ct->flags != 0) && (ct->gctype.getWeakLinkOffset != 0));
-        if (0 == ct->gctype.getWeakLinkOffset) {
-        /* Heap is probably corrupted */
-        continue;
-        }
-
-        /* Get offset into the object of where the weak pointer is */
-        offset = (*ct->gctype.getWeakLinkOffset)(p + 1);
-
-        /* Check the weak pointer */
-        weakPtrAddress = (PRWord**)((char*)(p + 1) + offset);
-        p = *weakPtrAddress;
-        if (p != 0) {
-        h = p[-1];    /* Grab header word for pointed to object */
-        if (h & MARK_BIT) {
-            /* Object can't be dead */
-            continue;
-        }
-        /* Break weak link to an object that is about to be swept */
-        *weakPtrAddress = 0;
-        }
-    }
-    }
-}
-
-/************************************************************************/
-
-/*
-** Perform a complete garbage collection
-*/
-
-extern GCLockHook *_pr_GCLockHook;
-
-static void dogc(void)
-{
-    RootFinder *rf;
-    GCLockHook* lhook;
-
-    GCScanQ scanQ;
-    GCSeg *sp, *esp;
-    PRInt64 start, end, diff;
-
-#if defined(GCMETER) || defined(GCTIMINGHOOK)
-    start = PR_Now();
-#endif
-
-    /*
-    ** Stop all of the other threads. This also promises to capture the
-    ** register state of each and every thread
-    */
-
-    /* 
-    ** Get all the locks that will be need during GC after SuspendAll. We 
-    ** cannot make any locking/library calls after SuspendAll.
-    */
-    if (_pr_GCLockHook) {
-        for (lhook = _pr_GCLockHook->next; lhook != _pr_GCLockHook; 
-          lhook = lhook->next) {
-          (*lhook->func)(PR_GCBEGIN, lhook->arg);
-        }
-    }
-
-    PR_SuspendAll();
-
-#ifdef GCMETER
-    /* Reset meter info */
-    if (_pr_gcMeter & _GC_METER_STATS) {
-        fprintf(stderr,
-                "[GCSTATS: busy:%ld skipped:%ld, alloced:%ld+wasted:%ld+free:%ld = total:%ld]\n",
-                (long) _pr_gcData.busyMemory,
-                (long) meter.skippedFreeChunks,
-                (long) meter.allocBytes,
-                (long) meter.wastedBytes,
-                (long) _pr_gcData.freeMemory,
-                (long) _pr_gcData.allocMemory);
-    }        
-    memset(&meter, 0, sizeof(meter));
-#endif
-
-    PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS, ("begin mark phase; busy=%d free=%d total=%d",
-                     _pr_gcData.busyMemory, _pr_gcData.freeMemory,
-                     _pr_gcData.allocMemory));
-
-    if (_pr_beginGCHook) {
-    (*_pr_beginGCHook)(_pr_beginGCHookArg);
-    }
-
-    /*
-    ** Initialize scanQ to all zero's so that root finder doesn't walk
-    ** over it...
-    */
-    memset(&scanQ, 0, sizeof(scanQ));
-    pScanQ = &scanQ;
-
-    /******************************************/
-    /* MARK PHASE */
-
-    EmptyFreelists();
-
-    /* Find root's */
-    PR_LOG(_pr_msgc_lm, PR_LOG_WARNING,
-           ("begin mark phase; busy=%d free=%d total=%d",
-        _pr_gcData.busyMemory, _pr_gcData.freeMemory,
-            _pr_gcData.allocMemory));
-    METER(_pr_scanDepth = 0);
-    rf = _pr_rootFinders;
-    while (rf) {
-    _GCTRACE(GC_ROOTS, ("finding roots in %s", rf->name));
-    (*rf->func)(rf->arg);
-    rf = rf->next;
-    }
-    _GCTRACE(GC_ROOTS, ("done finding roots"));
-
-    /* Scan remaining object's that need scanning */
-    ScanScanQ(&scanQ);
-    PR_ASSERT(pScanQ == &scanQ);
-    PR_ASSERT(scanQ.queued == 0);
-    METER({
-    if (_pr_scanDepth > _pr_maxScanDepth) {
-        _pr_maxScanDepth = _pr_scanDepth;
-    }
-    });
-
-    /******************************************/
-    /* FINALIZATION PHASE */
-
-    METER(_pr_scanDepth = 0);
-    PrepareFinalize();
-
-    /* Scan any resurrected objects found during finalization */
-    ScanScanQ(&scanQ);
-    PR_ASSERT(pScanQ == &scanQ);
-    PR_ASSERT(scanQ.queued == 0);
-    METER({
-    if (_pr_scanDepth > _pr_maxScanDepth) {
-        _pr_maxScanDepth = _pr_scanDepth;
-    }
-    });
-    pScanQ = 0;
-
-    /******************************************/
-    /* SWEEP PHASE */
-
-    /*
-    ** Sweep each segment clean. While we are at it, figure out which
-    ** segment has the most free space and make that the current segment.
-    */
-    CheckWeakLinks();
-    _GCTRACE(GC_SWEEP, ("begin sweep phase"));
-    _pr_gcData.freeMemory = 0;
-    _pr_gcData.busyMemory = 0;
-    sp = segs;
-    esp = sp + nsegs;
-    while (sp < esp) {
-        if (SweepSegment(sp)) {
-            /*
-            ** Segment is now free and has been replaced with a different
-            ** segment object.
-            */
-            esp--;
-            continue;
-        }
-        sp++;
-    }
-
-#if defined(GCMETER) || defined(GCTIMINGHOOK)
-    end = PR_Now();
-#endif
-#ifdef GCMETER
-    LL_SUB(diff, end, start);
-    PR_LOG(GC, PR_LOG_ALWAYS,
-	   ("done; busy=%d free=%d chunks=%d total=%d time=%lldms",
-	    _pr_gcData.busyMemory, _pr_gcData.freeMemory,
-	    meter.numFreeChunks, _pr_gcData.allocMemory, diff));
-    if (_pr_gcMeter & _GC_METER_FREE_LIST) {
-        PRIntn bin;
-        fprintf(stderr, "Freelist bins:\n");
-        for (bin = 0; bin < NUM_BINS; bin++) {
-            GCFreeChunk *cp = bins[bin];
-            while (cp != NULL) {
-                fprintf(stderr, "%3d: %p %8ld\n",
-                        bin, cp, (long) cp->chunkSize);
-                cp = cp->next;
-            }
-        }
-    }
-#endif
-
-    if (_pr_endGCHook) {
-    (*_pr_endGCHook)(_pr_endGCHookArg);
-    }
-
-    /* clear the running total of the bytes allocated via BigAlloc() */
-    bigAllocBytes = 0;
-
-    /* And resume multi-threading */
-    PR_ResumeAll();
-
-    if (_pr_GCLockHook) {
-        for (lhook = _pr_GCLockHook->prev; lhook != _pr_GCLockHook; 
-          lhook = lhook->prev) {
-          (*lhook->func)(PR_GCEND, lhook->arg);
-        }
-    }
-
-    /* Kick finalizer */
-    NotifyFinalizer();
-#ifdef GCTIMINGHOOK
-    if (_pr_gcData.gcTimingHook) {
-	PRInt32 time;
-	LL_SUB(diff, end, start);
-	LL_L2I(time, diff);
-	_pr_gcData.gcTimingHook(time);
-    }
-#endif
-}
-
-PR_IMPLEMENT(void) PR_GC(void)
-{
-    LOCK_GC();
-    dogc();
-    UNLOCK_GC();
-
-    EmptyWeakFreeList();
-}
-
-/*******************************************************************************
- * Heap Walker
- ******************************************************************************/
-
-/*
-** This is yet another disgusting copy of the body of ProcessRootPointer
-** (the other being ProcessRootBlock), but we're not leveraging a single
-** function in their cases in interest of performance (avoiding the function
-** call).
-*/
-static PRInt32 PR_CALLBACK
-pr_ConservativeWalkPointer(void* ptr, PRWalkFun walkRootPointer, void* data)
-{
-  PRWord *p0, *p, *segBase;
-  GCSeg* sp;
-
-  p0 = (PRWord*) ptr;
-
-  /*
-  ** XXX:  
-  ** Until Win16 maintains lowSeg and highSeg correctly,
-  ** (ie. lowSeg=MIN(all segs) and highSeg = MAX(all segs))
-  ** Allways scan through the segment list
-  */
-#if !defined(WIN16)
-  if (p0 < _pr_gcData.lowSeg) return 0;                  /* below gc heap */
-  if (p0 >= _pr_gcData.highSeg) return 0;                /* above gc heap */
-#endif
-
-  /* NOTE: inline expansion of InHeap */
-  /* Find segment */
-  sp = lastInHeap;
-  if (!sp || !IN_SEGMENT(sp,p0)) {
-    GCSeg *esp;
-    sp = segs;
-    esp = segs + nsegs;
-    for (; sp < esp; sp++) {
-      if (IN_SEGMENT(sp, p0)) {
-	lastInHeap = sp;
-	goto find_object;
-      }
-    }
-    return 0;
-  }
-
-  find_object:
-    /* NOTE: Inline expansion of FindObject */
-    /* Align p to it's proper boundary before we start fiddling with it */
-    p = (PRWord*) ((PRWord)p0 & ~(BYTES_PER_WORD-1L));
-    segBase = (PRWord *) sp->base;
-    do {
-        if (IS_HBIT(sp, p)) {
-            goto winner;
-        }
-        p--;
-    } while (p >= segBase);
-
-    /*
-    ** We have a pointer into the heap, but it has no header
-    ** bit. This means that somehow the very first object in the heap
-    ** doesn't have a header. This is impossible so when debugging
-    ** lets abort.
-    */
-#ifdef DEBUG
-    PR_Abort();
-#endif
-    return 0;
-
- winner:
-    return walkRootPointer(p, data);
-}
-
-static PRInt32 PR_CALLBACK
-pr_ConservativeWalkBlock(void **base, PRInt32 count,
-			 PRWalkFun walkRootPointer, void* data)
-{
-    PRWord *p0;
-    while (--count >= 0) {
-	PRInt32 status;
-        p0 = (PRWord*) *base++;
-	status = pr_ConservativeWalkPointer(p0, walkRootPointer, data);
-	if (status) return status;
-    }
-    return 0;
-}
-
-/******************************************************************************/
-
-typedef void (*WalkObject_t)(FILE *out, GCType* tp, PRWord *obj,
-			     size_t bytes, PRBool detailed);
-typedef void (*WalkUnknown_t)(FILE *out, GCType* tp, PRWord tix, PRWord *p,
-			      size_t bytes, PRBool detailed);
-typedef void (*WalkFree_t)(FILE *out, PRWord *p, size_t size, PRBool detailed);
-typedef void (*WalkSegment_t)(FILE *out, GCSeg* sp, PRBool detailed);
-
-static void
-pr_WalkSegment(FILE* out, GCSeg* sp, PRBool detailed,
-           char* enterMsg, char* exitMsg,
-           WalkObject_t walkObject, WalkUnknown_t walkUnknown, WalkFree_t walkFree)
-{
-    PRWord *p, *limit;
-
-    p = (PRWord *) sp->base;
-    limit = (PRWord *) sp->limit;
-    if (enterMsg)
-    fprintf(out, enterMsg, p);
-    while (p < limit)
-    {
-    if (IS_HBIT(sp, p)) /* Is this an object header? */
-    {
-        PRWord h = p[0];
-        PRWord tix = GET_TYPEIX(h);
-        size_t bytes = OBJ_BYTES(h);
-        PRWord* np = (PRWord*) ((char*)p + bytes);
-
-        GCType* tp = &_pr_collectorTypes[tix].gctype;
-        if ((0 != tp) && walkObject)
-        walkObject(out, tp, p, bytes, detailed);
-        else if (walkUnknown)
-        walkUnknown(out, tp, tix, p, bytes, detailed);
-        p = np;
-    }
-    else
-    {
-        /* Must be a freelist item */
-        size_t size = ((GCFreeChunk*)p)->chunkSize;
-        if (walkFree)
-        walkFree(out, p, size, detailed);
-        p = (PRWord*)((char*)p + size);
-    }
-    }
-    if (p != limit)
-    fprintf(out, "SEGMENT OVERRUN (end should be at 0x%p)\n", limit);
-    if (exitMsg)
-    fprintf(out, exitMsg, p);
-}
-
-static void
-pr_WalkSegments(FILE *out, WalkSegment_t walkSegment, PRBool detailed)
-{
-    GCSeg *sp = segs;
-    GCSeg *esp;
-
-    LOCK_GC();
-    esp = sp + nsegs;
-    while (sp < esp)
-    {
-    walkSegment(out, sp, detailed);
-    sp++;
-    }
-    fprintf(out, "End of heap\n");
-    UNLOCK_GC();
-}
-
-/*******************************************************************************
- * Heap Dumper
- ******************************************************************************/
-
-PR_IMPLEMENT(void)
-PR_DumpIndent(FILE *out, int indent)
-{
-    while (--indent >= 0)
-    fprintf(out, " ");
-}
-
-static void
-PR_DumpHexWords(FILE *out, PRWord *p, int nWords,
-        int indent, int nWordsPerLine)
-{
-    while (nWords > 0)
-    {
-    int i;
-
-    PR_DumpIndent(out, indent);
-    i = nWordsPerLine;
-    if (i > nWords)
-        i = nWords;
-    nWords -= i;
-    while (i--)
-    {
-        fprintf(out, "0x%.8lX", (long) *p++);
-        if (i)
-        fputc(' ', out);
-    }
-    fputc('\n', out);
-    }
-}
-
-static void PR_CALLBACK
-pr_DumpObject(FILE *out, GCType* tp, PRWord *p, 
-          size_t bytes, PRBool detailed)
-{
-    char kindChar = tp->kindChar;
-    fprintf(out, "0x%p: 0x%.6lX %c  ",
-            p, (long) bytes, kindChar ? kindChar : '?');
-    if (tp->dump)
-    (*tp->dump)(out, (void*) (p + 1), detailed, 0);
-    if (detailed)
-    PR_DumpHexWords(out, p, bytes>>2, 22, 4);
-}
-    
-static void PR_CALLBACK
-pr_DumpUnknown(FILE *out, GCType* tp, PRWord tix, PRWord *p, 
-           size_t bytes, PRBool detailed)
-{
-    char kindChar = tp->kindChar;
-    fprintf(out, "0x%p: 0x%.6lX %c  ",
-            p, (long) bytes, kindChar ? kindChar : '?');
-    fprintf(out, "UNKNOWN KIND %ld\n", (long) tix);
-    if (detailed)
-    PR_DumpHexWords(out, p, bytes>>2, 22, 4);
-}
-
-static void PR_CALLBACK
-pr_DumpFree(FILE *out, PRWord *p, size_t size, PRBool detailed)
-{
-#if defined(XP_MAC) && XP_MAC
-# pragma unused( detailed )
-#endif
-
-    fprintf(out, "0x%p: 0x%.6lX -  FREE\n", p, (long) size);
-}
-
-static void PR_CALLBACK
-pr_DumpSegment(FILE* out, GCSeg* sp, PRBool detailed)
-{
-    pr_WalkSegment(out, sp, detailed,
-           "\n   Address: Length\n0x%p: Beginning of segment\n",
-           "0x%p: End of segment\n\n",
-           pr_DumpObject, pr_DumpUnknown, pr_DumpFree);
-}
-
-static void pr_DumpRoots(FILE *out);
-
-/*
-** Dump out the GC heap.
-*/
-PR_IMPLEMENT(void)
-PR_DumpGCHeap(FILE *out, PRBool detailed)
-{
-    fprintf(out, "\n"
-        "The kinds are:\n"
-        " U unscanned block\n"
-        " W weak link block\n"
-        " S scanned block\n"
-        " F scanned and final block\n"
-        " C class record\n"
-        " X context record\n"
-        " - free list item\n"
-        " ? other\n");
-    LOCK_GC();
-    pr_WalkSegments(out, pr_DumpSegment, detailed);
-    if (detailed)
-    pr_DumpRoots(out);
-    UNLOCK_GC();
-}
-
-PR_IMPLEMENT(void)
-PR_DumpMemory(PRBool detailed)
-{
-    PR_DumpToFile("memory.out", "Dumping memory", PR_DumpGCHeap, detailed);
-}
-
-/******************************************************************************/
-
-static PRInt32 PR_CALLBACK
-pr_DumpRootPointer(PRWord* p, void* data)
-{
-#ifdef XP_MAC
-#pragma unused(data)
-#endif
-    PRWord h = p[0];
-    PRWord tix = GET_TYPEIX(h);
-      size_t bytes = OBJ_BYTES(h);
-      
-      GCType* tp = &_pr_collectorTypes[tix].gctype;
-      if (0 != tp)
-      pr_DumpObject(_pr_gcData.dumpOutput, tp, p, bytes, PR_FALSE);
-      else
-      pr_DumpUnknown(_pr_gcData.dumpOutput, tp, tix, p, bytes, PR_FALSE);
-    return 0;
-}
-
-static void PR_CALLBACK
-pr_ConservativeDumpRootPointer(void* ptr)
-{
-    (void)pr_ConservativeWalkPointer(ptr, (PRWalkFun) pr_DumpRootPointer, NULL);
-}
-
-static void PR_CALLBACK
-pr_ConservativeDumpRootBlock(void **base, PRInt32 count)
-{
-    (void)pr_ConservativeWalkBlock(base, count, (PRWalkFun) pr_DumpRootPointer, NULL);
-}
-
-extern int
-DumpThreadRoots(PRThread *t, int i, void *notused);
-
-static void
-pr_DumpRoots(FILE *out)
-{
-    RootFinder *rf;
-    void (*liveBlock)(void **base, PRInt32 count);
-    void (*livePointer)(void *ptr);
-    void (*processRootBlock)(void **base, PRInt32 count);
-    void (*processRootPointer)(void *ptr);
-
-    LOCK_GC();
-
-    liveBlock = _pr_gcData.liveBlock;
-    livePointer = _pr_gcData.livePointer;
-    processRootBlock = _pr_gcData.processRootBlock;
-    processRootPointer = _pr_gcData.processRootPointer;
-    
-    _pr_gcData.liveBlock = pr_ConservativeDumpRootBlock;
-    _pr_gcData.livePointer = pr_ConservativeDumpRootPointer;
-    _pr_gcData.processRootBlock = pr_ConservativeDumpRootBlock;
-    _pr_gcData.processRootPointer = pr_ConservativeDumpRootPointer;
-    _pr_gcData.dumpOutput = out;
-
-    rf = _pr_rootFinders;
-    while (rf) {
-    fprintf(out, "\n===== Roots for %s\n", rf->name);
-    (*rf->func)(rf->arg);
-    rf = rf->next;
-    }
-
-    _pr_gcData.liveBlock = liveBlock;
-    _pr_gcData.livePointer = livePointer;
-    _pr_gcData.processRootBlock = processRootBlock;
-    _pr_gcData.processRootPointer = processRootPointer;
-    _pr_gcData.dumpOutput = NULL;
-
-    UNLOCK_GC();
-}
-
-/*******************************************************************************
- * Heap Summary Dumper
- ******************************************************************************/
-
-PRSummaryPrinter summaryPrinter = NULL;
-void* summaryPrinterClosure = NULL;
-
-PR_IMPLEMENT(void) 
-PR_RegisterSummaryPrinter(PRSummaryPrinter fun, void* closure)
-{
-    summaryPrinter = fun;
-    summaryPrinterClosure = closure;
-}
-
-static void PR_CALLBACK
-pr_SummarizeObject(FILE *out, GCType* tp, PRWord *p,
-           size_t bytes, PRBool detailed)
-{
-#if defined(XP_MAC) && XP_MAC
-# pragma unused( out, detailed )
-#endif
-
-    if (tp->summarize)
-    (*tp->summarize)((void GCPTR*)(p + 1), bytes);
-}
-
-static void PR_CALLBACK
-pr_DumpSummary(FILE* out, GCSeg* sp, PRBool detailed)
-{
-    pr_WalkSegment(out, sp, detailed, NULL, NULL,
-           pr_SummarizeObject, NULL, NULL);
-}
-
-PR_IMPLEMENT(void)
-PR_DumpGCSummary(FILE *out, PRBool detailed)
-{
-    if (summaryPrinter) {
-    pr_WalkSegments(out, pr_DumpSummary, detailed);
-    summaryPrinter(out, summaryPrinterClosure);
-    }
-#if 0
-    fprintf(out, "\nFinalizable objects:\n");
-    {
-    PRCList *qp;
-    qp = _pr_pendingFinalQueue.next;
-    while (qp != &_pr_pendingFinalQueue) {
-        GCFinal* fp = FinalPtr(qp);
-        PRWord h = fp->object[0];        /* Grab header word */
-        PRWord tix = GET_TYPEIX(h);
-        GCType* tp = _pr_gcTypes[tix];
-        size_t bytes = OBJ_BYTES(h);
-        pr_DumpObject(out, tp, fp->object, bytes, PR_FALSE);
-        qp = qp->next;
-    }
-    }
-#endif
-}
-
-PR_IMPLEMENT(void)
-PR_DumpMemorySummary(void)
-{
-    PR_DumpToFile("memory.out", "Memory Summary", PR_DumpGCSummary, PR_FALSE);
-}
-
-/*******************************************************************************
- * End Of Heap Walker 
- ******************************************************************************/
-
-#ifdef GC_TRACEROOTS
-
-PRInt32 pr_traceGen = 0;
-
-static PRBool
-pr_IsMarked(PRWord* p)
-{
-    GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-    PR_ASSERT(end->check == PR_BLOCK_END);
-    return end->traceGeneration == pr_traceGen;
-}
-
-static void
-pr_Mark(PRWord* p)
-{
-    GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-    PR_ASSERT(end->check == PR_BLOCK_END);
-    end->traceGeneration = pr_traceGen;
-}
-
-PRWord* pr_traceObj;	/* set this in the debugger, then execute PR_TraceRoot() */
-
-static PRInt32 PR_CALLBACK
-pr_TraceRootObject(void* obj, void* data);
-
-static PRInt32 PR_CALLBACK
-pr_TraceRootPointer(PRWord *p, void* data)
-{
-    PRInt32 printTrace = 0;
-    PRWord h = p[0];
-    PRWord tix = GET_TYPEIX(h);
-    GCType* tp = &_pr_collectorTypes[tix].gctype;
-    FILE* out = _pr_gcData.dumpOutput;
-
-    PR_ASSERT(tp);
-    if (pr_IsMarked(p))
-	return printTrace;
-
-    pr_Mark(p);
-    if (p == pr_traceObj) {
-	fprintf(out, "\n### Found path to:\n");
-	printTrace = 1;
-    }
-    else {
-	if (PR_StackSpaceLeft(PR_GetCurrentThread()) < 512) {
-	    fprintf(out, "\n### Path too deep (giving up):\n");
-	    printTrace = 1;
-	}
-	else if (tp->walk) {
-	    printTrace = tp->walk((void*)(p + 1), pr_TraceRootObject, data);
-	}
-	/* else there's no way to walk this object, so we
-	   haven't found what we're looking for */
-    }
-
-    if (printTrace == 1) {
-	PR_ASSERT(tp->dump);
-	fprintf(out, "0x%p: ", p);
-	tp->dump(out, (void*)(p + 1), PR_FALSE, 1);
-    }
-    return printTrace;
-}
-
-static PRInt32 PR_CALLBACK
-pr_TraceRootObject(void* obj, void* data)
-{
-    /* This version of pr_TraceRootPointer takes object
-       pointers, instead of gc header pointers. */
-    return pr_TraceRootPointer((PRWord*)obj - 1, data);
-}
-
-static void PR_CALLBACK
-pr_ConservativeTraceRootPointer(PRWord *p)
-{
-    PRInt32 status;
-    ++pr_traceGen;
-    status = pr_ConservativeWalkPointer(p, pr_TraceRootPointer, NULL);
-    if (status) {
-	FILE* out = _pr_gcData.dumpOutput;
-	fprintf(out, "### from root at 0x%p\n\n", p);
-    }
-}
-
-static void PR_CALLBACK
-pr_ConservativeTraceRootBlock(void **base, PRInt32 count)
-{
-    PRInt32 status;
-    ++pr_traceGen;
-    status = pr_ConservativeWalkBlock(base, count, pr_TraceRootPointer, NULL);
-    if (status) {
-	FILE* out = _pr_gcData.dumpOutput;
-	fprintf(out, "### from root in range 0x%p + 0x%lx\n\n",
-                base, (long) count);
-    }
-}
-
-static void
-PR_TraceRoot1(FILE* out, PRBool detailed)
-{
-    RootFinder *rf;
-    void (*liveBlock)(void **base, PRInt32 count);
-    void (*livePointer)(void *ptr);
-    void (*processRootBlock)(void **base, PRInt32 count);
-    void (*processRootPointer)(void *ptr);
-
-    LOCK_GC();
-
-    liveBlock = _pr_gcData.liveBlock;
-    livePointer = _pr_gcData.livePointer;
-    processRootBlock = _pr_gcData.processRootBlock;
-    processRootPointer = _pr_gcData.processRootPointer;
-    
-    _pr_gcData.liveBlock = pr_ConservativeTraceRootBlock;
-    _pr_gcData.livePointer = pr_ConservativeTraceRootPointer;
-    _pr_gcData.processRootBlock = pr_ConservativeTraceRootBlock;
-    _pr_gcData.processRootPointer = pr_ConservativeTraceRootPointer;
-    _pr_gcData.dumpOutput = out;
-
-    fprintf(out, "### Looking for paths to 0x%p\n\n", pr_traceObj);
-
-    rf = _pr_rootFinders;
-    while (rf) {
-	fprintf(out, "\n===== Roots for %s\n", rf->name);
-	(*rf->func)(rf->arg);
-	rf = rf->next;
-    }
-
-    _pr_gcData.liveBlock = liveBlock;
-    _pr_gcData.livePointer = livePointer;
-    _pr_gcData.processRootBlock = processRootBlock;
-    _pr_gcData.processRootPointer = processRootPointer;
-    _pr_gcData.dumpOutput = NULL;
-
-    UNLOCK_GC();
-}
-
-PR_PUBLIC_API(void)
-PR_TraceRoot()
-{
-    /*
-    ** How this works: 
-    ** Once you find the object you want to trace the roots of, set the
-    ** global variable pr_traceObj to point to it (the header, not the
-    ** java handle), and then call this routine (on Windows, you can set
-    ** a breakpoint at the end of a function that returns void (e.g. dogc)
-    ** and then do a "set next statement" to point to this routine and go.
-    ** This will dump a list of the paths from the roots to the object in
-    ** question to your memory.out file.
-    */
-    PR_DumpToFile("memory.out", "Tracing Roots", PR_TraceRoot1, PR_FALSE);
-}
-
-#endif /* GC_TRACEROOTS */
-
-/******************************************************************************/
-
-#if defined(DEBUG) && defined(WIN32)
-static void DumpApplicationHeap(FILE *out, HANDLE heap)
-{
-    PROCESS_HEAP_ENTRY entry;
-    DWORD err;
-
-    if (!HeapLock(heap))
-    OutputDebugString("Can't lock the heap.\n");
-    entry.lpData = 0;
-    fprintf(out, "   address:       size ovhd region\n");
-    while (HeapWalk(heap, &entry))
-    {
-    WORD flags = entry.wFlags;
-
-    fprintf(out, "0x%.8X: 0x%.8X 0x%.2X 0x%.2X  ", entry.lpData, entry.cbData,
-        entry.cbOverhead, entry.iRegionIndex);
-    if (flags & PROCESS_HEAP_REGION)
-        fprintf(out, "REGION  committedSize=0x%.8X uncommittedSize=0x%.8X firstBlock=0x%.8X lastBlock=0x%.8X",
-            entry.Region.dwCommittedSize, entry.Region.dwUnCommittedSize,
-            entry.Region.lpFirstBlock, entry.Region.lpLastBlock);
-    else if (flags & PROCESS_HEAP_UNCOMMITTED_RANGE)
-        fprintf(out, "UNCOMMITTED");
-    else if (flags & PROCESS_HEAP_ENTRY_BUSY)
-    {
-        if (flags & PROCESS_HEAP_ENTRY_DDESHARE)
-        fprintf(out, "DDEShare ");
-        if (flags & PROCESS_HEAP_ENTRY_MOVEABLE)
-        fprintf(out, "Moveable Block  handle=0x%.8X", entry.Block.hMem);
-        else
-        fprintf(out, "Block");
-    }
-    fprintf(out, "\n");
-    }
-    if ((err = GetLastError()) != ERROR_NO_MORE_ITEMS)
-    fprintf(out, "ERROR %d iterating through the heap\n", err);
-    if (!HeapUnlock(heap))
-    OutputDebugString("Can't unlock the heap.\n");
-}
-#endif
-
-#if defined(DEBUG) && defined(WIN32)
-static void DumpApplicationHeaps(FILE *out)
-{
-    HANDLE mainHeap;
-    HANDLE heaps[100];
-    DWORD nHeaps;
-    PRInt32 i;
-
-    mainHeap = GetProcessHeap();
-    nHeaps = GetProcessHeaps(100, heaps);
-    if (nHeaps > 100)
-    nHeaps = 0;
-    fprintf(out, "%ld heaps:\n", (long) nHeaps);
-    for (i = 0; i<nHeaps; i++)
-    {
-    HANDLE heap = heaps[i];
-
-    fprintf(out, "Heap at 0x%.8lX", (long) heap);
-    if (heap == mainHeap)
-        fprintf(out, " (main)");
-    fprintf(out, ":\n");
-    DumpApplicationHeap(out, heap);
-    fprintf(out, "\n");
-    }
-    fprintf(out, "End of heap dump\n\n");
-}
-#endif
-
-#if defined(DEBUG) && defined(WIN32)
-PR_IMPLEMENT(void) PR_DumpApplicationHeaps(void)
-{
-    FILE *out;
-
-    OutputDebugString("Dumping heaps...");
-    out = fopen("heaps.out", "a");
-    if (!out)
-    OutputDebugString("Can't open \"heaps.out\"\n");
-    else
-    {
-    struct tm *newtime;
-    time_t aclock;
-
-    time(&aclock);
-    newtime = localtime(&aclock);
-    fprintf(out, "Heap dump on %s\n", asctime(newtime));    /* Print current time */
-    DumpApplicationHeaps(out);
-    fprintf(out, "\n\n");
-    fclose(out);
-    }
-    OutputDebugString(" done\n");
-}
-#else
-
-PR_IMPLEMENT(void) PR_DumpApplicationHeaps(void)
-{
-    fprintf(stderr, "Native heap dumping is currently implemented only for Windows32.\n");
-}
-#endif
-
-/************************************************************************/
-
-/*
-** Scan the freelist bins looking for a big enough chunk of memory to
-** hold "bytes" worth of allocation. "bytes" already has the
-** per-allocation header added to it. Return a pointer to the object with
-** its per-allocation header already prepared.
-*/
-static PRWord *BinAlloc(int cbix, PRInt32 bytes, int dub)
-{
-    GCFreeChunk **cpp, *cp, *cpNext;
-    GCSeg *sp;
-    PRInt32 chunkSize, remainder;
-    PRWord *p, *np;
-    PRInt32 bin, newbin;
-
-    /* Compute bin that allocation belongs in */
-    InlineBinNumber(bin,bytes)
-    if (bin < minBin) {
-    bin = minBin;    /* Start at first filled bin */
-    }
-
-    /* Search in the bin, and larger bins, for a big enough piece */
-    for (; bin <= NUM_BINS-1; bin++) {
-        cpp = &bins[bin];
-    while ((cp = *cpp) != 0) {
-        chunkSize = cp->chunkSize;
-        if (chunkSize < bytes) {
-        /* Too small; skip it */
-            METER(meter.skippedFreeChunks++);
-        cpp = &cp->next;
-        continue;
-        }
-
-        /* We have found a hunk of memory large enough to use */
-        p = (PRWord*) cp;
-        sp = cp->segment;
-        cpNext = cp->next;
-#ifndef IS_64
-        if (dub && (((PRWord)p & (PR_BYTES_PER_DWORD-1)) == 0)) {
-        /*
-         * We are double aligning the memory and the current free
-         * chunk is aligned on an even boundary. Because header
-         * words are one word long we need to discard the first
-         * word of memory.
-         */
-        p[0] = MAKE_HEADER(FREE_MEMORY_TYPEIX, 1);
-        SET_HBIT(sp, p);
-        p++;
-        chunkSize -= PR_BYTES_PER_WORD;
-        bytes -= PR_BYTES_PER_WORD;
-        PR_ASSERT(((PRWord)p & (PR_BYTES_PER_DWORD-1)) != 0);
-        _pr_gcData.freeMemory -= PR_BYTES_PER_WORD;
-        _pr_gcData.busyMemory += PR_BYTES_PER_WORD;
-        }
-#endif
-        np = (PRWord*) ((char*) p + bytes);
-        remainder = chunkSize - bytes;
-        if (remainder >= MIN_FREE_CHUNK_BYTES) {
-        /* The left over memory is large enough to be freed. */
-        cp = (GCFreeChunk*) np;
-        cp->segment = sp;
-        cp->chunkSize = remainder;
-        InlineBinNumber(newbin, remainder)
-        if (newbin != bin) {
-            *cpp = (GCFreeChunk*) cpNext; /* remove */
-            cp->next = bins[newbin];      /* insert */
-            bins[newbin] = cp;
-            if (newbin < minBin) minBin = newbin;
-            if (newbin > maxBin) maxBin = newbin;
-        } else {
-            /* Leave it on the same list */
-            cp->next = cpNext;
-            *cpp = (GCFreeChunk*) np;
-        }
-        } else {
-        /*
-         * The left over memory is too small to be released. Just
-         * leave it attached to the chunk of memory being
-         * returned.
-         */
-        *cpp = cpNext;
-        bytes = chunkSize;
-        }
-        p[0] = MAKE_HEADER(cbix, (bytes >> PR_BYTES_PER_WORD_LOG2));
-        SET_HBIT(sp, p);
-        _pr_gcData.freeMemory -= bytes;
-        _pr_gcData.busyMemory += bytes;
-        return p;
-    }
-    }
-    return 0;
-}
-
-/*
-** Allocate a piece of memory that is "big" in it's own segment.  Make
-** the object consume the entire segment to avoid fragmentation.  When
-** the object is no longer referenced, the segment is freed.
-*/
-static PRWord *BigAlloc(int cbix, PRInt32 bytes, int dub)
-{
-    GCSeg *sp;
-    PRWord *p, h;
-    PRInt32 chunkSize;
-
-    /*
-    ** If the number of bytes allocated via BigAlloc() since the last GC
-    ** exceeds BIG_ALLOC_GC_SIZE then do a GC Now...
-    */
-    if (bigAllocBytes >= BIG_ALLOC_GC_SIZE) {
-        dogc();
-    }
-    bigAllocBytes += bytes;
-
-    /* Get a segment to hold this allocation */
-    sp = GrowHeapExactly(bytes);
-
-    if (sp) {
-        p = (PRWord*) sp->base;
-        chunkSize = sp->limit - sp->base;
-
-        /* All memory is double aligned on 64 bit machines... */
-#ifndef IS_64
-        if (dub && (((PRWord)p & (PR_BYTES_PER_DWORD-1)) == 0)) {
-            /*
-            ** Consume the first word of the chunk with a dummy
-            ** unreferenced object.
-            */
-            p[0] = MAKE_HEADER(FREE_MEMORY_TYPEIX, 1);
-            SET_HBIT(sp, p);
-            p++;
-            chunkSize -= PR_BYTES_PER_WORD;
-            _pr_gcData.freeMemory -= PR_BYTES_PER_WORD;
-            _pr_gcData.busyMemory += PR_BYTES_PER_WORD;
-            PR_ASSERT(((PRWord)p & (PR_BYTES_PER_DWORD-1)) != 0);
-        }
-#endif
-
-#if defined(WIN16)
-            /* All memory MUST be aligned on 32bit boundaries */
-            PR_ASSERT( (((PRWord)p) & (PR_BYTES_PER_WORD-1)) == 0 );
-#endif
-
-        /* Consume the *entire* segment with a single allocation */
-        h = MAKE_HEADER(cbix, (chunkSize >> PR_BYTES_PER_WORD_LOG2));
-        p[0] = h;
-        SET_HBIT(sp, p);
-        _pr_gcData.freeMemory -= chunkSize;
-        _pr_gcData.busyMemory += chunkSize;
-    return p;
-    }
-    return 0;
-}
-
-/* we disable gc allocation during low memory conditions */
-static PRBool allocationEnabled = PR_TRUE;
-
-PR_IMPLEMENT(void) PR_EnableAllocation(PRBool yesOrNo)
-{
-    allocationEnabled = yesOrNo;
-}
-
-static void CollectorCleanup(void) {
-    while (collectorCleanupNeeded) {
-    LOCK_GC();
-    collectorCleanupNeeded = 0;
-    UNLOCK_GC();
-    if (freeSegs) {
-        FreeSegments();
-    }
-    if (!WEAK_FREELIST_ISEMPTY()) {
-        EmptyWeakFreeList();
-    }
-    }
-}
-
-/******************************************************************************/
-
-#ifdef GC_CHECK
-static PRInt32 allocationCount;
-
-static void EarthShatteringKaBoom(PRInt32 whichOne) {
-    long* p = 0;
-    *p = 0;
-}
-
-/* Check a segment of heap memory. Verify that the object memory
-   hasn't been overwritten (past the end at least) */
-static void CheckSegment(GCSeg* sp) {
-    PRWord h, tix;
-    PRWord *p, *lastp, *np, *limit;
-
-    lastp = p = (PRWord *) sp->base;
-    limit = (PRWord *) sp->limit;
-    while (p < limit) {
-    if (IS_HBIT(sp, p)) {
-	    char *cp, i;
-	    GCBlockEnd* end;
-	    PRWord bytes, requestedBytes;
-
-	    h = p[0];
-	    tix = GET_TYPEIX(h);
-	    bytes = OBJ_BYTES(h);
-	    np = (PRWord *) ((char *)p + bytes);
-	    if (tix != FREE_MEMORY_TYPEIX) {
-                PRInt32 test;	/* msdev get's fooled without this local */
-		/* A live object is here. The last word in the object will
-		   contain the objects requestedSize */
-		end = (GCBlockEnd*)((char*)(p) + bytes - sizeof(GCBlockEnd));
-		test = end->check;
-		if (test != PR_BLOCK_END) {
-		    PR_ASSERT(test == PR_BLOCK_END);
-		}
-		requestedBytes = end->requestedBytes;
-		if (requestedBytes >= bytes) EarthShatteringKaBoom(0);
-		cp = (char*)(p + 1) + requestedBytes;
-		i = (char) 0xff;
-		while (cp < (char*)end) {
-            if (*cp != i) EarthShatteringKaBoom(1);
-            cp++;
-            i--;
-        }
-        }
-        lastp = p;
-        p = np;
-    } else {
-        /* Must be a freelist item */
-        GCFreeChunk *cp = (GCFreeChunk*) p;
-        if ((PRInt32)cp->chunkSize < (PRInt32)sizeof(GCFreeChunk)) {
-            EarthShatteringKaBoom(3);
-        }
-        lastp = p;
-        p = (PRWord*) ((char*)p + cp->chunkSize);
-    }
-    }
-}
-
-static void CheckHeap(void) {
-    GCSeg *sp = segs;
-    GCSeg *esp = sp + nsegs;
-    while (sp < esp) {
-    CheckSegment(sp);
-    sp++;
-    }
-}
-
-#endif /* GC_CHECK */
-
-/******************************************************************************/
-
-#ifdef DEBUG
-long gc_thrash = -1L;
-#endif
-
-/*
-** Allocate memory from the GC Heap. Performs garbage collections if
-** memory gets tight and grows the heap as needed. May return NULL if
-** memory cannot be found.
-*/
-PR_IMPLEMENT(PRWord GCPTR *)PR_AllocMemory(
-    PRWord requestedBytes, PRInt32 tix, PRWord flags)
-{
-    PRWord *p;
-    CollectorType *ct;
-    PRInt32 bytes;
-    GCFinal *final = 0;
-    GCWeak *weak = 0;
-    int dub = flags & PR_ALLOC_DOUBLE;
-    PRInt32 objBytes;
-#ifdef GC_STATS
-    PRInt64 allocTime, ldelta;
-#endif
-
-    if (!allocationEnabled) return NULL;
-
-    PR_ASSERT(requestedBytes >= 0);
-    PR_ASSERT(_pr_collectorTypes[tix].flags != 0);
-
-#ifdef DEBUG
-    if (_pr_do_a_dump) {
-    /*
-    ** Collect, pause for a second (lets finalizer run), and then GC
-    ** again.
-    */
-    PR_GC();
-    PR_Sleep(PR_MicrosecondsToInterval(1000000L));
-    PR_GC();
-    PR_DumpGCHeap(_pr_dump_file, PR_TRUE);
-    _pr_do_a_dump = 0;
-    }
-#endif
-
-#ifdef GC_STATS
-    allocTime = PR_Now();
-#endif
-    bytes = (PRInt32) requestedBytes;
-
-    /*
-    ** Align bytes to a multiple of a PRWord, then add in enough space
-    ** to hold the header word.
-    **
-    ** MSVC 1.52 crashed on the ff. code because of the "complex" shifting :-(
-    */
-#if !defined(WIN16) 
-    /* Check for possible overflow of bytes before performing add */
-    if ((MAX_INT - PR_BYTES_PER_WORD) < bytes ) return NULL;
-    bytes = (bytes + PR_BYTES_PER_WORD - 1) >> PR_BYTES_PER_WORD_LOG2;
-    bytes <<= PR_BYTES_PER_WORD_LOG2;
-    /* Check for possible overflow of bytes before performing add */
-    if ((MAX_INT - sizeof(PRWord)) < bytes ) return NULL;
-    bytes += sizeof(PRWord);
-#else 
-    /* 
-    ** For WIN16 the shifts have been broken out into separate statements
-    ** to prevent the compiler from crashing...
-    */
-    {
-        PRWord shiftVal;
-
-        /* Check for possible overflow of bytes before performing add */
-        if ((MAX_INT - PR_BYTES_PER_WORD) < bytes ) return NULL;
-        bytes += PR_BYTES_PER_WORD - 1L;
-        shiftVal = PR_BYTES_PER_WORD_LOG2;
-        bytes >>= shiftVal;
-        bytes <<= shiftVal;
-        /* Check for possible overflow of bytes before performing add */
-        if ((MAX_INT - sizeof(PRWord)) < bytes ) return NULL;
-        bytes += sizeof(PRWord);
-    }
-#endif
-    /*
-     * Add in an extra word of memory for double-aligned memory. Some
-     * percentage of the time this will waste a word of memory (too
-     * bad). Howver, it makes the allocation logic much simpler and
-     * faster.
-     */
-#ifndef IS_64
-    if (dub) {
-        /* Check for possible overflow of bytes before performing add */
-        if ((MAX_INT - PR_BYTES_PER_WORD) < bytes ) return NULL;
-        bytes += PR_BYTES_PER_WORD;
-    }
-#endif
-
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) {
-        /* Bloat the allocation a bit so that we can lay down
-           a check pattern that we will validate */
-        /* Check for possible overflow of bytes before performing add */
-        if ((MAX_INT - PR_BYTES_PER_WORD * 3) < bytes ) return NULL;
-        bytes += PR_BYTES_PER_WORD * 3;
-    }
-#endif
-
-#if defined(GC_CHECK) || defined(GC_STATS) || defined(GC_TRACEROOTS)
-    if ((MAX_INT - sizeof(GCBlockEnd)) < bytes ) return NULL;
-    bytes += sizeof(GCBlockEnd);
-#endif
-
-    PR_ASSERT( bytes < MAX_ALLOC_SIZE );
-    /*
-    ** Java can ask for objects bigger than MAX_ALLOC_SIZE,
-    ** but it won't get them.
-    */
-    if (bytes >= MAX_ALLOC_SIZE) return NULL;
-
-#ifdef DEBUG
-    if (gc_thrash == -1L ? (gc_thrash = (long)PR_GetEnv("GC_THRASH")):gc_thrash) PR_GC();
-#endif
-
-    ct = &_pr_collectorTypes[tix];
-    if (ct->flags & (_GC_TYPE_FINAL|_GC_TYPE_WEAK)) {
-    if (0 != ct->gctype.finalize) {
-        /*
-        ** Allocate a GCFinal struct for this object in advance. Don't put
-        ** it on the pending list until we have allocated the object
-        */
-        final = AllocFinalNode();
-        if (!final) {
-        /* XXX THIS IS NOT ACCEPTABLE*/
-		PR_ASSERT(0);
-        return 0;
-        }
-    }
-    if (0 != ct->gctype.getWeakLinkOffset) {
-        /*
-        ** Allocate a GCWeak struct for this object in advance. Don't put
-        ** it on the weak links list until we have allocated the object
-        */
-        weak = AllocWeakNode();
-        if (!weak) {
-        /* XXX THIS IS NOT ACCEPTABLE*/
-        if (0 != final) {
-            FreeFinalNode(final);
-        }
-		PR_ASSERT(0);
-        return 0;
-        }
-    }
-    }
-
-    LOCK_GC();
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) CheckHeap();
-    allocationCount++;
-#endif
-
-    /* Check for overflow of maximum size we can handle */
-    if (bytes > MAX_ALLOC) goto lost;
-
-    /* Try default allocation */
-    p = ((bytes >= BIG_ALLOC) && (nsegs < MAX_SEGS)) ?
-        BigAlloc(tix, bytes, dub) : BinAlloc(tix, bytes, dub);
-    if (0 == p) {
-#ifdef GC_STATS
-        LL_SUB(ldelta, PR_Now(), allocTime);
-#endif
-        /* Collect some memory */
-        _GCTRACE(GC_ALLOC, ("force GC: want %d", bytes));
-        dogc();
-        PR_ASSERT( GC_IS_LOCKED() );
-
-        /* After a collection we check and see if we should grow the
-        ** heap. We grow the heap when the amount of memory free is less
-        ** than a certain percentage of the heap size. We don't check to
-        ** see if the grow succeeded because our fallback strategy in
-        ** either case is to try one more time to allocate. */
-        if ((_pr_gcData.allocMemory < _pr_gcData.maxMemory)
-        && ((_pr_gcData.freeMemory <
-            ((_pr_gcData.allocMemory * MIN_FREE_THRESHOLD_AFTER_GC) / 100L))
-        || (_pr_gcData.freeMemory < bytes))) {
-            GrowHeap(PR_MAX(bytes, segmentSize));
-        }
-#ifdef GC_STATS
-        LL_ADD(allocTime, PR_Now(), ldelta);
-#endif
-
-        /* Try again */
-        p = ((bytes >= BIG_ALLOC) && (nsegs < MAX_SEGS)) ?
-            BigAlloc(tix, bytes, dub) : BinAlloc(tix, bytes, dub);
-        if (0 == p) {
-            /* Well that lost big time. Memory must be pretty well fragmented */
-            if (!GrowHeap(PR_MAX(bytes, segmentSize))) goto lost;
-            p = BinAlloc(tix, bytes, dub);
-            if (0 == p) goto lost;
-        }
-    }
-
-    /* Zero out the portion of the object memory that was used by
-       the GCFreeChunk structure (skip the first word because it
-       was already overwritten by the gc header word) */
-    objBytes = OBJ_BYTES(p[0]);
-    if (objBytes > sizeof(PRWord)) p[1] = 0;
-    if (objBytes > sizeof(PRWord)*2) p[2] = 0;
-
-    if (final) {
-	_GCTRACE(GC_ALLOC, ("alloc 0x%x (%d) final=0x%x",
-                p, bytes, final));
-    final->object = p;
-    PR_APPEND_LINK(&final->links, &_pr_finalizeableObjects);
-    } else {
-	_GCTRACE(GC_ALLOC, ("alloc 0x%x (%d)", p, bytes));
-    }
-    if (weak) {
-    weak->object = p;
-    PR_APPEND_LINK(&weak->links, &_pr_weakLinks);
-    }
-    METER(meter.allocBytes += bytes);
-    METER(meter.wastedBytes += (bytes - requestedBytes));
-    UNLOCK_GC();
-
-    if (collectorCleanupNeeded) {
-	CollectorCleanup();
-    }
-
-#if defined(GC_CHECK) || defined(GC_STATS) || defined(GC_TRACEROOTS)
-    {
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-	end->check = PR_BLOCK_END;
-    }
-#endif
-#ifdef GC_STATS
-    {
-	PRInt64 now = PR_Now();
-	double delta;
-	PRInt32 bin;
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-
-	end->allocTime = allocTime;
-	LL_SUB(ldelta, now, allocTime);
-	LL_L2D(delta, ldelta);
-	InlineBinNumber(bin, requestedBytes);
-	end->bin = bin;
-	gcstats[bin].nallocs++;
-	gcstats[bin].allocTime += delta;
-	gcstats[bin].allocTimeVariance += delta * delta;
-    }
-#endif
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) {
-    /* Place a pattern in the memory that was allocated that was not
-       requested. We will check the pattern later. */
-    char* cp = (char*)(p + 1) + requestedBytes;
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-	char i = (char) 0xff;
-	while (cp < (char*)end) {
-	    *cp++ = i--;
-	}
-	end->requestedBytes = requestedBytes;
-	CheckHeap();
-    }
-#endif
-    return p + 1;
-
-  lost:
-    /* Out of memory */
-    UNLOCK_GC();
-    if (final) {
-    FreeFinalNode(final);
-    }
-    if (weak) {
-    FreeWeakNode(weak);
-    }
-    if (collectorCleanupNeeded) {
-    CollectorCleanup();
-    }
-    return 0;
-}
-
-/* Shortcut allocator for objects that do not require finalization or
-   are weak objects */
-PR_IMPLEMENT(PRWord GCPTR *)
-PR_AllocSimpleMemory(PRWord requestedBytes, PRInt32 tix)
-{
-    PRWord *p;
-    PRInt32 bytes;
-    PRInt32 objBytes;
-#ifdef GC_STATS
-    PRInt64 allocTime, ldelta;
-#endif
-
-    if (!allocationEnabled) return NULL;
-
-    PR_ASSERT(requestedBytes >= 0);
-    PR_ASSERT(_pr_collectorTypes[tix].flags != 0);
-
-#ifdef DEBUG
-    if (_pr_do_a_dump) {
-	/*
-	** Collect, pause for a second (lets finalizer run), and then GC
-	** again.
-	*/
-	PR_GC();
-	PR_Sleep(PR_MicrosecondsToInterval(1000000L));
-	PR_GC();
-	PR_DumpGCHeap(_pr_dump_file, PR_TRUE);
-	_pr_do_a_dump = 0;
-    }
-#endif
-
-#ifdef GC_STATS
-    allocTime = PR_NowMS();
-#endif
-    bytes = (PRInt32) requestedBytes;
-
-    /*
-    ** Align bytes to a multiple of a PRWord, then add in enough space
-    ** to hold the header word.
-    **
-    ** MSVC 1.52 crashed on the ff. code because of the "complex" shifting :-(
-    */
-#if !defined(WIN16) 
-    bytes = (bytes + PR_BYTES_PER_WORD - 1) >> PR_BYTES_PER_WORD_LOG2;
-    bytes <<= PR_BYTES_PER_WORD_LOG2;
-    bytes += sizeof(PRWord);
-#else 
-    /* 
-    ** For WIN16 the shifts have been broken out into separate statements
-    ** to prevent the compiler from crashing...
-    */
-    {
-    PRWord shiftVal;
-
-    bytes += PR_BYTES_PER_WORD - 1L;
-    shiftVal = PR_BYTES_PER_WORD_LOG2;
-    bytes >>= shiftVal;
-    bytes <<= shiftVal;
-    bytes += sizeof(PRWord);
-    }
-#endif
-    
-    /*
-     * Add in an extra word of memory for double-aligned memory. Some
-     * percentage of the time this will waste a word of memory (too
-     * bad). Howver, it makes the allocation logic much simpler and
-     * faster.
-     */
-#ifndef IS_64
-    bytes += PR_BYTES_PER_WORD;
-#endif
-
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) {
-    /* Bloat the allocation a bit so that we can lay down
-       a check pattern that we will validate */
-    bytes += PR_BYTES_PER_WORD * 2;
-    }
-#endif
-
-#if defined(GC_CHECK) || defined(GC_STATS) || defined(GC_TRACEROOTS)
-    bytes += sizeof(GCBlockEnd);
-#endif
-
-#if defined(WIN16)
-    PR_ASSERT( bytes < MAX_ALLOC_SIZE );
-#endif
-    /* Java can ask for objects bigger than 4M, but it won't get them */
-    /*
-     * This check was added because there is a fundamental limit of
-     * the size field maintained by the gc code.  Going over the 4M
-     * limit caused some bits to roll over into another bit field,
-     * violating the max segment size and causing a bug.
-     */
-    if (bytes >= MAX_ALLOC_SIZE) {
-        return NULL;
-    }
-#ifdef DEBUG
-    if (gc_thrash == -1L
-	? (gc_thrash = (long)PR_GetEnv("GC_THRASH"))
-	: gc_thrash) {
-	PR_GC();
-    }
-#endif
-
-    LOCK_GC();
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) {
-    CheckHeap();
-    }
-    allocationCount++;
-#endif
-
-    /* Try default allocation */
-    if ((bytes >= BIG_ALLOC) && (nsegs < MAX_SEGS)) {
-    p = BigAlloc(tix, bytes, 1);
-    } else {
-    p = BinAlloc(tix, bytes, 1);
-    }
-    if (0 == p) {
-#ifdef GC_STATS
-      LL_SUB(ldelta, PR_Now(), allocTime);
-#endif
-      /* Collect some memory */
-      _GCTRACE(GC_ALLOC, ("force GC: want %d", bytes));
-      dogc();
-      PR_ASSERT( GC_IS_LOCKED() );
-
-      /* After a collection we check and see if we should grow the
-     heap. We grow the heap when the amount of memory free is less
-     than a certain percentage of the heap size. We don't check to
-     see if the grow succeeded because our fallback strategy in
-     either case is to try one more time to allocate. */
-      if ((_pr_gcData.allocMemory < _pr_gcData.maxMemory) &&
-      (_pr_gcData.freeMemory <
-       ((_pr_gcData.allocMemory * MIN_FREE_THRESHOLD_AFTER_GC) / 100L))) {
-    GrowHeap(PR_MAX(bytes, segmentSize));
-      }
-#ifdef GC_STATS
-      LL_ADD(allocTime, PR_Now(), ldelta);
-#endif
-
-      /* Try one last time */
-      if ((bytes >= BIG_ALLOC) && (nsegs < MAX_SEGS)) {
-    p = BigAlloc(tix, bytes, 1);
-      } else {
-    p = BinAlloc(tix, bytes, 1);
-      }
-      if (0 == p) {
-    /* Well that lost big time. Memory must be pretty well fragmented */
-    if (!GrowHeap(PR_MAX(bytes, segmentSize))) {
-      goto lost;
-    }
-    p = BinAlloc(tix, bytes, 1);
-    if (0 == p) goto lost;
-      }
-    }
-
-    /* Zero out the portion of the object memory that was used by
-       the GCFreeChunk structure (skip the first word because it
-       was already overwritten by the gc header word) */
-    objBytes = OBJ_BYTES(p[0]);
-    if (objBytes > sizeof(PRWord)) p[1] = 0;
-    if (objBytes > sizeof(PRWord)*2) p[2] = 0;
-
-    METER(meter.allocBytes += bytes);
-    METER(meter.wastedBytes += (bytes - requestedBytes));
-    UNLOCK_GC();
-
-    if (collectorCleanupNeeded) {
-	CollectorCleanup();
-    }
-
-#if defined(GC_CHECK) || defined(GC_STATS) || defined(GC_TRACEROOTS)
-    {
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-	end->check = PR_BLOCK_END;
-    }
-#endif
-#ifdef GC_STATS
-    {
-	PRInt64 now = PR_Now();
-	double delta;
-	PRInt32 bin;
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-
-	end->allocTime = allocTime;
-	LL_SUB(ldelta, now, allocTime);
-	LL_L2D(delta, ldelta);
-	InlineBinNumber(bin, requestedBytes);
-	end->bin = bin;
-	gcstats[bin].nallocs++;
-	gcstats[bin].allocTime += delta;
-	gcstats[bin].allocTimeVariance += delta * delta;
-    }
-#endif
-#ifdef GC_CHECK
-    if (_pr_gcData.flags & GC_CHECK) {
-    /* Place a pattern in the memory that was allocated that was not
-       requested. We will check the pattern later. */
-    char* cp = (char*)(p + 1) + requestedBytes;
-	GCBlockEnd* end = (GCBlockEnd*)((char*)p + OBJ_BYTES(p[0]) - sizeof(GCBlockEnd));
-	char i = (char) 0xff;
-	while (cp < (char*)end) {
-	    *cp++ = i--;
-	}
-	end->requestedBytes = requestedBytes;
-	CheckHeap();
-    }
-#endif
-    return p + 1;
-
-  lost:
-    /* Out of memory */
-    UNLOCK_GC();
-    if (collectorCleanupNeeded) {
-    CollectorCleanup();
-    }
-    return 0;
-}
-
-/************************************************************************/
-
-PR_IMPLEMENT(PRWord) PR_GetObjectHeader(void *ptr) {
-    GCSeg *sp;
-    PRWord *h;
-
-    if (ptr == 0) return 0;
-    sp = InHeap(ptr);
-    if (sp == 0) return 0;
-    h = (PRWord*)FindObject(sp, (PRWord*)ptr);
-    return GC_GET_USER_BITS(h[0]);
-}
-
-PR_IMPLEMENT(PRWord) PR_SetObjectHeader(void *ptr, PRWord newUserBits) {
-    GCSeg *sp;
-    PRWord *h, rv;
-
-    if (ptr == 0) return 0;
-    sp = InHeap(ptr);
-    if (sp == 0) return 0;
-    h = (PRWord*)FindObject(sp, (PRWord*)ptr);
-    rv = GC_GET_USER_BITS(h[0]);
-    h[0] = (h[0] & ~GC_USER_BITS) |
-    ((newUserBits << GC_USER_BITS_SHIFT) & GC_USER_BITS);
-    return rv;
-}
-
-PR_IMPLEMENT(void) PR_InitGC(
-    PRWord flags, PRInt32 initialHeapSize, PRInt32 segSize, PRThreadScope scope)
-{
-    static char firstTime = 1;
-
-    if (!firstTime) return;
-    firstTime = 0;
-
-    _pr_msgc_lm = PR_NewLogModule("msgc");
-    _pr_pageShift = PR_GetPageShift();
-    _pr_pageSize = PR_GetPageSize();
-
-#if defined(WIN16)
-    PR_ASSERT( initialHeapSize < MAX_ALLOC_SIZE );
-#endif
-
-  /* Setup initial heap size and initial segment size */
-  if (0 != segSize) segmentSize = segSize;
-#ifdef DEBUG
-    GC = PR_NewLogModule("GC");
-    {
-    char *ev = PR_GetEnv("GC_SEGMENT_SIZE");
-    if (ev && ev[0]) {
-      PRInt32 newSegmentSize = atoi(ev);
-      if (0 != newSegmentSize) segmentSize = newSegmentSize;
-    }
-    ev = PR_GetEnv("GC_INITIAL_HEAP_SIZE");
-    if (ev && ev[0]) {
-      PRInt32 newInitialHeapSize = atoi(ev);
-      if (0 != newInitialHeapSize) initialHeapSize = newInitialHeapSize;
-    }
-    ev = PR_GetEnv("GC_FLAGS");
-    if (ev && ev[0]) {
-        flags |= atoi(ev);
-    }
-#ifdef GCMETER
-        ev = PR_GetEnv("GC_METER");
-        if (ev && ev[0]) {
-            _pr_gcMeter = atoi(ev);
-        }
-#endif
-    }
-#endif
-  if (0 == initialHeapSize) initialHeapSize = segmentSize;
-  if (initialHeapSize < segmentSize) initialHeapSize = segmentSize;
-
-  _pr_gcData.maxMemory   = MAX_SEGS * segmentSize;
-  _pr_gcData.liveBlock  = ProcessRootBlock;
-  _pr_gcData.livePointer = ProcessRootPointer;
-  _pr_gcData.processRootBlock  = ProcessRootBlock;
-  _pr_gcData.processRootPointer = ProcessRootPointer;
-  _pr_gcData.dumpOutput = NULL;
-
-  PR_INIT_CLIST(&_pr_finalizeableObjects);
-    PR_INIT_CLIST(&_pr_finalQueue);
-    _PR_InitGC(flags);
-
-    /* Create finalizer thread */
-    _PR_CreateFinalizer(scope);
-
-  /* Allocate the initial segment for the heap */
-  minBin = 31;
-  maxBin = 0;
-  GrowHeap(initialHeapSize);
-    PR_RegisterRootFinder(ScanWeakFreeList, "scan weak free list", 0);
-}
-
-#if defined(WIN16)
-/*
-** For WIN16 the GC_IN_HEAP() macro must call the private InHeap function.
-** This public wrapper function makes this possible...
-*/
-PR_IMPLEMENT(PRBool)
-PR_GC_In_Heap(void *object)
-{
-    return InHeap( object ) != NULL;    
-}
-#endif
-
-
-/** Added by Vishy for sanity checking a few GC structures **/
-/** Can use SanityCheckGC to debug corrupted GC Heap situations **/
-
-#ifdef DEBUG
-
-static int SegmentOverlaps(int i, int j)
-{
-  return
-    (((segs[i].limit > segs[j].base) && (segs[i].base < segs[j].base)) ||
-     ((segs[j].limit > segs[i].base) && (segs[j].base < segs[i].base)));
-}
-
-static void NoSegmentOverlaps(void)
-{
-  int i,j;
-
-  for (i = 0; i < nsegs; i++)
-    for (j = i+1 ; j < nsegs ; j++)
-      PR_ASSERT(!SegmentOverlaps(i,j));
-}
-
-static void SegInfoCheck(void)
-{
-  int i;
-  for (i = 0 ; i < nsegs ; i++)
-    PR_ASSERT((segs[i].info->hbits) &&
-	      (segs[i].info->hbits == segs[i].hbits) &&
-	      (segs[i].info->base == segs[i].base) &&
-	      (segs[i].info->limit == segs[i].limit));
-}
-
-static void SanityCheckGC()
-{
-  NoSegmentOverlaps();
-  SegInfoCheck();
-}
-
-#endif
-
-#if defined(DEBUG) && defined(WIN32)
-
-extern void *baseaddr;
-extern void *lastaddr;
-
-PR_IMPLEMENT(void)
-PR_PrintGCStats(void)
-{
-    long reportedSegSpace = _pr_gcData.busyMemory + _pr_gcData.freeMemory;
-    char* msg;
-    long largeCount = 0, largeSize = 0;
-    long segCount = 0, segSize = 0;
-    long freeCount = 0, freeSize = 0;
-    GCSeg *sp, *esp;
-    GCSegInfo* si;
-
-    LOCK_GC();
-
-    sp = segs;
-    esp = sp + nsegs;
-    while (sp < esp) {
-    long size = sp->info->limit - sp->info->base;
-    segCount++;
-    segSize += size;
-        if (sp->info->fromMalloc) {
-        largeCount++;
-        largeSize += size;
-    }
-        sp++;
-    }
-
-    si = freeSegs;
-    while (si != NULL) {
-    long size = si->limit - si->base;
-    freeCount++;
-    freeSize += size;
-    si = si->next;
-    }
-    
-    msg = PR_smprintf("\
-# GC Stats:\n\
-#   vm space:\n\
-#     range:      %ld - %ld\n\
-#     size:       %ld\n\
-#   segments:\n\
-#     range:      %ld - %ld\n\
-#     count:      %ld (reported: %ld)\n\
-#     size:       %ld (reported: %ld)\n\
-#     free count: %ld\n\
-#     free size:  %ld\n\
-#     busy objs:  %ld (%ld%%)\n\
-#     free objs:  %ld (%ld%%)\n\
-#   large blocks:\n\
-#     count:      %ld\n\
-#     total size: %ld (%ld%%)\n\
-#     avg size:   %ld\n\
-",
-              /* vm space */
-              (long)baseaddr, (long)lastaddr,
-              (long)lastaddr - (long)baseaddr,
-              /* segments */
-              _pr_gcData.lowSeg, _pr_gcData.highSeg,
-              segCount, nsegs,
-              segSize, reportedSegSpace,
-              freeCount,
-              freeSize,
-              _pr_gcData.busyMemory,
-              (_pr_gcData.busyMemory * 100 / reportedSegSpace),
-              _pr_gcData.freeMemory,
-              (_pr_gcData.freeMemory * 100 / reportedSegSpace),
-              /* large blocks */
-              largeCount,
-              largeSize, (largeSize * 100 / reportedSegSpace),
-              (largeCount ? largeSize / largeCount : 0)
-              );
-    UNLOCK_GC();
-    fprintf(stderr, msg);
-    OutputDebugString(msg);
-    PR_smprintf_free(msg);
-#ifdef GC_STATS
-    PR_PrintGCAllocStats();
-#endif
-}
-#endif
-
-PR_IMPLEMENT(void)
-PR_DumpToFile(char* filename, char* msg, PRFileDumper dump, PRBool detailed)
-{
-    FILE *out;
-    OutputDebugString(msg);
-    out = fopen(filename, "a");
-    if (!out) {
-	char buf[64];
-	PR_ASSERT(strlen(filename) < sizeof(buf) - 16);
-	PR_snprintf(buf, sizeof(buf), "Can't open \"%s\"\n",
-		    filename);
-	OutputDebugString(buf);
-    }
-    else
-    {
-	struct tm *newtime;
-	time_t aclock;
-	int i;
-
-	time(&aclock);
-	newtime = localtime(&aclock);
-	fprintf(out, "%s on %s\n", msg, asctime(newtime));  /* Print current time */
-	dump(out, detailed);
-	fprintf(out, "\n\n");
-	for (i = 0; i < 80; i++)
-	    fprintf(out, "=");
-	fprintf(out, "\n\n");
-	fclose(out);
-    }
-    OutputDebugString(" done\n");
-}
-
diff --git a/libs/js/nsprpub/lib/msgc/src/unixgc.c b/libs/js/nsprpub/lib/msgc/src/unixgc.c
deleted file mode 100644
index cea4225ebe..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/unixgc.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prlock.h"
-#include "prlog.h"
-#include "prmem.h"
-#include "gcint.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#define _PR_GC_VMBASE 0x40000000
-
-#if defined(SOLARIS)
-#define _MD_MMAP_FLAGS MAP_SHARED
-#elif defined(RELIANTUNIX)
-#define _MD_MMAP_FLAGS MAP_PRIVATE|MAP_FIXED
-#else
-#define _MD_MMAP_FLAGS MAP_PRIVATE
-#endif
-
-static PRInt32 zero_fd = -1;
-static PRLock *zero_fd_lock = NULL;
-
-void _MD_InitGC(void)
-{
-#ifdef DEBUG
-    /*
-     * Disable using mmap(2) if NSPR_NO_MMAP is set
-     */
-    if (getenv("NSPR_NO_MMAP")) {
-        zero_fd = -2;
-        return;
-    }
-#endif
-    zero_fd = open("/dev/zero",O_RDWR , 0);
-    zero_fd_lock = PR_NewLock();
-}
-
-/* This static variable is used by _MD_GrowGCHeap and _MD_ExtendGCHeap */
-static void *lastaddr = (void*) _PR_GC_VMBASE;
-
-void *_MD_GrowGCHeap(PRUint32 *sizep)
-{
-	void *addr;
-	PRUint32 size;
-
-	size = *sizep;
-
-	PR_Lock(zero_fd_lock);
-	if (zero_fd < 0) {
-		goto mmap_loses;
-	}
-
-	/* Extend the mapping */
-	addr = mmap(lastaddr, size, PROT_READ|PROT_WRITE|PROT_EXEC,
-	    _MD_MMAP_FLAGS,
-	    zero_fd, 0);
-	if (addr == (void*)-1) {
-		zero_fd = -1;
-		goto mmap_loses;
-	}
-	lastaddr = ((char*)addr + size);
-#ifdef DEBUG
-	PR_LOG(_pr_msgc_lm, PR_LOG_WARNING,
-	    ("GC: heap extends from %08x to %08x\n",
-	    _PR_GC_VMBASE,
-	    _PR_GC_VMBASE + (char*)lastaddr - (char*)_PR_GC_VMBASE));
-#endif
-	PR_Unlock(zero_fd_lock);
-	return addr;
-
-mmap_loses:
-	PR_Unlock(zero_fd_lock);
-	return PR_MALLOC(size);
-}
-
-/* XXX - This is disabled.  MAP_FIXED just does not work. */
-#if 0
-PRBool _MD_ExtendGCHeap(char *base, PRInt32 oldSize, PRInt32 newSize) {
-	PRBool rv = PR_FALSE;
-	void* addr;
-	PRInt32 allocSize = newSize - oldSize;
-
-	PR_Lock(zero_fd_lock);
-	addr = mmap(base + oldSize, allocSize, PROT_READ|PROT_WRITE|PROT_EXEC,
-	    _MD_MMAP_FLAGS | MAP_FIXED, zero_fd, 0);
-	if (addr == (void*)-1) {
-		goto loser;
-	}
-	if (addr != (void*) (base + oldSize)) {
-		munmap(base + oldSize, allocSize);
-		goto loser;
-	}
-	lastaddr = ((char*)base + newSize);
-	PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS,
-	    ("GC: heap now extends from %p to %p",
-	    base, base + newSize));
-	rv = PR_TRUE;
-
-loser:
-	PR_Unlock(zero_fd_lock);
-	return rv;
-}
-#else
-PRBool _MD_ExtendGCHeap(char *base, PRInt32 oldSize, PRInt32 newSize) {
-	return PR_FALSE;
-}
-#endif
-
-void _MD_FreeGCSegment(void *base, PRInt32 len)
-{
-	if (zero_fd < 0) {
-		PR_DELETE(base);
-	} else {
-		(void) munmap(base, len);
-	}
-}
diff --git a/libs/js/nsprpub/lib/msgc/src/win16gc.c b/libs/js/nsprpub/lib/msgc/src/win16gc.c
deleted file mode 100644
index 0af0079b31..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/win16gc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#if defined(WIN16)
-#include <windows.h>
-#endif
-#include "prtypes.h"
-#include <stdlib.h>
-
-#define MAX_SEGMENT_SIZE (65536l - 4096l)
-
-/************************************************************************/
-/*
-** Machine dependent GC Heap management routines:
-**    _MD_GrowGCHeap
-*/
-/************************************************************************/
-
-void _MD_InitGC(void) {}
-
-extern void *
-_MD_GrowGCHeap(PRUint32 *sizep)
-{
-    void *addr;
-
-    if( *sizep > MAX_SEGMENT_SIZE ) {
-        *sizep = MAX_SEGMENT_SIZE;
-    }
-
-    addr = malloc((size_t)*sizep);
-    return addr;
-}
-
-HINSTANCE _pr_hInstance;
-
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg, 
-                      WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-    _pr_hInstance = hInst;
-    return TRUE;
-}
-
-
diff --git a/libs/js/nsprpub/lib/msgc/src/win32gc.c b/libs/js/nsprpub/lib/msgc/src/win32gc.c
deleted file mode 100644
index eec83774eb..0000000000
--- a/libs/js/nsprpub/lib/msgc/src/win32gc.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * GC related routines
- *
- */
-#include <windows.h>
-#include "prlog.h"
-
-extern PRLogModuleInfo* _pr_msgc_lm;
-
-#define GC_VMBASE               0x40000000
-#define GC_VMLIMIT              0x00FFFFFF
-
-/************************************************************************/
-/*
-** Machine dependent GC Heap management routines:
-**    _MD_GrowGCHeap
-*/
-/************************************************************************/
-
-void *baseaddr = (void*) GC_VMBASE;
-void *lastaddr = (void*) GC_VMBASE;
-
-void _MD_InitGC() {}
-
-void *_MD_GrowGCHeap(PRUint32 *sizep)
-{
-    void *addr;
-    size_t size;
-
-    /* Reserve a block of memory for the GC */
-    if( lastaddr == baseaddr ) {
-        addr = VirtualAlloc( (void *)GC_VMBASE, GC_VMLIMIT, MEM_RESERVE, PAGE_READWRITE );
-
-        /* 
-        ** If the GC_VMBASE address is already mapped, then let the OS choose a 
-        ** base address that is available...
-        */
-        if (addr == NULL) {
-            addr = VirtualAlloc( NULL, GC_VMLIMIT, MEM_RESERVE, PAGE_READWRITE );
-
-            baseaddr = lastaddr = addr;
-            if (addr == NULL) {
-                PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS, ("GC: unable to allocate heap: LastError=%ld",
-                       GetLastError()));
-                return 0;
-            }
-        }
-    }
-    size = *sizep;
-
-    /* Extend the mapping */
-    addr = VirtualAlloc( lastaddr, size, MEM_COMMIT, PAGE_READWRITE );
-    if (addr == NULL) {
-        return 0;
-    }
-
-    lastaddr = ((char*)addr + size);
-    PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS,
-	   ("GC: heap extends from %08x to %08x",
-	    baseaddr, (long)baseaddr + (char*)lastaddr - (char*)baseaddr));
-
-    return addr;
-}
-
-PRBool _MD_ExtendGCHeap(char *base, PRInt32 oldSize, PRInt32 newSize) {
-  void* addr;
-
-  addr = VirtualAlloc( base + oldSize, newSize - oldSize,
-		       MEM_COMMIT, PAGE_READWRITE );
-  if (NULL == addr) {
-    PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS, ("GC: unable to extend heap: LastError=%ld",
-		     GetLastError()));
-    return PR_FALSE;
-  }
-  if (base + oldSize != (char*)addr) {
-    PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS, ("GC: segment extension returned %x instead of %x",
-		     addr, base + oldSize));
-    VirtualFree(addr, newSize - oldSize, MEM_DECOMMIT);
-    return PR_FALSE;
-  }
-  lastaddr = base + newSize;
-  PR_LOG(_pr_msgc_lm, PR_LOG_ALWAYS,
-	 ("GC: heap now extends from %p to %p",
-	  base, base + newSize));
-  return PR_TRUE;
-}
-
-
-void _MD_FreeGCSegment(void *base, PRInt32 len)
-{
-     (void)VirtualFree(base, 0, MEM_RELEASE);
-}
diff --git a/libs/js/nsprpub/lib/msgc/tests/.cvsignore b/libs/js/nsprpub/lib/msgc/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/msgc/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/msgc/tests/Makefile.in b/libs/js/nsprpub/lib/msgc/tests/Makefile.in
deleted file mode 100644
index b447f76826..0000000000
--- a/libs/js/nsprpub/lib/msgc/tests/Makefile.in
+++ /dev/null
@@ -1,314 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX)
-endif
-
-ifeq ($(OS_TARGET), OS2)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-endif
-
-CSRCS = gc1.c thrashgc.c
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS) $(OBJS)
-
-INCLUDES = -I$(dist_includedir)
-
-# Setting the variables LDOPTS and LIBPR.  We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(dist_libdir)
-NSPR_VERSION = $(MOD_MAJOR_VERSION)
-GC_VERSION = $(MOD_MAJOR_VERSION)
-LIBPR = -lnspr$(NSPR_VERSION)
-LIBPLC = -lplc$(NSPR_VERSION)
-LIBGC = -lmsgc$(GC_VERSION)
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib
-  LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib
-  LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib
-else
-  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-  LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
-  LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
-  LIBGC= $(dist_libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-  LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
-  LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib
-  LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib
-  LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib
-else
-  LDOPTS += -Zomf -Zlinker /PM:VIO
-endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-PWD = $(shell pwd)
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-LDOPTS += -rpath $(PWD)/$(dist_libdir) -rdata_shared
-
-# For 6.x machines, include this flag
-ifeq ($(basename $(OS_RELEASE)),6)
-ifeq ($(USE_N32),1)
-LDOPTS += -n32
-else
-LDOPTS += -32
-endif
-endif
-
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
-# we do static linking.
-ifeq ($(OS_RELEASE), V3.2)
-  LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a
-  LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a
-  LIBGC = $(dist_libdir)/libmsgc$(GC_VERSION).a
-  EXTRA_LIBS = -lc_r
-else
-  LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-LDOPTS += -z -Wl,+s,+b,$(PWD)/$(dist_libdir)
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-LIBPR = -lnspr$(NSPR_VERSION)_shr
-LIBPLC = -lplc$(NSPR_VERSION)_shr
-LIBGC = -lmsgc$(GC_VERSION)_shr
-else
-LDOPTS += -brtl
-EXTRA_LIBS = -ldl
-endif
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-ifneq ($(OS_RELEASE), 4.1.3_U1)
-ifdef NS_USE_GCC
-LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
-else
-LDOPTS += -R $(PWD)/$(dist_libdir)
-endif
-endif
-
-ifneq ($(LOCAL_THREADS_ONLY),1)
-# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
-# even though we already linked with these system libraries
-# when we built libnspr.so.
-ifeq ($(OS_RELEASE), 5.4)
-EXTRA_LIBS = -lthread
-endif
-
-ifeq ($(OS_RELEASE), 5.5)
-ifdef USE_PTHREADS
-EXTRA_LIBS = -lpthread
-else
-EXTRA_LIBS = -lthread
-endif
-endif
-endif # LOCAL_THREADS_ONLY
-endif # SunOS
-
-ifeq ($(OS_ARCH),NEC)
-EXTRA_LIBS = $(OS_LIBS)
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), NCR)
-# XXX: We see some strange problems when we link with libnspr.so.
-# So for now we use static libraries on NCR.  The shared library
-# stuff below is commented out.
-LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a
-LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a
-LIBGC = $(dist_libdir)/libmsgc$(GC_VERSION).a
-EXTRA_LIBS = -lsocket -lnsl -ldl
-
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-#EXTRA_LIBS = -lsocket -lnsl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), Linux)
-ifeq ($(OS_RELEASE), 1.2)
-EXTRA_LIBS = -ldl
-endif
-endif
-
-ifeq ($(OS_ARCH), SCOOS)
-# SCO Unix needs to link against -lsocket again even though we
-# already linked with these system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH),SINIX)
-EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), UNIXWARE)
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH),BSD_OS)
-EXTRA_LIBS = -ldl
-endif
-
-ifeq ($(OS_ARCH),DGUX)
-EXTRA_LIBS = -lsocket -lnsl -ldl
-endif
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifneq ($(OS_RELEASE),4.2)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(NSPR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
-	echo system windows >w16link
-	echo name $@  >>w16link
-	echo option map >>w16link
-#	echo option CASEEXACT >>w16link
-	echo option stack=16K >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo file >>w16link
-	echo $< ,  >>w16link
-	echo $(W16STDIO) >>w16link
-	echo library  >>w16link
-	echo $(LIBPR),	     >>w16link
-	echo $(LIBPLC),		>>w16link
-	echo $(LIBGC),		 >>w16link
-	echo winsock.lib     >>w16link
-	wlink @w16link.
-else
-	link $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
-else
-ifeq ($(OS_ARCH),OS2)
-	$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
-else
-	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBGC) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
-endif
-endif
-endif
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
diff --git a/libs/js/nsprpub/lib/msgc/tests/gc1.c b/libs/js/nsprpub/lib/msgc/tests/gc1.c
deleted file mode 100644
index d6846235ba..0000000000
--- a/libs/js/nsprpub/lib/msgc/tests/gc1.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prgc.h"
-#include "prinit.h"
-#include "prmon.h"
-#include "prinrval.h"
-#ifndef XP_MAC
-#include "private/pprthred.h"
-#else
-#include "pprthred.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-static PRMonitor *mon;
-static PRInt32 threads, waiting, iterations;
-static PRInt32 scanCount, finalizeCount, freeCount;
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-typedef struct Array {
-    PRUintn size;
-    void *body[1];
-} Array;
-
-int arrayTypeIndex;
-
-static void PR_CALLBACK ScanArray(void *a)
-{
-/*	printf ("In ScanArray a = %X size = %d \n", a, a->size); */
-	scanCount++;
-}
-
-static void PR_CALLBACK FinalizeArray(void *a)
-{
-/*	printf ("In FinalizeArray a = %X size = %d \n", a, a->size); */	
-	finalizeCount++;
-}
-
-static void PR_CALLBACK FreeArray(void *a)
-{
-/*	printf ("In FreeArray\n");	*/
-	freeCount++;
-}
-
-static Array *NewArray(PRUintn size)
-{
-    Array *a;
-
-    a = (Array *)PR_AllocMemory(sizeof(Array) + size*sizeof(void*) - 1*sizeof(void*),
-                       arrayTypeIndex, PR_ALLOC_CLEAN);
-
-/*	printf ("In NewArray a = %X \n", a); */	
-
-    if (a)
-        a->size = size;
-    return a;
-}
-
-GCType arrayType = {
-    ScanArray,
-    FinalizeArray,
-    0,
-    0,
-    FreeArray,
-    0
-};
-
-static void Initialize(void)
-{
-    PR_InitGC(0, 0, 0, PR_GLOBAL_THREAD);
-    arrayTypeIndex = PR_RegisterType(&arrayType);
-}
-
-static void PR_CALLBACK AllocateLikeMad(void *arg)
-{
-    Array *prev;
-    PRInt32 i;
-	PRInt32 count;
-
-	count = (PRInt32)arg;
-    prev = 0;
-    for (i = 0; i < count; i++) {
-        Array *leak = NewArray(i & 511);
-        if ((i & 1023) == 0) {
-            prev = 0;                   /* forget */
-        } else {
-            if (i & 1) {
-                prev = leak;            /* remember */
-            }
-        }
-    }
-    PR_EnterMonitor(mon);
-    waiting++;
-    PR_Notify(mon);
-    PR_ExitMonitor(mon);
-}
-
-int main(int argc, char **argv)
-{
-    PRIntervalTime start, stop, usec;
-    double d;
-    PRIntn i, totalIterations;
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:c:");
-
-	threads = 10;
-	iterations = 100;
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) {
-            fprintf(stderr, "Invalid command-line option\n");
-            exit(1);
-        }
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 't':  /* number of threads */
-            threads = atoi(opt->value);
-            break;
-        case 'c':  /* iteration count */
-            iterations = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    fprintf(stderr, "t is %ld, i is %ld\n", (long) threads, (long) iterations);
-	/* main test */
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 5);
-    PR_STDIO_INIT();
-    Initialize();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("gc1.log");
-	debug_mode = 1;
-#endif
-
-    /* Spin all of the allocator threads and then wait for them to exit */
-    start = PR_IntervalNow();
-    mon = PR_NewMonitor();
-    PR_EnterMonitor(mon);
-    waiting = 0;
-    for (i = 0; i < threads; i++) {
-        (void) PR_CreateThreadGCAble(PR_USER_THREAD,
-                               AllocateLikeMad, (void*)iterations,
-						      PR_PRIORITY_NORMAL,
-						      PR_LOCAL_THREAD,
-		    				  PR_UNJOINABLE_THREAD,
-						      0);
-    }
-    while (waiting != threads) {
-        PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_ExitMonitor(mon);
-
-	PR_GC();
-	PR_ForceFinalize();	
-
-	totalIterations = iterations * threads;
-/*
-	if (scanCount != totalIterations)
-		printf ("scanCount discrepancy scanCount = %d totalIterations = %d \n", 
-			scanCount, totalIterations);
-	if (freeCount != totalIterations)
-		printf ("freeCount discrepancy freeCount = %d totalIterations = %d \n", 
-			freeCount, totalIterations);
-	if ((finalizeCount != totalIterations) && (finalizeCount != (totalIterations-1)))
-		printf ("finalizeCount discrepancy finalizeCount = %d totalIterations = %d \n", 
-			finalizeCount,totalIterations);
-*/
-
-    stop = PR_IntervalNow();
-    
-    usec = stop = stop - start;
-    d = (double)usec;
-
-    if (debug_mode) printf("%40s: %6.2f usec\n", "GC allocation", d / (iterations * threads));
-	else {
-		if (d == 0.0) failed_already = PR_TRUE;
-
-	}
-
-    PR_Cleanup();
-	if(failed_already)	
-	{
-	    printf("FAIL\n");
-		return 1;
-	}
-	else
-	{
-	    printf("PASS\n");
-		return 0;
-	}
-}
diff --git a/libs/js/nsprpub/lib/msgc/tests/thrashgc.c b/libs/js/nsprpub/lib/msgc/tests/thrashgc.c
deleted file mode 100644
index 9d49ec19f3..0000000000
--- a/libs/js/nsprpub/lib/msgc/tests/thrashgc.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-** Name: thrashgc
-**
-** Description: test garbace collection functions.
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-#include "prthread.h"
-#include "prgc.h"
-#include "prprf.h"
-#include "prinrval.h"
-#include "prlock.h"
-#include "prinit.h"
-#include "prcvar.h"
-
-#ifndef XP_MAC
-#include "private/pprthred.h"
-#else
-#include "pprthred.h"
-#endif
-
-#include <stdio.h>
-#include <memory.h>
-#include <string.h>
-
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-static char* progname;
-static PRInt32 loops = 1000;
-static int tix1, tix2, tix3;
-static GCInfo* gcInfo;
-static PRLock* stderrLock;
-
-typedef struct Type1 Type1;
-typedef struct Type2 Type2;
-
-struct Type1 {
-  Type2* atwo;
-  Type1* next;
-};
-
-struct Type2 {
-  void* buf;
-};
-
-static void PR_CALLBACK ScanType1(void *obj) {
-  gcInfo->livePointer(((Type1 *)obj)->atwo);
-  gcInfo->livePointer(((Type1 *)obj)->next);
-}
-
-static void PR_CALLBACK ScanType2(void *obj) {
-  gcInfo->livePointer(((Type2 *)obj)->buf);
-}
-
-static GCType type1 = {
-    ScanType1
-};
-
-static GCType type2 = {
-    ScanType2
-/*  (void (*)(void*)) ScanType2 */
-};
-
-static GCType type3 = {
-  0
-};
-
-Type1* NewType1(void) {
-    Type1* p = (Type1*) PR_AllocMemory(sizeof(Type1), tix1, PR_ALLOC_DOUBLE);
-    PR_ASSERT(p != NULL);
-    return p;
-}
-
-Type2* NewType2(void) {
-    Type2* p = (Type2*) PR_AllocMemory(sizeof(Type2), tix2, PR_ALLOC_DOUBLE);
-    PR_ASSERT(p != NULL);
-    return p;
-}
-
-void* NewBuffer(PRInt32 size) {
-    void* p = PR_AllocMemory(size, tix3, PR_ALLOC_DOUBLE);
-    PR_ASSERT(p != NULL);
-    return p;
-}
-
-/* Allocate alot of garbage */
-static void PR_CALLBACK AllocStuff(void *unused) {
-  PRInt32 i;
-  void* danglingRefs[50];
-  PRIntervalTime start, end;
-  char msg[100];
-
-  start = PR_IntervalNow();
-  for (i = 0; i < loops; i++) {
-    void* p;
-    if (i & 1) {
-      Type1* t1 = NewType1();
-      t1->atwo = NewType2();
-      t1->next = NewType1();
-      t1->atwo->buf = NewBuffer(100);
-      p = t1;
-    } else {
-      Type2* t2 = NewType2();
-      t2->buf = NewBuffer(i & 16383);
-      p = t2;
-    }
-    if ((i % 10) == 0) {
-      memmove(&danglingRefs[0], &danglingRefs[1], 49*sizeof(void*));
-      danglingRefs[49] = p;
-    }
-  }
-  end = PR_IntervalNow();
-  if (debug_mode) PR_snprintf(msg, sizeof(msg), "Thread %p: %ld allocations took %ld ms",
-	      PR_GetCurrentThread(), loops,
-	      PR_IntervalToMilliseconds((PRIntervalTime) (end - start)));
-  PR_Lock(stderrLock);
-#ifndef XP_MAC
-  fprintf(stderr, "%s\n", msg);
-#else
-  if (debug_mode) printf("%s\n", msg);
-#endif
-  PR_Unlock(stderrLock);
-  }
-
-static void usage(char *progname) {
-#ifndef XP_MAC
-  fprintf(stderr, "Usage: %s [-t threads] [-l loops]\n", progname);
-#else
-  printf("Usage: %s [-t threads] [-l loops]\n", progname);
-#endif
-  exit(-1);
-}
-
-static int realMain(int argc, char **argv, char *notused) {
-  int i;
-  int threads = 0;
-
-#ifndef XP_MAC
-  progname = strrchr(argv[0], '/');
-  if (progname == 0) progname = argv[0];
-  for (i = 1; i < argc; i++) {
-    if (strcmp(argv[i], "-t") == 0) {
-      if (i == argc - 1) {
-	usage(progname);
-      }
-      threads = atoi(argv[++i]);
-      if (threads < 0) threads = 0;
-      if (threads > 10000) threads = 10000;
-      continue;
-    }
-    if (strcmp(argv[i], "-l") == 0) {
-      if (i == argc - 1) {
-	usage(progname);
-      }
-      loops = atoi(argv[++i]);
-      continue;
-    }
-    usage(progname);
-  }
-#else
-	threads = 50;
-#endif
-
-  for (i = 0; i < threads; i++) {
-    PRThread* thread;
-
-    /* XXXXX */
-    thread = PR_CreateThreadGCAble(PR_USER_THREAD,  /* thread type */
-			     AllocStuff,  /* start function */
-			     NULL,  /* arg */
-			     PR_PRIORITY_NORMAL,  /* priority */
-			     PR_LOCAL_THREAD,  /* thread scope */
-			     PR_UNJOINABLE_THREAD,  /* thread state */
-			     0);   /* stack size */
-    if (thread == 0) {
-#ifndef XP_MAC
-      fprintf(stderr, "%s: no more threads (only %d were created)\n",
-	      progname, i);
-#else
-      printf("%s: no more threads (only %d were created)\n",
-	      progname, i);
-#endif
-      break;
-    }
-  }
-  AllocStuff(NULL);
-  return 0;
-}
-
-static int padMain(int argc, char **argv) {
-  char pad[512];
-  return realMain(argc, argv, pad);
-}
-
-int main(int argc, char **argv) {
-  int rv;
-
-  debug_mode = 1;
-  
-  PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-  PR_SetThreadGCAble();
-
-#ifdef XP_MAC
-  SetupMacPrintfLog("thrashgc.log");
-  debug_mode = 1;
-#endif
-
-  PR_InitGC(0, 0, 0, PR_GLOBAL_THREAD);
-  PR_STDIO_INIT();
-  stderrLock = PR_NewLock();
-  tix1 = PR_RegisterType(&type1);
-  tix2 = PR_RegisterType(&type2);
-  tix3 = PR_RegisterType(&type3);
-  gcInfo = PR_GetGCInfo();
-  rv = padMain(argc, argv);
-  printf("PASS\n");
-  PR_Cleanup();
-  return rv;
-}
diff --git a/libs/js/nsprpub/lib/prstreams/.cvsignore b/libs/js/nsprpub/lib/prstreams/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/prstreams/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/prstreams/Makefile.in b/libs/js/nsprpub/lib/prstreams/Makefile.in
deleted file mode 100644
index 679c03d907..0000000000
--- a/libs/js/nsprpub/lib/prstreams/Makefile.in
+++ /dev/null
@@ -1,207 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-    ifeq ($(OS_RELEASE),4.1.3_U1)
-        OPTIMIZER =
-    else
-        # The C++ compiler in Workshop 5.0 uses standard
-        # iostreams as default.  -library=iostream will
-        # allow Workshop 5.0 to work with classic iostreams.
-        ifndef NS_USE_GCC
-        CCC_VERSION := $(shell $(CCC) -V 2>&1)
-        ifneq (,$(findstring 5.0,$(CCC_VERSION)))
-        CCC_ONLY_FLAGS += -library=iostream
-        endif
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-    ifneq ($(OS_RELEASE),5.3)
-        CCC_ONLY_FLAGS += -exceptions
-    endif
-endif
-
-ifeq ($(OS_ARCH), BeOS)
-    CFLAGS += -frtti -fexceptions
-endif
-
-INCLUDES = -I$(dist_includedir)
-
-HEADERS = $(wildcard $(srcdir)/*.h)
-
-CSRCS = \
-	plvrsion.c \
-	$(NULL)
-
-CXXSRCS = \
-	prstrms.cpp \
-	$(NULL)
-
-OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
-
-ifeq ($(OS_ARCH), WINNT)
-        DLLBASE=-BASE:0x30000000
-        RES=$(OBJDIR)/prstrms.res
-        RESNAME=prstrms.rc
-        OS_LIBS = user32.lib
-else
-    ifeq ($(OS_ARCH),OS2)
-      ifneq ($(MOZ_OS2_TOOLS),VACPP)
-         OS_LIBS = -lstdcpp
-      endif
-    else
-    ifeq ($(OS_ARCH), AIX)
-      ifeq ($(OS_RELEASE), 4.1)
-        ifeq ($(CLASSIC_NSPR),1)
-            OS_LIBS += -lC -lc
-        else
-            OS_LIBS += -lC_r -lc_r
-        endif
-      else
-        # makeC++SharedLib(_r) is in either /usr/lpp/xlC/bin
-        # or /usr/ibmcxx/bin.
-        ifeq ($(CLASSIC_NSPR),1)
-            MKSHLIB = makeC++SharedLib -p 0
-        else
-            MKSHLIB = makeC++SharedLib_r -p 0
-        endif
-        OS_LIBS += -ldl
-      endif
-    endif
-    endif
-endif
-
-ifeq ($(OS_ARCH),BeOS)
-    OS_LIBS = -lstdc++.r4
-endif
-
-ifeq ($(OS_ARCH), UNIXWARE)
-    OS_LIBS += -lC
-endif
-
-EXTRA_LIBS = $(LIBNSPR)
-
-# On NCR and SCOOS, we can't link with extra libraries when
-# we build a shared library.  If we do so, the linker doesn't
-# complain, but we would run into weird problems at run-time.
-# Therefore on these platforms, we link just the object files.
-ifeq ($(OS_ARCH),NCR)
-    EXTRA_LIBS =
-endif
-ifeq ($(OS_ARCH),SCOOS)
-    EXTRA_LIBS =
-endif
-
-ifdef RESOLVE_LINK_SYMBOLS
-EXTRA_LIBS += $(OS_LIBS)
-endif
-
-LIBRARY_NAME    = prstrms
-LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
-
-RELEASE_HEADERS = $(HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
-RELEASE_LIBS    = $(TARGETS)
-
-include $(topsrcdir)/config/rules.mk
-
-#
-# Version information generation (begin)
-#
-ECHO = echo
-TINC = $(OBJDIR)/_pl_bld.h
-PROD = $(notdir $(SHARED_LIBRARY))
-NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
-
-ifeq ($(OS_ARCH), WINNT)
-	SUF = i64
-else
-	SUF = LL
-endif
-
-$(TINC):
-	@$(MAKE_OBJDIR)
-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
-	@if test ! -z "$(SH_NOW)"; then \
-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
-	else \
-	    true; \
-	fi
-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-
-
-$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
-ifeq ($(OS_ARCH), WINNT)
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-ifeq ($(MOZ_OS2_TOOLS), VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
-endif
-endif
-#
-# Version information generation (end)
-#
-
-export:: $(TARGETS) $(HEADERS)
-	$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-ifeq ($(OS_ARCH),OS2)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_bindir)
-endif
-ifeq ($(OS_ARCH),HP-UX)
-ifdef SHARED_LIBRARY
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
-endif
-endif
diff --git a/libs/js/nsprpub/lib/prstreams/plvrsion.c b/libs/js/nsprpub/lib/prstreams/plvrsion.c
deleted file mode 100644
index 87b62e7a9d..0000000000
--- a/libs/js/nsprpub/lib/prstreams/plvrsion.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prvrsion.h"
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-#include "_pl_bld.h"
-#if !defined(_BUILD_TIME)
-#ifdef HAVE_LONG_LONG
-#define _BUILD_TIME 0
-#else
-#define _BUILD_TIME {0, 0}
-#endif
-#endif
-#if !defined(_BUILD_STRING)
-#define _BUILD_STRING ""
-#endif
-#if !defined(_PRODUCTION)
-#define _PRODUCTION ""
-#endif
-#if defined(DEBUG)
-#define _DEBUG_STRING " (debug)"
-#else
-#define _DEBUG_STRING ""
-#endif
-
-/*
- * A trick to expand the PR_VMAJOR macro before concatenation.
- */
-#define CONCAT(x, y) x ## y
-#define CONCAT2(x, y) CONCAT(x, y)
-#define VERSION_DESC_NAME CONCAT2(prVersionDescription_libprstrms, PR_VMAJOR)
-
-PRVersionDescription VERSION_DESC_NAME =
-{
-    /* version          */  2,                  /* this is the only one supported */
-    /* buildTime        */  _BUILD_TIME,        /* usecs since midnight 1/1/1970 GMT */
-    /* buildTimeString  */  _BUILD_STRING,       /*    ditto, but human readable */
-    /* vMajor           */  PR_VMAJOR,          /* NSPR's version number */
-    /* vMinor           */  PR_VMINOR,          /*  and minor version */
-    /* vPatch           */  PR_VPATCH,          /*  and patch */
-    /* beta             */  PR_BETA,            /* beta build boolean */
-#if defined(DEBUG)
-    /* debug            */  PR_TRUE,            /* a debug build */
-#else
-    /* debug            */  PR_FALSE,           /* an optomized build */
-#endif
-    /* special          */  PR_FALSE,           /* they're all special, but ... */
-    /* filename         */  _PRODUCTION,        /* the produced library name */
-    /* description      */ "Portable runtime",  /* what we are */
-    /* security         */ "N/A",               /* not applicable here */
-    /* copywrite        */  "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
-    /* comment          */  "http://www.mozilla.org/MPL/",
-    /* specialString    */ ""
-};
-
-#ifdef XP_UNIX
-
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING " $";
-static char sccsid[] = "@(#)NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING;
-
-#endif /* XP_UNIX */
-
-PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint()
-{
-#ifdef XP_UNIX
-    /*
-     * Add dummy references to rcsid and sccsid to prevent them
-     * from being optimized away as unused variables.
-     */
-    const char *dummy;
-    
-    dummy = rcsid;
-    dummy = sccsid;
-#endif
-    return &VERSION_DESC_NAME;
-}  /* versionEntryPointType */
-
-/* plvrsion.c */
-
diff --git a/libs/js/nsprpub/lib/prstreams/prstrms.cpp b/libs/js/nsprpub/lib/prstreams/prstrms.cpp
deleted file mode 100644
index 17b280ea1f..0000000000
--- a/libs/js/nsprpub/lib/prstreams/prstrms.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Robin J. Maxwell 11-22-96
- */
-
-#include "prstrms.h"
-#include <string.h> // memmove
-
-//
-// Definition of macros _PRSTR_BP, _PRSTR_DELBUF, and _PRSTR_DELBUF_C.
-//
-// _PRSTR_BP is the protected member of class ios that is returned
-// by the public method rdbuf().
-//
-// _PRSTR_DELBUF is the method or data member of class ios, if available,
-// with which we can ensure that the ios destructor does not delete
-// the associated streambuf.  If such a method or data member does not
-// exist, define _PRSTR_DELBUF to be empty.
-//
-// _PRSTR_DELBUF_C is just _PRSTR_DELBUF qualified by a base class.
-//
-
-#if defined(__GNUC__)
-#define _PRSTR_BP _strbuf
-#define _PRSTR_DELBUF(x)    /* as nothing */
-#define _PRSTR_DELBUF_C(c, x)  /* as nothing */
-#elif defined(WIN32)
-#define _PRSTR_BP bp
-#define _PRSTR_DELBUF(x)	delbuf(x)
-#define _PRSTR_DELBUF_C(c, x)	c::_PRSTR_DELBUF(x)
-#elif defined(VMS)
-#undef  _PRSTR_BP
-#define _PRSTR_DELBUF(x) /* as nothing */
-#define _PRSTR_DELBUF_C(c, x)	/* as nothing */
-#elif defined(OSF1)
-#define _PRSTR_BP m_psb
-#define _PRSTR_DELBUF(x) /* as nothing */
-#define _PRSTR_DELBUF_C(c, x)	/* as nothing */
-#elif defined(QNX)
-#define PRFSTREAMS_BROKEN
-#else
-#define _PRSTR_BP bp
-// Unix compilers don't believe in encapsulation
-// At least on Solaris this is also ignored
-#define _PRSTR_DELBUF(x)	delbuf = x
-#define _PRSTR_DELBUF_C(c, x)	c::_PRSTR_DELBUF(x)
-#endif
-
-const PRIntn STRM_BUFSIZ = 8192;
-
-#if !defined (PRFSTREAMS_BROKEN)   
-
-PRfilebuf::PRfilebuf():
-_fd(0),
-_opened(PR_FALSE),
-_allocated(PR_FALSE)
-{
-}
-
-PRfilebuf::PRfilebuf(PRFileDesc *fd):
-streambuf(),
-_fd(fd),
-_opened(PR_FALSE),
-_allocated(PR_FALSE)
-{
-}
-
-PRfilebuf::PRfilebuf(PRFileDesc *fd, char * buffptr, int bufflen):
-_fd(fd),
-_opened(PR_FALSE),
-_allocated(PR_FALSE)
-{
-    PRfilebuf::setbuf(buffptr, bufflen);
-}
-
-PRfilebuf::~PRfilebuf()
-{
-    if (_opened){
-        close();
-    }else
-        sync();
-	if (_allocated)
-		delete base();
-}
-
-PRfilebuf*	
-PRfilebuf::open(const char *name, int mode, int flags)
-{
-     if (_fd != 0)
-        return 0;    // error if already open
-     PRIntn PRmode = 0;
-    // translate mode argument
-    if (!(mode & ios::nocreate))
-        PRmode |= PR_CREATE_FILE;
-    //if (mode & ios::noreplace)
-    //    PRmode |= O_EXCL;
-    if (mode & ios::app){
-        mode |= ios::out;
-        PRmode |= PR_APPEND;
-    }
-    if (mode & ios::trunc){
-        mode |= ios::out;  // IMPLIED
-        PRmode |= PR_TRUNCATE;
-    }
-    if (mode & ios::out){
-        if (mode & ios::in)
-            PRmode |= PR_RDWR;
-        else
-            PRmode |= PR_WRONLY;
-        if (!(mode & (ios::in|ios::app|ios::ate|ios::noreplace))){
-            mode |= ios::trunc; // IMPLIED
-            PRmode |= PR_TRUNCATE;
-        }
-    }else if (mode & ios::in)
-        PRmode |= PR_RDONLY;
-    else
-        return 0;    // error if not ios:in or ios::out
-
-
-    //
-    // The usual portable across unix crap...
-    // NT gets a hokey piece of junk layer that prevents
-    // access to the API.
-#ifdef WIN32
-    _fd = PR_Open(name, PRmode, PRmode);
-#else
-    _fd = PR_Open(name, PRmode, flags);
-#endif
-    if (_fd == 0)
-        return 0;
-    _opened = PR_TRUE;
-    if ((!unbuffered()) && (!ebuf())){
-        char * sbuf = new char[STRM_BUFSIZ];
-        if (!sbuf)
-            unbuffered(1);
-        else{
-			_allocated = PR_TRUE;
-            streambuf::setb(sbuf,sbuf+STRM_BUFSIZ,0);
-		}
-    }
-    if (mode & ios::ate){
-        if (seekoff(0,ios::end,mode)==EOF){
-            close();
-            return 0;
-        }
-    }
-    return this;
-}
-
-PRfilebuf*	
-PRfilebuf::attach(PRFileDesc *fd)
-{
-    _opened = PR_FALSE;
-    _fd = fd;
-    return this;
-}
-
-int	
-PRfilebuf::overflow(int c)
-{
-    if (allocate()==EOF)        // make sure there is a reserve area
-        return EOF;
-    if (PRfilebuf::sync()==EOF) // sync before new buffer created below
-        return EOF;
-
-    if (!unbuffered())
-        setp(base(),ebuf());
-
-    if (c!=EOF){
-        if ((!unbuffered()) && (pptr() < epptr())) // guard against recursion
-            sputc(c);
-        else{
-            if (PR_Write(_fd, &c, 1)!=1)
-                return(EOF);
-        }
-    }
-    return(1);  // return something other than EOF if successful
-}
-
-int	
-PRfilebuf::underflow()
-{
-    int count;
-    unsigned char tbuf;
-
-    if (in_avail())
-        return (int)(unsigned char) *gptr();
-
-    if (allocate()==EOF)        // make sure there is a reserve area
-        return EOF;
-    if (PRfilebuf::sync()==EOF)
-        return EOF;
-
-    if (unbuffered())
-        {
-        if (PR_Read(_fd,(void *)&tbuf,1)<=0)
-            return EOF;
-        return (int)tbuf;
-        }
-
-    if ((count=PR_Read(_fd,(void *)base(),blen())) <= 0)
-        return EOF;     // reached EOF
-    setg(base(),base(),base()+count);
-    return (int)(unsigned char) *gptr();
-}
-
-streambuf*	
-PRfilebuf::setbuf(char *buffptr, PRstreambuflen bufflen)
-{
-    if (is_open() && (ebuf()))
-        return 0;
-    if ((!buffptr) || (bufflen <= 0))
-        unbuffered(1);
-    else
-        setb(buffptr, buffptr+bufflen, 0);
-    return this;
-}
-
-streampos	
-PRfilebuf::seekoff(streamoff offset, ios::seek_dir dir, int /* mode */)
-{
-    if (PR_GetDescType(_fd) == PR_DESC_FILE){
-        PRSeekWhence fdir;
-        PRInt32 retpos;
-        switch (dir) {
-            case ios::beg :
-                fdir = PR_SEEK_SET;
-                break;
-            case ios::cur :
-                fdir = PR_SEEK_CUR;
-                break;
-            case ios::end :
-                fdir = PR_SEEK_END;
-                break;
-            default:
-            // error
-                return(EOF);
-            }
-
-        if (PRfilebuf::sync()==EOF)
-            return EOF;
-        if ((retpos=PR_Seek(_fd, offset, fdir))==-1L)
-            return (EOF);
-        return((streampos)retpos);
-    }else
-        return (EOF);
-}
-
-
-int 
-PRfilebuf::sync()
-{
-    PRInt32 count; 
-
-    if (_fd==0)
-        return(EOF);
-
-    if (!unbuffered()){
-        // Sync write area
-        if ((count=out_waiting())!=0){
-            PRInt32 nout;
-            if ((nout =PR_Write(_fd,
-                               (void *) pbase(),
-                               (unsigned int)count)) != count){
-                if (nout > 0) {
-                    // should set _pptr -= nout
-                    pbump(-(int)nout);
-                    memmove(pbase(), pbase()+nout, (int)(count-nout));
-                }
-                return(EOF);
-            }
-        }
-        setp(0,0); // empty put area
-
-        if (PR_GetDescType(_fd) == PR_DESC_FILE){
-            // Sockets can't seek; don't need this
-            if ((count=in_avail()) > 0){
-                if (PR_Seek(_fd, -count, PR_SEEK_CUR)!=-1L)
-                {
-                    return (EOF);
-                }
-            }
-        }
-        setg(0,0,0); // empty get area
-    }
-    return(0);
-}
-
-PRfilebuf * 
-PRfilebuf::close()
-{
-    int retval;
-    if (_fd==0)
-        return 0;
-
-    retval = sync();
-
-    if ((PR_Close(_fd)==0) || (retval==EOF))
-        return 0;
-    _fd = 0;
-    return this;
-}
-
-PRifstream::PRifstream():
-istream(new PRfilebuf)
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRifstream::PRifstream(PRFileDesc *fd):
-istream(new PRfilebuf(fd))
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRifstream::PRifstream(PRFileDesc *fd, char *buff, int bufflen):
-istream(new PRfilebuf(fd, buff, bufflen))
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRifstream::PRifstream(const char * name, int mode, int flags):
-istream(new PRfilebuf)
-{
-    _PRSTR_DELBUF(0);
-    if (!rdbuf()->open(name, (mode|ios::in), flags))
-        clear(rdstate() | ios::failbit);
-}
-
-PRifstream::~PRifstream()
-{
-	sync();
-
-	delete rdbuf();
-#ifdef _PRSTR_BP
-	_PRSTR_BP = 0;
-#endif
-}
-
-streambuf * 
-PRifstream::setbuf(char * ptr, int len)
-{
-    if ((is_open()) || (!(rdbuf()->setbuf(ptr, len)))){
-        clear(rdstate() | ios::failbit);
-        return 0;
-    }
-    return rdbuf();
-}
-
-void 
-PRifstream::attach(PRFileDesc *fd)
-{
-    if (!(rdbuf()->attach(fd)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRifstream::open(const char * name, int mode, int flags)
-{
-    if (is_open() || !(rdbuf()->open(name, (mode|ios::in), flags)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRifstream::close()
-{
-    clear((rdbuf()->close()) ? 0 : (rdstate() | ios::failbit));
-}
-
-PRofstream::PRofstream():
-ostream(new PRfilebuf)
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRofstream::PRofstream(PRFileDesc *fd):
-ostream(new PRfilebuf(fd))
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRofstream::PRofstream(PRFileDesc *fd, char *buff, int bufflen):
-ostream(new PRfilebuf(fd, buff, bufflen))
-{
-    _PRSTR_DELBUF(0);
-}
-
-PRofstream::PRofstream(const char *name, int mode, int flags):
-ostream(new PRfilebuf)
-{
-    _PRSTR_DELBUF(0);
-    if (!rdbuf()->open(name, (mode|ios::out), flags))
-        clear(rdstate() | ios::failbit);
-}
-
-PRofstream::~PRofstream()
-{
-	flush();
-
-	delete rdbuf();
-#ifdef _PRSTR_BP
-	_PRSTR_BP = 0;
-#endif
-}
-
-streambuf * 
-PRofstream::setbuf(char * ptr, int len)
-{
-    if ((is_open()) || (!(rdbuf()->setbuf(ptr, len)))){
-        clear(rdstate() | ios::failbit);
-        return 0;
-    }
-    return rdbuf();
-}
-
-void 
-PRofstream::attach(PRFileDesc *fd)
-{
-    if (!(rdbuf()->attach(fd)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRofstream::open(const char * name, int mode, int flags)
-{
-    if (is_open() || !(rdbuf()->open(name, (mode|ios::out), flags)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRofstream::close()
-{
-    clear((rdbuf()->close()) ? 0 : (rdstate() | ios::failbit));
-}
-
-PRfstream::PRfstream():
-iostream(new PRfilebuf)
-{
-	_PRSTR_DELBUF_C(istream, 0);
-	_PRSTR_DELBUF_C(ostream, 0);
-}
-
-PRfstream::PRfstream(PRFileDesc *fd):
-iostream(new PRfilebuf(fd))
-{
-	_PRSTR_DELBUF_C(istream, 0);
-	_PRSTR_DELBUF_C(ostream, 0);
-}
-
-PRfstream::PRfstream(PRFileDesc *fd, char *buff, int bufflen):
-iostream(new PRfilebuf(fd, buff, bufflen))
-{
-	_PRSTR_DELBUF_C(istream, 0);
-	_PRSTR_DELBUF_C(ostream, 0);
-}
-
-PRfstream::PRfstream(const char *name, int mode, int flags):
-iostream(new PRfilebuf)
-{
-	_PRSTR_DELBUF_C(istream, 0);
-	_PRSTR_DELBUF_C(ostream, 0);
-    if (!rdbuf()->open(name, (mode|(ios::in|ios::out)), flags))
-        clear(rdstate() | ios::failbit);
-}
-
-PRfstream::~PRfstream()
-{
-	sync();
-	flush();
-
-	delete rdbuf();
-#ifdef _PRSTR_BP
-	istream::_PRSTR_BP = 0;
-	ostream::_PRSTR_BP = 0;
-#endif
-}
-
-streambuf * 
-PRfstream::setbuf(char * ptr, int len)
-{
-    if ((is_open()) || (!(rdbuf()->setbuf(ptr, len)))){
-        clear(rdstate() | ios::failbit);
-        return 0;
-    }
-    return rdbuf();
-}
-
-void 
-PRfstream::attach(PRFileDesc *fd)
-{
-    if (!(rdbuf()->attach(fd)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRfstream::open(const char * name, int mode, int flags)
-{
-    if (is_open() || !(rdbuf()->open(name, (mode|(ios::in|ios::out)), flags)))
-        clear(rdstate() | ios::failbit);
-}
-
-void 
-PRfstream::close()
-{
-    clear((rdbuf()->close()) ? 0 : (rdstate() | ios::failbit));
-}
-
-#else
-
-// fix it sometime
-
-int fix_prfstreams ()	{	return 0; }
-
-#endif
diff --git a/libs/js/nsprpub/lib/prstreams/prstrms.h b/libs/js/nsprpub/lib/prstreams/prstrms.h
deleted file mode 100644
index a6752fc474..0000000000
--- a/libs/js/nsprpub/lib/prstreams/prstrms.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Robin J. Maxwell 11-22-96
- */
-
-#ifndef _PRSTRMS_H
-#define _PRSTRMS_H
-
-#include "prtypes.h"
-#include "prio.h"
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4275)
-#endif
-#include <iostream.h>
-
-#if defined(AIX) && defined(__64BIT__)
-typedef long PRstreambuflen;
-#else
-typedef int PRstreambuflen;
-#endif
-
-#if defined (PRFSTREAMS_BROKEN)
-
-// fix it sometime
-
-#define	 PRfilebuf	streambuf
-#define  PRifstream	ifstream
-#define	 PRofstream	ofstream
-#define	 PRfstream	fstream
-
-#else
-
-class PR_IMPLEMENT(PRfilebuf): public streambuf
-{
-public:
-    PRfilebuf();
-    PRfilebuf(PRFileDesc *fd);
-    PRfilebuf(PRFileDesc *fd, char * buffptr, int bufflen);
-    ~PRfilebuf();
-    virtual	int	overflow(int=EOF);
-    virtual	int	underflow();
-    virtual	streambuf *setbuf(char *buff, PRstreambuflen bufflen);
-    virtual	streampos seekoff(streamoff, ios::seek_dir, int);
-    virtual int sync();
-    PRfilebuf *open(const char *name, int mode, int flags);
-   	PRfilebuf *attach(PRFileDesc *fd);
-    PRfilebuf *close();
-   	int	is_open() const {return (_fd != 0);}
-    PRFileDesc *fd(){return _fd;}
-
-private:
-    PRFileDesc * _fd;
-    PRBool _opened;
-	PRBool _allocated;
-};
-
-class PR_IMPLEMENT(PRifstream): public istream {
-public:
-	PRifstream();
-	PRifstream(const char *, int mode=ios::in, int flags = 0);
-	PRifstream(PRFileDesc *);
-	PRifstream(PRFileDesc *, char *, int);
-	~PRifstream();
-
-	streambuf * setbuf(char *, int);
-	PRfilebuf* rdbuf(){return (PRfilebuf*) ios::rdbuf(); }
-
-	void attach(PRFileDesc *fd);
-	PRFileDesc *fd() {return rdbuf()->fd();}
-
-	int is_open(){return rdbuf()->is_open();}
-	void open(const char *, int mode=ios::in, int flags= 0);
-	void close();
-};
-
-class PR_IMPLEMENT(PRofstream) : public ostream {
-public:
-	PRofstream();
-	PRofstream(const char *, int mode=ios::out, int flags = 0);
-	PRofstream(PRFileDesc *);
-	PRofstream(PRFileDesc *, char *, int);
-	~PRofstream();
-
-	streambuf * setbuf(char *, int);
-	PRfilebuf* rdbuf() { return (PRfilebuf*) ios::rdbuf(); }
-
-	void attach(PRFileDesc *);
-	PRFileDesc *fd() {return rdbuf()->fd();}
-
-	int is_open(){return rdbuf()->is_open();}
-	void open(const char *, int =ios::out, int = 0);
-	void close();
-};
-	
-class PR_IMPLEMENT(PRfstream) : public iostream {
-public:
-	PRfstream();
-	PRfstream(const char *name, int mode, int flags= 0);
-	PRfstream(PRFileDesc *fd);
-	PRfstream(PRFileDesc *fd, char *buff, int bufflen);
-	~PRfstream();
-
-	streambuf * setbuf(char *, int);
-	PRfilebuf* rdbuf(){ return (PRfilebuf*) ostream::rdbuf(); }
-
-	void attach(PRFileDesc *);
-	PRFileDesc *fd() { return rdbuf()->fd(); }
-
-	int is_open() { return rdbuf()->is_open(); }
-	void open(const char *, int, int = 0);
-	void close();
-};
-
-#endif
-
-#endif /* _PRSTRMS_H */
diff --git a/libs/js/nsprpub/lib/prstreams/prstrms.rc b/libs/js/nsprpub/lib/prstreams/prstrms.rc
deleted file mode 100644
index 589a64d127..0000000000
--- a/libs/js/nsprpub/lib/prstreams/prstrms.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include <winver.h>
-
-#define MY_LIBNAME "prstrms"
-#define MY_FILEDESCRIPTION "PRSTRMS Library"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define PR_VMAJOR_STR STRINGIZE2(PR_VMAJOR)
-
-#ifdef _DEBUG
-#define MY_DEBUG_STR " (debug)"
-#define MY_FILEFLAGS_1 VS_FF_DEBUG
-#else
-#define MY_DEBUG_STR ""
-#define MY_FILEFLAGS_1 0x0L
-#endif
-#if PR_BETA
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
-#else
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
-#endif
-
-#ifdef WINNT
-#define MY_FILEOS VOS_NT_WINDOWS32
-#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
-#else
-#define MY_FILEOS VOS__WINDOWS32
-#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version-information resource
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS MY_FILEFLAGS_2
- FILEOS MY_FILEOS
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L // not used
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
-        BEGIN
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
-            VALUE "FileVersion", PR_VERSION "\0"
-            VALUE "InternalName", MY_INTERNAL_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \251 1996-2000 Netscape Communications Corporation\0"
-            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
-            VALUE "ProductName", "Netscape Portable Runtime\0"
-            VALUE "ProductVersion", PR_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore b/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in b/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
deleted file mode 100644
index e1405fd0b3..0000000000
--- a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
+++ /dev/null
@@ -1,254 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-endif
-
-CXXSRCS =           \
-	testprstrm.cpp    \
-	$(NULL)
-
-OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS) $(OBJS)
-
-INCLUDES = -I$(dist_includedir)
-
-# Setting the variables LDOPTS and LIBPR.  We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(dist_libdir)
-LIBPR = -lnspr$(MOD_MAJOR_VERSION)
-LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-  LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib
-else
-  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-  ifeq ($(OS_TARGET), WIN95)
-    LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-    LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  else
-    LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-    LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  endif
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-  ifeq ($(MOZ_OS2_TOOLS),VACPP)
-    LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768
-    LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-    LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  else
-    LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
-  endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-PWD = $(shell pwd)
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir)
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
-LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)_shr
-else
-LDOPTS += -brtl
-EXTRA_LIBS = -ldl
-endif
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-ifneq ($(OS_RELEASE), 4.1.3_U1)
-ifdef NS_USE_GCC
-LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
-else
-LDOPTS += -R $(PWD)/$(dist_libdir)
-# CC on SunOS 5.4 and 5.5.x need to link with -lthread or -lpthread
-# (or use the -mt switch) even though we already linked with these
-# system libraries when we built libnspr.so.
-ifdef USE_PTHREADS
-EXTRA_LIBS = -lpthread
-else
-EXTRA_LIBS = -lthread
-endif # USE_PTHREADS
-endif # NS_USE_GCC
-endif # 4.1.3_U1
-endif # SunOS
-
-ifeq ($(OS_ARCH), NCR)
-# XXX: We see some strange problems when we link with libnspr.so.
-# So for now we use static libraries on NCR.  The shared library
-# stuff below is commented out.
-LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).a
-EXTRA_LIBS = -lsocket -lnsl -ldl
-
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-#EXTRA_LIBS = -lsocket -lnsl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), SCOOS)
-# SCO Unix needs to link against -lsocket again even though we
-# already linked with these system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), UNIXWARE)
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifneq ($(OS_RELEASE),4.2)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
-	echo system windows >w16link
-	echo option map >>w16link
-	echo option stack=10K >>w16link
-	echo option heapsize=32K >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo name $@  >>w16link
-	echo file >>w16link
-	echo $<  >>w16link
-	echo library  >>w16link
-	echo $(LIBPR),	     >>w16link
-	echo $(LIBPRSTRMS),		 >>w16link
-	echo winsock.lib     >>w16link
-	wlink @w16link.
-else
-	link $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) wsock32.lib -out:$@
-endif
-else
-ifeq ($(OS_ARCH),OS2)
-	$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) $(OS_LIBS) $(EXTRA_LIBS)
-else
-	$(CCC) $(XCFLAGS) $< $(LDOPTS) $(LIBPR) $(LIBPRSTRMS) $(EXTRA_LIBS) -o $@
-endif
-endif
-endif
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
-
-testlinker:
-	echo $(LINK)
diff --git a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp b/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp
deleted file mode 100644
index 6e8b866570..0000000000
--- a/libs/js/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prstrms.h"
-#include "prio.h"
-#include <string.h>
-#include <stdio.h>
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
-const unsigned int MaxCnt = 1;
-
-void threadwork(void *mytag);
-
-
-typedef struct threadarg {
-    void *mytag;
-} threadarg;
-
-void 
-#ifdef XP_OS2_VACPP
-_Optlink
-#endif
-threadmain(void *mytag)
-{
-    threadarg arg;
-
-    arg.mytag = mytag;
-
-    threadwork(&arg);
-}
-
-
-void
-threadwork(void *_arg)
-{
-	threadarg *arg = (threadarg *)_arg;
-	unsigned int i;
-
-	char fname1[256];
-	char fname2[256];
-
-	strcpy(fname1, (char *)arg->mytag);
-	strcpy(fname2, (char *)arg->mytag);
-	strcat(fname2, "2");
-	PR_Delete(fname1);
-	PR_Delete(fname2);
-
-	PRfilebuf *fb[MaxCnt];
-	PRifstream *ifs[MaxCnt];
-	PRofstream *ofs[MaxCnt];
-	int mode = 0;
-#ifdef XP_UNIX
-	mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IRGRP|S_IWOTH|S_IROTH;
-#endif
-
-	//
-	// Allocate a bunch
-	cout << "Testing unused filebufs ----------------" << endl;
-	for (i=0; i < MaxCnt; i++){
-		fb[i] = new PRfilebuf;
-	}
-	// Delete them
-	for (i=0; i < MaxCnt; i++){
-		delete fb[i];
-	}
-	cout << "Unused filebufs complete ---------------" << endl;
-
-	//
-	// Allocate a bunch
-	cout << "Testing unused ifstream -----------------" << endl;
-	for (i=0; i < MaxCnt; i++){
-	  ifs[i] = new PRifstream;
-	}
-	//
-	// Delete them
-	for (i=0; i < MaxCnt; i++){
-	  delete ifs[i];
-	}
-	cout << "Unused ifstream complete ----------------" << endl;
-	//
-	// Allocate a bunch
-	cout << "Testing unused ofstream -----------------" << endl;
-	for (i=0; i < MaxCnt; i++){
-		ofs[i] = new PRofstream;
-	}
-	for (i=0; i < MaxCnt; i++){
-	  *(ofs[i]) << "A"; // Write a bit
-	  delete ofs[i]; // Delete it.
-	}
-	cout << "Unused ofstream complete ----------------" << endl;
-
-	cout << "Testing use of ofstream 1 (extra filebuf allocated) ---------" << endl;
-	PRofstream *aos = new PRofstream(fname1, ios::out|ios::ate, mode);
-	for (i=0; i < MaxCnt; i++){
-	  for (int j=0; j < 8192; j++)
-		*aos << "AaBbCcDdEeFfGg" << endl;
-		fb[i] = new PRfilebuf; // Allocate as we go to hack at the heap
-	}
-	//
-	// Delete the extra foo we allocated
-	for (i=0; i < MaxCnt; i++){
-	  delete fb[i];
-	}
-	aos->flush(); // Explicit flush
-	delete aos;
-	cout << "Testing use of ofstream 1 complete (extra filebuf deleted) --" << endl;
-	cout << "Testing use of ofstream 2 (extra filebuf allocated) ---------" << endl;
-	PRofstream *aos2 = new PRofstream(fname2, ios::out, mode);
-
-	for (i=0; i < MaxCnt; i++){
-	    *aos2 << "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz";
-	}
-	// Force flushing in the dtor
-	delete aos2;
-	cout << "Testing use of ofstream 2 complete (extra filebuf deleted) --" << endl;
-	char line[1024];
-	cout << "Testing use of ifstream 1 (stack allocation) -------------" << endl;
-	PRifstream ais(fname1);
-	for (i=0; i < MaxCnt; i++){
-		ais >> line;
-	}
-	cout << "Testing use of ifstream 1 complete -----------------------" << endl;
-	cout << "Testing use of ifstream 2 ----------------------" << endl;
-	PRifstream *ais2 = new PRifstream(fname2);
-	char achar;
-	for (i=0; i < MaxCnt*10; i++){
-		*ais2 >> achar;
-	}
-	delete ais2;
-	cout << "Testing use of ifstream 2 complete -------------" << endl;
-}
-
-#define STACKSIZE 1024*1024
-int
-main(int argc, char **argv)
-{
-	PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 256);
-	threadmain("TestFile");
-	PRThread *thr1 = PR_CreateThread(PR_SYSTEM_THREAD, 
-					 threadmain, 
-					 (void *)"TestFile1",
-					 PR_PRIORITY_NORMAL,
-					 PR_GLOBAL_THREAD,
-					 PR_JOINABLE_THREAD,
-					 STACKSIZE);
-	PRThread *thr2 = PR_CreateThread(PR_SYSTEM_THREAD, 
-					 threadmain, 
-					 (void *)"TestFile2",
-					 PR_PRIORITY_NORMAL,
-					 PR_GLOBAL_THREAD,
-					 PR_JOINABLE_THREAD,
-					 STACKSIZE);
-
-	PRThread *thr3 = PR_CreateThread(PR_SYSTEM_THREAD, 
-					 threadmain, 
-					 (void *)"TestFile3",
-					 PR_PRIORITY_NORMAL,
-					 PR_GLOBAL_THREAD,
-					 PR_JOINABLE_THREAD,
-					 STACKSIZE);
-	PR_JoinThread(thr1);
-	PR_JoinThread(thr2);
-	PR_JoinThread(thr3);
-	return 0;
-}
-
diff --git a/libs/js/nsprpub/lib/tests/.cvsignore b/libs/js/nsprpub/lib/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/lib/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/lib/tests/Makefile.in b/libs/js/nsprpub/lib/tests/Makefile.in
deleted file mode 100644
index 18917ad1ec..0000000000
--- a/libs/js/nsprpub/lib/tests/Makefile.in
+++ /dev/null
@@ -1,259 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_ARCH), WINNT)
-# DIRS = windows
-endif
-
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-endif
-
-CSRCS = \
-	arena.c \
-	string.c \
-	base64t.c
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-CSRCS += arena.c
-endif
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS) $(OBJS)
-
-INCLUDES = -I$(dist_includedir)
-
-# Setting the variables LDOPTS and LIBPR.  We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(dist_libdir)
-LIBPR = -lnspr$(MOD_MAJOR_VERSION)
-LIBPLC = -lplc$(MOD_MAJOR_VERSION)
-LIBPLDS = -lplds$(MOD_MAJOR_VERSION)
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-  LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
-  LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib
-else
-  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-  ifeq ($(OS_TARGET), WIN95)
-  LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  else
-  LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(dist_libdir)/libplds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  endif
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-  ifeq ($(MOZ_OS2_TOOLS),VACPP)
-    LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768
-    LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-    LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
-    LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)	
-  else
-    LDOPTS += -Zomf -Zlinker /PM:VIO
-  endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-PWD = $(shell pwd)
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), Linux)
-    ifeq ($(OS_RELEASE), 1.2)
-        EXTRA_LIBS = -ldl
-    else
-        LDOPTS += -Xlinker -rpath $(PWD)/$(dist_libdir)
-        ifeq ($(USE_PTHREADS),1)
-            EXTRA_LIBS = -lpthread
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir)
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
-LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-ifneq ($(OS_RELEASE), 4.1.3_U1)
-ifdef NS_USE_GCC
-LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
-else
-LDOPTS += -R $(PWD)/$(dist_libdir)
-endif
-endif
-
-# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
-# even though we already linked with these system libraries
-# when we built libnspr.so.
-ifeq ($(OS_RELEASE), 5.4)
-EXTRA_LIBS = -lthread
-endif
-
-ifeq ($(OS_RELEASE), 5.5)
-ifdef USE_PTHREADS
-EXTRA_LIBS = -lpthread
-else
-EXTRA_LIBS = -lthread
-endif
-endif
-endif # SunOS
-
-ifeq ($(OS_ARCH), NCR)
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket -lnsl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifneq ($(OS_RELEASE),4.2)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
-	echo system windows >w16link
-	echo option map >>w16link
-	echo option stack=10K >>w16link
-	echo option heapsize=32K >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo name $@  >>w16link
-	echo file >>w16link
-	echo $<  >>w16link
-	echo library  >>w16link
-	echo $(LIBPR),	     >>w16link
-	echo $(LIBPLC),		 >>w16link
-	echo winsock.lib     >>w16link
-	wlink @w16link.
-else
-	link $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) wsock32.lib -out:$@
-endif
-else
-ifeq ($(OS_ARCH),OS2)
-	$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC)  $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
-else
-	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@
-endif
-endif
-endif
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
-
-
-
diff --git a/libs/js/nsprpub/lib/tests/arena.c b/libs/js/nsprpub/lib/tests/arena.c
deleted file mode 100644
index 9c74479cbd..0000000000
--- a/libs/js/nsprpub/lib/tests/arena.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        arena.c
-** Description: Testing arenas
-**
-*/
-
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "nspr.h"
-#include "plarena.h"
-#include "plgetopt.h"
-
-PRLogModuleInfo *tLM;
-PRIntn  threadCount = 0;
-PRMonitor   *tMon;
-PRBool failed_already = PR_FALSE;
-
-/* Arguments from the command line with default values */
-PRIntn debug_mode = 0;
-PRIntn  poolMin = 4096;
-PRIntn  poolMax = (100 * 4096);
-PRIntn  arenaMin = 40;
-PRIntn  arenaMax = (100 * 40);
-PRIntn  stressIterations = 15;
-PRIntn  maxAlloc = (1024 * 1024);
-PRIntn  stressThreads = 4;
-
-void DumpAll( void )
-{
-	return;
-}
-
-/*
-** Test Arena allocation.
-*/
-static void ArenaAllocate( void )
-{
-    PLArenaPool ap;
-    void    *ptr;
-	PRInt32	i;
-
-    PL_InitArenaPool( &ap, "AllocArena", 2048, sizeof(double));
-    PR_LOG( tLM, PR_LOG_DEBUG, ("AA, InitPool -- Pool: %p. first: %p, current: %p, size: %d", 
-        &ap, ap.first, ap.current, ap.arenasize  ));
-
-	for( i = 0; i < 150; i++ )
-	{
-		PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-        PR_LOG( tLM, PR_LOG_DEBUG,("AA, after alloc -- Pool: %p. first: %p, current: %p, size: %d", 
-               &ap, ap.first, ap.current, ap.arenasize  ));
-		PR_LOG( tLM, PR_LOG_DEBUG,(
-		    "AA -- Pool: %p. alloc: %p ", &ap, ptr ));
-	}
-
-    PL_FreeArenaPool( &ap );
-
-	for( i = 0; i < 221; i++ )
-	{
-		PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-        PR_LOG( tLM, PR_LOG_DEBUG,("AA, after alloc -- Pool: %p. first: %p, current: %p, size: %d", 
-               &ap, ap.first, ap.current, ap.arenasize  ));
-		PR_LOG( tLM, PR_LOG_DEBUG,(
-		    "AA -- Pool: %p. alloc: %p ", &ap, ptr ));
-	}
-
-    PL_FreeArenaPool( &ap );
-    
-    return;
-} /* end ArenaGrow() */
-/*
-** Test Arena grow.
-*/
-static void ArenaGrow( void )
-{
-    PLArenaPool ap;
-    void    *ptr;
-	PRInt32	i;
-
-    PL_InitArenaPool( &ap, "TheArena", 4096, sizeof(double));
-    PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-
-	PR_LOG( tLM, PR_LOG_DEBUG, ("Before growth -- Pool: %p. alloc: %p ", &ap, ptr ));
-
-	for( i = 0; i < 10; i++ )
-	{
-		PL_ARENA_GROW( ptr, &ap, 512, 7000 );
-		PR_LOG( tLM, PR_LOG_DEBUG, ("After growth -- Pool: %p. alloc: %p ", &ap, ptr ));
-	}
-
-
-    return;
-} /* end ArenaGrow() */
-
-
-/*
-** Test arena Mark and Release.
-*/
-static void MarkAndRelease( void )
-{
-    PLArenaPool ap;
-    void    *ptr = NULL;
-    void    *mark0, *mark1;
-    PRIntn  i;
-
-    PL_InitArenaPool( &ap, "TheArena", 4096, sizeof(double));
-    mark0 = PL_ARENA_MARK( &ap );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("mark0. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p, m0: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr, mark0 ));
-
-	for( i = 0; i < 201; i++ )
-	{
-		PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-        PR_LOG( tLM, PR_LOG_DEBUG,
-            ("mr. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-                &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-	}
-
-    mark1 = PL_ARENA_MARK( &ap );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("mark1. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p, m1: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr, mark1 ));
-
-
-	for( i = 0; i < 225; i++ )
-	{
-		PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-        PR_LOG( tLM, PR_LOG_DEBUG,
-            ("mr. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-                &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-	}
-
-    PL_ARENA_RELEASE( &ap, mark1 );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("Release-1: %p -- Pool: %p. first: %p, current: %p, size: %d", 
-               mark1, &ap, ap.first, ap.current, ap.arenasize  ));
-
-	for( i = 0; i < 20; i++ )
-	{
-		PL_ARENA_ALLOCATE( ptr, &ap, 512 );
-        PR_LOG( tLM, PR_LOG_DEBUG,
-            ("mr. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-                &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-	}
-
-    PL_ARENA_RELEASE( &ap, mark1 );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("Release-1. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-
-    PL_ARENA_RELEASE( &ap, mark0 );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("Release-0. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-
-    PL_FreeArenaPool( &ap );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("Free. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-    
-    PL_FinishArenaPool( &ap );
-    PR_LOG( tLM, PR_LOG_DEBUG,
-        ("Finish. ap: %p, ap.f: %p, ap.c: %p, ap.siz: %d, alloc: %p", 
-            &ap, ap.first.next, ap.current, ap.arenasize, ptr ));
-
-    return;
-} /* end MarkAndRelease() */
-
-/*
-** RandSize() returns a random number in the range 
-** min..max, rounded to the next doubleword
-**
-*/
-static PRIntn RandSize( PRIntn min, PRIntn max )
-{
-    PRIntn  sz = (rand() % (max -min)) + min + sizeof(double);
-
-    sz &= ~sizeof(double)-1;
-
-    return(sz);
-}
-
-
-/*
-** StressThread()
-** A bunch of these beat on individual arenas
-** This tests the free_list protection.
-**
-*/
-static void PR_CALLBACK StressThread( void *arg )
-{
-    PLArenaPool ap;
-    PRIntn i;
-    PRIntn sz;
-    void *ptr;
-    PRThread *tp = PR_GetCurrentThread();
-
-    PR_LOG( tLM, PR_LOG_DEBUG, ("Stress Thread %p started\n", PR_GetCurrentThread()));
-    PL_InitArenaPool( &ap, "TheArena", RandSize( poolMin, poolMax), sizeof(double));
-
-    for ( i = 0; i < stressIterations; i++ )
-    {
-        PRIntn allocated = 0;
-
-        while ( allocated < maxAlloc )
-        {
-            sz = RandSize( arenaMin, arenaMax );
-            PL_ARENA_ALLOCATE( ptr, &ap, sz );
-            if ( ptr == NULL )
-            {
-                PR_LOG( tLM, PR_LOG_ERROR, ("ARENA_ALLOCATE() returned NULL\n\tAllocated: %d\n", allocated));
-                break;
-            }
-            allocated += sz;
-        }
-        PR_LOG( tLM, PR_LOG_DEBUG, ("Stress thread %p finished one iteration\n", tp));
-        PL_FreeArenaPool( &ap );
-    }
-    PR_LOG( tLM, PR_LOG_DEBUG, ("Stress thread %p finished all iteration\n", tp));
-    PL_FinishArenaPool( &ap );
-    PR_LOG( tLM, PR_LOG_DEBUG, ("Stress thread %p after FinishArenaPool()\n", tp));
-
-    /* That's all folks! let's quit */
-    PR_EnterMonitor(tMon);
-    threadCount--;
-    PR_Notify(tMon);
-    PR_ExitMonitor(tMon);    
-    return;
-}    
-
-/*
-** Stress()
-** Flog the hell out of arenas multi-threaded.
-** Do NOT pass an individual arena to another thread.
-** 
-*/
-static void Stress( void )
-{
-    PRThread    *tt;
-    PRIntn      i;
-
-    tMon = PR_NewMonitor();
-
-    for ( i = 0 ; i < stressThreads ; i++ )
-    {
-        PR_EnterMonitor(tMon);
-        tt = PR_CreateThread(PR_USER_THREAD,
-               StressThread,
-               NULL,
-               PR_PRIORITY_NORMAL,
-               PR_GLOBAL_THREAD,
-               PR_UNJOINABLE_THREAD,
-               0);
-        threadCount++;
-        PR_ExitMonitor(tMon);
-    }
-
-    /* Wait for all threads to exit */
-    PR_EnterMonitor(tMon);
-    while ( threadCount != 0 ) 
-    {
-        PR_Wait(tMon, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_ExitMonitor(tMon);
-	PR_DestroyMonitor(tMon);
-
-    return;
-} /* end Stress() */
-
-/*
-** EvaluateResults()
-** uses failed_already to display results and set program
-** exit code.
-*/
-static PRIntn  EvaluateResults(void)
-{
-    PRIntn rc = 0;
-
-    if ( failed_already == PR_TRUE )
-    {
-        PR_LOG( tLM, PR_LOG_DEBUG, ("FAIL\n"));
-        rc =1;
-    } 
-    else
-    {
-        PR_LOG( tLM, PR_LOG_DEBUG, ("PASS\n"));
-    }
-    return(rc);
-} /* EvaluateResults() */
-
-void Help( void )
-{
-    printf("arena [options]\n");
-    printf("where options are:\n");
-    printf("-p <n>   minimum size of an arena pool. Default(%d)\n", poolMin);
-    printf("-P <n>   maximum size of an arena pool. Default(%d)\n", poolMax);
-    printf("-a <n>   minimum size of an arena allocation. Default(%d)\n", arenaMin);
-    printf("-A <n>   maximum size of an arena allocation. Default(%d)\n", arenaMax);
-    printf("-i <n>   number of iterations in a stress thread. Default(%d)\n", stressIterations);
-    printf("-s <n>   maximum allocation for a single stress thread. Default(%d)\n", maxAlloc);
-    printf("-t <n>   number of stress threads. Default(%d)\n", stressThreads );
-    printf("-d       enable debug mode\n");
-    printf("\n");
-    exit(1);
-}    
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dhp:P:a:A:i:s:t:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'a':  /* arena Min size */
-            arenaMin = atol( opt->value );
-            break;
-        case 'A':  /* arena Max size  */
-            arenaMax = atol( opt->value );
-            break;
-        case 'p':  /* pool Min size */
-            poolMin = atol( opt->value );
-            break;
-        case 'P':  /* pool Max size */
-            poolMax = atol( opt->value );
-            break;
-        case 'i':  /* Iterations in stress tests */
-            stressIterations = atol( opt->value );
-            break;
-        case 's':  /* storage to get per iteration */
-            maxAlloc = atol( opt->value );
-            break;
-        case 't':  /* Number of stress threads to create */
-            stressThreads = atol( opt->value );
-            break;
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'h':  /* help */
-        default:
-            Help();
-        } /* end switch() */
-    } /* end while() */
-	PL_DestroyOptState(opt);
-
-    srand( (unsigned)time( NULL ) ); /* seed random number generator */
-    tLM = PR_NewLogModule("testcase");
-
-
-#if 0
-	ArenaAllocate();
-	ArenaGrow();
-#endif
-
-    MarkAndRelease();
-
-    Stress();
-
-    return(EvaluateResults());
-} /* end main() */
-
-/* arena.c */
diff --git a/libs/js/nsprpub/lib/tests/base64t.c b/libs/js/nsprpub/lib/tests/base64t.c
deleted file mode 100644
index c3c488137f..0000000000
--- a/libs/js/nsprpub/lib/tests/base64t.c
+++ /dev/null
@@ -1,3047 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plbase64.h"
-#include "plstr.h"
-#include "nspr.h"
-
-#include <stdio.h>
-
-static unsigned char *base = (unsigned char *)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/* PL_Base64Encode, single characters */
-PRBool test_001(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 001 (PL_Base64Encode, single characters)                         ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Encode((char *)plain, 1, result);
-            if( rv != result )
-            {
-                printf("FAIL\n\t(%d, %d): return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strncmp((char *)cypher, result, 4) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%.4s.\"\n",
-                       a, b, cypher, result);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, double characters */
-PRBool test_002(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 002 (PL_Base64Encode, double characters)                         ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Encode((char *)plain, 2, result);
-                    if( rv != result )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strncmp((char *)cypher, result, 4) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%.4s.\"\n",
-                               a, b, c, d, cypher, result);
-                        return PR_FALSE;
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, triple characters */
-PRBool test_003(void)
-{
-    PRUint32 a, b, c, d, e, f;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 003 (PL_Base64Encode, triple characters)                         ..."); fflush(stdout);
-
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    for( e = 0; e < 4; e++ )
-                    {
-                        cypher[2] = base[d*4 + e];
-                        for( f = 0; f < 64; f++ )
-                        {
-                            plain[2] = e * 64 + f;
-                            cypher[3] = base[f];
-
-                            rv = PL_Base64Encode((char *)plain, 3, result);
-                            if( rv != result )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): return value\n", a, b, c, d, e, f);
-                                return PR_FALSE;
-                            }
-
-                            if( 0 != PL_strncmp((char *)cypher, result, 4) )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): expected \"%s,\" got \"%.4s.\"\n",
-                                       a, b, c, d, e, f, cypher, result);
-                                return PR_FALSE;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-    static struct
-    {
-        const char *plaintext;
-        const char *cyphertext;
-    } array[] =
-      {
-          /* Cyphertexts generated with uuenview 0.5.13 */
-          { " ", "IA==" },
-          { ".", "Lg==" },
-          { "/", "Lw==" },
-          { "C", "Qw==" },
-          { "H", "SA==" },
-          { "S", "Uw==" },
-          { "^", "Xg==" },
-          { "a", "YQ==" },
-          { "o", "bw==" },
-          { "t", "dA==" },
-
-          { "AB", "QUI=" },
-          { "AH", "QUg=" },
-          { "AQ", "QVE=" },
-          { "BD", "QkQ=" },
-          { "CR", "Q1I=" },
-          { "CS", "Q1M=" },
-          { "DB", "REI=" },
-          { "DC", "REM=" },
-          { "EK", "RUs=" },
-          { "ET", "RVQ=" },
-          { "IM", "SU0=" },
-          { "JR", "SlI=" },
-          { "LO", "TE8=" },
-          { "LW", "TFc=" },
-          { "ML", "TUw=" },
-          { "SB", "U0I=" },
-          { "TO", "VE8=" },
-          { "VS", "VlM=" },
-          { "WP", "V1A=" },
-          /* legitimate two-letter words */
-          { "ad", "YWQ=" },
-          { "ah", "YWg=" },
-          { "am", "YW0=" },
-          { "an", "YW4=" },
-          { "as", "YXM=" },
-          { "at", "YXQ=" },
-          { "ax", "YXg=" },
-          { "be", "YmU=" },
-          { "by", "Ynk=" },
-          { "do", "ZG8=" },
-          { "go", "Z28=" },
-          { "he", "aGU=" },
-          { "hi", "aGk=" },
-          { "if", "aWY=" },
-          { "in", "aW4=" },
-          { "is", "aXM=" },
-          { "it", "aXQ=" },
-          { "me", "bWU=" },
-          { "my", "bXk=" },
-          { "no", "bm8=" },
-          { "of", "b2Y=" },
-          { "on", "b24=" },
-          { "or", "b3I=" },
-          { "ox", "b3g=" },
-          { "so", "c28=" },
-          { "to", "dG8=" },
-          { "up", "dXA=" },
-          { "us", "dXM=" },
-          { "we", "d2U=" },
-          /* all three-letter entries in /usr/dict/words */
-          { "1st", "MXN0" },
-          { "2nd", "Mm5k" },
-          { "3rd", "M3Jk" },
-          { "4th", "NHRo" },
-          { "5th", "NXRo" },
-          { "6th", "NnRo" },
-          { "7th", "N3Ro" },
-          { "8th", "OHRo" },
-          { "9th", "OXRo" },
-          { "AAA", "QUFB" },
-          { "AAU", "QUFV" },
-          { "ABA", "QUJB" },
-          { "abc", "YWJj" },
-          { "Abe", "QWJl" },
-          { "Abo", "QWJv" },
-          { "ace", "YWNl" },
-          { "ACM", "QUNN" },
-          { "ACS", "QUNT" },
-          { "act", "YWN0" },
-          { "Ada", "QWRh" },
-          { "add", "YWRk" },
-          { "ado", "YWRv" },
-          { "aft", "YWZ0" },
-          { "age", "YWdl" },
-          { "ago", "YWdv" },
-          { "aid", "YWlk" },
-          { "ail", "YWls" },
-          { "aim", "YWlt" },
-          { "air", "YWly" },
-          { "ala", "YWxh" },
-          { "alb", "YWxi" },
-          { "ale", "YWxl" },
-          { "Ali", "QWxp" },
-          { "all", "YWxs" },
-          { "alp", "YWxw" },
-          { "A&M", "QSZN" },
-          { "AMA", "QU1B" },
-          { "ami", "YW1p" },
-          { "amp", "YW1w" },
-          { "Amy", "QW15" },
-          { "amy", "YW15" },
-          { "ana", "YW5h" },
-          { "and", "YW5k" },
-          { "ani", "YW5p" },
-          { "Ann", "QW5u" },
-          { "ant", "YW50" },
-          { "any", "YW55" },
-          { "A&P", "QSZQ" },
-          { "ape", "YXBl" },
-          { "Apr", "QXBy" },
-          { "APS", "QVBT" },
-          { "apt", "YXB0" },
-          { "arc", "YXJj" },
-          { "are", "YXJl" },
-          { "ark", "YXJr" },
-          { "arm", "YXJt" },
-          { "art", "YXJ0" },
-          { "a's", "YSdz" },
-          { "ash", "YXNo" },
-          { "ask", "YXNr" },
-          { "ass", "YXNz" },
-          { "ate", "YXRl" },
-          { "Aug", "QXVn" },
-          { "auk", "YXVr" },
-          { "Ave", "QXZl" },
-          { "awe", "YXdl" },
-          { "awl", "YXds" },
-          { "awn", "YXdu" },
-          { "axe", "YXhl" },
-          { "aye", "YXll" },
-          { "bad", "YmFk" },
-          { "bag", "YmFn" },
-          { "bah", "YmFo" },
-          { "bam", "YmFt" },
-          { "ban", "YmFu" },
-          { "bar", "YmFy" },
-          { "bat", "YmF0" },
-          { "bay", "YmF5" },
-          { "bed", "YmVk" },
-          { "bee", "YmVl" },
-          { "beg", "YmVn" },
-          { "bel", "YmVs" },
-          { "Ben", "QmVu" },
-          { "bet", "YmV0" },
-          { "bey", "YmV5" },
-          { "bib", "Ymli" },
-          { "bid", "Ymlk" },
-          { "big", "Ymln" },
-          { "bin", "Ymlu" },
-          { "bit", "Yml0" },
-          { "biz", "Yml6" },
-          { "BMW", "Qk1X" },
-          { "boa", "Ym9h" },
-          { "bob", "Ym9i" },
-          { "bog", "Ym9n" },
-          { "bon", "Ym9u" },
-          { "boo", "Ym9v" },
-          { "bop", "Ym9w" },
-          { "bow", "Ym93" },
-          { "box", "Ym94" },
-          { "boy", "Ym95" },
-          { "b's", "Yidz" },
-          { "BTL", "QlRM" },
-          { "BTU", "QlRV" },
-          { "bub", "YnVi" },
-          { "bud", "YnVk" },
-          { "bug", "YnVn" },
-          { "bum", "YnVt" },
-          { "bun", "YnVu" },
-          { "bus", "YnVz" },
-          { "but", "YnV0" },
-          { "buy", "YnV5" },
-          { "bye", "Ynll" },
-          { "cab", "Y2Fi" },
-          { "Cal", "Q2Fs" },
-          { "cam", "Y2Ft" },
-          { "can", "Y2Fu" },
-          { "cap", "Y2Fw" },
-          { "car", "Y2Fy" },
-          { "cat", "Y2F0" },
-          { "caw", "Y2F3" },
-          { "CBS", "Q0JT" },
-          { "CDC", "Q0RD" },
-          { "CEQ", "Q0VR" },
-          { "chi", "Y2hp" },
-          { "CIA", "Q0lB" },
-          { "cit", "Y2l0" },
-          { "cod", "Y29k" },
-          { "cog", "Y29n" },
-          { "col", "Y29s" },
-          { "con", "Y29u" },
-          { "coo", "Y29v" },
-          { "cop", "Y29w" },
-          { "cos", "Y29z" },
-          { "cot", "Y290" },
-          { "cow", "Y293" },
-          { "cox", "Y294" },
-          { "coy", "Y295" },
-          { "CPA", "Q1BB" },
-          { "cpu", "Y3B1" },
-          { "CRT", "Q1JU" },
-          { "cry", "Y3J5" },
-          { "c's", "Yydz" },
-          { "cub", "Y3Vi" },
-          { "cud", "Y3Vk" },
-          { "cue", "Y3Vl" },
-          { "cup", "Y3Vw" },
-          { "cur", "Y3Vy" },
-          { "cut", "Y3V0" },
-          { "dab", "ZGFi" },
-          { "dad", "ZGFk" },
-          { "dam", "ZGFt" },
-          { "Dan", "RGFu" },
-          { "Dar", "RGFy" },
-          { "day", "ZGF5" },
-          { "Dec", "RGVj" },
-          { "Dee", "RGVl" },
-          { "Del", "RGVs" },
-          { "den", "ZGVu" },
-          { "Des", "RGVz" },
-          { "dew", "ZGV3" },
-          { "dey", "ZGV5" },
-          { "did", "ZGlk" },
-          { "die", "ZGll" },
-          { "dig", "ZGln" },
-          { "dim", "ZGlt" },
-          { "din", "ZGlu" },
-          { "dip", "ZGlw" },
-          { "Dis", "RGlz" },
-          { "DNA", "RE5B" },
-          { "DOD", "RE9E" },
-          { "doe", "ZG9l" },
-          { "dog", "ZG9n" },
-          { "don", "ZG9u" },
-          { "dot", "ZG90" },
-          { "Dow", "RG93" },
-          { "dry", "ZHJ5" },
-          { "d's", "ZCdz" },
-          { "dub", "ZHVi" },
-          { "dud", "ZHVk" },
-          { "due", "ZHVl" },
-          { "dug", "ZHVn" },
-          { "dun", "ZHVu" },
-          { "dye", "ZHll" },
-          { "ear", "ZWFy" },
-          { "eat", "ZWF0" },
-          { "ebb", "ZWJi" },
-          { "EDT", "RURU" },
-          { "eel", "ZWVs" },
-          { "eft", "ZWZ0" },
-          { "e.g", "ZS5n" },
-          { "egg", "ZWdn" },
-          { "ego", "ZWdv" },
-          { "eke", "ZWtl" },
-          { "Eli", "RWxp" },
-          { "elk", "ZWxr" },
-          { "ell", "ZWxs" },
-          { "elm", "ZWxt" },
-          { "Ely", "RWx5" },
-          { "end", "ZW5k" },
-          { "Eng", "RW5n" },
-          { "EPA", "RVBB" },
-          { "era", "ZXJh" },
-          { "ere", "ZXJl" },
-          { "erg", "ZXJn" },
-          { "err", "ZXJy" },
-          { "e's", "ZSdz" },
-          { "EST", "RVNU" },
-          { "eta", "ZXRh" },
-          { "etc", "ZXRj" },
-          { "Eva", "RXZh" },
-          { "eve", "ZXZl" },
-          { "ewe", "ZXdl" },
-          { "eye", "ZXll" },
-          { "FAA", "RkFB" },
-          { "fad", "ZmFk" },
-          { "fag", "ZmFn" },
-          { "fan", "ZmFu" },
-          { "far", "ZmFy" },
-          { "fat", "ZmF0" },
-          { "fay", "ZmF5" },
-          { "FBI", "RkJJ" },
-          { "FCC", "RkND" },
-          { "FDA", "RkRB" },
-          { "Feb", "RmVi" },
-          { "fed", "ZmVk" },
-          { "fee", "ZmVl" },
-          { "few", "ZmV3" },
-          { "fib", "Zmli" },
-          { "fig", "Zmln" },
-          { "fin", "Zmlu" },
-          { "fir", "Zmly" },
-          { "fit", "Zml0" },
-          { "fix", "Zml4" },
-          { "Flo", "Rmxv" },
-          { "flu", "Zmx1" },
-          { "fly", "Zmx5" },
-          { "FMC", "Rk1D" },
-          { "fob", "Zm9i" },
-          { "foe", "Zm9l" },
-          { "fog", "Zm9n" },
-          { "fop", "Zm9w" },
-          { "for", "Zm9y" },
-          { "fox", "Zm94" },
-          { "FPC", "RlBD" },
-          { "fro", "ZnJv" },
-          { "fry", "ZnJ5" },
-          { "f's", "Zidz" },
-          { "FTC", "RlRD" },
-          { "fum", "ZnVt" },
-          { "fun", "ZnVu" },
-          { "fur", "ZnVy" },
-          { "gab", "Z2Fi" },
-          { "gad", "Z2Fk" },
-          { "gag", "Z2Fn" },
-          { "gal", "Z2Fs" },
-          { "gam", "Z2Ft" },
-          { "GAO", "R0FP" },
-          { "gap", "Z2Fw" },
-          { "gar", "Z2Fy" },
-          { "gas", "Z2Fz" },
-          { "gay", "Z2F5" },
-          { "gee", "Z2Vl" },
-          { "gel", "Z2Vs" },
-          { "gem", "Z2Vt" },
-          { "get", "Z2V0" },
-          { "gig", "Z2ln" },
-          { "Gil", "R2ls" },
-          { "gin", "Z2lu" },
-          { "GMT", "R01U" },
-          { "GNP", "R05Q" },
-          { "gnu", "Z251" },
-          { "Goa", "R29h" },
-          { "gob", "Z29i" },
-          { "god", "Z29k" },
-          { "gog", "Z29n" },
-          { "GOP", "R09Q" },
-          { "got", "Z290" },
-          { "GPO", "R1BP" },
-          { "g's", "Zydz" },
-          { "GSA", "R1NB" },
-          { "gum", "Z3Vt" },
-          { "gun", "Z3Vu" },
-          { "Gus", "R3Vz" },
-          { "gut", "Z3V0" },
-          { "guy", "Z3V5" },
-          { "gym", "Z3lt" },
-          { "gyp", "Z3lw" },
-          { "had", "aGFk" },
-          { "Hal", "SGFs" },
-          { "ham", "aGFt" },
-          { "Han", "SGFu" },
-          { "hap", "aGFw" },
-          { "hat", "aGF0" },
-          { "haw", "aGF3" },
-          { "hay", "aGF5" },
-          { "hem", "aGVt" },
-          { "hen", "aGVu" },
-          { "her", "aGVy" },
-          { "hew", "aGV3" },
-          { "hex", "aGV4" },
-          { "hey", "aGV5" },
-          { "hid", "aGlk" },
-          { "him", "aGlt" },
-          { "hip", "aGlw" },
-          { "his", "aGlz" },
-          { "hit", "aGl0" },
-          { "hob", "aG9i" },
-          { "hoc", "aG9j" },
-          { "hoe", "aG9l" },
-          { "hog", "aG9n" },
-          { "hoi", "aG9p" },
-          { "Hom", "SG9t" },
-          { "hop", "aG9w" },
-          { "hot", "aG90" },
-          { "how", "aG93" },
-          { "hoy", "aG95" },
-          { "h's", "aCdz" },
-          { "hub", "aHVi" },
-          { "hue", "aHVl" },
-          { "hug", "aHVn" },
-          { "huh", "aHVo" },
-          { "hum", "aHVt" },
-          { "Hun", "SHVu" },
-          { "hut", "aHV0" },
-          { "Ian", "SWFu" },
-          { "IBM", "SUJN" },
-          { "Ibn", "SWJu" },
-          { "ICC", "SUND" },
-          { "ice", "aWNl" },
-          { "icy", "aWN5" },
-          { "I'd", "SSdk" },
-          { "Ida", "SWRh" },
-          { "i.e", "aS5l" },
-          { "iii", "aWlp" },
-          { "Ike", "SWtl" },
-          { "ill", "aWxs" },
-          { "I'm", "SSdt" },
-          { "imp", "aW1w" },
-          { "Inc", "SW5j" },
-          { "ink", "aW5r" },
-          { "inn", "aW5u" },
-          { "ion", "aW9u" },
-          { "Ira", "SXJh" },
-          { "ire", "aXJl" },
-          { "irk", "aXJr" },
-          { "IRS", "SVJT" },
-          { "i's", "aSdz" },
-          { "Ito", "SXRv" },
-          { "ITT", "SVRU" },
-          { "ivy", "aXZ5" },
-          { "jab", "amFi" },
-          { "jag", "amFn" },
-          { "jam", "amFt" },
-          { "Jan", "SmFu" },
-          { "jar", "amFy" },
-          { "jaw", "amF3" },
-          { "jay", "amF5" },
-          { "Jed", "SmVk" },
-          { "jet", "amV0" },
-          { "Jew", "SmV3" },
-          { "jig", "amln" },
-          { "Jim", "Smlt" },
-          { "job", "am9i" },
-          { "Joe", "Sm9l" },
-          { "jog", "am9n" },
-          { "Jon", "Sm9u" },
-          { "jot", "am90" },
-          { "joy", "am95" },
-          { "j's", "aidz" },
-          { "jug", "anVn" },
-          { "jut", "anV0" },
-          { "Kay", "S2F5" },
-          { "keg", "a2Vn" },
-          { "ken", "a2Vu" },
-          { "key", "a2V5" },
-          { "kid", "a2lk" },
-          { "Kim", "S2lt" },
-          { "kin", "a2lu" },
-          { "kit", "a2l0" },
-          { "k's", "aydz" },
-          { "lab", "bGFi" },
-          { "lac", "bGFj" },
-          { "lad", "bGFk" },
-          { "lag", "bGFn" },
-          { "lam", "bGFt" },
-          { "Lao", "TGFv" },
-          { "lap", "bGFw" },
-          { "law", "bGF3" },
-          { "lax", "bGF4" },
-          { "lay", "bGF5" },
-          { "lea", "bGVh" },
-          { "led", "bGVk" },
-          { "lee", "bGVl" },
-          { "leg", "bGVn" },
-          { "Len", "TGVu" },
-          { "Leo", "TGVv" },
-          { "let", "bGV0" },
-          { "Lev", "TGV2" },
-          { "Lew", "TGV3" },
-          { "lew", "bGV3" },
-          { "lid", "bGlk" },
-          { "lie", "bGll" },
-          { "lim", "bGlt" },
-          { "Lin", "TGlu" },
-          { "lip", "bGlw" },
-          { "lit", "bGl0" },
-          { "Liz", "TGl6" },
-          { "lob", "bG9i" },
-          { "log", "bG9n" },
-          { "lop", "bG9w" },
-          { "Los", "TG9z" },
-          { "lot", "bG90" },
-          { "Lou", "TG91" },
-          { "low", "bG93" },
-          { "loy", "bG95" },
-          { "l's", "bCdz" },
-          { "LSI", "TFNJ" },
-          { "Ltd", "THRk" },
-          { "LTV", "TFRW" },
-          { "lug", "bHVn" },
-          { "lux", "bHV4" },
-          { "lye", "bHll" },
-          { "Mac", "TWFj" },
-          { "mad", "bWFk" },
-          { "Mae", "TWFl" },
-          { "man", "bWFu" },
-          { "Mao", "TWFv" },
-          { "map", "bWFw" },
-          { "mar", "bWFy" },
-          { "mat", "bWF0" },
-          { "maw", "bWF3" },
-          { "Max", "TWF4" },
-          { "max", "bWF4" },
-          { "may", "bWF5" },
-          { "MBA", "TUJB" },
-          { "Meg", "TWVn" },
-          { "Mel", "TWVs" },
-          { "men", "bWVu" },
-          { "met", "bWV0" },
-          { "mew", "bWV3" },
-          { "mid", "bWlk" },
-          { "mig", "bWln" },
-          { "min", "bWlu" },
-          { "MIT", "TUlU" },
-          { "mix", "bWl4" },
-          { "mob", "bW9i" },
-          { "Moe", "TW9l" },
-          { "moo", "bW9v" },
-          { "mop", "bW9w" },
-          { "mot", "bW90" },
-          { "mow", "bW93" },
-          { "MPH", "TVBI" },
-          { "Mrs", "TXJz" },
-          { "m's", "bSdz" },
-          { "mud", "bXVk" },
-          { "mug", "bXVn" },
-          { "mum", "bXVt" },
-          { "nab", "bmFi" },
-          { "nag", "bmFn" },
-          { "Nan", "TmFu" },
-          { "nap", "bmFw" },
-          { "Nat", "TmF0" },
-          { "nay", "bmF5" },
-          { "NBC", "TkJD" },
-          { "NBS", "TkJT" },
-          { "NCO", "TkNP" },
-          { "NCR", "TkNS" },
-          { "Ned", "TmVk" },
-          { "nee", "bmVl" },
-          { "net", "bmV0" },
-          { "new", "bmV3" },
-          { "nib", "bmli" },
-          { "NIH", "TklI" },
-          { "nil", "bmls" },
-          { "nip", "bmlw" },
-          { "nit", "bml0" },
-          { "NNE", "Tk5F" },
-          { "NNW", "Tk5X" },
-          { "nob", "bm9i" },
-          { "nod", "bm9k" },
-          { "non", "bm9u" },
-          { "nor", "bm9y" },
-          { "not", "bm90" },
-          { "Nov", "Tm92" },
-          { "now", "bm93" },
-          { "NRC", "TlJD" },
-          { "n's", "bidz" },
-          { "NSF", "TlNG" },
-          { "nun", "bnVu" },
-          { "nut", "bnV0" },
-          { "NYC", "TllD" },
-          { "NYU", "TllV" },
-          { "oaf", "b2Fm" },
-          { "oak", "b2Fr" },
-          { "oar", "b2Fy" },
-          { "oat", "b2F0" },
-          { "Oct", "T2N0" },
-          { "odd", "b2Rk" },
-          { "ode", "b2Rl" },
-          { "off", "b2Zm" },
-          { "oft", "b2Z0" },
-          { "ohm", "b2ht" },
-          { "oil", "b2ls" },
-          { "old", "b2xk" },
-          { "one", "b25l" },
-          { "opt", "b3B0" },
-          { "orb", "b3Ji" },
-          { "ore", "b3Jl" },
-          { "Orr", "T3Jy" },
-          { "o's", "bydz" },
-          { "Ott", "T3R0" },
-          { "our", "b3Vy" },
-          { "out", "b3V0" },
-          { "ova", "b3Zh" },
-          { "owe", "b3dl" },
-          { "owl", "b3ds" },
-          { "own", "b3du" },
-          { "pad", "cGFk" },
-          { "pal", "cGFs" },
-          { "Pam", "UGFt" },
-          { "pan", "cGFu" },
-          { "pap", "cGFw" },
-          { "par", "cGFy" },
-          { "pat", "cGF0" },
-          { "paw", "cGF3" },
-          { "pax", "cGF4" },
-          { "pay", "cGF5" },
-          { "Paz", "UGF6" },
-          { "PBS", "UEJT" },
-          { "PDP", "UERQ" },
-          { "pea", "cGVh" },
-          { "pee", "cGVl" },
-          { "peg", "cGVn" },
-          { "pen", "cGVu" },
-          { "pep", "cGVw" },
-          { "per", "cGVy" },
-          { "pet", "cGV0" },
-          { "pew", "cGV3" },
-          { "PhD", "UGhE" },
-          { "phi", "cGhp" },
-          { "pie", "cGll" },
-          { "pig", "cGln" },
-          { "pin", "cGlu" },
-          { "pip", "cGlw" },
-          { "pit", "cGl0" },
-          { "ply", "cGx5" },
-          { "pod", "cG9k" },
-          { "Poe", "UG9l" },
-          { "poi", "cG9p" },
-          { "pol", "cG9s" },
-          { "pop", "cG9w" },
-          { "pot", "cG90" },
-          { "pow", "cG93" },
-          { "ppm", "cHBt" },
-          { "pro", "cHJv" },
-          { "pry", "cHJ5" },
-          { "p's", "cCdz" },
-          { "psi", "cHNp" },
-          { "PTA", "UFRB" },
-          { "pub", "cHVi" },
-          { "PUC", "UFVD" },
-          { "pug", "cHVn" },
-          { "pun", "cHVu" },
-          { "pup", "cHVw" },
-          { "pus", "cHVz" },
-          { "put", "cHV0" },
-          { "PVC", "UFZD" },
-          { "QED", "UUVE" },
-          { "q's", "cSdz" },
-          { "qua", "cXVh" },
-          { "quo", "cXVv" },
-          { "Rae", "UmFl" },
-          { "rag", "cmFn" },
-          { "raj", "cmFq" },
-          { "ram", "cmFt" },
-          { "ran", "cmFu" },
-          { "rap", "cmFw" },
-          { "rat", "cmF0" },
-          { "raw", "cmF3" },
-          { "ray", "cmF5" },
-          { "RCA", "UkNB" },
-          { "R&D", "UiZE" },
-          { "reb", "cmVi" },
-          { "red", "cmVk" },
-          { "rep", "cmVw" },
-          { "ret", "cmV0" },
-          { "rev", "cmV2" },
-          { "Rex", "UmV4" },
-          { "rho", "cmhv" },
-          { "rib", "cmli" },
-          { "rid", "cmlk" },
-          { "rig", "cmln" },
-          { "rim", "cmlt" },
-          { "Rio", "Umlv" },
-          { "rip", "cmlw" },
-          { "RNA", "Uk5B" },
-          { "rob", "cm9i" },
-          { "rod", "cm9k" },
-          { "roe", "cm9l" },
-          { "Ron", "Um9u" },
-          { "rot", "cm90" },
-          { "row", "cm93" },
-          { "Roy", "Um95" },
-          { "RPM", "UlBN" },
-          { "r's", "cidz" },
-          { "rub", "cnVi" },
-          { "rue", "cnVl" },
-          { "rug", "cnVn" },
-          { "rum", "cnVt" },
-          { "run", "cnVu" },
-          { "rut", "cnV0" },
-          { "rye", "cnll" },
-          { "sac", "c2Fj" },
-          { "sad", "c2Fk" },
-          { "sag", "c2Fn" },
-          { "Sal", "U2Fs" },
-          { "Sam", "U2Ft" },
-          { "San", "U2Fu" },
-          { "Sao", "U2Fv" },
-          { "sap", "c2Fw" },
-          { "sat", "c2F0" },
-          { "saw", "c2F3" },
-          { "sax", "c2F4" },
-          { "say", "c2F5" },
-          { "Sci", "U2Np" },
-          { "SCM", "U0NN" },
-          { "sea", "c2Vh" },
-          { "sec", "c2Vj" },
-          { "see", "c2Vl" },
-          { "sen", "c2Vu" },
-          { "seq", "c2Vx" },
-          { "set", "c2V0" },
-          { "sew", "c2V3" },
-          { "sex", "c2V4" },
-          { "she", "c2hl" },
-          { "Shu", "U2h1" },
-          { "shy", "c2h5" },
-          { "sib", "c2li" },
-          { "sic", "c2lj" },
-          { "sin", "c2lu" },
-          { "sip", "c2lw" },
-          { "sir", "c2ly" },
-          { "sis", "c2lz" },
-          { "sit", "c2l0" },
-          { "six", "c2l4" },
-          { "ski", "c2tp" },
-          { "sky", "c2t5" },
-          { "sly", "c2x5" },
-          { "sob", "c29i" },
-          { "Soc", "U29j" },
-          { "sod", "c29k" },
-          { "Sol", "U29s" },
-          { "son", "c29u" },
-          { "sop", "c29w" },
-          { "sou", "c291" },
-          { "sow", "c293" },
-          { "soy", "c295" },
-          { "spa", "c3Bh" },
-          { "spy", "c3B5" },
-          { "Sri", "U3Jp" },
-          { "s's", "cydz" },
-          { "SSE", "U1NF" },
-          { "SST", "U1NU" },
-          { "SSW", "U1NX" },
-          { "Stu", "U3R1" },
-          { "sub", "c3Vi" },
-          { "sud", "c3Vk" },
-          { "sue", "c3Vl" },
-          { "sum", "c3Vt" },
-          { "sun", "c3Vu" },
-          { "sup", "c3Vw" },
-          { "Sus", "U3Vz" },
-          { "tab", "dGFi" },
-          { "tad", "dGFk" },
-          { "tag", "dGFn" },
-          { "tam", "dGFt" },
-          { "tan", "dGFu" },
-          { "tao", "dGFv" },
-          { "tap", "dGFw" },
-          { "tar", "dGFy" },
-          { "tat", "dGF0" },
-          { "tau", "dGF1" },
-          { "tax", "dGF4" },
-          { "tea", "dGVh" },
-          { "Ted", "VGVk" },
-          { "ted", "dGVk" },
-          { "tee", "dGVl" },
-          { "Tel", "VGVs" },
-          { "ten", "dGVu" },
-          { "the", "dGhl" },
-          { "thy", "dGh5" },
-          { "tic", "dGlj" },
-          { "tid", "dGlk" },
-          { "tie", "dGll" },
-          { "til", "dGls" },
-          { "Tim", "VGlt" },
-          { "tin", "dGlu" },
-          { "tip", "dGlw" },
-          { "tit", "dGl0" },
-          { "TNT", "VE5U" },
-          { "toe", "dG9l" },
-          { "tog", "dG9n" },
-          { "Tom", "VG9t" },
-          { "ton", "dG9u" },
-          { "too", "dG9v" },
-          { "top", "dG9w" },
-          { "tor", "dG9y" },
-          { "tot", "dG90" },
-          { "tow", "dG93" },
-          { "toy", "dG95" },
-          { "TRW", "VFJX" },
-          { "try", "dHJ5" },
-          { "t's", "dCdz" },
-          { "TTL", "VFRM" },
-          { "TTY", "VFRZ" },
-          { "tub", "dHVi" },
-          { "tug", "dHVn" },
-          { "tum", "dHVt" },
-          { "tun", "dHVu" },
-          { "TVA", "VFZB" },
-          { "TWA", "VFdB" },
-          { "two", "dHdv" },
-          { "TWX", "VFdY" },
-          { "ugh", "dWdo" },
-          { "UHF", "VUhG" },
-          { "Uri", "VXJp" },
-          { "urn", "dXJu" },
-          { "U.S", "VS5T" },
-          { "u's", "dSdz" },
-          { "USA", "VVNB" },
-          { "USC", "VVND" },
-          { "use", "dXNl" },
-          { "USN", "VVNO" },
-          { "van", "dmFu" },
-          { "vat", "dmF0" },
-          { "vee", "dmVl" },
-          { "vet", "dmV0" },
-          { "vex", "dmV4" },
-          { "VHF", "VkhG" },
-          { "via", "dmlh" },
-          { "vie", "dmll" },
-          { "vii", "dmlp" },
-          { "vis", "dmlz" },
-          { "viz", "dml6" },
-          { "von", "dm9u" },
-          { "vow", "dm93" },
-          { "v's", "didz" },
-          { "WAC", "V0FD" },
-          { "wad", "d2Fk" },
-          { "wag", "d2Fn" },
-          { "wah", "d2Fo" },
-          { "wan", "d2Fu" },
-          { "war", "d2Fy" },
-          { "was", "d2Fz" },
-          { "wax", "d2F4" },
-          { "way", "d2F5" },
-          { "web", "d2Vi" },
-          { "wed", "d2Vk" },
-          { "wee", "d2Vl" },
-          { "Wei", "V2Vp" },
-          { "wet", "d2V0" },
-          { "who", "d2hv" },
-          { "why", "d2h5" },
-          { "wig", "d2ln" },
-          { "win", "d2lu" },
-          { "wit", "d2l0" },
-          { "woe", "d29l" },
-          { "wok", "d29r" },
-          { "won", "d29u" },
-          { "woo", "d29v" },
-          { "wop", "d29w" },
-          { "wow", "d293" },
-          { "wry", "d3J5" },
-          { "w's", "dydz" },
-          { "x's", "eCdz" },
-          { "yah", "eWFo" },
-          { "yak", "eWFr" },
-          { "yam", "eWFt" },
-          { "yap", "eWFw" },
-          { "yaw", "eWF3" },
-          { "yea", "eWVh" },
-          { "yen", "eWVu" },
-          { "yet", "eWV0" },
-          { "yin", "eWlu" },
-          { "yip", "eWlw" },
-          { "yon", "eW9u" },
-          { "you", "eW91" },
-          { "yow", "eW93" },
-          { "y's", "eSdz" },
-          { "yuh", "eXVo" },
-          { "zag", "emFn" },
-          { "Zan", "WmFu" },
-          { "zap", "emFw" },
-          { "Zen", "WmVu" },
-          { "zig", "emln" },
-          { "zip", "emlw" },
-          { "Zoe", "Wm9l" },
-          { "zoo", "em9v" },
-          { "z's", "eidz" },
-          /* the false rumors file */
-          { "\"So when I die, the first thing I will see in heaven is a score list?\"", 
-            "IlNvIHdoZW4gSSBkaWUsIHRoZSBmaXJzdCB0aGluZyBJIHdpbGwgc2VlIGluIGhlYXZlbiBpcyBhIHNjb3JlIGxpc3Q/Ig==" },
-          { "1st Law of Hacking: leaving is much more difficult than entering.", 
-            "MXN0IExhdyBvZiBIYWNraW5nOiBsZWF2aW5nIGlzIG11Y2ggbW9yZSBkaWZmaWN1bHQgdGhhbiBlbnRlcmluZy4=" },
-          { "2nd Law of Hacking: first in, first out.", 
-            "Mm5kIExhdyBvZiBIYWNraW5nOiBmaXJzdCBpbiwgZmlyc3Qgb3V0Lg==" },
-          { "3rd Law of Hacking: the last blow counts most.", 
-            "M3JkIExhdyBvZiBIYWNraW5nOiB0aGUgbGFzdCBibG93IGNvdW50cyBtb3N0Lg==" },
-          { "4th Law of Hacking: you will find the exit at the entrance.", 
-            "NHRoIExhdyBvZiBIYWNraW5nOiB5b3Ugd2lsbCBmaW5kIHRoZSBleGl0IGF0IHRoZSBlbnRyYW5jZS4=" },
-          { "A chameleon imitating a mail daemon often delivers scrolls of fire.", 
-            "QSBjaGFtZWxlb24gaW1pdGF0aW5nIGEgbWFpbCBkYWVtb24gb2Z0ZW4gZGVsaXZlcnMgc2Nyb2xscyBvZiBmaXJlLg==" },
-          { "A cockatrice corpse is guaranteed to be untainted!", 
-            "QSBjb2NrYXRyaWNlIGNvcnBzZSBpcyBndWFyYW50ZWVkIHRvIGJlIHVudGFpbnRlZCE=" },
-          { "A dead cockatrice is just a dead lizard.", 
-            "QSBkZWFkIGNvY2thdHJpY2UgaXMganVzdCBhIGRlYWQgbGl6YXJkLg==" },
-          { "A dragon is just a snake that ate a scroll of fire.", 
-            "QSBkcmFnb24gaXMganVzdCBhIHNuYWtlIHRoYXQgYXRlIGEgc2Nyb2xsIG9mIGZpcmUu" },
-          { "A fading corridor enlightens your insight.", 
-            "QSBmYWRpbmcgY29ycmlkb3IgZW5saWdodGVucyB5b3VyIGluc2lnaHQu" },
-          { "A glowing potion is too hot to drink.", 
-            "QSBnbG93aW5nIHBvdGlvbiBpcyB0b28gaG90IHRvIGRyaW5rLg==" },
-          { "A good amulet may protect you against guards.", 
-            "QSBnb29kIGFtdWxldCBtYXkgcHJvdGVjdCB5b3UgYWdhaW5zdCBndWFyZHMu" },
-          { "A lizard corpse is a good thing to turn undead.", 
-            "QSBsaXphcmQgY29ycHNlIGlzIGEgZ29vZCB0aGluZyB0byB0dXJuIHVuZGVhZC4=" },
-          { "A long worm can be defined recursively. So how should you attack it?", 
-            "QSBsb25nIHdvcm0gY2FuIGJlIGRlZmluZWQgcmVjdXJzaXZlbHkuIFNvIGhvdyBzaG91bGQgeW91IGF0dGFjayBpdD8=" },
-          { "A monstrous mind is a toy forever.", 
-            "QSBtb25zdHJvdXMgbWluZCBpcyBhIHRveSBmb3JldmVyLg==" },
-          { "A nymph will be very pleased if you call her by her real name: Lorelei.", 
-            "QSBueW1waCB3aWxsIGJlIHZlcnkgcGxlYXNlZCBpZiB5b3UgY2FsbCBoZXIgYnkgaGVyIHJlYWwgbmFtZTogTG9yZWxlaS4=" },
-          { "A ring of dungeon master control is a great find.", 
-            "QSByaW5nIG9mIGR1bmdlb24gbWFzdGVyIGNvbnRyb2wgaXMgYSBncmVhdCBmaW5kLg==" },
-          { "A ring of extra ring finger is useless if not enchanted.", 
-            "QSByaW5nIG9mIGV4dHJhIHJpbmcgZmluZ2VyIGlzIHVzZWxlc3MgaWYgbm90IGVuY2hhbnRlZC4=" },
-          { "A rope may form a trail in a maze.", 
-            "QSByb3BlIG1heSBmb3JtIGEgdHJhaWwgaW4gYSBtYXplLg==" },
-          { "A staff may recharge if you drop it for awhile.", 
-            "QSBzdGFmZiBtYXkgcmVjaGFyZ2UgaWYgeW91IGRyb3AgaXQgZm9yIGF3aGlsZS4=" },
-          { "A visit to the Zoo is very educational; you meet interesting animals.", 
-            "QSB2aXNpdCB0byB0aGUgWm9vIGlzIHZlcnkgZWR1Y2F0aW9uYWw7IHlvdSBtZWV0IGludGVyZXN0aW5nIGFuaW1hbHMu" },
-          { "A wand of deaf is a more dangerous weapon than a wand of sheep.", 
-            "QSB3YW5kIG9mIGRlYWYgaXMgYSBtb3JlIGRhbmdlcm91cyB3ZWFwb24gdGhhbiBhIHdhbmQgb2Ygc2hlZXAu" },
-          { "A wand of vibration might bring the whole cave crashing about your ears.", 
-            "QSB3YW5kIG9mIHZpYnJhdGlvbiBtaWdodCBicmluZyB0aGUgd2hvbGUgY2F2ZSBjcmFzaGluZyBhYm91dCB5b3VyIGVhcnMu" },
-          { "A winner never quits. A quitter never wins.", 
-            "QSB3aW5uZXIgbmV2ZXIgcXVpdHMuIEEgcXVpdHRlciBuZXZlciB3aW5zLg==" },
-          { "A wish? Okay, make me a fortune cookie!", 
-            "QSB3aXNoPyBPa2F5LCBtYWtlIG1lIGEgZm9ydHVuZSBjb29raWUh" },
-          { "Afraid of mimics? Try to wear a ring of true seeing.", 
-            "QWZyYWlkIG9mIG1pbWljcz8gVHJ5IHRvIHdlYXIgYSByaW5nIG9mIHRydWUgc2VlaW5nLg==" },
-          { "All monsters are created evil, but some are more evil than others.", 
-            "QWxsIG1vbnN0ZXJzIGFyZSBjcmVhdGVkIGV2aWwsIGJ1dCBzb21lIGFyZSBtb3JlIGV2aWwgdGhhbiBvdGhlcnMu" },
-          { "Always attack a floating eye from behind!", 
-            "QWx3YXlzIGF0dGFjayBhIGZsb2F0aW5nIGV5ZSBmcm9tIGJlaGluZCE=" },
-          { "An elven cloak is always the height of fashion.", 
-            "QW4gZWx2ZW4gY2xvYWsgaXMgYWx3YXlzIHRoZSBoZWlnaHQgb2YgZmFzaGlvbi4=" },
-          { "Any small object that is accidentally dropped will hide under a larger object.", 
-            "QW55IHNtYWxsIG9iamVjdCB0aGF0IGlzIGFjY2lkZW50YWxseSBkcm9wcGVkIHdpbGwgaGlkZSB1bmRlciBhIGxhcmdlciBvYmplY3Qu" },
-          { "Balrogs do not appear above level 20.", 
-            "QmFscm9ncyBkbyBub3QgYXBwZWFyIGFib3ZlIGxldmVsIDIwLg==" },
-          { "Banana peels work especially well against Keystone Kops.", 
-            "QmFuYW5hIHBlZWxzIHdvcmsgZXNwZWNpYWxseSB3ZWxsIGFnYWluc3QgS2V5c3RvbmUgS29wcy4=" },
-          { "Be careful when eating bananas. Monsters might slip on the peels.", 
-            "QmUgY2FyZWZ1bCB3aGVuIGVhdGluZyBiYW5hbmFzLiBNb25zdGVycyBtaWdodCBzbGlwIG9uIHRoZSBwZWVscy4=" },
-          { "Better leave the dungeon; otherwise you might get hurt badly.", 
-            "QmV0dGVyIGxlYXZlIHRoZSBkdW5nZW9uOyBvdGhlcndpc2UgeW91IG1pZ2h0IGdldCBodXJ0IGJhZGx5Lg==" },
-          { "Beware of the potion of nitroglycerin -- it's not for the weak of heart.", 
-            "QmV3YXJlIG9mIHRoZSBwb3Rpb24gb2Ygbml0cm9nbHljZXJpbiAtLSBpdCdzIG5vdCBmb3IgdGhlIHdlYWsgb2YgaGVhcnQu" },
-          { "Beware: there's always a chance that your wand explodes as you try to zap it!", 
-            "QmV3YXJlOiB0aGVyZSdzIGFsd2F5cyBhIGNoYW5jZSB0aGF0IHlvdXIgd2FuZCBleHBsb2RlcyBhcyB5b3UgdHJ5IHRvIHphcCBpdCE=" },
-          { "Beyond the 23rd level lies a happy retirement in a room of your own.", 
-            "QmV5b25kIHRoZSAyM3JkIGxldmVsIGxpZXMgYSBoYXBweSByZXRpcmVtZW50IGluIGEgcm9vbSBvZiB5b3VyIG93bi4=" },
-          { "Changing your suit without dropping your sword? You must be kidding!", 
-            "Q2hhbmdpbmcgeW91ciBzdWl0IHdpdGhvdXQgZHJvcHBpbmcgeW91ciBzd29yZD8gWW91IG11c3QgYmUga2lkZGluZyE=" },
-          { "Cockatrices might turn themselves to stone faced with a mirror.", 
-            "Q29ja2F0cmljZXMgbWlnaHQgdHVybiB0aGVtc2VsdmVzIHRvIHN0b25lIGZhY2VkIHdpdGggYSBtaXJyb3Iu" },
-          { "Consumption of home-made food is strictly forbidden in this dungeon.", 
-            "Q29uc3VtcHRpb24gb2YgaG9tZS1tYWRlIGZvb2QgaXMgc3RyaWN0bHkgZm9yYmlkZGVuIGluIHRoaXMgZHVuZ2Vvbi4=" },
-          { "Dark room? Your chance to develop your photographs!", 
-            "RGFyayByb29tPyBZb3VyIGNoYW5jZSB0byBkZXZlbG9wIHlvdXIgcGhvdG9ncmFwaHMh" },
-          { "Dark rooms are not *completely* dark: just wait and let your eyes adjust...", 
-            "RGFyayByb29tcyBhcmUgbm90ICpjb21wbGV0ZWx5KiBkYXJrOiBqdXN0IHdhaXQgYW5kIGxldCB5b3VyIGV5ZXMgYWRqdXN0Li4u" },
-          { "David London sez, \"Hey guys, *WIELD* a lizard corpse against a cockatrice!\"", 
-            "RGF2aWQgTG9uZG9uIHNleiwgIkhleSBndXlzLCAqV0lFTEQqIGEgbGl6YXJkIGNvcnBzZSBhZ2FpbnN0IGEgY29ja2F0cmljZSEi" },
-          { "Death is just life's way of telling you you've been fired.", 
-            "RGVhdGggaXMganVzdCBsaWZlJ3Mgd2F5IG9mIHRlbGxpbmcgeW91IHlvdSd2ZSBiZWVuIGZpcmVkLg==" },
-          { "Demi-gods don't need any help from the gods.", 
-            "RGVtaS1nb2RzIGRvbid0IG5lZWQgYW55IGhlbHAgZnJvbSB0aGUgZ29kcy4=" },
-          { "Demons *HATE* Priests and Priestesses.", 
-            "RGVtb25zICpIQVRFKiBQcmllc3RzIGFuZCBQcmllc3Rlc3Nlcy4=" },
-          { "Didn't you forget to pay?", 
-            "RGlkbid0IHlvdSBmb3JnZXQgdG8gcGF5Pw==" },
-          { "Didn't your mother tell you not to eat food off the floor?", 
-            "RGlkbid0IHlvdXIgbW90aGVyIHRlbGwgeW91IG5vdCB0byBlYXQgZm9vZCBvZmYgdGhlIGZsb29yPw==" },
-          { "Direct a direct hit on your direct opponent, directing in the right direction.", 
-            "RGlyZWN0IGEgZGlyZWN0IGhpdCBvbiB5b3VyIGRpcmVjdCBvcHBvbmVudCwgZGlyZWN0aW5nIGluIHRoZSByaWdodCBkaXJlY3Rpb24u" },
-          { "Do you want to make more money? Sure, we all do! Join the Fort Ludios guard!", 
-            "RG8geW91IHdhbnQgdG8gbWFrZSBtb3JlIG1vbmV5PyBTdXJlLCB3ZSBhbGwgZG8hIEpvaW4gdGhlIEZvcnQgTHVkaW9zIGd1YXJkIQ==" },
-          { "Don't eat too much: you might start hiccoughing!", 
-            "RG9uJ3QgZWF0IHRvbyBtdWNoOiB5b3UgbWlnaHQgc3RhcnQgaGljY291Z2hpbmch" },
-          { "Don't play hack at your work; your boss might hit you!", 
-            "RG9uJ3QgcGxheSBoYWNrIGF0IHlvdXIgd29yazsgeW91ciBib3NzIG1pZ2h0IGhpdCB5b3Uh" },
-          { "Don't tell a soul you found a secret door, otherwise it isn't a secret anymore.", 
-            "RG9uJ3QgdGVsbCBhIHNvdWwgeW91IGZvdW5kIGEgc2VjcmV0IGRvb3IsIG90aGVyd2lzZSBpdCBpc24ndCBhIHNlY3JldCBhbnltb3JlLg==" },
-          { "Drinking potions of booze may land you in jail if you are under 21.", 
-            "RHJpbmtpbmcgcG90aW9ucyBvZiBib296ZSBtYXkgbGFuZCB5b3UgaW4gamFpbCBpZiB5b3UgYXJlIHVuZGVyIDIxLg==" },
-          { "Drop your vanity and get rid of your jewels! Pickpockets about!", 
-            "RHJvcCB5b3VyIHZhbml0eSBhbmQgZ2V0IHJpZCBvZiB5b3VyIGpld2VscyEgUGlja3BvY2tldHMgYWJvdXQh" },
-          { "Eat 10 cloves of garlic and keep all humans at a two-square distance.", 
-            "RWF0IDEwIGNsb3ZlcyBvZiBnYXJsaWMgYW5kIGtlZXAgYWxsIGh1bWFucyBhdCBhIHR3by1zcXVhcmUgZGlzdGFuY2Uu" },
-          { "Eels hide under mud. Use a unicorn to clear the water and make them visible.", 
-            "RWVscyBoaWRlIHVuZGVyIG11ZC4gVXNlIGEgdW5pY29ybiB0byBjbGVhciB0aGUgd2F0ZXIgYW5kIG1ha2UgdGhlbSB2aXNpYmxlLg==" },
-          { "Engrave your wishes with a wand of wishing.", 
-            "RW5ncmF2ZSB5b3VyIHdpc2hlcyB3aXRoIGEgd2FuZCBvZiB3aXNoaW5nLg==" },
-          { "Eventually you will come to admire the swift elegance of a retreating nymph.", 
-            "RXZlbnR1YWxseSB5b3Ugd2lsbCBjb21lIHRvIGFkbWlyZSB0aGUgc3dpZnQgZWxlZ2FuY2Ugb2YgYSByZXRyZWF0aW5nIG55bXBoLg==" },
-          { "Ever heard hissing outside? I *knew* you hadn't!", 
-            "RXZlciBoZWFyZCBoaXNzaW5nIG91dHNpZGU/IEkgKmtuZXcqIHlvdSBoYWRuJ3Qh" },
-          { "Ever lifted a dragon corpse?", 
-            "RXZlciBsaWZ0ZWQgYSBkcmFnb24gY29ycHNlPw==" },
-          { "Ever seen a leocrotta dancing the tengu?", 
-            "RXZlciBzZWVuIGEgbGVvY3JvdHRhIGRhbmNpbmcgdGhlIHRlbmd1Pw==" },
-          { "Ever seen your weapon glow plaid?", 
-            "RXZlciBzZWVuIHlvdXIgd2VhcG9uIGdsb3cgcGxhaWQ/" },
-          { "Ever tamed a shopkeeper?", 
-            "RXZlciB0YW1lZCBhIHNob3BrZWVwZXI/" },
-          { "Ever tried digging through a Vault Guard?", 
-            "RXZlciB0cmllZCBkaWdnaW5nIHRocm91Z2ggYSBWYXVsdCBHdWFyZD8=" },
-          { "Ever tried enchanting a rope?", 
-            "RXZlciB0cmllZCBlbmNoYW50aW5nIGEgcm9wZT8=" },
-          { "Floating eyes can't stand Hawaiian shirts.", 
-            "RmxvYXRpbmcgZXllcyBjYW4ndCBzdGFuZCBIYXdhaWlhbiBzaGlydHMu" },
-          { "For any remedy there is a misery.", 
-            "Rm9yIGFueSByZW1lZHkgdGhlcmUgaXMgYSBtaXNlcnku" },
-          { "Giant bats turn into giant vampires.", 
-            "R2lhbnQgYmF0cyB0dXJuIGludG8gZ2lhbnQgdmFtcGlyZXMu" },
-          { "Good day for overcoming obstacles. Try a steeplechase.", 
-            "R29vZCBkYXkgZm9yIG92ZXJjb21pbmcgb2JzdGFjbGVzLiBUcnkgYSBzdGVlcGxlY2hhc2Uu" },
-          { "Half Moon tonight. (At least it's better than no Moon at all.)", 
-            "SGFsZiBNb29uIHRvbmlnaHQuIChBdCBsZWFzdCBpdCdzIGJldHRlciB0aGFuIG5vIE1vb24gYXQgYWxsLik=" },
-          { "Help! I'm being held prisoner in a fortune cookie factory!", 
-            "SGVscCEgSSdtIGJlaW5nIGhlbGQgcHJpc29uZXIgaW4gYSBmb3J0dW5lIGNvb2tpZSBmYWN0b3J5IQ==" },
-          { "Housecats have nine lives, kittens only one.", 
-            "SG91c2VjYXRzIGhhdmUgbmluZSBsaXZlcywga2l0dGVucyBvbmx5IG9uZS4=" },
-          { "How long can you tread water?", 
-            "SG93IGxvbmcgY2FuIHlvdSB0cmVhZCB3YXRlcj8=" },
-          { "Hungry? There is an abundance of food on the next level.", 
-            "SHVuZ3J5PyBUaGVyZSBpcyBhbiBhYnVuZGFuY2Ugb2YgZm9vZCBvbiB0aGUgbmV4dCBsZXZlbC4=" },
-          { "I guess you've never hit a mail daemon with the Amulet of Yendor...", 
-            "SSBndWVzcyB5b3UndmUgbmV2ZXIgaGl0IGEgbWFpbCBkYWVtb24gd2l0aCB0aGUgQW11bGV0IG9mIFllbmRvci4uLg==" },
-          { "If you are the shopkeeper, you can take things for free.", 
-            "SWYgeW91IGFyZSB0aGUgc2hvcGtlZXBlciwgeW91IGNhbiB0YWtlIHRoaW5ncyBmb3IgZnJlZS4=" },
-          { "If you can't learn to do it well, learn to enjoy doing it badly.", 
-            "SWYgeW91IGNhbid0IGxlYXJuIHRvIGRvIGl0IHdlbGwsIGxlYXJuIHRvIGVuam95IGRvaW5nIGl0IGJhZGx5Lg==" },
-          { "If you thought the Wizard was bad, just wait till you meet the Warlord!", 
-            "SWYgeW91IHRob3VnaHQgdGhlIFdpemFyZCB3YXMgYmFkLCBqdXN0IHdhaXQgdGlsbCB5b3UgbWVldCB0aGUgV2FybG9yZCE=" },
-          { "If you turn blind, don't expect your dog to be turned into a seeing-eye dog.", 
-            "SWYgeW91IHR1cm4gYmxpbmQsIGRvbid0IGV4cGVjdCB5b3VyIGRvZyB0byBiZSB0dXJuZWQgaW50byBhIHNlZWluZy1leWUgZG9nLg==" },
-          { "If you want to feel great, you must eat something real big.", 
-            "SWYgeW91IHdhbnQgdG8gZmVlbCBncmVhdCwgeW91IG11c3QgZWF0IHNvbWV0aGluZyByZWFsIGJpZy4=" },
-          { "If you want to float, you'd better eat a floating eye.", 
-            "SWYgeW91IHdhbnQgdG8gZmxvYXQsIHlvdSdkIGJldHRlciBlYXQgYSBmbG9hdGluZyBleWUu" },
-          { "If your ghost kills a player, it increases your score.", 
-            "SWYgeW91ciBnaG9zdCBraWxscyBhIHBsYXllciwgaXQgaW5jcmVhc2VzIHlvdXIgc2NvcmUu" },
-          { "Increase mindpower: Tame your own ghost!", 
-            "SW5jcmVhc2UgbWluZHBvd2VyOiBUYW1lIHlvdXIgb3duIGdob3N0IQ==" },
-          { "It furthers one to see the great man.", 
-            "SXQgZnVydGhlcnMgb25lIHRvIHNlZSB0aGUgZ3JlYXQgbWFuLg==" },
-          { "It's easy to overlook a monster in a wood.", 
-            "SXQncyBlYXN5IHRvIG92ZXJsb29rIGEgbW9uc3RlciBpbiBhIHdvb2Qu" },
-          { "Just below any trapdoor there may be another one. Just keep falling!", 
-            "SnVzdCBiZWxvdyBhbnkgdHJhcGRvb3IgdGhlcmUgbWF5IGJlIGFub3RoZXIgb25lLiBKdXN0IGtlZXAgZmFsbGluZyE=" },
-          { "Katanas are very sharp; watch you don't cut yourself.", 
-            "S2F0YW5hcyBhcmUgdmVyeSBzaGFycDsgd2F0Y2ggeW91IGRvbid0IGN1dCB5b3Vyc2VsZi4=" },
-          { "Keep a clear mind: quaff clear potions.", 
-            "S2VlcCBhIGNsZWFyIG1pbmQ6IHF1YWZmIGNsZWFyIHBvdGlvbnMu" },
-          { "Kicking the terminal doesn't hurt the monsters.", 
-            "S2lja2luZyB0aGUgdGVybWluYWwgZG9lc24ndCBodXJ0IHRoZSBtb25zdGVycy4=" },
-          { "Killer bees keep appearing till you kill their queen.", 
-            "S2lsbGVyIGJlZXMga2VlcCBhcHBlYXJpbmcgdGlsbCB5b3Uga2lsbCB0aGVpciBxdWVlbi4=" },
-          { "Killer bunnies can be tamed with carrots only.", 
-            "S2lsbGVyIGJ1bm5pZXMgY2FuIGJlIHRhbWVkIHdpdGggY2Fycm90cyBvbmx5Lg==" },
-          { "Latest news? Put `rec.games.roguelike.nethack' in your .newsrc!", 
-            "TGF0ZXN0IG5ld3M/IFB1dCBgcmVjLmdhbWVzLnJvZ3VlbGlrZS5uZXRoYWNrJyBpbiB5b3VyIC5uZXdzcmMh" },
-          { "Learn how to spell. Play NetHack!", 
-            "TGVhcm4gaG93IHRvIHNwZWxsLiBQbGF5IE5ldEhhY2sh" },
-          { "Leprechauns hide their gold in a secret room.", 
-            "TGVwcmVjaGF1bnMgaGlkZSB0aGVpciBnb2xkIGluIGEgc2VjcmV0IHJvb20u" },
-          { "Let your fingers do the walking on the yulkjhnb keys.", 
-            "TGV0IHlvdXIgZmluZ2VycyBkbyB0aGUgd2Fsa2luZyBvbiB0aGUgeXVsa2pobmIga2V5cy4=" },
-          { "Let's face it: this time you're not going to win.", 
-            "TGV0J3MgZmFjZSBpdDogdGhpcyB0aW1lIHlvdSdyZSBub3QgZ29pbmcgdG8gd2luLg==" },
-          { "Let's have a party, drink a lot of booze.", 
-            "TGV0J3MgaGF2ZSBhIHBhcnR5LCBkcmluayBhIGxvdCBvZiBib296ZS4=" },
-          { "Liquor sellers do not drink; they hate to see you twice.", 
-            "TGlxdW9yIHNlbGxlcnMgZG8gbm90IGRyaW5rOyB0aGV5IGhhdGUgdG8gc2VlIHlvdSB0d2ljZS4=" },
-          { "Lunar eclipse tonight. May as well quit now!", 
-            "THVuYXIgZWNsaXBzZSB0b25pZ2h0LiBNYXkgYXMgd2VsbCBxdWl0IG5vdyE=" },
-          { "Meeting your own ghost decreases your luck considerably!", 
-            "TWVldGluZyB5b3VyIG93biBnaG9zdCBkZWNyZWFzZXMgeW91ciBsdWNrIGNvbnNpZGVyYWJseSE=" },
-          { "Money to invest? Take it to the local branch of the Magic Memory Vault!", 
-            "TW9uZXkgdG8gaW52ZXN0PyBUYWtlIGl0IHRvIHRoZSBsb2NhbCBicmFuY2ggb2YgdGhlIE1hZ2ljIE1lbW9yeSBWYXVsdCE=" },
-          { "Monsters come from nowhere to hit you everywhere.", 
-            "TW9uc3RlcnMgY29tZSBmcm9tIG5vd2hlcmUgdG8gaGl0IHlvdSBldmVyeXdoZXJlLg==" },
-          { "Monsters sleep because you are boring, not because they ever get tired.", 
-            "TW9uc3RlcnMgc2xlZXAgYmVjYXVzZSB5b3UgYXJlIGJvcmluZywgbm90IGJlY2F1c2UgdGhleSBldmVyIGdldCB0aXJlZC4=" },
-          { "Most monsters prefer minced meat. That's why they are hitting you!", 
-            "TW9zdCBtb25zdGVycyBwcmVmZXIgbWluY2VkIG1lYXQuIFRoYXQncyB3aHkgdGhleSBhcmUgaGl0dGluZyB5b3Uh" },
-          { "Most of the bugs in NetHack are on the floor.", 
-            "TW9zdCBvZiB0aGUgYnVncyBpbiBOZXRIYWNrIGFyZSBvbiB0aGUgZmxvb3Iu" },
-          { "Much ado Nothing Happens.", 
-            "TXVjaCBhZG8gTm90aGluZyBIYXBwZW5zLg==" },
-          { "Multi-player NetHack is a myth.", 
-            "TXVsdGktcGxheWVyIE5ldEhhY2sgaXMgYSBteXRoLg==" },
-          { "NetHack is addictive. Too late, you're already hooked.", 
-            "TmV0SGFjayBpcyBhZGRpY3RpdmUuIFRvbyBsYXRlLCB5b3UncmUgYWxyZWFkeSBob29rZWQu" },
-          { "Never ask a shopkeeper for a price list.", 
-            "TmV2ZXIgYXNrIGEgc2hvcGtlZXBlciBmb3IgYSBwcmljZSBsaXN0Lg==" },
-          { "Never burn a tree, unless you like getting whacked with a +5 shovel.", 
-            "TmV2ZXIgYnVybiBhIHRyZWUsIHVubGVzcyB5b3UgbGlrZSBnZXR0aW5nIHdoYWNrZWQgd2l0aCBhICs1IHNob3ZlbC4=" },
-          { "Never eat with glowing hands!", 
-            "TmV2ZXIgZWF0IHdpdGggZ2xvd2luZyBoYW5kcyE=" },
-          { "Never mind the monsters hitting you: they just replace the charwomen.", 
-            "TmV2ZXIgbWluZCB0aGUgbW9uc3RlcnMgaGl0dGluZyB5b3U6IHRoZXkganVzdCByZXBsYWNlIHRoZSBjaGFyd29tZW4u" },
-          { "Never play leapfrog with a unicorn.", 
-            "TmV2ZXIgcGxheSBsZWFwZnJvZyB3aXRoIGEgdW5pY29ybi4=" },
-          { "Never step on a cursed engraving.", 
-            "TmV2ZXIgc3RlcCBvbiBhIGN1cnNlZCBlbmdyYXZpbmcu" },
-          { "Never swim with a camera: there's nothing to take pictures of.", 
-            "TmV2ZXIgc3dpbSB3aXRoIGEgY2FtZXJhOiB0aGVyZSdzIG5vdGhpbmcgdG8gdGFrZSBwaWN0dXJlcyBvZi4=" },
-          { "Never teach your pet rust monster to fetch.", 
-            "TmV2ZXIgdGVhY2ggeW91ciBwZXQgcnVzdCBtb25zdGVyIHRvIGZldGNoLg==" },
-          { "Never trust a random generator in magic fields.", 
-            "TmV2ZXIgdHJ1c3QgYSByYW5kb20gZ2VuZXJhdG9yIGluIG1hZ2ljIGZpZWxkcy4=" },
-          { "Never use a wand of death.", 
-            "TmV2ZXIgdXNlIGEgd2FuZCBvZiBkZWF0aC4=" },
-          { "No level contains two shops. The maze is no level. So...", 
-            "Tm8gbGV2ZWwgY29udGFpbnMgdHdvIHNob3BzLiBUaGUgbWF6ZSBpcyBubyBsZXZlbC4gU28uLi4=" },
-          { "No part of this fortune may be reproduced, stored in a retrieval system, ...", 
-            "Tm8gcGFydCBvZiB0aGlzIGZvcnR1bmUgbWF5IGJlIHJlcHJvZHVjZWQsIHN0b3JlZCBpbiBhIHJldHJpZXZhbCBzeXN0ZW0sIC4uLg==" },
-          { "Not all rumors are as misleading as this one.", 
-            "Tm90IGFsbCBydW1vcnMgYXJlIGFzIG1pc2xlYWRpbmcgYXMgdGhpcyBvbmUu" },
-          { "Nymphs and nurses like beautiful rings.", 
-            "TnltcGhzIGFuZCBudXJzZXMgbGlrZSBiZWF1dGlmdWwgcmluZ3Mu" },
-          { "Nymphs are blondes. Are you a gentleman?", 
-            "TnltcGhzIGFyZSBibG9uZGVzLiBBcmUgeW91IGEgZ2VudGxlbWFuPw==" },
-          { "Offering a unicorn a worthless piece of glass might prove to be fatal!", 
-            "T2ZmZXJpbmcgYSB1bmljb3JuIGEgd29ydGhsZXNzIHBpZWNlIG9mIGdsYXNzIG1pZ2h0IHByb3ZlIHRvIGJlIGZhdGFsIQ==" },
-          { "Old hackers never die: young ones do.", 
-            "T2xkIGhhY2tlcnMgbmV2ZXIgZGllOiB5b3VuZyBvbmVzIGRvLg==" },
-          { "One has to leave shops before closing time.", 
-            "T25lIGhhcyB0byBsZWF2ZSBzaG9wcyBiZWZvcmUgY2xvc2luZyB0aW1lLg==" },
-          { "One homunculus a day keeps the doctor away.", 
-            "T25lIGhvbXVuY3VsdXMgYSBkYXkga2VlcHMgdGhlIGRvY3RvciBhd2F5Lg==" },
-          { "One level further down somebody is getting killed, right now.", 
-            "T25lIGxldmVsIGZ1cnRoZXIgZG93biBzb21lYm9keSBpcyBnZXR0aW5nIGtpbGxlZCwgcmlnaHQgbm93Lg==" },
-          { "Only a wizard can use a magic whistle.", 
-            "T25seSBhIHdpemFyZCBjYW4gdXNlIGEgbWFnaWMgd2hpc3RsZS4=" },
-          { "Only adventurers of evil alignment think of killing their dog.", 
-            "T25seSBhZHZlbnR1cmVycyBvZiBldmlsIGFsaWdubWVudCB0aGluayBvZiBraWxsaW5nIHRoZWlyIGRvZy4=" },
-          { "Only chaotic evils kill sleeping monsters.", 
-            "T25seSBjaGFvdGljIGV2aWxzIGtpbGwgc2xlZXBpbmcgbW9uc3RlcnMu" },
-          { "Only real trappers escape traps.", 
-            "T25seSByZWFsIHRyYXBwZXJzIGVzY2FwZSB0cmFwcy4=" },
-          { "Only real wizards can write scrolls.", 
-            "T25seSByZWFsIHdpemFyZHMgY2FuIHdyaXRlIHNjcm9sbHMu" },
-          { "Operation OVERKILL has started now.", 
-            "T3BlcmF0aW9uIE9WRVJLSUxMIGhhcyBzdGFydGVkIG5vdy4=" },
-          { "PLEASE ignore previous rumor.", 
-            "UExFQVNFIGlnbm9yZSBwcmV2aW91cyBydW1vci4=" },
-          { "Polymorph into an ettin; meet your opponents face to face to face.", 
-            "UG9seW1vcnBoIGludG8gYW4gZXR0aW47IG1lZXQgeW91ciBvcHBvbmVudHMgZmFjZSB0byBmYWNlIHRvIGZhY2Uu" },
-          { "Praying will frighten demons.", 
-            "UHJheWluZyB3aWxsIGZyaWdodGVuIGRlbW9ucy4=" },
-          { "Row (3x) that boat gently down the stream, Charon (4x), death is but a dream.", 
-            "Um93ICgzeCkgdGhhdCBib2F0IGdlbnRseSBkb3duIHRoZSBzdHJlYW0sIENoYXJvbiAoNHgpLCBkZWF0aCBpcyBidXQgYSBkcmVhbS4=" },
-          { "Running is good for your legs.", 
-            "UnVubmluZyBpcyBnb29kIGZvciB5b3VyIGxlZ3Mu" },
-          { "Screw up your courage! You've screwed up everything else.", 
-            "U2NyZXcgdXAgeW91ciBjb3VyYWdlISBZb3UndmUgc2NyZXdlZCB1cCBldmVyeXRoaW5nIGVsc2Uu" },
-          { "Seepage? Leaky pipes? Rising damp? Summon the plumber!", 
-            "U2VlcGFnZT8gTGVha3kgcGlwZXM/IFJpc2luZyBkYW1wPyBTdW1tb24gdGhlIHBsdW1iZXIh" },
-          { "Segmentation fault (core dumped).", 
-            "U2VnbWVudGF0aW9uIGZhdWx0IChjb3JlIGR1bXBlZCku" },
-          { "Shopkeepers sometimes die from old age.", 
-            "U2hvcGtlZXBlcnMgc29tZXRpbWVzIGRpZSBmcm9tIG9sZCBhZ2Uu" },
-          { "Some mazes (especially small ones) have no solutions, says man 6 maze.", 
-            "U29tZSBtYXplcyAoZXNwZWNpYWxseSBzbWFsbCBvbmVzKSBoYXZlIG5vIHNvbHV0aW9ucywgc2F5cyBtYW4gNiBtYXplLg==" },
-          { "Some questions the Sphynx asks just *don't* have any answers.", 
-            "U29tZSBxdWVzdGlvbnMgdGhlIFNwaHlueCBhc2tzIGp1c3QgKmRvbid0KiBoYXZlIGFueSBhbnN3ZXJzLg==" },
-          { "Sometimes \"mu\" is the answer.", 
-            "U29tZXRpbWVzICJtdSIgaXMgdGhlIGFuc3dlci4=" },
-          { "Sorry, no fortune this time. Better luck next cookie!", 
-            "U29ycnksIG5vIGZvcnR1bmUgdGhpcyB0aW1lLiBCZXR0ZXIgbHVjayBuZXh0IGNvb2tpZSE=" },
-          { "Spare your scrolls of make-edible until it's really necessary!", 
-            "U3BhcmUgeW91ciBzY3JvbGxzIG9mIG1ha2UtZWRpYmxlIHVudGlsIGl0J3MgcmVhbGx5IG5lY2Vzc2FyeSE=" },
-          { "Suddenly, the dungeon will collapse...", 
-            "U3VkZGVubHksIHRoZSBkdW5nZW9uIHdpbGwgY29sbGFwc2UuLi4=" },
-          { "Taming a mail daemon may cause a system security violation.", 
-            "VGFtaW5nIGEgbWFpbCBkYWVtb24gbWF5IGNhdXNlIGEgc3lzdGVtIHNlY3VyaXR5IHZpb2xhdGlvbi4=" },
-          { "The crowd was so tough, the Stooges won't play the Dungeon anymore, nyuk nyuk.", 
-            "VGhlIGNyb3dkIHdhcyBzbyB0b3VnaCwgdGhlIFN0b29nZXMgd29uJ3QgcGxheSB0aGUgRHVuZ2VvbiBhbnltb3JlLCBueXVrIG55dWsu" },
-          { "The leprechauns hide their treasure in a small hidden room.", 
-            "VGhlIGxlcHJlY2hhdW5zIGhpZGUgdGhlaXIgdHJlYXN1cmUgaW4gYSBzbWFsbCBoaWRkZW4gcm9vbS4=" },
-          { "The longer the wand the better.", 
-            "VGhlIGxvbmdlciB0aGUgd2FuZCB0aGUgYmV0dGVyLg==" },
-          { "The magic word is \"XYZZY\".", 
-            "VGhlIG1hZ2ljIHdvcmQgaXMgIlhZWlpZIi4=" },
-          { "The meek shall inherit your bones files.", 
-            "VGhlIG1lZWsgc2hhbGwgaW5oZXJpdCB5b3VyIGJvbmVzIGZpbGVzLg==" },
-          { "The mines are dark and deep, and I have levels to go before I sleep.", 
-            "VGhlIG1pbmVzIGFyZSBkYXJrIGFuZCBkZWVwLCBhbmQgSSBoYXZlIGxldmVscyB0byBnbyBiZWZvcmUgSSBzbGVlcC4=" },
-          { "The use of dynamite is dangerous.", 
-            "VGhlIHVzZSBvZiBkeW5hbWl0ZSBpcyBkYW5nZXJvdXMu" },
-          { "There are no worms in the UNIX version.", 
-            "VGhlcmUgYXJlIG5vIHdvcm1zIGluIHRoZSBVTklYIHZlcnNpb24u" },
-          { "There is a trap on this level!", 
-            "VGhlcmUgaXMgYSB0cmFwIG9uIHRoaXMgbGV2ZWwh" },
-          { "They say that Demogorgon, Asmodeus, Orcus, Yeenoghu & Juiblex is no law firm.", 
-            "VGhleSBzYXkgdGhhdCBEZW1vZ29yZ29uLCBBc21vZGV1cywgT3JjdXMsIFllZW5vZ2h1ICYgSnVpYmxleCBpcyBubyBsYXcgZmlybS4=" },
-          { "They say that Geryon has an evil twin, beware!", 
-            "VGhleSBzYXkgdGhhdCBHZXJ5b24gaGFzIGFuIGV2aWwgdHdpbiwgYmV3YXJlIQ==" },
-          { "They say that Medusa would make a terrible pet.", 
-            "VGhleSBzYXkgdGhhdCBNZWR1c2Egd291bGQgbWFrZSBhIHRlcnJpYmxlIHBldC4=" },
-          { "They say that NetHack bugs are Seldon planned.", 
-            "VGhleSBzYXkgdGhhdCBOZXRIYWNrIGJ1Z3MgYXJlIFNlbGRvbiBwbGFubmVkLg==" },
-          { "They say that NetHack comes in 256 flavors.", 
-            "VGhleSBzYXkgdGhhdCBOZXRIYWNrIGNvbWVzIGluIDI1NiBmbGF2b3JzLg==" },
-          { "They say that NetHack is just a computer game.", 
-            "VGhleSBzYXkgdGhhdCBOZXRIYWNrIGlzIGp1c3QgYSBjb21wdXRlciBnYW1lLg==" },
-          { "They say that NetHack is more than just a computer game.", 
-            "VGhleSBzYXkgdGhhdCBOZXRIYWNrIGlzIG1vcmUgdGhhbiBqdXN0IGEgY29tcHV0ZXIgZ2FtZS4=" },
-          { "They say that NetHack is never what it used to be.", 
-            "VGhleSBzYXkgdGhhdCBOZXRIYWNrIGlzIG5ldmVyIHdoYXQgaXQgdXNlZCB0byBiZS4=" },
-          { "They say that a baby dragon is too small to hurt or help you.", 
-            "VGhleSBzYXkgdGhhdCBhIGJhYnkgZHJhZ29uIGlzIHRvbyBzbWFsbCB0byBodXJ0IG9yIGhlbHAgeW91Lg==" },
-          { "They say that a black pudding is simply a brown pudding gone bad.", 
-            "VGhleSBzYXkgdGhhdCBhIGJsYWNrIHB1ZGRpbmcgaXMgc2ltcGx5IGEgYnJvd24gcHVkZGluZyBnb25lIGJhZC4=" },
-          { "They say that a black sheep has 3 bags full of wool.", 
-            "VGhleSBzYXkgdGhhdCBhIGJsYWNrIHNoZWVwIGhhcyAzIGJhZ3MgZnVsbCBvZiB3b29sLg==" },
-          { "They say that a blank scroll is like a blank check.", 
-            "VGhleSBzYXkgdGhhdCBhIGJsYW5rIHNjcm9sbCBpcyBsaWtlIGEgYmxhbmsgY2hlY2su" },
-          { "They say that a cat named Morris has nine lives.", 
-            "VGhleSBzYXkgdGhhdCBhIGNhdCBuYW1lZCBNb3JyaXMgaGFzIG5pbmUgbGl2ZXMu" },
-          { "They say that a desperate shopper might pay any price in a shop.", 
-            "VGhleSBzYXkgdGhhdCBhIGRlc3BlcmF0ZSBzaG9wcGVyIG1pZ2h0IHBheSBhbnkgcHJpY2UgaW4gYSBzaG9wLg==" },
-          { "They say that a diamond dog is everybody's best friend.", 
-            "VGhleSBzYXkgdGhhdCBhIGRpYW1vbmQgZG9nIGlzIGV2ZXJ5Ym9keSdzIGJlc3QgZnJpZW5kLg==" },
-          { "They say that a dwarf lord can carry a pick-axe because his armor is light.", 
-            "VGhleSBzYXkgdGhhdCBhIGR3YXJmIGxvcmQgY2FuIGNhcnJ5IGEgcGljay1heGUgYmVjYXVzZSBoaXMgYXJtb3IgaXMgbGlnaHQu" },
-          { "They say that a floating eye can defeat Medusa.", 
-            "VGhleSBzYXkgdGhhdCBhIGZsb2F0aW5nIGV5ZSBjYW4gZGVmZWF0IE1lZHVzYS4=" },
-          { "They say that a fortune only has 1 line and you can't read between it.", 
-            "VGhleSBzYXkgdGhhdCBhIGZvcnR1bmUgb25seSBoYXMgMSBsaW5lIGFuZCB5b3UgY2FuJ3QgcmVhZCBiZXR3ZWVuIGl0Lg==" },
-          { "They say that a fortune only has 1 line, but you can read between it.", 
-            "VGhleSBzYXkgdGhhdCBhIGZvcnR1bmUgb25seSBoYXMgMSBsaW5lLCBidXQgeW91IGNhbiByZWFkIGJldHdlZW4gaXQu" },
-          { "They say that a fountain looks nothing like a regularly erupting geyser.", 
-            "VGhleSBzYXkgdGhhdCBhIGZvdW50YWluIGxvb2tzIG5vdGhpbmcgbGlrZSBhIHJlZ3VsYXJseSBlcnVwdGluZyBnZXlzZXIu" },
-          { "They say that a gold doubloon is worth more than its weight in gold.", 
-            "VGhleSBzYXkgdGhhdCBhIGdvbGQgZG91Ymxvb24gaXMgd29ydGggbW9yZSB0aGFuIGl0cyB3ZWlnaHQgaW4gZ29sZC4=" },
-          { "They say that a grid bug won't pay a shopkeeper for zapping you in a shop.", 
-            "VGhleSBzYXkgdGhhdCBhIGdyaWQgYnVnIHdvbid0IHBheSBhIHNob3BrZWVwZXIgZm9yIHphcHBpbmcgeW91IGluIGEgc2hvcC4=" },
-          { "They say that a gypsy could tell your fortune for a price.", 
-            "VGhleSBzYXkgdGhhdCBhIGd5cHN5IGNvdWxkIHRlbGwgeW91ciBmb3J0dW5lIGZvciBhIHByaWNlLg==" },
-          { "They say that a hacker named Alice once level teleported by using a mirror.", 
-            "VGhleSBzYXkgdGhhdCBhIGhhY2tlciBuYW1lZCBBbGljZSBvbmNlIGxldmVsIHRlbGVwb3J0ZWQgYnkgdXNpbmcgYSBtaXJyb3Iu" },
-          { "They say that a hacker named David once slew a giant with a sling and a rock.", 
-            "VGhleSBzYXkgdGhhdCBhIGhhY2tlciBuYW1lZCBEYXZpZCBvbmNlIHNsZXcgYSBnaWFudCB3aXRoIGEgc2xpbmcgYW5kIGEgcm9jay4=" },
-          { "They say that a hacker named Dorothy once rode a fog cloud to Oz.", 
-            "VGhleSBzYXkgdGhhdCBhIGhhY2tlciBuYW1lZCBEb3JvdGh5IG9uY2Ugcm9kZSBhIGZvZyBjbG91ZCB0byBPei4=" },
-          { "They say that a hacker named Mary once lost a white sheep in the mazes.", 
-            "VGhleSBzYXkgdGhhdCBhIGhhY2tlciBuYW1lZCBNYXJ5IG9uY2UgbG9zdCBhIHdoaXRlIHNoZWVwIGluIHRoZSBtYXplcy4=" },
-          { "They say that a helm of brilliance is not to be taken lightly.", 
-            "VGhleSBzYXkgdGhhdCBhIGhlbG0gb2YgYnJpbGxpYW5jZSBpcyBub3QgdG8gYmUgdGFrZW4gbGlnaHRseS4=" },
-          { "They say that a hot dog and a hell hound are the same thing.", 
-            "VGhleSBzYXkgdGhhdCBhIGhvdCBkb2cgYW5kIGEgaGVsbCBob3VuZCBhcmUgdGhlIHNhbWUgdGhpbmcu" },
-          { "They say that a lamp named Aladdin's Lamp contains a djinni with 3 wishes.", 
-            "VGhleSBzYXkgdGhhdCBhIGxhbXAgbmFtZWQgQWxhZGRpbidzIExhbXAgY29udGFpbnMgYSBkamlubmkgd2l0aCAzIHdpc2hlcy4=" },
-          { "They say that a large dog named Lassie will lead you to the amulet.", 
-            "VGhleSBzYXkgdGhhdCBhIGxhcmdlIGRvZyBuYW1lZCBMYXNzaWUgd2lsbCBsZWFkIHlvdSB0byB0aGUgYW11bGV0Lg==" },
-          { "They say that a long sword is not a light sword.", 
-            "VGhleSBzYXkgdGhhdCBhIGxvbmcgc3dvcmQgaXMgbm90IGEgbGlnaHQgc3dvcmQu" },
-          { "They say that a manes won't mince words with you.", 
-            "VGhleSBzYXkgdGhhdCBhIG1hbmVzIHdvbid0IG1pbmNlIHdvcmRzIHdpdGggeW91Lg==" },
-          { "They say that a mind is a terrible thing to waste.", 
-            "VGhleSBzYXkgdGhhdCBhIG1pbmQgaXMgYSB0ZXJyaWJsZSB0aGluZyB0byB3YXN0ZS4=" },
-          { "They say that a plain nymph will only wear a wire ring in one ear.", 
-            "VGhleSBzYXkgdGhhdCBhIHBsYWluIG55bXBoIHdpbGwgb25seSB3ZWFyIGEgd2lyZSByaW5nIGluIG9uZSBlYXIu" },
-          { "They say that a plumed hat could be a previously used crested helmet.", 
-            "VGhleSBzYXkgdGhhdCBhIHBsdW1lZCBoYXQgY291bGQgYmUgYSBwcmV2aW91c2x5IHVzZWQgY3Jlc3RlZCBoZWxtZXQu" },
-          { "They say that a potion of oil is difficult to grasp.", 
-            "VGhleSBzYXkgdGhhdCBhIHBvdGlvbiBvZiBvaWwgaXMgZGlmZmljdWx0IHRvIGdyYXNwLg==" },
-          { "They say that a potion of yogurt is a cancelled potion of sickness.", 
-            "VGhleSBzYXkgdGhhdCBhIHBvdGlvbiBvZiB5b2d1cnQgaXMgYSBjYW5jZWxsZWQgcG90aW9uIG9mIHNpY2tuZXNzLg==" },
-          { "They say that a purple worm is not a baby purple dragon.", 
-            "VGhleSBzYXkgdGhhdCBhIHB1cnBsZSB3b3JtIGlzIG5vdCBhIGJhYnkgcHVycGxlIGRyYWdvbi4=" },
-          { "They say that a quivering blob tastes different than a gelatinous cube.", 
-            "VGhleSBzYXkgdGhhdCBhIHF1aXZlcmluZyBibG9iIHRhc3RlcyBkaWZmZXJlbnQgdGhhbiBhIGdlbGF0aW5vdXMgY3ViZS4=" },
-          { "They say that a runed broadsword named Stormbringer attracts vortices.", 
-            "VGhleSBzYXkgdGhhdCBhIHJ1bmVkIGJyb2Fkc3dvcmQgbmFtZWQgU3Rvcm1icmluZ2VyIGF0dHJhY3RzIHZvcnRpY2VzLg==" },
-          { "They say that a scroll of summoning has other names.", 
-            "VGhleSBzYXkgdGhhdCBhIHNjcm9sbCBvZiBzdW1tb25pbmcgaGFzIG90aGVyIG5hbWVzLg==" },
-          { "They say that a shaman can bestow blessings but usually doesn't.", 
-            "VGhleSBzYXkgdGhhdCBhIHNoYW1hbiBjYW4gYmVzdG93IGJsZXNzaW5ncyBidXQgdXN1YWxseSBkb2Vzbid0Lg==" },
-          { "They say that a shaman will bless you for an eye of newt and wing of bat.", 
-            "VGhleSBzYXkgdGhhdCBhIHNoYW1hbiB3aWxsIGJsZXNzIHlvdSBmb3IgYW4gZXllIG9mIG5ld3QgYW5kIHdpbmcgb2YgYmF0Lg==" },
-          { "They say that a shimmering gold shield is not a polished silver shield.", 
-            "VGhleSBzYXkgdGhhdCBhIHNoaW1tZXJpbmcgZ29sZCBzaGllbGQgaXMgbm90IGEgcG9saXNoZWQgc2lsdmVyIHNoaWVsZC4=" },
-          { "They say that a spear will hit a neo-otyugh. (Do YOU know what that is?)", 
-            "VGhleSBzYXkgdGhhdCBhIHNwZWFyIHdpbGwgaGl0IGEgbmVvLW90eXVnaC4gKERvIFlPVSBrbm93IHdoYXQgdGhhdCBpcz8p" },
-          { "They say that a spotted dragon is the ultimate shape changer.", 
-            "VGhleSBzYXkgdGhhdCBhIHNwb3R0ZWQgZHJhZ29uIGlzIHRoZSB1bHRpbWF0ZSBzaGFwZSBjaGFuZ2VyLg==" },
-          { "They say that a stethoscope is no good if you can only hear your heartbeat.", 
-            "VGhleSBzYXkgdGhhdCBhIHN0ZXRob3Njb3BlIGlzIG5vIGdvb2QgaWYgeW91IGNhbiBvbmx5IGhlYXIgeW91ciBoZWFydGJlYXQu" },
-          { "They say that a succubus named Suzy will sometimes warn you of danger.", 
-            "VGhleSBzYXkgdGhhdCBhIHN1Y2N1YnVzIG5hbWVkIFN1enkgd2lsbCBzb21ldGltZXMgd2FybiB5b3Ugb2YgZGFuZ2VyLg==" },
-          { "They say that a wand of cancellation is not like a wand of polymorph.", 
-            "VGhleSBzYXkgdGhhdCBhIHdhbmQgb2YgY2FuY2VsbGF0aW9uIGlzIG5vdCBsaWtlIGEgd2FuZCBvZiBwb2x5bW9ycGgu" },
-          { "They say that a wood golem named Pinocchio would be easy to control.", 
-            "VGhleSBzYXkgdGhhdCBhIHdvb2QgZ29sZW0gbmFtZWQgUGlub2NjaGlvIHdvdWxkIGJlIGVhc3kgdG8gY29udHJvbC4=" },
-          { "They say that after killing a dragon it's time for a change of scenery.", 
-            "VGhleSBzYXkgdGhhdCBhZnRlciBraWxsaW5nIGEgZHJhZ29uIGl0J3MgdGltZSBmb3IgYSBjaGFuZ2Ugb2Ygc2NlbmVyeS4=" },
-          { "They say that an amulet of strangulation is worse than ring around the collar.", 
-            "VGhleSBzYXkgdGhhdCBhbiBhbXVsZXQgb2Ygc3RyYW5ndWxhdGlvbiBpcyB3b3JzZSB0aGFuIHJpbmcgYXJvdW5kIHRoZSBjb2xsYXIu" },
-          { "They say that an attic is the best place to hide your toys.", 
-            "VGhleSBzYXkgdGhhdCBhbiBhdHRpYyBpcyB0aGUgYmVzdCBwbGFjZSB0byBoaWRlIHlvdXIgdG95cy4=" },
-          { "They say that an axe named Cleaver once belonged to a hacker named Beaver.", 
-            "VGhleSBzYXkgdGhhdCBhbiBheGUgbmFtZWQgQ2xlYXZlciBvbmNlIGJlbG9uZ2VkIHRvIGEgaGFja2VyIG5hbWVkIEJlYXZlci4=" },
-          { "They say that an eye of newt and a wing of bat are double the trouble.", 
-            "VGhleSBzYXkgdGhhdCBhbiBleWUgb2YgbmV3dCBhbmQgYSB3aW5nIG9mIGJhdCBhcmUgZG91YmxlIHRoZSB0cm91YmxlLg==" },
-          { "They say that an incubus named Izzy sometimes makes women feel sensitive.", 
-            "VGhleSBzYXkgdGhhdCBhbiBpbmN1YnVzIG5hbWVkIEl6enkgc29tZXRpbWVzIG1ha2VzIHdvbWVuIGZlZWwgc2Vuc2l0aXZlLg==" },
-          { "They say that an opulent throne room is rarely a place to wish you'd be in.", 
-            "VGhleSBzYXkgdGhhdCBhbiBvcHVsZW50IHRocm9uZSByb29tIGlzIHJhcmVseSBhIHBsYWNlIHRvIHdpc2ggeW91J2QgYmUgaW4u" },
-          { "They say that an unlucky hacker once had a nose bleed at an altar and died.", 
-            "VGhleSBzYXkgdGhhdCBhbiB1bmx1Y2t5IGhhY2tlciBvbmNlIGhhZCBhIG5vc2UgYmxlZWQgYXQgYW4gYWx0YXIgYW5kIGRpZWQu" },
-          { "They say that and they say this but they never say never, never!", 
-            "VGhleSBzYXkgdGhhdCBhbmQgdGhleSBzYXkgdGhpcyBidXQgdGhleSBuZXZlciBzYXkgbmV2ZXIsIG5ldmVyIQ==" },
-          { "They say that any quantum mechanic knows that speed kills.", 
-            "VGhleSBzYXkgdGhhdCBhbnkgcXVhbnR1bSBtZWNoYW5pYyBrbm93cyB0aGF0IHNwZWVkIGtpbGxzLg==" },
-          { "They say that applying a unicorn horn means you've missed the point.", 
-            "VGhleSBzYXkgdGhhdCBhcHBseWluZyBhIHVuaWNvcm4gaG9ybiBtZWFucyB5b3UndmUgbWlzc2VkIHRoZSBwb2ludC4=" },
-          { "They say that blue stones are radioactive, beware.", 
-            "VGhleSBzYXkgdGhhdCBibHVlIHN0b25lcyBhcmUgcmFkaW9hY3RpdmUsIGJld2FyZS4=" },
-          { "They say that building a dungeon is a team effort.", 
-            "VGhleSBzYXkgdGhhdCBidWlsZGluZyBhIGR1bmdlb24gaXMgYSB0ZWFtIGVmZm9ydC4=" },
-          { "They say that chaotic characters never get a kick out of altars.", 
-            "VGhleSBzYXkgdGhhdCBjaGFvdGljIGNoYXJhY3RlcnMgbmV2ZXIgZ2V0IGEga2ljayBvdXQgb2YgYWx0YXJzLg==" },
-          { "They say that collapsing a dungeon often creates a panic.", 
-            "VGhleSBzYXkgdGhhdCBjb2xsYXBzaW5nIGEgZHVuZ2VvbiBvZnRlbiBjcmVhdGVzIGEgcGFuaWMu" },
-          { "They say that counting your eggs before they hatch shows that you care.", 
-            "VGhleSBzYXkgdGhhdCBjb3VudGluZyB5b3VyIGVnZ3MgYmVmb3JlIHRoZXkgaGF0Y2ggc2hvd3MgdGhhdCB5b3UgY2FyZS4=" },
-          { "They say that dipping a bag of tricks in a fountain won't make it an icebox.", 
-            "VGhleSBzYXkgdGhhdCBkaXBwaW5nIGEgYmFnIG9mIHRyaWNrcyBpbiBhIGZvdW50YWluIHdvbid0IG1ha2UgaXQgYW4gaWNlYm94Lg==" },
-          { "They say that dipping an eel and brown mold in hot water makes bouillabaisse.", 
-            "VGhleSBzYXkgdGhhdCBkaXBwaW5nIGFuIGVlbCBhbmQgYnJvd24gbW9sZCBpbiBob3Qgd2F0ZXIgbWFrZXMgYm91aWxsYWJhaXNzZS4=" },
-          { "They say that donating a doubloon is extremely pious charity.", 
-            "VGhleSBzYXkgdGhhdCBkb25hdGluZyBhIGRvdWJsb29uIGlzIGV4dHJlbWVseSBwaW91cyBjaGFyaXR5Lg==" },
-          { "They say that eating royal jelly attracts grizzly owlbears.", 
-            "VGhleSBzYXkgdGhhdCBlYXRpbmcgcm95YWwgamVsbHkgYXR0cmFjdHMgZ3JpenpseSBvd2xiZWFycy4=" },
-          { "They say that eggs, pancakes and juice are just a mundane breakfast.", 
-            "VGhleSBzYXkgdGhhdCBlZ2dzLCBwYW5jYWtlcyBhbmQganVpY2UgYXJlIGp1c3QgYSBtdW5kYW5lIGJyZWFrZmFzdC4=" },
-          { "They say that everyone knows why Medusa stands alone in the dark.", 
-            "VGhleSBzYXkgdGhhdCBldmVyeW9uZSBrbm93cyB3aHkgTWVkdXNhIHN0YW5kcyBhbG9uZSBpbiB0aGUgZGFyay4=" },
-          { "They say that everyone wanted rec.games.hack to undergo a name change.", 
-            "VGhleSBzYXkgdGhhdCBldmVyeW9uZSB3YW50ZWQgcmVjLmdhbWVzLmhhY2sgdG8gdW5kZXJnbyBhIG5hbWUgY2hhbmdlLg==" },
-          { "They say that finding a winning strategy is a deliberate move on your part.", 
-            "VGhleSBzYXkgdGhhdCBmaW5kaW5nIGEgd2lubmluZyBzdHJhdGVneSBpcyBhIGRlbGliZXJhdGUgbW92ZSBvbiB5b3VyIHBhcnQu" },
-          { "They say that finding worthless glass is worth something.", 
-            "VGhleSBzYXkgdGhhdCBmaW5kaW5nIHdvcnRobGVzcyBnbGFzcyBpcyB3b3J0aCBzb21ldGhpbmcu" },
-          { "They say that fortune cookies are food for thought.", 
-            "VGhleSBzYXkgdGhhdCBmb3J0dW5lIGNvb2tpZXMgYXJlIGZvb2QgZm9yIHRob3VnaHQu" },
-          { "They say that gold is only wasted on a pet dragon.", 
-            "VGhleSBzYXkgdGhhdCBnb2xkIGlzIG9ubHkgd2FzdGVkIG9uIGEgcGV0IGRyYWdvbi4=" },
-          { "They say that good things come to those that wait.", 
-            "VGhleSBzYXkgdGhhdCBnb29kIHRoaW5ncyBjb21lIHRvIHRob3NlIHRoYXQgd2FpdC4=" },
-          { "They say that greased objects will slip out of monsters' hands.", 
-            "VGhleSBzYXkgdGhhdCBncmVhc2VkIG9iamVjdHMgd2lsbCBzbGlwIG91dCBvZiBtb25zdGVycycgaGFuZHMu" },
-          { "They say that if you can't spell then you'll wish you had a spell book.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3UgY2FuJ3Qgc3BlbGwgdGhlbiB5b3UnbGwgd2lzaCB5b3UgaGFkIGEgc3BlbGwgYm9vay4=" },
-          { "They say that if you live by the sword, you'll die by the sword.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3UgbGl2ZSBieSB0aGUgc3dvcmQsIHlvdSdsbCBkaWUgYnkgdGhlIHN3b3JkLg==" },
-          { "They say that if you play like a monster you'll have a better game.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3UgcGxheSBsaWtlIGEgbW9uc3RlciB5b3UnbGwgaGF2ZSBhIGJldHRlciBnYW1lLg==" },
-          { "They say that if you sleep with a demon you might awake with a headache.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3Ugc2xlZXAgd2l0aCBhIGRlbW9uIHlvdSBtaWdodCBhd2FrZSB3aXRoIGEgaGVhZGFjaGUu" },
-          { "They say that if you step on a crack you could break your mother's back.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3Ugc3RlcCBvbiBhIGNyYWNrIHlvdSBjb3VsZCBicmVhayB5b3VyIG1vdGhlcidzIGJhY2su" },
-          { "They say that if you're invisible you can still be heard!", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3UncmUgaW52aXNpYmxlIHlvdSBjYW4gc3RpbGwgYmUgaGVhcmQh" },
-          { "They say that if you're lucky you can feel the runes on a scroll.", 
-            "VGhleSBzYXkgdGhhdCBpZiB5b3UncmUgbHVja3kgeW91IGNhbiBmZWVsIHRoZSBydW5lcyBvbiBhIHNjcm9sbC4=" },
-          { "They say that in the big picture gold is only small change.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgYmlnIHBpY3R1cmUgZ29sZCBpcyBvbmx5IHNtYWxsIGNoYW5nZS4=" },
-          { "They say that in the dungeon it's not what you know that really matters.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiBpdCdzIG5vdCB3aGF0IHlvdSBrbm93IHRoYXQgcmVhbGx5IG1hdHRlcnMu" },
-          { "They say that in the dungeon moon rocks are really dilithium crystals.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiBtb29uIHJvY2tzIGFyZSByZWFsbHkgZGlsaXRoaXVtIGNyeXN0YWxzLg==" },
-          { "They say that in the dungeon the boorish customer is never right.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiB0aGUgYm9vcmlzaCBjdXN0b21lciBpcyBuZXZlciByaWdodC4=" },
-          { "They say that in the dungeon you don't need a watch to tell time.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiB5b3UgZG9uJ3QgbmVlZCBhIHdhdGNoIHRvIHRlbGwgdGltZS4=" },
-          { "They say that in the dungeon you need something old, new, burrowed and blue.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiB5b3UgbmVlZCBzb21ldGhpbmcgb2xkLCBuZXcsIGJ1cnJvd2VkIGFuZCBibHVlLg==" },
-          { "They say that in the dungeon you should always count your blessings.", 
-            "VGhleSBzYXkgdGhhdCBpbiB0aGUgZHVuZ2VvbiB5b3Ugc2hvdWxkIGFsd2F5cyBjb3VudCB5b3VyIGJsZXNzaW5ncy4=" },
-          { "They say that iron golem plate mail isn't worth wishing for.", 
-            "VGhleSBzYXkgdGhhdCBpcm9uIGdvbGVtIHBsYXRlIG1haWwgaXNuJ3Qgd29ydGggd2lzaGluZyBmb3Iu" },
-          { "They say that it takes four quarterstaffs to make one staff.", 
-            "VGhleSBzYXkgdGhhdCBpdCB0YWtlcyBmb3VyIHF1YXJ0ZXJzdGFmZnMgdG8gbWFrZSBvbmUgc3RhZmYu" },
-          { "They say that it's not over till the fat ladies sing.", 
-            "VGhleSBzYXkgdGhhdCBpdCdzIG5vdCBvdmVyIHRpbGwgdGhlIGZhdCBsYWRpZXMgc2luZy4=" },
-          { "They say that it's not over till the fat lady shouts `Off with its head'.", 
-            "VGhleSBzYXkgdGhhdCBpdCdzIG5vdCBvdmVyIHRpbGwgdGhlIGZhdCBsYWR5IHNob3V0cyBgT2ZmIHdpdGggaXRzIGhlYWQnLg==" },
-          { "They say that kicking a heavy statue is really a dumb move.", 
-            "VGhleSBzYXkgdGhhdCBraWNraW5nIGEgaGVhdnkgc3RhdHVlIGlzIHJlYWxseSBhIGR1bWIgbW92ZS4=" },
-          { "They say that kicking a valuable gem doesn't seem to make sense.", 
-            "VGhleSBzYXkgdGhhdCBraWNraW5nIGEgdmFsdWFibGUgZ2VtIGRvZXNuJ3Qgc2VlbSB0byBtYWtlIHNlbnNlLg==" },
-          { "They say that leprechauns know Latin and you should too.", 
-            "VGhleSBzYXkgdGhhdCBsZXByZWNoYXVucyBrbm93IExhdGluIGFuZCB5b3Ugc2hvdWxkIHRvby4=" },
-          { "They say that minotaurs get lost outside of the mazes.", 
-            "VGhleSBzYXkgdGhhdCBtaW5vdGF1cnMgZ2V0IGxvc3Qgb3V0c2lkZSBvZiB0aGUgbWF6ZXMu" },
-          { "They say that most trolls are born again.", 
-            "VGhleSBzYXkgdGhhdCBtb3N0IHRyb2xscyBhcmUgYm9ybiBhZ2Fpbi4=" },
-          { "They say that naming your cat Garfield will make you more attractive.", 
-            "VGhleSBzYXkgdGhhdCBuYW1pbmcgeW91ciBjYXQgR2FyZmllbGQgd2lsbCBtYWtlIHlvdSBtb3JlIGF0dHJhY3RpdmUu" },
-          { "They say that no one knows everything about everything in the dungeon.", 
-            "VGhleSBzYXkgdGhhdCBubyBvbmUga25vd3MgZXZlcnl0aGluZyBhYm91dCBldmVyeXRoaW5nIGluIHRoZSBkdW5nZW9uLg==" },
-          { "They say that no one plays NetHack just for the fun of it.", 
-            "VGhleSBzYXkgdGhhdCBubyBvbmUgcGxheXMgTmV0SGFjayBqdXN0IGZvciB0aGUgZnVuIG9mIGl0Lg==" },
-          { "They say that no one really subscribes to rec.games.roguelike.nethack.", 
-            "VGhleSBzYXkgdGhhdCBubyBvbmUgcmVhbGx5IHN1YnNjcmliZXMgdG8gcmVjLmdhbWVzLnJvZ3VlbGlrZS5uZXRoYWNrLg==" },
-          { "They say that no one will admit to starting a rumor.", 
-            "VGhleSBzYXkgdGhhdCBubyBvbmUgd2lsbCBhZG1pdCB0byBzdGFydGluZyBhIHJ1bW9yLg==" },
-          { "They say that nurses sometimes carry scalpels and never use them.", 
-            "VGhleSBzYXkgdGhhdCBudXJzZXMgc29tZXRpbWVzIGNhcnJ5IHNjYWxwZWxzIGFuZCBuZXZlciB1c2UgdGhlbS4=" },
-          { "They say that once you've met one wizard you've met them all.", 
-            "VGhleSBzYXkgdGhhdCBvbmNlIHlvdSd2ZSBtZXQgb25lIHdpemFyZCB5b3UndmUgbWV0IHRoZW0gYWxsLg==" },
-          { "They say that one troll is worth 10,000 newts.", 
-            "VGhleSBzYXkgdGhhdCBvbmUgdHJvbGwgaXMgd29ydGggMTAsMDAwIG5ld3RzLg==" },
-          { "They say that only David can find the zoo!", 
-            "VGhleSBzYXkgdGhhdCBvbmx5IERhdmlkIGNhbiBmaW5kIHRoZSB6b28h" },
-          { "They say that only angels play their harps for their pets.", 
-            "VGhleSBzYXkgdGhhdCBvbmx5IGFuZ2VscyBwbGF5IHRoZWlyIGhhcnBzIGZvciB0aGVpciBwZXRzLg==" },
-          { "They say that only big spenders carry gold.", 
-            "VGhleSBzYXkgdGhhdCBvbmx5IGJpZyBzcGVuZGVycyBjYXJyeSBnb2xkLg==" },
-          { "They say that orc shamans are healthy, wealthy and wise.", 
-            "VGhleSBzYXkgdGhhdCBvcmMgc2hhbWFucyBhcmUgaGVhbHRoeSwgd2VhbHRoeSBhbmQgd2lzZS4=" },
-          { "They say that playing NetHack is like walking into a death trap.", 
-            "VGhleSBzYXkgdGhhdCBwbGF5aW5nIE5ldEhhY2sgaXMgbGlrZSB3YWxraW5nIGludG8gYSBkZWF0aCB0cmFwLg==" },
-          { "They say that problem breathing is best treated by a proper diet.", 
-            "VGhleSBzYXkgdGhhdCBwcm9ibGVtIGJyZWF0aGluZyBpcyBiZXN0IHRyZWF0ZWQgYnkgYSBwcm9wZXIgZGlldC4=" },
-          { "They say that quaffing many potions of levitation can give you a headache.", 
-            "VGhleSBzYXkgdGhhdCBxdWFmZmluZyBtYW55IHBvdGlvbnMgb2YgbGV2aXRhdGlvbiBjYW4gZ2l2ZSB5b3UgYSBoZWFkYWNoZS4=" },
-          { "They say that queen bees get that way by eating royal jelly.", 
-            "VGhleSBzYXkgdGhhdCBxdWVlbiBiZWVzIGdldCB0aGF0IHdheSBieSBlYXRpbmcgcm95YWwgamVsbHku" },
-          { "They say that reading a scare monster scroll is the same as saying Elbereth.", 
-            "VGhleSBzYXkgdGhhdCByZWFkaW5nIGEgc2NhcmUgbW9uc3RlciBzY3JvbGwgaXMgdGhlIHNhbWUgYXMgc2F5aW5nIEVsYmVyZXRoLg==" },
-          { "They say that real hackers always are controlled.", 
-            "VGhleSBzYXkgdGhhdCByZWFsIGhhY2tlcnMgYWx3YXlzIGFyZSBjb250cm9sbGVkLg==" },
-          { "They say that real hackers never sleep.", 
-            "VGhleSBzYXkgdGhhdCByZWFsIGhhY2tlcnMgbmV2ZXIgc2xlZXAu" },
-          { "They say that shopkeepers are insured by Croesus himself!", 
-            "VGhleSBzYXkgdGhhdCBzaG9wa2VlcGVycyBhcmUgaW5zdXJlZCBieSBDcm9lc3VzIGhpbXNlbGYh" },
-          { "They say that shopkeepers never carry more than 20 gold pieces, at night.", 
-            "VGhleSBzYXkgdGhhdCBzaG9wa2VlcGVycyBuZXZlciBjYXJyeSBtb3JlIHRoYW4gMjAgZ29sZCBwaWVjZXMsIGF0IG5pZ2h0Lg==" },
-          { "They say that shopkeepers never sell blessed potions of invisibility.", 
-            "VGhleSBzYXkgdGhhdCBzaG9wa2VlcGVycyBuZXZlciBzZWxsIGJsZXNzZWQgcG90aW9ucyBvZiBpbnZpc2liaWxpdHku" },
-          { "They say that soldiers wear kid gloves and silly helmets.", 
-            "VGhleSBzYXkgdGhhdCBzb2xkaWVycyB3ZWFyIGtpZCBnbG92ZXMgYW5kIHNpbGx5IGhlbG1ldHMu" },
-          { "They say that some Kops are on the take.", 
-            "VGhleSBzYXkgdGhhdCBzb21lIEtvcHMgYXJlIG9uIHRoZSB0YWtlLg==" },
-          { "They say that some guards' palms can be greased.", 
-            "VGhleSBzYXkgdGhhdCBzb21lIGd1YXJkcycgcGFsbXMgY2FuIGJlIGdyZWFzZWQu" },
-          { "They say that some monsters may kiss your boots to stop your drum playing.", 
-            "VGhleSBzYXkgdGhhdCBzb21lIG1vbnN0ZXJzIG1heSBraXNzIHlvdXIgYm9vdHMgdG8gc3RvcCB5b3VyIGRydW0gcGxheWluZy4=" },
-          { "They say that sometimes you can be the hit of the party when playing a horn.", 
-            "VGhleSBzYXkgdGhhdCBzb21ldGltZXMgeW91IGNhbiBiZSB0aGUgaGl0IG9mIHRoZSBwYXJ0eSB3aGVuIHBsYXlpbmcgYSBob3JuLg==" },
-          { "They say that the NetHack gods generally welcome your sacrifices.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgTmV0SGFjayBnb2RzIGdlbmVyYWxseSB3ZWxjb21lIHlvdXIgc2FjcmlmaWNlcy4=" },
-          { "They say that the Three Rings are named Vilya, Nenya and Narya.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgVGhyZWUgUmluZ3MgYXJlIG5hbWVkIFZpbHlhLCBOZW55YSBhbmQgTmFyeWEu" },
-          { "They say that the Wizard of Yendor has a death wish.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgV2l6YXJkIG9mIFllbmRvciBoYXMgYSBkZWF0aCB3aXNoLg==" },
-          { "They say that the `hair of the dog' is sometimes an effective remedy.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgYGhhaXIgb2YgdGhlIGRvZycgaXMgc29tZXRpbWVzIGFuIGVmZmVjdGl2ZSByZW1lZHku" },
-          { "They say that the best time to save your game is now before its too late.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgYmVzdCB0aW1lIHRvIHNhdmUgeW91ciBnYW1lIGlzIG5vdyBiZWZvcmUgaXRzIHRvbyBsYXRlLg==" },
-          { "They say that the biggest obstacle in NetHack is your mind.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgYmlnZ2VzdCBvYnN0YWNsZSBpbiBOZXRIYWNrIGlzIHlvdXIgbWluZC4=" },
-          { "They say that the gods are angry when they hit you with objects.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgZ29kcyBhcmUgYW5ncnkgd2hlbiB0aGV5IGhpdCB5b3Ugd2l0aCBvYmplY3RzLg==" },
-          { "They say that the priesthood are specially favored by the gods.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgcHJpZXN0aG9vZCBhcmUgc3BlY2lhbGx5IGZhdm9yZWQgYnkgdGhlIGdvZHMu" },
-          { "They say that the way to make a unicorn happy is to give it what it wants.", 
-            "VGhleSBzYXkgdGhhdCB0aGUgd2F5IHRvIG1ha2UgYSB1bmljb3JuIGhhcHB5IGlzIHRvIGdpdmUgaXQgd2hhdCBpdCB3YW50cy4=" },
-          { "They say that there are no black or white stones, only gray.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBhcmUgbm8gYmxhY2sgb3Igd2hpdGUgc3RvbmVzLCBvbmx5IGdyYXku" },
-          { "They say that there are no skeletons hence there are no skeleton keys.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBhcmUgbm8gc2tlbGV0b25zIGhlbmNlIHRoZXJlIGFyZSBubyBza2VsZXRvbiBrZXlzLg==" },
-          { "They say that there is a clever rogue in every hacker just dying to escape.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBpcyBhIGNsZXZlciByb2d1ZSBpbiBldmVyeSBoYWNrZXIganVzdCBkeWluZyB0byBlc2NhcGUu" },
-          { "They say that there is no such thing as free advice.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBpcyBubyBzdWNoIHRoaW5nIGFzIGZyZWUgYWR2aWNlLg==" },
-          { "They say that there is only one way to win at NetHack.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBpcyBvbmx5IG9uZSB3YXkgdG8gd2luIGF0IE5ldEhhY2su" },
-          { "They say that there once was a fearsome chaotic samurai named Luk No.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSBvbmNlIHdhcyBhIGZlYXJzb21lIGNoYW90aWMgc2FtdXJhaSBuYW1lZCBMdWsgTm8u" },
-          { "They say that there was a time when cursed holy water wasn't water.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSB3YXMgYSB0aW1lIHdoZW4gY3Vyc2VkIGhvbHkgd2F0ZXIgd2Fzbid0IHdhdGVyLg==" },
-          { "They say that there's no point in crying over a gray ooze.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSdzIG5vIHBvaW50IGluIGNyeWluZyBvdmVyIGEgZ3JheSBvb3plLg==" },
-          { "They say that there's only hope left after you've opened Pandora's box.", 
-            "VGhleSBzYXkgdGhhdCB0aGVyZSdzIG9ubHkgaG9wZSBsZWZ0IGFmdGVyIHlvdSd2ZSBvcGVuZWQgUGFuZG9yYSdzIGJveC4=" },
-          { "They say that trapdoors should always be marked `Caution: Trap Door'.", 
-            "VGhleSBzYXkgdGhhdCB0cmFwZG9vcnMgc2hvdWxkIGFsd2F5cyBiZSBtYXJrZWQgYENhdXRpb246IFRyYXAgRG9vcicu" },
-          { "They say that using an amulet of change isn't a difficult operation.", 
-            "VGhleSBzYXkgdGhhdCB1c2luZyBhbiBhbXVsZXQgb2YgY2hhbmdlIGlzbid0IGEgZGlmZmljdWx0IG9wZXJhdGlvbi4=" },
-          { "They say that water walking boots are better if you are fast like Hermes.", 
-            "VGhleSBzYXkgdGhhdCB3YXRlciB3YWxraW5nIGJvb3RzIGFyZSBiZXR0ZXIgaWYgeW91IGFyZSBmYXN0IGxpa2UgSGVybWVzLg==" },
-          { "They say that when you wear a circular amulet you might resemble a troll.", 
-            "VGhleSBzYXkgdGhhdCB3aGVuIHlvdSB3ZWFyIGEgY2lyY3VsYXIgYW11bGV0IHlvdSBtaWdodCByZXNlbWJsZSBhIHRyb2xsLg==" },
-          { "They say that when you're hungry you can get a pizza in 30 moves or it's free.", 
-            "VGhleSBzYXkgdGhhdCB3aGVuIHlvdSdyZSBodW5ncnkgeW91IGNhbiBnZXQgYSBwaXp6YSBpbiAzMCBtb3ZlcyBvciBpdCdzIGZyZWUu" },
-          { "They say that when your god is angry you should try another one.", 
-            "VGhleSBzYXkgdGhhdCB3aGVuIHlvdXIgZ29kIGlzIGFuZ3J5IHlvdSBzaG91bGQgdHJ5IGFub3RoZXIgb25lLg==" },
-          { "They say that wielding a unicorn horn takes strength.", 
-            "VGhleSBzYXkgdGhhdCB3aWVsZGluZyBhIHVuaWNvcm4gaG9ybiB0YWtlcyBzdHJlbmd0aC4=" },
-          { "They say that with speed boots you never worry about hit and run accidents.", 
-            "VGhleSBzYXkgdGhhdCB3aXRoIHNwZWVkIGJvb3RzIHlvdSBuZXZlciB3b3JyeSBhYm91dCBoaXQgYW5kIHJ1biBhY2NpZGVudHMu" },
-          { "They say that you can defeat a killer bee with a unicorn horn.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIGRlZmVhdCBhIGtpbGxlciBiZWUgd2l0aCBhIHVuaWNvcm4gaG9ybi4=" },
-          { "They say that you can only cross the River Styx in Charon's boat.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIG9ubHkgY3Jvc3MgdGhlIFJpdmVyIFN0eXggaW4gQ2hhcm9uJ3MgYm9hdC4=" },
-          { "They say that you can only kill a lich once and then you'd better be careful.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIG9ubHkga2lsbCBhIGxpY2ggb25jZSBhbmQgdGhlbiB5b3UnZCBiZXR0ZXIgYmUgY2FyZWZ1bC4=" },
-          { "They say that you can only wish for things you've already had.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIG9ubHkgd2lzaCBmb3IgdGhpbmdzIHlvdSd2ZSBhbHJlYWR5IGhhZC4=" },
-          { "They say that you can train a cat by talking gently to it.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIHRyYWluIGEgY2F0IGJ5IHRhbGtpbmcgZ2VudGx5IHRvIGl0Lg==" },
-          { "They say that you can train a dog by talking firmly to it.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIHRyYWluIGEgZG9nIGJ5IHRhbGtpbmcgZmlybWx5IHRvIGl0Lg==" },
-          { "They say that you can trust your gold with the king.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuIHRydXN0IHlvdXIgZ29sZCB3aXRoIHRoZSBraW5nLg==" },
-          { "They say that you can't wipe your greasy bare hands on a blank scroll.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2FuJ3Qgd2lwZSB5b3VyIGdyZWFzeSBiYXJlIGhhbmRzIG9uIGEgYmxhbmsgc2Nyb2xsLg==" },
-          { "They say that you cannot trust scrolls of rumor.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY2Fubm90IHRydXN0IHNjcm9sbHMgb2YgcnVtb3Iu" },
-          { "They say that you could fall head over heels for an energy vortex.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgY291bGQgZmFsbCBoZWFkIG92ZXIgaGVlbHMgZm9yIGFuIGVuZXJneSB2b3J0ZXgu" },
-          { "They say that you need a key in order to open locked doors.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgbmVlZCBhIGtleSBpbiBvcmRlciB0byBvcGVuIGxvY2tlZCBkb29ycy4=" },
-          { "They say that you need a mirror to notice a mimic in an antique shop.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgbmVlZCBhIG1pcnJvciB0byBub3RpY2UgYSBtaW1pYyBpbiBhbiBhbnRpcXVlIHNob3Au" },
-          { "They say that you really can use a pick-axe unless you really can't.", 
-            "VGhleSBzYXkgdGhhdCB5b3UgcmVhbGx5IGNhbiB1c2UgYSBwaWNrLWF4ZSB1bmxlc3MgeW91IHJlYWxseSBjYW4ndC4=" },
-          { "They say that you should always store your tools in the cellar.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIGFsd2F5cyBzdG9yZSB5b3VyIHRvb2xzIGluIHRoZSBjZWxsYXIu" },
-          { "They say that you should be careful while climbing the ladder to success.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIGJlIGNhcmVmdWwgd2hpbGUgY2xpbWJpbmcgdGhlIGxhZGRlciB0byBzdWNjZXNzLg==" },
-          { "They say that you should call your armor `rustproof'.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIGNhbGwgeW91ciBhcm1vciBgcnVzdHByb29mJy4=" },
-          { "They say that you should name your dog Spuds to have a cool pet.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIG5hbWUgeW91ciBkb2cgU3B1ZHMgdG8gaGF2ZSBhIGNvb2wgcGV0Lg==" },
-          { "They say that you should name your weapon after your first monster kill.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIG5hbWUgeW91ciB3ZWFwb24gYWZ0ZXIgeW91ciBmaXJzdCBtb25zdGVyIGtpbGwu" },
-          { "They say that you should never introduce a rope golem to a succubus.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIG5ldmVyIGludHJvZHVjZSBhIHJvcGUgZ29sZW0gdG8gYSBzdWNjdWJ1cy4=" },
-          { "They say that you should never sleep near invisible ring wraiths.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIG5ldmVyIHNsZWVwIG5lYXIgaW52aXNpYmxlIHJpbmcgd3JhaXRocy4=" },
-          { "They say that you should never try to leave the dungeon with a bag of gems.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIG5ldmVyIHRyeSB0byBsZWF2ZSB0aGUgZHVuZ2VvbiB3aXRoIGEgYmFnIG9mIGdlbXMu" },
-          { "They say that you should remove your armor before sitting on a throne.", 
-            "VGhleSBzYXkgdGhhdCB5b3Ugc2hvdWxkIHJlbW92ZSB5b3VyIGFybW9yIGJlZm9yZSBzaXR0aW5nIG9uIGEgdGhyb25lLg==" },
-          { "This fortune cookie is copy protected.", 
-            "VGhpcyBmb3J0dW5lIGNvb2tpZSBpcyBjb3B5IHByb3RlY3RlZC4=" },
-          { "This fortune cookie is the property of Fortune Cookies, Inc.", 
-            "VGhpcyBmb3J0dW5lIGNvb2tpZSBpcyB0aGUgcHJvcGVydHkgb2YgRm9ydHVuZSBDb29raWVzLCBJbmMu" },
-          { "Tired? Try a scroll of charging on yourself.", 
-            "VGlyZWQ/IFRyeSBhIHNjcm9sbCBvZiBjaGFyZ2luZyBvbiB5b3Vyc2VsZi4=" },
-          { "To achieve the next higher rating, you need 3 more points.", 
-            "VG8gYWNoaWV2ZSB0aGUgbmV4dCBoaWdoZXIgcmF0aW5nLCB5b3UgbmVlZCAzIG1vcmUgcG9pbnRzLg==" },
-          { "To reach heaven, escape the dungeon while wearing a ring of levitation.", 
-            "VG8gcmVhY2ggaGVhdmVuLCBlc2NhcGUgdGhlIGR1bmdlb24gd2hpbGUgd2VhcmluZyBhIHJpbmcgb2YgbGV2aXRhdGlvbi4=" },
-          { "Tourists wear shirts loud enough to wake the dead.", 
-            "VG91cmlzdHMgd2VhciBzaGlydHMgbG91ZCBlbm91Z2ggdG8gd2FrZSB0aGUgZGVhZC4=" },
-          { "Try calling your katana Moulinette.", 
-            "VHJ5IGNhbGxpbmcgeW91ciBrYXRhbmEgTW91bGluZXR0ZS4=" },
-          { "Ulch! That meat was painted!", 
-            "VWxjaCEgVGhhdCBtZWF0IHdhcyBwYWludGVkIQ==" },
-          { "Unfortunately, this message was left intentionally blank.", 
-            "VW5mb3J0dW5hdGVseSwgdGhpcyBtZXNzYWdlIHdhcyBsZWZ0IGludGVudGlvbmFsbHkgYmxhbmsu" },
-          { "Using a morning star in the evening has no effect.", 
-            "VXNpbmcgYSBtb3JuaW5nIHN0YXIgaW4gdGhlIGV2ZW5pbmcgaGFzIG5vIGVmZmVjdC4=" },
-          { "Want a hint? Zap a wand of make invisible on your weapon!", 
-            "V2FudCBhIGhpbnQ/IFphcCBhIHdhbmQgb2YgbWFrZSBpbnZpc2libGUgb24geW91ciB3ZWFwb24h" },
-          { "Want to ascend in a hurry? Apply at Gizmonic Institute.", 
-            "V2FudCB0byBhc2NlbmQgaW4gYSBodXJyeT8gQXBwbHkgYXQgR2l6bW9uaWMgSW5zdGl0dXRlLg==" },
-          { "Wanted: shopkeepers. Send a scroll of mail to Mage of Yendor/Level 35/Dungeon.", 
-            "V2FudGVkOiBzaG9wa2VlcGVycy4gU2VuZCBhIHNjcm9sbCBvZiBtYWlsIHRvIE1hZ2Ugb2YgWWVuZG9yL0xldmVsIDM1L0R1bmdlb24u" },
-          { "Warning: fortune reading can be hazardous to your health.", 
-            "V2FybmluZzogZm9ydHVuZSByZWFkaW5nIGNhbiBiZSBoYXphcmRvdXMgdG8geW91ciBoZWFsdGgu" },
-          { "We have new ways of detecting treachery...", 
-            "V2UgaGF2ZSBuZXcgd2F5cyBvZiBkZXRlY3RpbmcgdHJlYWNoZXJ5Li4u" },
-          { "Wet towels make great weapons!", 
-            "V2V0IHRvd2VscyBtYWtlIGdyZWF0IHdlYXBvbnMh" },
-          { "What a pity, you cannot read it!", 
-            "V2hhdCBhIHBpdHksIHlvdSBjYW5ub3QgcmVhZCBpdCE=" },
-          { "When a piercer drops in on you, you will be tempted to hit the ceiling!", 
-            "V2hlbiBhIHBpZXJjZXIgZHJvcHMgaW4gb24geW91LCB5b3Ugd2lsbCBiZSB0ZW1wdGVkIHRvIGhpdCB0aGUgY2VpbGluZyE=" },
-          { "When in a maze follow the right wall and you will never get lost.", 
-            "V2hlbiBpbiBhIG1hemUgZm9sbG93IHRoZSByaWdodCB3YWxsIGFuZCB5b3Ugd2lsbCBuZXZlciBnZXQgbG9zdC4=" },
-          { "When you have a key, you don't have to wait for the guard.", 
-            "V2hlbiB5b3UgaGF2ZSBhIGtleSwgeW91IGRvbid0IGhhdmUgdG8gd2FpdCBmb3IgdGhlIGd1YXJkLg==" },
-          { "Why are you wasting time reading fortunes?", 
-            "V2h5IGFyZSB5b3Ugd2FzdGluZyB0aW1lIHJlYWRpbmcgZm9ydHVuZXM/" },
-          { "Wish for a master key and open the Magic Memory Vault!", 
-            "V2lzaCBmb3IgYSBtYXN0ZXIga2V5IGFuZCBvcGVuIHRoZSBNYWdpYyBNZW1vcnkgVmF1bHQh" },
-          { "Wizard expects every monster to do its duty.", 
-            "V2l6YXJkIGV4cGVjdHMgZXZlcnkgbW9uc3RlciB0byBkbyBpdHMgZHV0eS4=" },
-          { "Wow! You could've had a potion of fruit juice!", 
-            "V293ISBZb3UgY291bGQndmUgaGFkIGEgcG90aW9uIG9mIGZydWl0IGp1aWNlIQ==" },
-          { "Yet Another Silly Message (YASM).", 
-            "WWV0IEFub3RoZXIgU2lsbHkgTWVzc2FnZSAoWUFTTSku" },
-          { "You are destined to be misled by a fortune.", 
-            "WW91IGFyZSBkZXN0aW5lZCB0byBiZSBtaXNsZWQgYnkgYSBmb3J0dW5lLg==" },
-          { "You can get a genuine Amulet of Yendor by doing the following: --More--", 
-            "WW91IGNhbiBnZXQgYSBnZW51aW5lIEFtdWxldCBvZiBZZW5kb3IgYnkgZG9pbmcgdGhlIGZvbGxvd2luZzogLS1Nb3JlLS0=" },
-          { "You can protect yourself from black dragons by doing the following: --More--", 
-            "WW91IGNhbiBwcm90ZWN0IHlvdXJzZWxmIGZyb20gYmxhY2sgZHJhZ29ucyBieSBkb2luZyB0aGUgZm9sbG93aW5nOiAtLU1vcmUtLQ==" },
-          { "You can't get by the snake.", 
-            "WW91IGNhbid0IGdldCBieSB0aGUgc25ha2Uu" },
-          { "You feel like someone is pulling your leg.", 
-            "WW91IGZlZWwgbGlrZSBzb21lb25lIGlzIHB1bGxpbmcgeW91ciBsZWcu" },
-          { "You have to outwit the Sphynx or pay her.", 
-            "WW91IGhhdmUgdG8gb3V0d2l0IHRoZSBTcGh5bnggb3IgcGF5IGhlci4=" },
-          { "You hear the fortune cookie's hissing!", 
-            "WW91IGhlYXIgdGhlIGZvcnR1bmUgY29va2llJ3MgaGlzc2luZyE=" },
-          { "You may get rich selling letters, but beware of being blackmailed!", 
-            "WW91IG1heSBnZXQgcmljaCBzZWxsaW5nIGxldHRlcnMsIGJ1dCBiZXdhcmUgb2YgYmVpbmcgYmxhY2ttYWlsZWQh" },
-          { "You offend Shai-Hulud by sheathing your crysknife without having drawn blood.", 
-            "WW91IG9mZmVuZCBTaGFpLUh1bHVkIGJ5IHNoZWF0aGluZyB5b3VyIGNyeXNrbmlmZSB3aXRob3V0IGhhdmluZyBkcmF3biBibG9vZC4=" },
-          { "You swallowed the fortune!", 
-            "WW91IHN3YWxsb3dlZCB0aGUgZm9ydHVuZSE=" },
-          { "You want to regain strength? Two levels ahead is a guesthouse!", 
-            "WW91IHdhbnQgdG8gcmVnYWluIHN0cmVuZ3RoPyBUd28gbGV2ZWxzIGFoZWFkIGlzIGEgZ3Vlc3Rob3VzZSE=" },
-          { "You will encounter a tall, dark, and gruesome creature...", 
-            "WW91IHdpbGwgZW5jb3VudGVyIGEgdGFsbCwgZGFyaywgYW5kIGdydWVzb21lIGNyZWF0dXJlLi4u" },
-
-          { "The End", "VGhlIEVuZA==" }
-      };
-
-/* PL_Base64Encode, random strings */
-PRBool test_004(void)
-{
-    int i;
-    char result[ 4096 ];
-
-    printf("Test 004 (PL_Base64Encode, random strings)                            ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 plen = PL_strlen(array[i].plaintext);
-        PRUint32 clen = ((plen + 2)/3)*4;
-
-        char *rv = PL_Base64Encode(array[i].plaintext, plen, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strncmp(result, array[i].cyphertext, clen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].plaintext, array[i].cyphertext, clen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, single characters, malloc */
-PRBool test_005(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 005 (PL_Base64Encode, single characters, malloc)                 ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Encode((char *)plain, 1, (char *)0);
-            if( (char *)0 == rv )
-            {
-                printf("FAIL\n\t(%d, %d): no return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strcmp((char *)cypher, rv) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%s.\"\n",
-                       a, b, cypher, rv);
-                PR_DELETE(rv);
-                return PR_FALSE;
-            }
-
-            PR_DELETE(rv);
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, double characters, malloc */
-PRBool test_006(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 006 (PL_Base64Encode, double characters, malloc)                 ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Encode((char *)plain, 2, (char *)0);
-                    if( (char *)0 == rv )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): no return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strcmp((char *)cypher, rv) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%s.\"\n",
-                               a, b, c, d, cypher, rv);
-                        PR_DELETE(rv);
-                        return PR_FALSE;
-                    }
-
-                    PR_DELETE(rv);
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, triple characters, malloc */
-PRBool test_007(void)
-{
-    PRUint32 a, b, c, d, e, f;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 007 (PL_Base64Encode, triple characters, malloc)                 ..."); fflush(stdout);
-
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    for( e = 0; e < 4; e++ )
-                    {
-                        cypher[2] = base[d*4 + e];
-                        for( f = 0; f < 64; f++ )
-                        {
-                            plain[2] = e * 64 + f;
-                            cypher[3] = base[f];
-
-                            rv = PL_Base64Encode((char *)plain, 3, (char *)0);
-                            if( (char *)0 == rv )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): no return value\n", a, b, c, d, e, f);
-                                return PR_FALSE;
-                            }
-
-                            if( 0 != PL_strcmp((char *)cypher, rv) )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): expected \"%s,\" got \"%.4s.\"\n",
-                                       a, b, c, d, e, f, cypher, rv);
-                                PR_DELETE(rv);
-                                return PR_FALSE;
-                            }
-
-                            PR_DELETE(rv);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, random strings, malloc */
-PRBool test_008(void)
-{
-    int i;
-
-    printf("Test 008 (PL_Base64Encode, random strings, malloc)                    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 plen = PL_strlen(array[i].plaintext);
-        PRUint32 clen = ((plen + 2)/3)*4;
-
-        char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].cyphertext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].plaintext, array[i].cyphertext, rv);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, single characters */
-PRBool test_009(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 009 (PL_Base64Decode, single characters, equals)                 ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Decode((char *)cypher, 4, result);
-            if( rv != result )
-            {
-                printf("FAIL\n\t(%d, %d): return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strncmp((char *)plain, result, 1) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%.1s.\"\n",
-                       a, b, plain, result);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, single characters */
-PRBool test_010(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 010 (PL_Base64Decode, single characters, no equals)              ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)0;
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Decode((char *)cypher, 2, result);
-            if( rv != result )
-            {
-                printf("FAIL\n\t(%d, %d): return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strncmp((char *)plain, result, 1) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%.1s.\"\n",
-                       a, b, plain, result);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, double characters */
-PRBool test_011(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 011 (PL_Base64Decode, double characters, equals)                 ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Decode((char *)cypher, 4, result);
-                    if( rv != result )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strncmp((char *)plain, result, 2) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%.2s.\"\n",
-                               a, b, c, d, plain, result);
-                        return PR_FALSE;
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, double characters */
-PRBool test_012(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 012 (PL_Base64Decode, double characters, no equals)              ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)0;
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Decode((char *)cypher, 3, result);
-                    if( rv != result )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strncmp((char *)plain, result, 2) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%.2s.\"\n",
-                               a, b, c, d, cypher, result);
-                        return PR_FALSE;
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, triple characters */
-PRBool test_013(void)
-{
-    PRUint32 a, b, c, d, e, f;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char result[ 8 ];
-    char *rv;
-
-    printf("Test 013 (PL_Base64Decode, triple characters)                         ..."); fflush(stdout);
-
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    for( e = 0; e < 4; e++ )
-                    {
-                        cypher[2] = base[d*4 + e];
-                        for( f = 0; f < 64; f++ )
-                        {
-                            plain[2] = e * 64 + f;
-                            cypher[3] = base[f];
-
-                            rv = PL_Base64Decode((char *)cypher, 4, result);
-                            if( rv != result )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): return value\n", a, b, c, d, e, f);
-                                return PR_FALSE;
-                            }
-
-                            if( 0 != PL_strncmp((char *)plain, result, 3) )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): expected \"%s,\" got \"%.3s.\"\n",
-                                       a, b, c, d, e, f, plain, result);
-                                return PR_FALSE;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings */
-PRBool test_014(void)
-{
-    int i;
-    char result[ 4096 ];
-
-    printf("Test 014 (PL_Base64Decode, random strings, equals)                    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen = PL_strlen(array[i].cyphertext);
-        PRUint32 plen = (clen * 3) / 4;
-
-        char *rv = PL_Base64Decode(array[i].cyphertext, clen, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == array[i].cyphertext[clen-1] )
-            {
-                if( '=' == array[i].cyphertext[clen-2] )
-                {
-                    plen -= 2;
-                }
-                else
-                {
-                    plen -= 1;
-                }
-            }
-        }
-
-        if( 0 != PL_strncmp(result, array[i].plaintext, plen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, plen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings */
-PRBool test_015(void)
-{
-    int i;
-    char buffer[ 4096 ];
-    char result[ 4096 ];
-    char *rv;
-
-    printf("Test 015 (PL_Base64Decode, random strings, no equals)                 ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen, plen;
-
-        PL_strcpy(buffer, array[i].cyphertext);
-        clen = PL_strlen(buffer);
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == buffer[clen-1] )
-            {
-                if( '=' == buffer[clen-2] )
-                {
-                    buffer[clen-2] = buffer[clen-1] = (char)0;
-                    clen -= 2;
-                }
-                else
-                {
-                    buffer[clen-1] = (char)0;
-                    clen -= 1;
-                }
-            }
-        }
-
-        plen = (clen * 3) / 4;
-
-        rv = PL_Base64Decode(buffer, clen, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strncmp(result, array[i].plaintext, plen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, plen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, single characters, malloc */
-PRBool test_016(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 016 (PL_Base64Decode, single characters, equals, malloc)         ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Decode((char *)cypher, 4, (char *)0);
-            if( (char *)0 == rv )
-            {
-                printf("FAIL\n\t(%d, %d): no return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strcmp((char *)plain, rv) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%s.\"\n",
-                       a, b, plain, rv);
-                PR_DELETE(rv);
-                return PR_FALSE;
-            }
-
-            PR_DELETE(rv);
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, single characters, malloc */
-PRBool test_017(void)
-{
-    PRUint32 a, b;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 017 (PL_Base64Decode, single characters, no equals, malloc)      ..."); fflush(stdout);
-
-    plain[1] = plain[2] = plain[3] = (unsigned char)0;
-    cypher[2] = cypher[3] = (unsigned char)0;
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (unsigned char)(a * 4 + b);
-            cypher[1] = base[(b * 16)];
-
-            rv = PL_Base64Decode((char *)cypher, 2, (char *)0);
-            if( (char *)0 == rv )
-            {
-                printf("FAIL\n\t(%d, %d): no return value\n", a, b);
-                return PR_FALSE;
-            }
-
-            if( 0 != PL_strcmp((char *)plain, rv) )
-            {
-                printf("FAIL\n\t(%d, %d): expected \"%s,\" got \"%s.\"\n",
-                       a, b, plain, rv);
-                PR_DELETE(rv);
-                return PR_FALSE;
-            }
-
-            PR_DELETE(rv);
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, double characters, malloc */
-PRBool test_018(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 018 (PL_Base64Decode, double characters, equals, malloc)         ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)'=';
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Decode((char *)cypher, 4, (char *)0);
-                    if( (char *)0 == rv )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): no return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strcmp((char *)plain, rv) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%s.\"\n",
-                               a, b, c, d, plain, rv);
-                        PR_DELETE(rv);
-                        return PR_FALSE;
-                    }
-
-                    PR_DELETE(rv);
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, double characters, malloc */
-PRBool test_019(void)
-{
-    PRUint32 a, b, c, d;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 019 (PL_Base64Decode, double characters, no equals, malloc)      ..."); fflush(stdout);
-
-    plain[2] = plain[3] = (unsigned char)0;
-    cypher[3] = (unsigned char)0;
-    cypher[4] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    cypher[2] = base[d*4];
-
-                    rv = PL_Base64Decode((char *)cypher, 3, (char *)0);
-                    if( (char *)0 == rv )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): no return value\n", a, b, c, d);
-                        return PR_FALSE;
-                    }
-
-                    if( 0 != PL_strcmp((char *)plain, rv) )
-                    {
-                        printf("FAIL\n\t(%d, %d, %d, %d): expected \"%s,\" got \"%s.\"\n",
-                               a, b, c, d, cypher, rv);
-                        PR_DELETE(rv);
-                        return PR_FALSE;
-                    }
-
-                    PR_DELETE(rv);
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, triple characters, malloc */
-PRBool test_020(void)
-{
-    PRUint32 a, b, c, d, e, f;
-    unsigned char plain[ 4 ];
-    unsigned char cypher[ 5 ];
-    char *rv;
-
-    printf("Test 020 (PL_Base64Decode, triple characters, malloc)                 ..."); fflush(stdout);
-
-    cypher[4] = (unsigned char)0;
-    plain[3] = (unsigned char)0;
-
-    for( a = 0; a < 64; a++ )
-    {
-        cypher[0] = base[a];
-        for( b = 0; b < 4; b++ )
-        {
-            plain[0] = (a*4) + b;
-            for( c = 0; c < 16; c++ )
-            {
-                cypher[1] = base[b*16 + c];
-                for( d = 0; d < 16; d++ )
-                {
-                    plain[1] = c*16 + d;
-                    for( e = 0; e < 4; e++ )
-                    {
-                        cypher[2] = base[d*4 + e];
-                        for( f = 0; f < 64; f++ )
-                        {
-                            plain[2] = e * 64 + f;
-                            cypher[3] = base[f];
-
-                            rv = PL_Base64Decode((char *)cypher, 4, (char *)0);
-                            if( (char *)0 == rv )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): no return value\n", a, b, c, d, e, f);
-                                return PR_FALSE;
-                            }
-
-                            if( 0 != PL_strcmp((char *)plain, rv) )
-                            {
-                                printf("FAIL\n\t(%d, %d, %d, %d, %d, %d): expected \"%s,\" got \"%.3s.\"\n",
-                                       a, b, c, d, e, f, plain, rv);
-                                PR_DELETE(rv);
-                                return PR_FALSE;
-                            }
-
-                            PR_DELETE(rv);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings, malloc */
-PRBool test_021(void)
-{
-    int i;
-
-    printf("Test 021 (PL_Base64Decode, random strings, equals, malloc)            ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen = PL_strlen(array[i].cyphertext);
-
-        char *rv = PL_Base64Decode(array[i].cyphertext, clen, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].plaintext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, rv);
-            PR_DELETE(rv);
-            return PR_FALSE;
-        }
-
-        PR_DELETE(rv);
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, random strings, malloc */
-PRBool test_022(void)
-{
-    int i;
-    char buffer[ 4096 ];
-    char *rv;
-
-    printf("Test 022 (PL_Base64Decode, random strings, no equals, malloc)         ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen;
-
-        PL_strcpy(buffer, array[i].cyphertext);
-        clen = PL_strlen(buffer);
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == buffer[clen-1] )
-            {
-                if( '=' == buffer[clen-2] )
-                {
-                    buffer[clen-2] = buffer[clen-1] = (char)0;
-                    clen -= 2;
-                }
-                else
-                {
-                    buffer[clen-1] = (char)0;
-                    clen -= 1;
-                }
-            }
-        }
-
-        rv = PL_Base64Decode(buffer, clen, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].plaintext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, rv);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, random strings */
-PRBool test_023(void)
-{
-    int i;
-    char result[ 4096 ];
-
-    printf("Test 023 (PL_Base64Encode, random strings, strlen)                    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 plen = PL_strlen(array[i].plaintext);
-        PRUint32 clen = ((plen + 2)/3)*4;
-
-        char *rv = PL_Base64Encode(array[i].plaintext, 0, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strncmp(result, array[i].cyphertext, clen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].plaintext, array[i].cyphertext, clen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, random strings, malloc */
-PRBool test_024(void)
-{
-    int i;
-
-    printf("Test 024 (PL_Base64Encode, random strings, malloc, strlen)            ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 plen = PL_strlen(array[i].plaintext);
-        PRUint32 clen = ((plen + 2)/3)*4;
-
-        char *rv = PL_Base64Encode(array[i].plaintext, 0, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].cyphertext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].plaintext, array[i].cyphertext, rv);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings */
-PRBool test_025(void)
-{
-    int i;
-    char result[ 4096 ];
-
-    printf("Test 025 (PL_Base64Decode, random strings, equals, strlen)            ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen = PL_strlen(array[i].cyphertext);
-        PRUint32 plen = (clen * 3) / 4;
-
-        char *rv = PL_Base64Decode(array[i].cyphertext, 0, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == array[i].cyphertext[clen-1] )
-            {
-                if( '=' == array[i].cyphertext[clen-2] )
-                {
-                    plen -= 2;
-                }
-                else
-                {
-                    plen -= 1;
-                }
-            }
-        }
-
-        if( 0 != PL_strncmp(result, array[i].plaintext, plen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, plen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings */
-PRBool test_026(void)
-{
-    int i;
-    char buffer[ 4096 ];
-    char result[ 4096 ];
-    char *rv;
-
-    printf("Test 026 (PL_Base64Decode, random strings, no equals, strlen)         ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen, plen;
-
-        PL_strcpy(buffer, array[i].cyphertext);
-        clen = PL_strlen(buffer);
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == buffer[clen-1] )
-            {
-                if( '=' == buffer[clen-2] )
-                {
-                    buffer[clen-2] = buffer[clen-1] = (char)0;
-                    clen -= 2;
-                }
-                else
-                {
-                    buffer[clen-1] = (char)0;
-                    clen -= 1;
-                }
-            }
-        }
-
-        plen = (clen * 3) / 4;
-
-        rv = PL_Base64Decode(buffer, 0, result);
-
-        if( rv != result )
-        {
-            printf("FAIL\n\t(%d): return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strncmp(result, array[i].plaintext, plen) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%.*s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, plen, result);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Decode, random strings, malloc */
-PRBool test_027(void)
-{
-    int i;
-
-    printf("Test 027 (PL_Base64Decode, random strings, equals, malloc, strlen)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen = PL_strlen(array[i].cyphertext);
-
-        char *rv = PL_Base64Decode(array[i].cyphertext, 0, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].plaintext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, rv);
-            PR_DELETE(rv);
-            return PR_FALSE;
-        }
-
-        PR_DELETE(rv);
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_Base64Encode, random strings, malloc */
-PRBool test_028(void)
-{
-    int i;
-    char buffer[ 4096 ];
-    char *rv;
-
-    printf("Test 028 (PL_Base64Decode, random strings, no equals, malloc, strlen) ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRUint32 clen;
-
-        PL_strcpy(buffer, array[i].cyphertext);
-        clen = PL_strlen(buffer);
-
-        if( 0 == (clen & 3) )
-        {
-            if( '=' == buffer[clen-1] )
-            {
-                if( '=' == buffer[clen-2] )
-                {
-                    buffer[clen-2] = buffer[clen-1] = (char)0;
-                    clen -= 2;
-                }
-                else
-                {
-                    buffer[clen-1] = (char)0;
-                    clen -= 1;
-                }
-            }
-        }
-
-        rv = PL_Base64Decode(buffer, 0, (char *)0);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL\n\t(%d): no return value\n", i);
-            return PR_FALSE;
-        }
-
-        if( 0 != PL_strcmp(rv, array[i].plaintext) )
-        {
-            printf("FAIL\n\t(%d, \"%s\"): expected \n\"%s,\" got \n\"%s.\"\n", 
-                   i, array[i].cyphertext, array[i].plaintext, rv);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-int
-main
-(
-    int     argc,
-    char   *argv[]
-)
-{
-    printf("Testing the Portable Library base64 functions:\n");
-    printf("(warning: the \"triple characters\" tests are slow)\n");
-
-    if( 1
-        && test_001()
-        && test_002()
-        && test_003()
-        && test_004()
-        && test_005()
-        && test_006()
-        && test_007()
-        && test_008()
-        && test_009()
-        && test_010()
-        && test_011()
-        && test_012()
-        && test_013()
-        && test_014()
-        && test_015()
-        && test_016()
-        && test_017()
-        && test_018()
-        && test_019()
-        && test_020()
-        && test_021()
-        && test_022()
-        && test_023()
-        && test_024()
-        && test_025()
-        && test_026()
-        && test_027()
-        && test_028()
-      )
-    {
-        printf("Suite passed.\n");
-        return 0;
-    }
-    else
-    {
-        printf("Suite failed.\n");
-        return 1;
-    }
-
-    /*NOTREACHED*/
-}
diff --git a/libs/js/nsprpub/lib/tests/string.c b/libs/js/nsprpub/lib/tests/string.c
deleted file mode 100644
index 482e17b5dc..0000000000
--- a/libs/js/nsprpub/lib/tests/string.c
+++ /dev/null
@@ -1,3116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plstr.h"
-#include "nspr.h"
-
-#include <stdio.h>
-
-/* PL_strlen */
-PRBool test_001(void)
-{
-    static struct
-    {
-        const char *str;
-        PRUint32    len;
-    } array[] =
-      {
-          { (const char *)0, 0 },
-          { "", 0 },
-          { "a", 1 },
-          { "abcdefg", 7 },
-          { "abcdefg\0hijk", 7 }
-      };
-
-    int i;
-
-    printf("Test 001 (PL_strlen)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        if( PL_strlen(array[i].str) != array[i].len )
-        {
-            printf("FAIL (%d: %s->%d, %d)\n", i, 
-                   array[i].str ? array[i].str : "(null)",
-                   PL_strlen(array[i].str), array[i].len);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnlen */
-PRBool test_002(void)
-{
-    static struct
-    {
-        const char *str;
-        PRUint32    max;
-        PRUint32    len;
-    } array[] =
-      {
-          { (const char *)0, 0, 0 },
-          { (const char *)0, 12, 0 },
-          { "", 0, 0 },
-          { "", 12, 0 },
-          { "a", 0, 0 },
-          { "a", 1, 1 },
-          { "a", 12, 1 },
-          { "abcdefg", 0, 0 },
-          { "abcdefg", 1, 1 },
-          { "abcdefg", 7, 7 },
-          { "abcdefg", 12, 7 },
-          { "abcdefg\0hijk", 0, 0 },
-          { "abcdefg\0hijk", 1, 1 },
-          { "abcdefg\0hijk", 7, 7 },
-          { "abcdefg\0hijk", 12, 7 },
-      };
-
-    int i;
-
-    printf("Test 002 (PL_strnlen)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        if( PL_strnlen(array[i].str, array[i].max) != array[i].len )
-        {
-            printf("FAIL (%d: %s,%d->%d, %d)\n", i,
-                   array[i].str ? array[i].str : "(null)", array[i].max,
-                   PL_strnlen(array[i].str, array[i].max), array[i].len);
-            return PR_FALSE;
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcpy */
-PRBool test_003(void)
-{
-    static char buffer[ 1024 ];
-
-    static struct
-    {
-        const char *str;
-        char       *dest;
-        char       *rv;
-        PRBool      comp;
-    } array[] =
-      {
-          { (const char *)0, (char *)0, (char *)0, PR_FALSE },
-          { (const char *)0, buffer, (char *)0, PR_FALSE },
-          { "", (char *)0, (char *)0, PR_FALSE },
-          { "", buffer, buffer, PR_TRUE },
-          { "a", (char *)0, (char *)0, PR_FALSE },
-          { "a", buffer, buffer, PR_TRUE },
-          { "abcdefg", (char *)0, (char *)0, PR_FALSE },
-          { "abcdefg", buffer, buffer, PR_TRUE },
-          { "wxyz\0abcdefg", (char *)0, (char *)0, PR_FALSE },
-          { "wxyz\0abcdefg", buffer, buffer, PR_TRUE }
-      };
-
-    int i;
-
-    printf("Test 003 (PL_strcpy)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv;
-        const char *a = array[i].str;
-        const char *b = (const char *)array[i].dest;
-
-        rv = PL_strcpy(array[i].dest, array[i].str);
-        if( array[i].rv != rv )
-        {
-            printf("FAIL %d: (0x%x, %s)->0x%x\n", i, array[i].dest,
-                   array[i].str ? array[i].str : "(null)", rv);
-            return PR_FALSE;
-        }
-
-        if( array[i].comp )
-        {
-            while( 1 )
-            {
-                if( *a != *b )
-                {
-                    printf("FAIL %d: %s->%.32s\n", i, 
-                           array[i].str ? array[i].str : "(null)", 
-                           array[i].dest ? array[i].dest : "(null)");
-                    return PR_FALSE;
-                }
-
-                if( (char)0 == *a ) break;
-
-                a++;
-                b++;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncpy */
-PRBool test_004(void)
-{
-    static char buffer[ 1024 ];
-
-    static struct
-    {
-        const char *str;
-        PRUint32    len;
-        char       *dest;
-        char       *rv;
-        PRBool      comp;
-        const char *result;
-        PRBool      nulled;
-    } array[] =
-      {
-          { (const char *)0, 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { (const char *)0, 0, buffer, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { (const char *)0, 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { (const char *)0, 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { (const char *)0, 1, buffer, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { (const char *)0, 7, buffer, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "", 1, buffer, buffer, PR_TRUE, "", PR_TRUE },
-          { "", 7, buffer, buffer, PR_TRUE, "", PR_TRUE },
-          { "a", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "b", 1, buffer, buffer, PR_TRUE, "b", PR_FALSE },
-          { "c", 7, buffer, buffer, PR_TRUE, "c", PR_TRUE },
-          { "de", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "fg", 1, buffer, buffer, PR_TRUE, "f", PR_FALSE },
-          { "hi", 7, buffer, buffer, PR_TRUE, "hi", PR_TRUE },
-          { "jklmnopq", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "rstuvwxy", 1, buffer, buffer, PR_TRUE, "r", PR_FALSE },
-          { "zABCDEFG", 7, buffer, buffer, PR_TRUE, "zABCDEF", PR_FALSE },
-          { "a\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a\0XXX", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "a\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "b\0XXX", 1, buffer, buffer, PR_TRUE, "b", PR_FALSE },
-          { "c\0XXX", 7, buffer, buffer, PR_TRUE, "c", PR_TRUE },
-          { "de\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de\0XXX", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "de\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "fg\0XXX", 1, buffer, buffer, PR_TRUE, "f", PR_FALSE },
-          { "hi\0XXX", 7, buffer, buffer, PR_TRUE, "hi", PR_TRUE },
-          { "jklmnopq\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq\0XXX", 0, buffer, buffer, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "jklmnopq\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0, PR_FALSE },
-          { "rstuvwxy\0XXX", 1, buffer, buffer, PR_TRUE, "r", PR_FALSE },
-          { "zABCDEFG\0XXX", 7, buffer, buffer, PR_TRUE, "zABCDEF", PR_FALSE },
-      };
-
-    int i;
-
-    printf("Test 004 (PL_strncpy)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv;
-        int j;
-
-        for( j = 0; j < sizeof(buffer); j++ )
-            buffer[j] = '-';
-
-        rv = PL_strncpy(array[i].dest, array[i].str, array[i].len);
-        if( array[i].rv != rv )
-        {
-            printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
-                   array[i].str ? array[i].str : "(null)", array[i].len, rv);
-            return PR_FALSE;
-        }
-
-        if( array[i].comp )
-        {
-            const char *a = array[i].result;
-            const char *b = array[i].dest;
-
-            while( *a )
-            {
-                if( *a != *b )
-                {
-                    printf("FAIL %d: %s != %.32s\n", i, 
-                           array[i].result, array[i].dest);
-                    return PR_FALSE;
-                }
-
-                a++;
-                b++;
-            }
-
-            if( array[i].nulled )
-            {
-                if( *b != '\0' )
-                {
-                    printf("FAIL %d: not terminated\n", i);
-                    return PR_FALSE;
-                }
-            }
-            else
-            {
-                if( *b != '-' )
-                {
-                    printf("FAIL %d: overstepped\n", i);
-                    return PR_FALSE;
-                }
-            }
-        }
-    }
-                
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncpyz */
-PRBool test_005(void)
-{
-    static char buffer[ 1024 ];
-
-    static struct
-    {
-        const char *str;
-        PRUint32    len;
-        char       *dest;
-        char       *rv;
-        PRBool      comp;
-        const char *result;
-    } array[] =
-      {
-          { (const char *)0, 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { (const char *)0, 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { (const char *)0, 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { (const char *)0, 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { (const char *)0, 1, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { (const char *)0, 7, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "", 1, buffer, buffer, PR_TRUE, "" },
-          { "", 7, buffer, buffer, PR_TRUE, "" },
-          { "a", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "a", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "a", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "a", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "b", 1, buffer, buffer, PR_TRUE, "" },
-          { "c", 7, buffer, buffer, PR_TRUE, "c" },
-          { "de", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "de", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "de", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "de", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "fg", 1, buffer, buffer, PR_TRUE, "" },
-          { "hi", 7, buffer, buffer, PR_TRUE, "hi" },
-          { "jklmnopq", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "rstuvwxy", 1, buffer, buffer, PR_TRUE, "" },
-          { "zABCDEFG", 7, buffer, buffer, PR_TRUE, "zABCDE" },
-          { "a\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "a\0XXX", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "a\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "a\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "b\0XXX", 1, buffer, buffer, PR_TRUE, "" },
-          { "c\0XXX", 7, buffer, buffer, PR_TRUE, "c" },
-          { "de\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "de\0XXX", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "de\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "de\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "fg\0XXX", 1, buffer, buffer, PR_TRUE, "" },
-          { "hi\0XXX", 7, buffer, buffer, PR_TRUE, "hi" },
-          { "jklmnopq\0XXX", 0, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq\0XXX", 0, buffer, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq\0XXX", 1, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "jklmnopq\0XXX", 7, (char *)0, (char *)0, PR_FALSE, (const char *)0 },
-          { "rstuvwxy\0XXX", 1, buffer, buffer, PR_TRUE, "" },
-          { "zABCDEFG\0XXX", 7, buffer, buffer, PR_TRUE, "zABCDE" },
-      };
-
-    int i;
-
-    printf("Test 005 (PL_strncpyz)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv;
-        int j;
-
-        for( j = 0; j < sizeof(buffer); j++ )
-            buffer[j] = '-';
-
-        rv = PL_strncpyz(array[i].dest, array[i].str, array[i].len);
-        if( array[i].rv != rv )
-        {
-            printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
-                   array[i].str ? array[i].str : "(null)", array[i].len, rv);
-            return PR_FALSE;
-        }
-
-        if( array[i].comp )
-        {
-            const char *a = array[i].result;
-            const char *b = array[i].dest;
-
-            while( 1 )
-            {
-                if( *a != *b )
-                {
-                    printf("FAIL %d: %s != %.32s\n", i, 
-                           array[i].result, array[i].dest);
-                    return PR_FALSE;
-                }
-
-                if( (char)0 == *a ) break;
-
-                a++;
-                b++;
-            }
-        }
-    }
-                
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strdup */
-PRBool test_006(void)
-{
-    static const char *array[] =
-    {
-        (const char *)0,
-        "",
-        "a",
-        "abcdefg"
-    };
-
-    int i;
-
-    printf("Test 006 (PL_strdup)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strdup(array[i]);
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL %d: 0x%x -> 0\n", i, array[i]);
-            return PR_FALSE;
-        }
-
-        if( (const char *)0 == array[i] )
-        {
-            if( (char)0 != *rv )
-            {
-                printf("FAIL %d: (const char *)0 -> %.32s\n", i, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            const char *a = array[i];
-            const char *b = (const char *)rv;
-
-            while( 1 )
-            {
-                if( *a != *b )
-                {
-                    printf("FAIL %d: %s != %.32s\n", i, array[i], rv);
-                    return PR_FALSE;
-                }
-
-                if( (char)0 == *a ) break;
-
-                a++;
-                b++;
-            }
-
-        }
-        PL_strfree(rv);
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strndup */
-PRBool test_007(void)
-{
-    static struct
-    {
-        const char *str;
-        PRUint32    len;
-        const char *result;
-    } array[] =
-      {
-          { (const char *)0, 0, "" },
-          { (const char *)0, 1, "" },
-          { (const char *)0, 7, "" },
-          { "", 0, "" },
-          { "", 1, "" },
-          { "", 7, "" },
-          { "a", 0, "" },
-          { "a", 1, "a" },
-          { "a", 7, "a" },
-          { "ab", 0, "" },
-          { "ab", 1, "a" },
-          { "ab", 7, "ab" },
-          { "abcdefg", 0, "" },
-          { "abcdefg", 1, "a" },
-          { "abcdefg", 7, "abcdefg" },
-          { "abcdefghijk", 0, "" },
-          { "abcdefghijk", 1, "a" },
-          { "abcdefghijk", 7, "abcdefg" },
-          { "abcdef\0ghijk", 0, "" },
-          { "abcdef\0ghijk", 1, "a" },
-          { "abcdef\0ghijk", 7, "abcdef" }
-      };
-
-    int i;
-
-    printf("Test 007 (PL_strndup)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strndup(array[i].str, array[i].len);
-        const char *a;
-        const char *b;
-
-        if( (char *)0 == rv )
-        {
-            printf("FAIL %d: %s,%lu -> 0\n", i, 
-                   array[i].str ? array[i].str : "(null)", array[i].len);
-            return PR_FALSE;
-        }
-
-        a = array[i].result;
-        b = (const char *)rv;
-
-        while( 1 )
-        {
-            if( *a != *b )
-            {
-                printf("FAIL %d: %s != %.32s\n", i, array[i].result, rv);
-                return PR_FALSE;
-            }
-
-            if( (char)0 == *a ) break;
-
-            a++;
-            b++;
-        }
-
-        free(rv);
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcat */
-PRBool test_008(void)
-{
-    static struct
-    {
-        const char *first;
-        const char *second;
-        const char *result;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, (const char *)0 },
-          { (const char *)0, "xyz", (const char *)0 },
-          { "", (const char *)0, "" },
-          { "", "", "" },
-          { "ab", "", "ab" },
-          { "cd", "ef", "cdef" },
-          { "gh\0X", "", "gh" },
-          { "ij\0X", "kl", "ijkl" },
-          { "mn\0X", "op\0X", "mnop" },
-          { "qr", "st\0X", "qrst" },
-          { "uv\0X", "wx\0X", "uvwx" }
-      };
-
-    int i;
-
-    printf("Test 008 (PL_strcat)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char buffer[ 1024 ];
-        int j;
-        char *rv;
-
-        for( j = 0; j < sizeof(buffer); j++ )
-            buffer[j] = '-';
-
-        if( (const char *)0 != array[i].first )
-            (void)PL_strcpy(buffer, array[i].first);
-
-        rv = PL_strcat(((const char *)0 == array[i].first) ? (char *)0 : buffer,
-                       array[i].second);
-
-        if( (const char *)0 == array[i].result )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s+%s -> %.32s, not zero\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s+%s -> null, not %s\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       array[i].result);
-                return PR_FALSE;
-            }
-            else
-            {
-                const char *a = array[i].result;
-                const char *b = (const char *)rv;
-
-                while( 1 )
-                {
-                    if( *a != *b )
-                    {
-                        printf("FAIL %d: %s+%s -> %.32s, not %s\n", i,
-                               array[i].first ? array[i].first : "(null)",
-                               array[i].second ? array[i].second : "(null)",
-                               rv, array[i].result);
-                        return PR_FALSE;
-                    }
-
-                    if( (char)0 == *a ) break;
-
-                    a++;
-                    b++;
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncat */
-PRBool test_009(void)
-{
-    static struct
-    {
-        const char *first;
-        const char *second;
-        PRUint32    length;
-        PRBool      nulled;
-        const char *result;
-    } array[] = 
-      {
-          { (const char *)0, (const char *)0, 0, PR_FALSE, (const char *)0 },
-          { (const char *)0, (const char *)0, 1, PR_FALSE, (const char *)0 },
-          { (const char *)0, (const char *)0, 7, PR_FALSE, (const char *)0 },
-          { (const char *)0, "", 0, PR_FALSE, (const char *)0 },
-          { (const char *)0, "", 1, PR_FALSE, (const char *)0 },
-          { (const char *)0, "", 7, PR_FALSE, (const char *)0 },
-          { (const char *)0, "stuff", 0, PR_FALSE, (const char *)0 },
-          { (const char *)0, "stuff", 1, PR_FALSE, (const char *)0 },
-          { (const char *)0, "stuff", 7, PR_FALSE, (const char *)0 },
-          { "", (const char *)0, 0, PR_TRUE, "" },
-          { "", (const char *)0, 1, PR_TRUE, "" },
-          { "", (const char *)0, 7, PR_TRUE, "" },
-          { "", "", 0, PR_TRUE, "" },
-          { "", "", 1, PR_TRUE, "" },
-          { "", "", 7, PR_TRUE, "" },
-          { "", "abcdefgh", 0, PR_TRUE, "" },
-          { "", "abcdefgh", 1, PR_FALSE, "a" },
-          { "", "abcdefgh", 7, PR_FALSE, "abcdefg" },
-          { "xyz", (const char *)0, 0, PR_TRUE, "xyz" },
-          { "xyz", (const char *)0, 1, PR_TRUE, "xyz" },
-          { "xyz", (const char *)0, 7, PR_TRUE, "xyz" },
-          { "xyz", "", 0, PR_TRUE, "xyz" },
-          { "xyz", "", 1, PR_TRUE, "xyz" },
-          { "xyz", "", 7, PR_TRUE, "xyz" },
-          { "xyz", "abcdefgh", 0, PR_TRUE, "xyz" },
-          { "xyz", "abcdefgh", 1, PR_FALSE, "xyza" },
-          { "xyz", "abcdefgh", 7, PR_FALSE, "xyzabcdefg" }
-      };
-
-    int i;
-
-    printf("Test 009 (PL_strncat)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char buffer[ 1024 ];
-        int j;
-        char *rv;
-
-        for( j = 0; j < sizeof(buffer); j++ )
-            buffer[j] = '-';
-
-        if( (const char *)0 != array[i].first )
-            (void)PL_strcpy(buffer, array[i].first);
-
-        rv = PL_strncat(((const char *)0 == array[i].first) ? (char *)0 : buffer,
-                         array[i].second, array[i].length);
-
-        if( (const char *)0 == array[i].result )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       array[i].length, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       array[i].length, array[i].result);
-                return PR_FALSE;
-            }
-            else
-            {
-                const char *a = array[i].result;
-                const char *b = (const char *)rv;
-
-                while( *a )
-                {
-                    if( *a != *b )
-                    {
-                        printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
-                               array[i].first ? array[i].first : "(null)",
-                               array[i].second ? array[i].second : "(null)",
-                               array[i].length, rv, array[i].result);
-                        return PR_FALSE;
-                    }
-
-                    a++;
-                    b++;
-                }
-
-                if( array[i].nulled )
-                {
-                    if( (char)0 != *b )
-                    {
-                        printf("FAIL %d: %s+%s/%lu -> not nulled\n", i,
-                               array[i].first ? array[i].first : "(null)",
-                               array[i].second ? array[i].second : "(null)",
-                               array[i].length);
-                        return PR_FALSE;
-                    }
-                }
-                else
-                {
-                    if( (char)0 == *b )
-                    {
-                        printf("FAIL %d: %s+%s/%lu -> overrun\n", i,
-                               array[i].first ? array[i].first : "(null)",
-                               array[i].second ? array[i].second : "(null)",
-                               array[i].length);
-                        return PR_FALSE;
-                    }
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcatn */
-PRBool test_010(void)
-{
-    static struct
-    {
-        const char *first;
-        const char *second;
-        PRUint32    length;
-        const char *result;
-    } array[] = 
-      {
-          { (const char *)0, (const char *)0, 0, (const char *)0 },
-          { (const char *)0, (const char *)0, 1, (const char *)0 },
-          { (const char *)0, (const char *)0, 7, (const char *)0 },
-          { (const char *)0, "", 0, (const char *)0 },
-          { (const char *)0, "", 1, (const char *)0 },
-          { (const char *)0, "", 7, (const char *)0 },
-          { (const char *)0, "stuff", 0, (const char *)0 },
-          { (const char *)0, "stuff", 1, (const char *)0 },
-          { (const char *)0, "stuff", 7, (const char *)0 },
-          { "", (const char *)0, 0, "" },
-          { "", (const char *)0, 1, "" },
-          { "", (const char *)0, 7, "" },
-          { "", "", 0, "" },
-          { "", "", 1, "" },
-          { "", "", 7, "" },
-          { "", "abcdefgh", 0, "" },
-          { "", "abcdefgh", 1, "" },
-          { "", "abcdefgh", 7, "abcdef" },
-          { "xyz", (const char *)0, 0, "xyz" },
-          { "xyz", (const char *)0, 1, "xyz" },
-          { "xyz", (const char *)0, 7, "xyz" },
-          { "xyz", "", 0, "xyz" },
-          { "xyz", "", 1, "xyz" },
-          { "xyz", "", 7, "xyz" },
-          { "xyz", "abcdefgh", 0, "xyz" },
-          { "xyz", "abcdefgh", 1, "xyz" },
-          { "xyz", "abcdefgh", 7, "xyzabc" }
-      };
-
-    int i;
-
-    printf("Test 010 (PL_strcatn)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char buffer[ 1024 ];
-        int j;
-        char *rv;
-
-        for( j = 0; j < sizeof(buffer); j++ )
-            buffer[j] = '-';
-
-        if( (const char *)0 != array[i].first )
-            (void)PL_strcpy(buffer, array[i].first);
-
-        rv = PL_strcatn(((const char *)0 == array[i].first) ? (char *)0 : buffer,
-                        array[i].length, array[i].second);
-
-        if( (const char *)0 == array[i].result )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       array[i].length, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
-                       array[i].first ? array[i].first : "(null)",
-                       array[i].second ? array[i].second : "(null)",
-                       array[i].length, array[i].result);
-                return PR_FALSE;
-            }
-            else
-            {
-                const char *a = array[i].result;
-                const char *b = (const char *)rv;
-
-                while( 1 )
-                {
-                    if( *a != *b )
-                    {
-                        printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
-                               array[i].first ? array[i].first : "(null)",
-                               array[i].second ? array[i].second : "(null)",
-                               array[i].length, rv, array[i].result);
-                        return PR_FALSE;
-                    }
-
-                    if( (char)0 == *a ) break;
-
-                    a++;
-                    b++;
-                }
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcmp */
-PRBool test_011(void)
-{
-    static struct
-    {
-        const char *one;
-        const char *two;
-        PRIntn      sign;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 0 },
-          { (const char *)0, "word", -1 },
-          { "word", (const char *)0, 1 },
-          { "word", "word", 0 },
-          { "aZYXVUT", "bZYXVUT", -1 },
-          { "aZYXVUT", "bAAAAAA", -1 },
-          { "a", "aa", -1 },
-          { "a", "a", 0 },
-          { "a", "A", 1 },
-          { "aaaaa", "baaaa", -1 },
-          { "aaaaa", "abaaa", -1 },
-          { "aaaaa", "aabaa", -1 },
-          { "aaaaa", "aaaba", -1 },
-          { "aaaaa", "aaaab", -1 },
-          { "bZYXVUT", "aZYXVUT", 1 },
-          { "bAAAAAA", "aZYXVUT", 1 },
-          { "aa", "a", 1 },
-          { "A", "a", -1 },
-          { "baaaa", "aaaaa", 1 },
-          { "abaaa", "aaaaa", 1 },
-          { "aabaa", "aaaaa", 1 },
-          { "aaaba", "aaaaa", 1 },
-          { "aaaab", "aaaaa", 1 },
-          { "word", "Word", 1 },
-          { "word", "wOrd", 1 },
-          { "word", "woRd", 1 },
-          { "word", "worD", 1 },
-          { "WORD", "wORD", -1 },
-          { "WORD", "WoRD", -1 },
-          { "WORD", "WOrD", -1 },
-          { "WORD", "WORd", -1 }
-      };
-
-    int i;
-
-    printf("Test 011 (PL_strcmp)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRIntn rv = PL_strcmp(array[i].one, array[i].two);
-
-        switch( array[i].sign )
-        {
-            case -1:
-                if( rv < 0 ) continue;
-                break;
-            case 1:
-                if( rv > 0 ) continue;
-                break;
-            case 0:
-                if( 0 == rv ) continue;
-                break;
-            default:
-                PR_NOT_REACHED("static data inconsistancy");
-                break;
-        }
-
-        printf("FAIL %d: %s-%s -> %d, not %d\n", i,
-               array[i].one ? array[i].one : "(null)",
-               array[i].two ? array[i].two : "(null)",
-               rv, array[i].sign);
-        return PR_FALSE;
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncmp */
-PRBool test_012(void)
-{
-    static struct
-    {
-        const char *one;
-        const char *two;
-        PRUint32    max;
-        PRIntn      sign;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 0, 0 },
-          { (const char *)0, (const char *)0, 1, 0 },
-          { (const char *)0, (const char *)0, 4, 0 },
-          { (const char *)0, "word", 0, -1 },
-          { (const char *)0, "word", 1, -1 },
-          { (const char *)0, "word", 4, -1 },
-          { "word", (const char *)0, 0, 1 },
-          { "word", (const char *)0, 1, 1 },
-          { "word", (const char *)0, 4, 1 },
-          { "word", "word", 0, 0 },
-          { "word", "word", 1, 0 },
-          { "word", "word", 3, 0 },
-          { "word", "word", 5, 0 },
-          { "aZYXVUT", "bZYXVUT", 0, 0 },
-          { "aZYXVUT", "bZYXVUT", 1, -1 },
-          { "aZYXVUT", "bZYXVUT", 4, -1 },
-          { "aZYXVUT", "bZYXVUT", 9, -1 },
-          { "aZYXVUT", "bAAAAAA", 0, 0 },
-          { "aZYXVUT", "bAAAAAA", 1, -1 },
-          { "aZYXVUT", "bAAAAAA", 4, -1 },
-          { "aZYXVUT", "bAAAAAA", 5, -1 },
-          { "a", "aa", 0, 0 },
-          { "a", "aa", 1, 0 },
-          { "a", "aa", 4, -1 },
-          { "a", "a", 0, 0 },
-          { "a", "a", 1, 0 },
-          { "a", "a", 4, 0 },
-          { "a", "A", 0, 0 },
-          { "a", "A", 1, 1 },
-          { "a", "A", 4, 1 },
-          { "aaaaa", "baaaa", 0, 0 },
-          { "aaaaa", "baaaa", 1, -1 },
-          { "aaaaa", "baaaa", 4, -1 },
-          { "aaaaa", "abaaa", 0, 0 },
-          { "aaaaa", "abaaa", 1, 0 },
-          { "aaaaa", "abaaa", 4, -1 },
-          { "aaaaa", "aabaa", 0, 0 },
-          { "aaaaa", "aabaa", 1, 0 },
-          { "aaaaa", "aabaa", 4, -1 },
-          { "aaaaa", "aaaba", 0, 0 },
-          { "aaaaa", "aaaba", 1, 0 },
-          { "aaaaa", "aaaba", 4, -1 },
-          { "aaaaa", "aaaab", 0, 0 },
-          { "aaaaa", "aaaab", 1, 0 },
-          { "aaaaa", "aaaab", 4, 0 },
-          { "bZYXVUT", "aZYXVUT", 0, 0 },
-          { "bZYXVUT", "aZYXVUT", 1, 1 },
-          { "bZYXVUT", "aZYXVUT", 4, 1 },
-          { "bAAAAAA", "aZYXVUT", 0, 0 },
-          { "bAAAAAA", "aZYXVUT", 1, 1 },
-          { "bAAAAAA", "aZYXVUT", 4, 1 },
-          { "aa", "a", 0, 0 },
-          { "aa", "a", 1, 0 },
-          { "aa", "a", 4, 1 },
-          { "A", "a", 0, 0 },
-          { "A", "a", 1, -1 },
-          { "A", "a", 4, -1 },
-          { "baaaa", "aaaaa", 0, 0 },
-          { "baaaa", "aaaaa", 1, 1 },
-          { "baaaa", "aaaaa", 4, 1 },
-          { "abaaa", "aaaaa", 0, 0 },
-          { "abaaa", "aaaaa", 1, 0 },
-          { "abaaa", "aaaaa", 4, 1 },
-          { "aabaa", "aaaaa", 0, 0 },
-          { "aabaa", "aaaaa", 1, 0 },
-          { "aabaa", "aaaaa", 4, 1 },
-          { "aaaba", "aaaaa", 0, 0 },
-          { "aaaba", "aaaaa", 1, 0 },
-          { "aaaba", "aaaaa", 4, 1 },
-          { "aaaab", "aaaaa", 0, 0 },
-          { "aaaab", "aaaaa", 1, 0 },
-          { "aaaab", "aaaaa", 4, 0 },
-          { "word", "Word", 0, 0 },
-          { "word", "Word", 1, 1 },
-          { "word", "Word", 3, 1 },
-          { "word", "wOrd", 0, 0 },
-          { "word", "wOrd", 1, 0 },
-          { "word", "wOrd", 3, 1 },
-          { "word", "woRd", 0, 0 },
-          { "word", "woRd", 1, 0 },
-          { "word", "woRd", 3, 1 },
-          { "word", "worD", 0, 0 },
-          { "word", "worD", 1, 0 },
-          { "word", "worD", 3, 0 },
-          { "WORD", "wORD", 0, 0 },
-          { "WORD", "wORD", 1, -1 },
-          { "WORD", "wORD", 3, -1 },
-          { "WORD", "WoRD", 0, 0 },
-          { "WORD", "WoRD", 1, 0 },
-          { "WORD", "WoRD", 3, -1 },
-          { "WORD", "WOrD", 0, 0 },
-          { "WORD", "WOrD", 1, 0 },
-          { "WORD", "WOrD", 3, -1 },
-          { "WORD", "WORd", 0, 0 },
-          { "WORD", "WORd", 1, 0 },
-          { "WORD", "WORd", 3, 0 }
-
-      };
-
-    int i;
-
-    printf("Test 012 (PL_strncmp)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRIntn rv = PL_strncmp(array[i].one, array[i].two, array[i].max);
-
-        switch( array[i].sign )
-        {
-            case -1:
-                if( rv < 0 ) continue;
-                break;
-            case 1:
-                if( rv > 0 ) continue;
-                break;
-            case 0:
-                if( 0 == rv ) continue;
-                break;
-            default:
-                PR_NOT_REACHED("static data inconsistancy");
-                break;
-        }
-
-        printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
-               array[i].one ? array[i].one : "(null)",
-               array[i].two ? array[i].two : "(null)",
-               array[i].max, rv, array[i].sign);
-        return PR_FALSE;
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcasecmp */
-PRBool test_013(void)
-{
-    static struct
-    {
-        const char *one;
-        const char *two;
-        PRIntn      sign;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 0 },
-          { (const char *)0, "word", -1 },
-          { "word", (const char *)0, 1 },
-          { "word", "word", 0 },
-          { "aZYXVUT", "bZYXVUT", -1 },
-          { "aZYXVUT", "bAAAAAA", -1 },
-          { "a", "aa", -1 },
-          { "a", "a", 0 },
-          { "a", "A", 0 },
-          { "aaaaa", "baaaa", -1 },
-          { "aaaaa", "abaaa", -1 },
-          { "aaaaa", "aabaa", -1 },
-          { "aaaaa", "aaaba", -1 },
-          { "aaaaa", "aaaab", -1 },
-          { "bZYXVUT", "aZYXVUT", 1 },
-          { "bAAAAAA", "aZYXVUT", 1 },
-          { "aa", "a", 1 },
-          { "A", "a", 0 },
-          { "baaaa", "aaaaa", 1 },
-          { "abaaa", "aaaaa", 1 },
-          { "aabaa", "aaaaa", 1 },
-          { "aaaba", "aaaaa", 1 },
-          { "aaaab", "aaaaa", 1 },
-          { "word", "Word", 0 },
-          { "word", "wOrd", 0 },
-          { "word", "woRd", 0 },
-          { "word", "worD", 0 },
-          { "WORD", "wORD", 0 },
-          { "WORD", "WoRD", 0 },
-          { "WORD", "WOrD", 0 },
-          { "WORD", "WORd", 0 }
-      };
-
-    int i;
-
-    printf("Test 013 (PL_strcasecmp)  ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRIntn rv = PL_strcasecmp(array[i].one, array[i].two);
-
-        switch( array[i].sign )
-        {
-            case -1:
-                if( rv < 0 ) continue;
-                break;
-            case 1:
-                if( rv > 0 ) continue;
-                break;
-            case 0:
-                if( 0 == rv ) continue;
-                break;
-            default:
-                PR_NOT_REACHED("static data inconsistancy");
-                break;
-        }
-
-        printf("FAIL %d: %s-%s -> %d, not %d\n", i,
-               array[i].one ? array[i].one : "(null)",
-               array[i].two ? array[i].two : "(null)",
-               rv, array[i].sign);
-        return PR_FALSE;
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncasecmp */
-PRBool test_014(void)
-{
-    static struct
-    {
-        const char *one;
-        const char *two;
-        PRUint32    max;
-        PRIntn      sign;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 0, 0 },
-          { (const char *)0, (const char *)0, 1, 0 },
-          { (const char *)0, (const char *)0, 4, 0 },
-          { (const char *)0, "word", 0, -1 },
-          { (const char *)0, "word", 1, -1 },
-          { (const char *)0, "word", 4, -1 },
-          { "word", (const char *)0, 0, 1 },
-          { "word", (const char *)0, 1, 1 },
-          { "word", (const char *)0, 4, 1 },
-          { "word", "word", 0, 0 },
-          { "word", "word", 1, 0 },
-          { "word", "word", 3, 0 },
-          { "word", "word", 5, 0 },
-          { "aZYXVUT", "bZYXVUT", 0, 0 },
-          { "aZYXVUT", "bZYXVUT", 1, -1 },
-          { "aZYXVUT", "bZYXVUT", 4, -1 },
-          { "aZYXVUT", "bZYXVUT", 9, -1 },
-          { "aZYXVUT", "bAAAAAA", 0, 0 },
-          { "aZYXVUT", "bAAAAAA", 1, -1 },
-          { "aZYXVUT", "bAAAAAA", 4, -1 },
-          { "aZYXVUT", "bAAAAAA", 5, -1 },
-          { "a", "aa", 0, 0 },
-          { "a", "aa", 1, 0 },
-          { "a", "aa", 4, -1 },
-          { "a", "a", 0, 0 },
-          { "a", "a", 1, 0 },
-          { "a", "a", 4, 0 },
-          { "a", "A", 0, 0 },
-          { "a", "A", 1, 0 },
-          { "a", "A", 4, 0 },
-          { "aaaaa", "baaaa", 0, 0 },
-          { "aaaaa", "baaaa", 1, -1 },
-          { "aaaaa", "baaaa", 4, -1 },
-          { "aaaaa", "abaaa", 0, 0 },
-          { "aaaaa", "abaaa", 1, 0 },
-          { "aaaaa", "abaaa", 4, -1 },
-          { "aaaaa", "aabaa", 0, 0 },
-          { "aaaaa", "aabaa", 1, 0 },
-          { "aaaaa", "aabaa", 4, -1 },
-          { "aaaaa", "aaaba", 0, 0 },
-          { "aaaaa", "aaaba", 1, 0 },
-          { "aaaaa", "aaaba", 4, -1 },
-          { "aaaaa", "aaaab", 0, 0 },
-          { "aaaaa", "aaaab", 1, 0 },
-          { "aaaaa", "aaaab", 4, 0 },
-          { "bZYXVUT", "aZYXVUT", 0, 0 },
-          { "bZYXVUT", "aZYXVUT", 1, 1 },
-          { "bZYXVUT", "aZYXVUT", 4, 1 },
-          { "bAAAAAA", "aZYXVUT", 0, 0 },
-          { "bAAAAAA", "aZYXVUT", 1, 1 },
-          { "bAAAAAA", "aZYXVUT", 4, 1 },
-          { "aa", "a", 0, 0 },
-          { "aa", "a", 1, 0 },
-          { "aa", "a", 4, 1 },
-          { "A", "a", 0, 0 },
-          { "A", "a", 1, 0 },
-          { "A", "a", 4, 0 },
-          { "baaaa", "aaaaa", 0, 0 },
-          { "baaaa", "aaaaa", 1, 1 },
-          { "baaaa", "aaaaa", 4, 1 },
-          { "abaaa", "aaaaa", 0, 0 },
-          { "abaaa", "aaaaa", 1, 0 },
-          { "abaaa", "aaaaa", 4, 1 },
-          { "aabaa", "aaaaa", 0, 0 },
-          { "aabaa", "aaaaa", 1, 0 },
-          { "aabaa", "aaaaa", 4, 1 },
-          { "aaaba", "aaaaa", 0, 0 },
-          { "aaaba", "aaaaa", 1, 0 },
-          { "aaaba", "aaaaa", 4, 1 },
-          { "aaaab", "aaaaa", 0, 0 },
-          { "aaaab", "aaaaa", 1, 0 },
-          { "aaaab", "aaaaa", 4, 0 },
-          { "word", "Word", 0, 0 },
-          { "word", "Word", 1, 0 },
-          { "word", "Word", 3, 0 },
-          { "word", "wOrd", 0, 0 },
-          { "word", "wOrd", 1, 0 },
-          { "word", "wOrd", 3, 0 },
-          { "word", "woRd", 0, 0 },
-          { "word", "woRd", 1, 0 },
-          { "word", "woRd", 3, 0 },
-          { "word", "worD", 0, 0 },
-          { "word", "worD", 1, 0 },
-          { "word", "worD", 3, 0 },
-          { "WORD", "wORD", 0, 0 },
-          { "WORD", "wORD", 1, 0 },
-          { "WORD", "wORD", 3, 0 },
-          { "WORD", "WoRD", 0, 0 },
-          { "WORD", "WoRD", 1, 0 },
-          { "WORD", "WoRD", 3, 0 },
-          { "WORD", "WOrD", 0, 0 },
-          { "WORD", "WOrD", 1, 0 },
-          { "WORD", "WOrD", 3, 0 },
-          { "WORD", "WORd", 0, 0 },
-          { "WORD", "WORd", 1, 0 },
-          { "WORD", "WORd", 3, 0 }
-      };
-
-    int i;
-
-    printf("Test 014 (PL_strncasecmp) ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        PRIntn rv = PL_strncasecmp(array[i].one, array[i].two, array[i].max);
-
-        switch( array[i].sign )
-        {
-            case -1:
-                if( rv < 0 ) continue;
-                break;
-            case 1:
-                if( rv > 0 ) continue;
-                break;
-            case 0:
-                if( 0 == rv ) continue;
-                break;
-            default:
-                PR_NOT_REACHED("static data inconsistancy");
-                break;
-        }
-
-        printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
-               array[i].one ? array[i].one : "(null)",
-               array[i].two ? array[i].two : "(null)",
-               array[i].max, rv, array[i].sign);
-        return PR_FALSE;
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strchr */
-PRBool test_015(void)
-{
-    static struct
-    {
-        const char *str;
-        char        chr;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, 'a', PR_FALSE, 0 },
-          { (const char *)0, '\0', PR_FALSE, 0 },
-          { "abcdefg", 'a', PR_TRUE, 0 },
-          { "abcdefg", 'b', PR_TRUE, 1 },
-          { "abcdefg", 'c', PR_TRUE, 2 },
-          { "abcdefg", 'd', PR_TRUE, 3 },
-          { "abcdefg", 'e', PR_TRUE, 4 },
-          { "abcdefg", 'f', PR_TRUE, 5 },
-          { "abcdefg", 'g', PR_TRUE, 6 },
-          { "abcdefg", 'h', PR_FALSE, 0 },
-          { "abcdefg", '\0', PR_TRUE, 7 },
-          { "abcdefg", 'A', PR_FALSE, 0 },
-          { "abcdefg", 'B', PR_FALSE, 0 },
-          { "abcdefg", 'C', PR_FALSE, 0 },
-          { "abcdefg", 'D', PR_FALSE, 0 },
-          { "abcdefg", 'E', PR_FALSE, 0 },
-          { "abcdefg", 'F', PR_FALSE, 0 },
-          { "abcdefg", 'G', PR_FALSE, 0 },
-          { "abcdefg", 'H', PR_FALSE, 0 },
-          { "abcdefgabcdefg", 'a', PR_TRUE, 0 },
-          { "abcdefgabcdefg", 'b', PR_TRUE, 1 },
-          { "abcdefgabcdefg", 'c', PR_TRUE, 2 },
-          { "abcdefgabcdefg", 'd', PR_TRUE, 3 },
-          { "abcdefgabcdefg", 'e', PR_TRUE, 4 },
-          { "abcdefgabcdefg", 'f', PR_TRUE, 5 },
-          { "abcdefgabcdefg", 'g', PR_TRUE, 6 },
-          { "abcdefgabcdefg", 'h', PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', PR_TRUE, 14 }
-      };
-
-    int i;
-
-    printf("Test 015 (PL_strchr)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strchr(array[i].str, array[i].chr);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%c -> %.32s, not zero\n", i, array[i].str,
-                       array[i].chr, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
-                       array[i].chr, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
-                       array[i].chr, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strrchr */
-PRBool test_016(void)
-{
-    static struct
-    {
-        const char *str;
-        char        chr;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, 'a', PR_FALSE, 0 },
-          { (const char *)0, '\0', PR_FALSE, 0 },
-          { "abcdefg", 'a', PR_TRUE, 0 },
-          { "abcdefg", 'b', PR_TRUE, 1 },
-          { "abcdefg", 'c', PR_TRUE, 2 },
-          { "abcdefg", 'd', PR_TRUE, 3 },
-          { "abcdefg", 'e', PR_TRUE, 4 },
-          { "abcdefg", 'f', PR_TRUE, 5 },
-          { "abcdefg", 'g', PR_TRUE, 6 },
-          { "abcdefg", 'h', PR_FALSE, 0 },
-          { "abcdefg", '\0', PR_TRUE, 7 },
-          { "abcdefg", 'A', PR_FALSE, 0 },
-          { "abcdefg", 'B', PR_FALSE, 0 },
-          { "abcdefg", 'C', PR_FALSE, 0 },
-          { "abcdefg", 'D', PR_FALSE, 0 },
-          { "abcdefg", 'E', PR_FALSE, 0 },
-          { "abcdefg", 'F', PR_FALSE, 0 },
-          { "abcdefg", 'G', PR_FALSE, 0 },
-          { "abcdefg", 'H', PR_FALSE, 0 },
-          { "abcdefgabcdefg", 'a', PR_TRUE, 7 },
-          { "abcdefgabcdefg", 'b', PR_TRUE, 8 },
-          { "abcdefgabcdefg", 'c', PR_TRUE, 9 },
-          { "abcdefgabcdefg", 'd', PR_TRUE, 10 },
-          { "abcdefgabcdefg", 'e', PR_TRUE, 11 },
-          { "abcdefgabcdefg", 'f', PR_TRUE, 12 },
-          { "abcdefgabcdefg", 'g', PR_TRUE, 13 },
-          { "abcdefgabcdefg", 'h', PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', PR_TRUE, 14 }
-      };
-
-    int i;
-
-    printf("Test 016 (PL_strrchr)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strrchr(array[i].str, array[i].chr);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%c -> %.32s, not zero\n", i, array[i].str,
-                       array[i].chr, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
-                       array[i].chr, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
-                       array[i].chr, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnchr */
-PRBool test_017(void)
-{
-    static struct
-    {
-        const char *str;
-        char        chr;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, 'a', 2, PR_FALSE, 0 },
-          { (const char *)0, '\0', 2, PR_FALSE, 0 },
-          { "abcdefg", 'a', 5, PR_TRUE, 0 },
-          { "abcdefg", 'b', 5, PR_TRUE, 1 },
-          { "abcdefg", 'c', 5, PR_TRUE, 2 },
-          { "abcdefg", 'd', 5, PR_TRUE, 3 },
-          { "abcdefg", 'e', 5, PR_TRUE, 4 },
-          { "abcdefg", 'f', 5, PR_FALSE, 0 },
-          { "abcdefg", 'g', 5, PR_FALSE, 0 },
-          { "abcdefg", 'h', 5, PR_FALSE, 0 },
-          { "abcdefg", '\0', 5, PR_FALSE, 0 },
-          { "abcdefg", '\0', 15, PR_TRUE, 7 },
-          { "abcdefg", 'A', 5, PR_FALSE, 0 },
-          { "abcdefg", 'B', 5, PR_FALSE, 0 },
-          { "abcdefg", 'C', 5, PR_FALSE, 0 },
-          { "abcdefg", 'D', 5, PR_FALSE, 0 },
-          { "abcdefg", 'E', 5, PR_FALSE, 0 },
-          { "abcdefg", 'F', 5, PR_FALSE, 0 },
-          { "abcdefg", 'G', 5, PR_FALSE, 0 },
-          { "abcdefg", 'H', 5, PR_FALSE, 0 },
-          { "abcdefgabcdefg", 'a', 10, PR_TRUE, 0 },
-          { "abcdefgabcdefg", 'b', 10, PR_TRUE, 1 },
-          { "abcdefgabcdefg", 'c', 10, PR_TRUE, 2 },
-          { "abcdefgabcdefg", 'd', 10, PR_TRUE, 3 },
-          { "abcdefgabcdefg", 'e', 10, PR_TRUE, 4 },
-          { "abcdefgabcdefg", 'f', 10, PR_TRUE, 5 },
-          { "abcdefgabcdefg", 'g', 10, PR_TRUE, 6 },
-          { "abcdefgabcdefg", 'h', 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 14, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 15, PR_TRUE, 14 }
-      };
-
-    int i;
-
-    printf("Test 017 (PL_strnchr)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnchr(array[i].str, array[i].chr, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
-                       array[i].chr, array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
-                       array[i].chr, array[i].max, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
-                       array[i].chr, array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnrchr */
-PRBool test_018(void)
-{
-    static struct
-    {
-        const char *str;
-        char        chr;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, 'a', 2, PR_FALSE, 0 },
-          { (const char *)0, '\0', 2, PR_FALSE, 0 },
-          { "abcdefg", 'a', 5, PR_TRUE, 0 },
-          { "abcdefg", 'b', 5, PR_TRUE, 1 },
-          { "abcdefg", 'c', 5, PR_TRUE, 2 },
-          { "abcdefg", 'd', 5, PR_TRUE, 3 },
-          { "abcdefg", 'e', 5, PR_TRUE, 4 },
-          { "abcdefg", 'f', 5, PR_FALSE, 0 },
-          { "abcdefg", 'g', 5, PR_FALSE, 0 },
-          { "abcdefg", 'h', 5, PR_FALSE, 0 },
-          { "abcdefg", '\0', 5, PR_FALSE, 0 },
-          { "abcdefg", '\0', 15, PR_TRUE, 7 },
-          { "abcdefg", 'A', 5, PR_FALSE, 0 },
-          { "abcdefg", 'B', 5, PR_FALSE, 0 },
-          { "abcdefg", 'C', 5, PR_FALSE, 0 },
-          { "abcdefg", 'D', 5, PR_FALSE, 0 },
-          { "abcdefg", 'E', 5, PR_FALSE, 0 },
-          { "abcdefg", 'F', 5, PR_FALSE, 0 },
-          { "abcdefg", 'G', 5, PR_FALSE, 0 },
-          { "abcdefg", 'H', 5, PR_FALSE, 0 },
-          { "abcdefgabcdefg", 'a', 10, PR_TRUE, 7 },
-          { "abcdefgabcdefg", 'b', 10, PR_TRUE, 8 },
-          { "abcdefgabcdefg", 'c', 10, PR_TRUE, 9 },
-          { "abcdefgabcdefg", 'd', 10, PR_TRUE, 3 },
-          { "abcdefgabcdefg", 'e', 10, PR_TRUE, 4 },
-          { "abcdefgabcdefg", 'f', 10, PR_TRUE, 5 },
-          { "abcdefgabcdefg", 'g', 10, PR_TRUE, 6 },
-          { "abcdefgabcdefg", 'h', 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 14, PR_FALSE, 0 },
-          { "abcdefgabcdefg", '\0', 15, PR_TRUE, 14 }
-      };
-
-    int i;
-
-    printf("Test 018 (PL_strnrchr)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnrchr(array[i].str, array[i].chr, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
-                       array[i].chr, array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
-                       array[i].chr, array[i].max, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%c/%lu -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
-                       array[i].chr, array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strpbrk */
-PRBool test_019(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *chrs;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "abc", PR_FALSE, 0 },
-          { "abc", (const char *)0, PR_FALSE, 0 },
-          { "abcdefg", "", PR_FALSE, 0 },
-          { "", "aeiou", PR_FALSE, 0 },
-          { "abcdefg", "ae", PR_TRUE, 0 },
-          { "abcdefg", "ei", PR_TRUE, 4 },
-          { "abcdefg", "io", PR_FALSE, 0 },
-          { "abcdefg", "bcd", PR_TRUE, 1 },
-          { "abcdefg", "cbd", PR_TRUE, 1 },
-          { "abcdefg", "dbc", PR_TRUE, 1 },
-          { "abcdefg", "ghi", PR_TRUE, 6 },
-          { "abcdefg", "AE", PR_FALSE, 0 },
-          { "abcdefg", "EI", PR_FALSE, 0 },
-          { "abcdefg", "IO", PR_FALSE, 0 },
-          { "abcdefg", "BCD", PR_FALSE, 0 },
-          { "abcdefg", "CBD", PR_FALSE, 0 },
-          { "abcdefg", "DBC", PR_FALSE, 0 },
-          { "abcdefg", "GHI", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ae", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "ei", PR_TRUE, 4 },
-          { "abcdefgabcdefg", "io", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "bcd", PR_TRUE, 1 },
-          { "abcdefgabcdefg", "cbd", PR_TRUE, 1 },
-          { "abcdefgabcdefg", "dbc", PR_TRUE, 1 },
-          { "abcdefgabcdefg", "ghi", PR_TRUE, 6 },
-          { "abcdefgabcdefg", "AE", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "EI", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "IO", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "BCD", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "CBD", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "DBC", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "GHI", PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 019 (PL_strpbrk)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strpbrk(array[i].str, array[i].chrs);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strprbrk */
-PRBool test_020(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *chrs;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "abc", PR_FALSE, 0 },
-          { "abc", (const char *)0, PR_FALSE, 0 },
-          { "abcdefg", "", PR_FALSE, 0 },
-          { "", "aeiou", PR_FALSE, 0 },
-          { "abcdefg", "ae", PR_TRUE, 4 },
-          { "abcdefg", "ei", PR_TRUE, 4 },
-          { "abcdefg", "io", PR_FALSE, 0 },
-          { "abcdefg", "bcd", PR_TRUE, 3 },
-          { "abcdefg", "cbd", PR_TRUE, 3 },
-          { "abcdefg", "dbc", PR_TRUE, 3 },
-          { "abcdefg", "ghi", PR_TRUE, 6 },
-          { "abcdefg", "AE", PR_FALSE, 0 },
-          { "abcdefg", "EI", PR_FALSE, 0 },
-          { "abcdefg", "IO", PR_FALSE, 0 },
-          { "abcdefg", "BCD", PR_FALSE, 0 },
-          { "abcdefg", "CBD", PR_FALSE, 0 },
-          { "abcdefg", "DBC", PR_FALSE, 0 },
-          { "abcdefg", "GHI", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ae", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "ei", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "io", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "bcd", PR_TRUE, 10 },
-          { "abcdefgabcdefg", "cbd", PR_TRUE, 10 },
-          { "abcdefgabcdefg", "dbc", PR_TRUE, 10 },
-          { "abcdefgabcdefg", "ghi", PR_TRUE, 13 },
-          { "abcdefgabcdefg", "AE", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "EI", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "IO", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "BCD", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "CBD", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "DBC", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "GHI", PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 020 (PL_strprbrk)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strprbrk(array[i].str, array[i].chrs);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-                       
-/* PL_strnpbrk */
-PRBool test_021(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *chrs;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 3, PR_FALSE, 0 },
-          { (const char *)0, "abc", 3, PR_FALSE, 0 },
-          { "abc", (const char *)0, 3, PR_FALSE, 0 },
-          { "abcdefg", "", 3, PR_FALSE, 0 },
-          { "", "aeiou", 3, PR_FALSE, 0 },
-          { "abcdefg", "ae", 0, PR_FALSE, 0 },
-          { "abcdefg", "ae", 1, PR_TRUE, 0 },
-          { "abcdefg", "ae", 4, PR_TRUE, 0 },
-          { "abcdefg", "ae", 5, PR_TRUE, 0 },
-          { "abcdefg", "ae", 6, PR_TRUE, 0 },
-          { "abcdefg", "ei", 4, PR_FALSE, 0 },
-          { "abcdefg", "io", 10, PR_FALSE, 0 },
-          { "abcdefg", "bcd", 2, PR_TRUE, 1 },
-          { "abcdefg", "cbd", 2, PR_TRUE, 1 },
-          { "abcdefg", "dbc", 2, PR_TRUE, 1 },
-          { "abcdefg", "ghi", 6, PR_FALSE, 0 },
-          { "abcdefg", "ghi", 7, PR_TRUE, 6 },
-          { "abcdefg", "AE", 9, PR_FALSE, 0 },
-          { "abcdefg", "EI", 9, PR_FALSE, 0 },
-          { "abcdefg", "IO", 9, PR_FALSE, 0 },
-          { "abcdefg", "BCD", 9, PR_FALSE, 0 },
-          { "abcdefg", "CBD", 9, PR_FALSE, 0 },
-          { "abcdefg", "DBC", 9, PR_FALSE, 0 },
-          { "abcdefg", "GHI", 9, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ae", 10, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "ei", 10, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "io", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "bcd", 10, PR_TRUE, 1 },
-          { "abcdefgabcdefg", "cbd", 10, PR_TRUE, 1 },
-          { "abcdefgabcdefg", "dbc", 10, PR_TRUE, 1 },
-          { "abcdefgabcdefg", "ghi", 10, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "AE", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "EI", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "IO", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "BCD", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "CBD", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "DBC", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "GHI", 10, PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 021 (PL_strnpbrk)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnpbrk(array[i].str, array[i].chrs, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnprbrk */
-PRBool test_022(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *chrs;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 3, PR_FALSE, 0 },
-          { (const char *)0, "abc", 3, PR_FALSE, 0 },
-          { "abc", (const char *)0, 3, PR_FALSE, 0 },
-          { "abcdefg", "", 3, PR_FALSE, 0 },
-          { "", "aeiou", 3, PR_FALSE, 0 },
-          { "abcdefg", "ae", 0, PR_FALSE, 0 },
-          { "abcdefg", "ae", 1, PR_TRUE, 0 },
-          { "abcdefg", "ae", 4, PR_TRUE, 0 },
-          { "abcdefg", "ae", 5, PR_TRUE, 4 },
-          { "abcdefg", "ae", 6, PR_TRUE,  4 },
-          { "abcdefg", "ei", 4, PR_FALSE, 0 },
-          { "abcdefg", "io", 10, PR_FALSE, 0 },
-          { "abcdefg", "bcd", 2, PR_TRUE, 1 },
-          { "abcdefg", "cbd", 2, PR_TRUE, 1 },
-          { "abcdefg", "dbc", 2, PR_TRUE, 1 },
-          { "abcdefg", "bcd", 3, PR_TRUE, 2 },
-          { "abcdefg", "cbd", 3, PR_TRUE, 2 },
-          { "abcdefg", "dbc", 3, PR_TRUE, 2 },
-          { "abcdefg", "bcd", 5, PR_TRUE, 3 },
-          { "abcdefg", "cbd", 5, PR_TRUE, 3 },
-          { "abcdefg", "dbc", 5, PR_TRUE, 3 },
-          { "abcdefg", "bcd", 15, PR_TRUE, 3 },
-          { "abcdefg", "cbd", 15, PR_TRUE, 3 },
-          { "abcdefg", "dbc", 15, PR_TRUE, 3 },
-          { "abcdefg", "ghi", 6, PR_FALSE, 0 },
-          { "abcdefg", "ghi", 7, PR_TRUE, 6 },
-          { "abcdefg", "AE", 9, PR_FALSE, 0 },
-          { "abcdefg", "EI", 9, PR_FALSE, 0 },
-          { "abcdefg", "IO", 9, PR_FALSE, 0 },
-          { "abcdefg", "BCD", 9, PR_FALSE, 0 },
-          { "abcdefg", "CBD", 9, PR_FALSE, 0 },
-          { "abcdefg", "DBC", 9, PR_FALSE, 0 },
-          { "abcdefg", "GHI", 9, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ae", 10, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "ei", 10, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "io", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "bcd", 10, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "cbd", 10, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "dbc", 10, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "ghi", 10, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "AE", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "EI", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "IO", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "BCD", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "CBD", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "DBC", 10, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "GHI", 10, PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 022 (PL_strnprbrk)   ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnprbrk(array[i].str, array[i].chrs, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].chrs ? array[i].chrs : "(null)", 
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strstr */
-PRBool test_023(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "blah", PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", PR_TRUE, 0 },
-          { "", "blah", PR_FALSE, 0 },
-          { "blah-de-blah", "", PR_FALSE, 0 },
-          { "abcdefg", "a", PR_TRUE, 0 },
-          { "abcdefg", "c", PR_TRUE, 2 },
-          { "abcdefg", "e", PR_TRUE, 4 },
-          { "abcdefg", "g", PR_TRUE, 6 },
-          { "abcdefg", "i", PR_FALSE, 0 },
-          { "abcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabc", "bc", PR_TRUE, 1 },
-          { "abcdefg", "abcdefg", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "c", PR_TRUE, 2 },
-          { "abcdefgabcdefg", "e", PR_TRUE, 4 },
-          { "abcdefgabcdefg", "g", PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefgabcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", PR_TRUE, 1 },
-          { "abcdefgabcdefg", "abcdefg", PR_TRUE, 0 },
-          { "ABCDEFG", "a", PR_FALSE, 0 },
-          { "ABCDEFG", "c", PR_FALSE, 0 },
-          { "ABCDEFG", "e", PR_FALSE, 0 },
-          { "ABCDEFG", "g", PR_FALSE, 0 },
-          { "ABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFG", "ab", PR_FALSE, 0 },
-          { "ABCDEFG", "cd", PR_FALSE, 0 },
-          { "ABCDEFG", "ef", PR_FALSE, 0 },
-          { "ABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABC", "bc", PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "a", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "c", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "e", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "g", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "cd", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ef", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 023 (PL_strstr)      ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strstr(array[i].str, array[i].sub);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strrstr */
-PRBool test_024(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "blah", PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", PR_TRUE, 8 },
-          { "", "blah", PR_FALSE, 0 },
-          { "blah-de-blah", "", PR_FALSE, 0 },
-          { "abcdefg", "a", PR_TRUE, 0 },
-          { "abcdefg", "c", PR_TRUE, 2 },
-          { "abcdefg", "e", PR_TRUE, 4 },
-          { "abcdefg", "g", PR_TRUE, 6 },
-          { "abcdefg", "i", PR_FALSE, 0 },
-          { "abcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabc", "bc", PR_TRUE, 5 },
-          { "abcdefg", "abcdefg", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", PR_TRUE, 7 },
-          { "abcdefgabcdefg", "c", PR_TRUE, 9 },
-          { "abcdefgabcdefg", "e", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "g", PR_TRUE, 13 },
-          { "abcdefgabcdefg", "i", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", PR_TRUE, 7 },
-          { "abcdefgabcdefg", "cd", PR_TRUE, 9 },
-          { "abcdefgabcdefg", "ef", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", PR_TRUE, 12 },
-          { "abcdefgabcdefg", "abcdefg", PR_TRUE, 7 },
-          { "ABCDEFG", "a", PR_FALSE, 0 },
-          { "ABCDEFG", "c", PR_FALSE, 0 },
-          { "ABCDEFG", "e", PR_FALSE, 0 },
-          { "ABCDEFG", "g", PR_FALSE, 0 },
-          { "ABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFG", "ab", PR_FALSE, 0 },
-          { "ABCDEFG", "cd", PR_FALSE, 0 },
-          { "ABCDEFG", "ef", PR_FALSE, 0 },
-          { "ABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABC", "bc", PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "a", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "c", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "e", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "g", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "cd", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ef", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 024 (PL_strrstr)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strrstr(array[i].str, array[i].sub);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnstr */
-PRBool test_025(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 12, PR_FALSE, 0 },
-          { (const char *)0, "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, 12, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 2, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 3, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 4, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 5, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 12, PR_TRUE, 0 },
-          { "", "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", "", 12, PR_FALSE, 0 },
-          { "abcdefg", "a", 5, PR_TRUE, 0 },
-          { "abcdefg", "c", 5, PR_TRUE, 2 },
-          { "abcdefg", "e", 5, PR_TRUE, 4 },
-          { "abcdefg", "g", 5, PR_FALSE, 0 },
-          { "abcdefg", "i", 5, PR_FALSE, 0 },
-          { "abcdefg", "ab", 5, PR_TRUE, 0 },
-          { "abcdefg", "cd", 5, PR_TRUE, 2 },
-          { "abcdefg", "ef", 5, PR_FALSE, 0 },
-          { "abcdefg", "gh", 5, PR_FALSE, 0 },
-          { "abcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabc", "bc", 7, PR_TRUE, 1 },
-          { "abcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", 12, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "c", 12, PR_TRUE, 2 },
-          { "abcdefgabcdefg", "e", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "g", 12, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", 12, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", 12, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "cd", 12, PR_TRUE, 2 },
-          { "abcdefgabcdefg", "ef", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", 12, PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabcabcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabcabcdabc", "bc", 7, PR_TRUE, 1 },
-          { "abcdefgabcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "ABCDEFG", "a", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "c", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "e", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "g", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "i", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ab", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "cd", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ef", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "gh", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 6, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 7, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 7, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 8, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "a", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "c", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "e", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "g", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "i", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "cd", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ef", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "gh", 12, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 5, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 6, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 7, PR_FALSE,  },
-          { "ABCDEFGABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 7, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 8, PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 025 (PL_strnstr)     ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnstr(array[i].str, array[i].sub, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strnrstr */
-PRBool test_026(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 12, PR_FALSE, 0 },
-          { (const char *)0, "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, 12, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 2, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 3, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 4, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 5, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 11, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 12, PR_TRUE, 8 },
-          { "blah-de-blah", "blah", 13, PR_TRUE, 8 },
-          { "", "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", "", 12, PR_FALSE, 0 },
-          { "abcdefg", "a", 5, PR_TRUE, 0 },
-          { "abcdefg", "c", 5, PR_TRUE, 2 },
-          { "abcdefg", "e", 5, PR_TRUE, 4 },
-          { "abcdefg", "g", 5, PR_FALSE, 0 },
-          { "abcdefg", "i", 5, PR_FALSE, 0 },
-          { "abcdefg", "ab", 5, PR_TRUE, 0 },
-          { "abcdefg", "cd", 5, PR_TRUE, 2 },
-          { "abcdefg", "ef", 5, PR_FALSE, 0 },
-          { "abcdefg", "gh", 5, PR_FALSE, 0 },
-          { "abcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabc", "bc", 7, PR_TRUE, 5 },
-          { "abcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", 12, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "c", 12, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "e", 12, PR_TRUE, 11 },
-          { "abcdefgabcdefg", "g", 12, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", 12, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", 12, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "cd", 12, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "ef", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", 12, PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", 12, PR_TRUE, 8 },
-          { "abcdabcabcdabc", "bc", 13, PR_TRUE, 8 },
-          { "abcdabcabcdabc", "bc", 14, PR_TRUE, 12 },
-          { "abcdefgabcdefg", "abcdefg", 13, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 14, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "abcdefg", 15, PR_TRUE, 7 },
-          { "ABCDEFG", "a", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "c", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "e", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "g", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "i", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ab", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "cd", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ef", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "gh", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 6, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 7, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 7, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 8, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "a", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "c", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "e", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "g", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "i", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "cd", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ef", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "gh", 12, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 12, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 13, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 14, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 13, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 14, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 15, PR_FALSE, 0 }
-      };
-
-    int i;
-
-    printf("Test 026 (PL_strnrstr)    ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strnrstr(array[i].str, array[i].sub, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcasestr */
-PRBool test_027(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "blah", PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", PR_TRUE, 0 },
-          { "", "blah", PR_FALSE, 0 },
-          { "blah-de-blah", "", PR_FALSE, 0 },
-          { "abcdefg", "a", PR_TRUE, 0 },
-          { "abcdefg", "c", PR_TRUE, 2 },
-          { "abcdefg", "e", PR_TRUE, 4 },
-          { "abcdefg", "g", PR_TRUE, 6 },
-          { "abcdefg", "i", PR_FALSE, 0 },
-          { "abcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabc", "bc", PR_TRUE, 1 },
-          { "abcdefg", "abcdefg", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "c", PR_TRUE, 2 },
-          { "abcdefgabcdefg", "e", PR_TRUE, 4 },
-          { "abcdefgabcdefg", "g", PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefgabcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", PR_TRUE, 1 },
-          { "abcdefgabcdefg", "abcdefg", PR_TRUE, 0 },
-          { "ABCDEFG", "a", PR_TRUE, 0 },
-          { "ABCDEFG", "c", PR_TRUE, 2 },
-          { "ABCDEFG", "e", PR_TRUE, 4 },
-          { "ABCDEFG", "g", PR_TRUE, 6 },
-          { "ABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFG", "ab", PR_TRUE, 0 },
-          { "ABCDEFG", "cd", PR_TRUE, 2 },
-          { "ABCDEFG", "ef", PR_TRUE, 4 },
-          { "ABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABC", "bc", PR_TRUE, 1 },
-          { "ABCDEFG", "abcdefg", PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "a", PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "c", PR_TRUE, 2 },
-          { "ABCDEFGABCDEFG", "e", PR_TRUE, 4 },
-          { "ABCDEFGABCDEFG", "g", PR_TRUE, 6 },
-          { "ABCDEFGABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "cd", PR_TRUE, 2 },
-          { "ABCDEFGABCDEFG", "ef", PR_TRUE, 4 },
-          { "ABCDEFGABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", PR_TRUE, 1 },
-          { "ABCDEFGABCDEFG", "abcdefg", PR_TRUE, 0 }
-      };
-
-    int i;
-
-    printf("Test 027 (PL_strcasestr)  ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strcasestr(array[i].str, array[i].sub);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strcaserstr */
-PRBool test_028(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, PR_FALSE, 0 },
-          { (const char *)0, "blah", PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", PR_TRUE, 8 },
-          { "", "blah", PR_FALSE, 0 },
-          { "blah-de-blah", "", PR_FALSE, 0 },
-          { "abcdefg", "a", PR_TRUE, 0 },
-          { "abcdefg", "c", PR_TRUE, 2 },
-          { "abcdefg", "e", PR_TRUE, 4 },
-          { "abcdefg", "g", PR_TRUE, 6 },
-          { "abcdefg", "i", PR_FALSE, 0 },
-          { "abcdefg", "ab", PR_TRUE, 0 },
-          { "abcdefg", "cd", PR_TRUE, 2 },
-          { "abcdefg", "ef", PR_TRUE, 4 },
-          { "abcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabc", "bc", PR_TRUE, 5 },
-          { "abcdefg", "abcdefg", PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", PR_TRUE, 7 },
-          { "abcdefgabcdefg", "c", PR_TRUE, 9 },
-          { "abcdefgabcdefg", "e", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "g", PR_TRUE, 13 },
-          { "abcdefgabcdefg", "i", PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", PR_TRUE, 7 },
-          { "abcdefgabcdefg", "cd", PR_TRUE, 9 },
-          { "abcdefgabcdefg", "ef", PR_TRUE, 11 },
-          { "abcdefgabcdefg", "gh", PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", PR_TRUE, 12 },
-          { "abcdefgabcdefg", "abcdefg", PR_TRUE, 7 },
-          { "ABCDEFG", "a", PR_TRUE, 0 },
-          { "ABCDEFG", "c", PR_TRUE, 2 },
-          { "ABCDEFG", "e", PR_TRUE, 4 },
-          { "ABCDEFG", "g", PR_TRUE, 6 },
-          { "ABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFG", "ab", PR_TRUE, 0 },
-          { "ABCDEFG", "cd", PR_TRUE, 2 },
-          { "ABCDEFG", "ef", PR_TRUE, 4 },
-          { "ABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABC", "bc", PR_TRUE, 5 },
-          { "ABCDEFG", "abcdefg", PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "a", PR_TRUE, 7 },
-          { "ABCDEFGABCDEFG", "c", PR_TRUE, 9 },
-          { "ABCDEFGABCDEFG", "e", PR_TRUE, 11 },
-          { "ABCDEFGABCDEFG", "g", PR_TRUE, 13 },
-          { "ABCDEFGABCDEFG", "i", PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", PR_TRUE, 7 },
-          { "ABCDEFGABCDEFG", "cd", PR_TRUE, 9 },
-          { "ABCDEFGABCDEFG", "ef", PR_TRUE, 11 },
-          { "ABCDEFGABCDEFG", "gh", PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", PR_TRUE, 12 },
-          { "ABCDEFGABCDEFG", "abcdefg", PR_TRUE, 7 }
-      };
-
-    int i;
-
-    printf("Test 028 (PL_strcaserstr) ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strcaserstr(array[i].str, array[i].sub);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncasestr */
-PRBool test_029(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 12, PR_FALSE, 0 },
-          { (const char *)0, "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, 12, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 2, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 3, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 4, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 5, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 12, PR_TRUE, 0 },
-          { "", "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", "", 12, PR_FALSE, 0 },
-          { "abcdefg", "a", 5, PR_TRUE, 0 },
-          { "abcdefg", "c", 5, PR_TRUE, 2 },
-          { "abcdefg", "e", 5, PR_TRUE, 4 },
-          { "abcdefg", "g", 5, PR_FALSE, 0 },
-          { "abcdefg", "i", 5, PR_FALSE, 0 },
-          { "abcdefg", "ab", 5, PR_TRUE, 0 },
-          { "abcdefg", "cd", 5, PR_TRUE, 2 },
-          { "abcdefg", "ef", 5, PR_FALSE, 0 },
-          { "abcdefg", "gh", 5, PR_FALSE, 0 },
-          { "abcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabc", "bc", 7, PR_TRUE, 1 },
-          { "abcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", 12, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "c", 12, PR_TRUE, 2 },
-          { "abcdefgabcdefg", "e", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "g", 12, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", 12, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", 12, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "cd", 12, PR_TRUE, 2 },
-          { "abcdefgabcdefg", "ef", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", 12, PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabcabcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabcabcdabc", "bc", 7, PR_TRUE, 1 },
-          { "abcdefgabcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "ABCDEFG", "a", 5, PR_TRUE, 0 },
-          { "ABCDEFG", "c", 5, PR_TRUE, 2 },
-          { "ABCDEFG", "e", 5, PR_TRUE, 4 },
-          { "ABCDEFG", "g", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "i", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ab", 5, PR_TRUE, 0 },
-          { "ABCDEFG", "cd", 5, PR_TRUE, 2 },
-          { "ABCDEFG", "ef", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "gh", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 5, PR_TRUE, 1 },
-          { "ABCDABC", "bc", 6, PR_TRUE, 1 },
-          { "ABCDABC", "bc", 7, PR_TRUE, 1 },
-          { "ABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 7, PR_TRUE, 0 },
-          { "ABCDEFG", "abcdefg", 8, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "a", 12, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "c", 12, PR_TRUE, 2 },
-          { "ABCDEFGABCDEFG", "e", 12, PR_TRUE, 4 },
-          { "ABCDEFGABCDEFG", "g", 12, PR_TRUE, 6 },
-          { "ABCDEFGABCDEFG", "i", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", 12, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "cd", 12, PR_TRUE, 2 },
-          { "ABCDEFGABCDEFG", "ef", 12, PR_TRUE, 4 },
-          { "ABCDEFGABCDEFG", "gh", 12, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 5, PR_TRUE, 1 },
-          { "ABCDABCABCDABC", "bc", 6, PR_TRUE, 1 },
-          { "ABCDABCABCDABC", "bc", 7, PR_TRUE, 1 },
-          { "ABCDEFGABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 7, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 8, PR_TRUE, 0 }
-      };
-
-    int i;
-
-    printf("Test 029 (PL_strncasestr) ..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strncasestr(array[i].str, array[i].sub, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strncaserstr */
-PRBool test_030(void)
-{
-    static struct
-    {
-        const char *str;
-        const char *sub;
-        PRUint32    max;
-        PRBool      ret;
-        PRUint32    off;
-    } array[] =
-      {
-          { (const char *)0, (const char *)0, 12, PR_FALSE, 0 },
-          { (const char *)0, "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", (const char *)0, 12, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 0, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 2, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 3, PR_FALSE, 0 },
-          { "blah-de-blah", "blah", 4, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 5, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 11, PR_TRUE, 0 },
-          { "blah-de-blah", "blah", 12, PR_TRUE, 8 },
-          { "blah-de-blah", "blah", 13, PR_TRUE, 8 },
-          { "", "blah", 12, PR_FALSE, 0 },
-          { "blah-de-blah", "", 12, PR_FALSE, 0 },
-          { "abcdefg", "a", 5, PR_TRUE, 0 },
-          { "abcdefg", "c", 5, PR_TRUE, 2 },
-          { "abcdefg", "e", 5, PR_TRUE, 4 },
-          { "abcdefg", "g", 5, PR_FALSE, 0 },
-          { "abcdefg", "i", 5, PR_FALSE, 0 },
-          { "abcdefg", "ab", 5, PR_TRUE, 0 },
-          { "abcdefg", "cd", 5, PR_TRUE, 2 },
-          { "abcdefg", "ef", 5, PR_FALSE, 0 },
-          { "abcdefg", "gh", 5, PR_FALSE, 0 },
-          { "abcdabc", "bc", 5, PR_TRUE, 1 },
-          { "abcdabc", "bc", 6, PR_TRUE, 1 },
-          { "abcdabc", "bc", 7, PR_TRUE, 5 },
-          { "abcdefg", "abcdefg", 6, PR_FALSE, 0 },
-          { "abcdefg", "abcdefg", 7, PR_TRUE, 0 },
-          { "abcdefg", "abcdefg", 8, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "a", 12, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "c", 12, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "e", 12, PR_TRUE, 11 },
-          { "abcdefgabcdefg", "g", 12, PR_TRUE, 6 },
-          { "abcdefgabcdefg", "i", 12, PR_FALSE, 0 },
-          { "abcdefgabcdefg", "ab", 12, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "cd", 12, PR_TRUE, 9 },
-          { "abcdefgabcdefg", "ef", 12, PR_TRUE, 4 },
-          { "abcdefgabcdefg", "gh", 12, PR_FALSE, 0 },
-          { "abcdabcabcdabc", "bc", 12, PR_TRUE, 8 },
-          { "abcdabcabcdabc", "bc", 13, PR_TRUE, 8 },
-          { "abcdabcabcdabc", "bc", 14, PR_TRUE, 12 },
-          { "abcdefgabcdefg", "abcdefg", 13, PR_TRUE, 0 },
-          { "abcdefgabcdefg", "abcdefg", 14, PR_TRUE, 7 },
-          { "abcdefgabcdefg", "abcdefg", 15, PR_TRUE, 7 },
-          { "ABCDEFG", "a", 5, PR_TRUE, 0 },
-          { "ABCDEFG", "c", 5, PR_TRUE, 2 },
-          { "ABCDEFG", "e", 5, PR_TRUE, 4 },
-          { "ABCDEFG", "g", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "i", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "ab", 5, PR_TRUE, 0 },
-          { "ABCDEFG", "cd", 5, PR_TRUE, 2 },
-          { "ABCDEFG", "ef", 5, PR_FALSE, 0 },
-          { "ABCDEFG", "gh", 5, PR_FALSE, 0 },
-          { "ABCDABC", "bc", 5, PR_TRUE, 1 },
-          { "ABCDABC", "bc", 6, PR_TRUE, 1 },
-          { "ABCDABC", "bc", 7, PR_TRUE, 5 },
-          { "ABCDEFG", "abcdefg", 6, PR_FALSE, 0 },
-          { "ABCDEFG", "abcdefg", 7, PR_TRUE, 0 },
-          { "ABCDEFG", "abcdefg", 8, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "a", 12, PR_TRUE, 7 },
-          { "ABCDEFGABCDEFG", "c", 12, PR_TRUE, 9 },
-          { "ABCDEFGABCDEFG", "e", 12, PR_TRUE, 11 },
-          { "ABCDEFGABCDEFG", "g", 12, PR_TRUE, 6 },
-          { "ABCDEFGABCDEFG", "i", 12, PR_FALSE, 0 },
-          { "ABCDEFGABCDEFG", "ab", 12, PR_TRUE, 7 },
-          { "ABCDEFGABCDEFG", "cd", 12, PR_TRUE, 9 },
-          { "ABCDEFGABCDEFG", "ef", 12, PR_TRUE, 4 },
-          { "ABCDEFGABCDEFG", "gh", 12, PR_FALSE, 0 },
-          { "ABCDABCABCDABC", "bc", 12, PR_TRUE, 8 },
-          { "ABCDABCABCDABC", "bc", 13, PR_TRUE, 8 },
-          { "ABCDABCABCDABC", "bc", 14, PR_TRUE, 12 },
-          { "ABCDEFGABCDEFG", "abcdefg", 13, PR_TRUE, 0 },
-          { "ABCDEFGABCDEFG", "abcdefg", 14, PR_TRUE, 7 },
-          { "ABCDEFGABCDEFG", "abcdefg", 15, PR_TRUE, 7 }
-      };
-
-    int i;
-
-    printf("Test 030 (PL_strncaserstr)..."); fflush(stdout);
-
-    for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
-    {
-        char *rv = PL_strncaserstr(array[i].str, array[i].sub, array[i].max);
-
-        if( PR_FALSE == array[i].ret )
-        {
-            if( (char *)0 != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv);
-                return PR_FALSE;
-            }
-        }
-        else
-        {
-            if( (char *)0 == rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-
-            if( &array[i].str[ array[i].off ] != rv )
-            {
-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-                       array[i].str ? array[i].str : "(null)",
-                       array[i].sub ? array[i].sub : "(null)",
-                       array[i].max, rv, array[i].str, array[i].off);
-                return PR_FALSE;
-            }
-        }
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-/* PL_strtok_r */
-PRBool test_031(void)
-{
-    static const char *tokens[] = {
-        "wtc", "relyea", "nelsonb", "jpierre", "nicolson",
-        "ian.mcgreer", "kirk.erickson", "sonja.mirtitsch", "mhein"
-    };
-
-    static const char *seps[] = {
-        ", ", ",", " ", "\t", ",,,", " ,", "    ", " \t\t", ","
-    };
-
-    static const char s2[] = ", \t";
-
-    char string[ 1024 ];
-    char *s1;
-    char *token;
-    char *lasts;
-    unsigned int i;
-
-    printf("Test 031 (PL_strtok_r)    ..."); fflush(stdout);
-
-    /* Build the string. */
-    string[0] = '\0';
-    for( i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++ )
-    {
-        PL_strcat(string, tokens[i]);
-        PL_strcat(string, seps[i]);
-    }
-    
-    /* Scan the string for tokens. */
-    i = 0;
-    s1 = string;
-    while( (token = PL_strtok_r(s1, s2, &lasts)) != NULL)
-    {
-        if( PL_strcmp(token, tokens[i]) != 0 )
-        {
-            printf("FAIL wrong token scanned\n");
-            return PR_FALSE;
-        }
-        i++;
-        s1 = NULL;
-    }
-    if( i != sizeof(tokens)/sizeof(tokens[0]) )
-    {
-        printf("FAIL wrong number of tokens scanned\n");
-        return PR_FALSE;
-    }
-
-    printf("PASS\n");
-    return PR_TRUE;
-}
-
-int
-main
-(
-    int     argc,
-    char   *argv[]
-)
-{
-    printf("Testing the Portable Library string functions:\n");
-
-    if( 1
-        && test_001()
-        && test_001()
-        && test_002()
-        && test_003()
-        && test_004()
-        && test_005()
-        && test_006()
-        && test_007()
-        && test_008()
-        && test_009()
-        && test_010()
-        && test_011()
-        && test_012()
-        && test_013()
-        && test_014()
-        && test_015()
-        && test_016()
-        && test_017()
-        && test_018()
-        && test_019()
-        && test_020()
-        && test_021()
-        && test_022()
-        && test_023()
-        && test_024()
-        && test_025()
-        && test_026()
-        && test_027()
-        && test_028()
-        && test_029()
-        && test_030()
-        && test_031()
-      )
-    {
-        printf("Suite passed.\n");
-        return 0;
-    }
-    else
-    {
-        printf("Suite failed.\n");
-        return 1;
-    }
-
-    /*NOTREACHED*/
-}
diff --git a/libs/js/nsprpub/lib/tests/windows/makefile b/libs/js/nsprpub/lib/tests/windows/makefile
deleted file mode 100644
index 32b9e30a5d..0000000000
--- a/libs/js/nsprpub/lib/tests/windows/makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-
-
-MOD_DEPTH = ../../..
-
-include $(MOD_DEPTH)/config/config.mk
-
-INCLUDES = -I$(DIST)/include
-
-CSRCS = winevent.c
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
-  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
-  LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
-else
-  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-  ifeq ($(OS_TARGET), WIN95)
-  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
-  else
-  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).lib
-  endif
-endif
-endif
-
-TARGETS = $(OBJDIR)/winevent.exe
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-LDFLAGS += -DEBUG
-LIBPR += $(LIBPLDS)
-LIBPR += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-
-include $(MOD_DEPTH)/config/rules.mk
-
-$(OBJDIR)/winevent.exe: $(OBJS)
-	link $(LDOPTS) $< $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
-
-export:: $(TARGETS)
-
-clean::
-	rm -rf $(TARGETS)
diff --git a/libs/js/nsprpub/lib/tests/windows/readme.1st b/libs/js/nsprpub/lib/tests/windows/readme.1st
deleted file mode 100644
index 2b756823a3..0000000000
--- a/libs/js/nsprpub/lib/tests/windows/readme.1st
+++ /dev/null
@@ -1,37 +0,0 @@
-readme.1st.
-
-The files in the lib/tests/WinGUI directory are taken
-from "Programming Windows 3.1" by Charles Petzold,
-specifically, the programs in chapter 14 related
-to the "poppad4" sample application.
-
-These programs are compiled with nspr20 to test nspr 2.0
-and to demostrate the use of nspr in a gui application.
-
-Library (DLL) PLDSxx.lib PLDSxx.dll is required to be
-linked with this test case. Functions in this dll are
-in the source ns/nspr20/lib/ds/plevent.* files.
-
-Permission to use.
-
-The source for poppad.c are used under license from
-Petzold. The license to use is stated in the book.
-The following paragraph of the license grants that
-use.
-
- 5. SAMPLE CODE.  If the SOFTWARE includes Sample Code, then
-    Microsoft grants you a royalty-free right to reproduce and
-    distribute the sample code of the SOFTWARE provided that you:
-    (a) distribute the sample code only in conjunction with and
-    as part of your software product; (b) do not use Microsoft's
-    or its authors' names, logos, or trademarks to market your
-    software product; (c) include the copyright notice that appears
-    on the SOFTWARE on your product label and as a part of the
-    sign-on message for your software product; and (d) agree to
-    idemnify, hold harmless, and defend Microsoft and its authors
-    from and against any claims or lawsuits, including attorneys'
-    fees, that arise or result from the use or distribution of
-    your software product.
-
-lth. 9/24/97.
-
diff --git a/libs/js/nsprpub/lib/tests/windows/winevent.c b/libs/js/nsprpub/lib/tests/windows/winevent.c
deleted file mode 100644
index d571aed76f..0000000000
--- a/libs/js/nsprpub/lib/tests/windows/winevent.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        winevent.c
-** Description: Test functions in plevent.c using Windows
-**
-** The winevent test exercises the PLEvent library in a maner
-** similar to how the Mozilla (or NGLayout) Client will use
-** it in a Windows environment.
-**
-** This test is based on ideas taken from Charles Petzold's
-** book "Programming Windows 3.1". License to use is in the
-** book. It has been ported to Win32.
-**
-** Operation:
-** The initialization is a standard Windows GUI application
-** setup. When the main window receives its WM_CREATE
-** message, a child window is created, a edit control is
-** instantiated in that window.
-**
-** A thread is created; this thread runs in the function:
-** TimerThread(). The new thread sends a message every second
-** via the PL_PostEvent() function. The event handler
-** HandlePadEvent() sends a windows message to the edit
-** control window; these messages are WM_CHAR messages that
-** cause the edit control to place a single '.' character in
-** the edit control. 
-**
-** After a deterministic number of '.' characters, the
-** TimerThread() function is notified via a global variable
-** that it's quitting time.
-** 
-** TimerThread() callse TestEvents(), an external function
-** that tests additional function of PLEvent.
-**
-*/
-
-#include "nspr.h"
-#include "plevent.h"
-
-#include <windows.h>
-#include <commdlg.h>
-
-#define ID_EDIT     1
-
-/* 
-** Declarations for NSPR customization
-** 
-*/
-typedef struct PadEvent
-{
-    PLEvent plEvent;
-    int     unused;    
-} PadEvent;
-
-static void PR_CALLBACK TimerThread( void *arg);
-static void PR_CALLBACK HandlePadEvent( PadEvent *padEvent );
-static void PR_CALLBACK DestroyPadEvent( PadEvent *padevent );
-
-static PRThread *tThread;
-static PLEventQueue *padQueue; 
-static long ThreadSleepTime = 1000; /* in milli-seconds */
-static long timerCount = 0;
-static HWND hDlgModeless ;
-static HWND hwndEdit ;
-static PRBool testFinished = PR_FALSE;
-static HWND     hwnd ;
-
-LRESULT CALLBACK WinProc (HWND, UINT, WPARAM, LPARAM);
-
-TCHAR appName[] = TEXT ("WinEvent") ;
-
-int WINAPI WinMain(
-    HINSTANCE hInstance, 
-    HINSTANCE hPrevInstance,
-    PSTR szCmdLine, 
-    int iCmdShow
-    )
-{
-    MSG      msg ;
-    WNDCLASS wndclass ;
-    HANDLE   hAccel ;
-    
-    PR_Init(0, 0, 0);
-
-    wndclass.style = CS_HREDRAW | CS_VREDRAW;
-    wndclass.lpfnWndProc = WinProc;
-    wndclass.cbClsExtra = 0;
-    wndclass.cbWndExtra = 0;
-    wndclass.hInstance = hInstance;
-    wndclass.hIcon = LoadIcon( NULL, IDI_APPLICATION );
-    wndclass.hCursor = LoadCursor( NULL, IDC_ARROW );
-    wndclass.hbrBackground = (HBRUSH)GetStockObject( WHITE_BRUSH );
-    wndclass.lpszMenuName = NULL;
-    wndclass.lpszClassName = appName;
-     
-    if ( !RegisterClass( &wndclass ))
-    {
-        MessageBox( NULL, 
-            TEXT( "This program needs Win32" ),
-            appName, 
-            MB_ICONERROR );
-        return 0; 
-    }
-     
-    hwnd = CreateWindow( appName, 
-        appName,
-        WS_OVERLAPPEDWINDOW,
-        CW_USEDEFAULT, 
-        CW_USEDEFAULT,
-        CW_USEDEFAULT, 
-        CW_USEDEFAULT,
-        NULL, 
-        NULL, 
-        hInstance, 
-        NULL);
-     
-     ShowWindow( hwnd, iCmdShow );
-     UpdateWindow( hwnd ); 
-     
-     for(;;)
-     {
-        if ( PeekMessage( &msg, NULL, 0, 0, PM_NOREMOVE  ))
-        {
-            if ( GetMessage( &msg, NULL, 0, 0 ))
-            {
-                if ( hDlgModeless == NULL || !IsDialogMessage( hDlgModeless, &msg ))
-                {
-                    if ( !TranslateAccelerator( hwnd, hAccel, &msg ))
-                    {
-                        TranslateMessage( &msg );
-                        DispatchMessage( &msg );
-                    } /* end if !TranslateAccelerator */
-                } 
-            }
-            else
-            {
-                break;    
-            } /* end if GetMessage() */
-        } 
-        else /* !PeekMessage */
-        {
-            PR_Sleep(50);
-        }/* end if PeekMessage() */
-     } /* end for() */
-
-     PR_JoinThread( tThread );
-     PL_DestroyEventQueue( padQueue );
-     PR_Cleanup();
-     return msg.wParam ;
-}
-
-LRESULT CALLBACK WinProc(
-    HWND hwnd, 
-    UINT message, 
-    WPARAM wParam, 
-    LPARAM lParam
-)
-{
-     switch (message)
-     {
-     case WM_CREATE :
-          hwndEdit = CreateWindow(
-                        TEXT( "edit" ), 
-                        NULL,
-                        WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL | 
-                            WS_BORDER | ES_LEFT | ES_MULTILINE |
-                            ES_AUTOHSCROLL | ES_AUTOVSCROLL,
-                         0, 0, 0, 0, 
-                         hwnd, 
-                         (HMENU)ID_EDIT,
-                         ((LPCREATESTRUCT)lParam)->hInstance, 
-                         NULL);
-     
-          /* Initialize Event Processing for NSPR
-          ** Retrieve the event queue just created
-          ** Create the TimerThread
-          */
-
-/*
-          PL_InitializeEventsLib( "someName" );
-          padQueue = PL_GetMainEventQueue();
-*/
-          padQueue = PL_CreateEventQueue("MainQueue", PR_GetCurrentThread());
-		  PR_ASSERT( padQueue != NULL );
-          tThread = PR_CreateThread( PR_USER_THREAD,
-                    TimerThread,
-                    NULL,
-                    PR_PRIORITY_NORMAL,
-                    PR_LOCAL_THREAD,
-                    PR_JOINABLE_THREAD,
-                    0 );
-          return 0 ;
-          
-     case WM_SETFOCUS :
-          SetFocus( hwndEdit );
-          return 0;
-          
-     case WM_SIZE : 
-          MoveWindow( hwndEdit, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE );
-          return 0 ;
-          
-     case WM_COMMAND :
-          if ( LOWORD(wParam) == ID_EDIT )
-               if ( HIWORD(wParam ) == EN_ERRSPACE || 
-                         HIWORD( wParam ) == EN_MAXTEXT )
-
-                    MessageBox( hwnd, TEXT( "Edit control out of space." ),
-                        appName, MB_OK | MB_ICONSTOP );
-          return 0;
-               
-     case WM_DESTROY :
-          PostQuitMessage(0);
-          return 0;
-     }
-     return DefWindowProc( hwnd, message, wParam, lParam );
-}
-
-
-
-/*
-** TimerThread() -- The Main function of the timer pop thread
-**
-*/
-static void PR_CALLBACK TimerThread( void *arg )
-{
-    PRIntn  rc;
-
-    do {
-        PadEvent   *ev;
-        
-        /*
-        ** Create and Post the event the event
-        */
-        PL_ENTER_EVENT_QUEUE_MONITOR( padQueue );
-        ev = (PadEvent *) PR_NEW( PadEvent );
-        PL_InitEvent( &ev->plEvent, NULL, 
-                (PLHandleEventProc)HandlePadEvent, 
-                (PLDestroyEventProc)DestroyPadEvent );
-        PL_PostEvent( padQueue, &ev->plEvent );
-        PL_EXIT_EVENT_QUEUE_MONITOR( padQueue );
-            
-        PR_Sleep( PR_MillisecondsToInterval(ThreadSleepTime) );
-    } while( testFinished == PR_FALSE );
-
-    PR_Sleep( PR_SecondsToInterval(4) );
-
-    /*
-    ** All done now. This thread can kill the main thread by sending 
-    ** WM_DESTROY message to the main window.
-    */
-    SendMessage( hwnd, WM_DESTROY, 0, 0 );
-    return;
-}    
-
-static char *startMessage = "Poppad: NSPR Windows GUI and event test program.\n"
-                            "Every 1 second gets a '.'.\n"
-                            "The test self terminates in less than a minute\n"
-                            "You should be able to type in the window.\n\n";
-
-static char *stopMessage = "\n\nIf you saw a series of dots being emitted in the window\n"
-                           " at one second intervals, the test worked.\n\n";
-
-/*
-** HandlePadEvent() -- gets called because of PostEvent
-*/
-static void PR_CALLBACK HandlePadEvent( PadEvent *padEvent )
-{
-    char *cp;
-    static const long lineLimit = 10;   /* limit on number of '.' per line */
-    static const long timerLimit = 25;  /* limit on timer pop iterations */
-
-    if ( timerCount++ == 0 )
-    {
-        
-        for ( cp = startMessage; *cp != 0 ; cp++ )
-        {
-            SendMessage( hwndEdit, WM_CHAR, *cp, 1 );
-        }
-    }
-    /* 
-    ** Send a WM_CHAR event the edit Window
-    */
-    SendMessage( hwndEdit, WM_CHAR, '.', 1 );
-    
-    /*
-    ** Limit the number of characters sent via timer pop to lineLimit
-    */
-    if ( (timerCount % lineLimit) == 0)
-    {
-        SendMessage( hwndEdit, WM_CHAR, '\n', 1 );
-    }
-
-    if ( timerCount >= timerLimit )
-    {
-        for ( cp = stopMessage; *cp != 0 ; cp++ )
-        {
-            SendMessage( hwndEdit, WM_CHAR, *cp, 1 );
-        }
-        testFinished = PR_TRUE;
-    }
-
-    return;
-}
-
-/*
-** DestroyPadEvent() -- Called after HandlePadEvent()
-*/
-static void PR_CALLBACK DestroyPadEvent( PadEvent *padevent )
-{
-   PR_Free( padevent );
-   return;
-}    
diff --git a/libs/js/nsprpub/macbuild/.empty b/libs/js/nsprpub/macbuild/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/Makefile.in b/libs/js/nsprpub/pkg/Makefile.in
deleted file mode 100644
index d181bf6ffc..0000000000
--- a/libs/js/nsprpub/pkg/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-DIRS = 
-ifeq ($(OS_TARGET),Linux)
-DIRS = linux
-endif
-ifeq ($(OS_TARGET),SunOS)
-DIRS = solaris
-endif
-
-publish::
-	+$(LOOP_OVER_DIRS)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/libs/js/nsprpub/pkg/linux/Makefile.in b/libs/js/nsprpub/pkg/linux/Makefile.in
deleted file mode 100644
index 5a91b052a2..0000000000
--- a/libs/js/nsprpub/pkg/linux/Makefile.in
+++ /dev/null
@@ -1,111 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.in,v 1.10 2005/11/18 21:50:20 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MOD_DEPTH = ../..
-topsrcdir   = @top_srcdir@
-srcdir	    = @srcdir@
-VPATH	    = @srcdir@
-
-NAME        = sun-nspr
-ifndef RPM_RELEASE
-RPM_RELEASE = 1
-endif
-TOPDIR      = /usr/src/redhat
-VERSION     = `grep PR_VERSION $(dist_includedir)/prinit.h \
-                  | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
-
-SPECFILE    = $(NAME).spec
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-# Force i386 for non 64 bit build
-ifneq ($(USE_64),1)
-	RPMTARGET = "--target=i386"
-	RPMLIBDIR = lib
-else
-	RPMLIBDIR = lib64
-endif
-
-publish:
-	$(MAKE) clean
-	mkdir -p SOURCES SRPMS RPMS BUILD
-	(cd $(dist_libdir) && tar cphf - libnspr4.so libplds4.so libplc4.so) \
-	| (mkdir -p opt/sun/private/$(RPMLIBDIR) && cd opt/sun/private/$(RPMLIBDIR) && tar xvfBp -)
-	(cd $(dist_includedir) && tar cphf - .) \
-	| (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -)
-	(cd opt/sun/private/include/nspr && \
-		rm -rf md private obsolete/pralarm.h obsolete/probslet.h obsolete/prsem.h)
-	tar czvf SOURCES/$(NAME)-$(VERSION).tar.gz opt
-	echo "%define name $(NAME)" >$(SPECFILE)
-	echo "%define version $(VERSION)" >>$(SPECFILE)
-	echo "%define release $(RPM_RELEASE)" >>$(SPECFILE)
-	echo "%define buildroot `pwd`/$(NAME)-root" >>$(SPECFILE)
-	echo "%define _topdir `pwd`" >>$(SPECFILE)
-	echo "%define _unpackaged_files_terminate_build 0" >>$(SPECFILE)
-	cat $(srcdir)/$(NAME).spec >>$(SPECFILE)
-	echo "" >>$(SPECFILE)
-	echo "%files" >>$(SPECFILE)
-	echo "%defattr(-,root,root)" >>$(SPECFILE)
-	echo "%dir /opt" >>$(SPECFILE)
-	echo "%dir /opt/sun" >>$(SPECFILE)
-	echo "%dir /opt/sun/private" >>$(SPECFILE)
-	echo "%dir /opt/sun/private/$(RPMLIBDIR)" >>$(SPECFILE)
-	find opt \( -name "*.so" \) | sed -e "s-^-/-" >>$(SPECFILE)
-	echo "" >>$(SPECFILE)
-	echo "%files devel" >>$(SPECFILE)
-	echo "%defattr(-,root,root)" >>$(SPECFILE)
-	echo "%dir /opt" >>$(SPECFILE)
-	echo "%dir /opt/sun" >>$(SPECFILE)
-	echo "%dir /opt/sun/private" >>$(SPECFILE)
-	echo "%dir /opt/sun/private/include" >>$(SPECFILE)
-	echo "%dir /opt/sun/private/include/nspr" >>$(SPECFILE)
-	echo "%dir /opt/sun/private/include/nspr/obsolete" >>$(SPECFILE)
-	find opt -type f \( -name "*.h" \) \
-		| sed -e "s-^-/-" >>$(SPECFILE)
-	rpmbuild $(RPMTARGET) -bb $(SPECFILE)
-
-clean:
-	rm -rf $(TOPDIR)/BUILD/$(NAME)
-	rm -rf SOURCES SRPMS RPMS BUILD
-	rm -rf RPMS SRPMS opt
-	rm -f $(NAME)-$(VERSION).tar.gz
diff --git a/libs/js/nsprpub/pkg/linux/sun-nspr.spec b/libs/js/nsprpub/pkg/linux/sun-nspr.spec
deleted file mode 100644
index f914736d97..0000000000
--- a/libs/js/nsprpub/pkg/linux/sun-nspr.spec
+++ /dev/null
@@ -1,81 +0,0 @@
-Summary: Netscape Portable Runtime
-Name: %{name}
-Vendor: Sun Microsystems, Inc.
-Version: %{version}
-Release: %{release}
-Copyright: Copyright 2005 Sun Microsystems, Inc.  All rights reserved.  Use is subject to license terms.  Also under other license(s) as shown at the Description field.
-Distribution: Sun Java(TM) Enterprise System
-URL: http://www.sun.com
-Group: System Environment/Base
-Source: %{name}-%{version}.tar.gz
-ExclusiveOS: Linux
-BuildRoot: /var/tmp/%{name}-root
-        
-%description
-
-NSPR provides platform independence for non-GUI operating system
-facilities. These facilities include threads, thread synchronization,
-normal file and network I/O, interval timing and calendar time, basic
-memory management (malloc and free) and shared library linking. 
-
-See: http://www.mozilla.org/projects/nspr/about-nspr.html
-
-***** BEGIN LICENSE BLOCK *****
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is the Netscape security libraries.
-
-The Initial Developer of the Original Code is
-Netscape Communications Corporation.
-Portions created by the Initial Developer are Copyright (C) 1994-2000
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-
-***** END LICENSE BLOCK *****
-
-%package devel
-Summary: Development Libraries for the Netscape Portable Runtime
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Header files for doing development with the Netscape Portable Runtime.
-
-Under "MPL/GPL" license.
-
-%prep
-%setup -c
-
-%build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
-cd $RPM_BUILD_ROOT
-tar xvzf $RPM_SOURCE_DIR/%{name}-%{version}.tar.gz
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/libs/js/nsprpub/pkg/solaris/Makefile-devl.com b/libs/js/nsprpub/pkg/solaris/Makefile-devl.com
deleted file mode 100755
index fa47f5b3d7..0000000000
--- a/libs/js/nsprpub/pkg/solaris/Makefile-devl.com
+++ /dev/null
@@ -1,66 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile-devl.com,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MACH = $(shell mach)
-
-PUBLISH_ROOT = $(DIST)
-ifeq ($(MOD_DEPTH),../..)
-ROOT = ROOT
-else
-ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT
-endif
-
-PKGARCHIVE = $(dist_prefix)/pkgarchive
-DATAFILES = copyright
-FILES = $(DATAFILES) pkginfo
-
-PACKAGE = $(shell basename `pwd`)
-
-PRODUCT_VERSION = "$(MOD_VERSION).$(MOD_MINOR).$(MOD_PATCH)$(MOD_BETA)"
-LN = /usr/bin/ln
-
-CLOBBERFILES = $(FILES)
-
-include $(topsrcdir)/config/rules.mk
-
-# vim: ft=make
diff --git a/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ b/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ
deleted file mode 100755
index da52e3ab87..0000000000
--- a/libs/js/nsprpub/pkg/solaris/Makefile-devl.targ
+++ /dev/null
@@ -1,66 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile-devl.targ,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-include $(srcdir)/../proto64.mk
-
-pkginfo: pkginfo.tmpl ../awk_pkginfo
-	$(RM) $@; nawk -f ../awk_pkginfo $(srcdir)/$@.tmpl > $@
-
-pkg: $(PKGARCHIVE)
-	cat $(srcdir)/prototype | sed $(sed_proto64) > prototype
-	cp $(srcdir)/depend .
-	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
-
-$(PKGARCHIVE):
-	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
-
-$(DATAFILES): %: $(srcdir)/../common_files/%
-	$(RM) $@; cp $(srcdir)/../common_files/$@ $@
-
-$(MACHDATAFILES): %: $(srcdir)/../common_files/%_$(MACH)
-	$(RM) $@; cp $(srcdir)/../common_files/$@_$(MACH) $@
-
-clobber clean::
-	-$(RM) $(CLOBBERFILES) $(CLEANFILES)
-
-.PHONY: pkg
diff --git a/libs/js/nsprpub/pkg/solaris/Makefile.com b/libs/js/nsprpub/pkg/solaris/Makefile.com
deleted file mode 100644
index 32640abfe4..0000000000
--- a/libs/js/nsprpub/pkg/solaris/Makefile.com
+++ /dev/null
@@ -1,69 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.com,v 1.8 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MACH = $(shell mach)
-
-PUBLISH_ROOT = $(DIST)
-ifeq ($(MOD_DEPTH),../..)
-ROOT = ROOT
-else
-ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT
-endif
-
-PKGARCHIVE = $(dist_prefix)/pkgarchive
-DATAFILES = copyright
-FILES = $(DATAFILES) pkginfo
-
-PACKAGE = $(shell basename `pwd`)
-
-PRODUCT_VERSION = $(shell grep PR_VERSION $(dist_includedir)/prinit.h \
-		   | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//')
-
-LN = /usr/bin/ln
-CP = /usr/bin/cp
-
-CLOBBERFILES = $(FILES)
-
-include $(topsrcdir)/config/rules.mk
-
-# vim: ft=make
diff --git a/libs/js/nsprpub/pkg/solaris/Makefile.in b/libs/js/nsprpub/pkg/solaris/Makefile.in
deleted file mode 100644
index 1fa7258661..0000000000
--- a/libs/js/nsprpub/pkg/solaris/Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.in,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MOD_DEPTH = ../..
-topsrcdir   = @top_srcdir@
-srcdir	    = @srcdir@
-VPATH	    = @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-abs_dist_libdir := $(shell (cd $(dist_libdir);pwd))
-abs_dist_includedir := $(shell (cd $(dist_includedir);pwd))
-
-%: %.ksh
-	$(RM) $@
-	cp $< $@
-	chmod +x $@
-
-DIRS = \
-	SUNWpr \
-	SUNWprd
-
-include $(srcdir)/Makefile.com
-
-PROTO = \
-	$(ROOT) \
-	$(ROOT)/usr/lib/mps \
-	$(ROOT)/usr/include/mps
-
-ifeq ($(MACH), sparc)
-	PROTO += $(ROOT)/usr/lib/mps/cpu/sparcv8plus
-endif
-
-ifeq ($(USE_64), 1)
-ifeq ($(MACH), sparc)
-# Sparc
-	PROTO += $(ROOT)/usr/lib/mps/sparcv9
-else
-# AMD64
-	PROTO += $(ROOT)/usr/lib/mps/amd64
-endif
-	abs_dist64_libdir = $(abs_dist_libdir)
-	abs_dist32_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
-	abs_dist64_includedir = $(abs_dist_includedir)
-	abs_dist32_includedir = $(shell echo $(abs_dist_includedir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
-else
-	abs_dist32_libdir = $(abs_dist_libdir)
-	abs_dist64_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
-	abs_dist32_includedir = $(abs_dist_includedir)
-	abs_dist64_includedir = $(shell echo $(abs_dist_includedir) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
-endif
-
-awk_pkginfo: bld_awk_pkginfo
-	./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
-
-all:: awk_pkginfo $(PROTO)
-publish: awk_pkginfo $(PROTO)
-	+$(LOOP_OVER_DIRS)
-
-clean clobber::
-	$(RM) awk_pkginfo bld_awk_pkginfo
-	$(RM) -r $(ROOT)
-
-$(ROOT):
-	mkdir -p $@
-
-$(ROOT)/usr/lib/mps/sparcv9:
-	mkdir -p $@
-	$(CP) -r $(abs_dist64_libdir)/*.so $@
-$(ROOT)/usr/lib/mps/amd64:
-	mkdir -p $@
-	$(CP) -r $(abs_dist64_libdir)/*.so $@
-$(ROOT)/usr/lib/mps:
-	mkdir -p $@
-	$(CP) -r $(abs_dist32_libdir)/*.so $@
-$(ROOT)/usr/lib/mps/cpu/sparcv8plus:
-	mkdir -p $@
-	$(CP) -r $(abs_dist32_libdir)/cpu/sparcv8plus/*.so $@
-$(ROOT)/usr/include/mps:
-	mkdir -p $@
-	$(CP) -r $(abs_dist32_includedir)/* $@
diff --git a/libs/js/nsprpub/pkg/solaris/Makefile.targ b/libs/js/nsprpub/pkg/solaris/Makefile.targ
deleted file mode 100644
index ca17a803d5..0000000000
--- a/libs/js/nsprpub/pkg/solaris/Makefile.targ
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.targ,v 1.6 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-include $(srcdir)/../proto64.mk
-
-pkginfo: pkginfo.tmpl ../awk_pkginfo
-	$(RM) $@; nawk -f ../awk_pkginfo $< > $@
-
-pkg: $(PKGARCHIVE) prototype_$(MACH)
-	cp $(srcdir)/prototype_com .
-	cat $(srcdir)/prototype_$(MACH) | sed $(sed_proto64) > prototype_$(MACH)
-	cp $(srcdir)/depend .
-	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
-
-$(PKGARCHIVE):
-	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
-
-$(DATAFILES): %: $(srcdir)/../common_files/%
-	$(RM) $@; cp $(srcdir)/../common_files/$@ $@
-
-clobber clean::
-	-$(RM) $(CLOBBERFILES) $(CLEANFILES)
-
-.PHONY: pkg
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty b/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty b/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in b/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in
deleted file mode 100644
index 3cd5669d4f..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.in,v 1.2 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MOD_DEPTH = ../../..
-topsrcdir   = @top_srcdir@
-srcdir	    = @srcdir@
-VPATH	    = @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(srcdir)/../Makefile.com
-
-DATAFILES += 
-
-all:: $(FILES)
-publish:: all pkg
-
-include $(srcdir)/../Makefile.targ
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/depend b/libs/js/nsprpub/pkg/solaris/SUNWpr/depend
deleted file mode 100644
index f5b1b70581..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/depend
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#	$Id: depend,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl b/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl
deleted file mode 100644
index 96520510ef..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: pkginfo.tmpl,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWpr"
-NAME="Netscape Portable Runtime"
-ARCH="ISA"
-VERSION="NSPRVERS,REV=0.0.0"
-SUNW_PRODNAME="Netscape Portable Runtime"
-SUNW_PRODVERS="NSPRVERS"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Netscape Portable Runtime Interface"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com b/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com
deleted file mode 100644
index 881fdb59ef..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_com
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: prototype_com,v 1.4 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i copyright
-i pkginfo
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWpr
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/mps 755 root bin
-d none usr/lib/mps/secv1 755 root bin
-f none usr/lib/mps/libnspr4.so 755 root bin
-f none usr/lib/mps/libplc4.so 755 root bin
-f none usr/lib/mps/libplds4.so 755 root bin
-s none usr/lib/mps/secv1/libnspr4.so=../libnspr4.so
-s none usr/lib/mps/secv1/libplc4.so=../libplc4.so
-s none usr/lib/mps/secv1/libplds4.so=../libplds4.so
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386 b/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386
deleted file mode 100644
index 9cbb7ed16e..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_i386
+++ /dev/null
@@ -1,77 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: prototype_i386,v 1.4 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWpr
-#
-#64#s none usr/lib/mps/64=amd64
-#64#s none usr/lib/mps/secv1/64=amd64
-#64#d none usr/lib/mps/amd64 755 root bin
-#64#d none usr/lib/mps/secv1/amd64 755 root bin
-#64#f none usr/lib/mps/amd64/libnspr4.so 755 root bin
-#64#f none usr/lib/mps/amd64/libplc4.so 755 root bin
-#64#f none usr/lib/mps/amd64/libplds4.so 755 root bin
-#64#s none usr/lib/mps/secv1/amd64/libnspr4.so=../../amd64/libnspr4.so
-#64#s none usr/lib/mps/secv1/amd64/libplc4.so=../../amd64/libplc4.so
-#64#s none usr/lib/mps/secv1/amd64/libplds4.so=../../amd64/libplds4.so
-
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc b/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc
deleted file mode 100644
index c141e6c89f..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWpr/prototype_sparc
+++ /dev/null
@@ -1,83 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: prototype_sparc,v 1.4 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWpr
-#
-d none usr/lib/mps/cpu 755 root bin
-d none usr/lib/mps/cpu/sparcv8plus 755 root bin
-d none usr/lib/mps/secv1/cpu 755 root bin
-d none usr/lib/mps/secv1/cpu/sparcv8plus 755 root bin
-f none usr/lib/mps/cpu/sparcv8plus/libnspr_flt4.so 755 root bin
-s none usr/lib/mps/secv1/cpu/sparcv8plus/libnspr_flt4.so=../../../cpu/sparcv8plus/libnspr_flt4.so
-#64#s none usr/lib/mps/64=sparcv9
-#64#s none usr/lib/mps/secv1/64=sparcv9
-#64#d none usr/lib/mps/sparcv9 755 root bin
-#64#d none usr/lib/mps/secv1/sparcv9 755 root bin
-#64#f none usr/lib/mps/sparcv9/libnspr4.so 755 root bin
-#64#f none usr/lib/mps/sparcv9/libplc4.so 755 root bin
-#64#f none usr/lib/mps/sparcv9/libplds4.so 755 root bin
-#64#s none usr/lib/mps/secv1/sparcv9/libnspr4.so=../../sparcv9/libnspr4.so
-#64#s none usr/lib/mps/secv1/sparcv9/libplc4.so=../../sparcv9/libplc4.so
-#64#s none usr/lib/mps/secv1/sparcv9/libplds4.so=../../sparcv9/libplds4.so
-
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in b/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in
deleted file mode 100755
index 3c6d0594c0..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWprd/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: Makefile.in,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-MOD_DEPTH = ../../..
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(srcdir)/../Makefile-devl.com
-
-DATAFILES += 
-
-all:: $(FILES)
-publish:: all pkg
-
-include $(srcdir)/../Makefile-devl.targ
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprd/depend b/libs/js/nsprpub/pkg/solaris/SUNWprd/depend
deleted file mode 100755
index fee5a2a284..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWprd/depend
+++ /dev/null
@@ -1,59 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#	$Id: depend,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWpr	Netscape Portable Runtime
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl b/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl
deleted file mode 100755
index 6eea9fe876..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: pkginfo.tmpl,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWprd"
-NAME="Netscape Portable Runtime Development"
-ARCH="ISA"
-VERSION="NSPRVERS,REV=0.0.0"
-SUNW_PRODNAME="Netscape Portable Runtime Development"
-SUNW_PRODVERS="NSPRVERS"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Netscape Portable Runtime Interface Files for Development"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype b/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype
deleted file mode 100755
index 3574dfe400..0000000000
--- a/libs/js/nsprpub/pkg/solaris/SUNWprd/prototype
+++ /dev/null
@@ -1,114 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident  "$Id: prototype,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>        # where to find pkg objects
-#!include <filename>                    # include another 'prototype' file
-#!default <mode> <owner> <group>        # default used if not specified on entry
-#!<param>=<value>                       # puts parameter in pkg environment
-
-# packaging files
-i copyright
-i pkginfo
-i depend
-#
-# source locations relative to .h 0644 root bine prototype file
-#
-# SUNWprd
-#
-d none usr 0755 root sys
-d none usr/include 0755 root bin
-d none usr/include/mps 0755 root bin
-d none usr/include/mps/obsolete 0755 root bin
-f none usr/include/mps/obsolete/protypes.h 0644 root bin
-f none usr/include/mps/prcpucfg.h 0644 root bin
-f none usr/include/mps/nspr.h 0644 root bin
-f none usr/include/mps/pratom.h 0644 root bin
-f none usr/include/mps/prbit.h 0644 root bin
-f none usr/include/mps/prclist.h 0644 root bin
-f none usr/include/mps/prcmon.h 0644 root bin
-f none usr/include/mps/prcountr.h 0644 root bin
-f none usr/include/mps/prcvar.h 0644 root bin
-f none usr/include/mps/prdtoa.h 0644 root bin
-f none usr/include/mps/prenv.h 0644 root bin
-f none usr/include/mps/prerr.h 0644 root bin
-f none usr/include/mps/prerror.h 0644 root bin
-f none usr/include/mps/prinet.h 0644 root bin
-f none usr/include/mps/prinit.h 0644 root bin
-f none usr/include/mps/prinrval.h 0644 root bin
-f none usr/include/mps/prio.h 0644 root bin
-f none usr/include/mps/pripcsem.h 0644 root bin
-f none usr/include/mps/prlink.h 0644 root bin
-f none usr/include/mps/prlock.h 0644 root bin
-f none usr/include/mps/prlog.h 0644 root bin
-f none usr/include/mps/prlong.h 0644 root bin
-f none usr/include/mps/prmem.h 0644 root bin
-f none usr/include/mps/prmon.h 0644 root bin
-f none usr/include/mps/prmwait.h 0644 root bin
-f none usr/include/mps/prnetdb.h 0644 root bin
-f none usr/include/mps/prolock.h 0644 root bin
-f none usr/include/mps/prpdce.h 0644 root bin
-f none usr/include/mps/prprf.h 0644 root bin
-f none usr/include/mps/prproces.h 0644 root bin
-f none usr/include/mps/prrng.h 0644 root bin
-f none usr/include/mps/prrwlock.h 0644 root bin
-f none usr/include/mps/prshm.h 0644 root bin
-f none usr/include/mps/prshma.h 0644 root bin
-f none usr/include/mps/prsystem.h 0644 root bin
-f none usr/include/mps/prthread.h 0644 root bin
-f none usr/include/mps/prtime.h 0644 root bin
-f none usr/include/mps/prtpool.h 0644 root bin
-f none usr/include/mps/prtrace.h 0644 root bin
-f none usr/include/mps/prtypes.h 0644 root bin
-f none usr/include/mps/prvrsion.h 0644 root bin
-f none usr/include/mps/prwin16.h 0644 root bin
-f none usr/include/mps/plarenas.h 0644 root bin
-f none usr/include/mps/plarena.h 0644 root bin
-f none usr/include/mps/plbase64.h 0644 root bin
-f none usr/include/mps/plerror.h 0644 root bin
-f none usr/include/mps/plgetopt.h 0644 root bin
-f none usr/include/mps/plhash.h 0644 root bin
-f none usr/include/mps/plresolv.h 0644 root bin
-f none usr/include/mps/plstr.h 0644 root bin
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh b/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh
deleted file mode 100644
index 11063c8eb2..0000000000
--- a/libs/js/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/ksh -p
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident	"$Id: bld_awk_pkginfo.ksh,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-# Simple script which builds the awk_pkginfo awk script.  This awk script
-# is used to convert the pkginfo.tmpl files into pkginfo files
-# for the build.
-#
-
-usage()
-{
-   cat <<-EOF
-usage: bld_awk_pkginfo -p <prodver> -m <mach> -o <awk_script> [-v <version>]
-EOF
-}
-
-#
-# Awk strings
-#
-# two VERSION patterns: one for Dewey decimal, one for Dewey plus ,REV=n
-# the first has one '=' the second has two or more '='
-#
-VERSION1="VERSION=[^=]*$"
-VERSION2="VERSION=[^=]*=.*$"
-PRODVERS="^SUNW_PRODVERS="
-ARCH='ARCH=\"ISA\"'
-
-#
-# parse command line
-#
-mach=""
-prodver=""
-awk_script=""
-version="NSPRVERS"
-
-while getopts o:p:m:v: c
-do
-   case $c in
-   o)
-      awk_script=$OPTARG
-      ;;
-   m)
-      mach=$OPTARG
-      ;;
-   p)
-      prodver=$OPTARG
-      ;;
-   v)
-      version=$OPTARG
-      ;;
-   \?)
-      usage
-      exit 1
-      ;;
-   esac
-done
-
-if [[ ( -z $prodver ) || ( -z $mach ) || ( -z $awk_script ) ]]
-then
-   usage
-   exit 1
-fi
-
-if [[ -f $awk_script ]]
-then
-	rm -f $awk_script
-fi
-
-#
-# Build REV= field based on date
-#
-rev=$(date "+%Y.%m.%d.%H.%M")
-
-#
-# Build awk script which will process all the
-# pkginfo.tmpl files.
-#
-# the first VERSION pattern is replaced with a leading quotation mark
-#
-rm -f $awk_script
-cat << EOF > $awk_script
-/$VERSION1/ {
-      sub(/\=[^=]*$/,"=\"$rev\"")
-      print
-      next
-   }
-/$VERSION2/ {
-      sub(/\=[^=]*$/,"=$rev\"")
-      sub(/NSPRVERS/,"$version")
-      print
-      next
-   }
-/$PRODVERS/ { 
-      printf "SUNW_PRODVERS=\"%s\"\n", "$prodver" 
-      next
-   }
-/$ARCH/ {
-      printf "ARCH=\"%s\"\n", "$mach"
-      next
-   }
-{ print }
-EOF
diff --git a/libs/js/nsprpub/pkg/solaris/common_files/copyright b/libs/js/nsprpub/pkg/solaris/common_files/copyright
deleted file mode 100644
index 21d2e6ffdd..0000000000
--- a/libs/js/nsprpub/pkg/solaris/common_files/copyright
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-Use is subject to license terms.
-
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this package are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this package except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is the Netscape Portable Runtime (NSPR).
-
-The Initial Developer of the Original Code is
-Netscape Communications Corporation.
-Portions created by the Initial Developer are Copyright (C) 1998-2000
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-
diff --git a/libs/js/nsprpub/pkg/solaris/proto64.mk b/libs/js/nsprpub/pkg/solaris/proto64.mk
deleted file mode 100644
index c14dc098de..0000000000
--- a/libs/js/nsprpub/pkg/solaris/proto64.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# 
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-#
-#ident  "$Id: proto64.mk,v 1.3 2005/02/25 20:20:52 christophe.ravel.bugs%sun.com Exp $"
-#
-
-ifeq ($(USE_64), 1)
-  # Remove 64 tag
-  sed_proto64='s/\#64\#//g'
-else
-  # Strip 64 lines
-  sed_proto64='/\#64\#/d'
-endif
diff --git a/libs/js/nsprpub/pr/.cvsignore b/libs/js/nsprpub/pr/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/Makefile.in b/libs/js/nsprpub/pr/Makefile.in
deleted file mode 100644
index e060f19574..0000000000
--- a/libs/js/nsprpub/pr/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-DIRS = include src
-
-include $(topsrcdir)/config/rules.mk
diff --git a/libs/js/nsprpub/pr/include/.cvsignore b/libs/js/nsprpub/pr/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/include/MANIFEST b/libs/js/nsprpub/pr/include/MANIFEST
deleted file mode 100644
index 634968effd..0000000000
--- a/libs/js/nsprpub/pr/include/MANIFEST
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nspr.h
-pratom.h
-prbit.h
-prclist.h
-prcmon.h
-prcountr.h
-prcvar.h
-prdtoa.h
-prenv.h
-prerr.h
-prerror.h
-prinet.h
-prinit.h
-prinrval.h
-prio.h
-pripcsem.h
-prlink.h
-prlock.h
-prlog.h
-prlong.h
-prmem.h
-prmon.h
-prmwait.h
-prnetdb.h
-prolock.h
-prpdce.h
-prprf.h
-prproces.h
-prrng.h
-prrwlock.h
-prshm.h
-prshma.h
-prsystem.h
-prthread.h
-prtime.h
-prtpool.h
-prtrace.h
-prtypes.h
-prvrsion.h
-prwin16.h
-
-obsolete/protypes.h
-obsolete/prsem.h
-obsolete/probslet.h
-
-private/prpriv.h
-private/pprio.h
-private/pprthred.h
diff --git a/libs/js/nsprpub/pr/include/Makefile.in b/libs/js/nsprpub/pr/include/Makefile.in
deleted file mode 100644
index 5dc9686dee..0000000000
--- a/libs/js/nsprpub/pr/include/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-DIRS = md private obsolete
-
-include $(topsrcdir)/config/config.mk
-
-HEADERS = $(wildcard $(srcdir)/*.h)
-
-RELEASE_HEADERS = $(HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(RELEASE_HEADERS)
-	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir)
diff --git a/libs/js/nsprpub/pr/include/gencfg.c b/libs/js/nsprpub/pr/include/gencfg.c
deleted file mode 100644
index e67c13098d..0000000000
--- a/libs/js/nsprpub/pr/include/gencfg.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-
-#if defined(sgi)
-#ifndef IRIX
-	error - IRIX is not defined
-#endif
-#endif
-
-#if defined(__sun)
-#if defined(__svr4) || defined(__svr4__) || defined(__SVR4)
-#ifndef SOLARIS
-	error - SOLARIS is not defined
-#endif
-#else
-#ifndef SUNOS4
-	error - SUNOS4 is not defined
-#endif
-#endif
-#endif
-
-#if defined(__hpux)
-#ifndef HPUX
-	error - HPUX is not defined
-#endif
-#endif
-
-#if defined(__alpha) 
-#if !(defined(_WIN32)) && !(defined(OSF1)) && !(defined(__linux)) && !(defined(__FreeBSD__))
-	error - None of OSF1, _WIN32, __linux, or __FreeBSD__ is defined
-#endif
-#endif
-
-#if defined(_IBMR2)
-#ifndef AIX
-	error - AIX is not defined
-#endif
-#endif
-
-#if defined(linux)
-#ifndef LINUX
-	error - LINUX is not defined
-#endif
-#endif
-
-#if defined(bsdi)
-#ifndef BSDI
-	error - BSDI is not defined
-#endif
-#endif
-
-#if defined(M_UNIX)
-#ifndef SCO
-      error - SCO is not defined
-#endif
-#endif
-#if !defined(M_UNIX) && defined(_USLC_)
-#ifndef UNIXWARE
-      error - UNIXWARE is not defined
-#endif
-#endif
-
-#if defined(__APPLE__)
-#ifndef DARWIN
-      error - DARWIN is not defined
-#endif
-#endif
-
-#if defined(__NeXT__)
-#ifndef NEXTSTEP
-      error - NEXTSTEP is not defined
-#endif
-#endif
-
-/************************************************************************/
-
-/* Generate cpucfg.h */
-
-#ifdef XP_PC
-#ifdef WIN32
-#define INT64	_PRInt64
-#else
-#define INT64	long
-#endif
-#else
-#if defined(HPUX) || defined(NECSVR4) || defined(SCO) || defined(UNIXWARE) || defined (NCR)
-#define INT64	long
-#else
-#define INT64	long long
-#endif
-#endif
-
-struct align_short {
-    char c;
-    short a;
-};
-struct align_int {
-    char c;
-    int a;
-};
-struct align_long {
-    char c;
-    long a;
-};
-struct align_PRInt64 {
-    char c;
-    INT64 a;
-};
-struct align_fakelonglong {
-    char c;
-    struct {
-	long hi, lo;
-    } a;
-};
-struct align_float {
-    char c;
-    float a;
-};
-struct align_double {
-    char c;
-    double a;
-};
-struct align_pointer {
-    char c;
-    void *a;
-};
-
-#define ALIGN_OF(type) \
-    (((char*)&(((struct align_##type *)0)->a)) - ((char*)0))
-
-int bpb;
-
-/* Used if shell doesn't support redirection. By default, assume it does. */
-FILE *stream;
-
-static int Log2(int n)
-{
-    int log2 = 0;
-
-    if (n & (n-1))
-	log2++;
-    if (n >> 16)
-	log2 += 16, n >>= 16;
-    if (n >> 8)
-	log2 += 8, n >>= 8;
-    if (n >> 4)
-	log2 += 4, n >>= 4;
-    if (n >> 2)
-	log2 += 2, n >>= 2;
-    if (n >> 1)
-	log2++;
-    return log2;
-}
-
-/* We assume that int's are 32 bits */
-static void do64(void)
-{
-    union {
-	int i;
-	char c[4];
-    } u;
-
-    u.i = 0x01020304;
-    if (u.c[0] == 0x01) {
-	fprintf(stream, "#undef  IS_LITTLE_ENDIAN\n");
-	fprintf(stream, "#define IS_BIG_ENDIAN 1\n\n");
-    } else {
-	fprintf(stream, "#define IS_LITTLE_ENDIAN 1\n");
-	fprintf(stream, "#undef  IS_BIG_ENDIAN\n\n");
-    }
-}
-
-static void do32(void)
-{
-    union {
-	long i;
-	char c[4];
-    } u;
-
-    u.i = 0x01020304;
-    if (u.c[0] == 0x01) {
-	fprintf(stream, "#undef  IS_LITTLE_ENDIAN\n");
-	fprintf(stream, "#define IS_BIG_ENDIAN 1\n\n");
-    } else {
-	fprintf(stream, "#define IS_LITTLE_ENDIAN 1\n");
-	fprintf(stream, "#undef  IS_BIG_ENDIAN\n\n");
-    }
-}
-
-/*
-** Concievably this could actually be used; but there is lots of code out
-** there with and's and shift's in it that assumes a byte is 8 bits, so
-** forget about porting THIS code to those non 8 bit byte machines.
-*/
-static void BitsPerByte(void)
-{
-    bpb = 8;
-}
-
-int main(int argc, char **argv)
-{
-    BitsPerByte();
-
-    /* If we got a command line argument, try to use it as the stream. */
-    ++argv;
-    if(*argv) {
-        if(!(stream = fopen ( *argv, "wt" ))) {
-            fprintf(stderr, "Could not write to output file %s.\n", *argv);
-            return 1;
-        }
-    } else {
-		stream = stdout;
-	}
-
-    fprintf(stream, "#ifndef nspr_cpucfg___\n");
-    fprintf(stream, "#define nspr_cpucfg___\n\n");
-
-    fprintf(stream, "/* AUTOMATICALLY GENERATED - DO NOT EDIT */\n\n");
-
-    if (sizeof(long) == 8) {
-	do64();
-    } else {
-	do32();
-    }
-    fprintf(stream, "#define PR_BYTES_PER_BYTE   %d\n", sizeof(char));
-    fprintf(stream, "#define PR_BYTES_PER_SHORT  %d\n", sizeof(short));
-    fprintf(stream, "#define PR_BYTES_PER_INT    %d\n", sizeof(int));
-    fprintf(stream, "#define PR_BYTES_PER_INT64  %d\n", 8);
-    fprintf(stream, "#define PR_BYTES_PER_LONG   %d\n", sizeof(long));
-    fprintf(stream, "#define PR_BYTES_PER_FLOAT  %d\n", sizeof(float));
-    fprintf(stream, "#define PR_BYTES_PER_DOUBLE %d\n\n", sizeof(double));
-
-    fprintf(stream, "#define PR_BITS_PER_BYTE    %d\n", bpb);
-    fprintf(stream, "#define PR_BITS_PER_SHORT   %d\n", bpb * sizeof(short));
-    fprintf(stream, "#define PR_BITS_PER_INT     %d\n", bpb * sizeof(int));
-    fprintf(stream, "#define PR_BITS_PER_INT64   %d\n", bpb * 8);
-    fprintf(stream, "#define PR_BITS_PER_LONG    %d\n", bpb * sizeof(long));
-    fprintf(stream, "#define PR_BITS_PER_FLOAT   %d\n", bpb * sizeof(float));
-    fprintf(stream, "#define PR_BITS_PER_DOUBLE  %d\n\n", 
-            bpb * sizeof(double));
-
-    fprintf(stream, "#define PR_BITS_PER_BYTE_LOG2   %d\n", Log2(bpb));
-    fprintf(stream, "#define PR_BITS_PER_SHORT_LOG2  %d\n", 
-            Log2(bpb * sizeof(short)));
-    fprintf(stream, "#define PR_BITS_PER_INT_LOG2    %d\n", 
-            Log2(bpb * sizeof(int)));
-    fprintf(stream, "#define PR_BITS_PER_INT64_LOG2  %d\n", 6);
-    fprintf(stream, "#define PR_BITS_PER_LONG_LOG2   %d\n", 
-            Log2(bpb * sizeof(long)));
-    fprintf(stream, "#define PR_BITS_PER_FLOAT_LOG2  %d\n", 
-            Log2(bpb * sizeof(float)));
-    fprintf(stream, "#define PR_BITS_PER_DOUBLE_LOG2 %d\n\n", 
-            Log2(bpb * sizeof(double)));
-
-    fprintf(stream, "#define PR_ALIGN_OF_SHORT   %d\n", ALIGN_OF(short));
-    fprintf(stream, "#define PR_ALIGN_OF_INT     %d\n", ALIGN_OF(int));
-    fprintf(stream, "#define PR_ALIGN_OF_LONG    %d\n", ALIGN_OF(long));
-    if (sizeof(INT64) < 8) {
-	/* this machine doesn't actually support PRInt64's */
-	fprintf(stream, "#define PR_ALIGN_OF_INT64   %d\n", 
-                ALIGN_OF(fakelonglong));
-    } else {
-	fprintf(stream, "#define PR_ALIGN_OF_INT64   %d\n", ALIGN_OF(PRInt64));
-    }
-    fprintf(stream, "#define PR_ALIGN_OF_FLOAT   %d\n", ALIGN_OF(float));
-    fprintf(stream, "#define PR_ALIGN_OF_DOUBLE  %d\n", ALIGN_OF(double));
-    fprintf(stream, "#define PR_ALIGN_OF_POINTER %d\n\n", ALIGN_OF(pointer));
-
-    fprintf(stream, "#endif /* nspr_cpucfg___ */\n");
-    fclose(stream);
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/include/md/.cvsignore b/libs/js/nsprpub/pr/include/md/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/include/md/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/include/md/Makefile.in b/libs/js/nsprpub/pr/include/md/Makefile.in
deleted file mode 100644
index 36df758ab4..0000000000
--- a/libs/js/nsprpub/pr/include/md/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-# The .cfg files need to be exported and installed to support
-# cross-compilation.
-CONFIGS = $(wildcard $(srcdir)/*.cfg)
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(MDCPUCFG_H)
-	$(INSTALL) -m 444 $(CONFIGS) $(dist_includedir)/md
-	$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(dist_includedir)
-ifeq ($(OS_ARCH),OpenVMS)
-# On OpenVMS mv updates the file's modified time, so we create a hard link.
-	cd $(dist_includedir); \
-	if test ! -f prcpucfg.h; then \
-	    dcl set file /enter=prcpucfg.h $(MDCPUCFG_H); \
-	fi
-else
-	mv -f $(dist_includedir)/$(MDCPUCFG_H) $(dist_includedir)/prcpucfg.h
-endif
-
-install::
-#	$(NSINSTALL) -D $(DESTDIR)$(includedir)/md
-#	cp $(srcdir)/$(MDCPUCFG_H) $(DESTDIR)$(includedir)/prcpucfg.h
-#	$(NSINSTALL) -t -m 644 $(CONFIGS) $(DESTDIR)$(includedir)/md
-
-release:: export
-	@echo "Copying machine-dependent prcpucfg.h"
-	@if test -z "$(BUILD_NUMBER)"; then \
-		echo "BUILD_NUMBER must be defined"; \
-		false; \
-	fi
-	@if test ! -d $(RELEASE_INCLUDE_DIR); then \
-		rm -rf $(RELEASE_INCLUDE_DIR); \
-		$(NSINSTALL) -D $(RELEASE_INCLUDE_DIR);\
-	fi
-	cp $(srcdir)/$(MDCPUCFG_H) $(RELEASE_INCLUDE_DIR)/prcpucfg.h
diff --git a/libs/js/nsprpub/pr/include/md/_aix.h b/libs/js/nsprpub/pr/include/md/_aix.h
deleted file mode 100644
index 855cb247b3..0000000000
--- a/libs/js/nsprpub/pr/include/md/_aix.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_aix_defs_h___
-#define nspr_aix_defs_h___
-
-#include <sys/types.h>
-#if defined(_PR_PTHREADS) || defined(PTHREADS_USER)
-#include <pthread.h>
-#endif
-
-/*
- * To pick up fd_set and the poll events.
- */
-#include <sys/select.h>
-#include <sys/poll.h>
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH          "aix"
-#define _PR_SI_SYSNAME		    "AIX"
-#define _PR_SI_ARCHITECTURE	    "rs6000"
-#define PR_DLL_SUFFIX		    ".so"
-
-#define _PR_VMBASE	 	        0x30000000
-#define _PR_STACK_VMBASE	    0x50000000
-#define _MD_DEFAULT_STACK_SIZE	(2*65536L)
-#define _MD_MINIMUM_STACK_SIZE	(2*65536L)
-#define _MD_MMAP_FLAGS		    MAP_PRIVATE
-
-#define NEED_TIME_R
-#undef  HAVE_STACK_GROWING_UP
-#undef	HAVE_WEAK_IO_SYMBOLS
-#undef	HAVE_WEAK_MALLOC_SYMBOLS
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define _PR_HAVE_SOCKADDR_LEN
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-#endif
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-#define _PR_ACCEPT_INHERIT_NONBLOCK
-
-/* Timer operations */
-#if defined(AIX_TIMERS)
-extern PRIntervalTime _MD_AixGetInterval(void);
-#define _MD_GET_INTERVAL _MD_AixGetInterval
-
-extern PRIntervalTime _MD_AixIntervalPerSec(void);
-#define _MD_INTERVAL_PER_SEC _MD_AixIntervalPerSec
-
-#else  /* defined(AIX_TIMERS) */
-#define _MD_GET_INTERVAL        _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC    _PR_UNIX_TicksPerSecond
-#endif  /* defined(AIX_TIMERS) */
-
-#ifdef AIX_HAVE_ATOMIC_OP_H
-/* The atomic operations */
-#include <sys/atomic_op.h>
-#define _PR_HAVE_ATOMIC_OPS
-#ifndef IS_64
-#define _PR_HAVE_ATOMIC_CAS
-#endif
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(val)   ((PRInt32)fetch_and_add((atomic_p)val, 1) + 1)
-#define _MD_ATOMIC_ADD(ptr, val)   ((PRInt32)fetch_and_add((atomic_p)ptr, val) + val)
-#define _MD_ATOMIC_DECREMENT(val)   ((PRInt32)fetch_and_add((atomic_p)val, -1) - 1)
-#define _MD_ATOMIC_SET(val, newval) _AIX_AtomicSet(val, newval)
-#endif /* AIX_HAVE_ATOMIC_OP_H */
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _MD_GET_SP(_t)				(_t)->md.jb[3]
-#define _MD_SET_THR_SP(_t, _sp)		((_t)->md.jb[3] = (int) (_sp - 2 * 64))
-#define PR_NUM_GCREGS				_JBLEN
-
-#define CONTEXT(_th) 				((_th)->md.jb)
-#define SAVE_CONTEXT(_th)			_setjmp(CONTEXT(_th))
-#define GOTO_CONTEXT(_th)			_longjmp(CONTEXT(_th), 1)
-
-#ifdef PTHREADS_USER
-#include "_nspr_pthread.h"
-#else
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-    PR_BEGIN_MACRO				      \
-        *status = PR_TRUE;              \
-	if (setjmp(CONTEXT(_thread))) {	\
-	    (*_main)();			\
-	}				\
-	_MD_GET_SP(_thread) = (int) (_sp - 2 * 64);		\
-    PR_END_MACRO
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode; \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    longjmp(CONTEXT(_thread), 1); \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    jmp_buf jb;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#if !defined(_PR_PTHREADS)
-#define _MD_INIT_LOCKS()
-#endif
-
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_EARLY_INIT          	_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-#endif /* PTHREADS_USER */
-
-#ifdef AIX_RENAME_SELECT
-#define _MD_SELECT	select
-#define _MD_POLL	poll
-#endif
-
-extern void _MD_aix_map_sendfile_error(int err);
-
-#endif /* nspr_aix_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_aix32.cfg b/libs/js/nsprpub/pr/include/md/_aix32.cfg
deleted file mode 100644
index 1949862ae6..0000000000
--- a/libs/js/nsprpub/pr/include/md/_aix32.cfg
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef AIX
-#define AIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2	5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-/* used by protypes.h only */
-#define _PR_AIX_HAVE_BSD_INT_TYPES
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_aix64.cfg b/libs/js/nsprpub/pr/include/md/_aix64.cfg
deleted file mode 100644
index e2c9dc424a..0000000000
--- a/libs/js/nsprpub/pr/include/md/_aix64.cfg
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef AIX
-#define AIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2	6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 8
-
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-/* used by protypes.h only */
-#define _PR_AIX_HAVE_BSD_INT_TYPES
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_beos.cfg b/libs/js/nsprpub/pr/include/md/_beos.cfg
deleted file mode 100644
index d15cf04494..0000000000
--- a/libs/js/nsprpub/pr/include/md/_beos.cfg
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_BEOS
-#define XP_BEOS
-#undef XP_UNIX
-#endif
-
-#ifndef BEOS
-#define BEOS
-#endif
-
-#define PR_AF_INET6 5  /* same as AF_INET6 */
-
-#ifdef __powerpc__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#else
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define	HAVE_LONG_LONG
-/*
- * XXX These two macros need to be investigated for different architectures.
- */
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_beos.h b/libs/js/nsprpub/pr/include/md/_beos.h
deleted file mode 100644
index 38dd5fb8a4..0000000000
--- a/libs/js/nsprpub/pr/include/md/_beos.h
+++ /dev/null
@@ -1,613 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_beos_defs_h___
-#define nspr_beos_defs_h___
-
-#include "prtypes.h"
-#include "prio.h"
-#include "prthread.h"
-#include "prproces.h"
-#include "prmem.h"
-#include "obsolete/prsem.h"
-#include <errno.h>
-
-#include <support/SupportDefs.h>
-#include <kernel/OS.h>
-#include <dirent.h>
-
-/*
- * Internal configuration macros
- */
-
-#ifdef BONE_VERSION
-#define _PR_HAVE_SOCKADDR_LEN
-#endif
-
-#define PR_LINKER_ARCH	"beos"
-#define _PR_SI_SYSNAME  "BEOS"
-#ifdef __powerpc__
-#define _PR_SI_ARCHITECTURE "ppc"
-#else
-#define _PR_SI_ARCHITECTURE "x86"
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef	HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define _PR_NO_CLOCK_TIMER
-
-/*
- * The Atomic operations
- */
-
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC _MD_AtomicInit
-#define _MD_ATOMIC_INCREMENT _MD_AtomicIncrement
-#define _MD_ATOMIC_ADD _MD_AtomicAdd
-#define _MD_ATOMIC_DECREMENT _MD_AtomicDecrement
-#define _MD_ATOMIC_SET _MD_AtomicSet
-
-#define HAVE_CVAR_BUILT_ON_SEM
-#define _PR_GLOBAL_THREADS_ONLY
-#define _PR_BTHREADS
-#define _PR_NEED_FAKE_POLL
-#define _PR_HAVE_PEEK_BUFFER
-#define _PR_PEEK_BUFFER_MAX (16 * 1024)
-#define _PR_FD_NEED_EMULATE_MSG_PEEK(fd) 1
-#define _PR_CONNECT_DOES_NOT_BIND
-#define _PR_HAVE_O_APPEND
-
-/* Define threading functions and objects as native BeOS */
-struct _MDThread {
-    thread_id	tid;	/* BeOS thread handle */
-	sem_id		joinSem;	/* sems used to synchronzie joining */
-	PRBool	is_joining;	/* TRUE if someone is currently waiting to
-						   join this thread */
-};
-
-struct _MDThreadStack {
-    PRInt8	notused;
-};
-
-/*
- * Lock and Semaphore related definitions
- */
-
-struct _MDLock {
-    sem_id semaphoreID;
-    int32  benaphoreCount;
-};
-
-struct _MDCVar {
-    sem_id sem1;
-    sem_id sem2;
-    int16  count;
-};
-
-struct _MDSemaphore {
-    sem_id sid;
-};
-
-/*
-** CPU-related definitions
-*/
-struct _MDCPU {
-    int8		unused;
-};
-
-/*
-** Process-related definitions
-*/
-struct _MDProcess {
-    pid_t pid;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
-** File- and directory-related definitions
-*/
-
-#ifndef BONE_VERSION
-#define BE_SOCK_SHUTDOWN_READ	0x01
-#define BE_SOCK_SHUTDOWN_WRITE	0x02
-#endif
-
-struct _MDFileDesc {
-    PRInt32	osfd;
-    PRInt32	sock_state;
-    PRBool	accepted_socket;
-    PRNetAddr	peer_addr;
-#ifndef BONE_VERSION
-    PRBool	connectValueValid;
-    int		connectReturnValue;
-    int		connectReturnError;
-#endif
-};
-
-struct _MDDir {
-    DIR		*d;
-};
-
-#define PR_DIRECTORY_SEPARATOR		'/'
-#define PR_DIRECTORY_SEPARATOR_STR	"/"
-#define PR_PATH_SEPARATOR		':'
-#define PR_PATH_SEPARATOR_STR		":"
-
-#define GETTIMEOFDAY(tp)	gettimeofday((tp), NULL)
-
-/* --- Memory-mapped files stuff --- not implemented on BeOS */
-
-struct _MDFileMap {
-    PRInt8 unused;
-};
-
-/*
- * Network related definitions.
- */
-
-#ifndef BONE_VERSION
-#define IPPROTO_IP 0
-#define AF_UNIX 2
-#define TCP_NODELAY SO_NONBLOCK
-#define SO_LINGER -1
-#define SO_ERROR 4
-#endif
-
-#define _PR_INTERRUPT_CHECK_INTERVAL_SECS 5
-
-#ifndef BONE_VERSION
-/* these aren't actually used. if they are, we're screwed */
-struct  protoent {
-    char    *p_name;        /* official protocol name */
-    char    **p_aliases;    /* alias list */
-    int     p_proto;        /* protocol # */
-};
-
-struct protoent* getprotobyname(const char* name);
-struct protoent* getprotobynumber(int number);
-#endif
-
-/*
- * malloc() related definitions.
- */
-
-#undef _PR_OVERRIDE_MALLOC
-
-/* Miscellaneous */
-
-#define _MD_ERRNO()             (errno)
-
-#define _MD_CLEANUP_BEFORE_EXIT _MD_cleanup_before_exit
-#define _MD_EXIT _MD_exit
-
-#define _MD_GET_ENV getenv
-#define _MD_PUT_ENV putenv
-
-#define _MD_EARLY_INIT _MD_early_init
-#define _MD_FINAL_INIT _MD_final_init
-
-/* CPU Stuff */
-
-#define _MD_INIT_CPUS _MD_init_cpus
-#define _MD_WAKEUP_CPUS _MD_wakeup_cpus
-#define _MD_START_INTERRUPTS _MD_start_interrupts
-#define _MD_STOP_INTERRUPTS _MD_stop_interrupts
-#define _MD_DISABLE_CLOCK_INTERRUPTS _MD_disable_clock_interrupts
-#define _MD_BLOCK_CLOCK_INTERRUPTS _MD_block_clock_interrupts
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS _MD_unblock_clock_interrupts
-#define _MD_CLOCK_INTERRUPT _MD_clock_interrupt
-#define _MD_INIT_STACK _MD_init_stack
-#define _MD_CLEAR_STACK _MD_clear_stack
-// #define _MD_GET_INTSOFF _MD_get_intsoff
-// #define _MD_SET_INTSOFF _MD_set_intsoff
-#define _MD_CURRENT_CPU _MD_current_cpu
-#define _MD_SET_CURRENT_CPU _MD_set_current_cpu
-#define _MD_INIT_RUNNING_CPU _MD_init_running_cpu
-#define _MD_PAUSE_CPU _MD_pause_cpu
-
-/* Thread stuff */
-
-#define _MD_CURRENT_THREAD() PR_GetCurrentThread()
-// #define _MD_GET_ATTACHED_THREAD _MD_get_attached_thread
-#define _MD_LAST_THREAD _MD_last_thread
-#define _MD_SET_CURRENT_THREAD _MD_set_current_THREAD
-#define _MD_SET_LAST_THREAD _MD_set_last_thread
-#define _MD_INIT_THREAD _MD_init_thread
-#define _MD_EXIT_THREAD _MD_exit_thread
-#define _MD_INIT_ATTACHED_THREAD _MD_init_attached_thread
-
-#define _MD_SUSPEND_THREAD _MD_suspend_thread
-#define _MD_RESUME_THREAD _MD_resume_thread
-#define _MD_SUSPEND_CPU _MD_suspend_cpu
-#define _MD_RESUME_CPU _MD_resume_cpu
-#define _MD_BEGIN_SUSPEND_ALL _MD_begin_suspend_all
-#define _MD_END_SUSPEND_ALL _MD_end_suspend_all
-#define _MD_BEGIN_RESUME_ALL _MD_begin_resume_all
-#define _MD_END_RESUME_ALL _MD_end_resume_all
-
-#define _MD_GET_SP _MD_get_sp
-
-#define _MD_CLEAN_THREAD _MD_clean_thread
-#define _MD_CREATE_PRIMORDIAL_USER_THREAD _MD_create_primordial_user_thread
-#define _MD_CREATE_USER_THREAD _MD_create_user_thread
-#define _MD_INIT_PRIMORDIAL_THREAD _MD_init_primordial_thread
-#define _MD_CREATE_THREAD _MD_create_thread
-#define _MD_YIELD _MD_yield
-#define _MD_SET_PRIORITY _MD_set_priority
-
-#define _MD_SUSPENDALL _MD_suspendall
-#define _MD_RESUMEALL _MD_resumeall
-
-#define _MD_SWITCH_CONTEXT _MD_switch_context
-#define _MD_RESTORE_CONTEXT _MD_restore_context
-
-#define _MD_WAIT _MD_wait
-#define _MD_WAKEUP_WAITER _MD_wakeup_waiter
-
-#define _MD_SETTHREADAFFINITYMASK _MD_setthreadaffinitymask
-#define _MD_GETTHREADAFFINITYMASK _MD_getthreadaffinitymask
-
-/* Thread Synchronization */
-
-#define _MD_INIT_LOCKS _MD_init_locks
-#define _MD_NEW_LOCK _MD_new_lock
-#define _MD_FREE_LOCK _MD_free_lock
-#define _MD_LOCK _MD_lock
-#define _MD_TEST_AND_LOCK _MD_test_and_lock
-#define _MD_UNLOCK _MD_unlock
-#define _MD_IOQ_LOCK _MD_ioq_lock
-#define _MD_IOQ_UNLOCK _MD_ioq_unlock
-#define _MD_NEW_SEM _MD_new_sem
-#define _MD_DESTROY_SEM _MD_destroy_sem
-#define _MD_TIMED_WAIT_SEM _MD_timed_wait_sem
-#define _MD_WAIT_SEM _MD_wait_sem
-#define _MD_POST_SEM _MD_post_sem
-// #define _MD_NEW_CV _MD_new_cv
-// #define _MD_FREE_CV _MD_free_cv
-// #define _MD_WAIT_CV _MD_wait_cv
-// #define _MD_NOTIFY_CV _MD_notify_cv
-// #define _MD_NOTIFYALL_CV _MD_notifyall_cv
-
-/* File I/O */
-
-/* don't need any I/O initializations */
-#define _MD_INIT_IO()
-#define _MD_INIT_FILEDESC(fd)
-
-#define _MD_OPEN_DIR _MD_open_dir
-#define _MD_READ_DIR _MD_read_dir
-#define _MD_CLOSE_DIR _MD_close_dir
-#define _MD_MAKE_NONBLOCK _MD_make_nonblock
-#define _MD_SET_FD_INHERITABLE _MD_set_fd_inheritable
-#define _MD_INIT_FD_INHERITABLE _MD_init_fd_inheritable
-#define _MD_QUERY_FD_INHERITABLE _MD_query_fd_inheritable
-#define _MD_OPEN _MD_open
-#define _MD_OPEN_FILE _MD_open
-#define _MD_CLOSE_FILE _MD_close_file
-#define _MD_READ _MD_read
-#define _MD_WRITE _MD_write
-#define _MD_WRITEV _MD_writev
-#define _MD_LSEEK _MD_lseek
-#define _MD_LSEEK64 _MD_lseek64
-#define _MD_FSYNC _MD_fsync
-#define _MD_DELETE _MD_delete
-#define _MD_GETFILEINFO _MD_getfileinfo
-#define _MD_GETFILEINFO64 _MD_getfileinfo64
-#define _MD_GETOPENFILEINFO _MD_getopenfileinfo
-#define _MD_GETOPENFILEINFO64 _MD_getopenfileinfo64
-#define _MD_RENAME _MD_rename
-#define _MD_ACCESS _MD_access
-#define _MD_STAT stat
-#define _MD_MKDIR _MD_mkdir
-#define _MD_MAKE_DIR _MD_mkdir
-#define _MD_RMDIR _MD_rmdir
-#define _MD_PR_POLL _MD_pr_poll
-
-/* Network I/O */
-
-#define _MD_CLOSE_SOCKET _MD_close_socket
-#define _MD_CONNECT _MD_connect
-#define _MD_ACCEPT _MD_accept
-#define _MD_BIND _MD_bind
-#define _MD_LISTEN _MD_listen
-#define _MD_SHUTDOWN _MD_shutdown
-#define _MD_RECV _MD_recv
-#define _MD_SEND _MD_send
-#define _MD_ACCEPT_READ _MD_accept_read
-#define _MD_GETSOCKNAME _MD_getsockname
-#define _MD_GETPEERNAME _MD_getpeername
-#define _MD_GETSOCKOPT _MD_getsockopt
-#define _MD_SETSOCKOPT _MD_setsockopt
-#define _MD_RECVFROM _MD_recvfrom
-#define _MD_SENDTO _MD_sendto
-#define _MD_SOCKETPAIR _MD_socketpair
-#define _MD_SOCKET _MD_socket
-#define _MD_SOCKETAVAILABLE _MD_socketavailable
-#define _MD_PIPEAVAILABLE _MD_socketavailable
-
-#define _MD_GET_SOCKET_ERROR()	(errno)
-#define _MD_GETHOSTNAME _MD_gethostname
-
-#define _MD_SELECT select
-
-/* Process management */
-
-#define _MD_CREATE_PROCESS _MD_create_process
-#define _MD_DETACH_PROCESS _MD_detach_process
-#define _MD_WAIT_PROCESS _MD_wait_process
-#define _MD_KILL_PROCESS _MD_kill_process
-
-/* Atomic data operations */
-
-// #define _MD_INIT_ATOMIC _MD_init_atomic
-// #define _MD_ATOMIC_INCREMENT _MD_atomic_increment
-// #define _MD_ATOMIC_DECREMENT _MD_atomic_decrement
-// #define _MD_ATOMIC_SET _MD_atomic_set
-
-/* memory management */
-
-#define _MD_INIT_SEGS _MD_init_segs
-#define _MD_ALLOC_SEGMENT _MD_alloc_segment
-#define _MD_FREE_SEGMENT _MD_free_segment
-
-/* Memory mapped file I/O */
-
-#define _MD_CREATE_FILE_MAP _MD_create_file_map
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_get_mem_map_alignment
-#define _MD_MEM_MAP _MD_mem_map
-#define _MD_MEM_UNMAP _MD_mem_unmap
-#define _MD_CLOSE_FILE_MAP _MD_close_file_map
-
-/* Time related */
-
-#define _MD_NOW _MD_now
-#define _MD_INTERVAL_INIT _MD_interval_init
-#define _MD_GET_INTERVAL _MD_get_interval
-#define _MD_INTERVAL_PER_SEC _MD_interval_per_sec
-
-/* File locking */
-
-#define _MD_LOCKFILE _MD_lockfile
-#define _MD_TLOCKFILE _MD_tlockfile
-#define _MD_UNLOCKFILE _MD_unlockfile
-
-/**
- * Prototypes for machine dependent function implementations. (Too bad
- * NSPR's MD system blows so much that we have to reiterate every stinking
- * thing we implement here in our MD header file.)
- */
-
-/* Miscellaneous */
-
-NSPR_API(void) _MD_cleanup_before_exit(void);
-NSPR_API(void) _MD_exit(PRIntn status);
-
-NSPR_API(char*) _MD_get_env(const char *name);
-NSPR_API(PRIntn) _MD_put_env(const char *name);
-
-NSPR_API(void) _MD_early_init(void);
-NSPR_API(void) _MD_final_init(void);
-
-/* CPU Stuff */
-
-NSPR_API(void) _MD_init_cpus();
-NSPR_API(void) _MD_wakeup_cpus();
-NSPR_API(void) _MD_start_interrupts(void);
-NSPR_API(void) _MD_stop_interrupts(void);
-NSPR_API(void) _MD_disable_clock_interrupts(void);
-NSPR_API(void) _MD_block_clock_interrupts(void);
-NSPR_API(void) _MD_unblock_clock_interrupts(void);
-NSPR_API(void) _MD_clock_interrupt(void);
-// NSPR_API(void) _MD_init_stack(PRThreadStack *ts, PRIntn redzone);
-// NSPR_API(void) _MD_clear_stack(PRThreadStack* ts);
-// NSPR_API(PRInt32) _MD_get_intsoff(void);
-// NSPR_API(void) _MD_set_intsoff(PRInt32 _val);
-// NSPR_API(_PRCPU*) _MD_current_cpu(void);
-// NSPR_API(void) _MD_set_current_cpu(_PRCPU *cpu);
-// NSPR_API(void) _MD_init_running_cpu(_PRCPU *cpu);
-NSPR_API(PRInt32) _MD_pause_cpu(PRIntervalTime timeout);
-
-/* Thread stuff */
-
-// NSPR_API(PRThread*) _MD_current_thread(void);
-NSPR_API(PRThread*) _MD_get_attached_thread(void);
-NSPR_API(PRThread*) _MD_last_thread(void);
-NSPR_API(void) _MD_set_current_thread(PRThread *thread);
-NSPR_API(void) _MD_set_last_thread(PRThread *thread);
-NSPR_API(PRStatus) _MD_init_thread(PRThread *thread);
-NSPR_API(void) _MD_exit_thread(PRThread *thread);
-NSPR_API(PRStatus) _MD_init_attached_thread(PRThread *thread);
-
-NSPR_API(void) _MD_suspend_thread(PRThread *thread);
-NSPR_API(void) _MD_resume_thread(PRThread *thread);
-// NSPR_API(void) _MD_suspend_cpu(_PRCPU  *cpu);
-// NSPR_API(void) _MD_resume_cpu(_PRCPU  *cpu);
-NSPR_API(void) _MD_begin_suspend_all(void);
-NSPR_API(void) _MD_end_suspend_all(void);
-NSPR_API(void) _MD_begin_resume_all(void);
-NSPR_API(void) _MD_end_resume_all(void);
-
-NSPR_API(void *) _MD_get_sp(PRThread *thread);
-
-NSPR_API(void) _MD_clean_thread(PRThread *thread);
-NSPR_API(void) _MD_create_primordial_user_thread(PRThread *);
-NSPR_API(PRThread*) _MD_create_user_thread(PRUint32 stacksize, void (*start)(void *), void *arg);
-NSPR_API(void) _MD_init_primordial_thread(PRThread *thread);
-NSPR_API(PRStatus) _MD_create_thread(PRThread *thread, void (*start)(void *), PRThreadPriority priority, PRThreadScope scope, PRThreadState state, PRUint32 stackSize);
-NSPR_API(void) _MD_yield(void);
-NSPR_API(void) _MD_set_priority(struct _MDThread *md, PRThreadPriority newPri);
-
-NSPR_API(void) _MD_suspendall(void);
-NSPR_API(void) _MD_resumeall(void);
-
-NSPR_API(void) _MD_init_context(PRThread *thread, char *top, void (*start) (void), PRBool *status);
-NSPR_API(void) _MD_switch_context(PRThread *thread);
-NSPR_API(void) _MD_restore_context(PRThread *thread);
-
-NSPR_API(PRStatus) _MD_wait(PRThread *, PRIntervalTime timeout);
-NSPR_API(PRStatus) _MD_wakeup_waiter(PRThread *);
-
-NSPR_API(PRInt32) _MD_setthreadaffinitymask(PRThread *thread, PRUint32 mask );
-NSPR_API(PRInt32) _MD_getthreadaffinitymask(PRThread *thread, PRUint32 *mask);
-
-/* Thread Synchronization */
-
-NSPR_API(void) _MD_init_locks(void);
-NSPR_API(PRStatus) _MD_new_lock(struct _MDLock *md);
-NSPR_API(void) _MD_free_lock(struct _MDLock *md);
-NSPR_API(void) _MD_lock(struct _MDLock *md);
-NSPR_API(PRIntn) _MD_test_and_lock(struct _MDLock *md);
-NSPR_API(void) _MD_unlock(struct _MDLock *md);
-NSPR_API(void) _MD_ioq_lock(void);
-NSPR_API(void) _MD_ioq_unlock(void);
-NSPR_API(void) _MD_new_sem(struct _MDSemaphore *md, PRUintn value);
-NSPR_API(void) _MD_destroy_sem(struct _MDSemaphore *md);
-NSPR_API(PRStatus) _MD_timed_wait_sem(struct _MDSemaphore *md, PRIntervalTime timeout);
-NSPR_API(PRStatus) _MD_wait_sem(struct _MDSemaphore *md);
-NSPR_API(void) _MD_post_sem(struct _MDSemaphore *md);
-// NSPR_API(PRInt32) _MD_new_cv(struct _MDCVar *md);
-// NSPR_API(void) _MD_free_cv(struct _MDCVar *md);
-// NSPR_API(void) _MD_wait_cv(struct _MDCVar *mdCVar, struct _MDLock *mdLock, PRIntervalTime timeout);
-// NSPR_API(void) _MD_notify_cv(struct _MDCVar *md, struct _MDLock *lock);
-// NSPR_API(void) _MD_notifyall_cv(struct _MDCVar *md, struct _MDLock *lock);
-
-/* File I/O */
-
-// NSPR_API(void) _MD_init_io(void);
-NSPR_API(PRStatus) _MD_open_dir(struct _MDDir *md,const char *name);
-NSPR_API(char *) _MD_read_dir(struct _MDDir *md, PRIntn flags);
-NSPR_API(PRInt32) _MD_close_dir(struct _MDDir *md);
-NSPR_API(void) _MD_make_nonblock(PRFileDesc *fd);
-NSPR_API(void) _MD_init_fd_inheritable(PRFileDesc *fd, PRBool imported);
-NSPR_API(void) _MD_query_fd_inheritable(PRFileDesc *fd);
-NSPR_API(PRInt32) _MD_open(const char *name, PRIntn osflags, PRIntn mode);
-NSPR_API(PRInt32) _MD_close_file(PRInt32 osfd);
-NSPR_API(PRInt32) _MD_read(PRFileDesc *fd, void *buf, PRInt32 amount);
-NSPR_API(PRInt32) _MD_write(PRFileDesc *fd, const void *buf, PRInt32 amount);
-NSPR_API(PRInt32) _MD_writev(PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_lseek(PRFileDesc *fd, PRInt32 offset, int whence);
-NSPR_API(PRInt64) _MD_lseek64(PRFileDesc *fd, PRInt64 offset, int whence);
-NSPR_API(PRInt32) _MD_fsync(PRFileDesc *fd);
-NSPR_API(PRInt32) _MD_delete(const char *name);
-NSPR_API(PRInt32) _MD_getfileinfo(const char *fn, PRFileInfo *info);
-NSPR_API(PRInt32) _MD_getfileinfo64(const char *fn, PRFileInfo64 *info);
-NSPR_API(PRInt32) _MD_getopenfileinfo(const PRFileDesc *fd, PRFileInfo *info);
-NSPR_API(PRInt32) _MD_getopenfileinfo64(const PRFileDesc *fd, PRFileInfo64 *info);
-NSPR_API(PRInt32) _MD_rename(const char *from, const char *to);
-NSPR_API(PRInt32) _MD_access(const char *name, PRIntn how);
-NSPR_API(PRInt32) _MD_stat(const char *name, struct stat *buf);
-NSPR_API(PRInt32) _MD_mkdir(const char *name, PRIntn mode);
-NSPR_API(PRInt32) _MD_rmdir(const char *name);
-NSPR_API(PRInt32) _MD_pr_poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout);
-
-/* Network I/O */
-NSPR_API(PRInt32) _MD_close_socket(PRInt32 osfd);
-NSPR_API(PRInt32) _MD_connect(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_accept(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_bind(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen);
-NSPR_API(PRInt32) _MD_listen(PRFileDesc *fd, PRIntn backlog);
-NSPR_API(PRInt32) _MD_shutdown(PRFileDesc *fd, PRIntn how);
-NSPR_API(PRInt32) _MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_send(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_accept_read(PRFileDesc *sd, PRInt32 *newSock, PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
-// NSPR_API(PRInt32) _MD_fast_accept(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout, PRBool fast, _PR_AcceptTimeoutCallback callback, void *callbackArg);
-// NSPR_API(PRInt32) _MD_fast_accept_read(PRFileDesc *sd, PRInt32 *newSock, PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout, PRBool fast, _PR_AcceptTimeoutCallback callback, void *callbackArg);
-// NSPR_API(void) _MD_update_accept_context(PRInt32 s, PRInt32 ls);
-NSPR_API(PRStatus) _MD_getsockname(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen);
-NSPR_API(PRStatus) _MD_getpeername(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen);
-NSPR_API(PRStatus) _MD_getsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen);
-NSPR_API(PRStatus) _MD_setsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen);
-NSPR_API(PRInt32) _MD_recvfrom(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_sendto(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags, const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout);
-NSPR_API(PRInt32) _MD_socketpair(int af, int type, int flags, PRInt32 *osfd);
-NSPR_API(PRInt32) _MD_socket(int af, int type, int flags);
-NSPR_API(PRInt32) _MD_socketavailable(PRFileDesc *fd);
-
-// NSPR_API(PRInt32) _MD_get_socket_error(void);
-NSPR_API(PRStatus) _MD_gethostname(char *name, PRUint32 namelen);
-
-/* Process management */
-
-NSPR_API(PRProcess *) _MD_create_process(const char *path, char *const *argv, char *const *envp, const PRProcessAttr *attr);
-NSPR_API(PRStatus) _MD_detach_process(PRProcess *process);
-NSPR_API(PRStatus) _MD_wait_process(PRProcess *process, PRInt32 *exitCode);
-NSPR_API(PRStatus) _MD_kill_process(PRProcess *process);
-
-/* Atomic data operations */
-
-// NSPR_API(void) _MD_init_atomic(void);
-// NSPR_API(PRInt32) _MD_atomic_increment(PRInt32 *);
-// NSPR_API(PRInt32) _MD_atomic_decrement(PRInt32 *);
-// NSPR_API(PRInt32) _MD_atomic_set(PRInt32 *, PRInt32);
-
-/* Memory management */
-
-NSPR_API(void) _MD_init_segs(void);
-NSPR_API(PRStatus) _MD_alloc_segment(PRSegment *seg, PRUint32 size, void *vaddr);
-NSPR_API(void) _MD_free_segment(PRSegment *seg);
-
-/* Memory mapped file I/O */
-
-NSPR_API(PRStatus) _MD_create_file_map(PRFileMap *fmap, PRInt64 size);
-NSPR_API(PRInt32) _MD_get_mem_map_alignment(void);
-NSPR_API(void *) _MD_mem_map(PRFileMap *fmap, PRInt64 offset, PRUint32 len);
-NSPR_API(PRStatus) _MD_mem_unmap(void *addr, PRUint32 size);
-NSPR_API(PRStatus) _MD_close_file_map(PRFileMap *fmap);
-
-/* Time related */
-
-NSPR_API(PRTime) _MD_now(void);
-NSPR_API(void) _MD_interval_init(void);
-NSPR_API(PRIntervalTime) _MD_get_interval(void);
-NSPR_API(PRIntervalTime) _MD_interval_per_sec(void);
-
-/* File locking */
-
-NSPR_API(PRStatus) _MD_lockfile(PRInt32 osfd);
-NSPR_API(PRStatus) _MD_tlockfile(PRInt32 osfd);
-NSPR_API(PRStatus) _MD_unlockfile(PRInt32 osfd);
-
-#endif /* _nspr_beos_defs_h___*/
diff --git a/libs/js/nsprpub/pr/include/md/_bsdi.cfg b/libs/js/nsprpub/pr/include/md/_bsdi.cfg
deleted file mode 100644
index 843f35f644..0000000000
--- a/libs/js/nsprpub/pr/include/md/_bsdi.cfg
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef BSDI
-#define BSDI
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#if defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_bsdi.h b/libs/js/nsprpub/pr/include/md/_bsdi.h
deleted file mode 100644
index b59c9b0f22..0000000000
--- a/libs/js/nsprpub/pr/include/md/_bsdi.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_bsdi_defs_h___
-#define nspr_bsdi_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#include <sys/param.h>	/* for _BSDI_VERSION */
-
-#define PR_LINKER_ARCH	"bsdi"
-#define _PR_SI_SYSNAME "BSDI"
-#if defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#else
-#error "Unknown CPU architecture"
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#define HAVE_BSD_FLOCK
-#define NEED_TIME_R
-#define _PR_HAVE_SOCKADDR_LEN
-#define _PR_NO_LARGE_FILES
-
-#define USE_SETJMP
-
-/* BSD/OS 4.3 and newer all have IPv6 support */
-#if _BSDI_VERSION >= 200105
-#define _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#endif
-
-#ifndef _PR_PTHREADS
-
-#include <setjmp.h>
-
-#if defined(_PR_BSDI_JMPBUF_IS_ARRAY)
-#define _MD_GET_SP(_t)    (_t)->md.context[2] 
-#elif defined(_PR_BSDI_JMPBUF_IS_STRUCT)
-#define _MD_GET_SP(_t)    (_t)->md.context[0].jb_esp
-#else
-#error "Unknown BSDI jmp_buf type"
-#endif
-
-#define PR_NUM_GCREGS	_JBLEN
-#define PR_CONTEXT_TYPE	jmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	  \
-{								  \
-    *status = PR_TRUE; \
-    if (setjmp(CONTEXT(_thread))) {				  \
-	_main();					  \
-    }								  \
-    _MD_GET_SP(_thread) = (int) (_sp - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    longjmp(CONTEXT(_thread), 1);    \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-#endif /* ! _PR_PTHREADS */
-
-#define _MD_EARLY_INIT          _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-
-#include <sys/syscall.h>
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#endif /* nspr_bsdi_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_darwin.cfg b/libs/js/nsprpub/pr/include/md/_darwin.cfg
deleted file mode 100644
index dc7e0e0c9a..0000000000
--- a/libs/js/nsprpub/pr/include/md/_darwin.cfg
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#define PR_AF_INET6 30  /* same as AF_INET6 */
-
-#if defined(i386)
-#undef IS_BIG_ENDIAN
-#define  IS_LITTLE_ENDIAN 1
-#else
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#endif
-
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-#define PR_BITS_PER_DWORD   64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
-
diff --git a/libs/js/nsprpub/pr/include/md/_darwin.h b/libs/js/nsprpub/pr/include/md/_darwin.h
deleted file mode 100644
index f4a1a4e070..0000000000
--- a/libs/js/nsprpub/pr/include/md/_darwin.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_darwin_defs_h___
-#define nspr_darwin_defs_h___
-
-#include "prthread.h"
-
-#include <sys/syscall.h>
-
-#ifdef XP_MACOSX
-#include <AvailabilityMacros.h>
-#endif
-
-#define PR_LINKER_ARCH	"darwin"
-#define _PR_SI_SYSNAME  "DARWIN"
-#ifdef __i386__
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__ppc__)
-#define _PR_SI_ARCHITECTURE "ppc"
-#endif
-#define PR_DLL_SUFFIX		".dylib"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_MACH_DYLD
-#define _PR_HAVE_SOCKADDR_LEN  
-#define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_NO_LARGE_FILES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
-#define _PR_INET6
-/*
- * I'd prefer to use getipnodebyname and getipnodebyaddr but the
- * getipnodebyname(3) man page on Mac OS X 10.2 says they are not
- * thread-safe.  AI_V4MAPPED|AI_ADDRCONFIG doesn't work either.
- */
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-/*
- * On Mac OS X 10.2, gethostbyaddr fails with h_errno=NO_RECOVERY
- * if you pass an IPv4-mapped IPv6 address to it.
- */
-#define _PR_GHBA_DISALLOW_V4MAPPED
-#ifdef XP_MACOSX
-#if !defined(MAC_OS_X_VERSION_10_3) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3
-/*
- * socket(AF_INET6) fails with EPROTONOSUPPORT on Mac OS X 10.1.
- * IPv6 under OS X 10.2 and below is not complete (see bug 222031).
- */
-#define _PR_INET6_PROBE
-#endif /* DT < 10.3 */
-#if defined(MAC_OS_X_VERSION_10_2) && \
-    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_2
-/* Mac OS X 10.2 has inet_ntop and inet_pton. */
-#define _PR_HAVE_INET_NTOP
-#endif /* DT >= 10.2 */
-#endif /* XP_MACOSX */
-#define _PR_IPV6_V6ONLY_PROBE
-/* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
-#ifndef IPV6_V6ONLY
-#define IPV6_V6ONLY 27
-#endif
-
-#if defined(__ppc__)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_DarwinPPC_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT(val)   _PR_DarwinPPC_AtomicIncrement(val)
-extern PRInt32 _PR_DarwinPPC_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT(val)   _PR_DarwinPPC_AtomicDecrement(val)
-extern PRInt32 _PR_DarwinPPC_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET(val, newval) _PR_DarwinPPC_AtomicSet(val, newval)
-extern PRInt32 _PR_DarwinPPC_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD(ptr, val)    _PR_DarwinPPC_AtomicAdd(ptr, val)
-#elif defined(__i386__)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_Darwin_x86_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT(val)   _PR_Darwin_x86_AtomicIncrement(val)
-extern PRInt32 _PR_Darwin_x86_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT(val)   _PR_Darwin_x86_AtomicDecrement(val)
-extern PRInt32 _PR_Darwin_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET(val, newval) _PR_Darwin_x86_AtomicSet(val, newval)
-extern PRInt32 _PR_Darwin_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD(ptr, val)    _PR_Darwin_x86_AtomicAdd(ptr, val)
-#endif /* __i386__ */
-
-#define USE_SETJMP
-
-#if !defined(_PR_PTHREADS)
-
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	jmp_buf
-
-#define CONTEXT(_th)       ((_th)->md.context)
-#define _MD_GET_SP(_th)    (((struct sigcontext *) (_th)->md.context)->sc_onstack)
-#define PR_NUM_GCREGS	    _JBLEN
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (setjmp(CONTEXT(_thread))) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) {  \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    longjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize);
-extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri);
-extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(PRThread *);
-extern void _MD_YIELD(void);
-
-#endif /* ! _PR_PTHREADS */
-
-#define _MD_EARLY_INIT          _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL        _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC    _PR_UNIX_TicksPerSecond
-
-extern void             _MD_EarlyInit(void);
-extern PRIntervalTime   _PR_UNIX_GetInterval(void);
-extern PRIntervalTime   _PR_UNIX_TicksPerSecond(void);
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-/* For writev() */
-#include <sys/uio.h>
-
-#endif /* nspr_darwin_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_dgux.cfg b/libs/js/nsprpub/pr/include/md/_dgux.cfg
deleted file mode 100644
index ed6b93f82a..0000000000
--- a/libs/js/nsprpub/pr/include/md/_dgux.cfg
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef DGUX
-#define DGUX
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_dgux.h b/libs/js/nsprpub/pr/include/md/_dgux.h
deleted file mode 100644
index f3f02e82b3..0000000000
--- a/libs/js/nsprpub/pr/include/md/_dgux.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_dgux_defs_h___
-#define nspr_dgux_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"dgux"
-#define _PR_SI_SYSNAME		"DGUX"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE	 	0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_NETCONFIG
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define _PR_NEED_STRCASECMP
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP setjmp
-#define _LONGJMP longjmp
-#define _PR_CONTEXT_TYPE         jmp_buf
-#define _MD_GET_SP(_t)           (_t)->md.context[4]
-#define _PR_NUM_GCREGS	_JBLEN
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-{								  \
-    *status = PR_TRUE; \
-    if(_SETJMP(CONTEXT(_thread))) (*_main)(); \
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!_SETJMP(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    _LONGJMP(CONTEXT(_thread), 1);    \
-}
-
-/* Machine-dependent (MD) data structures.
- * Don't use SVR4 native threads (yet). 
- */
-
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-                fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-    struct pollfd *ioq_pollfds;
-    int ioq_pollfds_size;
-#endif  /* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)               ((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)       ((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)       ((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)      ((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)      ((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)  ((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)  ((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)       ((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)      ((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)      ((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)       ((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)  ((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)  32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
- * The following are copied from _sunos.h, _aix.h.  This means
- * some of them should probably be moved into _unixos.h.  But
- * _irix.h seems to be quite different in regard to these macros.
- */
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *execptfds, struct timeval *timeout);
-#define _MD_SELECT _select
-
-#define _MD_POLL _poll
-#include <poll.h>
-#include <stropts.h>
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-#endif /* nspr_dgux_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_freebsd.cfg b/libs/js/nsprpub/pr/include/md/_freebsd.cfg
deleted file mode 100644
index d4e09ec18d..0000000000
--- a/libs/js/nsprpub/pr/include/md/_freebsd.cfg
+++ /dev/null
@@ -1,338 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef FREEBSD
-#define FREEBSD
-#endif
-
-#define PR_AF_INET6 28  /* same as AF_INET6 */
-
-#if defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#elif defined(__sparc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#elif defined(__ia64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#elif defined(__amd64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_freebsd.h b/libs/js/nsprpub/pr/include/md/_freebsd.h
deleted file mode 100644
index 06a6c92f15..0000000000
--- a/libs/js/nsprpub/pr/include/md/_freebsd.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_freebsd_defs_h___
-#define nspr_freebsd_defs_h___
-
-#include "prthread.h"
-
-#if __FreeBSD__ >= 2
-#include <osreldate.h>  /* for __FreeBSD_version */
-#endif
-#include <sys/syscall.h>
-
-#define PR_LINKER_ARCH	"freebsd"
-#define _PR_SI_SYSNAME  "FREEBSD"
-#if defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__alpha__)
-#define _PR_SI_ARCHITECTURE "alpha"
-#elif defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#elif defined(__ia64__)
-#define _PR_SI_ARCHITECTURE "ia64"
-#elif defined(__amd64__)
-#define _PR_SI_ARCHITECTURE "amd64"
-#else
-#error "Unknown CPU architecture"
-#endif
-#if defined(__ELF__)
-#define PR_DLL_SUFFIX          ".so"
-#else
-#define PR_DLL_SUFFIX          ".so.1.0"
-#endif
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_DLFCN
-#define _PR_HAVE_SOCKADDR_LEN
-#define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_NO_LARGE_FILES
-
-#if defined(_PR_PTHREADS)
-#if __FreeBSD_version >= 400008
-/*
- * libc_r before this version of FreeBSD doesn't have poll().
- * Although libc has poll(), it is not thread-safe so we can't
- * use it in the pthreads version.
- */
-#define _PR_POLL_AVAILABLE
-#endif
-#else
-#if __FreeBSD_version >= 300000
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#endif
-#endif
-
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
-#if __FreeBSD_version >= 400014
-#define _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#define _PR_IPV6_V6ONLY_PROBE
-#endif
-
-#if __FreeBSD_version >= 601103
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_5_ARG_GETPROTO_R
-#endif
-
-#define USE_SETJMP
-
-#ifndef _PR_PTHREADS
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	sigjmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-#define _MD_GET_SP(_th)    (_th)->md.context[0]._sjb[2]
-#define PR_NUM_GCREGS	_JBLEN
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (sigsetjmp(CONTEXT(_thread), 1)) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    siglongjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize);
-extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri);
-extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(PRThread *);
-extern void _MD_YIELD(void);
-
-#endif /* ! _PR_PTHREADS */
-
-extern void _MD_EarlyInit(void);
-extern PRIntervalTime _PR_UNIX_GetInterval(void);
-extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-
-#define _MD_EARLY_INIT                  _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-#if defined(_PR_POLL_AVAILABLE)
-#include <poll.h>
-#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
-#endif
-
-/* freebsd has INADDR_LOOPBACK defined, but in /usr/include/rpc/types.h, and I didn't
-   want to be including that.. */
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK         (u_long)0x7F000001
-#endif
-
-/* For writev() */
-#include <sys/uio.h>
-
-#endif /* nspr_freebsd_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_hpux.h b/libs/js/nsprpub/pr/include/md/_hpux.h
deleted file mode 100644
index 6472960768..0000000000
--- a/libs/js/nsprpub/pr/include/md/_hpux.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_xhppa_defs_h___
-#define nspr_xhppa_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH    "hpux"
-#define _PR_SI_SYSNAME   "HPUX"
-#ifdef __ia64
-#define _PR_SI_ARCHITECTURE "ia64"
-#define PR_DLL_SUFFIX        ".so"
-#else
-#define _PR_SI_ARCHITECTURE "hppa"
-#define PR_DLL_SUFFIX        ".sl"
-#endif
-
-#define _PR_VMBASE        0x30000000 
-#define _PR_STACK_VMBASE    0x50000000
-/*
- * _USE_BIG_FDS increases the size of fd_set from 256 bytes to
- * about 7500 bytes.  PR_Poll allocates three fd_sets on the
- * stack, so it is safer to also increase the default thread
- * stack size.
- */
-#define _MD_DEFAULT_STACK_SIZE    (2*65536L)
-#define _MD_MINIMUM_STACK_SIZE    (2*65536L)
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#define NEED_TIME_R
-
-#define HAVE_STACK_GROWING_UP
-#undef	HAVE_WEAK_IO_SYMBOLS
-#undef	HAVE_WEAK_MALLOC_SYMBOLS
-#define	HAVE_DLL
-#ifdef IS_64
-#define USE_DLFCN
-#else
-#define USE_HPSHL
-#endif
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR
-#endif
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define _PR_HAVE_POSIX_SEMAPHORES
-#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-#define _PR_ACCEPT_INHERIT_NONBLOCK
-
-#if defined(__ia64)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT          _PR_ia64_AtomicIncrement
-extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
-extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
-extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
-#endif
-
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#endif
-
-#if !defined(_PR_PTHREADS)
-
-#include <syscall.h>
-#include <setjmp.h>
-
-#define USE_SETJMP
-
-#define _MD_GET_SP(_t) (*((int *)((_t)->md.jb) + 1))
-#define PR_NUM_GCREGS _JBLEN
-/* Caveat: This makes jmp_buf full of doubles. */
-#define CONTEXT(_th) ((_th)->md.jb)
-
-    /* Stack needs two frames (64 bytes) at the bottom */ \
-#define _MD_SET_THR_SP(_t, _sp)     ((_MD_GET_SP(_t)) = (int) (_sp + 64 *2))
-#define SAVE_CONTEXT(_th)           _setjmp(CONTEXT(_th))
-#define GOTO_CONTEXT(_th)           _longjmp(CONTEXT(_th), 1)
-
-#if !defined(PTHREADS_USER)
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-{ \
-    *(status) = PR_TRUE; \
-    if (_setjmp(CONTEXT(_thread))) (*_main)(); \
-    /* Stack needs two frames (64 bytes) at the bottom */ \
-    (_MD_GET_SP(_thread)) = (int) ((_sp) + 64*2); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread) \
-    if (!_setjmp(CONTEXT(_thread))) { \
-    (_thread)->md.errcode = errno; \
-    _PR_Schedule(); \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{ \
-    errno = (_thread)->md.errcode; \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    _longjmp(CONTEXT(_thread), 1); \
-}
-
-/* Machine-dependent (MD) data structures.  HP-UX has no native threads. */
-
-struct _MDThread {
-    jmp_buf jb;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-#else /* PTHREADS_USER	*/
-
-#include "_nspr_pthread.h"
-
-#endif /* PTHREADS_USER	*/
-
-#endif  /* !defined(_PR_PTHREADS) */
-
-#if !defined(PTHREADS_USER)
-#define _MD_EARLY_INIT                 	_MD_EarlyInit
-#define _MD_FINAL_INIT					_PR_UnixInit
-#endif 
-
-#if defined(HPUX_LW_TIMER)
-extern void _PR_HPUX_LW_IntervalInit(void);
-extern PRIntervalTime _PR_HPUX_LW_GetInterval(void);
-#define _MD_INTERVAL_INIT                 _PR_HPUX_LW_IntervalInit
-#define _MD_GET_INTERVAL                  _PR_HPUX_LW_GetInterval
-#define _MD_INTERVAL_PER_SEC()            1000
-#else
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-#endif
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-#include <poll.h>
-#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
-
-#ifdef HPUX11
-extern void _MD_hpux_map_sendfile_error(int err);
-#endif /* HPUX11 */
-
-#endif /* nspr_xhppa_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_hpux32.cfg b/libs/js/nsprpub/pr/include/md/_hpux32.cfg
deleted file mode 100644
index 1213802da3..0000000000
--- a/libs/js/nsprpub/pr/include/md/_hpux32.cfg
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef HPUX
-#define HPUX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_AF_INET6 22  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2 2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_hpux64.cfg b/libs/js/nsprpub/pr/include/md/_hpux64.cfg
deleted file mode 100644
index 17574adef8..0000000000
--- a/libs/js/nsprpub/pr/include/md/_hpux64.cfg
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef HPUX
-#define HPUX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_AF_INET6 22  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2 3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_irix.h b/libs/js/nsprpub/pr/include/md/_irix.h
deleted file mode 100644
index c38bb4bc28..0000000000
--- a/libs/js/nsprpub/pr/include/md/_irix.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_irix_defs_h___
-#define nspr_irix_defs_h___
-
-#define _PR_HAVE_ATOMIC_CAS
-
-/*
- * MipsPro assembler defines _LANGUAGE_ASSEMBLY
- */
-#ifndef _LANGUAGE_ASSEMBLY
-
-#include "prclist.h"
-#include "prthread.h"
-#include <sys/ucontext.h>
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH          "irix"
-#define _PR_SI_SYSNAME          "IRIX"
-#define _PR_SI_ARCHITECTURE     "mips"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE        0x50000000
-#define _PR_NUM_GCREGS          9
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#define _MD_DEFAULT_STACK_SIZE  65536L
-#define _MD_MIN_STACK_SIZE      16384L
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_WEAK_IO_SYMBOLS
-#define HAVE_WEAK_MALLOC_SYMBOLS
-#define HAVE_DLL
-#define USE_DLFCN
-#define _PR_HAVE_ATOMIC_OPS
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ST_ATIM
-#define _PR_HAVE_OFF64_T
-#define HAVE_POINTER_LOCALTIME_R
-#define _PR_HAVE_POSIX_SEMAPHORES
-#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-#define _PR_ACCEPT_INHERIT_NONBLOCK
-
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#endif
-
-/* Initialization entry points */
-NSPR_API(void) _MD_EarlyInit(void);
-#define _MD_EARLY_INIT _MD_EarlyInit
-
-NSPR_API(void) _MD_IrixInit(void);
-#define _MD_FINAL_INIT _MD_IrixInit
-
-#define _MD_INIT_IO()
-
-/* Timer operations */
-NSPR_API(PRIntervalTime) _MD_IrixGetInterval(void);
-#define _MD_GET_INTERVAL _MD_IrixGetInterval
-
-NSPR_API(PRIntervalTime) _MD_IrixIntervalPerSec(void);
-#define _MD_INTERVAL_PER_SEC _MD_IrixIntervalPerSec
-
-/* GC operations */
-NSPR_API(void *) _MD_GetSP(PRThread *thread);
-#define    _MD_GET_SP _MD_GetSP
-
-/* The atomic operations */
-#include <mutex.h>
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(val) add_then_test((unsigned long*)val, 1)
-#define _MD_ATOMIC_ADD(ptr, val) add_then_test((unsigned long*)ptr, (unsigned long)val)
-#define _MD_ATOMIC_DECREMENT(val) add_then_test((unsigned long*)val, 0xffffffff)
-#define _MD_ATOMIC_SET(val, newval) test_and_set((unsigned long*)val, newval)
-
-#if defined(_PR_PTHREADS)
-#else /* defined(_PR_PTHREADS) */
-
-/************************************************************************/
-
-#include <setjmp.h>
-#include <errno.h>
-#include <unistd.h>
-#include <bstring.h>
-#include <sys/time.h>
-#include <ulocks.h>
-#include <sys/prctl.h>
-
-
-/*
- * Data region private to each sproc. This region is setup by calling
- * mmap(...,MAP_LOCAL,...). The private data is mapped at the same
- * address in every sproc, but every sproc gets a private mapping.
- *
- * Just make sure that this structure fits in a page, as only one page
- * is allocated for the private region.
- */
-struct sproc_private_data {
-    struct PRThread *me;
-    struct _PRCPU *cpu;
-    struct PRThread *last;
-    PRUintn intsOff;
-	int		sproc_pid;
-};
-
-extern char *_nspr_sproc_private;
-
-#define _PR_PRDA() ((struct sproc_private_data *) _nspr_sproc_private)
-#define _MD_SET_CURRENT_THREAD(_thread) _PR_PRDA()->me = (_thread)
-#define _MD_THIS_THREAD() (_PR_PRDA()->me)
-#define _MD_LAST_THREAD() (_PR_PRDA()->last)
-#define _MD_SET_LAST_THREAD(_thread) _PR_PRDA()->last = (_thread)
-#define _MD_CURRENT_CPU() (_PR_PRDA()->cpu)
-#define _MD_SET_CURRENT_CPU(_cpu) _PR_PRDA()->cpu = (_cpu)
-#define _MD_SET_INTSOFF(_val) (_PR_PRDA()->intsOff = _val)
-#define _MD_GET_INTSOFF() (_PR_PRDA()->intsOff)
-
-#define _MD_SET_SPROC_PID(_val) (_PR_PRDA()->sproc_pid = _val)
-#define _MD_GET_SPROC_PID() (_PR_PRDA()->sproc_pid)
-
-NSPR_API(struct PRThread*) _MD_get_attached_thread(void);
-NSPR_API(struct PRThread*) _MD_get_current_thread(void);
-#define _MD_GET_ATTACHED_THREAD()	_MD_get_attached_thread()
-#define _MD_CURRENT_THREAD()	_MD_get_current_thread()
-
-#define _MD_CHECK_FOR_EXIT() {					\
-		if (_pr_irix_exit_now) {				\
-			_PR_POST_SEM(_pr_irix_exit_sem);	\
-			_MD_Wakeup_CPUs();					\
-			_exit(0);							\
-		}										\
-	}
-		
-#define _MD_ATTACH_THREAD(threadp)
-
-#define _MD_SAVE_ERRNO(_thread)			(_thread)->md.errcode = errno;
-#define _MD_RESTORE_ERRNO(_thread)		errno = (_thread)->md.errcode;
-
-extern struct _PRCPU  *_pr_primordialCPU;
-extern usema_t *_pr_irix_exit_sem;
-extern PRInt32 _pr_irix_exit_now;
-extern int _pr_irix_primoridal_cpu_fd[];
-extern PRInt32 _pr_irix_process_exit;
-extern PRInt32 _pr_irix_process_exit_code;
-
-/* Thread operations */
-#define _PR_LOCK_HEAP()	{						\
-			PRIntn _is;					\
-				if (_pr_primordialCPU) {		\
-				if (_MD_GET_ATTACHED_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_MD_GET_ATTACHED_THREAD()))	\
-						_PR_INTSOFF(_is); 	\
-					_PR_LOCK(_pr_heapLock);		\
-				}
-
-#define _PR_UNLOCK_HEAP() 	if (_pr_primordialCPU)	{		\
-					_PR_UNLOCK(_pr_heapLock);	\
-				if (_MD_GET_ATTACHED_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_MD_GET_ATTACHED_THREAD()))	\
-						_PR_INTSON(_is);	\
-				}					\
-			  }
-
-#define _PR_OPEN_POLL_SEM(_sem)  usopenpollsema(_sem, 0666)
-#define _PR_WAIT_SEM(_sem) uspsema(_sem)
-#define _PR_POST_SEM(_sem) usvsema(_sem)
-
-#define _MD_CVAR_POST_SEM(threadp)	usvsema((threadp)->md.cvar_pollsem)
-
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-struct _MDLock {
-    ulock_t lock;
-	usptr_t *arena;
-};
-
-/*
- * disable pre-emption for the LOCAL threads when calling the arena lock
- * routines
- */
-
-#define _PR_LOCK(lock) {						\
-		PRIntn _is;						\
-		PRThread *me = _MD_GET_ATTACHED_THREAD();			\
-		if (me && !_PR_IS_NATIVE_THREAD(me))			\
-			_PR_INTSOFF(_is); 				\
-		ussetlock(lock);					\
-		if (me && !_PR_IS_NATIVE_THREAD(me))			\
-			_PR_FAST_INTSON(_is); 				\
-	}
-
-#define _PR_UNLOCK(lock) {						\
-		PRIntn _is;						\
-		PRThread *me = _MD_GET_ATTACHED_THREAD();			\
-		if (me && !_PR_IS_NATIVE_THREAD(me))			\
-			_PR_INTSOFF(_is); 				\
-		usunsetlock(lock);					\
-		if (me && !_PR_IS_NATIVE_THREAD(me))			\
-			_PR_FAST_INTSON(_is); 				\
-	}
-
-NSPR_API(PRStatus) _MD_NEW_LOCK(struct _MDLock *md);
-NSPR_API(void) _MD_FREE_LOCK(struct _MDLock *lockp);
-
-#define _MD_LOCK(_lockp) _PR_LOCK((_lockp)->lock)
-#define _MD_UNLOCK(_lockp) _PR_UNLOCK((_lockp)->lock)
-#define _MD_TEST_AND_LOCK(_lockp) (uscsetlock((_lockp)->lock, 1) == 0)
-
-extern ulock_t _pr_heapLock;
-
-struct _MDThread {
-    jmp_buf jb;
-    usptr_t     *pollsem_arena;
-    usema_t     *cvar_pollsem;
-    PRInt32     cvar_pollsemfd;
-    PRInt32     cvar_pollsem_select;    /* acquire sem by calling select */
-    PRInt32     cvar_wait;              /* if 1, thread is waiting on cvar Q */
-    PRInt32	id;
-    PRInt32	suspending_id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    usema_t *sem;
-};
-
-struct _MDCVar {
-    ulock_t mdcvar_lock;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-
-struct _MDCPU {
-    PRInt32 id;
-    PRInt32 suspending_id;
-    struct _MDCPU_Unix md_unix;
-};
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-    PR_BEGIN_MACRO				      \
-	int *jb = (_thread)->md.jb;		      \
-    *status = PR_TRUE;              \
-	(void) setjmp(jb);			      \
-	(_thread)->md.jb[JB_SP] = (int) ((_sp) - 64); \
-	(_thread)->md.jb[JB_PC] = (int) _main;	      \
-	_thread->no_sched = 0; \
-    PR_END_MACRO
-
-/*
-** Switch away from the current thread context by saving its state and
-** calling the thread scheduler. Reload cpu when we come back from the
-** context switch because it might have changed.
-*
-*  XXX RUNQ lock needed before clearing _PR_NO_SCHED flag, because the
-*      thread may be unr RUNQ?
-*/
-#define _MD_SWITCH_CONTEXT(_thread) \
-    PR_BEGIN_MACRO    \
-    PR_ASSERT(_thread->no_sched); \
-    if (!setjmp(_thread->md.jb)) { \
-        _MD_SAVE_ERRNO(_thread) \
-        _MD_SET_LAST_THREAD(_thread); \
-        _PR_Schedule(); \
-    } else {      \
-        PR_ASSERT(_MD_LAST_THREAD() !=_MD_CURRENT_THREAD()); \
-            _MD_LAST_THREAD()->no_sched = 0;			\
-    }             \
-    PR_END_MACRO
-
-/*
-** Restore a thread context that was saved by _MD_SWITCH_CONTEXT or
-** initialized by _MD_INIT_CONTEXT.
-*/
-#define _MD_RESTORE_CONTEXT(_newThread) \
-    PR_BEGIN_MACRO \
-    int *jb = (_newThread)->md.jb; \
-    _MD_RESTORE_ERRNO(_newThread) \
-    _MD_SET_CURRENT_THREAD(_newThread); \
-    _newThread->no_sched = 1;		\
-    longjmp(jb, 1); \
-    PR_END_MACRO
-
-NSPR_API(PRStatus) _MD_InitThread(struct PRThread *thread,
-								PRBool wakeup_parent);
-NSPR_API(PRStatus) _MD_InitAttachedThread(struct PRThread *thread,
-									PRBool wakeup_parent);
-#define _MD_INIT_THREAD(thread) 			_MD_InitThread(thread, PR_TRUE)
-#define _MD_INIT_ATTACHED_THREAD(thread)		\
-						_MD_InitAttachedThread(thread, PR_FALSE)
-
-NSPR_API(void) _MD_ExitThread(struct PRThread *thread);
-#define _MD_EXIT_THREAD _MD_ExitThread
-
-NSPR_API(void) _MD_SuspendThread(struct PRThread *thread);
-#define _MD_SUSPEND_THREAD _MD_SuspendThread
-
-NSPR_API(void) _MD_ResumeThread(struct PRThread *thread);
-#define _MD_RESUME_THREAD _MD_ResumeThread
-
-NSPR_API(void) _MD_SuspendCPU(struct _PRCPU *thread);
-#define _MD_SUSPEND_CPU _MD_SuspendCPU
-
-NSPR_API(void) _MD_ResumeCPU(struct _PRCPU *thread);
-#define _MD_RESUME_CPU _MD_ResumeCPU
-
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_RESUME_ALL()
-
-NSPR_API(void) _MD_InitLocks(void);
-#define _MD_INIT_LOCKS _MD_InitLocks
-
-NSPR_API(void) _MD_CleanThread(struct PRThread *thread);
-#define _MD_CLEAN_THREAD _MD_CleanThread
-
-#define _MD_YIELD()    sginap(0)
-
-/* The _PR_MD_WAIT_LOCK and _PR_MD_WAKEUP_WAITER functions put to sleep and
- * awaken a thread which is waiting on a lock or cvar.
- */
-NSPR_API(PRStatus) _MD_wait(struct PRThread *, PRIntervalTime timeout);
-#define _MD_WAIT _MD_wait
-
-NSPR_API(void) _PR_MD_primordial_cpu();
-NSPR_API(void) _PR_MD_WAKEUP_PRIMORDIAL_CPU();
-
-NSPR_API(PRStatus) _MD_WakeupWaiter(struct PRThread *);
-#define _MD_WAKEUP_WAITER _MD_WakeupWaiter
-
-NSPR_API(void ) _MD_exit(PRIntn status);
-#define _MD_EXIT	_MD_exit
-
-#include "prthread.h"
-
-NSPR_API(void) _MD_SetPriority(struct _MDThread *thread,
-	PRThreadPriority newPri);
-#define _MD_SET_PRIORITY _MD_SetPriority
-
-NSPR_API(PRStatus) _MD_CreateThread(
-                        struct PRThread *thread,
-                        void (*start) (void *),
-                        PRThreadPriority priority,
-                        PRThreadScope scope,
-                        PRThreadState state,
-                        PRUint32 stackSize);
-#define _MD_CREATE_THREAD _MD_CreateThread
-
-extern void _MD_CleanupBeforeExit(void);
-#define _MD_CLEANUP_BEFORE_EXIT _MD_CleanupBeforeExit
-
-NSPR_API(void) _PR_MD_PRE_CLEANUP(PRThread *me);
-
-
-/* The following defines the unwrapped versions of select() and poll(). */
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *exceptfds, struct timeval *timeout);
-#define _MD_SELECT	_select
-
-#include <stropts.h>
-#include <poll.h>
-#define _MD_POLL _poll
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-
-#define HAVE_THREAD_AFFINITY 1
-
-NSPR_API(PRInt32) _MD_GetThreadAffinityMask(PRThread *unused, PRUint32 *mask);
-#define _MD_GETTHREADAFFINITYMASK _MD_GetThreadAffinityMask
-
-NSPR_API(void) _MD_InitRunningCPU(struct _PRCPU *cpu);
-#define    _MD_INIT_RUNNING_CPU _MD_InitRunningCPU
-
-#endif  /* defined(_PR_PTHREADS) */
-
-#endif /* _LANGUAGE_ASSEMBLY */
-
-#endif /* nspr_irix_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_irix32.cfg b/libs/js/nsprpub/pr/include/md/_irix32.cfg
deleted file mode 100644
index db6ca446d4..0000000000
--- a/libs/js/nsprpub/pr/include/md/_irix32.cfg
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef _SGI_MP_SOURCE
-#define _SGI_MP_SOURCE
-#endif
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef IRIX
-#define IRIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_irix64.cfg b/libs/js/nsprpub/pr/include/md/_irix64.cfg
deleted file mode 100644
index 305317ea8b..0000000000
--- a/libs/js/nsprpub/pr/include/md/_irix64.cfg
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef _SGI_MP_SOURCE
-#define _SGI_MP_SOURCE
-#endif
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef IRIX
-#define IRIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_linux.cfg b/libs/js/nsprpub/pr/include/md/_linux.cfg
deleted file mode 100644
index 6083d5ed64..0000000000
--- a/libs/js/nsprpub/pr/include/md/_linux.cfg
+++ /dev/null
@@ -1,712 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This file is used by not only Linux but also other glibc systems
- * such as GNU/Hurd and GNU/k*BSD.
- */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#if !defined(LINUX) && defined(__linux__)
-#define LINUX
-#endif
-
-#define PR_AF_INET6 10  /* same as AF_INET6 */
-
-#ifdef __powerpc64__
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__powerpc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__alpha)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__ia64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__x86_64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__mc68000__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     2
-#define PR_ALIGN_OF_LONG    2
-#define PR_ALIGN_OF_INT64   2
-#define PR_ALIGN_OF_FLOAT   2
-#define PR_ALIGN_OF_DOUBLE  2
-#define PR_ALIGN_OF_POINTER 2
-#define PR_ALIGN_OF_WORD    2
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__)
-
-#undef	IS_LITTLE_ENDIAN
-#define	IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__mips__)
-
-#ifdef __MIPSEB__
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#elif defined(__MIPSEL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown MIPS endianness."
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__arm__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__hppa__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390x__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#define	HAVE_LONG_LONG
-#if PR_ALIGN_OF_DOUBLE == 8
-#define HAVE_ALIGNED_DOUBLES
-#endif
-#if PR_ALIGN_OF_INT64 == 8
-#define HAVE_ALIGNED_LONGLONGS
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_linux.h b/libs/js/nsprpub/pr/include/md/_linux.h
deleted file mode 100644
index 92a5f38aa6..0000000000
--- a/libs/js/nsprpub/pr/include/md/_linux.h
+++ /dev/null
@@ -1,559 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_linux_defs_h___
-#define nspr_linux_defs_h___
-
-#include "prthread.h"
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"linux"
-#define _PR_SI_SYSNAME  "LINUX"
-#ifdef __powerpc64__
-#define _PR_SI_ARCHITECTURE "ppc64"
-#elif defined(__powerpc__)
-#define _PR_SI_ARCHITECTURE "ppc"
-#elif defined(__alpha)
-#define _PR_SI_ARCHITECTURE "alpha"
-#elif defined(__ia64__)
-#define _PR_SI_ARCHITECTURE "ia64"
-#elif defined(__x86_64__)
-#define _PR_SI_ARCHITECTURE "x86-64"
-#elif defined(__mc68000__)
-#define _PR_SI_ARCHITECTURE "m68k"
-#elif defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#elif defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__mips__)
-#define _PR_SI_ARCHITECTURE "mips"
-#elif defined(__arm__)
-#define _PR_SI_ARCHITECTURE "arm"
-#elif defined(__hppa__)
-#define _PR_SI_ARCHITECTURE "hppa"
-#elif defined(__s390x__)
-#define _PR_SI_ARCHITECTURE "s390x"
-#elif defined(__s390__)
-#define _PR_SI_ARCHITECTURE "s390"
-#else
-#error "Unknown CPU architecture"
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef	HAVE_STACK_GROWING_UP
-
-/*
- * Elf linux supports dl* functions
- */
-#define HAVE_DLL
-#define USE_DLFCN
-
-#if defined(__i386__)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
-extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
-extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
-extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET                _PR_x86_AtomicSet
-#endif
-
-#if defined(__ia64__)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT          _PR_ia64_AtomicIncrement
-extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
-extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
-extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
-#endif
-
-#if defined(__x86_64__)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
-extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
-extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
-extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
-#endif
-
-#if defined(__alpha)
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_ADD(ptr, i) ({               \
-    PRInt32 __atomic_tmp, __atomic_ret;   \
-    __asm__ __volatile__(                       \
-    "1: ldl_l   %[ret], %[val]          \n"     \
-    "   addl    %[ret], %[inc], %[tmp]  \n"     \
-    "   addl    %[ret], %[inc], %[ret]  \n"     \
-    "   stl_c   %[tmp], %[val]          \n"     \
-    "   beq     %[tmp], 2f              \n"     \
-    ".subsection 2                      \n"     \
-    "2: br      1b                      \n"     \
-    ".previous"                                 \
-    : [ret] "=&r" (__atomic_ret),               \
-      [tmp] "=&r" (__atomic_tmp),               \
-      [val] "=m" (*ptr)                         \
-    : [inc] "Ir" (i), "m" (*ptr));              \
-    __atomic_ret;                               \
-})
-#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1)
-#define _MD_ATOMIC_DECREMENT(ptr) ({            \
-    PRInt32 __atomic_tmp, __atomic_ret;   \
-    __asm__ __volatile__(                       \
-    "1: ldl_l   %[ret], %[val]          \n"     \
-    "   subl    %[ret], 1, %[tmp]       \n"     \
-    "   subl    %[ret], 1, %[ret]       \n"     \
-    "   stl_c   %[tmp], %[val]          \n"     \
-    "   beq     %[tmp], 2f              \n"     \
-    ".subsection 2                      \n"     \
-    "2: br      1b                      \n"     \
-    ".previous"                                 \
-    : [ret] "=&r" (__atomic_ret),               \
-      [tmp] "=&r" (__atomic_tmp),               \
-      [val] "=m" (*ptr)                         \
-    : "m" (*ptr));                              \
-    __atomic_ret;                               \
-})
-#define _MD_ATOMIC_SET(ptr, n) ({               \
-    PRInt32 __atomic_tmp, __atomic_ret;   \
-    __asm__ __volatile__(                       \
-    "1: ldl_l   %[ret], %[val]          \n"     \
-    "   mov     %[newval], %[tmp]       \n"     \
-    "   stl_c   %[tmp], %[val]          \n"     \
-    "   beq     %[tmp], 2f              \n"     \
-    ".subsection 2                      \n"     \
-    "2: br      1b                      \n"     \
-    ".previous"                                 \
-    : [ret] "=&r" (__atomic_ret),               \
-      [tmp] "=&r"(__atomic_tmp),                \
-      [val] "=m" (*ptr)                         \
-    : [newval] "Ir" (n), "m" (*ptr));           \
-    __atomic_ret;                               \
-})
-#endif
-
-#define USE_SETJMP
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _PR_POLL_AVAILABLE
-#endif
-#undef _PR_USE_POLL
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#if defined(__alpha) || defined(__ia64__)
-#define _PR_HAVE_LARGE_OFF_T
-#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-#define _PR_HAVE_OFF64_T
-#else
-#define _PR_NO_LARGE_FILES
-#endif
-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-#define _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#endif
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS)
-#define _PR_HAVE_GETHOST_R
-#define _PR_HAVE_GETHOST_R_INT
-#endif
-
-#ifdef _PR_PTHREADS
-
-extern void _MD_CleanupBeforeExit(void);
-#define _MD_CLEANUP_BEFORE_EXIT _MD_CleanupBeforeExit
-
-#else  /* ! _PR_PTHREADS */
-
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	sigjmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-#ifdef __powerpc__
-/*
- * PowerPC based MkLinux
- *
- * On the PowerPC, the new style jmp_buf isn't used until glibc
- * 2.1.
- */
-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[JB_GPR1]
-#else
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__misc[0]
-#endif /* glibc 2.1 or later */
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-/* aix = 64, macos = 70 */
-#define PR_NUM_GCREGS  64
-
-#elif defined(__alpha)
-/* Alpha based Linux */
-
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[JB_SP]
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-#define _MD_SP_TYPE long int
-#else
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__sp
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-#define _MD_SP_TYPE __ptr_t
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-
-/* XXX not sure if this is correct, or maybe it should be 17? */
-#define PR_NUM_GCREGS 9
-
-#elif defined(__ia64__)
-
-#define _MD_GET_SP(_t)      ((long *)((_t)->md.context[0].__jmpbuf)[0])
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t)  &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t)  ((void *) 0)
-#define _MD_SP_TYPE         long int
-
-#define PR_NUM_GCREGS       _JBLEN
-
-#elif defined(__mc68000__)
-/* m68k based Linux */
-
-/*
- * On the m68k, glibc still uses the old style sigjmp_buf, even
- * in glibc 2.0.7.
- */
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__sp
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-#define _MD_SP_TYPE int
-#else
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__sp
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-#define _MD_SP_TYPE __ptr_t
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-
-/* XXX not sure if this is correct, or maybe it should be 17? */
-#define PR_NUM_GCREGS 9
-
-#elif defined(__sparc__)
-/* Sparc */
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-/*
- * You need glibc2-2.0.7-25 or later. The libraries that came with
- * Red Hat 5.1 are not new enough, but they are in 5.2.
- */
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[JB_SP]
-#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[JB_FP] = val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[JB_FP])
-#define _MD_SP_TYPE int
-#else
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__fp
-#define _MD_SET_FP(_t, val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) ((void *) 0)
-#define _MD_SP_TYPE __ptr_t
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-
-#elif defined(__i386__)
-/* Intel based Linux */
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[JB_SP]
-#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[JB_BP] = val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[JB_BP])
-#define _MD_SP_TYPE int
-#else
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__sp
-#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[0].__bp = val)
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) &((_t)->md.context[0].__jmpbuf[0].__bp)
-#define _MD_SP_TYPE __ptr_t
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-#define PR_NUM_GCREGS   6
-
-#elif defined(__mips__)
-/* Linux/MIPS */
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__sp
-#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[0].__fp = (val))
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[0].__fp)
-#define _MD_SP_TYPE __ptr_t
-#else
-#error "Linux/MIPS pre-glibc2 not supported yet"
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-
-#elif defined(__arm__)
-/* ARM/Linux */
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
-#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
-#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[19])
-#define _MD_SP_TYPE __ptr_t
-#else
-#error "ARM/Linux pre-glibc2 not supported yet"
-#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif /*__powerpc__*/
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#ifdef __powerpc__
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (sigsetjmp(CONTEXT(_thread), 1)) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 128); \
-	_thread->md.sp = _MD_GET_SP_PTR(_thread); \
-	_thread->md.fp = _MD_GET_FP_PTR(_thread); \
-    _MD_SET_FP(_thread, 0); \
-}
-
-#elif defined(__mips__)
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    (void) sigsetjmp(CONTEXT(_thread), 1);  \
-    _thread->md.context[0].__jmpbuf[0].__pc = (__ptr_t) _main;  \
-    _MD_GET_SP(_thread) = (_MD_SP_TYPE) ((_sp) - 64); \
-    _thread->md.sp = _MD_GET_SP_PTR(_thread); \
-    _thread->md.fp = _MD_GET_FP_PTR(_thread); \
-    _MD_SET_FP(_thread, 0); \
-}
-
-#else
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (sigsetjmp(CONTEXT(_thread), 1)) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (_MD_SP_TYPE) ((_sp) - 64); \
-	_thread->md.sp = _MD_GET_SP_PTR(_thread); \
-	_thread->md.fp = _MD_GET_FP_PTR(_thread); \
-    _MD_SET_FP(_thread, 0); \
-}
-
-#endif /*__powerpc__*/
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    siglongjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-	void *sp;
-	void *fp;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#include <sys/time.h>  /* for FD_SETSIZE */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize);
-extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri);
-extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(PRThread *);
-extern void _MD_YIELD(void);
-
-#endif /* ! _PR_PTHREADS */
-
-extern void _MD_EarlyInit(void);
-extern PRIntervalTime _PR_UNIX_GetInterval(void);
-extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-
-#define _MD_EARLY_INIT                  _MD_EarlyInit
-#define _MD_FINAL_INIT					_PR_UnixInit
-#define _MD_GET_INTERVAL                _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC            _PR_UNIX_TicksPerSecond
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT __select
-
-#ifdef _PR_POLL_AVAILABLE
-#include <sys/poll.h>
-extern int __syscall_poll(struct pollfd *ufds, unsigned long int nfds,
-	int timeout);
-#define _MD_POLL __syscall_poll
-#endif
-
-/* For writev() */
-#include <sys/uio.h>
-
-extern void _MD_linux_map_sendfile_error(int err);
-
-#endif /* nspr_linux_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_macos.h b/libs/js/nsprpub/pr/include/md/_macos.h
deleted file mode 100644
index dbcab4090b..0000000000
--- a/libs/js/nsprpub/pr/include/md/_macos.h
+++ /dev/null
@@ -1,725 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prmacos_h___
-#define prmacos_h___
-
-//
-// This file contains all changes and additions which need to be made to the NSPR runtime 
-// for the Macintosh platform (specifically the Metrowerks environment).  This file should 
-// only be incluced in Macintosh builds.
-//
-
-#define PR_DLL_SUFFIX		""
-#define _PR_LOCAL_THREADS_ONLY
-#define _PR_NO_PREEMPT	1
-#define _PR_HAVE_ATOMIC_OPS 1
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlong.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "prsem.h"
-#include "prthread.h"
-#include "prtime.h"
-#include "prproces.h"
-
-#if !defined(MAC_NSPR_STANDALONE)
-#include "macstdlibextras.h"
-#endif
-
-#include <stddef.h>
-#include <setjmp.h>
-
-#include <Errors.h>
-#include <OpenTransport.h>
-#include <DriverServices.h>
-
-#define _PR_HAVE_PEEK_BUFFER
-#define _PR_PEEK_BUFFER_MAX (16 * 1024)
-#define _PR_FD_NEED_EMULATE_MSG_PEEK(fd) 1
-
-struct _MDProcess {
-    PRInt8 notused;
-};
-
-struct _MDThread {
-    jmp_buf      jb;
-    int          osErrCode;
-	PRLock *     asyncIOLock;
-	PRCondVar *  asyncIOCVar;
-    PRBool       missedIONotify;
-    PRBool       missedAsyncNotify;
-    PRBool       asyncNotifyPending;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-struct _MDCPU {
-    AbsoluteTime    lastThreadSwitch;
-    AbsoluteTime    lastWakeUpProcess;
-    PRBool          trackScheduling;
-};
-
-typedef struct _MDSocketCallerInfo {
-	PRThread *	thread;
-	void *		cookie;
-} _MDSocketCallerInfo;
-
-struct _MDFileDesc {
-    PRInt32         osfd;
-    PRPackedBool    orderlyDisconnect;
-    PRPackedBool    readReady;
-    PRPackedBool    writeReady;
-    PRPackedBool    exceptReady;
-    PRLock *        miscLock;
-
-    /* Server sockets: listen bit tells the notifier func what to do */
-    PRBool          doListen;
-
-    /* stored error for non-blocking connects, as a Unix-style error code */
-    OTReason        disconnectError;
-
-    _MDSocketCallerInfo  misc;
-    _MDSocketCallerInfo  read;
-    _MDSocketCallerInfo  write;
-};
-
-/*
-** Iinitialization Related definitions
-*/
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_MD_FinalInit
-
-/*
-** Interrupts Related definitions
-*/
-
-#define _MD_GET_INTSOFF()               (_pr_intsOff)
-
-#define _MD_INTSOFF(_is)                                  \
-    PR_BEGIN_MACRO                                        \
-        ENTER_CRITICAL_REGION();                          \
-        (_is) = _PR_MD_GET_INTSOFF();                     \
-        _PR_MD_SET_INTSOFF(1);                            \
-        LEAVE_CRITICAL_REGION();                          \
-    PR_END_MACRO
-
-#if TARGET_CARBON
-extern void _MD_SetIntsOff(PRInt32 ints);
-#define _MD_SET_INTSOFF(_val)           _MD_SetIntsOff(_val)
-#else /* not TARGET_CARBON */
-#define _MD_SET_INTSOFF(_val)           (_pr_intsOff = _val)
-#endif /* TARGET_CARBON */
-
-#define _MD_START_INTERRUPTS			_MD_StartInterrupts
-#define _MD_STOP_INTERRUPTS	    		_MD_StopInterrupts
-#define _MD_BLOCK_CLOCK_INTERRUPTS()
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _MD_DISABLE_CLOCK_INTERRUPTS()
-#define _MD_ENABLE_CLOCK_INTERRUPTS()
-
-/*
-** CPU Related definitions
-*/
-
-#define _MD_PAUSE_CPU		_MD_PauseCPU
-#define _MD_CLEANUP_BEFORE_EXIT()
-#define _MD_EXIT(status)	exit(status)
-#define _MD_INIT_CPUS()
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_InitRunningCPU(cpu)
-
-/*
-** Process Related definitions
-*/
-
-extern struct PRProcess * _MD_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-#define _MD_CREATE_PROCESS _MD_CreateProcess
-
-extern PRStatus _MD_DetachProcess(PRProcess *process);
-#define _MD_DETACH_PROCESS _MD_DetachProcess
-
-extern PRStatus _MD_WaitProcess(PRProcess *process, PRInt32 *exitCode);
-#define _MD_WAIT_PROCESS _MD_WaitProcess
-
-extern PRStatus _MD_KillProcess(PRProcess *process);
-#define _MD_KILL_PROCESS _MD_KillProcess
-
-/*
-** Memory Segments Related definitions
-*/
-
-#define _MD_INIT_SEGS()
-
-/*
-** Thread Stacks Debugging Related definitions
-*/
-
-#define _MD_INIT_STACK		_MD_InitStack
-#define _MD_CLEAR_STACK		_MD_ClearStack
-
-/*
-** Locks Related definitions
-*/
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) (PR_SUCCESS)
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-
-/*
-** Thread Related definitions
-*/
-
-NSPR_API(PRThread *) PR_GetPrimaryThread();
-
-#if defined(powerc) || defined(__powerc)
-#define _MD_GET_PC(_t) (*((PRUint32 *)((_t)->md.jb)))
-#define _MD_GET_SP(_t) (*((PRUint32 *)((_t)->md.jb) + 2))
-#define _MD_GET_TOC(_t) (*((PRUint32 *)((_t)->md.jb) + 3))
-#define INIT_STACKPTR(stackTop) ((unsigned char*)stackTop - 128)
-#define PR_NUM_GCREGS 70
-#else
-#define _MD_GET_PC(_t) (*((PRUint32 *)((_t)->md.jb) + 6))
-#define _MD_GET_SP(_t) (*((PRUint32 *)((_t)->md.jb) + 12))
-#define INIT_STACKPTR(stackTop) ((unsigned char*)stackTop - 4)
-#define PR_NUM_GCREGS 13
-#endif
-
-#define _MD_DEFAULT_STACK_SIZE (58 * 1024)
-#define _MD_MINIMUM_STACK_SIZE (58 * 1024)
-
-/*
-** Initialize the thread machine dependent data structure
-*/
-extern PRStatus _MD_InitThread(PRThread *thread);
-#define _MD_INIT_THREAD	_MD_InitThread
-
-/*
-** Clean-up the thread machine dependent data structure
-*/
-#define	_MD_CLEAN_THREAD(_thread)						\
-    PR_BEGIN_MACRO				      					\
-	PR_DestroyCondVar(_thread->md.asyncIOCVar);			\
-	PR_DestroyLock(_thread->md.asyncIOLock);			\
-    PR_END_MACRO
-
-
-/*
-** Initialize the thread context preparing it to execute _main.
-** *sp = 0 zeros out the sp for the first stack frame so that
-** stack walking code can find the top of the stack.
-*/
-#if defined(powerc) || defined(__powerc)
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, _status)	\
-    PR_BEGIN_MACRO				      					\
- 	unsigned char *sp;									\
- 	unsigned long *tvect;								\
-	long **jb = (_thread)->md.jb;		      			\
-    *((PRBool *)_status) = PR_TRUE;              		\
-	(void) setjmp(jb);			      					\
-    sp = INIT_STACKPTR(_sp);							\
-    *sp = 0;                                            \
-    (_MD_GET_SP(_thread)) = (long) sp;   				\
-	tvect = (unsigned long *)_main;						\
-    (_MD_GET_PC(_thread)) = (int) *tvect;   			\
-    (_MD_GET_TOC(_thread)) = (int) *(tvect+1);   		\
-	_thread->no_sched = 0;                              \
-    PR_END_MACRO
-#else
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, _status)	\
-    PR_BEGIN_MACRO				      					\
- 	unsigned char *sp;									\
-	long **jb = (_thread)->md.jb;		      			\
-    *((PRBool *)_status) = PR_TRUE;              		\
-	(void) setjmp(jb);			      					\
-    sp = INIT_STACKPTR(_sp);							\
-    (_MD_GET_SP(_thread)) = (long) sp;   				\
-    (_MD_GET_PC(_thread)) = (int) _main;   				\
-	_thread->no_sched = 0;                              \
-    PR_END_MACRO
-#endif
-
-/*
-** Switch away from the current thread context by saving its state and
-** calling the thread scheduler. Reload cpu when we come back from the
-** context switch because it might have changed.
-*/
-/*    	ResetTimer();	before _PR_Schedule()		   		*/
-
-
-#define _MD_SWITCH_CONTEXT(_thread)                                 \
-    PR_BEGIN_MACRO                                                  \
-    PR_ASSERT(_thread->no_sched);                                   \
-    if (!setjmp(_thread->md.jb)) {                                  \
-        _MD_SET_LAST_THREAD(_thread);                               \
-        if (_PR_MD_CURRENT_CPU()->md.trackScheduling)               \
-            _PR_MD_CURRENT_CPU()->md.lastThreadSwitch = UpTime();   \
-        _PR_Schedule();                                             \
-    } else {                                                        \
-        PR_ASSERT(_MD_LAST_THREAD() !=_MD_CURRENT_THREAD());        \
-        _MD_LAST_THREAD()->no_sched = 0;                            \
-    }                                                               \
-    PR_END_MACRO
-
-/*
-** Restore a thread context that was saved by _MD_SWITCH_CONTEXT or
-** initialized by _MD_INIT_CONTEXT.
-*/
-#define _MD_RESTORE_CONTEXT(_newThread)	    \
-    PR_BEGIN_MACRO			    			\
-	long **jb = (_newThread)->md.jb;	    \
-	_MD_SET_CURRENT_THREAD(_newThread); 	\
-    _newThread->no_sched = 1;		        \
-	longjmp(jb, 1);			    			\
-    PR_END_MACRO
-
-
-#define _MD_ERRNO()	 _MD_CURRENT_THREAD()->md.osErrCode
-
-extern PRStatus _MD_wait(PRThread *thread, PRIntervalTime timeout);
-#define _MD_WAIT	_MD_wait
-
-/*
-** Combined thread model related definitions
-*/
-
-#define _MD_CREATE_THREAD(a,b,c,d,e,f) (PR_SUCCESS)
-#define _MD_WAKEUP_WAITER(a)
-#define _MD_SET_PRIORITY(a,b)
-
-/*
-** File I/O Related definitions
-*/
-
-extern PRInt32 _PR_MD_WRITE_SYNC(PRFileDesc *fd, void *buf, PRInt32 amount);
-#define    _PR_MD_WRITE_SYNC _MD_WRITE_SYNC
-
-struct _MDDir {
-	short		ioVRefNum;
-	long		ioDirID;
-	short		ioFDirIndex;
-	char		*currentEntryName;
-};
-
-#define PR_DIRECTORY_SEPARATOR		'/'
-#define PR_DIRECTORY_SEPARATOR_STR	"/"
-#define PR_PATH_SEPARATOR		':'
-#define PR_PATH_SEPARATOR_STR		":"
-
-typedef enum IOOperation {
-    READ_ASYNC,
-    WRITE_ASYNC
-} IOOperation;
-
-
-#define _MD_INIT_IO()
-
-#define _MD_OPEN 					_MD_Open
-#define _MD_OPEN_FILE 				_MD_Open
-#define _MD_CLOSE_FILE 				FSClose
-#define _MD_READ(fd,buf,amount) 	ReadWriteProc(fd,buf,amount,READ_ASYNC)
-#define _MD_WRITE(fd,buf,amount) 	ReadWriteProc(fd,buf,amount,WRITE_ASYNC)
-#define _MD_WRITE_SYNC(fd,buf,amount) WriteSyncProc(fd,buf,amount)
-#define _MD_GET_FILE_ERROR() 		_PR_MD_CURRENT_THREAD()->md.osErrCode
-#define _MD_LSEEK 					_MD_LSeek
-#define _MD_FSYNC 					_MD_FSync
-
-/* to be implemented */
-#define _MD_LSEEK64(a,b,c)           LL_ZERO
-#define _MD_GETOPENFILEINFO64(fd,info)   -1
-#define _MD_GETFILEINFO64(fd,info)   -1
-
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
-** File Manipulation definitions
-*/
-
-#define	_MD_RENAME 			_MD_Rename
-#define	_MD_ACCESS 			_MD_Access
-
-#define	_MD_GETFILEINFO 	_MD_GetFileInfo
-#define	_MD_GETOPENFILEINFO _MD_GetOpenFileInfo
-
-#define	_MD_STAT 			_MD_Stat
-
-#define	_MD_DELETE 			_MD_Delete
-
-extern PRStatus _MD_LockFile(PRInt32 osfd);
-#define	_MD_LOCKFILE 		_MD_LockFile
-extern PRStatus _MD_TLockFile(PRInt32 osfd);
-#define	_MD_TLOCKFILE 		_MD_TLockFile
-extern PRStatus _MD_UnlockFile(PRInt32 osfd);
-#define	_MD_UNLOCKFILE		_MD_UnlockFile
-
-/* 
-** Directory enumeration related definitions 
-*/
-
-extern PRStatus _MD_OpenDir(struct _MDDir *md,const char *name);
-#define	_MD_OPEN_DIR 		_MD_OpenDir
-
-extern char* _MD_ReadDir(struct _MDDir *md,PRIntn flags);
-#define	_MD_READ_DIR 		_MD_ReadDir
-
-#define	_MD_CLOSE_DIR 		_MD_CloseDir
-
-#define	_MD_MKDIR 			_MD_MkDir
-#define	_MD_MAKE_DIR		_MD_MkDir
-#define	_MD_RMDIR 			_MD_Delete
-
-/*
-** Pipe I/O Related definitions (not implemented)
-*/
-
-#define _MD_PIPEAVAILABLE(fd) -1
-
-/*
-** Socket I/O Related definitions
-*/
-
-#if UNIVERSAL_INTERFACES_VERSION >= 0x0330
-/* In Universal Interfaces 3.3 and later, these are enums. */
-#define IP_TTL IP_TTL
-#define IP_TOS IP_TOS
-#define IP_ADD_MEMBERSHIP IP_ADD_MEMBERSHIP
-#define IP_DROP_MEMBERSHIP IP_DROP_MEMBERSHIP
-#define IP_MULTICAST_IF IP_MULTICAST_IF
-#define IP_MULTICAST_TTL IP_MULTICAST_TTL
-#define IP_MULTICAST_LOOP IP_MULTICAST_LOOP
-#define TCP_NODELAY TCP_NODELAY
-#define TCP_MAXSEG TCP_MAXSEG
-#endif
-
-#define _MD_SOCKET 			_MD_socket
-#define _MD_BIND			_MD_bind
-#define _MD_LISTEN			_MD_listen
-#define _MD_GETSOCKNAME		_MD_getsockname
-
-extern PRStatus _MD_getsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen);
-#define _MD_GETSOCKOPT		_MD_getsockopt
-
-extern PRStatus _MD_setsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen);
-#define _MD_SETSOCKOPT		_MD_setsockopt
-
-#define _MD_SOCKETAVAILABLE	_MD_socketavailable
-#define _MD_ACCEPT			_MD_accept
-#define _MD_CONNECT			_MD_connect
-#define _MD_SEND			_MD_send
-#define _MD_RECV			_MD_recv
-#define _MD_CLOSE_SOCKET	_MD_closesocket
-#define _MD_SENDTO			_MD_sendto
-#define _MD_RECVFROM		_MD_recvfrom
-#define _MD_PR_POLL			_MD_poll
-#define _MD_INIT_FILEDESC	_MD_initfiledesc
-#define _MD_FREE_FILEDESC	_MD_freefiledesc
-#define _MD_MAKE_NONBLOCK	_MD_makenonblock
-#define _MD_INIT_FD_INHERITABLE _MD_initfdinheritable
-#define _MD_QUERY_FD_INHERITABLE _MD_queryfdinheritable
-
-#define _MD_GET_SOCKET_ERROR() 		_PR_MD_CURRENT_THREAD()->md.osErrCode
-
-#define _PR_MD_MAP_SELECT_ERROR(x) 	(x)
-/*
-** Netdb Related definitions
-*/
-extern PRStatus _MD_gethostname(char *name, int namelen);
-#define _MD_GETHOSTNAME		_MD_gethostname
-#define _PR_GET_HOST_ADDR_AS_NAME
-
-/* 
-	XXX _MD_WRITEV, _MD_SHUTDOWN & _MD_GETPEERNAME not done yet!!!
-*/
-#define _MD_WRITEV			_MD_writev
-#define _MD_SHUTDOWN		_MD_shutdown
-#define _MD_GETPEERNAME		_MD_getpeername
-
-
-#ifdef OLD_MACSOCK_LIBRARY
-#define _MD_SOCKET 			macsock_socket
-#define _MD_LISTEN			macsock_listen
-#define _MD_SEND(fd,buf,amount,flags,timeout)	macsock_send(fd->secret->md.osfd,buf,amount,flags)
-#define _MD_SENDTO(fd,buf,amount,flags,addr,addrlen,timeout)	macsock_sendto(fd->secret->md.osfd,buf,amount,flags,(struct sockaddr *)addr,addrlen)
-#define _MD_RECV(fd,buf,amount,flags,timeout)	macsock_recv(fd->secret->md.osfd,buf,amount,flags)
-#define _MD_RECVFROM(fd,buf,amount,flags,addr,addrlen,timeout)	macsock_recvfrom(fd->secret->md.osfd,buf,amount,flags,(struct sockaddr *)addr,addrlen)
-#define _MD_CLOSE_SOCKET	macsock_close
-#define _MD_SHUTDOWN(a,b)	(0)
-
-#define _MD_ACCEPT(fd,addr,addrlen,timeout)	macsock_accept(fd->secret->md.osfd,(struct sockaddr *)addr,addrlen)
-#define _MD_CONNECT(fd,name,namelen,timeout)	macsock_connect(fd->secret->md.osfd,(struct sockaddr *)name,namelen)
-#define _MD_BIND(fd,name,namelen)				macsock_bind(fd->secret->md.osfd,(struct sockaddr *)name,namelen)
-#define _MD_GETSOCKNAME(fd,name,namelen)		macsock_getsockname(fd->secret->md.osfd,(struct sockaddr *)name,namelen)
-#define _MD_GETPEERNAME(fd,name,namelen)		macsock_getpeername(fd->secret->md.osfd,(struct sockaddr *)name,namelen)
-#define _MD_GETSOCKOPT(fd,level,optname,optval,optlen)		macsock_getsockopt(fd->secret->md.osfd,level,optname,optval,optlen)
-#define _MD_SETSOCKOPT(fd,level,optname,optval,optlen)		macsock_setsockopt(fd->secret->md.osfd,level,optname,optval,optlen)
-#define _MD_SOCKETAVAILABLE(fd,bytes)		macsock_socketavailable(fd->secret->md.osfd,bytes)
-#endif
-
-/*
-** Memory Segements Related definitions
-*/
-
-#define _MD_INIT_SEGS()		
-#define _MD_ALLOC_SEGMENT	_MD_AllocSegment
-#define _MD_FREE_SEGMENT	_MD_FreeSegment
-
-/*
-** Time Related definitions
-*/
-
-#define _MD_GET_INTERVAL 				_MD_GetInterval
-#define _MD_INTERVAL_PER_SEC() 			PR_MSEC_PER_SEC
-#define _MD_INTERVAL_INIT()
-
-/*
-** Environemnt Related definitions
-*/
-
-extern char *_MD_GetEnv(const char *name);
-#define _MD_GET_ENV			_MD_GetEnv
-
-extern int _MD_PutEnv(const char *variableCopy);
-#define _MD_PUT_ENV			_MD_PutEnv
-
-/*
-** Following is old stuff to be looked at.
-*/
-
-#define GCPTR
-#define CALLBACK
-typedef int (*FARPROC)();
-
-
-#define MAX_NON_PRIMARY_TIME_SLICES 	6
-
-extern long gTimeSlicesOnNonPrimaryThread;
-extern struct PRThread *gPrimaryThread;
-
-// Errors not found in the Mac StdCLib
-#define EACCES  		13      	// Permission denied
-#define ENOENT			-43			// No such file or directory
-#define _OS_INVALID_FD_VALUE -1
-
-#define	STDERR_FILENO	2
-
-#if !defined(MAC_NSPR_STANDALONE)
-#define PATH_SEPARATOR 					':'
-#define PATH_SEPARATOR_STR		        ":"
-#define DIRECTORY_SEPARATOR				'/'
-#define DIRECTORY_SEPARATOR_STR			"/"
-#endif
-
-#define UNIX_THIS_DIRECTORY_STR			"./"
-#define UNIX_PARENT_DIRECTORY_STR		"../"
-
-
-// Alias a few names
-#define getenv	PR_GetEnv
-#define putenv	_MD_PutEnv
-
-#if defined(MAC_NSPR_STANDALONE)
-typedef unsigned char (*MemoryCacheFlusherProc)(size_t size);
-typedef void (*PreAllocationHookProc)(void);
-
-extern char *strdup(const char *source);
-
-extern void InstallPreAllocationHook(PreAllocationHookProc newHook);
-extern void InstallMemoryCacheFlusher(MemoryCacheFlusherProc newFlusher);
-#endif
-
-extern char *PR_GetDLLSearchPath(void);
-
-#if defined(MAC_NSPR_STANDALONE)
-extern int strcmp(const char *str1, const char *str2);
-extern int strcasecmp(const char *str1, const char *str2);
-#endif
-
-extern void MapFullToPartialMacFile(char *);
-extern char *MapPartialToFullMacFile(const char *);
-
-extern void ResetTimer(void);
-extern void PR_PeriodicIdle(void);
-extern void ActivateTimer(void);
-extern void DeactivateTimer(void);
-extern void PR_InitMemory(void);
-
-extern struct hostent *gethostbyaddr(const void *addr, int addrlen, int type);
-
-extern short GetVolumeRefNumFromName(const char *);
-
-#include <stdio.h>			// Needed to get FILE typedef
-extern FILE *_OS_FOPEN(const char *filename, const char *mode);
-//
-//	Macintosh only private parts.
-//
-
-#define	dprintTrace			";dprintf;doTrace"
-#define	dprintNoTrace		";dprintf"
-extern void dprintf(const char *format, ...);
-
-
-// Entry into the memory system's cache flushing
-#if defined(MAC_NSPR_STANDALONE)
-extern PRUint8 CallCacheFlushers(size_t blockSize);
-#endif
-
-#if defined(MAC_NSPR_STANDALONE)
-extern void* reallocSmaller(void* block, size_t newSize);
-#endif
-
-
-/*
-** PR_GetSystemInfo related definitions
-*/
-#define _PR_SI_SYSNAME          "MacOS"
-#define _PR_SI_ARCHITECTURE     "PowerPC"
-
-/*
- * Memory-mapped files
- */
-
-struct _MDFileMap {
-    PRInt8 unused;
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-extern PRInt32 _MD_GetMemMapAlignment(void);
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_GetMemMapAlignment
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-extern void SetLogFileTypeCreator(const char *logFile);
-extern int _MD_mac_get_nonblocking_connect_error(PRFileDesc* fd);
-
-
-/*
- * Critical section support
- */
-
-#define MAC_CRITICAL_REGIONS  TARGET_CARBON
-
-#if MAC_CRITICAL_REGIONS
-
-extern void InitCriticalRegion();
-extern void TermCriticalRegion();
-
-extern void EnterCritialRegion();
-extern void LeaveCritialRegion();
-
-#define INIT_CRITICAL_REGION()     InitCriticalRegion()
-#define TERM_CRITICAL_REGION()     TermCriticalRegion()
-
-#define ENTER_CRITICAL_REGION()     EnterCritialRegion()
-#define LEAVE_CRITICAL_REGION()     LeaveCritialRegion()
-
-#else
-
-#define INIT_CRITICAL_REGION()
-#define TERM_CRITICAL_REGION()
-
-#define ENTER_CRITICAL_REGION()
-#define LEAVE_CRITICAL_REGION()
-
-#endif
-
-
-
-/*
- * CPU Idle support
- */
-
-extern void InitIdleSemaphore();
-extern void TermIdleSemaphore();
-
-extern void WaitOnIdleSemaphore();
-extern void SignalIdleSemaphore();
-
-
-/*
- * Atomic operations
- */
-#ifdef _PR_HAVE_ATOMIC_OPS
-
-extern PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval);
-
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(val)   OTAtomicAdd32(1, (SInt32 *)val)
-#define _MD_ATOMIC_ADD(ptr, val)    OTAtomicAdd32(val, (SInt32 *)ptr)
-#define _MD_ATOMIC_DECREMENT(val)   OTAtomicAdd32(-1, (SInt32 *)val)
-#define _MD_ATOMIC_SET(val, newval) _MD_AtomicSet(val, newval)
-
-#endif /* _PR_HAVE_ATOMIC_OPS */
-
-
-#endif /* prmacos_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_ncr.cfg b/libs/js/nsprpub/pr/include/md/_ncr.cfg
deleted file mode 100644
index c8a32bfbf4..0000000000
--- a/libs/js/nsprpub/pr/include/md/_ncr.cfg
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NCR
-#define NCR
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_ncr.h b/libs/js/nsprpub/pr/include/md/_ncr.h
deleted file mode 100644
index d094c2ee50..0000000000
--- a/libs/js/nsprpub/pr/include/md/_ncr.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_unixware_defs_h___
-#define nspr_unixware_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"ncr"
-#define _PR_SI_SYSNAME		"NCR"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE	 	0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */
-
-#if !defined (HAVE_STRERROR)
-#define HAVE_STRERROR
-#endif
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_NO_LARGE_FILES
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_NETCONFIG
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define NEED_LOCALTIME_R
-#define NEED_GMTIME_R  
-#define NEED_ASCTIME_R
-#define NEED_STRTOK_R
-#define NEED_CTIME_R
-#define _PR_NEED_STRCASECMP
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP setjmp
-#define _LONGJMP longjmp
-#define _PR_CONTEXT_TYPE         jmp_buf
-#define _MD_GET_SP(_t)           (_t)->md.context[4]
-#define _PR_NUM_GCREGS	_JBLEN
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-{								  \
-    *status = PR_TRUE; \
-    if(_SETJMP(CONTEXT(_thread))) (*_main)(); \
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!_SETJMP(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    _LONGJMP(CONTEXT(_thread), 1);    \
-}
-
-/* Machine-dependent (MD) data structures.
- * Don't use SVR4 native threads (yet). 
- */
-
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
- * The following are copied from _sunos.h, _aix.h.  This means
- * some of them should probably be moved into _unixos.h.  But
- * _irix.h seems to be quite different in regard to these macros.
- */
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *execptfds, struct timeval *timeout);
-#define _MD_SELECT _select
-
-#define _MD_POLL _poll
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-#endif /* nspr_ncr_defs_h */
diff --git a/libs/js/nsprpub/pr/include/md/_nec.cfg b/libs/js/nsprpub/pr/include/md/_nec.cfg
deleted file mode 100644
index 558a5251cb..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nec.cfg
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NEC
-#define NEC
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#undef  HAVE_LONG_LONG
-#undef  HAVE_ALIGNED_DOUBLES
-#undef  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nec.h b/libs/js/nsprpub/pr/include/md/_nec.h
deleted file mode 100644
index ed7e8a36df..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_nec_defs_h___
-#define nspr_nec_defs_h___
- 
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH  "nec"
-#define _PR_SI_SYSNAME "NEC"
-#define _PR_SI_ARCHITECTURE "mips"
-#define PR_DLL_SUFFIX		".so"
- 
-#define _PR_STACK_VMBASE        0x50000000
-#define _MD_DEFAULT_STACK_SIZE  65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_DLFCN
-#define NEED_TIME_R
-#define NEED_STRFTIME_LOCK
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ST_ATIM_UNION
- 
-#include <ucontext.h>
-#include <sys/regset.h>
- 
-#define PR_NUM_GCREGS   NGREG
-#define PR_CONTEXT_TYPE ucontext_t
- 
-#define CONTEXT(_thread) (&(_thread)->md.context)
- 
-#define _MD_GET_SP(_t)    (_t)->md.context.uc_mcontext.gregs[CXT_SP]
- 
-/*
-** Initialize the thread context preparing it to execute "e(o,a)"
-*/
-#define _MD_INIT_CONTEXT(thread, _sp, _main, status)               \
-{                                                                   \
-    *status = PR_TRUE; \
-    getcontext(CONTEXT(thread));                                    \
-    CONTEXT(thread)->uc_stack.ss_sp = (char*) (thread)->stack->stackBottom; \
-    CONTEXT(thread)->uc_stack.ss_size = (thread)->stack->stackSize; \
-    _MD_GET_SP(thread) = (greg_t) _sp - 64;             \
-    makecontext(CONTEXT(thread), _main, 0);              \
-}
- 
-#define _MD_SWITCH_CONTEXT(_thread)      \
-    if (!getcontext(CONTEXT(_thread))) { \
-        (_thread)->md.errcode = errno;      \
-        _PR_Schedule();                  \
-    }
- 
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)   \
-{                                      \
-    ucontext_t *uc = CONTEXT(_thread); \
-    uc->uc_mcontext.gregs[CXT_V0] = 1; \
-    uc->uc_mcontext.gregs[CXT_A3] = 0; \
-    errno = (_thread)->md.errcode;     \
-    _MD_SET_CURRENT_THREAD(_thread);   \
-    setcontext(uc);                    \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_EARLY_INIT          _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-#define _MD_SELECT _select
-#define _MD_POLL _poll
-
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
- 
-#endif /* nspr_nec_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_netbsd.cfg b/libs/js/nsprpub/pr/include/md/_netbsd.cfg
deleted file mode 100644
index 6a36bb1656..0000000000
--- a/libs/js/nsprpub/pr/include/md/_netbsd.cfg
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NETBSD
-#define NETBSD
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__sparc__) || defined(__MIPSEB__)
-
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
-#define  HAVE_ALIGNED_DOUBLES
-#define  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__powerpc__) || defined(__m68k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error Must define constants for type sizes here.
-
-#endif
-
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_netbsd.h b/libs/js/nsprpub/pr/include/md/_netbsd.h
deleted file mode 100644
index cc16f10503..0000000000
--- a/libs/js/nsprpub/pr/include/md/_netbsd.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#ifndef nspr_netbsd_defs_h___
-#define nspr_netbsd_defs_h___
-
-#include <sys/syscall.h>
-#include <sys/param.h>  /* for __NetBSD_Version__ */
-
-#define PR_LINKER_ARCH	"netbsd"
-#define _PR_SI_SYSNAME  "NetBSD"
-#if defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__alpha__)
-#define _PR_SI_ARCHITECTURE "alpha"
-#elif defined(__m68k__)
-#define _PR_SI_ARCHITECTURE "m68k"
-#elif defined(__powerpc__)
-#define _PR_SI_ARCHITECTURE "powerpc"
-#elif defined(__sparc_v9__)
-#define _PR_SI_ARCHITECTURE "sparc64"
-#elif defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#elif defined(__mips__)
-#define _PR_SI_ARCHITECTURE "mips"
-#elif defined(__arm32__) || defined(__arm__) || defined(__armel__) \
-    || defined(__armeb__)
-#define _PR_SI_ARCHITECTURE "arm"
-#endif
-
-#if defined(__ELF__)
-#define PR_DLL_SUFFIX		".so"
-#else
-#define PR_DLL_SUFFIX		".so.1.0"
-#endif
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_DLFCN
-#define _PR_HAVE_SOCKADDR_LEN
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
-#if __NetBSD_Version__ >= 105000000
-#define _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#endif
-
-#if __NetBSD_Version__ >= 106370000
-/* NetBSD 1.6ZK */
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_GETPROTO_R_INT
-#endif
-
-#define USE_SETJMP
-
-#ifndef _PR_PTHREADS
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	sigjmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#ifdef __i386__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[0] = (int) _main;					\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-#endif
-#ifdef __sparc_v9__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff);	\
-    CONTEXT(_thread)[2] = (long) _main;					\
-    CONTEXT(_thread)[3] = (long) _main + 4;				\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	(CONTEXT(_thread)[2]+0x7ff)
-#elif defined(__sparc__)
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[3] = (int) _main;					\
-    CONTEXT(_thread)[4] = (int) _main + 4;				\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-#endif
-#ifdef __powerpc__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[3] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[4] = (int) _main;					\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[3]
-#endif
-#ifdef __m68k__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[5] = (int) _main;					\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-#endif
-#ifdef __mips__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[32] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[2] = (int) _main;					\
-    CONTEXT(_thread)[28] = (int) _main;					\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
-#endif
-#if defined(__arm32__) || defined(__arm__) || defined(__armel__) \
-    || defined(__armeb__)
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[23] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[24] = (int) _main;					\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[23]
-#endif
-#ifdef __alpha__
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-{									\
-    sigsetjmp(CONTEXT(_thread), 1);					\
-    CONTEXT(_thread)[34] = (unsigned char*) ((_sp) - 128);		\
-    CONTEXT(_thread)[2] = (long) _main;					\
-    CONTEXT(_thread)[30] = (long) _main;				\
-    CONTEXT(_thread)[31] = (long) _main;				\
-    *status = PR_TRUE;							\
-}
-#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[34]
-#endif
-#ifndef _MD_INIT_CONTEXT
-#error "Need to define _MD_INIT_CONTEXT for this platform"
-#endif
-
-#define PR_NUM_GCREGS	_JBLEN
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
-        (_thread)->md.errcode = errno;  \
-        _PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    siglongjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-#endif /* ! _PR_PTHREADS */
-
-#define _MD_EARLY_INIT                  _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-#if defined(_PR_POLL_AVAILABLE)
-#include <poll.h>
-#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
-#endif
-
-#if NetBSD1_3 == 1L
-typedef unsigned int nfds_t;
-#endif
-
-#endif /* nspr_netbsd_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nextstep.cfg b/libs/js/nsprpub/pr/include/md/_nextstep.cfg
deleted file mode 100644
index ce623cb95d..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nextstep.cfg
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NEXTSTEP
-#define NEXTSTEP
-#endif
-
-/*	Platform specific
-*/
-#if defined(__sparc__)
-
-/* Check these
-*/
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-/* Taken from _solaris.cfg
-*/
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-/* Taken from _solaris.cfg
-*/
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-/* Taken from _solaris.cfg
-*/
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#elif defined(__m68k__)
-
-/* Check these
-*/
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     2
-#define PR_ALIGN_OF_LONG    2
-#define PR_ALIGN_OF_INT64   2
-#define PR_ALIGN_OF_FLOAT   2
-#define PR_ALIGN_OF_DOUBLE  2
-#define PR_ALIGN_OF_POINTER 2
-
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#elif defined(__i386__)
-
-/* Check these
-*/
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-#define PR_WORDS_PER_DWORD_LOG2  1
-#endif /* defined(__somearch__) */
-
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nextstep.h b/libs/js/nsprpub/pr/include/md/_nextstep.h
deleted file mode 100644
index e7e4c055ab..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nextstep.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_nextstep_defs_h___
-#define nspr_nextstep_defs_h___
-
-#include "prthread.h"
-
-#include <bsd/libc.h>
-#include <bsd/syscall.h>
-
-/*	syscall() is not declared in NEXTSTEP's syscall.h ...
-*/
-extern int syscall(int number, ...);
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"nextstep"
-#define _PR_SI_SYSNAME  "NEXTSTEP"
-#if defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#elif defined(__m68k__)
-#define _PR_SI_ARCHITECTURE "m68k"
-#elif defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#else
-error Unknown NEXTSTEP architecture
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-
-#define HAVE_WEAK_MALLOC_SYMBOLS
-
-#define HAVE_DLL
-#define USE_MACH_DYLD
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define _PR_NO_LARGE_FILES
-
-#define USE_SETJMP
-
-#ifndef _PR_PTHREADS
-
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	jmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/* balazs.pataki@sztaki.hu:
-** __sparc__ is checked
-** __m68k__ is checked
-** __i386__ is a guess (one of the two defines should work)
-*/
-#if defined(__sparc__)
-#define _MD_GET_SP(_th)		(_th)->md.context[2]
-#elif defined(__m68k__)
-#define _MD_GET_SP(_th)		(_th)->md.context[2]
-#elif defined(__i386__)
-/* One of this two must be OK ... try using sc_onstack
-*/
-#define _MD_GET_SP(_th)    (((struct sigcontext *) (_th)->md.context)->sc_onstack)
-//#define _MD_GET_SP(_th)		(_th)->md.context[0].sc_esp
-#else
-error Unknown NEXTSTEP architecture
-#endif
-
-#define PR_NUM_GCREGS	_JBLEN
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (setjmp(CONTEXT(_thread))) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (int) ((_sp) - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) {  \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    longjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize);
-extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri);
-extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(PRThread *);
-extern void _MD_YIELD(void);
-
-#endif /* ! _PR_PTHREADS */
-
-extern void _MD_EarlyInit(void);
-extern PRIntervalTime _PR_UNIX_GetInterval(void);
-extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-
-#define _MD_EARLY_INIT                  _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-/* For writev() */
-#include <sys/uio.h>
-
-/* signal.h */
-/* 	balazs.pataki@sztaki.hu: this is stolen from sunos4.h. The things is that
-** 	NEXTSTEP doesn't support these flags for `struct sigaction's sa_flags, so
-**	I have to fake them ...
-*/
-#define SA_RESTART 0
-
-/* mmap */
-/* 	balazs.pataki@sztaki.hu: NEXTSTEP doesn't have mmap, at least not 
-**	publically. We have sys/mman.h, but it doesn't declare mmap(), and
-**	PROT_NONE is also missing. syscall.h has entries for mmap, munmap, and 
-**	mprotect so I wrap these in nextstep.c as  mmap(), munmap() and mprotect()
-**	and pray for it to work.
-**	
-*/
-caddr_t mmap(caddr_t addr, size_t len, int prot, int flags,
-          int fildes, off_t off);
-int munmap(caddr_t addr, size_t len);
-int mprotect(caddr_t addr, size_t len, int prot);
-
-/*	my_mmap() is implemented in nextstep.c and is based on map_fd() of mach.
-*/
-caddr_t my_mmap(caddr_t addr, size_t len, int prot, int flags,
-          int fildes, off_t off);
-int my_munmap(caddr_t addr, size_t len);
-
-
-/*	string.h
-*/
-/* balazs.pataki@sztaki.hu: this is missing so implemenetd in nextstep.c ...
-*/
-char *strdup(const char *s1);
-
-/* unistd.h
-*/
-/* 	balazs.pataki@sztaki.hu: these functions are hidden, though correctly 
-**	implemented in NEXTSTEP. Here I give the declaration for them to be used
-**	by prmalloc.c, and I have a wrapped syscall() version of them in nextstep.c
-*/
-int brk(void *endds);
-void *sbrk(int incr);
-
-#endif /* nspr_nextstep_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nspr_pthread.h b/libs/js/nsprpub/pr/include/md/_nspr_pthread.h
deleted file mode 100644
index b7a0481ee5..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nspr_pthread.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_pthread_defs_h___
-#define nspr_pthread_defs_h___
-
-#include <pthread.h>
-#include "prthread.h"
-
-#if defined(PTHREADS_USER)
-/*
-** Thread Local Storage 
-*/
-extern pthread_key_t current_thread_key;
-extern pthread_key_t current_cpu_key;
-extern pthread_key_t last_thread_key;
-extern pthread_key_t intsoff_key;
-
-#define _MD_CURRENT_THREAD() 			\
-			((struct PRThread *) pthread_getspecific(current_thread_key))
-#define _MD_CURRENT_CPU() 				\
-			((struct _PRCPU *) pthread_getspecific(current_cpu_key))
-#define _MD_LAST_THREAD()				\
-			((struct PRThread *) pthread_getspecific(last_thread_key))
-	
-#define _MD_SET_CURRENT_THREAD(newval) 			\
-	pthread_setspecific(current_thread_key, (void *)newval)
-
-#define _MD_SET_CURRENT_CPU(newval) 			\
-	pthread_setspecific(current_cpu_key, (void *)newval)
-
-#define _MD_SET_LAST_THREAD(newval)	 			\
-	pthread_setspecific(last_thread_key, (void *)newval)
-
-#define _MD_SET_INTSOFF(_val)
-#define _MD_GET_INTSOFF()	1
-	
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-    PR_BEGIN_MACRO				      							\
-        *status = PR_TRUE;              						\
-		if (SAVE_CONTEXT(_thread)) {							\
-	    	(*_main)();											\
-		}														\
-		_MD_SET_THR_SP(_thread, _sp);							\
-		_thread->no_sched = 0; 									\
-    PR_END_MACRO
-
-#define _MD_SWITCH_CONTEXT(_thread)  								\
-    PR_BEGIN_MACRO 													\
-	PR_ASSERT(_thread->no_sched);									\
-	if (!SAVE_CONTEXT(_thread)) {									\
-		(_thread)->md.errcode = errno;  							\
-		_MD_SET_LAST_THREAD(_thread);								\
-		_PR_Schedule();		     									\
-    } else {														\
-		 (_MD_LAST_THREAD())->no_sched = 0;							\
-	}																\
-    PR_END_MACRO
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)								\
-    PR_BEGIN_MACRO 													\
-    errno = (_thread)->md.errcode; 									\
-    _MD_SET_CURRENT_THREAD(_thread); 								\
-	_thread->no_sched = 1;											\
-    GOTO_CONTEXT(_thread); 											\
-    PR_END_MACRO
-
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    jmp_buf 		jb;
-    int				id;
-    int				errcode;
-	pthread_t		pthread;
-	pthread_mutex_t	pthread_mutex;
-	pthread_cond_t	pthread_cond;
-	int				wait;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-	pthread_mutex_t mutex;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-	pthread_mutex_t mutex;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    jmp_buf 			jb;
-	pthread_t 			pthread;
-	struct _MDCPU_Unix 	md_unix;
-};
-
-/*
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-*/
-
-extern pthread_mutex_t _pr_heapLock;
-
-#define _PR_LOCK(lock) pthread_mutex_lock(lock)
-
-#define _PR_UNLOCK(lock) pthread_mutex_unlock(lock)
-
-
-#define _PR_LOCK_HEAP()	{									\
-				if (_pr_primordialCPU) {					\
-					_PR_LOCK(_pr_heapLock);					\
-				}
-
-#define _PR_UNLOCK_HEAP() 	if (_pr_primordialCPU)	{		\
-					_PR_UNLOCK(_pr_heapLock);				\
-				}											\
-			  }
-
-NSPR_API(PRStatus) _MD_NEW_LOCK(struct _MDLock *md);
-NSPR_API(void) _MD_FREE_LOCK(struct _MDLock *lockp);
-
-#define _MD_LOCK(_lockp) _PR_LOCK(&(_lockp)->mutex)
-#define _MD_UNLOCK(_lockp) _PR_UNLOCK(&(_lockp)->mutex)
-
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-#define _MD_CHECK_FOR_EXIT()
-
-NSPR_API(PRStatus) _MD_InitThread(struct PRThread *thread);
-#define _MD_INIT_THREAD _MD_InitThread
-#define _MD_INIT_ATTACHED_THREAD _MD_InitThread
-
-NSPR_API(void) _MD_ExitThread(struct PRThread *thread);
-#define _MD_EXIT_THREAD _MD_ExitThread
-
-NSPR_API(void) _MD_SuspendThread(struct PRThread *thread);
-#define _MD_SUSPEND_THREAD _MD_SuspendThread
-
-NSPR_API(void) _MD_ResumeThread(struct PRThread *thread);
-#define _MD_RESUME_THREAD _MD_ResumeThread
-
-NSPR_API(void) _MD_SuspendCPU(struct _PRCPU *thread);
-#define _MD_SUSPEND_CPU _MD_SuspendCPU
-
-NSPR_API(void) _MD_ResumeCPU(struct _PRCPU *thread);
-#define _MD_RESUME_CPU _MD_ResumeCPU
-
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_RESUME_ALL()
-
-NSPR_API(void) _MD_EarlyInit(void);
-#define _MD_EARLY_INIT _MD_EarlyInit
-
-#define _MD_FINAL_INIT _PR_UnixInit
-
-NSPR_API(void) _MD_InitLocks(void);
-#define _MD_INIT_LOCKS _MD_InitLocks
-
-NSPR_API(void) _MD_CleanThread(struct PRThread *thread);
-#define _MD_CLEAN_THREAD _MD_CleanThread
-
-NSPR_API(PRStatus) _MD_CreateThread(
-                        struct PRThread *thread,
-                        void (*start) (void *),
-                        PRThreadPriority priority,
-                        PRThreadScope scope,
-                        PRThreadState state,
-                        PRUint32 stackSize);
-#define _MD_CREATE_THREAD _MD_CreateThread
-
-extern void _MD_CleanupBeforeExit(void);
-#define _MD_CLEANUP_BEFORE_EXIT _MD_CleanupBeforeExit
-
-NSPR_API(void) _MD_InitRunningCPU(struct _PRCPU *cpu);
-#define    _MD_INIT_RUNNING_CPU _MD_InitRunningCPU
-
-/* The _PR_MD_WAIT_LOCK and _PR_MD_WAKEUP_WAITER functions put to sleep and
- * awaken a thread which is waiting on a lock or cvar.
- */
-NSPR_API(PRStatus) _MD_wait(struct PRThread *, PRIntervalTime timeout);
-#define _MD_WAIT _MD_wait
-
-NSPR_API(PRStatus) _MD_WakeupWaiter(struct PRThread *);
-#define _MD_WAKEUP_WAITER _MD_WakeupWaiter
-
-NSPR_API(void) _MD_SetPriority(struct _MDThread *thread,
-	PRThreadPriority newPri);
-#define _MD_SET_PRIORITY _MD_SetPriority
-
-#endif /* PTHREADS_USER */
-
-#endif /* nspr_pthread_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nto.cfg b/libs/js/nsprpub/pr/include/md/_nto.cfg
deleted file mode 100644
index 7663572975..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nto.cfg
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NTO
-#define NTO
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifdef __i386__
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1L
-#define PR_BYTES_PER_SHORT  2L
-#define PR_BYTES_PER_INT    4L
-#define PR_BYTES_PER_INT64  8L
-#define PR_BYTES_PER_LONG   4L
-#define PR_BYTES_PER_FLOAT  4L
-#define PR_BYTES_PER_DOUBLE 8L
-#define PR_BYTES_PER_WORD   4L
-#define PR_BYTES_PER_DWORD  8L
-
-#define PR_BITS_PER_BYTE    8L
-#define PR_BITS_PER_SHORT   16L
-#define PR_BITS_PER_INT     32L
-#define PR_BITS_PER_INT64   64L
-#define PR_BITS_PER_LONG    32L
-#define PR_BITS_PER_FLOAT   32L
-#define PR_BITS_PER_DOUBLE  64L
-#define PR_BITS_PER_WORD    32L
-
-#define PR_BITS_PER_BYTE_LOG2   3L
-#define PR_BITS_PER_SHORT_LOG2  4L
-#define PR_BITS_PER_INT_LOG2    5L
-#define PR_BITS_PER_INT64_LOG2  6L
-#define PR_BITS_PER_LONG_LOG2   5L
-#define PR_BITS_PER_FLOAT_LOG2  5L
-#define PR_BITS_PER_DOUBLE_LOG2 6L
-#define PR_BITS_PER_WORD_LOG2   5L
-
-#define PR_ALIGN_OF_SHORT   2L
-#define PR_ALIGN_OF_INT     4L
-#define PR_ALIGN_OF_LONG    4L
-#define PR_ALIGN_OF_INT64   4L
-#define PR_ALIGN_OF_FLOAT   4L
-#define PR_ALIGN_OF_DOUBLE  4L
-#define PR_ALIGN_OF_POINTER 4L
-#define PR_ALIGN_OF_WORD    4L
-
-#define PR_BYTES_PER_WORD_LOG2   2L
-#define PR_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#else
-
-#error Undefined CPU Architecture
-
-#endif
-
-#define HAVE_LONG_LONG
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_nto.h b/libs/js/nsprpub/pr/include/md/_nto.h
deleted file mode 100644
index 97f4d38fae..0000000000
--- a/libs/js/nsprpub/pr/include/md/_nto.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_nto_defs_h___
-#define nspr_nto_defs_h___
-
-/*
-** Internal configuration macros
-*/
-#define PR_LINKER_ARCH		"nto"
-#define _PR_SI_SYSNAME		"NTO"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MINIMUM_STACK_SIZE	131072L
-#define _MD_MMAP_FLAGS		MAP_PRIVATE
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#undef  _PR_POLL_AVAILABLE
-#undef  _PR_USE_POLL
-#define _PR_HAVE_SOCKADDR_LEN
-#undef  HAVE_BSD_FLOCK
-#define HAVE_FCNTL_FILE_LOCKING
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-#define _PR_HAVE_POSIX_SEMAPHORES
-
-#undef FD_SETSIZE
-#define FD_SETSIZE	4096
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-
-#undef  HAVE_STACK_GROWING_UP
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define _PR_NEED_STRCASECMP
-
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR
-#endif
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP			setjmp
-#define _LONGJMP		longjmp
-#define _PR_CONTEXT_TYPE	jmp_buf
-#define _PR_NUM_GCREGS		_JBLEN
-#define _MD_GET_SP(_t)		(_t)->md.context[7]
-
-#define CONTEXT(_th)		((_th)->md.context)
-
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	\
-{							\
-    *status = PR_TRUE;					\
-    if(_SETJMP(CONTEXT(_thread))) (*_main)();		\
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128);		\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)	\
-    if (!_SETJMP(CONTEXT(_thread))) {	\
-	(_thread)->md.errcode = errno;	\
-	_PR_Schedule();			\
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)	\
-{					\
-    errno = (_thread)->md.errcode;	\
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    _LONGJMP(CONTEXT(_thread), 1);	\
-}
-
-/*
-** Machine-dependent (MD) data structures.
-*/
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
-** md-specific cpu structure field
-*/
-#define _PR_MD_MAX_OSFD		FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD], fd_write_cnt[_PR_MD_MAX_OSFD], fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-    struct pollfd *ioq_pollfds;
-    int ioq_pollfds_size;
-#endif
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu)	PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock)		PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_GET_INTERVAL		_PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC		_PR_UNIX_TicksPerSecond
-#define _MD_EARLY_INIT			_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
-** We wrapped the select() call.  _MD_SELECT refers to the built-in,
-** unwrapped version.
-*/
-#define _MD_SELECT		select
-
-#define SA_RESTART 0
-
-#endif /* nspr_nto_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_openbsd.cfg b/libs/js/nsprpub/pr/include/md/_openbsd.cfg
deleted file mode 100644
index 0041a242bb..0000000000
--- a/libs/js/nsprpub/pr/include/md/_openbsd.cfg
+++ /dev/null
@@ -1,387 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef OPENBSD
-#define OPENBSD
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#if defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__amd64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#elif defined(__sparc_v9__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__sparc__)
-
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
-#define  HAVE_ALIGNED_DOUBLES
-#define  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__powerpc__) || defined(__m68k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error Must define constants for type sizes here.
-
-#endif
-
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_openbsd.h b/libs/js/nsprpub/pr/include/md/_openbsd.h
deleted file mode 100644
index ccd7530642..0000000000
--- a/libs/js/nsprpub/pr/include/md/_openbsd.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_openbsd_defs_h___
-#define nspr_openbsd_defs_h___
-
-#include <sys/syscall.h>
-
-#define PR_LINKER_ARCH	"openbsd"
-#define _PR_SI_SYSNAME  "OPENBSD"
-#if defined(__i386__)
-#define _PR_SI_ARCHITECTURE "x86"
-#elif defined(__alpha__)
-#define _PR_SI_ARCHITECTURE "alpha"
-#elif defined(__amd64__)
-#define _PR_SI_ARCHITECTURE "amd64"
-#elif defined(__m68k__)
-#define _PR_SI_ARCHITECTURE "m68k"
-#elif defined(__powerpc__)
-#define _PR_SI_ARCHITECTURE "powerpc"
-#elif defined(__sparc__)
-#define _PR_SI_ARCHITECTURE "sparc"
-#endif
-
-#define PR_DLL_SUFFIX		".so.1.0"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_DLFCN
-#define _PR_HAVE_SOCKADDR_LEN
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
-#define _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#define _PR_HAVE_GETHOSTBYNAME2
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-
-#define USE_SETJMP
-
-#ifndef _PR_PTHREADS
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	sigjmp_buf
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-#if defined(__i386__) || defined(__sparc__) || defined(__m68k__)
-#define JB_SP_INDEX 2
-#elif defined(__powerpc__)
-#define JB_SP_INDEX 1
-#elif defined(__alpha__)
-#define JB_SP_INDEX 34
-#elif defined(__amd64__)
-#define JB_SP_INDEX 6
-#else
-#error "Need to define SP index in jmp_buf here"
-#endif
-#define _MD_GET_SP(_th)    (_th)->md.context[JB_SP_INDEX]
-
-#define PR_NUM_GCREGS	_JBLEN
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (sigsetjmp(CONTEXT(_thread), 1)) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
-        (_thread)->md.errcode = errno;  \
-        _PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    siglongjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-#endif /* ! _PR_PTHREADS */
-
-#define _MD_EARLY_INIT                  _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-#include <poll.h>
-#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
-
-#if OpenBSD1_3 == 1L
-typedef unsigned int nfds_t;
-#endif
-
-#endif /* nspr_openbsd_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_openvms.cfg b/libs/js/nsprpub/pr/include/md/_openvms.cfg
deleted file mode 100644
index 84c2a9d4ba..0000000000
--- a/libs/js/nsprpub/pr/include/md/_openvms.cfg
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef VMS
-#define VMS
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#ifdef IS_64
-#undef IS_64
-#endif
-
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32 
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_openvms.h b/libs/js/nsprpub/pr/include/md/_openvms.h
deleted file mode 100644
index 1ee7e4286e..0000000000
--- a/libs/js/nsprpub/pr/include/md/_openvms.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** This is the OpenVMS machine dependant configuration file. It is based
-** on the OSF/1 machine dependant file.
-*/
-
-#ifndef nspr_openvms_defs_h___
-#define nspr_openvms_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"OpenVMS"
-#define _PR_SI_SYSNAME	"OpenVMS"
-#ifdef __alpha
-#define _PR_SI_ARCHITECTURE "alpha"
-#else
-#define _PR_SI_ARCHITECTURE "vax"
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	131072L
-#define _MD_MINIMUM_STACK_SIZE	131072L
-
-/*
-** This is not defined on OpenVMS. I believe its only used in GC code, and
-** isn't that only used in Java? Anyway, for now, let's keep the compiler
-** happy.
-*/
-#define SA_RESTART 0
-
-/*
-** OpenVMS doesn't have these in socket.h.
-** Does in later versions!
-*/
-#if 0
-struct ip_mreq {
-    struct in_addr  imr_multiaddr;      /* IP multicast address of group */
-    struct in_addr  imr_interface;      /* local IP address of interface */
-};
-#endif
-
-/*
- * OSF1 needs the MAP_FIXED flag to ensure that mmap returns a pointer
- * with the upper 32 bits zero.  This is because Java sticks a pointer
- * into an int.
- */
-#define _MD_MMAP_FLAGS          MAP_PRIVATE|MAP_FIXED
-
-#undef  HAVE_STACK_GROWING_UP
-#undef 	HAVE_WEAK_IO_SYMBOLS
-#undef 	HAVE_WEAK_MALLOC_SYMBOLS
-#undef  HAVE_BSD_FLOCK
-
-#define NEED_TIME_R
-
-#define HAVE_DLL
-#define USE_DLFCN
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define _PR_NO_LARGE_FILES
-#define _PR_STRICT_ADDR_LEN
-
-/* IPv6 support */
-#ifdef _SOCKADDR_LEN
-#define _PR_HAVE_SOCKADDR_LEN
-#endif
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#else
-#define AF_INET6 26
-#ifndef AI_CANONNAME
-#define AI_CANONNAME 0x00000002
-struct addrinfo {
-    int ai_flags;
-    int ai_family;
-    int ai_socktype;
-    int ai_protocol;
-    size_t ai_addrlen;
-    char *ai_canonname;
-    struct sockaddr *ai_addr;
-    struct addrinfo *ai_next;
-};
-#endif
-#define AI_V4MAPPED 0x00000010
-#define AI_ALL      0x00000008
-#define AI_ADDRCONFIG 0x00000020
-#endif
-
-#define _PR_HAVE_MD_SOCKADDR_IN6
-/* if we have a quadword field defined in the structure, then its length */
-/* will be a multiple of 8, and connect() won't accept 32 (it wants 28) */
-struct _md_in6_addr {
-    union {
-        PRUint8  _S6_u8[16];
-        PRUint16 _S6_u16[8];
-        PRUint32 _S6_u32[4];
-    } _S6_un;
-};
-struct _md_sockaddr_in6 {
-    PRUint16 sin6_family;
-    PRUint16 sin6_port;
-    PRUint32 sin6_flowinfo;
-    struct _md_in6_addr sin6_addr;
-    PRUint32 sin6_scope_id;
-};
-
-#undef  USE_SETJMP
-
-#include <setjmp.h>
-
-/*
- * A jmp_buf is actually a struct sigcontext.  The sc_sp field of
- * struct sigcontext is the stack pointer.
- */
-#define _MD_GET_SP(_t) (((struct sigcontext *) (_t)->md.context)->sc_sp)
-#define PR_NUM_GCREGS _JBLEN
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** I am ifdef'ing these out because that's the way they are in FT.
-*/
-#ifndef __VMS
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-{									  \
-        *status = PR_TRUE;              \
-    if (setjmp(CONTEXT(_thread))) {				\
-	(*_main)();						\
-    }								\
-    _MD_GET_SP(_thread) = (long) ((_sp) - 64);			\
-    _MD_GET_SP(_thread) &= ~15;					\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;     \
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    longjmp(CONTEXT(_thread), 1);    \
-}
-
-#endif /* __VMS */
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    jmp_buf context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-                              fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-      struct pollfd *ioq_pollfds;
-      int ioq_pollfds_size;
-#endif        /* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)                 ((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)         ((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)         ((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)                ((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)                ((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)    ((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)    ((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)         ((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)                ((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)                ((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)         ((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)    ((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)        32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#ifndef _PR_PTHREADS
-#define _MD_INIT_LOCKS()
-#endif
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
- * The following are copied from _sunos.h, _aix.h.  This means
- * some of them should probably be moved into _unixos.h.  But
- * _irix.h seems to be quite different in regard to these macros.
- */
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-extern PRIntervalTime _PR_UNIX_GetInterval(void);
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-void _MD_EarlyInit(void);
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#ifdef _VMS_NOT_YET
-NSPR_API(void) _PR_InitThreads(
-  PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs);
-#endif
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/* The following defines unwrapped versions of select() and poll(). */
-extern int __select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#define _MD_SELECT              __select
-
-#ifndef __VMS
-#define _MD_POLL __poll
-extern int __poll(struct pollfd filedes[], unsigned int nfds, int timeout);
-#endif
-
-#ifdef __VMS
-NSPR_API(void) _PR_InitCPUs(void);
-NSPR_API(void) _PR_MD_START_INTERRUPTS(void);
-#endif
-
-/*
- * Atomic operations
- */
-#include <machine/builtins.h>
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_ADD(ptr,val) (__ATOMIC_ADD_LONG(ptr,val) + val)
-#define _MD_ATOMIC_INCREMENT(val) (__ATOMIC_INCREMENT_LONG(val) + 1)
-#define _MD_ATOMIC_DECREMENT(val) (__ATOMIC_DECREMENT_LONG(val) - 1)
-#define _MD_ATOMIC_SET(val, newval) __ATOMIC_EXCH_LONG(val, newval)
-
-extern int thread_suspend(PRThread *thr_id);
-extern int thread_resume(PRThread *thr_id);
-
-#endif /* nspr_openvms_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_os2.cfg b/libs/js/nsprpub/pr/include/md/_os2.cfg
deleted file mode 100644
index 55bcf93bfa..0000000000
--- a/libs/js/nsprpub/pr/include/md/_os2.cfg
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef XP_OS2
-#define XP_OS2
-#endif
-
-#ifndef OS2
-#define OS2
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifdef NO_LONG_LONG
-#undef HAVE_LONG_LONG
-#else
-#define HAVE_LONG_LONG 1
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD       4
-#define PR_BYTES_PER_DWORD	8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_os2.h b/libs/js/nsprpub/pr/include/md/_os2.h
deleted file mode 100644
index c012e32ef6..0000000000
--- a/libs/js/nsprpub/pr/include/md/_os2.h
+++ /dev/null
@@ -1,594 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_os2_defs_h___
-#define nspr_os2_defs_h___
-
-#ifndef NO_LONG_LONG
-#define INCL_LONGLONG
-#endif
-#define INCL_DOS
-#define INCL_DOSPROCESS
-#define INCL_DOSERRORS
-#define INCL_WIN
-#define INCL_WPS
-#include <os2.h>
-#include <sys/select.h>
-
-#include "prio.h"
-
-#include <errno.h>
-
-#ifdef XP_OS2_VACPP
-/* TODO RAMSEMs need to be written for GCC/EMX */
-#define USE_RAMSEM
-#endif
-
-#ifdef USE_RAMSEM
-#pragma pack(4)
-
-#pragma pack(2)
-typedef struct _RAMSEM
-{
-   ULONG   ulTIDPID;
-   ULONG   hevSem;
-   ULONG   cLocks;
-   USHORT  cWaiting;
-   USHORT  cPosts;
-} RAMSEM, *PRAMSEM;
-
-typedef struct _CRITICAL_SECTION
-{
-    ULONG ulReserved[4]; /* Same size as RAMSEM */
-} CRITICAL_SECTION, *PCRITICAL_SECTION, *LPCRITICAL_SECTION;
-#pragma pack(4)
-
-APIRET _Optlink SemRequest486(PRAMSEM, ULONG);
-APIRET _Optlink SemReleasex86(PRAMSEM, ULONG);
-#endif
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH      "os2"
-#define _PR_SI_SYSNAME        "OS2"
-#define _PR_SI_ARCHITECTURE   "x86"    /* XXXMB hardcode for now */
-
-#define HAVE_DLL
-#define _PR_GLOBAL_THREADS_ONLY
-#undef  HAVE_THREAD_AFFINITY
-#define _PR_HAVE_THREADSAFE_GETHOST
-#define _PR_HAVE_ATOMIC_OPS
-
-#define HANDLE unsigned long
-#define HINSTANCE HMODULE
-
-/* --- Common User-Thread/Native-Thread Definitions --------------------- */
-
-/* --- Globals --- */
-extern struct PRLock                      *_pr_schedLock;
-
-/* --- Typedefs --- */
-typedef void (*FiberFunc)(void *);
-
-#define PR_NUM_GCREGS           8
-typedef PRInt32	                PR_CONTEXT_TYPE[PR_NUM_GCREGS];
-#define GC_VMBASE               0x40000000
-#define GC_VMLIMIT              0x00FFFFFF
-typedef int (*FARPROC)();
-
-#define _MD_MAGIC_THREAD	0x22222222
-#define _MD_MAGIC_THREADSTACK	0x33333333
-#define _MD_MAGIC_SEGMENT	0x44444444
-#define _MD_MAGIC_DIR		0x55555555
-#define _MD_MAGIC_CV        0x66666666
-
-struct _MDSemaphore {
-   HEV sem;
-};
-
-struct _MDCPU {
-    int              unused;
-}; 
-
-struct _MDThread {
-    HEV              blocked_sema;      /* Threads block on this when waiting
-                                         * for IO or CondVar.
-                                         */
-    PRBool           inCVWaitQueue;     /* PR_TRUE if the thread is in the
-                                         * wait queue of some cond var.
-                                         * PR_FALSE otherwise.  */
-    TID              handle;            /* OS/2 thread handle */
-    void            *sp;                /* only valid when suspended */
-    PRUint32         magic;             /* for debugging */
-    PR_CONTEXT_TYPE  gcContext;         /* Thread context for GC */
-    struct PRThread *prev, *next;       /* used by the cvar wait queue to
-                                         * chain the PRThread structures
-                                         * together */
-};
-
-struct _MDThreadStack {
-    PRUint32           magic;          /* for debugging */
-};
-
-struct _MDSegment {
-    PRUint32           magic;          /* for debugging */
-};
-
-#undef PROFILE_LOCKS
-
-struct _MDDir {
-    HDIR           d_hdl;
-    union {
-        FILEFINDBUF3  small;
-        FILEFINDBUF3L large;
-    } d_entry;
-    PRBool           firstEntry;     /* Is this the entry returned
-                                      * by FindFirstFile()? */
-    PRUint32         magic;          /* for debugging */
-};
-
-struct _MDCVar {
-    PRUint32 magic;
-    struct PRThread *waitHead, *waitTail;  /* the wait queue: a doubly-
-                                            * linked list of threads
-                                            * waiting on this condition
-                                            * variable */
-    PRIntn nwait;                          /* number of threads in the
-                                            * wait queue */
-};
-
-#define _MD_CV_NOTIFIED_LENGTH 6
-typedef struct _MDNotified _MDNotified;
-struct _MDNotified {
-    PRIntn length;                     /* # of used entries in this
-                                        * structure */
-    struct {
-        struct _MDCVar *cv;            /* the condition variable notified */
-        PRIntn times;                  /* and the number of times notified */
-        struct PRThread *notifyHead;   /* list of threads to wake up */
-    } cv[_MD_CV_NOTIFIED_LENGTH];
-    _MDNotified *link;                 /* link to another of these, or NULL */
-};
-
-struct _MDLock {
-#ifdef USE_RAMSEM
-    CRITICAL_SECTION mutex;            /* this is recursive on NT */
-#else
-    HMTX mutex;                        /* this is recursive on NT */
-#endif
-
-    /*
-     * When notifying cvars, there is no point in actually
-     * waking up the threads waiting on the cvars until we've
-     * released the lock.  So, we temporarily record the cvars.
-     * When doing an unlock, we'll then wake up the waiting threads.
-     */
-    struct _MDNotified notified;     /* array of conditions notified */
-#ifdef PROFILE_LOCKS
-    PRInt32 hitcount;
-    PRInt32 misscount;
-#endif
-};
-
-struct _MDFileDesc {
-    PRInt32 osfd;    /* The osfd can come from one of three spaces:
-                      * - For stdin, stdout, and stderr, we are using
-                      *   the libc file handle (0, 1, 2), which is an int.
-                      * - For files and pipes, we are using OS/2 handles,
-                      *   which is a void*.
-                      * - For sockets, we are using int
-                      */
-};
-
-struct _MDProcess {
-   PID pid;
-};
-
-/* --- Misc stuff --- */
-#define _MD_GET_SP(thread)            (thread)->md.gcContext[6]
-
-/* --- IO stuff --- */
-
-#define _MD_OPEN                      (_PR_MD_OPEN)
-#define _MD_OPEN_FILE                 (_PR_MD_OPEN)
-#define _MD_READ                      (_PR_MD_READ)
-#define _MD_WRITE                     (_PR_MD_WRITE)
-#define _MD_WRITEV                    (_PR_MD_WRITEV)
-#define _MD_LSEEK                     (_PR_MD_LSEEK)
-#define _MD_LSEEK64                   (_PR_MD_LSEEK64)
-extern PRInt32 _MD_CloseFile(PRInt32 osfd);
-#define _MD_CLOSE_FILE                _MD_CloseFile
-#define _MD_GETFILEINFO               (_PR_MD_GETFILEINFO)
-#define _MD_GETFILEINFO64             (_PR_MD_GETFILEINFO64)
-#define _MD_GETOPENFILEINFO           (_PR_MD_GETOPENFILEINFO)
-#define _MD_GETOPENFILEINFO64         (_PR_MD_GETOPENFILEINFO64)
-#define _MD_STAT                      (_PR_MD_STAT)
-#define _MD_RENAME                    (_PR_MD_RENAME)
-#define _MD_ACCESS                    (_PR_MD_ACCESS)
-#define _MD_DELETE                    (_PR_MD_DELETE)
-#define _MD_MKDIR                     (_PR_MD_MKDIR)
-#define _MD_MAKE_DIR                  (_PR_MD_MKDIR)
-#define _MD_RMDIR                     (_PR_MD_RMDIR)
-#define _MD_LOCKFILE                  (_PR_MD_LOCKFILE)
-#define _MD_TLOCKFILE                 (_PR_MD_TLOCKFILE)
-#define _MD_UNLOCKFILE                (_PR_MD_UNLOCKFILE)
-
-/* --- Socket IO stuff --- */
-
-/* The ones that don't map directly may need to be re-visited... */
-#ifdef XP_OS2_VACPP
-#define EPIPE                     EBADF
-#define EIO                       ECONNREFUSED
-#endif
-#define _MD_EACCES                EACCES
-#define _MD_EADDRINUSE            EADDRINUSE
-#define _MD_EADDRNOTAVAIL         EADDRNOTAVAIL
-#define _MD_EAFNOSUPPORT          EAFNOSUPPORT
-#define _MD_EAGAIN                EWOULDBLOCK
-#define _MD_EALREADY              EALREADY
-#define _MD_EBADF                 EBADF
-#define _MD_ECONNREFUSED          ECONNREFUSED
-#define _MD_ECONNRESET            ECONNRESET
-#define _MD_EFAULT                SOCEFAULT
-#define _MD_EINPROGRESS           EINPROGRESS
-#define _MD_EINTR                 EINTR
-#define _MD_EINVAL                EINVAL
-#define _MD_EISCONN               EISCONN
-#define _MD_ENETUNREACH           ENETUNREACH
-#define _MD_ENOENT                ENOENT
-#define _MD_ENOTCONN              ENOTCONN
-#define _MD_ENOTSOCK              ENOTSOCK
-#define _MD_EOPNOTSUPP            EOPNOTSUPP
-#define _MD_EWOULDBLOCK           EWOULDBLOCK
-#define _MD_GET_SOCKET_ERROR()    sock_errno()
-#ifndef INADDR_LOOPBACK /* For some reason this is not defined in OS2 tcpip */
-/*  #define INADDR_LOOPBACK         INADDR_ANY */
-#endif  
-
-#define _MD_INIT_FILEDESC(fd)
-extern void _MD_MakeNonblock(PRFileDesc *f);
-#define _MD_MAKE_NONBLOCK             _MD_MakeNonblock
-#define _MD_INIT_FD_INHERITABLE       (_PR_MD_INIT_FD_INHERITABLE)
-#define _MD_QUERY_FD_INHERITABLE      (_PR_MD_QUERY_FD_INHERITABLE)
-#define _MD_SHUTDOWN                  (_PR_MD_SHUTDOWN)
-#define _MD_LISTEN                    _PR_MD_LISTEN
-extern PRInt32 _MD_CloseSocket(PRInt32 osfd);
-#define _MD_CLOSE_SOCKET              _MD_CloseSocket
-#define _MD_SENDTO                    (_PR_MD_SENDTO)
-#define _MD_RECVFROM                  (_PR_MD_RECVFROM)
-#ifdef XP_OS2_VACPP
-#define _MD_SOCKETPAIR(s, type, proto, sv) -1
-#else
-#define _MD_SOCKETPAIR                (_PR_MD_SOCKETPAIR)
-#endif
-#define _MD_GETSOCKNAME               (_PR_MD_GETSOCKNAME)
-#define _MD_GETPEERNAME               (_PR_MD_GETPEERNAME)
-#define _MD_GETSOCKOPT                (_PR_MD_GETSOCKOPT)
-#define _MD_SETSOCKOPT                (_PR_MD_SETSOCKOPT)
-
-#define _MD_FSYNC                     _PR_MD_FSYNC
-#define _MD_SET_FD_INHERITABLE        (_PR_MD_SET_FD_INHERITABLE)
-
-#ifdef _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT          _PR_MD_ATOMIC_INCREMENT
-#define _MD_ATOMIC_ADD                _PR_MD_ATOMIC_ADD
-#define _MD_ATOMIC_DECREMENT          _PR_MD_ATOMIC_DECREMENT
-#define _MD_ATOMIC_SET                _PR_MD_ATOMIC_SET
-#endif
-
-#define _MD_INIT_IO                   (_PR_MD_INIT_IO)
-#define _MD_PR_POLL                   (_PR_MD_PR_POLL)
-
-#define _MD_SOCKET                    (_PR_MD_SOCKET)
-extern PRInt32 _MD_SocketAvailable(PRFileDesc *fd);
-#define _MD_SOCKETAVAILABLE           _MD_SocketAvailable
-#define _MD_PIPEAVAILABLE             _MD_SocketAvailable
-#define _MD_CONNECT                   (_PR_MD_CONNECT)
-extern PRInt32 _MD_Accept(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen,
-        PRIntervalTime timeout);
-#define _MD_ACCEPT                    _MD_Accept
-#define _MD_BIND                      (_PR_MD_BIND)
-#define _MD_RECV                      (_PR_MD_RECV)
-#define _MD_SEND                      (_PR_MD_SEND)
-
-/* --- Scheduler stuff --- */
-/* #define _MD_PAUSE_CPU                 _PR_MD_PAUSE_CPU */
-#define _MD_PAUSE_CPU
-
-/* --- DIR stuff --- */
-#define PR_DIRECTORY_SEPARATOR        '\\'
-#define PR_DIRECTORY_SEPARATOR_STR    "\\"
-#define PR_PATH_SEPARATOR		';'
-#define PR_PATH_SEPARATOR_STR		";"
-#define _MD_ERRNO()                   errno
-#define _MD_OPEN_DIR                  (_PR_MD_OPEN_DIR)
-#define _MD_CLOSE_DIR                 (_PR_MD_CLOSE_DIR)
-#define _MD_READ_DIR                  (_PR_MD_READ_DIR)
-
-/* --- Segment stuff --- */
-#define _MD_INIT_SEGS()
-#define _MD_ALLOC_SEGMENT(seg, size, vaddr)   0
-#define _MD_FREE_SEGMENT(seg)
-
-/* --- Environment Stuff --- */
-#define _MD_GET_ENV                 (_PR_MD_GET_ENV)
-#define _MD_PUT_ENV                 (_PR_MD_PUT_ENV)
-
-/* --- Threading Stuff --- */
-#define _MD_DEFAULT_STACK_SIZE      65536L
-#define _MD_INIT_THREAD             (_PR_MD_INIT_THREAD)
-#define _MD_INIT_ATTACHED_THREAD    (_PR_MD_INIT_THREAD)
-#define _MD_CREATE_THREAD           (_PR_MD_CREATE_THREAD)
-#define _MD_YIELD                   (_PR_MD_YIELD)
-#define _MD_SET_PRIORITY            (_PR_MD_SET_PRIORITY)
-#define _MD_CLEAN_THREAD            (_PR_MD_CLEAN_THREAD)
-#define _MD_SETTHREADAFFINITYMASK   (_PR_MD_SETTHREADAFFINITYMASK)
-#define _MD_GETTHREADAFFINITYMASK   (_PR_MD_GETTHREADAFFINITYMASK)
-#define _MD_EXIT_THREAD             (_PR_MD_EXIT_THREAD)
-#define _MD_SUSPEND_THREAD          (_PR_MD_SUSPEND_THREAD)
-#define _MD_RESUME_THREAD           (_PR_MD_RESUME_THREAD)
-#define _MD_SUSPEND_CPU             (_PR_MD_SUSPEND_CPU)
-#define _MD_RESUME_CPU              (_PR_MD_RESUME_CPU)
-#define _MD_WAKEUP_CPUS             (_PR_MD_WAKEUP_CPUS)
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_END_RESUME_ALL()
-
-/* --- Lock stuff --- */
-#define _PR_LOCK                      _MD_LOCK
-#define _PR_UNLOCK					  _MD_UNLOCK
-
-#ifdef USE_RAMSEM
-#define _MD_NEW_LOCK                  (_PR_MD_NEW_LOCK)
-#define _MD_FREE_LOCK(lock)           (DosCloseEventSem(((PRAMSEM)(&((lock)->mutex)))->hevSem))
-#define _MD_LOCK(lock)                (SemRequest486(&((lock)->mutex), -1))
-#define _MD_TEST_AND_LOCK(lock)       (SemRequest486(&((lock)->mutex), -1),0)
-#define _MD_UNLOCK(lock)              \
-    PR_BEGIN_MACRO \
-    if (0 != (lock)->notified.length) { \
-        md_UnlockAndPostNotifies((lock), NULL, NULL); \
-    } else { \
-        SemReleasex86( &(lock)->mutex, 0 ); \
-    } \
-    PR_END_MACRO
-#else
-#define _MD_NEW_LOCK                  (_PR_MD_NEW_LOCK)
-#define _MD_FREE_LOCK(lock)           (DosCloseMutexSem((lock)->mutex))
-#define _MD_LOCK(lock)                (DosRequestMutexSem((lock)->mutex, SEM_INDEFINITE_WAIT))
-#define _MD_TEST_AND_LOCK(lock)       (DosRequestMutexSem((lock)->mutex, SEM_INDEFINITE_WAIT),0)
-#define _MD_UNLOCK(lock)              \
-    PR_BEGIN_MACRO \
-    if (0 != (lock)->notified.length) { \
-        md_UnlockAndPostNotifies((lock), NULL, NULL); \
-    } else { \
-        DosReleaseMutexSem((lock)->mutex); \
-    } \
-    PR_END_MACRO
-#endif
-
-/* --- lock and cv waiting --- */
-#define _MD_WAIT                      (_PR_MD_WAIT)
-#define _MD_WAKEUP_WAITER             (_PR_MD_WAKEUP_WAITER)
-
-/* --- CVar ------------------- */
-#define _MD_WAIT_CV					  (_PR_MD_WAIT_CV)
-#define _MD_NEW_CV					  (_PR_MD_NEW_CV)
-#define _MD_FREE_CV					  (_PR_MD_FREE_CV)
-#define _MD_NOTIFY_CV				  (_PR_MD_NOTIFY_CV	)
-#define _MD_NOTIFYALL_CV			  (_PR_MD_NOTIFYALL_CV)
-
-   /* XXXMB- the IOQ stuff is certainly not working correctly yet. */
-/* extern  struct _MDLock              _pr_ioq_lock; */
-#define _MD_IOQ_LOCK()                
-#define _MD_IOQ_UNLOCK()              
-
-
-/* --- Initialization stuff --- */
-#define _MD_START_INTERRUPTS()
-#define _MD_STOP_INTERRUPTS()
-#define _MD_DISABLE_CLOCK_INTERRUPTS()
-#define _MD_ENABLE_CLOCK_INTERRUPTS()
-#define _MD_BLOCK_CLOCK_INTERRUPTS()
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _MD_EARLY_INIT                (_PR_MD_EARLY_INIT)
-#define _MD_FINAL_INIT()
-#define _MD_INIT_CPUS()
-#define _MD_INIT_RUNNING_CPU(cpu)
-
-struct PRProcess;
-struct PRProcessAttr;
-
-#define _MD_CREATE_PROCESS _PR_CreateOS2Process
-extern struct PRProcess * _PR_CreateOS2Process(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#define _MD_DETACH_PROCESS _PR_DetachOS2Process
-extern PRStatus _PR_DetachOS2Process(struct PRProcess *process);
-
-/* --- Wait for a child process to terminate --- */
-#define _MD_WAIT_PROCESS _PR_WaitOS2Process
-extern PRStatus _PR_WaitOS2Process(struct PRProcess *process, 
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _PR_KillOS2Process
-extern PRStatus _PR_KillOS2Process(struct PRProcess *process);
-
-#define _MD_CLEANUP_BEFORE_EXIT()
-#define _MD_EXIT                          (_PR_MD_EXIT)
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-    PR_BEGIN_MACRO \
-    *status = PR_TRUE; \
-    PR_END_MACRO
-#define _MD_SWITCH_CONTEXT
-#define _MD_RESTORE_CONTEXT
-
-/* --- Intervals --- */
-#define _MD_INTERVAL_INIT                 (_PR_MD_INTERVAL_INIT)
-#define _MD_GET_INTERVAL                  (_PR_MD_GET_INTERVAL)
-#define _MD_INTERVAL_PER_SEC              (_PR_MD_INTERVAL_PER_SEC)
-#define _MD_INTERVAL_PER_MILLISEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000)
-#define _MD_INTERVAL_PER_MICROSEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000000)
-
-/* --- Native-Thread Specific Definitions ------------------------------- */
-
-typedef struct __NSPR_TLS
-{
-    struct PRThread  *_pr_thread_last_run;
-    struct PRThread  *_pr_currentThread;
-    struct _PRCPU    *_pr_currentCPU;
-} _NSPR_TLS;
-
-extern _NSPR_TLS*  pThreadLocalStorage;
-NSPR_API(void) _PR_MD_ENSURE_TLS(void);
-
-#define _MD_GET_ATTACHED_THREAD() pThreadLocalStorage->_pr_currentThread
-extern struct PRThread * _MD_CURRENT_THREAD(void);
-#define _MD_SET_CURRENT_THREAD(_thread) _PR_MD_ENSURE_TLS(); pThreadLocalStorage->_pr_currentThread = (_thread)
-
-#define _MD_LAST_THREAD() pThreadLocalStorage->_pr_thread_last_run
-#define _MD_SET_LAST_THREAD(_thread) _PR_MD_ENSURE_TLS(); pThreadLocalStorage->_pr_thread_last_run = (_thread)
-
-#define _MD_CURRENT_CPU() pThreadLocalStorage->_pr_currentCPU
-#define _MD_SET_CURRENT_CPU(_cpu) _PR_MD_ENSURE_TLS(); pThreadLocalStorage->_pr_currentCPU = (_cpu)
-
-/* lth. #define _MD_SET_INTSOFF(_val) (_pr_ints_off = (_val)) */
-/* lth. #define _MD_GET_INTSOFF() _pr_ints_off */
-/* lth. #define _MD_INCREMENT_INTSOFF() (_pr_ints_off++) */
-/* lth. #define _MD_DECREMENT_INTSOFF() (_pr_ints_off--) */
-
-/* --- Scheduler stuff --- */
-#define LOCK_SCHEDULER()                 0
-#define UNLOCK_SCHEDULER()               0
-#define _PR_LockSched()                	 0
-#define _PR_UnlockSched()                0
-
-/* --- Initialization stuff --- */
-#define _MD_INIT_LOCKS()
-
-/* --- Stack stuff --- */
-#define _MD_INIT_STACK(stack, redzone)
-#define _MD_CLEAR_STACK(stack)
-
-/* --- Memory-mapped files stuff --- not implemented on OS/2 */
-
-struct _MDFileMap {
-    PRInt8 unused;
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-extern PRInt32 _MD_GetMemMapAlignment(void);
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_GetMemMapAlignment
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-/* Some stuff for setting up thread contexts */
-typedef ULONG DWORD, *PDWORD;
-
-/* The following definitions and two structures are new in OS/2 Warp 4.0.
- */
-#ifndef CONTEXT_CONTROL
-#define CONTEXT_CONTROL        0x00000001
-#define CONTEXT_INTEGER        0x00000002
-#define CONTEXT_SEGMENTS       0x00000004
-#define CONTEXT_FLOATING_POINT 0x00000008
-#define CONTEXT_FULL           0x0000000F
-
-#pragma pack(2)
-typedef struct _FPREG {
-    ULONG      losig;    /*  Low 32-bits of the significand. */
-    ULONG      hisig;    /*  High 32-bits of the significand. */
-    USHORT     signexp;  /*  Sign and exponent. */
-} FPREG;
-typedef struct _CONTEXTRECORD {
-    ULONG     ContextFlags;
-    ULONG     ctx_env[7];
-    FPREG     ctx_stack[8];
-    ULONG     ctx_SegGs;     /*  GS register. */
-    ULONG     ctx_SegFs;     /*  FS register. */
-    ULONG     ctx_SegEs;     /*  ES register. */
-    ULONG     ctx_SegDs;     /*  DS register. */
-    ULONG     ctx_RegEdi;    /*  EDI register. */
-    ULONG     ctx_RegEsi;    /*  ESI register. */
-    ULONG     ctx_RegEax;    /*  EAX register. */
-    ULONG     ctx_RegEbx;    /*  EBX register. */
-    ULONG     ctx_RegEcx;    /*  ECX register. */
-    ULONG     ctx_RegEdx;    /*  EDX register. */
-    ULONG     ctx_RegEbp;    /*  EBP register. */
-    ULONG     ctx_RegEip;    /*  EIP register. */
-    ULONG     ctx_SegCs;     /*  CS register. */
-    ULONG     ctx_EFlags;    /*  EFLAGS register. */
-    ULONG     ctx_RegEsp;    /*  ESP register. */
-    ULONG     ctx_SegSs;     /*  SS register. */
-} CONTEXTRECORD, *PCONTEXTRECORD;
-#pragma pack()
-#endif
-
-extern APIRET (* APIENTRY QueryThreadContext)(TID, ULONG, PCONTEXTRECORD);
-
-/*
-#define _pr_tid            (((PTIB2)_getTIBvalue(offsetof(TIB, tib_ptib2)))->tib2_ultid)
-#define _pr_current_Thread (_system_tls[_pr_tid-1].__pr_current_thread)
-*/
-
-/* Some simple mappings of Windows API's to OS/2 API's to make our lives a
- * little bit easier.  Only add one here if it is a DIRECT mapping.  We are
- * not emulating anything.  Just mapping.
- */
-#define FreeLibrary(x) DosFreeModule((HMODULE)x)
-#define OutputDebugString(x)
-                               
-extern int _MD_os2_get_nonblocking_connect_error(int osfd);
-
-#endif /* nspr_os2_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_os2_errors.h b/libs/js/nsprpub/pr/include/md/_os2_errors.h
deleted file mode 100644
index 628b058a3a..0000000000
--- a/libs/js/nsprpub/pr/include/md/_os2_errors.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_os2_errors_h___
-#define nspr_os2_errors_h___
-
-#include "md/_os2.h"
-#ifndef assert
-  #include <assert.h>
-#endif  
-
-NSPR_API(void) _MD_os2_map_default_error(PRInt32 err);
-#define	_PR_MD_MAP_DEFAULT_ERROR	_MD_os2_map_default_error
-
-NSPR_API(void) _MD_os2_map_opendir_error(PRInt32 err);
-#define	_PR_MD_MAP_OPENDIR_ERROR	_MD_os2_map_opendir_error
-
-NSPR_API(void) _MD_os2_map_closedir_error(PRInt32 err);
-#define	_PR_MD_MAP_CLOSEDIR_ERROR	_MD_os2_map_closedir_error
-
-NSPR_API(void) _MD_os2_readdir_error(PRInt32 err);
-#define	_PR_MD_MAP_READDIR_ERROR	_MD_os2_readdir_error
-
-NSPR_API(void) _MD_os2_map_delete_error(PRInt32 err);
-#define	_PR_MD_MAP_DELETE_ERROR	_MD_os2_map_delete_error
-
-NSPR_API(void) _MD_os2_map_stat_error(PRInt32 err);
-#define	_PR_MD_MAP_STAT_ERROR	_MD_os2_map_stat_error
-
-NSPR_API(void) _MD_os2_map_fstat_error(PRInt32 err);
-#define	_PR_MD_MAP_FSTAT_ERROR	_MD_os2_map_fstat_error
-
-NSPR_API(void) _MD_os2_map_rename_error(PRInt32 err);
-#define	_PR_MD_MAP_RENAME_ERROR	_MD_os2_map_rename_error
-
-NSPR_API(void) _MD_os2_map_access_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCESS_ERROR	_MD_os2_map_access_error
-
-NSPR_API(void) _MD_os2_map_mkdir_error(PRInt32 err);
-#define	_PR_MD_MAP_MKDIR_ERROR	_MD_os2_map_mkdir_error
-
-NSPR_API(void) _MD_os2_map_rmdir_error(PRInt32 err);
-#define	_PR_MD_MAP_RMDIR_ERROR	_MD_os2_map_rmdir_error
-
-NSPR_API(void) _MD_os2_map_read_error(PRInt32 err);
-#define	_PR_MD_MAP_READ_ERROR	_MD_os2_map_read_error
-
-NSPR_API(void) _MD_os2_map_transmitfile_error(PRInt32 err);
-#define	_PR_MD_MAP_TRANSMITFILE_ERROR	_MD_os2_map_transmitfile_error
-
-NSPR_API(void) _MD_os2_map_write_error(PRInt32 err);
-#define	_PR_MD_MAP_WRITE_ERROR	_MD_os2_map_write_error
-
-NSPR_API(void) _MD_os2_map_lseek_error(PRInt32 err);
-#define	_PR_MD_MAP_LSEEK_ERROR	_MD_os2_map_lseek_error
-
-NSPR_API(void) _MD_os2_map_fsync_error(PRInt32 err);
-#define	_PR_MD_MAP_FSYNC_ERROR	_MD_os2_map_fsync_error
-
-NSPR_API(void) _MD_os2_map_close_error(PRInt32 err);
-#define	_PR_MD_MAP_CLOSE_ERROR	_MD_os2_map_close_error
-
-NSPR_API(void) _MD_os2_map_socket_error(PRInt32 err);
-#define	_PR_MD_MAP_SOCKET_ERROR	_MD_os2_map_socket_error
-
-NSPR_API(void) _MD_os2_map_recv_error(PRInt32 err);
-#define	_PR_MD_MAP_RECV_ERROR	_MD_os2_map_recv_error
-
-NSPR_API(void) _MD_os2_map_recvfrom_error(PRInt32 err);
-#define	_PR_MD_MAP_RECVFROM_ERROR	_MD_os2_map_recvfrom_error
-
-NSPR_API(void) _MD_os2_map_send_error(PRInt32 err);
-#define	_PR_MD_MAP_SEND_ERROR	_MD_os2_map_send_error
-
-NSPR_API(void) _MD_os2_map_sendto_error(PRInt32 err);
-#define	_PR_MD_MAP_SENDTO_ERROR	_MD_os2_map_sendto_error
-
-NSPR_API(void) _MD_os2_map_writev_error(int err);
-#define	_PR_MD_MAP_WRITEV_ERROR	_MD_os2_map_writev_error
-
-NSPR_API(void) _MD_os2_map_accept_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCEPT_ERROR	_MD_os2_map_accept_error
-
-NSPR_API(void) _MD_os2_map_acceptex_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCEPTEX_ERROR	_MD_os2_map_acceptex_error
-
-NSPR_API(void) _MD_os2_map_connect_error(PRInt32 err);
-#define	_PR_MD_MAP_CONNECT_ERROR	_MD_os2_map_connect_error
-
-NSPR_API(void) _MD_os2_map_bind_error(PRInt32 err);
-#define	_PR_MD_MAP_BIND_ERROR	_MD_os2_map_bind_error
-
-NSPR_API(void) _MD_os2_map_listen_error(PRInt32 err);
-#define	_PR_MD_MAP_LISTEN_ERROR	_MD_os2_map_listen_error
-
-NSPR_API(void) _MD_os2_map_shutdown_error(PRInt32 err);
-#define	_PR_MD_MAP_SHUTDOWN_ERROR	_MD_os2_map_shutdown_error
-
-#ifndef XP_OS2_VACPP
-NSPR_API(void) _MD_os2_map_socketpair_error(int err);
-#define	_PR_MD_MAP_SOCKETPAIR_ERROR	_MD_os2_map_socketpair_error
-#endif
-
-NSPR_API(void) _MD_os2_map_getsockname_error(PRInt32 err);
-#define	_PR_MD_MAP_GETSOCKNAME_ERROR	_MD_os2_map_getsockname_error
-
-NSPR_API(void) _MD_os2_map_getpeername_error(PRInt32 err);
-#define	_PR_MD_MAP_GETPEERNAME_ERROR	_MD_os2_map_getpeername_error
-
-NSPR_API(void) _MD_os2_map_getsockopt_error(PRInt32 err);
-#define	_PR_MD_MAP_GETSOCKOPT_ERROR	_MD_os2_map_getsockopt_error
-
-NSPR_API(void) _MD_os2_map_setsockopt_error(PRInt32 err);
-#define	_PR_MD_MAP_SETSOCKOPT_ERROR	_MD_os2_map_setsockopt_error
-
-NSPR_API(void) _MD_os2_map_open_error(PRInt32 err);
-#define	_PR_MD_MAP_OPEN_ERROR	_MD_os2_map_open_error
-
-NSPR_API(void) _MD_os2_map_gethostname_error(PRInt32 err);
-#define	_PR_MD_MAP_GETHOSTNAME_ERROR	_MD_os2_map_gethostname_error
-
-NSPR_API(void) _MD_os2_map_select_error(PRInt32 err);
-#define	_PR_MD_MAP_SELECT_ERROR	_MD_os2_map_select_error
-
-NSPR_API(void) _MD_os2_map_lockf_error(int err);
-#define _PR_MD_MAP_LOCKF_ERROR  _MD_os2_map_lockf_error
-
-#endif /* nspr_os2_errors_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_osf1.cfg b/libs/js/nsprpub/pr/include/md/_osf1.cfg
deleted file mode 100644
index ac07b57cfc..0000000000
--- a/libs/js/nsprpub/pr/include/md/_osf1.cfg
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef OSF1
-#define OSF1
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_LONG_LONG
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#ifndef IS_64
-#define IS_64
-#endif
-
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_osf1.h b/libs/js/nsprpub/pr/include/md/_osf1.h
deleted file mode 100644
index 9767b8731f..0000000000
--- a/libs/js/nsprpub/pr/include/md/_osf1.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_osf1_defs_h___
-#define nspr_osf1_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"osf"
-#define _PR_SI_SYSNAME	"OSF"
-#define _PR_SI_ARCHITECTURE "alpha"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE        0x50000000
-#define _MD_DEFAULT_STACK_SIZE  131072L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#undef 	HAVE_WEAK_IO_SYMBOLS
-#undef 	HAVE_WEAK_MALLOC_SYMBOLS
-#define HAVE_DLL
-#define HAVE_BSD_FLOCK
-
-#define NEED_TIME_R
-#define USE_DLFCN
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define _PR_HAVE_LARGE_OFF_T
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#else
-#define AF_INET6 26
-#ifndef AI_CANONNAME
-#define AI_CANONNAME 0x00000002
-struct addrinfo {
-    int              ai_flags;
-    int              ai_family;
-    int              ai_socktype;
-    int              ai_protocol;
-    size_t           ai_addrlen;
-    char            *ai_canonname;
-    struct sockaddr *ai_addr;
-    struct addrinfo *ai_next;
-};
-#endif
-#define AI_V4MAPPED 0x00000010
-#define AI_ALL      0x00000008
-#define AI_ADDRCONFIG 0x00000020
-#endif
-#define _PR_HAVE_POSIX_SEMAPHORES
-#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-/*
- * A jmp_buf is actually a struct sigcontext.  The sc_sp field of
- * struct sigcontext is the stack pointer.
- */
-#define _MD_GET_SP(_t) (((struct sigcontext *) (_t)->md.context)->sc_sp)
-#define PR_NUM_GCREGS _JBLEN
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-{									  \
-        *status = PR_TRUE;              \
-    if (setjmp(CONTEXT(_thread))) {				\
-	(*_main)();						\
-    }								\
-    _MD_GET_SP(_thread) = (long) ((_sp) - 64);			\
-    _MD_GET_SP(_thread) &= ~15;					\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;     \
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    longjmp(CONTEXT(_thread), 1);    \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    jmp_buf context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#ifndef _PR_PTHREADS
-#define _MD_INIT_LOCKS()
-#endif
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
- * The following are copied from _sunos.h, _aix.h.  This means
- * some of them should probably be moved into _unixos.h.  But
- * _irix.h seems to be quite different in regard to these macros.
- */
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/* The following defines unwrapped versions of select() and poll(). */
-#include <sys/time.h>
-extern int __select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#define _MD_SELECT              __select
-
-#include <sys/poll.h>
-#define _MD_POLL __poll
-extern int __poll(struct pollfd filedes[], unsigned int nfds, int timeout);
-
-/*
- * Atomic operations
- */
-#ifdef OSF1_HAVE_MACHINE_BUILTINS_H
-#include <machine/builtins.h>
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(val) (__ATOMIC_INCREMENT_LONG(val) + 1)
-#define _MD_ATOMIC_ADD(ptr, val)  (__ATOMIC_ADD_LONG(ptr, val) + val)
-#define _MD_ATOMIC_DECREMENT(val) (__ATOMIC_DECREMENT_LONG(val) - 1)
-#define _MD_ATOMIC_SET(val, newval) __ATOMIC_EXCH_LONG(val, newval)
-#endif /* OSF1_HAVE_MACHINE_BUILTINS_H */
-
-#endif /* nspr_osf1_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_pcos.h b/libs/js/nsprpub/pr/include/md/_pcos.h
deleted file mode 100644
index 64bd8405d9..0000000000
--- a/libs/js/nsprpub/pr/include/md/_pcos.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prpcos_h___
-#define prpcos_h___
-
-#define PR_DLL_SUFFIX		".dll"
-
-#include <stdlib.h>
-
-#define DIRECTORY_SEPARATOR         '\\'
-#define DIRECTORY_SEPARATOR_STR     "\\"
-#define PATH_SEPARATOR              ';'
-
-#ifdef WIN16
-#define GCPTR __far
-#else
-#define GCPTR
-#endif
-
-/*
-** Routines for processing command line arguments
-*/
-PR_BEGIN_EXTERN_C
-#ifndef XP_OS2_EMX
-extern char *optarg;
-extern int optind;
-extern int getopt(int argc, char **argv, char *spec);
-#endif
-PR_END_EXTERN_C
-
-
-/*
-** Definitions of directory structures amd functions
-** These definitions are from:
-**      <dirent.h>
-*/
-#ifdef XP_OS2_EMX
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#include <io.h>
-#include <fcntl.h>          /* O_BINARY */
-
-#ifdef OS2
-extern PRStatus _MD_OS2GetHostName(char *name, PRUint32 namelen);
-#define _MD_GETHOSTNAME _MD_OS2GetHostName
-#else
-extern PRStatus _MD_WindowsGetHostName(char *name, PRUint32 namelen);
-#define _MD_GETHOSTNAME _MD_WindowsGetHostName
-extern PRStatus _MD_WindowsGetSysInfo(PRSysInfo cmd, char *name, PRUint32 namelen);
-#define _MD_GETSYSINFO _MD_WindowsGetSysInfo
-#endif
-
-#endif /* prpcos_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_pth.h b/libs/js/nsprpub/pr/include/md/_pth.h
deleted file mode 100644
index cd0808b682..0000000000
--- a/libs/js/nsprpub/pr/include/md/_pth.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_pth_defs_h_
-#define nspr_pth_defs_h_
-
-/*
-** Appropriate definitions of entry points not used in a pthreads world
-*/
-#define _PR_MD_BLOCK_CLOCK_INTERRUPTS()
-#define _PR_MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _PR_MD_DISABLE_CLOCK_INTERRUPTS()
-#define _PR_MD_ENABLE_CLOCK_INTERRUPTS()
-
-/* In good standards fashion, the DCE threads (based on posix-4) are not
- * quite the same as newer posix implementations.  These are mostly name
- * changes and small differences, so macros usually do the trick
- */
-#ifdef _PR_DCETHREADS
-#define _PT_PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_create
-#define _PT_PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_delete
-#define _PT_PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), a)
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (0 == pthread_mutex_trylock(&(m)))
-#define _PT_PTHREAD_CONDATTR_INIT         pthread_condattr_create
-#define _PT_PTHREAD_COND_INIT(m, a)       pthread_cond_init(&(m), a)
-#define _PT_PTHREAD_CONDATTR_DESTROY      pthread_condattr_delete
-
-/* Notes about differences between DCE threads and pthreads 10:
- *   1. pthread_mutex_trylock returns 1 when it locks the mutex
- *      0 when it does not.  The latest pthreads has a set of errno-like
- *      return values.
- *   2. return values from pthread_cond_timedwait are different.
- *
- *
- *
- */
-#elif defined(BSDI)
-/*
- * Mutex and condition attributes are not supported.  The attr
- * argument to pthread_mutex_init() and pthread_cond_init() must
- * be passed as NULL.
- *
- * The memset calls in _PT_PTHREAD_MUTEX_INIT and _PT_PTHREAD_COND_INIT
- * are to work around BSDI's using a single bit to indicate a mutex
- * or condition variable is initialized.  This entire BSDI section
- * will go away when BSDI releases updated threads libraries for
- * BSD/OS 3.1 and 4.0.
- */
-#define _PT_PTHREAD_MUTEXATTR_INIT(x)     0
-#define _PT_PTHREAD_MUTEXATTR_DESTROY(x)  /* */
-#define _PT_PTHREAD_MUTEX_INIT(m, a)      (memset(&(m), 0, sizeof(m)), \
-                                      pthread_mutex_init(&(m), NULL))
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-#define _PT_PTHREAD_CONDATTR_INIT(x)      0
-#define _PT_PTHREAD_CONDATTR_DESTROY(x)   /* */
-#define _PT_PTHREAD_COND_INIT(m, a)       (memset(&(m), 0, sizeof(m)), \
-                                      pthread_cond_init(&(m), NULL))
-#else
-#define _PT_PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init
-#define _PT_PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy
-#define _PT_PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))
-#if defined(FREEBSD)
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    pt_pthread_mutex_is_locked(&(m))
-#else
-#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-#endif
-#if defined(DARWIN)
-#define _PT_PTHREAD_CONDATTR_INIT(x)      0
-#else
-#define _PT_PTHREAD_CONDATTR_INIT         pthread_condattr_init
-#endif
-#define _PT_PTHREAD_CONDATTR_DESTROY      pthread_condattr_destroy
-#define _PT_PTHREAD_COND_INIT(m, a)       pthread_cond_init(&(m), &(a))
-#endif
-
-/* The pthreads standard does not specify an invalid value for the
- * pthread_t handle.  (0 is usually an invalid pthread identifier
- * but there are exceptions, for example, DG/UX.)  These macros
- * define a way to set the handle to or compare the handle with an
- * invalid identifier.  These macros are not portable and may be
- * more of a problem as we adapt to more pthreads implementations.
- * They are only used in the PRMonitor functions.  Do not use them
- * in new code.
- *
- * Unfortunately some of our clients depend on certain properties
- * of our PRMonitor implementation, preventing us from replacing
- * it by a portable implementation.
- * - High-performance servers like the fact that PR_EnterMonitor
- *   only calls PR_Lock and PR_ExitMonitor only calls PR_Unlock.
- *   (A portable implementation would use a PRLock and a PRCondVar
- *   to implement the recursive lock in a monitor and call both
- *   PR_Lock and PR_Unlock in PR_EnterMonitor and PR_ExitMonitor.)
- *   Unfortunately this forces us to read the monitor owner field
- *   without holding a lock.
- * - One way to make it safe to read the monitor owner field
- *   without holding a lock is to make that field a PRThread*
- *   (one should be able to read a pointer with a single machine
- *   instruction).  However, PR_GetCurrentThread calls calloc if
- *   it is called by a thread that was not created by NSPR.  The
- *   malloc tracing tools in the Mozilla client use PRMonitor for
- *   locking in their malloc, calloc, and free functions.  If
- *   PR_EnterMonitor calls any of these functions, infinite
- *   recursion ensues.
- */
-#if defined(_PR_DCETHREADS)
-#define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) \
-	memset(&(t), 0, sizeof(pthread_t))
-#define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) \
-	(!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
-#define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
-#elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-	|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-	|| defined(HPUX) || defined(FREEBSD) \
-	|| defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-	|| defined(VMS) || defined(NTO) || defined(DARWIN) \
-	|| defined(UNIXWARE) || defined(RISCOS)
-#ifdef __GNU__
-/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-#error Using Hurd pthreads
-#endif
-#define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t)  (t) = 0
-#define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t)  (t) == 0
-#define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
-#else 
-#error "pthreads is not supported for this architecture"
-#endif
-
-#if defined(_PR_DCETHREADS)
-#define _PT_PTHREAD_ATTR_INIT            pthread_attr_create
-#define _PT_PTHREAD_ATTR_DESTROY         pthread_attr_delete
-#define _PT_PTHREAD_CREATE(t, a, f, r)   pthread_create(t, a, f, r) 
-#define _PT_PTHREAD_KEY_CREATE           pthread_keycreate
-#define _PT_PTHREAD_ATTR_SETSCHEDPOLICY  pthread_attr_setsched
-#define _PT_PTHREAD_ATTR_GETSTACKSIZE(a, s) \
-                                     (*(s) = pthread_attr_getstacksize(*(a)), 0)
-#define _PT_PTHREAD_GETSPECIFIC(k, r) \
-		pthread_getspecific((k), (pthread_addr_t *) &(r))
-#elif defined(_PR_PTHREADS)
-#define _PT_PTHREAD_ATTR_INIT            pthread_attr_init
-#define _PT_PTHREAD_ATTR_DESTROY         pthread_attr_destroy
-#define _PT_PTHREAD_CREATE(t, a, f, r)   pthread_create(t, &a, f, r) 
-#define _PT_PTHREAD_KEY_CREATE           pthread_key_create
-#define _PT_PTHREAD_ATTR_SETSCHEDPOLICY  pthread_attr_setschedpolicy
-#define _PT_PTHREAD_ATTR_GETSTACKSIZE(a, s) pthread_attr_getstacksize(a, s)
-#define _PT_PTHREAD_GETSPECIFIC(k, r)    (r) = pthread_getspecific(k)
-#else
-#error "Cannot determine pthread strategy"
-#endif
-
-#if defined(_PR_DCETHREADS)
-#define _PT_PTHREAD_EXPLICIT_SCHED      _PT_PTHREAD_DEFAULT_SCHED
-#endif
-
-/*
- * pthread_mutex_trylock returns different values in DCE threads and
- * pthreads.
- */
-#if defined(_PR_DCETHREADS)
-#define PT_TRYLOCK_SUCCESS 1
-#define PT_TRYLOCK_BUSY    0
-#else
-#define PT_TRYLOCK_SUCCESS 0
-#define PT_TRYLOCK_BUSY    EBUSY
-#endif
-
-/*
- * These platforms don't have sigtimedwait()
- */
-#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-	|| defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-	|| defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
-	|| defined(DARWIN)
-#define PT_NO_SIGTIMEDWAIT
-#endif
-
-/*
- * These platforms don't have pthread_kill()
- */
-#if defined(DARWIN)
-#define pthread_kill(thread, sig) ENOSYS
-#endif
-
-#if defined(OSF1) || defined(VMS)
-#define PT_PRIO_MIN            PRI_OTHER_MIN
-#define PT_PRIO_MAX            PRI_OTHER_MAX
-#elif defined(IRIX)
-#include <sys/sched.h>
-#define PT_PRIO_MIN            PX_PRIO_MIN
-#define PT_PRIO_MAX            PX_PRIO_MAX
-#elif defined(AIX)
-#include <sys/priv.h>
-#include <sys/sched.h>
-#ifndef PTHREAD_CREATE_JOINABLE
-#define PTHREAD_CREATE_JOINABLE     PTHREAD_CREATE_UNDETACHED
-#endif
-#define PT_PRIO_MIN            DEFAULT_PRIO
-#define PT_PRIO_MAX            DEFAULT_PRIO
-#elif defined(HPUX)
-
-#if defined(_PR_DCETHREADS)
-#define PT_PRIO_MIN            PRI_OTHER_MIN
-#define PT_PRIO_MAX            PRI_OTHER_MAX
-#else /* defined(_PR_DCETHREADS) */
-#include <sys/sched.h>
-#define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
-#define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
-#endif /* defined(_PR_DCETHREADS) */
-
-#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-	|| defined(FREEBSD)
-#define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
-#define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
-#elif defined(NTO)
-/*
- * Neutrino has functions that return the priority range but
- * they return invalid numbers, so I just hard coded these here
- * for now.  Jerry.Kirk@Nexarecorp.com
- */
-#define PT_PRIO_MIN            0
-#define PT_PRIO_MAX            30
-#elif defined(SOLARIS)
-/*
- * Solaris doesn't seem to have macros for the min/max priorities.
- * The range of 0-127 is mentioned in the pthread_setschedparam(3T)
- * man pages, and pthread_setschedparam indeed allows 0-127.  However,
- * pthread_attr_setschedparam does not allow 0; it allows 1-127.
- */
-#define PT_PRIO_MIN            1
-#define PT_PRIO_MAX            127
-#elif defined(OPENBSD)
-#define PT_PRIO_MIN            0
-#define PT_PRIO_MAX            31
-#elif defined(NETBSD) \
-	|| defined(BSDI) || defined(DARWIN) || defined(UNIXWARE) \
-	|| defined(RISCOS) /* XXX */
-#define PT_PRIO_MIN            0
-#define PT_PRIO_MAX            126
-#else
-#error "pthreads is not supported for this architecture"
-#endif
-
-/*
- * The _PT_PTHREAD_YIELD function is called from a signal handler.
- * Needed for garbage collection -- Look at PR_Suspend/PR_Resume
- * implementation.
- */
-#if defined(_PR_DCETHREADS)
-#define _PT_PTHREAD_YIELD()            	pthread_yield()
-#elif defined(OSF1) || defined(VMS)
-/*
- * sched_yield can't be called from a signal handler.  Must use
- * the _np version.
- */
-#define _PT_PTHREAD_YIELD()            	pthread_yield_np()
-#elif defined(AIX)
-extern int (*_PT_aix_yield_fcn)();
-#define _PT_PTHREAD_YIELD()			(*_PT_aix_yield_fcn)()
-#elif defined(IRIX)
-#include <time.h>
-#define _PT_PTHREAD_YIELD() \
-    PR_BEGIN_MACRO               				\
-		struct timespec onemillisec = {0};		\
-		onemillisec.tv_nsec = 1000000L;			\
-        nanosleep(&onemillisec,NULL);			\
-    PR_END_MACRO
-#elif defined(HPUX) || defined(SOLARIS) \
-	|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-	|| defined(BSDI) || defined(NTO) || defined(DARWIN) \
-	|| defined(UNIXWARE) || defined(RISCOS)
-#define _PT_PTHREAD_YIELD()            	sched_yield()
-#else
-#error "Need to define _PT_PTHREAD_YIELD for this platform"
-#endif
-
-#endif /* nspr_pth_defs_h_ */
diff --git a/libs/js/nsprpub/pr/include/md/_qnx.cfg b/libs/js/nsprpub/pr/include/md/_qnx.cfg
deleted file mode 100644
index 7c5fc3e89e..0000000000
--- a/libs/js/nsprpub/pr/include/md/_qnx.cfg
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef QNX
-#define QNX
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef  HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   1
-#define PR_ALIGN_OF_INT     1
-#define PR_ALIGN_OF_LONG    1
-#define PR_ALIGN_OF_INT64   1
-#define PR_ALIGN_OF_FLOAT   1
-#define PR_ALIGN_OF_DOUBLE  1
-#define PR_ALIGN_OF_POINTER 1
-#define PR_ALIGN_OF_WORD    1
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_qnx.h b/libs/js/nsprpub/pr/include/md/_qnx.h
deleted file mode 100644
index f7593c6a33..0000000000
--- a/libs/js/nsprpub/pr/include/md/_qnx.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_qnx_defs_h___
-#define nspr_qnx_defs_h___
-
-/*
-** Internal configuration macros
-*/
-#define PR_LINKER_ARCH		"qnx"
-#define _PR_SI_SYSNAME		"QNX"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS		MAP_PRIVATE
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#undef _PR_POLL_AVAILABLE
-#undef _PR_USE_POLL
-#define _PR_HAVE_SOCKADDR_LEN
-#define HAVE_BSD_FLOCK
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-
-#include <sys/select.h>
-
-#undef  HAVE_STACK_GROWING_UP
-#undef	HAVE_DLL
-#undef	USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define _PR_NEED_STRCASECMP
-
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR
-#endif
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP			setjmp
-#define _LONGJMP		longjmp
-#define _PR_CONTEXT_TYPE	jmp_buf
-#define _PR_NUM_GCREGS		_JBLEN
-#define _MD_GET_SP(_t)		(_t)->md.context[7]
-
-#define CONTEXT(_th)		((_th)->md.context)
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	\
-{							\
-    *status = PR_TRUE;					\
-    if(_SETJMP(CONTEXT(_thread))) (*_main)();		\
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128);		\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)	\
-    if (!_SETJMP(CONTEXT(_thread))) {	\
-	(_thread)->md.errcode = errno;	\
-	_PR_Schedule();			\
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)	\
-{					\
-    errno = (_thread)->md.errcode;	\
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    _LONGJMP(CONTEXT(_thread), 1);	\
-}
-
-/*
-** Machine-dependent (MD) data structures.
-*/
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
-** md-specific cpu structure field
-*/
-#define _PR_MD_MAX_OSFD		FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD], fd_write_cnt[_PR_MD_MAX_OSFD], fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-    struct pollfd *ioq_pollfds;
-    int ioq_pollfds_size;
-#endif
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu)	PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock)		PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_GET_INTERVAL		_PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC		_PR_UNIX_TicksPerSecond
-#define _MD_EARLY_INIT			_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
-** We wrapped the select() call.  _MD_SELECT refers to the built-in,
-** unwrapped version.
-*/
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#define _MD_SELECT		select
-
-#define SA_RESTART 0
-
-#endif /* nspr_qnx_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_reliantunix.cfg b/libs/js/nsprpub/pr/include/md/_reliantunix.cfg
deleted file mode 100644
index f2913d181c..0000000000
--- a/libs/js/nsprpub/pr/include/md/_reliantunix.cfg
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef RELIANTUNIX
-#define RELIANTUNIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#undef HAVE_LONG_LONG
-#undef  HAVE_ALIGNED_DOUBLES
-#undef  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    32
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2   5
-#define PR_BITS_PER_DWORD_LOG2  6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-#define PR_WORDS_PER_DWORD_LOG2 1
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_reliantunix.h b/libs/js/nsprpub/pr/include/md/_reliantunix.h
deleted file mode 100644
index a924e2f992..0000000000
--- a/libs/js/nsprpub/pr/include/md/_reliantunix.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * reliantunix.h
- * 5/18/96 Taken from nec.h -- chrisk@netscape.com
- * 3/14/97 Modified for nspr20 -- chrisk@netscape.com
- */
-#ifndef nspr_reliantunix_defs_h___
-#define nspr_reliantunix_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"sinix"
-#define _PR_SI_SYSNAME	"SINIX"
-#define _PR_SI_ARCHITECTURE "mips"
-#define PR_DLL_SUFFIX ".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	(2*65536L)
-#define _MD_MMAP_FLAGS		MAP_PRIVATE|MAP_FIXED
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define HAVE_NETCONFIG
-#define HAVE_WEAK_IO_SYMBOLS
-#define HAVE_WEAK_MALLOC_SYMBOLS
-#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ST_ATIM
-#define _PR_NO_LARGE_FILES
-
-/*
- * Mike Patnode indicated that it is possibly safe now to use context-switching
- * calls that do not change the signal mask, like setjmp vs. sigsetjmp.
- * So we'll use our homegrown, getcontext/setcontext-compatible stuff which 
- * will save us the getcontext/setcontext system calls at each context switch.
- * It already works in FastTrack 2.01, so it should do it here :-)
- *  - chrisk 040497
- */
-#define USE_SETCXT /* temporarily disabled... */
-
-#include <ucontext.h>
- 
-#ifdef USE_SETCXT
-/* use non-syscall machine language replacement */
-#define _GETCONTEXT		getcxt
-#define _SETCONTEXT		setcxt
-/* defined in os_ReliantUNIX.s */
-extern int getcxt(ucontext_t *);
-extern int setcxt(ucontext_t *);
-#else
-#define _GETCONTEXT		getcontext
-#define _SETCONTEXT		setcontext
-#endif
-
-#define _MD_GET_SP(_t)		(_t)->md.context.uc_mcontext.gpregs[CXT_SP]
-#define _PR_CONTEXT_TYPE	ucontext_t
-#define _PR_NUM_GCREGS		NGREG
- 
-#define CONTEXT(_thread) (&(_thread)->md.context)
-
-#define _PR_IS_NATIVE_THREAD_SUPPORTED() 0
- 
-/*
-** Machine-dependent (MD) data structures.
-*/
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
-** Initialize the thread context preparing it to execute "_main()"
-** - get a nice, fresh context
-** - set its SP to the stack we allcoated for it
-** - set it to start things at "e"
-*/
-#define _MD_INIT_CONTEXT(thread, _sp, _main, status)                \
-    PR_BEGIN_MACRO                                                  \
-    *status = PR_TRUE;                                              \
-    _GETCONTEXT(CONTEXT(thread));                                   \
-    /* this is supposed to point to the stack BASE, not to SP */    \
-    CONTEXT(thread)->uc_stack.ss_sp = thread->stack->stackBottom;   \
-    CONTEXT(thread)->uc_stack.ss_size = thread->stack->stackSize;   \
-    CONTEXT(thread)->uc_mcontext.gpregs[CXT_SP] = ((unsigned long)_sp - 128) & 0xfffffff8; \
-    CONTEXT(thread)->uc_mcontext.gpregs[CXT_T9] = _main;            \
-    CONTEXT(thread)->uc_mcontext.gpregs[CXT_EPC] = _main;           \
-    CONTEXT(thread)->uc_mcontext.gpregs[CXT_RA] = 0;                \
-    thread->no_sched = 0;                                           \
-    PR_END_MACRO
- 
-/*
-** Save current context as it is scheduled away
-*/
-#define _MD_SWITCH_CONTEXT(_thread)       \
-    PR_BEGIN_MACRO                        \
-    if (!_GETCONTEXT(CONTEXT(_thread))) { \
-	_MD_SAVE_ERRNO(_thread);          \
-	_MD_SET_LAST_THREAD(_thread);     \
-        _PR_Schedule();                   \
-    }                                     \
-    PR_END_MACRO
- 
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT or set up
-**  by _MD_INIT_CONTEXT
-**  CXT_V0 is the register that holds the return value.
-**   We must set it to 1 so that we can see if the return from
-**   getcontext() is the result of calling getcontext() or
-**   setcontext()...
-**   setting a context got with getcontext() appears to
-**   return from getcontext(), too!
-**  CXT_A3 is the register that holds status when returning
-**   from a syscall. It is set to 0 to indicate success,
-**   because we want getcontext() on the other side of the magic
-**   door to be ok.
-*/
-#define _MD_RESTORE_CONTEXT(_thread)   \
-    PR_BEGIN_MACRO                     \
-    ucontext_t *uc = CONTEXT(_thread); \
-    uc->uc_mcontext.gpregs[CXT_V0] = 1;\
-    uc->uc_mcontext.gpregs[CXT_A3] = 0;\
-    _MD_RESTORE_ERRNO(_thread);        \
-    _MD_SET_CURRENT_THREAD(_thread);   \
-    _SETCONTEXT(uc);                   \
-    PR_END_MACRO
-
-#define _MD_SAVE_ERRNO(t)	 (t)->md.errcode = errno;
-#define _MD_RESTORE_ERRNO(t)	 errno = (t)->md.errcode;
-
-#define _MD_GET_INTERVAL	_PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC	_PR_UNIX_TicksPerSecond
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD		_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)
-#define _MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-#if !defined(S_ISSOCK) && defined(S_IFSOCK)
-#define S_ISSOCK(mode)   ((mode&0xF000) == 0xC000)
-#endif
-#if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(mode)   ((mode&0xA000) == 0xC000)
-#endif
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *execptfds, struct timeval *timeout);
-#define _MD_SELECT(nfds,r,w,e,tv) _select(nfds,r,w,e,tv)
-#define _MD_POLL _poll
-
-#endif /* nspr_reliantunix_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_rhapsody.cfg b/libs/js/nsprpub/pr/include/md/_rhapsody.cfg
deleted file mode 100644
index b79e250331..0000000000
--- a/libs/js/nsprpub/pr/include/md/_rhapsody.cfg
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef RHAPOSDY
-#define RHAPOSDY
-#endif
-
-#define PR_AF_INET6 30  /* same as AF_INET6 */
-
-#if defined(i386)
-#undef IS_BIG_ENDIAN
-#define  IS_LITTLE_ENDIAN 1
-#else
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#endif
-
-#define	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-#define PR_BITS_PER_DWORD   64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
-
diff --git a/libs/js/nsprpub/pr/include/md/_rhapsody.h b/libs/js/nsprpub/pr/include/md/_rhapsody.h
deleted file mode 100644
index fa9903ed9a..0000000000
--- a/libs/js/nsprpub/pr/include/md/_rhapsody.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_rhapsody_defs_h___
-#define nspr_rhapsody_defs_h___
-
-#include "prthread.h"
-
-#include <sys/syscall.h>
-
-#define PR_LINKER_ARCH	"rhapsody"
-#define _PR_SI_SYSNAME  "RHAPSODY"
-#ifdef i386
-#define _PR_SI_ARCHITECTURE "x86"
-#else
-#define _PR_SI_ARCHITECTURE "ppc"
-#endif
-#define PR_DLL_SUFFIX		".dylib"
-
-#define _PR_VMBASE              0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_DLL
-#define USE_MACH_DYLD
-#define _PR_HAVE_SOCKADDR_LEN  
-#define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_NO_LARGE_FILES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-
-#define USE_SETJMP
-
-#if !defined(_PR_PTHREADS)
-
-#include <setjmp.h>
-
-#define PR_CONTEXT_TYPE	jmp_buf
-
-#define CONTEXT(_th)       ((_th)->md.context)
-#define _MD_GET_SP(_th)    (((struct sigcontext *) (_th)->md.context)->sc_onstack)
-#define PR_NUM_GCREGS	    _JBLEN
-
-/*
-** Initialize a thread context to run "_main()" when started
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
-{  \
-    *status = PR_TRUE;  \
-    if (setjmp(CONTEXT(_thread))) {  \
-        _main();  \
-    }  \
-    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!setjmp(CONTEXT(_thread))) {  \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();  \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{   \
-    errno = (_thread)->md.errcode;  \
-    _MD_SET_CURRENT_THREAD(_thread);  \
-    longjmp(CONTEXT(_thread), 1);  \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-
-#define _MD_INIT_RUNNING_CPU(cpu)       _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD                 _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)      _MD_suspend_thread
-#define _MD_RESUME_THREAD(thread)       _MD_resume_thread
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize);
-extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri);
-extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(PRThread *);
-extern void _MD_YIELD(void);
-
-#endif /* ! _PR_PTHREADS */
-
-#define _MD_EARLY_INIT          _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_GET_INTERVAL        _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC    _PR_UNIX_TicksPerSecond
-
-extern void             _MD_EarlyInit(void);
-extern PRIntervalTime   _PR_UNIX_GetInterval(void);
-extern PRIntervalTime   _PR_UNIX_TicksPerSecond(void);
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-
-/* For writev() */
-#include <sys/uio.h>
-
-#endif /* nspr_rhapsody_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_riscos.cfg b/libs/js/nsprpub/pr/include/md/_riscos.cfg
deleted file mode 100644
index 86b88eb5ed..0000000000
--- a/libs/js/nsprpub/pr/include/md/_riscos.cfg
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef RISCOS
-#define RISCOS
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
-#undef  HAVE_ALIGNED_DOUBLES
-#undef  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_riscos.h b/libs/js/nsprpub/pr/include/md/_riscos.h
deleted file mode 100644
index 5a0309eb3e..0000000000
--- a/libs/js/nsprpub/pr/include/md/_riscos.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Peter Naulls <peter@chocky.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_riscos_defs_h___
-#define nspr_riscos_defs_h___
-
-/*
-** Internal configuration macros
-*/
-#define PR_LINKER_ARCH		"riscos"
-#define _PR_SI_SYSNAME		"RISCOS"
-#define _PR_SI_ARCHITECTURE	"arm"
-#define PR_DLL_SUFFIX		".a"
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_HAVE_SOCKADDR_LEN
-#undef HAVE_BSD_FLOCK
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-#define _PR_HAVE_POSIX_SEMAPHORES
-
-#include <sys/select.h>
-#include <sys/poll.h>
-#include <kernel.h>
-
-
-#undef  HAVE_STACK_GROWING_UP
-#undef  HAVE_DLL
-#undef  USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define PT_NO_SIGTIMEDWAIT
-
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR
-#endif
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP			setjmp
-#define _LONGJMP		longjmp
-#define _PR_CONTEXT_TYPE	jmp_buf
-#define _PR_NUM_GCREGS		_JBLEN
-#define _MD_GET_SP(_t)		(_t)->md.context[7]
-
-#define CONTEXT(_th)		((_th)->md.context)
-
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	\
-{							\
-    *status = PR_TRUE;					\
-    if(_SETJMP(CONTEXT(_thread))) (*_main)();		\
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128);		\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)	\
-    if (!_SETJMP(CONTEXT(_thread))) {	\
-	(_thread)->md.errcode = errno;	\
-	_PR_Schedule();			\
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)	\
-{					\
-    errno = (_thread)->md.errcode;	\
-    _MD_SET_CURRENT_THREAD(_thread);	\
-    _LONGJMP(CONTEXT(_thread), 1);	\
-}
-
-/*
-** Machine-dependent (MD) data structures.
-*/
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
-** md-specific cpu structure field
-*/
-#define _PR_MD_MAX_OSFD		FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD], fd_write_cnt[_PR_MD_MAX_OSFD], fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-    struct pollfd *ioq_pollfds;
-    int ioq_pollfds_size;
-#endif
-};
-
-#define _PR_IOQ(_cpu)	/*	*/	((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu)	PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock)		PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_GET_INTERVAL		_PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC		_PR_UNIX_TicksPerSecond
-#define _MD_EARLY_INIT			_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
-** We wrapped the select() call.  _MD_SELECT refers to the built-in,
-** unwrapped version.
-*/
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#define _MD_SELECT		select
-
-#endif /* nspr_riscos_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_scoos.cfg b/libs/js/nsprpub/pr/include/md/_scoos.cfg
deleted file mode 100644
index d7c461fff4..0000000000
--- a/libs/js/nsprpub/pr/include/md/_scoos.cfg
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SCO
-#define SCO
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_scoos.h b/libs/js/nsprpub/pr/include/md/_scoos.h
deleted file mode 100644
index 6efaa7ea2b..0000000000
--- a/libs/js/nsprpub/pr/include/md/_scoos.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_scoos5_defs_h___
-#define nspr_scoos5_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"scoos5"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_SI_SYSNAME      "SCO"
-#define _PR_SI_ARCHITECTURE "x86"
-#define _PR_STACK_VMBASE    0x50000000
-
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#define	HAVE_DLL
-#define	USE_DLFCN
-
-#if !defined (HAVE_STRERROR)
-#define HAVE_STRERROR
-#endif
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */
-
-#define USE_SETJMP
-
-#ifdef _PR_LOCAL_THREADS_ONLY
-#include <setjmp.h>
-
-#define _MD_GET_SP(_t)  (_t)->md.jb[4]
-#define PR_NUM_GCREGS	_SIGJBLEN
-#define PR_CONTEXT_TYPE	sigjmp_buf
-
-#define CONTEXT(_th) ((_th)->md.jb)
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)				\
-{								  									\
-	*status = PR_TRUE;												\
-    if (sigsetjmp(CONTEXT(_thread),1)) {				  			\
-		(*_main)(); 												\
-    }								  								\
-    _MD_GET_SP(_thread) = (int) ((_sp) - 64);	\
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  								\
-    if (!sigsetjmp(CONTEXT(_thread), 1)) { 							\
-		(_thread)->md.errcode = errno;  							\
-		_PR_Schedule();		     									\
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)								\
-{				     												\
-    errno = (_thread)->osErrorCode;	     							\
-	_MD_SET_CURRENT_THREAD(_thread);								\
-    siglongjmp(CONTEXT(_thread), 1);    							\
-}
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-struct _MDThread {
-    jmp_buf jb;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_EARLY_INIT          	_MD_EarlyInit
-#define _MD_FINAL_INIT				_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) 	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         	_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define _MD_SELECT		_select
-#define _MD_POLL		_poll
-
-#endif /* nspr_scoos5_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_solaris.cfg b/libs/js/nsprpub/pr/include/md/_solaris.cfg
deleted file mode 100644
index 4dc0294632..0000000000
--- a/libs/js/nsprpub/pr/include/md/_solaris.cfg
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SOLARIS
-#define SOLARIS
-#endif
-
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-
-#if defined(sparc) || defined(__sparc)
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_DOUBLE  8
-#if defined(__sparcv9)
-#define IS_64
-#endif
-#elif defined(__x86_64)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define IS_64
-#elif defined(i386) || defined(__i386)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_DOUBLE  4
-#else
-#error unknown processor
-#endif
-
-#ifdef IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 8
-
-#else /* IS_64 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 4
-
-#endif /* IS_64 */
-
-#define	HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* ifndef nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_solaris.h b/libs/js/nsprpub/pr/include/md/_solaris.h
deleted file mode 100644
index aed078fcbf..0000000000
--- a/libs/js/nsprpub/pr/include/md/_solaris.h
+++ /dev/null
@@ -1,806 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_solaris_defs_h___
-#define nspr_solaris_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"solaris"
-#define _PR_SI_SYSNAME	"SOLARIS"
-#ifdef sparc
-#define _PR_SI_ARCHITECTURE	"sparc"
-#elif defined(__x86_64)
-#define _PR_SI_ARCHITECTURE	"x86-64"
-#elif defined(i386)
-#define _PR_SI_ARCHITECTURE	"x86"
-#else
-#error unknown processor
-#endif
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	(2*65536L)
-#define _MD_MMAP_FLAGS          MAP_SHARED
-
-#undef  HAVE_STACK_GROWING_UP
-
-#ifndef HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-
-#undef	HAVE_WEAK_MALLOC_SYMBOLS
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define NEED_STRFTIME_LOCK
-
-/*
- * Intel x86 has atomic instructions.
- *
- * Sparc v8 does not have instructions to efficiently implement
- * atomic increment/decrement operations.  In the local threads
- * only and pthreads versions, we use the default atomic routine
- * implementation in pratom.c.  The obsolete global threads only
- * version uses a global mutex_t to implement the atomic routines
- * in solaris.c, which is actually equivalent to the default
- * implementation.
- *
- * 64-bit Solaris requires sparc v9, which has atomic instructions.
- */
-#if defined(i386) || defined(_PR_GLOBAL_THREADS_ONLY) || defined(IS_64)
-#define _PR_HAVE_ATOMIC_OPS
-#endif
-
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ST_ATIM
-#ifdef SOLARIS2_5
-#define _PR_HAVE_SYSV_SEMAPHORES
-#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-#else
-#define _PR_HAVE_POSIX_SEMAPHORES
-#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-#endif
-#define _PR_HAVE_GETIPNODEBYNAME
-#define _PR_HAVE_GETIPNODEBYADDR
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#define _PR_ACCEPT_INHERIT_NONBLOCK
-#ifdef _PR_INET6
-#define _PR_HAVE_INET_NTOP
-#else
-#define AF_INET6 26
-struct addrinfo {
-    int ai_flags;
-    int ai_family;
-    int ai_socktype;
-    int ai_protocol;
-    size_t ai_addrlen;
-    char *ai_canonname;
-    struct sockaddr *ai_addr;
-    struct addrinfo *ai_next;
-};
-#define AI_CANONNAME 0x0010
-#define AI_V4MAPPED 0x0001 
-#define AI_ALL      0x0002
-#define AI_ADDRCONFIG   0x0004
-#define _PR_HAVE_MD_SOCKADDR_IN6
-/* isomorphic to struct in6_addr on Solaris 8 */
-struct _md_in6_addr {
-    union {
-        PRUint8  _S6_u8[16];
-        PRUint32 _S6_u32[4];
-        PRUint32 __S6_align;
-    } _S6_un;
-};
-/* isomorphic to struct sockaddr_in6 on Solaris 8 */
-struct _md_sockaddr_in6 {
-    PRUint16 sin6_family;
-    PRUint16 sin6_port;
-    PRUint32 sin6_flowinfo;
-    struct _md_in6_addr sin6_addr;
-    PRUint32 sin6_scope_id;
-    PRUint32 __sin6_src_id;
-};
-#endif
-#if defined(_PR_GLOBAL_THREADS_ONLY) || defined(_PR_PTHREADS)
-#define _PR_HAVE_GETHOST_R
-#define _PR_HAVE_GETHOST_R_POINTER
-#endif
-
-#include "prinrval.h"
-NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void);
-#define _MD_GET_INTERVAL                  _MD_Solaris_GetInterval
-NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void);
-#define _MD_INTERVAL_PER_SEC              _MD_Solaris_TicksPerSecond
-
-#if defined(_PR_HAVE_ATOMIC_OPS)
-/*
-** Atomic Operations
-*/
-#define _MD_INIT_ATOMIC()
-
-NSPR_API(PRInt32) _MD_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT _MD_AtomicIncrement
-
-NSPR_API(PRInt32) _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD _MD_AtomicAdd
-
-NSPR_API(PRInt32) _MD_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT _MD_AtomicDecrement
-
-NSPR_API(PRInt32) _MD_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET _MD_AtomicSet
-#endif /* _PR_HAVE_ATOMIC_OPS */
-
-#if defined(_PR_PTHREADS)
-
-NSPR_API(void)		_MD_EarlyInit(void);
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-
-#elif defined(_PR_GLOBAL_THREADS_ONLY)
-
-#include "prthread.h"
-
-#include <ucontext.h>
-
-/*
-** Iinitialization Related definitions
-*/
-
-NSPR_API(void)		_MD_EarlyInit(void);
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-
-#define _MD_GET_SP(threadp)	threadp->md.sp
-
-/*
-** Clean-up the thread machine dependent data structure
-*/
-#define	_MD_INIT_THREAD				_MD_InitializeThread
-#define	_MD_INIT_ATTACHED_THREAD	_MD_InitializeThread
-
-NSPR_API(PRStatus) _MD_CreateThread(PRThread *thread, 
-					void (*start)(void *), 
-					PRThreadPriority priority,
-					PRThreadScope scope, 
-					PRThreadState state, 
-					PRUint32 stackSize);
-#define _MD_CREATE_THREAD _MD_CreateThread
-
-#define	_PR_CONTEXT_TYPE	ucontext_t
-
-#define CONTEXT(_thread) (&(_thread)->md.context)
-
-#include <thread.h>
-#include <sys/lwp.h>
-#include <synch.h>
-
-extern struct PRLock *_pr_schedLock;
-
-/*
-** Thread Local Storage 
-*/
-
-#define THREAD_KEY_T thread_key_t
-
-extern struct PRThread *_pr_attached_thread_tls();
-extern struct PRThread *_pr_current_thread_tls();
-extern struct _PRCPU *_pr_current_cpu_tls();
-extern struct PRThread *_pr_last_thread_tls();
-
-extern THREAD_KEY_T threadid_key;
-extern THREAD_KEY_T cpuid_key;
-extern THREAD_KEY_T last_thread_key;
-
-#define _MD_GET_ATTACHED_THREAD() _pr_attached_thread_tls()
-#define _MD_CURRENT_THREAD() _pr_current_thread_tls()
-#define _MD_CURRENT_CPU() _pr_current_cpu_tls()
-#define _MD_LAST_THREAD() _pr_last_thread_tls()
-	
-#define _MD_SET_CURRENT_THREAD(newval) 			\
-	PR_BEGIN_MACRO					\
-	thr_setspecific(threadid_key, (void *)newval);	\
-	PR_END_MACRO
-
-#define _MD_SET_CURRENT_CPU(newval) 			\
-	PR_BEGIN_MACRO					\
-	thr_setspecific(cpuid_key, (void *)newval);	\
-	PR_END_MACRO
-
-#define _MD_SET_LAST_THREAD(newval)	 			\
-	PR_BEGIN_MACRO						\
-	thr_setspecific(last_thread_key, (void *)newval);	\
-	PR_END_MACRO
-	
-#define	_MD_CLEAN_THREAD(_thread)	_MD_cleanup_thread(_thread)
-extern void _MD_exit_thread(PRThread *thread);
-#define _MD_EXIT_THREAD(thread)		_MD_exit_thread(thread)
-
-#define	_MD_SUSPEND_THREAD(thread)	_MD_Suspend(thread)
-#define	_MD_RESUME_THREAD(thread)	thr_continue((thread)->md.handle)
-
-/* XXXX Needs to be defined - Prashant */
-#define _MD_SUSPEND_CPU(cpu)
-#define _MD_RESUME_CPU(cpu)
-
-extern void _MD_Begin_SuspendAll(void);
-extern void _MD_End_SuspendAll(void);
-extern void _MD_End_ResumeAll(void);
-#define _MD_BEGIN_SUSPEND_ALL()		_MD_Begin_SuspendAll()
-#define _MD_BEGIN_RESUME_ALL()		
-#define	_MD_END_SUSPEND_ALL()		_MD_End_SuspendAll()
-#define	_MD_END_RESUME_ALL()		_MD_End_ResumeAll()
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(md_lockp) (mutex_init(&((md_lockp)->lock),USYNC_THREAD,NULL) ? PR_FAILURE : PR_SUCCESS)
-#define _MD_FREE_LOCK(md_lockp) mutex_destroy(&((md_lockp)->lock))
-#define _MD_UNLOCK(md_lockp) mutex_unlock(&((md_lockp)->lock))
-#define _MD_TEST_AND_LOCK(md_lockp) mutex_trylock(&((md_lockp)->lock))
-struct _MDLock;
-NSPR_API(void) _MD_lock(struct _MDLock *md_lock);
-#undef PROFILE_LOCKS
-#ifndef PROFILE_LOCKS
-#define _MD_LOCK(md_lockp) _MD_lock(md_lockp)
-#else
-#define _MD_LOCK(md_lockp)                 \
-    PR_BEGIN_MACRO \
-    int rv = _MD_TEST_AND_LOCK(md_lockp); \
-    if (rv == 0) { \
-        (md_lockp)->hitcount++; \
-    } else { \
-        (md_lockp)->misscount++; \
-        _MD_lock(md_lockp); \
-    } \
-    PR_END_MACRO
-#endif
-
-#define _PR_LOCK_HEAP() if (_pr_heapLock) _MD_LOCK(&_pr_heapLock->md)
-#define _PR_UNLOCK_HEAP() if (_pr_heapLock) _MD_UNLOCK(&_pr_heapLock->md)
-
-#define _MD_ATTACH_THREAD(threadp)
-
-
-#define THR_KEYCREATE thr_keycreate
-#define THR_SELF thr_self
-#define _MD_NEW_CV(condp) cond_init(&((condp)->cv), USYNC_THREAD, 0)
-#define COND_WAIT(condp, mutexp) cond_wait(condp, mutexp)
-#define COND_TIMEDWAIT(condp, mutexp, tspec) \
-                                     cond_timedwait(condp, mutexp, tspec)
-#define _MD_NOTIFY_CV(condp, lockp) cond_signal(&((condp)->cv))
-#define _MD_NOTIFYALL_CV(condp,unused) cond_broadcast(&((condp)->cv))	
-#define _MD_FREE_CV(condp) cond_destroy(&((condp)->cv))
-#define _MD_YIELD() thr_yield()
-#include <time.h>
-/* 
- * Because clock_gettime() on Solaris/x86 2.4 always generates a
- * segmentation fault, we use an emulated version _pr_solx86_clock_gettime(),
- * which is implemented using gettimeofday().
- */
-#if defined(i386) && defined(SOLARIS2_4)
-extern int _pr_solx86_clock_gettime(clockid_t clock_id, struct timespec *tp);
-#define GETTIME(tt) _pr_solx86_clock_gettime(CLOCK_REALTIME, (tt))
-#else
-#define GETTIME(tt) clock_gettime(CLOCK_REALTIME, (tt))
-#endif  /* i386 && SOLARIS2_4 */
-
-#define MUTEX_T mutex_t
-#define COND_T cond_t
-
-#define _MD_NEW_SEM(md_semp,_val)  sema_init(&((md_semp)->sem),_val,USYNC_THREAD,NULL)
-#define _MD_DESTROY_SEM(md_semp) sema_destroy(&((md_semp)->sem))
-#define _MD_WAIT_SEM(md_semp) sema_wait(&((md_semp)->sem))
-#define _MD_POST_SEM(md_semp) sema_post(&((md_semp)->sem))
-
-#define _MD_SAVE_ERRNO(_thread)
-#define _MD_RESTORE_ERRNO(_thread)
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-
-extern struct _MDLock _pr_ioq_lock;
-#define _MD_IOQ_LOCK()		_MD_LOCK(&_pr_ioq_lock)
-#define _MD_IOQ_UNLOCK()	_MD_UNLOCK(&_pr_ioq_lock)
-
-extern PRStatus _MD_wait(struct PRThread *, PRIntervalTime timeout);
-#define _MD_WAIT _MD_wait
-
-extern PRStatus _MD_WakeupWaiter(struct PRThread *);
-#define _MD_WAKEUP_WAITER _MD_WakeupWaiter
-
-NSPR_API(void) _MD_InitIO(void);
-#define _MD_INIT_IO _MD_InitIO
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-    PR_BEGIN_MACRO \
-    *status = PR_TRUE; \
-    PR_END_MACRO
-#define _MD_SWITCH_CONTEXT(_thread)
-#define _MD_RESTORE_CONTEXT(_newThread)
-
-struct _MDLock {
-    MUTEX_T lock;
-#ifdef PROFILE_LOCKS
-    PRInt32 hitcount;
-    PRInt32 misscount;
-#endif
-};
-
-struct _MDCVar {
-    COND_T cv;
-};
-
-struct _MDSemaphore {
-    sema_t sem;
-};
-
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    thread_t handle;
-    lwpid_t lwpid;
-    uint_t sp;		/* stack pointer */
-    uint_t threadID;	/* ptr to solaris-internal thread id structures */
-    struct _MDSemaphore waiter_sem;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field, common to all Unix platforms
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-/* The following defines the unwrapped versions of select() and poll(). */
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *exceptfds, struct timeval *timeout);
-#define _MD_SELECT	_select
-
-#include <poll.h>
-#define _MD_POLL _poll
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Missing function prototypes
-*/
-extern int gethostname (char *name, int namelen);
-
-PR_END_EXTERN_C
-
-#else /* _PR_GLOBAL_THREADS_ONLY */
-
-/*
- * LOCAL_THREADS_ONLY implementation on Solaris
- */
-
-#include "prthread.h"
-
-#include <errno.h>
-#include <ucontext.h>
-#include <sys/stack.h>
-#include <synch.h>
-
-/*
-** Iinitialization Related definitions
-*/
-
-NSPR_API(void)				_MD_EarlyInit(void);
-NSPR_API(void)				_MD_SolarisInit();
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_MD_SolarisInit
-#define	_MD_INIT_THREAD		_MD_InitializeThread
-
-#ifdef USE_SETJMP
-
-#include <setjmp.h>
-
-#define _PR_CONTEXT_TYPE	jmp_buf
-
-#ifdef sparc
-#define _MD_GET_SP(_t)		(_t)->md.context[2]
-#else
-#define _MD_GET_SP(_t)		(_t)->md.context[4]
-#endif
-
-#define PR_NUM_GCREGS		_JBLEN
-#define CONTEXT(_thread)	(_thread)->md.context
-
-#else  /* ! USE_SETJMP */
-
-#ifdef sparc
-#define	_PR_CONTEXT_TYPE	ucontext_t
-#define _MD_GET_SP(_t)		(_t)->md.context.uc_mcontext.gregs[REG_SP]
-/*
-** Sparc's use register windows. the _MD_GetRegisters for the sparc's
-** doesn't actually store anything into the argument buffer; instead the
-** register windows are homed to the stack. I assume that the stack
-** always has room for the registers to spill to...
-*/
-#define PR_NUM_GCREGS		0
-#else
-#define _PR_CONTEXT_TYPE	unsigned int edi; sigset_t oldMask, blockMask; ucontext_t
-#define _MD_GET_SP(_t)		(_t)->md.context.uc_mcontext.gregs[USP]
-#define PR_NUM_GCREGS		_JBLEN
-#endif
-
-#define CONTEXT(_thread)	(&(_thread)->md.context)
-
-#endif /* ! USE_SETJMP */
-
-#include <time.h>
-/* 
- * Because clock_gettime() on Solaris/x86 always generates a
- * segmentation fault, we use an emulated version _pr_solx86_clock_gettime(),
- * which is implemented using gettimeofday().
- */
-#ifdef i386
-#define GETTIME(tt) _pr_solx86_clock_gettime(CLOCK_REALTIME, (tt))
-#else
-#define GETTIME(tt) clock_gettime(CLOCK_REALTIME, (tt))
-#endif  /* i386 */
-
-#define _MD_SAVE_ERRNO(_thread)			(_thread)->md.errcode = errno;
-#define _MD_RESTORE_ERRNO(_thread)		errno = (_thread)->md.errcode;
-
-#ifdef sparc
-
-#ifdef USE_SETJMP
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-    PR_BEGIN_MACRO				      \
-	int *context = (_thread)->md.context;	      \
-    *status = PR_TRUE;              \
-	(void) setjmp(context);			      \
-	(_thread)->md.context[1] = (int) ((_sp) - 64); \
-	(_thread)->md.context[2] = (int) _main;	      \
-	(_thread)->md.context[3] = (int) _main + 4; \
-    _thread->no_sched = 0; \
-    PR_END_MACRO
-
-#define _MD_SWITCH_CONTEXT(_thread)    \
-    if (!setjmp(CONTEXT(_thread))) { \
-	_MD_SAVE_ERRNO(_thread)    \
-	_MD_SET_LAST_THREAD(_thread);	 \
-    _MD_SET_CURRENT_THREAD(_thread);	 \
-	_PR_Schedule();		     \
-    }
-
-#define _MD_RESTORE_CONTEXT(_newThread)	    \
-{				     \
-	_MD_RESTORE_ERRNO(_newThread)	    \
-	_MD_SET_CURRENT_THREAD(_newThread); \
-    longjmp(CONTEXT(_newThread), 1);    \
-}
-
-#else
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)					\
-    PR_BEGIN_MACRO				      									\
-    ucontext_t *uc = CONTEXT(_thread);									\
-    *status = PR_TRUE;													\
-    getcontext(uc);														\
-    uc->uc_stack.ss_sp = (char *) ((unsigned long)(_sp - WINDOWSIZE - SA(MINFRAME)) & 0xfffffff8);	\
-    uc->uc_stack.ss_size = _thread->stack->stackSize; 					\
-    uc->uc_stack.ss_flags = 0; 				/* ? */		        		\
-    uc->uc_mcontext.gregs[REG_SP] = (unsigned int) uc->uc_stack.ss_sp;	\
-    uc->uc_mcontext.gregs[REG_PC] = (unsigned int) _main;				\
-    uc->uc_mcontext.gregs[REG_nPC] = (unsigned int) ((char*)_main)+4;	\
-    uc->uc_flags = UC_ALL;												\
-    _thread->no_sched = 0;												\
-    PR_END_MACRO
-
-/*
-** Switch away from the current thread context by saving its state and
-** calling the thread scheduler. Reload cpu when we come back from the
-** context switch because it might have changed.
-*/
-#define _MD_SWITCH_CONTEXT(_thread)    				\
-    PR_BEGIN_MACRO                     				\
-		if (!getcontext(CONTEXT(_thread))) { 		\
-			_MD_SAVE_ERRNO(_thread);    			\
-			_MD_SET_LAST_THREAD(_thread);	 		\
-			_PR_Schedule();			 				\
-		}					 						\
-    PR_END_MACRO
-
-/*
-** Restore a thread context that was saved by _MD_SWITCH_CONTEXT or
-** initialized by _MD_INIT_CONTEXT.
-*/
-#define _MD_RESTORE_CONTEXT(_newThread)	    				\
-    PR_BEGIN_MACRO			    							\
-    	ucontext_t *uc = CONTEXT(_newThread); 				\
-    	uc->uc_mcontext.gregs[11] = 1;     					\
-		_MD_RESTORE_ERRNO(_newThread);	    				\
-		_MD_SET_CURRENT_THREAD(_newThread); 				\
-    	setcontext(uc);		       							\
-    PR_END_MACRO
-#endif
-
-#else  /* x86 solaris */
-
-#ifdef USE_SETJMP
-
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-    PR_BEGIN_MACRO \
-    *status = PR_TRUE; \
-    if (setjmp(CONTEXT(_thread))) _main(); \
-    _MD_GET_SP(_thread) = (int) ((_sp) - 64); \
-    PR_END_MACRO
-
-#define _MD_SWITCH_CONTEXT(_thread) \
-    if (!setjmp(CONTEXT(_thread))) { \
-        _MD_SAVE_ERRNO(_thread) \
-        _PR_Schedule();	\
-    }
-
-#define _MD_RESTORE_CONTEXT(_newThread) \
-{ \
-    _MD_RESTORE_ERRNO(_newThread) \
-    _MD_SET_CURRENT_THREAD(_newThread); \
-    longjmp(CONTEXT(_newThread), 1); \
-}
-
-#else /* USE_SETJMP */
-
-#define WINDOWSIZE		0
- 
-int getedi(void);
-void setedi(int);
- 
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-	PR_BEGIN_MACRO					\
-	ucontext_t *uc = CONTEXT(_thread);		\
-        *status = PR_TRUE;              \
-	getcontext(uc);					\
-	/* Force sp to be double aligned! */		\
-    	uc->uc_mcontext.gregs[USP] = (int) ((unsigned long)(_sp - WINDOWSIZE - SA(MINFRAME)) & 0xfffffff8);	\
-	uc->uc_mcontext.gregs[PC] = (int) _main;	\
-	(_thread)->no_sched = 0; \
-	PR_END_MACRO
-
-/* getcontext() may return 1, contrary to what the man page says */
-#define _MD_SWITCH_CONTEXT(_thread)			\
-	PR_BEGIN_MACRO					\
-	ucontext_t *uc = CONTEXT(_thread);		\
-	PR_ASSERT(_thread->no_sched);			\
-	sigfillset(&((_thread)->md.blockMask));		\
-	sigprocmask(SIG_BLOCK, &((_thread)->md.blockMask),	\
-		&((_thread)->md.oldMask));		\
-	(_thread)->md.edi = getedi();			\
-	if (! getcontext(uc)) {				\
-		sigprocmask(SIG_SETMASK, &((_thread)->md.oldMask), NULL); \
-		uc->uc_mcontext.gregs[EDI] = (_thread)->md.edi;	\
-		_MD_SAVE_ERRNO(_thread)    		\
-	        _MD_SET_LAST_THREAD(_thread);	        \
-		_PR_Schedule();				\
-	} else {					\
-		sigprocmask(SIG_SETMASK, &((_thread)->md.oldMask), NULL); \
-		setedi((_thread)->md.edi);		\
-		PR_ASSERT(_MD_LAST_THREAD() !=_MD_CURRENT_THREAD()); \
-		_MD_LAST_THREAD()->no_sched = 0;	\
-	}						\
-	PR_END_MACRO
-
-/*
-** Restore a thread context, saved by _PR_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_newthread)			\
-	PR_BEGIN_MACRO					\
-	ucontext_t *uc = CONTEXT(_newthread);		\
-	uc->uc_mcontext.gregs[EAX] = 1;			\
-	_MD_RESTORE_ERRNO(_newthread)  			\
-	_MD_SET_CURRENT_THREAD(_newthread);		\
-	(_newthread)->no_sched = 1;			\
-	setcontext(uc);					\
-	PR_END_MACRO
-#endif /* USE_SETJMP */
-
-#endif /* sparc */
-
-struct _MDLock {
-	PRInt8 notused;
-};
-
-struct _MDCVar {
-	PRInt8 notused;
-};
-
-struct _MDSemaphore {
-	PRInt8 notused;
-};
-
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int errcode;
-    int id;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#ifndef _PR_PTHREADS
-#define _MD_INIT_LOCKS()
-#endif
-#define _MD_NEW_LOCK(lock)				PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_INIT_RUNNING_CPU(cpu)		_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD					_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define _MD_SUSPEND_THREAD(thread)
-#define _MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-extern PRStatus _MD_WAIT(struct PRThread *, PRIntervalTime timeout);
-extern PRStatus _MD_WAKEUP_WAITER(struct PRThread *);
-extern void     _MD_YIELD(void);
-extern PRStatus _MD_InitializeThread(PRThread *thread);
-extern void     _MD_SET_PRIORITY(struct _MDThread *thread,
-	PRThreadPriority newPri);
-extern PRStatus _MD_CREATE_THREAD(PRThread *thread, void (*start) (void *),
-	PRThreadPriority priority, PRThreadScope scope, PRThreadState state,
-        PRUint32 stackSize);
-
-NSPR_API(PRIntervalTime)				_MD_Solaris_GetInterval(void);
-#define _MD_GET_INTERVAL				_MD_Solaris_GetInterval
-NSPR_API(PRIntervalTime)				_MD_Solaris_TicksPerSecond(void);
-#define _MD_INTERVAL_PER_SEC			_MD_Solaris_TicksPerSecond
-
-/* The following defines the unwrapped versions of select() and poll(). */
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *exceptfds, struct timeval *timeout);
-#define _MD_SELECT	_select
-
-#include <stropts.h>
-#include <poll.h>
-#define _MD_POLL _poll
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Missing function prototypes
-*/
-extern int gethostname (char *name, int namelen);
-
-PR_END_EXTERN_C
-
-#endif /* _PR_GLOBAL_THREADS_ONLY */
-
-extern void _MD_solaris_map_sendfile_error(int err);
-
-#endif /* nspr_solaris_defs_h___ */
-
diff --git a/libs/js/nsprpub/pr/include/md/_sony.cfg b/libs/js/nsprpub/pr/include/md/_sony.cfg
deleted file mode 100644
index 4b8fbff966..0000000000
--- a/libs/js/nsprpub/pr/include/md/_sony.cfg
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SONY
-#define SONY
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#undef  HAVE_LONG_LONG
-#undef  HAVE_ALIGNED_DOUBLES
-#undef  HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_sony.h b/libs/js/nsprpub/pr/include/md/_sony.h
deleted file mode 100644
index 3d17e04dba..0000000000
--- a/libs/js/nsprpub/pr/include/md/_sony.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_sony_defs_h___
-#define nspr_sony_defs_h___
- 
-#define PR_LINKER_ARCH		"sony"
-#define _PR_SI_SYSNAME		"SONY"
-#define _PR_SI_ARCHITECTURE	"mips"
-#define PR_DLL_SUFFIX		".so"
- 
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#define _MD_GET_INTERVAL	_PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC	_PR_UNIX_TicksPerSecond
-
-#if defined(_PR_LOCAL_THREADS_ONLY)
-#include <ucontext.h>
-#include <sys/regset.h>
- 
-#define PR_NUM_GCREGS	NGREG
-#define PR_CONTEXT_TYPE	ucontext_t
- 
-#define CONTEXT(_thread)	(&(_thread)->md.context)
- 
-#define _MD_GET_SP(_t)		(_t)->md.context.uc_mcontext.gregs[CXT_SP]
- 
-/*
-** Initialize the thread context preparing it to execute _main()
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)               \
-{                                                                   \
-    *status = PR_TRUE;  \
-    getcontext(CONTEXT(_thread));                                    \
-    CONTEXT(_thread)->uc_stack.ss_sp = (char*) (_thread)->stack->stackBottom; \
-    CONTEXT(_thread)->uc_stack.ss_size = (_thread)->stack->stackSize; \
-    _MD_GET_SP(_thread) = (greg_t) (_sp) - 64;             \
-    makecontext(CONTEXT(_thread), _main, 0);              \
-}
- 
-#define _MD_SWITCH_CONTEXT(_thread)      \
-    if (!getcontext(CONTEXT(_thread))) { \
-        (_thread)->md.errcode = errno;      \
-        _PR_Schedule();                  \
-    }
- 
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread)   \
-{                                      \
-    ucontext_t *uc = CONTEXT(_thread); \
-    uc->uc_mcontext.gregs[CXT_V0] = 1; \
-    uc->uc_mcontext.gregs[CXT_A3] = 0; \
-    _MD_SET_CURRENT_THREAD(_thread);      \
-    errno = (_thread)->md.errcode;        \
-    setcontext(uc);                    \
-}
-
-/* Machine-dependent (MD) data structures */
-
-struct _MDThread {
-    PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-    struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-#define _MD_EARLY_INIT          	_MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu)	_MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD			_MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/* The following defines unwrapped versions of select() and poll(). */
-extern int _select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#define _MD_SELECT              _select
-
-#include <sys/poll.h>
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-#define _MD_POLL _poll
- 
-#endif /* _PR_LOCAL_THREADS_ONLY */
- 
-#undef	HAVE_STACK_GROWING_UP
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define	NEED_TIME_R
-#define NEED_STRFTIME_LOCK
- 
-/*
-** Missing function prototypes
-*/
-extern int gethostname(char *name, int namelen);
- 
-#endif /* nspr_sony_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_sunos4.cfg b/libs/js/nsprpub/pr/include/md/_sunos4.cfg
deleted file mode 100644
index 581d483433..0000000000
--- a/libs/js/nsprpub/pr/include/md/_sunos4.cfg
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SUNOS4
-#define SUNOS4
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#undef  HAVE_LONG_LONG
-#define	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* ifndef nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_sunos4.h b/libs/js/nsprpub/pr/include/md/_sunos4.h
deleted file mode 100644
index 0d62892e30..0000000000
--- a/libs/js/nsprpub/pr/include/md/_sunos4.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_sunos_defs_h___
-#define nspr_sunos_defs_h___
-
-#include "md/sunos4.h"
-
-/* On SunOS 4, memset is declared in memory.h */
-#include <memory.h>
-#include <errno.h>
-#include <sys/syscall.h>
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"sunos"
-#define _PR_SI_SYSNAME	"SUNOS"
-#define _PR_SI_ARCHITECTURE "sparc"
-#define PR_DLL_SUFFIX		".so.1.0"
-
-/*
-** For sunos type machines, don't specify an address because the
-** NetBSD/SPARC O.S. does the wrong thing.
-*/
-#define _PR_VMBASE		0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#undef  HAVE_STACK_GROWING_UP
-#undef	HAVE_WEAK_IO_SYMBOLS
-#undef	HAVE_WEAK_MALLOC_SYMBOLS
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define HAVE_BSD_FLOCK
-#define _PR_NO_LARGE_FILES
-#define _PR_STAT_HAS_ONLY_ST_ATIME
-
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _MD_GET_SP(_t)    (_t)->md.context[2]
-
-#define PR_NUM_GCREGS	_JBLEN
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)	      \
-    PR_BEGIN_MACRO				      \
-	int *context = (_thread)->md.context;	      \
-        *status = PR_TRUE;              \
-	asm("ta 3");					\
-	(void) setjmp(context);			      \
-	(_thread)->md.context[2] = (int) ((_sp) - 64); \
-	(_thread)->md.context[2] &= ~7;		\
-	(_thread)->md.context[3] = (int) _main;  \
-	(_thread)->md.context[4] = (int) _main + 4;  \
-    PR_END_MACRO
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    asm("ta 3");			\
-    if (!setjmp(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
-    _MD_SET_CURRENT_THREAD(_thread);	 \
-    longjmp(CONTEXT(_thread), 1);    \
-}
-
-#pragma unknown_control_flow(longjmp)
-#pragma unknown_control_flow(setjmp)
-#pragma unknown_control_flow(_PR_Schedule)
-
-/*
-** Missing function prototypes
-*/
-
-extern int socket (int domain, int type, int protocol);
-extern int getsockname (int s, struct sockaddr *name, int *namelen);
-extern int getpeername (int s, struct sockaddr *name, int *namelen);
-extern int getsockopt (int s, int level, int optname, char* optval, int* optlen);
-extern int setsockopt (int s, int level, int optname, const char* optval, int optlen);
-extern int accept (int s, struct sockaddr *addr, int *addrlen);
-extern int listen (int s, int backlog);
-extern int brk(void *);
-extern void *sbrk(int);
-
-
-/* Machine-dependent (MD) data structures.  SunOS 4 has no native threads. */
-
-struct _MDThread {
-    jmp_buf context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/* These are copied from _solaris.h */
-
-#define _MD_EARLY_INIT          _MD_EarlyInit
-#define _MD_FINAL_INIT			_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
-#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
-
-#endif /* nspr_sparc_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_unix_errors.h b/libs/js/nsprpub/pr/include/md/_unix_errors.h
deleted file mode 100644
index a44cbb3169..0000000000
--- a/libs/js/nsprpub/pr/include/md/_unix_errors.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prunixerrors_h___
-#define prunixerrors_h___
-
-#include <unistd.h>
-#include <stddef.h>
-
-PR_BEGIN_EXTERN_C
-
-extern void _MD_unix_map_default_error(int err);
-#define	_PR_MD_MAP_DEFAULT_ERROR	_MD_unix_map_default_error
-
-extern void _MD_unix_map_opendir_error(int err);
-#define	_PR_MD_MAP_OPENDIR_ERROR	_MD_unix_map_opendir_error
-
-extern void _MD_unix_map_closedir_error(int err);
-#define	_PR_MD_MAP_CLOSEDIR_ERROR	_MD_unix_map_closedir_error
-
-extern void _MD_unix_readdir_error(int err);
-#define	_PR_MD_MAP_READDIR_ERROR	_MD_unix_readdir_error
-
-extern void _MD_unix_map_unlink_error(int err);
-#define	_PR_MD_MAP_UNLINK_ERROR	_MD_unix_map_unlink_error
-
-extern void _MD_unix_map_stat_error(int err);
-#define	_PR_MD_MAP_STAT_ERROR	_MD_unix_map_stat_error
-
-extern void _MD_unix_map_fstat_error(int err);
-#define	_PR_MD_MAP_FSTAT_ERROR	_MD_unix_map_fstat_error
-
-extern void _MD_unix_map_rename_error(int err);
-#define	_PR_MD_MAP_RENAME_ERROR	_MD_unix_map_rename_error
-
-extern void _MD_unix_map_access_error(int err);
-#define	_PR_MD_MAP_ACCESS_ERROR	_MD_unix_map_access_error
-
-extern void _MD_unix_map_mkdir_error(int err);
-#define	_PR_MD_MAP_MKDIR_ERROR	_MD_unix_map_mkdir_error
-
-extern void _MD_unix_map_rmdir_error(int err);
-#define	_PR_MD_MAP_RMDIR_ERROR	_MD_unix_map_rmdir_error
-
-extern void _MD_unix_map_read_error(int err);
-#define	_PR_MD_MAP_READ_ERROR	_MD_unix_map_read_error
-
-extern void _MD_unix_map_write_error(int err);
-#define	_PR_MD_MAP_WRITE_ERROR	_MD_unix_map_write_error
-
-extern void _MD_unix_map_lseek_error(int err);
-#define	_PR_MD_MAP_LSEEK_ERROR	_MD_unix_map_lseek_error
-
-extern void _MD_unix_map_fsync_error(int err);
-#define	_PR_MD_MAP_FSYNC_ERROR	_MD_unix_map_fsync_error
-
-extern void _MD_unix_map_close_error(int err);
-#define	_PR_MD_MAP_CLOSE_ERROR	_MD_unix_map_close_error
-
-extern void _MD_unix_map_socket_error(int err);
-#define	_PR_MD_MAP_SOCKET_ERROR	_MD_unix_map_socket_error
-
-extern void _MD_unix_map_socketavailable_error(int err);
-#define	_PR_MD_MAP_SOCKETAVAILABLE_ERROR	_MD_unix_map_socketavailable_error
-
-extern void _MD_unix_map_recv_error(int err);
-#define	_PR_MD_MAP_RECV_ERROR	_MD_unix_map_recv_error
-
-extern void _MD_unix_map_recvfrom_error(int err);
-#define	_PR_MD_MAP_RECVFROM_ERROR	_MD_unix_map_recvfrom_error
-
-extern void _MD_unix_map_send_error(int err);
-#define	_PR_MD_MAP_SEND_ERROR	_MD_unix_map_send_error
-
-extern void _MD_unix_map_sendto_error(int err);
-#define	_PR_MD_MAP_SENDTO_ERROR	_MD_unix_map_sendto_error
-
-extern void _MD_unix_map_writev_error(int err);
-#define	_PR_MD_MAP_WRITEV_ERROR	_MD_unix_map_writev_error
-
-extern void _MD_unix_map_accept_error(int err);
-#define	_PR_MD_MAP_ACCEPT_ERROR	_MD_unix_map_accept_error
-
-extern void _MD_unix_map_connect_error(int err);
-#define	_PR_MD_MAP_CONNECT_ERROR	_MD_unix_map_connect_error
-
-extern void _MD_unix_map_bind_error(int err);
-#define	_PR_MD_MAP_BIND_ERROR	_MD_unix_map_bind_error
-
-extern void _MD_unix_map_listen_error(int err);
-#define	_PR_MD_MAP_LISTEN_ERROR	_MD_unix_map_listen_error
-
-extern void _MD_unix_map_shutdown_error(int err);
-#define	_PR_MD_MAP_SHUTDOWN_ERROR	_MD_unix_map_shutdown_error
-
-extern void _MD_unix_map_socketpair_error(int err);
-#define	_PR_MD_MAP_SOCKETPAIR_ERROR	_MD_unix_map_socketpair_error
-
-extern void _MD_unix_map_getsockname_error(int err);
-#define	_PR_MD_MAP_GETSOCKNAME_ERROR	_MD_unix_map_getsockname_error
-
-extern void _MD_unix_map_getpeername_error(int err);
-#define	_PR_MD_MAP_GETPEERNAME_ERROR	_MD_unix_map_getpeername_error
-
-extern void _MD_unix_map_getsockopt_error(int err);
-#define	_PR_MD_MAP_GETSOCKOPT_ERROR	_MD_unix_map_getsockopt_error
-
-extern void _MD_unix_map_setsockopt_error(int err);
-#define	_PR_MD_MAP_SETSOCKOPT_ERROR	_MD_unix_map_setsockopt_error
-
-extern void _MD_unix_map_open_error(int err);
-#define	_PR_MD_MAP_OPEN_ERROR	_MD_unix_map_open_error
-
-extern void _MD_unix_map_mmap_error(int err);
-#define	_PR_MD_MAP_MMAP_ERROR	_MD_unix_map_mmap_error
-
-extern void _MD_unix_map_gethostname_error(int err);
-#define	_PR_MD_MAP_GETHOSTNAME_ERROR	_MD_unix_map_gethostname_error
-
-extern void _MD_unix_map_select_error(int err);
-#define	_PR_MD_MAP_SELECT_ERROR	_MD_unix_map_select_error
-
-extern void _MD_unix_map_poll_error(int err);
-#define _PR_MD_MAP_POLL_ERROR _MD_unix_map_poll_error
-
-extern void _MD_unix_map_poll_revents_error(int err);
-#define _PR_MD_MAP_POLL_REVENTS_ERROR _MD_unix_map_poll_revents_error
-
-extern void _MD_unix_map_flock_error(int err);
-#define	_PR_MD_MAP_FLOCK_ERROR	_MD_unix_map_flock_error
-
-extern void _MD_unix_map_lockf_error(int err);
-#define	_PR_MD_MAP_LOCKF_ERROR	_MD_unix_map_lockf_error
-
-PR_END_EXTERN_C
-
-#endif /* prunixerrors_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_unixos.h b/libs/js/nsprpub/pr/include/md/_unixos.h
deleted file mode 100644
index 642599bd6d..0000000000
--- a/libs/js/nsprpub/pr/include/md/_unixos.h
+++ /dev/null
@@ -1,633 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prunixos_h___
-#define prunixos_h___
-
-/*
- * If FD_SETSIZE is not defined on the command line, set the default value
- * before include select.h
- */
-/*
- * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
- * not be redefined.
- */
-#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
-    && !defined(DARWIN) && !defined(NEXTSTEP)
-#ifndef FD_SETSIZE
-#define FD_SETSIZE  4096
-#endif
-#endif
-
-#include <unistd.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include "prio.h"
-#include "prmem.h"
-#include "prclist.h"
-
-/*
- * For select(), fd_set, and struct timeval.
- *
- * In The Single UNIX(R) Specification, Version 2,
- * the header file for select() is <sys/time.h>.
- *
- * fd_set is defined in <sys/types.h>.  Usually
- * <sys/time.h> includes <sys/types.h>, but on some
- * older systems <sys/time.h> does not include
- * <sys/types.h>, so we include it explicitly.
- */
-#include <sys/time.h>
-#include <sys/types.h>
-#if defined(AIX)  /* Only pre-4.2 AIX needs it, but for simplicity... */
-#include <sys/select.h>
-#endif
-
-#define _PR_HAVE_O_APPEND
-
-#define PR_DIRECTORY_SEPARATOR		'/'
-#define PR_DIRECTORY_SEPARATOR_STR	"/"
-#define PR_PATH_SEPARATOR		':'
-#define PR_PATH_SEPARATOR_STR		":"
-#define GCPTR
-typedef int (*FARPROC)();
-
-/*
- * intervals at which GLOBAL threads wakeup to check for pending interrupt
- */
-#define _PR_INTERRUPT_CHECK_INTERVAL_SECS 5
-extern PRIntervalTime intr_timeout_ticks;
-
-/*
- * The bit flags for the in_flags and out_flags fields
- * of _PR_UnixPollDesc
- */
-#ifdef _PR_USE_POLL
-#define _PR_UNIX_POLL_READ    POLLIN
-#define _PR_UNIX_POLL_WRITE   POLLOUT
-#define _PR_UNIX_POLL_EXCEPT  POLLPRI
-#define _PR_UNIX_POLL_ERR     POLLERR
-#define _PR_UNIX_POLL_NVAL    POLLNVAL
-#define _PR_UNIX_POLL_HUP     POLLHUP
-#else /* _PR_USE_POLL */
-#define _PR_UNIX_POLL_READ    0x1
-#define _PR_UNIX_POLL_WRITE   0x2
-#define _PR_UNIX_POLL_EXCEPT  0x4
-#define _PR_UNIX_POLL_ERR     0x8
-#define _PR_UNIX_POLL_NVAL    0x10
-#define _PR_UNIX_POLL_HUP     0x20
-#endif /* _PR_USE_POLL */
-
-typedef struct _PRUnixPollDesc {
-	PRInt32 osfd;
-	PRInt16 in_flags;
-	PRInt16 out_flags;
-} _PRUnixPollDesc;
-
-typedef struct PRPollQueue {
-    PRCList links;        /* for linking PRPollQueue's together */
-    _PRUnixPollDesc *pds;        /* array of poll descriptors */
-    PRUintn npds;            /* length of the array */
-    PRPackedBool on_ioq;    /* is this on the async i/o work q? */
-    PRIntervalTime timeout;        /* timeout, in ticks */
-    struct PRThread *thr;
-} PRPollQueue;
-
-#define _PR_POLLQUEUE_PTR(_qp) \
-    ((PRPollQueue*) ((char*) (_qp) - offsetof(PRPollQueue,links)))
-
-
-extern PRInt32 _PR_WaitForMultipleFDs(
-    _PRUnixPollDesc *unixpds,
-    PRInt32 pdcnt,
-    PRIntervalTime timeout);
-extern void _PR_Unblock_IO_Wait(struct PRThread *thr);
-
-#if defined(_PR_LOCAL_THREADS_ONLY) || defined(_PR_GLOBAL_THREADS_ONLY)
-#define _MD_CHECK_FOR_EXIT()
-#endif
-
-extern fd_set _pr_md_read_set, _pr_md_write_set, _pr_md_exception_set;
-extern PRInt16 _pr_md_read_cnt[], _pr_md_write_cnt[], _pr_md_exception_cnt[];
-extern PRInt32 _pr_md_ioq_max_osfd;
-extern PRUint32 _pr_md_ioq_timeout;
-
-struct _MDFileDesc {
-    int osfd;
-#if defined(LINUX) && defined(_PR_PTHREADS)
-    int tcp_nodelay;  /* used by pt_LinuxSendFile */
-#endif
-};
-
-struct _MDDir {
-	DIR *d;
-};
-
-struct _PRCPU;
-extern void _MD_unix_init_running_cpu(struct _PRCPU *cpu);
-
-/*
-** Make a redzone at both ends of the stack segment. Disallow access
-** to those pages of memory. It's ok if the mprotect call's don't
-** work - it just means that we don't really have a functional
-** redzone.
-*/
-#include <sys/mman.h>
-#ifndef PROT_NONE
-#define PROT_NONE 0x0
-#endif
-
-#if defined(DEBUG) && !defined(DARWIN) && !defined(NEXTSTEP)
-#if !defined(SOLARIS)	
-#include <string.h>  /* for memset() */
-#define _MD_INIT_STACK(ts,REDZONE)					\
-    PR_BEGIN_MACRO                 					\
-	(void) mprotect((void*)ts->seg->vaddr, REDZONE, PROT_NONE);	\
-	(void) mprotect((void*) ((char*)ts->seg->vaddr + REDZONE + ts->stackSize),\
-			REDZONE, PROT_NONE);				\
-    /*									\
-    ** Fill stack memory with something that turns into an illegal	\
-    ** pointer value. This will sometimes find runtime references to	\
-    ** uninitialized pointers. We don't do this for solaris because we	\
-    ** can use purify instead.						\
-    */									\
-    if (_pr_debugStacks) {						\
-	memset(ts->allocBase + REDZONE, 0xf7, ts->stackSize);		\
-    }									\
-    PR_END_MACRO
-#else	/* !SOLARIS	*/
-#define _MD_INIT_STACK(ts,REDZONE)					\
-    PR_BEGIN_MACRO                 					\
-	(void) mprotect((void*)ts->seg->vaddr, REDZONE, PROT_NONE);	\
-	(void) mprotect((void*) ((char*)ts->seg->vaddr + REDZONE + ts->stackSize),\
-			REDZONE, PROT_NONE);				\
-    PR_END_MACRO
-#endif	/* !SOLARIS	*/
-
-/*
- * _MD_CLEAR_STACK
- *	Allow access to the redzone pages; the access was turned off in
- *	_MD_INIT_STACK.
- */
-#define _MD_CLEAR_STACK(ts)						\
-    PR_BEGIN_MACRO                 					\
-	(void) mprotect((void*)ts->seg->vaddr, REDZONE, PROT_READ|PROT_WRITE);\
-	(void) mprotect((void*) ((char*)ts->seg->vaddr + REDZONE + ts->stackSize),\
-			REDZONE, PROT_READ|PROT_WRITE);			\
-    PR_END_MACRO
-
-#else	/* DEBUG */
-
-#define _MD_INIT_STACK(ts,REDZONE)
-#define _MD_CLEAR_STACK(ts)
-
-#endif	/* DEBUG */
-
-#if !defined(SOLARIS) 
-
-#define PR_SET_INTSOFF(newval)
-
-#endif
-
-/************************************************************************/
-
-extern void _PR_UnixInit(void);
-
-/************************************************************************/
-
-struct _MDProcess {
-    pid_t pid;
-};
-
-struct PRProcess;
-struct PRProcessAttr;
-
-/* Create a new process (fork() + exec()) */
-#define _MD_CREATE_PROCESS _MD_CreateUnixProcess
-extern struct PRProcess * _MD_CreateUnixProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#define _MD_DETACH_PROCESS _MD_DetachUnixProcess
-extern PRStatus _MD_DetachUnixProcess(struct PRProcess *process);
-
-/* Wait for a child process to terminate */
-#define _MD_WAIT_PROCESS _MD_WaitUnixProcess
-extern PRStatus _MD_WaitUnixProcess(struct PRProcess *process,
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _MD_KillUnixProcess
-extern PRStatus _MD_KillUnixProcess(struct PRProcess *process);
-
-/************************************************************************/
-
-extern void _MD_EnableClockInterrupts(void);
-extern void _MD_DisableClockInterrupts(void);
-
-#define _MD_START_INTERRUPTS			_MD_StartInterrupts
-#define _MD_STOP_INTERRUPTS				_MD_StopInterrupts
-#define _MD_DISABLE_CLOCK_INTERRUPTS	_MD_DisableClockInterrupts
-#define _MD_ENABLE_CLOCK_INTERRUPTS		_MD_EnableClockInterrupts
-#define _MD_BLOCK_CLOCK_INTERRUPTS		_MD_BlockClockInterrupts
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS	_MD_UnblockClockInterrupts
-
-/************************************************************************/
-
-extern void		_MD_InitCPUS(void);
-#define _MD_INIT_CPUS           _MD_InitCPUS
-
-extern void		_MD_Wakeup_CPUs(void);
-#define _MD_WAKEUP_CPUS _MD_Wakeup_CPUs
-
-#define _MD_PAUSE_CPU			_MD_PauseCPU
-
-#if defined(_PR_LOCAL_THREADS_ONLY) || defined(_PR_GLOBAL_THREADS_ONLY)
-#define _MD_CLEANUP_BEFORE_EXIT()
-#endif
-
-#ifndef IRIX
-#define _MD_EXIT(status)		_exit(status)
-#endif
-
-/************************************************************************/
-
-#define _MD_GET_ENV				getenv
-#define _MD_PUT_ENV				putenv
-
-/************************************************************************/
-
-#define _MD_INIT_FILEDESC(fd)
-
-extern void		_MD_MakeNonblock(PRFileDesc *fd);
-#define _MD_MAKE_NONBLOCK			_MD_MakeNonblock		
-
-/************************************************************************/
-
-#if !defined(_PR_PTHREADS)
-
-extern void		_MD_InitSegs(void);
-extern PRStatus	_MD_AllocSegment(PRSegment *seg, PRUint32 size,
-				void *vaddr);
-extern void		_MD_FreeSegment(PRSegment *seg);
-
-#define _MD_INIT_SEGS			_MD_InitSegs
-#define _MD_ALLOC_SEGMENT		_MD_AllocSegment
-#define _MD_FREE_SEGMENT		_MD_FreeSegment
-
-#endif /* !defined(_PR_PTHREADS) */
-
-/************************************************************************/
-
-#if !defined(HPUX_LW_TIMER)
-#define _MD_INTERVAL_INIT()
-#endif
-#define _MD_INTERVAL_PER_MILLISEC()	(_PR_MD_INTERVAL_PER_SEC() / 1000)
-#define _MD_INTERVAL_PER_MICROSEC()	(_PR_MD_INTERVAL_PER_SEC() / 1000000)
-
-/************************************************************************/
-
-#define _MD_ERRNO()             	(errno)
-#define _MD_GET_SOCKET_ERROR()		(errno)
-
-/************************************************************************/
-
-extern PRInt32 _MD_AvailableSocket(PRInt32 osfd);
-
-extern void _MD_StartInterrupts(void);
-extern void _MD_StopInterrupts(void);
-extern void _MD_DisableClockInterrupts(void);
-extern void _MD_BlockClockInterrupts(void);
-extern void _MD_UnblockClockInterrupts(void);
-extern void _MD_PauseCPU(PRIntervalTime timeout);
-
-extern PRStatus _MD_open_dir(struct _MDDir *, const char *);
-extern PRInt32  _MD_close_dir(struct _MDDir *);
-extern char *   _MD_read_dir(struct _MDDir *, PRIntn);
-extern PRInt32  _MD_open(const char *name, PRIntn osflags, PRIntn mode);
-extern PRInt32	_MD_delete(const char *name);
-extern PRInt32	_MD_getfileinfo(const char *fn, PRFileInfo *info);
-extern PRInt32  _MD_getfileinfo64(const char *fn, PRFileInfo64 *info);
-extern PRInt32  _MD_getopenfileinfo(const PRFileDesc *fd, PRFileInfo *info);
-extern PRInt32  _MD_getopenfileinfo64(const PRFileDesc *fd, PRFileInfo64 *info);
-extern PRInt32	_MD_rename(const char *from, const char *to);
-extern PRInt32	_MD_access(const char *name, PRAccessHow how);
-extern PRInt32	_MD_mkdir(const char *name, PRIntn mode);
-extern PRInt32	_MD_rmdir(const char *name);
-extern PRInt32	_MD_accept_read(PRInt32 sock, PRInt32 *newSock,
-				PRNetAddr **raddr, void *buf, PRInt32 amount);
-extern PRInt32 	_PR_UnixSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-			PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-extern PRStatus _MD_LockFile(PRInt32 osfd);
-extern PRStatus _MD_TLockFile(PRInt32 osfd);
-extern PRStatus _MD_UnlockFile(PRInt32 osfd);
-
-#define _MD_OPEN_DIR(dir, name)		    _MD_open_dir(dir, name)
-#define _MD_CLOSE_DIR(dir)		        _MD_close_dir(dir)
-#define _MD_READ_DIR(dir, flags)	    _MD_read_dir(dir, flags)
-#define _MD_OPEN(name, osflags, mode)	_MD_open(name, osflags, mode)
-#define _MD_OPEN_FILE(name, osflags, mode)	_MD_open(name, osflags, mode)
-extern PRInt32 _MD_read(PRFileDesc *fd, void *buf, PRInt32 amount);
-#define _MD_READ(fd,buf,amount)		    _MD_read(fd,buf,amount)
-extern PRInt32 _MD_write(PRFileDesc *fd, const void *buf, PRInt32 amount);
-#define _MD_WRITE(fd,buf,amount)	    _MD_write(fd,buf,amount)
-#define _MD_DELETE(name)		        _MD_delete(name)
-#define _MD_GETFILEINFO(fn, info)	    _MD_getfileinfo(fn, info)
-#define _MD_GETFILEINFO64(fn, info)	    _MD_getfileinfo64(fn, info)
-#define _MD_GETOPENFILEINFO(fd, info)	_MD_getopenfileinfo(fd, info)
-#define _MD_GETOPENFILEINFO64(fd, info)	_MD_getopenfileinfo64(fd, info)
-#define _MD_RENAME(from, to)		    _MD_rename(from, to)
-#define _MD_ACCESS(name, how)		    _MD_access(name, how)
-#define _MD_MKDIR(name, mode)		    _MD_mkdir(name, mode)
-#define _MD_MAKE_DIR(name, mode)		_MD_mkdir(name, mode)
-#define _MD_RMDIR(name)			        _MD_rmdir(name)
-#define _MD_ACCEPT_READ(sock, newSock, raddr, buf, amount)	_MD_accept_read(sock, newSock, raddr, buf, amount)
-
-#define _MD_LOCKFILE _MD_LockFile
-#define _MD_TLOCKFILE _MD_TLockFile
-#define _MD_UNLOCKFILE _MD_UnlockFile
-
-
-extern PRInt32		_MD_socket(int af, int type, int flags);
-#define _MD_SOCKET	_MD_socket
-extern PRInt32		_MD_connect(PRFileDesc *fd, const PRNetAddr *addr,
-								PRUint32 addrlen, PRIntervalTime timeout);
-#define _MD_CONNECT	_MD_connect
-extern PRInt32		_MD_accept(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen,
-													PRIntervalTime timeout);
-#define _MD_ACCEPT	_MD_accept
-extern PRInt32		_MD_bind(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen);
-#define _MD_BIND	_MD_bind
-extern PRInt32		_MD_listen(PRFileDesc *fd, PRIntn backlog);
-#define _MD_LISTEN	_MD_listen
-extern PRInt32		_MD_shutdown(PRFileDesc *fd, PRIntn how);
-#define _MD_SHUTDOWN	_MD_shutdown
-
-extern PRInt32		_MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRIntervalTime timeout);
-#define _MD_RECV	_MD_recv
-extern PRInt32		_MD_send(PRFileDesc *fd, const void *buf, PRInt32 amount,
-									PRIntn flags, PRIntervalTime timeout);
-#define _MD_SEND	_MD_send
-extern PRInt32		_MD_recvfrom(PRFileDesc *fd, void *buf, PRInt32 amount,
-						PRIntn flags, PRNetAddr *addr, PRUint32 *addrlen,
-											PRIntervalTime timeout);
-#define _MD_RECVFROM	_MD_recvfrom
-extern PRInt32 _MD_sendto(PRFileDesc *fd, const void *buf, PRInt32 amount,
-							PRIntn flags, const PRNetAddr *addr, PRUint32 addrlen,
-												PRIntervalTime timeout);
-#define _MD_SENDTO	_MD_sendto
-extern PRInt32		_MD_writev(PRFileDesc *fd, const struct PRIOVec *iov,
-								PRInt32 iov_size, PRIntervalTime timeout);
-#define _MD_WRITEV	_MD_writev
-
-extern PRInt32		_MD_socketavailable(PRFileDesc *fd);
-#define	_MD_SOCKETAVAILABLE		_MD_socketavailable
-extern PRInt64		_MD_socketavailable64(PRFileDesc *fd);
-#define	_MD_SOCKETAVAILABLE64		_MD_socketavailable64
-
-#define	_MD_PIPEAVAILABLE		_MD_socketavailable
-
-extern PRInt32 _MD_pr_poll(PRPollDesc *pds, PRIntn npds,
-												PRIntervalTime timeout);
-#define _MD_PR_POLL		_MD_pr_poll
-
-extern PRInt32		_MD_close(PRInt32 osfd);
-#define _MD_CLOSE_FILE	_MD_close
-extern PRInt32		_MD_lseek(PRFileDesc*, PRInt32, PRSeekWhence);
-#define _MD_LSEEK	_MD_lseek
-extern PRInt64		_MD_lseek64(PRFileDesc*, PRInt64, PRSeekWhence);
-#define _MD_LSEEK64	_MD_lseek64
-extern PRInt32		_MD_fsync(PRFileDesc *fd);
-#define _MD_FSYNC	_MD_fsync
-
-extern PRInt32 _MD_socketpair(int af, int type, int flags, PRInt32 *osfd);
-#define _MD_SOCKETPAIR		_MD_socketpair
-
-#define _MD_CLOSE_SOCKET	_MD_close
-
-#ifndef NO_NSPR_10_SUPPORT
-#define _MD_STAT	stat
-#endif
-
-extern PRStatus _MD_getpeername(PRFileDesc *fd, PRNetAddr *addr,
-											PRUint32 *addrlen);
-#define _MD_GETPEERNAME _MD_getpeername
-extern PRStatus _MD_getsockname(PRFileDesc *fd, PRNetAddr *addr,
-											PRUint32 *addrlen);
-#define _MD_GETSOCKNAME _MD_getsockname
-
-extern PRStatus _MD_getsockopt(PRFileDesc *fd, PRInt32 level,
-						PRInt32 optname, char* optval, PRInt32* optlen);
-#define _MD_GETSOCKOPT		_MD_getsockopt
-extern PRStatus _MD_setsockopt(PRFileDesc *fd, PRInt32 level,
-					PRInt32 optname, const char* optval, PRInt32 optlen);
-#define _MD_SETSOCKOPT		_MD_setsockopt
-
-extern PRStatus _MD_set_fd_inheritable(PRFileDesc *fd, PRBool inheritable);
-#define _MD_SET_FD_INHERITABLE _MD_set_fd_inheritable
-
-extern void _MD_init_fd_inheritable(PRFileDesc *fd, PRBool imported);
-#define _MD_INIT_FD_INHERITABLE _MD_init_fd_inheritable
-
-extern void _MD_query_fd_inheritable(PRFileDesc *fd);
-#define _MD_QUERY_FD_INHERITABLE _MD_query_fd_inheritable
-
-extern PRStatus _MD_gethostname(char *name, PRUint32 namelen);
-#define _MD_GETHOSTNAME		_MD_gethostname
-
-extern PRStatus _MD_getsysinfo(PRSysInfo cmd, char *name, PRUint32 namelen);
-#define _MD_GETSYSINFO		_MD_getsysinfo
-
-extern int _MD_unix_get_nonblocking_connect_error(int osfd);
-
-/* Memory-mapped files */
-
-struct _MDFileMap {
-    PRIntn prot;
-    PRIntn flags;
-    PRBool isAnonFM; /* when true, PR_CloseFileMap() must close the related fd */
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-#define _MD_GET_MEM_MAP_ALIGNMENT() PR_GetPageSize()
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-/*
- * The standard (XPG4) gettimeofday() (from BSD) takes two arguments.
- * On some SVR4 derivatives, gettimeofday() takes only one argument.
- * The GETTIMEOFDAY macro is intended to hide this difference.
- */
-#ifdef HAVE_SVID_GETTOD
-#define GETTIMEOFDAY(tp) gettimeofday(tp)
-#else
-#define GETTIMEOFDAY(tp) gettimeofday((tp), NULL)
-#endif
-
-#if defined(_PR_PTHREADS) && !defined(_PR_POLL_AVAILABLE)
-#define _PR_NEED_FAKE_POLL
-#endif
-
-#if defined(_PR_NEED_FAKE_POLL)
-
-/*
- * Some platforms don't have poll(), but our pthreads code calls poll().
- * As a temporary measure, I implemented a fake poll() using select().
- * Here are the struct and macro definitions copied from sys/poll.h
- * on Solaris 2.5.
- */
-
-struct pollfd {
-    int fd;
-    short events;
-    short revents;
-};
-
-/* poll events */
-
-#define	POLLIN		0x0001		/* fd is readable */
-#define	POLLPRI		0x0002		/* high priority info at fd */
-#define	POLLOUT		0x0004		/* fd is writeable (won't block) */
-#define	POLLRDNORM	0x0040		/* normal data is readable */
-#define	POLLWRNORM	POLLOUT
-#define	POLLRDBAND	0x0080		/* out-of-band data is readable */
-#define	POLLWRBAND	0x0100		/* out-of-band data is writeable */
-
-#define	POLLNORM	POLLRDNORM
-
-#define	POLLERR		0x0008		/* fd has error condition */
-#define	POLLHUP		0x0010		/* fd has been hung up on */
-#define	POLLNVAL	0x0020		/* invalid pollfd entry */
-
-extern int poll(struct pollfd *, unsigned long, int);
-
-#endif /* _PR_NEED_FAKE_POLL */
-
-/*
-** A vector of the UNIX I/O calls we use. These are here to smooth over
-** the rough edges needed for large files. All of NSPR's implmentaions
-** go through this vector using syntax of the form
-**      result = _md_iovector.xxx64(args);
-*/
-
-#if defined(SOLARIS2_5)
-/*
-** Special case: Solaris 2.5.1
-** Solaris starts to have 64-bit file I/O in 2.6.  We build on Solaris
-** 2.5.1 so that we can use the same binaries on both Solaris 2.5.1 and
-** 2.6.  At run time, we detect whether 64-bit file I/O is available by
-** looking up the 64-bit file function symbols in libc.  At build time,
-** we need to define the 64-bit file I/O datatypes that are compatible
-** with their definitions on Solaris 2.6.
-*/
-typedef PRInt64 off64_t;
-typedef PRUint64 ino64_t;
-typedef PRInt64 blkcnt64_t;
-struct stat64 {
-    dev_t st_dev;
-    long st_pad1[3];
-    ino64_t st_ino;
-    mode_t st_mode;
-    nlink_t st_nlink;
-    uid_t st_uid;
-    gid_t st_gid;
-    dev_t st_rdev;
-    long t_pad2[2];
-    off64_t st_size;
-    timestruc_t st_atim;
-    timestruc_t st_mtim;
-    timestruc_t st_ctim;
-    long st_blksize;
-    blkcnt64_t st_blocks;
-    char st_fstype[_ST_FSTYPSZ];
-    long st_pad4[8];
-};
-typedef struct stat64 _MDStat64;
-typedef off64_t _MDOff64_t;
-
-#elif defined(_PR_HAVE_OFF64_T)
-typedef struct stat64 _MDStat64;
-typedef off64_t _MDOff64_t;
-#elif defined(_PR_HAVE_LARGE_OFF_T)
-typedef struct stat _MDStat64;
-typedef off_t _MDOff64_t;
-#elif defined(_PR_NO_LARGE_FILES)
-typedef struct stat _MDStat64;
-typedef PRInt64 _MDOff64_t;
-#else
-#error "I don't know yet"
-#endif
-
-typedef PRIntn (*_MD_Fstat64)(PRIntn osfd, _MDStat64 *buf);
-typedef PRIntn (*_MD_Open64)(const char *path, int oflag, ...);
-#if defined(VMS)
-typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf, ...);
-#else
-typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf);
-#endif
-typedef _MDOff64_t (*_MD_Lseek64)(PRIntn osfd, _MDOff64_t, PRIntn whence);
-typedef void* (*_MD_Mmap64)(
-    void *addr, PRSize len, PRIntn prot, PRIntn flags,
-    PRIntn fildes, _MDOff64_t offset);
-struct _MD_IOVector
-{
-    _MD_Open64 _open64;
-    _MD_Mmap64 _mmap64;
-    _MD_Stat64 _stat64;
-    _MD_Fstat64 _fstat64;
-    _MD_Lseek64 _lseek64;
-};
-extern struct _MD_IOVector _md_iovector;
-
-#endif /* prunixos_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_unixware.cfg b/libs/js/nsprpub/pr/include/md/_unixware.cfg
deleted file mode 100644
index 796e748d73..0000000000
--- a/libs/js/nsprpub/pr/include/md/_unixware.cfg
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef UNIXWARE
-#define UNIXWARE
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_unixware.h b/libs/js/nsprpub/pr/include/md/_unixware.h
deleted file mode 100644
index bdc084f23d..0000000000
--- a/libs/js/nsprpub/pr/include/md/_unixware.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_unixware_defs_h___
-#define nspr_unixware_defs_h___
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH	"unixware"
-#define _PR_SI_SYSNAME		"UnixWare"
-#define _PR_SI_ARCHITECTURE	"x86"
-#define PR_DLL_SUFFIX		".so"
-
-#define _PR_VMBASE	 	0x30000000
-#define _PR_STACK_VMBASE	0x50000000
-#define _MD_DEFAULT_STACK_SIZE	65536L
-#define _MD_MMAP_FLAGS          MAP_PRIVATE
-
-#ifndef	HAVE_WEAK_IO_SYMBOLS
-#define	HAVE_WEAK_IO_SYMBOLS
-#endif
-#define _PR_POLL_AVAILABLE
-#define _PR_USE_POLL
-#define _PR_STAT_HAS_ST_ATIM_UNION
-
-#undef  HAVE_STACK_GROWING_UP
-#define HAVE_NETCONFIG
-#define	HAVE_DLL
-#define	USE_DLFCN
-#define HAVE_STRERROR
-#define NEED_STRFTIME_LOCK
-#define NEED_TIME_R
-#define _PR_NEED_STRCASECMP
-
-#define USE_SETJMP
-
-#include <setjmp.h>
-
-#define _SETJMP setjmp
-#define _LONGJMP longjmp
-#define _PR_CONTEXT_TYPE         jmp_buf
-#define _MD_GET_SP(_t)           (_t)->md.context[4]
-#define _PR_NUM_GCREGS	_JBLEN
-
-#define CONTEXT(_th) ((_th)->md.context)
-
-/*
-** Initialize the thread context preparing it to execute _main.
-*/
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-{								  \
-    *status = PR_TRUE; \
-    if(_SETJMP(CONTEXT(_thread))) (*_main)(); \
-    _MD_GET_SP(_thread) = (int) ((_sp) - 128); \
-}
-
-#define _MD_SWITCH_CONTEXT(_thread)  \
-    if (!_SETJMP(CONTEXT(_thread))) { \
-	(_thread)->md.errcode = errno;  \
-	_PR_Schedule();		     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _MD_RESTORE_CONTEXT(_thread) \
-{				     \
-    errno = (_thread)->md.errcode;	     \
-    _MD_SET_CURRENT_THREAD(_thread); \
-    _LONGJMP(CONTEXT(_thread), 1);    \
-}
-
-/* Machine-dependent (MD) data structures.
- * Don't use SVR4 native threads (yet). 
- */
-
-struct _MDThread {
-    _PR_CONTEXT_TYPE context;
-    int id;
-    int errcode;
-};
-
-struct _MDThreadStack {
-    PRInt8 notused;
-};
-
-struct _MDLock {
-    PRInt8 notused;
-};
-
-struct _MDSemaphore {
-    PRInt8 notused;
-};
-
-struct _MDCVar {
-    PRInt8 notused;
-};
-
-struct _MDSegment {
-    PRInt8 notused;
-};
-
-/*
- * md-specific cpu structure field
- */
-#define _PR_MD_MAX_OSFD FD_SETSIZE
-
-struct _MDCPU_Unix {
-    PRCList ioQ;
-    PRUint32 ioq_timeout;
-    PRInt32 ioq_max_osfd;
-    PRInt32 ioq_osfd_cnt;
-#ifndef _PR_USE_POLL
-    fd_set fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-#else
-	struct pollfd *ioq_pollfds;
-	int ioq_pollfds_size;
-#endif	/* _PR_USE_POLL */
-};
-
-#define _PR_IOQ(_cpu)			((_cpu)->md.md_unix.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.md_unix.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.md_unix.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.md_unix.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.md_unix.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.md_unix.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.md_unix.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.md_unix.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.md_unix.ioq_max_osfd)
-#define _PR_IOQ_OSFD_CNT(_cpu)		((_cpu)->md.md_unix.ioq_osfd_cnt)
-#define _PR_IOQ_POLLFDS(_cpu)		((_cpu)->md.md_unix.ioq_pollfds)
-#define _PR_IOQ_POLLFDS_SIZE(_cpu)	((_cpu)->md.md_unix.ioq_pollfds_size)
-
-#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu)	32
-
-struct _MDCPU {
-	struct _MDCPU_Unix md_unix;
-};
-
-#define _MD_INIT_LOCKS()
-#define _MD_NEW_LOCK(lock) PR_SUCCESS
-#define _MD_FREE_LOCK(lock)
-#define _MD_LOCK(lock)
-#define _MD_UNLOCK(lock)
-#define _MD_INIT_IO()
-#define _MD_IOQ_LOCK()
-#define _MD_IOQ_UNLOCK()
-
-/*
- * The following are copied from _sunos.h, _aix.h.  This means
- * some of them should probably be moved into _unixos.h.  But
- * _irix.h seems to be quite different in regard to these macros.
- */
-#define _MD_GET_INTERVAL                  _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC              _PR_UNIX_TicksPerSecond
-
-#define _MD_EARLY_INIT		_MD_EarlyInit
-#define _MD_FINAL_INIT		_PR_UnixInit
-#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu)
-#define _MD_INIT_THREAD         _MD_InitializeThread
-#define _MD_EXIT_THREAD(thread)
-#define	_MD_SUSPEND_THREAD(thread)
-#define	_MD_RESUME_THREAD(thread)
-#define _MD_CLEAN_THREAD(_thread)
-
-/*
- * We wrapped the select() call.  _MD_SELECT refers to the built-in,
- * unwrapped version.
- */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
-	fd_set *execptfds, struct timeval *timeout);
-#define _MD_SELECT _select
-
-#define _MD_POLL _poll
-extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout);
-
-#endif /* nspr_unixware_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_unixware7.cfg b/libs/js/nsprpub/pr/include/md/_unixware7.cfg
deleted file mode 100644
index c37bd3c9f1..0000000000
--- a/libs/js/nsprpub/pr/include/md/_unixware7.cfg
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef UNIXWARE
-#define UNIXWARE
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 27  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_win16.cfg b/libs/js/nsprpub/pr/include/md/_win16.cfg
deleted file mode 100644
index 330db386e3..0000000000
--- a/libs/js/nsprpub/pr/include/md/_win16.cfg
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** _win16.cfg -- prcpucfg.h for win16
-**
-**
-** lth. 14-Apr-1997. New. Made from _win95.cfg
-*/
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN16
-#define WIN16
-#undef  WIN32
-#endif
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    2
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     16
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    4
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	4
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     2
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	2
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#undef  HAVE_LONG_LONG
-
-/*
-** HAVE_WATCOM_BUG_1
-** When HAVE_WATCOM_BUG_1 is defined, special case code is
-** used to circumvent the bug.
-** Functions declared __cdecl in DLLs returning floating point types
-** generate bad return code and will not return the intended result.
-*/
-#define HAVE_WATCOM_BUG_1
-
-/*
-** HAVE_WATCOM_BUG_2
-** When HAVE_WATCOM_BUG_2 is defined, special case code is
-** used to circumvent the bug.
-** Functions declared __cdecl in DLLs returning a structure by value
-** generate bad return values.
-** Yes, similar to Watcom Bug 1.
-*/
-#define HAVE_WATCOM_BUG_2
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_win16.h b/libs/js/nsprpub/pr/include/md/_win16.h
deleted file mode 100644
index d7e79c2221..0000000000
--- a/libs/js/nsprpub/pr/include/md/_win16.h
+++ /dev/null
@@ -1,568 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_win16_defs_h___
-#define nspr_win16_defs_h___
-
-#include <windows.h>
-#include <winsock.h>
-#include <errno.h>
-#include <direct.h>
-
-#include "nspr.h"
-/* $$ fix this */
-#define Remind(x)
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH      "win16"
-#define _PR_SI_SYSNAME        "WIN16"
-#define _PR_SI_ARCHITECTURE   "x86"    /* XXXMB hardcode for now */
-
-#define HAVE_DLL
-#define _PR_NO_PREEMPT
-#define _PR_LOCAL_THREADS_ONLY
-#undef  _PR_GLOBAL_THREADS_ONLY
-#undef  HAVE_THREAD_AFFINITY
-#define _PR_HAVE_ATOMIC_OPS
-
-/* --- Common User-Thread/Native-Thread Definitions --------------------- */
-
-extern struct PRLock        *_pr_schedLock;
-extern char                 * _pr_top_of_task_stack;
-
-
-/* --- Typedefs --- */
-
-#define PR_NUM_GCREGS           9
-typedef PRInt32	               PR_CONTEXT_TYPE[PR_NUM_GCREGS];
-
-#define _MD_MAGIC_THREAD	0x22222222
-#define _MD_MAGIC_THREADSTACK	0x33333333
-#define _MD_MAGIC_SEGMENT	0x44444444
-#define _MD_MAGIC_DIR		0x55555555
-#define _MD_MAGIC_CV        0x66666666
-
-
-typedef struct _PRWin16PollDesc
-{
-	PRInt32 osfd;
-	PRInt16 in_flags;
-	PRInt16 out_flags;
-} _PRWin16PollDesc;
-
-typedef struct PRPollQueue
-{
-    PRCList links;              /* for linking PRPollQueue's together */
-    _PRWin16PollDesc *pds;      /* array of poll descriptors */
-    PRUintn npds;				/* length of the array */
-    PRPackedBool on_ioq;        /* is this on the async i/o work q? */
-    PRIntervalTime timeout;     /* timeout, in ticks */
-    struct PRThread *thr;
-} PRPollQueue;
-
-#define _PR_POLLQUEUE_PTR(_qp) \
-    ((PRPollQueue *) ((char*) (_qp) - offsetof(PRPollQueue,links)))
-
-NSPR_API(PRInt32) _PR_WaitForFD(PRInt32 osfd, PRUintn how,
-					PRIntervalTime timeout);
-NSPR_API(void) _PR_Unblock_IO_Wait(struct PRThread *thr);
-
-#define _PR_MD_MAX_OSFD             FD_SETSIZE
-#define _PR_IOQ(_cpu)				((_cpu)->md.ioQ)
-#define _PR_ADD_TO_IOQ(_pq, _cpu) 	PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu))
-#define _PR_FD_READ_SET(_cpu)		((_cpu)->md.fd_read_set)
-#define _PR_FD_READ_CNT(_cpu)		((_cpu)->md.fd_read_cnt)
-#define _PR_FD_WRITE_SET(_cpu)		((_cpu)->md.fd_write_set)
-#define _PR_FD_WRITE_CNT(_cpu)		((_cpu)->md.fd_write_cnt)
-#define _PR_FD_EXCEPTION_SET(_cpu)	((_cpu)->md.fd_exception_set)
-#define _PR_FD_EXCEPTION_CNT(_cpu)	((_cpu)->md.fd_exception_cnt)
-#define _PR_IOQ_TIMEOUT(_cpu)		((_cpu)->md.ioq_timeout)
-#define _PR_IOQ_MAX_OSFD(_cpu)		((_cpu)->md.ioq_max_osfd)
-
-struct _MDCPU {
-    PRCList		ioQ;
-    fd_set		fd_read_set, fd_write_set, fd_exception_set;
-    PRInt16		fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD],
-				fd_exception_cnt[_PR_MD_MAX_OSFD];
-    PRUint32	ioq_timeout;
-    PRInt32		ioq_max_osfd;
-};
-
-struct _MDThread {
-    /* The overlapped structure must be first! */
-    HANDLE           blocked_sema;      /* Threads block on this when waiting
-                                         * for IO or CondVar.
-                                         */
-    PRInt32         errcode;        /* preserved errno for this thread */
-    CATCHBUF        context;        /* thread context for Throw() */
-    void           *SP;             /* Stack pointer, used only by GarbColl */
-    int             threadNumber;   /* instrumentation: order of creation */
-	_PRWin16PollDesc thr_pd;       /* poll descriptor for i/o */
-	PRPollQueue		thr_pq;        /* i/o parameters			*/
-    void           *exceptionContext; /* mfc exception context */
-    char            guardBand[24];  /* don't overwrite this */
-    PRUint32        magic;          /* self identifier, for debug */
-};
-
-struct _MDThreadStack {
-    PRUint32           magic;          /* for debugging */
-    PRIntn          cxByteCount;    /* number of stack bytes to move */
-    char *          stackTop;       /* high address on stack */
-};
-
-struct _MDSegment {
-    PRUint32           magic;          /* for debugging */
-};
-
-
-struct _MDLock {
-    PRUint32           magic;          /* for debugging */
-    PRUint32           mutex;
-};
-
-struct _MDDir {
-    PRUint32         magic;          /* for debugging */
-    struct  dirent  *dir;
-};
-
-struct _MDCVar {
-	PRUint32        magic;
-};
-
-struct _MDSemaphore {
-	PRInt32			unused;
-};
-
-struct _MDFileDesc {
-    PRInt32 osfd;
-};
-
-struct _MDProcess {
-    HANDLE handle;
-    DWORD id;
-};
-
-/*
-** Microsoft 'struct _stat'
-** ... taken directly from msvc 1.52c's header file sys/stat.h
-** see PR_Stat() implemented in w16io.c
-** See BugSplat: 98516
-*/
-#pragma pack(push)
-#pragma pack(2)
-
-typedef unsigned short _ino_t;
-typedef short _dev_t;
-typedef long _off_t;
-
-typedef struct _MDMSStat {
-    _dev_t st_dev;
-    _ino_t st_ino;
-    unsigned short st_mode;
-    short st_nlink;
-    short st_uid;
-    short st_gid;
-    _dev_t st_rdev;
-    _off_t st_size;
-    time_t st_atime;
-    time_t st_mtime;
-    time_t st_ctime;
-} _MDMSStat;
-#pragma pack(pop)
-
-/* --- Errors --- */
-    /* These are NSPR generated error codes which need to be unique from
-     * OS error codes.
-     */
-#define _MD_UNIQUEBASE                 50000
-#define _MD_EINTERRUPTED               _MD_UNIQUEBASE + 1
-#define _MD_ETIMEDOUT                  _MD_UNIQUEBASE + 2
-#define _MD_EIO                        _MD_UNIQUEBASE + 3
-
-struct PRProcess;
-struct PRProcessAttr;
-
-/* --- Create a new process --- */
-#define _MD_CREATE_PROCESS _PR_CreateWindowsProcess
-extern struct PRProcess * _PR_CreateWindowsProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#define _MD_DETACH_PROCESS _PR_DetachWindowsProcess
-extern PRStatus _PR_DetachWindowsProcess(struct PRProcess *process);
-
-/* --- Wait for a child process to terminate --- */
-#define _MD_WAIT_PROCESS _PR_WaitWindowsProcess
-extern PRStatus _PR_WaitWindowsProcess(struct PRProcess *process, 
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _PR_KillWindowsProcess
-extern PRStatus _PR_KillWindowsProcess(struct PRProcess *process);
-
-
-/* --- Misc stuff --- */
-
-#define MD_ASSERTINT( x )             PR_ASSERT( (x) < 65535 )
-
-/* --- IO stuff --- */
-#define MAX_PATH    256
-#define _MD_ERRNO()                   errno
-#define GetLastError()                errno
-
-#define _MD_GET_FILE_ERROR()          errno
-#define _MD_SET_FILE_ERROR(_err)      errno = (_err)
-
-#define _MD_OPEN                      _PR_MD_OPEN
-#define _MD_READ                      _PR_MD_READ
-#define _MD_WRITE                     _PR_MD_WRITE
-#define _MD_WRITEV                    _PR_MD_WRITEV
-#define _MD_LSEEK                     _PR_MD_LSEEK
-#define _MD_LSEEK64                   _PR_MD_LSEEK64
-#define _MD_CLOSE_FILE                _PR_MD_CLOSE_FILE
-#define _MD_GETFILEINFO               _PR_MD_GETFILEINFO
-#define _MD_GETOPENFILEINFO           _PR_MD_GETOPENFILEINFO
-#define _MD_STAT                      _PR_MD_STAT
-#define _MD_RENAME                    _PR_MD_RENAME     
-#define _MD_ACCESS                    _PR_MD_ACCESS     
-#define _MD_DELETE                    _PR_MD_DELETE     
-#define _MD_MKDIR                     _PR_MD_MKDIR      
-#define _MD_RMDIR                     _PR_MD_RMDIR      
-#define _MD_LOCKFILE                  _PR_MD_LOCKFILE
-#define _MD_TLOCKFILE                 _PR_MD_TLOCKFILE
-#define _MD_UNLOCKFILE                _PR_MD_UNLOCKFILE
-
-
-/* --- Socket IO stuff --- */
-#define _MD_EACCES                WSAEACCES
-#define _MD_EADDRINUSE            WSAEADDRINUSE
-#define _MD_EADDRNOTAVAIL         WSAEADDRNOTAVAIL
-#define _MD_EAFNOSUPPORT          WSAEAFNOSUPPORT
-#define _MD_EAGAIN                WSAEWOULDBLOCK
-#define _MD_EALREADY              WSAEALREADY
-#define _MD_EBADF                 WSAEBADF
-#define _MD_ECONNREFUSED          WSAECONNREFUSED
-#define _MD_ECONNRESET            WSAECONNRESET
-#define _MD_EFAULT                WSAEFAULT
-#define _MD_EINPROGRESS           WSAEINPROGRESS
-#define _MD_EINTR                 WSAEINTR
-#define _MD_EINVAL                EINVAL
-#define _MD_EISCONN               WSAEISCONN
-#define _MD_ENETUNREACH           WSAENETUNREACH
-#define _MD_ENOENT                ENOENT
-#define _MD_ENOTCONN              WSAENOTCONN
-#define _MD_ENOTSOCK              WSAENOTSOCK
-#define _MD_EOPNOTSUPP            WSAEOPNOTSUPP
-#define _MD_EWOULDBLOCK           WSAEWOULDBLOCK
-#define _MD_GET_SOCKET_ERROR()    WSAGetLastError()
-#define _MD_SET_SOCKET_ERROR(_err) WSASetLastError(_err)
-
-#define _MD_INIT_FILEDESC(fd)
-#define _MD_MAKE_NONBLOCK             _PR_MD_MAKE_NONBLOCK
-#define _MD_SHUTDOWN                  _PR_MD_SHUTDOWN
-#define _MD_LISTEN                      _PR_MD_LISTEN
-#define _MD_CLOSE_SOCKET              _PR_MD_CLOSE_SOCKET
-#define _MD_SENDTO                    _PR_MD_SENDTO
-#define _MD_RECVFROM                  _PR_MD_RECVFROM
-#define _MD_SOCKETPAIR(s, type, proto, sv) -1
-#define _MD_GETSOCKNAME               _PR_MD_GETSOCKNAME
-#define _MD_GETPEERNAME               _PR_MD_GETPEERNAME
-#define _MD_GETSOCKOPT                _PR_MD_GETSOCKOPT
-#define _MD_SETSOCKOPT                _PR_MD_SETSOCKOPT
-#define _MD_SELECT                    select
-#define _MD_FSYNC                     _PR_MD_FSYNC
-#define _MD_SOCKETAVAILABLE           _PR_MD_SOCKETAVAILABLE
-
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(x)       (*x++)
-#define _MD_ATOMIC_ADD(ptr, val)      ((*x) += val)
-#define _MD_ATOMIC_DECREMENT(x)       (*x--)
-#define _MD_ATOMIC_SET(x,y)           (*x, y)
-
-#define _MD_INIT_IO                   _PR_MD_INIT_IO
-
-/* win95 doesn't have async IO */
-#define _MD_SOCKET                    _PR_MD_SOCKET
-#define _MD_CONNECT                   _PR_MD_CONNECT
-#define _MD_ACCEPT                    _PR_MD_ACCEPT
-#define _MD_BIND                      _PR_MD_BIND
-#define _MD_RECV                      _PR_MD_RECV
-#define _MD_SEND                      _PR_MD_SEND
-
-#define _MD_CHECK_FOR_EXIT()
-
-/* --- Scheduler stuff --- */
-#define _MD_PAUSE_CPU                 _PR_MD_PAUSE_CPU
-
-/* --- DIR stuff --- */
-#define PR_DIRECTORY_SEPARATOR        '\\'
-#define PR_DIRECTORY_SEPARATOR_STR    "\\"
-#define PR_PATH_SEPARATOR		';'
-#define PR_PATH_SEPARATOR_STR		";"
-#define _MD_OPEN_DIR                  _PR_MD_OPEN_DIR
-#define _MD_CLOSE_DIR                 _PR_MD_CLOSE_DIR
-#define _MD_READ_DIR                  _PR_MD_READ_DIR
-
-/* --- Segment stuff --- */
-#define _MD_INIT_SEGS()
-#define _MD_ALLOC_SEGMENT           _MD_AllocSegment
-#define _MD_FREE_SEGMENT            _MD_FreeSegment
-
-/* --- Environment Stuff --- */
-#define _MD_GET_ENV                 _PR_MD_GET_ENV
-#define _MD_PUT_ENV                 _PR_MD_PUT_ENV
-
-/* --- Threading Stuff --- */
-#define _MD_DEFAULT_STACK_SIZE      32767L
-#define _MD_INIT_THREAD             _PR_MD_INIT_THREAD
-#define _MD_CREATE_THREAD(t,f,p,sc,st,stsiz) (PR_SUCCESS)
-#define _MD_YIELD                   _PR_MD_YIELD
-#define _MD_SET_PRIORITY(t,p)            
-#define _MD_CLEAN_THREAD(t)
-#define _MD_SETTHREADAFFINITYMASK   _PR_MD_SETTHREADAFFINITYMASK
-#define _MD_GETTHREADAFFINITYMASK   _PR_MD_GETTHREADAFFINITYMASK
-#define _MD_EXIT_THREAD
-#define _MD_SUSPEND_THREAD          _PR_MD_SUSPEND_THREAD
-#define _MD_RESUME_THREAD           _PR_MD_RESUME_THREAD
-#define _MD_SUSPEND_CPU             _PR_MD_SUSPEND_CPU
-#define _MD_RESUME_CPU              _PR_MD_RESUME_CPU
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_END_RESUME_ALL()
-
-/* --- Lock stuff --- */
-/*
-** Win16 does not need MD locks.
-*/
-#define _PR_LOCK                    _MD_LOCK
-#define _PR_UNLOCK                  _MD_UNLOCK
-
-#define _MD_NEW_LOCK(l)             (PR_SUCCESS)
-#define _MD_FREE_LOCK(l)
-#define _MD_LOCK(l)
-#define _MD_TEST_AND_LOCK(l)        (-1)
-#define _MD_UNLOCK(l)
-
-/* --- lock and cv waiting --- */
-#define _MD_WAIT                      _PR_MD_WAIT
-#define _MD_WAKEUP_WAITER(a)
-#define _MD_WAKEUP_CPUS               _PR_MD_WAKEUP_CPUS
-
-/* --- CVar ------------------- */
-#define _MD_WAIT_CV					  _PR_MD_WAIT_CV
-#define _MD_NEW_CV					  _PR_MD_NEW_CV
-#define _MD_FREE_CV					  _PR_MD_FREE_CV
-#define _MD_NOTIFY_CV				  _PR_MD_NOTIFY_CV	
-#define _MD_NOTIFYALL_CV			  _PR_MD_NOTIFYALL_CV
-
-   /* XXXMB- the IOQ stuff is certainly not working correctly yet. */
-#define _MD_IOQ_LOCK()                
-#define _MD_IOQ_UNLOCK()              
-
-
-/* --- Initialization stuff --- */
-NSPR_API(void) _MD_INIT_RUNNING_CPU(struct _PRCPU *cpu );
-#define _MD_START_INTERRUPTS()
-#define _MD_STOP_INTERRUPTS()
-#define _MD_DISABLE_CLOCK_INTERRUPTS()
-#define _MD_ENABLE_CLOCK_INTERRUPTS()
-#define _MD_BLOCK_CLOCK_INTERRUPTS()
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _MD_EARLY_INIT                  _PR_MD_EARLY_INIT
-#define _MD_FINAL_INIT                  _PR_MD_FINAL_INIT
-#define _MD_INIT_CPUS()
-
-/* --- User Threading stuff --- */
-#define _MD_EXIT
-
-#define _MD_CLEANUP_BEFORE_EXIT              _PR_MD_CLEANUP_BEFORE_EXIT
-
-/* --- Intervals --- */
-#define _MD_INTERVAL_INIT                 _PR_MD_INTERVAL_INIT
-#define _MD_GET_INTERVAL                  _PR_MD_GET_INTERVAL
-#define _MD_INTERVAL_PER_SEC              _PR_MD_INTERVAL_PER_SEC
-#define _MD_INTERVAL_PER_MILLISEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000)
-#define _MD_INTERVAL_PER_MICROSEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000000)
-
-/* --- Scheduler stuff --- */
-#define LOCK_SCHEDULER()                 0
-#define UNLOCK_SCHEDULER()               0
-#define _PR_LockSched()                	 0
-#define _PR_UnlockSched()                0
-
-/* --- Initialization stuff --- */
-#define _MD_INIT_LOCKS()
-
-/* --- Stack stuff --- */
-#define _MD_INIT_STACK                   _PR_MD_INIT_STACK
-#define _MD_CLEAR_STACK(stack)
-
-/*
-** Watcom needs to see this to make the linker work.
-**
-*/
-NSPR_API(void) _PR_NativeDestroyThread(PRThread *thread);
-NSPR_API(void) _PR_UserDestroyThread(PRThread *thread);
-
-
-/*
-** If thread emulation is used, then setjmp/longjmp stores the register
-** state of each thread.
-**
-** CatchBuf layout:
-**  context[0] - IP
-**  context[1] - CS
-**  context[2] - SP
-**  context[3] - BP
-**  context[4] - SI
-**  context[5] - DI
-**  context[6] - DS
-**  context[7] - ?? (maybe flags)
-**  context[8] - SS
-*/
-#define PR_CONTEXT_TYPE     CATCHBUF
-#define PR_NUM_GCREGS       9
-
-#define _MD_GET_SP(thread)  ((thread)->md.SP)
-#define CONTEXT(_t)  ((_t)->md.context)
-
-/*
-** Initialize a thread context to run "e(o,a)" when started
-*/
-#define _MD_INIT_CONTEXT(_t, sp, epa, stat )   \
-{                                              \
-     *(stat) = PR_TRUE;                        \
-     Catch((_t)->md.context );             \
-     (_t)->md.context[0] = OFFSETOF(epa);         \
-     (_t)->md.context[1] = SELECTOROF(epa);                       \
-     (_t)->md.context[2] = OFFSETOF(_pr_top_of_task_stack - 64);  \
-     (_t)->md.context[3]  = 0;                 \
-}
-
-#define _MD_SWITCH_CONTEXT(_t)                 \
-    if (!Catch((_t)->md.context)) {            \
-        int     garbCollPlaceHolder;           \
-        (_t)->md.errcode = errno;              \
-        (_t)->md.SP = &garbCollPlaceHolder;    \
-        _PR_Schedule();                        \
-    }
-
-#define _MD_SAVE_CONTEXT(_t)                    \
-    {                                           \
-        int     garbCollPlaceHolder;            \
-        Catch((_t)->md.context);                \
-        (_t)->md.errcode = errno;               \
-        (_t)->md.SP = &garbCollPlaceHolder;     \
-    }
-
-/*
-** Restore a thread context, saved by _MD_SWITCH_CONTEXT
-*/
-#define _PR_MD_RESTORE_CONTEXT  _MD_RESTORE_CONTEXT
-
-/*
- * Memory-mapped files
- */
-
-struct _MDFileMap {
-    PRInt8 unused;
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-extern PRInt32 _MD_GetMemMapAlignment(void);
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_GetMemMapAlignment
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-
-/* --- Error mapping ----------------------------------- */
-extern void _PR_MD_map_error( int err );
-
-#define _PR_MD_MAP_OPENDIR_ERROR        _PR_MD_map_error
-#define _PR_MD_MAP_CLOSEDIR_ERROR       _PR_MD_map_error
-#define _PR_MD_MAP_READDIR_ERROR        _PR_MD_map_error
-#define _PR_MD_MAP_DELETE_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_STAT_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_FSTAT_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_RENAME_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_ACCESS_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_MKDIR_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_RMDIR_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_READ_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_TRANSMITFILE_ERROR   _PR_MD_map_error
-#define _PR_MD_MAP_WRITE_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_LSEEK_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_FSYNC_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_CLOSE_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_SOCKET_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_RECV_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_RECVFROM_ERROR       _PR_MD_map_error
-#define _PR_MD_MAP_SEND_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_SENDTO_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_ACCEPT_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_ACCEPTEX_ERROR       _PR_MD_map_error
-#define _PR_MD_MAP_CONNECT_ERROR        _PR_MD_map_error
-#define _PR_MD_MAP_BIND_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_LISTEN_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_SHUTDOWN_ERROR       _PR_MD_map_error
-#define _PR_MD_MAP_GETSOCKNAME_ERROR    _PR_MD_map_error
-#define _PR_MD_MAP_GETPEERNAME_ERROR    _PR_MD_map_error
-#define _PR_MD_MAP_GETSOCKOPT_ERROR     _PR_MD_map_error
-#define _PR_MD_MAP_SETSOCKOPT_ERROR     _PR_MD_map_error
-#define _PR_MD_MAP_OPEN_ERROR           _PR_MD_map_error
-#define _PR_MD_MAP_GETHOSTNAME_ERROR    _PR_MD_map_error
-#define _PR_MD_MAP_SELECT_ERROR         _PR_MD_map_error
-#define _PR_MD_MAP_LOCKF_ERROR          _PR_MD_map_error
-#define _PR_MD_MAP_WSASTARTUP_ERROR     _PR_MD_map_error
-
-#endif /* nspr_win16_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_win32_errors.h b/libs/js/nsprpub/pr/include/md/_win32_errors.h
deleted file mode 100644
index d5d8b71423..0000000000
--- a/libs/js/nsprpub/pr/include/md/_win32_errors.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_win32_errors_h___
-#define nspr_win32_errors_h___
-
-#include <windows.h>
-#include <winsock.h>
-#include <errno.h>
-
-
-extern void _MD_win32_map_default_error(PRInt32 err);
-#define _PR_MD_MAP_DEFAULT_ERROR	_MD_win32_map_default_error
-
-extern void _MD_win32_map_opendir_error(PRInt32 err);
-#define	_PR_MD_MAP_OPENDIR_ERROR	_MD_win32_map_opendir_error
-
-extern void _MD_win32_map_closedir_error(PRInt32 err);
-#define	_PR_MD_MAP_CLOSEDIR_ERROR	_MD_win32_map_closedir_error
-
-extern void _MD_unix_readdir_error(PRInt32 err);
-#define	_PR_MD_MAP_READDIR_ERROR	_MD_unix_readdir_error
-
-extern void _MD_win32_map_delete_error(PRInt32 err);
-#define	_PR_MD_MAP_DELETE_ERROR	_MD_win32_map_delete_error
-
-extern void _MD_win32_map_stat_error(PRInt32 err);
-#define	_PR_MD_MAP_STAT_ERROR	_MD_win32_map_stat_error
-
-extern void _MD_win32_map_fstat_error(PRInt32 err);
-#define	_PR_MD_MAP_FSTAT_ERROR	_MD_win32_map_fstat_error
-
-extern void _MD_win32_map_rename_error(PRInt32 err);
-#define	_PR_MD_MAP_RENAME_ERROR	_MD_win32_map_rename_error
-
-extern void _MD_win32_map_access_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCESS_ERROR	_MD_win32_map_access_error
-
-extern void _MD_win32_map_mkdir_error(PRInt32 err);
-#define	_PR_MD_MAP_MKDIR_ERROR	_MD_win32_map_mkdir_error
-
-extern void _MD_win32_map_rmdir_error(PRInt32 err);
-#define	_PR_MD_MAP_RMDIR_ERROR	_MD_win32_map_rmdir_error
-
-extern void _MD_win32_map_read_error(PRInt32 err);
-#define	_PR_MD_MAP_READ_ERROR	_MD_win32_map_read_error
-
-extern void _MD_win32_map_transmitfile_error(PRInt32 err);
-#define	_PR_MD_MAP_TRANSMITFILE_ERROR	_MD_win32_map_transmitfile_error
-
-extern void _MD_win32_map_write_error(PRInt32 err);
-#define	_PR_MD_MAP_WRITE_ERROR	_MD_win32_map_write_error
-
-extern void _MD_win32_map_lseek_error(PRInt32 err);
-#define	_PR_MD_MAP_LSEEK_ERROR	_MD_win32_map_lseek_error
-
-extern void _MD_win32_map_fsync_error(PRInt32 err);
-#define	_PR_MD_MAP_FSYNC_ERROR	_MD_win32_map_fsync_error
-
-extern void _MD_win32_map_close_error(PRInt32 err);
-#define	_PR_MD_MAP_CLOSE_ERROR	_MD_win32_map_close_error
-
-extern void _MD_win32_map_socket_error(PRInt32 err);
-#define	_PR_MD_MAP_SOCKET_ERROR	_MD_win32_map_socket_error
-
-extern void _MD_win32_map_recv_error(PRInt32 err);
-#define	_PR_MD_MAP_RECV_ERROR	_MD_win32_map_recv_error
-
-extern void _MD_win32_map_recvfrom_error(PRInt32 err);
-#define	_PR_MD_MAP_RECVFROM_ERROR	_MD_win32_map_recvfrom_error
-
-extern void _MD_win32_map_send_error(PRInt32 err);
-#define	_PR_MD_MAP_SEND_ERROR	_MD_win32_map_send_error
-
-extern void _MD_win32_map_sendto_error(PRInt32 err);
-#define	_PR_MD_MAP_SENDTO_ERROR	_MD_win32_map_sendto_error
-
-extern void _MD_win32_map_accept_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCEPT_ERROR	_MD_win32_map_accept_error
-
-extern void _MD_win32_map_acceptex_error(PRInt32 err);
-#define	_PR_MD_MAP_ACCEPTEX_ERROR	_MD_win32_map_acceptex_error
-
-extern PRInt32 _MD_win32_map_connect_error(PRInt32 err);
-#define	_PR_MD_MAP_CONNECT_ERROR	_MD_win32_map_connect_error
-
-extern void _MD_win32_map_bind_error(PRInt32 err);
-#define	_PR_MD_MAP_BIND_ERROR	_MD_win32_map_bind_error
-
-extern void _MD_win32_map_listen_error(PRInt32 err);
-#define	_PR_MD_MAP_LISTEN_ERROR	_MD_win32_map_listen_error
-
-extern void _MD_win32_map_shutdown_error(PRInt32 err);
-#define	_PR_MD_MAP_SHUTDOWN_ERROR	_MD_win32_map_shutdown_error
-
-extern void _MD_win32_map_getsockname_error(PRInt32 err);
-#define	_PR_MD_MAP_GETSOCKNAME_ERROR	_MD_win32_map_getsockname_error
-
-extern void _MD_win32_map_getpeername_error(PRInt32 err);
-#define	_PR_MD_MAP_GETPEERNAME_ERROR	_MD_win32_map_getpeername_error
-
-extern void _MD_win32_map_getsockopt_error(PRInt32 err);
-#define	_PR_MD_MAP_GETSOCKOPT_ERROR	_MD_win32_map_getsockopt_error
-
-extern void _MD_win32_map_setsockopt_error(PRInt32 err);
-#define	_PR_MD_MAP_SETSOCKOPT_ERROR	_MD_win32_map_setsockopt_error
-
-extern void _MD_win32_map_open_error(PRInt32 err);
-#define	_PR_MD_MAP_OPEN_ERROR	_MD_win32_map_open_error
-
-extern void _MD_win32_map_gethostname_error(PRInt32 err);
-#define	_PR_MD_MAP_GETHOSTNAME_ERROR	_MD_win32_map_gethostname_error
-
-extern void _MD_win32_map_select_error(PRInt32 err);
-#define	_PR_MD_MAP_SELECT_ERROR	_MD_win32_map_select_error
-
-extern void _MD_win32_map_lockf_error(int err);
-#define _PR_MD_MAP_LOCKF_ERROR  _MD_win32_map_lockf_error
-
-#endif /* nspr_win32_errors_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_win95.cfg b/libs/js/nsprpub/pr/include/md/_win95.cfg
deleted file mode 100644
index de25ce2428..0000000000
--- a/libs/js/nsprpub/pr/include/md/_win95.cfg
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef WIN95
-#define WIN95
-#endif
-
-#define PR_AF_INET6 23  /* same as AF_INET6 */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#elif defined(_ALPHA_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(_AMD64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	8
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	64
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	8
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_IA64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	8
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	64
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	8
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#define HAVE_LONG_LONG
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_win95.h b/libs/js/nsprpub/pr/include/md/_win95.h
deleted file mode 100644
index 083d0200f5..0000000000
--- a/libs/js/nsprpub/pr/include/md/_win95.h
+++ /dev/null
@@ -1,557 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_win95_defs_h___
-#define nspr_win95_defs_h___
-
-#include "prio.h"
-
-#include <windows.h>
-#include <winsock.h>
-#include <errno.h>
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH      "win32"
-#define _PR_SI_SYSNAME        "WIN95"
-#if defined(_M_IX86) || defined(_X86_)
-#define _PR_SI_ARCHITECTURE   "x86"
-#elif defined(_AMD64_)
-#define _PR_SI_ARCHITECTURE   "x86-64"
-#elif defined(_IA64_)
-#define _PR_SI_ARCHITECTURE   "ia64"
-#else
-#error unknown processor architecture
-#endif
-
-#define HAVE_DLL
-#undef  HAVE_THREAD_AFFINITY
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#ifndef _PR_INET6
-#define AF_INET6 23
-/* newer ws2tcpip.h provides these */
-#ifndef AI_CANONNAME
-#define AI_CANONNAME 0x2
-struct addrinfo {
-    int ai_flags;
-    int ai_family;
-    int ai_socktype;
-    int ai_protocol;
-    size_t ai_addrlen;
-    char *ai_canonname;
-    struct sockaddr *ai_addr;
-    struct addrinfo *ai_next;
-};
-#endif
-#define _PR_HAVE_MD_SOCKADDR_IN6
-/* isomorphic to struct in6_addr on Windows */
-struct _md_in6_addr {
-    union {
-        PRUint8  _S6_u8[16];
-        PRUint16 _S6_u16[8];
-    } _S6_un;
-};
-/* isomorphic to struct sockaddr_in6 on Windows */
-struct _md_sockaddr_in6 {
-    PRInt16 sin6_family;
-    PRUint16 sin6_port;
-    PRUint32 sin6_flowinfo;
-    struct _md_in6_addr sin6_addr;
-    PRUint32 sin6_scope_id;
-};
-#endif
-#define _PR_HAVE_THREADSAFE_GETHOST
-#define _PR_HAVE_ATOMIC_OPS
-#define PR_HAVE_WIN32_NAMED_SHARED_MEMORY
-
-/* --- Common User-Thread/Native-Thread Definitions --------------------- */
-
-/* --- Globals --- */
-extern struct PRLock                      *_pr_schedLock;
-
-/* --- Typedefs --- */
-typedef void (*FiberFunc)(void *);
-
-#define PR_NUM_GCREGS           8
-typedef PRInt32	                PR_CONTEXT_TYPE[PR_NUM_GCREGS];
-#define GC_VMBASE               0x40000000
-#define GC_VMLIMIT              0x00FFFFFF
-
-#define _MD_MAGIC_THREAD	0x22222222
-#define _MD_MAGIC_THREADSTACK	0x33333333
-#define _MD_MAGIC_SEGMENT	0x44444444
-#define _MD_MAGIC_DIR		0x55555555
-#define _MD_MAGIC_CV        0x66666666
-
-struct _MDCPU {
-    int              unused;
-};
-
-struct _MDThread {
-    HANDLE           blocked_sema;      /* Threads block on this when waiting
-                                         * for IO or CondVar.
-                                         */
-    PRBool           inCVWaitQueue;     /* PR_TRUE if the thread is in the
-                                         * wait queue of some cond var.
-                                         * PR_FALSE otherwise.  */
-    HANDLE           handle;            /* Win32 thread handle */
-    PRUint32         id;
-    void            *sp;                /* only valid when suspended */
-    PRUint32         magic;             /* for debugging */
-    PR_CONTEXT_TYPE  gcContext;         /* Thread context for GC */
-    struct PRThread *prev, *next;       /* used by the cvar wait queue to
-                                         * chain the PRThread structures
-                                         * together */
-    void (*start)(void *);              /* used by _PR_MD_CREATE_THREAD to
-                                         * pass its 'start' argument to
-                                         * pr_root. */
-};
-
-struct _MDThreadStack {
-    PRUint32           magic;          /* for debugging */
-};
-
-struct _MDSegment {
-    PRUint32           magic;          /* for debugging */
-};
-
-#undef PROFILE_LOCKS
-
-struct _MDDir {
-    HANDLE           d_hdl;
-    WIN32_FIND_DATA  d_entry;
-    PRBool           firstEntry;     /* Is this the entry returned
-                                      * by FindFirstFile()? */
-    PRUint32         magic;          /* for debugging */
-};
-
-#ifdef MOZ_UNICODE
-struct _MDDirUTF16 {
-    HANDLE           d_hdl;
-    WIN32_FIND_DATAW d_entry;
-    PRBool           firstEntry;     /* Is this the entry returned
-                                      * by FindFirstFileW()? */
-    PRUint32         magic;          /* for debugging */
-};
-#endif /* MOZ_UNICODE */
-
-struct _MDCVar {
-    PRUint32 magic;
-    struct PRThread *waitHead, *waitTail;  /* the wait queue: a doubly-
-                                            * linked list of threads
-                                            * waiting on this condition
-                                            * variable */
-    PRIntn nwait;                          /* number of threads in the
-                                            * wait queue */
-};
-
-#define _MD_CV_NOTIFIED_LENGTH 6
-typedef struct _MDNotified _MDNotified;
-struct _MDNotified {
-    PRIntn length;                     /* # of used entries in this
-                                        * structure */
-    struct {
-        struct _MDCVar *cv;            /* the condition variable notified */
-        PRIntn times;                  /* and the number of times notified */
-        struct PRThread *notifyHead;   /* list of threads to wake up */
-    } cv[_MD_CV_NOTIFIED_LENGTH];
-    _MDNotified *link;                 /* link to another of these, or NULL */
-};
-
-struct _MDLock {
-    CRITICAL_SECTION mutex;          /* this is recursive on NT */
-
-    /*
-     * When notifying cvars, there is no point in actually
-     * waking up the threads waiting on the cvars until we've
-     * released the lock.  So, we temporarily record the cvars.
-     * When doing an unlock, we'll then wake up the waiting threads.
-     */
-    struct _MDNotified notified;     /* array of conditions notified */
-#ifdef PROFILE_LOCKS
-    PRInt32 hitcount;
-    PRInt32 misscount;
-#endif
-};
-
-struct _MDSemaphore {
-    HANDLE           sem;
-};
-
-struct _MDFileDesc {
-    PROsfd osfd;     /* The osfd can come from one of three spaces:
-                      * - For stdin, stdout, and stderr, we are using
-                      *   the libc file handle (0, 1, 2), which is an int.
-                      * - For files and pipes, we are using Win32 HANDLE,
-                      *   which is a void*.
-                      * - For sockets, we are using Winsock SOCKET, which
-                      *   is a u_int.
-                      */
-};
-
-struct _MDProcess {
-    HANDLE handle;
-    DWORD id;
-};
-
-/* --- Misc stuff --- */
-#define _MD_GET_SP(thread)            (thread)->md.gcContext[6]
-
-/* --- NT security stuff --- */
-
-extern void _PR_NT_InitSids(void);
-extern void _PR_NT_FreeSids(void);
-extern PRStatus _PR_NT_MakeSecurityDescriptorACL(
-    PRIntn mode,
-    DWORD accessTable[],
-    PSECURITY_DESCRIPTOR *resultSD,
-    PACL *resultACL
-);
-extern void _PR_NT_FreeSecurityDescriptorACL(
-    PSECURITY_DESCRIPTOR pSD, PACL pACL);
-
-/* --- IO stuff --- */
-
-#define _MD_OPEN                      _PR_MD_OPEN
-#define _MD_OPEN_FILE                 _PR_MD_OPEN_FILE
-#define _MD_READ                      _PR_MD_READ
-#define _MD_WRITE                     _PR_MD_WRITE
-#define _MD_WRITEV                    _PR_MD_WRITEV
-#define _MD_LSEEK                     _PR_MD_LSEEK
-#define _MD_LSEEK64                   _PR_MD_LSEEK64
-extern PRInt32 _MD_CloseFile(PROsfd osfd);
-#define _MD_CLOSE_FILE                _MD_CloseFile
-#define _MD_GETFILEINFO               _PR_MD_GETFILEINFO
-#define _MD_GETFILEINFO64             _PR_MD_GETFILEINFO64
-#define _MD_GETOPENFILEINFO           _PR_MD_GETOPENFILEINFO
-#define _MD_GETOPENFILEINFO64         _PR_MD_GETOPENFILEINFO64
-#define _MD_STAT                      _PR_MD_STAT
-#define _MD_RENAME                    _PR_MD_RENAME     
-#define _MD_ACCESS                    _PR_MD_ACCESS     
-#define _MD_DELETE                    _PR_MD_DELETE     
-#define _MD_MKDIR                     _PR_MD_MKDIR      
-#define _MD_MAKE_DIR                  _PR_MD_MAKE_DIR
-#define _MD_RMDIR                     _PR_MD_RMDIR      
-#define _MD_LOCKFILE                  _PR_MD_LOCKFILE
-#define _MD_TLOCKFILE                 _PR_MD_TLOCKFILE
-#define _MD_UNLOCKFILE                _PR_MD_UNLOCKFILE
-
-#ifdef MOZ_UNICODE
-/* --- UTF16 IO stuff --- */
-#define _MD_OPEN_FILE_UTF16           _PR_MD_OPEN_FILE_UTF16
-#define _MD_OPEN_DIR_UTF16            _PR_MD_OPEN_DIR_UTF16
-#define _MD_READ_DIR_UTF16            _PR_MD_READ_DIR_UTF16
-#define _MD_CLOSE_DIR_UTF16           _PR_MD_CLOSE_DIR_UTF16
-#define _MD_GETFILEINFO64_UTF16       _PR_MD_GETFILEINFO64_UTF16
-#endif /* MOZ_UNICODE */
-
-/* --- Socket IO stuff --- */
-#define _MD_EACCES                WSAEACCES
-#define _MD_EADDRINUSE            WSAEADDRINUSE
-#define _MD_EADDRNOTAVAIL         WSAEADDRNOTAVAIL
-#define _MD_EAFNOSUPPORT          WSAEAFNOSUPPORT
-#define _MD_EAGAIN                WSAEWOULDBLOCK
-#define _MD_EALREADY              WSAEALREADY
-#define _MD_EBADF                 WSAEBADF
-#define _MD_ECONNREFUSED          WSAECONNREFUSED
-#define _MD_ECONNRESET            WSAECONNRESET
-#define _MD_EFAULT                WSAEFAULT
-#define _MD_EINPROGRESS           WSAEINPROGRESS
-#define _MD_EINTR                 WSAEINTR
-#define _MD_EINVAL                EINVAL
-#define _MD_EISCONN               WSAEISCONN
-#define _MD_ENETUNREACH           WSAENETUNREACH
-#define _MD_ENOENT                ENOENT
-#define _MD_ENOTCONN              WSAENOTCONN
-#define _MD_ENOTSOCK              WSAENOTSOCK
-#define _MD_EOPNOTSUPP            WSAEOPNOTSUPP
-#define _MD_EWOULDBLOCK           WSAEWOULDBLOCK
-#define _MD_GET_SOCKET_ERROR()    WSAGetLastError()
-#define _MD_SET_SOCKET_ERROR(_err) WSASetLastError(_err)
-
-#define _MD_INIT_FILEDESC(fd)
-extern void _MD_MakeNonblock(PRFileDesc *f);
-#define _MD_MAKE_NONBLOCK             _MD_MakeNonblock
-#define _MD_INIT_FD_INHERITABLE       _PR_MD_INIT_FD_INHERITABLE
-#define _MD_QUERY_FD_INHERITABLE      _PR_MD_QUERY_FD_INHERITABLE
-#define _MD_SHUTDOWN                  _PR_MD_SHUTDOWN
-#define _MD_LISTEN                    _PR_MD_LISTEN
-extern PRInt32 _MD_CloseSocket(PROsfd osfd);
-#define _MD_CLOSE_SOCKET              _MD_CloseSocket
-#define _MD_SENDTO                    _PR_MD_SENDTO
-#define _MD_RECVFROM                  _PR_MD_RECVFROM
-#define _MD_SOCKETPAIR(s, type, proto, sv) -1
-#define _MD_GETSOCKNAME               _PR_MD_GETSOCKNAME
-#define _MD_GETPEERNAME               _PR_MD_GETPEERNAME
-#define _MD_GETSOCKOPT                _PR_MD_GETSOCKOPT
-#define _MD_SETSOCKOPT                _PR_MD_SETSOCKOPT
-#define _MD_SET_FD_INHERITABLE        _PR_MD_SET_FD_INHERITABLE
-#define _MD_SELECT                    select
-#define _MD_FSYNC                     _PR_MD_FSYNC
-#define READ_FD                       1
-#define WRITE_FD                      2
-
-#define _MD_INIT_ATOMIC()
-#if defined(_M_IX86) || defined(_X86_)
-#define _MD_ATOMIC_INCREMENT          _PR_MD_ATOMIC_INCREMENT
-#define _MD_ATOMIC_ADD          	  _PR_MD_ATOMIC_ADD
-#define _MD_ATOMIC_DECREMENT          _PR_MD_ATOMIC_DECREMENT
-#else /* non-x86 processors */
-#define _MD_ATOMIC_INCREMENT(x)       InterlockedIncrement((PLONG)x)
-#define _MD_ATOMIC_ADD(ptr,val)    (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val)
-#define _MD_ATOMIC_DECREMENT(x)       InterlockedDecrement((PLONG)x)
-#endif /* x86 */
-#define _MD_ATOMIC_SET(x,y)           InterlockedExchange((PLONG)x, (LONG)y)
-
-#define _MD_INIT_IO                   _PR_MD_INIT_IO
-
-
-/* win95 doesn't have async IO */
-#define _MD_SOCKET                    _PR_MD_SOCKET
-extern PRInt32 _MD_SocketAvailable(PRFileDesc *fd);
-#define _MD_SOCKETAVAILABLE           _MD_SocketAvailable
-#define _MD_PIPEAVAILABLE             _PR_MD_PIPEAVAILABLE
-#define _MD_CONNECT                   _PR_MD_CONNECT
-extern PROsfd _MD_Accept(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen,
-        PRIntervalTime timeout);
-#define _MD_ACCEPT                    _MD_Accept
-#define _MD_BIND                      _PR_MD_BIND
-#define _MD_RECV                      _PR_MD_RECV
-#define _MD_SEND                      _PR_MD_SEND
-#define _MD_PR_POLL                   _PR_MD_PR_POLL
-
-/* --- Scheduler stuff --- */
-// #define _MD_PAUSE_CPU                 _PR_MD_PAUSE_CPU
-#define _MD_PAUSE_CPU
-
-/* --- DIR stuff --- */
-#define PR_DIRECTORY_SEPARATOR        '\\'
-#define PR_DIRECTORY_SEPARATOR_STR    "\\"
-#define PR_PATH_SEPARATOR		';'
-#define PR_PATH_SEPARATOR_STR		";"
-#define _MD_ERRNO()                   GetLastError()
-#define _MD_OPEN_DIR                  _PR_MD_OPEN_DIR
-#define _MD_CLOSE_DIR                 _PR_MD_CLOSE_DIR
-#define _MD_READ_DIR                  _PR_MD_READ_DIR
-
-/* --- Segment stuff --- */
-#define _MD_INIT_SEGS()
-#define _MD_ALLOC_SEGMENT(seg, size, vaddr)   0
-#define _MD_FREE_SEGMENT(seg)
-
-/* --- Environment Stuff --- */
-#define _MD_GET_ENV                 _PR_MD_GET_ENV
-#define _MD_PUT_ENV                 _PR_MD_PUT_ENV
-
-/* --- Threading Stuff --- */
-#define _MD_DEFAULT_STACK_SIZE            0
-#define _MD_INIT_THREAD             _PR_MD_INIT_THREAD
-#define _MD_INIT_ATTACHED_THREAD    _PR_MD_INIT_THREAD
-#define _MD_CREATE_THREAD           _PR_MD_CREATE_THREAD
-#define _MD_YIELD                   _PR_MD_YIELD
-#define _MD_SET_PRIORITY            _PR_MD_SET_PRIORITY
-#define _MD_CLEAN_THREAD            _PR_MD_CLEAN_THREAD
-#define _MD_SETTHREADAFFINITYMASK   _PR_MD_SETTHREADAFFINITYMASK
-#define _MD_GETTHREADAFFINITYMASK   _PR_MD_GETTHREADAFFINITYMASK
-#define _MD_EXIT_THREAD             _PR_MD_EXIT_THREAD
-#define _MD_EXIT                    _PR_MD_EXIT
-#define _MD_SUSPEND_THREAD          _PR_MD_SUSPEND_THREAD
-#define _MD_RESUME_THREAD           _PR_MD_RESUME_THREAD
-#define _MD_SUSPEND_CPU             _PR_MD_SUSPEND_CPU
-#define _MD_RESUME_CPU              _PR_MD_RESUME_CPU
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_END_RESUME_ALL()
-
-/* --- Lock stuff --- */
-#define _PR_LOCK                      _MD_LOCK
-#define _PR_UNLOCK					  _MD_UNLOCK
-
-#define _MD_NEW_LOCK(lock)            (InitializeCriticalSection(&((lock)->mutex)),(lock)->notified.length=0,(lock)->notified.link=NULL,PR_SUCCESS)
-#define _MD_FREE_LOCK(lock)           DeleteCriticalSection(&((lock)->mutex))
-#define _MD_LOCK(lock)                EnterCriticalSection(&((lock)->mutex))
-#define _MD_TEST_AND_LOCK(lock)       (EnterCriticalSection(&((lock)->mutex)),0)
-#define _MD_UNLOCK                    _PR_MD_UNLOCK
-
-/* --- lock and cv waiting --- */
-#define _MD_WAIT                      _PR_MD_WAIT
-#define _MD_WAKEUP_WAITER             _PR_MD_WAKEUP_WAITER
-
-/* --- CVar ------------------- */
-#define _MD_WAIT_CV					  _PR_MD_WAIT_CV
-#define _MD_NEW_CV					  _PR_MD_NEW_CV
-#define _MD_FREE_CV					  _PR_MD_FREE_CV
-#define _MD_NOTIFY_CV				  _PR_MD_NOTIFY_CV	
-#define _MD_NOTIFYALL_CV			  _PR_MD_NOTIFYALL_CV
-
-   /* XXXMB- the IOQ stuff is certainly not working correctly yet. */
-// extern  struct _MDLock              _pr_ioq_lock;
-#define _MD_IOQ_LOCK()                
-#define _MD_IOQ_UNLOCK()              
-
-
-/* --- Initialization stuff --- */
-#define _MD_START_INTERRUPTS()
-#define _MD_STOP_INTERRUPTS()
-#define _MD_DISABLE_CLOCK_INTERRUPTS()
-#define _MD_ENABLE_CLOCK_INTERRUPTS()
-#define _MD_BLOCK_CLOCK_INTERRUPTS()
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _MD_EARLY_INIT                _PR_MD_EARLY_INIT
-#define _MD_FINAL_INIT()
-#define _MD_INIT_CPUS()
-#define _MD_INIT_RUNNING_CPU(cpu)
-
-struct PRProcess;
-struct PRProcessAttr;
-
-#define _MD_CREATE_PROCESS _PR_CreateWindowsProcess
-extern struct PRProcess * _PR_CreateWindowsProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#define _MD_DETACH_PROCESS _PR_DetachWindowsProcess
-extern PRStatus _PR_DetachWindowsProcess(struct PRProcess *process);
-
-/* --- Wait for a child process to terminate --- */
-#define _MD_WAIT_PROCESS _PR_WaitWindowsProcess
-extern PRStatus _PR_WaitWindowsProcess(struct PRProcess *process, 
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _PR_KillWindowsProcess
-extern PRStatus _PR_KillWindowsProcess(struct PRProcess *process);
-
-#define _MD_CLEANUP_BEFORE_EXIT           _PR_MD_CLEANUP_BEFORE_EXIT
-#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
-    PR_BEGIN_MACRO \
-    *status = PR_TRUE; \
-    PR_END_MACRO
-#define _MD_SWITCH_CONTEXT
-#define _MD_RESTORE_CONTEXT
-
-/* --- Intervals --- */
-#define _MD_INTERVAL_INIT                 _PR_MD_INTERVAL_INIT
-#define _MD_GET_INTERVAL                  _PR_MD_GET_INTERVAL
-#define _MD_INTERVAL_PER_SEC              _PR_MD_INTERVAL_PER_SEC
-#define _MD_INTERVAL_PER_MILLISEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000)
-#define _MD_INTERVAL_PER_MICROSEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000000)
-
-/* --- Time --- */
-extern void _PR_FileTimeToPRTime(const FILETIME *filetime, PRTime *prtm);
-
-/* --- Native-Thread Specific Definitions ------------------------------- */
-
-extern struct PRThread * _MD_CURRENT_THREAD(void);
-
-#ifdef _PR_USE_STATIC_TLS
-extern __declspec(thread) struct PRThread *_pr_currentThread;
-#define _MD_GET_ATTACHED_THREAD() _pr_currentThread
-#define _MD_SET_CURRENT_THREAD(_thread) (_pr_currentThread = (_thread))
-
-extern __declspec(thread) struct PRThread *_pr_thread_last_run;
-#define _MD_LAST_THREAD() _pr_thread_last_run
-#define _MD_SET_LAST_THREAD(_thread) (_pr_thread_last_run = 0)
-
-extern __declspec(thread) struct _PRCPU *_pr_currentCPU;
-#define _MD_CURRENT_CPU() _pr_currentCPU
-#define _MD_SET_CURRENT_CPU(_cpu) (_pr_currentCPU = 0)
-#else /* _PR_USE_STATIC_TLS */
-extern DWORD _pr_currentThreadIndex;
-#define _MD_GET_ATTACHED_THREAD() ((PRThread *) TlsGetValue(_pr_currentThreadIndex))
-#define _MD_SET_CURRENT_THREAD(_thread) TlsSetValue(_pr_currentThreadIndex, (_thread))
-
-extern DWORD _pr_lastThreadIndex;
-#define _MD_LAST_THREAD() ((PRThread *) TlsGetValue(_pr_lastThreadIndex))
-#define _MD_SET_LAST_THREAD(_thread) TlsSetValue(_pr_lastThreadIndex, 0)
-
-extern DWORD _pr_currentCPUIndex;
-#define _MD_CURRENT_CPU() ((struct _PRCPU *) TlsGetValue(_pr_currentCPUIndex))
-#define _MD_SET_CURRENT_CPU(_cpu) TlsSetValue(_pr_currentCPUIndex, 0)
-#endif /* _PR_USE_STATIC_TLS */
-
-/* --- Scheduler stuff --- */
-#define LOCK_SCHEDULER()                 0
-#define UNLOCK_SCHEDULER()               0
-#define _PR_LockSched()                	 0
-#define _PR_UnlockSched()                0
-
-/* --- Initialization stuff --- */
-#define _MD_INIT_LOCKS()
-
-/* --- Stack stuff --- */
-#define _MD_INIT_STACK(stack, redzone)
-#define _MD_CLEAR_STACK(stack)
-
-/* --- Memory-mapped files stuff --- */
-
-struct _MDFileMap {
-    HANDLE hFileMap;
-    DWORD dwAccess;
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-extern PRInt32 _MD_GetMemMapAlignment(void);
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_GetMemMapAlignment
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-/* --- Named semaphores stuff --- */
-#define _PR_HAVE_NAMED_SEMAPHORES
-#define _MD_OPEN_SEMAPHORE            _PR_MD_OPEN_SEMAPHORE
-#define _MD_WAIT_SEMAPHORE            _PR_MD_WAIT_SEMAPHORE
-#define _MD_POST_SEMAPHORE            _PR_MD_POST_SEMAPHORE
-#define _MD_CLOSE_SEMAPHORE           _PR_MD_CLOSE_SEMAPHORE
-#define _MD_DELETE_SEMAPHORE(name)    PR_SUCCESS  /* no op */
-
-#endif /* nspr_win32_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/_winnt.cfg b/libs/js/nsprpub/pr/include/md/_winnt.cfg
deleted file mode 100644
index fb71b8a9e5..0000000000
--- a/libs/js/nsprpub/pr/include/md/_winnt.cfg
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef WINNT
-#define WINNT
-#endif
-
-#define PR_AF_INET6 23  /* same as AF_INET6 */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#elif defined(_ALPHA_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(_AMD64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    64
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    8
-#define PR_ALIGN_OF_DWORD   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_IA64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    64
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    8
-#define PR_ALIGN_OF_DWORD   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#define HAVE_LONG_LONG
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/include/md/_winnt.h b/libs/js/nsprpub/pr/include/md/_winnt.h
deleted file mode 100644
index da349cd05f..0000000000
--- a/libs/js/nsprpub/pr/include/md/_winnt.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_win32_defs_h___
-#define nspr_win32_defs_h___
-
-/* Need to force service-pack 3 extensions to be defined by
-** setting _WIN32_WINNT to NT 4.0 for winsock.h, winbase.h, winnt.h.
-*/ 
-#ifndef  _WIN32_WINNT
-    #define _WIN32_WINNT 0x0400
-#elif   (_WIN32_WINNT < 0x0400)
-    #undef  _WIN32_WINNT
-    #define _WIN32_WINNT 0x0400
-#endif /* _WIN32_WINNT */
-
-#include <windows.h>
-#include <winsock.h>
-#ifdef __MINGW32__
-#include <mswsock.h>
-#endif
-#include <errno.h>
-
-#include "prio.h"
-#include "prclist.h"
-
-/*
- * Internal configuration macros
- */
-
-#define PR_LINKER_ARCH      "win32"
-#define _PR_SI_SYSNAME        "WINNT"
-#if defined(_M_IX86) || defined(_X86_)
-#define _PR_SI_ARCHITECTURE   "x86"
-#elif defined(_AMD64_)
-#define _PR_SI_ARCHITECTURE   "x86-64"
-#elif defined(_IA64_)
-#define _PR_SI_ARCHITECTURE   "ia64"
-#else
-#error unknown processor architecture
-#endif
-
-#define HAVE_DLL
-#define HAVE_CUSTOM_USER_THREADS
-#define HAVE_THREAD_AFFINITY
-#define _PR_HAVE_GETADDRINFO
-#define _PR_INET6_PROBE
-#ifndef _PR_INET6
-#define AF_INET6 23
-/* newer ws2tcpip.h provides these */
-#ifndef AI_CANONNAME
-#define AI_CANONNAME 0x2
-struct addrinfo {
-    int ai_flags;
-    int ai_family;
-    int ai_socktype;
-    int ai_protocol;
-    size_t ai_addrlen;
-    char *ai_canonname;
-    struct sockaddr *ai_addr;
-    struct addrinfo *ai_next;
-};
-#endif
-#define _PR_HAVE_MD_SOCKADDR_IN6
-/* isomorphic to struct in6_addr on Windows */
-struct _md_in6_addr {
-    union {
-        PRUint8  _S6_u8[16];
-        PRUint16 _S6_u16[8];
-    } _S6_un;
-};
-/* isomorphic to struct sockaddr_in6 on Windows */
-struct _md_sockaddr_in6 {
-    PRInt16 sin6_family;
-    PRUint16 sin6_port;
-    PRUint32 sin6_flowinfo;
-    struct _md_in6_addr sin6_addr;
-    PRUint32 sin6_scope_id;
-};
-#endif
-#define _PR_HAVE_THREADSAFE_GETHOST
-#define _PR_HAVE_ATOMIC_OPS
-#if defined(_M_IX86) || defined(_X86_)
-#define _PR_HAVE_ATOMIC_CAS
-#endif
-#define PR_HAVE_WIN32_NAMED_SHARED_MEMORY
-#define _PR_HAVE_PEEK_BUFFER
-#define _PR_PEEK_BUFFER_MAX (32 * 1024)
-#define _PR_FD_NEED_EMULATE_MSG_PEEK(fd) \
-    (!(fd)->secret->nonblocking && (fd)->secret->inheritable != _PR_TRI_TRUE)
-
-/* --- Common User-Thread/Native-Thread Definitions --------------------- */
-
-/* --- Globals --- */
-extern struct PRLock                      *_pr_schedLock;
-
-/* --- Typedefs --- */
-typedef void (*FiberFunc)(void *);
-
-#define PR_NUM_GCREGS           8
-typedef PRInt32	                PR_CONTEXT_TYPE[PR_NUM_GCREGS];
-#define GC_VMBASE               0x40000000
-#define GC_VMLIMIT              0x00FFFFFF
-
-#define _MD_MAGIC_THREAD	0x22222222
-#define _MD_MAGIC_THREADSTACK	0x33333333
-#define _MD_MAGIC_SEGMENT	0x44444444
-#define _MD_MAGIC_DIR		0x55555555
-
-struct _MDCPU {
-    int              unused;
-};
-
-enum _MDIOModel {
-    _MD_BlockingIO = 0x38,
-    _MD_MultiWaitIO = 0x49
-};
-
-typedef struct _MDOverlapped {
-    OVERLAPPED overlapped;              /* Used for async I/O */
-
-    enum _MDIOModel ioModel;            /* The I/O model to implement
-                                         * using overlapped I/O.
-                                         */
-    union {
-        struct _MDThread *mdThread;     /* For blocking I/O, this structure
-                                         * is embedded in the _MDThread
-                                         * structure.
-                                         */
-        struct {
-            PRCList links;              /* for group->io_ready list */
-            struct PRRecvWait *desc;    /* For multiwait I/O, this structure
-                                         * is associated with a PRRecvWait
-                                         * structure.
-                                         */
-            struct PRWaitGroup *group;
-            struct TimerEvent *timer;
-            DWORD error;
-        } mw;
-    } data;
-} _MDOverlapped;
-
-struct _MDThread {
-        /* The overlapped structure must be first! */
-    struct _MDOverlapped overlapped;    /* Used for async IO for this thread */
-    void            *acceptex_buf;      /* Used for AcceptEx() */
-    TRANSMIT_FILE_BUFFERS *xmit_bufs;   /* Used for TransmitFile() */
-    HANDLE           blocked_sema;      /* Threads block on this when waiting
-                                         * for IO or CondVar.
-                                         */
-    PRInt32          blocked_io_status; /* Status of the completed IO */
-    PRInt32          blocked_io_bytes;  /* Bytes transferred for completed IO */
-    PRInt32          blocked_io_error;  /* Save error if status is FALSE */
-    HANDLE           handle;
-    PRUint32         id;
-    void            *sp;                /* only valid when suspended */
-    PRUint32         magic;             /* for debugging */
-    PR_CONTEXT_TYPE  gcContext;         /* Thread context for GC */
-	struct _PRCPU    *thr_bound_cpu;		/* thread bound to cpu */
-	PRBool   		 interrupt_disabled;/* thread cannot be interrupted */
-	HANDLE 			 thr_event;			/* For native-threads-only support,
-											thread blocks on this event		*/
-
-    /* The following are used only if this is a fiber */
-    void            *fiber_id;          /* flag whether or not this is a fiber*/
-    FiberFunc        fiber_fn;          /* main fiber routine */
-    void            *fiber_arg;         /* arg to main fiber routine */
-    PRUint32         fiber_stacksize;   /* stacksize for fiber */
-    PRInt32          fiber_last_error;  /* last error for the fiber */
-    void (*start)(void *);              /* used by _PR_MD_CREATE_THREAD to
-                                         * pass its 'start' argument to
-                                         * pr_root. */
-};
-
-struct _MDThreadStack {
-    PRUint32           magic;          /* for debugging */
-};
-
-struct _MDSegment {
-    PRUint32           magic;          /* for debugging */
-};
-
-#undef PROFILE_LOCKS
-
-struct _MDLock {
-    CRITICAL_SECTION mutex;          /* this is recursive on NT */
-#ifdef PROFILE_LOCKS
-    PRInt32 hitcount;
-    PRInt32 misscount;
-#endif
-};
-
-struct _MDDir {
-    HANDLE           d_hdl;
-    WIN32_FIND_DATA  d_entry;
-    PRBool           firstEntry;     /* Is this the entry returned
-                                      * by FindFirstFile()? */
-    PRUint32         magic;          /* for debugging */
-};
-
-struct _MDCVar {
-    PRUint32         unused;
-};
-
-struct _MDSemaphore {
-    HANDLE           sem;
-};
-
-struct _MDFileDesc {
-    PROsfd osfd;     /* The osfd can come from one of three spaces:
-                      * - For stdin, stdout, and stderr, we are using
-                      *   the libc file handle (0, 1, 2), which is an int.
-                      * - For files and pipes, we are using Win32 HANDLE,
-                      *   which is a void*.
-                      * - For sockets, we are using Winsock SOCKET, which
-                      *   is a u_int.
-                      */
-    PRBool io_model_committed;  /* The io model (blocking or nonblocking)
-                                 * for this osfd has been committed and
-                                 * cannot be changed.  The osfd has been
-                                 * either associated with the io
-                                 * completion port or made nonblocking. */
-    PRBool sync_file_io;        /* Use synchronous file I/O on the osfd
-                                 * (a file handle) */
-    PRBool accepted_socket;     /* Is this an accepted socket (on the
-                                 * server side)? */
-    PRNetAddr peer_addr;        /* If this is an accepted socket, cache
-                                 * the peer's address returned by
-                                 * AcceptEx().  This is to work around
-                                 * the bug that getpeername() on an
-                                 * socket accepted by AcceptEx() returns
-                                 * an all-zero net address. */
-};
-
-struct _MDProcess {
-    HANDLE handle;
-    DWORD id;
-};
-
-
-/* --- Misc stuff --- */
-#define _MD_GET_SP(thread)            (thread)->md.gcContext[6]
-
-/* --- NT security stuff --- */
-
-extern void _PR_NT_InitSids(void);
-extern void _PR_NT_FreeSids(void);
-extern PRStatus _PR_NT_MakeSecurityDescriptorACL(
-    PRIntn mode,
-    DWORD accessTable[],
-    PSECURITY_DESCRIPTOR *resultSD,
-    PACL *resultACL
-);
-extern void _PR_NT_FreeSecurityDescriptorACL(
-    PSECURITY_DESCRIPTOR pSD, PACL pACL);
-
-/* --- IO stuff --- */
-
-extern PRInt32 _md_Associate(HANDLE);
-extern PRInt32 _PR_MD_CLOSE(PROsfd osfd, PRBool socket);
-
-#define _MD_OPEN                      _PR_MD_OPEN
-#define _MD_OPEN_FILE                 _PR_MD_OPEN_FILE
-#define _MD_READ                      _PR_MD_READ
-#define _MD_WRITE                     _PR_MD_WRITE
-#define _MD_WRITEV                    _PR_MD_WRITEV
-#define _MD_LSEEK                     _PR_MD_LSEEK
-#define _MD_LSEEK64                   _PR_MD_LSEEK64
-#define _MD_CLOSE_FILE(f)             _PR_MD_CLOSE(f, PR_FALSE)
-#define _MD_GETFILEINFO               _PR_MD_GETFILEINFO
-#define _MD_GETFILEINFO64             _PR_MD_GETFILEINFO64
-#define _MD_GETOPENFILEINFO           _PR_MD_GETOPENFILEINFO
-#define _MD_GETOPENFILEINFO64         _PR_MD_GETOPENFILEINFO64
-#define _MD_STAT                      _PR_MD_STAT
-#define _MD_RENAME                    _PR_MD_RENAME     
-#define _MD_ACCESS                    _PR_MD_ACCESS     
-#define _MD_DELETE                    _PR_MD_DELETE     
-#define _MD_MKDIR                     _PR_MD_MKDIR      
-#define _MD_MAKE_DIR                  _PR_MD_MAKE_DIR
-#define _MD_RMDIR                     _PR_MD_RMDIR      
-#define _MD_LOCKFILE                  _PR_MD_LOCKFILE
-#define _MD_TLOCKFILE                 _PR_MD_TLOCKFILE
-#define _MD_UNLOCKFILE                _PR_MD_UNLOCKFILE
-
-/* --- Socket IO stuff --- */
-#define _MD_GET_SOCKET_ERROR()    WSAGetLastError()
-#define _MD_SET_SOCKET_ERROR(_err) WSASetLastError(_err)
-
-#define _MD_INIT_FILEDESC(fd)
-#define _MD_MAKE_NONBLOCK             _PR_MD_MAKE_NONBLOCK
-#define _MD_INIT_FD_INHERITABLE       _PR_MD_INIT_FD_INHERITABLE
-#define _MD_QUERY_FD_INHERITABLE      _PR_MD_QUERY_FD_INHERITABLE
-#define _MD_SHUTDOWN                  _PR_MD_SHUTDOWN
-#define _MD_LISTEN                    _PR_MD_LISTEN
-#define _MD_CLOSE_SOCKET(s)           _PR_MD_CLOSE(s, PR_TRUE)
-#define _MD_SENDTO                    _PR_MD_SENDTO
-#define _MD_RECVFROM                  _PR_MD_RECVFROM
-#define _MD_SOCKETPAIR(s, type, proto, sv) -1
-#define _MD_GETSOCKNAME               _PR_MD_GETSOCKNAME
-#define _MD_GETPEERNAME               _PR_MD_GETPEERNAME
-#define _MD_GETSOCKOPT                _PR_MD_GETSOCKOPT
-#define _MD_SETSOCKOPT                _PR_MD_SETSOCKOPT
-#define _MD_SELECT                    select
-extern int _PR_NTFiberSafeSelect(int, fd_set *, fd_set *, fd_set *,
-    const struct timeval *);
-#define _MD_FSYNC                     _PR_MD_FSYNC
-#define _MD_SOCKETAVAILABLE           _PR_MD_SOCKETAVAILABLE
-#define _MD_PIPEAVAILABLE             _PR_MD_PIPEAVAILABLE
-#define _MD_SET_FD_INHERITABLE        _PR_MD_SET_FD_INHERITABLE
-
-#define _MD_INIT_ATOMIC()
-#if defined(_M_IX86) || defined(_X86_)
-#define _MD_ATOMIC_INCREMENT          _PR_MD_ATOMIC_INCREMENT
-#define _MD_ATOMIC_ADD          	  _PR_MD_ATOMIC_ADD
-#define _MD_ATOMIC_DECREMENT          _PR_MD_ATOMIC_DECREMENT
-#else /* non-x86 processors */
-#define _MD_ATOMIC_INCREMENT(x)       InterlockedIncrement((PLONG)x)
-#define _MD_ATOMIC_ADD(ptr,val)    (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val)
-#define _MD_ATOMIC_DECREMENT(x)       InterlockedDecrement((PLONG)x)
-#endif /* x86 */
-#define _MD_ATOMIC_SET(x,y)           InterlockedExchange((PLONG)x, (LONG)y)
-
-#define _MD_INIT_IO                   _PR_MD_INIT_IO
-#define _MD_SOCKET                    _PR_MD_SOCKET
-#define _MD_CONNECT                   _PR_MD_CONNECT
-
-#define _MD_ACCEPT(s, a, l, to)       \
-        _MD_FAST_ACCEPT(s, a, l, to, PR_FALSE, NULL, NULL)
-#define _MD_FAST_ACCEPT(s, a, l, to, fast, cb, cba) \
-        _PR_MD_FAST_ACCEPT(s, a, l, to, fast, cb, cba)
-#define _MD_ACCEPT_READ(s, ns, ra, buf, l, t) \
-        _MD_FAST_ACCEPT_READ(s, ns, ra, buf, l, t, PR_FALSE, NULL, NULL)
-#define _MD_FAST_ACCEPT_READ(s, ns, ra, buf, l, t, fast, cb, cba) \
-        _PR_MD_FAST_ACCEPT_READ(s, ns, ra, buf, l, t, fast, cb, cba)
-#define _MD_UPDATE_ACCEPT_CONTEXT     _PR_MD_UPDATE_ACCEPT_CONTEXT
-
-#define _MD_BIND                      _PR_MD_BIND
-#define _MD_RECV                      _PR_MD_RECV
-#define _MD_SEND                      _PR_MD_SEND
-#define _MD_SENDFILE              	  _PR_MD_SENDFILE
-#define _MD_PR_POLL                   _PR_MD_PR_POLL
-
-/* --- Scheduler stuff --- */
-#define _MD_PAUSE_CPU                   _PR_MD_PAUSE_CPU
-
-/* --- DIR stuff --- */
-#define PR_DIRECTORY_SEPARATOR        '\\'
-#define PR_DIRECTORY_SEPARATOR_STR    "\\"
-#define PR_PATH_SEPARATOR		';'
-#define PR_PATH_SEPARATOR_STR		";"
-#define _MD_ERRNO()                   GetLastError()
-#define _MD_OPEN_DIR                  _PR_MD_OPEN_DIR
-#define _MD_CLOSE_DIR                 _PR_MD_CLOSE_DIR
-#define _MD_READ_DIR                  _PR_MD_READ_DIR
-
-/* --- Segment stuff --- */
-#define _MD_INIT_SEGS()
-#define _MD_ALLOC_SEGMENT(seg, size, vaddr)   0
-#define _MD_FREE_SEGMENT(seg)
-
-/* --- Environment Stuff --- */
-#define _MD_GET_ENV                 _PR_MD_GET_ENV
-#define _MD_PUT_ENV                 _PR_MD_PUT_ENV
-
-/* --- Threading Stuff --- */
-#define _MD_DEFAULT_STACK_SIZE            0
-#define _MD_INIT_THREAD             _PR_MD_INIT_THREAD
-#define _MD_INIT_ATTACHED_THREAD    _PR_MD_INIT_THREAD
-#define _MD_CREATE_THREAD           _PR_MD_CREATE_THREAD
-#define _MD_JOIN_THREAD             _PR_MD_JOIN_THREAD
-#define _MD_END_THREAD              _PR_MD_END_THREAD
-#define _MD_YIELD                   _PR_MD_YIELD
-#define _MD_SET_PRIORITY            _PR_MD_SET_PRIORITY
-#define _MD_CLEAN_THREAD            _PR_MD_CLEAN_THREAD
-#define _MD_SETTHREADAFFINITYMASK   _PR_MD_SETTHREADAFFINITYMASK
-#define _MD_GETTHREADAFFINITYMASK   _PR_MD_GETTHREADAFFINITYMASK
-#define _MD_EXIT_THREAD             _PR_MD_EXIT_THREAD
-#define _MD_SUSPEND_THREAD          _PR_MD_SUSPEND_THREAD
-#define _MD_RESUME_THREAD           _PR_MD_RESUME_THREAD
-#define _MD_SUSPEND_CPU             _PR_MD_SUSPEND_CPU
-#define _MD_RESUME_CPU              _PR_MD_RESUME_CPU
-#define _MD_BEGIN_SUSPEND_ALL()
-#define _MD_BEGIN_RESUME_ALL()
-#define _MD_END_SUSPEND_ALL()
-#define _MD_END_RESUME_ALL()
-
-extern void _PR_Unblock_IO_Wait(PRThread *thr);
-
-/* --- Lock stuff --- */
-#define _MD_NEW_LOCK(lock)            (InitializeCriticalSection(&((lock)->mutex)),PR_SUCCESS)
-#define _MD_FREE_LOCK(lock)           DeleteCriticalSection(&((lock)->mutex))
-#ifndef PROFILE_LOCKS
-#define _MD_LOCK(lock)                EnterCriticalSection(&((lock)->mutex))
-#define _MD_TEST_AND_LOCK(lock)       (TryEnterCriticalSection(&((lock)->mutex))== FALSE)
-#define _MD_UNLOCK(lock)              LeaveCriticalSection(&((lock)->mutex))
-#else
-#define _MD_LOCK(lock)                 \
-    PR_BEGIN_MACRO \
-    BOOL rv = TryEnterCriticalSection(&((lock)->mutex)); \
-    if (rv == TRUE) { \
-        InterlockedIncrement(&((lock)->hitcount)); \
-    } else { \
-        InterlockedIncrement(&((lock)->misscount)); \
-        EnterCriticalSection(&((lock)->mutex)); \
-    } \
-    PR_END_MACRO
-#define _MD_TEST_AND_LOCK(lock)       0  /* XXXMB */
-#define _MD_UNLOCK(lock)              LeaveCriticalSection(&((lock)->mutex))
-#endif
-#define _PR_LOCK                      _MD_LOCK
-#define _PR_UNLOCK					  _MD_UNLOCK
-
-/* --- lock and cv waiting --- */
-#define _MD_WAIT                      _PR_MD_WAIT
-#define _MD_WAKEUP_WAITER             _PR_MD_WAKEUP_WAITER
-
-   /* XXXMB- the IOQ stuff is certainly not working correctly yet. */
-extern  struct _MDLock              _pr_ioq_lock;
-#define _MD_IOQ_LOCK()                _MD_LOCK(&_pr_ioq_lock)
-#define _MD_IOQ_UNLOCK()              _MD_UNLOCK(&_pr_ioq_lock)
-
-
-/* --- Initialization stuff --- */
-#define _MD_START_INTERRUPTS()
-#define _MD_STOP_INTERRUPTS()
-#define _MD_DISABLE_CLOCK_INTERRUPTS()
-#define _MD_ENABLE_CLOCK_INTERRUPTS()
-#define _MD_BLOCK_CLOCK_INTERRUPTS()
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS()
-#define _MD_EARLY_INIT                _PR_MD_EARLY_INIT
-#define _MD_FINAL_INIT()
-#define _MD_INIT_CPUS()
-#define _MD_INIT_RUNNING_CPU(cpu)
-
-struct PRProcess;
-struct PRProcessAttr;
-
-/* --- Create a new process --- */
-#define _MD_CREATE_PROCESS _PR_CreateWindowsProcess
-extern struct PRProcess * _PR_CreateWindowsProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#define _MD_DETACH_PROCESS _PR_DetachWindowsProcess
-extern PRStatus _PR_DetachWindowsProcess(struct PRProcess *process);
-
-/* --- Wait for a child process to terminate --- */
-#define _MD_WAIT_PROCESS _PR_WaitWindowsProcess
-extern PRStatus _PR_WaitWindowsProcess(struct PRProcess *process, 
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _PR_KillWindowsProcess
-extern PRStatus _PR_KillWindowsProcess(struct PRProcess *process);
-
-/* --- User Threading stuff --- */
-#define HAVE_FIBERS
-#define _MD_CREATE_USER_THREAD            _PR_MD_CREATE_USER_THREAD
-#define _MD_CREATE_PRIMORDIAL_USER_THREAD _PR_MD_CREATE_PRIMORDIAL_USER_THREAD
-#define _MD_CLEANUP_BEFORE_EXIT           _PR_MD_CLEANUP_BEFORE_EXIT
-#define _MD_EXIT                          _PR_MD_EXIT
-#define _MD_INIT_CONTEXT                  _PR_MD_INIT_CONTEXT
-#define _MD_SWITCH_CONTEXT                _PR_MD_SWITCH_CONTEXT
-#define _MD_RESTORE_CONTEXT               _PR_MD_RESTORE_CONTEXT
-
-/* --- Intervals --- */
-#define _MD_INTERVAL_INIT                 _PR_MD_INTERVAL_INIT
-#define _MD_GET_INTERVAL                  _PR_MD_GET_INTERVAL
-#define _MD_INTERVAL_PER_SEC              _PR_MD_INTERVAL_PER_SEC
-#define _MD_INTERVAL_PER_MILLISEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000)
-#define _MD_INTERVAL_PER_MICROSEC()       (_PR_MD_INTERVAL_PER_SEC() / 1000000)
-
-/* --- Time --- */
-extern void _PR_FileTimeToPRTime(const FILETIME *filetime, PRTime *prtm);
-
-/* --- Native-Thread Specific Definitions ------------------------------- */
-
-extern BOOL _pr_use_static_tls;
-
-extern __declspec(thread) struct PRThread *_pr_current_fiber;
-extern DWORD _pr_currentFiberIndex;
-
-#define _MD_GET_ATTACHED_THREAD() \
-    (_pr_use_static_tls ? _pr_current_fiber \
-    : (PRThread *) TlsGetValue(_pr_currentFiberIndex))
-
-extern struct PRThread * _MD_CURRENT_THREAD(void);
-
-#define _MD_SET_CURRENT_THREAD(_thread) \
-    PR_BEGIN_MACRO \
-        if (_pr_use_static_tls) { \
-            _pr_current_fiber = (_thread); \
-        } else { \
-            TlsSetValue(_pr_currentFiberIndex, (_thread)); \
-        } \
-    PR_END_MACRO
-
-extern __declspec(thread) struct PRThread *_pr_fiber_last_run;
-extern DWORD _pr_lastFiberIndex;
-
-#define _MD_LAST_THREAD() \
-    (_pr_use_static_tls ? _pr_fiber_last_run \
-    : (PRThread *) TlsGetValue(_pr_lastFiberIndex))
-
-#define _MD_SET_LAST_THREAD(_thread) \
-    PR_BEGIN_MACRO \
-        if (_pr_use_static_tls) { \
-            _pr_fiber_last_run = (_thread); \
-        } else { \
-            TlsSetValue(_pr_lastFiberIndex, (_thread)); \
-        } \
-    PR_END_MACRO
-
-extern __declspec(thread) struct _PRCPU *_pr_current_cpu;
-extern DWORD _pr_currentCPUIndex;
-
-#define _MD_CURRENT_CPU() \
-    (_pr_use_static_tls ? _pr_current_cpu \
-    : (struct _PRCPU *) TlsGetValue(_pr_currentCPUIndex))
-
-#define _MD_SET_CURRENT_CPU(_cpu) \
-    PR_BEGIN_MACRO \
-        if (_pr_use_static_tls) { \
-            _pr_current_cpu = (_cpu); \
-        } else { \
-            TlsSetValue(_pr_currentCPUIndex, (_cpu)); \
-        } \
-    PR_END_MACRO
-
-extern __declspec(thread) PRUintn _pr_ints_off;
-extern DWORD _pr_intsOffIndex;
-
-#define _MD_GET_INTSOFF() \
-    (_pr_use_static_tls ? _pr_ints_off \
-    : (PRUintn) TlsGetValue(_pr_intsOffIndex))
-
-#define _MD_SET_INTSOFF(_val) \
-    PR_BEGIN_MACRO \
-        if (_pr_use_static_tls) { \
-            _pr_ints_off = (_val); \
-        } else { \
-            TlsSetValue(_pr_intsOffIndex, (LPVOID) (_val)); \
-        } \
-    PR_END_MACRO
-
-/* --- Initialization stuff --- */
-#define _MD_INIT_LOCKS()
-
-/* --- Stack stuff --- */
-#define _MD_INIT_STACK(stack, redzone)
-#define _MD_CLEAR_STACK(stack)
-
-/* --- Memory-mapped files stuff --- */
-
-struct _MDFileMap {
-    HANDLE hFileMap;
-    DWORD dwAccess;
-};
-
-extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
-#define _MD_CREATE_FILE_MAP _MD_CreateFileMap
-
-extern PRInt32 _MD_GetMemMapAlignment(void);
-#define _MD_GET_MEM_MAP_ALIGNMENT _MD_GetMemMapAlignment
-
-extern void * _MD_MemMap(struct PRFileMap *fmap, PRInt64 offset,
-        PRUint32 len);
-#define _MD_MEM_MAP _MD_MemMap
-
-extern PRStatus _MD_MemUnmap(void *addr, PRUint32 size);
-#define _MD_MEM_UNMAP _MD_MemUnmap
-
-extern PRStatus _MD_CloseFileMap(struct PRFileMap *fmap);
-#define _MD_CLOSE_FILE_MAP _MD_CloseFileMap
-
-/* --- Named semaphores stuff --- */
-#define _PR_HAVE_NAMED_SEMAPHORES
-#define _MD_OPEN_SEMAPHORE            _PR_MD_OPEN_SEMAPHORE
-#define _MD_WAIT_SEMAPHORE            _PR_MD_WAIT_SEMAPHORE
-#define _MD_POST_SEMAPHORE            _PR_MD_POST_SEMAPHORE
-#define _MD_CLOSE_SEMAPHORE           _PR_MD_CLOSE_SEMAPHORE
-#define _MD_DELETE_SEMAPHORE(name)    PR_SUCCESS  /* no op */
-
-#endif /* nspr_win32_defs_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/prosdep.h b/libs/js/nsprpub/pr/include/md/prosdep.h
deleted file mode 100644
index 0de89a98f4..0000000000
--- a/libs/js/nsprpub/pr/include/md/prosdep.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prosdep_h___
-#define prosdep_h___
-
-/*
-** Get OS specific header information
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-#ifdef XP_PC
-
-#include "md/_pcos.h"
-#ifdef WINNT
-#include "md/_winnt.h"
-#include "md/_win32_errors.h"
-#elif defined(WIN95)
-#include "md/_win95.h"
-#include "md/_win32_errors.h"
-#elif defined(WIN16)
-#include "md/_win16.h"
-#elif defined(OS2)
-#include "md/_os2.h"
-#include "md/_os2_errors.h"
-#else
-#error unknown Windows platform
-#endif
-
-#elif defined XP_MAC
-
-#include "_macos.h"
-
-#elif defined(XP_UNIX)
-
-#if defined(AIX)
-#include "md/_aix.h"
-
-#elif defined(FREEBSD)
-#include "md/_freebsd.h"
-
-#elif defined(NETBSD)
-#include "md/_netbsd.h"
-
-#elif defined(OPENBSD)
-#include "md/_openbsd.h"
-
-#elif defined(BSDI)
-#include "md/_bsdi.h"
-
-#elif defined(HPUX)
-#include "md/_hpux.h"
-
-#elif defined(IRIX)
-#include "md/_irix.h"
-
-#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
-#include "md/_linux.h"
-
-#elif defined(OSF1)
-#include "md/_osf1.h"
-
-#elif defined(DARWIN)
-#include "md/_darwin.h"
-
-#elif defined(NEXTSTEP)
-#include "md/_nextstep.h"
-
-#elif defined(SOLARIS)
-#include "md/_solaris.h"
-
-#elif defined(SUNOS4)
-#include "md/_sunos4.h"
-
-#elif defined(SNI)
-#include "md/_reliantunix.h"
-
-#elif defined(SONY)
-#include "md/_sony.h"
-
-#elif defined(NEC)
-#include "md/_nec.h"
-
-#elif defined(SCO)
-#include "md/_scoos.h"
-
-#elif defined(UNIXWARE)
-#include "md/_unixware.h"
-
-#elif defined(NCR)
-#include "md/_ncr.h"
-
-#elif defined(DGUX)
-#include "md/_dgux.h"
-
-#elif defined(QNX)
-#include "md/_qnx.h"
-
-#elif defined(VMS)
-#include "md/_openvms.h"
-
-#elif defined(NTO)
-#include "md/_nto.h"
-
-#elif defined(RISCOS)
-#include "md/_riscos.h"
-
-#else
-#error unknown Unix flavor
-
-#endif
-
-#include "md/_unixos.h"
-#include "md/_unix_errors.h"
-
-#elif defined(XP_BEOS)
-
-#include "md/_beos.h"
-#include "md/_unix_errors.h"
-
-#else
-
-#error "The platform is not BeOS, Unix, Windows, or Mac"
-
-#endif
-
-#ifdef _PR_PTHREADS
-#include "md/_pth.h"
-#endif
-
-PR_END_EXTERN_C
-
-#endif /* prosdep_h___ */
diff --git a/libs/js/nsprpub/pr/include/md/sunos4.h b/libs/js/nsprpub/pr/include/md/sunos4.h
deleted file mode 100644
index 0a8f36d45c..0000000000
--- a/libs/js/nsprpub/pr/include/md/sunos4.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef pr_sunos4_h___
-#define pr_sunos4_h___
-
-#ifndef SVR4
-
-/*
-** Hodge podge of random missing prototypes for the Sunos4 system
-*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-#include <limits.h>
-#include <sys/types.h>
-
-#define PATH_MAX _POSIX_PATH_MAX
-
-struct timeval;
-struct timezone;
-struct itimerval;
-struct sockaddr;
-struct stat;
-struct tm;
-
-/* ctype.h */
-extern int tolower(int);
-extern int toupper(int);
-
-/* errno.h */
-extern char *sys_errlist[];
-extern int sys_nerr;
-
-#define strerror(e) sys_errlist[((unsigned)(e) < sys_nerr) ? e : 0]
-
-extern void perror(const char *);
-
-/* getopt */
-extern char *optarg;
-extern int optind;
-extern int getopt(int argc, char **argv, char *spec);
-
-/* math.h */
-extern int srandom(long val);
-extern long random(void);
-
-/* memory.h */
-#define memmove(to,from,len) bcopy((char*)(from),(char*)(to),len)
-
-extern void bcopy(const char *, char *, int);
-
-/* signal.h */
-/*
-** SunOS4 sigaction hides interrupts by default, so we can safely define
-** SA_RESTART to 0.
-*/
-#define SA_RESTART 0
-
-/* stdio.h */
-extern int printf(const char *, ...);
-extern int fprintf(FILE *, const char *, ...);
-extern int vprintf(const char *, va_list);
-extern int vfprintf(FILE *, const char *, va_list);
-extern char *vsprintf(char *, const char *, va_list);
-extern int scanf(const char *, ...);
-extern int sscanf(const char *, const char *, ...);
-extern int fscanf(FILE *, const char *, ...);
-extern int fgetc(FILE *);
-extern int fputc(int, FILE *);
-extern int fputs(const char *, FILE *);
-extern int puts(const char *);
-extern int fread(void *, size_t, size_t, FILE *);
-extern int fwrite(const char *, int, int, FILE *);
-extern int fseek(FILE *, long, int);
-extern long ftell(FILE *);
-extern int rewind(FILE *);
-extern int fflush(FILE *);
-extern int _flsbuf(unsigned char, FILE *);
-extern int fclose(FILE *);
-extern int remove(const char *);
-extern int setvbuf(FILE *, char *, int, size_t);
-extern int system(const char *);
-extern FILE *popen(const char *, const char *);
-extern int pclose(FILE *);
-
-/* stdlib.h */
-#define strtoul strtol
-
-extern int isatty(int fildes);
-extern long strtol(const char *, char **, int);
-extern int putenv(const char *);
-extern void srand48(long);
-extern long lrand48(void);
-extern double drand48(void);
-
-/* string.h */
-extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *, const char *, size_t);
-extern int strcoll(const char *, const char *);
-
-/* time.h */
-extern time_t mktime(struct tm *);
-extern size_t strftime(char *, size_t, const char *, const struct tm *);
-extern int gettimeofday(struct timeval *, struct timezone *);
-extern int setitimer(int, struct itimerval *, struct itimerval *);
-extern time_t time(time_t *);
-extern time_t timegm(struct tm *);
-extern struct tm *localtime(const time_t *);
-extern struct tm *gmtime(const time_t *);
-
-/* unistd.h */
-extern int rename(const char *, const char *);
-extern int ioctl(int, int, int *arg);
-extern int connect(int, struct sockaddr *, int);
-extern int readlink(const char *, char *, int);
-extern int symlink(const char *, const char *);
-extern int ftruncate(int, off_t);
-extern int fchmod(int, mode_t);
-extern int fchown(int, uid_t, gid_t);
-extern int lstat(const char *, struct stat *);
-extern int fstat(int, struct stat *);
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern int gethostname(char *, int);
-extern char *getwd(char *);
-extern int getpagesize(void);
-
-#endif /* SVR4 */
-
-#endif /* pr_sunos4_h___ */
diff --git a/libs/js/nsprpub/pr/include/nspr.h b/libs/js/nsprpub/pr/include/nspr.h
deleted file mode 100644
index cf3bfad7a1..0000000000
--- a/libs/js/nsprpub/pr/include/nspr.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_h___
-#define nspr_h___
-
-#include "pratom.h"
-#include "prbit.h"
-#include "prclist.h"
-#include "prcmon.h"
-#include "prcvar.h"
-#include "prdtoa.h"
-#include "prenv.h"
-#include "prerror.h"
-#include "prinet.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "pripcsem.h"
-#include "prlink.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prlong.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prmwait.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prproces.h"
-#include "prrng.h"
-#include "prrwlock.h"
-#include "prshm.h"
-#include "prshma.h"
-#include "prsystem.h"
-#include "prthread.h"
-#include "prtime.h"
-#include "prtpool.h"
-#include "prtrace.h"
-#include "prtypes.h"
-
-#endif /* nspr_h___ */
diff --git a/libs/js/nsprpub/pr/include/obsolete/.cvsignore b/libs/js/nsprpub/pr/include/obsolete/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/include/obsolete/Makefile.in b/libs/js/nsprpub/pr/include/obsolete/Makefile.in
deleted file mode 100644
index 1add484493..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-HEADERS = $(wildcard $(srcdir)/*.h)
-
-RELEASE_HEADERS = $(HEADERS)
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
-
-include_subdir = obsolete
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(RELEASE_HEADERS)
-	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir)/obsolete
diff --git a/libs/js/nsprpub/pr/include/obsolete/pralarm.h b/libs/js/nsprpub/pr/include/obsolete/pralarm.h
deleted file mode 100644
index 20476e444f..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/pralarm.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:		pralarm.h
-** Description:	API to periodic alarms.
-**
-**
-** Alarms are defined to invoke some client specified function at 
-** a time in the future. The notification may be a one time event
-** or repeated at a fixed interval. The interval at which the next
-** notification takes place may be modified by the client code only
-** during the respective notification.
-**
-** The notification is delivered on a thread that is part of the
-** alarm context (PRAlarm). The thread will inherit the priority
-** of the Alarm creator.
-**
-** Any number of periodic alarms (PRAlarmID) may be created within
-** the context of a single alarm (PRAlarm). The notifications will be
-** scheduled as close to the desired time as possible.
-**
-** Repeating periodic notifies are expected to run at a fixed rate.
-** That rate is expressed as some number of notifies per period where
-** the period is much larger than a PRIntervalTime (see prinrval.h).
-*/
-
-#if !defined(pralarm_h)
-#define pralarm_h
-
-#include "prtypes.h"
-#include "prinrval.h"
-
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-typedef struct PRAlarm PRAlarm;
-typedef struct PRAlarmID PRAlarmID;
-
-typedef PRBool (PR_CALLBACK *PRPeriodicAlarmFn)(
-    PRAlarmID *id, void *clientData, PRUint32 late);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_CreateAlarm
-** DESCRIPTION:
-**  Create an alarm context.
-** INPUTS:      void
-** OUTPUTS:     None
-** RETURN:      PRAlarm*
-**  
-** SIDE EFFECTS:
-**  This creates an alarm context, which is an object used for subsequent
-**  notification creations. It also creates a thread that will be used to
-** deliver the notifications that are expected to be defined. The client
-** is resposible for destroying the context when appropriate.
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      The object (PRAlarm) and a thread to support notifications.
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRAlarm*) PR_CreateAlarm(void);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyAlarm
-** DESCRIPTION:
-**  Destroys the context created by PR_CreateAlarm().
-** INPUTS:      PRAlarm*
-** OUTPUTS:     None
-** RETURN:      PRStatus
-**  
-** SIDE EFFECTS:
-**  This destroys the context that was created by PR_CreateAlarm().
-**  If there are any active alarms (PRAlarmID), they will be cancelled.
-**  Once that is done, the thread that was used to deliver the alarms
-**  will be joined. 
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRStatus) PR_DestroyAlarm(PRAlarm *alarm);
-
-/***********************************************************************
-** FUNCTION:    PR_SetAlarm
-** DESCRIPTION:
-**  Creates a periodic notifier that is to be delivered to a specified
-**  function at some fixed interval.
-** INPUTS:      PRAlarm *alarm              Parent alarm context
-**              PRIntervalTime period       Interval over which the notifies
-**                                          are delivered.
-**              PRUint32 rate               The rate within the interval that
-**                                          the notifies will be delivered.
-**              PRPeriodicAlarmFn function  Entry point where the notifies
-**                                          will be delivered.
-** OUTPUTS:     None
-** RETURN:      PRAlarmID*                  Handle to the notifier just created
-**                                          or NULL if the request failed.
-**  
-** SIDE EFFECTS:
-**  A periodic notifier is created. The notifications will be delivered
-**  by the alarm's internal thread at a fixed interval whose rate is the
-**  number of interrupts per interval specified. The first notification
-**  will be delivered as soon as possible, and they will continue until
-**  the notifier routine indicates that they should cease of the alarm
-**  context is destroyed (PR_DestroyAlarm).
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      Memory for the notifier object.
-** ALGORITHM:   The rate at which notifications are delivered are stated
-**              to be "'rate' notifies per 'interval'". The exact time of
-**              the notification is computed based on a epoch established
-**              when the notifier was set. Each notification is delivered
-**              not ealier than the epoch plus the fixed rate times the
-**              notification sequence number. Such notifications have the
-**              potential to be late by not more than 'interval'/'rate'.
-**              The amount of lateness of one notification is taken into
-**              account on the next in an attempt to avoid long term slew.  
-***********************************************************************/
-NSPR_API(PRAlarmID*) PR_SetAlarm(
-    PRAlarm *alarm, PRIntervalTime period, PRUint32 rate,
-    PRPeriodicAlarmFn function, void *clientData);
-
-/***********************************************************************
-** FUNCTION:    PR_ResetAlarm
-** DESCRIPTION:
-**  Resets an existing alarm.
-** INPUTS:      PRAlarmID *id               Identify of the notifier.
-**              PRIntervalTime period       Interval over which the notifies
-**                                          are delivered.
-**              PRUint32 rate               The rate within the interval that
-**                                          the notifies will be delivered.
-** OUTPUTS:     None
-** RETURN:      PRStatus                    Indication of completion.
-**  
-** SIDE EFFECTS:
-**  An existing alarm may have its period and rate redefined. The
-**  additional side effect is that the notifier's epoch is recomputed.
-**  The first notification delivered by the newly refreshed alarm is
-**  defined to be 'interval'/'rate' from the time of the reset.
-** RESTRICTIONS:
-**  This function may only be called in the notifier for that alarm.
-** MEMORY:      N/A.
-** ALGORITHM:   See PR_SetAlarm().  
-***********************************************************************/
-NSPR_API(PRStatus) PR_ResetAlarm(
-	PRAlarmID *id, PRIntervalTime period, PRUint32 rate);
-
-PR_END_EXTERN_C
-
-#endif /* !defined(pralarm_h) */
-
-/* prinrval.h */
diff --git a/libs/js/nsprpub/pr/include/obsolete/probslet.h b/libs/js/nsprpub/pr/include/obsolete/probslet.h
deleted file mode 100644
index 98bed4d59e..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/probslet.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** A collection of things thought to be obsolete
-*/
-
-#if defined(PROBSLET_H)
-#else
-#define PROBSLET_H
-
-#include "prio.h"
-#include "private/pprio.h"  /* for PROsfd */
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Yield the current thread.  The proper function to use in place of
-** PR_Yield() is PR_Sleep() with an argument of PR_INTERVAL_NO_WAIT.
-*/
-NSPR_API(PRStatus) PR_Yield(void);
-
-/************************************************************************/
-/************* The following definitions are for select *****************/
-/************************************************************************/
-
-/*
-** The following is obsolete and will be deleted in the next release!
-** These are provided for compatibility, but are GUARANTEED to be slow.
-**
-** Override PR_MAX_SELECT_DESC if you need more space in the select set.
-*/
-#ifndef PR_MAX_SELECT_DESC
-#define PR_MAX_SELECT_DESC 1024
-#endif
-typedef struct PR_fd_set {
-    PRUint32      hsize;
-    PRFileDesc   *harray[PR_MAX_SELECT_DESC];
-    PRUint32      nsize;
-    PROsfd        narray[PR_MAX_SELECT_DESC];
-} PR_fd_set;
-
-/*
-*************************************************************************
-** FUNCTION:    PR_Select
-** DESCRIPTION:
-**
-** The call returns as soon as I/O is ready on one or more of the underlying
-** file/socket descriptors or an exceptional condition is pending. A count of the 
-** number of ready descriptors is returned unless a timeout occurs in which case 
-** zero is returned.  On return, PR_Select replaces the given descriptor sets with 
-** subsets consisting of those descriptors that are ready for the requested condition.
-** The total number of ready descriptors in all the sets is the return value.
-**
-** INPUTS:
-**   PRInt32 num             
-**       This argument is unused but is provided for select(unix) interface
-**       compatability.  All input PR_fd_set arguments are self-describing
-**       with its own maximum number of elements in the set.
-**                               
-**   PR_fd_set *readfds
-**       A set describing the io descriptors for which ready for reading
-**       condition is of interest.  
-**                               
-**   PR_fd_set *writefds
-**       A set describing the io descriptors for which ready for writing
-**       condition is of interest.  
-**                               
-**   PR_fd_set *exceptfds
-**       A set describing the io descriptors for which exception pending
-**       condition is of interest.  
-**
-**   Any of the above readfds, writefds or exceptfds may be given as NULL 
-**   pointers if no descriptors are of interest for that particular condition.                          
-**   
-**   PRIntervalTime timeout  
-**       Amount of time the call will block waiting for I/O to become ready. 
-**       If this time expires without any I/O becoming ready, the result will
-**       be zero.
-**
-** OUTPUTS:    
-**   PR_fd_set *readfds
-**       A set describing the io descriptors which are ready for reading.
-**                               
-**   PR_fd_set *writefds
-**       A set describing the io descriptors which are ready for writing.
-**                               
-**   PR_fd_set *exceptfds
-**       A set describing the io descriptors which have pending exception.
-**
-** RETURN:PRInt32
-**   Number of io descriptors with asked for conditions or zero if the function
-**   timed out or -1 on failure.  The reason for the failure is obtained by 
-**   calling PR_GetError().
-** XXX can we implement this on windoze and mac?
-**************************************************************************
-*/
-NSPR_API(PRInt32) PR_Select(
-    PRInt32 num, PR_fd_set *readfds, PR_fd_set *writefds,
-    PR_fd_set *exceptfds, PRIntervalTime timeout);
-
-/* 
-** The following are not thread safe for two threads operating on them at the
-** same time.
-**
-** The following routines are provided for manipulating io descriptor sets.
-** PR_FD_ZERO(&fdset) initializes a descriptor set fdset to the null set.
-** PR_FD_SET(fd, &fdset) includes a particular file descriptor fd in fdset.
-** PR_FD_CLR(fd, &fdset) removes a file descriptor fd from fdset.  
-** PR_FD_ISSET(fd, &fdset) is nonzero if file descriptor fd is a member of 
-** fdset, zero otherwise.
-**
-** PR_FD_NSET(osfd, &fdset) includes a particular native file descriptor osfd
-** in fdset.
-** PR_FD_NCLR(osfd, &fdset) removes a native file descriptor osfd from fdset.  
-** PR_FD_NISSET(osfd, &fdset) is nonzero if native file descriptor osfd is a member of 
-** fdset, zero otherwise.
-*/
-
-NSPR_API(void)        PR_FD_ZERO(PR_fd_set *set);
-NSPR_API(void)        PR_FD_SET(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_CLR(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(PRInt32)     PR_FD_ISSET(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_NSET(PROsfd osfd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_NCLR(PROsfd osfd, PR_fd_set *set);
-NSPR_API(PRInt32)     PR_FD_NISSET(PROsfd osfd, PR_fd_set *set);
-
-/*
-** The next two entry points should not be in the API, but they are
-** declared here for historical reasons.
-*/
-
-NSPR_API(PRInt32) PR_GetSysfdTableMax(void);
-
-NSPR_API(PRInt32) PR_SetSysfdTableSize(PRIntn table_size);
-
-#ifndef NO_NSPR_10_SUPPORT
-#ifdef XP_MAC
-#include <stat.h>
-#else
-#include <sys/stat.h>
-#endif
-
-NSPR_API(PRInt32) PR_Stat(const char *path, struct stat *buf);
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-#endif /* defined(PROBSLET_H) */
-
-/* probslet.h */
diff --git a/libs/js/nsprpub/pr/include/obsolete/protypes.h b/libs/js/nsprpub/pr/include/obsolete/protypes.h
deleted file mode 100644
index 4405bfce2f..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/protypes.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This header typedefs the old 'native' types to the new PR<type>s.
- * These definitions are scheduled to be eliminated at the earliest
- * possible time. The NSPR API is implemented and documented using
- * the new definitions.
- */
-
-#if !defined(PROTYPES_H)
-#define PROTYPES_H
-
-typedef PRUintn uintn;
-#ifndef _XP_Core_
-typedef PRIntn intn;
-#endif
-
-/*
- * It is trickier to define uint, int8, uint8, int16, uint16,
- * int32, uint32, int64, and uint64 because some of these int
- * types are defined by standard header files on some platforms.
- * Our strategy here is to include all such standard headers
- * first, and then define these int types only if they are not
- * defined by those standard headers.
- */
-
-/*
- * BeOS defines all the int types below in its standard header
- * file SupportDefs.h.
- */
-#ifdef XP_BEOS
-#include <support/SupportDefs.h>
-#endif
-
-/*
- * OpenVMS defines all the int types below in its standard
- * header files ints.h and types.h.
- */
-#ifdef VMS
-#include <ints.h>
-#include <types.h>
-#endif
-
-/*
- * SVR4 typedef of uint is commonly found on UNIX machines.
- *
- * On AIX 4.3, sys/inttypes.h (which is included by sys/types.h)
- * defines the types int8, int16, int32, and int64.
- */
-#ifdef XP_UNIX
-#include <sys/types.h>
-#endif
-
-/* model.h on HP-UX defines int8, int16, and int32. */
-#ifdef HPUX
-#include <model.h>
-#endif
-
-/*
- * uint
- */
-
-#if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(XP_UNIX) || defined(NTO)
-typedef PRUintn uint;
-#endif
-
-/*
- * uint64
- */
-
-#if !defined(XP_BEOS) && !defined(VMS)
-typedef PRUint64 uint64;
-#endif
-
-/*
- * uint32
- */
-
-#if !defined(XP_BEOS) && !defined(VMS)
-#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
-typedef PRUint32 uint32;
-#else
-typedef unsigned long uint32;
-#endif
-#endif
-
-/*
- * uint16
- */
-
-#if !defined(XP_BEOS) && !defined(VMS)
-typedef PRUint16 uint16;
-#endif
-
-/*
- * uint8
- */
-
-#if !defined(XP_BEOS) && !defined(VMS)
-typedef PRUint8 uint8;
-#endif
-
-/*
- * int64
- */
-
-#if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
-typedef PRInt64 int64;
-#endif
-
-/*
- * int32
- */
-
-#if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
-typedef PRInt32 int32;
-#else
-typedef long int32;
-#endif
-#endif
-
-/*
- * int16
- */
-
-#if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-typedef PRInt16 int16;
-#endif
-
-/*
- * int8
- */
-
-#if !defined(XP_BEOS) && !defined(VMS) \
-    && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-typedef PRInt8 int8;
-#endif
-
-typedef PRFloat64 float64;
-typedef PRUptrdiff uptrdiff_t;
-typedef PRUword uprword_t;
-typedef PRWord prword_t;
-
-
-/* Re: prbit.h */
-#define TEST_BIT	PR_TEST_BIT
-#define SET_BIT		PR_SET_BIT
-#define CLEAR_BIT	PR_CLEAR_BIT
-
-/* Re: prarena.h->plarena.h */
-#define PRArena PLArena
-#define PRArenaPool PLArenaPool
-#define PRArenaStats PLArenaStats
-#define PR_ARENA_ALIGN PL_ARENA_ALIGN
-#define PR_INIT_ARENA_POOL PL_INIT_ARENA_POOL
-#define PR_ARENA_ALLOCATE PL_ARENA_ALLOCATE
-#define PR_ARENA_GROW PL_ARENA_GROW
-#define PR_ARENA_MARK PL_ARENA_MARK
-#define PR_CLEAR_UNUSED PL_CLEAR_UNUSED
-#define PR_CLEAR_ARENA PL_CLEAR_ARENA
-#define PR_ARENA_RELEASE PL_ARENA_RELEASE
-#define PR_COUNT_ARENA PL_COUNT_ARENA
-#define PR_ARENA_DESTROY PL_ARENA_DESTROY
-#define PR_InitArenaPool PL_InitArenaPool
-#define PR_FreeArenaPool PL_FreeArenaPool
-#define PR_FinishArenaPool PL_FinishArenaPool
-#define PR_CompactArenaPool PL_CompactArenaPool
-#define PR_ArenaFinish PL_ArenaFinish
-#define PR_ArenaAllocate PL_ArenaAllocate
-#define PR_ArenaGrow PL_ArenaGrow
-#define PR_ArenaRelease PL_ArenaRelease
-#define PR_ArenaCountAllocation PL_ArenaCountAllocation
-#define PR_ArenaCountInplaceGrowth PL_ArenaCountInplaceGrowth
-#define PR_ArenaCountGrowth PL_ArenaCountGrowth
-#define PR_ArenaCountRelease PL_ArenaCountRelease
-#define PR_ArenaCountRetract PL_ArenaCountRetract
-
-/* Re: prhash.h->plhash.h */
-#define PRHashEntry PLHashEntry
-#define PRHashTable PLHashTable
-#define PRHashNumber PLHashNumber
-#define PRHashFunction PLHashFunction
-#define PRHashComparator PLHashComparator
-#define PRHashEnumerator PLHashEnumerator
-#define PRHashAllocOps PLHashAllocOps
-#define PR_NewHashTable PL_NewHashTable
-#define PR_HashTableDestroy PL_HashTableDestroy
-#define PR_HashTableRawLookup PL_HashTableRawLookup
-#define PR_HashTableRawAdd PL_HashTableRawAdd
-#define PR_HashTableRawRemove PL_HashTableRawRemove
-#define PR_HashTableAdd PL_HashTableAdd
-#define PR_HashTableRemove PL_HashTableRemove
-#define PR_HashTableEnumerateEntries PL_HashTableEnumerateEntries
-#define PR_HashTableLookup PL_HashTableLookup
-#define PR_HashTableDump PL_HashTableDump
-#define PR_HashString PL_HashString
-#define PR_CompareStrings PL_CompareStrings
-#define PR_CompareValues PL_CompareValues
-
-#if defined(XP_MAC)
-#ifndef TRUE				/* Mac standard is lower case true */
-	#define TRUE 1
-#endif
-#ifndef FALSE				/* Mac standard is lower case false */
-	#define FALSE 0
-#endif
-#endif
-
-#endif /* !defined(PROTYPES_H) */
diff --git a/libs/js/nsprpub/pr/include/obsolete/prsem.h b/libs/js/nsprpub/pr/include/obsolete/prsem.h
deleted file mode 100644
index fd0863aba6..0000000000
--- a/libs/js/nsprpub/pr/include/obsolete/prsem.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prsem_h___
-#define prsem_h___
-
-/*
-** API for counting semaphores. Semaphores are counting synchronizing 
-** variables based on a lock and a condition variable.  They are lightweight 
-** contention control for a given count of resources.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRSemaphore PRSemaphore;
-
-/*
-** Create a new semaphore object.
-*/
-NSPR_API(PRSemaphore*) PR_NewSem(PRUintn value);
-
-/*
-** Destroy the given semaphore object.
-**
-*/
-NSPR_API(void) PR_DestroySem(PRSemaphore *sem);
-
-/*
-** Wait on a Semaphore.
-** 
-** This routine allows a calling thread to wait or proceed depending upon the 
-** state of the semahore sem. The thread can proceed only if the counter value 
-** of the semaphore sem is currently greater than 0. If the value of semaphore 
-** sem is positive, it is decremented by one and the routine returns immediately 
-** allowing the calling thread to continue. If the value of semaphore sem is 0, 
-** the calling thread blocks awaiting the semaphore to be released by another 
-** thread.
-** 
-** This routine can return PR_PENDING_INTERRUPT if the waiting thread 
-** has been interrupted.
-*/
-NSPR_API(PRStatus) PR_WaitSem(PRSemaphore *sem);
-
-/*
-** This routine increments the counter value of the semaphore. If other threads 
-** are blocked for the semaphore, then the scheduler will determine which ONE 
-** thread will be unblocked.
-*/
-NSPR_API(void) PR_PostSem(PRSemaphore *sem);
-
-/*
-** Returns the value of the semaphore referenced by sem without affecting
-** the state of the semaphore.  The value represents the semaphore vaule
-F** at the time of the call, but may not be the actual value when the
-** caller inspects it.
-*/
-NSPR_API(PRUintn) PR_GetValueSem(PRSemaphore *sem);
-
-PR_END_EXTERN_C
-
-#endif /* prsem_h___ */
diff --git a/libs/js/nsprpub/pr/include/pratom.h b/libs/js/nsprpub/pr/include/pratom.h
deleted file mode 100644
index 57d069b05c..0000000000
--- a/libs/js/nsprpub/pr/include/pratom.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* GLOBAL FUNCTIONS:
-** DESCRIPTION:
-**     PR Atomic operations
-*/
-
-#ifndef pratom_h___
-#define pratom_h___
-
-#include "prtypes.h"
-#include "prlock.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** FUNCTION: PR_AtomicIncrement
-** DESCRIPTION:
-**    Atomically increment a 32 bit value.
-** INPUTS:
-**    val:  a pointer to the value to increment
-** RETURN:
-**    the returned value is the result of the increment
-*/
-NSPR_API(PRInt32)	PR_AtomicIncrement(PRInt32 *val);
-
-/*
-** FUNCTION: PR_AtomicDecrement
-** DESCRIPTION:
-**    Atomically decrement a 32 bit value.
-** INPUTS:
-**    val:  a pointer to the value to decrement
-** RETURN:
-**    the returned value is the result of the decrement
-*/
-NSPR_API(PRInt32)	PR_AtomicDecrement(PRInt32 *val);
-
-/*
-** FUNCTION: PR_AtomicSet
-** DESCRIPTION:
-**    Atomically set a 32 bit value.
-** INPUTS:
-**    val: A pointer to a 32 bit value to be set
-**    newval: The newvalue to assign to val
-** RETURN:
-**    Returns the prior value
-*/
-NSPR_API(PRInt32) PR_AtomicSet(PRInt32 *val, PRInt32 newval);
-
-/*
-** FUNCTION: PR_AtomicAdd
-** DESCRIPTION:
-**    Atomically add a 32 bit value.
-** INPUTS:
-**    ptr:  a pointer to the value to increment
-**	  val:  value to be added
-** RETURN:
-**    the returned value is the result of the addition
-*/
-NSPR_API(PRInt32)	PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-
-/*
-** LIFO linked-list (stack)
-*/
-typedef struct PRStackElemStr PRStackElem;
-
-struct PRStackElemStr {
-    PRStackElem	*prstk_elem_next;	/* next pointer MUST be at offset 0;
-									  assembly language code relies on this */
-};
-
-typedef struct PRStackStr PRStack;
-
-/*
-** FUNCTION: PR_CreateStack
-** DESCRIPTION:
-**    Create a stack, a LIFO linked list
-** INPUTS:
-**    stack_name:  a pointer to string containing the name of the stack
-** RETURN:
-**    A pointer to the created stack, if successful, else NULL.
-*/
-NSPR_API(PRStack *)	PR_CreateStack(const char *stack_name);
-
-/*
-** FUNCTION: PR_StackPush
-** DESCRIPTION:
-**    Push an element on the top of the stack
-** INPUTS:
-**    stack:		pointer to the stack
-**    stack_elem:	pointer to the stack element
-** RETURN:
-**    None
-*/
-NSPR_API(void)			PR_StackPush(PRStack *stack, PRStackElem *stack_elem);
-
-/*
-** FUNCTION: PR_StackPop
-** DESCRIPTION:
-**    Remove the element on the top of the stack
-** INPUTS:
-**    stack:		pointer to the stack
-** RETURN:
-**    A pointer to the stack element removed from the top of the stack,
-**	  if non-empty,
-**    else NULL
-*/
-NSPR_API(PRStackElem *)	PR_StackPop(PRStack *stack);
-
-/*
-** FUNCTION: PR_DestroyStack
-** DESCRIPTION:
-**    Destroy the stack
-** INPUTS:
-**    stack:		pointer to the stack
-** RETURN:
-**    PR_SUCCESS - if successfully deleted
-**	  PR_FAILURE - if the stack is not empty
-**					PR_GetError will return
-**						PR_INVALID_STATE_ERROR - stack is not empty
-*/
-NSPR_API(PRStatus)		PR_DestroyStack(PRStack *stack);
-
-PR_END_EXTERN_C
-
-#endif /* pratom_h___ */
diff --git a/libs/js/nsprpub/pr/include/prbit.h b/libs/js/nsprpub/pr/include/prbit.h
deleted file mode 100644
index 379971e8b7..0000000000
--- a/libs/js/nsprpub/pr/include/prbit.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prbit_h___
-#define prbit_h___
-
-#include "prtypes.h"
-PR_BEGIN_EXTERN_C
-
-/*
-** A prbitmap_t is a long integer that can be used for bitmaps
-*/
-typedef unsigned long prbitmap_t;
-
-#define PR_TEST_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] & (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_SET_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] |= (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_CLEAR_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] &= ~(1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-NSPR_API(PRIntn) PR_CeilingLog2(PRUint32 i); 
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n
-*/
-NSPR_API(PRIntn) PR_FloorLog2(PRUint32 i); 
-
-/*
-** Macro version of PR_CeilingLog2: Compute the log of the least power of
-** 2 greater than or equal to _n. The result is returned in _log2.
-*/
-#define PR_CEILING_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n); 	\
-    (_log2) = 0;                    \
-    if ((j_) & ((j_)-1))            \
-	(_log2) += 1;               \
-    if ((j_) >> 16)                 \
-	(_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-	(_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-	(_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-	(_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-	(_log2) += 1;               \
-  PR_END_MACRO
-
-/*
-** Macro version of PR_FloorLog2: Compute the log of the greatest power of
-** 2 less than or equal to _n. The result is returned in _log2.
-**
-** This is equivalent to finding the highest set bit in the word.
-*/
-#define PR_FLOOR_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n); 	\
-    (_log2) = 0;                    \
-    if ((j_) >> 16)                 \
-	(_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-	(_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-	(_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-	(_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-	(_log2) += 1;               \
-  PR_END_MACRO
-
-PR_END_EXTERN_C
-#endif /* prbit_h___ */
diff --git a/libs/js/nsprpub/pr/include/prclist.h b/libs/js/nsprpub/pr/include/prclist.h
deleted file mode 100644
index 1680ac177c..0000000000
--- a/libs/js/nsprpub/pr/include/prclist.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prclist_h___
-#define prclist_h___
-
-#include "prtypes.h"
-
-typedef struct PRCListStr PRCList;
-
-/*
-** Circular linked list
-*/
-struct PRCListStr {
-    PRCList	*next;
-    PRCList	*prev;
-};
-
-/*
-** Insert element "_e" into the list, before "_l".
-*/
-#define PR_INSERT_BEFORE(_e,_l)	 \
-    PR_BEGIN_MACRO		 \
-	(_e)->next = (_l);	 \
-	(_e)->prev = (_l)->prev; \
-	(_l)->prev->next = (_e); \
-	(_l)->prev = (_e);	 \
-    PR_END_MACRO
-
-/*
-** Insert element "_e" into the list, after "_l".
-*/
-#define PR_INSERT_AFTER(_e,_l)	 \
-    PR_BEGIN_MACRO		 \
-	(_e)->next = (_l)->next; \
-	(_e)->prev = (_l);	 \
-	(_l)->next->prev = (_e); \
-	(_l)->next = (_e);	 \
-    PR_END_MACRO
-
-/*
-** Return the element following element "_e"
-*/
-#define PR_NEXT_LINK(_e)	 \
-    	((_e)->next)
-/*
-** Return the element preceding element "_e"
-*/
-#define PR_PREV_LINK(_e)	 \
-    	((_e)->prev)
-
-/*
-** Append an element "_e" to the end of the list "_l"
-*/
-#define PR_APPEND_LINK(_e,_l) PR_INSERT_BEFORE(_e,_l)
-
-/*
-** Insert an element "_e" at the head of the list "_l"
-*/
-#define PR_INSERT_LINK(_e,_l) PR_INSERT_AFTER(_e,_l)
-
-/* Return the head/tail of the list */
-#define PR_LIST_HEAD(_l) (_l)->next
-#define PR_LIST_TAIL(_l) (_l)->prev
-
-/*
-** Remove the element "_e" from it's circular list.
-*/
-#define PR_REMOVE_LINK(_e)	       \
-    PR_BEGIN_MACRO		       \
-	(_e)->prev->next = (_e)->next; \
-	(_e)->next->prev = (_e)->prev; \
-    PR_END_MACRO
-
-/*
-** Remove the element "_e" from it's circular list. Also initializes the
-** linkage.
-*/
-#define PR_REMOVE_AND_INIT_LINK(_e)    \
-    PR_BEGIN_MACRO		       \
-	(_e)->prev->next = (_e)->next; \
-	(_e)->next->prev = (_e)->prev; \
-	(_e)->next = (_e);	       \
-	(_e)->prev = (_e);	       \
-    PR_END_MACRO
-
-/*
-** Return non-zero if the given circular list "_l" is empty, zero if the
-** circular list is not empty
-*/
-#define PR_CLIST_IS_EMPTY(_l) \
-    ((_l)->next == (_l))
-
-/*
-** Initialize a circular list
-*/
-#define PR_INIT_CLIST(_l)  \
-    PR_BEGIN_MACRO	   \
-	(_l)->next = (_l); \
-	(_l)->prev = (_l); \
-    PR_END_MACRO
-
-#define PR_INIT_STATIC_CLIST(_l) \
-    {(_l), (_l)}
-
-#endif /* prclist_h___ */
diff --git a/libs/js/nsprpub/pr/include/prcmon.h b/libs/js/nsprpub/pr/include/prcmon.h
deleted file mode 100644
index f61cf56a0b..0000000000
--- a/libs/js/nsprpub/pr/include/prcmon.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prcmon_h___
-#define prcmon_h___
-
-/*
-** Interface to cached monitors. Cached monitors use an address to find a
-** given PR monitor. In this way a monitor can be associated with another
-** object without preallocating a monitor for all objects.
-**
-** A hash table is used to quickly map addresses to individual monitors
-** and the system automatically grows the hash table as needed.
-**
-** Cache monitors are about 5 times slower to use than uncached monitors.
-*/
-#include "prmon.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-/**
-** Like PR_EnterMonitor except use the "address" to find a monitor in the
-** monitor cache. If successful, returns the PRMonitor now associated
-** with "address". Note that you must PR_CExitMonitor the address to
-** release the monitor cache entry (otherwise the monitor cache will fill
-** up). This call will return NULL if the monitor cache needs to be
-** expanded and the system is out of memory.
-*/
-NSPR_API(PRMonitor*) PR_CEnterMonitor(void *address);
-
-/*
-** Like PR_ExitMonitor except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CExitMonitor(void *address);
-
-/*
-** Like PR_Wait except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CWait(void *address, PRIntervalTime timeout);
-
-/*
-** Like PR_Notify except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CNotify(void *address);
-
-/*
-** Like PR_NotifyAll except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CNotifyAll(void *address);
-
-/*
-** Set a callback to be invoked each time a monitor is recycled from the cache
-** freelist, with the monitor's cache-key passed in address.
-*/
-NSPR_API(void) PR_CSetOnMonitorRecycle(void (PR_CALLBACK *callback)(void *address));
-
-PR_END_EXTERN_C
-
-#endif /* prcmon_h___ */
diff --git a/libs/js/nsprpub/pr/include/prcountr.h b/libs/js/nsprpub/pr/include/prcountr.h
deleted file mode 100644
index 4b197e974b..0000000000
--- a/libs/js/nsprpub/pr/include/prcountr.h
+++ /dev/null
@@ -1,557 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prcountr_h___
-#define prcountr_h___
-
-/*----------------------------------------------------------------------------
-** prcountr.h -- NSPR Instrumentation counters
-**
-** The NSPR Counter Feature provides a means to "count
-** something." Counters can be dynamically defined, incremented,
-** decremented, set, and deleted under application program
-** control.
-** 																                   
-** The Counter Feature is intended to be used as instrumentation,                  
-** not as operational data. If you need a counter for operational                  
-** data, use native integral types.                                                
-** 																                   
-** Counters are 32bit unsigned intergers. On overflow, a counter                   
-** will wrap. No exception is recognized or reported.                              
-**                                                                                 
-** A counter can be dynamically created using a two level naming
-** convention. A "handle" is returned when the counter is
-** created. The counter can subsequently be addressed by its
-** handle. An API is provided to get an existing counter's handle
-** given the names with  which it was originally created. 
-** Similarly, a counter's name can be retrieved given its handle.
-** 
-** The counter naming convention is a two-level hierarchy. The
-** QName is the higher level of the hierarchy; RName is the
-** lower level. RNames can be thought of as existing within a
-** QName. The same RName can exist within multiple QNames. QNames
-** are unique. The NSPR Counter is not a near-zero overhead
-** feature. Application designers should be aware of 
-** serialization issues when using the Counter API. Creating a
-** counter locks a large asset, potentially causing a stall. This
-** suggest that applications should create counters at component
-** initialization, for example, and not create and destroy them
-** willy-nilly. ... You have been warned.
-** 
-** Incrementing and Adding to counters uses atomic operations.
-** The performance of these operations will vary from platform
-** to platform. On platforms where atomic operations are not
-** supported the overhead may be substantial.
-** 
-** When traversing the counter database with FindNext functions,
-** the instantaneous values of any given counter is that at the
-** moment of extraction. The state of the entire counter database
-** may not be viewed as atomic.
-** 
-** The counter interface may be disabled (No-Op'd) at compile
-** time. When DEBUG is defined at compile time, the Counter
-** Feature is compiled into NSPR and applications invoking it.
-** When DEBUG is not defined, the counter macros compile to
-** nothing. To force the Counter Feature to be compiled into an
-** optimized build, define FORCE_NSPR_COUNTERS at compile time
-** for both NSPR and the application intending to use it.
-** 
-** Application designers should use the macro form of the Counter
-** Feature methods to minimize performance impact in optimized
-** builds. The macros normally compile to nothing on optimized
-** builds.
-** 
-** Application designers should be aware of the effects of
-** debug and optimized build differences when using result of the
-** Counter Feature macros in expressions.
-** 
-** The Counter Feature is thread-safe and SMP safe.
-** 
-** /lth. 09-Jun-1998.
-*/
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Opaque counter handle type.
-** ... don't even think of looking in here.
-**
-*/
-typedef void *  PRCounterHandle;
-
-#define PRCOUNTER_NAME_MAX 31
-#define PRCOUNTER_DESC_MAX 255
-
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DEFINE_COUNTER() -- Define a PRCounterHandle
-** 
-** DESCRIPTION: PR_DEFINE_COUNTER() is used to define a counter
-** handle.
-** 
-*/
-#define PR_DEFINE_COUNTER(name) PRCounterHandle name
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_INIT_COUNTER_HANDLE() -- Set the value of a PRCounterHandle
-** 
-** DESCRIPTION: 
-** PR_INIT_COUNTER_HANDLE() sets the value of a PRCounterHandle
-** to value.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_INIT_COUNTER_HANDLE(handle,value)\
-    (handle) = (PRCounterHandle)(value)
-#else
-#define PR_INIT_COUNTER_HANDLE(handle,value)
-#endif
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateCounter() -- Create a counter
-** 
-** DESCRIPTION: PR_CreateCounter() creates a counter object and
-** initializes it to zero.
-** 
-** The macro form takes as its first argument the name of the
-** PRCounterHandle to receive the handle returned from
-** PR_CreateCounter().
-** 
-** INPUTS:
-**  qName: The QName for the counter object. The maximum length
-** of qName is defined by PRCOUNTER_NAME_MAX
-** 
-**  rName: The RName for the counter object. The maximum length
-** of qName is defined by PRCOUNTER_NAME_MAX
-** 
-**  descrioption: The description of the counter object. The
-** maximum length of description is defined by
-** PRCOUNTER_DESC_MAX.
-** 
-** OUTPUTS:
-** 
-** RETURNS:
-**  PRCounterHandle.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_CREATE_COUNTER(handle,qName,rName,description)\
-   (handle) = PR_CreateCounter((qName),(rName),(description))
-#else
-#define PR_CREATE_COUNTER(handle,qName,rName,description)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_CreateCounter( 
-		const char *qName, 
-    	const char *rName, 
-        const char *description 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyCounter() -- Destroy a counter object.
-** 
-** DESCRIPTION: PR_DestroyCounter() removes a counter and
-** unregisters its handle from the counter database.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be destroyed.
-** 
-** OUTPUTS: 
-**  The counter is destroyed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_DESTROY_COUNTER(handle) PR_DestroyCounter((handle))
-#else
-#define PR_DESTROY_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DestroyCounter( 
-		PRCounterHandle handle 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounterHandleFromName() -- Retreive a
-** counter's handle give its name.
-** 
-** DESCRIPTION: PR_GetCounterHandleFromName() retreives a
-** counter's handle from the counter database, given the name
-** the counter was originally created with.
-** 
-** INPUTS:
-**  qName: Counter's original QName.
-**  rName: Counter's original RName.
-** 
-** OUTPUTS:
-** 
-** RETURNS: 
-**  PRCounterHandle or PRCounterError.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)\
-    (handle) = PR_GetCounterHandleFromName((qName),(rName))
-#else
-#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_GetCounterHandleFromName( 
-    	const char *qName, 
-    	const char *rName 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounterNameFromHandle() -- Retreive a
-** counter's name, given its handle.
-** 
-** DESCRIPTION: PR_GetCounterNameFromHandle() retreives a
-** counter's name given its handle.
-** 
-** INPUTS:
-**  qName: Where to store a pointer to qName.
-**  rName: Where to store a pointer to rName.
-**  description: Where to store a pointer to description.
-** 
-** OUTPUTS: Pointers to the Counter Feature's copies of the names
-** used when the counters were created.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description)\
-    PR_GetCounterNameFromHandle((handle),(qName),(rName),(description))
-#else
-#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description )
-#endif
-
-NSPR_API(void) 
-	PR_GetCounterNameFromHandle( 
-    	PRCounterHandle handle,  
-	    const char **qName, 
-	    const char **rName, 
-		const char **description 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_IncrementCounter() -- Add one to the referenced
-** counter.
-** 
-** DESCRIPTION: Add one to the referenced counter.
-** 
-** INPUTS:
-**  handle: The PRCounterHandle of the counter to be incremented
-** 
-** OUTPUTS: The counter is incrementd.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_INCREMENT_COUNTER(handle) PR_IncrementCounter(handle)
-#else
-#define PR_INCREMENT_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_IncrementCounter( 
-		PRCounterHandle handle
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DecrementCounter() -- Subtract one from the
-** referenced counter
-** 
-** DESCRIPTION: Subtract one from the referenced counter.
-** 
-** INPUTS: 
-**  handle: The PRCounterHandle of the coutner to be
-** decremented.
-** 
-** OUTPUTS: the counter is decremented.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_DECREMENT_COUNTER(handle) PR_DecrementCounter(handle)
-#else
-#define PR_DECREMENT_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DecrementCounter( 
-		PRCounterHandle handle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_AddToCounter() -- Add a value to a counter.
-** 
-** DESCRIPTION: Add value to the counter referenced by handle.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be added to.
-** 
-**  value: the value to be added to the counter.
-** 
-** OUTPUTS: new value for counter.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_ADD_TO_COUNTER(handle,value)\
-    PR_AddToCounter((handle),(value))
-#else
-#define PR_ADD_TO_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_AddToCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SubtractFromCounter() -- A value is subtracted
-** from a counter.
-** 
-** DESCRIPTION:
-** Subtract a value from a counter.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be subtracted
-** from.
-** 
-**  value: the value to be subtracted from the counter.
-** 
-** OUTPUTS: new value for counter
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_SUBTRACT_FROM_COUNTER(handle,value)\
-    PR_SubtractFromCounter((handle),(value))
-#else
-#define PR_SUBTRACT_FROM_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_SubtractFromCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounter() -- Retreive the value of a counter
-** 
-** DESCRIPTION:
-** Retreive the value of a counter.
-** 
-** INPUTS:
-**  handle: the PR_CounterHandle of the counter to be retreived
-** 
-** OUTPUTS:
-** 
-** RETURNS: The value of the referenced counter
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER(counter,handle)\
-    (counter) = PR_GetCounter((handle))
-#else
-#define PR_GET_COUNTER(counter,handle) 0
-#endif
-
-NSPR_API(PRUint32) 
-	PR_GetCounter( 
-		PRCounterHandle handle 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SetCounter() -- Replace the content of counter
-** with value.
-** 
-** DESCRIPTION: The contents of the referenced counter are
-** replaced by value.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter whose contents
-** are to be replaced.
-** 
-**  value: the new value of the counter.
-** 
-** OUTPUTS:
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_SET_COUNTER(handle,value) PR_SetCounter((handle),(value))
-#else
-#define PR_SET_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_SetCounter( 
-		PRCounterHandle handle, 
-		PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextCounterQname() -- Retreive the next QName counter
-** handle iterator
-** 
-** DESCRIPTION:
-** PR_FindNextCounterQname() retreives the first or next Qname
-** the counter data base, depending on the value of handle. When
-** handle is NULL, the function attempts to retreive the first
-** QName handle in the database. When handle is a handle previosly
-** retreived QName handle, then the function attempts to retreive
-** the next QName handle.
-** 
-** INPUTS: 
-**  handle: PRCounterHandle or NULL.
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PRCounterHandle or NULL when no more QName counter
-** handles are present.
-** 
-** RESTRICTIONS:
-**  A concurrent PR_CreateCounter() or PR_DestroyCounter() may
-** cause unpredictable results.
-** 
-** A PRCounterHandle returned from this function may only be used
-** in another PR_FindNextCounterQname() function call; other
-** operations may cause unpredictable results.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\
-    (next) = PR_FindNextCounterQname((handle))
-#else
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_FindNextCounterQname( 
-        PRCounterHandle handle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextCounterRname() -- Retreive the next RName counter
-** handle iterator
-** 
-** DESCRIPTION:
-** PR_FindNextCounterRname() retreives the first or next RNname
-** handle from the counter data base, depending on the
-** value of handle. When handle is NULL, the function attempts to
-** retreive the first RName handle in the database. When handle is
-** a handle previosly retreived RName handle, then the function
-** attempts to retreive the next RName handle.
-** 
-** INPUTS:
-**  handle: PRCounterHandle or NULL.
-**  qhandle: PRCounterHandle of a previously aquired via
-** PR_FIND_NEXT_QNAME_HANDLE()
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PRCounterHandle or NULL when no more RName counter
-** handles are present.
-** 
-** RESTRICTIONS:
-**  A concurrent PR_CreateCounter() or PR_DestroyCounter() may
-** cause unpredictable results.
-** 
-** A PRCounterHandle returned from this function may only be used
-** in another PR_FindNextCounterRname() function call; other
-** operations may cause unpredictable results.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)\
-    (next) = PR_FindNextCounterRname((rhandle),(qhandle))
-#else
-#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_FindNextCounterRname( 
-        PRCounterHandle rhandle,
-        PRCounterHandle qhandle
-);
-
-PR_END_EXTERN_C
-
-#endif /* prcountr_h___ */
diff --git a/libs/js/nsprpub/pr/include/prcvar.h b/libs/js/nsprpub/pr/include/prcvar.h
deleted file mode 100644
index c668493783..0000000000
--- a/libs/js/nsprpub/pr/include/prcvar.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prcvar_h___
-#define prcvar_h___
-
-#include "prlock.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRCondVar PRCondVar;
-
-/*
-** Create a new condition variable.
-**
-** 	"lock" is the lock used to protect the condition variable.
-**
-** Condition variables are synchronization objects that threads can use
-** to wait for some condition to occur.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low. In such cases, a NULL will be returned.
-*/
-NSPR_API(PRCondVar*) PR_NewCondVar(PRLock *lock);
-
-/*
-** Destroy a condition variable. There must be no thread
-** waiting on the condvar. The caller is responsible for guaranteeing
-** that the condvar is no longer in use.
-**
-*/
-NSPR_API(void) PR_DestroyCondVar(PRCondVar *cvar);
-
-/*
-** The thread that waits on a condition is blocked in a "waiting on
-** condition" state until another thread notifies the condition or a
-** caller specified amount of time expires. The lock associated with
-** the condition variable will be released, which must have be held
-** prior to the call to wait.
-**
-** Logically a notified thread is moved from the "waiting on condition"
-** state and made "ready." When scheduled, it will attempt to reacquire
-** the lock that it held when wait was called.
-**
-** The timeout has two well known values, PR_INTERVAL_NO_TIMEOUT and
-** PR_INTERVAL_NO_WAIT. The former value requires that a condition be
-** notified (or the thread interrupted) before it will resume from the
-** wait. If the timeout has a value of PR_INTERVAL_NO_WAIT, the effect
-** is to release the lock, possibly causing a rescheduling within the
-** runtime, then immediately attempting to reacquire the lock and resume.
-**
-** Any other value for timeout will cause the thread to be rescheduled
-** either due to explicit notification or an expired interval. The latter
-** must be determined by treating time as one part of the monitored data
-** being protected by the lock and tested explicitly for an expired
-** interval.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable or the thread was interrupted (PR_Interrupt()).
-** The particular reason can be extracted with PR_GetError().
-*/
-NSPR_API(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout);
-
-/*
-** Notify ONE thread that is currently waiting on 'cvar'. Which thread is
-** dependent on the implementation of the runtime. Common sense would dictate
-** that all threads waiting on a single condition have identical semantics,
-** therefore which one gets notified is not significant. 
-**
-** The calling thead must hold the lock that protects the condition, as
-** well as the invariants that are tightly bound to the condition, when
-** notify is called.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-NSPR_API(PRStatus) PR_NotifyCondVar(PRCondVar *cvar);
-
-/*
-** Notify all of the threads waiting on the condition variable. The order
-** that the threads are notified is indeterminant. The lock that protects
-** the condition must be held.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-NSPR_API(PRStatus) PR_NotifyAllCondVar(PRCondVar *cvar);
-
-PR_END_EXTERN_C
-
-#endif /* prcvar_h___ */
diff --git a/libs/js/nsprpub/pr/include/prdtoa.h b/libs/js/nsprpub/pr/include/prdtoa.h
deleted file mode 100644
index 54e8c34f4c..0000000000
--- a/libs/js/nsprpub/pr/include/prdtoa.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prdtoa_h___
-#define prdtoa_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_strtod() returns as a double-precision floating-point number
-** the  value represented by the character string pointed to by
-** s00. The string is scanned up to the first unrecognized
-** character.
-**a
-** If the value of se is not (char **)NULL, a  pointer  to
-** the  character terminating the scan is returned in the location pointed
-** to by se. If no number can be formed, se is set to s00, and
-** zero is returned.
-*/
-#if defined(HAVE_WATCOM_BUG_1)
-/* this is a hack to circumvent a bug in the Watcom C/C++ 11.0 compiler
-** When Watcom fixes the bug, remove the special case for Win16
-*/
-PRFloat64 __pascal __loadds __export
-#else
-NSPR_API(PRFloat64)
-#endif
-PR_strtod(const char *s00, char **se);
-
-/*
-** PR_cnvtf()
-** conversion routines for floating point
-** prcsn - number of digits of precision to generate floating
-** point value.
-*/
-NSPR_API(void) PR_cnvtf(char *buf, PRIntn bufsz, PRIntn prcsn, PRFloat64 fval);
-
-/*
-** PR_dtoa() converts double to a string.
-**
-** ARGUMENTS:
-** If rve is not null, *rve is set to point to the end of the return value.
-** If d is +-Infinity or NaN, then *decpt is set to 9999.
-**
-** mode:
-**     0 ==> shortest string that yields d when read in
-**           and rounded to nearest.
-*/
-NSPR_API(PRStatus) PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
-	PRIntn *decpt, PRIntn *sign, char **rve, char *buf, PRSize bufsize);
-
-PR_END_EXTERN_C
-
-#endif /* prdtoa_h___ */
diff --git a/libs/js/nsprpub/pr/include/prenv.h b/libs/js/nsprpub/pr/include/prenv.h
deleted file mode 100644
index 2cae7d79ee..0000000000
--- a/libs/js/nsprpub/pr/include/prenv.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prenv_h___
-#define prenv_h___
-
-#include "prtypes.h"
-
-/*******************************************************************************/
-/*******************************************************************************/
-/****************** THESE FUNCTIONS MAY NOT BE THREAD SAFE *********************/
-/*******************************************************************************/
-/*******************************************************************************/
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_GetEnv() -- Retrieve value of environment variable
-** 
-** Description:
-** PR_GetEnv() is modeled on Unix getenv().
-** 
-** 
-** Inputs: 
-**   var -- The name of the environment variable
-** 
-** Returns:
-**   The value of the environment variable 'var' or NULL if
-** the variable is undefined.
-** 
-** Restrictions:
-**   You'd think that a POSIX getenv(), putenv() would be
-**   consistently implemented everywhere. Surprise! It is not. On
-**   some platforms, a putenv() where the argument is of
-**   the form "name"  causes the named environment variable to
-**   be un-set; that is: a subsequent getenv() returns NULL. On
-**   other platforms, the putenv() fails, on others, it is a
-**   no-op. Similarly, a putenv() where the argument is of the
-**   form "name=" causes the named environment variable to be
-**   un-set; a subsequent call to getenv() returns NULL. On
-**   other platforms, a subsequent call to getenv() returns a
-**   pointer to a null-string (a byte of zero).
-** 
-**   PR_GetEnv(), PR_SetEnv() provide a consistent behavior 
-**   across all supported platforms. There are, however, some
-**   restrictions and some practices you must use to achieve
-**   consistent results everywhere.
-** 
-**   When manipulating the environment there is no way to un-set
-**   an environment variable across all platforms. We suggest
-**   you interpret the return of a pointer to null-string to
-**   mean the same as a return of NULL from PR_GetEnv().
-** 
-**   A call to PR_SetEnv() where the parameter is of the form
-**   "name" will return PR_FAILURE; the environment remains
-**   unchanged. A call to PR_SetEnv() where the parameter is
-**   of the form "name=" may un-set the envrionment variable on
-**   some platforms; on others it may set the value of the
-**   environment variable to the null-string.
-** 
-**   For example, to test for NULL return or return of the
-**   null-string from PR_GetEnv(), use the following code
-**   fragment:
-** 
-**      char *val = PR_GetEnv("foo");
-**      if ((NULL == val) || ('\0' == *val)) { 
-**          ... interpret this as un-set ... 
-**      }
-** 
-**   The caller must ensure that the string passed
-**   to PR_SetEnv() is persistent. That is: The string should
-**   not be on the stack, where it can be overwritten
-**   on return from the function calling PR_SetEnv().
-**   Similarly, the string passed to PR_SetEnv() must not be
-**   overwritten by other actions of the process. ... Some
-**   platforms use the string by reference rather than copying
-**   it into the environment space. ... You have been warned!
-** 
-**   Use of platform-native functions that manipulate the
-**   environment (getenv(), putenv(), 
-**   SetEnvironmentVariable(), etc.) must not be used with
-**   NSPR's similar functions. The platform-native functions
-**   may not be thread safe and/or may operate on different
-**   conceptual environment space than that operated upon by
-**   NSPR's functions or other environment manipulating
-**   functions on the same platform. (!)
-** 
-*/
-NSPR_API(char*) PR_GetEnv(const char *var);
-
-/*
-** PR_SetEnv() -- set, unset or change an environment variable
-** 
-** Description:
-** PR_SetEnv() is modeled on the Unix putenv() function.
-** 
-** Inputs: 
-**   string -- pointer to a caller supplied
-**   constant, persistent string of the form name=value. Where
-**   name is the name of the environment variable to be set or
-**   changed; value is the value assigned to the variable.
-**
-** Returns: 
-**   PRStatus.
-** 
-** Restrictions: 
-**   See the Restrictions documented in the description of
-**   PR_GetEnv() in this header file.
-** 
-** 
-*/
-NSPR_API(PRStatus) PR_SetEnv(const char *string);
-
-/*
-** DEPRECATED.  Use PR_SetEnv() instead.
-*/
-#ifdef XP_MAC
-NSPR_API(PRIntn) PR_PutEnv(const char *string);
-#endif
-
-PR_END_EXTERN_C
-
-#endif /* prenv_h___ */
diff --git a/libs/js/nsprpub/pr/include/prerr.h b/libs/js/nsprpub/pr/include/prerr.h
deleted file mode 100644
index 7929484742..0000000000
--- a/libs/js/nsprpub/pr/include/prerr.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prerr_h___
-#define prerr_h___
-
-/*
- *
- * prerr.h
- * This file is automatically generated; please do not edit it.
- */
-
-/* Memory allocation attempt failed */
-#define PR_OUT_OF_MEMORY_ERROR                   (-6000L)
-
-/* Invalid file descriptor */
-#define PR_BAD_DESCRIPTOR_ERROR                  (-5999L)
-
-/* The operation would have blocked */
-#define PR_WOULD_BLOCK_ERROR                     (-5998L)
-
-/* Invalid memory address argument */
-#define PR_ACCESS_FAULT_ERROR                    (-5997L)
-
-/* Invalid function for file type */
-#define PR_INVALID_METHOD_ERROR                  (-5996L)
-
-/* Invalid memory address argument */
-#define PR_ILLEGAL_ACCESS_ERROR                  (-5995L)
-
-/* Some unknown error has occurred */
-#define PR_UNKNOWN_ERROR                         (-5994L)
-
-/* Operation interrupted by another thread */
-#define PR_PENDING_INTERRUPT_ERROR               (-5993L)
-
-/* function not implemented */
-#define PR_NOT_IMPLEMENTED_ERROR                 (-5992L)
-
-/* I/O function error */
-#define PR_IO_ERROR                              (-5991L)
-
-/* I/O operation timed out */
-#define PR_IO_TIMEOUT_ERROR                      (-5990L)
-
-/* I/O operation on busy file descriptor */
-#define PR_IO_PENDING_ERROR                      (-5989L)
-
-/* The directory could not be opened */
-#define PR_DIRECTORY_OPEN_ERROR                  (-5988L)
-
-/* Invalid function argument */
-#define PR_INVALID_ARGUMENT_ERROR                (-5987L)
-
-/* Network address not available (in use?) */
-#define PR_ADDRESS_NOT_AVAILABLE_ERROR           (-5986L)
-
-/* Network address type not supported */
-#define PR_ADDRESS_NOT_SUPPORTED_ERROR           (-5985L)
-
-/* Already connected */
-#define PR_IS_CONNECTED_ERROR                    (-5984L)
-
-/* Network address is invalid */
-#define PR_BAD_ADDRESS_ERROR                     (-5983L)
-
-/* Local Network address is in use */
-#define PR_ADDRESS_IN_USE_ERROR                  (-5982L)
-
-/* Connection refused by peer */
-#define PR_CONNECT_REFUSED_ERROR                 (-5981L)
-
-/* Network address is presently unreachable */
-#define PR_NETWORK_UNREACHABLE_ERROR             (-5980L)
-
-/* Connection attempt timed out */
-#define PR_CONNECT_TIMEOUT_ERROR                 (-5979L)
-
-/* Network file descriptor is not connected */
-#define PR_NOT_CONNECTED_ERROR                   (-5978L)
-
-/* Failure to load dynamic library */
-#define PR_LOAD_LIBRARY_ERROR                    (-5977L)
-
-/* Failure to unload dynamic library */
-#define PR_UNLOAD_LIBRARY_ERROR                  (-5976L)
-
-/* Symbol not found in any of the loaded dynamic libraries */
-#define PR_FIND_SYMBOL_ERROR                     (-5975L)
-
-/* Insufficient system resources */
-#define PR_INSUFFICIENT_RESOURCES_ERROR          (-5974L)
-
-/* A directory lookup on a network address has failed */
-#define PR_DIRECTORY_LOOKUP_ERROR                (-5973L)
-
-/* Attempt to access a TPD key that is out of range */
-#define PR_TPD_RANGE_ERROR                       (-5972L)
-
-/* Process open FD table is full */
-#define PR_PROC_DESC_TABLE_FULL_ERROR            (-5971L)
-
-/* System open FD table is full */
-#define PR_SYS_DESC_TABLE_FULL_ERROR             (-5970L)
-
-/* Network operation attempted on non-network file descriptor */
-#define PR_NOT_SOCKET_ERROR                      (-5969L)
-
-/* TCP-specific function attempted on a non-TCP file descriptor */
-#define PR_NOT_TCP_SOCKET_ERROR                  (-5968L)
-
-/* TCP file descriptor is already bound */
-#define PR_SOCKET_ADDRESS_IS_BOUND_ERROR         (-5967L)
-
-/* Access Denied */
-#define PR_NO_ACCESS_RIGHTS_ERROR                (-5966L)
-
-/* The requested operation is not supported by the platform */
-#define PR_OPERATION_NOT_SUPPORTED_ERROR         (-5965L)
-
-/* The host operating system does not support the protocol requested */
-#define PR_PROTOCOL_NOT_SUPPORTED_ERROR          (-5964L)
-
-/* Access to the remote file has been severed */
-#define PR_REMOTE_FILE_ERROR                     (-5963L)
-
-/* The value requested is too large to be stored in the data buffer provided */
-#define PR_BUFFER_OVERFLOW_ERROR                 (-5962L)
-
-/* TCP connection reset by peer */
-#define PR_CONNECT_RESET_ERROR                   (-5961L)
-
-/* Unused */
-#define PR_RANGE_ERROR                           (-5960L)
-
-/* The operation would have deadlocked */
-#define PR_DEADLOCK_ERROR                        (-5959L)
-
-/* The file is already locked */
-#define PR_FILE_IS_LOCKED_ERROR                  (-5958L)
-
-/* Write would result in file larger than the system allows */
-#define PR_FILE_TOO_BIG_ERROR                    (-5957L)
-
-/* The device for storing the file is full */
-#define PR_NO_DEVICE_SPACE_ERROR                 (-5956L)
-
-/* Unused */
-#define PR_PIPE_ERROR                            (-5955L)
-
-/* Unused */
-#define PR_NO_SEEK_DEVICE_ERROR                  (-5954L)
-
-/* Cannot perform a normal file operation on a directory */
-#define PR_IS_DIRECTORY_ERROR                    (-5953L)
-
-/* Symbolic link loop */
-#define PR_LOOP_ERROR                            (-5952L)
-
-/* File name is too long */
-#define PR_NAME_TOO_LONG_ERROR                   (-5951L)
-
-/* File not found */
-#define PR_FILE_NOT_FOUND_ERROR                  (-5950L)
-
-/* Cannot perform directory operation on a normal file */
-#define PR_NOT_DIRECTORY_ERROR                   (-5949L)
-
-/* Cannot write to a read-only file system */
-#define PR_READ_ONLY_FILESYSTEM_ERROR            (-5948L)
-
-/* Cannot delete a directory that is not empty */
-#define PR_DIRECTORY_NOT_EMPTY_ERROR             (-5947L)
-
-/* Cannot delete or rename a file object while the file system is busy */
-#define PR_FILESYSTEM_MOUNTED_ERROR              (-5946L)
-
-/* Cannot rename a file to a file system on another device */
-#define PR_NOT_SAME_DEVICE_ERROR                 (-5945L)
-
-/* The directory object in the file system is corrupted */
-#define PR_DIRECTORY_CORRUPTED_ERROR             (-5944L)
-
-/* Cannot create or rename a filename that already exists */
-#define PR_FILE_EXISTS_ERROR                     (-5943L)
-
-/* Directory is full.  No additional filenames may be added */
-#define PR_MAX_DIRECTORY_ENTRIES_ERROR           (-5942L)
-
-/* The required device was in an invalid state */
-#define PR_INVALID_DEVICE_STATE_ERROR            (-5941L)
-
-/* The device is locked */
-#define PR_DEVICE_IS_LOCKED_ERROR                (-5940L)
-
-/* No more entries in the directory */
-#define PR_NO_MORE_FILES_ERROR                   (-5939L)
-
-/* Encountered end of file */
-#define PR_END_OF_FILE_ERROR                     (-5938L)
-
-/* Seek error */
-#define PR_FILE_SEEK_ERROR                       (-5937L)
-
-/* The file is busy */
-#define PR_FILE_IS_BUSY_ERROR                    (-5936L)
-
-/* The I/O operation was aborted */
-#define PR_OPERATION_ABORTED_ERROR               (-5935L)
-
-/* Operation is still in progress (probably a non-blocking connect) */
-#define PR_IN_PROGRESS_ERROR                     (-5934L)
-
-/* Operation has already been initiated (probably a non-blocking connect) */
-#define PR_ALREADY_INITIATED_ERROR               (-5933L)
-
-/* The wait group is empty */
-#define PR_GROUP_EMPTY_ERROR                     (-5932L)
-
-/* Object state improper for request */
-#define PR_INVALID_STATE_ERROR                   (-5931L)
-
-/* Network is down */
-#define PR_NETWORK_DOWN_ERROR                    (-5930L)
-
-/* Socket shutdown */
-#define PR_SOCKET_SHUTDOWN_ERROR                 (-5929L)
-
-/* Connection aborted */
-#define PR_CONNECT_ABORTED_ERROR                 (-5928L)
-
-/* Host is unreachable */
-#define PR_HOST_UNREACHABLE_ERROR                (-5927L)
-
-/* The library is not loaded */
-#define PR_LIBRARY_NOT_LOADED_ERROR              (-5926L)
-
-/* Placeholder for the end of the list */
-#define PR_MAX_ERROR                             (-5925L)
-
-extern void nspr_InitializePRErrorTable(void);
-#define ERROR_TABLE_BASE_nspr (-6000L)
-
-#endif /* prerr_h___ */
diff --git a/libs/js/nsprpub/pr/include/prerror.h b/libs/js/nsprpub/pr/include/prerror.h
deleted file mode 100644
index cf94872e30..0000000000
--- a/libs/js/nsprpub/pr/include/prerror.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prerror_h___
-#define prerror_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef PRInt32 PRErrorCode;
-
-#define PR_NSPR_ERROR_BASE -6000
-
-#include "prerr.h"
-
-/*
-** Set error will preserve an error condition within a thread context.
-** The values stored are the NSPR (platform independent) translation of
-** the error. Also, if available, the platform specific oserror is stored.
-** If there is no appropriate OS error number, a zero my be supplied.
-*/
-NSPR_API(void) PR_SetError(PRErrorCode errorCode, PRInt32 oserr);
-
-/*
-** The text value specified may be NULL. If it is not NULL and the text length
-** is zero, the string is assumed to be a null terminated C string. Otherwise
-** the text is assumed to be the length specified and possibly include NULL
-** characters (e.g., a multi-national string).
-**
-** The text will be copied into to thread structure and remain there
-** until the next call to PR_SetError.
-*/
-NSPR_API(void) PR_SetErrorText(
-    PRIntn textLength, const char *text);
-
-/*
-** Return the current threads last set error code.
-*/
-NSPR_API(PRErrorCode) PR_GetError(void);
-
-/*
-** Return the current threads last set os error code. This is used for
-** machine specific code that desires the underlying os error.
-*/
-NSPR_API(PRInt32) PR_GetOSError(void);
-
-/*
-** Get the length of the error text. If a zero is returned, then there
-** is no text. Otherwise, the value returned is sufficient to contain
-** the error text currently available.
-*/
-NSPR_API(PRInt32) PR_GetErrorTextLength(void);
-
-/*
-** Copy the current threads current error text. Then actual number of bytes
-** copied is returned as the result. If the result is zero, the 'text' area
-** is unaffected.
-*/
-NSPR_API(PRInt32) PR_GetErrorText(char *text);
-
-
-/*
-Copyright (C) 1987, 1988 Student Information Processing Board of the
-Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  M.I.T. and the M.I.T. S.I.P.B.
-make no representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-*/
-
-
-/*
- * NOTE:
- *		The interfaces for error-code-translation described in the rest of
- *		this file are preliminary in the 3.1 release of nspr and are subject 
- *		to change in future releases.
- */
-
-/*
-** Description:	Localizable error code to string function.
-**
-**
-** NSPR provides a mechanism for converting an error code to a
-** descriptive string, in a caller-specified language.
-**
-** Error codes themselves are 32 bit (signed) integers.  Typically,
-** the high order 24 bits are an identifier of which error table the
-** error code is from, and the low order 8 bits are a sequential error
-** number within the table.  NSPR supports error tables whose first
-** error code is not a multiple of 256, such error code assignments
-** should be avoided when possible.
-**
-** Error table 0 is defined to match the UNIX system call error table
-** (sys_errlist); this allows errno values to be used directly in the
-** library.  Other error table numbers are typically formed by
-** compacting together the first four characters of the error table
-** name.  The mapping between characters in the name and numeric
-** values in the error code are defined in a system-independent
-** fashion, so that two systems that can pass integral values between
-** them can reliably pass error codes without loss of meaning; this
-** should work even if the character sets used are not the
-** same. (However, if this is to be done, error table 0 should be
-** avoided, since the local system call error tables may differ.)
-**
-** Libraries defining error codes need only provide a table mapping
-** error code numbers to names and default English descriptions,
-** calling a routine to install the table, making it ``known'' to NSPR
-** library.  Once installed, a table may not be removed.  Any error
-** code the library generates can be converted to the corresponding
-** error message.  There is also a default format for error codes
-** accidentally returned before making the table known, which is of
-** the form "unknown code foo 32", where "foo" would be the name of
-** the table.
-**
-** Normally, the error code conversion routine only supports the
-** languages "i-default" and "en", returning the error-table-provided
-** English description for both languages.  The application may
-** provide a localization plugin, allowing support for additional
-** languages.
-**
-**/
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * PRLanguageCode --
- *
- *    NSPR represents a language code as a non-negative integer.
- *    Languages 0 is always "i-default" the language you get without
- *    explicit negotiation.  Language 1 is always "en", English
- *    which has been explicitly negotiated.  Additional language
- *    codes are defined by an application-provided localization plugin.
- */
-typedef PRUint32 PRLanguageCode;
-#define PR_LANGUAGE_I_DEFAULT 0 /* i-default, the default language */
-#define PR_LANGUAGE_EN 1 /* English, explicitly negotiated */
-
-/*
- * struct PRErrorMessage --
- *
- *    An error message in an error table.
- */
-struct PRErrorMessage {
-    const char * name;    /* Macro name for error */
-    const char * en_text; /* Default English text */
-};
-
-/*
- * struct PRErrorTable --
- *
- *    An error table, provided by a library.
- */
-struct PRErrorTable {
-    const struct PRErrorMessage * msgs; /* Array of error information */
-    const char *name; /* Name of error table source */
-    PRErrorCode base; /* Error code for first error in table */
-    int n_msgs; /* Number of codes in table */
-};
-
-/*
- * struct PRErrorCallbackPrivate --
- *
- *    A private structure for the localization plugin 
- */
-struct PRErrorCallbackPrivate;
-
-/*
- * struct PRErrorCallbackTablePrivate --
- *
- *    A data structure under which the localization plugin may store information,
- *    associated with an error table, that is private to itself.
- */
-struct PRErrorCallbackTablePrivate;
-
-/*
- * PRErrorCallbackLookupFn --
- *
- *    A function of PRErrorCallbackLookupFn type is a localization
- *    plugin callback which converts an error code into a description
- *    in the requested language.  The callback is provided the
- *    appropriate error table, private data for the plugin and the table.
- *    The callback returns the appropriate UTF-8 encoded description, or NULL
- *    if no description can be found.
- */
-typedef const char *
-PRErrorCallbackLookupFn(PRErrorCode code, PRLanguageCode language, 
-		   const struct PRErrorTable *table,
-		   struct PRErrorCallbackPrivate *cb_private,
-		   struct PRErrorCallbackTablePrivate *table_private);
-
-/*
- * PRErrorCallbackNewTableFn --
- *
- *    A function PRErrorCallbackNewTableFn type is a localization plugin
- *    callback which is called once with each error table registered
- *    with NSPR.  The callback is provided with the error table and
- *    the plugin's private structure.  The callback returns any table private
- *    data it wishes to associate with the error table.  Does not need to be thread
- *    safe.
- */
-typedef struct PRErrorCallbackTablePrivate *
-PRErrorCallbackNewTableFn(const struct PRErrorTable *table,
-			struct PRErrorCallbackPrivate *cb_private);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToString
-** DESCRIPTION:
-**  Returns the UTF-8 message for an error code in
-**  the requested language.  May return the message
-**  in the default language if a translation in the requested
-**  language is not available.  The returned string is
-**  valid for the duration of the process.  Never returns NULL.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToString(PRErrorCode code,
-    PRLanguageCode language);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToName
-** DESCRIPTION:
-**  Returns the macro name for an error code, or NULL
-**  if the error code is not known.  The returned string is
-**  valid for the duration of the process.
-**
-**  Does not work for error table 0, the system error codes.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToName(PRErrorCode code);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorLanguages
-** DESCRIPTION:
-**  Returns the RFC 1766 language tags for the language
-**  codes PR_ErrorToString() supports.  The returned array is valid
-**  for the duration of the process.  Never returns NULL.  The first
-**  item in the returned array is the language tag for PRLanguageCode 0,
-**  the second is for PRLanguageCode 1, and so on.  The array is terminated
-**  with a null pointer.
-**
-***********************************************************************/
-NSPR_API(const char * const *) PR_ErrorLanguages(void);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallTable
-** DESCRIPTION:
-**  Registers an error table with NSPR.  Must be done exactly once per
-**  table.  Memory pointed to by `table' must remain valid for the life
-**  of the process.
-**
-**  NOT THREAD SAFE!
-**  
-***********************************************************************/
-NSPR_API(PRErrorCode) PR_ErrorInstallTable(const struct PRErrorTable *table);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallCallback
-** DESCRIPTION:
-**  Registers an error localization plugin with NSPR.  May be called
-**  at most one time.  `languages' contains the language codes supported
-**  by this plugin.  Languages 0 and 1 must be "i-default" and "en"
-**  respectively.  `lookup' and `newtable' contain pointers to
-**  the plugin callback functions.  `cb_private' contains any information
-**  private to the plugin functions.
-**
-**  NOT THREAD SAFE!
-**
-***********************************************************************/
-NSPR_API(void) PR_ErrorInstallCallback(const char * const * languages,
-			      PRErrorCallbackLookupFn *lookup, 
-			      PRErrorCallbackNewTableFn *newtable,
-			      struct PRErrorCallbackPrivate *cb_private);
-
-PR_END_EXTERN_C
-
-#endif /* prerror_h___ */
diff --git a/libs/js/nsprpub/pr/include/prinet.h b/libs/js/nsprpub/pr/include/prinet.h
deleted file mode 100644
index 02dfef6fce..0000000000
--- a/libs/js/nsprpub/pr/include/prinet.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:		prinet.h
- * Description:
- *     Header file used to find the system header files for socket support.
- *     This file serves the following purposes:
- *     - A cross-platform, "get-everything" socket header file.  On
- *       Unix, socket support is scattered in several header files,
- *       while Windows and Mac have a "get-everything" socket header
- *       file.
- *     - NSPR needs the following macro definitions and function
- *       prototype declarations from these header files:
- *           AF_INET
- *           INADDR_ANY, INADDR_LOOPBACK, INADDR_BROADCAST
- *           ntohl(), ntohs(), htonl(), ntons().
- *       NSPR does not define its own versions of these macros and
- *       functions.  It simply uses the native versions, which have
- *       the same names on all supported platforms.
- *     This file is intended to be included by nspr20 public header
- *     files, such as prio.h.  One should not include this file directly.
- */
-
-#ifndef prinet_h__
-#define prinet_h__
-
-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-#include <sys/types.h>
-#include <sys/socket.h>		/* AF_INET */
-#include <netinet/in.h>         /* INADDR_ANY, ..., ntohl(), ... */
-#ifdef XP_OS2
-#include <sys/ioctl.h>
-#endif
-#ifdef XP_UNIX
-#ifdef AIX
-/*
- * On AIX 4.3, the header <arpa/inet.h> refers to struct
- * ether_addr and struct sockaddr_dl that are not declared.
- * The following struct declarations eliminate the compiler
- * warnings.
- */
-struct ether_addr;
-struct sockaddr_dl;
-#endif /* AIX */
-#include <arpa/inet.h>
-#endif /* XP_UNIX */
-#include <netdb.h>
-
-#if defined(FREEBSD) || defined(BSDI) || defined(QNX)
-#include <rpc/types.h> /* the only place that defines INADDR_LOOPBACK */
-#endif
-
-/*
- * OS/2 hack.  For some reason INADDR_LOOPBACK is not defined in the
- * socket headers.
- */
-#if defined(OS2) && !defined(INADDR_LOOPBACK)
-#define INADDR_LOOPBACK 0x7f000001
-#endif
-
-/*
- * Prototypes of ntohl() etc. are declared in <machine/endian.h>
- * on these platforms.
- */
-#if defined(BSDI) || defined(OSF1)
-#include <machine/endian.h>
-#endif
-
-#elif defined(WIN32)
-
-/* Do not include any system header files. */
-
-#elif defined(WIN16)
-
-#include <winsock.h>
-
-#elif defined(XP_MAC)
-
-#include "macsocket.h"
-
-#else
-
-#error Unknown platform
-
-#endif
-
-#endif /* prinet_h__ */
diff --git a/libs/js/nsprpub/pr/include/prinit.h b/libs/js/nsprpub/pr/include/prinit.h
deleted file mode 100644
index 1ea7c05b0c..0000000000
--- a/libs/js/nsprpub/pr/include/prinit.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prinit_h___
-#define prinit_h___
-
-#include "prthread.h"
-#include "prtypes.h"
-#include "prwin16.h"
-#include <stdio.h>
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-
-/*
-** NSPR's name, this should persist until at least the turn of the
-** century.
-*/
-#define PR_NAME     "NSPR"
-
-/*
-** NSPR's version is used to determine the likelihood that the version you
-** used to build your component is anywhere close to being compatible with
-** what is in the underlying library.
-**
-** The format of the version string is
-**     "<major version>.<minor version>[.<patch level>] [<Beta>]"
-*/
-#define PR_VERSION  "4.7 Beta"
-#define PR_VMAJOR   4
-#define PR_VMINOR   7
-#define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
-
-/*
-** PRVersionCheck
-**
-** The basic signature of the function that is called to provide version
-** checking. The result will be a boolean that indicates the likelihood
-** that the underling library will perform as the caller expects.
-**
-** The only argument is a string, which should be the verson identifier
-** of the library in question. That string will be compared against an
-** equivalent string that represents the actual build version of the
-** exporting library.
-**
-** The result will be the logical union of the directly called library
-** and all dependent libraries.
-*/
-
-typedef PRBool (*PRVersionCheck)(const char*);
-
-/*
-** PR_VersionCheck
-**
-** NSPR's existance proof of the version check function.
-**
-** Note that NSPR has no cooperating dependencies.
-*/
-
-NSPR_API(PRBool) PR_VersionCheck(const char *importedVersion);
-
-
-/************************************************************************/
-/*******************************INITIALIZATION***************************/
-/************************************************************************/
-
-/*
-** Initialize the runtime. Attach a thread object to the currently
-** executing native thread of type "type".
-**
-** The specificaiton of 'maxPTDs' is ignored.
-*/
-NSPR_API(void) PR_Init(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs);
-
-/*
-** And alternate form of initialization, one that may become the default if
-** not the only mechanism, provides a method to get the NSPR runtime init-
-** ialized and place NSPR between the caller and the runtime library. This
-** allows main() to be treated as any other thread root function, signalling
-** its compeletion by returning and allowing the runtime to coordinate the
-** completion of the other threads of the runtime.
-**
-** The priority of the main (or primordial) thread will be PR_PRIORITY_NORMAL.
-** The thread may adjust its own priority by using PR_SetPriority(), though
-** at this time the support for priorities is somewhat weak.
-**
-** The specificaiton of 'maxPTDs' is ignored.
-**
-** The value returned by PR_Initialize is the value returned from the root
-** function, 'prmain'.
-*/
-
-typedef PRIntn (PR_CALLBACK *PRPrimordialFn)(PRIntn argc, char **argv);
-
-NSPR_API(PRIntn) PR_Initialize(
-    PRPrimordialFn prmain, PRIntn argc, char **argv, PRUintn maxPTDs);
-
-/*
-** Return PR_TRUE if PR_Init has already been called.
-*/
-NSPR_API(PRBool) PR_Initialized(void);
-
-/*
- * Perform a graceful shutdown of NSPR.  PR_Cleanup() may be called by
- * the primordial thread near the end of the main() function.
- *
- * PR_Cleanup() attempts to synchronize the natural termination of
- * process.  It does that by blocking the caller, if and only if it is
- * the primordial thread, until the number of user threads has dropped
- * to zero.  When the primordial thread returns from main(), the process
- * will immediately and silently exit.  That is, it will (if necessary)
- * forcibly terminate any existing threads and exit without significant
- * blocking and there will be no error messages or core files.
- *
- * PR_Cleanup() returns PR_SUCCESS if NSPR is successfully shutdown,
- * or PR_FAILURE if the calling thread of this function is not the
- * primordial thread.
- */
-NSPR_API(PRStatus) PR_Cleanup(void);
-
-/*
-** Disable Interrupts
-**		Disables timer signals used for pre-emptive scheduling.
-*/
-NSPR_API(void) PR_DisableClockInterrupts(void);
-
-/*
-** Enables Interrupts
-**		Enables timer signals used for pre-emptive scheduling.
-*/
-NSPR_API(void) PR_EnableClockInterrupts(void);
-
-/*
-** Block Interrupts
-**		Blocks the timer signal used for pre-emptive scheduling
-*/
-NSPR_API(void) PR_BlockClockInterrupts(void);
-
-/*
-** Unblock Interrupts
-**		Unblocks the timer signal used for pre-emptive scheduling
-*/
-NSPR_API(void) PR_UnblockClockInterrupts(void);
-
-/*
-** Create extra virtual processor threads. Generally used with MP systems.
-*/
-NSPR_API(void) PR_SetConcurrency(PRUintn numCPUs);
-
-/*
-** Control the method and size of the file descriptor (PRFileDesc*)
-** cache used by the runtime. Setting 'high' to zero is for performance,
-** any other value probably for debugging (see memo on FD caching).
-*/
-NSPR_API(PRStatus) PR_SetFDCacheSize(PRIntn low, PRIntn high);
-
-/*
- * Cause an immediate, nongraceful, forced termination of the process.
- * It takes a PRIntn argument, which is the exit status code of the
- * process.
- */
-NSPR_API(void) PR_ProcessExit(PRIntn status);
-
-/*
-** Abort the process in a non-graceful manner. This will cause a core file,
-** call to the debugger or other moral equivalent as well as causing the
-** entire process to stop.
-*/
-NSPR_API(void) PR_Abort(void);
-
-/*
- ****************************************************************
- *
- * Module initialization:
- *
- ****************************************************************
- */
-
-typedef struct PRCallOnceType {
-    PRIntn initialized;
-    PRInt32 inProgress;
-    PRStatus status;
-} PRCallOnceType;
-
-typedef PRStatus (PR_CALLBACK *PRCallOnceFN)(void);
-
-typedef PRStatus (PR_CALLBACK *PRCallOnceWithArgFN)(void *arg);
-
-NSPR_API(PRStatus) PR_CallOnce(
-    PRCallOnceType *once,
-    PRCallOnceFN    func
-);
-
-NSPR_API(PRStatus) PR_CallOnceWithArg(
-    PRCallOnceType      *once,
-    PRCallOnceWithArgFN  func,
-    void                *arg
-);
-
-
-PR_END_EXTERN_C
-
-#endif /* prinit_h___ */
diff --git a/libs/js/nsprpub/pr/include/prinrval.h b/libs/js/nsprpub/pr/include/prinrval.h
deleted file mode 100644
index 9d9d0189b3..0000000000
--- a/libs/js/nsprpub/pr/include/prinrval.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:		prinrval.h
-** Description:	API to interval timing functions of NSPR.
-**
-**
-** NSPR provides interval times that are independent of network time
-** of day values. Interval times are (in theory) accurate regardless
-** of host processing requirements and also very cheap to acquire. It
-** is expected that getting an interval time while in a synchronized
-** function (holding one's lock).
-**/
-
-#if !defined(prinrval_h)
-#define prinrval_h
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-typedef PRUint32 PRIntervalTime;
-
-/***********************************************************************
-** DEFINES:     PR_INTERVAL_MIN
-**              PR_INTERVAL_MAX
-** DESCRIPTION:
-**  These two constants define the range (in ticks / second) of the
-**  platform dependent type, PRIntervalTime. These constants bound both
-**  the period and the resolution of a PRIntervalTime. 
-***********************************************************************/
-#define PR_INTERVAL_MIN 1000UL
-#define PR_INTERVAL_MAX 100000UL
-
-/***********************************************************************
-** DEFINES:     PR_INTERVAL_NO_WAIT
-**              PR_INTERVAL_NO_TIMEOUT
-** DESCRIPTION:
-**  Two reserved constants are defined in the PRIntervalTime namespace.
-**  They are used to indicate that the process should wait no time (return
-**  immediately) or wait forever (never time out), respectively.
-***********************************************************************/
-#define PR_INTERVAL_NO_WAIT 0UL
-#define PR_INTERVAL_NO_TIMEOUT 0xffffffffUL
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_IntervalNow
-** DESCRIPTION:
-**  Return the value of NSPR's free running interval timer. That timer
-**  can be used to establish epochs and determine intervals (be computing
-**  the difference between two times).
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRIntervalTime
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  The units of PRIntervalTime are platform dependent. They are chosen
-**  such that they are appropriate for the host OS, yet provide sufficient
-**  resolution and period to be useful to clients. 
-** MEMORY:      N/A
-** ALGORITHM:   Platform dependent
-***********************************************************************/
-NSPR_API(PRIntervalTime) PR_IntervalNow(void);
-
-/***********************************************************************
-** FUNCTION:    PR_TicksPerSecond
-** DESCRIPTION:
-**  Return the number of ticks per second for PR_IntervalNow's clock.
-**  The value will be in the range [PR_INTERVAL_MIN..PR_INTERVAL_MAX].
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRUint32
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  None
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRUint32) PR_TicksPerSecond(void);
-
-/***********************************************************************
-** FUNCTION:    PR_SecondsToInterval
-**              PR_MillisecondsToInterval
-**              PR_MicrosecondsToInterval
-** DESCRIPTION:
-**  Convert standard clock units to platform dependent intervals.
-** INPUTS:      PRUint32
-** OUTPUTS:     void
-** RETURN:      PRIntervalTime
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  Conversion may cause overflow, which is not reported.
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRIntervalTime) PR_SecondsToInterval(PRUint32 seconds);
-NSPR_API(PRIntervalTime) PR_MillisecondsToInterval(PRUint32 milli);
-NSPR_API(PRIntervalTime) PR_MicrosecondsToInterval(PRUint32 micro);
-
-/***********************************************************************
-** FUNCTION:    PR_IntervalToSeconds
-**              PR_IntervalToMilliseconds
-**              PR_IntervalToMicroseconds
-** DESCRIPTION:
-**  Convert platform dependent intervals to standard clock units.
-** INPUTS:      PRIntervalTime
-** OUTPUTS:     void
-** RETURN:      PRUint32
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  Conversion may cause overflow, which is not reported.
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRUint32) PR_IntervalToSeconds(PRIntervalTime ticks);
-NSPR_API(PRUint32) PR_IntervalToMilliseconds(PRIntervalTime ticks);
-NSPR_API(PRUint32) PR_IntervalToMicroseconds(PRIntervalTime ticks);
-
-PR_END_EXTERN_C
-
-
-#endif /* !defined(prinrval_h) */
-
-/* prinrval.h */
diff --git a/libs/js/nsprpub/pr/include/prio.h b/libs/js/nsprpub/pr/include/prio.h
deleted file mode 100644
index 626d860dc4..0000000000
--- a/libs/js/nsprpub/pr/include/prio.h
+++ /dev/null
@@ -1,2030 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:     prio.h
- *
- * Description:    PR i/o related stuff, such as file system access, file
- *         i/o, socket i/o, etc.
- */
-
-#ifndef prio_h___
-#define prio_h___
-
-#include "prlong.h"
-#include "prtime.h"
-#include "prinrval.h"
-#include "prinet.h"
-
-PR_BEGIN_EXTERN_C
-
-/* Typedefs */
-typedef struct PRDir            PRDir;
-typedef struct PRDirEntry       PRDirEntry;
-#ifdef MOZ_UNICODE
-typedef struct PRDirUTF16       PRDirUTF16;
-typedef struct PRDirEntryUTF16  PRDirEntryUTF16;
-#endif /* MOZ_UNICODE */
-typedef struct PRFileDesc       PRFileDesc;
-typedef struct PRFileInfo       PRFileInfo;
-typedef struct PRFileInfo64     PRFileInfo64;
-typedef union  PRNetAddr        PRNetAddr;
-typedef struct PRIOMethods      PRIOMethods;
-typedef struct PRPollDesc       PRPollDesc;
-typedef struct PRFilePrivate    PRFilePrivate;
-typedef struct PRSendFileData   PRSendFileData;
-
-/*
-***************************************************************************
-** The file descriptor.
-** This is the primary structure to represent any active open socket,
-** whether it be a normal file or a network connection. Such objects
-** are stackable (or layerable). Each layer may have its own set of
-** method pointers and context private to that layer. All each layer
-** knows about its neighbors is how to get to their method table.
-***************************************************************************
-*/
-
-typedef PRIntn PRDescIdentity;          /* see: Layering file descriptors */
-
-struct PRFileDesc {
-    const PRIOMethods *methods;         /* the I/O methods table */
-    PRFilePrivate *secret;              /* layer dependent data */
-    PRFileDesc *lower, *higher;         /* pointers to adjacent layers */
-    void (PR_CALLBACK *dtor)(PRFileDesc *fd);
-                                        /* A destructor function for layer */
-    PRDescIdentity identity;            /* Identity of this particular layer  */
-};
-
-/*
-***************************************************************************
-** PRTransmitFileFlags
-**
-** Flags for PR_TransmitFile.  Pass PR_TRANSMITFILE_CLOSE_SOCKET to
-** PR_TransmitFile if the connection should be closed after the file
-** is transmitted.
-***************************************************************************
-*/
-typedef enum PRTransmitFileFlags {
-    PR_TRANSMITFILE_KEEP_OPEN = 0,    /* socket is left open after file
-                                       * is transmitted. */
-    PR_TRANSMITFILE_CLOSE_SOCKET = 1  /* socket is closed after file
-                                       * is transmitted. */
-} PRTransmitFileFlags;
-
-/*
-**************************************************************************
-** Macros for PRNetAddr
-**
-** Address families: PR_AF_INET, PR_AF_INET6, PR_AF_LOCAL
-** IP addresses: PR_INADDR_ANY, PR_INADDR_LOOPBACK, PR_INADDR_BROADCAST
-**************************************************************************
-*/
-
-#ifdef WIN32
-
-#define PR_AF_INET 2
-#define PR_AF_LOCAL 1
-#define PR_INADDR_ANY (unsigned long)0x00000000
-#define PR_INADDR_LOOPBACK 0x7f000001
-#define PR_INADDR_BROADCAST (unsigned long)0xffffffff
-
-#else /* WIN32 */
-
-#define PR_AF_INET AF_INET
-#define PR_AF_LOCAL AF_UNIX
-#define PR_INADDR_ANY INADDR_ANY
-#define PR_INADDR_LOOPBACK INADDR_LOOPBACK
-#define PR_INADDR_BROADCAST INADDR_BROADCAST
-
-#endif /* WIN32 */
-
-/*
-** Define PR_AF_INET6 in prcpucfg.h with the same
-** value as AF_INET6 on platforms with IPv6 support.
-** Otherwise define it here.
-*/
-#ifndef PR_AF_INET6
-#define PR_AF_INET6 100
-#endif
-
-#ifndef PR_AF_UNSPEC
-#define PR_AF_UNSPEC 0
-#endif
-
-/*
-**************************************************************************
-** A network address
-**
-** Only Internet Protocol (IPv4 and IPv6) addresses are supported.
-** The address family must always represent IPv4 (AF_INET, probably == 2)
-** or IPv6 (AF_INET6).
-**************************************************************************
-*************************************************************************/
-
-struct PRIPv6Addr {
-	union {
-		PRUint8  _S6_u8[16];
-		PRUint16 _S6_u16[8];
-		PRUint32 _S6_u32[4];
-		PRUint64 _S6_u64[2];
-	} _S6_un;
-};
-#define pr_s6_addr		_S6_un._S6_u8
-#define pr_s6_addr16	_S6_un._S6_u16
-#define pr_s6_addr32	_S6_un._S6_u32
-#define pr_s6_addr64 	_S6_un._S6_u64
-
-typedef struct PRIPv6Addr PRIPv6Addr;
-
-union PRNetAddr {
-    struct {
-        PRUint16 family;                /* address family (0x00ff maskable) */
-#ifdef XP_BEOS
-        char data[10];                  /* Be has a smaller structure */
-#else
-        char data[14];                  /* raw address data */
-#endif
-    } raw;
-    struct {
-        PRUint16 family;                /* address family (AF_INET) */
-        PRUint16 port;                  /* port number */
-        PRUint32 ip;                    /* The actual 32 bits of address */
-#ifdef XP_BEOS
-        char pad[4];                    /* Be has a smaller structure */
-#else
-        char pad[8];
-#endif
-    } inet;
-    struct {
-        PRUint16 family;                /* address family (AF_INET6) */
-        PRUint16 port;                  /* port number */
-        PRUint32 flowinfo;              /* routing information */
-        PRIPv6Addr ip;                  /* the actual 128 bits of address */
-        PRUint32 scope_id;              /* set of interfaces for a scope */
-    } ipv6;
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-    struct {                            /* Unix domain socket address */
-        PRUint16 family;                /* address family (AF_UNIX) */
-#ifdef XP_OS2
-        char path[108];                 /* null-terminated pathname */
-                                        /* bind fails if size is not 108. */
-#else
-        char path[104];                 /* null-terminated pathname */
-#endif
-    } local;
-#endif
-};
-
-/*
-***************************************************************************
-** PRSockOption
-**
-** The file descriptors can have predefined options set after they file
-** descriptor is created to change their behavior. Only the options in
-** the following enumeration are supported.
-***************************************************************************
-*/
-typedef enum PRSockOption
-{
-    PR_SockOpt_Nonblocking,     /* nonblocking io */
-    PR_SockOpt_Linger,          /* linger on close if data present */
-    PR_SockOpt_Reuseaddr,       /* allow local address reuse */
-    PR_SockOpt_Keepalive,       /* keep connections alive */
-    PR_SockOpt_RecvBufferSize,  /* send buffer size */
-    PR_SockOpt_SendBufferSize,  /* receive buffer size */
-
-    PR_SockOpt_IpTimeToLive,    /* time to live */
-    PR_SockOpt_IpTypeOfService, /* type of service and precedence */
-
-    PR_SockOpt_AddMember,       /* add an IP group membership */
-    PR_SockOpt_DropMember,      /* drop an IP group membership */
-    PR_SockOpt_McastInterface,  /* multicast interface address */
-    PR_SockOpt_McastTimeToLive, /* multicast timetolive */
-    PR_SockOpt_McastLoopback,   /* multicast loopback */
-
-    PR_SockOpt_NoDelay,         /* don't delay send to coalesce packets */
-    PR_SockOpt_MaxSegment,      /* maximum segment size */
-    PR_SockOpt_Broadcast,       /* enable broadcast */
-    PR_SockOpt_Last
-} PRSockOption;
-
-typedef struct PRLinger {
-	PRBool polarity;		    /* Polarity of the option's setting */
-	PRIntervalTime linger;	    /* Time to linger before closing */
-} PRLinger;
-
-typedef struct PRMcastRequest {
-	PRNetAddr mcaddr;			/* IP multicast address of group */
-	PRNetAddr ifaddr;			/* local IP address of interface */
-} PRMcastRequest;
-
-typedef struct PRSocketOptionData
-{
-    PRSockOption option;
-    union
-    {
-        PRUintn ip_ttl;             /* IP time to live */
-        PRUintn mcast_ttl;          /* IP multicast time to live */
-        PRUintn tos;                /* IP type of service and precedence */
-        PRBool non_blocking;        /* Non-blocking (network) I/O */
-        PRBool reuse_addr;          /* Allow local address reuse */
-        PRBool keep_alive;          /* Keep connections alive */
-        PRBool mcast_loopback;      /* IP multicast loopback */
-        PRBool no_delay;            /* Don't delay send to coalesce packets */
-        PRBool broadcast;           /* Enable broadcast */
-        PRSize max_segment;         /* Maximum segment size */
-        PRSize recv_buffer_size;    /* Receive buffer size */
-        PRSize send_buffer_size;    /* Send buffer size */
-        PRLinger linger;            /* Time to linger on close if data present */
-        PRMcastRequest add_member;  /* add an IP group membership */
-        PRMcastRequest drop_member; /* Drop an IP group membership */
-        PRNetAddr mcast_if;         /* multicast interface address */
-    } value;
-} PRSocketOptionData;
-
-/*
-***************************************************************************
-** PRIOVec
-**
-** The I/O vector is used by the write vector method to describe the areas
-** that are affected by the ouput operation.
-***************************************************************************
-*/
-typedef struct PRIOVec {
-    char *iov_base;
-    int iov_len;
-} PRIOVec;
-
-/*
-***************************************************************************
-** Discover what type of socket is being described by the file descriptor.
-***************************************************************************
-*/
-typedef enum PRDescType
-{
-    PR_DESC_FILE = 1,
-    PR_DESC_SOCKET_TCP = 2,
-    PR_DESC_SOCKET_UDP = 3,
-    PR_DESC_LAYERED = 4,
-    PR_DESC_PIPE = 5
-} PRDescType;
-
-typedef enum PRSeekWhence {
-    PR_SEEK_SET = 0,
-    PR_SEEK_CUR = 1,
-    PR_SEEK_END = 2
-} PRSeekWhence;
-
-NSPR_API(PRDescType) PR_GetDescType(PRFileDesc *file);
-
-/*
-***************************************************************************
-** PRIOMethods
-**
-** The I/O methods table provides procedural access to the functions of
-** the file descriptor. It is the responsibility of a layer implementor
-** to provide suitable functions at every entry point. If a layer provides
-** no functionality, it should call the next lower(higher) function of the
-** same name (e.g., return fd->lower->method->close(fd->lower));
-**
-** Not all functions are implemented for all types of files. In cases where
-** that is true, the function will return a error indication with an error
-** code of PR_INVALID_METHOD_ERROR.
-***************************************************************************
-*/
-
-typedef PRStatus (PR_CALLBACK *PRCloseFN)(PRFileDesc *fd);
-typedef PRInt32 (PR_CALLBACK *PRReadFN)(PRFileDesc *fd, void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRWriteFN)(PRFileDesc *fd, const void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRAvailableFN)(PRFileDesc *fd);
-typedef PRInt64 (PR_CALLBACK *PRAvailable64FN)(PRFileDesc *fd);
-typedef PRStatus (PR_CALLBACK *PRFsyncFN)(PRFileDesc *fd);
-typedef PROffset32 (PR_CALLBACK *PRSeekFN)(PRFileDesc *fd, PROffset32 offset, PRSeekWhence how);
-typedef PROffset64 (PR_CALLBACK *PRSeek64FN)(PRFileDesc *fd, PROffset64 offset, PRSeekWhence how);
-typedef PRStatus (PR_CALLBACK *PRFileInfoFN)(PRFileDesc *fd, PRFileInfo *info);
-typedef PRStatus (PR_CALLBACK *PRFileInfo64FN)(PRFileDesc *fd, PRFileInfo64 *info);
-typedef PRInt32 (PR_CALLBACK *PRWritevFN)(
-    PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-    PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRConnectFN)(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRFileDesc* (PR_CALLBACK *PRAcceptFN) (
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRBindFN)(PRFileDesc *fd, const PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRListenFN)(PRFileDesc *fd, PRIntn backlog);
-typedef PRStatus (PR_CALLBACK *PRShutdownFN)(PRFileDesc *fd, PRIntn how);
-typedef PRInt32 (PR_CALLBACK *PRRecvFN)(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRSendFN) (
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRRecvfromFN)(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRSendtoFN)(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, const PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRInt16 (PR_CALLBACK *PRPollFN)(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags);
-typedef PRInt32 (PR_CALLBACK *PRAcceptreadFN)(
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
-    void *buf, PRInt32 amount, PRIntervalTime t);
-typedef PRInt32 (PR_CALLBACK *PRTransmitfileFN)(
-     PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-     PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime t);
-typedef PRStatus (PR_CALLBACK *PRGetsocknameFN)(PRFileDesc *fd, PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRGetpeernameFN)(PRFileDesc *fd, PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRGetsocketoptionFN)(
-    PRFileDesc *fd, PRSocketOptionData *data);
-typedef PRStatus (PR_CALLBACK *PRSetsocketoptionFN)(
-    PRFileDesc *fd, const PRSocketOptionData *data);
-typedef PRInt32 (PR_CALLBACK *PRSendfileFN)(
-	PRFileDesc *networkSocket, PRSendFileData *sendData,
-	PRTransmitFileFlags flags, PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRConnectcontinueFN)(
-    PRFileDesc *fd, PRInt16 out_flags);
-typedef PRIntn (PR_CALLBACK *PRReservedFN)(PRFileDesc *fd);
-
-struct PRIOMethods {
-    PRDescType file_type;           /* Type of file represented (tos)           */
-    PRCloseFN close;                /* close file and destroy descriptor        */
-    PRReadFN read;                  /* read up to specified bytes into buffer   */
-    PRWriteFN write;                /* write specified bytes from buffer        */
-    PRAvailableFN available;        /* determine number of bytes available      */
-    PRAvailable64FN available64;    /*          ditto, 64 bit                   */
-    PRFsyncFN fsync;                /* flush all buffers to permanent store     */
-    PRSeekFN seek;                  /* position the file to the desired place   */
-    PRSeek64FN seek64;              /*           ditto, 64 bit                  */
-    PRFileInfoFN fileInfo;          /* Get information about an open file       */
-    PRFileInfo64FN fileInfo64;      /*           ditto, 64 bit                  */
-    PRWritevFN writev;              /* Write segments as described by iovector  */
-    PRConnectFN connect;            /* Connect to the specified (net) address   */
-    PRAcceptFN accept;              /* Accept a connection for a (net) peer     */
-    PRBindFN bind;                  /* Associate a (net) address with the fd    */
-    PRListenFN listen;              /* Prepare to listen for (net) connections  */
-    PRShutdownFN shutdown;          /* Shutdown a (net) connection              */
-    PRRecvFN recv;                  /* Solicit up the the specified bytes       */
-    PRSendFN send;                  /* Send all the bytes specified             */
-    PRRecvfromFN recvfrom;          /* Solicit (net) bytes and report source    */
-    PRSendtoFN sendto;              /* Send bytes to (net) address specified    */
-    PRPollFN poll;                  /* Test the fd to see if it is ready        */
-    PRAcceptreadFN acceptread;      /* Accept and read on a new (net) fd        */
-    PRTransmitfileFN transmitfile;  /* Transmit at entire file                  */
-    PRGetsocknameFN getsockname;    /* Get (net) address associated with fd     */
-    PRGetpeernameFN getpeername;    /* Get peer's (net) address                 */
-    PRReservedFN reserved_fn_6;     /* reserved for future use */
-    PRReservedFN reserved_fn_5;     /* reserved for future use */
-    PRGetsocketoptionFN getsocketoption;
-                                    /* Get current setting of specified option  */
-    PRSetsocketoptionFN setsocketoption;
-                                    /* Set value of specified option            */
-    PRSendfileFN sendfile;			/* Send a (partial) file with header/trailer*/
-    PRConnectcontinueFN connectcontinue;
-                                    /* Continue a nonblocking connect */
-    PRReservedFN reserved_fn_3;		/* reserved for future use */
-    PRReservedFN reserved_fn_2;		/* reserved for future use */
-    PRReservedFN reserved_fn_1;		/* reserved for future use */
-    PRReservedFN reserved_fn_0;		/* reserved for future use */
-};
-
-/*
- **************************************************************************
- * FUNCTION: PR_GetSpecialFD
- * DESCRIPTION: Get the file descriptor that represents the standard input,
- *              output, or error stream.
- * INPUTS:
- *     PRSpecialFD id
- *         A value indicating the type of stream desired:
- *             PR_StandardInput: standard input
- *             PR_StandardOuput: standard output
- *             PR_StandardError: standard error
- * OUTPUTS: none
- * RETURNS: PRFileDesc *
- *     If the argument is valid, PR_GetSpecialFD returns a file descriptor
- *     that represents the corresponding standard I/O stream.  Otherwise,
- *     PR_GetSpecialFD returns NULL and sets error PR_INVALID_ARGUMENT_ERROR.
- **************************************************************************
- */
-
-typedef enum PRSpecialFD
-{
-    PR_StandardInput,          /* standard input */
-    PR_StandardOutput,         /* standard output */
-    PR_StandardError           /* standard error */
-} PRSpecialFD;
-
-NSPR_API(PRFileDesc*) PR_GetSpecialFD(PRSpecialFD id);
-
-#define PR_STDIN	PR_GetSpecialFD(PR_StandardInput)
-#define PR_STDOUT	PR_GetSpecialFD(PR_StandardOutput)
-#define PR_STDERR	PR_GetSpecialFD(PR_StandardError)
-
-/*
- **************************************************************************
- * Layering file descriptors
- *
- * File descriptors may be layered. Each layer has it's own identity.
- * Identities are allocated by the runtime and are to be associated
- * (by the layer implementor) with all layers that are of that type.
- * It is then possible to scan the chain of layers and find a layer
- * that one recongizes and therefore predict that it will implement
- * a desired protocol.
- *
- * There are three well-known identities:
- *      PR_INVALID_IO_LAYER => an invalid layer identity, for error return
- *      PR_TOP_IO_LAYER     => the identity of the top of the stack
- *      PR_NSPR_IO_LAYER    => the identity used by NSPR proper
- * PR_TOP_IO_LAYER may be used as a shorthand for identifying the topmost
- * layer of an existing stack. Ie., the following two constructs are
- * equivalent.
- *
- *      rv = PR_PushIOLayer(stack, PR_TOP_IO_LAYER, my_layer);
- *      rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), my_layer)
- *
- * A string may be associated with the creation of the identity. It
- * will be copied by the runtime. If queried the runtime will return
- * a reference to that copied string (not yet another copy). There
- * is no facility for deleting an identity.
- **************************************************************************
- */
-
-#define PR_IO_LAYER_HEAD (PRDescIdentity)-3
-#define PR_INVALID_IO_LAYER (PRDescIdentity)-1
-#define PR_TOP_IO_LAYER (PRDescIdentity)-2
-#define PR_NSPR_IO_LAYER (PRDescIdentity)0
-
-NSPR_API(PRDescIdentity) PR_GetUniqueIdentity(const char *layer_name);
-NSPR_API(const char*) PR_GetNameForIdentity(PRDescIdentity ident);
-NSPR_API(PRDescIdentity) PR_GetLayersIdentity(PRFileDesc* fd);
-NSPR_API(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* fd_stack, PRDescIdentity id);
-
-/*
- **************************************************************************
- * PR_GetDefaultIOMethods: Accessing the default methods table.
- * You may get a pointer to the default methods table by calling this function.
- * You may then select any elements from that table with which to build your
- * layer's methods table. You may NOT modify the table directly.
- **************************************************************************
- */
-NSPR_API(const PRIOMethods *) PR_GetDefaultIOMethods(void);
-
-/*
- **************************************************************************
- * Creating a layer
- *
- * A new layer may be allocated by calling PR_CreateIOLayerStub(). The
- * file descriptor returned will contain the pointer to the methods table
- * provided. The runtime will not modify the table nor test its correctness.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_CreateIOLayerStub(
-    PRDescIdentity ident, const PRIOMethods *methods);
-
-/*
- **************************************************************************
- * Creating a layer
- *
- * A new stack may be created by calling PR_CreateIOLayer(). The
- * file descriptor returned will point to the top of the stack, which has
- * the layer 'fd' as the topmost layer.
- * 
- * NOTE: This function creates a new style stack, which has a fixed, dummy
- * header. The old style stack, created by a call to PR_PushIOLayer,
- * results in modifying contents of the top layer of the stack, when
- * pushing and popping layers of the stack.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_CreateIOLayer(PRFileDesc* fd);
-
-/*
- **************************************************************************
- * Pushing a layer
- *
- * A file descriptor (perhaps allocated using PR_CreateIOLayerStub()) may
- * be pushed into an existing stack of file descriptors at any point the
- * caller deems appropriate. The new layer will be inserted into the stack
- * just above the layer with the indicated identity.
- *
- * Note: Even if the identity parameter indicates the top-most layer of
- * the stack, the value of the file descriptor describing the original
- * stack will not change.
- **************************************************************************
- */
-NSPR_API(PRStatus) PR_PushIOLayer(
-    PRFileDesc *fd_stack, PRDescIdentity id, PRFileDesc *layer);
-
-/*
- **************************************************************************
- * Popping a layer
- *
- * A layer may be popped from a stack by indicating the identity of the
- * layer to be removed. If found, a pointer to the removed object will
- * be returned to the caller. The object then becomes the responsibility
- * of the caller.
- *
- * Note: Even if the identity indicates the top layer of the stack, the
- * reference returned will not be the file descriptor for the stack and
- * that file descriptor will remain valid.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_PopIOLayer(PRFileDesc *fd_stack, PRDescIdentity id);
-
-/*
- **************************************************************************
- * FUNCTION:    PR_Open
- * DESCRIPTION:    Open a file for reading, writing, or both.
- * INPUTS:
- *     const char *name
- *         The path name of the file to be opened
- *     PRIntn flags
- *         The file status flags.
- *         It is a bitwise OR of the following bit flags (only one of
- *         the first three flags below may be used):
- *		PR_RDONLY        Open for reading only.
- *		PR_WRONLY        Open for writing only.
- *		PR_RDWR          Open for reading and writing.
- *		PR_CREATE_FILE   If the file does not exist, the file is created
- *                              If the file exists, this flag has no effect.
- *      PR_SYNC          If set, each write will wait for both the file data
- *                              and file status to be physically updated.
- *		PR_APPEND        The file pointer is set to the end of
- *                              the file prior to each write.
- *		PR_TRUNCATE      If the file exists, its length is truncated to 0.
- *      PR_EXCL          With PR_CREATE_FILE, if the file does not exist,
- *                              the file is created. If the file already 
- *                              exists, no action and NULL is returned
- *
- *     PRIntn mode
- *         The access permission bits of the file mode, if the file is
- *         created when PR_CREATE_FILE is on.
- * OUTPUTS:    None
- * RETURNS:    PRFileDesc *
- *     If the file is successfully opened,
- *     returns a pointer to the PRFileDesc
- *     created for the newly opened file.
- *     Returns a NULL pointer if the open
- *     failed.
- * SIDE EFFECTS:
- * RESTRICTIONS:
- * MEMORY:
- *     The return value, if not NULL, points to a dynamically allocated
- *     PRFileDesc object.
- * ALGORITHM:
- **************************************************************************
- */
-
-/* Open flags */
-#define PR_RDONLY       0x01
-#define PR_WRONLY       0x02
-#define PR_RDWR         0x04
-#define PR_CREATE_FILE  0x08
-#define PR_APPEND       0x10
-#define PR_TRUNCATE     0x20
-#define PR_SYNC         0x40
-#define PR_EXCL         0x80
-
-/*
-** File modes ....
-**
-** CAVEAT: 'mode' is currently only applicable on UNIX platforms.
-** The 'mode' argument may be ignored by PR_Open on other platforms.
-**
-**   00400   Read by owner.
-**   00200   Write by owner.
-**   00100   Execute (search if a directory) by owner.
-**   00040   Read by group.
-**   00020   Write by group.
-**   00010   Execute by group.
-**   00004   Read by others.
-**   00002   Write by others
-**   00001   Execute by others.
-**
-*/
-
-NSPR_API(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode);
-
-/*
- **************************************************************************
- * FUNCTION: PR_OpenFile
- * DESCRIPTION:
- *     Open a file for reading, writing, or both.
- *     PR_OpenFile has the same prototype as PR_Open but implements
- *     the specified file mode where possible.
- **************************************************************************
- */
-
-/* File mode bits */
-#define PR_IRWXU 00700  /* read, write, execute/search by owner */
-#define PR_IRUSR 00400  /* read permission, owner */
-#define PR_IWUSR 00200  /* write permission, owner */
-#define PR_IXUSR 00100  /* execute/search permission, owner */
-#define PR_IRWXG 00070  /* read, write, execute/search by group */
-#define PR_IRGRP 00040  /* read permission, group */
-#define PR_IWGRP 00020  /* write permission, group */
-#define PR_IXGRP 00010  /* execute/search permission, group */
-#define PR_IRWXO 00007  /* read, write, execute/search by others */
-#define PR_IROTH 00004  /* read permission, others */
-#define PR_IWOTH 00002  /* write permission, others */
-#define PR_IXOTH 00001  /* execute/search permission, others */
-
-NSPR_API(PRFileDesc*) PR_OpenFile(
-    const char *name, PRIntn flags, PRIntn mode);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode);
-#endif /* MOZ_UNICODE */
-
-/*
- **************************************************************************
- * FUNCTION: PR_Close
- * DESCRIPTION:
- *     Close a file or socket.
- * INPUTS:
- *     PRFileDesc *fd
- *         a pointer to a PRFileDesc.
- * OUTPUTS:
- *     None.
- * RETURN:
- *     PRStatus
- * SIDE EFFECTS:
- * RESTRICTIONS:
- *     None.
- * MEMORY:
- *     The dynamic memory pointed to by the argument fd is freed.
- **************************************************************************
- */
-
-NSPR_API(PRStatus)    PR_Close(PRFileDesc *fd);
-
-/*
- **************************************************************************
- * FUNCTION: PR_Read
- * DESCRIPTION:
- *     Read bytes from a file or socket.
- *     The operation will block until either an end of stream indication is
- *     encountered, some positive number of bytes are transferred, or there
- *     is an error. No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *         pointer to the PRFileDesc object for the file or socket
- *     void *buf
- *         pointer to a buffer to hold the data read in.
- *     PRInt32 amount
- *         the size of 'buf' (in bytes)
- * OUTPUTS:
- * RETURN:
- *     PRInt32
- *         a positive number indicates the number of bytes actually read in.
- *         0 means end of file is reached or the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- * SIDE EFFECTS:
- *     data is written into the buffer pointed to by 'buf'.
- * RESTRICTIONS:
- *     None.
- * MEMORY:
- *     N/A
- * ALGORITHM:
- *     N/A
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Read(PRFileDesc *fd, void *buf, PRInt32 amount);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Write
- * DESCRIPTION:
- *     Write a specified number of bytes to a file or socket.  The thread
- *     invoking this function blocks until all the data is written.
- * INPUTS:
- *     PRFileDesc *fd
- *         pointer to a PRFileDesc object that refers to a file or socket
- *     const void *buf
- *         pointer to the buffer holding the data
- *     PRInt32 amount
- *         amount of data in bytes to be written from the buffer
- * OUTPUTS:
- *     None.
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully written.
- *     A -1 is an indication that the operation failed. The reason
- *     for the failure is obtained by calling PR_GetError().
- ***************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Write(PRFileDesc *fd,const void *buf,PRInt32 amount);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Writev
- * DESCRIPTION:
- *     Write data to a socket.  The data is organized in a PRIOVec array. The
- *     operation will block until all the data is written or the operation
- *     fails.
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer that points to a PRFileDesc object for a socket.
- *     const PRIOVec *iov
- *         An array of PRIOVec.  PRIOVec is a struct with the following
- *         two fields:
- *             char *iov_base;
- *             int iov_len;
- *     PRInt32 iov_size
- *         Number of elements in the iov array. The value of this
- *         argument must not be greater than PR_MAX_IOVECTOR_SIZE.
- *         If it is, the method will fail (PR_BUFFER_OVERFLOW_ERROR).
- *     PRIntervalTime timeout
- *       Time limit for completion of the entire write operation.
- * OUTPUTS:
- *     None
- * RETURN:
- *     A positive number indicates the number of bytes successfully written.
- *     A -1 is an indication that the operation failed. The reason
- *     for the failure is obtained by calling PR_GetError().
- ***************************************************************************
- */
-
-#define PR_MAX_IOVECTOR_SIZE 16   /* 'iov_size' must be <= */
-
-NSPR_API(PRInt32) PR_Writev(
-    PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-    PRIntervalTime timeout);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Delete
- * DESCRIPTION:
- *     Delete a file from the filesystem. The operation may fail if the
- *     file is open.
- * INPUTS:
- *     const char *name
- *         Path name of the file to be deleted.
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- *     The function returns PR_SUCCESS if the file is successfully
- *     deleted, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Delete(const char *name);
-
-/**************************************************************************/
-
-typedef enum PRFileType
-{
-    PR_FILE_FILE = 1,
-    PR_FILE_DIRECTORY = 2,
-    PR_FILE_OTHER = 3
-} PRFileType;
-
-struct PRFileInfo {
-    PRFileType type;        /* Type of file */
-    PROffset32 size;        /* Size, in bytes, of file's contents */
-    PRTime creationTime;    /* Creation time per definition of PRTime */
-    PRTime modifyTime;      /* Last modification time per definition of PRTime */
-};
-
-struct PRFileInfo64 {
-    PRFileType type;        /* Type of file */
-    PROffset64 size;        /* Size, in bytes, of file's contents */
-    PRTime creationTime;    /* Creation time per definition of PRTime */
-    PRTime modifyTime;      /* Last modification time per definition of PRTime */
-};
-
-/****************************************************************************
- * FUNCTION: PR_GetFileInfo, PR_GetFileInfo64
- * DESCRIPTION:
- *     Get the information about the file with the given path name. This is
- *     applicable only to NSFileDesc describing 'file' types (see
- * INPUTS:
- *     const char *fn
- *         path name of the file
- * OUTPUTS:
- *     PRFileInfo *info
- *         Information about the given file is written into the file
- *         information object pointer to by 'info'.
- * RETURN: PRStatus
- *     PR_GetFileInfo returns PR_SUCCESS if file information is successfully
- *     obtained, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info);
-NSPR_API(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info);
-#endif /* MOZ_UNICODE */
-
-/*
- **************************************************************************
- * FUNCTION: PR_GetOpenFileInfo, PR_GetOpenFileInfo64
- * DESCRIPTION:
- *     Get information about an open file referred to by the
- *     given PRFileDesc object.
- * INPUTS:
- *     const PRFileDesc *fd
- *          A reference to a valid, open file.
- * OUTPUTS:
- *     Same as PR_GetFileInfo, PR_GetFileInfo64
- * RETURN: PRStatus
- *     PR_GetFileInfo returns PR_SUCCESS if file information is successfully
- *     obtained, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_GetOpenFileInfo(PRFileDesc *fd, PRFileInfo *info);
-NSPR_API(PRStatus) PR_GetOpenFileInfo64(PRFileDesc *fd, PRFileInfo64 *info);
-
-/*
- **************************************************************************
- * FUNCTION: PR_Rename
- * DESCRIPTION:
- *     Rename a file from the old name 'from' to the new name 'to'.
- * INPUTS:
- *     const char *from
- *         The old name of the file to be renamed.
- *     const char *to
- *         The new name of the file.
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- **************************************************************************
- */
-
-NSPR_API(PRStatus)    PR_Rename(const char *from, const char *to);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Access
- * DESCRIPTION:
- *     Determine accessibility of a file.
- * INPUTS:
- *     const char *name
- *         path name of the file
- *     PRAccessHow how
- *         specifies which access permission to check for.
- *         It can be one of the following values:
- *             PR_ACCESS_READ_OK       Test for read permission
- *             PR_ACCESS_WRITE_OK      Test for write permission
- *             PR_ACCESS_EXISTS        Check existence of file
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- *     PR_SUCCESS is returned if the requested access is permitted.
- *     Otherwise, PR_FAILURE is returned. Additional information
- *     regarding the reason for the failure may be retrieved from
- *     PR_GetError().
- *************************************************************************
- */
-
-typedef enum PRAccessHow {
-    PR_ACCESS_EXISTS = 1,
-    PR_ACCESS_WRITE_OK = 2,
-    PR_ACCESS_READ_OK = 3
-} PRAccessHow;
-
-NSPR_API(PRStatus) PR_Access(const char *name, PRAccessHow how);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Seek, PR_Seek64
- * DESCRIPTION:
- *     Moves read-write file offset
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object.
- *     PROffset32, PROffset64 offset
- *         Specifies a value, in bytes, that is used in conjunction
- *         with the 'whence' parameter to set the file pointer.  A
- *         negative value causes seeking in the reverse direction.
- *     PRSeekWhence whence
- *         Specifies how to interpret the 'offset' parameter in setting
- *         the file pointer associated with the 'fd' parameter.
- *         Values for the 'whence' parameter are:
- *             PR_SEEK_SET  Sets the file pointer to the value of the
- *                          'offset' parameter
- *             PR_SEEK_CUR  Sets the file pointer to its current location
- *                          plus the value of the offset parameter.
- *             PR_SEEK_END  Sets the file pointer to the size of the
- *                          file plus the value of the offset parameter.
- * OUTPUTS:
- *     None.
- * RETURN: PROffset32, PROffset64
- *     Upon successful completion, the resulting pointer location,
- *     measured in bytes from the beginning of the file, is returned.
- *     If the PR_Seek() function fails, the file offset remains
- *     unchanged, and the returned value is -1. The error code can
- *     then be retrieved via PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PROffset32) PR_Seek(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence);
-NSPR_API(PROffset64) PR_Seek64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence);
-
-/*
- ************************************************************************
- * FUNCTION: PR_Available
- * DESCRIPTION:
- *     Determine the amount of data in bytes available for reading
- *     in the given file or socket.
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object that refers to a file or
- *         socket.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32, PRInt64
- *     Upon successful completion, PR_Available returns the number of
- *     bytes beyond the current read pointer that is available for
- *     reading.  Otherwise, it returns a -1 and the reason for the
- *     failure can be retrieved via PR_GetError().
- ************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Available(PRFileDesc *fd);
-NSPR_API(PRInt64) PR_Available64(PRFileDesc *fd);
-
-/*
- ************************************************************************
- * FUNCTION: PR_Sync
- * DESCRIPTION:
- *     Sync any buffered data for a fd to its backing device (disk).
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object that refers to a file or
- *         socket
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     PR_SUCCESS is returned if the requested access is permitted.
- *     Otherwise, PR_FAILURE is returned.
- ************************************************************************
- */
-
-NSPR_API(PRStatus)	PR_Sync(PRFileDesc *fd);
-
-/************************************************************************/
-
-struct PRDirEntry {
-    const char *name;        /* name of entry, relative to directory name */
-};
-
-#ifdef MOZ_UNICODE
-struct PRDirEntryUTF16 {
-    const PRUnichar *name;   /* name of entry in UTF16, relative to
-                              * directory name */
-};
-#endif /* MOZ_UNICODE */
-
-#if !defined(NO_NSPR_10_SUPPORT)
-#define PR_DirName(dirEntry)	(dirEntry->name)
-#endif
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenDir
- * DESCRIPTION:
- *     Open the directory by the given name
- * INPUTS:
- *     const char *name
- *         path name of the directory to be opened
- * OUTPUTS:
- *     None
- * RETURN: PRDir *
- *     If the directory is sucessfully opened, a PRDir object is
- *     dynamically allocated and a pointer to it is returned.
- *     If the directory cannot be opened, a NULL pointer is returned.
- * MEMORY:
- *     Upon successful completion, the return value points to
- *     dynamically allocated memory.
- *************************************************************************
- */
-
-NSPR_API(PRDir*) PR_OpenDir(const char *name);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_ReadDir
- * DESCRIPTION:
- * INPUTS:
- *     PRDir *dir
- *         pointer to a PRDir object that designates an open directory
- *     PRDirFlags flags
- *           PR_SKIP_NONE     Do not skip any files
- *           PR_SKIP_DOT      Skip the directory entry "." that
- *                            represents the current directory
- *           PR_SKIP_DOT_DOT  Skip the directory entry ".." that
- *                            represents the parent directory.
- *           PR_SKIP_BOTH     Skip both '.' and '..'
- *           PR_SKIP_HIDDEN   Skip hidden files
- * OUTPUTS:
- * RETURN: PRDirEntry*
- *     Returns a pointer to the next entry in the directory.  Returns
- *     a NULL pointer upon reaching the end of the directory or when an
- *     error occurs. The actual reason can be retrieved via PR_GetError().
- *************************************************************************
- */
-
-typedef enum PRDirFlags {
-    PR_SKIP_NONE = 0x0,
-    PR_SKIP_DOT = 0x1,
-    PR_SKIP_DOT_DOT = 0x2,
-    PR_SKIP_BOTH = 0x3,
-    PR_SKIP_HIDDEN = 0x4
-} PRDirFlags;
-
-NSPR_API(PRDirEntry*) PR_ReadDir(PRDir *dir, PRDirFlags flags);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_CloseDir
- * DESCRIPTION:
- *     Close the specified directory.
- * INPUTS:
- *     PRDir *dir
- *        The directory to be closed.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_CloseDir(PRDir *dir);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_CloseDirUTF16(PRDirUTF16 *dir);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_MkDir
- * DESCRIPTION:
- *     Create a new directory with the given name and access mode.
- * INPUTS:
- *     const char *name
- *        The name of the directory to be created. All the path components
- *        up to but not including the leaf component must already exist.
- *     PRIntn mode
- *        See 'mode' definiton in PR_Open().
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_MkDir(const char *name, PRIntn mode);
-
-/*
- *************************************************************************
- * FUNCTION: PR_MakeDir
- * DESCRIPTION:
- *     Create a new directory with the given name and access mode.
- *     PR_MakeDir has the same prototype as PR_MkDir but implements
- *     the specified access mode where possible.
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_MakeDir(const char *name, PRIntn mode);
-
-/*
- *************************************************************************
- * FUNCTION: PR_RmDir
- * DESCRIPTION:
- *     Remove a directory by the given name.
- * INPUTS:
- *     const char *name
- *        The name of the directory to be removed. All the path components
- *        must already exist. Only the leaf component will be removed.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_RmDir(const char *name);
-
-/*
- *************************************************************************
- * FUNCTION: PR_NewUDPSocket
- * DESCRIPTION:
- *     Create a new UDP socket.
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewUDPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened UDP socket.
- *     Returns a NULL pointer if the creation of a new UDP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_NewUDPSocket(void);
-
-/*
- *************************************************************************
- * FUNCTION: PR_NewTCPSocket
- * DESCRIPTION:
- *     Create a new TCP socket.
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewTCPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened TCP socket.
- *     Returns a NULL pointer if the creation of a new TCP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_NewTCPSocket(void);
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenUDPSocket
- * DESCRIPTION:
- *     Create a new UDP socket of the specified address family.
- * INPUTS:
- *     PRIntn af
- *       Address family
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_OpenUDPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened UDP socket.
- *     Returns a NULL pointer if the creation of a new UDP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_OpenUDPSocket(PRIntn af);
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenTCPSocket
- * DESCRIPTION:
- *     Create a new TCP socket of the specified address family.
- * INPUTS:
- *     PRIntn af
- *       Address family
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewTCPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened TCP socket.
- *     Returns a NULL pointer if the creation of a new TCP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_OpenTCPSocket(PRIntn af);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Connect
- * DESCRIPTION:
- *     Initiate a connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket
- *     PRNetAddr *addr
- *       Specifies the address of the socket in its own communication
- *       space.
- *     PRIntervalTime timeout
- *       Time limit for completion of the connect operation.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of connection initiation, PR_Connect
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Connect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_ConnectContinue
- * DESCRIPTION:
- *     Continue a nonblocking connect.  After a nonblocking connect
- *     is initiated with PR_Connect() (which fails with
- *     PR_IN_PROGRESS_ERROR), one should call PR_Poll() on the socket,
- *     with the in_flags PR_POLL_WRITE | PR_POLL_EXCEPT.  When
- *     PR_Poll() returns, one calls PR_ConnectContinue() on the
- *     socket to determine whether the nonblocking connect has
- *     completed or is still in progress.  Repeat the PR_Poll(),
- *     PR_ConnectContinue() sequence until the nonblocking connect
- *     has completed.
- * INPUTS:
- *     PRFileDesc *fd
- *         the file descriptor representing a socket
- *     PRInt16 out_flags
- *         the out_flags field of the poll descriptor returned by
- *         PR_Poll()
- * RETURN: PRStatus
- *     If the nonblocking connect has successfully completed,
- *     PR_ConnectContinue returns PR_SUCCESS.  If PR_ConnectContinue()
- *     returns PR_FAILURE, call PR_GetError():
- *     - PR_IN_PROGRESS_ERROR: the nonblocking connect is still in
- *       progress and has not completed yet.  The caller should poll
- *       on the file descriptor for the in_flags
- *       PR_POLL_WRITE|PR_POLL_EXCEPT and retry PR_ConnectContinue
- *       later when PR_Poll() returns.
- *     - Other errors: the nonblocking connect has failed with this
- *       error code.
- */
-
-NSPR_API(PRStatus)    PR_ConnectContinue(PRFileDesc *fd, PRInt16 out_flags);
-
-/*
- *************************************************************************
- * THIS FUNCTION IS DEPRECATED.  USE PR_ConnectContinue INSTEAD.
- *
- * FUNCTION: PR_GetConnectStatus
- * DESCRIPTION:
- *     Get the completion status of a nonblocking connect.  After
- *     a nonblocking connect is initiated with PR_Connect() (which
- *     fails with PR_IN_PROGRESS_ERROR), one should call PR_Poll()
- *     on the socket, with the in_flags PR_POLL_WRITE | PR_POLL_EXCEPT.
- *     When PR_Poll() returns, one calls PR_GetConnectStatus on the
- *     PRPollDesc structure to determine whether the nonblocking
- *     connect has succeeded or failed.
- * INPUTS:
- *     const PRPollDesc *pd
- *         Pointer to a PRPollDesc whose fd member is the socket,
- *         and in_flags must contain PR_POLL_WRITE and PR_POLL_EXCEPT.
- *         PR_Poll() should have been called and set the out_flags.
- * RETURN: PRStatus
- *     If the nonblocking connect has successfully completed,
- *     PR_GetConnectStatus returns PR_SUCCESS.  If PR_GetConnectStatus()
- *     returns PR_FAILURE, call PR_GetError():
- *     - PR_IN_PROGRESS_ERROR: the nonblocking connect is still in
- *       progress and has not completed yet.
- *     - Other errors: the nonblocking connect has failed with this
- *       error code.
- */
-
-NSPR_API(PRStatus)    PR_GetConnectStatus(const PRPollDesc *pd);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Accept
- * DESCRIPTION:
- *     Accept a connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing the rendezvous socket
- *       on which the caller is willing to accept new connections.
- *     PRIntervalTime timeout
- *       Time limit for completion of the accept operation.
- * OUTPUTS:
- *     PRNetAddr *addr
- *       Returns the address of the connecting entity in its own
- *       communication space. It may be NULL.
- * RETURN: PRFileDesc*
- *     Upon successful acceptance of a connection, PR_Accept
- *     returns a valid file descriptor. Otherwise, it returns NULL.
- *     Further failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*) PR_Accept(
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Bind
- * DESCRIPTION:
- *    Bind an address to a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket.
- *     PRNetAddr *addr
- *       Specifies the address to which the socket will be bound.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful binding of an address to a socket, PR_Bind
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Bind(PRFileDesc *fd, const PRNetAddr *addr);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Listen
- * DESCRIPTION:
- *    Listen for connections on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket that will be
- *       used to listen for new connections.
- *     PRIntn backlog
- *       Specifies the maximum length of the queue of pending connections.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of listen request, PR_Listen
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Listen(PRFileDesc *fd, PRIntn backlog);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Shutdown
- * DESCRIPTION:
- *    Shut down part of a full-duplex connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a connected socket.
- *     PRIntn how
- *       Specifies the kind of disallowed operations on the socket.
- *           PR_SHUTDOWN_RCV - Further receives will be disallowed
- *           PR_SHUTDOWN_SEND - Further sends will be disallowed
- *           PR_SHUTDOWN_BOTH - Further sends and receives will be disallowed
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of shutdown request, PR_Shutdown
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-typedef enum PRShutdownHow
-{
-    PR_SHUTDOWN_RCV = 0,      /* disallow further receives */
-    PR_SHUTDOWN_SEND = 1,     /* disallow further sends */
-    PR_SHUTDOWN_BOTH = 2      /* disallow further receives and sends */
-} PRShutdownHow;
-
-NSPR_API(PRStatus)    PR_Shutdown(PRFileDesc *fd, PRShutdownHow how);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Recv
- * DESCRIPTION:
- *    Receive a specified number of bytes from a connected socket.
- *     The operation will block until some positive number of bytes are 
- *     transferred, a time out has occurred, or there is an error. 
- *     No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer to hold the data received.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *       must be zero or PR_MSG_PEEK.
- *     PRIntervalTime timeout
- *       Time limit for completion of the receive operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *         a positive number indicates the number of bytes actually received.
- *         0 means the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- **************************************************************************
- */
-
-#define PR_MSG_PEEK 0x2
-
-NSPR_API(PRInt32)    PR_Recv(PRFileDesc *fd, void *buf, PRInt32 amount,
-                PRIntn flags, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Send
- * DESCRIPTION:
- *    Send a specified number of bytes from a connected socket.
- *     The operation will block until all bytes are 
- *     processed, a time out has occurred, or there is an error. 
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer from where the data is sent.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRIntervalTime timeout
- *       Time limit for completion of the send operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully processed.
- *     This number must always equal 'amount'. A -1 is an indication that the
- *     operation failed. The reason for the failure is obtained by calling
- *     PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32)    PR_Send(PRFileDesc *fd, const void *buf, PRInt32 amount,
-                                PRIntn flags, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_RecvFrom
- * DESCRIPTION:
- *     Receive up to a specified number of bytes from socket which may
- *     or may not be connected.
- *     The operation will block until one or more bytes are 
- *     transferred, a time out has occurred, or there is an error. 
- *     No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer to hold the data received.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRNetAddr *addr
- *       Specifies the address of the sending peer. It may be NULL.
- *     PRIntervalTime timeout
- *       Time limit for completion of the receive operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *         a positive number indicates the number of bytes actually received.
- *         0 means the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_RecvFrom(
-    PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-    PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_SendTo
- * DESCRIPTION:
- *    Send a specified number of bytes from an unconnected socket.
- *    The operation will block until all bytes are 
- *    sent, a time out has occurred, or there is an error. 
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing an unconnected socket.
- *     void *buf
- *       pointer to a buffer from where the data is sent.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRNetAddr *addr
- *       Specifies the address of the peer.
-.*     PRIntervalTime timeout
- *       Time limit for completion of the send operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully sent.
- *     -1 indicates a failure. The reason for the failure is obtained
- *     by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_SendTo(
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-    const PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_TransmitFile
-** DESCRIPTION:
-**    Transmitfile sends a complete file (sourceFile) across a socket 
-**    (networkSocket).  If headers is non-NULL, the headers will be sent across
-**    the socket prior to sending the file.
-** 
-**    Optionally, the PR_TRANSMITFILE_CLOSE_SOCKET flag may be passed to
-**    transmitfile.  This flag specifies that transmitfile should close the
-**    socket after sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRFileDesc *sourceFile
-**        The file to send
-**    const void *headers
-**        A pointer to headers to be sent before sending data
-**    PRInt32       hlen
-**        length of header buffers in bytes.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the transmit operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-NSPR_API(PRInt32) PR_TransmitFile(
-    PRFileDesc *networkSocket, PRFileDesc *sourceFile,
-    const void *headers, PRInt32 hlen, PRTransmitFileFlags flags,
-    PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_SendFile
-** DESCRIPTION:
-**    PR_SendFile sends data from a file (sendData->fd) across a socket 
-**    (networkSocket).  If specified, a header and/or trailer buffer are sent
-**	  before and after the file, respectively. The file offset, number of bytes
-** 	  of file data to send, the header and trailer buffers are specified in the
-**	  sendData argument.
-** 
-**    Optionally, if the PR_TRANSMITFILE_CLOSE_SOCKET flag is passed, the
-**    socket is closed after successfully sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRSendFileData *sendData
-**        Contains the FD, file offset and length, header and trailer
-**		  buffer specifications.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the send operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-struct PRSendFileData {
-	PRFileDesc	*fd;			/* file to send							*/
-	PRUint32	file_offset;	/* file offset							*/
-	PRSize		file_nbytes;	/* number of bytes of file data to send	*/
-								/* if 0, send data from file_offset to	*/
-								/* end-of-file.							*/
-	const void	*header;		/* header buffer						*/
-	PRInt32		hlen;			/* header len							*/
-	const void	*trailer;		/* trailer buffer						*/
-	PRInt32		tlen;			/* trailer len							*/
-};
-
-
-NSPR_API(PRInt32) PR_SendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-	PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_AcceptRead
-** DESCRIPTION:
-**    AcceptRead accepts a new connection, returns the newly created
-**    socket's descriptor and also returns the connecting peer's address.
-**    AcceptRead, as its name suggests, also receives the first block of data 
-**    sent by the peer.
-**
-** INPUTS:
-**    PRFileDesc *listenSock
-**        A socket descriptor that has been called with the PR_Listen() 
-**        function, also known as the rendezvous socket.
-**    void *buf
-**        A pointer to a buffer to receive data sent by the client.  This 
-**        buffer must be large enough to receive <amount> bytes of data
-**        and two PRNetAddr structures, plus an extra 32 bytes. See:
-**        PR_ACCEPT_READ_BUF_OVERHEAD.
-**    PRInt32 amount
-**        The number of bytes of client data to receive.  Does not include
-**        the size of the PRNetAddr structures.  If 0, no data will be read
-**        from the client.
-**    PRIntervalTime timeout
-**        The timeout interval only applies to the read portion of the 
-**        operation.  PR_AcceptRead will block indefinitely until the 
-**        connection is accepted; the read will timeout after the timeout 
-**        interval elapses.
-** OUTPUTS:
-**    PRFileDesc **acceptedSock
-**        The file descriptor for the newly connected socket.  This parameter
-**        will only be valid if the function return does not indicate failure.
-**    PRNetAddr  **peerAddr,
-**        The address of the remote socket.  This parameter will only be
-**        valid if the function return does not indicate failure.  The
-**        returned address is not guaranteed to be properly aligned.
-** 
-** RETURNS:
-**     The number of bytes read from the client or -1 on failure.  The reason 
-**     for the failure is obtained by calling PR_GetError().
-**************************************************************************
-**/       
-/* define buffer overhead constant. Add this value to the user's 
-** data length when allocating a buffer to accept data.
-**    Example:
-**    #define USER_DATA_SIZE 10
-**    char buf[USER_DATA_SIZE + PR_ACCEPT_READ_BUF_OVERHEAD];
-**    bytesRead = PR_AcceptRead( s, fd, &a, &p, USER_DATA_SIZE, ...);
-*/
-#define PR_ACCEPT_READ_BUF_OVERHEAD (32+(2*sizeof(PRNetAddr)))
-
-NSPR_API(PRInt32) PR_AcceptRead(
-    PRFileDesc *listenSock, PRFileDesc **acceptedSock,
-    PRNetAddr **peerAddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_NewTCPSocketPair
-** DESCRIPTION:
-**    Create a new TCP socket pair. The returned descriptors can be used
-**    interchangeably; they are interconnected full-duplex descriptors: data
-**    written to one can be read from the other and vice-versa.
-**
-** INPUTS:
-**    None
-** OUTPUTS:
-**    PRFileDesc *fds[2]
-**        The file descriptor pair for the newly created TCP sockets.
-** RETURN: PRStatus
-**     Upon successful completion of TCP socket pair, PR_NewTCPSocketPair 
-**     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
-**     failure information can be obtained by calling PR_GetError().
-** XXX can we implement this on windoze and mac?
-**************************************************************************
-**/
-NSPR_API(PRStatus) PR_NewTCPSocketPair(PRFileDesc *fds[2]);
-
-/*
-*************************************************************************
-** FUNCTION: PR_GetSockName
-** DESCRIPTION:
-**    Get socket name.  Return the network address for this socket.
-**
-** INPUTS:
-**     PRFileDesc *fd
-**       Points to a PRFileDesc object representing the socket.
-** OUTPUTS:
-**     PRNetAddr *addr
-**       Returns the address of the socket in its own communication space.
-** RETURN: PRStatus
-**     Upon successful completion, PR_GetSockName returns PR_SUCCESS.  
-**     Otherwise, it returns PR_FAILURE.  Further failure information can 
-**     be obtained by calling PR_GetError().
-**************************************************************************
-**/
-NSPR_API(PRStatus)	PR_GetSockName(PRFileDesc *fd, PRNetAddr *addr);
-
-/*
-*************************************************************************
-** FUNCTION: PR_GetPeerName
-** DESCRIPTION:
-**    Get name of the connected peer.  Return the network address for the 
-**    connected peer socket.
-**
-** INPUTS:
-**     PRFileDesc *fd
-**       Points to a PRFileDesc object representing the connected peer.
-** OUTPUTS:
-**     PRNetAddr *addr
-**       Returns the address of the connected peer in its own communication
-**       space.
-** RETURN: PRStatus
-**     Upon successful completion, PR_GetPeerName returns PR_SUCCESS.  
-**     Otherwise, it returns PR_FAILURE.  Further failure information can 
-**     be obtained by calling PR_GetError().
-**************************************************************************
-**/
-NSPR_API(PRStatus)	PR_GetPeerName(PRFileDesc *fd, PRNetAddr *addr);
-
-NSPR_API(PRStatus)	PR_GetSocketOption(
-    PRFileDesc *fd, PRSocketOptionData *data);
-
-NSPR_API(PRStatus)	PR_SetSocketOption(
-    PRFileDesc *fd, const PRSocketOptionData *data);
-
-/*
- *********************************************************************
- *
- * File descriptor inheritance
- *
- *********************************************************************
- */
-
-/*
- ************************************************************************
- * FUNCTION: PR_SetFDInheritable
- * DESCRIPTION:
- *    Set the inheritance attribute of a file descriptor.
- *
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object.
- *     PRBool inheritable
- *       If PR_TRUE, the file descriptor fd is set to be inheritable
- *       by a child process.  If PR_FALSE, the file descriptor is set
- *       to be not inheritable by a child process.
- * RETURN: PRStatus
- *     Upon successful completion, PR_SetFDInheritable returns PR_SUCCESS.  
- *     Otherwise, it returns PR_FAILURE.  Further failure information can 
- *     be obtained by calling PR_GetError().
- *************************************************************************
- */
-NSPR_API(PRStatus) PR_SetFDInheritable(
-    PRFileDesc *fd,
-    PRBool inheritable);
-
-/*
- ************************************************************************
- * FUNCTION: PR_GetInheritedFD
- * DESCRIPTION:
- *    Get an inherited file descriptor with the specified name.
- *
- * INPUTS:
- *     const char *name
- *       The name of the inherited file descriptor.
- * RETURN: PRFileDesc *
- *     Upon successful completion, PR_GetInheritedFD returns the
- *     inherited file descriptor with the specified name.  Otherwise,  
- *     it returns NULL.  Further failure information can be obtained
- *     by calling PR_GetError().
- *************************************************************************
- */
-NSPR_API(PRFileDesc *) PR_GetInheritedFD(const char *name);
-
-/*
- *********************************************************************
- *
- * Memory-mapped files
- *
- *********************************************************************
- */
-
-typedef struct PRFileMap PRFileMap;
-
-/*
- * protection options for read and write accesses of a file mapping
- */
-typedef enum PRFileMapProtect {
-    PR_PROT_READONLY,     /* read only */
-    PR_PROT_READWRITE,    /* readable, and write is shared */
-    PR_PROT_WRITECOPY     /* readable, and write is private (copy-on-write) */
-} PRFileMapProtect;
-
-NSPR_API(PRFileMap *) PR_CreateFileMap(
-    PRFileDesc *fd,
-    PRInt64 size,
-    PRFileMapProtect prot);
-
-/*
- * return the alignment (in bytes) of the offset argument to PR_MemMap
- */
-NSPR_API(PRInt32) PR_GetMemMapAlignment(void);
-
-NSPR_API(void *) PR_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,  /* must be aligned and sized according to the
-                         * return value of PR_GetMemMapAlignment() */
-    PRUint32 len);
-
-NSPR_API(PRStatus) PR_MemUnmap(void *addr, PRUint32 len);
-
-NSPR_API(PRStatus) PR_CloseFileMap(PRFileMap *fmap);
-
-/*
- ******************************************************************
- *
- * Interprocess communication
- *
- ******************************************************************
- */
-
-/*
- * Creates an anonymous pipe and returns file descriptors for the
- * read and write ends of the pipe.
- */
-
-NSPR_API(PRStatus) PR_CreatePipe(
-    PRFileDesc **readPipe,
-    PRFileDesc **writePipe
-);
-
-/************************************************************************/
-/************** The following definitions are for poll ******************/
-/************************************************************************/
-
-struct PRPollDesc {
-    PRFileDesc* fd;
-    PRInt16 in_flags;
-    PRInt16 out_flags;
-};
-
-/*
-** Bit values for PRPollDesc.in_flags or PRPollDesc.out_flags. Binary-or
-** these together to produce the desired poll request.
-*/
-
-#if defined(_PR_POLL_BACKCOMPAT)
-
-#include <poll.h>
-#define PR_POLL_READ    POLLIN
-#define PR_POLL_WRITE   POLLOUT
-#define PR_POLL_EXCEPT  POLLPRI
-#define PR_POLL_ERR     POLLERR     /* only in out_flags */
-#define PR_POLL_NVAL    POLLNVAL    /* only in out_flags when fd is bad */
-#define PR_POLL_HUP     POLLHUP     /* only in out_flags */
-
-#else  /* _PR_POLL_BACKCOMPAT */
-
-#define PR_POLL_READ    0x1
-#define PR_POLL_WRITE   0x2
-#define PR_POLL_EXCEPT  0x4
-#define PR_POLL_ERR     0x8         /* only in out_flags */
-#define PR_POLL_NVAL    0x10        /* only in out_flags when fd is bad */
-#define PR_POLL_HUP     0x20        /* only in out_flags */
-
-#endif  /* _PR_POLL_BACKCOMPAT */
-
-/*
-*************************************************************************
-** FUNCTION:    PR_Poll
-** DESCRIPTION:
-**
-** The call returns as soon as I/O is ready on one or more of the underlying
-** socket objects. A count of the number of ready descriptors is
-** returned unless a timeout occurs in which case zero is returned.
-**
-** PRPollDesc.fd should be set to a pointer to a PRFileDesc object
-** representing a socket. This field can be set to NULL to indicate to
-** PR_Poll that this PRFileDesc object should be ignored.
-** PRPollDesc.in_flags should be set to the desired request
-** (read/write/except or some combination). Upon successful return from
-** this call PRPollDesc.out_flags will be set to indicate what kind of
-** i/o can be performed on the respective descriptor. PR_Poll() uses the
-** out_flags fields as scratch variables during the call. If PR_Poll()
-** returns 0 or -1, the out_flags fields do not contain meaningful values
-** and must not be used.
-**
-** INPUTS:
-**      PRPollDesc *pds         A pointer to an array of PRPollDesc
-**
-**      PRIntn npds             The number of elements in the array
-**                              If this argument is zero PR_Poll is
-**                              equivalent to a PR_Sleep(timeout).
-**
-**      PRIntervalTime timeout  Amount of time the call will block waiting
-**                              for I/O to become ready. If this time expires
-**                              w/o any I/O becoming ready, the result will
-**                              be zero.
-**
-** OUTPUTS:    None
-** RETURN:
-**      PRInt32                 Number of PRPollDesc's with events or zero
-**                              if the function timed out or -1 on failure.
-**                              The reason for the failure is obtained by
-**                              calling PR_GetError().
-**************************************************************************
-*/
-NSPR_API(PRInt32) PR_Poll(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout);
-
-/*
-**************************************************************************
-**
-** Pollable events
-**
-** A pollable event is a special kind of file descriptor.
-** The only I/O operation you can perform on a pollable event
-** is to poll it with the PR_POLL_READ flag.  You can't
-** read from or write to a pollable event.
-**
-** The purpose of a pollable event is to combine event waiting
-** with I/O waiting in a single PR_Poll call.  Pollable events
-** are implemented using a pipe or a pair of TCP sockets
-** connected via the loopback address, therefore setting and
-** waiting for pollable events are expensive operating system
-** calls.  Do not use pollable events for general thread
-** synchronization. Use condition variables instead.
-**
-** A pollable event has two states: set and unset.  Events
-** are not queued, so there is no notion of an event count.
-** A pollable event is either set or unset.
-**
-** A new pollable event is created by a PR_NewPollableEvent
-** call and is initially in the unset state.
-**
-** PR_WaitForPollableEvent blocks the calling thread until
-** the pollable event is set, and then it atomically unsets
-** the pollable event before it returns.
-**
-** To set a pollable event, call PR_SetPollableEvent.
-**
-** One can call PR_Poll with the PR_POLL_READ flag on a pollable
-** event.  When the pollable event is set, PR_Poll returns with
-** the PR_POLL_READ flag set in the out_flags.
-**
-** To close a pollable event, call PR_DestroyPollableEvent
-** (not PR_Close).
-**
-**************************************************************************
-*/
-
-NSPR_API(PRFileDesc *) PR_NewPollableEvent(void);
-
-NSPR_API(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_SetPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event);
-
-PR_END_EXTERN_C
-
-#endif /* prio_h___ */
diff --git a/libs/js/nsprpub/pr/include/pripcsem.h b/libs/js/nsprpub/pr/include/pripcsem.h
deleted file mode 100644
index 5a96be5813..0000000000
--- a/libs/js/nsprpub/pr/include/pripcsem.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pripcsem.h
- *
- * Description: named semaphores for interprocess
- * synchronization
- *
- * Unrelated processes obtain access to a shared semaphore
- * by specifying its name.
- *
- * Our goal is to support named semaphores on at least
- * Unix and Win32 platforms.  The implementation will use
- * one of the three native semaphore APIs: POSIX, System V,
- * and Win32.
- *
- * Because POSIX named semaphores have kernel persistence,
- * we are forced to have a delete function in this API.
- */
-
-#ifndef pripcsem_h___
-#define pripcsem_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PRSem is an opaque structure that represents a named
- * semaphore.
- */
-typedef struct PRSem PRSem;
-
-/*
- * PR_OpenSemaphore --
- *
- * Create or open a named semaphore with the specified name.
- * A handle to the semaphore is returned.
- *
- * If the named semaphore doesn't exist and the PR_SEM_CREATE
- * flag is specified, the named semaphore is created.  The
- * created semaphore needs to be removed from the system with
- * a PR_DeleteSemaphore call.
- *
- * If PR_SEM_CREATE is specified, the third argument is the
- * access permission bits of the new semaphore (same
- * interpretation as the mode argument to PR_Open) and the
- * fourth argument is the initial value of the new semaphore.
- * If PR_SEM_CREATE is not specified, the third and fourth
- * arguments are ignored.
- */
-
-#define PR_SEM_CREATE 0x1  /* create if not exist */
-#define PR_SEM_EXCL   0x2  /* fail if already exists */
-
-NSPR_API(PRSem *) PR_OpenSemaphore(
-    const char *name, PRIntn flags, PRIntn mode, PRUintn value);
-
-/*
- * PR_WaitSemaphore --
- *
- * If the value of the semaphore is > 0, decrement the value and return.
- * If the value is 0, sleep until the value becomes > 0, then decrement
- * the value and return.
- *
- * The "test and decrement" operation is performed atomically.
- */
-
-NSPR_API(PRStatus) PR_WaitSemaphore(PRSem *sem);
-
-/*
- * PR_PostSemaphore --
- *
- * Increment the value of the named semaphore by 1.
- */
-
-NSPR_API(PRStatus) PR_PostSemaphore(PRSem *sem);
-
-/*
- * PR_CloseSemaphore --
- *
- * Close a named semaphore handle.
- */
-
-NSPR_API(PRStatus) PR_CloseSemaphore(PRSem *sem);
-
-/*
- * PR_DeleteSemaphore --
- *
- * Remove a named semaphore from the system.
- */
-
-NSPR_API(PRStatus) PR_DeleteSemaphore(const char *name);
-
-PR_END_EXTERN_C
-
-#endif /* pripcsem_h___ */
diff --git a/libs/js/nsprpub/pr/include/private/.cvsignore b/libs/js/nsprpub/pr/include/private/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/include/private/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/include/private/Makefile.in b/libs/js/nsprpub/pr/include/private/Makefile.in
deleted file mode 100644
index 180393b1e0..0000000000
--- a/libs/js/nsprpub/pr/include/private/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-RELEASE_HEADERS = pprio.h pprthred.h prpriv.h
-RELEASE_HEADERS := $(addprefix $(srcdir)/, $(RELEASE_HEADERS))
-RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private
-
-HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h
-
-include_subdir = private
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(RELEASE_HEADERS)
-	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(dist_includedir)/private
diff --git a/libs/js/nsprpub/pr/include/private/pprio.h b/libs/js/nsprpub/pr/include/private/pprio.h
deleted file mode 100644
index 63e063cf2c..0000000000
--- a/libs/js/nsprpub/pr/include/private/pprio.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:	pprio.h
-**
-** Description:	Private definitions for I/O related structures
-*/
-
-#ifndef pprio_h___
-#define pprio_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/************************************************************************/
-
-#ifdef _WIN64
-typedef __int64 PROsfd;
-#else
-typedef PRInt32 PROsfd;
-#endif
-
-/* Return the method tables for files, tcp sockets and udp sockets */
-NSPR_API(const PRIOMethods*)    PR_GetFileMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetTCPMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetUDPMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetPipeMethods(void);
-
-/*
-** Convert a NSPR Socket Handle to a Native Socket handle.
-** This function will be obsoleted with the next release; avoid using it.
-*/
-NSPR_API(PROsfd)       PR_FileDesc2NativeHandle(PRFileDesc *);
-NSPR_API(void)         PR_ChangeFileDescNativeHandle(PRFileDesc *, PROsfd);
-NSPR_API(PRFileDesc*)  PR_AllocFileDesc(PROsfd osfd,
-                                         const PRIOMethods *methods);
-NSPR_API(void)         PR_FreeFileDesc(PRFileDesc *fd);
-/*
-** Import an existing OS file to NSPR. 
-*/
-NSPR_API(PRFileDesc*)  PR_ImportFile(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportPipe(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportTCPSocket(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportUDPSocket(PROsfd osfd);
-
-
-/*
- *************************************************************************
- * FUNCTION: PR_CreateSocketPollFd
- * DESCRIPTION:
- *     Create a PRFileDesc wrapper for a native socket handle, for use with
- *	   PR_Poll only
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_CreateSocketPollFd returns a pointer
- *     to the PRFileDesc created for the native socket handle
- *     Returns a NULL pointer if the create of a new PRFileDesc failed
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)	PR_CreateSocketPollFd(PROsfd osfd);
-
-/*
- *************************************************************************
- * FUNCTION: PR_DestroySocketPollFd
- * DESCRIPTION:
- *     Destroy the PRFileDesc wrapper created by PR_CreateSocketPollFd
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_DestroySocketPollFd returns
- *	   PR_SUCCESS, else PR_FAILURE
- *
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_DestroySocketPollFd(PRFileDesc *fd);
-
-
-/*
-** Macros for PR_Socket
-**
-** Socket types: PR_SOCK_STREAM, PR_SOCK_DGRAM
-*/
-
-#ifdef WIN32
-
-#define PR_SOCK_STREAM 1
-#define PR_SOCK_DGRAM 2
-
-#else /* WIN32 */
-
-#define PR_SOCK_STREAM SOCK_STREAM
-#define PR_SOCK_DGRAM SOCK_DGRAM
-
-#endif /* WIN32 */
-
-/*
-** Create a new Socket; this function is obsolete.
-*/
-NSPR_API(PRFileDesc*)	PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto);
-
-/* FUNCTION: PR_LockFile
-** DESCRIPTION:
-**    Lock a file for exclusive access.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_LockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_TLockFile
-** DESCRIPTION:
-**    Test and Lock a file for exclusive access.  Do not block if the
-**    file cannot be locked immediately.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_TLockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_UnlockFile
-** DESCRIPTION:
-**    Unlock a file which has been previously locked successfully by this
-**    process.
-** RETURNS:
-**    PR_SUCCESS when the lock is released
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_UnlockFile(PRFileDesc *fd);
-
-/*
-** Emulate acceptread by accept and recv.
-*/
-NSPR_API(PRInt32) PR_EmulateAcceptRead(PRFileDesc *sd, PRFileDesc **nd,
-    PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
-
-/*
-** Emulate sendfile by reading from the file and writing to the socket.
-** The file is memory-mapped if memory-mapped files are supported.
-*/
-NSPR_API(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-    PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-#ifdef WIN32
-/* FUNCTION: PR_NTFast_AcceptRead
-** DESCRIPTION:
-**    NT has the notion of an "accept context", which is only needed in
-**    order to make certain calls.  By default, a socket connected via
-**    AcceptEx can only do a limited number of things without updating
-**    the acceptcontext.  The generic version of PR_AcceptRead always
-**    updates the accept context.  This version does not.
-**/
-NSPR_API(PRInt32) PR_NTFast_AcceptRead(PRFileDesc *sd, PRFileDesc **nd,
-              PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime t);
-
-typedef void (*_PR_AcceptTimeoutCallback)(void *);
-
-/* FUNCTION: PR_NTFast_AcceptRead_WithTimeoutCallback
-** DESCRIPTION:
-**    The AcceptEx call combines the accept with the read function.  However,
-**    our daemon threads need to be able to wakeup and reliably flush their
-**    log buffers if the Accept times out.  However, with the current blocking
-**    interface to AcceptRead, there is no way for us to timeout the Accept;
-**    this is because when we timeout the Read, we can close the newly 
-**    socket and continue; but when we timeout the accept itself, there is no
-**    new socket to timeout.  So instead, this version of the function is
-**    provided.  After the initial timeout period elapses on the accept()
-**    portion of the function, it will call the callback routine and then
-**    continue the accept.   If the timeout occurs on the read, it will 
-**    close the connection and return error.
-*/
-NSPR_API(PRInt32) PR_NTFast_AcceptRead_WithTimeoutCallback(
-              PRFileDesc *sd, 
-              PRFileDesc **nd,
-              PRNetAddr **raddr, 
-              void *buf, 
-              PRInt32 amount, 
-              PRIntervalTime t,
-              _PR_AcceptTimeoutCallback callback, 
-              void *callback_arg);
-
-/* FUNCTION: PR_NTFast_Accept
-** DESCRIPTION:
-**    NT has the notion of an "accept context", which is only needed in
-**    order to make certain calls.  By default, a socket connected via
-**    AcceptEx can only do a limited number of things without updating
-**    the acceptcontext.  The generic version of PR_Accept always
-**    updates the accept context.  This version does not.
-**/
-NSPR_API(PRFileDesc*)	PR_NTFast_Accept(PRFileDesc *fd, PRNetAddr *addr,
-                                                PRIntervalTime timeout);
-
-/* FUNCTION: PR_NTFast_Update
-** DESCRIPTION:
-**    For sockets accepted with PR_NTFast_Accept or PR_NTFastAcceptRead,
-**    this function will update the accept context for those sockets,
-**    so that the socket can make general purpose socket calls.
-**    Without calling this, the only operations supported on the socket
-**    Are PR_Read, PR_Write, PR_Transmitfile, and PR_Close.
-*/
-NSPR_API(void) PR_NTFast_UpdateAcceptContext(PRFileDesc *acceptSock, 
-                                        PRFileDesc *listenSock);
-
-
-/* FUNCTION: PR_NT_CancelIo
-** DESCRIPTION:
-**    Cancel IO operations on fd.
-*/
-NSPR_API(PRStatus) PR_NT_CancelIo(PRFileDesc *fd);
-
-
-#endif /* WIN32 */
-
-/*
-** Need external access to this on Mac so we can first set up our faux
-** environment vars
-*/
-#ifdef XP_MAC
-NSPR_API(void) PR_Init_Log(void);
-#endif
-
-
-PR_END_EXTERN_C
-
-#endif /* pprio_h___ */
diff --git a/libs/js/nsprpub/pr/include/private/pprmwait.h b/libs/js/nsprpub/pr/include/private/pprmwait.h
deleted file mode 100644
index d116a8b312..0000000000
--- a/libs/js/nsprpub/pr/include/private/pprmwait.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if defined(_PPRMWAIT_H)
-#else
-#define _PPRMWAIT_H
-
-#include "prlock.h"
-#include "prcvar.h"
-#include "prclist.h"
-#include "prthread.h"
-
-#define MAX_POLLING_INTERVAL 100
-#define _PR_POLL_COUNT_FUDGE 64
-#define _PR_DEFAULT_HASH_LENGTH 59
-
-/*
- * Our hash table resolves collisions by open addressing with
- * double hashing.  See Cormen, Leiserson, and Rivest,
- * Introduction to Algorithms, p. 232, The MIT Press, 1990.
- */
-
-#define _MW_HASH(a, m) ((((PRUptrdiff)(a) >> 4) ^ ((PRUptrdiff)(a) >> 10)) % (m))
-#define _MW_HASH2(a, m) (1 + ((((PRUptrdiff)(a) >> 4) ^ ((PRUptrdiff)(a) >> 10)) % (m - 2)))
-#define _MW_ABORTED(_rv) \
-    ((PR_FAILURE == (_rv)) && (PR_PENDING_INTERRUPT_ERROR == PR_GetError()))
-
-typedef enum {_prmw_success, _prmw_rehash, _prmw_error} _PR_HashStory;
-
-typedef struct _PRWaiterHash
-{
-    PRUint16 count;             /* current number in hash table */
-    PRUint16 length;            /* current size of the hash table */
-    PRRecvWait *recv_wait;      /* hash table of receive wait objects */
-} _PRWaiterHash;
-
-typedef enum {_prmw_running, _prmw_stopping, _prmw_stopped} PRMWGroupState;
-
-struct PRWaitGroup
-{
-    PRCList group_link;         /* all groups are linked to each other */
-    PRCList io_ready;           /* list of I/O requests that are ready */
-    PRMWGroupState state;       /* state of this group (so we can shut down) */
-
-    PRLock *ml;                 /* lock for synchronizing this wait group */
-    PRCondVar *io_taken;        /* calling threads notify when they take I/O */
-    PRCondVar *io_complete;     /* calling threads wait here for completions */
-    PRCondVar *new_business;    /* polling thread waits here more work */
-    PRCondVar *mw_manage;       /* used to manage group lists */
-    PRThread* poller;           /* thread that's actually doing the poll() */
-    PRUint16 waiting_threads;   /* number of threads waiting for recv */
-    PRUint16 polling_count;     /* number of elements in the polling list */
-    PRUint32 p_timestamp;       /* pseudo-time group had element removed */
-    PRPollDesc *polling_list;   /* list poller builds for polling */
-    PRIntervalTime last_poll;   /* last time we polled */
-    _PRWaiterHash *waiter;      /* pointer to hash table of wait receive objects */
-
-#ifdef WINNT
-    /*
-     * On NT, idle threads are responsible for getting completed i/o.
-     * They need to add completed i/o to the io_ready list.  Since
-     * idle threads cannot use nspr locks, we have to use an md lock
-     * to protect the io_ready list.
-     */
-    _MDLock mdlock;             /* protect io_ready, waiter, and wait_list */
-    PRCList wait_list;          /* used in place of io_complete.  reuse
-                                 * waitQLinks in the PRThread structure. */
-#endif /* WINNT */
-};
-
-/**********************************************************************
-***********************************************************************
-******************** Wait group enumerations **************************
-***********************************************************************
-**********************************************************************/
-typedef struct _PRGlobalState
-{
-    PRCList group_list;         /* master of the group list */
-    PRWaitGroup *group;         /* the default (NULL) group */
-} _PRGlobalState;
-
-#ifdef WINNT
-extern PRStatus NT_HashRemoveInternal(PRWaitGroup *group, PRFileDesc *fd);
-#endif
-
-typedef enum {_PR_ENUM_UNSEALED=0, _PR_ENUM_SEALED=0x0eadface} _PREnumSeal;
-
-struct PRMWaitEnumerator
-{
-    PRWaitGroup *group;       /* group this enumerator is bound to */
-    PRThread *thread;               /* thread in midst of an enumeration */
-    _PREnumSeal seal;               /* trying to detect deleted objects */
-    PRUint32 p_timestamp;           /* when enumeration was (re)started */
-    PRRecvWait **waiter;            /* pointer into hash table */
-    PRUintn index;                  /* position in hash table */
-    void *pad[4];                   /* some room to grow */
-};
-
-#endif /* defined(_PPRMWAIT_H) */
-
-/* pprmwait.h */
diff --git a/libs/js/nsprpub/pr/include/private/pprthred.h b/libs/js/nsprpub/pr/include/private/pprthred.h
deleted file mode 100644
index c94133965b..0000000000
--- a/libs/js/nsprpub/pr/include/private/pprthred.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef pprthred_h___
-#define pprthred_h___
-
-/*
-** API for PR private functions.  These calls are to be used by internal
-** developers only.
-*/
-#include "nspr.h"
-
-#if defined(XP_OS2)
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_WIN
-#include <os2.h>
-#endif
-
-PR_BEGIN_EXTERN_C
-
-/*---------------------------------------------------------------------------
-** THREAD PRIVATE FUNCTIONS
----------------------------------------------------------------------------*/
-
-/*
-** Associate a thread object with an existing native thread.
-** 	"type" is the type of thread object to attach
-** 	"priority" is the priority to assign to the thread
-** 	"stack" defines the shape of the threads stack
-**
-** This can return NULL if some kind of error occurs, or if memory is
-** tight. This call invokes "start(obj,arg)" and returns when the
-** function returns. The thread object is automatically destroyed.
-**
-** This call is not normally needed unless you create your own native
-** thread. PR_Init does this automatically for the primordial thread.
-*/
-NSPR_API(PRThread*) PR_AttachThread(PRThreadType type,
-                                     PRThreadPriority priority,
-				     PRThreadStack *stack);
-
-/*
-** Detach the nspr thread from the currently executing native thread.
-** The thread object will be destroyed and all related data attached
-** to it. The exit procs will be invoked.
-**
-** This call is not normally needed unless you create your own native
-** thread. PR_Exit will automatially detach the nspr thread object
-** created by PR_Init for the primordial thread.
-**
-** This call returns after the nspr thread object is destroyed.
-*/
-NSPR_API(void) PR_DetachThread(void);
-
-/*
-** Get the id of the named thread. Each thread is assigned a unique id
-** when it is created or attached.
-*/
-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-
-/*
-** Set the procedure that is called when a thread is dumped. The procedure
-** will be applied to the argument, arg, when called. Setting the procedure
-** to NULL effectively removes it.
-*/
-typedef void (*PRThreadDumpProc)(PRFileDesc *fd, PRThread *t, void *arg);
-NSPR_API(void) PR_SetThreadDumpProc(
-    PRThread* thread, PRThreadDumpProc dump, void *arg);
-
-/*
-** Get this thread's affinity mask.  The affinity mask is a 32 bit quantity
-** marking a bit for each processor this process is allowed to run on.
-** The processor mask is returned in the mask argument.
-** The least-significant-bit represents processor 0.
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask);
-
-/*
-** Set this thread's affinity mask.  
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask );
-
-/*
-** Set the default CPU Affinity mask.
-**
-*/
-NSPR_API(PRInt32) PR_SetCPUAffinityMask(PRUint32 mask);
-
-/*
-** Show status of all threads to standard error output.
-*/
-NSPR_API(void) PR_ShowStatus(void);
-
-/*
-** Set thread recycle mode to on (1) or off (0)
-*/
-NSPR_API(void) PR_SetThreadRecycleMode(PRUint32 flag);
-
-
-/*---------------------------------------------------------------------------
-** THREAD PRIVATE FUNCTIONS FOR GARBAGE COLLECTIBLE THREADS           
----------------------------------------------------------------------------*/
-
-/* 
-** Only Garbage collectible threads participate in resume all, suspend all and 
-** enumeration operations.  They are also different during creation when
-** platform specific action may be needed (For example, all Solaris GC able
-** threads are bound threads).
-*/
-
-/*
-** Same as PR_CreateThread except that the thread is marked as garbage
-** collectible.
-*/
-NSPR_API(PRThread*) PR_CreateThreadGCAble(PRThreadType type,
-				     void (*start)(void *arg),
-				     void *arg,
-				     PRThreadPriority priority,
-				     PRThreadScope scope,
-				     PRThreadState state,
-				     PRUint32 stackSize);
-
-/*
-** Same as PR_AttachThread except that the thread being attached is marked as 
-** garbage collectible.
-*/
-NSPR_API(PRThread*) PR_AttachThreadGCAble(PRThreadType type,
-					PRThreadPriority priority,
-					PRThreadStack *stack);
-
-/*
-** Mark the thread as garbage collectible.
-*/
-NSPR_API(void) PR_SetThreadGCAble(void);
-
-/*
-** Unmark the thread as garbage collectible.
-*/
-NSPR_API(void) PR_ClearThreadGCAble(void);
-
-/*
-** This routine prevents all other GC able threads from running. This call is needed by 
-** the garbage collector.
-*/
-NSPR_API(void) PR_SuspendAll(void);
-
-/*
-** This routine unblocks all other GC able threads that were suspended from running by 
-** PR_SuspendAll(). This call is needed by the garbage collector.
-*/
-NSPR_API(void) PR_ResumeAll(void);
-
-/*
-** Return the thread stack pointer of the given thread. 
-** Needed by the garbage collector.
-*/
-NSPR_API(void *) PR_GetSP(PRThread *thread);
-
-/*
-** Save the registers that the GC would find interesting into the thread
-** "t". isCurrent will be non-zero if the thread state that is being
-** saved is the currently executing thread. Return the address of the
-** first register to be scanned as well as the number of registers to
-** scan in "np".
-**
-** If "isCurrent" is non-zero then it is allowed for the thread context
-** area to be used as scratch storage to hold just the registers
-** necessary for scanning.
-**
-** This function simply calls the internal function _MD_HomeGCRegisters().
-*/
-NSPR_API(PRWord *) PR_GetGCRegisters(PRThread *t, int isCurrent, int *np);
-
-/*
-** (Get|Set)ExecutionEnvironent
-**
-** Used by Java to associate it's execution environment so garbage collector
-** can find it. If return is NULL, then it's probably not a collectable thread.
-**
-** There's no locking required around these calls.
-*/
-NSPR_API(void*) GetExecutionEnvironment(PRThread *thread);
-NSPR_API(void) SetExecutionEnvironment(PRThread* thread, void *environment);
-
-/*
-** Enumeration function that applies "func(thread,i,arg)" to each active
-** thread in the process. The enumerator returns PR_SUCCESS if the enumeration
-** should continue, any other value is considered failure, and enumeration
-** stops, returning the failure value from PR_EnumerateThreads.
-** Needed by the garbage collector.
-*/
-typedef PRStatus (PR_CALLBACK *PREnumerator)(PRThread *t, int i, void *arg);
-NSPR_API(PRStatus) PR_EnumerateThreads(PREnumerator func, void *arg);
-
-/* 
-** Signature of a thread stack scanning function. It is applied to every
-** contiguous group of potential pointers within a thread. Count denotes the
-** number of pointers. 
-*/
-typedef PRStatus 
-(PR_CALLBACK *PRScanStackFun)(PRThread* t,
-			      void** baseAddr, PRUword count, void* closure);
-
-/*
-** Applies scanFun to all contiguous groups of potential pointers 
-** within a thread. This includes the stack, registers, and thread-local
-** data. If scanFun returns a status value other than PR_SUCCESS the scan
-** is aborted, and the status value is returned. 
-*/
-NSPR_API(PRStatus)
-PR_ThreadScanStackPointers(PRThread* t,
-                           PRScanStackFun scanFun, void* scanClosure);
-
-/* 
-** Calls PR_ThreadScanStackPointers for every thread.
-*/
-NSPR_API(PRStatus)
-PR_ScanStackPointers(PRScanStackFun scanFun, void* scanClosure);
-
-/*
-** Returns a conservative estimate on the amount of stack space left
-** on a thread in bytes, sufficient for making decisions about whether 
-** to continue recursing or not.
-*/
-NSPR_API(PRUword)
-PR_GetStackSpaceLeft(PRThread* t);
-
-/*---------------------------------------------------------------------------
-** THREAD CPU PRIVATE FUNCTIONS             
----------------------------------------------------------------------------*/
-
-/*
-** Get a pointer to the primordial CPU.
-*/
-NSPR_API(struct _PRCPU *) _PR_GetPrimordialCPU(void);
-
-/*---------------------------------------------------------------------------
-** THREAD SYNCHRONIZATION PRIVATE FUNCTIONS
----------------------------------------------------------------------------*/
-
-/*
-** Create a new named monitor (named for debugging purposes).
-**  Monitors are re-entrant locks with a built-in condition variable.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-NSPR_API(PRMonitor*) PR_NewNamedMonitor(const char* name);
-
-/*
-** Test and then lock the lock if it's not already locked by some other
-** thread. Return PR_FALSE if some other thread owned the lock at the
-** time of the call.
-*/
-NSPR_API(PRBool) PR_TestAndLock(PRLock *lock);
-
-/*
-** Test and then enter the mutex associated with the monitor if it's not
-** already entered by some other thread. Return PR_FALSE if some other
-** thread owned the mutex at the time of the call.
-*/
-NSPR_API(PRBool) PR_TestAndEnterMonitor(PRMonitor *mon);
-
-/*
-** Return the number of times that the current thread has entered the
-** mutex. Returns zero if the current thread has not entered the mutex.
-*/
-NSPR_API(PRIntn) PR_GetMonitorEntryCount(PRMonitor *mon);
-
-/*
-** Just like PR_CEnterMonitor except that if the monitor is owned by
-** another thread NULL is returned.
-*/
-NSPR_API(PRMonitor*) PR_CTestAndEnterMonitor(void *address);
-
-/*---------------------------------------------------------------------------
-** PLATFORM-SPECIFIC THREAD SYNCHRONIZATION FUNCTIONS
----------------------------------------------------------------------------*/
-#if defined(XP_MAC)
-
-NSPR_API(void) PR_Mac_WaitForAsyncNotify(PRIntervalTime timeout);
-NSPR_API(void) PR_Mac_PostAsyncNotify(PRThread *thread);
-
-#endif /* XP_MAC */
-
-/*---------------------------------------------------------------------------
-** PLATFORM-SPECIFIC INITIALIZATION FUNCTIONS
----------------------------------------------------------------------------*/
-#if defined(IRIX)
-/*
-** Irix specific initialization funtion to be called before PR_Init
-** is called by the application. Sets the CONF_INITUSERS and CONF_INITSIZE
-** attributes of the shared arena set up by nspr.
-**
-** The environment variables _NSPR_IRIX_INITUSERS and _NSPR_IRIX_INITSIZE
-** can also be used to set these arena attributes. If _NSPR_IRIX_INITUSERS
-** is set, but not _NSPR_IRIX_INITSIZE, the value of the CONF_INITSIZE
-** attribute of the nspr arena is scaled as a function of the
-** _NSPR_IRIX_INITUSERS value.
-** 
-** If the _PR_Irix_Set_Arena_Params() is called in addition to setting the
-** environment variables, the values of the environment variables are used.
-** 
-*/
-NSPR_API(void) _PR_Irix_Set_Arena_Params(PRInt32 initusers, PRInt32 initsize);
-
-#endif /* IRIX */
-
-#if defined(XP_OS2)
-/*
-** These functions need to be called at the start and end of a thread.
-** An EXCEPTIONREGISTRATIONRECORD must be declared on the stack and its
-** address passed to the two functions.
-*/
-NSPR_API(void) PR_OS2_SetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* e);
-NSPR_API(void) PR_OS2_UnsetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* e);
-#endif /* XP_OS2 */
-
-/* I think PR_GetMonitorEntryCount is useless. All you really want is this... */
-#define PR_InMonitor(m)		(PR_GetMonitorEntryCount(m) > 0)
-
-/*---------------------------------------------------------------------------
-** Special X-Lock hack for client
----------------------------------------------------------------------------*/
-
-#ifdef XP_UNIX
-extern void PR_XLock(void);
-extern void PR_XUnlock(void);
-extern PRBool PR_XIsLocked(void);
-#endif /* XP_UNIX */
-
-PR_END_EXTERN_C
-
-#endif /* pprthred_h___ */
diff --git a/libs/js/nsprpub/pr/include/private/primpl.h b/libs/js/nsprpub/pr/include/private/primpl.h
deleted file mode 100644
index 79c2543376..0000000000
--- a/libs/js/nsprpub/pr/include/private/primpl.h
+++ /dev/null
@@ -1,2152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef primpl_h___
-#define primpl_h___
-
-/*
- * HP-UX 10.10's pthread.h (DCE threads) includes dce/cma.h, which
- * has:
- *     #define sigaction _sigaction_sys
- * This macro causes chaos if signal.h gets included before pthread.h.
- * To be safe, we include pthread.h first.
- */
-
-#if defined(_PR_PTHREADS)
-#include <pthread.h>
-#endif
-
-#if defined(_PR_BTHREADS)
-#include <kernel/OS.h>
-#endif
-
-#ifdef DARWIN 
-#include <signal.h>
-#endif
-
-#ifdef WINNT
-/* Need to force service-pack 3 extensions to be defined by
-** setting _WIN32_WINNT to NT 4.0 for winsock.h, winbase.h, winnt.h.
-*/
-#ifndef  _WIN32_WINNT
-    #define _WIN32_WINNT 0x0400
-#elif   (_WIN32_WINNT < 0x0400)
-    #undef  _WIN32_WINNT
-    #define _WIN32_WINNT 0x0400
-#endif /* _WIN32_WINNT */
-#endif /* WINNT */
-
-#include "nspr.h"
-#include "prpriv.h"
-
-typedef struct PRSegment PRSegment;
-
-#ifdef XP_MAC
-#include "prosdep.h"
-#include "probslet.h"
-#else
-#include "md/prosdep.h"
-#include "obsolete/probslet.h"
-#endif  /* XP_MAC */
-
-#ifdef _PR_HAVE_POSIX_SEMAPHORES
-#include <semaphore.h>
-#elif defined(_PR_HAVE_SYSV_SEMAPHORES)
-#include <sys/sem.h>
-#endif
-
-/*************************************************************************
-*****  A Word about Model Dependent Function Naming Convention ***********
-*************************************************************************/
-
-/*
-NSPR 2.0 must implement its function across a range of platforms 
-including: MAC, Windows/16, Windows/95, Windows/NT, and several
-variants of Unix. Each implementation shares common code as well 
-as having platform dependent portions. This standard describes how
-the model dependent portions are to be implemented.
-
-In header file pr/include/primpl.h, each publicly declared 
-platform dependent function is declared as:
-
-NSPR_API void _PR_MD_FUNCTION( long arg1, long arg2 );
-#define _PR_MD_FUNCTION _MD_FUNCTION
-
-In header file pr/include/md/<platform>/_<platform>.h, 
-each #define'd macro is redefined as one of:
-
-#define _MD_FUNCTION <blanks>
-#define _MD_FUNCTION <expanded macro>
-#define _MD_FUNCTION <osFunction>
-#define _MD_FUNCTION <_MD_Function>
-
-Where:
-
-<blanks> is no definition at all. In this case, the function is not implemented 
-and is never called for this platform. 
-For example: 
-#define _MD_INIT_CPUS()
-
-<expanded macro> is a C language macro expansion. 
-For example: 
-#define        _MD_CLEAN_THREAD(_thread) \
-    PR_BEGIN_MACRO \
-        PR_DestroyCondVar(_thread->md.asyncIOCVar); \
-        PR_DestroyLock(_thread->md.asyncIOLock); \
-    PR_END_MACRO
-
-<osFunction> is some function implemented by the host operating system. 
-For example: 
-#define _MD_EXIT        exit
-
-<_MD_function> is the name of a function implemented for this platform in 
-pr/src/md/<platform>/<soruce>.c file. 
-For example: 
-#define        _MD_GETFILEINFO         _MD_GetFileInfo
-
-In <source>.c, the implementation is:
-PR_IMPLEMENT(PRInt32) _MD_GetFileInfo(const char *fn, PRFileInfo *info);
-*/
-
-PR_BEGIN_EXTERN_C
-
-typedef struct _MDLock _MDLock;
-typedef struct _MDCVar _MDCVar;
-typedef struct _MDSegment _MDSegment;
-typedef struct _MDThread _MDThread;
-typedef struct _MDThreadStack _MDThreadStack;
-typedef struct _MDSemaphore _MDSemaphore;
-typedef struct _MDDir _MDDir;
-#ifdef MOZ_UNICODE
-typedef struct _MDDirUTF16 _MDDirUTF16;
-#endif /* MOZ_UNICODE */
-typedef struct _MDFileDesc _MDFileDesc;
-typedef struct _MDProcess _MDProcess;
-typedef struct _MDFileMap _MDFileMap;
-
-#if defined(_PR_PTHREADS)
-
-/*
-** The following definitions are unique to implementing NSPR using pthreads.
-** Since pthreads defines most of the thread and thread synchronization
-** stuff, this is a pretty small set.
-*/
-
-#define PT_CV_NOTIFIED_LENGTH 6
-typedef struct _PT_Notified _PT_Notified;
-struct _PT_Notified
-{
-    PRIntn length;              /* # of used entries in this structure */
-    struct
-    {
-        PRCondVar *cv;          /* the condition variable notified */
-        PRIntn times;           /* and the number of times notified */
-    } cv[PT_CV_NOTIFIED_LENGTH];
-    _PT_Notified *link;         /* link to another of these | NULL */
-};
-
-/*
- * bits defined for pthreads 'state' field 
- */
-#define PT_THREAD_DETACHED  0x01    /* thread can't be joined */
-#define PT_THREAD_GLOBAL    0x02    /* a global thread (unlikely) */
-#define PT_THREAD_SYSTEM    0x04    /* system (not user) thread */
-#define PT_THREAD_PRIMORD   0x08    /* this is the primordial thread */
-#define PT_THREAD_ABORTED   0x10    /* thread has been interrupted */
-#define PT_THREAD_GCABLE    0x20    /* thread is garbage collectible */
-#define PT_THREAD_SUSPENDED 0x40    /* thread has been suspended */
-#define PT_THREAD_FOREIGN   0x80    /* thread is not one of ours */
-#define PT_THREAD_BOUND     0x100    /* a bound-global thread */
-
-#define _PT_THREAD_INTERRUPTED(thr)					\
-		(!(thr->interrupt_blocked) && (thr->state & PT_THREAD_ABORTED))
-#define _PT_THREAD_BLOCK_INTERRUPT(thr)				\
-		(thr->interrupt_blocked = 1)
-#define _PT_THREAD_UNBLOCK_INTERRUPT(thr)			\
-		(thr->interrupt_blocked = 0)
-
-#ifdef GC_LEAK_DETECTOR
-/* All threads are GCable. */
-#define _PT_IS_GCABLE_THREAD(thr) 1
-#else
-#define _PT_IS_GCABLE_THREAD(thr) ((thr)->state & PT_THREAD_GCABLE)
-#endif /* GC_LEAK_DETECTOR */
-
-/* 
-** Possible values for thread's suspend field
-** Note that the first two can be the same as they are really mutually exclusive,
-** i.e. both cannot be happening at the same time. We have two symbolic names
-** just as a mnemonic.
-**/
-#define PT_THREAD_RESUMED   0x80    /* thread has been resumed */
-#define PT_THREAD_SETGCABLE 0x100   /* set the GCAble flag */
-
-#if defined(DEBUG)
-
-typedef struct PTDebug
-{
-    PRTime timeStarted;
-    PRUintn locks_created, locks_destroyed;
-    PRUintn locks_acquired, locks_released;
-    PRUintn cvars_created, cvars_destroyed;
-    PRUintn cvars_notified, delayed_cv_deletes;
-} PTDebug;
-
-#endif /* defined(DEBUG) */
-
-NSPR_API(void) PT_FPrintStats(PRFileDesc *fd, const char *msg);
-
-#else /* defined(_PR_PTHREADS) */
-
-NSPR_API(void) PT_FPrintStats(PRFileDesc *fd, const char *msg);
-
-/*
-** This section is contains those parts needed to implement NSPR on
-** platforms in general. One would assume that the pthreads implementation
-** included lots of the same types, at least conceptually.
-*/
-
-/*
- * Local threads only.  No multiple CPU support and hence all the
- * following routines are no-op.
- */
-#ifdef _PR_LOCAL_THREADS_ONLY
-
-#define        _PR_MD_SUSPEND_THREAD(thread)        
-#define        _PR_MD_RESUME_THREAD(thread)        
-#define        _PR_MD_SUSPEND_CPU(cpu)        
-#define        _PR_MD_RESUME_CPU(cpu)        
-#define        _PR_MD_BEGIN_SUSPEND_ALL()        
-#define        _PR_MD_END_SUSPEND_ALL()        
-#define        _PR_MD_BEGIN_RESUME_ALL()        
-#define        _PR_MD_END_RESUME_ALL()
-#define _PR_MD_INIT_ATTACHED_THREAD(thread) PR_FAILURE
-
-#endif
-
-typedef struct _PRCPUQueue _PRCPUQueue;
-typedef struct _PRCPU _PRCPU;
-typedef struct _MDCPU _MDCPU;
-
-struct _PRCPUQueue {
-    _MDLock  runQLock;          /* lock for the run + wait queues */
-    _MDLock  sleepQLock;        /* lock for the run + wait queues */
-    _MDLock  miscQLock;         /* lock for the run + wait queues */
-
-    PRCList runQ[PR_PRIORITY_LAST + 1]; /* run queue for this CPU */
-    PRUint32  runQReadyMask;
-    PRCList sleepQ;
-    PRIntervalTime sleepQmax;
-    PRCList pauseQ;
-    PRCList suspendQ;
-    PRCList waitingToJoinQ;
-
-    PRUintn   numCPUs;          /* number of CPUs using this Q */
-};
-
-struct _PRCPU {
-    PRCList links;              /* link list of CPUs */
-    PRUint32 id;                /* id for this CPU */
-
-    union {
-        PRInt32 bits;
-        PRUint8 missed[4];
-    } u;
-    PRIntn where;               /* index into u.missed */
-    PRPackedBool paused;        /* cpu is paused */
-    PRPackedBool exit;          /* cpu should exit */
-
-    PRThread *thread;           /* native thread for this CPUThread */
-    PRThread *idle_thread;      /* user-level idle thread for this CPUThread */
-
-    PRIntervalTime last_clock;  /* the last time we went into 
-                                 * _PR_ClockInterrupt() on this CPU
-                                 */
-
-    _PRCPUQueue *queue;
-
-    _MDCPU md;
-};
-
-typedef struct _PRInterruptTable {
-    const char *name;
-    PRUintn missed_bit;
-    void (*handler)(void);
-} _PRInterruptTable;
-
-#define _PR_CPU_PTR(_qp) \
-    ((_PRCPU*) ((char*) (_qp) - offsetof(_PRCPU,links)))
-
-#if !defined(IRIX) && !defined(WIN32) && !defined(XP_OS2) \
-        && !(defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY))
-#define _MD_GET_ATTACHED_THREAD()        (_PR_MD_CURRENT_THREAD())
-#endif
-
-#ifdef _PR_LOCAL_THREADS_ONLY 
-
-NSPR_API(struct _PRCPU *)              _pr_currentCPU;
-NSPR_API(PRThread *)                   _pr_currentThread;
-NSPR_API(PRThread *)                   _pr_lastThread;
-NSPR_API(PRInt32)                      _pr_intsOff;
-
-#define _MD_CURRENT_CPU()               (_pr_currentCPU)
-#define _MD_SET_CURRENT_CPU(_cpu)       (_pr_currentCPU = (_cpu))
-#define _MD_CURRENT_THREAD()            (_pr_currentThread)
-#define _MD_SET_CURRENT_THREAD(_thread) (_pr_currentThread = (_thread))
-#define _MD_LAST_THREAD()               (_pr_lastThread)
-#define _MD_SET_LAST_THREAD(t)          (_pr_lastThread = t)
-
-#ifndef XP_MAC
-#define _MD_GET_INTSOFF()               (_pr_intsOff)
-#define _MD_SET_INTSOFF(_val)           (_pr_intsOff = _val)
-#endif
-
-
-/* The unbalanced curly braces in these two macros are intentional */
-#define _PR_LOCK_HEAP() { PRIntn _is; if (_pr_currentCPU) _PR_INTSOFF(_is);
-#define _PR_UNLOCK_HEAP() if (_pr_currentCPU) _PR_INTSON(_is); }
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-extern PRInt32                  _native_threads_only;
-
-#if defined(_PR_GLOBAL_THREADS_ONLY)
-
-#define _MD_GET_INTSOFF() 0
-#define _MD_SET_INTSOFF(_val)
-#define _PR_INTSOFF(_is)
-#define _PR_FAST_INTSON(_is)
-#define _PR_INTSON(_is)
-#define _PR_THREAD_LOCK(_thread)
-#define _PR_THREAD_UNLOCK(_thread)
-#define _PR_RUNQ_LOCK(cpu)
-#define _PR_RUNQ_UNLOCK(cpu)
-#define _PR_SLEEPQ_LOCK(thread)
-#define _PR_SLEEPQ_UNLOCK(thread)
-#define _PR_MISCQ_LOCK(thread)
-#define _PR_MISCQ_UNLOCK(thread)
-#define _PR_CPU_LIST_LOCK()
-#define _PR_CPU_LIST_UNLOCK()
-
-#define _PR_ADD_RUNQ(_thread, _cpu, _pri)
-#define _PR_DEL_RUNQ(_thread)
-#define _PR_ADD_SLEEPQ(_thread, _timeout)
-#define _PR_DEL_SLEEPQ(_thread, _propogate)
-#define _PR_ADD_JOINQ(_thread, _cpu)
-#define _PR_DEL_JOINQ(_thread)
-#define _PR_ADD_SUSPENDQ(_thread, _cpu)
-#define _PR_DEL_SUSPENDQ(_thread)
-
-#define _PR_THREAD_SWITCH_CPU(_thread, _newCPU)
-
-#define _PR_IS_NATIVE_THREAD(thread) 1
-#define _PR_IS_NATIVE_THREAD_SUPPORTED() 1
-
-#else
-
-#ifdef XP_MAC
-
-#define _PR_INTSOFF(_is)        _MD_INTSOFF(_is)
-
-#else /* XP_MAC */
-
-#define _PR_INTSOFF(_is) \
-    PR_BEGIN_MACRO \
-        (_is) = _PR_MD_GET_INTSOFF(); \
-        _PR_MD_SET_INTSOFF(1); \
-    PR_END_MACRO
-
-#endif /* XP_MAC */
-
-#define _PR_FAST_INTSON(_is) \
-    PR_BEGIN_MACRO \
-        _PR_MD_SET_INTSOFF(_is); \
-    PR_END_MACRO
-
-#define _PR_INTSON(_is) \
-    PR_BEGIN_MACRO \
-        if ((_is == 0) && (_PR_MD_CURRENT_CPU())->u.bits) \
-                _PR_IntsOn((_PR_MD_CURRENT_CPU())); \
-        _PR_MD_SET_INTSOFF(_is); \
-    PR_END_MACRO
-
-#ifdef _PR_LOCAL_THREADS_ONLY 
-
-#define _PR_IS_NATIVE_THREAD(thread) 0
-#define _PR_THREAD_LOCK(_thread)
-#define _PR_THREAD_UNLOCK(_thread)
-#define _PR_RUNQ_LOCK(cpu)
-#define _PR_RUNQ_UNLOCK(cpu)
-#define _PR_SLEEPQ_LOCK(thread)
-#define _PR_SLEEPQ_UNLOCK(thread)
-#define _PR_MISCQ_LOCK(thread)
-#define _PR_MISCQ_UNLOCK(thread)
-#define _PR_CPU_LIST_LOCK()
-#define _PR_CPU_LIST_UNLOCK()
-
-#define _PR_ADD_RUNQ(_thread, _cpu, _pri) \
-    PR_BEGIN_MACRO \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_RUNQ(_cpu)[_pri]); \
-    _PR_RUNQREADYMASK(_cpu) |= (1L << _pri); \
-    PR_END_MACRO
-
-#define _PR_DEL_RUNQ(_thread) \
-    PR_BEGIN_MACRO \
-    _PRCPU *_cpu = _thread->cpu; \
-    PRInt32 _pri = _thread->priority; \
-    PR_REMOVE_LINK(&(_thread)->links); \
-    if (PR_CLIST_IS_EMPTY(&_PR_RUNQ(_cpu)[_pri])) \
-        _PR_RUNQREADYMASK(_cpu) &= ~(1L << _pri); \
-    PR_END_MACRO
-
-#define _PR_ADD_SLEEPQ(_thread, _timeout) \
-    _PR_AddSleepQ(_thread, _timeout);   
-
-#define _PR_DEL_SLEEPQ(_thread, _propogate) \
-    _PR_DelSleepQ(_thread, _propogate);  
-
-#define _PR_ADD_JOINQ(_thread, _cpu) \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_WAITINGTOJOINQ(_cpu));
-
-#define _PR_DEL_JOINQ(_thread) \
-    PR_REMOVE_LINK(&(_thread)->links);
-
-#define _PR_ADD_SUSPENDQ(_thread, _cpu) \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_SUSPENDQ(_cpu));
-
-#define _PR_DEL_SUSPENDQ(_thread) \
-    PR_REMOVE_LINK(&(_thread)->links);
-
-#define _PR_THREAD_SWITCH_CPU(_thread, _newCPU)
-
-#define _PR_IS_NATIVE_THREAD_SUPPORTED() 0
-
-#else        /* _PR_LOCAL_THREADS_ONLY */
-
-/* These are for the "combined" thread model */
-
-#define _PR_THREAD_LOCK(_thread) \
-    _PR_MD_LOCK(&(_thread)->threadLock);
-
-#define _PR_THREAD_UNLOCK(_thread) \
-    _PR_MD_UNLOCK(&(_thread)->threadLock);
-
-#define _PR_RUNQ_LOCK(_cpu) \
-    PR_BEGIN_MACRO \
-    _PR_MD_LOCK(&(_cpu)->queue->runQLock );\
-    PR_END_MACRO
-    
-#define _PR_RUNQ_UNLOCK(_cpu) \
-    PR_BEGIN_MACRO \
-    _PR_MD_UNLOCK(&(_cpu)->queue->runQLock );\
-    PR_END_MACRO
-
-#define _PR_SLEEPQ_LOCK(_cpu) \
-    _PR_MD_LOCK(&(_cpu)->queue->sleepQLock );
-
-#define _PR_SLEEPQ_UNLOCK(_cpu) \
-    _PR_MD_UNLOCK(&(_cpu)->queue->sleepQLock );
-
-#define _PR_MISCQ_LOCK(_cpu) \
-    _PR_MD_LOCK(&(_cpu)->queue->miscQLock );
-
-#define _PR_MISCQ_UNLOCK(_cpu) \
-    _PR_MD_UNLOCK(&(_cpu)->queue->miscQLock );
-
-#define _PR_CPU_LIST_LOCK()                 _PR_MD_LOCK(&_pr_cpuLock)
-#define _PR_CPU_LIST_UNLOCK()               _PR_MD_UNLOCK(&_pr_cpuLock)
-
-#define QUEUE_RUN           0x1
-#define QUEUE_SLEEP         0x2
-#define QUEUE_JOIN          0x4
-#define QUEUE_SUSPEND       0x8
-#define QUEUE_LOCK          0x10
-
-#define _PR_ADD_RUNQ(_thread, _cpu, _pri) \
-    PR_BEGIN_MACRO \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_RUNQ(_cpu)[_pri]); \
-    _PR_RUNQREADYMASK(_cpu) |= (1L << _pri); \
-    PR_ASSERT((_thread)->queueCount == 0); \
-    (_thread)->queueCount = QUEUE_RUN; \
-    PR_END_MACRO
-
-#define _PR_DEL_RUNQ(_thread) \
-    PR_BEGIN_MACRO \
-    _PRCPU *_cpu = _thread->cpu; \
-    PRInt32 _pri = _thread->priority; \
-    PR_REMOVE_LINK(&(_thread)->links); \
-    if (PR_CLIST_IS_EMPTY(&_PR_RUNQ(_cpu)[_pri])) \
-        _PR_RUNQREADYMASK(_cpu) &= ~(1L << _pri); \
-    PR_ASSERT((_thread)->queueCount == QUEUE_RUN);\
-    (_thread)->queueCount = 0; \
-    PR_END_MACRO
-
-#define _PR_ADD_SLEEPQ(_thread, _timeout) \
-    PR_ASSERT((_thread)->queueCount == 0); \
-    (_thread)->queueCount = QUEUE_SLEEP; \
-    _PR_AddSleepQ(_thread, _timeout);  
-
-#define _PR_DEL_SLEEPQ(_thread, _propogate) \
-    PR_ASSERT((_thread)->queueCount == QUEUE_SLEEP);\
-    (_thread)->queueCount = 0; \
-    _PR_DelSleepQ(_thread, _propogate);  
-
-#define _PR_ADD_JOINQ(_thread, _cpu) \
-    PR_ASSERT((_thread)->queueCount == 0); \
-    (_thread)->queueCount = QUEUE_JOIN; \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_WAITINGTOJOINQ(_cpu));
-
-#define _PR_DEL_JOINQ(_thread) \
-    PR_ASSERT((_thread)->queueCount == QUEUE_JOIN);\
-    (_thread)->queueCount = 0; \
-    PR_REMOVE_LINK(&(_thread)->links);
-
-#define _PR_ADD_SUSPENDQ(_thread, _cpu) \
-    PR_ASSERT((_thread)->queueCount == 0); \
-    (_thread)->queueCount = QUEUE_SUSPEND; \
-    PR_APPEND_LINK(&(_thread)->links, &_PR_SUSPENDQ(_cpu));
-
-#define _PR_DEL_SUSPENDQ(_thread) \
-    PR_ASSERT((_thread)->queueCount == QUEUE_SUSPEND);\
-    (_thread)->queueCount = 0; \
-    PR_REMOVE_LINK(&(_thread)->links);
-
-#define _PR_THREAD_SWITCH_CPU(_thread, _newCPU) \
-    (_thread)->cpu = (_newCPU);
-
-#define _PR_IS_NATIVE_THREAD(thread) (thread->flags & _PR_GLOBAL_SCOPE)
-#define _PR_IS_NATIVE_THREAD_SUPPORTED() 1
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-#endif /* _PR_GLOBAL_THREADS_ONLY */
-
-#define _PR_SET_RESCHED_FLAG() _PR_MD_CURRENT_CPU()->u.missed[3] = 1
-#define _PR_CLEAR_RESCHED_FLAG() _PR_MD_CURRENT_CPU()->u.missed[3] = 0
-
-extern _PRInterruptTable _pr_interruptTable[];
-
-/* Bits for _pr_interruptState.u.missed[0,1] */
-#define _PR_MISSED_CLOCK    0x1
-#define _PR_MISSED_IO        0x2
-#define _PR_MISSED_CHILD    0x4
-
-extern void _PR_IntsOn(_PRCPU *cpu);
-
-NSPR_API(void) _PR_WakeupCPU(void);
-NSPR_API(void) _PR_PauseCPU(void);
-
-/************************************************************************/
-
-#define _PR_LOCK_LOCK(_lock) \
-    _PR_MD_LOCK(&(_lock)->ilock);
-#define _PR_LOCK_UNLOCK(_lock) \
-    _PR_MD_UNLOCK(&(_lock)->ilock);
-    
-extern void _PR_UnblockLockWaiter(PRLock *lock);
-
-#define _PR_LOCK_PTR(_qp) \
-    ((PRLock*) ((char*) (_qp) - offsetof(PRLock,links)))
-
-/************************************************************************/
-
-#define _PR_CVAR_LOCK(_cvar) \
-    _PR_MD_LOCK(&(_cvar)->ilock); 
-#define _PR_CVAR_UNLOCK(_cvar) \
-    _PR_MD_UNLOCK(&(_cvar)->ilock);
-
-extern PRStatus _PR_WaitCondVar(
-    PRThread *thread, PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout);
-extern PRUint32 _PR_CondVarToString(PRCondVar *cvar, char *buf, PRUint32 buflen);
-
-NSPR_API(void) _PR_Notify(PRMonitor *mon, PRBool all, PRBool sticky);
-
-/* PRThread.flags */
-#define _PR_SYSTEM          0x01
-#define _PR_INTERRUPT       0x02
-#define _PR_ATTACHED        0x04        /* created via PR_AttachThread */
-#define _PR_PRIMORDIAL      0x08        /* the thread that called PR_Init */
-#define _PR_ON_SLEEPQ       0x10        /* thread is on the sleepQ */
-#define _PR_ON_PAUSEQ       0x20        /* thread is on the pauseQ */
-#define _PR_SUSPENDING      0x40        /* thread wants to suspend */
-#define _PR_GLOBAL_SCOPE    0x80        /* thread is global scope */
-#define _PR_IDLE_THREAD     0x200       /* this is an idle thread        */
-#define _PR_GCABLE_THREAD   0x400       /* this is a collectable thread */
-#define _PR_BOUND_THREAD    0x800       /* a bound thread */
-#define _PR_INTERRUPT_BLOCKED	0x1000	/* interrupts blocked */
-
-/* PRThread.state */
-#define _PR_UNBORN       0
-#define _PR_RUNNABLE     1
-#define _PR_RUNNING      2
-#define _PR_LOCK_WAIT    3
-#define _PR_COND_WAIT    4
-#define _PR_JOIN_WAIT    5
-#define _PR_IO_WAIT      6
-#define _PR_SUSPENDED    7
-#define _PR_DEAD_STATE   8  /* for debugging */
-
-/* PRThreadStack.flags */
-#define _PR_STACK_VM            0x1    /* using vm instead of malloc */
-#define _PR_STACK_MAPPED        0x2    /* vm is mapped */
-#define _PR_STACK_PRIMORDIAL    0x4    /* stack for primordial thread */
-
-/* 
-** If the default stcksize from the client is zero, we need to pick a machine
-** dependent value.  This is only for standard user threads.  For custom threads,
-** 0 has a special meaning.
-** Adjust stackSize. Round up to a page boundary.
-*/
-
-#ifndef _MD_MINIMUM_STACK_SIZE
-#define _MD_MINIMUM_STACK_SIZE	0
-#endif
-
-#if (!defined(HAVE_CUSTOM_USER_THREADS))
-#define        _PR_ADJUST_STACKSIZE(stackSize) \
-        PR_BEGIN_MACRO \
-    if (stackSize == 0) \
-                stackSize = _MD_DEFAULT_STACK_SIZE; \
-    if (stackSize < _MD_MINIMUM_STACK_SIZE) \
-                stackSize = _MD_MINIMUM_STACK_SIZE; \
-    stackSize = (stackSize + (1 << _pr_pageShift) - 1) >> _pr_pageShift; \
-    stackSize <<= _pr_pageShift; \
-        PR_END_MACRO
-#else
-#define        _PR_ADJUST_STACKSIZE(stackSize)
-#endif
-
-#ifdef GC_LEAK_DETECTOR
-/* All threads are GCable. */
-#define _PR_IS_GCABLE_THREAD(thr) 1
-#else
-#define _PR_IS_GCABLE_THREAD(thr) ((thr)->flags & _PR_GCABLE_THREAD)
-#endif /* GC_LEAK_DETECTOR */
-
-#define _PR_PENDING_INTERRUPT(thr)					\
-		(!((thr)->flags & _PR_INTERRUPT_BLOCKED) && ((thr)->flags & _PR_INTERRUPT))
-#define _PR_THREAD_BLOCK_INTERRUPT(thr)			\
-		(thr->flags |= _PR_INTERRUPT_BLOCKED)
-#define _PR_THREAD_UNBLOCK_INTERRUPT(thr)			\
-		(thr->flags &= ~_PR_INTERRUPT_BLOCKED)
-
-#define _PR_THREAD_PTR(_qp) \
-    ((PRThread*) ((char*) (_qp) - offsetof(PRThread,links)))
-
-#define _PR_ACTIVE_THREAD_PTR(_qp) \
-    ((PRThread*) ((char*) (_qp) - offsetof(PRThread,active)))
-
-#define _PR_THREAD_CONDQ_PTR(_qp) \
-    ((PRThread*) ((char*) (_qp) - offsetof(PRThread,waitQLinks)))
-
-#define _PR_THREAD_MD_TO_PTR(_md) \
-    ((PRThread*) ((char*) (_md) - offsetof(PRThread,md)))
-
-#define _PR_THREAD_STACK_TO_PTR(_stack) \
-    ((PRThread*) (_stack->thr))
-
-extern PRCList _pr_active_local_threadQ;
-extern PRCList _pr_active_global_threadQ;
-extern PRCList _pr_cpuQ;
-extern _MDLock  _pr_cpuLock;
-extern PRInt32 _pr_md_idle_cpus;
-
-#define _PR_ACTIVE_LOCAL_THREADQ()          _pr_active_local_threadQ
-#define _PR_ACTIVE_GLOBAL_THREADQ()         _pr_active_global_threadQ
-#define _PR_CPUQ()                          _pr_cpuQ
-#define _PR_RUNQ(_cpu)                      ((_cpu)->queue->runQ)
-#define _PR_RUNQREADYMASK(_cpu)             ((_cpu)->queue->runQReadyMask)
-#define _PR_SLEEPQ(_cpu)                    ((_cpu)->queue->sleepQ)
-#define _PR_SLEEPQMAX(_cpu)                 ((_cpu)->queue->sleepQmax)
-#define _PR_PAUSEQ(_cpu)                    ((_cpu)->queue->pauseQ)
-#define _PR_SUSPENDQ(_cpu)                  ((_cpu)->queue->suspendQ)
-#define _PR_WAITINGTOJOINQ(_cpu)            ((_cpu)->queue->waitingToJoinQ)
-
-extern PRUint32 _pr_recycleThreads;   /* Flag for behavior on thread cleanup */
-extern PRLock *_pr_deadQLock;
-extern PRUint32 _pr_numNativeDead;
-extern PRUint32 _pr_numUserDead;
-extern PRCList _pr_deadNativeQ;
-extern PRCList _pr_deadUserQ;
-#define _PR_DEADNATIVEQ     _pr_deadNativeQ
-#define _PR_DEADUSERQ       _pr_deadUserQ
-#define _PR_DEADQ_LOCK      PR_Lock(_pr_deadQLock);
-#define _PR_DEADQ_UNLOCK    PR_Unlock(_pr_deadQLock);
-#define _PR_INC_DEADNATIVE  (_pr_numNativeDead++)
-#define _PR_DEC_DEADNATIVE  (_pr_numNativeDead--)
-#define _PR_NUM_DEADNATIVE  (_pr_numNativeDead)
-#define _PR_INC_DEADUSER    (_pr_numUserDead++)
-#define _PR_DEC_DEADUSER    (_pr_numUserDead--)
-#define _PR_NUM_DEADUSER    (_pr_numUserDead)
-
-extern PRUint32 _pr_utid;
-
-extern struct _PRCPU  *_pr_primordialCPU;
-
-extern PRLock *_pr_activeLock;          /* lock for userActive and systemActive */
-extern PRInt32 _pr_userActive;          /* number of active user threads */
-extern PRInt32 _pr_systemActive;        /* number of active system threads */
-extern PRInt32 _pr_primordialExitCount; /* number of user threads left
-                                         * before the primordial thread
-                                         * can exit.  */
-extern PRCondVar *_pr_primordialExitCVar; /* the condition variable for
-                                           * notifying the primordial thread
-                                           * when all other user threads
-                                           * have terminated.  */
-
-extern PRUintn _pr_maxPTDs;
-
-extern PRLock *_pr_terminationCVLock;
-
-/*************************************************************************
-* Internal routines either called by PR itself or from machine-dependent *
-* code.                                                                  *
-*************************************************************************/
-
-extern void _PR_ClockInterrupt(void);
-
-extern void _PR_Schedule(void);
-extern void _PR_SetThreadPriority(
-    PRThread* thread, PRThreadPriority priority);
-
-/***********************************************************************
-** FUNCTION:	_PR_NewSegment()
-** DESCRIPTION:
-**   Allocate a memory segment. The "size" value is rounded up to the
-**   native system page size and a page aligned portion of memory is
-**   returned.  This memory is not part of the malloc heap. If "vaddr" is
-**   not NULL then PR tries to allocate the segment at the desired virtual
-**   address.
-** INPUTS:	size:  size of the desired memory segment
-**          vaddr:  address at which the newly aquired segment is to be
-**                  mapped into memory.
-** OUTPUTS:	a memory segment is allocated, a PRSegment is allocated
-** RETURN:	pointer to PRSegment
-***********************************************************************/
-extern PRSegment* _PR_NewSegment(PRUint32 size, void *vaddr);
-
-/***********************************************************************
-** FUNCTION:	_PR_DestroySegment()
-** DESCRIPTION:
-**   The memory segment and the PRSegment are freed
-** INPUTS:	seg:  pointer to PRSegment to be freed
-** OUTPUTS:	the the PRSegment and its associated memory segment are freed
-** RETURN:	void
-***********************************************************************/
-extern void _PR_DestroySegment(PRSegment *seg);
-
-extern PRThreadStack * _PR_NewStack(PRUint32 stackSize);
-extern void _PR_FreeStack(PRThreadStack *stack);
-extern PRBool _PR_NotifyThread (PRThread *thread, PRThread *me);
-extern void _PR_NotifyLockedThread (PRThread *thread);
-
-NSPR_API(void) _PR_AddSleepQ(PRThread *thread, PRIntervalTime timeout);
-NSPR_API(void) _PR_DelSleepQ(PRThread *thread, PRBool propogate_time);
-
-extern void _PR_AddThreadToRunQ(PRThread *me, PRThread *thread);
-
-NSPR_API(PRThread*) _PR_CreateThread(PRThreadType type,
-                                     void (*start)(void *arg),
-                                     void *arg,
-                                     PRThreadPriority priority,
-                                     PRThreadScope scope,
-                                     PRThreadState state,
-                                     PRUint32 stackSize,
-                     PRUint32 flags);
-
-extern void _PR_NativeDestroyThread(PRThread *thread);
-extern void _PR_UserDestroyThread(PRThread *thread);
-
-extern PRThread* _PRI_AttachThread(
-    PRThreadType type, PRThreadPriority priority,
-    PRThreadStack *stack, PRUint32 flags);
-
-extern void _PRI_DetachThread(void);
-
-
-#define _PR_IO_PENDING(_thread) ((_thread)->io_pending)
-
-NSPR_API(void) _PR_MD_INIT_CPUS();
-#define    _PR_MD_INIT_CPUS _MD_INIT_CPUS
-
-NSPR_API(void) _PR_MD_WAKEUP_CPUS();
-#define    _PR_MD_WAKEUP_CPUS _MD_WAKEUP_CPUS
-
-/* Interrupts related */
-
-NSPR_API(void) _PR_MD_START_INTERRUPTS(void);
-#define    _PR_MD_START_INTERRUPTS _MD_START_INTERRUPTS
-
-NSPR_API(void) _PR_MD_STOP_INTERRUPTS(void);
-#define    _PR_MD_STOP_INTERRUPTS _MD_STOP_INTERRUPTS
-
-NSPR_API(void) _PR_MD_ENABLE_CLOCK_INTERRUPTS(void);
-#define    _PR_MD_ENABLE_CLOCK_INTERRUPTS _MD_ENABLE_CLOCK_INTERRUPTS
-
-NSPR_API(void) _PR_MD_DISABLE_CLOCK_INTERRUPTS(void);
-#define    _PR_MD_DISABLE_CLOCK_INTERRUPTS _MD_DISABLE_CLOCK_INTERRUPTS
-
-NSPR_API(void) _PR_MD_BLOCK_CLOCK_INTERRUPTS(void);
-#define    _PR_MD_BLOCK_CLOCK_INTERRUPTS _MD_BLOCK_CLOCK_INTERRUPTS
-
-NSPR_API(void) _PR_MD_UNBLOCK_CLOCK_INTERRUPTS(void);
-#define    _PR_MD_UNBLOCK_CLOCK_INTERRUPTS _MD_UNBLOCK_CLOCK_INTERRUPTS
-
-/* The _PR_MD_WAIT_LOCK and _PR_MD_WAKEUP_WAITER functions put to sleep and
- * awaken a thread which is waiting on a lock or cvar.
- */
-extern PRStatus _PR_MD_WAIT(PRThread *, PRIntervalTime timeout);
-#define    _PR_MD_WAIT _MD_WAIT
-
-extern PRStatus _PR_MD_WAKEUP_WAITER(PRThread *);
-#define    _PR_MD_WAKEUP_WAITER _MD_WAKEUP_WAITER
-
-#ifndef _PR_LOCAL_THREADS_ONLY /* not if only local threads supported */
-NSPR_API(void) _PR_MD_CLOCK_INTERRUPT(void);
-#define    _PR_MD_CLOCK_INTERRUPT _MD_CLOCK_INTERRUPT
-#endif
-
-/* Stack debugging */
-NSPR_API(void) _PR_MD_INIT_STACK(PRThreadStack *ts, PRIntn redzone);
-#define    _PR_MD_INIT_STACK _MD_INIT_STACK
-
-NSPR_API(void) _PR_MD_CLEAR_STACK(PRThreadStack* ts);
-#define    _PR_MD_CLEAR_STACK _MD_CLEAR_STACK
-
-/* CPU related */
-NSPR_API(PRInt32) _PR_MD_GET_INTSOFF(void);
-#define    _PR_MD_GET_INTSOFF _MD_GET_INTSOFF
-
-NSPR_API(void) _PR_MD_SET_INTSOFF(PRInt32 _val);
-#define    _PR_MD_SET_INTSOFF _MD_SET_INTSOFF
-
-NSPR_API(_PRCPU*) _PR_MD_CURRENT_CPU(void);
-#define    _PR_MD_CURRENT_CPU _MD_CURRENT_CPU
-
-NSPR_API(void) _PR_MD_SET_CURRENT_CPU(_PRCPU *cpu);
-#define    _PR_MD_SET_CURRENT_CPU _MD_SET_CURRENT_CPU
-
-NSPR_API(void) _PR_MD_INIT_RUNNING_CPU(_PRCPU *cpu);
-#define    _PR_MD_INIT_RUNNING_CPU _MD_INIT_RUNNING_CPU
-
-/*
- * Returns the number of threads awoken or 0 if a timeout occurred;
- */
-extern PRInt32 _PR_MD_PAUSE_CPU(PRIntervalTime timeout);
-#define    _PR_MD_PAUSE_CPU _MD_PAUSE_CPU
-
-extern void _PR_MD_CLEANUP_BEFORE_EXIT(void);
-#define _PR_MD_CLEANUP_BEFORE_EXIT _MD_CLEANUP_BEFORE_EXIT
-
-extern void _PR_MD_EXIT(PRIntn status);
-#define    _PR_MD_EXIT _MD_EXIT
-
-/* Locks related */
-
-NSPR_API(void) _PR_MD_INIT_LOCKS(void);
-#define    _PR_MD_INIT_LOCKS _MD_INIT_LOCKS
-
-NSPR_API(PRStatus) _PR_MD_NEW_LOCK(_MDLock *md);
-#define    _PR_MD_NEW_LOCK _MD_NEW_LOCK
-
-NSPR_API(void) _PR_MD_FREE_LOCK(_MDLock *md);
-#define    _PR_MD_FREE_LOCK _MD_FREE_LOCK
-
-NSPR_API(void) _PR_MD_LOCK(_MDLock *md);
-#define    _PR_MD_LOCK _MD_LOCK
-
-/* Return 0 on success, a nonzero value on failure. */
-NSPR_API(PRIntn) _PR_MD_TEST_AND_LOCK(_MDLock *md);
-#define    _PR_MD_TEST_AND_LOCK _MD_TEST_AND_LOCK
-
-NSPR_API(void) _PR_MD_UNLOCK(_MDLock *md);
-#define    _PR_MD_UNLOCK _MD_UNLOCK
-
-NSPR_API(void) _PR_MD_IOQ_LOCK(void);
-#define    _PR_MD_IOQ_LOCK _MD_IOQ_LOCK
-
-NSPR_API(void) _PR_MD_IOQ_UNLOCK(void);
-#define    _PR_MD_IOQ_UNLOCK _MD_IOQ_UNLOCK
-
-#ifndef _PR_LOCAL_THREADS_ONLY /* not if only local threads supported */
-/* Semaphore related -- only for native threads */
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-NSPR_API(void) _PR_MD_NEW_SEM(_MDSemaphore *md, PRUintn value);
-#define _PR_MD_NEW_SEM _MD_NEW_SEM
-
-NSPR_API(void) _PR_MD_DESTROY_SEM(_MDSemaphore *md);
-#define _PR_MD_DESTROY_SEM _MD_DESTROY_SEM
-
-NSPR_API(PRStatus) _PR_MD_TIMED_WAIT_SEM(
-    _MDSemaphore *md, PRIntervalTime timeout);
-#define _PR_MD_TIMED_WAIT_SEM _MD_TIMED_WAIT_SEM
-
-NSPR_API(PRStatus) _PR_MD_WAIT_SEM(_MDSemaphore *md);
-#define _PR_MD_WAIT_SEM _MD_WAIT_SEM
-
-NSPR_API(void) _PR_MD_POST_SEM(_MDSemaphore *md);
-#define _PR_MD_POST_SEM _MD_POST_SEM
-#endif /* HAVE_CVAR_BUILT_ON_SEM */
-
-#endif
-
-/* Condition Variables related -- only for native threads */
-
-#ifndef _PR_LOCAL_THREADS_ONLY /* not if only local threads supported */
-NSPR_API(PRInt32) _PR_MD_NEW_CV(_MDCVar *md);
-#define    _PR_MD_NEW_CV _MD_NEW_CV
-
-NSPR_API(void) _PR_MD_FREE_CV(_MDCVar *md);
-#define    _PR_MD_FREE_CV _MD_FREE_CV
-
-NSPR_API(void) _PR_MD_WAIT_CV(
-    _MDCVar *mdCVar,_MDLock *mdLock,PRIntervalTime timeout);
-#define    _PR_MD_WAIT_CV _MD_WAIT_CV
-
-NSPR_API(void) _PR_MD_NOTIFY_CV(_MDCVar *md, _MDLock *lock);
-#define    _PR_MD_NOTIFY_CV _MD_NOTIFY_CV
-
-NSPR_API(void) _PR_MD_NOTIFYALL_CV(_MDCVar *md, _MDLock *lock);
-#define    _PR_MD_NOTIFYALL_CV _MD_NOTIFYALL_CV
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-/* Threads related */
-NSPR_API(PRThread*) _PR_MD_CURRENT_THREAD(void);
-#define    _PR_MD_CURRENT_THREAD _MD_CURRENT_THREAD
-
-NSPR_API(PRThread*) _PR_MD_GET_ATTACHED_THREAD(void);
-#define    _PR_MD_GET_ATTACHED_THREAD _MD_GET_ATTACHED_THREAD
-
-NSPR_API(PRThread*) _PR_MD_LAST_THREAD(void);
-#define    _PR_MD_LAST_THREAD _MD_LAST_THREAD
-
-NSPR_API(void) _PR_MD_SET_CURRENT_THREAD(PRThread *thread);
-#define    _PR_MD_SET_CURRENT_THREAD _MD_SET_CURRENT_THREAD
-
-NSPR_API(void) _PR_MD_SET_LAST_THREAD(PRThread *thread);
-#define    _PR_MD_SET_LAST_THREAD _MD_SET_LAST_THREAD
-
-extern PRStatus _PR_MD_INIT_THREAD(PRThread *thread);
-#define    _PR_MD_INIT_THREAD _MD_INIT_THREAD
-
-extern void _PR_MD_EXIT_THREAD(PRThread *thread);
-#define    _PR_MD_EXIT_THREAD _MD_EXIT_THREAD
-
-#ifndef _PR_LOCAL_THREADS_ONLY /* not if only local threads supported */
-
-NSPR_API(PRStatus) _PR_MD_INIT_ATTACHED_THREAD(PRThread *thread);
-#define    _PR_MD_INIT_ATTACHED_THREAD _MD_INIT_ATTACHED_THREAD
-
-extern void _PR_MD_SUSPEND_THREAD(PRThread *thread);
-#define    _PR_MD_SUSPEND_THREAD _MD_SUSPEND_THREAD
-
-extern void _PR_MD_RESUME_THREAD(PRThread *thread);
-#define    _PR_MD_RESUME_THREAD _MD_RESUME_THREAD
-
-extern void _PR_MD_SUSPEND_CPU(_PRCPU  *cpu);
-#define    _PR_MD_SUSPEND_CPU _MD_SUSPEND_CPU
-
-extern void _PR_MD_RESUME_CPU(_PRCPU  *cpu);
-#define    _PR_MD_RESUME_CPU _MD_RESUME_CPU
-
-extern void _PR_MD_BEGIN_SUSPEND_ALL(void);
-#define    _PR_MD_BEGIN_SUSPEND_ALL _MD_BEGIN_SUSPEND_ALL
-
-extern void _PR_MD_END_SUSPEND_ALL(void);
-#define    _PR_MD_END_SUSPEND_ALL _MD_END_SUSPEND_ALL
-
-extern void _PR_MD_BEGIN_RESUME_ALL(void);
-#define    _PR_MD_BEGIN_RESUME_ALL _MD_BEGIN_RESUME_ALL
-
-extern void _PR_MD_END_RESUME_ALL(void);
-#define    _PR_MD_END_RESUME_ALL _MD_END_RESUME_ALL
-
-#if defined(IRIX) 
-NSPR_API(void) _PR_IRIX_CHILD_PROCESS(void);
-#endif        /* IRIX */
-
-#endif        /* !_PR_LOCAL_THREADS_ONLY */
-
-extern void _PR_MD_CLEAN_THREAD(PRThread *thread);
-#define    _PR_MD_CLEAN_THREAD _MD_CLEAN_THREAD
-
-#ifdef HAVE_CUSTOM_USER_THREADS
-extern void _PR_MD_CREATE_PRIMORDIAL_USER_THREAD(PRThread *);
-#define    _PR_MD_CREATE_PRIMORDIAL_USER_THREAD _MD_CREATE_PRIMORDIAL_USER_THREAD
-
-extern PRThread* _PR_MD_CREATE_USER_THREAD(
-                        PRUint32 stacksize,
-                        void (*start)(void *),
-                        void *arg);
-#define    _PR_MD_CREATE_USER_THREAD _MD_CREATE_USER_THREAD
-#endif
-
-extern PRStatus _PR_MD_CREATE_THREAD(
-                        PRThread *thread, 
-                        void (*start) (void *), 
-                        PRThreadPriority priority,                      
-                        PRThreadScope scope,
-                        PRThreadState state,
-                        PRUint32 stackSize);
-#define    _PR_MD_CREATE_THREAD _MD_CREATE_THREAD
-
-extern void _PR_MD_JOIN_THREAD(_MDThread *md);
-#define    _PR_MD_JOIN_THREAD _MD_JOIN_THREAD
-
-extern void _PR_MD_END_THREAD(void);
-#define    _PR_MD_END_THREAD _MD_END_THREAD
-
-extern void _PR_MD_YIELD(void);
-#define    _PR_MD_YIELD _MD_YIELD
-
-extern void _PR_MD_SET_PRIORITY(_MDThread *md, PRThreadPriority newPri);
-#define    _PR_MD_SET_PRIORITY _MD_SET_PRIORITY
-
-NSPR_API(void) _PR_MD_SUSPENDALL(void);
-#define    _PR_MD_SUSPENDALL _MD_SUSPENDALL
-
-NSPR_API(void) _PR_MD_RESUMEALL(void);
-#define    _PR_MD_RESUMEALL _MD_RESUMEALL
-
-extern void _PR_MD_INIT_CONTEXT(
-    PRThread *thread, char *top, void (*start) (void), PRBool *status);
-#define    _PR_MD_INIT_CONTEXT _MD_INIT_CONTEXT
-
-extern void _PR_MD_SWITCH_CONTEXT(PRThread *thread);
-#define    _PR_MD_SWITCH_CONTEXT _MD_SWITCH_CONTEXT
-
-extern void _PR_MD_RESTORE_CONTEXT(PRThread *thread);
-#define    _PR_MD_RESTORE_CONTEXT _MD_RESTORE_CONTEXT
-
-/* Segment related */
-extern void _PR_MD_INIT_SEGS(void);
-#define    _PR_MD_INIT_SEGS _MD_INIT_SEGS
-
-extern PRStatus _PR_MD_ALLOC_SEGMENT(PRSegment *seg, PRUint32 size, void *vaddr);
-#define    _PR_MD_ALLOC_SEGMENT _MD_ALLOC_SEGMENT
-
-extern void _PR_MD_FREE_SEGMENT(PRSegment *seg);
-#define    _PR_MD_FREE_SEGMENT _MD_FREE_SEGMENT
-
-/* Directory enumeration related */
-extern PRStatus _PR_MD_OPEN_DIR(_MDDir *md,const char *name);
-#define    _PR_MD_OPEN_DIR _MD_OPEN_DIR
-
-extern char * _PR_MD_READ_DIR(_MDDir *md, PRIntn flags);
-#define    _PR_MD_READ_DIR _MD_READ_DIR
-
-extern PRInt32 _PR_MD_CLOSE_DIR(_MDDir *md);
-#define    _PR_MD_CLOSE_DIR _MD_CLOSE_DIR
-
-/* Named semaphores related */
-extern PRSem * _PR_MD_OPEN_SEMAPHORE(
-    const char *osname, PRIntn flags, PRIntn mode, PRUintn value);
-#define    _PR_MD_OPEN_SEMAPHORE _MD_OPEN_SEMAPHORE
-
-extern PRStatus _PR_MD_WAIT_SEMAPHORE(PRSem *sem);
-#define    _PR_MD_WAIT_SEMAPHORE _MD_WAIT_SEMAPHORE
-
-extern PRStatus _PR_MD_POST_SEMAPHORE(PRSem *sem);
-#define    _PR_MD_POST_SEMAPHORE _MD_POST_SEMAPHORE
-
-extern PRStatus _PR_MD_CLOSE_SEMAPHORE(PRSem *sem);
-#define    _PR_MD_CLOSE_SEMAPHORE _MD_CLOSE_SEMAPHORE
-
-extern PRStatus _PR_MD_DELETE_SEMAPHORE(const char *osname);
-#define    _PR_MD_DELETE_SEMAPHORE _MD_DELETE_SEMAPHORE
-
-/* I/O related */
-extern void _PR_MD_INIT_FILEDESC(PRFileDesc *fd);
-#define    _PR_MD_INIT_FILEDESC _MD_INIT_FILEDESC
-
-#ifdef XP_MAC
-extern void _PR_MD_FREE_FILEDESC(PRFileDesc *fd);
-#define    _PR_MD_FREE_FILEDESC _MD_FREE_FILEDESC
-#endif
-
-extern void _PR_MD_MAKE_NONBLOCK(PRFileDesc *fd);
-#define    _PR_MD_MAKE_NONBLOCK _MD_MAKE_NONBLOCK
-
-/* File I/O related */
-extern PROsfd _PR_MD_OPEN(const char *name, PRIntn osflags, PRIntn mode);
-#define    _PR_MD_OPEN _MD_OPEN
-
-extern PROsfd _PR_MD_OPEN_FILE(const char *name, PRIntn osflags, PRIntn mode);
-#define    _PR_MD_OPEN_FILE _MD_OPEN_FILE
-
-extern PRInt32 _PR_MD_CLOSE_FILE(PROsfd osfd);
-#define    _PR_MD_CLOSE_FILE _MD_CLOSE_FILE
-
-extern PRInt32 _PR_MD_READ(PRFileDesc *fd, void *buf, PRInt32 amount);
-#define    _PR_MD_READ _MD_READ
-
-extern PRInt32 _PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 amount);
-#define    _PR_MD_WRITE _MD_WRITE
-
-extern PRInt32 _PR_MD_WRITEV(
-    PRFileDesc *fd, const struct PRIOVec *iov,
-    PRInt32 iov_size, PRIntervalTime timeout);
-#define    _PR_MD_WRITEV _MD_WRITEV
-
-extern PRInt32 _PR_MD_FSYNC(PRFileDesc *fd);
-#define    _PR_MD_FSYNC _MD_FSYNC
-
-extern PRInt32 _PR_MD_DELETE(const char *name);
-#define        _PR_MD_DELETE _MD_DELETE
-
-extern PRInt32 _PR_MD_RENAME(const char *from, const char *to);
-#define _PR_MD_RENAME _MD_RENAME
-
-extern PRInt32 _PR_MD_ACCESS(const char *name, PRAccessHow how);
-#define _PR_MD_ACCESS _MD_ACCESS
-
-extern PRInt32 _PR_MD_STAT(const char *name, struct stat *buf);
-#define _PR_MD_STAT _MD_STAT
-
-extern PRInt32 _PR_MD_MKDIR(const char *name, PRIntn mode);
-#define _PR_MD_MKDIR _MD_MKDIR
-
-extern PRInt32 _PR_MD_MAKE_DIR(const char *name, PRIntn mode);
-#define _PR_MD_MAKE_DIR _MD_MAKE_DIR
-
-extern PRInt32 _PR_MD_RMDIR(const char *name);
-#define _PR_MD_RMDIR _MD_RMDIR
-
-#ifdef MOZ_UNICODE
-/* UTF16 File I/O related */
-extern PRStatus _PR_MD_OPEN_DIR_UTF16(_MDDirUTF16 *md, const PRUnichar *name);
-#define    _PR_MD_OPEN_DIR_UTF16 _MD_OPEN_DIR_UTF16
-
-extern PROsfd _PR_MD_OPEN_FILE_UTF16(const PRUnichar *name, PRIntn osflags, PRIntn mode);
-#define    _PR_MD_OPEN_FILE_UTF16 _MD_OPEN_FILE_UTF16
-
-extern PRUnichar * _PR_MD_READ_DIR_UTF16(_MDDirUTF16 *md, PRIntn flags);
-#define    _PR_MD_READ_DIR_UTF16 _MD_READ_DIR_UTF16
-
-extern PRInt32 _PR_MD_CLOSE_DIR_UTF16(_MDDirUTF16 *md);
-#define    _PR_MD_CLOSE_DIR_UTF16 _MD_CLOSE_DIR_UTF16
-
-extern PRInt32 _PR_MD_GETFILEINFO64_UTF16(const PRUnichar *fn, PRFileInfo64 *info);
-#define _PR_MD_GETFILEINFO64_UTF16 _MD_GETFILEINFO64_UTF16
-#endif /* MOZ_UNICODE */
-
-/* Socket I/O related */
-extern void _PR_MD_INIT_IO(void);
-#define    _PR_MD_INIT_IO _MD_INIT_IO
-
-extern PRInt32 _PR_MD_CLOSE_SOCKET(PROsfd osfd);
-#define    _PR_MD_CLOSE_SOCKET _MD_CLOSE_SOCKET
-
-extern PRInt32 _PR_MD_CONNECT(
-    PRFileDesc *fd, const PRNetAddr *addr,
-    PRUint32 addrlen, PRIntervalTime timeout);
-#define    _PR_MD_CONNECT _MD_CONNECT
-
-extern PROsfd _PR_MD_ACCEPT(
-    PRFileDesc *fd, PRNetAddr *addr,
-    PRUint32 *addrlen, PRIntervalTime timeout);
-#define    _PR_MD_ACCEPT _MD_ACCEPT
-
-extern PRInt32 _PR_MD_BIND(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen);
-#define    _PR_MD_BIND _MD_BIND
-
-extern PRInt32 _PR_MD_LISTEN(PRFileDesc *fd, PRIntn backlog);
-#define    _PR_MD_LISTEN _MD_LISTEN
-
-extern PRInt32 _PR_MD_SHUTDOWN(PRFileDesc *fd, PRIntn how);
-#define    _PR_MD_SHUTDOWN _MD_SHUTDOWN
-
-extern PRInt32 _PR_MD_RECV(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRIntervalTime timeout);
-#define    _PR_MD_RECV _MD_RECV
-
-extern PRInt32 _PR_MD_SEND(
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags, 
-    PRIntervalTime timeout);
-#define    _PR_MD_SEND _MD_SEND
-
-extern PRInt32 _PR_MD_ACCEPT_READ(PRFileDesc *sd, PROsfd *newSock, 
-                                PRNetAddr **raddr, void *buf, PRInt32 amount,
-                                PRIntervalTime timeout);
-#define _PR_MD_ACCEPT_READ _MD_ACCEPT_READ
-
-#ifdef WIN32
-extern PROsfd _PR_MD_FAST_ACCEPT(PRFileDesc *fd, PRNetAddr *addr, 
-                                PRUint32 *addrlen, PRIntervalTime timeout,
-                                PRBool fast,
-                                _PR_AcceptTimeoutCallback callback,
-                                void *callbackArg);
-
-extern PRInt32 _PR_MD_FAST_ACCEPT_READ(PRFileDesc *sd, PROsfd *newSock, 
-                                PRNetAddr **raddr, void *buf, PRInt32 amount,
-                                PRIntervalTime timeout, PRBool fast,
-                                _PR_AcceptTimeoutCallback callback,
-                                void *callbackArg);
-
-extern void _PR_MD_UPDATE_ACCEPT_CONTEXT(PROsfd s, PROsfd ls);
-#define _PR_MD_UPDATE_ACCEPT_CONTEXT _MD_UPDATE_ACCEPT_CONTEXT
-#endif /* WIN32 */
-
-extern PRInt32 _PR_MD_SENDFILE(
-    PRFileDesc *sock, PRSendFileData *sfd, 
-	PRInt32 flags, PRIntervalTime timeout);
-#define _PR_MD_SENDFILE _MD_SENDFILE
-
-extern PRStatus _PR_MD_GETSOCKNAME(
-    PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen);
-#define    _PR_MD_GETSOCKNAME _MD_GETSOCKNAME
-
-extern PRStatus _PR_MD_GETPEERNAME(
-    PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen);
-#define    _PR_MD_GETPEERNAME _MD_GETPEERNAME
-
-extern PRStatus _PR_MD_GETSOCKOPT(
-    PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen);
-#define    _PR_MD_GETSOCKOPT _MD_GETSOCKOPT
-
-extern PRStatus _PR_MD_SETSOCKOPT(
-    PRFileDesc *fd, PRInt32 level, PRInt32 optname,
-    const char* optval, PRInt32 optlen);
-#define    _PR_MD_SETSOCKOPT _MD_SETSOCKOPT
-
-extern PRStatus PR_CALLBACK _PR_SocketGetSocketOption(
-    PRFileDesc *fd, PRSocketOptionData *data);
-
-extern PRStatus PR_CALLBACK _PR_SocketSetSocketOption(
-    PRFileDesc *fd, const PRSocketOptionData *data);
-
-extern PRInt32 _PR_MD_RECVFROM(
-    PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-    PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout);
-#define    _PR_MD_RECVFROM _MD_RECVFROM
-
-extern PRInt32 _PR_MD_SENDTO(
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-    const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout);
-#define    _PR_MD_SENDTO _MD_SENDTO
-
-extern PRInt32 _PR_MD_SOCKETPAIR(int af, int type, int flags, PROsfd *osfd);
-#define    _PR_MD_SOCKETPAIR _MD_SOCKETPAIR
-
-extern PROsfd _PR_MD_SOCKET(int af, int type, int flags);
-#define    _PR_MD_SOCKET _MD_SOCKET
-
-extern PRInt32 _PR_MD_SOCKETAVAILABLE(PRFileDesc *fd);
-#define    _PR_MD_SOCKETAVAILABLE _MD_SOCKETAVAILABLE
-
-extern PRInt32 _PR_MD_PIPEAVAILABLE(PRFileDesc *fd);
-#define    _PR_MD_PIPEAVAILABLE _MD_PIPEAVAILABLE
-
-extern PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds,
-                                                                                        PRIntervalTime timeout);
-#define    _PR_MD_PR_POLL _MD_PR_POLL
-
-/*
- * Initialize fd->secret->inheritable for a newly created fd.
- * If 'imported' is false, the osfd (i.e., fd->secret->md.osfd)
- * was created by NSPR and hence has the OS-dependent default
- * inheritable attribute.  If 'imported' is true, the osfd was
- * not created by NSPR and hence a system call is required to
- * query its inheritable attribute.  Since we may never need to
- * know the inheritable attribute of a fd, a platform may choose
- * to initialize fd->secret->inheritable of an imported fd to
- * _PR_TRI_UNKNOWN and only pay the cost of the system call
- * (in _PR_MD_QUERY_FD_INHERITABLE) when necessary.
- */
-extern void _PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported);
-#define    _PR_MD_INIT_FD_INHERITABLE _MD_INIT_FD_INHERITABLE
-
-extern PRStatus _PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable);
-#define    _PR_MD_SET_FD_INHERITABLE _MD_SET_FD_INHERITABLE
-
-
-#define _PR_PROCESS_TIMEOUT_INTERRUPT_ERRORS(me) \
-        if (_PR_PENDING_INTERRUPT(me)) { \
-                me->flags &= ~_PR_INTERRUPT; \
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0); \
-        } else { \
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0); \
-        }                                                        
-                
-extern void *_PR_MD_GET_SP(PRThread *thread);
-#define    _PR_MD_GET_SP _MD_GET_SP
-
-#endif /* defined(_PR_PTHREADS) */
-
-/************************************************************************/
-/*************************************************************************
-** The remainder of the definitions are shared by pthreads and the classic
-** NSPR code. These too may be conditionalized.
-*************************************************************************/
-/************************************************************************/
-
-extern PROffset32 _PR_MD_LSEEK(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence);
-#define    _PR_MD_LSEEK _MD_LSEEK
-
-extern PROffset64 _PR_MD_LSEEK64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence);
-#define    _PR_MD_LSEEK64 _MD_LSEEK64
-
-extern PRInt32 _PR_MD_GETFILEINFO(const char *fn, PRFileInfo *info);
-#define _PR_MD_GETFILEINFO _MD_GETFILEINFO
-
-extern PRInt32 _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info);
-#define _PR_MD_GETFILEINFO64 _MD_GETFILEINFO64
-
-extern PRInt32 _PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info);
-#define _PR_MD_GETOPENFILEINFO _MD_GETOPENFILEINFO
-
-extern PRInt32 _PR_MD_GETOPENFILEINFO64(const PRFileDesc *fd, PRFileInfo64 *info);
-#define _PR_MD_GETOPENFILEINFO64 _MD_GETOPENFILEINFO64
-
-
-/*****************************************************************************/
-/************************** File descriptor caching **************************/
-/*****************************************************************************/
-extern void _PR_InitFdCache(void);
-extern void _PR_CleanupFdCache(void);
-extern PRFileDesc *_PR_Getfd(void);
-extern void _PR_Putfd(PRFileDesc *fd);
-
-/*
- * These flags are used by NSPR temporarily in the poll
- * descriptor's out_flags field to record the mapping of
- * NSPR's poll flags to the system poll flags.
- *
- * If _PR_POLL_READ_SYS_WRITE bit is set, it means the
- * PR_POLL_READ flag specified by the topmost layer is
- * mapped to the WRITE flag at the system layer.  Similarly
- * for the other three _PR_POLL_XXX_SYS_YYY flags.  It is
- * assumed that the PR_POLL_EXCEPT flag doesn't get mapped
- * to other flags.
- */
-#define _PR_POLL_READ_SYS_READ     0x1
-#define _PR_POLL_READ_SYS_WRITE    0x2
-#define _PR_POLL_WRITE_SYS_READ    0x4
-#define _PR_POLL_WRITE_SYS_WRITE   0x8
-
-/*
-** These methods are coerced into file descriptor methods table
-** when the intended service is inappropriate for the particular
-** type of file descriptor.
-*/
-extern PRIntn _PR_InvalidInt(void);
-extern PRInt16 _PR_InvalidInt16(void);
-extern PRInt64 _PR_InvalidInt64(void);
-extern PRStatus _PR_InvalidStatus(void);
-extern PRFileDesc *_PR_InvalidDesc(void);
-
-extern PRIOMethods _pr_faulty_methods;
-
-/*
-** The PR_NETADDR_SIZE macro can only be called on a PRNetAddr union
-** whose 'family' field is set.  It returns the size of the union
-** member corresponding to the specified address family.
-*/
-
-extern PRUintn _PR_NetAddrSize(const PRNetAddr* addr);
-
-#if defined(_PR_INET6)
-
-#define PR_NETADDR_SIZE(_addr) _PR_NetAddrSize(_addr)
-
-#elif defined(_PR_HAVE_MD_SOCKADDR_IN6)
-
-/*
-** Under the following conditions:
-** 1. _PR_INET6 is not defined;
-** 2. _PR_INET6_PROBE is defined;
-** 3. struct sockaddr_in6 has nonstandard fields at the end
-**    (e.g., on Solaris 8),
-** (_addr)->ipv6 is smaller than struct sockaddr_in6, and
-** hence we can't pass sizeof((_addr)->ipv6) to socket
-** functions such as connect because they would fail with
-** EINVAL.
-**
-** To pass the correct socket address length to socket
-** functions, define the macro _PR_HAVE_MD_SOCKADDR_IN6 and
-** define struct _md_sockaddr_in6 to be isomorphic to
-** struct sockaddr_in6.
-*/
-
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : ((_addr)->raw.family == PR_AF_INET6	\
-        ? sizeof(struct _md_sockaddr_in6)		\
-        : sizeof((_addr)->local)))
-#else
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : sizeof(struct _md_sockaddr_in6))
-#endif /* defined(XP_UNIX) */
-
-#else
-
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : ((_addr)->raw.family == PR_AF_INET6	\
-        ? sizeof((_addr)->ipv6)					\
-        : sizeof((_addr)->local)))
-#else
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : sizeof((_addr)->ipv6))
-#endif /* defined(XP_UNIX) */
-
-#endif /* defined(_PR_INET6) */
-
-extern PRStatus _PR_MapOptionName(
-    PRSockOption optname, PRInt32 *level, PRInt32 *name);
-extern void _PR_InitThreads(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs);
-
-struct PRLock {
-#if defined(_PR_PTHREADS)
-    pthread_mutex_t mutex;          /* the underlying lock */
-    _PT_Notified notified;          /* array of conditions notified */
-    PRBool locked;                  /* whether the mutex is locked */
-    pthread_t owner;                /* if locked, current lock owner */
-#elif defined(_PR_BTHREADS)
-    sem_id	semaphoreID;	    /* the underlying lock */
-    int32	benaphoreCount;	    /* number of people in lock */
-    thread_id	owner;		    /* current lock owner */
-#else /* not pthreads or Be threads */
-    PRCList links;                  /* linkage for PRThread.lockList */
-    struct PRThread *owner;         /* current lock owner */
-    PRCList waitQ;                  /* list of threads waiting for lock */
-    PRThreadPriority priority;      /* priority of lock */ 
-    PRThreadPriority boostPriority; /* boosted priority of lock owner */
-    _MDLock ilock;                  /* Internal Lock to protect user-level fields */
-#endif
-};
-
-extern void _PR_InitLocks(void);
-
-struct PRCondVar {
-    PRLock *lock;               /* associated lock that protects the condition */
-#if defined(_PR_PTHREADS)
-    pthread_cond_t cv;          /* underlying pthreads condition */
-    PRInt32 notify_pending;     /* CV has destroy pending notification */
-#elif defined(_PR_BTHREADS)
-    sem_id    sem;              /* the underlying lock */
-    sem_id    handshakeSem;     /* the lock for 'notify'-threads waiting for confirmation */
-    sem_id    signalSem;        /* the lock for threads waiting for someone to notify */
-    volatile int32    nw;       /* the number waiting */
-    volatile int32    ns;       /* the number signalling */
-    long signalBenCount;        /* the number waiting on the underlying sem */
-#else /* not pthreads or Be threads */
-    PRCList condQ;              /* Condition variable wait Q */
-    _MDLock ilock;              /* Internal Lock to protect condQ */
-    _MDCVar md;
-#endif
-};
-
-/************************************************************************/
-
-struct PRMonitor {
-    const char* name;           /* monitor name for debugging */
-#if defined(_PR_PTHREADS)
-    PRLock lock;                /* the lock structure */
-    pthread_t owner;            /* the owner of the lock or invalid */
-    PRCondVar *cvar;            /* condition variable queue */
-#else  /* defined(_PR_PTHREADS) */
-    PRCondVar *cvar;            /* associated lock and condition variable queue */
-#endif /* defined(_PR_PTHREADS) */
-    PRUint32 entryCount;        /* # of times re-entered */
-};
-
-/************************************************************************/
-
-struct PRSemaphore {
-#if defined(_PR_BTHREADS)
-    sem_id  sem;
-    int32   benaphoreCount;
-#else
-    PRCondVar *cvar;        /* associated lock and condition variable queue */
-    PRUintn count;            /* the value of the counting semaphore */
-    PRUint32 waiters;            /* threads waiting on the semaphore */
-#if defined(_PR_PTHREADS)
-#else  /* defined(_PR_PTHREADS) */
-    _MDSemaphore md;
-#endif /* defined(_PR_PTHREADS) */
-#endif /* defined(_PR_BTHREADS) */
-};
-
-NSPR_API(void) _PR_InitSem(void);
-
-/*************************************************************************/
-
-struct PRSem {
-#ifdef _PR_HAVE_POSIX_SEMAPHORES
-    sem_t *sem;
-#elif defined(_PR_HAVE_SYSV_SEMAPHORES)
-    int semid;
-#elif defined(WIN32)
-    HANDLE sem;
-#else
-    PRInt8 notused;
-#endif
-};
-
-/*************************************************************************/
-
-struct PRStackStr {
-    /* head MUST be at offset 0; assembly language code relies on this */
-#if defined(AIX)
-    volatile PRStackElem prstk_head;
-#else
-    PRStackElem prstk_head;
-#endif
-
-    PRLock *prstk_lock;
-    char *prstk_name;
-};
-
-/************************************************************************/
-
-/* XXX this needs to be exported (sigh) */
-struct PRThreadStack {
-    PRCList links;
-    PRUintn flags;
-
-    char *allocBase;            /* base of stack's allocated memory */
-    PRUint32 allocSize;         /* size of stack's allocated memory */
-    char *stackBottom;          /* bottom of stack from C's point of view */
-    char *stackTop;             /* top of stack from C's point of view */
-    PRUint32 stackSize;         /* size of usable portion of the stack */
-
-    PRSegment *seg;
-        PRThread* thr;          /* back pointer to thread owning this stack */
-
-#if defined(_PR_PTHREADS)
-#else /* defined(_PR_PTHREADS) */
-    _MDThreadStack md;
-#endif /* defined(_PR_PTHREADS) */
-};
-
-extern void _PR_DestroyThreadPrivate(PRThread*);
-
-typedef void (PR_CALLBACK *_PRStartFn)(void *);
-
-struct PRThread {
-    PRUint32 state;                 /* thread's creation state */
-    PRThreadPriority priority;      /* apparent priority, loosly defined */
-
-    void *arg;                      /* argument to the client's entry point */
-    _PRStartFn startFunc;           /* the root of the client's thread */
-
-    PRThreadStack *stack;           /* info about thread's stack (for GC) */
-    void *environment;              /* pointer to execution environment */
-
-    PRThreadDumpProc dump;          /* dump thread info out */
-    void *dumpArg;                  /* argument for the dump function */
-
-    /*
-    ** Per thread private data
-    */
-    PRUint32 tpdLength;             /* thread's current vector length */
-    void **privateData;             /* private data vector or NULL */
-    PRErrorCode errorCode;          /* current NSPR error code | zero */
-    PRInt32 osErrorCode;            /* mapping of errorCode | zero */
-    PRIntn  errorStringLength;      /* textLength from last call to PR_SetErrorText() */
-    PRInt32 errorStringSize;        /* malloc()'d size of buffer | zero */
-    char *errorString;              /* current error string | NULL */
-
-#if defined(_PR_PTHREADS)
-    pthread_t id;                   /* pthread identifier for the thread */
-    PRBool okToDelete;              /* ok to delete the PRThread struct? */
-    PRCondVar *waiting;             /* where the thread is waiting | NULL */
-    void *sp;                       /* recorded sp for garbage collection */
-    PRThread *next, *prev;          /* simple linked list of all threads */
-    PRUint32 suspend;               /* used to store suspend and resume flags */
-#ifdef PT_NO_SIGTIMEDWAIT
-    pthread_mutex_t suspendResumeMutex;
-    pthread_cond_t suspendResumeCV;
-#endif
-    PRUint32 interrupt_blocked;     /* interrupt blocked */
-    struct pollfd *syspoll_list;    /* Unix polling list used by PR_Poll */
-    PRUint32 syspoll_count;         /* number of elements in syspoll_list */
-#if defined(_PR_POLL_WITH_SELECT)
-    int *selectfd_list;             /* Unix fd's that PR_Poll selects on */
-    PRUint32 selectfd_count;        /* number of elements in selectfd_list */
-#endif
-#elif defined(_PR_BTHREADS)
-    PRUint32 flags;
-    _MDThread md;
-    PRBool io_pending;
-    PRInt32 io_fd;
-    PRBool io_suspended;
-#else /* not pthreads or Be threads */
-    _MDLock threadLock;             /* Lock to protect thread state variables.
-                                     * Protects the following fields:
-                                     *     state
-                                     *     priority
-                                     *     links
-                                     *     wait
-                                     *     cpu
-                                     */
-    PRUint32 queueCount;
-    PRUint32 waitCount;
-
-    PRCList active;                 /* on list of all active threads        */
-    PRCList links;
-    PRCList waitQLinks;             /* when thread is PR_Wait'ing */
-    PRCList lockList;               /* list of locks currently holding */
-    PRIntervalTime sleep;           /* sleep time when thread is sleeping */
-    struct _wait {
-        struct PRLock *lock;
-        struct PRCondVar *cvar;
-    } wait;
-
-    PRUint32 id;
-    PRUint32 flags;
-    PRUint32 no_sched;              /* Don't schedule the thread to run.
-                                     * This flag has relevance only when
-                                     * multiple NSPR CPUs are created.
-                                     * When a thread is de-scheduled, there
-                                     * is a narrow window of time in which
-                                     * the thread is put on the run queue
-                                     * but the scheduler is actually using
-                                     * the stack of this thread.  It is safe
-                                     * to run this thread on a different CPU
-                                     * only when its stack is not in use on
-                                     * any other CPU.  The no_sched flag is
-                                     * set during this interval to prevent
-                                     * the thread from being scheduled on a
-                                     * different CPU.
-                                     */
-
-    /* thread termination condition variable for join */
-    PRCondVar *term;
-
-    _PRCPU *cpu;                    /* cpu to which this thread is bound    */
-    PRUint32 threadAllocatedOnStack;/* boolean */
-
-    /* When an async IO is in progress and a second async IO cannot be 
-     * initiated, the io_pending flag is set to true.  Some platforms will
-     * not use the io_pending flag.  If the io_pending flag is true, then
-     * io_fd is the OS-file descriptor on which IO is pending.
-     */
-    PRBool io_pending;
-    PRInt32 io_fd;
- 
-    /* If a timeout occurs or if an outstanding IO is interrupted and the
-     * OS doesn't support a real cancellation (NT or MAC), then the 
-     * io_suspended flag will be set to true.  The thread will be resumed
-     * but may run into trouble issuing additional IOs until the io_pending
-     * flag can be cleared 
-     */
-    PRBool io_suspended;
-
-    _MDThread md;
-#endif
-};
-
-struct PRProcessAttr {
-    PRFileDesc *stdinFd;
-    PRFileDesc *stdoutFd;
-    PRFileDesc *stderrFd;
-    char *currentDirectory;
-    char *fdInheritBuffer;
-    PRSize fdInheritBufferSize;
-    PRSize fdInheritBufferUsed;
-};
-
-struct PRProcess {
-    _MDProcess md;
-};
-
-struct PRFileMap {
-    PRFileDesc *fd;
-    PRFileMapProtect prot;
-    _MDFileMap md;
-};
-
-/************************************************************************/
-
-/*
-** File descriptors of the NSPR layer can be in one of the
-** following states (stored in the 'state' field of struct
-** PRFilePrivate):
-** - _PR_FILEDESC_OPEN: The OS fd is open.
-** - _PR_FILEDESC_CLOSED: The OS fd is closed.  The PRFileDesc
-**   is still open but is unusable.  The only operation allowed
-**   on the PRFileDesc is PR_Close().
-** - _PR_FILEDESC_FREED: The OS fd is closed and the PRFileDesc
-**   structure is freed.
-*/
-
-#define _PR_FILEDESC_OPEN       0xaaaaaaaa    /* 1010101... */
-#define _PR_FILEDESC_CLOSED     0x55555555    /* 0101010... */
-#define _PR_FILEDESC_FREED      0x11111111
-
-/*
-** A boolean type with an additional "unknown" state
-*/
-
-typedef enum {
-    _PR_TRI_TRUE = 1,
-    _PR_TRI_FALSE = 0,
-    _PR_TRI_UNKNOWN = -1
-} _PRTriStateBool;
-
-struct PRFilePrivate {
-    PRInt32 state;
-    PRBool nonblocking;
-    _PRTriStateBool inheritable;
-    PRFileDesc *next;
-    PRIntn lockCount;   /*   0: not locked
-                         *  -1: a native lockfile call is in progress
-                         * > 0: # times the file is locked */
-#ifdef _PR_HAVE_PEEK_BUFFER
-    char *peekBuffer;
-    PRInt32 peekBufSize;
-    PRInt32 peekBytes;
-#endif
-#if !defined(_PR_HAVE_O_APPEND)
-    PRBool  appendMode; /* Some platforms don't have O_APPEND or its
-                         * equivalent, so they have to seek to end of
-                         * file on write if the file was opened in
-                         * append mode.  See Bugzilla 4090, 276330. */
-#endif
-    _MDFileDesc md;
-#ifdef _PR_STRICT_ADDR_LEN
-    PRUint16 af;        /* If the platform requires passing the exact
-                         * length of the sockaddr structure for the
-                         * address family of the socket to socket
-                         * functions like accept(), we need to save
-                         * the address family of the socket. */
-#endif
-};
-
-#ifdef _WIN64
-#define PR_PRIdOSFD "lld"       /* for printing PROsfd */
-#define PR_PRIxOSFD "llx"
-#define PR_SCNdOSFD "lld"       /* for scanning PROsfd */
-#define PR_SCNxOSFD "llx"
-#else
-#define PR_PRIdOSFD "ld"        /* for printing PROsfd */
-#define PR_PRIxOSFD "lx"
-#define PR_SCNdOSFD "ld"        /* for scanning PROsfd */
-#define PR_SCNxOSFD "lx"
-#endif
-
-struct PRDir {
-    PRDirEntry d;
-    _MDDir md;
-};
-
-#ifdef MOZ_UNICODE
-struct PRDirUTF16 { 
-    PRDirEntry d; 
-    _MDDirUTF16 md; 
-}; 
-#endif /* MOZ_UNICODE */
-
-extern void _PR_InitSegs(void);
-extern void _PR_InitStacks(void);
-extern void _PR_InitTPD(void);
-extern void _PR_InitMem(void);
-extern void _PR_InitEnv(void);
-extern void _PR_InitCMon(void);
-extern void _PR_InitIO(void);
-extern void _PR_InitLog(void);
-extern void _PR_InitNet(void);
-extern void _PR_InitClock(void);
-extern void _PR_InitLinker(void);
-extern void _PR_InitAtomic(void);
-extern void _PR_InitCPUs(void);
-extern void _PR_InitDtoa(void);
-extern void _PR_InitMW(void);
-extern void _PR_InitRWLocks(void);
-extern void _PR_NotifyCondVar(PRCondVar *cvar, PRThread *me);
-extern void _PR_CleanupThread(PRThread *thread);
-extern void _PR_CleanupCallOnce(void);
-extern void _PR_CleanupMW(void);
-extern void _PR_CleanupDtoa(void);
-extern void _PR_ShutdownLinker(void);
-extern void _PR_CleanupEnv(void);
-extern void _PR_CleanupIO(void);
-extern void _PR_CleanupNet(void);
-extern void _PR_CleanupLayerCache(void);
-extern void _PR_CleanupStacks(void);
-#ifdef WINNT
-extern void _PR_CleanupCPUs(void);
-#endif
-extern void _PR_CleanupThreads(void);
-extern void _PR_CleanupTPD(void);
-extern void _PR_Cleanup(void);
-extern void _PR_LogCleanup(void);
-extern void _PR_InitLayerCache(void);
-#ifdef GC_LEAK_DETECTOR
-extern void _PR_InitGarbageCollector(void);
-#endif
-
-extern PRBool _pr_initialized;
-extern void _PR_ImplicitInitialization(void);
-extern PRBool _PR_Obsolete(const char *obsolete, const char *preferred);
-
-/************************************************************************/
-
-struct PRSegment {
-    void *vaddr;
-    PRUint32 size;
-    PRUintn flags;
-#if defined(_PR_PTHREADS)
-#else  /* defined(_PR_PTHREADS) */
-    _MDSegment md;
-#endif /* defined(_PR_PTHREADS) */
-};
-
-/* PRSegment.flags */
-#define _PR_SEG_VM    0x1
-
-/************************************************************************/
-
-extern PRInt32 _pr_pageSize;
-extern PRInt32 _pr_pageShift;
-
-extern PRLogModuleInfo *_pr_clock_lm;
-extern PRLogModuleInfo *_pr_cmon_lm;
-extern PRLogModuleInfo *_pr_io_lm;
-extern PRLogModuleInfo *_pr_cvar_lm;
-extern PRLogModuleInfo *_pr_mon_lm;
-extern PRLogModuleInfo *_pr_linker_lm;
-extern PRLogModuleInfo *_pr_sched_lm;
-extern PRLogModuleInfo *_pr_thread_lm;
-extern PRLogModuleInfo *_pr_gc_lm;
-
-extern PRFileDesc *_pr_stdin;
-extern PRFileDesc *_pr_stdout;
-extern PRFileDesc *_pr_stderr;
-
-/* Zone allocator */
-/*
-** The zone allocator code has hardcoded pthread types and
-** functions, so it can only be used in the pthreads version.
-** This can be fixed by replacing the hardcoded pthread types
-** and functions with macros that expand to the native thread
-** types and functions on each platform.
-*/
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#define _PR_ZONE_ALLOCATOR
-#endif
-
-#ifdef _PR_ZONE_ALLOCATOR
-extern void _PR_InitZones(void);
-extern void _PR_DestroyZones(void);
-#endif
-
-/* Overriding malloc, free, etc. */
-#if !defined(_PR_NO_PREEMPT) && defined(XP_UNIX) \
-        && !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \
-        && !defined(PURIFY) \
-        && !defined(DARWIN) \
-        && !defined(NEXTSTEP) \
-        && !defined(QNX) \
-        && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
-#define _PR_OVERRIDE_MALLOC
-#endif
-
-/*************************************************************************
-* External machine-dependent code provided by each OS.                     *                                                                     *
-*************************************************************************/
-
-/* Initialization related */
-extern void _PR_MD_EARLY_INIT(void);
-#define    _PR_MD_EARLY_INIT _MD_EARLY_INIT
-
-extern void _PR_MD_INTERVAL_INIT(void);
-#define    _PR_MD_INTERVAL_INIT _MD_INTERVAL_INIT
-
-NSPR_API(void) _PR_MD_FINAL_INIT(void);
-#define    _PR_MD_FINAL_INIT _MD_FINAL_INIT
-
-/* Process control */
-
-extern PRProcess * _PR_MD_CREATE_PROCESS(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-#define    _PR_MD_CREATE_PROCESS _MD_CREATE_PROCESS
-
-extern PRStatus _PR_MD_DETACH_PROCESS(PRProcess *process);
-#define    _PR_MD_DETACH_PROCESS _MD_DETACH_PROCESS
-
-extern PRStatus _PR_MD_WAIT_PROCESS(PRProcess *process, PRInt32 *exitCode);
-#define    _PR_MD_WAIT_PROCESS _MD_WAIT_PROCESS
-
-extern PRStatus _PR_MD_KILL_PROCESS(PRProcess *process);
-#define    _PR_MD_KILL_PROCESS _MD_KILL_PROCESS        
-
-/* Current Time */
-NSPR_API(PRTime) _PR_MD_NOW(void);
-#define    _PR_MD_NOW _MD_NOW
-
-/* Environment related */
-extern char* _PR_MD_GET_ENV(const char *name);
-#define    _PR_MD_GET_ENV _MD_GET_ENV
-
-extern PRIntn _PR_MD_PUT_ENV(const char *name);
-#define    _PR_MD_PUT_ENV _MD_PUT_ENV
-
-/* Atomic operations */
-
-extern void _PR_MD_INIT_ATOMIC(void);
-#define    _PR_MD_INIT_ATOMIC _MD_INIT_ATOMIC
-
-extern PRInt32 _PR_MD_ATOMIC_INCREMENT(PRInt32 *);
-#define    _PR_MD_ATOMIC_INCREMENT _MD_ATOMIC_INCREMENT
-
-extern PRInt32 _PR_MD_ATOMIC_ADD(PRInt32 *, PRInt32);
-#define    _PR_MD_ATOMIC_ADD _MD_ATOMIC_ADD
-
-extern PRInt32 _PR_MD_ATOMIC_DECREMENT(PRInt32 *);
-#define    _PR_MD_ATOMIC_DECREMENT _MD_ATOMIC_DECREMENT
-
-extern PRInt32 _PR_MD_ATOMIC_SET(PRInt32 *, PRInt32);
-#define    _PR_MD_ATOMIC_SET _MD_ATOMIC_SET
-
-/* Garbage collection */
-
-/*
-** Save the registers that the GC would find interesting into the thread
-** "t". isCurrent will be non-zero if the thread state that is being
-** saved is the currently executing thread. Return the address of the
-** first register to be scanned as well as the number of registers to
-** scan in "np".
-**
-** If "isCurrent" is non-zero then it is allowed for the thread context
-** area to be used as scratch storage to hold just the registers
-** necessary for scanning.
-*/
-extern PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np);
-
-/* Time intervals */
-
-extern PRIntervalTime _PR_MD_GET_INTERVAL(void);
-#define _PR_MD_GET_INTERVAL _MD_GET_INTERVAL
-
-extern PRIntervalTime _PR_MD_INTERVAL_PER_SEC(void);
-#define _PR_MD_INTERVAL_PER_SEC _MD_INTERVAL_PER_SEC
-
-/* Affinity masks */
-
-extern PRInt32 _PR_MD_SETTHREADAFFINITYMASK(PRThread *thread, PRUint32 mask );
-#define _PR_MD_SETTHREADAFFINITYMASK _MD_SETTHREADAFFINITYMASK
-
-extern PRInt32 _PR_MD_GETTHREADAFFINITYMASK(PRThread *thread, PRUint32 *mask);
-#define _PR_MD_GETTHREADAFFINITYMASK _MD_GETTHREADAFFINITYMASK
-
-/* File locking */
-
-extern PRStatus _PR_MD_LOCKFILE(PROsfd osfd);
-#define    _PR_MD_LOCKFILE _MD_LOCKFILE
-
-extern PRStatus _PR_MD_TLOCKFILE(PROsfd osfd);
-#define    _PR_MD_TLOCKFILE _MD_TLOCKFILE
-
-extern PRStatus _PR_MD_UNLOCKFILE(PROsfd osfd);
-#define    _PR_MD_UNLOCKFILE _MD_UNLOCKFILE
-
-/* Memory-mapped files */
-
-extern PRStatus _PR_MD_CREATE_FILE_MAP(PRFileMap *fmap, PRInt64 size);
-#define _PR_MD_CREATE_FILE_MAP _MD_CREATE_FILE_MAP
-
-extern PRInt32 _PR_MD_GET_MEM_MAP_ALIGNMENT(void);
-#define _PR_MD_GET_MEM_MAP_ALIGNMENT _MD_GET_MEM_MAP_ALIGNMENT
-
-extern void * _PR_MD_MEM_MAP(
-    PRFileMap *fmap,
-    PROffset64 offset,
-    PRUint32 len);
-#define _PR_MD_MEM_MAP _MD_MEM_MAP
-
-extern PRStatus _PR_MD_MEM_UNMAP(void *addr, PRUint32 size);
-#define _PR_MD_MEM_UNMAP _MD_MEM_UNMAP
-
-extern PRStatus _PR_MD_CLOSE_FILE_MAP(PRFileMap *fmap);
-#define _PR_MD_CLOSE_FILE_MAP _MD_CLOSE_FILE_MAP
-
-/* Named Shared Memory */
-
-/*
-** Declare PRSharedMemory.
-*/
-struct PRSharedMemory 
-{
-    char        *ipcname; /* after conversion to native */
-    PRSize      size;  /* from open */
-    PRIntn      mode;  /* from open */
-    PRIntn      flags; /* from open */
-#if defined(PR_HAVE_POSIX_NAMED_SHARED_MEMORY)
-    int         id;
-#elif defined(PR_HAVE_SYSV_NAMED_SHARED_MEMORY)
-    int         id;
-#elif defined(PR_HAVE_WIN32_NAMED_SHARED_MEMORY)
-    HANDLE      handle;
-#else
-    PRUint32    nothing; /* placeholder, nothing behind here */
-#endif
-    PRUint32    ident; /* guard word at end of struct */
-#define _PR_SHM_IDENT 0xdeadbad
-};
-                                                      
-extern PRSharedMemory * _MD_OpenSharedMemory( 
-    const char *name,
-    PRSize      size,
-    PRIntn      flags,
-    PRIntn      mode
-);
-#define _PR_MD_OPEN_SHARED_MEMORY _MD_OpenSharedMemory
-
-extern void * _MD_AttachSharedMemory( PRSharedMemory *shm, PRIntn flags );
-#define _PR_MD_ATTACH_SHARED_MEMORY _MD_AttachSharedMemory
-
-extern PRStatus _MD_DetachSharedMemory( PRSharedMemory *shm, void *addr );
-#define _PR_MD_DETACH_SHARED_MEMORY _MD_DetachSharedMemory
-
-extern PRStatus _MD_CloseSharedMemory( PRSharedMemory *shm );
-#define _PR_MD_CLOSE_SHARED_MEMORY _MD_CloseSharedMemory
-
-extern PRStatus _MD_DeleteSharedMemory( const char *name );
-#define _PR_MD_DELETE_SHARED_MEMORY  _MD_DeleteSharedMemory
-
-extern PRFileMap* _md_OpenAnonFileMap( 
-    const char *dirName,
-    PRSize      size,
-    PRFileMapProtect prot
-);
-#define _PR_MD_OPEN_ANON_FILE_MAP _md_OpenAnonFileMap
-
-extern PRStatus _md_ExportFileMapAsString(
-    PRFileMap *fm,
-    PRSize    bufSize,
-    char      *buf
-);
-#define _PR_MD_EXPORT_FILE_MAP_AS_STRING _md_ExportFileMapAsString
-
-extern PRFileMap * _md_ImportFileMapFromString(
-    const char *fmstring
-);
-#define _PR_MD_IMPORT_FILE_MAP_FROM_STRING _md_ImportFileMapFromString
-
-
-
-/* Interprocess communications (IPC) */
-
-/*
- * The maximum length of an NSPR IPC name, including the
- * terminating null byte.
- */
-#define PR_IPC_NAME_SIZE 1024
-
-/*
- * Types of NSPR IPC objects
- */
-typedef enum {
-    _PRIPCSem,  /* semaphores */
-    _PRIPCShm   /* shared memory segments */
-} _PRIPCType;
-
-/*
- * Make a native IPC name from an NSPR IPC name.
- */
-extern PRStatus _PR_MakeNativeIPCName(
-    const char *name,  /* NSPR IPC name */
-    char *result,      /* result buffer */
-    PRIntn size,       /* size of result buffer */
-    _PRIPCType type    /* type of IPC object */
-);
-
-/* Socket call error code */
-
-NSPR_API(PRInt32) _PR_MD_GET_SOCKET_ERROR(void);
-#define    _PR_MD_GET_SOCKET_ERROR _MD_GET_SOCKET_ERROR
-
-/* Get name of current host */
-extern PRStatus _PR_MD_GETHOSTNAME(char *name, PRUint32 namelen);
-#define    _PR_MD_GETHOSTNAME _MD_GETHOSTNAME
-
-extern PRStatus _PR_MD_GETSYSINFO(PRSysInfo cmd, char *name, PRUint32 namelen);
-#define    _PR_MD_GETSYSINFO _MD_GETSYSINFO
-
-/* File descriptor inheritance */
-
-/*
- * If fd->secret->inheritable is _PR_TRI_UNKNOWN and we need to
- * know the inheritable attribute of the fd, call this function
- * to find that out.  This typically requires a system call.
- */
-extern void _PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd);
-#define    _PR_MD_QUERY_FD_INHERITABLE _MD_QUERY_FD_INHERITABLE
-
-/* --- PR_GetRandomNoise() related things --- */
-
-extern PRSize _PR_MD_GetRandomNoise( void *buf, PRSize size );
-#define _PR_MD_GET_RANDOM_NOISE(buf,size) _PR_MD_GetRandomNoise((buf),(size))
-extern PRSize _pr_CopyLowBits( void *dest, PRSize dstlen, void *src, PRSize srclen );
-
-/* end PR_GetRandomNoise() related */
-
-#ifdef XP_BEOS
-
-extern PRLock *_connectLock;
-
-typedef struct _ConnectListNode {
-	PRInt32		osfd;
-	PRNetAddr	addr;
-	PRUint32	addrlen;
-	PRIntervalTime	timeout;
-} ConnectListNode;
-
-extern ConnectListNode connectList[64];
-
-extern PRUint32 connectCount;
-
-#endif /* XP_BEOS */
-
-PR_END_EXTERN_C
-
-#endif /* primpl_h___ */
diff --git a/libs/js/nsprpub/pr/include/private/prpriv.h b/libs/js/nsprpub/pr/include/private/prpriv.h
deleted file mode 100644
index 780376e8e1..0000000000
--- a/libs/js/nsprpub/pr/include/private/prpriv.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prpriv_h___
-#define prpriv_h___
-
-/*
- * NSPR 2.0 Private API
- */
-
-#ifndef XP_MAC
-#include "private/pprio.h"
-#include "private/pprthred.h"
-#else
-#include "pprio.h"
-#include "pprthred.h"
-#endif
-
-#endif /* prpriv_h___ */
diff --git a/libs/js/nsprpub/pr/include/prlink.h b/libs/js/nsprpub/pr/include/prlink.h
deleted file mode 100644
index b2eb514170..0000000000
--- a/libs/js/nsprpub/pr/include/prlink.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prlink_h___
-#define prlink_h___
-
-/*
-** API to static and dynamic linking.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRLibrary PRLibrary;
-
-typedef struct PRStaticLinkTable {
-    const char *name;
-    void (*fp)();
-} PRStaticLinkTable;
-
-/*
-** Change the default library path to the given string. The string is
-** copied. This call will fail if it runs out of memory.
-**
-** The string provided as 'path' is copied. The caller can do whatever is
-** convenient with the argument when the function is complete.
-*/
-NSPR_API(PRStatus) PR_SetLibraryPath(const char *path);
-
-/*
-** Return a character string which contains the path used to search for
-** dynamically loadable libraries.
-**
-** The returned value is basically a copy of a PR_SetLibraryPath().
-** The storage is allocated by the runtime and becomes the responsibilty
-** of the caller.
-*/
-NSPR_API(char*) PR_GetLibraryPath(void);
-
-/*
-** Given a directory name "dir" and a library name "lib" construct a full
-** path name that will refer to the actual dynamically loaded
-** library. This does not test for existance of said file, it just
-** constructs the full filename. The name constructed is system dependent
-** and prepared for PR_LoadLibrary. The result must be free'd when the
-** caller is done with it.
-**
-** The storage for the result is allocated by the runtime and becomes the
-** responsibility of the caller.
-*/
-NSPR_API(char*) PR_GetLibraryName(const char *dir, const char *lib);
-
-/*
-**
-** Free the memory allocated, for the caller, by PR_GetLibraryName
-*/
-NSPR_API(void) PR_FreeLibraryName(char *mem);
-
-/*
-** Given a library "name" try to load the library. The argument "name"
-** is a machine-dependent name for the library, such as the full pathname
-** returned by PR_GetLibraryName.  If the library is already loaded,
-** this function will avoid loading the library twice.
-**
-** If the library is loaded successfully, then a pointer to the PRLibrary
-** structure representing the library is returned.  Otherwise, NULL is
-** returned.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRLibrary*) PR_LoadLibrary(const char *name);
-
-/*
-** Each operating system has its preferred way of specifying
-** a file in the file system.  Most operating systems use
-** a pathname.  Mac OS, on the other hand, uses the FSSpec
-** structure to specify a file. PRLibSpec allows NSPR clients
-** to use the type of file specification that is most efficient
-** for a particular platform.
-**
-** On some operating systems such as Mac OS, a shared library may
-** contain code fragments that can be individually loaded.
-** PRLibSpec also allows NSPR clients to identify a code fragment
-** in a library, if code fragments are supported by the OS.
-** A code fragment can be specified by name or by an integer index.
-**
-** Right now PRLibSpec supports three types of library specification:
-** a pathname, a Mac code fragment by name, and a Mac code fragment
-** by index.
-*/
-
-typedef enum PRLibSpecType {
-    PR_LibSpec_Pathname,
-    PR_LibSpec_MacNamedFragment,   /* obsolete (for Mac OS Classic) */
-    PR_LibSpec_MacIndexedFragment  /* obsolete (for Mac OS Classic) */
-} PRLibSpecType;
-
-struct FSSpec; /* Mac OS FSSpec */
-
-typedef struct PRLibSpec {
-    PRLibSpecType type;
-    union {
-        /* if type is PR_LibSpec_Pathname */
-        const char *pathname;
-
-        /* if type is PR_LibSpec_MacNamedFragment */
-        struct {
-            const struct FSSpec *fsspec;
-            const char *name;
-        } mac_named_fragment;      /* obsolete (for Mac OS Classic) */
-
-        /* if type is PR_LibSpec_MacIndexedFragment */
-        struct {
-            const struct FSSpec *fsspec;
-            PRUint32 index;
-        } mac_indexed_fragment;    /* obsolete (for Mac OS Classic) */
-    } value;
-} PRLibSpec;
-
-/*
-** The following bit flags may be or'd together and passed
-** as the 'flags' argument to PR_LoadLibraryWithFlags.
-** Flags not supported by the underlying OS are ignored.
-*/
-
-#define PR_LD_LAZY   0x1  /* equivalent to RTLD_LAZY on Unix */
-#define PR_LD_NOW    0x2  /* equivalent to RTLD_NOW on Unix */
-#define PR_LD_GLOBAL 0x4  /* equivalent to RTLD_GLOBAL on Unix */
-#define PR_LD_LOCAL  0x8  /* equivalent to RTLD_LOCAL on Unix */
-
-/*
-** Load the specified library, in the manner specified by 'flags'.
-*/
-
-NSPR_API(PRLibrary *)
-PR_LoadLibraryWithFlags(
-    PRLibSpec libSpec,    /* the shared library */
-    PRIntn flags          /* flags that affect the loading */
-);
-
-/*
-** Unload a previously loaded library. If the library was a static
-** library then the static link table will no longer be referenced. The
-** associated PRLibrary object is freed.
-**
-** PR_FAILURE is returned if the library cannot be unloaded.
-**
-** This function decrements the reference count of the library.
-*/
-NSPR_API(PRStatus) PR_UnloadLibrary(PRLibrary *lib);
-
-/*
-** Given the name of a procedure, return the address of the function that
-** implements the procedure, or NULL if no such function can be
-** found. This does not find symbols in the main program (the ".exe");
-** use PR_LoadStaticLibrary to register symbols in the main program.
-**
-** This function does not modify the reference count of the library.
-*/
-NSPR_API(void*) PR_FindSymbol(PRLibrary *lib, const char *name);
-
-/*
-** Similar to PR_FindSymbol, except that the return value is a pointer to
-** a function, and not a pointer to void. Casting between a data pointer
-** and a function pointer is not portable according to the C standard.
-** Any function pointer can be cast to any other function pointer.
-**
-** This function does not modify the reference count of the library.
-*/
-typedef void (*PRFuncPtr)();
-NSPR_API(PRFuncPtr) PR_FindFunctionSymbol(PRLibrary *lib, const char *name);
-
-/*
-** Finds a symbol in one of the currently loaded libraries. Given the
-** name of a procedure, return the address of the function that
-** implements the procedure, and return the library that contains that
-** symbol, or NULL if no such function can be found. This does not find
-** symbols in the main program (the ".exe"); use PR_AddStaticLibrary to
-** register symbols in the main program.  
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(void*) PR_FindSymbolAndLibrary(const char *name,
-						      PRLibrary* *lib);
-
-/*
-** Similar to PR_FindSymbolAndLibrary, except that the return value is
-** a pointer to a function, and not a pointer to void. Casting between a
-** data pointer and a function pointer is not portable according to the C
-** standard. Any function pointer can be cast to any other function pointer.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRFuncPtr) PR_FindFunctionSymbolAndLibrary(const char *name,
-						      PRLibrary* *lib);
-
-/*
-** Register a static link table with the runtime under the name
-** "name". The symbols present in the static link table will be made
-** available to PR_FindSymbol. If "name" is null then the symbols will be
-** made available to the library which represents the executable. The
-** tables are not copied.
-**
-** Returns the library object if successful, null otherwise.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRLibrary*) PR_LoadStaticLibrary(
-    const char *name, const PRStaticLinkTable *table);
-
-/*
-** Return the pathname of the file that the library "name" was loaded
-** from. "addr" is the address of a function defined in the library.
-**
-** The caller is responsible for freeing the result with PR_Free.
-*/
-NSPR_API(char *) PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr);
-
-PR_END_EXTERN_C
-
-#endif /* prlink_h___ */
diff --git a/libs/js/nsprpub/pr/include/prlock.h b/libs/js/nsprpub/pr/include/prlock.h
deleted file mode 100644
index 0805d95ba4..0000000000
--- a/libs/js/nsprpub/pr/include/prlock.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:		prlock.h
-** Description:	API to basic locking functions of NSPR.
-**
-**
-** NSPR provides basic locking mechanisms for thread synchronization.  Locks 
-** are lightweight resource contention controls that prevent multiple threads 
-** from accessing something (code/data) simultaneously.
-**/
-
-#ifndef prlock_h___
-#define prlock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * PRLock --
- *
- *     NSPR represents the lock as an opaque entity to the client of the
- *	   API.  All routines operate on a pointer to this opaque entity.
- */
-
-typedef struct PRLock PRLock;
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_NewLock
-** DESCRIPTION:
-**  Returns a pointer to a newly created opaque lock object.
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRLock*
-**   If the lock can not be created because of resource constraints, NULL
-**   is returned.
-**  
-***********************************************************************/
-NSPR_API(PRLock*) PR_NewLock(void);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyLock
-** DESCRIPTION:
-**  Destroys a given opaque lock object.
-** INPUTS:      PRLock *lock
-**              Lock to be freed.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_DestroyLock(PRLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_Lock
-** DESCRIPTION:
-**  Lock a lock.
-** INPUTS:      PRLock *lock
-**              Lock to locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_Lock(PRLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_Unlock
-** DESCRIPTION:
-**  Unlock a lock.  Unlocking an unlocked lock has undefined results.
-** INPUTS:      PRLock *lock
-**              Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      PR_STATUS
-**              Returns PR_FAILURE if the caller does not own the lock.
-***********************************************************************/
-NSPR_API(PRStatus) PR_Unlock(PRLock *lock);
-
-PR_END_EXTERN_C
-
-#endif /* prlock_h___ */
diff --git a/libs/js/nsprpub/pr/include/prlog.h b/libs/js/nsprpub/pr/include/prlog.h
deleted file mode 100644
index 6b88a5cbfa..0000000000
--- a/libs/js/nsprpub/pr/include/prlog.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prlog_h___
-#define prlog_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** prlog.h -- Declare interfaces to NSPR's Logging service
-**
-** NSPR provides a logging service that is used by NSPR itself and is
-** available to client programs.
-**
-** To use the service from a client program, you should create a
-** PRLogModuleInfo structure by calling PR_NewLogModule(). After
-** creating the LogModule, you can write to the log using the PR_LOG()
-** macro.
-**
-** Initialization of the log service is handled by NSPR initialization.
-**
-** At execution time, you must enable the log service. To enable the
-** log service, set the environment variable: NSPR_LOG_MODULES
-** variable.
-**
-** NSPR_LOG_MODULES variable has the form:
-**
-**     <moduleName>:<value>[, <moduleName>:<value>]*
-**
-** Where:
-**  <moduleName> is the name passed to PR_NewLogModule().
-**  <value> is a numeric constant, e.g. 5. This value is the maximum
-** value of a log event, enumerated by PRLogModuleLevel, that you want
-** written to the log.
-** 
-** For example: to record all events of greater value than or equal to
-** PR_LOG_ERROR for a LogModule names "gizmo", say:
-** 
-** set NSPR_LOG_MODULES=gizmo:2
-** 
-** Note that you must specify the numeric value of PR_LOG_ERROR.
-** 
-** Special LogModule names are provided for controlling NSPR's log
-** service at execution time. These controls should be set in the
-** NSPR_LOG_MODULES environment variable at execution time to affect
-** NSPR's log service for your application.
-** 
-** The special LogModule "all" enables all LogModules. To enable all
-** LogModule calls to PR_LOG(), say:
-** 
-** set NSPR_LOG_MODULES=all:5
-** 
-** The special LogModule name "sync" tells the NSPR log service to do
-** unbuffered logging.
-** 
-** The special LogModule name "bufsize:<size>" tells NSPR to set the
-** log buffer to <size>.
-**
-** The environment variable NSPR_LOG_FILE specifies the log file to use
-** unless the default of "stderr" is acceptable. For MS Windows
-** systems, NSPR_LOG_FILE can be set to a special value: "WinDebug"
-** (case sensitive). This value causes PR_LOG() output to be written
-** using the Windows API OutputDebugString(). OutputDebugString()
-** writes to the debugger window; some people find this helpful.
-** 
-**
-** To put log messages in your programs, use the PR_LOG macro:
-**
-**     PR_LOG(<module>, <level>, (<printfString>, <args>*));
-**
-** Where <module> is the address of a PRLogModuleInfo structure, and
-** <level> is one of the levels defined by the enumeration:
-** PRLogModuleLevel. <args> is a printf() style of argument list. That
-** is: (fmtstring, ...).
-**
-** Example:
-** 
-** main() {
-**    PRIntn one = 1;
-**    PRLogModuleInfo * myLm = PR_NewLogModule("gizmo");
-**    PR_LOG( myLm, PR_LOG_ALWAYS, ("Log this! %d\n", one)); 
-**    return; 
-** }
-** 
-** Note the use of printf() style arguments as the third agrument(s) to
-** PR_LOG().
-** 
-** After compiling and linking you application, set the environment:
-** 
-** set NSPR_LOG_MODULES=gizmo:5
-** set NSPR_LOG_FILE=logfile.txt
-** 
-** When you execute your application, the string "Log this! 1" will be
-** written to the file "logfile.txt".
-** 
-** Note to NSPR engineers: a number of PRLogModuleInfo structures are
-** defined and initialized in prinit.c. See this module for ideas on
-** what to log where.
-** 
-*/
-
-typedef enum PRLogModuleLevel {
-    PR_LOG_NONE = 0,                /* nothing */
-    PR_LOG_ALWAYS = 1,              /* always printed */
-    PR_LOG_ERROR = 2,               /* error messages */
-    PR_LOG_WARNING = 3,             /* warning messages */
-    PR_LOG_DEBUG = 4,               /* debug messages */
-
-    PR_LOG_NOTICE = PR_LOG_DEBUG,   /* notice messages */
-    PR_LOG_WARN = PR_LOG_WARNING,   /* warning messages */
-    PR_LOG_MIN = PR_LOG_DEBUG,      /* minimal debugging messages */
-    PR_LOG_MAX = PR_LOG_DEBUG       /* maximal debugging messages */
-} PRLogModuleLevel;
-
-/*
-** One of these structures is created for each module that uses logging.
-**    "name" is the name of the module
-**    "level" is the debugging level selected for that module
-*/
-typedef struct PRLogModuleInfo {
-    const char *name;
-    PRLogModuleLevel level;
-    struct PRLogModuleInfo *next;
-} PRLogModuleInfo;
-
-/*
-** Create a new log module.
-*/
-NSPR_API(PRLogModuleInfo*) PR_NewLogModule(const char *name);
-
-/*
-** Set the file to use for logging. Returns PR_FALSE if the file cannot
-** be created
-*/
-NSPR_API(PRBool) PR_SetLogFile(const char *name);
-
-/*
-** Set the size of the logging buffer. If "buffer_size" is zero then the
-** logging becomes "synchronous" (or unbuffered).
-*/
-NSPR_API(void) PR_SetLogBuffering(PRIntn buffer_size);
-
-/*
-** Print a string to the log. "fmt" is a PR_snprintf format type. All
-** messages printed to the log are preceeded by the name of the thread
-** and a time stamp. Also, the routine provides a missing newline if one
-** is not provided.
-*/
-NSPR_API(void) PR_LogPrint(const char *fmt, ...);
-
-/*
-** Flush the log to its file.
-*/
-NSPR_API(void) PR_LogFlush(void);
-
-/*
-** Windoze 16 can't support a large static string space for all of the
-** various debugging strings so logging is not enabled for it.
-*/
-#if (defined(DEBUG) || defined(FORCE_PR_LOG)) && !defined(WIN16)
-#define PR_LOGGING 1
-
-#define PR_LOG_TEST(_module,_level) \
-    ((_module)->level >= (_level))
-
-/*
-** Log something.
-**    "module" is the address of a PRLogModuleInfo structure
-**    "level" is the desired logging level
-**    "args" is a variable length list of arguments to print, in the following
-**       format:  ("printf style format string", ...)
-*/
-#define PR_LOG(_module,_level,_args)     \
-    PR_BEGIN_MACRO             \
-      if (PR_LOG_TEST(_module,_level)) { \
-      PR_LogPrint _args;         \
-      }                     \
-    PR_END_MACRO
-
-#else /* (defined(DEBUG) || defined(FORCE_PR_LOG)) && !defined(WIN16) */
-
-#undef PR_LOGGING
-#define PR_LOG_TEST(module,level) 0
-#define PR_LOG(module,level,args)
-
-#endif /* (defined(DEBUG) || defined(FORCE_PR_LOG)) && !defined(WIN16) */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#ifdef PR_LOGGING
-#define PR_LOG_BEGIN    PR_LOG
-#define PR_LOG_END      PR_LOG
-#define PR_LOG_DEFINE   PR_NewLogModule
-#else
-#define PR_LOG_BEGIN(module,level,args)
-#define PR_LOG_END(module,level,args)
-#define PR_LOG_DEFINE(_name)    NULL
-#endif /* PR_LOGGING */
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-
-NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln);
-#define PR_ASSERT(_expr) \
-    ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__))
-
-#define PR_NOT_REACHED(_reasonStr) \
-    PR_Assert(_reasonStr,__FILE__,__LINE__)
-
-#else
-
-#define PR_ASSERT(expr) ((void) 0)
-#define PR_NOT_REACHED(reasonStr)
-
-#endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */
-
-PR_END_EXTERN_C
-
-#endif /* prlog_h___ */
diff --git a/libs/js/nsprpub/pr/include/prlong.h b/libs/js/nsprpub/pr/include/prlong.h
deleted file mode 100644
index 09b432175a..0000000000
--- a/libs/js/nsprpub/pr/include/prlong.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                prlong.h
-** Description: Portable access to 64 bit numerics
-**
-** Long-long (64-bit signed integer type) support. Some C compilers
-** don't support 64 bit integers yet, so we use these macros to
-** support both machines that do and don't.
-**/
-#ifndef prlong_h___
-#define prlong_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/***********************************************************************
-** DEFINES:     LL_MaxInt
-**              LL_MinInt
-**              LL_Zero
-**              LL_MaxUint
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-#if defined(HAVE_WATCOM_BUG_2)
-PRInt64 __pascal __loadds __export
-    LL_MaxInt(void);
-PRInt64 __pascal __loadds __export
-    LL_MinInt(void);
-PRInt64 __pascal __loadds __export
-    LL_Zero(void);
-PRUint64 __pascal __loadds __export
-    LL_MaxUint(void);
-#else
-NSPR_API(PRInt64) LL_MaxInt(void);
-NSPR_API(PRInt64) LL_MinInt(void);
-NSPR_API(PRInt64) LL_Zero(void);
-NSPR_API(PRUint64) LL_MaxUint(void);
-#endif
-
-#if defined(HAVE_LONG_LONG)
-
-#if PR_BYTES_PER_LONG == 8
-#define LL_MAXINT   9223372036854775807L
-#define LL_MININT   (-LL_MAXINT - 1L)
-#define LL_ZERO     0L
-#define LL_MAXUINT  18446744073709551615UL
-#define LL_INIT(hi, lo)  ((hi ## L << 32) + lo ## L)
-#elif (defined(WIN32) || defined(WIN16)) && !defined(__GNUC__)
-#define LL_MAXINT   9223372036854775807i64
-#define LL_MININT   (-LL_MAXINT - 1i64)
-#define LL_ZERO     0i64
-#define LL_MAXUINT  18446744073709551615ui64
-#define LL_INIT(hi, lo)  ((hi ## i64 << 32) + lo ## i64)
-#else
-#define LL_MAXINT   9223372036854775807LL
-#define LL_MININT   (-LL_MAXINT - 1LL)
-#define LL_ZERO     0LL
-#define LL_MAXUINT  18446744073709551615ULL
-#define LL_INIT(hi, lo)  ((hi ## LL << 32) + lo ## LL)
-#endif
-
-/***********************************************************************
-** MACROS:      LL_*
-** DESCRIPTION:
-**      The following macros define portable access to the 64 bit
-**      math facilities.
-**
-***********************************************************************/
-
-/***********************************************************************
-** MACROS:      LL_<relational operators>
-**
-**  LL_IS_ZERO        Test for zero
-**  LL_EQ             Test for equality
-**  LL_NE             Test for inequality
-**  LL_GE_ZERO        Test for zero or positive
-**  LL_CMP            Compare two values
-***********************************************************************/
-#define LL_IS_ZERO(a)       ((a) == 0)
-#define LL_EQ(a, b)         ((a) == (b))
-#define LL_NE(a, b)         ((a) != (b))
-#define LL_GE_ZERO(a)       ((a) >= 0)
-#define LL_CMP(a, op, b)    ((PRInt64)(a) op (PRInt64)(b))
-#define LL_UCMP(a, op, b)   ((PRUint64)(a) op (PRUint64)(b))
-
-/***********************************************************************
-** MACROS:      LL_<logical operators>
-**
-**  LL_AND            Logical and
-**  LL_OR             Logical or
-**  LL_XOR            Logical exclusion
-**  LL_OR2            A disgusting deviation
-**  LL_NOT            Negation (one's complement)
-***********************************************************************/
-#define LL_AND(r, a, b)        ((r) = (a) & (b))
-#define LL_OR(r, a, b)        ((r) = (a) | (b))
-#define LL_XOR(r, a, b)        ((r) = (a) ^ (b))
-#define LL_OR2(r, a)        ((r) = (r) | (a))
-#define LL_NOT(r, a)        ((r) = ~(a))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_NEG            Negation (two's complement)
-**  LL_ADD            Summation (two's complement)
-**  LL_SUB            Difference (two's complement)
-***********************************************************************/
-#define LL_NEG(r, a)        ((r) = -(a))
-#define LL_ADD(r, a, b)     ((r) = (a) + (b))
-#define LL_SUB(r, a, b)     ((r) = (a) - (b))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_MUL            Product (two's complement)
-**  LL_DIV            Quotient (two's complement)
-**  LL_MOD            Modulus (two's complement)
-***********************************************************************/
-#define LL_MUL(r, a, b)        ((r) = (a) * (b))
-#define LL_DIV(r, a, b)        ((r) = (a) / (b))
-#define LL_MOD(r, a, b)        ((r) = (a) % (b))
-
-/***********************************************************************
-** MACROS:      LL_<shifting operators>
-**
-**  LL_SHL            Shift left [0..64] bits
-**  LL_SHR            Shift right [0..64] bits with sign extension
-**  LL_USHR           Unsigned shift right [0..64] bits
-**  LL_ISHL           Signed shift left [0..64] bits
-***********************************************************************/
-#define LL_SHL(r, a, b)     ((r) = (PRInt64)(a) << (b))
-#define LL_SHR(r, a, b)     ((r) = (PRInt64)(a) >> (b))
-#define LL_USHR(r, a, b)    ((r) = (PRUint64)(a) >> (b))
-#define LL_ISHL(r, a, b)    ((r) = (PRInt64)(a) << (b))
-
-/***********************************************************************
-** MACROS:      LL_<conversion operators>
-**
-**  LL_L2I            Convert to signed 32 bit
-**  LL_L2UI           Convert to unsigned 32 bit
-**  LL_L2F            Convert to floating point
-**  LL_L2D            Convert to floating point
-**  LL_I2L            Convert signed to 64 bit
-**  LL_UI2L           Convert unsigned to 64 bit
-**  LL_F2L            Convert float to 64 bit
-**  LL_D2L            Convert float to 64 bit
-***********************************************************************/
-#define LL_L2I(i, l)        ((i) = (PRInt32)(l))
-#define LL_L2UI(ui, l)        ((ui) = (PRUint32)(l))
-#define LL_L2F(f, l)        ((f) = (PRFloat64)(l))
-#define LL_L2D(d, l)        ((d) = (PRFloat64)(l))
-
-#define LL_I2L(l, i)        ((l) = (PRInt64)(i))
-#define LL_UI2L(l, ui)        ((l) = (PRInt64)(ui))
-#define LL_F2L(l, f)        ((l) = (PRInt64)(f))
-#define LL_D2L(l, d)        ((l) = (PRInt64)(d))
-
-/***********************************************************************
-** MACROS:      LL_UDIVMOD
-** DESCRIPTION:
-**  Produce both a quotient and a remainder given an unsigned 
-** INPUTS:      PRUint64 a: The dividend of the operation
-**              PRUint64 b: The quotient of the operation
-** OUTPUTS:     PRUint64 *qp: pointer to quotient
-**              PRUint64 *rp: pointer to remainder
-***********************************************************************/
-#define LL_UDIVMOD(qp, rp, a, b) \
-    (*(qp) = ((PRUint64)(a) / (b)), \
-     *(rp) = ((PRUint64)(a) % (b)))
-
-#else  /* !HAVE_LONG_LONG */
-
-#define LL_MAXINT   LL_MaxInt()
-#define LL_MININT   LL_MinInt()
-#define LL_ZERO     LL_Zero()
-#define LL_MAXUINT  LL_MaxUint()
-
-#ifdef IS_LITTLE_ENDIAN
-#define LL_INIT(hi, lo) {PR_UINT32(lo), PR_UINT32(hi)}
-#else
-#define LL_INIT(hi, lo) {PR_UINT32(hi), PR_UINT32(lo)}
-#endif
-
-#define LL_IS_ZERO(a)        (((a).hi == 0) && ((a).lo == 0))
-#define LL_EQ(a, b)        (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define LL_NE(a, b)        (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define LL_GE_ZERO(a)        (((a).hi >> 31) == 0)
-
-#define LL_CMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((PRInt32)(a).hi op (PRInt32)(b).hi))
-#define LL_UCMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((a).hi op (b).hi))
-
-#define LL_AND(r, a, b)        ((r).lo = (a).lo & (b).lo, \
-                 (r).hi = (a).hi & (b).hi)
-#define LL_OR(r, a, b)        ((r).lo = (a).lo | (b).lo, \
-                 (r).hi = (a).hi | (b).hi)
-#define LL_XOR(r, a, b)        ((r).lo = (a).lo ^ (b).lo, \
-                 (r).hi = (a).hi ^ (b).hi)
-#define LL_OR2(r, a)        ((r).lo = (r).lo | (a).lo, \
-                 (r).hi = (r).hi | (a).hi)
-#define LL_NOT(r, a)        ((r).lo = ~(a).lo, \
-                 (r).hi = ~(a).hi)
-
-#define LL_NEG(r, a)        ((r).lo = -(PRInt32)(a).lo, \
-                 (r).hi = -(PRInt32)(a).hi - ((r).lo != 0))
-#define LL_ADD(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo + _b.lo; \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo); \
-}
-
-#define LL_SUB(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo - _b.lo; \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo); \
-}
-
-#define LL_MUL(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    LL_MUL32(r, _a.lo, _b.lo); \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi; \
-}
-
-#define _lo16(a)        ((a) & PR_BITMASK(16))
-#define _hi16(a)        ((a) >> 16)
-
-#define LL_MUL32(r, a, b) { \
-     PRUint32 _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3; \
-     _a1 = _hi16(a), _a0 = _lo16(a); \
-     _b1 = _hi16(b), _b0 = _lo16(b); \
-     _y0 = _a0 * _b0; \
-     _y1 = _a0 * _b1; \
-     _y2 = _a1 * _b0; \
-     _y3 = _a1 * _b1; \
-     _y1 += _hi16(_y0);                         /* can't carry */ \
-     _y1 += _y2;                                /* might carry */ \
-     if (_y1 < _y2)    \
-        _y3 += (PRUint32)(PR_BIT(16));  /* propagate */ \
-     (r).lo = (_lo16(_y1) << 16) + _lo16(_y0); \
-     (r).hi = _y3 + _hi16(_y1); \
-}
-
-#define LL_UDIVMOD(qp, rp, a, b)    ll_udivmod(qp, rp, a, b)
-
-NSPR_API(void) ll_udivmod(PRUint64 *qp, PRUint64 *rp, PRUint64 a, PRUint64 b);
-
-#define LL_DIV(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    _negative ^= 1; \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(&(r), 0, _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_MOD(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(0, &(r), _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_SHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-        if ((b) < 32) { \
-        (r).lo = _a.lo << ((b) & 31); \
-        (r).hi = (_a.hi << ((b) & 31)) | (_a.lo >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = _a.lo << ((b) & 31); \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-/* a is an PRInt32, b is PRInt32, r is PRInt64 */
-#define LL_ISHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-    _a.lo = (a); \
-    _a.hi = 0; \
-        if ((b) < 32) { \
-        (r).lo = (a) << ((b) & 31); \
-        (r).hi = ((a) >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = (a) << ((b) & 31); \
-    } \
-    } else { \
-    (r).lo = (a); \
-    (r).hi = 0; \
-    } \
-}
-
-#define LL_SHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = (PRInt32)_a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = (PRInt32)_a.hi >> ((b) & 31); \
-        (r).hi = (PRInt32)_a.hi >> 31; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_USHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = _a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = _a.hi >> ((b) & 31); \
-        (r).hi = 0; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_L2I(i, l)        ((i) = (l).lo)
-#define LL_L2UI(ui, l)        ((ui) = (l).lo)
-#define LL_L2F(f, l)        { double _d; LL_L2D(_d, l); (f) = (PRFloat64)_d; }
-
-#define LL_L2D(d, l) { \
-    int _negative; \
-    PRInt64 _absval; \
- \
-    _negative = (l).hi >> 31; \
-    if (_negative) { \
-    LL_NEG(_absval, l); \
-    } else { \
-    _absval = l; \
-    } \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo; \
-    if (_negative) \
-    (d) = -(d); \
-}
-
-#define LL_I2L(l, i)        { PRInt32 _i = ((PRInt32)(i)) >> 31; (l).lo = (i); (l).hi = _i; }
-#define LL_UI2L(l, ui)      ((l).lo = (ui), (l).hi = 0)
-#define LL_F2L(l, f)        { double _d = (double)f; LL_D2L(l, _d); }
-
-#define LL_D2L(l, d) { \
-    int _negative; \
-    double _absval, _d_hi; \
-    PRInt64 _lo_d; \
- \
-    _negative = ((d) < 0); \
-    _absval = _negative ? -(d) : (d); \
- \
-    (l).hi = _absval / 4.294967296e9; \
-    (l).lo = 0; \
-    LL_L2D(_d_hi, l); \
-    _absval -= _d_hi; \
-    _lo_d.hi = 0; \
-    if (_absval < 0) { \
-    _lo_d.lo = -_absval; \
-    LL_SUB(l, l, _lo_d); \
-    } else { \
-    _lo_d.lo = _absval; \
-    LL_ADD(l, l, _lo_d); \
-    } \
- \
-    if (_negative) \
-    LL_NEG(l, l); \
-}
-
-#endif /* !HAVE_LONG_LONG */
-
-PR_END_EXTERN_C
-
-#endif /* prlong_h___ */
diff --git a/libs/js/nsprpub/pr/include/prmem.h b/libs/js/nsprpub/pr/include/prmem.h
deleted file mode 100644
index 1cf0949c09..0000000000
--- a/libs/js/nsprpub/pr/include/prmem.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: prmem.h
-** Description: API to NSPR memory management functions
-**
-*/
-#ifndef prmem_h___
-#define prmem_h___
-
-#include "prtypes.h"
-#include <stdlib.h>
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Thread safe memory allocation.
-**
-** NOTE: pr wraps up malloc, free, calloc, realloc so they are already
-** thread safe (and are not declared here - look in stdlib.h).
-*/
-
-/*
-** PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free have the same signatures
-** as their libc equivalent malloc, calloc, realloc, and free, and have
-** the same semantics.  (Note that the argument type size_t is replaced
-** by PRUint32.)  Memory allocated by PR_Malloc, PR_Calloc, or PR_Realloc
-** must be freed by PR_Free.
-*/
-
-NSPR_API(void *) PR_Malloc(PRUint32 size);
-
-NSPR_API(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize);
-
-NSPR_API(void *) PR_Realloc(void *ptr, PRUint32 size);
-
-NSPR_API(void) PR_Free(void *ptr);
-
-/*
-** The following are some convenience macros defined in terms of
-** PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free.
-*/
-
-/***********************************************************************
-** FUNCTION:	PR_MALLOC()
-** DESCRIPTION:
-**   PR_NEW() allocates an untyped item of size _size from the heap.
-** INPUTS:  _size: size in bytes of item to be allocated
-** OUTPUTS:	untyped pointer to the node allocated
-** RETURN:	pointer to node or error returned from malloc().
-***********************************************************************/
-#define PR_MALLOC(_bytes) (PR_Malloc((_bytes)))
-
-/***********************************************************************
-** FUNCTION:	PR_NEW()
-** DESCRIPTION:
-**   PR_NEW() allocates an item of type _struct from the heap.
-** INPUTS:  _struct: a data type
-** OUTPUTS:	pointer to _struct
-** RETURN:	pointer to _struct or error returns from malloc().
-***********************************************************************/
-#define PR_NEW(_struct) ((_struct *) PR_MALLOC(sizeof(_struct)))
-
-/***********************************************************************
-** FUNCTION:	PR_REALLOC()
-** DESCRIPTION:
-**   PR_REALLOC() re-allocates _ptr bytes from the heap as a _size
-**   untyped item.
-** INPUTS:	_ptr: pointer to node to reallocate
-**          _size: size of node to allocate
-** OUTPUTS:	pointer to node allocated
-** RETURN:	pointer to node allocated
-***********************************************************************/
-#define PR_REALLOC(_ptr, _size) (PR_Realloc((_ptr), (_size)))
-
-/***********************************************************************
-** FUNCTION:	PR_CALLOC()
-** DESCRIPTION:
-**   PR_CALLOC() allocates a _size bytes untyped item from the heap
-**   and sets the allocated memory to all 0x00.
-** INPUTS:	_size: size of node to allocate
-** OUTPUTS:	pointer to node allocated
-** RETURN:	pointer to node allocated
-***********************************************************************/
-#define PR_CALLOC(_size) (PR_Calloc(1, (_size)))
-
-/***********************************************************************
-** FUNCTION:	PR_NEWZAP()
-** DESCRIPTION:
-**   PR_NEWZAP() allocates an item of type _struct from the heap
-**   and sets the allocated memory to all 0x00.
-** INPUTS:	_struct: a data type
-** OUTPUTS:	pointer to _struct
-** RETURN:	pointer to _struct
-***********************************************************************/
-#define PR_NEWZAP(_struct) ((_struct*)PR_Calloc(1, sizeof(_struct)))
-
-/***********************************************************************
-** FUNCTION:	PR_DELETE()
-** DESCRIPTION:
-**   PR_DELETE() unallocates an object previosly allocated via PR_NEW()
-**   or PR_NEWZAP() to the heap.
-** INPUTS:	pointer to previously allocated object
-** OUTPUTS:	the referenced object is returned to the heap
-** RETURN:	void
-***********************************************************************/
-#define PR_DELETE(_ptr) { PR_Free(_ptr); (_ptr) = NULL; }
-
-/***********************************************************************
-** FUNCTION:	PR_FREEIF()
-** DESCRIPTION:
-**   PR_FREEIF() conditionally unallocates an object previously allocated
-**   vial PR_NEW() or PR_NEWZAP(). If the pointer to the object is
-**   equal to zero (0), the object is not released.
-** INPUTS:	pointer to previously allocated object
-** OUTPUTS:	the referenced object is conditionally returned to the heap
-** RETURN:	void
-***********************************************************************/
-#define PR_FREEIF(_ptr)	if (_ptr) PR_DELETE(_ptr)
-
-PR_END_EXTERN_C
-
-#endif /* prmem_h___ */
diff --git a/libs/js/nsprpub/pr/include/prmon.h b/libs/js/nsprpub/pr/include/prmon.h
deleted file mode 100644
index d2a1971cfe..0000000000
--- a/libs/js/nsprpub/pr/include/prmon.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prmon_h___
-#define prmon_h___
-
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRMonitor PRMonitor;
-
-/*
-** Create a new monitor. Monitors are re-entrant locks with a single built-in
-** condition variable.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-NSPR_API(PRMonitor*) PR_NewMonitor(void);
-
-/*
-** Destroy a monitor. The caller is responsible for guaranteeing that the
-** monitor is no longer in use. There must be no thread waiting on the monitor's
-** condition variable and that the lock is not held.
-**
-*/
-NSPR_API(void) PR_DestroyMonitor(PRMonitor *mon);
-
-/*
-** Enter the lock associated with the monitor. If the calling thread currently
-** is in the monitor, the call to enter will silently succeed. In either case,
-** it will increment the entry count by one.
-*/
-NSPR_API(void) PR_EnterMonitor(PRMonitor *mon);
-
-/*
-** Decrement the entry count associated with the monitor. If the decremented
-** entry count is zero, the monitor is exited. Returns PR_FAILURE if the
-** calling thread has not entered the monitor.
-*/
-NSPR_API(PRStatus) PR_ExitMonitor(PRMonitor *mon);
-
-/*
-** Wait for a notify on the monitor's condition variable. Sleep for "ticks"
-** amount of time (if "ticks" is PR_INTERVAL_NO_TIMEOUT then the sleep is
-** indefinite).
-**
-** While the thread is waiting it exits the monitor (as if it called
-** PR_ExitMonitor as many times as it had called PR_EnterMonitor).  When
-** the wait has finished the thread regains control of the monitors lock
-** with the same entry count as before the wait began.
-**
-** The thread waiting on the monitor will be resumed when the monitor is
-** notified (assuming the thread is the next in line to receive the
-** notify) or when the "ticks" timeout elapses.
-**
-** Returns PR_FAILURE if the caller has not entered the monitor.
-*/
-NSPR_API(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime ticks);
-
-/*
-** Notify a thread waiting on the monitor's condition variable. If a thread
-** is waiting on the condition variable (using PR_Wait) then it is awakened
-** and attempts to reenter the monitor.
-*/
-NSPR_API(PRStatus) PR_Notify(PRMonitor *mon);
-
-/*
-** Notify all of the threads waiting on the monitor's condition variable.
-** All of threads waiting on the condition are scheduled to reenter the
-** monitor.
-*/
-NSPR_API(PRStatus) PR_NotifyAll(PRMonitor *mon);
-
-PR_END_EXTERN_C
-
-#endif /* prmon_h___ */
diff --git a/libs/js/nsprpub/pr/include/prmwait.h b/libs/js/nsprpub/pr/include/prmwait.h
deleted file mode 100644
index e4cabda408..0000000000
--- a/libs/js/nsprpub/pr/include/prmwait.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if defined(_PRMWAIT_H)
-#else
-#define _PRMWAIT_H
-
-#include "prio.h"
-#include "prtypes.h"
-#include "prclist.h"
-
-PR_BEGIN_EXTERN_C
-
-/********************************************************************************/
-/********************************************************************************/
-/********************************************************************************/
-/******************************       WARNING        ****************************/
-/********************************************************************************/
-/**************************** This is work in progress. *************************/
-/************************** Do not make any assumptions *************************/
-/************************** about the stability of this *************************/
-/************************** API or the underlying imple- ************************/
-/************************** mentation.                   ************************/
-/********************************************************************************/
-/********************************************************************************/
-
-/*
-** STRUCTURE:   PRWaitGroup
-** DESCRIPTION:
-**      The client may define several wait groups in order to semantically
-**      tie a collection of file descriptors for a single purpose. This allows
-**      easier dispatching of threads that returned with active file descriptors
-**      from the wait function.
-*/
-typedef struct PRWaitGroup PRWaitGroup;
-
-/*
-** ENUMERATION: PRMWStatus
-** DESCRIPTION:
-**      This enumeration is used to indicate the completion status of
-**      a receive wait object. Generally stated, a positive value indicates
-**      that the operation is not yet complete. A zero value indicates
-**      success (similar to PR_SUCCESS) and any negative value is an
-**      indication of failure. The reason for the failure can be retrieved
-**      by calling PR_GetError().
-**
-**  PR_MW_PENDING       The operation is still pending. None of the other
-**                      fields of the object are currently valid.
-**  PR_MW_SUCCESS       The operation is complete and it was successful.
-**  PR_MW_FAILURE       The operation failed. The reason for the failure
-**                      can be retrieved by calling PR_GetError().
-**  PR_MW_TIMEOUT       The amount of time allowed for by the object's
-**                      'timeout' field has expired w/o the operation
-**                      otherwise coming to closure.
-**  PR_MW_INTERRUPT     The operation was cancelled, either by the client
-**                      calling PR_CancelWaitFileDesc() or destroying the
-**                      entire wait group (PR_DestroyWaitGroup()).
-*/
-typedef enum PRMWStatus
-{
-    PR_MW_PENDING = 1,
-    PR_MW_SUCCESS = 0,
-    PR_MW_FAILURE = -1,
-    PR_MW_TIMEOUT = -2,
-    PR_MW_INTERRUPT = -3
-} PRMWStatus;
-
-/*
-** STRUCTURE:   PRMemoryDescriptor
-** DESCRIPTION:
-**      THis is a descriptor for an interval of memory. It contains a
-**      pointer to the first byte of that memory and the length (in
-**      bytes) of the interval.
-*/
-typedef struct PRMemoryDescriptor
-{
-    void *start;                /* pointer to first byte of memory */
-    PRSize length;              /* length (in bytes) of memory interval */
-} PRMemoryDescriptor;
-
-/*
-** STRUCTURE:   PRMWaitClientData
-** DESCRIPTION:
-**      An opague stucture for which a client MAY give provide a concrete
-**      definition and associate with a receive descriptor. The NSPR runtime
-**      does not manage this field. It is completely up to the client.
-*/
-typedef struct PRMWaitClientData PRMWaitClientData;
-
-/*
-** STRUCTURE:   PRRecvWait
-** DESCRIPTION:
-**      A receive wait object contains the file descriptor that is subject
-**      to the wait and the amount of time (beginning epoch established
-**      when the object is presented to the runtime) the the channel should
-**      block before abandoning the process.
-**
-**      The success of the wait operation will be noted in the object's
-**      'outcome' field. The fields are not valid when the NSPR runtime
-**      is in possession of the object.
-**
-**      The memory descriptor describes an interval of writable memory
-**      in the caller's address space where data from an initial read
-**      can be placed. The description may indicate a null interval.
-*/
-typedef struct PRRecvWait 
-{
-    PRCList internal;           /* internal runtime linkages */
-
-    PRFileDesc *fd;             /* file descriptor associated w/ object */
-    PRMWStatus outcome;         /* outcome of the current/last operation */
-    PRIntervalTime timeout;     /* time allowed for entire operation */
-
-    PRInt32 bytesRecv;          /* number of bytes transferred into buffer */
-    PRMemoryDescriptor buffer;  /* where to store first segment of input data */
-    PRMWaitClientData *client;  /* pointer to arbitrary client defined data */
-} PRRecvWait;
-
-/*
-** STRUCTURE:   PRMWaitEnumerator
-** DESCRIPTION:
-**      An enumeration object is used to store the state of an existing
-**      enumeration over a wait group. The opaque object must be allocated
-**      by the client and the reference presented on each call to the
-**      pseudo-stateless enumerator. The enumeration objects are sharable
-**      only in serial fashion.
-*/
-typedef struct PRMWaitEnumerator PRMWaitEnumerator;
-
-
-/*
-** FUNCTION:    PR_AddWaitFileDesc
-** DESCRIPTION:
-**      This function will effectively add a file descriptor to the
-**      list of those waiting for network receive. The new descriptor
-**      will be semantically tied to the wait group specified.
-**
-**      The ownership for the storage pointed to by 'desc' is temporarily
-**      passed over the the NSPR runtime. It will be handed back by the
-**      function PR_WaitRecvReady().
-**
-**  INPUTS
-**      group       A reference to a PRWaitGroup or NULL. Wait groups are
-**                  created by calling PR_CreateWaitGroup() and are used
-**                  to semantically group various file descriptors by the
-**                  client's application.
-**      desc        A reference to a valid PRRecvWait. The object of the
-**                  reference must be preserved and not be modified
-**                  until its ownership is returned to the client.
-**  RETURN
-**      PRStatus    An indication of success. If equal to PR_FAILUE details
-**                  of the failure are avaiable via PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  Invalid 'group' identifier or duplicate 'desc' object.
-**      PR_OUT_OF_MEMORY_ERROR
-**                  Insuffient memory for internal data structures.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRStatus) PR_AddWaitFileDesc(PRWaitGroup *group, PRRecvWait *desc);
-
-/*
-** FUNCTION:    PR_WaitRecvReady
-** DESCRIPTION:
-**      PR_WaitRecvReady will block the calling thread until one of the
-**      file descriptors that have been added via PR_AddWaitFileDesc is
-**      available for input I/O.
-**  INPUT
-**      group       A pointer to a valid PRWaitGroup or NULL (the null
-**                  group. The function will block the caller until a
-**                  channel from the wait group becomes ready for receive
-**                  or there is some sort of error.
-**  RETURN
-**      PRReciveWait
-**                  When the caller is resumed it is either returned a
-**                  valid pointer to a previously added receive wait or
-**                  a NULL. If the latter, the function has terminated
-**                  for a reason that can be determined by calling
-**                  PR_GetError().
-**                  If a valid pointer is returned, the reference is to the
-**                  file descriptor contained in the receive wait object.
-**                  The outcome of the wait operation may still fail, and
-**                  if it has, that fact will be noted in the object's
-**                  outcome field. Details can be retrieved from PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' is not known by the runtime.
-**      PR_PENDING_INTERRUPT_ERROR
-                    The thread was interrupted.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRRecvWait*) PR_WaitRecvReady(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CancelWaitFileDesc
-** DESCRIPTION:
-**      PR_CancelWaitFileDesc is provided as a means for cancelling operations
-**      on objects previously submitted by use of PR_AddWaitFileDesc(). If
-**      the runtime knows of the object, it will be marked as having failed
-**      because it was interrupted (similar to PR_Interrupt()). The first
-**      available thread waiting on the group will be made to return the
-**      PRRecvWait object with the outcome noted.
-**
-**  INPUTS
-**      group       The wait group under which the wait receive object was
-**                  added.
-**      desc        A pointer to the wait receive object that is to be
-**                  cancelled.
-**  RETURN
-**      PRStatus    If the wait receive object was located and associated
-**                  with the specified wait group, the status returned will
-**                  be PR_SUCCESS. There is still a race condition that would
-**                  permit the offected object to complete normally, but it
-**                  is assured that it will complete in the near future.
-**                  If the receive object or wait group are invalid, the
-**                  function will return with a status of PR_FAILURE.
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument is not recognized as a valid group.
-**      PR_COLLECTION_EMPTY_ERROR
-**                  There are no more receive wait objects in the group's
-**                  collection.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRStatus) PR_CancelWaitFileDesc(PRWaitGroup *group, PRRecvWait *desc);
-
-/*
-** FUNCTION:    PR_CancelWaitGroup
-** DESCRIPTION:
-**      PR_CancelWaitGroup is provided as a means for cancelling operations
-**      on objects previously submitted by use of PR_AddWaitFileDesc(). Each
-**      successive call will return a pointer to a PRRecvWait object that
-**      was previously registered via PR_AddWaitFileDesc(). If no wait
-**      objects are associated with the wait group, a NULL will be returned.
-**      This function should be called in a loop until a NULL is returned
-**      to reclaim all the wait objects prior to calling PR_DestroyWaitGroup().
-**
-**  INPUTS
-**      group       The wait group under which the wait receive object was
-**                  added.
-**  RETURN
-**      PRRecvWait* If the wait group is valid and at least one receive wait
-**                  object is present in the group, that object will be
-**                  marked as PR_MW_INTERRUPT'd and removed from the group's
-**                  queues. Otherwise a NULL will be returned and the reason
-**                  for the NULL may be retrieved by calling PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**      PR_GROUP_EMPTY_ERROR
-*/
-NSPR_API(PRRecvWait*) PR_CancelWaitGroup(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CreateWaitGroup
-** DESCRIPTION:
-**      A wait group is an opaque object that a client may create in order
-**      to semantically group various wait requests. Each wait group is
-**      unique, including the default wait group (NULL). A wait request
-**      that was added under a wait group will only be serviced by a caller
-**      that specified the same wait group.
-**
-**  INPUT
-**      size        The size of the hash table to be used to contain the
-**                  receive wait objects. This is just the initial size.
-**                  It will grow as it needs to, but to avoid that hassle
-**                  one can suggest a suitable size initially. It should
-**                  be ~30% larger than the maximum number of receive wait
-**                  objects expected.
-**  RETURN
-**      PRWaitGroup If successful, the function will return a pointer to an
-**                  object that was allocated by and owned by the runtime.
-**                  The reference remains valid until it is explicitly destroyed
-**                  by calling PR_DestroyWaitGroup().
-**
-**  ERRORS
-**      PR_OUT_OF_MEMORY_ERROR
-*/
-NSPR_API(PRWaitGroup*) PR_CreateWaitGroup(PRInt32 size);
-
-/*
-** FUNCTION:    PR_DestroyWaitGroup
-** DESCRIPTION:
-**      Undo the effects of PR_CreateWaitGroup(). Any receive wait operations
-**      on the group will be treated as if the each had been the target of a
-**      PR_CancelWaitFileDesc().
-**
-**  INPUT
-**      group       Reference to a wait group previously allocated using
-**                  PR_CreateWaitGroup().
-**  RETURN
-**      PRStatus    Will be PR_SUCCESS if the wait group was valid and there
-**                  are no receive wait objects in that group. Otherwise
-**                  will indicate PR_FAILURE.
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument does not reference a known object.
-**      PR_INVALID_STATE_ERROR
-**                  The group still contains receive wait objects.
-*/
-NSPR_API(PRStatus) PR_DestroyWaitGroup(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CreateMWaitEnumerator
-** DESCRIPTION:
-**      The PR_CreateMWaitEnumerator() function returns a reference to an
-**      opaque PRMWaitEnumerator object. The enumerator object is required
-**      as an argument for each successive call in the stateless enumeration
-**      of the indicated wait group.
-**
-**      group       The wait group that the enumeration is intended to
-**                  process. It may be be the default wait group (NULL).
-** RETURN
-**      PRMWaitEnumerator* group
-**                  A reference to an object that will be used to store
-**                  intermediate state of enumerations.
-** ERRORS
-**      Errors are indicated by the function returning a NULL.
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument does not reference a known object.
-**      PR_OUT_OF_MEMORY_ERROR
-*/
-NSPR_API(PRMWaitEnumerator*) PR_CreateMWaitEnumerator(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_DestroyMWaitEnumerator
-** DESCRIPTION:
-**      Destroys the object created by PR_CreateMWaitEnumerator(). The reference
-**      used as an argument becomes invalid.
-**
-** INPUT
-**      PRMWaitEnumerator* enumerator
-**          The PRMWaitEnumerator object to destroy.
-** RETURN
-**      PRStatus
-**          PR_SUCCESS if successful, PR_FAILURE otherwise.
-** ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The enumerator is invalid.
-*/
-NSPR_API(PRStatus) PR_DestroyMWaitEnumerator(PRMWaitEnumerator* enumerator);
-
-/*
-** FUNCTION:    PR_EnumerateWaitGroup
-** DESCRIPTION:
-**      PR_EnumerateWaitGroup is a thread safe enumerator over a wait group.
-**      Each call to the enumerator must present a valid PRMWaitEnumerator
-**      rererence and a pointer to the "previous" element returned from the
-**      enumeration process or a NULL.
-**
-**      An enumeration is started by passing a NULL as the "previous" value.
-**      Subsequent calls to the enumerator must pass in the result of the
-**      previous call. The enumeration end is signaled by the runtime returning
-**      a NULL as the result.
-**
-**      Modifications to the content of the wait group are allowed during
-**      an enumeration. The effect is that the enumeration may have to be
-**      "reset" and that may result in duplicates being returned from the
-**      enumeration.
-**
-**      An enumeration may be abandoned at any time. The runtime is not
-**      keeping any state, so there are no issues in that regard.
-*/
-NSPR_API(PRRecvWait*) PR_EnumerateWaitGroup(
-    PRMWaitEnumerator *enumerator, const PRRecvWait *previous);
-   
-PR_END_EXTERN_C
-
-#endif /* defined(_PRMWAIT_H) */
-
-/* prmwait.h */
diff --git a/libs/js/nsprpub/pr/include/prnetdb.h b/libs/js/nsprpub/pr/include/prnetdb.h
deleted file mode 100644
index 685efbbc14..0000000000
--- a/libs/js/nsprpub/pr/include/prnetdb.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prnetdb_h___
-#define prnetdb_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-
-/*
- *********************************************************************
- *  Translate an Internet address to/from a character string
- *********************************************************************
- */
-NSPR_API(PRStatus) PR_StringToNetAddr(
-    const char *string, PRNetAddr *addr);
-
-NSPR_API(PRStatus) PR_NetAddrToString(
-    const PRNetAddr *addr, char *string, PRUint32 size);
-
-/*
-** Structures returned by network data base library.  All addresses are
-** supplied in host order, and returned in network order (suitable for
-** use in system calls).
-*/
-/*
-** Beware that WINSOCK.H defines h_addrtype and h_length as short.
-** Client code does direct struct copies of hostent to PRHostEnt and
-** hence the ifdef.
-*/
-typedef struct PRHostEnt {
-    char *h_name;       /* official name of host */
-    char **h_aliases;   /* alias list */
-#if defined(WIN32) || defined(WIN16)
-    PRInt16 h_addrtype; /* host address type */
-    PRInt16 h_length;   /* length of address */
-#else
-    PRInt32 h_addrtype; /* host address type */
-    PRInt32 h_length;   /* length of address */
-#endif
-    char **h_addr_list; /* list of addresses from name server */
-} PRHostEnt;
-
-/* A safe size to use that will mostly work... */
-#if (defined(AIX) && defined(_THREAD_SAFE)) || defined(OSF1)
-#define PR_NETDB_BUF_SIZE sizeof(struct protoent_data)
-#else
-#define PR_NETDB_BUF_SIZE 1024
-#endif
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetHostByName()
-** Lookup a host by name.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetHostByName(
-    const char *hostname, char *buf, PRIntn bufsize, PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetIPNodeByName()
-** Lookup a host by name. Equivalent to getipnodebyname(AI_DEFAULT)
-** of RFC 2553.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  PRUint16 af         Address family (either PR_AF_INET or PR_AF_INET6)
-**  PRIntn flags        Specifies the types of addresses that are searched
-**                      for and the types of addresses that are returned.
-**                      The only supported flag is PR_AI_DEFAULT.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-
-
-#define PR_AI_ALL         0x08
-#define PR_AI_V4MAPPED    0x10
-#define PR_AI_ADDRCONFIG  0x20
-#define PR_AI_NOCANONNAME 0x8000
-#define PR_AI_DEFAULT     (PR_AI_V4MAPPED | PR_AI_ADDRCONFIG)
-
-NSPR_API(PRStatus) PR_GetIPNodeByName(
-    const char *hostname,
-    PRUint16 af,
-    PRIntn flags,
-    char *buf,
-    PRIntn bufsize,
-    PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetHostByAddr()
-** Lookup a host entry by its network address.
-**
-** INPUTS:
-**  char *hostaddr      IP address of host in question
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetHostByAddr(
-    const PRNetAddr *hostaddr, char *buf, PRIntn bufsize, PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	PR_EnumerateHostEnt()	
-** DESCRIPTION:
-**  A stateless enumerator over a PRHostEnt structure acquired from
-**  PR_GetHostByName() PR_GetHostByAddr() to evaluate the possible
-**  network addresses.
-**
-** INPUTS:
-**  PRIntn  enumIndex   Index of the enumeration. The enumeration starts
-**                      and ends with a value of zero.
-**
-**  PRHostEnt *hostEnt  A pointer to a host entry struct that was
-**                      previously returned by PR_GetHostByName() or
-**                      PR_GetHostByAddr().
-**
-**  PRUint16 port       The port number to be assigned as part of the
-**                      PRNetAddr.
-**
-** OUTPUTS:
-**  PRNetAddr *address  A pointer to an address structure that will be
-**                      filled in by the call to the enumeration if the
-**                      result of the call is greater than zero.
-**
-** RETURN:
-**  PRIntn              The value that should be used for the next call
-**                      of the enumerator ('enumIndex'). The enumeration
-**                      is ended if this value is returned zero.
-**                      If a value of -1 is returned, the enumeration
-**                      has failed. The reason for the failure can be
-**                      retrieved by calling PR_GetError().
-***********************************************************************/
-NSPR_API(PRIntn) PR_EnumerateHostEnt(
-    PRIntn enumIndex, const PRHostEnt *hostEnt, PRUint16 port, PRNetAddr *address);
-
-/***********************************************************************
-** FUNCTION: PR_InitializeNetAddr(), 
-** DESCRIPTION:
-**  Initialize the fields of a PRNetAddr, assigning well known values as
-**  appropriate.
-**
-** INPUTS
-**  PRNetAddrValue val  The value to be assigned to the IP Address portion
-**                      of the network address. This can only specify the
-**                      special well known values that are equivalent to
-**                      INADDR_ANY and INADDR_LOOPBACK.
-**
-**  PRUint16 port       The port number to be assigned in the structure.
-**
-** OUTPUTS:
-**  PRNetAddr *addr     The address to be manipulated.
-**
-** RETURN:
-**  PRStatus            To indicate success or failure. If the latter, the
-**                      reason for the failure can be retrieved by calling
-**                      PR_GetError();
-***********************************************************************/
-typedef enum PRNetAddrValue
-{
-    PR_IpAddrNull,      /* do NOT overwrite the IP address */
-    PR_IpAddrAny,       /* assign logical INADDR_ANY to IP address */
-    PR_IpAddrLoopback,  /* assign logical INADDR_LOOPBACK  */
-    PR_IpAddrV4Mapped   /* IPv4 mapped address */
-} PRNetAddrValue;
-
-NSPR_API(PRStatus) PR_InitializeNetAddr(
-    PRNetAddrValue val, PRUint16 port, PRNetAddr *addr);
-
-/***********************************************************************
-** FUNCTION: PR_SetNetAddr(), 
-** DESCRIPTION:
-**  Set the fields of a PRNetAddr, assigning well known values as
-**  appropriate. This function is similar to PR_InitializeNetAddr
-**  but differs in that the address family is specified.
-**
-** INPUTS
-**  PRNetAddrValue val  The value to be assigned to the IP Address portion
-**                      of the network address. This can only specify the
-**                      special well known values that are equivalent to
-**                      INADDR_ANY and INADDR_LOOPBACK.
-**
-**  PRUint16 af         The address family (either PR_AF_INET or PR_AF_INET6)
-**
-**  PRUint16 port       The port number to be assigned in the structure.
-**
-** OUTPUTS:
-**  PRNetAddr *addr     The address to be manipulated.
-**
-** RETURN:
-**  PRStatus            To indicate success or failure. If the latter, the
-**                      reason for the failure can be retrieved by calling
-**                      PR_GetError();
-***********************************************************************/
-NSPR_API(PRStatus) PR_SetNetAddr(
-    PRNetAddrValue val, PRUint16 af, PRUint16 port, PRNetAddr *addr);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_IsNetAddrType()
-** Determine if the network address is of the specified type.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**  PRNetAddrValue          The type of network address 
-**
-** RETURN:
-**  PRBool                  PR_TRUE if the network address is of the
-**                          specified type, else PR_FALSE.
-***********************************************************************/
-NSPR_API(PRBool) PR_IsNetAddrType(const PRNetAddr *addr, PRNetAddrValue val);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_ConvertIPv4AddrToIPv6()
-** Convert an IPv4 addr to an (IPv4-mapped) IPv6 addr
-**
-** INPUTS:
-**  PRUint32 	v4addr		IPv4 address
-**
-** OUTPUTS:
-**  PRIPv6Addr *v6addr      The converted IPv6 address
-**
-** RETURN:
-**  void
-**                       
-***********************************************************************/
-NSPR_API(void) PR_ConvertIPv4AddrToIPv6(PRUint32 v4addr, PRIPv6Addr *v6addr);
-
-/***********************************************************************
-** MACRO:	
-** DESCRIPTION:	PR_NetAddrFamily()
-** Get the 'family' field of a PRNetAddr union.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**
-** RETURN:
-**  PRUint16                The 'family' field of 'addr'.
-***********************************************************************/
-#define PR_NetAddrFamily(addr) ((addr)->raw.family)
-
-/***********************************************************************
-** MACRO:	
-** DESCRIPTION:	PR_NetAddrInetPort()
-** Get the 'port' field of a PRNetAddr union.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**
-** RETURN:
-**  PRUint16                The 'port' field of 'addr'.
-***********************************************************************/
-#define PR_NetAddrInetPort(addr) \
-    ((addr)->raw.family == PR_AF_INET6 ? (addr)->ipv6.port : (addr)->inet.port)
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetProtoByName()
-** Lookup a protocol entry based on protocol's name
-**
-** INPUTS:
-**  char *protocolname  Character string of the protocol's name.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *PRProtoEnt
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-
-typedef struct PRProtoEnt {
-    char *p_name;       /* official protocol name */
-    char **p_aliases;   /* alias list */
-#if defined(WIN32) || defined(WIN16)
-    PRInt16 p_num;      /* protocol # */
-#else
-    PRInt32 p_num;      /* protocol # */
-#endif
-} PRProtoEnt;
-
-NSPR_API(PRStatus) PR_GetProtoByName(
-    const char* protocolname, char* buffer, PRInt32 bufsize, PRProtoEnt* result);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetProtoByNumber()
-** Lookup a protocol entry based on protocol's number
-**
-** INPUTS:
-**  PRInt32 protocolnumber
-**                      Number assigned to the protocol.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *PRProtoEnt
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetProtoByNumber(
-    PRInt32 protocolnumber, char* buffer, PRInt32 bufsize, PRProtoEnt* result);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_GetAddrInfoByName()
-**  Lookup a host by name. Equivalent to getaddrinfo(host, NULL, ...) of
-**  RFC 3493.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  PRUint16 af         May be PR_AF_UNSPEC or PR_AF_INET.
-**  PRIntn flags        May be either PR_AI_ADDRCONFIG or
-**                      PR_AI_ADDRCONFIG | PR_AI_NOCANONNAME. Include
-**                      PR_AI_NOCANONNAME to suppress the determination of
-**                      the canonical name corresponding to hostname.
-** RETURN:
-**  PRAddrInfo*         Handle to a data structure containing the results
-**                      of the host lookup. Use PR_EnumerateAddrInfo to
-**                      inspect the PRNetAddr values stored in this object.
-**                      When no longer needed, this handle must be destroyed
-**                      with a call to PR_FreeAddrInfo.  If a lookup error
-**                      occurs, then NULL will be returned.
-***********************************************************************/
-typedef struct PRAddrInfo PRAddrInfo;
-
-NSPR_API(PRAddrInfo*) PR_GetAddrInfoByName(
-    const char *hostname, PRUint16 af, PRIntn flags);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_FreeAddrInfo()
-**  Destroy the PRAddrInfo handle allocated by PR_GetAddrInfoByName().
-**
-** INPUTS:
-**  PRAddrInfo *addrInfo
-**                      The handle resulting from a successful call to
-**                      PR_GetAddrInfoByName().
-** RETURN:
-**  void
-***********************************************************************/
-NSPR_API(void) PR_FreeAddrInfo(PRAddrInfo *addrInfo);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_EnumerateAddrInfo()
-**  A stateless enumerator over a PRAddrInfo handle acquired from
-**  PR_GetAddrInfoByName() to inspect the possible network addresses.
-**
-** INPUTS:
-**  void *enumPtr       Index pointer of the enumeration. The enumeration
-**                      starts and ends with a value of NULL.
-**  PRAddrInfo *addrInfo
-**                      The PRAddrInfo handle returned by a successful
-**                      call to PR_GetAddrInfoByName().
-**  PRUint16 port       The port number to be assigned as part of the
-**                      PRNetAddr.
-** OUTPUTS:
-**  PRNetAddr *result   A pointer to an address structure that will be
-**                      filled in by the call to the enumeration if the
-**                      result of the call is greater than zero.
-** RETURN:
-**  void*               The value that should be used for the next call
-**                      of the enumerator ('enumPtr'). The enumeration
-**                      is ended if this value is returned NULL.
-***********************************************************************/
-NSPR_API(void *) PR_EnumerateAddrInfo(
-    void *enumPtr, const PRAddrInfo *addrInfo, PRUint16 port, PRNetAddr *result);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_GetCanonNameFromAddrInfo()
-**  Extracts the canonical name of the hostname passed to
-**  PR_GetAddrInfoByName().
-**
-** INPUTS:
-**  PRAddrInfo *addrInfo 
-**                      The PRAddrInfo handle returned by a successful
-**                      call to PR_GetAddrInfoByName().
-** RETURN:
-**  const char *        A const pointer to the canonical hostname stored
-**                      in the given PRAddrInfo handle. This pointer is
-**                      invalidated once the PRAddrInfo handle is destroyed
-**                      by a call to PR_FreeAddrInfo().
-***********************************************************************/
-NSPR_API(const char *) PR_GetCanonNameFromAddrInfo(
-    const PRAddrInfo *addrInfo);
-
-/***********************************************************************
-** FUNCTIONS: PR_ntohs, PR_ntohl, PR_ntohll, PR_htons, PR_htonl, PR_htonll
-**
-** DESCRIPTION: API entries for the common byte ordering routines.
-**
-**      PR_ntohs        16 bit conversion from network to host
-**      PR_ntohl        32 bit conversion from network to host
-**      PR_ntohll       64 bit conversion from network to host
-**      PR_htons        16 bit conversion from host to network
-**      PR_htonl        32 bit conversion from host to network
-**      PR_ntonll       64 bit conversion from host to network
-**
-***********************************************************************/
-NSPR_API(PRUint16) PR_ntohs(PRUint16);
-NSPR_API(PRUint32) PR_ntohl(PRUint32);
-NSPR_API(PRUint64) PR_ntohll(PRUint64);
-NSPR_API(PRUint16) PR_htons(PRUint16);
-NSPR_API(PRUint32) PR_htonl(PRUint32);
-NSPR_API(PRUint64) PR_htonll(PRUint64);
-
-PR_END_EXTERN_C
-
-#endif /* prnetdb_h___ */
diff --git a/libs/js/nsprpub/pr/include/prolock.h b/libs/js/nsprpub/pr/include/prolock.h
deleted file mode 100644
index d8aece986c..0000000000
--- a/libs/js/nsprpub/pr/include/prolock.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prolock_h___
-#define prolock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** A locking mechanism, built on the existing PRLock definiion,
-** is provided that will permit applications to define a Lock
-** Hierarchy (or Lock Ordering) schema. An application designed
-** using the Ordered Lock functions will terminate with a
-** diagnostic message when a lock inversion condition is
-** detected. 
-** 
-** The lock ordering detection is complile-time enabled only. in
-** optimized builds of NSPR, the Ordered Lock functions map
-** directly to PRLock functions, providing no lock order
-** detection.
-** 
-** The Ordered Lock Facility is compiled in when DEBUG is defined at
-** compile time. Ordered Lock can be forced on in optimized builds by
-** defining FORCE_NSPR_ORDERED_LOCK at compile time. Both the
-** application using Ordered Lock and NSPR must be compiled with the
-** facility enabled to achieve the desired results.
-** 
-** Application designers should use the macro interfaces to the Ordered
-** Lock facility to ensure that it is compiled out in optimized builds.
-**
-** Application designers are responsible for defining their own
-** lock hierarchy. 
-**
-** Ordered Lock is thread-safe and SMP safe.
-**
-** See Also: prlock.h
-**
-** /lth. 10-Jun-1998.
-**
-*/
-
-/*
-** Opaque type for ordered lock.
-** ... Don't even think of looking in here.
-**
-*/
-
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-typedef void * PROrderedLock;
-#else
-/*
-** Map PROrderedLock and methods onto PRLock when ordered locking
-** is not compiled in.
-**  
-*/
-#include "prlock.h"
-
-typedef PRLock PROrderedLock;
-#endif
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateOrderedLock() -- Create an Ordered Lock
-** 
-** DESCRIPTION: PR_CreateOrderedLock() creates an ordered lock.
-** 
-** INPUTS:
-**  order: user defined order of this lock.
-**  name: name of the lock. For debugging purposes.
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PR_OrderedLock pointer
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_CREATE_ORDERED_LOCK(order,name)\
-    PR_CreateOrderedLock((order),(name))
-#else
-#define PR_CREATE_ORDERED_LOCK(order) PR_NewLock()
-#endif
-
-NSPR_API(PROrderedLock *) 
-    PR_CreateOrderedLock( 
-        PRInt32 order,
-        const char *name
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyOrderedLock() -- Destroy an Ordered Lock
-** 
-** DESCRIPTION: PR_DestroyOrderedLock() destroys the ordered lock
-** referenced by lock.
-** 
-** INPUTS: lock: pointer to a PROrderedLock
-** 
-** OUTPUTS: the lock is destroyed
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyOrderedLock((lock))
-#else
-#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyLock((lock))
-#endif
-
-NSPR_API(void) 
-    PR_DestroyOrderedLock( 
-        PROrderedLock *lock 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_LockOrderedLock() -- Lock an ordered lock
-** 
-** DESCRIPTION: PR_LockOrderedLock() locks the ordered lock
-** referenced by lock. If the order of lock is less than or equal
-** to the order of the highest lock held by the locking thread,
-** the function asserts.
-** 
-** INPUTS: lock: a pointer to a PROrderedLock
-** 
-** OUTPUTS: The lock is held or the function asserts.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_LOCK_ORDERED_LOCK(lock) PR_LockOrderedLock((lock))
-#else
-#define PR_LOCK_ORDERED_LOCK(lock) PR_Lock((lock))
-#endif
-
-NSPR_API(void) 
-    PR_LockOrderedLock( 
-        PROrderedLock *lock 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_UnlockOrderedLock() -- unlock and Ordered Lock
-** 
-** DESCRIPTION: PR_UnlockOrderedLock() unlocks the lock referenced
-** by lock.
-** 
-** INPUTS: lock: a pointer to a PROrderedLock
-** 
-** OUTPUTS: the lock is unlocked
-** 
-** RETURNS:
-**  PR_SUCCESS
-**  PR_FAILURE
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_UNLOCK_ORDERED_LOCK(lock) PR_UnlockOrderedLock((lock))
-#else
-#define PR_UNLOCK_ORDERED_LOCK(lock) PR_Unlock((lock))
-#endif
-
-NSPR_API(PRStatus) 
-    PR_UnlockOrderedLock( 
-        PROrderedLock *lock 
-);
-
-PR_END_EXTERN_C
-
-#endif /* prolock_h___ */
diff --git a/libs/js/nsprpub/pr/include/prpdce.h b/libs/js/nsprpub/pr/include/prpdce.h
deleted file mode 100644
index ebd595ac52..0000000000
--- a/libs/js/nsprpub/pr/include/prpdce.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:		prpdce.h
- * Description:	This file is the API defined to allow for DCE (aka POSIX)
- *				thread emulation in an NSPR environment. It is not the
- *				intent that this be a fully supported API.
- */
-
-#if !defined(PRPDCE_H)
-#define PRPDCE_H
-
-#include "prlock.h"
-#include "prcvar.h"
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-#define _PR_NAKED_CV_LOCK (PRLock*)0xdce1dce1
-
-/*
-** Test and acquire a lock.
-**
-** If the lock is acquired by the calling thread, the
-** return value will be PR_SUCCESS. If the lock is
-** already held, by another thread or this thread, the
-** result will be PR_FAILURE.
-*/
-NSPR_API(PRStatus) PRP_TryLock(PRLock *lock);
-
-/*
-** Create a naked condition variable
-**
-** A "naked" condition variable is one that is not created bound
-** to a lock. The CV created with this function is the only type
-** that may be used in the subsequent "naked" condition variable
-** operations (see PRP_NakedWait, PRP_NakedNotify, PRP_NakedBroadcast);
-*/
-NSPR_API(PRCondVar*) PRP_NewNakedCondVar(void);
-
-/*
-** Destroy a naked condition variable
-**
-** Destroy the condition variable created by PR_NewNakedCondVar.
-*/
-NSPR_API(void) PRP_DestroyNakedCondVar(PRCondVar *cvar);
-
-/*
-** Wait on a condition
-**
-** Wait on the condition variable 'cvar'. It is asserted that
-** the lock protecting the condition 'lock' is held by the
-** calling thread. If more time expires than that declared in
-** 'timeout' the condition will be notified. Waits can be
-** interrupted by another thread.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedWait(
-	PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout);
-
-/*
-** Notify a thread waiting on a condition
-**
-** Notify the condition specified 'cvar'.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedNotify(PRCondVar *cvar);
-
-/*
-** Notify all threads waiting on a condition
-**
-** Notify the condition specified 'cvar'.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedBroadcast(PRCondVar *cvar);
-
-PR_END_EXTERN_C
-
-#endif /* PRPDCE_H */
diff --git a/libs/js/nsprpub/pr/include/prprf.h b/libs/js/nsprpub/pr/include/prprf.h
deleted file mode 100644
index 7336d97f2d..0000000000
--- a/libs/js/nsprpub/pr/include/prprf.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prprf_h___
-#define prprf_h___
-
-/*
-** API for PR printf like routines. Supports the following formats
-**	%d - decimal
-**	%u - unsigned decimal
-**	%x - unsigned hex
-**	%X - unsigned uppercase hex
-**	%o - unsigned octal
-**	%hd, %hu, %hx, %hX, %ho - 16-bit versions of above
-**	%ld, %lu, %lx, %lX, %lo - 32-bit versions of above
-**	%lld, %llu, %llx, %llX, %llo - 64 bit versions of above
-**	%s - string
-**	%c - character
-**	%p - pointer (deals with machine dependent pointer size)
-**	%f - float
-**	%g - float
-*/
-#include "prtypes.h"
-#include "prio.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-PR_BEGIN_EXTERN_C
-
-/*
-** sprintf into a fixed size buffer. Guarantees that a NUL is at the end
-** of the buffer. Returns the length of the written output, NOT including
-** the NUL, or (PRUint32)-1 if an error occurs.
-*/
-NSPR_API(PRUint32) PR_snprintf(char *out, PRUint32 outlen, const char *fmt, ...);
-
-/*
-** sprintf into a PR_MALLOC'd buffer. Return a pointer to the malloc'd
-** buffer on success, NULL on failure. Call "PR_smprintf_free" to release
-** the memory returned.
-*/
-NSPR_API(char*) PR_smprintf(const char *fmt, ...);
-
-/*
-** Free the memory allocated, for the caller, by PR_smprintf
-*/
-NSPR_API(void) PR_smprintf_free(char *mem);
-
-/*
-** "append" sprintf into a PR_MALLOC'd buffer. "last" is the last value of
-** the PR_MALLOC'd buffer. sprintf will append data to the end of last,
-** growing it as necessary using realloc. If last is NULL, PR_sprintf_append
-** will allocate the initial string. The return value is the new value of
-** last for subsequent calls, or NULL if there is a malloc failure.
-*/
-NSPR_API(char*) PR_sprintf_append(char *last, const char *fmt, ...);
-
-/*
-** sprintf into a function. The function "f" is called with a string to
-** place into the output. "arg" is an opaque pointer used by the stuff
-** function to hold any state needed to do the storage of the output
-** data. The return value is a count of the number of characters fed to
-** the stuff function, or (PRUint32)-1 if an error occurs.
-*/
-typedef PRIntn (*PRStuffFunc)(void *arg, const char *s, PRUint32 slen);
-
-NSPR_API(PRUint32) PR_sxprintf(PRStuffFunc f, void *arg, const char *fmt, ...);
-
-/*
-** fprintf to a PRFileDesc
-*/
-NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt, ...);
-
-/*
-** va_list forms of the above.
-*/
-NSPR_API(PRUint32) PR_vsnprintf(char *out, PRUint32 outlen, const char *fmt, va_list ap);
-NSPR_API(char*) PR_vsmprintf(const char *fmt, va_list ap);
-NSPR_API(char*) PR_vsprintf_append(char *last, const char *fmt, va_list ap);
-NSPR_API(PRUint32) PR_vsxprintf(PRStuffFunc f, void *arg, const char *fmt, va_list ap);
-NSPR_API(PRUint32) PR_vfprintf(struct PRFileDesc* fd, const char *fmt, va_list ap);
-
-/*
-***************************************************************************
-** FUNCTION: PR_sscanf
-** DESCRIPTION:
-**     PR_sscanf() scans the input character string, performs data
-**     conversions, and stores the converted values in the data objects
-**     pointed to by its arguments according to the format control
-**     string.
-**
-**     PR_sscanf() behaves the same way as the sscanf() function in the
-**     Standard C Library (stdio.h), with the following exceptions:
-**     - PR_sscanf() handles the NSPR integer and floating point types,
-**       such as PRInt16, PRInt32, PRInt64, and PRFloat64, whereas
-**       sscanf() handles the standard C types like short, int, long,
-**       and double.
-**     - PR_sscanf() has no multibyte character support, while sscanf()
-**       does.
-** INPUTS:
-**     const char *buf
-**         a character string holding the input to scan
-**     const char *fmt
-**         the format control string for the conversions
-**     ...
-**         variable number of arguments, each of them is a pointer to
-**         a data object in which the converted value will be stored
-** OUTPUTS: none
-** RETURNS: PRInt32
-**     The number of values converted and stored.
-** RESTRICTIONS:
-**    Multibyte characters in 'buf' or 'fmt' are not allowed.
-***************************************************************************
-*/
-
-NSPR_API(PRInt32) PR_sscanf(const char *buf, const char *fmt, ...);
-
-PR_END_EXTERN_C
-
-#endif /* prprf_h___ */
diff --git a/libs/js/nsprpub/pr/include/prproces.h b/libs/js/nsprpub/pr/include/prproces.h
deleted file mode 100644
index 0c1e8a65fd..0000000000
--- a/libs/js/nsprpub/pr/include/prproces.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prproces_h___
-#define prproces_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/*****************************PROCESS OPERATIONS*************************/
-/************************************************************************/
-
-typedef struct PRProcess PRProcess;
-typedef struct PRProcessAttr PRProcessAttr;
-
-NSPR_API(PRProcessAttr *) PR_NewProcessAttr(void);
-
-NSPR_API(void) PR_ResetProcessAttr(PRProcessAttr *attr);
-
-NSPR_API(void) PR_DestroyProcessAttr(PRProcessAttr *attr);
-
-NSPR_API(void) PR_ProcessAttrSetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd
-);
-
-/*
- * OBSOLETE -- use PR_ProcessAttrSetStdioRedirect instead.
- */
-NSPR_API(void) PR_SetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd
-);
-
-NSPR_API(PRStatus) PR_ProcessAttrSetCurrentDirectory(
-    PRProcessAttr *attr,
-    const char *dir
-);
-
-NSPR_API(PRStatus) PR_ProcessAttrSetInheritableFD(
-    PRProcessAttr *attr,
-    PRFileDesc *fd,
-    const char *name
-);
-
-/*
-** Create a new process
-**
-** Create a new process executing the file specified as 'path' and with
-** the supplied arguments and environment.
-**
-** This function may fail because of illegal access (permissions),
-** invalid arguments or insufficient resources.
-**
-** A process may be created such that the creator can later synchronize its
-** termination using PR_WaitProcess(). 
-*/
-
-NSPR_API(PRProcess*) PR_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-
-NSPR_API(PRStatus) PR_CreateProcessDetached(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-
-NSPR_API(PRStatus) PR_DetachProcess(PRProcess *process);
-
-NSPR_API(PRStatus) PR_WaitProcess(PRProcess *process, PRInt32 *exitCode);
-
-NSPR_API(PRStatus) PR_KillProcess(PRProcess *process);
-
-PR_END_EXTERN_C
-
-#endif /* prproces_h___ */
diff --git a/libs/js/nsprpub/pr/include/prrng.h b/libs/js/nsprpub/pr/include/prrng.h
deleted file mode 100644
index e94b806b8c..0000000000
--- a/libs/js/nsprpub/pr/include/prrng.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
-** prrng.h -- NSPR Random Number Generator
-** 
-**
-** lth. 29-Oct-1999.
-*/
-
-#ifndef prrng_h___ 
-#define prrng_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_GetRandomNoise() -- Get random noise from the host platform
-**
-** Description:
-** PR_GetRandomNoise() provides, depending on platform, a random value.
-** The length of the random value is dependent on platform and the
-** platform's ability to provide a random value at that moment.
-**
-** The intent of PR_GetRandomNoise() is to provide a "seed" value for a
-** another random number generator that may be suitable for
-** cryptographic operations. This implies that the random value
-** provided may not be, by itself, cryptographically secure. The value
-** generated by PR_GetRandomNoise() is at best, extremely difficult to
-** predict and is as non-deterministic as the underlying platfrom can
-** provide.
-**
-** Inputs:
-**   buf -- pointer to a caller supplied buffer to contain the
-**          generated random number. buf must be at least as large as
-**          is specified in the 'size' argument.
-**
-**   size -- the requested size of the generated random number
-**
-** Outputs:
-**   a random number provided in 'buf'.
-**
-** Returns:
-**   PRSize value equal to the size of the random number actually
-**   generated, or zero. The generated size may be less than the size
-**   requested. A return value of zero means that PR_GetRandomNoise() is
-**   not implemented on this platform, or there is no available noise
-**   available to be returned at the time of the call.
-**
-** Restrictions:
-**   Calls to PR_GetRandomNoise() may use a lot of CPU on some platforms.
-**   Some platforms may block for up to a few seconds while they
-**   accumulate some noise. Busy machines generate lots of noise, but
-**   care is advised when using PR_GetRandomNoise() frequently in your
-**   application.
-**
-** History:
-**   Parts of the model dependent implementation for PR_GetRandomNoise()
-**   were taken in whole or part from code previously in Netscape's NSS
-**   component.
-**
-*/
-NSPR_API(PRSize) PR_GetRandomNoise( 
-    void    *buf,
-    PRSize  size
-);
-
-PR_END_EXTERN_C
-
-#endif /* prrng_h___ */
-/* end prrng.h */
diff --git a/libs/js/nsprpub/pr/include/prrwlock.h b/libs/js/nsprpub/pr/include/prrwlock.h
deleted file mode 100644
index 945e5f88d2..0000000000
--- a/libs/js/nsprpub/pr/include/prrwlock.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:		prrwlock.h
-** Description:	API to basic reader-writer lock functions of NSPR.
-**
-**/
-
-#ifndef prrwlock_h___
-#define prrwlock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PRRWLock --
- *
- *	The reader writer lock, PRRWLock, is an opaque object to the clients
- *	of NSPR.  All routines operate on a pointer to this opaque entity.
- */
-
-
-typedef struct PRRWLock PRRWLock;
-
-#define	PR_RWLOCK_RANK_NONE	0
-
-
-/***********************************************************************
-** FUNCTION:    PR_NewRWLock
-** DESCRIPTION:
-**  Returns a pointer to a newly created reader-writer lock object.
-** INPUTS:      Lock rank
-**				Lock name
-** OUTPUTS:     void
-** RETURN:      PRRWLock*
-**   If the lock cannot be created because of resource constraints, NULL
-**   is returned.
-**  
-***********************************************************************/
-NSPR_API(PRRWLock*) PR_NewRWLock(PRUint32 lock_rank, const char *lock_name);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyRWLock
-** DESCRIPTION:
-**  Destroys a given RW lock object.
-** INPUTS:      PRRWLock *lock - Lock to be freed.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_DestroyRWLock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Rlock
-** DESCRIPTION:
-**  Apply a read lock (non-exclusive) on a RWLock
-** INPUTS:      PRRWLock *lock - Lock to be read-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Rlock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Wlock
-** DESCRIPTION:
-**  Apply a write lock (exclusive) on a RWLock
-** INPUTS:      PRRWLock *lock - Lock to write-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Wlock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Unlock
-** DESCRIPTION:
-**  Release a RW lock. Unlocking an unlocked lock has undefined results.
-** INPUTS:      PRRWLock *lock - Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      void
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Unlock(PRRWLock *lock);
-
-PR_END_EXTERN_C
-
-#endif /* prrwlock_h___ */
diff --git a/libs/js/nsprpub/pr/include/prshm.h b/libs/js/nsprpub/pr/include/prshm.h
deleted file mode 100644
index 098566ec7f..0000000000
--- a/libs/js/nsprpub/pr/include/prshm.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prshm.h -- NSPR Shared Memory
-**
-** NSPR Named Shared Memory API provides a cross-platform named
-** shared-memory interface. NSPR Named Shared Memory is modeled on
-** similar constructs in Unix and Windows operating systems. Shared
-** memory allows multiple processes to access one or more common shared
-** memory regions, using it as an inter-process communication channel.
-**
-** Notes on Platform Independence:
-**   NSPR Named Shared Memory is built on the native services offered
-**   by most platforms. The NSPR Named Shared Memory API tries to
-**   provide a least common denominator interface so that it works
-**   across all supported platforms. To ensure that it works everywhere,
-**   some platform considerations must be accomodated and the protocol
-**   for using NSPR Shared Memory API must be observed.
-**
-** Protocol:
-**   Multiple shared memories can be created using NSPR's Shared Memory
-**   feature. For each named shared memory, as defined by the name
-**   given in the PR_OpenSharedMemory() call, a protocol for using the
-**   shared memory API is required to ensure desired behavior. Failing
-**   to follow the protocol may yield unpredictable results.
-**   
-**   PR_OpenSharedMemory() will create the shared memory segment, if it
-**   does not already exist, or open a connection that the existing
-**   shared memory segment if it already exists.
-**   
-**   PR_AttachSharedMemory() should be called following
-**   PR_OpenSharedMemory() to map the memory segment to an address in
-**   the application's address space.
-**   
-**   PR_AttachSharedMemory() may be called to re-map a shared memory
-**   segment after detaching the same PRSharedMemory object. Be
-**   sure to detach it when done.
-**   
-**   PR_DetachSharedMemory() should be called to un-map the shared
-**   memory segment from the application's address space.
-**   
-**   PR_CloseSharedMemory() should be called when no further use of the
-**   PRSharedMemory object is required within a process. Following a
-**   call to  PR_CloseSharedMemory() the PRSharedMemory object is
-**   invalid and cannot be reused.
-**   
-**   PR_DeleteSharedMemory() should be called before process
-**   termination. After calling PR_DeleteSharedMemory() any further use
-**   of the shared memory associated with the name may cause
-**   unpredictable results.
-**   
-** Files:
-**   The name passed to PR_OpenSharedMemory() should be a valid filename
-**   for a unix platform. PR_OpenSharedMemory() creates file using the
-**   name passed in. Some platforms may mangle the name before creating
-**   the file and the shared memory.
-**   
-**   The unix implementation may use SysV IPC shared memory, Posix
-**   shared memory, or memory mapped files; the filename may used to
-**   define the namespace. On Windows, the name is significant, but
-**   there is no file associated with name.
-**   
-**   No assumptions about the persistence of data in the named file
-**   should be made. Depending on platform, the shared memory may be
-**   mapped onto system paging space and be discarded at process
-**   termination.
-**   
-**   All names provided to PR_OpenSharedMemory() should be valid
-**   filename syntax or name syntax for shared memory for the target
-**   platform. Referenced directories should have permissions 
-**   appropriate for writing.
-**
-** Limits:
-**   Different platforms have limits on both the number and size of
-**   shared memory resources. The default system limits on some
-**   platforms may be smaller than your requirements. These limits may
-**   be adjusted on some platforms either via boot-time options or by
-**   setting the size of the system paging space to accomodate more
-**   and/or larger shared memory segment(s).
-**
-** Security:
-**   On unix platforms, depending on implementation, contents of the
-**   backing store for the shared memory can be exposed via the file
-**   system. Set permissions and or access controls at create and attach
-**   time to ensure you get the desired security.
-**
-**   On windows platforms, no special security measures are provided.
-**
-** Example:
-**   The test case pr/tests/nameshm1.c provides an example of use as
-**   well as testing the operation of NSPR's Named Shared Memory.
-**
-** lth. 18-Aug-1999.
-*/
-
-#ifndef prshm_h___
-#define prshm_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Declare opaque type PRSharedMemory.
-*/
-typedef struct PRSharedMemory PRSharedMemory;
-
-/*
-** FUNCTION: PR_OpenSharedMemory()
-**
-** DESCRIPTION:
-**   PR_OpenSharedMemory() creates a new shared-memory segment or
-**   associates a previously created memory segment with name.
-**
-**   When parameter create is (PR_SHM_EXCL | PR_SHM_CREATE) and the
-**   shared memory already exists, the function returns NULL with the
-**   error set to PR_FILE_EXISTS_ERROR.
-**
-**   When parameter create is PR_SHM_CREATE and the shared memory
-**   already exists, a handle to that memory segment is returned. If
-**   the segment does not exist, it is created and a pointer to the
-**   related PRSharedMemory structure is returned.
-**
-**   When parameter create is 0, and the shared memory exists, a
-**   pointer to a PRSharedMemory is returned. If the shared memory does
-**   not exist, NULL is returned with the error set to
-**   PR_FILE_NOT_FOUND_ERROR.
-**
-** INPUTS:
-**   name -- the name the shared-memory segment is known as.
-**   size -- the size of the shared memory segment. 
-**   flags -- Options for creating the shared memory
-**   mode -- Same as is passed to PR_Open()
-**
-** OUTPUTS: 
-**   The shared memory is allocated.
-**
-** RETURNS: Pointer to opaque structure PRSharedMemory or NULL.
-**   NULL is returned on error. The reason for the error can be
-**   retrieved via PR_GetError() and PR_GetOSError();
-**
-*/
-NSPR_API( PRSharedMemory * )
-    PR_OpenSharedMemory(
-        const char *name,
-        PRSize      size,
-        PRIntn      flags,
-        PRIntn      mode
-);
-/* Define values for PR_OpenShareMemory(...,create) */
-#define PR_SHM_CREATE 0x1  /* create if not exist */
-#define PR_SHM_EXCL   0x2  /* fail if already exists */
-
-/*
-** FUNCTION: PR_AttachSharedMemory()
-**
-** DESCRIPTION:
-** PR_AttachSharedMemory() maps the shared-memory described by
-** shm to the current process. 
-**
-** INPUTS: 
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**   flags -- options for mapping the shared memory.
-**   PR_SHM_READONLY causes the memory to be attached 
-**   read-only.
-**
-** OUTPUTS:
-**   On success, the shared memory segment represented by shm is mapped
-**   into the process' address space.
-**
-** RETURNS: Address where shared memory is mapped, or NULL.
-**   NULL is returned on error. The reason for the error can be
-**   retrieved via PR_GetError() and PR_GetOSError();
-**
-**
-*/
-NSPR_API( void * )
-    PR_AttachSharedMemory(
-        PRSharedMemory *shm,
-        PRIntn  flags
-);
-/* Define values for PR_AttachSharedMemory(...,flags) */ 
-#define PR_SHM_READONLY 0x01
-
-/*
-** FUNCTION: PR_DetachSharedMemory()
-**
-** DESCRIPTION:
-**   PR_DetachSharedMemory() detaches the shared-memory described
-**   by shm. 
-**
-** INPUTS: 
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**   addr -- The address at which the memory was attached.
-**
-** OUTPUTS:
-**   The shared memory mapped to an address via a previous call to
-**   PR_AttachSharedMemory() is unmapped.
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_DetachSharedMemory(
-        PRSharedMemory *shm,
-        void  *addr
-);
-
-/*
-** FUNCTION: PR_CloseSharedMemory()
-**
-** DESCRIPTION:
-**   PR_CloseSharedMemory() closes the shared-memory described by
-**   shm.
-** 
-** INPUTS:
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**
-** OUTPUTS:
-**   the shared memory represented by shm is closed
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_CloseSharedMemory(
-        PRSharedMemory *shm
-);
-
-/*
-** FUNCTION: PR_DeleteSharedMemory()
-**
-** DESCRIPTION:
-**   The shared memory resource represented by name is released.
-**
-** INPUTS:
-**   name -- the name the shared-memory segment
-**
-** OUTPUTS:
-**   depending on platform, resources may be returned to the underlying
-**   operating system.
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_DeleteSharedMemory( 
-        const char *name
-);
-
-PR_END_EXTERN_C
-
-#endif /* prshm_h___ */
diff --git a/libs/js/nsprpub/pr/include/prshma.h b/libs/js/nsprpub/pr/include/prshma.h
deleted file mode 100644
index e72ee85fa4..0000000000
--- a/libs/js/nsprpub/pr/include/prshma.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prshma.h -- NSPR Anonymous Shared Memory
-**
-** NSPR provides an anonymous shared memory based on NSPR's PRFileMap
-** type. The anonymous file-mapped shared memory provides an inheritable
-** shared memory, as in: the child process inherits the shared memory.
-** Compare the file-mapped anonymous shared memory to to a named shared
-** memory described in prshm.h. The intent is to provide a shared
-** memory that is accessable only by parent and child processes. ...
-** It's a security thing.
-** 
-** Depending on the underlying platform, the file-mapped shared memory
-** may be backed by a file. ... surprise! ... On some platforms, no
-** real file backs the shared memory. On platforms where the shared
-** memory is backed by a file, the file's name in the filesystem is
-** visible to other processes for only the duration of the creation of
-** the file, hopefully a very short time. This restricts processess
-** that do not inherit the shared memory from opening the file and
-** reading or writing its contents. Further, when all processes
-** using an anonymous shared memory terminate, the backing file is
-** deleted. ... If you are not paranoid, you're not paying attention.
-** 
-** The file-mapped shared memory requires a protocol for the parent
-** process and child process to share the memory. NSPR provides two
-** protocols. Use one or the other; don't mix and match.
-** 
-** In the first protocol, the job of passing the inheritable shared
-** memory is done via helper-functions with PR_CreateProcess(). In the
-** second protocol, the parent process is responsible for creating the
-** child process; the parent and child are mutually responsible for
-** passing a FileMap string. NSPR provides helper functions for
-** extracting data from the PRFileMap object. ... See the examples
-** below.
-** 
-** Both sides should adhere strictly to the protocol for proper
-** operation. The pseudo-code below shows the use of a file-mapped
-** shared memory by a parent and child processes. In the examples, the
-** server creates the file-mapped shared memory, the client attaches to
-** it.
-**
-** First protocol.
-** Server:
-**
-**   fm = PR_OpenAnonFileMap(dirName, size, FilemapProt); 
-**   addr = PR_MemMap(fm); 
-**   attr = PR_NewProcessAttr();
-**   PR_ProcessAttrSetInheritableFileMap( attr, fm, shmname );
-**   PR_CreateProcess(Client); 
-**   PR_DestroyProcessAttr(attr);
-**   ... yadda ...
-**   PR_MemUnmap( addr );
-**   PR_CloseFileMap(fm);
-**
-**
-** Client: 
-**   ... started by server via PR_CreateProcess()
-**   fm = PR_GetInheritedFileMap( shmname );
-**   addr = PR_MemMap(fm);
-**   ... yadda ...
-**   PR_MemUnmap(addr);
-**   PR_CloseFileMap(fm);
-**
-**
-** Second Protocol:
-** Server:
-**
-**   fm = PR_OpenAnonFileMap(dirName, size, FilemapProt); 
-**   fmstring = PR_ExportFileMapAsString( fm );
-**   addr = PR_MemMap(fm); 
-**    ... application specific technique to pass fmstring to child
-**    ... yadda ... Server uses his own magic to create child
-**   PR_MemUnmap( addr );
-**   PR_CloseFileMap(fm);
-**
-**
-** Client: 
-**   ... started by server via his own magic
-**   ... application specific technique to find fmstring from parent
-**   fm = PR_ImportFileMapFromString( fmstring )
-**   addr = PR_MemMap(fm);
-**   ... yadda ...
-**   PR_MemUnmap(addr);
-**   PR_CloseFileMap(fm);
-**
-**
-** lth. 2-Jul-1999.
-**
-** Note: The second protocol was requested by NelsonB (7/1999); this is
-** to accomodate servers which already create their own child processes
-** using platform native methods.
-** 
-*/
-
-#ifndef prshma_h___
-#define prshma_h___
-
-#include "prtypes.h"
-#include "prio.h"
-#include "prproces.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_OpenAnonFileMap() -- Creates an anonymous file-mapped shared memory
-**
-** Description:
-** PR_OpenAnonFileMap() creates an anonymous shared memory. If the
-** shared memory already exists, a handle is returned to that shared
-** memory object.
-**
-** On Unix platforms, PR_OpenAnonFileMap() uses 'dirName' as a
-** directory name, without the trailing '/', to contain the anonymous
-** file. A filename is generated for the name.
-**
-** On Windows platforms, dirName is ignored.
-**
-** Inputs:
-**   dirName -- A directory name to contain the anonymous file.
-**   size -- The size of the shared memory
-**   prot -- How the shared memory is mapped. See prio.h
-**   
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   Pointer to PRFileMap or NULL on error.
-**
-*/
-NSPR_API( PRFileMap *)
-PR_OpenAnonFileMap(
-    const char *dirName,
-    PRSize      size, 
-    PRFileMapProtect prot
-);  
-
-/*
-** PR_ProcessAttrSetInheritableFileMap() -- Prepare FileMap for export  
-**   to my children processes via PR_CreateProcess()
-**
-** Description:
-** PR_ProcessAttrSetInheritableFileMap() connects the PRFileMap to
-** PRProcessAttr with shmname. A subsequent call to PR_CreateProcess()
-** makes the PRFileMap importable by the child process.
-**
-** Inputs:
-**   attr -- PRProcessAttr, used to pass data to PR_CreateProcess()
-**   fm -- PRFileMap structure to be passed to the child process
-**   shmname -- The name for the PRFileMap; used by child.
-**
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   PRStatus
-**
-*/
-NSPR_API(PRStatus) 
-PR_ProcessAttrSetInheritableFileMap( 
-    PRProcessAttr   *attr,
-    PRFileMap       *fm, 
-    const char      *shmname
-);
-
-/*
-** PR_GetInheritedFileMap() -- Import a PRFileMap previously exported
-**   by my parent process via PR_CreateProcess()
-**
-** Description:
-** PR_GetInheritedFileMap() retrieves a PRFileMap object exported from
-** its parent process via PR_CreateProcess().
-**
-** Inputs:
-**    shmname -- The name provided to PR_ProcessAttrSetInheritableFileMap()
-** 
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   PRFileMap pointer or NULL.
-**
-*/
-NSPR_API( PRFileMap *)
-PR_GetInheritedFileMap( 
-    const char *shmname 
-);
-
-/*
-** PR_ExportFileMapAsString() -- Creates a string identifying a PRFileMap
-**
-** Description:
-** Creates an identifier, as a string, from a PRFileMap object
-** previously created with PR_OpenAnonFileMap().
-**
-** Inputs:
-**   fm -- PRFileMap pointer to be represented as a string.
-**   bufsize -- sizeof(buf)
-**   buf -- a buffer of length PR_FILEMAP_STRING_BUFSIZE
-**
-** Outputs:
-**   buf contains the stringized PRFileMap identifier
-**
-** Returns:
-**   PRStatus
-**
-*/
-NSPR_API( PRStatus )
-PR_ExportFileMapAsString( 
-    PRFileMap *fm,
-    PRSize    bufsize,
-    char      *buf
-);
-#define PR_FILEMAP_STRING_BUFSIZE 128
-
-/*
-** PR_ImportFileMapFromString() -- Creates a PRFileMap from the identifying string
-**
-** Description:
-** PR_ImportFileMapFromString() creates a PRFileMap object from a
-** string previously created by PR_ExportFileMapAsString().
-**
-** Inputs:
-**   fmstring -- string created by PR_ExportFileMapAsString()
-**
-** Returns:
-**   PRFileMap pointer or NULL.
-**
-*/
-NSPR_API( PRFileMap * )
-PR_ImportFileMapFromString( 
-    const char *fmstring
-);
-
-PR_END_EXTERN_C
-#endif /* prshma_h___ */
diff --git a/libs/js/nsprpub/pr/include/prsystem.h b/libs/js/nsprpub/pr/include/prsystem.h
deleted file mode 100644
index 13cf8babdd..0000000000
--- a/libs/js/nsprpub/pr/include/prsystem.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prsystem_h___
-#define prsystem_h___
-
-/*
-** API to NSPR functions returning system info.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Get the host' directory separator.
-**  Pathnames are then assumed to be of the form:
-**      [<sep><root_component><sep>]*(<component><sep>)<leaf_name>
-*/
-
-NSPR_API(char) PR_GetDirectorySeparator(void);
-
-/*
-** OBSOLETE -- the function name is misspelled.
-** Use PR_GetDirectorySeparator instead.
-*/
-
-NSPR_API(char) PR_GetDirectorySepartor(void);
-
-/*
-** Get the host' path separator.
-**  Paths are assumed to be of the form:
-**      <directory>[<sep><directory>]*
-*/
-
-NSPR_API(char) PR_GetPathSeparator(void);
-
-/* Types of information available via PR_GetSystemInfo(...) */
-typedef enum {
-    PR_SI_HOSTNAME,  /* the hostname with the domain name (if any)
-                      * removed */
-    PR_SI_SYSNAME,
-    PR_SI_RELEASE,
-    PR_SI_ARCHITECTURE,
-    PR_SI_HOSTNAME_UNTRUNCATED  /* the hostname exactly as configured
-                                 * on the system */
-} PRSysInfo;
-
-
-/*
-** If successful returns a null termintated string in 'buf' for
-** the information indicated in 'cmd'. If unseccussful the reason for
-** the failure can be retrieved from PR_GetError().
-**
-** The buffer is allocated by the caller and should be at least
-** SYS_INFO_BUFFER_LENGTH bytes in length.
-*/
-
-#define SYS_INFO_BUFFER_LENGTH 256
-
-NSPR_API(PRStatus) PR_GetSystemInfo(PRSysInfo cmd, char *buf, PRUint32 buflen);
-
-/*
-** Return the number of bytes in a page
-*/
-NSPR_API(PRInt32) PR_GetPageSize(void);
-
-/*
-** Return log2 of the size of a page
-*/
-NSPR_API(PRInt32) PR_GetPageShift(void);
-
-/*
-** PR_GetNumberOfProcessors() -- returns the number of CPUs
-**
-** Description:
-** PR_GetNumberOfProcessors() extracts the number of processors
-** (CPUs available in an SMP system) and returns the number.
-** 
-** Parameters:
-**   none
-**
-** Returns:
-**   The number of available processors or -1 on error
-** 
-*/
-NSPR_API(PRInt32) PR_GetNumberOfProcessors( void );
-
-/*
-** PR_GetPhysicalMemorySize() -- returns the amount of system RAM
-**
-** Description:
-** PR_GetPhysicalMemorySize() determines the amount of physical RAM
-** in the system and returns the size in bytes.
-**
-** Parameters:
-**   none
-**
-** Returns:
-**   The amount of system RAM, or 0 on failure.
-**
-*/
-NSPR_API(PRUint64) PR_GetPhysicalMemorySize(void);
-
-PR_END_EXTERN_C
-
-#endif /* prsystem_h___ */
diff --git a/libs/js/nsprpub/pr/include/prthread.h b/libs/js/nsprpub/pr/include/prthread.h
deleted file mode 100644
index dba1c9b859..0000000000
--- a/libs/js/nsprpub/pr/include/prthread.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prthread_h___
-#define prthread_h___
-
-/*
-** API for NSPR threads. On some architectures (MAC and WIN16
-** notably) pre-emptibility is not guaranteed. Hard priority scheduling
-** is not guaranteed, so programming using priority based synchronization
-** is a no-no.
-**
-** NSPR threads are scheduled based loosely on their client set priority.
-** In general, a thread of a higher priority has a statistically better
-** chance of running relative to threads of lower priority. However,
-** NSPR uses multiple strategies to provide execution vehicles for thread
-** abstraction of various host platforms. As it turns out, there is little
-** NSPR can do to affect the scheduling attributes of "GLOBAL" threads.
-** However, a semblance of GLOBAL threads is used to implement "LOCAL"
-** threads. An arbitrary number of such LOCAL threads can be assigned to
-** a single GLOBAL thread.
-**
-** For scheduling, NSPR will attempt to run the highest priority LOCAL
-** thread associated with a given GLOBAL thread. It is further assumed
-** that the host OS will apply some form of "fair" scheduling on the
-** GLOBAL threads.
-**
-** Threads have a "system flag" which when set indicates the thread
-** doesn't count for determining when the process should exit (the
-** process exits when the last user thread exits).
-**
-** Threads also have a "scope flag" which controls whether the threads
-** are scheduled in the local scope or scheduled by the OS globally. This 
-** indicates whether a thread is permanently bound to a native OS thread. 
-** An unbound thread competes for scheduling resources in the same process.
-**
-** Another flag is "state flag" which control whether the thread is joinable.
-** It allows other threads to wait for the created thread to reach completion.
-**
-** Threads can have "per-thread-data" attached to them. Each thread has a
-** per-thread error number and error string which are updated when NSPR
-** operations fail.
-*/
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRThread PRThread;
-typedef struct PRThreadStack PRThreadStack;
-
-typedef enum PRThreadType {
-    PR_USER_THREAD,
-    PR_SYSTEM_THREAD
-} PRThreadType;
-
-typedef enum PRThreadScope {
-    PR_LOCAL_THREAD,
-    PR_GLOBAL_THREAD,
-    PR_GLOBAL_BOUND_THREAD
-} PRThreadScope;
-
-typedef enum PRThreadState {
-    PR_JOINABLE_THREAD,
-    PR_UNJOINABLE_THREAD
-} PRThreadState;
-
-typedef enum PRThreadPriority
-{
-    PR_PRIORITY_FIRST = 0,      /* just a placeholder */
-    PR_PRIORITY_LOW = 0,        /* the lowest possible priority */
-    PR_PRIORITY_NORMAL = 1,     /* most common expected priority */
-    PR_PRIORITY_HIGH = 2,       /* slightly more aggressive scheduling */
-    PR_PRIORITY_URGENT = 3,     /* it does little good to have more than one */
-    PR_PRIORITY_LAST = 3        /* this is just a placeholder */
-} PRThreadPriority;
-
-/*
-** Create a new thread:
-**     "type" is the type of thread to create
-**     "start(arg)" will be invoked as the threads "main"
-**     "priority" will be created thread's priority
-**     "scope" will specify whether the thread is local or global
-**     "state" will specify whether the thread is joinable or not
-**     "stackSize" the size of the stack, in bytes. The value can be zero
-**        and then a machine specific stack size will be chosen.
-**
-** This can return NULL if some kind of error occurs, such as if memory is
-** tight.
-**
-** If you want the thread to start up waiting for the creator to do
-** something, enter a lock before creating the thread and then have the
-** threads start routine enter and exit the same lock. When you are ready
-** for the thread to run, exit the lock.
-**
-** If you want to detect the completion of the created thread, the thread
-** should be created joinable.  Then, use PR_JoinThread to synchrnoize the
-** termination of another thread.
-**
-** When the start function returns the thread exits. If it is the last
-** PR_USER_THREAD to exit then the process exits.
-*/
-NSPR_API(PRThread*) PR_CreateThread(PRThreadType type,
-                     void (PR_CALLBACK *start)(void *arg),
-                     void *arg,
-                     PRThreadPriority priority,
-                     PRThreadScope scope,
-                     PRThreadState state,
-                     PRUint32 stackSize);
-
-/*
-** Wait for thread termination:
-**     "thread" is the target thread 
-**
-** This can return PR_FAILURE if no joinable thread could be found 
-** corresponding to the specified target thread.
-**
-** The calling thread is blocked until the target thread completes.
-** Several threads cannot wait for the same thread to complete; one thread
-** will operate successfully and others will terminate with an error PR_FAILURE.
-** The calling thread will not be blocked if the target thread has already
-** terminated.
-*/
-NSPR_API(PRStatus) PR_JoinThread(PRThread *thread);
-
-/*
-** Return the current thread object for the currently running code.
-** Never returns NULL.
-*/
-NSPR_API(PRThread*) PR_GetCurrentThread(void);
-#ifndef NO_NSPR_10_SUPPORT
-#define PR_CurrentThread() PR_GetCurrentThread() /* for nspr1.0 compat. */
-#endif /* NO_NSPR_10_SUPPORT */
-
-/*
-** Get the priority of "thread".
-*/
-NSPR_API(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread);
-
-/*
-** Change the priority of the "thread" to "priority".
-*/
-NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority);
-
-/*
-** This routine returns a new index for per-thread-private data table. 
-** The index is visible to all threads within a process. This index can 
-** be used with the PR_SetThreadPrivate() and PR_GetThreadPrivate() routines 
-** to save and retrieve data associated with the index for a thread.
-**
-** Each index is associationed with a destructor function ('dtor'). The function
-** may be specified as NULL when the index is created. If it is not NULL, the
-** function will be called when:
-**      - the thread exits and the private data for the associated index
-**        is not NULL,
-**      - new thread private data is set and the current private data is
-**        not NULL.
-**
-** The index independently maintains specific values for each binding thread. 
-** A thread can only get access to its own thread-specific-data.
-**
-** Upon a new index return the value associated with the index for all threads
-** is NULL, and upon thread creation the value associated with all indices for 
-** that thread is NULL. 
-**
-** Returns PR_FAILURE if the total number of indices will exceed the maximun 
-** allowed.
-*/
-typedef void (PR_CALLBACK *PRThreadPrivateDTOR)(void *priv);
-
-NSPR_API(PRStatus) PR_NewThreadPrivateIndex(
-    PRUintn *newIndex, PRThreadPrivateDTOR destructor);
-
-/*
-** Define some per-thread-private data.
-**     "tpdIndex" is an index into the per-thread private data table
-**     "priv" is the per-thread-private data 
-**
-** If the per-thread private data table has a previously registered
-** destructor function and a non-NULL per-thread-private data value,
-** the destructor function is invoked.
-**
-** This can return PR_FAILURE if the index is invalid.
-*/
-NSPR_API(PRStatus) PR_SetThreadPrivate(PRUintn tpdIndex, void *priv);
-
-/*
-** Recover the per-thread-private data for the current thread. "tpdIndex" is
-** the index into the per-thread private data table. 
-**
-** The returned value may be NULL which is indistinguishable from an error 
-** condition.
-**
-** A thread can only get access to its own thread-specific-data.
-*/
-NSPR_API(void*) PR_GetThreadPrivate(PRUintn tpdIndex);
-
-/*
-** This routine sets the interrupt request for a target thread. The interrupt
-** request remains in the thread's state until it is delivered exactly once
-** or explicitly canceled.
-**
-** A thread that has been interrupted will fail all NSPR blocking operations
-** that return a PRStatus (I/O, waiting on a condition, etc).
-**
-** PR_Interrupt may itself fail if the target thread is invalid.
-*/
-NSPR_API(PRStatus) PR_Interrupt(PRThread *thread);
-
-/*
-** Clear the interrupt request for the calling thread. If no such request
-** is pending, this operation is a noop.
-*/
-NSPR_API(void) PR_ClearInterrupt(void);
-
-/*
-** Block the interrupt for the calling thread.
-*/
-NSPR_API(void) PR_BlockInterrupt(void);
-
-/*
-** Unblock the interrupt for the calling thread.
-*/
-NSPR_API(void) PR_UnblockInterrupt(void);
-
-/*
-** Make the current thread sleep until "ticks" time amount of time
-** has expired. If "ticks" is PR_INTERVAL_NO_WAIT then the call is
-** equivalent to calling PR_Yield. Calling PR_Sleep with an argument
-** equivalent to PR_INTERVAL_NO_TIMEOUT is an error and will result
-** in a PR_FAILURE error return.
-*/
-NSPR_API(PRStatus) PR_Sleep(PRIntervalTime ticks);
-
-/*
-** Get the scoping of this thread.
-*/
-NSPR_API(PRThreadScope) PR_GetThreadScope(const PRThread *thread);
-
-/*
-** Get the type of this thread.
-*/
-NSPR_API(PRThreadType) PR_GetThreadType(const PRThread *thread);
-
-/*
-** Get the join state of this thread.
-*/
-NSPR_API(PRThreadState) PR_GetThreadState(const PRThread *thread);
-
-PR_END_EXTERN_C
-
-#endif /* prthread_h___ */
diff --git a/libs/js/nsprpub/pr/include/prtime.h b/libs/js/nsprpub/pr/include/prtime.h
deleted file mode 100644
index 35ff507ea9..0000000000
--- a/libs/js/nsprpub/pr/include/prtime.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *----------------------------------------------------------------------
- *
- * prtime.h --
- *
- *     NSPR date and time functions
- *
- *-----------------------------------------------------------------------
- */
-
-#ifndef prtime_h___
-#define prtime_h___
-
-#include "prlong.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-#define PR_MSEC_PER_SEC		1000UL
-#define PR_USEC_PER_SEC		1000000UL
-#define PR_NSEC_PER_SEC		1000000000UL
-#define PR_USEC_PER_MSEC	1000UL
-#define PR_NSEC_PER_MSEC	1000000UL
-
-/*
- * PRTime --
- *
- *     NSPR represents basic time as 64-bit signed integers relative
- *     to midnight (00:00:00), January 1, 1970 Greenwich Mean Time (GMT).
- *     (GMT is also known as Coordinated Universal Time, UTC.)
- *     The units of time are in microseconds. Negative times are allowed
- *     to represent times prior to the January 1970 epoch. Such values are
- *     intended to be exported to other systems or converted to human
- *     readable form.
- *
- *     Notes on porting: PRTime corresponds to time_t in ANSI C.  NSPR 1.0
- *     simply uses PRInt64.
- */
-
-typedef PRInt64 PRTime;
-
-/*
- * Time zone and daylight saving time corrections applied to GMT to
- * obtain the local time of some geographic location
- */
-
-typedef struct PRTimeParameters {
-    PRInt32 tp_gmt_offset;     /* the offset from GMT in seconds */
-    PRInt32 tp_dst_offset;     /* contribution of DST in seconds */
-} PRTimeParameters;
-
-/*
- * PRExplodedTime --
- *
- *     Time broken down into human-readable components such as year, month,
- *     day, hour, minute, second, and microsecond.  Time zone and daylight
- *     saving time corrections may be applied.  If they are applied, the
- *     offsets from the GMT must be saved in the 'tm_params' field so that
- *     all the information is available to reconstruct GMT.
- *
- *     Notes on porting: PRExplodedTime corrresponds to struct tm in
- *     ANSI C, with the following differences:
- *       - an additional field tm_usec;
- *       - replacing tm_isdst by tm_params;
- *       - the month field is spelled tm_month, not tm_mon;
- *       - we use absolute year, AD, not the year since 1900.
- *     The corresponding type in NSPR 1.0 is called PRTime.  Below is
- *     a table of date/time type correspondence in the three APIs:
- *         API          time since epoch          time in components
- *       ANSI C             time_t                  struct tm
- *       NSPR 1.0           PRInt64                   PRTime
- *       NSPR 2.0           PRTime                  PRExplodedTime
- */
-
-typedef struct PRExplodedTime {
-    PRInt32 tm_usec;		    /* microseconds past tm_sec (0-99999)  */
-    PRInt32 tm_sec;             /* seconds past tm_min (0-61, accomodating
-                                   up to two leap seconds) */	
-    PRInt32 tm_min;             /* minutes past tm_hour (0-59) */
-    PRInt32 tm_hour;            /* hours past tm_day (0-23) */
-    PRInt32 tm_mday;            /* days past tm_mon (1-31, note that it
-				                starts from 1) */
-    PRInt32 tm_month;           /* months past tm_year (0-11, Jan = 0) */
-    PRInt16 tm_year;            /* absolute year, AD (note that we do not
-				                count from 1900) */
-
-    PRInt8 tm_wday;		        /* calculated day of the week
-				                (0-6, Sun = 0) */
-    PRInt16 tm_yday;            /* calculated day of the year 
-				                (0-365, Jan 1 = 0) */
-
-    PRTimeParameters tm_params;  /* time parameters used by conversion */
-} PRExplodedTime;
-
-/*
- * PRTimeParamFn --
- *
- *     A function of PRTimeParamFn type returns the time zone and
- *     daylight saving time corrections for some geographic location,
- *     given the current time in GMT.  The input argument gmt should
- *     point to a PRExplodedTime that is in GMT, i.e., whose
- *     tm_params contains all 0's.
- *
- *     For any time zone other than GMT, the computation is intended to
- *     consist of two steps:
- *       - Figure out the time zone correction, tp_gmt_offset.  This number
- *         usually depends on the geographic location only.  But it may
- *         also depend on the current time.  For example, all of China
- *         is one time zone right now.  But this situation may change
- *         in the future.
- *       - Figure out the daylight saving time correction, tp_dst_offset.
- *         This number depends on both the geographic location and the
- *         current time.  Most of the DST rules are expressed in local
- *         current time.  If so, one should apply the time zone correction
- *         to GMT before applying the DST rules.
- */
-
-typedef PRTimeParameters (PR_CALLBACK *PRTimeParamFn)(const PRExplodedTime *gmt);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/*
- * The PR_Now routine returns the current time relative to the
- * epoch, midnight, January 1, 1970 UTC. The units of the returned
- * value are microseconds since the epoch.
- *
- * The values returned are not guaranteed to advance in a linear fashion
- * due to the application of time correction protocols which synchronize
- * computer clocks to some external time source. Consequently it should
- * not be depended on for interval timing.
- *
- * The implementation is machine dependent.
- * Cf. time_t time(time_t *tp) in ANSI C.
- */
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-NSPR_API(PRTime) 
-#endif
-PR_Now(void);
-
-/*
- * Expand time binding it to time parameters provided by PRTimeParamFn.
- * The calculation is envisoned to proceed in the following steps:
- *   - From given PRTime, calculate PRExplodedTime in GMT
- *   - Apply the given PRTimeParamFn to the GMT that we just calculated
- *     to obtain PRTimeParameters.
- *   - Add the PRTimeParameters offsets to GMT to get the local time
- *     as PRExplodedTime.
- */
-
-NSPR_API(void) PR_ExplodeTime(
-    PRTime usecs, PRTimeParamFn params, PRExplodedTime *exploded);
-
-/* Reverse operation of PR_ExplodeTime */
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-NSPR_API(PRTime) 
-#endif
-PR_ImplodeTime(const PRExplodedTime *exploded);
-
-/*
- * Adjust exploded time to normalize field overflows after manipulation.
- * Note that the following fields of PRExplodedTime should not be
- * manipulated:
- *   - tm_month and tm_year: because the number of days in a month and
- *     number of days in a year are not constant, it is ambiguous to
- *     manipulate the month and year fields, although one may be tempted
- *     to.  For example, what does "a month from January 31st" mean?
- *   - tm_wday and tm_yday: these fields are calculated by NSPR.  Users
- *     should treat them as "read-only".
- */
-
-NSPR_API(void) PR_NormalizeTime(
-    PRExplodedTime *exploded, PRTimeParamFn params);
-
-/**********************************************************************/
-/*********************** TIME PARAMETER FUNCTIONS *********************/
-/**********************************************************************/
-
-/* Time parameters that suit current host machine */
-NSPR_API(PRTimeParameters) PR_LocalTimeParameters(const PRExplodedTime *gmt);
-
-/* Time parameters that represent Greenwich Mean Time */
-NSPR_API(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt);
-
-/*
- * Time parameters that represent the US Pacific Time Zone, with the
- * current daylight saving time rules (for testing only)
- */
-NSPR_API(PRTimeParameters) PR_USPacificTimeParameters(const PRExplodedTime *gmt);
-
-/*
- * This parses a time/date string into a PRTime
- * (microseconds after "1-Jan-1970 00:00:00 GMT").
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- *
- * Many formats are handled, including:
- *
- *   14 Apr 89 03:20:12
- *   14 Apr 89 03:20 GMT
- *   Fri, 17 Mar 89 4:01:33
- *   Fri, 17 Mar 89 4:01 GMT
- *   Mon Jan 16 16:12 PDT 1989
- *   Mon Jan 16 16:12 +0130 1989
- *   6 May 1992 16:41-JST (Wednesday)
- *   22-AUG-1993 10:59:12.82
- *   22-AUG-1993 10:59pm
- *   22-AUG-1993 12:59am
- *   22-AUG-1993 12:59 PM
- *   Friday, August 04, 1995 3:54 PM
- *   06/21/95 04:24:34 PM
- *   20/06/95 21:07
- *   95-06-08 19:32:48 EDT
- *
- * If the input string doesn't contain a description of the timezone,
- * we consult the `default_to_gmt' to decide whether the string should
- * be interpreted relative to the local time zone (PR_FALSE) or GMT (PR_TRUE).
- * The correct value for this argument depends on what standard specified
- * the time string which you are parsing.
- */
-
-NSPR_API(PRStatus) PR_ParseTimeString (
-	const char *string,
-	PRBool default_to_gmt,
-	PRTime *result);
-
-/*
- * FIXME: should we also have a formatting function, such as asctime, ctime,
- * and strftime in standard C library?  But this would involve
- * internationalization issues.  Might want to provide a US English version.
- */
-
-/**********************************************************************/
-/*********************** OLD COMPATIBILITYFUNCTIONS *******************/
-/**********************************************************************/
-#ifndef NO_NSPR_10_SUPPORT
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt, 
-                                           const PRExplodedTime *tm);
-
-/* Format a time value into a buffer. Time is always in US English format, regardless
- * of locale setting.
- */
-NSPR_API(PRUint32)
-PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
-                        const char* format, const PRExplodedTime* tm );
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-#endif /* prtime_h___ */
diff --git a/libs/js/nsprpub/pr/include/prtpool.h b/libs/js/nsprpub/pr/include/prtpool.h
deleted file mode 100644
index 2e1f6ddb37..0000000000
--- a/libs/js/nsprpub/pr/include/prtpool.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prtpool_h___
-#define prtpool_h___
-
-#include "prtypes.h"
-#include "prthread.h"
-#include "prio.h"
-#include "prerror.h"
-
-/*
- * NOTE:
- *		THIS API IS A PRELIMINARY VERSION IN NSPR 4.0 AND IS SUBJECT TO
- *		CHANGE
- */
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRJobIoDesc {
-    PRFileDesc *socket;
-    PRErrorCode error;
-    PRIntervalTime timeout;
-} PRJobIoDesc;
-
-typedef struct PRThreadPool PRThreadPool;
-typedef struct PRJob PRJob;
-typedef void (PR_CALLBACK *PRJobFn) (void *arg);
-
-/* Create thread pool */
-NSPR_API(PRThreadPool *)
-PR_CreateThreadPool(PRInt32 initial_threads, PRInt32 max_threads,
-                          PRUint32 stacksize);
-
-/* queue a job */
-NSPR_API(PRJob *)
-PR_QueueJob(PRThreadPool *tpool, PRJobFn fn, void *arg, PRBool joinable);
-
-/* queue a job, when a socket is readable */
-NSPR_API(PRJob *)
-PR_QueueJob_Read(PRThreadPool *tpool, PRJobIoDesc *iod,
-							PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a socket is writeable */
-NSPR_API(PRJob *)
-PR_QueueJob_Write(PRThreadPool *tpool, PRJobIoDesc *iod,
-								PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a socket has a pending connection */
-NSPR_API(PRJob *)
-PR_QueueJob_Accept(PRThreadPool *tpool, PRJobIoDesc *iod,
-									PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when the socket connection to addr succeeds or fails */
-NSPR_API(PRJob *)
-PR_QueueJob_Connect(PRThreadPool *tpool, PRJobIoDesc *iod,
-			const PRNetAddr *addr, PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a timer exipres */
-NSPR_API(PRJob *)
-PR_QueueJob_Timer(PRThreadPool *tpool, PRIntervalTime timeout,
-								PRJobFn fn, void * arg, PRBool joinable);
-/* cancel a job */
-NSPR_API(PRStatus)
-PR_CancelJob(PRJob *job);
-
-/* join a job */
-NSPR_API(PRStatus)
-PR_JoinJob(PRJob *job);
-
-/* shutdown pool */
-NSPR_API(PRStatus)
-PR_ShutdownThreadPool(PRThreadPool *tpool);
-
-/* join pool, wait for exit of all threads */
-NSPR_API(PRStatus)
-PR_JoinThreadPool(PRThreadPool *tpool);
-
-PR_END_EXTERN_C
-
-#endif /* prtpool_h___ */
diff --git a/libs/js/nsprpub/pr/include/prtrace.h b/libs/js/nsprpub/pr/include/prtrace.h
deleted file mode 100644
index 42f88e93b7..0000000000
--- a/libs/js/nsprpub/pr/include/prtrace.h
+++ /dev/null
@@ -1,678 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prtrace_h___
-#define prtrace_h___
-/*
-** prtrace.h -- NSPR's Trace Facility.  		           
-**                                                               		           
-** The Trace Facility provides a means to trace application				           
-** program events within a process. When implementing an         		           
-** application program an engineer may insert a "Trace" function 		           
-** call, passing arguments to be traced. The "Trace" function     		           
-** combines the user trace data with identifying data and        		           
-** writes this data in time ordered sequence into a circular     		           
-** in-memory buffer; when the buffer fills, it wraps.
-**                                                               		           
-** Functions are provided to set and/or re-configure the size of		           
-** the trace buffer, control what events are recorded in the			           
-** buffer, enable and disable tracing based on specific user			           
-** supplied data and other control functions. Methods are provided		           
-** to record the trace entries in the in-memory trace buffer to
-** a file.
-**                                                               		           
-** Tracing may cause a performance degredation to the application		           
-** depending on the number and placement of calls to the tracing		           
-** facility. When tracing is compiled in and all tracing is				           
-** disabled via the runtime controls, the overhead should be			           
-** minimal. ... Famous last words, eh?									           
-** 																                   
-** When DEBUG is defined at compile time, the Trace Facility is                    
-** compiled as part of NSPR and any application using NSPR's                       
-** header files will have tracing compiled in. When DEBUG is not                   
-** defined, the Trace Facility is not compiled into NSPR nor                       
-** exported in its header files.  If the Trace Facility is                         
-** desired in a non-debug build, then FORCE_NSPR_TRACE may be                      
-** defined at compile time for both the optimized build of NSPR                    
-** and the application. NSPR and any application using  NSPR's                     
-** Trace Facility must be compiled with the same level of trace                    
-** conditioning or unresolved references may be realized at link                   
-** time.                                                                           
-**                                                                                 
-** For any of the Trace Facility methods that requires a trace                     
-** handle as an input argument, the caller must ensure that the                    
-** trace handle argument is valid. An invalid trace handle                         
-** argument may cause unpredictable results.                                       
-**                                                                                 
-** Trace Facility methods are thread-safe and SMP safe.                            
-**                                                                                 
-** Users of the Trace Facility should use the defined macros to                     
-** invoke trace methods, not the function calls directly. e.g.                      
-** PR_TRACE( h1,0,1,2, ...); not PR_Trace(h1,0,1,2, ...);
-**                                                                                  
-** Application designers should be aware of the effects of
-** debug and optimized build differences when using result of the
-** Trace Facility macros in expressions.
-** 
-** See Also: prcountr.h                                                                                 
-**                                                                                  
-** /lth. 08-Jun-1998.                                                                                  
-*/
-
-#include "prtypes.h"
-#include "prthread.h"
-#include "prtime.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Opaque type for the trace handle 
-** ... Don't even think about looking in here.
-**
-*/
-typedef void *  PRTraceHandle;
-
-/*
-** PRTraceEntry -- A trace entry in the in-memory trace buffer
-** looks like this.
-**
-*/
-typedef struct PRTraceEntry
-{
-    PRThread        *thread;        /* The thread creating the trace entry */
-    PRTraceHandle   handle;         /* PRTraceHandle creating the trace entry */
-    PRTime          time;           /* Value of PR_Now() at time of trace entry */
-    PRUint32        userData[8];    /* user supplied trace data */
-} PRTraceEntry;
-
-/*
-** PRTraceOption -- command operands to
-** PR_[Set|Get]TraceOption(). See descriptive meanings there.
-**
-*/
-typedef enum PRTraceOption
-{
-    PRTraceBufSize,
-    PRTraceEnable,              
-    PRTraceDisable,
-    PRTraceSuspend,
-    PRTraceResume,
-    PRTraceSuspendRecording,
-    PRTraceResumeRecording,
-    PRTraceLockHandles,
-    PRTraceUnLockHandles,
-    PRTraceStopRecording
-} PRTraceOption;
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DEFINE_TRACE() -- Define a PRTraceHandle
-** 
-** DESCRIPTION: PR_DEFINE_TRACE() is used to define a trace
-** handle.
-** 
-*/
-#define PR_DEFINE_TRACE(name) PRTraceHandle name
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_INIT_TRACE_HANDLE() -- Set the value of a PRTraceHandle
-** 
-** DESCRIPTION: 
-** PR_INIT_TRACE_HANDLE() sets the value of a PRTraceHandle
-** to value. e.g. PR_INIT_TRACE_HANDLE( myHandle, NULL );
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_INIT_TRACE_HANDLE(handle,value)\
-    (handle) = (PRCounterHandle)(value)
-#else
-#define PR_INIT_TRACE_HANDLE(handle,value)
-#endif
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateTrace() -- Create a trace handle
-** 
-** DESCRIPTION:
-**  PR_CreateTrace() creates a new trace handle. Tracing is
-**  enabled for this handle when it is created. The trace handle
-**  is intended for use in other Trace Facility calls.
-**  
-**  PR_CreateTrace() registers the QName, RName and description
-**  data so that this data can be retrieved later.
-** 
-** INPUTS: 
-**  qName: pointer to string. QName for this trace handle. 
-** 
-**  rName: pointer to string. RName for this trace handle. 
-** 
-**  description: pointer to string. Descriptive data about this
-**  trace handle.
-**
-** OUTPUTS:
-**  Creates the trace handle. 
-**  Registers the QName and RName with the trace facility.
-** 
-** RETURNS: 
-**  PRTraceHandle
-** 
-** RESTRICTIONS:
-**  qName is limited to 31 characters.
-**  rName is limited to 31 characters.
-**  description is limited to 255 characters.
-** 
-*/
-#define PRTRACE_NAME_MAX 31
-#define PRTRACE_DESC_MAX 255
-
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_CREATE_TRACE(handle,qName,rName,description)\
-    (handle) = PR_CreateTrace((qName),(rName),(description))
-#else
-#define PR_CREATE_TRACE(handle,qName,rName,description)
-#endif
-
-NSPR_API(PRTraceHandle)
-	PR_CreateTrace( 
-    	const char *qName,          /* QName for this trace handle */
-	    const char *rName,          /* RName for this trace handle */
-	    const char *description     /* description for this trace handle */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyTrace() -- Destroy a trace handle
-** 
-** DESCRIPTION: 
-**  PR_DestroyTrace() removes the referenced trace handle and
-** associated QName, RName and description data from the Trace
-** Facility.
-** 
-** INPUTS: handle. A PRTraceHandle
-** 
-** OUTPUTS: 
-**  The trace handle is unregistered.
-**  The QName, RName and description are removed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_DESTROY_TRACE(handle)\
-    PR_DestroyTrace((handle))
-#else
-#define PR_DESTROY_TRACE(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DestroyTrace( 
-		PRTraceHandle handle    /* Handle to be destroyed */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_Trace() -- Make a trace entry in the in-memory trace
-** 
-** DESCRIPTION:
-** PR_Trace() makes an entry in the in-memory trace buffer for
-** the referenced trace handle. The next logically available
-** PRTraceEntry is used; when the next trace entry would overflow
-** the trace table, the table wraps.
-**
-** PR_Trace() for a specific trace handle may be disabled by
-** calling PR_SetTraceOption() specifying PRTraceDisable for the
-** trace handle to be disabled.
-** 
-** INPUTS:
-** handle: PRTraceHandle. The trace handle for this trace.
-** 
-** userData[0..7]: unsigned 32bit integers. user supplied data
-** that is copied into the PRTraceEntry
-** 
-** OUTPUTS:
-**  A PRTraceEntry is (conditionally) formatted in the in-memory
-** trace buffer.
-** 
-** RETURNS: void.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)\
-    PR_Trace((handle),(ud0),(ud1),(ud2),(ud3),(ud4),(ud5),(ud6),(ud7))
-#else
-#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)
-#endif
-
-NSPR_API(void) 
-	PR_Trace( 
-    	PRTraceHandle handle,       /* use this trace handle */
-	    PRUint32    userData0,      /* User supplied data word 0 */
-	    PRUint32    userData1,      /* User supplied data word 1 */
-	    PRUint32    userData2,      /* User supplied data word 2 */
-	    PRUint32    userData3,      /* User supplied data word 3 */
-	    PRUint32    userData4,      /* User supplied data word 4 */
-	    PRUint32    userData5,      /* User supplied data word 5 */
-	    PRUint32    userData6,      /* User supplied data word 6 */
-	    PRUint32    userData7       /* User supplied data word 7 */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SetTraceOption() -- Control the Trace Facility
-** 
-** DESCRIPTION:
-** PR_SetTraceOption() controls the Trace Facility. Depending on
-** command and value, attributes of the Trace Facility may be
-** changed.
-** 
-** INPUTS:
-**  command: An enumerated value in the set of PRTraceOption.
-**  value: pointer to the data to be set. Type of the data is
-**  dependent on command; for each value of command, the type
-**  and meaning of dereferenced value is shown.
-**
-**  PRTraceBufSize: unsigned long: the size of the trace buffer,
-** in bytes.
-** 
-**  PRTraceEnable: PRTraceHandle. The trace handle to be
-** enabled.
-** 
-**  PRTraceDisable: PRTraceHandle. The trace handle to be
-** disabled.
-** 
-**  PRTraceSuspend: void. value must be NULL. All tracing is
-** suspended.
-** 
-**  PRTraceResume: void. value must be NULL. Tracing for all
-** previously enabled, prior to a PRTraceSuspend, is resumed.
-** 
-**  PRTraceStopRecording: void. value must be NULL. If recording
-** (see: ** PR_RecordTraceEntries()) is being done, 
-** PRTraceStopRecording causes PR_RecordTraceEntries() to return
-** to its caller. If recording is not being done, this function
-** has no effect.
-** 
-**  PRTraceSuspendRecording: void. Must be NULL. If recording is
-** being done, PRTraceSuspendRecording causes further writes to
-** the trace file to be suspended. Data in the in-memory
-** trace buffer that would ordinarily be written to the
-** trace file will not be written. Trace entries will continue
-** to be entered in the in-memory buffer. If the Trace Facility
-** recording is already in a suspended state, the call has no
-** effect.
-** 
-**  PRTraceResumeRecording: void. value must be NULL. If
-** recording for the Trace Facility has been previously been
-** suspended, this causes recording to resume. Recording resumes
-** with the next in-memory buffer segment that would be written
-** if trace recording had not been suspended. If recording is
-** not currently suspended, the call has no effect.
-** 
-**  PRTraceLockHandles: void. value must be NULL. Locks the
-** trace handle lock. While the trace handle lock is held,
-** calls to PR_CreateTrace() will block until the lock is
-** released.
-** 
-**  PRTraceUnlockHandles: void. value must be NULL. Unlocks the
-** trace handle lock.
-** 
-** OUTPUTS:
-**  The operation of the Trace Facility may be changed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_SET_TRACE_OPTION(command,value)\
-    PR_SetTraceOption((command),(value))
-#else
-#define PR_SET_TRACE_OPTION(command,value)
-#endif
-
-NSPR_API(void) 
-	PR_SetTraceOption( 
-	    PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceOption() -- Retrieve settings from the Trace Facility
-** 
-** DESCRIPTION:
-** PR_GetTraceOption() retrieves the current setting of the
-** Trace Facility control depending on command.
-** 
-** 
-**  PRTraceBufSize: unsigned long: the size of the trace buffer,
-** in bytes.
-** 
-** 
-** INPUTS:
-**  command: one of the enumerated values in PRTraceOptions
-** valid for PR_GetTraceOption().
-** 
-** OUTPUTS:
-**  dependent on command.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_OPTION(command,value)\
-    PR_GetTraceOption((command),(value))
-#else
-#define PR_GET_TRACE_OPTION(command,value)
-#endif
-
-NSPR_API(void) 
-	PR_GetTraceOption( 
-    	PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceHandleFromName() -- Retrieve an existing
-** handle by name.
-** 
-** DESCRIPTION:
-** PR_GetTraceHandleFromName() retreives an existing tracehandle
-** using the name specified by qName and rName.
-** 
-** INPUTS:
-**  qName: pointer to string. QName for this trace handle. 
-** 
-**  rName: pointer to string. RName for this trace handle. 
-** 
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle associated with qName and rName or NULL when
-** there is no match.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)\
-    (handle) = PR_GetTraceHandleFromName((qName),(rName))
-#else
-#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_GetTraceHandleFromName( 
-    	const char *qName,      /* QName search argument */
-        const char *rName       /* RName search argument */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceNameFromHandle() -- Retreive trace name
-** by bandle.
-** 
-** DESCRIPTION:
-** PR_GetTraceNameFromHandle() retreives the existing qName,
-** rName, and description for the referenced trace handle.
-** 
-** INPUTS: handle: PRTraceHandle.
-** 
-** OUTPUTS: pointers to the Trace Facility's copy of qName,
-** rName and description. ... Don't mess with these values.
-** They're mine.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)\
-    PR_GetTraceNameFromHandle((handle),(qName),(rName),(description))
-#else
-#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)
-#endif
-
-NSPR_API(void) 
-	PR_GetTraceNameFromHandle( 
-    	PRTraceHandle handle,       /* handle as search argument */
-	    const char **qName,         /* pointer to associated QName */
-	    const char **rName,         /* pointer to associated RName */
-    	const char **description    /* pointer to associated description */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextTraceQname() -- Retrieive a QName handle
-** iterator.
-** 
-** DESCRIPTION:
-** PR_FindNextTraceQname() retreives the first or next trace
-** QName handle, depending on the value of handle, from the trace
-** database. The PRTraceHandle returned can be used as an
-** iterator to traverse the QName handles in the Trace database.
-** 
-** INPUTS:
-**  handle: When NULL, PR_FindNextQname() returns the first QName
-** handle. When a handle is a valid PRTraceHandle previously
-** retreived using PR_FindNextQname() the next QName handle is
-** retreived.
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle or NULL when there are no trace handles.
-** 
-** RESTRICTIONS:
-**  Iterating thru the trace handles via FindFirst/FindNext
-** should be done under protection of the trace handle lock.
-** See: PR_SetTraceOption( PRLockTraceHandles ).
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_FIND_NEXT_TRACE_QNAME(next,handle)\
-    (next) = PR_FindNextTraceQname((handle))
-#else
-#define PR_FIND_NEXT_TRACE_QNAME(next,handle)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_FindNextTraceQname( 
-        PRTraceHandle handle
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextTraceRname() -- Retrieive an RName handle
-** iterator.
-** 
-** DESCRIPTION:
-** PR_FindNextTraceRname() retreives the first or next trace
-** RName handle, depending on the value of handle, from the trace
-** database. The PRTraceHandle returned can be used as an
-** iterator to traverse the RName handles in the Trace database.
-** 
-** INPUTS:
-**  rhandle: When NULL, PR_FindNextRname() returns the first
-** RName handle. When a handle is a valid PRTraceHandle
-** previously retreived using PR_FindNextRname() the next RName
-** handle is retreived.
-**  qhandle: A valid PRTraceHandle retruned from a previous call
-** to PR_FIND_NEXT_TRACE_QNAME().
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle or NULL when there are no trace handles.
-** 
-** RESTRICTIONS:
-**  Iterating thru the trace handles via FindNext should be done
-** under protection of the trace handle lock. See: (
-** PR_SetTraceOption( PRLockTraceHandles ).
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)\
-    (next) = PR_FindNextTraceRname((rhandle),(qhandle))
-#else
-#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_FindNextTraceRname( 
-        PRTraceHandle rhandle,
-        PRTraceHandle qhandle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_RecordTraceEntries() -- Write trace entries to external media
-** 
-** DESCRIPTION:
-** PR_RecordTraceEntries() causes entries in the in-memory trace
-** buffer to be written to external media.
-**
-** When PR_RecordTraceEntries() is called from an application
-** thread, the function appears to block until another thread
-** calls PR_SetTraceOption() with the PRTraceStopRecording
-** option. This suggests that PR_RecordTraceEntries() should be
-** called from a user supplied thread whose only job is to
-** record trace entries. 
-** 
-** The environment variable NSPR_TRACE_LOG controls the operation
-** of this function. When NSPR_TRACE_LOG is not defined in the
-** environment, no recording of trace entries occurs. When
-** NSPR_TRACE_LOG is defined, the value of its definition must be
-** the filename of the file to receive the trace entry buffer.
-**
-** PR_RecordTraceEntries() attempts to record the in-memory
-** buffer to a file, subject to the setting of the environment
-** variable NSPR_TRACE_LOG. It is possible because of system
-** load, the thread priority of the recording thread, number of
-** active trace records being written over time, and other
-** variables that some trace records can be lost. ... In other
-** words: don't bet the farm on getting everything.
-** 
-** INPUTS: none
-** 
-** OUTPUTS: none
-** 
-** RETURNS: PR_STATUS
-**    PR_SUCCESS no errors were found.
-**    PR_FAILURE errors were found.
-** 
-** RESTRICTIONS:
-** Only one thread can call PR_RecordTraceEntries() within a
-** process.
-** 
-** On error, PR_RecordTraceEntries() may return prematurely.
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_RECORD_TRACE_ENTRIES()\
-	PR_RecordTraceEntries()
-#else
-#define PR_RECORD_TRACE_ENTRIES()
-#endif
-    
-NSPR_API(void)
-	PR_RecordTraceEntries(
-        void 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceEntries() -- Retreive trace entries from
-** the Trace Facility
-** 
-** DESCRIPTION:
-** PR_GetTraceEntries() retreives trace entries from the Trace
-** Facility. Up to count trace entries are copied from the Trace
-** Facility into buffer. Only those trace entries that have not
-** been copied via a previous call to PR_GetTraceEntries() are
-** copied. The actual number copied is placed in the PRInt32
-** variable pointed to by found.
-**
-** If more than count trace entries have entered the Trace
-** Facility since the last call to PR_GetTraceEntries() 
-** a lost data condition is returned. In this case, the most
-** recent count trace entries are copied into buffer and found is
-** set to count.
-** 
-** INPUTS:
-**  count. The number of trace entries to be copied into buffer.
-** 
-** 
-** OUTPUTS:
-**  buffer. An array of PRTraceEntries. The buffer is supplied
-** by the caller.
-** 
-** found: 32bit signed integer. The number of PRTraceEntries
-** actually copied. found is always less than or equal to count.
-** 
-** RETURNS: 
-**  zero when there is no lost data.
-**  non-zero when some PRTraceEntries have been lost.
-** 
-** RESTRICTIONS:
-** This is a real performance pig. The copy out operation is bad
-** enough, but depending on then frequency of calls to the
-** function, serious performance impact to the operating
-** application may be realized. ... YMMV.
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_ENTRIES(buffer,count,found)\
-        PR_GetTraceEntries((buffer),(count),(found))
-#else
-#define PR_GET_TRACE_ENTRIES(buffer,count,found)
-#endif
-
-NSPR_API(PRIntn)
-    PR_GetTraceEntries(
-        PRTraceEntry    *buffer,    /* where to write output */
-        PRInt32         count,      /* number to get */
-        PRInt32         *found      /* number you got */
-);
-
-PR_END_EXTERN_C
-
-#endif /* prtrace_h___ */
-
diff --git a/libs/js/nsprpub/pr/include/prtypes.h b/libs/js/nsprpub/pr/include/prtypes.h
deleted file mode 100644
index 157da93a03..0000000000
--- a/libs/js/nsprpub/pr/include/prtypes.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                prtypes.h
-** Description: Definitions of NSPR's basic types
-**
-** Prototypes and macros used to make up for deficiencies that we have found
-** in ANSI environments.
-**
-** Since we do not wrap <stdlib.h> and all the other standard headers, authors
-** of portable code will not know in general that they need these definitions.
-** Instead of requiring these authors to find the dependent uses in their code
-** and take the following steps only in those C files, we take steps once here
-** for all C files.
-**/
-
-#ifndef prtypes_h___
-#define prtypes_h___
-
-#ifdef MDCPUCFG
-#include MDCPUCFG
-#else
-#include "prcpucfg.h"
-#endif
-
-#include <stddef.h>
-
-/***********************************************************************
-** MACROS:      PR_EXTERN
-**              PR_IMPLEMENT
-** DESCRIPTION:
-**      These are only for externally visible routines and globals.  For
-**      internal routines, just use "extern" for type checking and that
-**      will not export internal cross-file or forward-declared symbols.
-**      Define a macro for declaring procedures return types. We use this to
-**      deal with windoze specific type hackery for DLL definitions. Use
-**      PR_EXTERN when the prototype for the method is declared. Use
-**      PR_IMPLEMENT for the implementation of the method.
-**
-** Example:
-**   in dowhim.h
-**     PR_EXTERN( void ) DoWhatIMean( void );
-**   in dowhim.c
-**     PR_IMPLEMENT( void ) DoWhatIMean( void ) { return; }
-**
-**
-***********************************************************************/
-#if defined(WIN32)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_BEOS)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(WIN16)
-
-#define PR_CALLBACK_DECL        __cdecl
-
-#if defined(_WINDLL)
-#define PR_EXPORT(__type) extern __type _cdecl _export _loadds
-#define PR_IMPORT(__type) extern __type _cdecl _export _loadds
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export _loadds
-#define PR_IMPLEMENT(__type) __type _cdecl _export _loadds
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* this must be .EXE */
-#define PR_EXPORT(__type) extern __type _cdecl _export
-#define PR_IMPORT(__type) extern __type _cdecl _export
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export
-#define PR_IMPLEMENT(__type) __type _cdecl _export
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) __x PR_CALLBACK
-#endif /* _WINDLL */
-
-#elif defined(XP_MAC)
-
-#define PR_EXPORT(__type) extern __declspec(export) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(export) __type
-#define PR_IMPORT(__type) extern __declspec(export) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(export) __type
-
-#define PR_EXTERN(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT(__type) __declspec(export) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(export) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2_VACPP) 
-
-#define PR_EXPORT(__type) extern __type
-#define PR_EXPORT_DATA(__type) extern __type
-#define PR_IMPORT(__type) extern __type
-#define PR_IMPORT_DATA(__type) extern __type
-
-#define PR_EXTERN(__type) extern __type
-#define PR_IMPLEMENT(__type) __type
-#define PR_EXTERN_DATA(__type) extern __type
-#define PR_IMPLEMENT_DATA(__type) __type
-#define PR_CALLBACK _Optlink
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* Unix */
-
-/* GCC 3.3 and later support the visibility attribute. */
-#if (__GNUC__ >= 4) || \
-    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
-#else
-#define PR_VISIBILITY_DEFAULT
-#endif
-
-#define PR_EXPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_EXPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-
-#define PR_EXTERN(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_EXTERN_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT_DATA(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#endif
-
-#if defined(_NSPR_BUILD_)
-#define NSPR_API(__type) PR_EXPORT(__type)
-#define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
-#else
-#define NSPR_API(__type) PR_IMPORT(__type)
-#define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_MACRO
-**              PR_END_MACRO
-** DESCRIPTION:
-**      Macro body brackets so that macros with compound statement definitions
-**      behave syntactically more like functions when called.
-***********************************************************************/
-#define PR_BEGIN_MACRO  do {
-#define PR_END_MACRO    } while (0)
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_EXTERN_C
-**              PR_END_EXTERN_C
-** DESCRIPTION:
-**      Macro shorthands for conditional C++ extern block delimiters.
-***********************************************************************/
-#ifdef __cplusplus
-#define PR_BEGIN_EXTERN_C       extern "C" {
-#define PR_END_EXTERN_C         }
-#else
-#define PR_BEGIN_EXTERN_C
-#define PR_END_EXTERN_C
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BIT
-**              PR_BITMASK
-** DESCRIPTION:
-** Bit masking macros.  XXX n must be <= 31 to be portable
-***********************************************************************/
-#define PR_BIT(n)       ((PRUint32)1 << (n))
-#define PR_BITMASK(n)   (PR_BIT(n) - 1)
-
-/***********************************************************************
-** MACROS:      PR_ROUNDUP
-**              PR_MIN
-**              PR_MAX
-**              PR_ABS
-** DESCRIPTION:
-**      Commonly used macros for operations on compatible types.
-***********************************************************************/
-#define PR_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
-#define PR_MIN(x,y)     ((x)<(y)?(x):(y))
-#define PR_MAX(x,y)     ((x)>(y)?(x):(y))
-#define PR_ABS(x)       ((x)<0?-(x):(x))
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************
-** TYPES:       PRUint8
-**              PRInt8
-** DESCRIPTION:
-**  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char". 
-************************************************************************/
-#if PR_BYTES_PER_BYTE == 1
-typedef unsigned char PRUint8;
-/*
-** Some cfront-based C++ compilers do not like 'signed char' and
-** issue the warning message:
-**     warning: "signed" not implemented (ignored)
-** For these compilers, we have to define PRInt8 as plain 'char'.
-** Make sure that plain 'char' is indeed signed under these compilers.
-*/
-#if (defined(HPUX) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus < 199707L) \
-    || (defined(SCO) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus == 1L)
-typedef char PRInt8;
-#else
-typedef signed char PRInt8;
-#endif
-#else
-#error No suitable type for PRInt8/PRUint8
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT8_MAX
- *              PR_INT8_MIN
- *              PR_UINT8_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt8 or PRUint8.
-************************************************************************/
-
-#define PR_INT8_MAX 127
-#define PR_INT8_MIN (-128)
-#define PR_UINT8_MAX 255U
-
-/************************************************************************
-** TYPES:       PRUint16
-**              PRInt16
-** DESCRIPTION:
-**  The int16 types are known to be 16 bits each. 
-************************************************************************/
-#if PR_BYTES_PER_SHORT == 2
-typedef unsigned short PRUint16;
-typedef short PRInt16;
-#else
-#error No suitable type for PRInt16/PRUint16
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT16_MAX
- *              PR_INT16_MIN
- *              PR_UINT16_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt16 or PRUint16.
-************************************************************************/
-
-#define PR_INT16_MAX 32767
-#define PR_INT16_MIN (-32768)
-#define PR_UINT16_MAX 65535U
-
-/************************************************************************
-** TYPES:       PRUint32
-**              PRInt32
-** DESCRIPTION:
-**  The int32 types are known to be 32 bits each. 
-************************************************************************/
-#if PR_BYTES_PER_INT == 4
-typedef unsigned int PRUint32;
-typedef int PRInt32;
-#define PR_INT32(x)  x
-#define PR_UINT32(x) x ## U
-#elif PR_BYTES_PER_LONG == 4
-typedef unsigned long PRUint32;
-typedef long PRInt32;
-#define PR_INT32(x)  x ## L
-#define PR_UINT32(x) x ## UL
-#else
-#error No suitable type for PRInt32/PRUint32
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT32_MAX
- *              PR_INT32_MIN
- *              PR_UINT32_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt32 or PRUint32.
-************************************************************************/
-
-#define PR_INT32_MAX PR_INT32(2147483647)
-#define PR_INT32_MIN (-PR_INT32_MAX - 1)
-#define PR_UINT32_MAX PR_UINT32(4294967295)
-
-/************************************************************************
-** TYPES:       PRUint64
-**              PRInt64
-** DESCRIPTION:
-**  The int64 types are known to be 64 bits each. Care must be used when
-**      declaring variables of type PRUint64 or PRInt64. Different hardware
-**      architectures and even different compilers have varying support for
-**      64 bit values. The only guaranteed portability requires the use of
-**      the LL_ macros (see prlong.h).
-************************************************************************/
-#ifdef HAVE_LONG_LONG
-#if PR_BYTES_PER_LONG == 8
-typedef long PRInt64;
-typedef unsigned long PRUint64;
-#elif defined(WIN16)
-typedef __int64 PRInt64;
-typedef unsigned __int64 PRUint64;
-#elif defined(WIN32) && !defined(__GNUC__)
-typedef __int64  PRInt64;
-typedef unsigned __int64 PRUint64;
-#else
-typedef long long PRInt64;
-typedef unsigned long long PRUint64;
-#endif /* PR_BYTES_PER_LONG == 8 */
-#else  /* !HAVE_LONG_LONG */
-typedef struct {
-#ifdef IS_LITTLE_ENDIAN
-    PRUint32 lo, hi;
-#else
-    PRUint32 hi, lo;
-#endif
-} PRInt64;
-typedef PRInt64 PRUint64;
-#endif /* !HAVE_LONG_LONG */
-
-/************************************************************************
-** TYPES:       PRUintn
-**              PRIntn
-** DESCRIPTION:
-**  The PRIntn types are most appropriate for automatic variables. They are
-**      guaranteed to be at least 16 bits, though various architectures may
-**      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure. 
-************************************************************************/
-#if PR_BYTES_PER_INT >= 2
-typedef int PRIntn;
-typedef unsigned int PRUintn;
-#else
-#error 'sizeof(int)' not sufficient for platform use
-#endif
-
-/************************************************************************
-** TYPES:       PRFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits. 
-************************************************************************/
-typedef double          PRFloat64;
-
-/************************************************************************
-** TYPES:       PRSize
-** DESCRIPTION:
-**  A type for representing the size of objects. 
-************************************************************************/
-typedef size_t PRSize;
-
-
-/************************************************************************
-** TYPES:       PROffset32, PROffset64
-** DESCRIPTION:
-**  A type for representing byte offsets from some location. 
-************************************************************************/
-typedef PRInt32 PROffset32;
-typedef PRInt64 PROffset64;
-
-/************************************************************************
-** TYPES:       PRPtrDiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction. 
-************************************************************************/
-typedef ptrdiff_t PRPtrdiff;
-
-/************************************************************************
-** TYPES:       PRUptrdiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction. 
-************************************************************************/
-#ifdef _WIN64
-typedef unsigned __int64 PRUptrdiff;
-#else
-typedef unsigned long PRUptrdiff;
-#endif
-
-/************************************************************************
-** TYPES:       PRBool
-** DESCRIPTION:
-**  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
-**      for clarity of target type in assignments and actual arguments. Use
-**      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions. 
-************************************************************************/
-typedef PRIntn PRBool;
-#define PR_TRUE 1
-#define PR_FALSE 0
-
-/************************************************************************
-** TYPES:       PRPackedBool
-** DESCRIPTION:
-**  Use PRPackedBool within structs where bitfields are not desirable
-**      but minimum and consistant overhead matters.
-************************************************************************/
-typedef PRUint8 PRPackedBool;
-
-/*
-** Status code used by some routines that have a single point of failure or 
-** special status return.
-*/
-typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This type may be removed in a future release.
- */
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-#if defined(WIN32) || defined(XP_MAC)
-typedef wchar_t PRUnichar;
-#else
-typedef PRUint16 PRUnichar;
-#endif
-#endif
-#endif /* MOZ_UNICODE */
-
-/*
-** WARNING: The undocumented data types PRWord and PRUword are
-** only used in the garbage collection and arena code.  Do not
-** use PRWord and PRUword in new code.
-**
-** A PRWord is an integer that is the same size as a void*.
-** It implements the notion of a "word" in the Java Virtual
-** Machine.  (See Sec. 3.4 "Words", The Java Virtual Machine
-** Specification, Addison-Wesley, September 1996.
-** http://java.sun.com/docs/books/vmspec/index.html.)
-*/
-#ifdef _WIN64
-typedef __int64 PRWord;
-typedef unsigned __int64 PRUword;
-#else
-typedef long PRWord;
-typedef unsigned long PRUword;
-#endif
-
-#if defined(NO_NSPR_10_SUPPORT)
-#else
-/********* ???????????????? FIX ME       ??????????????????????????? *****/
-/********************** Some old definitions until pr=>ds transition is done ***/
-/********************** Also, we are still using NSPR 1.0. GC ******************/
-/*
-** Fundamental NSPR macros, used nearly everywhere.
-*/
-
-#define PR_PUBLIC_API		PR_IMPLEMENT
-
-/*
-** Macro body brackets so that macros with compound statement definitions
-** behave syntactically more like functions when called.
-*/
-#define NSPR_BEGIN_MACRO        do {
-#define NSPR_END_MACRO          } while (0)
-
-/*
-** Macro shorthands for conditional C++ extern block delimiters.
-*/
-#ifdef NSPR_BEGIN_EXTERN_C
-#undef NSPR_BEGIN_EXTERN_C
-#endif
-#ifdef NSPR_END_EXTERN_C
-#undef NSPR_END_EXTERN_C
-#endif
-
-#ifdef __cplusplus
-#define NSPR_BEGIN_EXTERN_C     extern "C" {
-#define NSPR_END_EXTERN_C       }
-#else
-#define NSPR_BEGIN_EXTERN_C
-#define NSPR_END_EXTERN_C
-#endif
-
-#ifdef XP_MAC
-#include "protypes.h"
-#else
-#include "obsolete/protypes.h"
-#endif
-
-/********* ????????????? End Fix me ?????????????????????????????? *****/
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-#endif /* prtypes_h___ */
-
diff --git a/libs/js/nsprpub/pr/include/prvrsion.h b/libs/js/nsprpub/pr/include/prvrsion.h
deleted file mode 100644
index eb8e1e61cf..0000000000
--- a/libs/js/nsprpub/pr/include/prvrsion.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/* author: jstewart */
-
-#if defined(_PRVERSION_H)
-#else
-#define _PRVERSION_H
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/* All components participating in the PR version protocol must expose
- * a structure and a function. The structure is defined below and named
- * according to the naming conventions outlined further below.  The function
- * is called libVersionPoint and returns a pointer to this structure.
- */
-
-/* on NT, always pack the structure the same. */
-#ifdef _WIN32
-#pragma pack(push, 8)
-#endif
-
-typedef struct {
-    /*
-     * The first field defines which version of this structure is in use.
-     * At this time, only version 2 is specified. If this value is not 
-     * 2, you must read no further into the structure.
-     */
-    PRInt32    version; 
-  
-    /* for Version 2, this is the body format. */
-    PRInt64         buildTime;      /* 64 bits - usecs since midnight, 1/1/1970 */
-    char *          buildTimeString;/* a human readable version of the time */
-  
-    PRUint8   vMajor;               /* Major version of this component */
-    PRUint8   vMinor;               /* Minor version of this component */
-    PRUint8   vPatch;               /* Patch level of this component */
-  
-    PRBool          beta;           /* true if this is a beta component */
-    PRBool          debug;          /* true if this is a debug component */
-    PRBool          special;        /* true if this component is a special build */
-  
-    char *          filename;       /* The original filename */
-    char *          description;    /* description of this component */
-    char *          security;       /* level of security in this component */
-    char *          copyright;      /* The copyright for this file */
-    char *          comment;        /* free form field for misc usage */
-    char *          specialString;  /* the special variant for this build */
-} PRVersionDescription;
-
-/* on NT, restore the previous packing */
-#ifdef _WIN32
-#pragma pack(pop)
-#endif
-
-/*
- * All components must define an entrypoint named libVersionPoint which
- * is of type versionEntryPointType.
- *
- * For example, for a library named libfoo, we would have:
- *
- *   PRVersionDescription prVersionDescription_libfoo =
- *   {
- *       ...
- *   };
- *
- *   PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint(void)
- *   {
- *       return &prVersionDescription_libfoo;
- *   }
- */
-typedef const PRVersionDescription *(*versionEntryPointType)(void);
-
-/* 
- * Where you declare your libVersionPoint, do it like this: 
- * PR_IMPLEMENT(const PRVersionDescription *) libVersionPoint(void) {
- *  fill it in...
- * }
- */
-
-/*
- * NAMING CONVENTION FOR struct
- *
- * all components should also expose a static PRVersionDescription
- * The name of the struct should be calculated as follows:
- * Take the value of filename. (If filename is not specified, calculate
- * a short, unique string.)  Convert all non-alphanumeric characters
- * to '_'.  To this, prepend "PRVersionDescription_".  Thus for libfoo.so,
- * the symbol name is "PRVersionDescription_libfoo_so".
- * so the file should have
- * PRVersionDescription PRVersionDescription_libfoo_so { fill it in };
- * on NT, this file should be declspec export.
- */
-
-PR_END_EXTERN_C
-
-#endif  /* defined(_PRVERSION_H) */
-
-/* prvrsion.h */
-
diff --git a/libs/js/nsprpub/pr/include/prwin16.h b/libs/js/nsprpub/pr/include/prwin16.h
deleted file mode 100644
index 215b051404..0000000000
--- a/libs/js/nsprpub/pr/include/prwin16.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prwin16_h___
-#define prwin16_h___
-
-/*
-** Condition use of this header on platform.
-*/
-#if (defined(XP_PC) && !defined(_WIN32) && !defined(XP_OS2) && defined(MOZILLA_CLIENT)) || defined(WIN16)
-#include <stdio.h>
-
-PR_BEGIN_EXTERN_C
-/* 
-** Win16 stdio special case.
-** To get stdio to work for Win16, all calls to printf() and related
-** things must be called from the environment of the .EXE; calls to
-** printf() from the .DLL send output to the bit-bucket.
-**
-** To make sure that PR_fprintf(), and related functions, work correctly,
-** the actual stream I/O to stdout, stderr, stdin must be done in the
-** .EXE. To do this, a hack is placed in _MD_Write() such that the
-** fd for stdio handles results in a call to the .EXE.
-**
-** file w16stdio.c contains the functions that get called from NSPR
-** to do the actual I/O. w16stdio.o must be statically linked with
-** any application needing stdio for Win16.
-**
-** The address of these functions must be made available to the .DLL
-** so he can call back to the .EXE. To do this, function 
-** PR_MD_RegisterW16StdioCallbacks() is called from the .EXE.
-** The arguments are the functions defined in w16stdio.c
-** At runtime, MD_Write() calls the registered functions, if any
-** were registered.
-**
-** prinit.h contains a macro PR_STDIO_INIT() that calls the registration
-** function for Win16; For other platforms, the macro is a No-Op.
-**
-** Note that stdio is not operational at all on Win16 GUI applications.
-** This special case exists to provide stdio capability from the NSPR
-** .DLL for command line applications only. NSPR's test cases are
-** almost exclusively command line applications.
-**
-** See also: w16io.c, w16stdio.c
-*/
-typedef PRInt32 (PR_CALLBACK *PRStdinRead)( void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRStdoutWrite)( void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRStderrWrite)( void *buf, PRInt32 amount);
-
-NSPR_API(PRStatus)
-PR_MD_RegisterW16StdioCallbacks( 
-    PRStdinRead inReadf,            /* i: function pointer for stdin read       */
-    PRStdoutWrite outWritef,        /* i: function pointer for stdout write     */
-    PRStderrWrite errWritef         /* i: function pointer for stderr write     */
-    );
-
-NSPR_API(PRInt32)
-_PL_W16StdioWrite( void *buf, PRInt32 amount );
-
-NSPR_API(PRInt32)
-_PL_W16StdioRead( void *buf, PRInt32 amount );
-
-#define PR_STDIO_INIT() PR_MD_RegisterW16StdioCallbacks( \
-    _PL_W16StdioRead, _PL_W16StdioWrite, _PL_W16StdioWrite ); \
-    PR_INIT_CALLBACKS();
-
-/*
-** Win16 hackery.
-**
-*/
-struct PRMethodCallbackStr {
-    int     (PR_CALLBACK *auxOutput)(const char *outputString);
-    size_t  (PR_CALLBACK *strftime)(char *s, size_t len, const char *fmt, const struct tm *p);
-    void *  (PR_CALLBACK *malloc)( size_t size );
-    void *  (PR_CALLBACK *calloc)(size_t n, size_t size );
-    void *  (PR_CALLBACK *realloc)( void* old_blk, size_t size );
-    void    (PR_CALLBACK *free)( void *ptr );
-    void *  (PR_CALLBACK *getenv)( const char *name);
-    int     (PR_CALLBACK *putenv)( const char *assoc);
-/*    void *  (PR_CALLBACK *perror)( const char *prefix ); */
-};
-
-NSPR_API(void) PR_MDRegisterCallbacks(struct PRMethodCallbackStr *);
-
-int PR_CALLBACK _PL_W16CallBackPuts( const char *outputString );
-size_t PR_CALLBACK _PL_W16CallBackStrftime( 
-    char *s, 
-    size_t len, 
-    const char *fmt,
-    const struct tm *p );
-void * PR_CALLBACK _PL_W16CallBackMalloc( size_t size );
-void * PR_CALLBACK _PL_W16CallBackCalloc( size_t n, size_t size );
-void * PR_CALLBACK _PL_W16CallBackRealloc( 
-    void *old_blk, 
-    size_t size );
-void   PR_CALLBACK _PL_W16CallBackFree( void *ptr );
-void * PR_CALLBACK _PL_W16CallBackGetenv( const char *name );
-int PR_CALLBACK _PL_W16CallBackPutenv( const char *assoc );
-
-/*
-** Hackery! 
-**
-** These functions are provided as static link points.
-** This is to satisfy the quick port of Gromit to NSPR 2.0
-** ... Don't do this! ... alas, It may never go away.
-** 
-*/
-NSPR_API(int)     PR_MD_printf(const char *, ...);
-NSPR_API(void)    PR_MD_exit(int);
-NSPR_API(size_t)  PR_MD_strftime(char *, size_t, const char *, const struct tm *); 
-NSPR_API(int)     PR_MD_sscanf(const char *, const char *, ...);
-NSPR_API(void*)   PR_MD_malloc( size_t size );
-NSPR_API(void*)   PR_MD_calloc( size_t n, size_t size );
-NSPR_API(void*)   PR_MD_realloc( void* old_blk, size_t size );
-NSPR_API(void)    PR_MD_free( void *ptr );
-NSPR_API(char*)   PR_MD_getenv( const char *name );
-NSPR_API(int)     PR_MD_putenv( const char *assoc );
-NSPR_API(int)     PR_MD_fprintf(FILE *fPtr, const char *fmt, ...);
-
-#define PR_INIT_CALLBACKS()                         \
-    {                                               \
-        static struct PRMethodCallbackStr cbf = {   \
-            _PL_W16CallBackPuts,                    \
-            _PL_W16CallBackStrftime,                \
-            _PL_W16CallBackMalloc,                  \
-            _PL_W16CallBackCalloc,                  \
-            _PL_W16CallBackRealloc,                 \
-            _PL_W16CallBackFree,                    \
-            _PL_W16CallBackGetenv,                  \
-            _PL_W16CallBackPutenv,                  \
-        };                                          \
-        PR_MDRegisterCallbacks( &cbf );             \
-    }
-
-
-/*
-** Get the exception context for Win16 MFC applications threads
-*/
-NSPR_API(void *) PR_W16GetExceptionContext(void);
-/*
-** Set the exception context for Win16 MFC applications threads
-*/
-NSPR_API(void) PR_W16SetExceptionContext(void *context);
-
-PR_END_EXTERN_C
-#else
-/*
-** For platforms other than Win16, define
-** PR_STDIO_INIT() as a No-Op.
-*/
-#define PR_STDIO_INIT()
-#endif /* WIN16 || MOZILLA_CLIENT */
-
-#endif /* prwin16_h___ */
-
-
-
-
-
-
-
-
diff --git a/libs/js/nsprpub/pr/src/.cvsignore b/libs/js/nsprpub/pr/src/.cvsignore
deleted file mode 100644
index 41a1bd2b78..0000000000
--- a/libs/js/nsprpub/pr/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pr_bld.h
diff --git a/libs/js/nsprpub/pr/src/Makefile.in b/libs/js/nsprpub/pr/src/Makefile.in
deleted file mode 100644
index 945b14e9d7..0000000000
--- a/libs/js/nsprpub/pr/src/Makefile.in
+++ /dev/null
@@ -1,400 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = io malloc md memory misc threads
-
-# For VAC++ 4 geticcdata rule in config/OS2.mk
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-CSRCS = prvrsion.c
-endif
-
-ifeq ($(USE_PTHREADS), 1)
-	DIRS += pthreads
-endif
-
-ifeq ($(USE_BTHREADS), 1)
-	DIRS += bthreads
-endif
-
-ifeq ($(USE_CPLUS), 1)
-#	DIRS += cplus
-endif
-
-#
-# Define platform-dependent OS_LIBS
-#
-
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OS_LIBS			= -lm
-else	# 4.1.3_U1
-MAPFILE = $(OBJDIR)/nsprmap.sun
-GARBAGE += $(MAPFILE)
-ifdef NS_USE_GCC
-ifdef GCC_USE_GNU_LD
-MKSHLIB += -Wl,--version-script,$(MAPFILE)
-else
-MKSHLIB += -Wl,-M,$(MAPFILE)
-endif
-else
-MKSHLIB += -M $(MAPFILE)
-endif
-#
-# In Solaris 2.6 or earlier, -lrt is called -lposix4.
-# 
-LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
-ifeq (5.7, $(LIBRT_TEST))
-LIBRT=-lrt
-else
-LIBRT=-lposix4
-endif
-
-ifdef USE_PTHREADS
-OS_LIBS			= -lpthread -lthread ${LIBRT} -lsocket -lnsl -ldl -lc
-else
-ifdef LOCAL_THREADS_ONLY
-OS_LIBS			= -lsocket -lnsl -ldl -lc
-else
-OS_LIBS			= -lthread ${LIBRT} -lsocket -lnsl -ldl -lc
-endif	# LOCAL_THREADS_ONLY
-endif	# USE_PTHREADS
-ifeq ($(OS_TEST),sun4u)
-ifndef USE_64
-DSO_LDOPTS	+= -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so
-endif
-endif	# sun4u
-endif	# 4.1.3_U1
-endif	# SunOS
-
-ifeq ($(OS_ARCH), IRIX)
-ifeq ($(USE_PTHREADS), 1)
-OS_LIBS = -lpthread
-endif
-OS_LIBS += -lc
-endif
-
-ifeq ($(OS_ARCH),AIX)
-OS_LIBS		= -lodm -lcfg
-ifeq ($(CLASSIC_NSPR),1)
-ifeq ($(OS_RELEASE),4.1)
-OS_LIBS		+= -lsvld -lc
-else
-OS_LIBS		+= -ldl -lc
-endif
-else
-ifeq ($(OS_RELEASE),4.1)
-OS_LIBS		+= -lpthreads -lsvld -lC_r -lC -lc_r -lm /usr/lib/libc.a
-else
-OS_LIBS		+= -lpthreads -ldl -lC_r -lC -lc_r -lm /usr/lib/libc.a
-endif
-endif
-endif
-
-# On AIX, we override malloc in non-pthread versions.  On AIX 4.2 or
-# above, this requires that we use the rtl-enabled version of libc.a.
-ifeq ($(OS_ARCH),AIX)
-ifneq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
-ifneq ($(USE_PTHREADS),1)
-BUILD_AIX_RTL_LIBC = 1
-AIX_RTL_LIBC	= $(OBJDIR)/libc.a
-endif
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
-ADD_TO_DEF_FILE = cat $(srcdir)/os2extra.def >> $(MAPFILE)
-GARBAGE += $(MAPFILE)
-MKSHLIB += $(MAPFILE)
-endif
-
-ifeq ($(OS_ARCH),OSF1)
-ifeq ($(USE_PTHREADS), 1)
-OS_LIBS 	= -lpthread -lrt
-endif
-ifneq ($(OS_RELEASE),V2.0)
-OS_LIBS		+= -lc_r
-endif
-endif
-
-ifeq ($(OS_ARCH),Linux)
-ifeq ($(USE_PTHREADS), 1)
-OS_LIBS		= -lpthread -ldl
-else
-OS_LIBS		= -ldl
-endif
-endif
-
-ifeq ($(OS_ARCH),HP-UX)
-ifeq ($(USE_PTHREADS), 1)
-ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
-OS_LIBS 	= -ldce
-else
-OS_LIBS 	= -lpthread -lrt
-endif
-endif
-ifeq ($(PTHREADS_USER), 1)
-OS_LIBS 	= -lpthread
-endif
-ifeq ($(basename $(OS_RELEASE)),A.09)
-OS_LIBS		+= -ldld -L/lib/pa1.1 -lm
-else
-OS_LIBS		+= -ldld -lm -lc
-endif
-endif
-
-ifeq ($(OS_ARCH),UNIXWARE)
-OS_LIBS		= -lsocket -lc
-endif
-
-ifeq ($(OS_ARCH),NEWS-OS)
-OS_LIBS		= -lsocket -lnsl -lgen -lresolv
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef NS_USE_GCC
-OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
-else
-OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
-endif
-endif
-
-ifeq ($(OS_TARGET),MacOSX)
-OS_LIBS		= -framework CoreServices -framework CoreFoundation
-endif
-
-ifdef GC_LEAK_DETECTOR
-EXTRA_LIBS	= -L$(dist_libdir) -lboehm
-endif
-
-EXTRA_LIBS += $(OS_LIBS)
-
-#
-# Define platform-dependent OBJS
-#
-
-OBJS = \
-    $(OBJDIR)/prvrsion.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prfdcach.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prmwait.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/priometh.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prlayer.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prlog.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prmmap.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prprf.$(OBJ_SUFFIX) \
-	threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \
-    malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \
-    md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \
-    memory/$(OBJDIR)/prseg.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/pratom.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/prerror.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/prinit.$(OBJ_SUFFIX) \
-   misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/prinrval.$(OBJ_SUFFIX) \
-    misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX)	 \
-    misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX)
-
-# ilib now rejects empty objects
-ifneq ($(MOZ_OS2_TOOLS),VACPP)
-#OBJS += malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX)
-endif
-
-ifdef USE_PTHREADS
-OBJS += \
-    pthreads/$(OBJDIR)/ptsynch.$(OBJ_SUFFIX) \
-    pthreads/$(OBJDIR)/ptio.$(OBJ_SUFFIX) \
-    pthreads/$(OBJDIR)/ptthread.$(OBJ_SUFFIX) \
-    pthreads/$(OBJDIR)/ptmisc.$(OBJ_SUFFIX)
-else
-OBJS += \
-    io/$(OBJDIR)/prdir.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prfile.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prio.$(OBJ_SUFFIX) 
-
-
-ifndef USE_BTHREADS
-OBJS += \
-	threads/$(OBJDIR)/prcthr.$(OBJ_SUFFIX) \
-	threads/combined/$(OBJDIR)/prucpu.$(OBJ_SUFFIX) \
-	threads/combined/$(OBJDIR)/prucv.$(OBJ_SUFFIX) \
-	threads/combined/$(OBJDIR)/prulock.$(OBJ_SUFFIX) \
-	threads/combined/$(OBJDIR)/prustack.$(OBJ_SUFFIX) \
-	threads/combined/$(OBJDIR)/pruthr.$(OBJ_SUFFIX)
-endif
-
-endif
-
-ifeq ($(USE_CPLUS), 1)
-OBJS += \
-	cplus/$(OBJDIR)/rcbase.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rccv.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcfileio.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcinrval.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcio.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rclock.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcnetdb.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcnetio.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rcthread.$(OBJ_SUFFIX) \
-	cplus/$(OBJDIR)/rctime.$(OBJ_SUFFIX)
-endif
-
-ifdef GC_LEAK_DETECTOR
-OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX)
-endif
-
-ifeq ($(OS_ARCH), WINNT)
-ifndef USE_64
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
-endif # !USE_64
-RES=$(OBJDIR)/nspr.res
-RESNAME=nspr.rc
-endif # WINNT
-
-include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
-ifdef USE_BTHREADS
-include $(srcdir)/bthreads/objs.mk
-endif
-
-LIBRARY_NAME = nspr
-LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
-
-RELEASE_LIBS = $(TARGETS)
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(BUILD_AIX_RTL_LIBC),1)
-TARGETS		+= $(AIX_RTL_LIBC)
-# XXX is this a shared library?
-endif
-
-#
-# Version information generation (begin)
-#
-ECHO = echo
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-TINC = $(OBJDIR)/_pr_bld.h
-
-ifeq ($(OS_TARGET),OS2)
-PROD = nspr$(MOD_MAJOR_VERSION).$(DLL_SUFFIX)
-else
-PROD = $(notdir $(SHARED_LIBRARY))
-endif
-
-NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
-
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	SUF = i64
-else
-	SUF = LL
-endif
-
-DEFINES		+= -D_NSPR_BUILD_
-
-GARBAGE += $(TINC)
-
-$(TINC):
-	@$(MAKE_OBJDIR)
-	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
-	@if test ! -z "$(SH_NOW)"; then \
-	    $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
-	else \
-	    true; \
-	fi
-	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-
-
-$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-ifeq ($(MOZ_OS2_TOOLS), VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-else
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
-endif
-endif
-#
-# Version information generation (end)
-#
-
-
-#
-# The Client build wants the shared libraries in $(dist_bindir)
-# so we also install them there.
-#
-
-export:: $(TARGETS)
-	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
-ifdef SHARED_LIBRARY
-ifeq ($(OS_ARCH),HP-UX)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
-	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
-else
-	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
-endif
-endif
-ifeq ($(MOZ_BITS),16)
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
-	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
-endif
-
-ifeq ($(BUILD_AIX_RTL_LIBC),1)
-$(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
-	rtl_enable -o $@ $<
-endif
-
-
diff --git a/libs/js/nsprpub/pr/src/bthreads/.cvsignore b/libs/js/nsprpub/pr/src/bthreads/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/bthreads/Makefile.in b/libs/js/nsprpub/pr/src/bthreads/Makefile.in
deleted file mode 100644
index 285f217d6a..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-include $(srcdir)/bsrcs.mk
-CSRCS += $(BTCSRCS)
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_NSPR_BUILD_
-
-export:: $(TARGETS)
-
-
diff --git a/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk b/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk
deleted file mode 100644
index af01bb7d48..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/bsrcs.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# this file lists the source files to be compiled (used in Makefile) and
-# then enumerated as object files (in objs.mk) for inclusion in the NSPR
-# shared library
-
-BTCSRCS = \
-	btthread.c \
-	btlocks.c \
-	btcvar.c \
-	btmon.c \
-	btsem.c \
-	btmisc.c \
-	$(NULL)
diff --git a/libs/js/nsprpub/pr/src/bthreads/btcvar.c b/libs/js/nsprpub/pr/src/bthreads/btcvar.c
deleted file mode 100644
index f615bf5b3a..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btcvar.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <kernel/OS.h>
-
-#include "primpl.h"
-
-/*
-** Create a new condition variable.
-**
-** 	"lock" is the lock used to protect the condition variable.
-**
-** Condition variables are synchronization objects that threads can use
-** to wait for some condition to occur.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low. In such cases, a NULL will be returned.
-*/
-PR_IMPLEMENT(PRCondVar*)
-    PR_NewCondVar (PRLock *lock)
-{
-    PRCondVar *cv = PR_NEW( PRCondVar );
-    PR_ASSERT( NULL != lock );
-    if( NULL != cv )
-    {
-	cv->lock = lock;
-	cv->sem = create_sem(0, "CVSem");
-	cv->handshakeSem = create_sem(0, "CVHandshake");
-	cv->signalSem = create_sem( 0, "CVSignal");
-	cv->signalBenCount = 0;
-	cv->ns = cv->nw = 0;
-	PR_ASSERT( cv->sem >= B_NO_ERROR );
-	PR_ASSERT( cv->handshakeSem >= B_NO_ERROR );
-	PR_ASSERT( cv->signalSem >= B_NO_ERROR );
-    }
-    return cv;
-} /* PR_NewCondVar */
-
-/*
-** Destroy a condition variable. There must be no thread
-** waiting on the condvar. The caller is responsible for guaranteeing
-** that the condvar is no longer in use.
-**
-*/
-PR_IMPLEMENT(void)
-    PR_DestroyCondVar (PRCondVar *cvar)
-{
-    status_t result = delete_sem( cvar->sem );
-    PR_ASSERT( result == B_NO_ERROR );
-    
-    result = delete_sem( cvar->handshakeSem );
-    PR_ASSERT( result == B_NO_ERROR );
-
-    result = delete_sem( cvar->signalSem );
-    PR_ASSERT( result == B_NO_ERROR );
-
-    PR_DELETE( cvar );
-}
-
-/*
-** The thread that waits on a condition is blocked in a "waiting on
-** condition" state until another thread notifies the condition or a
-** caller specified amount of time expires. The lock associated with
-** the condition variable will be released, which must have be held
-** prior to the call to wait.
-**
-** Logically a notified thread is moved from the "waiting on condition"
-** state and made "ready." When scheduled, it will attempt to reacquire
-** the lock that it held when wait was called.
-**
-** The timeout has two well known values, PR_INTERVAL_NO_TIMEOUT and
-** PR_INTERVAL_NO_WAIT. The former value requires that a condition be
-** notified (or the thread interrupted) before it will resume from the
-** wait. If the timeout has a value of PR_INTERVAL_NO_WAIT, the effect
-** is to release the lock, possibly causing a rescheduling within the
-** runtime, then immediately attempting to reacquire the lock and resume.
-**
-** Any other value for timeout will cause the thread to be rescheduled
-** either due to explicit notification or an expired interval. The latter
-** must be determined by treating time as one part of the monitored data
-** being protected by the lock and tested explicitly for an expired
-** interval.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable or the thread was interrupted (PR_Interrupt()).
-** The particular reason can be extracted with PR_GetError().
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_WaitCondVar (PRCondVar *cvar, PRIntervalTime timeout)
-{
-    status_t err;
-    if( timeout == PR_INTERVAL_NO_WAIT ) 
-    {
-        PR_Unlock( cvar->lock );
-        PR_Lock( cvar->lock );
-        return PR_SUCCESS;
-    }
-
-    if( atomic_add( &cvar->signalBenCount, 1 ) > 0 ) 
-    {
-        if (acquire_sem(cvar->signalSem) == B_INTERRUPTED) 
-        {
-            atomic_add( &cvar->signalBenCount, -1 );
-            return PR_FAILURE;
-        }
-    }
-    cvar->nw += 1;
-    if( atomic_add( &cvar->signalBenCount, -1 ) > 1 ) 
-    {
-        release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-    }
-
-    PR_Unlock( cvar->lock );
-    if( timeout==PR_INTERVAL_NO_TIMEOUT ) 
-    {
-    	err = acquire_sem(cvar->sem);
-    } 
-    else 
-    {
-    	err = acquire_sem_etc(cvar->sem, 1, B_RELATIVE_TIMEOUT, PR_IntervalToMicroseconds(timeout) );
-    }
-
-    if( atomic_add( &cvar->signalBenCount, 1 ) > 0 ) 
-    {
-        while (acquire_sem(cvar->signalSem) == B_INTERRUPTED);
-    }
-
-    if (cvar->ns > 0)
-    {
-        release_sem_etc(cvar->handshakeSem, 1, B_DO_NOT_RESCHEDULE);
-        cvar->ns -= 1;
-    }
-    cvar->nw -= 1;
-    if( atomic_add( &cvar->signalBenCount, -1 ) > 1 ) 
-    {
-        release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-    }
-
-    PR_Lock( cvar->lock );
-    if(err!=B_NO_ERROR) 
-    {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-/*
-** Notify ONE thread that is currently waiting on 'cvar'. Which thread is
-** dependent on the implementation of the runtime. Common sense would dictate
-** that all threads waiting on a single condition have identical semantics,
-** therefore which one gets notified is not significant. 
-**
-** The calling thead must hold the lock that protects the condition, as
-** well as the invariants that are tightly bound to the condition, when
-** notify is called.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_NotifyCondVar (PRCondVar *cvar)
-{
-    status_t err ;
-    if( atomic_add( &cvar->signalBenCount, 1 ) > 0 ) 
-    {
-        if (acquire_sem(cvar->signalSem) == B_INTERRUPTED) 
-        {
-            atomic_add( &cvar->signalBenCount, -1 );
-            return PR_FAILURE;
-        }
-    }
-    if (cvar->nw > cvar->ns)
-    {
-        cvar->ns += 1;
-        release_sem_etc(cvar->sem, 1, B_DO_NOT_RESCHEDULE);
-        if( atomic_add( &cvar->signalBenCount, -1 ) > 1 ) 
-        {
-            release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-        }
-
-        while (acquire_sem(cvar->handshakeSem) == B_INTERRUPTED) 
-        {
-            err = B_INTERRUPTED; 
-        }
-    }
-    else
-    {
-        if( atomic_add( &cvar->signalBenCount, -1 ) > 1 )
-        {
-            release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-        }
-    }
-    return PR_SUCCESS; 
-}
-
-/*
-** Notify all of the threads waiting on the condition variable. The order
-** that the threads are notified is indeterminant. The lock that protects
-** the condition must be held.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_NotifyAllCondVar (PRCondVar *cvar)
-{
-    int32 handshakes;
-    status_t err = B_OK;
-
-    if( atomic_add( &cvar->signalBenCount, 1 ) > 0 ) 
-    {
-        if (acquire_sem(cvar->signalSem) == B_INTERRUPTED) 
-        {
-            atomic_add( &cvar->signalBenCount, -1 );
-            return PR_FAILURE;
-        }
-    }
-
-    if (cvar->nw > cvar->ns)
-    {
-        handshakes = cvar->nw - cvar->ns;
-        cvar->ns = cvar->nw;				
-        release_sem_etc(cvar->sem, handshakes, B_DO_NOT_RESCHEDULE);	
-        if( atomic_add( &cvar->signalBenCount, -1 ) > 1 ) 
-        {
-            release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-        }
-
-        while (acquire_sem_etc(cvar->handshakeSem, handshakes, 0, 0) == B_INTERRUPTED) 
-        {
-            err = B_INTERRUPTED; 
-        }
-    }
-    else
-    {
-        if( atomic_add( &cvar->signalBenCount, -1 ) > 1 ) 
-        {
-            release_sem_etc(cvar->signalSem, 1, B_DO_NOT_RESCHEDULE);
-        }
-    }
-    return PR_SUCCESS;
-}
diff --git a/libs/js/nsprpub/pr/src/bthreads/btlocks.c b/libs/js/nsprpub/pr/src/bthreads/btlocks.c
deleted file mode 100644
index bf8bfd474b..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btlocks.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        btlocks.c
-** Description: Implemenation for thread locks using bthreads
-** Exports:     prlock.h
-*/
-
-#include "primpl.h"
-
-#include <string.h>
-#include <sys/time.h>
-
-void
-_PR_InitLocks (void)
-{
-}
-
-PR_IMPLEMENT(PRLock*)
-    PR_NewLock (void)
-{
-    PRLock *lock;
-    status_t semresult;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    lock = PR_NEWZAP(PRLock);
-    if (lock != NULL) {
-
-	lock->benaphoreCount = 0;
-	lock->semaphoreID = create_sem( 0, "nsprLockSem" );
-	if( lock->semaphoreID < B_NO_ERROR ) {
-
-	    PR_DELETE( lock );
-	    lock = NULL;
-	}
-    }
-
-    return lock;
-}
-
-PR_IMPLEMENT(void)
-    PR_DestroyLock (PRLock* lock)
-{
-    status_t result;
-
-    PR_ASSERT(NULL != lock);
-    result = delete_sem(lock->semaphoreID);
-    PR_ASSERT(result == B_NO_ERROR);
-    PR_DELETE(lock);
-}
-
-PR_IMPLEMENT(void)
-    PR_Lock (PRLock* lock)
-{
-    PR_ASSERT(lock != NULL);
-
-    if( atomic_add( &lock->benaphoreCount, 1 ) > 0 ) {
-
-	if( acquire_sem(lock->semaphoreID ) != B_NO_ERROR ) {
-
-	    atomic_add( &lock->benaphoreCount, -1 );
-	    return;
-	}
-    }
-
-    lock->owner = find_thread( NULL );
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_Unlock (PRLock* lock)
-{
-    PR_ASSERT(lock != NULL);
-    lock->owner = NULL;
-    if( atomic_add( &lock->benaphoreCount, -1 ) > 1 ) {
-
-	release_sem_etc( lock->semaphoreID, 1, B_DO_NOT_RESCHEDULE );
-    }
-
-    return PR_SUCCESS;
-}
diff --git a/libs/js/nsprpub/pr/src/bthreads/btmisc.c b/libs/js/nsprpub/pr/src/bthreads/btmisc.c
deleted file mode 100644
index 2d678a9d14..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btmisc.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <stdio.h>
-
-// void _PR_InitCPUs(void) {PT_LOG("_PR_InitCPUs")}
-// void _MD_StartInterrupts(void) {PT_LOG("_MD_StartInterrupts")}
-
-/* this is a total hack.. */
-
-struct protoent* getprotobyname(const char* name)
-{
-    return 0;
-}
-
-struct protoent* getprotobynumber(int number)
-{
-    return 0;
-}
-
-/* this is needed by prinit for some reason */
-void
-_PR_InitStacks (void)
-{
-}
-
-/* this is needed by prinit for some reason */
-void
-_PR_InitTPD (void)
-{
-}
-
-/*
-** Create extra virtual processor threads. Generally used with MP systems.
-*/
-PR_IMPLEMENT(void)
-    PR_SetConcurrency (PRUintn numCPUs)
-{
-}
-
-/*
-** Set thread recycle mode to on (1) or off (0)
-*/
-PR_IMPLEMENT(void)
-    PR_SetThreadRecycleMode (PRUint32 flag)
-{
-}
-
-/*
-** Get context registers, return with error for now.
-*/
-
-PR_IMPLEMENT(PRWord *)
-_MD_HomeGCRegisters( PRThread *t, int isCurrent, int *np )
-{
-     return 0;
-}
-
-PR_IMPLEMENT(void *)
-PR_GetSP( PRThread *t )
-{
-    return 0;
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_EnumerateThreads( PREnumerator func, void *arg )
-{
-    return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/bthreads/btmon.c b/libs/js/nsprpub/pr/src/bthreads/btmon.c
deleted file mode 100644
index f14d1379b7..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btmon.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <kernel/OS.h>
-
-#include "primpl.h"
-
-/*
-** Create a new monitor. Monitors are re-entrant locks with a single built-in
-** condition variable.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-PR_IMPLEMENT(PRMonitor*)
-    PR_NewMonitor (void)
-{
-    PRMonitor *mon;
-    PRCondVar *cvar;
-    PRLock    *lock;
-
-    mon = PR_NEWZAP( PRMonitor );
-    if( mon )
-    {
-	lock = PR_NewLock();
-	if( !lock )
-        {
-	    PR_DELETE( mon );
-	    return( 0 );
-	}
-
-	cvar = PR_NewCondVar( lock );
-	if( !cvar )
-	{
-	    PR_DestroyLock( lock );
-	    PR_DELETE( mon );
-	    return( 0 );
-	}
-
-	mon->cvar = cvar;
-	mon->name = NULL;
-    }
-
-    return( mon );
-}
-
-PR_IMPLEMENT(PRMonitor*) PR_NewNamedMonitor(const char* name)
-{
-    PRMonitor* mon = PR_NewMonitor();
-    if( mon )
-    {
-        mon->name = name;
-    }
-    return mon;
-}
-
-/*
-** Destroy a monitor. The caller is responsible for guaranteeing that the
-** monitor is no longer in use. There must be no thread waiting on the
-** monitor's condition variable and that the lock is not held.
-**
-*/
-PR_IMPLEMENT(void)
-    PR_DestroyMonitor (PRMonitor *mon)
-{
-    PR_DestroyLock( mon->cvar->lock );
-    PR_DestroyCondVar( mon->cvar );
-    PR_DELETE( mon );
-}
-
-/*
-** Enter the lock associated with the monitor. If the calling thread currently
-** is in the monitor, the call to enter will silently succeed. In either case,
-** it will increment the entry count by one.
-*/
-PR_IMPLEMENT(void)
-    PR_EnterMonitor (PRMonitor *mon)
-{
-    if( mon->cvar->lock->owner == find_thread( NULL ) )
-    {
-	mon->entryCount++;
-
-    } else
-    {
-	PR_Lock( mon->cvar->lock );
-	mon->entryCount = 1;
-    }
-}
-
-/*
-** Decrement the entry count associated with the monitor. If the decremented
-** entry count is zero, the monitor is exited. Returns PR_FAILURE if the
-** calling thread has not entered the monitor.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_ExitMonitor (PRMonitor *mon)
-{
-    if( mon->cvar->lock->owner != find_thread( NULL ) )
-    {
-	return( PR_FAILURE );
-    }
-    if( --mon->entryCount == 0 )
-    {
-	return( PR_Unlock( mon->cvar->lock ) );
-    }
-    return( PR_SUCCESS );
-}
-
-/*
-** Wait for a notify on the monitor's condition variable. Sleep for "ticks"
-** amount of time (if "ticks" is PR_INTERVAL_NO_TIMEOUT then the sleep is
-** indefinite).
-**
-** While the thread is waiting it exits the monitor (as if it called
-** PR_ExitMonitor as many times as it had called PR_EnterMonitor).  When
-** the wait has finished the thread regains control of the monitors lock
-** with the same entry count as before the wait began.
-**
-** The thread waiting on the monitor will be resumed when the monitor is
-** notified (assuming the thread is the next in line to receive the
-** notify) or when the "ticks" timeout elapses.
-**
-** Returns PR_FAILURE if the caller has not entered the monitor.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_Wait (PRMonitor *mon, PRIntervalTime ticks)
-{
-    PRUint32 entryCount;
-    PRUintn  status;
-    PRThread *meThread;
-    thread_id me = find_thread( NULL );
-    meThread = PR_GetCurrentThread();
-
-    if( mon->cvar->lock->owner != me ) return( PR_FAILURE );
-
-    entryCount = mon->entryCount;
-    mon->entryCount = 0;
-
-    status = PR_WaitCondVar( mon->cvar, ticks );
-
-    mon->entryCount = entryCount;
-
-    return( status );
-}
-
-/*
-** Notify a thread waiting on the monitor's condition variable. If a thread
-** is waiting on the condition variable (using PR_Wait) then it is awakened
-** and attempts to reenter the monitor.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_Notify (PRMonitor *mon)
-{
-    if( mon->cvar->lock->owner != find_thread( NULL ) )
-    {
-	return( PR_FAILURE );
-    }
-
-    PR_NotifyCondVar( mon->cvar );
-    return( PR_SUCCESS );
-}
-
-/*
-** Notify all of the threads waiting on the monitor's condition variable.
-** All of threads waiting on the condition are scheduled to reenter the
-** monitor.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_NotifyAll (PRMonitor *mon)
-{
-    if( mon->cvar->lock->owner != find_thread( NULL ) )
-    {
-	return( PR_FAILURE );
-    }
-
-    PR_NotifyAllCondVar( mon->cvar );
-    return( PR_SUCCESS );
-}
-
-PR_IMPLEMENT(PRIntn)
-    PR_GetMonitorEntryCount(PRMonitor *mon)
-{
-    return( mon->entryCount );
-}
-
diff --git a/libs/js/nsprpub/pr/src/bthreads/btsem.c b/libs/js/nsprpub/pr/src/bthreads/btsem.c
deleted file mode 100644
index bce28142bc..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btsem.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <kernel/OS.h>
-
-#include "primpl.h"
-
-/*
-** Create a new semaphore object.
-*/
-PR_IMPLEMENT(PRSemaphore*)
-    PR_NewSem (PRUintn value)
-{
-	PRSemaphore *semaphore;
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	semaphore = PR_NEWZAP(PRSemaphore);
-	if (NULL != semaphore) {
-		if ((semaphore->sem = create_sem(value, "nspr_sem")) < B_NO_ERROR)
-			return NULL;
-		else 
-			return semaphore;
-	}
-	return NULL;
-}
-
-/*
-** Destroy the given semaphore object.
-**
-*/
-PR_IMPLEMENT(void)
-    PR_DestroySem (PRSemaphore *sem)
-{
-	status_t result;
-
-	PR_ASSERT(sem != NULL);
-	result = delete_sem(sem->sem);
-	PR_ASSERT(result == B_NO_ERROR);
-	PR_DELETE(sem);
-} 
-
-/*
-** Wait on a Semaphore.
-** 
-** This routine allows a calling thread to wait or proceed depending upon
-** the state of the semahore sem. The thread can proceed only if the
-** counter value of the semaphore sem is currently greater than 0. If the
-** value of semaphore sem is positive, it is decremented by one and the
-** routine returns immediately allowing the calling thread to continue. If
-** the value of semaphore sem is 0, the calling thread blocks awaiting the
-** semaphore to be released by another thread.
-** 
-** This routine can return PR_PENDING_INTERRUPT if the waiting thread 
-** has been interrupted.
-*/
-PR_IMPLEMENT(PRStatus)
-    PR_WaitSem (PRSemaphore *sem)
-{
-	PR_ASSERT(sem != NULL);
-	if (acquire_sem(sem->sem) == B_NO_ERROR)
-		return PR_SUCCESS;
-	else
-		return PR_FAILURE;
-}
-
-/*
-** This routine increments the counter value of the semaphore. If other
-** threads are blocked for the semaphore, then the scheduler will
-** determine which ONE thread will be unblocked.
-*/
-PR_IMPLEMENT(void)
-    PR_PostSem (PRSemaphore *sem)
-{
-	status_t result;
-
-	PR_ASSERT(sem != NULL);
-	result = release_sem_etc(sem->sem, 1, B_DO_NOT_RESCHEDULE);
-	PR_ASSERT(result == B_NO_ERROR);
-}
-
-/*
-** Returns the value of the semaphore referenced by sem without affecting
-** the state of the semaphore.  The value represents the semaphore value
-** at the time of the call, but may not be the actual value when the
-** caller inspects it.
-*/
-PR_IMPLEMENT(PRUintn)
-    PR_GetValueSem (PRSemaphore *sem)
-{
-	sem_info	info;
-
-	PR_ASSERT(sem != NULL);
-	get_sem_info(sem->sem, &info);
-	return info.count;
-}
diff --git a/libs/js/nsprpub/pr/src/bthreads/btthread.c b/libs/js/nsprpub/pr/src/bthreads/btthread.c
deleted file mode 100644
index 33bdfcc70e..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/btthread.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <kernel/OS.h>
-#include <support/TLS.h>
-
-#include "prlog.h"
-#include "primpl.h"
-#include "prcvar.h"
-#include "prpdce.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-/* values for PRThread.state */
-#define BT_THREAD_PRIMORD   0x01    /* this is the primordial thread */
-#define BT_THREAD_SYSTEM    0x02    /* this is a system thread */
-#define BT_THREAD_JOINABLE  0x04	/* this is a joinable thread */
-
-struct _BT_Bookeeping
-{
-    PRLock *ml;                 /* a lock to protect ourselves */
-	sem_id cleanUpSem;		/* the primoridal thread will block on this
-							   sem while waiting for the user threads */
-    PRInt32 threadCount;	/* user thred count */
-
-} bt_book = { NULL, B_ERROR, 0 };
-
-
-#define BT_TPD_LIMIT 128	/* number of TPD slots we'll provide (arbitrary) */
-
-/* these will be used to map an index returned by PR_NewThreadPrivateIndex()
-   to the corresponding beos native TLS slot number, and to the destructor
-   for that slot - note that, because it is allocated globally, this data
-   will be automatically zeroed for us when the program begins */
-static int32 tpd_beosTLSSlots[BT_TPD_LIMIT];
-static PRThreadPrivateDTOR tpd_dtors[BT_TPD_LIMIT];
-
-static vint32 tpd_slotsUsed=0;	/* number of currently-allocated TPD slots */
-static int32 tls_prThreadSlot;	/* TLS slot in which PRThread will be stored */
-
-/* this mutex will be used to synchronize access to every
-   PRThread.md.joinSem and PRThread.md.is_joining (we could
-   actually allocate one per thread, but that seems a bit excessive,
-   especially considering that there will probably be little
-   contention, PR_JoinThread() is allowed to block anyway, and the code
-   protected by the mutex is short/fast) */
-static PRLock *joinSemLock;
-
-static PRUint32 _bt_MapNSPRToNativePriority( PRThreadPriority priority );
-static PRThreadPriority _bt_MapNativeToNSPRPriority( PRUint32 priority );
-static void _bt_CleanupThread(void *arg);
-static PRThread *_bt_AttachThread();
-
-void
-_PR_InitThreads (PRThreadType type, PRThreadPriority priority,
-                 PRUintn maxPTDs)
-{
-    PRThread *primordialThread;
-    PRUint32  beThreadPriority;
-
-	/* allocate joinSem mutex */
-	joinSemLock = PR_NewLock();
-	if (joinSemLock == NULL)
-	{
-		PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-		return;
-    }
-
-    /*
-    ** Create and initialize NSPR structure for our primordial thread.
-    */
-    
-    primordialThread = PR_NEWZAP(PRThread);
-    if( NULL == primordialThread )
-    {
-        PR_SetError( PR_OUT_OF_MEMORY_ERROR, 0 );
-        return;
-    }
-
-	primordialThread->md.joinSem = B_ERROR;
-
-    /*
-    ** Set the priority to the desired level.
-    */
-
-    beThreadPriority = _bt_MapNSPRToNativePriority( priority );
-    
-    set_thread_priority( find_thread( NULL ), beThreadPriority );
-    
-    primordialThread->priority = priority;
-
-
-	/* set the thread's state - note that the thread is not joinable */
-    primordialThread->state |= BT_THREAD_PRIMORD;
-	if (type == PR_SYSTEM_THREAD)
-		primordialThread->state |= BT_THREAD_SYSTEM;
-
-    /*
-    ** Allocate a TLS slot for the PRThread structure (just using
-    ** native TLS, as opposed to NSPR TPD, will make PR_GetCurrentThread()
-    ** somewhat faster, and will leave one more TPD slot for our client)
-    */
-	
-	tls_prThreadSlot = tls_allocate();
-
-    /*
-    ** Stuff our new PRThread structure into our thread specific
-    ** slot.
-    */
-
-	tls_set(tls_prThreadSlot, primordialThread);
-    
-	/* allocate lock for bt_book */
-    bt_book.ml = PR_NewLock();
-    if( NULL == bt_book.ml )
-    {
-    	PR_SetError( PR_OUT_OF_MEMORY_ERROR, 0 );
-	return;
-    }
-}
-
-PRUint32
-_bt_MapNSPRToNativePriority( PRThreadPriority priority )
-    {
-    switch( priority )
-    {
-    	case PR_PRIORITY_LOW:	 return( B_LOW_PRIORITY );
-	case PR_PRIORITY_NORMAL: return( B_NORMAL_PRIORITY );
-	case PR_PRIORITY_HIGH:	 return( B_DISPLAY_PRIORITY );
-	case PR_PRIORITY_URGENT: return( B_URGENT_DISPLAY_PRIORITY );
-	default:		 return( B_NORMAL_PRIORITY );
-    }
-}
-
-PRThreadPriority
-_bt_MapNativeToNSPRPriority(PRUint32 priority)
-    {
-	if (priority < B_NORMAL_PRIORITY)
-		return PR_PRIORITY_LOW;
-	if (priority < B_DISPLAY_PRIORITY)
-		return PR_PRIORITY_NORMAL;
-	if (priority < B_URGENT_DISPLAY_PRIORITY)
-		return PR_PRIORITY_HIGH;
-	return PR_PRIORITY_URGENT;
-}
-
-PRUint32
-_bt_mapNativeToNSPRPriority( int32 priority )
-{
-    switch( priority )
-    {
-    	case PR_PRIORITY_LOW:	 return( B_LOW_PRIORITY );
-	case PR_PRIORITY_NORMAL: return( B_NORMAL_PRIORITY );
-	case PR_PRIORITY_HIGH:	 return( B_DISPLAY_PRIORITY );
-	case PR_PRIORITY_URGENT: return( B_URGENT_DISPLAY_PRIORITY );
-	default:		 return( B_NORMAL_PRIORITY );
-    }
-}
-
-/* This method is called by all NSPR threads as they exit */
-void _bt_CleanupThread(void *arg)
-{
-	PRThread *me = PR_GetCurrentThread();
-	int32 i;
-
-	/* first, clean up all thread-private data */
-	for (i = 0; i < tpd_slotsUsed; i++)
-	{
-		void *oldValue = tls_get(tpd_beosTLSSlots[i]);
-		if ( oldValue != NULL && tpd_dtors[i] != NULL )
-			(*tpd_dtors[i])(oldValue);
-	}
-
-	/* if this thread is joinable, wait for someone to join it */
-	if (me->state & BT_THREAD_JOINABLE)
-	{
-		/* protect access to our joinSem */
-		PR_Lock(joinSemLock);
-
-		if (me->md.is_joining)
-		{
-			/* someone is already waiting to join us (they've
-			   allocated a joinSem for us) - let them know we're
-			   ready */
-			delete_sem(me->md.joinSem);
-
-			PR_Unlock(joinSemLock);
-
-		}
-		else
-    {
-			/* noone is currently waiting for our demise - it
-			   is our responsibility to allocate the joinSem
-			   and block on it */
-			me->md.joinSem = create_sem(0, "join sem");
-
-			/* we're done accessing our joinSem */
-			PR_Unlock(joinSemLock);
-
-			/* wait for someone to join us */
-			while (acquire_sem(me->md.joinSem) == B_INTERRUPTED);
-	    }
-	}
-
-	/* if this is a user thread, we must update our books */
-	if ((me->state & BT_THREAD_SYSTEM) == 0)
-	{
-		/* synchronize access to bt_book */
-    PR_Lock( bt_book.ml );
-
-		/* decrement the number of currently-alive user threads */
-	bt_book.threadCount--;
-
-		if (bt_book.threadCount == 0 && bt_book.cleanUpSem != B_ERROR) {
-			/* we are the last user thread, and the primordial thread is
-			   blocked in PR_Cleanup() waiting for us to finish - notify
-			   it */
-			delete_sem(bt_book.cleanUpSem);
-	}
-
-    PR_Unlock( bt_book.ml );
-	}
-
-	/* finally, delete this thread's PRThread */
-	PR_DELETE(me);
-}
-
-/**
- * This is a wrapper that all threads invoke that allows us to set some
- * things up prior to a thread's invocation and clean up after a thread has
- * exited.
- */
-static void*
-_bt_root (void* arg)
-	{
-    PRThread *thred = (PRThread*)arg;
-    PRIntn rv;
-    void *privData;
-    status_t result;
-    int i;
-
-	/* save our PRThread object into our TLS */
-	tls_set(tls_prThreadSlot, thred);
-
-    thred->startFunc(thred->arg);  /* run the dang thing */
-
-	/* clean up */
-	_bt_CleanupThread(NULL);
-
-	return 0;
-}
-
-PR_IMPLEMENT(PRThread*)
-    PR_CreateThread (PRThreadType type, void (*start)(void* arg), void* arg,
-                     PRThreadPriority priority, PRThreadScope scope,
-                     PRThreadState state, PRUint32 stackSize)
-{
-    PRUint32 bePriority;
-
-    PRThread* thred;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	thred = PR_NEWZAP(PRThread);
- 	if (thred == NULL)
-	{
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-
-    thred->md.joinSem = B_ERROR;
-
-        thred->arg = arg;
-        thred->startFunc = start;
-        thred->priority = priority;
-
-	if( state == PR_JOINABLE_THREAD )
-	{
-	    thred->state |= BT_THREAD_JOINABLE;
-	}
-
-        /* keep some books */
-
-	PR_Lock( bt_book.ml );
-
-	if (type == PR_USER_THREAD)
-	{
-	    bt_book.threadCount++;
-        }
-
-	PR_Unlock( bt_book.ml );
-
-	bePriority = _bt_MapNSPRToNativePriority( priority );
-
-        thred->md.tid = spawn_thread((thread_func)_bt_root, "moz-thread",
-                                     bePriority, thred);
-        if (thred->md.tid < B_OK) {
-            PR_SetError(PR_UNKNOWN_ERROR, thred->md.tid);
-            PR_DELETE(thred);
-			return NULL;
-        }
-
-        if (resume_thread(thred->md.tid) < B_OK) {
-            PR_SetError(PR_UNKNOWN_ERROR, 0);
-            PR_DELETE(thred);
-			return NULL;
-        }
-
-    return thred;
-    }
-
-PR_IMPLEMENT(PRThread*)
-	PR_AttachThread(PRThreadType type, PRThreadPriority priority,
-					PRThreadStack *stack)
-{
-	/* PR_GetCurrentThread() will attach a thread if necessary */
-	return PR_GetCurrentThread();
-}
-
-PR_IMPLEMENT(void)
-	PR_DetachThread()
-{
-	/* we don't support detaching */
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_JoinThread (PRThread* thred)
-{
-    status_t eval, status;
-
-    PR_ASSERT(thred != NULL);
-
-	if ((thred->state & BT_THREAD_JOINABLE) == 0)
-    {
-	PR_SetError( PR_INVALID_ARGUMENT_ERROR, 0 );
-	return( PR_FAILURE );
-    }
-
-	/* synchronize access to the thread's joinSem */
-	PR_Lock(joinSemLock);
-	
-	if (thred->md.is_joining)
-	{
-		/* another thread is already waiting to join the specified
-		   thread - we must fail */
-		PR_Unlock(joinSemLock);
-		return PR_FAILURE;
-	}
-
-	/* let others know we are waiting to join */
-	thred->md.is_joining = PR_TRUE;
-
-	if (thred->md.joinSem == B_ERROR)
-	{
-		/* the thread hasn't finished yet - it is our responsibility to
-		   allocate a joinSem and wait on it */
-		thred->md.joinSem = create_sem(0, "join sem");
-
-		/* we're done changing the joinSem now */
-		PR_Unlock(joinSemLock);
-
-		/* wait for the thread to finish */
-		while (acquire_sem(thred->md.joinSem) == B_INTERRUPTED);
-
-	}
-	else
-	{
-		/* the thread has already finished, and has allocated the
-		   joinSem itself - let it know it can finally die */
-		delete_sem(thred->md.joinSem);
-		
-		PR_Unlock(joinSemLock);
-    }
-
-	/* make sure the thread is dead */
-    wait_for_thread(thred->md.tid, &eval);
-
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRThread*)
-    PR_GetCurrentThread ()
-{
-    PRThread* thred;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    thred = (PRThread *)tls_get( tls_prThreadSlot);
-	if (thred == NULL)
-	{
-		/* this thread doesn't have a PRThread structure (it must be
-		   a native thread not created by the NSPR) - assimilate it */
-		thred = _bt_AttachThread();
-	}
-    PR_ASSERT(NULL != thred);
-
-    return thred;
-}
-
-PR_IMPLEMENT(PRThreadScope)
-    PR_GetThreadScope (const PRThread* thred)
-{
-    PR_ASSERT(thred != NULL);
-    return PR_GLOBAL_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadType)
-    PR_GetThreadType (const PRThread* thred)
-{
-    PR_ASSERT(thred != NULL);
-    return (thred->state & BT_THREAD_SYSTEM) ?
-        PR_SYSTEM_THREAD : PR_USER_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadState)
-    PR_GetThreadState (const PRThread* thred)
-{
-    PR_ASSERT(thred != NULL);
-    return (thred->state & BT_THREAD_JOINABLE)?
-    					PR_JOINABLE_THREAD: PR_UNJOINABLE_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadPriority)
-    PR_GetThreadPriority (const PRThread* thred)
-{
-    PR_ASSERT(thred != NULL);
-    return thred->priority;
-}  /* PR_GetThreadPriority */
-
-PR_IMPLEMENT(void) PR_SetThreadPriority(PRThread *thred,
-                                        PRThreadPriority newPri)
-{
-    PRUint32 bePriority;
-
-    PR_ASSERT( thred != NULL );
-
-    thred->priority = newPri;
-    bePriority = _bt_MapNSPRToNativePriority( newPri );
-    set_thread_priority( thred->md.tid, bePriority );
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_NewThreadPrivateIndex (PRUintn* newIndex,
-                              PRThreadPrivateDTOR destructor)
-{
-	int32    index;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	/* reserve the next available tpd slot */
-	index = atomic_add( &tpd_slotsUsed, 1 );
-	if (index >= BT_TPD_LIMIT)
-	{
-		/* no slots left - decrement value, then fail */
-		atomic_add( &tpd_slotsUsed, -1 );
-		PR_SetError( PR_TPD_RANGE_ERROR, 0 );
-	    return( PR_FAILURE );
-	}
-
-	/* allocate a beos-native TLS slot for this index (the new slot
-	   automatically contains NULL) */
-	tpd_beosTLSSlots[index] = tls_allocate();
-
-	/* remember the destructor */
-	tpd_dtors[index] = destructor;
-
-    *newIndex = (PRUintn)index;
-
-    return( PR_SUCCESS );
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_SetThreadPrivate (PRUintn index, void* priv)
-{
-	void *oldValue;
-
-    /*
-    ** Sanity checking
-    */
-
-    if(index < 0 || index >= tpd_slotsUsed || index >= BT_TPD_LIMIT)
-    {
-		PR_SetError( PR_TPD_RANGE_ERROR, 0 );
-	return( PR_FAILURE );
-    }
-
-	/* if the old value isn't NULL, and the dtor for this slot isn't
-	   NULL, we must destroy the data */
-	oldValue = tls_get(tpd_beosTLSSlots[index]);
-	if (oldValue != NULL && tpd_dtors[index] != NULL)
-		(*tpd_dtors[index])(oldValue);
-
-	/* save new value */
-	tls_set(tpd_beosTLSSlots[index], priv);
-
-	    return( PR_SUCCESS );
-	}
-
-PR_IMPLEMENT(void*)
-    PR_GetThreadPrivate (PRUintn index)
-{
-	/* make sure the index is valid */
-	if (index < 0 || index >= tpd_slotsUsed || index >= BT_TPD_LIMIT)
-    {   
-		PR_SetError( PR_TPD_RANGE_ERROR, 0 );
-		return NULL;
-    }
-
-	/* return the value */
-	return tls_get( tpd_beosTLSSlots[index] );
-	}
-
-
-PR_IMPLEMENT(PRStatus)
-    PR_Interrupt (PRThread* thred)
-{
-    PRIntn rv;
-
-    PR_ASSERT(thred != NULL);
-
-    /*
-    ** there seems to be a bug in beos R5 in which calling
-    ** resume_thread() on a blocked thread returns B_OK instead
-    ** of B_BAD_THREAD_STATE (beos bug #20000422-19095).  as such,
-    ** to interrupt a thread, we will simply suspend then resume it
-    ** (no longer call resume_thread(), check for B_BAD_THREAD_STATE,
-    ** the suspend/resume to wake up a blocked thread).  this wakes
-    ** up blocked threads properly, and doesn't hurt unblocked threads
-    ** (they simply get stopped then re-started immediately)
-    */
-
-    rv = suspend_thread( thred->md.tid );
-    if( rv != B_NO_ERROR )
-    {
-        /* this doesn't appear to be a valid thread_id */
-        PR_SetError( PR_UNKNOWN_ERROR, rv );
-        return PR_FAILURE;
-    }
-
-    rv = resume_thread( thred->md.tid );
-    if( rv != B_NO_ERROR )
-    {
-        PR_SetError( PR_UNKNOWN_ERROR, rv );
-        return PR_FAILURE;
-    }
-
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(void)
-    PR_ClearInterrupt ()
-{
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_Yield ()
-{
-    /* we just sleep for long enough to cause a reschedule (100
-       microseconds) */
-    snooze(100);
-}
-
-#define BT_MILLION 1000000UL
-
-PR_IMPLEMENT(PRStatus)
-    PR_Sleep (PRIntervalTime ticks)
-{
-    bigtime_t tps;
-    status_t status;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    tps = PR_IntervalToMicroseconds( ticks );
-
-    status = snooze(tps);
-    if (status == B_NO_ERROR) return PR_SUCCESS;
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, status);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-    PR_Cleanup ()
-{
-    PRThread *me = PR_GetCurrentThread();
-
-    PR_ASSERT(me->state & BT_THREAD_PRIMORD);
-    if ((me->state & BT_THREAD_PRIMORD) == 0) {
-        return PR_FAILURE;
-    }
-
-    PR_Lock( bt_book.ml );
-
-	if (bt_book.threadCount != 0)
-    {
-		/* we'll have to wait for some threads to finish - create a
-		   sem to block on */
-		bt_book.cleanUpSem = create_sem(0, "cleanup sem");
-    }
-
-    PR_Unlock( bt_book.ml );
-
-	/* note that, if all the user threads were already dead, we
-	   wouldn't have created a sem above, so this acquire_sem()
-	   will fail immediately */
-	while (acquire_sem(bt_book.cleanUpSem) == B_INTERRUPTED);
-
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(void)
-    PR_ProcessExit (PRIntn status)
-{
-    exit(status);
-}
-
-PRThread *_bt_AttachThread()
-{
-	PRThread *thread;
-	thread_info tInfo;
-
-	/* make sure this thread doesn't already have a PRThread structure */
-	PR_ASSERT(tls_get(tls_prThreadSlot) == NULL);
-
-	/* allocate a PRThread structure for this thread */
-	thread = PR_NEWZAP(PRThread);
-	if (thread == NULL)
-	{
-		PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-		return NULL;
-	}
-
-	/* get the native thread's current state */
-	get_thread_info(find_thread(NULL), &tInfo);
-
-	/* initialize new PRThread */
-	thread->md.tid = tInfo.thread;
-	thread->md.joinSem = B_ERROR;
-	thread->priority = _bt_MapNativeToNSPRPriority(tInfo.priority);
-
-	/* attached threads are always non-joinable user threads */
-	thread->state = 0;
-
-	/* increment user thread count */
-	PR_Lock(bt_book.ml);
-	bt_book.threadCount++;
-	PR_Unlock(bt_book.ml);
-
-	/* store this thread's PRThread */
-	tls_set(tls_prThreadSlot, thread);
-	
-	/* the thread must call _bt_CleanupThread() before it dies, in order
-	   to clean up its PRThread, synchronize with the primordial thread,
-	   etc. */
-	on_exit_thread(_bt_CleanupThread, NULL);
-	
-	return thread;
-}
diff --git a/libs/js/nsprpub/pr/src/bthreads/objs.mk b/libs/js/nsprpub/pr/src/bthreads/objs.mk
deleted file mode 100644
index 60455a3768..0000000000
--- a/libs/js/nsprpub/pr/src/bthreads/objs.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# This makefile appends to the variable OBJS the bthread object modules
-# that will be part of the nspr20 library.
-
-include $(srcdir)/bthreads/bsrcs.mk
-
-OBJS += $(BTCSRCS:%.c=bthreads/$(OBJDIR)/%.$(OBJ_SUFFIX))
diff --git a/libs/js/nsprpub/pr/src/cplus/.cvsignore b/libs/js/nsprpub/pr/src/cplus/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/cplus/Makefile.in b/libs/js/nsprpub/pr/src/cplus/Makefile.in
deleted file mode 100644
index 46e62e75f6..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-CXXSRCS =           \
-	rcbase.cpp      \
-	rccv.cpp		\
-	rcfileio.cpp    \
-	rcinrval.cpp	\
-	rcio.cpp	    \
-	rclock.cpp	    \
-	rcnetdb.cpp	    \
-	rcnetio.cpp	    \
-	rcthread.cpp	\
-	rctime.cpp      \
-	$(NULL)
-
-OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir)
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-HEADERS = $(wildcard $(srcdir)/*.h)
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rcascii.h b/libs/js/nsprpub/pr/src/cplus/rcascii.h
deleted file mode 100644
index 8476fc49e9..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcascii.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class definitions to format ASCII data.
-*/
-
-#if defined(_RCASCII_H)
-#else
-#define _RCASCII_H
-
-/*
-** RCFormatStuff
-**  This class maintains no state - that is the responsibility of
-**  the class' client. For each call to Sx_printf(), the StuffFunction
-**  will be called for each embedded "%" in the 'fmt' string and once
-**  for each interveaning literal.
-*/
-class PR_IMPLEMENT(RCFormatStuff)
-{
-public:
-    RCFormatStuff();
-    virtual ~RCFormatStuff();
-
-    /*
-    ** Process the arbitrary argument list using as indicated by
-    ** the 'fmt' string. Each segment of the processing the stuff
-    ** function is called with the relavent translation.
-    */
-    virtual PRInt32 Sx_printf(void *state, const char *fmt, ...);
-
-    /*
-    ** The 'state' argument is not processed by the runtime. It
-    ** is merely passed from the Sx_printf() call. It is intended
-    ** to be used by the client to figure out what to do with the
-    ** new string.
-    **
-    ** The new string ('stuff') is ASCII translation driven by the
-    ** Sx_printf()'s 'fmt' string. It is not guaranteed to be a null
-    ** terminated string.
-    **
-    ** The return value is the number of bytes copied from the 'stuff'
-    ** string. It is accumulated for each of the calls to the stuff
-    ** function and returned from the original caller of Sx_printf().
-    */
-    virtual PRSize StuffFunction(
-        void *state, const char *stuff, PRSize stufflen) = 0;
-};  /* RCFormatStuff */
-
-
-/*
-** RCFormatBuffer
-**  The caller is supplying the buffer, the runtime is doing all
-**  the conversion. The object contains no state, so is reusable
-**  and reentrant.
-*/
-class PR_IMPLEMENT(RCFormatBuffer): public RCFormatStuff
-{
-public:
-    RCFormatBuffer();
-    virtual ~RCFormatBuffer();
-
-    /*
-    ** Format the trailing arguments as indicated by the 'fmt'
-    ** string. Put the result in 'buffer'. Return the number
-    ** of bytes moved into 'buffer'. 'buffer' will always be
-    ** a properly terminated string even if the convresion fails.
-    */
-    virtual PRSize Sn_printf(
-        char *buffer, PRSize length, const char *fmt, ...);
-
-    virtual char *Sm_append(char *buffer, const char *fmt, ...);
-
-private:
-    /*
-    ** This class overrides the stuff function, does not preserve
-    ** its virtual-ness and no longer allows the clients to call
-    ** it in the clear. In other words, it is now the implementation
-    ** for this class.
-    */
-    PRSize StuffFunction(void*, const char*, PRSize);
-        
-};  /* RCFormatBuffer */
-
-/*
-** RCFormat
-**  The runtime is supplying the buffer. The object has state - the
-**  buffer. Each operation must run to completion before the object
-**  can be reused. When it is, the buffer is reset (whatever that
-**  means). The result of a conversion is available via the extractor.
-**  After extracted, the memory still belongs to the class - if the
-**  caller wants to retain or modify, it must first be copied.
-*/
-class PR_IMPLEMENT(RCFormat): pubic RCFormatBuffer
-{
-public:
-    RCFormat();
-    virtual ~RCFormat();
-
-    /*
-    ** Translate the trailing arguments according to the 'fmt'
-    ** string and store the results in the object.
-    */
-    virtual PRSize Sm_printf(const char *fmt, ...);
-
-    /*
-    ** Extract the latest translation.
-    ** The object does not surrender the memory occupied by
-    ** the string. If the caller wishes to modify the data,
-    ** it must first be copied.
-    */
-    const char*();
-
-private:
-    char *buffer;
-
-    RCFormat(const RCFormat&);
-    RCFormat& operator=(const RCFormat&);
-}; /* RCFormat */
-
-/*
-** RCPrint
-**  The output is formatted and then written to an associated file
-**  descriptor. The client can provide a suitable file descriptor
-**  or can indicate that the output should be directed to one of
-**  the well-known "console" devices.
-*/
-class PR_IMPLEMENT(RCPrint): public RCFormat
-{
-    virtual ~RCPrint();
-    RCPrint(RCIO* output);
-    RCPrint(RCFileIO::SpecialFile output);
-
-    virtual PRSize Printf(const char *fmt, ...);
-private:
-    RCPrint();
-};  /* RCPrint */
-
-#endif /* defined(_RCASCII_H) */
-
-/* RCAscii.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcbase.cpp b/libs/js/nsprpub/pr/src/cplus/rcbase.cpp
deleted file mode 100644
index 84662d9ae4..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcbase.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** RCBase.cpp - Mixin class for NSPR C++ wrappers
-*/
-
-#include "rcbase.h"
-
-RCBase::~RCBase() { }
-
-PRSize RCBase::GetErrorTextLength() { return PR_GetErrorTextLength(); }
-PRSize RCBase::CopyErrorText(char *text) { return PR_GetErrorText(text); }
-
-void RCBase::SetError(PRErrorCode error, PRInt32 oserror)
-    { PR_SetError(error, oserror); }
-
-void RCBase::SetErrorText(PRSize text_length, const char *text)
-    { PR_SetErrorText(text_length, text); }
-
-/* rcbase.cpp */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcbase.h b/libs/js/nsprpub/pr/src/cplus/rcbase.h
deleted file mode 100644
index 0910a15828..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcbase.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** RCBase.h - Mixin class for NSPR C++ wrappers
-*/
-
-#if defined(_RCRUNTIME_H)
-#else
-#define _RCRUNTIME_H
-
-#include <prerror.h>
-
-/*
-** Class: RCBase (mixin)
-**
-** Generally mixed into every base class. The functions in this class are all
-** static. Therefore this entire class is just syntatic sugar. It gives the
-** illusion that errors (in particular) are retrieved via the same object
-** that just reported a failure. It also (unfortunately) might lead one to
-** believe that the errors are persistent in that object. They're not.
-*/
-
-class PR_IMPLEMENT(RCBase)
-{
-public:
-    virtual ~RCBase();
-
-    static void AbortSelf();
-
-    static PRErrorCode GetError();
-    static PRInt32 GetOSError();
-
-    static PRSize GetErrorTextLength();
-    static PRSize CopyErrorText(char *text);
-
-    static void SetError(PRErrorCode error, PRInt32 oserror);
-    static void SetErrorText(PRSize textLength, const char *text);
-
-protected:
-    RCBase() { }
-};  /* RCObject */
-
-inline PRErrorCode RCBase::GetError() { return PR_GetError(); }
-inline PRInt32 RCBase::GetOSError() { return PR_GetOSError(); }
-
-#endif  /* defined(_RCRUNTIME_H) */
-
-/* rcbase.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rccv.cpp b/libs/js/nsprpub/pr/src/cplus/rccv.cpp
deleted file mode 100644
index 5e03ae75d1..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rccv.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** RCCondition - C++ wrapper around NSPR's PRCondVar
-*/
-
-#include "rccv.h"
-
-#include <prlog.h>
-#include <prerror.h>
-#include <prcvar.h>
-
-RCCondition::RCCondition(class RCLock *lock): RCBase()
-{
-    cv = PR_NewCondVar(lock->lock);
-    PR_ASSERT(NULL != cv);
-    timeout = PR_INTERVAL_NO_TIMEOUT;
-}  /* RCCondition::RCCondition */
-
-RCCondition::~RCCondition()
-{
-    if (NULL != cv) PR_DestroyCondVar(cv);
-}  /* RCCondition::~RCCondition */
-
-PRStatus RCCondition::Wait()
-{
-    PRStatus rv;
-    PR_ASSERT(NULL != cv);
-    if (NULL == cv)
-    {
-        SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        rv = PR_FAILURE;
-    }
-    else
-        rv = PR_WaitCondVar(cv, timeout.interval);
-    return rv;
-}  /* RCCondition::Wait */
-
-PRStatus RCCondition::Notify()
-{
-    return PR_NotifyCondVar(cv);
-}  /* RCCondition::Notify */
-
-PRStatus RCCondition::Broadcast()
-{
-    return PR_NotifyAllCondVar(cv);
-}  /* RCCondition::Broadcast */
-
-PRStatus RCCondition::SetTimeout(const RCInterval& tmo)
-{
-    if (NULL == cv)
-    {
-        SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    timeout = tmo;
-    return PR_SUCCESS;
-}  /* RCCondition::SetTimeout */
-
-RCInterval RCCondition::GetTimeout() const { return timeout; }
-
-/* rccv.cpp */
diff --git a/libs/js/nsprpub/pr/src/cplus/rccv.h b/libs/js/nsprpub/pr/src/cplus/rccv.h
deleted file mode 100644
index 56923af1d4..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rccv.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** RCCondition - C++ wrapper around NSPR's PRCondVar
-**
-** Conditions have a notion of timeouts. A thread that waits on a condition
-** will resume execution when the condition is notified OR when a specified
-** interval of time has expired.
-**
-** Most applications don't adjust the timeouts on conditions. The literature
-** would argue that all threads waiting on a single condition must have the
-** same semantics. But if an application wishes to modify the timeout with
-** (perhaps) each wait call, that modification should be done consistantly
-** and under protection of the condition's associated lock.
-**
-** The default timeout is infinity.
-*/
-
-#if defined(_RCCOND_H)
-#else
-#define _RCCOND_H
-
-#include "rclock.h"
-#include "rcbase.h"
-#include "rcinrval.h"
-
-struct PRCondVar;
-
-class PR_IMPLEMENT(RCCondition): public RCBase
-{
-public:
-    RCCondition(RCLock*);           /* associates CV with a lock and infinite tmo */
-    virtual ~RCCondition();
-
-    virtual PRStatus Wait();        /* applies object's current timeout */
-
-    virtual PRStatus Notify();      /* perhaps ready one thread */
-    virtual PRStatus Broadcast();   /* perhaps ready many threads */
-
-    virtual PRStatus SetTimeout(const RCInterval&);
-                                    /* set object's current timeout value */
-
-private:
-    PRCondVar *cv;
-    RCInterval timeout;
-
-    RCCondition();
-    RCCondition(const RCCondition&);
-    void operator=(const RCCondition&);
-
-public:
-    RCInterval GetTimeout() const;
-};  /* RCCondition */
-
-inline RCCondition::RCCondition(): RCBase() { }
-inline RCCondition::RCCondition(const RCCondition&): RCBase() { }
-inline void RCCondition::operator=(const RCCondition&) { }
-
-#endif /* defined(_RCCOND_H) */
-
-/* RCCond.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp b/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp
deleted file mode 100644
index 7646c89401..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcfileio.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class implementation for normal and special file I/O (ref: prio.h)
-*/
-
-#include "rcfileio.h"
-
-#include <string.h>
-
-RCFileIO::RCFileIO(): RCIO(RCIO::file) { }
-
-RCFileIO::~RCFileIO() { if (NULL != fd) (void)Close(); }
-
-PRInt64 RCFileIO::Available()
-    { return fd->methods->available(fd); }
-
-PRStatus RCFileIO::Close()
-    { PRStatus rv = fd->methods->close(fd); fd = NULL; return rv; }
-
-PRStatus RCFileIO::Delete(const char* filename) { return PR_Delete(filename); }
-
-PRStatus RCFileIO::FileInfo(RCFileInfo* info) const
-    { return fd->methods->fileInfo64(fd, &info->info); }
-
-PRStatus RCFileIO::FileInfo(const char *name, RCFileInfo* info)
-    { return PR_GetFileInfo64(name, &info->info); }
-
-PRStatus RCFileIO::Fsync()
-    { return fd->methods->fsync(fd); }
-
-PRStatus RCFileIO::Open(const char *filename, PRIntn flags, PRIntn mode)
-{
-    fd = PR_Open(filename, flags, mode);
-    return (NULL == fd) ? PR_FAILURE : PR_SUCCESS;
-}  /* RCFileIO::Open */
-
-PRInt32 RCFileIO::Read(void *buf, PRSize amount)
-    { return fd->methods->read(fd, buf, amount); }
-
-PRInt64 RCFileIO::Seek(PRInt64 offset, RCIO::Whence how)
-{
-    PRSeekWhence whence;
-    switch (how)
-    {
-        case RCFileIO::set: whence = PR_SEEK_SET; break;
-        case RCFileIO::current: whence = PR_SEEK_CUR; break;
-        case RCFileIO::end: whence = PR_SEEK_END; break;
-        default: whence = (PRSeekWhence)-1;
-    }
-    return fd->methods->seek64(fd, offset, whence);
-}  /* RCFileIO::Seek */
-
-PRInt32 RCFileIO::Write(const void *buf, PRSize amount)
-    { return fd->methods->write(fd, buf, amount); }
-
-PRInt32 RCFileIO::Writev(
-    const PRIOVec *iov, PRSize size, const RCInterval& timeout)
-    { return fd->methods->writev(fd, iov, size, timeout); }
-
-RCIO *RCFileIO::GetSpecialFile(RCFileIO::SpecialFile special)
-{
-    PRFileDesc* fd;
-    PRSpecialFD which;
-    RCFileIO* spec = NULL;
-
-    switch (special)
-    {
-        case RCFileIO::input: which = PR_StandardInput; break;
-        case RCFileIO::output: which = PR_StandardOutput; break;
-        case RCFileIO::error: which = PR_StandardError; break;
-        default: which = (PRSpecialFD)-1;
-    }
-    fd = PR_GetSpecialFD(which);
-    if (NULL != fd)
-    {
-        spec = new RCFileIO();
-        if (NULL != spec) spec->fd = fd;
-    }
-    return spec;
-}  /* RCFileIO::GetSpecialFile */
-
-
-/*
-** The following methods have been made non-virtual and private. These
-** default implementations are intended to NEVER be called. They
-** are not valid for this type of I/O class (normal and special file).
-*/
-PRStatus RCFileIO::Connect(const RCNetAddr&, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCFileIO::GetLocalName(RCNetAddr*) const
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCFileIO::GetPeerName(RCNetAddr*) const
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCFileIO::GetSocketOption(PRSocketOptionData*) const
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCFileIO::Listen(PRIntn)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRInt16 RCFileIO::Poll(PRInt16, PRInt16*)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return 0; }
-
-PRInt32 RCFileIO::Recv(void*, PRSize, PRIntn, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-PRInt32 RCFileIO::Recvfrom(void*, PRSize, PRIntn, RCNetAddr*, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-PRInt32 RCFileIO::Send(
-    const void*, PRSize, PRIntn, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-PRInt32 RCFileIO::Sendto(
-    const void*, PRSize, PRIntn, const RCNetAddr&, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-RCIO* RCFileIO::Accept(RCNetAddr*, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return NULL; }
-
-PRStatus RCFileIO::Bind(const RCNetAddr&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRInt32 RCFileIO::AcceptRead(
-    RCIO**, RCNetAddr**, void*, PRSize, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-PRStatus RCFileIO::SetSocketOption(const PRSocketOptionData*)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCFileIO::Shutdown(RCIO::ShutdownHow)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRInt32 RCFileIO::TransmitFile(
-    RCIO*, const void*, PRSize, RCIO::FileDisposition, const RCInterval&)
-{ PR_SetError(PR_INVALID_METHOD_ERROR, 0); return -1; }
-
-/*
-** Class implementation for file information object (ref: prio.h)
-*/
-
-RCFileInfo::~RCFileInfo() { }
-
-RCFileInfo::RCFileInfo(const RCFileInfo& her): RCBase()
-    { info = her.info; }  /* RCFileInfo::RCFileInfo */
-
-RCTime RCFileInfo::CreationTime() const { return RCTime(info.creationTime); }
-
-RCTime RCFileInfo::ModifyTime() const { return RCTime(info.modifyTime); }
-
-RCFileInfo::FileType RCFileInfo::Type() const
-{
-    RCFileInfo::FileType type;
-    switch (info.type)
-    {
-        case PR_FILE_FILE: type = RCFileInfo::file; break;
-        case PR_FILE_DIRECTORY: type = RCFileInfo::directory; break;
-        default: type = RCFileInfo::other;
-    }
-    return type;
-}  /* RCFileInfo::Type */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcfileio.h b/libs/js/nsprpub/pr/src/cplus/rcfileio.h
deleted file mode 100644
index 576b37dffe..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcfileio.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class definitions for normal and special file I/O (ref: prio.h)
-*/
-
-#if defined(_RCFILEIO_H)
-#else
-#define _RCFILEIO_H
-
-#include "rcio.h"
-#include "rctime.h"
-
-/*
-** One would normally create a concrete class, such as RCFileIO, but then
-** pass around more generic references, ie., RCIO.
-**
-** This subclass of RCIO hides (makes private) the methods that are not
-** applicable to normal files.
-*/
-
-class RCFileInfo;
-
-class PR_IMPLEMENT(RCFileIO): public RCIO
-{
-public:
-    RCFileIO();
-    virtual ~RCFileIO();
-
-    virtual PRInt64     Available();
-    virtual PRStatus    Close();
-    static  PRStatus    Delete(const char *name);
-    virtual PRStatus    FileInfo(RCFileInfo* info) const;
-    static  PRStatus    FileInfo(const char *name, RCFileInfo* info);
-    virtual PRStatus    Fsync();
-    virtual PRStatus    Open(const char *name, PRIntn flags, PRIntn mode);
-    virtual PRInt32     Read(void *buf, PRSize amount);
-    virtual PRInt64     Seek(PRInt64 offset, RCIO::Whence how);
-    virtual PRInt32     Write(const void *buf, PRSize amount);
-    virtual PRInt32     Writev(
-                            const PRIOVec *iov, PRSize size,
-                            const RCInterval& timeout);
-
-private:
-
-    /* These methods made private are unavailable for this object */
-    RCFileIO(const RCFileIO&);
-    void operator=(const RCFileIO&);
-
-    RCIO*       Accept(RCNetAddr* addr, const RCInterval& timeout);
-    PRInt32     AcceptRead(
-                    RCIO **newfd, RCNetAddr **address, void *buffer,
-                    PRSize amount, const RCInterval& timeout);
-    PRStatus    Bind(const RCNetAddr& addr);
-    PRStatus    Connect(const RCNetAddr& addr, const RCInterval& timeout);
-    PRStatus    GetLocalName(RCNetAddr *addr) const;
-    PRStatus    GetPeerName(RCNetAddr *addr) const;
-    PRStatus    GetSocketOption(PRSocketOptionData *data) const;
-    PRStatus    Listen(PRIntn backlog);
-    PRInt16     Poll(PRInt16 in_flags, PRInt16 *out_flags);
-    PRInt32     Recv(
-                    void *buf, PRSize amount, PRIntn flags,
-                    const RCInterval& timeout);
-    PRInt32     Recvfrom(
-                    void *buf, PRSize amount, PRIntn flags,
-                    RCNetAddr* addr, const RCInterval& timeout);
-    PRInt32     Send(
-                    const void *buf, PRSize amount, PRIntn flags,
-                    const RCInterval& timeout);
-    PRInt32     Sendto(
-                    const void *buf, PRSize amount, PRIntn flags,
-                    const RCNetAddr& addr,
-                    const RCInterval& timeout);
-    PRStatus    SetSocketOption(const PRSocketOptionData *data);
-    PRStatus    Shutdown(RCIO::ShutdownHow how);
-    PRInt32     TransmitFile(
-                    RCIO *source, const void *headers,
-                    PRSize hlen, RCIO::FileDisposition flags,
-                    const RCInterval& timeout);
-public:
-
-    /*
-    ** The following function return a valid normal file object,
-    ** Such objects can be used for scanned input and console output.
-    */
-    typedef enum {
-        input = PR_StandardInput,
-        output = PR_StandardOutput,
-        error = PR_StandardError
-    } SpecialFile;
-
-    static RCIO *GetSpecialFile(RCFileIO::SpecialFile special);
-
-};  /* RCFileIO */
-
-class PR_IMPLEMENT(RCFileInfo): public RCBase
-{
-public:
-    typedef enum {
-        file = PR_FILE_FILE,
-        directory = PR_FILE_DIRECTORY,
-        other = PR_FILE_OTHER
-    } FileType;
-
-public:
-    RCFileInfo();
-    RCFileInfo(const RCFileInfo&);
-
-    virtual ~RCFileInfo();
-
-    PRInt64 Size() const;
-    RCTime CreationTime() const;
-    RCTime ModifyTime() const;
-    RCFileInfo::FileType Type() const;
-
-friend PRStatus RCFileIO::FileInfo(RCFileInfo*) const;
-friend PRStatus RCFileIO::FileInfo(const char *name, RCFileInfo*);
-
-private:
-    PRFileInfo64 info;
-};  /* RCFileInfo */
-
-inline RCFileInfo::RCFileInfo(): RCBase() { }
-inline PRInt64 RCFileInfo::Size() const { return info.size; }
-
-#endif /* defined(_RCFILEIO_H) */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp b/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp
deleted file mode 100644
index ff075a3a9d..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcinrval.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** C++ interval times (ref: prinrval.h)
-**
-**  An interval is a period of time. The start of the interval (epoch)
-**  must be defined by the application. The unit of time of an interval
-**  is platform dependent, therefore so is the maximum interval that is
-**  representable. However, that interval is never less that ~12 hours.
-*/
-
-#include "rcinrval.h"
-
-RCInterval::~RCInterval() { }
-
-RCInterval::RCInterval(RCInterval::RCReservedInterval special): RCBase()
-{
-    switch (special)
-    {
-    case RCInterval::now:
-        interval = PR_IntervalNow();
-        break;
-    case RCInterval::no_timeout:
-        interval = PR_INTERVAL_NO_TIMEOUT;
-        break;
-    case RCInterval::no_wait:
-        interval = PR_INTERVAL_NO_WAIT;
-        break;
-    default:
-        break;
-    }
-}  /* RCInterval::RCInterval */
-
-/* rcinrval.cpp */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcinrval.h b/libs/js/nsprpub/pr/src/cplus/rcinrval.h
deleted file mode 100644
index 2dc24987d2..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcinrval.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** C++ interval times (ref: prinrval.h)
-**
-**  An interval is a period of time. The start of the interval (epoch)
-**  must be defined by the application. The unit of time of an interval
-**  is platform dependent, therefore so is the maximum interval that is
-**  representable. However, that interval is never less than ~6 hours.
-*/
-#if defined(_RCINTERVAL_H)
-#else
-#define _RCINTERVAL_H
-
-#include "rcbase.h"
-#include <prinrval.h>
-
-class PR_IMPLEMENT(RCInterval): public RCBase
-{
-public:
-    typedef enum {now, no_timeout, no_wait} RCReservedInterval;
-
-    virtual ~RCInterval();
-
-    RCInterval();
-
-    RCInterval(PRIntervalTime interval);
-    RCInterval(const RCInterval& copy);
-    RCInterval(RCReservedInterval special);
-
-    void SetToNow();
-
-    void operator=(const RCInterval&);
-    void operator=(PRIntervalTime interval);
-
-    PRBool operator<(const RCInterval&);
-    PRBool operator>(const RCInterval&);
-    PRBool operator==(const RCInterval&);
-    PRBool operator>=(const RCInterval&);
-    PRBool operator<=(const RCInterval&);
-
-    RCInterval operator+(const RCInterval&);
-    RCInterval operator-(const RCInterval&);
-    RCInterval& operator+=(const RCInterval&);
-    RCInterval& operator-=(const RCInterval&);
-
-    RCInterval operator/(PRUint32);
-    RCInterval operator*(PRUint32);
-    RCInterval& operator/=(PRUint32);
-    RCInterval& operator*=(PRUint32);
-
-
-    PRUint32 ToSeconds() const;
-    PRUint32 ToMilliseconds() const;
-    PRUint32 ToMicroseconds() const;
-    operator PRIntervalTime() const;
-
-    static PRIntervalTime FromSeconds(PRUint32 seconds);
-    static PRIntervalTime FromMilliseconds(PRUint32 milli);
-    static PRIntervalTime FromMicroseconds(PRUint32 micro);
-
-    friend class RCCondition;
-
-private:
-    PRIntervalTime interval;
-    
-};  /* RCInterval */
-
-
-inline RCInterval::RCInterval(): RCBase() { }
-
-inline RCInterval::RCInterval(const RCInterval& his): RCBase()
-    { interval = his.interval; }
-
-inline RCInterval::RCInterval(PRIntervalTime ticks): RCBase()
-    { interval = ticks; }
-
-inline void RCInterval::SetToNow() { interval = PR_IntervalNow(); }
-
-inline void RCInterval::operator=(const RCInterval& his)
-    { interval = his.interval; }
-
-inline void RCInterval::operator=(PRIntervalTime his)
-    { interval = his; }
-
-inline PRBool RCInterval::operator==(const RCInterval& his)
-    { return (interval == his.interval) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCInterval::operator<(const RCInterval& his)
-    { return (interval < his.interval)? PR_TRUE : PR_FALSE; }
-inline PRBool RCInterval::operator>(const RCInterval& his)
-    { return (interval > his.interval) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCInterval::operator<=(const RCInterval& his)
-    { return (interval <= his.interval) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCInterval::operator>=(const RCInterval& his)
-    { return (interval <= his.interval) ? PR_TRUE : PR_FALSE; }
-
-inline RCInterval RCInterval::operator+(const RCInterval& his)
-    { return RCInterval((PRIntervalTime)(interval + his.interval)); }
-inline RCInterval RCInterval::operator-(const RCInterval& his)
-    { return RCInterval((PRIntervalTime)(interval - his.interval)); }
-inline RCInterval& RCInterval::operator+=(const RCInterval& his)
-    { interval += his.interval; return *this; }
-inline RCInterval& RCInterval::operator-=(const RCInterval& his)
-    { interval -= his.interval; return *this; }
-
-inline RCInterval RCInterval::operator/(PRUint32 him)
-    { return RCInterval((PRIntervalTime)(interval / him)); }
-inline RCInterval RCInterval::operator*(PRUint32 him)
-    { return RCInterval((PRIntervalTime)(interval * him)); }
-
-inline RCInterval& RCInterval::operator/=(PRUint32 him)
-    { interval /= him; return *this; }
-
-inline RCInterval& RCInterval::operator*=(PRUint32 him)
-    { interval *= him; return *this; }
-
-inline PRUint32 RCInterval::ToSeconds() const
-    { return PR_IntervalToSeconds(interval); }
-inline PRUint32 RCInterval::ToMilliseconds() const
-    { return PR_IntervalToMilliseconds(interval); }
-inline PRUint32 RCInterval::ToMicroseconds() const
-    { return PR_IntervalToMicroseconds(interval); }
-inline RCInterval::operator PRIntervalTime() const { return interval; }
-
-inline PRIntervalTime RCInterval::FromSeconds(PRUint32 seconds)
-    { return PR_SecondsToInterval(seconds); }
-inline PRIntervalTime RCInterval::FromMilliseconds(PRUint32 milli)
-    { return PR_MillisecondsToInterval(milli); }
-inline PRIntervalTime RCInterval::FromMicroseconds(PRUint32 micro)
-    { return PR_MicrosecondsToInterval(micro); }
-
-#endif  /* defined(_RCINTERVAL_H) */
-
-/* RCInterval.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcio.cpp b/libs/js/nsprpub/pr/src/cplus/rcio.cpp
deleted file mode 100644
index 27f9e788ac..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcio.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Base class implmenation for I/O (ref: prio.h)
-*/
-
-#include "rcio.h"
-
-RCIO::~RCIO() { }
-
-RCIO::RCIO(RCIO::RCIOType): RCBase() { }
diff --git a/libs/js/nsprpub/pr/src/cplus/rcio.h b/libs/js/nsprpub/pr/src/cplus/rcio.h
deleted file mode 100644
index 5550a881ba..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcio.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Base class definitions for I/O (ref: prio.h)
-**
-** This class is a virtual base class. Construction must be done by a
-** subclass, but the I/O operations can be done on a RCIO object reference.
-*/
-
-#if defined(_RCIO_H)
-#else
-#define _RCIO_H
-
-#include "rcbase.h"
-#include "rcnetdb.h"
-#include "rcinrval.h"
-
-#include "prio.h"
-
-class RCFileInfo;
-
-class PR_IMPLEMENT(RCIO): public RCBase
-{
-public:
-    typedef enum {
-        open = PR_TRANSMITFILE_KEEP_OPEN,   /* socket is left open after file
-                                             * is transmitted. */
-        close = PR_TRANSMITFILE_CLOSE_SOCKET/* socket is closed after file
-                                             * is transmitted. */
-    } FileDisposition;
-
-    typedef enum {
-        set = PR_SEEK_SET,                  /* Set to value specified */
-        current = PR_SEEK_CUR,              /* Seek relative to current position */
-        end = PR_SEEK_END                   /* seek past end of current eof */
-    } Whence;
-
-    typedef enum {
-        recv = PR_SHUTDOWN_RCV,             /* receives will be disallowed */
-        send = PR_SHUTDOWN_SEND,            /* sends will be disallowed */
-        both = PR_SHUTDOWN_BOTH             /* sends & receives will be disallowed */
-    } ShutdownHow;
-
-public:
-    virtual ~RCIO();
-
-    virtual RCIO*       Accept(RCNetAddr* addr, const RCInterval& timeout) = 0;
-    virtual PRInt32     AcceptRead(
-                            RCIO **nd, RCNetAddr **raddr, void *buf,
-                            PRSize amount, const RCInterval& timeout) = 0;
-    virtual PRInt64     Available() = 0;
-    virtual PRStatus    Bind(const RCNetAddr& addr) = 0;
-    virtual PRStatus    Close() = 0;
-    virtual PRStatus    Connect(
-                            const RCNetAddr& addr,
-                            const RCInterval& timeout) = 0;
-    virtual PRStatus    FileInfo(RCFileInfo *info) const = 0;
-    virtual PRStatus    Fsync() = 0;
-    virtual PRStatus    GetLocalName(RCNetAddr *addr) const = 0;
-    virtual PRStatus    GetPeerName(RCNetAddr *addr) const = 0;
-    virtual PRStatus    GetSocketOption(PRSocketOptionData *data) const = 0;
-    virtual PRStatus    Listen(PRIntn backlog) = 0;
-    virtual PRStatus    Open(const char *name, PRIntn flags, PRIntn mode) = 0;
-    virtual PRInt16     Poll(PRInt16 in_flags, PRInt16 *out_flags) = 0;
-    virtual PRInt32     Read(void *buf, PRSize amount) = 0;
-    virtual PRInt32     Recv(
-                            void *buf, PRSize amount, PRIntn flags,
-                            const RCInterval& timeout) = 0;
-    virtual PRInt32     Recvfrom(
-                            void *buf, PRSize amount, PRIntn flags,
-                            RCNetAddr* addr, const RCInterval& timeout) = 0;
-    virtual PRInt64     Seek(PRInt64 offset, Whence how) = 0;
-    virtual PRInt32     Send(
-                            const void *buf, PRSize amount, PRIntn flags,
-                            const RCInterval& timeout) = 0;
-    virtual PRInt32     Sendto(
-                            const void *buf, PRSize amount, PRIntn flags,
-                            const RCNetAddr& addr,
-                            const RCInterval& timeout) = 0;
-    virtual PRStatus    SetSocketOption(const PRSocketOptionData *data) = 0;
-    virtual PRStatus    Shutdown(ShutdownHow how) = 0;
-    virtual PRInt32     TransmitFile(
-                            RCIO *source, const void *headers,
-                            PRSize hlen, RCIO::FileDisposition flags,
-                            const RCInterval& timeout) = 0;
-    virtual PRInt32     Write(const void *buf, PRSize amount) = 0;
-    virtual PRInt32     Writev(
-                            const PRIOVec *iov, PRSize size,
-                            const RCInterval& timeout) = 0;
-
-protected:
-    typedef enum {
-        file = PR_DESC_FILE,
-        tcp = PR_DESC_SOCKET_TCP,
-        udp = PR_DESC_SOCKET_UDP,
-        layered = PR_DESC_LAYERED} RCIOType;
-
-    RCIO(RCIOType);
-
-    PRFileDesc *fd;  /* where the real code hides */
-
-private:
-    /* no default construction and no copies allowed */
-    RCIO();
-    RCIO(const RCIO&);
-
-};  /* RCIO */
-
-#endif /* defined(_RCIO_H) */
-
-/* RCIO.h */
-
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rclock.cpp b/libs/js/nsprpub/pr/src/cplus/rclock.cpp
deleted file mode 100644
index 87b326bca7..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rclock.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
-** C++ access to NSPR locks (PRLock)
-*/
-
-#include "rclock.h"
-#include <prlog.h>
-
-RCLock::RCLock()
-{
-    lock = PR_NewLock();  /* it might be NULL */
-    PR_ASSERT(NULL != lock);
-}  /* RCLock::RCLock */
-
-RCLock::~RCLock()
-{
-    if (NULL != lock) PR_DestroyLock(lock);
-    lock = NULL;
-}  /* RCLock::~RCLock */
-
-void RCLock::Acquire()
-{
-    PR_ASSERT(NULL != lock);
-    PR_Lock(lock);
-}  /* RCLock::Acquire */
-
-void RCLock::Release()
-{
-    PRStatus rv;
-    PR_ASSERT(NULL != lock);
-    rv = PR_Unlock(lock);
-    PR_ASSERT(PR_SUCCESS == rv);
-}  /* RCLock::Release */
-
-/* RCLock.cpp */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rclock.h b/libs/js/nsprpub/pr/src/cplus/rclock.h
deleted file mode 100644
index 9e20ef04c7..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rclock.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** C++ access to NSPR locks (PRLock)
-*/
-
-#if defined(_RCLOCK_H)
-#else
-#define _RCLOCK_H
-
-#include "rcbase.h"
-
-#include <prlock.h>
-
-class PR_IMPLEMENT(RCLock): public RCBase
-{
-public:
-    RCLock();
-    virtual ~RCLock();
-
-    void Acquire();                 /* non-reentrant */
-    void Release();                 /* should be by owning thread */
-
-    friend class RCCondition;
-
-private:
-    RCLock(const RCLock&);          /* can't do that */
-    void operator=(const RCLock&);  /* nor that */
-
-    PRLock *lock;
-};  /* RCLock */
-
-/*
-** Class: RCEnter
-**
-** In scope locks. You can only allocate them on the stack. The language
-** will insure that they get released (by calling the destructor) when
-** the thread leaves scope, even if via an exception.
-*/
-class PR_IMPLEMENT(RCEnter)
-{
-public:
-    ~RCEnter();                     /* releases the lock */
-    RCEnter(RCLock*);               /* acquires the lock */
-
-private:
-    RCLock *lock;
-
-    RCEnter();
-    RCEnter(const RCEnter&);
-    void operator=(const RCEnter&);
-
-    void *operator new(PRSize) { return NULL; }
-    void operator delete(void*) { }
-};  /* RCEnter */
-
-
-inline RCEnter::RCEnter(RCLock* ml) { lock = ml; lock->Acquire(); }
-inline RCEnter::~RCEnter() { lock->Release(); lock = NULL; }
-
-#endif /* defined(_RCLOCK_H) */
-
-/* RCLock.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcmon.h b/libs/js/nsprpub/pr/src/cplus/rcmon.h
deleted file mode 100644
index 75b8ca3e39..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcmon.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class: RCMonitor (ref prmonitor.h)
-**
-** RCMonitor.h - C++ wrapper around NSPR's monitors
-*/
-#if defined(_RCMONITOR_H)
-#else
-#define _RCMONITOR_H
-
-#include "rcbase.h"
-#include "rcinrval.h"
-
-struct PRMonitor;
-
-class PR_IMPLEMENT(RCMonitor): public RCBase
-{
-public:
-    RCMonitor();                    /* timeout is infinity */
-    virtual ~RCMonitor();
-
-    virtual void Enter();           /* reentrant entry */
-    virtual void Exit();
-
-    virtual void Notify();          /* possibly enable one thread */
-    virtual void NotifyAll();       /* enable all waiters */
-
-    virtual void Wait();            /* applies object's timeout */
-
-    virtual void SetTimeout(const RCInterval& timeout);
-
-private:
-    PRMonitor *monitor;
-    RCInterval timeout;
-
-public:
-    RCInterval GetTimeout() const;  /* get the current value */
-
-};  /* RCMonitor */
-
-#endif /* defined(_RCMONITOR_H) */
-
-/* RCMonitor.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp b/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp
deleted file mode 100644
index 9890c9aea8..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcnetdb.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Base class implementation for network access functions (ref: prnetdb.h)
-*/
-
-#include "rclock.h"
-#include "rcnetdb.h"
-
-#include <prmem.h>
-#include <prlog.h>
-#include <string.h>
-
-RCNetAddr::RCNetAddr(const RCNetAddr& his): RCBase()
-    { address = his.address; }
-
-RCNetAddr::RCNetAddr(const RCNetAddr& his, PRUint16 port): RCBase()
-{
-    address = his.address;
-    switch (address.raw.family)
-    {
-        case PR_AF_INET: address.inet.port = port; break;
-        case PR_AF_INET6: address.ipv6.port = port; break;
-        default: break;
-    }
-}  /* RCNetAddr::RCNetAddr */
-
-RCNetAddr::RCNetAddr(RCNetAddr::HostValue host, PRUint16 port): RCBase()
-{
-    PRNetAddrValue how;
-    switch (host)
-    {
-        case RCNetAddr::any: how = PR_IpAddrAny; break;
-        case RCNetAddr::loopback: how = PR_IpAddrLoopback; break;
-        default: PR_ASSERT(!"This can't happen -- and did!");
-    }
-    (void)PR_InitializeNetAddr(how, port, &address);
-}  /* RCNetAddr::RCNetAddr */
-
-RCNetAddr::~RCNetAddr() { }
-
-void RCNetAddr::operator=(const RCNetAddr& his) { address = his.address; }
-
-PRStatus RCNetAddr::FromString(const char* string)
-    { return PR_StringToNetAddr(string, &address); }
-
-void RCNetAddr::operator=(const PRNetAddr* addr) { address = *addr; }
-
-PRBool RCNetAddr::operator==(const RCNetAddr& his) const
-{
-    PRBool rv = EqualHost(his);
-    if (rv)
-    {
-        switch (address.raw.family)
-        {
-            case PR_AF_INET:
-                rv = (address.inet.port == his.address.inet.port); break;
-            case PR_AF_INET6:
-                rv = (address.ipv6.port == his.address.ipv6.port); break;
-            case PR_AF_LOCAL:
-            default: break;
-        }
-    }
-    return rv;
-}  /* RCNetAddr::operator== */
-
-PRBool RCNetAddr::EqualHost(const RCNetAddr& his) const
-{
-    PRBool rv;
-    switch (address.raw.family)
-    {
-        case PR_AF_INET:
-            rv = (address.inet.ip == his.address.inet.ip); break;
-        case PR_AF_INET6:
-            rv = (0 == memcmp(
-                &address.ipv6.ip, &his.address.ipv6.ip,
-                sizeof(address.ipv6.ip)));
-            break;
-#if defined(XP_UNIX)
-        case PR_AF_LOCAL:
-            rv = (0 == strncmp(
-                address.local.path, his.address.local.path,
-                sizeof(address.local.path)));
-            break;
-#endif
-        default: break;
-    }
-    return rv;
-}  /* RCNetAddr::operator== */
-
-PRStatus RCNetAddr::ToString(char *string, PRSize size) const
-    { return PR_NetAddrToString(&address, string, size); }
-
-/*
-** RCHostLookup
-*/
-
-RCHostLookup::~RCHostLookup()
-{
-    if (NULL != address) delete [] address;
-}  /* RCHostLookup::~RCHostLookup */
-
-RCHostLookup::RCHostLookup(): RCBase()
-{
-    address = NULL;
-    max_index = 0;
-}  /* RCHostLookup::RCHostLookup */
-
-PRStatus RCHostLookup::ByName(const char* name)
-{
-    PRStatus rv;
-    PRNetAddr addr;
-    PRHostEnt hostentry;
-    PRIntn index = 0, max;
-    RCNetAddr* vector = NULL;
-    RCNetAddr* old_vector = NULL;
-    void* buffer = PR_Malloc(PR_NETDB_BUF_SIZE);
-    if (NULL == buffer) return PR_FAILURE;
-    rv = PR_GetHostByName(name, (char*)buffer, PR_NETDB_BUF_SIZE, &hostentry);
-    if (PR_SUCCESS == rv)
-    {
-        for (max = 0, index = 0;; ++max)
-        {
-            index = PR_EnumerateHostEnt(index, &hostentry, 0, &addr);
-            if (0 == index) break;
-        }
-        if (max > 0)
-        {
-            vector = new RCNetAddr[max];
-            while (--max > 0)
-            {
-                index = PR_EnumerateHostEnt(index, &hostentry, 0, &addr);
-                if (0 == index) break;
-                vector[index] = &addr;
-            }
-            {
-                RCEnter entry(&ml);
-                old_vector = address;
-                address = vector;
-                max_index = max;
-            }
-            if (NULL != old_vector) delete [] old_vector;
-        }
-    }
-    if (NULL != buffer) PR_DELETE(buffer);
-    return PR_SUCCESS;
-}  /* RCHostLookup::ByName */
-
-PRStatus RCHostLookup::ByAddress(const RCNetAddr& host_addr)
-{
-    PRStatus rv;
-    PRNetAddr addr;
-    PRHostEnt hostentry;
-    PRIntn index = 0, max;
-    RCNetAddr* vector = NULL;
-    RCNetAddr* old_vector = NULL;
-    char *buffer = (char*)PR_Malloc(PR_NETDB_BUF_SIZE);
-    if (NULL == buffer) return PR_FAILURE;
-    rv = PR_GetHostByAddr(host_addr, buffer, PR_NETDB_BUF_SIZE, &hostentry);
-    if (PR_SUCCESS == rv)
-    {
-        for (max = 0, index = 0;; ++max)
-        {
-            index = PR_EnumerateHostEnt(index, &hostentry, 0, &addr);
-            if (0 == index) break;
-        }
-        if (max > 0)
-        {
-            vector = new RCNetAddr[max];
-            while (--max > 0)
-            {
-                index = PR_EnumerateHostEnt(index, &hostentry, 0, &addr);
-                if (0 == index) break;
-                vector[index] = &addr;
-            }
-            {
-                RCEnter entry(&ml);
-                old_vector = address;
-                address = vector;
-                max_index = max;
-            }
-            if (NULL != old_vector) delete [] old_vector;
-        }
-    }
-    if (NULL != buffer) PR_DELETE(buffer);
-    return PR_SUCCESS;
-}  /* RCHostLookup::ByAddress */
-
-const RCNetAddr* RCHostLookup::operator[](PRUintn which)
-{
-    RCNetAddr* addr = NULL;
-    if (which < max_index)
-        addr = &address[which];
-    return addr;
-}  /* RCHostLookup::operator[] */
-
-/* RCNetdb.cpp */
diff --git a/libs/js/nsprpub/pr/src/cplus/rcnetdb.h b/libs/js/nsprpub/pr/src/cplus/rcnetdb.h
deleted file mode 100644
index 03f5b4f0ad..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcnetdb.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Base class definitions for network access functions (ref: prnetdb.h)
-*/
-
-#if defined(_RCNETDB_H)
-#else
-#define _RCNETDB_H
-
-#include "rclock.h"
-#include "rcbase.h"
-
-#include <prnetdb.h>
-
-class PR_IMPLEMENT(RCNetAddr): public RCBase
-{
-public:
-    typedef enum {
-        any = PR_IpAddrAny,             /* assign logical INADDR_ANY */
-        loopback = PR_IpAddrLoopback    /* assign logical INADDR_LOOPBACK */
-    } HostValue;
-
-    RCNetAddr();                        /* default constructor is unit'd object */
-    RCNetAddr(const RCNetAddr&);        /* copy constructor */
-    RCNetAddr(HostValue, PRUint16 port);/* init'd w/ 'special' assignments */
-    RCNetAddr(const RCNetAddr&, PRUint16 port);
-                                        /* copy w/ port reassigment */
-
-    virtual ~RCNetAddr();
-
-    void operator=(const RCNetAddr&);
-
-    virtual PRBool operator==(const RCNetAddr&) const;
-                                        /* compare of all relavent fields */
-    virtual PRBool EqualHost(const RCNetAddr&) const;
-                                        /* compare of just host field */
-
-
-public:
-
-    void operator=(const PRNetAddr*);   /* construction from more primitive data */
-    operator const PRNetAddr*() const;  /* extraction of underlying representation */
-    virtual PRStatus FromString(const char* string);
-                                        /* initialization from an ASCII string */
-    virtual PRStatus ToString(char *string, PRSize size) const;
-                                        /* convert internal fromat to a string */
-
-private:
-
-    PRNetAddr address;
-
-};  /* RCNetAddr */
-
-/*
-** Class: RCHostLookup
-**
-** Abstractions to look up host names and addresses.
-**
-** This is a stateful class. One looks up the host by name or by
-** address, then enumerates over a possibly empty array of network
-** addresses. The storage for the addresses is owned by the class.
-*/
-
-class RCHostLookup: public RCBase
-{
-public:
-    virtual ~RCHostLookup();
-
-    RCHostLookup();
-
-    virtual PRStatus ByName(const char* name);
-    virtual PRStatus ByAddress(const RCNetAddr&);
-
-    virtual const RCNetAddr* operator[](PRUintn);
-
-private:
-    RCLock ml;
-    PRIntn max_index;
-    RCNetAddr* address;
-
-    RCHostLookup(const RCHostLookup&);
-    RCHostLookup& operator=(const RCHostLookup&);
-};
-
-inline RCNetAddr::RCNetAddr(): RCBase() { }
-inline RCNetAddr::operator const PRNetAddr*() const { return &address; }
-
-
-#endif /* defined(_RCNETDB_H) */
-
-/* RCNetdb.h */
-
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp b/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp
deleted file mode 100644
index bdc94309c8..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcnetio.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Subclass implementation for streamed network I/O (ref: prio.h)
-*/
-
-#include "rcnetio.h"
-
-#include <private/pprio.h>
-
-RCNetStreamIO::~RCNetStreamIO()
-    { PRStatus rv = (fd->methods->close)(fd); fd = NULL; }
-
-RCNetStreamIO::RCNetStreamIO(): RCIO(RCIO::tcp)
-    { fd = PR_NewTCPSocket(); }
-
-RCNetStreamIO::RCNetStreamIO(PRIntn protocol): RCIO(RCIO::tcp)
-    { fd = PR_Socket(PR_AF_INET, PR_SOCK_STREAM, protocol); }
-
-RCIO* RCNetStreamIO::Accept(RCNetAddr* addr, const RCInterval& timeout)
-{
-    PRNetAddr peer;
-    RCNetStreamIO* rcio = NULL;
-    PRFileDesc* newfd = fd->methods->accept(fd, &peer, timeout);
-    if (NULL != newfd)
-    {
-        rcio = new RCNetStreamIO();
-        if (NULL != rcio)
-        {
-            *addr = &peer;
-            rcio->fd = newfd;
-        }
-        else
-            (void)(newfd->methods->close)(newfd);
-    }
-    return rcio;
-}  /* RCNetStreamIO::Accept */
-
-PRInt32 RCNetStreamIO::AcceptRead(
-    RCIO **nd, RCNetAddr **raddr, void *buf,
-    PRSize amount, const RCInterval& timeout)
-{   
-    PRNetAddr *from;
-    PRFileDesc *accepted;
-    PRInt32 rv = (fd->methods->acceptread)(
-        fd, &accepted, &from, buf, amount, timeout);
-    if (rv >= 0)
-    {
-        RCNetStreamIO *ns = new RCNetStreamIO();
-        if (NULL != *nd) ns->fd = accepted;
-        else {PR_Close(accepted); rv = -1; }
-        *nd = ns;
-    }
-    return rv;
-}  /* RCNetStreamIO::AcceptRead */
-
-PRInt64 RCNetStreamIO::Available()
-    { return (fd->methods->available64)(fd); }
-
-PRStatus RCNetStreamIO::Bind(const RCNetAddr& addr)
-    { return (fd->methods->bind)(fd, addr); }
-
-PRStatus RCNetStreamIO::Connect(const RCNetAddr& addr, const RCInterval& timeout)
-    { return (fd->methods->connect)(fd, addr, timeout); }
-
-PRStatus RCNetStreamIO::GetLocalName(RCNetAddr *addr) const
-{
-    PRNetAddr local;
-    PRStatus rv = (fd->methods->getsockname)(fd, &local);
-    if (PR_SUCCESS == rv) *addr = &local;
-    return rv;
-}  /* RCNetStreamIO::GetLocalName */
-
-PRStatus RCNetStreamIO::GetPeerName(RCNetAddr *addr) const
-{
-    PRNetAddr peer;
-    PRStatus rv = (fd->methods->getpeername)(fd, &peer);
-    if (PR_SUCCESS == rv) *addr = &peer;
-    return rv;
-}  /* RCNetStreamIO::GetPeerName */
-
-PRStatus RCNetStreamIO::GetSocketOption(PRSocketOptionData *data) const
-    { return (fd->methods->getsocketoption)(fd, data); }
-
-PRStatus RCNetStreamIO::Listen(PRIntn backlog)
-    { return (fd->methods->listen)(fd, backlog); }
-
-PRInt16 RCNetStreamIO::Poll(PRInt16 in_flags, PRInt16 *out_flags)
-    { return (fd->methods->poll)(fd, in_flags, out_flags); }
-
-PRInt32 RCNetStreamIO::Read(void *buf, PRSize amount)
-    { return (fd->methods->read)(fd, buf, amount); }
-
-PRInt32 RCNetStreamIO::Recv(
-    void *buf, PRSize amount, PRIntn flags, const RCInterval& timeout)
-    { return (fd->methods->recv)(fd, buf, amount, flags, timeout); }
-
-PRInt32 RCNetStreamIO::Recvfrom(
-    void *buf, PRSize amount, PRIntn flags,
-    RCNetAddr* addr, const RCInterval& timeout)
-{
-    PRNetAddr peer;
-    PRInt32 rv = (fd->methods->recvfrom)(
-        fd, buf, amount, flags, &peer, timeout);
-    if (-1 != rv) *addr = &peer;
-    return rv;
-}  /* RCNetStreamIO::Recvfrom */
-
-PRInt32 RCNetStreamIO::Send(
-    const void *buf, PRSize amount, PRIntn flags, const RCInterval& timeout)
-    { return (fd->methods->send)(fd, buf, amount, flags, timeout); }
-
-PRInt32 RCNetStreamIO::Sendto(
-    const void *buf, PRSize amount, PRIntn flags,
-    const RCNetAddr& addr, const RCInterval& timeout)
-    { return (fd->methods->sendto)(fd, buf, amount, flags, addr, timeout); }
-
-PRStatus RCNetStreamIO::SetSocketOption(const PRSocketOptionData *data)
-    { return (fd->methods->setsocketoption)(fd, data); }
-
-PRStatus RCNetStreamIO::Shutdown(RCIO::ShutdownHow how)
-    { return (fd->methods->shutdown)(fd, (PRIntn)how); }
-
-PRInt32 RCNetStreamIO::TransmitFile(
-    RCIO *source, const void *headers, PRSize hlen,
-    RCIO::FileDisposition flags, const RCInterval& timeout)
-{
-    RCNetStreamIO *src = (RCNetStreamIO*)source;
-    return (fd->methods->transmitfile)(
-        fd, src->fd, headers, hlen, (PRTransmitFileFlags)flags, timeout); }
-
-PRInt32 RCNetStreamIO::Write(const void *buf, PRSize amount)
-    { return (fd->methods->write)(fd, buf, amount); }
-
-PRInt32 RCNetStreamIO::Writev(
-    const PRIOVec *iov, PRSize size, const RCInterval& timeout)
-    { return (fd->methods->writev)(fd, iov, size, timeout); }
-    
-/*
-** Invalid functions
-*/
-
-PRStatus RCNetStreamIO::Close()
-    { PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCNetStreamIO::FileInfo(RCFileInfo*) const
-    { PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRStatus RCNetStreamIO::Fsync()
-    { return (fd->methods->fsync)(fd); }
-
-PRStatus RCNetStreamIO::Open(const char*, PRIntn, PRIntn)
-    { PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-PRInt64 RCNetStreamIO::Seek(PRInt64, RCIO::Whence)
-    { PR_SetError(PR_INVALID_METHOD_ERROR, 0); return PR_FAILURE; }
-
-/* RCNetStreamIO.cpp */
-
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rcnetio.h b/libs/js/nsprpub/pr/src/cplus/rcnetio.h
deleted file mode 100644
index 54ce695fc7..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcnetio.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Subclass definitions for network I/O (ref: prio.h)
-*/
-
-#if defined(_RCNETIO_H)
-#else
-#define _RCNETIO_H
-
-#include "rcbase.h"
-#include "rcinrval.h"
-#include "rcio.h"
-#include "rcnetdb.h"
-
-#include "prio.h"
-
-class RCFileInfo;
-
-/*
-** Class: RCNetStreamIO (ref prio.h)
-**
-** Streamed (reliable) network I/O (e.g., TCP).
-** This class hides (makes private) the functions that are not applicable
-** to network I/O (i.e., those for file I/O).
-*/
-
-class PR_IMPLEMENT(RCNetStreamIO): public RCIO
-{
-
-public:
-    RCNetStreamIO();
-    virtual ~RCNetStreamIO();
-
-    virtual RCIO*       Accept(RCNetAddr* addr, const RCInterval& timeout);
-    virtual PRInt32     AcceptRead(
-                            RCIO **nd, RCNetAddr **raddr, void *buf,
-                            PRSize amount, const RCInterval& timeout);
-    virtual PRInt64     Available();
-    virtual PRStatus    Bind(const RCNetAddr& addr);
-    virtual PRStatus    Connect(
-                            const RCNetAddr& addr, const RCInterval& timeout);
-    virtual PRStatus    GetLocalName(RCNetAddr *addr) const;
-    virtual PRStatus    GetPeerName(RCNetAddr *addr) const;
-    virtual PRStatus    GetSocketOption(PRSocketOptionData *data) const;
-    virtual PRStatus    Listen(PRIntn backlog);
-    virtual PRInt16     Poll(PRInt16 in_flags, PRInt16 *out_flags);
-    virtual PRInt32     Read(void *buf, PRSize amount);
-    virtual PRInt32     Recv(
-                            void *buf, PRSize amount, PRIntn flags,
-                            const RCInterval& timeout);
-    virtual PRInt32     Recvfrom(
-                            void *buf, PRSize amount, PRIntn flags,
-                            RCNetAddr* addr, const RCInterval& timeout);
-    virtual PRInt32     Send(
-                            const void *buf, PRSize amount, PRIntn flags,
-                            const RCInterval& timeout);
-    virtual PRInt32     Sendto(
-                            const void *buf, PRSize amount, PRIntn flags,
-                            const RCNetAddr& addr,
-                            const RCInterval& timeout);
-    virtual PRStatus    SetSocketOption(const PRSocketOptionData *data);
-    virtual PRStatus    Shutdown(ShutdownHow how);
-    virtual PRInt32     TransmitFile(
-                            RCIO *source, const void *headers,
-                            PRSize hlen, RCIO::FileDisposition flags,
-                            const RCInterval& timeout);
-    virtual PRInt32     Write(const void *buf, PRSize amount);
-    virtual PRInt32     Writev(
-                            const PRIOVec *iov, PRSize size,
-                            const RCInterval& timeout);
-
-private:
-    /* functions unavailable to this clients of this class */
-    RCNetStreamIO(const RCNetStreamIO&);
-
-    PRStatus    Close();
-    PRStatus    Open(const char *name, PRIntn flags, PRIntn mode);
-    PRStatus    FileInfo(RCFileInfo *info) const;
-    PRStatus    Fsync();
-    PRInt64     Seek(PRInt64 offset, RCIO::Whence how);
-
-public:
-    RCNetStreamIO(PRIntn protocol);
-};  /* RCNetIO */
-
-#endif /* defined(_RCNETIO_H) */
-
-/* RCNetStreamIO.h */
-
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rcthread.cpp b/libs/js/nsprpub/pr/src/cplus/rcthread.cpp
deleted file mode 100644
index 25a9810fec..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcthread.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* RCThread.cpp - C++ wrapper on NSPR */
-
-#include "rcthread.h"
-#include "rcinrval.h"
-
-#include <prmem.h>
-#include <prlog.h>
-#include <stdio.h>
-#include <prinit.h>
-
-static RCPrimordialThread *primordial = NULL;
-
-void nas_Root(void *arg)
-{
-    RCThread *him = (RCThread*)arg;
-    while (RCThread::ex_unstarted == him->execution)
-        (void)PR_Sleep(PR_INTERVAL_NO_TIMEOUT);  /* wait for Start() */
-    him->RootFunction();  /* he gets a self reference */
-    if (PR_UNJOINABLE_THREAD == PR_GetThreadState(him->identity))
-        delete him;
-}  /* nas_Root */
-
-RCThread::~RCThread() { }
-
-RCThread::RCThread(): RCBase() { }
-
-RCThread::RCThread(const RCThread&): RCBase()
-{
-    PR_NOT_REACHED("Cannot call thread copy constructor");
-}  /* RCThread::RCThread */
-
-RCThread::RCThread(
-    RCThread::Scope scope, RCThread::State join, PRUint32 stackSize):
-    RCBase()
-{
-    execution = ex_unstarted;
-    identity = PR_CreateThread(
-        PR_USER_THREAD, nas_Root, this,
-        PR_GetThreadPriority(PR_GetCurrentThread()),
-        (PRThreadScope)scope, (PRThreadState)join, stackSize);
-}  /* RCThread::RCThread */
-
-void RCThread::operator=(const RCThread&)
-{
-    PR_NOT_REACHED("Cannot call thread assignment operator");
-}  /* RCThread::operator= */
-
-
-PRStatus RCThread::Start()
-{
-    PRStatus rv;
-    /* This is an unsafe check, but not too critical */
-    if (RCThread::ex_unstarted == execution)
-    {
-        execution = RCThread::ex_started;
-        rv = PR_Interrupt(identity);
-        PR_ASSERT(PR_SUCCESS == rv);
-    }
-    else
-    {
-        rv = PR_FAILURE;
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-    }
-    return rv;
-}  /* RCThread::Start */
-
-PRStatus RCThread::Join()
-{
-    PRStatus rv;
-    if (RCThread::ex_unstarted == execution)
-    {
-        rv = PR_FAILURE;
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-    }
-    else rv = PR_JoinThread(identity);
-    if (PR_SUCCESS == rv) delete this;
-    return rv;
-}  /* RCThread::Join */
-
-PRStatus RCThread::Interrupt()
-{
-    PRStatus rv;
-    if (RCThread::ex_unstarted == execution)
-    {
-        rv = PR_FAILURE;
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-    }
-    else rv = PR_Interrupt(identity);
-    return rv;
-}  /* RCThread::Interrupt */
-
-void RCThread::ClearInterrupt() { PR_ClearInterrupt(); }
-
-void RCThread::SetPriority(RCThread::Priority new_priority)
-    { PR_SetThreadPriority(identity, (PRThreadPriority)new_priority); }
-
-PRThread *RCThread::Self()
-    { return PR_GetCurrentThread(); }
-
-RCThread::Scope RCThread::GetScope() const
-    { return (RCThread::Scope)PR_GetThreadScope(identity); }
-
-RCThread::State RCThread::GetState() const
-    { return (RCThread::State)PR_GetThreadState(identity); }
-
-RCThread::Priority RCThread::GetPriority() const
-    { return (RCThread::Priority)PR_GetThreadPriority(identity); }
-    
-static void _rc_PDDestructor(RCThreadPrivateData* privateData)
-{
-    PR_ASSERT(NULL != privateData);
-    privateData->Release();
-}
-
-static PRThreadPrivateDTOR _tpd_dtor = (PRThreadPrivateDTOR)_rc_PDDestructor;
-
-PRStatus RCThread::NewPrivateIndex(PRUintn* index)
-    { return PR_NewThreadPrivateIndex(index, _tpd_dtor); }
-
-PRStatus RCThread::SetPrivateData(PRUintn index)
-    { return PR_SetThreadPrivate(index, NULL); }
-
-PRStatus RCThread::SetPrivateData(PRUintn index, RCThreadPrivateData* data)
-{
-    return PR_SetThreadPrivate(index, data);
-}
-
-RCThreadPrivateData* RCThread::GetPrivateData(PRUintn index)
-    { return (RCThreadPrivateData*)PR_GetThreadPrivate(index); }
-
-PRStatus RCThread::Sleep(const RCInterval& ticks)
-    { PRIntervalTime tmo = ticks; return PR_Sleep(tmo); }
-
-RCPrimordialThread *RCThread::WrapPrimordialThread()
-{
-    /*
-    ** This needs to take more care in insuring that the thread
-    ** being wrapped is really the primordial thread. This code
-    ** is assuming that the caller is the primordial thread, and
-    ** there's nothing to insure that.
-    */
-    if (NULL == primordial)
-    {
-        /* it doesn't have to be perfect */
-        RCPrimordialThread *me = new RCPrimordialThread();
-        PR_ASSERT(NULL != me);
-        if (NULL == primordial)
-        {
-            primordial = me;
-            me->execution = RCThread::ex_started;
-            me->identity = PR_GetCurrentThread();
-        }
-        else delete me;  /* somebody beat us to it */
-    }
-    return primordial;
-}  /* RCThread::WrapPrimordialThread */
-
-RCPrimordialThread::RCPrimordialThread(): RCThread() { }
-
-RCPrimordialThread::~RCPrimordialThread() { }
-
-void RCPrimordialThread::RootFunction()
-{
-    PR_NOT_REACHED("Primordial thread calling root function"); 
-}  /* RCPrimordialThread::RootFunction */
- 
-PRStatus RCPrimordialThread::Cleanup() { return PR_Cleanup(); }
-
-PRStatus RCPrimordialThread::SetVirtualProcessors(PRIntn count)
-{
-    PR_SetConcurrency(count);
-    return PR_SUCCESS;
-}  /* SetVirutalProcessors */
-
-RCThreadPrivateData::RCThreadPrivateData() { }
-
-RCThreadPrivateData::RCThreadPrivateData(
-    const RCThreadPrivateData& him) { }
-
-RCThreadPrivateData::~RCThreadPrivateData() { }
-
-/* RCThread.c */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rcthread.h b/libs/js/nsprpub/pr/src/cplus/rcthread.h
deleted file mode 100644
index 2b000564a8..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rcthread.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* RCThread.h */
-
-#if defined(_RCTHREAD_H)
-#else
-#define _RCTHREAD_H
-
-#include "rcbase.h"
-
-#include <prthread.h>
-
-class RCInterval;
-
-class PR_IMPLEMENT(RCThreadPrivateData)
-{
-public:
-    RCThreadPrivateData();
-    RCThreadPrivateData(const RCThreadPrivateData&);
-
-    virtual ~RCThreadPrivateData();
-
-    virtual void Release() = 0;
-
-};  /* RCThreadPrivateData */
-
-class PR_IMPLEMENT(RCThread): public RCBase
-{
-public:
-
-    typedef enum 
-    {
-        local = PR_LOCAL_THREAD, global = PR_GLOBAL_THREAD
-    } Scope;
-
-    typedef enum
-    {
-        joinable = PR_JOINABLE_THREAD, unjoinable = PR_UNJOINABLE_THREAD
-    } State;
-
-    typedef enum
-    {
-        first = PR_PRIORITY_FIRST,
-        low = PR_PRIORITY_LOW,
-        normal = PR_PRIORITY_NORMAL,
-        high = PR_PRIORITY_HIGH,
-        urgent = PR_PRIORITY_URGENT,
-        last = PR_PRIORITY_LAST
-    } Priority;
-
-    /*
-     * Create a new thread, providing scope and joinability state.
-     */
-    RCThread(Scope scope, State state, PRUint32 stackSize=0);
-
-    /*
-     * New threads are created in a suspended state. It must be 'started"
-     * before it begins execution in the class' defined 'RootFunction()'.
-     */
-    virtual PRStatus Start();
-
-    /*
-     * If a thread is created joinable, then the thread's object exists
-     * until join is called. The thread that calls join will block until
-     * the target thread returns from it's root function.
-     */
-    virtual PRStatus Join();
-    
-    /*
-     * The priority of a newly created thread is the same as the creator.
-     * The priority may be changed either by the new thread itself, by
-     * the creator or any other arbitrary thread.
-     */   
-    virtual void SetPriority(Priority newPriority);
-
-
-    /*
-     * Interrupt another thread, causing it to stop what it
-     * is doing and return with a well known error code.
-     */
-    virtual PRStatus Interrupt();
-    
-    /*
-     * And in case a thread was interrupted and didn't get a chance
-     * to have the notification delivered, a way to cancel the pending
-     * status.
-     */
-    static void ClearInterrupt();
-    
-    /*
-     * Methods to discover the attributes of an existing thread.
-     */
-    static PRThread *Self();
-    Scope GetScope() const;
-    State GetState() const;
-    Priority GetPriority() const;
-
-    /*
-     * Thread private data
-     */
-    static PRStatus NewPrivateIndex(PRUintn* index);
-
-    /*
-     * Getting it - if you want to modify, make a copy
-     */
-    static RCThreadPrivateData* GetPrivateData(PRUintn index);
-
-    /*
-     * Setting it to <empty> - deletes existing data
-     */
-    static PRStatus SetPrivateData(PRUintn index);
-
-    /*
-     * Setting it - runtime will make a copy, freeing old iff necessary
-     */
-    static PRStatus SetPrivateData(PRUintn index, RCThreadPrivateData* data);
-
-    /*
-     * Scheduling control
-     */
-    static PRStatus Sleep(const RCInterval& ticks);
-
-    friend void nas_Root(void*);
-    friend class RCPrimordialThread;
-protected:
-
-    /*
-     * The instantiator of a class must not call the destructor. The base
-     * implementation of Join will, and if the thread is created unjoinable,
-     * then the code that called the RootFunction will call the desctructor.
-     */
-    virtual ~RCThread();
-
-private:
-
-    /*
-     * This is where a newly created thread begins execution. Returning
-     * from this function is equivalent to terminating the thread.
-     */
-    virtual void RootFunction() = 0;
-
-    PRThread *identity;
-
-    /* Threads are unstarted until started - pretty startling */
-    enum {ex_unstarted, ex_started} execution;
-
-    /* There is no public default constructor or copy constructor */
-    RCThread();
-    RCThread(const RCThread&);
-    
-    /* And there is no assignment operator */
-    void operator=(const RCThread&);
-
-public:
-    static RCPrimordialThread *WrapPrimordialThread();    
-
- };
- 
-/*
-** class RCPrimordialThread
-*/
-class PR_IMPLEMENT(RCPrimordialThread): public RCThread
-{
-public:
-    /*
-    ** The primordial thread can (optionally) wait for all created
-    ** threads to terminate before allowing the process to exit.
-    ** Not calling Cleanup() before returning from main() will cause
-    ** the immediate termination of the entire process, including
-    ** any running threads.
-    */
-    static PRStatus Cleanup();
-
-    /*
-    ** Only the primordial thread is allowed to adjust the number of
-    ** virtual processors of the runtime. It's a lame security thing.
-    */
-    static PRStatus SetVirtualProcessors(PRIntn count=10);
-
-friend class RCThread;
-private:
-    /*
-    ** None other than the runtime can create of destruct
-    ** a primordial thread. It is fabricated by the runtime
-    ** to wrap the thread that initiated the application.
-    */
-    RCPrimordialThread();
-    ~RCPrimordialThread();
-    void RootFunction();
-};  /* RCPrimordialThread */
-
- #endif /* defined(_RCTHREAD_H) */
diff --git a/libs/js/nsprpub/pr/src/cplus/rctime.cpp b/libs/js/nsprpub/pr/src/cplus/rctime.cpp
deleted file mode 100644
index 03c6ff325a..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rctime.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class implementation for calendar time routines (ref: prtime.h)
-*/
-
-#include "rctime.h"
-
-RCTime::~RCTime() { }
-
-RCTime::RCTime(PRTime time): RCBase() { gmt = time; }
-RCTime::RCTime(const RCTime& his): RCBase() { gmt = his.gmt; }
-RCTime::RCTime(RCTime::Current): RCBase() { gmt = PR_Now(); }
-RCTime::RCTime(const PRExplodedTime& time): RCBase()
-{ gmt = PR_ImplodeTime(&time); }
-
-void RCTime::operator=(const PRExplodedTime& time)
-{ gmt = PR_ImplodeTime(&time); }
-
-RCTime RCTime::operator+(const RCTime& his)
-{ RCTime sum(gmt + his.gmt); return sum; }
-
-RCTime RCTime::operator-(const RCTime& his)
-{ RCTime difference(gmt - his.gmt); return difference; }
-
-RCTime RCTime::operator/(PRUint64 his)
-{ RCTime quotient(gmt / gmt); return quotient; }
-
-RCTime RCTime::operator*(PRUint64 his)
-{ RCTime product(gmt * his); return product; }
-
diff --git a/libs/js/nsprpub/pr/src/cplus/rctime.h b/libs/js/nsprpub/pr/src/cplus/rctime.h
deleted file mode 100644
index f0b900a26b..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/rctime.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Class definitions for calendar time routines (ref: prtime.h)
-*/
-
-#if defined(_RCTIME_H)
-#else
-#define _RCTIME_H
-
-#include "rcbase.h"
-
-#include <prtime.h>
-
-/*
-** Class: RCTime (ref: prtime.h)
-**
-** RCTimes are objects that are intended to be used to represent calendar
-** times. They maintain units internally as microseconds since the defined
-** epoch (midnight, January 1, 1970, GMT). Conversions to and from external
-** formats (PRExplodedTime) are available.
-**
-** In general, NCTimes possess normal algebretic capabilities.
-*/
-
-class PR_IMPLEMENT(RCTime): public RCBase
-{
-public:
-    typedef enum {now} Current;
-
-    RCTime();                       /* leaves the object unitialized */
-    RCTime(Current);                /* initializes to current system time */
-    RCTime(const RCTime&);          /* copy constructor */
-    RCTime(const PRExplodedTime&);  /* construction from exploded representation */
-
-    virtual ~RCTime();
-
-    /* assignment operators */
-    void operator=(const RCTime&); 
-    void operator=(const PRExplodedTime&);
-
-    /* comparitive operators */
-    PRBool operator<(const RCTime&);
-    PRBool operator>(const RCTime&);
-    PRBool operator<=(const RCTime&);
-    PRBool operator>=(const RCTime&);
-    PRBool operator==(const RCTime&);
-
-    /* associative operators */
-    RCTime operator+(const RCTime&);
-    RCTime operator-(const RCTime&);
-    RCTime& operator+=(const RCTime&);
-    RCTime& operator-=(const RCTime&);
-
-    /* multiply and divide operators */
-    RCTime operator/(PRUint64);
-    RCTime operator*(PRUint64);
-    RCTime& operator/=(PRUint64);
-    RCTime& operator*=(PRUint64);
-
-    void Now();                     /* assign current time to object */
-
-private:
-    PRTime gmt;
-
-public:
-
-    RCTime(PRTime);                 /* construct from raw PRTime */
-    void operator=(PRTime);         /* assign from raw PRTime */
-    operator PRTime() const;        /* extract internal representation */
-};  /* RCTime */
-
-inline RCTime::RCTime(): RCBase() { }
-
-inline void RCTime::Now() { gmt = PR_Now(); }
-inline RCTime::operator PRTime() const { return gmt; }
-
-inline void RCTime::operator=(PRTime his) { gmt = his; }
-inline void RCTime::operator=(const RCTime& his) { gmt = his.gmt; }
-
-inline PRBool RCTime::operator<(const RCTime& his)
-    { return (gmt < his.gmt) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCTime::operator>(const RCTime& his)
-    { return (gmt > his.gmt) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCTime::operator<=(const RCTime& his)
-    { return (gmt <= his.gmt) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCTime::operator>=(const RCTime& his)
-    { return (gmt >= his.gmt) ? PR_TRUE : PR_FALSE; }
-inline PRBool RCTime::operator==(const RCTime& his)
-    { return (gmt == his.gmt) ? PR_TRUE : PR_FALSE; }
-
-inline RCTime& RCTime::operator+=(const RCTime& his)
-    { gmt += his.gmt; return *this; }
-inline RCTime& RCTime::operator-=(const RCTime& his)
-    { gmt -= his.gmt; return *this; }
-inline RCTime& RCTime::operator/=(PRUint64 his)
-    { gmt /= his; return *this; }
-inline RCTime& RCTime::operator*=(PRUint64 his)
-    { gmt *= his; return *this; }
-
-#endif /* defined(_RCTIME_H) */
-
-/* RCTime.h */
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore b/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in b/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in
deleted file mode 100644
index 1ef206971f..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/Makefile.in
+++ /dev/null
@@ -1,288 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-endif
-
-CXXSRCS =           \
-	ranfile.cpp     \
-	thread.cpp      \
-	interval.cpp    \
-	time.cpp        \
-	fileio.cpp      \
-	switch.cpp      \
-	tpd.cpp         \
-	$(NULL)
-
-OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS) $(OBJS)
-
-INCLUDES = -I.. -I$(dist_includedir)
-
-# Setting the variables LDOPTS and LIBPR.  We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(dist_libdir)
-LIBPR = -lnspr$(MOD_MAJOR_VERSION)
-LIBPL = -lplc$(MOD_MAJOR_VERSION)
-
-ifeq ($(OS_ARCH), IRIX)
-    LDOPTS += -rpath $(PWD)/$(dist_libdir) -rdata_shared
-    # For 6.x machines, include this flag
-    ifeq ($(basename $(OS_RELEASE)),6)
-        ifeq ($(USE_N32),1)
-            LDOPTS += -n32
-        else
-            LDOPTS += -32
-        endif
-
-        ifeq ($(USE_PTHREADS), 1)
-            ifeq ($(OS_RELEASE), 6.2)
-                LDOPTS += -Wl,-woff,85
-            endif
-        endif
-    endif
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-    ifneq ($(OS_RELEASE), 4.1.3_U1)
-        ifdef NS_USE_GCC
-            LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
-        else
-            LDOPTS += -R $(PWD)/$(dist_libdir)
-        endif
-    endif
-
-    ifneq ($(LOCAL_THREADS_ONLY),1)
-# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
-# even though we already linked with these system libraries
-# when we built libnspr.so.
-        ifeq ($(OS_RELEASE), 5.4)
-            EXTRA_LIBS = -lthread
-        endif
-
-        ifeq ($(OS_RELEASE), 5.5)
-            ifdef USE_PTHREADS
-                EXTRA_LIBS = -lpthread
-            else
-                EXTRA_LIBS = -lthread
-            endif
-        endif
-    endif # LOCAL_THREADS_ONLY
-endif # SunOS
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-  LIBPL = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
-else
-  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-  LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-  LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-  ifeq ($(MOZ_OS2_TOOLS),VACPP)
-    LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
-    LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-    LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
-  else
-    LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
-  endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-PWD = $(shell pwd)
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-    LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir)
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-    LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-    ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-        LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
-        LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
-    else
-        LDOPTS += -brtl
-        EXTRA_LIBS = -ldl
-    endif
-endif
-
-ifeq ($(OS_ARCH), Linux)
-    ifeq ($(OS_RELEASE), 1.2)
-        EXTRA_LIBS = -ldl
-    else
-        LDOPTS += -Xlinker -rpath $(PWD)/$(dist_libdir)
-        ifeq ($(USE_PTHREADS),1)
-            EXTRA_LIBS = -lpthread
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), NCR)
-# XXX: We see some strange problems when we link with libnspr.so.
-# So for now we use static libraries on NCR.  The shared library
-# stuff below is commented out.
-LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
-EXTRA_LIBS = -lsocket -lnsl -ldl
-
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-#EXTRA_LIBS = -lsocket -lnsl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), SCO_SV)
-# SCO Unix needs to link against -lsocket again even though we
-# already linked with these system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), UNIXWARE)
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifneq ($(OS_RELEASE),4.2)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
-	echo system windows         >w16link
-	echo option map             >>w16link
-	echo option stack=10K       >>w16link
-	echo option heapsize=32K    >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo name $@                >>w16link
-	echo file                   >>w16link
-	echo $<                     >>w16link
-	echo library                >>w16link
-	echo $(LIBPR),	            >>w16link
-	echo $(LIBPL),	            >>w16link
-	echo winsock.lib            >>w16link
-	wlink @w16link.
-else
-	link $(LDOPTS) $< $(LIBPR) $(LIBPL) wsock32.lib -out:$@
-endif
-else
-ifeq ($(OS_ARCH),OS2)
-	$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
-else
-	$(CCC) $(XCFLAGS) $< $(LDOPTS) $(LIBPR) $(LIBPL) $(EXTRA_LIBS) -o $@
-endif
-endif
-endif
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp b/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp
deleted file mode 100644
index a01ea5eb0e..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/fileio.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* fileio.cpp - a test program */
-
-#include "rcfileio.h"
-
-#include <prlog.h>
-#include <prprf.h>
-
-#define DEFAULT_ITERATIONS 100
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    RCFileIO fd;
-    RCFileInfo info;
-    rv = fd.Open("filio.dat", PR_CREATE_FILE, 0666);
-    PR_ASSERT(PR_SUCCESS == rv);
-    rv = fd.FileInfo(&info);
-    PR_ASSERT(PR_SUCCESS == rv);
-    rv = fd.Delete("filio.dat");
-    PR_ASSERT(PR_SUCCESS == rv);
-    fd.Close();
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    return 0;
-}  /* main */
-
-/* interval.cpp */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp b/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp
deleted file mode 100644
index 1223d67a72..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/interval.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* interval.cpp - a test program */
-
-#include "rclock.h"
-#include "rcthread.h"
-#include "rcinrval.h"
-#include "rccv.h"
-
-#include <prio.h>
-#include <prlog.h>
-#include <prprf.h>
-
-#define DEFAULT_ITERATIONS 100
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    RCLock ml;
-    PRStatus rv;
-    RCCondition cv(&ml);
-
-    RCInterval now, timeout, epoch, elapsed;
-    PRFileDesc *output = PR_GetSpecialFD(PR_StandardOutput);
-    PRIntn msecs, seconds, loops, iterations = DEFAULT_ITERATIONS;
-
-    /* slow, agonizing waits */
-    for (seconds = 0; seconds < 10; ++seconds)
-    {
-        timeout = RCInterval::FromSeconds(seconds);
-        cv.SetTimeout(timeout);
-        {
-            RCEnter lock(&ml);
-
-            epoch.SetToNow();
-
-            rv = cv.Wait();
-            PR_ASSERT(PR_SUCCESS == rv);
-
-            now = RCInterval(RCInterval::now);
-            elapsed = now - epoch;
-        }
-
-        PR_fprintf(
-            output, "Waiting %u seconds took %s%u milliseconds\n",
-            seconds, ((elapsed < timeout)? "**" : ""),
-            elapsed.ToMilliseconds());
-    }
-
-    /* more slow, agonizing sleeps */
-    for (seconds = 0; seconds < 10; ++seconds)
-    {
-        timeout = RCInterval::FromSeconds(seconds);
-        {
-            epoch.SetToNow();
-
-            rv = RCThread::Sleep(timeout);
-            PR_ASSERT(PR_SUCCESS == rv);
-
-            now = RCInterval(RCInterval::now);
-            elapsed = now - epoch;
-        }
-
-        PR_fprintf(
-            output, "Sleeping %u seconds took %s%u milliseconds\n",
-            seconds, ((elapsed < timeout)? "**" : ""),
-            elapsed.ToMilliseconds());
-    }
-
-    /* fast, spritely little devils */
-    for (msecs = 10; msecs < 100; msecs += 10)
-    {
-        timeout = RCInterval::FromMilliseconds(msecs);
-        cv.SetTimeout(timeout);
-        {
-            RCEnter lock(&ml);
-
-            epoch.SetToNow();
-
-            for (loops = 0; loops < iterations; ++loops)
-            {
-                rv = cv.Wait();
-                PR_ASSERT(PR_SUCCESS == rv);
-            }
-
-            now = RCInterval(RCInterval::now);
-            elapsed = now - epoch;
-        }
-        elapsed /= iterations;
-
-        PR_fprintf(
-            output, "Waiting %u msecs took %s%u milliseconds average\n",
-            msecs, ((elapsed < timeout)? "**" : ""), elapsed.ToMilliseconds());
-    }
-    return 0;
-}  /* main */
-
-/* interval.cpp */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp b/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp
deleted file mode 100644
index b745b15c53..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/ranfile.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Contact:     AOF<mailto:freier@netscape.com>
-**
-** Name: ranfile.c
-**
-** Description: Test to hammer on various components of NSPR
-** Modification History:
-** 20-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include <plgetopt.h>
-#include <prprf.h>
-#include <prio.h>
-
-#include "rccv.h"
-#include "rcthread.h"
-#include "rcfileio.h"
-#include "rclock.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static PRFileDesc *output;
-static PRIntn debug_mode = 0;
-static PRIntn failed_already = 0;
-
-class HammerData
-{
-public:
-    typedef enum {
-        sg_go, sg_stop, sg_done} Action;
-    typedef enum {
-        sg_okay, sg_open, sg_close, sg_delete, sg_write, sg_seek} Problem;
-
-	virtual ~HammerData();
-	HammerData(RCLock* lock, RCCondition *cond, PRUint32 clip);
-    virtual PRUint32 Random();
-
-    Action action;
-    Problem problem;
-    PRUint32 writes;
-    RCInterval timein;
-friend class Hammer;
-private:
-    RCLock *ml;
-    RCCondition *cv;
-    PRUint32 limit;
-
-    PRFloat64 seed;
-};  /* HammerData */
-
-class Hammer: public HammerData, public RCThread
-{
-public:
-    virtual ~Hammer();
-    Hammer(RCThread::Scope scope, RCLock* lock, RCCondition *cond, PRUint32 clip);
-
-private:
-    void RootFunction();
-
-};
-
-static PRInt32 pageSize = 1024;
-static const char* baseName = "./";
-static const char *programName = "Random File";
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Random
-** DESCRIPTION:
-**   Generate a pseudo-random number
-** INPUTS:      None
-** OUTPUTS:     None
-** RETURN:      A pseudo-random unsigned number, 32-bits wide
-** SIDE EFFECTS:
-**      Updates random seed (a static)
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:
-**      Uses the current interval timer value, promoted to a 64 bit
-**      float as a multiplier for a static residue (which begins
-**      as an uninitialized variable). The result is bits [16..48)
-**      of the product. Seed is then updated with the return value
-**      promoted to a float-64.
-***********************************************************************/
-PRUint32 HammerData::Random()
-{
-    PRUint32 rv;
-    PRUint64 shift;
-    RCInterval now = RCInterval(RCInterval::now);
-    PRFloat64 random = seed * (PRFloat64)((PRIntervalTime)now);
-    LL_USHR(shift, *((PRUint64*)&random), 16);
-    LL_L2UI(rv, shift);
-    seed = (PRFloat64)rv;
-    return rv;
-}  /* HammerData::Random */
-
-Hammer::~Hammer() { }
-
-Hammer::Hammer(
-    RCThread::Scope scope, RCLock* lock, RCCondition *cond, PRUint32 clip):
-	HammerData(lock, cond, clip), RCThread(scope, RCThread::joinable, 0) { }
-
-HammerData::~HammerData() { }
-
-HammerData::HammerData(RCLock* lock, RCCondition *cond, PRUint32 clip)
-{
-    ml = lock;
-    cv = cond;
-    writes = 0;
-    limit = clip;
-    seed = 0x58a9382;
-    action = HammerData::sg_go;
-    problem = HammerData::sg_okay;
-    timein = RCInterval(RCInterval::now);
-}  /* HammerData::HammerData */
-
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Hammer::RootFunction
-** DESCRIPTION:
-**   Hammer on the file I/O system
-** INPUTS:      A pointer to the thread's private data
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      Creates, accesses and deletes a file
-** RESTRICTIONS:
-**      (Currently) must have file create permission in "/usr/tmp".
-** MEMORY:      NA
-** ALGORITHM:
-**      This function is a root of a thread
-**      1) Creates a (hopefully) unique file in /usr/tmp/
-**      2) Writes a zero to a random number of sequential pages
-**      3) Closes the file
-**      4) Reopens the file
-**      5) Seeks to a random page within the file
-**      6) Writes a one byte on that page
-**      7) Repeat steps [5..6] for each page in the file
-**      8) Close and delete the file
-**      9) Repeat steps [1..8] until told to stop
-**     10) Notify complete and return
-***********************************************************************/
-void Hammer::RootFunction()
-{
-    PRUint32 index;
-    RCFileIO file;
-    char filename[30];
-    const char zero = 0;
-    PRStatus rv = PR_SUCCESS;
-
-    limit = (Random() % limit) + 1;
-
-    (void)sprintf(filename, "%ssg%04p.dat", baseName, this);
-
-    if (debug_mode) PR_fprintf(output, "Starting work on %s\n", filename);
-
-    while (PR_TRUE)
-    {
-        PRUint64 bytes;
-        PRUint32 minor = (Random() % limit) + 1;
-        PRUint32 random = (Random() % limit) + 1;
-        PRUint32 pages = (Random() % limit) + 10;
-        while (minor-- > 0)
-        {
-            problem = sg_okay;
-            if (action != sg_go) goto finished;
-            problem = sg_open;
-            rv = file.Open(filename, PR_RDWR|PR_CREATE_FILE, 0666);
-            if (PR_FAILURE == rv) goto finished;
-            for (index = 0; index < pages; index++)
-            {
-                problem = sg_okay;
-                if (action != sg_go) goto close;
-                problem = sg_seek;
-                bytes = file.Seek(pageSize * index, RCFileIO::set);
-                if (bytes != pageSize * index) goto close;
-                problem = sg_write;
-                bytes = file.Write(&zero, sizeof(zero));
-                if (bytes <= 0) goto close;
-                writes += 1;
-            }
-            problem = sg_close;
-            rv = file.Close();
-            if (rv != PR_SUCCESS) goto purge;
-
-            problem = sg_okay;
-            if (action != sg_go) goto purge;
-
-            problem = sg_open;
-            rv = file.Open(filename, PR_RDWR, 0666);
-            if (PR_FAILURE == rv) goto finished;
-            for (index = 0; index < pages; index++)
-            {
-                problem = sg_okay;
-                if (action != sg_go) goto close;
-                problem = sg_seek;
-                bytes = file.Seek(pageSize * index, RCFileIO::set);
-                if (bytes != pageSize * index) goto close;
-                problem = sg_write;
-                bytes = file.Write(&zero, sizeof(zero));
-                if (bytes <= 0) goto close;
-                writes += 1;
-                random = (random + 511) % pages;
-            }
-            problem = sg_close;
-            rv = file.Close();
-            if (rv != PR_SUCCESS) goto purge;
-            problem = sg_delete;
-            rv = file.Delete(filename);
-            if (rv != PR_SUCCESS) goto finished;
-       }
-    }
-
-close:
-    (void)file.Close();
-purge:
-    (void)file.Delete(filename);
-finished:
-    RCEnter scope(ml);
-    action = HammerData::sg_done;
-    cv->Notify();
-
-    if (debug_mode) PR_fprintf(output, "Ending work on %s\n", filename);
-
-    return;
-}  /* Hammer::RootFunction */
-
-static Hammer* hammer[100];
-/***********************************************************************
-** PRIVATE FUNCTION:    main
-** DESCRIPTION:
-**   Hammer on the file I/O system
-** INPUTS:      The usual argc and argv
-**              argv[0] - program name (not used)
-**              argv[1] - the number of virtual_procs to execute the major loop
-**              argv[2] - the number of threads to toss into the batch
-**              argv[3] - the clipping number applied to randoms
-**              default values: max_virtual_procs = 2, threads = 10, limit = 57
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      Creates, accesses and deletes lots of files
-** RESTRICTIONS:
-**      (Currently) must have file create permission in "/usr/tmp".
-** MEMORY:      NA
-** ALGORITHM:
-**      1) Fork a "Thread()"
-**      2) Wait for 'interleave' seconds
-**      3) For [0..'threads') repeat [1..2]
-**      4) Mark all objects to stop
-**      5) Collect the threads, accumulating the results
-**      6) For [0..'max_virtual_procs') repeat [1..5]
-**      7) Print accumulated results and exit
-**
-**      Characteristic output (from IRIX)
-**          Random File: Using max_virtual_procs = 2, threads = 10, limit = 57
-**          Random File: [min [avg] max] writes/sec average
-***********************************************************************/
-PRIntn main (PRIntn argc, char *argv[])
-{
-    RCLock ml;
-	PLOptStatus os;
-    RCCondition cv(&ml);
-    PRUint32 writesMax = 0, durationTot = 0;
-    RCThread::Scope thread_scope = RCThread::local;
-    PRUint32 writes, writesMin = 0x7fffffff, writesTot = 0;
-    PRIntn active, poll, limit = 0, max_virtual_procs = 0, threads = 0, virtual_procs;
-    RCInterval interleave(RCInterval::FromMilliseconds(10000)), duration(0);
-
-    const char *where[] = {"okay", "open", "close", "delete", "write", "seek"};
-
-	PLOptState *opt = PL_CreateOptState(argc, argv, "Gdl:t:i:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-	case 0:
-		baseName = opt->value;
-		break;
-        case 'G':  /* global threads */
-		thread_scope = RCThread::global;
-            break;
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'l':  /* limiting number */
-			limit = atoi(opt->value);
-            break;
-        case 't':  /* number of threads */
-			threads = atoi(opt->value);
-            break;
-        case 'i':  /* iteration counter */
-			max_virtual_procs = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-    output = PR_GetSpecialFD(PR_StandardOutput);
-
- /* main test */
- 
-    cv.SetTimeout(interleave);
-	
-    if (max_virtual_procs == 0) max_virtual_procs = 2;
-    if (limit == 0) limit = 57;
-    if (threads == 0) threads = 10;
-
-    if (debug_mode) PR_fprintf(output,
-        "%s: Using %d virtual processors, %d threads, limit = %d and %s threads\n",
-        programName, max_virtual_procs, threads, limit,
-        (thread_scope == RCThread::local) ? "LOCAL" : "GLOBAL");
-
-    for (virtual_procs = 0; virtual_procs < max_virtual_procs; ++virtual_procs)
-    {
-        if (debug_mode)
-			PR_fprintf(output,
-				"%s: Setting number of virtual processors to %d\n",
-				programName, virtual_procs + 1);
-		RCPrimordialThread::SetVirtualProcessors(virtual_procs + 1);
-        for (active = 0; active < threads; active++)
-        {
-            hammer[active] = new Hammer(thread_scope, &ml, &cv, limit);
-            hammer[active]->Start();  /* then make it roll */
-            RCThread::Sleep(interleave);  /* start them slowly */
-        }
-
-        /*
-         * The last thread started has had the opportunity to run for
-         * 'interleave' seconds. Now gather them all back in.
-         */
-        {
-            RCEnter scope(&ml);
-            for (poll = 0; poll < threads; poll++)
-            {
-                if (hammer[poll]->action == HammerData::sg_go)  /* don't overwrite done */
-                    hammer[poll]->action = HammerData::sg_stop;  /* ask him to stop */
-            }
-        }
-
-        while (active > 0)
-        {
-            for (poll = 0; poll < threads; poll++)
-            {
-                ml.Acquire();
-                while (hammer[poll]->action < HammerData::sg_done) cv.Wait();
-                ml.Release();
-
-                if (hammer[poll]->problem == HammerData::sg_okay)
-                {
-                    duration = RCInterval(RCInterval::now) - hammer[poll]->timein;
-                    writes = hammer[poll]->writes * 1000 / duration;
-                    if (writes < writesMin)  writesMin = writes;
-                    if (writes > writesMax) writesMax = writes;
-                    writesTot += hammer[poll]->writes;
-                    durationTot += duration;
-                }
-                else
-                {
-                    if (debug_mode) PR_fprintf(output,
-                        "%s: test failed %s after %ld seconds\n",
-                        programName, where[hammer[poll]->problem], duration);
-					else failed_already=1;
-                }
-                active -= 1;  /* this is another one down */
-                (void)hammer[poll]->Join();
-                hammer[poll] = NULL;
-            }
-        }
-        if (debug_mode) PR_fprintf(output,
-            "%s: [%ld [%ld] %ld] writes/sec average\n",
-            programName, writesMin,
-            writesTot * 1000 / durationTot, writesMax);
-    }
-
-        failed_already |= (PR_FAILURE == RCPrimordialThread::Cleanup());
-	    PR_fprintf(output, "%s\n", (failed_already) ? "FAIL\n" : "PASS\n");
-		return failed_already;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp b/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp
deleted file mode 100644
index fddc580803..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/switch.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:            switch.cpp
-** Description:     trying to time context switches
-*/
-
-#include "rccv.h"
-#include "rcinrval.h"
-#include "rclock.h"
-#include "rcthread.h"
-
-#include <prio.h>
-#include <prlog.h>
-#include <prprf.h>
-#include <plerror.h>
-#include <plgetopt.h>
-
-#include <stdlib.h>
-
-#define INNER_LOOPS 100
-#define DEFAULT_LOOPS 100
-#define DEFAULT_THREADS 10
-
-static PRFileDesc *debug_out = NULL;
-static PRBool debug_mode = PR_FALSE, verbosity = PR_FALSE, failed = PR_FALSE;
-
-class Home: public RCCondition
-{
-public:
-    virtual ~Home();
-    Home(Home *link, RCLock* ml);
-
-public:
-    Home *next;
-    RCLock* ml;
-    PRBool twiddle;
-};  /* Home */
-
-Home::~Home() { }
-
-Home::Home(Home *link, RCLock* lock): RCCondition(lock)
-{
-    ml = lock;
-    next = link;
-    twiddle = PR_FALSE;
-}  /* Home::Home */
-
-class Shared: public Home, public RCThread
-{
-public:
-    Shared(RCThread::Scope scope, Home* link, RCLock* ml);
-
-private:
-    ~Shared();
-    void RootFunction();
-};  /* Shared */
-
-Shared::Shared(RCThread::Scope scope, Home* link, RCLock* lock):
-    Home(link, lock), RCThread(scope, RCThread::joinable) { }
-
-Shared::~Shared() { }
-
-void Shared::RootFunction()
-{
-    PRStatus status = PR_SUCCESS;
-    while (PR_SUCCESS == status)
-    {
-        RCEnter entry(ml);
-        while (twiddle && (PR_SUCCESS == status)) status = Wait();
-		if (verbosity) PR_fprintf(debug_out, "+");
-        twiddle = PR_TRUE;
-        next->twiddle = PR_FALSE;
-        next->Notify();
-    }
-}  /* Shared::RootFunction */
-
-static void Help(void)
-{
-    debug_out = PR_STDOUT;
-
-    PR_fprintf(
-		debug_out, "Usage: >./switch [-d] [-c n] [-t n] [-T n] [-G]\n");
-    PR_fprintf(
-		debug_out, "-c n\tloops at thread level (default: %d)\n", DEFAULT_LOOPS);
-    PR_fprintf(
-		debug_out, "-t n\tnumber of threads (default: %d)\n", DEFAULT_THREADS);
-    PR_fprintf(debug_out, "-d\tturn on debugging output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-v\tturn on verbose output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-G n\tglobal threads only (default: FALSE)\n");
-    PR_fprintf(debug_out, "-C n\tconcurrency setting (default: 1)\n");
-}  /* Help */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-	PLOptStatus os;
-    PRStatus status;
-    PRBool help = PR_FALSE;
-    PRUintn concurrency = 1;
-    RCThread::Scope thread_scope = RCThread::local;
-    PRUintn thread_count, inner_count, loop_count, average;
-    PRUintn thread_limit = DEFAULT_THREADS, loop_limit = DEFAULT_LOOPS;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "hdvc:t:C:G");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'v':  /* verbose mode */
-			verbosity = PR_TRUE;
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-        case 'c':  /* loop counter */
-			loop_limit = atoi(opt->value);
-            break;
-        case 't':  /* thread limit */
-			thread_limit = atoi(opt->value);
-            break;
-        case 'C':  /* Concurrency limit */
-			concurrency = atoi(opt->value);
-            break;
-        case 'G':  /* global threads only */
-			thread_scope = RCThread::global;
-            break;
-        case 'h':  /* help message */
-			Help();
-			help = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (help) return -1;
-
-	if (PR_TRUE == debug_mode)
-	{
-		debug_out = PR_STDOUT;
-		PR_fprintf(debug_out, "Test parameters\n");
-		PR_fprintf(debug_out, "\tThreads involved: %d\n", thread_limit);
-		PR_fprintf(debug_out, "\tIteration limit: %d\n", loop_limit);
-		PR_fprintf(debug_out, "\tConcurrency: %d\n", concurrency);
-		PR_fprintf(
-			debug_out, "\tThread type: %s\n",
-			(PR_GLOBAL_THREAD == thread_scope) ? "GLOBAL" : "LOCAL");
-	}
-
-    /*
-    ** The interesting part starts here
-    */
-    RCLock lock;
-    Shared* shared;
-    Home home(NULL, &lock);
-    Home* link = &home;
-    RCInterval timein, timeout = 0;
-
-    /* Build up the string of objects */
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        shared = new Shared(thread_scope, link, &lock);
-        shared->Start();  /* make it run */
-        link = (Home*)shared;
-	}
-
-    /* Pass the message around the horn a few times */
-    for (loop_count = 1; loop_count <= loop_limit; ++loop_count)
-    {
-		timein.SetToNow();
-		for (inner_count = 0; inner_count < INNER_LOOPS; ++inner_count)
-		{
-			RCEnter entry(&lock);
-			home.twiddle = PR_TRUE;
-			shared->twiddle = PR_FALSE;
-			shared->Notify();
-			while (home.twiddle)
-            {
-				failed = (PR_FAILURE == home.Wait()) ? PR_TRUE : PR_FALSE;
-            }
-		}
-		timeout += (RCInterval(RCInterval::now) - timein);
-	}
-
-    /* Figure out how well we did */
-	if (debug_mode)
-	{
-		average = timeout.ToMicroseconds()
-			/ (INNER_LOOPS * loop_limit * thread_count);
-		PR_fprintf(
-			debug_out, "Average switch times %d usecs for %d threads\n",
-            average, thread_limit);
-	}
-
-    /* Start reclamation process */
-    link = shared;
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        if (&home == link) break;
-        status = ((Shared*)link)->Interrupt();
-		if (PR_SUCCESS != status)
-        {
-            failed = PR_TRUE;
-            if (debug_mode)
-			    PL_FPrintError(debug_out, "Failed to interrupt");
-        }
-		link = link->next; 
-    }
-
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        link = shared->next;
-        status = shared->Join();
-		if (PR_SUCCESS != status)
-		{
-            failed = PR_TRUE;
-            if (debug_mode)
-			    PL_FPrintError(debug_out, "Failed to join");
-        }
-        if (&home == link) break;
-        shared = (Shared*)link;
-    }
-
-    PR_fprintf(PR_STDOUT, ((failed) ? "FAILED\n" : "PASSED\n"));
-
-    failed |= (PR_SUCCESS == RCPrimordialThread::Cleanup());
-
-    return ((failed) ? 1 : 0);
-}  /* main */
-
-/* switch.c */
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp b/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp
deleted file mode 100644
index 801eee0da7..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/thread.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* thread.cpp - a test program */
-
-#include "rcthread.h"
-
-#include <prlog.h>
-
-#include <stdio.h>
-
-class TestThread: public RCThread
-{
-public:
-    TestThread(RCThread::State state, PRIntn count);
-
-    virtual void RootFunction();
-
-protected:
-    virtual ~TestThread();
-
-private:
-    PRUint32 mydata;
-};
-
-TestThread::~TestThread() { }
-
-TestThread::TestThread(RCThread::State state, PRIntn count):
-    RCThread(RCThread::global, state, 0) { mydata = count; }
-
-void TestThread::RootFunction()
-{
-    SetPriority(RCThread::high);
-    printf("TestThread::RootFunction %d did it\n", mydata);
-}  /* TestThread::RootFunction */
-
-class Foo1
-{
-public:
-    Foo1();
-    virtual ~Foo1();
-
-    TestThread *thread;
-    PRIntn data;
-};
-
-Foo1::Foo1() 
-{
-    data = 0xafaf;
-    thread = new TestThread(RCThread::joinable, 0xafaf);
-    thread->Start();
-}
-
-Foo1::~Foo1()
-{
-    PRStatus rv = thread->Join();
-    PR_ASSERT(PR_SUCCESS == rv);
-}  /* Foo1::~Foo1 */
-
-PRIntn main(PRIntn argc, char **agrv)
-{
-    PRStatus status;
-    PRIntn count = 100;
-    RCThread *thread[10];
-    while (--count > 0)
-    {
-        TestThread *thread = new TestThread(RCThread::joinable, count);
-        status = thread->Start();  /* have to remember to start it */
-        PR_ASSERT(PR_SUCCESS == status);
-        status = thread->Join();  /* this should work */
-        PR_ASSERT(PR_SUCCESS == status);
-    }
-    while (++count < 100)
-    {
-        TestThread *thread = new TestThread(RCThread::unjoinable, count);
-        status = thread->Start();  /* have to remember to start it */
-        PR_ASSERT(PR_SUCCESS == status);
-    }
-
-    {
-        Foo1 *foo1 = new Foo1();
-        PR_ASSERT(NULL != foo1);
-        delete foo1;
-    }
-
-    {
-        for (count = 0; count < 10; ++count)
-        {
-            thread[count] = new TestThread( RCThread::joinable, count);
-            status = thread[count]->Start();  /* have to remember to start it */
-            PR_ASSERT(PR_SUCCESS == status);
-        }
-        for (count = 0; count < 10; ++count)
-        {
-            PRStatus rv = thread[count]->Join();
-            PR_ASSERT(PR_SUCCESS == rv);
-        }
-    }
-
-    (void)RCPrimordialThread::Cleanup();
-
-    return 0;
-}  /* main */
-
-/* thread.cpp */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/time.cpp b/libs/js/nsprpub/pr/src/cplus/tests/time.cpp
deleted file mode 100644
index c0a9c3e86f..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/time.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* time.cpp - a test program */
-
-#include "rctime.h"
-
-#include <prlog.h>
-#include <prprf.h>
-
-#define DEFAULT_ITERATIONS 100
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    RCTime unitialized;
-    RCTime now(PR_Now());
-    RCTime current(RCTime::now);
-    PRTime time = current;
-
-    unitialized = now;
-    now.Now();
-
-    return 0;
-}  /* main */
-
-/* time.cpp */
-
diff --git a/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp b/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp
deleted file mode 100644
index 6e3dd95366..0000000000
--- a/libs/js/nsprpub/pr/src/cplus/tests/tpd.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        tpd.cpp
-** Description: Exercising the thread private data bailywick.
-*/
-
-#include "prlog.h"
-#include "prprf.h"
-#include "rcthread.h"
-
-#include <string.h>
-
-#include "plgetopt.h"
-
-/*
-** class MyThread
-*/
-class MyThread: public RCThread
-{
-public:
-    MyThread();
-
-private:
-    ~MyThread();
-    void RootFunction();
-};  /* MyThread */
-
-/*
-** class MyPrivateData
-*/
-class MyPrivateData: public RCThreadPrivateData
-{
-public:
-    virtual ~MyPrivateData();
-
-    MyPrivateData();
-    MyPrivateData(char*);
-    MyPrivateData(const MyPrivateData&);
-
-    void Release();
-
-private:
-    char *string;
-};  /* MyPrivateData */
-
-static PRUintn key[128];
-static PRIntn debug = 0;
-static PRBool failed = PR_FALSE;
-static PRBool should = PR_TRUE;
-static PRBool did = PR_TRUE;
-static PRFileDesc *fout = NULL;
-
-static void PrintProgress(PRIntn line)
-{
-    failed = failed || (should && !did);
-    failed = failed || (!should && did);
-    if (debug > 0)
-    {
-        PR_fprintf(
-            fout, "@ line %d destructor should %shave been called and was%s\n",
-            line, ((should) ? "" : "NOT "), ((did) ? "" : " NOT"));
-    }
-}  /* PrintProgress */
-
-static void MyAssert(const char *expr, const char *file, PRIntn line)
-{
-    if (debug > 0)
-        (void)PR_fprintf(fout, "'%s' in file: %s: %d\n", expr, file, line);
-}  /* MyAssert */
-
-#define MY_ASSERT(_expr) \
-    ((_expr)?((void)0):MyAssert(# _expr,__FILE__,__LINE__))
-
-int main(PRIntn argc, char *argv[])
-{
-    PRStatus rv;
-    PRUintn keys;
-    MyThread *thread;
-    const RCThreadPrivateData *pd;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-    RCThread *primordial = RCThread::WrapPrimordialThread();
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            debug = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    fout = PR_STDOUT;
-
-    MyPrivateData extension = MyPrivateData("EXTENSION");
-    MyPrivateData key_string[] = {
-        "Key #0", "Key #1", "Key #2", "Key #3",
-        "Bogus #5", "Bogus #6", "Bogus #7", "Bogus #8"};
-    
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = RCThread::NewPrivateIndex(&key[keys]);
-        key[keys + 4] = key[keys] + 4;
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* the first four should be bu null, the last four undefined and null */
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 8; ++keys)
-    {
-        pd = RCThread::GetPrivateData(key[keys]);
-        MY_ASSERT(NULL == pd);
-    }
-    PrintProgress(__LINE__);
-
-    /* initially set private data for new keys */
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = RCThread::SetPrivateData(key[keys], &key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* re-assign the private data, albeit the same content */    
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        pd = RCThread::GetPrivateData(key[keys]);
-        PR_ASSERT(NULL != pd);
-        rv = RCThread::SetPrivateData(key[keys], &key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* set private to <empty> */
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = RCThread::SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* should all be null now */
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        pd = RCThread::GetPrivateData(key[keys]);
-        PR_ASSERT(NULL == pd);
-    }
-    PrintProgress(__LINE__);
-
-    /* allocate another batch of keys and assign data to them */
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = RCThread::NewPrivateIndex(&key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-        rv = RCThread::SetPrivateData(key[keys], &extension);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* set all the extended slots to <empty> */
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = RCThread::SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    /* set all the extended slots to <empty> again (noop) */
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = RCThread::SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-
-    if (debug) PR_fprintf(fout, "Creating thread\n");
-    thread = new MyThread();
-    if (debug) PR_fprintf(fout, "Starting thread\n");
-    thread->Start();
-    if (debug) PR_fprintf(fout, "Joining thread\n");
-    (void)thread->Join();
-    if (debug) PR_fprintf(fout, "Joined thread\n");
-
-    failed |= (PR_FAILURE == RCPrimordialThread::Cleanup());
-
-    (void)PR_fprintf(
-        fout, "%s\n",((PR_TRUE == failed) ? "FAILED" : "PASSED"));
-
-    return (failed) ? 1 : 0;
-
-}  /* main */
-
-/*
-** class MyPrivateData
-*/
-MyPrivateData::~MyPrivateData()
-{
-    PR_fprintf(
-        fout, "MyPrivateData::~MyPrivateData[%s]\n",
-        (NULL != string) ? string : "NULL");
-}  /* MyPrivateData::~MyPrivateData */
-
-MyPrivateData::MyPrivateData(): RCThreadPrivateData()
-{
-    PR_fprintf(fout, "MyPrivateData::MyPrivateData()\n");
-    string = NULL;
-}  /* MyPrivateData::MyPrivateData */
-
-MyPrivateData::MyPrivateData(char* data): RCThreadPrivateData()
-{
-    PR_fprintf(fout, "MyPrivateData::MyPrivateData(char* data)\n");
-    string = data;
-}  /* MyPrivateData:: MyPrivateData */
-
-MyPrivateData::MyPrivateData(const MyPrivateData& him): RCThreadPrivateData(him)
-{
-    PR_fprintf(fout, "MyPrivateData::MyPrivateData(const MyPrivateData& him)\n");
-    string = him.string;
-}  /* MyPrivateData:: MyPrivateData */
-
-void MyPrivateData::Release()
-{
-    if (should) did = PR_TRUE;
-    else failed = PR_TRUE;
-}  /* MyPrivateData::operator= */
-
-/*
-** class MyThread
-*/
-MyThread::~MyThread() { }
-MyThread::MyThread(): RCThread(RCThread::global, RCThread::joinable) { }
-
-
-void MyThread::RootFunction()
-{
-    PRStatus rv;
-    PRUintn keys;
-    const RCThreadPrivateData *pd;
-    
-    MyPrivateData extension = MyPrivateData("EXTENSION");
-    MyPrivateData key_string[] = {
-        "Key #0", "Key #1", "Key #2", "Key #3",
-        "Bogus #5", "Bogus #6", "Bogus #7", "Bogus #8"};
-    
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 8; ++keys)
-    {
-        pd = GetPrivateData(key[keys]);
-        MY_ASSERT(NULL == pd);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = SetPrivateData(keys, &key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-#if !defined(DEBUG)
-    did = should = PR_FALSE;
-    for (keys = 4; keys < 8; ++keys)
-    {
-        rv = SetPrivateData(keys, &key_string[keys]);
-        MY_ASSERT(PR_FAILURE == rv);
-    }
-    PrintProgress(__LINE__);
-#endif
-    
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = SetPrivateData(key[keys], &key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = SetPrivateData(key[keys], &extension);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = SetPrivateData(key[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-}  /* MyThread::RootFunction */
-
-/* tpd.c */
diff --git a/libs/js/nsprpub/pr/src/cthreads/.empty b/libs/js/nsprpub/pr/src/cthreads/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pr/src/io/.cvsignore b/libs/js/nsprpub/pr/src/io/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/io/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/io/Makefile.in b/libs/js/nsprpub/pr/src/io/Makefile.in
deleted file mode 100644
index 62d42caf63..0000000000
--- a/libs/js/nsprpub/pr/src/io/Makefile.in
+++ /dev/null
@@ -1,93 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-CSRCS = \
-    prfdcach.c \
-    prmwait.c \
-    priometh.c \
-    pripv6.c \
-    prmapopt.c \
-    prlayer.c \
-    prlog.c \
-	prmmap.c \
-	prprf.c \
-	$(NULL)
-
-ifndef USE_PTHREADS
-    CSRCS += \
-	    prdir.c \
-	    prfile.c \
-	    prio.c \
-	    $(NULL)
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-# An OS/2 Optimization bug causes PR_snprintf() to produce wrong result.
-# This suppresses optimization for this single compilation unit.
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-$(OBJDIR)/prprf.obj: prprf.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $<
-endif
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/io/prdir.c b/libs/js/nsprpub/pr/src/io/prdir.c
deleted file mode 100644
index 8679c9d528..0000000000
--- a/libs/js/nsprpub/pr/src/io/prdir.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roy Yokoyama <yokoyama@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-PR_IMPLEMENT(PRDir*) PR_OpenDir(const char *name)
-{
-    PRDir *dir;
-    PRStatus sts;
-
-    dir = PR_NEW(PRDir);
-    if (dir) {
-        sts = _PR_MD_OPEN_DIR(&dir->md,name);
-        if (sts != PR_SUCCESS) {
-            PR_DELETE(dir);
-            return NULL;
-        }
-    } else {
-		PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	}
-    return dir;
-}
-
-PR_IMPLEMENT(PRDirEntry*) PR_ReadDir(PRDir *dir, PRDirFlags flags)
-{
-    /* _MD_READ_DIR return a char* to the name; allocation in machine-dependent code */
-    char* name = _PR_MD_READ_DIR(&dir->md, flags);
-    dir->d.name = name;
-    return name ? &dir->d : NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseDir(PRDir *dir)
-{
-PRInt32 rv;
-
-    if (dir) {
-        rv = _PR_MD_CLOSE_DIR(&dir->md);
-		PR_DELETE(dir);
-		if (rv < 0) {
-			return PR_FAILURE;
-		} else
-			return PR_SUCCESS;
-    }
-	return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_MkDir(const char *name, PRIntn mode)
-{
-PRInt32 rv;
-
-	rv = _PR_MD_MKDIR(name, mode);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_MakeDir(const char *name, PRIntn mode)
-{
-PRInt32 rv;
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-	rv = _PR_MD_MAKE_DIR(name, mode);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_RmDir(const char *name)
-{
-PRInt32 rv;
-
-	rv = _PR_MD_RMDIR(name);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-#ifdef MOZ_UNICODE
-/*
- *  UTF16 Interface
- */
-PR_IMPLEMENT(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name)
-{ 
-    PRDirUTF16 *dir;
-    PRStatus sts;
-
-    dir = PR_NEW(PRDirUTF16);
-    if (dir) {
-        sts = _PR_MD_OPEN_DIR_UTF16(&dir->md,name);
-        if (sts != PR_SUCCESS) {
-            PR_DELETE(dir);
-            return NULL;
-        }
-    } else {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    }
-    return dir;
-}  
- 
-PR_IMPLEMENT(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags)
-{ 
-    /*
-     * _MD_READ_DIR_UTF16 return a PRUnichar* to the name; allocation in
-     * machine-dependent code
-     */
-    PRUnichar* name = _PR_MD_READ_DIR_UTF16(&dir->md, flags);
-    dir->d.name = name;
-    return name ? &dir->d : NULL;
-} 
- 
-PR_IMPLEMENT(PRStatus) PR_CloseDirUTF16(PRDirUTF16 *dir)
-{ 
-    PRInt32 rv; 
-
-    if (dir) {
-        rv = _PR_MD_CLOSE_DIR_UTF16(&dir->md);
-        PR_DELETE(dir);
-        if (rv < 0)
-	    return PR_FAILURE;
-        else
-	    return PR_SUCCESS;
-    } 
-    return PR_SUCCESS;
-}
-
-#endif /* MOZ_UNICODE */
diff --git a/libs/js/nsprpub/pr/src/io/prfdcach.c b/libs/js/nsprpub/pr/src/io/prfdcach.c
deleted file mode 100644
index fefefbace0..0000000000
--- a/libs/js/nsprpub/pr/src/io/prfdcach.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-/*****************************************************************************/
-/*****************************************************************************/
-/************************** File descriptor caching **************************/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/*
-** This code is built into debuggable versions of NSPR to assist in
-** finding misused file descriptors. Since file descritors (PRFileDesc)
-** are identified by a pointer to their structure, they can be the
-** target of dangling references. Furthermore, NSPR caches and tries
-** to aggressively reuse file descriptors, leading to more ambiguity.
-** The following code will allow a debugging client to set environment
-** variables and control the number of file descriptors that will be
-** preserved before they are recycled. The environment variables are
-** NSPR_FD_CACHE_SIZE_LOW and NSPR_FD_CACHE_SIZE_HIGH. The former sets
-** the number of descriptors NSPR will allocate before beginning to
-** recycle. The latter is the maximum number permitted in the cache
-** (exclusive of those in use) at a time.
-*/
-typedef struct _PR_Fd_Cache
-{
-    PRLock *ml;
-    PRIntn count;
-    PRStack *stack;
-    PRFileDesc *head, *tail;
-    PRIntn limit_low, limit_high;
-} _PR_Fd_Cache;
-
-static _PR_Fd_Cache _pr_fd_cache;
-static PRFileDesc **stack2fd = &(((PRFileDesc*)NULL)->higher);
-
-
-/*
-** Get a FileDescriptor from the cache if one exists. If not allocate
-** a new one from the heap.
-*/
-PRFileDesc *_PR_Getfd(void)
-{
-    PRFileDesc *fd;
-    /*
-    ** $$$
-    ** This may look a little wasteful. We'll see. Right now I want to
-    ** be able to toggle between caching and not at runtime to measure
-    ** the differences. If it isn't too annoying, I'll leave it in.
-    ** $$$$
-    **
-    ** The test is against _pr_fd_cache.limit_high. If that's zero,
-    ** we're not doing the extended cache but going for performance.
-    */
-    if (0 == _pr_fd_cache.limit_high)
-    {
-        PRStackElem *pop;
-        PR_ASSERT(NULL != _pr_fd_cache.stack);
-        pop = PR_StackPop(_pr_fd_cache.stack);
-        if (NULL == pop) goto allocate;
-        fd = (PRFileDesc*)((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
-    }
-    else
-    {
-        do
-        {
-            if (NULL == _pr_fd_cache.head) goto allocate;  /* nothing there */
-            if (_pr_fd_cache.count < _pr_fd_cache.limit_low) goto allocate;
-
-            /* we "should" be able to extract an fd from the cache */
-            PR_Lock(_pr_fd_cache.ml);  /* need the lock to do this safely */
-            fd = _pr_fd_cache.head;  /* protected extraction */
-            if (NULL == fd)  /* unexpected, but not fatal */
-            {
-                PR_ASSERT(0 == _pr_fd_cache.count);
-                PR_ASSERT(NULL == _pr_fd_cache.tail);
-            }
-            else
-            {
-                _pr_fd_cache.count -= 1;
-                _pr_fd_cache.head = fd->higher;
-                if (NULL == _pr_fd_cache.head)
-                {
-                    PR_ASSERT(0 == _pr_fd_cache.count);
-                    _pr_fd_cache.tail = NULL;
-                }
-                PR_ASSERT(&_pr_faulty_methods == fd->methods);
-                PR_ASSERT(PR_INVALID_IO_LAYER == fd->identity);
-                PR_ASSERT(_PR_FILEDESC_FREED == fd->secret->state);
-            }
-            PR_Unlock(_pr_fd_cache.ml);
-
-        } while (NULL == fd);  /* then go around and allocate a new one */
-    }
-
-finished:
-    fd->dtor = NULL;
-    fd->lower = fd->higher = NULL;
-    fd->identity = PR_NSPR_IO_LAYER;
-    memset(fd->secret, 0, sizeof(PRFilePrivate));
-    return fd;
-
-allocate:
-    fd = PR_NEW(PRFileDesc);
-    if (NULL != fd)
-    {
-        fd->secret = PR_NEW(PRFilePrivate);
-        if (NULL == fd->secret) PR_DELETE(fd);
-    }
-    if (NULL != fd) goto finished;
-    else return NULL;
-
-}  /* _PR_Getfd */
-
-/*
-** Return a file descriptor to the cache unless there are too many in
-** there already. If put in cache, clear the fields first.
-*/
-void _PR_Putfd(PRFileDesc *fd)
-{
-    PR_ASSERT(PR_NSPR_IO_LAYER == fd->identity);
-    fd->methods = &_pr_faulty_methods;
-    fd->identity = PR_INVALID_IO_LAYER;
-    fd->secret->state = _PR_FILEDESC_FREED;
-
-    if (0 == _pr_fd_cache.limit_high)
-    {
-        PR_StackPush(_pr_fd_cache.stack, (PRStackElem*)(&fd->higher));
-    }
-    else
-    {
-        if (_pr_fd_cache.count > _pr_fd_cache.limit_high)
-        {
-            PR_Free(fd->secret);
-            PR_Free(fd);
-        }
-        else
-        {
-            PR_Lock(_pr_fd_cache.ml);
-            if (NULL == _pr_fd_cache.tail)
-            {
-                PR_ASSERT(0 == _pr_fd_cache.count);
-                PR_ASSERT(NULL == _pr_fd_cache.head);
-                _pr_fd_cache.head = _pr_fd_cache.tail = fd;
-            }
-            else
-            {
-                PR_ASSERT(NULL == _pr_fd_cache.tail->higher);
-                _pr_fd_cache.tail->higher = fd;
-                _pr_fd_cache.tail = fd;  /* new value */
-            }
-            fd->higher = NULL;  /* always so */
-            _pr_fd_cache.count += 1;  /* count the new entry */
-            PR_Unlock(_pr_fd_cache.ml);
-        }
-    }
-}  /* _PR_Putfd */
-
-PR_IMPLEMENT(PRStatus) PR_SetFDCacheSize(PRIntn low, PRIntn high)
-{
-    /*
-    ** This can be called at any time, may adjust the cache sizes,
-    ** turn the caches off, or turn them on. It is not dependent
-    ** on the compilation setting of DEBUG.
-    */
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (low > high) low = high;  /* sanity check the params */
-    
-    PR_Lock(_pr_fd_cache.ml);
-    if (0 == high)  /* shutting down or staying down */
-    {
-        if (0 != _pr_fd_cache.limit_high)  /* shutting down */
-        {
-            _pr_fd_cache.limit_high = 0;  /* stop use */
-            /*
-            ** Hold the lock throughout - nobody's going to want it
-            ** other than another caller to this routine. Just don't
-            ** let that happen.
-            **
-            ** Put all the cached fds onto the new cache.
-            */
-            while (NULL != _pr_fd_cache.head)
-            {
-                PRFileDesc *fd = _pr_fd_cache.head;
-                _pr_fd_cache.head = fd->higher;
-                PR_StackPush(_pr_fd_cache.stack, (PRStackElem*)(&fd->higher));
-            }
-            _pr_fd_cache.limit_low = 0;
-            _pr_fd_cache.tail = NULL;
-            _pr_fd_cache.count = 0;
-        }
-    }
-    else  /* starting up or just adjusting parameters */
-    {
-        PRBool was_using_stack = (0 == _pr_fd_cache.limit_high);
-        _pr_fd_cache.limit_low = low;
-        _pr_fd_cache.limit_high = high;
-        if (was_using_stack)  /* was using stack - feed into cache */
-        {
-            PRStackElem *pop;
-            while (NULL != (pop = PR_StackPop(_pr_fd_cache.stack)))
-            {
-                PRFileDesc *fd = (PRFileDesc*)
-                    ((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
-                if (NULL == _pr_fd_cache.tail) _pr_fd_cache.tail = fd;
-                fd->higher = _pr_fd_cache.head;
-                _pr_fd_cache.head = fd;
-                _pr_fd_cache.count += 1;
-            }
-        }
-    }
-    PR_Unlock(_pr_fd_cache.ml);
-    return PR_SUCCESS;
-}  /* PR_SetFDCacheSize */
-
-void _PR_InitFdCache(void)
-{
-    /*
-    ** The fd caching is enabled by default for DEBUG builds,
-    ** disabled by default for OPT builds. That default can
-    ** 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"); */
-
-    /* 
-    ** _low is allowed to be zero, _high is not.
-    ** If _high is zero, we're not doing the caching.
-    */
-
-    _pr_fd_cache.limit_low = 0;
-#if defined(DEBUG)
-    _pr_fd_cache.limit_high = FD_SETSIZE;
-#else
-    _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 (_pr_fd_cache.limit_high < _pr_fd_cache.limit_low)
-        _pr_fd_cache.limit_high = _pr_fd_cache.limit_low;
-
-    _pr_fd_cache.ml = PR_NewLock();
-    PR_ASSERT(NULL != _pr_fd_cache.ml);
-    _pr_fd_cache.stack = PR_CreateStack("FD");
-    PR_ASSERT(NULL != _pr_fd_cache.stack);
-
-}  /* _PR_InitFdCache */
-
-void _PR_CleanupFdCache(void)
-{
-    PRFileDesc *fd, *next;
-    PRStackElem *pop;
-
-    for (fd = _pr_fd_cache.head; fd != NULL; fd = next)
-    {
-        next = fd->higher;
-        PR_DELETE(fd->secret);
-        PR_DELETE(fd);
-    }
-    PR_DestroyLock(_pr_fd_cache.ml);
-    while ((pop = PR_StackPop(_pr_fd_cache.stack)) != NULL)
-    {
-        fd = (PRFileDesc*)((PRPtrdiff)pop - (PRPtrdiff)stack2fd);
-        PR_DELETE(fd->secret);
-        PR_DELETE(fd);
-    }
-    PR_DestroyStack(_pr_fd_cache.stack);
-}  /* _PR_CleanupFdCache */
-
-/* prfdcach.c */
diff --git a/libs/js/nsprpub/pr/src/io/prfile.c b/libs/js/nsprpub/pr/src/io/prfile.c
deleted file mode 100644
index 5b4c074223..0000000000
--- a/libs/js/nsprpub/pr/src/io/prfile.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-#include <fcntl.h>
-
-#ifdef XP_UNIX
-#if defined(AIX) || defined(QNX)
-/* To pick up sysconf */
-#include <unistd.h>
-#else
-/* To pick up getrlimit, setrlimit */
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-#endif /* XP_UNIX */
-
-extern PRLock *_pr_flock_lock;
-extern PRCondVar *_pr_flock_cv;
-
-static PRInt32 PR_CALLBACK FileRead(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    PRInt32 rv = 0;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (_PR_PENDING_INTERRUPT(me)) {
- 		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		rv = -1;
-    }
-    if (_PR_IO_PENDING(me)) {
-        PR_SetError(PR_IO_PENDING_ERROR, 0);
-	rv = -1;
-    }
-    if (rv == -1)
-    	return rv;
-
-	rv = _PR_MD_READ(fd, buf, amount);
-	if (rv < 0) {
-		PR_ASSERT(rv == -1);
-	}
-    PR_LOG(_pr_io_lm, PR_LOG_MAX, ("read -> %d", rv));
-    return rv;
-}
-
-static PRInt32 PR_CALLBACK FileWrite(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    PRInt32 rv = 0;
-    PRInt32 temp, count;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (_PR_PENDING_INTERRUPT(me)) {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-	    rv = -1;
-    }
-    if (_PR_IO_PENDING(me)) {
-        PR_SetError(PR_IO_PENDING_ERROR, 0);
-	    rv = -1;
-    }
-    if (rv != 0)
-    	return rv;
-
-    count = 0;
-#if !defined(_PR_HAVE_O_APPEND)  /* Bugzilla: 4090, 276330 */
-    if ( PR_TRUE == fd->secret->appendMode ) {
-        rv = PR_Seek(fd, 0, PR_SEEK_END );
-        if ( -1 == rv )  {
-            return rv;
-        }
-    } /* if (fd->secret->appendMode...) */
-#endif /* _PR_HAVE_O_APPEND */
-    while (amount > 0) {
-		temp = _PR_MD_WRITE(fd, buf, amount);
-		if (temp < 0) {
-			count = -1;
-			break;
-		}
-		count += temp;
-		if (fd->secret->nonblocking) {
-			break;
-		}
-		buf = (const void*) ((const char*)buf + temp);
-		amount -= temp;
-    }
-    PR_LOG(_pr_io_lm, PR_LOG_MAX, ("write -> %d", count));
-    return count;
-}
-
-static PROffset32 PR_CALLBACK FileSeek(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence)
-{
-    PROffset32 result;
-
-    result = _PR_MD_LSEEK(fd, offset, whence);
-    return result;
-}
-
-static PROffset64 PR_CALLBACK FileSeek64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence)
-{
-#ifdef XP_MAC
-#pragma unused( fd, offset, whence )
-#endif
-    PROffset64 result;
-
-    result = _PR_MD_LSEEK64(fd, offset, whence);
-    return result;
-}
-
-static PRInt32 PR_CALLBACK FileAvailable(PRFileDesc *fd)
-{
-    PRInt32 result, cur, end;
-
-    cur = _PR_MD_LSEEK(fd, 0, PR_SEEK_CUR);
-
-	if (cur >= 0)
-    	end = _PR_MD_LSEEK(fd, 0, PR_SEEK_END);
-
-    if ((cur < 0) || (end < 0)) {
-        return -1;
-    }
-
-    result = end - cur;
-    _PR_MD_LSEEK(fd, cur, PR_SEEK_SET);
-
-    return result;
-}
-
-static PRInt64 PR_CALLBACK FileAvailable64(PRFileDesc *fd)
-{
-#ifdef XP_MAC
-#pragma unused( fd )
-#endif
-    PRInt64 result, cur, end;
-    PRInt64 minus_one;
-
-    LL_I2L(minus_one, -1);
-    cur = _PR_MD_LSEEK64(fd, LL_ZERO, PR_SEEK_CUR);
-
-    if (LL_GE_ZERO(cur))
-    	end = _PR_MD_LSEEK64(fd, LL_ZERO, PR_SEEK_END);
-
-    if (!LL_GE_ZERO(cur) || !LL_GE_ZERO(end)) return minus_one;
-
-    LL_SUB(result, end, cur);
-    (void)_PR_MD_LSEEK64(fd, cur, PR_SEEK_SET);
-
-    return result;
-}
-
-static PRInt32 PR_CALLBACK PipeAvailable(PRFileDesc *fd)
-{
-	PRInt32 rv;
-	rv =  _PR_MD_PIPEAVAILABLE(fd);
-	return rv;		
-}
-
-static PRInt64 PR_CALLBACK PipeAvailable64(PRFileDesc *fd)
-{
-    PRInt64 rv;
-    LL_I2L(rv, _PR_MD_PIPEAVAILABLE(fd));
-	return rv;		
-}
-
-static PRStatus PR_CALLBACK PipeSync(PRFileDesc *fd)
-{
-#if defined(XP_MAC)
-#pragma unused (fd)
-#endif
-
-	return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK FileGetInfo(PRFileDesc *fd, PRFileInfo *info)
-{
-	PRInt32 rv;
-
-    rv = _PR_MD_GETOPENFILEINFO(fd, info);
-    if (rv < 0) {
-	return PR_FAILURE;
-    } else
-	return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK FileGetInfo64(PRFileDesc *fd, PRFileInfo64 *info)
-{
-#ifdef XP_MAC
-#pragma unused( fd, info )
-#endif
-    /* $$$$ NOT YET IMPLEMENTED */
-	PRInt32 rv;
-
-    rv = _PR_MD_GETOPENFILEINFO64(fd, info);
-    if (rv < 0) return PR_FAILURE;
-    else return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK FileSync(PRFileDesc *fd)
-{
-    PRInt32 result;
-    result = _PR_MD_FSYNC(fd);
-    if (result < 0) {
-		return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK FileClose(PRFileDesc *fd)
-{
-    if (!fd || !fd->secret
-            || (fd->secret->state != _PR_FILEDESC_OPEN
-            && fd->secret->state != _PR_FILEDESC_CLOSED)) {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    if (fd->secret->state == _PR_FILEDESC_OPEN) {
-        if (_PR_MD_CLOSE_FILE(fd->secret->md.osfd) < 0) {
-            return PR_FAILURE;
-        }
-        fd->secret->state = _PR_FILEDESC_CLOSED;
-    }
-    PR_FreeFileDesc(fd);
-    return PR_SUCCESS;
-}
-
-static PRInt16 PR_CALLBACK FilePoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-#ifdef XP_MAC
-#pragma unused( fd, in_flags )
-#endif
-    *out_flags = 0;
-    return in_flags;
-}  /* FilePoll */
-
-static PRIOMethods _pr_fileMethods = {
-    PR_DESC_FILE,
-    FileClose,
-    FileRead,
-    FileWrite,
-    FileAvailable,
-    FileAvailable64,
-    FileSync,
-    FileSeek,
-    FileSeek64,
-    FileGetInfo,
-    FileGetInfo64,
-    (PRWritevFN)_PR_InvalidInt,		
-    (PRConnectFN)_PR_InvalidStatus,		
-    (PRAcceptFN)_PR_InvalidDesc,		
-    (PRBindFN)_PR_InvalidStatus,		
-    (PRListenFN)_PR_InvalidStatus,		
-    (PRShutdownFN)_PR_InvalidStatus,	
-    (PRRecvFN)_PR_InvalidInt,		
-    (PRSendFN)_PR_InvalidInt,		
-    (PRRecvfromFN)_PR_InvalidInt,	
-    (PRSendtoFN)_PR_InvalidInt,		
-    FilePoll,         
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,	
-    (PRGetpeernameFN)_PR_InvalidStatus,	
-    (PRReservedFN)_PR_InvalidInt,	
-    (PRReservedFN)_PR_InvalidInt,	
-    (PRGetsocketoptionFN)_PR_InvalidStatus,	
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetFileMethods(void)
-{
-    return &_pr_fileMethods;
-}
-
-static PRIOMethods _pr_pipeMethods = {
-    PR_DESC_PIPE,
-    FileClose,
-    FileRead,
-    FileWrite,
-    PipeAvailable,
-    PipeAvailable64,
-    PipeSync,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,		
-    (PRConnectFN)_PR_InvalidStatus,		
-    (PRAcceptFN)_PR_InvalidDesc,		
-    (PRBindFN)_PR_InvalidStatus,		
-    (PRListenFN)_PR_InvalidStatus,		
-    (PRShutdownFN)_PR_InvalidStatus,	
-    (PRRecvFN)_PR_InvalidInt,		
-    (PRSendFN)_PR_InvalidInt,		
-    (PRRecvfromFN)_PR_InvalidInt,	
-    (PRSendtoFN)_PR_InvalidInt,		
-    FilePoll,         
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,	
-    (PRGetpeernameFN)_PR_InvalidStatus,	
-    (PRReservedFN)_PR_InvalidInt,	
-    (PRReservedFN)_PR_InvalidInt,	
-    (PRGetsocketoptionFN)_PR_InvalidStatus,	
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetPipeMethods(void)
-{
-    return &_pr_pipeMethods;
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode)
-{
-    PROsfd osfd;
-    PRFileDesc *fd = 0;
-#if !defined(_PR_HAVE_O_APPEND)
-    PRBool  appendMode = ( PR_APPEND & flags )? PR_TRUE : PR_FALSE;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    /* Map pr open flags and mode to os specific flags */
-
-    osfd = _PR_MD_OPEN(name, flags, mode);
-    if (osfd != -1) {
-        fd = PR_AllocFileDesc(osfd, &_pr_fileMethods);
-        if (!fd) {
-            (void) _PR_MD_CLOSE_FILE(osfd);
-        } else {
-#if !defined(_PR_HAVE_O_APPEND)
-            fd->secret->appendMode = appendMode;
-#endif
-            _PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
-        }
-    }
-    return fd;
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
-    const char *name, PRIntn flags, PRIntn mode)
-{
-    PROsfd osfd;
-    PRFileDesc *fd = 0;
-#if !defined(_PR_HAVE_O_APPEND)
-    PRBool  appendMode = ( PR_APPEND & flags )? PR_TRUE : PR_FALSE;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    /* Map pr open flags and mode to os specific flags */
-
-    osfd = _PR_MD_OPEN_FILE(name, flags, mode);
-    if (osfd != -1) {
-        fd = PR_AllocFileDesc(osfd, &_pr_fileMethods);
-        if (!fd) {
-            (void) _PR_MD_CLOSE_FILE(osfd);
-        } else {
-#if !defined(_PR_HAVE_O_APPEND)
-            fd->secret->appendMode = appendMode;
-#endif
-            _PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
-        }
-    }
-    return fd;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
-    struct rlimit rlim;
-
-    if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
-       /* XXX need to call PR_SetError() */
-       return -1;
-    }
-
-    return rlim.rlim_max;
-#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX)
-    return sysconf(_SC_OPEN_MAX);
-#elif defined(WIN32)
-    /*
-     * There is a systemwide limit of 65536 user handles.
-     */
-    return 16384;
-#elif defined (WIN16)
-    return FOPEN_MAX;
-#elif defined(XP_OS2)
-    ULONG ulReqCount = 0;
-    ULONG ulCurMaxFH = 0;
-    DosSetRelMaxFH(&ulReqCount, &ulCurMaxFH);
-    return ulCurMaxFH;
-#elif defined (XP_MAC) || defined(XP_BEOS)
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-   return -1;
-#else
-    write me;
-#endif
-}
-
-PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size)
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
-    struct rlimit rlim;
-    PRInt32 tableMax = PR_GetSysfdTableMax();
-
-    if (tableMax < 0) 
-        return -1;
-
-    if (tableMax > FD_SETSIZE)
-        tableMax = FD_SETSIZE;
-
-    rlim.rlim_max = tableMax;
-
-    /* Grow as much as we can; even if too big */
-    if ( rlim.rlim_max < table_size )
-        rlim.rlim_cur = rlim.rlim_max;
-    else
-        rlim.rlim_cur = table_size;
-
-    if ( setrlimit(RLIMIT_NOFILE, &rlim) < 0) {
-        /* XXX need to call PR_SetError() */
-        return -1;
-    }
-
-    return rlim.rlim_cur;
-#elif defined(XP_OS2)
-    PRInt32 tableMax = PR_GetSysfdTableMax();
-    if (table_size > tableMax) {
-      APIRET rc = NO_ERROR;
-      rc = DosSetMaxFH(table_size);
-      if (rc == NO_ERROR)
-        return table_size;
-      else
-        return -1;
-    } 
-    return tableMax;
-#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX) \
-        || defined(WIN32) || defined(WIN16) || defined(XP_BEOS)
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-#elif defined (XP_MAC)
-#pragma unused (table_size)
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-   return -1;
-#else
-    write me;
-#endif
-}
-
-PR_IMPLEMENT(PRStatus) PR_Delete(const char *name)
-{
-	PRInt32 rv;
-
-	rv = _PR_MD_DELETE(name);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info)
-{
-	PRInt32 rv;
-
-	rv = _PR_MD_GETFILEINFO(fn, info);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info)
-{
-#ifdef XP_MAC
-#pragma unused (fn, info)
-#endif
-    PRInt32 rv;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    rv = _PR_MD_GETFILEINFO64(fn, info);
-    if (rv < 0) {
-        return PR_FAILURE;
-    } else {
-        return PR_SUCCESS;
-    }
-}
-
-PR_IMPLEMENT(PRStatus) PR_Rename(const char *from, const char *to)
-{
-	PRInt32 rv;
-
-	rv = _PR_MD_RENAME(from, to);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_Access(const char *name, PRAccessHow how)
-{
-PRInt32 rv;
-
-	rv = _PR_MD_ACCESS(name, how);
-	if (rv < 0) {
-		return PR_FAILURE;
-	} else
-		return PR_SUCCESS;
-}
-
-/*
-** Import an existing OS file to NSPR 
-*/
-PR_IMPLEMENT(PRFileDesc*) PR_ImportFile(PROsfd osfd)
-{
-    PRFileDesc *fd = NULL;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    fd = PR_AllocFileDesc(osfd, &_pr_fileMethods);
-    if( !fd ) {
-        (void) _PR_MD_CLOSE_FILE(osfd);
-    } else {
-        _PR_MD_INIT_FD_INHERITABLE(fd, PR_TRUE);
-    }
-
-    return fd;
-}
-
-/*
-** Import an existing OS pipe to NSPR 
-*/
-PR_IMPLEMENT(PRFileDesc*) PR_ImportPipe(PROsfd osfd)
-{
-    PRFileDesc *fd = NULL;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    fd = PR_AllocFileDesc(osfd, &_pr_pipeMethods);
-    if( !fd ) {
-        (void) _PR_MD_CLOSE_FILE(osfd);
-    } else {
-        _PR_MD_INIT_FD_INHERITABLE(fd, PR_TRUE);
-#ifdef WINNT
-        fd->secret->md.sync_file_io = PR_TRUE;
-#endif
-    }
-
-    return fd;
-}
-
-#ifndef NO_NSPR_10_SUPPORT
-/*
-** PR_Stat() for Win16 is defined in w16io.c
-** it is a hack to circumvent problems in Gromit and Java
-** See also: BugSplat: 98516.
-*/
-#if !defined(WIN16)
-/*
- * This function is supposed to be for backward compatibility with
- * nspr 1.0.  Therefore, it still uses the nspr 1.0 error-reporting
- * mechanism -- returns a PRInt32, which is the error code when the call
- * fails.
- * 
- * If we need this function in nspr 2.0, it should be changed to
- * return PRStatus, as follows:
- *
- * PR_IMPLEMENT(PRStatus) PR_Stat(const char *name, struct stat *buf)
- * {
- *     PRInt32 rv;
- *
- *     rv = _PR_MD_STAT(name, buf);
- *     if (rv < 0)
- *         return PR_FAILURE;
- *     else
- *         return PR_SUCCESS;
- * }
- *
- * -- wtc, 2/14/97.
- */
-PR_IMPLEMENT(PRInt32) PR_Stat(const char *name, struct stat *buf)
-{
-    PRInt32 rv;
-
-    rv = _PR_MD_STAT(name, buf);
-	return rv;
-}
-
-#endif /* !defined(WIN16)  */
-#endif /* ! NO_NSPR_10_SUPPORT */
-
-PR_IMPLEMENT(PRStatus) PR_LockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-#ifdef WINNT
-    if (!fd->secret->md.io_model_committed) {
-        PRInt32 rv;
-        rv = _md_Associate((HANDLE)fd->secret->md.osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-#endif
-
-    PR_Lock(_pr_flock_lock);
-    while (fd->secret->lockCount == -1)
-        PR_WaitCondVar(_pr_flock_cv, PR_INTERVAL_NO_TIMEOUT);
-    if (fd->secret->lockCount == 0) {
-        fd->secret->lockCount = -1;
-        PR_Unlock(_pr_flock_lock);
-        status = _PR_MD_LOCKFILE(fd->secret->md.osfd);
-        PR_Lock(_pr_flock_lock);
-        fd->secret->lockCount = (status == PR_SUCCESS) ? 1 : 0;
-        PR_NotifyAllCondVar(_pr_flock_cv);
-    } else {
-        fd->secret->lockCount++;
-    }
-    PR_Unlock(_pr_flock_lock);
- 
-    return status;
-}
-
-PR_IMPLEMENT(PRStatus) PR_TLockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-#ifdef WINNT
-    if (!fd->secret->md.io_model_committed) {
-        PRInt32 rv;
-        rv = _md_Associate((HANDLE)fd->secret->md.osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-#endif
-
-    PR_Lock(_pr_flock_lock);
-    if (fd->secret->lockCount == 0) {
-        status = _PR_MD_TLOCKFILE(fd->secret->md.osfd);
-        PR_ASSERT(status == PR_SUCCESS || fd->secret->lockCount == 0);
-        if (status == PR_SUCCESS)
-            fd->secret->lockCount = 1;
-    } else {
-        fd->secret->lockCount++;
-    }
-    PR_Unlock(_pr_flock_lock);
-
-    return status;
-}
-
-PR_IMPLEMENT(PRStatus) PR_UnlockFile(PRFileDesc *fd)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    PR_Lock(_pr_flock_lock);
-    if (fd->secret->lockCount == 1) {
-        rv = _PR_MD_UNLOCKFILE(fd->secret->md.osfd);
-        if (rv == PR_SUCCESS) 
-            fd->secret->lockCount = 0;
-    } else {
-        fd->secret->lockCount--;
-    }
-    PR_Unlock(_pr_flock_lock);
-
-    return rv;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CreatePipe(
-    PRFileDesc **readPipe,
-    PRFileDesc **writePipe
-)
-{
-#if defined(XP_MAC)
-#pragma unused (readPipe, writePipe)
-#endif
-
-#ifdef WIN32
-    HANDLE readEnd, writeEnd;
-    SECURITY_ATTRIBUTES pipeAttributes;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    ZeroMemory(&pipeAttributes, sizeof(pipeAttributes));
-    pipeAttributes.nLength = sizeof(pipeAttributes);
-    pipeAttributes.bInheritHandle = TRUE;
-    if (CreatePipe(&readEnd, &writeEnd, &pipeAttributes, 0) == 0) {
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        return PR_FAILURE;
-    }
-    *readPipe = PR_AllocFileDesc((PROsfd)readEnd, &_pr_pipeMethods);
-    if (NULL == *readPipe) {
-        CloseHandle(readEnd);
-        CloseHandle(writeEnd);
-        return PR_FAILURE;
-    }
-    *writePipe = PR_AllocFileDesc((PROsfd)writeEnd, &_pr_pipeMethods);
-    if (NULL == *writePipe) {
-        PR_Close(*readPipe);
-        CloseHandle(writeEnd);
-        return PR_FAILURE;
-    }
-#ifdef WINNT
-    (*readPipe)->secret->md.sync_file_io = PR_TRUE;
-    (*writePipe)->secret->md.sync_file_io = PR_TRUE;
-#endif
-    (*readPipe)->secret->inheritable = _PR_TRI_TRUE;
-    (*writePipe)->secret->inheritable = _PR_TRI_TRUE;
-    return PR_SUCCESS;
-#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-#ifdef XP_OS2
-    HFILE pipefd[2];
-#else
-    int pipefd[2];
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-#ifdef XP_OS2
-    if (DosCreatePipe(&pipefd[0], &pipefd[1], 4096) != 0) {
-#else
-    if (pipe(pipefd) == -1) {
-#endif
-        /* XXX map pipe error */
-        PR_SetError(PR_UNKNOWN_ERROR, errno);
-        return PR_FAILURE;
-    }
-    *readPipe = PR_AllocFileDesc(pipefd[0], &_pr_pipeMethods);
-    if (NULL == *readPipe) {
-        close(pipefd[0]);
-        close(pipefd[1]);
-        return PR_FAILURE;
-    }
-    *writePipe = PR_AllocFileDesc(pipefd[1], &_pr_pipeMethods);
-    if (NULL == *writePipe) {
-        PR_Close(*readPipe);
-        close(pipefd[1]);
-        return PR_FAILURE;
-    }
-#ifndef XP_BEOS /* Pipes are nonblocking on BeOS */
-    _PR_MD_MAKE_NONBLOCK(*readPipe);
-#endif
-    _PR_MD_INIT_FD_INHERITABLE(*readPipe, PR_FALSE);
-#ifndef XP_BEOS /* Pipes are nonblocking on BeOS */
-    _PR_MD_MAKE_NONBLOCK(*writePipe);
-#endif
-    _PR_MD_INIT_FD_INHERITABLE(*writePipe, PR_FALSE);
-    return PR_SUCCESS;
-#else
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-#endif
-}
-
-#ifdef MOZ_UNICODE
-/* ================ UTF16 Interfaces ================================ */
-PR_IMPLEMENT(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode)
-{ 
-    PROsfd osfd;
-    PRFileDesc *fd = 0;
-#if !defined(_PR_HAVE_O_APPEND)
-    PRBool  appendMode = ( PR_APPEND & flags )? PR_TRUE : PR_FALSE;
-#endif
-   
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-  
-    /* Map pr open flags and mode to os specific flags */
-    osfd = _PR_MD_OPEN_FILE_UTF16(name, flags, mode);
-    if (osfd != -1) {
-        fd = PR_AllocFileDesc(osfd, &_pr_fileMethods);
-        if (!fd) {
-            (void) _PR_MD_CLOSE_FILE(osfd);
-        } else {
-#if !defined(_PR_HAVE_O_APPEND)
-            fd->secret->appendMode = appendMode;
-#endif
-            _PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
-        }
-    }
-    return fd;
-}
- 
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info)
-{
-#ifdef XP_MAC
-#pragma unused (fn, info)
-#endif
-    PRInt32 rv;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    rv = _PR_MD_GETFILEINFO64_UTF16(fn, info);
-    if (rv < 0) {
-        return PR_FAILURE;
-    } else {
-        return PR_SUCCESS;
-    }
-}
-
-/* ================ UTF16 Interfaces ================================ */
-#endif /* MOZ_UNICODE */
diff --git a/libs/js/nsprpub/pr/src/io/prio.c b/libs/js/nsprpub/pr/src/io/prio.c
deleted file mode 100644
index be187756ab..0000000000
--- a/libs/js/nsprpub/pr/src/io/prio.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h> /* for memset() */
-
-
-/************************************************************************/
-
-PRLock *_pr_flock_lock;
-PRCondVar *_pr_flock_cv;
-
-void _PR_InitIO(void)
-{
-    const PRIOMethods *methods = PR_GetFileMethods();
-
-    _PR_InitFdCache();
-
-    _pr_flock_lock = PR_NewLock();
-    _pr_flock_cv = PR_NewCondVar(_pr_flock_lock);
-
-#ifdef WIN32
-    _pr_stdin = PR_AllocFileDesc((PROsfd)GetStdHandle(STD_INPUT_HANDLE),
-            methods);
-    _pr_stdout = PR_AllocFileDesc((PROsfd)GetStdHandle(STD_OUTPUT_HANDLE),
-            methods);
-    _pr_stderr = PR_AllocFileDesc((PROsfd)GetStdHandle(STD_ERROR_HANDLE),
-            methods);
-#ifdef WINNT
-    _pr_stdin->secret->md.sync_file_io = PR_TRUE;
-    _pr_stdout->secret->md.sync_file_io = PR_TRUE;
-    _pr_stderr->secret->md.sync_file_io = PR_TRUE;
-#endif
-#else
-    _pr_stdin = PR_AllocFileDesc(0, methods);
-    _pr_stdout = PR_AllocFileDesc(1, methods);
-    _pr_stderr = PR_AllocFileDesc(2, methods);
-#endif
-    _PR_MD_INIT_FD_INHERITABLE(_pr_stdin, PR_TRUE);
-    _PR_MD_INIT_FD_INHERITABLE(_pr_stdout, PR_TRUE);
-    _PR_MD_INIT_FD_INHERITABLE(_pr_stderr, PR_TRUE);
-
-    _PR_MD_INIT_IO();
-}
-
-void _PR_CleanupIO(void)
-{
-    PR_FreeFileDesc(_pr_stdin);
-    _pr_stdin = NULL;
-    PR_FreeFileDesc(_pr_stdout);
-    _pr_stdout = NULL;
-    PR_FreeFileDesc(_pr_stderr);
-    _pr_stderr = NULL;
-
-    if (_pr_flock_cv) {
-        PR_DestroyCondVar(_pr_flock_cv);
-        _pr_flock_cv = NULL;
-    }
-    if (_pr_flock_lock) {
-        PR_DestroyLock(_pr_flock_lock);
-        _pr_flock_lock = NULL;
-    }
-
-    _PR_CleanupFdCache();
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_GetSpecialFD(PRSpecialFD osfd)
-{
-    PRFileDesc *result = NULL;
-    PR_ASSERT((int) osfd >= PR_StandardInput && osfd <= PR_StandardError);
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    
-    switch (osfd)
-    {
-        case PR_StandardInput: result = _pr_stdin; break;
-        case PR_StandardOutput: result = _pr_stdout; break;
-        case PR_StandardError: result = _pr_stderr; break;
-        default:
-            (void)PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    }
-    return result;
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_AllocFileDesc(
-    PROsfd osfd, const PRIOMethods *methods)
-{
-    PRFileDesc *fd;
-
-#ifdef XP_UNIX
-	/*
-	 * Assert that the file descriptor is small enough to fit in the
-	 * fd_set passed to select
-	 */
-	PR_ASSERT(osfd < FD_SETSIZE);
-#endif
-    fd = _PR_Getfd();
-    if (fd) {
-        /* Initialize the members of PRFileDesc and PRFilePrivate */
-        fd->methods = methods;
-        fd->secret->state = _PR_FILEDESC_OPEN;
-	fd->secret->md.osfd = osfd;
-        _PR_MD_INIT_FILEDESC(fd);
-    } else {
-	    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    }
-
-    return fd;
-}
-
-PR_IMPLEMENT(void) PR_FreeFileDesc(PRFileDesc *fd)
-{
-    PR_ASSERT(fd);
-#ifdef XP_MAC
-	_PR_MD_FREE_FILEDESC(fd);
-#endif
-    _PR_Putfd(fd);
-}
-
-/*
-** Wait for some i/o to finish on one or more more poll descriptors.
-*/
-PR_IMPLEMENT(PRInt32) PR_Poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-	return(_PR_MD_PR_POLL(pds, npds, timeout));
-}
-
-/*
-** Set the inheritance attribute of a file descriptor.
-*/
-PR_IMPLEMENT(PRStatus) PR_SetFDInheritable(
-    PRFileDesc *fd,
-    PRBool inheritable)
-{
-#if defined(XP_UNIX) || defined(WIN32) || defined(XP_OS2) || defined(XP_BEOS)
-    /*
-     * Only a non-layered, NSPR file descriptor can be inherited
-     * by a child process.
-     */
-    if (fd->identity != PR_NSPR_IO_LAYER) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if (fd->secret->inheritable != inheritable) {
-        if (_PR_MD_SET_FD_INHERITABLE(fd, inheritable) == PR_FAILURE) {
-            return PR_FAILURE;
-        }
-        fd->secret->inheritable = inheritable;
-    }
-    return PR_SUCCESS;
-#else
-#ifdef XP_MAC
-#pragma unused (fd, inheritable)
-#endif
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-#endif
-}
-
-/*
-** This function only has a useful implementation in the debug build of
-** the pthreads version.
-*/
-PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg)
-{
-    /* do nothing */
-}  /* PT_FPrintStats */
diff --git a/libs/js/nsprpub/pr/src/io/priometh.c b/libs/js/nsprpub/pr/src/io/priometh.c
deleted file mode 100644
index 1ca474f013..0000000000
--- a/libs/js/nsprpub/pr/src/io/priometh.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "primpl.h"
-
-#include <string.h>
-
-/*****************************************************************************/
-/************************** Invalid I/O method object ************************/
-/*****************************************************************************/
-PRIOMethods _pr_faulty_methods = {
-    (PRDescType)0,
-    (PRCloseFN)_PR_InvalidStatus,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    (PRPollFN)_PR_InvalidInt16,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt
-};
-
-PRIntn _PR_InvalidInt(void)
-{
-    PR_ASSERT(!"I/O method is invalid");
-    PR_SetError(PR_INVALID_METHOD_ERROR, 0);
-    return -1;
-}  /* _PR_InvalidInt */
-
-PRInt16 _PR_InvalidInt16(void)
-{
-    PR_ASSERT(!"I/O method is invalid");
-    PR_SetError(PR_INVALID_METHOD_ERROR, 0);
-    return -1;
-}  /* _PR_InvalidInt */
-
-PRInt64 _PR_InvalidInt64(void)
-{
-    PRInt64 rv;
-    LL_I2L(rv, -1);
-    PR_ASSERT(!"I/O method is invalid");
-    PR_SetError(PR_INVALID_METHOD_ERROR, 0);
-    return rv;
-}  /* _PR_InvalidInt */
-
-/*
- * An invalid method that returns PRStatus
- */
-
-PRStatus _PR_InvalidStatus(void)
-{
-    PR_ASSERT(!"I/O method is invalid");
-    PR_SetError(PR_INVALID_METHOD_ERROR, 0);
-    return PR_FAILURE;
-}  /* _PR_InvalidDesc */
-
-/*
- * An invalid method that returns a pointer
- */
-
-PRFileDesc *_PR_InvalidDesc(void)
-{
-    PR_ASSERT(!"I/O method is invalid");
-    PR_SetError(PR_INVALID_METHOD_ERROR, 0);
-    return NULL;
-}  /* _PR_InvalidDesc */
-
-PR_IMPLEMENT(PRDescType) PR_GetDescType(PRFileDesc *file)
-{
-    return file->methods->file_type;
-}
-
-PR_IMPLEMENT(PRStatus) PR_Close(PRFileDesc *fd)
-{
-    return (fd->methods->close)(fd);
-}
-
-PR_IMPLEMENT(PRInt32) PR_Read(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-	return((fd->methods->read)(fd,buf,amount));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Write(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-	return((fd->methods->write)(fd,buf,amount));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Seek(PRFileDesc *fd, PRInt32 offset, PRSeekWhence whence)
-{
-	return((fd->methods->seek)(fd, offset, whence));
-}
-
-PR_IMPLEMENT(PRInt64) PR_Seek64(PRFileDesc *fd, PRInt64 offset, PRSeekWhence whence)
-{
-	return((fd->methods->seek64)(fd, offset, whence));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Available(PRFileDesc *fd)
-{
-	return((fd->methods->available)(fd));
-}
-
-PR_IMPLEMENT(PRInt64) PR_Available64(PRFileDesc *fd)
-{
-	return((fd->methods->available64)(fd));
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetOpenFileInfo(PRFileDesc *fd, PRFileInfo *info)
-{
-	return((fd->methods->fileInfo)(fd, info));
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetOpenFileInfo64(PRFileDesc *fd, PRFileInfo64 *info)
-{
-	return((fd->methods->fileInfo64)(fd, info));
-}
-
-PR_IMPLEMENT(PRStatus) PR_Sync(PRFileDesc *fd)
-{
-	return((fd->methods->fsync)(fd));
-}
-
-PR_IMPLEMENT(PRStatus) PR_Connect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	return((fd->methods->connect)(fd,addr,timeout));
-}
-
-PR_IMPLEMENT(PRStatus) PR_ConnectContinue(
-    PRFileDesc *fd, PRInt16 out_flags)
-{
-	return((fd->methods->connectcontinue)(fd,out_flags));
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_Accept(PRFileDesc *fd, PRNetAddr *addr,
-PRIntervalTime timeout)
-{
-	return((fd->methods->accept)(fd,addr,timeout));
-}
-
-PR_IMPLEMENT(PRStatus) PR_Bind(PRFileDesc *fd, const PRNetAddr *addr)
-{
-	return((fd->methods->bind)(fd,addr));
-}
-
-PR_IMPLEMENT(PRStatus) PR_Shutdown(PRFileDesc *fd, PRShutdownHow how)
-{
-	return((fd->methods->shutdown)(fd,how));
-}
-
-PR_IMPLEMENT(PRStatus) PR_Listen(PRFileDesc *fd, PRIntn backlog)
-{
-	return((fd->methods->listen)(fd,backlog));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Recv(PRFileDesc *fd, void *buf, PRInt32 amount,
-PRIntn flags, PRIntervalTime timeout)
-{
-	return((fd->methods->recv)(fd,buf,amount,flags,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Send(PRFileDesc *fd, const void *buf, PRInt32 amount,
-PRIntn flags, PRIntervalTime timeout)
-{
-	return((fd->methods->send)(fd,buf,amount,flags,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_Writev(PRFileDesc *fd, const PRIOVec *iov,
-PRInt32 iov_size, PRIntervalTime timeout)
-{
-    if (iov_size > PR_MAX_IOVECTOR_SIZE)
-    {
-        PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0);
-        return -1;
-    }
-	return((fd->methods->writev)(fd,iov,iov_size,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_RecvFrom(PRFileDesc *fd, void *buf, PRInt32 amount,
-PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout)
-{
-	return((fd->methods->recvfrom)(fd,buf,amount,flags,addr,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_SendTo(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	return((fd->methods->sendto)(fd,buf,amount,flags,addr,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_TransmitFile(
-    PRFileDesc *sd, PRFileDesc *fd, const void *hdr, PRInt32 hlen,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-	return((sd->methods->transmitfile)(sd,fd,hdr,hlen,flags,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_AcceptRead(
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
-    void *buf, PRInt32 amount, PRIntervalTime timeout)
-{
-	return((sd->methods->acceptread)(sd, nd, raddr, buf, amount,timeout));
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetSockName(PRFileDesc *fd, PRNetAddr *addr)
-{
-	return((fd->methods->getsockname)(fd,addr));
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetPeerName(PRFileDesc *fd, PRNetAddr *addr)
-{
-	return((fd->methods->getpeername)(fd,addr));
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetSocketOption(
-    PRFileDesc *fd, PRSocketOptionData *data)
-{
-	return((fd->methods->getsocketoption)(fd, data));
-}
-
-PR_IMPLEMENT(PRStatus) PR_SetSocketOption(
-    PRFileDesc *fd, const PRSocketOptionData *data)
-{
-	return((fd->methods->setsocketoption)(fd, data));
-}
-
-PR_IMPLEMENT(PRInt32) PR_SendFile(
-	PRFileDesc *sd, PRSendFileData *sfd,
-	PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-	return((sd->methods->sendfile)(sd,sfd,flags,timeout));
-}
-
-PR_IMPLEMENT(PRInt32) PR_EmulateAcceptRead(
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
-    void *buf, PRInt32 amount, PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-    PRNetAddr remote;
-    PRFileDesc *accepted = NULL;
-
-    /*
-    ** The timeout does not apply to the accept portion of the
-    ** operation - it waits indefinitely.
-    */
-    accepted = PR_Accept(sd, &remote, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == accepted) return rv;
-
-    rv = PR_Recv(accepted, buf, amount, 0, timeout);
-    if (rv >= 0)
-    {
-        /* copy the new info out where caller can see it */
-#define AMASK ((PRPtrdiff)7)  /* mask for alignment of PRNetAddr */
-        PRPtrdiff aligned = (PRPtrdiff)buf + amount + AMASK;
-        *raddr = (PRNetAddr*)(aligned & ~AMASK);
-        memcpy(*raddr, &remote, PR_NETADDR_SIZE(&remote));
-        *nd = accepted;
-        return rv;
-    }
-
-    PR_Close(accepted);
-    return rv;
-}
-
-/*
- * PR_EmulateSendFile
- *
- *    Send file sfd->fd across socket sd. If header/trailer are specified
- *    they are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *    
- *    return number of bytes sent or -1 on error
- *
- */
-
-#if defined(XP_UNIX) || defined(WIN32)
-
-/*
- * An implementation based on memory-mapped files
- */
-
-#define SENDFILE_MMAP_CHUNK	(256 * 1024)
-
-PR_IMPLEMENT(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PRInt32 rv, count = 0;
-    PRInt32 len, file_bytes, index = 0;
-    PRFileInfo info;
-    PRIOVec iov[3];
-    PRFileMap *mapHandle = NULL;
-    void *addr = (void*)0; /* initialized to some arbitrary value. Keeps compiler warnings down. */
-    PRUint32 file_mmap_offset, alignment;
-    PRInt64 zero64;
-    PROffset64 file_mmap_offset64;
-    PRUint32 addr_offset, mmap_len;
-
-    /* Get file size */
-    if (PR_SUCCESS != PR_GetOpenFileInfo(sfd->fd, &info)) {
-        count = -1;
-        goto done;
-    }
-    if (sfd->file_nbytes &&
-            (info.size < (sfd->file_offset + sfd->file_nbytes))) {
-        /*
-         * there are fewer bytes in file to send than specified
-         */
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        count = -1;
-        goto done;
-    }
-    if (sfd->file_nbytes)
-        file_bytes = sfd->file_nbytes;
-    else
-        file_bytes = info.size - sfd->file_offset;
-
-    alignment = PR_GetMemMapAlignment();
-
-    /* number of initial bytes to skip in mmap'd segment */
-    addr_offset = sfd->file_offset % alignment;
-
-    /* find previous mmap alignment boundary */
-    file_mmap_offset = sfd->file_offset - addr_offset;
-
-    /*
-     * If the file is large, mmap and send the file in chunks so as
-     * to not consume too much virtual address space
-     */
-    mmap_len = PR_MIN(file_bytes + addr_offset, SENDFILE_MMAP_CHUNK);
-    len = mmap_len - addr_offset;
-
-    /*
-     * Map in (part of) file. Take care of zero-length files.
-     */
-    if (len) {
-        LL_I2L(zero64, 0);
-        mapHandle = PR_CreateFileMap(sfd->fd, zero64, PR_PROT_READONLY);
-        if (!mapHandle) {
-            count = -1;
-            goto done;
-        }
-        LL_I2L(file_mmap_offset64, file_mmap_offset);
-        addr = PR_MemMap(mapHandle, file_mmap_offset64, mmap_len);
-        if (!addr) {
-            count = -1;
-            goto done;
-        }
-    }
-    /*
-     * send headers first, followed by the file
-     */
-    if (sfd->hlen) {
-        iov[index].iov_base = (char *) sfd->header;
-        iov[index].iov_len = sfd->hlen;
-        index++;
-    }
-    if (len) {
-        iov[index].iov_base = (char*)addr + addr_offset;
-        iov[index].iov_len = len;
-        index++;
-    }
-    if ((file_bytes == len) && (sfd->tlen)) {
-        /*
-         * all file data is mapped in; send the trailer too
-         */
-        iov[index].iov_base = (char *) sfd->trailer;
-        iov[index].iov_len = sfd->tlen;
-        index++;
-    }
-    rv = PR_Writev(sd, iov, index, timeout);
-    if (len)
-        PR_MemUnmap(addr, mmap_len);
-    if (rv < 0) {
-        count = -1;
-        goto done;
-    }
-
-    PR_ASSERT(rv == sfd->hlen + len + ((len == file_bytes) ? sfd->tlen : 0));
-
-    file_bytes -= len;
-    count += rv;
-    if (!file_bytes)    /* header, file and trailer are sent */
-        goto done;
-
-    /*
-     * send remaining bytes of the file, if any
-     */
-    len = PR_MIN(file_bytes, SENDFILE_MMAP_CHUNK);
-    while (len > 0) {
-        /*
-         * Map in (part of) file
-         */
-        file_mmap_offset = sfd->file_offset + count - sfd->hlen;
-        PR_ASSERT((file_mmap_offset % alignment) == 0);
-
-        LL_I2L(file_mmap_offset64, file_mmap_offset);
-        addr = PR_MemMap(mapHandle, file_mmap_offset64, len);
-        if (!addr) {
-            count = -1;
-            goto done;
-        }
-        rv = PR_Send(sd, addr, len, 0, timeout);
-        PR_MemUnmap(addr, len);
-        if (rv < 0) {
-            count = -1;
-            goto done;
-        }
-
-        PR_ASSERT(rv == len);
-        file_bytes -= rv;
-        count += rv;
-        len = PR_MIN(file_bytes, SENDFILE_MMAP_CHUNK);
-    }
-    PR_ASSERT(0 == file_bytes);
-    if (sfd->tlen) {
-        rv = PR_Send(sd, sfd->trailer, sfd->tlen, 0, timeout);
-        if (rv >= 0) {
-            PR_ASSERT(rv == sfd->tlen);
-            count += rv;
-        } else
-            count = -1;
-    }
-done:
-    if (mapHandle)
-        PR_CloseFileMap(mapHandle);
-    if ((count >= 0) && (flags & PR_TRANSMITFILE_CLOSE_SOCKET))
-        PR_Close(sd);
-    return count;
-}
-
-#else
-
-PR_IMPLEMENT(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PRInt32 rv, count = 0;
-    PRInt32 rlen;
-    const void * buffer;
-    PRInt32 buflen;
-    PRInt32 sendbytes, readbytes;
-    char *buf;
-
-#define _SENDFILE_BUFSIZE   (16 * 1024)
-
-    buf = (char*)PR_MALLOC(_SENDFILE_BUFSIZE);
-    if (buf == NULL) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-
-    /*
-     * send header first
-     */
-    buflen = sfd->hlen;
-    buffer = sfd->header;
-    while (buflen) {
-        rv = PR_Send(sd, buffer, buflen, 0, timeout);
-        if (rv < 0) {
-            /* PR_Send() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else {
-            count += rv;
-            buffer = (const void*) ((const char*)buffer + rv);
-            buflen -= rv;
-        }
-    }
-
-    /*
-     * send file next
-     */
-    if (PR_Seek(sfd->fd, sfd->file_offset, PR_SEEK_SET) < 0) {
-        rv = -1;
-        goto done;
-    }
-    sendbytes = sfd->file_nbytes;
-    if (sendbytes == 0) {
-        /* send entire file */
-        while ((rlen = PR_Read(sfd->fd, buf, _SENDFILE_BUFSIZE)) > 0) {
-            while (rlen) {
-                char *bufptr = buf;
-
-                rv =  PR_Send(sd, bufptr, rlen, 0, timeout);
-                if (rv < 0) {
-                    /* PR_Send() has invoked PR_SetError(). */
-                    rv = -1;
-                    goto done;
-                } else {
-                    count += rv;
-                    bufptr = ((char*)bufptr + rv);
-                    rlen -= rv;
-                }
-            }
-        }
-        if (rlen < 0) {
-            /* PR_Read() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        }
-    } else {
-        readbytes = PR_MIN(sendbytes, _SENDFILE_BUFSIZE);
-        while (readbytes && ((rlen = PR_Read(sfd->fd, buf, readbytes)) > 0)) {
-            while (rlen) {
-                char *bufptr = buf;
-
-                rv =  PR_Send(sd, bufptr, rlen, 0, timeout);
-                if (rv < 0) {
-                    /* PR_Send() has invoked PR_SetError(). */
-                    rv = -1;
-                    goto done;
-                } else {
-                    count += rv;
-                    sendbytes -= rv;
-                    bufptr = ((char*)bufptr + rv);
-                    rlen -= rv;
-                }
-            }
-            readbytes = PR_MIN(sendbytes, _SENDFILE_BUFSIZE);
-        }
-        if (rlen < 0) {
-            /* PR_Read() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else if (sendbytes != 0) {
-            /*
-             * there are fewer bytes in file to send than specified
-             */
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = -1;
-            goto done;
-        }
-    }
-
-    /*
-     * send trailer last
-     */
-    buflen = sfd->tlen;
-    buffer = sfd->trailer;
-    while (buflen) {
-        rv =  PR_Send(sd, buffer, buflen, 0, timeout);
-        if (rv < 0) {
-            /* PR_Send() has invoked PR_SetError(). */
-            rv = -1;
-            goto done;
-        } else {
-            count += rv;
-            buffer = (const void*) ((const char*)buffer + rv);
-            buflen -= rv;
-        }
-    }
-    rv = count;
-
-done:
-    if (buf)
-        PR_DELETE(buf);
-    if ((rv >= 0) && (flags & PR_TRANSMITFILE_CLOSE_SOCKET))
-        PR_Close(sd);
-    return rv;
-}
-
-#endif
-
-/* priometh.c */
diff --git a/libs/js/nsprpub/pr/src/io/pripv6.c b/libs/js/nsprpub/pr/src/io/pripv6.c
deleted file mode 100644
index 12449e95ee..0000000000
--- a/libs/js/nsprpub/pr/src/io/pripv6.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        pripv6.c
-** Description: Support for various functions unique to IPv6
-*/
-#include "primpl.h"
-#include <string.h>
-
-#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-
-static PRIOMethods ipv6_to_v4_tcpMethods;
-static PRIOMethods ipv6_to_v4_udpMethods;
-static PRDescIdentity _pr_ipv6_to_ipv4_id;
-extern PRBool IsValidNetAddr(const PRNetAddr *addr);
-extern PRIPv6Addr _pr_in6addr_any;
-extern PRIPv6Addr _pr_in6addr_loopback;
-
-/*
- * convert an IPv4-mapped IPv6 addr to an IPv4 addr
- */
-static void _PR_ConvertToIpv4NetAddr(const PRNetAddr *src_v6addr,
-											PRNetAddr *dst_v4addr)
-{
-const PRUint8 *srcp;
-
-	PR_ASSERT(PR_AF_INET6 == src_v6addr->ipv6.family);
-
-	if (PR_IsNetAddrType(src_v6addr, PR_IpAddrV4Mapped)) {
-		srcp = src_v6addr->ipv6.ip.pr_s6_addr;
-		memcpy((char *) &dst_v4addr->inet.ip, srcp + 12, 4);
-    } else if (PR_IsNetAddrType(src_v6addr, PR_IpAddrAny)) {
-        dst_v4addr->inet.ip = htonl(INADDR_ANY);
-    } else if (PR_IsNetAddrType(src_v6addr, PR_IpAddrLoopback)) {
-        dst_v4addr->inet.ip = htonl(INADDR_LOOPBACK);
-    }
-	dst_v4addr->inet.family = PR_AF_INET;
-	dst_v4addr->inet.port = src_v6addr->ipv6.port;
-}
-
-/*
- * convert an IPv4 addr to an IPv4-mapped IPv6 addr
- */
-static void _PR_ConvertToIpv6NetAddr(const PRNetAddr *src_v4addr,
-                                            PRNetAddr *dst_v6addr)
-{
-PRUint8 *dstp;
-
-	PR_ASSERT(PR_AF_INET == src_v4addr->inet.family);
-	dst_v6addr->ipv6.family = PR_AF_INET6;
-	dst_v6addr->ipv6.port = src_v4addr->inet.port;
-
- 	if (htonl(INADDR_ANY) == src_v4addr->inet.ip) {
-		dst_v6addr->ipv6.ip = _pr_in6addr_any;
-	} else {
-		dstp = dst_v6addr->ipv6.ip.pr_s6_addr;
-		memset(dstp, 0, 10);
-		memset(dstp + 10, 0xff, 2);
-		memcpy(dstp + 12,(char *) &src_v4addr->inet.ip, 4);
-	}
-}
-
-static PRStatus PR_CALLBACK Ipv6ToIpv4SocketBind(PRFileDesc *fd,
-								const PRNetAddr *addr)
-{
-	PRNetAddr tmp_ipv4addr;
-	const PRNetAddr *tmp_addrp;
-	PRFileDesc *lo = fd->lower;
-
-	if (PR_AF_INET6 != addr->raw.family) {
-        PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-		return PR_FAILURE;
-	}
-	if (PR_IsNetAddrType(addr, PR_IpAddrV4Mapped) ||
-    			PR_IsNetAddrType(addr, PR_IpAddrAny)) {
-		_PR_ConvertToIpv4NetAddr(addr, &tmp_ipv4addr);
-		tmp_addrp = &tmp_ipv4addr;
-	} else {
-        PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, 0);
-		return PR_FAILURE;
-	}
-	return((lo->methods->bind)(lo,tmp_addrp));
-}
-
-static PRStatus PR_CALLBACK Ipv6ToIpv4SocketConnect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	PRNetAddr tmp_ipv4addr;
-	const PRNetAddr *tmp_addrp;
-
-	if (PR_AF_INET6 != addr->raw.family) {
-        PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-		return PR_FAILURE;
-	}
-	if (PR_IsNetAddrType(addr, PR_IpAddrV4Mapped) ||
-			PR_IsNetAddrType(addr, PR_IpAddrLoopback)) {
-		_PR_ConvertToIpv4NetAddr(addr, &tmp_ipv4addr);
-		tmp_addrp = &tmp_ipv4addr;
-	} else {
-        PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, 0);
-		return PR_FAILURE;
-	}
-	return (fd->lower->methods->connect)(fd->lower, tmp_addrp, timeout);
-}
-
-static PRInt32 PR_CALLBACK Ipv6ToIpv4SocketSendTo(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	PRNetAddr tmp_ipv4addr;
-	const PRNetAddr *tmp_addrp;
-
-	if (PR_AF_INET6 != addr->raw.family) {
-        PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-		return PR_FAILURE;
-	}
-	if (PR_IsNetAddrType(addr, PR_IpAddrV4Mapped) ||
-			PR_IsNetAddrType(addr, PR_IpAddrLoopback)) {
-		_PR_ConvertToIpv4NetAddr(addr, &tmp_ipv4addr);
-		tmp_addrp = &tmp_ipv4addr;
-	} else {
-        PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, 0);
-		return PR_FAILURE;
-	}
-    return (fd->lower->methods->sendto)(
-        fd->lower, buf, amount, flags, tmp_addrp, timeout);
-}
-
-static PRFileDesc* PR_CALLBACK Ipv6ToIpv4SocketAccept (
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRStatus rv;
-    PRFileDesc *newfd;
-    PRFileDesc *newstack;
-	PRNetAddr tmp_ipv4addr;
-    PRNetAddr *addrlower = NULL;
-
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    newstack = PR_NEW(PRFileDesc);
-    if (NULL == newstack)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    *newstack = *fd;  /* make a copy of the accepting layer */
-
-    if (addr)
-        addrlower = &tmp_ipv4addr;
-    newfd = (fd->lower->methods->accept)(fd->lower, addrlower, timeout);
-    if (NULL == newfd)
-    {
-        PR_DELETE(newstack);
-        return NULL;
-    }
-    if (addr)
-        _PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, addr);
-
-    rv = PR_PushIOLayer(newfd, PR_TOP_IO_LAYER, newstack);
-    PR_ASSERT(PR_SUCCESS == rv);
-    return newfd;  /* that's it */
-}
-
-static PRInt32 PR_CALLBACK Ipv6ToIpv4SocketAcceptRead(PRFileDesc *sd,
-			PRFileDesc **nd, PRNetAddr **ipv6_raddr, void *buf, PRInt32 amount,
-							PRIntervalTime timeout)
-{
-    PRInt32 nbytes;
-    PRStatus rv;
-	PRNetAddr tmp_ipv4addr;
-    PRFileDesc *newstack;
-
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-    newstack = PR_NEW(PRFileDesc);
-    if (NULL == newstack)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-    *newstack = *sd;  /* make a copy of the accepting layer */
-
-    nbytes = sd->lower->methods->acceptread(
-        sd->lower, nd, ipv6_raddr, buf, amount, timeout);
-    if (-1 == nbytes)
-    {
-        PR_DELETE(newstack);
-        return nbytes;
-    }
-	tmp_ipv4addr = **ipv6_raddr;	/* copy */
-	_PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, *ipv6_raddr);
-
-    /* this PR_PushIOLayer call cannot fail */
-    rv = PR_PushIOLayer(*nd, PR_TOP_IO_LAYER, newstack);
-    PR_ASSERT(PR_SUCCESS == rv);
-    return nbytes;
-}
-
-static PRStatus PR_CALLBACK Ipv6ToIpv4SocketGetName(PRFileDesc *fd,
-										PRNetAddr *ipv6addr)
-{
-	PRStatus result;
-	PRNetAddr tmp_ipv4addr;
-
-	result = (fd->lower->methods->getsockname)(fd->lower, &tmp_ipv4addr);
-	if (PR_SUCCESS == result) {
-		_PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, ipv6addr);
-		PR_ASSERT(IsValidNetAddr(ipv6addr) == PR_TRUE);
-	}
-	return result;
-}
-
-static PRStatus PR_CALLBACK Ipv6ToIpv4SocketGetPeerName(PRFileDesc *fd,
-										PRNetAddr *ipv6addr)
-{
-	PRStatus result;
-	PRNetAddr tmp_ipv4addr;
-
-	result = (fd->lower->methods->getpeername)(fd->lower, &tmp_ipv4addr);
-	if (PR_SUCCESS == result) {
-		_PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, ipv6addr);
-		PR_ASSERT(IsValidNetAddr(ipv6addr) == PR_TRUE);
-	}
-	return result;
-}
-
-static PRInt32 PR_CALLBACK Ipv6ToIpv4SocketRecvFrom(PRFileDesc *fd, void *buf,
-			PRInt32 amount, PRIntn flags, PRNetAddr *ipv6addr,
-				PRIntervalTime timeout)
-{
-	PRNetAddr tmp_ipv4addr;
-	PRInt32 result;
-
-    result = (fd->lower->methods->recvfrom)(
-        fd->lower, buf, amount, flags, &tmp_ipv4addr, timeout);
-	if (-1 != result) {
-		_PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, ipv6addr);
-		PR_ASSERT(IsValidNetAddr(ipv6addr) == PR_TRUE);
-	}
-	return result;
-}
-
-#if defined(_PR_INET6_PROBE)
-PRBool _pr_ipv6_is_present;
-
-#if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME)
-extern PRStatus _pr_find_getipnodebyname(void);
-#endif
-
-#if !defined(_PR_INET6) && defined(_PR_HAVE_GETADDRINFO)
-extern PRStatus _pr_find_getaddrinfo(void);
-#endif
-
-static PRBool
-_pr_probe_ipv6_presence(void)
-{
-        return PR_FALSE;
-}
-#endif  /* _PR_INET6_PROBE */
-
-PRStatus _pr_init_ipv6()
-{
-    const PRIOMethods *stubMethods;
-
-#if defined(_PR_INET6_PROBE)
-    _pr_ipv6_is_present = _pr_probe_ipv6_presence();
-    if (PR_TRUE == _pr_ipv6_is_present)
-        return PR_SUCCESS;
-#endif
-
-    _pr_ipv6_to_ipv4_id = PR_GetUniqueIdentity("Ipv6_to_Ipv4 layer");
-    PR_ASSERT(PR_INVALID_IO_LAYER != _pr_ipv6_to_ipv4_id);
-
-	stubMethods = PR_GetDefaultIOMethods();
-
-	ipv6_to_v4_tcpMethods = *stubMethods;  /* first get the entire batch */
-	/* then override the ones we care about */
-	ipv6_to_v4_tcpMethods.connect = Ipv6ToIpv4SocketConnect;
-	ipv6_to_v4_tcpMethods.bind = Ipv6ToIpv4SocketBind;
-	ipv6_to_v4_tcpMethods.accept = Ipv6ToIpv4SocketAccept;
-	ipv6_to_v4_tcpMethods.acceptread = Ipv6ToIpv4SocketAcceptRead;
-	ipv6_to_v4_tcpMethods.getsockname = Ipv6ToIpv4SocketGetName;
-	ipv6_to_v4_tcpMethods.getpeername = Ipv6ToIpv4SocketGetPeerName;
-/*
-	ipv6_to_v4_tcpMethods.getsocketoption = Ipv6ToIpv4GetSocketOption;
-	ipv6_to_v4_tcpMethods.setsocketoption = Ipv6ToIpv4SetSocketOption;
-*/
-	ipv6_to_v4_udpMethods = *stubMethods;  /* first get the entire batch */
-	/* then override the ones we care about */
-	ipv6_to_v4_udpMethods.connect = Ipv6ToIpv4SocketConnect;
-	ipv6_to_v4_udpMethods.bind = Ipv6ToIpv4SocketBind;
-	ipv6_to_v4_udpMethods.sendto = Ipv6ToIpv4SocketSendTo;
-	ipv6_to_v4_udpMethods.recvfrom = Ipv6ToIpv4SocketRecvFrom;
-	ipv6_to_v4_udpMethods.getsockname = Ipv6ToIpv4SocketGetName;
-	ipv6_to_v4_udpMethods.getpeername = Ipv6ToIpv4SocketGetPeerName;
-/*
-	ipv6_to_v4_udpMethods.getsocketoption = Ipv6ToIpv4GetSocketOption;
-	ipv6_to_v4_udpMethods.setsocketoption = Ipv6ToIpv4SetSocketOption;
-*/
-	return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd)
-{
-	PRFileDesc *ipv6_fd = NULL;
-
-	/*
-	 * For platforms with no support for IPv6 
-	 * create layered socket for IPv4-mapped IPv6 addresses
-	 */
-	if (fd->methods->file_type == PR_DESC_SOCKET_TCP)
-		ipv6_fd = PR_CreateIOLayerStub(_pr_ipv6_to_ipv4_id,
-									&ipv6_to_v4_tcpMethods);
-	else
-		ipv6_fd = PR_CreateIOLayerStub(_pr_ipv6_to_ipv4_id,
-									&ipv6_to_v4_udpMethods);
-	if (NULL == ipv6_fd) {
-		goto errorExit;
-	} 
-	ipv6_fd->secret = NULL;
-
-	if (PR_PushIOLayer(fd, PR_TOP_IO_LAYER, ipv6_fd) == PR_FAILURE) {
-		goto errorExit;
-	}
-
-	return PR_SUCCESS;
-errorExit:
-
-	if (ipv6_fd)
-		ipv6_fd->dtor(ipv6_fd);
-	return PR_FAILURE;
-}
-
-#endif /* !defined(_PR_INET6) || defined(_PR_INET6_PROBE) */
diff --git a/libs/js/nsprpub/pr/src/io/prlayer.c b/libs/js/nsprpub/pr/src/io/prlayer.c
deleted file mode 100644
index cf48d23a35..0000000000
--- a/libs/js/nsprpub/pr/src/io/prlayer.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        prlayer.c
-** Description: Routines for handling pushable protocol modules on sockets.
-*/
-
-#include "primpl.h"
-#include "prerror.h"
-#include "prmem.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prio.h"
-
-#include <string.h> /* for memset() */
-static PRStatus _PR_DestroyIOLayer(PRFileDesc *stack);
-
-void PR_CALLBACK pl_FDDestructor(PRFileDesc *fd)
-{
-    PR_ASSERT(fd != NULL);
-    if (NULL != fd->lower) fd->lower->higher = fd->higher;
-    if (NULL != fd->higher) fd->higher->lower = fd->lower;
-    PR_DELETE(fd);
-}
-
-/*
-** Default methods that just call down to the next fd.
-*/
-static PRStatus PR_CALLBACK pl_TopClose (PRFileDesc *fd)
-{
-    PRFileDesc *top, *lower;
-	PRStatus rv;
-
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-    PR_ASSERT(fd->secret == NULL);
-    PR_ASSERT(fd->methods->file_type == PR_DESC_LAYERED);
-
-	if (PR_IO_LAYER_HEAD == fd->identity) {
-		/*
-		 * new style stack; close all the layers, before deleting the
-		 * stack head
-		 */
-		rv = fd->lower->methods->close(fd->lower);
-		_PR_DestroyIOLayer(fd);
-		return rv;
-	} else if ((fd->higher) && (PR_IO_LAYER_HEAD == fd->higher->identity)) {
-		/*
-		 * lower layers of new style stack
-		 */
-		lower = fd->lower;
-		/*
-		 * pop and cleanup current layer
-		 */
-    	top = PR_PopIOLayer(fd->higher, PR_TOP_IO_LAYER);
-		top->dtor(top);
-		/*
-		 * then call lower layer
-		 */
-		return (lower->methods->close(lower));
-	} else {
-		/* old style stack */
-    	top = PR_PopIOLayer(fd, PR_TOP_IO_LAYER);
-		top->dtor(top);
-		return (fd->methods->close)(fd);
-	}
-}
-
-static PRInt32 PR_CALLBACK pl_DefRead (PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->read)(fd->lower, buf, amount);
-}
-
-static PRInt32 PR_CALLBACK pl_DefWrite (
-    PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->write)(fd->lower, buf, amount);
-}
-
-static PRInt32 PR_CALLBACK pl_DefAvailable (PRFileDesc *fd)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->available)(fd->lower);
-}
-
-static PRInt64 PR_CALLBACK pl_DefAvailable64 (PRFileDesc *fd)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->available64)(fd->lower);
-}
-
-static PRStatus PR_CALLBACK pl_DefFsync (PRFileDesc *fd)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->fsync)(fd->lower);
-}
-
-static PRInt32 PR_CALLBACK pl_DefSeek (
-    PRFileDesc *fd, PRInt32 offset, PRSeekWhence how)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->seek)(fd->lower, offset, how);
-}
-
-static PRInt64 PR_CALLBACK pl_DefSeek64 (
-    PRFileDesc *fd, PRInt64 offset, PRSeekWhence how)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->seek64)(fd->lower, offset, how);
-}
-
-static PRStatus PR_CALLBACK pl_DefFileInfo (PRFileDesc *fd, PRFileInfo *info)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->fileInfo)(fd->lower, info);
-}
-
-static PRStatus PR_CALLBACK pl_DefFileInfo64 (PRFileDesc *fd, PRFileInfo64 *info)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->fileInfo64)(fd->lower, info);
-}
-
-static PRInt32 PR_CALLBACK pl_DefWritev (PRFileDesc *fd, const PRIOVec *iov,
-    PRInt32 size, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->writev)(fd->lower, iov, size, timeout);
-}
-
-static PRStatus PR_CALLBACK pl_DefConnect (
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->connect)(fd->lower, addr, timeout);
-}
-
-static PRStatus PR_CALLBACK pl_DefConnectcontinue (
-    PRFileDesc *fd, PRInt16 out_flags)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->connectcontinue)(fd->lower, out_flags);
-}
-
-static PRFileDesc* PR_CALLBACK pl_TopAccept (
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRStatus rv;
-    PRFileDesc *newfd, *layer = fd;
-    PRFileDesc *newstack;
-	PRBool newstyle_stack = PR_FALSE;
-
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-	/* test for new style stack */
-	while (NULL != layer->higher)
-		layer = layer->higher;
-	newstyle_stack = (PR_IO_LAYER_HEAD == layer->identity) ? PR_TRUE : PR_FALSE;
-    newstack = PR_NEW(PRFileDesc);
-    if (NULL == newstack)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    *newstack = *fd;  /* make a copy of the accepting layer */
-
-    newfd = (fd->lower->methods->accept)(fd->lower, addr, timeout);
-    if (NULL == newfd)
-    {
-        PR_DELETE(newstack);
-        return NULL;
-    }
-
-    if (newstyle_stack) {
-		newstack->lower = newfd;
-		newfd->higher = newstack;
-		return newstack;
-	} else {
-		/* this PR_PushIOLayer call cannot fail */
-		rv = PR_PushIOLayer(newfd, PR_TOP_IO_LAYER, newstack);
-		PR_ASSERT(PR_SUCCESS == rv);
-    	return newfd;  /* that's it */
-	}
-}
-
-static PRStatus PR_CALLBACK pl_DefBind (PRFileDesc *fd, const PRNetAddr *addr)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->bind)(fd->lower, addr);
-}
-
-static PRStatus PR_CALLBACK pl_DefListen (PRFileDesc *fd, PRIntn backlog)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->listen)(fd->lower, backlog);
-}
-
-static PRStatus PR_CALLBACK pl_DefShutdown (PRFileDesc *fd, PRIntn how)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->shutdown)(fd->lower, how);
-}
-
-static PRInt32 PR_CALLBACK pl_DefRecv (
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->recv)(
-        fd->lower, buf, amount, flags, timeout);
-}
-
-static PRInt32 PR_CALLBACK pl_DefSend (
-    PRFileDesc *fd, const void *buf,
-    PRInt32 amount, PRIntn flags, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->send)(fd->lower, buf, amount, flags, timeout);
-}
-
-static PRInt32 PR_CALLBACK pl_DefRecvfrom (
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->recvfrom)(
-        fd->lower, buf, amount, flags, addr, timeout);
-}
-
-static PRInt32 PR_CALLBACK pl_DefSendto (
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-    const PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->sendto)(
-        fd->lower, buf, amount, flags, addr, timeout);
-}
-
-static PRInt16 PR_CALLBACK pl_DefPoll (
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->poll)(fd->lower, in_flags, out_flags);
-}
-
-static PRInt32 PR_CALLBACK pl_DefAcceptread (
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr, void *buf,
-    PRInt32 amount, PRIntervalTime t)
-{
-    PRInt32 nbytes;
-    PRStatus rv;
-    PRFileDesc *newstack;
-    PRFileDesc *layer = sd;
-	PRBool newstyle_stack = PR_FALSE;
-
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-	/* test for new style stack */
-	while (NULL != layer->higher)
-		layer = layer->higher;
-	newstyle_stack = (PR_IO_LAYER_HEAD == layer->identity) ? PR_TRUE : PR_FALSE;
-    newstack = PR_NEW(PRFileDesc);
-    if (NULL == newstack)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-    *newstack = *sd;  /* make a copy of the accepting layer */
-
-    nbytes = sd->lower->methods->acceptread(
-        sd->lower, nd, raddr, buf, amount, t);
-    if (-1 == nbytes)
-    {
-        PR_DELETE(newstack);
-        return nbytes;
-    }
-    if (newstyle_stack) {
-		newstack->lower = *nd;
-		(*nd)->higher = newstack;
-		*nd = newstack;
-		return nbytes;
-	} else {
-		/* this PR_PushIOLayer call cannot fail */
-		rv = PR_PushIOLayer(*nd, PR_TOP_IO_LAYER, newstack);
-		PR_ASSERT(PR_SUCCESS == rv);
-		return nbytes;
-	}
-}
-
-static PRInt32 PR_CALLBACK pl_DefTransmitfile (
-    PRFileDesc *sd, PRFileDesc *fd, const void *headers, PRInt32 hlen,
-    PRTransmitFileFlags flags, PRIntervalTime t)
-{
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-    return sd->lower->methods->transmitfile(
-        sd->lower, fd, headers, hlen, flags, t);
-}
-
-static PRStatus PR_CALLBACK pl_DefGetsockname (PRFileDesc *fd, PRNetAddr *addr)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->getsockname)(fd->lower, addr);
-}
-
-static PRStatus PR_CALLBACK pl_DefGetpeername (PRFileDesc *fd, PRNetAddr *addr)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->getpeername)(fd->lower, addr);
-}
-
-static PRStatus PR_CALLBACK pl_DefGetsocketoption (
-    PRFileDesc *fd, PRSocketOptionData *data)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->getsocketoption)(fd->lower, data);
-}
-
-static PRStatus PR_CALLBACK pl_DefSetsocketoption (
-    PRFileDesc *fd, const PRSocketOptionData *data)
-{
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    return (fd->lower->methods->setsocketoption)(fd->lower, data);
-}
-
-static PRInt32 PR_CALLBACK pl_DefSendfile (
-	PRFileDesc *sd, PRSendFileData *sfd,
-	PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PR_ASSERT(sd != NULL);
-    PR_ASSERT(sd->lower != NULL);
-
-    return sd->lower->methods->sendfile(
-        sd->lower, sfd, flags, timeout);
-}
-
-/* Methods for the top of the stack.  Just call down to the next fd. */
-static PRIOMethods pl_methods = {
-    PR_DESC_LAYERED,
-    pl_TopClose,
-    pl_DefRead,
-    pl_DefWrite,
-    pl_DefAvailable,
-    pl_DefAvailable64,
-    pl_DefFsync,
-    pl_DefSeek,
-    pl_DefSeek64,
-    pl_DefFileInfo,
-    pl_DefFileInfo64,
-    pl_DefWritev,
-    pl_DefConnect,
-    pl_TopAccept,
-    pl_DefBind,
-    pl_DefListen,
-    pl_DefShutdown,
-    pl_DefRecv,
-    pl_DefSend,
-    pl_DefRecvfrom,
-    pl_DefSendto,
-    pl_DefPoll,
-    pl_DefAcceptread,
-    pl_DefTransmitfile,
-    pl_DefGetsockname,
-    pl_DefGetpeername,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    pl_DefGetsocketoption,
-    pl_DefSetsocketoption,
-    pl_DefSendfile,
-    pl_DefConnectcontinue,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt
-};
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetDefaultIOMethods(void)
-{
-    return &pl_methods;
-}  /* PR_GetDefaultIOMethods */
-
-PR_IMPLEMENT(PRFileDesc*) PR_CreateIOLayerStub(
-    PRDescIdentity ident, const PRIOMethods *methods)
-{
-    PRFileDesc *fd = NULL;
-    PR_ASSERT((PR_NSPR_IO_LAYER != ident) && (PR_TOP_IO_LAYER != ident));
-    if ((PR_NSPR_IO_LAYER == ident) || (PR_TOP_IO_LAYER == ident))
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    else
-    {
-        fd = PR_NEWZAP(PRFileDesc);
-        if (NULL == fd)
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        else
-        {
-            fd->methods = methods;
-            fd->dtor = pl_FDDestructor;
-            fd->identity = ident;
-        }
-    }
-    return fd;
-}  /* PR_CreateIOLayerStub */
-
-/*
- * PR_CreateIOLayer
- *		Create a new style stack, where the stack top is a dummy header.
- *		Unlike the old style stacks, the contents of the stack head
- *		are not modified when a layer is pushed onto or popped from a new
- *		style stack.
- */
-
-PR_IMPLEMENT(PRFileDesc*) PR_CreateIOLayer(PRFileDesc *top)
-{
-    PRFileDesc *fd = NULL;
-
-	fd = PR_NEWZAP(PRFileDesc);
-	if (NULL == fd)
-		PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	else
-	{
-		fd->methods = &pl_methods;
-		fd->dtor = pl_FDDestructor;
-		fd->identity = PR_IO_LAYER_HEAD;
-		fd->higher = NULL;
-		fd->lower = top;
-		top->higher = fd;
-		top->lower = NULL;
-	}
-    return fd;
-}  /* PR_CreateIOLayer */
-
-/*
- * _PR_DestroyIOLayer
- *		Delete the stack head of a new style stack.
- */
-
-static PRStatus _PR_DestroyIOLayer(PRFileDesc *stack)
-{
-    if (NULL == stack)
-        return PR_FAILURE;
-    else {
-        PR_DELETE(stack);
-    	return PR_SUCCESS;
-    }
-}  /* _PR_DestroyIOLayer */
-
-PR_IMPLEMENT(PRStatus) PR_PushIOLayer(
-    PRFileDesc *stack, PRDescIdentity id, PRFileDesc *fd)
-{
-    PRFileDesc *insert = PR_GetIdentitiesLayer(stack, id);
-
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(stack != NULL);
-    PR_ASSERT(insert != NULL);
-    PR_ASSERT(PR_IO_LAYER_HEAD != id);
-    if ((NULL == stack) || (NULL == fd) || (NULL == insert))
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    if (stack == insert)
-    {
-		/* going on top of the stack */
-		/* old-style stack */	
-		PRFileDesc copy = *stack;
-		*stack = *fd;
-		*fd = copy;
-		fd->higher = stack;
-		stack->lower = fd;
-		stack->higher = NULL;
-	} else {
-        /*
-		 * going somewhere in the middle of the stack for both old and new
-		 * style stacks, or going on top of stack for new style stack
-		 */
-        fd->lower = insert;
-        fd->higher = insert->higher;
-
-        insert->higher->lower = fd;
-        insert->higher = fd;
-    }
-
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_PopIOLayer(PRFileDesc *stack, PRDescIdentity id)
-{
-    PRFileDesc *extract = PR_GetIdentitiesLayer(stack, id);
-
-    PR_ASSERT(0 != id);
-    PR_ASSERT(NULL != stack);
-    PR_ASSERT(NULL != extract);
-    if ((NULL == stack) || (0 == id) || (NULL == extract))
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return NULL;
-    }
-
-    if (extract == stack) {
-        /* popping top layer of the stack */
-		/* old style stack */
-        PRFileDesc copy = *stack;
-        extract = stack->lower;
-        *stack = *extract;
-        *extract = copy;
-        stack->higher = NULL;
-	} else if ((PR_IO_LAYER_HEAD == stack->identity) &&
-					(extract == stack->lower) && (extract->lower == NULL)) {
-			/*
-			 * new style stack
-			 * popping the only layer in the stack; delete the stack too
-			 */
-			stack->lower = NULL;
-			_PR_DestroyIOLayer(stack);
-	} else {
-		/* for both kinds of stacks */
-        extract->lower->higher = extract->higher;
-        extract->higher->lower = extract->lower;
-    }
-    extract->higher = extract->lower = NULL;
-    return extract;
-}  /* PR_PopIOLayer */
-
-#define ID_CACHE_INCREMENT 16
-typedef struct _PRIdentity_cache
-{
-    PRLock *ml;
-    char **name;
-    PRIntn length;
-    PRDescIdentity ident;
-} _PRIdentity_cache;
-
-static _PRIdentity_cache identity_cache;
-
-PR_IMPLEMENT(PRDescIdentity) PR_GetUniqueIdentity(const char *layer_name)
-{
-    PRDescIdentity identity, length;
-    char **names = NULL, *name = NULL, **old = NULL;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    PR_ASSERT((PRDescIdentity)0x7fff > identity_cache.ident);
-
-    if (NULL != layer_name)
-    {
-        name = (char*)PR_Malloc(strlen(layer_name) + 1);
-        if (NULL == name)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return PR_INVALID_IO_LAYER;
-        }
-        strcpy(name, layer_name);
-    }
-
-    /* this initial code runs unsafe */
-retry:
-    PR_ASSERT(NULL == names);
-    length = identity_cache.length;
-    if (length < (identity_cache.ident + 1))
-    {
-        length += ID_CACHE_INCREMENT;
-        names = (char**)PR_CALLOC(length * sizeof(char*));
-        if (NULL == names)
-        {
-            if (NULL != name) PR_DELETE(name);
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return PR_INVALID_IO_LAYER;
-        }
-    }
-
-    /* now we get serious about thread safety */
-    PR_Lock(identity_cache.ml);
-    PR_ASSERT(identity_cache.ident <= identity_cache.length);
-    identity = identity_cache.ident + 1;
-    if (identity > identity_cache.length)  /* there's no room */
-    {
-        /* we have to do something - hopefully it's already done */
-        if ((NULL != names) && (length >= identity))
-        {
-            /* what we did is still okay */
-            memcpy(
-                names, identity_cache.name,
-                identity_cache.length * sizeof(char*));
-            old = identity_cache.name;
-            identity_cache.name = names;
-            identity_cache.length = length;
-            names = NULL;
-        }
-        else
-        {
-            PR_ASSERT(identity_cache.ident <= identity_cache.length);
-            PR_Unlock(identity_cache.ml);
-            if (NULL != names) PR_DELETE(names);
-            goto retry;
-        }
-    }
-    if (NULL != name) /* there's a name to be stored */
-    {
-        identity_cache.name[identity] = name;
-    }
-    identity_cache.ident = identity;
-    PR_ASSERT(identity_cache.ident <= identity_cache.length);
-    PR_Unlock(identity_cache.ml);
-
-    if (NULL != old) PR_DELETE(old);
-    if (NULL != names) PR_DELETE(names);
-
-    return identity;
-}  /* PR_GetUniqueIdentity */
-
-PR_IMPLEMENT(const char*) PR_GetNameForIdentity(PRDescIdentity ident)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (PR_TOP_IO_LAYER == ident) return NULL;
-
-    PR_ASSERT(ident <= identity_cache.ident);
-    return (ident > identity_cache.ident) ? NULL : identity_cache.name[ident];
-}  /* PR_GetNameForIdentity */
-
-PR_IMPLEMENT(PRDescIdentity) PR_GetLayersIdentity(PRFileDesc* fd)
-{
-    PR_ASSERT(NULL != fd);
-    if (PR_IO_LAYER_HEAD == fd->identity) {
-    	PR_ASSERT(NULL != fd->lower);
-    	return fd->lower->identity;
-	} else
-    	return fd->identity;
-}  /* PR_GetLayersIdentity */
-
-PR_IMPLEMENT(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* fd, PRDescIdentity id)
-{
-    PRFileDesc *layer = fd;
-
-    if (PR_TOP_IO_LAYER == id) {
-    	if (PR_IO_LAYER_HEAD == fd->identity)
-			return fd->lower;
-		else 
-			return fd;
-	}
-
-    for (layer = fd; layer != NULL; layer = layer->lower)
-    {
-        if (id == layer->identity) return layer;
-    }
-    for (layer = fd; layer != NULL; layer = layer->higher)
-    {
-        if (id == layer->identity) return layer;
-    }
-    return NULL;
-}  /* PR_GetIdentitiesLayer */
-
-void _PR_InitLayerCache(void)
-{
-    memset(&identity_cache, 0, sizeof(identity_cache));
-    identity_cache.ml = PR_NewLock();
-    PR_ASSERT(NULL != identity_cache.ml);
-}  /* _PR_InitLayerCache */
-
-void _PR_CleanupLayerCache(void)
-{
-    if (identity_cache.ml)
-    {
-        PR_DestroyLock(identity_cache.ml);
-        identity_cache.ml = NULL;
-    }
-
-    if (identity_cache.name)
-    {
-        PRDescIdentity ident;
-
-        for (ident = 0; ident <= identity_cache.ident; ident++)
-            PR_DELETE(identity_cache.name[ident]);
-
-        PR_DELETE(identity_cache.name);
-    }
-}  /* _PR_CleanupLayerCache */
-
-/* prlayer.c */
diff --git a/libs/js/nsprpub/pr/src/io/prlog.c b/libs/js/nsprpub/pr/src/io/prlog.c
deleted file mode 100644
index be98e802c6..0000000000
--- a/libs/js/nsprpub/pr/src/io/prlog.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Contributors:
- *
- * This Original Code has been modified by IBM Corporation.
- * Modifications made by IBM described herein are
- * Copyright (c) International Business Machines Corporation, 2000.
- * Modifications to Mozilla code or documentation identified per
- * MPL Section 3.3
- *
- * Date         Modified by     Description of modification
- * 04/10/2000   IBM Corp.       Added DebugBreak() definitions for OS/2
- */
-
-#include "primpl.h"
-#include "prenv.h"
-#include "prprf.h"
-#include <string.h>
-
-/*
- * Lock used to lock the log.
- *
- * We can't define _PR_LOCK_LOG simply as PR_Lock because PR_Lock may
- * contain assertions.  We have to avoid assertions in _PR_LOCK_LOG
- * because PR_ASSERT calls PR_LogPrint, which in turn calls _PR_LOCK_LOG.
- * This can lead to infinite recursion.
- */
-static PRLock *_pr_logLock;
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-#define _PR_LOCK_LOG() PR_Lock(_pr_logLock);
-#define _PR_UNLOCK_LOG() PR_Unlock(_pr_logLock);
-#elif defined(_PR_GLOBAL_THREADS_ONLY)
-#define _PR_LOCK_LOG() { _PR_LOCK_LOCK(_pr_logLock)
-#define _PR_UNLOCK_LOG() _PR_LOCK_UNLOCK(_pr_logLock); }
-#else
-
-#define _PR_LOCK_LOG() \
-{ \
-    PRIntn _is; \
-    PRThread *_me = _PR_MD_CURRENT_THREAD(); \
-    if (!_PR_IS_NATIVE_THREAD(_me)) \
-        _PR_INTSOFF(_is); \
-    _PR_LOCK_LOCK(_pr_logLock)
-
-#define _PR_UNLOCK_LOG() \
-    _PR_LOCK_UNLOCK(_pr_logLock); \
-    PR_ASSERT(_me == _PR_MD_CURRENT_THREAD()); \
-    if (!_PR_IS_NATIVE_THREAD(_me)) \
-        _PR_INTSON(_is); \
-}
-
-#endif
-
-#if defined(XP_PC)
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#endif
-
-/*
- * On NT, we can't define _PUT_LOG as PR_Write or _PR_MD_WRITE,
- * because every asynchronous file io operation leads to a fiber context
- * switch.  So we define _PUT_LOG as fputs (from stdio.h).  A side
- * benefit is that fputs handles the LF->CRLF translation.  This
- * code can also be used on other platforms with file stream io.
- */
-#if defined(WIN32) || defined(XP_OS2)
-#define _PR_USE_STDIO_FOR_LOGGING
-#endif
-
-/*
-** Coerce Win32 log output to use OutputDebugString() when
-** NSPR_LOG_FILE is set to "WinDebug".
-*/
-#if defined(XP_PC)
-#define WIN32_DEBUG_FILE (FILE*)-2
-#endif
-
-/* Macros used to reduce #ifdef pollution */
-
-#if defined(_PR_USE_STDIO_FOR_LOGGING) && defined(XP_PC)
-#define _PUT_LOG(fd, buf, nb) \
-    PR_BEGIN_MACRO \
-    if (logFile == WIN32_DEBUG_FILE) { \
-        char savebyte = buf[nb]; \
-        buf[nb] = '\0'; \
-        OutputDebugString(buf); \
-        buf[nb] = savebyte; \
-    } else { \
-        fwrite(buf, 1, nb, fd); \
-        fflush(fd); \
-    } \
-    PR_END_MACRO
-#elif defined(_PR_USE_STDIO_FOR_LOGGING)
-#define _PUT_LOG(fd, buf, nb) {fwrite(buf, 1, nb, fd); fflush(fd);}
-#elif defined(_PR_PTHREADS)
-#define _PUT_LOG(fd, buf, nb) PR_Write(fd, buf, nb)
-#elif defined(XP_MAC)
-#define _PUT_LOG(fd, buf, nb) _PR_MD_WRITE_SYNC(fd, buf, nb)
-#else
-#define _PUT_LOG(fd, buf, nb) _PR_MD_WRITE(fd, buf, nb)
-#endif
-
-/************************************************************************/
-
-static PRLogModuleInfo *logModules;
-
-static char *logBuf = NULL;
-static char *logp;
-static char *logEndp;
-#ifdef _PR_USE_STDIO_FOR_LOGGING
-static FILE *logFile = NULL;
-#else
-static PRFileDesc *logFile = 0;
-#endif
-
-#define LINE_BUF_SIZE           512
-#define DEFAULT_BUF_SIZE        16384
-
-#ifdef _PR_NEED_STRCASECMP
-
-/*
- * strcasecmp is defined in /usr/ucblib/libucb.a on some platforms
- * such as NCR and Unixware.  Linking with both libc and libucb
- * may cause some problem, so I just provide our own implementation
- * of strcasecmp here.
- */
-
-static const unsigned char uc[] =
-{
-    '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-    '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-    '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-    '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-    ' ',    '!',    '"',    '#',    '$',    '%',    '&',    '\'',
-    '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',
-    '0',    '1',    '2',    '3',    '4',    '5',    '6',    '7',
-    '8',    '9',    ':',    ';',    '<',    '=',    '>',    '?',
-    '@',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
-    'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
-    'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
-    'X',    'Y',    'Z',    '[',    '\\',   ']',    '^',    '_',
-    '`',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
-    'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
-    'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
-    'X',    'Y',    'Z',    '{',    '|',    '}',    '~',    '\177'
-};
-
-PRIntn strcasecmp(const char *a, const char *b)
-{
-    const unsigned char *ua = (const unsigned char *)a;
-    const unsigned char *ub = (const unsigned char *)b;
-
-    if( ((const char *)0 == a) || (const char *)0 == b ) 
-        return (PRIntn)(a-b);
-
-    while( (uc[*ua] == uc[*ub]) && ('\0' != *a) )
-    {
-        a++;
-        ua++;
-        ub++;
-    }
-
-    return (PRIntn)(uc[*ua] - uc[*ub]);
-}
-
-#endif /* _PR_NEED_STRCASECMP */
-
-void _PR_InitLog(void)
-{
-    char *ev = NULL;
-
-    _pr_logLock = PR_NewLock();
-
-    /*   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
-                           * format string to be size-1.
-                           */
-        PRBool isSync = PR_FALSE;
-        PRIntn evlen = strlen(ev), pos = 0;
-        PRInt32 bufSize = DEFAULT_BUF_SIZE;
-        while (pos < evlen) {
-            PRIntn level = 1, count = 0, delta = 0;
-            count = sscanf(&ev[pos], "%63[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-]%n:%d%n",
-                           module, &delta, &level, &delta);
-            pos += delta;
-            if (count == 0) break;
-
-            /*
-            ** If count == 2, then we got module and level. If count
-            ** == 1, then level defaults to 1 (module enabled).
-            */
-            if (strcasecmp(module, "sync") == 0) {
-                isSync = PR_TRUE;
-            } else if (strcasecmp(module, "bufsize") == 0) {
-                if (level >= LINE_BUF_SIZE) {
-                    bufSize = level;
-                }
-            } else {
-                PRLogModuleInfo *lm = logModules;
-                PRBool skip_modcheck =
-                    (0 == strcasecmp (module, "all")) ? PR_TRUE : PR_FALSE;
-
-                while (lm != NULL) {
-                    if (skip_modcheck) lm -> level = (PRLogModuleLevel)level;
-                    else if (strcasecmp(module, lm->name) == 0) {
-                        lm->level = (PRLogModuleLevel)level;
-                        break;
-                    }
-                    lm = lm->next;
-                }
-            }
-            /*found:*/
-            count = sscanf(&ev[pos], " , %n", &delta);
-            pos += delta;
-            if (count == EOF) break;
-        }
-        PR_SetLogBuffering(isSync ? bufSize : 0);
-
-        /* ev = PR_GetEnv("NSPR_LOG_FILE"); */
-        if (ev && ev[0]) {
-            if (!PR_SetLogFile(ev)) {
-#ifdef XP_PC
-                char* str = PR_smprintf("Unable to create nspr log file '%s'\n", ev);
-                if (str) {
-                    OutputDebugString(str);
-                    PR_smprintf_free(str);
-                }
-#else
-                fprintf(stderr, "Unable to create nspr log file '%s'\n", ev);
-#endif
-            }
-        } else {
-#ifdef _PR_USE_STDIO_FOR_LOGGING
-            logFile = stderr;
-#else
-            logFile = _pr_stderr;
-#endif
-        }
-    }
-}
-
-void _PR_LogCleanup(void)
-{
-    PRLogModuleInfo *lm = logModules;
-
-    PR_LogFlush();
-
-#ifdef _PR_USE_STDIO_FOR_LOGGING
-    if (logFile
-        && logFile != stdout
-        && logFile != stderr
-#ifdef XP_PC
-        && logFile != WIN32_DEBUG_FILE
-#endif
-        ) {
-        fclose(logFile);
-    }
-#else
-    if (logFile && logFile != _pr_stdout && logFile != _pr_stderr) {
-        PR_Close(logFile);
-    }
-#endif
-
-    while (lm != NULL) {
-        PRLogModuleInfo *next = lm->next;
-        free((/*const*/ char *)lm->name);
-        PR_Free(lm);
-        lm = next;
-    }
-    logModules = NULL;
-
-    if (_pr_logLock) {
-        PR_DestroyLock(_pr_logLock);
-        _pr_logLock = NULL;
-    }
-}
-
-static void _PR_SetLogModuleLevel( PRLogModuleInfo *lm )
-{
-    char *ev = NULL;
-
-    /* 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
-                           * format string to be size-1.
-                           */
-        PRIntn evlen = strlen(ev), pos = 0;
-        while (pos < evlen) {
-            PRIntn level = 1, count = 0, delta = 0;
-
-            count = sscanf(&ev[pos], "%63[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-]%n:%d%n",
-                           module, &delta, &level, &delta);
-            pos += delta;
-            if (count == 0) break;
-
-            /*
-            ** If count == 2, then we got module and level. If count
-            ** == 1, then level defaults to 1 (module enabled).
-            */
-            if (lm != NULL)
-            {
-                if ((strcasecmp(module, "all") == 0)
-                    || (strcasecmp(module, lm->name) == 0))
-                {
-                    lm->level = (PRLogModuleLevel)level;
-                }
-            }
-            count = sscanf(&ev[pos], " , %n", &delta);
-            pos += delta;
-            if (count == EOF) break;
-        }
-    }
-} /* end _PR_SetLogModuleLevel() */
-
-PR_IMPLEMENT(PRLogModuleInfo*) PR_NewLogModule(const char *name)
-{
-    PRLogModuleInfo *lm;
-
-        if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    lm = PR_NEWZAP(PRLogModuleInfo);
-    if (lm) {
-        lm->name = strdup(name);
-        lm->level = PR_LOG_NONE;
-        lm->next = logModules;
-        logModules = lm;
-        _PR_SetLogModuleLevel(lm);
-    }
-    return lm;
-}
-
-PR_IMPLEMENT(PRBool) PR_SetLogFile(const char *file)
-{
-#ifdef _PR_USE_STDIO_FOR_LOGGING
-    FILE *newLogFile;
-
-#ifdef XP_PC
-    if ( strcmp( file, "WinDebug") == 0)
-    {
-        newLogFile = WIN32_DEBUG_FILE;
-    }
-    else
-#endif
-    {
-        newLogFile = fopen(file, "w");
-        if (!newLogFile)
-            return PR_FALSE;
-
-        /* We do buffering ourselves. */
-        setvbuf(newLogFile, NULL, _IONBF, 0);
-    }
-    if (logFile
-        && logFile != stdout
-        && logFile != stderr
-#ifdef XP_PC
-        && logFile != WIN32_DEBUG_FILE
-#endif
-        ) {
-        fclose(logFile);
-    }
-    logFile = newLogFile;
-    return PR_TRUE;
-#else
-    PRFileDesc *newLogFile;
-
-    newLogFile = PR_Open(file, PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE, 0666);
-    if (newLogFile) {
-        if (logFile && logFile != _pr_stdout && logFile != _pr_stderr) {
-            PR_Close(logFile);
-        }
-        logFile = newLogFile;
-#if defined(XP_MAC)
-        SetLogFileTypeCreator(file);
-#endif
-    }
-    return (PRBool) (newLogFile != 0);
-#endif /* _PR_USE_STDIO_FOR_LOGGING */
-}
-
-PR_IMPLEMENT(void) PR_SetLogBuffering(PRIntn buffer_size)
-{
-    PR_LogFlush();
-
-    if (logBuf)
-        PR_DELETE(logBuf);
-
-    if (buffer_size >= LINE_BUF_SIZE) {
-        logp = logBuf = (char*) PR_MALLOC(buffer_size);
-        logEndp = logp + buffer_size;
-    }
-}
-
-PR_IMPLEMENT(void) PR_LogPrint(const char *fmt, ...)
-{
-    va_list ap;
-    char line[LINE_BUF_SIZE];
-    PRUint32 nb;
-    PRThread *me;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (!logFile) {
-        return;
-    }
-
-    va_start(ap, fmt);
-    me = PR_GetCurrentThread();
-    nb = PR_snprintf(line, sizeof(line)-1, "%ld[%p]: ",
-#if defined(_PR_DCETHREADS)
-             /* The problem is that for _PR_DCETHREADS, pthread_t is not a 
-              * pointer, but a structure; so you can't easily print it...
-              */
-                     me ? &(me->id): 0L, me);
-#elif defined(_PR_BTHREADS)
-		     me, me);
-#else
-                     me ? me->id : 0L, me);
-#endif
-
-    nb += PR_vsnprintf(line+nb, sizeof(line)-nb-1, fmt, ap);
-    if (nb && (line[nb-1] != '\n')) {
-#ifndef XP_MAC
-        line[nb++] = '\n';
-#else
-        line[nb++] = '\015';
-#endif 
-        line[nb] = '\0';
-    } else {
-#ifdef XP_MAC
-        line[nb-1] = '\015';
-#endif
-    }
-    va_end(ap);
-
-    _PR_LOCK_LOG();
-    if (logBuf == 0) {
-        _PUT_LOG(logFile, line, nb);
-    } else {
-        if (logp + nb > logEndp) {
-            _PUT_LOG(logFile, logBuf, logp - logBuf);
-            logp = logBuf;
-        }
-        memcpy(logp, line, nb);
-        logp += nb;
-    }
-    _PR_UNLOCK_LOG();
-    PR_LogFlush();
-}
-
-PR_IMPLEMENT(void) PR_LogFlush(void)
-{
-    if (logBuf && logFile) {
-        _PR_LOCK_LOG();
-            if (logp > logBuf) {
-                _PUT_LOG(logFile, logBuf, logp - logBuf);
-                logp = logBuf;
-            }
-        _PR_UNLOCK_LOG();
-    }
-}
-
-PR_IMPLEMENT(void) PR_Abort(void)
-{
-    PR_LogPrint("Aborting");
-    abort();
-}
-
-#if defined(XP_OS2)
-/*
- * Added definitions for DebugBreak() for 2 different OS/2 compilers.
- * Doing the int3 on purpose for Visual Age so that a developer can
- * step over the instruction if so desired.  Not always possible if
- * trapping due to exception handling IBM-AKR
- */
-#if defined(XP_OS2_VACPP)
-#include <builtin.h>
-static void DebugBreak(void) { _interrupt(3); }
-#elif defined(XP_OS2_EMX)
-static void DebugBreak(void) { asm("int $3"); }
-#else
-static void DebugBreak(void) { }
-#endif
-#endif /* XP_OS2 */
-
-PR_IMPLEMENT(void) PR_Assert(const char *s, const char *file, PRIntn ln)
-{
-    PR_LogPrint("Assertion failure: %s, at %s:%d\n", s, file, ln);
-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-    fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, ln);
-#endif
-#ifdef XP_MAC
-    dprintf("Assertion failure: %s, at %s:%d\n", s, file, ln);
-#endif
-#if defined(WIN32) || defined(XP_OS2)
-    DebugBreak();
-#endif
-#ifndef XP_MAC
-    abort();
-#endif
-}
-
-#ifdef XP_MAC
-PR_IMPLEMENT(void) PR_Init_Log(void)
-{
-	_PR_InitLog();
-}
-#endif
diff --git a/libs/js/nsprpub/pr/src/io/prmapopt.c b/libs/js/nsprpub/pr/src/io/prmapopt.c
deleted file mode 100644
index e4811e5725..0000000000
--- a/libs/js/nsprpub/pr/src/io/prmapopt.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This file defines _PR_MapOptionName().  The purpose of putting
- * _PR_MapOptionName() in a separate file is to work around a Winsock
- * header file problem on Windows NT.
- *
- * On Windows NT, if we define _WIN32_WINNT to be 0x0400 (in order
- * to use Service Pack 3 extensions), windows.h includes winsock2.h
- * (instead of winsock.h), which doesn't define many socket options
- * defined in winsock.h.
- *
- * We need the socket options defined in winsock.h.  So this file
- * includes winsock.h, with _WIN32_WINNT undefined.
- */
-
-#if defined(WINNT) || defined(__MINGW32__)
-#include <winsock.h>
-#endif
-
-/* MinGW doesn't define these in its winsock.h. */
-#ifdef __MINGW32__
-#ifndef IP_TTL
-#define IP_TTL 7
-#endif
-#ifndef IP_TOS
-#define IP_TOS 8
-#endif
-#endif
-
-#include "primpl.h"
-
-#if defined(NEXTSTEP)
-/* NEXTSTEP is special: this must come before netinet/tcp.h. */
-#include <netinet/in_systm.h>  /* n_short, n_long, n_time */
-#endif
-
-#if defined(XP_UNIX) || defined(OS2) || (defined(XP_BEOS) && defined(BONE_VERSION))
-#include <netinet/tcp.h>  /* TCP_NODELAY, TCP_MAXSEG */
-#endif
-
-#ifndef _PR_PTHREADS
-
-PRStatus PR_CALLBACK _PR_SocketGetSocketOption(PRFileDesc *fd, PRSocketOptionData *data)
-{
-    PRStatus rv;
-    PRInt32 length;
-    PRInt32 level, name;
-
-    /*
-     * PR_SockOpt_Nonblocking is a special case that does not
-     * translate to a getsockopt() call
-     */
-    if (PR_SockOpt_Nonblocking == data->option)
-    {
-        data->value.non_blocking = fd->secret->nonblocking;
-        return PR_SUCCESS;
-    }
-
-    rv = _PR_MapOptionName(data->option, &level, &name);
-    if (PR_SUCCESS == rv)
-    {
-        switch (data->option)
-        {
-            case PR_SockOpt_Linger:
-            {
-#if !defined(XP_BEOS) || defined(BONE_VERSION)
-                struct linger linger;
-                length = sizeof(linger);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char *) &linger, &length);
-                if (PR_SUCCESS == rv)
-                {
-                    PR_ASSERT(sizeof(linger) == length);
-                    data->value.linger.polarity =
-                        (linger.l_onoff) ? PR_TRUE : PR_FALSE;
-                    data->value.linger.linger =
-                        PR_SecondsToInterval(linger.l_linger);
-                }
-                break;
-#else
-                PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-                return PR_FAILURE;
-#endif
-            }
-            case PR_SockOpt_Reuseaddr:
-            case PR_SockOpt_Keepalive:
-            case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
-            {
-#ifdef WIN32 /* Winsock */
-                BOOL value;
-#else
-                PRIntn value;
-#endif
-                length = sizeof(value);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&value, &length);
-                if (PR_SUCCESS == rv)
-                    data->value.reuse_addr = (0 == value) ? PR_FALSE : PR_TRUE;
-                break;
-            }
-            case PR_SockOpt_McastLoopback:
-            {
-#ifdef WIN32 /* Winsock */
-                BOOL bool;
-#else
-                PRUint8 bool;
-#endif
-                length = sizeof(bool);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&bool, &length);
-                if (PR_SUCCESS == rv)
-                    data->value.mcast_loopback = (0 == bool) ? PR_FALSE : PR_TRUE;
-                break;
-            }
-            case PR_SockOpt_RecvBufferSize:
-            case PR_SockOpt_SendBufferSize:
-            case PR_SockOpt_MaxSegment:
-            {
-                PRIntn value;
-                length = sizeof(value);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&value, &length);
-                if (PR_SUCCESS == rv)
-                    data->value.recv_buffer_size = value;
-                break;
-            }
-            case PR_SockOpt_IpTimeToLive:
-            case PR_SockOpt_IpTypeOfService:
-            {
-                /* These options should really be an int (or PRIntn). */
-                length = sizeof(PRUintn);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&data->value.ip_ttl, &length);
-                break;
-            }
-            case PR_SockOpt_McastTimeToLive:
-            {
-#ifdef WIN32 /* Winsock */
-                int ttl;
-#else
-                PRUint8 ttl;
-#endif
-                length = sizeof(ttl);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&ttl, &length);
-                if (PR_SUCCESS == rv)
-                    data->value.mcast_ttl = ttl;
-                break;
-            }
-#ifdef IP_ADD_MEMBERSHIP
-            case PR_SockOpt_AddMember:
-            case PR_SockOpt_DropMember:
-            {
-                struct ip_mreq mreq;
-                length = sizeof(mreq);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name, (char*)&mreq, &length);
-                if (PR_SUCCESS == rv)
-                {
-                    data->value.add_member.mcaddr.inet.ip =
-                        mreq.imr_multiaddr.s_addr;
-                    data->value.add_member.ifaddr.inet.ip =
-                        mreq.imr_interface.s_addr;
-                }
-                break;
-            }
-#endif /* IP_ADD_MEMBERSHIP */
-            case PR_SockOpt_McastInterface:
-            {
-                /* This option is a struct in_addr. */
-                length = sizeof(data->value.mcast_if.inet.ip);
-                rv = _PR_MD_GETSOCKOPT(
-                    fd, level, name,
-                    (char*)&data->value.mcast_if.inet.ip, &length);
-                break;
-            }
-            default:
-                PR_NOT_REACHED("Unknown socket option");
-                break;
-        }  
-    }
-    return rv;
-}  /* _PR_SocketGetSocketOption */
-
-PRStatus PR_CALLBACK _PR_SocketSetSocketOption(PRFileDesc *fd, const PRSocketOptionData *data)
-{
-    PRStatus rv;
-    PRInt32 level, name;
-
-    /*
-     * PR_SockOpt_Nonblocking is a special case that does not
-     * translate to a setsockopt call.
-     */
-    if (PR_SockOpt_Nonblocking == data->option)
-    {
-#ifdef WINNT
-        PR_ASSERT((fd->secret->md.io_model_committed == PR_FALSE)
-            || (fd->secret->nonblocking == data->value.non_blocking));
-        if (fd->secret->md.io_model_committed
-            && (fd->secret->nonblocking != data->value.non_blocking))
-        {
-            /*
-             * On NT, once we have associated a socket with the io
-             * completion port, we can't disassociate it.  So we
-             * can't change the nonblocking option of the socket
-             * afterwards.
-             */
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return PR_FAILURE;
-        }
-#endif
-        fd->secret->nonblocking = data->value.non_blocking;
-        return PR_SUCCESS;
-    }
-
-    rv = _PR_MapOptionName(data->option, &level, &name);
-    if (PR_SUCCESS == rv)
-    {
-        switch (data->option)
-        {
-            case PR_SockOpt_Linger:
-            {
-#if !defined(XP_BEOS) || defined(BONE_VERSION)
-                struct linger linger;
-                linger.l_onoff = data->value.linger.polarity;
-                linger.l_linger = PR_IntervalToSeconds(data->value.linger.linger);
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&linger, sizeof(linger));
-                break;
-#else
-                PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-                return PR_FAILURE;
-#endif
-            }
-            case PR_SockOpt_Reuseaddr:
-            case PR_SockOpt_Keepalive:
-            case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
-            {
-#ifdef WIN32 /* Winsock */
-                BOOL value;
-#else
-                PRIntn value;
-#endif
-                value = (data->value.reuse_addr) ? 1 : 0;
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&value, sizeof(value));
-                break;
-            }
-            case PR_SockOpt_McastLoopback:
-            {
-#ifdef WIN32 /* Winsock */
-                BOOL bool;
-#else
-                PRUint8 bool;
-#endif
-                bool = data->value.mcast_loopback ? 1 : 0;
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&bool, sizeof(bool));
-                break;
-            }
-            case PR_SockOpt_RecvBufferSize:
-            case PR_SockOpt_SendBufferSize:
-            case PR_SockOpt_MaxSegment:
-            {
-                PRIntn value = data->value.recv_buffer_size;
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&value, sizeof(value));
-                break;
-            }
-            case PR_SockOpt_IpTimeToLive:
-            case PR_SockOpt_IpTypeOfService:
-            {
-                /* These options should really be an int (or PRIntn). */
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&data->value.ip_ttl, sizeof(PRUintn));
-                break;
-            }
-            case PR_SockOpt_McastTimeToLive:
-            {
-#ifdef WIN32 /* Winsock */
-                int ttl;
-#else
-                PRUint8 ttl;
-#endif
-                ttl = data->value.mcast_ttl;
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&ttl, sizeof(ttl));
-                break;
-            }
-#ifdef IP_ADD_MEMBERSHIP
-            case PR_SockOpt_AddMember:
-            case PR_SockOpt_DropMember:
-            {
-                struct ip_mreq mreq;
-                mreq.imr_multiaddr.s_addr =
-                    data->value.add_member.mcaddr.inet.ip;
-                mreq.imr_interface.s_addr =
-                    data->value.add_member.ifaddr.inet.ip;
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&mreq, sizeof(mreq));
-                break;
-            }
-#endif /* IP_ADD_MEMBERSHIP */
-            case PR_SockOpt_McastInterface:
-            {
-                /* This option is a struct in_addr. */
-                rv = _PR_MD_SETSOCKOPT(
-                    fd, level, name, (char*)&data->value.mcast_if.inet.ip,
-                    sizeof(data->value.mcast_if.inet.ip));
-                break;
-            }
-            default:
-                PR_NOT_REACHED("Unknown socket option");
-                break;
-        }  
-    }
-    return rv;
-}  /* _PR_SocketSetSocketOption */
-
-#endif /* ! _PR_PTHREADS */
-
-/*
- *********************************************************************
- *********************************************************************
- **
- ** Make sure that the following is at the end of this file,
- ** because we will be playing with macro redefines.
- **
- *********************************************************************
- *********************************************************************
- */
-
-#if defined(VMS)
-/*
-** Sad but true. The DEC C header files define the following socket options
-** differently to what UCX is expecting. The values that UCX expects are
-** defined in SYS$LIBRARY:UCX$INETDEF.H. We redefine them here to the values
-** that UCX expects. Note that UCX V4.x will only accept these values while
-** UCX V5.x will accept either. So in theory this hack can be removed once
-** UCX V5 is the minimum.
-*/
-#undef IP_MULTICAST_IF
-#undef IP_MULTICAST_TTL
-#undef IP_MULTICAST_LOOP
-#undef IP_ADD_MEMBERSHIP
-#undef IP_DROP_MEMBERSHIP
-#include <ucx$inetdef.h>
-#define IP_MULTICAST_IF    UCX$C_IP_MULTICAST_IF
-#define IP_MULTICAST_TTL   UCX$C_IP_MULTICAST_TTL
-#define IP_MULTICAST_LOOP  UCX$C_IP_MULTICAST_LOOP
-#define IP_ADD_MEMBERSHIP  UCX$C_IP_ADD_MEMBERSHIP
-#define IP_DROP_MEMBERSHIP UCX$C_IP_DROP_MEMBERSHIP
-#endif
-
-/*
- * Not every platform has all the socket options we want to
- * support.  Some older operating systems such as SunOS 4.1.3
- * don't have the IP multicast socket options.  Win32 doesn't
- * have TCP_MAXSEG.
- *
- * To deal with this problem, we define the missing socket
- * options as _PR_NO_SUCH_SOCKOPT.  _PR_MapOptionName() fails with
- * PR_OPERATION_NOT_SUPPORTED_ERROR if a socket option not
- * available on the platform is requested.
- */
-
-/*
- * Sanity check.  SO_LINGER and TCP_NODELAY should be available
- * on all platforms.  Just to make sure we have included the
- * appropriate header files.  Then any undefined socket options
- * are really missing.
- */
-
-#if !defined(SO_LINGER)
-#error "SO_LINGER is not defined"
-#endif
-
-/*
- * Some platforms, such as NCR 2.03, don't have TCP_NODELAY defined
- * in <netinet/tcp.h>
- */
-#if !defined(NCR)
-#if !defined(TCP_NODELAY)
-#error "TCP_NODELAY is not defined"
-#endif
-#endif
-
-/*
- * Make sure the value of _PR_NO_SUCH_SOCKOPT is not
- * a valid socket option.
- */
-#define _PR_NO_SUCH_SOCKOPT -1
-
-#ifndef SO_KEEPALIVE
-#define SO_KEEPALIVE        _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef SO_SNDBUF
-#define SO_SNDBUF           _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef SO_RCVBUF
-#define SO_RCVBUF           _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_MULTICAST_IF                 /* set/get IP multicast interface   */
-#define IP_MULTICAST_IF     _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_MULTICAST_TTL                /* set/get IP multicast timetolive  */
-#define IP_MULTICAST_TTL    _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_MULTICAST_LOOP               /* set/get IP multicast loopback    */
-#define IP_MULTICAST_LOOP   _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_ADD_MEMBERSHIP               /* add  an IP group membership      */
-#define IP_ADD_MEMBERSHIP   _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_DROP_MEMBERSHIP              /* drop an IP group membership      */
-#define IP_DROP_MEMBERSHIP  _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_TTL                          /* set/get IP Time To Live          */
-#define IP_TTL              _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef IP_TOS                          /* set/get IP Type Of Service       */
-#define IP_TOS              _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef TCP_NODELAY                     /* don't delay to coalesce data     */
-#define TCP_NODELAY         _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef TCP_MAXSEG                      /* maxumum segment size for tcp     */
-#define TCP_MAXSEG          _PR_NO_SUCH_SOCKOPT
-#endif
-
-#ifndef SO_BROADCAST                 /* enable broadcast on udp sockets */
-#define SO_BROADCAST        _PR_NO_SUCH_SOCKOPT
-#endif
-
-PRStatus _PR_MapOptionName(
-    PRSockOption optname, PRInt32 *level, PRInt32 *name)
-{
-    static PRInt32 socketOptions[PR_SockOpt_Last] =
-    {
-        0, SO_LINGER, SO_REUSEADDR, SO_KEEPALIVE, SO_RCVBUF, SO_SNDBUF,
-        IP_TTL, IP_TOS, IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP,
-        IP_MULTICAST_IF, IP_MULTICAST_TTL, IP_MULTICAST_LOOP,
-        TCP_NODELAY, TCP_MAXSEG, SO_BROADCAST
-    };
-    static PRInt32 socketLevels[PR_SockOpt_Last] =
-    {
-        0, SOL_SOCKET, SOL_SOCKET, SOL_SOCKET, SOL_SOCKET, SOL_SOCKET,
-        IPPROTO_IP, IPPROTO_IP, IPPROTO_IP, IPPROTO_IP,
-        IPPROTO_IP, IPPROTO_IP, IPPROTO_IP,
-        IPPROTO_TCP, IPPROTO_TCP, SOL_SOCKET
-    };
-
-    if ((optname < PR_SockOpt_Linger)
-    || (optname >= PR_SockOpt_Last))
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    if (socketOptions[optname] == _PR_NO_SUCH_SOCKOPT)
-    {
-        PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, 0);
-        return PR_FAILURE;
-    }
-    *name = socketOptions[optname];
-    *level = socketLevels[optname];
-    return PR_SUCCESS;
-}  /* _PR_MapOptionName */
diff --git a/libs/js/nsprpub/pr/src/io/prmmap.c b/libs/js/nsprpub/pr/src/io/prmmap.c
deleted file mode 100644
index e5c1e5dc7a..0000000000
--- a/libs/js/nsprpub/pr/src/io/prmmap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *********************************************************************
- *
- * Memory-mapped files
- *
- *********************************************************************
- */
-
-#include "primpl.h"
-
-PR_IMPLEMENT(PRFileMap *) PR_CreateFileMap(
-    PRFileDesc *fd,
-    PRInt64 size,
-    PRFileMapProtect prot)
-{
-    PRFileMap *fmap;
-
-    PR_ASSERT(prot == PR_PROT_READONLY || prot == PR_PROT_READWRITE
-            || prot == PR_PROT_WRITECOPY);
-    fmap = PR_NEWZAP(PRFileMap);
-    if (NULL == fmap) {
-	PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	return NULL;
-    }
-    fmap->fd = fd;
-    fmap->prot = prot;
-    if (_PR_MD_CREATE_FILE_MAP(fmap, size) == PR_SUCCESS) {
-	return fmap;
-    } else {
-	PR_DELETE(fmap);
-	return NULL;
-    }
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetMemMapAlignment(void)
-{
-    return _PR_MD_GET_MEM_MAP_ALIGNMENT();
-}
-
-PR_IMPLEMENT(void *) PR_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,
-    PRUint32 len)
-{
-    return _PR_MD_MEM_MAP(fmap, offset, len);
-}
-
-PR_IMPLEMENT(PRStatus) PR_MemUnmap(void *addr, PRUint32 len)
-{
-    return _PR_MD_MEM_UNMAP(addr, len);
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseFileMap(PRFileMap *fmap)
-{
-    return _PR_MD_CLOSE_FILE_MAP(fmap);
-}
diff --git a/libs/js/nsprpub/pr/src/io/prmwait.c b/libs/js/nsprpub/pr/src/io/prmwait.c
deleted file mode 100644
index afdcddf215..0000000000
--- a/libs/js/nsprpub/pr/src/io/prmwait.c
+++ /dev/null
@@ -1,1491 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include "pprmwait.h"
-
-#define _MW_REHASH_MAX 11
-
-static PRLock *mw_lock = NULL;
-static _PRGlobalState *mw_state = NULL;
-
-static PRIntervalTime max_polling_interval;
-
-#ifdef WINNT
-
-typedef struct TimerEvent {
-    PRIntervalTime absolute;
-    void (*func)(void *);
-    void *arg;
-    LONG ref_count;
-    PRCList links;
-} TimerEvent;
-
-#define TIMER_EVENT_PTR(_qp) \
-    ((TimerEvent *) ((char *) (_qp) - offsetof(TimerEvent, links)))
-
-struct {
-    PRLock *ml;
-    PRCondVar *new_timer;
-    PRCondVar *cancel_timer;
-    PRThread *manager_thread;
-    PRCList timer_queue;
-} tm_vars;
-
-static PRStatus TimerInit(void);
-static void TimerManager(void *arg);
-static TimerEvent *CreateTimer(PRIntervalTime timeout,
-    void (*func)(void *), void *arg);
-static PRBool CancelTimer(TimerEvent *timer);
-
-static void TimerManager(void *arg)
-{
-    PRIntervalTime now;
-    PRIntervalTime timeout;
-    PRCList *head;
-    TimerEvent *timer;
-
-    PR_Lock(tm_vars.ml);
-    while (1)
-    {
-        if (PR_CLIST_IS_EMPTY(&tm_vars.timer_queue))
-        {
-            PR_WaitCondVar(tm_vars.new_timer, PR_INTERVAL_NO_TIMEOUT);
-        }
-        else
-        {
-            now = PR_IntervalNow();
-            head = PR_LIST_HEAD(&tm_vars.timer_queue);
-            timer = TIMER_EVENT_PTR(head);
-            if ((PRInt32) (now - timer->absolute) >= 0)
-            {
-                PR_REMOVE_LINK(head);
-                /*
-                 * make its prev and next point to itself so that
-                 * it's obvious that it's not on the timer_queue.
-                 */
-                PR_INIT_CLIST(head);
-                PR_ASSERT(2 == timer->ref_count);
-                PR_Unlock(tm_vars.ml);
-                timer->func(timer->arg);
-                PR_Lock(tm_vars.ml);
-                timer->ref_count -= 1;
-                if (0 == timer->ref_count)
-                {
-                    PR_NotifyAllCondVar(tm_vars.cancel_timer);
-                }
-            }
-            else
-            {
-                timeout = (PRIntervalTime)(timer->absolute - now);
-                PR_WaitCondVar(tm_vars.new_timer, timeout);
-            } 
-        }
-    }
-    PR_Unlock(tm_vars.ml);
-}
-
-static TimerEvent *CreateTimer(
-    PRIntervalTime timeout,
-    void (*func)(void *),
-    void *arg)
-{
-    TimerEvent *timer;
-    PRCList *links, *tail;
-    TimerEvent *elem;
-
-    timer = PR_NEW(TimerEvent);
-    if (NULL == timer)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return timer;
-    }
-    timer->absolute = PR_IntervalNow() + timeout;
-    timer->func = func;
-    timer->arg = arg;
-    timer->ref_count = 2;
-    PR_Lock(tm_vars.ml);
-    tail = links = PR_LIST_TAIL(&tm_vars.timer_queue);
-    while (links->prev != tail)
-    {
-        elem = TIMER_EVENT_PTR(links);
-        if ((PRInt32)(timer->absolute - elem->absolute) >= 0)
-        {
-            break;
-        }
-        links = links->prev;
-    }
-    PR_INSERT_AFTER(&timer->links, links);
-    PR_NotifyCondVar(tm_vars.new_timer);
-    PR_Unlock(tm_vars.ml);
-    return timer;
-}
-
-static PRBool CancelTimer(TimerEvent *timer)
-{
-    PRBool canceled = PR_FALSE;
-
-    PR_Lock(tm_vars.ml);
-    timer->ref_count -= 1;
-    if (timer->links.prev == &timer->links)
-    {
-        while (timer->ref_count == 1)
-        {
-            PR_WaitCondVar(tm_vars.cancel_timer, PR_INTERVAL_NO_TIMEOUT);
-        }
-    }
-    else
-    {
-        PR_REMOVE_LINK(&timer->links);
-        canceled = PR_TRUE;
-    }
-    PR_Unlock(tm_vars.ml);
-    PR_DELETE(timer);
-    return canceled; 
-}
-
-static PRStatus TimerInit(void)
-{
-    tm_vars.ml = PR_NewLock();
-    if (NULL == tm_vars.ml)
-    {
-        goto failed;
-    }
-    tm_vars.new_timer = PR_NewCondVar(tm_vars.ml);
-    if (NULL == tm_vars.new_timer)
-    {
-        goto failed;
-    }
-    tm_vars.cancel_timer = PR_NewCondVar(tm_vars.ml);
-    if (NULL == tm_vars.cancel_timer)
-    {
-        goto failed;
-    }
-    PR_INIT_CLIST(&tm_vars.timer_queue);
-    tm_vars.manager_thread = PR_CreateThread(
-        PR_SYSTEM_THREAD, TimerManager, NULL, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-    if (NULL == tm_vars.manager_thread)
-    {
-        goto failed;
-    }
-    return PR_SUCCESS;
-
-failed:
-    if (NULL != tm_vars.cancel_timer)
-    {
-        PR_DestroyCondVar(tm_vars.cancel_timer);
-    }
-    if (NULL != tm_vars.new_timer)
-    {
-        PR_DestroyCondVar(tm_vars.new_timer);
-    }
-    if (NULL != tm_vars.ml)
-    {
-        PR_DestroyLock(tm_vars.ml);
-    }
-    return PR_FAILURE;
-}
-
-#endif /* WINNT */
-
-/******************************************************************/
-/******************************************************************/
-/************************ The private portion *********************/
-/******************************************************************/
-/******************************************************************/
-void _PR_InitMW(void)
-{
-#ifdef WINNT
-    /*
-     * We use NT 4's InterlockedCompareExchange() to operate
-     * on PRMWStatus variables.
-     */
-    //PR_ASSERT(sizeof(PVOID) == sizeof(PRMWStatus));
-    TimerInit();
-#endif
-    mw_lock = PR_NewLock();
-    PR_ASSERT(NULL != mw_lock);
-    mw_state = PR_NEWZAP(_PRGlobalState);
-    PR_ASSERT(NULL != mw_state);
-    PR_INIT_CLIST(&mw_state->group_list);
-    max_polling_interval = PR_MillisecondsToInterval(MAX_POLLING_INTERVAL);
-}  /* _PR_InitMW */
-
-void _PR_CleanupMW(void)
-{
-    PR_DestroyLock(mw_lock);
-    mw_lock = NULL;
-    if (mw_state->group) {
-        PR_DestroyWaitGroup(mw_state->group);
-        /* mw_state->group is set to NULL as a side effect. */
-    }
-    PR_DELETE(mw_state);
-}  /* _PR_CleanupMW */
-
-static PRWaitGroup *MW_Init2(void)
-{
-    PRWaitGroup *group = mw_state->group;  /* it's the null group */
-    if (NULL == group)  /* there is this special case */
-    {
-        group = PR_CreateWaitGroup(_PR_DEFAULT_HASH_LENGTH);
-        if (NULL == group) goto failed_alloc;
-        PR_Lock(mw_lock);
-        if (NULL == mw_state->group)
-        {
-            mw_state->group = group;
-            group = NULL;
-        }
-        PR_Unlock(mw_lock);
-        if (group != NULL) (void)PR_DestroyWaitGroup(group);
-        group = mw_state->group;  /* somebody beat us to it */
-    }
-failed_alloc:
-    return group;  /* whatever */
-}  /* MW_Init2 */
-
-static _PR_HashStory MW_AddHashInternal(PRRecvWait *desc, _PRWaiterHash *hash)
-{
-    /*
-    ** The entries are put in the table using the fd (PRFileDesc*) of
-    ** the receive descriptor as the key. This allows us to locate
-    ** the appropriate entry aqain when the poll operation finishes.
-    **
-    ** The pointer to the file descriptor object is first divided by
-    ** the natural alignment of a pointer in the belief that object
-    ** will have at least that many zeros in the low order bits.
-    ** This may not be a good assuption.
-    **
-    ** We try to put the entry in by rehashing _MW_REHASH_MAX times. After
-    ** that we declare defeat and force the table to be reconstructed.
-    ** Since some fds might be added more than once, won't that cause
-    ** collisions even in an empty table?
-    */
-    PRIntn rehash = _MW_REHASH_MAX;
-    PRRecvWait **waiter;
-    PRUintn hidx = _MW_HASH(desc->fd, hash->length);
-    PRUintn hoffset = 0;
-
-    while (rehash-- > 0)
-    {
-        waiter = &hash->recv_wait;
-        if (NULL == waiter[hidx])
-        {
-            waiter[hidx] = desc;
-            hash->count += 1;
-#if 0
-            printf("Adding 0x%x->0x%x ", desc, desc->fd);
-            printf(
-                "table[%u:%u:*%u]: 0x%x->0x%x\n",
-                hidx, hash->count, hash->length, waiter[hidx], waiter[hidx]->fd);
-#endif
-            return _prmw_success;
-        }
-        if (desc == waiter[hidx])
-        {
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);  /* desc already in table */
-            return _prmw_error;
-        }
-#if 0
-        printf("Failing 0x%x->0x%x ", desc, desc->fd);
-        printf(
-            "table[*%u:%u:%u]: 0x%x->0x%x\n",
-            hidx, hash->count, hash->length, waiter[hidx], waiter[hidx]->fd);
-#endif
-        if (0 == hoffset)
-        {
-            hoffset = _MW_HASH2(desc->fd, hash->length);
-            PR_ASSERT(0 != hoffset);
-        }
-        hidx = (hidx + hoffset) % (hash->length);
-    }
-    return _prmw_rehash;    
-}  /* MW_AddHashInternal */
-
-static _PR_HashStory MW_ExpandHashInternal(PRWaitGroup *group)
-{
-    PRRecvWait **desc;
-    PRUint32 pidx, length;
-    _PRWaiterHash *newHash, *oldHash = group->waiter;
-    PRBool retry;
-    _PR_HashStory hrv;
-
-    static const PRInt32 prime_number[] = {
-        _PR_DEFAULT_HASH_LENGTH, 179, 521, 907, 1427,
-        2711, 3917, 5021, 8219, 11549, 18911, 26711, 33749, 44771};
-    PRUintn primes = (sizeof(prime_number) / sizeof(PRInt32));
-
-    /* look up the next size we'd like to use for the hash table */
-    for (pidx = 0; pidx < primes; ++pidx)
-    {
-        if (prime_number[pidx] == oldHash->length)
-        {
-            break;
-        }
-    }
-    /* table size must be one of the prime numbers */
-    PR_ASSERT(pidx < primes);
-
-    /* if pidx == primes - 1, we can't expand the table any more */
-    while (pidx < primes - 1)
-    {
-        /* next size */
-        ++pidx;
-        length = prime_number[pidx];
-
-        /* allocate the new hash table and fill it in with the old */
-        newHash = (_PRWaiterHash*)PR_CALLOC(
-            sizeof(_PRWaiterHash) + (length * sizeof(PRRecvWait*)));
-        if (NULL == newHash)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return _prmw_error;
-        }
-
-        newHash->length = length;
-        retry = PR_FALSE;
-        for (desc = &oldHash->recv_wait;
-            newHash->count < oldHash->count; ++desc)
-        {
-            PR_ASSERT(desc < &oldHash->recv_wait + oldHash->length);
-            if (NULL != *desc)
-            {
-                hrv = MW_AddHashInternal(*desc, newHash);
-                PR_ASSERT(_prmw_error != hrv);
-                if (_prmw_success != hrv)
-                {
-                    PR_DELETE(newHash);
-                    retry = PR_TRUE;
-                    break;
-                }
-            }
-        }
-        if (retry) continue;
-
-        PR_DELETE(group->waiter);
-        group->waiter = newHash;
-        group->p_timestamp += 1;
-        return _prmw_success;
-    }
-
-    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    return _prmw_error;  /* we're hosed */
-}  /* MW_ExpandHashInternal */
-
-#ifndef WINNT
-static void _MW_DoneInternal(
-    PRWaitGroup *group, PRRecvWait **waiter, PRMWStatus outcome)
-{
-    /*
-    ** Add this receive wait object to the list of finished I/O
-    ** operations for this particular group. If there are other
-    ** threads waiting on the group, notify one. If not, arrange
-    ** for this thread to return.
-    */
-
-#if 0
-    printf("Removing 0x%x->0x%x\n", *waiter, (*waiter)->fd);
-#endif
-    (*waiter)->outcome = outcome;
-    PR_APPEND_LINK(&((*waiter)->internal), &group->io_ready);
-    PR_NotifyCondVar(group->io_complete);
-    PR_ASSERT(0 != group->waiter->count);
-    group->waiter->count -= 1;
-    *waiter = NULL;
-}  /* _MW_DoneInternal */
-#endif /* WINNT */
-
-static PRRecvWait **_MW_LookupInternal(PRWaitGroup *group, PRFileDesc *fd)
-{
-    /*
-    ** Find the receive wait object corresponding to the file descriptor.
-    ** Only search the wait group specified.
-    */
-    PRRecvWait **desc;
-    PRIntn rehash = _MW_REHASH_MAX;
-    _PRWaiterHash *hash = group->waiter;
-    PRUintn hidx = _MW_HASH(fd, hash->length);
-    PRUintn hoffset = 0;
-    
-    while (rehash-- > 0)
-    {
-        desc = (&hash->recv_wait) + hidx;
-        if ((*desc != NULL) && ((*desc)->fd == fd)) return desc;
-        if (0 == hoffset)
-        {
-            hoffset = _MW_HASH2(fd, hash->length);
-            PR_ASSERT(0 != hoffset);
-        }
-        hidx = (hidx + hoffset) % (hash->length);
-    }
-    return NULL;
-}  /* _MW_LookupInternal */
-
-#ifndef WINNT
-static PRStatus _MW_PollInternal(PRWaitGroup *group)
-{
-    PRRecvWait **waiter;
-    PRStatus rv = PR_FAILURE;
-    PRInt32 count, count_ready;
-    PRIntervalTime polling_interval;
-
-    group->poller = PR_GetCurrentThread();
-
-    while (PR_TRUE)
-    {
-        PRIntervalTime now, since_last_poll;
-        PRPollDesc *poll_list;
-
-        while (0 == group->waiter->count)
-        {
-            PRStatus st;
-            st = PR_WaitCondVar(group->new_business, PR_INTERVAL_NO_TIMEOUT);
-            if (_prmw_running != group->state)
-            {
-                PR_SetError(PR_INVALID_STATE_ERROR, 0);
-                goto aborted;
-            }
-            if (_MW_ABORTED(st)) goto aborted;
-        }
-
-        /*
-        ** There's something to do. See if our existing polling list
-        ** is large enough for what we have to do?
-        */
-
-        while (group->polling_count < group->waiter->count)
-        {
-            PRUint32 old_count = group->waiter->count;
-            PRUint32 new_count = PR_ROUNDUP(old_count, _PR_POLL_COUNT_FUDGE);
-            PRSize new_size = sizeof(PRPollDesc) * new_count;
-            PRPollDesc *old_polling_list = group->polling_list;
-
-            PR_Unlock(group->ml);
-            poll_list = (PRPollDesc*)PR_CALLOC(new_size);
-            if (NULL == poll_list)
-            {
-                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                PR_Lock(group->ml);
-                goto failed_alloc;
-            }
-            if (NULL != old_polling_list)
-                PR_DELETE(old_polling_list);
-            PR_Lock(group->ml);
-            if (_prmw_running != group->state)
-            {
-                PR_SetError(PR_INVALID_STATE_ERROR, 0);
-                goto aborted;
-            }
-            group->polling_list = poll_list;
-            group->polling_count = new_count;
-        }
-
-        now = PR_IntervalNow();
-        polling_interval = max_polling_interval;
-        since_last_poll = now - group->last_poll;
-
-        waiter = &group->waiter->recv_wait;
-        poll_list = group->polling_list;
-        for (count = 0; count < group->waiter->count; ++waiter)
-        {
-            PR_ASSERT(waiter < &group->waiter->recv_wait
-                + group->waiter->length);
-            if (NULL != *waiter)  /* a live one! */
-            {
-                if ((PR_INTERVAL_NO_TIMEOUT != (*waiter)->timeout)
-                && (since_last_poll >= (*waiter)->timeout))
-                    _MW_DoneInternal(group, waiter, PR_MW_TIMEOUT);
-                else
-                {
-                    if (PR_INTERVAL_NO_TIMEOUT != (*waiter)->timeout)
-                    {
-                        (*waiter)->timeout -= since_last_poll;
-                        if ((*waiter)->timeout < polling_interval)
-                            polling_interval = (*waiter)->timeout;
-                    }
-                    PR_ASSERT(poll_list < group->polling_list
-                        + group->polling_count);
-                    poll_list->fd = (*waiter)->fd;
-                    poll_list->in_flags = PR_POLL_READ;
-                    poll_list->out_flags = 0;
-#if 0
-                    printf(
-                        "Polling 0x%x[%d]: [fd: 0x%x, tmo: %u]\n",
-                        poll_list, count, poll_list->fd, (*waiter)->timeout);
-#endif
-                    poll_list += 1;
-                    count += 1;
-                }
-            }
-        } 
-
-        PR_ASSERT(count == group->waiter->count);
-
-        /*
-        ** If there are no more threads waiting for completion,
-        ** we need to return.
-        */
-        if ((!PR_CLIST_IS_EMPTY(&group->io_ready))
-        && (1 == group->waiting_threads)) break;
-
-        if (0 == count) continue;  /* wait for new business */
-
-        group->last_poll = now;
-
-        PR_Unlock(group->ml);
-
-        count_ready = PR_Poll(group->polling_list, count, polling_interval);
-
-        PR_Lock(group->ml);
-
-        if (_prmw_running != group->state)
-        {
-            PR_SetError(PR_INVALID_STATE_ERROR, 0);
-            goto aborted;
-        }
-        if (-1 == count_ready)
-        {
-            goto failed_poll;  /* that's a shame */
-        }
-        else if (0 < count_ready)
-        {
-            for (poll_list = group->polling_list; count > 0;
-            poll_list++, count--)
-            {
-                PR_ASSERT(
-                    poll_list < group->polling_list + group->polling_count);
-                if (poll_list->out_flags != 0)
-                {
-                    waiter = _MW_LookupInternal(group, poll_list->fd);
-                    /*
-                    ** If 'waiter' is NULL, that means the wait receive
-                    ** descriptor has been canceled.
-                    */
-                    if (NULL != waiter)
-                        _MW_DoneInternal(group, waiter, PR_MW_SUCCESS);
-                }
-            }
-        }
-        /*
-        ** If there are no more threads waiting for completion,
-        ** we need to return.
-        ** This thread was "borrowed" to do the polling, but it really
-        ** belongs to the client.
-        */
-        if ((!PR_CLIST_IS_EMPTY(&group->io_ready))
-        && (1 == group->waiting_threads)) break;
-    }
-
-    rv = PR_SUCCESS;
-
-aborted:
-failed_poll:
-failed_alloc:
-    group->poller = NULL;  /* we were that, not we ain't */
-    if ((_prmw_running == group->state) && (group->waiting_threads > 1))
-    {
-        /* Wake up one thread to become the new poller. */
-        PR_NotifyCondVar(group->io_complete);
-    }
-    return rv;  /* we return with the lock held */
-}  /* _MW_PollInternal */
-#endif /* !WINNT */
-
-static PRMWGroupState MW_TestForShutdownInternal(PRWaitGroup *group)
-{
-    PRMWGroupState rv = group->state;
-    /*
-    ** Looking at the group's fields is safe because
-    ** once the group's state is no longer running, it
-    ** cannot revert and there is a safe check on entry
-    ** to make sure no more threads are made to wait.
-    */
-    if ((_prmw_stopping == rv)
-    && (0 == group->waiting_threads))
-    {
-        rv = group->state = _prmw_stopped;
-        PR_NotifyCondVar(group->mw_manage);
-    }
-    return rv;
-}  /* MW_TestForShutdownInternal */
-
-#ifndef WINNT
-static void _MW_InitialRecv(PRCList *io_ready)
-{
-    PRRecvWait *desc = (PRRecvWait*)io_ready;
-    if ((NULL == desc->buffer.start)
-    || (0 == desc->buffer.length))
-        desc->bytesRecv = 0;
-    else
-    {
-        desc->bytesRecv = (desc->fd->methods->recv)(
-            desc->fd, desc->buffer.start,
-            desc->buffer.length, 0, desc->timeout);
-        if (desc->bytesRecv < 0)  /* SetError should already be there */
-            desc->outcome = PR_MW_FAILURE;
-    }
-}  /* _MW_InitialRecv */
-#endif
-
-#ifdef WINNT
-static void NT_TimeProc(void *arg)
-{
-    _MDOverlapped *overlapped = (_MDOverlapped *)arg;
-    PRRecvWait *desc =  overlapped->data.mw.desc;
-    PRFileDesc *bottom;
-    
-    if (InterlockedCompareExchange((PVOID *)&desc->outcome,
-        (PVOID)PR_MW_TIMEOUT, (PVOID)PR_MW_PENDING) != (PVOID)PR_MW_PENDING)
-    {
-        /* This wait recv descriptor has already completed. */
-        return;
-    }
-
-    /* close the osfd to abort the outstanding async io request */
-    /* $$$$
-    ** Little late to be checking if NSPR's on the bottom of stack,
-    ** but if we don't check, we can't assert that the private data
-    ** is what we think it is.
-    ** $$$$
-    */
-    bottom = PR_GetIdentitiesLayer(desc->fd, PR_NSPR_IO_LAYER);
-    PR_ASSERT(NULL != bottom);
-    if (NULL != bottom)  /* now what!?!?! */
-    {
-        bottom->secret->state = _PR_FILEDESC_CLOSED;
-        if (closesocket(bottom->secret->md.osfd) == SOCKET_ERROR)
-        {
-            fprintf(stderr, "closesocket failed: %d\n", WSAGetLastError());
-            PR_ASSERT(!"What shall I do?");
-        }
-    }
-    return;
-}  /* NT_TimeProc */
-
-static PRStatus NT_HashRemove(PRWaitGroup *group, PRFileDesc *fd)
-{
-    PRRecvWait **waiter;
-
-    _PR_MD_LOCK(&group->mdlock);
-    waiter = _MW_LookupInternal(group, fd);
-    if (NULL != waiter)
-    {
-        group->waiter->count -= 1;
-        *waiter = NULL;
-    }
-    _PR_MD_UNLOCK(&group->mdlock);
-    return (NULL != waiter) ? PR_SUCCESS : PR_FAILURE;
-}
-
-PRStatus NT_HashRemoveInternal(PRWaitGroup *group, PRFileDesc *fd)
-{
-    PRRecvWait **waiter;
-
-    waiter = _MW_LookupInternal(group, fd);
-    if (NULL != waiter)
-    {
-        group->waiter->count -= 1;
-        *waiter = NULL;
-    }
-    return (NULL != waiter) ? PR_SUCCESS : PR_FAILURE;
-}
-#endif /* WINNT */
-
-/******************************************************************/
-/******************************************************************/
-/********************** The public API portion ********************/
-/******************************************************************/
-/******************************************************************/
-PR_IMPLEMENT(PRStatus) PR_AddWaitFileDesc(
-    PRWaitGroup *group, PRRecvWait *desc)
-{
-    _PR_HashStory hrv;
-    PRStatus rv = PR_FAILURE;
-#ifdef WINNT
-    _MDOverlapped *overlapped;
-    HANDLE hFile;
-    BOOL bResult;
-    DWORD dwError;
-    PRFileDesc *bottom;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    if ((NULL == group) && (NULL == (group = MW_Init2())))
-    {
-        return rv;
-    }
-
-    PR_ASSERT(NULL != desc->fd);
-
-    desc->outcome = PR_MW_PENDING;  /* nice, well known value */
-    desc->bytesRecv = 0;  /* likewise, though this value is ambiguious */
-
-    PR_Lock(group->ml);
-
-    if (_prmw_running != group->state)
-    {
-        /* Not allowed to add after cancelling the group */
-        desc->outcome = PR_MW_INTERRUPT;
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        PR_Unlock(group->ml);
-        return rv;
-    }
-
-#ifdef WINNT
-    _PR_MD_LOCK(&group->mdlock);
-#endif
-
-    /*
-    ** If the waiter count is zero at this point, there's no telling
-    ** how long we've been idle. Therefore, initialize the beginning
-    ** of the timing interval. As long as the list doesn't go empty,
-    ** it will maintain itself.
-    */
-    if (0 == group->waiter->count)
-        group->last_poll = PR_IntervalNow();
-
-    do
-    {
-        hrv = MW_AddHashInternal(desc, group->waiter);
-        if (_prmw_rehash != hrv) break;
-        hrv = MW_ExpandHashInternal(group);  /* gruesome */
-        if (_prmw_success != hrv) break;
-    } while (PR_TRUE);
-
-#ifdef WINNT
-    _PR_MD_UNLOCK(&group->mdlock);
-#endif
-
-    PR_NotifyCondVar(group->new_business);  /* tell the world */
-    rv = (_prmw_success == hrv) ? PR_SUCCESS : PR_FAILURE;
-    PR_Unlock(group->ml);
-
-#ifdef WINNT
-    overlapped = PR_NEWZAP(_MDOverlapped);
-    if (NULL == overlapped)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        NT_HashRemove(group, desc->fd);
-        return rv;
-    }
-    overlapped->ioModel = _MD_MultiWaitIO;
-    overlapped->data.mw.desc = desc;
-    overlapped->data.mw.group = group;
-    if (desc->timeout != PR_INTERVAL_NO_TIMEOUT)
-    {
-        overlapped->data.mw.timer = CreateTimer(
-            desc->timeout,
-            NT_TimeProc,
-            overlapped);
-        if (0 == overlapped->data.mw.timer)
-        {
-            NT_HashRemove(group, desc->fd);
-            PR_DELETE(overlapped);
-            /*
-             * XXX It appears that a maximum of 16 timer events can
-             * be outstanding. GetLastError() returns 0 when I try it.
-             */
-            PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, GetLastError());
-            return PR_FAILURE;
-        }
-    }
-
-    /* Reach to the bottom layer to get the OS fd */
-    bottom = PR_GetIdentitiesLayer(desc->fd, PR_NSPR_IO_LAYER);
-    PR_ASSERT(NULL != bottom);
-    if (NULL == bottom)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    hFile = (HANDLE)bottom->secret->md.osfd; 
-    if (!bottom->secret->md.io_model_committed)
-    {
-        PRInt32 st;
-        st = _md_Associate(hFile);
-        PR_ASSERT(0 != st);
-        bottom->secret->md.io_model_committed = PR_TRUE;
-    }
-    bResult = ReadFile(hFile,
-        desc->buffer.start,
-        (DWORD)desc->buffer.length,
-        NULL,
-        &overlapped->overlapped);
-    if (FALSE == bResult && (dwError = GetLastError()) != ERROR_IO_PENDING)
-    {
-        if (desc->timeout != PR_INTERVAL_NO_TIMEOUT)
-        {
-            if (InterlockedCompareExchange((PVOID *)&desc->outcome,
-                (PVOID)PR_MW_FAILURE, (PVOID)PR_MW_PENDING)
-                == (PVOID)PR_MW_PENDING)
-            {
-                CancelTimer(overlapped->data.mw.timer);
-            }
-            NT_HashRemove(group, desc->fd);
-            PR_DELETE(overlapped);
-        }
-        _PR_MD_MAP_READ_ERROR(dwError);
-        rv = PR_FAILURE;
-    }
-#endif
-
-    return rv;
-}  /* PR_AddWaitFileDesc */
-
-PR_IMPLEMENT(PRRecvWait*) PR_WaitRecvReady(PRWaitGroup *group)
-{
-    PRCList *io_ready = NULL;
-#ifdef WINNT
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    _MDOverlapped *overlapped;    
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    if ((NULL == group) && (NULL == (group = MW_Init2()))) goto failed_init;
-
-    PR_Lock(group->ml);
-
-    if (_prmw_running != group->state)
-    {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        goto invalid_state;
-    }
-
-    group->waiting_threads += 1;  /* the polling thread is counted */
-
-#ifdef WINNT
-    _PR_MD_LOCK(&group->mdlock);
-    while (PR_CLIST_IS_EMPTY(&group->io_ready))
-    {
-        _PR_THREAD_LOCK(me);
-        me->state = _PR_IO_WAIT;
-        PR_APPEND_LINK(&me->waitQLinks, &group->wait_list);
-        if (!_PR_IS_NATIVE_THREAD(me))
-        {
-            _PR_SLEEPQ_LOCK(me->cpu);
-            _PR_ADD_SLEEPQ(me, PR_INTERVAL_NO_TIMEOUT);
-            _PR_SLEEPQ_UNLOCK(me->cpu);
-        }
-        _PR_THREAD_UNLOCK(me);
-        _PR_MD_UNLOCK(&group->mdlock);
-        PR_Unlock(group->ml);
-        _PR_MD_WAIT(me, PR_INTERVAL_NO_TIMEOUT);
-        me->state = _PR_RUNNING;
-        PR_Lock(group->ml);
-        _PR_MD_LOCK(&group->mdlock);
-        if (_PR_PENDING_INTERRUPT(me)) {
-            PR_REMOVE_LINK(&me->waitQLinks);
-            _PR_MD_UNLOCK(&group->mdlock);
-            me->flags &= ~_PR_INTERRUPT;
-            me->io_suspended = PR_FALSE;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-            goto aborted;
-        }
-    }
-    io_ready = PR_LIST_HEAD(&group->io_ready);
-    PR_ASSERT(io_ready != NULL);
-    PR_REMOVE_LINK(io_ready);
-    _PR_MD_UNLOCK(&group->mdlock);
-    overlapped = (_MDOverlapped *)
-        ((char *)io_ready - offsetof(_MDOverlapped, data));
-    io_ready = &overlapped->data.mw.desc->internal;
-#else
-    do
-    {
-        /*
-        ** If the I/O ready list isn't empty, have this thread
-        ** return with the first receive wait object that's available.
-        */
-        if (PR_CLIST_IS_EMPTY(&group->io_ready))
-        {
-            /*
-            ** Is there a polling thread yet? If not, grab this thread
-            ** and use it.
-            */
-            if (NULL == group->poller)
-            {
-                /*
-                ** This thread will stay do polling until it becomes the only one
-                ** left to service a completion. Then it will return and there will
-                ** be none left to actually poll or to run completions.
-                **
-                ** The polling function should only return w/ failure or
-                ** with some I/O ready.
-                */
-                if (PR_FAILURE == _MW_PollInternal(group)) goto failed_poll;
-            }
-            else
-            {
-                /*
-                ** There are four reasons a thread can be awakened from
-                ** a wait on the io_complete condition variable.
-                ** 1. Some I/O has completed, i.e., the io_ready list
-                **    is nonempty.
-                ** 2. The wait group is canceled.
-                ** 3. The thread is interrupted.
-                ** 4. The current polling thread has to leave and needs
-                **    a replacement.
-                ** The logic to find a new polling thread is made more
-                ** complicated by all the other possible events.
-                ** I tried my best to write the logic clearly, but
-                ** it is still full of if's with continue and goto.
-                */
-                PRStatus st;
-                do 
-                {
-                    st = PR_WaitCondVar(group->io_complete, PR_INTERVAL_NO_TIMEOUT);
-                    if (_prmw_running != group->state)
-                    {
-                        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-                        goto aborted;
-                    }
-                    if (_MW_ABORTED(st) || (NULL == group->poller)) break;
-                } while (PR_CLIST_IS_EMPTY(&group->io_ready));
-
-                /*
-                ** The thread is interrupted and has to leave.  It might
-                ** have also been awakened to process ready i/o or be the
-                ** new poller.  To be safe, if either condition is true,
-                ** we awaken another thread to take its place.
-                */
-                if (_MW_ABORTED(st))
-                {
-                    if ((NULL == group->poller
-                    || !PR_CLIST_IS_EMPTY(&group->io_ready))
-                    && group->waiting_threads > 1)
-                        PR_NotifyCondVar(group->io_complete);
-                    goto aborted;
-                }
-
-                /*
-                ** A new poller is needed, but can I be the new poller?
-                ** If there is no i/o ready, sure.  But if there is any
-                ** i/o ready, it has a higher priority.  I want to
-                ** process the ready i/o first and wake up another
-                ** thread to be the new poller.
-                */ 
-                if (NULL == group->poller)
-                {
-                    if (PR_CLIST_IS_EMPTY(&group->io_ready))
-                        continue;
-                    if (group->waiting_threads > 1)
-                        PR_NotifyCondVar(group->io_complete);
-                }
-            }
-            PR_ASSERT(!PR_CLIST_IS_EMPTY(&group->io_ready));
-        }
-        io_ready = PR_LIST_HEAD(&group->io_ready);
-        PR_NotifyCondVar(group->io_taken);
-        PR_ASSERT(io_ready != NULL);
-        PR_REMOVE_LINK(io_ready);
-    } while (NULL == io_ready);
-
-failed_poll:
-
-#endif
-
-aborted:
-
-    group->waiting_threads -= 1;
-invalid_state:
-    (void)MW_TestForShutdownInternal(group);
-    PR_Unlock(group->ml);
-
-failed_init:
-    if (NULL != io_ready)
-    {
-        /* If the operation failed, record the reason why */
-        switch (((PRRecvWait*)io_ready)->outcome)
-        {
-            case PR_MW_PENDING:
-                PR_ASSERT(0);
-                break;
-            case PR_MW_SUCCESS:
-#ifndef WINNT
-                _MW_InitialRecv(io_ready);
-#endif
-                break;
-#ifdef WINNT
-            case PR_MW_FAILURE:
-                _PR_MD_MAP_READ_ERROR(overlapped->data.mw.error);
-                break;
-#endif
-            case PR_MW_TIMEOUT:
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                break;
-            case PR_MW_INTERRUPT:
-                PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                break;
-            default: break;
-        }
-#ifdef WINNT
-        if (NULL != overlapped->data.mw.timer)
-        {
-            PR_ASSERT(PR_INTERVAL_NO_TIMEOUT
-                != overlapped->data.mw.desc->timeout);
-            CancelTimer(overlapped->data.mw.timer);
-        }
-        else
-        {
-            PR_ASSERT(PR_INTERVAL_NO_TIMEOUT
-                == overlapped->data.mw.desc->timeout);
-        }
-        PR_DELETE(overlapped);
-#endif
-    }
-    return (PRRecvWait*)io_ready;
-}  /* PR_WaitRecvReady */
-
-PR_IMPLEMENT(PRStatus) PR_CancelWaitFileDesc(PRWaitGroup *group, PRRecvWait *desc)
-{
-#if !defined(WINNT)
-    PRRecvWait **recv_wait;
-#endif
-    PRStatus rv = PR_SUCCESS;
-    if (NULL == group) group = mw_state->group;
-    PR_ASSERT(NULL != group);
-    if (NULL == group)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    PR_Lock(group->ml);
-
-    if (_prmw_running != group->state)
-    {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        rv = PR_FAILURE;
-        goto unlock;
-    }
-
-#ifdef WINNT
-    if (InterlockedCompareExchange((PVOID *)&desc->outcome,
-        (PVOID)PR_MW_INTERRUPT, (PVOID)PR_MW_PENDING) == (PVOID)PR_MW_PENDING)
-    {
-        PRFileDesc *bottom = PR_GetIdentitiesLayer(desc->fd, PR_NSPR_IO_LAYER);
-        PR_ASSERT(NULL != bottom);
-        if (NULL == bottom)
-        {
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            goto unlock;
-        }
-        bottom->secret->state = _PR_FILEDESC_CLOSED;
-#if 0
-        fprintf(stderr, "cancel wait recv: closing socket\n");
-#endif
-        if (closesocket(bottom->secret->md.osfd) == SOCKET_ERROR)
-        {
-            fprintf(stderr, "closesocket failed: %d\n", WSAGetLastError());
-            exit(1);
-        }
-    }
-#else
-    if (NULL != (recv_wait = _MW_LookupInternal(group, desc->fd)))
-    {
-        /* it was in the wait table */
-        _MW_DoneInternal(group, recv_wait, PR_MW_INTERRUPT);
-        goto unlock;
-    }
-    if (!PR_CLIST_IS_EMPTY(&group->io_ready))
-    {
-        /* is it already complete? */
-        PRCList *head = PR_LIST_HEAD(&group->io_ready);
-        do
-        {
-            PRRecvWait *done = (PRRecvWait*)head;
-            if (done == desc) goto unlock;
-            head = PR_NEXT_LINK(head);
-        } while (head != &group->io_ready);
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    rv = PR_FAILURE;
-
-#endif
-unlock:
-    PR_Unlock(group->ml);
-    return rv;
-}  /* PR_CancelWaitFileDesc */
-
-PR_IMPLEMENT(PRRecvWait*) PR_CancelWaitGroup(PRWaitGroup *group)
-{
-    PRRecvWait **desc;
-    PRRecvWait *recv_wait = NULL;
-#ifdef WINNT
-    _MDOverlapped *overlapped;
-    PRRecvWait **end;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-#endif
-
-    if (NULL == group) group = mw_state->group;
-    PR_ASSERT(NULL != group);
-    if (NULL == group)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return NULL;
-    }
-
-    PR_Lock(group->ml);
-    if (_prmw_stopped != group->state)
-    {
-        if (_prmw_running == group->state)
-            group->state = _prmw_stopping;  /* so nothing new comes in */
-        if (0 == group->waiting_threads)  /* is there anybody else? */
-            group->state = _prmw_stopped;  /* we can stop right now */
-        else
-        {
-            PR_NotifyAllCondVar(group->new_business);
-            PR_NotifyAllCondVar(group->io_complete);
-        }
-        while (_prmw_stopped != group->state)
-            (void)PR_WaitCondVar(group->mw_manage, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-#ifdef WINNT
-    _PR_MD_LOCK(&group->mdlock);
-#endif
-    /* make all the existing descriptors look done/interrupted */
-#ifdef WINNT
-    end = &group->waiter->recv_wait + group->waiter->length;
-    for (desc = &group->waiter->recv_wait; desc < end; ++desc)
-    {
-        if (NULL != *desc)
-        {
-            if (InterlockedCompareExchange((PVOID *)&(*desc)->outcome,
-                (PVOID)PR_MW_INTERRUPT, (PVOID)PR_MW_PENDING)
-                == (PVOID)PR_MW_PENDING)
-            {
-                PRFileDesc *bottom = PR_GetIdentitiesLayer(
-                    (*desc)->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);
-                if (NULL == bottom)
-                {
-                    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-                    goto invalid_arg;
-                }
-                bottom->secret->state = _PR_FILEDESC_CLOSED;
-#if 0
-                fprintf(stderr, "cancel wait group: closing socket\n");
-#endif
-                if (closesocket(bottom->secret->md.osfd) == SOCKET_ERROR)
-                {
-                    fprintf(stderr, "closesocket failed: %d\n",
-                        WSAGetLastError());
-                    exit(1);
-                }
-            }
-        }
-    }
-    while (group->waiter->count > 0)
-    {
-        _PR_THREAD_LOCK(me);
-        me->state = _PR_IO_WAIT;
-        PR_APPEND_LINK(&me->waitQLinks, &group->wait_list);
-        if (!_PR_IS_NATIVE_THREAD(me))
-        {
-            _PR_SLEEPQ_LOCK(me->cpu);
-            _PR_ADD_SLEEPQ(me, PR_INTERVAL_NO_TIMEOUT);
-            _PR_SLEEPQ_UNLOCK(me->cpu);
-        }
-        _PR_THREAD_UNLOCK(me);
-        _PR_MD_UNLOCK(&group->mdlock);
-        PR_Unlock(group->ml);
-        _PR_MD_WAIT(me, PR_INTERVAL_NO_TIMEOUT);
-        me->state = _PR_RUNNING;
-        PR_Lock(group->ml);
-        _PR_MD_LOCK(&group->mdlock);
-    }
-#else
-    for (desc = &group->waiter->recv_wait; group->waiter->count > 0; ++desc)
-    {
-        PR_ASSERT(desc < &group->waiter->recv_wait + group->waiter->length);
-        if (NULL != *desc)
-            _MW_DoneInternal(group, desc, PR_MW_INTERRUPT);
-    }
-#endif
-
-    /* take first element of finished list and return it or NULL */
-    if (PR_CLIST_IS_EMPTY(&group->io_ready))
-        PR_SetError(PR_GROUP_EMPTY_ERROR, 0);
-    else
-    {
-        PRCList *head = PR_LIST_HEAD(&group->io_ready);
-        PR_REMOVE_AND_INIT_LINK(head);
-#ifdef WINNT
-        overlapped = (_MDOverlapped *)
-            ((char *)head - offsetof(_MDOverlapped, data));
-        head = &overlapped->data.mw.desc->internal;
-        if (NULL != overlapped->data.mw.timer)
-        {
-            PR_ASSERT(PR_INTERVAL_NO_TIMEOUT
-                != overlapped->data.mw.desc->timeout);
-            CancelTimer(overlapped->data.mw.timer);
-        }
-        else
-        {
-            PR_ASSERT(PR_INTERVAL_NO_TIMEOUT
-                == overlapped->data.mw.desc->timeout);
-        }
-        PR_DELETE(overlapped);
-#endif
-        recv_wait = (PRRecvWait*)head;
-    }
-#ifdef WINNT
-invalid_arg:
-    _PR_MD_UNLOCK(&group->mdlock);
-#endif
-    PR_Unlock(group->ml);
-
-    return recv_wait;
-}  /* PR_CancelWaitGroup */
-
-PR_IMPLEMENT(PRWaitGroup*) PR_CreateWaitGroup(PRInt32 size /* ignored */)
-{
-#ifdef XP_MAC
-#pragma unused (size)
-#endif
-    PRWaitGroup *wg;
-
-    if (NULL == (wg = PR_NEWZAP(PRWaitGroup)))
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto failed;
-    }
-    /* the wait group itself */
-    wg->ml = PR_NewLock();
-    if (NULL == wg->ml) goto failed_lock;
-    wg->io_taken = PR_NewCondVar(wg->ml);
-    if (NULL == wg->io_taken) goto failed_cvar0;
-    wg->io_complete = PR_NewCondVar(wg->ml);
-    if (NULL == wg->io_complete) goto failed_cvar1;
-    wg->new_business = PR_NewCondVar(wg->ml);
-    if (NULL == wg->new_business) goto failed_cvar2;
-    wg->mw_manage = PR_NewCondVar(wg->ml);
-    if (NULL == wg->mw_manage) goto failed_cvar3;
-
-    PR_INIT_CLIST(&wg->group_link);
-    PR_INIT_CLIST(&wg->io_ready);
-
-    /* the waiters sequence */
-    wg->waiter = (_PRWaiterHash*)PR_CALLOC(
-        sizeof(_PRWaiterHash) +
-        (_PR_DEFAULT_HASH_LENGTH * sizeof(PRRecvWait*)));
-    if (NULL == wg->waiter)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto failed_waiter;
-    }
-    wg->waiter->count = 0;
-    wg->waiter->length = _PR_DEFAULT_HASH_LENGTH;
-
-#ifdef WINNT
-    _PR_MD_NEW_LOCK(&wg->mdlock);
-    PR_INIT_CLIST(&wg->wait_list);
-#endif /* WINNT */
-
-    PR_Lock(mw_lock);
-    PR_APPEND_LINK(&wg->group_link, &mw_state->group_list);
-    PR_Unlock(mw_lock);
-    return wg;
-
-failed_waiter:
-    PR_DestroyCondVar(wg->mw_manage);
-failed_cvar3:
-    PR_DestroyCondVar(wg->new_business);
-failed_cvar2:
-    PR_DestroyCondVar(wg->io_complete);
-failed_cvar1:
-    PR_DestroyCondVar(wg->io_taken);
-failed_cvar0:
-    PR_DestroyLock(wg->ml);
-failed_lock:
-    PR_DELETE(wg);
-    wg = NULL;
-
-failed:
-    return wg;
-}  /* MW_CreateWaitGroup */
-
-PR_IMPLEMENT(PRStatus) PR_DestroyWaitGroup(PRWaitGroup *group)
-{
-    PRStatus rv = PR_SUCCESS;
-    if (NULL == group) group = mw_state->group;
-    PR_ASSERT(NULL != group);
-    if (NULL != group)
-    {
-        PR_Lock(group->ml);
-        if ((group->waiting_threads == 0)
-        && (group->waiter->count == 0)
-        && PR_CLIST_IS_EMPTY(&group->io_ready))
-        {
-            group->state = _prmw_stopped;
-        }
-        else
-        {
-            PR_SetError(PR_INVALID_STATE_ERROR, 0);
-            rv = PR_FAILURE;
-        }
-        PR_Unlock(group->ml);
-        if (PR_FAILURE == rv) return rv;
-
-        PR_Lock(mw_lock);
-        PR_REMOVE_LINK(&group->group_link);
-        PR_Unlock(mw_lock);
-
-#ifdef WINNT
-        /*
-         * XXX make sure wait_list is empty and waiter is empty.
-         * These must be checked while holding mdlock.
-         */
-        _PR_MD_FREE_LOCK(&group->mdlock);
-#endif
-
-        PR_DELETE(group->waiter);
-        PR_DELETE(group->polling_list);
-        PR_DestroyCondVar(group->mw_manage);
-        PR_DestroyCondVar(group->new_business);
-        PR_DestroyCondVar(group->io_complete);
-        PR_DestroyCondVar(group->io_taken);
-        PR_DestroyLock(group->ml);
-        if (group == mw_state->group) mw_state->group = NULL;
-        PR_DELETE(group);
-    }
-    else
-    {
-        /* The default wait group is not created yet. */
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        rv = PR_FAILURE;
-    }
-    return rv;
-}  /* PR_DestroyWaitGroup */
-
-/**********************************************************************
-***********************************************************************
-******************** Wait group enumerations **************************
-***********************************************************************
-**********************************************************************/
-
-PR_IMPLEMENT(PRMWaitEnumerator*) PR_CreateMWaitEnumerator(PRWaitGroup *group)
-{
-    PRMWaitEnumerator *enumerator = PR_NEWZAP(PRMWaitEnumerator);
-    if (NULL == enumerator) PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    else
-    {
-        enumerator->group = group;
-        enumerator->seal = _PR_ENUM_SEALED;
-    }
-    return enumerator;
-}  /* PR_CreateMWaitEnumerator */
-
-PR_IMPLEMENT(PRStatus) PR_DestroyMWaitEnumerator(PRMWaitEnumerator* enumerator)
-{
-    PR_ASSERT(NULL != enumerator);
-    PR_ASSERT(_PR_ENUM_SEALED == enumerator->seal);
-    if ((NULL == enumerator) || (_PR_ENUM_SEALED != enumerator->seal))
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    enumerator->seal = _PR_ENUM_UNSEALED;
-    PR_Free(enumerator);
-    return PR_SUCCESS;
-}  /* PR_DestroyMWaitEnumerator */
-
-PR_IMPLEMENT(PRRecvWait*) PR_EnumerateWaitGroup(
-    PRMWaitEnumerator *enumerator, const PRRecvWait *previous)
-{
-    PRRecvWait *result = NULL;
-    
-    /* entry point sanity checking */
-    PR_ASSERT(NULL != enumerator);
-    PR_ASSERT(_PR_ENUM_SEALED == enumerator->seal);
-    if ((NULL == enumerator)
-    || (_PR_ENUM_SEALED != enumerator->seal)) goto bad_argument;
-
-    /* beginning of enumeration */
-    if (NULL == previous)
-    {
-        if (NULL == enumerator->group)
-        {
-            enumerator->group = mw_state->group;
-            if (NULL == enumerator->group)
-            {
-                PR_SetError(PR_GROUP_EMPTY_ERROR, 0);
-                return NULL;
-            }
-        }
-        enumerator->waiter = &enumerator->group->waiter->recv_wait;
-        enumerator->p_timestamp = enumerator->group->p_timestamp;
-        enumerator->thread = PR_GetCurrentThread();
-        enumerator->index = 0;
-    }
-    /* continuing an enumeration */
-    else
-    {
-        PRThread *me = PR_GetCurrentThread();
-        PR_ASSERT(me == enumerator->thread);
-        if (me != enumerator->thread) goto bad_argument;
-
-        /* need to restart the enumeration */
-        if (enumerator->p_timestamp != enumerator->group->p_timestamp)
-            return PR_EnumerateWaitGroup(enumerator, NULL);
-    }
-
-    /* actually progress the enumeration */
-#if defined(WINNT)
-    _PR_MD_LOCK(&enumerator->group->mdlock);
-#else
-    PR_Lock(enumerator->group->ml);
-#endif
-    while (enumerator->index++ < enumerator->group->waiter->length)
-    {
-        if (NULL != (result = *(enumerator->waiter)++)) break;
-    }
-#if defined(WINNT)
-    _PR_MD_UNLOCK(&enumerator->group->mdlock);
-#else
-    PR_Unlock(enumerator->group->ml);
-#endif
-
-    return result;  /* what we live for */
-
-bad_argument:
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return NULL;  /* probably ambiguous */
-}  /* PR_EnumerateWaitGroup */
-
-/* prmwait.c */
diff --git a/libs/js/nsprpub/pr/src/io/prpolevt.c b/libs/js/nsprpub/pr/src/io/prpolevt.c
deleted file mode 100644
index de5f991c56..0000000000
--- a/libs/js/nsprpub/pr/src/io/prpolevt.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *********************************************************************
- *
- * Pollable events
- *
- * Pollable events are implemented using layered I/O.  The only
- * I/O methods that are implemented for pollable events are poll
- * and close.  No other methods can be invoked on a pollable
- * event.
- *
- * A pipe or socket pair is created and the pollable event layer
- * is pushed onto the read end.  A pointer to the write end is
- * saved in the PRFilePrivate structure of the pollable event.
- *
- *********************************************************************
- */
-
-#include "prinit.h"
-#include "prio.h"
-#include "prmem.h"
-#include "prerror.h"
-#include "prlog.h"
-
-#ifdef VMS
-
-/*
- * On OpenVMS we use an event flag instead of a pipe or a socket since
- * event flags are much more efficient on OpenVMS.
- */
-#include "pprio.h"
-#include <lib$routines.h>
-#include <starlet.h>
-#include <stsdef.h>
-
-PR_IMPLEMENT(PRFileDesc *) PR_NewPollableEvent(void)
-{
-    unsigned int status;
-    int flag = -1;
-    PRFileDesc *event;
-
-    /*
-    ** Allocate an event flag and clear it.
-    */
-    status = lib$get_ef(&flag);
-    if ((!$VMS_STATUS_SUCCESS(status)) || (flag == -1)) {
-        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, status);
-        return NULL;
-    }
-    sys$clref(flag);
-
-    /*
-    ** Give NSPR the event flag's negative value. We do this because our
-    ** select interprets a negative fd as an event flag rather than a
-    ** regular file fd.
-    */
-    event = PR_CreateSocketPollFd(-flag);
-    if (NULL == event) {
-        lib$free_ef(&flag);
-        return NULL;
-    }
-
-    return event;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event)
-{
-    int flag = -PR_FileDesc2NativeHandle(event);
-    PR_DestroySocketPollFd(event);
-    lib$free_ef(&flag);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_SetPollableEvent(PRFileDesc *event)
-{
-    /*
-    ** Just set the event flag.
-    */
-    unsigned int status;
-    status = sys$setef(-PR_FileDesc2NativeHandle(event));
-    if (!$VMS_STATUS_SUCCESS(status)) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, status);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event)
-{
-    /*
-    ** Just clear the event flag.
-    */
-    unsigned int status;
-    status = sys$clref(-PR_FileDesc2NativeHandle(event));
-    if (!$VMS_STATUS_SUCCESS(status)) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, status);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-#elif defined (XP_MAC)
-
-#include "primpl.h"
-
-/*
- * On Mac, local sockets cannot be used, because the networking stack
- * closes them when the machine goes to sleep. Instead, we'll use a simple
- * flag.
- */
-
-
-/*
- * PRFilePrivate structure for the NSPR pollable events layer
- */
-typedef struct PRPollableDesc {
-    PRBool      gotEvent;
-    PRThread    *pollingThread;
-} PRPollableDesc;
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtClose(PRFileDesc *fd);
-
-static PRInt16 PR_CALLBACK _pr_MacPolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags);
-
-static PRIOMethods _pr_mac_polevt_methods = {
-    PR_DESC_LAYERED,
-    _pr_MacPolEvtClose,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    _pr_MacPolEvtPoll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRDescIdentity _pr_mac_polevt_id;
-static PRCallOnceType _pr_mac_polevt_once_control;
-static PRStatus PR_CALLBACK _pr_MacPolEvtInit(void);
-
-static PRInt16 PR_CALLBACK _pr_MacPolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)fd->secret;
-    PR_ASSERT(pollDesc);
-
-    // set the current thread so that we can wake up the poll thread
-    pollDesc->pollingThread = PR_GetCurrentThread();
-
-    if ((in_flags & PR_POLL_READ) && pollDesc->gotEvent)
-        *out_flags = PR_POLL_READ;
-    else
-        *out_flags = 0;
-    return pollDesc->gotEvent ? 1 : 0;
-}
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtInit(void)
-{
-    _pr_mac_polevt_id = PR_GetUniqueIdentity("NSPR pollable events");
-    if (PR_INVALID_IO_LAYER == _pr_mac_polevt_id) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtClose(PRFileDesc *fd)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)fd->secret;
-    PR_ASSERT(NULL == fd->higher && NULL == fd->lower);
-    PR_ASSERT(pollDesc);
-    PR_DELETE(pollDesc);
-    fd->dtor(fd);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRFileDesc *) PR_NewPollableEvent(void)
-{
-    PRFileDesc      *event;
-    PRPollableDesc   *pollDesc;
-    
-    if (PR_CallOnce(&_pr_mac_polevt_once_control, _pr_MacPolEvtInit) == PR_FAILURE) {
-        return NULL;
-    }
-
-    event = PR_CreateIOLayerStub(_pr_mac_polevt_id, &_pr_mac_polevt_methods);
-    if (NULL == event) {
-        return NULL;
-    } 
-
-    /*
-    ** Allocate an event flag and clear it.
-    */
-    pollDesc = PR_NEW(PRPollableDesc);
-    if (!pollDesc) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-    pollDesc->gotEvent = PR_FALSE;
-    pollDesc->pollingThread = NULL;
-    
-    event->secret = (PRFilePrivate*)pollDesc;
-    return event;
-
-errorExit:
-
-    if (event) {
-        PR_DELETE(event->secret);
-        event->dtor(event);
-    }
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event)
-{
-    return PR_Close(event);
-}
-
-/* from macsockotpt.c. I wish there was a cleaner way */
-extern void WakeUpNotifiedThread(PRThread *thread, OTResult result);
-
-PR_IMPLEMENT(PRStatus) PR_SetPollableEvent(PRFileDesc *event)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)event->secret;
-    PR_ASSERT(pollDesc);
-    PR_ASSERT(pollDesc->pollingThread->state != _PR_DEAD_STATE);
-    
-    if (pollDesc->pollingThread->state == _PR_DEAD_STATE)
-      return PR_FAILURE;
-
-    pollDesc->gotEvent = PR_TRUE;
-    
-    if (pollDesc->pollingThread)
-        WakeUpNotifiedThread(pollDesc->pollingThread, noErr);
-        
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)event->secret;
-    PRStatus status;    
-    PR_ASSERT(pollDesc);
-    
-    /*
-      FIXME: Danger Will Robinson!
-      
-      The current implementation of PR_WaitForPollableEvent is somewhat
-      bogus; it makes the assumption that, in Mozilla, this will only
-      ever be called when PR_Poll has returned, telling us that an
-      event has been set.
-    */
-    
-    PR_ASSERT(pollDesc->gotEvent);
-    
-    status = (pollDesc->gotEvent) ? PR_SUCCESS : PR_FAILURE;
-    pollDesc->gotEvent = PR_FALSE;
-    return status;    
-}
-
-#else /* VMS */
-
-/*
- * These internal functions are declared in primpl.h,
- * but we can't include primpl.h because the definition
- * of struct PRFilePrivate in this file (for the pollable
- * event layer) will conflict with the definition of
- * struct PRFilePrivate in primpl.h (for the NSPR layer).
- */
-extern PRIntn _PR_InvalidInt(void);
-extern PRInt64 _PR_InvalidInt64(void);
-extern PRStatus _PR_InvalidStatus(void);
-extern PRFileDesc *_PR_InvalidDesc(void);
-
-/*
- * PRFilePrivate structure for the NSPR pollable events layer
- */
-struct PRFilePrivate {
-    PRFileDesc *writeEnd;  /* the write end of the pipe/socketpair */
-};
-
-static PRStatus PR_CALLBACK _pr_PolEvtClose(PRFileDesc *fd);
-
-static PRInt16 PR_CALLBACK _pr_PolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags);
-
-static PRIOMethods _pr_polevt_methods = {
-    PR_DESC_LAYERED,
-    _pr_PolEvtClose,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    _pr_PolEvtPoll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRDescIdentity _pr_polevt_id;
-static PRCallOnceType _pr_polevt_once_control;
-static PRStatus PR_CALLBACK _pr_PolEvtInit(void);
-
-static PRInt16 PR_CALLBACK _pr_PolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    return (fd->lower->methods->poll)(fd->lower, in_flags, out_flags);
-}
-
-static PRStatus PR_CALLBACK _pr_PolEvtInit(void)
-{
-    _pr_polevt_id = PR_GetUniqueIdentity("NSPR pollable events");
-    if (PR_INVALID_IO_LAYER == _pr_polevt_id) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-#if !defined(XP_UNIX)
-#define USE_TCP_SOCKETPAIR
-#endif
-
-PR_IMPLEMENT(PRFileDesc *) PR_NewPollableEvent(void)
-{
-    PRFileDesc *event;
-    PRFileDesc *fd[2]; /* fd[0] is the read end; fd[1] is the write end */
-#ifdef USE_TCP_SOCKETPAIR
-    PRSocketOptionData socket_opt;
-    PRStatus rv;
-#endif
-
-    fd[0] = fd[1] = NULL;
-
-    if (PR_CallOnce(&_pr_polevt_once_control, _pr_PolEvtInit) == PR_FAILURE) {
-        return NULL;
-    }
-
-    event = PR_CreateIOLayerStub(_pr_polevt_id, &_pr_polevt_methods);
-    if (NULL == event) {
-        goto errorExit;
-    } 
-    event->secret = PR_NEW(PRFilePrivate);
-    if (event->secret == NULL) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-#ifndef USE_TCP_SOCKETPAIR
-    if (PR_CreatePipe(&fd[0], &fd[1]) == PR_FAILURE) {
-        fd[0] = fd[1] = NULL;
-        goto errorExit;
-    }
-#else
-    if (PR_NewTCPSocketPair(fd) == PR_FAILURE) {
-        fd[0] = fd[1] = NULL;
-        goto errorExit;
-    }
-	/*
-	 * set the TCP_NODELAY option to reduce notification latency
-	 */
-    socket_opt.option = PR_SockOpt_NoDelay;
-    socket_opt.value.no_delay = PR_TRUE;
-    rv = PR_SetSocketOption(fd[1], &socket_opt);
-    PR_ASSERT(PR_SUCCESS == rv);
-#endif
-
-    event->secret->writeEnd = fd[1];
-    if (PR_PushIOLayer(fd[0], PR_TOP_IO_LAYER, event) == PR_FAILURE) {
-        goto errorExit;
-    }
-
-    return fd[0];
-
-errorExit:
-    if (fd[0]) {
-        PR_Close(fd[0]);
-        PR_Close(fd[1]);
-    }
-    if (event) {
-        PR_DELETE(event->secret);
-        event->dtor(event);
-    }
-    return NULL;
-}
-
-static PRStatus PR_CALLBACK _pr_PolEvtClose(PRFileDesc *fd)
-{
-    PRFileDesc *event;
-
-    event = PR_PopIOLayer(fd, PR_TOP_IO_LAYER);
-    PR_ASSERT(NULL == event->higher && NULL == event->lower);
-    PR_Close(fd);
-    PR_Close(event->secret->writeEnd);
-    PR_DELETE(event->secret);
-    event->dtor(event);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event)
-{
-    return PR_Close(event);
-}
-
-static const char magicChar = '\x38';
-
-PR_IMPLEMENT(PRStatus) PR_SetPollableEvent(PRFileDesc *event)
-{
-    if (PR_Write(event->secret->writeEnd, &magicChar, 1) != 1) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event)
-{
-    char buf[1024];
-    PRInt32 nBytes;
-#ifdef DEBUG
-    PRIntn i;
-#endif
-
-    nBytes = PR_Read(event->lower, buf, sizeof(buf));
-    if (nBytes == -1) {
-        return PR_FAILURE;
-    }
-
-#ifdef DEBUG
-    /*
-     * Make sure people do not write to the pollable event fd
-     * directly.
-     */
-    for (i = 0; i < nBytes; i++) {
-        PR_ASSERT(buf[i] == magicChar);
-    }
-#endif
-
-    return PR_SUCCESS;
-}
-
-#endif /* VMS */
diff --git a/libs/js/nsprpub/pr/src/io/prprf.c b/libs/js/nsprpub/pr/src/io/prprf.c
deleted file mode 100644
index cd5760a922..0000000000
--- a/libs/js/nsprpub/pr/src/io/prprf.c
+++ /dev/null
@@ -1,1228 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Portable safe sprintf code.
-**
-** Author: Kipp E.B. Hickman
-*/
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include "primpl.h"
-#include "prprf.h"
-#include "prlong.h"
-#include "prlog.h"
-#include "prmem.h"
-
-/*
-** WARNING: This code may *NOT* call PR_LOG (because PR_LOG calls it)
-*/
-
-/*
-** XXX This needs to be internationalized!
-*/
-
-typedef struct SprintfStateStr SprintfState;
-
-struct SprintfStateStr {
-    int (*stuff)(SprintfState *ss, const char *sp, PRUint32 len);
-
-    char *base;
-    char *cur;
-    PRUint32 maxlen;
-
-    int (*func)(void *arg, const char *sp, PRUint32 len);
-    void *arg;
-};
-
-/*
-** Numbered Argument
-*/
-struct NumArg {
-    int type;           /* type of the numbered argument    */
-    union {             /* the numbered argument            */
-	int i;
-	unsigned int ui;
-	PRInt32 i32;
-	PRUint32 ui32;
-	PRInt64 ll;
-	PRUint64 ull;
-	double d;
-	const char *s;
-	int *ip;
-    } u;
-};
-
-#define NAS_DEFAULT_NUM 20  /* default number of NumberedArgument array */
-
-
-#define TYPE_INT16	0
-#define TYPE_UINT16	1
-#define TYPE_INTN	2
-#define TYPE_UINTN	3
-#define TYPE_INT32	4
-#define TYPE_UINT32	5
-#define TYPE_INT64	6
-#define TYPE_UINT64	7
-#define TYPE_STRING	8
-#define TYPE_DOUBLE	9
-#define TYPE_INTSTR	10
-#define TYPE_UNKNOWN	20
-
-#define FLAG_LEFT	0x1
-#define FLAG_SIGNED	0x2
-#define FLAG_SPACED	0x4
-#define FLAG_ZEROS	0x8
-#define FLAG_NEG	0x10
-
-/*
-** Fill into the buffer using the data in src
-*/
-static int fill2(SprintfState *ss, const char *src, int srclen, int width,
-		int flags)
-{
-    char space = ' ';
-    int rv;
-
-    width -= srclen;
-    if ((width > 0) && ((flags & FLAG_LEFT) == 0)) {	/* Right adjusting */
-	if (flags & FLAG_ZEROS) {
-	    space = '0';
-	}
-	while (--width >= 0) {
-	    rv = (*ss->stuff)(ss, &space, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	}
-    }
-
-    /* Copy out the source data */
-    rv = (*ss->stuff)(ss, src, srclen);
-    if (rv < 0) {
-	return rv;
-    }
-
-    if ((width > 0) && ((flags & FLAG_LEFT) != 0)) {	/* Left adjusting */
-	while (--width >= 0) {
-	    rv = (*ss->stuff)(ss, &space, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	}
-    }
-    return 0;
-}
-
-/*
-** Fill a number. The order is: optional-sign zero-filling conversion-digits
-*/
-static int fill_n(SprintfState *ss, const char *src, int srclen, int width,
-		  int prec, int type, int flags)
-{
-    int zerowidth = 0;
-    int precwidth = 0;
-    int signwidth = 0;
-    int leftspaces = 0;
-    int rightspaces = 0;
-    int cvtwidth;
-    int rv;
-    char sign;
-
-    if ((type & 1) == 0) {
-	if (flags & FLAG_NEG) {
-	    sign = '-';
-	    signwidth = 1;
-	} else if (flags & FLAG_SIGNED) {
-	    sign = '+';
-	    signwidth = 1;
-	} else if (flags & FLAG_SPACED) {
-	    sign = ' ';
-	    signwidth = 1;
-	}
-    }
-    cvtwidth = signwidth + srclen;
-
-    if (prec > 0) {
-	if (prec > srclen) {
-	    precwidth = prec - srclen;		/* Need zero filling */
-	    cvtwidth += precwidth;
-	}
-    }
-
-    if ((flags & FLAG_ZEROS) && (prec < 0)) {
-	if (width > cvtwidth) {
-	    zerowidth = width - cvtwidth;	/* Zero filling */
-	    cvtwidth += zerowidth;
-	}
-    }
-
-    if (flags & FLAG_LEFT) {
-	if (width > cvtwidth) {
-	    /* Space filling on the right (i.e. left adjusting) */
-	    rightspaces = width - cvtwidth;
-	}
-    } else {
-	if (width > cvtwidth) {
-	    /* Space filling on the left (i.e. right adjusting) */
-	    leftspaces = width - cvtwidth;
-	}
-    }
-    while (--leftspaces >= 0) {
-	rv = (*ss->stuff)(ss, " ", 1);
-	if (rv < 0) {
-	    return rv;
-	}
-    }
-    if (signwidth) {
-	rv = (*ss->stuff)(ss, &sign, 1);
-	if (rv < 0) {
-	    return rv;
-	}
-    }
-    while (--precwidth >= 0) {
-	rv = (*ss->stuff)(ss, "0", 1);
-	if (rv < 0) {
-	    return rv;
-	}
-    }
-    while (--zerowidth >= 0) {
-	rv = (*ss->stuff)(ss, "0", 1);
-	if (rv < 0) {
-	    return rv;
-	}
-    }
-    rv = (*ss->stuff)(ss, src, srclen);
-    if (rv < 0) {
-	return rv;
-    }
-    while (--rightspaces >= 0) {
-	rv = (*ss->stuff)(ss, " ", 1);
-	if (rv < 0) {
-	    return rv;
-	}
-    }
-    return 0;
-}
-
-/*
-** Convert a long into its printable form
-*/
-static int cvt_l(SprintfState *ss, long num, int width, int prec, int radix,
-		 int type, int flags, const char *hexp)
-{
-    char cvtbuf[100];
-    char *cvt;
-    int digits;
-
-    /* according to the man page this needs to happen */
-    if ((prec == 0) && (num == 0)) {
-	return 0;
-    }
-
-    /*
-    ** Converting decimal is a little tricky. In the unsigned case we
-    ** need to stop when we hit 10 digits. In the signed case, we can
-    ** stop when the number is zero.
-    */
-    cvt = cvtbuf + sizeof(cvtbuf);
-    digits = 0;
-    while (num) {
-	int digit = (((unsigned long)num) % radix) & 0xF;
-	*--cvt = hexp[digit];
-	digits++;
-	num = (long)(((unsigned long)num) / radix);
-    }
-    if (digits == 0) {
-	*--cvt = '0';
-	digits++;
-    }
-
-    /*
-    ** Now that we have the number converted without its sign, deal with
-    ** the sign and zero padding.
-    */
-    return fill_n(ss, cvt, digits, width, prec, type, flags);
-}
-
-/*
-** Convert a 64-bit integer into its printable form
-*/
-static int cvt_ll(SprintfState *ss, PRInt64 num, int width, int prec, int radix,
-		  int type, int flags, const char *hexp)
-{
-    char cvtbuf[100];
-    char *cvt;
-    int digits;
-    PRInt64 rad;
-
-    /* according to the man page this needs to happen */
-    if ((prec == 0) && (LL_IS_ZERO(num))) {
-	return 0;
-    }
-
-    /*
-    ** Converting decimal is a little tricky. In the unsigned case we
-    ** need to stop when we hit 10 digits. In the signed case, we can
-    ** stop when the number is zero.
-    */
-    LL_I2L(rad, radix);
-    cvt = cvtbuf + sizeof(cvtbuf);
-    digits = 0;
-    while (!LL_IS_ZERO(num)) {
-	PRInt32 digit;
-	PRInt64 quot, rem;
-	LL_UDIVMOD(&quot, &rem, num, rad);
-	LL_L2I(digit, rem);
-	*--cvt = hexp[digit & 0xf];
-	digits++;
-	num = quot;
-    }
-    if (digits == 0) {
-	*--cvt = '0';
-	digits++;
-    }
-
-    /*
-    ** Now that we have the number converted without its sign, deal with
-    ** the sign and zero padding.
-    */
-    return fill_n(ss, cvt, digits, width, prec, type, flags);
-}
-
-/*
-** Convert a double precision floating point number into its printable
-** form.
-**
-** XXX stop using sprintf to convert floating point
-*/
-static int cvt_f(SprintfState *ss, double d, const char *fmt0, const char *fmt1)
-{
-    char fin[20];
-    char fout[300];
-    int amount = fmt1 - fmt0;
-
-    PR_ASSERT((amount > 0) && (amount < sizeof(fin)));
-    if (amount >= sizeof(fin)) {
-	/* Totally bogus % command to sprintf. Just ignore it */
-	return 0;
-    }
-    memcpy(fin, fmt0, amount);
-    fin[amount] = 0;
-
-    /* Convert floating point using the native sprintf code */
-#ifdef DEBUG
-    {
-        const char *p = fin;
-        while (*p) {
-            PR_ASSERT(*p != 'L');
-            p++;
-        }
-    }
-#endif
-    sprintf(fout, fin, d);
-
-    /*
-    ** This assert will catch overflow's of fout, when building with
-    ** debugging on. At least this way we can track down the evil piece
-    ** of calling code and fix it!
-    */
-    PR_ASSERT(strlen(fout) < sizeof(fout));
-
-    return (*ss->stuff)(ss, fout, strlen(fout));
-}
-
-/*
-** Convert a string into its printable form.  "width" is the output
-** width. "prec" is the maximum number of characters of "s" to output,
-** where -1 means until NUL.
-*/
-static int cvt_s(SprintfState *ss, const char *s, int width, int prec,
-		 int flags)
-{
-    int slen;
-
-    if (prec == 0)
-	return 0;
-
-    /* Limit string length by precision value */
-    slen = s ? strlen(s) : 6;
-    if (prec > 0) {
-	if (prec < slen) {
-	    slen = prec;
-	}
-    }
-
-    /* and away we go */
-    return fill2(ss, s ? s : "(null)", slen, width, flags);
-}
-
-/*
-** BuildArgArray stands for Numbered Argument list Sprintf
-** for example,  
-**	fmp = "%4$i, %2$d, %3s, %1d";
-** the number must start from 1, and no gap among them
-*/
-
-static struct NumArg* BuildArgArray( const char *fmt, va_list ap, int* rv, struct NumArg* nasArray )
-{
-    int number = 0, cn = 0, i;
-    const char* p;
-    char  c;
-    struct NumArg* nas;
-    
-
-    /*
-    **	first pass:
-    **	determine how many legal % I have got, then allocate space
-    */
-
-    p = fmt;
-    *rv = 0;
-    i = 0;
-    while( ( c = *p++ ) != 0 ){
-	if( c != '%' )
-	    continue;
-	if( ( c = *p++ ) == '%' )	/* skip %% case */
-	    continue;
-
-	while( c != 0 ){
-	    if( c > '9' || c < '0' ){
-		if( c == '$' ){		/* numbered argument case */
-		    if( i > 0 ){
-			*rv = -1;
-			return NULL;
-		    }
-		    number++;
-		} else{			/* non-numbered argument case */
-		    if( number > 0 ){
-			*rv = -1;
-			return NULL;
-		    }
-		    i = 1;
-		}
-		break;
-	    }
-
-	    c = *p++;
-	}
-    }
-
-    if( number == 0 ){
-	return NULL;
-    }
-
-    
-    if( number > NAS_DEFAULT_NUM ){
-	nas = (struct NumArg*)PR_MALLOC( number * sizeof( struct NumArg ) );
-	if( !nas ){
-	    *rv = -1;
-	    return NULL;
-	}
-    } else {
-	nas = nasArray;
-    }
-
-    for( i = 0; i < number; i++ ){
-	nas[i].type = TYPE_UNKNOWN;
-    }
-
-
-    /*
-    ** second pass:
-    ** set nas[].type
-    */
-
-    p = fmt;
-    while( ( c = *p++ ) != 0 ){
-    	if( c != '%' )	continue;
-	    c = *p++;
-	if( c == '%' )	continue;
-
-	cn = 0;
-	while( c && c != '$' ){	    /* should imporve error check later */
-	    cn = cn*10 + c - '0';
-	    c = *p++;
-	}
-
-	if( !c || cn < 1 || cn > number ){
-	    *rv = -1;
-	    break;
-        }
-
-	/* nas[cn] starts from 0, and make sure nas[cn].type is not assigned */
-        cn--;
-	if( nas[cn].type != TYPE_UNKNOWN )
-	    continue;
-
-        c = *p++;
-
-        /* width */
-        if (c == '*') {
-	    /* not supported feature, for the argument is not numbered */
-	    *rv = -1;
-	    break;
-	}
-
-	while ((c >= '0') && (c <= '9')) {
-	    c = *p++;
-	}
-
-	/* precision */
-	if (c == '.') {
-	    c = *p++;
-	    if (c == '*') {
-	        /* not supported feature, for the argument is not numbered */
-	        *rv = -1;
-	        break;
-	    }
-
-	    while ((c >= '0') && (c <= '9')) {
-		c = *p++;
-	    }
-	}
-
-	/* size */
-	nas[cn].type = TYPE_INTN;
-	if (c == 'h') {
-	    nas[cn].type = TYPE_INT16;
-	    c = *p++;
-	} else if (c == 'L') {
-	    /* XXX not quite sure here */
-	    nas[cn].type = TYPE_INT64;
-	    c = *p++;
-	} else if (c == 'l') {
-	    nas[cn].type = TYPE_INT32;
-	    c = *p++;
-	    if (c == 'l') {
-	        nas[cn].type = TYPE_INT64;
-	        c = *p++;
-	    }
-	}
-
-	/* format */
-	switch (c) {
-	case 'd':
-	case 'c':
-	case 'i':
-	case 'o':
-	case 'u':
-	case 'x':
-	case 'X':
-	    break;
-
-	case 'e':
-	case 'f':
-	case 'g':
-	    nas[ cn ].type = TYPE_DOUBLE;
-	    break;
-
-	case 'p':
-	    /* XXX should use cpp */
-	    if (sizeof(void *) == sizeof(PRInt32)) {
-		nas[ cn ].type = TYPE_UINT32;
-	    } else if (sizeof(void *) == sizeof(PRInt64)) {
-	        nas[ cn ].type = TYPE_UINT64;
-	    } else if (sizeof(void *) == sizeof(PRIntn)) {
-	        nas[ cn ].type = TYPE_UINTN;
-	    } else {
-	        nas[ cn ].type = TYPE_UNKNOWN;
-	    }
-	    break;
-
-	case 'C':
-	case 'S':
-	case 'E':
-	case 'G':
-	    /* XXX not supported I suppose */
-	    PR_ASSERT(0);
-	    nas[ cn ].type = TYPE_UNKNOWN;
-	    break;
-
-	case 's':
-	    nas[ cn ].type = TYPE_STRING;
-	    break;
-
-	case 'n':
-	    nas[ cn ].type = TYPE_INTSTR;
-	    break;
-
-	default:
-	    PR_ASSERT(0);
-	    nas[ cn ].type = TYPE_UNKNOWN;
-	    break;
-	}
-
-	/* get a legal para. */
-	if( nas[ cn ].type == TYPE_UNKNOWN ){
-	    *rv = -1;
-	    break;
-	}
-    }
-
-
-    /*
-    ** third pass
-    ** fill the nas[cn].ap
-    */
-
-    if( *rv < 0 ){
-	if( nas != nasArray )
-	    PR_DELETE( nas );
-	return NULL;
-    }
-
-    cn = 0;
-    while( cn < number ){
-	if( nas[cn].type == TYPE_UNKNOWN ){
-	    cn++;
-	    continue;
-	}
-
-	switch( nas[cn].type ){
-	case TYPE_INT16:
-	case TYPE_UINT16:
-	case TYPE_INTN:
-	    nas[cn].u.i = va_arg( ap, int );
-	    break;
-
-	case TYPE_UINTN:
-	    nas[cn].u.ui = va_arg( ap, unsigned int );
-	    break;
-
-	case TYPE_INT32:
-	    nas[cn].u.i32 = va_arg( ap, PRInt32 );
-	    break;
-
-	case TYPE_UINT32:
-	    nas[cn].u.ui32 = va_arg( ap, PRUint32 );
-	    break;
-
-	case TYPE_INT64:
-	    nas[cn].u.ll = va_arg( ap, PRInt64 );
-	    break;
-
-	case TYPE_UINT64:
-	    nas[cn].u.ull = va_arg( ap, PRUint64 );
-	    break;
-
-	case TYPE_STRING:
-	    nas[cn].u.s = va_arg( ap, char* );
-	    break;
-
-	case TYPE_INTSTR:
-	    nas[cn].u.ip = va_arg( ap, int* );
-	    break;
-
-	case TYPE_DOUBLE:
-	    nas[cn].u.d = va_arg( ap, double );
-	    break;
-
-	default:
-	    if( nas != nasArray )
-		PR_DELETE( nas );
-	    *rv = -1;
-	    return NULL;
-	}
-
-	cn++;
-    }
-
-
-    return nas;
-}
-
-/*
-** The workhorse sprintf code.
-*/
-static int dosprintf(SprintfState *ss, const char *fmt, va_list ap)
-{
-    char c;
-    int flags, width, prec, radix, type;
-    union {
-	char ch;
-	int i;
-	long l;
-	PRInt64 ll;
-	double d;
-	const char *s;
-	int *ip;
-    } u;
-    const char *fmt0;
-    static char *hex = "0123456789abcdef";
-    static char *HEX = "0123456789ABCDEF";
-    char *hexp;
-    int rv, i;
-    struct NumArg* nas = NULL;
-    struct NumArg* nap;
-    struct NumArg  nasArray[ NAS_DEFAULT_NUM ];
-    char  pattern[20];
-    const char* dolPt = NULL;  /* in "%4$.2f", dolPt will point to . */
-
-
-    /*
-    ** build an argument array, IF the fmt is numbered argument
-    ** list style, to contain the Numbered Argument list pointers
-    */
-
-    nas = BuildArgArray( fmt, ap, &rv, nasArray );
-    if( rv < 0 ){
-	/* the fmt contains error Numbered Argument format, jliu@netscape.com */
-	PR_ASSERT(0);
-	return rv;
-    }
-
-    while ((c = *fmt++) != 0) {
-	if (c != '%') {
-	    rv = (*ss->stuff)(ss, fmt - 1, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	    continue;
-	}
-	fmt0 = fmt - 1;
-
-	/*
-	** Gobble up the % format string. Hopefully we have handled all
-	** of the strange cases!
-	*/
-	flags = 0;
-	c = *fmt++;
-	if (c == '%') {
-	    /* quoting a % with %% */
-	    rv = (*ss->stuff)(ss, fmt - 1, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	    continue;
-	}
-
-	if( nas != NULL ){
-	    /* the fmt contains the Numbered Arguments feature */
-	    i = 0;
-	    while( c && c != '$' ){	    /* should imporve error check later */
-		i = ( i * 10 ) + ( c - '0' );
-		c = *fmt++;
-	    }
-
-	    if( nas[i-1].type == TYPE_UNKNOWN ){
-		if( nas && ( nas != nasArray ) )
-		    PR_DELETE( nas );
-		return -1;
-	    }
-
-	    nap = &nas[i-1];
-	    dolPt = fmt;
-	    c = *fmt++;
-	}
-
-	/*
-	 * Examine optional flags.  Note that we do not implement the
-	 * '#' flag of sprintf().  The ANSI C spec. of the '#' flag is
-	 * somewhat ambiguous and not ideal, which is perhaps why
-	 * the various sprintf() implementations are inconsistent
-	 * on this feature.
-	 */
-	while ((c == '-') || (c == '+') || (c == ' ') || (c == '0')) {
-	    if (c == '-') flags |= FLAG_LEFT;
-	    if (c == '+') flags |= FLAG_SIGNED;
-	    if (c == ' ') flags |= FLAG_SPACED;
-	    if (c == '0') flags |= FLAG_ZEROS;
-	    c = *fmt++;
-	}
-	if (flags & FLAG_SIGNED) flags &= ~FLAG_SPACED;
-	if (flags & FLAG_LEFT) flags &= ~FLAG_ZEROS;
-
-	/* width */
-	if (c == '*') {
-	    c = *fmt++;
-	    width = va_arg(ap, int);
-	} else {
-	    width = 0;
-	    while ((c >= '0') && (c <= '9')) {
-		width = (width * 10) + (c - '0');
-		c = *fmt++;
-	    }
-	}
-
-	/* precision */
-	prec = -1;
-	if (c == '.') {
-	    c = *fmt++;
-	    if (c == '*') {
-		c = *fmt++;
-		prec = va_arg(ap, int);
-	    } else {
-		prec = 0;
-		while ((c >= '0') && (c <= '9')) {
-		    prec = (prec * 10) + (c - '0');
-		    c = *fmt++;
-		}
-	    }
-	}
-
-	/* size */
-	type = TYPE_INTN;
-	if (c == 'h') {
-	    type = TYPE_INT16;
-	    c = *fmt++;
-	} else if (c == 'L') {
-	    /* XXX not quite sure here */
-	    type = TYPE_INT64;
-	    c = *fmt++;
-	} else if (c == 'l') {
-	    type = TYPE_INT32;
-	    c = *fmt++;
-	    if (c == 'l') {
-		type = TYPE_INT64;
-		c = *fmt++;
-	    }
-	}
-
-	/* format */
-	hexp = hex;
-	switch (c) {
-	  case 'd': case 'i':			/* decimal/integer */
-	    radix = 10;
-	    goto fetch_and_convert;
-
-	  case 'o':				/* octal */
-	    radix = 8;
-	    type |= 1;
-	    goto fetch_and_convert;
-
-	  case 'u':				/* unsigned decimal */
-	    radix = 10;
-	    type |= 1;
-	    goto fetch_and_convert;
-
-	  case 'x':				/* unsigned hex */
-	    radix = 16;
-	    type |= 1;
-	    goto fetch_and_convert;
-
-	  case 'X':				/* unsigned HEX */
-	    radix = 16;
-	    hexp = HEX;
-	    type |= 1;
-	    goto fetch_and_convert;
-
-	  fetch_and_convert:
-	    switch (type) {
-	      case TYPE_INT16:
-		u.l = nas ? nap->u.i : va_arg(ap, int);
-		if (u.l < 0) {
-		    u.l = -u.l;
-		    flags |= FLAG_NEG;
-		}
-		goto do_long;
-	      case TYPE_UINT16:
-		u.l = (nas ? nap->u.i : va_arg(ap, int)) & 0xffff;
-		goto do_long;
-	      case TYPE_INTN:
-		u.l = nas ? nap->u.i : va_arg(ap, int);
-		if (u.l < 0) {
-		    u.l = -u.l;
-		    flags |= FLAG_NEG;
-		}
-		goto do_long;
-	      case TYPE_UINTN:
-		u.l = (long)(nas ? nap->u.ui : va_arg(ap, unsigned int));
-		goto do_long;
-
-	      case TYPE_INT32:
-		u.l = nas ? nap->u.i32 : va_arg(ap, PRInt32);
-		if (u.l < 0) {
-		    u.l = -u.l;
-		    flags |= FLAG_NEG;
-		}
-		goto do_long;
-	      case TYPE_UINT32:
-		u.l = (long)(nas ? nap->u.ui32 : va_arg(ap, PRUint32));
-	      do_long:
-		rv = cvt_l(ss, u.l, width, prec, radix, type, flags, hexp);
-		if (rv < 0) {
-		    return rv;
-		}
-		break;
-
-	      case TYPE_INT64:
-		u.ll = nas ? nap->u.ll : va_arg(ap, PRInt64);
-		if (!LL_GE_ZERO(u.ll)) {
-		    LL_NEG(u.ll, u.ll);
-		    flags |= FLAG_NEG;
-		}
-		goto do_longlong;
-	      case TYPE_UINT64:
-		u.ll = nas ? nap->u.ull : va_arg(ap, PRUint64);
-	      do_longlong:
-		rv = cvt_ll(ss, u.ll, width, prec, radix, type, flags, hexp);
-		if (rv < 0) {
-		    return rv;
-		}
-		break;
-	    }
-	    break;
-
-	  case 'e':
-	  case 'E':
-	  case 'f':
-	  case 'g':
-	    u.d = nas ? nap->u.d : va_arg(ap, double);
-	    if( nas != NULL ){
-		i = fmt - dolPt;
-		if( i < sizeof( pattern ) ){
-		    pattern[0] = '%';
-		    memcpy( &pattern[1], dolPt, i );
-		    rv = cvt_f(ss, u.d, pattern, &pattern[i+1] );
-		}
-	    } else
-		rv = cvt_f(ss, u.d, fmt0, fmt);
-
-	    if (rv < 0) {
-		return rv;
-	    }
-	    break;
-
-	  case 'c':
-	    u.ch = nas ? nap->u.i : va_arg(ap, int);
-            if ((flags & FLAG_LEFT) == 0) {
-                while (width-- > 1) {
-                    rv = (*ss->stuff)(ss, " ", 1);
-                    if (rv < 0) {
-                        return rv;
-                    }
-                }
-            }
-	    rv = (*ss->stuff)(ss, &u.ch, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-            if (flags & FLAG_LEFT) {
-                while (width-- > 1) {
-                    rv = (*ss->stuff)(ss, " ", 1);
-                    if (rv < 0) {
-                        return rv;
-                    }
-                }
-            }
-	    break;
-
-	  case 'p':
-	    if (sizeof(void *) == sizeof(PRInt32)) {
-	    	type = TYPE_UINT32;
-	    } else if (sizeof(void *) == sizeof(PRInt64)) {
-	    	type = TYPE_UINT64;
-	    } else if (sizeof(void *) == sizeof(int)) {
-		type = TYPE_UINTN;
-	    } else {
-		PR_ASSERT(0);
-		break;
-	    }
-	    radix = 16;
-	    goto fetch_and_convert;
-
-#if 0
-	  case 'C':
-	  case 'S':
-	  case 'E':
-	  case 'G':
-	    /* XXX not supported I suppose */
-	    PR_ASSERT(0);
-	    break;
-#endif
-
-	  case 's':
-	    u.s = nas ? nap->u.s : va_arg(ap, const char*);
-	    rv = cvt_s(ss, u.s, width, prec, flags);
-	    if (rv < 0) {
-		return rv;
-	    }
-	    break;
-
-	  case 'n':
-	    u.ip = nas ? nap->u.ip : va_arg(ap, int*);
-	    if (u.ip) {
-		*u.ip = ss->cur - ss->base;
-	    }
-	    break;
-
-	  default:
-	    /* Not a % token after all... skip it */
-#if 0
-	    PR_ASSERT(0);
-#endif
-	    rv = (*ss->stuff)(ss, "%", 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	    rv = (*ss->stuff)(ss, fmt - 1, 1);
-	    if (rv < 0) {
-		return rv;
-	    }
-	}
-    }
-
-    /* Stuff trailing NUL */
-    rv = (*ss->stuff)(ss, "\0", 1);
-
-    if( nas && ( nas != nasArray ) ){
-	PR_DELETE( nas );
-    }
-
-    return rv;
-}
-
-/************************************************************************/
-
-static int FuncStuff(SprintfState *ss, const char *sp, PRUint32 len)
-{
-    int rv;
-
-    rv = (*ss->func)(ss->arg, sp, len);
-    if (rv < 0) {
-	return rv;
-    }
-    ss->maxlen += len;
-    return 0;
-}
-
-PR_IMPLEMENT(PRUint32) PR_sxprintf(PRStuffFunc func, void *arg, 
-                                 const char *fmt, ...)
-{
-    va_list ap;
-    PRUint32 rv;
-
-    va_start(ap, fmt);
-    rv = PR_vsxprintf(func, arg, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-PR_IMPLEMENT(PRUint32) PR_vsxprintf(PRStuffFunc func, void *arg, 
-                                  const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = FuncStuff;
-    ss.func = func;
-    ss.arg = arg;
-    ss.maxlen = 0;
-    rv = dosprintf(&ss, fmt, ap);
-    return (rv < 0) ? (PRUint32)-1 : ss.maxlen;
-}
-
-/*
-** Stuff routine that automatically grows the malloc'd output buffer
-** before it overflows.
-*/
-static int GrowStuff(SprintfState *ss, const char *sp, PRUint32 len)
-{
-    ptrdiff_t off;
-    char *newbase;
-    PRUint32 newlen;
-
-    off = ss->cur - ss->base;
-    if (off + len >= ss->maxlen) {
-	/* Grow the buffer */
-	newlen = ss->maxlen + ((len > 32) ? len : 32);
-	if (ss->base) {
-	    newbase = (char*) PR_REALLOC(ss->base, newlen);
-	} else {
-	    newbase = (char*) PR_MALLOC(newlen);
-	}
-	if (!newbase) {
-	    /* Ran out of memory */
-	    return -1;
-	}
-	ss->base = newbase;
-	ss->maxlen = newlen;
-	ss->cur = ss->base + off;
-    }
-
-    /* Copy data */
-    while (len) {
-	--len;
-	*ss->cur++ = *sp++;
-    }
-    PR_ASSERT((PRUint32)(ss->cur - ss->base) <= ss->maxlen);
-    return 0;
-}
-
-/*
-** sprintf into a malloc'd buffer
-*/
-PR_IMPLEMENT(char *) PR_smprintf(const char *fmt, ...)
-{
-    va_list ap;
-    char *rv;
-
-    va_start(ap, fmt);
-    rv = PR_vsmprintf(fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-/*
-** Free memory allocated, for the caller, by PR_smprintf
-*/
-PR_IMPLEMENT(void) PR_smprintf_free(char *mem)
-{
-	PR_DELETE(mem);
-}
-
-PR_IMPLEMENT(char *) PR_vsmprintf(const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = GrowStuff;
-    ss.base = 0;
-    ss.cur = 0;
-    ss.maxlen = 0;
-    rv = dosprintf(&ss, fmt, ap);
-    if (rv < 0) {
-	if (ss.base) {
-	    PR_DELETE(ss.base);
-	}
-	return 0;
-    }
-    return ss.base;
-}
-
-/*
-** Stuff routine that discards overflow data
-*/
-static int LimitStuff(SprintfState *ss, const char *sp, PRUint32 len)
-{
-    PRUint32 limit = ss->maxlen - (ss->cur - ss->base);
-
-    if (len > limit) {
-	len = limit;
-    }
-    while (len) {
-	--len;
-	*ss->cur++ = *sp++;
-    }
-    return 0;
-}
-
-/*
-** sprintf into a fixed size buffer. Make sure there is a NUL at the end
-** when finished.
-*/
-PR_IMPLEMENT(PRUint32) PR_snprintf(char *out, PRUint32 outlen, const char *fmt, ...)
-{
-    va_list ap;
-    PRUint32 rv;
-
-    PR_ASSERT((PRInt32)outlen > 0);
-    if ((PRInt32)outlen <= 0) {
-	return 0;
-    }
-
-    va_start(ap, fmt);
-    rv = PR_vsnprintf(out, outlen, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-PR_IMPLEMENT(PRUint32) PR_vsnprintf(char *out, PRUint32 outlen,const char *fmt,
-                                  va_list ap)
-{
-    SprintfState ss;
-    PRUint32 n;
-
-    PR_ASSERT((PRInt32)outlen > 0);
-    if ((PRInt32)outlen <= 0) {
-	return 0;
-    }
-
-    ss.stuff = LimitStuff;
-    ss.base = out;
-    ss.cur = out;
-    ss.maxlen = outlen;
-    (void) dosprintf(&ss, fmt, ap);
-
-    /* If we added chars, and we didn't append a null, do it now. */
-    if( (ss.cur != ss.base) && (*(ss.cur - 1) != '\0') )
-        *(ss.cur - 1) = '\0';
-
-    n = ss.cur - ss.base;
-    return n ? n - 1 : n;
-}
-
-PR_IMPLEMENT(char *) PR_sprintf_append(char *last, const char *fmt, ...)
-{
-    va_list ap;
-    char *rv;
-
-    va_start(ap, fmt);
-    rv = PR_vsprintf_append(last, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-PR_IMPLEMENT(char *) PR_vsprintf_append(char *last, const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = GrowStuff;
-    if (last) {
-	int lastlen = strlen(last);
-	ss.base = last;
-	ss.cur = last + lastlen;
-	ss.maxlen = lastlen;
-    } else {
-	ss.base = 0;
-	ss.cur = 0;
-	ss.maxlen = 0;
-    }
-    rv = dosprintf(&ss, fmt, ap);
-    if (rv < 0) {
-	if (ss.base) {
-	    PR_DELETE(ss.base);
-	}
-	return 0;
-    }
-    return ss.base;
-}
-
diff --git a/libs/js/nsprpub/pr/src/io/prscanf.c b/libs/js/nsprpub/pr/src/io/prscanf.c
deleted file mode 100644
index 618f184f5f..0000000000
--- a/libs/js/nsprpub/pr/src/io/prscanf.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Scan functions for NSPR types
- *
- * Author: Wan-Teh Chang
- *
- * Acknowledgment: The implementation is inspired by the source code
- * in P.J. Plauger's "The Standard C Library," Prentice-Hall, 1992.
- */
-
-#include <limits.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef SUNOS4
-#include "md/sunos4.h"  /* for strtoul */
-#endif
-#include "prprf.h"
-#include "prdtoa.h"
-#include "prlog.h"
-#include "prerror.h"
-
-/*
- * A function that reads a character from 'stream'.
- * Returns the character read, or EOF if end of stream is reached.
- */
-typedef int (*_PRGetCharFN)(void *stream);
-
-/*
- * A function that pushes the character 'ch' back to 'stream'.
- */
-typedef void (*_PRUngetCharFN)(void *stream, int ch); 
-
-/*
- * The size specifier for the integer and floating point number
- * conversions in format control strings.
- */
-typedef enum {
-    _PR_size_none,  /* No size specifier is given */
-    _PR_size_h,     /* The 'h' specifier, suggesting "short" */
-    _PR_size_l,     /* The 'l' specifier, suggesting "long" */
-    _PR_size_L,     /* The 'L' specifier, meaning a 'long double' */
-    _PR_size_ll     /* The 'll' specifier, suggesting "long long" */
-} _PRSizeSpec;
-
-/*
- * The collection of data that is passed between the scan function
- * and its subordinate functions.  The fields of this structure
- * serve as the input or output arguments for these functions.
- */
-typedef struct {
-    _PRGetCharFN get;        /* get a character from input stream */
-    _PRUngetCharFN unget;    /* unget (push back) a character */
-    void *stream;            /* argument for get and unget */
-    va_list ap;              /* the variable argument list */
-    int nChar;               /* number of characters read from 'stream' */
-
-    PRBool assign;           /* assign, or suppress assignment? */
-    int width;               /* field width */
-    _PRSizeSpec sizeSpec;    /* 'h', 'l', 'L', or 'll' */
-
-    PRBool converted;        /* is the value actually converted? */
-} ScanfState;
-
-#define GET(state) ((state)->nChar++, (state)->get((state)->stream))
-#define UNGET(state, ch) \
-        ((state)->nChar--, (state)->unget((state)->stream, ch))
-
-/*
- * The following two macros, GET_IF_WITHIN_WIDTH and WITHIN_WIDTH,
- * are always used together.
- *
- * GET_IF_WITHIN_WIDTH calls the GET macro and assigns its return
- * value to 'ch' only if we have not exceeded the field width of
- * 'state'.  Therefore, after GET_IF_WITHIN_WIDTH, the value of
- * 'ch' is valid only if the macro WITHIN_WIDTH evaluates to true.
- */
-
-#define GET_IF_WITHIN_WIDTH(state, ch) \
-        if (--(state)->width >= 0) { \
-            (ch) = GET(state); \
-        }
-#define WITHIN_WIDTH(state) ((state)->width >= 0)
-
-/*
- * _pr_strtoull:
- *     Convert a string to an unsigned 64-bit integer.  The string
- *     'str' is assumed to be a representation of the integer in
- *     base 'base'.
- *
- * Warning: 
- *     - Only handle base 8, 10, and 16.
- *     - No overflow checking.
- */
-
-static PRUint64
-_pr_strtoull(const char *str, char **endptr, int base)
-{
-    static const int BASE_MAX = 16;
-    static const char digits[] = "0123456789abcdef";
-    char *digitPtr;
-    PRUint64 x;    /* return value */
-    PRInt64 base64;
-    const char *cPtr;
-    PRBool negative;
-    const char *digitStart;
-
-    PR_ASSERT(base == 0 || base == 8 || base == 10 || base == 16);
-    if (base < 0 || base == 1 || base > BASE_MAX) {
-        if (endptr) {
-            *endptr = (char *) str;
-            return LL_ZERO;
-        }
-    }
-
-    cPtr = str;
-    while (isspace(*cPtr)) {
-        ++cPtr;
-    }
-
-    negative = PR_FALSE;
-    if (*cPtr == '-') {
-        negative = PR_TRUE;
-        cPtr++;
-    } else if (*cPtr == '+') {
-        cPtr++;
-    }
-
-    if (base == 16) {
-        if (*cPtr == '0' && (cPtr[1] == 'x' || cPtr[1] == 'X')) {
-            cPtr += 2;
-        }
-    } else if (base == 0) {
-        if (*cPtr != '0') {
-            base = 10;
-        } else if (cPtr[1] == 'x' || cPtr[1] == 'X') {
-            base = 16;
-            cPtr += 2;
-        } else {
-            base = 8;
-        } 
-    }
-    PR_ASSERT(base != 0);
-    LL_I2L(base64, base);
-    digitStart = cPtr;
-
-    /* Skip leading zeros */
-    while (*cPtr == '0') {
-        cPtr++;
-    }
-
-    LL_I2L(x, 0);
-    while ((digitPtr = (char*)memchr(digits, tolower(*cPtr), base)) != NULL) {
-        PRUint64 d;
-
-        LL_I2L(d, (digitPtr - digits));
-        LL_MUL(x, x, base64);
-        LL_ADD(x, x, d);
-        cPtr++;
-    }
-
-    if (cPtr == digitStart) {
-        if (endptr) {
-            *endptr = (char *) str;
-        }
-        return LL_ZERO;
-    }
-
-    if (negative) {
-#ifdef HAVE_LONG_LONG
-        /* The cast to a signed type is to avoid a compiler warning */
-        x = -(PRInt64)x;
-#else
-        LL_NEG(x, x);
-#endif
-    }
-
-    if (endptr) {
-        *endptr = (char *) cPtr;
-    }
-    return x;
-}
-
-/*
- * The maximum field width (in number of characters) that is enough
- * (may be more than necessary) to represent a 64-bit integer or
- * floating point number.
- */
-#define FMAX 31
-#define DECIMAL_POINT '.'
-
-static PRStatus
-GetInt(ScanfState *state, int code)
-{
-    char buf[FMAX + 1], *p;
-    int ch;
-    static const char digits[] = "0123456789abcdefABCDEF";
-    PRBool seenDigit = PR_FALSE;
-    int base;
-    int dlen;
-
-    switch (code) {
-        case 'd': case 'u':
-            base = 10;
-            break;
-        case 'i':
-            base = 0;
-            break;
-        case 'x': case 'X': case 'p':
-            base = 16;
-            break;
-        case 'o':
-            base = 8;
-            break;
-        default:
-            return PR_FAILURE;
-    }
-    if (state->width == 0 || state->width > FMAX) {
-        state->width = FMAX;
-    }
-    p = buf;
-    GET_IF_WITHIN_WIDTH(state, ch);
-    if (WITHIN_WIDTH(state) && (ch == '+' || ch == '-')) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-    }
-    if (WITHIN_WIDTH(state) && ch == '0') {
-        seenDigit = PR_TRUE;
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        if (WITHIN_WIDTH(state)
-                && (ch == 'x' || ch == 'X')
-                && (base == 0 || base == 16)) {
-            base = 16;
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-        } else if (base == 0) {
-            base = 8;
-        }
-    }
-    if (base == 0 || base == 10) {
-        dlen = 10;
-    } else if (base == 8) {
-        dlen = 8;
-    } else {
-        PR_ASSERT(base == 16);
-        dlen = 16 + 6; /* 16 digits, plus 6 in uppercase */
-    }
-    while (WITHIN_WIDTH(state) && memchr(digits, ch, dlen)) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        seenDigit = PR_TRUE;
-    }
-    if (WITHIN_WIDTH(state)) {
-        UNGET(state, ch);
-    }
-    if (!seenDigit) {
-        return PR_FAILURE;
-    }
-    *p = '\0';
-    if (state->assign) {
-        if (code == 'd' || code == 'i') {
-            if (state->sizeSpec == _PR_size_ll) {
-                PRInt64 llval = _pr_strtoull(buf, NULL, base);
-                *va_arg(state->ap, PRInt64 *) = llval;
-            } else {
-                long lval = strtol(buf, NULL, base);
-
-                if (state->sizeSpec == _PR_size_none) {
-                    *va_arg(state->ap, PRIntn *) = lval;
-                } else if (state->sizeSpec == _PR_size_h) {
-                    *va_arg(state->ap, PRInt16 *) = (PRInt16)lval;
-                } else if (state->sizeSpec == _PR_size_l) {
-                    *va_arg(state->ap, PRInt32 *) = lval;
-                } else {
-                    return PR_FAILURE;
-                }
-            }
-        } else {
-            if (state->sizeSpec == _PR_size_ll) {
-                PRUint64 llval = _pr_strtoull(buf, NULL, base);
-                *va_arg(state->ap, PRUint64 *) = llval;
-            } else {
-                unsigned long lval = strtoul(buf, NULL, base);
-
-                if (state->sizeSpec == _PR_size_none) {
-                    *va_arg(state->ap, PRUintn *) = lval;
-                } else if (state->sizeSpec == _PR_size_h) {
-                    *va_arg(state->ap, PRUint16 *) = (PRUint16)lval;
-                } else if (state->sizeSpec == _PR_size_l) {
-                    *va_arg(state->ap, PRUint32 *) = lval;
-                } else {
-                    return PR_FAILURE;
-                }
-            }
-        }
-        state->converted = PR_TRUE;
-    }
-    return PR_SUCCESS;
-}
-
-static PRStatus
-GetFloat(ScanfState *state)
-{
-    char buf[FMAX + 1], *p;
-    int ch;
-    PRBool seenDigit = PR_FALSE;
-
-    if (state->width == 0 || state->width > FMAX) {
-        state->width = FMAX;
-    }
-    p = buf;
-    GET_IF_WITHIN_WIDTH(state, ch);
-    if (WITHIN_WIDTH(state) && (ch == '+' || ch == '-')) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-    }
-    while (WITHIN_WIDTH(state) && isdigit(ch)) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        seenDigit = PR_TRUE;
-    }
-    if (WITHIN_WIDTH(state) && ch == DECIMAL_POINT) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        while (WITHIN_WIDTH(state) && isdigit(ch)) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-            seenDigit = PR_TRUE;
-        }
-    }
-
-    /*
-     * This is not robust.  For example, "1.2e+" would confuse
-     * the code below to read 'e' and '+', only to realize that
-     * it should have stopped at "1.2".  But we can't push back
-     * more than one character, so there is nothing I can do.
-     */
-
-    /* Parse exponent */
-    if (WITHIN_WIDTH(state) && (ch == 'e' || ch == 'E') && seenDigit) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        if (WITHIN_WIDTH(state) && (ch == '+' || ch == '-')) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-        }
-        while (WITHIN_WIDTH(state) && isdigit(ch)) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-        }
-    }
-    if (WITHIN_WIDTH(state)) {
-        UNGET(state, ch);
-    }
-    if (!seenDigit) {
-        return PR_FAILURE;
-    }
-    *p = '\0';
-    if (state->assign) {
-        PRFloat64 dval = PR_strtod(buf, NULL);
-
-        state->converted = PR_TRUE;
-        if (state->sizeSpec == _PR_size_l) {
-            *va_arg(state->ap, PRFloat64 *) = dval;
-        } else if (state->sizeSpec == _PR_size_L) {
-#if defined(OSF1) || defined(IRIX)
-            *va_arg(state->ap, double *) = dval;
-#else
-            *va_arg(state->ap, long double *) = dval;
-#endif
-        } else {
-            *va_arg(state->ap, float *) = (float) dval;
-        }
-    }
-    return PR_SUCCESS;
-}
-
-/*
- * Convert, and return the end of the conversion spec.
- * Return NULL on error.
- */
-
-static const char *
-Convert(ScanfState *state, const char *fmt)
-{
-    const char *cPtr;
-    int ch;
-    char *cArg = NULL;
-
-    state->converted = PR_FALSE;
-    cPtr = fmt;
-    if (*cPtr != 'c' && *cPtr != 'n' && *cPtr != '[') {
-        do {
-            ch = GET(state);
-        } while (isspace(ch));
-        UNGET(state, ch);
-    }
-    switch (*cPtr) {
-        case 'c':
-            if (state->assign) {
-                cArg = va_arg(state->ap, char *);
-            }
-            if (state->width == 0) {
-                state->width = 1;
-            }
-            for (; state->width > 0; state->width--) {
-                ch = GET(state);
-                if (ch == EOF) {
-                    return NULL;
-                } else if (state->assign) {
-                    *cArg++ = ch;
-                }
-            }
-            if (state->assign) {
-                state->converted = PR_TRUE;
-            }
-            break;
-        case 'p':
-        case 'd': case 'i': case 'o':
-        case 'u': case 'x': case 'X':
-            if (GetInt(state, *cPtr) == PR_FAILURE) {
-                return NULL;
-            }
-            break;
-        case 'e': case 'E': case 'f':
-        case 'g': case 'G':
-            if (GetFloat(state) == PR_FAILURE) {
-                return NULL;
-            }
-            break;
-        case 'n':
-            /* do not consume any input */
-            if (state->assign) {
-                switch (state->sizeSpec) {
-                    case _PR_size_none:
-                        *va_arg(state->ap, PRIntn *) = state->nChar;
-                        break;
-                    case _PR_size_h:
-                        *va_arg(state->ap, PRInt16 *) = state->nChar;
-                        break;
-                    case _PR_size_l:
-                        *va_arg(state->ap, PRInt32 *) = state->nChar;
-                        break;
-                    case _PR_size_ll:
-                        LL_I2L(*va_arg(state->ap, PRInt64 *), state->nChar);
-                        break;
-                    default:
-                        PR_ASSERT(0);
-                }
-            }
-            break;
-        case 's':
-            if (state->width == 0) {
-                state->width = INT_MAX;
-            }
-            if (state->assign) {
-                cArg = va_arg(state->ap, char *);
-            }
-            for (; state->width > 0; state->width--) {
-                ch = GET(state);
-                if ((ch == EOF) || isspace(ch)) {
-                    UNGET(state, ch);
-                    break;
-                }
-                if (state->assign) {
-                    *cArg++ = ch;
-                }
-            }
-            if (state->assign) {
-                *cArg = '\0';
-                state->converted = PR_TRUE;
-            }
-            break;
-        case '%':
-            ch = GET(state);
-            if (ch != '%') {
-                UNGET(state, ch);
-                return NULL;
-            }
-            break;
-        case '[':
-            {
-                PRBool complement = PR_FALSE;
-                const char *closeBracket;
-                size_t n;
-
-                if (*++cPtr == '^') {
-                    complement = PR_TRUE;
-                    cPtr++;
-                }
-                closeBracket = strchr(*cPtr == ']' ? cPtr + 1 : cPtr, ']');
-                if (closeBracket == NULL) {
-                    return NULL;
-                }
-                n = closeBracket - cPtr;
-                if (state->width == 0) {
-                    state->width = INT_MAX;
-                }
-                if (state->assign) {
-                    cArg = va_arg(state->ap, char *);
-                }
-                for (; state->width > 0; state->width--) {
-                    ch = GET(state);
-                    if ((ch == EOF) 
-                            || (!complement && !memchr(cPtr, ch, n))
-                            || (complement && memchr(cPtr, ch, n))) {
-                        UNGET(state, ch);
-                        break;
-                    }
-                    if (state->assign) {
-                        *cArg++ = ch;
-                    }
-                }
-                if (state->assign) {
-                    *cArg = '\0';
-                    state->converted = PR_TRUE;
-                }
-                cPtr = closeBracket;
-            }
-            break;
-        default:
-            return NULL;
-    }
-    return cPtr;
-}
-
-static PRInt32
-DoScanf(ScanfState *state, const char *fmt)
-{
-    PRInt32 nConverted = 0;
-    const char *cPtr;
-    int ch;
-
-    state->nChar = 0;
-    cPtr = fmt;
-    while (1) {
-        if (isspace(*cPtr)) {
-            /* white space: skip */
-            do {
-                cPtr++;
-            } while (isspace(*cPtr));
-            do {
-                ch = GET(state);
-            } while (isspace(ch));
-            UNGET(state, ch);
-        } else if (*cPtr == '%') {
-            /* format spec: convert */
-            cPtr++;
-            state->assign = PR_TRUE;
-            if (*cPtr == '*') {
-                cPtr++;
-                state->assign = PR_FALSE;
-            }
-            for (state->width = 0; isdigit(*cPtr); cPtr++) {
-                state->width = state->width * 10 + *cPtr - '0';
-            }
-            state->sizeSpec = _PR_size_none;
-            if (*cPtr == 'h') {
-                cPtr++;
-                state->sizeSpec = _PR_size_h;
-            } else if (*cPtr == 'l') {
-                cPtr++;
-                if (*cPtr == 'l') {
-                    cPtr++;
-                    state->sizeSpec = _PR_size_ll;
-                } else {
-                    state->sizeSpec = _PR_size_l;
-                }
-            } else if (*cPtr == 'L') {
-                cPtr++;
-                state->sizeSpec = _PR_size_L;
-            }
-            cPtr = Convert(state, cPtr);
-            if (cPtr == NULL) {
-                return (nConverted > 0 ? nConverted : EOF);
-            }
-            if (state->converted) {
-                nConverted++;
-            }
-            cPtr++;
-        } else {
-            /* others: must match */
-            if (*cPtr == '\0') {
-                return nConverted;
-            }
-            ch = GET(state);
-            if (ch != *cPtr) {
-                UNGET(state, ch);
-                return nConverted;
-            }
-            cPtr++;
-        }
-    }
-}
-
-static int
-StringGetChar(void *stream)
-{
-    char *cPtr = *((char **) stream);
-
-    if (*cPtr == '\0') {
-        return EOF;
-    } else {
-        *((char **) stream) = cPtr + 1;
-        return (unsigned char) *cPtr;
-    }
-}
-
-static void
-StringUngetChar(void *stream, int ch)
-{
-    char *cPtr = *((char **) stream);
-
-    if (ch != EOF) {
-        *((char **) stream) = cPtr - 1;
-    }
-}
-
-PR_IMPLEMENT(PRInt32)
-PR_sscanf(const char *buf, const char *fmt, ...)
-{
-    PRInt32 rv;
-    ScanfState state;
-
-    state.get = &StringGetChar;
-    state.unget = &StringUngetChar;
-    state.stream = (void *) &buf;
-    va_start(state.ap, fmt);
-    rv = DoScanf(&state, fmt);
-    va_end(state.ap);
-    return rv;
-}
diff --git a/libs/js/nsprpub/pr/src/io/prsocket.c b/libs/js/nsprpub/pr/src/io/prsocket.c
deleted file mode 100644
index 535e1c7a4e..0000000000
--- a/libs/js/nsprpub/pr/src/io/prsocket.c
+++ /dev/null
@@ -1,1843 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-/************************************************************************/
-
-/* These two functions are only used in assertions. */
-#if defined(DEBUG)
-
-PRBool IsValidNetAddr(const PRNetAddr *addr)
-{
-    if ((addr != NULL)
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-	    && (addr->raw.family != PR_AF_LOCAL)
-#endif
-	    && (addr->raw.family != PR_AF_INET6)
-	    && (addr->raw.family != PR_AF_INET)) {
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-
-static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len)
-{
-    /*
-     * The definition of the length of a Unix domain socket address
-     * is not uniform, so we don't check it.
-     */
-    if ((addr != NULL)
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-            && (addr->raw.family != AF_UNIX)
-#endif
-            && (PR_NETADDR_SIZE(addr) != addr_len)) {
-#if defined(LINUX) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 1
-        /*
-         * In glibc 2.1, struct sockaddr_in6 is 24 bytes.  In glibc 2.2
-         * and in the 2.4 kernel, struct sockaddr_in6 has the scope_id
-         * field and is 28 bytes.  It is possible for socket functions
-         * to return an addr_len greater than sizeof(struct sockaddr_in6).
-         * We need to allow that.  (Bugzilla bug #77264)
-         */
-        if ((PR_AF_INET6 == addr->raw.family)
-                && (sizeof(addr->ipv6) == addr_len)) {
-            return PR_TRUE;
-        }
-#endif
-        /*
-         * The accept(), getsockname(), etc. calls on some platforms
-         * do not set the actual socket address length on return.
-         * In this case, we verifiy addr_len is still the value we
-         * passed in (i.e., sizeof(PRNetAddr)).
-         */
-#if defined(QNX)
-        if (sizeof(PRNetAddr) == addr_len) {
-            return PR_TRUE;
-        }
-#endif
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-
-#endif /* DEBUG */
-
-static PRInt32 PR_CALLBACK SocketWritev(PRFileDesc *fd, const PRIOVec *iov,
-PRInt32 iov_size, PRIntervalTime timeout)
-{
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-	int w = 0;
-	const PRIOVec *tmp_iov;
-#define LOCAL_MAXIOV    8
-	PRIOVec local_iov[LOCAL_MAXIOV];
-	PRIOVec *iov_copy = NULL;
-	int tmp_out;
-	int index, iov_cnt;
-	int count=0, sz = 0;    /* 'count' is the return value. */
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-
-    /*
-     * Assume the first writev will succeed.  Copy iov's only on
-     * failure.
-     */
-    tmp_iov = iov;
-    for (index = 0; index < iov_size; index++)
-        sz += iov[index].iov_len;
-
-	iov_cnt = iov_size;
-
-	while (sz > 0) {
-
-		w = _PR_MD_WRITEV(fd, tmp_iov, iov_cnt, timeout);
-		if (w < 0) {
-			count = -1;
-			break;
-		}
-		count += w;
-		if (fd->secret->nonblocking) {
-			break;
-		}
-		sz -= w;
-
-		if (sz > 0) {
-			/* find the next unwritten vector */
-			for ( index = 0, tmp_out = count;
-				tmp_out >= iov[index].iov_len;
-				tmp_out -= iov[index].iov_len, index++){;} /* nothing to execute */
-
-			if (tmp_iov == iov) {
-				/*
-				 * The first writev failed so we
-				 * must copy iov's around.
-				 * Avoid calloc/free if there
-				 * are few enough iov's.
-				 */
-				if (iov_size - index <= LOCAL_MAXIOV)
-					iov_copy = local_iov;
-				else if ((iov_copy = (PRIOVec *) PR_CALLOC((iov_size - index) *
-					sizeof *iov_copy)) == NULL) {
-					PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-					return -1;
-				}
-				tmp_iov = iov_copy;
-			}
-
-			PR_ASSERT(tmp_iov == iov_copy);
-
-			/* fill in the first partial read */
-			iov_copy[0].iov_base = &(((char *)iov[index].iov_base)[tmp_out]);
-			iov_copy[0].iov_len = iov[index].iov_len - tmp_out;
-			index++;
-
-			/* copy the remaining vectors */
-			for (iov_cnt=1; index<iov_size; iov_cnt++, index++) {
-				iov_copy[iov_cnt].iov_base = iov[index].iov_base;
-				iov_copy[iov_cnt].iov_len = iov[index].iov_len;
-			}
-		}
-	}
-
-	if (iov_copy != local_iov)
-		PR_DELETE(iov_copy);
-	return count;
-}
-
-/************************************************************************/
-
-PR_IMPLEMENT(PRFileDesc *) PR_ImportTCPSocket(PROsfd osfd)
-{
-PRFileDesc *fd;
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-	fd = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
-	if (fd != NULL) {
-		_PR_MD_MAKE_NONBLOCK(fd);
-		_PR_MD_INIT_FD_INHERITABLE(fd, PR_TRUE);
-	} else
-		_PR_MD_CLOSE_SOCKET(osfd);
-	return(fd);
-}
-
-PR_IMPLEMENT(PRFileDesc *) PR_ImportUDPSocket(PROsfd osfd)
-{
-PRFileDesc *fd;
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-	fd = PR_AllocFileDesc(osfd, PR_GetUDPMethods());
-	if (fd != NULL) {
-		_PR_MD_MAKE_NONBLOCK(fd);
-		_PR_MD_INIT_FD_INHERITABLE(fd, PR_TRUE);
-	} else
-		_PR_MD_CLOSE_SOCKET(osfd);
-	return(fd);
-}
-
-
-static const PRIOMethods* PR_GetSocketPollFdMethods(void);
-
-PR_IMPLEMENT(PRFileDesc*) PR_CreateSocketPollFd(PROsfd osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    fd = _PR_Getfd();
-
-    if (fd == NULL) PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    else
-    {
-        fd->secret->md.osfd = osfd;
-        fd->secret->inheritable = _PR_TRI_FALSE;
-    	fd->secret->state = _PR_FILEDESC_OPEN;
-        fd->methods = PR_GetSocketPollFdMethods();
-    }
-
-    return fd;
-}  /* PR_CreateSocketPollFD */
-
-PR_IMPLEMENT(PRStatus) PR_DestroySocketPollFd(PRFileDesc *fd)
-{
-    if (NULL == fd)
-    {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-    fd->secret->state = _PR_FILEDESC_CLOSED;
-    _PR_Putfd(fd);
-    return PR_SUCCESS;
-}  /* PR_DestroySocketPollFd */
-
-static PRStatus PR_CALLBACK SocketConnect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	PRInt32 rv;    /* Return value of _PR_MD_CONNECT */
-    const PRNetAddr *addrp = addr;
-#if defined(_PR_INET6)
-	PRNetAddr addrCopy;
-#endif
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return PR_FAILURE;
-	}
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-	}
-#endif
-
-	rv = _PR_MD_CONNECT(fd, addrp, PR_NETADDR_SIZE(addr), timeout);
-	PR_LOG(_pr_io_lm, PR_LOG_MAX, ("connect -> %d", rv));
-	if (rv == 0)
-		return PR_SUCCESS;
-	else
-		return PR_FAILURE;
-}
-
-static PRStatus PR_CALLBACK SocketConnectContinue(
-    PRFileDesc *fd, PRInt16 out_flags)
-{
-    PROsfd osfd;
-    int err;
-
-    if (out_flags & PR_POLL_NVAL) {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0) {
-        PR_ASSERT(out_flags == 0);
-        PR_SetError(PR_IN_PROGRESS_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    osfd = fd->secret->md.osfd;
-
-#if defined(XP_UNIX)
-
-    err = _MD_unix_get_nonblocking_connect_error(osfd);
-    if (err != 0) {
-        _PR_MD_MAP_CONNECT_ERROR(err);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-
-#elif defined(WIN32) || defined(WIN16)
-
-#if defined(WIN32)
-    /*
-     * The sleep circumvents a bug in Win32 WinSock.
-     * See Microsoft Knowledge Base article ID: Q165989.
-     */
-    Sleep(0);
-#endif /* WIN32 */
-
-    if (out_flags & PR_POLL_EXCEPT) {
-        int len = sizeof(err);
-        if (getsockopt(osfd, (int)SOL_SOCKET, SO_ERROR, (char *) &err, &len)
-                == SOCKET_ERROR) {
-            _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-            return PR_FAILURE;
-        }
-        if (err != 0) {
-            _PR_MD_MAP_CONNECT_ERROR(err);
-        } else {
-            PR_SetError(PR_UNKNOWN_ERROR, 0);
-        }
-        return PR_FAILURE;
-    }
-
-    PR_ASSERT(out_flags & PR_POLL_WRITE);
-    return PR_SUCCESS;
-
-#elif defined(XP_OS2)
-
-    err = _MD_os2_get_nonblocking_connect_error(osfd);
-    if (err != 0) {
-        _PR_MD_MAP_CONNECT_ERROR(err);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-
-#elif defined(XP_MAC)
-
-    err = _MD_mac_get_nonblocking_connect_error(fd);
-    if (err == -1)
-        return PR_FAILURE;
-	else     
-		return PR_SUCCESS;
-
-#elif defined(XP_BEOS)
-
-#ifdef BONE_VERSION  /* bug 122364 */
-    /* temporary workaround until getsockopt(SO_ERROR) works in BONE */
-    if (out_flags & PR_POLL_EXCEPT) {
-        PR_SetError(PR_CONNECT_REFUSED_ERROR, 0);
-        return PR_FAILURE;
-    }
-    PR_ASSERT(out_flags & PR_POLL_WRITE);
-    return PR_SUCCESS;
-#else
-    err = _MD_beos_get_nonblocking_connect_error(fd);
-    if( err != 0 ) {
-        _PR_MD_MAP_CONNECT_ERROR(err);
-        return PR_FAILURE;
-    }
-    else
-        return PR_SUCCESS;
-#endif /* BONE_VERSION */
-
-#else
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-#endif
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd)
-{
-    /* Find the NSPR layer and invoke its connectcontinue method */
-    PRFileDesc *bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-
-    if (NULL == bottom) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    return SocketConnectContinue(bottom, pd->out_flags);
-}
-
-static PRFileDesc* PR_CALLBACK SocketAccept(PRFileDesc *fd, PRNetAddr *addr,
-PRIntervalTime timeout)
-{
-	PROsfd osfd;
-	PRFileDesc *fd2;
-	PRUint32 al;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-#ifdef WINNT
-	PRNetAddr addrCopy;
-#endif
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return 0;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return 0;
-	}
-
-#ifdef WINNT
-	if (addr == NULL) {
-		addr = &addrCopy;
-	}
-#endif
-	al = sizeof(PRNetAddr);
-	osfd = _PR_MD_ACCEPT(fd, addr, &al, timeout);
-	if (osfd == -1)
-		return 0;
-
-	fd2 = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
-	if (!fd2) {
-		_PR_MD_CLOSE_SOCKET(osfd);
-		return NULL;
-	}
-
-	fd2->secret->nonblocking = fd->secret->nonblocking;
-	fd2->secret->inheritable = fd->secret->inheritable;
-#ifdef WINNT
-	if (!fd2->secret->nonblocking && fd2->secret->inheritable != _PR_TRI_TRUE) {
-		/*
-		 * The new socket has been associated with an I/O
-		 * completion port.  There is no going back.
-		 */
-		fd2->secret->md.io_model_committed = PR_TRUE;
-	}
-	PR_ASSERT(al == PR_NETADDR_SIZE(addr));
-	fd2->secret->md.accepted_socket = PR_TRUE;
-	memcpy(&fd2->secret->md.peer_addr, addr, al);
-#endif
-
-	/*
-	 * On some platforms, the new socket created by accept()
-	 * inherits the nonblocking (or overlapped io) attribute
-	 * of the listening socket.  As an optimization, these
-	 * platforms can skip the following _PR_MD_MAKE_NONBLOCK
-	 * call.
-	 * 
-	 * On Mac, we MUST make this call, because _PR_MD_MAKE_NONBLOCK
-	 * (which maps to _MD_makenonblock, see macsockotpt.c)
-	 * installs the async notifier routine needed to make blocking
-	 * I/O work properly.
-	 */
-#if !defined(SOLARIS) && !defined(IRIX) && !defined(WINNT)
-	_PR_MD_MAKE_NONBLOCK(fd2);
-#endif
-
-#ifdef _PR_INET6
-	if (addr && (AF_INET6 == addr->raw.family))
-        addr->raw.family = PR_AF_INET6;
-#endif
-	PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-	PR_ASSERT(IsValidNetAddrLen(addr, al) == PR_TRUE);
-
-	return fd2;
-}
-
-#ifdef WINNT
-PR_IMPLEMENT(PRFileDesc*) PR_NTFast_Accept(PRFileDesc *fd, PRNetAddr *addr,
-PRIntervalTime timeout)
-{
-	PROsfd osfd;
-	PRFileDesc *fd2;
-	PRIntn al;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-	PRNetAddr addrCopy;
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return 0;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return 0;
-	}
-
-		if (addr == NULL) {
-			addr = &addrCopy;
-		}
-		al = PR_NETADDR_SIZE(addr);
-		osfd = _PR_MD_FAST_ACCEPT(fd, addr, &al, timeout, PR_TRUE, NULL, NULL);
-		if (osfd == -1) {
-			return 0;
-		}
-
-	fd2 = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
-	if (!fd2) {
-		_PR_MD_CLOSE_SOCKET(osfd);
-	} else {
-		fd2->secret->nonblocking = fd->secret->nonblocking;
-		fd2->secret->md.io_model_committed = PR_TRUE;
-	        PR_ASSERT(al == PR_NETADDR_SIZE(addr));
-        	fd2->secret->md.accepted_socket = PR_TRUE;
-        	memcpy(&fd2->secret->md.peer_addr, addr, al);
-#ifdef _PR_INET6
-		if (AF_INET6 == addr->raw.family)
-        	addr->raw.family = PR_AF_INET6;
-#endif
-	}
-	return fd2;
-}
-#endif /* WINNT */
-
-
-static PRStatus PR_CALLBACK SocketBind(PRFileDesc *fd, const PRNetAddr *addr)
-{
-	PRInt32 result;
-    const PRNetAddr *addrp = addr;
-#if defined(_PR_INET6)
-	PRNetAddr addrCopy;
-#endif
-
-	PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-
-#ifdef XP_UNIX
-	if (addr->raw.family == AF_UNIX) {
-		/* Disallow relative pathnames */
-		if (addr->local.path[0] != '/') {
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-			return PR_FAILURE;
-		}
-	}
-#endif /* XP_UNIX */
-
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-	}
-#endif
-	result = _PR_MD_BIND(fd, addrp, PR_NETADDR_SIZE(addr));
-	if (result < 0) {
-		return PR_FAILURE;
-	}
-	return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK SocketListen(PRFileDesc *fd, PRIntn backlog)
-{
-	PRInt32 result;
-
-	result = _PR_MD_LISTEN(fd, backlog);
-	if (result < 0) {
-		return PR_FAILURE;
-	}
-	return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK SocketShutdown(PRFileDesc *fd, PRIntn how)
-{
-	PRInt32 result;
-
-	result = _PR_MD_SHUTDOWN(fd, how);
-	if (result < 0) {
-		return PR_FAILURE;
-	}
-	return PR_SUCCESS;
-}
-
-static PRInt32 PR_CALLBACK SocketRecv(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-PRIntervalTime timeout)
-{
-	PRInt32 rv;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if ((flags != 0) && (flags != PR_MSG_PEEK)) {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-
-	PR_LOG(_pr_io_lm, PR_LOG_MAX,
-		("recv: fd=%p osfd=%" PR_PRIdOSFD " buf=%p amount=%d flags=%d",
-		fd, fd->secret->md.osfd, buf, amount, flags));
-
-#ifdef _PR_HAVE_PEEK_BUFFER
-	if (fd->secret->peekBytes != 0) {
-		rv = (amount < fd->secret->peekBytes) ?
-			amount : fd->secret->peekBytes;
-		memcpy(buf, fd->secret->peekBuffer, rv);
-		if (flags == 0) {
-			/* consume the bytes in the peek buffer */
-			fd->secret->peekBytes -= rv;
-			if (fd->secret->peekBytes != 0) {
-				memmove(fd->secret->peekBuffer,
-					fd->secret->peekBuffer + rv,
-					fd->secret->peekBytes);
-			}
-		}
-		return rv;
-	}
-
-	/* allocate peek buffer, if necessary */
-	if ((PR_MSG_PEEK == flags) && _PR_FD_NEED_EMULATE_MSG_PEEK(fd)) {
-		PR_ASSERT(0 == fd->secret->peekBytes);
-		/* impose a max size on the peek buffer */
-		if (amount > _PR_PEEK_BUFFER_MAX) {
-			amount = _PR_PEEK_BUFFER_MAX;
-		}
-		if (fd->secret->peekBufSize < amount) {
-			if (fd->secret->peekBuffer) {
-				PR_Free(fd->secret->peekBuffer);
-			}
-			fd->secret->peekBufSize = amount;
-			fd->secret->peekBuffer = PR_Malloc(amount);
-			if (NULL == fd->secret->peekBuffer) {
-				fd->secret->peekBufSize = 0;
-				PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-				return -1;
-			}
-		}
-	}
-#endif
-
-	rv = _PR_MD_RECV(fd, buf, amount, flags, timeout);
-	PR_LOG(_pr_io_lm, PR_LOG_MAX, ("recv -> %d, error = %d, os error = %d",
-		rv, PR_GetError(), PR_GetOSError()));
-
-#ifdef _PR_HAVE_PEEK_BUFFER
-	if ((PR_MSG_PEEK == flags) && _PR_FD_NEED_EMULATE_MSG_PEEK(fd)) {
-		if (rv > 0) {
-			memcpy(fd->secret->peekBuffer, buf, rv);
-			fd->secret->peekBytes = rv;
-		}
-	}
-#endif
-
-	return rv;
-}
-
-static PRInt32 PR_CALLBACK SocketRead(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-	return SocketRecv(fd, buf, amount, 0, PR_INTERVAL_NO_TIMEOUT);
-}
-
-static PRInt32 PR_CALLBACK SocketSend(PRFileDesc *fd, const void *buf, PRInt32 amount,
-PRIntn flags, PRIntervalTime timeout)
-{
-	PRInt32 temp, count;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-
-	count = 0;
-	while (amount > 0) {
-		PR_LOG(_pr_io_lm, PR_LOG_MAX,
-		    ("send: fd=%p osfd=%" PR_PRIdOSFD " buf=%p amount=%d",
-		    fd, fd->secret->md.osfd, buf, amount));
-		temp = _PR_MD_SEND(fd, buf, amount, flags, timeout);
-		if (temp < 0) {
-					count = -1;
-					break;
-				}
-
-		count += temp;
-		if (fd->secret->nonblocking) {
-			break;
-		}
-		buf = (const void*) ((const char*)buf + temp);
-
-		amount -= temp;
-	}
-	PR_LOG(_pr_io_lm, PR_LOG_MAX, ("send -> %d", count));
-	return count;
-}
-
-static PRInt32 PR_CALLBACK SocketWrite(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-	return SocketSend(fd, buf, amount, 0, PR_INTERVAL_NO_TIMEOUT);
-}
-
-static PRStatus PR_CALLBACK SocketClose(PRFileDesc *fd)
-{
-	if (!fd || !fd->secret
-			|| (fd->secret->state != _PR_FILEDESC_OPEN
-			&& fd->secret->state != _PR_FILEDESC_CLOSED)) {
-		PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-		return PR_FAILURE;
-	}
-
-	if (fd->secret->state == _PR_FILEDESC_OPEN) {
-		if (_PR_MD_CLOSE_SOCKET(fd->secret->md.osfd) < 0) {
-			return PR_FAILURE;
-		}
-		fd->secret->state = _PR_FILEDESC_CLOSED;
-	}
-
-#ifdef _PR_HAVE_PEEK_BUFFER
-	if (fd->secret->peekBuffer) {
-		PR_ASSERT(fd->secret->peekBufSize > 0);
-		PR_DELETE(fd->secret->peekBuffer);
-		fd->secret->peekBufSize = 0;
-		fd->secret->peekBytes = 0;
-	}
-#endif
-
-	PR_FreeFileDesc(fd);
-	return PR_SUCCESS;
-}
-
-static PRInt32 PR_CALLBACK SocketAvailable(PRFileDesc *fd)
-{
-	PRInt32 rv;
-#ifdef _PR_HAVE_PEEK_BUFFER
-	if (fd->secret->peekBytes != 0) {
-		return fd->secret->peekBytes;
-	}
-#endif
-	rv =  _PR_MD_SOCKETAVAILABLE(fd);
-	return rv;		
-}
-
-static PRInt64 PR_CALLBACK SocketAvailable64(PRFileDesc *fd)
-{
-    PRInt64 rv;
-#ifdef _PR_HAVE_PEEK_BUFFER
-    if (fd->secret->peekBytes != 0) {
-        LL_I2L(rv, fd->secret->peekBytes);
-        return rv;
-    }
-#endif
-    LL_I2L(rv, _PR_MD_SOCKETAVAILABLE(fd));
-	return rv;		
-}
-
-static PRStatus PR_CALLBACK SocketSync(PRFileDesc *fd)
-{
-#if defined(XP_MAC)
-#pragma unused (fd)
-#endif
-
-	return PR_SUCCESS;
-}
-
-static PRInt32 PR_CALLBACK SocketSendTo(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-	PRInt32 temp, count;
-    const PRNetAddr *addrp = addr;
-#if defined(_PR_INET6)
-	PRNetAddr addrCopy;
-#endif
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-
-	PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-	}
-#endif
-
-	count = 0;
-	while (amount > 0) {
-		temp = _PR_MD_SENDTO(fd, buf, amount, flags,
-		    addrp, PR_NETADDR_SIZE(addr), timeout);
-		if (temp < 0) {
-					count = -1;
-					break;
-				}
-		count += temp;
-		if (fd->secret->nonblocking) {
-			break;
-		}
-		buf = (const void*) ((const char*)buf + temp);
-		amount -= temp;
-	}
-	return count;
-}
-
-static PRInt32 PR_CALLBACK SocketRecvFrom(PRFileDesc *fd, void *buf, PRInt32 amount,
-PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout)
-{
-	PRInt32 rv;
-	PRUint32 al;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-
-	al = sizeof(PRNetAddr);
-	rv = _PR_MD_RECVFROM(fd, buf, amount, flags, addr, &al, timeout);
-#ifdef _PR_INET6
-	if (addr && (AF_INET6 == addr->raw.family))
-        addr->raw.family = PR_AF_INET6;
-#endif
-	return rv;
-}
-
-static PRInt32 PR_CALLBACK SocketAcceptRead(PRFileDesc *sd, PRFileDesc **nd, 
-PRNetAddr **raddr, void *buf, PRInt32 amount,
-PRIntervalTime timeout)
-{
-	PRInt32 rv;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-	/* The socket must be in blocking mode. */
-	if (sd->secret->nonblocking) {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-	}
-	*nd = NULL;
-
-#if defined(WINNT)
-	{
-	PROsfd newSock;
-	PRNetAddr *raddrCopy;
-
-	if (raddr == NULL) {
-		raddr = &raddrCopy;
-	}
-	rv = _PR_MD_ACCEPT_READ(sd, &newSock, raddr, buf, amount, timeout);
-	if (rv < 0) {
-		rv = -1;
-	} else {
-		/* Successfully accepted and read; create the new PRFileDesc */
-		*nd = PR_AllocFileDesc(newSock, PR_GetTCPMethods());
-		if (*nd == 0) {
-			_PR_MD_CLOSE_SOCKET(newSock);
-			/* PR_AllocFileDesc() has invoked PR_SetError(). */
-			rv = -1;
-		} else {
-			(*nd)->secret->md.io_model_committed = PR_TRUE;
-			(*nd)->secret->md.accepted_socket = PR_TRUE;
-			memcpy(&(*nd)->secret->md.peer_addr, *raddr,
-				PR_NETADDR_SIZE(*raddr));
-#ifdef _PR_INET6
-			if (AF_INET6 == *raddr->raw.family)
-        		*raddr->raw.family = PR_AF_INET6;
-#endif
-		}
-	}
-	}
-#else
-	rv = PR_EmulateAcceptRead(sd, nd, raddr, buf, amount, timeout);
-#endif
-	return rv;
-}
-
-#ifdef WINNT
-PR_IMPLEMENT(PRInt32) PR_NTFast_AcceptRead(PRFileDesc *sd, PRFileDesc **nd, 
-PRNetAddr **raddr, void *buf, PRInt32 amount,
-PRIntervalTime timeout)
-{
-	PRInt32 rv;
-	PROsfd newSock;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-	PRNetAddr *raddrCopy;
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-	*nd = NULL;
-
-	if (raddr == NULL) {
-		raddr = &raddrCopy;
-	}
-	rv = _PR_MD_FAST_ACCEPT_READ(sd, &newSock, raddr, buf, amount, 
-	    timeout, PR_TRUE, NULL, NULL);
-	if (rv < 0) {
-		rv = -1;
-	} else {
-		/* Successfully accepted and read; create the new PRFileDesc */
-		*nd = PR_AllocFileDesc(newSock, PR_GetTCPMethods());
-		if (*nd == 0) {
-			_PR_MD_CLOSE_SOCKET(newSock);
-			/* PR_AllocFileDesc() has invoked PR_SetError(). */
-			rv = -1;
-		} else {
-			(*nd)->secret->md.io_model_committed = PR_TRUE;
-			(*nd)->secret->md.accepted_socket = PR_TRUE;
-			memcpy(&(*nd)->secret->md.peer_addr, *raddr,
-				PR_NETADDR_SIZE(*raddr));
-#ifdef _PR_INET6
-			if (AF_INET6 == *raddr->raw.family)
-        		*raddr->raw.family = PR_AF_INET6;
-#endif
-		}
-	}
-	return rv;
-}
-
-PR_IMPLEMENT(PRInt32) PR_NTFast_AcceptRead_WithTimeoutCallback(
-PRFileDesc *sd, PRFileDesc **nd, 
-PRNetAddr **raddr, void *buf, PRInt32 amount,
-PRIntervalTime timeout,
-_PR_AcceptTimeoutCallback callback,
-void *callbackArg)
-{
-	PRInt32 rv;
-	PROsfd newSock;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-	PRNetAddr *raddrCopy;
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-	*nd = NULL;
-
-	if (raddr == NULL) {
-		raddr = &raddrCopy;
-	}
-	rv = _PR_MD_FAST_ACCEPT_READ(sd, &newSock, raddr, buf, amount,
-	    timeout, PR_TRUE, callback, callbackArg);
-	if (rv < 0) {
-		rv = -1;
-	} else {
-		/* Successfully accepted and read; create the new PRFileDesc */
-		*nd = PR_AllocFileDesc(newSock, PR_GetTCPMethods());
-		if (*nd == 0) {
-			_PR_MD_CLOSE_SOCKET(newSock);
-			/* PR_AllocFileDesc() has invoked PR_SetError(). */
-			rv = -1;
-		} else {
-			(*nd)->secret->md.io_model_committed = PR_TRUE;
-			(*nd)->secret->md.accepted_socket = PR_TRUE;
-			memcpy(&(*nd)->secret->md.peer_addr, *raddr,
-				PR_NETADDR_SIZE(*raddr));
-#ifdef _PR_INET6
-			if (AF_INET6 == *raddr->raw.family)
-        		*raddr->raw.family = PR_AF_INET6;
-#endif
-		}
-	}
-	return rv;
-}
-#endif /* WINNT */
-
-#ifdef WINNT
-PR_IMPLEMENT(void)
-PR_NTFast_UpdateAcceptContext(PRFileDesc *socket, PRFileDesc *acceptSocket)
-{
-	_PR_MD_UPDATE_ACCEPT_CONTEXT(
-		socket->secret->md.osfd, acceptSocket->secret->md.osfd);
-}
-#endif /* WINNT */
-
-static PRInt32 PR_CALLBACK SocketSendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-	PRInt32 rv;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-	if (_PR_IO_PENDING(me)) {
-		PR_SetError(PR_IO_PENDING_ERROR, 0);
-		return -1;
-	}
-	/* The socket must be in blocking mode. */
-	if (sd->secret->nonblocking) {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-	}
-#if defined(WINNT)
-	rv = _PR_MD_SENDFILE(sd, sfd, flags, timeout);
-	if ((rv >= 0) && (flags == PR_TRANSMITFILE_CLOSE_SOCKET)) {
-		/*
-		 * This should be kept the same as SocketClose, except
-		 * that _PR_MD_CLOSE_SOCKET(sd->secret->md.osfd) should
-		 * not be called because the socket will be recycled.
-		 */
-		PR_FreeFileDesc(sd);
-	}
-#else
-	rv = PR_EmulateSendFile(sd, sfd, flags, timeout);
-#endif	/* WINNT */
-
-	return rv;
-}
-
-static PRInt32 PR_CALLBACK SocketTransmitFile(PRFileDesc *sd, PRFileDesc *fd, 
-const void *headers, PRInt32 hlen, PRTransmitFileFlags flags,
-PRIntervalTime timeout)
-{
-	PRSendFileData sfd;
-
-	sfd.fd = fd;
-	sfd.file_offset = 0;
-	sfd.file_nbytes = 0;
-	sfd.header = headers;
-	sfd.hlen = hlen;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-
-	return(SocketSendFile(sd, &sfd, flags, timeout));
-}
-
-static PRStatus PR_CALLBACK SocketGetName(PRFileDesc *fd, PRNetAddr *addr)
-{
-	PRInt32 result;
-	PRUint32 addrlen;
-
-	addrlen = sizeof(PRNetAddr);
-	result = _PR_MD_GETSOCKNAME(fd, addr, &addrlen);
-	if (result < 0) {
-		return PR_FAILURE;
-	}
-#ifdef _PR_INET6
-	if (AF_INET6 == addr->raw.family)
-        addr->raw.family = PR_AF_INET6;
-#endif
-	PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-	PR_ASSERT(IsValidNetAddrLen(addr, addrlen) == PR_TRUE);
-	return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK SocketGetPeerName(PRFileDesc *fd, PRNetAddr *addr)
-{
-	PRInt32 result;
-	PRUint32 addrlen;
-
-	addrlen = sizeof(PRNetAddr);
-	result = _PR_MD_GETPEERNAME(fd, addr, &addrlen);
-	if (result < 0) {
-		return PR_FAILURE;
-	}
-#ifdef _PR_INET6
-	if (AF_INET6 == addr->raw.family)
-        addr->raw.family = PR_AF_INET6;
-#endif
-	PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-	PR_ASSERT(IsValidNetAddrLen(addr, addrlen) == PR_TRUE);
-	return PR_SUCCESS;
-}
-
-static PRInt16 PR_CALLBACK SocketPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-#ifdef XP_MAC
-#pragma unused( fd, in_flags )
-#endif
-    *out_flags = 0;
-    return in_flags;
-}  /* SocketPoll */
-
-static PRIOMethods tcpMethods = {
-	PR_DESC_SOCKET_TCP,
-	SocketClose,
-	SocketRead,
-	SocketWrite,
-	SocketAvailable,
-	SocketAvailable64,
-	SocketSync,
-	(PRSeekFN)_PR_InvalidInt,
-	(PRSeek64FN)_PR_InvalidInt64,
-	(PRFileInfoFN)_PR_InvalidStatus,
-	(PRFileInfo64FN)_PR_InvalidStatus,
-	SocketWritev,
-	SocketConnect,
-	SocketAccept,
-	SocketBind,
-	SocketListen,
-	SocketShutdown,
-	SocketRecv,
-	SocketSend,
-	(PRRecvfromFN)_PR_InvalidInt,
-	(PRSendtoFN)_PR_InvalidInt,
-	SocketPoll,
-	SocketAcceptRead,
-	SocketTransmitFile,
-	SocketGetName,
-	SocketGetPeerName,
-	(PRReservedFN)_PR_InvalidInt,
-	(PRReservedFN)_PR_InvalidInt,
-	_PR_SocketGetSocketOption,
-	_PR_SocketSetSocketOption,
-    SocketSendFile, 
-    SocketConnectContinue,
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRIOMethods udpMethods = {
-	PR_DESC_SOCKET_UDP,
-	SocketClose,
-	SocketRead,
-	SocketWrite,
-	SocketAvailable,
-	SocketAvailable64,
-	SocketSync,
-	(PRSeekFN)_PR_InvalidInt,
-	(PRSeek64FN)_PR_InvalidInt64,
-	(PRFileInfoFN)_PR_InvalidStatus,
-	(PRFileInfo64FN)_PR_InvalidStatus,
-	SocketWritev,
-	SocketConnect,
-	(PRAcceptFN)_PR_InvalidDesc,
-	SocketBind,
-	SocketListen,
-	SocketShutdown,
-	SocketRecv,
-	SocketSend,
-	SocketRecvFrom,
-	SocketSendTo,
-	SocketPoll,
-	(PRAcceptreadFN)_PR_InvalidInt,
-	(PRTransmitfileFN)_PR_InvalidInt,
-	SocketGetName,
-	SocketGetPeerName,
-	(PRReservedFN)_PR_InvalidInt,
-	(PRReservedFN)_PR_InvalidInt,
-	_PR_SocketGetSocketOption,
-	_PR_SocketSetSocketOption,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-
-static PRIOMethods socketpollfdMethods = {
-    (PRDescType) 0,
-    (PRCloseFN)_PR_InvalidStatus,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-	SocketPoll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetTCPMethods()
-{
-	return &tcpMethods;
-}
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetUDPMethods()
-{
-	return &udpMethods;
-}
-
-static const PRIOMethods* PR_GetSocketPollFdMethods()
-{
-    return &socketpollfdMethods;
-}  /* PR_GetSocketPollFdMethods */
-
-#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
-
-#if defined(_PR_INET6_PROBE)
-
-PR_EXTERN(PRBool) _pr_ipv6_is_present;
-
-PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
-{
-	PROsfd osfd;
-
-	osfd = _PR_MD_SOCKET(AF_INET6, SOCK_STREAM, 0);
-	if (osfd != -1) {
-		_PR_MD_CLOSE_SOCKET(osfd);
-		return PR_TRUE;
-	}
-	return PR_FALSE;
-}
-#endif	/* _PR_INET6_PROBE */
-
-#endif
-
-PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
-{
-	PROsfd osfd;
-	PRFileDesc *fd;
-	PRInt32 tmp_domain = domain;
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-	if (PR_AF_INET != domain
-			&& PR_AF_INET6 != domain
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-			&& PR_AF_LOCAL != domain
-#endif
-			) {
-		PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-		return NULL;
-	}
-
-#if defined(_PR_INET6_PROBE)
-	if (PR_AF_INET6 == domain) {
-		if (_pr_ipv6_is_present == PR_FALSE) 
-			domain = AF_INET;
-		else
-			domain = AF_INET6;
-	}
-#elif defined(_PR_INET6)
-	if (PR_AF_INET6 == domain)
-		domain = AF_INET6;
-#else
-	if (PR_AF_INET6 == domain)
-		domain = AF_INET;
-#endif	/* _PR_INET6 */
-	osfd = _PR_MD_SOCKET(domain, type, proto);
-	if (osfd == -1) {
-		return 0;
-	}
-	if (type == SOCK_STREAM)
-		fd = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
-	else
-		fd = PR_AllocFileDesc(osfd, PR_GetUDPMethods());
-	/*
-	 * Make the sockets non-blocking
-	 */
-	if (fd != NULL) {
-		_PR_MD_MAKE_NONBLOCK(fd);
-		_PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
-#if defined(_PR_INET6_PROBE) || !defined(_PR_INET6)
-		/*
-		 * For platforms with no support for IPv6 
-		 * create layered socket for IPv4-mapped IPv6 addresses
-		 */
-		if (PR_AF_INET6 == tmp_domain && PR_AF_INET == domain) {
-			if (PR_FAILURE == _pr_push_ipv6toipv4_layer(fd)) {
-				PR_Close(fd);
-				fd = NULL;
-			}
-		}
-#endif
-	} else
-		_PR_MD_CLOSE_SOCKET(osfd);
-
-	return fd;
-}
-
-PR_IMPLEMENT(PRFileDesc *) PR_NewTCPSocket(void)
-{
-	PRInt32 domain = AF_INET;
-
-	return PR_Socket(domain, SOCK_STREAM, 0);
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_NewUDPSocket(void)
-{
-	PRInt32 domain = AF_INET;
-
-	return PR_Socket(domain, SOCK_DGRAM, 0);
-}
-
-PR_IMPLEMENT(PRFileDesc *) PR_OpenTCPSocket(PRIntn af)
-{
-	return PR_Socket(af, SOCK_STREAM, 0);
-}
-
-PR_IMPLEMENT(PRFileDesc*) PR_OpenUDPSocket(PRIntn af)
-{
-	return PR_Socket(af, SOCK_DGRAM, 0);
-}
-
-PR_IMPLEMENT(PRStatus) PR_NewTCPSocketPair(PRFileDesc *f[])
-{
-#ifdef XP_UNIX
-	PRInt32 rv, osfd[2];
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	rv = _PR_MD_SOCKETPAIR(AF_UNIX, SOCK_STREAM, 0, osfd);
-	if (rv == -1) {
-		return PR_FAILURE;
-	}
-
-	f[0] = PR_AllocFileDesc(osfd[0], PR_GetTCPMethods());
-	if (!f[0]) {
-		_PR_MD_CLOSE_SOCKET(osfd[0]);
-		_PR_MD_CLOSE_SOCKET(osfd[1]);
-		/* PR_AllocFileDesc() has invoked PR_SetError(). */
-		return PR_FAILURE;
-	}
-	f[1] = PR_AllocFileDesc(osfd[1], PR_GetTCPMethods());
-	if (!f[1]) {
-		PR_Close(f[0]);
-		_PR_MD_CLOSE_SOCKET(osfd[1]);
-		/* PR_AllocFileDesc() has invoked PR_SetError(). */
-		return PR_FAILURE;
-	}
-	_PR_MD_MAKE_NONBLOCK(f[0]);
-	_PR_MD_INIT_FD_INHERITABLE(f[0], PR_FALSE);
-	_PR_MD_MAKE_NONBLOCK(f[1]);
-	_PR_MD_INIT_FD_INHERITABLE(f[1], PR_FALSE);
-	return PR_SUCCESS;
-#elif defined(WINNT)
-    /*
-     * A socket pair is often used for interprocess communication,
-     * so we need to make sure neither socket is associated with
-     * the I/O completion port; otherwise it can't be used by a
-     * child process.
-     *
-     * The default implementation below cannot be used for NT
-     * because PR_Accept would have associated the I/O completion
-     * port with the listening and accepted sockets.
-     */
-    SOCKET listenSock;
-    SOCKET osfd[2];
-    struct sockaddr_in selfAddr, peerAddr;
-    int addrLen;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    osfd[0] = osfd[1] = INVALID_SOCKET;
-    listenSock = socket(AF_INET, SOCK_STREAM, 0);
-    if (listenSock == INVALID_SOCKET) {
-        goto failed;
-    }
-    selfAddr.sin_family = AF_INET;
-    selfAddr.sin_port = 0;
-    selfAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); /* BugZilla: 35408 */
-    addrLen = sizeof(selfAddr);
-    if (bind(listenSock, (struct sockaddr *) &selfAddr,
-            addrLen) == SOCKET_ERROR) {
-        goto failed;
-    }
-    if (getsockname(listenSock, (struct sockaddr *) &selfAddr,
-            &addrLen) == SOCKET_ERROR) {
-        goto failed;
-    }
-    if (listen(listenSock, 5) == SOCKET_ERROR) {
-        goto failed;
-    }
-    osfd[0] = socket(AF_INET, SOCK_STREAM, 0);
-    if (osfd[0] == INVALID_SOCKET) {
-        goto failed;
-    }
-    selfAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-    /*
-     * Only a thread is used to do the connect and accept.
-     * I am relying on the fact that connect returns
-     * successfully as soon as the connect request is put
-     * into the listen queue (but before accept is called).
-     * This is the behavior of the BSD socket code.  If
-     * connect does not return until accept is called, we
-     * will need to create another thread to call connect.
-     */
-    if (connect(osfd[0], (struct sockaddr *) &selfAddr,
-            addrLen) == SOCKET_ERROR) {
-        goto failed;
-    }
-    /*
-     * A malicious local process may connect to the listening
-     * socket, so we need to verify that the accepted connection
-     * is made from our own socket osfd[0].
-     */
-    if (getsockname(osfd[0], (struct sockaddr *) &selfAddr,
-            &addrLen) == SOCKET_ERROR) {
-        goto failed;
-    }
-    osfd[1] = accept(listenSock, (struct sockaddr *) &peerAddr, &addrLen);
-    if (osfd[1] == INVALID_SOCKET) {
-        goto failed;
-    }
-    if (peerAddr.sin_port != selfAddr.sin_port) {
-        /* the connection we accepted is not from osfd[0] */
-        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-        goto failed;
-    }
-    closesocket(listenSock);
-
-    f[0] = PR_AllocFileDesc(osfd[0], PR_GetTCPMethods());
-    if (!f[0]) {
-        closesocket(osfd[0]);
-        closesocket(osfd[1]);
-        /* PR_AllocFileDesc() has invoked PR_SetError(). */
-        return PR_FAILURE;
-    }
-    f[1] = PR_AllocFileDesc(osfd[1], PR_GetTCPMethods());
-    if (!f[1]) {
-        PR_Close(f[0]);
-        closesocket(osfd[1]);
-        /* PR_AllocFileDesc() has invoked PR_SetError(). */
-        return PR_FAILURE;
-    }
-    _PR_MD_INIT_FD_INHERITABLE(f[0], PR_FALSE);
-    _PR_MD_INIT_FD_INHERITABLE(f[1], PR_FALSE);
-    return PR_SUCCESS;
-
-failed:
-    if (listenSock != INVALID_SOCKET) {
-        closesocket(listenSock);
-    }
-    if (osfd[0] != INVALID_SOCKET) {
-        closesocket(osfd[0]);
-    }
-    if (osfd[1] != INVALID_SOCKET) {
-        closesocket(osfd[1]);
-    }
-    return PR_FAILURE;
-#else /* not Unix or NT */
-    /*
-     * default implementation
-     */
-    PRFileDesc *listenSock;
-    PRNetAddr selfAddr, peerAddr;
-    PRUint16 port;
-
-    f[0] = f[1] = NULL;
-    listenSock = PR_NewTCPSocket();
-    if (listenSock == NULL) {
-        goto failed;
-    }
-    PR_InitializeNetAddr(PR_IpAddrLoopback, 0, &selfAddr); /* BugZilla: 35408 */
-    if (PR_Bind(listenSock, &selfAddr) == PR_FAILURE) {
-        goto failed;
-    }
-    if (PR_GetSockName(listenSock, &selfAddr) == PR_FAILURE) {
-        goto failed;
-    }
-    port = ntohs(selfAddr.inet.port);
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-        goto failed;
-    }
-    f[0] = PR_NewTCPSocket();
-    if (f[0] == NULL) {
-        goto failed;
-    }
-#ifdef _PR_CONNECT_DOES_NOT_BIND
-    /*
-     * If connect does not implicitly bind the socket (e.g., on
-     * BeOS), we have to bind the socket so that we can get its
-     * port with getsockname later.
-     */
-    PR_InitializeNetAddr(PR_IpAddrLoopback, 0, &selfAddr);
-    if (PR_Bind(f[0], &selfAddr) == PR_FAILURE) {
-        goto failed;
-    }
-#endif
-    PR_InitializeNetAddr(PR_IpAddrLoopback, port, &selfAddr);
-
-    /*
-     * Only a thread is used to do the connect and accept.
-     * I am relying on the fact that PR_Connect returns
-     * successfully as soon as the connect request is put
-     * into the listen queue (but before PR_Accept is called).
-     * This is the behavior of the BSD socket code.  If
-     * connect does not return until accept is called, we
-     * will need to create another thread to call connect.
-     */
-    if (PR_Connect(f[0], &selfAddr, PR_INTERVAL_NO_TIMEOUT)
-            == PR_FAILURE) {
-        goto failed;
-    }
-    /*
-     * A malicious local process may connect to the listening
-     * socket, so we need to verify that the accepted connection
-     * is made from our own socket f[0].
-     */
-    if (PR_GetSockName(f[0], &selfAddr) == PR_FAILURE) {
-        goto failed;
-    }
-    f[1] = PR_Accept(listenSock, &peerAddr, PR_INTERVAL_NO_TIMEOUT);
-    if (f[1] == NULL) {
-        goto failed;
-    }
-    if (peerAddr.inet.port != selfAddr.inet.port) {
-        /* the connection we accepted is not from f[0] */
-        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-        goto failed;
-    }
-    PR_Close(listenSock);
-    return PR_SUCCESS;
-
-failed:
-    if (listenSock) {
-        PR_Close(listenSock);
-    }
-    if (f[0]) {
-        PR_Close(f[0]);
-    }
-    if (f[1]) {
-        PR_Close(f[1]);
-    }
-    return PR_FAILURE;
-#endif
-}
-
-PR_IMPLEMENT(PROsfd)
-PR_FileDesc2NativeHandle(PRFileDesc *fd)
-{
-    if (fd) {
-        fd = PR_GetIdentitiesLayer(fd, PR_NSPR_IO_LAYER);
-    }
-    if (!fd) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-    return fd->secret->md.osfd;
-}
-
-PR_IMPLEMENT(void)
-PR_ChangeFileDescNativeHandle(PRFileDesc *fd, PROsfd handle)
-{
-	if (fd)
-		fd->secret->md.osfd = handle;
-}
-
-/*
-** Select compatibility
-**
-*/
-
-PR_IMPLEMENT(void) PR_FD_ZERO(PR_fd_set *set)
-{
-	memset(set, 0, sizeof(PR_fd_set));
-}
-
-PR_IMPLEMENT(void) PR_FD_SET(PRFileDesc *fh, PR_fd_set *set)
-{
-	PR_ASSERT( set->hsize < PR_MAX_SELECT_DESC );
-
-	set->harray[set->hsize++] = fh;
-}
-
-PR_IMPLEMENT(void) PR_FD_CLR(PRFileDesc *fh, PR_fd_set *set)
-{
-	PRUint32 index, index2;
-
-	for (index = 0; index<set->hsize; index++)
-		if (set->harray[index] == fh) {
-			for (index2=index; index2 < (set->hsize-1); index2++) {
-				set->harray[index2] = set->harray[index2+1];
-			}
-			set->hsize--;
-			break;
-		}
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_ISSET(PRFileDesc *fh, PR_fd_set *set)
-{
-	PRUint32 index;
-	for (index = 0; index<set->hsize; index++)
-		if (set->harray[index] == fh) {
-			return 1;
-		}
-	return 0;
-}
-
-PR_IMPLEMENT(void) PR_FD_NSET(PROsfd fd, PR_fd_set *set)
-{
-	PR_ASSERT( set->nsize < PR_MAX_SELECT_DESC );
-
-	set->narray[set->nsize++] = fd;
-}
-
-PR_IMPLEMENT(void) PR_FD_NCLR(PROsfd fd, PR_fd_set *set)
-{
-	PRUint32 index, index2;
-
-	for (index = 0; index<set->nsize; index++)
-		if (set->narray[index] == fd) {
-			for (index2=index; index2 < (set->nsize-1); index2++) {
-				set->narray[index2] = set->narray[index2+1];
-			}
-			set->nsize--;
-			break;
-		}
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PROsfd fd, PR_fd_set *set)
-{
-	PRUint32 index;
-	for (index = 0; index<set->nsize; index++)
-		if (set->narray[index] == fd) {
-			return 1;
-		}
-	return 0;
-}
-
-
-#if !defined(NEED_SELECT)
-#if !defined(XP_MAC)
-#include "obsolete/probslet.h"
-#else
-#include "probslet.h"
-#endif
-
-#define PD_INCR 20
-
-static PRPollDesc *_pr_setfd(
-    PR_fd_set *set, PRInt16 flags, PRPollDesc *polldesc)
-{
-    PRUintn fsidx, pdidx;
-    PRPollDesc *poll = polldesc;
-
-    if (NULL == set) return poll;
-
-	/* First set the pr file handle osfds */
-	for (fsidx = 0; fsidx < set->hsize; fsidx++)
-	{
-	    for (pdidx = 0; 1; pdidx++)
-        {
-            if ((PRFileDesc*)-1 == poll[pdidx].fd)
-            {
-                /* our vector is full - extend and condition it */
-                poll = (PRPollDesc*)PR_Realloc(
-                    poll, (pdidx + 1 + PD_INCR) * sizeof(PRPollDesc));
-                if (NULL == poll) goto out_of_memory;
-                memset(
-                    poll + pdidx * sizeof(PRPollDesc),
-                    0, PD_INCR * sizeof(PRPollDesc));
-                poll[pdidx + PD_INCR].fd = (PRFileDesc*)-1;
-            }
-            if ((NULL == poll[pdidx].fd)
-            || (poll[pdidx].fd == set->harray[fsidx]))
-            {
-                /* PR_ASSERT(0 == (poll[pdidx].in_flags & flags)); */
-                /* either empty or prevously defined */
-                poll[pdidx].fd = set->harray[fsidx];  /* possibly redundant */
-                poll[pdidx].in_flags |= flags;  /* possibly redundant */
-                break;
-            }
-        }
-	}
-
-#if 0
-	/* Second set the native osfds */
-	for (fsidx = 0; fsidx < set->nsize; fsidx++)
-	{
-	    for (pdidx = 0; ((PRFileDesc*)-1 != poll[pdidx].fd); pdidx++)
-        {
-            if ((PRFileDesc*)-1 == poll[pdidx].fd)
-            {
-                /* our vector is full - extend and condition it */
-                poll = PR_Realloc(
-                    poll, (pdidx + PD_INCR) * sizeof(PRPollDesc));
-                if (NULL == poll) goto out_of_memory;
-                memset(
-                    poll + pdidx * sizeof(PRPollDesc),
-                    0, PD_INCR * sizeof(PRPollDesc));
-                poll[(pdidx + PD_INCR)].fd = (PRFileDesc*)-1;
-            }
-            if ((NULL == poll[pdidx].fd)
-            || (poll[pdidx].fd == set->narray[fsidx]))
-            {
-                /* either empty or prevously defined */
-                poll[pdidx].fd = set->narray[fsidx];
-                PR_ASSERT(0 == (poll[pdidx].in_flags & flags));
-                poll[pdidx].in_flags |= flags;
-                break;
-            }
-        }
-	}
-#endif /* 0 */
-
-	return poll;
-
-out_of_memory:
-    if (NULL != polldesc) PR_DELETE(polldesc);
-    return NULL;
-}  /* _pr_setfd */
-
-#endif /* !defined(NEED_SELECT) */
-
-PR_IMPLEMENT(PRInt32) PR_Select(
-    PRInt32 unused, PR_fd_set *pr_rd, PR_fd_set *pr_wr, 
-    PR_fd_set *pr_ex, PRIntervalTime timeout)
-{
-
-#if !defined(NEED_SELECT)
-    PRInt32 npds = 0; 
-    /*
-    ** Find out how many fds are represented in the three lists.
-    ** Then allocate a polling descriptor for the logical union
-    ** (there can't be any overlapping) and call PR_Poll().
-    */
-
-    PRPollDesc *copy, *poll;
-
-    static PRBool warning = PR_TRUE;
-    if (warning) warning = _PR_Obsolete( "PR_Select()", "PR_Poll()");
-
-    /* try to get an initial guesss at how much space we need */
-    npds = 0;
-    if ((NULL != pr_rd) && ((pr_rd->hsize + pr_rd->nsize - npds) > 0))
-        npds = pr_rd->hsize + pr_rd->nsize;
-    if ((NULL != pr_wr) && ((pr_wr->hsize + pr_wr->nsize - npds) > 0))
-        npds = pr_wr->hsize + pr_wr->nsize;
-    if ((NULL != pr_ex) && ((pr_ex->hsize + pr_ex->nsize - npds) > 0))
-        npds = pr_ex->hsize + pr_ex->nsize;
-
-    if (0 == npds)
-    {
-        PR_Sleep(timeout);
-        return 0;
-    }
-
-    copy = poll = (PRPollDesc*)PR_Calloc(npds + PD_INCR, sizeof(PRPollDesc));
-    if (NULL == poll) goto out_of_memory;
-    poll[npds + PD_INCR - 1].fd = (PRFileDesc*)-1;
-
-    poll = _pr_setfd(pr_rd, PR_POLL_READ, poll);
-    if (NULL == poll) goto out_of_memory;
-    poll = _pr_setfd(pr_wr, PR_POLL_WRITE, poll);
-    if (NULL == poll) goto out_of_memory;
-    poll = _pr_setfd(pr_ex, PR_POLL_EXCEPT, poll);
-    if (NULL == poll) goto out_of_memory;
-    unused = 0;
-    while (NULL != poll[unused].fd && (PRFileDesc*)-1 != poll[unused].fd)
-    {
-        ++unused;
-    }
-
-    PR_ASSERT(unused > 0);
-    npds = PR_Poll(poll, unused, timeout);
-
-    if (npds > 0)
-    {
-        /* Copy the results back into the fd sets */
-        if (NULL != pr_rd) pr_rd->nsize = pr_rd->hsize = 0;
-        if (NULL != pr_wr) pr_wr->nsize = pr_wr->hsize = 0;
-        if (NULL != pr_ex) pr_ex->nsize = pr_ex->hsize = 0;
-        for (copy = &poll[unused - 1]; copy >= poll; --copy)
-        {
-            if (copy->out_flags & PR_POLL_NVAL)
-            {
-                PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-                npds = -1;
-                break;
-            }
-            if (copy->out_flags & PR_POLL_READ)
-                if (NULL != pr_rd) pr_rd->harray[pr_rd->hsize++] = copy->fd;
-            if (copy->out_flags & PR_POLL_WRITE)
-                if (NULL != pr_wr) pr_wr->harray[pr_wr->hsize++] = copy->fd;
-            if (copy->out_flags & PR_POLL_EXCEPT)
-                if (NULL != pr_ex) pr_ex->harray[pr_ex->hsize++] = copy->fd;
-        }
-    }
-    PR_DELETE(poll);
-
-    return npds;
-out_of_memory:
-    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    return -1;    
-
-#endif /* !defined(NEED_SELECT) */
-    
-}
diff --git a/libs/js/nsprpub/pr/src/io/prstdio.c b/libs/js/nsprpub/pr/src/io/prstdio.c
deleted file mode 100644
index 0b7ecd89e8..0000000000
--- a/libs/js/nsprpub/pr/src/io/prstdio.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-/*
-** fprintf to a PRFileDesc
-*/
-PR_IMPLEMENT(PRUint32) PR_fprintf(PRFileDesc* fd, const char *fmt, ...)
-{
-    va_list ap;
-    PRUint32 rv;
-
-    va_start(ap, fmt);
-    rv = PR_vfprintf(fd, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-PR_IMPLEMENT(PRUint32) PR_vfprintf(PRFileDesc* fd, const char *fmt, va_list ap)
-{
-    /* XXX this could be better */
-    PRUint32 rv, len;
-    char* msg = PR_vsmprintf(fmt, ap);
-    len = strlen(msg);
-#ifdef XP_OS2
-    /*
-     * OS/2 really needs a \r for every \n.
-     * In the future we should try to use scatter-gather instead of a
-     * succession of PR_Write.
-     */
-    if (isatty(PR_FileDesc2NativeHandle(fd))) {
-        PRUint32 last = 0, idx;
-        PRInt32 tmp;
-        rv = 0;
-        for (idx = 0; idx < len+1; idx++) {
-            if ((idx - last > 0) && (('\n' == msg[idx]) || (idx == len))) {
-                tmp = PR_Write(fd, msg + last, idx - last);
-                if (tmp >= 0) {
-                    rv += tmp;
-                }
-                last = idx;
-            }
-            /*
-             * if current character is \n, and
-             * previous character isn't \r, and
-             * next character isn't \r
-             */
-            if (('\n' == msg[idx]) &&
-                ((0 == idx) || ('\r' != msg[idx-1])) &&
-                ('\r' != msg[idx+1])) {
-                /* add extra \r */
-                tmp = PR_Write(fd, "\r", 1);
-                if (tmp >= 0) {
-                    rv += tmp;
-                }
-            }
-        }
-    } else {
-        rv = PR_Write(fd, msg, len);
-    }
-#else
-    rv = PR_Write(fd, msg, len);
-#endif
-    PR_DELETE(msg);
-    return rv;
-}
diff --git a/libs/js/nsprpub/pr/src/linking/.cvsignore b/libs/js/nsprpub/pr/src/linking/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/linking/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/linking/Makefile.in b/libs/js/nsprpub/pr/src/linking/Makefile.in
deleted file mode 100644
index 9b82aca205..0000000000
--- a/libs/js/nsprpub/pr/src/linking/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-CSRCS =           \
-	prlink.c   \
-	$(NULL)
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-# On Mac OS X use flat #includes.
-ifeq ($(OS_TARGET),MacOSX)
-INCLUDES    += -I$(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon
-endif
-
-DEFINES += -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/linking/prlink.c b/libs/js/nsprpub/pr/src/linking/prlink.c
deleted file mode 100644
index e6e7d64c23..0000000000
--- a/libs/js/nsprpub/pr/src/linking/prlink.c
+++ /dev/null
@@ -1,1742 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): Steve Streeter (Hewlett-Packard Company)
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "primpl.h"
-
-#include <string.h>
-
-#ifdef XP_BEOS
-#include <image.h>
-#endif
-
-#ifdef XP_MACOSX
-#include <CodeFragments.h>
-#include <TextUtils.h>
-#include <Types.h>
-#include <Aliases.h>
-#include <CFURL.h>
-#include <CFBundle.h>
-#include <CFString.h>
-#include <CFDictionary.h>
-#include <CFData.h>
-#endif
-
-#ifdef XP_UNIX
-#ifdef USE_DLFCN
-#include <dlfcn.h>
-/* Define these on systems that don't have them. */
-#ifndef RTLD_NOW
-#define RTLD_NOW 0
-#endif
-#ifndef RTLD_LAZY
-#define RTLD_LAZY RTLD_NOW
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-#ifndef RTLD_LOCAL
-#define RTLD_LOCAL 0
-#endif
-#ifdef AIX
-#include <sys/ldr.h>
-#endif
-#ifdef OSF1
-#include <loader.h>
-#include <rld_interface.h>
-#endif
-#elif defined(USE_HPSHL)
-#include <dl.h>
-#elif defined(USE_MACH_DYLD)
-#include <mach-o/dyld.h>
-#endif
-#endif /* XP_UNIX */
-
-#define _PR_DEFAULT_LD_FLAGS PR_LD_LAZY
-
-#ifdef VMS
-/* These are all require for the PR_GetLibraryFilePathname implementation */
-#include <descrip.h>
-#include <dvidef.h>
-#include <fibdef.h>
-#include <iodef.h>
-#include <lib$routines.h>
-#include <ssdef.h>
-#include <starlet.h>
-#include <stsdef.h>
-#include <unixlib.h>
-
-#pragma __nostandard 
-#pragma __member_alignment __save
-#pragma __nomember_alignment
-#ifdef __INITIAL_POINTER_SIZE
-#pragma __required_pointer_size __save 
-#pragma __required_pointer_size __short
-#endif
- 
-typedef struct _imcb {
-    struct _imcb *imcb$l_flink;         
-    struct _imcb *imcb$l_blink;         
-    unsigned short int imcb$w_size;     
-    unsigned char imcb$b_type;          
-    char imcb$b_resv_1;                 
-    unsigned char imcb$b_access_mode;   
-    unsigned char imcb$b_act_code;      
-    unsigned short int imcb$w_chan;     
-    unsigned int imcb$l_flags;		
-    char imcb$t_image_name [40];        
-    unsigned int imcb$l_symvec_size; 
-    unsigned __int64 imcb$q_ident;
-    void *imcb$l_starting_address;
-    void *imcb$l_end_address;
-} IMCB;
- 
-#pragma __member_alignment __restore
-#ifdef __INITIAL_POINTER_SIZE 
-#pragma __required_pointer_size __restore
-#endif
-#pragma __standard
- 
-typedef struct {
-    short   buflen;
-    short   itmcode;
-    void    *buffer;
-    void    *retlen;
-} ITMLST;
-
-typedef struct {
-    short cond;
-    short count;
-    int   rest;
-} IOSB;
-
-typedef unsigned long int ulong_t;
-
-struct _imcb *IAC$GL_IMAGE_LIST = NULL;
-
-#define MAX_DEVNAM 64
-#define MAX_FILNAM 255
-#endif  /* VMS */
-
-/*
- * On these platforms, symbols have a leading '_'.
- */
-#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
-    || defined(WIN16) || defined(XP_OS2) \
-    || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
-#define NEED_LEADING_UNDERSCORE
-#endif
-
-/************************************************************************/
-
-struct PRLibrary {
-    char*                       name;  /* Our own copy of the name string */
-    PRLibrary*                  next;
-    int                         refCount;
-    const PRStaticLinkTable*    staticTable;
-
-#ifdef XP_PC
-#ifdef XP_OS2
-    HMODULE                     dlh;
-#else
-    HINSTANCE                   dlh;
-#endif
-#endif
-
-#ifdef XP_MACOSX
-    CFragConnectionID           connection;
-    CFBundleRef                 bundle;
-    Ptr                         main;
-    CFMutableDictionaryRef      wrappers;
-    const struct mach_header*   image;
-#endif
-
-#ifdef XP_UNIX
-#if defined(USE_HPSHL)
-    shl_t                       dlh;
-#elif defined(USE_MACH_DYLD)
-    NSModule                    dlh;
-#else
-    void*                       dlh;
-#endif 
-#endif 
-
-#ifdef XP_BEOS
-    void*                       dlh;
-    void*                       stub_dlh;
-#endif
-};
-
-static PRLibrary *pr_loadmap;
-static PRLibrary *pr_exe_loadmap;
-static PRMonitor *pr_linker_lock;
-static char* _pr_currentLibPath = NULL;
-
-static PRLibrary *pr_LoadLibraryByPathname(const char *name, PRIntn flags);
-
-/************************************************************************/
-
-#if !defined(USE_DLFCN) && !defined(HAVE_STRERROR)
-static char* errStrBuf = NULL;
-#define ERR_STR_BUF_LENGTH    20
-static char* errno_string(PRIntn oserr)
-{
-    if (errStrBuf == NULL)
-        errStrBuf = PR_MALLOC(ERR_STR_BUF_LENGTH);
-    PR_snprintf(errStrBuf, ERR_STR_BUF_LENGTH, "error %d", oserr);
-    return errStrBuf;
-}
-#endif
-
-static void DLLErrorInternal(PRIntn oserr)
-/*
-** This whole function, and most of the code in this file, are run
-** with a big hairy lock wrapped around it. Not the best of situations,
-** but will eventually come up with the right answer.
-*/
-{
-    const char *error = NULL;
-#ifdef USE_DLFCN
-    error = dlerror();  /* $$$ That'll be wrong some of the time - AOF */
-#elif defined(HAVE_STRERROR)
-    error = strerror(oserr);  /* this should be okay */
-#else
-    error = errno_string(oserr);
-#endif
-    if (NULL != error)
-        PR_SetErrorText(strlen(error), error);
-}  /* DLLErrorInternal */
-
-void _PR_InitLinker(void)
-{
-    PRLibrary *lm = NULL;
-#if defined(XP_UNIX)
-    void *h;
-#endif
-
-    if (!pr_linker_lock) {
-        pr_linker_lock = PR_NewNamedMonitor("linker-lock");
-    }
-    PR_EnterMonitor(pr_linker_lock);
-
-#if defined(XP_PC)
-    lm = PR_NEWZAP(PRLibrary);
-    lm->name = strdup("Executable");
-        /* 
-        ** In WIN32, GetProcAddress(...) expects a module handle in order to
-        ** get exported symbols from the executable...
-        **
-        ** However, in WIN16 this is accomplished by passing NULL to 
-        ** GetProcAddress(...)
-        */
-#if defined(_WIN32)
-        lm->dlh = GetModuleHandle(NULL);
-#else
-        lm->dlh = (HINSTANCE)NULL;
-#endif /* ! _WIN32 */
-
-    lm->refCount    = 1;
-    lm->staticTable = NULL;
-    pr_exe_loadmap  = lm;
-    pr_loadmap      = lm;
-
-#elif defined(XP_UNIX)
-#ifdef HAVE_DLL
-#ifdef USE_DLFCN
-    h = dlopen(0, RTLD_LAZY);
-    if (!h) {
-        char *error;
-        
-        DLLErrorInternal(_MD_ERRNO());
-        error = (char*)PR_MALLOC(PR_GetErrorTextLength());
-        (void) PR_GetErrorText(error);
-        fprintf(stderr, "failed to initialize shared libraries [%s]\n",
-            error);
-        PR_DELETE(error);
-        abort();/* XXX */
-    }
-#elif defined(USE_HPSHL)
-    h = NULL;
-    /* don't abort with this NULL */
-#elif defined(USE_MACH_DYLD)
-    h = NULL; /* XXXX  toshok */
-#else
-#error no dll strategy
-#endif /* USE_DLFCN */
-
-    lm = PR_NEWZAP(PRLibrary);
-    if (lm) {
-        lm->name = strdup("a.out");
-        lm->refCount = 1;
-        lm->dlh = h;
-        lm->staticTable = NULL;
-    }
-    pr_exe_loadmap = lm;
-    pr_loadmap = lm;
-#endif /* HAVE_DLL */
-#endif /* XP_UNIX */
-
-    if (lm) {
-        PR_LOG(_pr_linker_lm, PR_LOG_MIN,
-            ("Loaded library %s (init)", lm->name));
-    }
-
-    PR_ExitMonitor(pr_linker_lock);
-}
-
-#if defined(WIN16)
-/*
- * _PR_ShutdownLinker unloads all dlls loaded by the application via
- * calls to PR_LoadLibrary
- */
-void _PR_ShutdownLinker(void)
-{
-    PR_EnterMonitor(pr_linker_lock);
-
-    while (pr_loadmap) {
-    if (pr_loadmap->refCount > 1) {
-#ifdef DEBUG
-        fprintf(stderr, "# Forcing library to unload: %s (%d outstanding references)\n",
-            pr_loadmap->name, pr_loadmap->refCount);
-#endif
-        pr_loadmap->refCount = 1;
-    }
-    PR_UnloadLibrary(pr_loadmap);
-    }
-    
-    PR_ExitMonitor(pr_linker_lock);
-
-    PR_DestroyMonitor(pr_linker_lock);
-    pr_linker_lock = NULL;
-}
-#else
-/*
- * _PR_ShutdownLinker was originally only used on WIN16 (see above),
- * but I think it should also be used on other platforms.  However,
- * I disagree with the original implementation's unloading the dlls
- * for the application.  Any dlls that still remain on the pr_loadmap
- * list when NSPR shuts down are application programming errors.  The
- * only exception is pr_exe_loadmap, which was added to the list by
- * NSPR and hence should be cleaned up by NSPR.
- */
-void _PR_ShutdownLinker(void)
-{
-    /* FIXME: pr_exe_loadmap should be destroyed. */
-    
-    PR_DestroyMonitor(pr_linker_lock);
-    pr_linker_lock = NULL;
-
-    if (_pr_currentLibPath) {
-        free(_pr_currentLibPath);
-        _pr_currentLibPath = NULL;
-    }
-
-#if !defined(USE_DLFCN) && !defined(HAVE_STRERROR)
-    PR_DELETE(errStrBuf);
-#endif
-}
-#endif
-
-/******************************************************************************/
-
-PR_IMPLEMENT(PRStatus) PR_SetLibraryPath(const char *path)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    PR_EnterMonitor(pr_linker_lock);
-    if (_pr_currentLibPath) {
-        free(_pr_currentLibPath);
-    }
-    if (path) {
-        _pr_currentLibPath = strdup(path);
-        if (!_pr_currentLibPath) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        rv = PR_FAILURE;
-        }
-    } else {
-        _pr_currentLibPath = 0;
-    }
-    PR_ExitMonitor(pr_linker_lock);
-    return rv;
-}
-
-/*
-** Return the library path for finding shared libraries.
-*/
-PR_IMPLEMENT(char *) 
-PR_GetLibraryPath(void)
-{
-    char *ev;
-    char *copy = NULL;  /* a copy of _pr_currentLibPath */
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    PR_EnterMonitor(pr_linker_lock);
-    if (_pr_currentLibPath != NULL) {
-        goto exit;
-    }
-
-    /* initialize pr_currentLibPath */
-
-#ifdef XP_PC
-    ev = getenv("LD_LIBRARY_PATH");
-    if (!ev) {
-    ev = ".;\\lib";
-    }
-    ev = strdup(ev);
-#endif
-
-#if defined(XP_UNIX) || defined(XP_BEOS)
-#if defined(USE_DLFCN) || defined(USE_MACH_DYLD) || defined(XP_BEOS)
-    {
-    char *p=NULL;
-    int len;
-
-#ifdef XP_BEOS
-    ev = getenv("LIBRARY_PATH");
-    if (!ev) {
-        ev = "%A/lib:/boot/home/config/lib:/boot/beos/system/lib";
-    }
-#else
-    ev = getenv("LD_LIBRARY_PATH");
-    if (!ev) {
-        ev = "/usr/lib:/lib";
-    }
-#endif
-    len = strlen(ev) + 1;        /* +1 for the null */
-
-    p = (char*) malloc(len);
-    if (p) {
-        strcpy(p, ev);
-    }   /* if (p)  */
-    ev = p;
-    PR_LOG(_pr_io_lm, PR_LOG_NOTICE, ("linker path '%s'", ev));
-
-    }
-#else
-    /* AFAIK there isn't a library path with the HP SHL interface --Rob */
-    ev = strdup("");
-#endif
-#endif
-
-    /*
-     * If ev is NULL, we have run out of memory
-     */
-    _pr_currentLibPath = ev;
-
-  exit:
-    if (_pr_currentLibPath) {
-        copy = strdup(_pr_currentLibPath);
-    }
-    PR_ExitMonitor(pr_linker_lock);
-    if (!copy) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    }
-    return copy;
-}
-
-/*
-** Build library name from path, lib and extensions
-*/
-PR_IMPLEMENT(char*) 
-PR_GetLibraryName(const char *path, const char *lib)
-{
-    char *fullname;
-
-#ifdef XP_PC
-    if (strstr(lib, PR_DLL_SUFFIX) == NULL)
-    {
-        if (path) {
-            fullname = PR_smprintf("%s\\%s%s", path, lib, PR_DLL_SUFFIX);
-        } else {
-            fullname = PR_smprintf("%s%s", lib, PR_DLL_SUFFIX);
-        }
-    } else {
-        if (path) {
-            fullname = PR_smprintf("%s\\%s", path, lib);
-        } else {
-            fullname = PR_smprintf("%s", lib);
-        }
-    }
-#endif /* XP_PC */
-#if defined(XP_UNIX) || defined(XP_BEOS)
-    if (strstr(lib, PR_DLL_SUFFIX) == NULL)
-    {
-        if (path) {
-            fullname = PR_smprintf("%s/lib%s%s", path, lib, PR_DLL_SUFFIX);
-        } else {
-            fullname = PR_smprintf("lib%s%s", lib, PR_DLL_SUFFIX);
-        }
-    } else {
-        if (path) {
-            fullname = PR_smprintf("%s/%s", path, lib);
-        } else {
-            fullname = PR_smprintf("%s", lib);
-        }
-    }
-#endif /* XP_UNIX || XP_BEOS */
-    return fullname;
-}
-
-/*
-** Free the memory allocated, for the caller, by PR_GetLibraryName
-*/
-PR_IMPLEMENT(void) 
-PR_FreeLibraryName(char *mem)
-{
-    PR_smprintf_free(mem);
-}
-
-static PRLibrary* 
-pr_UnlockedFindLibrary(const char *name)
-{
-    PRLibrary* lm = pr_loadmap;
-    const char* np = strrchr(name, PR_DIRECTORY_SEPARATOR);
-    np = np ? np + 1 : name;
-    while (lm) {
-    const char* cp = strrchr(lm->name, PR_DIRECTORY_SEPARATOR);
-    cp = cp ? cp + 1 : lm->name;
-#ifdef WIN32
-        /* Windows DLL names are case insensitive... */
-    if (strcmpi(np, cp) == 0) 
-#elif defined(XP_OS2)
-    if (stricmp(np, cp) == 0)
-#else
-    if (strcmp(np, cp)  == 0) 
-#endif
-    {
-        /* found */
-        lm->refCount++;
-        PR_LOG(_pr_linker_lm, PR_LOG_MIN,
-           ("%s incr => %d (find lib)",
-            lm->name, lm->refCount));
-        return lm;
-    }
-    lm = lm->next;
-    }
-    return NULL;
-}
-
-PR_IMPLEMENT(PRLibrary*)
-PR_LoadLibraryWithFlags(PRLibSpec libSpec, PRIntn flags)
-{
-    if (flags == 0) {
-        flags = _PR_DEFAULT_LD_FLAGS;
-    }
-    switch (libSpec.type) {
-        case PR_LibSpec_Pathname:
-            return pr_LoadLibraryByPathname(libSpec.value.pathname, flags);
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return NULL;
-    }
-}
-            
-PR_IMPLEMENT(PRLibrary*) 
-PR_LoadLibrary(const char *name)
-{
-    PRLibSpec libSpec;
-
-    libSpec.type = PR_LibSpec_Pathname;
-    libSpec.value.pathname = name;
-    return PR_LoadLibraryWithFlags(libSpec, 0);
-}
-
-#if defined(USE_MACH_DYLD)
-static NSModule
-pr_LoadMachDyldModule(const char *name)
-{
-    NSObjectFileImage ofi;
-    NSModule h = NULL;
-    if (NSCreateObjectFileImageFromFile(name, &ofi)
-            == NSObjectFileImageSuccess) {
-        h = NSLinkModule(ofi, name, NSLINKMODULE_OPTION_PRIVATE
-                         | NSLINKMODULE_OPTION_RETURN_ON_ERROR);
-        /*
-         * TODO: If NSLinkModule fails, use NSLinkEditError to retrieve
-         * error information.
-         */
-        if (NSDestroyObjectFileImage(ofi) == FALSE) {
-            if (h) {
-                (void)NSUnLinkModule(h, NSUNLINKMODULE_OPTION_NONE);
-                h = NULL;
-            }
-        }
-    }
-    return h;
-}
-#endif
-
-#ifdef XP_MACOSX
-
-/*
-** macLibraryLoadProc is a function definition for a Mac shared library
-** loading method. The "name" param is the same full or partial pathname
-** that was passed to pr_LoadLibraryByPathName. The function must fill
-** in the fields of "lm" which apply to its library type. Returns
-** PR_SUCCESS if successful.
-*/
-
-typedef PRStatus (*macLibraryLoadProc)(const char *name, PRLibrary *lm);
-
-#ifdef __ppc__
-
-/*
-** CFM and its TVectors only exist on PowerPC.  Other OS X architectures
-** only use Mach-O as a native binary format.
-*/
-
-static void* TV2FP(CFMutableDictionaryRef dict, const char* name, void *tvp)
-{
-    static uint32 glue[6] = { 0x3D800000, 0x618C0000, 0x800C0000, 0x804C0004, 0x7C0903A6, 0x4E800420 };
-    uint32* newGlue = NULL;
-
-    if (tvp != NULL) {
-        CFStringRef nameRef = CFStringCreateWithCString(NULL, name, kCFStringEncodingASCII);
-        if (nameRef) {
-            CFMutableDataRef glueData = (CFMutableDataRef) CFDictionaryGetValue(dict, nameRef);
-            if (glueData == NULL) {
-                glueData = CFDataCreateMutable(NULL, sizeof(glue));
-                if (glueData != NULL) {
-                    newGlue = (uint32*) CFDataGetMutableBytePtr(glueData);
-                    memcpy(newGlue, glue, sizeof(glue));
-                    newGlue[0] |= ((UInt32)tvp >> 16);
-                    newGlue[1] |= ((UInt32)tvp & 0xFFFF);
-                    MakeDataExecutable(newGlue, sizeof(glue));
-                    CFDictionaryAddValue(dict, nameRef, glueData);
-                    CFRelease(glueData);
-
-                    PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("TV2FP: created wrapper for CFM function %s().", name));
-                }
-            } else {
-                PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("TV2FP: found wrapper for CFM function %s().", name));
-
-                newGlue = (uint32*) CFDataGetMutableBytePtr(glueData);
-            }
-            CFRelease(nameRef);
-        }
-    }
-    
-    return newGlue;
-}
-
-static PRStatus
-pr_LoadViaCFM(const char *name, PRLibrary *lm)
-{
-    OSErr err;
-    Str255 errName;
-    FSRef ref;
-    FSSpec fileSpec;
-    Boolean tempUnusedBool;
-
-    /*
-     * Make an FSSpec from the path name and call GetDiskFragment.
-     */
-
-    /* Use direct conversion of POSIX path to FSRef to FSSpec. */
-    err = FSPathMakeRef((const UInt8*)name, &ref, NULL);
-    if (err != noErr)
-        return PR_FAILURE;
-    err = FSGetCatalogInfo(&ref, kFSCatInfoNone, NULL, NULL,
-                           &fileSpec, NULL);
-    if (err != noErr)
-        return PR_FAILURE;
-
-    /* Resolve an alias if this was one */
-    err = ResolveAliasFile(&fileSpec, true, &tempUnusedBool,
-                           &tempUnusedBool);
-    if (err != noErr)
-        return PR_FAILURE;
-
-    /* Finally, try to load the library */
-    err = GetDiskFragment(&fileSpec, 0, kCFragGoesToEOF, fileSpec.name,
-                          kLoadCFrag, &lm->connection, &lm->main, errName);
-
-    if (err == noErr && lm->connection) {
-        /*
-         * if we're a mach-o binary, need to wrap all CFM function
-         * pointers. need a hash-table of already seen function
-         * pointers, etc.
-         */
-        lm->wrappers = CFDictionaryCreateMutable(NULL, 16,
-                       &kCFTypeDictionaryKeyCallBacks,
-                       &kCFTypeDictionaryValueCallBacks);
-        if (lm->wrappers) {
-            lm->main = TV2FP(lm->wrappers, "main", lm->main);
-        } else
-            err = memFullErr;
-    }
-    return (err == noErr) ? PR_SUCCESS : PR_FAILURE;
-}
-#endif /* __ppc__ */
-
-/*
-** Creates a CFBundleRef if the pathname refers to a Mac OS X bundle
-** directory. The caller is responsible for calling CFRelease() to
-** deallocate.
-*/
-
-static PRStatus
-pr_LoadCFBundle(const char *name, PRLibrary *lm)
-{
-    CFURLRef bundleURL;
-    CFBundleRef bundle = NULL;
-    char pathBuf[PATH_MAX];
-    const char *resolvedPath;
-    CFStringRef pathRef;
-
-    /* Takes care of relative paths and symlinks */
-    resolvedPath = realpath(name, pathBuf);
-    if (!resolvedPath)
-        return PR_FAILURE;
-        
-    pathRef = CFStringCreateWithCString(NULL, pathBuf, kCFStringEncodingUTF8);
-    if (pathRef) {
-        bundleURL = CFURLCreateWithFileSystemPath(NULL, pathRef,
-                                                  kCFURLPOSIXPathStyle, true);
-        if (bundleURL) {
-            bundle = CFBundleCreate(NULL, bundleURL);
-            CFRelease(bundleURL);
-        }
-        CFRelease(pathRef);
-    }
-
-    lm->bundle = bundle;
-    return (bundle != NULL) ? PR_SUCCESS : PR_FAILURE;
-}
-
-static PRStatus
-pr_LoadViaDyld(const char *name, PRLibrary *lm)
-{
-    lm->dlh = pr_LoadMachDyldModule(name);
-    if (lm->dlh == NULL) {
-        lm->image = NSAddImage(name, NSADDIMAGE_OPTION_RETURN_ON_ERROR
-                               | NSADDIMAGE_OPTION_WITH_SEARCHING);
-        /*
-         * TODO: If NSAddImage fails, use NSLinkEditError to retrieve
-         * error information.
-         */
-    }
-    return (lm->dlh != NULL || lm->image != NULL) ? PR_SUCCESS : PR_FAILURE;
-}
-
-#endif /* XP_MACOSX */
-
-/*
-** Dynamically load a library. Only load libraries once, so scan the load
-** map first.
-*/
-static PRLibrary*
-pr_LoadLibraryByPathname(const char *name, PRIntn flags)
-{
-    PRLibrary *lm;
-    PRLibrary* result;
-    PRInt32 oserr;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    /* See if library is already loaded */
-    PR_EnterMonitor(pr_linker_lock);
-
-    result = pr_UnlockedFindLibrary(name);
-    if (result != NULL) goto unlock;
-
-    lm = PR_NEWZAP(PRLibrary);
-    if (lm == NULL) {
-        oserr = _MD_ERRNO();
-        goto unlock;
-    }
-    lm->staticTable = NULL;
-
-#ifdef XP_OS2  /* Why isn't all this stuff in MD code?! */
-    {
-        HMODULE h;
-        UCHAR pszError[_MAX_PATH];
-        ULONG ulRc = NO_ERROR;
-
-          ulRc = DosLoadModule(pszError, _MAX_PATH, (PSZ) name, &h);
-          if (ulRc != NO_ERROR) {
-              oserr = ulRc;
-              PR_DELETE(lm);
-              goto unlock;
-          }
-          lm->name = strdup(name);
-          lm->dlh  = h;
-          lm->next = pr_loadmap;
-          pr_loadmap = lm;
-    }
-#endif /* XP_OS2 */
-
-#if defined(WIN32) || defined(WIN16)
-    {
-    HINSTANCE h;
-
-    h = LoadLibrary(name);
-    if (h < (HINSTANCE)HINSTANCE_ERROR) {
-        oserr = _MD_ERRNO();
-        PR_DELETE(lm);
-        goto unlock;
-    }
-    lm->name = strdup(name);
-    lm->dlh = h;
-    lm->next = pr_loadmap;
-    pr_loadmap = lm;
-    }
-#endif /* WIN32 || WIN16 */
-
-#ifdef XP_MACOSX
-    {
-    int     i;
-    PRStatus status;
-
-    static const macLibraryLoadProc loadProcs[] = {
-#ifdef __ppc__
-        pr_LoadViaDyld, pr_LoadCFBundle, pr_LoadViaCFM
-#else  /* __ppc__ */
-        pr_LoadViaDyld, pr_LoadCFBundle
-#endif /* __ppc__ */
-    };
-
-    for (i = 0; i < sizeof(loadProcs) / sizeof(loadProcs[0]); i++) {
-        if ((status = loadProcs[i](name, lm)) == PR_SUCCESS)
-            break;
-    }
-    if (status != PR_SUCCESS) {
-        oserr = cfragNoLibraryErr;
-        PR_DELETE(lm);
-        goto unlock;        
-    }
-    lm->name = strdup(name);
-    lm->next = pr_loadmap;
-    pr_loadmap = lm;
-    }
-#endif
-
-#if defined(XP_UNIX) && !defined(XP_MACOSX)
-#ifdef HAVE_DLL
-    {
-#if defined(USE_DLFCN)
-#ifdef NTO
-    /* Neutrino needs RTLD_GROUP to load Netscape plugins. (bug 71179) */
-    int dl_flags = RTLD_GROUP;
-#elif defined(AIX)
-    /* AIX needs RTLD_MEMBER to load an archive member.  (bug 228899) */
-    int dl_flags = RTLD_MEMBER;
-#else
-    int dl_flags = 0;
-#endif
-    void *h;
-
-    if (flags & PR_LD_LAZY) {
-        dl_flags |= RTLD_LAZY;
-    }
-    if (flags & PR_LD_NOW) {
-        dl_flags |= RTLD_NOW;
-    }
-    if (flags & PR_LD_GLOBAL) {
-        dl_flags |= RTLD_GLOBAL;
-    }
-    if (flags & PR_LD_LOCAL) {
-        dl_flags |= RTLD_LOCAL;
-    }
-    h = dlopen(name, dl_flags);
-#elif defined(USE_HPSHL)
-    int shl_flags = 0;
-    shl_t h;
-
-    /*
-     * Use the DYNAMIC_PATH flag only if 'name' is a plain file
-     * name (containing no directory) to match the behavior of
-     * dlopen().
-     */
-    if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
-        shl_flags |= DYNAMIC_PATH;
-    }
-    if (flags & PR_LD_LAZY) {
-        shl_flags |= BIND_DEFERRED;
-    }
-    if (flags & PR_LD_NOW) {
-        shl_flags |= BIND_IMMEDIATE;
-    }
-    /* No equivalent of PR_LD_GLOBAL and PR_LD_LOCAL. */
-    h = shl_load(name, shl_flags, 0L);
-#elif defined(USE_MACH_DYLD)
-    NSModule h = pr_LoadMachDyldModule(name);
-#else
-#error Configuration error
-#endif
-    if (!h) {
-        oserr = _MD_ERRNO();
-        PR_DELETE(lm);
-        goto unlock;
-    }
-    lm->name = strdup(name);
-    lm->dlh = h;
-    lm->next = pr_loadmap;
-    pr_loadmap = lm;
-    }
-#endif /* HAVE_DLL */
-#endif /* XP_UNIX */
-
-    lm->refCount = 1;
-
-#ifdef XP_BEOS
-    {
-        image_info info;
-        int32 cookie = 0;
-        image_id imageid = B_ERROR;
-        image_id stubid = B_ERROR;
-        PRLibrary *p;
-
-        for (p = pr_loadmap; p != NULL; p = p->next) {
-            /* hopefully, our caller will always use the same string
-               to refer to the same library */
-            if (strcmp(name, p->name) == 0) {
-                /* we've already loaded this library */
-                imageid = info.id;
-                lm->refCount++;
-                break;
-            }
-        }
-
-        if(imageid == B_ERROR) {
-            /* it appears the library isn't yet loaded - load it now */
-            char stubName [B_PATH_NAME_LENGTH + 1];
-
-            /* the following is a work-around to a "bug" in the beos -
-               the beos system loader allows only 32M (system-wide)
-               to be used by code loaded as "add-ons" (code loaded
-               through the 'load_add_on()' system call, which includes
-               mozilla components), but allows 256M to be used by
-               shared libraries.
-               
-               unfortunately, mozilla is too large to fit into the
-               "add-on" space, so we must trick the loader into
-               loading some of the components as shared libraries.  this
-               is accomplished by creating a "stub" add-on (an empty
-               shared object), and linking it with the component
-               (the actual .so file generated by the build process,
-               without any modifications).  when this stub is loaded
-               by load_add_on(), the loader will automatically load the
-               component into the shared library space.
-            */
-
-            strcpy(stubName, name);
-            strcat(stubName, ".stub");
-
-            /* first, attempt to load the stub (thereby loading the
-               component as a shared library */
-            if ((stubid = load_add_on(stubName)) > B_ERROR) {
-                /* the stub was loaded successfully. */
-                imageid = B_FILE_NOT_FOUND;
-
-                cookie = 0;
-                while (get_next_image_info(0, &cookie, &info) == B_OK) {
-                    const char *endOfSystemName = strrchr(info.name, '/');
-                    const char *endOfPassedName = strrchr(name, '/');
-                    if( 0 == endOfSystemName ) 
-                        endOfSystemName = info.name;
-                    else
-                        endOfSystemName++;
-                    if( 0 == endOfPassedName )
-                        endOfPassedName = name;
-                    else
-                        endOfPassedName++;
-                    if (strcmp(endOfSystemName, endOfPassedName) == 0) {
-                        /* this is the actual component - remember it */
-                        imageid = info.id;
-                        break;
-                    }
-                }
-
-            } else {
-                /* we failed to load the "stub" - try to load the
-                   component directly as an add-on */
-                stubid = B_ERROR;
-                imageid = load_add_on(name);
-            }
-        }
-
-        if (imageid <= B_ERROR) {
-            oserr = imageid;
-            PR_DELETE( lm );
-            goto unlock;
-        }
-        lm->name = strdup(name);
-        lm->dlh = (void*)imageid;
-        lm->stub_dlh = (void*)stubid;
-        lm->next = pr_loadmap;
-        pr_loadmap = lm;
-    }
-#endif
-
-    result = lm;    /* success */
-    PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Loaded library %s (load lib)", lm->name));
-
-  unlock:
-    if (result == NULL) {
-        PR_SetError(PR_LOAD_LIBRARY_ERROR, oserr);
-        DLLErrorInternal(oserr);  /* sets error text */
-    }
-    PR_ExitMonitor(pr_linker_lock);
-    return result;
-}
-
-/*
-** Unload a shared library which was loaded via PR_LoadLibrary
-*/
-PR_IMPLEMENT(PRStatus) 
-PR_UnloadLibrary(PRLibrary *lib)
-{
-    int result = 0;
-    PRStatus status = PR_SUCCESS;
-
-    if ((lib == 0) || (lib->refCount <= 0)) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    PR_EnterMonitor(pr_linker_lock);
-    if (--lib->refCount > 0) {
-    PR_LOG(_pr_linker_lm, PR_LOG_MIN,
-           ("%s decr => %d",
-        lib->name, lib->refCount));
-    goto done;
-    }
-
-#ifdef XP_BEOS
-    if(((image_id)lib->stub_dlh) == B_ERROR)
-        unload_add_on( (image_id) lib->dlh );
-    else
-        unload_add_on( (image_id) lib->stub_dlh);
-#endif
-
-#ifdef XP_UNIX
-#ifdef HAVE_DLL
-#ifdef USE_DLFCN
-    result = dlclose(lib->dlh);
-#elif defined(USE_HPSHL)
-    result = shl_unload(lib->dlh);
-#elif defined(USE_MACH_DYLD)
-    result = NSUnLinkModule(lib->dlh, NSUNLINKMODULE_OPTION_NONE) ? 0 : -1;
-#else
-#error Configuration error
-#endif
-#endif /* HAVE_DLL */
-#endif /* XP_UNIX */
-#ifdef XP_PC
-    if (lib->dlh) {
-        FreeLibrary((HINSTANCE)(lib->dlh));
-        lib->dlh = (HINSTANCE)NULL;
-    }
-#endif  /* XP_PC */
-
-#ifdef XP_MACOSX
-    /* Close the connection */
-    if (lib->connection)
-        CloseConnection(&(lib->connection));
-    if (lib->bundle)
-        CFRelease(lib->bundle);
-    if (lib->wrappers)
-        CFRelease(lib->wrappers);
-    /* No way to unload an image (lib->image) */
-#endif
-
-    /* unlink from library search list */
-    if (pr_loadmap == lib)
-        pr_loadmap = pr_loadmap->next;
-    else if (pr_loadmap != NULL) {
-        PRLibrary* prev = pr_loadmap;
-        PRLibrary* next = pr_loadmap->next;
-        while (next != NULL) {
-            if (next == lib) {
-                prev->next = next->next;
-                goto freeLib;
-            }
-            prev = next;
-            next = next->next;
-        }
-        /*
-         * fail (the library is not on the _pr_loadmap list),
-         * but don't wipe out an error from dlclose/shl_unload.
-         */
-        PR_ASSERT(!"_pr_loadmap and lib->refCount inconsistent");
-        if (result == 0) {
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            status = PR_FAILURE;
-        }
-    }
-    /*
-     * We free the PRLibrary structure whether dlclose/shl_unload
-     * succeeds or not.
-     */
-
-  freeLib:
-    PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Unloaded library %s", lib->name));
-    free(lib->name);
-    lib->name = NULL;
-    PR_DELETE(lib);
-    if (result != 0) {
-        PR_SetError(PR_UNLOAD_LIBRARY_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        status = PR_FAILURE;
-    }
-
-done:
-    PR_ExitMonitor(pr_linker_lock);
-    return status;
-}
-
-static void* 
-pr_FindSymbolInLib(PRLibrary *lm, const char *name)
-{
-    void *f = NULL;
-#ifdef XP_OS2
-    int rc;
-#endif
-
-    if (lm->staticTable != NULL) {
-        const PRStaticLinkTable* tp;
-        for (tp = lm->staticTable; tp->name; tp++) {
-            if (strcmp(name, tp->name) == 0) {
-                return (void*) tp->fp;
-            }
-        }
-        /* 
-        ** If the symbol was not found in the static table then check if
-        ** the symbol was exported in the DLL... Win16 only!!
-        */
-#if !defined(WIN16) && !defined(XP_BEOS)
-        PR_SetError(PR_FIND_SYMBOL_ERROR, 0);
-        return (void*)NULL;
-#endif
-    }
-    
-#ifdef XP_OS2
-    rc = DosQueryProcAddr(lm->dlh, 0, (PSZ) name, (PFN *) &f);
-#if defined(NEED_LEADING_UNDERSCORE)
-    /*
-     * Older plugins (not built using GCC) will have symbols that are not
-     * underscore prefixed.  We check for that here.
-     */
-    if (rc != NO_ERROR) {
-        name++;
-        DosQueryProcAddr(lm->dlh, 0, (PSZ) name, (PFN *) &f);
-    }
-#endif
-#endif  /* XP_OS2 */
-
-#if defined(WIN32) || defined(WIN16)
-    f = GetProcAddress(lm->dlh, name);
-#endif  /* WIN32 || WIN16 */
-
-#ifdef XP_MACOSX
-/* add this offset to skip the leading underscore in name */
-#define SYM_OFFSET 1
-    if (lm->bundle) {
-        CFStringRef nameRef = CFStringCreateWithCString(NULL, name + SYM_OFFSET, kCFStringEncodingASCII);
-        if (nameRef) {
-            f = CFBundleGetFunctionPointerForName(lm->bundle, nameRef);
-            CFRelease(nameRef);
-        }
-    }
-    if (lm->connection) {
-        Ptr                 symAddr;
-        CFragSymbolClass    symClass;
-        Str255              pName;
-        
-        PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Looking up symbol: %s", name + SYM_OFFSET));
-        
-        c2pstrcpy(pName, name + SYM_OFFSET);
-        
-        f = (FindSymbol(lm->connection, pName, &symAddr, &symClass) == noErr) ? symAddr : NULL;
-        
-#ifdef __ppc__
-        /* callers expect mach-o function pointers, so must wrap tvectors with glue. */
-        if (f && symClass == kTVectorCFragSymbol) {
-            f = TV2FP(lm->wrappers, name + SYM_OFFSET, f);
-        }
-#endif /* __ppc__ */
-        
-        if (f == NULL && strcmp(name + SYM_OFFSET, "main") == 0) f = lm->main;
-    }
-    if (lm->image) {
-        NSSymbol symbol;
-        symbol = NSLookupSymbolInImage(lm->image, name,
-                 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-                 | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-        if (symbol != NULL)
-            f = NSAddressOfSymbol(symbol);
-        else
-            f = NULL;
-    }
-#undef SYM_OFFSET
-#endif /* XP_MACOSX */
-
-#ifdef XP_BEOS
-    if( B_NO_ERROR != get_image_symbol( (image_id)lm->dlh, name, B_SYMBOL_TYPE_TEXT, &f ) ) {
-        f = NULL;
-    }
-#endif
-
-#ifdef XP_UNIX
-#ifdef HAVE_DLL
-#ifdef USE_DLFCN
-    f = dlsym(lm->dlh, name);
-#elif defined(USE_HPSHL)
-    if (shl_findsym(&lm->dlh, name, TYPE_PROCEDURE, &f) == -1) {
-        f = NULL;
-    }
-#elif defined(USE_MACH_DYLD)
-    if (lm->dlh) {
-        NSSymbol symbol;
-        symbol = NSLookupSymbolInModule(lm->dlh, name);
-        if (symbol != NULL)
-            f = NSAddressOfSymbol(symbol);
-        else
-            f = NULL;
-    }
-#endif
-#endif /* HAVE_DLL */
-#endif /* XP_UNIX */
-    if (f == NULL) {
-        PR_SetError(PR_FIND_SYMBOL_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-    }
-    return f;
-}
-
-/*
-** Called by class loader to resolve missing native's
-*/
-PR_IMPLEMENT(void*) 
-PR_FindSymbol(PRLibrary *lib, const char *raw_name)
-{
-    void *f = NULL;
-#if defined(NEED_LEADING_UNDERSCORE)
-    char *name;
-#else
-    const char *name;
-#endif
-    /*
-    ** Mangle the raw symbol name in any way that is platform specific.
-    */
-#if defined(NEED_LEADING_UNDERSCORE)
-    /* Need a leading _ */
-    name = PR_smprintf("_%s", raw_name);
-#elif defined(AIX)
-    /*
-    ** AIX with the normal linker put's a "." in front of the symbol
-    ** name.  When use "svcc" and "svld" then the "." disappears. Go
-    ** figure.
-    */
-    name = raw_name;
-#else
-    name = raw_name;
-#endif
-
-    PR_EnterMonitor(pr_linker_lock);
-    PR_ASSERT(lib != NULL);
-    f = pr_FindSymbolInLib(lib, name);
-
-#if defined(NEED_LEADING_UNDERSCORE)
-    PR_smprintf_free(name);
-#endif
-
-    PR_ExitMonitor(pr_linker_lock);
-    return f;
-}
-
-/*
-** Return the address of the function 'raw_name' in the library 'lib'
-*/
-PR_IMPLEMENT(PRFuncPtr) 
-PR_FindFunctionSymbol(PRLibrary *lib, const char *raw_name)
-{
-    return ((PRFuncPtr) PR_FindSymbol(lib, raw_name));
-}
-
-PR_IMPLEMENT(void*) 
-PR_FindSymbolAndLibrary(const char *raw_name, PRLibrary* *lib)
-{
-    void *f = NULL;
-#if defined(NEED_LEADING_UNDERSCORE)
-    char *name;
-#else
-    const char *name;
-#endif
-    PRLibrary* lm;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    /*
-    ** Mangle the raw symbol name in any way that is platform specific.
-    */
-#if defined(NEED_LEADING_UNDERSCORE)
-    /* Need a leading _ */
-    name = PR_smprintf("_%s", raw_name);
-#elif defined(AIX)
-    /*
-    ** AIX with the normal linker put's a "." in front of the symbol
-    ** name.  When use "svcc" and "svld" then the "." disappears. Go
-    ** figure.
-    */
-    name = raw_name;
-#else
-    name = raw_name;
-#endif
-
-    PR_EnterMonitor(pr_linker_lock);
-
-    /* search all libraries */
-    for (lm = pr_loadmap; lm != NULL; lm = lm->next) {
-        f = pr_FindSymbolInLib(lm, name);
-        if (f != NULL) {
-            *lib = lm;
-            lm->refCount++;
-            PR_LOG(_pr_linker_lm, PR_LOG_MIN,
-                       ("%s incr => %d (for %s)",
-                    lm->name, lm->refCount, name));
-            break;
-        }
-    }
-#if defined(NEED_LEADING_UNDERSCORE)
-    PR_smprintf_free(name);
-#endif
-
-    PR_ExitMonitor(pr_linker_lock);
-    return f;
-}
-
-PR_IMPLEMENT(PRFuncPtr) 
-PR_FindFunctionSymbolAndLibrary(const char *raw_name, PRLibrary* *lib)
-{
-    return ((PRFuncPtr) PR_FindSymbolAndLibrary(raw_name, lib));
-}
-
-/*
-** Add a static library to the list of loaded libraries. If LoadLibrary
-** is called with the name then we will pretend it was already loaded
-*/
-PR_IMPLEMENT(PRLibrary*) 
-PR_LoadStaticLibrary(const char *name, const PRStaticLinkTable *slt)
-{
-    PRLibrary *lm=NULL;
-    PRLibrary* result = NULL;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    /* See if library is already loaded */
-    PR_EnterMonitor(pr_linker_lock);
-
-    /* If the lbrary is already loaded, then add the static table information... */
-    result = pr_UnlockedFindLibrary(name);
-    if (result != NULL) {
-        PR_ASSERT( (result->staticTable == NULL) || (result->staticTable == slt) );
-        result->staticTable = slt;
-        goto unlock;
-    }
-
-    /* Add library to list...Mark it static */
-    lm = PR_NEWZAP(PRLibrary);
-    if (lm == NULL) goto unlock;
-
-    lm->name = strdup(name);
-    lm->refCount    = 1;
-    lm->dlh         = pr_exe_loadmap ? pr_exe_loadmap->dlh : 0;
-    lm->staticTable = slt;
-    lm->next        = pr_loadmap;
-    pr_loadmap      = lm;
-
-    result = lm;    /* success */
-    PR_ASSERT(lm->refCount == 1);
-  unlock:
-    PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Loaded library %s (static lib)", lm->name));
-    PR_ExitMonitor(pr_linker_lock);
-    return result;
-}
-
-PR_IMPLEMENT(char *)
-PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
-{
-#if defined(USE_DLFCN) && (defined(SOLARIS) || defined(FREEBSD) \
-        || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__))
-    Dl_info dli;
-    char *result;
-
-    if (dladdr((void *)addr, &dli) == 0) {
-        PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        return NULL;
-    }
-    result = PR_Malloc(strlen(dli.dli_fname)+1);
-    if (result != NULL) {
-        strcpy(result, dli.dli_fname);
-    }
-    return result;
-#elif defined(USE_MACH_DYLD)
-    char *result;
-    const char *image_name;
-    int i, count = _dyld_image_count();
-
-    for (i = 0; i < count; i++) {
-        image_name = _dyld_get_image_name(i);
-        if (strstr(image_name, name) != NULL) {
-            result = PR_Malloc(strlen(image_name)+1);
-            if (result != NULL) {
-                strcpy(result, image_name);
-            }
-            return result;
-        }
-    }
-    PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0);
-    return NULL;
-#elif defined(AIX)
-    char *result;
-#define LD_INFO_INCREMENT 64
-    struct ld_info *info;
-    unsigned int info_length = LD_INFO_INCREMENT * sizeof(struct ld_info);
-    struct ld_info *infop;
-    int loadflags = L_GETINFO | L_IGNOREUNLOAD;
-
-    for (;;) {
-        info = PR_Malloc(info_length);
-        if (info == NULL) {
-            return NULL;
-        }
-        /* If buffer is too small, loadquery fails with ENOMEM. */
-        if (loadquery(loadflags, info, info_length) != -1) {
-            break;
-        }
-        /*
-         * Calling loadquery when compiled for 64-bit with the
-         * L_IGNOREUNLOAD flag can cause an invalid argument error
-         * on AIX 5.1. Detect this error the first time that
-         * loadquery is called, and try calling it again without
-         * this flag set.
-         */
-        if (errno == EINVAL && (loadflags & L_IGNOREUNLOAD)) {
-            loadflags &= ~L_IGNOREUNLOAD;
-            if (loadquery(loadflags, info, info_length) != -1) {
-                break;
-            }
-        }
-        PR_Free(info);
-        if (errno != ENOMEM) {
-            /* should not happen */
-            _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO());
-            return NULL;
-        }
-        /* retry with a larger buffer */
-        info_length += LD_INFO_INCREMENT * sizeof(struct ld_info);
-    }
-
-    for (infop = info;
-         ;
-         infop = (struct ld_info *)((char *)infop + infop->ldinfo_next)) {
-        unsigned long start = (unsigned long)infop->ldinfo_dataorg;
-        unsigned long end = start + infop->ldinfo_datasize;
-        if (start <= (unsigned long)addr && end > (unsigned long)addr) {
-            result = PR_Malloc(strlen(infop->ldinfo_filename)+1);
-            if (result != NULL) {
-                strcpy(result, infop->ldinfo_filename);
-            }
-            break;
-        }
-        if (!infop->ldinfo_next) {
-            PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0);
-            result = NULL;
-            break;
-        }
-    }
-    PR_Free(info);
-    return result;
-#elif defined(OSF1)
-    /* Contributed by Steve Streeter of HP */
-    ldr_process_t process, ldr_my_process();
-    ldr_module_t mod_id;
-    ldr_module_info_t info;
-    ldr_region_t regno;
-    ldr_region_info_t reginfo;
-    size_t retsize;
-    int rv;
-    char *result;
-
-    /* Get process for which dynamic modules will be listed */
-
-    process = ldr_my_process();
-
-    /* Attach to process */
-
-    rv = ldr_xattach(process);
-    if (rv) {
-        /* should not happen */
-        _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO());
-        return NULL;
-    }
-
-    /* Print information for list of modules */
-
-    mod_id = LDR_NULL_MODULE;
-
-    for (;;) {
-
-        /* Get information for the next module in the module list. */
-
-        ldr_next_module(process, &mod_id);
-        if (ldr_inq_module(process, mod_id, &info, sizeof(info),
-                           &retsize) != 0) {
-            /* No more modules */
-            break;
-        }
-        if (retsize < sizeof(info)) {
-            continue;
-        }
-
-        /*
-         * Get information for each region in the module and check if any
-         * contain the address of this function.
-         */
-
-        for (regno = 0; ; regno++) {
-            if (ldr_inq_region(process, mod_id, regno, &reginfo,
-                               sizeof(reginfo), &retsize) != 0) {
-                /* No more regions */
-                break;
-            }
-            if (((unsigned long)reginfo.lri_mapaddr <=
-                (unsigned long)addr) &&
-                (((unsigned long)reginfo.lri_mapaddr + reginfo.lri_size) >
-                (unsigned long)addr)) {
-                /* Found it. */
-                result = PR_Malloc(strlen(info.lmi_name)+1);
-                if (result != NULL) {
-                    strcpy(result, info.lmi_name);
-                }
-                return result;
-            }
-        }
-    }
-    PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0);
-    return NULL;
-#elif defined(VMS)
-    /* Contributed by Colin Blake of HP */
-    struct _imcb	*icb;
-    ulong_t 		status;
-    char                device_name[MAX_DEVNAM];
-    int                 device_name_len;
-    $DESCRIPTOR         (device_name_desc, device_name);
-    struct fibdef	fib;
-    struct dsc$descriptor_s fib_desc = 
-	{ sizeof(struct fibdef), DSC$K_DTYPE_Z, DSC$K_CLASS_S, (char *)&fib } ;
-    IOSB		iosb;
-    ITMLST		devlst[2] = {
-            		{MAX_DEVNAM, DVI$_ALLDEVNAM, device_name, &device_name_len},
-            		{0,0,0,0}};
-    short               file_name_len;
-    char                file_name[MAX_FILNAM+1];
-    char		*result = NULL;
-    struct dsc$descriptor_s file_name_desc = 
-	{ MAX_FILNAM, DSC$K_DTYPE_T, DSC$K_CLASS_S, (char *) &file_name[0] } ;
-
-    /*
-    ** The address for the process image list could change in future versions
-    ** of the operating system. 7FFD0688 is valid for V7.2 and V7.3 releases,
-    ** so we use that for the default, but allow an environment variable
-    ** (logical name) to override.
-    */
-    if (IAC$GL_IMAGE_LIST == NULL) {
-        char *p = getenv("MOZILLA_IAC_GL_IMAGE_LIST");
-        if (p)
-            IAC$GL_IMAGE_LIST = (struct _imcb *) strtol(p,NULL,0);
-        else
-            IAC$GL_IMAGE_LIST = (struct _imcb *) 0x7FFD0688;
-    }
-
-    for (icb = IAC$GL_IMAGE_LIST->imcb$l_flink;
-         icb != IAC$GL_IMAGE_LIST;
-         icb = icb->imcb$l_flink) {
-        if (((void *)addr >= icb->imcb$l_starting_address) && 
-	    ((void *)addr <= icb->imcb$l_end_address)) {
-	    /*
-	    ** This is the correct image.
-	    ** Get the device name.
-	    */
-	    status = sys$getdviw(0,icb->imcb$w_chan,0,&devlst,0,0,0,0);
-	    if ($VMS_STATUS_SUCCESS(status))
-		device_name_desc.dsc$w_length = device_name_len;
-
-	    /*
-	    ** Get the FID.
-	    */
-	    memset(&fib,0,sizeof(struct fibdef));
-	    status = sys$qiow(0,icb->imcb$w_chan,IO$_ACCESS,&iosb,
-                		0,0,&fib_desc,0,0,0,0,0);
-
-	    /*
-	    ** If we got the FID, now look up its name (if for some reason
-	    ** we didn't get the device name, this call will fail).
-	    */
-	    if (($VMS_STATUS_SUCCESS(status)) && ($VMS_STATUS_SUCCESS(iosb.cond))) {
-		status = lib$fid_to_name (
-                    &device_name_desc,
-                    &fib.fib$w_fid,
-                    &file_name_desc,
-                    &file_name_len,
-                    0, 0);
-
-		/*
-		** If we succeeded then remove the version number and
-		** return a copy of the UNIX format version of the file name.
-		*/
-		if ($VMS_STATUS_SUCCESS(status)) {
-		    char *p, *result;
-		    file_name[file_name_len] = 0;
-		    p = strrchr(file_name,';');
-		    if (p) *p = 0;
-		    p = decc$translate_vms(&file_name[0]);
-		    result = PR_Malloc(strlen(p)+1);
-		    if (result != NULL) {
-			strcpy(result, p);
-		    }
-		    return result;
-		}
-            }
-	}
-    }
-
-    /* Didn't find it */
-    PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0);
-    return NULL;
-
-#elif defined(HPUX) && defined(USE_HPSHL)
-    int index;
-    struct shl_descriptor desc;
-    char *result;
-
-    for (index = 0; shl_get_r(index, &desc) == 0; index++) {
-        if (strstr(desc.filename, name) != NULL) {
-            result = PR_Malloc(strlen(desc.filename)+1);
-            if (result != NULL) {
-                strcpy(result, desc.filename);
-            }
-            return result;
-        }
-    }
-    /*
-     * Since the index value of a library is decremented if
-     * a library preceding it in the shared library search
-     * list was unloaded, it is possible that we missed some
-     * libraries as we went up the list.  So we should go
-     * down the list to be sure that we not miss anything.
-     */
-    for (index--; index >= 0; index--) {
-        if ((shl_get_r(index, &desc) == 0)
-                && (strstr(desc.filename, name) != NULL)) {
-            result = PR_Malloc(strlen(desc.filename)+1);
-            if (result != NULL) {
-                strcpy(result, desc.filename);
-            }
-            return result;
-        }
-    }
-    PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0);
-    return NULL;
-#elif defined(HPUX) && defined(USE_DLFCN)
-    struct load_module_desc desc;
-    char *result;
-    const char *module_name;
-
-    if (dlmodinfo((unsigned long)addr, &desc, sizeof desc, NULL, 0, 0) == 0) {
-        PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        return NULL;
-    }
-    module_name = dlgetname(&desc, sizeof desc, NULL, 0, 0);
-    if (module_name == NULL) {
-        /* should not happen */
-        _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        return NULL;
-    }
-    result = PR_Malloc(strlen(module_name)+1);
-    if (result != NULL) {
-        strcpy(result, module_name);
-    }
-    return result;
-#elif defined(WIN32)
-    HMODULE handle;
-    char module_name[MAX_PATH];
-    char *result;
-
-    handle = GetModuleHandle(name);
-    if (handle == NULL) {
-        PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        return NULL;
-    }
-    if (GetModuleFileName(handle, module_name, sizeof module_name) == 0) {
-        /* should not happen */
-        _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO());
-        return NULL;
-    }
-    result = PR_Malloc(strlen(module_name)+1);
-    if (result != NULL) {
-        strcpy(result, module_name);
-    }
-    return result;
-#elif defined(XP_OS2)
-    HMODULE module = NULL;
-    char module_name[_MAX_PATH];
-    char *result;
-    APIRET ulrc = DosQueryModFromEIP(&module, NULL, 0, NULL, NULL, (ULONG) addr);
-    if ((NO_ERROR != ulrc) || (NULL == module) ) {
-        PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, _MD_ERRNO());
-        DLLErrorInternal(_MD_ERRNO());
-        return NULL;
-    }
-    ulrc = DosQueryModuleName(module, sizeof module_name, module_name);
-    if (NO_ERROR != ulrc) {
-        /* should not happen */
-        _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO());
-        return NULL;
-    }
-    result = PR_Malloc(strlen(module_name)+1);
-    if (result != NULL) {
-        strcpy(result, module_name);
-    }
-    return result;
-#else
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/malloc/.cvsignore b/libs/js/nsprpub/pr/src/malloc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/malloc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/malloc/Makefile.in b/libs/js/nsprpub/pr/src/malloc/Makefile.in
deleted file mode 100644
index 85fc8717da..0000000000
--- a/libs/js/nsprpub/pr/src/malloc/Makefile.in
+++ /dev/null
@@ -1,67 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES += -D_NSPR_BUILD_
-
-CSRCS =  prmem.c
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/malloc/prmalloc.c b/libs/js/nsprpub/pr/src/malloc/prmalloc.c
deleted file mode 100644
index 10e9cf78b7..0000000000
--- a/libs/js/nsprpub/pr/src/malloc/prmalloc.c
+++ /dev/null
@@ -1,1174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/*
-** We override malloc etc. on any platform which has preemption +
-** nspr20 user level threads.  When we're debugging, we can make our
-** version of malloc fail occasionally.
-*/
-#ifdef _PR_OVERRIDE_MALLOC
-
-/*
-** Thread safe version of malloc, calloc, realloc, free
-*/
-#include <stdarg.h>
-
-#ifdef DEBUG
-#define SANITY
-#define EXTRA_SANITY
-#else
-#undef SANITY
-#undef EXTRA_SANITY
-#endif
-
-/* Forward decls */
-void *_PR_UnlockedMalloc(size_t size);
-void _PR_UnlockedFree(void *ptr);
-void *_PR_UnlockedRealloc(void *ptr, size_t size);
-void *_PR_UnlockedCalloc(size_t n, size_t elsize);
-
-/************************************************************************/
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- */
-
-/*
- * Defining SANITY will enable some checks which will tell you if the users
- * program did botch something
- */
-
-/*
- * Defining EXTRA_SANITY will enable some checks which are mostly related
- * to internal conditions in malloc.c
- */
-
-/*
- * Very verbose progress on stdout...
- */
-#if 0
-#  define TRACE(foo)    printf  foo
-static int malloc_event;
-#else
-#  define TRACE(foo)	
-#endif
-
-/* XXX Pick a number, any number */
-#   define malloc_pagesize		4096UL
-#   define malloc_pageshift		12UL
-
-#ifdef XP_UNIX
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#endif
-
-/*
- * This structure describes a page's worth of chunks.
- */
-
-struct pginfo {
-    struct pginfo	*next;	/* next on the free list */
-    char		*page;	/* Pointer to the page */
-    u_short		size;	/* size of this page's chunks */
-    u_short		shift;	/* How far to shift for this size chunks */
-    u_short		free;	/* How many free chunks */
-    u_short		total;	/* How many chunk */
-    u_long		bits[1]; /* Which chunks are free */
-};
-
-struct pgfree {
-    struct pgfree	*next;	/* next run of free pages */
-    struct pgfree	*prev;	/* prev run of free pages */
-    char		*page;	/* pointer to free pages */
-    char		*end;	/* pointer to end of free pages */
-    u_long		size;	/* number of bytes free */
-};
-
-/*
- * How many bits per u_long in the bitmap.
- * Change only if not 8 bits/byte
- */
-#define	MALLOC_BITS	(8*sizeof(u_long))
-
-/*
- * Magic values to put in the page_directory
- */
-#define MALLOC_NOT_MINE	((struct pginfo*) 0)
-#define MALLOC_FREE 	((struct pginfo*) 1)
-#define MALLOC_FIRST	((struct pginfo*) 2)
-#define MALLOC_FOLLOW	((struct pginfo*) 3)
-#define MALLOC_MAGIC	((struct pginfo*) 4)
-
-/*
- * Set to one when malloc_init has been called
- */
-static	unsigned	initialized;
-
-/*
- * The size of a page.
- * Must be a integral multiplum of the granularity of mmap(2).
- * Your toes will curl if it isn't a power of two
- */
-#define malloc_pagemask	((malloc_pagesize)-1)
-
-/*
- * The size of the largest chunk.
- * Half a page.
- */
-#define malloc_maxsize	((malloc_pagesize)>>1)
-
-/*
- * malloc_pagesize == 1 << malloc_pageshift
- */
-#ifndef malloc_pageshift
-static	unsigned	malloc_pageshift;
-#endif /* malloc_pageshift */
-
-/*
- * The smallest allocation we bother about.
- * Must be power of two
- */
-#ifndef malloc_minsize
-static	unsigned  malloc_minsize;
-#endif /* malloc_minsize */
-
-/*
- * The largest chunk we care about.
- * Must be smaller than pagesize
- * Must be power of two
- */
-#ifndef malloc_maxsize
-static	unsigned  malloc_maxsize;
-#endif /* malloc_maxsize */
-
-#ifndef malloc_cache
-static	unsigned  malloc_cache;
-#endif /* malloc_cache */
-
-/*
- * The offset from pagenumber to index into the page directory
- */
-static	u_long  malloc_origo;
-
-/*
- * The last index in the page directory we care about
- */
-static	u_long  last_index;
-
-/*
- * Pointer to page directory.
- * Allocated "as if with" malloc
- */
-static	struct	pginfo **page_dir;
-
-/*
- * How many slots in the page directory
- */
-static	unsigned	malloc_ninfo;
-
-/*
- * Free pages line up here 
- */
-static struct pgfree	free_list;
-
-/*
- * Abort() if we fail to get VM ?
- */
-static int malloc_abort;
-
-#ifdef SANITY
-/*
- * Are we trying to die ?
- */
-static int suicide;
-#endif
-
-/*
- * dump statistics
- */
-static int malloc_stats;
-
-/*
- * always realloc ?
- */
-static int malloc_realloc;
-
-/*
- * my last break.
- */
-static void *malloc_brk;
-
-/*
- * one location cache for free-list holders
- */
-static struct pgfree *px;
-
-static int set_pgdir(void *ptr, struct  pginfo *info);
-static int extend_page_directory(u_long index);
-
-#ifdef SANITY
-void
-malloc_dump(FILE *fd)
-{
-    struct pginfo **pd;
-    struct pgfree *pf;
-    int j;
-
-    pd = page_dir;
-
-    /* print out all the pages */
-    for(j=0;j<=last_index;j++) {
-	fprintf(fd,"%08lx %5d ",(j+malloc_origo) << malloc_pageshift,j);
-	if (pd[j] == MALLOC_NOT_MINE) {
-	    for(j++;j<=last_index && pd[j] == MALLOC_NOT_MINE;j++)
-		;
-	    j--;
-	    fprintf(fd,".. %5d not mine\n",	j);
-	} else if (pd[j] == MALLOC_FREE) {
-	    for(j++;j<=last_index && pd[j] == MALLOC_FREE;j++)
-		;
-	    j--;
-	    fprintf(fd,".. %5d free\n", j);
-	} else if (pd[j] == MALLOC_FIRST) {
-	    for(j++;j<=last_index && pd[j] == MALLOC_FOLLOW;j++)
-		;
-	    j--;
-	    fprintf(fd,".. %5d in use\n", j);
-	} else if (pd[j] < MALLOC_MAGIC) {
-	    fprintf(fd,"(%p)\n", pd[j]);
-	} else {
-	    fprintf(fd,"%p %d (of %d) x %d @ %p --> %p\n",
-		pd[j],pd[j]->free, pd[j]->total, 
-		pd[j]->size, pd[j]->page, pd[j]->next);
-	}
-    }
-
-    for(pf=free_list.next; pf; pf=pf->next) {
-	fprintf(fd,"Free: @%p [%p...%p[ %ld ->%p <-%p\n",
-		pf,pf->page,pf->end,pf->size,pf->prev,pf->next);
-	if (pf == pf->next) {
-		fprintf(fd,"Free_list loops.\n");
-		break;
-	}
-    }
-
-    /* print out various info */
-    fprintf(fd,"Minsize\t%d\n",malloc_minsize);
-    fprintf(fd,"Maxsize\t%ld\n",malloc_maxsize);
-    fprintf(fd,"Pagesize\t%ld\n",malloc_pagesize);
-    fprintf(fd,"Pageshift\t%ld\n",malloc_pageshift);
-    fprintf(fd,"FirstPage\t%ld\n",malloc_origo);
-    fprintf(fd,"LastPage\t%ld %lx\n",last_index+malloc_pageshift,
-	(last_index + malloc_pageshift) << malloc_pageshift);
-    fprintf(fd,"Break\t%ld\n",(u_long)sbrk(0) >> malloc_pageshift);
-}
-
-static void wrterror(char *fmt, ...)
-{
-    char *q = "malloc() error: ";
-    char buf[100];
-    va_list ap;
-
-    suicide = 1;
-
-    va_start(ap, fmt);
-    PR_vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    fputs(q, stderr);
-    fputs(buf, stderr);
-
-    malloc_dump(stderr);
-    PR_Abort();
-}
-
-static void wrtwarning(char *fmt, ...)
-{
-    char *q = "malloc() warning: ";
-    char buf[100];
-    va_list ap;
-
-    va_start(ap, fmt);
-    PR_vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    fputs(q, stderr);
-    fputs(buf, stderr);
-}
-#endif /* SANITY */
-
-
-/*
- * Allocate a number of pages from the OS
- */
-static caddr_t
-map_pages(int pages, int update)
-{
-    caddr_t result,tail;
-
-    result = ((caddr_t)sbrk(0)) + malloc_pagemask - 1;
-    result = (caddr_t) ((u_long)result & ~malloc_pagemask);
-    tail = result + (pages << malloc_pageshift);
-    if (!brk(tail)) {
-	last_index = ((u_long)tail >> malloc_pageshift) - malloc_origo -1;
-	malloc_brk = tail;
-	TRACE(("%6d S %p .. %p\n",malloc_event++, result, tail));
-	if (!update || last_index < malloc_ninfo ||
-	  extend_page_directory(last_index))
-	    return result;
-    }
-    TRACE(("%6d s %d %p %d\n",malloc_event++,pages,sbrk(0),errno));
-#ifdef EXTRA_SANITY
-    wrterror("map_pages fails\n");
-#endif
-    return 0;
-}
-
-#define set_bit(_pi,_bit) \
-    (_pi)->bits[(_bit)/MALLOC_BITS] |= 1L<<((_bit)%MALLOC_BITS)
-
-#define clr_bit(_pi,_bit) \
-    (_pi)->bits[(_bit)/MALLOC_BITS] &= ~(1L<<((_bit)%MALLOC_BITS));
-
-#define tst_bit(_pi,_bit) \
-    ((_pi)->bits[(_bit)/MALLOC_BITS] & (1L<<((_bit)%MALLOC_BITS)))
-
-/*
- * Extend page directory
- */
-static int
-extend_page_directory(u_long index)
-{
-    struct  pginfo **young, **old;
-    int i;
-
-    TRACE(("%6d E %lu\n",malloc_event++,index));
-    
-    /* Make it this many pages */
-    i = index * sizeof *page_dir;
-    i /= malloc_pagesize;
-    i += 2;
-
-    /* Get new pages, if you used this much mem you don't care :-) */
-    young = (struct pginfo**) map_pages(i,0);
-    if (!young)
-	return 0;
-
-    /* Copy the old stuff */
-    memset(young, 0, i * malloc_pagesize);
-    memcpy(young, page_dir,
-	    malloc_ninfo * sizeof *page_dir);
-
-    /* register the new size */
-    malloc_ninfo = i * malloc_pagesize / sizeof *page_dir;
-
-    /* swap the pointers */
-    old = page_dir;
-    page_dir = young;
-
-    /* Mark the pages */
-    index = ((u_long)young >> malloc_pageshift) - malloc_origo;
-    page_dir[index] = MALLOC_FIRST;
-    while (--i) {
-	page_dir[++index] = MALLOC_FOLLOW;
-    }
-
-    /* Now free the old stuff */
-    _PR_UnlockedFree(old);
-    return 1;
-}
-
-/*
- * Set entry in page directory.
- * Extend page directory if need be.
- */
-static int
-set_pgdir(void *ptr, struct  pginfo *info)
-{
-    u_long index = ((u_long)ptr >> malloc_pageshift) - malloc_origo;
-
-    if (index >= malloc_ninfo && !extend_page_directory(index))
-	return 0;
-    page_dir[index] = info;
-    return 1;
-}
-
-/*
- * Initialize the world
- */
-static void
-malloc_init (void)
-{
-    int i;
-    char *p;
-
-    TRACE(("%6d I\n",malloc_event++));
-#ifdef DEBUG
-    for (p=getenv("MALLOC_OPTIONS"); p && *p; p++) {
-	switch (*p) {
-	    case 'a': malloc_abort = 0; break;
-	    case 'A': malloc_abort = 1; break;
-	    case 'd': malloc_stats = 0; break;
-	    case 'D': malloc_stats = 1; break;
-	    case 'r': malloc_realloc = 0; break;
-	    case 'R': malloc_realloc = 1; break;
-	    default:
-		wrtwarning("Unknown chars in MALLOC_OPTIONS\n");
-		break;
-	}
-    }
-#endif
-
-#ifndef malloc_pagesize
-    /* determine our pagesize */
-    malloc_pagesize = getpagesize();
-#endif /* malloc_pagesize */
-
-#ifndef malloc_pageshift
-    /* determine how much we shift by to get there */
-    for (i = malloc_pagesize; i > 1; i >>= 1)
-	malloc_pageshift++;
-#endif /* malloc_pageshift */
-
-#ifndef malloc_cache
-    malloc_cache = 50 << malloc_pageshift;	
-#endif /* malloc_cache */
-
-#ifndef malloc_minsize
-    /*
-     * find the smallest size allocation we will bother about.
-     * this is determined as the smallest allocation that can hold
-     * it's own pginfo;
-     */
-    i = 2;
-    for(;;) {
-	int j;
-
-	/* Figure out the size of the bits */
-	j = malloc_pagesize/i;
-	j /= 8;
-	if (j < sizeof(u_long))
-		j = sizeof (u_long);
-	if (sizeof(struct pginfo) + j - sizeof (u_long) <= i)
-		break;
-	i += i;
-    }
-    malloc_minsize = i;
-#endif /* malloc_minsize */
-
-
-    /* Allocate one page for the page directory */
-    page_dir = (struct pginfo **) map_pages(1,0);
-#ifdef SANITY
-    if (!page_dir)
-	wrterror("fatal: my first mmap failed.  (check limits ?)\n");
-#endif
-
-    /*
-     * We need a maximum of malloc_pageshift buckets, steal these from the
-     * front of the page_directory;
-     */
-    malloc_origo = (u_long) page_dir >> malloc_pageshift;
-    malloc_origo -= malloc_pageshift;
-
-    /* Clear it */
-    memset(page_dir,0,malloc_pagesize);
-
-    /* Find out how much it tells us */
-    malloc_ninfo = malloc_pagesize / sizeof *page_dir;
-
-    /* Plug the page directory into itself */
-    i = set_pgdir(page_dir,MALLOC_FIRST);
-#ifdef SANITY
-    if (!i)
-	wrterror("fatal: couldn't set myself in the page directory\n");
-#endif
-
-    /* Been here, done that */
-    initialized++;
-}
-
-/*
- * Allocate a number of complete pages
- */
-static void *malloc_pages(size_t size)
-{
-    void *p,*delay_free = 0;
-    int i;
-    struct pgfree *pf;
-    u_long index;
-
-    /* How many pages ? */
-    size += (malloc_pagesize-1);
-    size &= ~malloc_pagemask;
-
-    p = 0;
-    /* Look for free pages before asking for more */
-    for(pf = free_list.next; pf; pf = pf->next) {
-#ifdef EXTRA_SANITY
-	if (pf->page == pf->end)
-	    wrterror("zero entry on free_list\n");
-	if (pf->page > pf->end) {
-	    TRACE(("%6d !s %p %p %p <%d>\n",malloc_event++,
-		pf,pf->page,pf->end,__LINE__));
-	    wrterror("sick entry on free_list\n");
-	}
-	if ((void*)pf->page >= (void*)sbrk(0))
-	    wrterror("entry on free_list past brk\n");
-	if (page_dir[((u_long)pf->page >> malloc_pageshift) - malloc_origo] 
-	  != MALLOC_FREE) {
-	    TRACE(("%6d !f %p %p %p <%d>\n",malloc_event++,
-		pf,pf->page,pf->end,__LINE__));
-	    wrterror("non-free first page on free-list\n");
-	}
-	if (page_dir[((u_long)pf->end >> malloc_pageshift) - 1 - malloc_origo] 
-	  != MALLOC_FREE)
-	    wrterror("non-free last page on free-list\n");
-#endif /* EXTRA_SANITY */
-	if (pf->size < size) 
-	    continue;
-	else if (pf->size == size) {
-	    p = pf->page;
-	    if (pf->next)
-		    pf->next->prev = pf->prev;
-	    pf->prev->next = pf->next;
-	    delay_free = pf;
-	    break;
-	} else {
-	    p = pf->page;
-	    pf->page += size;
-	    pf->size -= size;
-	    break;
-        }
-    }
-#ifdef EXTRA_SANITY
-    if (p && page_dir[((u_long)p >> malloc_pageshift) - malloc_origo] 
-      != MALLOC_FREE) {
-	wrterror("allocated non-free page on free-list\n");
-    }
-#endif /* EXTRA_SANITY */
-
-    size >>= malloc_pageshift;
-
-    /* Map new pages */
-    if (!p)
-	p = map_pages(size,1);
-
-    if (p) {
-	/* Mark the pages in the directory */
-	index = ((u_long)p >> malloc_pageshift) - malloc_origo;
-	page_dir[index] = MALLOC_FIRST;
-	for (i=1;i<size;i++)
-	    page_dir[index+i] = MALLOC_FOLLOW;
-    }
-    if (delay_free) {
-	if (!px) 
-	    px = (struct pgfree*)delay_free;
-	else
-	    _PR_UnlockedFree(delay_free);
-    }
-    return p;
-}
-
-/*
- * Allocate a page of fragments
- */
-
-static int
-malloc_make_chunks(int bits)
-{
-    struct  pginfo *bp;
-    void *pp;
-    int i,k,l;
-
-    /* Allocate a new bucket */
-    pp = malloc_pages(malloc_pagesize);
-    if (!pp)
-	return 0;
-    l = sizeof *bp - sizeof(u_long);
-    l += sizeof(u_long) *
-	(((malloc_pagesize >> bits)+MALLOC_BITS-1) / MALLOC_BITS);
-    if ((1<<(bits)) <= l+l) {
-	bp = (struct  pginfo *)pp;
-    } else {
-	bp = (struct  pginfo *)_PR_UnlockedMalloc(l);
-    }
-    if (!bp)
-	return 0;
-    bp->size = (1<<bits);
-    bp->shift = bits;
-    bp->total = bp->free = malloc_pagesize >> bits;
-    bp->next = page_dir[bits];
-    bp->page = (char*)pp;
-    i = set_pgdir(pp,bp);
-    if (!i)
-	return 0;
-
-    /* We can safely assume that there is nobody in this chain */
-    page_dir[bits] = bp;
-
-    /* set all valid bits in the bits */
-    k = bp->total;
-    i = 0;
-/*
-    for(;k-i >= MALLOC_BITS; i += MALLOC_BITS)
-	bp->bits[i / MALLOC_BITS] = ~0;
-*/
-    for(; i < k; i++)
-	set_bit(bp,i);
-
-    if (bp != pp)
-	return 1;
-
-    /* We may have used the first ones already */
-    for(i=0;l > 0;i++) {
-	clr_bit(bp,i);
-	bp->free--;
-	bp->total--;
-	l -= (1 << bits);
-    }
-    return 1;
-}
-
-/*
- * Allocate a fragment
- */
-static void *malloc_bytes(size_t size)
-{
-    size_t s;
-    int j;
-    struct  pginfo *bp;
-    int k;
-    u_long *lp, bf;
-
-    /* Don't bother with anything less than this */
-    if (size < malloc_minsize) {
-	size = malloc_minsize;
-    }
-
-    /* Find the right bucket */
-    j = 1;
-    s = size - 1;
-    while (s >>= 1) {
-        j++;
-    }
-
-    /* If it's empty, make a page more of that size chunks */
-    if (!page_dir[j] && !malloc_make_chunks(j))
-	return 0;
-
-    /* Find first word of bitmap which isn't empty */
-    bp = page_dir[j];
-    for (lp = bp->bits; !*lp; lp++)
-	;
-
-    /* Find that bit */
-    bf = *lp;
-    k = 0;
-    while ((bf & 1) == 0) {
-	bf >>= 1;
-	k++;
-    }
-
-    *lp ^= 1L<<k;                       /* clear it */
-    bp->free--;
-    if (!bp->free) {
-	page_dir[j] = bp->next;
-	bp->next = 0;
-    }
-    k += (lp - bp->bits)*MALLOC_BITS;
-    return bp->page + (k << bp->shift);
-}
-
-void *_PR_UnlockedMalloc(size_t size)
-{
-    void *result;
-
-    /* Round up to a multiple of 8 bytes */
-    if (size & 7) {
-	size = size + 8 - (size & 7);
-    }
-
-    if (!initialized)
-	malloc_init();
-
-#ifdef SANITY
-    if (suicide)
-	PR_Abort();
-#endif
-
-    if (size <= malloc_maxsize)
-	result =  malloc_bytes(size);
-    else
-	result =  malloc_pages(size);
-#ifdef SANITY
-    if (malloc_abort && !result)
-	wrterror("malloc() returns NULL\n");
-#endif
-    TRACE(("%6d M %p %d\n",malloc_event++,result,size));
-
-    return result;
-}
-
-void *_PR_UnlockedMemalign(size_t alignment, size_t size)
-{
-    void *result;
-
-    /*
-     * alignment has to be a power of 2
-     */
-
-    if ((size <= alignment) && (alignment <= malloc_maxsize))
-		size = alignment;	
-    else
-           	size += alignment - 1;	
-
-    /* Round up to a multiple of 8 bytes */
-    if (size & 7) {
-	size = size + 8 - (size & 7);
-    }
-
-    if (!initialized)
-	malloc_init();
-
-#ifdef SANITY
-    if (suicide)
-	abort();
-#endif
-
-    if (size <= malloc_maxsize)
-	result =  malloc_bytes(size);
-    else
-	result =  malloc_pages(size);
-#ifdef SANITY
-    if (malloc_abort && !result)
-	wrterror("malloc() returns NULL\n");
-#endif
-    TRACE(("%6d A %p %d\n",malloc_event++,result,size));
-
-    if ((u_long)result & (alignment - 1))
-    	return ((void *)(((u_long)result + alignment)  & ~(alignment - 1)));
-    else
-    	return result;
-}
-
-void *_PR_UnlockedCalloc(size_t n, size_t nelem)
-{
-    void *p;
-
-    /* Compute total size and then round up to a double word amount */
-    n *= nelem;
-    if (n & 7) {
-	n = n + 8 - (n & 7);
-    }
-
-    /* Get the memory */
-    p = _PR_UnlockedMalloc(n);
-    if (p) {
-	/* Zero it */
-	memset(p, 0, n);
-    }
-    return p;
-}
-
-/*
- * Change an allocation's size
- */
-void *_PR_UnlockedRealloc(void *ptr, size_t size)
-{
-    void *p;
-    u_long osize,page,index,tmp_index;
-    struct pginfo **mp;
-
-    if (!initialized)
-	malloc_init();
-
-#ifdef SANITY
-    if (suicide)
-	PR_Abort();
-#endif
-
-    /* used as free() */
-    TRACE(("%6d R %p %d\n",malloc_event++, ptr, size));
-    if (ptr && !size) {
-	_PR_UnlockedFree(ptr);
-	return _PR_UnlockedMalloc (1);
-    }
-
-    /* used as malloc() */
-    if (!ptr) {
-	p = _PR_UnlockedMalloc(size);
-	return p;
-    }
-
-    /* Find the page directory entry for the page in question */
-    page = (u_long)ptr >> malloc_pageshift;
-    index = page - malloc_origo;
-
-    /*
-     * check if memory was allocated by memalign
-     */
-    tmp_index = index;
-    while (page_dir[tmp_index] == MALLOC_FOLLOW)
-	tmp_index--;
-    if (tmp_index != index) {
-	/*
-	 * memalign-allocated memory
-	 */
-	index = tmp_index;
-	page = index + malloc_origo;			
-	ptr = (void *) (page << malloc_pageshift);
-    }
-    TRACE(("%6d R2 %p %d\n",malloc_event++, ptr, size));
-
-    /* make sure it makes sense in some fashion */
-    if (index < malloc_pageshift || index > last_index) {
-#ifdef SANITY
-	wrtwarning("junk pointer passed to realloc()\n");
-#endif
-	return 0;
-    }
-
-    /* find the size of that allocation, and see if we need to relocate */
-    mp = &page_dir[index];
-    if (*mp == MALLOC_FIRST) {
-	osize = malloc_pagesize;
-	while (mp[1] == MALLOC_FOLLOW) {
-	    osize += malloc_pagesize;
-	    mp++;
-	}
-        if (!malloc_realloc && 
-		size < osize && 
-		size > malloc_maxsize &&
-	    size > (osize - malloc_pagesize)) {
-	    return ptr;
-	}
-    } else if (*mp >= MALLOC_MAGIC) {
-	osize = (*mp)->size;
-	if (!malloc_realloc &&
-		size < osize && 
-	    (size > (*mp)->size/2 || (*mp)->size == malloc_minsize)) {
-	    return ptr;
-	}
-    } else {
-#ifdef SANITY
-	wrterror("realloc() of wrong page.\n");
-#endif
-    }
-
-    /* try to reallocate */
-    p = _PR_UnlockedMalloc(size);
-
-    if (p) {
-	/* copy the lesser of the two sizes */
-	if (osize < size)
-	    memcpy(p,ptr,osize);
-	else
-	    memcpy(p,ptr,size);
-	_PR_UnlockedFree(ptr);
-    }
-#ifdef DEBUG
-    else if (malloc_abort)
-	wrterror("realloc() returns NULL\n");
-#endif
-
-    return p;
-}
-
-/*
- * Free a sequence of pages
- */
-
-static void
-free_pages(char *ptr, u_long page, int index, struct pginfo *info)
-{
-    int i;
-    struct pgfree *pf,*pt;
-    u_long l;
-    char *tail;
-
-    TRACE(("%6d FP %p %d\n",malloc_event++, ptr, page));
-    /* Is it free already ? */
-    if (info == MALLOC_FREE) {
-#ifdef SANITY
-	wrtwarning("freeing free page at %p.\n", ptr);
-#endif
-	return;
-    }
-
-#ifdef SANITY
-    /* Is it not the right place to begin ? */
-    if (info != MALLOC_FIRST)
-	wrterror("freeing wrong page.\n");
-
-    /* Is this really a pointer to a page ? */
-    if ((u_long)ptr & malloc_pagemask)
-	wrterror("freeing messed up page pointer.\n");
-#endif
-
-    /* Count how many pages it is anyway */
-    page_dir[index] = MALLOC_FREE;
-    for (i = 1; page_dir[index+i] == MALLOC_FOLLOW; i++)
-	page_dir[index + i] = MALLOC_FREE;
-
-    l = i << malloc_pageshift;
-
-    tail = ptr+l;
-
-    /* add to free-list */
-    if (!px)
-	px = (struct pgfree*)_PR_UnlockedMalloc(sizeof *pt);
-    /* XXX check success */
-    px->page = ptr;
-    px->end =  tail;
-    px->size = l;
-    if (!free_list.next) {
-	px->next = free_list.next;
-	px->prev = &free_list;
-	free_list.next = px;
-	pf = px;
-	px = 0;
-    } else {
-	tail = ptr+l;
-	for(pf = free_list.next; pf->next && pf->end < ptr; pf = pf->next)
-	    ;
-	for(; pf; pf = pf->next) {
-	    if (pf->end == ptr ) {
-		/* append to entry */
-		pf->end += l;
-		pf->size += l;
-		if (pf->next && pf->end == pf->next->page ) {
-		    pt = pf->next;
-		    pf->end = pt->end;
-		    pf->size += pt->size;
-		    pf->next = pt->next;
-		    if (pf->next)
-			pf->next->prev = pf;
-		    _PR_UnlockedFree(pt);
-		}
-	    } else if (pf->page == tail) {
-		/* prepend to entry */
-		pf->size += l;
-		pf->page = ptr;
-	    } else if (pf->page > ptr) {
-		px->next = pf;
-		px->prev = pf->prev;
-		pf->prev = px;
-		px->prev->next = px;
-		pf = px;
-		px = 0;
-	    } else if (!pf->next) {
-		px->next = 0;
-		px->prev = pf;
-		pf->next = px;
-		pf = px;
-		px = 0;
-	    } else {
-		continue;
-	    }
-	    break;
-	}
-    }
-    if (!pf->next &&
-      pf->size > malloc_cache &&
-      pf->end == malloc_brk &&
-      malloc_brk == (void*)sbrk(0)) {
-	pf->end = pf->page + malloc_cache;
-	pf->size = malloc_cache;
-	TRACE(("%6d U %p %d\n",malloc_event++,pf->end,pf->end - pf->page));
-	brk(pf->end);
-	malloc_brk = pf->end;
-	/* Find the page directory entry for the page in question */
-	page = (u_long)pf->end >> malloc_pageshift;
-	index = page - malloc_origo;
-	/* Now update the directory */
-	for(i=index;i <= last_index;)
-	    page_dir[i++] = MALLOC_NOT_MINE;
-	last_index = index - 1;
-    }
-}
-
-/*
- * Free a chunk, and possibly the page it's on, if the page becomes empty.
- */
-
-static void
-free_bytes(void *ptr, u_long page, int index, struct pginfo *info)
-{
-    int i;
-    struct pginfo **mp;
-    void *vp;
-
-    /* Make sure that pointer is multiplum of chunk-size */
-#ifdef SANITY
-    if ((u_long)ptr & (info->size - 1))
-	wrterror("freeing messed up chunk pointer\n");
-#endif
-
-    /* Find the chunk number on the page */
-    i = ((u_long)ptr & malloc_pagemask) >> info->shift;
-
-    /* See if it's free already */
-    if (tst_bit(info,i)) {
-#ifdef SANITY
-	wrtwarning("freeing free chunk at %p\n", ptr);
-#endif
-	return;
-    }
-
-    /* Mark it free */
-    set_bit(info,i);
-    info->free++;
-
-    /* If the page was full before, we need to put it on the queue now */
-    if (info->free == 1) {
-	mp = page_dir + info->shift;
-	while (*mp && (*mp)->next && (*mp)->next->page < info->page)
-	    mp = &(*mp)->next;
-	info->next = *mp;
-	*mp = info;
-	return;
-    }
-
-    /* If this page isn't empty, don't do anything. */
-    if (info->free != info->total)
-	return;
-
-    /* We may want to keep at least one page of each size chunks around.  */
-    mp = page_dir + info->shift;
-    if (0 && (*mp == info) && !info->next)
-	return;
-
-    /* Find & remove this page in the queue */
-    while (*mp != info) {
-	mp = &((*mp)->next);
-#ifdef EXTRA_SANITY
-	if (!*mp) {
-		TRACE(("%6d !q %p\n",malloc_event++,info));
-		wrterror("Not on queue\n");
-	}
-#endif
-    }
-    *mp = info->next;
-
-    /* Free the page & the info structure if need be */
-    set_pgdir(info->page,MALLOC_FIRST);
-    if((void*)info->page == (void*)info) {
-	_PR_UnlockedFree(info->page);
-    } else {
-	vp = info->page;
-	_PR_UnlockedFree(info);
-	_PR_UnlockedFree(vp);
-    }
-}
-
-void _PR_UnlockedFree(void *ptr)
-{
-    u_long page;
-    struct pginfo *info;
-    int index, tmp_index;
-
-    TRACE(("%6d F %p\n",malloc_event++,ptr));
-    /* This is legal */
-    if (!ptr)
-	return;
-
-#ifdef SANITY
-    /* There wouldn't be anything to free */
-    if (!initialized) {
-	wrtwarning("free() called before malloc() ever got called\n");
-	return;
-    }
-#endif
-
-#ifdef SANITY
-    if (suicide)
-	PR_Abort();
-#endif
-
-    /* Find the page directory entry for the page in question */
-    page = (u_long)ptr >> malloc_pageshift;
-    index = page - malloc_origo;
-
-    /*
-     * check if memory was allocated by memalign
-     */
-    tmp_index = index;
-    while (page_dir[tmp_index] == MALLOC_FOLLOW)
-	tmp_index--;
-    if (tmp_index != index) {
-	/*
-	 * memalign-allocated memory
-	 */
-	index = tmp_index;
-	page = index + malloc_origo;			
-	ptr = (void *) (page << malloc_pageshift);
-    }
-    /* make sure it makes sense in some fashion */
-    if (index < malloc_pageshift) {
-#ifdef SANITY
-	wrtwarning("junk pointer %p (low) passed to free()\n", ptr);
-#endif
-	return;
-    }
-    if (index > last_index) {
-#ifdef SANITY
-	wrtwarning("junk pointer %p (high) passed to free()\n", ptr);
-#endif
-	return;
-    }
-
-    /* handle as page-allocation or chunk allocation */
-    info = page_dir[index];
-    if (info < MALLOC_MAGIC)
-        free_pages((char*)ptr, page, index, info);
-    else 
-	free_bytes(ptr,page,index,info);
-    return;
-}
-#endif /* _PR_OVERRIDE_MALLOC */
diff --git a/libs/js/nsprpub/pr/src/malloc/prmem.c b/libs/js/nsprpub/pr/src/malloc/prmem.c
deleted file mode 100644
index e61eca1828..0000000000
--- a/libs/js/nsprpub/pr/src/malloc/prmem.c
+++ /dev/null
@@ -1,707 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Thread safe versions of malloc, free, realloc, calloc and cfree.
-*/
-
-#include "primpl.h"
-
-#ifdef _PR_ZONE_ALLOCATOR
-
-/*
-** The zone allocator code must use native mutexes and cannot
-** use PRLocks because PR_NewLock calls PR_Calloc, resulting
-** in cyclic dependency of initialization.
-*/
-
-#include <string.h>	
-
-union memBlkHdrUn;
-
-typedef struct MemoryZoneStr {
-    union memBlkHdrUn    *head;         /* free list */
-    pthread_mutex_t       lock;
-    size_t                blockSize;    /* size of blocks on this free list */
-    PRUint32              locked;       /* current state of lock */
-    PRUint32              contention;   /* counter: had to wait for lock */
-    PRUint32              hits;         /* allocated from free list */
-    PRUint32              misses;       /* had to call malloc */
-    PRUint32              elements;     /* on free list */
-} MemoryZone;
-
-typedef union memBlkHdrUn {
-    unsigned char filler[48];  /* fix the size of this beast */
-    struct memBlkHdrStr {
-        union memBlkHdrUn    *next;
-        MemoryZone           *zone;
-        size_t                blockSize;
-        size_t                requestedSize;
-        PRUint32              magic;
-    } s;
-} MemBlockHdr;
-
-#define MEM_ZONES     7
-#define THREAD_POOLS 11  /* prime number for modulus */
-#define ZONE_MAGIC  0x0BADC0DE
-
-static MemoryZone zones[MEM_ZONES][THREAD_POOLS];
-
-static PRBool use_zone_allocator = PR_FALSE;
-
-static void pr_ZoneFree(void *ptr);
-
-void
-_PR_DestroyZones(void)
-{   
-    int i, j;
-
-    if (!use_zone_allocator)
-        return;
-    
-    for (j = 0; j < THREAD_POOLS; j++) {
-        for (i = 0; i < MEM_ZONES; i++) {
-            MemoryZone *mz = &zones[i][j];
-            pthread_mutex_destroy(&mz->lock);
-            while (mz->head) {
-                MemBlockHdr *hdr = mz->head;
-                mz->head = hdr->s.next;  /* unlink it */
-                free(hdr);
-                mz->elements--;
-            }
-        }
-    } 
-    use_zone_allocator = PR_FALSE;
-} 
-
-/*
-** pr_FindSymbolInProg
-**
-** Find the specified data symbol in the program and return
-** its address.
-*/
-
-#ifdef HAVE_DLL
-
-#ifdef USE_DLFCN
-
-#include <dlfcn.h>
-
-static void *
-pr_FindSymbolInProg(const char *name)
-{
-    void *h;
-    void *sym;
-
-    h = dlopen(0, RTLD_LAZY);
-    if (h == NULL)
-        return NULL;
-    sym = dlsym(h, name);
-    (void)dlclose(h);
-    return sym;
-}
-
-#elif defined(USE_HPSHL)
-
-#include <dl.h>
-
-static void *
-pr_FindSymbolInProg(const char *name)
-{
-    shl_t h = NULL;
-    void *sym;
-
-    if (shl_findsym(&h, name, TYPE_DATA, &sym) == -1)
-        return NULL;
-    return sym;
-}
-
-#elif defined(USE_MACH_DYLD)
-
-static void *
-pr_FindSymbolInProg(const char *name)
-{
-    /* FIXME: not implemented */
-    return NULL;
-}
-
-#else
-
-#error "The zone allocator is not supported on this platform"
-
-#endif
-
-#else /* !defined(HAVE_DLL) */
-
-static void *
-pr_FindSymbolInProg(const char *name)
-{
-    /* can't be implemented */
-    return NULL;
-}
-
-#endif /* HAVE_DLL */
-
-void
-_PR_InitZones(void)
-{
-    int i, j;
-    char *envp;
-    PRBool *sym;
-
-    if ((sym = (PRBool *)pr_FindSymbolInProg("nspr_use_zone_allocator")) != NULL) {
-        use_zone_allocator = *sym;
-    } else if ((envp = getenv("NSPR_USE_ZONE_ALLOCATOR")) != NULL) {
-        use_zone_allocator = (atoi(envp) == 1);
-    }
-
-    if (!use_zone_allocator)
-        return;
-
-    for (j = 0; j < THREAD_POOLS; j++) { 
-        for (i = 0; i < MEM_ZONES; i++) {
-            MemoryZone *mz = &zones[i][j];
-            int rv = pthread_mutex_init(&mz->lock, NULL);
-            PR_ASSERT(0 == rv);
-            if (rv != 0) {
-                goto loser;
-            } 
-            mz->blockSize = 16 << ( 2 * i);
-        }
-    }
-    return;
-
-loser:
-    _PR_DestroyZones();
-    return;
-}
-
-static void *
-pr_ZoneMalloc(PRUint32 size)
-{
-    void         *rv;
-    unsigned int  zone;
-    size_t        blockSize;
-    MemBlockHdr  *mb, *mt;
-    MemoryZone   *mz;
-
-    /* Always allocate a non-zero amount of bytes */
-    if (size < 1) {
-        size = 1;
-    }
-    for (zone = 0, blockSize = 16; zone < MEM_ZONES; ++zone, blockSize <<= 2) {
-        if (size <= blockSize) {
-            break;
-        }
-    }
-    if (zone < MEM_ZONES) {
-        pthread_t me = pthread_self();
-        unsigned int pool = (PRUptrdiff)me % THREAD_POOLS;
-        PRUint32     wasLocked;
-        mz = &zones[zone][pool];
-        wasLocked = mz->locked;
-        pthread_mutex_lock(&mz->lock);
-        mz->locked = 1;
-        if (wasLocked)
-            mz->contention++;
-        if (mz->head) {
-            mb = mz->head;
-            PR_ASSERT(mb->s.magic == ZONE_MAGIC);
-            PR_ASSERT(mb->s.zone  == mz);
-            PR_ASSERT(mb->s.blockSize == blockSize);
-            PR_ASSERT(mz->blockSize == blockSize);
-
-            mt = (MemBlockHdr *)(((char *)(mb + 1)) + blockSize);
-            PR_ASSERT(mt->s.magic == ZONE_MAGIC);
-            PR_ASSERT(mt->s.zone  == mz);
-            PR_ASSERT(mt->s.blockSize == blockSize);
-
-            mz->hits++;
-            mz->elements--;
-            mz->head = mb->s.next;    /* take off free list */
-            mz->locked = 0;
-            pthread_mutex_unlock(&mz->lock);
-
-            mt->s.next          = mb->s.next          = NULL;
-            mt->s.requestedSize = mb->s.requestedSize = size;
-
-            rv = (void *)(mb + 1);
-            return rv;
-        }
-
-        mz->misses++;
-        mz->locked = 0;
-        pthread_mutex_unlock(&mz->lock);
-
-        mb = (MemBlockHdr *)malloc(blockSize + 2 * (sizeof *mb));
-        if (!mb) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return NULL;
-        }
-        mb->s.next          = NULL;
-        mb->s.zone          = mz;
-        mb->s.magic         = ZONE_MAGIC;
-        mb->s.blockSize     = blockSize;
-        mb->s.requestedSize = size;
-
-        mt = (MemBlockHdr *)(((char *)(mb + 1)) + blockSize);
-        memcpy(mt, mb, sizeof *mb);
-
-        rv = (void *)(mb + 1);
-        return rv;
-    }
-
-    /* size was too big.  Create a block with no zone */
-    blockSize = (size & 15) ? size + 16 - (size & 15) : size;
-    mb = (MemBlockHdr *)malloc(blockSize + 2 * (sizeof *mb));
-    if (!mb) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    mb->s.next          = NULL;
-    mb->s.zone          = NULL;
-    mb->s.magic         = ZONE_MAGIC;
-    mb->s.blockSize     = blockSize;
-    mb->s.requestedSize = size;
-
-    mt = (MemBlockHdr *)(((char *)(mb + 1)) + blockSize);
-    memcpy(mt, mb, sizeof *mb);
-
-    rv = (void *)(mb + 1);
-    return rv;
-}
-
-
-static void *
-pr_ZoneCalloc(PRUint32 nelem, PRUint32 elsize)
-{
-    PRUint32 size = nelem * elsize;
-    void *p = pr_ZoneMalloc(size);
-    if (p) {
-        memset(p, 0, size);
-    }
-    return p;
-}
-
-static void *
-pr_ZoneRealloc(void *oldptr, PRUint32 bytes)
-{
-    void         *rv;
-    MemBlockHdr  *mb;
-    int           ours;
-    MemBlockHdr   phony;
-
-    if (!oldptr)
-        return pr_ZoneMalloc(bytes);
-    mb = (MemBlockHdr *)((char *)oldptr - (sizeof *mb));
-    if (mb->s.magic != ZONE_MAGIC) {
-        /* Maybe this just came from ordinary malloc */
-#ifdef DEBUG
-        fprintf(stderr,
-            "Warning: reallocing memory block %p from ordinary malloc\n",
-            oldptr);
-#endif
-        /*
-         * We are going to realloc oldptr.  If realloc succeeds, the
-         * original value of oldptr will point to freed memory.  So this
-         * function must not fail after a successfull realloc call.  We
-         * must perform any operation that may fail before the realloc
-         * call.
-         */
-        rv = pr_ZoneMalloc(bytes);  /* this may fail */
-        if (!rv) {
-            return rv;
-        }
-
-        /* We don't know how big it is.  But we can fix that. */
-        oldptr = realloc(oldptr, bytes);
-        /*
-         * If realloc returns NULL, this function loses the original
-         * value of oldptr.  This isn't a leak because the caller of
-         * this function still has the original value of oldptr.
-         */
-        if (!oldptr) {
-            if (bytes) {
-                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                pr_ZoneFree(rv);
-                return oldptr;
-            }
-        }
-        phony.s.requestedSize = bytes;
-        mb = &phony;
-        ours = 0;
-    } else {
-        size_t blockSize = mb->s.blockSize;
-        MemBlockHdr *mt = (MemBlockHdr *)(((char *)(mb + 1)) + blockSize);
-
-        PR_ASSERT(mt->s.magic == ZONE_MAGIC);
-        PR_ASSERT(mt->s.zone  == mb->s.zone);
-        PR_ASSERT(mt->s.blockSize == blockSize);
-	
-        if (bytes <= blockSize) {
-            /* The block is already big enough. */
-            mt->s.requestedSize = mb->s.requestedSize = bytes;
-            return oldptr;
-        }
-        ours = 1;
-        rv = pr_ZoneMalloc(bytes);
-        if (!rv) {
-            return rv;
-        }
-    }
-    
-    if (oldptr && mb->s.requestedSize)
-        memcpy(rv, oldptr, mb->s.requestedSize);
-    if (ours)
-        pr_ZoneFree(oldptr);
-    else if (oldptr)
-        free(oldptr);
-    return rv;
-}
-
-static void
-pr_ZoneFree(void *ptr)
-{
-    MemBlockHdr  *mb, *mt;
-    MemoryZone   *mz;
-    size_t        blockSize;
-    PRUint32      wasLocked;
-
-    if (!ptr)
-        return;
-
-    mb = (MemBlockHdr *)((char *)ptr - (sizeof *mb));
-
-    if (mb->s.magic != ZONE_MAGIC) {
-        /* maybe this came from ordinary malloc */
-#ifdef DEBUG
-        fprintf(stderr,
-            "Warning: freeing memory block %p from ordinary malloc\n", ptr);
-#endif
-        free(ptr);
-        return;
-    }
-
-    blockSize = mb->s.blockSize;
-    mz        = mb->s.zone;
-    mt = (MemBlockHdr *)(((char *)(mb + 1)) + blockSize);
-    PR_ASSERT(mt->s.magic == ZONE_MAGIC);
-    PR_ASSERT(mt->s.zone  == mz);
-    PR_ASSERT(mt->s.blockSize == blockSize);
-    if (!mz) {
-        PR_ASSERT(blockSize > 65536);
-        /* This block was not in any zone.  Just free it. */
-        free(mb);
-        return;
-    }
-    PR_ASSERT(mz->blockSize == blockSize);
-    wasLocked = mz->locked;
-    pthread_mutex_lock(&mz->lock);
-    mz->locked = 1;
-    if (wasLocked)
-        mz->contention++;
-    mt->s.next = mb->s.next = mz->head;        /* put on head of list */
-    mz->head = mb;
-    mz->elements++;
-    mz->locked = 0;
-    pthread_mutex_unlock(&mz->lock);
-}
-
-PR_IMPLEMENT(void *) PR_Malloc(PRUint32 size)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    return use_zone_allocator ? pr_ZoneMalloc(size) : malloc(size);
-}
-
-PR_IMPLEMENT(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    return use_zone_allocator ?
-        pr_ZoneCalloc(nelem, elsize) : calloc(nelem, elsize);
-}
-
-PR_IMPLEMENT(void *) PR_Realloc(void *ptr, PRUint32 size)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    return use_zone_allocator ? pr_ZoneRealloc(ptr, size) : realloc(ptr, size);
-}
-
-PR_IMPLEMENT(void) PR_Free(void *ptr)
-{
-    if (use_zone_allocator)
-        pr_ZoneFree(ptr);
-    else
-        free(ptr);
-}
-
-#else /* !defined(_PR_ZONE_ALLOCATOR) */
-
-/*
-** The PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free functions simply
-** call their libc equivalents now.  This may seem redundant, but it
-** ensures that we are calling into the same runtime library.  On
-** Win32, it is possible to have multiple runtime libraries (e.g.,
-** objects compiled with /MD and /MDd) in the same process, and
-** they maintain separate heaps, which cannot be mixed.
-*/
-PR_IMPLEMENT(void *) PR_Malloc(PRUint32 size)
-{
-#if defined (WIN16)
-    return PR_MD_malloc( (size_t) size);
-#else
-    return malloc(size);
-#endif
-}
-
-PR_IMPLEMENT(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize)
-{
-#if defined (WIN16)
-    return PR_MD_calloc( (size_t)nelem, (size_t)elsize );
-    
-#else
-    return calloc(nelem, elsize);
-#endif
-}
-
-PR_IMPLEMENT(void *) PR_Realloc(void *ptr, PRUint32 size)
-{
-#if defined (WIN16)
-    return PR_MD_realloc( ptr, (size_t) size);
-#else
-    return realloc(ptr, size);
-#endif
-}
-
-PR_IMPLEMENT(void) PR_Free(void *ptr)
-{
-#if defined (WIN16)
-    PR_MD_free( ptr );
-#else
-    free(ptr);
-#endif
-}
-
-#endif /* _PR_ZONE_ALLOCATOR */
-
-/*
-** Complexity alert!
-**
-** If malloc/calloc/free (etc.) were implemented to use pr lock's then
-** the entry points could block when called if some other thread had the
-** lock.
-**
-** Most of the time this isn't a problem. However, in the case that we
-** are using the thread safe malloc code after PR_Init but before
-** PR_AttachThread has been called (on a native thread that nspr has yet
-** to be told about) we could get royally screwed if the lock was busy
-** and we tried to context switch the thread away. In this scenario
-** 	PR_CURRENT_THREAD() == NULL
-**
-** To avoid this unfortunate case, we use the low level locking
-** facilities for malloc protection instead of the slightly higher level
-** locking. This makes malloc somewhat faster so maybe it's a good thing
-** anyway.
-*/
-#ifdef _PR_OVERRIDE_MALLOC
-
-/* Imports */
-extern void *_PR_UnlockedMalloc(size_t size);
-extern void *_PR_UnlockedMemalign(size_t alignment, size_t size);
-extern void _PR_UnlockedFree(void *ptr);
-extern void *_PR_UnlockedRealloc(void *ptr, size_t size);
-extern void *_PR_UnlockedCalloc(size_t n, size_t elsize);
-
-static PRBool _PR_malloc_initialised = PR_FALSE;
-
-#ifdef _PR_PTHREADS
-static pthread_mutex_t _PR_MD_malloc_crustylock;
-
-#define _PR_Lock_Malloc() {						\
-    				if(PR_TRUE == _PR_malloc_initialised) { \
-					PRStatus rv;			\
-					rv = pthread_mutex_lock(&_PR_MD_malloc_crustylock); \
-					PR_ASSERT(0 == rv);		\
-				}
-
-#define _PR_Unlock_Malloc() 	if(PR_TRUE == _PR_malloc_initialised) { \
-					PRStatus rv;			\
-					rv = pthread_mutex_unlock(&_PR_MD_malloc_crustylock); \
-					PR_ASSERT(0 == rv);		\
-				}					\
-			  }
-#else /* _PR_PTHREADS */
-static _MDLock _PR_MD_malloc_crustylock;
-
-#ifdef IRIX
-#define _PR_Lock_Malloc() {						\
-			   PRIntn _is;					\
-    				if(PR_TRUE == _PR_malloc_initialised) { \
-				if (_PR_MD_GET_ATTACHED_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_PR_MD_GET_ATTACHED_THREAD()))	\
-						_PR_INTSOFF(_is); 	\
-					_PR_MD_LOCK(&_PR_MD_malloc_crustylock); \
-				}
-
-#define _PR_Unlock_Malloc() 	if(PR_TRUE == _PR_malloc_initialised) { \
-					_PR_MD_UNLOCK(&_PR_MD_malloc_crustylock); \
-				if (_PR_MD_GET_ATTACHED_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_PR_MD_GET_ATTACHED_THREAD()))	\
-						_PR_INTSON(_is);	\
-				}					\
-			  }
-#else	/* IRIX */
-#define _PR_Lock_Malloc() {						\
-			   PRIntn _is;					\
-    				if(PR_TRUE == _PR_malloc_initialised) { \
-				if (_PR_MD_CURRENT_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_PR_MD_CURRENT_THREAD()))	\
-						_PR_INTSOFF(_is); 	\
-					_PR_MD_LOCK(&_PR_MD_malloc_crustylock); \
-				}
-
-#define _PR_Unlock_Malloc() 	if(PR_TRUE == _PR_malloc_initialised) { \
-					_PR_MD_UNLOCK(&_PR_MD_malloc_crustylock); \
-				if (_PR_MD_CURRENT_THREAD() && 		\
-					!_PR_IS_NATIVE_THREAD( 		\
-					_PR_MD_CURRENT_THREAD()))	\
-						_PR_INTSON(_is);	\
-				}					\
-			  }
-#endif	/* IRIX	*/
-#endif /* _PR_PTHREADS */
-
-PR_IMPLEMENT(PRStatus) _PR_MallocInit(void)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if( PR_TRUE == _PR_malloc_initialised ) return PR_SUCCESS;
-
-#ifdef _PR_PTHREADS
-    {
-	int status;
-	pthread_mutexattr_t mattr;
-
-	status = _PT_PTHREAD_MUTEXATTR_INIT(&mattr);
-	PR_ASSERT(0 == status);
-	status = _PT_PTHREAD_MUTEX_INIT(_PR_MD_malloc_crustylock, mattr);
-	PR_ASSERT(0 == status);
-	status = _PT_PTHREAD_MUTEXATTR_DESTROY(&mattr);
-	PR_ASSERT(0 == status);
-    }
-#else /* _PR_PTHREADS */
-    _MD_NEW_LOCK(&_PR_MD_malloc_crustylock);
-#endif /* _PR_PTHREADS */
-
-    if( PR_SUCCESS == rv )
-    {
-        _PR_malloc_initialised = PR_TRUE;
-    }
-
-    return rv;
-}
-
-void *malloc(size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedMalloc(size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-#if defined(IRIX)
-void *memalign(size_t alignment, size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedMemalign(alignment, size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void *valloc(size_t size)
-{
-    return(memalign(sysconf(_SC_PAGESIZE),size));
-}
-#endif	/* IRIX */
-
-void free(void *ptr)
-{
-    _PR_Lock_Malloc();
-    _PR_UnlockedFree(ptr);
-    _PR_Unlock_Malloc();
-}
-
-void *realloc(void *ptr, size_t size)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedRealloc(ptr, size);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void *calloc(size_t n, size_t elsize)
-{
-    void *p;
-    _PR_Lock_Malloc();
-    p = _PR_UnlockedCalloc(n, elsize);
-    _PR_Unlock_Malloc();
-    return p;
-}
-
-void cfree(void *p)
-{
-    _PR_Lock_Malloc();
-    _PR_UnlockedFree(p);
-    _PR_Unlock_Malloc();
-}
-
-void _PR_InitMem(void)
-{
-    PRStatus rv;
-    rv = _PR_MallocInit();
-    PR_ASSERT(PR_SUCCESS == rv);
-}
-
-#endif /* _PR_OVERRIDE_MALLOC */
diff --git a/libs/js/nsprpub/pr/src/md/.cvsignore b/libs/js/nsprpub/pr/src/md/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/md/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/md/Makefile.in b/libs/js/nsprpub/pr/src/md/Makefile.in
deleted file mode 100644
index 2b8d47789c..0000000000
--- a/libs/js/nsprpub/pr/src/md/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = $(PR_MD_ARCH_DIR)
-
-CSRCS =          \
-	prosdep.c \
-	$(NULL)
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/md/beos/.cvsignore b/libs/js/nsprpub/pr/src/md/beos/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/md/beos/Makefile.in b/libs/js/nsprpub/pr/src/md/beos/Makefile.in
deleted file mode 100644
index fca5cf2c26..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-include $(srcdir)/bsrcs.mk
-CSRCS += $(MDCSRCS)
-
-TARGETS		= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/md/beos/bcpu.c b/libs/js/nsprpub/pr/src/md/beos/bcpu.c
deleted file mode 100644
index 548df8c282..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bcpu.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-PR_EXTERN(void) _PR_MD_INIT_CPUS();
-PR_EXTERN(void) _PR_MD_WAKEUP_CPUS();
-PR_EXTERN(void) _PR_MD_START_INTERRUPTS(void);
-PR_EXTERN(void) _PR_MD_STOP_INTERRUPTS(void);
-PR_EXTERN(void) _PR_MD_DISABLE_CLOCK_INTERRUPTS(void);
-PR_EXTERN(void) _PR_MD_BLOCK_CLOCK_INTERRUPTS(void);
-PR_EXTERN(void) _PR_MD_UNBLOCK_CLOCK_INTERRUPTS(void);
-PR_EXTERN(void) _PR_MD_CLOCK_INTERRUPT(void);
-PR_EXTERN(void) _PR_MD_INIT_STACK(PRThreadStack *ts, PRIntn redzone);
-PR_EXTERN(void) _PR_MD_CLEAR_STACK(PRThreadStack* ts);
-PR_EXTERN(PRInt32) _PR_MD_GET_INTSOFF(void);
-PR_EXTERN(void) _PR_MD_SET_INTSOFF(PRInt32 _val);
-PR_EXTERN(_PRCPU*) _PR_MD_CURRENT_CPU(void);
-PR_EXTERN(void) _PR_MD_SET_CURRENT_CPU(_PRCPU *cpu);
-PR_EXTERN(void) _PR_MD_INIT_RUNNING_CPU(_PRCPU *cpu);
-PR_EXTERN(PRInt32) _PR_MD_PAUSE_CPU(PRIntervalTime timeout);
diff --git a/libs/js/nsprpub/pr/src/md/beos/beos.c b/libs/js/nsprpub/pr/src/md/beos/beos.c
deleted file mode 100644
index dba9ae24d1..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/beos.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-#include <unistd.h>
-#include <memory.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-
-/*
- * Make sure _PRSockLen_t is 32-bit, because we will cast a PRUint32* or
- * PRInt32* pointer to a _PRSockLen_t* pointer.
- */
-#define _PRSockLen_t int
-
-/*
-** Global lock variable used to bracket calls into rusty libraries that
-** aren't thread safe (like libc, libX, etc).
-*/
-static PRLock *_pr_rename_lock = NULL;
-static PRMonitor *_pr_Xfe_mon = NULL;
-
-/*
- * Variables used by the GC code, initialized in _MD_InitSegs().
- * _pr_zero_fd should be a static variable.  Unfortunately, there is
- * still some Unix-specific code left in function PR_GrowSegment()
- * in file memory/prseg.c that references it, so it needs
- * to be a global variable for now.
- */
-PRInt32 _pr_zero_fd = -1;
-static PRLock *_pr_md_lock = NULL;
-
-sigset_t timer_set;
-
-void _PR_UnixInit()
-{
-	struct sigaction sigact;
-	int rv;
-
-	sigemptyset(&timer_set);
-
-	sigact.sa_handler = SIG_IGN;
-	sigemptyset(&sigact.sa_mask);
-	sigact.sa_flags = 0;
-	rv = sigaction(SIGPIPE, &sigact, 0);
-	PR_ASSERT(0 == rv);
-
-	_pr_rename_lock = PR_NewLock();
-	PR_ASSERT(NULL != _pr_rename_lock);
-	_pr_Xfe_mon = PR_NewMonitor();
-	PR_ASSERT(NULL != _pr_Xfe_mon);
-}
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the Unix
- *     implementation.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTime)
-PR_Now(void)
-{
-	struct timeval tv;
-	PRInt64 s, us, s2us;
-
-	GETTIMEOFDAY(&tv);
-	LL_I2L(s2us, PR_USEC_PER_SEC);
-	LL_I2L(s, tv.tv_sec);
-	LL_I2L(us, tv.tv_usec);
-	LL_MUL(s, s, s2us);
-	LL_ADD(s, s, us);
-	return s;
-}
-
-PRIntervalTime
-_PR_UNIX_GetInterval()
-{
-	struct timeval time;
-	PRIntervalTime ticks;
-
-	(void)GETTIMEOFDAY(&time);  /* fallicy of course */
-	ticks = (PRUint32)time.tv_sec * PR_MSEC_PER_SEC;  /* that's in milliseconds */
-	ticks += (PRUint32)time.tv_usec / PR_USEC_PER_MSEC;  /* so's that */
-	return ticks;
-}  /* _PR_SUNOS_GetInterval */
-
-PRIntervalTime _PR_UNIX_TicksPerSecond()
-{
-	return 1000;  /* this needs some work :) */
-}
-
-/************************************************************************/
-
-/*
-** Special hacks for xlib. Xlib/Xt/Xm is not re-entrant nor is it thread
-** safe.  Unfortunately, neither is mozilla. To make these programs work
-** in a pre-emptive threaded environment, we need to use a lock.
-*/
-
-void PR_XLock()
-{
-	PR_EnterMonitor(_pr_Xfe_mon);
-}
-
-void PR_XUnlock()
-{
-	PR_ExitMonitor(_pr_Xfe_mon);
-}
-
-PRBool PR_XIsLocked()
-{
-	return (PR_InMonitor(_pr_Xfe_mon)) ? PR_TRUE : PR_FALSE;
-}
-
-void PR_XWait(int ms)
-{
-	PR_Wait(_pr_Xfe_mon, PR_MillisecondsToInterval(ms));
-}
-
-void PR_XNotify(void)
-{
-	PR_Notify(_pr_Xfe_mon);
-}
-
-void PR_XNotifyAll(void)
-{
-	PR_NotifyAll(_pr_Xfe_mon);
-}
-
-#if !defined(BEOS)
-#ifdef HAVE_BSD_FLOCK
-
-#include <sys/file.h>
-
-PR_IMPLEMENT(PRStatus)
-_MD_LOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = flock(f, LOCK_EX);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_TLOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = flock(f, LOCK_EX|LOCK_NB);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_UNLOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = flock(f, LOCK_UN);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-#else
-
-PR_IMPLEMENT(PRStatus)
-_MD_LOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = lockf(f, F_LOCK, 0);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_TLOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = lockf(f, F_TLOCK, 0);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_UNLOCKFILE (PRInt32 f)
-{
-	PRInt32 rv;
-	rv = lockf(f, F_ULOCK, 0);
-	if (rv == 0)
-		return PR_SUCCESS;
-	_PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-	return PR_FAILURE;
-}
-#endif
-
-PR_IMPLEMENT(PRStatus)
-  _MD_GETHOSTNAME (char *name, PRUint32 namelen)
-{
-    PRIntn rv;
-
-    rv = gethostname(name, namelen);
-    if (0 == rv) {
-		return PR_SUCCESS;
-    }
-	_PR_MD_MAP_GETHOSTNAME_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-#endif
diff --git a/libs/js/nsprpub/pr/src/md/beos/beos_errors.c b/libs/js/nsprpub/pr/src/md/beos/beos_errors.c
deleted file mode 100644
index bfb44eb7e3..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/beos_errors.c
+++ /dev/null
@@ -1,1526 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prtypes.h"
-#include "md/_unix_errors.h"
-#include "prerror.h"
-#include <errno.h>
-
-void _MD_unix_map_opendir_error(int err)
-{
-	switch (err) {
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EMFILE:
-			PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ENFILE:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_closedir_error(int err)
-{
-	switch (err) {
-		case EINVAL:
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_readdir_error(int err)
-{
-
-	switch (err) {
-		case 0:
-		case ENOENT:
-			PR_SetError(PR_NO_MORE_FILES_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#ifdef IRIX
-#ifdef IRIX5_3
-#else
-		case EDIRCORRUPTED:
-			PR_SetError(PR_DIRECTORY_CORRUPTED_ERROR, err);
-			break;
-#endif
-#endif
-#ifdef EOVERFLOW
-		case EOVERFLOW:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-#endif
-		case EINVAL:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-#ifdef EBADMSG
-		case EBADMSG:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-#endif
-		case EDEADLK:
-			PR_SetError(PR_DEADLOCK_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ENOLCK:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-#ifdef ENOLINK
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
-		case ENXIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_unlink_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EBUSY:
-			PR_SetError(PR_FILESYSTEM_MOUNTED_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EPERM:
-			PR_SetError(PR_IS_DIRECTORY_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_stat_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-#ifdef EOVERFLOW
-		case EOVERFLOW:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_fstat_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ETIMEDOUT:
-#ifdef ENOLINK
-		case ENOLINK:
-#endif
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#ifdef EOVERFLOW
-		case EOVERFLOW:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_rename_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EBUSY:
-			PR_SetError(PR_FILESYSTEM_MOUNTED_ERROR, err);
-			break;
-#ifdef EDQUOT
-		case EDQUOT:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-#endif
-		case EEXIST:
-			PR_SetError(PR_DIRECTORY_NOT_EMPTY_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case EISDIR:
-			PR_SetError(PR_IS_DIRECTORY_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOSPC:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		case EXDEV:
-			PR_SetError(PR_NOT_SAME_DEVICE_ERROR, err);
-			break;
-		case EMLINK:
-			PR_SetError(PR_MAX_DIRECTORY_ENTRIES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_access_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_mkdir_error(int err)
-{
-	switch (err) {
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EEXIST:
-			PR_SetError(PR_FILE_EXISTS_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case EMLINK:
-			PR_SetError(PR_MAX_DIRECTORY_ENTRIES_ERROR, err);
-			break;
-		case ENOSPC:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-#ifdef EDQUOT
-		case EDQUOT:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-#endif
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_rmdir_error(int err)
-{
-
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EBUSY:
-			PR_SetError(PR_FILESYSTEM_MOUNTED_ERROR, err);
-			break;
-		case EEXIST:
-			PR_SetError(PR_DIRECTORY_NOT_EMPTY_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_DIRECTORY_NOT_EMPTY_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_read_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#ifdef EBADMSG
-		case EBADMSG:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-#endif
-		case EDEADLK:
-			PR_SetError(PR_DEADLOCK_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ENOLCK:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ENXIO:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EISDIR:
-			PR_SetError(PR_IS_DIRECTORY_ERROR, err);
-			break;
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-#ifdef ENOLINK
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_write_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EDEADLK:
-			PR_SetError(PR_DEADLOCK_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EFBIG:
-			PR_SetError(PR_FILE_TOO_BIG_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ENOLCK:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case ENOSPC:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		case ENXIO:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		case ERANGE:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-#ifdef EDQUOT
-		case EDQUOT:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-#endif
-#ifdef ENOLINK
-		case ENOLINK:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_lseek_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ESPIPE:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_fsync_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#ifdef ENOLINK
-		case ENOLINK:
-#endif
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_METHOD_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_close_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-#ifdef ENOLINK
-		case ENOLINK:
-#endif
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_socket_error(int err)
-{
-	switch (err) {
-		case EPROTONOSUPPORT:
-			PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-			break;
-		case EMFILE:
-			PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ENFILE:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-#if !defined(SCO)
-		case ENOBUFS:
-#endif /* !defined(SCO) */
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_socketavailable_error(int err)
-{
-	PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-}
-
-void _MD_unix_map_recv_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_recvfrom_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case ECONNRESET:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_send_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-#if !defined(BEOS)
-		case EMSGSIZE:
-#endif
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-#if !defined(SCO)
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif /* !defined(SCO) */
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_sendto_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-#if !defined(BEOS)
-		case EMSGSIZE:
-#endif
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-#if !defined(SCO)
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif /* !defined(SCO) */
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_writev_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ECONNRESET:
-		case EPIPE:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_accept_error(int err)
-{
-	switch (err) {
-		case EAGAIN:
-#if EWOULDBLOCK != EAGAIN
-		case EWOULDBLOCK:
-#endif
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-#if !defined(BEOS)
-		case EOPNOTSUPP:
-#endif
-		case ENODEV:
-			PR_SetError(PR_NOT_TCP_SOCKET_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EMFILE:
-			PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ENFILE:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-#ifdef EPROTO
-		case EPROTO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_connect_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EADDRNOTAVAIL:
-			PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-			break;
-		case EINPROGRESS:
-			PR_SetError(PR_IN_PROGRESS_ERROR, err);
-			break;
-		case EALREADY:
-			PR_SetError(PR_ALREADY_INITIATED_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case EAFNOSUPPORT:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_IO_TIMEOUT_ERROR, err);
-			break;
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case ENETUNREACH:
-			PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, err);
-			break;
-		case EADDRINUSE:
-			PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		/*
-		 * UNIX domain sockets are not supported in NSPR
-		 */
-		case EACCES:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EIO:
-#if defined(UNIXWARE) || defined(SNI) || defined(NEC)
-			/*
-			 * On some platforms, if we connect to a port on
-			 * the local host (the loopback address) that no
-			 * process is listening on, we get EIO instead
-			 * of ECONNREFUSED.
-			 */
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-#else
-			PR_SetError(PR_IO_ERROR, err);
-#endif
-			break;
-		case ELOOP:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		case ENOENT:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		case ENXIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case EPROTOTYPE:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_bind_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EADDRNOTAVAIL:
-			PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-			break;
-		case EADDRINUSE:
-			PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_SOCKET_ADDRESS_IS_BOUND_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		/*
-		 * UNIX domain sockets are not supported in NSPR
-		 */
-		case EIO:
-		case EISDIR:
-		case ELOOP:
-		case ENOENT:
-		case ENOTDIR:
-		case EROFS:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_listen_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-#if !defined(BEOS)
-		case EOPNOTSUPP:
-			PR_SetError(PR_NOT_TCP_SOCKET_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_shutdown_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case ENOTCONN:
-			PR_SetError(PR_NOT_CONNECTED_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_socketpair_error(int err)
-{
-	switch (err) {
-		case EMFILE:
-			PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case EAFNOSUPPORT:
-		case EPROTONOSUPPORT:
-#if !defined(BEOS)
-		case EOPNOTSUPP:
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_getsockname_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#if !defined(SCO)
-		case ENOBUFS:
-#endif /* !defined(SCO) */
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_getpeername_error(int err)
-{
-
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case ENOTCONN:
-			PR_SetError(PR_NOT_CONNECTED_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#if !defined(SCO)
-		case ENOBUFS:
-#endif /* !defined(SCO) */
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_getsockopt_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case ENOPROTOOPT:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_setsockopt_error(int err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-#if !defined(BEOS)
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#endif
-		case ENOPROTOOPT:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-		case ENOMEM:
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_open_error(int err)
-{
-	switch (err) {
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EAGAIN:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case EBUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case EEXIST:
-			PR_SetError(PR_FILE_EXISTS_ERROR, err);
-			break;
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case EIO:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case EISDIR:
-			PR_SetError(PR_IS_DIRECTORY_ERROR, err);
-			break;
-		case ELOOP:
-			PR_SetError(PR_LOOP_ERROR, err);
-			break;
-		case EMFILE:
-			PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ENAMETOOLONG:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ENFILE:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ENODEV:
-		case ENOENT:
-		case ENXIO:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ENOSPC:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-#ifdef ENOSR
-		case ENOSR:
-#endif
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ENOTDIR:
-			PR_SetError(PR_NOT_DIRECTORY_ERROR, err);
-			break;
-		case EPERM:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_REMOTE_FILE_ERROR, err);
-			break;
-		case EROFS:
-			PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_mmap_error(int err)
-{
-
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EAGAIN:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ENOMEM:
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_unix_map_gethostname_error(int err)
-{
-    switch (err) {
-		case EFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
-
-void _MD_unix_map_select_error(int err)
-{
-    switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EINTR:
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
-
-void _MD_unix_map_poll_error(int err)
-{
-    PRErrorCode prerror;
-    switch (err) {
-        case EAGAIN:
-            prerror = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case EINVAL:
-            prerror = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case EFAULT:
-            prerror = PR_ACCESS_FAULT_ERROR;
-            break;
-        default:
-            prerror = PR_UNKNOWN_ERROR;
-            break;
-    }
-    PR_SetError(prerror, err);
-}
-
-void _MD_unix_map_flock_error(int err)
-{
-    switch (err) {
-		case EBADF:
-		case EINVAL:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EWOULDBLOCK:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
-
-void _MD_unix_map_lockf_error(int err)
-{
-    switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case EDEADLK:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
-
-#ifdef HPUX11
-void _MD_hpux_map_sendfile_error(int oserror)
-{
-    PRErrorCode prerror;
-
-    switch (oserror) {
-        case ENOTSOCK:
-            prerror = PR_NOT_SOCKET_ERROR;
-            break;
-        case EFAULT:
-            prerror = PR_ACCESS_FAULT_ERROR;
-            break;
-        case ENOBUFS:
-            prerror = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case EINVAL:
-            prerror = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case ENOTCONN:
-            prerror = PR_NOT_CONNECTED_ERROR;
-            break;
-        case EPIPE:
-            prerror = PR_CONNECT_RESET_ERROR;
-            break;
-        case ENOMEM:
-            prerror = PR_OUT_OF_MEMORY_ERROR;
-            break;
-        case EOPNOTSUPP:
-            prerror = PR_NOT_TCP_SOCKET_ERROR;
-            break;
-        default:
-            prerror = PR_UNKNOWN_ERROR;
-    }
-    PR_SetError(prerror, oserror); 
-}
-#endif /* HPUX11 */
diff --git a/libs/js/nsprpub/pr/src/md/beos/bfile.c b/libs/js/nsprpub/pr/src/md/beos/bfile.c
deleted file mode 100644
index 103fb8ef4f..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bfile.c
+++ /dev/null
@@ -1,902 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; c-basic-offset: 8 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "primpl.h"
-
-/*
-** Global lock variable used to bracket calls into rusty libraries that
-** aren't thread safe (like libc, libX, etc).
-*/
-static PRLock *_pr_rename_lock = NULL; 
-
-void
-_MD_InitIO (void)
-{
-}
-
-PRStatus
-_MD_open_dir (_MDDir *md,const char *name)
-{
-int err;
-
-	md->d = opendir(name);
-	if (!md->d) {
-		err = _MD_ERRNO();
-		_PR_MD_MAP_OPENDIR_ERROR(err);
-		return PR_FAILURE;
-	}
-	return PR_SUCCESS;
-}
-
-char*
-_MD_read_dir (_MDDir *md, PRIntn flags)
-{
-struct dirent *de;
-int err;
-
-	for (;;) {
-		/*
-		 * XXX: readdir() is not MT-safe
-		 */
-		_MD_ERRNO() = 0;
-		de = readdir(md->d);
-
-		if (!de) {
-			err = _MD_ERRNO();
-			_PR_MD_MAP_READDIR_ERROR(err);
-			return 0;
-		}
-
-		if ((flags & PR_SKIP_DOT) &&
-		    (de->d_name[0] == '.') && (de->d_name[1] == 0))
-			continue;
-
-		if ((flags & PR_SKIP_DOT_DOT) &&
-		    (de->d_name[0] == '.') && (de->d_name[1] == '.') &&
-		    (de->d_name[2] == 0))
-			continue;
-
-		if ((flags & PR_SKIP_HIDDEN) && (de->d_name[1] == '.'))
-			continue;
-
-		break;
-	}
-	return de->d_name;
-}
-
-
-PRInt32
-_MD_close_dir (_MDDir *md)
-{
-int rv = 0, err;
-
-	if (md->d) {
-		rv = closedir(md->d);
-		if (rv == -1) {
-			err = _MD_ERRNO();
-			_PR_MD_MAP_CLOSEDIR_ERROR(err);
-		}
-	}
-	return(rv);
-}
-
-void
-_MD_make_nonblock (PRFileDesc *fd)
-{
-	int blocking = 1;
-	setsockopt(fd->secret->md.osfd, SOL_SOCKET, SO_NONBLOCK, &blocking, sizeof(blocking));
-
-}
-
-PRStatus
-_MD_set_fd_inheritable (PRFileDesc *fd, PRBool inheritable)
-{
-        int rv;
-	
-        rv = fcntl(fd->secret->md.osfd, F_SETFD, inheritable ? 0 : FD_CLOEXEC);
-        if (-1 == rv) {
-                PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-                return PR_FAILURE;
-        }
-        return PR_SUCCESS;
-}
-
-void
-_MD_init_fd_inheritable (PRFileDesc *fd, PRBool imported)
-{
-	if (imported) {
-		fd->secret->inheritable = _PR_TRI_UNKNOWN;
-	} else {
-		int flags = fcntl(fd->secret->md.osfd, F_GETFD, 0);
-		if (flags == -1) {
-			PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-			return;
-		}
-		fd->secret->inheritable = (flags & FD_CLOEXEC) ? 
-			_PR_TRI_TRUE : _PR_TRI_FALSE;
-	}
-}
-
-void
-_MD_query_fd_inheritable (PRFileDesc *fd)
-{
-	int flags;
-	
-	PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-	flags = fcntl(fd->secret->md.osfd, F_GETFD, 0);
-	PR_ASSERT(-1 != flags);
-	fd->secret->inheritable = (flags & FD_CLOEXEC) ?
-		_PR_TRI_FALSE : _PR_TRI_TRUE;
-}
-
-PRInt32
-_MD_open (const char *name, PRIntn flags, PRIntn mode)
-{
-	PRInt32 osflags;
-	PRInt32 rv, err;
-
-	if (flags & PR_RDWR) {
-		osflags = O_RDWR;
-	} else if (flags & PR_WRONLY) {
-		osflags = O_WRONLY;
-	} else {
-		osflags = O_RDONLY;
-	}
-
-	if (flags & PR_EXCL)
-		osflags |= O_EXCL;
-	if (flags & PR_APPEND)
-		osflags |= O_APPEND;
-	if (flags & PR_TRUNCATE)
-		osflags |= O_TRUNC;
-	if (flags & PR_SYNC) {
-/* Ummmm.  BeOS doesn't appear to
-   support sync in any way shape or
-   form. */
-		return PR_NOT_IMPLEMENTED_ERROR;
-	}
-
-	/*
-	** On creations we hold the 'create' lock in order to enforce
-	** the semantics of PR_Rename. (see the latter for more details)
-	*/
-	if (flags & PR_CREATE_FILE)
-	{
-		osflags |= O_CREAT ;
-		if (NULL !=_pr_rename_lock)
-		    PR_Lock(_pr_rename_lock);
-	}
-
-        rv = open(name, osflags, mode);
-
-        if (rv < 0) {
-                err = _MD_ERRNO();
-                _PR_MD_MAP_OPEN_ERROR(err);
-        }                                                                      
-
-    if ((flags & PR_CREATE_FILE) && (NULL !=_pr_rename_lock))
-        PR_Unlock(_pr_rename_lock);
-        return rv;
-}
-
-PRInt32
-_MD_close_file (PRInt32 osfd)
-{
-PRInt32 rv, err;
-
-	rv = close(osfd);
-	if (rv == -1) {
-		err = _MD_ERRNO();
-		_PR_MD_MAP_CLOSE_ERROR(err);
-	}
-	return(rv);
-}
-
-PRInt32
-_MD_read (PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    PRInt32 rv, err;
-    PRInt32 osfd = fd->secret->md.osfd;
-
-    rv = read( osfd, buf, amount );
-    if (rv < 0) {
-	err = _MD_ERRNO();
-	_PR_MD_MAP_READ_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32
-_MD_write (PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    PRInt32 rv, err;
-    PRInt32 osfd = fd->secret->md.osfd;
-
-    rv = write( osfd, buf, amount );
-
-    if( rv < 0 ) {
-
-	err = _MD_ERRNO();
-	_PR_MD_MAP_WRITE_ERROR(err);
-    }
-    return( rv );
-}
-
-#ifndef BONE_VERSION /* Writev moves to bnet.c with BONE */
-PRInt32
-_MD_writev (PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-	    PRIntervalTime timeout)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-#endif
-
-PRInt32
-_MD_lseek (PRFileDesc *fd, PRInt32 offset, int whence)
-{
-PRInt32 rv, err;
-
-    rv = lseek (fd->secret->md.osfd, offset, whence);
-    if (rv == -1) {
-        err = _MD_ERRNO();
-	_PR_MD_MAP_LSEEK_ERROR(err);
-    }
-    return( rv );
-}
-
-PRInt64
-_MD_lseek64 (PRFileDesc *fd, PRInt64 offset, int whence)
-{
-PRInt32 rv, err;
-
-/* According to the BeOS headers, lseek accepts a
- * variable of type off_t for the offset, and off_t
- * is defined to be a 64-bit value.  So no special
- * cracking needs to be done on "offset".
- */
-
-    rv = lseek (fd->secret->md.osfd, offset, whence);
-    if (rv == -1) {
-        err = _MD_ERRNO();
-	_PR_MD_MAP_LSEEK_ERROR(err);
-    }
-    return( rv );
-}
-
-PRInt32
-_MD_fsync (PRFileDesc *fd)
-{
-PRInt32 rv, err;
-
-    rv = fsync(fd->secret->md.osfd);
-    if (rv == -1) {
-	err = _MD_ERRNO();
-	_PR_MD_MAP_FSYNC_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32
-_MD_delete (const char *name)
-{
-PRInt32 rv, err;
-
-    rv = unlink(name);
-    if (rv == -1)
-    {
-	err = _MD_ERRNO();
-        _PR_MD_MAP_UNLINK_ERROR(err);
-    }
-    return (rv);
-}
-
-PRInt32
-_MD_getfileinfo (const char *fn, PRFileInfo *info)
-{
-struct stat sb;
-PRInt32 rv, err;
-PRInt64 s, s2us;
-
-	rv = stat(fn, &sb);
-	if (rv < 0) {
-		err = _MD_ERRNO();
-		_PR_MD_MAP_STAT_ERROR(err);
-	} else if (info) {
-		if (S_IFREG & sb.st_mode)
-			info->type = PR_FILE_FILE;
-		else if (S_IFDIR & sb.st_mode)
-			info->type = PR_FILE_DIRECTORY;
-		else
-			info->type = PR_FILE_OTHER;
-
-		/* Must truncate file size for the 32 bit
-		   version */
-		info->size = (sb.st_size & 0xffffffff);
-		LL_I2L(s, sb.st_mtime);
-		LL_I2L(s2us, PR_USEC_PER_SEC);
-		LL_MUL(s, s, s2us);
-		info->modifyTime = s;
-		LL_I2L(s, sb.st_ctime);
-		LL_MUL(s, s, s2us);
-		info->creationTime = s;
-	}
-	return rv;
-}
-
-PRInt32
-_MD_getfileinfo64 (const char *fn, PRFileInfo64 *info)
-{
-struct stat sb;
-PRInt32 rv, err;
-PRInt64 s, s2us;
-
-	rv = stat(fn, &sb);
-	if (rv < 0) {
-		err = _MD_ERRNO();
-		_PR_MD_MAP_STAT_ERROR(err);
-	} else if (info) {
-		if (S_IFREG & sb.st_mode)
-			info->type = PR_FILE_FILE;
-		else if (S_IFDIR & sb.st_mode)
-			info->type = PR_FILE_DIRECTORY;
-		else
-			info->type = PR_FILE_OTHER;
-	
-		/* For the 64 bit version we can use
-		 * the native st_size without modification
-		 */
-		info->size = sb.st_size;
-		LL_I2L(s, sb.st_mtime);
-		LL_I2L(s2us, PR_USEC_PER_SEC);
-		LL_MUL(s, s, s2us);
-		info->modifyTime = s;
-		LL_I2L(s, sb.st_ctime);
-		LL_MUL(s, s, s2us);
-		info->creationTime = s;
-	}
-	return rv;
-}
-
-PRInt32
-_MD_getopenfileinfo (const PRFileDesc *fd, PRFileInfo *info)
-{
-        struct stat sb;
-        PRInt64 s, s2us;
-        PRInt32 rv, err;
-
-        rv = fstat(fd->secret->md.osfd, &sb);
-        if (rv < 0) {
-                        err = _MD_ERRNO();
-                        _PR_MD_MAP_FSTAT_ERROR(err);
-        } else if (info) {
-                if (info) {
-                        if (S_IFREG & sb.st_mode)
-                                info->type = PR_FILE_FILE ;
-                        else if (S_IFDIR & sb.st_mode)
-                                info->type = PR_FILE_DIRECTORY;
-                        else
-                                info->type = PR_FILE_OTHER;
-			/* Use lower 32 bits of file size */
-                        info->size = ( sb.st_size & 0xffffffff);
-                        LL_I2L(s, sb.st_mtime);
-                        LL_I2L(s2us, PR_USEC_PER_SEC);
-                        LL_MUL(s, s, s2us);
-                        info->modifyTime = s;
-                        LL_I2L(s, sb.st_ctime);
-                        LL_MUL(s, s, s2us);
-                        info->creationTime = s;
-                }
-        }
-        return rv;
-}
-
-PRInt32
-_MD_getopenfileinfo64 (const PRFileDesc *fd, PRFileInfo64 *info)
-{
-        struct stat sb;
-        PRInt64 s, s2us;
-        PRInt32 rv, err;
-
-        rv = fstat(fd->secret->md.osfd, &sb);
-        if (rv < 0) {
-                        err = _MD_ERRNO();
-                        _PR_MD_MAP_FSTAT_ERROR(err);
-        } else if (info) {
-                if (info) {
-                        if (S_IFREG & sb.st_mode)
-                                info->type = PR_FILE_FILE ;
-                        else if (S_IFDIR & sb.st_mode)
-                                info->type = PR_FILE_DIRECTORY;
-                        else
-                                info->type = PR_FILE_OTHER;
-                        info->size = sb.st_size;
-                        LL_I2L(s, sb.st_mtime);
-                        LL_I2L(s2us, PR_USEC_PER_SEC);
-                        LL_MUL(s, s, s2us);
-                        info->modifyTime = s;
-                        LL_I2L(s, sb.st_ctime);
-                        LL_MUL(s, s, s2us);
-                        info->creationTime = s;
-                }
-        }
-        return rv;
-}
-
-PRInt32
-_MD_rename (const char *from, const char *to)
-{
-    PRInt32 rv = -1, err;
-
-    /*
-    ** This is trying to enforce the semantics of WINDOZE' rename
-    ** operation. That means one is not allowed to rename over top
-    ** of an existing file. Holding a lock across these two function
-    ** and the open function is known to be a bad idea, but ....
-    */
-    if (NULL != _pr_rename_lock)
-        PR_Lock(_pr_rename_lock);
-    if (0 == access(to, F_OK))
-        PR_SetError(PR_FILE_EXISTS_ERROR, 0);
-    else
-    {
-            rv = rename(from, to);
-            if (rv < 0) {
-                    err = _MD_ERRNO();
-                    _PR_MD_MAP_RENAME_ERROR(err);
-            }
-    }
-    if (NULL != _pr_rename_lock)
-        PR_Unlock(_pr_rename_lock);
-    return rv; 
-}
-
-PRInt32
-_MD_access (const char *name, PRIntn how)
-{
-PRInt32 rv, err;
-int checkFlags;
-struct stat buf;
-
-	switch (how) {
-		case PR_ACCESS_WRITE_OK:
-			checkFlags = S_IWUSR | S_IWGRP | S_IWOTH;
-			break;
-		
-		case PR_ACCESS_READ_OK:
-			checkFlags = S_IRUSR | S_IRGRP | S_IROTH;
-			break;
-		
-		case PR_ACCESS_EXISTS:
-			/* we don't need to examine st_mode. */
-			break;
-		
-		default:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-			return -1;
-	}
-
-	rv = stat(name, &buf);
-	if (rv == 0 && how != PR_ACCESS_EXISTS && (!(buf.st_mode & checkFlags))) {
-		PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, 0);
-		return -1;
-	}
-
-	if (rv < 0) {
-		err = _MD_ERRNO();
-		_PR_MD_MAP_STAT_ERROR(err);
-	}
-
-	return(rv);
-}
-
-PRInt32
-_MD_stat (const char *name, struct stat *buf)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-
-PRInt32
-_MD_mkdir (const char *name, PRIntn mode)
-{
-    status_t rv;
-    int err;
-
-    /*
-    ** This lock is used to enforce rename semantics as described
-    ** in PR_Rename. Look there for more fun details.
-    */
-    if (NULL !=_pr_rename_lock)
-        PR_Lock(_pr_rename_lock);
-
-    rv = mkdir(name, mode);
-    if (rv < 0) {
-	err = _MD_ERRNO();
-	_PR_MD_MAP_MKDIR_ERROR(err);
-    }
-    if (NULL !=_pr_rename_lock)
-        PR_Unlock(_pr_rename_lock);
-    return rv; 
-}
-
-PRInt32
-_MD_rmdir (const char *name)
-{
-int rv, err;
-
-        rv = rmdir(name);
-        if (rv == -1) {
-                        err = _MD_ERRNO();
-                        _PR_MD_MAP_RMDIR_ERROR(err);
-        }
-        return rv;
-}
-
-PRInt32
-_MD_pr_poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-	PRInt32 rv = 0;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-	/*
-	 * This code is almost a duplicate of w32poll.c's _PR_MD_PR_POLL().
-	 */
-	fd_set rd, wt, ex;
-	PRFileDesc *bottom;
-	PRPollDesc *pd, *epd;
-	PRInt32 maxfd = -1, ready, err;
-	PRIntervalTime remaining, elapsed, start;
-
-	struct timeval tv, *tvp = NULL;
-
-	if (_PR_PENDING_INTERRUPT(me))
-	{
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-		return -1;
-	}
-
-	if (0 == npds) {
-		PR_Sleep(timeout);
-		return rv;
-	}
-
-	FD_ZERO(&rd);
-	FD_ZERO(&wt);
-	FD_ZERO(&ex);
-
-	ready = 0;
-	for (pd = pds, epd = pd + npds; pd < epd; pd++)
-	{
-		PRInt16 in_flags_read = 0, in_flags_write = 0;
-		PRInt16 out_flags_read = 0, out_flags_write = 0; 
-		
-		if ((NULL != pd->fd) && (0 != pd->in_flags))
-		{
-			if (pd->in_flags & PR_POLL_READ)
-			{
-				in_flags_read = (pd->fd->methods->poll)(pd->fd, pd->in_flags & ~PR_POLL_WRITE, &out_flags_read);
-			}
-			if (pd->in_flags & PR_POLL_WRITE)
-			{
-				in_flags_write = (pd->fd->methods->poll)(pd->fd, pd->in_flags & ~PR_POLL_READ, &out_flags_write);
-			}
-			if ((0 != (in_flags_read & out_flags_read))
-			    || (0 != (in_flags_write & out_flags_write)))
-			{
-				/* this one's ready right now */
-				if (0 == ready)
-				{
-					/*
-					 * We will have to return without calling the
-					 * system poll/select function.  So zero the
-					 * out_flags fields of all the poll descriptors
-					 * before this one. 
-					 */
-					PRPollDesc *prev;
-					for (prev = pds; prev < pd; prev++)
-					{
-						prev->out_flags = 0;
-					}
-				}
-				ready += 1;
-				pd->out_flags = out_flags_read | out_flags_write;
-			}
-			else
-			{
-				pd->out_flags = 0;  /* pre-condition */
-				
-				/* make sure this is an NSPR supported stack */
-				bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-				PR_ASSERT(NULL != bottom);  /* what to do about that? */
-				if ((NULL != bottom)
-				    && (_PR_FILEDESC_OPEN == bottom->secret->state))
-				{
-					if (0 == ready)
-					{
-						PRInt32 osfd = bottom->secret->md.osfd; 
-						if (osfd > maxfd) maxfd = osfd;
-						if (in_flags_read & PR_POLL_READ)
-						{
-							pd->out_flags |= _PR_POLL_READ_SYS_READ;
-							FD_SET(osfd, &rd);
-						}
-						if (in_flags_read & PR_POLL_WRITE)
-						{
-							pd->out_flags |= _PR_POLL_READ_SYS_WRITE;
-							FD_SET(osfd, &wt);
-						}
-						if (in_flags_write & PR_POLL_READ)
-						{
-							pd->out_flags |= _PR_POLL_WRITE_SYS_READ;
-							FD_SET(osfd, &rd);
-						}
-						if (in_flags_write & PR_POLL_WRITE)
-						{
-							pd->out_flags |= _PR_POLL_WRITE_SYS_WRITE;
-							FD_SET(osfd, &wt);
-						}
-						if (pd->in_flags & PR_POLL_EXCEPT) FD_SET(osfd, &ex);
-					}
-				}
-				else
-				{
-					if (0 == ready)
-					{
-						PRPollDesc *prev;
-						for (prev = pds; prev < pd; prev++)
-						{
-							prev->out_flags = 0;
-						}
-					}
-					ready += 1;  /* this will cause an abrupt return */
-					pd->out_flags = PR_POLL_NVAL;  /* bogii */
-				}
-			}
-		}
-		else
-		{
-			pd->out_flags = 0;
-		}
-	}
-
-	if (0 != ready) return ready;  /* no need to block */
-
-	remaining = timeout;
-	start = PR_IntervalNow(); 
-
- retry:
-	if (timeout != PR_INTERVAL_NO_TIMEOUT)
-	{
-		PRInt32 ticksPerSecond = PR_TicksPerSecond();
-		tv.tv_sec = remaining / ticksPerSecond;
-		tv.tv_usec = PR_IntervalToMicroseconds( remaining % ticksPerSecond );
-		tvp = &tv;
-	}
-	
-	ready = _MD_SELECT(maxfd + 1, &rd, &wt, &ex, tvp);
-	
-	if (ready == -1 && errno == EINTR)
-	{
-		if (timeout == PR_INTERVAL_NO_TIMEOUT) goto retry;
-		else
-		{
-			elapsed = (PRIntervalTime) (PR_IntervalNow() - start);
-			if (elapsed > timeout) ready = 0;  /* timed out */
-			else
-			{
-				remaining = timeout - elapsed;
-				goto retry; 
-			}
-		}
-	} 
-
-	/*
-	** Now to unravel the select sets back into the client's poll
-	** descriptor list. Is this possibly an area for pissing away
-	** a few cycles or what?
-	*/
-	if (ready > 0)
-	{
-		ready = 0;
-		for (pd = pds, epd = pd + npds; pd < epd; pd++)
-		{
-			PRInt16 out_flags = 0;
-			if ((NULL != pd->fd) && (0 != pd->in_flags))
-			{
-				PRInt32 osfd;
-				bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-				PR_ASSERT(NULL != bottom);
-				
-				osfd = bottom->secret->md.osfd; 
-				
-				if (FD_ISSET(osfd, &rd))
-				{
-					if (pd->out_flags & _PR_POLL_READ_SYS_READ)
-						out_flags |= PR_POLL_READ;
-					if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
-						out_flags |= PR_POLL_WRITE;
-				}
-				if (FD_ISSET(osfd, &wt))
-				{
-					if (pd->out_flags & _PR_POLL_READ_SYS_WRITE)
-						out_flags |= PR_POLL_READ;
-					if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
-						out_flags |= PR_POLL_WRITE;
-				}
-				if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT;
-
-/* Workaround for nonblocking connects under net_server */
-#ifndef BONE_VERSION 		
-				if (out_flags)
-				{
-					/* check if it is a pending connect */
-					int i = 0, j = 0;
-					PR_Lock( _connectLock );
-					for( i = 0; i < connectCount; i++ ) 
-					{
-						if(connectList[i].osfd == osfd)
-						{
-							int connectError;
-							int connectResult;
-					
-							connectResult = connect(connectList[i].osfd,
-							                        &connectList[i].addr,
-							                        connectList[i].addrlen);
-							connectError = errno;
-					
-							if(connectResult < 0 ) 
-							{
-								if(connectError == EINTR || connectError == EWOULDBLOCK ||
-					  		   connectError == EINPROGRESS || connectError == EALREADY)
-								{
-									break;
-								}
-							}
-					
-							if(i == (connectCount - 1))
-							{
-								connectList[i].osfd = -1;
-							} else {
-								for(j = i; j < connectCount; j++ )
-								{
-									memcpy( &connectList[j], &connectList[j+1],
-									        sizeof(connectList[j]));
-								}
-							}
-							connectCount--;
-					
-							bottom->secret->md.connectReturnValue = connectResult;
-							bottom->secret->md.connectReturnError = connectError;
-							bottom->secret->md.connectValueValid = PR_TRUE;
-							break;
-						}
-					}
-					PR_Unlock( _connectLock );
-				}
-#endif
-			}
-			pd->out_flags = out_flags;
-			if (out_flags) ready++;
-		}
-		PR_ASSERT(ready > 0);
-	}
-	else if (ready < 0)
-	{ 
-		err = _MD_ERRNO();
-		if (err == EBADF)
-		{
-			/* Find the bad fds */
-			ready = 0;
-			for (pd = pds, epd = pd + npds; pd < epd; pd++)
-			{
-				pd->out_flags = 0;
-				if ((NULL != pd->fd) && (0 != pd->in_flags))
-				{
-					bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-					if (fcntl(bottom->secret->md.osfd, F_GETFL, 0) == -1)
-					{
-						pd->out_flags = PR_POLL_NVAL;
-						ready++;
-					}
-				}
-			}
-			PR_ASSERT(ready > 0);
-		}
-		else _PR_MD_MAP_SELECT_ERROR(err);
-	}
-	
-	return ready;
-}  /* _MD_pr_poll */
-
-/*
- * File locking.
- */
-
-PRStatus
-_MD_lockfile (PRInt32 osfd)
-{
-    PRInt32 rv;
-    struct flock linfo;
-
-    linfo.l_type = 
-    linfo.l_whence = SEEK_SET;
-    linfo.l_start = 0;
-    linfo.l_len = 0;
-
-    rv = fcntl(osfd, F_SETLKW, &linfo);
-    if (rv == 0)
-	return PR_SUCCESS;
-
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_tlockfile (PRInt32 osfd)
-{
-    PRInt32 rv;
-    struct flock linfo;
-
-    linfo.l_type = 
-    linfo.l_whence = SEEK_SET;
-    linfo.l_start = 0;
-    linfo.l_len = 0;
-
-    rv = fcntl(osfd, F_SETLK, &linfo);
-    if (rv == 0)
-	return PR_SUCCESS;
-
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_unlockfile (PRInt32 osfd)
-{
-    PRInt32 rv;
-    struct flock linfo;
-
-    linfo.l_type = 
-    linfo.l_whence = SEEK_SET;
-    linfo.l_start = 0;
-    linfo.l_len = 0;
-
-    rv = fcntl(osfd, F_UNLCK, &linfo);
-
-    if (rv == 0)
-	return PR_SUCCESS;
-
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/beos/bmemory.c b/libs/js/nsprpub/pr/src/md/beos/bmemory.c
deleted file mode 100644
index 17c73325af..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bmemory.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-PR_EXTERN(void) _PR_MD_INIT_SEGS(void);
-PR_EXTERN(PRStatus) _PR_MD_ALLOC_SEGMENT(PRSegment *seg, PRUint32 size, void *vaddr);
-PR_EXTERN(void) _PR_MD_FREE_SEGMENT(PRSegment *seg);
diff --git a/libs/js/nsprpub/pr/src/md/beos/bmisc.c b/libs/js/nsprpub/pr/src/md/beos/bmisc.c
deleted file mode 100644
index 429cd7be23..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bmisc.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <stdlib.h>
-
-PRLock *_connectLock = NULL;
-
-#ifndef BONE_VERSION
-/* Workaround for nonblocking connects under net_server */
-PRUint32 connectCount = 0;
-ConnectListNode connectList[64];
-#endif
-                                   
-void
-_MD_cleanup_before_exit (void)
-{
-}
-
-void
-_MD_exit (PRIntn status)
-{
-    exit(status);
-}
-
-void
-_MD_early_init (void)
-{
-}
-
-static PRLock *monitor = NULL;
-
-void
-_MD_final_init (void)
-{
-    _connectLock = PR_NewLock();
-    PR_ASSERT(NULL != _connectLock); 
-#ifndef BONE_VERSION   
-    /* Workaround for nonblocking connects under net_server */
-    connectCount = 0;
-#endif
-}
-
-void
-_MD_AtomicInit (void)
-{
-    if (monitor == NULL) {
-        monitor = PR_NewLock();
-    }
-}
-
-/*
-** This is exceedingly messy.  atomic_add returns the last value, NSPR expects the new value.
-** We just add or subtract 1 from the result.  The actual memory update is atomic.
-*/
-
-PRInt32
-_MD_AtomicAdd( PRInt32 *ptr, PRInt32 val )
-{
-    return( ( atomic_add( (long *)ptr, val ) ) + val );
-}
-
-PRInt32
-_MD_AtomicIncrement( PRInt32 *val )
-{
-    return( ( atomic_add( (long *)val, 1 ) ) + 1 );
-}
-
-PRInt32
-_MD_AtomicDecrement( PRInt32 *val )
-{
-    return( ( atomic_add( (long *)val, -1 ) ) - 1 );
-}
-
-PRInt32
-_MD_AtomicSet( PRInt32 *val, PRInt32 newval )
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-    PR_Lock(monitor);
-    rv = *val;
-    *val = newval;
-    PR_Unlock(monitor);
-    return rv;
-}
diff --git a/libs/js/nsprpub/pr/src/md/beos/bmmap.c b/libs/js/nsprpub/pr/src/md/beos/bmmap.c
deleted file mode 100644
index 9edd067397..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bmmap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-PR_EXTERN(PRStatus)
-_PR_MD_CREATE_FILE_MAP(PRFileMap *fmap, PRInt64 size)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return PR_FAILURE;
-}
-
-PR_EXTERN(PRInt32)
-_PR_MD_GET_MEM_MAP_ALIGNMENT(void)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return -1;
-}
-
-PR_EXTERN(void *)
-_PR_MD_MEM_MAP(PRFileMap *fmap, PRInt64 offset, PRUint32 len)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return 0;
-}
-
-PR_EXTERN(PRStatus)
-_PR_MD_MEM_UNMAP(void *addr, PRUint32 size)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return PR_FAILURE;
-}
-
-PR_EXTERN(PRStatus)
-_PR_MD_CLOSE_FILE_MAP(PRFileMap *fmap)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/beos/bnet.c b/libs/js/nsprpub/pr/src/md/beos/bnet.c
deleted file mode 100644
index 9b10509e06..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bnet.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-#include <unistd.h>
-#include <memory.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-
-/*
- * Make sure _PRSockLen_t is 32-bit, because we will cast a PRUint32* or
- * PRInt32* pointer to a _PRSockLen_t* pointer.
- */
-#define _PRSockLen_t int
-
-
-/*
-** Global lock variable used to bracket calls into rusty libraries that
-** aren't thread safe (like libc, libX, etc).
-*/
-static PRLock *_pr_rename_lock = NULL;
-static PRMonitor *_pr_Xfe_mon = NULL;
-
-#define READ_FD     1
-#define WRITE_FD    2
-
-/*
-** This is a support routine to handle "deferred" i/o on sockets. 
-** It uses "select", so it is subject to all of the BeOS limitations
-** (only READ notification, only sockets)
-*/
-
-/*
- * socket_io_wait --
- *
- * wait for socket i/o, periodically checking for interrupt
- *
- */
-
-static PRInt32 socket_io_wait(PRInt32 osfd, PRInt32 fd_type,
-                              PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-    struct timeval tv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntervalTime epoch, now, elapsed, remaining;
-    PRBool wait_for_remaining;
-    PRInt32 syserror;
-    fd_set rd_wr;
-
-    switch (timeout) {
-    case PR_INTERVAL_NO_WAIT:
-        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        break;
-    case PR_INTERVAL_NO_TIMEOUT:
-        /*
-         * This is a special case of the 'default' case below.
-         * Please see the comments there.
-         */
-        tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-        tv.tv_usec = 0;
-        FD_ZERO(&rd_wr);
-        do {
-            FD_SET(osfd, &rd_wr);
-            if (fd_type == READ_FD)
-                rv = _MD_SELECT(osfd + 1, &rd_wr, NULL, NULL, &tv);
-            else
-                rv = _MD_SELECT(osfd + 1, NULL, &rd_wr, NULL, &tv);
-            if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-#ifdef BONE_VERSION
-                _PR_MD_MAP_SELECT_ERROR(syserror);
-#else
-                if (syserror == EBADF) {
-                    PR_SetError(PR_BAD_DESCRIPTOR_ERROR, EBADF);
-                } else {
-                    PR_SetError(PR_UNKNOWN_ERROR, syserror);
-                }
-#endif
-                break;
-            }
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                break;
-            }
-        } while (rv == 0 || (rv == -1 && syserror == EINTR));
-        break;
-    default:
-        now = epoch = PR_IntervalNow();
-        remaining = timeout;
-        FD_ZERO(&rd_wr);
-        do {
-            /*
-             * We block in _MD_SELECT for at most
-             * _PR_INTERRUPT_CHECK_INTERVAL_SECS seconds,
-             * so that there is an upper limit on the delay
-             * before the interrupt bit is checked.
-             */
-            wait_for_remaining = PR_TRUE;
-            tv.tv_sec = PR_IntervalToSeconds(remaining);
-            if (tv.tv_sec > _PR_INTERRUPT_CHECK_INTERVAL_SECS) {
-                wait_for_remaining = PR_FALSE;
-                tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-                tv.tv_usec = 0;
-            } else {
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                                 remaining -
-                                 PR_SecondsToInterval(tv.tv_sec));
-            }
-            FD_SET(osfd, &rd_wr);
-            if (fd_type == READ_FD)
-                rv = _MD_SELECT(osfd + 1, &rd_wr, NULL, NULL, &tv);
-            else
-                rv = _MD_SELECT(osfd + 1, NULL, &rd_wr, NULL, &tv);
-            /*
-             * we don't consider EINTR a real error
-             */
-            if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-#ifdef BONE_VERSION
-                _PR_MD_MAP_SELECT_ERROR(syserror);
-#else
-                if (syserror == EBADF) {
-                    PR_SetError(PR_BAD_DESCRIPTOR_ERROR, EBADF);
-                } else {
-                    PR_SetError(PR_UNKNOWN_ERROR, syserror);
-                }
-#endif
-                break;
-            }
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                break;
-            }
-            /*
-             * We loop again if _MD_SELECT timed out or got interrupted
-             * by a signal, and the timeout deadline has not passed yet.
-             */
-            if (rv == 0 || (rv == -1 && syserror == EINTR)) {
-                /*
-                 * If _MD_SELECT timed out, we know how much time
-                 * we spent in blocking, so we can avoid a
-                 * PR_IntervalNow() call.
-                 */
-                if (rv == 0) {
-                    if (wait_for_remaining) {
-                        now += remaining;
-                    } else {
-                        now += PR_SecondsToInterval(tv.tv_sec)
-                               + PR_MicrosecondsToInterval(tv.tv_usec);
-                    }
-                } else {
-                    now = PR_IntervalNow();
-                }
-                elapsed = (PRIntervalTime) (now - epoch);
-                if (elapsed >= timeout) {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                    rv = -1;
-                    break;
-                } else {
-                    remaining = timeout - elapsed;
-                }
-            }
-        } while (rv == 0 || (rv == -1 && syserror == EINTR));
-        break;
-    }
-    return(rv);
-}
-
-PRInt32
-_MD_recv (PRFileDesc *fd, void *buf, PRInt32 amount, PRInt32 flags,
-          PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-#ifndef BONE_VERSION
-    if (fd->secret->md.sock_state & BE_SOCK_SHUTDOWN_READ) {
-        _PR_MD_MAP_RECV_ERROR(EPIPE);
-        return -1;
-    }
-#endif
-
-#ifdef BONE_VERSION
-    /*
-    ** Gah, stupid hack.  If reading a zero amount, instantly return success.
-    ** BONE beta 6 returns EINVAL for reads of zero bytes, which parts of
-    ** mozilla use to check for socket availability.
-    */
-
-    if( 0 == amount ) return(0);
-#endif
-
-    while ((rv = recv(osfd, buf, amount, flags)) == -1) {
-        err = _MD_ERRNO();
-
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            /* If socket was supposed to be blocking,
-            wait a while for the condition to be
-            satisfied. */
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-
-        } else
-            break;
-    }
-
-    if (rv < 0) {
-        _PR_MD_MAP_RECV_ERROR(err);
-    }
-
-done:
-    return(rv);
-}
-
-PRInt32
-_MD_recvfrom (PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-              PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((*addrlen = PR_NETADDR_SIZE(addr)),
-            ((rv = recvfrom(osfd, buf, amount, flags,
-                            (struct sockaddr *) addr,
-                            (_PRSockLen_t *)addrlen)) == -1)) {
-        err = _MD_ERRNO();
-
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                goto done;
-
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))) {
-            continue;
-        } else {
-            break;
-        }
-    }
-
-    if (rv < 0) {
-        _PR_MD_MAP_RECVFROM_ERROR(err);
-    }
-
-done:
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv != -1) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    return(rv);
-}
-
-PRInt32
-_MD_send (PRFileDesc *fd, const void *buf, PRInt32 amount, PRInt32 flags,
-          PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-#ifndef BONE_VERSION
-    if (fd->secret->md.sock_state & BE_SOCK_SHUTDOWN_WRITE)
-    {
-        _PR_MD_MAP_SEND_ERROR(EPIPE);
-        return -1;
-    }
-#endif
-
-    while ((rv = send(osfd, buf, amount, flags)) == -1) {
-        err = _MD_ERRNO();
-
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-
-#ifndef BONE_VERSION
-            if( _PR_PENDING_INTERRUPT(me)) {
-
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-
-            /* in UNIX implementations, you could do a socket_io_wait here.
-             * but since BeOS doesn't yet support WRITE notification in select,
-             * you're spanked.
-             */
-            snooze( 10000L );
-            continue;
-#else /* BONE_VERSION */
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))< 0)
-                goto done;
-#endif
-
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))) {
-            continue;
-
-        } else {
-            break;
-        }
-    }
-
-#ifdef BONE_VERSION
-    /*
-     * optimization; if bytes sent is less than "amount" call
-     * select before returning. This is because it is likely that
-     * the next writev() call will return EWOULDBLOCK.
-     */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-        && (timeout != PR_INTERVAL_NO_WAIT)) {
-        if (socket_io_wait(osfd, WRITE_FD, timeout) < 0) {
-            rv = -1;
-            goto done;
-        }
-    }
-#endif /* BONE_VERSION */
-    
-    if (rv < 0) {
-        _PR_MD_MAP_SEND_ERROR(err);
-    }
-
-#ifdef BONE_VERSION
-done:
-#endif
-    return(rv);
-}
-
-PRInt32
-_MD_sendto (PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-            const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-
-    while ((rv = sendto(osfd, buf, amount, flags,
-                        (struct sockaddr *) &addrCopy, addrlen)) == -1) {
-#else
-    while ((rv = sendto(osfd, buf, amount, flags,
-                        (struct sockaddr *) addr, addrlen)) == -1) {
-#endif
-        err = _MD_ERRNO();
-
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-
-#ifdef BONE_VERSION
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))< 0)
-                goto done;
-#endif
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))) {
-            continue;
-
-        } else {
-            break;
-        }
-    }
-
-    if (rv < 0) {
-        _PR_MD_MAP_SENDTO_ERROR(err);
-    }
-
-#ifdef BONE_VERSION
-done:
-#endif
-    return(rv);
-}
-
-#ifdef BONE_VERSION
-
-PRInt32 _MD_writev(
-    PRFileDesc *fd, const PRIOVec *iov,
-    PRInt32 iov_size, PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 index, amount = 0;
-    PRInt32 osfd = fd->secret->md.osfd;
-
-    /*
-     * Calculate the total number of bytes to be sent; needed for
-     * optimization later.
-     * We could avoid this if this number was passed in; but it is
-     * probably not a big deal because iov_size is usually small (less than
-     * 3)
-     */
-    if (!fd->secret->nonblocking) {
-        for (index=0; index<iov_size; index++) {
-            amount += iov[index].iov_len;
-        }
-    }
-
-    while ((rv = writev(osfd, (const struct iovec*)iov, iov_size)) == -1) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK))    {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))<0)
-                goto done;
-
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-
-    /*
-     * optimization; if bytes sent is less than "amount" call
-     * select before returning. This is because it is likely that
-     * the next writev() call will return EWOULDBLOCK.
-     */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-        && (timeout != PR_INTERVAL_NO_WAIT)) {
-        if (socket_io_wait(osfd, WRITE_FD, timeout) < 0) {
-            rv = -1;
-            goto done;
-        }
-    }
-
-
-    if (rv < 0) {
-        _PR_MD_MAP_WRITEV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-#endif /* BONE_VERSION */
-
-PRInt32
-_MD_accept (PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen,
-            PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((rv = accept(osfd, (struct sockaddr *) addr,
-                        (_PRSockLen_t *)addrlen)) == -1) {
-        err = _MD_ERRNO();
-
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            /* If it's SUPPOSED to be a blocking thread, wait
-             * a while to see if the triggering condition gets
-             * satisfied.
-             */
-            /* Assume that we're always using a native thread */
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))) {
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_ACCEPT_ERROR(err);
-    } else if (addr != NULL) {
-        /* bug 134099 */
-        err = getpeername(rv, (struct sockaddr *) addr, (_PRSockLen_t *)addrlen);
-    }
-done:
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv != -1) {
-        /* Mask off the first byte of struct sockaddr (the length field) */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    return(rv);
-}
-
-PRInt32
-_MD_connect (PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen,
-             PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 osfd = fd->secret->md.osfd;
-
-#ifndef BONE_VERSION
-    fd->secret->md.connectValueValid = PR_FALSE;
-#endif
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-#endif
-
-    /* (Copied from unix.c)
-     * We initiate the connection setup by making a nonblocking connect()
-     * call.  If the connect() call fails, there are two cases we handle
-     * specially:
-     * 1. The connect() call was interrupted by a signal.  In this case
-     *    we simply retry connect().
-     * 2. The NSPR socket is nonblocking and connect() fails with
-     *    EINPROGRESS.  We first wait until the socket becomes writable.
-     *    Then we try to find out whether the connection setup succeeded
-     *    or failed.
-     */
-
-retry:
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if ((rv = connect(osfd, (struct sockaddr *)&addrCopy, addrlen)) == -1) {
-#else
-    if ((rv = connect(osfd, (struct sockaddr *)addr, addrlen)) == -1) {
-#endif
-        err = _MD_ERRNO();
-#ifndef BONE_VERSION
-        fd->secret->md.connectReturnValue = rv;
-        fd->secret->md.connectReturnError = err;
-        fd->secret->md.connectValueValid = PR_TRUE;
-#endif
-        if( err == EINTR ) {
-
-            if( _PR_PENDING_INTERRUPT(me)) {
-
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-#ifndef BONE_VERSION
-            snooze( 100000L );
-#endif
-            goto retry;
-        }
-
-#ifndef BONE_VERSION
-        if(!fd->secret->nonblocking && ((err == EINPROGRESS) || (err==EAGAIN) || (err==EALREADY))) {
-
-            /*
-            ** There's no timeout on this connect, but that's not
-            ** a big deal, since the connect times out anyways
-            ** after 30 seconds.   Just sleep for 1/10th of a second
-            ** and retry until we go through or die.
-            */
-
-            if( _PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-
-            goto retry;
-        }
-
-        if( fd->secret->nonblocking && ((err == EAGAIN) || (err == EINPROGRESS))) {
-            PR_Lock(_connectLock);
-            if (connectCount < sizeof(connectList)/sizeof(connectList[0])) {
-                connectList[connectCount].osfd = osfd;
-                memcpy(&connectList[connectCount].addr, addr, addrlen);
-                connectList[connectCount].addrlen = addrlen;
-                connectList[connectCount].timeout = timeout;
-                connectCount++;
-                PR_Unlock(_connectLock);
-                _PR_MD_MAP_CONNECT_ERROR(err);
-            } else {
-                PR_Unlock(_connectLock);
-                PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-            }
-            return rv;
-        }
-#else /* BONE_VERSION */
-        if(!fd->secret->nonblocking && (err == EINTR)) {
-
-            rv = socket_io_wait(osfd, WRITE_FD, timeout);
-            if (rv == -1) {
-                return -1;
-            }
-
-            PR_ASSERT(rv == 1);
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-            err = _MD_beos_get_nonblocking_connect_error(osfd);
-            if (err != 0) {
-                _PR_MD_MAP_CONNECT_ERROR(err);
-                return -1;
-            }
-            return 0;
-        }
-#endif
-
-        _PR_MD_MAP_CONNECT_ERROR(err);
-    }
-
-    return rv;
-}
-
-PRInt32
-_MD_bind (PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv, err;
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-    rv = bind(fd->secret->md.osfd, (struct sockaddr *) &addrCopy, (int )addrlen);
-#else
-    rv = bind(fd->secret->md.osfd, (struct sockaddr *) addr, (int )addrlen);
-#endif
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_BIND_ERROR(err);
-    }
-
-    return(rv);
-}
-
-PRInt32
-_MD_listen (PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 rv, err;
-
-#ifndef BONE_VERSION
-    /* Bug workaround!  Setting listen to 0 on Be accepts no connections.
-    ** On most UN*Xes this sets the default.
-    */
-
-    if( backlog == 0 ) backlog = 5;
-#endif
-
-    rv = listen(fd->secret->md.osfd, backlog);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_LISTEN_ERROR(err);
-    }
-
-    return(rv);
-}
-
-PRInt32
-_MD_shutdown (PRFileDesc *fd, PRIntn how)
-{
-    PRInt32 rv, err;
-
-#ifndef BONE_VERSION
-    if (how == PR_SHUTDOWN_SEND)
-        fd->secret->md.sock_state = BE_SOCK_SHUTDOWN_WRITE;
-    else if (how == PR_SHUTDOWN_RCV)
-        fd->secret->md.sock_state = BE_SOCK_SHUTDOWN_READ;
-    else if (how == PR_SHUTDOWN_BOTH) {
-        fd->secret->md.sock_state = (BE_SOCK_SHUTDOWN_WRITE | BE_SOCK_SHUTDOWN_READ);
-    }
-
-    return 0;
-#else /* BONE_VERSION */
-    rv = shutdown(fd->secret->md.osfd, how);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SHUTDOWN_ERROR(err);
-    }
-    return(rv);
-#endif
-}
-
-PRInt32
-_MD_socketpair (int af, int type, int flags, PRInt32 *osfd)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-
-PRInt32
-_MD_close_socket (PRInt32 osfd)
-{
-#ifdef BONE_VERSION
-    close( osfd );
-#else
-    closesocket( osfd );
-#endif
-}
-
-PRStatus
-_MD_getsockname (PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockname(fd->secret->md.osfd,
-                     (struct sockaddr *) addr, (_PRSockLen_t *)addrlen);
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv == 0) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETSOCKNAME_ERROR(err);
-    }
-
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_MD_getpeername (PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getpeername(fd->secret->md.osfd,
-                     (struct sockaddr *) addr, (_PRSockLen_t *)addrlen);
-
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv == 0) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETPEERNAME_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_MD_getsockopt (PRFileDesc *fd, PRInt32 level,
-                PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockopt(fd->secret->md.osfd, level, optname,
-                    optval, (_PRSockLen_t *)optlen);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETSOCKOPT_ERROR(err);
-    }
-
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_MD_setsockopt (PRFileDesc *fd, PRInt32 level,
-                PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv, err;
-
-    rv = setsockopt(fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SETSOCKOPT_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRInt32
-_MD_accept_read (PRFileDesc *sd, PRInt32 *newSock, PRNetAddr **raddr,
-                 void *buf, PRInt32 amount, PRIntervalTime timeout)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-
-#ifndef BONE_VERSION
-PRInt32
-_MD_socket (int af, int type, int flags)
-{
-    PRInt32 osfd, err;
-
-    osfd = socket( af, type, 0 );
-
-    if( -1 == osfd ) {
-
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SOCKET_ERROR( err );
-    }
-
-    return( osfd );
-}
-#else
-PRInt32
-_MD_socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
-{
-    PRInt32 osfd, err;
-
-    osfd = socket(domain, type, proto);
-
-    if (osfd == -1) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SOCKET_ERROR(err);
-    }
-
-    return(osfd);
-}
-#endif
-
-PRInt32
-_MD_socketavailable (PRFileDesc *fd)
-{
-#ifdef BONE_VERSION
-    PRInt32 result;
-
-    if (ioctl(fd->secret->md.osfd, FIONREAD, &result) < 0) {
-        _PR_MD_MAP_SOCKETAVAILABLE_ERROR(_MD_ERRNO());
-        return -1;
-    }
-    return result;
-#else
-    return PR_NOT_IMPLEMENTED_ERROR;
-#endif
-}
-
-PRInt32
-_MD_get_socket_error (void)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-
-PRStatus
-_MD_gethostname (char *name, PRUint32 namelen)
-{
-    PRInt32 rv, err;
-
-    rv = gethostname(name, namelen);
-    if (rv == 0)
-    {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETHOSTNAME_ERROR(err);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-#ifndef BONE_VERSION
-PRInt32
-_MD_beos_get_nonblocking_connect_error(PRFileDesc *fd)
-{
-    int rv;
-    int flags = 0;
-
-    rv = recv(fd->secret->md.osfd, NULL, 0, flags);
-    PR_ASSERT(-1 == rv || 0 == rv);
-    if (-1 == rv && errno != EAGAIN && errno != EWOULDBLOCK) {
-        return errno;
-    }
-    return 0;  /* no error */
-}
-#else
-PRInt32
-_MD_beos_get_nonblocking_connect_error(int osfd)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-    //    int err;
-    //    _PRSockLen_t optlen = sizeof(err);
-    //    if (getsockopt(osfd, SOL_SOCKET, SO_ERROR, (char *) &err, &optlen) == -1) {
-    //        return errno;
-    //    } else {
-    //        return err;
-    //    }
-}
-#endif /* BONE_VERSION */
diff --git a/libs/js/nsprpub/pr/src/md/beos/bproc.c b/libs/js/nsprpub/pr/src/md/beos/bproc.c
deleted file mode 100644
index f21e946532..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bproc.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; c-basic-offset: 8 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <stdio.h>
-#include <signal.h>
-
-#define _PR_SIGNALED_EXITSTATUS 256
-
-PRProcess*
-_MD_create_process (const char *path, char *const *argv,
-		    char *const *envp, const PRProcessAttr *attr)
-{
-	PRProcess *process;
-	int nEnv, idx;
-	char *const *childEnvp;
-	char **newEnvp = NULL;
-	int flags;
-
-	process = PR_NEW(PRProcess);
-	if (!process) {
-		PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-		return NULL;
-	}
-
-	childEnvp = envp;
-	if (attr && attr->fdInheritBuffer) {
-		if (NULL == childEnvp) {
-			childEnvp = environ;
-		}
-		for (nEnv = 0; childEnvp[nEnv]; nEnv++) {
-		}
-		newEnvp = (char **) PR_MALLOC((nEnv + 2) * sizeof(char *));
-		if (NULL == newEnvp) {
-			PR_DELETE(process);
-			PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-			return NULL;
-		}
-		for (idx = 0; idx < nEnv; idx++) {
-			newEnvp[idx] = childEnvp[idx];
-		}
-		newEnvp[idx++] = attr->fdInheritBuffer;
-		newEnvp[idx] = NULL;
-		childEnvp = newEnvp;
-	}
-
-	process->md.pid = fork();
-
-	if ((pid_t) -1 == process->md.pid) {
-		PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, errno);
-		PR_DELETE(process);
-		if (newEnvp) {
-			PR_DELETE(newEnvp);
-		}
-		return NULL;
-	} else if (0 == process->md.pid) {  /* the child process */
-		/*
-		 * If the child process needs to exit, it must call _exit().
-		 * Do not call exit(), because exit() will flush and close
-		 * the standard I/O file descriptors, and hence corrupt
-		 * the parent process's standard I/O data structures.
-		 */
-
-		if (attr) {
-			/* the osfd's to redirect stdin, stdout, and stderr to */
-			int in_osfd = -1, out_osfd = -1, err_osfd = -1;
-
-			if (attr->stdinFd
-			    && attr->stdinFd->secret->md.osfd != 0) {
-				in_osfd = attr->stdinFd->secret->md.osfd;
-				if (dup2(in_osfd, 0) != 0) {
-					_exit(1);  /* failed */
-				}
-				flags = fcntl(0, F_GETFL, 0);
-				if (flags & O_NONBLOCK) {
-					fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-				}
-			}
-			if (attr->stdoutFd
-			    && attr->stdoutFd->secret->md.osfd != 1) {
-				out_osfd = attr->stdoutFd->secret->md.osfd;
-				if (dup2(out_osfd, 1) != 1) {
-					_exit(1);  /* failed */
-				}
-				flags = fcntl(1, F_GETFL, 0);
-				if (flags & O_NONBLOCK) {
-					fcntl(1, F_SETFL, flags & ~O_NONBLOCK);
-				}
-			}
-			if (attr->stderrFd
-			    && attr->stderrFd->secret->md.osfd != 2) {
-				err_osfd = attr->stderrFd->secret->md.osfd;
-				if (dup2(err_osfd, 2) != 2) {
-					_exit(1);  /* failed */
-				}
-				flags = fcntl(2, F_GETFL, 0);
-				if (flags & O_NONBLOCK) {
-					fcntl(2, F_SETFL, flags & ~O_NONBLOCK);
-				}
-			}
-			if (in_osfd != -1) {
-				close(in_osfd);
-			}
-			if (out_osfd != -1 && out_osfd != in_osfd) {
-				close(out_osfd);
-			}
-			if (err_osfd != -1 && err_osfd != in_osfd
-			    && err_osfd != out_osfd) {
-				close(err_osfd);
-			}
-			if (attr->currentDirectory) {
-				if (chdir(attr->currentDirectory) < 0) {
-					_exit(1);  /* failed */
-				}
-			}
-		}
-
-		if (childEnvp) {
-			(void)execve(path, argv, childEnvp);
-		} else {
-			/* Inherit the environment of the parent. */
-			(void)execv(path, argv);
-		}
-		/* Whoops! It returned. That's a bad sign. */
-		_exit(1);
-	}
-
-	if (newEnvp) {
-		PR_DELETE(newEnvp);
-	}
-
-	return process;
-}
-
-PRStatus
-_MD_detach_process (PRProcess *process)
-{
-	/* If we kept a process table like unix does,
-	 * we'd remove the entry here.
-	 * Since we dont', just delete the process variable
-	 */
-	PR_DELETE(process);
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_wait_process (PRProcess *process, PRInt32 *exitCode)
-{
-	PRStatus retVal = PR_SUCCESS;
-	int ret, status;
-	
-	/* Ignore interruptions */
-	do {
-		ret = waitpid(process->md.pid, &status, 0);
-	} while (ret == -1 && errno == EINTR);
-
-	/*
-	 * waitpid() cannot return 0 because we did not invoke it
-	 * with the WNOHANG option.
-	 */ 
-	PR_ASSERT(0 != ret);
-
-	if (ret < 0) {
-                PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-		return PR_FAILURE;
-	}
-
-	/* If child process exited normally, return child exit code */
-	if (WIFEXITED(status)) {
-		*exitCode = WEXITSTATUS(status);
-	} else {
-		PR_ASSERT(WIFSIGNALED(status));
-		*exitCode = _PR_SIGNALED_EXITSTATUS;
-	}		
-
-	PR_DELETE(process);
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_kill_process (PRProcess *process)
-{
-	PRErrorCode prerror;
-	PRInt32 oserror;
-	
-	if (kill(process->md.pid, SIGKILL) == 0) {
-		return PR_SUCCESS;
-	}
-	oserror = errno;
-	switch (oserror) {
-        case EPERM:
-		prerror = PR_NO_ACCESS_RIGHTS_ERROR;
-		break;
-        case ESRCH:
-		prerror = PR_INVALID_ARGUMENT_ERROR;
-		break;
-        default:
-		prerror = PR_UNKNOWN_ERROR;
-		break;
-	}
-	PR_SetError(prerror, oserror);
-	return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/beos/brng.c b/libs/js/nsprpub/pr/src/md/beos/brng.c
deleted file mode 100644
index 0aba8da3ce..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/brng.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1999-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <time.h>
-#include "primpl.h"
-
-extern PRSize _PR_MD_GetRandomNoise( void *buf, PRSize size )
-{
-    struct timeval tv;
-    int n = 0;
-    int s;
-
-    GETTIMEOFDAY(&tv);
-
-    if ( size >= 0 ) {
-        s = _pr_CopyLowBits((char*)buf+n, size, &tv.tv_usec, sizeof(tv.tv_usec));
-        size -= s;
-        n += s;
-    }
-    if ( size >= 0 ) {
-        s = _pr_CopyLowBits((char*)buf+n, size, &tv.tv_sec, sizeof(tv.tv_usec));
-        size -= s;
-        n += s;
-    }
-
-    return n;
-} /* end _PR_MD_GetRandomNoise() */
diff --git a/libs/js/nsprpub/pr/src/md/beos/bseg.c b/libs/js/nsprpub/pr/src/md/beos/bseg.c
deleted file mode 100644
index b6b3b67bef..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bseg.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-PR_IMPLEMENT(void)
-    _MD_init_segs (void)
-{
-}
-
-PR_IMPLEMENT(PRStatus)
-    _MD_alloc_segment (PRSegment *seg, PRUint32 size, void *vaddr)
-{
-    return PR_NOT_IMPLEMENTED_ERROR;
-}
-
-PR_IMPLEMENT(void)
-    _MD_free_segment (PRSegment *seg)
-{
-}
diff --git a/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk b/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk
deleted file mode 100644
index c6eb6fe19b..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/bsrcs.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-# this file lists the source files to be compiled (used in Makefile) and
-# then enumerated as object files (in objs.mk) for inclusion in the NSPR
-# shared library
-
-MDCSRCS =             \
-	beos.c        \
-	beos_errors.c \
-	bfile.c       \
-	bmisc.c       \
-	bnet.c        \
-	bproc.c       \
-	brng.c        \
-	bseg.c        \
-	btime.c       \
-	bmmap.c       \
-	$(NULL)
diff --git a/libs/js/nsprpub/pr/src/md/beos/btime.c b/libs/js/nsprpub/pr/src/md/beos/btime.c
deleted file mode 100644
index aaaa9d2762..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/btime.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <kernel/OS.h>
-
-static bigtime_t start;
-
-PRTime
-_MD_now (void)
-{
-    return (PRTime)real_time_clock_usecs();
-}
-
-void
-_MD_interval_init (void)
-{
-    /* grab the base interval time */
-    start = real_time_clock_usecs();
-}
-
-PRIntervalTime
-_MD_get_interval (void)
-{
-    return( (PRIntervalTime) real_time_clock_usecs() / 10 );
-
-#if 0
-    /* return the number of tens of microseconds that have elapsed since
-       we were initialized */
-    bigtime_t now = real_time_clock_usecs();
-    now -= start;
-    now /= 10;
-    return (PRIntervalTime)now;
-#endif
-}
-
-PRIntervalTime
-_MD_interval_per_sec (void)
-{
-    return 100000L;
-}
diff --git a/libs/js/nsprpub/pr/src/md/beos/objs.mk b/libs/js/nsprpub/pr/src/md/beos/objs.mk
deleted file mode 100644
index 163c5d9c73..0000000000
--- a/libs/js/nsprpub/pr/src/md/beos/objs.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# This makefile appends to the variable OBJS the platform-dependent
-# object modules that will be part of the nspr20 library.
-
-include $(srcdir)/md/beos/bsrcs.mk
-
-OBJS += $(MDCSRCS:%.c=md/beos/$(OBJDIR)/%.$(OBJ_SUFFIX))
diff --git a/libs/js/nsprpub/pr/src/md/mac/MANIFEST b/libs/js/nsprpub/pr/src/md/mac/MANIFEST
deleted file mode 100644
index c51cbd5a02..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/MANIFEST
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-MacErrorHandling.h
-macsocket.h
-prcpucfg.h
diff --git a/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h b/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h
deleted file mode 100644
index b0e0390005..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/MacErrorHandling.h
+++ /dev/null
@@ -1,668 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*********************************************************************
-
-FILENAME
-	Exceptions.h
-	
-DESCRIPTION
-	A collection of routines and macros to handle assertions and
-	exceptions.
-
-COPYRIGHT
-	Copyright © Apple Computer, Inc. 1989-1991
-	All rights reserved.
-
-ROUTINES
-	EXTERNALS
-		dprintf
-		check_dprintf
-		checkpos_dprintf
-
-MACROS
-	EXTERNALS
-		check
-		ncheck
-		check_action
-		ncheck_action
-		require
-		nrequire
-		require_action
-		nrequire_action
-		resume
-
-MODIFICATION HISTORY
-	Nov 12 95		BKJ		Moved to MetroWerks environment & the NSPR
-		
-NOTE
-	To keep code size down, use these routines and macros with the C
-	compiler option -b2 or -b3. This will eliminate duplicate strings
-	within a procedure.
-
-*********************************************************************/
-
-#ifndef __MACERRORHANDLING__
-#define __MACERRORHANDLING__
-
-/*********************************************************************
-
-INCLUDES
-
-*********************************************************************/
-
-#include	<Types.h>
-
-/*<FF>*/
-/*********************************************************************
-
-CONSTANTS AND CONTROL
-
-*********************************************************************/
-
-/*
-	These defines are used to control the amount of information
-	displayed when an assertion fails. DEBUGOFF and WARN will run
-	silently. MIN will simply break into the debugger. ON will break
-	and display the assertion that failed and the exception (for
-	require statements). FULL will also display the source file name
-	and line number. SYM does a SysBreak and is usefull when using a
-	symbolic debugger like SourceBug or SADE. They should be set into
-	DEBUGLEVEL. The default LEVEL is OFF.
-*/
-
-#define DEBUGOFF		0
-#define DEBUGWARN		1
-#define DEBUGMIN		2
-#define DEBUGON			3
-#define DEBUGFULL		4
-#define DEBUGSYM		6
-
-#ifndef	DEBUGLEVEL
-#define	DEBUGLEVEL	DEBUGOFF
-#endif	DEBUGLEVEL
-
-/*
-	resumeLabel is used to control the insertion of labels for use with
-	the resume macro. If you do not use the resume macro and you wish
-	to have multible exceptions per label then you can add the
-	following define to you source code.
-	
-*/
-#define resumeLabel(exception)											// Multiple exceptions per label
-// #define resumeLabel(exception)	resume_ ## exception:				// Single exception per label
-
-
-/*
-	traceon and debugon are used to test for options
-*/
-
-#define	traceon	((DEBUGLEVEL > DEBUGWARN) && defined(TRACEON))
-#define	debugon	(DEBUGLEVEL > DEBUGWARN)
-
-/*
-	Add some macros for DEBUGMIN and DEBUGSYM to keep the size down.
-*/
-
-#define	__DEBUGSMALL	((DEBUGLEVEL == DEBUGMIN) ||			\
-								 (DEBUGLEVEL == DEBUGSYM))
-
-#if	DEBUGLEVEL == DEBUGMIN
-#define	__DebuggerBreak	Debugger()
-#elif	DEBUGLEVEL == DEBUGSYM
-#define  __DebuggerBreak	SysBreak()
-#endif
-
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	check(assertion)
-
-DESCRIPTION
-	If debugging is on then check will test assertion and if it fails
-	break into the debugger. Otherwise check does nothing.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define check(assertion)															\
-	do {																			\
-		if (assertion) ;															\
-		else __DebuggerBreak;														\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define check(assertion)															\
-	do {																			\
-		if (assertion) ;															\
-		else {																		\
-			dprintf(notrace, "Assertion \"%s\" Failed",	#assertion);				\
-		}																			\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGFULL
-
-#define check(assertion)															\
-	do {																			\
-		if (assertion) ;															\
-		else {																		\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"							\
-									"File: %s\n"									\
-									"Line: %d",										\
-				#assertion, __FILE__, __LINE__);									\
-		}																			\
-	} while (false)
-	
-#else
-
-#define check(assertion)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	ncheck(assertion)
-
-DESCRIPTION
-	If debugging is on then ncheck will test !assertion and if it fails
-	break into the debugger. Otherwise ncheck does nothing.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define ncheck(assertion)													\
-	do {																	\
-		if (assertion) __DebuggerBreak;										\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define ncheck(assertion)													\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace, "Assertion \"!(%s [= %#08X])\" Failed",		\
-				#assertion, __privateAssertion);							\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGFULL
-
-#define ncheck(assertion)													\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"File: %s\n"							\
-									"Line: %d",								\
-			#assertion, __privateAssertion, __FILE__, __LINE__);			\
-		}																	\
-	} while (false)
-
-#else
-
-#define ncheck(assertion)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	check_action(assertion, action)
-
-DESCRIPTION
-	If debugging is on then check_action will test assertion and if it
-	fails break into the debugger then execute action. Otherwise
-	check_action does nothing.
-	
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define check_action(assertion, action)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			__DebuggerBreak;												\
-			{ action }														\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define check_action(assertion, action)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace, "Assertion \"%s\" Failed",	#assertion);		\
-			{ action }														\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGFULL
-
-#define check_action(assertion, action)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"					\
-									"File: %s\n"							\
-									"Line: %d",								\
-				#assertion, __FILE__, __LINE__);							\
-			{ action }														\
-		}																	\
-	} while (false)
-
-#else
-
-#define check_action(assertion, action)
-
-#endif
-
-/*<FF>*/
-/**************************************************************************************
-
-MACRO
-	ncheck_action(assertion, action)
-
-DESCRIPTION
-	If debugging is on then ncheck_action will test !assertion and if
-	it fails break into the debugger then execute action. Otherwise
-	ncheck_action does nothing.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define ncheck_action(assertion, action)									\
-	do {																	\
-		if (assertion) {													\
-			__DebuggerBreak;												\
-			{ action }														\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define ncheck_action(assertion, action)									\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace, "Assertion \"!(%s [= %#08X])\" Failed",		\
-				#assertion, __privateAssertion);							\
-			{ action }														\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGFULL
-
-#define ncheck_action(assertion, action)									\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"File: %s\n"							\
-									"Line: %d",								\
-			#assertion, __privateAssertion, __FILE__, __LINE__);			\
-			{ action }														\
-		}																	\
-	} while (false)
-
-#else
-
-#define ncheck_action(assertion, action)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	require(assertion, exception)
-
-DESCRIPTION
-	require will test assertion and if it fails:
-		break into the debugger if debugging is on.
-		goto exception.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define require(assertion, exception)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			__DebuggerBreak;												\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define require(assertion, exception)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"					\
-									"Exception \"%s\" Raised",				\
-			#assertion, #exception);										\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGFULL
-
-#define require(assertion, exception)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"					\
-									"Exception \"%s\" Raised\n"				\
-									"File: %s\n"							\
-									"Line: %d",								\
-				#assertion, #exception, __FILE__, __LINE__);				\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#else
-
-#define require(assertion, exception)										\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	nrequire(assertion, exception)
-
-DESCRIPTION
-	nrequire will test !assertion and if it fails:
-		break into the debugger if debugging is on.
-		goto exception.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define nrequire(assertion, exception)										\
-	do {																	\
-		if (assertion) {													\
-			DebugStr();														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define nrequire(assertion, exception)										\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"Exception \"%s\" Raised",				\
-				#assertion, __privateAssertion, #exception);				\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGFULL
-
-#define nrequire(assertion, exception)										\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"Exception \"%s\" Raised\n"				\
-									"File: %s\n"							\
-									"Line: %d",								\
-				#assertion, __privateAssertion, #exception, __FILE__,		\
-				__LINE__);													\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#else
-
-#define nrequire(assertion, exception)										\
-	do {																	\
-		if (assertion) {													\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	require_action(assertion, exception, action)
-
-DESCRIPTION
-	require_action will test assertion and if it fails:
-		break into the debugger if debugging is on.
-		execute action.
-		goto exception.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define require_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			__DebuggerBreak;												\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif	DEBUGLEVEL == DEBUGON
-
-#define require_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"					\
-									"Exception \"%s\" Raised",				\
-			#assertion, #exception);										\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGFULL
-
-#define require_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			dprintf(notrace,	"Assertion \"%s\" Failed\n"					\
-									"Exception \"%s\" Raised\n"				\
-									"File: %s\n"							\
-									"Line: %d",								\
-				#assertion, #exception, __FILE__, __LINE__);				\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#else
-
-#define require_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) ;													\
-		else {																\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#endif
-
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	nrequire_action(assertion, exception, action)
-
-DESCRIPTION
-	nrequire_action will test !assertion and if it fails:
-		break into the debugger if debugging is on.
-		execute action.
-		goto exception.
-
-*********************************************************************/
-
-#if	__DEBUGSMALL
-
-#define nrequire_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) {													\
-			__DebuggerBreak;												\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGON
-
-#define nrequire_action(assertion, exception, action)						\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"Exception \"%s\" Raised",				\
-				#assertion, __privateAssertion, #exception);				\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#elif DEBUGLEVEL == DEBUGFULL
-
-#define nrequire_action(assertion, exception, action)						\
-	do {																	\
-		void*	__privateAssertion	= (void*)(assertion);					\
-																			\
-		if (__privateAssertion) {											\
-			dprintf(notrace,	"Assertion \"!(%s [= %#08X])\" Failed\n"	\
-									"Exception \"%s\" Raised\n"				\
-									"File: %s\n"							\
-									"Line: %d",								\
-				#assertion, __privateAssertion, #exception, __FILE__,		\
-				__LINE__);													\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#else
-
-#define nrequire_action(assertion, exception, action)						\
-	do {																	\
-		if (assertion) {													\
-			{ action }														\
-			goto exception;													\
-			resumeLabel(exception);											\
-		}																	\
-	} while (false)
-
-#endif
-	
-/*<FF>*/
-/*********************************************************************
-
-MACRO
-	resume(exception)
-
-DESCRIPTION
-	resume will resume execution after the n/require/_action statement
-	specified by exception. Resume lables must be on (the default) in
-	order to use resume. If an action form of require was used then the
-	action will not be re-executed.
-
-*********************************************************************/
-
-
-#define resume(exception)													\
-	do {																	\
-		goto resume_ ## exception;											\
-	} while (false)
-
-
-/*<FF>*/
-/********************************************************************/
-#endif
diff --git a/libs/js/nsprpub/pr/src/md/mac/macdll.c b/libs/js/nsprpub/pr/src/md/mac/macdll.c
deleted file mode 100644
index a5ecce78b0..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macdll.c
+++ /dev/null
@@ -1,587 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <string.h>
-
-#include <Files.h>
-#include <Errors.h>
-#include <Folders.h>
-#include <CodeFragments.h>
-#include <Aliases.h>
-#include <Resources.h>
-
-#include "IterateDirectory.h"		/* MoreFiles */
-
-#include "MacErrorHandling.h"
-#include "macdll.h"
-#include "mdmac.h"
-#include "macio.h"
-
-#include "primpl.h"
-#include "plstr.h"
-
-/*
-	turds used to iterate through the directories looking
-	for the desired library.
-*/
-
-struct GetSharedLibraryFilterProcData
-{
-	Boolean				inRecursive;
-	StringPtr			inName;
-	
-	Boolean				outFound;
-	CFragConnectionID	outID;
-	Ptr					outAddress;
-	OSErr				outError;
-};
-typedef struct GetSharedLibraryFilterProcData GetSharedLibraryFilterProcData;
-
-static pascal void
-GetSharedLibraryFilterProc(const CInfoPBRec* const inCpb, Boolean* inWantQuit, void *inFilterData);
-
-
-/*
-	NSGetSharedLibrary
-	
-	Unfortunately CFM doesn't support user specified loader paths,
-	so we emulate the behavior.  Effectively this is a GetSharedLibrary
-	where the loader path is user defined.
-*/
-
-OSErr
-NSGetSharedLibrary(Str255 inLibName, CFragConnectionID* outID, Ptr* outMainAddr)
-{
-	char*		curLibPath;
-	char*		freeCurLibPath;
-	OSErr		tempErr;
-	Boolean		recursive;
-	FSSpec		curFolder;	
-	GetSharedLibraryFilterProcData filterData;
-	char		*endCurLibPath;
-	Boolean		done;
-	
-	filterData.outFound = false;
-	filterData.outID = (CFragConnectionID)(-1);
-	filterData.outAddress = NULL;
-	filterData.inName = inLibName;
-		
-	freeCurLibPath = curLibPath = PR_GetLibraryPath();
-	
-	if (curLibPath == NULL)
-		return (cfragNoLibraryErr);
-	
-	tempErr = cfragNoLibraryErr;
-	
-	do
-	{
-		endCurLibPath = PL_strchr(curLibPath, PR_PATH_SEPARATOR);
-		done = (endCurLibPath == NULL);
-
-#if 0
-		// we overload the first character of a path if it's :
-		// then we want to recursively search that path
-		// see if path should be recursive
-		if (*curLibPath == ':')
-		{
-			// ':' is an illegal character in the name of a file
-			// if we start any path with this, we want to allow 
-			// search recursively
-			curLibPath++;
-			recursive = true;
-		}
-		else
-#endif
-		{
-			recursive = false;
-		}
-		
-		if (!done)
-			*endCurLibPath = '\0';	// NULL terminate the string
-		
-		// convert to FSSpec
-		tempErr = ConvertUnixPathToFSSpec(curLibPath, &curFolder);	
-
-		// now look in this directory
-		if (noErr == tempErr)
-		{
-			filterData.inRecursive = recursive;
-			FSpIterateDirectory(&curFolder, recursive ? 0 : 1, &GetSharedLibraryFilterProc, &filterData);
-			
-			if (filterData.outFound)
-			{
-				*outID = filterData.outID;
-				*outMainAddr = filterData.outAddress;
-				tempErr = noErr;
-				break;
-			}
-			else 
-			{
-				tempErr = cfragNoLibraryErr;
-			}
-		}
-		
-		curLibPath = endCurLibPath + 1;	// skip to next path (past the '\0');
-	} while (!done);
-
-	free(freeCurLibPath);
-	return (tempErr);
-}
-
-
-static Boolean
-LibInPefContainer(const FSSpec* inSpec, StringPtr inName, UInt32* outCodeOffset, UInt32* outCodeLength);
-
-
-/*
-	GetSharedLibraryFilterProc
-	
-	Callback to FSpIterateDirectory, finds a library with the name matching the
-	data in inFilterData (of type GetSharedLibraryFilterProcData).  Forces a quit
-	when a match is found.
-*/
-
-static pascal void
-GetSharedLibraryFilterProc(const CInfoPBRec* const inCpb, Boolean* inWantQuit, void *inFilterData)
-{
-	GetSharedLibraryFilterProcData* pFilterData = (GetSharedLibraryFilterProcData*) inFilterData;
-
-	if ((inCpb->hFileInfo.ioFlAttrib & (1 << ioDirFlg)) == 0)
-	{
-		FSSpec	fragSpec;
-		OSErr	tempErr;
-		Str255	errName;
-		Boolean	crap;
-		UInt32	codeOffset;
-		UInt32	codeLength;
-		
-		// it's a file
-		
-		// ¥ fix-me do we really want to allow all 'APPL's' for in which to find this library?
-		switch (inCpb->hFileInfo.ioFlFndrInfo.fdType)
-		{
-			case kCFragLibraryFileType:
-			case 'APPL':
-				tempErr = FSMakeFSSpec(inCpb->hFileInfo.ioVRefNum, inCpb->hFileInfo.ioFlParID, inCpb->hFileInfo.ioNamePtr, &fragSpec);
-
-				// this shouldn't fail
-				if (noErr != tempErr)
-				{
-					return;
-				}
-				
-				// resolve an alias if this was one
-				tempErr = ResolveAliasFile(&fragSpec, true, &crap, &crap);
-
-				// if got here we have a shlb (or app-like shlb)
-				if (noErr != tempErr)
-				{
-					// probably couldn't resolve an alias
-					return;
-				}
-		
-				break;
-			default:
-				return;
-		}
-	
-		// see if this symbol is in this fragment
-		if (LibInPefContainer(&fragSpec, pFilterData->inName, &codeOffset, &codeLength))
-			tempErr = GetDiskFragment(&fragSpec, codeOffset, codeLength, fragSpec.name, kLoadCFrag, &pFilterData->outID, &pFilterData->outAddress, errName);
-		else
-			return;
-				
-		// stop if we found a library by that name
-		if (noErr == tempErr)
-		{			
-			*inWantQuit = true;
-			pFilterData->outFound = true;
-			pFilterData->outError = tempErr;
-		}
-	}
-	// FSpIterateDirectory will automagically call us for subsequent sub-dirs if necessary
-}
-
-
-/*
-	LibInPefContainer
-	
-	Tell whether library inName is contained it the file pointed to by inSpec.
-	Return the codeOffset and codeLength information, for a subsequent
-	call to GetDiskFragment.
-*/
-
-static Boolean
-LibInPefContainer(const FSSpec* inSpec, StringPtr inName, UInt32* outCodeOffset, UInt32* outCodeLength)
-{
-	short					refNum;
-	CFragResourceHandle		hCfrg;
-	CFragResourceMember*	pCurItem;
-	UInt32					curLibIndex;
-	Boolean					found;
-	
-	// asume we didn't find it
-	found = false;
-	
-	// open the resource fork, if we can't bail
-	refNum = FSpOpenResFile(inSpec, fsRdPerm);
-	require(-1 != refNum, Exit);
-	
-	// grab out the alias record, if it's not there bail
-	hCfrg = (CFragResourceHandle) Get1Resource(kCFragResourceType, kCFragResourceID);
-	require(NULL != hCfrg, CloseResourceAndExit);
-	
-	HLock((Handle)hCfrg);
-	
-	// get ptr to first item
-	pCurItem = &(*hCfrg)->firstMember;
-	for (curLibIndex = 0; curLibIndex < (*hCfrg)->memberCount; curLibIndex++)
-	{
-		// is this our library?
-		if ((pCurItem->name[0] == inName[0]) &&
-			(strncmp((char*) inName + 1, (char*) pCurItem->name + 1, PR_MIN(pCurItem->name[0], inName[0])) == 0))
-		{
-			*outCodeOffset = pCurItem->offset;
-			*outCodeLength = pCurItem->length;
-			found = true;
-		}
-		
-		// skip to next one
-		pCurItem = (CFragResourceMember*) ((char*) pCurItem + pCurItem->memberSize);						
-	}
-	
-	HUnlock((Handle)hCfrg);
-	
-CloseResourceAndExit:
-	CloseResFile(refNum);
-Exit:
-	return (found);
-
-}
-
-
-/*
-	NSFindSymbol
-	
-	Workaround bug in CFM FindSymbol (in at least 7.5.5) where symbols with lengths
-	greater than 63 chars cause a "paramErr".  We iterate through all symbols
-	in the library to find the desired symbol.
-*/
-
-OSErr
-NSFindSymbol(CFragConnectionID inID, Str255 inSymName, Ptr*	outMainAddr, CFragSymbolClass *outSymClass)
-{
-	OSErr	err;
-	
-	if (inSymName[0] > 63)
-	{
-		/* 
-			if there are greater than 63 characters in the
-			name, CFM FindSymbol fails, so let's iterate through all
-			of the symbols in the fragment and grab it 
-			that way.
-		*/
-		long 	symbolCount;
-		Str255	curSymName;
-		long	curIndex;
-		Boolean found;
-		
-		found = false;
-		err = CountSymbols(inID, &symbolCount);
-		if (noErr == err)
-		{
-			/* now iterate through all the symbols in the library */
-			/* per DTS the indices apparently go 0 to n-1 */
-			for (curIndex = 0; (curIndex <= symbolCount - 1 && !found); curIndex++)
-			{
-				err = GetIndSymbol(inID, curIndex, curSymName, outMainAddr, outSymClass);
-				if (noErr == err && curSymName[0] == inSymName[0] && !strncmp((char*)curSymName + 1, (char*)inSymName + 1, curSymName[0]))
-				{
-					/* found our symbol */
-					found = true;
-				}
-			}
-			
-			/* if we didn't find it set the error code so below it won't take this symbol */
-			if (!found)
-				err = cfragNoSymbolErr;
-		}	
-	}
-	else
-	{	
-		err = FindSymbol(inID, inSymName, outMainAddr, outSymClass);
-	}
-	
-	return (err);
-}
-
-
-#pragma mark -
-
-
-/*-----------------------------------------------------------------
-
-	GetNamedFragmentOffsets
-
-	Get the offsets into the data fork of the named fragment,
-	by reading the 'cfrg' resoruce.
-
------------------------------------------------------------------*/
-OSErr GetNamedFragmentOffsets(const FSSpec *fileSpec, const char* fragmentName,
-							UInt32 *outOffset, UInt32 *outLength)
-{
-	CFragResourceHandle		cFragHandle;
-	short									fileRefNum;
-	OSErr									err = noErr;
-	
-	fileRefNum = FSpOpenResFile(fileSpec, fsRdPerm);
-	err = ResError();
-	if (err != noErr) return err;
-
-	cFragHandle = (CFragResourceHandle)Get1Resource(kCFragResourceType, kCFragResourceID);	
-	if (!cFragHandle)
-	{
-		err = resNotFound;
-		goto done;
-	}
-	
-	/* nothing here moves memory, so no need to lock the handle */
-	
-	err = cfragNoLibraryErr;			/* in case of failure */
-	*outOffset = 0;
-	*outLength = 0;
-	
-	/* Now look for the named fragment */
-	if ((**cFragHandle).memberCount > 0)
-	{
-		CFragResourceMemberPtr	memberPtr;
-		UInt16									i;
-		
-		for (	i = 0, memberPtr = &(**cFragHandle).firstMember;
-					i < (**cFragHandle).memberCount;
-					i ++, memberPtr = (CFragResourceMemberPtr)((char *)memberPtr + memberPtr->memberSize))
-		{
-			char		memberName[256];
-			UInt16	nameLen = PR_MIN(memberPtr->name[0], 255);
-		
-			// avoid malloc here for speed
-			strncpy(memberName, (char *)&memberPtr->name[1], nameLen);
-			memberName[nameLen] = '\0';
-		
-			// fragment names are case insensitive, so act like the system
-			if (PL_strcasecmp(memberName, fragmentName) == 0)
-			{
-				*outOffset = memberPtr->offset;
-				*outLength = memberPtr->length;
-				err = noErr;
-				break;
-			}
-		}
-	}
-	
-	/* Resource handle will go away when the res fork is closed */
-	
-done:
-	CloseResFile(fileRefNum);
-	return err;
-}
-
-
-/*-----------------------------------------------------------------
-
-	GetIndexedFragmentOffsets
-	
-	Get the offsets into the data fork of the indexed fragment,
-	by reading the 'cfrg' resoruce.
-
------------------------------------------------------------------*/
-OSErr GetIndexedFragmentOffsets(const FSSpec *fileSpec, UInt32 fragmentIndex,
-							UInt32 *outOffset, UInt32 *outLength, char **outFragmentName)
-{
-	CFragResourceHandle		cFragHandle;
-	short									fileRefNum;
-	OSErr									err = noErr;
-	
-	fileRefNum = FSpOpenResFile(fileSpec, fsRdPerm);
-	err = ResError();
-	if (err != noErr) return err;
-
-	cFragHandle = (CFragResourceHandle)Get1Resource(kCFragResourceType, kCFragResourceID);	
-	if (!cFragHandle)
-	{
-		err = resNotFound;
-		goto done;
-	}
-		
-	err = cfragNoLibraryErr;			/* in case of failure */
-	*outOffset = 0;
-	*outLength = 0;
-	*outFragmentName = NULL;
-	
-	/* the CStrFromPStr mallocs, so might move memory */
-	HLock((Handle)cFragHandle);
-	
-	/* Now look for the named fragment */
-	if ((**cFragHandle).memberCount > 0)
-	{
-		CFragResourceMemberPtr	memberPtr;
-		UInt16									i;
-		
-		for (	i = 0, memberPtr = &(**cFragHandle).firstMember;
-					i < (**cFragHandle).memberCount;
-					i ++, memberPtr = (CFragResourceMemberPtr)((char *)memberPtr + memberPtr->memberSize))
-		{
-			
-			if (i == fragmentIndex)
-			{
-				char	*fragmentStr;
-				CStrFromPStr(memberPtr->name, &fragmentStr);
-				if (!fragmentStr)		/* test for allocation failure */
-				{
-					err = memFullErr;
-					break;
-				}
-				
-				*outFragmentName = fragmentStr;
-				*outOffset = memberPtr->offset;
-				*outLength = memberPtr->length;
-				err = noErr;
-				break;
-			}
-		}
-	}
-	
-	HUnlock((Handle)cFragHandle);
-	
-	/* Resource handle will go away when the res fork is closed */
-	
-done:
-	CloseResFile(fileRefNum);
-	return err;
-}
-
-
-/*-----------------------------------------------------------------
-
-	NSLoadNamedFragment
-	
-	Load the named fragment from the specified file. Aliases must
-	have been resolved by this point.
-
------------------------------------------------------------------*/
-
-OSErr NSLoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName, CFragConnectionID *outConnectionID)
-{
-    UInt32      fragOffset, fragLength;
-    short       fragNameLength;
-    Ptr             main;
-    Str255      fragName;
-    Str255      errName;
-    OSErr           err;
-    
-    err = GetNamedFragmentOffsets(fileSpec, fragmentName, &fragOffset, &fragLength);
-    if (err != noErr) return err;
-    
-    // convert fragment name to pascal string
-    fragNameLength = strlen(fragmentName);
-    if (fragNameLength > 255)
-        fragNameLength = 255;
-    BlockMoveData(fragmentName, &fragName[1], fragNameLength);
-    fragName[0] = fragNameLength;
-    
-    // Note that we pass the fragment name as the 4th param to GetDiskFragment.
-    // This value affects the ability of debuggers, and the Talkback system,
-    // to match code fragments with symbol files
-    err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, 
-                    kLoadCFrag, outConnectionID, &main, errName);
-
-    return err;
-}
-
-
-/*-----------------------------------------------------------------
-
-	NSLoadIndexedFragment
-	
-	Load the indexed fragment from the specified file. Aliases must
-	have been resolved by this point.
-	
-	*outFragName is a malloc'd block containing the fragment name,
-	if returning noErr.
-
------------------------------------------------------------------*/
-
-OSErr NSLoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragmentIndex,
-                            char** outFragName, CFragConnectionID *outConnectionID)
-{
-    UInt32      fragOffset, fragLength;
-    char        *fragNameBlock = NULL;
-    Ptr         main;
-    Str255      fragName = "\p";
-    Str255      errName;
-    OSErr       err;
-
-    *outFragName = NULL;
-    
-    err = GetIndexedFragmentOffsets(fileSpec, fragmentIndex, &fragOffset, &fragLength, &fragNameBlock);
-    if (err != noErr) return err;
-                
-    if (fragNameBlock)
-    {
-        UInt32 nameLen = strlen(fragNameBlock);
-        if (nameLen > 63)
-            nameLen = 63;
-        BlockMoveData(fragNameBlock, &fragName[1], nameLen);
-        fragName[0] = nameLen;
-    }
-
-    // Note that we pass the fragment name as the 4th param to GetDiskFragment.
-    // This value affects the ability of debuggers, and the Talkback system,
-    // to match code fragments with symbol files
-    err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, 
-                    kLoadCFrag, outConnectionID, &main, errName);
-    if (err != noErr)
-    {
-        free(fragNameBlock);
-        return err;
-    }
-
-    *outFragName = fragNameBlock;
-    return noErr;
-}
-
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/macdll.h b/libs/js/nsprpub/pr/src/md/mac/macdll.h
deleted file mode 100644
index a34890cd33..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macdll.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef macdll_h__
-#define macdll_h__
-
-#include "prtypes.h"
-
-OSErr GetNamedFragmentOffsets(const FSSpec *fileSpec, const char* fragmentName,
-							UInt32 *outOffset, UInt32 *outLength);
-OSErr GetIndexedFragmentOffsets(const FSSpec *fileSpec, UInt32 fragmentIndex,
-							UInt32 *outOffset, UInt32 *outLength, char **outFragmentName);
-							
-OSErr NSLoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName, CFragConnectionID *outConnectionID);
-OSErr NSLoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragmentIndex,
-							char** outFragName, CFragConnectionID *outConnectionID);
-
-
-OSErr NSGetSharedLibrary(Str255 inLibName, CFragConnectionID* outID, Ptr* outMainAddr);
-OSErr NSFindSymbol(CFragConnectionID inID, Str255 inSymName,
-							Ptr*	outMainAddr, CFragSymbolClass *outSymClass);
-
-#endif /* macdll_h__ */
diff --git a/libs/js/nsprpub/pr/src/md/mac/macio.c b/libs/js/nsprpub/pr/src/md/mac/macio.c
deleted file mode 100644
index ae3516de1b..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macio.c
+++ /dev/null
@@ -1,1949 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <string.h>
-
-#include <Types.h>
-#include <Files.h>
-#include <Devices.h>
-#include <Folders.h>
-#include <Errors.h>
-#include <Resources.h>
-#include <Processes.h>
-#include <TextUtils.h>
-
-#include <fcntl.h>
-
-#include "FullPath.h"		/* MoreFiles */
-
-#include "primpl.h"
-#include "MacErrorHandling.h"
-#include "mdmac.h"
-
-#include "macio.h"
-
-/* forward declarations */
-extern unsigned long gJanuaryFirst1970Seconds;
-
-extern void WaitOnThisThread(PRThread *thread, PRIntervalTime timeout);
-extern void DoneWaitingOnThisThread(PRThread *thread);
-extern void AsyncNotify(PRThread *thread);
-
-
-/* PB for Read and Write */
-struct ExtendedParamBlock {
-	/* PB must be first so that the file system can get the right data. */
- 	ParamBlockRec 	pb;
-	PRThread 		*thread;
-};
-typedef struct ExtendedParamBlock ExtendedParamBlock;
-
-
-/* XXX Not done yet for 68K */
-/* I/O completion routne for _MD_READ and _MD_WRITE */
-static void AsyncIOCompletion (ExtendedParamBlock *pbAsyncPtr)
-{
-    _PRCPU *cpu = _PR_MD_CURRENT_CPU();
-    PRThread *thread = pbAsyncPtr->thread;    
-    PRIntn is;
-    
-    if (_PR_MD_GET_INTSOFF()) {
-        thread->md.missedIONotify = PR_TRUE;
-        cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-    } else {
-        _PR_INTSOFF(is);
-
-        thread->md.osErrCode = noErr;
-        DoneWaitingOnThisThread(thread);
-
-        _PR_FAST_INTSON(is);
-    }
-
-    SignalIdleSemaphore();
-}
-
-void  _MD_SetError(OSErr oserror)
-{
-    PRErrorCode code;
-
-    switch (oserror) {
-      case memFullErr:
-        code = PR_OUT_OF_MEMORY_ERROR;
-        break;
-      case fnfErr:
-        code = PR_FILE_NOT_FOUND_ERROR;
-        break;
-      case dupFNErr:
-        code = PR_FILE_EXISTS_ERROR;
-        break;
-      case ioErr:
-        code = PR_IO_ERROR;
-        break;
-      case nsvErr:
-      case wrgVolTypErr:
-        code = PR_INVALID_DEVICE_STATE_ERROR;
-        break;
-      case bdNamErr:
-      case fsRnErr:
-        code = PR_NAME_TOO_LONG_ERROR;
-        break;
-      case tmfoErr:
-        code = PR_INSUFFICIENT_RESOURCES_ERROR;
-        break;
-      case opWrErr:
-      case wrPermErr:
-      case permErr:
-      case afpAccessDenied:
-        code = PR_NO_ACCESS_RIGHTS_ERROR;
-        break;
-      case afpObjectTypeErr:
-        code = PR_DIRECTORY_LOOKUP_ERROR;
-        break;
-      case wPrErr:
-      case vLckdErr:
-        code = PR_DEVICE_IS_LOCKED_ERROR;
-        break;
-      case fLckdErr:
-        code = PR_FILE_IS_LOCKED_ERROR;
-        break;
-      case dirNFErr:
-        code = PR_NOT_DIRECTORY_ERROR;
-        break;
-      case dirFulErr:
-        code = PR_MAX_DIRECTORY_ENTRIES_ERROR;
-        break;
-      case dskFulErr:
-        code = PR_NO_DEVICE_SPACE_ERROR;
-        break;
-      case rfNumErr:
-      case fnOpnErr:
-        code = PR_BAD_DESCRIPTOR_ERROR;
-        break;
-      case eofErr:
-        code = PR_END_OF_FILE_ERROR;
-        break;
-      case posErr:
-      case gfpErr:
-        code = PR_FILE_SEEK_ERROR;
-        break;
-      case fBsyErr:
-        code = PR_FILE_IS_BUSY_ERROR;
-        break;
-      case extFSErr:
-        code = PR_REMOTE_FILE_ERROR;
-        break;
-      case abortErr:
-        code = PR_PENDING_INTERRUPT_ERROR;
-        break;
-      case paramErr:
-        code = PR_INVALID_ARGUMENT_ERROR;
-        break;
-      case unimpErr:
-        code = PR_NOT_IMPLEMENTED_ERROR;
-        break;
-    }
-
-    PR_SetError(code, oserror);
-}
-
-void _MD_IOInterrupt(void)
-{
-    PRCList *qp;
-    PRThread *thread, *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(_PR_MD_GET_INTSOFF() != 0);
-
-    _PR_SLEEPQ_LOCK(me->cpu);
-    qp = _PR_PAUSEQ(me->cpu).next;
-    while (qp != &_PR_PAUSEQ(me->cpu)) {
-
-		thread = _PR_THREAD_PTR(qp);
-		PR_ASSERT(thread->flags & _PR_ON_PAUSEQ);
-
-		qp = qp->next;
-		
-		if (thread->md.missedIONotify) {
-			thread->md.missedIONotify = PR_FALSE;
-			DoneWaitingOnThisThread(thread);
-		}
-
-		if (thread->md.missedAsyncNotify) {
-			thread->md.missedAsyncNotify = PR_FALSE;
-			AsyncNotify(thread);
-		}
-    }
-    qp = _PR_SLEEPQ(me->cpu).next;
-    while (qp != &_PR_SLEEPQ(me->cpu)) {
-
-		thread = _PR_THREAD_PTR(qp);
-		PR_ASSERT(thread->flags & _PR_ON_SLEEPQ);
-
-		qp = qp->next;
-		
-		if (thread->md.missedIONotify) {
-			thread->md.missedIONotify = PR_FALSE;
-			DoneWaitingOnThisThread(thread);
-		}
-
-		if (thread->md.missedAsyncNotify) {
-			thread->md.missedAsyncNotify = PR_FALSE;
-			AsyncNotify(thread);
-		}
-    }
-	_PR_SLEEPQ_UNLOCK(thread->cpu);
-}
-
-/* 
-** All PR_read and PR_Write calls are synchronous from caller's perspective.
-** They are internally made asynchronous calls.  This gives cpu to other
-** user threads while the async io is in progress.
-*/
-PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
-{
-	PRInt32 refNum = fd->secret->md.osfd;
-	OSErr				err;
-	ExtendedParamBlock 	pbAsync;
-	PRThread			*me = _PR_MD_CURRENT_THREAD();
-	_PRCPU *cpu = _PR_MD_CURRENT_CPU();
-
-	/* quick hack to allow PR_fprintf, etc to work with stderr, stdin, stdout */
-	/* note, if a user chooses "seek" or the like as an operation in another function */
-	/* this will not work */
-	if (refNum >= 0 && refNum < 3)
-	{
-		switch (refNum)
-		{
-				case 0:
-					/* stdin - not on a Mac for now */
-					err = paramErr;
-					goto ErrorExit;
-					break;
-				case 1: /* stdout */
-				case 2: /* stderr */
-					puts(buf);
-					break;
-		}
-		
-		return (bytes);
-	}
-	else
-	{
-		static IOCompletionUPP	sCompletionUPP = NULL;
-		
-		PRBool  doingAsync = PR_FALSE;
-		
-		/* allocate the callback Universal Procedure Pointer (UPP). This actually allocates
-		   a 32 byte Ptr in the heap, so only do this once
-		*/
-		if (!sCompletionUPP)
-			sCompletionUPP = NewIOCompletionUPP((IOCompletionProcPtr)&AsyncIOCompletion);
-			
-		/* grab the thread so we know which one to post to at completion */
-		pbAsync.thread	= me;
-
-		pbAsync.pb.ioParam.ioCompletion	= sCompletionUPP;
-		pbAsync.pb.ioParam.ioResult		= noErr;
-		pbAsync.pb.ioParam.ioRefNum		= refNum;
-		pbAsync.pb.ioParam.ioBuffer		= buf;
-		pbAsync.pb.ioParam.ioReqCount	= bytes;
-		pbAsync.pb.ioParam.ioPosMode	= fsAtMark;
-		pbAsync.pb.ioParam.ioPosOffset	= 0;
-
-		/* 
-		** Issue the async read call and wait for the io semaphore associated
-		** with this thread.
-		** Async file system calls *never* return error values, so ignore their
-		** results (see <http://developer.apple.com/technotes/fl/fl_515.html>);
-		** the completion routine is always called.
-		*/
-		me->io_fd = refNum;
-		me->md.osErrCode = noErr;
-		if (op == READ_ASYNC)
-		{
-			/*
-			**  Skanky optimization so that reads < 20K are actually done synchronously
-			**  to optimize performance on small reads (e.g. registry reads on startup)
-			*/
-			if ( bytes > 20480L )
-			{
-				doingAsync = PR_TRUE;
-				me->io_pending = PR_TRUE;
-				
-				(void)PBReadAsync(&pbAsync.pb);
-			}
-			else
-			{
-				pbAsync.pb.ioParam.ioCompletion = NULL;
-				me->io_pending = PR_FALSE;
-				
-				err = PBReadSync(&pbAsync.pb);
-				if (err != noErr && err != eofErr)
-					goto ErrorExit;
-			}
-		}
-		else
-		{
-			doingAsync = PR_TRUE;
-			me->io_pending = PR_TRUE;
-
-			/* writes are currently always async */
-			(void)PBWriteAsync(&pbAsync.pb);
-		}
-		
-		if (doingAsync) {
-			WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-		}
-	}
-	
-	err = me->md.osErrCode;
-	if (err != noErr)
-		goto ErrorExit;
-
-	err = pbAsync.pb.ioParam.ioResult;
-	if (err != noErr && err != eofErr)
-		goto ErrorExit;
-	
-	return pbAsync.pb.ioParam.ioActCount;
-
-ErrorExit:
-	me->md.osErrCode = err;
-	_MD_SetError(err);
-	return -1;
-}
-
-/*
-Special WriteSyncProc for logging only.  IO occurs synchronously.  Otherwise,
-logging internal to NSPR causes ReadWriteProc above to recurse on PR_WaitSem logging.
-*/
-PRInt32 WriteSyncProc(PRFileDesc *fd, void *buf, PRUint32 bytes)
-{
-	PRInt32				refNum = fd->secret->md.osfd;
-	OSErr				err;
- 	ParamBlockRec 		pb;
-	PRThread			*me = _PR_MD_CURRENT_THREAD();
-	
-	if (refNum >= 0 && refNum < 3)
-	{
-		PR_ASSERT(FALSE);	/* writing to these is hazardous to a Mac's health (refNum 2 is the system file) */
-		err = paramErr;
-		goto ErrorExit;
-	}
-
-	pb.ioParam.ioCompletion	= NULL;
-	pb.ioParam.ioResult		= noErr;
-	pb.ioParam.ioRefNum		= refNum;
-	pb.ioParam.ioBuffer		= buf;
-	pb.ioParam.ioReqCount	= bytes;
-	pb.ioParam.ioPosMode	= fsAtMark;
-	pb.ioParam.ioPosOffset	= 0;
-
-	err = PBWriteSync(&pb);
-
-	if (err != noErr)
-		goto ErrorExit;
-	else
-		return pb.ioParam.ioActCount;
-
-ErrorExit:
-	me->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-/* File I/O functions called by PR I/O routines */
-PRInt32 _MD_Open(const char *path, PRIntn flags, int mode)
-{
-// Macintosh doesn't really have mode bits, just drop them
-#pragma unused (mode)
-
-	OSErr 				err;
- 	HParamBlockRec 		hpb;
- 	ParamBlockRec 		pb;
-	char	 			*macFileName = NULL;
-	Str255				pascalName;
-	PRInt8 				perm;
-
-    err = ConvertUnixPathToMacPath(path, &macFileName);
-	
-	if (err != noErr)
-		goto ErrorExit;
-
-	hpb.ioParam.ioCompletion	= NULL;
-	PStrFromCStr(macFileName, pascalName);
-	PR_DELETE(macFileName);
-	hpb.ioParam.ioNamePtr 	= pascalName;
-	hpb.ioParam.ioVRefNum 	= 0;
-	hpb.ioParam.ioVersNum 	= 0;
-	hpb.fileParam.ioDirID	= 0;
-
-	if (flags & PR_RDWR)
-		perm = fsRdWrPerm;
-	else if (flags & PR_WRONLY)
-		perm = fsWrPerm;
-	else
-		perm = fsRdPerm;	
-	hpb.ioParam.ioPermssn 	= perm;
-
-	
-    if (flags & PR_CREATE_FILE) {
-		err = PBHCreateSync(&hpb);
-               
-       /* If opening with the PR_EXCL flag the existence of the file prior to opening is an error */
-       if ((flags & PR_EXCL) &&  (err == dupFNErr)) {
-           err = PR_FILE_EXISTS_ERROR;
-           goto ErrorExit;
-       }
-       
-       if ((err != noErr) && (err != dupFNErr))
-          goto ErrorExit;
-	}
- 
-    err = PBHOpenDFSync(&hpb);
-
-	if (err != noErr)
-		goto ErrorExit;
-
-	if (flags & PR_TRUNCATE) {
-		pb.ioParam.ioCompletion = NULL;
-		pb.ioParam.ioRefNum = hpb.ioParam.ioRefNum;
-		pb.ioParam.ioMisc = NULL;
-		err = PBSetEOFSync(&pb);
-		if (err != noErr)
-			goto ErrorExit;
-	} else if (flags & PR_APPEND) {
-		pb.ioParam.ioCompletion = NULL;
-		pb.ioParam.ioRefNum = hpb.ioParam.ioRefNum;
-		pb.ioParam.ioPosMode = fsFromLEOF;
-		pb.ioParam.ioPosOffset = 0;
-		err = PBSetFPosSync(&pb);
-		if (err != noErr)
-			goto ErrorExit;
-	}
-	return hpb.ioParam.ioRefNum;
-		
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-/* _MD_CLOSE_FILE, _MD_READ, _MD_WRITE, _MD_GET_FILE_ERROR are defined in _macos.h */
-
-PROffset32 _MD_LSeek(PRFileDesc *fd, PROffset32 offset, PRSeekWhence how)
-{
-	PRInt32 refNum = fd->secret->md.osfd;
-	OSErr 	err = noErr;
-	long	curPos, endPos;
-
-	/* compute new mark */
-	switch (how) {
-		case PR_SEEK_SET:
-			endPos = offset;
-			break;
-		
-		case PR_SEEK_CUR:
-			err = GetFPos(refNum, &curPos);
-			endPos = curPos + offset;
-			break;
-		
-		case PR_SEEK_END:
-			err = GetEOF(refNum, &curPos);
-			endPos = curPos + offset;
-			break;
-
-		default:
-			err = paramErr;
-			break;
-	}
-
-	/* set the new mark and extend the file if seeking beyond current EOF */
-	/* making sure to set the mark after any required extend */
-	if (err == noErr) {
-		err = SetFPos(refNum, fsFromStart, endPos);
-		if (err == eofErr) {
-			err = SetEOF(refNum, endPos);
-			if (err == noErr) {
-				err = SetFPos(refNum, fsFromStart, endPos);
-			}
-		}
-	}
-
-	if (err == noErr) {
-		return endPos;
-	} else {
-		_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	    _MD_SetError(err);
-		return -1;
-	}
-}
-
-PRInt32 _MD_FSync(PRFileDesc *fd)
-{
-	PRInt32 refNum = fd->secret->md.osfd;
-	OSErr 	err;
- 	ParamBlockRec 		pb;
-
-	pb.ioParam.ioCompletion		= NULL;
-	pb.ioParam.ioRefNum 		= refNum;
-
-	err = PBFlushFileSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-		
-	return 0;
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;	
-}
-
-#include "plstr.h"
-
-PRStatus _MD_OpenDir(_MDDir *mdDir,const char *name)
-{
-	// Emulate the Unix opendir() routine.
-
-	OSErr 				err;
- 	CInfoPBRec 			pb;
-	char				*macDirName = NULL;
-	char				*position = NULL;
-	char				volumeName[32];
-	Str255				pascalName;
-
-	// Get the Macintosh path
-	err = ConvertUnixPathToMacPath(name, &macDirName);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	// Get the vRefNum
-	position = PL_strchr(macDirName, PR_PATH_SEPARATOR);
-	if ((position == macDirName) || (position == NULL))
-		mdDir->ioVRefNum = 0;										// Use application relative searching
-	else {
-		memset(volumeName, 0, sizeof(volumeName));
-		strncpy(volumeName, macDirName, position-macDirName);
-		mdDir->ioVRefNum = GetVolumeRefNumFromName(volumeName);
-	}
-
-	// Get info about the object.
-	PStrFromCStr(macDirName, pascalName);
-	PR_DELETE(macDirName);
-	
-	pb.dirInfo.ioNamePtr = pascalName;
-	pb.dirInfo.ioVRefNum = mdDir->ioVRefNum;
-	pb.dirInfo.ioDrDirID = 0;
-	pb.dirInfo.ioFDirIndex = 0;
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-		
-	// Are we dealing with a directory?
-	if ((pb.dirInfo.ioFlAttrib & ioDirMask) == 0) {
-		err = dirNFErr;
-		goto ErrorExit;
-	}
-	
-	/* This is a directory, store away the pertinent information.
-	** We post increment.  I.e. index is always the nth. item we 
-	** should get on the next call
-	*/
-	mdDir->ioDirID = pb.dirInfo.ioDrDirID;
-	mdDir->currentEntryName = NULL;
-	mdDir->ioFDirIndex = 1;
-	return PR_SUCCESS;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return PR_FAILURE;
-}
-
-char *_MD_ReadDir(_MDDir *mdDir, PRIntn flags)
-{
-	// Emulate the Unix readdir() routine.
-
-	// Mac doesnÕt have the concept of .(PR_SKIP_DOT) & ..(PR_SKIP_DOT_DOT)
-
-	OSErr 				err;
-	CInfoPBRec			pb;
-	char				*returnedCStr;
-	Str255				pascalName = "\p";
-	PRBool				foundEntry;
-	
-	PR_ASSERT(mdDir != NULL);
-
-	do {
-
-	// Release the last name read.
-	PR_DELETE(mdDir->currentEntryName);
-	mdDir->currentEntryName = NULL;
-		
-	// WeÕve got all the info we need, just get info about this guy.
-	pb.hFileInfo.ioNamePtr = pascalName;
-	pb.hFileInfo.ioVRefNum = mdDir->ioVRefNum;
-	pb.hFileInfo.ioFDirIndex = mdDir->ioFDirIndex;
-	pb.hFileInfo.ioDirID = mdDir->ioDirID;
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	// Convert the Pascal string to a C string (actual allocation occurs in CStrFromPStr)
-	CStrFromPStr(pascalName, &returnedCStr);
-	
-	mdDir->currentEntryName = returnedCStr;
-	mdDir->ioFDirIndex++;
-	
-	// If it is not a hidden file and the flags did not specify skipping, we are done.
-	if ((flags & PR_SKIP_HIDDEN) && (pb.hFileInfo.ioFlFndrInfo.fdFlags & fInvisible))
-		foundEntry = PR_FALSE;
-	else
-		foundEntry = PR_TRUE;	
-	
-	} while (!foundEntry);
-	
-	return (mdDir->currentEntryName);
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return NULL;
-}
-
-
-void _MD_CloseDir(_MDDir *mdDir)
-{
-	// Emulate the Unix closedir() routine
-
-	PR_DELETE(mdDir->currentEntryName);
-}
-
-PRInt32 _MD_MkDir(char *unixPath, PRIntn mode)
-{
-	HFileParam		fpb;
-	Str255			pascalName = "\p";
-	char			*cMacPath = NULL;
-	OSErr			err;
-
-	#pragma unused (mode)	// Mode is ignored on the Mac
-
-	if (unixPath) {
-    	err = ConvertUnixPathToMacPath(unixPath, &cMacPath);
-		if (err != noErr)
-			goto ErrorExit;
-
-    	PStrFromCStr(cMacPath, pascalName);
-		PR_DELETE(cMacPath);
-		fpb.ioNamePtr = pascalName;
-		fpb.ioVRefNum = 0;
-		fpb.ioDirID = 0L;
-
-		err = PBDirCreateSync((HParmBlkPtr)&fpb);
-		if (err != noErr)
-			goto ErrorExit;
-	}
-
-	return 0;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRInt32 _MD_Delete(char *unixPath)
-{
-	HFileParam		fpb;
-	Str255			pascalName = "\p";
-	char			*cMacPath = NULL;
-	OSErr			err;
-
-	if (unixPath) {
-    	err = ConvertUnixPathToMacPath(unixPath, &cMacPath);
-		if (err != noErr)
-			goto ErrorExit;
-
-    	PStrFromCStr(cMacPath, pascalName);
-		PR_DELETE(cMacPath);
-		fpb.ioNamePtr = pascalName;
-		fpb.ioVRefNum = 0;
-		fpb.ioDirID = 0L;
-
-		err = PBHDeleteSync((HParmBlkPtr)&fpb);
-		if (err != noErr)
-			goto ErrorExit;
-	}
-
-	return 0;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRInt32 _MD_Rename(char *fromUnixPath, char *toUnixPath)
-{
-	OSErr			err;
-	FSSpec			fromSpec;
-	FSSpec			toSpec;
-	FSSpec			destDirSpec;
-	FSSpec			beforeRenameSpec;
-
-	if (fromUnixPath && toUnixPath) {
-    	err = ConvertUnixPathToFSSpec(fromUnixPath, &fromSpec);
-		if (err != noErr)
-			goto ErrorExit;
-
-    	err = ConvertUnixPathToFSSpec(toUnixPath, &toSpec);
-		if (err != noErr && err != fnfErr)
-			goto ErrorExit;
-
-    	/* make an FSSpec for the destination directory */
-		err = FSMakeFSSpec(toSpec.vRefNum, toSpec.parID, nil, &destDirSpec);
-		if (err != noErr) /* parent directory must exist */
-			goto ErrorExit;
-
-		// move it to the directory specified
-    	err = FSpCatMove(&fromSpec, &destDirSpec);
-		if (err != noErr)
-			goto ErrorExit;
-	    
-	    // make a new FSSpec for the file or directory in its new location	
-		err = FSMakeFSSpec(toSpec.vRefNum, toSpec.parID, fromSpec.name, &beforeRenameSpec);
-		if (err != noErr)
-			goto ErrorExit;
-    	
-    	// rename the file or directory
-    	err = FSpRename(&beforeRenameSpec, toSpec.name);
-		if (err != noErr)
-			goto ErrorExit;
-
-	} else {
-		err = paramErr;
-		goto ErrorExit;
-	}
-
-	return 0;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-#define kWriteAccessAllowed (0x100)
-PRInt32 _MD_Access(char *unixPath, int amode)
-{
-	//
-	// Emulate the Unix access routine
-	//
-	
-	OSErr			err;
-	CInfoPBRec		pb;
-	FCBPBRec		fcbpb;
-	char			*cMacPath = NULL;
-	Str255			pascalMacPath;
-	struct stat		info;
-	
-	// Convert to a Mac style path
-	err = ConvertUnixPathToMacPath(unixPath, &cMacPath);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	err = stat(cMacPath, &info);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	
-	// If all weÕre doing is checking for the existence of the file, weÕre out of here.
-	// On the Mac, if a file exists, you can read from it.
-	// This doesnÕt handle remote AppleShare volumes.  Does it need to?
-	if ((amode == PR_ACCESS_EXISTS) || (amode == PR_ACCESS_READ_OK)) {
-		goto success;
-	}
-	
-	PStrFromCStr(cMacPath, pascalMacPath);
-	
-	pb.hFileInfo.ioNamePtr = pascalMacPath;
-	pb.hFileInfo.ioVRefNum = info.st_dev;
-	pb.hFileInfo.ioDirID = 0;
-	pb.hFileInfo.ioFDirIndex = 0;
-	
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-	// Check out all the access permissions.
-	
-	if (amode == PR_ACCESS_WRITE_OK) {
-		fcbpb.ioNamePtr = NULL;
-		fcbpb.ioVRefNum = pb.hFileInfo.ioVRefNum;
-		fcbpb.ioRefNum = pb.hFileInfo.ioFRefNum;
-		fcbpb.ioFCBIndx = 0;
-	
-		err = PBGetFCBInfoSync(&fcbpb);
-		if (err != noErr)
-			goto ErrorExit;
-	
-		/* Look at Inside Mac IV-180 */
-		if ((fcbpb.ioFCBFlags & kWriteAccessAllowed) == 0) {
-			err = permErr;
-			goto ErrorExit;
-		}
-	}
-	
-success:
-	PR_DELETE(cMacPath);
-	return 0;
-	
-ErrorExit:
-	if (cMacPath != NULL)
-		PR_DELETE(cMacPath);
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRInt32 _MD_GetFileInfo(char *unixPath, PRFileInfo *info)
-{
-	CInfoPBRec		pb;
-	OSErr			err;
-	char			*cMacPath = NULL;
-	Str255			pascalMacPath;
-	PRTime			oneMillion, dateInMicroSeconds;
-	
-	// Convert to a Mac style path
-	err = ConvertUnixPathToMacPath(unixPath, &cMacPath);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	PStrFromCStr(cMacPath, pascalMacPath);
-	PR_DELETE(cMacPath);
-	
-	pb.hFileInfo.ioNamePtr = pascalMacPath;
-	pb.hFileInfo.ioVRefNum = 0;
-	pb.hFileInfo.ioDirID = 0;
-	pb.hFileInfo.ioFDirIndex = 0;
-	
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	if (pb.hFileInfo.ioFlAttrib & ioDirMask) {
-		info->type = PR_FILE_DIRECTORY;
-		info->size = 0;
-	} else {
-		info->type = PR_FILE_FILE;
-		info->size = pb.hFileInfo.ioFlLgLen + pb.hFileInfo.ioFlRLgLen;
-	}
-
-	pb.hFileInfo.ioFlCrDat -= gJanuaryFirst1970Seconds;
-	LL_I2L(dateInMicroSeconds, pb.hFileInfo.ioFlCrDat);
-	LL_I2L(oneMillion, PR_USEC_PER_SEC);
-	LL_MUL(info->creationTime, oneMillion, dateInMicroSeconds);
-
-	pb.hFileInfo.ioFlMdDat -= gJanuaryFirst1970Seconds;
-	LL_I2L(dateInMicroSeconds, pb.hFileInfo.ioFlMdDat);
-	LL_MUL(info->modifyTime, oneMillion, dateInMicroSeconds);
-
-	return 0;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRInt32 _MD_GetOpenFileInfo(const PRFileDesc *fd, PRFileInfo *info)
-{
-	OSErr			err;
-	FCBPBRec		fcbpb;
-	CInfoPBRec		pb;
-	Str255			pascalMacPath;
-	PRTime			oneMillion, dateInMicroSeconds;
-	
-	fcbpb.ioNamePtr = pascalMacPath;
-	fcbpb.ioVRefNum = 0;
-	fcbpb.ioRefNum = fd->secret->md.osfd;
-	fcbpb.ioFCBIndx = 0;
-	
-	err = PBGetFCBInfoSync(&fcbpb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	info->type = PR_FILE_FILE;
-	info->size = fcbpb.ioFCBEOF;
-
-	pb.hFileInfo.ioNamePtr = pascalMacPath;
-	pb.hFileInfo.ioVRefNum = fcbpb.ioFCBVRefNum;
-	pb.hFileInfo.ioDirID = fcbpb.ioFCBParID;
-	pb.hFileInfo.ioFDirIndex = 0;
-	
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	pb.hFileInfo.ioFlCrDat -= gJanuaryFirst1970Seconds;
-	LL_I2L(dateInMicroSeconds, pb.hFileInfo.ioFlCrDat);
-	LL_I2L(oneMillion, PR_USEC_PER_SEC);
-	LL_MUL(info->creationTime, oneMillion, dateInMicroSeconds);
-
-	pb.hFileInfo.ioFlMdDat -= gJanuaryFirst1970Seconds;
-	LL_I2L(dateInMicroSeconds, pb.hFileInfo.ioFlMdDat);
-	LL_MUL(info->modifyTime, oneMillion, dateInMicroSeconds);
-
-	return 0;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRInt32 _MD_Stat(const char *path, struct stat *buf)
-{
-	OSErr	err;
-	char	*macFileName = NULL;
-	
-    err = ConvertUnixPathToMacPath(path, &macFileName);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	err = stat(macFileName, buf);
-	if (err != noErr)
-		goto ErrorExit;
-		
-	PR_DELETE(macFileName);
-	
-	return 0;
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return -1;
-}
-
-PRStatus _MD_LockFile(PRInt32 fd)
-{
-	OSErr			err;
-	FCBPBRec		fcbpb;
-	HFileParam		fpb;
-	Str255			pascalName;
-	
-	fcbpb.ioNamePtr = pascalName;
-	fcbpb.ioVRefNum = 0;
-	fcbpb.ioRefNum = fd;
-	fcbpb.ioFCBIndx = 0;
-	
-	err = PBGetFCBInfoSync(&fcbpb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	fpb.ioCompletion = NULL;
-	fpb.ioNamePtr = pascalName;
-	fpb.ioVRefNum = fcbpb.ioFCBVRefNum;
-	fpb.ioDirID = fcbpb.ioFCBParID;
-
-	err = PBHSetFLockSync((HParmBlkPtr)&fpb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	return PR_SUCCESS;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_TLockFile(PRInt32 fd)
-{
-	return (_MD_LockFile(fd));
-}
-
-PRStatus _MD_UnlockFile(PRInt32 fd)
-{
-	OSErr			err;
-	FCBPBRec		fcbpb;
-	HFileParam		fpb;
-	Str255			pascalName;
-	
-	fcbpb.ioNamePtr = pascalName;
-	fcbpb.ioVRefNum = 0;
-	fcbpb.ioRefNum = fd;
-	fcbpb.ioFCBIndx = 0;
-	
-	err = PBGetFCBInfoSync(&fcbpb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	fpb.ioCompletion = NULL;
-	fpb.ioNamePtr = pascalName;
-	fpb.ioVRefNum = fcbpb.ioFCBVRefNum;
-	fpb.ioDirID = fcbpb.ioFCBParID;
-
-	err = PBHRstFLockSync((HParmBlkPtr)&fpb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	return PR_SUCCESS;
-	
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return PR_FAILURE;
-}
-
-void SetLogFileTypeCreator(const char *logFile)
-{
-	HParamBlockRec pb;
-	OSErr err;
-	Str31 pName;
-
-	PStrFromCStr(logFile, pName);
-	pb.fileParam.ioCompletion = nil;
-	pb.fileParam.ioNamePtr = pName;
-	pb.fileParam.ioVRefNum = 0;
-	pb.fileParam.ioFDirIndex = 0;
-	pb.fileParam.ioDirID = 0;
-	err = PBHGetFInfoSync(&pb);
-	PR_ASSERT(err == noErr);
-
-	pb.fileParam.ioDirID = 0;
-	pb.fileParam.ioFlFndrInfo.fdType = 'TEXT';
-	pb.fileParam.ioFlFndrInfo.fdCreator = 'ttxt';
-	err = PBHSetFInfoSync(&pb);
-	PR_ASSERT(err == noErr);
-}
-
-#if DEVELOPER_DEBUG
-PR_IMPLEMENT (void)
-SetupMacPrintfLog(char *logFile)
-{
-	/*
-	 * We do _PR_InitLog() twice.  The first to force the implicit initialization which
-	 * will set logging to highest levels in _MD_EARLY_INIT.  Then, change the env variable
-	 * to disable kernel logging and call _PR_InitLog() again to make it effective.  Since
-	 * we are using logging to log test program output, we disable kernel logging to avoid
-	 * all Kernel logging output.
-	 */
-#ifdef PR_INTERNAL_LOGGING
-	_PR_InitLog();
-	_MD_PutEnv("NSPR_LOG_MODULES=clock:0,cmon:0,io:0,mon:0,linker:0,cvar:0,sched:0,thread:0");
-	_PR_InitLog();
-#endif
-	PR_ASSERT(PR_SetLogFile(logFile) == PR_TRUE);
-	
-	SetLogFileTypeCreator(logFile);
-}
-#endif
-
-
-/*
-********************** Old name related stuff that is unchanged. **********************
-*/
-
-#if !defined(MAC_NSPR_STANDALONE)
-
-short GetVolumeRefNumFromName(const char *cTgtVolName)
-{
-	OSErr				err;
-	Str32				pVolName;
-	char				*cVolName = NULL;
-	HParamBlockRec		hPB;
-	short				refNum = 0;
-	
-	hPB.volumeParam.ioVolIndex = 0;
-	hPB.volumeParam.ioNamePtr = pVolName;
-	do {
-		hPB.volumeParam.ioVolIndex++;
-		err = PBHGetVInfoSync(&hPB);
-		CStrFromPStr(pVolName, &cVolName);
-		if (strcmp(cTgtVolName, cVolName) == 0) {
-			refNum =  hPB.volumeParam.ioVRefNum;
-			PR_DELETE(cVolName);
-			break;
-		}
-		PR_DELETE(cVolName);
-	} while (err == noErr);
-	
-	return refNum;
-}
-
-static OSErr CreateMacPathFromUnixPath(const char *unixPath, char **macPath)
-{
-	// Given a Unix style path with '/' directory separators, this allocates 
-	// a path with Mac style directory separators in the path.
-	//
-	// It does not do any special directory translation; use ConvertUnixPathToMacPath
-	// for that.
-	
-	const char	*src;
-	char		*tgt;
-	OSErr		err = noErr;
-
-	PR_ASSERT(unixPath != nil);
-	if (nil == unixPath) {
-		err = paramErr;
-		goto exit;
-	}
-
-	// If unixPath is a zero-length string, we copy ":" into
-	// macPath, so we need a minimum of two bytes to handle
-	// the case of ":". 
-	*macPath = malloc(strlen(unixPath) + 2);	// Will be enough extra space.
-	require_action (*macPath != NULL, exit, err = memFullErr;);
-
-	src = unixPath;
-	tgt = *macPath;
-	
-	if (PL_strchr(src, PR_DIRECTORY_SEPARATOR) == src)				// If weÕre dealing with an absolute
-		src++;													// path, skip the separator
-	else
-		*(tgt++) = PR_PATH_SEPARATOR;	
-		
-	if (PL_strstr(src, UNIX_THIS_DIRECTORY_STR) == src)			// If it starts with /
-		src += 2;												// skip it.
-		
-	while (*src) 
-	{				// deal with the rest of the path
-		if (PL_strstr(src, UNIX_PARENT_DIRECTORY_STR) == src) {	// Going up?
-			*(tgt++) = PR_PATH_SEPARATOR;						// simply add an extra colon.
-			src +=3;
-		}
-		else if (*src == PR_DIRECTORY_SEPARATOR) {					// Change the separator
-			*(tgt++) = PR_PATH_SEPARATOR;
-			src++;
-		}
-		else
-			*(tgt++) = *(src++);
-	}
-	
-	*tgt = NULL;							// make sure itÕs null terminated.
-
-exit:
-	return err;
-}
-
-
-static ProcessInfoRec gNavigatorProcInfo;
-static FSSpec gGutsFolder;
-static FSSpec gNetscapeFolder;
-
-static OSErr SetupRequiredFSSpecs(void)
-{
-	OSErr err;
-	CInfoPBRec pb;
-	ProcessSerialNumber curPSN = {0, kCurrentProcess};	
-	
-	gNavigatorProcInfo.processInfoLength = sizeof(ProcessInfoRec);
-	gNavigatorProcInfo.processName = NULL;
-	gNavigatorProcInfo.processAppSpec = &gNetscapeFolder;
-
-	err = GetProcessInformation (&curPSN, &gNavigatorProcInfo);
-	if (err != noErr)
-		goto ErrorExit;
-
-	/* guts folder resides at the same place as the app file itself */
-	gGutsFolder = gNetscapeFolder;
-	/* How else do we do this hack??? 
-	 * Should NSPR have a string resource for this ?
-	 */
-	GetIndString( gGutsFolder.name, 300, 34);
-
-	/* 
-	 * vRefNum and parentDirID are now set up correctly for the app file itself. 
-	 * parentDirID is the Netscape Folder's ID.  Then Find it's parent ID to
-	 * set up the FSSpec and its own name.
-	 */
-
-	pb.dirInfo.ioCompletion = NULL;
-	pb.dirInfo.ioNamePtr = gNetscapeFolder.name;
-	pb.dirInfo.ioVRefNum = gNetscapeFolder.vRefNum;
-	pb.dirInfo.ioFDirIndex = -1;
-	pb.dirInfo.ioDrDirID = gNetscapeFolder.parID;
-	
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	gNetscapeFolder.parID = pb.dirInfo.ioDrParID;
-	
-	return noErr;	
-
-ErrorExit:
-	return err;
-}
-
-static OSErr FindGutsFolder(FSSpec *foundSpec)
-{
-	OSErr err;
-	
-	if (gNavigatorProcInfo.processInfoLength == 0) { /* Uninitialized? */
-		err = SetupRequiredFSSpecs();
-		if (err != noErr)
-			goto ErrorExit;
-	} 
-	
-	*foundSpec = gGutsFolder;
-	
-	return noErr;	
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-    return err;	
-}
-
-static OSErr FindNetscapeFolder(FSSpec *foundSpec)
-{
-	OSErr err;
-	
-	if (gNavigatorProcInfo.processInfoLength == 0) { /* Uninitialized? */
-		err = SetupRequiredFSSpecs();
-		if (err != noErr)
-			goto ErrorExit;
-	} 
-	
-	*foundSpec = gNetscapeFolder;
-	
-	return noErr;	
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-    return err;	
-}
-
-
-PR_IMPLEMENT (OSErr)
-ConvertUnixPathToMacPath(const char *unixPath, char **macPath)
-{	
-		OSErr		err = noErr;
-		
-	//	******** HACK ALERT ********
-	//
-	//	Java really wants long file names (>31 chars).  We truncate file names 
-	//	greater than 31 characters long.  Truncation is from the middle.
-	//
-	//	Convert UNIX style path names (with . and / separators) into a Macintosh
-	//	style path (with :).
-	//
-	// There are also a couple of special paths that need to be dealt with
-	// by translating them to the appropriate Mac special folders.  These include:
-	//
-	//			/usr/tmp/file  =>  {TempFolder}file
-	//
-	// The file conversions we need to do are as follows:
-	//
-	//			file			=>		file
-	//			dir/file		=>		:dir:file
-	//			./file			=>		file
-	//			../file			=>		::file
-	//			../dir/file		=>		::dir:file
-	//			/file			=>		::BootDrive:file
-	//			/dir/file		=>		::BootDrive:dir:file
-	
-	
-	if (!strcmp(unixPath, "."))
-	{
-		*macPath = malloc(sizeof(":"));
-		if (*macPath == NULL)
-			err = memFullErr;
-		(*macPath)[0] = ':';
-		(*macPath)[1] = '\0';
-	}
-	else
-	
-	if (*unixPath != PR_DIRECTORY_SEPARATOR) {				// Not root relative, just convert it.
-		err = CreateMacPathFromUnixPath(unixPath, macPath);
-	}
-	
-	else {
-		// WeÕre root-relative.  This is either a special Unix directory, or a 
-		// full path (which weÕll support on the Mac since they might be generated).
-		// This is not condoning the use of full-paths on the Macintosh for file 
-		// specification.
-		
-		FSSpec		foundSpec;
-		short		pathBufferSize;
-#if DEBUG	
-		char		*temp;
-#endif
-		int		tempLen;
-
-		// Are we dealing with the temp folder?
-		if ((strncmp(unixPath, "/usr/tmp", strlen("/usr/tmp")) == 0) || 
-			((strncmp(unixPath, "/tmp", strlen("/tmp")) == 0))) {
-		    CInfoPBRec pb;
-
-			unixPath = PL_strchr(unixPath, PR_DIRECTORY_SEPARATOR);
-			if (strncmp(unixPath, "/tmp", strlen("/tmp")) == 0) // skip past temp spec
-				unixPath += 5;	
-			else
-				unixPath += 9;	
-							
-			err = FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder,	// Create if needed
-								&foundSpec.vRefNum, &foundSpec.parID);
-			if (err == noErr) {
-				pb.dirInfo.ioCompletion = NULL;
-				pb.dirInfo.ioNamePtr = foundSpec.name;
-				pb.dirInfo.ioVRefNum = foundSpec.vRefNum;
-				pb.dirInfo.ioFDirIndex = -1;
-				pb.dirInfo.ioDrDirID = foundSpec.parID;
-				
-				err = PBGetCatInfoSync(&pb);
-				foundSpec.parID = pb.dirInfo.ioDrParID;
-			}
-		}
-		
-		else if (!strncmp(unixPath, "/usr/local/netscape/", (tempLen = strlen("/usr/local/netscape/")))) {
-			
-			unixPath += tempLen;
-			
-			if (!strncmp(unixPath, "RequiredGuts/", (tempLen = strlen("RequiredGuts/"))))
-			{
-				unixPath += tempLen;
-				err = FindGutsFolder(&foundSpec);
-			}
-			else if (!strncmp(unixPath, "bin/", (tempLen = strlen("bin/"))))
-			{
-				unixPath += tempLen;
-				err = FindNetscapeFolder(&foundSpec);
-			}			
-			else if (*unixPath == '\0')
-			{
-				// it's /usr/local/netscape
-				err = FindGutsFolder(&foundSpec);
-			}
-
-		}
-		
-		else {
-			// This is a root relative directory, weÕll just convert the whole thing.
-			err = CreateMacPathFromUnixPath(unixPath, macPath);
-			goto Exit_ConvertUnixPathToMacPath;
-		}
-	
-
-		
-		// WeÕre dealing with a special folder
-		if (err == noErr)
-		{
-			Handle	hPathStr;
-			// Get the path to the root-relative directory
-			err = FSpGetFullPath(&foundSpec, &pathBufferSize, &hPathStr);		// NewHandle's hPathStr
-			 
-			if (noErr == err)
-			{
-				// convert handle to c-string
-				// add one for NULL termination
-				// pathBufferSize is now one greater than the length of the string
-				pathBufferSize++;	
-				
-				*macPath = (char*) malloc(sizeof(char) * pathBufferSize);
-				(*macPath)[pathBufferSize - 1] = '\0';
-				BlockMoveData(*hPathStr, *macPath, pathBufferSize - 1);
-			
-				DisposeHandle(hPathStr);
-			}
-		}
-		
-		if (err == noErr)
-		{
-			UInt32	unixPathLeft;
-			UInt32	macPathLen;
-
-			unixPathLeft =  strlen(unixPath);
-			macPathLen = strlen(*macPath);
-			
-
-			// copy over the remaining file name, converting
-			if (pathBufferSize - 1 < macPathLen + unixPathLeft) 
-			{
-				// need to grow string
-				*macPath = realloc(*macPath, macPathLen + unixPathLeft + 1);
-				err = (*macPath == NULL ? memFullErr : noErr);
-			}
-			
-			if (err == noErr)
-			{
-				// carefully remove the '/''s out of the unix path.  If we see an "escaped" /
-				// we will leave it in there, otherwise we take it out and replace it with a :
-				// we have to do this before we convert to a mac-path, so we can tell what is
-				// really a path separator and what is in the name of a file or directory
-				// Make sure that all of the /Õs are :Õs in the final pathname
-				// effectively we do a
-				// strcat(*macPath, unixPath); while replace all occurrences of / with : in unixPath
-				char*		dp;
-				const char*	sp;
-				
-				sp = unixPath;
-				dp = *macPath + macPathLen;
-				
-				for (;*sp != '\0'; sp++, dp++) 
-				{
-					if (*sp == PR_DIRECTORY_SEPARATOR)
-					{
-						// if we can look at the previous character
-						if (sp > unixPath)					
-						{
-							// check to see if previous character is an escape
-							if (sp[-1] == '\\')
-							{
-								// leave it in, and cycle
-								continue;
-							}
-							else
-							{
-								*dp = PR_PATH_SEPARATOR;
-							}
-						}
-						else				
-							*dp = PR_PATH_SEPARATOR;
-					}
-					else
-					{
-						// just copy;
-						*dp = *sp;
-					}
-				}
-				
-				*dp = '\0';   // NULL terminate *macPath
-			}
-#if DEBUG	
-			// we used to check here, now we check above, we leave this in
-			// the debug build to make sure we didn't screw up
-			// Make sure that all of the /Õs are :Õs in the final pathname
-			for (temp = *macPath + strlen(*macPath) - strlen(unixPath); *temp != '\0'; temp++) {
-
-				if (*temp == PR_DIRECTORY_SEPARATOR)
-				{
-					DebugStr("\pFound a slash");	
-					*temp = PR_PATH_SEPARATOR;
-				}
-			}
-#endif
-		}
-	}
-	
-	
-Exit_ConvertUnixPathToMacPath:
-
-	return err;
-}
-
-// Hey! Before you delete this "hack" you should look at how it's being
-// used by sun-java/netscape/applet/appletStubs.c.
-PR_IMPLEMENT (OSErr)
-ConvertMacPathToUnixPath(const char *macPath, char **unixPath) 
-{
-	// *** HACK ***
-	// Get minimal version working
-	
-	char		*unixPathPtr;
-	
-	*unixPath = malloc(strlen(macPath) + 2);	// Add one for the front slash, one for null
-	if (*unixPath == NULL)
-		return (memFullErr);
-		
-	unixPathPtr = *unixPath;
-	
-	*unixPathPtr++ = PR_DIRECTORY_SEPARATOR;
-	
-	do {
-		// Translate all colons to slashes
-		if (*macPath == PR_PATH_SEPARATOR)
-			*unixPathPtr = PR_DIRECTORY_SEPARATOR;
-		else
-			*unixPathPtr = *macPath;
-
-		unixPathPtr++;
-		macPath++;
-	} while (*macPath != NULL);
-	
-	// Terminate the string
-	*unixPathPtr = '\0';
-	
-	return (noErr);
-}
-
-OSErr
-ConvertUnixPathToFSSpec(const char *unixPath, FSSpec *fileSpec)
-{
-    char*                   macPath;
-    OSErr                   convertError;
-    int                             len;
-    
-    convertError = ConvertUnixPathToMacPath(unixPath, &macPath);
-    if (convertError != noErr)
-    	return convertError;
-
-    len = strlen(macPath);
-
-    if (*macPath == PR_PATH_SEPARATOR)
-    {
-        if (len < sizeof(Str255))
-        {
-            short   vRefNum;
-            long    dirID;
-            Str255  pascalMacPath;
-            
-            convertError = HGetVol(NULL, &vRefNum, &dirID);
-            if (convertError == noErr)
-            {
-                PStrFromCStr(macPath, pascalMacPath);
-                convertError = FSMakeFSSpec(vRefNum, dirID, pascalMacPath, fileSpec);
-            }
-        }
-        else
-            convertError = paramErr;
-    }
-    else
-    {
-    	convertError = FSpLocationFromFullPath(len, macPath, fileSpec);
-	    if (convertError == fnfErr)
-	    {
-			CInfoPBRec		pb;
-			Str255	pascalMacPath;
-			OSErr err;
-			
-			PStrFromCStr(macPath, pascalMacPath);
-			/* 
-			FSpLocationFromFullPath does not work for directories unless there is
-			a ":" at the end.  We will make sure of an existence of a directory.
-			If so, the returned fileSpec is valid from FSpLocationFromFullPath eventhough
-			it returned an error.
-			*/
-			pb.hFileInfo.ioNamePtr = pascalMacPath;
-			pb.hFileInfo.ioVRefNum = 0;
-			pb.hFileInfo.ioDirID = 0;
-			pb.hFileInfo.ioFDirIndex = 0;
-			
-			err = PBGetCatInfoSync(&pb);
-			if (err == noErr)
-				convertError = noErr;
-		}
-    }
-    
-    free(macPath);
-    
-    return (convertError);
-}
- 
-
-FILE *_OS_FOPEN(const char *filename, const char *mode) 
-{
-	OSErr	err = noErr;
-	char	*macFileName = NULL;
-	FILE	*result;
-	
-    err = ConvertUnixPathToMacPath(filename, &macFileName);
-	if (err != noErr)
-		goto ErrorExit;
-	
-	result = fopen(macFileName, mode);
-		
-	PR_DELETE(macFileName);
-	
-	return result;
-
-ErrorExit:
-	_PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-	_MD_SetError(err);
-    return NULL;
-}
-
-#else
-
-short GetVolumeRefNumFromName(const char *cTgtVolName)
-{
-	OSErr				err;
-	Str32				pVolName;
-	char				*cVolName = NULL;
-	HParamBlockRec		hPB;
-	short				refNum = 0;
-	
-	hPB.volumeParam.ioVolIndex = 0;
-	hPB.volumeParam.ioNamePtr = pVolName;
-	do {
-		hPB.volumeParam.ioVolIndex++;
-		err = PBHGetVInfoSync(&hPB);
-		CStrFromPStr(pVolName, &cVolName);
-		if (strcmp(cTgtVolName, cVolName) == 0) {
-			refNum =  hPB.volumeParam.ioVRefNum;
-			PR_DELETE(cVolName);
-			break;
-		}
-		PR_DELETE(cVolName);
-	} while (err == noErr);
-	
-	return refNum;
-}
-
-
-
-static OSErr GetFullPath(short vRefNum, long dirID, char **fullPath, int *strSize)
-{
-	Str255			pascalDirName;
-	char			cDirName[256];
-	char			*tmpPath = NULL;						// needed since sprintf isnÕt safe
-	CInfoPBRec		myPB;
-	OSErr			err = noErr;
-	
-	
-	// get the full path of the temp folder.
-	*strSize = 256;
-	*fullPath = NULL;
-	*fullPath = malloc(*strSize);	// How big should this thing be?
-	require_action (*fullPath != NULL, errorExit, err = memFullErr;);
-		
-	tmpPath = malloc(*strSize);
-	require_action (tmpPath != NULL, errorExit, err = memFullErr;);
-
-	strcpy(*fullPath, "");				// Clear C result
-	strcpy(tmpPath, "");
-	pascalDirName[0] = 0;				// Clear Pascal intermediate string
-	
-	myPB.dirInfo.ioNamePtr = &pascalDirName[0];
-	myPB.dirInfo.ioVRefNum = vRefNum;
-	myPB.dirInfo.ioDrParID = dirID;
-	myPB.dirInfo.ioFDirIndex = -1;				// Getting info about
-	
-	do {
-		myPB.dirInfo.ioDrDirID = myPB.dirInfo.ioDrParID;
-
-		err = PBGetCatInfoSync(&myPB);
-		require(err == noErr, errorExit);
-			
-		// Move the name into C domain
-		memcpy(&cDirName, &pascalDirName, 256);
-		p2cstr((unsigned char *)&cDirName);							// Changes in place!
-		
-		if ((strlen(cDirName) + strlen(*fullPath)) > *strSize) {
-			// We need to grow the string, do it in 256 byte chunks
-			(*strSize) += 256;										
-			*fullPath = PR_REALLOC(*fullPath, *strSize);
-			require_action (*fullPath != NULL, errorExit, err = memFullErr;);
-
-			tmpPath = PR_REALLOC(tmpPath, *strSize);
-			require_action (tmpPath != NULL, errorExit, err = memFullErr;);
-		}
-		sprintf(tmpPath, "%s:%s", cDirName, *fullPath);
-		strcpy(*fullPath, tmpPath);
-	} while (myPB.dirInfo.ioDrDirID != fsRtDirID);
-	
-	PR_DELETE(tmpPath);
-	
-	return noErr;
-	
-	
-errorExit:
-	PR_DELETE(*fullPath);
-	PR_DELETE(tmpPath);
-	
-	return err;
-
-}
-
-static OSErr CreateMacPathFromUnixPath(const char *unixPath, char **macPath)
-{
-	// Given a Unix style path with '/' directory separators, this allocates 
-	// a path with Mac style directory separators in the path.
-	//
-	// It does not do any special directory translation; use ConvertUnixPathToMacPath
-	// for that.
-	
-	const char	*src;
-	char		*tgt;
-	OSErr		err = noErr;
-
-	PR_ASSERT(unixPath != nil);
-	if (nil == unixPath) {
-		err = paramErr;
-		goto exit;
-	}
-
-	// If unixPath is a zero-length string, we copy ":" into
-	// macPath, so we need a minimum of two bytes to handle
-	// the case of ":". 
-	*macPath = malloc(strlen(unixPath) + 2);	// Will be enough extra space.
-	require_action (*macPath != NULL, exit, err = memFullErr;);
-
-	src = unixPath;
-	tgt = *macPath;
-	
-	if (PL_strchr(src, PR_DIRECTORY_SEPARATOR) == src)				// If weÕre dealing with an absolute
-		src++;													// path, skip the separator
-	else
-		*(tgt++) = PR_PATH_SEPARATOR;	
-		
-	if (PL_strstr(src, UNIX_THIS_DIRECTORY_STR) == src)			// If it starts with ./
-		src += 2;												// skip it.
-		
-	while (*src) 
-	{				// deal with the rest of the path
-		if (PL_strstr(src, UNIX_PARENT_DIRECTORY_STR) == src) {	// Going up?
-			*(tgt++) = PR_PATH_SEPARATOR;						// simply add an extra colon.
-			src +=3;
-		}
-		else if (*src == PR_DIRECTORY_SEPARATOR) {					// Change the separator
-			*(tgt++) = PR_PATH_SEPARATOR;
-			src++;
-		}
-		else
-			*(tgt++) = *(src++);
-	}
-	
-	*tgt = NULL;							// make sure itÕs null terminated.
-
-exit:
-	return err;
-}
-
-static OSErr ConvertUnixPathToMacPath(const char *unixPath, char **macPath)
-{	
-		OSErr		err = noErr;
-		
-
-	//
-	//	Convert UNIX style path names (with . and / separators) into a Macintosh
-	//	style path (with :).
-	//
-	// There are also a couple of special paths that need to be dealt with
-	// by translating them to the appropriate Mac special folders.  These include:
-	//
-	//			/usr/tmp/file  =>  {TempFolder}file
-	//
-	// The file conversions we need to do are as follows:
-	//
-	//			file			=>		file
-	//			dir/file		=>		:dir:file
-	//			./file			=>		file
-	//			../file			=>		::file
-	//			../dir/file		=>		::dir:file
-	//			/file			=>		::BootDrive:file
-	//			/dir/file		=>		::BootDrive:dir:file
-	
-	
-	if (*unixPath != PR_DIRECTORY_SEPARATOR) {				// Not root relative, just convert it.
-		err = CreateMacPathFromUnixPath(unixPath, macPath);
-	}
-	
-	else {
-		// WeÕre root-relative.  This is either a special Unix directory, or a 
-		// full path (which weÕll support on the Mac since they might be generated).
-		// This is not condoning the use of full-paths on the Macintosh for file 
-		// specification.
-		
-		short		foundVRefNum;
-		long		foundDirID;
-		int			pathBufferSize;
-		char		*temp;
-		char		isNetscapeDir = false;
-
-		// Are we dealing with the temp folder?
-		if (strncmp(unixPath, "/usr/tmp", strlen("/usr/tmp")) == 0){
-			unixPath += 8;
-			if (*unixPath == PR_DIRECTORY_SEPARATOR)
-				unixPath++;														// Skip the slash
-			err = FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder,	// Create if needed
-								&foundVRefNum, &foundDirID);
-		}
-		
-		if (strncmp(unixPath, "/tmp", strlen("/tmp")) == 0) {
-			unixPath += 4;															// Skip the slash
-			if (*unixPath == PR_DIRECTORY_SEPARATOR)
-				unixPath++;														// Skip the slash
-			err = FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder,	// Create if needed
-								&foundVRefNum, &foundDirID);
-		}
-		
-		else if (strncmp(unixPath, "/usr", strlen("/usr")) == 0) {
-		
-			int		usrNetscapePathLen;
-			
-			usrNetscapePathLen = strlen("/usr/local/netscape/");
-		
-			if (strncmp(unixPath, "/usr/local/netscape/", usrNetscapePathLen) == 0) {
-				unixPath += usrNetscapePathLen;				
-//				err = FindPreferencesFolder(&foundVRefNum, &foundDirID);
-				err = paramErr;
-				isNetscapeDir = true;
-			}
-			
-			else {
-				dprintf("Unable to translate Unix file path %s to Mac path\n", unixPath);
-				err = -1;
-				goto Exit_ConvertUnixPathToMacPath;
-			}
-
-		}
-		
-		else {
-			// This is a root relative directory, weÕll just convert the whole thing.
-			err = CreateMacPathFromUnixPath(unixPath, macPath);
-			goto Exit_ConvertUnixPathToMacPath;
-		}
-	
-		// WeÕre dealing with a special folder
-		if (err == noErr)
-			// Get the path to the root-relative directory
-			err = GetFullPath(foundVRefNum, foundDirID, macPath, &pathBufferSize);		// mallocs macPath
-		
-		if (err == noErr){
-			
-			// copy over the remaining file name, converting
-			if (pathBufferSize < (strlen(*macPath) + strlen(unixPath))) {
-				// need to grow string
-				*macPath = PR_REALLOC(*macPath, (strlen(*macPath) + strlen(unixPath) + 
-					(isNetscapeDir ? strlen("Netscape Ä:") : 0)));
-				err = (*macPath == NULL ? memFullErr : noErr);
-			}
-			
-			if (isNetscapeDir)
-				strcat(*macPath, "Netscape Ä:");
-		
-			if (err == noErr)
-				strcat(*macPath, unixPath);
-			
-			//	Make sure that all of the /Õs are :Õs in the final pathname
-				
-			for (temp = *macPath + strlen(*macPath) - strlen(unixPath); *temp != '\0'; temp++) {
-				if (*temp == PR_DIRECTORY_SEPARATOR)
-					*temp = PR_PATH_SEPARATOR;
-			}
-
-		}
-	}
-	
-	
-Exit_ConvertUnixPathToMacPath:
-
-	return err;
-}
-
-OSErr
-ConvertUnixPathToFSSpec(const char *unixPath, FSSpec *fileSpec)
-{
-    char*                   macPath;
-    OSErr                   convertError;
-    int                             len;
-    
-    convertError = ConvertUnixPathToMacPath(unixPath, &macPath);
-    if (convertError != noErr)
-    	return convertError;
-
-    len = strlen(macPath);
-
-    if (*macPath == PR_PATH_SEPARATOR)
-    {
-        if (len < sizeof(Str255))
-        {
-            short   vRefNum;
-            long    dirID;
-            Str255  pascalMacPath;
-            
-            convertError = HGetVol(NULL, &vRefNum, &dirID);
-            if (convertError == noErr)
-            {
-                PStrFromCStr(macPath, pascalMacPath);
-                convertError = FSMakeFSSpec(vRefNum, dirID, pascalMacPath, fileSpec);
-            }
-        }
-        else
-            convertError = paramErr;
-    }
-    else
-    {
-    	convertError = FSpLocationFromFullPath(len, macPath, fileSpec);
-    }
-    
-    free(macPath);
-    
-    return (convertError);
-}
- 
-
-#endif
-
-/*
- **********************************************************************
- *
- * Memory-mapped files are not implementable on the Mac.
- *
- **********************************************************************
- */
-
-PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size)
-{
-#pragma unused (fmap, size)
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRInt32 _MD_GetMemMapAlignment(void)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-}
-
-void * _MD_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,
-    PRUint32 len)
-{
-#pragma unused (fmap, offset, len)
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PRStatus _MD_MemUnmap(void *addr, PRUint32 len)
-{
-#pragma unused (addr, len)
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_CloseFileMap(PRFileMap *fmap)
-{
-#pragma unused (fmap)
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/mac/macio.h b/libs/js/nsprpub/pr/src/md/mac/macio.h
deleted file mode 100644
index 06b85a9a27..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macio.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef macio_h__
-#define macio_h__
-
-
-PR_BEGIN_EXTERN_C
-
-OSErr ConvertUnixPathToMacPath(const char *, char **);
-OSErr ConvertUnixPathToFSSpec(const char *unixPath, FSSpec *fileSpec);
-
-PR_END_EXTERN_C
-
-
-#endif /* macio_h__ */
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/macrng.c b/libs/js/nsprpub/pr/src/md/mac/macrng.c
deleted file mode 100644
index c869cc3d1e..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macrng.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/* XXX are all these headers required for a call to TickCount()? */
-#include <Events.h>
-#include <OSUtils.h>
-#include <QDOffscreen.h>
-#include <PPCToolbox.h>
-#include <Processes.h>
-#include <LowMem.h>
-#include "primpl.h"
-
-extern PRSize _PR_MD_GetRandomNoise( buf, size )
-{
-    uint32 c = TickCount();
-    return _pr_CopyLowBits((void *)buf, size,  &c, sizeof(c));
-}
diff --git a/libs/js/nsprpub/pr/src/md/mac/macsocket.h b/libs/js/nsprpub/pr/src/md/mac/macsocket.h
deleted file mode 100644
index 7e99faf287..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macsocket.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef macksocket_h___
-#define macksocket_h___
-
-// macsock.h
-// Interface visible to xp code
-// C socket type definitions and routines
-// from sys/socket.h
-#include <Files.h>
-#include <OpenTptInternet.h>	// All the internet typedefs
-#include <utime.h>				// For timeval
-/*
- * sleep and delay conflict with the same in unistd.h from Metrowerks.  OT
- * defines them as 
- *
- *    extern pascal void		OTDelay(UInt32 seconds);
- *    extern pascal void		OTIdle(void);
- *
- *    #define sleep(x)	OTDelay(x)
- *    #define delay(x)	OTDelay(x)
- */
-
-#undef sleep
-#undef delay
-
-#pragma once
-
-#include "prio.h"
-
-struct sockaddr {
-	unsigned char	sa_len;			/* total length */
-	unsigned char	sa_family;		/* address family */
-	char	sa_data[14];		/* actually longer; address value */
-};
-
-// from netinet/in.h
-struct in_addr {
-	unsigned long s_addr;
-};
-
-struct sockaddr_in {
-	unsigned char	sin_len;
-	unsigned char	sin_family;		// AF_INET
-	unsigned short	sin_port;
-	struct	in_addr sin_addr;
-	char		sin_zero[8];
-};
-
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatiblity */
-};
-
-// Necessary network defines, found by grepping unix headers when XP code would not compile
-#define FIONBIO 1
-#define SOCK_STREAM 1
-#define SOCK_DGRAM 		2
-#define IPPROTO_TCP 	INET_TCP		// Default TCP protocol
-#define IPPROTO_UDP		INET_UDP		// Default UDP protocol
-#define INADDR_ANY		kOTAnyInetAddress
-#define SOL_SOCKET		XTI_GENERIC		// Any type of socket
-#define SO_REUSEADDR	IP_REUSEADDR
-#define SO_BROADCAST	IP_BROADCAST
-#define MSG_PEEK		0x2				// Just look at a message waiting, donÕt actually read it.
-
-typedef unsigned long u_long;
-
-/* ldap.h has its own definition of fd_set */
-/* select support */
-#if !defined(FD_SET)
-#define	NBBY    8
-typedef long    fd_mask;
-#define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
-
-#ifndef howmany
-#define howmany(x, y)   (((x)+((y)-1))/(y))
-#endif
-#define FD_SETSIZE 64
-typedef	struct fd_set{
-    fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-
-#define	FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
-#define	FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
-#define	FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#define	FD_ZERO(p)      memset (p, 0, sizeof(*(p)))
-#endif /* !FD_SET */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern unsigned long inet_addr(const char *cp);
-extern char *inet_ntoa(struct in_addr in);
-
-inline unsigned long htonl(unsigned long hostlong) {return hostlong;}
-inline unsigned long ntohl(unsigned long netlong) {return netlong;}
-inline unsigned short ntohs(unsigned short netshort) {return netshort;}
-inline unsigned short htons(unsigned short hostshort) {return hostshort;}
-
-
-// UNIX look-alike routines
-// They make sure that the arguments passed in are valid, and then
-//
-extern struct hostent *macsock_gethostbyaddr(const void *addr, int addrlen, int type);
-
-extern int macsock_socket(int domain, int type, int protocol);
-extern int macsock_ioctl(int sID, unsigned int request, void *value);
-extern int macsock_connect(int sID, struct sockaddr *name, int namelen);
-extern int macsock_write(int sID, const void *buffer, unsigned buflen);
-extern int macsock_read(int sID, void *buf, unsigned nbyte);
-extern int macsock_close(int sID);
-
-extern int macsock_accept(int sID, struct sockaddr *addr, int *addrlen);
-extern int macsock_bind(int sID, const struct sockaddr *name, int namelen);
-extern int macsock_listen(int sID, int backlog);
-
-extern int macsock_shutdown(int sID, int how);
-extern int macsock_getpeername(int sID, struct sockaddr *name, int *namelen);
-extern int macsock_getsockname(int sID, struct sockaddr *name, int *namelen);
-extern int macsock_getsockopt(int sID, int level, int optname, void *optval,int *optlen);
-extern int macsock_setsockopt(int sID, int level, int optname, const void *optval,int optlen);
-extern int macsock_socketavailable(int sID, size_t *bytesAvailable);
-extern int macsock_dup(int sID);
-
-extern int macsock_send(int sID, const void *msg, int len, int flags);
-extern int macsock_sendto(int sID, const void *msg, int len, int flags, struct sockaddr *toAddr, int toLen);
-extern int macsock_recvfrom(int sID, void *buf, int len, int flags, struct sockaddr *from, int *fromLen);
-extern int macsock_recv(int sID, void *buf, int len, int flags);
-
-extern int select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
-
-
-#define macsock_gethostbyaddr PR_GetHostByAddr
-#define macsock_socket PR_Socket
-#define macsock_connect PR_Connect
-#define macsock_write PR_Write
-#define macsock_read PR_Read
-#define macsock_close PR_Close
-#define macsock_accept PR_Accept
-#define macsock_bind PR_Bind
-#define macsock_listen PR_Listen
-#define macsock_shutdown PR_Shutdown
-#define macsock_getpeername PR_GetPeerName
-#define macsock_getsockname PR_GetSockName
-#define macsock_socketavailable PR_SocketAvailable
-#define macsock_send PR_Send
-#define macsock_sendto PR_SendTo
-#define macsock_recvfrom PR_RecvFrom
-#define macsock_recv PR_Recv
-
-#ifdef __cplusplus
-}
-#endif
-//extern int errno;
-
-/*
-macsock_sendmsg
-macsock_readv
-macsock_writev
-*/
-
-/* New definitions that are not defined in macsock.h in macsock library */
-struct	protoent {
-    char	*p_name;		/* official protocol name */
-    char	**p_aliases;	/* alias list */
-    int		p_proto;		/* protocol # */
-};
-
-extern struct protoent *getprotobyname(const char * name);
-extern struct protoent *getprotobynumber(int number);
-
-extern int gethostname (char *name, int namelen);
-extern struct hostent *gethostbyname(const char * name);
-extern struct hostent *gethostbyaddr(const void *addr, int addrlen, int type);
-
-#define INADDR_LOOPBACK	0x7F000001
-
-#define SO_KEEPALIVE	TCP_KEEPALIVE
-#define SO_RCVBUF		XTI_RCVBUF
-#define SO_SNDBUF		XTI_SNDBUF
-#define SO_LINGER       XTI_LINGER          /* linger on close if data present */
-
-#define IPPROTO_IP		INET_IP
-
-/* Get/Set sock opt until fixed in NSPR 2.0 */
-struct  linger {
-        int     l_onoff;                /* option on/off */
-        int     l_linger;               /* linger time */
-};
-
-struct ip_mreq {
-        struct in_addr  imr_multiaddr;  /* IP multicast address of group */
-        struct in_addr  imr_interface;  /* local IP address of interface */
-};
-
-#endif /* macksocket_h___ */
diff --git a/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c b/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c
deleted file mode 100644
index b357eea674..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macsockotpt.c
+++ /dev/null
@@ -1,2321 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* This turns on UNIX style errors in OT 1.1 headers */
-#define OTUNIXERRORS 1
-
-#include <string.h>
-
-#include <Gestalt.h>
-#include <Files.h>
-#include <OpenTransport.h>
-#include <OSUtils.h>
-
-#define GESTALT_OPEN_TPT_PRESENT        gestaltOpenTptPresentMask
-#define GESTALT_OPEN_TPT_TCP_PRESENT    gestaltOpenTptTCPPresentMask
-
-#include <OpenTptInternet.h>    // All the internet typedefs
-
-#if (UNIVERSAL_INTERFACES_VERSION >= 0x0330)
-// for some reason Apple removed this typedef.
-typedef struct OTConfiguration	OTConfiguration;
-#endif
-
-#include "primpl.h"
-
-typedef enum SndRcvOpCode {
-    kSTREAM_SEND,
-    kSTREAM_RECEIVE,
-    kDGRAM_SEND,
-    kDGRAM_RECEIVE
-} SndRcvOpCode;
-
-static struct {
-	PRLock *    lock;
-	InetSvcRef  serviceRef;
-	PRThread *  thread;
-	void *      cookie;
-} dnsContext;
-
-
-static pascal void  DNSNotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie);
-static pascal void  NotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie);
-static pascal void  RawEndpointNotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie);
-
-static PRBool GetState(PRFileDesc *fd, PRBool *readReady, PRBool *writeReady, PRBool *exceptReady);
-
-void
-WakeUpNotifiedThread(PRThread *thread, OTResult result);
-
-extern void WaitOnThisThread(PRThread *thread, PRIntervalTime timeout);
-extern void DoneWaitingOnThisThread(PRThread *thread);
-
-#if TARGET_CARBON
-OTClientContextPtr  clientContext = NULL;
-
-#define INIT_OPEN_TRANSPORT()	InitOpenTransportInContext(kInitOTForExtensionMask, &clientContext)
-#define OT_OPEN_INTERNET_SERVICES(config, flags, err)	OTOpenInternetServicesInContext(config, flags, err, clientContext)
-#define OT_OPEN_ENDPOINT(config, flags, info, err)		OTOpenEndpointInContext(config, flags, info, err, clientContext)
-
-#else
-
-#define INIT_OPEN_TRANSPORT()	InitOpenTransport()
-#define OT_OPEN_INTERNET_SERVICES(config, flags, err)	OTOpenInternetServices(config, flags, err)
-#define OT_OPEN_ENDPOINT(config, flags, info, err)		OTOpenEndpoint(config, flags, info, err)
-#endif /* TARGET_CARBON */
-
-static OTNotifyUPP	DNSNotifierRoutineUPP;
-static OTNotifyUPP NotifierRoutineUPP;
-static OTNotifyUPP RawEndpointNotifierRoutineUPP;
-
-void _MD_InitNetAccess()
-{
-    OSErr       err;
-    OSStatus    errOT;
-    PRBool      hasOTTCPIP = PR_FALSE;
-    PRBool      hasOT = PR_FALSE;
-    long        gestaltResult;
-
-    err = Gestalt(gestaltOpenTpt, &gestaltResult);
-    if (err == noErr)
-        if (gestaltResult & GESTALT_OPEN_TPT_PRESENT)
-            hasOT = PR_TRUE;
-    
-    if (hasOT)
-        if (gestaltResult & GESTALT_OPEN_TPT_TCP_PRESENT)
-            hasOTTCPIP = PR_TRUE;
-        
-    PR_ASSERT(hasOTTCPIP == PR_TRUE);
-
-    DNSNotifierRoutineUPP	=  NewOTNotifyUPP(DNSNotifierRoutine);
-    NotifierRoutineUPP		=  NewOTNotifyUPP(NotifierRoutine);
-    RawEndpointNotifierRoutineUPP = NewOTNotifyUPP(RawEndpointNotifierRoutine);
-
-    errOT = INIT_OPEN_TRANSPORT();
-    PR_ASSERT(err == kOTNoError);
-
-	dnsContext.serviceRef = NULL;
-	dnsContext.lock = PR_NewLock();
-	PR_ASSERT(dnsContext.lock != NULL);
-
-	dnsContext.thread = _PR_MD_CURRENT_THREAD();
-	dnsContext.cookie = NULL;
-	
-/* XXX Does not handle absence of open tpt and tcp yet! */
-}
-
-static void _MD_FinishInitNetAccess()
-{
-    OSStatus    errOT;
-
-	if (dnsContext.serviceRef)
-		return;
-		
-    dnsContext.serviceRef = OT_OPEN_INTERNET_SERVICES(kDefaultInternetServicesPath, NULL, &errOT);
-    if (errOT != kOTNoError) {
-        dnsContext.serviceRef = NULL;
-        return;    /* no network -- oh well */
-    }
-    
-    PR_ASSERT((dnsContext.serviceRef != NULL) && (errOT == kOTNoError));
-
-    /* Install notify function for DNR Address To String completion */
-    errOT = OTInstallNotifier(dnsContext.serviceRef, DNSNotifierRoutineUPP, &dnsContext);
-    PR_ASSERT(errOT == kOTNoError);
-
-    /* Put us into async mode */
-    errOT = OTSetAsynchronous(dnsContext.serviceRef);
-    PR_ASSERT(errOT == kOTNoError);
-}
-
-
-static pascal void  DNSNotifierRoutine(void * contextPtr, OTEventCode otEvent, OTResult result, void * cookie)
-{
-#pragma unused(contextPtr)
-    _PRCPU *    cpu    = _PR_MD_CURRENT_CPU(); 
-	OSStatus    errOT;
-
-		dnsContext.thread->md.osErrCode = result;
-		dnsContext.cookie = cookie;
-	
-	switch (otEvent) {
-		case T_DNRSTRINGTOADDRCOMPLETE:
-				if (_PR_MD_GET_INTSOFF()) {
-					dnsContext.thread->md.missedIONotify = PR_TRUE;
-					cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-				} else {
-					DoneWaitingOnThisThread(dnsContext.thread);
-				}
-				break;
-		
-        case kOTProviderWillClose:
-                errOT = OTSetSynchronous(dnsContext.serviceRef);
-                // fall through to kOTProviderIsClosed case
-		
-        case kOTProviderIsClosed:
-                errOT = OTCloseProvider((ProviderRef)dnsContext.serviceRef);
-                dnsContext.serviceRef = nil;
-
-				if (_PR_MD_GET_INTSOFF()) {
-					dnsContext.thread->md.missedIONotify = PR_TRUE;
-					cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-				} else {
-					DoneWaitingOnThisThread(dnsContext.thread);
-				}
-                break;
-
-        default: // or else we don't handle the event
-	            PR_ASSERT(otEvent==NULL);
-		
-	}
-	// or else we don't handle the event
-	
-	SignalIdleSemaphore();
-}
-
-
-static void macsock_map_error(OSStatus err)
-{
-    _PR_MD_CURRENT_THREAD()->md.osErrCode = err;
-
-    if (IsEError(err) || (err >= EPERM && err <= ELASTERRNO)) {
-    switch (IsEError(err) ? OSStatus2E(err) : err) {
-        case EBADF:
-            PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-            break;
-        case EADDRNOTAVAIL:
-            PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-            break;
-        case EINPROGRESS:
-            PR_SetError(PR_IN_PROGRESS_ERROR, err);
-            break;
-        case EWOULDBLOCK:
-        case EAGAIN:
-            PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-            break;
-        case ENOTSOCK:
-            PR_SetError(PR_NOT_SOCKET_ERROR, err);
-            break;
-        case ETIMEDOUT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, err);
-            break;
-        case ECONNREFUSED:
-            PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-            break;
-        case ENETUNREACH:
-            PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, err);
-            break;
-        case EADDRINUSE:
-            PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-            break;
-        case EFAULT:
-            PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-            break;
-        case EINTR:
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, err);
-            break;
-        case EINVAL:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-            break;
-        case EIO:
-            PR_SetError(PR_IO_ERROR, err);
-            break;
-        case ENOENT:
-            PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-            break;
-        case ENXIO:
-            PR_SetError(PR_IO_ERROR, err);
-            break;
-        case EPROTOTYPE:
-            PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-            break;
-        case EOPNOTSUPP:
-            PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, err);
-            break;
-        default:
-            PR_SetError(PR_UNKNOWN_ERROR, err);
-            break;
-        }
-    } else {
-    PR_ASSERT(IsXTIError(err));
-    switch (err) {
-        case kOTNoDataErr:
-        case kOTFlowErr:
-            PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-            break;
-        default:
-            PR_SetError(PR_UNKNOWN_ERROR, err);
-            break;
-        }
-    }
-}
-
-static void PrepareForAsyncCompletion(PRThread * thread, PRInt32 osfd)
-{
-    thread->io_pending       = PR_TRUE;
-    thread->io_fd            = osfd;
-    thread->md.osErrCode     = noErr;
-}
-
-
-void
-WakeUpNotifiedThread(PRThread *thread, OTResult result)
-{
-    _PRCPU *      cpu      = _PR_MD_CURRENT_CPU(); 
-
-	if (thread) {
-		thread->md.osErrCode = result;
-		if (_PR_MD_GET_INTSOFF()) {
-			thread->md.missedIONotify = PR_TRUE;
-			cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-		} else {
-			DoneWaitingOnThisThread(thread);
-		}
-	}
-	
-	SignalIdleSemaphore();
-}
-
-// Notification routine
-// Async callback routine.
-// A5 is OK. Cannot allocate memory here
-// Ref: http://gemma.apple.com/techpubs/mac/NetworkingOT/NetworkingWOT-100.html
-//
-static pascal void  NotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie)
-{
-    PRFilePrivate *secret  = (PRFilePrivate *) contextPtr;
-    _MDFileDesc * md       = &(secret->md);
-    EndpointRef   endpoint = (EndpointRef)secret->md.osfd;
-    PRThread *    readThread   = NULL;          // also used for 'misc'
-    PRThread *    writeThread  = NULL;
-    OSStatus      err;
-    OTResult      resultOT;
-    TDiscon       discon;
-
-    switch (code)
-    {
-// OTLook Events - 
-        case T_LISTEN:        // A connection request is available
-            // If md->doListen is true, then PR_Listen has been
-            // called on this endpoint; therefore, we're ready to
-            // accept connections. But we'll do that with PR_Accept
-            // (which calls OTListen, OTAccept, etc) instead of 
-            // doing it here. 
-            if (md->doListen) {
-                readThread = secret->md.misc.thread;
-                secret->md.misc.thread    = NULL;
-                secret->md.misc.cookie    = cookie;
-                break;
-            } else {
-                // Reject the connection, we're not listening
-                OTSndDisconnect(endpoint, NULL);
-            }
-            break;
-
-        case T_CONNECT:      // Confirmation of a connect request
-            // cookie = sndCall parameter from OTConnect()
-            err = OTRcvConnect(endpoint, NULL);
-            PR_ASSERT(err == kOTNoError);
-
-            // wake up waiting thread, if any.
-            writeThread = secret->md.write.thread;
-            secret->md.write.thread    = NULL;
-            secret->md.write.cookie    = cookie;            
-            break;
-
-        case T_DATA:        // Standard data is available
-            // Mark this socket as readable.
-            secret->md.readReady = PR_TRUE;
-
-            // wake up waiting thread, if any
-            readThread = secret->md.read.thread;
-            secret->md.read.thread    = NULL;
-            secret->md.read.cookie    = cookie;
-            break;
-
-        case T_EXDATA:      // Expedited data is available
-            PR_ASSERT(!"T_EXDATA Not implemented");
-            return;
-
-        case T_DISCONNECT:  // A disconnect is available
-            discon.udata.len = 0;
-            err = OTRcvDisconnect(endpoint, &discon);
-            PR_ASSERT(err == kOTNoError);
-            secret->md.exceptReady = PR_TRUE;       // XXX Check this
-
-            md->disconnectError = discon.reason;    // save for _MD_mac_get_nonblocking_connect_error
-
-            // wake up waiting threads, if any
-            result = -3199 - discon.reason; // obtain the negative error code
-            if ((readThread = secret->md.read.thread) != NULL) {
-                secret->md.read.thread    = NULL;
-                secret->md.read.cookie    = cookie;
-            }
-
-            if ((writeThread = secret->md.write.thread) != NULL) {
-                secret->md.write.thread    = NULL;
-                secret->md.write.cookie    = cookie;
-            }
-            break;
-
-        case T_ERROR:       // obsolete/unused in library
-            PR_ASSERT(!"T_ERROR Not implemented");
-            return;
-
-        case T_UDERR:       // UDP Send error; clear the error
-            (void) OTRcvUDErr((EndpointRef) cookie, NULL);
-            break;
-
-        case T_ORDREL:      // An orderly release is available
-            err = OTRcvOrderlyDisconnect(endpoint);
-            PR_ASSERT(err == kOTNoError);
-            secret->md.readReady      = PR_TRUE;   // mark readable (to emulate bsd sockets)
-            // remember connection is closed, so we can return 0 on read or receive
-            secret->md.orderlyDisconnect = PR_TRUE;
-            
-            readThread = secret->md.read.thread;
-            secret->md.read.thread    = NULL;
-            secret->md.read.cookie    = cookie;
-            break;		
-
-        case T_GODATA:   // Flow control lifted on standard data
-            secret->md.writeReady = PR_TRUE;
-            resultOT = OTLook(endpoint);        // clear T_GODATA event
-            PR_ASSERT(resultOT == T_GODATA);
-            
-            // wake up waiting thread, if any
-            writeThread = secret->md.write.thread;
-            secret->md.write.thread    = NULL;
-            secret->md.write.cookie    = cookie;
-            break;
-
-        case T_GOEXDATA: // Flow control lifted on expedited data
-            PR_ASSERT(!"T_GOEXDATA Not implemented");
-            return;
-
-        case T_REQUEST:  // An Incoming request is available
-            PR_ASSERT(!"T_REQUEST Not implemented");
-            return;
-
-        case T_REPLY:    // An Incoming reply is available
-            PR_ASSERT(!"T_REPLY Not implemented");
-            return;
-
-        case T_PASSCON:  // State is now T_DATAXFER
-            // OTAccept() complete, receiving endpoint in T_DATAXFER state
-            // cookie = OTAccept() resRef parameter
-            break;
-
-        case T_RESET:    // Protocol has been reset
-            PR_ASSERT(!"T_RESET Not implemented");
-            return;
-            
-// Async Completion Events
-        case T_BINDCOMPLETE:
-        case T_UNBINDCOMPLETE:
-        case T_ACCEPTCOMPLETE:
-        case T_OPTMGMTCOMPLETE:
-        case T_GETPROTADDRCOMPLETE:
-            readThread = secret->md.misc.thread;
-            secret->md.misc.thread    = NULL;
-            secret->md.misc.cookie    = cookie;
-            break;
-
-//      case T_OPENCOMPLETE:            // we open endpoints in synchronous mode
-//      case T_REPLYCOMPLETE:
-//      case T_DISCONNECTCOMPLETE:      // we don't call OTSndDisconnect()
-//      case T_RESOLVEADDRCOMPLETE:
-//      case T_GETINFOCOMPLETE:
-//      case T_SYNCCOMPLETE:
-//      case T_MEMORYRELEASED:          // only if OTAckSends() called on endpoint
-//      case T_REGNAMECOMPLETE:
-//      case T_DELNAMECOMPLETE:
-//      case T_LKUPNAMECOMPLETE:
-//      case T_LKUPNAMERESULT:
-        // OpenTptInternet.h
-//      case T_DNRSTRINGTOADDRCOMPLETE: // DNS is handled by dnsContext in DNSNotifierRoutine()
-//      case T_DNRADDRTONAMECOMPLETE:
-//      case T_DNRSYSINFOCOMPLETE:
-//      case T_DNRMAILEXCHANGECOMPLETE:
-//      case T_DNRQUERYCOMPLETE:
-        default:
-            // we should probably have a bit more sophisticated handling of kOTSystemSleep, etc.
-            // PR_ASSERT(code != 0);
-            return;
-    }
-
-    if (readThread)
-        WakeUpNotifiedThread(readThread, result);
-
-    if (writeThread && (writeThread != readThread))
-        WakeUpNotifiedThread(writeThread, result);
-}
-
-
-static OSErr CreateSocket(int type, EndpointRef *endpoint)
-{
-    OSStatus err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    char *  configName;
-    OTConfiguration *config;
-    EndpointRef ep;
-
-    // for now we just create the endpoint
-    // we'll make it asynchronous and give it a notifier routine in _MD_makenonblock()
-
-    switch (type){
-        case SOCK_STREAM:   configName = kTCPName;  break;
-        case SOCK_DGRAM:    configName = kUDPName;  break;
-    }
-    config = OTCreateConfiguration(configName);
-    ep = OT_OPEN_ENDPOINT(config, 0, NULL, &err);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    *endpoint = ep;
-    PR_ASSERT(*endpoint != NULL);
-
-    return kOTNoError;
-
-ErrorExit:
-    return err;
-}
-
-
-// Errors returned:
-// kOTXXXX - OT returned error
-// EPROTONOSUPPORT - bad socket type/protocol
-// ENOBUFS - not enough space for another socket, or failure in socket creation routine
-PRInt32 _MD_socket(int domain, int type, int protocol)
-{
-    OSStatus    err;
-    EndpointRef endpoint;
-    
-    _MD_FinishInitNetAccess();
-
-    // We only deal with internet domain
-    if (domain != AF_INET) {
-        err = kEPROTONOSUPPORTErr;
-        goto ErrorExit;
-    }
-    
-    // We only know about tcp & udp
-    if ((type != SOCK_STREAM) && (type != SOCK_DGRAM)) {
-        err = kEPROTONOSUPPORTErr;
-        goto ErrorExit;
-    }
-    
-    // Convert default types to specific types.
-    if (protocol == 0)  {
-        if (type == SOCK_DGRAM)
-            protocol = IPPROTO_UDP;
-        else if (type == SOCK_STREAM)
-            protocol = IPPROTO_TCP;
-    }
-    
-    // Only support default protocol for tcp
-    if ((type == SOCK_STREAM)  && (protocol != IPPROTO_TCP)) {
-        err = kEPROTONOSUPPORTErr;
-        goto ErrorExit;
-    }
-                
-    // Only support default protocol for udp
-    if ((type == SOCK_DGRAM)  && (protocol != IPPROTO_UDP)) {
-        err = kEPROTONOSUPPORTErr;
-        goto ErrorExit;
-    }
-        
-    // Create a socket, we might run out of memory
-    err = CreateSocket(type, &endpoint);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    PR_ASSERT((PRInt32)endpoint != -1);
-
-    return ((PRInt32)endpoint);
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-// Errors:
-// EBADF  -- bad socket id
-// EFAULT -- bad address format
-PRInt32 _MD_bind(PRFileDesc *fd, PRNetAddr *addr, PRUint32 addrlen)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    TBind bindReq;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRUint32 retryCount = 0;
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (addr == NULL) {
-        err = kEFAULTErr;
-        goto ErrorExit;
-    }
-        
-/*
- * There seems to be a bug with OT related to OTBind failing with kOTNoAddressErr even though
- * a proper legal address was supplied.  This happens very rarely and just retrying the
- * operation after a certain time (less than 1 sec. does not work) seems to succeed.
- */
-
-TryAgain:
-    // setup our request
-    bindReq.addr.len = addrlen;
-        
-    bindReq.addr.maxlen = addrlen;
-    bindReq.addr.buf = (UInt8*) addr;
-    bindReq.qlen = 1;
-
-	PR_Lock(fd->secret->md.miscLock);
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);
-	fd->secret->md.misc.thread = me;
-
-    err = OTBind(endpoint, &bindReq, NULL);
-    if (err != kOTNoError) {
-	    me->io_pending = PR_FALSE;
-	    PR_Unlock(fd->secret->md.miscLock);
-        goto ErrorExit;
-	}
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(fd->secret->md.miscLock);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    return kOTNoError;
-
-ErrorExit:
-    if ((err == kOTNoAddressErr) && (++retryCount <= 4)) {
-        unsigned long finalTicks;
-    
-        Delay(100,&finalTicks);
-        goto TryAgain;
-    }
-    macsock_map_error(err);
-    return -1;
-}
-
-
-// Errors:
-// EBADF -- bad socket id
-PRInt32 _MD_listen(PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    OSStatus err = 0;
-    EndpointRef endpoint = (EndpointRef) osfd;
-    TBind bindReq;
-    PRNetAddr addr;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if ((fd == NULL) || (endpoint == NULL)) {
-		err = EBADF;
-		goto ErrorExit;
-	}
-
-    if (backlog == 0)
-        backlog = 1;
-
-    if (endpoint == NULL) {
-        err = EBADF;
-        goto ErrorExit;
-    }
-        
-    addr.inet.family = AF_INET;
-    addr.inet.port = addr.inet.ip = 0;
-
-    bindReq.addr.maxlen = PR_NETADDR_SIZE (&addr);
-    bindReq.addr.len = 0;
-    bindReq.addr.buf = (UInt8*) &addr;
-    bindReq.qlen = 0;
-    
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me; // tell notifier routine what to wake up
-
-    err = OTGetProtAddress(endpoint, &bindReq, NULL);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me; // tell notifier routine what to wake up
-
-    err = OTUnbind(endpoint);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-	/* tell the notifier func that we are interested in pending connections */
-	fd->secret->md.doListen = PR_TRUE;
-	/* accept up to (backlog) pending connections at any one time */
-    bindReq.qlen = backlog;
-    
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me; // tell notifier routine what to wake up
-
-    err = OTBind(endpoint, &bindReq, NULL);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-    {
-    	// If OTBind failed, we're really not ready to listen after all.
-		fd->secret->md.doListen = PR_FALSE;
-        goto ErrorExit;
-    }
-
-    return kOTNoError;
-
-ErrorExit:
-	me->io_pending = PR_FALSE; // clear pending wait state if any
-    macsock_map_error(err);
-    return -1;
-}
-
-
-// Errors:
-// EBADF -- bad socket id
-PRInt32 _MD_getsockname(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    TBind bindReq;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (addr == NULL) {
-        err = kEFAULTErr;
-        goto ErrorExit;
-    }
-
-    bindReq.addr.len = *addrlen;
-    bindReq.addr.maxlen = *addrlen;
-    bindReq.addr.buf = (UInt8*) addr;
-    bindReq.qlen = 0;
-    
-	PR_Lock(fd->secret->md.miscLock);
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me;
-
-    err = OTGetProtAddress(endpoint, &bindReq, NULL);
-    if (err != kOTNoError) {
-	    me->io_pending = PR_FALSE;
-	    PR_Unlock(fd->secret->md.miscLock);
-        goto ErrorExit;
-	}
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(fd->secret->md.miscLock);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    *addrlen = PR_NETADDR_SIZE(addr);
-    return kOTNoError;
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-PRStatus _MD_getsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    TOptMgmt cmd;
-    TOption *opt;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    unsigned char optionBuffer[kOTOptionHeaderSize + sizeof(PRSocketOptionData)];
-    
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-    
-    /* 
-    OT wants IPPROTO_IP for level and not XTI_GENERIC.  SO_REUSEADDR and SO_KEEPALIVE 
-    are equated to IP level and TCP level options respectively and hence we need to set 
-    the level correctly.
-    */
-    if (level == SOL_SOCKET) {
-        if (optname == SO_REUSEADDR)
-            level = IPPROTO_IP;
-        else if (optname == SO_KEEPALIVE)
-            level = INET_TCP;
-    }
-
-    opt = (TOption *)&optionBuffer[0];
-    opt->len = sizeof(TOption);
-    opt->level = level;
-    opt->name = optname;
-    opt->status = 0;
-    
-    cmd.opt.len = sizeof(TOption);
-    cmd.opt.maxlen = sizeof(optionBuffer);
-    cmd.opt.buf = (UInt8*)optionBuffer;
-    cmd.flags = T_CURRENT;
-
-	PR_Lock(fd->secret->md.miscLock);
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me;
-
-    err = OTOptionManagement(endpoint, &cmd, &cmd);
-    if (err != kOTNoError) {
-	    me->io_pending = PR_FALSE;
-	    PR_Unlock(fd->secret->md.miscLock);
-        goto ErrorExit;
-	}
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(fd->secret->md.miscLock);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    if (opt->status == T_FAILURE || opt->status == T_NOTSUPPORT){
-        err = kEOPNOTSUPPErr;
-        goto ErrorExit;
-    }
-
-    PR_ASSERT(opt->status == T_SUCCESS);
-
-    switch (optname) {
-        case SO_LINGER:
-            *((t_linger*)optval) = *((t_linger*)&opt->value);
-            *optlen = sizeof(t_linger);
-            break;
-        case SO_REUSEADDR:
-        case TCP_NODELAY:
-        case SO_KEEPALIVE:
-        case SO_RCVBUF:
-        case SO_SNDBUF:
-            *((PRIntn*)optval) = *((PRIntn*)&opt->value);
-            *optlen = sizeof(PRIntn);
-            break;
-        case IP_MULTICAST_LOOP:
-            *((PRUint8*)optval) = *((PRIntn*)&opt->value);
-            *optlen = sizeof(PRUint8);
-            break;
-        case IP_TTL:
-            *((PRUintn*)optval) = *((PRUint8*)&opt->value);
-            *optlen = sizeof(PRUintn);
-            break;
-        case IP_MULTICAST_TTL:
-            *((PRUint8*)optval) = *((PRUint8*)&opt->value);
-            *optlen = sizeof(PRUint8);
-            break;
-        case IP_ADD_MEMBERSHIP:
-        case IP_DROP_MEMBERSHIP:
-            {
-            /* struct ip_mreq and TIPAddMulticast are the same size and optval 
-               is pointing to struct ip_mreq */
-            *((struct ip_mreq *)optval) = *((struct ip_mreq *)&opt->value);
-            *optlen = sizeof(struct ip_mreq);
-            break;
-            }
-        case IP_MULTICAST_IF:
-            {
-            *((PRUint32*)optval) = *((PRUint32*)&opt->value);
-            *optlen = sizeof(PRUint32);
-            break;
-            }
-        /*case IP_TOS:*/ /*IP_TOS has same value as TCP_MAXSEG */
-        case TCP_MAXSEG:
-            if (level == IPPROTO_TCP) { /* it is TCP_MAXSEG */
-                *((PRIntn*)optval) = *((PRIntn*)&opt->value);
-                *optlen = sizeof(PRIntn);
-            } else { /* it is IP_TOS */
-                *((PRUintn*)optval) = *((PRUint8*)&opt->value);
-                *optlen = sizeof(PRUintn);
-            }
-            break;
-        default:
-            PR_ASSERT(0);
-            break;    
-    }
-    
-    return PR_SUCCESS;
-
-ErrorExit:
-    macsock_map_error(err);
-    return PR_FAILURE;
-}
-
-
-PRStatus _MD_setsockopt(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    TOptMgmt cmd;
-    TOption *opt;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    unsigned char optionBuffer[kOTOptionHeaderSize + sizeof(PRSocketOptionData) + 1];
-    
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-    
-    /* 
-    OT wants IPPROTO_IP for level and not XTI_GENERIC.  SO_REUSEADDR and SO_KEEPALIVE 
-    are equated to IP level and TCP level options respectively and hence we need to set 
-    the level correctly.
-    */
-    if (level == SOL_SOCKET) {
-        if (optname == SO_REUSEADDR)
-            level = IPPROTO_IP;
-        else if (optname == SO_KEEPALIVE)
-            level = INET_TCP;
-    }
-
-    opt = (TOption *)&optionBuffer[0];
-    opt->len = kOTOptionHeaderSize + optlen;
-
-    /* special case adjustments for length follow */
-    if (optname == SO_KEEPALIVE) /* we need to pass the timeout value for OT */
-        opt->len = kOTOptionHeaderSize + sizeof(t_kpalive);
-    if (optname == IP_MULTICAST_TTL || optname == IP_TTL) /* it is an unsigned char value */
-        opt->len = kOTOneByteOptionSize;
-    if (optname == IP_TOS && level == IPPROTO_IP)
-        opt->len = kOTOneByteOptionSize;
-
-    opt->level = level;
-    opt->name = optname;
-    opt->status = 0;
-    
-    cmd.opt.len = opt->len;
-    cmd.opt.maxlen = sizeof(optionBuffer);
-    cmd.opt.buf = (UInt8*)optionBuffer;
-    
-    optionBuffer[opt->len] = 0;
-    
-    cmd.flags = T_NEGOTIATE;
-
-    switch (optname) {
-        case SO_LINGER:
-            *((t_linger*)&opt->value) = *((t_linger*)optval);
-            break;
-        case SO_REUSEADDR:
-        case TCP_NODELAY:
-        case SO_RCVBUF:
-        case SO_SNDBUF:
-            *((PRIntn*)&opt->value) = *((PRIntn*)optval);
-            break;
-        case IP_MULTICAST_LOOP:
-            if (*optval != 0)
-                opt->value[0] = T_YES;
-            else
-                opt->value[0] = T_NO;
-            break;
-        case SO_KEEPALIVE:
-            {
-            t_kpalive *kpalive = (t_kpalive *)&opt->value;
-            
-            kpalive->kp_onoff = *((long*)optval);
-            kpalive->kp_timeout = 10; /* timeout in minutes */
-            break;
-            }
-        case IP_TTL:
-            *((unsigned char*)&opt->value) = *((PRUintn*)optval);
-            break;
-        case IP_MULTICAST_TTL:
-            *((unsigned char*)&opt->value) = *optval;
-            break;
-        case IP_ADD_MEMBERSHIP:
-        case IP_DROP_MEMBERSHIP:
-            {
-            /* struct ip_mreq and TIPAddMulticast are the same size and optval 
-               is pointing to struct ip_mreq */
-            *((TIPAddMulticast *)&opt->value) = *((TIPAddMulticast *)optval);
-            break;
-            }
-        case IP_MULTICAST_IF:
-            {
-            *((PRUint32*)&opt->value) = *((PRUint32*)optval);
-            break;
-            }
-        /*case IP_TOS:*/ /*IP_TOS has same value as TCP_MAXSEG */
-        case TCP_MAXSEG:
-            if (level == IPPROTO_TCP) { /* it is TCP_MAXSEG */
-                *((PRIntn*)&opt->value) = *((PRIntn*)optval);
-            } else { /* it is IP_TOS */
-                *((unsigned char*)&opt->value) = *((PRUintn*)optval);
-            }
-            break;
-        default:
-            PR_ASSERT(0);
-            break;    
-    }
-    
-	PR_Lock(fd->secret->md.miscLock);
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me;
-
-    err = OTOptionManagement(endpoint, &cmd, &cmd);
-    if (err != kOTNoError) {
-	    me->io_pending = PR_FALSE;
-	    PR_Unlock(fd->secret->md.miscLock);
-        goto ErrorExit;
-	}
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(fd->secret->md.miscLock);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    if (opt->status == T_FAILURE || opt->status == T_NOTSUPPORT){
-        err = kEOPNOTSUPPErr;
-        goto ErrorExit;
-    }
-    
-    if (level == IPPROTO_TCP && optname == TCP_MAXSEG && opt->status == T_READONLY) {
-        err = kEOPNOTSUPPErr;
-        goto ErrorExit;
-    }
-
-    PR_ASSERT(opt->status == T_SUCCESS);
-
-    return PR_SUCCESS;
-
-ErrorExit:
-    macsock_map_error(err);
-    return PR_FAILURE;
-}
-
-
-PRInt32 _MD_socketavailable(PRFileDesc *fd)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) osfd;
-    size_t bytes;
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-    
-    bytes = 0;
-    
-    err = OTCountDataBytes(endpoint, &bytes);
-    if ((err == kOTLookErr) ||         // Not really errors, we just need to do a read,
-        (err == kOTNoDataErr))        // or there's nothing there.
-        err = kOTNoError;
-        
-    if (err != kOTNoError)
-        goto ErrorExit;
-        
-    return bytes;
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-typedef struct RawEndpointAndThread
-{
-	PRThread *  thread;
-	EndpointRef endpoint;
-} RawEndpointAndThread;
-
-// Notification routine for raw endpoints not yet attached to a PRFileDesc.
-// Async callback routine.
-// A5 is OK. Cannot allocate memory here
-static pascal void  RawEndpointNotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie)
-{
-    RawEndpointAndThread *endthr = (RawEndpointAndThread *) contextPtr;
-    PRThread *    thread   = endthr->thread;
-    EndpointRef * endpoint = endthr->endpoint;
-    _PRCPU *      cpu      = _PR_MD_CURRENT_CPU(); 
-    OSStatus      err;
-    OTResult	  resultOT;
-
-    switch (code)
-    {
-// OTLook Events - 
-        case T_LISTEN:        // A connection request is available
-            PR_ASSERT(!"T_EXDATA not implemented for raw endpoints");
-            break;
-			
-        case T_CONNECT:      // Confirmation of a connect request
-			// cookie = sndCall parameter from OTConnect()
-            err = OTRcvConnect(endpoint, NULL);
-            PR_ASSERT(err == kOTNoError);
-
-			// wake up waiting thread
-            break;
-
-        case T_DATA:        // Standard data is available
-			break;
-
-        case T_EXDATA:      // Expedited data is available
-            PR_ASSERT(!"T_EXDATA Not implemented for raw endpoints");
-			return;
-
-        case T_DISCONNECT:  // A disconnect is available
-            err = OTRcvDisconnect(endpoint, NULL);
-            PR_ASSERT(err == kOTNoError);
-            break;
-		
-        case T_ERROR:       // obsolete/unused in library
-            PR_ASSERT(!"T_ERROR Not implemented for raw endpoints");
-			return;		
-		
-        case T_UDERR:       // UDP Send error; clear the error
-			(void) OTRcvUDErr((EndpointRef) cookie, NULL);
-            break;
-
-        case T_ORDREL:      // An orderly release is available
-            err = OTRcvOrderlyDisconnect(endpoint);
-            PR_ASSERT(err == kOTNoError);
-            break;		
-
-        case T_GODATA:   // Flow control lifted on standard data
-			resultOT = OTLook(endpoint);		// clear T_GODATA event
-			PR_ASSERT(resultOT == T_GODATA);
-			
-			// wake up waiting thread, if any
-            break;
-
-        case T_GOEXDATA: // Flow control lifted on expedited data
-            PR_ASSERT(!"T_GOEXDATA Not implemented");
-			return;
-
-        case T_REQUEST:  // An Incoming request is available
-            PR_ASSERT(!"T_REQUEST Not implemented");
-            return;
-
-        case T_REPLY:    // An Incoming reply is available
-            PR_ASSERT(!"T_REPLY Not implemented");
-            return;
-
-        case T_PASSCON:  // State is now T_DATAXFER
-			// OTAccept() complete, receiving endpoint in T_DATAXFER state
-			// cookie = OTAccept() resRef parameter
-			break;
-            
-// Async Completion Events
-        case T_BINDCOMPLETE:
-        case T_UNBINDCOMPLETE:
-        case T_ACCEPTCOMPLETE:
-        case T_OPTMGMTCOMPLETE:
-        case T_GETPROTADDRCOMPLETE:
-            break;
-
-		// for other OT events, see NotifierRoutine above
-        default:
-            return;
-    }
-
-	if (thread) {
-		thread->md.osErrCode = result;
-		if (_PR_MD_GET_INTSOFF()) {
-			thread->md.asyncNotifyPending = PR_TRUE;
-			cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-		} else {
-			DoneWaitingOnThisThread(thread);
-		}
-	}
-
-	SignalIdleSemaphore();
-}
-
-PRInt32 _MD_accept(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    TBind bindReq;
-    PRNetAddr bindAddr;
-    PRInt32 newosfd = -1;
-    TCall call;
-    PRNetAddr callAddr;
-    RawEndpointAndThread *endthr = NULL;
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    memset(&call, 0 , sizeof(call));
-
-    if (addr != NULL) {
-        call.addr.maxlen = *addrlen;
-        call.addr.len = *addrlen;
-        call.addr.buf = (UInt8*) addr;
-    } else {
-        call.addr.maxlen = sizeof(callAddr);
-        call.addr.len = sizeof(callAddr);
-        call.addr.buf = (UInt8*) &callAddr;
-    }
-
-	do {
-	    PrepareForAsyncCompletion(me, fd->secret->md.osfd);
-	    fd->secret->md.misc.thread = me;
-	    
-	    // Perform the listen. 
-	    err = OTListen (endpoint, &call);
-	    if (err == kOTNoError)
-	    	break; // got the call information
-	    else if ((!fd->secret->nonblocking) && (err == kOTNoDataErr)) {
-	        WaitOnThisThread(me, timeout);
-	        err = me->md.osErrCode;
-	        if ((err != kOTNoError) && (err != kOTNoDataErr))
-	        	goto ErrorExit;
-			// we can get kOTNoError here, but still need
-			// to loop back to call OTListen, in order
-			// to get call info for OTAccept
-	    } else {
-	    	goto ErrorExit; // we're nonblocking, and/or we got an error
-	    }   
-	}
-	while(1);
-
-    newosfd = _MD_socket(AF_INET, SOCK_STREAM, 0);
-    if (newosfd == -1)
-        return -1;
-            
-	// Attach the raw endpoint handler to this endpoint for now.
-	endthr = (RawEndpointAndThread *) PR_Malloc(sizeof(RawEndpointAndThread));
-	endthr->thread = me;
-	endthr->endpoint = (EndpointRef) newosfd;
-	
-	err = OTInstallNotifier((ProviderRef) newosfd, RawEndpointNotifierRoutineUPP, endthr);
-    PR_ASSERT(err == kOTNoError);
-    
-	err = OTSetAsynchronous((EndpointRef) newosfd);
-	PR_ASSERT(err == kOTNoError);
-
-    // Bind to a local port; let the system assign it.
-    bindAddr.inet.family = AF_INET;
-    bindAddr.inet.port = bindAddr.inet.ip = 0;
-
-    bindReq.addr.maxlen = PR_NETADDR_SIZE (&bindAddr);
-    bindReq.addr.len = 0;
-    bindReq.addr.buf = (UInt8*) &bindAddr;
-    bindReq.qlen = 0;
-
-    PrepareForAsyncCompletion(me, newosfd);    
-    err = OTBind((EndpointRef) newosfd, &bindReq, NULL);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    WaitOnThisThread(me, timeout);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    PrepareForAsyncCompletion(me, newosfd);    
-
-    err = OTAccept (endpoint, (EndpointRef) newosfd, &call);
- 	if ((err != kOTNoError) && (err != kOTNoDataErr))
-        goto ErrorExit;
-
-    WaitOnThisThread(me, timeout);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    if (addrlen != NULL)
-        *addrlen = call.addr.len;
-
-	// Remove the temporary notifier we installed to set up the new endpoint.
-	OTRemoveNotifier((EndpointRef) newosfd);
-	PR_Free(endthr); // free the temporary context we set up for this endpoint
-
-    return newosfd;
-
-ErrorExit:
-	me->io_pending = PR_FALSE; // clear pending wait state if any
-    if (newosfd != -1)
-        _MD_closesocket(newosfd);
-    macsock_map_error(err);
-    return -1;
-}
-
-
-PRInt32 _MD_connect(PRFileDesc *fd, PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    TCall sndCall;
-    TBind bindReq;
-    PRNetAddr bindAddr;
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (addr == NULL) {
-        err = kEFAULTErr;
-        goto ErrorExit;
-    }
-    
-    // Bind to a local port; let the system assign it.
-
-    bindAddr.inet.family = AF_INET;
-    bindAddr.inet.port = bindAddr.inet.ip = 0;
-
-    bindReq.addr.maxlen = PR_NETADDR_SIZE (&bindAddr);
-    bindReq.addr.len = 0;
-    bindReq.addr.buf = (UInt8*) &bindAddr;
-    bindReq.qlen = 0;
-    
-    PR_Lock(fd->secret->md.miscLock);
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-    fd->secret->md.misc.thread = me;
-
-    err = OTBind(endpoint, &bindReq, NULL);
-    if (err != kOTNoError) {
-      me->io_pending = PR_FALSE;
-      PR_Unlock(fd->secret->md.miscLock);
-      goto ErrorExit;
-    }
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-    PR_Unlock(fd->secret->md.miscLock);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    memset(&sndCall, 0 , sizeof(sndCall));
-
-    sndCall.addr.maxlen = addrlen;
-    sndCall.addr.len = addrlen;
-    sndCall.addr.buf = (UInt8*) addr;
-
-    if (!fd->secret->nonblocking) {    
-      PrepareForAsyncCompletion(me, fd->secret->md.osfd);
-      PR_ASSERT(fd->secret->md.write.thread == NULL);
-      fd->secret->md.write.thread = me;
-    }
-
-    err = OTConnect (endpoint, &sndCall, NULL);
-    if (err == kOTNoError) {
-      PR_ASSERT(!"OTConnect returned kOTNoError in async mode!?!");	
-    }
-    if (fd->secret->nonblocking) {
-      if (err == kOTNoDataErr)
-      err = EINPROGRESS;
-      goto ErrorExit;
-    } else {
-      if (err != kOTNoError && err != kOTNoDataErr) {
-        me->io_pending = PR_FALSE;
-        goto ErrorExit;
-      }
-    }
-	
-    WaitOnThisThread(me, timeout);
-
-    err = me->md.osErrCode;
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    return kOTNoError;
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-// Errors:
-// EBADF -- bad socket id
-// EFAULT -- bad buffer
-static PRInt32 SendReceiveStream(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRIntervalTime timeout, SndRcvOpCode opCode)
-{
-    OSStatus err;
-    OTResult result;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 bytesLeft = amount;
-
-    PR_ASSERT(flags == 0 ||
-        (opCode == kSTREAM_RECEIVE && flags == PR_MSG_PEEK));
-    PR_ASSERT(opCode == kSTREAM_SEND || opCode == kSTREAM_RECEIVE);
-    
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (buf == NULL) {
-        err = kEFAULTErr;
-        goto ErrorExit;
-    }
-
-    PR_ASSERT(opCode == kSTREAM_SEND ? fd->secret->md.write.thread == NULL :
-                                       fd->secret->md.read.thread  == NULL);
-
-    while (bytesLeft > 0)
-    {
-        Boolean disabledNotifications = OTEnterNotifier(endpoint);
-    
-        PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-
-        if (opCode == kSTREAM_SEND) {
-        	do {
-				fd->secret->md.write.thread = me;
-				fd->secret->md.writeReady = PR_FALSE;				// expect the worst
-	            result = OTSnd(endpoint, buf, bytesLeft, NULL);
-				fd->secret->md.writeReady = (result != kOTFlowErr);
-				if (fd->secret->nonblocking)							// hope for the best
-					break;
-				else {
-
-					// We drop through on anything other than a blocking write.
-					if (result != kOTFlowErr)
-						break;
-
-					// Blocking write, but the pipe is full. Turn notifications on and
-					// wait for an event, hoping that it's a T_GODATA event.
-                    if (disabledNotifications) {
-                        OTLeaveNotifier(endpoint);
-                        disabledNotifications = false;
-                    }
-					WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-					result = me->md.osErrCode;
-					if (result != kOTNoError) // got interrupted, or some other error
-						break;
-
-					// Prepare to loop back and try again
-					disabledNotifications = OTEnterNotifier(endpoint);
-  			   		PrepareForAsyncCompletion(me, fd->secret->md.osfd);  
-				}
-			}
-			while(1);
-        } else {
-        	do {
-				fd->secret->md.read.thread = me;
-				fd->secret->md.readReady = PR_FALSE;				// expect the worst			
-	            result = OTRcv(endpoint, buf, bytesLeft, NULL);
-	            if (fd->secret->nonblocking) {
-					fd->secret->md.readReady = (result != kOTNoDataErr);
-					break;
-				} else {
-					if (result != kOTNoDataErr) {
-			      		// If we successfully read a blocking socket, check for more data.
-			      		// According to IM:OT, we should be able to rely on OTCountDataBytes
-			      		// to tell us whether there is a nonzero amount of data pending.
-			        	size_t count;
-			        	OSErr tmpResult;
-			        	tmpResult = OTCountDataBytes(endpoint, &count);
-				        fd->secret->md.readReady = ((tmpResult == kOTNoError) && (count > 0));
-						break;
-				    }
-
-					// Blocking read, but no data available. Turn notifications on and
-					// wait for an event on this endpoint, and hope that we get a T_DATA event.
-                    if (disabledNotifications) {
-                        OTLeaveNotifier(endpoint);
-                        disabledNotifications = false;
-                    }
-					WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-					result = me->md.osErrCode;
-					if (result != kOTNoError) // interrupted thread, etc.
-						break;
-
-					// Prepare to loop back and try again
-					disabledNotifications = OTEnterNotifier(endpoint);
-  			   		PrepareForAsyncCompletion(me, fd->secret->md.osfd);  
-				}
-			}
-			// Retry read if we had to wait for data to show up.
-			while(1);
-        }
-
-		me->io_pending = PR_FALSE;
-		
-        if (opCode == kSTREAM_SEND)
-            fd->secret->md.write.thread = NULL;
-        else
-            fd->secret->md.read.thread  = NULL;
-
-        // turn notifications back on
-        if (disabledNotifications)
-            OTLeaveNotifier(endpoint);
-
-        if (result > 0) {
-            buf = (void *) ( (UInt32) buf + (UInt32)result );
-            bytesLeft -= result;
-            if (opCode == kSTREAM_RECEIVE) {
-                amount = result;
-                goto NormalExit;
-            }
-        } else {
-			switch (result) {
-				case kOTLookErr:
-				    PR_ASSERT(!"call to OTLook() required after all.");
-					break;
-				
-				case kOTFlowErr:
-				case kOTNoDataErr:
-				case kEAGAINErr:
-				case kEWOULDBLOCKErr:
-					if (fd->secret->nonblocking) {
-					
-					    if (bytesLeft == amount) {  // no data was sent
-						    err = result;
-						    goto ErrorExit;
-						}
-						
-						// some data was sent
-						amount -= bytesLeft;
-						goto NormalExit;
-					}
-
-					WaitOnThisThread(me, timeout);
-					err = me->md.osErrCode;
-					if (err != kOTNoError)
-						goto ErrorExit;				
-					break;
-					
-				case kOTOutStateErr:	// if provider already closed, fall through to handle error
-					if (fd->secret->md.orderlyDisconnect) {
-						amount = 0;
-						goto NormalExit;
-					}
-					// else fall through
-				default:
-					err = result;
-					goto ErrorExit;
-			}
-		}
-    }
-
-NormalExit:
-    PR_ASSERT(opCode == kSTREAM_SEND ? fd->secret->md.write.thread == NULL :
-                                       fd->secret->md.read.thread  == NULL);
-    return amount;
-
-ErrorExit:
-    PR_ASSERT(opCode == kSTREAM_SEND ? fd->secret->md.write.thread == NULL :
-                                       fd->secret->md.read.thread  == NULL);
-    macsock_map_error(err);
-    return -1;
-}
-
-
-PRInt32 _MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRIntervalTime timeout)
-{
-    return (SendReceiveStream(fd, buf, amount, flags, timeout, kSTREAM_RECEIVE));
-}
-
-
-PRInt32 _MD_send(PRFileDesc *fd,const void *buf, PRInt32 amount, 
-                               PRIntn flags, PRIntervalTime timeout)
-{
-    return (SendReceiveStream(fd, (void *)buf, amount, flags, timeout, kSTREAM_SEND));
-}
-
-
-// Errors:
-// EBADF -- bad socket id
-// EFAULT -- bad buffer
-static PRInt32 SendReceiveDgram(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRNetAddr *addr, PRUint32 *addrlen, 
-                               PRIntervalTime timeout, SndRcvOpCode opCode)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 bytesLeft = amount;
-    TUnitData dgram;
-
-    PR_ASSERT(flags == 0);
-    
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (buf == NULL || addr == NULL) {
-        err = kEFAULTErr;
-        goto ErrorExit;
-    }
-    
-    if (opCode != kDGRAM_SEND && opCode != kDGRAM_RECEIVE) {
-        err = kEINVALErr;
-        goto ErrorExit;
-    }
-        
-    memset(&dgram, 0 , sizeof(dgram));
-    dgram.addr.maxlen = *addrlen;
-    dgram.addr.len = *addrlen;
-    dgram.addr.buf = (UInt8*) addr;
-    dgram.udata.maxlen = amount;
-    dgram.udata.len = amount;
-    dgram.udata.buf = (UInt8*) buf;    
-
-    while (bytesLeft > 0) {
-    
-        PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-
-        if (opCode == kDGRAM_SEND) {
-			fd->secret->md.write.thread = me;
-			fd->secret->md.writeReady = PR_FALSE;				// expect the worst
-            err = OTSndUData(endpoint, &dgram);
-			if (err != kOTFlowErr)							// hope for the best
-				fd->secret->md.writeReady = PR_TRUE;
-		} else {
-			fd->secret->md.read.thread = me;
-			fd->secret->md.readReady = PR_FALSE;				// expect the worst			
-            err = OTRcvUData(endpoint, &dgram, NULL);
-			if (err != kOTNoDataErr)							// hope for the best
-				fd->secret->md.readReady = PR_TRUE;
-		}
-
-        if (err == kOTNoError) {
-            buf = (void *) ( (UInt32) buf + (UInt32)dgram.udata.len );
-            bytesLeft -= dgram.udata.len;
-            dgram.udata.buf = (UInt8*) buf;    
-            me->io_pending = PR_FALSE;
-        } else {
-            PR_ASSERT(err == kOTNoDataErr || err == kOTOutStateErr);
-            WaitOnThisThread(me, timeout);
-            err = me->md.osErrCode;
-            if (err != kOTNoError)
-                goto ErrorExit;
-        }
-    }
-
-    if (opCode == kDGRAM_RECEIVE)
-        *addrlen = dgram.addr.len;
-
-    return amount;
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-PRInt32 _MD_recvfrom(PRFileDesc *fd, void *buf, PRInt32 amount, 
-                               PRIntn flags, PRNetAddr *addr, PRUint32 *addrlen,
-                               PRIntervalTime timeout)
-{
-    return (SendReceiveDgram(fd, buf, amount, flags, addr, addrlen,
-                            timeout, kDGRAM_RECEIVE));
-}
-
-
-PRInt32 _MD_sendto(PRFileDesc *fd,const void *buf, PRInt32 amount, 
-                               PRIntn flags, PRNetAddr *addr, PRUint32 addrlen,
-                               PRIntervalTime timeout)
-{
-    return (SendReceiveDgram(fd, (void *)buf, amount, flags, addr, &addrlen,
-                            timeout, kDGRAM_SEND));
-}
-
-
-PRInt32 _MD_closesocket(PRInt32 osfd)
-{
-    OSStatus err;
-    EndpointRef endpoint = (EndpointRef) osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (endpoint == NULL) {
-        err = kEBADFErr;
-        goto ErrorExit;
-    }
-        
-    if (me->io_pending && me->io_fd == osfd)
-        me->io_pending = PR_FALSE;
-
-    (void) OTSndOrderlyDisconnect(endpoint);
-    err = OTCloseProvider(endpoint);
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    return kOTNoError;
-
-ErrorExit:
-    macsock_map_error(err);
-    return -1;
-}
-
-
-PRInt32 _MD_writev(PRFileDesc *fd, const struct PRIOVec *iov, PRInt32 iov_size, PRIntervalTime timeout)
-{
-#pragma unused (fd, iov, iov_size, timeout)
-
-    PR_ASSERT(0);
-    _PR_MD_CURRENT_THREAD()->md.osErrCode = unimpErr;
-    return -1;
-}
-
-// OT endpoint states are documented here:
-// http://gemma.apple.com/techpubs/mac/NetworkingOT/NetworkingWOT-27.html#MARKER-9-65
-//
-static PRBool GetState(PRFileDesc *fd, PRBool *readReady, PRBool *writeReady, PRBool *exceptReady)
-{
-    OTResult resultOT;
-    // hack to emulate BSD sockets; say that a socket that has disconnected
-    // is still readable.
-    size_t   availableData = 1;
-    if (!fd->secret->md.orderlyDisconnect)
-        OTCountDataBytes((EndpointRef)fd->secret->md.osfd, &availableData);
-
-    *readReady = fd->secret->md.readReady && (availableData > 0);
-    *exceptReady = fd->secret->md.exceptReady;
-
-    resultOT = OTGetEndpointState((EndpointRef)fd->secret->md.osfd);
-    switch (resultOT) {
-        case T_IDLE:
-        case T_UNBND:
-            // the socket is not connected. Emulating BSD sockets,
-            // we mark it readable and writable. The next PR_Read
-            // or PR_Write will then fail. Usually, in this situation,
-            // fd->secret->md.exceptReady is also set, and returned if
-            // anyone is polling for it.
-            *readReady = PR_FALSE;
-            *writeReady = PR_FALSE;
-            break;
-
-        case T_DATAXFER:        // data transfer
-            *writeReady = fd->secret->md.writeReady;
-            break;
-
-        case T_INREL:           // incoming orderly release
-            *writeReady = fd->secret->md.writeReady;
-            break;
-
-        case T_OUTCON:          // outgoing connection pending  
-        case T_INCON:           // incoming connection pending
-        case T_OUTREL:          // outgoing orderly release
-        default:
-            *writeReady = PR_FALSE;
-    }
-    
-    return  *readReady || *writeReady || *exceptReady;
-}
-
-// check to see if any of the poll descriptors have data available
-// for reading or writing, by calling their poll methods (layered IO).
-static PRInt32 CheckPollDescMethods(PRPollDesc *pds, PRIntn npds, PRInt16 *outReadFlags, PRInt16 *outWriteFlags)
-{
-    PRInt32     ready = 0;
-    PRPollDesc  *pd, *epd;
-    PRInt16     *readFlag, *writeFlag;
-    
-    for (pd = pds, epd = pd + npds, readFlag = outReadFlags, writeFlag = outWriteFlags;
-        pd < epd;
-        pd++, readFlag++, writeFlag++)
-    {
-        PRInt16  in_flags_read = 0,  in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        pd->out_flags = 0;
-
-        if (NULL == pd->fd || pd->in_flags == 0) continue;
-
-        if (pd->in_flags & PR_POLL_READ)
-        {
-            in_flags_read = (pd->fd->methods->poll)(
-                pd->fd, pd->in_flags & ~PR_POLL_WRITE, &out_flags_read);
-        }
-
-        if (pd->in_flags & PR_POLL_WRITE)
-        {
-            in_flags_write = (pd->fd->methods->poll)(
-                pd->fd, pd->in_flags & ~PR_POLL_READ, &out_flags_write);
-        }
-
-        if ((0 != (in_flags_read & out_flags_read)) ||
-            (0 != (in_flags_write & out_flags_write)))
-        {
-            ready += 1;  /* some layer has buffer input */
-            pd->out_flags = out_flags_read | out_flags_write;
-        }
-        
-        *readFlag = in_flags_read;
-        *writeFlag = in_flags_write;
-    }
-
-    return ready;
-}
-
-// check to see if any of OT endpoints of the poll descriptors have data available
-// for reading or writing.
-static PRInt32 CheckPollDescEndpoints(PRPollDesc *pds, PRIntn npds, const PRInt16 *inReadFlags, const PRInt16 *inWriteFlags)
-{
-    PRInt32 ready = 0;
-    PRPollDesc *pd, *epd;
-    const PRInt16   *readFlag, *writeFlag;
-    
-    for (pd = pds, epd = pd + npds, readFlag = inReadFlags, writeFlag = inWriteFlags;
-         pd < epd;
-        pd++, readFlag++, writeFlag++)
-    {
-        PRFileDesc *bottomFD;
-        PRBool      readReady, writeReady, exceptReady;
-        PRInt16     in_flags_read = *readFlag;
-        PRInt16     in_flags_write = *writeFlag;
-
-        if (NULL == pd->fd || pd->in_flags == 0) continue;
-
-        if ((pd->in_flags & ~pd->out_flags) == 0) {
-            ready++;
-            continue;
-        }
-
-        bottomFD = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-        /* bottomFD can be NULL for pollable sockets */
-        if (bottomFD)
-        {
-            if (_PR_FILEDESC_OPEN == bottomFD->secret->state)
-            {
-                if (GetState(bottomFD, &readReady, &writeReady, &exceptReady))
-                {
-                    if (readReady)
-                    {
-                        if (in_flags_read & PR_POLL_READ)
-                            pd->out_flags |= PR_POLL_READ;
-                        if (in_flags_write & PR_POLL_READ)
-                            pd->out_flags |= PR_POLL_WRITE;
-                    }
-                    if (writeReady)
-                    {
-                        if (in_flags_read & PR_POLL_WRITE)
-                            pd->out_flags |= PR_POLL_READ;
-                        if (in_flags_write & PR_POLL_WRITE)
-                            pd->out_flags |= PR_POLL_WRITE;
-                    }
-                    if (exceptReady && (pd->in_flags & PR_POLL_EXCEPT))
-                    {
-                        pd->out_flags |= PR_POLL_EXCEPT;
-                    }
-                }
-                if (0 != pd->out_flags) ready++;
-            }
-            else    /* bad state */
-            {
-                ready += 1;  /* this will cause an abrupt return */
-                pd->out_flags = PR_POLL_NVAL;  /* bogii */
-            }
-        }
-    }
-
-    return ready;
-}
-
-
-// see how many of the poll descriptors are ready
-static PRInt32 CountReadyPollDescs(PRPollDesc *pds, PRIntn npds)
-{
-    PRInt32 ready = 0;
-    PRPollDesc *pd, *epd;
-    
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        if (pd->out_flags)
-            ready ++;
-    }
-
-    return ready;
-}
-
-// set or clear the poll thread on the poll descriptors
-static void SetDescPollThread(PRPollDesc *pds, PRIntn npds, PRThread* thread)
-{
-    PRInt32     ready = 0;
-    PRPollDesc *pd, *epd;
-
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {   
-        if (pd->fd)
-        { 
-            PRFileDesc *bottomFD = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-            if (bottomFD && (_PR_FILEDESC_OPEN == bottomFD->secret->state))
-            {
-                if (pd->in_flags & PR_POLL_READ) {
-                    PR_ASSERT(thread == NULL || bottomFD->secret->md.read.thread == NULL);
-                    bottomFD->secret->md.read.thread = thread;
-                }
-
-                if (pd->in_flags & PR_POLL_WRITE) {
-                    // it's possible for the writing thread to be non-null during
-                    // a non-blocking connect, so we assert that we're on
-                    // the same thread, or the thread is null.
-                    // Note that it's strictly possible for the connect and poll
-                    // to be on different threads, so ideally we need to assert
-                    // that if md.write.thread is non-null, there is a non-blocking
-                    // connect in progress.
-                    PR_ASSERT(thread == NULL ||
-                        (bottomFD->secret->md.write.thread == NULL ||
-                         bottomFD->secret->md.write.thread == thread));
-                    bottomFD->secret->md.write.thread = thread;
-                }
-            }
-        }
-    }
-}
-
-
-#define DESCRIPTOR_FLAGS_ARRAY_SIZE     32
-
-PRInt32 _MD_poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    PRInt16     readFlagsArray[DESCRIPTOR_FLAGS_ARRAY_SIZE];
-    PRInt16     writeFlagsArray[DESCRIPTOR_FLAGS_ARRAY_SIZE];
-    
-    PRInt16     *readFlags  = readFlagsArray;
-    PRInt16     *writeFlags = writeFlagsArray;
-
-    PRInt16     *ioFlags = NULL;
-    
-    PRThread    *thread = _PR_MD_CURRENT_THREAD();
-    PRInt32     ready;
-    
-    if (npds > DESCRIPTOR_FLAGS_ARRAY_SIZE)
-    {
-        // we allocate a single double-size array. The first half is used
-        // for read flags, and the second half for write flags.
-        ioFlags = (PRInt16*)PR_Malloc(sizeof(PRInt16) * npds * 2);
-        if (!ioFlags)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return -1;
-        }
-        
-        readFlags = ioFlags;
-        writeFlags = &ioFlags[npds];
-    }
-
-    // we have to be outside the lock when calling this, since
-    // it can call arbitrary user code (including other socket
-    // entry points)
-    ready = CheckPollDescMethods(pds, npds, readFlags, writeFlags);
-
-    if (!ready && timeout != PR_INTERVAL_NO_WAIT) {
-        intn        is;
-        
-
-        _PR_INTSOFF(is);
-        PR_Lock(thread->md.asyncIOLock);
-        PrepareForAsyncCompletion(thread, 0);
-
-        SetDescPollThread(pds, npds, thread);
-
-        (void)CheckPollDescEndpoints(pds, npds, readFlags, writeFlags);
-
-        PR_Unlock(thread->md.asyncIOLock);
-        _PR_FAST_INTSON(is);
-
-        ready = CountReadyPollDescs(pds, npds);
-
-        if (ready == 0) {
-            WaitOnThisThread(thread, timeout);
-
-            // since we may have been woken by a pollable event firing,
-            // we have to check both poll methods and endpoints.
-            (void)CheckPollDescMethods(pds, npds, readFlags, writeFlags);
-            ready = CheckPollDescEndpoints(pds, npds, readFlags, writeFlags);
-        }
-        
-        thread->io_pending = PR_FALSE;
-        SetDescPollThread(pds, npds, NULL);
-    }
-    else {
-        ready = CheckPollDescEndpoints(pds, npds, readFlags, writeFlags);
-    }
-
-    if (readFlags != readFlagsArray)
-        PR_Free(ioFlags);
-    
-    return ready;
-}
-
-
-void _MD_initfiledesc(PRFileDesc *fd)
-{
-	// Allocate a PR_Lock to arbitrate miscellaneous OT calls for this endpoint between threads
-	// We presume that only one thread will be making Read calls (Recv/Accept) and that only
-	// one thread will be making Write calls (Send/Connect) on the endpoint at a time.
-	if (fd->methods->file_type == PR_DESC_SOCKET_TCP ||
-		fd->methods->file_type == PR_DESC_SOCKET_UDP )
-	{
-		PR_ASSERT(fd->secret->md.miscLock == NULL);
-		fd->secret->md.miscLock = PR_NewLock();
-		PR_ASSERT(fd->secret->md.miscLock != NULL);
-		fd->secret->md.orderlyDisconnect = PR_FALSE;
-		fd->secret->md.readReady = PR_FALSE;		// let's not presume we have data ready to read
-		fd->secret->md.writeReady = PR_TRUE;		// let's presume we can write unless we hear otherwise
-		fd->secret->md.exceptReady = PR_FALSE;
-	}
-}
-
-
-void _MD_freefiledesc(PRFileDesc *fd)
-{
-	if (fd->secret->md.miscLock)
-	{
-		PR_ASSERT(fd->methods->file_type == PR_DESC_SOCKET_TCP || fd->methods->file_type == PR_DESC_SOCKET_UDP);
-		PR_DestroyLock(fd->secret->md.miscLock);
-		fd->secret->md.miscLock = NULL;
-	} else {
-		PR_ASSERT(fd->methods->file_type != PR_DESC_SOCKET_TCP && PR_DESC_SOCKET_TCP != PR_DESC_SOCKET_UDP);
-	}
-}
-
-// _MD_makenonblock is also used for sockets meant to be used for blocking I/O,
-// in order to install the notifier routine for async completion.
-void _MD_makenonblock(PRFileDesc *fd)
-{
-	// We simulate non-blocking mode using async mode rather
-	// than put the endpoint in non-blocking mode.
-	// We need to install the PRFileDesc as the contextPtr for the NotifierRoutine, but it
-	// didn't exist at the time the endpoint was created.  It does now though...
-	ProviderRef	endpointRef = (ProviderRef)fd->secret->md.osfd;
-	OSStatus	err;
-	
-	// Install fd->secret as the contextPtr for the Notifier function associated with this 
-	// endpoint. We use this instead of the fd itself because:
-	//            (a) in cases where you import I/O layers, the containing 
-	//                fd changes, but the secret structure does not;
-	//            (b) the notifier func refers only to the secret data structure
-	//                anyway.
-	err = OTInstallNotifier(endpointRef, NotifierRoutineUPP, fd->secret);
-	PR_ASSERT(err == kOTNoError);
-	
-	// Now that we have a NotifierRoutine installed, we can make the endpoint asynchronous
-	err = OTSetAsynchronous(endpointRef);
-	PR_ASSERT(err == kOTNoError);
-}
-
-
-void _MD_initfdinheritable(PRFileDesc *fd, PRBool imported)
-{
-	/* XXX this function needs to be implemented */
-	fd->secret->inheritable = _PR_TRI_UNKNOWN;
-}
-
-
-void _MD_queryfdinheritable(PRFileDesc *fd)
-{
-	/* XXX this function needs to be implemented */
-	PR_ASSERT(0);
-}
-
-
-PR_IMPLEMENT(PRInt32) _MD_shutdown(PRFileDesc *fd, PRIntn how)
-{
-#pragma unused (fd, how)
-
-/* Just succeed silently!!! */
-return (0);
-}
-
-
-PR_IMPLEMENT(PRStatus) 
-_MD_getpeername(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-	EndpointRef ep = (EndpointRef) fd->secret->md.osfd;
-	InetAddress inetAddr;
-	TBind peerAddr;
-	OSErr err;
-	
-	if (*addrlen < sizeof(InetAddress)) {
-
-		err = (OSErr) kEINVALErr;
-		goto ErrorExit;
-	}
-
-    peerAddr.addr.maxlen = sizeof(InetAddress);
-    peerAddr.addr.len = 0;
-    peerAddr.addr.buf = (UInt8*) &inetAddr;
-    peerAddr.qlen = 0;
-
-    PrepareForAsyncCompletion(me, fd->secret->md.osfd);    
-	fd->secret->md.misc.thread = me; // tell notifier routine what to wake up
-
-	err = OTGetProtAddress(ep, NULL, &peerAddr);
-	
-    if (err != kOTNoError)
-        goto ErrorExit;
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-
-    err = me->md.osErrCode;
-    if ((err == kOTNoError) && (peerAddr.addr.len < sizeof(InetAddress)))
-    	err = kEBADFErr; // we don't understand the address we got
-    if (err != kOTNoError)
-    	goto ErrorExit;
-    	
-    // Translate the OT peer information into an NSPR address.
-    addr->inet.family = AF_INET;
-    addr->inet.port = (PRUint16) inetAddr.fPort;
-    addr->inet.ip = (PRUint32) inetAddr.fHost;
-    
-    *addrlen = PR_NETADDR_SIZE(addr); // return the amount of data obtained
-	return PR_SUCCESS;
-
-ErrorExit:
-    macsock_map_error(err);
-    return PR_FAILURE;
-}
-
-
-PR_IMPLEMENT(unsigned long) inet_addr(const char *cp)
-{
-    OSStatus err;
-    InetHost host;    
-
-    _MD_FinishInitNetAccess();
-
-    err = OTInetStringToHost((char*) cp, &host);
-    if (err != kOTNoError)
-        return -1;
-    
-    return host;
-}
-
-
-static char *sAliases[1] = {NULL};
-static struct hostent sHostEnt = {NULL, &sAliases[0], AF_INET, sizeof (long), NULL};
-static InetHostInfo sHostInfo;
-static InetHost *sAddresses[kMaxHostAddrs+1];
-
-
-PR_IMPLEMENT(struct hostent *) gethostbyname(const char * name)
-{
-    OSStatus err;
-    PRUint32 index;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    	_MD_FinishInitNetAccess();
-
-    me->io_pending       = PR_TRUE;
-    me->io_fd            = NULL;
-    me->md.osErrCode     = noErr;
-	
-	PR_Lock(dnsContext.lock);	// so we can safely store our thread ptr in dnsContext
-	dnsContext.thread = me;		// so we know what thread to wake up when OTInetStringToAddress completes
-
-    err = OTInetStringToAddress(dnsContext.serviceRef, (char *)name, &sHostInfo);
-    if (err != kOTNoError) {
-        me->io_pending = PR_FALSE;
-        me->md.osErrCode = err;
-        goto ErrorExit;
-    }
-
-    WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(dnsContext.lock);
-
-    if (me->md.osErrCode != kOTNoError)
-        goto ErrorExit;
-
-    sHostEnt.h_name = sHostInfo.name;
-    for (index=0; index<kMaxHostAddrs && sHostInfo.addrs[index] != NULL; index++)
-        sAddresses[index] = &sHostInfo.addrs[index];
-    sAddresses[index] = NULL;    
-    sHostEnt.h_addr_list = (char **)sAddresses;
-
-    return (&sHostEnt);
-
-ErrorExit:
-    return NULL;
-}
-
-
-PR_IMPLEMENT(struct hostent *) gethostbyaddr(const void *addr, int addrlen, int type)
-{
-    PR_ASSERT(type == AF_INET);
-    PR_ASSERT(addrlen == sizeof(struct in_addr));
-
-    	_MD_FinishInitNetAccess();
-
-    OTInetHostToString((InetHost)addr, sHostInfo.name);
-    
-    return (gethostbyname(sHostInfo.name));
-}
-
-
-PR_IMPLEMENT(char *) inet_ntoa(struct in_addr addr)
-{
-    _MD_FinishInitNetAccess();
-
-    OTInetHostToString((InetHost)addr.s_addr, sHostInfo.name);
-    
-    return sHostInfo.name;
-}
-
-
-PRStatus _MD_gethostname(char *name, int namelen)
-{
-    OSStatus err;
-    InetInterfaceInfo info;
-
-    _MD_FinishInitNetAccess();
-
-    /*
-     *    On a Macintosh, we don't have the concept of a local host name.
-     *    We do though have an IP address & everyone should be happy with
-     *     a string version of that for a name.
-     *    The alternative here is to ping a local DNS for our name, they
-     *    will often know it.  This is the cheap, easiest, and safest way out.
-     */
-
-    /* Make sure the string is as long as the longest possible address */
-    if (namelen < strlen("123.123.123.123")) {
-        err = kEINVALErr;
-        goto ErrorExit;
-    }
-
-    err = OTInetGetInterfaceInfo(&info, kDefaultInetInterface);
-    if (err != kOTNoError)
-        goto ErrorExit;
-    
-    OTInetHostToString(info.fAddress, name);
-    
-    return PR_SUCCESS;
-
-ErrorExit:
-    macsock_map_error(err);
-    return PR_FAILURE;
-}
-
-
-#define kIPName        "ip"
-static struct protoent sIPProto = {kIPName, NULL, INET_IP};
-static struct protoent sTCPProto = {kTCPName, NULL, INET_TCP};
-static struct protoent sUDPProto = {kUDPName, NULL, INET_UDP};
-
-PR_IMPLEMENT(struct protoent *) getprotobyname(const char * name)
-{
-    if (strcmp(name, kIPName) == 0)
-        return (&sIPProto);
-        
-    if (strcmp(name, kTCPName) == 0)
-        return (&sTCPProto);
-        
-    if (strcmp(name, kUDPName) == 0)
-        return (&sUDPProto);
-        
-ErrorExit:
-    macsock_map_error(kEINVALErr);
-    return NULL;
-}
-
-
-PR_IMPLEMENT(struct protoent *) getprotobynumber(int number)
-{
-    if (number == INET_IP)
-        return (&sIPProto);
-        
-    if (number == INET_TCP)
-        return (&sTCPProto);
-        
-    if (number == INET_UDP)
-        return (&sUDPProto);
-        
-ErrorExit:
-    macsock_map_error(kEINVALErr);
-    return NULL;
-}
-
-
-int _MD_mac_get_nonblocking_connect_error(PRFileDesc* fd)
-{
-    EndpointRef endpoint = (EndpointRef)fd->secret->md.osfd;
-    OTResult    resultOT = OTGetEndpointState(endpoint);
-
-    switch (resultOT)    {
-        case T_OUTCON:
-            macsock_map_error(EINPROGRESS);
-            return -1;
-            
-        case T_DATAXFER:
-            return 0;
-            
-        case T_IDLE:
-            macsock_map_error(fd->secret->md.disconnectError);
-            fd->secret->md.disconnectError = 0;
-            return -1;
-
-        case T_INREL:
-            macsock_map_error(ENOTCONN);
-            return -1;
-
-        default:
-            PR_ASSERT(0);
-            return -1;
-    }
-
-    return -1;      // not reached
-}
diff --git a/libs/js/nsprpub/pr/src/md/mac/macthr.c b/libs/js/nsprpub/pr/src/md/mac/macthr.c
deleted file mode 100644
index 292389ea8d..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/macthr.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-#include <MacTypes.h>
-#include <Timer.h>
-#include <OSUtils.h>
-#include <Math64.h>
-#include <LowMem.h>
-#include <Multiprocessing.h>
-#include <Gestalt.h>
-
-#include "mdcriticalregion.h"
-
-TimerUPP	gTimerCallbackUPP	= NULL;
-PRThread *	gPrimaryThread		= NULL;
-
-ProcessSerialNumber		gApplicationProcess;
-
-PR_IMPLEMENT(PRThread *) PR_GetPrimaryThread()
-{
-	return gPrimaryThread;
-}
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark CREATING MACINTOSH THREAD STACKS
-
-#if defined(GC_LEAK_DETECTOR)
-extern void* GC_malloc_atomic(PRUint32 size);
-#endif
-
-/*
-**	Allocate a new memory segment.  We allocate it from our figment heap.  Currently,
-**	it is being used for per thread stack space.
-**	
-**	Return the segment's access rights and size.  vaddr is used on Unix platforms to
-**	map an existing address for the segment.
-*/
-PRStatus _MD_AllocSegment(PRSegment *seg, PRUint32 size, void *vaddr)
-{
-	PR_ASSERT(seg != 0);
-	PR_ASSERT(size != 0);
-	PR_ASSERT(vaddr == 0);
-
-	/*	
-	** Take the actual memory for the segment out of our Figment heap.
-	*/
-
-#if defined(GC_LEAK_DETECTOR)
-	seg->vaddr = (char *)GC_malloc_atomic(size);
-#else
-	seg->vaddr = (char *)malloc(size);
-#endif
-
-	if (seg->vaddr == NULL) {
-
-#if DEBUG
-		DebugStr("\p_MD_AllocSegment failed.");
-#endif
-
-		return PR_FAILURE;
-	}
-
-	seg->size = size;	
-
-	return PR_SUCCESS;
-}
-
-
-/*
-**	Free previously allocated memory segment.
-*/
-void _MD_FreeSegment(PRSegment *seg)
-{
-	PR_ASSERT((seg->flags & _PR_SEG_VM) == 0);
-
-	if (seg->vaddr != NULL)
-		free(seg->vaddr);
-}
-
-
-/*
-**	The thread's stack has been allocated and its fields are already properly filled
-**	in by PR.  Perform any debugging related initialization here.
-**
-**	Put a recognizable pattern so that we can find it from Macsbug.
-**	Put a cookie at the top of the stack so that we can find it from Macsbug.
-*/
-void _MD_InitStack(PRThreadStack *ts, int redZoneBytes)
-	{
-#pragma unused (redZoneBytes)
-#if DEVELOPER_DEBUG
-	//	Put a cookie at the top of the stack so that we can find 
-	//	it from Macsbug.
-	
-	memset(ts->allocBase, 0xDC, ts->stackSize);
-	
-	((UInt32 *)ts->stackTop)[-1] = 0xBEEFCAFE;
-	((UInt32 *)ts->stackTop)[-2] = (UInt32)gPrimaryThread;
-	((UInt32 *)ts->stackTop)[-3] = (UInt32)(ts);
-	((UInt32 *)ts->stackBottom)[0] = 0xCAFEBEEF;
-#else
-#pragma unused (ts)
-#endif	
-	}
-
-extern void _MD_ClearStack(PRThreadStack *ts)
-	{
-#if DEVELOPER_DEBUG
-	//	Clear out our cookies. 
-	
-	memset(ts->allocBase, 0xEF, ts->allocSize);
-	((UInt32 *)ts->stackTop)[-1] = 0;
-	((UInt32 *)ts->stackTop)[-2] = 0;
-	((UInt32 *)ts->stackTop)[-3] = 0;
-	((UInt32 *)ts->stackBottom)[0] = 0;
-#else
-#pragma unused (ts)
-#endif
-	}
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark TIME MANAGER-BASED CLOCK
-
-// On Mac OS X, it's possible for the application to spend lots of time
-// in WaitNextEvent, yielding to other applications. Since NSPR threads are
-// cooperative here, this means that NSPR threads will also get very little
-// time to run. To kick ourselves out of a WaitNextEvent call when we have
-// determined that it's time to schedule another thread, the Timer Task
-// (which fires every 8ms, even when other apps have the CPU) calls WakeUpProcess.
-// We only want to do this on Mac OS X; the gTimeManagerTaskDoesWUP variable
-// indicates when we're running on that OS.
-//
-// Note that the TimerCallback makes use of gApplicationProcess. We need to
-// have set this up before the first possible run of the timer task; we do
-// so in _MD_EarlyInit().
-static Boolean  gTimeManagerTaskDoesWUP;
-
-static TMTask   gTimeManagerTaskElem;
-
-extern void _MD_IOInterrupt(void);
-_PRInterruptTable _pr_interruptTable[] = {
-    { "clock", _PR_MISSED_CLOCK, _PR_ClockInterrupt, },
-    { "i/o", _PR_MISSED_IO, _MD_IOInterrupt, },
-    { 0 }
-};
-
-#define kMacTimerInMiliSecs 8L
-
-pascal void TimerCallback(TMTaskPtr tmTaskPtr)
-{
-    _PRCPU *cpu = _PR_MD_CURRENT_CPU();
-    PRIntn is;
-
-    if (_PR_MD_GET_INTSOFF()) {
-        cpu->u.missed[cpu->where] |= _PR_MISSED_CLOCK;
-        PrimeTime((QElemPtr)tmTaskPtr, kMacTimerInMiliSecs);
-        return;
-    }
-
-    _PR_INTSOFF(is);
-
-    //	And tell nspr that a clock interrupt occured.
-    _PR_ClockInterrupt();
-	
-    if ((_PR_RUNQREADYMASK(cpu)) >> ((_PR_MD_CURRENT_THREAD()->priority))) {
-        if (gTimeManagerTaskDoesWUP) {
-            // We only want to call WakeUpProcess if we know that NSPR has managed to switch threads
-            // since the last call, otherwise we end up spewing out WakeUpProcess() calls while the
-            // application is blocking somewhere. This can interfere with events loops other than
-            // our own (see bug 158927).
-            if (UnsignedWideToUInt64(cpu->md.lastThreadSwitch) > UnsignedWideToUInt64(cpu->md.lastWakeUpProcess))
-            {
-                WakeUpProcess(&gApplicationProcess);
-                cpu->md.lastWakeUpProcess = UpTime();
-            }
-        }
-        _PR_SET_RESCHED_FLAG();
-	}
-	
-    _PR_FAST_INTSON(is);
-
-    //	Reset the clock timer so that we fire again.
-    PrimeTime((QElemPtr)tmTaskPtr, kMacTimerInMiliSecs);
-}
-
-
-void _MD_StartInterrupts(void)
-{
-	gPrimaryThread = _PR_MD_CURRENT_THREAD();
-
-	gTimeManagerTaskDoesWUP = RunningOnOSX();
-
-	if ( !gTimerCallbackUPP )
-		gTimerCallbackUPP = NewTimerUPP(TimerCallback);
-
-	//	Fill in the Time Manager queue element
-	
-	gTimeManagerTaskElem.tmAddr = (TimerUPP)gTimerCallbackUPP;
-	gTimeManagerTaskElem.tmCount = 0;
-	gTimeManagerTaskElem.tmWakeUp = 0;
-	gTimeManagerTaskElem.tmReserved = 0;
-
-	//	Make sure that our time manager task is ready to go.
-	InsTime((QElemPtr)&gTimeManagerTaskElem);
-	
-	PrimeTime((QElemPtr)&gTimeManagerTaskElem, kMacTimerInMiliSecs);
-}
-
-void _MD_StopInterrupts(void)
-{
-	if (gTimeManagerTaskElem.tmAddr != NULL) {
-		RmvTime((QElemPtr)&gTimeManagerTaskElem);
-		gTimeManagerTaskElem.tmAddr = NULL;
-	}
-}
-
-
-#define MAX_PAUSE_TIMEOUT_MS    500
-
-void _MD_PauseCPU(PRIntervalTime timeout)
-{
-    if (timeout != PR_INTERVAL_NO_WAIT)
-    {
-        // There is a race condition entering the critical section
-        // in AsyncIOCompletion (and probably elsewhere) that can
-        // causes deadlock for the duration of this timeout. To
-        // work around this, use a max 500ms timeout for now.
-        // See bug 99561 for details.
-        if (PR_IntervalToMilliseconds(timeout) > MAX_PAUSE_TIMEOUT_MS)
-            timeout = PR_MillisecondsToInterval(MAX_PAUSE_TIMEOUT_MS);
-
-        WaitOnIdleSemaphore(timeout);
-        (void) _MD_IOInterrupt();
-    }
-}
-
-void _MD_InitRunningCPU(_PRCPU* cpu)
-{
-    cpu->md.trackScheduling = RunningOnOSX();
-    if (cpu->md.trackScheduling) {
-        AbsoluteTime    zeroTime = {0, 0};
-        cpu->md.lastThreadSwitch = UpTime();
-        cpu->md.lastWakeUpProcess = zeroTime;
-    }
-}
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark THREAD SUPPORT FUNCTIONS
-
-#include <OpenTransport.h> /* for error codes */
-
-PRStatus _MD_InitThread(PRThread *thread)
-{
-	thread->md.asyncIOLock = PR_NewLock();
-	PR_ASSERT(thread->md.asyncIOLock != NULL);
-	thread->md.asyncIOCVar = PR_NewCondVar(thread->md.asyncIOLock);
-	PR_ASSERT(thread->md.asyncIOCVar != NULL);
-
-	if (thread->md.asyncIOLock == NULL || thread->md.asyncIOCVar == NULL)
-		return PR_FAILURE;
-	else
-		return PR_SUCCESS;
-}
-
-PRStatus _MD_wait(PRThread *thread, PRIntervalTime timeout)
-{
-#pragma unused (timeout)
-
-	_MD_SWITCH_CONTEXT(thread);
-	return PR_SUCCESS;
-}
-
-
-void WaitOnThisThread(PRThread *thread, PRIntervalTime timeout)
-{
-    intn is;
-    PRIntervalTime timein = PR_IntervalNow();
-	PRStatus status = PR_SUCCESS;
-
-    // Turn interrupts off to avoid a race over lock ownership with the callback
-    // (which can fire at any time). Interrupts may stay off until we leave
-    // this function, or another NSPR thread turns them back on. They certainly
-    // stay off until PR_WaitCondVar() relinquishes the asyncIOLock lock, which
-    // is what we care about.
-	_PR_INTSOFF(is);
-	PR_Lock(thread->md.asyncIOLock);
-	if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-	    while ((thread->io_pending) && (status == PR_SUCCESS))
-	        status = PR_WaitCondVar(thread->md.asyncIOCVar, PR_INTERVAL_NO_TIMEOUT);
-	} else {
-	    while ((thread->io_pending) && ((PRIntervalTime)(PR_IntervalNow() - timein) < timeout) && (status == PR_SUCCESS))
-	        status = PR_WaitCondVar(thread->md.asyncIOCVar, timeout);
-	}
-	if ((status == PR_FAILURE) && (PR_GetError() == PR_PENDING_INTERRUPT_ERROR)) {
-		thread->md.osErrCode = kEINTRErr;
-	} else if (thread->io_pending) {
-		thread->md.osErrCode = kETIMEDOUTErr;
-		PR_SetError(PR_IO_TIMEOUT_ERROR, kETIMEDOUTErr);
-	}
-
-	thread->io_pending = PR_FALSE;
-	PR_Unlock(thread->md.asyncIOLock);
-	_PR_FAST_INTSON(is);
-}
-
-
-void DoneWaitingOnThisThread(PRThread *thread)
-{
-    intn is;
-
-    PR_ASSERT(thread->md.asyncIOLock->owner == NULL);
-
-	// DoneWaitingOnThisThread() is called from OT notifiers and async file I/O
-	// callbacks that can run at "interrupt" time (Classic Mac OS) or on pthreads
-	// that may run concurrently with the main threads (Mac OS X). They can thus
-	// be called when any NSPR thread is running, or even while NSPR is in a
-	// thread context switch. It is therefore vital that we can guarantee to
-	// be able to get the asyncIOLock without blocking (thus avoiding code
-	// that makes assumptions about the current NSPR thread etc). To achieve
-	// this, we use NSPR interrrupts as a semaphore on the lock; all code 
-	// that grabs the lock also disables interrupts for the time the lock
-	// is held. Callers of DoneWaitingOnThisThread() thus have to check whether
-	// interrupts are already off, and, if so, simply set the missed_IO flag on
-	// the CPU rather than calling this function.
-	
-	_PR_INTSOFF(is);
-	PR_Lock(thread->md.asyncIOLock);
-	thread->io_pending = PR_FALSE;
-	/* let the waiting thread know that async IO completed */
-	PR_NotifyCondVar(thread->md.asyncIOCVar);
-	PR_Unlock(thread->md.asyncIOLock);
-	_PR_FAST_INTSON(is);
-}
-
-
-PR_IMPLEMENT(void) PR_Mac_WaitForAsyncNotify(PRIntervalTime timeout)
-{
-    intn is;
-    PRIntervalTime timein = PR_IntervalNow();
-	PRStatus status = PR_SUCCESS;
-    PRThread *thread = _PR_MD_CURRENT_THREAD();
-
-    // See commments in WaitOnThisThread()
-	_PR_INTSOFF(is);
-	PR_Lock(thread->md.asyncIOLock);
-	if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-	    while ((!thread->md.asyncNotifyPending) && (status == PR_SUCCESS))
-	        status = PR_WaitCondVar(thread->md.asyncIOCVar, PR_INTERVAL_NO_TIMEOUT);
-	} else {
-	    while ((!thread->md.asyncNotifyPending) && ((PRIntervalTime)(PR_IntervalNow() - timein) < timeout) && (status == PR_SUCCESS))
-	        status = PR_WaitCondVar(thread->md.asyncIOCVar, timeout);
-	}
-	if ((status == PR_FAILURE) && (PR_GetError() == PR_PENDING_INTERRUPT_ERROR)) {
-		thread->md.osErrCode = kEINTRErr;
-	} else if (!thread->md.asyncNotifyPending) {
-		thread->md.osErrCode = kETIMEDOUTErr;
-		PR_SetError(PR_IO_TIMEOUT_ERROR, kETIMEDOUTErr);
-	}
-	thread->md.asyncNotifyPending = PR_FALSE;
-	PR_Unlock(thread->md.asyncIOLock);
-	_PR_FAST_INTSON(is);
-}
-
-
-void AsyncNotify(PRThread *thread)
-{
-    intn is;
-	
-    PR_ASSERT(thread->md.asyncIOLock->owner == NULL);
-
-    // See commments in DoneWaitingOnThisThread()
-	_PR_INTSOFF(is);
-	PR_Lock(thread->md.asyncIOLock);
-	thread->md.asyncNotifyPending = PR_TRUE;
-	/* let the waiting thread know that async IO completed */
-	PR_NotifyCondVar(thread->md.asyncIOCVar);
-	PR_Unlock(thread->md.asyncIOLock);
-	_PR_FAST_INTSON(is);
-}
-
-
-PR_IMPLEMENT(void) PR_Mac_PostAsyncNotify(PRThread *thread)
-{
-	_PRCPU *  cpu = _PR_MD_CURRENT_CPU();
-	
-	if (_PR_MD_GET_INTSOFF()) {
-		thread->md.missedAsyncNotify = PR_TRUE;
-		cpu->u.missed[cpu->where] |= _PR_MISSED_IO;
-	} else {
-		AsyncNotify(thread);
-	}
-}
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark PROCESS SUPPORT FUNCTIONS
-
-PRProcess * _MD_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-#pragma unused (path, argv, envp, attr)
-
-	PR_SetError(PR_NOT_IMPLEMENTED_ERROR, unimpErr);
-	return NULL;
-}
-
-PRStatus _MD_DetachProcess(PRProcess *process)
-{
-#pragma unused (process)
-
-	PR_SetError(PR_NOT_IMPLEMENTED_ERROR, unimpErr);
-	return PR_FAILURE;
-}
-
-PRStatus _MD_WaitProcess(PRProcess *process, PRInt32 *exitCode)
-{
-#pragma unused (process, exitCode)
-
-	PR_SetError(PR_NOT_IMPLEMENTED_ERROR, unimpErr);
-	return PR_FAILURE;
-}
-
-PRStatus _MD_KillProcess(PRProcess *process)
-{
-#pragma unused (process)
-
-	PR_SetError(PR_NOT_IMPLEMENTED_ERROR, unimpErr);
-	return PR_FAILURE;
-}
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark ATOMIC OPERATIONS
-
-#ifdef _PR_HAVE_ATOMIC_OPS
-PRInt32
-_MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-{
-    PRInt32 rv;
-    do  {
-        rv = *val;
-    } while (!OTCompareAndSwap32(rv, newval, (UInt32*)val));
-
-    return rv;
-}
-
-#endif // _PR_HAVE_ATOMIC_OPS
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark INTERRUPT SUPPORT
-
-#if TARGET_CARBON
-
-/*
-     This critical region support is required for Mac NSPR to work correctly on dual CPU
-     machines on Mac OS X. This note explains why.
-
-     NSPR uses a timer task, and has callbacks for async file I/O and Open Transport
-     whose runtime behaviour differs depending on environment. On "Classic" Mac OS
-     these run at "interrupt" time (OS-level interrupts, that is, not NSPR interrupts),
-     and can thus preempt other code, but they always run to completion.
-
-     On Mac OS X, these are all emulated using MP tasks, which sit atop pthreads. Thus,
-     they can be preempted at any time (and not necessarily run to completion), and can
-     also run *concurrently* with eachother, and with application code, on multiple
-     CPU machines. Note that all NSPR threads are emulated, and all run on the main
-     application MP task.
-
-     We thus have to use MP critical sections to protect data that is shared between
-     the various callbacks and the main MP thread. It so happens that NSPR has this
-     concept of software interrupts, and making interrupt-off times be critical
-     sections works.
-
-*/
-
-
-/*  
-    Whether to use critical regions. True if running on Mac OS X and later
-*/
-
-PRBool  gUseCriticalRegions;
-
-/*
-    Count of the number of times we've entered the critical region.
-    We need this because ENTER_CRITICAL_REGION() will *not* block when
-    called from different NSPR threads (which all run on one MP thread),
-    and we need to ensure that when code turns interrupts back on (by
-    settings _pr_intsOff to 0) we exit the critical section enough times
-    to leave it.
-*/
-
-PRInt32 gCriticalRegionEntryCount;
-
-
-void _MD_SetIntsOff(PRInt32 ints)
-{
-    ENTER_CRITICAL_REGION();
-    gCriticalRegionEntryCount ++;
-    
-    _pr_intsOff = ints;
-    
-    if (!ints)
-    {
-        PRInt32     i = gCriticalRegionEntryCount;
-
-        gCriticalRegionEntryCount = 0;
-        for ( ;i > 0; i --) {
-            LEAVE_CRITICAL_REGION();
-        }
-    }
-}
-
-
-#endif /* TARGET_CARBON */
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark CRITICAL REGION SUPPORT
-
-
-static PRBool RunningOnOSX()
-{
-    long    systemVersion;
-    OSErr   err = Gestalt(gestaltSystemVersion, &systemVersion);
-    return (err == noErr) && (systemVersion >= 0x00001000);
-}
-
-
-#if MAC_CRITICAL_REGIONS
-
-MDCriticalRegionID  gCriticalRegion;
-
-void InitCriticalRegion()
-{
-    OSStatus    err;    
-    
-    // we only need to do critical region stuff on Mac OS X    
-    gUseCriticalRegions = RunningOnOSX();
-    if (!gUseCriticalRegions) return;
-    
-    err = MD_CriticalRegionCreate(&gCriticalRegion);
-    PR_ASSERT(err == noErr);
-}
-
-void TermCriticalRegion()
-{
-    OSStatus    err;    
-
-    if (!gUseCriticalRegions) return;
-
-    err = MD_CriticalRegionDelete(gCriticalRegion);
-    PR_ASSERT(err == noErr);
-}
-
-
-void EnterCritialRegion()
-{
-    OSStatus    err;
-    
-    if (!gUseCriticalRegions) return;
-
-    PR_ASSERT(gCriticalRegion != kInvalidID);
-    
-    /* Change to a non-infinite timeout for debugging purposes */
-    err = MD_CriticalRegionEnter(gCriticalRegion, kDurationForever /* 10000 * kDurationMillisecond */ );
-    PR_ASSERT(err == noErr);
-}
-
-void LeaveCritialRegion()
-{
-    OSStatus    err;    
-
-    if (!gUseCriticalRegions) return;
-
-    PR_ASSERT(gCriticalRegion != kInvalidID);
-
-    err = MD_CriticalRegionExit(gCriticalRegion);
-    PR_ASSERT(err == noErr);
-}
-
-
-#endif // MAC_CRITICAL_REGIONS
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark IDLE SEMAPHORE SUPPORT
-
-/*
-     Since the WaitNextEvent() in _MD_PauseCPU() is causing all sorts of
-     headache under Mac OS X we're going to switch to MPWaitOnSemaphore()
-     which should do what we want
-*/
-
-#if TARGET_CARBON
-PRBool					gUseIdleSemaphore = PR_FALSE;
-MPSemaphoreID			gIdleSemaphore = NULL;
-#endif
-
-void InitIdleSemaphore()
-{
-    // we only need to do idle semaphore stuff on Mac OS X
-#if TARGET_CARBON
-	gUseIdleSemaphore = RunningOnOSX();
-	if (gUseIdleSemaphore)
-	{
-		OSStatus  err = MPCreateSemaphore(1 /* max value */, 0 /* initial value */, &gIdleSemaphore);
-		PR_ASSERT(err == noErr);
-	}
-#endif
-}
-
-void TermIdleSemaphore()
-{
-#if TARGET_CARBON
-	if (gUseIdleSemaphore)
-	{
-		OSStatus  err = MPDeleteSemaphore(gIdleSemaphore);
-		PR_ASSERT(err == noErr);
-		gUseIdleSemaphore = NULL;
-	}
-#endif
-}
-
-
-void WaitOnIdleSemaphore(PRIntervalTime timeout)
-{
-#if TARGET_CARBON
-	if (gUseIdleSemaphore)
-	{
-		OSStatus  err = MPWaitOnSemaphore(gIdleSemaphore, kDurationMillisecond * PR_IntervalToMilliseconds(timeout));
-		PR_ASSERT(err == noErr);
-	}
-	else
-#endif
-	{
-		EventRecord   theEvent;
-		/*
-		** Calling WaitNextEvent() here is suboptimal. This routine should
-		** pause the process until IO or the timeout occur, yielding time to
-		** other processes on operating systems that require this (Mac OS classic).
-		** WaitNextEvent() may incur too much latency, and has other problems,
-		** such as the potential to drop suspend/resume events.
-		*/
-		(void)WaitNextEvent(nullEvent, &theEvent, 1, NULL);
-	}
-}
-
-
-void SignalIdleSemaphore()
-{
-#if TARGET_CARBON
-	if (gUseIdleSemaphore)
-	{
-		// often we won't be waiting on the semaphore here, so ignore any errors
-		(void)MPSignalSemaphore(gIdleSemaphore);
-	}
-	else
-#endif
-	{
-		WakeUpProcess(&gApplicationProcess);
-	}
-}
-
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/mactime.c b/libs/js/nsprpub/pr/src/md/mac/mactime.c
deleted file mode 100644
index 1e7d2a2223..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mactime.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <OSUtils.h>
-#include <Timer.h>
-
-#include "primpl.h"
-
-#include "mactime.h"
-
-unsigned long gJanuaryFirst1970Seconds;
-
-/*
- * The geographic location and time zone information of a Mac
- * are stored in extended parameter RAM.  The ReadLocation
- * produdure uses the geographic location record, MachineLocation,
- * to read the geographic location and time zone information in
- * extended parameter RAM.
- *
- * Because serial port and SLIP conflict with ReadXPram calls,
- * we cache the call here.
- *
- * Caveat: this caching will give the wrong result if a session
- * extend across the DST changeover time.
- */
-
-static void MyReadLocation(MachineLocation *loc)
-{
-    static MachineLocation storedLoc;
-    static Boolean didReadLocation = false;
-    
-    if (!didReadLocation) {
-        ReadLocation(&storedLoc);
-        didReadLocation = true;
-    }
-    *loc = storedLoc;
-}
-
-static long GMTDelta(void)
-{
-    MachineLocation loc;
-    long gmtDelta;
-
-    MyReadLocation(&loc);
-    gmtDelta = loc.u.gmtDelta & 0x00ffffff;
-    if (gmtDelta & 0x00800000) {    /* test sign extend bit */
-        gmtDelta |= 0xff000000;
-    }
-    return gmtDelta;
-}
-
-void MacintoshInitializeTime(void)
-{
-    /*
-     * The NSPR epoch is midnight, Jan. 1, 1970 GMT.
-     *
-     * At midnight Jan. 1, 1970 GMT, the local time was
-     *     midnight Jan. 1, 1970 + GMTDelta().
-     *
-     * Midnight Jan. 1, 1970 is 86400 * (365 * (1970 - 1904) + 17)
-     *     = 2082844800 seconds since the Mac epoch.
-     * (There were 17 leap years from 1904 to 1970.)
-     *
-     * So the NSPR epoch is 2082844800 + GMTDelta() seconds since
-     * the Mac epoch.  Whew! :-)
-     */
-    gJanuaryFirst1970Seconds = 2082844800 + GMTDelta();
-}
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the Mac
- *     Implementation.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-PRTime PR_Now(void)
-{
-    unsigned long currentTime;    /* unsigned 32-bit integer, ranging
-                                     from midnight Jan. 1, 1904 to 
-                                     6:28:15 AM Feb. 6, 2040 */
-    PRTime retVal;
-    int64  usecPerSec;
-
-    /*
-     * Get the current time expressed as the number of seconds
-     * elapsed since the Mac epoch, midnight, Jan. 1, 1904 (local time).
-     * On a Mac, current time accuracy is up to a second.
-     */
-    GetDateTime(&currentTime);
-
-    /*
-     * Express the current time relative to the NSPR epoch,
-     * midnight, Jan. 1, 1970 GMT.
-     *
-     * At midnight Jan. 1, 1970 GMT, the local time was
-     *     midnight Jan. 1, 1970 + GMTDelta().
-     *
-     * Midnight Jan. 1, 1970 is 86400 * (365 * (1970 - 1904) + 17)
-     *     = 2082844800 seconds since the Mac epoch.
-     * (There were 17 leap years from 1904 to 1970.)
-     *
-     * So the NSPR epoch is 2082844800 + GMTDelta() seconds since
-     * the Mac epoch.  Whew! :-)
-     */
-    currentTime = currentTime - 2082844800 - GMTDelta();
-
-    /* Convert seconds to microseconds */
-    LL_I2L(usecPerSec, PR_USEC_PER_SEC);
-    LL_I2L(retVal, currentTime);
-    LL_MUL(retVal, retVal, usecPerSec);
-
-    return retVal;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * PR_LocalTimeParameters --
- * 
- *     returns the time parameters for the local time zone
- *
- *     This is the machine-dependent implementation for Mac.
- *
- *     Caveat: On a Mac, we only know the GMT and DST offsets for
- *     the current time, not for the time in question.
- *     Mac has no support for DST handling.
- *     DST changeover is all manually set by the user.
- *
- *-------------------------------------------------------------------------
- */
-
-PRTimeParameters PR_LocalTimeParameters(const PRExplodedTime *gmt)
-{
-#pragma unused (gmt)
-
-    PRTimeParameters retVal;
-    MachineLocation loc;
-
-    MyReadLocation(&loc);
-
-    /* 
-     * On a Mac, the GMT value is in seconds east of GMT.  For example,
-     * San Francisco is at -28,800 seconds (8 hours * 3600 seconds per hour)
-     * east of GMT.  The gmtDelta field is a 3-byte value contained in a
-     * long word, so you must take care to get it properly.
-     */
-
-    retVal.tp_gmt_offset = loc.u.gmtDelta & 0x00ffffff;
-    if (retVal.tp_gmt_offset & 0x00800000) {    /* test sign extend bit */
-	retVal.tp_gmt_offset |= 0xff000000;
-    }
-
-    /*
-     * The daylight saving time value, dlsDelta, is a signed byte
-     * value representing the offset for the hour field -- whether
-     * to add 1 hour, subtract 1 hour, or make no change at all.
-     */
-
-    if (loc.u.dlsDelta) {
-    	retVal.tp_gmt_offset -= 3600;
-    	retVal.tp_dst_offset = 3600;
-    } else {
-    	retVal.tp_dst_offset = 0;
-    }
-    return retVal;
-}
-
-PRIntervalTime _MD_GetInterval(void)
-{
-    PRIntervalTime retVal;
-    PRUint64 upTime, microtomilli;	
-
-    /*
-     * Use the Microseconds procedure to obtain the number of
-     * microseconds elapsed since system startup time.
-     */
-    Microseconds((UnsignedWide *)&upTime);
-    LL_I2L(microtomilli, PR_USEC_PER_MSEC);
-    LL_DIV(upTime, upTime, microtomilli);
-    LL_L2I(retVal, upTime);
-	
-    return retVal;
-}
-
-struct tm *Maclocaltime(const time_t * t)
-{
-	DateTimeRec dtr;
-	MachineLocation loc;
-	time_t macLocal = *t + gJanuaryFirst1970Seconds; /* GMT Mac */
-	static struct tm statictime;
-	static const short monthday[12] =
-		{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-
-	SecondsToDate(macLocal, &dtr);
-	statictime.tm_sec = dtr.second;
-	statictime.tm_min = dtr.minute;
-	statictime.tm_hour = dtr.hour;
-	statictime.tm_mday = dtr.day;
-	statictime.tm_mon = dtr.month - 1;
-	statictime.tm_year = dtr.year - 1900;
-	statictime.tm_wday = dtr.dayOfWeek - 1;
-	statictime.tm_yday = monthday[statictime.tm_mon]
-		+ statictime.tm_mday - 1;
-	if (2 < statictime.tm_mon && !(statictime.tm_year & 3))
-		++statictime.tm_yday;
-	MyReadLocation(&loc);
-	statictime.tm_isdst = loc.u.dlsDelta;
-	return(&statictime);
-}
-
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/mactime.h b/libs/js/nsprpub/pr/src/md/mac/mactime.h
deleted file mode 100644
index a78424df59..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mactime.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef mactime_h__
-#define mactime_h__
-
-
-PR_BEGIN_EXTERN_C
-
-void MacintoshInitializeTime(void);
-
-
-PR_END_EXTERN_C
-
-
-#endif /* mactime_h__ */
diff --git a/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c b/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c
deleted file mode 100644
index 15eea19ad5..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: NULL; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   George Warner, Apple Computer Inc.
- *   Simon Fraser  <sfraser@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "mdcriticalregion.h"
-#include <MacErrors.h>
-
-/*
-  This code is a replacement for MPEnterCriticalRegion/MPLeaveCriticalRegion,
-  which is broken on Mac OS 10.0.x builds, but fixed in 10.1. This code works
-  everywhere.
-*/
-
-
-typedef struct MDCriticalRegionData_struct {
-  MPTaskID        mMPTaskID;          /* Who's in the critical region? */
-  UInt32          mDepthCount;        /* How deep? */
-  MPSemaphoreID   mMPSemaphoreID;     /* ready semaphore */
-} MDCriticalRegionData, *MDCriticalRegionDataPtr;
-
-
-OSStatus
-MD_CriticalRegionCreate(MDCriticalRegionID * outCriticalRegionID)
-{
-  MDCriticalRegionDataPtr newCriticalRegionPtr;
-  MPSemaphoreID           mpSemaphoreID;
-  OSStatus                err = noErr;
-
-  if (outCriticalRegionID == NULL)
-    return paramErr;
-
-  *outCriticalRegionID = NULL;
-
-  newCriticalRegionPtr = (MDCriticalRegionDataPtr)MPAllocateAligned(sizeof(MDCriticalRegionData),
-                        kMPAllocateDefaultAligned, kMPAllocateClearMask);
-  if (newCriticalRegionPtr == NULL)
-    return memFullErr;
-
-  // Note: this semaphore is pre-fired (ready!)
-  err = MPCreateBinarySemaphore(&mpSemaphoreID);
-  if (err == noErr)
-  {
-    newCriticalRegionPtr->mMPTaskID = kInvalidID;
-    newCriticalRegionPtr->mDepthCount = 0;
-    newCriticalRegionPtr->mMPSemaphoreID = mpSemaphoreID;
-
-    *outCriticalRegionID = (MDCriticalRegionID)newCriticalRegionPtr;
-  }
-  else
-  {
-    MPFree((LogicalAddress)newCriticalRegionPtr);
-  }
-
-  return err;
-}
-
-OSStatus
-MD_CriticalRegionDelete(MDCriticalRegionID inCriticalRegionID)
-{
-  MDCriticalRegionDataPtr criticalRegion = (MDCriticalRegionDataPtr)inCriticalRegionID;
-  OSStatus                err = noErr;
-
-  if (criticalRegion == NULL)
-    return paramErr;
-
-  if ((criticalRegion->mMPTaskID != kInvalidID) && (criticalRegion->mDepthCount > 0))
-    return kMPInsufficientResourcesErr;
-
-  if (criticalRegion->mMPSemaphoreID != kInvalidID)
-    err = MPDeleteSemaphore(criticalRegion->mMPSemaphoreID);
-  if (noErr != err) return err;
-
-  criticalRegion->mMPSemaphoreID = kInvalidID;
-  MPFree((LogicalAddress) criticalRegion);
-
-  return noErr;
-}
-
-OSStatus
-MD_CriticalRegionEnter(MDCriticalRegionID inCriticalRegionID, Duration inTimeout)
-{
-  MDCriticalRegionDataPtr criticalRegion = (MDCriticalRegionDataPtr)inCriticalRegionID;
-  MPTaskID                currentTaskID = MPCurrentTaskID();
-  OSStatus                err = noErr;
-
-  if (criticalRegion == NULL)
-    return paramErr;
-
-  // if I'm inside the critical region...
-  if (currentTaskID == criticalRegion->mMPTaskID)
-  {
-    // bump my depth
-    criticalRegion->mDepthCount++;
-    // and continue
-    return noErr;
-  }
-
-  // wait for the ready semaphore
-  err = MPWaitOnSemaphore(criticalRegion->mMPSemaphoreID, inTimeout);
-  // we didn't get it. return the error
-  if (noErr != err) return err;
-
-  // we got it!
-  criticalRegion->mMPTaskID = currentTaskID;
-  criticalRegion->mDepthCount = 1;
-
-  return noErr;
-}
-
-OSStatus
-MD_CriticalRegionExit(MDCriticalRegionID inCriticalRegionID)
-{
-  MDCriticalRegionDataPtr   criticalRegion = (MDCriticalRegionDataPtr)inCriticalRegionID;
-  MPTaskID                  currentTaskID = MPCurrentTaskID();
-  OSStatus                  err = noErr;
-
-  // if we don't own the critical region...
-  if (currentTaskID != criticalRegion->mMPTaskID)
-    return kMPInsufficientResourcesErr;
-
-  // if we aren't at a depth...
-  if (criticalRegion->mDepthCount == 0)
-    return kMPInsufficientResourcesErr;
-
-  // un-bump my depth
-  criticalRegion->mDepthCount--;
-
-  // if we just bottomed out...
-  if (criticalRegion->mDepthCount == 0)
-  {
-    // release ownership of the structure
-    criticalRegion->mMPTaskID = kInvalidID;
-    // and signal the ready semaphore
-    err = MPSignalSemaphore(criticalRegion->mMPSemaphoreID);
-  }
-  return err;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h b/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h
deleted file mode 100644
index abcd20e3b6..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mdcriticalregion.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   George Warner, Apple Computer Inc.
- *   Simon Fraser  <sfraser@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef mdcriticalregion_h___
-#define mdcriticalregion_h___
-
-
-#ifndef __MULTIPROCESSING__
-#include <Multiprocessing.h>
-#endif
-
-typedef struct OpaqueMDCriticalRegionID*  MDCriticalRegionID;
-
-OSStatus MD_CriticalRegionCreate(MDCriticalRegionID * pMDCriticalRegionID);
-
-OSStatus MD_CriticalRegionDelete(MDCriticalRegionID pMDCriticalRegionID);
-
-OSStatus MD_CriticalRegionEnter(MDCriticalRegionID pMDCriticalRegionID, Duration pTimeout);
-
-OSStatus MD_CriticalRegionExit(MDCriticalRegionID pMDCriticalRegionID);
-
-#endif /* mdcriticalregion_h___ */
-
diff --git a/libs/js/nsprpub/pr/src/md/mac/mdmac.c b/libs/js/nsprpub/pr/src/md/mac/mdmac.c
deleted file mode 100644
index cda67fb78e..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mdmac.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <Types.h>
-#include <Timer.h>
-#include <Files.h>
-#include <Errors.h>
-#include <Folders.h>
-#include <Gestalt.h>
-#include <Events.h>
-#include <Processes.h>
-#include <TextUtils.h>
-#include <MixedMode.h>
-#include <LowMem.h>
-
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stat.h>
-#include <stdarg.h>
-#include <unix.h>
-
-#include "MacErrorHandling.h"
-
-#include "primpl.h"
-#include "prgc.h"
-
-#include "mactime.h"
-
-#include "mdmac.h"
-
-// undefine getenv, so that _MD_GetEnv can call the version in NSStdLib::nsEnvironment.cpp.
-#undef getenv
-
-//
-// Local routines
-//
-unsigned char GarbageCollectorCacheFlusher(PRUint32 size);
-
-extern PRThread *gPrimaryThread;
-extern ProcessSerialNumber gApplicationProcess;     // in macthr.c
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark CREATING MACINTOSH THREAD STACKS
-
-
-enum {
-	uppExitToShellProcInfo 				= kPascalStackBased,
-	uppStackSpaceProcInfo				= kRegisterBased 
-										  | RESULT_SIZE(SIZE_CODE(sizeof(long)))
-										  | REGISTER_RESULT_LOCATION(kRegisterD0)
-		 								  | REGISTER_ROUTINE_PARAMETER(1, kRegisterD1, SIZE_CODE(sizeof(UInt16)))
-};
-
-typedef CALLBACK_API( long , StackSpacePatchPtr )(UInt16 trapNo);
-typedef REGISTER_UPP_TYPE(StackSpacePatchPtr)	StackSpacePatchUPP;
-
-StackSpacePatchUPP	  gStackSpacePatchUPP = NULL;
-UniversalProcPtr	  gStackSpacePatchCallThru = NULL;
-long				(*gCallOSTrapUniversalProc)(UniversalProcPtr,ProcInfoType,...) = NULL;
-
-
-pascal long StackSpacePatch(UInt16 trapNo)
-{
-	char		tos;
-	PRThread	*thisThread;
-	
-	thisThread = PR_GetCurrentThread();
-	
-	//	If we are the primary thread, then call through to the
-	//	good ol' fashion stack space implementation.  Otherwise,
-	//	compute it by hand.
-	if ((thisThread == gPrimaryThread) || 	
-		(&tos < thisThread->stack->stackBottom) || 
-		(&tos > thisThread->stack->stackTop)) {
-		return gCallOSTrapUniversalProc(gStackSpacePatchCallThru, uppStackSpaceProcInfo, trapNo);
-	}
-	else {
-		return &tos - thisThread->stack->stackBottom;
-	}
-}
-
-
-static void InstallStackSpacePatch(void)
-{
-	long				systemVersion;
-	OSErr				err;
-	CFragConnectionID	connID;
-	Str255				errMessage;
-	Ptr					interfaceLibAddr;
-	CFragSymbolClass	symClass;
-	UniversalProcPtr	(*getOSTrapAddressProc)(UInt16);
-	void				(*setOSTrapAddressProc)(StackSpacePatchUPP, UInt16);
-	UniversalProcPtr	(*newRoutineDescriptorProc)(ProcPtr,ProcInfoType,ISAType);
-	
-
-	err = Gestalt(gestaltSystemVersion,&systemVersion);
-	if (systemVersion >= 0x00000A00)	// we don't need to patch StackSpace()
-		return;
-
-	// open connection to "InterfaceLib"
-	err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
-											&connID, &interfaceLibAddr, errMessage);
-	PR_ASSERT(err == noErr);
-	if (err != noErr)
-		return;
-
-	// get symbol GetOSTrapAddress
-	err = FindSymbol(connID, "\pGetOSTrapAddress", &(Ptr)getOSTrapAddressProc, &symClass);
-	if (err != noErr)
-		return;
-
-	// get symbol SetOSTrapAddress
-	err = FindSymbol(connID, "\pSetOSTrapAddress", &(Ptr)setOSTrapAddressProc, &symClass);
-	if (err != noErr)
-		return;
-	
-	// get symbol NewRoutineDescriptor
-	err = FindSymbol(connID, "\pNewRoutineDescriptor", &(Ptr)newRoutineDescriptorProc, &symClass);
-	if (err != noErr)
-		return;
-	
-	// get symbol CallOSTrapUniversalProc
-	err = FindSymbol(connID, "\pCallOSTrapUniversalProc", &(Ptr)gCallOSTrapUniversalProc, &symClass);
-	if (err != noErr)
-		return;
-
-	// get and set trap address for StackSpace (A065)
-	gStackSpacePatchCallThru = getOSTrapAddressProc(0x0065);
-	if (gStackSpacePatchCallThru)
-	{
-		gStackSpacePatchUPP =
-			(StackSpacePatchUPP)newRoutineDescriptorProc((ProcPtr)(StackSpacePatch), uppStackSpaceProcInfo, GetCurrentArchitecture());
-		setOSTrapAddressProc(gStackSpacePatchUPP, 0x0065);
-	}
-
-#if DEBUG
-	StackSpace();
-#endif
-}
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark ENVIRONMENT VARIABLES
-
-
-typedef struct EnvVariable EnvVariable;
-
-struct EnvVariable {
-	char 			*variable;
-	char			*value;
-	EnvVariable		*next;
-};
-
-EnvVariable		*gEnvironmentVariables = NULL;
-
-char *_MD_GetEnv(const char *name)
-{
-	EnvVariable 	*currentVariable = gEnvironmentVariables;
-
-	while (currentVariable) {
-		if (!strcmp(currentVariable->variable, name))
-			return currentVariable->value;
-			
-		currentVariable = currentVariable->next;
-	}
-
-	return getenv(name);
-}
-
-PR_IMPLEMENT(int) 
-_MD_PutEnv(const char *string)
-{
-	EnvVariable 	*currentVariable = gEnvironmentVariables;
-	char			*variableCopy,
-				    *value,
-					*current;
-					
-	variableCopy = strdup(string);
-	PR_ASSERT(variableCopy != NULL);
-
-	current = variableCopy;
-	while (*current != '=')
-		current++;
-
-	*current = 0;
-	current++;
-
-	value = current;
-
-	while (currentVariable) {
-		if (!strcmp(currentVariable->variable, variableCopy))
-			break;
-		
-		currentVariable = currentVariable->next;
-	}
-
-	if (currentVariable == NULL) {
-		currentVariable = PR_NEW(EnvVariable);
-		
-		if (currentVariable == NULL) {
-			PR_DELETE(variableCopy);
-			return -1;
-		}
-		
-		currentVariable->variable = strdup(variableCopy);
-		currentVariable->value = strdup(value);
-		currentVariable->next = gEnvironmentVariables;
-		gEnvironmentVariables = currentVariable;
-	}
-	
-	else {
-		PR_DELETE(currentVariable->value);
-		currentVariable->value = strdup(current);
-
-		/* This is a temporary hack.  Working on a real fix, remove this when done. */
-		/* OK, there are two ways to access the  */
-		/* library path, getenv() and PR_GetLibraryPath().  Take a look at PR_GetLibraryPath(). */
-		/* You'll see that we keep the path in a global which is intialized at startup from */
-		/* a call to getenv().  From then on, they have nothing in common. */
-		/* We need to keep them in synch.  */
-		if (strcmp(currentVariable->variable, "LD_LIBRARY_PATH") == 0)
-			PR_SetLibraryPath(currentVariable->value);
-	}
-	
-	PR_DELETE(variableCopy);
-	return 0;
-}
-
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark MISCELLANEOUS
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(t->md.jb);
-    }
-    *np = sizeof(t->md.jb) / sizeof(PRUint32);
-    return (PRWord*) (t->md.jb);
-}
-
-void _MD_GetRegisters(PRUint32 *to)
-{
-  (void) setjmp((void*) to);
-}
-
-void _MD_EarlyInit()
-{
-	Handle				environmentVariables;
-
-	GetCurrentProcess(&gApplicationProcess);
-
-	INIT_CRITICAL_REGION();
-	InitIdleSemaphore();
-
-#if !defined(MAC_NSPR_STANDALONE)
-	// MacintoshInitializeMemory();  Moved to mdmacmem.c: AllocateRawMemory(Size blockSize)
-#else
-	MacintoshInitializeMemory();
-#endif
-	MacintoshInitializeTime();
-	
-	//	Install resource-controlled environment variables.
-	
-	environmentVariables = GetResource('Envi', 128);
-	if (environmentVariables != NULL) {
-	
-		Size 	resourceSize;
-		char	*currentPutEnvString = (char *)*environmentVariables,
-				*currentScanChar = currentPutEnvString;
-				
-		resourceSize = GetHandleSize(environmentVariables);			
-		DetachResource(environmentVariables);
-		HLock(environmentVariables);
-		
-		while (resourceSize--) {
-		
-			if ((*currentScanChar == '\n') || (*currentScanChar == '\r')) {
-				*currentScanChar = 0;
-				_MD_PutEnv (currentPutEnvString);
-				currentPutEnvString = currentScanChar + 1;
-			}
-		
-			currentScanChar++;
-		
-		}
-		
-		DisposeHandle(environmentVariables);
-
-	}
-
-#ifdef PR_INTERNAL_LOGGING
-	_MD_PutEnv ("NSPR_LOG_MODULES=clock:6,cmon:6,io:6,mon:6,linker:6,cvar:6,sched:6,thread:6");
-#endif
-
-	InstallStackSpacePatch();
-}
-
-void _MD_FinalInit()
-{
-	_MD_InitNetAccess();
-}
-
-void PR_InitMemory(void) {
-#ifndef NSPR_AS_SHARED_LIB
-	//	Needed for Mac browsers without Java.  We don't want them calling PR_INIT, since it
-	//	brings in all of the thread support.  But we do need to allow them to initialize
-	//	the NSPR memory package.
-	//	This should go away when all clients of the NSPR want threads AND memory.
-	MacintoshInitializeMemory();
-#endif
-}
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark TERMINATION
-
-
-//	THIS IS *** VERY *** IMPORTANT... our CFM Termination proc.
-//	This allows us to deactivate our Time Mananger task even
-//	if we are not totally gracefully exited.  If this is not
-//	done then we will randomly crash at later times when the
-//	task is called after the app heap is gone.
-
-#if TARGET_CARBON
-extern OTClientContextPtr	clientContext;
-#define CLOSE_OPEN_TRANSPORT()	CloseOpenTransportInContext(clientContext)
-
-#else
-
-#define CLOSE_OPEN_TRANSPORT()	CloseOpenTransport()
-#endif /* TARGET_CARBON */
-
-extern pascal void __NSTerminate(void);
-
-void CleanupTermProc(void)
-{
-	_MD_StopInterrupts();	// deactive Time Manager task
-
-	CLOSE_OPEN_TRANSPORT();
-	TermIdleSemaphore();
-	TERM_CRITICAL_REGION();
-	
-	__NSTerminate();
-}
-
-
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark STRING OPERATIONS
-
-#if !defined(MAC_NSPR_STANDALONE)
-
-//	PStrFromCStr converts the source C string to a destination
-//	pascal string as it copies. The dest string will
-//	be truncated to fit into an Str255 if necessary.
-//  If the C String pointer is NULL, the pascal string's length is set to zero
-//
-void 
-PStrFromCStr(const char* src, Str255 dst)
-{
-	short 	length  = 0;
-	
-	// handle case of overlapping strings
-	if ( (void*)src == (void*)dst )
-	{
-		unsigned char*		curdst = &dst[1];
-		unsigned char		thisChar;
-				
-		thisChar = *(const unsigned char*)src++;
-		while ( thisChar != '\0' ) 
-		{
-			unsigned char	nextChar;
-			
-			// use nextChar so we don't overwrite what we are about to read
-			nextChar = *(const unsigned char*)src++;
-			*curdst++ = thisChar;
-			thisChar = nextChar;
-			
-			if ( ++length >= 255 )
-				break;
-		}
-	}
-	else if ( src != NULL )
-	{
-		unsigned char*		curdst = &dst[1];
-		short 				overflow = 255;		// count down so test it loop is faster
-		register char		temp;
-	
-		// Can't do the K&R C thing of "while (*s++ = *t++)" because it will copy trailing zero
-		// which might overrun pascal buffer.  Instead we use a temp variable.
-		while ( (temp = *src++) != 0 ) 
-		{
-			*(char*)curdst++ = temp;
-				
-			if ( --overflow <= 0 )
-				break;
-		}
-		length = 255 - overflow;
-	}
-	dst[0] = length;
-}
-
-
-void CStrFromPStr(ConstStr255Param pString, char **cString)
-{
-	// Allocates a cString and copies a Pascal string into it.
-	unsigned int	len;
-	
-	len = pString[0];
-	*cString = malloc(len+1);
-	
-	if (*cString != NULL) {
-		strncpy(*cString, (char *)&pString[1], len);
-		(*cString)[len] = NULL;
-	}
-}
-
-
-void dprintf(const char *format, ...)
-{
-#if DEBUG
-    va_list ap;
-	Str255 buffer;
-	
-	va_start(ap, format);
-	buffer[0] = PR_vsnprintf((char *)buffer + 1, sizeof(buffer) - 1, format, ap);
-	va_end(ap);
-	
-	DebugStr(buffer);
-#endif /* DEBUG */
-}
-
-#else
-
-void debugstr(const char *debuggerMsg)
-{
-	Str255		pStr;
-	
-	PStrFromCStr(debuggerMsg, pStr);
-	DebugStr(pStr);
-}
-
-
-char *strdup(const char *source)
-{
-	char 	*newAllocation;
-	size_t	stringLength;
-
-	PR_ASSERT(source);
-	
-	stringLength = strlen(source) + 1;
-	
-	newAllocation = (char *)PR_MALLOC(stringLength);
-	if (newAllocation == NULL)
-		return NULL;
-	BlockMoveData(source, newAllocation, stringLength);
-	return newAllocation;
-}
-
-//	PStrFromCStr converts the source C string to a destination
-//	pascal string as it copies. The dest string will
-//	be truncated to fit into an Str255 if necessary.
-//  If the C String pointer is NULL, the pascal string's length is set to zero
-//
-void PStrFromCStr(const char* src, Str255 dst)
-{
-	short 	length  = 0;
-	
-	// handle case of overlapping strings
-	if ( (void*)src == (void*)dst )
-	{
-		unsigned char*		curdst = &dst[1];
-		unsigned char		thisChar;
-				
-		thisChar = *(const unsigned char*)src++;
-		while ( thisChar != '\0' ) 
-		{
-			unsigned char	nextChar;
-			
-			// use nextChar so we don't overwrite what we are about to read
-			nextChar = *(const unsigned char*)src++;
-			*curdst++ = thisChar;
-			thisChar = nextChar;
-			
-			if ( ++length >= 255 )
-				break;
-		}
-	}
-	else if ( src != NULL )
-	{
-		unsigned char*		curdst = &dst[1];
-		short 				overflow = 255;		// count down so test it loop is faster
-		register char		temp;
-	
-		// Can't do the K&R C thing of "while (*s++ = *t++)" because it will copy trailing zero
-		// which might overrun pascal buffer.  Instead we use a temp variable.
-		while ( (temp = *src++) != 0 ) 
-		{
-			*(char*)curdst++ = temp;
-				
-			if ( --overflow <= 0 )
-				break;
-		}
-		length = 255 - overflow;
-	}
-	dst[0] = length;
-}
-
-
-void CStrFromPStr(ConstStr255Param pString, char **cString)
-{
-	// Allocates a cString and copies a Pascal string into it.
-	unsigned int	len;
-	
-	len = pString[0];
-	*cString = PR_MALLOC(len+1);
-	
-	if (*cString != NULL) {
-		strncpy(*cString, (char *)&pString[1], len);
-		(*cString)[len] = NULL;
-	}
-}
-
-
-size_t strlen(const char *source)
-{
-	size_t currentLength = 0;
-	
-	if (source == NULL)
-		return currentLength;
-			
-	while (*source++ != '\0')
-		currentLength++;
-		
-	return currentLength;
-}
-
-int strcmpcore(const char *str1, const char *str2, int caseSensitive)
-{
-	char 	currentChar1, currentChar2;
-
-	while (1) {
-	
-		currentChar1 = *str1;
-		currentChar2 = *str2;
-		
-		if (!caseSensitive) {
-			
-			if ((currentChar1 >= 'a') && (currentChar1 <= 'z'))
-				currentChar1 += ('A' - 'a');
-		
-			if ((currentChar2 >= 'a') && (currentChar2 <= 'z'))
-				currentChar2 += ('A' - 'a');
-		
-		}
-	
-		if (currentChar1 == '\0')
-			break;
-	
-		if (currentChar1 != currentChar2)
-			return currentChar1 - currentChar2;
-			
-		str1++;
-		str2++;
-	
-	}
-	
-	return currentChar1 - currentChar2;
-}
-
-int strcmp(const char *str1, const char *str2)
-{
-	return strcmpcore(str1, str2, true);
-}
-
-int strcasecmp(const char *str1, const char *str2)
-{
-	return strcmpcore(str1, str2, false);
-}
-
-
-void *memcpy(void *to, const void *from, size_t size)
-{
-	if (size != 0) {
-#if DEBUG
-		if ((UInt32)to < 0x1000)
-			DebugStr("\pmemcpy has illegal to argument");
-		if ((UInt32)from < 0x1000)
-			DebugStr("\pmemcpy has illegal from argument");
-#endif
-		BlockMoveData(from, to, size);
-	}
-	return to;
-}
-
-void dprintf(const char *format, ...)
-{
-    va_list ap;
-	char	*buffer;
-	
-	va_start(ap, format);
-	buffer = (char *)PR_vsmprintf(format, ap);
-	va_end(ap);
-	
-	debugstr(buffer);
-	PR_DELETE(buffer);
-}
-
-void
-exit(int result)
-{
-#pragma unused (result)
-
-		ExitToShell();
-}
-
-void abort(void)
-{
-	exit(-1);
-}
-
-#endif
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark FLUSHING THE GARBAGE COLLECTOR
-
-#if !defined(MAC_NSPR_STANDALONE)
-
-unsigned char GarbageCollectorCacheFlusher(PRUint32)
-{
-
-    PRIntn is;
-
-	UInt32		oldPriority;
-
-	//	If java wasn't completely initialized, then bail 
-	//	harmlessly.
-	
-	if (PR_GetGCInfo()->lock == NULL)
-		return false;
-
-#if DEBUG
-	if (_MD_GET_INTSOFF() == 1)
-		DebugStr("\pGarbageCollectorCacheFlusher at interrupt time!");
-#endif
-
-	//	The synchronization here is very tricky.  We really
-	//	don't want any other threads to run while we are 
-	//	cleaning up the gc heap... they could call malloc,
-	//	and then we would be in trouble in a big way.  So,
-	//	we jack up our priority and that of the finalizer
-	//	so that we won't yield to other threads.
-	//	dkc 5/17/96
-
-	oldPriority = PR_GetThreadPriority(PR_GetCurrentThread());
-	_PR_INTSOFF(is);
-	_PR_SetThreadPriority(PR_GetCurrentThread(), (PRThreadPriority)30);
-	_PR_INTSON(is);
-
-	//	Garbage collect twice.  This will finalize any
-	//	dangling AWT resources (images, components), and
-	//	then free up their GC space, too.
-	//	dkc 2/15/96
-	//  interrupts must be on during PR_GC
-	
-	PR_GC();
-	
-	//	By setting the finalizer priority to 31, then we 
-	//	ensure it will run before us.  When it finishes
-	//	its list of finalizations, it returns to us
-	//	for the second garbage collection.
-	
-	PR_Yield();
-
-	PR_GC();
-	
-	//	Restore our old priorities.
-	
-	_PR_INTSOFF(is);
-	_PR_SetThreadPriority(PR_GetCurrentThread(), (PRThreadPriority)oldPriority);
-	_PR_INTSON(is);
-
-	return false;
-}
-
-#endif
-
-//##############################################################################
-//##############################################################################
-#pragma mark -
-#pragma mark MISCELLANEOUS-HACKS
-
-
-//
-//		***** HACK  FIX THESE ****
-//
-extern long _MD_GetOSName(char *buf, long count)
-{
-	long	len;
-	
-	len = PR_snprintf(buf, count, "Mac OS");
-	
-	return 0;
-}
-
-extern long _MD_GetOSVersion(char *buf, long count)
-{
-	long	len;
-	
-	len = PR_snprintf(buf, count, "7.5");
-
-	return 0;
-}
-
-extern long _MD_GetArchitecture(char *buf, long count)
-{
-	long	len;
-	
-#if defined(TARGET_CPU_PPC) && TARGET_CPU_PPC	
-	len = PR_snprintf(buf, count, "PowerPC");
-#else
-	len = PR_snprintf(buf, count, "Motorola68k");
-#endif
-
-	return 0;
-}
diff --git a/libs/js/nsprpub/pr/src/md/mac/mdmac.h b/libs/js/nsprpub/pr/src/md/mac/mdmac.h
deleted file mode 100644
index ad8c3c4d17..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/mdmac.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef mdmac_h__
-#define mdmac_h__
-
-
-PR_BEGIN_EXTERN_C
-
-void PStrFromCStr(const char* src, Str255 dst);
-void CStrFromPStr(ConstStr255Param pString, char **cString);
-
-PR_END_EXTERN_C
-
-
-#endif /* mdmac_h__ */
diff --git a/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h b/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h
deleted file mode 100644
index 17d665c65d..0000000000
--- a/libs/js/nsprpub/pr/src/md/mac/prcpucfg.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_MAC
-#define XP_MAC
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define	HAVE_LONG_LONG
-
-#define PR_AF_INET6 30  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1L
-#define PR_BYTES_PER_SHORT  2L
-#define PR_BYTES_PER_INT    4L
-#define PR_BYTES_PER_INT64  8L
-#define PR_BYTES_PER_LONG   4L
-#define PR_BYTES_PER_FLOAT  4L
-#define PR_BYTES_PER_DOUBLE 8L
-#define PR_BYTES_PER_WORD   4L
-#define PR_BYTES_PER_DWORD  8L
-
-#define PR_BITS_PER_BYTE    8L
-#define PR_BITS_PER_SHORT   16L
-#define PR_BITS_PER_INT     32L
-#define PR_BITS_PER_INT64   64L
-#define PR_BITS_PER_LONG    32L
-#define PR_BITS_PER_FLOAT   32L
-#define PR_BITS_PER_DOUBLE  64L
-#define PR_BITS_PER_WORD    32L
-
-#define PR_BITS_PER_BYTE_LOG2   3L
-#define PR_BITS_PER_SHORT_LOG2  4L
-#define PR_BITS_PER_INT_LOG2    5L
-#define PR_BITS_PER_INT64_LOG2  6L
-#define PR_BITS_PER_LONG_LOG2   5L
-#define PR_BITS_PER_FLOAT_LOG2  5L
-#define PR_BITS_PER_DOUBLE_LOG2 6L
-#define PR_BITS_PER_WORD_LOG2   5L
-
-#define PR_ALIGN_OF_SHORT   2L
-#define PR_ALIGN_OF_INT     4L
-#define PR_ALIGN_OF_LONG    4L
-#define PR_ALIGN_OF_INT64   2L
-#define PR_ALIGN_OF_FLOAT   4L
-#define PR_ALIGN_OF_DOUBLE  4L
-#define PR_ALIGN_OF_POINTER 4L
-#define PR_ALIGN_OF_WORD    4L
-
-#define PR_BYTES_PER_WORD_LOG2   2L
-#define PR_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#ifndef NO_NSPR_10_SUPPORT
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2		PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/libs/js/nsprpub/pr/src/md/os2/.cvsignore b/libs/js/nsprpub/pr/src/md/os2/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/md/os2/Makefile.in b/libs/js/nsprpub/pr/src/md/os2/Makefile.in
deleted file mode 100644
index 299cf6628a..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), OS2)
-CSRCS = \
-    os2misc.c \
-    os2sem.c   \
-    os2inrval.c \
-    os2gc.c \
-    os2thred.c \
-    os2io.c \
-    os2cv.c \
-    os2sock.c \
-    os2_errors.c \
-    os2poll.c \
-    os2rng.c \
-    $(NULL)
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-ASFILES = os2vacpp.asm
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),EMX)
-ASFILES = os2emx.s os2vaclegacy.s
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
-
-
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/objs.mk b/libs/js/nsprpub/pr/src/md/os2/objs.mk
deleted file mode 100644
index 008c252557..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/objs.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# This makefile appends to the variable OBJS the platform-dependent
-# object modules that will be part of the nspr20 library.
-
-CSRCS = \
-	os2io.c      \
-	os2sock.c    \
-	os2thred.c   \
-	os2cv.c      \
-	os2gc.c      \
-	os2misc.c    \
-	os2inrval.c  \
-	os2sem.c     \
-	os2_errors.c \
-	os2poll.c    \
-	os2rng.c     \
-	$(NULL)
-
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-ASFILES = os2vacpp.asm
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),EMX)
-ASFILES = os2emx.s os2vaclegacy.s
-endif
-
-OBJS += $(addprefix md/os2/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)))  \
-	$(addprefix md/os2/$(OBJDIR)/,$(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX)))
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2_errors.c b/libs/js/nsprpub/pr/src/md/os2/os2_errors.c
deleted file mode 100644
index 59784d0ca7..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2_errors.c
+++ /dev/null
@@ -1,1129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prerror.h"
-#include "primpl.h"
-
-void _MD_os2_map_default_error(PRInt32 err)
-{
-	switch (err) {
-		case EWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case EMSGSIZE:
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-void _MD_os2_map_opendir_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_FILE_NOT_FOUND:
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-      case ERROR_INVALID_ADDRESS:
-      case ERROR_INVALID_ACCESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-      case ERROR_INVALID_NAME:
-      case ERROR_INVALID_PARAMETER:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-      case ERROR_TOO_MANY_OPEN_FILES:
-		case ERROR_NOT_DOS_DISK:
-		case ERROR_NOT_READY:
-		case ERROR_OPEN_FAILED:
-      case ERROR_PATH_BUSY:
-      case ERROR_CANNOT_MAKE:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-      case ERROR_DRIVE_LOCKED:
-      case ERROR_DEVICE_IN_USE:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_SHARING_BUFFER_EXCEEDED:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_closedir_error(PRInt32 err)
-{
-	switch (err) {
-      case ERROR_FILE_NOT_FOUND:
-      case ERROR_ACCESS_DENIED:
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_readdir_error(PRInt32 err)
-{
-
-	switch (err) {
-		case ERROR_NO_MORE_FILES:
-			PR_SetError(PR_NO_MORE_FILES_ERROR, err);
-			break;
-		case ERROR_FILE_NOT_FOUND:
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_DOS_DISK:
-		case ERROR_LOCK_VIOLATION:
-		case ERROR_BROKEN_PIPE:
-		case ERROR_NOT_READY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-      case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_delete_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_FILE_NOT_FOUND:
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-		case ERROR_SHARING_VIOLATION:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-/* The error code for stat() is in errno. */
-void _MD_os2_map_stat_error(PRInt32 err)
-{
-    switch (err) {
-        case ENOENT:
-            PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-            break;
-        case EACCES:
-            PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-            break;
-        default:
-            PR_SetError(PR_UNKNOWN_ERROR, err);
-    }
-}
-
-void _MD_os2_map_fstat_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_rename_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_FILE_NOT_FOUND:
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_INVALID_NAME:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_ALREADY_EXISTS:
-		case ERROR_FILE_EXISTS:
-			PR_SetError(PR_FILE_EXISTS_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-/* The error code for access() is in errno. */
-void _MD_os2_map_access_error(PRInt32 err)
-{
-    switch (err) {
-        case ENOENT:
-            PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-            break;
-        case EACCES:
-            PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-            break;
-        default:
-            PR_SetError(PR_UNKNOWN_ERROR, err);
-    }
-}
-
-void _MD_os2_map_mkdir_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ALREADY_EXISTS:
-		case ERROR_FILE_EXISTS:
-			PR_SetError(PR_FILE_EXISTS_ERROR, err);
-			break;
-		case ERROR_FILE_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_INVALID_NAME:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_TOO_MANY_OPEN_FILES:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DISK_FULL:
-		case ERROR_HANDLE_DISK_FULL:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_rmdir_error(PRInt32 err)
-{
-
-	switch (err) {
-		case ERROR_FILE_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_INVALID_NAME:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_TOO_MANY_OPEN_FILES:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_read_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-		case ERROR_SHARING_VIOLATION:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break; 
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_transmitfile_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-		case ERROR_SHARING_VIOLATION:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_TOO_MANY_OPEN_FILES:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_write_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ACCESS_DENIED:
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-		case ERROR_SHARING_VIOLATION:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-		case ERROR_DISK_FULL:
-      case ERROR_HANDLE_DISK_FULL:
-      case ENOSPC:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case EMSGSIZE:
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_lseek_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_SEEK_ON_DEVICE:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_fsync_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ACCESS_DENIED:
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DISK_FULL:
-		case ERROR_HANDLE_DISK_FULL:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_close_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_INVALID_HANDLE:
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_socket_error(PRInt32 err)
-{
-	switch (err) {
-		case EPROTONOSUPPORT:
-			PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_recv_error(PRInt32 err)
-{
-	switch (err) {
-		case EWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_recvfrom_error(PRInt32 err)
-{
-	switch (err) {
-		case EWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_send_error(PRInt32 err)
-{
-	switch (err) {
-		case EWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case EMSGSIZE:
-		case EINVAL:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case EISCONN:
-			PR_SetError(PR_IS_CONNECTED_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ERROR_NETNAME_DELETED:
-			PR_SetError(PR_CONNECT_RESET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_sendto_error(PRInt32 err)
-{
-  _MD_os2_map_default_error(err);
-}
-
-void _MD_os2_map_writev_error(int err)
-{
-  _MD_os2_map_default_error(err);
-}
-
-void _MD_os2_map_accept_error(PRInt32 err)
-{
-  _MD_os2_map_default_error(err);
-}
-
-void _MD_os2_map_acceptex_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-/*
- * An error code of 0 means that the nonblocking connect succeeded.
- */
-
-int _MD_os2_get_nonblocking_connect_error(int osfd)
-{
-    int err;
-    int len = sizeof(err);
-    if (getsockopt(osfd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) {
-        return sock_errno();
-    } else {
-        return err;
-    }
-}
-
-void _MD_os2_map_connect_error(PRInt32 err)
-{
-	switch (err) {
-       case EWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-        case EINPROGRESS:
-			PR_SetError(PR_IN_PROGRESS_ERROR, err);
-			break;
-		case EALREADY:
-		case EINVAL:
-			PR_SetError(PR_ALREADY_INITIATED_ERROR, err);
-			break;
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case EADDRNOTAVAIL:
-			PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case EAFNOSUPPORT:
-			PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-			break;
-		case ETIMEDOUT:
-			PR_SetError(PR_IO_TIMEOUT_ERROR, err);
-			break;
-		case ECONNREFUSED:
-			PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-			break;
-		case ENETUNREACH:
-			PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, err);
-			break;
-		case EADDRINUSE:
-			PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-			break;
-      case EISCONN:
-         PR_SetError(PR_IS_CONNECTED_ERROR, err);
-         break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_bind_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case EADDRNOTAVAIL:
-			PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-			break;
-		case EADDRINUSE:
-			PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-			break;
-		case EACCES:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case EINVAL:
-			PR_SetError(PR_SOCKET_ADDRESS_IS_BOUND_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_listen_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case EOPNOTSUPP:
-			PR_SetError(PR_NOT_TCP_SOCKET_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_shutdown_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case ENOTCONN:
-			PR_SetError(PR_NOT_CONNECTED_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-#ifndef XP_OS2_VACPP
-void _MD_os2_map_socketpair_error(PRInt32 err)
-{
-  switch (err) {
-    case ENOMEM:
-      PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-      break;
-    case EAFNOSUPPORT:
-      PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-      break;
-    case EPROTONOSUPPORT:
-      PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-      break;
-    case EOPNOTSUPP:
-      PR_SetError(PR_NOT_TCP_SOCKET_ERROR, err);
-      break;
-    case EPROTOTYPE:
-      PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-      break;
-    default:
-      _MD_os2_map_default_error(err);
-      return;
-  }
-}
-#endif
-
-void _MD_os2_map_getsockname_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_getpeername_error(PRInt32 err)
-{
-
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case ENOTCONN:
-			PR_SetError(PR_NOT_CONNECTED_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ENOBUFS:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_getsockopt_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case ENOPROTOOPT:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case EINVAL:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_setsockopt_error(PRInt32 err)
-{
-	switch (err) {
-		case EBADF:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ENOTSOCK:
-			PR_SetError(PR_NOT_SOCKET_ERROR, err);
-			break;
-		case ENOPROTOOPT:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case EINVAL:
-			PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_open_error(PRInt32 err)
-{
-	switch (err) {
-		case ERROR_ALREADY_EXISTS:
-		case ERROR_FILE_EXISTS:
-			PR_SetError(PR_FILE_EXISTS_ERROR, err);
-			break;
-		case ERROR_FILE_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_INVALID_NAME:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-			break;
-		case ERROR_NOT_READY:
-		case ERROR_OPEN_FAILED:
-		case ERROR_PATH_BUSY:
-			PR_SetError(PR_IO_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_FILENAME_EXCED_RANGE:
-			PR_SetError(PR_NAME_TOO_LONG_ERROR, err);
-			break;
-		case ERROR_TOO_MANY_OPEN_FILES:
-			PR_SetError(PR_SYS_DESC_TABLE_FULL_ERROR, err);
-			break;
-		case ERROR_PATH_NOT_FOUND:
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		case ERROR_DISK_FULL:
-		case ERROR_HANDLE_DISK_FULL:
-			PR_SetError(PR_NO_DEVICE_SPACE_ERROR, err);
-			break;
-		case ERROR_WRITE_PROTECT:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-	}
-}
-
-void _MD_os2_map_gethostname_error(PRInt32 err)
-{
-    switch (err) {
-#ifdef SOCEFAULT
-		case SOCEFAULT:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-#endif
-		case ENETDOWN:
-		case EINPROGRESS:
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
-
-void _MD_os2_map_select_error(PRInt32 err)
-{
-    PRErrorCode prerror;
-
-    switch (err) {
-        /*
-         * OS/2 select() only works on sockets.  So in this
-         * context, ENOTSOCK is equivalent to EBADF on Unix.
-         */
-        case ENOTSOCK:
-            prerror = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        case EINVAL:
-            prerror = PR_INVALID_ARGUMENT_ERROR;
-            break;
-#ifdef SOCEFAULT
-        case SOCEFAULT:
-            prerror = PR_ACCESS_FAULT_ERROR;
-            break;
-#endif
-        default:
-            prerror = PR_UNKNOWN_ERROR;
-    }
-    PR_SetError(prerror, err);
-}
-
-void _MD_os2_map_lockf_error(PRInt32 err)
-{
-    switch (err) {
-		case ERROR_ACCESS_DENIED:
-			PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-			break;
-		case ERROR_INVALID_HANDLE:
-			PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-			break;
-		case ERROR_INVALID_ADDRESS:
-			PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-			break;
-		case ERROR_DRIVE_LOCKED:
-		case ERROR_LOCKED:
-		case ERROR_SHARING_VIOLATION:
-			PR_SetError(PR_FILE_IS_LOCKED_ERROR, err);
-			break;
-		case ERROR_NOT_ENOUGH_MEMORY:
-		case ERROR_MORE_DATA:
-			PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-			break;
-		default:
-			PR_SetError(PR_UNKNOWN_ERROR, err);
-			break;
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2cv.c b/libs/js/nsprpub/pr/src/md/os2/os2cv.c
deleted file mode 100644
index b9da838ef0..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2cv.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *  os2cv.c -- OS/2 Machine-Dependent Code for Condition Variables
- *
- *  We implement our own condition variable wait queue.  Each thread
- *  has a semaphore object (thread->md.blocked_sema) to block on while
- *  waiting on a condition variable.
- *
- *  We use a deferred condition notify algorithm.  When PR_NotifyCondVar
- *  or PR_NotifyAllCondVar is called, the condition notifies are simply
- *  recorded in the _MDLock structure.  We defer the condition notifies
- *  until right after we unlock the lock.  This way the awakened threads
- *  have a better chance to reaquire the lock.
- */
- 
-#include "primpl.h"
-
-#ifdef USE_RAMSEM
-ULONG _Far16 _Pascal Dos16GetInfoSeg(PSEL pselGlobal, PSEL pselLocal);
-
-#ifdef XP_OS2_EMX
-typedef unsigned short BOOL16;
-#endif
-
-typedef struct _LINFOSEG
-{
-    USHORT  pidCurrent;
-    USHORT  pidParent;
-    USHORT  prtyCurrent;
-    USHORT  tidCurrent;
-    USHORT  sgCurrent;
-    UCHAR   rfProcStatus;
-    UCHAR   dummy1;
-    BOOL16  fForeground;
-    UCHAR   typProcess;
-    UCHAR   dummy2;
-    SEL     selEnvironment;
-    USHORT  offCmdLine;
-    USHORT  cbDataSegment;
-    USHORT  cbStack;
-    USHORT  cbHeap;
-    USHORT  hmod;
-    SEL     selDS;
-    SEL     selPack;
-    SEL     selPackShr;
-    SEL     selPackPck;
-    ULONG   ulReserved;
-} LINFOSEG;
-typedef LINFOSEG FAR *PLINFOSEG;
-
-PLINFOSEG plisCurrent = NULL;
-#endif
-
-/*
- * AddThreadToCVWaitQueueInternal --
- *
- * Add the thread to the end of the condition variable's wait queue.
- * The CV's lock must be locked when this function is called.
- */
-
-static void
-AddThreadToCVWaitQueueInternal(PRThread *thred, struct _MDCVar *cv)
-{
-    PR_ASSERT((cv->waitTail != NULL && cv->waitHead != NULL)
-            || (cv->waitTail == NULL && cv->waitHead == NULL));
-    cv->nwait += 1;
-    thred->md.inCVWaitQueue = PR_TRUE;
-    thred->md.next = NULL;
-    thred->md.prev = cv->waitTail;
-    if (cv->waitHead == NULL) {
-        cv->waitHead = thred;
-    } else {
-        cv->waitTail->md.next = thred;
-    }
-    cv->waitTail = thred;
-}
-
-/*
- * md_UnlockAndPostNotifies --
- *
- * Unlock the lock, and then do the deferred condition notifies.
- * If waitThred and waitCV are not NULL, waitThred is added to
- * the wait queue of waitCV before the lock is unlocked.
- *
- * This function is called by _PR_MD_WAIT_CV and _PR_MD_UNLOCK,
- * the two places where a lock is unlocked.
- */
-void
-md_UnlockAndPostNotifies(
-    _MDLock *lock,
-    PRThread *waitThred,
-    _MDCVar *waitCV)
-{
-    PRIntn index;
-    _MDNotified post;
-    _MDNotified *notified, *prev = NULL;
-
-    /*
-     * Time to actually notify any conditions that were affected
-     * while the lock was held.  Get a copy of the list that's in
-     * the lock structure and then zero the original.  If it's
-     * linked to other such structures, we own that storage.
-     */
-    post = lock->notified;  /* a safe copy; we own the lock */
-
-#if defined(DEBUG)
-    memset(&lock->notified, 0, sizeof(_MDNotified));  /* reset */
-#else
-    lock->notified.length = 0;  /* these are really sufficient */
-    lock->notified.link = NULL;
-#endif
-
-    /* 
-     * Figure out how many threads we need to wake up.
-     */
-    notified = &post;  /* this is where we start */
-    do {
-        for (index = 0; index < notified->length; ++index) {
-            _MDCVar *cv = notified->cv[index].cv;
-            PRThread *thred;
-            int i;
-            
-            /* Fast special case: no waiting threads */
-            if (cv->waitHead == NULL) {
-                notified->cv[index].notifyHead = NULL;
-                continue;
-            }
-
-            /* General case */
-            if (-1 == notified->cv[index].times) {
-                /* broadcast */
-                thred = cv->waitHead;
-                while (thred != NULL) {
-                    thred->md.inCVWaitQueue = PR_FALSE;
-                    thred = thred->md.next;
-                }
-                notified->cv[index].notifyHead = cv->waitHead;
-                cv->waitHead = cv->waitTail = NULL;
-                cv->nwait = 0;
-            } else {
-                thred = cv->waitHead;
-                i = notified->cv[index].times;
-                while (thred != NULL && i > 0) {
-                    thred->md.inCVWaitQueue = PR_FALSE;
-                    thred = thred->md.next;
-                    i--;
-                }
-                notified->cv[index].notifyHead = cv->waitHead;
-                cv->waitHead = thred;
-                if (cv->waitHead == NULL) {
-                    cv->waitTail = NULL;
-                } else {
-                    if (cv->waitHead->md.prev != NULL) {
-                        cv->waitHead->md.prev->md.next = NULL;
-                        cv->waitHead->md.prev = NULL;
-                    }
-                }
-                cv->nwait -= notified->cv[index].times - i;
-            }
-        }
-        notified = notified->link;
-    } while (NULL != notified);
-
-    if (waitThred) {
-        AddThreadToCVWaitQueueInternal(waitThred, waitCV);
-    }
-
-    /* Release the lock before notifying */
-#ifdef USE_RAMSEM
-      SemReleasex86(&lock->mutex, 0);
-#else
-      DosReleaseMutexSem(lock->mutex);
-#endif
-
-    notified = &post;  /* this is where we start */
-    do {
-        for (index = 0; index < notified->length; ++index) {
-            PRThread *thred;
-            PRThread *next;
-
-            thred = notified->cv[index].notifyHead;
-            while (thred != NULL) {
-                BOOL rv;
-
-                next = thred->md.next;
-                thred->md.prev = thred->md.next = NULL;
-                rv = DosPostEventSem(thred->md.blocked_sema);
-                PR_ASSERT(rv == NO_ERROR);
-                thred = next;
-            }
-        }
-        prev = notified;
-        notified = notified->link;
-        if (&post != prev) PR_DELETE(prev);
-    } while (NULL != notified);
-}
-
-/*
- * Notifies just get posted to the protecting mutex.  The
- * actual notification is done when the lock is released so that
- * MP systems don't contend for a lock that they can't have.
- */
-static void md_PostNotifyToCvar(_MDCVar *cvar, _MDLock *lock,
-        PRBool broadcast)
-{
-    PRIntn index = 0;
-    _MDNotified *notified = &lock->notified;
-
-    while (1) {
-        for (index = 0; index < notified->length; ++index) {
-            if (notified->cv[index].cv == cvar) {
-                if (broadcast) {
-                    notified->cv[index].times = -1;
-                } else if (-1 != notified->cv[index].times) {
-                    notified->cv[index].times += 1;
-                }
-                return;
-            }
-        }
-        /* if not full, enter new CV in this array */
-        if (notified->length < _MD_CV_NOTIFIED_LENGTH) break;
-
-        /* if there's no link, create an empty array and link it */
-        if (NULL == notified->link) {
-            notified->link = PR_NEWZAP(_MDNotified);
-        }
-
-        notified = notified->link;
-    }
-
-    /* A brand new entry in the array */
-    notified->cv[index].times = (broadcast) ? -1 : 1;
-    notified->cv[index].cv = cvar;
-    notified->length += 1;
-}
-
-/*
- * _PR_MD_NEW_CV() -- Creating new condition variable
- * ... Solaris uses cond_init() in similar function.
- *
- * returns: -1 on failure
- *          0 when it succeeds.
- *
- */
-PRInt32
-_PR_MD_NEW_CV(_MDCVar *cv)
-{
-    cv->magic = _MD_MAGIC_CV;
-    /*
-     * The waitHead, waitTail, and nwait fields are zeroed
-     * when the PRCondVar structure is created.
-     */
-    return 0;
-} 
-
-void _PR_MD_FREE_CV(_MDCVar *cv)
-{
-    cv->magic = (PRUint32)-1;
-    return;
-}
-
-/*
- *  _PR_MD_WAIT_CV() -- Wait on condition variable
- */
-void
-_PR_MD_WAIT_CV(_MDCVar *cv, _MDLock *lock, PRIntervalTime timeout )
-{
-    PRThread *thred = _PR_MD_CURRENT_THREAD();
-    ULONG rv, count;
-    ULONG msecs = (timeout == PR_INTERVAL_NO_TIMEOUT) ?
-            SEM_INDEFINITE_WAIT : PR_IntervalToMilliseconds(timeout);
-
-    /*
-     * If we have pending notifies, post them now.
-     */
-    if (0 != lock->notified.length) {
-        md_UnlockAndPostNotifies(lock, thred, cv);
-    } else {
-        AddThreadToCVWaitQueueInternal(thred, cv);
-#ifdef USE_RAMSEM
-        SemReleasex86( &lock->mutex, 0 );
-#else
-        DosReleaseMutexSem(lock->mutex); 
-#endif
-    }
-
-    /* Wait for notification or timeout; don't really care which */
-    rv = DosWaitEventSem(thred->md.blocked_sema, msecs);
-    if (rv == NO_ERROR) {
-        DosResetEventSem(thred->md.blocked_sema, &count);
-    }
-
-#ifdef USE_RAMSEM
-    SemRequest486(&(lock->mutex), -1);
-#else
-    DosRequestMutexSem((lock->mutex), SEM_INDEFINITE_WAIT);
-#endif
-
-    PR_ASSERT(rv == NO_ERROR || rv == ERROR_TIMEOUT);
-
-    if(rv == ERROR_TIMEOUT)
-    {
-       if (thred->md.inCVWaitQueue) {
-           PR_ASSERT((cv->waitTail != NULL && cv->waitHead != NULL)
-                   || (cv->waitTail == NULL && cv->waitHead == NULL));
-           cv->nwait -= 1;
-           thred->md.inCVWaitQueue = PR_FALSE;
-           if (cv->waitHead == thred) {
-               cv->waitHead = thred->md.next;
-               if (cv->waitHead == NULL) {
-                   cv->waitTail = NULL;
-               } else {
-                   cv->waitHead->md.prev = NULL;
-               }
-           } else {
-               PR_ASSERT(thred->md.prev != NULL);
-               thred->md.prev->md.next = thred->md.next;
-               if (thred->md.next != NULL) {
-                   thred->md.next->md.prev = thred->md.prev;
-               } else {
-                   PR_ASSERT(cv->waitTail == thred);
-                   cv->waitTail = thred->md.prev;
-               }
-           }
-           thred->md.next = thred->md.prev = NULL;
-       } else {
-           /*
-            * This thread must have been notified, but the
-            * SemRelease call happens after SemRequest
-            * times out.  Wait on the semaphore again to make it
-            * non-signaled.  We assume this wait won't take long.
-            */
-           rv = DosWaitEventSem(thred->md.blocked_sema, SEM_INDEFINITE_WAIT);
-           if (rv == NO_ERROR) {
-               DosResetEventSem(thred->md.blocked_sema, &count);
-           }
-           PR_ASSERT(rv == NO_ERROR);
-       }
-    }
-    PR_ASSERT(thred->md.inCVWaitQueue == PR_FALSE);
-    return;
-} /* --- end _PR_MD_WAIT_CV() --- */
-
-void
-_PR_MD_NOTIFY_CV(_MDCVar *cv, _MDLock *lock)
-{
-    md_PostNotifyToCvar(cv, lock, PR_FALSE);
-    return;
-}
-
-PRStatus
-_PR_MD_NEW_LOCK(_MDLock *lock)
-{
-#ifdef USE_RAMSEM
-    // It's better if this API traps when pCriticalSect is not a valid
-    // pointer, because we can't return an error code and if we just return
-    // the API caller will have nasty bugs that are hard to find.
-   
-    PRAMSEM pramsem = (PRAMSEM)(&(lock->mutex));
-    /* First time, set up addresses of processor specific functions
-     */
-    if (plisCurrent == NULL)
-    {
-        SEL selGlobal = 0, selLocal = 0;
-   
-        /* Convert 16 bit global information segment to 32 bit address
-         * by performing CRMA on the 16 bit address: "shift" operation
-         * to convert sel to flat, "and" operation to mask the address
-         * to 32-bit
-         */
-        Dos16GetInfoSeg(&selGlobal, &selLocal);
-        plisCurrent = (PLINFOSEG)(((ULONG)selLocal << 13) &
-                      (ULONG)0x1fff0000);
-   
-    }
-   
-    memset(pramsem, 0, sizeof(pramsem));
-    DosCreateEventSem(0, &pramsem->hevSem, DC_SEM_SHARED, 0);
-   
-    lock->notified.length=0;
-    lock->notified.link=NULL;
-    return PR_SUCCESS;
-#else
-    DosCreateMutexSem(0, &(lock->mutex), 0, 0);
-    (lock)->notified.length=0;
-    (lock)->notified.link=NULL;
-    return PR_SUCCESS;
-#endif
-}
-
-void
-_PR_MD_NOTIFYALL_CV(_MDCVar *cv, _MDLock *lock)
-{
-    md_PostNotifyToCvar(cv, lock, PR_TRUE);
-    return;
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2emx.s b/libs/js/nsprpub/pr/src/md/os2/os2emx.s
deleted file mode 100644
index 90bf2315e2..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2emx.s
+++ /dev/null
@@ -1,110 +0,0 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/ 
-/ The contents of this file are subject to the Mozilla Public
-/ License Version 1.1 (the "License"); you may not use this file
-/ except in compliance with the License. You may obtain a copy of
-/ the License at http://www.mozilla.org/MPL/
-/ 
-/ Software distributed under the License is distributed on an "AS
-/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-/ implied. See the License for the specific language governing
-/ rights and limitations under the License.
-/ 
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/ 
-/ The Initial Developer of the Original Code is Netscape
-/ Communications Corporation.  Portions created by Netscape are 
-/ Copyright (C) 2000 Netscape Communications Corporation.  All
-/ Rights Reserved.
-/ 
-/ Contributor(s):
-/ 
-/ Alternatively, the contents of this file may be used under the
-/ terms of the GNU General Public License Version 2 or later (the
-/ "GPL"), in which case the provisions of the GPL are applicable 
-/ instead of those above.  If you wish to allow use of your 
-/ version of this file only under the terms of the GPL and not to
-/ allow others to use your version of this file under the MPL,
-/ indicate your decision by deleting the provisions above and
-/ replace them with the notice and other provisions required by
-/ the GPL.  If you do not delete the provisions above, a recipient
-/ may use your version of this file under either the MPL or the
-/ GPL.
-/ 
-
-/ PRInt32 __PR_MD_ATOMIC_INCREMENT(PRInt32 *val)
-/
-/ Atomically increment the integer pointed to by 'val' and return
-/ the result of the increment.
-/
-    .text
-    .globl __PR_MD_ATOMIC_INCREMENT
-    .align 4
-__PR_MD_ATOMIC_INCREMENT:
-    movl 4(%esp), %ecx
-    movl $1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    incl %eax
-    ret
-
-/ PRInt32 __PR_MD_ATOMIC_DECREMENT(PRInt32 *val)
-/
-/ Atomically decrement the integer pointed to by 'val' and return
-/ the result of the decrement.
-/
-    .text
-    .globl __PR_MD_ATOMIC_DECREMENT
-    .align 4
-__PR_MD_ATOMIC_DECREMENT:
-    movl 4(%esp), %ecx
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    decl %eax
-    ret
-
-/ PRInt32 __PR_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-/
-/ Atomically set the integer pointed to by 'val' to the new
-/ value 'newval' and return the old value.
-/
-/ An alternative implementation:
-/   .text
-/   .globl __PR_MD_ATOMIC_SET
-/   .align 4
-/__PR_MD_ATOMIC_SET:
-/   movl 4(%esp), %ecx
-/   movl 8(%esp), %edx
-/   movl (%ecx), %eax
-/retry:
-/   lock
-/   cmpxchgl %edx, (%ecx)
-/   jne retry
-/   ret
-/
-    .text
-    .globl __PR_MD_ATOMIC_SET
-    .align 4
-__PR_MD_ATOMIC_SET:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    xchgl %eax, (%ecx)
-    ret
-
-/ PRInt32 __PR_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-/
-/ Atomically add 'val' to the integer pointed to by 'ptr'
-/ and return the result of the addition.
-/
-    .text
-    .globl __PR_MD_ATOMIC_ADD
-    .align 4
-__PR_MD_ATOMIC_ADD:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    movl %eax, %edx
-    lock
-    xaddl %eax, (%ecx)
-    addl %edx, %eax
-    ret
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2gc.c b/libs/js/nsprpub/pr/src/md/os2/os2gc.c
deleted file mode 100644
index d9f7646686..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2gc.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * GC related routines
- *
- */
-#include "primpl.h"
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) 
-{
-    CONTEXTRECORD context;
-    context.ContextFlags = CONTEXT_INTEGER;
-
-    if (_PR_IS_NATIVE_THREAD(t)) {
-        context.ContextFlags |= CONTEXT_CONTROL;
-        if (QueryThreadContext(t->md.handle, CONTEXT_CONTROL, &context)) {
-            t->md.gcContext[0] = context.ctx_RegEax;
-            t->md.gcContext[1] = context.ctx_RegEbx;
-            t->md.gcContext[2] = context.ctx_RegEcx;
-            t->md.gcContext[3] = context.ctx_RegEdx;
-            t->md.gcContext[4] = context.ctx_RegEsi;
-            t->md.gcContext[5] = context.ctx_RegEdi;
-            t->md.gcContext[6] = context.ctx_RegEsp;
-            t->md.gcContext[7] = context.ctx_RegEbp;
-            *np = PR_NUM_GCREGS;
-        } else {
-            PR_ASSERT(0);/* XXX */
-        }
-    }
-    return (PRWord *)&t->md.gcContext;
-}
-
-/* This function is not used right now, but is left as a reference.
- * If you ever need to get the fiberID from the currently running fiber, 
- * this is it.
- */
-void *
-GetMyFiberID()
-{
-    void *fiberData = 0;
-
-    /* A pointer to our tib entry is found at FS:[18]
-     * At offset 10h is the fiberData pointer.  The context of the 
-     * fiber is stored in there.  
-     */
-#ifdef HAVE_ASM
-    __asm {
-        mov    EDX, FS:[18h]
-        mov    EAX, DWORD PTR [EDX+10h]
-        mov    [fiberData], EAX
-    }
-#endif
-  
-    return fiberData;
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2inrval.c b/libs/js/nsprpub/pr/src/md/os2/os2inrval.c
deleted file mode 100644
index 4006f5f2b0..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2inrval.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * OS/2 interval timers
- *
- */
-
-#include "primpl.h"
-
-static PRBool useHighResTimer = PR_FALSE;
-PRIntervalTime _os2_ticksPerSec = -1;
-PRIntn _os2_bitShift = 0;
-PRInt32 _os2_highMask = 0;
-   
-void
-_PR_MD_INTERVAL_INIT()
-{
-    char *envp;
-    ULONG timerFreq;
-    APIRET rc;
-
-    if ((envp = getenv("NSPR_OS2_NO_HIRES_TIMER")) != NULL) {
-        if (atoi(envp) == 1)
-           return;
-    }
-
-    timerFreq = 0; /* OS/2 high-resolution timer frequency in Hz */
-    rc = DosTmrQueryFreq(&timerFreq);
-    if (NO_ERROR == rc) {
-        useHighResTimer = PR_TRUE;
-        PR_ASSERT(timerFreq != 0);
-        while (timerFreq > PR_INTERVAL_MAX) {
-            timerFreq >>= 1;
-            _os2_bitShift++;
-            _os2_highMask = (_os2_highMask << 1)+1;
-        }
-
-        _os2_ticksPerSec = timerFreq;
-        PR_ASSERT(_os2_ticksPerSec > PR_INTERVAL_MIN);
-    }
-}
-
-PRIntervalTime
-_PR_MD_GET_INTERVAL()
-{
-    if (useHighResTimer) {
-        QWORD timestamp;
-        PRInt32 top;
-        APIRET rc = DosTmrQueryTime(&timestamp);
-        if (NO_ERROR != rc) {
-            return -1;
-        }
-        /* Sadly, nspr requires the interval to range from 1000 ticks per
-         * second to only 100000 ticks per second. DosTmrQueryTime is too
-         * high resolution...
-         */
-        top = timestamp.ulHi & _os2_highMask;
-        top = top << (32 - _os2_bitShift);
-        timestamp.ulLo = timestamp.ulLo >> _os2_bitShift;   
-        timestamp.ulLo = timestamp.ulLo + top; 
-        return (PRUint32)timestamp.ulLo;
-    } else {
-        ULONG msCount = -1;
-        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &msCount, sizeof(msCount));
-        return msCount;
-    }
-}
-
-PRIntervalTime
-_PR_MD_INTERVAL_PER_SEC()
-{
-    if (useHighResTimer) {
-        return _os2_ticksPerSec;
-    } else {
-        return 1000;
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2io.c b/libs/js/nsprpub/pr/src/md/os2/os2io.c
deleted file mode 100644
index 185ba973a6..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2io.c
+++ /dev/null
@@ -1,983 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- * This Original Code has been modified by IBM Corporation.
- * Modifications made by IBM described herein are
- * Copyright (c) International Business Machines
- * Corporation, 2000
- *
- * Modifications to Mozilla code or documentation
- * identified per MPL Section 3.3
- *
- * Date             Modified by     Description of modification
- * 03/23/2000       IBM Corp.       Changed write() to DosWrite(). EMX i/o
- *                                  calls cannot be intermixed with DosXXX
- *                                  calls since EMX remaps file/socket
- *                                  handles.
- * 04/27/2000       IBM Corp.       Changed open file to be more like NT and
- *                                  better handle PR_TRUNCATE | PR_CREATE_FILE
- *                                  and also fixed _PR_MD_SET_FD_INHERITABLE
- */
-
-/* OS2 IO module
- *
- * Assumes synchronous I/O.
- *
- */
-
-#include "primpl.h"
-#include "prio.h"
-#include <ctype.h>
-#include <string.h>
-#ifdef XP_OS2_VACPP
-#include <direct.h>
-#else
-#include <limits.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-struct _MDLock               _pr_ioq_lock;
-
-static PRBool isWSEB = PR_FALSE; /* whether we are using an OS/2 kernel that supports large files */
-
-typedef APIRET (*DosOpenLType)(PSZ pszFileName, PHFILE pHf, PULONG pulAction,
-                            LONGLONG cbFile, ULONG ulAttribute,
-                            ULONG fsOpenFlags, ULONG fsOpenMode,
-                            PEAOP2 peaop2);
-
-typedef APIRET (*DosSetFileLocksLType)(HFILE hFile, PFILELOCKL pflUnlock,
-                                    PFILELOCKL pflLock, ULONG timeout,
-                                    ULONG flags);
-
-typedef APIRET (*DosSetFilePtrLType)(HFILE hFile, LONGLONG ib, ULONG method,
-                                  PLONGLONG ibActual);
-
-DosOpenLType myDosOpenL;
-DosSetFileLocksLType myDosSetFileLocksL;
-DosSetFilePtrLType myDosSetFilePtrL;
-
-void
-_PR_MD_INIT_IO()
-{
-    APIRET rc;
-    HMODULE module;
-
-    sock_init();
-    
-    rc = DosLoadModule(NULL, 0, "DOSCALL1", &module);
-    if (rc != NO_ERROR)
-    {
-        return;
-    }
-    rc = DosQueryProcAddr(module, 981, NULL, (PFN*) &myDosOpenL);
-    if (rc != NO_ERROR)
-    {
-        return;
-    }
-    rc = DosQueryProcAddr(module, 986, NULL, (PFN*) &myDosSetFileLocksL);
-    if (rc != NO_ERROR)
-    {
-        return;
-    }
-    rc = DosQueryProcAddr(module, 988, NULL, (PFN*) &myDosSetFilePtrL);
-    if (rc != NO_ERROR)
-    {
-        return;
-    }
-    isWSEB = PR_TRUE;
-}
-
-PRStatus
-_PR_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PRInt32 rv;
-    ULONG count;
-
-    PRUint32 msecs = (ticks == PR_INTERVAL_NO_TIMEOUT) ?
-        SEM_INDEFINITE_WAIT : PR_IntervalToMilliseconds(ticks);
-    rv = DosWaitEventSem(thread->md.blocked_sema, msecs);
-    DosResetEventSem(thread->md.blocked_sema, &count); 
-    switch(rv) 
-    {
-        case NO_ERROR:
-            return PR_SUCCESS;
-            break;
-        case ERROR_TIMEOUT:
-            _PR_THREAD_LOCK(thread);
-            if (thread->state == _PR_IO_WAIT) {
-			  ;
-            } else {
-                if (thread->wait.cvar != NULL) {
-                    thread->wait.cvar = NULL;
-                    _PR_THREAD_UNLOCK(thread);
-                } else {
-                    /* The CVAR was notified just as the timeout
-                     * occurred.  This led to us being notified twice.
-                     * call SemRequest() to clear the semaphore.
-                     */
-                    _PR_THREAD_UNLOCK(thread);
-                    rv = DosWaitEventSem(thread->md.blocked_sema, 0);
-                    DosResetEventSem(thread->md.blocked_sema, &count); 
-                    PR_ASSERT(rv == NO_ERROR);
-                }
-            }
-            return PR_SUCCESS;
-            break;
-        default:
-            break;
-    }
-    return PR_FAILURE;
-}
-PRStatus
-_PR_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if ( _PR_IS_NATIVE_THREAD(thread) ) 
-    {
-        if (DosPostEventSem(thread->md.blocked_sema) != NO_ERROR)
-            return PR_FAILURE;
-        else
-			return PR_SUCCESS;
-	}
-}
-
-
-/* --- FILE IO ----------------------------------------------------------- */
-/*
- *  _PR_MD_OPEN() -- Open a file
- *
- *  returns: a fileHandle
- *
- *  The NSPR open flags (osflags) are translated into flags for OS/2
- *
- *  Mode seems to be passed in as a unix style file permissions argument
- *  as in 0666, in the case of opening the logFile. 
- *
- */
-PRInt32
-_PR_MD_OPEN(const char *name, PRIntn osflags, int mode)
-{
-    HFILE file;
-    PRInt32 access = OPEN_SHARE_DENYNONE;
-    PRInt32 flags = 0L;
-    APIRET rc = 0;
-    PRUword actionTaken;
-
-    if (osflags & PR_SYNC) access |= OPEN_FLAGS_WRITE_THROUGH;
-
-    if (osflags & PR_RDONLY)
-        access |= OPEN_ACCESS_READONLY;
-    else if (osflags & PR_WRONLY)
-        access |= OPEN_ACCESS_WRITEONLY;
-    else if(osflags & PR_RDWR)
-        access |= OPEN_ACCESS_READWRITE;
-
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-    {
-        flags = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_FAIL_IF_EXISTS;
-    }
-    else if (osflags & PR_CREATE_FILE)
-    {
-        if (osflags & PR_TRUNCATE)
-            flags = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_REPLACE_IF_EXISTS;
-        else
-            flags = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-    } 
-    else
-    {
-        if (osflags & PR_TRUNCATE)
-            flags = OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_REPLACE_IF_EXISTS;
-        else
-            flags = OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS;
-    }
-
-    do {
-        if (isWSEB)
-        {
-                rc = myDosOpenL((char*)name,
-                     &file,            /* file handle if successful */
-                     &actionTaken,     /* reason for failure        */
-                     0,                /* initial size of new file  */
-                     FILE_NORMAL,      /* file system attributes    */
-                     flags,            /* Open flags                */
-                     access,           /* Open mode and rights      */
-                     0);               /* OS/2 Extended Attributes  */
-        }
-        else
-        {
-                rc = DosOpen((char*)name,
-                     &file,            /* file handle if successful */
-                     &actionTaken,     /* reason for failure        */
-                     0,                /* initial size of new file  */
-                     FILE_NORMAL,      /* file system attributes    */
-                     flags,            /* Open flags                */
-                     access,           /* Open mode and rights      */
-                     0);               /* OS/2 Extended Attributes  */
-        };
-        if (rc == ERROR_TOO_MANY_OPEN_FILES) {
-            ULONG CurMaxFH = 0;
-            LONG ReqCount = 20;
-            APIRET rc2;
-            rc2 = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
-            if (rc2 != NO_ERROR) {
-                break;
-            }
-        }
-    } while (rc == ERROR_TOO_MANY_OPEN_FILES);
-
-    if (rc != NO_ERROR) {
-        _PR_MD_MAP_OPEN_ERROR(rc);
-        return -1; 
-    }
-
-    return (PRInt32)file;
-}
-
-PRInt32
-_PR_MD_READ(PRFileDesc *fd, void *buf, PRInt32 len)
-{
-    ULONG bytes;
-    int rv;
-
-    rv = DosRead((HFILE)fd->secret->md.osfd,
-                 (PVOID)buf,
-                 len,
-                 &bytes);
-    
-    if (rv != NO_ERROR) 
-    {
-        /* ERROR_HANDLE_EOF can only be returned by async io */
-        PR_ASSERT(rv != ERROR_HANDLE_EOF);
-        if (rv == ERROR_BROKEN_PIPE)
-            return 0;
-		else {
-			_PR_MD_MAP_READ_ERROR(rv);
-        return -1;
-    }
-    }
-    return (PRInt32)bytes;
-}
-
-PRInt32
-_PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 len)
-{
-    PRInt32 bytes;
-    int rv; 
-
-    rv = DosWrite((HFILE)fd->secret->md.osfd,
-                  (PVOID)buf,
-                  len,
-                  (PULONG)&bytes);
-
-    if (rv != NO_ERROR) 
-    {
-        _PR_MD_MAP_WRITE_ERROR(rv);
-        return -1;
-    }
-
-    if (len != bytes) {
-        rv = ERROR_DISK_FULL;
-        _PR_MD_MAP_WRITE_ERROR(rv);
-        return -1;
-    }
-
-    return bytes;
-} /* --- end _PR_MD_WRITE() --- */
-
-PRInt32
-_PR_MD_LSEEK(PRFileDesc *fd, PRInt32 offset, PRSeekWhence whence)
-{
-    PRInt32 rv;
-    PRUword newLocation;
-
-    rv = DosSetFilePtr((HFILE)fd->secret->md.osfd, offset, whence, &newLocation);
-
-	if (rv != NO_ERROR) {
-		_PR_MD_MAP_LSEEK_ERROR(rv);
-		return -1;
-	} else
-		return newLocation;
-}
-
-PRInt64
-_PR_MD_LSEEK64(PRFileDesc *fd, PRInt64 offset, PRSeekWhence whence)
-{
-#ifdef NO_LONG_LONG
-    PRInt64 result;
-    PRInt32 rv, low = offset.lo, hi = offset.hi;
-    PRUword newLocation;
-
-    rv = DosSetFilePtr((HFILE)fd->secret->md.osfd, low, whence, &newLocation);
-    rv = DosSetFilePtr((HFILE)fd->secret->md.osfd, hi, FILE_CURRENT, &newLocation);
-
-  	if (rv != NO_ERROR) {
-		_PR_MD_MAP_LSEEK_ERROR(rv);
-		hi = newLocation = -1;
-   }
-
-    result.lo = newLocation;
-    result.hi = hi;
-	return result;
-
-#else
-    PRInt32 where, rc, lo = (PRInt32)offset, hi = (PRInt32)(offset >> 32);
-    PRUint64 rv;
-    PRUint32 newLocation, uhi;
-    PRUint64 newLocationL;
-
-    switch (whence)
-      {
-      case PR_SEEK_SET:
-        where = FILE_BEGIN;
-        break;
-      case PR_SEEK_CUR:
-        where = FILE_CURRENT;
-        break;
-      case PR_SEEK_END:
-        where = FILE_END;
-        break;
-      default:
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-    if (isWSEB)
-    {
-        rc = myDosSetFilePtrL((HFILE)fd->secret->md.osfd, offset, where, (PLONGLONG)&newLocationL);
-    }
-    else
-    {
-        rc = DosSetFilePtr((HFILE)fd->secret->md.osfd, lo, where, (PULONG)&newLocation);
-    }
-     
-    if (rc != NO_ERROR) {
-      _PR_MD_MAP_LSEEK_ERROR(rc);
-      return -1;
-    }
-    
-    if (isWSEB)
-    {
-        return newLocationL;
-    }
-
-    uhi = (PRUint32)hi;
-    PR_ASSERT((PRInt32)uhi >= 0);
-    rv = uhi;
-    PR_ASSERT((PRInt64)rv >= 0);
-    rv = (rv << 32);
-    PR_ASSERT((PRInt64)rv >= 0);
-    rv += newLocation;
-    PR_ASSERT((PRInt64)rv >= 0);
-    return (PRInt64)rv;
-#endif
-}
-
-PRInt32
-_PR_MD_FSYNC(PRFileDesc *fd)
-{
-    PRInt32 rc = DosResetBuffer((HFILE)fd->secret->md.osfd);
-
-    if (rc != NO_ERROR) {
-   	if (rc != ERROR_ACCESS_DENIED) {	
-   			_PR_MD_MAP_FSYNC_ERROR(rc);
-   	    return -1;
-   	}
-    }
-    return 0;
-}
-
-PRInt32
-_MD_CloseFile(PRInt32 osfd)
-{
-    PRInt32 rv;
-    
-    rv = DosClose((HFILE)osfd);
- 	if (rv != NO_ERROR)
-		_PR_MD_MAP_CLOSE_ERROR(rv);
-    return rv;
-}
-
-
-/* --- DIR IO ------------------------------------------------------------ */
-#define GetFileFromDIR(d)       (isWSEB?(d)->d_entry.large.achName:(d)->d_entry.small.achName)
-#define GetFileAttr(d)          (isWSEB?(d)->d_entry.large.attrFile:(d)->d_entry.small.attrFile)
-
-void FlipSlashes(char *cp, int len)
-{
-    while (--len >= 0) {
-    if (cp[0] == '/') {
-        cp[0] = PR_DIRECTORY_SEPARATOR;
-    }
-    cp++;
-    }
-}
-
-/*
-**
-** Local implementations of standard Unix RTL functions which are not provided
-** by the VAC RTL.
-**
-*/
-
-PRInt32
-_PR_MD_CLOSE_DIR(_MDDir *d)
-{
-   PRInt32 rc;
-
-    if ( d ) {
-      rc = DosFindClose(d->d_hdl);
-      if(rc == NO_ERROR){
-        d->magic = (PRUint32)-1;
-        return PR_SUCCESS;
-		} else {
-			_PR_MD_MAP_CLOSEDIR_ERROR(rc);
-        	return PR_FAILURE;
-		}
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return PR_FAILURE;
-}
-
-
-PRStatus
-_PR_MD_OPEN_DIR(_MDDir *d, const char *name)
-{
-    char filename[ CCHMAXPATH ];
-    PRUword numEntries, rc;
-
-    numEntries = 1;
-
-    PR_snprintf(filename, CCHMAXPATH, "%s%s%s",
-                name, PR_DIRECTORY_SEPARATOR_STR, "*.*");
-    FlipSlashes( filename, strlen(filename) );
-
-    d->d_hdl = HDIR_CREATE;
-
-    if (isWSEB)
-    {
-        rc = DosFindFirst( filename,
-                           &d->d_hdl,
-                           FILE_DIRECTORY | FILE_HIDDEN,
-                           &(d->d_entry.large),
-                           sizeof(d->d_entry.large),
-                           &numEntries,
-                           FIL_STANDARDL);
-    }
-    else
-    {
-        rc = DosFindFirst( filename,
-                           &d->d_hdl,
-                           FILE_DIRECTORY | FILE_HIDDEN,
-                           &(d->d_entry.small),
-                           sizeof(d->d_entry.small),
-                           &numEntries,
-                           FIL_STANDARD);
-    }
-    if ( rc != NO_ERROR ) {
-		_PR_MD_MAP_OPENDIR_ERROR(rc);
-        return PR_FAILURE;
-    }
-    d->firstEntry = PR_TRUE;
-    d->magic = _MD_MAGIC_DIR;
-    return PR_SUCCESS;
-}
-
-char *
-_PR_MD_READ_DIR(_MDDir *d, PRIntn flags)
-{
-    PRUword numFiles = 1;
-    BOOL rv;
-    char *fileName;
-    USHORT fileAttr;
-
-    if ( d ) {
-       while (1) {
-           if (d->firstEntry) {
-               d->firstEntry = PR_FALSE;
-               rv = NO_ERROR;
-           } else {
-               rv = DosFindNext(d->d_hdl,
-                                &(d->d_entry),
-                                sizeof(d->d_entry),
-                                &numFiles);
-           }
-           if (rv != NO_ERROR) {
-               break;
-           }
-           fileName = GetFileFromDIR(d);
-           fileAttr = GetFileAttr(d);
-           if ( (flags & PR_SKIP_DOT) &&
-                (fileName[0] == '.') && (fileName[1] == '\0'))
-                continue;
-           if ( (flags & PR_SKIP_DOT_DOT) &&
-                (fileName[0] == '.') && (fileName[1] == '.') &&
-                (fileName[2] == '\0'))
-                continue;
-			/*
-			 * XXX
-			 * Is this the correct definition of a hidden file on OS/2?
-			 */
-           if ((flags & PR_SKIP_NONE) && (fileAttr & FILE_HIDDEN))
-                return fileName;
-           else if ((flags & PR_SKIP_HIDDEN) && (fileAttr & FILE_HIDDEN))
-                continue;
-           return fileName;
-        }
-        PR_ASSERT(NO_ERROR != rv);
-			_PR_MD_MAP_READDIR_ERROR(rv);
-        return NULL;
-		}
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return NULL;
-}
-
-PRInt32
-_PR_MD_DELETE(const char *name)
-{
-    PRInt32 rc = DosDelete((char*)name);
-    if(rc == NO_ERROR) {
-        return 0;
-    } else {
-		_PR_MD_MAP_DELETE_ERROR(rc);
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_STAT(const char *fn, struct stat *info)
-{
-    PRInt32 rv;
-    char filename[CCHMAXPATH];
-
-    PR_snprintf(filename, CCHMAXPATH, "%s", fn);
-    FlipSlashes(filename, strlen(filename));
-
-    rv = _stat((char*)filename, info);
-    if (-1 == rv) {
-        /*
-         * Check for MSVC runtime library _stat() bug.
-         * (It's really a bug in FindFirstFile().)
-         * If a pathname ends in a backslash or slash,
-         * e.g., c:\temp\ or c:/temp/, _stat() will fail.
-         * Note: a pathname ending in a slash (e.g., c:/temp/)
-         * can be handled by _stat() on NT but not on Win95.
-         *
-         * We remove the backslash or slash at the end and
-         * try again.  
-         *
-         * Not sure if this happens on OS/2 or not,
-         * but it doesn't hurt to be careful.
-         */
-
-        int len = strlen(fn);
-        if (len > 0 && len <= _MAX_PATH
-                && (fn[len - 1] == '\\' || fn[len - 1] == '/')) {
-            char newfn[_MAX_PATH + 1];
-
-            strcpy(newfn, fn);
-            newfn[len - 1] = '\0';
-            rv = _stat(newfn, info);
-        }
-    }
-
-    if (-1 == rv) {
-        _PR_MD_MAP_STAT_ERROR(errno);
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO(const char *fn, PRFileInfo *info)
-{
-    struct stat sb;
-    PRInt32 rv;
-    PRInt64 s, s2us;
- 
-    if ( (rv = _PR_MD_STAT(fn, &sb)) == 0 ) {
-        if (info) {
-            if (S_IFREG & sb.st_mode)
-                info->type = PR_FILE_FILE ;
-            else if (S_IFDIR & sb.st_mode)
-                info->type = PR_FILE_DIRECTORY;
-            else
-                info->type = PR_FILE_OTHER;
-            info->size = sb.st_size;
-            LL_I2L(s2us, PR_USEC_PER_SEC);
-            LL_I2L(s, sb.st_mtime);
-            LL_MUL(s, s, s2us);
-            info->modifyTime = s;
-            LL_I2L(s, sb.st_ctime);
-            LL_MUL(s, s, s2us);
-            info->creationTime = s;
-        }
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info)
-{
-    PRFileInfo info32;
-    PRInt32 rv = _PR_MD_GETFILEINFO(fn, &info32);
-    if (rv != 0)
-    {
-        return rv;
-    }
-    info->type = info32.type;
-    LL_UI2L(info->size,info32.size);
-    info->modifyTime = info32.modifyTime;
-    info->creationTime = info32.creationTime;
-    
-    if (isWSEB)
-    {
-        APIRET rc ;
-        FILESTATUS3L fstatus;
-
-        rc = DosQueryPathInfo(fn, FIL_STANDARDL, &fstatus, sizeof(fstatus));
-
-        if (NO_ERROR != rc)
-        {
-            _PR_MD_MAP_OPEN_ERROR(rc);
-            return -1;
-        }
-
-        if (! (fstatus.attrFile & FILE_DIRECTORY))
-        {
-            info->size = fstatus.cbFile;
-        }
-    }
-
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info)
-{
-   /* For once, the VAC compiler/library did a nice thing.
-    * The file handle used by the C runtime is the same one
-    * returned by the OS when you call DosOpen().  This means
-    * that you can take an OS HFILE and use it with C file
-    * functions.  The only caveat is that you have to call
-    * _setmode() first to initialize some junk.  This is
-    * immensely useful because I did not have a clue how to
-    * implement this function otherwise.  The windows folks
-    * took the source from the Microsoft C library source, but
-    * IBM wasn't kind enough to ship the source with VAC.
-    * On second thought, the needed function could probably
-    * be gotten from the OS/2 GNU library source, but the
-    * point is now moot.
-    */
-   struct stat hinfo;
-    PRInt64 s, s2us;
-
-    _setmode(fd->secret->md.osfd, O_BINARY);
-    if(fstat((int)fd->secret->md.osfd, &hinfo) != NO_ERROR) {
-		_PR_MD_MAP_FSTAT_ERROR(errno);
-        return -1;
-	}
-
-    if (hinfo.st_mode & S_IFDIR)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_FILE;
-
-    info->size = hinfo.st_size;
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, hinfo.st_mtime);
-    LL_MUL(s, s, s2us);
-    info->modifyTime = s;
-    LL_I2L(s, hinfo.st_ctime);
-    LL_MUL(s, s, s2us);
-    info->creationTime = s;
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO64(const PRFileDesc *fd, PRFileInfo64 *info)
-{
-    PRFileInfo info32;
-    PRInt32 rv = _PR_MD_GETOPENFILEINFO(fd, &info32);
-    if (0 == rv)
-    {
-       info->type = info32.type;
-       LL_UI2L(info->size,info32.size);
-    
-       info->modifyTime = info32.modifyTime;
-       info->creationTime = info32.creationTime;
-    }
-    
-    if (isWSEB)
-    {
-        APIRET rc ;
-        FILESTATUS3L fstatus;
-
-        rc = DosQueryFileInfo(fd->secret->md.osfd, FIL_STANDARDL, &fstatus, sizeof(fstatus));
-
-        if (NO_ERROR != rc)
-        {
-            _PR_MD_MAP_OPEN_ERROR(rc);
-            return -1;
-        }
-
-        if (! (fstatus.attrFile & FILE_DIRECTORY))
-        {
-            info->size = fstatus.cbFile;
-        }
-    }
-
-    return rv;
-}
-
-
-PRInt32
-_PR_MD_RENAME(const char *from, const char *to)
-{
-   PRInt32 rc;
-    /* Does this work with dot-relative pathnames? */
-    if ( (rc = DosMove((char *)from, (char *)to)) == NO_ERROR) {
-        return 0;
-    } else {
-		_PR_MD_MAP_RENAME_ERROR(rc);
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_ACCESS(const char *name, PRAccessHow how)
-{
-  PRInt32 rv;
-    switch (how) {
-      case PR_ACCESS_WRITE_OK:
-        rv = access(name, 02);
-		break;
-      case PR_ACCESS_READ_OK:
-        rv = access(name, 04);
-		break;
-      case PR_ACCESS_EXISTS:
-        return access(name, 00);
-	  	break;
-      default:
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-    }
-	if (rv < 0)
-		_PR_MD_MAP_ACCESS_ERROR(errno);
-    return rv;
-}
-
-PRInt32
-_PR_MD_MKDIR(const char *name, PRIntn mode)
-{
-   PRInt32 rc;
-    /* XXXMB - how to translate the "mode"??? */
-    if ((rc = DosCreateDir((char *)name, NULL))== NO_ERROR) {
-        return 0;
-    } else {
-		_PR_MD_MAP_MKDIR_ERROR(rc);
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_RMDIR(const char *name)
-{
-   PRInt32 rc;
-    if ( (rc = DosDeleteDir((char *)name)) == NO_ERROR) {
-        return 0;
-    } else {
-		_PR_MD_MAP_RMDIR_ERROR(rc);
-        return -1;
-    }
-}
-
-PRStatus
-_PR_MD_LOCKFILE(PRInt32 f)
-{
-    PRInt32   rv;
-    FILELOCK lock, unlock;
-    FILELOCKL lockL, unlockL;
-    
-    lock.lOffset = 0;
-    lockL.lOffset = 0;
-    lock.lRange = 0xffffffff;
-    lockL.lRange =  0xffffffffffffffff;
-    unlock.lOffset = 0;
-    unlock.lRange = 0;
-    unlockL.lOffset = 0;
-    unlockL.lRange = 0;
-
-    /*
-     * loop trying to DosSetFileLocks(),
-     * pause for a few miliseconds when can't get the lock
-     * and try again
-     */
-    for( rv = FALSE; rv == FALSE; /* do nothing */ )
-    {
-        if (isWSEB)
-        {
-	    rv = myDosSetFileLocksL( (HFILE) f,
-			                    &unlockL, &lockL,
-			                    0, 0);
-        }
-        else
-        {
-	    rv = DosSetFileLocks( (HFILE) f,
-			                    &unlock, &lock,
-			                    0, 0);
-        }
-		if ( rv != NO_ERROR )
-        {
-            DosSleep( 50 );  /* Sleep() a few milisecs and try again. */
-        }            
-    } /* end for() */
-    return PR_SUCCESS;
-} /* end _PR_MD_LOCKFILE() */
-
-PRStatus
-_PR_MD_TLOCKFILE(PRInt32 f)
-{
-    return _PR_MD_LOCKFILE(f);
-} /* end _PR_MD_TLOCKFILE() */
-
-
-PRStatus
-_PR_MD_UNLOCKFILE(PRInt32 f)
-{
-    PRInt32   rv;
-    FILELOCK lock, unlock;
-    FILELOCKL lockL, unlockL;
-    
-    lock.lOffset = 0;
-    lockL.lOffset = 0;
-    lock.lRange = 0;
-    lockL.lRange = 0;
-    unlock.lOffset = 0;
-    unlockL.lOffset = 0;
-    unlock.lRange = 0xffffffff;
-    unlockL.lRange = 0xffffffffffffffff;
-    
-    if (isWSEB)
-    {
-        rv = myDosSetFileLocksL( (HFILE) f,
-                                        &unlockL, &lockL,
-                                        0, 0);
-    }
-    else
-    {
-        rv = DosSetFileLocks( (HFILE) f,
-                                    &unlock, &lock,
-                                    0, 0);
-    }
-            
-    if ( rv != NO_ERROR )
-    {
-        return PR_SUCCESS;
-    }
-    else
-    {
-        return PR_FAILURE;
-    }
-} /* end _PR_MD_UNLOCKFILE() */
-
-PRStatus
-_PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable)
-{
-    APIRET rc = 0;
-    ULONG flags;
-    switch (fd->methods->file_type)
-    {
-        case PR_DESC_PIPE:
-        case PR_DESC_FILE:
-            rc = DosQueryFHState((HFILE)fd->secret->md.osfd, &flags);
-            if (rc != NO_ERROR) {
-                PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-                return PR_FAILURE;
-            }
-
-            if (inheritable)
-              flags &= ~OPEN_FLAGS_NOINHERIT;
-            else
-              flags |= OPEN_FLAGS_NOINHERIT;
-
-            /* Mask off flags DosSetFHState don't want. */
-            flags &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
-            rc = DosSetFHState((HFILE)fd->secret->md.osfd, flags);
-            if (rc != NO_ERROR) {
-                PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-                return PR_FAILURE;
-            }
-            break;
-
-        case PR_DESC_LAYERED:
-            /* what to do here? */
-            PR_SetError(PR_UNKNOWN_ERROR, 87 /*ERROR_INVALID_PARAMETER*/);
-            return PR_FAILURE;
-
-        case PR_DESC_SOCKET_TCP:
-        case PR_DESC_SOCKET_UDP:
-            /* These are global on OS/2. */
-            break;
-    }
-
-    return PR_SUCCESS;
-}
-
-void
-_PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported)
-{
-    /* XXX this function needs to be implemented */
-    fd->secret->inheritable = _PR_TRI_UNKNOWN;
-}
-
-void
-_PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd)
-{
-    /* XXX this function needs to be reviewed */
-    ULONG flags;
-
-    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-    if (DosQueryFHState((HFILE)fd->secret->md.osfd, &flags) == 0) {
-        if (flags & OPEN_FLAGS_NOINHERIT) {
-            fd->secret->inheritable = _PR_TRI_FALSE;
-        } else {
-            fd->secret->inheritable = _PR_TRI_TRUE;
-        }
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2misc.c b/libs/js/nsprpub/pr/src/md/os2/os2misc.c
deleted file mode 100644
index 6e330a03fe..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2misc.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Davide Bresolin <davide@teamos2.it>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * os2misc.c
- *
- */
-#include <string.h>
-#include "primpl.h"
-
-extern int   _CRT_init(void);
-extern void  _CRT_term(void);
-extern void __ctordtorInit(int flag);
-extern void __ctordtorTerm(int flag);
-
-char *
-_PR_MD_GET_ENV(const char *name)
-{
-    return getenv(name);
-}
-
-PRIntn
-_PR_MD_PUT_ENV(const char *name)
-{
-    return putenv(name);
-}
-
-
-/*
- **************************************************************************
- **************************************************************************
- **
- **     Date and time routines
- **
- **************************************************************************
- **************************************************************************
- */
-
-#include <sys/timeb.h>
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the
- *     implementation for OS/2.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTime)
-PR_Now(void)
-{
-    PRInt64 s, ms, ms2us, s2us;
-    struct timeb b;
-
-    ftime(&b);
-    LL_I2L(ms2us, PR_USEC_PER_MSEC);
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, b.time);
-    LL_I2L(ms, b.millitm);
-    LL_MUL(ms, ms, ms2us);
-    LL_MUL(s, s, s2us);
-    LL_ADD(s, s, ms);
-    return s;       
-}
-
-
-/*
- ***********************************************************************
- ***********************************************************************
- *
- * Process creation routines
- *
- ***********************************************************************
- ***********************************************************************
- */
-
-/*
- * Assemble the command line by concatenating the argv array.
- * On success, this function returns 0 and the resulting command
- * line is returned in *cmdLine.  On failure, it returns -1.
- */
-static int assembleCmdLine(char *const *argv, char **cmdLine)
-{
-    char *const *arg;
-    int cmdLineSize;
-
-    /*
-     * Find out how large the command line buffer should be.
-     */
-    cmdLineSize = 1; /* final null */
-    for (arg = argv+1; *arg; arg++) {
-        cmdLineSize += strlen(*arg) + 1; /* space in between */
-    }
-    *cmdLine = PR_MALLOC(cmdLineSize);
-    if (*cmdLine == NULL) {
-        return -1;
-    }
-
-    (*cmdLine)[0] = '\0';
-
-    for (arg = argv+1; *arg; arg++) {
-        if (arg > argv +1) {
-            strcat(*cmdLine, " ");
-        }
-        strcat(*cmdLine, *arg);
-    } 
-    return 0;
-}
-
-/*
- * Assemble the environment block by concatenating the envp array
- * (preserving the terminating null byte in each array element)
- * and adding a null byte at the end.
- *
- * Returns 0 on success.  The resulting environment block is returned
- * in *envBlock.  Note that if envp is NULL, a NULL pointer is returned
- * in *envBlock.  Returns -1 on failure.
- */
-static int assembleEnvBlock(char **envp, char **envBlock)
-{
-    char *p;
-    char *q;
-    char **env;
-    char *curEnv;
-    char *cwdStart, *cwdEnd;
-    int envBlockSize;
-
-    PPIB ppib = NULL;
-    PTIB ptib = NULL;
-
-    if (envp == NULL) {
-        *envBlock = NULL;
-        return 0;
-    }
-
-    if(DosGetInfoBlocks(&ptib, &ppib) != NO_ERROR)
-       return -1;
-
-    curEnv = ppib->pib_pchenv;
-
-    cwdStart = curEnv;
-    while (*cwdStart) {
-        if (cwdStart[0] == '=' && cwdStart[1] != '\0'
-                && cwdStart[2] == ':' && cwdStart[3] == '=') {
-            break;
-        }
-        cwdStart += strlen(cwdStart) + 1;
-    }
-    cwdEnd = cwdStart;
-    if (*cwdEnd) {
-        cwdEnd += strlen(cwdEnd) + 1;
-        while (*cwdEnd) {
-            if (cwdEnd[0] != '=' || cwdEnd[1] == '\0'
-                    || cwdEnd[2] != ':' || cwdEnd[3] != '=') {
-                break;
-            }
-            cwdEnd += strlen(cwdEnd) + 1;
-        }
-    }
-    envBlockSize = cwdEnd - cwdStart;
-
-    for (env = envp; *env; env++) {
-        envBlockSize += strlen(*env) + 1;
-    }
-    envBlockSize++;
-
-    p = *envBlock = PR_MALLOC(envBlockSize);
-    if (p == NULL) {
-        return -1;
-    }
-
-    q = cwdStart;
-    while (q < cwdEnd) {
-        *p++ = *q++;
-    }
-
-    for (env = envp; *env; env++) {
-        q = *env;
-        while (*q) {
-            *p++ = *q++;
-        }
-        *p++ = '\0';
-    }
-    *p = '\0';
-    return 0;
-}
-
-/*
- * For qsort.  We sort (case-insensitive) the environment strings
- * before generating the environment block.
- */
-static int compare(const void *arg1, const void *arg2)
-{
-    return stricmp(* (char**)arg1, * (char**)arg2);
-}
-
-PRProcess * _PR_CreateOS2Process(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    PRProcess *proc = NULL;
-    char *cmdLine = NULL;
-    char **newEnvp = NULL;
-    char *envBlock = NULL;
-   
-    STARTDATA startData = {0};
-    APIRET    rc;
-    ULONG     ulAppType = 0;
-    PID       pid = 0;
-    char     *pEnvWPS = NULL;
-    char     *pszComSpec;
-    char      pszEXEName[CCHMAXPATH] = "";
-    char      pszFormatString[CCHMAXPATH];
-    char      pszObjectBuffer[CCHMAXPATH];
-    char     *pszFormatResult = NULL;
-
-    /*
-     * Variables for DosExecPgm
-     */
-    char szFailed[CCHMAXPATH];
-    char *pszCmdLine = NULL;
-    RESULTCODES procInfo;
-    HFILE hStdIn  = 0,
-          hStdOut = 0,
-          hStdErr = 0;
-    HFILE hStdInSave  = -1,
-          hStdOutSave = -1,
-          hStdErrSave = -1;
-
-    proc = PR_NEW(PRProcess);
-    if (!proc) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-   
-    if (assembleCmdLine(argv, &cmdLine) == -1) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-   
-    if (envp == NULL) {
-        newEnvp = NULL;
-    } else {
-        int i;
-        int numEnv = 0;
-        while (envp[numEnv]) {
-            numEnv++;
-        }
-        newEnvp = (char **) PR_MALLOC((numEnv+1) * sizeof(char *));
-        for (i = 0; i <= numEnv; i++) {
-            newEnvp[i] = envp[i];
-        }
-        qsort((void *) newEnvp, (size_t) numEnv, sizeof(char *), compare);
-    }
-    if (assembleEnvBlock(newEnvp, &envBlock) == -1) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-  
-    rc = DosQueryAppType(path, &ulAppType);
-    if (rc != NO_ERROR) {
-       char *pszDot = strrchr(path, '.');
-       if (pszDot) {
-          /* If it is a CMD file, launch the users command processor */
-          if (!stricmp(pszDot, ".cmd")) {
-             rc = DosScanEnv("COMSPEC", &pszComSpec);
-             if (!rc) {
-                strcpy(pszFormatString, "/C %s %s");
-                strcpy(pszEXEName, pszComSpec);
-                ulAppType = FAPPTYP_WINDOWCOMPAT;
-             }
-          }
-       }
-    }
-    if (ulAppType == 0) {
-       PR_SetError(PR_UNKNOWN_ERROR, 0);
-       goto errorExit;
-    }
- 
-    if ((ulAppType & FAPPTYP_WINDOWAPI) == FAPPTYP_WINDOWAPI) {
-        startData.SessionType = SSF_TYPE_PM;
-    }
-    else if (ulAppType & FAPPTYP_WINDOWCOMPAT) {
-        startData.SessionType = SSF_TYPE_WINDOWABLEVIO;
-    }
-    else {
-        startData.SessionType = SSF_TYPE_DEFAULT;
-    }
- 
-    if (ulAppType & (FAPPTYP_WINDOWSPROT31 | FAPPTYP_WINDOWSPROT | FAPPTYP_WINDOWSREAL))
-    {
-        strcpy(pszEXEName, "WINOS2.COM");
-        startData.SessionType = PROG_31_STDSEAMLESSVDM;
-        strcpy(pszFormatString, "/3 %s %s");
-    }
- 
-    startData.InheritOpt = SSF_INHERTOPT_SHELL;
- 
-    if (pszEXEName[0]) {
-        pszFormatResult = PR_MALLOC(strlen(pszFormatString)+strlen(path)+strlen(cmdLine));
-        sprintf(pszFormatResult, pszFormatString, path, cmdLine);
-        startData.PgmInputs = pszFormatResult;
-    } else {
-        strcpy(pszEXEName, path);
-        startData.PgmInputs = cmdLine;
-    }
-    startData.PgmName = pszEXEName;
- 
-    startData.Length = sizeof(startData);
-    startData.Related = SSF_RELATED_INDEPENDENT;
-    startData.ObjectBuffer = pszObjectBuffer;
-    startData.ObjectBuffLen = CCHMAXPATH;
-    startData.Environment = envBlock;
- 
-    if (attr) {
-        /* On OS/2, there is really no way to pass file handles for stdin,
-         * stdout, and stderr to a new process.  Instead, we can make it
-         * a child process and make the given file handles a copy of our
-         * stdin, stdout, and stderr.  The child process then inherits
-         * ours, and we set ours back.  Twisted and gross I know. If you
-         * know a better way, please use it.
-         */
-        if (attr->stdinFd) {
-            hStdIn = 0;
-            DosDupHandle(hStdIn, &hStdInSave);
-            DosDupHandle((HFILE) attr->stdinFd->secret->md.osfd, &hStdIn);
-        }
-
-        if (attr->stdoutFd) {
-            hStdOut = 1;
-            DosDupHandle(hStdOut, &hStdOutSave);
-            DosDupHandle((HFILE) attr->stdoutFd->secret->md.osfd, &hStdOut);
-        }
-
-        if (attr->stderrFd) {
-            hStdErr = 2;
-            DosDupHandle(hStdErr, &hStdErrSave);
-            DosDupHandle((HFILE) attr->stderrFd->secret->md.osfd, &hStdErr);
-        }
-        /*
-         * Build up the Command Line for DosExecPgm
-         */
-        pszCmdLine = PR_MALLOC(strlen(pszEXEName) +
-                               strlen(startData.PgmInputs) + 3);
-        sprintf(pszCmdLine, "%s%c%s%c", pszEXEName, '\0',
-                startData.PgmInputs, '\0');
-        rc = DosExecPgm(szFailed,
-                        CCHMAXPATH,
-                        EXEC_ASYNCRESULT,
-                        pszCmdLine,
-                        envBlock,
-                        &procInfo,
-                        pszEXEName);
-        PR_DELETE(pszCmdLine);
-
-        /* Restore our old values.  Hope this works */
-        if (hStdInSave != -1) {
-            DosDupHandle(hStdInSave, &hStdIn);
-            DosClose(hStdInSave);
-        }
-
-        if (hStdOutSave != -1) {
-            DosDupHandle(hStdOutSave, &hStdOut);
-            DosClose(hStdOutSave);
-        }
-
-        if (hStdErrSave != -1) {
-            DosDupHandle(hStdErrSave, &hStdErr);
-            DosClose(hStdErrSave);
-        }
-
-        if (rc != NO_ERROR) {
-            /* XXX what error code? */
-            PR_SetError(PR_UNKNOWN_ERROR, rc);
-            goto errorExit;
-        }
-
-        proc->md.pid = procInfo.codeTerminate;
-    } else {	
-        /*
-         * If no STDIN/STDOUT redirection is not needed, use DosStartSession
-         * to create a new, independent session
-         */
-        rc = DosStartSession(&startData, &ulAppType, &pid);
-
-        if ((rc != NO_ERROR) && (rc != ERROR_SMG_START_IN_BACKGROUND)) {
-            PR_SetError(PR_UNKNOWN_ERROR, rc);
-            goto errorExit;
-        }
- 
-        proc->md.pid = pid;
-    }
-
-    if (pszFormatResult) {
-        PR_DELETE(pszFormatResult);
-    }
-
-    PR_DELETE(cmdLine);
-    if (newEnvp) {
-        PR_DELETE(newEnvp);
-    }
-    if (envBlock) {
-        PR_DELETE(envBlock);
-    }
-    return proc;
-
-errorExit:
-    if (cmdLine) {
-        PR_DELETE(cmdLine);
-    }
-    if (newEnvp) {
-        PR_DELETE(newEnvp);
-    }
-    if (envBlock) {
-        PR_DELETE(envBlock);
-    }
-    if (proc) {
-        PR_DELETE(proc);
-    }
-    return NULL;
-}  /* _PR_CreateOS2Process */
-
-PRStatus _PR_DetachOS2Process(PRProcess *process)
-{
-    /* On OS/2, a process is either created as a child or not. 
-     * You can't 'detach' it later on.
-     */
-    PR_DELETE(process);
-    return PR_SUCCESS;
-}
-
-/*
- * XXX: This will currently only work on a child process.
- */
-PRStatus _PR_WaitOS2Process(PRProcess *process,
-    PRInt32 *exitCode)
-{
-    ULONG ulRetVal;
-    RESULTCODES results;
-    PID pidEnded = 0;
-
-    ulRetVal = DosWaitChild(DCWA_PROCESS, DCWW_WAIT, 
-                            &results,
-                            &pidEnded, process->md.pid);
-
-    if (ulRetVal != NO_ERROR) {
-       printf("\nDosWaitChild rc = %lu\n", ulRetVal);
-        PR_SetError(PR_UNKNOWN_ERROR, ulRetVal);
-        return PR_FAILURE;
-    }
-    PR_DELETE(process);
-    return PR_SUCCESS;
-}
-
-PRStatus _PR_KillOS2Process(PRProcess *process)
-{
-   ULONG ulRetVal;
-    if ((ulRetVal = DosKillProcess(DKP_PROCESS, process->md.pid)) == NO_ERROR) {
-	return PR_SUCCESS;
-    }
-    PR_SetError(PR_UNKNOWN_ERROR, ulRetVal);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_OS2GetHostName(char *name, PRUint32 namelen)
-{
-    PRIntn rv;
-
-    rv = gethostname(name, (PRInt32) namelen);
-    if (0 == rv) {
-        return PR_SUCCESS;
-    }
-	_PR_MD_MAP_GETHOSTNAME_ERROR(sock_errno());
-    return PR_FAILURE;
-}
-
-void
-_PR_MD_WAKEUP_CPUS( void )
-{
-    return;
-}    
-
-
-/*
- **********************************************************************
- *
- * Memory-mapped files are not supported on OS/2 (or Win16).
- *
- **********************************************************************
- */
-
-PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRInt32 _MD_GetMemMapAlignment(void)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-}
-
-void * _MD_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,
-    PRUint32 len)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PRStatus _MD_MemUnmap(void *addr, PRUint32 len)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_CloseFileMap(PRFileMap *fmap)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2poll.c b/libs/js/nsprpub/pr/src/md/os2/os2poll.c
deleted file mode 100644
index 9151b9c670..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2poll.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This file implements _PR_MD_PR_POLL for OS/2.
- */
-
-#ifdef XP_OS2_EMX
- #include <sys/time.h> /* For timeval. */
-#endif
-
-#include "primpl.h"
-
-#ifndef BSD_SELECT
-/* Utility functions called when using OS/2 select */
-
-PRBool IsSocketSet( PRInt32 osfd, int* socks, int start, int count )
-{
-  int i;
-  PRBool isSet = PR_FALSE;
-
-  for( i = start; i < start+count; i++ )
-  {
-    if( socks[i] == osfd )
-      isSet = PR_TRUE;
-  }
-  
-  return isSet; 
-}
-#endif
-
-PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-#ifdef BSD_SELECT
-    fd_set rd, wt, ex;
-#else
-    int rd, wt, ex;
-    int* socks;
-    unsigned long msecs;
-    int i, j;
-#endif
-    PRFileDesc *bottom;
-    PRPollDesc *pd, *epd;
-    PRInt32 maxfd = -1, ready, err;
-    PRIntervalTime remaining, elapsed, start;
-
-#ifdef BSD_SELECT
-    struct timeval tv, *tvp = NULL;
-
-    FD_ZERO(&rd);
-    FD_ZERO(&wt);
-    FD_ZERO(&ex);
-#else
-    rd = 0;
-    wt = 0;
-    ex = 0;
-    socks = (int) PR_MALLOC( npds * 3 * sizeof(int) );
-    
-    if (!socks)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-#endif
-
-    ready = 0;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        PRInt16 in_flags_read = 0, in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        if ((NULL != pd->fd) && (0 != pd->in_flags))
-        {
-            if (pd->in_flags & PR_POLL_READ)
-            {
-                in_flags_read = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_WRITE, &out_flags_read);
-            }
-            if (pd->in_flags & PR_POLL_WRITE)
-            {
-                in_flags_write = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_READ, &out_flags_write);
-            }
-            if ((0 != (in_flags_read & out_flags_read)) ||
-                (0 != (in_flags_write & out_flags_write)))
-            {
-                /* this one's ready right now */
-                if (0 == ready)
-                {
-                    /*
-                     * We will have to return without calling the
-                     * system poll/select function.  So zero the
-                     * out_flags fields of all the poll descriptors
-                     * before this one.
-                     */
-                    PRPollDesc *prev;
-                    for (prev = pds; prev < pd; prev++)
-                    {
-                        prev->out_flags = 0;
-                    }
-                }
-                ready += 1;
-                pd->out_flags = out_flags_read | out_flags_write;
-            }
-            else
-            {
-                pd->out_flags = 0;  /* pre-condition */
-
-                /* make sure this is an NSPR supported stack */
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                if ((NULL != bottom) &&
-                    (_PR_FILEDESC_OPEN == bottom->secret->state))
-                {
-                    if (0 == ready)
-                    {
-                        PRInt32 osfd = bottom->secret->md.osfd;
-                        if (osfd > maxfd) 
-                            maxfd = osfd;
-                        if (in_flags_read & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_READ;
-#ifdef BSD_SELECT
-                            FD_SET(osfd, &rd);
-#else
-                            socks[rd] = osfd;
-                            rd++;              
-#endif
-                        }
-                        if (in_flags_read & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_WRITE;
-#ifdef BSD_SELECT
-                            FD_SET(osfd, &wt);
-#else
-                            socks[npds+wt] = osfd;
-                            wt++;              
-#endif
-                        }
-                        if (in_flags_write & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_READ;
-#ifdef BSD_SELECT
-                            FD_SET(osfd, &rd);
-#else
-                            socks[rd] = osfd;
-                            rd++;              
-#endif
-                        }
-                        if (in_flags_write & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_WRITE;
-#ifdef BSD_SELECT
-                            FD_SET(osfd, &wt);
-#else
-                            socks[npds+wt] = osfd;
-                            wt++;              
-#endif
-                        }
-                        if (pd->in_flags & PR_POLL_EXCEPT)
-                        {
-#ifdef BSD_SELECT
-                            FD_SET(osfd, &ex);
-#else
-                            socks[npds*2+ex] = osfd;
-                            ex++;
-#endif
-                        }
-                    }
-                }
-                else
-                {
-                    if (0 == ready)
-                    {
-                        PRPollDesc *prev;
-                        for (prev = pds; prev < pd; prev++)
-                        {
-                            prev->out_flags = 0;
-                        }
-                    }
-                    ready += 1;  /* this will cause an abrupt return */
-                    pd->out_flags = PR_POLL_NVAL;  /* bogii */
-                }
-            }
-        }
-        else
-        {
-            pd->out_flags = 0;
-        }
-    }
-
-    if (0 != ready)
-    {
-#ifndef BSD_SELECT
-        PR_Free(socks);
-#endif
-        return ready;  /* no need to block */
-    }
-
-    remaining = timeout;
-    start = PR_IntervalNow();
-
-retry:
-#ifdef BSD_SELECT
-    if (timeout != PR_INTERVAL_NO_TIMEOUT)
-    {
-        PRInt32 ticksPerSecond = PR_TicksPerSecond();
-        tv.tv_sec = remaining / ticksPerSecond;
-        tv.tv_usec = PR_IntervalToMicroseconds( remaining % ticksPerSecond );
-        tvp = &tv;
-    }
-
-    ready = bsdselect(maxfd + 1, &rd, &wt, &ex, tvp);
-#else
-    switch (timeout)
-    {
-        case PR_INTERVAL_NO_WAIT:
-            msecs = 0;
-            break;
-        case PR_INTERVAL_NO_TIMEOUT:
-            msecs = -1;
-            break;
-        default:
-            msecs = PR_IntervalToMilliseconds(remaining);
-    }
-
-     /* compact array */
-    for( i = rd, j = npds; j < npds+wt; i++,j++ )
-        socks[i] = socks[j];
-    for( i = rd+wt, j = npds*2; j < npds*2+ex; i++,j++ )
-        socks[i] = socks[j];
-    
-    ready = os2_select(socks, rd, wt, ex, msecs);
-#endif
-
-    if (ready == -1 && errno == EINTR)
-    {
-        if (timeout == PR_INTERVAL_NO_TIMEOUT)
-            goto retry;
-        else
-        {
-            elapsed = (PRIntervalTime) (PR_IntervalNow() - start);
-            if (elapsed > timeout)
-                ready = 0;  /* timed out */
-            else
-            {
-                remaining = timeout - elapsed;
-                goto retry;
-            }
-        }
-    }
-
-    /*
-    ** Now to unravel the select sets back into the client's poll
-    ** descriptor list. Is this possibly an area for pissing away
-    ** a few cycles or what?
-    */
-    if (ready > 0)
-    {
-        ready = 0;
-        for (pd = pds, epd = pd + npds; pd < epd; pd++)
-        {
-            PRInt16 out_flags = 0;
-            if ((NULL != pd->fd) && (0 != pd->in_flags))
-            {
-                PRInt32 osfd;
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);
-
-                osfd = bottom->secret->md.osfd;
-
-#ifdef BSD_SELECT
-                if (FD_ISSET(osfd, &rd))
-#else
-                if( IsSocketSet(osfd, socks, 0, rd) )        
-#endif
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_READ)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-
-#ifdef BSD_SELECT
-                if (FD_ISSET(osfd, &wt))
-#else
-                if( IsSocketSet(osfd, socks, rd, wt) )        
-#endif
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_WRITE)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-
-#ifdef BSD_SELECT
-                if (FD_ISSET(osfd, &ex))
-#else
-                if( IsSocketSet(osfd, socks, rd+wt, ex) )        
-#endif
-                {
-                    out_flags |= PR_POLL_EXCEPT;
-                }
-            }
-            pd->out_flags = out_flags;
-            if (out_flags) ready++;
-        }
-        PR_ASSERT(ready > 0);
-    }
-    else if (ready < 0)
-    {
-        err = _MD_ERRNO();
-        if (err == EBADF)
-        {
-            /* Find the bad fds */
-            int optval;
-            int optlen = sizeof(optval);
-            ready = 0;
-            for (pd = pds, epd = pd + npds; pd < epd; pd++)
-            {
-                pd->out_flags = 0;
-                if ((NULL != pd->fd) && (0 != pd->in_flags))
-                {
-                    bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                    if (getsockopt(bottom->secret->md.osfd, SOL_SOCKET,
-                        SO_TYPE, (char *) &optval, &optlen) == -1)
-                    {
-                        PR_ASSERT(sock_errno() == ENOTSOCK);
-                        if (sock_errno() == ENOTSOCK)
-                        {
-                            pd->out_flags = PR_POLL_NVAL;
-                            ready++;
-                        }
-                    }
-                }
-            }
-            PR_ASSERT(ready > 0);
-        }
-        else
-            _PR_MD_MAP_SELECT_ERROR(err);
-    }
-
-#ifndef BSD_SELECT
-    PR_Free(socks);
-#endif
-    return ready;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2rng.c b/libs/js/nsprpub/pr/src/md/os2/os2rng.c
deleted file mode 100644
index 1c3a7b7abe..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2rng.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include <os2.h>
-#include <stdlib.h>
-#include <time.h>
-#include "primpl.h"
-
-static BOOL clockTickTime(unsigned long *phigh, unsigned long *plow)
-{
-    APIRET rc = NO_ERROR;
-    QWORD qword = {0,0};
-
-    rc = DosTmrQueryTime(&qword);
-    if (rc != NO_ERROR)
-       return FALSE;
-
-    *phigh = qword.ulHi;
-    *plow  = qword.ulLo;
-
-    return TRUE;
-}
-
-extern PRSize _PR_MD_GetRandomNoise(void *buf, PRSize size )
-{
-    unsigned long high = 0;
-    unsigned long low  = 0;
-    clock_t val = 0;
-    int n = 0;
-    int nBytes = 0;
-    time_t sTime;
-
-    if (size <= 0)
-       return 0;
-
-    clockTickTime(&high, &low);
-
-    /* get the maximally changing bits first */
-    nBytes = sizeof(low) > size ? size : sizeof(low);
-    memcpy(buf, &low, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-       return n;
-
-    nBytes = sizeof(high) > size ? size : sizeof(high);
-    memcpy(((char *)buf) + n, &high, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-       return n;
-
-    /* get the number of milliseconds that have elapsed since application started */
-    val = clock();
-
-    nBytes = sizeof(val) > size ? size : sizeof(val);
-    memcpy(((char *)buf) + n, &val, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-       return n;
-
-    /* get the time in seconds since midnight Jan 1, 1970 */
-    time(&sTime);
-    nBytes = sizeof(sTime) > size ? size : sizeof(sTime);
-    memcpy(((char *)buf) + n, &sTime, nBytes);
-    n += nBytes;
-
-    return n;
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2sem.c b/libs/js/nsprpub/pr/src/md/os2/os2sem.c
deleted file mode 100644
index 20b57a828c..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2sem.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * OS/2-specific semaphore handling code.
- *
- */
-
-#include "primpl.h"
-
-
-void
-_PR_MD_NEW_SEM(_MDSemaphore *md, PRUintn value)
-{
-   int rv;
-
-    /* Our Sems don't support a value > 1 */
-    PR_ASSERT(value <= 1);
-
-    rv = DosCreateEventSem(NULL, &md->sem, 0, 0);
-    PR_ASSERT(rv == NO_ERROR);
-}
-
-void
-_PR_MD_DESTROY_SEM(_MDSemaphore *md)
-{
-   int rv;
-   rv = DosCloseEventSem(md->sem);
-   PR_ASSERT(rv == NO_ERROR);
-
-}
-
-PRStatus
-_PR_MD_TIMED_WAIT_SEM(_MDSemaphore *md, PRIntervalTime ticks)
-{
-    int rv;
-    rv = DosWaitEventSem(md->sem, PR_IntervalToMilliseconds(ticks));
-
-    if (rv == NO_ERROR)
-        return PR_SUCCESS;
-    else
-        return PR_FAILURE;
-}
-
-PRStatus
-_PR_MD_WAIT_SEM(_MDSemaphore *md)
-{
-    return _PR_MD_TIMED_WAIT_SEM(md, PR_INTERVAL_NO_TIMEOUT);
-}
-
-void
-_PR_MD_POST_SEM(_MDSemaphore *md)
-{
-   int rv;
-   rv = DosPostEventSem(md->sem);
-   PR_ASSERT(rv == NO_ERROR); 
-}
-
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2sock.c b/libs/js/nsprpub/pr/src/md/os2/os2sock.c
deleted file mode 100644
index 3e8d8286ff..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2sock.c
+++ /dev/null
@@ -1,684 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* OS/2 Sockets module
- *
- */
-
-/*Note from DSR111297 - it should be noted that there are two flavors of select() on OS/2    */
-/*There is standard BSD (which is kind of slow) and a new flavor of select() that takes      */
-/*an integer list of sockets, the number of read sockets, write sockets, except sockets, and */
-/*a millisecond count for timeout. In the interest of performance I have choosen the OS/2    */
-/*specific version of select(). See OS/2 TCP/IP Programmer's Toolkit for more info.          */ 
-
-#include "primpl.h"
-
-#ifdef XP_OS2_EMX
- #include <sys/time.h> /* For timeval. */
-#endif
-
-#define _PR_INTERRUPT_CHECK_INTERVAL_SECS 5
-#define READ_FD   1
-#define WRITE_FD  2
-
-#ifdef XP_OS2_VACPP
-#define _OS2_WRITEV writev
-#define _OS2_IOCTL ioctl
-#else
-#define _OS2_WRITEV so_writev
-#define _OS2_IOCTL so_ioctl
-#endif
-
-/* --- SOCKET IO --------------------------------------------------------- */
-
-
-PRInt32
-_PR_MD_SOCKET(int domain, int type, int flags)
-{
-    PRInt32 osfd, err;
-
-    osfd = socket(domain, type, flags);
-
-    if (osfd == -1) 
-    {
-        err = sock_errno();
-        _PR_MD_MAP_SOCKET_ERROR(err);
-    }
-
-    return(osfd);
-}
-
-/*
-** _MD_CloseSocket() -- Close a socket
-**
-*/
-PRInt32
-_MD_CloseSocket(PRInt32 osfd)
-{
-    PRInt32 rv, err;
-
-    rv = soclose(osfd);
-    if (rv == -1) {
-        err = sock_errno();
-        _PR_MD_MAP_CLOSE_ERROR(err);
-    }
-    return rv;
-}
-
-PRInt32
-_MD_SocketAvailable(PRFileDesc *fd)
-{
-    PRInt32 result;
-
-    if (_OS2_IOCTL(fd->secret->md.osfd, FIONREAD, (char *) &result, sizeof(result)) < 0) {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, sock_errno());
-        return -1;
-    }
-    return result;
-}
-
-static PRInt32
-socket_io_wait( PRInt32 osfd, PRInt32 fd_type, PRIntervalTime timeout )
-{
-    PRInt32 rv = -1;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntervalTime epoch, now, elapsed, remaining;
-    PRBool wait_for_remaining;
-    PRInt32 syserror;
-#ifdef BSD_SELECT
-    struct timeval tv;
-    fd_set rd_wr;
-#else
-    int socks[1];
-    long lTimeout;
-#endif
-
-    switch (timeout) {
-        case PR_INTERVAL_NO_WAIT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-            break;
-        case PR_INTERVAL_NO_TIMEOUT:
-            /*
-             * This is a special case of the 'default' case below.
-             * Please see the comments there.
-             */
-#ifdef BSD_SELECT
-            tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-            tv.tv_usec = 0;
-            FD_ZERO(&rd_wr);
-            do {
-                FD_SET(osfd, &rd_wr);
-                if (fd_type == READ_FD)
-                    rv = bsdselect(osfd + 1, &rd_wr, NULL, NULL, &tv);
-                else
-                    rv = bsdselect(osfd + 1, NULL, &rd_wr, NULL, &tv);
-#else
-            lTimeout = _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000; 
-            do {
-                socks[0] = osfd;
-                if (fd_type == READ_FD)
-                    rv = os2_select(socks, 1, 0, 0, lTimeout);
-                else
-                    rv = os2_select(socks, 0, 1, 0, lTimeout);
-#endif                    
-                if (rv == -1 && (syserror = sock_errno()) != EINTR) {
-                    _PR_MD_MAP_SELECT_ERROR(syserror);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-        default:
-            now = epoch = PR_IntervalNow();
-            remaining = timeout;
-#ifdef BSD_SELECT
-            FD_ZERO(&rd_wr);
-#endif
-            do {
-                /*
-                 * We block in select for at most
-                 * _PR_INTERRUPT_CHECK_INTERVAL_SECS seconds,
-                 * so that there is an upper limit on the delay
-                 * before the interrupt bit is checked.
-                 */
-#ifdef BSD_SELECT
-                wait_for_remaining = PR_TRUE;
-                tv.tv_sec = PR_IntervalToSeconds(remaining);
-                if (tv.tv_sec > _PR_INTERRUPT_CHECK_INTERVAL_SECS) {
-                    wait_for_remaining = PR_FALSE;
-                    tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-                    tv.tv_usec = 0;
-                } else {
-                    tv.tv_usec = PR_IntervalToMicroseconds(
-                        remaining -
-                        PR_SecondsToInterval(tv.tv_sec));
-                }
-                FD_SET(osfd, &rd_wr);
-                if (fd_type == READ_FD)
-                    rv = bsdselect(osfd + 1, &rd_wr, NULL, NULL, &tv);
-                else
-                    rv = bsdselect(osfd + 1, NULL, &rd_wr, NULL, &tv);
-#else
-                wait_for_remaining = PR_TRUE;
-                lTimeout = PR_IntervalToMilliseconds(remaining);
-                if (lTimeout > _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000) {
-                    wait_for_remaining = PR_FALSE;
-                    lTimeout = _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000;
-                }
-                socks[0] = osfd;
-                if (fd_type == READ_FD)
-                    rv = os2_select(socks, 1, 0, 0, lTimeout);
-                else
-                    rv = os2_select(socks, 0, 1, 0, lTimeout);
-#endif
-                /*
-                 * we don't consider EINTR a real error
-                 */
-                if (rv == -1 && (syserror = sock_errno()) != EINTR) {
-                    _PR_MD_MAP_SELECT_ERROR(syserror);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-                /*
-                 * We loop again if select timed out or got interrupted
-                 * by a signal, and the timeout deadline has not passed yet.
-                 */
-                if (rv == 0 || (rv == -1 && syserror == EINTR)) {
-                    /*
-                     * If select timed out, we know how much time
-                     * we spent in blocking, so we can avoid a
-                     * PR_IntervalNow() call.
-                     */
-                    if (rv == 0) {
-                        if (wait_for_remaining) {
-                            now += remaining;
-                        } else {
-#ifdef BSD_SELECT
-                            now += PR_SecondsToInterval(tv.tv_sec)
-                                + PR_MicrosecondsToInterval(tv.tv_usec);
-#else
-                            now += PR_MillisecondsToInterval(lTimeout);
-#endif
-                        }
-                    } else {
-                        now = PR_IntervalNow();
-                    }
-                    elapsed = (PRIntervalTime) (now - epoch);
-                    if (elapsed >= timeout) {
-                        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                        rv = -1;
-                        break;
-                    } else {
-                        remaining = timeout - elapsed;
-                    }
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-        }
-    return(rv);
-}
-
-PRInt32
-_MD_Accept(PRFileDesc *fd, PRNetAddr *addr,
-           PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((rv = accept(osfd, (struct sockaddr*) addr, (int*)addrlen)) == -1)
-    {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK) || (err == ECONNABORTED))
-        {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-                if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                    goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_ACCEPT_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_CONNECT(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, 
-               PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRNetAddr addrCopy = *addr; /* Work around a bug in OS/2 where connect
-                                 * modifies the sockaddr structure.
-                                 * See Bugzilla bug 100776. */
-
-     /*
-      * We initiate the connection setup by making a nonblocking connect()
-      * call.  If the connect() call fails, there are two cases we handle
-      * specially:
-      * 1. The connect() call was interrupted by a signal.  In this case
-      *    we simply retry connect().
-      * 2. The NSPR socket is nonblocking and connect() fails with
-      *    EINPROGRESS.  We first wait until the socket becomes writable.
-      *    Then we try to find out whether the connection setup succeeded
-      *    or failed.
-      */
-
-retry:
-    if ((rv = connect(osfd, (struct sockaddr *)&addrCopy, addrlen)) == -1)
-    {
-        err = sock_errno();
-
-        if (err == EINTR) {
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-            goto retry;
-        }
-
-        if (!fd->secret->nonblocking && (err == EINPROGRESS))
-        {
-            /*
-             * socket_io_wait() may return -1 or 1.
-             */
-
-            rv = socket_io_wait(osfd, WRITE_FD, timeout);
-            if (rv == -1) {
-                return -1;
-            }
-
-            PR_ASSERT(rv == 1);
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-            err = _MD_os2_get_nonblocking_connect_error(osfd);
-            if (err != 0) {
-                _PR_MD_MAP_CONNECT_ERROR(err);
-                return -1;
-            }
-            return 0;
-        }
-        
-        _PR_MD_MAP_CONNECT_ERROR(err);
-    }
-
-    return rv;
-}  /* _MD_connect */
-
-PRInt32
-_PR_MD_BIND(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv, err;
-    rv = bind(fd->secret->md.osfd, (struct sockaddr *) addr, (int )addrlen);
-    if (rv < 0) {
-        err = sock_errno();
-        _PR_MD_MAP_BIND_ERROR(err);
-    }
-    return(rv);
-}
-
-
-PRInt32
-_PR_MD_LISTEN(PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 rv, err;
-    rv = listen(fd->secret->md.osfd, backlog);
-    if (rv < 0)  {
-        err = sock_errno();
-        _PR_MD_MAP_DEFAULT_ERROR(err);
-    }
-    return(rv);
-}
-
-
-PRInt32
-_PR_MD_RECV(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, 
-            PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((rv = recv(osfd,buf,amount,flags)) == -1)
-    {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_SEND(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-            PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((rv = send(osfd,buf,amount,flags)) == -1)
-    {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-
-     /*
-      * optimization; if bytes sent is less than "amount" call
-      * select before returning. This is because it is likely that
-      * the next send() call will return EWOULDBLOCK.
-      */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-        && (timeout != PR_INTERVAL_NO_WAIT))
-    {
-        if (socket_io_wait(osfd, WRITE_FD, timeout)< 0) {
-            rv = -1;
-            goto done;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SEND_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_SENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-              const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    while ((rv = sendto(osfd, buf, amount, flags,
-           (struct sockaddr *) addr, addrlen)) == -1)
-    {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK))
-        {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SENDTO_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_RECVFROM(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-                PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while( (*addrlen = PR_NETADDR_SIZE(addr)),
-           ((rv = recvfrom(osfd, buf, amount, flags,
-             (struct sockaddr *) addr, (int *)addrlen)) == -1))
-    {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECVFROM_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_WRITEV(PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-              PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 index, amount = 0;
-    PRInt32 osfd = fd->secret->md.osfd;
-
-     /*
-      * Calculate the total number of bytes to be sent; needed for
-      * optimization later.
-      * We could avoid this if this number was passed in; but it is
-      * probably not a big deal because iov_size is usually small (less than
-      * 3)
-      */
-    if (!fd->secret->nonblocking) {
-        for (index=0; index<iov_size; index++) {
-            amount += iov[index].iov_len;
-        }
-    }
-
-    while ((rv = _OS2_WRITEV(osfd, (const struct iovec*)iov, iov_size)) == -1) {
-        err = sock_errno();
-        if ((err == EWOULDBLOCK))    {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))<0)
-                goto done;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-
-     /*
-      * optimization; if bytes sent is less than "amount" call
-      * select before returning. This is because it is likely that
-      * the next writev() call will return EWOULDBLOCK.
-      */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-          && (timeout != PR_INTERVAL_NO_WAIT)) {
-        if (socket_io_wait(osfd, WRITE_FD, timeout) < 0) {
-            rv = -1;
-            goto done;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_WRITEV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_SHUTDOWN(PRFileDesc *fd, PRIntn how)
-{
-    PRInt32 rv;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-    if (rv < 0)
-        _PR_MD_MAP_SHUTDOWN_ERROR(sock_errno());
-    return rv;
-}
-
-#ifndef XP_OS2_VACPP
-PRInt32
-_PR_MD_SOCKETPAIR(int af, int type, int flags, PRInt32 *osfd)
-{
-    PRInt32 rv, err;
-
-    rv = socketpair(af, type, flags, osfd);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SOCKETPAIR_ERROR(err);
-    }
-    return rv;
-}
-#endif
-
-PRStatus
-_PR_MD_GETSOCKNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockname(fd->secret->md.osfd,
-                     (struct sockaddr *) addr, (int *)addrlen);
-    if (rv < 0) {
-        err = sock_errno();
-        _PR_MD_MAP_GETSOCKNAME_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_PR_MD_GETPEERNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getpeername(fd->secret->md.osfd,
-                     (struct sockaddr *) addr, (int *)addrlen);
-    if (rv < 0) {
-        err = sock_errno();
-        _PR_MD_MAP_GETPEERNAME_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_PR_MD_GETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname,
-                  char* optval, PRInt32* optlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockopt(fd->secret->md.osfd, level, optname, optval, (int *)optlen);
-    if (rv < 0) {
-        err = sock_errno();
-        _PR_MD_MAP_GETSOCKOPT_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus
-_PR_MD_SETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname,
-                  const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv, err;
-
-    rv = setsockopt(fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv < 0) {
-        err = sock_errno();
-        _PR_MD_MAP_SETSOCKOPT_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-void
-_MD_MakeNonblock(PRFileDesc *fd)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 err;
-    PRUint32  one = 1;
-    
-    if (osfd <= 2) {
-        /* Don't mess around with stdin, stdout or stderr */
-        return;
-    }
-
-    err = _OS2_IOCTL( osfd, FIONBIO, (char *) &one, sizeof(one));
-    if ( err != 0 )
-    {
-        err = sock_errno();
-        _PR_MD_MAP_SOCKET_ERROR(err);
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2thred.c b/libs/js/nsprpub/pr/src/md/os2/os2thred.c
deleted file mode 100644
index 69f06aa023..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2thred.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <process.h>  /* for _beginthread() */
-
-#ifdef XP_OS2_VACPP
-#include <time.h>     /* for _tzset() */
-#endif
-
-#ifdef XP_OS2_EMX
-#include <signal.h>
-#endif
-
-#include <float.h>
-
-/* --- globals ------------------------------------------------ */
-_NSPR_TLS*        pThreadLocalStorage = 0;
-_PRInterruptTable             _pr_interruptTable[] = { { 0 } };
-APIRET (* APIENTRY QueryThreadContext)(TID, ULONG, PCONTEXTRECORD);
-
-void
-_PR_MD_ENSURE_TLS(void)
-{
-   if(!pThreadLocalStorage)
-   {
-      /* Allocate thread local storage (TLS).  Note, that only 32 bytes can
-       * be allocated at a time. 
-       */
-      int rc = DosAllocThreadLocalMemory(sizeof(_NSPR_TLS) / 4, (PULONG*)&pThreadLocalStorage);
-      PR_ASSERT(rc == NO_ERROR);
-      memset(pThreadLocalStorage, 0, sizeof(_NSPR_TLS));
-   }
-}
-
-void
-_PR_MD_EARLY_INIT()
-{
-   HMODULE hmod;
-
-   if (DosLoadModule(NULL, 0, "DOSCALL1", &hmod) == 0)
-       DosQueryProcAddr(hmod, 877, "DOSQUERYTHREADCONTEXT",
-                        (PFN *)&QueryThreadContext);
-
-#ifdef XP_OS2_VACPP
-   _tzset();
-#endif
-}
-
-static void
-_pr_SetThreadMDHandle(PRThread *thread)
-{
-   PTIB ptib;
-   PPIB ppib;
-   PRUword rc;
-
-   rc = DosGetInfoBlocks(&ptib, &ppib);
-
-   thread->md.handle = ptib->tib_ptib2->tib2_ultid;
-}
-
-/* On OS/2, some system function calls seem to change the FPU control word,
- * such that we crash with a floating underflow exception.  The FIX_FPU() call
- * in jsnum.c does not always work, as sometimes FIX_FPU() is called BEFORE the
- * OS/2 system call that horks the FPU control word.  So, we set an exception
- * handler that covers any floating point exceptions and resets the FPU CW to
- * the required value.
- */
-static ULONG
-_System OS2_FloatExcpHandler(PEXCEPTIONREPORTRECORD p1,
-                             PEXCEPTIONREGISTRATIONRECORD p2,
-                             PCONTEXTRECORD p3,
-                             PVOID pv)
-{
-#ifdef DEBUG_pedemonte
-    printf("Entering exception handler; ExceptionNum = %x\n", p1->ExceptionNum);
-    switch(p1->ExceptionNum) {
-        case XCPT_FLOAT_DENORMAL_OPERAND:
-            printf("got XCPT_FLOAT_DENORMAL_OPERAND\n");
-            break;
-        case XCPT_FLOAT_DIVIDE_BY_ZERO:
-            printf("got XCPT_FLOAT_DIVIDE_BY_ZERO\n");
-            break;
-        case XCPT_FLOAT_INEXACT_RESULT:
-            printf("got XCPT_FLOAT_INEXACT_RESULT\n");
-            break;
-        case XCPT_FLOAT_INVALID_OPERATION:
-            printf("got XCPT_FLOAT_INVALID_OPERATION\n");
-            break;
-        case XCPT_FLOAT_OVERFLOW:
-            printf("got XCPT_FLOAT_OVERFLOW\n");
-            break;
-        case XCPT_FLOAT_STACK_CHECK:
-            printf("got XCPT_FLOAT_STACK_CHECK\n");
-            break;
-        case XCPT_FLOAT_UNDERFLOW:
-            printf("got XCPT_FLOAT_UNDERFLOW\n");
-            break;
-    }
-#endif
-
-    switch(p1->ExceptionNum) {
-        case XCPT_FLOAT_DENORMAL_OPERAND:
-        case XCPT_FLOAT_DIVIDE_BY_ZERO:
-        case XCPT_FLOAT_INEXACT_RESULT:
-        case XCPT_FLOAT_INVALID_OPERATION:
-        case XCPT_FLOAT_OVERFLOW:
-        case XCPT_FLOAT_STACK_CHECK:
-        case XCPT_FLOAT_UNDERFLOW:
-        {
-            unsigned cw = p3->ctx_env[0];
-            if ((cw & MCW_EM) != MCW_EM) {
-                /* Mask out all floating point exceptions */
-                p3->ctx_env[0] |= MCW_EM;
-                /* Following two lines set precision to 53 bit mantissa.  See jsnum.c */
-                p3->ctx_env[0] &= ~MCW_PC;
-                p3->ctx_env[0] |= PC_53;
-                return XCPT_CONTINUE_EXECUTION;
-            }
-        }
-    }
-    return XCPT_CONTINUE_SEARCH;
-}
-
-PR_IMPLEMENT(void)
-PR_OS2_SetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* excpreg)
-{
-    /* setup the exception handler for the thread */
-    APIRET rv;
-    excpreg->ExceptionHandler = OS2_FloatExcpHandler;
-    excpreg->prev_structure = NULL;
-    rv = DosSetExceptionHandler(excpreg);
-    PR_ASSERT(rv == NO_ERROR);
-}
-
-PR_IMPLEMENT(void)
-PR_OS2_UnsetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* excpreg)
-{
-    /* unset exception handler */
-    APIRET rv = DosUnsetExceptionHandler(excpreg);
-    PR_ASSERT(rv == NO_ERROR);
-}
-
-PRStatus
-_PR_MD_INIT_THREAD(PRThread *thread)
-{
-   APIRET rv;
-
-   if (thread->flags & (_PR_PRIMORDIAL | _PR_ATTACHED)) {
-      _pr_SetThreadMDHandle(thread);
-   }
-
-   /* Create the blocking IO semaphore */
-   rv = DosCreateEventSem(NULL, &(thread->md.blocked_sema), 0, 0);
-   return (rv == NO_ERROR) ? PR_SUCCESS : PR_FAILURE;
-}
-
-typedef struct param_store
-{
-    void (*start)(void *);
-    PRThread* thread;
-} PARAMSTORE;
-
-/* This is a small intermediate function that sets/unsets the exception
-   handler before calling the initial thread function */
-static void
-ExcpStartFunc(void* arg)
-{
-    EXCEPTIONREGISTRATIONRECORD excpreg;
-    PARAMSTORE params, *pParams = arg;
-
-    PR_OS2_SetFloatExcpHandler(&excpreg);
-
-    params = *pParams;
-    PR_Free(pParams);
-    params.start(params.thread);
-
-    PR_OS2_UnsetFloatExcpHandler(&excpreg);
-}
-
-PRStatus
-_PR_MD_CREATE_THREAD(PRThread *thread, 
-                  void (*start)(void *), 
-                  PRThreadPriority priority, 
-                  PRThreadScope scope, 
-                  PRThreadState state, 
-                  PRUint32 stackSize)
-{
-    PARAMSTORE* params = PR_Malloc(sizeof(PARAMSTORE));
-    params->start = start;
-    params->thread = thread;
-#ifdef XP_OS2_VACPP /* No exception handler for VACPP */
-    thread->md.handle = thread->id = (TID) _beginthread(
-                    (void(* _Optlink)(void*))start,
-                    NULL, 
-                    thread->stack->stackSize,
-                    thread);
-#else
-    thread->md.handle = thread->id = (TID) _beginthread(ExcpStartFunc,
-                                                        NULL, 
-                                                        thread->stack->stackSize,
-                                                        params);
-#endif
-    if(thread->md.handle == -1) {
-        return PR_FAILURE;
-    }
-
-    /*
-     * On OS/2, a thread is created with a thread priority of
-     * THREAD_PRIORITY_NORMAL
-     */
-
-    if (priority != PR_PRIORITY_NORMAL) {
-        _PR_MD_SET_PRIORITY(&(thread->md), priority);
-    }
-
-    return PR_SUCCESS;
-}
-
-void
-_PR_MD_YIELD(void)
-{
-    /* Isn't there some problem with DosSleep(0) on OS/2? */
-    DosSleep(0);
-}
-
-void
-_PR_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
-{
-    int nativePri;
-    BOOL rv;
-
-    if (newPri < PR_PRIORITY_FIRST) {
-        newPri = PR_PRIORITY_FIRST;
-    } else if (newPri > PR_PRIORITY_LAST) {
-        newPri = PR_PRIORITY_LAST;
-    }
-    switch (newPri) {
-        case PR_PRIORITY_LOW:
-            nativePri = PRTYC_IDLETIME;
-            break;
-        case PR_PRIORITY_NORMAL:
-            nativePri = PRTYC_REGULAR;
-            break;
-        case PR_PRIORITY_HIGH:
-            nativePri = PRTYC_FOREGROUNDSERVER;
-            break;
-        case PR_PRIORITY_URGENT:
-            nativePri = PRTYC_TIMECRITICAL;
-    }
-    rv = DosSetPriority(PRTYS_THREAD, nativePri, 0, thread->handle);
-    PR_ASSERT(rv == NO_ERROR);
-    if (rv != NO_ERROR) {
-	PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-                ("PR_SetThreadPriority: can't set thread priority\n"));
-    }
-    return;
-}
-
-void
-_PR_MD_CLEAN_THREAD(PRThread *thread)
-{
-    APIRET rv;
-
-    if (thread->md.blocked_sema) {
-        rv = DosCloseEventSem(thread->md.blocked_sema);
-        PR_ASSERT(rv == NO_ERROR);
-        thread->md.blocked_sema = 0;
-    }
-
-    if (thread->md.handle) {
-        thread->md.handle = 0;
-    }
-}
-
-void
-_PR_MD_EXIT_THREAD(PRThread *thread)
-{
-    _PR_MD_CLEAN_THREAD(thread);
-    _PR_MD_SET_CURRENT_THREAD(NULL);
-}
-
-
-void
-_PR_MD_EXIT(PRIntn status)
-{
-    _exit(status);
-}
-
-#ifdef HAVE_THREAD_AFFINITY
-PR_EXTERN(PRInt32) 
-_PR_MD_SETTHREADAFFINITYMASK(PRThread *thread, PRUint32 mask )
-{
-   /* Can we do this on OS/2?  Only on SMP versions? */
-   PR_ASSERT(!"Not implemented");
-   return 0;
-
- /* This is what windows does:
-    int rv;
-
-    rv = SetThreadAffinityMask(thread->md.handle, mask);
-
-    return rv?0:-1;
-  */
-}
-
-PR_EXTERN(PRInt32)
-_PR_MD_GETTHREADAFFINITYMASK(PRThread *thread, PRUint32 *mask)
-{
-   /* Can we do this on OS/2?  Only on SMP versions? */
-   PR_ASSERT(!"Not implemented");
-   return 0;
-
- /* This is what windows does:
-    PRInt32 rv, system_mask;
-
-    rv = GetProcessAffinityMask(GetCurrentProcess(), mask, &system_mask);
-    
-    return rv?0:-1;
-  */
-}
-#endif /* HAVE_THREAD_AFFINITY */
-
-void
-_PR_MD_SUSPEND_CPU(_PRCPU *cpu) 
-{
-    _PR_MD_SUSPEND_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_RESUME_CPU(_PRCPU *cpu)
-{
-    _PR_MD_RESUME_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_SUSPEND_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-       APIRET rc;
-
-        /* XXXMB - DosSuspendThread() is not a blocking call; how do we
-         * know when the thread is *REALLY* suspended?
-         */
-       rc = DosSuspendThread(thread->md.handle);
-       PR_ASSERT(rc == NO_ERROR);
-    }
-}
-
-void
-_PR_MD_RESUME_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        DosResumeThread(thread->md.handle);
-    }
-}
-
-
-PRThread*
-_MD_CURRENT_THREAD(void)
-{
-    PRThread *thread;
-
-    thread = _MD_GET_ATTACHED_THREAD();
-
-    if (NULL == thread) {
-        thread = _PRI_AttachThread(PR_USER_THREAD, PR_PRIORITY_NORMAL, NULL, 0);
-    }
-
-    PR_ASSERT(thread != NULL);
-    return thread;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s b/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s
deleted file mode 100644
index 106df3de0e..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2vaclegacy.s
+++ /dev/null
@@ -1,74 +0,0 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/ 
-/ The contents of this file are subject to the Mozilla Public
-/ License Version 1.1 (the "License"); you may not use this file
-/ except in compliance with the License. You may obtain a copy of
-/ the License at http://www.mozilla.org/MPL/
-/ 
-/ Software distributed under the License is distributed on an "AS
-/ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-/ implied. See the License for the specific language governing
-/ rights and limitations under the License.
-/ 
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/ 
-/ The Initial Developer of the Original Code is InnoTek
-/ Systemberatung GmbH.
-/ Portions created by the Initial Developer are Copyright (C) 2003
-/ the Initial Developer. All Rights Reserved.
-/ 
-/ Contributor(s):
-/    InnoTek Systemberatung GmbH / Knut St. Osmundsen
-/ 
-/ Alternatively, the contents of this file may be used under the
-/ terms of the GNU General Public License Version 2 or later (the
-/ "GPL"), in which case the provisions of the GPL are applicable 
-/ instead of those above.  If you wish to allow use of your 
-/ version of this file only under the terms of the GPL and not to
-/ allow others to use your version of this file under the MPL,
-/ indicate your decision by deleting the provisions above and
-/ replace them with the notice and other provisions required by
-/ the GPL.  If you do not delete the provisions above, a recipient
-/ may use your version of this file under either the MPL or the
-/ GPL.
-/ 
-
-    .text
-    .align 4
-    .globl PR_NewMonitor
-PR_NewMonitor:
-    jmp _PR_NewMonitor
-
-    .align 4
-    .globl PR_EnterMonitor
-PR_EnterMonitor:
-    mov     %eax,  4(%esp) 
-    jmp _PR_EnterMonitor
-
-    .align 4
-    .globl PR_ExitMonitor 
-PR_ExitMonitor:
-    mov     %eax,  4(%esp) 
-    jmp _PR_ExitMonitor 
-
-
-    
-    .align 4
-    .globl PR_AttachThread
-PR_AttachThread:
-    mov     %eax,  4(%esp) 
-    mov     %edx,  8(%esp) 
-    mov     %ecx, 12(%esp)
-    jmp _PR_AttachThread
-    
-    .align 4
-    .globl PR_DetachThread
-PR_DetachThread:
-    jmp _PR_DetachThread
-    
-    .align 4
-    .globl PR_GetCurrentThread
-PR_GetCurrentThread:
-    jmp _PR_GetCurrentThread
-
-
diff --git a/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm b/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm
deleted file mode 100644
index 58cbbf691b..0000000000
--- a/libs/js/nsprpub/pr/src/md/os2/os2vacpp.asm
+++ /dev/null
@@ -1,266 +0,0 @@
-; -*- Mode: asm; tab-width: 8; c-basic-offset: 4 -*-
-
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; The contents of this file are subject to the Mozilla Public License Version
-; 1.1 (the "License"); you may not use this file except in compliance with
-; the License. You may obtain a copy of the License at
-; http://www.mozilla.org/MPL/
-;
-; Software distributed under the License is distributed on an "AS IS" basis,
-; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-; for the specific language governing rights and limitations under the
-; License.
-;
-; The Original Code is the Netscape Portable Runtime (NSPR).
-;
-; The Initial Developer of the Original Code is
-; IBM Corporation.
-; Portions created by the Initial Developer are Copyright (C) 2001
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either the GNU General Public License Version 2 or later (the "GPL"), or
-; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK *****
-
-; Windows uses inline assembly for their atomic functions, so we have
-; created an assembly file for VACPP on OS/2.
-;
-; This assembly file also contains an implementation of RAM semaphores.
-;
-; Notes:
-;   The ulTIDPID element of the RAMSEM structure is overloaded in the 386
-;   implementation to hold the TID:PID in the lower 31 bits and the lock
-;   bit in the high bit
-
-        page ,132
-
-        .486P
-        ASSUME  CS:FLAT,  DS:FLAT,  SS:FLAT,  ES:FLAT,  FS:FLAT
-
-        EXTRN   Dos32PostEventSem:PROC
-        EXTRN   Dos32WaitEventSem:PROC
-        EXTRN   Dos32ResetEventSem:PROC
-
-ramsem  STRUC
-        ramsem_ulTIDPID         DD      ?
-        ramsem_hevSem           DD      ?
-        ramsem_cLocks           DD      ?
-        ramsem_cWaiting         DW      ?
-        ramsem_cPosts           DW      ?
-ramsem  ENDS
-
-ERROR_SEM_TIMEOUT               equ     121
-ERROR_NOT_OWNER                 equ     288
-SEM_RELEASE_UNOWNED             equ     1
-SEM_RELEASE_ALL                 equ     2
-TS_LOCKBIT                      equ     31
-
-
-DATA    SEGMENT DWORD USE32 PUBLIC 'DATA'
-
-        EXTRN   plisCurrent:DWORD
-
-DATA    ENDS
-
-CODE32  SEGMENT USE32 PUBLIC 'CODE'
-
-        PUBLIC  SemRequest486
-        PUBLIC  SemReleasex86
-
-        PUBLIC  _PR_MD_ATOMIC_SET
-        PUBLIC  _PR_MD_ATOMIC_ADD
-        PUBLIC  _PR_MD_ATOMIC_INCREMENT
-        PUBLIC  _PR_MD_ATOMIC_DECREMENT
-
-;;;---------------------------------------------------------------------------
-;;; APIRET _Optlink SemRequest(PRAMSEM pramsem, ULONG ulTimeout);
-;;;
-;;; Registers:
-;;;   EAX - packed TID:PID word
-;;;   ECX - address of RAMSEM structure
-;;;   EDX - length of timeout in milli-seconds
-;;;---------------------------------------------------------------------------
-
-        ALIGN   10H
-SemRequest486     PROC
-        push    ebx                                  ; Save ebx (volatile)
-        mov     ecx, eax                             ; PRAMSEM must be in ecx,
-                                                     ; not eax, for cmpxchg
-
-        mov     ebx, dword ptr [plisCurrent]
-        mov     eax, dword ptr [ebx+4]               ; Place thread id in high
-                                                     ; word, process id in low
-        mov     ax,  word ptr [ebx]                  ; word
-        mov     ebx,eax
-
-req486_test:
-        xor     eax,eax
-        cmp     (ramsem PTR [ecx]).ramsem_ulTIDPID, ebx ; If we own the sem, just
-        jz short req486_inc_exit                      ; increment the use count
-
-        lock inc     (ramsem PTR [ecx]).ramsem_cWaiting ; inc waiting flag
-
-;       lock                                         ; Uncomment for SMP
-        DB      0F0h
-;       cmpxchg (ramsem PTR [ecx]).ramsem_ulTIDPID, ebx
-;         (byte 3 is the offset of ulProcessThread into the RAMSEM structure)
-        DB      00Fh
-        DB      0B1h
-        DB      019h
-        jnz short req486_sleep
-
-req486_inc_exit:
-   lock inc     (ramsem PTR [ecx]).ramsem_cLocks
-
-req486_exit:
-        pop     ebx                                  ; Restore ebx
-        ret
-
-req486_sleep:
-        push    ecx                                  ; Save ecx (volatile)
-        push    edx                                  ; Save edx (volatile)
-        push    edx                                  ; timeout
-        push    (ramsem PTR [ecx]).ramsem_hevSem
-        call    Dos32WaitEventSem
-        add     esp, 8
-        pop     edx                                  ; restore edx
-        pop     ecx                                  ; restore ecx
-        or      eax, eax
-        jne     req486_exit                          ; Exit, if error
-
-        push    ecx                                  ; Save ecx (volatile)
-        push    edx                                  ; Save edx (volatile)
-        sub     esp, 4                               ; Use stack space for
-        push    esp                                  ;  dummy pulPostCt
-        push    (ramsem PTR [ecx]).ramsem_hevSem
-        call    Dos32ResetEventSem
-        add     esp, 12
-        pop     edx                                  ; restore edx
-        pop     ecx                                  ; restore ecx
-        jmp     req486_test                          ; Retry the semaphore
-
-SemRequest486     ENDP
-
-;;;---------------------------------------------------------------------
-;;; APIRET _Optlink SemReleasex86(PRAMSEM pramsem, ULONG flFlags);
-;;;
-;;; Registers:
-;;;   EAX - address of RAMSEM structure
-;;;   ECX - temporary variable
-;;;   EDX - flags
-;;;---------------------------------------------------------------------
-
-        ALIGN   10H
-SemReleasex86     PROC
-        test    edx, SEM_RELEASE_UNOWNED             ; If set, don't bother
-        jnz short rel_ownerok                        ; getting/checking PID/TID
-
-        push    ebx                                  ; Save ebx (volatile)
-        mov     ebx, dword ptr [plisCurrent]
-        mov     ecx, dword ptr [ebx+4]               ; Place thread id in high
-                                                     ; word, process id in low
-        mov     cx,  word ptr [ebx]                  ; word
-        pop     ebx                                  ; Restore ebx
-
-        sub     ecx, (ramsem PTR [eax]).ramsem_ulTIDPID ; This thread the owner?
-        shl     ecx,1                                ; Don't compare top bit
-        jnz short rel_notowner
-
-rel_ownerok:
-        test    edx, SEM_RELEASE_ALL
-        jnz short rel_clear
-
-   lock dec     (ramsem PTR [eax]).ramsem_cLocks
-        jnz short rel_exit
-
-rel_disown:
-        mov     (ramsem PTR [eax]).ramsem_ulTIDPID, 0
-
-   lock inc     (ramsem PTR [eax]).ramsem_cPosts
-        mov     cx, (ramsem PTR [eax]).ramsem_cWaiting
-        cmp     (ramsem PTR [eax]).ramsem_cPosts, cx
-        jne short rel_post
-
-rel_exit:
-        xor     eax, eax
-        ret
-
-rel_clear:
-   lock mov     (ramsem PTR [eax]).ramsem_cLocks,0
-        jmp     rel_disown
-
-rel_notowner:
-        mov     eax, ERROR_NOT_OWNER
-        ret
-
-rel_post:
-        mov     (ramsem PTR [eax]).ramsem_cPosts, cx
-        push    (ramsem PTR [eax]).ramsem_hevSem
-        call    Dos32PostEventSem
-        add     esp,4
-        xor     eax,eax
-        ret
-SemReleasex86     ENDP
-
-;;;---------------------------------------------------------------------
-;;; PRInt32 _Optlink _PR_MD_ATOMIC_SET(PRInt32* val, PRInt32 newval)
-;;;---------------------------------------------------------------------
-        ALIGN   10H
-_PR_MD_ATOMIC_SET     proc
-        xchg    dword ptr [eax],edx
-        mov eax, edx;
-        ret
-_PR_MD_ATOMIC_SET     endp
-
-;;;---------------------------------------------------------------------
-;;; PRInt32 _Optlink _PR_MD_ATOMIC_ADD(PRInt32* ptr, PRInt32 val)
-;;;---------------------------------------------------------------------
-        ALIGN   10H
-_PR_MD_ATOMIC_ADD     proc
-        mov ecx, edx
-        lock xadd dword ptr [eax], edx
-        mov eax, edx
-        add eax, ecx
-        ret
-_PR_MD_ATOMIC_ADD     endp
-
-;;;---------------------------------------------------------------------
-;;; PRInt32 _Optlink _PR_MD_ATOMIC_INCREMENT(PRInt32* val)
-;;;---------------------------------------------------------------------
-        ALIGN   10H
-_PR_MD_ATOMIC_INCREMENT     proc
-        mov edx, 1
-        lock xadd dword ptr [eax], edx
-        mov eax, edx
-        inc eax
-        ret
-_PR_MD_ATOMIC_INCREMENT     endp
-
-;;;---------------------------------------------------------------------
-;;; PRInt32 _Optlink _PR_MD_ATOMIC_DECREMENT(PRInt32* val)
-;;;---------------------------------------------------------------------
-        ALIGN   10H
-_PR_MD_ATOMIC_DECREMENT     proc
-        mov edx, 0ffffffffh
-        lock xadd dword ptr [eax], edx
-        mov eax, edx
-        dec eax
-        ret
-_PR_MD_ATOMIC_DECREMENT     endp
-
-CODE32  ENDS
-END
diff --git a/libs/js/nsprpub/pr/src/md/prosdep.c b/libs/js/nsprpub/pr/src/md/prosdep.c
deleted file mode 100644
index 0f01b84c71..0000000000
--- a/libs/js/nsprpub/pr/src/md/prosdep.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prbit.h"
-#include "prsystem.h"
-
-#ifdef XP_UNIX
-#include <unistd.h>
-#endif
-#ifdef SUNOS4
-#include "md/sunos4.h"
-#endif
-#ifdef _WIN32
-#include <windows.h>
-#endif 
-#ifdef XP_BEOS
-#include <OS.h>
-#endif
-
-PRInt32 _pr_pageShift;
-PRInt32 _pr_pageSize;
-
-/*
-** Get system page size
-*/
-static void GetPageSize(void)
-{
-	PRInt32 pageSize;
-
-    /* Get page size */
-#ifdef XP_UNIX
-#if defined SUNOS4 || defined BSDI || defined AIX \
-        || defined LINUX || defined __GNU__ || defined __GLIBC__ \
-        || defined FREEBSD || defined NETBSD || defined OPENBSD \
-        || defined DARWIN || defined NEXTSTEP
-    _pr_pageSize = getpagesize();
-#elif defined(HPUX)
-    /* I have no idea. Don't get me started. --Rob */
-    _pr_pageSize = sysconf(_SC_PAGE_SIZE);
-#else
-    _pr_pageSize = sysconf(_SC_PAGESIZE);
-#endif
-#endif /* XP_UNIX */
-
-#ifdef XP_MAC
-    _pr_pageSize = 4096;
-#endif /* XP_MAC */
-
-#ifdef XP_BEOS
-    _pr_pageSize = B_PAGE_SIZE;
-#endif
-
-#ifdef XP_PC
-#ifdef _WIN32
-    SYSTEM_INFO info;
-    GetSystemInfo(&info);
-    _pr_pageSize = info.dwPageSize;
-#else
-    _pr_pageSize = 4096;
-#endif
-#endif /* XP_PC */
-
-	pageSize = _pr_pageSize;
-	PR_CEILING_LOG2(_pr_pageShift, pageSize);
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetPageShift(void)
-{
-    if (!_pr_pageSize) {
-	GetPageSize();
-    }
-    return _pr_pageShift;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetPageSize(void)
-{
-    if (!_pr_pageSize) {
-	GetPageSize();
-    }
-    return _pr_pageSize;
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/.cvsignore b/libs/js/nsprpub/pr/src/md/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/md/unix/Makefile.in b/libs/js/nsprpub/pr/src/md/unix/Makefile.in
deleted file mode 100644
index 6911ef06e0..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/Makefile.in
+++ /dev/null
@@ -1,133 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-CSRCS =          \
-	unix.c    \
-	unix_errors.c    \
-	uxproces.c \
-	uxwrap.c \
-	$(NULL)
-
-ifneq ($(USE_PTHREADS),1)
-CSRCS += uxpoll.c
-endif
-
-ifeq ($(PTHREADS_USER),1)
-CSRCS += pthreads_user.c
-endif
-
-CSRCS += $(PR_MD_CSRCS)
-ASFILES += $(PR_MD_ASFILES)
-
-TARGETS = $(OBJS)
-
-ifeq ($(OS_ARCH),SunOS)
-	ifneq ($(OS_RELEASE),4.1.3_U1)
-		ifeq ($(OS_TEST),sun4u)
-		ifdef USE_64
-			ULTRASPARC_ASFILES = os_SunOS_sparcv9.s
-			ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
-		else
-			LIBRARY_NAME = $(ULTRASPARC_LIBRARY)
-			LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
-			ULTRASPARC_ASFILES = os_SunOS_ultrasparc.s
-			ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
-			TARGETS		+= $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
-			RELEASE_LIBS = $(SHARED_LIBRARY)
-			RELEASE_LIBS_DEST = $(RELEASE_LIB_DIR)/cpu/sparcv8plus
-			lib_subdir = cpu/sparcv8plus
-		endif
-		endif
-	endif
-endif
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
-ifeq ($(OS_ARCH),SunOS)
-ifneq ($(OS_RELEASE),4.1.3_U1)
-ifeq ($(OS_TEST),sun4u)
-
-ifdef USE_64
-$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
-	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v9 $<
-else
-$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
-	$(LD) -G -z text -z endfiltee -o $@ $(ULTRASPARC_ASOBJS)
-	$(INSTALL) -m 444 $@ $(dist_libdir)/cpu/sparcv8plus
-	$(INSTALL) -m 444 $@ $(dist_bindir)/cpu/sparcv8plus
-#
-# The -f $(ORIGIN)/... linker flag uses the real file, after symbolic links
-# are resolved, as the origin.  If NSDISTMODE is not "copy", libnspr4.so
-# will be installed as a symbolic link in $(dist_libdir), pointing to the
-# real libnspr4.so file in pr/src.  Therefore we need to install an
-# additional copy of libnspr_flt4.so in pr/src/cpu/sparcv8plus.
-#
-ifneq ($(NSDISTMODE),copy)
-	$(INSTALL) -m 444 $@ ../../cpu/sparcv8plus
-endif
-
-ifneq ($(NSDISTMODE),copy)
-clobber realclean clobber_all distclean::
-	rm -rf ../../cpu
-endif
-
-$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
-	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $<
-
-clean::
-	rm -rf $(ULTRASPARC_ASOBJS)
-endif
-
-endif
-endif
-endif
diff --git a/libs/js/nsprpub/pr/src/md/unix/aix.c b/libs/js/nsprpub/pr/src/md/unix/aix.c
deleted file mode 100644
index ae945b1bd8..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/aix.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#ifdef AIX_HAVE_ATOMIC_OP_H
-#include <sys/atomic_op.h>
-
-PRInt32 _AIX_AtomicSet(PRInt32 *val, PRInt32 newval)
-{
-    PRIntn oldval;
-    boolean_t stored;
-    oldval = fetch_and_add((atomic_p)val, 0);
-    do
-    {
-        stored = compare_and_swap((atomic_p)val, &oldval, newval);
-    } while (!stored);
-    return oldval;
-}  /* _AIX_AtomicSet */
-#endif /* AIX_HAVE_ATOMIC_OP_H */
-
-#if defined(AIX_TIMERS)
-
-#include <sys/time.h>
-
-static PRUint32 _aix_baseline_epoch;
-
-static void _MD_AixIntervalInit(void)
-{
-    timebasestruct_t real_time;
-    read_real_time(&real_time, TIMEBASE_SZ);
-    (void)time_base_to_time(&real_time, TIMEBASE_SZ);
-    _aix_baseline_epoch = real_time.tb_high;
-}  /* _MD_AixIntervalInit */
-
-PRIntervalTime _MD_AixGetInterval(void)
-{
-    PRIntn rv;
-    PRUint64 temp;
-    timebasestruct_t real_time;
-    read_real_time(&real_time, TIMEBASE_SZ);
-    (void)time_base_to_time(&real_time, TIMEBASE_SZ);
-    /* tb_high is in seconds, tb_low in 10(-9)seconds */
-    temp = 1000000000ULL * (PRUint64)(real_time.tb_high - _aix_baseline_epoch);
-    temp += (PRUint64)real_time.tb_low;  /* everything's 10(-9) seconds */
-    temp >>= 16;  /* now it's something way different */
-    return (PRIntervalTime)temp;
-}  /* _MD_AixGetInterval */
-
-PRIntervalTime _MD_AixIntervalPerSec(void)
-{
-    return 1000000000ULL >> 16;  /* that's 15258, I think */
-}  /* _MD_AixIntervalPerSec */
-
-#endif /* defined(AIX_TIMERS) */
-
-#if !defined(PTHREADS_USER)
-
-#if defined(_PR_PTHREADS)
-
-/*
- * AIX 4.3 has sched_yield().  AIX 4.2 has pthread_yield().
- * So we look up the appropriate function pointer at run time.
- */
-
-#include <dlfcn.h>
-
-int (*_PT_aix_yield_fcn)() = NULL;
-int _pr_aix_send_file_use_disabled = 0;
-
-void _MD_EarlyInit(void)
-{
-    void *main_app_handle;
-	char *evp;
-
-    main_app_handle = dlopen(NULL, RTLD_NOW);
-    PR_ASSERT(NULL != main_app_handle);
-
-    _PT_aix_yield_fcn = (int(*)())dlsym(main_app_handle, "sched_yield");
-    if (!_PT_aix_yield_fcn) {
-        _PT_aix_yield_fcn = (int(*)())dlsym(main_app_handle,"pthread_yield");
-        PR_ASSERT(NULL != _PT_aix_yield_fcn);
-    }
-    dlclose(main_app_handle);
-
-	if (evp = getenv("NSPR_AIX_SEND_FILE_USE_DISABLED")) {
-		if (1 == atoi(evp))
-			_pr_aix_send_file_use_disabled = 1;
-	}
-
-#if defined(AIX_TIMERS)
-    _MD_AixIntervalInit();
-#endif
-}
-
-#else /* _PR_PTHREADS */
-
-void _MD_EarlyInit(void)
-{
-#if defined(AIX_TIMERS)
-    _MD_AixIntervalInit();
-#endif
-}
-
-#endif /* _PR_PTHREADS */
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-PR_IMPLEMENT(void)
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for AIX */
-PR_IMPLEMENT(void)
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for AIX.");
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for AIX.");
-}
-#endif /* _PR_PTHREADS */
-#endif /* PTHREADS_USER */
-
-/*
- * NSPR 2.0 overrides the system select() and poll() functions.
- * On AIX 4.2, we use dlopen("/unix", RTLD_NOW) and dlsym() to get
- * at the original system select() and poll() functions.
- */
-
-#if !defined(AIX_RENAME_SELECT)
-
-#include <sys/select.h>
-#include <sys/poll.h>
-#include <dlfcn.h>
-
-static int (*aix_select_fcn)() = NULL;
-static int (*aix_poll_fcn)() = NULL;
-
-int _MD_SELECT(int width, fd_set *r, fd_set *w, fd_set *e, struct timeval *t)
-{
-    int rv;
-
-    if (!aix_select_fcn) {
-        void *aix_handle;
-
-	aix_handle = dlopen("/unix", RTLD_NOW);
-	if (!aix_handle) {
-	    PR_SetError(PR_UNKNOWN_ERROR, 0);
-	    return -1;
-	}
-	aix_select_fcn = (int(*)())dlsym(aix_handle,"select");
-        dlclose(aix_handle);
-	if (!aix_select_fcn) {
-	    PR_SetError(PR_UNKNOWN_ERROR, 0);
-	    return -1;
-	}
-    }
-    rv = (*aix_select_fcn)(width, r, w, e, t);
-    return rv;
-}
-
-int _MD_POLL(void *listptr, unsigned long nfds, long timeout)
-{
-    int rv;
-
-    if (!aix_poll_fcn) {
-        void *aix_handle;
-
-	aix_handle = dlopen("/unix", RTLD_NOW);
-	if (!aix_handle) {
-	    PR_SetError(PR_UNKNOWN_ERROR, 0);
-	    return -1;
-	}
-	aix_poll_fcn = (int(*)())dlsym(aix_handle,"poll");
-        dlclose(aix_handle);
-	if (!aix_poll_fcn) {
-	    PR_SetError(PR_UNKNOWN_ERROR, 0);
-	    return -1;
-	}
-    }
-    rv = (*aix_poll_fcn)(listptr, nfds, timeout);
-    return rv;
-}
-
-#else
-
-/*
- * In AIX versions prior to 4.2, we use the two-step rename/link trick.
- * The binary must contain at least one "poll" symbol for linker's rename
- * to work.  So we must have this dummy function that references poll().
- */
-#include <sys/poll.h>
-void _pr_aix_dummy()
-{
-    poll(0,0,0);
-}
-
-#endif /* !defined(AIX_RENAME_SELECT) */
-
-#ifdef _PR_HAVE_ATOMIC_CAS
-
-#include "pratom.h"
-
-#define _PR_AIX_ATOMIC_LOCK	-1
-
-PR_IMPLEMENT(void)
-PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
-{
-PRStackElem *addr;
-boolean_t locked = TRUE;
-
-	/* Is it safe to cast a pointer to an int? */
-	PR_ASSERT(sizeof(int) == sizeof(PRStackElem *));
-	do {
-		while ((addr = stack->prstk_head.prstk_elem_next) ==
-											(PRStackElem *)_PR_AIX_ATOMIC_LOCK)
-			;
-		locked = _check_lock((atomic_p) &stack->prstk_head.prstk_elem_next,
-							(int) addr, _PR_AIX_ATOMIC_LOCK);
-	} while (locked == TRUE);
-	stack_elem->prstk_elem_next = addr;
-	_clear_lock((atomic_p)&stack->prstk_head.prstk_elem_next, (int)stack_elem);
-    return;
-}
-
-PR_IMPLEMENT(PRStackElem *)
-PR_StackPop(PRStack *stack)
-{
-PRStackElem *element;
-boolean_t locked = TRUE;
-
-	/* Is it safe to cast a pointer to an int? */
-	PR_ASSERT(sizeof(int) == sizeof(PRStackElem *));
-	do {
-		while ((element = stack->prstk_head.prstk_elem_next) ==
-										(PRStackElem *) _PR_AIX_ATOMIC_LOCK)
-			;
-		locked = _check_lock((atomic_p) &stack->prstk_head.prstk_elem_next,
-							(int)element, _PR_AIX_ATOMIC_LOCK);
-	} while (locked == TRUE);
-
-	if (element == NULL) {
-		_clear_lock((atomic_p) &stack->prstk_head.prstk_elem_next, NULL);
-	} else {
-		_clear_lock((atomic_p) &stack->prstk_head.prstk_elem_next,
-										(int) element->prstk_elem_next);
-	}
-	return element;
-}
-
-#endif	/* _PR_HAVE_ATOMIC_CAS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/aixwrap.c b/libs/js/nsprpub/pr/src/md/unix/aixwrap.c
deleted file mode 100644
index d829710af9..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/aixwrap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:		aixwrap.c
- * Description:
- *     This file contains a single function, _MD_SELECT(), which simply
- *     invokes the select() function.  This file is used in an ugly
- *     hack to override the system select() function on AIX releases
- *     prior to 4.2.  (On AIX 4.2, we use a different mechanism to
- *     override select().)
- */
-
-#ifndef AIX_RENAME_SELECT
-#error aixwrap.c should only be used on AIX 3.2 or 4.1
-#else
-
-#include <sys/select.h>
-#include <sys/poll.h>
-
-int _MD_SELECT(int width, fd_set *r, fd_set *w, fd_set *e, struct timeval *t)
-{
-    return select(width, r, w, e, t);
-}
-
-int _MD_POLL(void *listptr, unsigned long nfds, long timeout)
-{
-    return poll(listptr, nfds, timeout);
-}
-
-#endif /* AIX_RENAME_SELECT */
diff --git a/libs/js/nsprpub/pr/src/md/unix/bsdi.c b/libs/js/nsprpub/pr/src/md/unix/bsdi.c
deleted file mode 100644
index 646766335b..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/bsdi.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-
-void _MD_EarlyInit(void)
-{
-    /*
-     * Ignore FPE because coercion of a NaN to an int causes SIGFPE
-     * to be raised.
-     */
-    struct sigaction act;
-
-    act.sa_handler = SIG_IGN;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_RESTART;
-    sigaction(SIGFPE, &act, 0);
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-    *np = 0;
-    return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for BSDI */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for BSDI.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for BSDI.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/darwin.c b/libs/js/nsprpub/pr/src/md/unix/darwin.c
deleted file mode 100644
index 3a1329e709..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/darwin.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#if !defined(_PR_PTHREADS)
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#if !defined(_PR_PTHREADS)
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Darwin */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Darwin.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Darwin.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
-
-/* darwin.c */
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/dgux.c b/libs/js/nsprpub/pr/src/md/unix/dgux.c
deleted file mode 100644
index 2874d9ea9f..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/dgux.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/*
- * using only NSPR threads here
- *
- *  Copied from the UnixWare implementation.  Should be kept in sync
- *  with ../../../include/md/_dgux.h.
- */
-
-#include <setjmp.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-        (void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-        PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for DG/UX */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for DG/UX.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for DG/UX.");
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/freebsd.c b/libs/js/nsprpub/pr/src/md/unix/freebsd.c
deleted file mode 100644
index dce244a3db..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/freebsd.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-
-void _MD_EarlyInit(void)
-{
-    /*
-     * Ignore FPE because coercion of a NaN to an int causes SIGFPE
-     * to be raised.
-     */
-    struct sigaction act;
-
-    act.sa_handler = SIG_IGN;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_RESTART;
-    sigaction(SIGFPE, &act, 0);
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) sigsetjmp(CONTEXT(t), 1);
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for FreeBSD */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for FreeBSD.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for FreeBSD.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/hpux.c b/libs/js/nsprpub/pr/src/md/unix/hpux.c
deleted file mode 100644
index cf43e05ed8..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/hpux.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <setjmp.h>
-
-#if defined(HPUX_LW_TIMER)
-
-#include <machine/inline.h>
-#include <machine/clock.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/pstat.h>
-
-int __lw_get_thread_times(int which, int64_t *sample, int64_t *time);
-
-static double msecond_per_itick;
-
-void _PR_HPUX_LW_IntervalInit(void)
-{
-    struct pst_processor psp;
-    int iticksperclktick, clk_tck;
-    int rv;
-
-    rv = pstat_getprocessor(&psp, sizeof(psp), 1, 0);
-    PR_ASSERT(rv != -1);
-
-    iticksperclktick = psp.psp_iticksperclktick;
-    clk_tck = sysconf(_SC_CLK_TCK);
-    msecond_per_itick = (1000.0)/(double)(iticksperclktick * clk_tck);
-}
-
-PRIntervalTime _PR_HPUX_LW_GetInterval(void)
-{
-    int64_t time, sample;
-
-    __lw_get_thread_times(1, &sample, &time);
-    /*
-     * Division is slower than float multiplication.
-     * return (time / iticks_per_msecond);
-     */
-    return (time * msecond_per_itick);
-}
-#endif  /* HPUX_LW_TIMER */
-
-#if !defined(PTHREADS_USER)
-
-void _MD_EarlyInit(void)
-{
-#ifndef _PR_PTHREADS
-    /*
-     * The following piece of code is taken from ns/nspr/src/md_HP-UX.c.
-     * In the comment for revision 1.6, dated 1995/09/11 23:33:34,
-     * robm says:
-     *     This version has some problems which need to be addressed.
-     *     First, intercept all system calls and prevent them from
-     *     executing the library code which performs stack switches
-     *     before normal system call invocation.  In order for library
-     *     calls which make system calls to work (like stdio), however,
-     *     we must also allocate our own stack and switch the primordial
-     *     stack to use it. This isn't so bad, except that I fudged the
-     *     backtrace length when copying the old stack to the new one.
-     *
-     * This is the original comment of robm in the code:
-     *    XXXrobm Horrific. To avoid a problem with HP's system call
-     *    code, we allocate a new stack for the primordial thread and
-     *    use it. However, we don't know how far back the original stack
-     *    goes. We should create a routine that performs a backtrace and
-     *    finds out just how much we need to copy. As a temporary measure,
-     *    I just copy an arbitrary guess.
-     *
-     * In an email to servereng dated 2 Jan 1997, Mike Patnode (mikep)
-     * suggests that this only needs to be done for HP-UX 9.
-     */
-#ifdef HPUX9
-#define PIDOOMA_STACK_SIZE 524288
-#define BACKTRACE_SIZE 8192
-    {
-        jmp_buf jb;
-        char *newstack;
-        char *oldstack;
-
-        if(!setjmp(jb)) {
-            newstack = (char *) PR_MALLOC(PIDOOMA_STACK_SIZE);
-	    oldstack = (char *) (*(((int *) jb) + 1) - BACKTRACE_SIZE);
-            memcpy(newstack, oldstack, BACKTRACE_SIZE);
-            *(((int *) jb) + 1) = (int) (newstack + BACKTRACE_SIZE);
-            longjmp(jb, 1);
-        }
-    }
-#endif  /* HPUX9 */
-#endif  /* !_PR_PTHREADS */
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for HP-UX */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for HP-UX.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for HP-UX.");
-}
-#endif /* _PR_PTHREADS */
-
-void
-_MD_suspend_thread(PRThread *thread)
-{
-#ifdef _PR_PTHREADS
-#endif
-}
-
-void
-_MD_resume_thread(PRThread *thread)
-{
-#ifdef _PR_PTHREADS
-#endif
-}
-#endif /* PTHREADS_USER */
-
-/*
- * The HP version of strchr is buggy. It looks past the end of the
- * string and causes a segmentation fault when our (NSPR) version
- * of malloc is used.
- *
- * A better solution might be to put a cushion in our malloc just in
- * case HP's version of strchr somehow gets used instead of this one.
- */
-char *
-strchr(const char *s, int c)
-{
-    char ch;
-
-    if (!s) {
-        return NULL;
-    }
-
-    ch = (char) c;
-
-    while ((*s) && ((*s) != ch)) {
-        s++;
-    }
-
-    if ((*s) == ch) {
-        return (char *) s;
-    }
-
-    return NULL;
-}
-
-/*
- * Implemementation of memcmp in HP-UX (verified on releases A.09.03,
- * A.09.07, and B.10.10) dumps core if called with:
- * 1. First operand with address = 1(mod 4).
- * 2. Size = 1(mod 4)
- * 3. Last byte of the second operand is the last byte of the page and 
- *    next page is not accessible(not mapped or protected)
- * Thus, using the following naive version (tons of optimizations are
- * possible;^)
- */
-
-int memcmp(const void *s1, const void *s2, size_t n)
-{
-    register unsigned char *p1 = (unsigned char *) s1,
-            *p2 = (unsigned char *) s2;
-
-    while (n-- > 0) {
-        register int r = ((int) ((unsigned int) *p1)) 
-                - ((int) ((unsigned int) *p2));
-        if (r) return r;
-        p1++; p2++;
-    }
-    return 0; 
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/irix.c b/libs/js/nsprpub/pr/src/md/unix/irix.c
deleted file mode 100644
index 758e54d2cd..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/irix.c
+++ /dev/null
@@ -1,1680 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/syssgi.h>
-#include <sys/time.h>
-#include <sys/immu.h>
-#include <sys/utsname.h>
-#include <sys/sysmp.h>
-#include <sys/pda.h>
-#include <sys/prctl.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/procfs.h>
-#include <task.h>
-#include <dlfcn.h>
-
-static void _MD_IrixIntervalInit(void);
-
-#if defined(_PR_PTHREADS)
-/*
- * for compatibility with classic nspr
- */
-void _PR_IRIX_CHILD_PROCESS()
-{
-}
-#else  /* defined(_PR_PTHREADS) */
-
-static void irix_detach_sproc(void);
-char *_nspr_sproc_private;    /* ptr. to private region in every sproc */
-
-extern PRUintn    _pr_numCPU;
-
-typedef struct nspr_arena {
-	PRCList links;
-	usptr_t *usarena;
-} nspr_arena;
-
-#define ARENA_PTR(qp) \
-	((nspr_arena *) ((char*) (qp) - offsetof(nspr_arena , links)))
-
-static usptr_t *alloc_new_arena(void);
-
-PRCList arena_list = PR_INIT_STATIC_CLIST(&arena_list);
-ulock_t arena_list_lock;
-nspr_arena first_arena;
-int	_nspr_irix_arena_cnt = 1;
-
-PRCList sproc_list = PR_INIT_STATIC_CLIST(&sproc_list);
-ulock_t sproc_list_lock;
-
-typedef struct sproc_data {
-	void (*entry) (void *, size_t);
-	unsigned inh;
-	void *arg;
-	caddr_t sp;
-	size_t len;
-	int *pid;
-	int creator_pid;
-} sproc_data;
-
-typedef struct sproc_params {
-	PRCList links;
-	sproc_data sd;
-} sproc_params;
-
-#define SPROC_PARAMS_PTR(qp) \
-	((sproc_params *) ((char*) (qp) - offsetof(sproc_params , links)))
-
-long	_nspr_irix_lock_cnt = 0;
-long	_nspr_irix_sem_cnt = 0;
-long	_nspr_irix_pollsem_cnt = 0;
-
-usptr_t *_pr_usArena;
-ulock_t _pr_heapLock;
-
-usema_t *_pr_irix_exit_sem;
-PRInt32 _pr_irix_exit_now = 0;
-PRInt32 _pr_irix_process_exit_code = 0;	/* exit code for PR_ProcessExit */
-PRInt32 _pr_irix_process_exit = 0; /* process exiting due to call to
-										   PR_ProcessExit */
-
-int _pr_irix_primoridal_cpu_fd[2] = { -1, -1 };
-static void (*libc_exit)(int) = NULL;
-static void *libc_handle = NULL;
-
-#define _NSPR_DEF_INITUSERS		100	/* default value of CONF_INITUSERS */
-#define _NSPR_DEF_INITSIZE		(4 * 1024 * 1024)	/* 4 MB */
-
-int _irix_initusers = _NSPR_DEF_INITUSERS;
-int _irix_initsize = _NSPR_DEF_INITSIZE;
-
-PRIntn _pr_io_in_progress, _pr_clock_in_progress;
-
-PRInt32 _pr_md_irix_sprocs_created, _pr_md_irix_sprocs_failed;
-PRInt32 _pr_md_irix_sprocs = 1;
-PRCList _pr_md_irix_sproc_list =
-PR_INIT_STATIC_CLIST(&_pr_md_irix_sproc_list);
-
-sigset_t ints_off;
-extern sigset_t timer_set;
-
-#if !defined(PR_SETABORTSIG)
-#define PR_SETABORTSIG 18
-#endif
-/*
- * terminate the entire application if any sproc exits abnormally
- */
-PRBool _nspr_terminate_on_error = PR_TRUE;
-
-/*
- * exported interface to set the shared arena parameters
- */
-void _PR_Irix_Set_Arena_Params(PRInt32 initusers, PRInt32 initsize)
-{
-    _irix_initusers = initusers;
-    _irix_initsize = initsize;
-}
-
-static usptr_t *alloc_new_arena()
-{
-    return(usinit("/dev/zero"));
-}
-
-static PRStatus new_poll_sem(struct _MDThread *mdthr, int val)
-{
-PRIntn _is;
-PRStatus rv = PR_SUCCESS;
-usema_t *sem = NULL;
-PRCList *qp;
-nspr_arena *arena;
-usptr_t *irix_arena;
-PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	_PR_LOCK(arena_list_lock);
-	for (qp = arena_list.next; qp != &arena_list; qp = qp->next) {
-		arena = ARENA_PTR(qp);
-		sem = usnewpollsema(arena->usarena, val);
-		if (sem != NULL) {
-			mdthr->cvar_pollsem = sem;
-			mdthr->pollsem_arena = arena->usarena;
-			break;
-		}
-	}
-	if (sem == NULL) {
-		/*
-		 * If no space left in the arena allocate a new one.
-		 */
-		if (errno == ENOMEM) {
-			arena = PR_NEWZAP(nspr_arena);
-			if (arena != NULL) {
-				irix_arena = alloc_new_arena();
-				if (irix_arena) {
-					PR_APPEND_LINK(&arena->links, &arena_list);
-					_nspr_irix_arena_cnt++;
-					arena->usarena = irix_arena;
-					sem = usnewpollsema(arena->usarena, val);
-					if (sem != NULL) {
-						mdthr->cvar_pollsem = sem;
-						mdthr->pollsem_arena = arena->usarena;
-					} else
-						rv = PR_FAILURE;
-				} else {
-					PR_DELETE(arena);
-					rv = PR_FAILURE;
-				}
-
-			} else
-				rv = PR_FAILURE;
-		} else
-			rv = PR_FAILURE;
-	}
-	_PR_UNLOCK(arena_list_lock);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-	if (rv == PR_SUCCESS)
-		_MD_ATOMIC_INCREMENT(&_nspr_irix_pollsem_cnt);
-	return rv;
-}
-
-static void free_poll_sem(struct _MDThread *mdthr)
-{
-PRIntn _is;
-PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	usfreepollsema(mdthr->cvar_pollsem, mdthr->pollsem_arena);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-	_MD_ATOMIC_DECREMENT(&_nspr_irix_pollsem_cnt);
-}
-
-static PRStatus new_lock(struct _MDLock *lockp)
-{
-PRIntn _is;
-PRStatus rv = PR_SUCCESS;
-ulock_t lock = NULL;
-PRCList *qp;
-nspr_arena *arena;
-usptr_t *irix_arena;
-PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	_PR_LOCK(arena_list_lock);
-	for (qp = arena_list.next; qp != &arena_list; qp = qp->next) {
-		arena = ARENA_PTR(qp);
-		lock = usnewlock(arena->usarena);
-		if (lock != NULL) {
-			lockp->lock = lock;
-			lockp->arena = arena->usarena;
-			break;
-		}
-	}
-	if (lock == NULL) {
-		/*
-		 * If no space left in the arena allocate a new one.
-		 */
-		if (errno == ENOMEM) {
-			arena = PR_NEWZAP(nspr_arena);
-			if (arena != NULL) {
-				irix_arena = alloc_new_arena();
-				if (irix_arena) {
-					PR_APPEND_LINK(&arena->links, &arena_list);
-					_nspr_irix_arena_cnt++;
-					arena->usarena = irix_arena;
-					lock = usnewlock(irix_arena);
-					if (lock != NULL) {
-						lockp->lock = lock;
-						lockp->arena = arena->usarena;
-					} else
-						rv = PR_FAILURE;
-				} else {
-					PR_DELETE(arena);
-					rv = PR_FAILURE;
-				}
-
-			} else
-				rv = PR_FAILURE;
-		} else
-			rv = PR_FAILURE;
-	}
-	_PR_UNLOCK(arena_list_lock);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-	if (rv == PR_SUCCESS)
-		_MD_ATOMIC_INCREMENT(&_nspr_irix_lock_cnt);
-	return rv;
-}
-
-static void free_lock(struct _MDLock *lockp)
-{
-PRIntn _is;
-PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	usfreelock(lockp->lock, lockp->arena);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-	_MD_ATOMIC_DECREMENT(&_nspr_irix_lock_cnt);
-}
-
-void _MD_FREE_LOCK(struct _MDLock *lockp)
-{
-	PRIntn _is;
-	PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	free_lock(lockp);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-}
-
-/*
- * _MD_get_attached_thread
- *		Return the thread pointer of the current thread if it is attached.
- *
- *		This function is needed for Irix because the thread-local-storage is
- *		implemented by mmapin'g a page with the MAP_LOCAL flag. This causes the
- *		sproc-private page to inherit contents of the page of the caller of sproc().
- */
-PRThread *_MD_get_attached_thread(void)
-{
-
-	if (_MD_GET_SPROC_PID() == get_pid())
-		return _MD_THIS_THREAD();
-	else
-		return 0;
-}
-
-/*
- * _MD_get_current_thread
- *		Return the thread pointer of the current thread (attaching it if
- *		necessary)
- */
-PRThread *_MD_get_current_thread(void)
-{
-PRThread *me;
-
-	me = _MD_GET_ATTACHED_THREAD();
-    if (NULL == me) {
-        me = _PRI_AttachThread(
-            PR_USER_THREAD, PR_PRIORITY_NORMAL, NULL, 0);
-    }
-    PR_ASSERT(me != NULL);
-	return(me);
-}
-
-/*
- * irix_detach_sproc
- *		auto-detach a sproc when it exits
- */
-void irix_detach_sproc(void)
-{
-PRThread *me;
-
-	me = _MD_GET_ATTACHED_THREAD();
-	if ((me != NULL) && (me->flags & _PR_ATTACHED)) {
-		_PRI_DetachThread();
-	}
-}
-
-
-PRStatus _MD_NEW_LOCK(struct _MDLock *lockp)
-{
-    PRStatus rv;
-    PRIntn is;
-    PRThread *me = _MD_GET_ATTACHED_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(is);
-	rv = new_lock(lockp);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(is);
-	return rv;
-}
-
-static void
-sigchld_handler(int sig)
-{
-    pid_t pid;
-    int status;
-
-    /*
-     * If an sproc exited abnormally send a SIGKILL signal to all the
-     * sprocs in the process to terminate the application
-     */
-    while ((pid = waitpid(0, &status, WNOHANG)) > 0) {
-        if (WIFSIGNALED(status) && ((WTERMSIG(status) == SIGSEGV) ||
-            (WTERMSIG(status) == SIGBUS) ||
-            (WTERMSIG(status) == SIGABRT) ||
-            (WTERMSIG(status) == SIGILL))) {
-
-				prctl(PR_SETEXITSIG, SIGKILL);
-				_exit(status);
-			}
-    }
-}
-
-static void save_context_and_block(int sig)
-{
-PRThread *me = _PR_MD_CURRENT_THREAD();
-_PRCPU *cpu = _PR_MD_CURRENT_CPU();
-
-	/*
-	 * save context
-	 */
-	(void) setjmp(me->md.jb);
-	/*
-	 * unblock the suspending thread
-	 */
-	if (me->cpu) {
-		/*
-		 * I am a cpu thread, not a user-created GLOBAL thread
-		 */
-		unblockproc(cpu->md.suspending_id);	
-	} else {
-		unblockproc(me->md.suspending_id);	
-	}
-	/*
-	 * now, block current thread
-	 */
-	blockproc(getpid());
-}
-
-/*
-** The irix kernel has a bug in it which causes async connect's which are
-** interrupted by a signal to fail terribly (EADDRINUSE is returned). 
-** We work around the bug by blocking signals during the async connect
-** attempt.
-*/
-PRInt32 _MD_irix_connect(
-    PRInt32 osfd, const PRNetAddr *addr, PRInt32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 rv;
-    sigset_t oldset;
-
-    sigprocmask(SIG_BLOCK, &ints_off, &oldset);
-    rv = connect(osfd, addr, addrlen);
-    sigprocmask(SIG_SETMASK, &oldset, 0);
-
-    return(rv);
-}
-
-#include "prprf.h"
-
-/********************************************************************/
-/********************************************************************/
-/*************** Various thread like things for IRIX ****************/
-/********************************************************************/
-/********************************************************************/
-
-void *_MD_GetSP(PRThread *t)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    void *sp;
-
-    if (me == t)
-        (void) setjmp(t->md.jb);
-
-    sp = (void *)(t->md.jb[JB_SP]);
-    PR_ASSERT((sp >= (void *) t->stack->stackBottom) &&
-        (sp <= (void *) (t->stack->stackBottom + t->stack->stackSize)));
-    return(sp);
-}
-
-void _MD_InitLocks()
-{
-    char buf[200];
-    char *init_users, *init_size;
-
-    PR_snprintf(buf, sizeof(buf), "/dev/zero");
-
-    if (init_users = getenv("_NSPR_IRIX_INITUSERS"))
-        _irix_initusers = atoi(init_users);
-
-    if (init_size = getenv("_NSPR_IRIX_INITSIZE"))
-        _irix_initsize = atoi(init_size);
-
-    usconfig(CONF_INITUSERS, _irix_initusers);
-    usconfig(CONF_INITSIZE, _irix_initsize);
-    usconfig(CONF_AUTOGROW, 1);
-    usconfig(CONF_AUTORESV, 1);
-	if (usconfig(CONF_ARENATYPE, US_SHAREDONLY) < 0) {
-		perror("PR_Init: unable to config mutex arena");
-		exit(-1);
-	}
-
-    _pr_usArena = usinit(buf);
-    if (!_pr_usArena) {
-        fprintf(stderr,
-            "PR_Init: Error - unable to create lock/monitor arena\n");
-        exit(-1);
-    }
-    _pr_heapLock = usnewlock(_pr_usArena);
-	_nspr_irix_lock_cnt++;
-
-    arena_list_lock = usnewlock(_pr_usArena);
-	_nspr_irix_lock_cnt++;
-
-    sproc_list_lock = usnewlock(_pr_usArena);
-	_nspr_irix_lock_cnt++;
-
-	_pr_irix_exit_sem = usnewsema(_pr_usArena, 0);
-	_nspr_irix_sem_cnt = 1;
-
-	first_arena.usarena = _pr_usArena;
-	PR_INIT_CLIST(&first_arena.links);
-	PR_APPEND_LINK(&first_arena.links, &arena_list);
-}
-
-/* _PR_IRIX_CHILD_PROCESS is a private API for Server group */
-void _PR_IRIX_CHILD_PROCESS()
-{
-extern PRUint32 _pr_global_threads;
-
-    PR_ASSERT(_PR_MD_CURRENT_CPU() == _pr_primordialCPU);
-    PR_ASSERT(_pr_numCPU == 1);
-    PR_ASSERT(_pr_global_threads == 0);
-    /*
-     * save the new pid
-     */
-    _pr_primordialCPU->md.id = getpid();
-	_MD_SET_SPROC_PID(getpid());	
-}
-
-static PRStatus pr_cvar_wait_sem(PRThread *thread, PRIntervalTime timeout)
-{
-    int rv;
-
-#ifdef _PR_USE_POLL
-	struct pollfd pfd;
-	int msecs;
-
-	if (timeout == PR_INTERVAL_NO_TIMEOUT)
-		msecs = -1;
-	else
-		msecs  = PR_IntervalToMilliseconds(timeout);
-#else
-    struct timeval tv, *tvp;
-    fd_set rd;
-
-	if(timeout == PR_INTERVAL_NO_TIMEOUT)
-		tvp = NULL;
-	else {
-		tv.tv_sec = PR_IntervalToSeconds(timeout);
-		tv.tv_usec = PR_IntervalToMicroseconds(
-		timeout - PR_SecondsToInterval(tv.tv_sec));
-		tvp = &tv;
-	}
-	FD_ZERO(&rd);
-	FD_SET(thread->md.cvar_pollsemfd, &rd);
-#endif
-
-    /*
-     * call uspsema only if a previous select call on this semaphore
-     * did not timeout
-     */
-    if (!thread->md.cvar_pollsem_select) {
-        rv = _PR_WAIT_SEM(thread->md.cvar_pollsem);
-		PR_ASSERT(rv >= 0);
-	} else
-        rv = 0;
-again:
-    if(!rv) {
-#ifdef _PR_USE_POLL
-		pfd.events = POLLIN;
-		pfd.fd = thread->md.cvar_pollsemfd;
-		rv = _MD_POLL(&pfd, 1, msecs);
-#else
-		rv = _MD_SELECT(thread->md.cvar_pollsemfd + 1, &rd, NULL,NULL,tvp);
-#endif
-        if ((rv == -1) && (errno == EINTR)) {
-			rv = 0;
-			goto again;
-		}
-		PR_ASSERT(rv >= 0);
-	}
-
-    if (rv > 0) {
-        /*
-         * acquired the semaphore, call uspsema next time
-         */
-        thread->md.cvar_pollsem_select = 0;
-        return PR_SUCCESS;
-    } else {
-        /*
-         * select timed out; must call select, not uspsema, when trying
-         * to acquire the semaphore the next time
-         */
-        thread->md.cvar_pollsem_select = 1;
-        return PR_FAILURE;
-    }
-}
-
-PRStatus _MD_wait(PRThread *thread, PRIntervalTime ticks)
-{
-    if ( thread->flags & _PR_GLOBAL_SCOPE ) {
-	_MD_CHECK_FOR_EXIT();
-        if (pr_cvar_wait_sem(thread, ticks) == PR_FAILURE) {
-	    _MD_CHECK_FOR_EXIT();
-            /*
-             * wait timed out
-             */
-            _PR_THREAD_LOCK(thread);
-            if (thread->wait.cvar) {
-                /*
-                 * The thread will remove itself from the waitQ
-                 * of the cvar in _PR_WaitCondVar
-                 */
-                thread->wait.cvar = NULL;
-                thread->state =  _PR_RUNNING;
-                _PR_THREAD_UNLOCK(thread);
-            }  else {
-                _PR_THREAD_UNLOCK(thread);
-                /*
-             * This thread was woken up by a notifying thread
-             * at the same time as a timeout; so, consume the
-             * extra post operation on the semaphore
-             */
-	        _MD_CHECK_FOR_EXIT();
-            pr_cvar_wait_sem(thread, PR_INTERVAL_NO_TIMEOUT);
-            }
-	    _MD_CHECK_FOR_EXIT();
-        }
-    } else {
-        _PR_MD_SWITCH_CONTEXT(thread);
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus _MD_WakeupWaiter(PRThread *thread)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntn is;
-
-	PR_ASSERT(_pr_md_idle_cpus >= 0);
-    if (thread == NULL) {
-		if (_pr_md_idle_cpus)
-        	_MD_Wakeup_CPUs();
-    } else if (!_PR_IS_NATIVE_THREAD(thread)) {
-		if (_pr_md_idle_cpus)
-       		_MD_Wakeup_CPUs();
-    } else {
-		PR_ASSERT(_PR_IS_NATIVE_THREAD(thread));
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_INTSOFF(is);
-		_MD_CVAR_POST_SEM(thread);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-    } 
-    return PR_SUCCESS;
-}
-
-void create_sproc (void (*entry) (void *, size_t), unsigned inh,
-					void *arg, caddr_t sp, size_t len, int *pid)
-{
-sproc_params sparams;
-char data;
-int rv;
-PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (!_PR_IS_NATIVE_THREAD(me) && (_PR_MD_CURRENT_CPU()->id == 0)) {
-		*pid = sprocsp(entry,		/* startup func		*/
-						inh,        /* attribute flags	*/
-						arg,     	/* thread param		*/
-						sp,         /* stack address	*/
-						len);       /* stack size		*/
-	} else {
-		sparams.sd.entry = entry;
-		sparams.sd.inh = inh;
-		sparams.sd.arg = arg;
-		sparams.sd.sp = sp;
-		sparams.sd.len = len;
-		sparams.sd.pid = pid;
-		sparams.sd.creator_pid = getpid();
-		_PR_LOCK(sproc_list_lock);
-		PR_APPEND_LINK(&sparams.links, &sproc_list);
-		rv = write(_pr_irix_primoridal_cpu_fd[1], &data, 1);
-		PR_ASSERT(rv == 1);
-		_PR_UNLOCK(sproc_list_lock);
-		blockproc(getpid());
-	}
-}
-
-/*
- * _PR_MD_WAKEUP_PRIMORDIAL_CPU
- *
- *		wakeup cpu 0
- */
-
-void _PR_MD_WAKEUP_PRIMORDIAL_CPU()
-{
-char data = '0';
-int rv;
-
-	rv = write(_pr_irix_primoridal_cpu_fd[1], &data, 1);
-	PR_ASSERT(rv == 1);
-}
-
-/*
- * _PR_MD_primordial_cpu
- *
- *		process events that need to executed by the primordial cpu on each
- *		iteration through the idle loop
- */
-
-void _PR_MD_primordial_cpu()
-{
-PRCList *qp;
-sproc_params *sp;
-int pid;
-
-	_PR_LOCK(sproc_list_lock);
-	while ((qp = sproc_list.next) != &sproc_list) {
-		sp = SPROC_PARAMS_PTR(qp);
-		PR_REMOVE_LINK(&sp->links);
-		pid = sp->sd.creator_pid;
-		(*(sp->sd.pid)) = sprocsp(sp->sd.entry,		/* startup func    */
-							sp->sd.inh,            	/* attribute flags     */
-							sp->sd.arg,     		/* thread param     */
-							sp->sd.sp,             	/* stack address    */
-							sp->sd.len);         	/* stack size     */
-		unblockproc(pid);
-	}
-	_PR_UNLOCK(sproc_list_lock);
-}
-
-PRStatus _MD_CreateThread(PRThread *thread, 
-void (*start)(void *), 
-PRThreadPriority priority, 
-PRThreadScope scope, 
-PRThreadState state, 
-PRUint32 stackSize)
-{
-    typedef void (*SprocEntry) (void *, size_t);
-    SprocEntry spentry = (SprocEntry)start;
-    PRIntn is;
-	PRThread *me = _PR_MD_CURRENT_THREAD();	
-	PRInt32 pid;
-	PRStatus rv;
-
-	if (!_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(is);
-    thread->md.cvar_pollsem_select = 0;
-    thread->flags |= _PR_GLOBAL_SCOPE;
-
-	thread->md.cvar_pollsemfd = -1;
-	if (new_poll_sem(&thread->md,0) == PR_FAILURE) {
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-		return PR_FAILURE;
-	}
-	thread->md.cvar_pollsemfd =
-		_PR_OPEN_POLL_SEM(thread->md.cvar_pollsem);
-	if ((thread->md.cvar_pollsemfd < 0)) {
-		free_poll_sem(&thread->md);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-		return PR_FAILURE;
-	}
-
-    create_sproc(spentry,            /* startup func    */
-    			PR_SALL,            /* attribute flags     */
-    			(void *)thread,     /* thread param     */
-    			NULL,               /* stack address    */
-    			stackSize, &pid);         /* stack size     */
-    if (pid > 0) {
-        _MD_ATOMIC_INCREMENT(&_pr_md_irix_sprocs_created);
-        _MD_ATOMIC_INCREMENT(&_pr_md_irix_sprocs);
-		rv = PR_SUCCESS;
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return rv;
-    } else {
-        close(thread->md.cvar_pollsemfd);
-        thread->md.cvar_pollsemfd = -1;
-		free_poll_sem(&thread->md);
-        thread->md.cvar_pollsem = NULL;
-        _MD_ATOMIC_INCREMENT(&_pr_md_irix_sprocs_failed);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return PR_FAILURE;
-    }
-}
-
-void _MD_CleanThread(PRThread *thread)
-{
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        close(thread->md.cvar_pollsemfd);
-        thread->md.cvar_pollsemfd = -1;
-		free_poll_sem(&thread->md);
-        thread->md.cvar_pollsem = NULL;
-    }
-}
-
-void _MD_SetPriority(_MDThread *thread, PRThreadPriority newPri)
-{
-    return;
-}
-
-extern void _MD_unix_terminate_waitpid_daemon(void);
-
-void
-_MD_CleanupBeforeExit(void)
-{
-    extern PRInt32    _pr_cpus_exit;
-
-    _MD_unix_terminate_waitpid_daemon();
-
-	_pr_irix_exit_now = 1;
-    if (_pr_numCPU > 1) {
-        /*
-         * Set a global flag, and wakeup all cpus which will notice the flag
-         * and exit.
-         */
-        _pr_cpus_exit = getpid();
-        _MD_Wakeup_CPUs();
-        while(_pr_numCPU > 1) {
-            _PR_WAIT_SEM(_pr_irix_exit_sem);
-            _pr_numCPU--;
-        }
-    }
-    /*
-     * cause global threads on the recycle list to exit
-     */
-     _PR_DEADQ_LOCK;
-     if (_PR_NUM_DEADNATIVE != 0) {
-	PRThread *thread;
-    	PRCList *ptr;
-
-        ptr = _PR_DEADNATIVEQ.next;
-        while( ptr != &_PR_DEADNATIVEQ ) {
-        	thread = _PR_THREAD_PTR(ptr);
-		_MD_CVAR_POST_SEM(thread);
-                ptr = ptr->next;
-        } 
-     }
-     _PR_DEADQ_UNLOCK;
-     while(_PR_NUM_DEADNATIVE > 1) {
-	_PR_WAIT_SEM(_pr_irix_exit_sem);
-	_PR_DEC_DEADNATIVE;
-     }
-}
-
-#ifdef _PR_HAVE_SGI_PRDA_PROCMASK
-extern void __sgi_prda_procmask(int);
-#endif
-
-PRStatus
-_MD_InitAttachedThread(PRThread *thread, PRBool wakeup_parent)
-{
-	PRStatus rv = PR_SUCCESS;
-
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-		if (new_poll_sem(&thread->md,0) == PR_FAILURE) {
-			return PR_FAILURE;
-		}
-		thread->md.cvar_pollsemfd =
-			_PR_OPEN_POLL_SEM(thread->md.cvar_pollsem);
-		if ((thread->md.cvar_pollsemfd < 0)) {
-			free_poll_sem(&thread->md);
-			return PR_FAILURE;
-		}
-		if (_MD_InitThread(thread, PR_FALSE) == PR_FAILURE) {
-			close(thread->md.cvar_pollsemfd);
-			thread->md.cvar_pollsemfd = -1;
-			free_poll_sem(&thread->md);
-			thread->md.cvar_pollsem = NULL;
-			return PR_FAILURE;
-		}
-    }
-	return rv;
-}
-
-PRStatus
-_MD_InitThread(PRThread *thread, PRBool wakeup_parent)
-{
-    struct sigaction sigact;
-	PRStatus rv = PR_SUCCESS;
-
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-		thread->md.id = getpid();
-        setblockproccnt(thread->md.id, 0);
-		_MD_SET_SPROC_PID(getpid());	
-#ifdef _PR_HAVE_SGI_PRDA_PROCMASK
-		/*
-		 * enable user-level processing of sigprocmask(); this is an
-		 * undocumented feature available in Irix 6.2, 6.3, 6.4 and 6.5
-		 */
-		__sgi_prda_procmask(USER_LEVEL);
-#endif
-		/*
-		 * set up SIGUSR1 handler; this is used to save state
-		 */
-		sigact.sa_handler = save_context_and_block;
-		sigact.sa_flags = SA_RESTART;
-		/*
-		 * Must mask clock interrupts
-		 */
-		sigact.sa_mask = timer_set;
-		sigaction(SIGUSR1, &sigact, 0);
-
-
-		/*
-		 * PR_SETABORTSIG is a new command implemented in a patch to
-		 * Irix 6.2, 6.3 and 6.4. This causes a signal to be sent to all
-		 * sprocs in the process when one of them terminates abnormally
-		 *
-		 */
-		if (prctl(PR_SETABORTSIG, SIGKILL) < 0) {
-			/*
-			 *  if (errno == EINVAL)
-			 *
-			 *	PR_SETABORTSIG not supported under this OS.
-			 *	You may want to get a recent kernel rollup patch that
-			 *	supports this feature.
-			 */
-		}
-		/*
-		 * SIGCLD handler for detecting abormally-terminating
-		 * sprocs and for reaping sprocs
-		 */
-		sigact.sa_handler = sigchld_handler;
-		sigact.sa_flags = SA_RESTART;
-		sigact.sa_mask = ints_off;
-		sigaction(SIGCLD, &sigact, NULL);
-    }
-	return rv;
-}
-
-/*
- * PR_Cleanup should be executed on the primordial sproc; migrate the thread
- * to the primordial cpu
- */
-
-void _PR_MD_PRE_CLEANUP(PRThread *me)
-{
-PRIntn is;
-_PRCPU *cpu = _pr_primordialCPU;
-
-	PR_ASSERT(cpu);
-
-	me->flags |= _PR_BOUND_THREAD;	
-
-	if (me->cpu->id != 0) {
-		_PR_INTSOFF(is);
-		_PR_RUNQ_LOCK(cpu);
-		me->cpu = cpu;
-		me->state = _PR_RUNNABLE;
-		_PR_ADD_RUNQ(me, cpu, me->priority);
-		_PR_RUNQ_UNLOCK(cpu);
-		_MD_Wakeup_CPUs();
-
-		_PR_MD_SWITCH_CONTEXT(me);
-
-		_PR_FAST_INTSON(is);
-		PR_ASSERT(me->cpu->id == 0);
-	}
-}
-
-/*
- * process exiting
- */
-PR_EXTERN(void ) _MD_exit(PRIntn status)
-{
-PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	/*
-	 * the exit code of the process is the exit code of the primordial
-	 * sproc
-	 */
-	if (!_PR_IS_NATIVE_THREAD(me) && (_PR_MD_CURRENT_CPU()->id == 0)) {
-		/*
-		 * primordial sproc case: call _exit directly
-		 * Cause SIGKILL to be sent to other sprocs
-		 */
-		prctl(PR_SETEXITSIG, SIGKILL);
-		_exit(status);
-	} else {
-		int rv;
-		char data;
-		sigset_t set;
-
-		/*
-		 * non-primordial sproc case: cause the primordial sproc, cpu 0,
-		 * to wakeup and call _exit
-		 */
-		_pr_irix_process_exit = 1;
-		_pr_irix_process_exit_code = status;
-		rv = write(_pr_irix_primoridal_cpu_fd[1], &data, 1);
-		PR_ASSERT(rv == 1);
-		/*
-		 * block all signals and wait for SIGKILL to terminate this sproc
-		 */
-		sigfillset(&set);
-		sigsuspend(&set);
-		/*
-		 * this code doesn't (shouldn't) execute
-		 */
-		prctl(PR_SETEXITSIG, SIGKILL);
-		_exit(status);
-	}
-}
-
-/*
- * Override the exit() function in libc to cause the process to exit
- * when the primodial/main nspr thread calls exit. Calls to exit by any
- * other thread simply result in a call to the exit function in libc.
- * The exit code of the process is the exit code of the primordial
- * sproc.
- */
-
-void exit(int status)
-{
-PRThread *me, *thr;
-PRCList *qp;
-
-	if (!_pr_initialized)  {
-		if (!libc_exit) {
-
-			if (!libc_handle)
-				libc_handle = dlopen("libc.so",RTLD_NOW);
-			if (libc_handle)
-				libc_exit = (void (*)(int)) dlsym(libc_handle, "exit");
-		}
-		if (libc_exit)
-			(*libc_exit)(status);
-		else
-			_exit(status);
-	}
-
-	me = _PR_MD_CURRENT_THREAD();
-
-	if (me == NULL) 		/* detached thread */
-		(*libc_exit)(status);
-
-	PR_ASSERT(_PR_IS_NATIVE_THREAD(me) ||
-						(_PR_MD_CURRENT_CPU())->id == me->cpu->id);
-
-	if (me->flags & _PR_PRIMORDIAL) {
-
-		me->flags |= _PR_BOUND_THREAD;	
-
-		PR_ASSERT((_PR_MD_CURRENT_CPU())->id == me->cpu->id);
-		if (me->cpu->id != 0) {
-			_PRCPU *cpu = _pr_primordialCPU;
-			PRIntn is;
-
-			_PR_INTSOFF(is);
-			_PR_RUNQ_LOCK(cpu);
-			me->cpu = cpu;
-			me->state = _PR_RUNNABLE;
-			_PR_ADD_RUNQ(me, cpu, me->priority);
-			_PR_RUNQ_UNLOCK(cpu);
-			_MD_Wakeup_CPUs();
-
-			_PR_MD_SWITCH_CONTEXT(me);
-
-			_PR_FAST_INTSON(is);
-		}
-
-		PR_ASSERT((_PR_MD_CURRENT_CPU())->id == 0);
-
-		if (prctl(PR_GETNSHARE) > 1) {
-#define SPROC_EXIT_WAIT_TIME 5
-			int sleep_cnt = SPROC_EXIT_WAIT_TIME;
-
-			/*
-			 * sprocs still running; caue cpus and recycled global threads
-			 * to exit
-			 */
-			_pr_irix_exit_now = 1;
-			if (_pr_numCPU > 1) {
-				_MD_Wakeup_CPUs();
-			}
-			 _PR_DEADQ_LOCK;
-			 if (_PR_NUM_DEADNATIVE != 0) {
-				PRThread *thread;
-				PRCList *ptr;
-
-				ptr = _PR_DEADNATIVEQ.next;
-				while( ptr != &_PR_DEADNATIVEQ ) {
-					thread = _PR_THREAD_PTR(ptr);
-					_MD_CVAR_POST_SEM(thread);
-					ptr = ptr->next;
-				} 
-			 }
-
-			while (sleep_cnt-- > 0) {
-				if (waitpid(0, NULL, WNOHANG) >= 0) 
-					sleep(1);
-				else
-					break;
-			}
-			prctl(PR_SETEXITSIG, SIGKILL);
-		}
-		(*libc_exit)(status);
-	} else {
-		/*
-		 * non-primordial thread; simply call exit in libc.
-		 */
-		(*libc_exit)(status);
-	}
-}
-
-
-void
-_MD_InitRunningCPU(_PRCPU *cpu)
-{
-    extern int _pr_md_pipefd[2];
-
-    _MD_unix_init_running_cpu(cpu);
-    cpu->md.id = getpid();
-	_MD_SET_SPROC_PID(getpid());	
-	if (_pr_md_pipefd[0] >= 0) {
-    	_PR_IOQ_MAX_OSFD(cpu) = _pr_md_pipefd[0];
-#ifndef _PR_USE_POLL
-    	FD_SET(_pr_md_pipefd[0], &_PR_FD_READ_SET(cpu));
-#endif
-	}
-}
-
-void
-_MD_ExitThread(PRThread *thread)
-{
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        _MD_ATOMIC_DECREMENT(&_pr_md_irix_sprocs);
-        _MD_CLEAN_THREAD(thread);
-        _MD_SET_CURRENT_THREAD(NULL);
-    }
-}
-
-void
-_MD_SuspendCPU(_PRCPU *cpu)
-{
-    PRInt32 rv;
-
-	cpu->md.suspending_id = getpid();
-	rv = kill(cpu->md.id, SIGUSR1);
-	PR_ASSERT(rv == 0);
-	/*
-	 * now, block the current thread/cpu until woken up by the suspended
-	 * thread from it's SIGUSR1 signal handler
-	 */
-	blockproc(getpid());
-
-}
-
-void
-_MD_ResumeCPU(_PRCPU *cpu)
-{
-    unblockproc(cpu->md.id);
-}
-
-#if 0
-/*
- * save the register context of a suspended sproc
- */
-void get_context(PRThread *thr)
-{
-    int len, fd;
-    char pidstr[24];
-    char path[24];
-
-    /*
-     * open the file corresponding to this process in procfs
-     */
-    sprintf(path,"/proc/%s","00000");
-    len = strlen(path);
-    sprintf(pidstr,"%d",thr->md.id);
-    len -= strlen(pidstr);
-    sprintf(path + len,"%s",pidstr);
-    fd = open(path,O_RDONLY);
-    if (fd >= 0) {
-        (void) ioctl(fd, PIOCGREG, thr->md.gregs);
-        close(fd);
-    }
-    return;
-}
-#endif	/* 0 */
-
-void
-_MD_SuspendThread(PRThread *thread)
-{
-    PRInt32 rv;
-
-    PR_ASSERT((thread->flags & _PR_GLOBAL_SCOPE) &&
-        _PR_IS_GCABLE_THREAD(thread));
-
-	thread->md.suspending_id = getpid();
-	rv = kill(thread->md.id, SIGUSR1);
-	PR_ASSERT(rv == 0);
-	/*
-	 * now, block the current thread/cpu until woken up by the suspended
-	 * thread from it's SIGUSR1 signal handler
-	 */
-	blockproc(getpid());
-}
-
-void
-_MD_ResumeThread(PRThread *thread)
-{
-    PR_ASSERT((thread->flags & _PR_GLOBAL_SCOPE) &&
-        _PR_IS_GCABLE_THREAD(thread));
-    (void)unblockproc(thread->md.id);
-}
-
-/*
- * return the set of processors available for scheduling procs in the
- * "mask" argument
- */
-PRInt32 _MD_GetThreadAffinityMask(PRThread *unused, PRUint32 *mask)
-{
-    PRInt32 nprocs, rv;
-    struct pda_stat *pstat;
-#define MAX_PROCESSORS    32
-
-    nprocs = sysmp(MP_NPROCS);
-    if (nprocs < 0)
-        return(-1);
-    pstat = (struct pda_stat*)PR_MALLOC(sizeof(struct pda_stat) * nprocs);
-    if (pstat == NULL)
-        return(-1);
-    rv = sysmp(MP_STAT, pstat);
-    if (rv < 0) {
-        PR_DELETE(pstat);
-        return(-1);
-    }
-    /*
-     * look at the first 32 cpus
-     */
-    nprocs = (nprocs > MAX_PROCESSORS) ? MAX_PROCESSORS : nprocs;
-    *mask = 0;
-    while (nprocs) {
-        if ((pstat->p_flags & PDAF_ENABLED) &&
-            !(pstat->p_flags & PDAF_ISOLATED)) {
-            *mask |= (1 << pstat->p_cpuid);
-        }
-        nprocs--;
-        pstat++;
-    }
-    return 0;
-}
-
-static char *_thr_state[] = {
-    "UNBORN",
-    "RUNNABLE",
-    "RUNNING",
-    "LOCK_WAIT",
-    "COND_WAIT",
-    "JOIN_WAIT",
-    "IO_WAIT",
-    "SUSPENDED",
-    "DEAD"
-};
-
-void _PR_List_Threads()
-{
-    PRThread *thr;
-    void *handle;
-    struct _PRCPU *cpu;
-    PRCList *qp;
-    int len, fd;
-    char pidstr[24];
-    char path[24];
-    prpsinfo_t pinfo;
-
-
-    printf("\n%s %-s\n"," ","LOCAL Threads");
-    printf("%s %-s\n"," ","----- -------");
-    printf("%s %-14s %-10s %-12s %-3s %-10s %-10s %-12s\n\n"," ",
-        "Thread", "State", "Wait-Handle",
-        "Cpu","Stk-Base","Stk-Sz","SP");
-    for (qp = _PR_ACTIVE_LOCAL_THREADQ().next;
-        qp != &_PR_ACTIVE_LOCAL_THREADQ(); qp = qp->next) {
-        thr = _PR_ACTIVE_THREAD_PTR(qp);
-        printf("%s 0x%-12x %-10s "," ",thr,_thr_state[thr->state]);
-        if (thr->state == _PR_LOCK_WAIT)
-            handle = thr->wait.lock;
-        else if (thr->state == _PR_COND_WAIT)
-            handle = thr->wait.cvar;
-        else
-            handle = NULL;
-        if (handle)
-            printf("0x%-10x ",handle);
-        else
-            printf("%-12s "," ");
-        printf("%-3d ",thr->cpu->id);
-        printf("0x%-8x ",thr->stack->stackBottom);
-        printf("0x%-8x ",thr->stack->stackSize);
-        printf("0x%-10x\n",thr->md.jb[JB_SP]);
-    }
-
-    printf("\n%s %-s\n"," ","GLOBAL Threads");
-    printf("%s %-s\n"," ","------ -------");
-    printf("%s %-14s %-6s %-12s %-12s %-12s %-12s\n\n"," ","Thread",
-        "Pid","State","Wait-Handle",
-        "Stk-Base","Stk-Sz");
-
-    for (qp = _PR_ACTIVE_GLOBAL_THREADQ().next;
-        qp != &_PR_ACTIVE_GLOBAL_THREADQ(); qp = qp->next) {
-        thr = _PR_ACTIVE_THREAD_PTR(qp);
-        if (thr->cpu != NULL)
-            continue;        /* it is a cpu thread */
-        printf("%s 0x%-12x %-6d "," ",thr,thr->md.id);
-        /*
-         * check if the sproc is still running
-         * first call prctl(PR_GETSHMASK,pid) to check if
-         * the process is part of the share group (the pid
-         * could have been recycled by the OS)
-         */
-        if (prctl(PR_GETSHMASK,thr->md.id) < 0) {
-            printf("%-12s\n","TERMINATED");
-            continue;
-        }
-        /*
-         * Now, check if the sproc terminated and is in zombie
-         * state
-         */
-        sprintf(path,"/proc/pinfo/%s","00000");
-        len = strlen(path);
-        sprintf(pidstr,"%d",thr->md.id);
-        len -= strlen(pidstr);
-        sprintf(path + len,"%s",pidstr);
-        fd = open(path,O_RDONLY);
-        if (fd >= 0) {
-            if (ioctl(fd, PIOCPSINFO, &pinfo) < 0)
-                printf("%-12s ","TERMINATED");
-            else if (pinfo.pr_zomb)
-                printf("%-12s ","TERMINATED");
-            else
-                printf("%-12s ",_thr_state[thr->state]);
-            close(fd);
-        } else {
-            printf("%-12s ","TERMINATED");
-        }
-
-        if (thr->state == _PR_LOCK_WAIT)
-            handle = thr->wait.lock;
-        else if (thr->state == _PR_COND_WAIT)
-            handle = thr->wait.cvar;
-        else
-            handle = NULL;
-        if (handle)
-            printf("%-12x ",handle);
-        else
-            printf("%-12s "," ");
-        printf("0x%-10x ",thr->stack->stackBottom);
-        printf("0x%-10x\n",thr->stack->stackSize);
-    }
-
-    printf("\n%s %-s\n"," ","CPUs");
-    printf("%s %-s\n"," ","----");
-    printf("%s %-14s %-6s %-12s \n\n"," ","Id","Pid","State");
-
-
-    for (qp = _PR_CPUQ().next; qp != &_PR_CPUQ(); qp = qp->next) {
-        cpu = _PR_CPU_PTR(qp);
-        printf("%s %-14d %-6d "," ",cpu->id,cpu->md.id);
-        /*
-         * check if the sproc is still running
-         * first call prctl(PR_GETSHMASK,pid) to check if
-         * the process is part of the share group (the pid
-         * could have been recycled by the OS)
-         */
-        if (prctl(PR_GETSHMASK,cpu->md.id) < 0) {
-            printf("%-12s\n","TERMINATED");
-            continue;
-        }
-        /*
-         * Now, check if the sproc terminated and is in zombie
-         * state
-         */
-        sprintf(path,"/proc/pinfo/%s","00000");
-        len = strlen(path);
-        sprintf(pidstr,"%d",cpu->md.id);
-        len -= strlen(pidstr);
-        sprintf(path + len,"%s",pidstr);
-        fd = open(path,O_RDONLY);
-        if (fd >= 0) {
-            if (ioctl(fd, PIOCPSINFO, &pinfo) < 0)
-                printf("%-12s\n","TERMINATED");
-            else if (pinfo.pr_zomb)
-                printf("%-12s\n","TERMINATED");
-            else
-                printf("%-12s\n","RUNNING");
-            close(fd);
-        } else {
-            printf("%-12s\n","TERMINATED");
-        }
-
-    }
-    fflush(stdout);
-}
-#endif /* defined(_PR_PTHREADS) */ 
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#if !defined(_PR_PTHREADS)
-    if (isCurrent) {
-        (void) setjmp(t->md.jb);
-    }
-    *np = sizeof(t->md.jb) / sizeof(PRWord);
-    return (PRWord *) (t->md.jb);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-void _MD_EarlyInit(void)
-{
-#if !defined(_PR_PTHREADS)
-    char *eval;
-    int fd;
-	extern int __ateachexit(void (*func)(void));
-
-    sigemptyset(&ints_off);
-    sigaddset(&ints_off, SIGALRM);
-    sigaddset(&ints_off, SIGIO);
-    sigaddset(&ints_off, SIGCLD);
-
-    if (eval = getenv("_NSPR_TERMINATE_ON_ERROR"))
-        _nspr_terminate_on_error = (0 == atoi(eval) == 0) ? PR_FALSE : PR_TRUE;
-
-    fd = open("/dev/zero",O_RDWR , 0);
-    if (fd < 0) {
-        perror("open /dev/zero failed");
-        exit(1);
-    }
-    /*
-     * Set up the sproc private data area.
-     * This region exists at the same address, _nspr_sproc_private, for
-     * every sproc, but each sproc gets a private copy of the region.
-     */
-    _nspr_sproc_private = (char*)mmap(0, _pr_pageSize, PROT_READ | PROT_WRITE,
-        MAP_PRIVATE| MAP_LOCAL, fd, 0);
-    if (_nspr_sproc_private == (void*)-1) {
-        perror("mmap /dev/zero failed");
-        exit(1);
-    }
-	_MD_SET_SPROC_PID(getpid());	
-    close(fd);
-	__ateachexit(irix_detach_sproc);
-#endif
-    _MD_IrixIntervalInit();
-}  /* _MD_EarlyInit */
-
-void _MD_IrixInit(void)
-{
-#if !defined(_PR_PTHREADS)
-    struct sigaction sigact;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-	int rv;
-
-#ifdef _PR_HAVE_SGI_PRDA_PROCMASK
-	/*
-	 * enable user-level processing of sigprocmask(); this is an undocumented
-	 * feature available in Irix 6.2, 6.3, 6.4 and 6.5
-	 */
-	__sgi_prda_procmask(USER_LEVEL);
-#endif
-
-	/*
-	 * set up SIGUSR1 handler; this is used to save state
-	 * during PR_SuspendAll
-	 */
-	sigact.sa_handler = save_context_and_block;
-	sigact.sa_flags = SA_RESTART;
-	sigact.sa_mask = ints_off;
-	sigaction(SIGUSR1, &sigact, 0);
-
-    /*
-     * Change the name of the core file from core to core.pid,
-     * This is inherited by the sprocs created by this process
-     */
-#ifdef PR_COREPID
-    prctl(PR_COREPID, 0, 1);
-#endif
-    /*
-     * Irix-specific terminate on error processing
-     */
-	/*
-	 * PR_SETABORTSIG is a new command implemented in a patch to
-	 * Irix 6.2, 6.3 and 6.4. This causes a signal to be sent to all
-	 * sprocs in the process when one of them terminates abnormally
-	 *
-	 */
-	if (prctl(PR_SETABORTSIG, SIGKILL) < 0) {
-		/*
-		 *  if (errno == EINVAL)
-		 *
-		 *	PR_SETABORTSIG not supported under this OS.
-		 *	You may want to get a recent kernel rollup patch that
-		 *	supports this feature.
-		 *
-		 */
-	}
-	/*
-	 * PR_SETEXITSIG -  send the SIGCLD signal to the parent
-	 *            sproc when any sproc terminates
-	 *
-	 *    This is used to cause the entire application to
-	 *    terminate when    any sproc terminates abnormally by
-	 *     receipt of a SIGSEGV, SIGBUS or SIGABRT signal.
-	 *    If this is not done, the application may seem
-	 *     "hung" to the user because the other sprocs may be
-	 *    waiting for resources held by the
-	 *    abnormally-terminating sproc.
-	 */
-	prctl(PR_SETEXITSIG, 0);
-
-	sigact.sa_handler = sigchld_handler;
-	sigact.sa_flags = SA_RESTART;
-	sigact.sa_mask = ints_off;
-	sigaction(SIGCLD, &sigact, NULL);
-
-    /*
-     * setup stack fields for the primordial thread
-     */
-    me->stack->stackSize = prctl(PR_GETSTACKSIZE);
-    me->stack->stackBottom = me->stack->stackTop - me->stack->stackSize;
-
-    rv = pipe(_pr_irix_primoridal_cpu_fd);
-    PR_ASSERT(rv == 0);
-#ifndef _PR_USE_POLL
-    _PR_IOQ_MAX_OSFD(me->cpu) = _pr_irix_primoridal_cpu_fd[0];
-    FD_SET(_pr_irix_primoridal_cpu_fd[0], &_PR_FD_READ_SET(me->cpu));
-#endif
-
-	libc_handle = dlopen("libc.so",RTLD_NOW);
-	PR_ASSERT(libc_handle != NULL);
-	libc_exit = (void (*)(int)) dlsym(libc_handle, "exit");
-	PR_ASSERT(libc_exit != NULL);
-	/* dlclose(libc_handle); */
-
-#endif /* _PR_PTHREADS */
-
-    _PR_UnixInit();
-}
-
-/**************************************************************************/
-/************** code and such for NSPR 2.0's interval times ***************/
-/**************************************************************************/
-
-#define PR_PSEC_PER_SEC 1000000000000ULL  /* 10^12 */
-
-#ifndef SGI_CYCLECNTR_SIZE
-#define SGI_CYCLECNTR_SIZE      165     /* Size user needs to use to read CC */
-#endif
-
-static PRIntn mmem_fd = -1;
-static PRIntn clock_width = 0;
-static void *iotimer_addr = NULL;
-static PRUint32 pr_clock_mask = 0;
-static PRUint32 pr_clock_shift = 0;
-static PRIntervalTime pr_ticks = 0;
-static PRUint32 pr_clock_granularity = 1;
-static PRUint32 pr_previous = 0, pr_residual = 0;
-static PRUint32 pr_ticks_per_second = 0;
-
-extern PRIntervalTime _PR_UNIX_GetInterval(void);
-extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
-
-static void _MD_IrixIntervalInit(void)
-{
-    /*
-     * As much as I would like, the service available through this
-     * interface on R3000's (aka, IP12) just isn't going to make it.
-     * The register is only 24 bits wide, and rolls over at a verocious
-     * rate.
-     */
-    PRUint32 one_tick = 0;
-    struct utsname utsinfo;
-    uname(&utsinfo);
-    if ((strncmp("IP12", utsinfo.machine, 4) != 0)
-        && ((mmem_fd = open("/dev/mmem", O_RDONLY)) != -1))
-    {
-        int poffmask = getpagesize() - 1;
-        __psunsigned_t phys_addr, raddr, cycleval;
-
-        phys_addr = syssgi(SGI_QUERY_CYCLECNTR, &cycleval);
-        raddr = phys_addr & ~poffmask;
-        iotimer_addr = mmap(
-            0, poffmask, PROT_READ, MAP_PRIVATE, mmem_fd, (__psint_t)raddr);
-
-        clock_width = syssgi(SGI_CYCLECNTR_SIZE);
-        if (clock_width < 0)
-        {
-            /* 
-             * We must be executing on a 6.0 or earlier system, since the
-             * SGI_CYCLECNTR_SIZE call is not supported.
-             * 
-             * The only pre-6.1 platforms with 64-bit counters are
-             * IP19 and IP21 (Challenge, PowerChallenge, Onyx).
-             */
-            if (!strncmp(utsinfo.machine, "IP19", 4) ||
-                !strncmp(utsinfo.machine, "IP21", 4))
-                clock_width = 64;
-            else
-                clock_width = 32;
-        }
-
-        /*
-         * 'cycleval' is picoseconds / increment of the counter.
-         * I'm pushing for a tick to be 100 microseconds, 10^(-4).
-         * That leaves 10^(-8) left over, or 10^8 / cycleval.
-         * Did I do that right?
-         */
-
-        one_tick =  100000000UL / cycleval ;  /* 100 microseconds */
-
-        while (0 != one_tick)
-        {
-            pr_clock_shift += 1;
-            one_tick = one_tick >> 1;
-            pr_clock_granularity = pr_clock_granularity << 1;
-        }
-        pr_clock_mask = pr_clock_granularity - 1;  /* to make a mask out of it */
-        pr_ticks_per_second = PR_PSEC_PER_SEC
-                / ((PRUint64)pr_clock_granularity * (PRUint64)cycleval);
-            
-        iotimer_addr = (void*)
-            ((__psunsigned_t)iotimer_addr + (phys_addr & poffmask));
-    }
-    else
-    {
-        pr_ticks_per_second = _PR_UNIX_TicksPerSecond();
-    }
-}  /* _MD_IrixIntervalInit */
-
-PRIntervalTime _MD_IrixIntervalPerSec(void)
-{
-    return pr_ticks_per_second;
-}
-
-PRIntervalTime _MD_IrixGetInterval(void)
-{
-    if (mmem_fd != -1)
-    {
-        if (64 == clock_width)
-        {
-            PRUint64 temp = *(PRUint64*)iotimer_addr;
-            pr_ticks = (PRIntervalTime)(temp >> pr_clock_shift);
-        }
-        else
-        {
-            PRIntervalTime ticks = pr_ticks;
-            PRUint32 now = *(PRUint32*)iotimer_addr, temp;
-            PRUint32 residual = pr_residual, previous = pr_previous;
-
-            temp = now - previous + residual;
-            residual = temp & pr_clock_mask;
-            ticks += temp >> pr_clock_shift;
-
-            pr_previous = now;
-            pr_residual = residual;
-            pr_ticks = ticks;
-        }
-    }
-    else
-    {
-        /*
-         * No fast access. Use the time of day clock. This isn't the
-         * right answer since this clock can get set back, tick at odd
-         * rates, and it's expensive to acqurie.
-         */
-        pr_ticks = _PR_UNIX_GetInterval();
-    }
-    return pr_ticks;
-}  /* _MD_IrixGetInterval */
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/linux.c b/libs/js/nsprpub/pr/src/md/unix/linux.c
deleted file mode 100644
index c22618d7e0..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/linux.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifdef _PR_PTHREADS
-
-extern void _MD_unix_terminate_waitpid_daemon(void);
-
-void _MD_CleanupBeforeExit(void)
-{
-    _MD_unix_terminate_waitpid_daemon();
-}
-
-#else /* ! _PR_PTHREADS */
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	/*
-	 * set the pointers to the stack-pointer and frame-pointer words in the
-	 * context structure; this is for debugging use.
-	 */
-	thread->md.sp = _MD_GET_SP_PTR(thread);
-	thread->md.fp = _MD_GET_FP_PTR(thread);
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Linux */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Linux.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Linux.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/ncr.c b/libs/js/nsprpub/pr/src/md/unix/ncr.c
deleted file mode 100644
index 909b09e63b..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/ncr.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * NCR 3.0  - cloned from UnixWare by ruslan
- */
-#include "primpl.h"
-
-#include <setjmp.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-#ifdef ALARMS_BREAK_TCP /* I don't think they do */
-
-PRInt32 _MD_connect(PRInt32 osfd, const PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _connect(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-}
-
-PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _accept(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-    return(rv);
-}
-#endif
-
-/*
- * These are also implemented in pratom.c using NSPR locks.  Any reason
- * this might be better or worse?  If you like this better, define
- * _PR_HAVE_ATOMIC_OPS in include/md/unixware.h
- */
-#ifdef _PR_HAVE_ATOMIC_OPS
-/* Atomic operations */
-#include  <stdio.h>
-static FILE *_uw_semf;
-
-void
-_MD_INIT_ATOMIC(void)
-{
-    /* Sigh.  Sure wish SYSV semaphores weren't such a pain to use */
-    if ((_uw_semf = tmpfile()) == NULL)
-        PR_ASSERT(0);
-
-    return;
-}
-
-void
-_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)++;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    flockfile(_uw_semf);
-    (*ptr) += val;
-    unflockfile(_uw_semf);
-}
-
-
-void
-_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)--;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    flockfile(_uw_semf);
-    *val = newval;
-    unflockfile(_uw_semf);
-}
-#endif
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Unixware */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Unixware.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRUintn priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Unixware.");
-    return PR_FAILURE;
-}
-
-/*
- This is temp. replacement for localtime_r. Normally PR_ExplodeTime should
- be used as to my understanding
-*/
-
-/*
-** $$$$$ THEN WHY ARE WE DOING THIS? - AOF $$$$$
-*/
-
-#define NEED_LOCALTIME_R
-#define NEED_GMTIME_R
-#define NEED_ASCTIME_R
-#define NEED_STRTOK_R
-#define NEED_CTIME_R
-
-#if defined (NEED_LOCALTIME_R) || defined (NEED_CTIME_R) || defined (NEED_ASCTIME_R) || defined (NEED_GMTIME_R) || defined (NEED_STRTOK_R)
-#include "prlock.h"
-#endif
-
-#if defined (NEED_LOCALTIME_R)
-
-static PRLock *localtime_r_monitor = NULL;
-
-struct tm *localtime_r (const time_t *clock, struct tm *result)
-{
-    struct tm *tmPtr;
-    int needLock = PR_Initialized();  /* We need to use a lock to protect
-                                       * against NSPR threads only when the
-                                       * NSPR thread system is activated. */
-
-    if (needLock) {
-        if (localtime_r_monitor == NULL) {
-
-            localtime_r_monitor = PR_NewLock();
-        }
-        PR_Lock(localtime_r_monitor);
-    }
-
-    /*
-     * On Windows, localtime() returns a NULL pointer if 'clock'
-     * represents a time before midnight January 1, 1970.  In
-     * that case, we also return a NULL pointer and the struct tm
-     * object pointed to by 'result' is not modified.
-     */
-
-    tmPtr = localtime(clock);
-    if (tmPtr) {
-        *result = *tmPtr;
-    } else {
-        result = NULL;
-    }
-
-    if (needLock) PR_Unlock(localtime_r_monitor);
-
-    return result;
-}
-
-#endif
-
-#if defined (NEED_GMTIME_R)
-
-static PRLock *gmtime_r_monitor = NULL;
-
-struct tm *gmtime_r (const time_t *clock, struct tm *result)
-{
-    struct tm *tmPtr;
-    int needLock = PR_Initialized();  /* We need to use a lock to protect
-                                       * against NSPR threads only when the
-                                       * NSPR thread system is activated. */
-
-    if (needLock) {
-        if (gmtime_r_monitor == NULL) {
-            gmtime_r_monitor = PR_NewLock();
-        }
-        PR_Lock(gmtime_r_monitor);
-    }
-
-    tmPtr = gmtime(clock);
-    if (tmPtr) {
-        *result = *tmPtr;
-    } else {
-        result = NULL;
-    }
-
-    if (needLock) PR_Unlock(gmtime_r_monitor);
-
-    return result;
-}
-
-#endif
-
-#if defined (NEED_CTIME_R)
-
-static PRLock *ctime_r_monitor = NULL;
-
-char  *ctime_r (const time_t *clock, char *buf, int buflen)
-{
-    char *cbuf;
-    int needLock = PR_Initialized();  /* We need to use a lock to protect
-                                       * against NSPR threads only when the
-                                       * NSPR thread system is activated. */
-
-    if (needLock) {
-
-        if (ctime_r_monitor == NULL) {
-            ctime_r_monitor = PR_NewLock();
-        }
-        PR_Lock(ctime_r_monitor);
-    }
-
-    cbuf = ctime (clock);
-    if (cbuf) {
-        strncpy (buf, cbuf, buflen - 1);
-        buf[buflen - 1] = 0;
-    }
-
-    if (needLock) PR_Unlock(ctime_r_monitor);
-
-    return cbuf;
-}
-
-#endif
-
-#if defined (NEED_ASCTIME_R)
-
-static PRLock *asctime_r_monitor = NULL;
-
-
-char  *asctime_r (const struct tm  *tm, char *buf, int buflen)
-{
-    char *cbuf;
-    int needLock = PR_Initialized();  /* We need to use a lock to protect
-                                       * against NSPR threads only when the
-                                       * NSPR thread system is activated. */
-
-    if (needLock) {
-        if (asctime_r_monitor == NULL) {
-            asctime_r_monitor = PR_NewLock();
-        }
-        PR_Lock(asctime_r_monitor);
-    }
-
-    cbuf = asctime (tm);
-    if (cbuf) {
-        strncpy (buf, cbuf, buflen - 1);
-        buf[buflen - 1] = 0;
-    }
-
-    if (needLock) PR_Unlock(asctime_r_monitor);
-
-    return cbuf;
-
-}
-#endif
-
-#if defined (NEED_STRTOK_R)
-
-char *
-strtok_r (s, delim, last)
-        register char *s;
-        register const char *delim;
-        register char **last;
-{
-        register char *spanp;
-        register int c, sc;
-        char *tok;
-
-
-        if (s == NULL && (s = *last) == NULL)
-                return (NULL);
-
-        /*
-         * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-         */
-cont:
-
-        c = *s++;
-        for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-                if (c == sc)
-                        goto cont;
-        }
-
-        if (c == 0) {           /* no non-delimiter characters */
-                *last = NULL;
-                return (NULL);
-        }
-        tok = s - 1;
-
-        /*
-         * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-         * Note that delim must have one NUL; we stop if we see that, too.
-         */
-        for (;;) {
-                c = *s++;
-                spanp = (char *)delim;
-                do {
-                        if ((sc = *spanp++) == c) {
-                                if (c == 0)
-                                        s = NULL;
-
-                                else
-                                        s[-1] = 0;
-                                *last = s;
-                                return (tok);
-                        }
-                } while (sc != 0);
-        }
-        /* NOTREACHED */
-}
-
-#endif
diff --git a/libs/js/nsprpub/pr/src/md/unix/nec.c b/libs/js/nsprpub/pr/src/md/unix/nec.c
deleted file mode 100644
index 8c97b757d1..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/nec.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for NEC */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for NEC.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for NEC.");
-	return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/netbsd.c b/libs/js/nsprpub/pr/src/md/unix/netbsd.c
deleted file mode 100644
index fdef8d7bb4..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/netbsd.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-#include <poll.h>
-#include <sys/syscall.h>
-
-void _MD_EarlyInit(void)
-{
-    /*
-     * Ignore FPE because coercion of a NaN to an int causes SIGFPE
-     * to be raised.
-     */
-    struct sigaction act;
-
-    act.sa_handler = SIG_IGN;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_RESTART;
-    sigaction(SIGFPE, &act, 0);
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-        (void) sigsetjmp(CONTEXT(t), 1);
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-    *np = 0;
-    return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-        PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for NetBSD */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for NetBSD.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for NetBSD.");
-    return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/nextstep.c b/libs/js/nsprpub/pr/src/md/unix/nextstep.c
deleted file mode 100644
index 3f87815a77..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/nextstep.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <mach-o/dyld.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <syscall.h>
-
-
-
-/*	These functions are hidden in NEXTSTEP, but beacuse they have syscall()
-**	entries I can wrap these into their corresponding missing function.
-*/
-caddr_t
-mmap(caddr_t addr, size_t len, int prot, int flags,
-          int fildes, off_t off)
-{
-	return (caddr_t) syscall (SYS_mmap, addr, len, prot, flags, fildes, off);
-}
-
-int
-munmap(caddr_t addr, size_t len)
-{
-	return syscall (SYS_munmap, addr, len);
-}
-
-int
-mprotect(caddr_t addr, size_t len, int prot)
-{
-	return syscall (SYS_mprotect, addr, len, prot);
-}
-
-
-/* If found the brk() symbol in the sahred libraries but no syscall() entry ...
-** I don't know whether it will work ...
-int brk(void *endds)
-{
-	return syscall ();
-}
-*/
-
-void *sbrk(int incr)
-{
-	return (void *) syscall (SYS_sbrk, incr);
-}
-
-/*	These are my mach based versions, untested and probably bad ...
-*/
-caddr_t my_mmap(caddr_t addr, size_t len, int prot, int flags,
-          int fildes, off_t off)
-{
-	kern_return_t ret_val;
-	
-	/*	First map ...
-	*/
-	ret_val = map_fd ( fildes, 					/* fd				*/
-	                  (vm_offset_t) off,		/* offset			*/
-					  (vm_offset_t*)&addr,		/* address			*/
-					  TRUE, 					/* find_space		*/
-					  (vm_size_t) len);			/* size				*/
-
-	if (ret_val != KERN_SUCCESS) {
-    	mach_error("Error calling map_fd() in mmap", ret_val );
-		return (caddr_t)0;
-	}
-	
-	/*	... then protect (this is probably bad)
-	*/
-	ret_val = vm_protect( task_self(),			/* target_task 		*/
-						 (vm_address_t)addr,	/* address			*/
-						 (vm_size_t) len,		/* size 			*/
-						 FALSE,					/* set_maximum		*/
-						 (vm_prot_t) prot);		/* new_protection	*/
-	if (ret_val != KERN_SUCCESS) {
-		mach_error("vm_protect in mmap()", ret_val );
-		return (caddr_t)0;
-	}
-	
-	return addr;
-}
-
-int my_munmap(caddr_t addr, size_t len)
-{
-	kern_return_t ret_val;
-
-	ret_val = vm_deallocate(task_self(),
-	 						(vm_address_t) addr,
-							(vm_size_t) len);
-
-	if (ret_val != KERN_SUCCESS) {
-		mach_error("vm_deallocate in munmap()", ret_val);
-		return -1;
-	}
-	
-	return 0;
-}
-
-int my_mprotect(caddr_t addr, size_t len, int prot)
-{
-	vm_prot_t mach_prot;
-	kern_return_t ret_val;
-	
-	switch (prot) {
-		case PROT_READ:		mach_prot = VM_PROT_READ;		break;
-		case PROT_WRITE:	mach_prot = VM_PROT_WRITE;		break;
-		case PROT_EXEC:		mach_prot = VM_PROT_EXECUTE;	break;
-		case PROT_NONE:		mach_prot = VM_PROT_NONE;		break;
-	}
-	
-	ret_val = vm_protect(task_self(),			/* target_task 		*/
-						 (vm_address_t)addr,	/* address			*/
-						 (vm_size_t) len,		/* size 			*/
-						 FALSE,					/* set_maximum		*/
-						 (vm_prot_t) prot);		/* new_protection	*/
-
-	if (ret_val != KERN_SUCCESS) {
-		mach_error("vm_protect in mprotect()", ret_val);
-		return -1;
-	}
-	
-	return 0;
-}
-
-char *strdup(const char *s1)
-{
-	int len = strlen (s1);
-	char *copy = (char*) malloc (len+1);
-	
-	if (copy == (char*)0)
-		return (char*)0;
-
-	strcpy (copy, s1);
-
-	return copy;
-}
-
-/* Stub rld functions
-*/
-extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile(
-    const char *pathName,
-    NSObjectFileImage *objectFileImage)
-{
-	return NSObjectFileImageFailure;
-}
-
-extern void * NSAddressOfSymbol(
-    NSSymbol symbol)
-{
-	return NULL;
-}
-
-extern NSModule NSLinkModule(
-    NSObjectFileImage objectFileImage, 
-    const char *moduleName, /* can be NULL */
-    enum bool bindNow)
-{
-	return NULL;
-}
-
-extern NSSymbol NSLookupAndBindSymbol(
-    const char *symbolName)
-{
-	return NULL;
-}
-
-extern enum bool NSUnLinkModule(
-    NSModule module, 
-    enum bool keepMemoryMapped)
-{
-	return 0;
-}
-
-
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) sigsetjmp(CONTEXT(t), 1);
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for NEXTSTEP */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for NEXTSTEP.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for NEXTSTEP.");
-	return PR_FAILURE;
-}
-
-#endif
diff --git a/libs/js/nsprpub/pr/src/md/unix/nto.c b/libs/js/nsprpub/pr/src/md/unix/nto.c
deleted file mode 100644
index 352d93e9a0..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/nto.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <setjmp.h>
-
-/* Fake this out */
-int socketpair (int foo, int foo2, int foo3, int sv[2])
-{
-	printf("error in socketpair\n");
-	exit (-1);
-}
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-    (void) setjmp(CONTEXT(t));
-    }
-
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/objs.mk b/libs/js/nsprpub/pr/src/md/unix/objs.mk
deleted file mode 100644
index 33ee898273..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/objs.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# This makefile appends to the variable OBJS the platform-dependent
-# object modules that will be part of the nspr20 library.
-
-CSRCS =          \
-	unix.c    \
-	unix_errors.c \
-	uxproces.c \
-	uxwrap.c \
-	$(NULL)
-
-ifneq ($(USE_PTHREADS),1)
-CSRCS += uxpoll.c
-endif
-
-ifeq ($(PTHREADS_USER),1)
-CSRCS += pthreads_user.c
-endif
-
-CSRCS	+= $(PR_MD_CSRCS)
-ASFILES += $(PR_MD_ASFILES)
-
-OBJS += $(addprefix md/unix/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)))  \
-	$(addprefix md/unix/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX)))
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/openbsd.c b/libs/js/nsprpub/pr/src/md/unix/openbsd.c
deleted file mode 100644
index 1103377fad..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/openbsd.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-#include <poll.h>
-#include <sys/syscall.h>
-
-void _MD_EarlyInit(void)
-{
-    /*
-     * Ignore FPE because coercion of a NaN to an int causes SIGFPE
-     * to be raised.
-     */
-    struct sigaction act;
-
-    act.sa_handler = SIG_IGN;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_RESTART;
-    sigaction(SIGFPE, &act, 0);
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-        (void) sigsetjmp(CONTEXT(t), 1);
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-    *np = 0;
-    return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-        PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for OpenBSD */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for OpenBSD.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OpenBSD.");
-    return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/openvms.c b/libs/js/nsprpub/pr/src/md/unix/openvms.c
deleted file mode 100644
index 20b4f70880..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/openvms.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for OSF1 */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for OSF1.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
-
-#ifdef _PR_HAVE_ATOMIC_CAS
-
-#include <c_asm.h>
-
-#define _PR_OSF_ATOMIC_LOCK 1
-
-void 
-PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
-{
-long locked;
-
-	do {
-		while ((long) stack->prstk_head.prstk_elem_next ==
-							_PR_OSF_ATOMIC_LOCK)
-			;
-		locked = __ATOMIC_EXCH_QUAD(&stack->prstk_head.prstk_elem_next,
-								_PR_OSF_ATOMIC_LOCK);	
-
-	} while (locked == _PR_OSF_ATOMIC_LOCK);
-	stack_elem->prstk_elem_next = (PRStackElem *) locked;
-	/*
-	 * memory-barrier instruction
-	 */
-	asm("mb");
-	stack->prstk_head.prstk_elem_next = stack_elem;
-}
-
-PRStackElem * 
-PR_StackPop(PRStack *stack)
-{
-PRStackElem *element;
-long locked;
-
-	do {
-		while ((long)stack->prstk_head.prstk_elem_next == _PR_OSF_ATOMIC_LOCK)
-			;
-		locked = __ATOMIC_EXCH_QUAD(&stack->prstk_head.prstk_elem_next,
-								_PR_OSF_ATOMIC_LOCK);	
-
-	} while (locked == _PR_OSF_ATOMIC_LOCK);
-
-	element = (PRStackElem *) locked;
-
-	if (element == NULL) {
-		stack->prstk_head.prstk_elem_next = NULL;
-	} else {
-		stack->prstk_head.prstk_elem_next =
-			element->prstk_elem_next;
-	}
-	/*
-	 * memory-barrier instruction
-	 */
-	asm("mb");
-	return element;
-}
-#endif /* _PR_HAVE_ATOMIC_CAS */
-
-
-/*
-** thread_suspend and thread_resume are used by the gc code
-** in nsprpub/pr/src/pthreads/ptthread.c
-**
-** These routines are never called for the current thread, and
-** there is no check for that - so beware!
-*/
-int thread_suspend(PRThread *thr_id) {
-
-    extern int pthread_suspend_np (
-			pthread_t                       thread,
-			__pthreadLongUint_t             *regs,
-			void                            *spare);
-
-    __pthreadLongUint_t regs[34];
-    int res;
-
-    /*
-    ** A return res < 0 indicates that the thread was suspended
-    ** but register information could not be obtained
-    */
-
-    res = pthread_suspend_np(thr_id->id,&regs[0],0);
-    if (res==0)
-	thr_id->sp = (void *) regs[30]; 
-
-    thr_id->suspend |= PT_THREAD_SUSPENDED;
-
-    /* Always succeeds */
-    return 0;
-}
-
-int thread_resume(PRThread *thr_id) {
-    extern int pthread_resume_np(pthread_t thread);
-    int res;
-
-    res = pthread_resume_np (thr_id->id);
-	
-    thr_id->suspend |= PT_THREAD_RESUMED;
-
-    return 0;
-}
-
-/*
-** Stubs for nspr_symvec.opt
-**
-** PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended
-** (defined in ptthread.c) used to be exported by mistake
-** (because they look like public functions).  They have been
-** converted into static functions.
-**
-** There is an existing third-party binary that uses NSPR: the
-** Java plugin for Mozilla.  Because it is part of the Java
-** SDK, we have no control over its releases.  So we need these
-** stub functions to occupy the slots that used to be occupied
-** by PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended
-** in the symbol vector so that LIBNSPR4 is backward compatible.
-**
-** The Java plugin was also using PR_CreateThread which we didn't
-** realise and hadn't "nailed down". So we now need to nail it down
-** to its Mozilla 1.1 position and have to insert 51 additional stubs
-** in order to achive this (stubs 4-54).
-**
-** Over time some of these stubs will get reused by new symbols.
-**   - Stub54 is replaced by LL_MaxUint
-*/
-
-void PR_VMS_Stub1(void) { }
-void PR_VMS_Stub2(void) { }
-void PR_VMS_Stub3(void) { }
-void PR_VMS_Stub4(void) { }
-void PR_VMS_Stub5(void) { }
-void PR_VMS_Stub6(void) { }
-void PR_VMS_Stub7(void) { }
-void PR_VMS_Stub8(void) { }
-void PR_VMS_Stub9(void) { }
-void PR_VMS_Stub10(void) { }
-void PR_VMS_Stub11(void) { }
-void PR_VMS_Stub12(void) { }
-void PR_VMS_Stub13(void) { }
-void PR_VMS_Stub14(void) { }
-void PR_VMS_Stub15(void) { }
-void PR_VMS_Stub16(void) { }
-void PR_VMS_Stub17(void) { }
-void PR_VMS_Stub18(void) { }
-void PR_VMS_Stub19(void) { }
-void PR_VMS_Stub20(void) { }
-void PR_VMS_Stub21(void) { }
-void PR_VMS_Stub22(void) { }
-void PR_VMS_Stub23(void) { }
-void PR_VMS_Stub24(void) { }
-void PR_VMS_Stub25(void) { }
-void PR_VMS_Stub26(void) { }
-void PR_VMS_Stub27(void) { }
-void PR_VMS_Stub28(void) { }
-void PR_VMS_Stub29(void) { }
-void PR_VMS_Stub30(void) { }
-void PR_VMS_Stub31(void) { }
-void PR_VMS_Stub32(void) { }
-void PR_VMS_Stub33(void) { }
-void PR_VMS_Stub34(void) { }
-void PR_VMS_Stub35(void) { }
-void PR_VMS_Stub36(void) { }
-void PR_VMS_Stub37(void) { }
-void PR_VMS_Stub38(void) { }
-void PR_VMS_Stub39(void) { }
-void PR_VMS_Stub40(void) { }
-void PR_VMS_Stub41(void) { }
-void PR_VMS_Stub42(void) { }
-void PR_VMS_Stub43(void) { }
-void PR_VMS_Stub44(void) { }
-void PR_VMS_Stub45(void) { }
-void PR_VMS_Stub46(void) { }
-void PR_VMS_Stub47(void) { }
-void PR_VMS_Stub48(void) { }
-void PR_VMS_Stub49(void) { }
-void PR_VMS_Stub50(void) { }
-void PR_VMS_Stub51(void) { }
-void PR_VMS_Stub52(void) { }
-void PR_VMS_Stub53(void) { }
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_AIX.s b/libs/js/nsprpub/pr/src/md/unix/os_AIX.s
deleted file mode 100644
index 8911a75e96..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_AIX.s
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-.set r0,0; .set SP,1; .set RTOC,2; .set r3,3; .set r4,4
-.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-.set r30,30; .set r31,31
-
-
-        .rename H.10.NO_SYMBOL{PR},""
-        .rename H.18.longjmp{TC},"longjmp"
-
-        .lglobl H.10.NO_SYMBOL{PR}
-        .globl  .longjmp
-        .globl  longjmp{DS}
-        .extern .sigcleanup
-        .extern .jmprestfpr
-
-# .text section
-
-        .csect  H.10.NO_SYMBOL{PR}
-.longjmp:
-         mr   r13,r3
-         mr   r14,r4
-        stu   SP,-56(SP)
-         bl   .sigcleanup
-          l   RTOC,0x14(SP)
-        cal   SP,0x38(SP)
-         mr   r3,r13
-         mr   r4,r14
-          l   r5,0x8(r3)
-          l   SP,0xc(r3)
-          l   r7,0xf8(r3)
-         st   r7,0x0(SP)
-          l   RTOC,0x10(r3)
-         bl   .jmprestfpr
-# 1 == cr0 in disassembly
-       cmpi   1,r4,0x0  
-       mtlr   r5
-         lm   r13,0x14(r3)
-          l   r5,0x60(r3)
-      mtcrf   0x38,r5
-         mr   r3,r4
-        bne   __L1
-        lil   r3,0x1
-__L1:
-         br
-
-# traceback table
-        .long   0x00000000
-        .byte   0x00                    # VERSION=0
-        .byte   0x00                    # LANG=TB_C
-        .byte   0x20                    # IS_GL=0,IS_EPROL=0,HAS_TBOFF=1
-                                        # INT_PROC=0,HAS_CTL=0,TOCLESS=0
-                                        # FP_PRESENT=0,LOG_ABORT=0
-        .byte   0x40                    # INT_HNDL=0,NAME_PRESENT=1
-                                        # USES_ALLOCA=0,CL_DIS_INV=WALK_ONCOND
-                                        # SAVES_CR=0,SAVES_LR=0
-        .byte   0x80                    # STORES_BC=1,FPR_SAVED=0
-        .byte   0x00                    # GPR_SAVED=0
-        .byte   0x02                    # FIXEDPARMS=2
-        .byte   0x01                    # FLOATPARMS=0,PARMSONSTK=1
-        .long   0x00000000              #
-        .long   0x00000014              # TB_OFFSET
-        .short  7                       # NAME_LEN
-        .byte   "longjmp"
-        .byte   0                       # padding
-        .byte   0                       # padding
-        .byte   0                       # padding
-# End of traceback table
-        .long   0x00000000              # "\0\0\0\0"
-
-# .data section
-
-        .toc                            # 0x00000038
-T.18.longjmp:
-        .tc     H.18.longjmp{TC},longjmp{DS}
-
-        .csect  longjmp{DS}
-        .long   .longjmp                # "\0\0\0\0"
-        .long   TOC{TC0}                # "\0\0\0008"
-        .long   0x00000000              # "\0\0\0\0"
-# End   csect   longjmp{DS}
-
-# .bss section
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s b/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s
deleted file mode 100644
index aadf0df250..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_BSD_386_2.s
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
-* The contents of this file are subject to the Mozilla Public
-* License Version 1.1 (the "License"); you may not use this file
-* except in compliance with the License. You may obtain a copy of
-* the License at http://www.mozilla.org/MPL/
-* 
-* Software distributed under the License is distributed on an "AS
-* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-* 
-* The Original Code is the Netscape Portable Runtime (NSPR).
-* 
-* The Initial Developer of the Original Code is Netscape
-* Communications Corporation.  Portions created by Netscape are 
-* Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-* Rights Reserved.
-* 
-* Contributor(s):
-* 
-* Alternatively, the contents of this file may be used under the
-* terms of the GNU General Public License Version 2 or later (the
-* "GPL"), in which case the provisions of the GPL are applicable 
-* instead of those above.  If you wish to allow use of your 
-* version of this file only under the terms of the GPL and not to
-* allow others to use your version of this file under the MPL,
-* indicate your decision by deleting the provisions above and
-* replace them with the notice and other provisions required by
-* the GPL.  If you do not delete the provisions above, a recipient
-* may use your version of this file under either the MPL or the
-* GPL.
-*/
-
-/*
- * os_BSD_386_2.s
- * We need to define our own setjmp/longjmp on BSDI 2.x because libc's
- * implementation does some sanity checking that defeats user level threads.
- * This should no longer be necessary in BSDI 3.0.
- */
-
-.globl _setjmp
-.align 2
-_setjmp:
-		movl	4(%esp),%eax
-		movl	0(%esp),%edx
-		movl	%edx, 0(%eax)           /* rta */
-		movl	%ebx, 4(%eax)
-		movl	%esp, 8(%eax)
-		movl	%ebp,12(%eax)
-		movl	%esi,16(%eax)
-		movl	%edi,20(%eax)
-		movl	$0,%eax
-		ret
- 
-.globl _longjmp
-.align 2
-_longjmp:
-		movl	4(%esp),%edx
-		movl	8(%esp),%eax
-		movl	0(%edx),%ecx
-		movl	4(%edx),%ebx
-		movl	8(%edx),%esp
-		movl	12(%edx),%ebp
-		movl	16(%edx),%esi
-		movl	20(%edx),%edi
-		cmpl	$0,%eax
-		jne		1f
-		movl	$1,%eax
-1:		movl	%ecx,0(%esp)
-		ret
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s b/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
deleted file mode 100644
index f38ac64437..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2003 Netscape Communications Corporation.  All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#
-# Based on the programming examples in The PowerPC Architecture:
-# A Specification for A New Family of RISC Processors, 2nd Ed.,
-# Book I, Section E.1, "Synchronization," pp. 249-256, May 1994.
-#
-
-.text
-
-#
-# PRInt32 __PR_DarwinPPC_AtomicIncrement(PRInt32 *val);
-#
-        .align  2
-        .globl  __PR_DarwinPPC_AtomicIncrement
-__PR_DarwinPPC_AtomicIncrement:
-        lwarx   r4,0,r3
-        addi    r0,r4,1
-        stwcx.  r0,0,r3
-        bne-    __PR_DarwinPPC_AtomicIncrement
-        mr      r3,r0
-        blr
-
-#
-# PRInt32 __PR_DarwinPPC_AtomicDecrement(PRInt32 *val);
-#
-        .align  2
-        .globl  __PR_DarwinPPC_AtomicDecrement
-__PR_DarwinPPC_AtomicDecrement:
-        lwarx   r4,0,r3
-        addi    r0,r4,-1
-        stwcx.  r0,0,r3
-        bne-    __PR_DarwinPPC_AtomicDecrement
-        mr      r3,r0
-        blr
-
-#
-# PRInt32 __PR_DarwinPPC_AtomicSet(PRInt32 *val, PRInt32 newval);
-#
-        .align  2
-        .globl  __PR_DarwinPPC_AtomicSet
-__PR_DarwinPPC_AtomicSet:
-        lwarx   r5,0,r3
-        stwcx.  r4,0,r3
-        bne-    __PR_DarwinPPC_AtomicSet
-        mr      r3,r5
-        blr
-
-#
-# PRInt32 __PR_DarwinPPC_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#
-        .align  2
-        .globl  __PR_DarwinPPC_AtomicAdd
-__PR_DarwinPPC_AtomicAdd:
-        lwarx   r5,0,r3
-        add     r0,r4,r5
-        stwcx.  r0,0,r3
-        bne-    __PR_DarwinPPC_AtomicAdd
-        mr      r3,r0
-        blr
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s b/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
deleted file mode 100644
index d0042613c4..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2003 Netscape Communications Corporation.  All
-# Rights Reserved.
-#
-# Contributor(s):
-#   Josh Aas <josh@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-#
-# Based on os_Linux_x86.s
-#
-
-#
-# PRInt32 __PR_Darwin_x86_AtomicIncrement(PRInt32 *val);
-#
-# Atomically increment the integer pointed to by 'val' and return
-# the result of the increment.
-#
-    .text
-    .globl __PR_Darwin_x86_AtomicIncrement
-    .align 4
-__PR_Darwin_x86_AtomicIncrement:
-    movl 4(%esp), %ecx
-    movl $1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    incl %eax
-    ret
-
-#
-# PRInt32 __PR_Darwin_x86_AtomicDecrement(PRInt32 *val);
-#
-# Atomically decrement the integer pointed to by 'val' and return
-# the result of the decrement.
-#
-    .text
-    .globl __PR_Darwin_x86_AtomicDecrement
-    .align 4
-__PR_Darwin_x86_AtomicDecrement:
-    movl 4(%esp), %ecx
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    decl %eax
-    ret
-
-#
-# PRInt32 __PR_Darwin_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
-#
-# Atomically set the integer pointed to by 'val' to the new
-# value 'newval' and return the old value.
-#
-    .text
-    .globl __PR_Darwin_x86_AtomicSet
-    .align 4
-__PR_Darwin_x86_AtomicSet:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    xchgl %eax, (%ecx)
-    ret
-
-#
-# PRInt32 __PR_Darwin_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#
-# Atomically add 'val' to the integer pointed to by 'ptr'
-# and return the result of the addition.
-#
-    .text
-    .globl __PR_Darwin_x86_AtomicAdd
-    .align 4
-__PR_Darwin_x86_AtomicAdd:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    movl %eax, %edx
-    lock
-    xaddl %eax, (%ecx)
-    addl %edx, %eax
-    ret
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s b/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s
deleted file mode 100644
index 375cb2567e..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_HPUX.s
+++ /dev/null
@@ -1,54 +0,0 @@
-; 
-; The contents of this file are subject to the Mozilla Public
-; License Version 1.1 (the "License"); you may not use this file
-; except in compliance with the License. You may obtain a copy of
-; the License at http://www.mozilla.org/MPL/
-; 
-; Software distributed under the License is distributed on an "AS
-; IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-; implied. See the License for the specific language governing
-; rights and limitations under the License.
-; 
-; The Original Code is the Netscape Portable Runtime (NSPR).
-; 
-; The Initial Developer of the Original Code is Netscape
-; Communications Corporation.  Portions created by Netscape are 
-; Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-; Rights Reserved.
-; 
-; Contributor(s):
-; 
-; Alternatively, the contents of this file may be used under the
-; terms of the GNU General Public License Version 2 or later (the
-; "GPL"), in which case the provisions of the GPL are applicable 
-; instead of those above.  If you wish to allow use of your 
-; version of this file only under the terms of the GPL and not to
-; allow others to use your version of this file under the MPL,
-; indicate your decision by deleting the provisions above and
-; replace them with the notice and other provisions required by
-; the GPL.  If you do not delete the provisions above, a recipient
-; may use your version of this file under either the MPL or the
-; GPL.
-; 
-
-#ifdef __LP64__
-        .LEVEL   2.0W
-#else
-        .LEVEL   1.1
-#endif
-
-	.CODE	; equivalent to the following two lines
-;       .SPACE   $TEXT$,SORT=8
-;       .SUBSPA  $CODE$,QUAD=0,ALIGN=4,ACCESS=0x2c,CODE_ONLY,SORT=24
-
-ret_cr16
-	.PROC
-	.CALLINFO 	FRAME=0, NO_CALLS
-	.EXPORT 	ret_cr16,ENTRY
-	.ENTER
-;	BV		%r0(%rp)
-	BV		0(%rp)
-	MFCTL		%cr16,%ret0
-        .LEAVE
-        .PROCEND
-        .END
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s b/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s
deleted file mode 100644
index d433f4fee5..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_HPUX_ia64.s
+++ /dev/null
@@ -1,108 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 2000 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-//
-
-.text
-
-// PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-        .align 16
-        .global _PR_ia64_AtomicIncrement#
-        .proc _PR_ia64_AtomicIncrement#
-_PR_ia64_AtomicIncrement:
-#ifndef _LP64
-        addp4 r32 = 0, r32  ;;
-#endif
-        fetchadd4.acq r8 = [r32], 1  ;;
-        adds r8 = 1, r8
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicIncrement#
-
-// PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-        .align 16
-        .global _PR_ia64_AtomicDecrement#
-        .proc _PR_ia64_AtomicDecrement#
-_PR_ia64_AtomicDecrement:
-#ifndef _LP64
-        addp4 r32 = 0, r32  ;;
-#endif
-        fetchadd4.rel r8 = [r32], -1  ;;
-        adds r8 = -1, r8
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicDecrement#
-
-// PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-        .align 16
-        .global _PR_ia64_AtomicAdd#
-        .proc _PR_ia64_AtomicAdd#
-_PR_ia64_AtomicAdd:
-#ifndef _LP64
-        addp4 r32 = 0, r32  ;;
-#endif
-        ld4 r15 = [r32]  ;;
-.L3:
-        mov r14 = r15
-        mov ar.ccv = r15
-        add r8 = r15, r33  ;;
-        cmpxchg4.acq r15 = [r32], r8, ar.ccv  ;;
-        cmp4.ne p6, p7 =  r15, r14
-        (p6) br.cond.dptk .L3
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicAdd#
-
-// PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-        .align 16
-        .global _PR_ia64_AtomicSet#
-        .proc _PR_ia64_AtomicSet#
-_PR_ia64_AtomicSet:
-#ifndef _LP64
-        addp4 r32 = 0, r32  ;;
-#endif
-        xchg4 r8 = [r32], r33
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicSet#
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Irix.s b/libs/js/nsprpub/pr/src/md/unix/os_Irix.s
deleted file mode 100644
index 7a4b186f6e..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Irix.s
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
-* The contents of this file are subject to the Mozilla Public
-* License Version 1.1 (the "License"); you may not use this file
-* except in compliance with the License. You may obtain a copy of
-* the License at http://www.mozilla.org/MPL/
-* 
-* Software distributed under the License is distributed on an "AS
-* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-* 
-* The Original Code is the Netscape Portable Runtime (NSPR).
-* 
-* The Initial Developer of the Original Code is Netscape
-* Communications Corporation.  Portions created by Netscape are 
-* Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-* Rights Reserved.
-* 
-* Contributor(s):
-* 
-* Alternatively, the contents of this file may be used under the
-* terms of the GNU General Public License Version 2 or later (the
-* "GPL"), in which case the provisions of the GPL are applicable 
-* instead of those above.  If you wish to allow use of your 
-* version of this file only under the terms of the GPL and not to
-* allow others to use your version of this file under the MPL,
-* indicate your decision by deleting the provisions above and
-* replace them with the notice and other provisions required by
-* the GPL.  If you do not delete the provisions above, a recipient
-* may use your version of this file under either the MPL or the
-* GPL.
-*/
-
-/* 
- *  Atomically add a new element to the top of the stack
- *
- *  usage : PR_StackPush(listp, elementp);
- *  -----------------------
- */
-
-#include "md/_irix.h"
-#ifdef _PR_HAVE_ATOMIC_CAS
-
-#include <sys/asm.h>
-#include <sys/regdef.h>
-
-LEAF(PR_StackPush)
-
-retry_push:
-.set noreorder
-		lw		v0,0(a0)
-		li		t1,1
-		beq		v0,t1,retry_push
-		move	t0,a1
-
-        ll      v0,0(a0)
-		beq		v0,t1,retry_push
-		nop
-		sc		t1,0(a0)	
-		beq		t1,0,retry_push
-		nop
-		sw		v0,0(a1)
-		sync
-		sw		t0,0(a0)
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		jr		ra
-		nop
-
-END(PR_StackPush)
-
-/*
- *
- *  Atomically remove the element at the top of the stack
- *
- *  usage : elemep = PR_StackPop(listp);
- *
- */
-
-LEAF(PR_StackPop)
-retry_pop:
-.set noreorder
-
-
-		lw		v0,0(a0)
-		li		t1,1
-		beq		v0,0,done
-		nop	
-		beq		v0,t1,retry_pop
-		nop	
-
-        ll      v0,0(a0)
-		beq		v0,0,done
-		nop
-		beq		v0,t1,retry_pop
-		nop
-		sc		t1,0(a0)	
-		beq		t1,0,retry_pop
-		nop
-		lw		t0,0(v0)
-		sw		t0,0(a0)
-done:
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		nop
-		jr		ra
-		nop
-
-END(PR_StackPop)
-
-#endif /* _PR_HAVE_ATOMIC_CAS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s b/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
deleted file mode 100644
index 5a64c706b7..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 2000 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-//
-
-.text
-
-// PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-        .align 16
-        .global _PR_ia64_AtomicIncrement#
-        .proc _PR_ia64_AtomicIncrement#
-_PR_ia64_AtomicIncrement:
-        fetchadd4.acq r8 = [r32], 1  ;;
-        adds r8 = 1, r8
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicIncrement#
-
-// PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-        .align 16
-        .global _PR_ia64_AtomicDecrement#
-        .proc _PR_ia64_AtomicDecrement#
-_PR_ia64_AtomicDecrement:
-        fetchadd4.rel r8 = [r32], -1  ;;
-        adds r8 = -1, r8
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicDecrement#
-
-// PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-        .align 16
-        .global _PR_ia64_AtomicAdd#
-        .proc _PR_ia64_AtomicAdd#
-_PR_ia64_AtomicAdd:
-        ld4 r15 = [r32]  ;;
-.L3:
-        mov r14 = r15
-        mov ar.ccv = r15
-        add r8 = r15, r33  ;;
-        cmpxchg4.acq r15 = [r32], r8, ar.ccv  ;;
-        cmp4.ne p6, p7 =  r15, r14
-        (p6) br.cond.dptk .L3
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicAdd#
-
-// PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-        .align 16
-        .global _PR_ia64_AtomicSet#
-        .proc _PR_ia64_AtomicSet#
-_PR_ia64_AtomicSet:
-        xchg4 r8 = [r32], r33
-        br.ret.sptk.many b0
-        .endp _PR_ia64_AtomicSet#
-
-// Magic indicating no need for an executable stack
-.section .note.GNU-stack, "", @progbits ; .previous
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s b/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s
deleted file mode 100644
index 650aa2ad80..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86.s
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 2000 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-// 
-
-// PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-    .text
-    .globl _PR_x86_AtomicIncrement
-    .align 4
-_PR_x86_AtomicIncrement:
-    movl 4(%esp), %ecx
-    movl $1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    incl %eax
-    ret
-
-// PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-    .text
-    .globl _PR_x86_AtomicDecrement
-    .align 4
-_PR_x86_AtomicDecrement:
-    movl 4(%esp), %ecx
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    decl %eax
-    ret
-
-// PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-// An alternative implementation:
-//   .text
-//   .globl _PR_x86_AtomicSet
-//   .align 4
-//_PR_x86_AtomicSet:
-//   movl 4(%esp), %ecx
-//   movl 8(%esp), %edx
-//   movl (%ecx), %eax
-//retry:
-//   lock
-//   cmpxchgl %edx, (%ecx)
-//   jne retry
-//   ret
-//
-    .text
-    .globl _PR_x86_AtomicSet
-    .align 4
-_PR_x86_AtomicSet:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    xchgl %eax, (%ecx)
-    ret
-
-// PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-    .text
-    .globl _PR_x86_AtomicAdd
-    .align 4
-_PR_x86_AtomicAdd:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    movl %eax, %edx
-    lock
-    xaddl %eax, (%ecx)
-    addl %edx, %eax
-    ret
-
-// Magic indicating no need for an executable stack
-.section .note.GNU-stack, "", @progbits ; .previous
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s b/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
deleted file mode 100644
index 230dd82887..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 2004 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-// 
-
-// PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-    .text
-    .globl _PR_x86_64_AtomicIncrement
-    .align 4
-_PR_x86_64_AtomicIncrement:
-    movl $1, %eax
-    lock
-    xaddl %eax, (%rdi)
-    incl %eax
-    ret
-
-// PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-    .text
-    .globl _PR_x86_64_AtomicDecrement
-    .align 4
-_PR_x86_64_AtomicDecrement:
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%rdi)
-    decl %eax
-    ret
-
-// PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-    .text
-    .globl _PR_x86_64_AtomicSet
-    .align 4
-_PR_x86_64_AtomicSet:
-    movl %esi, %eax
-    xchgl %eax, (%rdi)
-    ret
-
-// PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-    .text
-    .globl _PR_x86_64_AtomicAdd
-    .align 4
-_PR_x86_64_AtomicAdd:
-    movl %esi, %eax
-    lock
-    xaddl %eax, (%rdi)
-    addl %esi, %eax
-    ret
-
-// Magic indicating no need for an executable stack
-//.section .note.GNU-stack, "", @progbits ; .previous
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s b/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
deleted file mode 100644
index 769160bf4b..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
-* The contents of this file are subject to the Mozilla Public
-* License Version 1.1 (the "License"); you may not use this file
-* except in compliance with the License. You may obtain a copy of
-* the License at http://www.mozilla.org/MPL/
-* 
-* Software distributed under the License is distributed on an "AS
-* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-* 
-* The Original Code is the Netscape Portable Runtime (NSPR).
-* 
-* The Initial Developer of the Original Code is Netscape
-* Communications Corporation.  Portions created by Netscape are 
-* Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-* Rights Reserved.
-* 
-* Contributor(s):
-* 
-* Alternatively, the contents of this file may be used under the
-* terms of the GNU General Public License Version 2 or later (the
-* "GPL"), in which case the provisions of the GPL are applicable 
-* instead of those above.  If you wish to allow use of your 
-* version of this file only under the terms of the GPL and not to
-* allow others to use your version of this file under the MPL,
-* indicate your decision by deleting the provisions above and
-* replace them with the notice and other provisions required by
-* the GPL.  If you do not delete the provisions above, a recipient
-* may use your version of this file under either the MPL or the
-* GPL.
-*/
-
-/* We want position independent code */
-#define PIC
-
-#include <sys/asm.h>
-#include <sys/regdef.h>
-#include <sys/syscall.h>
-
-	.file 1 "os_ReliantUNIX.s"
-	.option pic2
-	.text
-
-	.align	2
-	.globl	getcxt
-	.ent	getcxt
-getcxt:
-	.frame	sp,0,$31		# vars= 0, regs= 0/0, args= 0, extra= 0
-	# saved integer regs
-	sw	ra,180(a0)	# gpregs[CXT_EPC]
-	sw	gp,152(a0)	# gpregs[CXT_GP]
-	sw	sp,156(a0)	# gpregs[CXT_SP]
-	sw	s8,160(a0)	# gpregs[CXT_S8]
-	sw	s0,104(a0)	# gpregs[CXT_S0]
-	sw	s1,108(a0)	# gpregs[CXT_S1]
-	sw	s2,112(a0)	# gpregs[CXT_S2]
-	sw	s3,116(a0)	# gpregs[CXT_S3]
-	sw	s4,120(a0)	# gpregs[CXT_S4]
-	sw	s5,124(a0)	# gpregs[CXT_S5]
-	sw	s6,128(a0)	# gpregs[CXT_S6]
-	sw	s7,132(a0)	# gpregs[CXT_S7]
-	# csr
-	cfc1	v0,$31
-	# saved float regs
-	s.d	$f20,264(a0)	# fpregs.fp_r.fp_dregs[10]
-	s.d	$f22,272(a0)	# fpregs.fp_r.fp_dregs[11]
-	s.d	$f24,280(a0)	# fpregs.fp_r.fp_dregs[12]
-	s.d	$f26,288(a0)	# fpregs.fp_r.fp_dregs[13]
-	s.d	$f28,296(a0)	# fpregs.fp_r.fp_dregs[14]
-	s.d	$f30,304(a0)	# fpregs.fp_r.fp_dregs[15]
-	sw	v0,312(a0)	# fpregs.fp_csr
-
-	# give no illusions about the contents
-	li	v0,0x0c		# UC_CPU | UC_MAU
-	sw	v0,0(a0)	# uc_flags
-
-	move	v0,zero
-	j	ra
-	.end	getcxt
-
-	.align	2
-	.globl	setcxt
-	.ent	setcxt
-setcxt:
-	.frame	sp,0,$31		# vars= 0, regs= 0/0, args= 0, extra= 0
-	lw	v0,312(a0)	# fpregs.fp_csr
-	li	v1,0xfffc0fff	# mask out exception cause bits
-	and	v0,v0,v1
-	# saved integer regs
-	lw	t9,180(a0)	# gpregs[CXT_EPC]
-	lw	ra,180(a0)	# gpregs[CXT_EPC]
-	lw	gp,152(a0)	# gpregs[CXT_GP]
-	lw	sp,156(a0)	# gpregs[CXT_SP]
-	ctc1	v0,$31		# fp_csr
-	lw	s8,160(a0)	# gpregs[CXT_S8]
-	lw	s0,104(a0)	# gpregs[CXT_S0]
-	lw	s1,108(a0)	# gpregs[CXT_S1]
-	lw	s2,112(a0)	# gpregs[CXT_S2]
-	lw	s3,116(a0)	# gpregs[CXT_S3]
-	lw	s4,120(a0)	# gpregs[CXT_S4]
-	lw	s5,124(a0)	# gpregs[CXT_S5]
-	lw	s6,128(a0)	# gpregs[CXT_S6]
-	lw	s7,132(a0)	# gpregs[CXT_S7]
-	# saved float regs
-	l.d	$f20,264(a0)	# fpregs.fp_r.fp_dregs[10]
-	l.d	$f22,272(a0)	# fpregs.fp_r.fp_dregs[11]
-	l.d	$f24,280(a0)	# fpregs.fp_r.fp_dregs[12]
-	l.d	$f26,288(a0)	# fpregs.fp_r.fp_dregs[13]
-	l.d	$f28,296(a0)	# fpregs.fp_r.fp_dregs[14]
-	l.d	$f30,304(a0)	# fpregs.fp_r.fp_dregs[15]
-
-	# load these, too
-	# they were not saved, but maybe the user modified them...
-	lw	v0,48(a0)
-	lw	v1,52(a0)
-	lw	a1,60(a0)
-	lw	a2,64(a0)
-	lw	a3,68(a0)
-	lw	a0,56(a0)	# there is no way back
-
-	j	ra
-
-	.end	setcxt
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s b/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s
deleted file mode 100644
index 4930686276..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_SunOS.s
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
-* The contents of this file are subject to the Mozilla Public
-* License Version 1.1 (the "License"); you may not use this file
-* except in compliance with the License. You may obtain a copy of
-* the License at http://www.mozilla.org/MPL/
-* 
-* Software distributed under the License is distributed on an "AS
-* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-* 
-* The Original Code is the Netscape Portable Runtime (NSPR).
-* 
-* The Initial Developer of the Original Code is Netscape
-* Communications Corporation.  Portions created by Netscape are 
-* Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-* Rights Reserved.
-* 
-* Contributor(s):
-* 
-* Alternatively, the contents of this file may be used under the
-* terms of the GNU General Public License Version 2 or later (the
-* "GPL"), in which case the provisions of the GPL are applicable 
-* instead of those above.  If you wish to allow use of your 
-* version of this file only under the terms of the GPL and not to
-* allow others to use your version of this file under the MPL,
-* indicate your decision by deleting the provisions above and
-* replace them with the notice and other provisions required by
-* the GPL.  If you do not delete the provisions above, a recipient
-* may use your version of this file under either the MPL or the
-* GPL.
-*/ 
-
-	.text
-
-/*
- * sol_getsp()
- *
- * Return the current sp (for debugging)
- */
-	.global sol_getsp
-sol_getsp:
-	retl
-   	mov     %sp, %o0
-
-
-/*
- * sol_curthread()
- *
- * Return a unique identifier for the currently active thread.
- */
-	.global sol_curthread
-sol_curthread:
-    retl
-    mov %g7, %o0
-                  
-
-	.global __MD_FlushRegisterWindows
-	.global _MD_FlushRegisterWindows
-
-__MD_FlushRegisterWindows:
-_MD_FlushRegisterWindows:
-
-	ta	3
-	ret
-	restore
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s b/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s
deleted file mode 100644
index a4bb3b7984..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s
+++ /dev/null
@@ -1,201 +0,0 @@
-! -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-! 
-! The contents of this file are subject to the Mozilla Public
-! License Version 1.1 (the "License"); you may not use this file
-! except in compliance with the License. You may obtain a copy of
-! the License at http://www.mozilla.org/MPL/
-! 
-! Software distributed under the License is distributed on an "AS
-! IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-! implied. See the License for the specific language governing
-! rights and limitations under the License.
-! 
-! The Original Code is the Netscape Portable Runtime (NSPR).
-! 
-! The Initial Developer of the Original Code is Netscape
-! Communications Corporation.  Portions created by Netscape are 
-! Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-! Rights Reserved.
-! 
-! Contributor(s):
-! 
-! Alternatively, the contents of this file may be used under the
-! terms of the GNU General Public License Version 2 or later (the
-! "GPL"), in which case the provisions of the GPL are applicable 
-! instead of those above.  If you wish to allow use of your 
-! version of this file only under the terms of the GPL and not to
-! allow others to use your version of this file under the MPL,
-! indicate your decision by deleting the provisions above and
-! replace them with the notice and other provisions required by
-! the GPL.  If you do not delete the provisions above, a recipient
-! may use your version of this file under either the MPL or the
-! GPL.
-! 
-
-!
-!  atomic increment, decrement and swap routines for V8+ sparc (ultrasparc)
-!  using CAS (compare-and-swap) atomic instructions
-!
-!  this MUST be compiled with an ultrasparc-aware assembler
-!
-!  standard asm linkage macros; this module must be compiled
-!  with the -P option (use C preprocessor)
-
-#include <sys/asm_linkage.h>
-
-!  ======================================================================
-!
-!  Perform the sequence a = a + 1 atomically with respect to other
-!  fetch-and-adds to location a in a wait-free fashion.
-!
-!  usage : val = PR_AtomicIncrement(address)
-!  return: current value (you'd think this would be old val)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [local]   - work register
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(_MD_AtomicIncrement)      ! standard assembler/ELF prologue
-
-retryAI:
-        ld      [%o0], %o2              ! set o2 to the current value
-        add     %o2, 0x1, %o3           ! calc the new value
-        mov     %o3, %o1                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAI                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o1, %o0                ! set the return code to the new value
-
-        SET_SIZE(_MD_AtomicIncrement)   ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = a - 1 atomically with respect to other
-!  fetch-and-decs to location a in a wait-free fashion.
-!
-!  usage : val = PR_AtomicDecrement(address)
-!  return: current value (you'd think this would be old val)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [local]   - work register
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(_MD_AtomicDecrement)      ! standard assembler/ELF prologue
-
-retryAD:
-        ld      [%o0], %o2              ! set o2 to the current value
-        sub     %o2, 0x1, %o3           ! calc the new value
-        mov     %o3, %o1                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAD                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o1, %o0                ! set the return code to the new value
-
-        SET_SIZE(_MD_AtomicDecrement)   ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = b atomically with respect to other
-!  fetch-and-stores to location a in a wait-free fashion.
-!
-!  usage : old_val = PR_AtomicSet(address, newval)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [input]   - the new value to set for [%o0]
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(_MD_AtomicSet)            ! standard assembler/ELF prologue
-
-retryAS:
-        ld      [%o0], %o2              ! set o2 to the current value
-        mov     %o1, %o3                ! set up the new value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAS                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o3, %o0                ! set the return code to the prev value
-
-        SET_SIZE(_MD_AtomicSet)         ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = a + b atomically with respect to other
-!  fetch-and-adds to location a in a wait-free fashion.
-!
-!  usage : newval = PR_AtomicAdd(address, val)
-!  return: the value after addition
-!
-        ENTRY(_MD_AtomicAdd)      ! standard assembler/ELF prologue
-
-retryAA:
-        ld      [%o0], %o2              ! set o2 to the current value
-        add     %o2, %o1, %o3           ! calc the new value
-        mov     %o3, %o4                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAA                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o4, %o0                ! set the return code to the new value
-
-        SET_SIZE(_MD_AtomicAdd)    		! standard assembler/ELF epilogue
-
-!
-!  end
-!
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s b/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
deleted file mode 100644
index 03776f5baf..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
+++ /dev/null
@@ -1,201 +0,0 @@
-! -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-! 
-! The contents of this file are subject to the Mozilla Public
-! License Version 1.1 (the "License"); you may not use this file
-! except in compliance with the License. You may obtain a copy of
-! the License at http://www.mozilla.org/MPL/
-! 
-! Software distributed under the License is distributed on an "AS
-! IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-! implied. See the License for the specific language governing
-! rights and limitations under the License.
-! 
-! The Original Code is the Netscape Portable Runtime (NSPR).
-! 
-! The Initial Developer of the Original Code is Netscape
-! Communications Corporation.  Portions created by Netscape are 
-! Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-! Rights Reserved.
-! 
-! Contributor(s):
-! 
-! Alternatively, the contents of this file may be used under the
-! terms of the GNU General Public License Version 2 or later (the
-! "GPL"), in which case the provisions of the GPL are applicable 
-! instead of those above.  If you wish to allow use of your 
-! version of this file only under the terms of the GPL and not to
-! allow others to use your version of this file under the MPL,
-! indicate your decision by deleting the provisions above and
-! replace them with the notice and other provisions required by
-! the GPL.  If you do not delete the provisions above, a recipient
-! may use your version of this file under either the MPL or the
-! GPL.
-! 
-
-!
-!  atomic increment, decrement and swap routines for V8+ sparc (ultrasparc)
-!  using CAS (compare-and-swap) atomic instructions
-!
-!  this MUST be compiled with an ultrasparc-aware assembler
-!
-!  standard asm linkage macros; this module must be compiled
-!  with the -P option (use C preprocessor)
-
-#include <sys/asm_linkage.h>
-
-!  ======================================================================
-!
-!  Perform the sequence a = a + 1 atomically with respect to other
-!  fetch-and-adds to location a in a wait-free fashion.
-!
-!  usage : val = PR_AtomicIncrement(address)
-!  return: current value (you'd think this would be old val)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [local]   - work register
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(PR_AtomicIncrement)       ! standard assembler/ELF prologue
-
-retryAI:
-        ld      [%o0], %o2              ! set o2 to the current value
-        add     %o2, 0x1, %o3           ! calc the new value
-        mov     %o3, %o1                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAI                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o1, %o0                ! set the return code to the new value
-
-        SET_SIZE(PR_AtomicIncrement)    ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = a - 1 atomically with respect to other
-!  fetch-and-decs to location a in a wait-free fashion.
-!
-!  usage : val = PR_AtomicDecrement(address)
-!  return: current value (you'd think this would be old val)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [local]   - work register
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(PR_AtomicDecrement)       ! standard assembler/ELF prologue
-
-retryAD:
-        ld      [%o0], %o2              ! set o2 to the current value
-        sub     %o2, 0x1, %o3           ! calc the new value
-        mov     %o3, %o1                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAD                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o1, %o0                ! set the return code to the new value
-
-        SET_SIZE(PR_AtomicDecrement)    ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = b atomically with respect to other
-!  fetch-and-stores to location a in a wait-free fashion.
-!
-!  usage : old_val = PR_AtomicSet(address, newval)
-!
-!  -----------------------
-!  Note on REGISTER USAGE:
-!  as this is a LEAF procedure, a new stack frame is not created;
-!  we use the caller's stack frame so what would normally be %i (input)
-!  registers are actually %o (output registers).  Also, we must not
-!  overwrite the contents of %l (local) registers as they are not
-!  assumed to be volatile during calls.
-!
-!  So, the registers used are:
-!     %o0  [input]   - the address of the value to increment
-!     %o1  [input]   - the new value to set for [%o0]
-!     %o2  [local]   - work register
-!     %o3  [local]   - work register
-!  -----------------------
-
-        ENTRY(PR_AtomicSet)             ! standard assembler/ELF prologue
-
-retryAS:
-        ld      [%o0], %o2              ! set o2 to the current value
-        mov     %o1, %o3                ! set up the new value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAS                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o3, %o0                ! set the return code to the prev value
-
-        SET_SIZE(PR_AtomicSet)          ! standard assembler/ELF epilogue
-
-!
-!  end
-!
-!  ======================================================================
-!
-
-!  ======================================================================
-!
-!  Perform the sequence a = a + b atomically with respect to other
-!  fetch-and-adds to location a in a wait-free fashion.
-!
-!  usage : newval = PR_AtomicAdd(address, val)
-!  return: the value after addition
-!
-        ENTRY(PR_AtomicAdd)       ! standard assembler/ELF prologue
-
-retryAA:
-        ld      [%o0], %o2              ! set o2 to the current value
-        add     %o2, %o1, %o3           ! calc the new value
-        mov     %o3, %o4                ! save the return value
-        cas     [%o0], %o2, %o3         ! atomically set if o0 hasn't changed
-        cmp     %o2, %o3                ! see if we set the value
-        bne     retryAA                 ! if not, try again
-        nop                             ! empty out the branch pipeline
-        retl                            ! return back to the caller
-        mov     %o4, %o0                ! set the return code to the new value
-
-        SET_SIZE(PR_AtomicAdd)    		! standard assembler/ELF epilogue
-
-!
-!  end
-!
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s b/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s
deleted file mode 100644
index 6e94a732da..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86.s
+++ /dev/null
@@ -1,154 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-// 
-
-	.text
-
-	.globl	getedi
-getedi:
-	movl	%edi,%eax
-	ret
-	.type	getedi,@function
-	.size	getedi,.-getedi
- 
-	.globl	setedi
-setedi:
-	movl	4(%esp),%edi
-	ret
-	.type	setedi,@function
-	.size	setedi,.-setedi
-
-	.globl	__MD_FlushRegisterWindows
-	.globl _MD_FlushRegisterWindows
-
-__MD_FlushRegisterWindows:
-_MD_FlushRegisterWindows:
-
-	ret
-
-//
-// sol_getsp()
-//
-// Return the current sp (for debugging)
-//
-	.globl sol_getsp
-sol_getsp:
-	movl	%esp, %eax
-	ret
-
-//
-// sol_curthread()
-//
-// Return a unique identifier for the currently active thread.
-//
-	.globl sol_curthread
-sol_curthread:
-	movl	%ecx, %eax
-	ret
-
-// PRInt32 _MD_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-    .text
-    .globl _MD_AtomicIncrement
-    .align 4
-_MD_AtomicIncrement:
-    movl 4(%esp), %ecx
-    movl $1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    incl %eax
-    ret
-
-// PRInt32 _MD_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-    .text
-    .globl _MD_AtomicDecrement
-    .align 4
-_MD_AtomicDecrement:
-    movl 4(%esp), %ecx
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%ecx)
-    decl %eax
-    ret
-
-// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-// An alternative implementation:
-//   .text
-//   .globl _MD_AtomicSet
-//   .align 4
-//_MD_AtomicSet:
-//   movl 4(%esp), %ecx
-//   movl 8(%esp), %edx
-//   movl (%ecx), %eax
-//retry:
-//   lock
-//   cmpxchgl %edx, (%ecx)
-//   jne retry
-//   ret
-//
-    .text
-    .globl _MD_AtomicSet
-    .align 4
-_MD_AtomicSet:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    xchgl %eax, (%ecx)
-    ret
-
-// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-    .text
-    .globl _MD_AtomicAdd
-    .align 4
-_MD_AtomicAdd:
-    movl 4(%esp), %ecx
-    movl 8(%esp), %eax
-    movl %eax, %edx
-    lock
-    xaddl %eax, (%ecx)
-    addl %edx, %eax
-    ret
diff --git a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s b/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
deleted file mode 100644
index 6d30bc505e..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// 
-// The contents of this file are subject to the Mozilla Public
-// License Version 1.1 (the "License"); you may not use this file
-// except in compliance with the License. You may obtain a copy of
-// the License at http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
-// 
-// The Original Code is the Netscape Portable Runtime (NSPR).
-// 
-// The Initial Developer of the Original Code is Netscape
-// Communications Corporation.  Portions created by Netscape are 
-// Copyright (C) 2004 Netscape Communications Corporation.  All
-// Rights Reserved.
-// 
-// Contributor(s):
-// 
-// Alternatively, the contents of this file may be used under the
-// terms of the GNU General Public License Version 2 or later (the
-// "GPL"), in which case the provisions of the GPL are applicable 
-// instead of those above.  If you wish to allow use of your 
-// version of this file only under the terms of the GPL and not to
-// allow others to use your version of this file under the MPL,
-// indicate your decision by deleting the provisions above and
-// replace them with the notice and other provisions required by
-// the GPL.  If you do not delete the provisions above, a recipient
-// may use your version of this file under either the MPL or the
-// GPL.
-// 
-
-// PRInt32 _MD_AtomicIncrement(PRInt32 *val)
-//
-// Atomically increment the integer pointed to by 'val' and return
-// the result of the increment.
-//
-    .text
-    .globl _MD_AtomicIncrement
-    .align 4
-_MD_AtomicIncrement:
-    movl $1, %eax
-    lock
-    xaddl %eax, (%rdi)
-    incl %eax
-    ret
-
-// PRInt32 _MD_AtomicDecrement(PRInt32 *val)
-//
-// Atomically decrement the integer pointed to by 'val' and return
-// the result of the decrement.
-//
-    .text
-    .globl _MD_AtomicDecrement
-    .align 4
-_MD_AtomicDecrement:
-    movl $-1, %eax
-    lock
-    xaddl %eax, (%rdi)
-    decl %eax
-    ret
-
-// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-//
-// Atomically set the integer pointed to by 'val' to the new
-// value 'newval' and return the old value.
-//
-    .text
-    .globl _MD_AtomicSet
-    .align 4
-_MD_AtomicSet:
-    movl %esi, %eax
-    xchgl %eax, (%rdi)
-    ret
-
-// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-//
-// Atomically add 'val' to the integer pointed to by 'ptr'
-// and return the result of the addition.
-//
-    .text
-    .globl _MD_AtomicAdd
-    .align 4
-_MD_AtomicAdd:
-    movl %esi, %eax
-    lock
-    xaddl %eax, (%rdi)
-    addl %esi, %eax
-    ret
diff --git a/libs/js/nsprpub/pr/src/md/unix/osf1.c b/libs/js/nsprpub/pr/src/md/unix/osf1.c
deleted file mode 100644
index a4cd6a5123..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/osf1.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for OSF1 */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for OSF1.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c b/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c
deleted file mode 100644
index 21e5f0b8b9..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/pthreads_user.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <pthread.h>
-
-
-sigset_t ints_off;
-pthread_mutex_t	_pr_heapLock;
-pthread_key_t current_thread_key;
-pthread_key_t current_cpu_key;
-pthread_key_t last_thread_key;
-pthread_key_t intsoff_key;
-
-
-PRInt32 _pr_md_pthreads_created, _pr_md_pthreads_failed;
-PRInt32 _pr_md_pthreads = 1;
-
-void _MD_EarlyInit(void)
-{
-extern PRInt32 _nspr_noclock;
-
-	if (pthread_key_create(&current_thread_key, NULL) != 0) {
-		perror("pthread_key_create failed");
-		exit(1);
-	}
-	if (pthread_key_create(&current_cpu_key, NULL) != 0) {
-		perror("pthread_key_create failed");
-		exit(1);
-	}
-	if (pthread_key_create(&last_thread_key, NULL) != 0) {
-		perror("pthread_key_create failed");
-		exit(1);
-	}
-	if (pthread_key_create(&intsoff_key, NULL) != 0) {
-		perror("pthread_key_create failed");
-		exit(1);
-	}
-
-	sigemptyset(&ints_off);
-	sigaddset(&ints_off, SIGALRM);
-	sigaddset(&ints_off, SIGIO);
-	sigaddset(&ints_off, SIGCLD);
-
-	/*
-	 * disable clock interrupts
-	 */
-	_nspr_noclock = 1;
-
-}
-
-void _MD_InitLocks()
-{
-	if (pthread_mutex_init(&_pr_heapLock, NULL) != 0) {
-		perror("pthread_mutex_init failed");
-		exit(1);
-	}
-}
-
-PR_IMPLEMENT(void) _MD_FREE_LOCK(struct _MDLock *lockp)
-{
-	PRIntn _is;
-	PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(_is); 
-	pthread_mutex_destroy(&lockp->mutex);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(_is);
-}
-
-
-
-PR_IMPLEMENT(PRStatus) _MD_NEW_LOCK(struct _MDLock *lockp)
-{
-    PRStatus rv;
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();	
-
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(is);
-	rv = pthread_mutex_init(&lockp->mutex, NULL);
-	if (me && !_PR_IS_NATIVE_THREAD(me))
-		_PR_FAST_INTSON(is);
-	return (rv == 0) ? PR_SUCCESS : PR_FAILURE;
-}
-
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-PR_IMPLEMENT(void)
-_MD_SetPriority(_MDThread *thread, PRThreadPriority newPri)
-{
-	/*
-	 * XXX - to be implemented
-	 */
-    return;
-}
-
-PR_IMPLEMENT(PRStatus) _MD_InitThread(struct PRThread *thread)
-{
-    struct sigaction sigact;
-
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        thread->md.pthread = pthread_self();
-#if 0
-		/*
-		 * set up SIGUSR1 handler; this is used to save state
-		 * during PR_SuspendAll
-		 */
-		sigact.sa_handler = save_context_and_block;
-		sigact.sa_flags = SA_RESTART;
-		/*
-		 * Must mask clock interrupts
-		 */
-		sigact.sa_mask = timer_set;
-		sigaction(SIGUSR1, &sigact, 0);
-#endif
-    }
-
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(void) _MD_ExitThread(struct PRThread *thread)
-{
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        _MD_CLEAN_THREAD(thread);
-        _MD_SET_CURRENT_THREAD(NULL);
-    }
-}
-
-PR_IMPLEMENT(void) _MD_CleanThread(struct PRThread *thread)
-{
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-		pthread_mutex_destroy(&thread->md.pthread_mutex);
-		pthread_cond_destroy(&thread->md.pthread_cond);
-    }
-}
-
-PR_IMPLEMENT(void) _MD_SuspendThread(struct PRThread *thread)
-{
-    PRInt32 rv;
-
-    PR_ASSERT((thread->flags & _PR_GLOBAL_SCOPE) &&
-        _PR_IS_GCABLE_THREAD(thread));
-#if 0
-	thread->md.suspending_id = getpid();
-	rv = kill(thread->md.id, SIGUSR1);
-	PR_ASSERT(rv == 0);
-	/*
-	 * now, block the current thread/cpu until woken up by the suspended
-	 * thread from it's SIGUSR1 signal handler
-	 */
-	blockproc(getpid());
-#endif
-}
-
-PR_IMPLEMENT(void) _MD_ResumeThread(struct PRThread *thread)
-{
-    PRInt32 rv;
-
-    PR_ASSERT((thread->flags & _PR_GLOBAL_SCOPE) &&
-        _PR_IS_GCABLE_THREAD(thread));
-#if 0
-    rv = unblockproc(thread->md.id);
-#endif
-}
-
-PR_IMPLEMENT(void) _MD_SuspendCPU(struct _PRCPU *thread)
-{
-    PRInt32 rv;
-
-#if 0
-	cpu->md.suspending_id = getpid();
-	rv = kill(cpu->md.id, SIGUSR1);
-	PR_ASSERT(rv == 0);
-	/*
-	 * now, block the current thread/cpu until woken up by the suspended
-	 * thread from it's SIGUSR1 signal handler
-	 */
-	blockproc(getpid());
-#endif
-}
-
-PR_IMPLEMENT(void) _MD_ResumeCPU(struct _PRCPU *thread)
-{
-#if 0
-	unblockproc(cpu->md.id);
-#endif
-}
-
-
-#define PT_NANOPERMICRO 1000UL
-#define PT_BILLION 1000000000UL
-
-PR_IMPLEMENT(PRStatus)
-_pt_wait(PRThread *thread, PRIntervalTime timeout)
-{
-int rv;
-struct timeval now;
-struct timespec tmo;
-PRUint32 ticks = PR_TicksPerSecond();
-
-
-	if (timeout != PR_INTERVAL_NO_TIMEOUT) {
-		tmo.tv_sec = timeout / ticks;
-		tmo.tv_nsec = timeout - (tmo.tv_sec * ticks);
-		tmo.tv_nsec = PR_IntervalToMicroseconds(PT_NANOPERMICRO *
-											tmo.tv_nsec);
-
-		/* pthreads wants this in absolute time, off we go ... */
-		(void)GETTIMEOFDAY(&now);
-		/* that one's usecs, this one's nsecs - grrrr! */
-		tmo.tv_sec += now.tv_sec;
-		tmo.tv_nsec += (PT_NANOPERMICRO * now.tv_usec);
-		tmo.tv_sec += tmo.tv_nsec / PT_BILLION;
-		tmo.tv_nsec %= PT_BILLION;
-	}
-
-	pthread_mutex_lock(&thread->md.pthread_mutex);
-	thread->md.wait--;
-	if (thread->md.wait < 0) {
-		if (timeout != PR_INTERVAL_NO_TIMEOUT) {
-			rv = pthread_cond_timedwait(&thread->md.pthread_cond,
-					&thread->md.pthread_mutex, &tmo);
-        }
-		else
-			rv = pthread_cond_wait(&thread->md.pthread_cond,
-					&thread->md.pthread_mutex);
-		if (rv != 0) {
-			thread->md.wait++;
-		}
-	} else
-		rv = 0;
-	pthread_mutex_unlock(&thread->md.pthread_mutex);
-
-	return (rv == 0) ? PR_SUCCESS : PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_wait(PRThread *thread, PRIntervalTime ticks)
-{
-    if ( thread->flags & _PR_GLOBAL_SCOPE ) {
-		_MD_CHECK_FOR_EXIT();
-        if (_pt_wait(thread, ticks) == PR_FAILURE) {
-	    	_MD_CHECK_FOR_EXIT();
-            /*
-             * wait timed out
-             */
-            _PR_THREAD_LOCK(thread);
-            if (thread->wait.cvar) {
-                /*
-                 * The thread will remove itself from the waitQ
-                 * of the cvar in _PR_WaitCondVar
-                 */
-                thread->wait.cvar = NULL;
-                thread->state =  _PR_RUNNING;
-                _PR_THREAD_UNLOCK(thread);
-            }  else {
-        		_pt_wait(thread, PR_INTERVAL_NO_TIMEOUT);
-                _PR_THREAD_UNLOCK(thread);
-            }
-        }
-    } else {
-		_PR_MD_SWITCH_CONTEXT(thread);
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_WakeupWaiter(PRThread *thread)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 pid, rv;
-    PRIntn is;
-
-	PR_ASSERT(_pr_md_idle_cpus >= 0);
-    if (thread == NULL) {
-		if (_pr_md_idle_cpus)
-        	_MD_Wakeup_CPUs();
-    } else if (!_PR_IS_NATIVE_THREAD(thread)) {
-		/*
-		 * If the thread is on my cpu's runq there is no need to
-		 * wakeup any cpus
-		 */
-		if (!_PR_IS_NATIVE_THREAD(me)) {
-			if (me->cpu != thread->cpu) {
-				if (_pr_md_idle_cpus)
-        			_MD_Wakeup_CPUs();
-			}
-		} else {
-			if (_pr_md_idle_cpus)
-        		_MD_Wakeup_CPUs();
-		}
-    } else {
-		PR_ASSERT(_PR_IS_NATIVE_THREAD(thread));
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_INTSOFF(is);
-
-		pthread_mutex_lock(&thread->md.pthread_mutex);
-		thread->md.wait++;
-		rv = pthread_cond_signal(&thread->md.pthread_cond);
-		PR_ASSERT(rv == 0);
-		pthread_mutex_unlock(&thread->md.pthread_mutex);
-
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-    } 
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for AIX */
-PR_IMPLEMENT(void)
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for AIX.");
-}
-
-PR_IMPLEMENT(PRStatus)
-_MD_CreateThread(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PRIntn is;
-    int rv;
-	PRThread *me = _PR_MD_CURRENT_THREAD();	
-	pthread_attr_t attr;
-
-	if (!_PR_IS_NATIVE_THREAD(me))
-		_PR_INTSOFF(is);
-
-	if (pthread_mutex_init(&thread->md.pthread_mutex, NULL) != 0) {
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return PR_FAILURE;
-	}
-
-	if (pthread_cond_init(&thread->md.pthread_cond, NULL) != 0) {
-		pthread_mutex_destroy(&thread->md.pthread_mutex);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return PR_FAILURE;
-	}
-    thread->flags |= _PR_GLOBAL_SCOPE;
-
-	pthread_attr_init(&attr); /* initialize attr with default attributes */
-	if (pthread_attr_setstacksize(&attr, (size_t) stackSize) != 0) {
-		pthread_mutex_destroy(&thread->md.pthread_mutex);
-		pthread_cond_destroy(&thread->md.pthread_cond);
-		pthread_attr_destroy(&attr);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return PR_FAILURE;
-	}
-
-	thread->md.wait = 0;
-    rv = pthread_create(&thread->md.pthread, &attr, start, (void *)thread);
-    if (0 == rv) {
-        _MD_ATOMIC_INCREMENT(&_pr_md_pthreads_created);
-        _MD_ATOMIC_INCREMENT(&_pr_md_pthreads);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        return PR_SUCCESS;
-    } else {
-		pthread_mutex_destroy(&thread->md.pthread_mutex);
-		pthread_cond_destroy(&thread->md.pthread_cond);
-		pthread_attr_destroy(&attr);
-        _MD_ATOMIC_INCREMENT(&_pr_md_pthreads_failed);
-		if (!_PR_IS_NATIVE_THREAD(me))
-			_PR_FAST_INTSON(is);
-        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, rv);
-        return PR_FAILURE;
-    }
-}
-
-PR_IMPLEMENT(void)
-_MD_InitRunningCPU(struct _PRCPU *cpu)
-{
-    extern int _pr_md_pipefd[2];
-
-    _MD_unix_init_running_cpu(cpu);
-    cpu->md.pthread = pthread_self();
-	if (_pr_md_pipefd[0] >= 0) {
-    	_PR_IOQ_MAX_OSFD(cpu) = _pr_md_pipefd[0];
-#ifndef _PR_USE_POLL
-    	FD_SET(_pr_md_pipefd[0], &_PR_FD_READ_SET(cpu));
-#endif
-	}
-}
-
-
-void
-_MD_CleanupBeforeExit(void)
-{
-#if 0
-    extern PRInt32    _pr_cpus_exit;
-
-	_pr_irix_exit_now = 1;
-    if (_pr_numCPU > 1) {
-        /*
-         * Set a global flag, and wakeup all cpus which will notice the flag
-         * and exit.
-         */
-        _pr_cpus_exit = getpid();
-        _MD_Wakeup_CPUs();
-        while(_pr_numCPU > 1) {
-            _PR_WAIT_SEM(_pr_irix_exit_sem);
-            _pr_numCPU--;
-        }
-    }
-    /*
-     * cause global threads on the recycle list to exit
-     */
-     _PR_DEADQ_LOCK;
-     if (_PR_NUM_DEADNATIVE != 0) {
-	PRThread *thread;
-    	PRCList *ptr;
-
-        ptr = _PR_DEADNATIVEQ.next;
-        while( ptr != &_PR_DEADNATIVEQ ) {
-        	thread = _PR_THREAD_PTR(ptr);
-		_MD_CVAR_POST_SEM(thread);
-                ptr = ptr->next;
-        } 
-     }
-     _PR_DEADQ_UNLOCK;
-     while(_PR_NUM_DEADNATIVE > 1) {
-	_PR_WAIT_SEM(_pr_irix_exit_sem);
-	_PR_DEC_DEADNATIVE;
-     }
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/qnx.c b/libs/js/nsprpub/pr/src/md/unix/qnx.c
deleted file mode 100644
index be86e5b9c2..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/qnx.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <setjmp.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Unixware */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Unixware.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRUintn priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Unixware.");
-    return PR_FAILURE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/reliantunix.c b/libs/js/nsprpub/pr/src/md/unix/reliantunix.c
deleted file mode 100644
index efe21086a7..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/reliantunix.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * SINIX (ReliantUNIX) 5.4 - copied from unixware.c by chrisk 040497
- */
-#include "primpl.h"
-
-#include <ucontext.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) _GETCONTEXT(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-#ifdef ALARMS_BREAK_TCP /* I don't think they do */
-
-PRInt32 _MD_connect(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _connect(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-}
-
-PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _accept(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-    return(rv);
-}
-#endif
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for SINIX */
-/* Why? Just copied it from UNIXWARE... flying-by-night, chrisk 040497 */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for SINIX.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRUintn priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for SINIX.");
-#if defined(SNI) && !defined(__GNUC__)
-    /* make compiler happy */
-    return (PRStatus)NULL;
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/rhapsody.c b/libs/js/nsprpub/pr/src/md/unix/rhapsody.c
deleted file mode 100644
index 5df3c199a4..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/rhapsody.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#if !defined(_PR_PTHREADS)
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#if !defined(_PR_PTHREADS)
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Rhapsody */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Rhapsody.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Rhapsody.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
-
-#if defined(_PR_PTHREADS)
-
-/*
-** Stubs for unimplemented functions
-*/
-
-int pthread_condattr_init(pthread_condattr_t *attr)
-{
-    return 0;
-}
-
-int pthread_kill(pthread_t thread, int sig)
-{
-    return ENOSYS;
-}
-
-typedef struct siginfo_t siginfo_t;
-
-int sigtimedwait(const sigset_t *set, siginfo_t *info,
-    const struct timespec *timeout)
-{
-    errno = ENOSYS;
-    return -1;
-}
-
-#endif /* _PR_PTHREADS */
-
-/* rhapsody.c */
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/riscos.c b/libs/js/nsprpub/pr/src/md/unix/riscos.c
deleted file mode 100644
index eee94d3d2e..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/riscos.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Peter Naulls <peter@chocky.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifdef _PR_PTHREADS
-
-void _MD_CleanupBeforeExit(void)
-{
-}
-
-#else /* ! _PR_PTHREADS */
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	/*
-	 * set the pointers to the stack-pointer and frame-pointer words in the
-	 * context structure; this is for debugging use.
-	 */
-	thread->md.sp = _MD_GET_SP_PTR(thread);
-	thread->md.fp = _MD_GET_FP_PTR(thread);
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for RISC OS */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for RISC OS.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for RISC OS.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/scoos.c b/libs/js/nsprpub/pr/src/md/unix/scoos.c
deleted file mode 100644
index 766bf91703..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/scoos.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * SCO ODT 5.0 - originally created by mikep
- */
-#include "primpl.h"
-
-#include <setjmp.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-#ifdef ALARMS_BREAK_TCP /* I don't think they do */
-
-PRInt32 _MD_connect(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _connect(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-}
-
-PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _accept(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-    return(rv);
-}
-#endif
-
-/*
- * These are also implemented in pratom.c using NSPR locks.  Any reason
- * this might be better or worse?  If you like this better, define
- * _PR_HAVE_ATOMIC_OPS in include/md/unixware.h
- */
-#ifdef _PR_HAVE_ATOMIC_OPS
-/* Atomic operations */
-#include  <stdio.h>
-static FILE *_uw_semf;
-
-void
-_MD_INIT_ATOMIC(void)
-{
-    /* Sigh.  Sure wish SYSV semaphores weren't such a pain to use */
-    if ((_uw_semf = tmpfile()) == NULL)
-        PR_ASSERT(0);
-
-    return;
-}
-
-void
-_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)++;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    flockfile(_uw_semf);
-    (*ptr) += val;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)--;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    flockfile(_uw_semf);
-    *val = newval;
-    unflockfile(_uw_semf);
-}
-#endif
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for SCO */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for SCO.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for SCO.");
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/solaris.c b/libs/js/nsprpub/pr/src/md/unix/solaris.c
deleted file mode 100644
index 2ec3bd1ebd..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/solaris.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-
-extern PRBool suspendAllOn;
-extern PRThread *suspendAllThread;
-
-extern void _MD_SET_PRIORITY(_MDThread *md, PRThreadPriority newPri);
-
-PRIntervalTime _MD_Solaris_TicksPerSecond(void)
-{
-    /*
-     * Ticks have a 10-microsecond resolution.  So there are
-     * 100000 ticks per second.
-     */
-    return 100000UL;
-}
-
-/* Interval timers, implemented using gethrtime() */
-
-PRIntervalTime _MD_Solaris_GetInterval(void)
-{
-    union {
-	hrtime_t hrt;  /* hrtime_t is a 64-bit (long long) integer */
-	PRInt64 pr64;
-    } time;
-    PRInt64 resolution;
-    PRIntervalTime ticks;
-
-    time.hrt = gethrtime();  /* in nanoseconds */
-    /*
-     * Convert from nanoseconds to ticks.  A tick's resolution is
-     * 10 microseconds, or 10000 nanoseconds.
-     */
-    LL_I2L(resolution, 10000);
-    LL_DIV(time.pr64, time.pr64, resolution);
-    LL_L2UI(ticks, time.pr64);
-    return ticks;
-}
-
-#ifdef _PR_PTHREADS
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, PRIntn isCurrent, PRIntn *np)
-{
-	*np = 0;
-	return NULL;
-}
-#endif /* _PR_PTHREADS */
-
-#if !defined(i386) && !defined(IS_64)
-#if defined(_PR_HAVE_ATOMIC_OPS)
-/* NOTE:
- * SPARC v9 (Ultras) do have an atomic test-and-set operation.  But
- * SPARC v8 doesn't.  We should detect in the init if we are running on
- * v8 or v9, and then use assembly where we can.
- *
- * This code uses the Solaris threads API.  It can be used in both the
- * pthreads and Solaris threads versions of nspr20 because "POSIX threads
- * and Solaris threads are fully compatible even within the same process",
- * to quote from pthread_create(3T).
- */
-
-#include <thread.h>
-#include <synch.h>
-
-static mutex_t _solaris_atomic = DEFAULTMUTEX;
-
-PRInt32
-_MD_AtomicIncrement(PRInt32 *val)
-{
-    PRInt32 rv;
-    if (mutex_lock(&_solaris_atomic) != 0)
-        PR_ASSERT(0);
-
-    rv = ++(*val);
-
-    if (mutex_unlock(&_solaris_atomic) != 0)\
-        PR_ASSERT(0);
-
-	return rv;
-}
-
-PRInt32
-_MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-{
-    PRInt32 rv;
-    if (mutex_lock(&_solaris_atomic) != 0)
-        PR_ASSERT(0);
-
-    rv = ((*ptr) += val);
-
-    if (mutex_unlock(&_solaris_atomic) != 0)\
-        PR_ASSERT(0);
-
-	return rv;
-}
-
-PRInt32
-_MD_AtomicDecrement(PRInt32 *val)
-{
-    PRInt32 rv;
-    if (mutex_lock(&_solaris_atomic) != 0)
-        PR_ASSERT(0);
-
-    rv = --(*val);
-
-    if (mutex_unlock(&_solaris_atomic) != 0)\
-        PR_ASSERT(0);
-
-	return rv;
-}
-
-PRInt32
-_MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-{
-    PRInt32 rv;
-    if (mutex_lock(&_solaris_atomic) != 0)
-        PR_ASSERT(0);
-
-    rv = *val;
-    *val = newval;
-
-    if (mutex_unlock(&_solaris_atomic) != 0)\
-        PR_ASSERT(0);
-
-	return rv;
-}
-#endif  /* _PR_HAVE_ATOMIC_OPS */
-#endif  /* !defined(i386) */
-
-#if defined(_PR_GLOBAL_THREADS_ONLY)
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <thread.h>
-
-#include <sys/lwp.h>
-#include <sys/procfs.h>
-#include <sys/syscall.h>
-extern int syscall();  /* not declared in sys/syscall.h */
-
-static sigset_t old_mask;	/* store away original gc thread sigmask */
-static PRIntn gcprio;		/* store away original gc thread priority */
-
-THREAD_KEY_T threadid_key;
-THREAD_KEY_T cpuid_key;
-THREAD_KEY_T last_thread_key;
-static sigset_t set, oldset;
-
-static void
-threadid_key_destructor(void *value)
-{
-    PRThread *me = (PRThread *)value;
-    PR_ASSERT(me != NULL);
-    /* the thread could be PRIMORDIAL (thus not ATTACHED) */
-    if (me->flags & _PR_ATTACHED) {
-        /*
-         * The Solaris thread library sets the thread specific
-         * data (the current thread) to NULL before invoking
-         * the destructor.  We need to restore it to prevent the
-         * _PR_MD_CURRENT_THREAD() call in _PRI_DetachThread()
-         * from attaching the thread again.
-         */
-        _PR_MD_SET_CURRENT_THREAD(me);
-        _PRI_DetachThread();
-    }
-}
-
-void _MD_EarlyInit(void)
-{
-    THR_KEYCREATE(&threadid_key, threadid_key_destructor);
-    THR_KEYCREATE(&cpuid_key, NULL);
-    THR_KEYCREATE(&last_thread_key, NULL);
-    sigemptyset(&set);
-    sigaddset(&set, SIGALRM);
-}
-
-PRStatus _MD_CreateThread(PRThread *thread, 
-					void (*start)(void *), 
-					PRThreadPriority priority,
-					PRThreadScope scope, 
-					PRThreadState state, 
-					PRUint32 stackSize) 
-{
-	PRInt32 flags;
-	
-    /* mask out SIGALRM for native thread creation */
-    thr_sigsetmask(SIG_BLOCK, &set, &oldset); 
-
-    /*
-     * Note that we create joinable threads with the THR_DETACHED
-     * flag.  The reasons why we don't use thr_join to implement
-     * PR_JoinThread are:
-     * - We use a termination condition variable in the PRThread
-     *   structure to implement PR_JoinThread across all classic
-     *   nspr implementation strategies.
-     * - The native threads may be recycled by NSPR to run other
-     *   new NSPR threads, so the native threads may not terminate
-     *   when the corresponding NSPR threads terminate.  
-     */
-    flags = THR_SUSPENDED|THR_DETACHED;
-    if (_PR_IS_GCABLE_THREAD(thread) || (thread->flags & _PR_BOUND_THREAD) ||
-    							(scope == PR_GLOBAL_BOUND_THREAD))
-		flags |= THR_BOUND;
-
-    if (thr_create(NULL, thread->stack->stackSize,
-                  (void *(*)(void *)) start, (void *) thread, 
-				  flags,
-                  &thread->md.handle)) {
-        thr_sigsetmask(SIG_SETMASK, &oldset, NULL); 
-        return PR_FAILURE;
-    }
-
-    /* When the thread starts running, then the lwpid is set to the right
-     * value. Until then we want to mark this as 'uninit' so that
-     * its register state is initialized properly for GC */
-
-    thread->md.lwpid = -1;
-    thr_sigsetmask(SIG_SETMASK, &oldset, NULL); 
-    _MD_NEW_SEM(&thread->md.waiter_sem, 0);
-
-    if ((scope == PR_GLOBAL_THREAD) || (scope == PR_GLOBAL_BOUND_THREAD)) {
-		thread->flags |= _PR_GLOBAL_SCOPE;
-    }
-
-    _MD_SET_PRIORITY(&(thread->md), priority);
-
-    /* Activate the thread */
-    if (thr_continue( thread->md.handle ) ) {
-	return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-void _MD_cleanup_thread(PRThread *thread)
-{
-    thread_t hdl;
-
-    hdl = thread->md.handle;
-
-    /* 
-    ** First, suspend the thread (unless it's the active one)
-    ** Because we suspend it first, we don't have to use LOCK_SCHEDULER to
-    ** prevent both of us modifying the thread structure at the same time.
-    */
-    if ( thread != _PR_MD_CURRENT_THREAD() ) {
-        thr_suspend(hdl);
-    }
-    PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-            ("(0X%x)[DestroyThread]\n", thread));
-
-    _MD_DESTROY_SEM(&thread->md.waiter_sem);
-}
-
-void _MD_exit_thread(PRThread *thread)
-{
-    _MD_CLEAN_THREAD(thread);
-    _MD_SET_CURRENT_THREAD(NULL);
-}
-
-void _MD_SET_PRIORITY(_MDThread *md_thread,
-        PRThreadPriority newPri)
-{
-	PRIntn nativePri;
-
-	if (newPri < PR_PRIORITY_FIRST) {
-		newPri = PR_PRIORITY_FIRST;
-	} else if (newPri > PR_PRIORITY_LAST) {
-		newPri = PR_PRIORITY_LAST;
-	}
-	/* Solaris priorities are from 0 to 127 */
-	nativePri = newPri * 127 / PR_PRIORITY_LAST;
-	if(thr_setprio((thread_t)md_thread->handle, nativePri)) {
-		PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-		   ("_PR_SetThreadPriority: can't set thread priority\n"));
-	}
-}
-
-void _MD_WAIT_CV(
-    struct _MDCVar *md_cv, struct _MDLock *md_lock, PRIntervalTime timeout)
-{
-    struct timespec tt;
-    PRUint32 msec;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	PR_ASSERT((!suspendAllOn) || (suspendAllThread != me));
-
-    if (PR_INTERVAL_NO_TIMEOUT == timeout) {
-        COND_WAIT(&md_cv->cv, &md_lock->lock);
-    } else {
-        msec = PR_IntervalToMilliseconds(timeout);
-
-        GETTIME(&tt);
-        tt.tv_sec += msec / PR_MSEC_PER_SEC;
-        tt.tv_nsec += (msec % PR_MSEC_PER_SEC) * PR_NSEC_PER_MSEC;
-        /* Check for nsec overflow - otherwise we'll get an EINVAL */
-        if (tt.tv_nsec >= PR_NSEC_PER_SEC) {
-            tt.tv_sec++;
-            tt.tv_nsec -= PR_NSEC_PER_SEC;
-        }
-        COND_TIMEDWAIT(&md_cv->cv, &md_lock->lock, &tt);
-    }
-}
-
-void _MD_lock(struct _MDLock *md_lock)
-{
-#ifdef DEBUG
-    /* This code was used for GC testing to make sure that we didn't attempt
-     * to grab any locks while threads are suspended.
-     */
-    PRLock *lock;
-    
-    if ((suspendAllOn) && (suspendAllThread == _PR_MD_CURRENT_THREAD())) {
-        lock = ((PRLock *) ((char*) (md_lock) - offsetof(PRLock,ilock)));
-	PR_ASSERT(lock->owner == NULL);
-        return;
-    }
-#endif /* DEBUG */
-
-    mutex_lock(&md_lock->lock);
-}
-
-PRThread *_pr_attached_thread_tls()
-{
-    PRThread *ret;
-
-    thr_getspecific(threadid_key, (void **)&ret);
-    return ret;
-}
-
-PRThread *_pr_current_thread_tls()
-{
-    PRThread *thread;
-
-    thread = _MD_GET_ATTACHED_THREAD();
-
-    if (NULL == thread) {
-        thread = _PRI_AttachThread(
-            PR_USER_THREAD, PR_PRIORITY_NORMAL, NULL, 0);
-    }
-    PR_ASSERT(thread != NULL);
-
-    return thread;
-}
-
-PRStatus
-_MD_wait(PRThread *thread, PRIntervalTime ticks)
-{
-        _MD_WAIT_SEM(&thread->md.waiter_sem);
-        return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WakeupWaiter(PRThread *thread)
-{
-	if (thread == NULL) {
-		return PR_SUCCESS;
-	}
-	_MD_POST_SEM(&thread->md.waiter_sem);
-	return PR_SUCCESS;
-}
-
-_PRCPU *_pr_current_cpu_tls()
-{
-    _PRCPU *ret;
-
-    thr_getspecific(cpuid_key, (void **)&ret);
-    return ret;
-}
-
-PRThread *_pr_last_thread_tls()
-{
-    PRThread *ret;
-
-    thr_getspecific(last_thread_key, (void **)&ret);
-    return ret;
-}
-
-_MDLock _pr_ioq_lock;
-
-void
-_MD_InitIO(void)
-{
-    _MD_NEW_LOCK(&_pr_ioq_lock);
-}
-
-PRStatus _MD_InitializeThread(PRThread *thread)
-{
-    if (!_PR_IS_NATIVE_THREAD(thread))
-        return PR_SUCCESS;
-    /* sol_curthread is an asm routine which grabs GR7; GR7 stores an internal
-     * thread structure ptr used by solaris.  We'll use this ptr later
-     * with suspend/resume to find which threads are running on LWPs.
-     */
-    thread->md.threadID = sol_curthread();
-		/* prime the sp; substract 4 so we don't hit the assert that
-		 * curr sp > base_stack
-		 */
-    thread->md.sp = (uint_t) thread->stack->allocBase - sizeof(long);
-    thread->md.lwpid = _lwp_self();
-    thread->md.handle = THR_SELF();
-
-	/* all threads on Solaris are global threads from NSPR's perspective
-	 * since all of them are mapped to Solaris threads.
-	 */
-    thread->flags |= _PR_GLOBAL_SCOPE;
- 
- 	/* For primordial/attached thread, we don't create an underlying native thread.
- 	 * So, _MD_CREATE_THREAD() does not get called.  We need to do initialization
- 	 * like allocating thread's synchronization variables and set the underlying
- 	 * native thread's priority.
- 	 */
-	if (thread->flags & (_PR_PRIMORDIAL | _PR_ATTACHED)) {
-	    _MD_NEW_SEM(&thread->md.waiter_sem, 0);
-	    _MD_SET_PRIORITY(&(thread->md), thread->priority);
-	}
-	return PR_SUCCESS;
-}
-
-/* Sleep for n milliseconds, n < 1000   */
-void solaris_msec_sleep(int n)
-{
-    struct timespec ts;
-
-    ts.tv_sec = 0;
-    ts.tv_nsec = 1000000*n;
-    if (syscall(SYS_nanosleep, &ts, 0, 0) < 0) {
-        PR_ASSERT(0);
-    }
-}      
-
-#define VALID_SP(sp, bottom, top)   \
-	(((uint_t)(sp)) > ((uint_t)(bottom)) && ((uint_t)(sp)) < ((uint_t)(top)))
-
-void solaris_record_regs(PRThread *t, prstatus_t *lwpstatus)
-{
-#ifdef sparc
-	long *regs = (long *)&t->md.context.uc_mcontext.gregs[0];
-
-	PR_ASSERT(_PR_IS_GCABLE_THREAD(t));
-	PR_ASSERT(t->md.threadID == lwpstatus->pr_reg[REG_G7]);
-
-	t->md.sp = lwpstatus->pr_reg[REG_SP];
-	PR_ASSERT(VALID_SP(t->md.sp, t->stack->stackBottom, t->stack->stackTop));
-
-	regs[0] = lwpstatus->pr_reg[R_G1];
-	regs[1] = lwpstatus->pr_reg[R_G2];
-	regs[2] = lwpstatus->pr_reg[R_G3];
-	regs[3] = lwpstatus->pr_reg[R_G4];
-	regs[4] = lwpstatus->pr_reg[R_O0];
-	regs[5] = lwpstatus->pr_reg[R_O1];
-	regs[6] = lwpstatus->pr_reg[R_O2];
-	regs[7] = lwpstatus->pr_reg[R_O3];
-	regs[8] = lwpstatus->pr_reg[R_O4];
-	regs[9] = lwpstatus->pr_reg[R_O5];
-	regs[10] = lwpstatus->pr_reg[R_O6];
-	regs[11] = lwpstatus->pr_reg[R_O7];
-#elif defined(i386)
-	/*
-	 * To be implemented and tested
-	 */
-	PR_ASSERT(0);
-	PR_ASSERT(t->md.threadID == lwpstatus->pr_reg[GS]);
-	t->md.sp = lwpstatus->pr_reg[UESP];
-#endif
-}   
-
-void solaris_preempt_off()
-{
-    sigset_t set;
- 
-    (void)sigfillset(&set);
-    syscall(SYS_sigprocmask, SIG_SETMASK, &set, &old_mask);
-}
-
-void solaris_preempt_on()
-{
-    syscall(SYS_sigprocmask, SIG_SETMASK, &old_mask, NULL);      
-}
-
-int solaris_open_main_proc_fd()
-{
-    char buf[30];
-    int fd;
-
-    /* Not locked, so must be created while threads coming up */
-    PR_snprintf(buf, sizeof(buf), "/proc/%ld", getpid());
-    if ( (fd = syscall(SYS_open, buf, O_RDONLY)) < 0) {
-        return -1;
-    }
-    return fd;
-}
-
-/* Return a file descriptor for the /proc entry corresponding to the
- * given lwp. 
- */
-int solaris_open_lwp(lwpid_t id, int lwp_main_proc_fd)
-{
-    int result;
-
-    if ( (result = syscall(SYS_ioctl, lwp_main_proc_fd, PIOCOPENLWP, &id)) <0)
-        return -1; /* exited??? */
-
-    return result;
-}
-void _MD_Begin_SuspendAll()
-{
-    solaris_preempt_off();
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin_SuspendAll\n"));
-    /* run at highest prio so I cannot be preempted */
-    thr_getprio(thr_self(), &gcprio);
-    thr_setprio(thr_self(), 0x7fffffff); 
-    suspendAllOn = PR_TRUE;
-    suspendAllThread = _PR_MD_CURRENT_THREAD();
-}
-
-void _MD_End_SuspendAll()
-{
-}
-
-void _MD_End_ResumeAll()
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End_ResumeAll\n"));
-    thr_setprio(thr_self(), gcprio);
-    solaris_preempt_on();
-    suspendAllThread = NULL;
-    suspendAllOn = PR_FALSE;
-}
-
-void _MD_Suspend(PRThread *thr)
-{
-   int lwp_fd, result;
-   prstatus_t lwpstatus;
-   int lwp_main_proc_fd = 0;
-  
-   if (!_PR_IS_GCABLE_THREAD(thr) || !suspendAllOn){
-     /*XXX When the suspendAllOn is set, we will be trying to do lwp_suspend
-      * during that time we can't call any thread lib or libc calls. Hence
-      * make sure that no suspension is requested for Non gcable thread
-      * during suspendAllOn */
-      PR_ASSERT(!suspendAllOn);
-      thr_suspend(thr->md.handle);
-      return;
-   }
-
-    /* XXX Primordial thread can't be bound to an lwp, hence there is no
-     * way we can assume that we can get the lwp status for primordial
-     * thread reliably. Hence we skip this for primordial thread, hoping
-     * that the SP is saved during lock and cond. wait. 
-     * XXX - Again this is concern only for java interpreter, not for the
-     * server, 'cause primordial thread in the server does not do java work
-     */
-    if (thr->flags & _PR_PRIMORDIAL)
-      return;
-    
-    /* XXX Important Note: If the start function of a thread is not called,
-     * lwpid is -1. Then, skip this thread. This thread will get caught
-     * in PR_NativeRunThread before calling the start function, because
-     * we hold the pr_activeLock during suspend/resume */
-
-    /* if the thread is not started yet then don't do anything */
-    if (!suspendAllOn || thr->md.lwpid == -1)
-      return;
-
-    if (_lwp_suspend(thr->md.lwpid) < 0) { 
-       PR_ASSERT(0);
-       return;
-    }
-
-    if ( (lwp_main_proc_fd = solaris_open_main_proc_fd()) < 0) {
-        PR_ASSERT(0);
-        return;   /* XXXMB ARGH, we're hosed! */
-    }
-
-   if ( (lwp_fd = solaris_open_lwp(thr->md.lwpid, lwp_main_proc_fd)) < 0) {
-           PR_ASSERT(0);
-           close(lwp_main_proc_fd);
-	   return;
-   }
-   if ( (result = syscall(SYS_ioctl, lwp_fd, PIOCSTATUS, &lwpstatus)) < 0) {
-            /* Hopefully the thread just died... */
-           close(lwp_fd);
-           close(lwp_main_proc_fd);
-	   return;
-   }
-            while ( !(lwpstatus.pr_flags & PR_STOPPED) ) {
-                if ( (result = syscall(SYS_ioctl, lwp_fd, PIOCSTATUS, &lwpstatus)) < 0) {
-                    PR_ASSERT(0);  /* ARGH SOMETHING WRONG! */
-                    break;
-                }
-                solaris_msec_sleep(1);
-            }
-            solaris_record_regs(thr, &lwpstatus);
-            close(lwp_fd);
-   close(lwp_main_proc_fd);
-}
-
-#ifdef OLD_CODE
-
-void _MD_SuspendAll()
-{
-    /* On solaris there are threads, and there are LWPs. 
-     * Calling _PR_DoSingleThread would freeze all of the threads bound to LWPs
-     * but not necessarily stop all LWPs (for example if someone did
-     * an attachthread of a thread which was not bound to an LWP).
-     * So now go through all the LWPs for this process and freeze them.
-     *
-     * Note that if any thread which is capable of having the GC run on it must
-     * had better be a LWP with a single bound thread on it.  Otherwise, this 
-     * might not stop that thread from being run.
-     */
-    PRThread *current = _PR_MD_CURRENT_THREAD();
-    prstatus_t status, lwpstatus;
-    int result, index, lwp_fd;
-    lwpid_t me = _lwp_self();
-    int err;
-    int lwp_main_proc_fd;
-
-    solaris_preempt_off();
-
-    /* run at highest prio so I cannot be preempted */
-    thr_getprio(thr_self(), &gcprio);
-    thr_setprio(thr_self(), 0x7fffffff); 
-
-    current->md.sp = (uint_t)&me;	/* set my own stack pointer */
-
-    if ( (lwp_main_proc_fd = solaris_open_main_proc_fd()) < 0) {
-        PR_ASSERT(0);
-        solaris_preempt_on();
-        return;   /* XXXMB ARGH, we're hosed! */
-    }
-
-    if ( (result = syscall(SYS_ioctl, lwp_main_proc_fd, PIOCSTATUS, &status)) < 0) {
-        err = errno;
-        PR_ASSERT(0);
-        goto failure;   /* XXXMB ARGH, we're hosed! */
-    }
-
-    num_lwps = status.pr_nlwp;
-
-    if ( (all_lwps = (lwpid_t *)PR_MALLOC((num_lwps+1) * sizeof(lwpid_t)))==NULL) {
-        PR_ASSERT(0);
-        goto failure;   /* XXXMB ARGH, we're hosed! */
-    }
-           
-    if ( (result = syscall(SYS_ioctl, lwp_main_proc_fd, PIOCLWPIDS, all_lwps)) < 0) {
-        PR_ASSERT(0);
-        PR_DELETE(all_lwps);
-        goto failure;   /* XXXMB ARGH, we're hosed! */
-    }
-
-    for (index=0; index< num_lwps; index++) {
-        if (all_lwps[index] != me)  {
-            if (_lwp_suspend(all_lwps[index]) < 0) { 
-                /* could happen if lwp exited */
-                all_lwps[index] = me;	/* dummy it up */
-            }
-        }
-    }
-
-    /* Turns out that lwp_suspend is not a blocking call.
-     * Go through the list and make sure they are all stopped.
-     */
-    for (index=0; index< num_lwps; index++) {
-        if (all_lwps[index] != me)  {
-            if ( (lwp_fd = solaris_open_lwp(all_lwps[index], lwp_main_proc_fd)) < 0) {
-                PR_ASSERT(0);
-                PR_DELETE(all_lwps);
-                all_lwps = NULL;
-                goto failure;   /* XXXMB ARGH, we're hosed! */
-            }
-
-            if ( (result = syscall(SYS_ioctl, lwp_fd, PIOCSTATUS, &lwpstatus)) < 0) {
-                /* Hopefully the thread just died... */
-                close(lwp_fd);
-                continue;
-            }
-            while ( !(lwpstatus.pr_flags & PR_STOPPED) ) {
-                if ( (result = syscall(SYS_ioctl, lwp_fd, PIOCSTATUS, &lwpstatus)) < 0) {
-                    PR_ASSERT(0);  /* ARGH SOMETHING WRONG! */
-                    break;
-                }
-                solaris_msec_sleep(1);
-            }
-            solaris_record_regs(&lwpstatus);
-            close(lwp_fd);
-        }
-    }
-
-    close(lwp_main_proc_fd);
-
-    return;
-failure:
-    solaris_preempt_on();
-    thr_setprio(thr_self(), gcprio);
-    close(lwp_main_proc_fd);
-    return;
-}
-
-void _MD_ResumeAll()
-{
-    int i;
-    lwpid_t me = _lwp_self();
- 
-    for (i=0; i < num_lwps; i++) {
-        if (all_lwps[i] == me)
-            continue;
-        if ( _lwp_continue(all_lwps[i]) < 0) {
-            PR_ASSERT(0);  /* ARGH, we are hosed! */
-        }
-    }
-
-    /* restore priority and sigmask */
-    thr_setprio(thr_self(), gcprio);
-    solaris_preempt_on();
-    PR_DELETE(all_lwps);
-    all_lwps = NULL;
-}
-#endif /* OLD_CODE */
-
-#ifdef USE_SETJMP
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-		(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-#else
-PRWord *_MD_HomeGCRegisters(PRThread *t, PRIntn isCurrent, PRIntn *np)
-{
-    if (isCurrent) {
-		(void) getcontext(CONTEXT(t));
-    }
-    *np = NGREG;
-    return (PRWord*) &t->md.context.uc_mcontext.gregs[0];
-}
-#endif  /* USE_SETJMP */
-
-#else /* _PR_GLOBAL_THREADS_ONLY */
-
-#if defined(_PR_LOCAL_THREADS_ONLY)
-
-void _MD_EarlyInit(void)
-{
-}
-
-void _MD_SolarisInit()
-{
-    _PR_UnixInit();
-}
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-	PR_ASSERT((thread == NULL) || (!(thread->flags & _PR_GLOBAL_SCOPE)));
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Solaris */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Solaris");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Solaris");
-	return(PR_FAILURE);
-}
-
-#ifdef USE_SETJMP
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-		(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-#else
-PRWord *_MD_HomeGCRegisters(PRThread *t, PRIntn isCurrent, PRIntn *np)
-{
-    if (isCurrent) {
-		(void) getcontext(CONTEXT(t));
-    }
-    *np = NGREG;
-    return (PRWord*) &t->md.context.uc_mcontext.gregs[0];
-}
-#endif  /* USE_SETJMP */
-
-#endif  /* _PR_LOCAL_THREADS_ONLY */
-
-#endif /* _PR_GLOBAL_THREADS_ONLY */
-
-#ifndef _PR_PTHREADS
-#if defined(i386) && defined(SOLARIS2_4)
-/* 
- * Because clock_gettime() on Solaris/x86 2.4 always generates a
- * segmentation fault, we use an emulated version _pr_solx86_clock_gettime(),
- * which is implemented using gettimeofday().
- */
-
-int
-_pr_solx86_clock_gettime(clockid_t clock_id, struct timespec *tp)
-{
-    struct timeval tv;
-
-    if (clock_id != CLOCK_REALTIME) {
-	errno = EINVAL;
-	return -1;
-    }
-
-    gettimeofday(&tv, NULL);
-    tp->tv_sec = tv.tv_sec;
-    tp->tv_nsec = tv.tv_usec * 1000;
-    return 0;
-}
-#endif  /* i386 && SOLARIS2_4 */
-#endif  /* _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/sony.c b/libs/js/nsprpub/pr/src/md/unix/sony.c
deleted file mode 100644
index dacb4fd570..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/sony.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <signal.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-#ifndef _PR_PTHREADS
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t), 1);
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-#else
-	*np = 0;
-	return NULL;
-#endif
-}
-
-#ifndef _PR_PTHREADS
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Sony */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for SONY.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for SONY.");
-	return PR_FAILURE;
-}
-#endif /* ! _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/sunos4.c b/libs/js/nsprpub/pr/src/md/unix/sunos4.c
deleted file mode 100644
index d3b40c15cc..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/sunos4.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <setjmp.h>
-#include "primpl.h"
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRStatus _MD_CREATE_THREAD(PRThread *thread, 
-					void (*start)(void *), 
-					PRThreadPriority priority,
-					PRThreadScope scope, 
-					PRThreadState state, 
-					PRUint32 stackSize) 
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for SunOS 4.1.3.");
-    return PR_FAILURE;
-}
-
-void _MD_SET_PRIORITY(_MDThread *md_thread, PRUintn newPri)
-{
-    PR_NOT_REACHED("_MD_SET_PRIORITY should not be called for user-level threads.");
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus _MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for SunOS 4.1.3.");
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
diff --git a/libs/js/nsprpub/pr/src/md/unix/unix.c b/libs/js/nsprpub/pr/src/md/unix/unix.c
deleted file mode 100644
index 0fc7100ed1..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/unix.c
+++ /dev/null
@@ -1,3731 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "primpl.h"
-
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-
-#ifdef _PR_POLL_AVAILABLE
-#include <poll.h>
-#endif
-
-/* To get FIONREAD */
-#if defined(NCR) || defined(UNIXWARE) || defined(NEC) || defined(SNI) \
-        || defined(SONY)
-#include <sys/filio.h>
-#endif
-
-#if defined(NTO)
-#include <sys/statvfs.h>
-#endif
-
-/*
- * Make sure _PRSockLen_t is 32-bit, because we will cast a PRUint32* or
- * PRInt32* pointer to a _PRSockLen_t* pointer.
- */
-#if defined(HAVE_SOCKLEN_T) \
-    || (defined(__GLIBC__) && __GLIBC__ >= 2)
-#define _PRSockLen_t socklen_t
-#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-    || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-    || defined(BSDI) || defined(SCO) || defined(NEC) || defined(SNI) \
-    || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-    || defined(NEXTSTEP) || defined(QNX)
-#define _PRSockLen_t int
-#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-    || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-    || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS)
-#define _PRSockLen_t size_t
-#else
-#error "Cannot determine architecture"
-#endif
-
-/*
-** Global lock variable used to bracket calls into rusty libraries that
-** aren't thread safe (like libc, libX, etc).
-*/
-static PRLock *_pr_rename_lock = NULL;
-static PRMonitor *_pr_Xfe_mon = NULL;
-
-static PRInt64 minus_one;
-
-sigset_t timer_set;
-
-#if !defined(_PR_PTHREADS)
-
-static sigset_t empty_set;
-
-#ifdef SOLARIS
-#include <sys/file.h>
-#include <sys/filio.h>
-#endif
-
-#ifndef PIPE_BUF
-#define PIPE_BUF 512
-#endif
-
-/*
- * _nspr_noclock - if set clock interrupts are disabled
- */
-int _nspr_noclock = 1;
-
-#ifdef IRIX
-extern PRInt32 _nspr_terminate_on_error;
-#endif
-
-/*
- * There is an assertion in this code that NSPR's definition of PRIOVec
- * is bit compatible with UNIX' definition of a struct iovec. This is
- * applicable to the 'writev()' operations where the types are casually
- * cast to avoid warnings.
- */
-
-int _pr_md_pipefd[2] = { -1, -1 };
-static char _pr_md_pipebuf[PIPE_BUF];
-static PRInt32 local_io_wait(PRInt32 osfd, PRInt32 wait_flag,
-							PRIntervalTime timeout);
-
-_PRInterruptTable _pr_interruptTable[] = {
-    { 
-        "clock", _PR_MISSED_CLOCK, _PR_ClockInterrupt,     },
-    { 
-        0     }
-};
-
-void _MD_unix_init_running_cpu(_PRCPU *cpu)
-{
-    PR_INIT_CLIST(&(cpu->md.md_unix.ioQ));
-    cpu->md.md_unix.ioq_max_osfd = -1;
-    cpu->md.md_unix.ioq_timeout = PR_INTERVAL_NO_TIMEOUT;
-}
-
-PRStatus _MD_open_dir(_MDDir *d, const char *name)
-{
-int err;
-
-    d->d = opendir(name);
-    if (!d->d) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_OPENDIR_ERROR(err);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PRInt32 _MD_close_dir(_MDDir *d)
-{
-int rv = 0, err;
-
-    if (d->d) {
-        rv = closedir(d->d);
-        if (rv == -1) {
-                err = _MD_ERRNO();
-                _PR_MD_MAP_CLOSEDIR_ERROR(err);
-        }
-    }
-    return rv;
-}
-
-char * _MD_read_dir(_MDDir *d, PRIntn flags)
-{
-struct dirent *de;
-int err;
-
-    for (;;) {
-        /*
-          * XXX: readdir() is not MT-safe. There is an MT-safe version
-          * readdir_r() on some systems.
-          */
-        _MD_ERRNO() = 0;
-        de = readdir(d->d);
-        if (!de) {
-            err = _MD_ERRNO();
-            _PR_MD_MAP_READDIR_ERROR(err);
-            return 0;
-        }        
-        if ((flags & PR_SKIP_DOT) &&
-            (de->d_name[0] == '.') && (de->d_name[1] == 0))
-            continue;
-        if ((flags & PR_SKIP_DOT_DOT) &&
-            (de->d_name[0] == '.') && (de->d_name[1] == '.') &&
-            (de->d_name[2] == 0))
-            continue;
-        if ((flags & PR_SKIP_HIDDEN) && (de->d_name[0] == '.'))
-            continue;
-        break;
-    }
-    return de->d_name;
-}
-
-PRInt32 _MD_delete(const char *name)
-{
-PRInt32 rv, err;
-#ifdef UNIXWARE
-    sigset_t set, oset;
-#endif
-
-#ifdef UNIXWARE
-    sigfillset(&set);
-    sigprocmask(SIG_SETMASK, &set, &oset);
-#endif
-    rv = unlink(name);
-#ifdef UNIXWARE
-    sigprocmask(SIG_SETMASK, &oset, NULL);
-#endif
-    if (rv == -1) {
-            err = _MD_ERRNO();
-            _PR_MD_MAP_UNLINK_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_rename(const char *from, const char *to)
-{
-    PRInt32 rv = -1, err;
-
-    /*
-    ** This is trying to enforce the semantics of WINDOZE' rename
-    ** operation. That means one is not allowed to rename over top
-    ** of an existing file. Holding a lock across these two function
-    ** and the open function is known to be a bad idea, but ....
-    */
-    if (NULL != _pr_rename_lock)
-        PR_Lock(_pr_rename_lock);
-    if (0 == access(to, F_OK))
-        PR_SetError(PR_FILE_EXISTS_ERROR, 0);
-    else
-    {
-        rv = rename(from, to);
-        if (rv < 0) {
-            err = _MD_ERRNO();
-            _PR_MD_MAP_RENAME_ERROR(err);
-        }
-    }
-    if (NULL != _pr_rename_lock)
-        PR_Unlock(_pr_rename_lock);
-    return rv;
-}
-
-PRInt32 _MD_access(const char *name, PRAccessHow how)
-{
-PRInt32 rv, err;
-int amode;
-
-    switch (how) {
-        case PR_ACCESS_WRITE_OK:
-            amode = W_OK;
-            break;
-        case PR_ACCESS_READ_OK:
-            amode = R_OK;
-            break;
-        case PR_ACCESS_EXISTS:
-            amode = F_OK;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = -1;
-            goto done;
-    }
-    rv = access(name, amode);
-
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_ACCESS_ERROR(err);
-    }
-
-done:
-    return(rv);
-}
-
-PRInt32 _MD_mkdir(const char *name, PRIntn mode)
-{
-int rv, err;
-
-    /*
-    ** This lock is used to enforce rename semantics as described
-    ** in PR_Rename. Look there for more fun details.
-    */
-    if (NULL !=_pr_rename_lock)
-        PR_Lock(_pr_rename_lock);
-    rv = mkdir(name, mode);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_MKDIR_ERROR(err);
-    }
-    if (NULL !=_pr_rename_lock)
-        PR_Unlock(_pr_rename_lock);
-    return rv;
-}
-
-PRInt32 _MD_rmdir(const char *name)
-{
-int rv, err;
-
-    rv = rmdir(name);
-    if (rv == -1) {
-            err = _MD_ERRNO();
-            _PR_MD_MAP_RMDIR_ERROR(err);
-    }
-    return rv;
-}
-
-PRInt32 _MD_read(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-PRThread *me = _PR_MD_CURRENT_THREAD();
-PRInt32 rv, err;
-#ifndef _PR_USE_POLL
-fd_set rd;
-#else
-struct pollfd pfd;
-#endif /* _PR_USE_POLL */
-PRInt32 osfd = fd->secret->md.osfd;
-
-#ifndef _PR_USE_POLL
-    FD_ZERO(&rd);
-    FD_SET(osfd, &rd);
-#else
-    pfd.fd = osfd;
-    pfd.events = POLLIN;
-#endif /* _PR_USE_POLL */
-    while ((rv = read(osfd,buf,amount)) == -1) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-                if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_READ,
-										PR_INTERVAL_NO_TIMEOUT)) < 0)
-					goto done;								
-            } else {
-#ifndef _PR_USE_POLL
-                while ((rv = _MD_SELECT(osfd + 1, &rd, NULL, NULL, NULL))
-                        == -1 && (err = _MD_ERRNO()) == EINTR) {
-                    /* retry _MD_SELECT() if it is interrupted */
-                }
-#else /* _PR_USE_POLL */
-                while ((rv = _MD_POLL(&pfd, 1, -1))
-                        == -1 && (err = _MD_ERRNO()) == EINTR) {
-                    /* retry _MD_POLL() if it is interrupted */
-                }
-#endif /* _PR_USE_POLL */
-                if (rv == -1) {
-                    break;
-                }
-            }
-            if (_PR_PENDING_INTERRUPT(me))
-                break;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            _PR_MD_MAP_READ_ERROR(err);
-        }
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_write(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-PRThread *me = _PR_MD_CURRENT_THREAD();
-PRInt32 rv, err;
-#ifndef _PR_USE_POLL
-fd_set wd;
-#else
-struct pollfd pfd;
-#endif /* _PR_USE_POLL */
-PRInt32 osfd = fd->secret->md.osfd;
-
-#ifndef _PR_USE_POLL
-    FD_ZERO(&wd);
-    FD_SET(osfd, &wd);
-#else
-    pfd.fd = osfd;
-    pfd.events = POLLOUT;
-#endif /* _PR_USE_POLL */
-    while ((rv = write(osfd,buf,amount)) == -1) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-                if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_WRITE,
-										PR_INTERVAL_NO_TIMEOUT)) < 0)
-                    goto done;
-            } else {
-#ifndef _PR_USE_POLL
-                while ((rv = _MD_SELECT(osfd + 1, NULL, &wd, NULL, NULL))
-                        == -1 && (err = _MD_ERRNO()) == EINTR) {
-                    /* retry _MD_SELECT() if it is interrupted */
-                }
-#else /* _PR_USE_POLL */
-                while ((rv = _MD_POLL(&pfd, 1, -1))
-                        == -1 && (err = _MD_ERRNO()) == EINTR) {
-                    /* retry _MD_POLL() if it is interrupted */
-                }
-#endif /* _PR_USE_POLL */
-                if (rv == -1) {
-                    break;
-                }
-            }
-            if (_PR_PENDING_INTERRUPT(me))
-                break;
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            _PR_MD_MAP_WRITE_ERROR(err);
-        }
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_fsync(PRFileDesc *fd)
-{
-PRInt32 rv, err;
-
-    rv = fsync(fd->secret->md.osfd);
-    if (rv == -1) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_FSYNC_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_close(PRInt32 osfd)
-{
-PRInt32 rv, err;
-
-    rv = close(osfd);
-    if (rv == -1) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_CLOSE_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
-{
-    PRInt32 osfd, err;
-
-    osfd = socket(domain, type, proto);
-
-    if (osfd == -1) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SOCKET_ERROR(err);
-        return(osfd);
-    }
-
-    return(osfd);
-}
-
-PRInt32 _MD_socketavailable(PRFileDesc *fd)
-{
-    PRInt32 result;
-
-    if (ioctl(fd->secret->md.osfd, FIONREAD, &result) < 0) {
-        _PR_MD_MAP_SOCKETAVAILABLE_ERROR(_MD_ERRNO());
-        return -1;
-    }
-    return result;
-}
-
-PRInt64 _MD_socketavailable64(PRFileDesc *fd)
-{
-    PRInt64 result;
-    LL_I2L(result, _MD_socketavailable(fd));
-    return result;
-}  /* _MD_socketavailable64 */
-
-#define READ_FD        1
-#define WRITE_FD    2
-
-/*
- * socket_io_wait --
- *
- * wait for socket i/o, periodically checking for interrupt
- *
- * The first implementation uses select(), for platforms without
- * poll().  The second (preferred) implementation uses poll().
- */
-
-#ifndef _PR_USE_POLL
-
-static PRInt32 socket_io_wait(PRInt32 osfd, PRInt32 fd_type,
-    PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-    struct timeval tv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntervalTime epoch, now, elapsed, remaining;
-    PRBool wait_for_remaining;
-    PRInt32 syserror;
-    fd_set rd_wr;
-
-    switch (timeout) {
-        case PR_INTERVAL_NO_WAIT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-            break;
-        case PR_INTERVAL_NO_TIMEOUT:
-            /*
-             * This is a special case of the 'default' case below.
-             * Please see the comments there.
-             */
-            tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-            tv.tv_usec = 0;
-            FD_ZERO(&rd_wr);
-            do {
-                FD_SET(osfd, &rd_wr);
-                if (fd_type == READ_FD)
-                    rv = _MD_SELECT(osfd + 1, &rd_wr, NULL, NULL, &tv);
-                else
-                    rv = _MD_SELECT(osfd + 1, NULL, &rd_wr, NULL, &tv);
-                if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-                    _PR_MD_MAP_SELECT_ERROR(syserror);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-        default:
-            now = epoch = PR_IntervalNow();
-            remaining = timeout;
-            FD_ZERO(&rd_wr);
-            do {
-                /*
-                 * We block in _MD_SELECT for at most
-                 * _PR_INTERRUPT_CHECK_INTERVAL_SECS seconds,
-                 * so that there is an upper limit on the delay
-                 * before the interrupt bit is checked.
-                 */
-                wait_for_remaining = PR_TRUE;
-                tv.tv_sec = PR_IntervalToSeconds(remaining);
-                if (tv.tv_sec > _PR_INTERRUPT_CHECK_INTERVAL_SECS) {
-                    wait_for_remaining = PR_FALSE;
-                    tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-                    tv.tv_usec = 0;
-                } else {
-                    tv.tv_usec = PR_IntervalToMicroseconds(
-                        remaining -
-                        PR_SecondsToInterval(tv.tv_sec));
-                }
-                FD_SET(osfd, &rd_wr);
-                if (fd_type == READ_FD)
-                    rv = _MD_SELECT(osfd + 1, &rd_wr, NULL, NULL, &tv);
-                else
-                    rv = _MD_SELECT(osfd + 1, NULL, &rd_wr, NULL, &tv);
-                /*
-                 * we don't consider EINTR a real error
-                 */
-                if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-                    _PR_MD_MAP_SELECT_ERROR(syserror);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-                /*
-                 * We loop again if _MD_SELECT timed out or got interrupted
-                 * by a signal, and the timeout deadline has not passed yet.
-                 */
-                if (rv == 0 || (rv == -1 && syserror == EINTR)) {
-                    /*
-                     * If _MD_SELECT timed out, we know how much time
-                     * we spent in blocking, so we can avoid a
-                     * PR_IntervalNow() call.
-                     */
-                    if (rv == 0) {
-                        if (wait_for_remaining) {
-                            now += remaining;
-                        } else {
-                            now += PR_SecondsToInterval(tv.tv_sec)
-                                + PR_MicrosecondsToInterval(tv.tv_usec);
-                        }
-                    } else {
-                        now = PR_IntervalNow();
-                    }
-                    elapsed = (PRIntervalTime) (now - epoch);
-                    if (elapsed >= timeout) {
-                        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                        rv = -1;
-                        break;
-                    } else {
-                        remaining = timeout - elapsed;
-                    }
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-    }
-    return(rv);
-}
-
-#else /* _PR_USE_POLL */
-
-static PRInt32 socket_io_wait(PRInt32 osfd, PRInt32 fd_type,
-    PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-    int msecs;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntervalTime epoch, now, elapsed, remaining;
-    PRBool wait_for_remaining;
-    PRInt32 syserror;
-    struct pollfd pfd;
-
-    switch (timeout) {
-        case PR_INTERVAL_NO_WAIT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-            break;
-        case PR_INTERVAL_NO_TIMEOUT:
-            /*
-             * This is a special case of the 'default' case below.
-             * Please see the comments there.
-             */
-            msecs = _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000;
-            pfd.fd = osfd;
-            if (fd_type == READ_FD) {
-                pfd.events = POLLIN;
-            } else {
-                pfd.events = POLLOUT;
-            }
-            do {
-                rv = _MD_POLL(&pfd, 1, msecs);
-                if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-                    _PR_MD_MAP_POLL_ERROR(syserror);
-                    break;
-                }
-				/*
-				 * If POLLERR is set, don't process it; retry the operation
-				 */
-                if ((rv == 1) && (pfd.revents & (POLLHUP | POLLNVAL))) {
-					rv = -1;
-                    _PR_MD_MAP_POLL_REVENTS_ERROR(pfd.revents);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-        default:
-            now = epoch = PR_IntervalNow();
-            remaining = timeout;
-            pfd.fd = osfd;
-            if (fd_type == READ_FD) {
-                pfd.events = POLLIN;
-            } else {
-                pfd.events = POLLOUT;
-            }
-            do {
-                /*
-                 * We block in _MD_POLL for at most
-                 * _PR_INTERRUPT_CHECK_INTERVAL_SECS seconds,
-                 * so that there is an upper limit on the delay
-                 * before the interrupt bit is checked.
-                 */
-                wait_for_remaining = PR_TRUE;
-                msecs = PR_IntervalToMilliseconds(remaining);
-                if (msecs > _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000) {
-                    wait_for_remaining = PR_FALSE;
-                    msecs = _PR_INTERRUPT_CHECK_INTERVAL_SECS * 1000;
-                }
-                rv = _MD_POLL(&pfd, 1, msecs);
-                /*
-                 * we don't consider EINTR a real error
-                 */
-                if (rv == -1 && (syserror = _MD_ERRNO()) != EINTR) {
-                    _PR_MD_MAP_POLL_ERROR(syserror);
-                    break;
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-				/*
-				 * If POLLERR is set, don't process it; retry the operation
-				 */
-                if ((rv == 1) && (pfd.revents & (POLLHUP | POLLNVAL))) {
-					rv = -1;
-                    _PR_MD_MAP_POLL_REVENTS_ERROR(pfd.revents);
-                    break;
-                }
-                /*
-                 * We loop again if _MD_POLL timed out or got interrupted
-                 * by a signal, and the timeout deadline has not passed yet.
-                 */
-                if (rv == 0 || (rv == -1 && syserror == EINTR)) {
-                    /*
-                     * If _MD_POLL timed out, we know how much time
-                     * we spent in blocking, so we can avoid a
-                     * PR_IntervalNow() call.
-                     */
-                    if (rv == 0) {
-                        if (wait_for_remaining) {
-                            now += remaining;
-                        } else {
-                            now += PR_MillisecondsToInterval(msecs);
-                        }
-                    } else {
-                        now = PR_IntervalNow();
-                    }
-                    elapsed = (PRIntervalTime) (now - epoch);
-                    if (elapsed >= timeout) {
-                        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                        rv = -1;
-                        break;
-                    } else {
-                        remaining = timeout - elapsed;
-                    }
-                }
-            } while (rv == 0 || (rv == -1 && syserror == EINTR));
-            break;
-    }
-    return(rv);
-}
-
-#endif /* _PR_USE_POLL */
-
-static PRInt32 local_io_wait(
-    PRInt32 osfd,
-    PRInt32 wait_flag,
-    PRIntervalTime timeout)
-{
-    _PRUnixPollDesc pd;
-    PRInt32 rv;
-
-    PR_LOG(_pr_io_lm, PR_LOG_MIN,
-       ("waiting to %s on osfd=%d",
-        (wait_flag == _PR_UNIX_POLL_READ) ? "read" : "write",
-        osfd));
-
-    if (timeout == PR_INTERVAL_NO_WAIT) return 0;
-
-    pd.osfd = osfd;
-    pd.in_flags = wait_flag;
-    pd.out_flags = 0;
-
-    rv = _PR_WaitForMultipleFDs(&pd, 1, timeout);
-
-    if (rv == 0) {
-        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        rv = -1;
-    }
-    return rv;
-}
-
-
-PRInt32 _MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount,
-                                PRInt32 flags, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-/*
- * Many OS's (Solaris, Unixware) have a broken recv which won't read
- * from socketpairs.  As long as we don't use flags on socketpairs, this
- * is a decent fix. - mikep
- */
-#if defined(UNIXWARE) || defined(SOLARIS) || defined(NCR)
-    while ((rv = read(osfd,buf,amount)) == -1) {
-#else
-    while ((rv = recv(osfd,buf,amount,flags)) == -1) {
-#endif
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-				if ((rv = local_io_wait(osfd,_PR_UNIX_POLL_READ,timeout)) < 0)
-					goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_recvfrom(PRFileDesc *fd, void *buf, PRInt32 amount,
-                        PRIntn flags, PRNetAddr *addr, PRUint32 *addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((*addrlen = PR_NETADDR_SIZE(addr)),
-                ((rv = recvfrom(osfd, buf, amount, flags,
-                        (struct sockaddr *) addr, (_PRSockLen_t *)addrlen)) == -1)) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-                if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_READ, timeout)) < 0)
-                    goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECVFROM_ERROR(err);
-    }
-done:
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv != -1) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    return(rv);
-}
-
-PRInt32 _MD_send(PRFileDesc *fd, const void *buf, PRInt32 amount,
-                            PRInt32 flags, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-#if defined(SOLARIS)
-	PRInt32 tmp_amount = amount;
-#endif
-
-    /*
-     * On pre-2.6 Solaris, send() is much slower than write().
-     * On 2.6 and beyond, with in-kernel sockets, send() and
-     * write() are fairly equivalent in performance.
-     */
-#if defined(SOLARIS)
-    PR_ASSERT(0 == flags);
-    while ((rv = write(osfd,buf,tmp_amount)) == -1) {
-#else
-    while ((rv = send(osfd,buf,amount,flags)) == -1) {
-#endif
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK))    {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-                if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout)) < 0)
-                    goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))< 0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-#if defined(SOLARIS)
-			/*
-			 * The write system call has been reported to return the ERANGE
-			 * error on occasion. Try to write in smaller chunks to workaround
-			 * this bug.
-			 */
-			if (err == ERANGE) {
-				if (tmp_amount > 1) {
-					tmp_amount = tmp_amount/2;	/* half the bytes */
-					continue;
-				}
-			}
-#endif
-            break;
-        }
-    }
-        /*
-         * optimization; if bytes sent is less than "amount" call
-         * select before returning. This is because it is likely that
-         * the next send() call will return EWOULDBLOCK.
-         */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-            && (timeout != PR_INTERVAL_NO_WAIT)) {
-        if (_PR_IS_NATIVE_THREAD(me)) {
-			if (socket_io_wait(osfd, WRITE_FD, timeout)< 0) {
-				rv = -1;
-				goto done;
-			}
-        } else {
-			if (local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout) < 0) {
-				rv = -1;
-				goto done;
-			}
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SEND_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_sendto(
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-    const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-
-    while ((rv = sendto(osfd, buf, amount, flags,
-            (struct sockaddr *) &addrCopy, addrlen)) == -1) {
-#else
-    while ((rv = sendto(osfd, buf, amount, flags,
-            (struct sockaddr *) addr, addrlen)) == -1) {
-#endif
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK))    {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-				if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout)) < 0)
-					goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))< 0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SENDTO_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_writev(
-    PRFileDesc *fd, const PRIOVec *iov,
-    PRInt32 iov_size, PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 index, amount = 0;
-    PRInt32 osfd = fd->secret->md.osfd;
-
-    /*
-     * Calculate the total number of bytes to be sent; needed for
-     * optimization later.
-     * We could avoid this if this number was passed in; but it is
-     * probably not a big deal because iov_size is usually small (less than
-     * 3)
-     */
-    if (!fd->secret->nonblocking) {
-        for (index=0; index<iov_size; index++) {
-            amount += iov[index].iov_len;
-        }
-    }
-
-    while ((rv = writev(osfd, (const struct iovec*)iov, iov_size)) == -1) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK))    {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-				if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout)) < 0)
-					goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, WRITE_FD, timeout))<0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    /*
-     * optimization; if bytes sent is less than "amount" call
-     * select before returning. This is because it is likely that
-     * the next writev() call will return EWOULDBLOCK.
-     */
-    if ((!fd->secret->nonblocking) && (rv > 0) && (rv < amount)
-            && (timeout != PR_INTERVAL_NO_WAIT)) {
-        if (_PR_IS_NATIVE_THREAD(me)) {
-            if (socket_io_wait(osfd, WRITE_FD, timeout) < 0) {
-				rv = -1;
-                goto done;
-			}
-        } else {
-			if (local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout) < 0) {
-				rv = -1;
-				goto done;
-			}
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_WRITEV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32 _MD_accept(PRFileDesc *fd, PRNetAddr *addr,
-                            PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    while ((rv = accept(osfd, (struct sockaddr *) addr,
-                                        (_PRSockLen_t *)addrlen)) == -1) {
-        err = _MD_ERRNO();
-        if ((err == EAGAIN) || (err == EWOULDBLOCK) || (err == ECONNABORTED)) {
-            if (fd->secret->nonblocking) {
-                break;
-            }
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-				if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_READ, timeout)) < 0)
-					goto done;
-            } else {
-                if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-                    goto done;
-            }
-        } else if ((err == EINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_ACCEPT_ERROR(err);
-    }
-done:
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv != -1) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    return(rv);
-}
-
-extern int _connect (int s, const struct sockaddr *name, int namelen);
-PRInt32 _MD_connect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 osfd = fd->secret->md.osfd;
-#ifdef IRIX
-extern PRInt32 _MD_irix_connect(
-        PRInt32 osfd, const PRNetAddr *addr, PRInt32 addrlen, PRIntervalTime timeout);
-#endif
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-#endif
-
-    /*
-     * We initiate the connection setup by making a nonblocking connect()
-     * call.  If the connect() call fails, there are two cases we handle
-     * specially:
-     * 1. The connect() call was interrupted by a signal.  In this case
-     *    we simply retry connect().
-     * 2. The NSPR socket is nonblocking and connect() fails with
-     *    EINPROGRESS.  We first wait until the socket becomes writable.
-     *    Then we try to find out whether the connection setup succeeded
-     *    or failed.
-     */
-
-retry:
-#ifdef IRIX
-    if ((rv = _MD_irix_connect(osfd, addr, addrlen, timeout)) == -1) {
-#else
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if ((rv = connect(osfd, (struct sockaddr *)&addrCopy, addrlen)) == -1) {
-#else
-    if ((rv = connect(osfd, (struct sockaddr *)addr, addrlen)) == -1) {
-#endif
-#endif
-        err = _MD_ERRNO();
-
-        if (err == EINTR) {
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-            goto retry;
-        }
-
-        if (!fd->secret->nonblocking && (err == EINPROGRESS)) {
-            if (!_PR_IS_NATIVE_THREAD(me)) {
-
-				if ((rv = local_io_wait(osfd, _PR_UNIX_POLL_WRITE, timeout)) < 0)
-                    return -1;
-            } else {
-                /*
-                 * socket_io_wait() may return -1 or 1.
-                 */
-
-                rv = socket_io_wait(osfd, WRITE_FD, timeout);
-                if (rv == -1) {
-                    return -1;
-                }
-            }
-
-            PR_ASSERT(rv == 1);
-            if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                return -1;
-            }
-            err = _MD_unix_get_nonblocking_connect_error(osfd);
-            if (err != 0) {
-                _PR_MD_MAP_CONNECT_ERROR(err);
-                return -1;
-            }
-            return 0;
-        }
-
-        _PR_MD_MAP_CONNECT_ERROR(err);
-    }
-
-    return rv;
-}  /* _MD_connect */
-
-PRInt32 _MD_bind(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv, err;
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    PRNetAddr addrCopy;
-
-    addrCopy = *addr;
-    ((struct sockaddr *) &addrCopy)->sa_len = addrlen;
-    ((struct sockaddr *) &addrCopy)->sa_family = addr->raw.family;
-    rv = bind(fd->secret->md.osfd, (struct sockaddr *) &addrCopy, (int )addrlen);
-#else
-    rv = bind(fd->secret->md.osfd, (struct sockaddr *) addr, (int )addrlen);
-#endif
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_BIND_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_listen(PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 rv, err;
-
-    rv = listen(fd->secret->md.osfd, backlog);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_LISTEN_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_shutdown(PRFileDesc *fd, PRIntn how)
-{
-    PRInt32 rv, err;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SHUTDOWN_ERROR(err);
-    }
-    return(rv);
-}
-
-PRInt32 _MD_socketpair(int af, int type, int flags,
-                                                        PRInt32 *osfd)
-{
-    PRInt32 rv, err;
-
-    rv = socketpair(af, type, flags, osfd);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SOCKETPAIR_ERROR(err);
-    }
-    return rv;
-}
-
-PRStatus _MD_getsockname(PRFileDesc *fd, PRNetAddr *addr,
-                                                PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockname(fd->secret->md.osfd,
-            (struct sockaddr *) addr, (_PRSockLen_t *)addrlen);
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv == 0) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETSOCKNAME_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus _MD_getpeername(PRFileDesc *fd, PRNetAddr *addr,
-                                        PRUint32 *addrlen)
-{
-    PRInt32 rv, err;
-
-    rv = getpeername(fd->secret->md.osfd,
-            (struct sockaddr *) addr, (_PRSockLen_t *)addrlen);
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (rv == 0) {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr) {
-            addr->raw.family = ((struct sockaddr *) addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETPEERNAME_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus _MD_getsockopt(PRFileDesc *fd, PRInt32 level,
-                        PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    PRInt32 rv, err;
-
-    rv = getsockopt(fd->secret->md.osfd, level, optname, optval, (_PRSockLen_t *)optlen);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_GETSOCKOPT_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus _MD_setsockopt(PRFileDesc *fd, PRInt32 level,   
-                    PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv, err;
-
-    rv = setsockopt(fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_SETSOCKOPT_ERROR(err);
-    }
-    return rv==0?PR_SUCCESS:PR_FAILURE;
-}
-
-PRStatus _MD_set_fd_inheritable(PRFileDesc *fd, PRBool inheritable)
-{
-    int rv;
-
-    rv = fcntl(fd->secret->md.osfd, F_SETFD, inheritable ? 0 : FD_CLOEXEC);
-    if (-1 == rv) {
-        PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-void _MD_init_fd_inheritable(PRFileDesc *fd, PRBool imported)
-{
-    if (imported) {
-        fd->secret->inheritable = _PR_TRI_UNKNOWN;
-    } else {
-        /* By default, a Unix fd is not closed on exec. */
-#ifdef DEBUG
-        {
-            int flags = fcntl(fd->secret->md.osfd, F_GETFD, 0);
-            PR_ASSERT(0 == flags);
-        }
-#endif
-        fd->secret->inheritable = _PR_TRI_TRUE;
-    }
-}
-
-/************************************************************************/
-#if !defined(_PR_USE_POLL)
-
-/*
-** Scan through io queue and find any bad fd's that triggered the error
-** from _MD_SELECT
-*/
-static void FindBadFDs(void)
-{
-    PRCList *q;
-    PRThread *me = _MD_CURRENT_THREAD();
-
-    PR_ASSERT(!_PR_IS_NATIVE_THREAD(me));
-    q = (_PR_IOQ(me->cpu)).next;
-    _PR_IOQ_MAX_OSFD(me->cpu) = -1;
-    _PR_IOQ_TIMEOUT(me->cpu) = PR_INTERVAL_NO_TIMEOUT;
-    while (q != &_PR_IOQ(me->cpu)) {
-        PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-        PRBool notify = PR_FALSE;
-        _PRUnixPollDesc *pds = pq->pds;
-        _PRUnixPollDesc *epds = pds + pq->npds;
-        PRInt32 pq_max_osfd = -1;
-
-        q = q->next;
-        for (; pds < epds; pds++) {
-            PRInt32 osfd = pds->osfd;
-            pds->out_flags = 0;
-            PR_ASSERT(osfd >= 0 || pds->in_flags == 0);
-            if (pds->in_flags == 0) {
-                continue;  /* skip this fd */
-            }
-            if (fcntl(osfd, F_GETFL, 0) == -1) {
-                /* Found a bad descriptor, remove it from the fd_sets. */
-                PR_LOG(_pr_io_lm, PR_LOG_MAX,
-                    ("file descriptor %d is bad", osfd));
-                pds->out_flags = _PR_UNIX_POLL_NVAL;
-                notify = PR_TRUE;
-            }
-            if (osfd > pq_max_osfd) {
-                pq_max_osfd = osfd;
-            }
-        }
-
-        if (notify) {
-            PRIntn pri;
-            PR_REMOVE_LINK(&pq->links);
-            pq->on_ioq = PR_FALSE;
-
-            /*
-         * Decrement the count of descriptors for each desciptor/event
-         * because this I/O request is being removed from the
-         * ioq
-         */
-            pds = pq->pds;
-            for (; pds < epds; pds++) {
-                PRInt32 osfd = pds->osfd;
-                PRInt16 in_flags = pds->in_flags;
-                PR_ASSERT(osfd >= 0 || in_flags == 0);
-                if (in_flags & _PR_UNIX_POLL_READ) {
-                    if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                }
-                if (in_flags & _PR_UNIX_POLL_WRITE) {
-                    if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                }
-                if (in_flags & _PR_UNIX_POLL_EXCEPT) {
-                    if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                }
-            }
-
-            _PR_THREAD_LOCK(pq->thr);
-            if (pq->thr->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-                _PRCPU *cpu = pq->thr->cpu;
-                _PR_SLEEPQ_LOCK(pq->thr->cpu);
-                _PR_DEL_SLEEPQ(pq->thr, PR_TRUE);
-                _PR_SLEEPQ_UNLOCK(pq->thr->cpu);
-
-				if (pq->thr->flags & _PR_SUSPENDING) {
-				    /*
-				     * set thread state to SUSPENDED;
-				     * a Resume operation on the thread
-				     * will move it to the runQ
-				     */
-				    pq->thr->state = _PR_SUSPENDED;
-				    _PR_MISCQ_LOCK(pq->thr->cpu);
-				    _PR_ADD_SUSPENDQ(pq->thr, pq->thr->cpu);
-				    _PR_MISCQ_UNLOCK(pq->thr->cpu);
-				} else {
-				    pri = pq->thr->priority;
-				    pq->thr->state = _PR_RUNNABLE;
-
-				    _PR_RUNQ_LOCK(cpu);
-				    _PR_ADD_RUNQ(pq->thr, cpu, pri);
-				    _PR_RUNQ_UNLOCK(cpu);
-				}
-            }
-            _PR_THREAD_UNLOCK(pq->thr);
-        } else {
-            if (pq->timeout < _PR_IOQ_TIMEOUT(me->cpu))
-                _PR_IOQ_TIMEOUT(me->cpu) = pq->timeout;
-            if (_PR_IOQ_MAX_OSFD(me->cpu) < pq_max_osfd)
-                _PR_IOQ_MAX_OSFD(me->cpu) = pq_max_osfd;
-        }
-    }
-    if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-        if (_PR_IOQ_MAX_OSFD(me->cpu) < _pr_md_pipefd[0])
-            _PR_IOQ_MAX_OSFD(me->cpu) = _pr_md_pipefd[0];
-    }
-}
-#endif  /* !defined(_PR_USE_POLL) */
-
-/************************************************************************/
-
-/*
-** Called by the scheduler when there is nothing to do. This means that
-** all threads are blocked on some monitor somewhere.
-**
-** Note: this code doesn't release the scheduler lock.
-*/
-/*
-** Pause the current CPU. longjmp to the cpu's pause stack
-**
-** This must be called with the scheduler locked
-*/
-void _MD_PauseCPU(PRIntervalTime ticks)
-{
-    PRThread *me = _MD_CURRENT_THREAD();
-#ifdef _PR_USE_POLL
-    int timeout;
-    struct pollfd *pollfds;    /* an array of pollfd structures */
-    struct pollfd *pollfdPtr;    /* a pointer that steps through the array */
-    unsigned long npollfds;     /* number of pollfd structures in array */
-    unsigned long pollfds_size;
-    int nfd;                    /* to hold the return value of poll() */
-#else
-    struct timeval timeout, *tvp;
-    fd_set r, w, e;
-    fd_set *rp, *wp, *ep;
-    PRInt32 max_osfd, nfd;
-#endif  /* _PR_USE_POLL */
-    PRInt32 rv;
-    PRCList *q;
-    PRUint32 min_timeout;
-    sigset_t oldset;
-#ifdef IRIX
-extern sigset_t ints_off;
-#endif
-
-    PR_ASSERT(_PR_MD_GET_INTSOFF() != 0);
-
-    _PR_MD_IOQ_LOCK();
-
-#ifdef _PR_USE_POLL
-    /* Build up the pollfd structure array to wait on */
-
-    /* Find out how many pollfd structures are needed */
-    npollfds = _PR_IOQ_OSFD_CNT(me->cpu);
-    PR_ASSERT(npollfds >= 0);
-
-    /*
-     * We use a pipe to wake up a native thread.  An fd is needed
-     * for the pipe and we poll it for reading.
-     */
-    if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-        npollfds++;
-#ifdef	IRIX
-		/*
-		 * On Irix, a second pipe is used to cause the primordial cpu to
-		 * wakeup and exit, when the process is exiting because of a call
-		 * to exit/PR_ProcessExit.
-		 */
-		if (me->cpu->id == 0) {
-        	npollfds++;
-		}
-#endif
-	}
-
-    /*
-     * if the cpu's pollfd array is not big enough, release it and allocate a new one
-     */
-    if (npollfds > _PR_IOQ_POLLFDS_SIZE(me->cpu)) {
-        if (_PR_IOQ_POLLFDS(me->cpu) != NULL)
-            PR_DELETE(_PR_IOQ_POLLFDS(me->cpu));
-        pollfds_size =  PR_MAX(_PR_IOQ_MIN_POLLFDS_SIZE(me->cpu), npollfds);
-        pollfds = (struct pollfd *) PR_MALLOC(pollfds_size * sizeof(struct pollfd));
-        _PR_IOQ_POLLFDS(me->cpu) = pollfds;
-        _PR_IOQ_POLLFDS_SIZE(me->cpu) = pollfds_size;
-    } else {
-        pollfds = _PR_IOQ_POLLFDS(me->cpu);
-    }
-    pollfdPtr = pollfds;
-
-    /*
-     * If we need to poll the pipe for waking up a native thread,
-     * the pipe's fd is the first element in the pollfds array.
-     */
-    if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-        pollfdPtr->fd = _pr_md_pipefd[0];
-        pollfdPtr->events = POLLIN;
-        pollfdPtr++;
-#ifdef	IRIX
-		/*
-		 * On Irix, the second element is the exit pipe
-		 */
-		if (me->cpu->id == 0) {
-			pollfdPtr->fd = _pr_irix_primoridal_cpu_fd[0];
-			pollfdPtr->events = POLLIN;
-			pollfdPtr++;
-		}
-#endif
-    }
-
-    min_timeout = PR_INTERVAL_NO_TIMEOUT;
-    for (q = _PR_IOQ(me->cpu).next; q != &_PR_IOQ(me->cpu); q = q->next) {
-        PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-        _PRUnixPollDesc *pds = pq->pds;
-        _PRUnixPollDesc *epds = pds + pq->npds;
-
-        if (pq->timeout < min_timeout) {
-            min_timeout = pq->timeout;
-        }
-        for (; pds < epds; pds++, pollfdPtr++) {
-            /*
-         * Assert that the pollfdPtr pointer does not go
-         * beyond the end of the pollfds array
-         */
-            PR_ASSERT(pollfdPtr < pollfds + npollfds);
-            pollfdPtr->fd = pds->osfd;
-            /* direct copy of poll flags */
-            pollfdPtr->events = pds->in_flags;
-        }
-    }
-    _PR_IOQ_TIMEOUT(me->cpu) = min_timeout;
-#else
-    /*
-     * assigment of fd_sets
-     */
-    r = _PR_FD_READ_SET(me->cpu);
-    w = _PR_FD_WRITE_SET(me->cpu);
-    e = _PR_FD_EXCEPTION_SET(me->cpu);
-
-    rp = &r;
-    wp = &w;
-    ep = &e;
-
-    max_osfd = _PR_IOQ_MAX_OSFD(me->cpu) + 1;
-    min_timeout = _PR_IOQ_TIMEOUT(me->cpu);
-#endif  /* _PR_USE_POLL */
-    /*
-    ** Compute the minimum timeout value: make it the smaller of the
-    ** timeouts specified by the i/o pollers or the timeout of the first
-    ** sleeping thread.
-    */
-    q = _PR_SLEEPQ(me->cpu).next;
-
-    if (q != &_PR_SLEEPQ(me->cpu)) {
-        PRThread *t = _PR_THREAD_PTR(q);
-
-        if (t->sleep < min_timeout) {
-            min_timeout = t->sleep;
-        }
-    }
-    if (min_timeout > ticks) {
-        min_timeout = ticks;
-    }
-
-#ifdef _PR_USE_POLL
-    if (min_timeout == PR_INTERVAL_NO_TIMEOUT)
-        timeout = -1;
-    else
-        timeout = PR_IntervalToMilliseconds(min_timeout);
-#else
-    if (min_timeout == PR_INTERVAL_NO_TIMEOUT) {
-        tvp = NULL;
-    } else {
-        timeout.tv_sec = PR_IntervalToSeconds(min_timeout);
-        timeout.tv_usec = PR_IntervalToMicroseconds(min_timeout)
-            % PR_USEC_PER_SEC;
-        tvp = &timeout;
-    }
-#endif  /* _PR_USE_POLL */
-
-    _PR_MD_IOQ_UNLOCK();
-    _MD_CHECK_FOR_EXIT();
-    /*
-     * check for i/o operations
-     */
-#ifndef _PR_NO_CLOCK_TIMER
-    /*
-     * Disable the clock interrupts while we are in select, if clock interrupts
-     * are enabled. Otherwise, when the select/poll calls are interrupted, the
-     * timer value starts ticking from zero again when the system call is restarted.
-     */
-#ifdef IRIX
-    /*
-     * SIGCHLD signal is used on Irix to detect he termination of an
-     * sproc by SIGSEGV, SIGBUS or SIGABRT signals when
-     * _nspr_terminate_on_error is set.
-     */
-    if ((!_nspr_noclock) || (_nspr_terminate_on_error))
-#else
-        if (!_nspr_noclock)
-#endif    /* IRIX */
-#ifdef IRIX
-    sigprocmask(SIG_BLOCK, &ints_off, &oldset);
-#else
-    PR_ASSERT(sigismember(&timer_set, SIGALRM));
-    sigprocmask(SIG_BLOCK, &timer_set, &oldset);
-#endif    /* IRIX */
-#endif  /* !_PR_NO_CLOCK_TIMER */
-
-#ifndef _PR_USE_POLL
-    PR_ASSERT(FD_ISSET(_pr_md_pipefd[0],rp));
-    nfd = _MD_SELECT(max_osfd, rp, wp, ep, tvp);
-#else
-    nfd = _MD_POLL(pollfds, npollfds, timeout);
-#endif  /* !_PR_USE_POLL */
-
-#ifndef _PR_NO_CLOCK_TIMER
-#ifdef IRIX
-    if ((!_nspr_noclock) || (_nspr_terminate_on_error))
-#else
-        if (!_nspr_noclock)
-#endif    /* IRIX */
-    sigprocmask(SIG_SETMASK, &oldset, 0);
-#endif  /* !_PR_NO_CLOCK_TIMER */
-
-    _MD_CHECK_FOR_EXIT();
-
-#ifdef IRIX
-	_PR_MD_primordial_cpu();
-#endif
-
-    _PR_MD_IOQ_LOCK();
-    /*
-    ** Notify monitors that are associated with the selected descriptors.
-    */
-#ifdef _PR_USE_POLL
-    if (nfd > 0) {
-        pollfdPtr = pollfds;
-        if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-            /*
-			 * Assert that the pipe is the first element in the
-			 * pollfds array.
-			 */
-            PR_ASSERT(pollfds[0].fd == _pr_md_pipefd[0]);
-            if ((pollfds[0].revents & POLLIN) && (nfd == 1)) {
-                /*
-				 * woken up by another thread; read all the data
-				 * in the pipe to empty the pipe
-				 */
-                while ((rv = read(_pr_md_pipefd[0], _pr_md_pipebuf,
-                    PIPE_BUF)) == PIPE_BUF){
-                }
-                PR_ASSERT((rv > 0) || ((rv == -1) && (errno == EAGAIN)));
-            }
-            pollfdPtr++;
-#ifdef	IRIX
-			/*
-			 * On Irix, check to see if the primordial cpu needs to exit
-			 * to cause the process to terminate
-			 */
-			if (me->cpu->id == 0) {
-            	PR_ASSERT(pollfds[1].fd == _pr_irix_primoridal_cpu_fd[0]);
-				if (pollfdPtr->revents & POLLIN) {
-					if (_pr_irix_process_exit) {
-						/*
-						 * process exit due to a call to PR_ProcessExit
-						 */
-						prctl(PR_SETEXITSIG, SIGKILL);
-						_exit(_pr_irix_process_exit_code);
-					} else {
-						while ((rv = read(_pr_irix_primoridal_cpu_fd[0],
-							_pr_md_pipebuf, PIPE_BUF)) == PIPE_BUF) {
-						}
-						PR_ASSERT(rv > 0);
-					}
-				}
-				pollfdPtr++;
-			}
-#endif
-        }
-        for (q = _PR_IOQ(me->cpu).next; q != &_PR_IOQ(me->cpu); q = q->next) {
-            PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-            PRBool notify = PR_FALSE;
-            _PRUnixPollDesc *pds = pq->pds;
-            _PRUnixPollDesc *epds = pds + pq->npds;
-
-            for (; pds < epds; pds++, pollfdPtr++) {
-                /*
-                  * Assert that the pollfdPtr pointer does not go beyond
-                  * the end of the pollfds array.
-                  */
-                PR_ASSERT(pollfdPtr < pollfds + npollfds);
-                /*
-                 * Assert that the fd's in the pollfds array (stepped
-                 * through by pollfdPtr) are in the same order as
-                 * the fd's in _PR_IOQ() (stepped through by q and pds).
-                 * This is how the pollfds array was created earlier.
-                 */
-                PR_ASSERT(pollfdPtr->fd == pds->osfd);
-                pds->out_flags = pollfdPtr->revents;
-                /* Negative fd's are ignored by poll() */
-                if (pds->osfd >= 0 && pds->out_flags) {
-                    notify = PR_TRUE;
-                }
-            }
-            if (notify) {
-                PRIntn pri;
-                PRThread *thred;
-
-                PR_REMOVE_LINK(&pq->links);
-                pq->on_ioq = PR_FALSE;
-
-                thred = pq->thr;
-                _PR_THREAD_LOCK(thred);
-                if (pq->thr->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-                    _PRCPU *cpu = pq->thr->cpu;
-                    _PR_SLEEPQ_LOCK(pq->thr->cpu);
-                    _PR_DEL_SLEEPQ(pq->thr, PR_TRUE);
-                    _PR_SLEEPQ_UNLOCK(pq->thr->cpu);
-
-					if (pq->thr->flags & _PR_SUSPENDING) {
-					    /*
-					     * set thread state to SUSPENDED;
-					     * a Resume operation on the thread
-					     * will move it to the runQ
-					     */
-					    pq->thr->state = _PR_SUSPENDED;
-					    _PR_MISCQ_LOCK(pq->thr->cpu);
-					    _PR_ADD_SUSPENDQ(pq->thr, pq->thr->cpu);
-					    _PR_MISCQ_UNLOCK(pq->thr->cpu);
-					} else {
-						pri = pq->thr->priority;
-						pq->thr->state = _PR_RUNNABLE;
-
-						_PR_RUNQ_LOCK(cpu);
-						_PR_ADD_RUNQ(pq->thr, cpu, pri);
-						_PR_RUNQ_UNLOCK(cpu);
-						if (_pr_md_idle_cpus > 1)
-							_PR_MD_WAKEUP_WAITER(thred);
-					}
-                }
-                _PR_THREAD_UNLOCK(thred);
-                _PR_IOQ_OSFD_CNT(me->cpu) -= pq->npds;
-                PR_ASSERT(_PR_IOQ_OSFD_CNT(me->cpu) >= 0);
-            }
-        }
-    } else if (nfd == -1) {
-        PR_LOG(_pr_io_lm, PR_LOG_MAX, ("poll() failed with errno %d", errno));
-    }
-
-#else
-    if (nfd > 0) {
-        q = _PR_IOQ(me->cpu).next;
-        _PR_IOQ_MAX_OSFD(me->cpu) = -1;
-        _PR_IOQ_TIMEOUT(me->cpu) = PR_INTERVAL_NO_TIMEOUT;
-        while (q != &_PR_IOQ(me->cpu)) {
-            PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-            PRBool notify = PR_FALSE;
-            _PRUnixPollDesc *pds = pq->pds;
-            _PRUnixPollDesc *epds = pds + pq->npds;
-            PRInt32 pq_max_osfd = -1;
-
-            q = q->next;
-            for (; pds < epds; pds++) {
-                PRInt32 osfd = pds->osfd;
-                PRInt16 in_flags = pds->in_flags;
-                PRInt16 out_flags = 0;
-                PR_ASSERT(osfd >= 0 || in_flags == 0);
-                if ((in_flags & _PR_UNIX_POLL_READ) && FD_ISSET(osfd, rp)) {
-                    out_flags |= _PR_UNIX_POLL_READ;
-                }
-                if ((in_flags & _PR_UNIX_POLL_WRITE) && FD_ISSET(osfd, wp)) {
-                    out_flags |= _PR_UNIX_POLL_WRITE;
-                }
-                if ((in_flags & _PR_UNIX_POLL_EXCEPT) && FD_ISSET(osfd, ep)) {
-                    out_flags |= _PR_UNIX_POLL_EXCEPT;
-                }
-                pds->out_flags = out_flags;
-                if (out_flags) {
-                    notify = PR_TRUE;
-                }
-                if (osfd > pq_max_osfd) {
-                    pq_max_osfd = osfd;
-                }
-            }
-            if (notify == PR_TRUE) {
-                PRIntn pri;
-                PRThread *thred;
-
-                PR_REMOVE_LINK(&pq->links);
-                pq->on_ioq = PR_FALSE;
-
-                /*
-                 * Decrement the count of descriptors for each desciptor/event
-                 * because this I/O request is being removed from the
-                 * ioq
-                 */
-                pds = pq->pds;
-                for (; pds < epds; pds++) {
-                    PRInt32 osfd = pds->osfd;
-                    PRInt16 in_flags = pds->in_flags;
-                    PR_ASSERT(osfd >= 0 || in_flags == 0);
-                    if (in_flags & _PR_UNIX_POLL_READ) {
-                        if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                    }
-                    if (in_flags & _PR_UNIX_POLL_WRITE) {
-                        if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                    }
-                    if (in_flags & _PR_UNIX_POLL_EXCEPT) {
-                        if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                    }
-                }
-
-                /*
-                 * Because this thread can run on a different cpu right
-                 * after being added to the run queue, do not dereference
-                 * pq
-                 */
-                 thred = pq->thr;
-                _PR_THREAD_LOCK(thred);
-                if (pq->thr->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-                    _PRCPU *cpu = thred->cpu;
-                    _PR_SLEEPQ_LOCK(pq->thr->cpu);
-                    _PR_DEL_SLEEPQ(pq->thr, PR_TRUE);
-                    _PR_SLEEPQ_UNLOCK(pq->thr->cpu);
-
-					if (pq->thr->flags & _PR_SUSPENDING) {
-					    /*
-					     * set thread state to SUSPENDED;
-					     * a Resume operation on the thread
-					     * will move it to the runQ
-					     */
-					    pq->thr->state = _PR_SUSPENDED;
-					    _PR_MISCQ_LOCK(pq->thr->cpu);
-					    _PR_ADD_SUSPENDQ(pq->thr, pq->thr->cpu);
-					    _PR_MISCQ_UNLOCK(pq->thr->cpu);
-					} else {
-						pri = pq->thr->priority;
-						pq->thr->state = _PR_RUNNABLE;
-
-						pq->thr->cpu = cpu;
-						_PR_RUNQ_LOCK(cpu);
-						_PR_ADD_RUNQ(pq->thr, cpu, pri);
-						_PR_RUNQ_UNLOCK(cpu);
-						if (_pr_md_idle_cpus > 1)
-							_PR_MD_WAKEUP_WAITER(thred);
-					}
-                }
-                _PR_THREAD_UNLOCK(thred);
-            } else {
-                if (pq->timeout < _PR_IOQ_TIMEOUT(me->cpu))
-                    _PR_IOQ_TIMEOUT(me->cpu) = pq->timeout;
-                if (_PR_IOQ_MAX_OSFD(me->cpu) < pq_max_osfd)
-                    _PR_IOQ_MAX_OSFD(me->cpu) = pq_max_osfd;
-            }
-        }
-        if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-            if ((FD_ISSET(_pr_md_pipefd[0], rp)) && (nfd == 1)) {
-                /*
-             * woken up by another thread; read all the data
-             * in the pipe to empty the pipe
-             */
-                while ((rv =
-                    read(_pr_md_pipefd[0], _pr_md_pipebuf, PIPE_BUF))
-                    == PIPE_BUF){
-                }
-                PR_ASSERT((rv > 0) ||
-                    ((rv == -1) && (errno == EAGAIN)));
-            }
-            if (_PR_IOQ_MAX_OSFD(me->cpu) < _pr_md_pipefd[0])
-                _PR_IOQ_MAX_OSFD(me->cpu) = _pr_md_pipefd[0];
-#ifdef	IRIX
-			if ((me->cpu->id == 0) && 
-						(FD_ISSET(_pr_irix_primoridal_cpu_fd[0], rp))) {
-				if (_pr_irix_process_exit) {
-					/*
-					 * process exit due to a call to PR_ProcessExit
-					 */
-					prctl(PR_SETEXITSIG, SIGKILL);
-					_exit(_pr_irix_process_exit_code);
-				} else {
-						while ((rv = read(_pr_irix_primoridal_cpu_fd[0],
-							_pr_md_pipebuf, PIPE_BUF)) == PIPE_BUF) {
-						}
-						PR_ASSERT(rv > 0);
-				}
-			}
-			if (me->cpu->id == 0) {
-				if (_PR_IOQ_MAX_OSFD(me->cpu) < _pr_irix_primoridal_cpu_fd[0])
-					_PR_IOQ_MAX_OSFD(me->cpu) = _pr_irix_primoridal_cpu_fd[0];
-			}
-#endif
-        }
-    } else if (nfd < 0) {
-        if (errno == EBADF) {
-            FindBadFDs();
-        } else {
-            PR_LOG(_pr_io_lm, PR_LOG_MAX, ("select() failed with errno %d",
-                errno));
-        }
-    } else {
-        PR_ASSERT(nfd == 0);
-        /*
-         * compute the new value of _PR_IOQ_TIMEOUT
-         */
-        q = _PR_IOQ(me->cpu).next;
-        _PR_IOQ_MAX_OSFD(me->cpu) = -1;
-        _PR_IOQ_TIMEOUT(me->cpu) = PR_INTERVAL_NO_TIMEOUT;
-        while (q != &_PR_IOQ(me->cpu)) {
-            PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-            _PRUnixPollDesc *pds = pq->pds;
-            _PRUnixPollDesc *epds = pds + pq->npds;
-            PRInt32 pq_max_osfd = -1;
-
-            q = q->next;
-            for (; pds < epds; pds++) {
-                if (pds->osfd > pq_max_osfd) {
-                    pq_max_osfd = pds->osfd;
-                }
-            }
-            if (pq->timeout < _PR_IOQ_TIMEOUT(me->cpu))
-                _PR_IOQ_TIMEOUT(me->cpu) = pq->timeout;
-            if (_PR_IOQ_MAX_OSFD(me->cpu) < pq_max_osfd)
-                _PR_IOQ_MAX_OSFD(me->cpu) = pq_max_osfd;
-        }
-        if (_PR_IS_NATIVE_THREAD_SUPPORTED()) {
-            if (_PR_IOQ_MAX_OSFD(me->cpu) < _pr_md_pipefd[0])
-                _PR_IOQ_MAX_OSFD(me->cpu) = _pr_md_pipefd[0];
-        }
-    }
-#endif  /* _PR_USE_POLL */
-    _PR_MD_IOQ_UNLOCK();
-}
-
-void _MD_Wakeup_CPUs()
-{
-    PRInt32 rv, data;
-
-    data = 0;
-    rv = write(_pr_md_pipefd[1], &data, 1);
-
-    while ((rv < 0) && (errno == EAGAIN)) {
-        /*
-         * pipe full, read all data in pipe to empty it
-         */
-        while ((rv =
-            read(_pr_md_pipefd[0], _pr_md_pipebuf, PIPE_BUF))
-            == PIPE_BUF) {
-        }
-        PR_ASSERT((rv > 0) ||
-            ((rv == -1) && (errno == EAGAIN)));
-        rv = write(_pr_md_pipefd[1], &data, 1);
-    }
-}
-
-
-void _MD_InitCPUS()
-{
-    PRInt32 rv, flags;
-    PRThread *me = _MD_CURRENT_THREAD();
-
-    rv = pipe(_pr_md_pipefd);
-    PR_ASSERT(rv == 0);
-    _PR_IOQ_MAX_OSFD(me->cpu) = _pr_md_pipefd[0];
-#ifndef _PR_USE_POLL
-    FD_SET(_pr_md_pipefd[0], &_PR_FD_READ_SET(me->cpu));
-#endif
-
-    flags = fcntl(_pr_md_pipefd[0], F_GETFL, 0);
-    fcntl(_pr_md_pipefd[0], F_SETFL, flags | O_NONBLOCK);
-    flags = fcntl(_pr_md_pipefd[1], F_GETFL, 0);
-    fcntl(_pr_md_pipefd[1], F_SETFL, flags | O_NONBLOCK);
-}
-
-/*
-** Unix SIGALRM (clock) signal handler
-*/
-static void ClockInterruptHandler()
-{
-    int olderrno;
-    PRUintn pri;
-    _PRCPU *cpu = _PR_MD_CURRENT_CPU();
-    PRThread *me = _MD_CURRENT_THREAD();
-
-#ifdef SOLARIS
-    if (!me || _PR_IS_NATIVE_THREAD(me)) {
-        _pr_primordialCPU->u.missed[_pr_primordialCPU->where] |= _PR_MISSED_CLOCK;
-        return;
-    }
-#endif
-
-    if (_PR_MD_GET_INTSOFF() != 0) {
-        cpu->u.missed[cpu->where] |= _PR_MISSED_CLOCK;
-        return;
-    }
-    _PR_MD_SET_INTSOFF(1);
-
-    olderrno = errno;
-    _PR_ClockInterrupt();
-    errno = olderrno;
-
-    /*
-    ** If the interrupt wants a resched or if some other thread at
-    ** the same priority needs the cpu, reschedule.
-    */
-    pri = me->priority;
-    if ((cpu->u.missed[3] || (_PR_RUNQREADYMASK(me->cpu) >> pri))) {
-#ifdef _PR_NO_PREEMPT
-        cpu->resched = PR_TRUE;
-        if (pr_interruptSwitchHook) {
-            (*pr_interruptSwitchHook)(pr_interruptSwitchHookArg);
-        }
-#else /* _PR_NO_PREEMPT */
-        /*
-    ** Re-enable unix interrupts (so that we can use
-    ** setjmp/longjmp for context switching without having to
-    ** worry about the signal state)
-    */
-        sigprocmask(SIG_SETMASK, &empty_set, 0);
-        PR_LOG(_pr_sched_lm, PR_LOG_MIN, ("clock caused context switch"));
-
-        if(!(me->flags & _PR_IDLE_THREAD)) {
-            _PR_THREAD_LOCK(me);
-            me->state = _PR_RUNNABLE;
-            me->cpu = cpu;
-            _PR_RUNQ_LOCK(cpu);
-            _PR_ADD_RUNQ(me, cpu, pri);
-            _PR_RUNQ_UNLOCK(cpu);
-            _PR_THREAD_UNLOCK(me);
-        } else
-            me->state = _PR_RUNNABLE;
-        _MD_SWITCH_CONTEXT(me);
-        PR_LOG(_pr_sched_lm, PR_LOG_MIN, ("clock back from context switch"));
-#endif /* _PR_NO_PREEMPT */
-    }
-    /*
-     * Because this thread could be running on a different cpu after
-     * a context switch the current cpu should be accessed and the
-     * value of the 'cpu' variable should not be used.
-     */
-    _PR_MD_SET_INTSOFF(0);
-}
-
-/*
- * On HP-UX 9, we have to use the sigvector() interface to restart
- * interrupted system calls, because sigaction() does not have the
- * SA_RESTART flag.
- */
-
-#ifdef HPUX9
-static void HPUX9_ClockInterruptHandler(
-    int sig,
-    int code,
-    struct sigcontext *scp)
-{
-    ClockInterruptHandler();
-    scp->sc_syscall_action = SIG_RESTART;
-}
-#endif /* HPUX9 */
-
-/* # of milliseconds per clock tick that we will use */
-#define MSEC_PER_TICK    50
-
-
-void _MD_StartInterrupts()
-{
-    char *eval;
-
-    if ((eval = getenv("NSPR_NOCLOCK")) != NULL) {
-        if (atoi(eval) == 0)
-            _nspr_noclock = 0;
-        else
-            _nspr_noclock = 1;
-    }
-
-#ifndef _PR_NO_CLOCK_TIMER
-    if (!_nspr_noclock) {
-        _MD_EnableClockInterrupts();
-    }
-#endif
-}
-
-void _MD_StopInterrupts()
-{
-    sigprocmask(SIG_BLOCK, &timer_set, 0);
-}
-
-void _MD_EnableClockInterrupts()
-{
-    struct itimerval itval;
-    extern PRUintn _pr_numCPU;
-#ifdef HPUX9
-    struct sigvec vec;
-
-    vec.sv_handler = (void (*)()) HPUX9_ClockInterruptHandler;
-    vec.sv_mask = 0;
-    vec.sv_flags = 0;
-    sigvector(SIGALRM, &vec, 0);
-#else
-    struct sigaction vtact;
-
-    vtact.sa_handler = (void (*)()) ClockInterruptHandler;
-    sigemptyset(&vtact.sa_mask);
-    vtact.sa_flags = SA_RESTART;
-    sigaction(SIGALRM, &vtact, 0);
-#endif /* HPUX9 */
-
-    PR_ASSERT(_pr_numCPU == 1);
-	itval.it_interval.tv_sec = 0;
-	itval.it_interval.tv_usec = MSEC_PER_TICK * PR_USEC_PER_MSEC;
-	itval.it_value = itval.it_interval;
-	setitimer(ITIMER_REAL, &itval, 0);
-}
-
-void _MD_DisableClockInterrupts()
-{
-    struct itimerval itval;
-    extern PRUintn _pr_numCPU;
-
-    PR_ASSERT(_pr_numCPU == 1);
-	itval.it_interval.tv_sec = 0;
-	itval.it_interval.tv_usec = 0;
-	itval.it_value = itval.it_interval;
-	setitimer(ITIMER_REAL, &itval, 0);
-}
-
-void _MD_BlockClockInterrupts()
-{
-    sigprocmask(SIG_BLOCK, &timer_set, 0);
-}
-
-void _MD_UnblockClockInterrupts()
-{
-    sigprocmask(SIG_UNBLOCK, &timer_set, 0);
-}
-
-void _MD_MakeNonblock(PRFileDesc *fd)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    int flags;
-
-    if (osfd <= 2) {
-        /* Don't mess around with stdin, stdout or stderr */
-        return;
-    }
-    flags = fcntl(osfd, F_GETFL, 0);
-
-    /*
-     * Use O_NONBLOCK (POSIX-style non-blocking I/O) whenever possible.
-     * On SunOS 4, we must use FNDELAY (BSD-style non-blocking I/O),
-     * otherwise connect() still blocks and can be interrupted by SIGALRM.
-     */
-
-#ifdef SUNOS4
-    fcntl(osfd, F_SETFL, flags | FNDELAY);
-#else
-    fcntl(osfd, F_SETFL, flags | O_NONBLOCK);
-#endif
-    }
-
-PRInt32 _MD_open(const char *name, PRIntn flags, PRIntn mode)
-{
-    PRInt32 osflags;
-    PRInt32 rv, err;
-
-    if (flags & PR_RDWR) {
-        osflags = O_RDWR;
-    } else if (flags & PR_WRONLY) {
-        osflags = O_WRONLY;
-    } else {
-        osflags = O_RDONLY;
-    }
-
-    if (flags & PR_EXCL)
-        osflags |= O_EXCL;
-    if (flags & PR_APPEND)
-        osflags |= O_APPEND;
-    if (flags & PR_TRUNCATE)
-        osflags |= O_TRUNC;
-    if (flags & PR_SYNC) {
-#if defined(O_SYNC)
-        osflags |= O_SYNC;
-#elif defined(O_FSYNC)
-        osflags |= O_FSYNC;
-#else
-#error "Neither O_SYNC nor O_FSYNC is defined on this platform"
-#endif
-    }
-
-    /*
-    ** On creations we hold the 'create' lock in order to enforce
-    ** the semantics of PR_Rename. (see the latter for more details)
-    */
-    if (flags & PR_CREATE_FILE)
-    {
-        osflags |= O_CREAT;
-        if (NULL !=_pr_rename_lock)
-            PR_Lock(_pr_rename_lock);
-    }
-
-    rv = _md_iovector._open64(name, osflags, mode);
-
-    if (rv < 0) {
-        err = _MD_ERRNO();
-        _PR_MD_MAP_OPEN_ERROR(err);
-    }
-
-    if ((flags & PR_CREATE_FILE) && (NULL !=_pr_rename_lock))
-        PR_Unlock(_pr_rename_lock);
-    return rv;
-}
-
-PRIntervalTime intr_timeout_ticks;
-
-#if defined(SOLARIS) || defined(IRIX)
-static void sigsegvhandler() {
-    fprintf(stderr,"Received SIGSEGV\n");
-    fflush(stderr);
-    pause();
-}
-
-static void sigaborthandler() {
-    fprintf(stderr,"Received SIGABRT\n");
-    fflush(stderr);
-    pause();
-}
-
-static void sigbushandler() {
-    fprintf(stderr,"Received SIGBUS\n");
-    fflush(stderr);
-    pause();
-}
-#endif /* SOLARIS, IRIX */
-
-#endif  /* !defined(_PR_PTHREADS) */
-
-void _MD_query_fd_inheritable(PRFileDesc *fd)
-{
-    int flags;
-
-    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-    flags = fcntl(fd->secret->md.osfd, F_GETFD, 0);
-    PR_ASSERT(-1 != flags);
-    fd->secret->inheritable = (flags & FD_CLOEXEC) ?
-        _PR_TRI_FALSE : _PR_TRI_TRUE;
-}
-
-PROffset32 _MD_lseek(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence)
-{
-    PROffset32 rv, where;
-
-    switch (whence) {
-        case PR_SEEK_SET:
-            where = SEEK_SET;
-            break;
-        case PR_SEEK_CUR:
-            where = SEEK_CUR;
-            break;
-        case PR_SEEK_END:
-            where = SEEK_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = -1;
-            goto done;
-    }
-    rv = lseek(fd->secret->md.osfd,offset,where);
-    if (rv == -1)
-    {
-        PRInt32 syserr = _MD_ERRNO();
-        _PR_MD_MAP_LSEEK_ERROR(syserr);
-    }
-done:
-    return(rv);
-}
-
-PROffset64 _MD_lseek64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence)
-{
-    PRInt32 where;
-    PROffset64 rv;
-
-    switch (whence)
-    {
-        case PR_SEEK_SET:
-            where = SEEK_SET;
-            break;
-        case PR_SEEK_CUR:
-            where = SEEK_CUR;
-            break;
-        case PR_SEEK_END:
-            where = SEEK_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = minus_one;
-            goto done;
-    }
-    rv = _md_iovector._lseek64(fd->secret->md.osfd, offset, where);
-    if (LL_EQ(rv, minus_one))
-    {
-        PRInt32 syserr = _MD_ERRNO();
-        _PR_MD_MAP_LSEEK_ERROR(syserr);
-    }
-done:
-    return rv;
-}  /* _MD_lseek64 */
-
-/*
-** _MD_set_fileinfo_times --
-**     Set the modifyTime and creationTime of the PRFileInfo
-**     structure using the values in struct stat.
-**
-** _MD_set_fileinfo64_times --
-**     Set the modifyTime and creationTime of the PRFileInfo64
-**     structure using the values in _MDStat64.
-*/
-
-#if defined(_PR_STAT_HAS_ST_ATIM)
-/*
-** struct stat has st_atim, st_mtim, and st_ctim fields of
-** type timestruc_t.
-*/
-static void _MD_set_fileinfo_times(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtim.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtim.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctim.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctim.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-
-static void _MD_set_fileinfo64_times(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtim.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtim.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctim.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctim.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-#elif defined(_PR_STAT_HAS_ST_ATIM_UNION)
-/*
-** The st_atim, st_mtim, and st_ctim fields in struct stat are
-** unions with a st__tim union member of type timestruc_t.
-*/
-static void _MD_set_fileinfo_times(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtim.st__tim.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtim.st__tim.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctim.st__tim.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctim.st__tim.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-
-static void _MD_set_fileinfo64_times(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtim.st__tim.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtim.st__tim.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctim.st__tim.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctim.st__tim.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-#elif defined(_PR_STAT_HAS_ST_ATIMESPEC)
-/*
-** struct stat has st_atimespec, st_mtimespec, and st_ctimespec
-** fields of type struct timespec.
-*/
-#if defined(_PR_TIMESPEC_HAS_TS_SEC)
-static void _MD_set_fileinfo_times(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtimespec.ts_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtimespec.ts_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctimespec.ts_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctimespec.ts_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-
-static void _MD_set_fileinfo64_times(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtimespec.ts_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtimespec.ts_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctimespec.ts_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctimespec.ts_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-#else /* _PR_TIMESPEC_HAS_TS_SEC */
-/*
-** The POSIX timespec structure has tv_sec and tv_nsec.
-*/
-static void _MD_set_fileinfo_times(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtimespec.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtimespec.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctimespec.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctimespec.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-
-static void _MD_set_fileinfo64_times(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    PRInt64 us, s2us;
-
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(info->modifyTime, sb->st_mtimespec.tv_sec);
-    LL_MUL(info->modifyTime, info->modifyTime, s2us);
-    LL_I2L(us, sb->st_mtimespec.tv_nsec / 1000);
-    LL_ADD(info->modifyTime, info->modifyTime, us);
-    LL_I2L(info->creationTime, sb->st_ctimespec.tv_sec);
-    LL_MUL(info->creationTime, info->creationTime, s2us);
-    LL_I2L(us, sb->st_ctimespec.tv_nsec / 1000);
-    LL_ADD(info->creationTime, info->creationTime, us);
-}
-#endif /* _PR_TIMESPEC_HAS_TS_SEC */
-#elif defined(_PR_STAT_HAS_ONLY_ST_ATIME)
-/*
-** struct stat only has st_atime, st_mtime, and st_ctime fields
-** of type time_t.
-*/
-static void _MD_set_fileinfo_times(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    PRInt64 s, s2us;
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, sb->st_mtime);
-    LL_MUL(s, s, s2us);
-    info->modifyTime = s;
-    LL_I2L(s, sb->st_ctime);
-    LL_MUL(s, s, s2us);
-    info->creationTime = s;
-}
-
-static void _MD_set_fileinfo64_times(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    PRInt64 s, s2us;
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, sb->st_mtime);
-    LL_MUL(s, s, s2us);
-    info->modifyTime = s;
-    LL_I2L(s, sb->st_ctime);
-    LL_MUL(s, s, s2us);
-    info->creationTime = s;
-}
-#else
-#error "I don't know yet"
-#endif
-
-static int _MD_convert_stat_to_fileinfo(
-    const struct stat *sb,
-    PRFileInfo *info)
-{
-    if (S_IFREG & sb->st_mode)
-        info->type = PR_FILE_FILE;
-    else if (S_IFDIR & sb->st_mode)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_OTHER;
-
-#if defined(_PR_HAVE_LARGE_OFF_T)
-    if (0x7fffffffL < sb->st_size)
-    {
-        PR_SetError(PR_FILE_TOO_BIG_ERROR, 0);
-        return -1;
-    }
-#endif /* defined(_PR_HAVE_LARGE_OFF_T) */
-    info->size = sb->st_size;
-
-    _MD_set_fileinfo_times(sb, info);
-    return 0;
-}  /* _MD_convert_stat_to_fileinfo */
-
-static int _MD_convert_stat64_to_fileinfo64(
-    const _MDStat64 *sb,
-    PRFileInfo64 *info)
-{
-    if (S_IFREG & sb->st_mode)
-        info->type = PR_FILE_FILE;
-    else if (S_IFDIR & sb->st_mode)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_OTHER;
-
-    LL_I2L(info->size, sb->st_size);
-
-    _MD_set_fileinfo64_times(sb, info);
-    return 0;
-}  /* _MD_convert_stat64_to_fileinfo64 */
-
-PRInt32 _MD_getfileinfo(const char *fn, PRFileInfo *info)
-{
-    PRInt32 rv;
-    struct stat sb;
-
-    rv = stat(fn, &sb);
-    if (rv < 0)
-        _PR_MD_MAP_STAT_ERROR(_MD_ERRNO());
-    else if (NULL != info)
-        rv = _MD_convert_stat_to_fileinfo(&sb, info);
-    return rv;
-}
-
-PRInt32 _MD_getfileinfo64(const char *fn, PRFileInfo64 *info)
-{
-    _MDStat64 sb;
-    PRInt32 rv = _md_iovector._stat64(fn, &sb);
-    if (rv < 0)
-        _PR_MD_MAP_STAT_ERROR(_MD_ERRNO());
-    else if (NULL != info)
-        rv = _MD_convert_stat64_to_fileinfo64(&sb, info);
-    return rv;
-}
-
-PRInt32 _MD_getopenfileinfo(const PRFileDesc *fd, PRFileInfo *info)
-{
-    struct stat sb;
-    PRInt32 rv = fstat(fd->secret->md.osfd, &sb);
-    if (rv < 0)
-        _PR_MD_MAP_FSTAT_ERROR(_MD_ERRNO());
-    else if (NULL != info)
-        rv = _MD_convert_stat_to_fileinfo(&sb, info);
-    return rv;
-}
-
-PRInt32 _MD_getopenfileinfo64(const PRFileDesc *fd, PRFileInfo64 *info)
-{
-    _MDStat64 sb;
-    PRInt32 rv = _md_iovector._fstat64(fd->secret->md.osfd, &sb);
-    if (rv < 0)
-        _PR_MD_MAP_FSTAT_ERROR(_MD_ERRNO());
-    else if (NULL != info)
-        rv = _MD_convert_stat64_to_fileinfo64(&sb, info);
-    return rv;
-}
-
-struct _MD_IOVector _md_iovector = { open };
-
-/*
-** These implementations are to emulate large file routines on systems that
-** don't have them. Their goal is to check in case overflow occurs. Otherwise
-** they will just operate as normal using 32-bit file routines.
-**
-** The checking might be pre- or post-op, depending on the semantics.
-*/
-
-#if defined(SOLARIS2_5)
-
-static PRIntn _MD_solaris25_fstat64(PRIntn osfd, _MDStat64 *buf)
-{
-    PRInt32 rv;
-    struct stat sb;
-
-    rv = fstat(osfd, &sb);
-    if (rv >= 0)
-    {
-        /*
-        ** I'm only copying the fields that are immediately needed.
-        ** If somebody else calls this function, some of the fields
-        ** may not be defined.
-        */
-        (void)memset(buf, 0, sizeof(_MDStat64));
-        buf->st_mode = sb.st_mode;
-        buf->st_ctim = sb.st_ctim;
-        buf->st_mtim = sb.st_mtim;
-        buf->st_size = sb.st_size;
-    }
-    return rv;
-}  /* _MD_solaris25_fstat64 */
-
-static PRIntn _MD_solaris25_stat64(const char *fn, _MDStat64 *buf)
-{
-    PRInt32 rv;
-    struct stat sb;
-
-    rv = stat(fn, &sb);
-    if (rv >= 0)
-    {
-        /*
-        ** I'm only copying the fields that are immediately needed.
-        ** If somebody else calls this function, some of the fields
-        ** may not be defined.
-        */
-        (void)memset(buf, 0, sizeof(_MDStat64));
-        buf->st_mode = sb.st_mode;
-        buf->st_ctim = sb.st_ctim;
-        buf->st_mtim = sb.st_mtim;
-        buf->st_size = sb.st_size;
-    }
-    return rv;
-}  /* _MD_solaris25_stat64 */
-#endif /* defined(SOLARIS2_5) */
-
-#if defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5)
-
-static PROffset64 _MD_Unix_lseek64(PRIntn osfd, PROffset64 offset, PRIntn whence)
-{
-    PRUint64 maxoff;
-    PROffset64 rv = minus_one;
-    LL_I2L(maxoff, 0x7fffffff);
-    if (LL_CMP(offset, <=, maxoff))
-    {
-        off_t off;
-        LL_L2I(off, offset);
-        LL_I2L(rv, lseek(osfd, off, whence));
-    }
-    else errno = EFBIG;  /* we can't go there */
-    return rv;
-}  /* _MD_Unix_lseek64 */
-
-static void* _MD_Unix_mmap64(
-    void *addr, PRSize len, PRIntn prot, PRIntn flags,
-    PRIntn fildes, PRInt64 offset)
-{
-    PR_SetError(PR_FILE_TOO_BIG_ERROR, 0);
-    return NULL;
-}  /* _MD_Unix_mmap64 */
-#endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */
-
-#if defined(OSF1) && defined(__GNUC__)
-
-/*
- * On OSF1 V5.0A, <sys/stat.h> defines stat and fstat as
- * macros when compiled under gcc, so it is rather tricky to
- * take the addresses of the real functions the macros expend
- * to.  A simple solution is to define forwarder functions
- * and take the addresses of the forwarder functions instead.
- */
-
-static int stat_forwarder(const char *path, struct stat *buffer)
-{
-    return stat(path, buffer);
-}
-
-static int fstat_forwarder(int filedes, struct stat *buffer)
-{
-    return fstat(filedes, buffer);
-}
-
-#endif
-
-static void _PR_InitIOV(void)
-{
-#if defined(SOLARIS2_5)
-    PRLibrary *lib;
-    void *open64_func;
-
-    open64_func = PR_FindSymbolAndLibrary("open64", &lib);
-    if (NULL != open64_func)
-    {
-        PR_ASSERT(NULL != lib);
-        _md_iovector._open64 = (_MD_Open64)open64_func;
-        _md_iovector._mmap64 = (_MD_Mmap64)PR_FindSymbol(lib, "mmap64");
-        _md_iovector._fstat64 = (_MD_Fstat64)PR_FindSymbol(lib, "fstat64");
-        _md_iovector._stat64 = (_MD_Stat64)PR_FindSymbol(lib, "stat64");
-        _md_iovector._lseek64 = (_MD_Lseek64)PR_FindSymbol(lib, "lseek64");
-        (void)PR_UnloadLibrary(lib);
-    }
-    else
-    {
-        _md_iovector._open64 = open;
-        _md_iovector._mmap64 = _MD_Unix_mmap64;
-        _md_iovector._fstat64 = _MD_solaris25_fstat64;
-        _md_iovector._stat64 = _MD_solaris25_stat64;
-        _md_iovector._lseek64 = _MD_Unix_lseek64;
-    }
-#elif defined(_PR_NO_LARGE_FILES)
-    _md_iovector._open64 = open;
-    _md_iovector._mmap64 = _MD_Unix_mmap64;
-    _md_iovector._fstat64 = fstat;
-    _md_iovector._stat64 = stat;
-    _md_iovector._lseek64 = _MD_Unix_lseek64;
-#elif defined(_PR_HAVE_OFF64_T)
-#if defined(IRIX5_3)
-    _md_iovector._open64 = open;
-#else
-    _md_iovector._open64 = open64;
-#endif
-    _md_iovector._mmap64 = mmap64;
-    _md_iovector._fstat64 = fstat64;
-    _md_iovector._stat64 = stat64;
-    _md_iovector._lseek64 = lseek64;
-#elif defined(_PR_HAVE_LARGE_OFF_T)
-    _md_iovector._open64 = open;
-    _md_iovector._mmap64 = mmap;
-#if defined(OSF1) && defined(__GNUC__)
-    _md_iovector._fstat64 = fstat_forwarder;
-    _md_iovector._stat64 = stat_forwarder;
-#else
-    _md_iovector._fstat64 = fstat;
-    _md_iovector._stat64 = stat;
-#endif
-    _md_iovector._lseek64 = lseek;
-#else
-#error "I don't know yet"
-#endif
-    LL_I2L(minus_one, -1);
-}  /* _PR_InitIOV */
-
-void _PR_UnixInit(void)
-{
-    struct sigaction sigact;
-    int rv;
-
-    sigemptyset(&timer_set);
-
-#if !defined(_PR_PTHREADS)
-
-    sigaddset(&timer_set, SIGALRM);
-    sigemptyset(&empty_set);
-    intr_timeout_ticks =
-            PR_SecondsToInterval(_PR_INTERRUPT_CHECK_INTERVAL_SECS);
-
-#if defined(SOLARIS) || defined(IRIX)
-
-    if (getenv("NSPR_SIGSEGV_HANDLE")) {
-        sigact.sa_handler = sigsegvhandler;
-        sigact.sa_flags = 0;
-        sigact.sa_mask = timer_set;
-        sigaction(SIGSEGV, &sigact, 0);
-    }
-
-    if (getenv("NSPR_SIGABRT_HANDLE")) {
-        sigact.sa_handler = sigaborthandler;
-        sigact.sa_flags = 0;
-        sigact.sa_mask = timer_set;
-        sigaction(SIGABRT, &sigact, 0);
-    }
-
-    if (getenv("NSPR_SIGBUS_HANDLE")) {
-        sigact.sa_handler = sigbushandler;
-        sigact.sa_flags = 0;
-        sigact.sa_mask = timer_set;
-        sigaction(SIGBUS, &sigact, 0);
-    }
-
-#endif
-#endif  /* !defined(_PR_PTHREADS) */
-
-    /*
-     * Under HP-UX DCE threads, sigaction() installs a per-thread
-     * handler, so we use sigvector() to install a process-wide
-     * handler.
-     */
-#if defined(HPUX) && defined(_PR_DCETHREADS)
-    {
-        struct sigvec vec;
-
-        vec.sv_handler = SIG_IGN;
-        vec.sv_mask = 0;
-        vec.sv_flags = 0;
-        rv = sigvector(SIGPIPE, &vec, NULL);
-        PR_ASSERT(0 == rv);
-    }
-#else
-    sigact.sa_handler = SIG_IGN;
-    sigemptyset(&sigact.sa_mask);
-    sigact.sa_flags = 0;
-    rv = sigaction(SIGPIPE, &sigact, 0);
-    PR_ASSERT(0 == rv);
-#endif /* HPUX && _PR_DCETHREADS */
-
-    _pr_rename_lock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_rename_lock);
-    _pr_Xfe_mon = PR_NewMonitor();
-    PR_ASSERT(NULL != _pr_Xfe_mon);
-
-    _PR_InitIOV();  /* one last hack */
-}
-
-#if !defined(_PR_PTHREADS)
-
-/*
- * Variables used by the GC code, initialized in _MD_InitSegs().
- */
-static PRInt32 _pr_zero_fd = -1;
-static PRLock *_pr_md_lock = NULL;
-
-/*
- * _MD_InitSegs --
- *
- * This is Unix's version of _PR_MD_INIT_SEGS(), which is
- * called by _PR_InitSegs(), which in turn is called by
- * PR_Init().
- */
-void _MD_InitSegs(void)
-{
-#ifdef DEBUG
-    /*
-    ** Disable using mmap(2) if NSPR_NO_MMAP is set
-    */
-    if (getenv("NSPR_NO_MMAP")) {
-        _pr_zero_fd = -2;
-        return;
-    }
-#endif
-    _pr_zero_fd = open("/dev/zero",O_RDWR , 0);
-    /* Prevent the fd from being inherited by child processes */
-    fcntl(_pr_zero_fd, F_SETFD, FD_CLOEXEC);
-    _pr_md_lock = PR_NewLock();
-}
-
-PRStatus _MD_AllocSegment(PRSegment *seg, PRUint32 size, void *vaddr)
-{
-    static char *lastaddr = (char*) _PR_STACK_VMBASE;
-    PRStatus retval = PR_SUCCESS;
-    int prot;
-    void *rv;
-
-    PR_ASSERT(seg != 0);
-    PR_ASSERT(size != 0);
-
-    PR_Lock(_pr_md_lock);
-    if (_pr_zero_fd < 0) {
-from_heap:
-        seg->vaddr = PR_MALLOC(size);
-        if (!seg->vaddr) {
-            retval = PR_FAILURE;
-        }
-        else {
-            seg->size = size;
-        }
-        goto exit;
-    }
-
-    prot = PROT_READ|PROT_WRITE;
-    /*
-     * On Alpha Linux, the user-level thread stack needs
-     * to be made executable because longjmp/signal seem
-     * to put machine instructions on the stack.
-     */
-#if defined(LINUX) && defined(__alpha)
-    prot |= PROT_EXEC;
-#endif
-    rv = mmap((vaddr != 0) ? vaddr : lastaddr, size, prot,
-        _MD_MMAP_FLAGS,
-        _pr_zero_fd, 0);
-    if (rv == (void*)-1) {
-        goto from_heap;
-    }
-    lastaddr += size;
-    seg->vaddr = rv;
-    seg->size = size;
-    seg->flags = _PR_SEG_VM;
-
-exit:
-    PR_Unlock(_pr_md_lock);
-    return retval;
-}
-
-void _MD_FreeSegment(PRSegment *seg)
-{
-    if (seg->flags & _PR_SEG_VM)
-        (void) munmap(seg->vaddr, seg->size);
-    else
-        PR_DELETE(seg->vaddr);
-}
-
-#endif /* _PR_PTHREADS */
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the Unix
- *     implementation.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTime)
-PR_Now(void)
-{
-    struct timeval tv;
-    PRInt64 s, us, s2us;
-
-    GETTIMEOFDAY(&tv);
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, tv.tv_sec);
-    LL_I2L(us, tv.tv_usec);
-    LL_MUL(s, s, s2us);
-    LL_ADD(s, s, us);
-    return s;
-}
-
-PRIntervalTime _PR_UNIX_GetInterval()
-{
-    struct timeval time;
-    PRIntervalTime ticks;
-
-    (void)GETTIMEOFDAY(&time);  /* fallicy of course */
-    ticks = (PRUint32)time.tv_sec * PR_MSEC_PER_SEC;  /* that's in milliseconds */
-    ticks += (PRUint32)time.tv_usec / PR_USEC_PER_MSEC;  /* so's that */
-    return ticks;
-}  /* _PR_SUNOS_GetInterval */
-
-PRIntervalTime _PR_UNIX_TicksPerSecond()
-{
-    return 1000;  /* this needs some work :) */
-}
-
-#if !defined(_PR_PTHREADS)
-/*
- * Wait for I/O on multiple descriptors.
- *
- * Return 0 if timed out, return -1 if interrupted,
- * else return the number of ready descriptors.
- */
-PRInt32 _PR_WaitForMultipleFDs(
-    _PRUnixPollDesc *unixpds,
-    PRInt32 pdcnt,
-    PRIntervalTime timeout)
-{
-    PRPollQueue pq;
-    PRIntn is;
-    PRInt32 rv;
-    _PRCPU *io_cpu;
-    _PRUnixPollDesc *unixpd, *eunixpd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
-
-    if (_PR_PENDING_INTERRUPT(me)) {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        return -1;
-    }
-
-    pq.pds = unixpds;
-    pq.npds = pdcnt;
-
-    _PR_INTSOFF(is);
-    _PR_MD_IOQ_LOCK();
-    _PR_THREAD_LOCK(me);
-
-    pq.thr = me;
-    io_cpu = me->cpu;
-    pq.on_ioq = PR_TRUE;
-    pq.timeout = timeout;
-    _PR_ADD_TO_IOQ(pq, me->cpu);
-
-#if !defined(_PR_USE_POLL)
-    eunixpd = unixpds + pdcnt;
-    for (unixpd = unixpds; unixpd < eunixpd; unixpd++) {
-        PRInt32 osfd = unixpd->osfd;
-        if (unixpd->in_flags & _PR_UNIX_POLL_READ) {
-            FD_SET(osfd, &_PR_FD_READ_SET(me->cpu));
-            _PR_FD_READ_CNT(me->cpu)[osfd]++;
-        }
-        if (unixpd->in_flags & _PR_UNIX_POLL_WRITE) {
-            FD_SET(osfd, &_PR_FD_WRITE_SET(me->cpu));
-            (_PR_FD_WRITE_CNT(me->cpu))[osfd]++;
-        }
-        if (unixpd->in_flags & _PR_UNIX_POLL_EXCEPT) {
-            FD_SET(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-            (_PR_FD_EXCEPTION_CNT(me->cpu))[osfd]++;
-        }
-        if (osfd > _PR_IOQ_MAX_OSFD(me->cpu)) {
-            _PR_IOQ_MAX_OSFD(me->cpu) = osfd;
-        }
-    }
-#endif  /* !defined(_PR_USE_POLL) */
-
-    if (_PR_IOQ_TIMEOUT(me->cpu) > timeout) {
-        _PR_IOQ_TIMEOUT(me->cpu) = timeout;
-    }
-
-    _PR_IOQ_OSFD_CNT(me->cpu) += pdcnt;
-        
-    _PR_SLEEPQ_LOCK(me->cpu);
-    _PR_ADD_SLEEPQ(me, timeout);
-    me->state = _PR_IO_WAIT;
-    me->io_pending = PR_TRUE;
-    me->io_suspended = PR_FALSE;
-    _PR_SLEEPQ_UNLOCK(me->cpu);
-    _PR_THREAD_UNLOCK(me);
-    _PR_MD_IOQ_UNLOCK();
-
-    _PR_MD_WAIT(me, timeout);
-
-    me->io_pending = PR_FALSE;
-    me->io_suspended = PR_FALSE;
-
-    /*
-     * This thread should run on the same cpu on which it was blocked; when 
-     * the IO request times out the fd sets and fd counts for the
-     * cpu are updated below.
-     */
-    PR_ASSERT(me->cpu == io_cpu);
-
-    /*
-    ** If we timed out the pollq might still be on the ioq. Remove it
-    ** before continuing.
-    */
-    if (pq.on_ioq) {
-        _PR_MD_IOQ_LOCK();
-        /*
-         * Need to check pq.on_ioq again
-         */
-        if (pq.on_ioq) {
-            PR_REMOVE_LINK(&pq.links);
-#ifndef _PR_USE_POLL
-            eunixpd = unixpds + pdcnt;
-            for (unixpd = unixpds; unixpd < eunixpd; unixpd++) {
-                PRInt32 osfd = unixpd->osfd;
-                PRInt16 in_flags = unixpd->in_flags;
-
-                if (in_flags & _PR_UNIX_POLL_READ) {
-                    if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                }
-                if (in_flags & _PR_UNIX_POLL_WRITE) {
-                    if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                }
-                if (in_flags & _PR_UNIX_POLL_EXCEPT) {
-                    if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                }
-            }
-#endif  /* _PR_USE_POLL */
-            PR_ASSERT(pq.npds == pdcnt);
-            _PR_IOQ_OSFD_CNT(me->cpu) -= pdcnt;
-            PR_ASSERT(_PR_IOQ_OSFD_CNT(me->cpu) >= 0);
-        }
-        _PR_MD_IOQ_UNLOCK();
-    }
-    /* XXX Should we use _PR_FAST_INTSON or _PR_INTSON? */
-    if (1 == pdcnt) {
-        _PR_FAST_INTSON(is);
-    } else {
-        _PR_INTSON(is);
-    }
-
-    if (_PR_PENDING_INTERRUPT(me)) {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        return -1;
-    }
-
-    rv = 0;
-    if (pq.on_ioq == PR_FALSE) {
-        /* Count the number of ready descriptors */
-        while (--pdcnt >= 0) {
-            if (unixpds->out_flags != 0) {
-                rv++;
-            }
-            unixpds++;
-        }
-    }
-
-    return rv;
-}
-
-/*
- * Unblock threads waiting for I/O
- *    used when interrupting threads
- *
- * NOTE: The thread lock should held when this function is called.
- * On return, the thread lock is released.
- */
-void _PR_Unblock_IO_Wait(PRThread *thr)
-{
-    int pri = thr->priority;
-    _PRCPU *cpu = thr->cpu;
- 
-    /*
-     * GLOBAL threads wakeup periodically to check for interrupt
-     */
-    if (_PR_IS_NATIVE_THREAD(thr)) {
-        _PR_THREAD_UNLOCK(thr); 
-        return;
-    }
-
-    PR_ASSERT(thr->flags & (_PR_ON_SLEEPQ | _PR_ON_PAUSEQ));
-    _PR_SLEEPQ_LOCK(cpu);
-    _PR_DEL_SLEEPQ(thr, PR_TRUE);
-    _PR_SLEEPQ_UNLOCK(cpu);
-
-    PR_ASSERT(!(thr->flags & _PR_IDLE_THREAD));
-    thr->state = _PR_RUNNABLE;
-    _PR_RUNQ_LOCK(cpu);
-    _PR_ADD_RUNQ(thr, cpu, pri);
-    _PR_RUNQ_UNLOCK(cpu);
-    _PR_THREAD_UNLOCK(thr);
-    _PR_MD_WAKEUP_WAITER(thr);
-}
-#endif  /* !defined(_PR_PTHREADS) */
-
-/*
- * When a nonblocking connect has completed, determine whether it
- * succeeded or failed, and if it failed, what the error code is.
- *
- * The function returns the error code.  An error code of 0 means
- * that the nonblocking connect succeeded.
- */
-
-int _MD_unix_get_nonblocking_connect_error(int osfd)
-{
-#if defined(NTO)
-    /* Neutrino does not support the SO_ERROR socket option */
-    PRInt32      rv;
-    PRNetAddr    addr;
-    _PRSockLen_t addrlen = sizeof(addr);
-
-    /* Test to see if we are using the Tiny TCP/IP Stack or the Full one. */
-    struct statvfs superblock;
-    rv = fstatvfs(osfd, &superblock);
-    if (rv == 0) {
-        if (strcmp(superblock.f_basetype, "ttcpip") == 0) {
-            /* Using the Tiny Stack! */
-            rv = getpeername(osfd, (struct sockaddr *) &addr,
-                    (_PRSockLen_t *) &addrlen);
-            if (rv == -1) {
-                int errno_copy = errno;    /* make a copy so I don't
-                                            * accidentally reset */
-
-                if (errno_copy == ENOTCONN) {
-                    struct stat StatInfo;
-                    rv = fstat(osfd, &StatInfo);
-                    if (rv == 0) {
-                        time_t current_time = time(NULL);
-
-                        /*
-                         * this is a real hack, can't explain why it
-                         * works it just does
-                         */
-                        if (abs(current_time - StatInfo.st_atime) < 5) {
-                            return ECONNREFUSED;
-                        } else {
-                            return ETIMEDOUT;
-                        }
-                    } else {
-                        return ECONNREFUSED;
-                    }
-                } else {
-                    return errno_copy;
-                }
-            } else {
-                /* No Error */
-                return 0;
-            }
-        } else {
-            /* Have the FULL Stack which supports SO_ERROR */
-            /* Hasn't been written yet, never been tested! */
-            /* Jerry.Kirk@Nexwarecorp.com */
-
-            int err;
-            _PRSockLen_t optlen = sizeof(err);
-
-            if (getsockopt(osfd, SOL_SOCKET, SO_ERROR,
-                    (char *) &err, &optlen) == -1) {
-                return errno;
-            } else {
-                return err;
-            }		
-        }
-    } else {
-        return ECONNREFUSED;
-    }	
-#elif defined(NCR) || defined(UNIXWARE) || defined(SNI) || defined(NEC)
-    /*
-     * getsockopt() fails with EPIPE, so use getmsg() instead.
-     */
-
-    int rv;
-    int flags = 0;
-    rv = getmsg(osfd, NULL, NULL, &flags);
-    PR_ASSERT(-1 == rv || 0 == rv);
-    if (-1 == rv && errno != EAGAIN && errno != EWOULDBLOCK) {
-        return errno;
-    }
-    return 0;  /* no error */
-#else
-    int err;
-    _PRSockLen_t optlen = sizeof(err);
-    if (getsockopt(osfd, SOL_SOCKET, SO_ERROR, (char *) &err, &optlen) == -1) {
-        return errno;
-    } else {
-        return err;
-    }
-#endif
-}
-
-/************************************************************************/
-
-/*
-** Special hacks for xlib. Xlib/Xt/Xm is not re-entrant nor is it thread
-** safe.  Unfortunately, neither is mozilla. To make these programs work
-** in a pre-emptive threaded environment, we need to use a lock.
-*/
-
-void PR_XLock(void)
-{
-    PR_EnterMonitor(_pr_Xfe_mon);
-}
-
-void PR_XUnlock(void)
-{
-    PR_ExitMonitor(_pr_Xfe_mon);
-}
-
-PRBool PR_XIsLocked(void)
-{
-    return (PR_InMonitor(_pr_Xfe_mon)) ? PR_TRUE : PR_FALSE;
-}
-
-void PR_XWait(int ms)
-{
-    PR_Wait(_pr_Xfe_mon, PR_MillisecondsToInterval(ms));
-}
-
-void PR_XNotify(void)
-{
-    PR_Notify(_pr_Xfe_mon);
-}
-
-void PR_XNotifyAll(void)
-{
-    PR_NotifyAll(_pr_Xfe_mon);
-}
-
-#if defined(HAVE_FCNTL_FILE_LOCKING)
-
-PRStatus
-_MD_LockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    struct flock arg;
-
-    arg.l_type = F_WRLCK;
-    arg.l_whence = SEEK_SET;
-    arg.l_start = 0;
-    arg.l_len = 0;  /* until EOF */
-    rv = fcntl(f, F_SETLKW, &arg);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_TLockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    struct flock arg;
-
-    arg.l_type = F_WRLCK;
-    arg.l_whence = SEEK_SET;
-    arg.l_start = 0;
-    arg.l_len = 0;  /* until EOF */
-    rv = fcntl(f, F_SETLK, &arg);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_UnlockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    struct flock arg;
-
-    arg.l_type = F_UNLCK;
-    arg.l_whence = SEEK_SET;
-    arg.l_start = 0;
-    arg.l_len = 0;  /* until EOF */
-    rv = fcntl(f, F_SETLK, &arg);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-#elif defined(HAVE_BSD_FLOCK)
-
-#include <sys/file.h>
-
-PRStatus
-_MD_LockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = flock(f, LOCK_EX);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_TLockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = flock(f, LOCK_EX|LOCK_NB);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_UnlockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = flock(f, LOCK_UN);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_FLOCK_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-#else
-
-PRStatus
-_MD_LockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = lockf(f, F_LOCK, 0);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_TLockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = lockf(f, F_TLOCK, 0);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus
-_MD_UnlockFile(PRInt32 f)
-{
-    PRInt32 rv;
-    rv = lockf(f, F_ULOCK, 0);
-    if (rv == 0)
-        return PR_SUCCESS;
-    _PR_MD_MAP_LOCKF_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-#endif
-
-PRStatus _MD_gethostname(char *name, PRUint32 namelen)
-{
-    PRIntn rv;
-
-    rv = gethostname(name, namelen);
-    if (0 == rv) {
-        return PR_SUCCESS;
-    }
-    _PR_MD_MAP_GETHOSTNAME_ERROR(_MD_ERRNO());
-    return PR_FAILURE;
-}
-
-PRStatus _MD_getsysinfo(PRSysInfo cmd, char *name, PRUint32 namelen)
-{
-	struct utsname info;
-
-	PR_ASSERT((cmd == PR_SI_SYSNAME) || (cmd == PR_SI_RELEASE));
-
-	if (uname(&info) == -1) {
-		_PR_MD_MAP_DEFAULT_ERROR(errno);
-    	return PR_FAILURE;
-	}
-	if (PR_SI_SYSNAME == cmd)
-		(void)PR_snprintf(name, namelen, info.sysname);
-	else if (PR_SI_RELEASE == cmd)
-		(void)PR_snprintf(name, namelen, info.release);
-	else
-		return PR_FAILURE;
-    return PR_SUCCESS;
-}
-
-/*
- *******************************************************************
- *
- * Memory-mapped files
- *
- *******************************************************************
- */
-
-PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size)
-{
-    PRFileInfo info;
-    PRUint32 sz;
-
-    LL_L2UI(sz, size);
-    if (sz) {
-        if (PR_GetOpenFileInfo(fmap->fd, &info) == PR_FAILURE) {
-            return PR_FAILURE;
-        }
-        if (sz > info.size) {
-            /*
-             * Need to extend the file
-             */
-            if (fmap->prot != PR_PROT_READWRITE) {
-                PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, 0);
-                return PR_FAILURE;
-            }
-            if (PR_Seek(fmap->fd, sz - 1, PR_SEEK_SET) == -1) {
-                return PR_FAILURE;
-            }
-            if (PR_Write(fmap->fd, "", 1) != 1) {
-                return PR_FAILURE;
-            }
-        }
-    }
-    if (fmap->prot == PR_PROT_READONLY) {
-        fmap->md.prot = PROT_READ;
-#ifdef OSF1V4_MAP_PRIVATE_BUG
-        /*
-         * Use MAP_SHARED to work around a bug in OSF1 V4.0D
-         * (QAR 70220 in the OSF_QAR database) that results in
-         * corrupted data in the memory-mapped region.  This
-         * bug is fixed in V5.0.
-         */
-        fmap->md.flags = MAP_SHARED;
-#else
-        fmap->md.flags = MAP_PRIVATE;
-#endif
-    } else if (fmap->prot == PR_PROT_READWRITE) {
-        fmap->md.prot = PROT_READ | PROT_WRITE;
-        fmap->md.flags = MAP_SHARED;
-    } else {
-        PR_ASSERT(fmap->prot == PR_PROT_WRITECOPY);
-        fmap->md.prot = PROT_READ | PROT_WRITE;
-        fmap->md.flags = MAP_PRIVATE;
-    }
-    return PR_SUCCESS;
-}
-
-void * _MD_MemMap(
-    PRFileMap *fmap,
-    PRInt64 offset,
-    PRUint32 len)
-{
-    PRInt32 off;
-    void *addr;
-
-    LL_L2I(off, offset);
-    if ((addr = mmap(0, len, fmap->md.prot, fmap->md.flags,
-        fmap->fd->secret->md.osfd, off)) == (void *) -1) {
-            _PR_MD_MAP_MMAP_ERROR(_MD_ERRNO());
-        addr = NULL;
-    }
-    return addr;
-}
-
-PRStatus _MD_MemUnmap(void *addr, PRUint32 len)
-{
-    if (munmap(addr, len) == 0) {
-        return PR_SUCCESS;
-    } else {
-    if (errno == EINVAL) {
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, errno);
-    } else {
-        PR_SetError(PR_UNKNOWN_ERROR, errno);
-    }
-        return PR_FAILURE;
-    }
-}
-
-PRStatus _MD_CloseFileMap(PRFileMap *fmap)
-{
-    if ( PR_TRUE == fmap->md.isAnonFM ) {
-        PRStatus rc = PR_Close( fmap->fd );
-        if ( PR_FAILURE == rc ) {
-            PR_LOG( _pr_io_lm, PR_LOG_DEBUG,
-                ("_MD_CloseFileMap(): error closing anonymnous file map osfd"));
-            return PR_FAILURE;
-        }
-    }
-    PR_DELETE(fmap);
-    return PR_SUCCESS;
-}
-
-#if defined(_PR_NEED_FAKE_POLL)
-
-/*
- * Some platforms don't have poll().  For easier porting of code
- * that calls poll(), we emulate poll() using select().
- */
-
-int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
-{
-    int i;
-    int rv;
-    int maxfd;
-    fd_set rd, wr, ex;
-    struct timeval tv, *tvp;
-
-    if (timeout < 0 && timeout != -1) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (timeout == -1) {
-        tvp = NULL;
-    } else {
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
-        tvp = &tv;
-    }
-
-    maxfd = -1;
-    FD_ZERO(&rd);
-    FD_ZERO(&wr);
-    FD_ZERO(&ex);
-
-    for (i = 0; i < nfds; i++) {
-        int osfd = filedes[i].fd;
-        int events = filedes[i].events;
-        PRBool fdHasEvent = PR_FALSE;
-
-        if (osfd < 0) {
-            continue;  /* Skip this osfd. */
-        }
-
-        /*
-         * Map the poll events to the select fd_sets.
-         *     POLLIN, POLLRDNORM  ===> readable
-         *     POLLOUT, POLLWRNORM ===> writable
-         *     POLLPRI, POLLRDBAND ===> exception
-         *     POLLNORM, POLLWRBAND (and POLLMSG on some platforms)
-         *     are ignored.
-         *
-         * The output events POLLERR and POLLHUP are never turned on.
-         * POLLNVAL may be turned on.
-         */
-
-        if (events & (POLLIN | POLLRDNORM)) {
-            FD_SET(osfd, &rd);
-            fdHasEvent = PR_TRUE;
-        }
-        if (events & (POLLOUT | POLLWRNORM)) {
-            FD_SET(osfd, &wr);
-            fdHasEvent = PR_TRUE;
-        }
-        if (events & (POLLPRI | POLLRDBAND)) {
-            FD_SET(osfd, &ex);
-            fdHasEvent = PR_TRUE;
-        }
-        if (fdHasEvent && osfd > maxfd) {
-            maxfd = osfd;
-        }
-    }
-
-    rv = select(maxfd + 1, &rd, &wr, &ex, tvp);
-
-    /* Compute poll results */
-    if (rv > 0) {
-        rv = 0;
-        for (i = 0; i < nfds; i++) {
-            PRBool fdHasEvent = PR_FALSE;
-
-            filedes[i].revents = 0;
-            if (filedes[i].fd < 0) {
-                continue;
-            }
-            if (FD_ISSET(filedes[i].fd, &rd)) {
-                if (filedes[i].events & POLLIN) {
-                    filedes[i].revents |= POLLIN;
-                }
-                if (filedes[i].events & POLLRDNORM) {
-                    filedes[i].revents |= POLLRDNORM;
-                }
-                fdHasEvent = PR_TRUE;
-            }
-            if (FD_ISSET(filedes[i].fd, &wr)) {
-                if (filedes[i].events & POLLOUT) {
-                    filedes[i].revents |= POLLOUT;
-                }
-                if (filedes[i].events & POLLWRNORM) {
-                    filedes[i].revents |= POLLWRNORM;
-                }
-                fdHasEvent = PR_TRUE;
-            }
-            if (FD_ISSET(filedes[i].fd, &ex)) {
-                if (filedes[i].events & POLLPRI) {
-                    filedes[i].revents |= POLLPRI;
-                }
-                if (filedes[i].events & POLLRDBAND) {
-                    filedes[i].revents |= POLLRDBAND;
-                }
-                fdHasEvent = PR_TRUE;
-            }
-            if (fdHasEvent) {
-                rv++;
-            }
-        }
-        PR_ASSERT(rv > 0);
-    } else if (rv == -1 && errno == EBADF) {
-        rv = 0;
-        for (i = 0; i < nfds; i++) {
-            filedes[i].revents = 0;
-            if (filedes[i].fd < 0) {
-                continue;
-            }
-            if (fcntl(filedes[i].fd, F_GETFL, 0) == -1) {
-                filedes[i].revents = POLLNVAL;
-                rv++;
-            }
-        }
-        PR_ASSERT(rv > 0);
-    }
-    PR_ASSERT(-1 != timeout || rv != 0);
-
-    return rv;
-}
-#endif /* _PR_NEED_FAKE_POLL */
diff --git a/libs/js/nsprpub/pr/src/md/unix/unix_errors.c b/libs/js/nsprpub/pr/src/md/unix/unix_errors.c
deleted file mode 100644
index 4fbcd8210c..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/unix_errors.c
+++ /dev/null
@@ -1,863 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#if defined(_PR_POLL_AVAILABLE)
-#include <poll.h>
-#endif
-#include <errno.h>
-
-void _MD_unix_map_default_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err ) {
-        case EACCES:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case EADDRINUSE:
-            prError = PR_ADDRESS_IN_USE_ERROR;
-            break;
-        case EADDRNOTAVAIL:
-            prError = PR_ADDRESS_NOT_AVAILABLE_ERROR;
-            break;
-        case EAFNOSUPPORT:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        case EAGAIN:
-            prError = PR_WOULD_BLOCK_ERROR;
-            break;
-        /*
-         * On QNX and Neutrino, EALREADY is defined as EBUSY.
-         */
-#if EALREADY != EBUSY
-        case EALREADY:
-            prError = PR_ALREADY_INITIATED_ERROR;
-            break;
-#endif
-        case EBADF:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-#ifdef EBADMSG
-        case EBADMSG:
-            prError = PR_IO_ERROR;
-            break;
-#endif
-        case EBUSY:
-            prError = PR_FILESYSTEM_MOUNTED_ERROR;
-            break;
-        case ECONNABORTED:
-            prError = PR_CONNECT_ABORTED_ERROR;
-            break;
-        case ECONNREFUSED:
-            prError = PR_CONNECT_REFUSED_ERROR;
-            break;
-        case ECONNRESET:
-            prError = PR_CONNECT_RESET_ERROR;
-            break;
-        case EDEADLK:
-            prError = PR_DEADLOCK_ERROR;
-            break;
-#ifdef EDIRCORRUPTED
-        case EDIRCORRUPTED:
-            prError = PR_DIRECTORY_CORRUPTED_ERROR;
-            break;
-#endif
-#ifdef EDQUOT
-        case EDQUOT:
-            prError = PR_NO_DEVICE_SPACE_ERROR;
-            break;
-#endif
-        case EEXIST:
-            prError = PR_FILE_EXISTS_ERROR;
-            break;
-        case EFAULT:
-            prError = PR_ACCESS_FAULT_ERROR;
-            break;
-        case EFBIG:
-            prError = PR_FILE_TOO_BIG_ERROR;
-            break;
-        case EHOSTUNREACH:
-            prError = PR_HOST_UNREACHABLE_ERROR;
-            break;
-        case EINPROGRESS:
-            prError = PR_IN_PROGRESS_ERROR;
-            break;
-        case EINTR:
-            prError = PR_PENDING_INTERRUPT_ERROR;
-            break;
-        case EINVAL:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case EIO:
-            prError = PR_IO_ERROR;
-            break;
-        case EISCONN:
-            prError = PR_IS_CONNECTED_ERROR;
-            break;
-        case EISDIR:
-            prError = PR_IS_DIRECTORY_ERROR;
-            break;
-        case ELOOP:
-            prError = PR_LOOP_ERROR;
-            break;
-        case EMFILE:
-            prError = PR_PROC_DESC_TABLE_FULL_ERROR;
-            break;
-        case EMLINK:
-            prError = PR_MAX_DIRECTORY_ENTRIES_ERROR;
-            break;
-        case EMSGSIZE:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-#ifdef EMULTIHOP
-        case EMULTIHOP:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-#endif
-        case ENAMETOOLONG:
-            prError = PR_NAME_TOO_LONG_ERROR;
-            break;
-        case ENETUNREACH:
-            prError = PR_NETWORK_UNREACHABLE_ERROR;
-            break;
-        case ENFILE:
-            prError = PR_SYS_DESC_TABLE_FULL_ERROR;
-            break;
-        /*
-         * On SCO OpenServer 5, ENOBUFS is defined as ENOSR.
-         */
-#if defined(ENOBUFS) && (ENOBUFS != ENOSR)
-        case ENOBUFS:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-#endif
-        case ENODEV:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case ENOENT:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case ENOLCK:
-            prError = PR_FILE_IS_LOCKED_ERROR;
-            break;
-#ifdef ENOLINK 
-        case ENOLINK:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-#endif
-        case ENOMEM:
-            prError = PR_OUT_OF_MEMORY_ERROR;
-            break;
-        case ENOPROTOOPT:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case ENOSPC:
-            prError = PR_NO_DEVICE_SPACE_ERROR;
-            break;
-#ifdef ENOSR
-        case ENOSR:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-#endif
-        case ENOTCONN:
-            prError = PR_NOT_CONNECTED_ERROR;
-            break;
-        case ENOTDIR:
-            prError = PR_NOT_DIRECTORY_ERROR;
-            break;
-        case ENOTSOCK:
-            prError = PR_NOT_SOCKET_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case EOPNOTSUPP:
-            prError = PR_NOT_TCP_SOCKET_ERROR;
-            break;
-#ifdef EOVERFLOW
-        case EOVERFLOW:
-            prError = PR_BUFFER_OVERFLOW_ERROR;
-            break;
-#endif
-        case EPERM:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case EPIPE:
-            prError = PR_CONNECT_RESET_ERROR;
-            break;
-#ifdef EPROTO
-        case EPROTO:
-            prError = PR_IO_ERROR;
-            break;
-#endif
-        case EPROTONOSUPPORT:
-            prError = PR_PROTOCOL_NOT_SUPPORTED_ERROR;
-            break;
-        case EPROTOTYPE:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        case ERANGE:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        case EROFS:
-            prError = PR_READ_ONLY_FILESYSTEM_ERROR;
-            break;
-        case ESPIPE:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        case ETIMEDOUT:
-            prError = PR_IO_TIMEOUT_ERROR;
-            break;
-#if EWOULDBLOCK != EAGAIN
-        case EWOULDBLOCK:
-            prError = PR_WOULD_BLOCK_ERROR;
-            break;
-#endif
-        case EXDEV:
-            prError = PR_NOT_SAME_DEVICE_ERROR;
-            break;
-        default:
-            prError = PR_UNKNOWN_ERROR;
-            break;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_opendir_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_closedir_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_readdir_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case 0:
-        case ENOENT:
-            prError = PR_NO_MORE_FILES_ERROR;
-            break;
-#ifdef EOVERFLOW
-        case EOVERFLOW:
-            prError = PR_IO_ERROR;
-            break;
-#endif
-        case EINVAL:
-            prError = PR_IO_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_IO_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_unlink_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EPERM:
-            prError = PR_IS_DIRECTORY_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_stat_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_fstat_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_rename_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EEXIST:
-            prError = PR_DIRECTORY_NOT_EMPTY_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_access_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_mkdir_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_rmdir_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        /*
-         * On AIX 4.3, ENOTEMPTY is defined as EEXIST.
-         */
-#if ENOTEMPTY != EEXIST
-        case ENOTEMPTY:
-            prError = PR_DIRECTORY_NOT_EMPTY_ERROR;
-            break;
-#endif
-        case EEXIST:
-            prError = PR_DIRECTORY_NOT_EMPTY_ERROR;
-            break;
-        case EINVAL:
-            prError = PR_DIRECTORY_NOT_EMPTY_ERROR;
-            break;
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_read_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_write_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_lseek_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_fsync_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        case EINVAL:
-            prError = PR_INVALID_METHOD_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_close_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_socket_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_socketavailable_error(int err)
-{
-    PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-}
-
-void _MD_unix_map_recv_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_recvfrom_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_send_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_sendto_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_writev_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_accept_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ENODEV:
-            prError = PR_NOT_TCP_SOCKET_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_connect_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EACCES:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-#if defined(UNIXWARE) || defined(SNI) || defined(NEC)
-        /*
-         * On some platforms, if we connect to a port on the local host 
-         * (the loopback address) that no process is listening on, we get 
-         * EIO instead of ECONNREFUSED.
-         */
-        case EIO:
-            prError = PR_CONNECT_REFUSED_ERROR;
-            break;
-#endif
-        case ELOOP:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        case ENOENT:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_IO_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_bind_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_SOCKET_ADDRESS_IS_BOUND_ERROR;
-            break;
-        /*
-         * UNIX domain sockets are not supported in NSPR
-         */
-        case EIO:
-        case EISDIR:
-        case ELOOP:
-        case ENOENT:
-        case ENOTDIR:
-        case EROFS:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_listen_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_shutdown_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_socketpair_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_getsockname_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_getpeername_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_getsockopt_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_BUFFER_OVERFLOW_ERROR;
-            break;
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_setsockopt_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_BUFFER_OVERFLOW_ERROR;
-            break;
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_open_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EAGAIN:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case EBUSY:
-            prError = PR_IO_ERROR;
-            break;
-        case ENODEV:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case ENOMEM:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-#ifdef EOVERFLOW
-        case EOVERFLOW:
-            prError = PR_FILE_TOO_BIG_ERROR;
-            break;
-#endif
-        case ETIMEDOUT:
-            prError = PR_REMOTE_FILE_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_mmap_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EAGAIN:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case EMFILE:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case ENODEV:
-            prError = PR_OPERATION_NOT_SUPPORTED_ERROR;
-            break;
-        case ENXIO:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_gethostname_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-void _MD_unix_map_select_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-
-#if defined(_PR_POLL_AVAILABLE) || defined(_PR_NEED_FAKE_POLL)
-void _MD_unix_map_poll_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EAGAIN:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_poll_revents_error(int err)
-{
-    if (err & POLLNVAL)
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, EBADF);
-    else if (err & POLLHUP)
-        PR_SetError(PR_CONNECT_RESET_ERROR, EPIPE);
-    else if (err & POLLERR)
-        PR_SetError(PR_IO_ERROR, EIO);
-    else
-        PR_SetError(PR_UNKNOWN_ERROR, err);
-}
-#endif /* _PR_POLL_AVAILABLE || _PR_NEED_FAKE_POLL */
-
-
-void _MD_unix_map_flock_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EINVAL:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        case EWOULDBLOCK:
-            prError = PR_FILE_IS_LOCKED_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_unix_map_lockf_error(int err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EACCES:
-            prError = PR_FILE_IS_LOCKED_ERROR;
-            break;
-        case EDEADLK:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        default:
-            _MD_unix_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-#ifdef AIX
-void _MD_aix_map_sendfile_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-#endif /* AIX */
-
-#ifdef HPUX11
-void _MD_hpux_map_sendfile_error(int err)
-{
-    _MD_unix_map_default_error(err);
-}
-#endif /* HPUX11 */
-
-#ifdef SOLARIS
-void _MD_solaris_map_sendfile_error(int err)
-{
-    _MD_unix_map_default_error(err) ;
-}
-#endif /* SOLARIS */
-
-#ifdef LINUX
-void _MD_linux_map_sendfile_error(int err)
-{
-    _MD_unix_map_default_error(err) ;
-}
-#endif /* LINUX */
diff --git a/libs/js/nsprpub/pr/src/md/unix/unixware.c b/libs/js/nsprpub/pr/src/md/unix/unixware.c
deleted file mode 100644
index cbcbb3eb45..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/unixware.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#if !defined (USE_SVR4_THREADS)
-
-/*
-         * using only NSPR threads here
- */
-
-#include <setjmp.h>
-
-void _MD_EarlyInit(void)
-{
-}
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) setjmp(CONTEXT(t));
-    }
-    *np = sizeof(CONTEXT(t)) / sizeof(PRWord);
-    return (PRWord *) CONTEXT(t);
-}
-
-#ifdef ALARMS_BREAK_TCP /* I don't think they do */
-
-PRInt32 _MD_connect(PRInt32 osfd, const PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _connect(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-}
-
-PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen,
-                        PRIntervalTime timeout)
-{
-    PRInt32 rv;
-
-    _MD_BLOCK_CLOCK_INTERRUPTS();
-    rv = _accept(osfd,addr,addrlen);
-    _MD_UNBLOCK_CLOCK_INTERRUPTS();
-    return(rv);
-}
-#endif
-
-/*
- * These are also implemented in pratom.c using NSPR locks.  Any reason
- * this might be better or worse?  If you like this better, define
- * _PR_HAVE_ATOMIC_OPS in include/md/unixware.h
- */
-#ifdef _PR_HAVE_ATOMIC_OPS
-/* Atomic operations */
-#include  <stdio.h>
-static FILE *_uw_semf;
-
-void
-_MD_INIT_ATOMIC(void)
-{
-    /* Sigh.  Sure wish SYSV semaphores weren't such a pain to use */
-    if ((_uw_semf = tmpfile()) == NULL)
-        PR_ASSERT(0);
-
-    return;
-}
-
-void
-_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)++;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    flockfile(_uw_semf);
-    (*ptr) += val;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    flockfile(_uw_semf);
-    (*val)--;
-    unflockfile(_uw_semf);
-}
-
-void
-_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    flockfile(_uw_semf);
-    *val = newval;
-    unflockfile(_uw_semf);
-}
-#endif
-
-void
-_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri)
-{
-    return;
-}
-
-PRStatus
-_MD_InitializeThread(PRThread *thread)
-{
-	return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    _PR_MD_SWITCH_CONTEXT(thread);
-    return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread) {
-	PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE));
-    }
-    return PR_SUCCESS;
-}
-
-/* These functions should not be called for Unixware */
-void
-_MD_YIELD(void)
-{
-    PR_NOT_REACHED("_MD_YIELD should not be called for Unixware.");
-}
-
-PRStatus
-_MD_CREATE_THREAD(
-    PRThread *thread,
-    void (*start) (void *),
-    PRThreadPriority priority,
-    PRThreadScope scope,
-    PRThreadState state,
-    PRUint32 stackSize)
-{
-    PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Unixware.");
-}
-
-#else  /* USE_SVR4_THREADS */
-
-/* NOTE:
- * SPARC v9 (Ultras) do have an atomic test-and-set operation.  But
- * SPARC v8 doesn't.  We should detect in the init if we are running on
- * v8 or v9, and then use assembly where we can.
- */
-
-#include <thread.h>
-#include <synch.h>
-
-static mutex_t _unixware_atomic = DEFAULTMUTEX;
-
-#define TEST_THEN_ADD(where, inc) \
-    if (mutex_lock(&_unixware_atomic) != 0)\
-        PR_ASSERT(0);\
-    *where += inc;\
-    if (mutex_unlock(&_unixware_atomic) != 0)\
-        PR_ASSERT(0);
-
-#define TEST_THEN_SET(where, val) \
-    if (mutex_lock(&_unixware_atomic) != 0)\
-        PR_ASSERT(0);\
-    *where = val;\
-    if (mutex_unlock(&_unixware_atomic) != 0)\
-        PR_ASSERT(0);
-
-void
-_MD_INIT_ATOMIC(void)
-{
-}
-
-void
-_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    TEST_THEN_ADD(val, 1);
-}
-
-void
-_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    TEST_THEN_ADD(ptr, val);
-}
-
-void
-_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    TEST_THEN_ADD(val, 0xffffffff);
-}
-
-void
-_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    TEST_THEN_SET(val, newval);
-}
-
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include <sys/lwp.h>
-#include <sys/procfs.h>
-#include <sys/syscall.h>
-
-
-THREAD_KEY_T threadid_key;
-THREAD_KEY_T cpuid_key;
-THREAD_KEY_T last_thread_key;
-static sigset_t set, oldset;
-
-void _MD_EarlyInit(void)
-{
-    THR_KEYCREATE(&threadid_key, NULL);
-    THR_KEYCREATE(&cpuid_key, NULL);
-    THR_KEYCREATE(&last_thread_key, NULL);
-    sigemptyset(&set);
-    sigaddset(&set, SIGALRM);
-}
-
-PRStatus _MD_CREATE_THREAD(PRThread *thread, 
-					void (*start)(void *), 
-					PRThreadPriority priority,
-					PRThreadScope scope, 
-					PRThreadState state, 
-					PRUint32 stackSize) 
-{
-	long flags;
-	
-    /* mask out SIGALRM for native thread creation */
-    thr_sigsetmask(SIG_BLOCK, &set, &oldset); 
-
-    flags = (state == PR_JOINABLE_THREAD ? THR_SUSPENDED/*|THR_NEW_LWP*/ 
-			   : THR_SUSPENDED|THR_DETACHED/*|THR_NEW_LWP*/);
-	if (_PR_IS_GCABLE_THREAD(thread) ||
-							(scope == PR_GLOBAL_BOUND_THREAD))
-		flags |= THR_BOUND;
-
-    if (thr_create(NULL, thread->stack->stackSize,
-                  (void *(*)(void *)) start, (void *) thread, 
-				  flags,
-                  &thread->md.handle)) {
-        thr_sigsetmask(SIG_SETMASK, &oldset, NULL); 
-	return PR_FAILURE;
-    }
-
-
-    /* When the thread starts running, then the lwpid is set to the right
-     * value. Until then we want to mark this as 'uninit' so that
-     * its register state is initialized properly for GC */
-
-    thread->md.lwpid = -1;
-    thr_sigsetmask(SIG_SETMASK, &oldset, NULL); 
-    _MD_NEW_SEM(&thread->md.waiter_sem, 0);
-
-	if ((scope == PR_GLOBAL_THREAD) || (scope == PR_GLOBAL_BOUND_THREAD)) {
-		thread->flags |= _PR_GLOBAL_SCOPE;
-    }
-
-    /* 
-    ** Set the thread priority.  This will also place the thread on 
-    ** the runQ.
-    **
-    ** Force PR_SetThreadPriority to set the priority by
-    ** setting thread->priority to 100.
-    */
-    {
-    int pri;
-    pri = thread->priority;
-    thread->priority = 100;
-    PR_SetThreadPriority( thread, pri );
-
-    PR_LOG(_pr_thread_lm, PR_LOG_MIN, 
-            ("(0X%x)[Start]: on to runq at priority %d",
-            thread, thread->priority));
-    }
-
-    /* Activate the thread */
-    if (thr_continue( thread->md.handle ) ) {
-	return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-void _MD_cleanup_thread(PRThread *thread)
-{
-    thread_t hdl;
-    PRMonitor *mon;
-
-    hdl = thread->md.handle;
-
-    /* 
-    ** First, suspend the thread (unless it's the active one)
-    ** Because we suspend it first, we don't have to use LOCK_SCHEDULER to
-    ** prevent both of us modifying the thread structure at the same time.
-    */
-    if ( thread != _PR_MD_CURRENT_THREAD() ) {
-        thr_suspend(hdl);
-    }
-    PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-            ("(0X%x)[DestroyThread]\n", thread));
-
-    _MD_DESTROY_SEM(&thread->md.waiter_sem);
-}
-
-void _MD_SET_PRIORITY(_MDThread *md_thread, PRUintn newPri)
-{
-	if(thr_setprio((thread_t)md_thread->handle, newPri)) {
-		PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-		   ("_PR_SetThreadPriority: can't set thread priority\n"));
-	}
-}
-
-void _MD_WAIT_CV(
-    struct _MDCVar *md_cv, struct _MDLock *md_lock, PRIntervalTime timeout)
-{
-    struct timespec tt;
-    PRUint32 msec;
-    int rv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    msec = PR_IntervalToMilliseconds(timeout);
-
-    GETTIME (&tt);
-
-    tt.tv_sec += msec / PR_MSEC_PER_SEC;
-    tt.tv_nsec += (msec % PR_MSEC_PER_SEC) * PR_NSEC_PER_MSEC;
-    /* Check for nsec overflow - otherwise we'll get an EINVAL */
-    if (tt.tv_nsec >= PR_NSEC_PER_SEC) {
-        tt.tv_sec++;
-        tt.tv_nsec -= PR_NSEC_PER_SEC;
-    }
-    me->md.sp = unixware_getsp();
-
-
-    /* XXX Solaris 2.5.x gives back EINTR occasionally for no reason
-     * hence ignore EINTR for now */
-
-    COND_TIMEDWAIT(&md_cv->cv, &md_lock->lock, &tt);
-}
-
-void _MD_lock(struct _MDLock *md_lock)
-{
-    mutex_lock(&md_lock->lock);
-}
-
-void _MD_unlock(struct _MDLock *md_lock)
-{
-    mutex_unlock(&((md_lock)->lock));
-}
-
-
-PRThread *_pr_current_thread_tls()
-{
-    PRThread *ret;
-
-    thr_getspecific(threadid_key, (void **)&ret);
-    return ret;
-}
-
-PRStatus
-_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-        _MD_WAIT_SEM(&thread->md.waiter_sem);
-        return PR_SUCCESS;
-}
-
-PRStatus
-_MD_WAKEUP_WAITER(PRThread *thread)
-{
-	if (thread == NULL) {
-		return PR_SUCCESS;
-	}
-	_MD_POST_SEM(&thread->md.waiter_sem);
-	return PR_SUCCESS;
-}
-
-_PRCPU *_pr_current_cpu_tls()
-{
-    _PRCPU *ret;
-
-    thr_getspecific(cpuid_key, (void **)&ret);
-    return ret;
-}
-
-PRThread *_pr_last_thread_tls()
-{
-    PRThread *ret;
-
-    thr_getspecific(last_thread_key, (void **)&ret);
-    return ret;
-}
-
-_MDLock _pr_ioq_lock;
-
-void _MD_INIT_IO (void)
-{
-    _MD_NEW_LOCK(&_pr_ioq_lock);
-}
-
-PRStatus _MD_InitializeThread(PRThread *thread)
-{
-    if (!_PR_IS_NATIVE_THREAD(thread))
-        return;
-		/* prime the sp; substract 4 so we don't hit the assert that
-		 * curr sp > base_stack
-		 */
-    thread->md.sp = (uint_t) thread->stack->allocBase - sizeof(long);
-    thread->md.lwpid = _lwp_self();
-    thread->md.handle = THR_SELF();
-
-	/* all threads on Solaris are global threads from NSPR's perspective
-	 * since all of them are mapped to Solaris threads.
-	 */
-    thread->flags |= _PR_GLOBAL_SCOPE;
-
- 	/* For primordial/attached thread, we don't create an underlying native thread.
- 	 * So, _MD_CREATE_THREAD() does not get called.  We need to do initialization
- 	 * like allocating thread's synchronization variables and set the underlying
- 	 * native thread's priority.
- 	 */
-	if (thread->flags & (_PR_PRIMORDIAL | _PR_ATTACHED)) {
-	    _MD_NEW_SEM(&thread->md.waiter_sem, 0);
-	    _MD_SET_PRIORITY(&(thread->md), thread->priority);
-	}
-	return PR_SUCCESS;
-}
-
-static sigset_t old_mask;	/* store away original gc thread sigmask */
-static int gcprio;		/* store away original gc thread priority */
-static lwpid_t *all_lwps=NULL;	/* list of lwps that we suspended */
-static int num_lwps ;
-static int suspendAllOn = 0;
-
-#define VALID_SP(sp, bottom, top)	\
-       (((uint_t)(sp)) > ((uint_t)(bottom)) && ((uint_t)(sp)) < ((uint_t)(top)))
-
-void unixware_preempt_off()
-{
-    sigset_t set;
-    (void)sigfillset(&set);
-    sigprocmask (SIG_SETMASK, &set, &old_mask);
-}
-
-void unixware_preempt_on()
-{
-    sigprocmask (SIG_SETMASK, &old_mask, NULL);      
-}
-
-void _MD_Begin_SuspendAll()
-{
-    unixware_preempt_off();
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin_SuspendAll\n"));
-    /* run at highest prio so I cannot be preempted */
-    thr_getprio(thr_self(), &gcprio);
-    thr_setprio(thr_self(), 0x7fffffff); 
-    suspendAllOn = 1;
-}
-
-void _MD_End_SuspendAll()
-{
-}
-
-void _MD_End_ResumeAll()
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End_ResumeAll\n"));
-    thr_setprio(thr_self(), gcprio);
-    unixware_preempt_on();
-    suspendAllOn = 0;
-}
-
-void _MD_Suspend(PRThread *thr)
-{
-   int lwp_fd, result;
-   int lwp_main_proc_fd = 0;
-
-    thr_suspend(thr->md.handle);
-    if (!_PR_IS_GCABLE_THREAD(thr))
-      return;
-    /* XXX Primordial thread can't be bound to an lwp, hence there is no
-     * way we can assume that we can get the lwp status for primordial
-     * thread reliably. Hence we skip this for primordial thread, hoping
-     * that the SP is saved during lock and cond. wait. 
-     * XXX - Again this is concern only for java interpreter, not for the
-     * server, 'cause primordial thread in the server does not do java work
-     */
-    if (thr->flags & _PR_PRIMORDIAL)
-      return;
-
-    /* if the thread is not started yet then don't do anything */
-    if (!suspendAllOn || thr->md.lwpid == -1)
-      return;
-
-}
-void _MD_Resume(PRThread *thr)
-{
-   if (!_PR_IS_GCABLE_THREAD(thr) || !suspendAllOn){
-     /*XXX When the suspendAllOn is set, we will be trying to do lwp_suspend
-      * during that time we can't call any thread lib or libc calls. Hence
-      * make sure that no resume is requested for Non gcable thread
-      * during suspendAllOn */
-      PR_ASSERT(!suspendAllOn);
-      thr_continue(thr->md.handle);
-      return;
-   }
-   if (thr->md.lwpid == -1)
-     return;
- 
-   if ( _lwp_continue(thr->md.lwpid) < 0) {
-      PR_ASSERT(0);  /* ARGH, we are hosed! */
-   }
-}
-
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    if (isCurrent) {
-	(void) getcontext(CONTEXT(t));	/* XXX tune me: set md_IRIX.c */
-    }
-    *np = NGREG;
-    if (t->md.lwpid == -1)
-      memset(&t->md.context.uc_mcontext.gregs[0], 0, NGREG * sizeof(PRWord));
-    return (PRWord*) &t->md.context.uc_mcontext.gregs[0];
-}
-
-int
-_pr_unixware_clock_gettime (struct timespec *tp)
-{
-    struct timeval tv;
- 
-    gettimeofday(&tv, NULL);
-    tp->tv_sec = tv.tv_sec;
-    tp->tv_nsec = tv.tv_usec * 1000;
-    return 0;
-}
-
-
-#endif /* USE_SVR4_THREADS */
diff --git a/libs/js/nsprpub/pr/src/md/unix/uxpoll.c b/libs/js/nsprpub/pr/src/md/unix/uxpoll.c
deleted file mode 100644
index aa026568e7..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/uxpoll.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#if defined(_PR_PTHREADS)
-
-#error "This file should not be compiled"
-
-#else  /* defined(_PR_PTHREADS) */
-
-#include "primpl.h"
-
-#include <sys/time.h>
-
-#include <fcntl.h>
-#ifdef _PR_USE_POLL
-#include <poll.h>
-#endif
-
-#if defined(_PR_USE_POLL)
-static PRInt32 NativeThreadPoll(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    /*
-     * This function is mostly duplicated from ptio.s's PR_Poll().
-     */
-    PRInt32 ready = 0;
-    /*
-     * For restarting poll() if it is interrupted by a signal.
-     * We use these variables to figure out how much time has
-     * elapsed and how much of the timeout still remains.
-     */
-    PRIntn index, msecs;
-    struct pollfd *syspoll = NULL;
-    PRIntervalTime start, elapsed, remaining;
-
-    syspoll = (struct pollfd*)PR_MALLOC(npds * sizeof(struct pollfd));
-    if (NULL == syspoll)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-    for (index = 0; index < npds; ++index)
-    {
-        PRFileDesc *bottom;
-        PRInt16 in_flags_read = 0, in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-        {
-            if (pds[index].in_flags & PR_POLL_READ)
-            {
-                in_flags_read = (pds[index].fd->methods->poll)(
-                    pds[index].fd,
-                    pds[index].in_flags & ~PR_POLL_WRITE,
-                    &out_flags_read);
-            }
-            if (pds[index].in_flags & PR_POLL_WRITE)
-            {
-                in_flags_write = (pds[index].fd->methods->poll)(
-                    pds[index].fd,
-                    pds[index].in_flags & ~PR_POLL_READ,
-                    &out_flags_write);
-            }
-            if ((0 != (in_flags_read & out_flags_read))
-            || (0 != (in_flags_write & out_flags_write)))
-            {
-                /* this one is ready right now */
-                if (0 == ready)
-                {
-                    /*
-                     * We will return without calling the system
-                     * poll function.  So zero the out_flags
-                     * fields of all the poll descriptors before
-                     * this one.
-                     */
-                    int i;
-                    for (i = 0; i < index; i++)
-                    {
-                        pds[i].out_flags = 0;
-                    }
-                }
-                ready += 1;
-                pds[index].out_flags = out_flags_read | out_flags_write;
-            }
-            else
-            {
-                pds[index].out_flags = 0;  /* pre-condition */
-                /* now locate the NSPR layer at the bottom of the stack */
-                bottom = PR_GetIdentitiesLayer(pds[index].fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                if ((NULL != bottom)
-                && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                {
-                    if (0 == ready)
-                    {
-                        syspoll[index].fd = bottom->secret->md.osfd;
-                        syspoll[index].events = 0;  /* pre-condition */
-                        if (in_flags_read & PR_POLL_READ)
-                        {
-                            pds[index].out_flags |=
-                                _PR_POLL_READ_SYS_READ;
-                            syspoll[index].events |= POLLIN;
-                        }
-                        if (in_flags_read & PR_POLL_WRITE)
-                        {
-                            pds[index].out_flags |=
-                                _PR_POLL_READ_SYS_WRITE;
-                            syspoll[index].events |= POLLOUT;
-                        }
-                        if (in_flags_write & PR_POLL_READ)
-                        {
-                            pds[index].out_flags |=
-                                _PR_POLL_WRITE_SYS_READ;
-                            syspoll[index].events |= POLLIN;
-                        }
-                        if (in_flags_write & PR_POLL_WRITE)
-                        {
-                            pds[index].out_flags |=
-                                _PR_POLL_WRITE_SYS_WRITE;
-                            syspoll[index].events |= POLLOUT;
-                        }
-                        if (pds[index].in_flags & PR_POLL_EXCEPT)
-                            syspoll[index].events |= POLLPRI;
-                    }
-                }
-                else
-                {
-                    if (0 == ready)
-                    {
-                        int i;
-                        for (i = 0; i < index; i++)
-                        {
-                            pds[i].out_flags = 0;
-                        }
-                    }
-                    ready += 1;  /* this will cause an abrupt return */
-                    pds[index].out_flags = PR_POLL_NVAL;  /* bogii */
-                }
-            }
-        }
-        else
-        {
-            /* make poll() ignore this entry */
-            syspoll[index].fd = -1;
-            syspoll[index].events = 0;
-            pds[index].out_flags = 0;
-        }
-    }
-
-    if (0 == ready)
-    {
-        switch (timeout)
-        {
-            case PR_INTERVAL_NO_WAIT: msecs = 0; break;
-            case PR_INTERVAL_NO_TIMEOUT: msecs = -1; break;
-            default:
-                msecs = PR_IntervalToMilliseconds(timeout);
-                start = PR_IntervalNow();
-        }
-
-retry:
-        ready = _MD_POLL(syspoll, npds, msecs);
-        if (-1 == ready)
-        {
-            PRIntn oserror = errno;
-
-            if (EINTR == oserror)
-            {
-                if (timeout == PR_INTERVAL_NO_TIMEOUT) goto retry;
-                else if (timeout == PR_INTERVAL_NO_WAIT) ready = 0;
-                else
-                {
-                    elapsed = (PRIntervalTime)(PR_IntervalNow() - start);
-                    if (elapsed > timeout) ready = 0;  /* timed out */
-                    else
-                    {
-                        remaining = timeout - elapsed;
-                        msecs = PR_IntervalToMilliseconds(remaining);
-                        goto retry;
-                    }
-                }
-            }
-            else _PR_MD_MAP_POLL_ERROR(oserror);
-        }
-        else if (ready > 0)
-        {
-            for (index = 0; index < npds; ++index)
-            {
-                PRInt16 out_flags = 0;
-                if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-                {
-                    if (0 != syspoll[index].revents)
-                    {
-                        /*
-                        ** Set up the out_flags so that it contains the
-                        ** bits that the highest layer thinks are nice
-                        ** to have. Then the client of that layer will
-                        ** call the appropriate I/O function and maybe
-                        ** the protocol will make progress.
-                        */
-                        if (syspoll[index].revents & POLLIN)
-                        {
-                            if (pds[index].out_flags
-                            & _PR_POLL_READ_SYS_READ)
-                            {
-                                out_flags |= PR_POLL_READ;
-                            }
-                            if (pds[index].out_flags
-                            & _PR_POLL_WRITE_SYS_READ)
-                            {
-                                out_flags |= PR_POLL_WRITE;
-                            }
-                        }
-                        if (syspoll[index].revents & POLLOUT)
-                        {
-                            if (pds[index].out_flags
-                            & _PR_POLL_READ_SYS_WRITE)
-                            {
-                                out_flags |= PR_POLL_READ;
-                            }
-                            if (pds[index].out_flags
-                            & _PR_POLL_WRITE_SYS_WRITE)
-                            {
-                                out_flags |= PR_POLL_WRITE;
-                            }
-                        }
-                        if (syspoll[index].revents & POLLPRI)
-                            out_flags |= PR_POLL_EXCEPT;
-                        if (syspoll[index].revents & POLLERR)
-                            out_flags |= PR_POLL_ERR;
-                        if (syspoll[index].revents & POLLNVAL)
-                            out_flags |= PR_POLL_NVAL;
-                        if (syspoll[index].revents & POLLHUP)
-                            out_flags |= PR_POLL_HUP;
-                    }
-                }
-                pds[index].out_flags = out_flags;
-            }
-        }
-    }
-
-    PR_DELETE(syspoll);
-    return ready;
-
-}  /* NativeThreadPoll */
-#endif  /* defined(_PR_USE_POLL) */
-
-#if !defined(_PR_USE_POLL)
-static PRInt32 NativeThreadSelect(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    /*
-     * This code is almost a duplicate of w32poll.c's _PR_MD_PR_POLL().
-     */
-    fd_set rd, wt, ex;
-    PRFileDesc *bottom;
-    PRPollDesc *pd, *epd;
-    PRInt32 maxfd = -1, ready, err;
-    PRIntervalTime remaining, elapsed, start;
-
-    struct timeval tv, *tvp = NULL;
-
-    FD_ZERO(&rd);
-    FD_ZERO(&wt);
-    FD_ZERO(&ex);
-
-    ready = 0;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        PRInt16 in_flags_read = 0, in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        if ((NULL != pd->fd) && (0 != pd->in_flags))
-        {
-            if (pd->in_flags & PR_POLL_READ)
-            {
-                in_flags_read = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_WRITE, &out_flags_read);
-            }
-            if (pd->in_flags & PR_POLL_WRITE)
-            {
-                in_flags_write = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_READ, &out_flags_write);
-            }
-            if ((0 != (in_flags_read & out_flags_read))
-            || (0 != (in_flags_write & out_flags_write)))
-            {
-                /* this one's ready right now */
-                if (0 == ready)
-                {
-                    /*
-                     * We will have to return without calling the
-                     * system poll/select function.  So zero the
-                     * out_flags fields of all the poll descriptors
-                     * before this one.
-                     */
-                    PRPollDesc *prev;
-                    for (prev = pds; prev < pd; prev++)
-                    {
-                        prev->out_flags = 0;
-                    }
-                }
-                ready += 1;
-                pd->out_flags = out_flags_read | out_flags_write;
-            }
-            else
-            {
-                pd->out_flags = 0;  /* pre-condition */
-
-                /* make sure this is an NSPR supported stack */
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                if ((NULL != bottom)
-                && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                {
-                    if (0 == ready)
-                    {
-                        PRInt32 osfd = bottom->secret->md.osfd;
-                        if (osfd > maxfd) maxfd = osfd;
-                        if (in_flags_read & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_READ;
-                            FD_SET(osfd, &rd);
-                        }
-                        if (in_flags_read & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_WRITE;
-                            FD_SET(osfd, &wt);
-                        }
-                        if (in_flags_write & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_READ;
-                            FD_SET(osfd, &rd);
-                        }
-                        if (in_flags_write & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_WRITE;
-                            FD_SET(osfd, &wt);
-                        }
-                        if (pd->in_flags & PR_POLL_EXCEPT) FD_SET(osfd, &ex);
-                    }
-                }
-                else
-                {
-                    if (0 == ready)
-                    {
-                        PRPollDesc *prev;
-                        for (prev = pds; prev < pd; prev++)
-                        {
-                            prev->out_flags = 0;
-                        }
-                    }
-                    ready += 1;  /* this will cause an abrupt return */
-                    pd->out_flags = PR_POLL_NVAL;  /* bogii */
-                }
-            }
-        }
-        else
-        {
-            pd->out_flags = 0;
-        }
-    }
-
-    if (0 != ready) return ready;  /* no need to block */
-
-    remaining = timeout;
-    start = PR_IntervalNow();
-
-retry:
-    if (timeout != PR_INTERVAL_NO_TIMEOUT)
-    {
-        PRInt32 ticksPerSecond = PR_TicksPerSecond();
-        tv.tv_sec = remaining / ticksPerSecond;
-        tv.tv_usec = PR_IntervalToMicroseconds( remaining % ticksPerSecond );
-        tvp = &tv;
-    }
-
-    ready = _MD_SELECT(maxfd + 1, &rd, &wt, &ex, tvp);
-
-    if (ready == -1 && errno == EINTR)
-    {
-        if (timeout == PR_INTERVAL_NO_TIMEOUT) goto retry;
-        else
-        {
-            elapsed = (PRIntervalTime) (PR_IntervalNow() - start);
-            if (elapsed > timeout) ready = 0;  /* timed out */
-            else
-            {
-                remaining = timeout - elapsed;
-                goto retry;
-            }
-        }
-    }
-
-    /*
-    ** Now to unravel the select sets back into the client's poll
-    ** descriptor list. Is this possibly an area for pissing away
-    ** a few cycles or what?
-    */
-    if (ready > 0)
-    {
-        ready = 0;
-        for (pd = pds, epd = pd + npds; pd < epd; pd++)
-        {
-            PRInt16 out_flags = 0;
-            if ((NULL != pd->fd) && (0 != pd->in_flags))
-            {
-                PRInt32 osfd;
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);
-
-                osfd = bottom->secret->md.osfd;
-
-                if (FD_ISSET(osfd, &rd))
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_READ)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-                if (FD_ISSET(osfd, &wt))
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_WRITE)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-                if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT;
-            }
-            pd->out_flags = out_flags;
-            if (out_flags) ready++;
-        }
-        PR_ASSERT(ready > 0);
-    }
-    else if (ready < 0)
-    {
-        err = _MD_ERRNO();
-        if (err == EBADF)
-        {
-            /* Find the bad fds */
-            ready = 0;
-            for (pd = pds, epd = pd + npds; pd < epd; pd++)
-            {
-                pd->out_flags = 0;
-                if ((NULL != pd->fd) && (0 != pd->in_flags))
-                {
-                    bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                    if (fcntl(bottom->secret->md.osfd, F_GETFL, 0) == -1)
-                    {
-                        pd->out_flags = PR_POLL_NVAL;
-                        ready++;
-                    }
-                }
-            }
-            PR_ASSERT(ready > 0);
-        }
-        else _PR_MD_MAP_SELECT_ERROR(err);
-    }
-
-    return ready;
-}  /* NativeThreadSelect */
-#endif  /* !defined(_PR_USE_POLL) */
-
-static PRInt32 LocalThreads(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    PRPollDesc *pd, *epd;
-    PRInt32 ready, pdcnt;
-    _PRUnixPollDesc *unixpds, *unixpd;
-
-    /*
-     * XXX
-     *        PRPollDesc has a PRFileDesc field, fd, while the IOQ
-     *        is a list of PRPollQueue structures, each of which contains
-     *        a _PRUnixPollDesc. A _PRUnixPollDesc struct contains
-     *        the OS file descriptor, osfd, and not a PRFileDesc.
-     *        So, we have allocate memory for _PRUnixPollDesc structures,
-     *        copy the flags information from the pds list and have pq
-     *        point to this list of _PRUnixPollDesc structures.
-     *
-     *        It would be better if the memory allocation can be avoided.
-     */
-
-    unixpd = unixpds = (_PRUnixPollDesc*)
-        PR_MALLOC(npds * sizeof(_PRUnixPollDesc));
-    if (NULL == unixpds)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return -1;
-    }
-
-    ready = 0;
-    for (pdcnt = 0, pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        PRFileDesc *bottom;
-        PRInt16 in_flags_read = 0, in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        if ((NULL != pd->fd) && (0 != pd->in_flags))
-        {
-            if (pd->in_flags & PR_POLL_READ)
-            {
-                in_flags_read = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_WRITE, &out_flags_read);
-            }
-            if (pd->in_flags & PR_POLL_WRITE)
-            {
-                in_flags_write = (pd->fd->methods->poll)(
-                    pd->fd, pd->in_flags & ~PR_POLL_READ, &out_flags_write);
-            }
-            if ((0 != (in_flags_read & out_flags_read))
-            || (0 != (in_flags_write & out_flags_write)))
-            {
-                /* this one's ready right now */
-                if (0 == ready)
-                {
-                    /*
-                     * We will have to return without calling the
-                     * system poll/select function.  So zero the
-                     * out_flags fields of all the poll descriptors
-                     * before this one.
-                     */
-                    PRPollDesc *prev;
-                    for (prev = pds; prev < pd; prev++)
-                    {
-                        prev->out_flags = 0;
-                    }
-                }
-                ready += 1;
-                pd->out_flags = out_flags_read | out_flags_write;
-            }
-            else
-            {
-                pd->out_flags = 0;  /* pre-condition */
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                if ((NULL != bottom)
-                && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                {
-                    if (0 == ready)
-                    {
-                        unixpd->osfd = bottom->secret->md.osfd;
-                        unixpd->in_flags = 0;
-                        if (in_flags_read & PR_POLL_READ)
-                        {
-                            unixpd->in_flags |= _PR_UNIX_POLL_READ;
-                            pd->out_flags |= _PR_POLL_READ_SYS_READ;
-                        }
-                        if (in_flags_read & PR_POLL_WRITE)
-                        {
-                            unixpd->in_flags |= _PR_UNIX_POLL_WRITE;
-                            pd->out_flags |= _PR_POLL_READ_SYS_WRITE;
-                        }
-                        if (in_flags_write & PR_POLL_READ)
-                        {
-                            unixpd->in_flags |= _PR_UNIX_POLL_READ;
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_READ;
-                        }
-                        if (in_flags_write & PR_POLL_WRITE)
-                        {
-                            unixpd->in_flags |= _PR_UNIX_POLL_WRITE;
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_WRITE;
-                        }
-                        if ((in_flags_read | in_flags_write) & PR_POLL_EXCEPT)
-                        {
-                            unixpd->in_flags |= _PR_UNIX_POLL_EXCEPT;
-                        }
-                        unixpd++; pdcnt++;
-                    }
-                }
-                else
-                {
-                    if (0 == ready)
-                    {
-                        PRPollDesc *prev;
-                        for (prev = pds; prev < pd; prev++)
-                        {
-                            prev->out_flags = 0;
-                        }
-                    }
-                    ready += 1;  /* this will cause an abrupt return */
-                    pd->out_flags = PR_POLL_NVAL;  /* bogii */
-                }
-            }
-        }
-    }
-
-    if (0 != ready)
-    {
-        /* no need to block */
-        PR_DELETE(unixpds);
-        return ready;
-    }
-
-    ready = _PR_WaitForMultipleFDs(unixpds, pdcnt, timeout);
-
-    /*
-     * Copy the out_flags from the _PRUnixPollDesc structures to the
-     * user's PRPollDesc structures and free the allocated memory
-     */
-    unixpd = unixpds;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        PRInt16 out_flags = 0;
-        if ((NULL != pd->fd) && (0 != pd->in_flags))
-        {
-            /*
-             * take errors from the poll operation,
-             * the R/W bits from the request
-             */
-            if (0 != unixpd->out_flags)
-            {
-                if (unixpd->out_flags & _PR_UNIX_POLL_READ)
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_READ)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
-                        out_flags |= PR_POLL_WRITE;
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_WRITE)
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_WRITE)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
-                        out_flags |= PR_POLL_WRITE;
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_EXCEPT)
-                    out_flags |= PR_POLL_EXCEPT;
-                if (unixpd->out_flags & _PR_UNIX_POLL_ERR)
-                    out_flags |= PR_POLL_ERR;
-                if (unixpd->out_flags & _PR_UNIX_POLL_NVAL)
-                    out_flags |= PR_POLL_NVAL;
-                if (unixpd->out_flags & _PR_UNIX_POLL_HUP)
-                    out_flags |= PR_POLL_HUP;
-            }
-            unixpd++;
-        }
-        pd->out_flags = out_flags;
-    }
-
-    PR_DELETE(unixpds);
-
-    return ready;
-}  /* LocalThreads */
-
-#if defined(_PR_USE_POLL)
-#define NativeThreads NativeThreadPoll
-#else
-#define NativeThreads NativeThreadSelect
-#endif
-
-PRInt32 _MD_pr_poll(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    PRInt32 rv = 0;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (_PR_PENDING_INTERRUPT(me))
-    {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        return -1;
-    }
-    if (0 == npds) PR_Sleep(timeout);
-    else if (_PR_IS_NATIVE_THREAD(me))
-        rv = NativeThreads(pds, npds, timeout);
-    else rv = LocalThreads(pds, npds, timeout);
-
-    return rv;
-}  /* _MD_pr_poll */
-
-#endif  /* defined(_PR_PTHREADS) */               
-
-/* uxpoll.c */
-
diff --git a/libs/js/nsprpub/pr/src/md/unix/uxproces.c b/libs/js/nsprpub/pr/src/md/unix/uxproces.c
deleted file mode 100644
index 6806caf201..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/uxproces.c
+++ /dev/null
@@ -1,991 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/wait.h>
-#if defined(AIX)
-#include <dlfcn.h>  /* For dlopen, dlsym, dlclose */
-#endif
-
-#if defined(DARWIN)
-#include <crt_externs.h>
-#else
-PR_IMPORT_DATA(char **) environ;
-#endif
-
-/*
- * HP-UX 9 doesn't have the SA_RESTART flag.
- */
-#ifndef SA_RESTART
-#define SA_RESTART 0
-#endif
-
-#if defined(VMS)
-static PRLock *_pr_vms_fork_lock = NULL;
-#endif
-
-/*
- **********************************************************************
- *
- * The Unix process routines
- *
- **********************************************************************
- */
-
-#define _PR_SIGNALED_EXITSTATUS 256
-
-typedef enum pr_PidState {
-    _PR_PID_DETACHED,
-    _PR_PID_REAPED,
-    _PR_PID_WAITING
-} pr_PidState;
-
-typedef struct pr_PidRecord {
-    pid_t pid;
-    int exitStatus;
-    pr_PidState state;
-    PRCondVar *reapedCV;
-    struct pr_PidRecord *next;
-} pr_PidRecord;
-
-/*
- * Irix sprocs and LinuxThreads are actually a kind of processes
- * that can share the virtual address space and file descriptors.
- */
-#if (defined(IRIX) && !defined(_PR_PTHREADS)) \
-        || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
-        && defined(_PR_PTHREADS))
-#define _PR_SHARE_CLONES
-#endif
-
-/*
- * The macro _PR_NATIVE_THREADS indicates that we are
- * using native threads only, so waitpid() blocks just the
- * calling thread, not the process.  In this case, the waitpid
- * daemon thread can safely block in waitpid().  So we don't
- * need to catch SIGCHLD, and the pipe to unblock PR_Poll() is
- * also not necessary.
- */
-
-#if defined(_PR_GLOBAL_THREADS_ONLY) \
-	|| (defined(_PR_PTHREADS) \
-	&& !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
-#define _PR_NATIVE_THREADS
-#endif
-
-/*
- * All the static variables used by the Unix process routines are
- * collected in this structure.
- */
-
-static struct {
-    PRCallOnceType once;
-    PRThread *thread;
-    PRLock *ml;
-#if defined(_PR_NATIVE_THREADS)
-    PRInt32 numProcs;
-    PRCondVar *cv;
-#else
-    int pipefd[2];
-#endif
-    pr_PidRecord **pidTable;
-
-#ifdef _PR_SHARE_CLONES
-    struct pr_CreateProcOp *opHead, *opTail;
-#endif
-
-#ifdef AIX
-    pid_t (*forkptr)(void);  /* Newer versions of AIX (starting in 4.3.2)
-                              * have f_fork, which is faster than the
-                              * regular fork in a multithreaded process
-                              * because it skips calling the fork handlers.
-                              * So we look up the f_fork symbol to see if
-                              * it's available and fall back on fork.
-                              */
-#endif /* AIX */
-} pr_wp;
-
-#ifdef _PR_SHARE_CLONES
-static int pr_waitpid_daemon_exit;
-
-void
-_MD_unix_terminate_waitpid_daemon(void)
-{
-    if (pr_wp.thread) {
-        pr_waitpid_daemon_exit = 1;
-        write(pr_wp.pipefd[1], "", 1);
-        PR_JoinThread(pr_wp.thread);
-    }
-}
-#endif
-
-static PRStatus _MD_InitProcesses(void);
-#if !defined(_PR_NATIVE_THREADS)
-static void pr_InstallSigchldHandler(void);
-#endif
-
-static PRProcess *
-ForkAndExec(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    PRProcess *process;
-    int nEnv, idx;
-    char *const *childEnvp;
-    char **newEnvp = NULL;
-    int flags;
-#ifdef VMS
-    char VMScurdir[FILENAME_MAX+1] = { '\0' } ;
-#endif	
-
-    process = PR_NEW(PRProcess);
-    if (!process) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-
-    childEnvp = envp;
-    if (attr && attr->fdInheritBuffer) {
-        if (NULL == childEnvp) {
-#ifdef DARWIN
-            childEnvp = *(_NSGetEnviron());
-#else
-            childEnvp = environ;
-#endif
-        }
-        for (nEnv = 0; childEnvp[nEnv]; nEnv++) {
-        }
-        newEnvp = (char **) PR_MALLOC((nEnv + 2) * sizeof(char *));
-        if (NULL == newEnvp) {
-            PR_DELETE(process);
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return NULL;
-        }
-        for (idx = 0; idx < nEnv; idx++) {
-            newEnvp[idx] = childEnvp[idx];
-        }
-        newEnvp[idx++] = attr->fdInheritBuffer;
-        newEnvp[idx] = NULL;
-        childEnvp = newEnvp;
-    }
-
-#ifdef VMS
-/*
-** Since vfork/exec is implemented VERY differently on OpenVMS, we have to
-** handle the setting up of the standard streams very differently. And since
-** none of this code can ever execute in the context of the child, we have
-** to perform the chdir in the parent so the child is born into the correct
-** directory (and then switch the parent back again).
-*/
-{
-    int decc$set_child_standard_streams(int,int,int);
-    int n, fd_stdin=0, fd_stdout=1, fd_stderr=2;
-
-    /* Set up any standard streams we are given, assuming defaults */
-    if (attr) {
-       if (attr->stdinFd)
-           fd_stdin = attr->stdinFd->secret->md.osfd;
-       if (attr->stdoutFd)
-           fd_stdout = attr->stdoutFd->secret->md.osfd;
-       if (attr->stderrFd)
-           fd_stderr = attr->stderrFd->secret->md.osfd;
-    }
-
-    /*
-    ** Put a lock around anything that isn't going to be thread-safe.
-    */
-    PR_Lock(_pr_vms_fork_lock);
-
-    /*
-    ** Prepare the child's streams. We always do this in case a previous fork
-    ** has left the stream assignments in some non-standard way.
-    */
-    n = decc$set_child_standard_streams(fd_stdin,fd_stdout,fd_stderr);
-    if (n == -1) {
-       PR_SetError(PR_BAD_DESCRIPTOR_ERROR, errno);
-       PR_DELETE(process);
-       if (newEnvp) {
-           PR_DELETE(newEnvp);
-       }
-       PR_Unlock(_pr_vms_fork_lock);
-       return NULL;
-    }
-
-    /* Switch directory if we have to */
-    if (attr) {
-       if (attr->currentDirectory) {
-           if ( (getcwd(VMScurdir,sizeof(VMScurdir)) == NULL) ||
-                (chdir(attr->currentDirectory) < 0) ) {
-               PR_SetError(PR_DIRECTORY_OPEN_ERROR, errno);
-               PR_DELETE(process);
-               if (newEnvp) {
-                   PR_DELETE(newEnvp);
-               }
-               PR_Unlock(_pr_vms_fork_lock);
-               return NULL;
-           }
-       }
-    }
-}
-#endif /* VMS */
-
-#ifdef AIX
-    process->md.pid = (*pr_wp.forkptr)();
-#elif defined(NTO)
-    /*
-     * fork() & exec() does not work in a multithreaded process.
-     * Use spawn() instead.
-     */
-    {
-        int fd_map[3] = { 0, 1, 2 };
-
-        if (attr) {
-            if (attr->stdinFd && attr->stdinFd->secret->md.osfd != 0) {
-                fd_map[0] = dup(attr->stdinFd->secret->md.osfd);
-                flags = fcntl(fd_map[0], F_GETFL, 0);
-                if (flags & O_NONBLOCK)
-                    fcntl(fd_map[0], F_SETFL, flags & ~O_NONBLOCK);
-            }
-            if (attr->stdoutFd && attr->stdoutFd->secret->md.osfd != 1) {
-                fd_map[1] = dup(attr->stdoutFd->secret->md.osfd);
-                flags = fcntl(fd_map[1], F_GETFL, 0);
-                if (flags & O_NONBLOCK)
-                    fcntl(fd_map[1], F_SETFL, flags & ~O_NONBLOCK);
-            }
-            if (attr->stderrFd && attr->stderrFd->secret->md.osfd != 2) {
-                fd_map[2] = dup(attr->stderrFd->secret->md.osfd);
-                flags = fcntl(fd_map[2], F_GETFL, 0);
-                if (flags & O_NONBLOCK)
-                    fcntl(fd_map[2], F_SETFL, flags & ~O_NONBLOCK);
-            }
-
-            PR_ASSERT(attr->currentDirectory == NULL);  /* not implemented */
-        }
-
-        process->md.pid = spawn(path, 3, fd_map, NULL, argv, childEnvp);
-
-        if (fd_map[0] != 0)
-            close(fd_map[0]);
-        if (fd_map[1] != 1)
-            close(fd_map[1]);
-        if (fd_map[2] != 2)
-            close(fd_map[2]);
-    }
-#else
-    process->md.pid = fork();
-#endif
-    if ((pid_t) -1 == process->md.pid) {
-        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, errno);
-        PR_DELETE(process);
-        if (newEnvp) {
-            PR_DELETE(newEnvp);
-        }
-        return NULL;
-    } else if (0 == process->md.pid) {  /* the child process */
-        /*
-         * If the child process needs to exit, it must call _exit().
-         * Do not call exit(), because exit() will flush and close
-         * the standard I/O file descriptors, and hence corrupt
-         * the parent process's standard I/O data structures.
-         */
-
-#if !defined(NTO)
-#ifdef VMS
-       /* OpenVMS has already handled all this above */
-#else
-        if (attr) {
-            /* the osfd's to redirect stdin, stdout, and stderr to */
-            int in_osfd = -1, out_osfd = -1, err_osfd = -1;
-
-            if (attr->stdinFd
-                    && attr->stdinFd->secret->md.osfd != 0) {
-                in_osfd = attr->stdinFd->secret->md.osfd;
-                if (dup2(in_osfd, 0) != 0) {
-                    _exit(1);  /* failed */
-                }
-                flags = fcntl(0, F_GETFL, 0);
-                if (flags & O_NONBLOCK) {
-                    fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-                }
-            }
-            if (attr->stdoutFd
-                    && attr->stdoutFd->secret->md.osfd != 1) {
-                out_osfd = attr->stdoutFd->secret->md.osfd;
-                if (dup2(out_osfd, 1) != 1) {
-                    _exit(1);  /* failed */
-                }
-                flags = fcntl(1, F_GETFL, 0);
-                if (flags & O_NONBLOCK) {
-                    fcntl(1, F_SETFL, flags & ~O_NONBLOCK);
-                }
-            }
-            if (attr->stderrFd
-                    && attr->stderrFd->secret->md.osfd != 2) {
-                err_osfd = attr->stderrFd->secret->md.osfd;
-                if (dup2(err_osfd, 2) != 2) {
-                    _exit(1);  /* failed */
-                }
-                flags = fcntl(2, F_GETFL, 0);
-                if (flags & O_NONBLOCK) {
-                    fcntl(2, F_SETFL, flags & ~O_NONBLOCK);
-                }
-            }
-            if (in_osfd != -1) {
-                close(in_osfd);
-            }
-            if (out_osfd != -1 && out_osfd != in_osfd) {
-                close(out_osfd);
-            }
-            if (err_osfd != -1 && err_osfd != in_osfd
-                    && err_osfd != out_osfd) {
-                close(err_osfd);
-            }
-            if (attr->currentDirectory) {
-                if (chdir(attr->currentDirectory) < 0) {
-                    _exit(1);  /* failed */
-                }
-            }
-        }
-#endif /* !VMS */
-
-        if (childEnvp) {
-            (void)execve(path, argv, childEnvp);
-        } else {
-            /* Inherit the environment of the parent. */
-            (void)execv(path, argv);
-        }
-        /* Whoops! It returned. That's a bad sign. */
-#ifdef VMS
-       /*
-       ** On OpenVMS we are still in the context of the parent, and so we
-       ** can (and should!) perform normal error handling.
-       */
-       PR_SetError(PR_UNKNOWN_ERROR, errno);
-       PR_DELETE(process);
-       if (newEnvp) {
-           PR_DELETE(newEnvp);
-       }
-       if (VMScurdir[0] != '\0')
-           chdir(VMScurdir);
-       PR_Unlock(_pr_vms_fork_lock);
-       return NULL;
-#else
-        _exit(1);
-#endif /* VMS */
-#endif /* !NTO */
-    }
-
-    if (newEnvp) {
-        PR_DELETE(newEnvp);
-    }
-#ifdef VMS
-    /* If we switched directories, then remember to switch back */
-    if (VMScurdir[0] != '\0') {
-       chdir(VMScurdir); /* can't do much if it fails */
-    }
-    PR_Unlock(_pr_vms_fork_lock);
-#endif /* VMS */
-
-#if defined(_PR_NATIVE_THREADS)
-    PR_Lock(pr_wp.ml);
-    if (0 == pr_wp.numProcs++) {
-        PR_NotifyCondVar(pr_wp.cv);
-    }
-    PR_Unlock(pr_wp.ml);
-#endif
-    return process;
-}
-
-#ifdef _PR_SHARE_CLONES
-
-struct pr_CreateProcOp {
-    const char *path;
-    char *const *argv;
-    char *const *envp;
-    const PRProcessAttr *attr;
-    PRProcess *process;
-    PRErrorCode prerror;
-    PRInt32 oserror;
-    PRBool done;
-    PRCondVar *doneCV;
-    struct pr_CreateProcOp *next;
-};
-
-PRProcess *
-_MD_CreateUnixProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    struct pr_CreateProcOp *op;
-    PRProcess *proc;
-    int rv;
-
-    if (PR_CallOnce(&pr_wp.once, _MD_InitProcesses) == PR_FAILURE) {
-	return NULL;
-    }
-
-    op = PR_NEW(struct pr_CreateProcOp);
-    if (NULL == op) {
-	PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	return NULL;
-    }
-    op->path = path;
-    op->argv = argv;
-    op->envp = envp;
-    op->attr = attr;
-    op->done = PR_FALSE;
-    op->doneCV = PR_NewCondVar(pr_wp.ml);
-    if (NULL == op->doneCV) {
-	PR_DELETE(op);
-	return NULL;
-    }
-    PR_Lock(pr_wp.ml);
-
-    /* add to the tail of op queue */
-    op->next = NULL;
-    if (pr_wp.opTail) {
-	pr_wp.opTail->next = op;
-	pr_wp.opTail = op;
-    } else {
-	PR_ASSERT(NULL == pr_wp.opHead);
-	pr_wp.opHead = pr_wp.opTail = op;
-    }
-
-    /* wake up the daemon thread */
-    do {
-        rv = write(pr_wp.pipefd[1], "", 1);
-    } while (-1 == rv && EINTR == errno);
-
-    while (op->done == PR_FALSE) {
-	PR_WaitCondVar(op->doneCV, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(pr_wp.ml);
-    PR_DestroyCondVar(op->doneCV);
-    proc = op->process;
-    if (!proc) {
-	PR_SetError(op->prerror, op->oserror);
-    }
-    PR_DELETE(op);
-    return proc;
-}
-
-#else  /* ! _PR_SHARE_CLONES */
-
-PRProcess *
-_MD_CreateUnixProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    if (PR_CallOnce(&pr_wp.once, _MD_InitProcesses) == PR_FAILURE) {
-	return NULL;
-    }
-    return ForkAndExec(path, argv, envp, attr);
-}  /* _MD_CreateUnixProcess */
-
-#endif  /* _PR_SHARE_CLONES */
-
-/*
- * The pid table is a hashtable.
- *
- * The number of buckets in the hashtable (NBUCKETS) must be a power of 2.
- */
-#define NBUCKETS_LOG2 6
-#define NBUCKETS (1 << NBUCKETS_LOG2)
-#define PID_HASH_MASK ((pid_t) (NBUCKETS - 1))
-
-static pr_PidRecord *
-FindPidTable(pid_t pid)
-{
-    pr_PidRecord *pRec;
-    int keyHash = (int) (pid & PID_HASH_MASK);
-
-    pRec =  pr_wp.pidTable[keyHash];
-    while (pRec) {
-	if (pRec->pid == pid) {
-	    break;
-	}
-	pRec = pRec->next;
-    }
-    return pRec;
-}
-
-static void
-InsertPidTable(pr_PidRecord *pRec)
-{
-    int keyHash = (int) (pRec->pid & PID_HASH_MASK);
-
-    pRec->next = pr_wp.pidTable[keyHash];
-    pr_wp.pidTable[keyHash] = pRec;
-}
-
-static void
-DeletePidTable(pr_PidRecord *pRec)
-{
-    int keyHash = (int) (pRec->pid & PID_HASH_MASK);
-
-    if (pr_wp.pidTable[keyHash] == pRec) {
-	pr_wp.pidTable[keyHash] = pRec->next;
-    } else {
-	pr_PidRecord *pred, *cur;  /* predecessor and current */
-
-	pred = pr_wp.pidTable[keyHash];
-	cur = pred->next;
-	while (cur) {
-	    if (cur == pRec) {
-		pred->next = cur->next;
-		break;
-            }
-	    pred = cur;
-	    cur = cur->next;
-        }
-	PR_ASSERT(cur != NULL);
-    }
-}
-
-static int
-ExtractExitStatus(int rawExitStatus)
-{
-    /*
-     * We did not specify the WCONTINUED and WUNTRACED options
-     * for waitpid, so these two events should not be reported.
-     */
-    PR_ASSERT(!WIFSTOPPED(rawExitStatus));
-#ifdef WIFCONTINUED
-    PR_ASSERT(!WIFCONTINUED(rawExitStatus));
-#endif
-    if (WIFEXITED(rawExitStatus)) {
-	return WEXITSTATUS(rawExitStatus);
-    } else {
-	PR_ASSERT(WIFSIGNALED(rawExitStatus));
-	return _PR_SIGNALED_EXITSTATUS;
-    }
-}
-
-static void
-ProcessReapedChildInternal(pid_t pid, int status)
-{
-    pr_PidRecord *pRec;
-
-    pRec = FindPidTable(pid);
-    if (NULL == pRec) {
-        pRec = PR_NEW(pr_PidRecord);
-        pRec->pid = pid;
-        pRec->state = _PR_PID_REAPED;
-        pRec->exitStatus = ExtractExitStatus(status);
-        pRec->reapedCV = NULL;
-        InsertPidTable(pRec);
-    } else {
-        PR_ASSERT(pRec->state != _PR_PID_REAPED);
-        if (_PR_PID_DETACHED == pRec->state) {
-            PR_ASSERT(NULL == pRec->reapedCV);
-            DeletePidTable(pRec);
-            PR_DELETE(pRec);
-        } else {
-            PR_ASSERT(_PR_PID_WAITING == pRec->state);
-            PR_ASSERT(NULL != pRec->reapedCV);
-            pRec->exitStatus = ExtractExitStatus(status);
-            pRec->state = _PR_PID_REAPED;
-            PR_NotifyCondVar(pRec->reapedCV);
-        }
-    }
-}
-
-#if defined(_PR_NATIVE_THREADS)
-
-/*
- * If all the threads are native threads, the daemon thread is
- * simpler.  We don't need to catch the SIGCHLD signal.  We can
- * just have the daemon thread block in waitpid().
- */
-
-static void WaitPidDaemonThread(void *unused)
-{
-    pid_t pid;
-    int status;
-
-    while (1) {
-        PR_Lock(pr_wp.ml);
-        while (0 == pr_wp.numProcs) {
-            PR_WaitCondVar(pr_wp.cv, PR_INTERVAL_NO_TIMEOUT);
-        }
-        PR_Unlock(pr_wp.ml);
-
-	while (1) {
-	    do {
-	        pid = waitpid((pid_t) -1, &status, 0);
-	    } while ((pid_t) -1 == pid && EINTR == errno);
-
-            /*
-             * waitpid() cannot return 0 because we did not invoke it
-             * with the WNOHANG option.
-             */ 
-	    PR_ASSERT(0 != pid);
-
-            /*
-             * The only possible error code is ECHILD.  But if we do
-             * our accounting correctly, we should only call waitpid()
-             * when there is a child process to wait for.
-             */
-            PR_ASSERT((pid_t) -1 != pid);
-	    if ((pid_t) -1 == pid) {
-                break;
-            }
-
-	    PR_Lock(pr_wp.ml);
-            ProcessReapedChildInternal(pid, status);
-            pr_wp.numProcs--;
-            while (0 == pr_wp.numProcs) {
-                PR_WaitCondVar(pr_wp.cv, PR_INTERVAL_NO_TIMEOUT);
-            }
-	    PR_Unlock(pr_wp.ml);
-	}
-    }
-}
-
-#else /* _PR_NATIVE_THREADS */
-
-static void WaitPidDaemonThread(void *unused)
-{
-    PRPollDesc pd;
-    PRFileDesc *fd;
-    int rv;
-    char buf[128];
-    pid_t pid;
-    int status;
-#ifdef _PR_SHARE_CLONES
-    struct pr_CreateProcOp *op;
-#endif
-
-#ifdef _PR_SHARE_CLONES
-    pr_InstallSigchldHandler();
-#endif
-
-    fd = PR_ImportFile(pr_wp.pipefd[0]);
-    PR_ASSERT(NULL != fd);
-    pd.fd = fd;
-    pd.in_flags = PR_POLL_READ;
-
-    while (1) {
-        rv = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-        PR_ASSERT(1 == rv);
-
-#ifdef _PR_SHARE_CLONES
-        if (pr_waitpid_daemon_exit) {
-            return;
-        }
-	PR_Lock(pr_wp.ml);
-#endif
-	    
-        do {
-            rv = read(pr_wp.pipefd[0], buf, sizeof(buf));
-        } while (sizeof(buf) == rv || (-1 == rv && EINTR == errno));
-
-#ifdef _PR_SHARE_CLONES
-	PR_Unlock(pr_wp.ml);
-	while ((op = pr_wp.opHead) != NULL) {
-	    op->process = ForkAndExec(op->path, op->argv,
-		    op->envp, op->attr);
-	    if (NULL == op->process) {
-		op->prerror = PR_GetError();
-		op->oserror = PR_GetOSError();
-	    }
-	    PR_Lock(pr_wp.ml);
-	    pr_wp.opHead = op->next;
-	    if (NULL == pr_wp.opHead) {
-		pr_wp.opTail = NULL;
-	    }
-	    op->done = PR_TRUE;
-	    PR_NotifyCondVar(op->doneCV);
-	    PR_Unlock(pr_wp.ml);
-	}
-#endif
-
-	while (1) {
-	    do {
-	        pid = waitpid((pid_t) -1, &status, WNOHANG);
-	    } while ((pid_t) -1 == pid && EINTR == errno);
-	    if (0 == pid) break;
-	    if ((pid_t) -1 == pid) {
-		/* must be because we have no child processes */
-		PR_ASSERT(ECHILD == errno);
-		break;
-            }
-
-	    PR_Lock(pr_wp.ml);
-            ProcessReapedChildInternal(pid, status);
-	    PR_Unlock(pr_wp.ml);
-	}
-    }
-}
-
-static void pr_SigchldHandler(int sig)
-{
-    int errnoCopy;
-    int rv;
-
-    errnoCopy = errno;
-
-    do {
-        rv = write(pr_wp.pipefd[1], "", 1);
-    } while (-1 == rv && EINTR == errno);
-
-#ifdef DEBUG
-    if (-1 == rv && EAGAIN != errno && EWOULDBLOCK != errno) {
-        char *msg = "cannot write to pipe\n";
-        write(2, msg, strlen(msg) + 1);
-        _exit(1);
-    }
-#endif
-
-    errno = errnoCopy;
-}
-
-static void pr_InstallSigchldHandler()
-{
-#if defined(HPUX) && defined(_PR_DCETHREADS)
-#error "HP-UX DCE threads have their own SIGCHLD handler"
-#endif
-
-    struct sigaction act, oact;
-    int rv;
-
-    act.sa_handler = pr_SigchldHandler;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_NOCLDSTOP | SA_RESTART;
-    rv = sigaction(SIGCHLD, &act, &oact);
-    PR_ASSERT(0 == rv);
-    /* Make sure we are not overriding someone else's SIGCHLD handler */
-#ifndef _PR_SHARE_CLONES
-    PR_ASSERT(oact.sa_handler == SIG_DFL);
-#endif
-}
-
-#endif  /* !defined(_PR_NATIVE_THREADS) */
-
-static PRStatus _MD_InitProcesses(void)
-{
-#if !defined(_PR_NATIVE_THREADS)
-    int rv;
-    int flags;
-#endif
-#ifdef SUNOS4
-#define _PR_NBIO_FLAG FNDELAY
-#else
-#define _PR_NBIO_FLAG O_NONBLOCK
-#endif
-
-#ifdef AIX
-    {
-        void *handle = dlopen(NULL, RTLD_NOW | RTLD_GLOBAL);
-        pr_wp.forkptr = (pid_t (*)(void)) dlsym(handle, "f_fork");
-        if (!pr_wp.forkptr) {
-            pr_wp.forkptr = fork;
-        }
-        dlclose(handle);
-    }
-#endif /* AIX */
-
-    pr_wp.ml = PR_NewLock();
-    PR_ASSERT(NULL != pr_wp.ml);
-
-#if defined(VMS)
-    _pr_vms_fork_lock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_vms_fork_lock);
-#endif
-
-#if defined(_PR_NATIVE_THREADS)
-    pr_wp.numProcs = 0;
-    pr_wp.cv = PR_NewCondVar(pr_wp.ml);
-    PR_ASSERT(NULL != pr_wp.cv);
-#else
-    rv = pipe(pr_wp.pipefd);
-    PR_ASSERT(0 == rv);
-    flags = fcntl(pr_wp.pipefd[0], F_GETFL, 0);
-    fcntl(pr_wp.pipefd[0], F_SETFL, flags | _PR_NBIO_FLAG);
-    flags = fcntl(pr_wp.pipefd[1], F_GETFL, 0);
-    fcntl(pr_wp.pipefd[1], F_SETFL, flags | _PR_NBIO_FLAG);
-
-#ifndef _PR_SHARE_CLONES
-    pr_InstallSigchldHandler();
-#endif
-#endif  /* !_PR_NATIVE_THREADS */
-
-    pr_wp.thread = PR_CreateThread(PR_SYSTEM_THREAD,
-	    WaitPidDaemonThread, NULL, PR_PRIORITY_NORMAL,
-#ifdef _PR_SHARE_CLONES
-            PR_GLOBAL_THREAD,
-#else
-	    PR_LOCAL_THREAD,
-#endif
-	    PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(NULL != pr_wp.thread);
-
-    pr_wp.pidTable = (pr_PidRecord**)PR_CALLOC(NBUCKETS * sizeof(pr_PidRecord *));
-    PR_ASSERT(NULL != pr_wp.pidTable);
-    return PR_SUCCESS;
-}
-
-PRStatus _MD_DetachUnixProcess(PRProcess *process)
-{
-    PRStatus retVal = PR_SUCCESS;
-    pr_PidRecord *pRec;
-
-    PR_Lock(pr_wp.ml);
-    pRec = FindPidTable(process->md.pid);
-    if (NULL == pRec) {
-	pRec = PR_NEW(pr_PidRecord);
-	if (NULL == pRec) {
-	    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	    retVal = PR_FAILURE;
-	    goto done;
-	}
-	pRec->pid = process->md.pid;
-	pRec->state = _PR_PID_DETACHED;
-	pRec->reapedCV = NULL;
-	InsertPidTable(pRec);
-    } else {
-	PR_ASSERT(_PR_PID_REAPED == pRec->state);
-	if (_PR_PID_REAPED != pRec->state) {
-	    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-	    retVal = PR_FAILURE;
-	} else {
-	    DeletePidTable(pRec);
-	    PR_ASSERT(NULL == pRec->reapedCV);
-	    PR_DELETE(pRec);
-	}
-    }
-    PR_DELETE(process);
-
-done:
-    PR_Unlock(pr_wp.ml);
-    return retVal;
-}
-
-PRStatus _MD_WaitUnixProcess(
-    PRProcess *process,
-    PRInt32 *exitCode)
-{
-    pr_PidRecord *pRec;
-    PRStatus retVal = PR_SUCCESS;
-    PRBool interrupted = PR_FALSE;
-
-    PR_Lock(pr_wp.ml);
-    pRec = FindPidTable(process->md.pid);
-    if (NULL == pRec) {
-	pRec = PR_NEW(pr_PidRecord);
-	if (NULL == pRec) {
-	    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	    retVal = PR_FAILURE;
-	    goto done;
-	}
-	pRec->pid = process->md.pid;
-	pRec->state = _PR_PID_WAITING;
-	pRec->reapedCV = PR_NewCondVar(pr_wp.ml);
-	if (NULL == pRec->reapedCV) {
-	    PR_DELETE(pRec);
-	    retVal = PR_FAILURE;
-	    goto done;
-	}
-	InsertPidTable(pRec);
-	while (!interrupted && _PR_PID_REAPED != pRec->state) {
-	    if (PR_WaitCondVar(pRec->reapedCV,
-		    PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE
-		    && PR_GetError() == PR_PENDING_INTERRUPT_ERROR) {
-		interrupted = PR_TRUE;
-            }
-	}
-	if (_PR_PID_REAPED == pRec->state) {
-            if (exitCode) {
-                *exitCode = pRec->exitStatus;
-            }
-	} else {
-	    PR_ASSERT(interrupted);
-	    retVal = PR_FAILURE;
-	}
-	DeletePidTable(pRec);
-	PR_DestroyCondVar(pRec->reapedCV);
-	PR_DELETE(pRec);
-    } else {
-	PR_ASSERT(_PR_PID_REAPED == pRec->state);
-	PR_ASSERT(NULL == pRec->reapedCV);
-	DeletePidTable(pRec);
-        if (exitCode) {
-            *exitCode = pRec->exitStatus;
-        }
-	PR_DELETE(pRec);
-    }
-    PR_DELETE(process);
-
-done:
-    PR_Unlock(pr_wp.ml);
-    return retVal;
-}  /* _MD_WaitUnixProcess */
-
-PRStatus _MD_KillUnixProcess(PRProcess *process)
-{
-    PRErrorCode prerror;
-    PRInt32 oserror;
-
-    if (kill(process->md.pid, SIGKILL) == 0) {
-	return PR_SUCCESS;
-    }
-    oserror = errno;
-    switch (oserror) {
-        case EPERM:
-	    prerror = PR_NO_ACCESS_RIGHTS_ERROR;
-	    break;
-        case ESRCH:
-	    prerror = PR_INVALID_ARGUMENT_ERROR;
-	    break;
-        default:
-	    prerror = PR_UNKNOWN_ERROR;
-	    break;
-    }
-    PR_SetError(prerror, oserror);
-    return PR_FAILURE;
-}  /* _MD_KillUnixProcess */
diff --git a/libs/js/nsprpub/pr/src/md/unix/uxrng.c b/libs/js/nsprpub/pr/src/md/unix/uxrng.c
deleted file mode 100644
index 50b1882648..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/uxrng.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#include "primpl.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/time.h>
-
-
-#if defined(SOLARIS)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    hrtime_t t;
-    t = gethrtime();
-    if (t) {
-	    return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t));
-    }
-    return 0;
-}
-
-#elif defined(SUNOS4)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    return 0;
-}
-
-#elif defined(HPUX)
-
-#ifdef __ia64
-#include <ia64/sys/inline.h>
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    PRUint64 t;
-
-    t = _Asm_mov_from_ar(_AREG44);
-    return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
-#else
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    extern int ret_cr16();
-    int cr16val;
-
-    cr16val = ret_cr16();
-    return(_pr_CopyLowBits(buf, maxbytes, &cr16val, sizeof(cr16val)));
-}
-#endif
-
-#elif defined(OSF1)
-
-#include <c_asm.h>
-
-/*
- * Use the "get the cycle counter" instruction on the alpha.
- * The low 32 bits completely turn over in less than a minute.
- * The high 32 bits are some non-counter gunk that changes sometimes.
- */
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    unsigned long t;
-
-#ifdef __GNUC__
-    __asm__("rpcc %0" : "=r" (t));
-#else
-    t = asm("rpcc %v0");
-#endif
-    return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
-
-#elif defined(VMS)
-
-#include <ints.h>
-
-/*
- * Use the "get the cycle counter" instruction on the alpha.
- * The low 32 bits completely turn over in less than a minute.
- * The high 32 bits are some non-counter gunk that changes sometimes.
- */
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    uint64 t;
-
-    t = __RPCC();
-    return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
-
-#elif defined(AIX)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    return 0;
-}
-
-#elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-    || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static int      fdDevRandom;
-static PRCallOnceType coOpenDevRandom;
-
-static PRStatus OpenDevRandom( void )
-{
-    fdDevRandom = open( "/dev/random", O_RDONLY );
-    return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS );
-} /* end OpenDevRandom() */
-
-static size_t GetDevRandom( void *buf, size_t size )
-{
-    int bytesIn;
-    int rc;
-
-    rc = PR_CallOnce( &coOpenDevRandom, OpenDevRandom );
-    if ( PR_FAILURE == rc ) {
-        _PR_MD_MAP_OPEN_ERROR( errno );
-        return(0);
-    }
-
-    bytesIn = read( fdDevRandom, buf, size );
-    if ( -1 == bytesIn ) {
-        _PR_MD_MAP_READ_ERROR( errno );
-        return(0);
-    }
-
-    return( bytesIn );
-} /* end GetDevRandom() */
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{             
-    return(GetDevRandom( buf, maxbytes ));
-}
-
-#elif defined(NCR)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    return 0;
-}
-
-#elif defined(IRIX)
-#include <fcntl.h>
-#undef PRIVATE
-#include <sys/mman.h>
-#include <sys/syssgi.h>
-#include <sys/immu.h>
-#include <sys/systeminfo.h>
-#include <sys/utsname.h>
-
-static size_t GetHighResClock(void *buf, size_t maxbuf)
-{
-    unsigned phys_addr, raddr, cycleval;
-    static volatile unsigned *iotimer_addr = NULL;
-    static int tries = 0;
-    static int cntr_size;
-    int mfd;
-    unsigned s0[2];
-
-#ifndef SGI_CYCLECNTR_SIZE
-#define SGI_CYCLECNTR_SIZE      165     /* Size user needs to use to read CC */
-#endif
-
-    if (iotimer_addr == NULL) {
-	    if (tries++ > 1) {
-	        /* Don't keep trying if it didn't work */
-	        return 0;
-	    }
-
-	    /*
-	    ** For SGI machines we can use the cycle counter, if it has one,
-	    ** to generate some truly random numbers
-	    */
-	    phys_addr = syssgi(SGI_QUERY_CYCLECNTR, &cycleval);
-	    if (phys_addr) {
-	        int pgsz = getpagesize();
-	        int pgoffmask = pgsz - 1;
-
-	        raddr = phys_addr & ~pgoffmask;
-	        mfd = open("/dev/mmem", O_RDONLY);
-	        if (mfd < 0) {
-    		    return 0;
-	        }
-	        iotimer_addr = (unsigned *)
-		    mmap(0, pgoffmask, PROT_READ, MAP_PRIVATE, mfd, (int)raddr);
-	        if (iotimer_addr == (unsigned*)-1) {
-	    	    close(mfd);
-		        iotimer_addr = NULL;
-		        return 0;
-	        }
-	        iotimer_addr = (unsigned*)
-		    ((__psint_t)iotimer_addr | (phys_addr & pgoffmask));
-	        /*
-	         * The file 'mfd' is purposefully not closed.
-	         */
-	        cntr_size = syssgi(SGI_CYCLECNTR_SIZE);
-	        if (cntr_size < 0) {
-    		    struct utsname utsinfo;
-
-		        /* 
-		         * We must be executing on a 6.0 or earlier system, since the
-		         * SGI_CYCLECNTR_SIZE call is not supported.
-		         * 
-		         * The only pre-6.1 platforms with 64-bit counters are
-		         * IP19 and IP21 (Challenge, PowerChallenge, Onyx).
-		         */
-		        uname(&utsinfo);
-		        if (!strncmp(utsinfo.machine, "IP19", 4) ||
-		            !strncmp(utsinfo.machine, "IP21", 4))
-			        cntr_size = 64;
-		        else
-			        cntr_size = 32;
-	        }
-	        cntr_size /= 8;	/* Convert from bits to bytes */
-	    }
-    }
-
-    s0[0] = *iotimer_addr;
-    if (cntr_size > 4)
-	s0[1] = *(iotimer_addr + 1);
-    memcpy(buf, (char *)&s0[0], cntr_size);
-    return _pr_CopyLowBits(buf, maxbuf, &s0, cntr_size);
-}
-
-#elif defined(SONY)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    return 0;
-}
-
-#elif defined(SNI)
-#include <sys/times.h>
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    int ticks;
-    struct tms buffer;
-
-    ticks=times(&buffer);
-    return _pr_CopyLowBits(buf, maxbytes, &ticks, sizeof(ticks));
-}
-
-#elif defined(NEC)
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    return 0;
-}
-#elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \
-    || defined(QNX) || defined(DARWIN) || defined(RISCOS)
-#include <sys/times.h>
-
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    int ticks;
-    struct tms buffer;
-
-    ticks=times(&buffer);
-    return _pr_CopyLowBits(buf, maxbytes, &ticks, sizeof(ticks));
-}
-#else
-#error! Platform undefined
-#endif /* defined(SOLARIS) */
-
-extern PRSize _PR_MD_GetRandomNoise( void *buf, PRSize size )
-{
-    struct timeval tv;
-    int n = 0;
-    int s;
-
-    n += GetHighResClock(buf, size);
-    size -= n;
-
-    GETTIMEOFDAY(&tv);
-
-    if ( size > 0 ) {
-        s = _pr_CopyLowBits((char*)buf+n, size, &tv.tv_usec, sizeof(tv.tv_usec));
-        size -= s;
-        n += s;
-    }
-    if ( size > 0 ) {
-        s = _pr_CopyLowBits((char*)buf+n, size, &tv.tv_sec, sizeof(tv.tv_usec));
-        size -= s;
-        n += s;
-    }
-
-    return n;
-} /* end _PR_MD_GetRandomNoise() */
diff --git a/libs/js/nsprpub/pr/src/md/unix/uxshm.c b/libs/js/nsprpub/pr/src/md/unix/uxshm.c
deleted file mode 100644
index 6f3192fd24..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/uxshm.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** uxshm.c -- Unix Implementations NSPR Named Shared Memory
-**
-**
-** lth. Jul-1999.
-**
-*/
-#include <string.h>
-#include <prshm.h>
-#include <prerr.h>
-#include <prmem.h>
-#include "primpl.h"       
-#include <fcntl.h>
-
-extern PRLogModuleInfo *_pr_shm_lm;
-
-
-#define NSPR_IPC_SHM_KEY 'b'
-/*
-** Implementation for System V
-*/
-#if defined PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#define _MD_OPEN_SHARED_MEMORY _MD_OpenSharedMemory
-#define _MD_ATTACH_SHARED_MEMORY _MD_AttachSharedMemory
-#define _MD_DETACH_SHARED_MEMORY _MD_DetachSharedMemory
-#define _MD_CLOSE_SHARED_MEMORY _MD_CloseSharedMemory
-#define _MD_DELETE_SHARED_MEMORY  _MD_DeleteSharedMemory
-
-extern PRSharedMemory * _MD_OpenSharedMemory( 
-    const char *name,
-    PRSize      size,
-    PRIntn      flags,
-    PRIntn      mode
-)
-{
-    PRStatus rc = PR_SUCCESS;
-    key_t   key;
-    PRSharedMemory *shm;
-    char        ipcname[PR_IPC_NAME_SIZE];
-
-    rc = _PR_MakeNativeIPCName( name, ipcname, PR_IPC_NAME_SIZE, _PRIPCShm );
-    if ( PR_FAILURE == rc )
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): _PR_MakeNativeIPCName() failed: %s", name ));
-        return( NULL );
-    }
-
-    shm = PR_NEWZAP( PRSharedMemory );
-    if ( NULL == shm ) 
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New PRSharedMemory out of memory")); 
-        return( NULL );
-    }
-
-    shm->ipcname = (char*)PR_MALLOC( strlen( ipcname ) + 1 );
-    if ( NULL == shm->ipcname )
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New shm->ipcname out of memory")); 
-        return( NULL );
-    }
-
-    /* copy args to struct */
-    strcpy( shm->ipcname, ipcname );
-    shm->size = size; 
-    shm->mode = mode; 
-    shm->flags = flags;
-    shm->ident = _PR_SHM_IDENT;
-
-    /* create the file first */
-    if ( flags & PR_SHM_CREATE )  {
-        int osfd = open( shm->ipcname, (O_RDWR | O_CREAT), shm->mode );
-        if ( -1 == osfd ) {
-            _PR_MD_MAP_OPEN_ERROR( errno );
-            PR_FREEIF( shm->ipcname );
-            PR_DELETE( shm );
-            return( NULL );
-        } 
-        if ( close(osfd) == -1 ) {
-            _PR_MD_MAP_CLOSE_ERROR( errno );
-            PR_FREEIF( shm->ipcname );
-            PR_DELETE( shm );
-            return( NULL );
-        }
-    }
-
-    /* hash the shm.name to an ID */
-    key = ftok( shm->ipcname, NSPR_IPC_SHM_KEY );
-    if ( -1 == key )
-    {
-        rc = PR_FAILURE;
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): ftok() failed on name: %s", shm->ipcname));
-        PR_FREEIF( shm->ipcname );
-        PR_DELETE( shm );
-        return( NULL );
-    }
-
-    /* get the shared memory */
-    if ( flags & PR_SHM_CREATE )  {
-        shm->id = shmget( key, shm->size, ( shm->mode | IPC_CREAT|IPC_EXCL));
-        if ( shm->id >= 0 ) {
-            return( shm );
-        }
-        if ((errno == EEXIST) && (flags & PR_SHM_EXCL)) {
-            PR_SetError( PR_FILE_EXISTS_ERROR, errno );
-            PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-                ("_MD_OpenSharedMemory(): shmget() exclusive failed, errno: %d", errno));
-            PR_FREEIF(shm->ipcname);
-            PR_DELETE(shm);
-            return(NULL);
-        }
-    } 
-
-    shm->id = shmget( key, shm->size, shm->mode );
-    if ( -1 == shm->id ) {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): shmget() failed, errno: %d", errno));
-        PR_FREEIF(shm->ipcname);
-        PR_DELETE(shm);
-        return(NULL);
-    }
-
-    return( shm );
-} /* end _MD_OpenSharedMemory() */
-
-extern void * _MD_AttachSharedMemory( PRSharedMemory *shm, PRIntn flags )
-{
-    void        *addr;
-    PRUint32    aFlags = shm->mode;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    aFlags |= (flags & PR_SHM_READONLY )? SHM_RDONLY : 0;
-
-    addr = shmat( shm->id, NULL, aFlags );
-    if ( (void*)-1 == addr )
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_AttachSharedMemory(): shmat() failed on name: %s, OsError: %d", 
-                shm->ipcname, PR_GetOSError() ));
-        addr = NULL;
-    }
-
-    return addr;
-}    
-
-extern PRStatus _MD_DetachSharedMemory( PRSharedMemory *shm, void *addr )
-{
-    PRStatus rc = PR_SUCCESS;
-    PRIntn   urc;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    urc = shmdt( addr );
-    if ( -1 == urc )
-    {
-        rc = PR_FAILURE;
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DetachSharedMemory(): shmdt() failed on name: %s", shm->ipcname ));
-    }
-
-    return rc;
-}    
-
-extern PRStatus _MD_CloseSharedMemory( PRSharedMemory *shm )
-{
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    PR_FREEIF(shm->ipcname);
-    PR_DELETE(shm);
-
-    return PR_SUCCESS;
-}    
-
-extern PRStatus _MD_DeleteSharedMemory( const char *name )
-{
-    PRStatus rc = PR_SUCCESS;
-    key_t   key;
-    int     id;
-    PRIntn  urc;
-    char        ipcname[PR_IPC_NAME_SIZE];
-
-    rc = _PR_MakeNativeIPCName( name, ipcname, PR_IPC_NAME_SIZE, _PRIPCShm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_SetError( PR_UNKNOWN_ERROR , errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): _PR_MakeNativeIPCName() failed: %s", name ));
-        return(PR_FAILURE);
-    }
-
-    /* create the file first */ 
-    {
-        int osfd = open( ipcname, (O_RDWR | O_CREAT), 0666 );
-        if ( -1 == osfd ) {
-            _PR_MD_MAP_OPEN_ERROR( errno );
-            return( PR_FAILURE );
-        } 
-        if ( close(osfd) == -1 ) {
-            _PR_MD_MAP_CLOSE_ERROR( errno );
-            return( PR_FAILURE );
-        }
-    }
-
-    /* hash the shm.name to an ID */
-    key = ftok( ipcname, NSPR_IPC_SHM_KEY );
-    if ( -1 == key )
-    {
-        rc = PR_FAILURE;
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): ftok() failed on name: %s", ipcname));
-    }
-
-    id = shmget( key, 0, 0 );
-    if ( -1 == id ) {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): shmget() failed, errno: %d", errno));
-        return(PR_FAILURE);
-    }
-
-    urc = shmctl( id, IPC_RMID, NULL );
-    if ( -1 == urc )
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): shmctl() failed on name: %s", ipcname ));
-        return(PR_FAILURE);
-    }
-
-    urc = unlink( ipcname );
-    if ( -1 == urc ) {
-        _PR_MD_MAP_UNLINK_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): unlink() failed: %s", ipcname ));
-        return(PR_FAILURE);
-    }
-
-    return rc;
-}  /* end _MD_DeleteSharedMemory() */
-
-/*
-** Implementation for Posix
-*/
-#elif defined PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-#include <sys/mman.h>
-
-#define _MD_OPEN_SHARED_MEMORY _MD_OpenSharedMemory
-#define _MD_ATTACH_SHARED_MEMORY _MD_AttachSharedMemory
-#define _MD_DETACH_SHARED_MEMORY _MD_DetachSharedMemory
-#define _MD_CLOSE_SHARED_MEMORY _MD_CloseSharedMemory
-#define _MD_DELETE_SHARED_MEMORY  _MD_DeleteSharedMemory
-
-struct _MDSharedMemory {
-    int     handle;
-};
-
-extern PRSharedMemory * _MD_OpenSharedMemory( 
-    const char *name,
-    PRSize      size,
-    PRIntn      flags,
-    PRIntn      mode
-)
-{
-    PRStatus    rc = PR_SUCCESS;
-    PRInt32     end;
-    PRSharedMemory *shm;
-    char        ipcname[PR_IPC_NAME_SIZE];
-
-    rc = _PR_MakeNativeIPCName( name, ipcname, PR_IPC_NAME_SIZE, _PRIPCShm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_SetError( PR_UNKNOWN_ERROR , errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): _PR_MakeNativeIPCName() failed: %s", name ));
-        return( NULL );
-    }
-
-    shm = PR_NEWZAP( PRSharedMemory );
-    if ( NULL == shm ) 
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New PRSharedMemory out of memory")); 
-        return( NULL );
-    }
-
-    shm->ipcname = PR_MALLOC( strlen( ipcname ) + 1 );
-    if ( NULL == shm->ipcname )
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New shm->ipcname out of memory")); 
-        return( NULL );
-    }
-
-    /* copy args to struct */
-    strcpy( shm->ipcname, ipcname );
-    shm->size = size; 
-    shm->mode = mode;
-    shm->flags = flags;
-    shm->ident = _PR_SHM_IDENT;
-
-    /*
-    ** Create the shared memory
-    */
-    if ( flags & PR_SHM_CREATE )  {
-        int oflag = (O_CREAT | O_RDWR);
-        
-        if ( flags & PR_SHM_EXCL )
-            oflag |= O_EXCL;
-        shm->id = shm_open( shm->ipcname, oflag, shm->mode );
-    } else {
-        shm->id = shm_open( shm->ipcname, O_RDWR, shm->mode );
-    }
-
-    if ( -1 == shm->id )  {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): shm_open failed: %s, OSError: %d",
-                shm->ipcname, PR_GetOSError())); 
-        PR_DELETE( shm->ipcname );
-        PR_DELETE( shm );
-        return(NULL);
-    }
-
-    end = ftruncate( shm->id, shm->size );
-    if ( -1 == end ) {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): ftruncate failed, OSError: %d",
-                PR_GetOSError()));
-        PR_DELETE( shm->ipcname );
-        PR_DELETE( shm );
-        return(NULL);
-    }
-
-    return(shm);
-} /* end _MD_OpenSharedMemory() */
-
-extern void * _MD_AttachSharedMemory( PRSharedMemory *shm, PRIntn flags )
-{
-    void        *addr;
-    PRIntn      prot = (PROT_READ | PROT_WRITE);
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    if ( PR_SHM_READONLY == flags)
-        prot ^= PROT_WRITE;
-
-    addr = mmap( (void*)0, shm->size, prot, MAP_SHARED, shm->id, 0 );
-    if ((void*)-1 == addr )
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_AttachSharedMemory(): mmap failed: %s, errno: %d",
-                shm->ipcname, PR_GetOSError()));
-        addr = NULL;
-    } else {
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_AttachSharedMemory(): name: %s, attached at: %p", shm->ipcname, addr));
-    }
-    
-    return addr;
-}    
-
-extern PRStatus _MD_DetachSharedMemory( PRSharedMemory *shm, void *addr )
-{
-    PRStatus    rc = PR_SUCCESS;
-    PRIntn      urc;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    urc = munmap( addr, shm->size );
-    if ( -1 == urc )
-    {
-        rc = PR_FAILURE;
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DetachSharedMemory(): munmap failed: %s, errno: %d", 
-                shm->ipcname, PR_GetOSError()));
-    }
-    return rc;
-}    
-
-extern PRStatus _MD_CloseSharedMemory( PRSharedMemory *shm )
-{
-    int urc;
-    
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    urc = close( shm->id );
-    if ( -1 == urc ) {
-        _PR_MD_MAP_CLOSE_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_CloseSharedMemory(): close() failed, error: %d", PR_GetOSError()));
-        return(PR_FAILURE);
-    }
-    PR_DELETE( shm->ipcname );
-    PR_DELETE( shm );
-    return PR_SUCCESS;
-}    
-
-extern PRStatus _MD_DeleteSharedMemory( const char *name )
-{
-    PRStatus    rc = PR_SUCCESS;
-    PRUintn     urc;
-    char        ipcname[PR_IPC_NAME_SIZE];
-
-    rc = _PR_MakeNativeIPCName( name, ipcname, PR_IPC_NAME_SIZE, _PRIPCShm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_SetError( PR_UNKNOWN_ERROR , errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_OpenSharedMemory(): _PR_MakeNativeIPCName() failed: %s", name ));
-        return rc;
-    }
-
-    urc = shm_unlink( ipcname );
-    if ( -1 == urc ) {
-        rc = PR_FAILURE;
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): shm_unlink failed: %s, errno: %d", 
-                ipcname, PR_GetOSError()));
-    } else {
-        PR_LOG( _pr_shm_lm, PR_LOG_DEBUG, 
-            ("_MD_DeleteSharedMemory(): %s, success", ipcname));
-    }
-
-    return rc;
-} /* end _MD_DeleteSharedMemory() */
-#endif
-
-
-
-/*
-** Unix implementation for anonymous memory (file) mapping
-*/
-extern PRLogModuleInfo *_pr_shma_lm;
-
-#include <unistd.h>
-
-extern PRFileMap* _md_OpenAnonFileMap( 
-    const char *dirName,
-    PRSize      size,
-    PRFileMapProtect prot
-)
-{
-    PRFileMap   *fm = NULL;
-    PRFileDesc  *fd;
-    int         osfd;
-    PRIntn      urc;
-    PRIntn      mode = 0600;
-    char        *genName;
-    pid_t       pid = getpid(); /* for generating filename */
-    PRThread    *tid = PR_GetCurrentThread(); /* for generating filename */
-    int         incr; /* for generating filename */
-    const int   maxTries = 20; /* maximum # attempts at a unique filename */
-    PRInt64     size64; /* 64-bit version of 'size' */
-
-    /*
-    ** generate a filename from input and runtime environment
-    ** open the file, unlink the file.
-    ** make maxTries number of attempts at uniqueness in the filename
-    */
-    for ( incr = 0; incr < maxTries ; incr++ ) {
-        genName = PR_smprintf( "%s/.NSPR-AFM-%d-%p.%d", 
-            dirName, (int) pid, tid, incr );
-        if ( NULL == genName ) {
-            PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-                ("_md_OpenAnonFileMap(): PR_snprintf(): failed, generating filename"));
-            goto Finished;
-        }
-        
-        /* create the file */
-        osfd = open( genName, (O_CREAT | O_EXCL | O_RDWR), mode );
-        if ( -1 == osfd ) {
-            if ( EEXIST == errno )  {
-                PR_smprintf_free( genName );
-                continue; /* name exists, try again */
-            } else {
-                _PR_MD_MAP_OPEN_ERROR( errno );
-                PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-                    ("_md_OpenAnonFileMap(): open(): failed, filename: %s, errno: %d", 
-                        genName, PR_GetOSError()));
-                PR_smprintf_free( genName );
-                goto Finished;
-            }
-        }
-        break; /* name generation and open successful, break; */
-    } /* end for() */
-
-    if ( incr == maxTries ) {
-        PR_ASSERT( -1 == osfd );
-        PR_ASSERT( EEXIST == errno );
-        _PR_MD_MAP_OPEN_ERROR( errno );
-        goto Finished;
-    }
-
-    urc = unlink( genName );
-    if ( -1 == urc ) {
-        _PR_MD_MAP_UNLINK_ERROR( errno );
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_OpenAnonFileMap(): failed on unlink(), errno: %d", errno));
-        PR_smprintf_free( genName );
-        close( osfd );
-        goto Finished;        
-    }
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_OpenAnonFileMap(): unlink(): %s", genName ));
-
-    PR_smprintf_free( genName );
-
-    fd = PR_ImportFile( osfd );
-    if ( NULL == fd ) {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_OpenAnonFileMap(): PR_ImportFile(): failed"));
-        goto Finished;        
-    }
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_OpenAnonFileMap(): fd: %p", fd ));
-
-    urc = ftruncate( fd->secret->md.osfd, size );
-    if ( -1 == urc ) {
-        _PR_MD_MAP_DEFAULT_ERROR( errno );
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_OpenAnonFileMap(): failed on ftruncate(), errno: %d", errno));
-        PR_Close( fd );
-        goto Finished;        
-    }
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_OpenAnonFileMap(): ftruncate(): size: %d", size ));
-
-    LL_UI2L(size64, size);  /* PRSize (size_t) is unsigned */
-    fm = PR_CreateFileMap( fd, size64, prot );
-    if ( NULL == fm )  {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("PR_OpenAnonFileMap(): failed"));
-        PR_Close( fd );
-        goto Finished;        
-    }
-    fm->md.isAnonFM = PR_TRUE; /* set fd close */
-
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_OpenAnonFileMap(): PR_CreateFileMap(): fm: %p", fm ));
-
-Finished:    
-    return(fm);
-} /* end md_OpenAnonFileMap() */
-
-/*
-** _md_ExportFileMapAsString()
-**
-**
-*/
-extern PRStatus _md_ExportFileMapAsString(
-    PRFileMap *fm,
-    PRSize    bufSize,
-    char      *buf
-)
-{
-    PRIntn  written;
-    PRIntn  prot = (PRIntn)fm->prot;
-    
-    written = PR_snprintf( buf, bufSize, "%ld:%d",
-        fm->fd->secret->md.osfd, prot );
-        
-    return((written == -1)? PR_FAILURE : PR_SUCCESS);
-} /* end _md_ExportFileMapAsString() */
-
-
-extern PRFileMap * _md_ImportFileMapFromString(
-    const char *fmstring
-)
-{
-    PRStatus    rc;
-    PRInt32     osfd;
-    PRIntn      prot; /* really: a PRFileMapProtect */
-    PRFileDesc  *fd;
-    PRFileMap   *fm = NULL; /* default return value */
-    PRFileInfo64 info;
-
-    PR_sscanf( fmstring, "%ld:%d", &osfd, &prot );
-
-    /* import the os file descriptor */
-    fd = PR_ImportFile( osfd );
-    if ( NULL == fd ) {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_ImportFileMapFromString(): PR_ImportFile() failed"));
-        goto Finished;
-    }
-
-    rc = PR_GetOpenFileInfo64( fd, &info );
-    if ( PR_FAILURE == rc )  {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_ImportFileMapFromString(): PR_GetOpenFileInfo64() failed"));    
-        goto Finished;
-    }
-
-    fm = PR_CreateFileMap( fd, info.size, (PRFileMapProtect)prot );
-    if ( NULL == fm ) {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_ImportFileMapFromString(): PR_CreateFileMap() failed"));    
-    }
-
-Finished:
-    return(fm);
-} /* end _md_ImportFileMapFromString() */
diff --git a/libs/js/nsprpub/pr/src/md/unix/uxwrap.c b/libs/js/nsprpub/pr/src/md/unix/uxwrap.c
deleted file mode 100644
index ef226a6be1..0000000000
--- a/libs/js/nsprpub/pr/src/md/unix/uxwrap.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *------------------------------------------------------------------------
- * File: uxwrap.c
- *
- *     Our wrapped versions of the Unix select() and poll() system calls.
- *
- *------------------------------------------------------------------------
- */
-
-#include "primpl.h"
-
-#if defined(_PR_PTHREADS) || defined(_PR_GLOBAL_THREADS_ONLY) || defined(QNX)
-/* Do not wrap select() and poll(). */
-#else  /* defined(_PR_PTHREADS) || defined(_PR_GLOBAL_THREADS_ONLY) */
-/* The include files for select() */
-#ifdef IRIX
-#include <unistd.h>
-#include <bstring.h>
-#endif
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#define ZAP_SET(_to, _width)				      \
-    PR_BEGIN_MACRO					      \
-	memset(_to, 0,					      \
-	       ((_width + 8*sizeof(int)-1) / (8*sizeof(int))) \
-		* sizeof(int)				      \
-	       );					      \
-    PR_END_MACRO
-
-/* see comments in ns/cmd/xfe/mozilla.c (look for "PR_XGetXtHackFD") */
-static int _pr_xt_hack_fd = -1;
- 
-int PR_XGetXtHackFD(void)
-{
-    int fds[2];
- 
-    if (_pr_xt_hack_fd == -1) {
-        if (!pipe(fds)) {
-            _pr_xt_hack_fd = fds[0];
-        }
-    }
-    return _pr_xt_hack_fd;
-}
-
-static int (*_pr_xt_hack_okayToReleaseXLock)(void) = 0;
-
-void PR_SetXtHackOkayToReleaseXLockFn(int (*fn)(void))
-{
-    _pr_xt_hack_okayToReleaseXLock = fn; 
-}
-
-
-/*
- *-----------------------------------------------------------------------
- *  select() --
- *
- *    Wrap up the select system call so that we can deschedule
- *    a thread that tries to wait for i/o.
- *
- *-----------------------------------------------------------------------
- */
-
-#if defined(HPUX9)
-int select(size_t width, int *rl, int *wl, int *el, const struct timeval *tv)
-#elif defined(NEXTSTEP)
-int wrap_select(int width, fd_set *rd, fd_set *wr, fd_set *ex,
-        const struct timeval *tv)
-#elif defined(AIX_RENAME_SELECT)
-int wrap_select(unsigned long width, void *rl, void *wl, void *el,
-        struct timeval *tv)
-#elif defined(_PR_SELECT_CONST_TIMEVAL)
-int select(int width, fd_set *rd, fd_set *wr, fd_set *ex,
-        const struct timeval *tv)
-#else
-int select(int width, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *tv)
-#endif
-{
-    int osfd;
-    _PRUnixPollDesc *unixpds, *unixpd, *eunixpd;
-    PRInt32 pdcnt;
-    PRIntervalTime timeout;
-    int retVal;
-#if defined(HPUX9) || defined(AIX_RENAME_SELECT)
-    fd_set *rd = (fd_set*) rl;
-    fd_set *wr = (fd_set*) wl;
-    fd_set *ex = (fd_set*) el;
-#endif
-
-#if 0
-    /*
-     * Easy special case: zero timeout.  Simply call the native
-     * select() with no fear of blocking.
-     */
-    if (tv != NULL && tv->tv_sec == 0 && tv->tv_usec == 0) {
-#if defined(HPUX9) || defined(AIX_RENAME_SELECT)
-        return _MD_SELECT(width, rl, wl, el, tv);
-#else
-        return _MD_SELECT(width, rd, wr, ex, tv);
-#endif
-    }
-#endif
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-		
-#ifndef _PR_LOCAL_THREADS_ONLY
-    if (_PR_IS_NATIVE_THREAD(_PR_MD_CURRENT_THREAD())) {
-        return _MD_SELECT(width, rd, wr, ex, tv);	
-    }
-#endif
-
-    if (width < 0 || width > FD_SETSIZE) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    /* Compute timeout */
-    if (tv) {
-        /*
-         * These acceptable ranges for t_sec and t_usec are taken
-         * from the select() man pages.
-         */
-        if (tv->tv_sec < 0 || tv->tv_sec > 100000000
-                || tv->tv_usec < 0 || tv->tv_usec >= 1000000) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        /* Convert microseconds to ticks */
-        timeout = PR_MicrosecondsToInterval(1000000*tv->tv_sec + tv->tv_usec);
-    } else {
-        /* tv being a NULL pointer means blocking indefinitely */
-        timeout = PR_INTERVAL_NO_TIMEOUT;
-    }
-
-    /* Check for no descriptors case (just doing a timeout) */
-    if ((!rd && !wr && !ex) || !width) {
-        PR_Sleep(timeout);
-        return 0;
-    }
-
-    /*
-     * Set up for PR_Poll().  The PRPollDesc array is allocated
-     * dynamically.  If this turns out to have high performance
-     * penalty, one can change to use a large PRPollDesc array
-     * on the stack, and allocate dynamically only when it turns
-     * out to be not large enough.
-     *
-     * I allocate an array of size 'width', which is the maximum
-     * number of fds we may need to poll.
-     */
-    unixpds = (_PRUnixPollDesc *) PR_CALLOC(width * sizeof(_PRUnixPollDesc));
-    if (!unixpds) {
-        errno = ENOMEM;
-        return -1;
-    }
-
-    pdcnt = 0;
-    unixpd = unixpds;
-    for (osfd = 0; osfd < width; osfd++) {
-        int in_flags = 0;
-        if (rd && FD_ISSET(osfd, rd)) {
-            in_flags |= _PR_UNIX_POLL_READ;
-        }
-        if (wr && FD_ISSET(osfd, wr)) {
-            in_flags |= _PR_UNIX_POLL_WRITE;
-        }
-        if (ex && FD_ISSET(osfd, ex)) {
-            in_flags |= _PR_UNIX_POLL_EXCEPT;
-        }
-        if (in_flags) {
-            unixpd->osfd = osfd;
-            unixpd->in_flags = in_flags;
-            unixpd->out_flags = 0;
-            unixpd++;
-            pdcnt++;
-        }
-    }
-
-    /*
-     * see comments in mozilla/cmd/xfe/mozilla.c (look for
-     * "PR_XGetXtHackFD")
-     */
-   {
-     int needToLockXAgain;
- 
-     needToLockXAgain = 0;
-     if (rd && (_pr_xt_hack_fd != -1)
-             && FD_ISSET(_pr_xt_hack_fd, rd) && PR_XIsLocked()
-             && (!_pr_xt_hack_okayToReleaseXLock
-             || _pr_xt_hack_okayToReleaseXLock())) {
-         PR_XUnlock();
-         needToLockXAgain = 1;
-     }
-
-    /* This is the potentially blocking step */
-    retVal = _PR_WaitForMultipleFDs(unixpds, pdcnt, timeout);
-
-     if (needToLockXAgain) {
-         PR_XLock();
-     }
-   }
-
-    if (retVal > 0) {
-        /* Compute select results */
-        if (rd) ZAP_SET(rd, width);
-        if (wr) ZAP_SET(wr, width);
-        if (ex) ZAP_SET(ex, width);
-
-        /*
-         * The return value can be either the number of ready file
-         * descriptors or the number of set bits in the three fd_set's.
-         */
-        retVal = 0;  /* we're going to recompute */
-        eunixpd = unixpds + pdcnt;
-        for (unixpd = unixpds; unixpd < eunixpd; unixpd++) {
-            if (unixpd->out_flags) {
-                int nbits = 0;  /* The number of set bits on for this fd */
-
-                if (unixpd->out_flags & _PR_UNIX_POLL_NVAL) {
-                    errno = EBADF;
-                    PR_LOG(_pr_io_lm, PR_LOG_ERROR,
-                            ("select returns EBADF for %d", unixpd->osfd));
-                    retVal = -1;
-                    break;
-                }
-                /*
-                 * If a socket has a pending error, it is considered
-                 * both readable and writable.  (See W. Richard Stevens,
-                 * Unix Network Programming, Vol. 1, 2nd Ed., Section 6.3,
-                 * pp. 153-154.)  We also consider a socket readable if
-                 * it has a hangup condition.
-                 */
-                if (rd && (unixpd->in_flags & _PR_UNIX_POLL_READ)
-                        && (unixpd->out_flags & (_PR_UNIX_POLL_READ
-                        | _PR_UNIX_POLL_ERR | _PR_UNIX_POLL_HUP))) {
-                    FD_SET(unixpd->osfd, rd);
-                    nbits++;
-                }
-                if (wr && (unixpd->in_flags & _PR_UNIX_POLL_WRITE)
-                        && (unixpd->out_flags & (_PR_UNIX_POLL_WRITE
-                        | _PR_UNIX_POLL_ERR))) {
-                    FD_SET(unixpd->osfd, wr);
-                    nbits++;
-                }
-                if (ex && (unixpd->in_flags & _PR_UNIX_POLL_WRITE)
-                        && (unixpd->out_flags & PR_POLL_EXCEPT)) {
-                    FD_SET(unixpd->osfd, ex);
-                    nbits++;
-                }
-                PR_ASSERT(nbits > 0);
-#if defined(HPUX) || defined(SOLARIS) || defined(SUNOS4) || defined(OSF1) || defined(AIX)
-                retVal += nbits;
-#else /* IRIX */
-                retVal += 1;
-#endif
-            }
-        }
-    }
-
-    PR_ASSERT(tv || retVal != 0);
-    PR_LOG(_pr_io_lm, PR_LOG_MIN, ("select returns %d", retVal));
-    PR_DELETE(unixpds);
-
-    return retVal;
-}
-
-/*
- * Redefine poll, when supported on platforms, for local threads
- */
-
-/*
- * I am commenting out the poll() wrapper for Linux for now
- * because it is difficult to define _MD_POLL that works on all
- * Linux varieties.  People reported that glibc 2.0.7 on Debian
- * 2.0 Linux machines doesn't have the __syscall_poll symbol
- * defined.  (WTC 30 Nov. 1998)
- */
-#if defined(_PR_POLL_AVAILABLE) && !defined(LINUX)
-
-/*
- *-----------------------------------------------------------------------
- * poll() --
- *
- * RETURN VALUES: 
- *     -1:  fails, errno indicates the error.
- *      0:  timed out, the revents bitmasks are not set.
- *      positive value: the number of file descriptors for which poll()
- *          has set the revents bitmask.
- *
- *-----------------------------------------------------------------------
- */
-
-#include <poll.h>
-
-#if defined(AIX_RENAME_SELECT)
-int wrap_poll(void *listptr, unsigned long nfds, long timeout)
-#elif (defined(AIX) && !defined(AIX_RENAME_SELECT))
-int poll(void *listptr, unsigned long nfds, long timeout)
-#elif defined(OSF1) || (defined(HPUX) && !defined(HPUX9))
-int poll(struct pollfd filedes[], unsigned int nfds, int timeout)
-#elif defined(HPUX9)
-int poll(struct pollfd filedes[], int nfds, int timeout)
-#elif defined(NETBSD)
-int poll(struct pollfd *filedes, nfds_t nfds, int timeout)
-#elif defined(OPENBSD)
-int poll(struct pollfd filedes[], nfds_t nfds, int timeout)
-#elif defined(FREEBSD)
-int poll(struct pollfd *filedes, unsigned nfds, int timeout)
-#else
-int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
-#endif
-{
-#ifdef AIX
-    struct pollfd *filedes = (struct pollfd *) listptr;
-#endif
-    struct pollfd *pfd, *epfd;
-    _PRUnixPollDesc *unixpds, *unixpd, *eunixpd;
-    PRIntervalTime ticks;
-    PRInt32 pdcnt;
-    int ready;
-
-    /*
-     * Easy special case: zero timeout.  Simply call the native
-     * poll() with no fear of blocking.
-     */
-    if (timeout == 0) {
-#if defined(AIX)
-        return _MD_POLL(listptr, nfds, timeout);
-#else
-        return _MD_POLL(filedes, nfds, timeout);
-#endif
-    }
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-
-#ifndef _PR_LOCAL_THREADS_ONLY
-    if (_PR_IS_NATIVE_THREAD(_PR_MD_CURRENT_THREAD())) {
-    	return _MD_POLL(filedes, nfds, timeout);
-    }
-#endif
-
-    /* We do not support the pollmsg structures on AIX */
-#ifdef AIX
-    PR_ASSERT((nfds & 0xff00) == 0);
-#endif
-
-    if (timeout < 0 && timeout != -1) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    /* Convert timeout from miliseconds to ticks */
-    if (timeout == -1) {
-        ticks = PR_INTERVAL_NO_TIMEOUT;
-    } else {
-        ticks = PR_MillisecondsToInterval(timeout);
-    }
-
-    /* Check for no descriptor case (just do a timeout) */
-    if (nfds == 0) {
-        PR_Sleep(ticks);
-        return 0;
-    }
-
-    unixpds = (_PRUnixPollDesc *)
-            PR_MALLOC(nfds * sizeof(_PRUnixPollDesc));
-    if (NULL == unixpds) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    pdcnt = 0;
-    epfd = filedes + nfds;
-    unixpd = unixpds;
-    for (pfd = filedes; pfd < epfd; pfd++) {
-        /*
-         * poll() ignores negative fd's.
-         */
-        if (pfd->fd >= 0) {
-            unixpd->osfd = pfd->fd;
-#ifdef _PR_USE_POLL
-            unixpd->in_flags = pfd->events;
-#else
-            /*
-             * Map the poll events to one of the three that can be
-             * represented by the select fd_sets:
-             *     POLLIN, POLLRDNORM  ===> readable
-             *     POLLOUT, POLLWRNORM ===> writable
-             *     POLLPRI, POLLRDBAND ===> exception
-             *     POLLNORM, POLLWRBAND (and POLLMSG on some platforms)
-             *     are ignored.
-             *
-             * The output events POLLERR and POLLHUP are never turned on.
-             * POLLNVAL may be turned on.
-             */
-            unixpd->in_flags = 0;
-            if (pfd->events & (POLLIN
-#ifdef POLLRDNORM
-                    | POLLRDNORM
-#endif
-                    )) {
-                unixpd->in_flags |= _PR_UNIX_POLL_READ;
-            }
-            if (pfd->events & (POLLOUT
-#ifdef POLLWRNORM
-                    | POLLWRNORM
-#endif
-                    )) {
-                unixpd->in_flags |= _PR_UNIX_POLL_WRITE;
-            }
-            if (pfd->events & (POLLPRI
-#ifdef POLLRDBAND
-                    | POLLRDBAND
-#endif
-                    )) {
-                unixpd->in_flags |= PR_POLL_EXCEPT;
-            }
-#endif  /* _PR_USE_POLL */
-            unixpd->out_flags = 0;
-            unixpd++;
-            pdcnt++;
-        }
-    }
-
-    ready = _PR_WaitForMultipleFDs(unixpds, pdcnt, ticks);
-    if (-1 == ready) {
-        if (PR_GetError() == PR_PENDING_INTERRUPT_ERROR) {
-            errno = EINTR;  /* XXX we aren't interrupted by a signal, but... */
-        } else {
-            errno = PR_GetOSError();
-        }
-    }
-    if (ready <= 0) {
-        goto done;
-    }
-
-    /*
-     * Copy the out_flags from the _PRUnixPollDesc structures to the
-     * user's pollfd structures and free the allocated memory
-     */
-    unixpd = unixpds;
-    for (pfd = filedes; pfd < epfd; pfd++) {
-        pfd->revents = 0;
-        if (pfd->fd >= 0) {
-#ifdef _PR_USE_POLL
-            pfd->revents = unixpd->out_flags;
-#else
-            if (0 != unixpd->out_flags) {
-                if (unixpd->out_flags & _PR_UNIX_POLL_READ) {
-                    if (pfd->events & POLLIN) {
-                        pfd->revents |= POLLIN;
-                    }
-#ifdef POLLRDNORM
-                    if (pfd->events & POLLRDNORM) {
-                        pfd->revents |= POLLRDNORM;
-                    }
-#endif
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_WRITE) {
-                    if (pfd->events & POLLOUT) {
-                        pfd->revents |= POLLOUT;
-                    }
-#ifdef POLLWRNORM
-                    if (pfd->events & POLLWRNORM) {
-                        pfd->revents |= POLLWRNORM;
-                    }
-#endif
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_EXCEPT) {
-                    if (pfd->events & POLLPRI) {
-                        pfd->revents |= POLLPRI;
-                    }
-#ifdef POLLRDBAND
-                    if (pfd->events & POLLRDBAND) {
-                        pfd->revents |= POLLRDBAND;
-                    }
-#endif
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_ERR) {
-                    pfd->revents |= POLLERR;
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_NVAL) {
-                    pfd->revents |= POLLNVAL;
-                }
-                if (unixpd->out_flags & _PR_UNIX_POLL_HUP) {
-                    pfd->revents |= POLLHUP;
-                }
-            }
-#endif  /* _PR_USE_POLL */
-            unixpd++;
-        }
-    }
-
-done:
-    PR_DELETE(unixpds);
-    return ready;
-}
-
-#endif  /* !defined(LINUX) */
-
-#endif  /* defined(_PR_PTHREADS) || defined(_PR_GLOBAL_THREADS_ONLY) */
-
-/* uxwrap.c */
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/.cvsignore b/libs/js/nsprpub/pr/src/md/windows/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/md/windows/Makefile.in b/libs/js/nsprpub/pr/src/md/windows/Makefile.in
deleted file mode 100644
index c97c982121..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), WIN16)
-CSRCS = \
-	w16null.c \
-	w16thred.c \
-	w16proc.c \
-    w16fmem.c \
-    w16sock.c \
-    w16mem.c \
-    w16io.c  \
-    w16gc.c  \
-    w16error.c  \
-    w16stdio.c  \
-    w16callb.c \
-    ntinrval.c \
-    $(NULL)
-else
-ifeq ($(OS_TARGET), WIN95)
-CSRCS =          \
-    ntmisc.c \
-    ntsec.c   \
-    ntsem.c   \
-    ntinrval.c \
-    ntgc.c \
-	w95thred.c \
-	w95io.c \
-	w95cv.c \
-	w32rng.c \
-	w95sock.c \
-	win32_errors.c \
-    w32ipcsem.c \
-    w32poll.c \
-    w32shm.c \
-    w95dllmain.c \
-    $(NULL)
-else
-CSRCS =          \
-    ntdllmn.c \
-    ntmisc.c \
-    ntsec.c   \
-    ntsem.c   \
-    ntinrval.c \
-    ntgc.c \
-    ntthread.c \
-    ntio.c    \
-	win32_errors.c \
-    w32ipcsem.c \
-    w32poll.c \
-    w32rng.c \
-    w32shm.c \
-    $(NULL)
-endif
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES += -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
-# Bug 122433 workaround: disable global optimization (-Og-) on ntio.c.
-ifdef BUILD_OPT
-ifeq ($(OS_TARGET), WINNT)
-ifndef NS_USE_GCC
-$(OBJDIR)/ntio.$(OBJ_SUFFIX): ntio.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(CFLAGS) -Og- $<
-endif
-endif
-endif
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c b/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c
deleted file mode 100644
index fa8d25f6f6..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntdllmn.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * The DLL entry point (DllMain) for NSPR.
- *
- * The only reason we use DLLMain() now is to find out whether
- * the NSPR DLL is statically or dynamically loaded.  When
- * dynamically loaded, we cannot use static thread-local storage.
- * However, static TLS is faster than the TlsXXX() functions.
- * So we want to use static TLS whenever we can.  A global
- * variable _pr_use_static_tls is set in DllMain() during process
- * attachment to indicate whether it is safe to use static TLS
- * or not.
- */
-
-#include <windows.h>
-#include <primpl.h>
-
-extern BOOL _pr_use_static_tls;  /* defined in ntthread.c */
-
-BOOL WINAPI DllMain(
-    HINSTANCE hinstDLL,
-    DWORD fdwReason,
-    LPVOID lpvReserved)
-{
-PRThread *me;
-
-    switch (fdwReason) {
-        case DLL_PROCESS_ATTACH:
-            /*
-             * If lpvReserved is NULL, we are dynamically loaded
-             * and therefore can't use static thread-local storage.
-             */
-            if (lpvReserved == NULL) {
-                _pr_use_static_tls = FALSE;
-            } else {
-                _pr_use_static_tls = TRUE;
-            }
-            break;
-        case DLL_THREAD_ATTACH:
-            break;
-        case DLL_THREAD_DETACH:
-            if (_pr_initialized) {
-                me = _MD_GET_ATTACHED_THREAD();
-                if ((me != NULL) && (me->flags & _PR_ATTACHED))
-                    _PRI_DetachThread();
-            }
-            break;
-        case DLL_PROCESS_DETACH:
-            break;
-    }
-    return TRUE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntgc.c b/libs/js/nsprpub/pr/src/md/windows/ntgc.c
deleted file mode 100644
index e12b30d6c9..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntgc.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * GC related routines
- *
- */
-#include <windows.h>
-#include "primpl.h"
-
-PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) 
-{
-#if defined(_X86_)
-    CONTEXT context;
-    context.ContextFlags = CONTEXT_INTEGER;
-
-    if (_PR_IS_NATIVE_THREAD(t)) {
-        context.ContextFlags |= CONTEXT_CONTROL;
-        if (GetThreadContext(t->md.handle, &context)) {
-            t->md.gcContext[0] = context.Eax;
-            t->md.gcContext[1] = context.Ebx;
-            t->md.gcContext[2] = context.Ecx;
-            t->md.gcContext[3] = context.Edx;
-            t->md.gcContext[4] = context.Esi;
-            t->md.gcContext[5] = context.Edi;
-            t->md.gcContext[6] = context.Esp;
-            t->md.gcContext[7] = context.Ebp;
-            *np = PR_NUM_GCREGS;
-        } else {
-            PR_ASSERT(0);/* XXX */
-        }
-    } else {
-        /* WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-         *
-         * This code is extremely machine dependant and completely 
-         * undocumented by MS.  Its only known to work experimentally.  
-         * Ready for a walk on the wild * side?
-         *
-         * WARNING WARNING WARNING WARNING WARNING WARNING WARNING */
-
-#if !defined WIN95 // Win95 does not have fibers
-        int *fiberData = t->md.fiber_id;
-
-        /* I found these offsets by disassembling SwitchToFiber().
-         * Are your palms sweating yet?
-         */
-
-        /* 
-        ** EAX is on the stack (ESP+0)
-        ** EDX is on the stack (ESP+4)
-        ** ECX is on the stack (ESP+8)
-        */
-        t->md.gcContext[0] = 0;                /* context.Eax */
-        t->md.gcContext[1] = fiberData[0x2e];  /* context.Ebx */
-        t->md.gcContext[2] = 0;                /* context.Ecx */
-        t->md.gcContext[2] = 0;                /* context.Edx */
-        t->md.gcContext[4] = fiberData[0x2d];  /* context.Esi */
-        t->md.gcContext[5] = fiberData[0x2c];  /* context.Edi */
-        t->md.gcContext[6] = fiberData[0x36];  /* context.Esp */
-        t->md.gcContext[7] = fiberData[0x32];  /* context.Ebp */
-        *np = PR_NUM_GCREGS;
-#endif
-    }
-    return (PRWord *)&t->md.gcContext;
-#else
-    PR_NOT_REACHED("not implemented");
-    return NULL;
-#endif /* defined(_X86_) */
-}
-
-/* This function is not used right now, but is left as a reference.
- * If you ever need to get the fiberID from the currently running fiber, 
- * this is it.
- */
-void *
-GetMyFiberID()
-{
-#if defined(_X86_) && !defined(__MINGW32__)
-    void *fiberData;
-
-    /* A pointer to our tib entry is found at FS:[18]
-     * At offset 10h is the fiberData pointer.  The context of the 
-     * fiber is stored in there.  
-     */
-    __asm {
-        mov    EDX, FS:[18h]
-        mov    EAX, DWORD PTR [EDX+10h]
-        mov    [fiberData], EAX
-    }
-  
-    return fiberData;
-#else
-    PR_NOT_REACHED("not implemented");
-    return NULL;
-#endif /* defined(_X86_) */
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntinrval.c b/libs/js/nsprpub/pr/src/md/windows/ntinrval.c
deleted file mode 100644
index b8d858315e..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntinrval.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * NT interval timers
- *
- */
-
-#include "primpl.h"
-
-void
-_PR_MD_INTERVAL_INIT()
-{
-}
-
-PRIntervalTime 
-_PR_MD_GET_INTERVAL()
-{
-    return timeGetTime();  /* milliseconds since system start */
-}
-
-PRIntervalTime 
-_PR_MD_INTERVAL_PER_SEC()
-{
-    return 1000;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntio.c b/libs/js/nsprpub/pr/src/md/windows/ntio.c
deleted file mode 100644
index c247d21047..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntio.c
+++ /dev/null
@@ -1,4698 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Masayuki Nakano <masayuki@d-toybox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Windows NT IO module
- *
- * This module handles IO for LOCAL_SCOPE and GLOBAL_SCOPE threads.
- * For LOCAL_SCOPE threads, we're using NT fibers.  For GLOBAL_SCOPE threads
- * we're using NT-native threads.
- *
- * When doing IO, we want to use completion ports for optimal performance 
- * with fibers.  But if we use completion ports for all IO, it is difficult
- * to project a blocking model with GLOBAL_SCOPE threads.  To handle this
- * we create an extra thread for completing IO for GLOBAL_SCOPE threads.
- * We don't really want to complete IO on a separate thread for LOCAL_SCOPE
- * threads because it means extra context switches, which are really slow
- * on NT...  Since we're using a single completion port, some IO will
- * be incorrectly completed on the GLOBAL_SCOPE IO thread; this will mean
- * extra context switching; but I don't think there is anything I can do
- * about it.
- */
-
-#include "primpl.h"
-#include "pprmwait.h"
-#include <direct.h>
-#include <mbstring.h>
-
-static HANDLE                _pr_completion_port;
-static PRThread             *_pr_io_completion_thread;
-
-#define RECYCLE_SIZE 512
-static struct _MDLock        _pr_recycle_lock;
-static PRInt32               _pr_recycle_array[RECYCLE_SIZE];
-static PRInt32               _pr_recycle_tail = 0; 
-
-__declspec(thread) PRThread *_pr_io_restarted_io = NULL;
-DWORD _pr_io_restartedIOIndex;  /* The thread local storage slot for each
-                                 * thread is initialized to NULL. */
-
-PRBool                       _nt_version_gets_lockfile_completion;
-
-struct _MDLock               _pr_ioq_lock;
-extern _MDLock               _nt_idleLock;
-extern PRCList               _nt_idleList;
-extern PRUint32              _nt_idleCount;
-
-#define CLOSE_TIMEOUT   PR_SecondsToInterval(5)
-
-/*
- * NSPR-to-NT access right mapping table for files.
- */
-static DWORD fileAccessTable[] = {
-    FILE_GENERIC_READ,
-    FILE_GENERIC_WRITE,
-    FILE_GENERIC_EXECUTE
-};
-
-/*
- * NSPR-to-NT access right mapping table for directories.
- */
-static DWORD dirAccessTable[] = {
-    FILE_GENERIC_READ,
-    FILE_GENERIC_WRITE|FILE_DELETE_CHILD,
-    FILE_GENERIC_EXECUTE
-};
-
-/*
- * The NSPR epoch (00:00:00 1 Jan 1970 UTC) in FILETIME.
- * We store the value in a PRTime variable for convenience.
- * This constant is used by _PR_FileTimeToPRTime().
- */
-#ifdef __GNUC__
-static const PRTime _pr_filetime_offset = 116444736000000000LL;
-#else
-static const PRTime _pr_filetime_offset = 116444736000000000i64;
-#endif
-
-static PRBool IsPrevCharSlash(const char *str, const char *current);
-
-#define _NEED_351_FILE_LOCKING_HACK
-#ifdef _NEED_351_FILE_LOCKING_HACK
-#define _PR_LOCAL_FILE 1
-#define _PR_REMOTE_FILE 2
-PRBool IsFileLocalInit();
-PRInt32 IsFileLocal(HANDLE hFile);
-#endif /* _NEED_351_FILE_LOCKING_HACK */
-
-static PRInt32 _md_MakeNonblock(HANDLE);
-
-static PROsfd _nt_nonblock_accept(PRFileDesc *fd, struct sockaddr *addr, int *addrlen, PRIntervalTime);
-static PRInt32 _nt_nonblock_connect(PRFileDesc *fd, struct sockaddr *addr, int addrlen, PRIntervalTime);
-static PRInt32 _nt_nonblock_recv(PRFileDesc *fd, char *buf, int len, int flags, PRIntervalTime);
-static PRInt32 _nt_nonblock_send(PRFileDesc *fd, char *buf, int len, PRIntervalTime);
-static PRInt32 _nt_nonblock_writev(PRFileDesc *fd, const PRIOVec *iov, int size, PRIntervalTime);
-static PRInt32 _nt_nonblock_sendto(PRFileDesc *, const char *, int, const struct sockaddr *, int, PRIntervalTime);
-static PRInt32 _nt_nonblock_recvfrom(PRFileDesc *, char *, int, struct sockaddr *, int *, PRIntervalTime);
-
-/*
- * We cannot associate a fd (a socket) with an I/O completion port
- * if the fd is nonblocking or inheritable.
- *
- * Nonblocking socket I/O won't work if the socket is associated with
- * an I/O completion port.
- *
- * An inheritable fd cannot be associated with an I/O completion port
- * because the completion notification of async I/O initiated by the
- * child process is still posted to the I/O completion port in the
- * parent process. 
- */
-#define _NT_USE_NB_IO(fd) \
-    ((fd)->secret->nonblocking || (fd)->secret->inheritable == _PR_TRI_TRUE)
-
-/*
- * UDP support
- * 
- * UDP is supported on NT by the continuation thread mechanism.
- * The code is borrowed from ptio.c in pthreads nspr, hence the
- * PT and pt prefixes.  This mechanism is in fact general and
- * not limited to UDP.  For now, only UDP's recvfrom and sendto
- * go through the continuation thread if they get WSAEWOULDBLOCK
- * on first try.  Recv and send on a connected UDP socket still
- * goes through asychronous io.
- */
-
-#define PT_DEFAULT_SELECT_MSEC 100
-
-typedef struct pt_Continuation pt_Continuation;
-typedef PRBool (*ContinuationFn)(pt_Continuation *op, PRInt16 revent);
-
-typedef enum pr_ContuationStatus
-{
-    pt_continuation_sumbitted,
-    pt_continuation_inprogress,
-    pt_continuation_abort,
-    pt_continuation_done
-} pr_ContuationStatus;
-
-struct pt_Continuation
-{
-    /* These objects are linked in ascending timeout order */
-    pt_Continuation *next, *prev;           /* self linked list of these things */
-
-    /* The building of the continuation operation */
-    ContinuationFn function;                /* what function to continue */
-    union { SOCKET osfd; } arg1;            /* #1 - the op's fd */
-    union { void* buffer; } arg2;           /* #2 - primary transfer buffer */
-    union { PRIntn amount; } arg3;          /* #3 - size of 'buffer' */
-    union { PRIntn flags; } arg4;           /* #4 - read/write flags */
-    union { PRNetAddr *addr; } arg5;        /* #5 - send/recv address */
-    
-    PRIntervalTime timeout;                 /* representation of the timeout */
-
-    PRIntn event;                           /* flags for select()'s events */
-
-    /*
-    ** The representation and notification of the results of the operation.
-    ** These function can either return an int return code or a pointer to
-    ** some object.
-    */
-    union { PRIntn code; void *object; } result;
-
-    PRIntn syserrno;                        /* in case it failed, why (errno) */
-    pr_ContuationStatus status;             /* the status of the operation */
-    PRCondVar *complete;                    /* to notify the initiating thread */
-};
-
-static struct pt_TimedQueue
-{
-    PRLock *ml;                             /* a little protection */
-    PRThread *thread;                       /* internal thread's identification */
-    PRCondVar *new_op;                      /* new operation supplied */
-    PRCondVar *finish_op;                   /* an existing operation finished */
-    PRUintn op_count;                       /* number of operations in the list */
-    pt_Continuation *head, *tail;           /* head/tail of list of operations */
-
-    pt_Continuation *op;                    /* timed operation furthest in future */
-    PRIntervalTime epoch;                   /* the epoch of 'timed' */
-} pt_tq;
-
-#if defined(DEBUG)
-static struct pt_debug_s
-{
-    PRIntn predictionsFoiled;
-    PRIntn pollingListMax;
-    PRIntn continuationsServed;
-} pt_debug;
-#endif  /* DEBUG */
-
-static void ContinuationThread(void *arg);
-static PRInt32 pt_SendTo(
-    SOCKET osfd, const void *buf,
-    PRInt32 amount, PRInt32 flags, const PRNetAddr *addr,
-    PRIntn addrlen, PRIntervalTime timeout);
-static PRInt32 pt_RecvFrom(SOCKET osfd, void *buf, PRInt32 amount,
-    PRInt32 flags, PRNetAddr *addr, PRIntn *addr_len, PRIntervalTime timeout);
-
-
-/* The key returned from GetQueuedCompletionStatus() is used to determine what
- * type of completion we have.  We differentiate between IO completions and
- * CVAR completions.
- */
-#define KEY_IO              0xaaaaaaaa
-#define KEY_CVAR            0xbbbbbbbb
-
-PRInt32
-_PR_MD_PAUSE_CPU(PRIntervalTime ticks)
-{
-    int awoken = 0;
-    unsigned long bytes, key;
-    int rv;
-    LPOVERLAPPED olp;
-    _MDOverlapped *mdOlp;
-    PRUint32 timeout;
-
-    if (_nt_idleCount > 0) {
-        PRThread *deadThread;
-
-        _MD_LOCK(&_nt_idleLock);
-        while( !PR_CLIST_IS_EMPTY(&_nt_idleList) ) {
-            deadThread = _PR_THREAD_PTR(PR_LIST_HEAD(&_nt_idleList));
-            PR_REMOVE_LINK(&deadThread->links);
-
-            PR_ASSERT(deadThread->state == _PR_DEAD_STATE);
-
-            /* XXXMB - cleanup to do here? */
-            if ( !_PR_IS_NATIVE_THREAD(deadThread) ){
-                /* Spinlock while user thread is still running.
-                 * There is no way to use a condition variable here. The thread
-                 * is dead, and we have to wait until we switch off the dead 
-                 * thread before we can kill the fiber completely.
-                 */
-                while ( deadThread->no_sched)
-                    ;
-
-                DeleteFiber(deadThread->md.fiber_id);
-            }
-            memset(deadThread, 0xa, sizeof(PRThread)); /* debugging */
-            if (!deadThread->threadAllocatedOnStack)
-                PR_DELETE(deadThread);
-            _nt_idleCount--;
-        }
-        _MD_UNLOCK(&_nt_idleLock);
-    }
-
-    if (ticks == PR_INTERVAL_NO_TIMEOUT)
-#if 0
-        timeout = INFINITE;
-#else
-    /*
-     * temporary hack to poll the runq every 5 seconds because of bug in
-     * native threads creating user threads and not poking the right cpu.
-     *
-     * A local thread that was interrupted is bound to its current
-     * cpu but there is no easy way for the interrupter to poke the
-     * right cpu.  This is a hack to poll the runq every 5 seconds.
-     */
-        timeout = 5000;
-#endif
-    else 
-        timeout = PR_IntervalToMilliseconds(ticks);
-
-    /*
-     * The idea of looping here is to complete as many IOs as possible before
-     * returning.  This should minimize trips to the idle thread.
-     */
-    while(1) {
-        rv = GetQueuedCompletionStatus(
-                _pr_completion_port,
-                &bytes,
-                &key,
-                &olp,
-                timeout); 
-        if (rv == 0 && olp == NULL) {
-            /* Error in GetQueuedCompetionStatus */
-            if (GetLastError() != WAIT_TIMEOUT) {
-                /* ARGH - what can we do here? Log an error? XXXMB */
-                return -1;
-            } else {
-                /* If awoken == 0, then we just had a timeout */
-                return awoken;
-            }
-        }
-
-        if (olp == NULL) 
-            return 0;
-
-        mdOlp = (_MDOverlapped *)olp;
-
-        if (mdOlp->ioModel == _MD_MultiWaitIO) {
-            PRRecvWait *desc;
-            PRWaitGroup *group;
-            PRThread *thred = NULL;
-            PRMWStatus mwstatus;
-
-            desc = mdOlp->data.mw.desc;
-            PR_ASSERT(desc != NULL);
-            mwstatus = rv ? PR_MW_SUCCESS : PR_MW_FAILURE;
-            if (InterlockedCompareExchange((PVOID *)&desc->outcome,
-                    (PVOID)mwstatus, (PVOID)PR_MW_PENDING)
-                    == (PVOID)PR_MW_PENDING) {
-                if (mwstatus == PR_MW_SUCCESS) {
-                    desc->bytesRecv = bytes;
-                } else {
-                    mdOlp->data.mw.error = GetLastError();
-                }
-            }
-            group = mdOlp->data.mw.group;
-            PR_ASSERT(group != NULL);
-
-            _PR_MD_LOCK(&group->mdlock);
-            PR_APPEND_LINK(&mdOlp->data.mw.links, &group->io_ready);
-            PR_ASSERT(desc->fd != NULL);
-            NT_HashRemoveInternal(group, desc->fd);
-            if (!PR_CLIST_IS_EMPTY(&group->wait_list)) {
-                thred = _PR_THREAD_CONDQ_PTR(PR_LIST_HEAD(&group->wait_list));
-                PR_REMOVE_LINK(&thred->waitQLinks);
-            }
-            _PR_MD_UNLOCK(&group->mdlock);
-
-            if (thred) {
-                if (!_PR_IS_NATIVE_THREAD(thred)) {
-                    int pri = thred->priority;
-                    _PRCPU *lockedCPU = _PR_MD_CURRENT_CPU();
-                    _PR_THREAD_LOCK(thred);
-                    if (thred->flags & _PR_ON_PAUSEQ) {
-                        _PR_SLEEPQ_LOCK(thred->cpu);
-                        _PR_DEL_SLEEPQ(thred, PR_TRUE);
-                        _PR_SLEEPQ_UNLOCK(thred->cpu);
-                        _PR_THREAD_UNLOCK(thred);
-                        thred->cpu = lockedCPU;
-                        thred->state = _PR_RUNNABLE;
-                        _PR_RUNQ_LOCK(lockedCPU);
-                        _PR_ADD_RUNQ(thred, lockedCPU, pri);
-                        _PR_RUNQ_UNLOCK(lockedCPU);
-                    } else {
-                        /*
-                         * The thread was just interrupted and moved
-                         * from the pause queue to the run queue.
-                         */
-                        _PR_THREAD_UNLOCK(thred);
-                    }
-                } else {
-                    _PR_THREAD_LOCK(thred);
-                    thred->state = _PR_RUNNABLE;
-                    _PR_THREAD_UNLOCK(thred);
-                    ReleaseSemaphore(thred->md.blocked_sema, 1, NULL);
-                }
-            }
-        } else {
-            PRThread *completed_io;
-
-            PR_ASSERT(mdOlp->ioModel == _MD_BlockingIO);
-            completed_io = _PR_THREAD_MD_TO_PTR(mdOlp->data.mdThread);
-            completed_io->md.blocked_io_status = rv;
-            if (rv == 0)
-                completed_io->md.blocked_io_error = GetLastError();
-            completed_io->md.blocked_io_bytes = bytes;
-
-            if ( !_PR_IS_NATIVE_THREAD(completed_io) ) {
-                int pri = completed_io->priority;
-                _PRCPU *lockedCPU = _PR_MD_CURRENT_CPU();
-
-                /* The KEY_CVAR notification only occurs when a native thread
-                 * is notifying a user thread.  For user-user notifications
-                 * the wakeup occurs by having the notifier place the thread 
-                 * on the runq directly; for native-native notifications the
-                 * wakeup occurs by calling ReleaseSemaphore.
-                 */
-                if ( key == KEY_CVAR ) {
-                    PR_ASSERT(completed_io->io_pending == PR_FALSE);
-                    PR_ASSERT(completed_io->io_suspended == PR_FALSE);
-                    PR_ASSERT(completed_io->md.thr_bound_cpu == NULL);
-
-                    /* Thread has already been deleted from sleepQ */
-
-                    /* Switch CPU and add to runQ */
-                    completed_io->cpu = lockedCPU;
-                    completed_io->state = _PR_RUNNABLE;
-                    _PR_RUNQ_LOCK(lockedCPU);
-                    _PR_ADD_RUNQ(completed_io, lockedCPU, pri);
-                    _PR_RUNQ_UNLOCK(lockedCPU);
-                } else {
-                    PR_ASSERT(key == KEY_IO);
-                    PR_ASSERT(completed_io->io_pending == PR_TRUE);
-
-                    _PR_THREAD_LOCK(completed_io);
-
-                    completed_io->io_pending = PR_FALSE;
-
-                    /* If io_suspended is true, then this IO has already resumed.
-                     * We don't need to do anything; because the thread is
-                     * already running.
-                     */
-                    if (completed_io->io_suspended == PR_FALSE) {
-                        if (completed_io->flags & (_PR_ON_SLEEPQ|_PR_ON_PAUSEQ)) {
-                            _PR_SLEEPQ_LOCK(completed_io->cpu);
-                            _PR_DEL_SLEEPQ(completed_io, PR_TRUE);
-                            _PR_SLEEPQ_UNLOCK(completed_io->cpu);
-
-                            _PR_THREAD_UNLOCK(completed_io);
-
-						/*
-						 * If an I/O operation is suspended, the thread
-						 * must be running on the same cpu on which the
-						 * I/O operation was issued.
-						 */
-						PR_ASSERT(!completed_io->md.thr_bound_cpu ||
-					(completed_io->cpu == completed_io->md.thr_bound_cpu));
-
-							if (!completed_io->md.thr_bound_cpu)
-                            	completed_io->cpu = lockedCPU;
-                            completed_io->state = _PR_RUNNABLE;
-                            _PR_RUNQ_LOCK(completed_io->cpu);
-                            _PR_ADD_RUNQ(completed_io, completed_io->cpu, pri);
-                            _PR_RUNQ_UNLOCK(completed_io->cpu);
-                        } else {
-                            _PR_THREAD_UNLOCK(completed_io);
-                        }
-                    } else {
-                        _PR_THREAD_UNLOCK(completed_io);
-                    }
-                }
-            } else {
-                /* For native threads, they are only notified through this loop
-                 * when completing IO.  So, don't worry about this being a CVAR
-                 * notification, because that is not possible.
-                 */
-                _PR_THREAD_LOCK(completed_io);
-                completed_io->io_pending = PR_FALSE;
-                if (completed_io->io_suspended == PR_FALSE) {
-                    completed_io->state = _PR_RUNNABLE;
-                    _PR_THREAD_UNLOCK(completed_io);
-                    rv = ReleaseSemaphore(completed_io->md.blocked_sema,
-                            1, NULL);
-                    PR_ASSERT(0 != rv);
-                } else {
-                    _PR_THREAD_UNLOCK(completed_io);
-                }
-            }
-        }
-
-        awoken++;
-        timeout = 0;   /* Don't block on subsequent trips through the loop */
-    }
-
-    /* never reached */
-    return 0;
-}
-
-static PRStatus
-_native_thread_md_wait(PRThread *thread, PRIntervalTime ticks)
-{
-    DWORD rv;
-	PRUint32 msecs = (ticks == PR_INTERVAL_NO_TIMEOUT) ?
-		INFINITE : PR_IntervalToMilliseconds(ticks);
-
-	/*
-	 * thread waiting for a cvar or a joining thread
-	 */
-	rv = WaitForSingleObject(thread->md.blocked_sema, msecs);
-	switch(rv) {
-		case WAIT_OBJECT_0:
-			return PR_SUCCESS;
-			break;
-		case WAIT_TIMEOUT:
-			_PR_THREAD_LOCK(thread);
-			PR_ASSERT (thread->state != _PR_IO_WAIT);
-			if (thread->wait.cvar != NULL) {
-				PR_ASSERT(thread->state == _PR_COND_WAIT);
-				thread->wait.cvar = NULL;
-				thread->state = _PR_RUNNING;
-				_PR_THREAD_UNLOCK(thread);
-			} else {
-				/* The CVAR was notified just as the timeout
-				 * occurred.  This left the semaphore in the
-				 * signaled state.  Call WaitForSingleObject()
-				 * to clear the semaphore.
-				 */
-				_PR_THREAD_UNLOCK(thread);
-				rv = WaitForSingleObject(thread->md.blocked_sema, INFINITE);
-				PR_ASSERT(rv == WAIT_OBJECT_0);
-			}
-			return PR_SUCCESS;
-			break;
-		default:
-			return PR_FAILURE;
-			break;
-	}
-
-    return PR_SUCCESS;
-}
-
-PRStatus
-_PR_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    DWORD rv;
-
-	if (_native_threads_only) {
-		return(_native_thread_md_wait(thread, ticks));
-	}
-    if ( thread->flags & _PR_GLOBAL_SCOPE ) {
-        PRUint32 msecs = (ticks == PR_INTERVAL_NO_TIMEOUT) ?
-            INFINITE : PR_IntervalToMilliseconds(ticks);
-        rv = WaitForSingleObject(thread->md.blocked_sema, msecs);
-        switch(rv) {
-            case WAIT_OBJECT_0:
-                return PR_SUCCESS;
-                break;
-            case WAIT_TIMEOUT:
-                _PR_THREAD_LOCK(thread);
-                if (thread->state == _PR_IO_WAIT) {
-                    if (thread->io_pending == PR_TRUE) {
-                        thread->state = _PR_RUNNING;
-                        thread->io_suspended = PR_TRUE;
-                        _PR_THREAD_UNLOCK(thread);
-                    } else {
-                        /* The IO completed just at the same time the timeout
-                         * occurred.  This left the semaphore in the signaled
-                         * state.  Call WaitForSingleObject() to clear the
-                         * semaphore.
-                         */
-                        _PR_THREAD_UNLOCK(thread);
-                        rv = WaitForSingleObject(thread->md.blocked_sema, INFINITE);
-                        PR_ASSERT(rv == WAIT_OBJECT_0);
-                    }
-                } else {
-                    if (thread->wait.cvar != NULL) {
-                        PR_ASSERT(thread->state == _PR_COND_WAIT);
-                        thread->wait.cvar = NULL;
-                        thread->state = _PR_RUNNING;
-                        _PR_THREAD_UNLOCK(thread);
-                    } else {
-                        /* The CVAR was notified just as the timeout
-                         * occurred.  This left the semaphore in the
-                         * signaled state.  Call WaitForSingleObject()
-                         * to clear the semaphore.
-                         */
-                        _PR_THREAD_UNLOCK(thread);
-                        rv = WaitForSingleObject(thread->md.blocked_sema, INFINITE);
-                        PR_ASSERT(rv == WAIT_OBJECT_0);
-                    }
-                }
-                return PR_SUCCESS;
-                break;
-            default:
-                return PR_FAILURE;
-                break;
-        }
-    } else {
-        PRInt32 is;
-
-        _PR_INTSOFF(is);
-        _PR_MD_SWITCH_CONTEXT(thread);
-    }
-
-    return PR_SUCCESS;
-}
-
-static void
-_native_thread_io_nowait(
-    PRThread *thread,
-    int rv,
-    int bytes)
-{
-    int rc;
-
-    PR_ASSERT(rv != 0);
-    _PR_THREAD_LOCK(thread);
-    if (thread->state == _PR_IO_WAIT) {
-        PR_ASSERT(thread->io_suspended == PR_FALSE);
-        PR_ASSERT(thread->io_pending == PR_TRUE);
-        thread->state = _PR_RUNNING;
-        thread->io_pending = PR_FALSE;
-        _PR_THREAD_UNLOCK(thread);
-    } else {
-        /* The IO completed just at the same time the
-         * thread was interrupted. This left the semaphore
-         * in the signaled state. Call WaitForSingleObject()
-         * to clear the semaphore.
-         */
-        PR_ASSERT(thread->io_suspended == PR_TRUE);
-        PR_ASSERT(thread->io_pending == PR_TRUE);
-        thread->io_pending = PR_FALSE;
-        _PR_THREAD_UNLOCK(thread);
-        rc = WaitForSingleObject(thread->md.blocked_sema, INFINITE);
-        PR_ASSERT(rc == WAIT_OBJECT_0);
-    }
-
-    thread->md.blocked_io_status = rv;
-    thread->md.blocked_io_bytes = bytes;
-    rc = ResetEvent(thread->md.thr_event);
-    PR_ASSERT(rc != 0);
-    return;
-}
-
-static PRStatus
-_native_thread_io_wait(PRThread *thread, PRIntervalTime ticks)
-{
-    DWORD rv, bytes;
-#define _NATIVE_IO_WAIT_HANDLES		2
-#define _NATIVE_WAKEUP_EVENT_INDEX	0
-#define _NATIVE_IO_EVENT_INDEX		1
-
-	HANDLE wait_handles[_NATIVE_IO_WAIT_HANDLES];
-
-	PRUint32 msecs = (ticks == PR_INTERVAL_NO_TIMEOUT) ?
-		INFINITE : PR_IntervalToMilliseconds(ticks);
-
-    PR_ASSERT(thread->flags & _PR_GLOBAL_SCOPE);
-
-	wait_handles[0] = thread->md.blocked_sema;
-	wait_handles[1] = thread->md.thr_event;
-	rv = WaitForMultipleObjects(_NATIVE_IO_WAIT_HANDLES, wait_handles,
-										FALSE, msecs);
-
-	switch(rv) {
-		case WAIT_OBJECT_0 + _NATIVE_IO_EVENT_INDEX:
-			/*
-			 * I/O op completed
-			 */
-			_PR_THREAD_LOCK(thread);
-			if (thread->state == _PR_IO_WAIT) {
-
-				PR_ASSERT(thread->io_suspended == PR_FALSE);
-				PR_ASSERT(thread->io_pending == PR_TRUE);
-				thread->state = _PR_RUNNING;
-				thread->io_pending = PR_FALSE;
-				_PR_THREAD_UNLOCK(thread);
-			} else {
-				/* The IO completed just at the same time the
-				 * thread was interrupted. This led to us being
-				 * notified twice. Call WaitForSingleObject()
-				 * to clear the semaphore.
-				 */
-				PR_ASSERT(thread->io_suspended == PR_TRUE);
-				PR_ASSERT(thread->io_pending == PR_TRUE);
-				thread->io_pending = PR_FALSE;
-				_PR_THREAD_UNLOCK(thread);
-				rv = WaitForSingleObject(thread->md.blocked_sema,
-							INFINITE);
-				PR_ASSERT(rv == WAIT_OBJECT_0);
-			}
-
-			rv = GetOverlappedResult((HANDLE) thread->io_fd,
-				&thread->md.overlapped.overlapped, &bytes, FALSE);
-
-			thread->md.blocked_io_status = rv;
-			if (rv != 0) {
-				thread->md.blocked_io_bytes = bytes;
-			} else {
-				thread->md.blocked_io_error = GetLastError();
-				PR_ASSERT(ERROR_IO_PENDING != thread->md.blocked_io_error);
-			}
-			rv = ResetEvent(thread->md.thr_event);
-			PR_ASSERT(rv != 0);
-			break;
-		case WAIT_OBJECT_0 + _NATIVE_WAKEUP_EVENT_INDEX:
-			/*
-			 * I/O interrupted; 
-			 */
-#ifdef DEBUG
-			_PR_THREAD_LOCK(thread);
-			PR_ASSERT(thread->io_suspended == PR_TRUE);
-			_PR_THREAD_UNLOCK(thread);
-#endif
-			break;
-		case WAIT_TIMEOUT:
-			_PR_THREAD_LOCK(thread);
-			if (thread->state == _PR_IO_WAIT) {
-				thread->state = _PR_RUNNING;
-				thread->io_suspended = PR_TRUE;
-				_PR_THREAD_UNLOCK(thread);
-			} else {
-				/*
-				 * The thread was interrupted just as the timeout
-				 * occurred. This left the semaphore in the signaled
-				 * state. Call WaitForSingleObject() to clear the
-				 * semaphore.
-				 */
-				PR_ASSERT(thread->io_suspended == PR_TRUE);
-				_PR_THREAD_UNLOCK(thread);
-				rv = WaitForSingleObject(thread->md.blocked_sema, INFINITE);
-				PR_ASSERT(rv == WAIT_OBJECT_0);
-			}
-			break;
-		default:
-			return PR_FAILURE;
-			break;
-	}
-
-    return PR_SUCCESS;
-}
-
-
-static PRStatus
-_NT_IO_WAIT(PRThread *thread, PRIntervalTime timeout)
-{
-    PRBool fWait = PR_TRUE;
-
-	if (_native_threads_only) {
-		return(_native_thread_io_wait(thread, timeout));
-	}
-    if (!_PR_IS_NATIVE_THREAD(thread))  {
-
-        _PR_THREAD_LOCK(thread);
-
-        /* The IO may have already completed; if so, don't add to sleepQ, 
-         * since we are already on the runQ!
-         */
-        if (thread->io_pending == PR_TRUE) {
-            _PR_SLEEPQ_LOCK(thread->cpu);
-            _PR_ADD_SLEEPQ(thread, timeout);
-            _PR_SLEEPQ_UNLOCK(thread->cpu);
-        } else
-            fWait = PR_FALSE;
-        _PR_THREAD_UNLOCK(thread);
-    }
-    if (fWait)
-        return _PR_MD_WAIT(thread, timeout);
-    else
-        return PR_SUCCESS;
-}
-
-/*
- * Unblock threads waiting for I/O
- * used when interrupting threads
- *
- * NOTE: The thread lock should held when this function is called.
- * On return, the thread lock is released.
- */
-void _PR_Unblock_IO_Wait(PRThread *thr)
-{
-    PRStatus rv;
-    _PRCPU *cpu = thr->cpu;
- 
-    PR_ASSERT(thr->state == _PR_IO_WAIT);
-	/*
-	 * A thread for which an I/O timed out or was interrupted cannot be
-	 * in an IO_WAIT state except as a result of calling PR_Close or
-	 * PR_NT_CancelIo for the FD. For these two cases, _PR_IO_WAIT state
-	 * is not interruptible
-	 */
-	if (thr->md.interrupt_disabled == PR_TRUE) {
-    	_PR_THREAD_UNLOCK(thr);
-		return;
-	}
-    thr->io_suspended = PR_TRUE;
-    thr->state = _PR_RUNNABLE;
-
-    if (!_PR_IS_NATIVE_THREAD(thr)) {
-        PRThread *me = _PR_MD_CURRENT_THREAD();
-        PR_ASSERT(thr->flags & (_PR_ON_SLEEPQ | _PR_ON_PAUSEQ));
-        _PR_SLEEPQ_LOCK(cpu);
-        _PR_DEL_SLEEPQ(thr, PR_TRUE);
-        _PR_SLEEPQ_UNLOCK(cpu);
-		/*
-		 * this thread will continue to run on the same cpu until the
-		 * I/O is aborted by closing the FD or calling CancelIO
-		 */
-		thr->md.thr_bound_cpu = cpu;
-
-        PR_ASSERT(!(thr->flags & _PR_IDLE_THREAD));
-        _PR_AddThreadToRunQ(me, thr);
-    }
-    _PR_THREAD_UNLOCK(thr);
-    rv = _PR_MD_WAKEUP_WAITER(thr);
-    PR_ASSERT(PR_SUCCESS == rv);
-}
-
-/* Resume an outstanding IO; requires that after the switch, we disable */
-static PRStatus
-_NT_ResumeIO(PRThread *thread, PRIntervalTime ticks)
-{
-    PRBool fWait = PR_TRUE;
-
-    if (!_PR_IS_NATIVE_THREAD(thread)) {
-        if (_pr_use_static_tls) {
-            _pr_io_restarted_io = thread;
-        } else {
-            TlsSetValue(_pr_io_restartedIOIndex, thread);
-        }
-    } else {
-        _PR_THREAD_LOCK(thread);
-        if (!thread->io_pending)
-            fWait = PR_FALSE;
-        thread->io_suspended = PR_FALSE;
-            
-        _PR_THREAD_UNLOCK(thread);
-    }
-    /* We don't put ourselves back on the sleepQ yet; until we 
-     * set the suspended bit to false, we can't do that.  Just save
-     * the sleep time here, and then continue.  The restarted_io handler
-     * will add us to the sleepQ if needed.
-     */
-    thread->sleep = ticks;
-
-    if (fWait) {
-        if (!_PR_IS_NATIVE_THREAD(thread))
-            return _PR_MD_WAIT(thread, ticks);
-        else
-            return _NT_IO_WAIT(thread, ticks);
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus
-_PR_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if (thread == NULL) {
-        /* If thread is NULL, we aren't waking a thread, we're just poking
-         * idle thread 
-         */
-        if ( PostQueuedCompletionStatus(_pr_completion_port, 0, 
-            KEY_CVAR, NULL) == FALSE) 
-            return PR_FAILURE;
-        return PR_SUCCESS;
-    }
-
-    if ( _PR_IS_NATIVE_THREAD(thread) ) {
-        if (ReleaseSemaphore(thread->md.blocked_sema, 1, NULL) == FALSE)
-            return PR_FAILURE;
-        else
-            return PR_SUCCESS;
-    } else {
-        PRThread *me = _PR_MD_CURRENT_THREAD();
-
-        /* When a Native thread has to awaken a user thread, it has to poke
-         * the completion port because all user threads might be idle, and
-         * thus the CPUs are just waiting for a completion.  
-         *
-         * XXXMB - can we know when we are truely idle (and not checking 
-         *         the runq)?
-         */
-        if ((_PR_IS_NATIVE_THREAD(me) || (thread->cpu != me->cpu)) &&
-                (!thread->md.thr_bound_cpu)) {
-            /* The thread should not be in any queue */
-            PR_ASSERT(thread->queueCount == 0);
-            if ( PostQueuedCompletionStatus(_pr_completion_port, 0, 
-                KEY_CVAR, &(thread->md.overlapped.overlapped)) == FALSE) 
-                return PR_FAILURE;
-        }
-        return PR_SUCCESS;
-    }
-}
-
-void
-_PR_MD_INIT_IO()
-{
-    WORD WSAVersion = 0x0101;
-    WSADATA WSAData;
-    int err;
-    OSVERSIONINFO OSversion;
-
-    err = WSAStartup( WSAVersion, &WSAData );
-    PR_ASSERT(0 == err);
-                                                      
-    _pr_completion_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, 
-                                                 NULL, 
-                                                 0, 
-                                                 0);
- 
-    _MD_NEW_LOCK(&_pr_recycle_lock);
-    _MD_NEW_LOCK(&_pr_ioq_lock);
-
-    OSversion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if (GetVersionEx(&OSversion)) {
-        _nt_version_gets_lockfile_completion = PR_FALSE;
-        if (OSversion.dwMajorVersion >= 4) {
-            _nt_version_gets_lockfile_completion = PR_TRUE;
-        }
-    } else 
-        PR_ASSERT(0);
-
-    IsFileLocalInit();
-
-    /*
-     * UDP support: start up the continuation thread
-     */
-
-    pt_tq.op_count = 0;
-    pt_tq.head = pt_tq.tail = NULL;
-    pt_tq.ml = PR_NewLock();
-    PR_ASSERT(NULL != pt_tq.ml);
-    pt_tq.new_op = PR_NewCondVar(pt_tq.ml);
-    PR_ASSERT(NULL != pt_tq.new_op);
-#if defined(DEBUG)
-    memset(&pt_debug, 0, sizeof(struct pt_debug_s));
-#endif
-
-    pt_tq.thread = PR_CreateThread(
-        PR_SYSTEM_THREAD, ContinuationThread, NULL,
-        PR_PRIORITY_URGENT, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    PR_ASSERT(NULL != pt_tq.thread);
-
-#ifdef DEBUG
-    /* Doublecheck _pr_filetime_offset's hard-coded value is correct. */
-    {
-        SYSTEMTIME systime;
-        union {
-           PRTime prt;
-           FILETIME ft;
-        } filetime;
-        BOOL rv;
-
-        systime.wYear = 1970;
-        systime.wMonth = 1;
-        /* wDayOfWeek is ignored */
-        systime.wDay = 1;
-        systime.wHour = 0;
-        systime.wMinute = 0;
-        systime.wSecond = 0;
-        systime.wMilliseconds = 0;
-
-        rv = SystemTimeToFileTime(&systime, &filetime.ft);
-        PR_ASSERT(0 != rv);
-        PR_ASSERT(filetime.prt == _pr_filetime_offset);
-    }
-#endif /* DEBUG */
-
-    _PR_NT_InitSids();
-}
-
-/* --- SOCKET IO --------------------------------------------------------- */
-
-/* _md_get_recycled_socket()
- * Get a socket from the recycle bin; if no sockets are in the bin,
- * create one.  The socket will be passed to AcceptEx() as the
- * second argument.
- */
-static SOCKET
-_md_get_recycled_socket()
-{
-    SOCKET rv;
-    int af = AF_INET;
-
-    _MD_LOCK(&_pr_recycle_lock);
-    if (_pr_recycle_tail) {
-        _pr_recycle_tail--;
-        rv = _pr_recycle_array[_pr_recycle_tail];
-        _MD_UNLOCK(&_pr_recycle_lock);
-        return rv;
-    }
-    _MD_UNLOCK(&_pr_recycle_lock);
-
-    rv = _PR_MD_SOCKET(af, SOCK_STREAM, 0);
-    if (rv != INVALID_SOCKET && _md_Associate((HANDLE)rv) == 0) {
-        closesocket(rv);
-        return INVALID_SOCKET;
-    }
-    return rv;
-}
-
-/* _md_put_recycled_socket()
- * Add a socket to the recycle bin.
- */
-static void
-_md_put_recycled_socket(SOCKET newsock)
-{
-    PR_ASSERT(_pr_recycle_tail >= 0);
-
-    _MD_LOCK(&_pr_recycle_lock);
-    if (_pr_recycle_tail < RECYCLE_SIZE) {
-        _pr_recycle_array[_pr_recycle_tail] = newsock;
-        _pr_recycle_tail++;
-        _MD_UNLOCK(&_pr_recycle_lock);
-    } else {
-        _MD_UNLOCK(&_pr_recycle_lock);
-        closesocket(newsock);
-    }
- 
-    return;
-}
-
-/* _md_Associate()
- * Associates a file with the completion port.
- * Returns 0 on failure, 1 on success.
- */
-PRInt32
-_md_Associate(HANDLE file)
-{
-    HANDLE port;
-
-	if (!_native_threads_only) {
-		port = CreateIoCompletionPort((HANDLE)file, 
-										_pr_completion_port, 
-										KEY_IO,
-										0);
-
-		/* XXX should map error codes on failures */
-		return (port == _pr_completion_port);
-	} else {
-		return 1;
-	}
-}
-
-/*
- * _md_MakeNonblock()
- * Make a socket nonblocking.
- * Returns 0 on failure, 1 on success.
- */
-static PRInt32
-_md_MakeNonblock(HANDLE file)
-{
-    int rv;
-    u_long one = 1;
-
-    rv = ioctlsocket((SOCKET)file, FIONBIO, &one);
-    /* XXX should map error codes on failures */
-    return (rv == 0);
-}
-
-static int missing_completions = 0;
-static int max_wait_loops = 0;
-
-static PRInt32
-_NT_IO_ABORT(PROsfd sock)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRBool fWait;
-    PRInt32 rv;
-    int loop_count;
-
-    /* This is a clumsy way to abort the IO, but it is all we can do.
-     * It looks a bit racy, but we handle all the cases. 
-     * case 1:  IO completes before calling closesocket
-     *     case 1a:  fWait is set to PR_FALSE
-     *           This should e the most likely case.  We'll properly
-     *           not wait call _NT_IO_WAIT, since the closesocket()
-     *           won't be forcing a completion.
-     *     case 1b: fWait is set to PR_TRUE
-     *           This hopefully won't happen much.  When it does, this
-     *           thread will timeout in _NT_IO_WAIT for CLOSE_INTERVAL
-     *           before cleaning up.
-     * case 2:  IO does not complete before calling closesocket
-     *     case 2a: IO never completes
-     *           This is the likely case.  We'll close it and wait
-     *           for the completion forced by the close.  Return should
-     *           be immediate.
-     *     case 2b: IO completes just after calling closesocket
-     *           Since the closesocket is issued, we'll either get a
-     *           completion back for the real IO or for the close.  We
-     *           don't really care.  It may not even be possible to get
-     *           a real completion here.  In any event, we'll awaken
-     *           from NT_IO_WAIT immediately.
-     */
-
-    _PR_THREAD_LOCK(me);
-    fWait = me->io_pending;
-    if (fWait) {
-        /*
-         * If there's still I/O pending, it should have already timed
-         * out once before this function is called.
-         */
-        PR_ASSERT(me->io_suspended == PR_TRUE);
-
-        /* Set up to wait for I/O completion again */
-        me->state = _PR_IO_WAIT;
-        me->io_suspended = PR_FALSE;
-        me->md.interrupt_disabled = PR_TRUE;
-    }
-    _PR_THREAD_UNLOCK(me);
-
-    /* Close the socket if there is one */
-    if (sock != INVALID_SOCKET) {
-        rv = closesocket((SOCKET)sock);
-    }
-
-    /* If there was I/O pending before the close, wait for it to complete */
-    if (fWait) {
-
-        /* Wait and wait for the I/O to complete */
-        for (loop_count = 0; fWait; ++loop_count) {
-
-            _NT_IO_WAIT(me, CLOSE_TIMEOUT);
-
-            _PR_THREAD_LOCK(me);
-            fWait = me->io_pending;
-            if (fWait) {
-                PR_ASSERT(me->io_suspended == PR_TRUE);
-                me->state = _PR_IO_WAIT;
-                me->io_suspended = PR_FALSE;
-            }
-            _PR_THREAD_UNLOCK(me);
-
-            if (loop_count > max_wait_loops) {
-                max_wait_loops = loop_count;
-            }
-        }
-
-        if (loop_count > 1) {
-            ++missing_completions;
-        }
-
-        me->md.interrupt_disabled = PR_FALSE;
-        me->io_pending = PR_FALSE;
-        me->state = _PR_RUNNING;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-    me->md.thr_bound_cpu = NULL;
-    me->io_suspended = PR_FALSE;
-
-    return rv;
-}
-
-
-PROsfd
-_PR_MD_SOCKET(int af, int type, int flags)
-{
-    SOCKET sock;
-
-    sock = socket(af, type, flags);
-
-    if (sock == INVALID_SOCKET) {
-        _PR_MD_MAP_SOCKET_ERROR(WSAGetLastError());
-    }
-
-    return (PROsfd)sock;
-}
-
-struct connect_data_s {
-    PRInt32 status;
-    PRInt32 error;
-    PROsfd  osfd;
-    struct sockaddr *addr;
-    PRUint32 addrlen;
-    PRIntervalTime timeout;
-};
-
-void
-_PR_MD_connect_thread(void *cdata)
-{
-    struct connect_data_s *cd = (struct connect_data_s *)cdata;
-
-    cd->status = connect(cd->osfd, cd->addr, cd->addrlen);
-
-    if (cd->status == SOCKET_ERROR)
-        cd->error = WSAGetLastError();
-
-    return;
-}
-
-
-PRInt32
-_PR_MD_CONNECT(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, 
-               PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    u_long nbio;
-    PRInt32 rc;
-
-    if (fd->secret->nonblocking) {
-        if (!fd->secret->md.io_model_committed) {
-            rv = _md_MakeNonblock((HANDLE)osfd);
-            PR_ASSERT(0 != rv);
-            fd->secret->md.io_model_committed = PR_TRUE;
-        }
-
-        if ((rv = connect(osfd, (struct sockaddr *) addr, addrlen)) == -1) {
-            err = WSAGetLastError();
-            _PR_MD_MAP_CONNECT_ERROR(err);
-        }
-        return rv;
-    }
-
-    /*
-     * Temporarily make the socket non-blocking so that we can
-     * initiate a non-blocking connect and wait for its completion
-     * (with a timeout) in select.
-     */
-    PR_ASSERT(!fd->secret->md.io_model_committed);
-    nbio = 1;
-    rv = ioctlsocket((SOCKET)osfd, FIONBIO, &nbio);
-    PR_ASSERT(0 == rv);
-
-    rc = _nt_nonblock_connect(fd, (struct sockaddr *) addr, addrlen, timeout);
-
-    /* Set the socket back to blocking. */
-    nbio = 0;
-    rv = ioctlsocket((SOCKET)osfd, FIONBIO, &nbio);
-    PR_ASSERT(0 == rv);
-
-    return rc;
-}
-
-PRInt32
-_PR_MD_BIND(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv;
-#if 0
-    int one = 1;
-#endif
-
-    rv = bind(fd->secret->md.osfd, (const struct sockaddr *)&(addr->inet), addrlen);
-
-    if (rv == SOCKET_ERROR) {
-        _PR_MD_MAP_BIND_ERROR(WSAGetLastError());
-        return -1;
-    }
-
-#if 0
-    /* Disable nagle- so far unknown if this is good or not...
-     */
-    rv = setsockopt(fd->secret->md.osfd, 
-                    SOL_SOCKET,
-                    TCP_NODELAY,
-                    (const char *)&one,
-                    sizeof(one));
-    PR_ASSERT(rv == 0);
-#endif
-
-    return 0;
-}
-
-void _PR_MD_UPDATE_ACCEPT_CONTEXT(PROsfd accept_sock, PROsfd listen_sock)
-{
-    /* Sockets accept()'d with AcceptEx need to call this setsockopt before
-     * calling anything other than ReadFile(), WriteFile(), send(), recv(), 
-     * Transmitfile(), and closesocket().  In order to call any other 
-     * winsock functions, we have to make this setsockopt call.
-     *
-     * XXXMB - For the server, we *NEVER* need this in
-     * the "normal" code path.  But now we have to call it.  This is a waste
-     * of a system call.  We'd like to only call it before calling the 
-     * obscure socket calls, but since we don't know at that point what the
-     * original socket was (or even if it is still alive) we can't do it
-     * at that point... 
-     */
-    setsockopt((SOCKET)accept_sock, 
-               SOL_SOCKET, 
-               SO_UPDATE_ACCEPT_CONTEXT,
-               (char *)&listen_sock,
-               sizeof(listen_sock));
-
-}
-
-#define INET_ADDR_PADDED (sizeof(PRNetAddr) + 16)
-PROsfd
-_PR_MD_FAST_ACCEPT(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen,
-              PRIntervalTime timeout, PRBool fast, 
-              _PR_AcceptTimeoutCallback callback, void *callbackArg)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    SOCKET accept_sock;
-    int bytes;
-    PRNetAddr *Laddr;
-    PRNetAddr *Raddr;
-    PRUint32 llen, err;
-    int rv;
-
-    if (_NT_USE_NB_IO(fd)) {
-        if (!fd->secret->md.io_model_committed) {
-            rv = _md_MakeNonblock((HANDLE)osfd);
-            PR_ASSERT(0 != rv);
-            fd->secret->md.io_model_committed = PR_TRUE;
-        }
-        /*
-         * The accepted socket inherits the nonblocking and
-         * inheritable (HANDLE_FLAG_INHERIT) attributes of
-         * the listening socket.
-         */
-        accept_sock = _nt_nonblock_accept(fd, (struct sockaddr *)raddr, rlen, timeout);
-        if (!fd->secret->nonblocking) {
-            u_long zero = 0;
-
-            rv = ioctlsocket(accept_sock, FIONBIO, &zero);
-            PR_ASSERT(0 == rv);
-        }
-        return accept_sock;
-    }
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return -1;
-    }
-
-    if (!fd->secret->md.io_model_committed) {
-        rv = _md_Associate((HANDLE)osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-
-    if (!me->md.acceptex_buf) {
-        me->md.acceptex_buf = PR_MALLOC(2*INET_ADDR_PADDED);
-        if (!me->md.acceptex_buf) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return -1;
-        }
-    }
-
-    accept_sock = _md_get_recycled_socket();
-    if (accept_sock == INVALID_SOCKET)
-        return -1;
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-	if (_native_threads_only)
-		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		closesocket(accept_sock);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-    me->io_fd = osfd;
-
-    rv = AcceptEx((SOCKET)osfd,
-                  accept_sock,
-                  me->md.acceptex_buf,
-                  0,
-                  INET_ADDR_PADDED,
-                  INET_ADDR_PADDED,
-                  &bytes,
-                  &(me->md.overlapped.overlapped));
-
-    if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING))  {
-        /* Argh! The IO failed */
-		closesocket(accept_sock);
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return -1;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-		_PR_MD_MAP_ACCEPTEX_ERROR(err);
-        return -1;
-    }
-
-    if (_native_threads_only && rv) {
-        _native_thread_io_nowait(me, rv, bytes);
-    } else if (_NT_IO_WAIT(me, timeout) == PR_FAILURE) {
-        PR_ASSERT(0);
-        closesocket(accept_sock);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-    if (me->io_suspended) {
-        closesocket(accept_sock);
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        }
-        return -1;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-		closesocket(accept_sock);
-		_PR_MD_MAP_ACCEPTEX_ERROR(me->md.blocked_io_error);
-        return -1;
-    }
-
-    if (!fast)
-        _PR_MD_UPDATE_ACCEPT_CONTEXT((SOCKET)accept_sock, (SOCKET)osfd);
-
-    /* IO is done */
-    GetAcceptExSockaddrs(
-            me->md.acceptex_buf,
-            0,
-            INET_ADDR_PADDED,
-            INET_ADDR_PADDED,
-            (LPSOCKADDR *)&(Laddr),
-            &llen,
-            (LPSOCKADDR *)&(Raddr),
-            (unsigned int *)rlen);
-
-    if (raddr != NULL)
-        memcpy((char *)raddr, (char *)&Raddr->inet, *rlen);
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-
-    return accept_sock;
-}
-
-PRInt32
-_PR_MD_FAST_ACCEPT_READ(PRFileDesc *sd, PROsfd *newSock, PRNetAddr **raddr, 
-                   void *buf, PRInt32 amount, PRIntervalTime timeout, 
-                   PRBool fast, _PR_AcceptTimeoutCallback callback, 
-                   void *callbackArg)
-{
-    PROsfd sock = sd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    int bytes;
-    PRNetAddr *Laddr;
-    PRUint32 llen, rlen, err;
-    int rv;
-    PRBool isConnected;
-    PRBool madeCallback = PR_FALSE;
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return -1;
-    }
-
-    if (!sd->secret->md.io_model_committed) {
-        rv = _md_Associate((HANDLE)sock);
-        PR_ASSERT(0 != rv);
-        sd->secret->md.io_model_committed = PR_TRUE;
-    }
-
-    *newSock = _md_get_recycled_socket();
-    if (*newSock == INVALID_SOCKET)
-        return -1;
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-	if (_native_threads_only)
-		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		closesocket(*newSock);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-    me->io_fd = sock;
-
-    rv = AcceptEx((SOCKET)sock,
-                  *newSock,
-                  buf,
-                  amount,
-                  INET_ADDR_PADDED,
-                  INET_ADDR_PADDED,
-                  &bytes,
-                  &(me->md.overlapped.overlapped));
-
-    if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING)) {
-		closesocket(*newSock);
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return -1;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-		_PR_MD_MAP_ACCEPTEX_ERROR(err);
-        return -1;
-    }
-
-    if (_native_threads_only && rv) {
-        _native_thread_io_nowait(me, rv, bytes);
-    } else if (_NT_IO_WAIT(me, timeout) == PR_FAILURE) {
-        PR_ASSERT(0);
-        closesocket(*newSock);
-        return -1;
-    }
-
-retry:
-    if (me->io_suspended) {
-        PRInt32 err;
-        INT seconds;
-        INT bytes = sizeof(seconds);
-
-        PR_ASSERT(timeout != PR_INTERVAL_NO_TIMEOUT);
-
-        err = getsockopt(*newSock, 
-                         SOL_SOCKET,
-                         SO_CONNECT_TIME,
-                         (char *)&seconds,
-                         (PINT)&bytes);
-        if ( err == NO_ERROR ) {
-            PRIntervalTime elapsed = PR_SecondsToInterval(seconds);
-
-            if (seconds == 0xffffffff) 
-                isConnected = PR_FALSE;
-            else 
-                isConnected = PR_TRUE;
-
-            if (!isConnected) {
-                if (madeCallback == PR_FALSE && callback)
-                    callback(callbackArg);
-                madeCallback = PR_TRUE;
-                me->state = _PR_IO_WAIT;
-                if (_NT_ResumeIO(me, timeout) == PR_FAILURE) {
-                    closesocket(*newSock);
-                    return -1;
-                }
-                goto retry;
-            }
-
-            if (elapsed < timeout) {
-                /* Socket is connected but time not elapsed, RESUME IO */
-                timeout -= elapsed;
-                me->state = _PR_IO_WAIT;
-                if (_NT_ResumeIO(me, timeout) == PR_FAILURE) {
-                    closesocket(*newSock);
-                    return -1;
-                }
-                goto retry;
-            }
-        } else {
-            /*  What to do here? Assume socket not open?*/
-            PR_ASSERT(0);
-            isConnected = PR_FALSE;
-        }
-
-        rv = _NT_IO_ABORT(*newSock);
-
-        PR_ASSERT(me->io_pending ==  PR_FALSE);
-        PR_ASSERT(me->io_suspended ==  PR_FALSE);
-        PR_ASSERT(me->md.thr_bound_cpu ==  NULL);
-        /* If the IO is still suspended, it means we didn't get any 
-         * completion from NT_IO_WAIT.  This is not disasterous, I hope,
-         * but it may mean we still have an IO outstanding...  Try to 
-         * recover by just allowing ourselves to continue.
-         */
-        me->io_suspended = PR_FALSE;
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        }
-        me->state = _PR_RUNNING;
-        closesocket(*newSock);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-    PR_ASSERT(me->io_suspended == PR_FALSE);
-    PR_ASSERT(me->md.thr_bound_cpu == NULL);
-
-    if (me->md.blocked_io_status == 0) {
-		_PR_MD_MAP_ACCEPTEX_ERROR(me->md.blocked_io_error);
-        closesocket(*newSock);
-        return -1;
-    }
-
-    if (!fast) 
-        _PR_MD_UPDATE_ACCEPT_CONTEXT((SOCKET)*newSock, (SOCKET)sock);
-
-    /* IO is done */
-    GetAcceptExSockaddrs(
-            buf,
-            amount,
-            INET_ADDR_PADDED,
-            INET_ADDR_PADDED,
-            (LPSOCKADDR *)&(Laddr),
-            &llen,
-            (LPSOCKADDR *)(raddr),
-            (unsigned int *)&rlen);
-
-    return me->md.blocked_io_bytes;
-}
-
-PRInt32
-_PR_MD_SENDFILE(PRFileDesc *sock, PRSendFileData *sfd,
-					PRInt32 flags, PRIntervalTime timeout)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 tflags;
-    int rv, err;
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return -1;
-    }
-
-    if (!sock->secret->md.io_model_committed) {
-        rv = _md_Associate((HANDLE)sock->secret->md.osfd);
-        PR_ASSERT(0 != rv);
-        sock->secret->md.io_model_committed = PR_TRUE;
-    }
-    if (!me->md.xmit_bufs) {
-        me->md.xmit_bufs = PR_NEW(TRANSMIT_FILE_BUFFERS);
-        if (!me->md.xmit_bufs) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return -1;
-        }
-    }
-    me->md.xmit_bufs->Head       = (void *)sfd->header;
-    me->md.xmit_bufs->HeadLength = sfd->hlen;
-    me->md.xmit_bufs->Tail       = (void *)sfd->trailer;
-    me->md.xmit_bufs->TailLength = sfd->tlen;
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-    me->md.overlapped.overlapped.Offset = sfd->file_offset;
-	if (_native_threads_only)
-		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-    tflags = 0;
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET)
-        tflags = TF_DISCONNECT | TF_REUSE_SOCKET;
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-    me->io_fd = sock->secret->md.osfd;
-
-    rv = TransmitFile((SOCKET)sock->secret->md.osfd,
-                      (HANDLE)sfd->fd->secret->md.osfd,
-                      (DWORD)sfd->file_nbytes,
-                      (DWORD)0,
-                      (LPOVERLAPPED)&(me->md.overlapped.overlapped),
-                      (TRANSMIT_FILE_BUFFERS *)me->md.xmit_bufs,
-                      (DWORD)tflags);
-    if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING) ) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return -1;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-		_PR_MD_MAP_TRANSMITFILE_ERROR(err);
-        return -1;
-    }
-
-    if (_NT_IO_WAIT(me, timeout) == PR_FAILURE) {
-        PR_ASSERT(0);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-    if (me->io_suspended) {
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        }
-        return -1;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-		_PR_MD_MAP_TRANSMITFILE_ERROR(me->md.blocked_io_error);
-        return -1;
-    }
-
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-        _md_put_recycled_socket(sock->secret->md.osfd);
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-
-    return me->md.blocked_io_bytes;
-}
-
-PRInt32
-_PR_MD_RECV(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, 
-            PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    int bytes;
-    int rv, err;
-
-    if (_NT_USE_NB_IO(fd)) {
-        if (!fd->secret->md.io_model_committed) {
-            rv = _md_MakeNonblock((HANDLE)osfd);
-            PR_ASSERT(0 != rv);
-            fd->secret->md.io_model_committed = PR_TRUE;
-        }
-        return _nt_nonblock_recv(fd, buf, amount, flags, timeout);
-    }
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return -1;
-    }
-
-    if (!fd->secret->md.io_model_committed) {
-        rv = _md_Associate((HANDLE)osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-	if (_native_threads_only)
-		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-    me->io_fd = osfd;
-
-    rv = ReadFile((HANDLE)osfd,
-                  buf, 
-                  amount,
-                  &bytes,
-                  &(me->md.overlapped.overlapped));
-    if ( (rv == 0) && (GetLastError() != ERROR_IO_PENDING) ) {
-    	_PR_THREAD_LOCK(me);
-        me->io_pending = PR_FALSE;
-        me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return -1;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-        if ((err = GetLastError()) == ERROR_HANDLE_EOF)
-            return 0;
-		_PR_MD_MAP_READ_ERROR(err);
-        return -1;
-    }
-
-    if (_native_threads_only && rv) {
-        _native_thread_io_nowait(me, rv, bytes);
-    } else if (_NT_IO_WAIT(me, timeout) == PR_FAILURE) {
-        PR_ASSERT(0);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-    if (me->io_suspended) {
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        }
-        return -1;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-        if (me->md.blocked_io_error == ERROR_HANDLE_EOF)
-            return 0;
-		_PR_MD_MAP_READ_ERROR(me->md.blocked_io_error);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-
-    return me->md.blocked_io_bytes;
-}
-
-PRInt32
-_PR_MD_SEND(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-            PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    int bytes;
-    int rv, err;
-
-    if (_NT_USE_NB_IO(fd)) {
-        if (!fd->secret->md.io_model_committed) {
-            rv = _md_MakeNonblock((HANDLE)osfd);
-            PR_ASSERT(0 != rv);
-            fd->secret->md.io_model_committed = PR_TRUE;
-        }
-        return _nt_nonblock_send(fd, (char *)buf, amount, timeout);
-    }
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return -1;
-    }
-
-    if (!fd->secret->md.io_model_committed) {
-        rv = _md_Associate((HANDLE)osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-	if (_native_threads_only)
-		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-    me->io_fd = osfd;
-
-    rv = WriteFile((HANDLE)osfd,
-                   buf, 
-                   amount,
-                   &bytes,
-                   &(me->md.overlapped.overlapped));
-    if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING) ) {
-    	_PR_THREAD_LOCK(me);
-        me->io_pending = PR_FALSE;
-        me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return -1;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-		_PR_MD_MAP_WRITE_ERROR(err);
-        return -1;
-    }
-
-    if (_native_threads_only && rv) {
-        _native_thread_io_nowait(me, rv, bytes);
-    } else if (_NT_IO_WAIT(me, timeout) == PR_FAILURE) {
-        PR_ASSERT(0);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-    if (me->io_suspended) {
-        if (_PR_PENDING_INTERRUPT(me)) {
-            me->flags &= ~_PR_INTERRUPT;
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        } else {
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        }
-        return -1;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-		_PR_MD_MAP_WRITE_ERROR(me->md.blocked_io_error);
-        return -1;
-    }
-
-    PR_ASSERT(me->io_pending == PR_FALSE);
-
-    return me->md.blocked_io_bytes;
-}
-
-PRInt32
-_PR_MD_SENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-              const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv;
-
-    if (!fd->secret->md.io_model_committed) {
-        rv = _md_MakeNonblock((HANDLE)osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-    if (_NT_USE_NB_IO(fd))
-        return _nt_nonblock_sendto(fd, buf, amount, (struct sockaddr *)addr, addrlen, timeout);
-    else
-        return pt_SendTo(osfd, buf, amount, flags, addr, addrlen, timeout);
-}
-
-PRInt32
-_PR_MD_RECVFROM(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-                PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv;
-
-    if (!fd->secret->md.io_model_committed) {
-        rv = _md_MakeNonblock((HANDLE)osfd);
-        PR_ASSERT(0 != rv);
-        fd->secret->md.io_model_committed = PR_TRUE;
-    }
-    if (_NT_USE_NB_IO(fd))
-        return _nt_nonblock_recvfrom(fd, buf, amount, (struct sockaddr *)addr, addrlen, timeout);
-    else
-        return pt_RecvFrom(osfd, buf, amount, flags, addr, addrlen, timeout);
-}
-
-/* XXXMB - for now this is a sockets call only */
-PRInt32
-_PR_MD_WRITEV(PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    int index;
-    int sent = 0;
-    int rv;
-
-    if (_NT_USE_NB_IO(fd)) {
-        if (!fd->secret->md.io_model_committed) {
-            rv = _md_MakeNonblock((HANDLE)osfd);
-            PR_ASSERT(0 != rv);
-            fd->secret->md.io_model_committed = PR_TRUE;
-        }
-        return _nt_nonblock_writev(fd, iov, iov_size, timeout);
-    }
-
-    for (index=0; index<iov_size; index++) {
-        rv = _PR_MD_SEND(fd, iov[index].iov_base, iov[index].iov_len, 0,
-						timeout);
-        if (rv > 0) 
-            sent += rv;
-        if ( rv != iov[index].iov_len ) {
-            if (sent <= 0)
-                return -1;
-            return -1;
-        }
-    }
-
-    return sent;
-}
-
-PRInt32
-_PR_MD_LISTEN(PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 rv;
-
-    rv = listen(fd->secret->md.osfd, backlog);
-	if (rv < 0)
-		_PR_MD_MAP_LISTEN_ERROR(WSAGetLastError());
-	return(rv);
-}
-
-PRInt32
-_PR_MD_SHUTDOWN(PRFileDesc *fd, PRIntn how)
-{
-    PRInt32 rv;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-	if (rv < 0)
-		_PR_MD_MAP_SHUTDOWN_ERROR(WSAGetLastError());
-	return(rv);
-}
-
-PRStatus
-_PR_MD_GETSOCKNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    rv = getsockname((SOCKET)fd->secret->md.osfd, (struct sockaddr *)addr, len);
-    if (rv==0)
-		return PR_SUCCESS;
-	else {
-		_PR_MD_MAP_GETSOCKNAME_ERROR(WSAGetLastError());
-		return PR_FAILURE;
-	}
-}
-
-PRStatus
-_PR_MD_GETPEERNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    /*
-     * NT has a bug that, when invoked on a socket accepted by
-     * AcceptEx(), getpeername() returns an all-zero peer address.
-     * To work around this bug, we store the peer's address (returned
-     * by AcceptEx()) with the socket fd and use the cached peer
-     * address if the socket is an accepted socket.
-     */
-
-    if (fd->secret->md.accepted_socket) {
-        INT seconds;
-        INT bytes = sizeof(seconds);
-
-        /*
-         * Determine if the socket is connected.
-         */
-
-        rv = getsockopt(fd->secret->md.osfd, 
-                        SOL_SOCKET,
-                        SO_CONNECT_TIME,
-                        (char *) &seconds,
-                        (PINT) &bytes);
-        if (rv == NO_ERROR) {
-            if (seconds == 0xffffffff) {
-                PR_SetError(PR_NOT_CONNECTED_ERROR, 0);
-                return PR_FAILURE;
-            }
-            *len = PR_NETADDR_SIZE(&fd->secret->md.peer_addr);
-            memcpy(addr, &fd->secret->md.peer_addr, *len);
-            return PR_SUCCESS;
-        } else {
-            _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-            return PR_FAILURE;
-        }
-    } else { 
-        rv = getpeername((SOCKET)fd->secret->md.osfd,
-                         (struct sockaddr *) addr, len);
-        if (rv == 0) {
-            return PR_SUCCESS;
-        } else {
-            _PR_MD_MAP_GETPEERNAME_ERROR(WSAGetLastError());
-            return PR_FAILURE;
-        }
-    }
-}
-
-PRStatus
-_PR_MD_GETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    PRInt32 rv;
-
-    rv = getsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv==0)
-		return PR_SUCCESS;
-	else {
-		_PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-		return PR_FAILURE;
-	}
-}
-
-PRStatus
-_PR_MD_SETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv;
-
-    rv = setsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv==0)
-		return PR_SUCCESS;
-	else {
-		_PR_MD_MAP_SETSOCKOPT_ERROR(WSAGetLastError());
-		return PR_FAILURE;
-	}
-}
-
-/* --- FILE IO ----------------------------------------------------------- */
-
-PROsfd
-_PR_MD_OPEN(const char *name, PRIntn osflags, PRIntn mode)
-{
-    HANDLE file;
-    PRInt32 access = 0;
-    PRInt32 flags = 0;
-    PRInt32 flag6 = 0;
-    
-    if (osflags & PR_SYNC) flag6 = FILE_FLAG_WRITE_THROUGH;
- 
-    if (osflags & PR_RDONLY || osflags & PR_RDWR) access |= GENERIC_READ;
-    if (osflags & PR_WRONLY || osflags & PR_RDWR) access |= GENERIC_WRITE;
-
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-        flags = CREATE_NEW;
-    else if (osflags & PR_CREATE_FILE)
-        flags = (0 != (osflags & PR_TRUNCATE)) ? CREATE_ALWAYS : OPEN_ALWAYS;
-    else if (osflags & PR_TRUNCATE) flags = TRUNCATE_EXISTING;
-    else flags = OPEN_EXISTING;
-
-
-    flag6 |= FILE_FLAG_OVERLAPPED;
-
-    file = CreateFile(name, 
-                      access, 
-                      FILE_SHARE_READ|FILE_SHARE_WRITE,
-                      NULL,
-                      flags, 
-                      flag6,
-                      NULL);
-    if (file == INVALID_HANDLE_VALUE) {
-        _PR_MD_MAP_OPEN_ERROR(GetLastError());
-        return -1;
-    }
-
-    if (osflags & PR_APPEND) {
-        if ( SetFilePointer(file, 0, 0, FILE_END) == 0xFFFFFFFF ) {
-            _PR_MD_MAP_LSEEK_ERROR(GetLastError());
-            CloseHandle(file);
-            return -1;
-        }
-    }
-
-    return (PROsfd)file;
-}
-
-PROsfd
-_PR_MD_OPEN_FILE(const char *name, PRIntn osflags, PRIntn mode)
-{
-    HANDLE file;
-    PRInt32 access = 0;
-    PRInt32 flags = 0;
-    PRInt32 flag6 = 0;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    if (osflags & PR_SYNC) flag6 = FILE_FLAG_WRITE_THROUGH;
- 
-    if (osflags & PR_RDONLY || osflags & PR_RDWR) access |= GENERIC_READ;
-    if (osflags & PR_WRONLY || osflags & PR_RDWR) access |= GENERIC_WRITE;
-
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-        flags = CREATE_NEW;
-    else if (osflags & PR_CREATE_FILE)
-        flags = (0 != (osflags & PR_TRUNCATE)) ? CREATE_ALWAYS : OPEN_ALWAYS;
-    else if (osflags & PR_TRUNCATE) flags = TRUNCATE_EXISTING;
-    else flags = OPEN_EXISTING;
-
-
-    flag6 |= FILE_FLAG_OVERLAPPED;
-
-    if (osflags & PR_CREATE_FILE) {
-        if (_PR_NT_MakeSecurityDescriptorACL(mode, fileAccessTable,
-                &pSD, &pACL) == PR_SUCCESS) {
-            sa.nLength = sizeof(sa);
-            sa.lpSecurityDescriptor = pSD;
-            sa.bInheritHandle = FALSE;
-            lpSA = &sa;
-        }
-    }
-    file = CreateFile(name, 
-                      access, 
-                      FILE_SHARE_READ|FILE_SHARE_WRITE,
-                      lpSA,
-                      flags, 
-                      flag6,
-                      NULL);
-    if (lpSA != NULL) {
-        _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-    }
-    if (file == INVALID_HANDLE_VALUE) {
-        _PR_MD_MAP_OPEN_ERROR(GetLastError());
-        return -1;
-    }
-
-    if (osflags & PR_APPEND) {
-        if ( SetFilePointer(file, 0, 0, FILE_END) == 0xFFFFFFFF ) {
-            _PR_MD_MAP_LSEEK_ERROR(GetLastError());
-            CloseHandle(file);
-            return -1;
-        }
-    }
-
-    return (PROsfd)file;
-}
-
-PRInt32 
-_PR_MD_READ(PRFileDesc *fd, void *buf, PRInt32 len)
-{
-    PROsfd f = fd->secret->md.osfd;
-    PRUint32 bytes;
-    int rv, err;
-    LONG hiOffset = 0;
-    LONG loOffset;
-
-    if (!fd->secret->md.sync_file_io) {
-        PRThread *me = _PR_MD_CURRENT_THREAD();
-
-        if (me->io_suspended) {
-            PR_SetError(PR_INVALID_STATE_ERROR, 0);
-            return -1;
-        }
-
-        memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-
-        me->md.overlapped.overlapped.Offset = SetFilePointer((HANDLE)f, 0, &me->md.overlapped.overlapped.OffsetHigh, FILE_CURRENT);
-        PR_ASSERT((me->md.overlapped.overlapped.Offset != 0xffffffff) || (GetLastError() == NO_ERROR));
-
-        if (fd->secret->inheritable == _PR_TRI_TRUE) {
-            rv = ReadFile((HANDLE)f, 
-                          (LPVOID)buf, 
-                          len, 
-                          &bytes, 
-                          &me->md.overlapped.overlapped);
-            if (rv != 0) {
-                loOffset = SetFilePointer((HANDLE)f, bytes, &hiOffset, FILE_CURRENT);
-                PR_ASSERT((loOffset != 0xffffffff) || (GetLastError() == NO_ERROR));
-                return bytes;
-            }
-            err = GetLastError();
-            if (err == ERROR_IO_PENDING) {
-                rv = GetOverlappedResult((HANDLE)f,
-                        &me->md.overlapped.overlapped, &bytes, TRUE);
-                if (rv != 0) {
-                    loOffset = SetFilePointer((HANDLE)f, bytes, &hiOffset, FILE_CURRENT);
-                    PR_ASSERT((loOffset != 0xffffffff) || (GetLastError() == NO_ERROR));
-                    return bytes;
-                }
-                err = GetLastError();
-            }
-            if (err == ERROR_HANDLE_EOF) {
-                return 0;
-            } else {
-                _PR_MD_MAP_READ_ERROR(err);
-                return -1;
-            }
-        } else {
-            if (!fd->secret->md.io_model_committed) {
-                rv = _md_Associate((HANDLE)f);
-                PR_ASSERT(rv != 0);
-                fd->secret->md.io_model_committed = PR_TRUE;
-            }
-
-			if (_native_threads_only)
-        		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-			_PR_THREAD_LOCK(me);
-			if (_PR_PENDING_INTERRUPT(me)) {
-				me->flags &= ~_PR_INTERRUPT;
-				PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-				_PR_THREAD_UNLOCK(me);
-				return -1;
-			}
-			me->io_pending = PR_TRUE;
-			me->state = _PR_IO_WAIT;
-			_PR_THREAD_UNLOCK(me);
-			me->io_fd = f;
-
-            rv = ReadFile((HANDLE)f, 
-                          (LPVOID)buf, 
-                          len, 
-                          &bytes, 
-                          &me->md.overlapped.overlapped);
-            if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING) ) {
-				_PR_THREAD_LOCK(me);
-				me->io_pending = PR_FALSE;
-				me->state = _PR_RUNNING;
-				if (_PR_PENDING_INTERRUPT(me)) {
-					me->flags &= ~_PR_INTERRUPT;
-					PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-					_PR_THREAD_UNLOCK(me);
-					return -1;
-				}
-				_PR_THREAD_UNLOCK(me);
-
-                if (err == ERROR_HANDLE_EOF) {
-                    return 0;
-                }
-                _PR_MD_MAP_READ_ERROR(err);
-                return -1;
-            }
-
-            if (_native_threads_only && rv) {
-                _native_thread_io_nowait(me, rv, bytes);
-            } else if (_NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-                PR_ASSERT(0);
-                return -1;
-            }
-
-            PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-            if (me->io_suspended) {
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                } else {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                return -1;
-            }
-
-            if (me->md.blocked_io_status == 0) {
-                if (me->md.blocked_io_error == ERROR_HANDLE_EOF) {
-                    return 0;
-                }
-                _PR_MD_MAP_READ_ERROR(me->md.blocked_io_error);
-                return -1;
-            }
-
-            SetFilePointer((HANDLE)f, me->md.blocked_io_bytes, 0, FILE_CURRENT);
-    
-            PR_ASSERT(me->io_pending == PR_FALSE);
-
-            return me->md.blocked_io_bytes;
-        }
-    } else {
-
-        rv = ReadFile((HANDLE)f,
-                      (LPVOID)buf,
-                      len,
-                      &bytes,
-                      NULL);
-        if (rv == 0) {
-            err = GetLastError();
-            /* ERROR_HANDLE_EOF can only be returned by async io */
-            PR_ASSERT(err != ERROR_HANDLE_EOF);
-            if (err == ERROR_BROKEN_PIPE) {
-                /* The write end of the pipe has been closed. */ 
-                return 0;
-            }
-            _PR_MD_MAP_READ_ERROR(err);
-            return -1;
-        }
-        return bytes;
-    }
-}
-
-PRInt32
-_PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 len)
-{
-    PROsfd f = fd->secret->md.osfd;
-    PRInt32 bytes;
-    int rv, err;
-    LONG hiOffset = 0;
-    LONG loOffset;
-    LARGE_INTEGER offset; /* use for the calculation of the new offset */
-
-    if (!fd->secret->md.sync_file_io) {
-        PRThread *me = _PR_MD_CURRENT_THREAD();
-
-        if (me->io_suspended) {
-            PR_SetError(PR_INVALID_STATE_ERROR, 0);
-            return -1;
-        }
-
-        memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-
-        me->md.overlapped.overlapped.Offset = SetFilePointer((HANDLE)f, 0, &me->md.overlapped.overlapped.OffsetHigh, FILE_CURRENT);
-        PR_ASSERT((me->md.overlapped.overlapped.Offset != 0xffffffff) || (GetLastError() == NO_ERROR));
-
-        if (fd->secret->inheritable == _PR_TRI_TRUE) {
-            rv = WriteFile((HANDLE)f, 
-                          (LPVOID)buf, 
-                          len, 
-                          &bytes, 
-                          &me->md.overlapped.overlapped);
-            if (rv != 0) {
-                loOffset = SetFilePointer((HANDLE)f, bytes, &hiOffset, FILE_CURRENT);
-                PR_ASSERT((loOffset != 0xffffffff) || (GetLastError() == NO_ERROR));
-                return bytes;
-            }
-            err = GetLastError();
-            if (err == ERROR_IO_PENDING) {
-                rv = GetOverlappedResult((HANDLE)f,
-                        &me->md.overlapped.overlapped, &bytes, TRUE);
-                if (rv != 0) {
-                    loOffset = SetFilePointer((HANDLE)f, bytes, &hiOffset, FILE_CURRENT);
-                    PR_ASSERT((loOffset != 0xffffffff) || (GetLastError() == NO_ERROR));
-                    return bytes;
-                }
-                err = GetLastError();
-            }
-            _PR_MD_MAP_READ_ERROR(err);
-            return -1;
-        } else {
-            if (!fd->secret->md.io_model_committed) {
-                rv = _md_Associate((HANDLE)f);
-                PR_ASSERT(rv != 0);
-                fd->secret->md.io_model_committed = PR_TRUE;
-            }
-			if (_native_threads_only)
-        		me->md.overlapped.overlapped.hEvent = me->md.thr_event;
-
-			_PR_THREAD_LOCK(me);
-			if (_PR_PENDING_INTERRUPT(me)) {
-				me->flags &= ~_PR_INTERRUPT;
-				PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-				_PR_THREAD_UNLOCK(me);
-				return -1;
-			}
-			me->io_pending = PR_TRUE;
-			me->state = _PR_IO_WAIT;
-			_PR_THREAD_UNLOCK(me);
-			me->io_fd = f;
-
-            rv = WriteFile((HANDLE)f, 
-                           buf, 
-                           len, 
-                           &bytes, 
-                           &(me->md.overlapped.overlapped));
-            if ( (rv == 0) && ((err = GetLastError()) != ERROR_IO_PENDING) ) {
-				_PR_THREAD_LOCK(me);
-				me->io_pending = PR_FALSE;
-				me->state = _PR_RUNNING;
-				if (_PR_PENDING_INTERRUPT(me)) {
-					me->flags &= ~_PR_INTERRUPT;
-					PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-					_PR_THREAD_UNLOCK(me);
-					return -1;
-				}
-				_PR_THREAD_UNLOCK(me);
-
-                _PR_MD_MAP_WRITE_ERROR(err);
-                return -1;
-            }
-
-            if (_native_threads_only && rv) {
-                _native_thread_io_nowait(me, rv, bytes);
-            } else if (_NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-                PR_ASSERT(0);
-                return -1;
-            }
-
-            PR_ASSERT(me->io_pending == PR_FALSE || me->io_suspended == PR_TRUE);
-
-            if (me->io_suspended) {
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                } else {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                return -1;
-            }
-
-            if (me->md.blocked_io_status == 0) {
-                _PR_MD_MAP_WRITE_ERROR(me->md.blocked_io_error);
-                return -1;
-            }
-
-            /*
-             * Moving the file pointer by a relative offset (FILE_CURRENT)
-             * does not work with a file on a network drive exported by a
-             * Win2K system.  We still don't know why.  A workaround is to
-             * move the file pointer by an absolute offset (FILE_BEGIN).
-             * (Bugzilla bug 70765)
-             */
-            offset.LowPart = me->md.overlapped.overlapped.Offset;
-            offset.HighPart = me->md.overlapped.overlapped.OffsetHigh;
-            offset.QuadPart += me->md.blocked_io_bytes;
-
-            SetFilePointer((HANDLE)f, offset.LowPart, &offset.HighPart, FILE_BEGIN);
-    
-            PR_ASSERT(me->io_pending == PR_FALSE);
-
-            return me->md.blocked_io_bytes;
-        }
-    } else {
-        rv = WriteFile((HANDLE)f,
-                       buf,
-                       len,
-                       &bytes,
-                       NULL);
-        if (rv == 0) {
-            _PR_MD_MAP_WRITE_ERROR(GetLastError());
-            return -1;
-        }
-        return bytes;
-    }
-}
-
-PRInt32
-_PR_MD_SOCKETAVAILABLE(PRFileDesc *fd)
-{
-    PRInt32 result;
-
-    if (ioctlsocket(fd->secret->md.osfd, FIONREAD, &result) < 0) {
-		PR_SetError(PR_BAD_DESCRIPTOR_ERROR, WSAGetLastError());
-        return -1;
-    }
-    return result;
-}
-
-PRInt32
-_PR_MD_PIPEAVAILABLE(PRFileDesc *fd)
-{
-    if (NULL == fd)
-		PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-	else
-		PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-}
-
-PROffset32
-_PR_MD_LSEEK(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence)
-{
-    DWORD moveMethod;
-    PROffset32 rv;
-
-    switch (whence) {
-        case PR_SEEK_SET:
-            moveMethod = FILE_BEGIN;
-            break;
-        case PR_SEEK_CUR:
-            moveMethod = FILE_CURRENT;
-            break;
-        case PR_SEEK_END:
-            moveMethod = FILE_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return -1;
-    }
-
-    rv = SetFilePointer((HANDLE)fd->secret->md.osfd, offset, NULL, moveMethod);
-
-    /*
-     * If the lpDistanceToMoveHigh argument (third argument) is
-     * NULL, SetFilePointer returns 0xffffffff on failure.
-     */
-    if (-1 == rv) {
-        _PR_MD_MAP_LSEEK_ERROR(GetLastError());
-    }
-    return rv;
-}
-
-PROffset64
-_PR_MD_LSEEK64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence)
-{
-    DWORD moveMethod;
-    LARGE_INTEGER li;
-    DWORD err;
-
-    switch (whence) {
-        case PR_SEEK_SET:
-            moveMethod = FILE_BEGIN;
-            break;
-        case PR_SEEK_CUR:
-            moveMethod = FILE_CURRENT;
-            break;
-        case PR_SEEK_END:
-            moveMethod = FILE_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return -1;
-    }
-
-    li.QuadPart = offset;
-    li.LowPart = SetFilePointer((HANDLE)fd->secret->md.osfd,
-            li.LowPart, &li.HighPart, moveMethod);
-
-    if (0xffffffff == li.LowPart && (err = GetLastError()) != NO_ERROR) {
-        _PR_MD_MAP_LSEEK_ERROR(err);
-        li.QuadPart = -1;
-    }
-    return li.QuadPart;
-}
-
-/*
- * This is documented to succeed on read-only files, but Win32's
- * FlushFileBuffers functions fails with "access denied" in such a
- * case.  So we only signal an error if the error is *not* "access
- * denied".
- */
-PRInt32
-_PR_MD_FSYNC(PRFileDesc *fd)
-{
-    /*
-     * From the documentation:
-     *
-     *	   On Windows NT, the function FlushFileBuffers fails if hFile
-     *	   is a handle to console output. That is because console
-     *	   output is not buffered. The function returns FALSE, and
-     *	   GetLastError returns ERROR_INVALID_HANDLE.
-     *
-     * On the other hand, on Win95, it returns without error.  I cannot
-     * assume that 0, 1, and 2 are console, because if someone closes
-     * System.out and then opens a file, they might get file descriptor
-     * 1.  An error on *that* version of 1 should be reported, whereas
-     * an error on System.out (which was the original 1) should be
-     * ignored.  So I use isatty() to ensure that such an error was
-     * because of this, and if it was, I ignore the error.
-     */
-
-    BOOL ok = FlushFileBuffers((HANDLE)fd->secret->md.osfd);
-
-    if (!ok) {
-	DWORD err = GetLastError();
-
-	if (err != ERROR_ACCESS_DENIED) {	/* from winerror.h */
-			_PR_MD_MAP_FSYNC_ERROR(err);
-	    return -1;
-	}
-    }
-    return 0;
-}
-
-PRInt32
-_PR_MD_CLOSE(PROsfd osfd, PRBool socket)
-{
-    PRInt32 rv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (socket)  {
-        rv = closesocket((SOCKET)osfd);
-        if (rv < 0)
-            _PR_MD_MAP_CLOSE_ERROR(WSAGetLastError());
-    } else {
-        rv = CloseHandle((HANDLE)osfd)?0:-1;
-        if (rv < 0)
-            _PR_MD_MAP_CLOSE_ERROR(GetLastError());
-    }
-
-    if (rv == 0 && me->io_suspended) {
-        if (me->io_fd == osfd) {
-            PRBool fWait;
-
-            _PR_THREAD_LOCK(me);
-            me->state = _PR_IO_WAIT;
-            /* The IO could have completed on another thread just after
-             * calling closesocket while the io_suspended flag was true.  
-             * So we now grab the lock to do a safe check on io_pending to
-             * see if we need to wait or not.
-             */
-            fWait = me->io_pending;
-            me->io_suspended = PR_FALSE;
-            me->md.interrupt_disabled = PR_TRUE;
-            _PR_THREAD_UNLOCK(me);
-
-            if (fWait)
-                _NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT);
-            PR_ASSERT(me->io_suspended ==  PR_FALSE);
-            PR_ASSERT(me->io_pending ==  PR_FALSE);
-            /*
-             * I/O operation is no longer pending; the thread can now
-             * run on any cpu
-             */
-            _PR_THREAD_LOCK(me);
-            me->md.interrupt_disabled = PR_FALSE;
-            me->md.thr_bound_cpu = NULL;
-            me->io_suspended = PR_FALSE;
-            me->io_pending = PR_FALSE;
-            me->state = _PR_RUNNING;
-            _PR_THREAD_UNLOCK(me);
-        }
-    }
-    return rv;
-}
-
-PRStatus
-_PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable)
-{
-    BOOL rv;
-
-    if (fd->secret->md.io_model_committed) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    rv = SetHandleInformation(
-            (HANDLE)fd->secret->md.osfd,
-            HANDLE_FLAG_INHERIT,
-            inheritable ? HANDLE_FLAG_INHERIT : 0);
-    if (0 == rv) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-} 
-
-void
-_PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported)
-{
-    if (imported) {
-        fd->secret->inheritable = _PR_TRI_UNKNOWN;
-    } else {
-        fd->secret->inheritable = _PR_TRI_FALSE;
-    }
-}
-
-void
-_PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd)
-{
-    DWORD flags;
-
-    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-    if (fd->secret->md.io_model_committed) {
-        return;
-    }
-    if (GetHandleInformation((HANDLE)fd->secret->md.osfd, &flags)) {
-        if (flags & HANDLE_FLAG_INHERIT) {
-            fd->secret->inheritable = _PR_TRI_TRUE;
-        } else {
-            fd->secret->inheritable = _PR_TRI_FALSE;
-        }
-    }
-}
-
-
-/* --- DIR IO ------------------------------------------------------------ */
-#define GetFileFromDIR(d)       (d)->d_entry.cFileName
-#define FileIsHidden(d)       ((d)->d_entry.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-
-void FlipSlashes(char *cp, int len)
-{
-    while (--len >= 0) {
-        if (cp[0] == '/') {
-            cp[0] = PR_DIRECTORY_SEPARATOR;
-        }
-        cp = _mbsinc(cp);
-    }
-} /* end FlipSlashes() */
-
-/*
-**
-** Local implementations of standard Unix RTL functions which are not provided
-** by the VC RTL.
-**
-*/
-
-PRStatus
-_PR_MD_CLOSE_DIR(_MDDir *d)
-{
-    if ( d ) {
-        if (FindClose( d->d_hdl )) {
-            d->magic = (PRUint32)-1;
-            return PR_SUCCESS;
-        } else {
-            _PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
-            return PR_FAILURE;
-        }
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return PR_FAILURE;
-}
-
-
-PRStatus
-_PR_MD_OPEN_DIR(_MDDir *d, const char *name)
-{
-    char filename[ MAX_PATH ];
-    int len;
-
-    len = strlen(name);
-    /* Need 5 bytes for \*.* and the trailing null byte. */
-    if (len + 5 > MAX_PATH) {
-        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-        return PR_FAILURE;
-    }
-    strcpy(filename, name);
-
-    /*
-     * If 'name' ends in a slash or backslash, do not append
-     * another backslash.
-     */
-    if (IsPrevCharSlash(filename, filename + len)) {
-        len--;
-    }
-    strcpy(&filename[len], "\\*.*");
-    FlipSlashes( filename, strlen(filename) );
-
-    d->d_hdl = FindFirstFile( filename, &(d->d_entry) );
-    if ( d->d_hdl == INVALID_HANDLE_VALUE ) {
-		_PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    d->firstEntry = PR_TRUE;
-    d->magic = _MD_MAGIC_DIR;
-    return PR_SUCCESS;
-}
-
-char *
-_PR_MD_READ_DIR(_MDDir *d, PRIntn flags)
-{
-    PRInt32 err;
-    BOOL rv;
-    char *fileName;
-
-    if ( d ) {
-        while (1) {
-            if (d->firstEntry) {
-                d->firstEntry = PR_FALSE;
-                rv = 1;
-            } else {
-                rv = FindNextFile(d->d_hdl, &(d->d_entry));
-            }
-            if (rv == 0) {
-                break;
-            }
-            fileName = GetFileFromDIR(d);
-            if ( (flags & PR_SKIP_DOT) &&
-                 (fileName[0] == '.') && (fileName[1] == '\0'))
-                 continue;
-            if ( (flags & PR_SKIP_DOT_DOT) &&
-                 (fileName[0] == '.') && (fileName[1] == '.') &&
-                 (fileName[2] == '\0'))
-                 continue;
-            if ( (flags & PR_SKIP_HIDDEN) && FileIsHidden(d))
-                 continue;
-            return fileName;
-        }
-	err = GetLastError();
-	PR_ASSERT(NO_ERROR != err);
-			_PR_MD_MAP_READDIR_ERROR(err);
-	return NULL;
-		}
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return NULL;
-}
-
-PRInt32
-_PR_MD_DELETE(const char *name)
-{
-    if (DeleteFile(name)) {
-		return 0;
-	} else {
-		_PR_MD_MAP_DELETE_ERROR(GetLastError());
-		return -1;
-	}
-}
-
-void
-_PR_FileTimeToPRTime(const FILETIME *filetime, PRTime *prtm)
-{
-    PR_ASSERT(sizeof(FILETIME) == sizeof(PRTime));
-    CopyMemory(prtm, filetime, sizeof(PRTime));
-#ifdef __GNUC__
-    *prtm = (*prtm - _pr_filetime_offset) / 10LL;
-#else
-    *prtm = (*prtm - _pr_filetime_offset) / 10i64;
-#endif
-
-#ifdef DEBUG
-    /* Doublecheck our calculation. */
-    {
-        SYSTEMTIME systime;
-        PRExplodedTime etm;
-        PRTime cmp; /* for comparison */
-        BOOL rv;
-
-        rv = FileTimeToSystemTime(filetime, &systime);
-        PR_ASSERT(0 != rv);
-
-        /*
-         * PR_ImplodeTime ignores wday and yday.
-         */
-        etm.tm_usec = systime.wMilliseconds * PR_USEC_PER_MSEC;
-        etm.tm_sec = systime.wSecond;
-        etm.tm_min = systime.wMinute;
-        etm.tm_hour = systime.wHour;
-        etm.tm_mday = systime.wDay;
-        etm.tm_month = systime.wMonth - 1;
-        etm.tm_year = systime.wYear;
-        /*
-         * It is not well-documented what time zone the FILETIME's
-         * are in.  WIN32_FIND_DATA is documented to be in UTC (GMT).
-         * But BY_HANDLE_FILE_INFORMATION is unclear about this.
-         * By our best judgement, we assume that FILETIME is in UTC.
-         */
-        etm.tm_params.tp_gmt_offset = 0;
-        etm.tm_params.tp_dst_offset = 0;
-        cmp = PR_ImplodeTime(&etm);
-
-        /*
-         * SYSTEMTIME is in milliseconds precision, so we convert PRTime's
-         * microseconds to milliseconds before doing the comparison.
-         */
-        PR_ASSERT((cmp / PR_USEC_PER_MSEC) == (*prtm / PR_USEC_PER_MSEC));
-    }
-#endif /* DEBUG */
-}
-
-PRInt32
-_PR_MD_STAT(const char *fn, struct stat *info)
-{
-    PRInt32 rv;
-
-    rv = _stat(fn, (struct _stat *)info);
-    if (-1 == rv) {
-        /*
-         * Check for MSVC runtime library _stat() bug.
-         * (It's really a bug in FindFirstFile().)
-         * If a pathname ends in a backslash or slash,
-         * e.g., c:\temp\ or c:/temp/, _stat() will fail.
-         * Note: a pathname ending in a slash (e.g., c:/temp/)
-         * can be handled by _stat() on NT but not on Win95.
-         *
-         * We remove the backslash or slash at the end and
-         * try again.
-         */
-
-        int len = strlen(fn);
-        if (len > 0 && len <= _MAX_PATH
-                && IsPrevCharSlash(fn, fn + len)) {
-            char newfn[_MAX_PATH + 1];
-
-            strcpy(newfn, fn);
-            newfn[len - 1] = '\0';
-            rv = _stat(newfn, (struct _stat *)info);
-        }
-    }
-
-    if (-1 == rv) {
-        _PR_MD_MAP_STAT_ERROR(errno);
-    }
-    return rv;
-}
-
-#define _PR_IS_SLASH(ch) ((ch) == '/' || (ch) == '\\')
-
-static PRBool
-IsPrevCharSlash(const char *str, const char *current)
-{
-    const char *prev;
-
-    if (str >= current)
-        return PR_FALSE;
-    prev = _mbsdec(str, current);
-    return (prev == current - 1) && _PR_IS_SLASH(*prev);
-}
-
-/*
- * IsRootDirectory --
- *
- * Return PR_TRUE if the pathname 'fn' is a valid root directory,
- * else return PR_FALSE.  The char buffer pointed to by 'fn' must
- * be writable.  During the execution of this function, the contents
- * of the buffer pointed to by 'fn' may be modified, but on return
- * the original contents will be restored.  'buflen' is the size of
- * the buffer pointed to by 'fn'.
- *
- * Root directories come in three formats:
- * 1. / or \, meaning the root directory of the current drive.
- * 2. C:/ or C:\, where C is a drive letter.
- * 3. \\<server name>\<share point name>\ or
- *    \\<server name>\<share point name>, meaning the root directory
- *    of a UNC (Universal Naming Convention) name.
- */
-
-static PRBool
-IsRootDirectory(char *fn, size_t buflen)
-{
-    char *p;
-    PRBool slashAdded = PR_FALSE;
-    PRBool rv = PR_FALSE;
-
-    if (_PR_IS_SLASH(fn[0]) && fn[1] == '\0') {
-        return PR_TRUE;
-    }
-
-    if (isalpha(fn[0]) && fn[1] == ':' && _PR_IS_SLASH(fn[2])
-            && fn[3] == '\0') {
-        rv = GetDriveType(fn) > 1 ? PR_TRUE : PR_FALSE;
-        return rv;
-    }
-
-    /* The UNC root directory */
-
-    if (_PR_IS_SLASH(fn[0]) && _PR_IS_SLASH(fn[1])) {
-        /* The 'server' part should have at least one character. */
-        p = &fn[2];
-        if (*p == '\0' || _PR_IS_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the next slash */
-        do {
-            p = _mbsinc(p);
-        } while (*p != '\0' && !_PR_IS_SLASH(*p));
-        if (*p == '\0') {
-            return PR_FALSE;
-        }
-
-        /* The 'share' part should have at least one character. */
-        p++;
-        if (*p == '\0' || _PR_IS_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the final slash */
-        do {
-            p = _mbsinc(p);
-        } while (*p != '\0' && !_PR_IS_SLASH(*p));
-        if (_PR_IS_SLASH(*p) && p[1] != '\0') {
-            return PR_FALSE;
-        }
-        if (*p == '\0') {
-            /*
-             * GetDriveType() doesn't work correctly if the
-             * path is of the form \\server\share, so we add
-             * a final slash temporarily.
-             */
-            if ((p + 1) < (fn + buflen)) {
-                *p++ = '\\';
-                *p = '\0';
-                slashAdded = PR_TRUE;
-            } else {
-                return PR_FALSE; /* name too long */
-            }
-        }
-        rv = GetDriveType(fn) > 1 ? PR_TRUE : PR_FALSE;
-        /* restore the 'fn' buffer */
-        if (slashAdded) {
-            *--p = '\0';
-        }
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info)
-{
-    HANDLE hFindFile;
-    WIN32_FIND_DATA findFileData;
-    char pathbuf[MAX_PATH + 1];
-    
-    if (NULL == fn || '\0' == *fn) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-
-    /*
-     * FindFirstFile() expands wildcard characters.  So
-     * we make sure the pathname contains no wildcard.
-     */
-    if (NULL != _mbspbrk(fn, "?*")) {
-        PR_SetError(PR_FILE_NOT_FOUND_ERROR, 0);
-        return -1;
-    }
-
-    hFindFile = FindFirstFile(fn, &findFileData);
-    if (INVALID_HANDLE_VALUE == hFindFile) {
-        DWORD len;
-        char *filePart;
-
-        /*
-         * FindFirstFile() does not work correctly on root directories.
-         * It also doesn't work correctly on a pathname that ends in a
-         * slash.  So we first check to see if the pathname specifies a
-         * root directory.  If not, and if the pathname ends in a slash,
-         * we remove the final slash and try again.
-         */
-
-        /*
-         * If the pathname does not contain ., \, and /, it cannot be
-         * a root directory or a pathname that ends in a slash.
-         */
-        if (NULL == _mbspbrk(fn, ".\\/")) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } 
-        len = GetFullPathName(fn, sizeof(pathbuf), pathbuf,
-                &filePart);
-        if (0 == len) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        }
-        if (len > sizeof(pathbuf)) {
-            PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-            return -1;
-        }
-        if (IsRootDirectory(pathbuf, sizeof(pathbuf))) {
-            info->type = PR_FILE_DIRECTORY;
-            info->size = 0;
-            /*
-             * These timestamps don't make sense for root directories.
-             */
-            info->modifyTime = 0;
-            info->creationTime = 0;
-            return 0;
-        }
-        if (!IsPrevCharSlash(pathbuf, pathbuf + len)) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } else {
-            pathbuf[len - 1] = '\0';
-            hFindFile = FindFirstFile(pathbuf, &findFileData);
-            if (INVALID_HANDLE_VALUE == hFindFile) {
-                _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-                return -1;
-            }
-        }
-    }
-
-    FindClose(hFindFile);
-
-    if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        info->type = PR_FILE_DIRECTORY;
-    } else {
-        info->type = PR_FILE_FILE;
-    }
-
-    info->size = findFileData.nFileSizeHigh;
-    info->size = (info->size << 32) + findFileData.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&findFileData.ftLastWriteTime, &info->modifyTime);
-
-    if (0 == findFileData.ftCreationTime.dwLowDateTime &&
-            0 == findFileData.ftCreationTime.dwHighDateTime) {
-        info->creationTime = info->modifyTime;
-    } else {
-        _PR_FileTimeToPRTime(&findFileData.ftCreationTime,
-                &info->creationTime);
-    }
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO(const char *fn, PRFileInfo *info)
-{
-    PRFileInfo64 info64;
-    PRInt32 rv = _PR_MD_GETFILEINFO64(fn, &info64);
-    if (0 == rv)
-    {
-        info->type = info64.type;
-        info->size = (PRUint32) info64.size;
-        info->modifyTime = info64.modifyTime;
-        info->creationTime = info64.creationTime;
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO64(const PRFileDesc *fd, PRFileInfo64 *info)
-{
-    int rv;
-
-    BY_HANDLE_FILE_INFORMATION hinfo;
-
-    rv = GetFileInformationByHandle((HANDLE)fd->secret->md.osfd, &hinfo);
-    if (rv == FALSE) {
-		_PR_MD_MAP_FSTAT_ERROR(GetLastError());
-        return -1;
-	}
-
-    if (hinfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_FILE;
-
-    info->size = hinfo.nFileSizeHigh;
-    info->size = (info->size << 32) + hinfo.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&hinfo.ftLastWriteTime, &(info->modifyTime) );
-    _PR_FileTimeToPRTime(&hinfo.ftCreationTime, &(info->creationTime) );
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info)
-{
-    int rv;
-
-    BY_HANDLE_FILE_INFORMATION hinfo;
-
-    rv = GetFileInformationByHandle((HANDLE)fd->secret->md.osfd, &hinfo);
-    if (rv == FALSE) {
-		_PR_MD_MAP_FSTAT_ERROR(GetLastError());
-        return -1;
-	}
-
-    if (hinfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_FILE;
-
-    info->size = hinfo.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&hinfo.ftLastWriteTime, &(info->modifyTime) );
-    _PR_FileTimeToPRTime(&hinfo.ftCreationTime, &(info->creationTime) );
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_RENAME(const char *from, const char *to)
-{
-    /* Does this work with dot-relative pathnames? */
-    if (MoveFile(from, to)) {
-		return 0;
-	} else {
-		_PR_MD_MAP_RENAME_ERROR(GetLastError());
-		return -1;
-	}
-}
-
-PRInt32
-_PR_MD_ACCESS(const char *name, PRAccessHow how)
-{
-    PRInt32 rv;
-
-    switch (how) {
-      case PR_ACCESS_WRITE_OK:
-        rv = _access(name, 02);
-		break;
-      case PR_ACCESS_READ_OK:
-        rv = _access(name, 04);
-		break;
-      case PR_ACCESS_EXISTS:
-        rv = _access(name, 00);
-		break;
-      default:
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-    }
-	if (rv < 0) {
-		_PR_MD_MAP_ACCESS_ERROR(errno);
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_MKDIR(const char *name, PRIntn mode)
-{
-    /* XXXMB - how to translate the "mode"??? */
-    if (CreateDirectory(name, NULL)) {
-        return 0;
-    } else {
-        _PR_MD_MAP_MKDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_MAKE_DIR(const char *name, PRIntn mode)
-{
-    BOOL rv;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    if (_PR_NT_MakeSecurityDescriptorACL(mode, dirAccessTable,
-            &pSD, &pACL) == PR_SUCCESS) {
-        sa.nLength = sizeof(sa);
-        sa.lpSecurityDescriptor = pSD;
-        sa.bInheritHandle = FALSE;
-        lpSA = &sa;
-    }
-    rv = CreateDirectory(name, lpSA);
-    if (lpSA != NULL) {
-        _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-    }
-    if (rv) {
-        return 0;
-    } else {
-        _PR_MD_MAP_MKDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_RMDIR(const char *name)
-{
-    if (RemoveDirectory(name)) {
-        return 0;
-    } else {
-        _PR_MD_MAP_RMDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRStatus
-_PR_MD_LOCKFILE(PROsfd f)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-
-    rv = LockFileEx((HANDLE)f, 
-                    LOCKFILE_EXCLUSIVE_LOCK,
-                    0,
-                    0x7fffffff,
-                    0,
-                    &me->md.overlapped.overlapped);
-
-    if (_native_threads_only) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return PR_FAILURE;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-        if (rv == FALSE) {
-            err = GetLastError();
-            PR_ASSERT(err != ERROR_IO_PENDING);
-            _PR_MD_MAP_LOCKF_ERROR(err);
-            return PR_FAILURE;
-        }
-        return PR_SUCCESS;
-    }
-
-    /* HACK AROUND NT BUG
-     * NT 3.51 has a bug.  In NT 3.51, if LockFileEx returns true, you
-     * don't get any completion on the completion port.  This is a bug.
-     *
-     * They fixed it on NT4.0 so that you do get a completion.
-     *
-     * If we pretend we won't get a completion, NSPR gets confused later
-     * when the unexpected completion arrives.  If we assume we do get
-     * a completion, we hang on 3.51.  Worse, Microsoft informs me that the 
-     * behavior varies on 3.51 depending on if you are using a network
-     * file system or a local disk!
-     *
-     * Solution:  For now, _nt_version_gets_lockfile_completion is set
-     * depending on whether or not this system is EITHER
-     *      - running NT 4.0
-     *      - running NT 3.51 with a service pack greater than 5.
-     * 
-     * In the meantime, this code may not work on network file systems.
-     *
-     */
-
-    if ( rv == FALSE && ((err = GetLastError()) != ERROR_IO_PENDING)) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return PR_FAILURE;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-		_PR_MD_MAP_LOCKF_ERROR(err);
-        return PR_FAILURE;
-    }
-#ifdef _NEED_351_FILE_LOCKING_HACK
-    else if (rv)  {
-        /* If this is NT 3.51 and the file is local, then we won't get a 
-         * completion back from LockFile when it succeeded.
-         */
-        if (_nt_version_gets_lockfile_completion == PR_FALSE) {
-            if ( IsFileLocal((HANDLE)f) == _PR_LOCAL_FILE) {
-                me->io_pending = PR_FALSE;
-                me->state = _PR_RUNNING;
-                return PR_SUCCESS; 
-            }
-        }
-    }
-#endif /* _NEED_351_FILE_LOCKING_HACK */
-
-    if (_NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-		_PR_THREAD_LOCK(me);
-        me->io_pending = PR_FALSE;
-        me->state = _PR_RUNNING;
-		_PR_THREAD_UNLOCK(me);
-        return PR_FAILURE;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-		_PR_MD_MAP_LOCKF_ERROR(me->md.blocked_io_error);
-        return PR_FAILURE;
-    }
-
-    return PR_SUCCESS;
-}
-
-PRStatus
-_PR_MD_TLOCKFILE(PROsfd f)
-{
-    PRInt32 rv, err;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-
-    _PR_THREAD_LOCK(me);
-	if (_PR_PENDING_INTERRUPT(me)) {
-		me->flags &= ~_PR_INTERRUPT;
-		PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    	_PR_THREAD_UNLOCK(me);
-		return -1;
-	}
-    me->io_pending = PR_TRUE;
-    me->state = _PR_IO_WAIT;
-    _PR_THREAD_UNLOCK(me);
-
-    rv = LockFileEx((HANDLE)f, 
-                    LOCKFILE_FAIL_IMMEDIATELY|LOCKFILE_EXCLUSIVE_LOCK,
-                    0,
-                    0x7fffffff,
-                    0,
-                    &me->md.overlapped.overlapped);
-    if (_native_threads_only) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return PR_FAILURE;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-        if (rv == FALSE) {
-            err = GetLastError();
-            PR_ASSERT(err != ERROR_IO_PENDING);
-            _PR_MD_MAP_LOCKF_ERROR(err);
-            return PR_FAILURE;
-        }
-        return PR_SUCCESS;
-    }
-    if ( rv == FALSE && ((err = GetLastError()) != ERROR_IO_PENDING)) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return PR_FAILURE;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-        _PR_MD_MAP_LOCKF_ERROR(err);
-        return PR_FAILURE;
-    }
-#ifdef _NEED_351_FILE_LOCKING_HACK
-    else if (rv)  {
-        /* If this is NT 3.51 and the file is local, then we won't get a 
-         * completion back from LockFile when it succeeded.
-         */
-        if (_nt_version_gets_lockfile_completion == PR_FALSE) {
-            if ( IsFileLocal((HANDLE)f) == _PR_LOCAL_FILE) {
-				_PR_THREAD_LOCK(me);
-				me->io_pending = PR_FALSE;
-				me->state = _PR_RUNNING;
-				if (_PR_PENDING_INTERRUPT(me)) {
-					me->flags &= ~_PR_INTERRUPT;
-					PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-					_PR_THREAD_UNLOCK(me);
-					return PR_FAILURE;
-				}
-				_PR_THREAD_UNLOCK(me);
-
-                return PR_SUCCESS; 
-            }
-        }
-    }
-#endif /* _NEED_351_FILE_LOCKING_HACK */
-
-    if (_NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-		_PR_THREAD_LOCK(me);
-		me->io_pending = PR_FALSE;
-		me->state = _PR_RUNNING;
-		if (_PR_PENDING_INTERRUPT(me)) {
-			me->flags &= ~_PR_INTERRUPT;
-			PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-			_PR_THREAD_UNLOCK(me);
-			return PR_FAILURE;
-		}
-		_PR_THREAD_UNLOCK(me);
-
-        return PR_FAILURE;
-    }
-
-    if (me->md.blocked_io_status == 0) {
-		_PR_MD_MAP_LOCKF_ERROR(me->md.blocked_io_error);
-        return PR_FAILURE;
-    }
-
-    return PR_SUCCESS;
-}
-
-
-PRStatus
-_PR_MD_UNLOCKFILE(PROsfd f)
-{
-    PRInt32 rv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (me->io_suspended) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    memset(&(me->md.overlapped.overlapped), 0, sizeof(OVERLAPPED));
-
-    rv = UnlockFileEx((HANDLE)f,
-                      0,
-                      0x7fffffff,
-                      0,
-                      &me->md.overlapped.overlapped);
-
-    if (rv)
-        return PR_SUCCESS;
-    else {
-        int err = GetLastError();
-		_PR_MD_MAP_LOCKF_ERROR(err);
-        return PR_FAILURE;
-    }
-}
-
-void
-_PR_MD_MAKE_NONBLOCK(PRFileDesc *f)
-{
-    /*
-     * On NT, we either call _md_Associate() or _md_MakeNonblock(),
-     * depending on whether the socket is blocking or not.
-     *
-     * Once we associate a socket with the io completion port,
-     * there is no way to disassociate it from the io completion
-     * port.  So we have to call _md_Associate/_md_MakeNonblock
-     * lazily.
-     */
-}
-
-#ifdef _NEED_351_FILE_LOCKING_HACK
-/***************
-** 
-** Lockfile hacks
-**
-** The following code is a hack to work around a microsoft bug with lockfile.
-** The problem is that on NT 3.51, if LockFileEx() succeeds, you never
-** get a completion back for files that are on local disks.  So, we need to
-** know if a file is local or remote so we can tell if we should expect 
-** a completion.
-**
-** The only way to check if a file is local or remote based on the handle is
-** to get the serial number for the volume it is mounted on and then to 
-** compare that with mounted drives.  This code caches the volume numbers of
-** fixed disks and does a relatively quick check.
-**
-** Locking:  Since the only thing we ever do when multithreaded is a 32bit
-**           assignment, we probably don't need locking.  It is included just
-**           case anyway.
-**
-** Limitations:  Does not work on floppies because they are too slow
-**               Unknown if it will work on wierdo 3rd party file systems
-**
-****************
-*/
-
-/* There can only be 26 drive letters on NT */
-#define _PR_MAX_DRIVES 26
-
-_MDLock cachedVolumeLock;
-DWORD dwCachedVolumeSerialNumbers[_PR_MAX_DRIVES] = {0};
-DWORD dwLastCachedDrive = 0;
-DWORD dwRemoveableDrivesToCheck = 0; /* bitmask for removeable drives */
-
-PRBool IsFileLocalInit()
-{
-   TCHAR lpBuffer[_PR_MAX_DRIVES*5];
-   DWORD nBufferLength = _PR_MAX_DRIVES*5;
-   DWORD nBufferNeeded = GetLogicalDriveStrings(0, NULL);
-   DWORD dwIndex = 0;
-   DWORD dwDriveType;
-   DWORD dwVolumeSerialNumber;
-   DWORD dwDriveIndex = 0;
-   DWORD oldmode = (DWORD) -1;
-
-   _MD_NEW_LOCK(&cachedVolumeLock);
-
-   nBufferNeeded = GetLogicalDriveStrings(nBufferLength, lpBuffer);
-   if (nBufferNeeded == 0 || nBufferNeeded > nBufferLength)
-      return PR_FALSE;
-
-   // Calling GetVolumeInformation on a removeable drive where the
-   // disk is currently removed will cause a dialog box to the
-   // console.  This is not good.
-   // Temporarily disable the SEM_FAILCRITICALERRORS to avoid the
-   // damn dialog.
-
-   dwCachedVolumeSerialNumbers[dwDriveIndex] = 0;
-   oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
-
-   // now loop through the logical drives
-   while(lpBuffer[dwIndex] != TEXT('\0'))
-   {
-      // skip the floppy drives.  This is *SLOW*
-      if ((lpBuffer[dwIndex] == TEXT('A')) || (lpBuffer[dwIndex] == TEXT('B')))
-         /* Skip over floppies */;
-      else
-      {
-         dwDriveIndex = (lpBuffer[dwIndex] - TEXT('A'));
-
-         dwDriveType = GetDriveType(&lpBuffer[dwIndex]);
-
-         switch(dwDriveType)
-         {
-               // Ignore these drive types
-            case 0:
-            case 1:
-            case DRIVE_REMOTE:
-            default: // If the drive type is unknown, ignore it.
-               break;
-
-               // Removable media drives can have different serial numbers
-               // at different times, so cache the current serial number
-               // but keep track of them so they can be rechecked if necessary.
-            case DRIVE_REMOVABLE:
-
-               // CDROM is a removable media
-            case DRIVE_CDROM: 
-
-               // no idea if ramdisks can change serial numbers or not
-               // but it doesn't hurt to treat them as removable.
-              
-            case DRIVE_RAMDISK: 
-
-
-               // Here is where we keep track of removable drives.
-               dwRemoveableDrivesToCheck |= 1 << dwDriveIndex;
-
-               // removable drives fall through to fixed drives and get cached.
-
-            case DRIVE_FIXED:
-
-               // cache volume serial numbers. 
-               if (GetVolumeInformation(
-                   &lpBuffer[dwIndex],
-                   NULL, 0,
-                   &dwVolumeSerialNumber,
-                   NULL, NULL, NULL, 0)
-                  )
-                  {
-                     if (dwLastCachedDrive < dwDriveIndex)
-                        dwLastCachedDrive = dwDriveIndex;
-                     dwCachedVolumeSerialNumbers[dwDriveIndex] = dwVolumeSerialNumber;
-                  }
- 
-               break;
-         }
-      }
-
-      dwIndex += lstrlen(&lpBuffer[dwIndex]) +1;
-   }
-
-   if (oldmode != (DWORD) -1) {
-       SetErrorMode(oldmode);
-       oldmode = (DWORD) -1;
-   }
-
-   return PR_TRUE;
-}
-
-PRInt32 IsFileLocal(HANDLE hFile)
-{
-   DWORD dwIndex = 0, dwMask;
-   BY_HANDLE_FILE_INFORMATION Info;
-   TCHAR szDrive[4] = TEXT("C:\\");
-   DWORD dwVolumeSerialNumber;
-   DWORD oldmode = (DWORD) -1;
-   int rv = _PR_REMOTE_FILE;
-
-   if (!GetFileInformationByHandle(hFile, &Info))
-      return -1;
-
-   // look to see if the volume serial number has been cached.
-   _MD_LOCK(&cachedVolumeLock);
-   while(dwIndex <= dwLastCachedDrive)
-      if (dwCachedVolumeSerialNumbers[dwIndex++] == Info.dwVolumeSerialNumber)
-         return _PR_LOCAL_FILE;
-   _MD_UNLOCK(&cachedVolumeLock);
-
-   // volume serial number not found in the cache.  Check removable files.
-   // removable drives are noted as a bitmask.  If the bit associated with 
-   // a specific drive is set, then we should query its volume serial number
-   // as its possible it has changed.
-   dwMask = dwRemoveableDrivesToCheck;
-   dwIndex = 0;
-
-   while(dwMask)
-   {
-      while(!(dwMask & 1))
-      {
-         dwIndex++;
-         dwMask = dwMask >> 1;
-      }
-
-      szDrive[0] = TEXT('A')+ (TCHAR) dwIndex;
-
-      // Calling GetVolumeInformation on a removeable drive where the
-      // disk is currently removed will cause a dialog box to the
-      // console.  This is not good.
-      // Temporarily disable the SEM_FAILCRITICALERRORS to avoid the
-      // dialog.
-
-      oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
-
-      if (GetVolumeInformation(
-                  szDrive,
-                  NULL, 0,
-                  &dwVolumeSerialNumber,
-                  NULL, NULL, NULL, 0)
-         )
-      {
-         if (dwVolumeSerialNumber == Info.dwVolumeSerialNumber)
-         {
-            _MD_LOCK(&cachedVolumeLock);
-            if (dwLastCachedDrive < dwIndex)
-               dwLastCachedDrive = dwIndex;
-            dwCachedVolumeSerialNumbers[dwIndex] = dwVolumeSerialNumber;
-            _MD_UNLOCK(&cachedVolumeLock);
-            rv = _PR_LOCAL_FILE;
-         }
-      }
-      if (oldmode != (DWORD) -1) {
-          SetErrorMode(oldmode);
-          oldmode = (DWORD) -1;
-      }
-
-      if (rv == _PR_LOCAL_FILE)
-          return _PR_LOCAL_FILE;
-
-      dwIndex++;
-      dwMask = dwMask >> 1;
-   }
-
-   return _PR_REMOTE_FILE;
-}
-#endif /* _NEED_351_FILE_LOCKING_HACK */
-
-PR_IMPLEMENT(PRStatus) PR_NT_CancelIo(PRFileDesc *fd)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-	PRBool fWait;
-	PRFileDesc *bottom;
-
-	bottom = PR_GetIdentitiesLayer(fd, PR_NSPR_IO_LAYER);
-    if (!me->io_suspended || (NULL == bottom) ||
-					(me->io_fd != bottom->secret->md.osfd)) {
-        PR_SetError(PR_INVALID_STATE_ERROR, 0);
-        return PR_FAILURE;
-    }
-	/*
-	 * The CancelIO operation has to be issued by the same NT thread that
-	 * issued the I/O operation
-	 */
-	PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || (me->cpu == me->md.thr_bound_cpu));
-	if (me->io_pending) {
-		if (!CancelIo((HANDLE)bottom->secret->md.osfd)) {
-			PR_SetError(PR_INVALID_STATE_ERROR, GetLastError());
-			return PR_FAILURE;
-		}
-	}
-	_PR_THREAD_LOCK(me);
-	fWait = me->io_pending;
-	me->io_suspended = PR_FALSE;
-	me->state = _PR_IO_WAIT;
-	me->md.interrupt_disabled = PR_TRUE;
-	_PR_THREAD_UNLOCK(me);
-	if (fWait)
-		_NT_IO_WAIT(me, PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(me->io_suspended ==  PR_FALSE);
-	PR_ASSERT(me->io_pending ==  PR_FALSE);
-
-	_PR_THREAD_LOCK(me);
-	me->md.interrupt_disabled = PR_FALSE;
-	me->md.thr_bound_cpu = NULL;
-    me->io_suspended = PR_FALSE;
-    me->io_pending = PR_FALSE;
-	me->state = _PR_RUNNING;
-	_PR_THREAD_UNLOCK(me);
-	return PR_SUCCESS;
-}
-
-static PROsfd _nt_nonblock_accept(PRFileDesc *fd, struct sockaddr *addr, int *addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    SOCKET sock;
-    PRInt32 rv, err;
-    fd_set rd;
-    struct timeval tv, *tvp;
-
-    FD_ZERO(&rd);
-    FD_SET((SOCKET)osfd, &rd);
-    if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-        while ((sock = accept(osfd, addr, addrlen)) == -1) {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                    && (!fd->secret->nonblocking)) {
-                if ((rv = _PR_NTFiberSafeSelect(0, &rd, NULL, NULL,
-                        NULL)) == -1) {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                    break;
-                }
-            } else {
-                _PR_MD_MAP_ACCEPT_ERROR(err);
-                break;
-            }
-        }
-    } else if (timeout == PR_INTERVAL_NO_WAIT) {
-        if ((sock = accept(osfd, addr, addrlen)) == -1) {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                    && (!fd->secret->nonblocking)) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-            } else {
-                _PR_MD_MAP_ACCEPT_ERROR(err);
-            }
-        }
-    } else {
-retry:
-        if ((sock = accept(osfd, addr, addrlen)) == -1) {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                    && (!fd->secret->nonblocking)) {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                    timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-
-                rv = _PR_NTFiberSafeSelect(0, &rd, NULL, NULL, tvp);
-                if (rv > 0) {
-                    goto retry;
-                } else if (rv == 0) {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                } else {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                }
-            } else {
-                _PR_MD_MAP_ACCEPT_ERROR(err);
-            }
-        }
-    }
-    return (PROsfd)sock;
-}
-
-static PRInt32 _nt_nonblock_connect(PRFileDesc *fd, struct sockaddr *addr, int addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv;
-    int err;
-    fd_set wr, ex;
-    struct timeval tv, *tvp;
-    int len;
-
-    if ((rv = connect(osfd, addr, addrlen)) == -1) {
-        if ((err = WSAGetLastError()) == WSAEWOULDBLOCK) {
-            if ( timeout == PR_INTERVAL_NO_TIMEOUT ) {
-                tvp = NULL;
-            } else {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                    timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-            }
-            FD_ZERO(&wr);
-            FD_ZERO(&ex);
-            FD_SET((SOCKET)osfd, &wr);
-            FD_SET((SOCKET)osfd, &ex);
-            if ((rv = _PR_NTFiberSafeSelect(0, NULL, &wr, &ex,
-                    tvp)) == -1) {
-                _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                return rv;
-            }
-            if (rv == 0) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                return -1;
-            }
-            /* Call Sleep(0) to work around a Winsock timeing bug. */
-            Sleep(0);
-            if (FD_ISSET((SOCKET)osfd, &ex)) {
-                len = sizeof(err);
-                if (getsockopt(osfd, SOL_SOCKET, SO_ERROR,
-                        (char *) &err, &len) == SOCKET_ERROR) {
-                    _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-                    return -1;
-                }
-                _PR_MD_MAP_CONNECT_ERROR(err);
-                return -1;
-            } 
-            PR_ASSERT(FD_ISSET((SOCKET)osfd, &wr));
-            rv = 0;
-        } else {
-            _PR_MD_MAP_CONNECT_ERROR(err);
-        }
-    }
-    return rv;
-}
-
-static PRInt32 _nt_nonblock_recv(PRFileDesc *fd, char *buf, int len, int flags, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    struct timeval tv, *tvp;
-    fd_set rd;
-    int osflags;
-
-    if (0 == flags) {
-        osflags = 0;
-    } else {
-        PR_ASSERT(PR_MSG_PEEK == flags);
-        osflags = MSG_PEEK;
-    }
-    while ((rv = recv(osfd,buf,len,osflags)) == -1) {
-        if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                && (!fd->secret->nonblocking)) {
-            FD_ZERO(&rd);
-            FD_SET((SOCKET)osfd, &rd);
-            if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-                tvp = NULL;
-            } else {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-            }
-            if ((rv = _PR_NTFiberSafeSelect(0, &rd, NULL, NULL,
-                    tvp)) == -1) {
-                _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                break;
-            } else if (rv == 0) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                rv = -1;
-                break;
-            }
-        } else {
-            _PR_MD_MAP_RECV_ERROR(err);
-            break;
-        }
-    }
-    return(rv);
-}
-
-static PRInt32 _nt_nonblock_send(PRFileDesc *fd, char *buf, int len, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    struct timeval tv, *tvp;
-    fd_set wd;
-    PRInt32 bytesSent = 0;
-
-    while(bytesSent < len) {
-        while ((rv = send(osfd,buf,len,0)) == -1) {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                    && (!fd->secret->nonblocking)) {
-                if ( timeout == PR_INTERVAL_NO_TIMEOUT ) {
-                    tvp = NULL;
-                } else {
-                    tv.tv_sec = PR_IntervalToSeconds(timeout);
-                    tv.tv_usec = PR_IntervalToMicroseconds(
-                        timeout - PR_SecondsToInterval(tv.tv_sec));
-                    tvp = &tv;
-                }
-                FD_ZERO(&wd);
-                FD_SET((SOCKET)osfd, &wd);
-                if ((rv = _PR_NTFiberSafeSelect(0, NULL, &wd, NULL,
-                        tvp)) == -1) {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                    return -1;
-                }
-                if (rv == 0) {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                    return -1;
-                }
-            } else {
-                _PR_MD_MAP_SEND_ERROR(err);
-                return -1;
-            }
-        }
-        bytesSent += rv;
-        if (fd->secret->nonblocking) {
-            break;
-        }
-        if (bytesSent < len) {
-            if ( timeout == PR_INTERVAL_NO_TIMEOUT ) {
-                tvp = NULL;
-            } else {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                    timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-            }
-            FD_ZERO(&wd);
-            FD_SET((SOCKET)osfd, &wd);
-            if ((rv = _PR_NTFiberSafeSelect(0, NULL, &wd, NULL,
-                    tvp)) == -1) {
-                _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                return -1;
-            }
-            if (rv == 0) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                return -1;
-            }
-        }
-    }
-    return bytesSent;
-}
-
-static PRInt32 _nt_nonblock_writev(PRFileDesc *fd, const PRIOVec *iov, int size, PRIntervalTime timeout)
-{
-    int index;
-    int sent = 0;
-    int rv;
-
-    for (index=0; index<size; index++) {
-        rv = _nt_nonblock_send(fd, iov[index].iov_base, iov[index].iov_len, timeout);
-        if (rv > 0) 
-            sent += rv;
-        if ( rv != iov[index].iov_len ) {
-            if (rv < 0) {
-                if (fd->secret->nonblocking
-                        && (PR_GetError() == PR_WOULD_BLOCK_ERROR)
-                        && (sent > 0)) {
-                    return sent;
-                } else {
-                    return -1;
-                }
-            }
-            /* Only a nonblocking socket can have partial sends */
-            PR_ASSERT(fd->secret->nonblocking);
-            return sent;
-        }
-    }
-
-    return sent;
-}
-
-static PRInt32 _nt_nonblock_sendto(
-    PRFileDesc *fd, const char *buf, int len,
-    const struct sockaddr *addr, int addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    struct timeval tv, *tvp;
-    fd_set wd;
-    PRInt32 bytesSent = 0;
-
-    while(bytesSent < len) {
-        while ((rv = sendto(osfd,buf,len,0, addr, addrlen)) == -1) {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                    && (!fd->secret->nonblocking)) {
-                if ( timeout == PR_INTERVAL_NO_TIMEOUT ) {
-                    tvp = NULL;
-                } else {
-                    tv.tv_sec = PR_IntervalToSeconds(timeout);
-                    tv.tv_usec = PR_IntervalToMicroseconds(
-                        timeout - PR_SecondsToInterval(tv.tv_sec));
-                    tvp = &tv;
-                }
-                FD_ZERO(&wd);
-                FD_SET((SOCKET)osfd, &wd);
-                if ((rv = _PR_NTFiberSafeSelect(0, NULL, &wd, NULL,
-                        tvp)) == -1) {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                    return -1;
-                }
-                if (rv == 0) {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                    return -1;
-                }
-            } else {
-                _PR_MD_MAP_SENDTO_ERROR(err);
-                return -1;
-            }
-        }
-        bytesSent += rv;
-        if (fd->secret->nonblocking) {
-            break;
-        }
-        if (bytesSent < len) {
-            if ( timeout == PR_INTERVAL_NO_TIMEOUT ) {
-                tvp = NULL;
-            } else {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                    timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-            }
-            FD_ZERO(&wd);
-            FD_SET((SOCKET)osfd, &wd);
-            if ((rv = _PR_NTFiberSafeSelect(0, NULL, &wd, NULL,
-                    tvp)) == -1) {
-                _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                return -1;
-            }
-            if (rv == 0) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                return -1;
-            }
-        }
-    }
-    return bytesSent;
-}
-
-static PRInt32 _nt_nonblock_recvfrom(PRFileDesc *fd, char *buf, int len, struct sockaddr *addr, int *addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    struct timeval tv, *tvp;
-    fd_set rd;
-
-    while ((rv = recvfrom(osfd,buf,len,0,addr, addrlen)) == -1) {
-        if (((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-                && (!fd->secret->nonblocking)) {
-            if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-                tvp = NULL;
-            } else {
-                tv.tv_sec = PR_IntervalToSeconds(timeout);
-                tv.tv_usec = PR_IntervalToMicroseconds(
-                timeout - PR_SecondsToInterval(tv.tv_sec));
-                tvp = &tv;
-            }
-            FD_ZERO(&rd);
-            FD_SET((SOCKET)osfd, &rd);
-            if ((rv = _PR_NTFiberSafeSelect(0, &rd, NULL, NULL,
-                    tvp)) == -1) {
-                _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                break;
-            } else if (rv == 0) {
-                PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                rv = -1;
-                break;
-            }
-        } else {
-            _PR_MD_MAP_RECVFROM_ERROR(err);
-            break;
-        }
-    }
-    return(rv);
-}
-
-/*
- * UDP support: the continuation thread functions and recvfrom and sendto.
- */
-
-static void pt_InsertTimedInternal(pt_Continuation *op)
-{
-    PRInt32 delta = 0;
-    pt_Continuation *t_op = NULL;
-    PRIntervalTime now = PR_IntervalNow(), op_tmo, qd_tmo;
-
-    /*
-     * If this element operation isn't timed, it gets queued at the
-     * end of the list (just after pt_tq.tail) and we're
-     * finishd early.
-     */
-    if (PR_INTERVAL_NO_TIMEOUT == op->timeout)
-    {
-        t_op = pt_tq.tail;  /* put it at the end */
-        goto done;
-    }
-
-    /*
-     * The rest of this routine actaully deals with timed ops.
-     */
-
-    if (NULL != pt_tq.op)
-    {
-        /*
-         * To find where in the list to put the new operation, form
-         * the absolute time the operations in question will expire.
-         *
-         * The new operation ('op') will expire at now() + op->timeout.
-         *
-         * The operation that will time out furthest in the future will
-         * do so at pt_tq.epoch + pt_tq.op->timeout.
-         *
-         * Subsequently earlier timeouts are computed based on the latter
-         * knowledge by subracting the timeout deltas that are stored in
-         * the operation list. There are operation[n]->timeout ticks
-         * between the expiration of operation[n-1] and operation[n].e e 
-         *
-         * Therefore, the operation[n-1] will expire operation[n]->timeout
-         * ticks prior to operation[n].
-         *
-         * This should be easy!
-         */
-        t_op = pt_tq.op;  /* running pointer to queued op */
-        op_tmo = now + op->timeout;  /* that's in absolute ticks */
-        qd_tmo = pt_tq.epoch + t_op->timeout;  /* likewise */
-
-        do
-        {
-            /*
-             * If 'op' expires later than t_op, then insert 'op' just
-             * ahead of t_op. Otherwise, compute when operation[n-1]
-             * expires and try again.
-             *
-             * The actual different between the expiriation of 'op'
-             * and the current operation what becomes the new operaton's
-             * timeout interval. That interval is also subtracted from
-             * the interval of the operation immediately following where
-             * we stick 'op' (unless the next one isn't timed). The new
-             * timeout assigned to 'op' takes into account the values of
-             * now() and when the previous intervals were compured.
-             */
-            delta = op_tmo - qd_tmo;
-            if (delta >= 0)
-            {
-                op->timeout += (now - pt_tq.epoch);
-                goto done;
-            }
-
-            qd_tmo -= t_op->timeout;  /* previous operaton expiration */
-            t_op = t_op->prev;  /* point to previous operation */
-            if (NULL != t_op) qd_tmo += t_op->timeout;
-        } while (NULL != t_op);
-
-        /*
-         * If we got here we backed off the head of the list. That means that
-         * this timed entry has to go at the head of the list. This is just
-         * about like having an empty timer list.
-         */
-        delta = op->timeout;  /* $$$ is this right? */
-    }
-
-done:
-
-    /*
-     * Insert 'op' into the queue just after t_op or if t_op is null,
-     * at the head of the list.
-     *
-     * If t_op is NULL, the list is currently empty and this is pretty
-     * easy.
-     */
-    if (NULL == t_op)
-    {
-        op->prev = NULL;
-        op->next = pt_tq.head;
-        pt_tq.head = op;
-        if (NULL == pt_tq.tail) pt_tq.tail = op;
-        else op->next->prev = op;
-    }
-    else
-    {
-        op->prev = t_op;
-        op->next = t_op->next;
-        if (NULL != op->prev)
-            op->prev->next = op;
-        if (NULL != op->next)
-            op->next->prev = op;
-        if (t_op == pt_tq.tail)
-            pt_tq.tail = op;
-    }
-
-    /*
-     * Are we adjusting our epoch, etc? Are we replacing
-     * what was previously the element due to expire furthest
-     * out in the future? Is this even a timed operation?
-     */
-    if (PR_INTERVAL_NO_TIMEOUT != op->timeout)
-    {
-        if ((NULL == pt_tq.op)  /* we're the one and only */
-        || (t_op == pt_tq.op))  /* we're replacing */
-        {
-            pt_tq.op = op;
-            pt_tq.epoch = now;
-        }
-    }
-
-    pt_tq.op_count += 1;
-
-}  /* pt_InsertTimedInternal */
-
-/*
- * function: pt_FinishTimed
- *
- * Takes the finished operation out of the timed queue. It
- * notifies the initiating thread that the opertions is
- * complete and returns to the caller the value of the next
- * operation in the list (or NULL).
- */
-static pt_Continuation *pt_FinishTimedInternal(pt_Continuation *op)
-{
-    pt_Continuation *next;
-
-    /* remove this one from the list */
-    if (NULL == op->prev) pt_tq.head = op->next;
-    else op->prev->next = op->next;
-    if (NULL == op->next) pt_tq.tail = op->prev;
-    else op->next->prev = op->prev;
-
-    /* did we happen to hit the timed op? */
-    if (op == pt_tq.op) pt_tq.op = op->prev;
-
-    next = op->next;
-    op->next = op->prev = NULL;
-    op->status = pt_continuation_done;
-
-    pt_tq.op_count -= 1;
-#if defined(DEBUG)
-    pt_debug.continuationsServed += 1;
-#endif
-    PR_NotifyCondVar(op->complete);
-
-    return next;
-}  /* pt_FinishTimedInternal */
-
-static void ContinuationThread(void *arg)
-{
-    /* initialization */
-    fd_set readSet, writeSet, exceptSet;
-    struct timeval tv;
-    SOCKET *pollingList = 0;                /* list built for polling */
-    PRIntn pollingListUsed;                 /* # entries used in the list */
-    PRIntn pollingListNeeded;               /* # entries needed this time */
-    PRIntn pollingSlotsAllocated = 0;       /* # entries available in list */
-    PRIntervalTime mx_select_ticks = PR_MillisecondsToInterval(PT_DEFAULT_SELECT_MSEC);
-
-    /* do some real work */
-    while (1)
-    {
-        PRIntn rv;
-        PRStatus status;
-        PRIntn pollIndex;
-        pt_Continuation *op;
-        PRIntervalTime now = PR_IntervalNow();
-        PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
-
-        PR_Lock(pt_tq.ml);
-        while (NULL == pt_tq.head)
-        {
-            status = PR_WaitCondVar(pt_tq.new_op, PR_INTERVAL_NO_TIMEOUT);
-            if ((PR_FAILURE == status)
-                && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) break;
-        }
-        pollingListNeeded = pt_tq.op_count;
-        PR_Unlock(pt_tq.ml);
-
-        /* Okay. We're history */
-        if ((PR_FAILURE == status)
-            && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) break;
-
-	/*
-	 * We are not holding the pt_tq.ml lock now, so more items may
-	 * get added to pt_tq during this window of time.  We hope
-	 * that 10 more spaces in the polling list should be enough.
-	 */
-
-        FD_ZERO(&readSet);
-        FD_ZERO(&writeSet);
-        FD_ZERO(&exceptSet);
-        pollingListNeeded += 10;
-        if (pollingListNeeded > pollingSlotsAllocated)
-        {
-            if (NULL != pollingList) PR_DELETE(pollingList);
-            pollingList = PR_MALLOC(pollingListNeeded * sizeof(PRPollDesc));
-            PR_ASSERT(NULL != pollingList);
-            pollingSlotsAllocated = pollingListNeeded;
-        }
-
-#if defined(DEBUG)
-        if (pollingListNeeded > pt_debug.pollingListMax)
-            pt_debug.pollingListMax = pollingListUsed;
-#endif
-
-        /*
-         * Build up a polling list.
-         * This list is sorted on time. Operations that have been
-         * interrupted are completed and not included in the list.
-         * There is an assertion that the operation is in progress.
-         */
-        pollingListUsed = 0;
-        PR_Lock(pt_tq.ml);
-
-        for (op = pt_tq.head; NULL != op;)
-        {
-            if (pt_continuation_abort == op->status)
-            {
-                op->result.code = -1;
-                op->syserrno = WSAEINTR;
-                op = pt_FinishTimedInternal(op);
-            }
-            else
-            {
-                PR_ASSERT(pt_continuation_done != op->status);
-                op->status = pt_continuation_inprogress;
-                if (op->event & PR_POLL_READ) {
-                    FD_SET(op->arg1.osfd, &readSet);
-                }
-                if (op->event & PR_POLL_WRITE) {
-                    FD_SET(op->arg1.osfd, &writeSet);
-                }
-                if (op->event & PR_POLL_EXCEPT) {
-                    FD_SET(op->arg1.osfd, &exceptSet);
-                }
-                pollingList[pollingListUsed] = op->arg1.osfd;
-                pollingListUsed += 1;
-                if (pollingListUsed == pollingSlotsAllocated) break;
-                op = op->next;
-            }
-        }
-
-        PR_Unlock(pt_tq.ml);
-
-        /*
-         * If 'op' isn't NULL at this point, then we didn't get to
-         * the end of the list. That means that more items got added
-         * to the list than we anticipated. So, forget this iteration,
-         * go around the horn again.
-         * One would hope this doesn't happen all that often.
-         */
-        if (NULL != op)
-        {
-#if defined(DEBUG)
-            pt_debug.predictionsFoiled += 1;  /* keep track */
-#endif
-            continue;  /* make it rethink things */
-        }
-
-        /* there's a chance that all ops got blown away */
-        if (NULL == pt_tq.head) continue;
-        /* if not, we know this is the shortest timeout */
-        timeout = pt_tq.head->timeout;
-
-        /*
-         * We don't want to wait forever on this poll. So keep
-         * the interval down. The operations, if they are timed,
-         * still have to timeout, while those that are not timed
-         * should persist forever. But they may be aborted. That's
-         * what this anxiety is all about.
-         */
-        if (timeout > mx_select_ticks) timeout = mx_select_ticks;
-
-        if (PR_INTERVAL_NO_TIMEOUT != pt_tq.head->timeout)
-            pt_tq.head->timeout -= timeout;
-        tv.tv_sec = PR_IntervalToSeconds(timeout);
-        tv.tv_usec = PR_IntervalToMicroseconds(timeout) % PR_USEC_PER_SEC;
-
-        rv = select(0, &readSet, &writeSet, &exceptSet, &tv);
-
-        if (0 == rv)  /* poll timed out - what about leading op? */
-        {
-            if (0 == pt_tq.head->timeout)
-            {
-                /* 
-                 * The leading element of the timed queue has timed
-                 * out. Get rid of it. In any case go around the
-                 * loop again, computing the polling list, checking
-                 * for interrupted operations.
-                 */
-                PR_Lock(pt_tq.ml);
-                do
-                {
-                    pt_tq.head->result.code = -1;
-                    pt_tq.head->syserrno = WSAETIMEDOUT;
-                    op = pt_FinishTimedInternal(pt_tq.head);
-                } while ((NULL != op) && (0 == op->timeout));
-                PR_Unlock(pt_tq.ml);
-            }
-            continue;
-        }
-
-        if (-1 == rv && (WSAGetLastError() == WSAEINTR
-                || WSAGetLastError() == WSAEINPROGRESS))
-        {
-            continue;               /* go around the loop again */
-        }
-
-        /*
-         * select() says that something in our list is ready for some more
-         * action or is an invalid fd. Find it, load up the operation and
-         * see what happens.
-         */
-
-        PR_ASSERT(rv > 0 || WSAGetLastError() == WSAENOTSOCK);
-
-
-        /*
-         * $$$ There's a problem here. I'm running the operations list
-         * and I'm not holding any locks. I don't want to hold the lock
-         * and do the operation, so this is really messed up..
-         *
-         * This may work out okay. The rule is that only this thread,
-         * the continuation thread, can remove elements from the list.
-         * Therefore, the list is at worst, longer than when we built
-         * the polling list.
-         */
-        op = pt_tq.head;
-        for (pollIndex = 0; pollIndex < pollingListUsed; ++pollIndex)
-        {
-            PRInt16 revents = 0;
-
-            PR_ASSERT(NULL != op);
-
-            /*
-             * This one wants attention. Redo the operation.
-             * We know that there can only be more elements
-             * in the op list than we knew about when we created
-             * the poll list. Therefore, we might have to skip
-             * a few ops to find the right one to operation on.
-             */
-            while (pollingList[pollIndex] != op->arg1.osfd )
-            {
-                op = op->next;
-                PR_ASSERT(NULL != op);
-            }
-
-            if (FD_ISSET(op->arg1.osfd, &readSet)) {
-                revents |= PR_POLL_READ;
-            }
-            if (FD_ISSET(op->arg1.osfd, &writeSet)) {
-                revents |= PR_POLL_WRITE;
-            }
-            if (FD_ISSET(op->arg1.osfd, &exceptSet)) {
-                revents |= PR_POLL_EXCEPT;
-            }
-
-            /*
-             * Sip over all those not in progress. They'll be
-             * pruned next time we build a polling list. Call
-             * the continuation function. If it reports completion,
-             * finish off the operation.
-             */
-            if (revents && (pt_continuation_inprogress == op->status)
-                && (op->function(op, revents)))
-            {
-                PR_Lock(pt_tq.ml);
-                op = pt_FinishTimedInternal(op);
-                PR_Unlock(pt_tq.ml);
-            }
-        }
-    }
-    if (NULL != pollingList) PR_DELETE(pollingList);
-}  /* ContinuationThread */
-
-static int pt_Continue(pt_Continuation *op)
-{
-    PRStatus rv;
-    /* Finish filling in the blank slots */
-    op->status = pt_continuation_sumbitted;
-    op->complete = PR_NewCondVar(pt_tq.ml);
-
-    PR_Lock(pt_tq.ml);  /* we provide the locking */
-
-    pt_InsertTimedInternal(op);  /* insert in the structure */
-
-    PR_NotifyCondVar(pt_tq.new_op);  /* notify the continuation thread */
-
-    while (pt_continuation_done != op->status)  /* wait for completion */
-    {
-        rv = PR_WaitCondVar(op->complete, PR_INTERVAL_NO_TIMEOUT);
-        /*
-         * If we get interrupted, we set state the continuation thread will
-         * see and allow it to finish the I/O operation w/ error. That way
-         * the rule that only the continuation thread is removing elements
-         * from the list is still valid.
-         *
-         * Don't call interrupt on the continuation thread. That'll just
-         * piss him off. He's cycling around at least every mx_select_ticks
-         * anyhow and should notice the request in there.
-         */
-        if ((PR_FAILURE == rv)
-            && (PR_PENDING_INTERRUPT_ERROR == PR_GetError()))
-            op->status = pt_continuation_abort;  /* our status */
-    }
-
-    PR_Unlock(pt_tq.ml);  /* we provide the locking */
-
-    PR_DestroyCondVar(op->complete);
-
-    return op->result.code;  /* and the primary answer */
-}  /* pt_Continue */
-
-static PRBool pt_sendto_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn bytes = sendto(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount, op->arg4.flags,
-        (struct sockaddr*)op->arg5.addr, sizeof(*(op->arg5.addr)));
-    op->syserrno = WSAGetLastError();
-    if (bytes > 0)  /* this is progress */
-    {
-        char *bp = op->arg2.buffer;
-        bp += bytes;  /* adjust the buffer pointer */
-        op->arg2.buffer = bp;
-        op->result.code += bytes;  /* accumulate the number sent */
-        op->arg3.amount -= bytes;  /* and reduce the required count */
-        return (0 == op->arg3.amount) ? PR_TRUE : PR_FALSE;
-    }
-    else return ((-1 == bytes) && (WSAEWOULDBLOCK == op->syserrno)) ?
-	PR_FALSE : PR_TRUE;
-}  /* pt_sendto_cont */
-
-static PRBool pt_recvfrom_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn addr_len = sizeof(*(op->arg5.addr));
-    op->result.code = recvfrom(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount,
-        op->arg4.flags, (struct sockaddr*)op->arg5.addr, &addr_len);
-    op->syserrno = WSAGetLastError();
-    return ((-1 == op->result.code) && (WSAEWOULDBLOCK == op->syserrno)) ?
-        PR_FALSE : PR_TRUE;
-}  /* pt_recvfrom_cont */
-
-static PRInt32 pt_SendTo(
-    SOCKET osfd, const void *buf,
-    PRInt32 amount, PRInt32 flags, const PRNetAddr *addr,
-    PRIntn addrlen, PRIntervalTime timeout)
-{
-    PRInt32 bytes = -1, err;
-    PRBool fNeedContinue = PR_FALSE;
-
-    bytes = sendto(
-            osfd, buf, amount, flags,
-            (struct sockaddr*)addr, PR_NETADDR_SIZE(addr));
-    if (bytes == -1) {
-		if ((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-        fNeedContinue = PR_TRUE;
-		else
-			_PR_MD_MAP_SENDTO_ERROR(err);
-    }
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = osfd;
-        op.arg2.buffer = (void*)buf;
-        op.arg3.amount = amount;
-        op.arg4.flags = flags;
-        op.arg5.addr = (PRNetAddr*)addr;
-        op.timeout = timeout;
-        op.result.code = 0;  /* initialize the number sent */
-        op.function = pt_sendto_cont;
-        op.event = PR_POLL_WRITE | PR_POLL_EXCEPT;
-        bytes = pt_Continue(&op);
-        if (bytes < 0) {
-            WSASetLastError(op.syserrno);
-			_PR_MD_MAP_SENDTO_ERROR(op.syserrno);
-        }
-    }
-    return bytes;
-}  /* pt_SendTo */
-
-static PRInt32 pt_RecvFrom(SOCKET osfd, void *buf, PRInt32 amount,
-    PRInt32 flags, PRNetAddr *addr, PRIntn *addr_len, PRIntervalTime timeout)
-{
-    PRInt32 bytes = -1, err;
-    PRBool fNeedContinue = PR_FALSE;
-
-    bytes = recvfrom(
-            osfd, buf, amount, flags,
-            (struct sockaddr*)addr, addr_len);
-    if (bytes == -1) {
-		if ((err = WSAGetLastError()) == WSAEWOULDBLOCK)
-        fNeedContinue = PR_TRUE;
-		else
-			_PR_MD_MAP_RECVFROM_ERROR(err);
-    }
-
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = osfd;
-        op.arg2.buffer = buf;
-        op.arg3.amount = amount;
-        op.arg4.flags = flags;
-        op.arg5.addr = addr;
-        op.timeout = timeout;
-        op.function = pt_recvfrom_cont;
-        op.event = PR_POLL_READ | PR_POLL_EXCEPT;
-        bytes = pt_Continue(&op);
-        if (bytes < 0) {
-            WSASetLastError(op.syserrno);
-			_PR_MD_MAP_RECVFROM_ERROR(op.syserrno);
-        }
-    }
-    return bytes;
-}  /* pt_RecvFrom */
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntmisc.c b/libs/js/nsprpub/pr/src/md/windows/ntmisc.c
deleted file mode 100644
index 7cb5b3cb0a..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntmisc.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * ntmisc.c
- *
- */
-
-#include "primpl.h"
-
-char *_PR_MD_GET_ENV(const char *name)
-{
-    return getenv(name);
-}
-
-/*
-** _PR_MD_PUT_ENV() -- add or change environment variable
-**
-**
-*/
-PRIntn _PR_MD_PUT_ENV(const char *name)
-{
-    return(putenv(name));
-}
-
-
-/*
- **************************************************************************
- **************************************************************************
- **
- **     Date and time routines
- **
- **************************************************************************
- **************************************************************************
- */
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the
- *     implementation for Windows.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTime)
-PR_Now(void)
-{
-    PRTime prt;
-    FILETIME ft;
-
-    GetSystemTimeAsFileTime(&ft);
-    _PR_FileTimeToPRTime(&ft, &prt);
-    return prt;       
-}
-
-/*
- ***********************************************************************
- ***********************************************************************
- *
- * Process creation routines
- *
- ***********************************************************************
- ***********************************************************************
- */
-
-/*
- * Assemble the command line by concatenating the argv array.
- * On success, this function returns 0 and the resulting command
- * line is returned in *cmdLine.  On failure, it returns -1.
- */
-static int assembleCmdLine(char *const *argv, char **cmdLine)
-{
-    char *const *arg;
-    char *p, *q;
-    size_t cmdLineSize;
-    int numBackslashes;
-    int i;
-    int argNeedQuotes;
-
-    /*
-     * Find out how large the command line buffer should be.
-     */
-    cmdLineSize = 0;
-    for (arg = argv; *arg; arg++) {
-        /*
-         * \ and " need to be escaped by a \.  In the worst case,
-         * every character is a \ or ", so the string of length
-         * may double.  If we quote an argument, that needs two ".
-         * Finally, we need a space between arguments, and
-         * a null byte at the end of command line.
-         */
-        cmdLineSize += 2 * strlen(*arg)  /* \ and " need to be escaped */
-                + 2                      /* we quote every argument */
-                + 1;                     /* space in between, or final null */
-    }
-    p = *cmdLine = PR_MALLOC((PRUint32) cmdLineSize);
-    if (p == NULL) {
-        return -1;
-    }
-
-    for (arg = argv; *arg; arg++) {
-        /* Add a space to separates the arguments */
-        if (arg != argv) {
-            *p++ = ' '; 
-        }
-        q = *arg;
-        numBackslashes = 0;
-        argNeedQuotes = 0;
-
-        /* If the argument contains white space, it needs to be quoted. */
-        if (strpbrk(*arg, " \f\n\r\t\v")) {
-            argNeedQuotes = 1;
-        }
-
-        if (argNeedQuotes) {
-            *p++ = '"';
-        }
-        while (*q) {
-            if (*q == '\\') {
-                numBackslashes++;
-                q++;
-            } else if (*q == '"') {
-                if (numBackslashes) {
-                    /*
-                     * Double the backslashes since they are followed
-                     * by a quote
-                     */
-                    for (i = 0; i < 2 * numBackslashes; i++) {
-                        *p++ = '\\';
-                    }
-                    numBackslashes = 0;
-                }
-                /* To escape the quote */
-                *p++ = '\\';
-                *p++ = *q++;
-            } else {
-                if (numBackslashes) {
-                    /*
-                     * Backslashes are not followed by a quote, so
-                     * don't need to double the backslashes.
-                     */
-                    for (i = 0; i < numBackslashes; i++) {
-                        *p++ = '\\';
-                    }
-                    numBackslashes = 0;
-                }
-                *p++ = *q++;
-            }
-        }
-
-        /* Now we are at the end of this argument */
-        if (numBackslashes) {
-            /*
-             * Double the backslashes if we have a quote string
-             * delimiter at the end.
-             */
-            if (argNeedQuotes) {
-                numBackslashes *= 2;
-            }
-            for (i = 0; i < numBackslashes; i++) {
-                *p++ = '\\';
-            }
-        }
-        if (argNeedQuotes) {
-            *p++ = '"';
-        }
-    } 
-
-    *p = '\0';
-    return 0;
-}
-
-/*
- * Assemble the environment block by concatenating the envp array
- * (preserving the terminating null byte in each array element)
- * and adding a null byte at the end.
- *
- * Returns 0 on success.  The resulting environment block is returned
- * in *envBlock.  Note that if envp is NULL, a NULL pointer is returned
- * in *envBlock.  Returns -1 on failure.
- */
-static int assembleEnvBlock(char **envp, char **envBlock)
-{
-    char *p;
-    char *q;
-    char **env;
-    char *curEnv;
-    char *cwdStart, *cwdEnd;
-    size_t envBlockSize;
-
-    if (envp == NULL) {
-        *envBlock = NULL;
-        return 0;
-    }
-
-    curEnv = GetEnvironmentStrings();
-
-    cwdStart = curEnv;
-    while (*cwdStart) {
-        if (cwdStart[0] == '=' && cwdStart[1] != '\0'
-                && cwdStart[2] == ':' && cwdStart[3] == '=') {
-            break;
-        }
-        cwdStart += strlen(cwdStart) + 1;
-    }
-    cwdEnd = cwdStart;
-    if (*cwdEnd) {
-        cwdEnd += strlen(cwdEnd) + 1;
-        while (*cwdEnd) {
-            if (cwdEnd[0] != '=' || cwdEnd[1] == '\0'
-                    || cwdEnd[2] != ':' || cwdEnd[3] != '=') {
-                break;
-            }
-            cwdEnd += strlen(cwdEnd) + 1;
-        }
-    }
-    envBlockSize = cwdEnd - cwdStart;
-
-    for (env = envp; *env; env++) {
-        envBlockSize += strlen(*env) + 1;
-    }
-    envBlockSize++;
-
-    p = *envBlock = PR_MALLOC((PRUint32) envBlockSize);
-    if (p == NULL) {
-        FreeEnvironmentStrings(curEnv);
-        return -1;
-    }
-
-    q = cwdStart;
-    while (q < cwdEnd) {
-        *p++ = *q++;
-    }
-    FreeEnvironmentStrings(curEnv);
-
-    for (env = envp; *env; env++) {
-        q = *env;
-        while (*q) {
-            *p++ = *q++;
-        }
-        *p++ = '\0';
-    }
-    *p = '\0';
-    return 0;
-}
-
-/*
- * For qsort.  We sort (case-insensitive) the environment strings
- * before generating the environment block.
- */
-static int compare(const void *arg1, const void *arg2)
-{
-    return _stricmp(* (char**)arg1, * (char**)arg2);
-}
-
-PRProcess * _PR_CreateWindowsProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    STARTUPINFO startupInfo;
-    PROCESS_INFORMATION procInfo;
-    BOOL retVal;
-    char *cmdLine = NULL;
-    char *envBlock = NULL;
-    char **newEnvp = NULL;
-    const char *cwd = NULL; /* current working directory */
-    PRProcess *proc = NULL;
-
-    proc = PR_NEW(PRProcess);
-    if (!proc) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-    if (assembleCmdLine(argv, &cmdLine) == -1) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-    /*
-     * If attr->fdInheritBuffer is not NULL, we need to insert
-     * it into the envp array, so envp cannot be NULL.
-     */
-    if ((envp == NULL) && attr && attr->fdInheritBuffer) {
-        envp = environ;
-    }
-
-    if (envp != NULL) {
-        int idx;
-        int numEnv;
-        int newEnvpSize;
-
-        numEnv = 0;
-        while (envp[numEnv]) {
-            numEnv++;
-        }
-        newEnvpSize = numEnv + 1;  /* terminating null pointer */
-        if (attr && attr->fdInheritBuffer) {
-            newEnvpSize++;
-        }
-        newEnvp = (char **) PR_MALLOC(newEnvpSize * sizeof(char *));
-        for (idx = 0; idx < numEnv; idx++) {
-            newEnvp[idx] = envp[idx];
-        }
-        if (attr && attr->fdInheritBuffer) {
-            newEnvp[idx++] = attr->fdInheritBuffer;
-        }
-        newEnvp[idx] = NULL;
-        qsort((void *) newEnvp, (size_t) (newEnvpSize - 1),
-                sizeof(char *), compare);
-    }
-    if (assembleEnvBlock(newEnvp, &envBlock) == -1) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-    ZeroMemory(&startupInfo, sizeof(startupInfo));
-    startupInfo.cb = sizeof(startupInfo);
-
-    if (attr) {
-        PRBool redirected = PR_FALSE;
-
-        /*
-         * XXX the default value for stdin, stdout, and stderr
-         * should probably be the console input and output, not
-         * those of the parent process.
-         */
-        startupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-        startupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-        startupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-        if (attr->stdinFd) {
-            startupInfo.hStdInput = (HANDLE) attr->stdinFd->secret->md.osfd;
-            redirected = PR_TRUE;
-        }
-        if (attr->stdoutFd) {
-            startupInfo.hStdOutput = (HANDLE) attr->stdoutFd->secret->md.osfd;
-            redirected = PR_TRUE;
-        }
-        if (attr->stderrFd) {
-            startupInfo.hStdError = (HANDLE) attr->stderrFd->secret->md.osfd;
-            redirected = PR_TRUE;
-        }
-        if (redirected) {
-            startupInfo.dwFlags |= STARTF_USESTDHANDLES;
-        }
-        cwd = attr->currentDirectory;
-    }
-
-    retVal = CreateProcess(NULL,
-                           cmdLine,
-                           NULL,  /* security attributes for the new
-                                   * process */
-                           NULL,  /* security attributes for the primary
-                                   * thread in the new process */
-                           TRUE,  /* inherit handles */
-                           0,     /* creation flags */
-                           envBlock,  /* an environment block, consisting
-                                       * of a null-terminated block of
-                                       * null-terminated strings.  Each
-                                       * string is in the form:
-                                       *     name=value
-                                       * XXX: usually NULL */
-                           cwd,  /* current drive and directory */
-                           &startupInfo,
-                           &procInfo
-                          );
-    if (retVal == FALSE) {
-        /* XXX what error code? */
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        goto errorExit;
-    }
-
-    CloseHandle(procInfo.hThread);
-    proc->md.handle = procInfo.hProcess;
-    proc->md.id = procInfo.dwProcessId;
-
-    PR_DELETE(cmdLine);
-    if (newEnvp) {
-        PR_DELETE(newEnvp);
-    }
-    if (envBlock) {
-        PR_DELETE(envBlock);
-    }
-    return proc;
-
-errorExit:
-    if (cmdLine) {
-        PR_DELETE(cmdLine);
-    }
-    if (newEnvp) {
-        PR_DELETE(newEnvp);
-    }
-    if (envBlock) {
-        PR_DELETE(envBlock);
-    }
-    if (proc) {
-        PR_DELETE(proc);
-    }
-    return NULL;
-}  /* _PR_CreateWindowsProcess */
-
-PRStatus _PR_DetachWindowsProcess(PRProcess *process)
-{
-    CloseHandle(process->md.handle);
-    PR_DELETE(process);
-    return PR_SUCCESS;
-}
-
-/*
- * XXX: This implementation is a temporary quick solution.
- * It can be called by native threads only (not by fibers).
- */
-PRStatus _PR_WaitWindowsProcess(PRProcess *process,
-    PRInt32 *exitCode)
-{
-    DWORD dwRetVal;
-
-    dwRetVal = WaitForSingleObject(process->md.handle, INFINITE);
-    if (dwRetVal == WAIT_FAILED) {
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        return PR_FAILURE;
-    }
-    PR_ASSERT(dwRetVal == WAIT_OBJECT_0);
-    if (exitCode != NULL &&
-            GetExitCodeProcess(process->md.handle, exitCode) == FALSE) {
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        return PR_FAILURE;
-    }
-    CloseHandle(process->md.handle);
-    PR_DELETE(process);
-    return PR_SUCCESS;
-}
-
-PRStatus _PR_KillWindowsProcess(PRProcess *process)
-{
-    /*
-     * On Unix, if a process terminates normally, its exit code is
-     * between 0 and 255.  So here on Windows, we use the exit code
-     * 256 to indicate that the process is killed.
-     */
-    if (TerminateProcess(process->md.handle, 256)) {
-	return PR_SUCCESS;
-    }
-    PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-    return PR_FAILURE;
-}
-
-PRStatus _MD_WindowsGetHostName(char *name, PRUint32 namelen)
-{
-    PRIntn rv;
-    PRInt32 syserror;
-
-    rv = gethostname(name, (PRInt32) namelen);
-    if (0 == rv) {
-        return PR_SUCCESS;
-    }
-    syserror = WSAGetLastError();
-    PR_ASSERT(WSANOTINITIALISED != syserror);
-	_PR_MD_MAP_GETHOSTNAME_ERROR(syserror);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_WindowsGetSysInfo(PRSysInfo cmd, char *name, PRUint32 namelen)
-{
-	OSVERSIONINFO osvi;
-
-	PR_ASSERT((cmd == PR_SI_SYSNAME) || (cmd == PR_SI_RELEASE));
-
-	ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-	if (! GetVersionEx (&osvi) ) {
-		_PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-    	return PR_FAILURE;
-	}
-
-	switch (osvi.dwPlatformId) {
-		case VER_PLATFORM_WIN32_NT:
-			if (PR_SI_SYSNAME == cmd)
-				(void)PR_snprintf(name, namelen, "Windows_NT");
-			else if (PR_SI_RELEASE == cmd)
-				(void)PR_snprintf(name, namelen, "%d.%d",osvi.dwMajorVersion, 
-            							osvi.dwMinorVersion);
-			break;
-		case VER_PLATFORM_WIN32_WINDOWS:
-			if (PR_SI_SYSNAME == cmd) {
-				if ((osvi.dwMajorVersion > 4) || 
-					((osvi.dwMajorVersion == 4) && (osvi.dwMinorVersion > 0)))
-					(void)PR_snprintf(name, namelen, "Windows_98");
-				else
-					(void)PR_snprintf(name, namelen, "Windows_95");
-			} else if (PR_SI_RELEASE == cmd) {
-				(void)PR_snprintf(name, namelen, "%d.%d",osvi.dwMajorVersion, 
-            							osvi.dwMinorVersion);
-			}
-			break;
-   		default:
-			if (PR_SI_SYSNAME == cmd)
-				(void)PR_snprintf(name, namelen, "Windows_Unknown");
-			else if (PR_SI_RELEASE == cmd)
-				(void)PR_snprintf(name, namelen, "%d.%d",0,0);
-			break;
-	}
-	return PR_SUCCESS;
-}
-
-PRStatus _MD_WindowsGetReleaseName(char *name, PRUint32 namelen)
-{
-	OSVERSIONINFO osvi;
-
-	ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-	if (! GetVersionEx (&osvi) ) {
-		_PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-    	return PR_FAILURE;
-	}
-
-	switch (osvi.dwPlatformId) {
-		case VER_PLATFORM_WIN32_NT:
-		case VER_PLATFORM_WIN32_WINDOWS:
-			(void)PR_snprintf(name, namelen, "%d.%d",osvi.dwMajorVersion, 
-            							osvi.dwMinorVersion);
-			break;
-   		default:
-			(void)PR_snprintf(name, namelen, "%d.%d",0,0);
-			break;
-	}
-	return PR_SUCCESS;
-}
-
-/*
- **********************************************************************
- *
- * Memory-mapped files
- *
- **********************************************************************
- */
-
-PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size)
-{
-    DWORD dwHi, dwLo;
-    DWORD flProtect;
-    PROsfd osfd;
-
-    osfd = ( fmap->fd == (PRFileDesc*)-1 )?  -1 : fmap->fd->secret->md.osfd;
-
-    dwLo = (DWORD) (size & 0xffffffff);
-    dwHi = (DWORD) (((PRUint64) size >> 32) & 0xffffffff);
-
-    if (fmap->prot == PR_PROT_READONLY) {
-        flProtect = PAGE_READONLY;
-        fmap->md.dwAccess = FILE_MAP_READ;
-    } else if (fmap->prot == PR_PROT_READWRITE) {
-        flProtect = PAGE_READWRITE;
-        fmap->md.dwAccess = FILE_MAP_WRITE;
-    } else {
-        PR_ASSERT(fmap->prot == PR_PROT_WRITECOPY);
-        flProtect = PAGE_WRITECOPY;
-        fmap->md.dwAccess = FILE_MAP_COPY;
-    }
-
-    fmap->md.hFileMap = CreateFileMapping(
-        (HANDLE) osfd,
-        NULL,
-        flProtect,
-        dwHi,
-        dwLo,
-        NULL);
-
-    if (fmap->md.hFileMap == NULL) {
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PRInt32 _MD_GetMemMapAlignment(void)
-{
-    SYSTEM_INFO info;
-    GetSystemInfo(&info);
-    return info.dwAllocationGranularity;
-}
-
-extern PRLogModuleInfo *_pr_shma_lm;
-
-void * _MD_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,
-    PRUint32 len)
-{
-    DWORD dwHi, dwLo;
-    void *addr;
-
-    dwLo = (DWORD) (offset & 0xffffffff);
-    dwHi = (DWORD) (((PRUint64) offset >> 32) & 0xffffffff);
-    if ((addr = MapViewOfFile(fmap->md.hFileMap, fmap->md.dwAccess,
-            dwHi, dwLo, len)) == NULL) {
-        {
-            LPVOID lpMsgBuf; 
-            
-            FormatMessage( 
-                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL,
-                GetLastError(),
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                (LPTSTR) &lpMsgBuf,
-                0,
-                NULL 
-            );
-            PR_LOG( _pr_shma_lm, PR_LOG_DEBUG, ("md_memmap(): %s", lpMsgBuf ));
-        }
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-    }
-    return addr;
-}
-
-PRStatus _MD_MemUnmap(void *addr, PRUint32 len)
-{
-    if (UnmapViewOfFile(addr)) {
-        return PR_SUCCESS;
-    } else {
-        PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus _MD_CloseFileMap(PRFileMap *fmap)
-{
-    CloseHandle(fmap->md.hFileMap);
-    PR_DELETE(fmap);
-    return PR_SUCCESS;
-}
-
-/*
- ***********************************************************************
- *
- * Atomic increment and decrement operations for x86 processors
- *
- * We don't use InterlockedIncrement and InterlockedDecrement
- * because on NT 3.51 and Win95, they return a number with
- * the same sign as the incremented/decremented result, rather
- * than the result itself.  On NT 4.0 these functions do return
- * the incremented/decremented result.
- *
- * The result is returned in the eax register by the inline
- * assembly code.  We disable the harmless "no return value"
- * warning (4035) for these two functions.
- *
- ***********************************************************************
- */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#pragma warning(disable: 4035)
-PRInt32 _PR_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{    
-#if defined(__GNUC__)
-  PRInt32 result;
-  asm volatile ("lock ; xadd %0, %1" 
-                : "=r"(result), "=m"(*val)
-                : "0"(1), "m"(*val));
-  return result + 1;
-#else
-    __asm
-    {
-        mov ecx, val
-        mov eax, 1
-        lock xadd dword ptr [ecx], eax
-        inc eax
-    }
-#endif /* __GNUC__ */
-}
-#pragma warning(default: 4035)
-
-#pragma warning(disable: 4035)
-PRInt32 _PR_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-#if defined(__GNUC__)
-  PRInt32 result;
-  asm volatile ("lock ; xadd %0, %1" 
-                : "=r"(result), "=m"(*val)
-                : "0"(-1), "m"(*val));
-  //asm volatile("lock ; xadd %0, %1" : "=m" (val), "=a" (result) : "-1" (1));
-  return result - 1;
-#else
-    __asm
-    {
-        mov ecx, val
-        mov eax, 0ffffffffh
-        lock xadd dword ptr [ecx], eax
-        dec eax
-    }
-#endif /* __GNUC__ */
-}
-#pragma warning(default: 4035)
-
-#pragma warning(disable: 4035)
-PRInt32 _PR_MD_ATOMIC_ADD(PRInt32 *intp, PRInt32 val)
-{
-#if defined(__GNUC__)
-  PRInt32 result;
-  //asm volatile("lock ; xadd %1, %0" : "=m" (intp), "=a" (result) : "1" (val));
-  asm volatile ("lock ; xadd %0, %1" 
-                : "=r"(result), "=m"(*intp)
-                : "0"(val), "m"(*intp));
-  return result + val;
-#else
-    __asm
-    {
-        mov ecx, intp
-        mov eax, val
-        mov edx, eax
-        lock xadd dword ptr [ecx], eax
-        add eax, edx
-    }
-#endif /* __GNUC__ */
-}
-#pragma warning(default: 4035)
-
-#ifdef _PR_HAVE_ATOMIC_CAS
-
-#pragma warning(disable: 4035)
-void 
-PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
-{
-#if defined(__GNUC__)
-  void **tos = (void **) stack;
-  void *tmp;
-  
- retry:
-  if (*tos == (void *) -1)
-    goto retry;
-  
-  __asm__("xchg %0,%1"
-          : "=r" (tmp), "=m"(*tos)
-          : "0" (-1), "m"(*tos));
-  
-  if (tmp == (void *) -1)
-    goto retry;
-  
-  *(void **)stack_elem = tmp;
-  __asm__("" : : : "memory");
-  *tos = stack_elem;
-#else
-    __asm
-    {
-	mov ebx, stack
-	mov ecx, stack_elem
-retry:	mov eax,[ebx]
-	cmp eax,-1
-	je retry
-	mov eax,-1
-	xchg dword ptr [ebx], eax
-	cmp eax,-1
-	je  retry
-	mov [ecx],eax
-	mov [ebx],ecx
-    }
-#endif /* __GNUC__ */
-}
-#pragma warning(default: 4035)
-
-#pragma warning(disable: 4035)
-PRStackElem * 
-PR_StackPop(PRStack *stack)
-{
-#if defined(__GNUC__)
-  void **tos = (void **) stack;
-  void *tmp;
-  
- retry:
-  if (*tos == (void *) -1)
-    goto retry;
-  
-  __asm__("xchg %0,%1"
-          : "=r" (tmp), "=m"(*tos)
-          : "0" (-1), "m"(*tos));
-
-  if (tmp == (void *) -1)
-    goto retry;
-  
-  if (tmp != (void *) 0)
-    {
-      void *next = *(void **)tmp;
-      *tos = next;
-      *(void **)tmp = 0;
-    }
-  else
-    *tos = tmp;
-  
-  return tmp;
-#else
-    __asm
-    {
-	mov ebx, stack
-retry:	mov eax,[ebx]
-	cmp eax,-1
-	je retry
-	mov eax,-1
-	xchg dword ptr [ebx], eax
-	cmp eax,-1
-	je  retry
-	cmp eax,0
-	je  empty
-	mov ecx,[eax]
-	mov [ebx],ecx
-	mov [eax],0
-	jmp done
-empty:
-	mov [ebx],eax
-done:	
-	}
-#endif /* __GNUC__ */
-}
-#pragma warning(default: 4035)
-
-#endif /* _PR_HAVE_ATOMIC_CAS */
-
-#endif /* x86 processors */
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntsec.c b/libs/js/nsprpub/pr/src/md/windows/ntsec.c
deleted file mode 100644
index 89ac1dfbc9..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntsec.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/*
- * ntsec.c
- *
- * Implement the POSIX-style mode bits (access permissions) for
- * files and other securable objects in Windows NT using Windows
- * NT's security descriptors with appropriate discretionary
- * access-control lists.
- */
-
-/*
- * The security identifiers (SIDs) for owner, primary group,
- * and the Everyone (World) group.
- *
- * These SIDs are looked up during NSPR initialization and
- * saved in this global structure (see _PR_NT_InitSids) so
- * that _PR_NT_MakeSecurityDescriptorACL doesn't need to
- * look them up every time.
- */
-static struct {
-    PSID owner;
-    PSID group;
-    PSID everyone;
-} _pr_nt_sids;
-
-/*
- * Initialize the SIDs for owner, primary group, and the Everyone
- * group in the _pr_nt_sids structure.
- *
- * This function needs to be called by NSPR initialization.
- */
-void _PR_NT_InitSids(void)
-{
-    SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_WORLD_SID_AUTHORITY;
-    HANDLE hToken = NULL; /* initialized to an arbitrary value to
-                           * silence a Purify UMR warning */
-    UCHAR infoBuffer[1024];
-    PTOKEN_OWNER pTokenOwner = (PTOKEN_OWNER) infoBuffer;
-    PTOKEN_PRIMARY_GROUP pTokenPrimaryGroup
-            = (PTOKEN_PRIMARY_GROUP) infoBuffer;
-    DWORD dwLength;
-    BOOL rv;
-
-    /*
-     * Look up and make a copy of the owner and primary group
-     * SIDs in the access token of the calling process.
-     */
-    rv = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken);
-    if (rv == 0) {
-        /*
-         * On non-NT systems, this function is not implemented
-         * (error code ERROR_CALL_NOT_IMPLEMENTED), and neither are
-         * the other security functions.  There is no point in
-         * going further.
-         *
-         * A process with insufficient access permissions may fail
-         * with the error code ERROR_ACCESS_DENIED.
-         */
-        PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-                ("_PR_NT_InitSids: OpenProcessToken() failed. Error: %d",
-                GetLastError()));
-        return;
-    }
-
-    rv = GetTokenInformation(hToken, TokenOwner, infoBuffer,
-            sizeof(infoBuffer), &dwLength);
-    PR_ASSERT(rv != 0);
-    dwLength = GetLengthSid(pTokenOwner->Owner);
-    _pr_nt_sids.owner = (PSID) PR_Malloc(dwLength);
-    PR_ASSERT(_pr_nt_sids.owner != NULL);
-    rv = CopySid(dwLength, _pr_nt_sids.owner, pTokenOwner->Owner);
-    PR_ASSERT(rv != 0);
-
-    rv = GetTokenInformation(hToken, TokenPrimaryGroup, infoBuffer,
-            sizeof(infoBuffer), &dwLength);
-    PR_ASSERT(rv != 0);
-    dwLength = GetLengthSid(pTokenPrimaryGroup->PrimaryGroup);
-    _pr_nt_sids.group = (PSID) PR_Malloc(dwLength);
-    PR_ASSERT(_pr_nt_sids.group != NULL);
-    rv = CopySid(dwLength, _pr_nt_sids.group,
-            pTokenPrimaryGroup->PrimaryGroup);
-    PR_ASSERT(rv != 0);
-
-    rv = CloseHandle(hToken);
-    PR_ASSERT(rv != 0);
-
-    /* Create a well-known SID for the Everyone group. */
-    rv = AllocateAndInitializeSid(&SIDAuthWorld, 1,
-            SECURITY_WORLD_RID,
-            0, 0, 0, 0, 0, 0, 0,
-            &_pr_nt_sids.everyone);
-    PR_ASSERT(rv != 0);
-}
-
-/*
- * Free the SIDs for owner, primary group, and the Everyone group
- * in the _pr_nt_sids structure.
- *
- * This function needs to be called by NSPR cleanup.
- */
-void
-_PR_NT_FreeSids(void)
-{
-    if (_pr_nt_sids.owner) {
-        PR_Free(_pr_nt_sids.owner);
-    }
-    if (_pr_nt_sids.group) {
-        PR_Free(_pr_nt_sids.group);
-    }
-    if (_pr_nt_sids.everyone) {
-        FreeSid(_pr_nt_sids.everyone);
-    }
-}
-
-/*
- * Construct a security descriptor whose discretionary access-control
- * list implements the specified mode bits.  The SIDs for owner, group,
- * and everyone are obtained from the global _pr_nt_sids structure.
- * Both the security descriptor and access-control list are returned
- * and should be freed by a _PR_NT_FreeSecurityDescriptorACL call.
- *
- * The accessTable array maps NSPR's read, write, and execute access
- * rights to the corresponding NT access rights for the securable
- * object.
- */
-PRStatus
-_PR_NT_MakeSecurityDescriptorACL(
-    PRIntn mode,
-    DWORD accessTable[],
-    PSECURITY_DESCRIPTOR *resultSD,
-    PACL *resultACL)
-{
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-    DWORD cbACL;  /* size of ACL */
-    DWORD accessMask;
-
-    if (_pr_nt_sids.owner == NULL) {
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    pSD = (PSECURITY_DESCRIPTOR) PR_Malloc(SECURITY_DESCRIPTOR_MIN_LENGTH);
-    if (pSD == NULL) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    if (!SetSecurityDescriptorOwner(pSD, _pr_nt_sids.owner, FALSE)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    if (!SetSecurityDescriptorGroup(pSD, _pr_nt_sids.group, FALSE)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-
-    /*
-     * Construct a discretionary access-control list with three
-     * access-control entries, one each for owner, primary group,
-     * and Everyone.
-     */
-
-    cbACL = sizeof(ACL)
-          + 3 * (sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD))
-          + GetLengthSid(_pr_nt_sids.owner)
-          + GetLengthSid(_pr_nt_sids.group)
-          + GetLengthSid(_pr_nt_sids.everyone);
-    pACL = (PACL) PR_Malloc(cbACL);
-    if (pACL == NULL) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    if (!InitializeAcl(pACL, cbACL, ACL_REVISION)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    accessMask = 0;
-    if (mode & 00400) accessMask |= accessTable[0];
-    if (mode & 00200) accessMask |= accessTable[1];
-    if (mode & 00100) accessMask |= accessTable[2];
-    if (accessMask && !AddAccessAllowedAce(pACL, ACL_REVISION, accessMask,
-            _pr_nt_sids.owner)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    accessMask = 0;
-    if (mode & 00040) accessMask |= accessTable[0];
-    if (mode & 00020) accessMask |= accessTable[1];
-    if (mode & 00010) accessMask |= accessTable[2];
-    if (accessMask && !AddAccessAllowedAce(pACL, ACL_REVISION, accessMask,
-            _pr_nt_sids.group)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-    accessMask = 0;
-    if (mode & 00004) accessMask |= accessTable[0];
-    if (mode & 00002) accessMask |= accessTable[1];
-    if (mode & 00001) accessMask |= accessTable[2];
-    if (accessMask && !AddAccessAllowedAce(pACL, ACL_REVISION, accessMask,
-            _pr_nt_sids.everyone)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-
-    if (!SetSecurityDescriptorDacl(pSD, TRUE, pACL, FALSE)) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        goto failed;
-    }
-
-    *resultSD = pSD;
-    *resultACL = pACL;
-    return PR_SUCCESS;
-
-failed:
-    if (pSD) {
-        PR_Free(pSD);
-    }
-    if (pACL) {
-        PR_Free(pACL);
-    }
-    return PR_FAILURE;
-}
-
-/*
- * Free the specified security descriptor and access-control list
- * previously created by _PR_NT_MakeSecurityDescriptorACL.
- */
-void
-_PR_NT_FreeSecurityDescriptorACL(PSECURITY_DESCRIPTOR pSD, PACL pACL)
-{
-    if (pSD) {
-        PR_Free(pSD);
-    }
-    if (pACL) {
-        PR_Free(pACL);
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntsem.c b/libs/js/nsprpub/pr/src/md/windows/ntsem.c
deleted file mode 100644
index b25fac6200..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntsem.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * NT-specific semaphore handling code.
- *
- */
-
-
-#include "primpl.h"
-
-
-void 
-_PR_MD_NEW_SEM(_MDSemaphore *md, PRUintn value)
-{
-    md->sem = CreateSemaphore(NULL, value, 0x7fffffff, NULL);
-}
-
-void 
-_PR_MD_DESTROY_SEM(_MDSemaphore *md)
-{
-    CloseHandle(md->sem);
-}
-
-PRStatus 
-_PR_MD_TIMED_WAIT_SEM(_MDSemaphore *md, PRIntervalTime ticks)
-{
-    int rv;
-
-    rv = WaitForSingleObject(md->sem, PR_IntervalToMilliseconds(ticks));
-
-    if (rv == WAIT_OBJECT_0)
-        return PR_SUCCESS;
-    else
-        return PR_FAILURE;
-}
-
-PRStatus 
-_PR_MD_WAIT_SEM(_MDSemaphore *md)
-{
-    return _PR_MD_TIMED_WAIT_SEM(md, PR_INTERVAL_NO_TIMEOUT);
-}
-
-void 
-_PR_MD_POST_SEM(_MDSemaphore *md)
-{
-    int old_count;
-
-    ReleaseSemaphore(md->sem, 1, &old_count);
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/ntthread.c b/libs/js/nsprpub/pr/src/md/windows/ntthread.c
deleted file mode 100644
index 7bdaeac368..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/ntthread.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <process.h>  /* for _beginthreadex() */
-
-/* --- globals ------------------------------------------------ */
-PRLock                       *_pr_schedLock = NULL;
-_PRInterruptTable             _pr_interruptTable[] = { { 0 } };
-
-BOOL _pr_use_static_tls = FALSE;
-__declspec(thread) PRThread  *_pr_current_fiber;
-__declspec(thread) PRThread  *_pr_fiber_last_run;
-__declspec(thread) _PRCPU    *_pr_current_cpu;
-__declspec(thread) PRUintn    _pr_ints_off;
-DWORD _pr_currentFiberIndex;
-DWORD _pr_lastFiberIndex;
-DWORD _pr_currentCPUIndex;
-DWORD _pr_intsOffIndex;
-
-_MDLock                       _nt_idleLock;
-PRCList                       _nt_idleList;
-PRUint32                        _nt_idleCount;
-
-extern __declspec(thread) PRThread *_pr_io_restarted_io;
-extern DWORD _pr_io_restartedIOIndex;
-
-/* Must check the restarted_io *before* decrementing no_sched to 0 */
-#define POST_SWITCH_WORK() \
-    PR_BEGIN_MACRO \
-        PRThread *restarted_io = \
-            (_pr_use_static_tls ? _pr_io_restarted_io \
-            : (PRThread *) TlsGetValue(_pr_io_restartedIOIndex)); \
-        if (restarted_io) { \
-            _nt_handle_restarted_io(restarted_io); \
-        } \
-        _PR_MD_LAST_THREAD()->no_sched = 0; \
-    PR_END_MACRO
-
-void
-_nt_handle_restarted_io(PRThread *restarted_io)
-{
-    /* After the switch we can resume an IO if needed.
-     * XXXMB - this needs to be done in create thread, since that could
-     * be the result for a context switch too..
-     */
-    PR_ASSERT(restarted_io->io_suspended == PR_TRUE);
-    PR_ASSERT(restarted_io->md.thr_bound_cpu == restarted_io->cpu);
-
-    _PR_THREAD_LOCK(restarted_io);
-    if (restarted_io->io_pending == PR_FALSE) {
-
-        /* The IO already completed, put us back on the runq. */
-        int pri = restarted_io->priority;
-
-        restarted_io->state = _PR_RUNNABLE;
-        _PR_RUNQ_LOCK(restarted_io->cpu);
-        _PR_ADD_RUNQ(restarted_io, restarted_io->cpu, pri);
-        _PR_RUNQ_UNLOCK(restarted_io->cpu);
-    } else {
-        _PR_SLEEPQ_LOCK(restarted_io->cpu);
-        _PR_ADD_SLEEPQ(restarted_io, restarted_io->sleep);
-        _PR_SLEEPQ_UNLOCK(restarted_io->cpu);
-    }
-    restarted_io->io_suspended = PR_FALSE;
-    restarted_io->md.thr_bound_cpu = NULL;
-
-    _PR_THREAD_UNLOCK(restarted_io);
-
-    if (_pr_use_static_tls) {
-        _pr_io_restarted_io = NULL;
-    } else {
-        TlsSetValue(_pr_io_restartedIOIndex, NULL);
-    }
-}
-
-void
-_PR_MD_EARLY_INIT()
-{
-    _MD_NEW_LOCK( &_nt_idleLock );
-    _nt_idleCount = 0;
-    PR_INIT_CLIST(&_nt_idleList);
-
-#if 0
-    /* Make the clock tick at least once per millisecond */
-    if ( timeBeginPeriod(1) == TIMERR_NOCANDO) {
-        /* deep yoghurt; clock doesn't tick fast enough! */
-        PR_ASSERT(0);
-    }
-#endif
-
-    if (!_pr_use_static_tls) {
-        _pr_currentFiberIndex = TlsAlloc();
-        _pr_lastFiberIndex = TlsAlloc();
-        _pr_currentCPUIndex = TlsAlloc();
-        _pr_intsOffIndex = TlsAlloc();
-        _pr_io_restartedIOIndex = TlsAlloc();
-    }
-}
-
-void _PR_MD_CLEANUP_BEFORE_EXIT(void)
-{
-    _PR_NT_FreeSids();
-
-    WSACleanup();
-
-    if (!_pr_use_static_tls) {
-        TlsFree(_pr_currentFiberIndex);
-        TlsFree(_pr_lastFiberIndex);
-        TlsFree(_pr_currentCPUIndex);
-        TlsFree(_pr_intsOffIndex);
-        TlsFree(_pr_io_restartedIOIndex);
-    }
-}
-
-PRStatus
-_PR_MD_INIT_THREAD(PRThread *thread)
-{
-    thread->md.overlapped.ioModel = _MD_BlockingIO;
-    thread->md.overlapped.data.mdThread = &thread->md;
-
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        if (thread->flags & (_PR_PRIMORDIAL | _PR_ATTACHED)) {
-            /*
-            ** Warning:
-            ** --------
-            ** NSPR requires a real handle to every thread.
-            ** GetCurrentThread() returns a pseudo-handle which
-            ** is not suitable for some thread operations (e.g.,
-            ** suspending).  Therefore, get a real handle from
-            ** the pseudo handle via DuplicateHandle(...)
-            */
-            DuplicateHandle(
-                    GetCurrentProcess(),     /* Process of source handle */
-                    GetCurrentThread(),      /* Pseudo Handle to dup */
-                    GetCurrentProcess(),     /* Process of handle */
-                    &(thread->md.handle),    /* resulting handle */
-                    0L,                      /* access flags */
-                    FALSE,                   /* Inheritable */
-                    DUPLICATE_SAME_ACCESS);  /* Options */
-        }
-
-        /* Create the blocking IO semaphore */
-        thread->md.blocked_sema = CreateSemaphore(NULL, 0, 1, NULL);
-        if (thread->md.blocked_sema == NULL) {
-            return PR_FAILURE;
-        }
-		if (_native_threads_only) {
-			/* Create the blocking IO semaphore */
-			thread->md.thr_event = CreateEvent(NULL, TRUE, FALSE, NULL);
-			if (thread->md.thr_event == NULL) {
-				return PR_FAILURE;
-			}
-		}
-    }
-
-    return PR_SUCCESS;
-}
-
-static unsigned __stdcall
-pr_root(void *arg)
-{
-    PRThread *thread = (PRThread *)arg;
-    thread->md.start(thread);
-    return 0;
-}
-
-PRStatus 
-_PR_MD_CREATE_THREAD(PRThread *thread, 
-                  void (*start)(void *), 
-                  PRThreadPriority priority, 
-                  PRThreadScope scope, 
-                  PRThreadState state, 
-                  PRUint32 stackSize)
-{
-
-    thread->md.start = start;
-    thread->md.handle = (HANDLE) _beginthreadex(
-                    NULL,
-                    thread->stack->stackSize,
-                    pr_root,
-                    (void *)thread,
-                    CREATE_SUSPENDED,
-                    &(thread->id));
-    if(!thread->md.handle) {
-        PRErrorCode prerror;
-        thread->md.fiber_last_error = GetLastError();
-        switch (errno) {
-            case ENOMEM:
-                prerror = PR_OUT_OF_MEMORY_ERROR;
-                break;
-            case EAGAIN:
-                prerror = PR_INSUFFICIENT_RESOURCES_ERROR;
-                break;
-            case EINVAL:
-                prerror = PR_INVALID_ARGUMENT_ERROR;
-                break;
-            default:
-                prerror = PR_UNKNOWN_ERROR;
-        }
-        PR_SetError(prerror, errno);
-        return PR_FAILURE;
-    }
-
-    thread->md.id = thread->id;
-    /*
-     * On windows, a thread is created with a thread priority of
-     * THREAD_PRIORITY_NORMAL.
-     */
-    if (priority != PR_PRIORITY_NORMAL) {
-        _PR_MD_SET_PRIORITY(&(thread->md), priority);
-    }
-
-    /* Activate the thread */
-    if ( ResumeThread( thread->md.handle ) != -1)
-        return PR_SUCCESS;
-
-    PR_SetError(PR_UNKNOWN_ERROR, GetLastError());
-    return PR_FAILURE;
-}
-
-void
-_PR_MD_JOIN_THREAD(_MDThread *md)
-{
-    DWORD rv;
-
-    rv = WaitForSingleObject(md->handle, INFINITE);
-    PR_ASSERT(WAIT_OBJECT_0 == rv);
-}
-
-void
-_PR_MD_END_THREAD(void)
-{
-    _endthreadex(0);
-}
-
-void    
-_PR_MD_YIELD(void)
-{
-    /* Can NT really yield at all? */
-    Sleep(0);
-}
-
-void     
-_PR_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
-{
-    int nativePri;
-    BOOL rv;
-
-    if (newPri < PR_PRIORITY_FIRST) {
-        newPri = PR_PRIORITY_FIRST;
-    } else if (newPri > PR_PRIORITY_LAST) {
-        newPri = PR_PRIORITY_LAST;
-    }
-    switch (newPri) {
-        case PR_PRIORITY_LOW:
-            nativePri = THREAD_PRIORITY_BELOW_NORMAL;
-            break;
-        case PR_PRIORITY_NORMAL:
-            nativePri = THREAD_PRIORITY_NORMAL;
-            break;
-        case PR_PRIORITY_HIGH:
-            nativePri = THREAD_PRIORITY_ABOVE_NORMAL;
-            break;
-        case PR_PRIORITY_URGENT:
-            nativePri = THREAD_PRIORITY_HIGHEST;
-    }
-    rv = SetThreadPriority(thread->handle, nativePri);
-    PR_ASSERT(rv);
-    if (!rv) {
-	PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-                ("PR_SetThreadPriority: can't set thread priority\n"));
-    }
-    return;
-}
-
-void
-_PR_MD_CLEAN_THREAD(PRThread *thread)
-{
-    BOOL rv;
-
-    if (thread->md.acceptex_buf) {
-        PR_DELETE(thread->md.acceptex_buf);
-    }
-
-    if (thread->md.xmit_bufs) {
-        PR_DELETE(thread->md.xmit_bufs);
-    }
-
-    if (thread->md.blocked_sema) {
-        rv = CloseHandle(thread->md.blocked_sema);
-        PR_ASSERT(rv);
-        thread->md.blocked_sema = 0;
-    }
-	if (_native_threads_only) {
-		if (thread->md.thr_event) {
-			rv = CloseHandle(thread->md.thr_event);
-			PR_ASSERT(rv);
-			thread->md.thr_event = 0;
-		}
-	}
-
-    if (thread->md.handle) {
-        rv = CloseHandle(thread->md.handle);
-        PR_ASSERT(rv);
-        thread->md.handle = 0;
-    }
-
-    /* Don't call DeleteFiber on current fiber or we'll kill the whole thread.
-     * Don't call free(thread) until we've switched off the thread.
-     * So put this fiber (or thread) on a list to be deleted by the idle
-     * fiber next time we have a chance.
-     */
-    if (!(thread->flags & (_PR_ATTACHED|_PR_GLOBAL_SCOPE))) {
-        _MD_LOCK(&_nt_idleLock);
-        _nt_idleCount++;
-        PR_APPEND_LINK(&thread->links, &_nt_idleList);
-        _MD_UNLOCK(&_nt_idleLock);
-    }
-}
-
-void
-_PR_MD_EXIT_THREAD(PRThread *thread)
-{
-    BOOL rv;
-
-    if (thread->md.acceptex_buf) {
-        PR_DELETE(thread->md.acceptex_buf);
-    }
-
-    if (thread->md.xmit_bufs) {
-        PR_DELETE(thread->md.xmit_bufs);
-    }
-
-    if (thread->md.blocked_sema) {
-        rv = CloseHandle(thread->md.blocked_sema);
-        PR_ASSERT(rv);
-        thread->md.blocked_sema = 0;
-    }
-
-	if (_native_threads_only) {
-		if (thread->md.thr_event) {
-			rv = CloseHandle(thread->md.thr_event);
-			PR_ASSERT(rv);
-			thread->md.thr_event = 0;
-		}
-	}
-
-    if (thread->md.handle) {
-        rv = CloseHandle(thread->md.handle);
-        PR_ASSERT(rv);
-        thread->md.handle = 0;
-    }
-
-    if (thread->flags & _PR_GLOBAL_SCOPE) {
-        _MD_SET_CURRENT_THREAD(NULL);
-    }
-}
-
-
-void
-_PR_MD_EXIT(PRIntn status)
-{
-    _exit(status);
-}
-
-#ifdef HAVE_FIBERS
-
-void
-_pr_fiber_mainline(void *unused) 
-{
-    PRThread *fiber = _PR_MD_CURRENT_THREAD();
-
-    POST_SWITCH_WORK();
-
-    fiber->md.fiber_fn(fiber->md.fiber_arg);
-}
-
-PRThread *_PR_MD_CREATE_USER_THREAD(
-    PRUint32 stacksize, void (*start)(void *), void *arg)
-{
-    PRThread *thread;
-
-    if ( (thread = PR_NEW(PRThread)) == NULL ) {
-        return NULL;
-    }
-    
-    memset(thread, 0, sizeof(PRThread));
-    thread->md.fiber_fn = start;
-    thread->md.fiber_arg = arg;
-    thread->md.fiber_stacksize = stacksize;
-    return thread;
-}
-
-void
-_PR_MD_CREATE_PRIMORDIAL_USER_THREAD(PRThread *thread)
-{
-    thread->md.fiber_id = ConvertThreadToFiber(NULL);
-    PR_ASSERT(thread->md.fiber_id);
-    _MD_SET_CURRENT_THREAD(thread);
-    _MD_SET_LAST_THREAD(thread);
-    thread->no_sched = 1;
-    return;
-}
-
-void
-_PR_MD_INIT_CONTEXT(PRThread *thread, char *top, void (*start) (void), PRBool *status)
-{
-    thread->md.fiber_fn = (void (*)(void *))start;
-    thread->md.fiber_id = CreateFiber(thread->md.fiber_stacksize, 
-        (LPFIBER_START_ROUTINE)_pr_fiber_mainline, NULL);
-    if (thread->md.fiber_id != 0)
-        *status = PR_TRUE;
-    else {
-        DWORD oserror = GetLastError();
-        PRErrorCode prerror;
-        if (oserror == ERROR_NOT_ENOUGH_MEMORY) {
-            prerror = PR_OUT_OF_MEMORY_ERROR;
-        } else {
-            prerror = PR_UNKNOWN_ERROR;
-        }
-        PR_SetError(prerror, oserror);
-        *status = PR_FALSE;
-    }
-}
-
-void
-_PR_MD_SWITCH_CONTEXT(PRThread *thread)
-{
-    PR_ASSERT( !_PR_IS_NATIVE_THREAD(thread) );
-
-    thread->md.fiber_last_error = GetLastError();
-    _PR_Schedule();
-}
-
-void
-_PR_MD_RESTORE_CONTEXT(PRThread *thread)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT( !_PR_IS_NATIVE_THREAD(thread) );
-
-    /* The user-level code for yielding will happily add ourselves to the runq
-     * and then switch to ourselves; the NT fibers can't handle switching to 
-     * ourselves.
-     */
-    if (thread != me) {
-        SetLastError(thread->md.fiber_last_error);
-        _MD_SET_CURRENT_THREAD(thread);
-        _PR_MD_SET_LAST_THREAD(me);
-        thread->no_sched = 1;
-        SwitchToFiber(thread->md.fiber_id);
-        POST_SWITCH_WORK();
-    }
-}
-
-
-#endif /* HAVE_FIBERS */
-
-PRInt32 _PR_MD_SETTHREADAFFINITYMASK(PRThread *thread, PRUint32 mask )
-{
-    int rv;
-
-    rv = SetThreadAffinityMask(thread->md.handle, mask);
-
-    return rv?0:-1;
-}
-
-PRInt32 _PR_MD_GETTHREADAFFINITYMASK(PRThread *thread, PRUint32 *mask)
-{
-    PRInt32 rv, system_mask;
-
-    rv = GetProcessAffinityMask(GetCurrentProcess(), mask, &system_mask);
-    
-    return rv?0:-1;
-}
-
-void 
-_PR_MD_SUSPEND_CPU(_PRCPU *cpu) 
-{
-    _PR_MD_SUSPEND_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_RESUME_CPU(_PRCPU *cpu)
-{
-    _PR_MD_RESUME_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_SUSPEND_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        /*
-        ** There seems to be some doubt about whether or not SuspendThread
-        ** is a synchronous function. The test afterwards is to help veriry
-        ** that it is, which is what Microsoft says it is.
-        */
-        PRUintn rv = SuspendThread(thread->md.handle);
-        PR_ASSERT(0xffffffffUL != rv);
-    }
-}
-
-void
-_PR_MD_RESUME_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        ResumeThread(thread->md.handle);
-    }
-}
-
-PRThread*
-_MD_CURRENT_THREAD(void)
-{
-PRThread *thread;
-
-	thread = _MD_GET_ATTACHED_THREAD();
-
-   	if (NULL == thread) {
-		thread = _PRI_AttachThread(
-            PR_USER_THREAD, PR_PRIORITY_NORMAL, NULL, 0);
-	}
-	PR_ASSERT(thread != NULL);
-	return thread;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/objs.mk b/libs/js/nsprpub/pr/src/md/windows/objs.mk
deleted file mode 100644
index 36f21a443c..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/objs.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-ifeq ($(OS_TARGET),WINNT)
-CSRCS = ntmisc.c \
-	ntsec.c \
-	ntsem.c \
-	ntinrval.c \
-	ntgc.c \
-	ntio.c \
-	ntthread.c \
-	ntdllmn.c \
-	win32_errors.c \
-	w32ipcsem.c \
-	w32poll.c \
-	w32rng.c \
-	w32shm.c
-else
-ifeq ($(OS_TARGET),WIN95)
-CSRCS =	ntmisc.c \
-	ntsec.c \
-	ntsem.c \
-	ntinrval.c \
-	ntgc.c \
-	w95thred.c \
-	w95io.c \
-	w95cv.c \
-	w95sock.c \
-	win32_errors.c \
-	w32ipcsem.c \
-	w32poll.c \
-	w32rng.c \
-	w32shm.c \
-	w95dllmain.c
-else
-ifeq ($(OS_TARGET),WIN16)
-CSRCS =	w16null.c \
-	w16thred.c \
-	w16proc.c \
-	w16fmem.c \
-	w16sock.c \
-	w16mem.c \
-	w16io.c \
-	w16gc.c \
-	w16error.c \
-	w16stdio.c \
-	w16callb.c \
-	ntinrval.c
-endif # win16
-endif # win95
-endif # winnt
-
-CSRCS	+= $(PR_MD_CSRCS)
-ASFILES += $(PR_MD_ASFILES)
-
-OBJS += $(addprefix md/windows/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)))  \
-	$(addprefix md/windows/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX)))
-
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16callb.c b/libs/js/nsprpub/pr/src/md/windows/w16callb.c
deleted file mode 100644
index 3f7b4eeae7..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16callb.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** w16callb.c -- Implement Win16 Callback functions
-**
-** Functions here are to replace functions normally in
-** LIBC which are not implemented in MSVC's LIBC.
-** Some clients of NSPR expect to statically link
-** to NSPR and get these functions.
-**
-** Some are implemented as callbacks to the .EXE
-** some are implemented directly in this module.
-**
-*/
-
-#include "primpl.h"
-#include "windowsx.h"
-
-/*
-** _pr_callback_funcs -- This is where clients register the 
-** callback function structure.
-*/
-struct PRMethodCallbackStr * _pr_callback_funcs;
-
-/*
-** PR_MDInitWin16() -- Register the PRMethodCallback table pointer
-** 
-*/
-void PR_MDRegisterCallbacks(struct PRMethodCallbackStr *f)
-{
-    _pr_callback_funcs = f;
-}
-
-/*
-** NSPR re-implenentations of various C runtime functions:
-*/
-
-/*
-** PR_MD_printf() -- exported as printf()
-**
-*/
-int  PR_MD_printf(const char *fmt, ...)
-{
-    char buffer[1024];
-    int ret = 0;
-    va_list args;
-
-    va_start(args, fmt);
-
-#ifdef DEBUG
-    PR_vsnprintf(buffer, sizeof(buffer), fmt, args);
-    {   
-        if (_pr_callback_funcs != NULL && _pr_callback_funcs->auxOutput != NULL) {
-            (* _pr_callback_funcs->auxOutput)(buffer);
-        } else {
-            OutputDebugString(buffer);
-        }
-    }
-#endif
-
-    va_end(args);
-    return ret;
-}
-
-/*
-** PR_MD_sscanf() -- exported as sscanf()
-**
-*/
-int  PR_MD_sscanf(const char *buf, const char *fmt, ...)
-{
-	int		retval;
-	va_list	arglist;
-
-	va_start(arglist, fmt);
-	retval = vsscanf((const unsigned char *)buf, (const unsigned char *)fmt, arglist);
-	va_end(arglist);
-	return retval;
-}
-
-/*
-** PR_MD_strftime() -- exported as strftime
-**
-*/
-size_t PR_MD_strftime(char *s, size_t len, const char *fmt, const struct tm *p) 
-{
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->strftime)(s, len, fmt, p);
-    } else {
-        PR_ASSERT(0);
-        return 0;
-    }
-}
-
-
-/*
-** PR_MD_malloc() -- exported as malloc()
-**
-*/
-void *PR_MD_malloc( size_t size )
-{
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->malloc)( size );
-    } else {
-        return GlobalAllocPtr(GPTR, (DWORD)size);
-    }
-} /* end malloc() */
-
-/*
-** PR_MD_calloc() -- exported as calloc()
-**
-*/
-void *PR_MD_calloc( size_t n, size_t size )
-{
-    void *p;
-    size_t sz;
-    
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->calloc)( n, size );
-    } else {
-        sz = n * size;
-        p = GlobalAllocPtr(GPTR, (DWORD)sz );
-        memset( p, 0x00, sz );
-        return p;
-    }
-} /* end calloc() */
-
-/*
-** PR_MD_realloc() -- exported as realloc()
-**
-*/
-void *PR_MD_realloc( void* old_blk, size_t size )
-{
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->realloc)( old_blk, size );
-    } else {
-        return GlobalReAllocPtr( old_blk, (DWORD)size, GPTR);
-    }
-} /* end realloc */
-
-/*
-** PR_MD_free() -- exported as free()
-**
-*/
-void PR_MD_free( void *ptr )
-{
-    if( _pr_callback_funcs ) {
-        (*_pr_callback_funcs->free)( ptr );
-        return;
-    } else {
-        GlobalFreePtr( ptr );
-        return;
-    }
-} /* end free() */
-
-/*
-** PR_MD_getenv() -- exported as getenv()
-**
-*/
-char *PR_MD_getenv( const char *name )
-{
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->getenv)( name );
-    } else {
-        return 0;
-    }
-} /* end getenv() */
-
-
-/*
-** PR_MD_perror() -- exported as perror()
-**
-** well, not really (lth. 12/5/97).
-** XXX hold this thought.
-**
-*/
-void PR_MD_perror( const char *prefix )
-{
-    return;
-} /* end perror() */
-
-/*
-** PR_MD_putenv() -- exported as putenv()
-**
-*/
-int  PR_MD_putenv(const char *assoc)
-{
-    if( _pr_callback_funcs ) {
-        return (*_pr_callback_funcs->putenv)(assoc);
-    } else {
-        PR_ASSERT(0);
-        return NULL;
-    }
-}
-
-/*
-** PR_MD_fprintf() -- exported as fprintf()
-**
-*/
-int  PR_MD_fprintf(FILE *fPtr, const char *fmt, ...)
-{
-    char buffer[1024];
-    va_list args;
-
-    va_start(args, fmt);
-    PR_vsnprintf(buffer, sizeof(buffer), fmt, args);
-
-    if (fPtr == NULL) 
-    {
-        if (_pr_callback_funcs != NULL && _pr_callback_funcs->auxOutput != NULL) 
-        {
-            (* _pr_callback_funcs->auxOutput)(buffer);
-        } 
-        else 
-        {
-            OutputDebugString(buffer);
-        }
-    } 
-    else 
-    {
-        fwrite(buffer, 1, strlen(buffer), fPtr); /* XXX Is this a sec. hole? */
-    }
-
-    va_end(args);
-    return 0;
-}
-
-/* end w16callb.c */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16error.c b/libs/js/nsprpub/pr/src/md/windows/w16error.c
deleted file mode 100644
index 72d1725b31..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16error.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Note: A single error mapping function is provided.
-**
-*/ 
-#include "prerror.h"
-#include <errno.h>
-#include <winsock.h>
-
-
-void _PR_MD_map_error( int err )
-{
-
-    switch ( err )
-    {
-        case  ENOENT:   /* No such file or directory */
-			PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-            break;
-        case  E2BIG:    /* Argument list too big */
-            PR_SetError( PR_INVALID_ARGUMENT_ERROR, err );
-            break;
-        case  ENOEXEC:  /* Exec format error */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EBADF:    /* Bad file number */
-            PR_SetError( PR_BAD_DESCRIPTOR_ERROR, err );
-            break;
-        case  ENOMEM:   /* Not enough Memory */
-            PR_SetError( PR_OUT_OF_MEMORY_ERROR, err );
-            break;
-        case  EACCES:   /* Permission denied */
-            PR_SetError( PR_NO_ACCESS_RIGHTS_ERROR, err );
-            break;
-        case  EEXIST:   /* File exists */
-        
- /* RESTART here */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EXDEV:    /* Cross device link */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EINVAL:   /* Invalid argument */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENFILE:   /* File table overflow */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EMFILE:   /* Too many open files */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOSPC:   /* No space left on device */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        /* math errors */
-        case  EDOM:     /* Argument too large */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ERANGE:   /* Result too large */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        /* file locking error */
-        case  EDEADLK:      /* Resource deadlock would occur */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EINTR:    /* Interrupt */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ECHILD:   /* Child does not exist */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        /* POSIX errors */
-        case  EAGAIN:   /* Resource unavailable, try again */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EBUSY:    /* Device or Resource is busy */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EFBIG:    /* File too large */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EIO:      /* I/O error */
-            PR_SetError( PR_IO_ERROR, err );
-            break;
-        case  EISDIR:   /* Is a directory */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOTDIR:  /* Not a directory */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EMLINK:   /* Too many links */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOTBLK:  /* Block device required */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOTTY:   /* Not a character device */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENXIO:    /* No such device or address */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EPERM:    /* Not owner */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EPIPE:    /* Broken pipe */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EROFS:    /* Read only file system */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ESPIPE:   /* Illegal seek */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ESRCH:    /* No such process */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ETXTBSY:  /* Text file busy */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  EFAULT:   /* Bad address */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENAMETOOLONG: /* Name too long */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENODEV:   /* No such device */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOLCK:   /* No locks available on system */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOSYS:   /* Unknown system call */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-        case  ENOTEMPTY:    /* Directory not empty */
-        /* Normative Addendum error */
-        case  EILSEQ:   /* Multibyte/widw character encoding error */
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-            
-        /* WinSock errors */
-        case WSAEACCES:
-            PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err);
-            break;
-        case WSAEADDRINUSE:
-            PR_SetError(PR_ADDRESS_IN_USE_ERROR, err);
-            break;
-        case WSAEADDRNOTAVAIL:
-            PR_SetError(PR_ADDRESS_NOT_AVAILABLE_ERROR, err);
-            break;
-        case WSAEAFNOSUPPORT:
-            PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, err);
-            break;
-        case WSAEBADF:
-            PR_SetError(PR_BAD_DESCRIPTOR_ERROR, err);
-            break;
-        case WSAECONNREFUSED:
-            PR_SetError(PR_CONNECT_REFUSED_ERROR, err);
-            break;
-        case WSAEFAULT:
-            PR_SetError(PR_ACCESS_FAULT_ERROR, err);
-            break;
-        case WSAEINVAL:
-            PR_SetError(PR_BUFFER_OVERFLOW_ERROR, err);
-            break;
-        case WSAEISCONN:
-            PR_SetError(PR_IS_CONNECTED_ERROR, err);
-            break;
-        case WSAEMFILE:
-            PR_SetError(PR_PROC_DESC_TABLE_FULL_ERROR, err);
-            break;
-        case WSAENETDOWN:
-        case WSAENETUNREACH:
-            PR_SetError(PR_NETWORK_UNREACHABLE_ERROR, err);
-            break;
-        case WSAENOBUFS:
-            PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, err);
-            break;
-        case WSAENOPROTOOPT:
-        case WSAEMSGSIZE:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
-            break;
-        case WSAENOTCONN:
-            PR_SetError(PR_NOT_CONNECTED_ERROR, err);
-            break;
-        case WSAENOTSOCK:
-            PR_SetError(PR_NOT_SOCKET_ERROR, err);
-            break;
-        case WSAEOPNOTSUPP:
-            PR_SetError(PR_NOT_TCP_SOCKET_ERROR, err);
-            break;
-        case WSAEPROTONOSUPPORT:
-            PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-            break;
-        case WSAETIMEDOUT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, err);
-            break;
-        case WSAEINTR:
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, err );
-            break;
-        case WSASYSNOTREADY:
-        case WSAVERNOTSUPPORTED:
-            PR_SetError(PR_PROTOCOL_NOT_SUPPORTED_ERROR, err);
-            break;
-		case WSAEWOULDBLOCK:
-			PR_SetError(PR_WOULD_BLOCK_ERROR, err);
-			break;
-            
-        default:
-            PR_SetError( PR_UNKNOWN_ERROR, err );
-            break;
-    }
-    return;
-} /* end _MD_map_win16_error() */
-
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16fmem.c b/libs/js/nsprpub/pr/src/md/windows/w16fmem.c
deleted file mode 100644
index 55df512853..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16fmem.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/*
- **********************************************************************
- *
- * Memory-mapped files are not implemented on Win16.
- *
- **********************************************************************
- */
-
-PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRInt32 _MD_GetMemMapAlignment(void)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-}
-
-void * _MD_MemMap(
-    PRFileMap *fmap,
-    PRInt64 offset,
-    PRUint32 len)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PRStatus _MD_MemUnmap(void *addr, PRUint32 len)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _MD_CloseFileMap(PRFileMap *fmap)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16gc.c b/libs/js/nsprpub/pr/src/md/windows/w16gc.c
deleted file mode 100644
index cd3a65284f..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16gc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/timeb.h>
-
-PRWord *
-_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) 
-{
-    if (isCurrent) 
-    {
-        _MD_SAVE_CONTEXT(t);
-    }
-    /*
-    ** In Win16 because the premption is "cooperative" it can never be the 
-    ** case that a register holds the sole reference to an object.  It
-    ** will always have been pushed onto the stack before the thread
-    ** switch...  So don't bother to scan the registers...
-    */
-    *np = 0;
-
-    return (PRWord *) CONTEXT(t);
-}
-
-#if 0
-#ifndef SPORT_MODEL
-
-#define MAX_SEGMENT_SIZE (65536l - 4096l)
-
-/************************************************************************/
-/*
-** Machine dependent GC Heap management routines:
-**    _MD_GrowGCHeap
-*/
-/************************************************************************/
-
-extern void *
-_MD_GrowGCHeap(uint32 *sizep)
-{
-    void *addr;
-
-    if( *sizep > MAX_SEGMENT_SIZE ) {
-        *sizep = MAX_SEGMENT_SIZE;
-    }
-
-    addr = malloc((size_t)*sizep);
-    return addr;
-}
-
-#endif /* SPORT_MODEL */
-#endif /* 0 */
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16io.c b/libs/js/nsprpub/pr/src/md/windows/w16io.c
deleted file mode 100644
index 6089d3992d..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16io.c
+++ /dev/null
@@ -1,855 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <share.h>
-#include <sys/locking.h>
-
-
-/*
-** Sleep this many milliseconds on each I/O operation
-** to cause an intentional thread switch. 
-*/
-#define _PR_MD_WIN16_DELAY 1
-
-
-/*
-** PR_MD_RegisterW16StdioCallbacks() -- Register Win16 stdio callback functions
-**
-** This public function call is unique to Win16. 
-** ... Sigh ... So much for platform independence.
-** 
-** To get stdio to work from a command line executable, the stdio stream
-** calls must be issued from the .EXE file; calling them from the .DLL
-** sends the output to the bit-bucket. Therefore, the .EXE wanting to
-** do stdio to the console window (must be built as a "quickwin" application)
-** must have the wrapper functions defined in this module statically linked
-** into the .EXE.
-**
-** There appears to be nothing you can do to get stdio to work from a
-** Win16 GUI application. Oh Well!
-**
-*/
-PRStdinRead   _pr_md_read_stdin = 0;
-PRStdoutWrite _pr_md_write_stdout = 0;
-PRStderrWrite _pr_md_write_stderr = 0;
-
-PRStatus
-PR_MD_RegisterW16StdioCallbacks( PRStdinRead inReadf, PRStdoutWrite outWritef, PRStderrWrite errWritef )
-{
-    _pr_md_write_stdout = outWritef;
-    _pr_md_write_stderr = errWritef;
-    _pr_md_read_stdin   = inReadf;
-    
-    return(PR_SUCCESS);
-} /* end PR_MD_RegisterW16StdioCallbacks() */
-
-
-/*
-** _PR_MD_OPEN() -- Open a file
-**
-** Returns: a fileHandle or -1
-**
-**
-*/
-PRInt32
-_PR_MD_OPEN(const char *name, PRIntn osflags, int mode)
-{
-    PRInt32 file;
-    int     access = O_BINARY;
-    int     rights = 0;
-    
-    
-    /*
-    ** Map NSPR open flags to os open flags
-    */
-    if (osflags & PR_RDONLY )
-        access |= O_RDONLY;
-    if (osflags & PR_WRONLY )
-        access |= O_WRONLY;
-    if (osflags & PR_RDWR )
-        access |= O_RDWR;
-    if (osflags & PR_CREATE_FILE )
-    {
-        access |= O_CREAT;
-        rights |= S_IRWXU;
-    }
-    if (osflags & PR_TRUNCATE)
-        access |= O_TRUNC;
-    if (osflags & PR_APPEND)
-        access |= O_APPEND;
-    else
-        access |= O_RDONLY;
-        
-    /*
-    ** Open the file
-    */        
-    file = (PRInt32) sopen( name, access, SH_DENYNO, rights );
-    if ( -1 == (PRInt32)file )
-    {
-        _PR_MD_MAP_OPEN_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return file;
-}
-
-/*
-** _PR_MD_READ() - Read something
-**
-** Returns: bytes read or -1
-**
-*/
-PRInt32
-_PR_MD_READ(PRFileDesc *fd, void *buf, PRInt32 len)
-{
-    PRInt32     rv;
-    
-    if ( (PR_GetDescType(fd) == PR_DESC_FILE) &&
-         ( fd->secret->md.osfd == PR_StandardInput ) &&
-         ( _pr_md_write_stdout ))
-    {
-        rv = (*_pr_md_read_stdin)( buf, len);    
-    }
-    else
-    {
-        rv = read( fd->secret->md.osfd, buf, len );
-    }
-    
-    if ( rv == -1)
-    {
-        _PR_MD_MAP_READ_ERROR( errno );
-    }
-    
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-}
-
-/*
-** _PR_MD_WRITE() - Write something
-**
-** Returns:  bytes written or -1
-**
-** Note: for file handles 1 and 2 (stdout and stderr)
-** call the Win16 NSPR stdio callback functions, if they are 
-** registered.
-**
-*/
-PRInt32
-_PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 len)
-{
-    PRInt32     rv;
-
-    if ( (PR_GetDescType(fd) == PR_DESC_FILE))
-    {
-        switch ( fd->secret->md.osfd )
-        {
-            case  PR_StandardOutput :
-                if ( _pr_md_write_stdout )
-                    rv = (*_pr_md_write_stdout)( (void *)buf, len);
-                else
-                    rv = len; /* fake success */
-                break;
-                
-            case  PR_StandardError  :
-                if ( _pr_md_write_stderr )
-                    rv = (*_pr_md_write_stderr)( (void *)buf, len);    
-                else
-                    rv = len; /* fake success */
-                break;
-                
-            default:
-                rv = write( fd->secret->md.osfd, buf, len );
-                if ( rv == -1 )
-                {
-                    _PR_MD_MAP_WRITE_ERROR( errno );
-                }
-                break;
-        }
-    }
-    else
-    {
-        rv = write( fd->secret->md.osfd, buf, len );
-        if ( rv == -1 )
-        {
-            _PR_MD_MAP_WRITE_ERROR( errno );
-        }
-    }
-    
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-} /* --- end _PR_MD_WRITE() --- */
-
-/*
-** _PR_MD_LSEEK() - Seek to position in a file
-**
-** Note: 'whence' maps directly to PR_...
-**
-** Returns:
-**
-*/
-PRInt32
-_PR_MD_LSEEK(PRFileDesc *fd, PRInt32 offset, int whence)
-{
-    PRInt32     rv;
-    
-    rv = lseek( fd->secret->md.osfd, offset, whence );
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return( rv );
-}
-
-/*
-** _PR_MD_LSEEK64() -- Seek to position in file, 64bit offset.
-**
-*/
-PRInt64
-_PR_MD_LSEEK64( PRFileDesc *fd, PRInt64 offset, int whence )
-{
-    PRInt64 test;
-    PRInt32 rv, off;
-    LL_SHR(test, offset, 32);
-    if (!LL_IS_ZERO(test))
-    {
-        PR_SetError(PR_FILE_TOO_BIG_ERROR, 0);
-        LL_I2L(test, -1);
-        return test;
-    }
-    LL_L2I(off, offset);
-    rv = _PR_MD_LSEEK(fd, off, whence);
-    LL_I2L(test, rv);
-    return test;
-} /* end _PR_MD_LSEEK64() */
-
-/*
-** _PR_MD_FSYNC() - Flush file buffers.
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_FSYNC(PRFileDesc *fd)
-{
-    PRInt32     rv;
-    
-    rv = (PRInt32) fsync( fd->secret->md.osfd );
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_FSYNC_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-}
-
-/*
-** _PR_MD_CLOSE() - Close an open file handle
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_CLOSE_FILE(PRInt32 osfd)
-{
-    PRInt32     rv;
-    
-    rv = (PRInt32) close( osfd );
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_CLOSE_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-} /* --- end _MD_CloseFile() --- */
-
-
-/* --- DIR IO ------------------------------------------------------------ */
-#define GetFileFromDIR(d)       (d)->d_entry.cFileName
-
-/*
-** FlipSlashes() - Make forward slashes ('/') into backslashes
-**
-** Returns: void
-**
-**
-*/
-void FlipSlashes(char *cp, int len)
-{
-    while (--len >= 0) {
-    if (cp[0] == '/') {
-        cp[0] = PR_DIRECTORY_SEPARATOR;
-    }
-    cp++;
-    }
-}
-
-
-/*
-** _PR_MD_OPEN_DIR() - Open a Directory.
-**
-** Returns:
-**
-**
-*/
-PRStatus
-_PR_MD_OPEN_DIR(_MDDir *d, const char *name)
-{
-    d->dir = opendir( name );
-    
-    if ( d->dir == NULL )
-    {
-        _PR_MD_MAP_OPENDIR_ERROR( errno );
-        return( PR_FAILURE );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return( PR_SUCCESS );
-}
-
-
-/*
-** _PR_MD_READ_DIR() - read next directory entry
-**
-**
-*/
-char *
-_PR_MD_READ_DIR(_MDDir *d, PRIntn flags)
-{
-    struct dirent *de;
-    int err;
-
-	for (;;) 
-    {
-		de = readdir( d->dir );
-		if ( de == NULL ) {
-			_PR_MD_MAP_READDIR_ERROR( errno);
-			return 0;
-		}		
-		if ((flags & PR_SKIP_DOT) &&
-		    (de->d_name[0] == '.') && (de->d_name[1] == 0))
-			continue;
-		if ((flags & PR_SKIP_DOT_DOT) &&
-		    (de->d_name[0] == '.') && (de->d_name[1] == '.') &&
-		    (de->d_name[2] == 0))
-			continue;
-		break;
-	}
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-	return de->d_name;
-}
-
-/*
-** _PR_MD_CLOSE_DIR() - Close a directory.
-**
-**
-*/
-PRInt32
-_PR_MD_CLOSE_DIR(_MDDir *d)
-{
-    PRInt32     rv;
-    
-    if ( d->dir ) 
-    {
-        rv = closedir( d->dir );
-        if (rv != 0) 
-        {
-            _PR_MD_MAP_CLOSEDIR_ERROR( errno );
-        }
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-}
-
-
-/*
-** _PR_MD_DELETE() - Delete a file.
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_DELETE(const char *name)
-{
-    PRInt32     rv;
-    
-    rv = (PRInt32) remove( name );
-    if ( rv != 0 )
-    {
-        _PR_MD_MAP_DELETE_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-}
-
-
-/*
-** _PR_MD_STAT() - Get file attributes by filename
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_STAT(const char *fn, struct stat *info)
-{
-    PRInt32     rv;
-    
-    rv = _stat(fn, (struct _stat *)info);
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_STAT_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return( rv );
-}
-
-/*
-** _PR_MD_GETFILEINFO() - Get file attributes by filename
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_GETFILEINFO(const char *fn, PRFileInfo *info)
-{
-    struct _stat sb;
-    PRInt32 rv;
- 
-    if ( (rv = _stat(fn, &sb)) == 0 ) {
-        if (info) {
-            if (S_IFREG & sb.st_mode)
-                info->type = PR_FILE_FILE ;
-            else if (S_IFDIR & sb.st_mode)
-                info->type = PR_FILE_DIRECTORY;
-            else
-                info->type = PR_FILE_OTHER;
-            info->size = sb.st_size;
-            LL_I2L(info->modifyTime, sb.st_mtime);
-            LL_I2L(info->creationTime, sb.st_ctime);
-        }
-    }
-    else
-    {
-        _PR_MD_MAP_STAT_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info)
-{
-    PRFileInfo info32;
-    
-    PRInt32 rv = _PR_MD_GETFILEINFO(fn, &info32);
-    if (0 == rv)
-    {
-        info->type = info32.type;
-        info->modifyTime = info32.modifyTime;
-        info->creationTime = info32.creationTime;
-        LL_I2L(info->size, info32.size);
-    }
-    return(rv);
-}
-
-/*
-** _PR_MD_GETOPENFILEINFO() - Get file attributes from an open file handle
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info)
-{
-    struct stat statBuf;
-    PRInt32 rv = PR_SUCCESS;
-    
-    rv = fstat( fd->secret->md.osfd, &statBuf );
-    if ( rv == 0)
-    {
-        if (statBuf.st_mode & S_IFREG )
-            info->type = PR_FILE_FILE;
-        else if ( statBuf.st_mode & S_IFDIR )
-            info->type = PR_FILE_DIRECTORY;
-        else
-            info->type = PR_FILE_OTHER;
-        info->size = statBuf.st_size;
-        LL_I2L(info->modifyTime, statBuf.st_mtime);
-        LL_I2L(info->creationTime, statBuf.st_ctime);
-        
-    }
-    else
-    {
-        _PR_MD_MAP_FSTAT_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO64(const PRFileDesc *fd, PRFileInfo64 *info)
-{
-    PRFileInfo info32;
-    
-    PRInt32 rv = _PR_MD_GETOPENFILEINFO(fd, &info32);
-    if (0 == rv)
-    {
-        info->type = info32.type;
-        info->modifyTime = info32.modifyTime;
-        info->creationTime = info32.creationTime;
-        LL_I2L(info->size, info32.size);
-    }
-    return(rv);
-}
-
-/*
-** _PR_MD_RENAME() - Rename a file
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_RENAME(const char *from, const char *to)
-{
-    PRInt32 rv;
-    
-    rv = rename( from, to );
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_RENAME_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return( rv );
-}
-
-/*
-** _PR_MD_ACCESS() - Return file acesss attribute.
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_ACCESS(const char *name, PRIntn how)
-{
-    PRInt32     rv;
-    int         mode = 0;
-    
-    if ( how & PR_ACCESS_WRITE_OK )
-        mode |= W_OK;
-    if ( how & PR_ACCESS_READ_OK )
-        mode |= R_OK;
-        
-    rv = (PRInt32) access( name, mode );        
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_ACCESS_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-}
-
-/*
-** _PR_MD_MKDIR() - Make a directory
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_MKDIR(const char *name, PRIntn mode)
-{
-    PRInt32 rv;
-        
-    rv = mkdir( name );
-    if ( rv == 0 )
-    {
-        PR_Sleep( _PR_MD_WIN16_DELAY );    
-        return PR_SUCCESS;
-    }
-    else
-    {
-        _PR_MD_MAP_MKDIR_ERROR( errno );
-        PR_Sleep( _PR_MD_WIN16_DELAY );    
-        return PR_FAILURE;
-    }
-}
-
-/*
-** _PR_MD_RMDIR() - Delete a directory
-**
-** Returns:
-**
-**
-*/
-PRInt32
-_PR_MD_RMDIR(const char *name)
-{
-    PRInt32 rv;
-    
-    rv = (PRInt32) rmdir( name );
-    if ( rv == -1 )
-    {
-        _PR_MD_MAP_RMDIR_ERROR( errno );
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return(rv);
-}
-
-/*
-** _PR_MD_LOCKFILE() - Lock a file.
-**
-** The _locking() call locks relative to the current file pointer.
-** This function is required to lock all of the file, so,
-** 1. Seek to the beginning of the file, preserving the original position.
-** 2. Lock the file, pausing if it is locked by someone else, and
-**    try again.
-** 3. Re-position to the original position in the file.
-**
-** For unlocking, a similar protocol of positioning is required.
-**
-*/
-PRStatus
-_PR_MD_LOCKFILE(PRInt32 f)
-{
-    PRInt32 rv = PR_SUCCESS;    /* What we return to our caller */
-    long    seekOrigin;         /* original position in file */
-    PRInt32 rc;                 /* what the system call returns to us */
-
-    /*
-    ** Seek to beginning of file, saving original position.
-    */    
-    seekOrigin = lseek( f, 0l, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        return( PR_FAILURE );
-    }
-    
-    /*
-    ** Attempt to lock the file.
-    ** If someone else has it, Sleep-a-while and try again.
-    */
-    for( rc = -1; rc != 0; )
-    {
-        rc = _locking( f, _LK_NBLCK , 0x7fffffff );
-        if ( rc == -1 )
-        {
-            if ( errno == EACCES )
-            {
-                PR_Sleep( 100 );
-                continue;
-            }
-            else
-            {
-                _PR_MD_MAP_LOCKF_ERROR( errno );
-                rv = PR_FAILURE;
-                break;
-            }
-        }
-    } /* end for() */
-    
-    /*
-    ** Now that the file is locked, re-position to
-    ** the original file position.
-    **
-    */
-    rc = lseek( f, seekOrigin, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        rv = PR_FAILURE;
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return PR_SUCCESS;
-} /* end _PR_MD_LOCKFILE() */
-
-/*
-** _PR_MD_TLOCKFILE() - Test and Lock file.
-**
-** The _locking() call locks relative to the current file pointer.
-** This function is required to lock all of the file, so,
-** 1. Seek to the beginning of the file, preserving the original position.
-** 2. Attempt to Lock the file.
-**    If the file is locked by someone else, try NO MORE.
-** 3. Re-position to the original position in the file.
-**
-** See the discussion of _PR_MD_LOCKFILE
-**
-**
-*/
-PRStatus
-_PR_MD_TLOCKFILE(PRInt32 f)
-{
-    PRInt32 rv = PR_SUCCESS;    /* What we return */
-    long    seekOrigin;         /* original position in file */
-    PRInt32 rc;                 /* return value from system call */
-
-    /*
-    ** Seek to beginning of file, saving original position.
-    */    
-    seekOrigin = lseek( f, 0l, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        return( PR_FAILURE );
-    }
-    
-    /*
-    ** Attempt to lock the file. One ping; one ping only, Vasily.
-    ** If someone else has it, Reposition and return failure.
-    */
-    rc = _locking( f, _LK_NBLCK , 0x7fffffff );
-    if ( rc == -1 )
-    {
-        if ( errno != EACCES )
-            _PR_MD_MAP_LOCKF_ERROR( errno );
-        rv = PR_FAILURE;
-    }
-    
-    /*
-    ** Now that the file is locked, maybe, re-position to
-    ** the original file position.
-    */
-    rc = lseek( f, seekOrigin, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        rv = PR_FAILURE;
-    }
-    
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-} /* end _PR_MD_TLOCKFILE() */
-
-
-/*
-** _PR_MD_UNLOCKFILE() - Unlock a file.
-**
-** See the discussion of _PR_MD_LOCKFILE
-**
-*/
-PRStatus
-_PR_MD_UNLOCKFILE(PRInt32 f)
-{
-    PRInt32 rv = PR_SUCCESS;    /* What we return */
-    long    seekOrigin;         /* original position in file */
-    PRInt32 rc;                 /* return value from system call */
-
-    /*
-    ** Seek to beginning of file, saving original position.
-    */    
-    seekOrigin = lseek( f, 0l, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        return( PR_FAILURE );
-    }
-    
-    /*
-    ** Unlock the file.
-    */
-    rc = _locking( f, _LK_UNLCK , 0x7fffffff );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LOCKF_ERROR( errno );
-        rv = PR_FAILURE;
-    }
-    
-    /*
-    ** Now that the file is unlocked, re-position to
-    ** the original file position.
-    */
-    rc = lseek( f, seekOrigin, SEEK_SET );
-    if ( rc == -1 )
-    {
-        _PR_MD_MAP_LSEEK_ERROR( errno );
-        rv = PR_FAILURE;
-    }
-    PR_Sleep( _PR_MD_WIN16_DELAY );    
-    return rv;
-} /* end _PR_MD_UNLOCKFILE() */
-
-/*
-** PR_Stat() -- Return status on a file
-**
-** This is a hack! ... See BugSplat: 98516 
-** Basically, this hack takes a name and stat buffer as input.
-** The input stat buffer is presumed to be a Microsoft stat buffer.
-** The functions does a Watcom stat() then maps the result to
-** the MS stat buffer. ...
-**
-*/
-PR_IMPLEMENT(PRInt32) PR_Stat(const char *name, struct stat *buf)
-{
-    PRInt32     rv;
-    _MDMSStat   *mssb = (_MDMSStat*) buf; /* this is Microsoft's stat buffer */
-    struct stat statBuf;   /* this is Watcom's stat buffer */
-
-    /* First, get Watcom's idea of stat
-    ** then reformat it into a Microsoft idea of stat
-    */
-    rv = (PRInt32) _stat( name, &statBuf);
-    if (rv == 0l )
-    {
-        mssb->st_dev = statBuf.st_dev;
-        mssb->st_ino = statBuf.st_ino; /* not used, really */
-        mssb->st_mode = statBuf.st_mode;
-        mssb->st_nlink = 1; /* always 1, says MS */
-        mssb->st_uid = statBuf.st_uid;
-        mssb->st_gid = statBuf.st_gid;
-        mssb->st_rdev = statBuf.st_rdev; /* please Gh0d! Let these be the same */
-        mssb->st_size = statBuf.st_size;
-        mssb->st_atime = statBuf.st_atime;
-        mssb->st_mtime = statBuf.st_mtime;
-        mssb->st_ctime = statBuf.st_ctime;
-    }
-    return rv;
-} /* end PR_Stat() */
-
-
-
-/* $$ end W16io.c */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16mem.c b/libs/js/nsprpub/pr/src/md/windows/w16mem.c
deleted file mode 100644
index 1c07099d02..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16mem.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*******************************************************************
-** w16mem.c -- Implement memory segment functions.
-**
-** 
-********************************************************************
-*/
-#include "primpl.h"
-
-
-/*
-**	Allocate a new memory segment.
-**	
-**	Return the segment's access rights and size.  
-*/
-PRStatus _MD_AllocSegment(PRSegment *seg, PRUint32 size, void *vaddr)
-{
-	PR_ASSERT(seg != 0);
-	PR_ASSERT(size != 0);
-	PR_ASSERT(vaddr == 0);
-
-	/*	
-	** Take the actual memory for the segment out of our Figment heap.
-	*/
-
-	seg->vaddr = (char *)malloc(size);
-
-	if (seg->vaddr == NULL) {
-		return PR_FAILURE;
-	}
-
-	seg->size = size;	
-
-	return PR_SUCCESS;
-} /* --- end _MD_AllocSegment() --- */
-
-
-/*
-**	Free previously allocated memory segment.
-*/
-void _MD_FreeSegment(PRSegment *seg)
-{
-	PR_ASSERT((seg->flags & _PR_SEG_VM) == 0);
-
-	if (seg->vaddr != NULL)
-		free( seg->vaddr );
-    return;
-} /* --- end _MD_FreeSegment() --- */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16null.c b/libs/js/nsprpub/pr/src/md/windows/w16null.c
deleted file mode 100644
index 7f4c5fc173..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16null.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/timeb.h>
-
-
-struct _MDLock          _pr_ioq_lock;
-HINSTANCE               _pr_hInstance = NULL;
-char *                  _pr_top_of_task_stack;
-_PRInterruptTable       _pr_interruptTable[] = { { 0 } };
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_Now --
- *
- *     Returns the current time in microseconds since the epoch.
- *     The epoch is midnight January 1, 1970 GMT.
- *     The implementation is machine dependent.  This is the
- *     implementation for Windows.
- *     Cf. time_t time(time_t *tp)
- *
- *-----------------------------------------------------------------------
- */
-
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-PR_IMPLEMENT(PRTime)
-#endif
-PR_Now(void)
-{
-    PRInt64 s, ms, ms2us, s2us;
-    struct timeb b;
-
-    ftime(&b);
-    LL_I2L(ms2us, PR_USEC_PER_MSEC);
-    LL_I2L(s2us, PR_USEC_PER_SEC);
-    LL_I2L(s, b.time);
-    LL_I2L(ms, (PRInt32)b.millitm);
-    LL_MUL(ms, ms, ms2us);
-    LL_MUL(s, s, s2us);
-    LL_ADD(s, s, ms);
-    return s;       
-}
-
-
-
-char *_PR_MD_GET_ENV(const char *name)
-{
-    return NULL;
-}
-
-PRIntn
-_PR_MD_PUT_ENV(const char *name)
-{
-    return NULL;
-}
-
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg, 
-                      WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-    _pr_hInstance = hInst;
-    return TRUE;
-}
-
-
-
-void
-_PR_MD_EARLY_INIT()
-{
-    _tzset();
-    return;
-}
-
-void
-_PR_MD_WAKEUP_CPUS( void )
-{
-    return;
-}    
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16proc.c b/libs/js/nsprpub/pr/src/md/windows/w16proc.c
deleted file mode 100644
index f1a9eab827..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16proc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/timeb.h>
-
-
-/* 
-** Create Process.
-*/
-PRProcess * _PR_CreateWindowsProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PRStatus _PR_DetachWindowsProcess(PRProcess *process)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _PR_WaitWindowsProcess(PRProcess *process,
-    PRInt32 *exitCode)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _PR_KillWindowsProcess(PRProcess *process)
-{
-    PR_ASSERT(!"Not implemented");
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16sock.c b/libs/js/nsprpub/pr/src/md/windows/w16sock.c
deleted file mode 100644
index 78e95906bf..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16sock.c
+++ /dev/null
@@ -1,1170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-static  int winsockNotPresent = 0;
-
-void
-_PR_MD_INIT_IO()
-{
-    int rv;
-    
-    WORD WSAVersion = 0x0101;
-    WSADATA WSAData;
-
-    rv = WSAStartup( WSAVersion, &WSAData );
-    if ( rv != 0 )
-    {
-        _PR_MD_MAP_WSASTARTUP_ERROR(WSAGetLastError());
-        winsockNotPresent = 1;
-    }
-    return;
-}
-
-void
-_PR_MD_CLEANUP_BEFORE_EXIT(void)
-{
-    int rv;
-    int err;
-    
-    rv = WSACleanup();
-    if ( rv == SOCKET_ERROR )
-    {
-        err = WSAGetLastError();
-        PR_ASSERT(0);
-    }
-    return;
-} /* end _PR_MD_CLEANUP_BEFORE_EXIT() */
-
-/* --- SOCKET IO --------------------------------------------------------- */
-
-PRStatus 
-_MD_WindowsGetHostName(char *name, PRUint32 namelen)
-{
-    PRIntn  rv;
-    PRInt32 syserror;
-    
-    rv = gethostname(name, (PRInt32) namelen);
-    if (0 == rv) {
-        return PR_SUCCESS;
-    }
-    syserror = WSAGetLastError();
-    PR_ASSERT(WSANOTINITIALISED != syserror);
-    _PR_MD_MAP_GETHOSTNAME_ERROR(syserror);
-    return PR_FAILURE;
-}
-
-
-PRInt32
-_PR_MD_SOCKET(int af, int type, int flags)
-{
-    SOCKET      sock;
-    PRUint32    one = 1;
-    PRInt32     rv;
-    PRInt32     err;
-
-    if ( winsockNotPresent )
-        return( (PRInt32)INVALID_SOCKET );
-
-    sock = socket(af, type, flags);
-
-    if (sock == INVALID_SOCKET ) 
-    {
-        int rv = GetLastError();
-        closesocket(sock);
-        _PR_MD_MAP_SOCKET_ERROR(rv);
-        return (PRInt32)INVALID_SOCKET;
-    }
-
-    /*
-    ** Make the socket Non-Blocking
-    */
-    rv = ioctlsocket( sock, FIONBIO, &one);
-    if ( rv != 0 )
-    {
-        err = WSAGetLastError();
-        return -1;
-    }
-
-    return (PRInt32)sock;
-}
-
-
-PRInt32
-_PR_MD_SOCKETAVAILABLE(PRFileDesc *fd)
-{
-    PRUint32 result;
-
-    if (ioctlsocket(fd->secret->md.osfd, FIONREAD, &result) < 0) {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, WSAGetLastError());
-        return -1;
-    }
-    return result;
-}
-
-
-/*
-** _MD_CloseSocket() -- Close a socket
-**
-*/
-PRInt32
-_PR_MD_CLOSE_SOCKET(PRInt32 osfd)
-{
-    PRInt32 rv;
-
-    rv = closesocket((SOCKET) osfd );
-    if (rv < 0)
-        _PR_MD_MAP_CLOSE_ERROR(WSAGetLastError());
-
-    return rv;
-}
-
-PRInt32 _PR_MD_LISTEN(PRFileDesc *fd, PRIntn backlog)
-{
-    int rv, err;
-
-	rv = listen(fd->secret->md.osfd, backlog);
-	if ( rv == SOCKET_ERROR ) {
-		_PR_MD_MAP_LISTEN_ERROR(WSAGetLastError());
-        return(-1);
-	}
-	return(rv);
-}
-
-PRInt32
-_PR_MD_ACCEPT(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *addrlen,
-       PRIntervalTime timeout )
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread    *me = _PR_MD_CURRENT_THREAD();
-    PRInt32     err;
-    PRIntn      rv;
-
-    MD_ASSERTINT( *addrlen );    
-
-    while ((rv = (SOCKET)accept(osfd, (struct sockaddr *) addr,
-                                        (int *)addrlen)) == INVALID_SOCKET ) {
-        err = WSAGetLastError();
-		if ( err == WSAEWOULDBLOCK ) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_READ, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_ACCEPT_ERROR(err);
-    }
-done:
-    if ( rv == INVALID_SOCKET )
-        return(-1 );
-    else
-        return(rv);
-} /* end _MD_Accept() */
-
-
-PRInt32
-_PR_MD_CONNECT(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, 
-               PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 rv, err;
-
-    while ((rv = connect(osfd, (struct sockaddr *)addr, addrlen)) == -1) {
-        err = WSAGetLastError();
-        if (err == WSAEISCONN) {
-            rv = 0;
-            break;
-        }
-        /* for winsock1.1, it reports EALREADY as EINVAL */
-		if ((err == WSAEWOULDBLOCK)
-            ||(err == WSAEALREADY) 
-            || (err = WSAEINVAL)) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_WRITE, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-
-    if (rv < 0) {
-        _PR_MD_MAP_CONNECT_ERROR(err);
-    }
-done:
-    return rv;
-}
-
-PRInt32
-_PR_MD_BIND(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv;
-    int one = 1;
-
-    rv = bind(fd->secret->md.osfd, (const struct sockaddr *)&(addr->inet), addrlen);
-
-    if (rv == SOCKET_ERROR)  {
-        _PR_MD_MAP_BIND_ERROR(WSAGetLastError());
-        return -1;
-    }
-
-    return 0;
-}
-
-
-PRInt32
-_PR_MD_RECV(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, 
-            PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 rv, err;
-
-    while ((rv = recv(osfd,buf,amount,flags)) == -1) {
-        err = WSAGetLastError();
-		if ( err == WSAEWOULDBLOCK ) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_READ, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECV_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_SEND(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-            PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 rv, err;
-
-    while ((rv = send(osfd,buf,amount,flags)) == -1) {
-        err = WSAGetLastError();
-		if ( err == WSAEWOULDBLOCK ) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_WRITE, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SEND_ERROR(err);
-    }
-done:
-    return rv;
-}
-
-PRInt32
-_PR_MD_SENDTO(PRFileDesc*fd, const void *buf, PRInt32 amount, PRIntn flags,
-              const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 rv, err;
-
-    while ((rv = sendto(osfd, buf, amount, flags,
-            (struct sockaddr *) addr, addrlen)) == -1) {
-        err = WSAGetLastError();
-		if ( err == WSAEWOULDBLOCK ) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_WRITE, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_SENDTO_ERROR(err);
-    }
-done:
-    return rv;
-}
-
-PRInt32
-_PR_MD_RECVFROM(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-                PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PRInt32 osfd = fd->secret->md.osfd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRInt32 rv, err;
-
-    while ((*addrlen = PR_NETADDR_SIZE(addr)),
-                ((rv = recvfrom(osfd, buf, amount, flags,
-                (struct sockaddr FAR *) addr,(int FAR *)addrlen)) == -1)) {
-        err = WSAGetLastError();
-		if ( err == WSAEWOULDBLOCK ) {
-			if (fd->secret->nonblocking) {
-				break;
-			}
-            if (_PR_WaitForFD(osfd, PR_POLL_READ, timeout) == 0) {
-                if ( _PR_PENDING_INTERRUPT(me))
-                {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                } else
-                {
-                    PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                }
-                rv = -1;
-                goto done;
-            } else if (_PR_PENDING_INTERRUPT(me)) {
-                me->flags &= ~_PR_INTERRUPT;
-                PR_SetError( PR_PENDING_INTERRUPT_ERROR, 0);
-                rv = -1;
-                goto done;
-            }
-        } else if ((err == WSAEINTR) && (!_PR_PENDING_INTERRUPT(me))){
-            continue;
-        } else {
-            break;
-        }
-    }
-    if (rv < 0) {
-        _PR_MD_MAP_RECVFROM_ERROR(err);
-    }
-done:
-    return(rv);
-}
-
-PRInt32
-_PR_MD_WRITEV(PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size, PRIntervalTime timeout)
-{
-    int index;
-    int sent = 0;
-    int rv;
-
-    for (index=0; index < iov_size; index++) 
-    {
-
-/*
- * XXX To be fixed
- * should call PR_Send
- */
-
-        rv = _PR_MD_SEND(fd, iov[index].iov_base, iov[index].iov_len, 0, timeout);
-        if (rv > 0) 
-            sent += rv;
-        if ( rv != iov[index].iov_len ) 
-        {
-            if (sent <= 0)
-                return -1;
-            return -1;
-        }
-    }
-    return sent;
-}
-
-PRInt32
-_PR_MD_SHUTDOWN(PRFileDesc *fd, PRIntn how)
-{
-PRInt32 rv;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-    if (rv < 0)
-        _PR_MD_MAP_SHUTDOWN_ERROR(WSAGetLastError());
-    return rv;
-}
-
-PRStatus
-_PR_MD_GETSOCKNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    rv = getsockname((SOCKET)fd->secret->md.osfd, (struct sockaddr *)addr, (int *)len);
-    if (rv==0)
-        return PR_SUCCESS;
-    else {
-        _PR_MD_MAP_GETSOCKNAME_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_GETPEERNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    rv = getpeername((SOCKET)fd->secret->md.osfd, (struct sockaddr *)addr, (int*)len);
-    if (rv==0)
-        return PR_SUCCESS;
-    else {
-        _PR_MD_MAP_GETPEERNAME_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_GETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    PRInt32 rv;
-
-    rv = getsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, (int*)optlen);
-    if (rv==0)
-        return PR_SUCCESS;
-    else {
-        _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_SETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv;
-
-    rv = setsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv==0)
-        return PR_SUCCESS;
-    else {
-        _PR_MD_MAP_SETSOCKOPT_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-void
-_PR_MD_MAKE_NONBLOCK(PRFileDesc *f)
-{
-    return; // do nothing!
-}
-
-/*
-** Wait for I/O on a single descriptor.
- *
- * return 0, if timed-out, else return 1
-*/
-PRInt32
-_PR_WaitForFD(PRInt32 osfd, PRUintn how, PRIntervalTime timeout)
-{
-    _PRWin16PollDesc *pd;
-    PRPollQueue      *pq;
-    PRIntn is;
-    PRInt32 rv = 1;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
-
-    pd = &me->md.thr_pd;
-    pq = &me->md.thr_pq;
-    if (timeout == PR_INTERVAL_NO_WAIT) return 0;
-
-    pd->osfd = osfd;
-    pd->in_flags = how;
-    pd->out_flags = 0;
-
-    pq->pds = pd;
-    pq->npds = 1;
-
-    _PR_INTSOFF(is);
-    _PR_MD_IOQ_LOCK();
-    _PR_THREAD_LOCK(me);
-
-	if (_PR_PENDING_INTERRUPT(me)) {
-    	_PR_THREAD_UNLOCK(me);
-    	_PR_MD_IOQ_UNLOCK();
-		return 0;
-	}
-
-    pq->thr = me;
-    pq->on_ioq = PR_TRUE;
-    pq->timeout = timeout;
-    _PR_ADD_TO_IOQ((*pq), me->cpu);
-    if (how == PR_POLL_READ) {
-        FD_SET(osfd, &_PR_FD_READ_SET(me->cpu));
-        (_PR_FD_READ_CNT(me->cpu))[osfd]++;
-    } else if (how == PR_POLL_WRITE) {
-        FD_SET(osfd, &_PR_FD_WRITE_SET(me->cpu));
-        (_PR_FD_WRITE_CNT(me->cpu))[osfd]++;
-    } else {
-        FD_SET(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-        (_PR_FD_EXCEPTION_CNT(me->cpu))[osfd]++;
-    }
-    if (_PR_IOQ_MAX_OSFD(me->cpu) < osfd)
-        _PR_IOQ_MAX_OSFD(me->cpu) = osfd;
-    if (_PR_IOQ_TIMEOUT(me->cpu) > timeout)
-        _PR_IOQ_TIMEOUT(me->cpu) = timeout;
-        
-    _PR_THREAD_LOCK(me);
-
-    _PR_SLEEPQ_LOCK(me->cpu);
-    _PR_ADD_SLEEPQ(me, timeout);
-    me->state = _PR_IO_WAIT;
-    me->io_pending = PR_TRUE;
-    me->io_suspended = PR_FALSE;
-    _PR_SLEEPQ_UNLOCK(me->cpu);
-    _PR_THREAD_UNLOCK(me);
-    _PR_MD_IOQ_UNLOCK();
-
-    _PR_MD_WAIT(me, timeout);
-    me->io_pending = PR_FALSE;
-    me->io_suspended = PR_FALSE;
-
-    /*
-    ** If we timed out the pollq might still be on the ioq. Remove it
-    ** before continuing.
-    */
-    if (pq->on_ioq) {
-        _PR_INTSOFF(is);
-        _PR_MD_IOQ_LOCK();
-    /*
-     * Need to check pq.on_ioq again
-     */
-        if (pq->on_ioq) {
-            PR_REMOVE_LINK(&pq->links);
-            if (how == PR_POLL_READ) {
-                if ((--(_PR_FD_READ_CNT(me->cpu))[osfd]) == 0)
-                    FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-            
-            } else if (how == PR_POLL_WRITE) {
-                if ((--(_PR_FD_WRITE_CNT(me->cpu))[osfd]) == 0)
-                    FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-            } else {
-                if ((--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd]) == 0)
-                    FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-            }
-        }
-        _PR_MD_IOQ_UNLOCK();
-        rv = 0;
-    }
-    _PR_FAST_INTSON(is);
-   return(rv);
-}
-
-/*
- * Unblock threads waiting for I/O
- *    used when interrupting threads
- *
- * NOTE: The thread lock should held when this function is called.
- * On return, the thread lock is released.
- */
-void _PR_Unblock_IO_Wait(PRThread *thr)
-{
-    int pri = thr->priority;
-    _PRCPU *cpu = thr->cpu;
- 
-    PR_ASSERT(thr->flags & (_PR_ON_SLEEPQ | _PR_ON_PAUSEQ));
-    _PR_SLEEPQ_LOCK(cpu);
-    _PR_DEL_SLEEPQ(thr, PR_TRUE);
-    _PR_SLEEPQ_UNLOCK(cpu);
-
-    PR_ASSERT(!(thr->flags & _PR_IDLE_THREAD));
-    thr->state = _PR_RUNNABLE;
-    _PR_RUNQ_LOCK(cpu);
-    _PR_ADD_RUNQ(thr, cpu, pri);
-    _PR_RUNQ_UNLOCK(cpu);
-    _PR_THREAD_UNLOCK(thr);
-    _PR_MD_WAKEUP_WAITER(thr);
-}
-
-/*
-** Scan through io queue and find any bad fd's that triggered the error
-** from _MD_SELECT
-*/
-static void FindBadFDs(void)
-{
-    PRCList *q;
-    PRThread *me = _MD_CURRENT_THREAD();
-    int sockOpt;
-    int sockOptLen = sizeof(sockOpt);
-
-    PR_ASSERT(!_PR_IS_NATIVE_THREAD(me));
-    q = (_PR_IOQ(me->cpu)).next;
-    _PR_IOQ_MAX_OSFD(me->cpu) = -1;
-    _PR_IOQ_TIMEOUT(me->cpu) = PR_INTERVAL_NO_TIMEOUT;
-    while (q != &_PR_IOQ(me->cpu)) {
-        PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-        PRBool notify = PR_FALSE;
-        _PRWin16PollDesc *pds = pq->pds;
-        _PRWin16PollDesc *epds = pds + pq->npds;
-        PRInt32 pq_max_osfd = -1;
-
-        q = q->next;
-        for (; pds < epds; pds++) {
-            PRInt32 osfd = pds->osfd;
-            pds->out_flags = 0;
-            PR_ASSERT(osfd >= 0 || pds->in_flags == 0);
-            if (pds->in_flags == 0) {
-                continue;  /* skip this fd */
-            }
-            if ( getsockopt(osfd, 
-                    (int)SOL_SOCKET, 
-                    SO_TYPE, 
-                    (char*)&sockOpt, 
-                    &sockOptLen) == SOCKET_ERROR ) 
-            {
-                if ( WSAGetLastError() == WSAENOTSOCK )
-                {
-                    PR_LOG(_pr_io_lm, PR_LOG_MAX,
-                        ("file descriptor %d is bad", osfd));
-                    pds->out_flags = PR_POLL_NVAL;
-                    notify = PR_TRUE;
-                }
-            }
-            if (osfd > pq_max_osfd) {
-                pq_max_osfd = osfd;
-            }
-        }
-
-        if (notify) {
-            PRIntn pri;
-            PR_REMOVE_LINK(&pq->links);
-            pq->on_ioq = PR_FALSE;
-
-            /*
-         * Decrement the count of descriptors for each desciptor/event
-         * because this I/O request is being removed from the
-         * ioq
-         */
-            pds = pq->pds;
-            for (; pds < epds; pds++) {
-                PRInt32 osfd = pds->osfd;
-                PRInt16 in_flags = pds->in_flags;
-                PR_ASSERT(osfd >= 0 || in_flags == 0);
-                if (in_flags & PR_POLL_READ) {
-                    if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                }
-                if (in_flags & PR_POLL_WRITE) {
-                    if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                }
-                if (in_flags & PR_POLL_EXCEPT) {
-                    if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                }
-            }
-
-            _PR_THREAD_LOCK(pq->thr);
-            if (pq->thr->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-                _PRCPU *cpu = pq->thr->cpu;
-                
-                _PR_SLEEPQ_LOCK(pq->thr->cpu);
-                _PR_DEL_SLEEPQ(pq->thr, PR_TRUE);
-                _PR_SLEEPQ_UNLOCK(pq->thr->cpu);
-
-                pri = pq->thr->priority;
-                pq->thr->state = _PR_RUNNABLE;
-
-                _PR_RUNQ_LOCK(cpu);
-                _PR_ADD_RUNQ(pq->thr, cpu, pri);
-                _PR_RUNQ_UNLOCK(cpu);
-            }
-            _PR_THREAD_UNLOCK(pq->thr);
-        } else {
-            if (pq->timeout < _PR_IOQ_TIMEOUT(me->cpu))
-                _PR_IOQ_TIMEOUT(me->cpu) = pq->timeout;
-            if (_PR_IOQ_MAX_OSFD(me->cpu) < pq_max_osfd)
-                _PR_IOQ_MAX_OSFD(me->cpu) = pq_max_osfd;
-        }
-    }
-} /* end FindBadFDs() */
-
-/*
-** Called by the scheduler when there is nothing to do. This means that
-** all threads are blocked on some monitor somewhere.
-**
-** Pause the current CPU. longjmp to the cpu's pause stack
-*/
-PRInt32 _PR_MD_PAUSE_CPU( PRIntervalTime ticks)
-{
-    PRThread *me = _MD_CURRENT_THREAD();
-    struct timeval timeout, *tvp;
-    fd_set r, w, e;
-    fd_set *rp, *wp, *ep;
-    PRInt32 max_osfd, nfd;
-    PRInt32 rv;
-    PRCList *q;
-    PRUint32 min_timeout;
-
-    PR_ASSERT(_PR_MD_GET_INTSOFF() != 0);
-
-    /*
-     * assigment of fd_sets
-     */
-    r = _PR_FD_READ_SET(me->cpu);
-    w = _PR_FD_WRITE_SET(me->cpu);
-    e = _PR_FD_EXCEPTION_SET(me->cpu);
-
-    rp = &r;
-    wp = &w;
-    ep = &e;
-
-    max_osfd = _PR_IOQ_MAX_OSFD(me->cpu) + 1;
-    min_timeout = _PR_IOQ_TIMEOUT(me->cpu);
-    /*
-    ** Compute the minimum timeout value: make it the smaller of the
-    ** timeouts specified by the i/o pollers or the timeout of the first
-    ** sleeping thread.
-    */
-    q = _PR_SLEEPQ(me->cpu).next;
-
-    if (q != &_PR_SLEEPQ(me->cpu)) {
-        PRThread *t = _PR_THREAD_PTR(q);
-
-        if (t->sleep < min_timeout) {
-            min_timeout = t->sleep;
-        }
-    }
-    if (min_timeout > ticks) {
-        min_timeout = ticks;
-    }
-
-    if (min_timeout == PR_INTERVAL_NO_TIMEOUT) {
-        tvp = NULL;
-    } else {
-        timeout.tv_sec = PR_IntervalToSeconds(min_timeout);
-        timeout.tv_usec = PR_IntervalToMicroseconds(min_timeout)
-            % PR_USEC_PER_SEC;
-        tvp = &timeout;
-    }
-
-    _PR_MD_IOQ_UNLOCK();
-    _MD_CHECK_FOR_EXIT();
-    /*
-     * check for i/o operations
-     */
-
-    nfd = _MD_SELECT(max_osfd, rp, wp, ep, tvp);
-
-    _MD_CHECK_FOR_EXIT();
-    _PR_MD_IOQ_LOCK();
-    /*
-    ** Notify monitors that are associated with the selected descriptors.
-    */
-    if (nfd > 0) {
-        q = _PR_IOQ(me->cpu).next;
-        _PR_IOQ_MAX_OSFD(me->cpu) = -1;
-        _PR_IOQ_TIMEOUT(me->cpu) = PR_INTERVAL_NO_TIMEOUT;
-        while (q != &_PR_IOQ(me->cpu)) {
-            PRPollQueue *pq = _PR_POLLQUEUE_PTR(q);
-            PRBool notify = PR_FALSE;
-            _PRWin16PollDesc *pds = pq->pds;
-            _PRWin16PollDesc *epds = pds + pq->npds;
-            PRInt32 pq_max_osfd = -1;
-
-            q = q->next;
-            for (; pds < epds; pds++) {
-                PRInt32 osfd = pds->osfd;
-                PRInt16 in_flags = pds->in_flags;
-                PRInt16 out_flags = 0;
-                PR_ASSERT(osfd >= 0 || in_flags == 0);
-                if ((in_flags & PR_POLL_READ) && FD_ISSET(osfd, rp)) {
-                    out_flags |= PR_POLL_READ;
-                }
-                if ((in_flags & PR_POLL_WRITE) && FD_ISSET(osfd, wp)) {
-                    out_flags |= PR_POLL_WRITE;
-                }
-                if ((in_flags & PR_POLL_EXCEPT) && FD_ISSET(osfd, ep)) {
-                    out_flags |= PR_POLL_EXCEPT;
-                }
-                pds->out_flags = out_flags;
-                if (out_flags) {
-                    notify = PR_TRUE;
-                }
-                if (osfd > pq_max_osfd) {
-                    pq_max_osfd = osfd;
-                }
-            }
-            if (notify == PR_TRUE) {
-                PRIntn pri;
-                PRThread *thred;
-
-                PR_REMOVE_LINK(&pq->links);
-                pq->on_ioq = PR_FALSE;
-
-                /*
-                 * Decrement the count of descriptors for each desciptor/event
-                 * because this I/O request is being removed from the
-                 * ioq
-                 */
-                pds = pq->pds;
-                for (; pds < epds; pds++) {
-                    PRInt32 osfd = pds->osfd;
-                    PRInt16 in_flags = pds->in_flags;
-                    PR_ASSERT(osfd >= 0 || in_flags == 0);
-                    if (in_flags & PR_POLL_READ) {
-                        if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                    }
-                    if (in_flags & PR_POLL_WRITE) {
-                        if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                    }
-                    if (in_flags & PR_POLL_EXCEPT) {
-                        if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                    }
-                }
-                 thred = pq->thr;
-                _PR_THREAD_LOCK(thred);
-                if (pq->thr->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-                    _PRCPU *cpu = thred->cpu;
-                    _PR_SLEEPQ_LOCK(pq->thr->cpu);
-                    _PR_DEL_SLEEPQ(pq->thr, PR_TRUE);
-                    _PR_SLEEPQ_UNLOCK(pq->thr->cpu);
-
-                    pri = pq->thr->priority;
-                    pq->thr->state = _PR_RUNNABLE;
-
-                    pq->thr->cpu = cpu;
-                    _PR_RUNQ_LOCK(cpu);
-                    _PR_ADD_RUNQ(pq->thr, cpu, pri);
-                    _PR_RUNQ_UNLOCK(cpu);
-                    if (_pr_md_idle_cpus > 1)
-                        _PR_MD_WAKEUP_WAITER(thred);
-                }
-                _PR_THREAD_UNLOCK(thred);
-            } else {
-                if (pq->timeout < _PR_IOQ_TIMEOUT(me->cpu))
-                    _PR_IOQ_TIMEOUT(me->cpu) = pq->timeout;
-                if (_PR_IOQ_MAX_OSFD(me->cpu) < pq_max_osfd)
-                    _PR_IOQ_MAX_OSFD(me->cpu) = pq_max_osfd;
-            }
-        }
-    } else if (nfd < 0) {
-        if ( WSAGetLastError() == WSAENOTSOCK )
-        {
-            FindBadFDs();
-        } else {
-            PR_LOG(_pr_io_lm, PR_LOG_MAX, ("select() failed with errno %d",
-                errno));
-        }
-    }
-    _PR_MD_IOQ_UNLOCK();
-    return(0);
-    
-} /* end _PR_MD_PAUSE_CPU() */
-
-
-/*
-** _MD_pr_poll() -- Implement MD polling
-**
-** The function was snatched (re-used) from the unix implementation.
-** 
-** The native thread stuff was deleted.
-** The pollqueue is instantiated on the mdthread structure
-** to keep the stack frame from being corrupted when this
-** thread is waiting on the poll.
-**
-*/
-extern PRInt32 
-_MD_PR_POLL(PRPollDesc *pds, PRIntn npds,
-                        PRIntervalTime timeout)
-{
-    PRPollDesc *pd, *epd;
-    PRInt32 n, err, pdcnt;
-    PRIntn is;
-    _PRWin16PollDesc *spds, *spd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRPollQueue *pq;
-
-    pq = &me->md.thr_pq;
-    
-    /*
-     * XXX
-     *   PRPollDesc has a PRFileDesc field, fd, while the IOQ
-     *   is a list of PRPollQueue structures, each of which contains
-     *   a _PRWin16PollDesc. A _PRWin16PollDesc struct contains
-     *   the OS file descriptor, osfd, and not a PRFileDesc.
-     *   So, we have allocate memory for _PRWin16PollDesc structures,
-     *   copy the flags information from the pds list and have pq
-     *   point to this list of _PRWin16PollDesc structures.
-     *
-     *   It would be better if the memory allocation can be avoided.
-     */
-
-    spds = (_PRWin16PollDesc*) PR_MALLOC(npds * sizeof(_PRWin16PollDesc));
-    if (!spds) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-           return -1;
-    }
-    spd = spds;
-
-    _PR_INTSOFF(is);
-    _PR_MD_IOQ_LOCK();
-       _PR_THREAD_LOCK(me);
-
-    if (_PR_PENDING_INTERRUPT(me)) {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        _PR_THREAD_UNLOCK(me);
-        _PR_MD_IOQ_UNLOCK();
-        PR_DELETE(spds);
-           return -1;
-    }
-
-    pdcnt = 0;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++) {
-        PRInt32 osfd;
-        PRInt16 in_flags = pd->in_flags;
-        PRFileDesc *bottom = pd->fd;
-
-        if ((NULL == bottom) || (in_flags == 0)) {
-            continue;
-        }
-        while (bottom->lower != NULL) {
-            bottom = bottom->lower;
-        }
-        osfd = bottom->secret->md.osfd;
-
-        PR_ASSERT(osfd >= 0 || in_flags == 0);
-
-        spd->osfd = osfd;
-        spd->in_flags = pd->in_flags;
-        spd++;
-        pdcnt++;
-
-        if (in_flags & PR_POLL_READ)  {
-            FD_SET(osfd, &_PR_FD_READ_SET(me->cpu));
-            _PR_FD_READ_CNT(me->cpu)[osfd]++;
-        }
-        if (in_flags & PR_POLL_WRITE) {
-            FD_SET(osfd, &_PR_FD_WRITE_SET(me->cpu));
-            (_PR_FD_WRITE_CNT(me->cpu))[osfd]++;
-        }
-        if (in_flags & PR_POLL_EXCEPT) {
-            FD_SET(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-            (_PR_FD_EXCEPTION_CNT(me->cpu))[osfd]++;
-        }
-        if (osfd > _PR_IOQ_MAX_OSFD(me->cpu))
-            _PR_IOQ_MAX_OSFD(me->cpu) = osfd;
-    }
-    if (timeout < _PR_IOQ_TIMEOUT(me->cpu))
-        _PR_IOQ_TIMEOUT(me->cpu) = timeout;
-
-
-    pq->pds = spds;
-    pq->npds = pdcnt;
-
-    pq->thr = me;
-    pq->on_ioq = PR_TRUE;
-    pq->timeout = timeout;
-    _PR_ADD_TO_IOQ((*pq), me->cpu);
-    _PR_SLEEPQ_LOCK(me->cpu);
-    _PR_ADD_SLEEPQ(me, timeout);
-    me->state = _PR_IO_WAIT;
-    me->io_pending = PR_TRUE;
-    me->io_suspended = PR_FALSE;
-    _PR_SLEEPQ_UNLOCK(me->cpu);
-    _PR_THREAD_UNLOCK(me);
-    _PR_MD_IOQ_UNLOCK();
-
-    _PR_MD_WAIT(me, timeout);
-
-    me->io_pending = PR_FALSE;
-    me->io_suspended = PR_FALSE;
-
-    /*
-     * Copy the out_flags from the _PRWin16PollDesc structures to the
-     * user's PRPollDesc structures and free the allocated memory
-     */
-    spd = spds;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++) {
-        if ((NULL == pd->fd) || (pd->in_flags == 0)) {
-            pd->out_flags = 0;
-            continue;
-        }
-        pd->out_flags = spd->out_flags;
-        spd++;
-    }
-    PR_DELETE(spds);
-
-    /*
-    ** If we timed out the pollq might still be on the ioq. Remove it
-    ** before continuing.
-    */
-    if (pq->on_ioq) {
-        _PR_INTSOFF(is);
-        _PR_MD_IOQ_LOCK();
-        /*
-         * Need to check pq.on_ioq again
-         */
-        if (pq->on_ioq == PR_TRUE) {
-            PR_REMOVE_LINK(&pq->links);
-            for (pd = pds, epd = pd + npds; pd < epd; pd++) {
-                PRInt32 osfd;
-                PRInt16 in_flags = pd->in_flags;
-                PRFileDesc *bottom = pd->fd;
-
-                if ((NULL == bottom) || (in_flags == 0)) {
-                    continue;
-                }
-                while (bottom->lower != NULL) {
-                    bottom = bottom->lower;
-                }
-                osfd = bottom->secret->md.osfd;
-                PR_ASSERT(osfd >= 0 || in_flags == 0);
-                if (in_flags & PR_POLL_READ)  {
-                    if (--(_PR_FD_READ_CNT(me->cpu))[osfd] == 0)
-                        FD_CLR(osfd, &_PR_FD_READ_SET(me->cpu));
-                }
-                if (in_flags & PR_POLL_WRITE) {
-                    if (--(_PR_FD_WRITE_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_WRITE_SET(me->cpu));
-                }
-                if (in_flags & PR_POLL_EXCEPT) {
-                    if (--(_PR_FD_EXCEPTION_CNT(me->cpu))[osfd] == 0)
-                            FD_CLR(osfd, &_PR_FD_EXCEPTION_SET(me->cpu));
-                }
-            }
-        }
-        _PR_MD_IOQ_UNLOCK();
-        _PR_INTSON(is);
-    }
-    if (_PR_PENDING_INTERRUPT(me)) {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-           return -1;
-    } else {
-        n = 0;
-        if (pq->on_ioq == PR_FALSE) {
-            /* Count the number of ready descriptors */
-            while (--npds >= 0) {
-            if (pds->out_flags) {
-                n++;
-            }
-                pds++;
-            }
-        }
-        return n;
-    }
-} /* end _MD_pr_poll() */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16stdio.c b/libs/js/nsprpub/pr/src/md/windows/w16stdio.c
deleted file mode 100644
index 52d34cfe72..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16stdio.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-/*
-** w16stdio.c -- Callback functions for Win16 stdio read/write.
-**
-**
-*/
-#include "primpl.h"
-
-/*
-** _PL_MDStdioWrite() -- Win16 hackery to get console output
-**
-** Returns: number of bytes written.
-**
-*/
-PRInt32
-_PL_W16StdioWrite( void *buf, PRInt32 amount )
-{
-    int   rc;
-    
-    rc = fputs( buf, stdout );
-    if ( rc == EOF )
-    {
-        // something about errno
-        return(PR_FAILURE);
-    }
-    return( strlen(buf));
-} /* end _PL_fputs() */
-
-/*
-** _PL_W16StdioRead() -- Win16 hackery to get console input
-**
-*/
-PRInt32
-_PL_W16StdioRead( void *buf, PRInt32 amount )
-{
-    char *bp;
-
-    bp = fgets( buf, (int) amount, stdin );
-    if ( bp == NULL )
-    {
-        // something about errno
-        return(PR_FAILURE);
-    }
-    
-    return( strlen(buf));
-} /* end _PL_fgets() */
-/* --- end w16stdio.c --- */
-
-/*
-** Wrappers, linked into the client, that call
-** functions in LibC
-**
-*/
-
-/*
-** _PL_W16CallBackPuts() -- Wrapper for puts()
-**
-*/
-int PR_CALLBACK _PL_W16CallBackPuts( const char *outputString )
-{
-    return( puts( outputString ));
-} /* end _PL_W16CallBackPuts()  */    
-
-/*
-** _PL_W16CallBackStrftime() -- Wrapper for strftime()
-**
-*/
-size_t PR_CALLBACK _PL_W16CallBackStrftime( 
-    char *s, 
-    size_t len, 
-    const char *fmt,
-    const struct tm *p )
-{
-    return( strftime( s, len, fmt, p ));
-} /* end _PL_W16CallBackStrftime()  */    
-
-/*
-** _PL_W16CallBackMalloc() -- Wrapper for malloc()
-**
-*/
-void * PR_CALLBACK _PL_W16CallBackMalloc( size_t size )
-{
-    return( malloc( size ));
-} /* end _PL_W16CallBackMalloc()  */    
-
-/*
-** _PL_W16CallBackCalloc() -- Wrapper for calloc()
-**
-*/
-void * PR_CALLBACK _PL_W16CallBackCalloc( size_t n, size_t size )
-{
-    return( calloc( n, size ));
-} /* end _PL_W16CallBackCalloc()  */    
-
-/*
-** _PL_W16CallBackRealloc() -- Wrapper for realloc()
-**
-*/
-void * PR_CALLBACK _PL_W16CallBackRealloc( 
-    void *old_blk, 
-    size_t size )
-{
-    return( realloc( old_blk, size ));
-} /* end _PL_W16CallBackRealloc()  */
-
-/*
-** _PL_W16CallBackFree() -- Wrapper for free()
-**
-*/
-void PR_CALLBACK _PL_W16CallBackFree( void *ptr )
-{
-    free( ptr );
-    return;
-} /* end _PL_W16CallBackFree()  */
-
-/*
-** _PL_W16CallBackGetenv() -- Wrapper for getenv()
-**
-*/
-void * PR_CALLBACK _PL_W16CallBackGetenv( const char *name )
-{
-    return( getenv( name ));
-} /* end _PL_W16CallBackGetenv  */
-
-
-/*
-** _PL_W16CallBackPutenv() -- Wrapper for putenv()
-**
-*/
-int PR_CALLBACK _PL_W16CallBackPutenv( const char *assoc )
-{
-    return( putenv( assoc ));
-} /* end _PL_W16CallBackGetenv  */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w16thred.c b/libs/js/nsprpub/pr/src/md/windows/w16thred.c
deleted file mode 100644
index 85531318b8..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w16thred.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <sys/timeb.h>
-#include <stdio.h>
-
-/*
-** DispatchTrace -- define a thread dispatch trace entry
-**
-** The DispatchTrace oject(s) are instantiated in a single
-** array. Think of the array as a push-down stack; entry
-** zero is the most recent, entry one the next most recent, etc.
-** For each time PR_MD_RESTORE_CONTEXT() is called, the array
-** is Pushed down and entry zero is overwritten with data
-** for the newly dispatched thread.
-**
-** Function TraceDispatch() manages the DispatchTrace array.
-**
-*/
-typedef struct DispatchTrace
-{
-    PRThread *          thread;
-    PRUint32            state;
-    PRInt16             mdThreadNumber;
-    PRInt16             unused;
-    PRThreadPriority    priority;
-    
-} DispatchTrace, *DispatchTracePtr ;
-
-static void TraceDispatch( PRThread *thread );
-
-
-PRThread                *_pr_primordialThread;
-
-/*
-** Note: the static variables must be on the data-segment because
-** the stack is destroyed during shadow-stack copy operations.
-**
-*/
-static char * pSource;          /* ptr to sourc of a "shadow-stack" copy */
-static char * pTarget;          /* ptr to target of a "shadow-stack" copy */
-static int   cxByteCount;       /* number of bytes for "shadow-stack" copy */
-static int   bytesMoved;        /* instrumentation: WRT "shadow-stack" copy */
-static FILE *    file1 = 0;     /* instrumentation: WRT debug */
-
-#define NUM_DISPATCHTRACE_OBJECTS  24
-static DispatchTrace dt[NUM_DISPATCHTRACE_OBJECTS] = {0}; /* instrumentation: WRT dispatch */
-static PRUint32 dispatchCount = 0;  /* instrumentation: number of thread dispatches */
-
-static int OldPriorityOfPrimaryThread   = -1;
-static int TimeSlicesOnNonPrimaryThread =  0;
-static PRUint32 threadNumber = 1;   /* Instrumentation: monotonically increasing number */
-
-
-
-/*
-** _PR_MD_FINAL_INIT() -- Final MD Initialization
-**
-** Poultry Problems! ... The stack, as allocated by PR_NewStack()
-** is called from here, late in initialization, because PR_NewStack()
-** requires lots of things working. When some elements of the
-** primordial thread are created, early in initialization, the
-** shadow stack is not one of these things. The "shadow stack" is
-** created here, late in initiailization using PR_NewStack(), to
-** ensure consistency in creation of the related objects.
-** 
-** A new ThreadStack, and all its affiliated structures, is allocated
-** via the call to PR_NewStack(). The PRThread structure in the
-** new stack is ignored; the old PRThread structure is used (why?).
-** The old PRThreadStack structure is abandoned.
-**
-*/
-void
-_PR_MD_FINAL_INIT()
-{
-    PRThreadStack *     stack = 0;
-    PRInt32             stacksize = 0;
-    PRThread *          me = _PR_MD_CURRENT_THREAD();
-    
-    _PR_ADJUST_STACKSIZE( stacksize );
-    stack = _PR_NewStack( stacksize );
-    
-    me->stack = stack;
-    stack->thr = me;
-    
-    return;
-} /* --- end _PR_MD_FINAL_INIT() --- */
-
-
-void
-_MD_INIT_RUNNING_CPU( struct _PRCPU *cpu )
-{
-	PR_INIT_CLIST(&(cpu->md.ioQ));
-	cpu->md.ioq_max_osfd = -1;
-	cpu->md.ioq_timeout = PR_INTERVAL_NO_TIMEOUT;
-}    
-
-
-void
-_PR_MD_YIELD( void )
-{
-    PR_ASSERT(0);
-}
-
-/*
-** _PR_MD_INIT_STACK() -- Win16 specific Stack initialization.
-**
-**
-*/
-
-void
-_PR_MD_INIT_STACK( PRThreadStack *ts, PRIntn redzone )
-{
-    ts->md.stackTop = ts->stackTop - sizeof(PRThread);
-    ts->md.cxByteCount = 0;
-    
-    return;
-} /* --- end _PR_MD_INIT_STACK() --- */
-
-/*
-**  _PR_MD_INIT_THREAD() -- Win16 specific Thread initialization.
-**
-*/
-PRStatus
-_PR_MD_INIT_THREAD(PRThread *thread)
-{
-    if ( thread->flags & _PR_PRIMORDIAL)
-    {
-        _pr_primordialThread = thread;
-        thread->md.threadNumber = 1;
-    }
-    else
-    {
-        thread->md.threadNumber = ++threadNumber;
-    }
-
-    thread->md.magic = _MD_MAGIC_THREAD;
-    strcpy( thread->md.guardBand, "GuardBand" );
-    
-    return PR_SUCCESS;
-}
-
-
-PRStatus
-_PR_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    _MD_SWITCH_CONTEXT( thread );
-    
-    return( PR_SUCCESS );
-}
-
-void *PR_W16GetExceptionContext(void)
-{
-    return _MD_CURRENT_THREAD()->md.exceptionContext;
-}
-
-void
-PR_W16SetExceptionContext(void *context)
-{
-    _MD_CURRENT_THREAD()->md.exceptionContext = context;
-}
-
-
-
-
-/*
-** _MD_RESTORE_CONTEXT() -- Resume execution of thread 't'.
-**
-** Win16 threading is based on the NSPR 2.0 general model of
-** user threads. It differs from the general model in that a 
-** single "real" stack segment is used for execution of all 
-** threads. The context of the suspended threads is preserved
-** in the md.context [and related members] of the PRThread 
-** structure. The stack context of the suspended thread is
-** preserved in a "shadow stack" object.
-**
-** _MD_RESTORE_CONTEXT() implements most of the thread switching
-** for NSPR's implementation of Win16 theads.
-**
-** Operations Notes:
-**
-** Function PR_NewStack() in prustack.c allocates a new
-** PRThreadStack, PRStack, PRSegment, and a "shadow" stack
-** for a thread. These structures are wired together to
-** form the basis of Win16 threads. The thread and shadow
-** stack structures are created as part of PR_CreateThread().
-** 
-** Note! Some special "magic" is applied to the "primordial"
-** thread. The physical layout of the PRThread, PRThreadStack,
-** shadow stack, ... is somewhat different. Watch yourself when
-** mucking around with it. ... See _PR_MD_FINAL_INIT() for most
-** of the special treatment of the primordial thread.
-**
-** Function _PR_MD_INIT_STACK() initializes the value of
-** PRThreadStack member md.cxByteCount to zero; there
-** is no context to be restored for a thread's initial
-** dispatch. The value of member md.stackTop is set to
-** point to the highest usable address on the shadow stack.
-** This point corresponds to _pr_top_of_task_stack on the
-** system's operating stack.
-**
-** _pr_top_of_task_stack points to a place on the system stack
-** considered to be "close to the top". Stack context is preserved
-** relative to this point.
-**
-** Reminder: In x86 architecture, the stack grows "down".
-** That is: the stack pointer (SP register) is decremented
-** to push objects onto the stack or when a call is made.
-** 
-** Function _PR_MD_WAIT() invokes macro _MD_SWITCH_CONTEXT();
-** this causes the hardware registers to be preserved in a
-** CATCHBUF structure using function Catch() [see _win16.h], 
-** then calls PR_Schedule() to select a new thread for dispatch. 
-** PR_Schedule() calls _MD_RESTORE_CONTEXT() to cause the thread 
-** being suspended's stack to be preserved, to restore the 
-** stack of the to-be-dispactched thread, and to restore the 
-** to-be-dispactched thread's hardware registers.
-**
-** At the moment _PR_MD_RESTORE_CONTEXT() is called, the stack
-** pointer (SP) is less than the reference pointer
-** _pr_top_of_task_stack. The distance difference between the SP and
-** _pr_top_of_task_stack is the amount of stack that must be preserved.
-** This value, cxByteCount, is calculated then preserved in the
-** PRThreadStack.md.cxByteCount for later use (size of stack
-** context to restore) when this thread is dispatched again.
-** 
-** A C language for() loop is used to copy, byte-by-byte, the
-** stack data being preserved starting at the "address of t"
-** [Note: 't' is the argument passed to _PR_MD_RESTORE_CONTEXT()]
-** for the length of cxByteCount.
-**
-** variables pSource and pTarget are the calculated source and
-** destination pointers for the stack copy operation. These
-** variables are static scope because they cannot be instantiated
-** on the stack itself, since the stack is clobbered by restoring
-** the to-be-dispatched thread's stack context.
-**
-** After preserving the suspended thread's stack and architectural
-** context, the to-be-dispatched thread's stack context is copied
-** from its shadow stack to the system operational stack. The copy
-** is done in a small fragment of in-line assembly language. Note:
-** In NSPR 1.0, a while() loop was used to do the copy; when compiled
-** with the MS C 1.52c compiler, the short while loop used no
-** stack variables. The Watcom compiler, specified for use on NSPR 2.0,
-** uses stack variables to implement the same while loop. This is
-** a no-no! The copy operation clobbers these variables making the
-** results of the copy ... unpredictable ... So, a short piece of
-** inline assembly language is used to effect the copy.
-**
-** Following the restoration of the to-be-dispatched thread's
-** stack context, another short inline piece of assemble language
-** is used to set the SP register to correspond to what it was
-** when the to-be-dispatched thread was suspended. This value
-** uses the thread's stack->md.cxByteCount as a negative offset 
-** from _pr_top_of_task_stack as the new value of SP.
-**
-** Finally, Function Throw() is called to restore the architectural
-** context of the to-be-dispatched thread.
-**
-** At this point, the newly dispatched thread appears to resume
-** execution following the _PR_MD_SWITCH_CONTEXT() macro.
-**
-** OK, this ain't rocket-science, but it can confuse you easily.
-** If you have to work on this stuff, please take the time to
-** draw, on paper, the structures (PRThread, PRThreadStack,
-** PRSegment, the "shadow stack", the system stack and the related
-** global variables). Hand step it thru the debugger to make sure
-** you understand it very well before making any changes. ...
-** YMMV.
-** 
-*/
-void _MD_RESTORE_CONTEXT(PRThread *t)
-{
-    dispatchCount++;
-    TraceDispatch( t );
-    /*	
-    **	This is a good opportunity to make sure that the main
-    **	mozilla thread actually gets some time.  If interrupts
-    **	are on, then we know it is safe to check if the main
-    **	thread is being starved.  If moz has not been scheduled
-    **	for a long time, then then temporarily bump the fe priority 
-    **	up so that it gets to run at least one. 
-    */	
-// #if 0 // lth. condition off for debug.
-    if (_pr_primordialThread == t) {
-        if (OldPriorityOfPrimaryThread != -1) {
-            PR_SetThreadPriority(_pr_primordialThread, OldPriorityOfPrimaryThread);
-            OldPriorityOfPrimaryThread = -1;
-        }
-        TimeSlicesOnNonPrimaryThread = 0;
-    } else {
-        TimeSlicesOnNonPrimaryThread++;
-    }
-
-    if ((TimeSlicesOnNonPrimaryThread >= 20) && (OldPriorityOfPrimaryThread == -1)) {
-        OldPriorityOfPrimaryThread = PR_GetThreadPriority(_pr_primordialThread);
-        PR_SetThreadPriority(_pr_primordialThread, 31);
-        TimeSlicesOnNonPrimaryThread = 0;
-    }
-// #endif
-    /*
-    ** Save the Task Stack into the "shadow stack" of the current thread
-    */
-    cxByteCount  = (int) ((PRUint32) _pr_top_of_task_stack - (PRUint32) &t );
-    pSource      = (char *) &t;
-    pTarget      = (char *)((PRUint32)_pr_currentThread->stack->md.stackTop 
-                            - (PRUint32)cxByteCount );
-    _pr_currentThread->stack->md.cxByteCount = cxByteCount;
-    
-    for( bytesMoved = 0; bytesMoved < cxByteCount; bytesMoved++ )
-        *(pTarget + bytesMoved ) = *(pSource + bytesMoved );
-    
-    /* Mark the new thread as the current thread */
-    _pr_currentThread = t;
-
-    /*
-    ** Now copy the "shadow stack" of the new thread into the Task Stack
-    **
-    ** REMEMBER:
-    **    After the stack has been copied, ALL local variables in this function
-    **    are invalid !!
-    */
-    cxByteCount  = t->stack->md.cxByteCount;
-    pSource      = t->stack->md.stackTop - cxByteCount;
-    pTarget      = _pr_top_of_task_stack - cxByteCount;
-    
-    errno = (_pr_currentThread)->md.errcode;
-    
-    __asm 
-    {
-        mov cx, cxByteCount
-        mov si, WORD PTR [pSource]
-        mov di, WORD PTR [pTarget]
-        mov ax, WORD PTR [pTarget + 2]
-        mov es, ax
-        mov ax, WORD PTR [pSource + 2]
-        mov bx, ds
-        mov ds, ax
-        rep movsb
-        mov ds, bx
-    }
-
-    /* 
-    ** IMPORTANT:
-    ** ----------
-    ** SS:SP is now invalid :-( This means that all local variables and
-    ** function arguments are invalid and NO function calls can be
-    ** made !!! We must fix up SS:SP so that function calls can safely
-    ** be made...
-    */
-
-    __asm {
-        mov     ax, WORD PTR [_pr_top_of_task_stack]
-        sub     ax, cxByteCount
-        mov     sp, ax
-    };
-
-    /*
-    ** Resume execution of thread: t by restoring the thread's context.
-    **
-    */
-    Throw((_pr_currentThread)->md.context, 1);
-} /* --- end MD_RESTORE_CONTEXT() --- */
-
-
-static void TraceDispatch( PRThread *thread )
-{
-    int i;
-    
-    /*
-    ** push all DispatchTrace objects to down one slot.
-    ** Note: the last entry is lost; last-1 becomes last, etc.
-    */
-    for( i = NUM_DISPATCHTRACE_OBJECTS -2; i >= 0; i-- )
-    {
-        dt[i +1] = dt[i];
-    }
-    
-    /*
-    ** Build dt[0] from t
-    */
-    dt->thread = thread;
-    dt->state = thread->state;
-    dt->mdThreadNumber = thread->md.threadNumber;
-    dt->priority = thread->priority;
-    
-    return;
-} /* --- end TraceDispatch() --- */
-
-
-/* $$ end W16thred.c */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c b/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c
deleted file mode 100644
index 82201a804c..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w32ipcsem.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: w32ipcsem.c
- * Description: implements named semaphores for NT and WIN95.
- */
-
-#include "primpl.h"
-
-/*
- * NSPR-to-NT access right mapping table for semaphore objects.
- *
- * The SYNCHRONIZE access is required by WaitForSingleObject.
- * The SEMAPHORE_MODIFY_STATE access is required by ReleaseSemaphore.
- * The OR of these three access masks must equal SEMAPHORE_ALL_ACCESS.
- * This is because if a semaphore object with the specified name
- * exists, CreateSemaphore requests SEMAPHORE_ALL_ACCESS access to
- * the existing object.
- */
-static DWORD semAccessTable[] = {
-    STANDARD_RIGHTS_REQUIRED|0x1, /* read (0x1 is "query state") */
-    STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|SEMAPHORE_MODIFY_STATE, /* write */
-    0 /* execute */
-};
-
-#ifndef _PR_GLOBAL_THREADS_ONLY
-
-/*
- * A fiber cannot call WaitForSingleObject because that
- * will block the other fibers running on the same thread.
- * If a fiber needs to wait on a (semaphore) handle, we
- * create a native thread to call WaitForSingleObject and
- * have the fiber join the native thread.
- */
-
-/*
- * Arguments, return value, and error code for WaitForSingleObject
- */
-struct WaitSingleArg {
-    HANDLE handle;
-    DWORD timeout;
-    DWORD rv;
-    DWORD error;
-};
-
-static void WaitSingleThread(void *arg)
-{
-    struct WaitSingleArg *warg = (struct WaitSingleArg *) arg;
-
-    warg->rv = WaitForSingleObject(warg->handle, warg->timeout);
-    if (warg->rv == WAIT_FAILED) {
-        warg->error = GetLastError();
-    }
-}
-
-static DWORD FiberSafeWaitForSingleObject(
-    HANDLE hHandle,
-    DWORD dwMilliseconds
-)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (_PR_IS_NATIVE_THREAD(me)) {
-        return WaitForSingleObject(hHandle, dwMilliseconds);
-    } else {
-        PRThread *waitThread;
-        struct WaitSingleArg warg;
-        PRStatus rv;
-
-        warg.handle = hHandle;
-        warg.timeout = dwMilliseconds;
-        waitThread = PR_CreateThread(
-            PR_USER_THREAD, WaitSingleThread, &warg,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (waitThread == NULL) {
-            return WAIT_FAILED;
-        }
-
-        rv = PR_JoinThread(waitThread);
-        PR_ASSERT(rv == PR_SUCCESS);
-        if (rv == PR_FAILURE) {
-            return WAIT_FAILED;
-        }
-        if (warg.rv == WAIT_FAILED) {
-            SetLastError(warg.error);
-        }
-        return warg.rv;
-    }
-}
-
-#endif /* !_PR_GLOBAL_THREADS_ONLY */
-
-PRSem *_PR_MD_OPEN_SEMAPHORE(
-    const char *osname, PRIntn flags, PRIntn mode, PRUintn value)
-{
-    PRSem *sem;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    sem = PR_NEW(PRSem);
-    if (sem == NULL) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    if (flags & PR_SEM_CREATE) {
-        if (_PR_NT_MakeSecurityDescriptorACL(mode, semAccessTable,
-                &pSD, &pACL) == PR_SUCCESS) {
-            sa.nLength = sizeof(sa);
-            sa.lpSecurityDescriptor = pSD;
-            sa.bInheritHandle = FALSE;
-            lpSA = &sa;
-        }
-        sem->sem = CreateSemaphore(lpSA, value, 0x7fffffff, osname);
-        if (lpSA != NULL) {
-            _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-        }
-        if (sem->sem == NULL) {
-            _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-            PR_DELETE(sem);
-            return NULL;
-        }
-        if ((flags & PR_SEM_EXCL) && (GetLastError() == ERROR_ALREADY_EXISTS)) {
-            PR_SetError(PR_FILE_EXISTS_ERROR, ERROR_ALREADY_EXISTS);
-            CloseHandle(sem->sem);
-            PR_DELETE(sem);
-            return NULL;
-        }
-    } else {
-        sem->sem = OpenSemaphore(
-                SEMAPHORE_MODIFY_STATE|SYNCHRONIZE, FALSE, osname);
-        if (sem->sem == NULL) {
-            DWORD err = GetLastError();
-
-            /*
-             * If we open a nonexistent named semaphore, NT
-             * returns ERROR_FILE_NOT_FOUND, while Win95
-             * returns ERROR_INVALID_NAME
-             */
-            if (err == ERROR_INVALID_NAME) {
-                PR_SetError(PR_FILE_NOT_FOUND_ERROR, err);
-            } else {
-                _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-            }
-            PR_DELETE(sem);
-            return NULL;
-        }
-    }
-    return sem;
-}
-
-PRStatus _PR_MD_WAIT_SEMAPHORE(PRSem *sem)
-{
-    DWORD rv;
-
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    rv = WaitForSingleObject(sem->sem, INFINITE);
-#else
-    rv = FiberSafeWaitForSingleObject(sem->sem, INFINITE);
-#endif
-    PR_ASSERT(rv == WAIT_FAILED || rv == WAIT_OBJECT_0);
-    if (rv == WAIT_FAILED) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    if (rv != WAIT_OBJECT_0) {
-        /* Should not happen */
-        PR_SetError(PR_UNKNOWN_ERROR, 0);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus _PR_MD_POST_SEMAPHORE(PRSem *sem)
-{
-    if (ReleaseSemaphore(sem->sem, 1, NULL) == FALSE) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus _PR_MD_CLOSE_SEMAPHORE(PRSem *sem)
-{
-    if (CloseHandle(sem->sem) == FALSE) {
-        _PR_MD_MAP_CLOSE_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    PR_DELETE(sem);
-    return PR_SUCCESS;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/w32poll.c b/libs/js/nsprpub/pr/src/md/windows/w32poll.c
deleted file mode 100644
index 0bf5203a56..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w32poll.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This file implements _PR_MD_PR_POLL for Win32.
- */
-
-/* The default value of FD_SETSIZE is 64. */
-#define FD_SETSIZE 1024
-
-#include "primpl.h"
-
-#if !defined(_PR_GLOBAL_THREADS_ONLY)
-
-struct select_data_s {
-    PRInt32 status;
-    PRInt32 error;
-    fd_set *rd, *wt, *ex;
-    const struct timeval *tv;
-};
-
-static void
-_PR_MD_select_thread(void *cdata)
-{
-    struct select_data_s *cd = (struct select_data_s *)cdata;
-
-    cd->status = select(0, cd->rd, cd->wt, cd->ex, cd->tv);
-
-    if (cd->status == SOCKET_ERROR) {
-        cd->error = WSAGetLastError();
-    }
-}
-
-int _PR_NTFiberSafeSelect(
-    int nfds,
-    fd_set *readfds,
-    fd_set *writefds,
-    fd_set *exceptfds,
-    const struct timeval *timeout)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    int ready;
-
-    if (_PR_IS_NATIVE_THREAD(me)) {
-        ready = _MD_SELECT(nfds, readfds, writefds, exceptfds, timeout);
-    }
-    else
-    {
-        /*
-        ** Creating a new thread on each call!!
-        ** I guess web server doesn't use non-block I/O.
-        */
-        PRThread *selectThread;
-        struct select_data_s data;
-        data.status = 0;
-        data.error = 0;
-        data.rd = readfds;
-        data.wt = writefds;
-        data.ex = exceptfds;
-        data.tv = timeout;
-
-        selectThread = PR_CreateThread(
-            PR_USER_THREAD, _PR_MD_select_thread, &data,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (selectThread == NULL) return -1;
-
-        PR_JoinThread(selectThread);
-        ready = data.status;
-        if (ready == SOCKET_ERROR) WSASetLastError(data.error);
-    }
-    return ready;
-}
-
-#endif /* !defined(_PR_GLOBAL_THREADS_ONLY) */
-
-PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    int ready, err;
-    fd_set rd, wt, ex;
-    fd_set *rdp, *wtp, *exp;
-    int nrd, nwt, nex;
-    PRFileDesc *bottom;
-    PRPollDesc *pd, *epd;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    struct timeval tv, *tvp = NULL;
-
-    if (_PR_PENDING_INTERRUPT(me))
-    {
-        me->flags &= ~_PR_INTERRUPT;
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        return -1;
-    }
-
-    /*
-    ** Is it an empty set? If so, just sleep for the timeout and return
-    */
-    if (0 == npds)
-    {
-        PR_Sleep(timeout);
-        return 0;
-    }
-
-    nrd = nwt = nex = 0;
-    FD_ZERO(&rd);
-    FD_ZERO(&wt);
-    FD_ZERO(&ex);
-
-    ready = 0;
-    for (pd = pds, epd = pd + npds; pd < epd; pd++)
-    {
-        SOCKET osfd;
-        PRInt16 in_flags_read = 0, in_flags_write = 0;
-        PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-        if ((NULL != pd->fd) && (0 != pd->in_flags))
-        {
-            if (pd->in_flags & PR_POLL_READ)
-            {
-                in_flags_read = (pd->fd->methods->poll)(
-                    pd->fd, (PRInt16)(pd->in_flags & ~PR_POLL_WRITE),
-                    &out_flags_read);
-            }
-            if (pd->in_flags & PR_POLL_WRITE)
-            {
-                in_flags_write = (pd->fd->methods->poll)(
-                    pd->fd, (PRInt16)(pd->in_flags & ~PR_POLL_READ),
-                    &out_flags_write);
-            }
-            if ((0 != (in_flags_read & out_flags_read))
-            || (0 != (in_flags_write & out_flags_write)))
-            {
-                /* this one's ready right now (buffered input) */
-                if (0 == ready)
-                {
-                    /*
-                     * We will have to return without calling the
-                     * system poll/select function.  So zero the
-                     * out_flags fields of all the poll descriptors
-                     * before this one.
-                     */
-                    PRPollDesc *prev;
-                    for (prev = pds; prev < pd; prev++)
-                    {
-                        prev->out_flags = 0;
-                    }
-                }
-                ready += 1;
-                pd->out_flags = out_flags_read | out_flags_write;
-            }
-            else
-            {
-                pd->out_flags = 0;  /* pre-condition */
-                /* make sure this is an NSPR supported stack */
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                if ((NULL != bottom)
-                && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                {
-                    if (0 == ready)
-                    {
-                        osfd = (SOCKET) bottom->secret->md.osfd;
-                        if (in_flags_read & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_READ;
-                            FD_SET(osfd, &rd);
-                            nrd++;
-                        }
-                        if (in_flags_read & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_READ_SYS_WRITE;
-                            FD_SET(osfd, &wt);
-                            nwt++;
-                        }
-                        if (in_flags_write & PR_POLL_READ)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_READ;
-                            FD_SET(osfd, &rd);
-                            nrd++;
-                        }
-                        if (in_flags_write & PR_POLL_WRITE)
-                        {
-                            pd->out_flags |= _PR_POLL_WRITE_SYS_WRITE;
-                            FD_SET(osfd, &wt);
-                            nwt++;
-                        }
-                        if (pd->in_flags & PR_POLL_EXCEPT) {
-                            FD_SET(osfd, &ex);
-                            nex++;
-                        }
-                    }
-                }
-                else
-                {
-                    if (0 == ready)
-                    {
-                        PRPollDesc *prev;
-                        for (prev = pds; prev < pd; prev++)
-                        {
-                            prev->out_flags = 0;
-                        }
-                    }
-                    ready += 1;  /* this will cause an abrupt return */
-                    pd->out_flags = PR_POLL_NVAL;  /* bogii */
-                }
-            }
-        }
-        else
-        {
-            pd->out_flags = 0;
-        }
-    }
-
-    if (0 != ready) return ready;  /* no need to block */
-
-    if ((nrd > FD_SETSIZE) || (nwt > FD_SETSIZE) || (nex > FD_SETSIZE)) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-
-    rdp = (0 == nrd) ? NULL : &rd;
-    wtp = (0 == nwt) ? NULL : &wt;
-    exp = (0 == nex) ? NULL : &ex;
-
-    if ((NULL == rdp) && (NULL == wtp) && (NULL == exp)) {
-        PR_Sleep(timeout);
-        return 0;
-    }
-
-    if (timeout != PR_INTERVAL_NO_TIMEOUT)
-    {
-        PRInt32 ticksPerSecond = PR_TicksPerSecond();
-        tv.tv_sec = timeout / ticksPerSecond;
-        tv.tv_usec = PR_IntervalToMicroseconds( timeout % ticksPerSecond );
-        tvp = &tv;
-    }
-
-#if defined(_PR_GLOBAL_THREADS_ONLY)
-    ready = _MD_SELECT(0, rdp, wtp, exp, tvp);
-#else
-    ready = _PR_NTFiberSafeSelect(0, rdp, wtp, exp, tvp);
-#endif
-
-    /*
-    ** Now to unravel the select sets back into the client's poll
-    ** descriptor list. Is this possibly an area for pissing away
-    ** a few cycles or what?
-    */
-    if (ready > 0)
-    {
-        ready = 0;
-        for (pd = pds, epd = pd + npds; pd < epd; pd++)
-        {
-            PRInt16 out_flags = 0;
-            if ((NULL != pd->fd) && (0 != pd->in_flags))
-            {
-                SOCKET osfd;
-                bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                PR_ASSERT(NULL != bottom);
-
-                osfd = (SOCKET) bottom->secret->md.osfd;
-
-                if (FD_ISSET(osfd, &rd))
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_READ)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-                if (FD_ISSET(osfd, &wt))
-                {
-                    if (pd->out_flags & _PR_POLL_READ_SYS_WRITE)
-                        out_flags |= PR_POLL_READ;
-                    if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
-                        out_flags |= PR_POLL_WRITE;
-                } 
-                if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT;
-            }
-            pd->out_flags = out_flags;
-            if (out_flags) ready++;
-        }
-        PR_ASSERT(ready > 0);
-    }
-    else if (ready == SOCKET_ERROR)
-    {
-        err = WSAGetLastError();
-        if (err == WSAENOTSOCK)
-        {
-            /* Find the bad fds */
-            int optval;
-            int optlen = sizeof(optval);
-            ready = 0;
-            for (pd = pds, epd = pd + npds; pd < epd; pd++)
-            {
-                pd->out_flags = 0;
-                if ((NULL != pd->fd) && (0 != pd->in_flags))
-                {
-                    bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-                    if (getsockopt(bottom->secret->md.osfd, SOL_SOCKET,
-                        SO_TYPE, (char *) &optval, &optlen) == -1)
-                    {
-                        PR_ASSERT(WSAGetLastError() == WSAENOTSOCK);
-                        if (WSAGetLastError() == WSAENOTSOCK)
-                        {
-                            pd->out_flags = PR_POLL_NVAL;
-                            ready++;
-                        }
-                    }
-                }
-            }
-            PR_ASSERT(ready > 0);
-        }
-        else _PR_MD_MAP_SELECT_ERROR(err);
-    }
-
-    return ready;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/w32rng.c b/libs/js/nsprpub/pr/src/md/windows/w32rng.c
deleted file mode 100644
index 5232b5fae8..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w32rng.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <windows.h>
-#include <time.h>
-#include <io.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <primpl.h>
-
-static BOOL
-CurrentClockTickTime(LPDWORD lpdwHigh, LPDWORD lpdwLow)
-{
-    LARGE_INTEGER   liCount;
-
-    if (!QueryPerformanceCounter(&liCount))
-        return FALSE;
-
-    *lpdwHigh = liCount.u.HighPart;
-    *lpdwLow = liCount.u.LowPart;
-    return TRUE;
-}
-
-extern PRSize _PR_MD_GetRandomNoise( void *buf, PRSize size )
-{
-    DWORD   dwHigh, dwLow, dwVal;
-    size_t  n = 0;
-    size_t  nBytes;
-    time_t  sTime;
-
-    if (size <= 0)
-        return 0;
-
-    CurrentClockTickTime(&dwHigh, &dwLow);
-
-    // get the maximally changing bits first
-    nBytes = sizeof(dwLow) > size ? size : sizeof(dwLow);
-    memcpy((char *)buf, &dwLow, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-        return n;
-
-    nBytes = sizeof(dwHigh) > size ? size : sizeof(dwHigh);
-    memcpy(((char *)buf) + n, &dwHigh, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-        return n;
-
-    // get the number of milliseconds that have elapsed since Windows started
-    dwVal = GetTickCount();
-
-    nBytes = sizeof(dwVal) > size ? size : sizeof(dwVal);
-    memcpy(((char *)buf) + n, &dwVal, nBytes);
-    n += nBytes;
-    size -= nBytes;
-
-    if (size <= 0)
-        return n;
-
-    // get the time in seconds since midnight Jan 1, 1970
-    time(&sTime);
-    nBytes = sizeof(sTime) > size ? size : sizeof(sTime);
-    memcpy(((char *)buf) + n, &sTime, nBytes);
-    n += nBytes;
-
-    return n;
-}
-
diff --git a/libs/js/nsprpub/pr/src/md/windows/w32shm.c b/libs/js/nsprpub/pr/src/md/windows/w32shm.c
deleted file mode 100644
index 136b20d2de..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w32shm.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <private/primpl.h>       
-#include <string.h>
-#include <prshm.h>
-#include <prerr.h>
-#include <prmem.h>
-
-#if defined(PR_HAVE_WIN32_NAMED_SHARED_MEMORY)
-
-extern PRLogModuleInfo *_pr_shm_lm;
-
-/*
- * NSPR-to-NT access right mapping table for file-mapping objects.
- *
- * The OR of these three access masks must equal FILE_MAP_ALL_ACCESS.
- * This is because if a file-mapping object with the specified name
- * exists, CreateFileMapping requests full access to the existing
- * object.
- */
-static DWORD filemapAccessTable[] = {
-    FILE_MAP_ALL_ACCESS & ~FILE_MAP_WRITE, /* read */
-    FILE_MAP_ALL_ACCESS & ~FILE_MAP_READ, /* write */ 
-    0  /* execute */
-};
-
-extern PRSharedMemory * _MD_OpenSharedMemory( 
-        const char *name,
-        PRSize      size,
-        PRIntn      flags,
-        PRIntn      mode
-)
-{
-    char        ipcname[PR_IPC_NAME_SIZE];
-    PRStatus    rc = PR_SUCCESS;
-    DWORD dwHi, dwLo;
-    PRSharedMemory *shm;
-    DWORD flProtect = ( PAGE_READWRITE );
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    rc = _PR_MakeNativeIPCName( name, ipcname, PR_IPC_NAME_SIZE, _PRIPCShm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_SetError(PR_UNKNOWN_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: name is invalid")); 
-        return(NULL);
-    }
-
-    shm = PR_NEWZAP( PRSharedMemory );
-    if ( NULL == shm ) 
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New PRSharedMemory out of memory")); 
-        return(NULL);
-    }
-
-    shm->ipcname = PR_MALLOC( (PRUint32) (strlen( ipcname ) + 1) );
-    if ( NULL == shm->ipcname )
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0 );
-        PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, ( "PR_OpenSharedMemory: New shm->ipcname out of memory")); 
-        PR_DELETE(shm);
-        return(NULL);
-    }
-
-    /* copy args to struct */
-    strcpy( shm->ipcname, ipcname );
-    shm->size = size; 
-    shm->mode = mode;
-    shm->flags = flags;
-    shm->ident = _PR_SHM_IDENT;
-
-    if (flags & PR_SHM_CREATE ) {
-        dwHi = (DWORD) (((PRUint64) shm->size >> 32) & 0xffffffff);
-        dwLo = (DWORD) (shm->size & 0xffffffff);
-
-        if (_PR_NT_MakeSecurityDescriptorACL(mode, filemapAccessTable,
-                &pSD, &pACL) == PR_SUCCESS) {
-            sa.nLength = sizeof(sa);
-            sa.lpSecurityDescriptor = pSD;
-            sa.bInheritHandle = FALSE;
-            lpSA = &sa;
-        }
-        shm->handle = CreateFileMapping(
-            (HANDLE)-1 ,
-            lpSA,
-            flProtect,
-            dwHi,
-            dwLo,
-            shm->ipcname);
-        if (lpSA != NULL) {
-            _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-        }
-
-        if ( NULL == shm->handle ) {
-            PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-                ( "PR_OpenSharedMemory: CreateFileMapping() failed: %s",
-                    shm->ipcname )); 
-            _PR_MD_MAP_DEFAULT_ERROR( GetLastError());
-            PR_FREEIF( shm->ipcname )
-            PR_DELETE( shm );
-            return(NULL);
-        } else {
-            if (( flags & PR_SHM_EXCL) && ( GetLastError() == ERROR_ALREADY_EXISTS ))  {
-                PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-                    ( "PR_OpenSharedMemory: Request exclusive & already exists",
-                        shm->ipcname )); 
-                PR_SetError( PR_FILE_EXISTS_ERROR, ERROR_ALREADY_EXISTS );
-                CloseHandle( shm->handle );
-                PR_FREEIF( shm->ipcname )
-                PR_DELETE( shm );
-                return(NULL);
-            } else {
-                PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-                    ( "PR_OpenSharedMemory: CreateFileMapping() success: %s, handle: %d",
-                        shm->ipcname, shm->handle ));
-                return(shm);
-            }
-        }
-    } else {
-        shm->handle = OpenFileMapping( FILE_MAP_WRITE, TRUE, shm->ipcname );
-        if ( NULL == shm->handle ) {
-            _PR_MD_MAP_DEFAULT_ERROR( GetLastError());
-            PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-                ( "PR_OpenSharedMemory: OpenFileMapping() failed: %s, error: %d",
-                    shm->ipcname, PR_GetOSError())); 
-            PR_FREEIF( shm->ipcname );
-            PR_DELETE( shm );
-            return(NULL);
-        } else {
-            PR_LOG(_pr_shm_lm, PR_LOG_DEBUG, 
-                ( "PR_OpenSharedMemory: OpenFileMapping() success: %s, handle: %d",
-                    shm->ipcname, shm->handle )); 
-                return(shm);
-        }
-    }
-    /* returns from separate paths */
-}
-
-extern void * _MD_AttachSharedMemory( PRSharedMemory *shm, PRIntn flags )
-{
-    PRUint32    access = FILE_MAP_WRITE;
-    void        *addr;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    if ( PR_SHM_READONLY & flags )
-        access = FILE_MAP_READ;
-
-    addr = MapViewOfFile( shm->handle,
-        access,
-        0, 0,
-        shm->size );
-
-    if ( NULL == addr ) {
-        _PR_MD_MAP_DEFAULT_ERROR( GetLastError());
-        PR_LOG( _pr_shm_lm, PR_LOG_ERROR, 
-            ("_MD_AttachSharedMemory: MapViewOfFile() failed. OSerror: %d", PR_GetOSError()));
-    }
-
-    return( addr );
-} /* end _MD_ATTACH_SHARED_MEMORY() */
-
-
-extern PRStatus _MD_DetachSharedMemory( PRSharedMemory *shm, void *addr )
-{
-    PRStatus rc = PR_SUCCESS;
-    BOOL        wrc;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    wrc = UnmapViewOfFile( addr );
-    if ( FALSE == wrc ) 
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( GetLastError());
-        PR_LOG( _pr_shm_lm, PR_LOG_ERROR, 
-            ("_MD_DetachSharedMemory: UnmapViewOfFile() failed. OSerror: %d", PR_GetOSError()));
-        rc = PR_FAILURE;
-    }
-
-    return( rc );
-}
-
-
-extern PRStatus _MD_CloseSharedMemory( PRSharedMemory *shm )
-{
-    PRStatus rc = PR_SUCCESS;
-    BOOL wrc;
-
-    PR_ASSERT( shm->ident == _PR_SHM_IDENT );
-
-    wrc = CloseHandle( shm->handle );
-    if ( FALSE == wrc )
-    {
-        _PR_MD_MAP_DEFAULT_ERROR( GetLastError());
-        PR_LOG( _pr_shm_lm, PR_LOG_ERROR, 
-            ("_MD_CloseSharedMemory: CloseHandle() failed. OSerror: %d", PR_GetOSError()));
-        rc = PR_FAILURE;
-    }
-    PR_FREEIF( shm->ipcname );
-    PR_DELETE( shm );
-
-    return( rc );
-} /* end _MD_CLOSE_SHARED_MEMORY() */
-
-extern PRStatus _MD_DeleteSharedMemory( const char *name )
-{
-    return( PR_SUCCESS );
-}    
-
-
-/*
-** Windows implementation of anonymous memory (file) map
-*/
-extern PRLogModuleInfo *_pr_shma_lm;
-
-extern PRFileMap* _md_OpenAnonFileMap( 
-    const char *dirName,
-    PRSize      size,
-    PRFileMapProtect prot
-)
-{
-    PRFileMap   *fm;
-    HANDLE      hFileMap;
-
-    fm = PR_CreateFileMap( (PRFileDesc*)-1, size, prot );
-    if ( NULL == fm )  {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_OpenAnonFileMap(): PR_CreateFileMap(): failed"));
-        goto Finished;
-    }
-
-    /*
-    ** Make fm->md.hFileMap inheritable. We can't use
-    ** GetHandleInformation and SetHandleInformation
-    ** because these two functions fail with
-    ** ERROR_CALL_NOT_IMPLEMENTED on Win95.
-    */
-    if (DuplicateHandle(GetCurrentProcess(), fm->md.hFileMap,
-            GetCurrentProcess(), &hFileMap,
-            0, TRUE /* inheritable */,
-            DUPLICATE_SAME_ACCESS) == FALSE) {
-        PR_SetError( PR_UNKNOWN_ERROR, GetLastError() );
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_OpenAnonFileMap(): DuplicateHandle(): failed"));
-        PR_CloseFileMap( fm );
-        fm = NULL;
-        goto Finished;
-    }
-    CloseHandle(fm->md.hFileMap);
-    fm->md.hFileMap = hFileMap;
-
-Finished:    
-    return(fm);
-} /* end md_OpenAnonFileMap() */
-
-/*
-** _md_ExportFileMapAsString()
-**
-*/
-extern PRStatus _md_ExportFileMapAsString(
-    PRFileMap *fm,
-    PRSize    bufSize,
-    char      *buf
-)
-{
-    PRIntn  written;
-
-    written = PR_snprintf( buf, (PRUint32) bufSize, "%d:%" PR_PRIdOSFD ":%ld",
-        (PRIntn)fm->prot, (PROsfd)fm->md.hFileMap, (PRInt32)fm->md.dwAccess );
-
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_ExportFileMapAsString(): prot: %x, hFileMap: %x, dwAccess: %x",
-            fm->prot, fm->md.hFileMap, fm->md.dwAccess ));
-        
-    return((written == -1)? PR_FAILURE : PR_SUCCESS);
-} /* end _md_ExportFileMapAsString() */
-
-
-/*
-** _md_ImportFileMapFromString()
-**
-*/
-extern PRFileMap * _md_ImportFileMapFromString(
-    const char *fmstring
-)
-{
-    PRIntn  prot;
-    PROsfd hFileMap;
-    PRInt32 dwAccess;
-    PRFileMap *fm = NULL;
-
-    PR_sscanf( fmstring, "%d:%" PR_SCNdOSFD ":%ld",
-        &prot, &hFileMap, &dwAccess );
-
-    fm = PR_NEWZAP(PRFileMap);
-    if ( NULL == fm ) {
-        PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-            ("_md_ImportFileMapFromString(): PR_NEWZAP(): Failed"));
-        return(fm);
-    }
-
-    fm->prot = (PRFileMapProtect)prot;
-    fm->md.hFileMap = (HANDLE)hFileMap;
-    fm->md.dwAccess = (DWORD)dwAccess;
-    fm->fd = (PRFileDesc*)-1;
-
-    PR_LOG( _pr_shma_lm, PR_LOG_DEBUG,
-        ("_md_ImportFileMapFromString(): fm: %p, prot: %d, hFileMap: %8.8x, dwAccess: %8.8x, fd: %x",
-            fm, prot, fm->md.hFileMap, fm->md.dwAccess, fm->fd));
-    return(fm);
-} /* end _md_ImportFileMapFromString() */
-
-#else
-Error! Why is PR_HAVE_WIN32_NAMED_SHARED_MEMORY not defined? 
-#endif /* PR_HAVE_WIN32_NAMED_SHARED_MEMORY */
-/* --- end w32shm.c --- */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w95cv.c b/libs/js/nsprpub/pr/src/md/windows/w95cv.c
deleted file mode 100644
index 975ac4b06f..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w95cv.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *  w95cv.c -- Windows 95 Machine-Dependent Code for Condition Variables
- *
- *  We implement our own condition variable wait queue.  Each thread
- *  has a semaphore object (thread->md.blocked_sema) to block on while
- *  waiting on a condition variable.
- *
- *  We use a deferred condition notify algorithm.  When PR_NotifyCondVar
- *  or PR_NotifyAllCondVar is called, the condition notifies are simply
- *  recorded in the _MDLock structure.  We defer the condition notifies
- *  until right after we unlock the lock.  This way the awakened threads
- *  have a better chance to reaquire the lock.
- */
- 
-#include "primpl.h"
-
-/*
- * AddThreadToCVWaitQueueInternal --
- *
- * Add the thread to the end of the condition variable's wait queue.
- * The CV's lock must be locked when this function is called.
- */
-
-static void
-AddThreadToCVWaitQueueInternal(PRThread *thred, struct _MDCVar *cv)
-{
-    PR_ASSERT((cv->waitTail != NULL && cv->waitHead != NULL)
-            || (cv->waitTail == NULL && cv->waitHead == NULL));
-    cv->nwait += 1;
-    thred->md.inCVWaitQueue = PR_TRUE;
-    thred->md.next = NULL;
-    thred->md.prev = cv->waitTail;
-    if (cv->waitHead == NULL) {
-        cv->waitHead = thred;
-    } else {
-        cv->waitTail->md.next = thred;
-    }
-    cv->waitTail = thred;
-}
-
-/*
- * md_UnlockAndPostNotifies --
- *
- * Unlock the lock, and then do the deferred condition notifies.
- * If waitThred and waitCV are not NULL, waitThred is added to
- * the wait queue of waitCV before the lock is unlocked.
- *
- * This function is called by _PR_MD_WAIT_CV and _PR_MD_UNLOCK,
- * the two places where a lock is unlocked.
- */
-static void
-md_UnlockAndPostNotifies(
-    _MDLock *lock,
-    PRThread *waitThred,
-    _MDCVar *waitCV)
-{
-    PRIntn index;
-    _MDNotified post;
-    _MDNotified *notified, *prev = NULL;
-
-    /*
-     * Time to actually notify any conditions that were affected
-     * while the lock was held.  Get a copy of the list that's in
-     * the lock structure and then zero the original.  If it's
-     * linked to other such structures, we own that storage.
-     */
-    post = lock->notified;  /* a safe copy; we own the lock */
-
-#if defined(DEBUG)
-    ZeroMemory(&lock->notified, sizeof(_MDNotified));  /* reset */
-#else
-    lock->notified.length = 0;  /* these are really sufficient */
-    lock->notified.link = NULL;
-#endif
-
-    /* 
-     * Figure out how many threads we need to wake up.
-     */
-    notified = &post;  /* this is where we start */
-    do {
-        for (index = 0; index < notified->length; ++index) {
-            _MDCVar *cv = notified->cv[index].cv;
-            PRThread *thred;
-            int i;
-            
-            /* Fast special case: no waiting threads */
-            if (cv->waitHead == NULL) {
-                notified->cv[index].notifyHead = NULL;
-                continue;
-            }
-
-            /* General case */
-            if (-1 == notified->cv[index].times) {
-                /* broadcast */
-                thred = cv->waitHead;
-                while (thred != NULL) {
-                    thred->md.inCVWaitQueue = PR_FALSE;
-                    thred = thred->md.next;
-                }
-                notified->cv[index].notifyHead = cv->waitHead;
-                cv->waitHead = cv->waitTail = NULL;
-                cv->nwait = 0;
-            } else {
-                thred = cv->waitHead;
-                i = notified->cv[index].times;
-                while (thred != NULL && i > 0) {
-                    thred->md.inCVWaitQueue = PR_FALSE;
-                    thred = thred->md.next;
-                    i--;
-                }
-                notified->cv[index].notifyHead = cv->waitHead;
-                cv->waitHead = thred;
-                if (cv->waitHead == NULL) {
-                    cv->waitTail = NULL;
-                } else {
-                    if (cv->waitHead->md.prev != NULL) {
-                        cv->waitHead->md.prev->md.next = NULL;
-                        cv->waitHead->md.prev = NULL;
-                    }
-                }
-                cv->nwait -= notified->cv[index].times - i;
-            }
-        }
-        notified = notified->link;
-    } while (NULL != notified);
-
-    if (waitThred) {
-        AddThreadToCVWaitQueueInternal(waitThred, waitCV);
-    }
-
-    /* Release the lock before notifying */
-        LeaveCriticalSection(&lock->mutex);
-
-    notified = &post;  /* this is where we start */
-    do {
-        for (index = 0; index < notified->length; ++index) {
-            PRThread *thred;
-            PRThread *next;
-
-            thred = notified->cv[index].notifyHead;
-            while (thred != NULL) {
-                BOOL rv;
-
-                next = thred->md.next;
-                thred->md.prev = thred->md.next = NULL;
-
-                rv = ReleaseSemaphore(thred->md.blocked_sema, 1, NULL);
-                PR_ASSERT(rv != 0);
-                thred = next;
-            }
-        }
-        prev = notified;
-        notified = notified->link;
-        if (&post != prev) PR_DELETE(prev);
-    } while (NULL != notified);
-}
-
-/*
- * Notifies just get posted to the protecting mutex.  The
- * actual notification is done when the lock is released so that
- * MP systems don't contend for a lock that they can't have.
- */
-static void md_PostNotifyToCvar(_MDCVar *cvar, _MDLock *lock,
-        PRBool broadcast)
-{
-    PRIntn index = 0;
-    _MDNotified *notified = &lock->notified;
-
-    while (1) {
-        for (index = 0; index < notified->length; ++index) {
-            if (notified->cv[index].cv == cvar) {
-                if (broadcast) {
-                    notified->cv[index].times = -1;
-                } else if (-1 != notified->cv[index].times) {
-                    notified->cv[index].times += 1;
-                }
-                return;
-            }
-        }
-        /* if not full, enter new CV in this array */
-        if (notified->length < _MD_CV_NOTIFIED_LENGTH) break;
-
-        /* if there's no link, create an empty array and link it */
-        if (NULL == notified->link) {
-            notified->link = PR_NEWZAP(_MDNotified);
-        }
-
-        notified = notified->link;
-    }
-
-    /* A brand new entry in the array */
-    notified->cv[index].times = (broadcast) ? -1 : 1;
-    notified->cv[index].cv = cvar;
-    notified->length += 1;
-}
-
-/*
- * _PR_MD_NEW_CV() -- Creating new condition variable
- * ... Solaris uses cond_init() in similar function.
- *
- * returns: -1 on failure
- *          0 when it succeeds.
- *
- */
-PRInt32 
-_PR_MD_NEW_CV(_MDCVar *cv)
-{
-    cv->magic = _MD_MAGIC_CV;
-    /*
-     * The waitHead, waitTail, and nwait fields are zeroed
-     * when the PRCondVar structure is created.
-     */
-    return 0;
-} 
-
-void _PR_MD_FREE_CV(_MDCVar *cv)
-{
-    cv->magic = (PRUint32)-1;
-    return;
-}
-
-/*
- *  _PR_MD_WAIT_CV() -- Wait on condition variable
- */
-void _PR_MD_WAIT_CV(_MDCVar *cv, _MDLock *lock, PRIntervalTime timeout )
-{
-    PRThread *thred = _PR_MD_CURRENT_THREAD();
-    DWORD rv;
-    DWORD msecs = (timeout == PR_INTERVAL_NO_TIMEOUT) ?
-            INFINITE : PR_IntervalToMilliseconds(timeout);
-
-    /*
-     * If we have pending notifies, post them now.
-     */
-    if (0 != lock->notified.length) {
-        md_UnlockAndPostNotifies(lock, thred, cv);
-    } else {
-        AddThreadToCVWaitQueueInternal(thred, cv);
-        LeaveCriticalSection(&lock->mutex);
-    }
-
-    /* Wait for notification or timeout; don't really care which */
-    rv = WaitForSingleObject(thred->md.blocked_sema, msecs);
-
-    EnterCriticalSection(&(lock->mutex));
-
-    PR_ASSERT(rv != WAIT_ABANDONED);
-    PR_ASSERT(rv != WAIT_FAILED);
-    PR_ASSERT(rv != WAIT_OBJECT_0 || thred->md.inCVWaitQueue == PR_FALSE);
-
-    if (rv == WAIT_TIMEOUT) {
-        if (thred->md.inCVWaitQueue) {
-            PR_ASSERT((cv->waitTail != NULL && cv->waitHead != NULL)
-                    || (cv->waitTail == NULL && cv->waitHead == NULL));
-            cv->nwait -= 1;
-            thred->md.inCVWaitQueue = PR_FALSE;
-            if (cv->waitHead == thred) {
-                cv->waitHead = thred->md.next;
-                if (cv->waitHead == NULL) {
-                    cv->waitTail = NULL;
-                } else {
-                    cv->waitHead->md.prev = NULL;
-                }
-            } else {
-                PR_ASSERT(thred->md.prev != NULL);
-                thred->md.prev->md.next = thred->md.next;
-                if (thred->md.next != NULL) {
-                    thred->md.next->md.prev = thred->md.prev;
-                } else {
-                    PR_ASSERT(cv->waitTail == thred);
-                    cv->waitTail = thred->md.prev;
-                }
-            }
-            thred->md.next = thred->md.prev = NULL;
-        } else {
-            /*
-             * This thread must have been notified, but the
-             * ReleaseSemaphore call happens after WaitForSingleObject
-             * times out.  Wait on the semaphore again to make it
-             * non-signaled.  We assume this wait won't take long.
-             */
-            rv = WaitForSingleObject(thred->md.blocked_sema, INFINITE);
-            PR_ASSERT(rv == WAIT_OBJECT_0);
-        }
-    }
-    PR_ASSERT(thred->md.inCVWaitQueue == PR_FALSE);
-    return;
-} /* --- end _PR_MD_WAIT_CV() --- */
-
-void _PR_MD_NOTIFY_CV(_MDCVar *cv, _MDLock *lock)
-{
-    md_PostNotifyToCvar(cv, lock, PR_FALSE);
-    return;
-}
-
-void _PR_MD_NOTIFYALL_CV(_MDCVar *cv, _MDLock *lock)
-{
-    md_PostNotifyToCvar(cv, lock, PR_TRUE);
-    return;
-}
-
-void _PR_MD_UNLOCK(_MDLock *lock)
-{
-    if (0 != lock->notified.length) {
-        md_UnlockAndPostNotifies(lock, NULL, NULL);
-    } else {
-        LeaveCriticalSection(&lock->mutex);
-    }
-    return;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c b/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c
deleted file mode 100644
index 1dafe7a22b..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w95dllmain.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * The DLL entry point (DllMain) for NSPR.
- *
- * This is used to detach threads that were automatically attached by
- * nspr.
- */
-
-#include <windows.h>
-#include <primpl.h>
-
-BOOL WINAPI DllMain(
-    HINSTANCE hinstDLL,
-    DWORD fdwReason,
-    LPVOID lpvReserved)
-{
-PRThread *me;
-
-    switch (fdwReason) {
-        case DLL_PROCESS_ATTACH:
-            break;
-        case DLL_THREAD_ATTACH:
-            break;
-        case DLL_THREAD_DETACH:
-            if (_pr_initialized) {
-                me = _MD_GET_ATTACHED_THREAD();
-                if ((me != NULL) && (me->flags & _PR_ATTACHED))
-                    _PRI_DetachThread();
-            }
-            break;
-        case DLL_PROCESS_DETACH:
-            break;
-    }
-    return TRUE;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/w95io.c b/libs/js/nsprpub/pr/src/md/windows/w95io.c
deleted file mode 100644
index 81be67b16a..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w95io.c
+++ /dev/null
@@ -1,1492 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Masayuki Nakano <masayuki@d-toybox.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Windows 95 IO module
- *
- * Assumes synchronous I/O.
- *
- */
-
-#include "primpl.h"
-#include <direct.h>
-#include <mbstring.h>
-#ifdef MOZ_UNICODE
-#include <wchar.h>
-#endif /* MOZ_UNICODE */
-
-
-struct _MDLock               _pr_ioq_lock;
-
-/*
- * NSPR-to-NT access right mapping table for files.
- */
-static DWORD fileAccessTable[] = {
-    FILE_GENERIC_READ,
-    FILE_GENERIC_WRITE,
-    FILE_GENERIC_EXECUTE
-};
-
-/*
- * NSPR-to-NT access right mapping table for directories.
- */
-static DWORD dirAccessTable[] = {
-    FILE_GENERIC_READ,
-    FILE_GENERIC_WRITE|FILE_DELETE_CHILD,
-    FILE_GENERIC_EXECUTE
-};
-
-/*
- * The NSPR epoch (00:00:00 1 Jan 1970 UTC) in FILETIME.
- * We store the value in a PRTime variable for convenience.
- * This constant is used by _PR_FileTimeToPRTime().
- */
-#if defined(__MINGW32__)
-static const PRTime _pr_filetime_offset = 116444736000000000LL;
-#else
-static const PRTime _pr_filetime_offset = 116444736000000000i64;
-#endif
-
-#ifdef MOZ_UNICODE
-static void InitUnicodeSupport(void);
-#endif
-
-static PRBool IsPrevCharSlash(const char *str, const char *current);
-
-void
-_PR_MD_INIT_IO()
-{
-    WORD WSAVersion = 0x0101;
-    WSADATA WSAData;
-    int err;
-
-    err = WSAStartup( WSAVersion, &WSAData );
-    PR_ASSERT(0 == err);
-
-#ifdef DEBUG
-    /* Doublecheck _pr_filetime_offset's hard-coded value is correct. */
-    {
-        SYSTEMTIME systime;
-        union {
-           PRTime prt;
-           FILETIME ft;
-        } filetime;
-        BOOL rv;
-
-        systime.wYear = 1970;
-        systime.wMonth = 1;
-        /* wDayOfWeek is ignored */
-        systime.wDay = 1;
-        systime.wHour = 0;
-        systime.wMinute = 0;
-        systime.wSecond = 0;
-        systime.wMilliseconds = 0;
-
-        rv = SystemTimeToFileTime(&systime, &filetime.ft);
-        PR_ASSERT(0 != rv);
-        PR_ASSERT(filetime.prt == _pr_filetime_offset);
-    }
-#endif /* DEBUG */
-
-    _PR_NT_InitSids();
-
-#ifdef MOZ_UNICODE
-    InitUnicodeSupport();
-#endif
-}
-
-PRStatus
-_PR_MD_WAIT(PRThread *thread, PRIntervalTime ticks)
-{
-    DWORD rv;
-
-    PRUint32 msecs = (ticks == PR_INTERVAL_NO_TIMEOUT) ?
-        INFINITE : PR_IntervalToMilliseconds(ticks);
-    rv = WaitForSingleObject(thread->md.blocked_sema, msecs);
-    switch(rv) 
-    {
-        case WAIT_OBJECT_0:
-            return PR_SUCCESS;
-            break;
-        case WAIT_TIMEOUT:
-            _PR_THREAD_LOCK(thread);
-            if (thread->state == _PR_IO_WAIT) {
-			  ;
-            } else {
-                if (thread->wait.cvar != NULL) {
-                    thread->wait.cvar = NULL;
-                    _PR_THREAD_UNLOCK(thread);
-                } else {
-                    /* The CVAR was notified just as the timeout
-                     * occurred.  This led to us being notified twice.
-                     * call WaitForSingleObject() to clear the semaphore.
-                     */
-                    _PR_THREAD_UNLOCK(thread);
-                    rv = WaitForSingleObject(thread->md.blocked_sema, 0);
-                    PR_ASSERT(rv == WAIT_OBJECT_0);
-                }
-            }
-            return PR_SUCCESS;
-            break;
-        default:
-            return PR_FAILURE;
-            break;
-    }
-}
-PRStatus
-_PR_MD_WAKEUP_WAITER(PRThread *thread)
-{
-    if ( _PR_IS_NATIVE_THREAD(thread) ) 
-    {
-        if (ReleaseSemaphore(thread->md.blocked_sema, 1, NULL) == FALSE)
-            return PR_FAILURE;
-        else
-			return PR_SUCCESS;
-	}
-}
-
-
-/* --- FILE IO ----------------------------------------------------------- */
-/*
- *  _PR_MD_OPEN() -- Open a file
- *
- *  returns: a fileHandle
- *
- *  The NSPR open flags (osflags) are translated into flags for Win95
- *
- *  Mode seems to be passed in as a unix style file permissions argument
- *  as in 0666, in the case of opening the logFile. 
- *
- */
-PROsfd
-_PR_MD_OPEN(const char *name, PRIntn osflags, int mode)
-{
-    HANDLE file;
-    PRInt32 access = 0;
-    PRInt32 flags = 0;
-    PRInt32 flag6 = 0;
-    
-    if (osflags & PR_SYNC) flag6 = FILE_FLAG_WRITE_THROUGH;
- 
-    if (osflags & PR_RDONLY || osflags & PR_RDWR)
-        access |= GENERIC_READ;
-    if (osflags & PR_WRONLY || osflags & PR_RDWR)
-        access |= GENERIC_WRITE;
-
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-        flags = CREATE_NEW;
-    else if (osflags & PR_CREATE_FILE) {
-        if (osflags & PR_TRUNCATE)
-            flags = CREATE_ALWAYS;
-        else
-            flags = OPEN_ALWAYS;
-    } else {
-        if (osflags & PR_TRUNCATE)
-            flags = TRUNCATE_EXISTING;
-        else
-            flags = OPEN_EXISTING;
-    }
-
-    file = CreateFile(name,
-                      access,
-                      FILE_SHARE_READ|FILE_SHARE_WRITE,
-                      NULL,
-                      flags,
-                      flag6,
-                      NULL);
-    if (file == INVALID_HANDLE_VALUE) {
-		_PR_MD_MAP_OPEN_ERROR(GetLastError());
-        return -1; 
-	}
-
-    return (PROsfd)file;
-}
-
-PROsfd
-_PR_MD_OPEN_FILE(const char *name, PRIntn osflags, int mode)
-{
-    HANDLE file;
-    PRInt32 access = 0;
-    PRInt32 flags = 0;
-    PRInt32 flag6 = 0;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    if (osflags & PR_CREATE_FILE) {
-        if (_PR_NT_MakeSecurityDescriptorACL(mode, fileAccessTable,
-                &pSD, &pACL) == PR_SUCCESS) {
-            sa.nLength = sizeof(sa);
-            sa.lpSecurityDescriptor = pSD;
-            sa.bInheritHandle = FALSE;
-            lpSA = &sa;
-        }
-    }
-    
-    if (osflags & PR_SYNC) flag6 = FILE_FLAG_WRITE_THROUGH;
- 
-    if (osflags & PR_RDONLY || osflags & PR_RDWR)
-        access |= GENERIC_READ;
-    if (osflags & PR_WRONLY || osflags & PR_RDWR)
-        access |= GENERIC_WRITE;
-
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-        flags = CREATE_NEW;
-    else if (osflags & PR_CREATE_FILE) {
-        if (osflags & PR_TRUNCATE)
-            flags = CREATE_ALWAYS;
-        else
-            flags = OPEN_ALWAYS;
-    } else {
-        if (osflags & PR_TRUNCATE)
-            flags = TRUNCATE_EXISTING;
-        else
-            flags = OPEN_EXISTING;
-    }
-
-    file = CreateFile(name,
-                      access,
-                      FILE_SHARE_READ|FILE_SHARE_WRITE,
-                      lpSA,
-                      flags,
-                      flag6,
-                      NULL);
-    if (lpSA != NULL) {
-        _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-    }
-    if (file == INVALID_HANDLE_VALUE) {
-		_PR_MD_MAP_OPEN_ERROR(GetLastError());
-        return -1; 
-	}
-
-    return (PROsfd)file;
-}
-
-PRInt32
-_PR_MD_READ(PRFileDesc *fd, void *buf, PRInt32 len)
-{
-    PRUint32 bytes;
-    int rv, err;
-
-    rv = ReadFile((HANDLE)fd->secret->md.osfd,
-            (LPVOID)buf,
-            len,
-            &bytes,
-            NULL);
-    
-    if (rv == 0) 
-    {
-        err = GetLastError();
-        /* ERROR_HANDLE_EOF can only be returned by async io */
-        PR_ASSERT(err != ERROR_HANDLE_EOF);
-        if (err == ERROR_BROKEN_PIPE)
-            return 0;
-		else {
-			_PR_MD_MAP_READ_ERROR(err);
-        return -1;
-    }
-    }
-    return bytes;
-}
-
-PRInt32
-_PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 len)
-{
-    PROsfd f = fd->secret->md.osfd;
-    PRInt32 bytes;
-    int rv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    
-    rv = WriteFile((HANDLE)f,
-            buf,
-            len,
-            &bytes,
-            NULL );
-            
-    if (rv == 0) 
-    {
-		_PR_MD_MAP_WRITE_ERROR(GetLastError());
-        return -1;
-    }
-    return bytes;
-} /* --- end _PR_MD_WRITE() --- */
-
-PROffset32
-_PR_MD_LSEEK(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence)
-{
-    DWORD moveMethod;
-    PROffset32 rv;
-
-    switch (whence) {
-        case PR_SEEK_SET:
-            moveMethod = FILE_BEGIN;
-            break;
-        case PR_SEEK_CUR:
-            moveMethod = FILE_CURRENT;
-            break;
-        case PR_SEEK_END:
-            moveMethod = FILE_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return -1;
-    }
-
-    rv = SetFilePointer((HANDLE)fd->secret->md.osfd, offset, NULL, moveMethod);
-
-    /*
-     * If the lpDistanceToMoveHigh argument (third argument) is
-     * NULL, SetFilePointer returns 0xffffffff on failure.
-     */
-    if (-1 == rv) {
-        _PR_MD_MAP_LSEEK_ERROR(GetLastError());
-    }
-    return rv;
-}
-
-PROffset64
-_PR_MD_LSEEK64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence)
-{
-    DWORD moveMethod;
-    LARGE_INTEGER li;
-    DWORD err;
-
-    switch (whence) {
-        case PR_SEEK_SET:
-            moveMethod = FILE_BEGIN;
-            break;
-        case PR_SEEK_CUR:
-            moveMethod = FILE_CURRENT;
-            break;
-        case PR_SEEK_END:
-            moveMethod = FILE_END;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return -1;
-    }
-
-    li.QuadPart = offset;
-    li.LowPart = SetFilePointer((HANDLE)fd->secret->md.osfd,
-            li.LowPart, &li.HighPart, moveMethod);
-
-    if (0xffffffff == li.LowPart && (err = GetLastError()) != NO_ERROR) {
-        _PR_MD_MAP_LSEEK_ERROR(err);
-        li.QuadPart = -1;
-    }
-    return li.QuadPart;
-}
-
-/*
- * This is documented to succeed on read-only files, but Win32's
- * FlushFileBuffers functions fails with "access denied" in such a
- * case.  So we only signal an error if the error is *not* "access
- * denied".
- */
-PRInt32
-_PR_MD_FSYNC(PRFileDesc *fd)
-{
-    /*
-     * From the documentation:
-     *
-     *	   On Windows NT, the function FlushFileBuffers fails if hFile
-     *	   is a handle to console output. That is because console
-     *	   output is not buffered. The function returns FALSE, and
-     *	   GetLastError returns ERROR_INVALID_HANDLE.
-     *
-     * On the other hand, on Win95, it returns without error.  I cannot
-     * assume that 0, 1, and 2 are console, because if someone closes
-     * System.out and then opens a file, they might get file descriptor
-     * 1.  An error on *that* version of 1 should be reported, whereas
-     * an error on System.out (which was the original 1) should be
-     * ignored.  So I use isatty() to ensure that such an error was due
-     * to this bogosity, and if it was, I ignore the error.
-     */
-
-    BOOL ok = FlushFileBuffers((HANDLE)fd->secret->md.osfd);
-
-    if (!ok) {
-	DWORD err = GetLastError();
-	if (err != ERROR_ACCESS_DENIED) {	// from winerror.h
-			_PR_MD_MAP_FSYNC_ERROR(err);
-	    return -1;
-	}
-    }
-    return 0;
-}
-
-PRInt32
-_MD_CloseFile(PROsfd osfd)
-{
-    PRInt32 rv;
-    
-    rv = (CloseHandle((HANDLE)osfd))?0:-1;
-	if (rv == -1)
-		_PR_MD_MAP_CLOSE_ERROR(GetLastError());
-    return rv;
-}
-
-
-/* --- DIR IO ------------------------------------------------------------ */
-#define GetFileFromDIR(d)       (d)->d_entry.cFileName
-#define FileIsHidden(d)	((d)->d_entry.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-
-void FlipSlashes(char *cp, size_t len)
-{
-    while (len-- > 0) {
-        if (cp[0] == '/') {
-            cp[0] = PR_DIRECTORY_SEPARATOR;
-        }
-        cp = _mbsinc(cp);
-    }
-} /* end FlipSlashes() */
-
-
-/*
-**
-** Local implementations of standard Unix RTL functions which are not provided
-** by the VC RTL.
-**
-*/
-
-PRStatus
-_PR_MD_CLOSE_DIR(_MDDir *d)
-{
-    if ( d ) {
-        if (FindClose(d->d_hdl)) {
-        d->magic = (PRUint32)-1;
-        return PR_SUCCESS;
-		} else {
-			_PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
-        	return PR_FAILURE;
-		}
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return PR_FAILURE;
-}
-
-
-PRStatus
-_PR_MD_OPEN_DIR(_MDDir *d, const char *name)
-{
-    char filename[ MAX_PATH ];
-    size_t len;
-
-    len = strlen(name);
-    /* Need 5 bytes for \*.* and the trailing null byte. */
-    if (len + 5 > MAX_PATH) {
-        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-        return PR_FAILURE;
-    }
-    strcpy(filename, name);
-
-    /*
-     * If 'name' ends in a slash or backslash, do not append
-     * another backslash.
-     */
-    if (IsPrevCharSlash(filename, filename + len)) {
-        len--;
-    }
-    strcpy(&filename[len], "\\*.*");
-    FlipSlashes( filename, strlen(filename) );
-
-    d->d_hdl = FindFirstFile( filename, &(d->d_entry) );
-    if ( d->d_hdl == INVALID_HANDLE_VALUE ) {
-		_PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    d->firstEntry = PR_TRUE;
-    d->magic = _MD_MAGIC_DIR;
-    return PR_SUCCESS;
-}
-
-char *
-_PR_MD_READ_DIR(_MDDir *d, PRIntn flags)
-{
-    PRInt32 err;
-    BOOL rv;
-    char *fileName;
-
-    if ( d ) {
-        while (1) {
-            if (d->firstEntry) {
-                d->firstEntry = PR_FALSE;
-                rv = 1;
-            } else {
-                rv = FindNextFile(d->d_hdl, &(d->d_entry));
-            }
-            if (rv == 0) {
-                break;
-            }
-            fileName = GetFileFromDIR(d);
-            if ( (flags & PR_SKIP_DOT) &&
-                 (fileName[0] == '.') && (fileName[1] == '\0'))
-                 continue;
-            if ( (flags & PR_SKIP_DOT_DOT) &&
-                 (fileName[0] == '.') && (fileName[1] == '.') &&
-                 (fileName[2] == '\0'))
-                 continue;
-            if ( (flags & PR_SKIP_HIDDEN) && FileIsHidden(d))
-                 continue;
-            return fileName;
-        }
-        err = GetLastError();
-        PR_ASSERT(NO_ERROR != err);
-			_PR_MD_MAP_READDIR_ERROR(err);
-        return NULL;
-		}
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return NULL;
-}
-
-PRInt32
-_PR_MD_DELETE(const char *name)
-{
-    if (DeleteFile(name)) {
-        return 0;
-    } else {
-		_PR_MD_MAP_DELETE_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-void
-_PR_FileTimeToPRTime(const FILETIME *filetime, PRTime *prtm)
-{
-    PR_ASSERT(sizeof(FILETIME) == sizeof(PRTime));
-    CopyMemory(prtm, filetime, sizeof(PRTime));
-#if defined(__MINGW32__)
-    *prtm = (*prtm - _pr_filetime_offset) / 10LL;
-#else
-    *prtm = (*prtm - _pr_filetime_offset) / 10i64;
-#endif
-
-#ifdef DEBUG
-    /* Doublecheck our calculation. */
-    {
-        SYSTEMTIME systime;
-        PRExplodedTime etm;
-        PRTime cmp; /* for comparison */
-        BOOL rv;
-
-        rv = FileTimeToSystemTime(filetime, &systime);
-        PR_ASSERT(0 != rv);
-
-        /*
-         * PR_ImplodeTime ignores wday and yday.
-         */
-        etm.tm_usec = systime.wMilliseconds * PR_USEC_PER_MSEC;
-        etm.tm_sec = systime.wSecond;
-        etm.tm_min = systime.wMinute;
-        etm.tm_hour = systime.wHour;
-        etm.tm_mday = systime.wDay;
-        etm.tm_month = systime.wMonth - 1;
-        etm.tm_year = systime.wYear;
-        /*
-         * It is not well-documented what time zone the FILETIME's
-         * are in.  WIN32_FIND_DATA is documented to be in UTC (GMT).
-         * But BY_HANDLE_FILE_INFORMATION is unclear about this.
-         * By our best judgement, we assume that FILETIME is in UTC.
-         */
-        etm.tm_params.tp_gmt_offset = 0;
-        etm.tm_params.tp_dst_offset = 0;
-        cmp = PR_ImplodeTime(&etm);
-
-        /*
-         * SYSTEMTIME is in milliseconds precision, so we convert PRTime's
-         * microseconds to milliseconds before doing the comparison.
-         */
-        PR_ASSERT((cmp / PR_USEC_PER_MSEC) == (*prtm / PR_USEC_PER_MSEC));
-    }
-#endif /* DEBUG */
-}
-
-PRInt32
-_PR_MD_STAT(const char *fn, struct stat *info)
-{
-    PRInt32 rv;
-
-    rv = _stat(fn, (struct _stat *)info);
-    if (-1 == rv) {
-        /*
-         * Check for MSVC runtime library _stat() bug.
-         * (It's really a bug in FindFirstFile().)
-         * If a pathname ends in a backslash or slash,
-         * e.g., c:\temp\ or c:/temp/, _stat() will fail.
-         * Note: a pathname ending in a slash (e.g., c:/temp/)
-         * can be handled by _stat() on NT but not on Win95.
-         *
-         * We remove the backslash or slash at the end and
-         * try again.
-         */
-
-        size_t len = strlen(fn);
-        if (len > 0 && len <= _MAX_PATH
-                && IsPrevCharSlash(fn, fn + len)) {
-            char newfn[_MAX_PATH + 1];
-
-            strcpy(newfn, fn);
-            newfn[len - 1] = '\0';
-            rv = _stat(newfn, (struct _stat *)info);
-        }
-    }
-
-    if (-1 == rv) {
-        _PR_MD_MAP_STAT_ERROR(errno);
-    }
-    return rv;
-}
-
-#define _PR_IS_SLASH(ch) ((ch) == '/' || (ch) == '\\')
-
-static PRBool
-IsPrevCharSlash(const char *str, const char *current)
-{
-    const char *prev;
-
-    if (str >= current)
-        return PR_FALSE;
-    prev = _mbsdec(str, current);
-    return (prev == current - 1) && _PR_IS_SLASH(*prev);
-}
-
-/*
- * IsRootDirectory --
- *
- * Return PR_TRUE if the pathname 'fn' is a valid root directory,
- * else return PR_FALSE.  The char buffer pointed to by 'fn' must
- * be writable.  During the execution of this function, the contents
- * of the buffer pointed to by 'fn' may be modified, but on return
- * the original contents will be restored.  'buflen' is the size of
- * the buffer pointed to by 'fn'.
- *
- * Root directories come in three formats:
- * 1. / or \, meaning the root directory of the current drive.
- * 2. C:/ or C:\, where C is a drive letter.
- * 3. \\<server name>\<share point name>\ or
- *    \\<server name>\<share point name>, meaning the root directory
- *    of a UNC (Universal Naming Convention) name.
- */
-
-static PRBool
-IsRootDirectory(char *fn, size_t buflen)
-{
-    char *p;
-    PRBool slashAdded = PR_FALSE;
-    PRBool rv = PR_FALSE;
-
-    if (_PR_IS_SLASH(fn[0]) && fn[1] == '\0') {
-        return PR_TRUE;
-    }
-
-    if (isalpha(fn[0]) && fn[1] == ':' && _PR_IS_SLASH(fn[2])
-            && fn[3] == '\0') {
-        rv = GetDriveType(fn) > 1 ? PR_TRUE : PR_FALSE;
-        return rv;
-    }
-
-    /* The UNC root directory */
-
-    if (_PR_IS_SLASH(fn[0]) && _PR_IS_SLASH(fn[1])) {
-        /* The 'server' part should have at least one character. */
-        p = &fn[2];
-        if (*p == '\0' || _PR_IS_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the next slash */
-        do {
-            p = _mbsinc(p);
-        } while (*p != '\0' && !_PR_IS_SLASH(*p));
-        if (*p == '\0') {
-            return PR_FALSE;
-        }
-
-        /* The 'share' part should have at least one character. */
-        p++;
-        if (*p == '\0' || _PR_IS_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the final slash */
-        do {
-            p = _mbsinc(p);
-        } while (*p != '\0' && !_PR_IS_SLASH(*p));
-        if (_PR_IS_SLASH(*p) && p[1] != '\0') {
-            return PR_FALSE;
-        }
-        if (*p == '\0') {
-            /*
-             * GetDriveType() doesn't work correctly if the
-             * path is of the form \\server\share, so we add
-             * a final slash temporarily.
-             */
-            if ((p + 1) < (fn + buflen)) {
-                *p++ = '\\';
-                *p = '\0';
-                slashAdded = PR_TRUE;
-            } else {
-                return PR_FALSE; /* name too long */
-            }
-        }
-        rv = GetDriveType(fn) > 1 ? PR_TRUE : PR_FALSE;
-        /* restore the 'fn' buffer */
-        if (slashAdded) {
-            *--p = '\0';
-        }
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info)
-{
-    HANDLE hFindFile;
-    WIN32_FIND_DATA findFileData;
-    char pathbuf[MAX_PATH + 1];
-    
-    if (NULL == fn || '\0' == *fn) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-
-    /*
-     * FindFirstFile() expands wildcard characters.  So
-     * we make sure the pathname contains no wildcard.
-     */
-    if (NULL != _mbspbrk(fn, "?*")) {
-        PR_SetError(PR_FILE_NOT_FOUND_ERROR, 0);
-        return -1;
-    }
-
-    hFindFile = FindFirstFile(fn, &findFileData);
-    if (INVALID_HANDLE_VALUE == hFindFile) {
-        DWORD len;
-        char *filePart;
-
-        /*
-         * FindFirstFile() does not work correctly on root directories.
-         * It also doesn't work correctly on a pathname that ends in a
-         * slash.  So we first check to see if the pathname specifies a
-         * root directory.  If not, and if the pathname ends in a slash,
-         * we remove the final slash and try again.
-         */
-
-        /*
-         * If the pathname does not contain ., \, and /, it cannot be
-         * a root directory or a pathname that ends in a slash.
-         */
-        if (NULL == _mbspbrk(fn, ".\\/")) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } 
-        len = GetFullPathName(fn, sizeof(pathbuf), pathbuf,
-                &filePart);
-        if (0 == len) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        }
-        if (len > sizeof(pathbuf)) {
-            PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-            return -1;
-        }
-        if (IsRootDirectory(pathbuf, sizeof(pathbuf))) {
-            info->type = PR_FILE_DIRECTORY;
-            info->size = 0;
-            /*
-             * These timestamps don't make sense for root directories.
-             */
-            info->modifyTime = 0;
-            info->creationTime = 0;
-            return 0;
-        }
-        if (!IsPrevCharSlash(pathbuf, pathbuf + len)) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } else {
-            pathbuf[len - 1] = '\0';
-            hFindFile = FindFirstFile(pathbuf, &findFileData);
-            if (INVALID_HANDLE_VALUE == hFindFile) {
-                _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-                return -1;
-            }
-        }
-    }
-
-    FindClose(hFindFile);
-
-    if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        info->type = PR_FILE_DIRECTORY;
-    } else {
-        info->type = PR_FILE_FILE;
-    }
-
-    info->size = findFileData.nFileSizeHigh;
-    info->size = (info->size << 32) + findFileData.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&findFileData.ftLastWriteTime, &info->modifyTime);
-
-    if (0 == findFileData.ftCreationTime.dwLowDateTime &&
-            0 == findFileData.ftCreationTime.dwHighDateTime) {
-        info->creationTime = info->modifyTime;
-    } else {
-        _PR_FileTimeToPRTime(&findFileData.ftCreationTime,
-                &info->creationTime);
-    }
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO(const char *fn, PRFileInfo *info)
-{
-    PRFileInfo64 info64;
-    PRInt32 rv = _PR_MD_GETFILEINFO64(fn, &info64);
-    if (0 == rv)
-    {
-        info->type = info64.type;
-        info->size = (PRUint32) info64.size;
-        info->modifyTime = info64.modifyTime;
-        info->creationTime = info64.creationTime;
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO64(const PRFileDesc *fd, PRFileInfo64 *info)
-{
-    int rv;
-
-    BY_HANDLE_FILE_INFORMATION hinfo;
-
-    rv = GetFileInformationByHandle((HANDLE)fd->secret->md.osfd, &hinfo);
-    if (rv == FALSE) {
-		_PR_MD_MAP_FSTAT_ERROR(GetLastError());
-        return -1;
-	}
-
-    if (hinfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        info->type = PR_FILE_DIRECTORY;
-    else
-        info->type = PR_FILE_FILE;
-
-    info->size = hinfo.nFileSizeHigh;
-    info->size = (info->size << 32) + hinfo.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&hinfo.ftLastWriteTime, &(info->modifyTime) );
-    _PR_FileTimeToPRTime(&hinfo.ftCreationTime, &(info->creationTime) );
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info)
-{
-    PRFileInfo64 info64;
-    int rv = _PR_MD_GETOPENFILEINFO64(fd, &info64);
-    if (0 == rv)
-    {
-        info->type = info64.type;
-        info->modifyTime = info64.modifyTime;
-        info->creationTime = info64.creationTime;
-        LL_L2I(info->size, info64.size);
-    }
-    return rv;
-}
-
-PRStatus
-_PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable)
-{
-    BOOL rv;
-
-    /*
-     * The SetHandleInformation function fails with the
-     * ERROR_CALL_NOT_IMPLEMENTED error on Win95.
-     */
-    rv = SetHandleInformation(
-            (HANDLE)fd->secret->md.osfd,
-            HANDLE_FLAG_INHERIT,
-            inheritable ? HANDLE_FLAG_INHERIT : 0);
-    if (0 == rv) {
-        _PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-} 
-
-void
-_PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported)
-{
-    if (imported) {
-        fd->secret->inheritable = _PR_TRI_UNKNOWN;
-    } else {
-        fd->secret->inheritable = _PR_TRI_FALSE;
-    }
-}
-
-void
-_PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd)
-{
-    DWORD flags;
-
-    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-    if (GetHandleInformation((HANDLE)fd->secret->md.osfd, &flags)) {
-        if (flags & HANDLE_FLAG_INHERIT) {
-            fd->secret->inheritable = _PR_TRI_TRUE;
-        } else {
-            fd->secret->inheritable = _PR_TRI_FALSE;
-        }
-    }
-}
-
-PRInt32
-_PR_MD_RENAME(const char *from, const char *to)
-{
-    /* Does this work with dot-relative pathnames? */
-    if (MoveFile(from, to)) {
-        return 0;
-    } else {
-		_PR_MD_MAP_RENAME_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_ACCESS(const char *name, PRAccessHow how)
-{
-PRInt32 rv;
-    switch (how) {
-      case PR_ACCESS_WRITE_OK:
-        rv = _access(name, 02);
-		break;
-      case PR_ACCESS_READ_OK:
-        rv = _access(name, 04);
-		break;
-      case PR_ACCESS_EXISTS:
-        return _access(name, 00);
-	  	break;
-      default:
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-    }
-	if (rv < 0)
-		_PR_MD_MAP_ACCESS_ERROR(errno);
-    return rv;
-}
-
-PRInt32
-_PR_MD_MKDIR(const char *name, PRIntn mode)
-{
-    /* XXXMB - how to translate the "mode"??? */
-    if (CreateDirectory(name, NULL)) {
-        return 0;
-    } else {
-		_PR_MD_MAP_MKDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_MAKE_DIR(const char *name, PRIntn mode)
-{
-    BOOL rv;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    if (_PR_NT_MakeSecurityDescriptorACL(mode, dirAccessTable,
-            &pSD, &pACL) == PR_SUCCESS) {
-        sa.nLength = sizeof(sa);
-        sa.lpSecurityDescriptor = pSD;
-        sa.bInheritHandle = FALSE;
-        lpSA = &sa;
-    }
-    rv = CreateDirectory(name, lpSA);
-    if (lpSA != NULL) {
-        _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-    }
-    if (rv) {
-        return 0;
-    } else {
-        _PR_MD_MAP_MKDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRInt32
-_PR_MD_RMDIR(const char *name)
-{
-    if (RemoveDirectory(name)) {
-        return 0;
-    } else {
-		_PR_MD_MAP_RMDIR_ERROR(GetLastError());
-        return -1;
-    }
-}
-
-PRStatus
-_PR_MD_LOCKFILE(PROsfd f)
-{
-    PRStatus  rc = PR_SUCCESS;
-	DWORD     rv;
-
-	rv = LockFile( (HANDLE)f,
-		0l, 0l,
-		0x0l, 0xffffffffl ); 
-	if ( rv == 0 ) {
-        DWORD rc = GetLastError();
-        PR_LOG( _pr_io_lm, PR_LOG_ERROR,
-            ("_PR_MD_LOCKFILE() failed. Error: %d", rc ));
-        rc = PR_FAILURE;
-    }
-
-    return rc;
-} /* end _PR_MD_LOCKFILE() */
-
-PRStatus
-_PR_MD_TLOCKFILE(PROsfd f)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return PR_FAILURE;
-} /* end _PR_MD_TLOCKFILE() */
-
-
-PRStatus
-_PR_MD_UNLOCKFILE(PROsfd f)
-{
-	PRInt32   rv;
-    
-    rv = UnlockFile( (HANDLE) f,
-    		0l, 0l,
-            0x0l, 0xffffffffl ); 
-            
-    if ( rv )
-    {
-    	return PR_SUCCESS;
-    }
-    else
-    {
-		_PR_MD_MAP_DEFAULT_ERROR(GetLastError());
-		return PR_FAILURE;
-    }
-} /* end _PR_MD_UNLOCKFILE() */
-
-PRInt32
-_PR_MD_PIPEAVAILABLE(PRFileDesc *fd)
-{
-    if (NULL == fd)
-		PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-	else
-		PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return -1;
-}
-
-#ifdef MOZ_UNICODE
-
-typedef HANDLE (WINAPI *CreateFileWFn) (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE);
-static CreateFileWFn createFileW = CreateFileW;
-typedef HANDLE (WINAPI *FindFirstFileWFn) (LPCWSTR, LPWIN32_FIND_DATAW);
-static FindFirstFileWFn findFirstFileW = FindFirstFileW;
-typedef BOOL (WINAPI *FindNextFileWFn) (HANDLE, LPWIN32_FIND_DATAW);
-static FindNextFileWFn findNextFileW = FindNextFileW;
-typedef DWORD (WINAPI *GetFullPathNameWFn) (LPCWSTR, DWORD, LPWSTR, LPWSTR *);
-static GetFullPathNameWFn getFullPathNameW = GetFullPathNameW;
-typedef UINT (WINAPI *GetDriveTypeWFn) (LPCWSTR);
-static GetDriveTypeWFn getDriveTypeW = GetDriveTypeW;
-
-static void InitUnicodeSupport(void)
-{
-    /*
-     * The W functions exist on Win9x as stubs that fail with the
-     * ERROR_CALL_NOT_IMPLEMENTED error.  We plan to emulate the
-     * MSLU W functions on Win9x in the future.
-     */
-}
-
-/* ================ UTF16 Interfaces ================================ */
-void FlipSlashesW(PRUnichar *cp, size_t len)
-{
-    while (len-- > 0) {
-        if (cp[0] == L'/') {
-            cp[0] = L'\\';
-        }
-        cp++;
-    }
-} /* end FlipSlashesW() */
-
-PROsfd
-_PR_MD_OPEN_FILE_UTF16(const PRUnichar *name, PRIntn osflags, int mode)
-{
-    HANDLE file;
-    PRInt32 access = 0;
-    PRInt32 flags = 0;
-    PRInt32 flag6 = 0;
-    SECURITY_ATTRIBUTES sa;
-    LPSECURITY_ATTRIBUTES lpSA = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    PACL pACL = NULL;
-
-    if (osflags & PR_CREATE_FILE) {
-        if (_PR_NT_MakeSecurityDescriptorACL(mode, fileAccessTable,
-                &pSD, &pACL) == PR_SUCCESS) {
-            sa.nLength = sizeof(sa);
-            sa.lpSecurityDescriptor = pSD;
-            sa.bInheritHandle = FALSE;
-            lpSA = &sa;
-        }
-    }
-
-    if (osflags & PR_SYNC) flag6 = FILE_FLAG_WRITE_THROUGH;
-
-    if (osflags & PR_RDONLY || osflags & PR_RDWR)
-        access |= GENERIC_READ;
-    if (osflags & PR_WRONLY || osflags & PR_RDWR)
-        access |= GENERIC_WRITE;
- 
-    if ( osflags & PR_CREATE_FILE && osflags & PR_EXCL )
-        flags = CREATE_NEW;
-    else if (osflags & PR_CREATE_FILE) {
-        if (osflags & PR_TRUNCATE)
-            flags = CREATE_ALWAYS;
-        else
-            flags = OPEN_ALWAYS;
-    } else {
-        if (osflags & PR_TRUNCATE)
-            flags = TRUNCATE_EXISTING;
-        else
-            flags = OPEN_EXISTING;
-    }
-
-    file = createFileW(name,
-                       access,
-                       FILE_SHARE_READ|FILE_SHARE_WRITE,
-                       lpSA,
-                       flags,
-                       flag6,
-                       NULL);
-    if (lpSA != NULL) {
-        _PR_NT_FreeSecurityDescriptorACL(pSD, pACL);
-    }
-    if (file == INVALID_HANDLE_VALUE) {
-        _PR_MD_MAP_OPEN_ERROR(GetLastError());
-        return -1;
-    }
- 
-    return (PROsfd)file;
-}
- 
-PRStatus
-_PR_MD_OPEN_DIR_UTF16(_MDDirUTF16 *d, const PRUnichar *name)
-{
-    PRUnichar filename[ MAX_PATH ];
-    int len;
-
-    len = wcslen(name);
-    /* Need 5 bytes for \*.* and the trailing null byte. */
-    if (len + 5 > MAX_PATH) {
-        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-        return PR_FAILURE;
-    }
-    wcscpy(filename, name);
-
-    /*
-     * If 'name' ends in a slash or backslash, do not append
-     * another backslash.
-     */
-    if (filename[len - 1] == L'/' || filename[len - 1] == L'\\') {
-        len--;
-    }
-    wcscpy(&filename[len], L"\\*.*");
-    FlipSlashesW( filename, wcslen(filename) );
-
-    d->d_hdl = findFirstFileW( filename, &(d->d_entry) );
-    if ( d->d_hdl == INVALID_HANDLE_VALUE ) {
-        _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-        return PR_FAILURE;
-    }
-    d->firstEntry = PR_TRUE;
-    d->magic = _MD_MAGIC_DIR;
-    return PR_SUCCESS;
-}
-
-PRUnichar *
-_PR_MD_READ_DIR_UTF16(_MDDirUTF16 *d, PRIntn flags)
-{
-    PRInt32 err;
-    BOOL rv;
-    PRUnichar *fileName;
-
-    if ( d ) {
-        while (1) {
-            if (d->firstEntry) {
-                d->firstEntry = PR_FALSE;
-                rv = 1;
-            } else {
-                rv = findNextFileW(d->d_hdl, &(d->d_entry));
-            }
-            if (rv == 0) {
-                break;
-            }
-            fileName = GetFileFromDIR(d);
-            if ( (flags & PR_SKIP_DOT) &&
-                 (fileName[0] == L'.') && (fileName[1] == L'\0'))
-                continue;
-            if ( (flags & PR_SKIP_DOT_DOT) &&
-                 (fileName[0] == L'.') && (fileName[1] == L'.') &&
-                 (fileName[2] == L'\0'))
-                continue;
-            if ( (flags & PR_SKIP_HIDDEN) && FileIsHidden(d))
-                continue;
-            return fileName;
-        }
-        err = GetLastError();
-        PR_ASSERT(NO_ERROR != err);
-        _PR_MD_MAP_READDIR_ERROR(err);
-        return NULL;
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return NULL;
-}
- 
-PRStatus
-_PR_MD_CLOSE_DIR_UTF16(_MDDirUTF16 *d)
-{
-    if ( d ) {
-        if (FindClose(d->d_hdl)) {
-            d->magic = (PRUint32)-1;
-            return PR_SUCCESS;
-        } else {
-            _PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
-            return PR_FAILURE;
-        }
-    }
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return PR_FAILURE;
-}
-
-#define _PR_IS_W_SLASH(ch) ((ch) == L'/' || (ch) == L'\\')
-
-/*
- * IsRootDirectoryW --
- *
- * Return PR_TRUE if the pathname 'fn' is a valid root directory,
- * else return PR_FALSE.  The PRUnichar buffer pointed to by 'fn' must
- * be writable.  During the execution of this function, the contents
- * of the buffer pointed to by 'fn' may be modified, but on return
- * the original contents will be restored.  'buflen' is the size of
- * the buffer pointed to by 'fn', in PRUnichars.
- *
- * Root directories come in three formats:
- * 1. / or \, meaning the root directory of the current drive.
- * 2. C:/ or C:\, where C is a drive letter.
- * 3. \\<server name>\<share point name>\ or
- *    \\<server name>\<share point name>, meaning the root directory
- *    of a UNC (Universal Naming Convention) name.
- */
-
-static PRBool
-IsRootDirectoryW(PRUnichar *fn, size_t buflen)
-{
-    PRUnichar *p;
-    PRBool slashAdded = PR_FALSE;
-    PRBool rv = PR_FALSE;
-
-    if (_PR_IS_W_SLASH(fn[0]) && fn[1] == L'\0') {
-        return PR_TRUE;
-    }
-
-    if (iswalpha(fn[0]) && fn[1] == L':' && _PR_IS_W_SLASH(fn[2])
-            && fn[3] == L'\0') {
-        rv = getDriveTypeW(fn) > 1 ? PR_TRUE : PR_FALSE;
-        return rv;
-    }
-
-    /* The UNC root directory */
-
-    if (_PR_IS_W_SLASH(fn[0]) && _PR_IS_W_SLASH(fn[1])) {
-        /* The 'server' part should have at least one character. */
-        p = &fn[2];
-        if (*p == L'\0' || _PR_IS_W_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the next slash */
-        do {
-            p++;
-        } while (*p != L'\0' && !_PR_IS_W_SLASH(*p));
-        if (*p == L'\0') {
-            return PR_FALSE;
-        }
-
-        /* The 'share' part should have at least one character. */
-        p++;
-        if (*p == L'\0' || _PR_IS_W_SLASH(*p)) {
-            return PR_FALSE;
-        }
-
-        /* look for the final slash */
-        do {
-            p++;
-        } while (*p != L'\0' && !_PR_IS_W_SLASH(*p));
-        if (_PR_IS_W_SLASH(*p) && p[1] != L'\0') {
-            return PR_FALSE;
-        }
-        if (*p == L'\0') {
-            /*
-             * GetDriveType() doesn't work correctly if the
-             * path is of the form \\server\share, so we add
-             * a final slash temporarily.
-             */
-            if ((p + 1) < (fn + buflen)) {
-                *p++ = L'\\';
-                *p = L'\0';
-                slashAdded = PR_TRUE;
-            } else {
-                return PR_FALSE; /* name too long */
-            }
-        }
-        rv = getDriveTypeW(fn) > 1 ? PR_TRUE : PR_FALSE;
-        /* restore the 'fn' buffer */
-        if (slashAdded) {
-            *--p = L'\0';
-        }
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_GETFILEINFO64_UTF16(const PRUnichar *fn, PRFileInfo64 *info)
-{
-    HANDLE hFindFile;
-    WIN32_FIND_DATAW findFileData;
-    PRUnichar pathbuf[MAX_PATH + 1];
-
-    if (NULL == fn || L'\0' == *fn) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-
-    /*
-     * FindFirstFile() expands wildcard characters.  So
-     * we make sure the pathname contains no wildcard.
-     */
-    if (NULL != wcspbrk(fn, L"?*")) {
-        PR_SetError(PR_FILE_NOT_FOUND_ERROR, 0);
-        return -1;
-    }
-
-    hFindFile = findFirstFileW(fn, &findFileData);
-    if (INVALID_HANDLE_VALUE == hFindFile) {
-        DWORD len;
-        PRUnichar *filePart;
-
-        /*
-         * FindFirstFile() does not work correctly on root directories.
-         * It also doesn't work correctly on a pathname that ends in a
-         * slash.  So we first check to see if the pathname specifies a
-         * root directory.  If not, and if the pathname ends in a slash,
-         * we remove the final slash and try again.
-         */
-
-        /*
-         * If the pathname does not contain ., \, and /, it cannot be
-         * a root directory or a pathname that ends in a slash.
-         */
-        if (NULL == wcspbrk(fn, L".\\/")) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } 
-        len = getFullPathNameW(fn, sizeof(pathbuf)/sizeof(pathbuf[0]), pathbuf,
-                &filePart);
-        if (0 == len) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        }
-        if (len > sizeof(pathbuf)/sizeof(pathbuf[0])) {
-            PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
-            return -1;
-        }
-        if (IsRootDirectoryW(pathbuf, sizeof(pathbuf)/sizeof(pathbuf[0]))) {
-            info->type = PR_FILE_DIRECTORY;
-            info->size = 0;
-            /*
-             * These timestamps don't make sense for root directories.
-             */
-            info->modifyTime = 0;
-            info->creationTime = 0;
-            return 0;
-        }
-        if (!_PR_IS_W_SLASH(pathbuf[len - 1])) {
-            _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-            return -1;
-        } else {
-            pathbuf[len - 1] = L'\0';
-            hFindFile = findFirstFileW(pathbuf, &findFileData);
-            if (INVALID_HANDLE_VALUE == hFindFile) {
-                _PR_MD_MAP_OPENDIR_ERROR(GetLastError());
-                return -1;
-            }
-        }
-    }
-
-    FindClose(hFindFile);
-
-    if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        info->type = PR_FILE_DIRECTORY;
-    } else {
-        info->type = PR_FILE_FILE;
-    }
-
-    info->size = findFileData.nFileSizeHigh;
-    info->size = (info->size << 32) + findFileData.nFileSizeLow;
-
-    _PR_FileTimeToPRTime(&findFileData.ftLastWriteTime, &info->modifyTime);
-
-    if (0 == findFileData.ftCreationTime.dwLowDateTime &&
-            0 == findFileData.ftCreationTime.dwHighDateTime) {
-        info->creationTime = info->modifyTime;
-    } else {
-        _PR_FileTimeToPRTime(&findFileData.ftCreationTime,
-                &info->creationTime);
-    }
-
-    return 0;
-}
-/* ================ end of UTF16 Interfaces ================================ */
-#endif /* MOZ_UNICODE */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w95sock.c b/libs/js/nsprpub/pr/src/md/windows/w95sock.c
deleted file mode 100644
index 58d6f6a00e..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w95sock.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Win95 Sockets module
- *
- */
-
-#include "primpl.h"
-
-#define READ_FD     1
-#define WRITE_FD    2
-#define CONNECT_FD  3
-
-static PRInt32 socket_io_wait(
-    PROsfd osfd, 
-    PRInt32 fd_type,
-    PRIntervalTime timeout);
-
-
-/* --- SOCKET IO --------------------------------------------------------- */
-
-
-PROsfd
-_PR_MD_SOCKET(int af, int type, int flags)
-{
-    SOCKET sock;
-    u_long one = 1;
-
-    sock = socket(af, type, flags);
-
-    if (sock == INVALID_SOCKET ) 
-    {
-        _PR_MD_MAP_SOCKET_ERROR(WSAGetLastError());
-        return (PROsfd)sock;
-    }
-
-    /*
-    ** Make the socket Non-Blocking
-    */
-    if (ioctlsocket( sock, FIONBIO, &one) != 0)
-    {
-        PR_SetError(PR_UNKNOWN_ERROR, WSAGetLastError());
-        closesocket(sock);
-        return -1;
-    }
-
-    return (PROsfd)sock;
-}
-
-/*
-** _MD_CloseSocket() -- Close a socket
-**
-*/
-PRInt32
-_MD_CloseSocket(PROsfd osfd)
-{
-    PRInt32 rv;
-
-    rv = closesocket((SOCKET) osfd );
-    if (rv < 0)
-        _PR_MD_MAP_CLOSE_ERROR(WSAGetLastError());
-
-    return rv;
-}
-
-PRInt32
-_MD_SocketAvailable(PRFileDesc *fd)
-{
-    PRInt32 result;
-
-    if (ioctlsocket(fd->secret->md.osfd, FIONREAD, &result) < 0) {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, WSAGetLastError());
-        return -1;
-    }
-    return result;
-}
-
-PROsfd _MD_Accept(
-    PRFileDesc *fd, 
-    PRNetAddr *raddr, 
-    PRUint32 *rlen,
-    PRIntervalTime timeout )
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    SOCKET sock;
-    PRInt32 rv, err;
-
-    while ((sock = accept(osfd, (struct sockaddr *) raddr, rlen)) == -1) 
-    {
-        err = WSAGetLastError();
-        if ((err == WSAEWOULDBLOCK) && (!fd->secret->nonblocking))
-        {
-            if ((rv = socket_io_wait(osfd, READ_FD, timeout)) < 0)
-            {
-                break;
-            }
-        }
-        else
-        {
-            _PR_MD_MAP_ACCEPT_ERROR(err);
-            break;
-        }
-    }
-    return(sock);
-} /* end _MD_accept() */
-
-PRInt32
-_PR_MD_CONNECT(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen, 
-               PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv;
-    int     err;
-
-    if ((rv = connect(osfd, (struct sockaddr *) addr, addrlen)) == -1) 
-    {
-        err = WSAGetLastError();
-        if ((!fd->secret->nonblocking) && (err == WSAEWOULDBLOCK))
-        {
-            rv = socket_io_wait(osfd, CONNECT_FD, timeout);
-            if ( rv < 0 )
-            {
-                return(-1);
-            }
-            else
-            {
-                PR_ASSERT(rv > 0);
-                /* it's connected */
-                return(0);
-            } 
-        }
-        _PR_MD_MAP_CONNECT_ERROR(err);
-    }
-    return rv;
-}
-
-PRInt32
-_PR_MD_BIND(PRFileDesc *fd, const PRNetAddr *addr, PRUint32 addrlen)
-{
-    PRInt32 rv;
-
-    rv = bind(fd->secret->md.osfd, (const struct sockaddr *)&(addr->inet), addrlen);
-
-    if (rv == SOCKET_ERROR)  {
-        _PR_MD_MAP_BIND_ERROR(WSAGetLastError());
-        return -1;
-    }
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_LISTEN(PRFileDesc *fd, PRIntn backlog)
-{
-    PRInt32 rv;
-
-    rv = listen(fd->secret->md.osfd, backlog);
-
-    if (rv == SOCKET_ERROR)  {
-        _PR_MD_MAP_DEFAULT_ERROR(WSAGetLastError());
-        return -1;
-    }
-
-    return 0;
-}
-
-PRInt32
-_PR_MD_RECV(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags, 
-            PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    int osflags;
-
-    if (0 == flags) {
-        osflags = 0;
-    } else {
-        PR_ASSERT(PR_MSG_PEEK == flags);
-        osflags = MSG_PEEK;
-    }
-    while ((rv = recv( osfd, buf, amount, osflags)) == -1) 
-    {
-        if (((err = WSAGetLastError()) == WSAEWOULDBLOCK) 
-            && (!fd->secret->nonblocking))
-        {
-            rv = socket_io_wait(osfd, READ_FD, timeout);
-            if ( rv < 0 )
-            {
-                return -1;
-            } 
-        } 
-        else 
-        {
-            _PR_MD_MAP_RECV_ERROR(err);
-            break;
-        }
-    } /* end while() */
-    return(rv);
-}
-
-PRInt32
-_PR_MD_SEND(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-            PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRInt32 bytesSent = 0;
-
-    while(bytesSent < amount ) 
-    {
-        while ((rv = send( osfd, buf, amount, 0 )) == -1) 
-        {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK) 
-                && (!fd->secret->nonblocking))
-            {
-                rv = socket_io_wait(osfd, WRITE_FD, timeout);
-                if ( rv < 0 )
-                {
-                    return -1;
-                }
-            } 
-            else 
-            {
-                _PR_MD_MAP_SEND_ERROR(err);
-                return -1;
-            }
-        }
-        bytesSent += rv;
-        if (fd->secret->nonblocking)
-        {
-            break;
-        }
-        if (bytesSent < amount) 
-        {
-            rv = socket_io_wait(osfd, WRITE_FD, timeout);
-            if ( rv < 0 )
-            {
-                return -1;
-            }
-        }
-    }
-    return bytesSent;
-}
-
-PRInt32
-_PR_MD_SENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-              const PRNetAddr *addr, PRUint32 addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-    PRInt32 bytesSent = 0;
-
-    while(bytesSent < amount) 
-    {
-        while ((rv = sendto( osfd, buf, amount, 0, (struct sockaddr *) addr,
-                addrlen)) == -1) 
-        {
-            if (((err = WSAGetLastError()) == WSAEWOULDBLOCK) 
-                && (!fd->secret->nonblocking))
-            {
-                rv = socket_io_wait(osfd, WRITE_FD, timeout);
-                if ( rv < 0 )
-                {
-                    return -1;
-                }
-            } 
-            else 
-            {
-                _PR_MD_MAP_SENDTO_ERROR(err);
-                return -1;
-            }
-        }
-        bytesSent += rv;
-        if (fd->secret->nonblocking)
-        {
-            break;
-        }
-        if (bytesSent < amount) 
-        {
-            rv = socket_io_wait(osfd, WRITE_FD, timeout);
-            if (rv < 0) 
-            {
-                return -1;
-            }
-        }
-    }
-    return bytesSent;
-}
-
-PRInt32
-_PR_MD_RECVFROM(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-                PRNetAddr *addr, PRUint32 *addrlen, PRIntervalTime timeout)
-{
-    PROsfd osfd = fd->secret->md.osfd;
-    PRInt32 rv, err;
-
-    while ((rv = recvfrom( osfd, buf, amount, 0, (struct sockaddr *) addr,
-            addrlen)) == -1) 
-    {
-        if (((err = WSAGetLastError()) == WSAEWOULDBLOCK) 
-            && (!fd->secret->nonblocking))
-        {
-            rv = socket_io_wait(osfd, READ_FD, timeout);
-            if ( rv < 0)
-            {
-                return -1;
-            } 
-        } 
-        else 
-        {
-            _PR_MD_MAP_RECVFROM_ERROR(err);
-            break;
-        }
-    }
-    return(rv);
-}
-
-PRInt32
-_PR_MD_WRITEV(PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size, PRIntervalTime timeout)
-{
-    int index;
-    int sent = 0;
-    int rv;
-
-    for (index=0; index < iov_size; index++) 
-    {
-        rv = _PR_MD_SEND(fd, iov[index].iov_base, iov[index].iov_len, 0, timeout);
-        if (rv > 0) 
-            sent += rv;
-        if ( rv != iov[index].iov_len ) 
-        {
-            if (rv < 0)
-            {
-                if (fd->secret->nonblocking
-                    && (PR_GetError() == PR_WOULD_BLOCK_ERROR)
-                    && (sent > 0))
-                {
-                    return sent;
-                }
-                else
-                {
-                    return -1;
-                }
-            }
-            /* Only a nonblocking socket can have partial sends */
-            PR_ASSERT(fd->secret->nonblocking);
-            return sent;
-        }
-    }
-    return sent;
-}
-
-PRInt32
-_PR_MD_SHUTDOWN(PRFileDesc *fd, PRIntn how)
-{
-PRInt32 rv;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-    if (rv < 0)
-        _PR_MD_MAP_SHUTDOWN_ERROR(WSAGetLastError());
-    return rv;
-}
-
-PRStatus
-_PR_MD_GETSOCKNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    rv = getsockname((SOCKET)fd->secret->md.osfd, (struct sockaddr *)addr, len);
-    if (rv==0) {
-        return PR_SUCCESS;
-    } else {
-        _PR_MD_MAP_GETSOCKNAME_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_GETPEERNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len)
-{
-    PRInt32 rv;
-
-    rv = getpeername((SOCKET)fd->secret->md.osfd, (struct sockaddr *)addr, len);
-    if (rv==0) {
-        return PR_SUCCESS;
-    } else {
-        _PR_MD_MAP_GETPEERNAME_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_GETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, char* optval, PRInt32* optlen)
-{
-    PRInt32 rv;
-
-    rv = getsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv==0) {
-        return PR_SUCCESS;
-    } else {
-        _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-PRStatus
-_PR_MD_SETSOCKOPT(PRFileDesc *fd, PRInt32 level, PRInt32 optname, const char* optval, PRInt32 optlen)
-{
-    PRInt32 rv;
-
-    rv = setsockopt((SOCKET)fd->secret->md.osfd, level, optname, optval, optlen);
-    if (rv==0) {
-        return PR_SUCCESS;
-    } else {
-        _PR_MD_MAP_SETSOCKOPT_ERROR(WSAGetLastError());
-        return PR_FAILURE;
-    }
-}
-
-void
-_MD_MakeNonblock(PRFileDesc *f)
-{
-    return; /* do nothing */
-}
-
-
-
-/*
- * socket_io_wait --
- *
- * Wait for socket i/o, periodically checking for interrupt.
- *
- * This function returns 1 on success.  On failure, it returns
- * -1 and sets the error codes.  It never returns 0.
- */
-#define _PR_INTERRUPT_CHECK_INTERVAL_SECS 5
-
-static PRInt32 socket_io_wait(
-    PROsfd osfd, 
-    PRInt32 fd_type,
-    PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-    struct timeval tv;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntervalTime elapsed, remaining;
-    PRBool wait_for_remaining;
-    fd_set rd_wr, ex;
-    int err, len;
-
-    switch (timeout) {
-        case PR_INTERVAL_NO_WAIT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-            break;
-        case PR_INTERVAL_NO_TIMEOUT:
-            /*
-             * This is a special case of the 'default' case below.
-             * Please see the comments there.
-             */
-            tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-            tv.tv_usec = 0;
-            FD_ZERO(&rd_wr);
-            FD_ZERO(&ex);
-            do {
-                FD_SET(osfd, &rd_wr);
-                FD_SET(osfd, &ex);
-                switch( fd_type )
-                {
-                    case READ_FD:
-                        rv = _MD_SELECT(0, &rd_wr, NULL, NULL, &tv);
-                        break;
-                    case WRITE_FD:
-                        rv = _MD_SELECT(0, NULL, &rd_wr, NULL, &tv);
-                        break;
-                    case CONNECT_FD:
-                        rv = _MD_SELECT(0, NULL, &rd_wr, &ex, &tv);
-                        break;
-                    default:
-                        PR_ASSERT(0);
-                        break;
-                } /* end switch() */
-                if (rv == -1 )
-                {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                    break;
-                }
-                if ( rv > 0 && fd_type == CONNECT_FD )
-                {
-                    /*
-                     * Call Sleep(0) to work around a Winsock timing bug.
-                     */
-                    Sleep(0);
-                    if (FD_ISSET((SOCKET)osfd, &ex))
-                    {
-                        len = sizeof(err);
-                        if (getsockopt(osfd, SOL_SOCKET, SO_ERROR,
-                                (char *) &err, &len) == SOCKET_ERROR)
-                        {  
-                            _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-                            return -1;
-                        }
-                        if (err != 0)
-                            _PR_MD_MAP_CONNECT_ERROR(err);
-                        else
-                            PR_SetError(PR_UNKNOWN_ERROR, 0);
-                        return -1;
-                    }
-                    if (FD_ISSET((SOCKET)osfd, &rd_wr))
-                    {
-                        /* it's connected */
-                        return 1;
-                    }
-                    PR_ASSERT(0);
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-            } while (rv == 0);
-            break;
-        default:
-            remaining = timeout;
-            FD_ZERO(&rd_wr);
-            FD_ZERO(&ex);
-            do {
-                /*
-                 * We block in _MD_SELECT for at most
-                 * _PR_INTERRUPT_CHECK_INTERVAL_SECS seconds,
-                 * so that there is an upper limit on the delay
-                 * before the interrupt bit is checked.
-                 */
-                wait_for_remaining = PR_TRUE;
-                tv.tv_sec = PR_IntervalToSeconds(remaining);
-                if (tv.tv_sec > _PR_INTERRUPT_CHECK_INTERVAL_SECS) {
-                    wait_for_remaining = PR_FALSE;
-                    tv.tv_sec = _PR_INTERRUPT_CHECK_INTERVAL_SECS;
-                    tv.tv_usec = 0;
-                } else {
-                    tv.tv_usec = PR_IntervalToMicroseconds(
-                        remaining -
-                        PR_SecondsToInterval(tv.tv_sec));
-                }
-                FD_SET(osfd, &rd_wr);
-                FD_SET(osfd, &ex);
-                switch( fd_type )
-                {
-                    case READ_FD:
-                        rv = _MD_SELECT(0, &rd_wr, NULL, NULL, &tv);
-                        break;
-                    case WRITE_FD:
-                        rv = _MD_SELECT(0, NULL, &rd_wr, NULL, &tv);
-                        break;
-                    case CONNECT_FD:
-                        rv = _MD_SELECT(0, NULL, &rd_wr, &ex, &tv);
-                        break;
-                    default:
-                        PR_ASSERT(0);
-                        break;
-                } /* end switch() */
-                if (rv == -1)
-                {
-                    _PR_MD_MAP_SELECT_ERROR(WSAGetLastError());
-                    break;
-                }
-                if ( rv > 0 && fd_type == CONNECT_FD )
-                {
-                    /*
-                     * Call Sleep(0) to work around a Winsock timing bug.
-                     */
-                    Sleep(0);
-                    if (FD_ISSET((SOCKET)osfd, &ex))
-                    {
-                        len = sizeof(err);
-                        if (getsockopt(osfd, SOL_SOCKET, SO_ERROR,
-                                (char *) &err, &len) == SOCKET_ERROR)
-                        {  
-                            _PR_MD_MAP_GETSOCKOPT_ERROR(WSAGetLastError());
-                            return -1;
-                        }
-                        if (err != 0)
-                            _PR_MD_MAP_CONNECT_ERROR(err);
-                        else
-                            PR_SetError(PR_UNKNOWN_ERROR, 0);
-                        return -1;
-                    }
-                    if (FD_ISSET((SOCKET)osfd, &rd_wr))
-                    {
-                        /* it's connected */
-                        return 1;
-                    }
-                    PR_ASSERT(0);
-                }
-                if (_PR_PENDING_INTERRUPT(me)) {
-                    me->flags &= ~_PR_INTERRUPT;
-                    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-                    rv = -1;
-                    break;
-                }
-                /*
-                 * We loop again if _MD_SELECT timed out and the
-                 * timeout deadline has not passed yet.
-                 */
-                if (rv == 0 )
-                {
-                    if (wait_for_remaining) {
-                        elapsed = remaining;
-                    } else {
-                        elapsed = PR_SecondsToInterval(tv.tv_sec) 
-                                    + PR_MicrosecondsToInterval(tv.tv_usec);
-                    }
-                    if (elapsed >= remaining) {
-                        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-                        rv = -1;
-                        break;
-                    } else {
-                        remaining = remaining - elapsed;
-                    }
-                }
-            } while (rv == 0 );
-            break;
-    }
-    return(rv);
-} /* end socket_io_wait() */
diff --git a/libs/js/nsprpub/pr/src/md/windows/w95thred.c b/libs/js/nsprpub/pr/src/md/windows/w95thred.c
deleted file mode 100644
index 89cd39ab0e..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/w95thred.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <process.h>  /* for _beginthreadex() */
-
-#if _MSC_VER <= 1200
-/*
- * VC++ 6.0 doesn't have DWORD_PTR.
- */
-
-typedef DWORD DWORD_PTR;
-#endif /* _MSC_VER <= 1200 */
-
-/* --- globals ------------------------------------------------ */
-#ifdef _PR_USE_STATIC_TLS
-__declspec(thread) struct PRThread  *_pr_thread_last_run;
-__declspec(thread) struct PRThread  *_pr_currentThread;
-__declspec(thread) struct _PRCPU    *_pr_currentCPU;
-#else
-DWORD _pr_currentThreadIndex;
-DWORD _pr_lastThreadIndex;
-DWORD _pr_currentCPUIndex;
-#endif
-int                           _pr_intsOff = 0; 
-_PRInterruptTable             _pr_interruptTable[] = { { 0 } };
-
-void
-_PR_MD_EARLY_INIT()
-{
-#ifndef _PR_USE_STATIC_TLS
-    _pr_currentThreadIndex = TlsAlloc();
-    _pr_lastThreadIndex = TlsAlloc();
-    _pr_currentCPUIndex = TlsAlloc();
-#endif
-}
-
-void _PR_MD_CLEANUP_BEFORE_EXIT(void)
-{
-    _PR_NT_FreeSids();
-
-    WSACleanup();
-
-#ifndef _PR_USE_STATIC_TLS
-    TlsFree(_pr_currentThreadIndex);
-    TlsFree(_pr_lastThreadIndex);
-    TlsFree(_pr_currentCPUIndex);
-#endif
-}
-
-PRStatus
-_PR_MD_INIT_THREAD(PRThread *thread)
-{
-    if (thread->flags & (_PR_PRIMORDIAL | _PR_ATTACHED)) {
-        /*
-        ** Warning:
-        ** --------
-        ** NSPR requires a real handle to every thread.
-        ** GetCurrentThread() returns a pseudo-handle which
-        ** is not suitable for some thread operations (e.g.,
-        ** suspending).  Therefore, get a real handle from
-        ** the pseudo handle via DuplicateHandle(...)
-        */
-        DuplicateHandle(
-                GetCurrentProcess(),     /* Process of source handle */
-                GetCurrentThread(),      /* Pseudo Handle to dup */
-                GetCurrentProcess(),     /* Process of handle */
-                &(thread->md.handle),    /* resulting handle */
-                0L,                      /* access flags */
-                FALSE,                   /* Inheritable */
-                DUPLICATE_SAME_ACCESS);  /* Options */
-    }
-
-    /* Create the blocking IO semaphore */
-    thread->md.blocked_sema = CreateSemaphore(NULL, 0, 1, NULL);
-    if (thread->md.blocked_sema == NULL)
-        return PR_FAILURE;
-	else
-		return PR_SUCCESS;
-}
-
-static unsigned __stdcall
-pr_root(void *arg)
-{
-    PRThread *thread = (PRThread *)arg;
-    thread->md.start(thread);
-    return 0;
-}
-
-PRStatus 
-_PR_MD_CREATE_THREAD(PRThread *thread, 
-                  void (*start)(void *), 
-                  PRThreadPriority priority, 
-                  PRThreadScope scope, 
-                  PRThreadState state, 
-                  PRUint32 stackSize)
-{
-
-    thread->md.start = start;
-    thread->md.handle = (HANDLE) _beginthreadex(
-                    NULL,
-                    thread->stack->stackSize,
-                    pr_root,
-                    (void *)thread,
-                    CREATE_SUSPENDED,
-                    &(thread->id));
-    if(!thread->md.handle) {
-        return PR_FAILURE;
-    }
-
-    thread->md.id = thread->id;
-    /*
-     * On windows, a thread is created with a thread priority of
-     * THREAD_PRIORITY_NORMAL.
-     */
-    if (priority != PR_PRIORITY_NORMAL) {
-        _PR_MD_SET_PRIORITY(&(thread->md), priority);
-    }
-
-    /* Activate the thread */
-    if ( ResumeThread( thread->md.handle ) != -1)
-        return PR_SUCCESS;
-
-    return PR_FAILURE;
-}
-
-void    
-_PR_MD_YIELD(void)
-{
-    /* Can NT really yield at all? */
-    Sleep(0);
-}
-
-void     
-_PR_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
-{
-    int nativePri;
-    BOOL rv;
-
-    if (newPri < PR_PRIORITY_FIRST) {
-        newPri = PR_PRIORITY_FIRST;
-    } else if (newPri > PR_PRIORITY_LAST) {
-        newPri = PR_PRIORITY_LAST;
-    }
-    switch (newPri) {
-        case PR_PRIORITY_LOW:
-            nativePri = THREAD_PRIORITY_BELOW_NORMAL;
-            break;
-        case PR_PRIORITY_NORMAL:
-            nativePri = THREAD_PRIORITY_NORMAL;
-            break;
-        case PR_PRIORITY_HIGH:
-            nativePri = THREAD_PRIORITY_ABOVE_NORMAL;
-            break;
-        case PR_PRIORITY_URGENT:
-            nativePri = THREAD_PRIORITY_HIGHEST;
-    }
-    rv = SetThreadPriority(thread->handle, nativePri);
-    PR_ASSERT(rv);
-    if (!rv) {
-	PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-                ("PR_SetThreadPriority: can't set thread priority\n"));
-    }
-    return;
-}
-
-void
-_PR_MD_CLEAN_THREAD(PRThread *thread)
-{
-    BOOL rv;
-
-    if (thread->md.blocked_sema) {
-        rv = CloseHandle(thread->md.blocked_sema);
-        PR_ASSERT(rv);
-        thread->md.blocked_sema = 0;
-    }
-
-    if (thread->md.handle) {
-        rv = CloseHandle(thread->md.handle);
-        PR_ASSERT(rv);
-        thread->md.handle = 0;
-    }
-}
-
-void
-_PR_MD_EXIT_THREAD(PRThread *thread)
-{
-    _PR_MD_CLEAN_THREAD(thread);
-    _PR_MD_SET_CURRENT_THREAD(NULL);
-}
-
-
-void
-_PR_MD_EXIT(PRIntn status)
-{
-    _exit(status);
-}
-
-PRInt32 _PR_MD_SETTHREADAFFINITYMASK(PRThread *thread, PRUint32 mask )
-{
-    DWORD_PTR rv;
-
-    rv = SetThreadAffinityMask(thread->md.handle, mask);
-
-    return rv?0:-1;
-}
-
-PRInt32 _PR_MD_GETTHREADAFFINITYMASK(PRThread *thread, PRUint32 *mask)
-{
-    BOOL rv;
-    DWORD_PTR process_mask;
-    DWORD_PTR system_mask;
-
-    rv = GetProcessAffinityMask(GetCurrentProcess(),
-            &process_mask, &system_mask);
-    if (rv)
-        *mask = (PRUint32)process_mask;
-
-    return rv?0:-1;
-}
-
-void 
-_PR_MD_SUSPEND_CPU(_PRCPU *cpu) 
-{
-    _PR_MD_SUSPEND_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_RESUME_CPU(_PRCPU *cpu)
-{
-    _PR_MD_RESUME_THREAD(cpu->thread);
-}
-
-void
-_PR_MD_SUSPEND_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        DWORD previousSuspendCount;
-        /* XXXMB - SuspendThread() is not a blocking call; how do we
-         * know when the thread is *REALLY* suspended?
-         */
-        previousSuspendCount = SuspendThread(thread->md.handle);
-        PR_ASSERT(previousSuspendCount == 0);
-    }
-}
-
-void
-_PR_MD_RESUME_THREAD(PRThread *thread)
-{
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        DWORD previousSuspendCount;
-        previousSuspendCount = ResumeThread(thread->md.handle);
-        PR_ASSERT(previousSuspendCount == 1);
-    }
-}
-
-PRThread*
-_MD_CURRENT_THREAD(void)
-{
-PRThread *thread;
-
-	thread = _MD_GET_ATTACHED_THREAD();
-
-   	if (NULL == thread) {
-		thread = _PRI_AttachThread(
-            PR_USER_THREAD, PR_PRIORITY_NORMAL, NULL, 0);
-	}
-	PR_ASSERT(thread != NULL);
-	return thread;
-}
diff --git a/libs/js/nsprpub/pr/src/md/windows/win32_errors.c b/libs/js/nsprpub/pr/src/md/windows/win32_errors.c
deleted file mode 100644
index ced1b7aa3d..0000000000
--- a/libs/js/nsprpub/pr/src/md/windows/win32_errors.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prerror.h"
-#include "prlog.h"
-#include <errno.h>
-#include <windows.h>
-
-/*
- * On Win32, we map three kinds of error codes:
- * - GetLastError(): for Win32 functions
- * - WSAGetLastError(): for Winsock functions
- * - errno: for standard C library functions
- * 
- * GetLastError() and WSAGetLastError() return error codes in
- * non-overlapping ranges, so their error codes (ERROR_* and
- * WSAE*) can be mapped by the same function.  On the other hand,
- * errno and GetLastError() have overlapping ranges, so we need
- * to use a separate function to map errno.
- *
- * We do not check for WSAEINPROGRESS and WSAEINTR because we do not
- * use blocking Winsock 1.1 calls.
- *
- * Except for the 'socket' call, we do not check for WSAEINITIALISED.
- * It is assumed that if Winsock is not initialized, that fact will
- * be detected at the time we create new sockets.
- */
-
-static void _MD_win32_map_default_errno(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case EACCES:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case ENOENT:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        default:
-            prError = PR_UNKNOWN_ERROR;
-            break;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_default_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case ERROR_ACCESS_DENIED:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case ERROR_ALREADY_EXISTS:
-            prError = PR_FILE_EXISTS_ERROR;
-            break;
-        case ERROR_CALL_NOT_IMPLEMENTED:
-            prError = PR_NOT_IMPLEMENTED_ERROR;
-            break;
-        case ERROR_DISK_CORRUPT:
-            prError = PR_IO_ERROR; 
-            break;
-        case ERROR_DISK_FULL:
-            prError = PR_NO_DEVICE_SPACE_ERROR;
-            break;
-        case ERROR_DISK_OPERATION_FAILED:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_DRIVE_LOCKED:
-            prError = PR_FILE_IS_LOCKED_ERROR;
-            break;
-        case ERROR_FILENAME_EXCED_RANGE:
-            prError = PR_NAME_TOO_LONG_ERROR;
-            break;
-        case ERROR_FILE_CORRUPT:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_FILE_EXISTS:
-            prError = PR_FILE_EXISTS_ERROR;
-            break;
-        case ERROR_FILE_INVALID:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        case ERROR_FILE_NOT_FOUND:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case ERROR_HANDLE_DISK_FULL:
-            prError = PR_NO_DEVICE_SPACE_ERROR;
-            break;
-        case ERROR_INVALID_ADDRESS:
-            prError = PR_ACCESS_FAULT_ERROR;
-            break;
-        case ERROR_INVALID_HANDLE:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        case ERROR_INVALID_NAME:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case ERROR_INVALID_PARAMETER:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case ERROR_INVALID_USER_BUFFER:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case ERROR_LOCKED:
-            prError = PR_FILE_IS_LOCKED_ERROR;
-            break;
-        case ERROR_NETNAME_DELETED:
-            prError = PR_CONNECT_RESET_ERROR;
-            break;
-        case ERROR_NOACCESS:
-            prError = PR_ACCESS_FAULT_ERROR;
-            break;
-        case ERROR_NOT_ENOUGH_MEMORY:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case ERROR_NOT_ENOUGH_QUOTA:
-            prError = PR_OUT_OF_MEMORY_ERROR;
-            break;
-        case ERROR_NOT_READY:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_NO_MORE_FILES:
-            prError = PR_NO_MORE_FILES_ERROR;
-            break;
-        case ERROR_OPEN_FAILED:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_OPEN_FILES:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_OPERATION_ABORTED:
-            prError = PR_OPERATION_ABORTED_ERROR;
-            break;
-        case ERROR_OUTOFMEMORY:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case ERROR_PATH_BUSY:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_PATH_NOT_FOUND:
-            prError = PR_FILE_NOT_FOUND_ERROR;
-            break;
-        case ERROR_SEEK_ON_DEVICE:
-            prError = PR_IO_ERROR;
-            break;
-        case ERROR_SHARING_VIOLATION:
-            prError = PR_FILE_IS_BUSY_ERROR;
-            break;
-        case ERROR_STACK_OVERFLOW:
-            prError = PR_ACCESS_FAULT_ERROR;
-            break;
-        case ERROR_TOO_MANY_OPEN_FILES:
-            prError = PR_SYS_DESC_TABLE_FULL_ERROR;
-            break;
-        case ERROR_WRITE_PROTECT:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case WSAEACCES:
-            prError = PR_NO_ACCESS_RIGHTS_ERROR;
-            break;
-        case WSAEADDRINUSE:
-            prError = PR_ADDRESS_IN_USE_ERROR;
-            break;
-        case WSAEADDRNOTAVAIL:
-            prError = PR_ADDRESS_NOT_AVAILABLE_ERROR;
-            break;
-        case WSAEAFNOSUPPORT:
-            prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
-            break;
-        case WSAEALREADY:
-            prError = PR_ALREADY_INITIATED_ERROR;
-            break;
-        case WSAEBADF:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        case WSAECONNABORTED:
-            prError = PR_CONNECT_ABORTED_ERROR;
-            break;
-        case WSAECONNREFUSED:
-            prError = PR_CONNECT_REFUSED_ERROR;
-            break;
-        case WSAECONNRESET:
-            prError = PR_CONNECT_RESET_ERROR;
-            break;
-        case WSAEDESTADDRREQ:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case WSAEFAULT:
-            prError = PR_ACCESS_FAULT_ERROR;
-            break;
-        case WSAEHOSTUNREACH:
-            prError = PR_HOST_UNREACHABLE_ERROR;
-            break;
-        case WSAEINVAL:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case WSAEISCONN:
-            prError = PR_IS_CONNECTED_ERROR;
-            break;
-        case WSAEMFILE:
-            prError = PR_PROC_DESC_TABLE_FULL_ERROR;
-            break;
-        case WSAEMSGSIZE:
-            prError = PR_BUFFER_OVERFLOW_ERROR;
-            break;
-        case WSAENETDOWN:
-            prError = PR_NETWORK_DOWN_ERROR;
-            break;
-        case WSAENETRESET:
-            prError = PR_CONNECT_ABORTED_ERROR;
-            break;
-        case WSAENETUNREACH:
-            prError = PR_NETWORK_UNREACHABLE_ERROR;
-            break;
-        case WSAENOBUFS:
-            prError = PR_INSUFFICIENT_RESOURCES_ERROR;
-            break;
-        case WSAENOPROTOOPT:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case WSAENOTCONN:
-            prError = PR_NOT_CONNECTED_ERROR;
-            break;
-        case WSAENOTSOCK:
-            prError = PR_NOT_SOCKET_ERROR;
-            break;
-        case WSAEOPNOTSUPP:
-            prError = PR_OPERATION_NOT_SUPPORTED_ERROR;
-            break;
-        case WSAEPROTONOSUPPORT:
-            prError = PR_PROTOCOL_NOT_SUPPORTED_ERROR;
-            break;
-        case WSAEPROTOTYPE:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case WSAESHUTDOWN:
-            prError = PR_SOCKET_SHUTDOWN_ERROR;
-            break;
-        case WSAESOCKTNOSUPPORT:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        case WSAETIMEDOUT:
-            prError = PR_CONNECT_ABORTED_ERROR;
-            break;
-        case WSAEWOULDBLOCK:
-            prError = PR_WOULD_BLOCK_ERROR;
-            break;
-        default:
-            prError = PR_UNKNOWN_ERROR;
-            break;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_opendir_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_closedir_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_unix_readdir_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_delete_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-/* The error code for stat() is in errno. */
-void _MD_win32_map_stat_error(PRInt32 err)
-{
-    _MD_win32_map_default_errno(err);
-}
-
-void _MD_win32_map_fstat_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_rename_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-/* The error code for access() is in errno. */
-void _MD_win32_map_access_error(PRInt32 err)
-{
-    _MD_win32_map_default_errno(err);
-}
-
-void _MD_win32_map_mkdir_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_rmdir_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_read_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_transmitfile_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_write_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_lseek_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_fsync_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-/*
- * For both CloseHandle() and closesocket().
- */
-void _MD_win32_map_close_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_socket_error(PRInt32 err)
-{
-    PR_ASSERT(err != WSANOTINITIALISED);
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_recv_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_recvfrom_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_send_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEMSGSIZE:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_sendto_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEMSGSIZE:
-            prError = PR_INVALID_ARGUMENT_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_accept_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEOPNOTSUPP:
-            prError = PR_NOT_TCP_SOCKET_ERROR;
-            break;
-        case WSAEINVAL:
-            prError = PR_INVALID_STATE_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_acceptex_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_connect_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEWOULDBLOCK:
-            prError = PR_IN_PROGRESS_ERROR;
-            break;
-        case WSAEINVAL:
-            prError = PR_ALREADY_INITIATED_ERROR;
-            break;
-        case WSAETIMEDOUT:
-            prError = PR_IO_TIMEOUT_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_bind_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEINVAL:
-            prError = PR_SOCKET_ADDRESS_IS_BOUND_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_listen_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEOPNOTSUPP:
-            prError = PR_NOT_TCP_SOCKET_ERROR;
-            break;
-        case WSAEINVAL:
-            prError = PR_INVALID_STATE_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_shutdown_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_getsockname_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAEINVAL:
-            prError = PR_INVALID_STATE_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_getpeername_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_getsockopt_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_setsockopt_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_open_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-void _MD_win32_map_gethostname_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
-
-/* Win32 select() only works on sockets.  So in this
-** context, WSAENOTSOCK is equivalent to EBADF on Unix.  
-*/
-void _MD_win32_map_select_error(PRInt32 err)
-{
-    PRErrorCode prError;
-
-    switch (err) {
-        case WSAENOTSOCK:
-            prError = PR_BAD_DESCRIPTOR_ERROR;
-            break;
-        default:
-            _MD_win32_map_default_error(err);
-            return;
-    }
-    PR_SetError(prError, err);
-}
-
-void _MD_win32_map_lockf_error(PRInt32 err)
-{
-    _MD_win32_map_default_error(err);
-}
diff --git a/libs/js/nsprpub/pr/src/memory/.cvsignore b/libs/js/nsprpub/pr/src/memory/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/memory/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/memory/Makefile.in b/libs/js/nsprpub/pr/src/memory/Makefile.in
deleted file mode 100644
index e8084437de..0000000000
--- a/libs/js/nsprpub/pr/src/memory/Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-CSRCS = prseg.c
-
-ifdef GC_LEAK_DETECTOR
-CSRCS += prgcleak.c
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-ifdef GC_LEAK_DETECTOR
-INCLUDES += -I$(dist_includedir)/.. -I$(dist_includedir)/../boehm
-endif
-
-DEFINES += -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
-
diff --git a/libs/js/nsprpub/pr/src/memory/prgcleak.c b/libs/js/nsprpub/pr/src/memory/prgcleak.c
deleted file mode 100644
index 414b3851d3..0000000000
--- a/libs/js/nsprpub/pr/src/memory/prgcleak.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Patrick Beard <beard@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * prgcleak.c
- */
-
-#ifdef GC_LEAK_DETECTOR
-
-/* for FILE */
-#include <stdio.h>
-
-/* NSPR stuff */
-#include "generic_threads.h"
-#include "primpl.h"
-
-extern FILE *GC_stdout, *GC_stderr;
-
-extern void GC_gcollect(void);
-extern void GC_clear_roots(void);
-
-static PRStatus PR_CALLBACK scanner(PRThread* t, void** baseAddr,
-                                    PRUword count, void* closure)
-{
-    if (count) {
-        char* begin = (char*)baseAddr;
-        char* end = (char*)(baseAddr + count);
-        GC_mark_range_proc marker = (GC_mark_range_proc) closure;
-        marker(begin, end);
-    }
-    return PR_SUCCESS;
-}
-
-static void mark_all_stacks(GC_mark_range_proc marker)
-{
-    PR_ScanStackPointers(&scanner, (void *)marker);
-}
-
-#if defined(_PR_PTHREADS)
-#define _PR_MD_CURRENT_CPU() 1
-#endif
-
-static void locker(void* mutex)
-{
-    if (_PR_MD_CURRENT_CPU())
-        PR_EnterMonitor(mutex);
-}
-
-static void unlocker(void* mutex)
-{
-    if (_PR_MD_CURRENT_CPU())
-        PR_ExitMonitor(mutex);
-}
-
-static void stopper(void* unused)
-{
-    if (_PR_MD_CURRENT_CPU())
-        PR_SuspendAll();
-}
-
-static void starter(void* unused)
-{
-    if (_PR_MD_CURRENT_CPU())
-        PR_ResumeAll();
-}
-
-void _PR_InitGarbageCollector()
-{
-    void* mutex;
-
-    /* redirect GC's stderr to catch startup leaks. */
-    GC_stderr = fopen("StartupLeaks", "w");
-
-    mutex = PR_NewMonitor();
-    PR_ASSERT(mutex != NULL);
-
-    GC_generic_init_threads(&mark_all_stacks, mutex,
-            &locker, &unlocker,
-            &stopper, &starter);
-}
-
-void _PR_ShutdownGarbageCollector()
-{
-    /* do anything you need to shut down the collector. */
-}
-
-#endif /* GC_LEAK_DETECTOR */
diff --git a/libs/js/nsprpub/pr/src/memory/prseg.c b/libs/js/nsprpub/pr/src/memory/prseg.c
deleted file mode 100644
index 14de6668fc..0000000000
--- a/libs/js/nsprpub/pr/src/memory/prseg.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#if defined(_PR_PTHREADS)
-
-/*
-** The pthreads version doesn't use these functions.
-*/
-void _PR_InitSegs(void)
-{
-}
-
-#else /* _PR_PTHREADS */
-
-void _PR_InitSegs(void)
-{
-	_PR_MD_INIT_SEGS();
-}
-
-/*
-** Allocate a memory segment. The size value is rounded up to the native
-** system page size and a page aligned portion of memory is returned.
-** This memory is not part of the malloc heap. If "vaddr" is not NULL
-** then PR tries to allocate the segment at the desired virtual address.
-*/
-PRSegment* _PR_NewSegment(PRUint32 size, void *vaddr)
-{
-    PRSegment *seg;
-
-	/* calloc the data structure for the segment */
-    seg = PR_NEWZAP(PRSegment);
-
-    if (seg) {
-	    size = ((size + _pr_pageSize - 1) >> _pr_pageShift) << _pr_pageShift;
-		/*
-		**	Now, allocate the actual segment memory (or map under some OS)
-		**	The OS specific code decides from where or how to allocate memory.
-		*/
-	    if (_PR_MD_ALLOC_SEGMENT(seg, size, vaddr) != PR_SUCCESS) {
-			PR_DELETE(seg);
-			return NULL;
-    	}
-	}
-
-    return seg;
-}
-
-/*
-** Free a memory segment.
-*/
-void _PR_DestroySegment(PRSegment *seg)
-{
-	_PR_MD_FREE_SEGMENT(seg);
-    PR_DELETE(seg);
-}
-
-#endif /* _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/memory/prshm.c b/libs/js/nsprpub/pr/src/memory/prshm.c
deleted file mode 100644
index ac6339523d..0000000000
--- a/libs/js/nsprpub/pr/src/memory/prshm.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prshm.c -- NSPR Named Shared Memory
-**
-** lth. Jul-1999.
-*/
-#include <string.h>
-#include "primpl.h"
-
-extern PRLogModuleInfo *_pr_shm_lm;
-
-
-#if defined PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-/* SysV implementation is in pr/src/md/unix/uxshm.c */
-#elif defined PR_HAVE_POSIX_NAMED_SHARED_MEMORY
-/* Posix implementation is in pr/src/md/unix/uxshm.c */
-#elif defined PR_HAVE_WIN32_NAMED_SHARED_MEMORY
-/* Win32 implementation is in pr/src/md/windows/w32shm.c */
-#else 
-/* 
-**  there is no named_shared_memory 
-*/
-extern PRSharedMemory*  _MD_OpenSharedMemory( const char *name, PRSize size, PRIntn flags, PRIntn mode )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}    
-
-extern void * _MD_AttachSharedMemory( PRSharedMemory *shm, PRIntn flags )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}    
-
-extern PRStatus _MD_DetachSharedMemory( PRSharedMemory *shm, void *addr )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}    
-
-extern PRStatus _MD_CloseSharedMemory( PRSharedMemory *shm )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}    
-
-extern PRStatus _MD_DeleteSharedMemory( const char *name )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}    
-#endif /* HAVE_SYSV_NAMED_SHARED_MEMORY */
-
-/*
-** FUNCTION: PR_OpenSharedMemory()
-**
-*/
-PR_IMPLEMENT( PRSharedMemory * )
-    PR_OpenSharedMemory(
-        const char *name,
-        PRSize      size,
-        PRIntn      flags,
-        PRIntn      mode
-)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    return( _PR_MD_OPEN_SHARED_MEMORY( name, size, flags, mode ));
-} /* end PR_OpenSharedMemory() */
-
-/*
-** FUNCTION: PR_AttachSharedMemory()
-**
-*/
-PR_IMPLEMENT( void * )
-    PR_AttachSharedMemory(
-        PRSharedMemory *shm,
-        PRIntn          flags
-)
-{
-    return( _PR_MD_ATTACH_SHARED_MEMORY( shm, flags ));
-} /* end PR_AttachSharedMemory() */
-
-/*
-** FUNCTION: PR_DetachSharedMemory()
-**
-*/
-PR_IMPLEMENT( PRStatus )
-    PR_DetachSharedMemory(
-        PRSharedMemory *shm,
-        void *addr
-)
-{
-    return( _PR_MD_DETACH_SHARED_MEMORY( shm, addr ));
-} /* end PR_DetachSharedMemory() */
-
-/*
-** FUNCTION: PR_CloseSharedMemory()
-**
-*/
-PR_IMPLEMENT( PRStatus )
-    PR_CloseSharedMemory(
-        PRSharedMemory *shm
-)
-{
-    return( _PR_MD_CLOSE_SHARED_MEMORY( shm ));
-} /* end PR_CloseSharedMemory() */
-
-/*
-** FUNCTION: PR_DeleteSharedMemory()
-**
-*/
-PR_EXTERN( PRStatus )
-    PR_DeleteSharedMemory(
-        const char *name
-)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    return(_PR_MD_DELETE_SHARED_MEMORY( name ));
-} /* end PR_DestroySharedMemory() */
-/* end prshm.c */
diff --git a/libs/js/nsprpub/pr/src/memory/prshma.c b/libs/js/nsprpub/pr/src/memory/prshma.c
deleted file mode 100644
index fbc2257898..0000000000
--- a/libs/js/nsprpub/pr/src/memory/prshma.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prshma.h -- NSPR Anonymous Shared Memory
-**
-** 
-*/
-
-#include "primpl.h"
-
-extern PRLogModuleInfo *_pr_shma_lm;
-
-#if defined(XP_UNIX)
-/* defined in pr/src/md/unix/uxshm.c */
-#elif defined(WIN32)
-/* defined in pr/src/md/windows/w32shm.c */
-#else
-extern PRFileMap * _PR_MD_OPEN_ANON_FILE_MAP( const char *dirName, PRSize size, PRFileMapProtect prot )
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-extern PRStatus _PR_MD_EXPORT_FILE_MAP_AS_STRING(PRFileMap *fm, PRSize bufSize, char *buf)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-extern PRFileMap * _PR_MD_IMPORT_FILE_MAP_FROM_STRING(const char *fmstring)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-#endif
-
-/*
-** PR_OpenAnonFileMap() -- Creates an anonymous file-mapped shared memory
-**
-*/
-PR_IMPLEMENT(PRFileMap*)
-PR_OpenAnonFileMap(
-    const char *dirName,
-    PRSize      size, 
-    PRFileMapProtect prot
-)
-{
-    return(_PR_MD_OPEN_ANON_FILE_MAP( dirName, size, prot ));
-} /* end PR_OpenAnonFileMap() */
-
-/*
-** PR_ProcessAttrSetInheritableFileMap() -- Prepare FileMap for export  
-**   to my children processes via PR_CreateProcess()
-**
-**
-*/
-PR_IMPLEMENT( PRStatus) 
-PR_ProcessAttrSetInheritableFileMap( 
-    PRProcessAttr   *attr,
-    PRFileMap       *fm, 
-    const char      *shmname
-)
-{
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return( PR_FAILURE);
-} /* end PR_ProcessAttrSetInheritableFileMap() */ 
-
-/*
-** PR_GetInheritedFileMap() -- Import a PRFileMap previously exported
-**   by my parent process via PR_CreateProcess()
-**
-*/
-PR_IMPLEMENT( PRFileMap *)
-PR_GetInheritedFileMap( 
-    const char *shmname 
-)
-{
-    PRFileMap   *fm = NULL;
-    PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 );
-    return( fm );
-} /* end PR_GetInhteritedFileMap() */
-
-/*
-** PR_ExportFileMapAsString() -- Creates a string identifying a PRFileMap
-**
-*/
-PR_IMPLEMENT( PRStatus )
-PR_ExportFileMapAsString( 
-    PRFileMap *fm,
-    PRSize    bufSize,
-    char      *buf
-)
-{
-    return( _PR_MD_EXPORT_FILE_MAP_AS_STRING( fm, bufSize, buf ));
-} /* end PR_ExportFileMapAsString() */
-
-/*
-** PR_ImportFileMapFromString() -- Creates a PRFileMap from the identifying string
-**
-**
-*/
-PR_IMPLEMENT( PRFileMap * )
-PR_ImportFileMapFromString( 
-    const char *fmstring
-)
-{
-    return( _PR_MD_IMPORT_FILE_MAP_FROM_STRING(fmstring));
-} /* end PR_ImportFileMapFromString() */
-/* end prshma.c */
diff --git a/libs/js/nsprpub/pr/src/misc/.cvsignore b/libs/js/nsprpub/pr/src/misc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/misc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/misc/Makefile.in b/libs/js/nsprpub/pr/src/misc/Makefile.in
deleted file mode 100644
index 2d96ae8387..0000000000
--- a/libs/js/nsprpub/pr/src/misc/Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-CSRCS = \
-	pratom.c   \
-	prerror.c  \
-        pripc.c \
-	prinit.c   \
-	prnetdb.c   \
-	prinrval.c \
-	prolock.c  \
-	prtime.c   \
-	$(NULL)
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-RELEASE_BINS = $(srcdir)/compile-et.pl $(srcdir)/prerr.properties
-
-include $(topsrcdir)/config/rules.mk
-
-# Prevent floating point errors caused by MSVC 6.0 Processor Pack
-# optimizations (bug 207421).  This disables optimizations that
-# could change the precision of floating-point calculations for
-# this single compilation unit.
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c
-	@$(MAKE_OBJDIR)
-ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER)))
-	$(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<)
-else
-	$(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<)
-endif
-endif
-
-#
-# Generate prerr.h, prerr.c, and prerr.properties from prerr.et.
-#
-build_prerr:
-	cd $(srcdir); $(PERL) compile-et.pl prerr.et
-
-export:: $(TARGETS)
-
-
diff --git a/libs/js/nsprpub/pr/src/misc/compile-et.pl b/libs/js/nsprpub/pr/src/misc/compile-et.pl
deleted file mode 100644
index 9f0d90bc10..0000000000
--- a/libs/js/nsprpub/pr/src/misc/compile-et.pl
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-
-# usage: compile-et input.et
-
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-sub header
-{
-    local($filename, $comment) = @_;
-
-<<EOF
-$comment
-$comment $filename
-$comment This file is automatically generated; please do not edit it.
-EOF
-}
-
-sub table_base
-{
-    local($name) = @_;
-    local($base) = 0;
-
-    for ($i = 0; $i < length($name); $i++) {
-	$base *= 64;
-	$base += index("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_", substr($name, $i, 1)) + 1;
-    }
-    $base -= 0x1000000 if ($base > 0x7fffff);
-    $base*256;
-}
-
-sub code {
-    local($macro, $text) = @_;
-    $code = $table_base + $table_item_count;
-
-    print H "\n";
-    print H "/* ", $text, " */\n";
-    printf H "#define %-40s (%dL)\n", $macro, $code;
-
-    print C "\t{\"", $macro, "\",    \"", $text, "\"},\n";
-
-    print PROPERTIES $macro, "=", $text, "\n";
-
-    $table_item_count++;
-}
-
-
-$filename = $ARGV[0];
-open(INPUT, "< $filename") || die "Can't read $filename: $!\n";
-
-$base = "$filename";
-$base =~ s/\.et$//;
-$base =~ s#.*/##;
-
-open(H, "> ${base}.h") || die "Can't write ${base}.h\n";
-open(C, "> ${base}.c") || die "Can't write ${base}.c\n";
-open(PROPERTIES, "> ${base}.properties") || die "Can't write ${base}.properties\n";
-
-print H "/*\n", &header("${base}.h", " *"), " */\n";
-print C "/*\n", &header("${base}.c", " *"), " */\n";
-print PROPERTIES &header("${base}.properties", "#");
-
-$skipone = 0;
-
-while ($_ = <INPUT>) {
-    next if /^#/;
-
-    if (/^[ \t]*(error_table|et)[ \t]+([a-zA-Z][a-zA-Z0-9_]+) *(-?[0-9]*)/) {
-	$table_name = $2;
-	if ($3) {
-	    $table_base = $3;
-	}
-	else {
-	    $table_base = &table_base($table_name);
-	}
-	$table_item_count = 0;
-
-	print C "#include \"prerror.h\"\n";
-	print C "static const struct PRErrorMessage text[] = {\n";
-    }
-    elsif (/^[ \t]*(error_code|ec)[ \t]+([A-Z_0-9]+),[ \t]*$/) {
-	$skipone = 1;
-	$macro = $2;
-    }
-    elsif (/^[ \t]*(error_code|ec)[ \t]+([A-Z_0-9]+),[ \t]*"(.*)"[ \t]*$/) {
-	&code($2, $3);
-    }
-    elsif ($skipone && /^[ \t]*"(.*)"[ \t]*$/) {
-	&code($macro, $1);
-    }
-}
-
-print H "\n";
-print H "extern void ", $table_name, "_InitializePRErrorTable","(void);\n";
-printf H "#define ERROR_TABLE_BASE_%s (%dL)\n", $table_name, $table_base;
-
-print C "\t{0, 0}\n";
-print C "};\n\n";
-printf C "static const struct PRErrorTable et = { text, \"%s\", %dL, %d };\n",
-    $base, $table_base, $table_item_count;
-print C "\n";
-print C "void ", $table_name, "_InitializePRErrorTable", "(void) {\n";
-print C "    PR_ErrorInstallTable(&et);\n";
-print C "}\n";
-
-0;
diff --git a/libs/js/nsprpub/pr/src/misc/pralarm.c b/libs/js/nsprpub/pr/src/misc/pralarm.c
deleted file mode 100644
index 9323bab677..0000000000
--- a/libs/js/nsprpub/pr/src/misc/pralarm.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/**********************************************************************/
-/******************************* PRALARM ******************************/
-/**********************************************************************/
-
-#ifdef XP_MAC
-#include "pralarm.h"
-#else
-#include "obsolete/pralarm.h"
-#endif
-
-struct PRAlarmID {                       /* typedef'd in pralarm.h       */
-    PRCList list;                        /* circular list linkage        */
-    PRAlarm *alarm;                      /* back pointer to owning alarm */
-    PRPeriodicAlarmFn function;          /* function to call for notify  */
-    void *clientData;                    /* opaque client context        */
-    PRIntervalTime period;               /* the client defined period    */
-    PRUint32 rate;                       /* rate of notification         */
-
-    PRUint32 accumulator;                /* keeps track of # notifies    */
-    PRIntervalTime epoch;                /* when timer was started       */
-    PRIntervalTime nextNotify;           /* when we'll next do our thing */
-    PRIntervalTime lastNotify;           /* when we last did our thing   */
-};
-
-typedef enum {alarm_active, alarm_inactive} _AlarmState;
-
-struct PRAlarm {                         /* typedef'd in pralarm.h       */
-    PRCList timers;                      /* base of alarm ids list       */
-    PRLock *lock;                        /* lock used to protect data    */
-    PRCondVar *cond;                     /* condition that used to wait  */
-    PRThread *notifier;                  /* thread to deliver notifies   */
-    PRAlarmID *current;                  /* current alarm being served   */
-    _AlarmState state;                   /* used to delete the alarm     */
-};
-
-static PRAlarmID *pr_getNextAlarm(PRAlarm *alarm, PRAlarmID *id)
-{
-/*
- * Puts 'id' back into the sorted list iff it's not NULL.
- * Removes the first element from the list and returns it (or NULL).
- * List is "assumed" to be short.
- *
- * NB: Caller is providing locking
- */
-    PRCList *timer;
-    PRAlarmID *result = id;
-    PRIntervalTime now = PR_IntervalNow();
-
-    if (!PR_CLIST_IS_EMPTY(&alarm->timers))
-    {    
-        if (id != NULL)  /* have to put this id back in */
-        {        
-            PRIntervalTime idDelta = now - id->nextNotify;
-            timer = alarm->timers.next;
-            do
-            {
-                result = (PRAlarmID*)timer;
-                if ((PRIntervalTime)(now - result->nextNotify) > idDelta)
-                {
-                    PR_INSERT_BEFORE(&id->list, &alarm->timers);
-                    break;
-                }
-                timer = timer->next;
-            } while (timer != &alarm->timers);
-        }
-        result = (PRAlarmID*)(timer = PR_LIST_HEAD(&alarm->timers));
-        PR_REMOVE_LINK(timer);  /* remove it from the list */
-    }
-
-    return result;
-}  /* pr_getNextAlarm */
-
-static PRIntervalTime pr_PredictNextNotifyTime(PRAlarmID *id)
-{
-    PRIntervalTime delta;
-    PRFloat64 baseRate = (PRFloat64)id->period / (PRFloat64)id->rate;
-    PRFloat64 offsetFromEpoch = (PRFloat64)id->accumulator * baseRate;
-
-    id->accumulator += 1;  /* every call advances to next period */
-    id->lastNotify = id->nextNotify;  /* just keeping track of things */
-    id->nextNotify = (PRIntervalTime)(offsetFromEpoch + 0.5);
-
-    delta = id->nextNotify - id->lastNotify;
-    return delta;
-}  /* pr_PredictNextNotifyTime */
-
-static void PR_CALLBACK pr_alarmNotifier(void *arg)
-{
-    /*
-     * This is the root of the notifier thread. There is one such thread
-     * for each PRAlarm. It may service an arbitrary (though assumed to be
-     * small) number of alarms using the same thread and structure. It
-     * continues to run until the alarm is destroyed.
-     */
-    PRAlarmID *id = NULL;
-    PRAlarm *alarm = (PRAlarm*)arg;
-    enum {notify, abort, scan} why = scan;
-
-    while (why != abort)
-    {
-        PRIntervalTime pause;
-
-        PR_Lock(alarm->lock);
-        while (why == scan)
-        {
-            alarm->current = NULL;  /* reset current id */
-            if (alarm->state == alarm_inactive) why = abort;  /* we're toast */
-            else if (why == scan)  /* the dominant case */
-            {
-                id = pr_getNextAlarm(alarm, id);  /* even if it's the same */
-                if (id == NULL)  /* there are no alarms set */
-                    (void)PR_WaitCondVar(alarm->cond, PR_INTERVAL_NO_TIMEOUT);
-                else
-                {
-                    pause = id->nextNotify - (PR_IntervalNow() - id->epoch);
-                    if ((PRInt32)pause <= 0)  /* is this one's time up? */
-                    {
-                        why = notify;  /* set up to do our thing */
-                        alarm->current = id;  /* id we're about to schedule */
-                    }
-                    else
-                        (void)PR_WaitCondVar(alarm->cond, pause);  /* dally */
-                }
-            }
-        }
-        PR_Unlock(alarm->lock);
-
-        if (why == notify)
-        {
-            (void)pr_PredictNextNotifyTime(id);
-            if (!id->function(id, id->clientData, ~pause))
-            {
-                /*
-                 * Notified function decided not to continue. Free
-                 * the alarm id to make sure it doesn't get back on
-                 * the list.
-                 */
-                PR_DELETE(id);  /* free notifier object */
-                id = NULL;  /* so it doesn't get back into the list */
-            }
-            why = scan;  /* so we can cycle through the loop again */
-        }
-    }
-
-}  /* pr_alarm_notifier */
-
-PR_IMPLEMENT(PRAlarm*) PR_CreateAlarm(void)
-{
-    PRAlarm *alarm = PR_NEWZAP(PRAlarm);
-    if (alarm != NULL)
-    {
-        if ((alarm->lock = PR_NewLock()) == NULL) goto done;
-        if ((alarm->cond = PR_NewCondVar(alarm->lock)) == NULL) goto done;
-        alarm->state = alarm_active;
-        PR_INIT_CLIST(&alarm->timers);
-        alarm->notifier = PR_CreateThread(
-            PR_USER_THREAD, pr_alarmNotifier, alarm,
-            PR_GetThreadPriority(PR_GetCurrentThread()),
-            PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (alarm->notifier == NULL) goto done;
-    }
-    return alarm;
-
-done:
-    if (alarm->cond != NULL) PR_DestroyCondVar(alarm->cond);
-    if (alarm->lock != NULL) PR_DestroyLock(alarm->lock);
-    PR_DELETE(alarm);
-    return NULL;
-}  /* CreateAlarm */
-
-PR_IMPLEMENT(PRStatus) PR_DestroyAlarm(PRAlarm *alarm)
-{
-    PRStatus rv;
-
-    PR_Lock(alarm->lock);
-    alarm->state = alarm_inactive;
-    rv = PR_NotifyCondVar(alarm->cond);
-    PR_Unlock(alarm->lock);
-
-    if (rv == PR_SUCCESS)
-        rv = PR_JoinThread(alarm->notifier);
-    if (rv == PR_SUCCESS)
-    {
-        PR_DestroyCondVar(alarm->cond);
-        PR_DestroyLock(alarm->lock);
-        PR_DELETE(alarm);
-    }
-    return rv;
-}  /* PR_DestroyAlarm */
-
-PR_IMPLEMENT(PRAlarmID*) PR_SetAlarm(
-    PRAlarm *alarm, PRIntervalTime period, PRUint32 rate,
-    PRPeriodicAlarmFn function, void *clientData)
-{
-    /*
-     * Create a new periodic alarm an existing current structure.
-     * Set up the context and compute the first notify time (immediate).
-     * Link the new ID into the head of the list (since it's notifying
-     * immediately).
-     */
-
-    PRAlarmID *id = PR_NEWZAP(PRAlarmID);
-
-    if (!id)
-        return NULL;
-
-    id->alarm = alarm;
-    PR_INIT_CLIST(&id->list);
-    id->function = function;
-    id->clientData = clientData;
-    id->period = period;
-    id->rate = rate;
-    id->epoch = id->nextNotify = PR_IntervalNow();
-    (void)pr_PredictNextNotifyTime(id);
-
-    PR_Lock(alarm->lock);
-    PR_INSERT_BEFORE(&id->list, &alarm->timers);
-    PR_NotifyCondVar(alarm->cond);
-    PR_Unlock(alarm->lock);
-
-    return id;
-}  /* PR_SetAlarm */
-
-PR_IMPLEMENT(PRStatus) PR_ResetAlarm(
-    PRAlarmID *id, PRIntervalTime period, PRUint32 rate)
-{
-    /*
-     * Can only be called from within the notify routine. Doesn't
-     * need locking because it can only be called from within the
-     * notify routine.
-     */
-    if (id != id->alarm->current)
-        return PR_FAILURE;
-    id->period = period;
-    id->rate = rate;
-    id->accumulator = 1;
-    id->epoch = PR_IntervalNow();
-    (void)pr_PredictNextNotifyTime(id);
-    return PR_SUCCESS;
-}  /* PR_ResetAlarm */
-
-
-
diff --git a/libs/js/nsprpub/pr/src/misc/pratom.c b/libs/js/nsprpub/pr/src/misc/pratom.c
deleted file mode 100644
index a903e98a50..0000000000
--- a/libs/js/nsprpub/pr/src/misc/pratom.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-**     PR Atomic operations
-*/
-
-
-#include "pratom.h"
-#include "primpl.h"
-
-#include <string.h>
-
-/*
- * The following is a fallback implementation that emulates
- * atomic operations for platforms without atomic operations.
- * If a platform has atomic operations, it should define the
- * macro _PR_HAVE_ATOMIC_OPS, and the following will not be
- * compiled in.
- */
-
-#if !defined(_PR_HAVE_ATOMIC_OPS)
-#include "prbit.h"
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-PR_IMPLEMENT(PRIntn) PR_CeilingLog2(PRUint32 n)
-{
-    PRIntn log2 = 0;
-
-    if (n & (n-1))
-	log2++;
-    if (n >> 16)
-	log2 += 16, n >>= 16;
-    if (n >> 8)
-	log2 += 8, n >>= 8;
-    if (n >> 4)
-	log2 += 4, n >>= 4;
-    if (n >> 2)
-	log2 += 2, n >>= 2;
-    if (n >> 1)
-	log2++;
-    return log2;
-}
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n.
-** This really just finds the highest set bit in the word.
-*/
-PR_IMPLEMENT(PRIntn) PR_FloorLog2(PRUint32 n)
-{
-    PRIntn log2 = 0;
-
-    if (n >> 16)
-	log2 += 16, n >>= 16;
-    if (n >> 8)
-	log2 += 8, n >>= 8;
-    if (n >> 4)
-	log2 += 4, n >>= 4;
-    if (n >> 2)
-	log2 += 2, n >>= 2;
-    if (n >> 1)
-	log2++;
-    return log2;
-}
-
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-/*
- * PR_AtomicDecrement() is used in NSPR's thread-specific data
- * destructor.  Because thread-specific data destructors may be
- * invoked after a PR_Cleanup() call, we need an implementation
- * of the atomic routines that doesn't need NSPR to be initialized.
- */
-
-/*
- * We use a set of locks for all the emulated atomic operations.
- * By hashing on the address of the integer to be locked the
- * contention between multiple threads should be lessened.
- *
- * The number of atomic locks can be set by the environment variable
- * NSPR_ATOMIC_HASH_LOCKS
- */
-
-/*
- * lock counts should be a power of 2
- */
-#define DEFAULT_ATOMIC_LOCKS	16	/* should be in sync with the number of initializers
-										below */
-#define MAX_ATOMIC_LOCKS		(4 * 1024)
-
-static pthread_mutex_t static_atomic_locks[DEFAULT_ATOMIC_LOCKS] = {
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER };
-
-#ifdef DEBUG
-static PRInt32 static_hash_lock_counts[DEFAULT_ATOMIC_LOCKS];
-static PRInt32 *hash_lock_counts = static_hash_lock_counts;
-#endif
-
-static PRUint32	num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
-static pthread_mutex_t *atomic_locks = static_atomic_locks;
-static PRUint32 atomic_hash_mask = DEFAULT_ATOMIC_LOCKS - 1;
-
-#define _PR_HASH_FOR_LOCK(ptr) 							\
-			((PRUint32) (((PRUptrdiff) (ptr) >> 2)	^	\
-						((PRUptrdiff) (ptr) >> 8)) &	\
-						atomic_hash_mask)
-
-void _PR_MD_INIT_ATOMIC()
-{
-char *eval;
-int index;
-
-
-	PR_ASSERT(PR_FloorLog2(MAX_ATOMIC_LOCKS) ==
-						PR_CeilingLog2(MAX_ATOMIC_LOCKS));
-
-	PR_ASSERT(PR_FloorLog2(DEFAULT_ATOMIC_LOCKS) ==
-							PR_CeilingLog2(DEFAULT_ATOMIC_LOCKS));
-
-	if (((eval = getenv("NSPR_ATOMIC_HASH_LOCKS")) != NULL)  &&
-		((num_atomic_locks = atoi(eval)) != DEFAULT_ATOMIC_LOCKS)) {
-
-		if (num_atomic_locks > MAX_ATOMIC_LOCKS)
-			num_atomic_locks = MAX_ATOMIC_LOCKS;
-		else {
-			num_atomic_locks = PR_FloorLog2(num_atomic_locks);
-			num_atomic_locks = 1L << num_atomic_locks;
-		}
-		atomic_locks = (pthread_mutex_t *) PR_Malloc(sizeof(pthread_mutex_t) *
-						num_atomic_locks);
-		if (atomic_locks) {
-			for (index = 0; index < num_atomic_locks; index++) {
-				if (pthread_mutex_init(&atomic_locks[index], NULL)) {
-						PR_DELETE(atomic_locks);
-						atomic_locks = NULL;
-						break; 
-				}
-			}
-		}
-#ifdef DEBUG
-		if (atomic_locks) {
-			hash_lock_counts = PR_CALLOC(num_atomic_locks * sizeof(PRInt32));
-			if (hash_lock_counts == NULL) {
-				PR_DELETE(atomic_locks);
-				atomic_locks = NULL;
-			}
-		}
-#endif
-		if (atomic_locks == NULL) {
-			/*
-			 *	Use statically allocated locks
-			 */
-			atomic_locks = static_atomic_locks;
-			num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
-	#ifdef DEBUG
-			hash_lock_counts = static_hash_lock_counts;
-	#endif
-		}
-		atomic_hash_mask = num_atomic_locks - 1;
-	}
-	PR_ASSERT(PR_FloorLog2(num_atomic_locks) ==
-								PR_CeilingLog2(num_atomic_locks));
-}
-
-PRInt32
-_PR_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    PRInt32 rv;
-    PRInt32 idx = _PR_HASH_FOR_LOCK(val);
-
-    pthread_mutex_lock(&atomic_locks[idx]);
-    rv = ++(*val);
-#ifdef DEBUG
-    hash_lock_counts[idx]++;
-#endif
-    pthread_mutex_unlock(&atomic_locks[idx]);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    PRInt32 rv;
-    PRInt32 idx = _PR_HASH_FOR_LOCK(ptr);
-
-    pthread_mutex_lock(&atomic_locks[idx]);
-    rv = ((*ptr) += val);
-#ifdef DEBUG
-    hash_lock_counts[idx]++;
-#endif
-    pthread_mutex_unlock(&atomic_locks[idx]);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    PRInt32 rv;
-    PRInt32 idx = _PR_HASH_FOR_LOCK(val);
-
-    pthread_mutex_lock(&atomic_locks[idx]);
-    rv = --(*val);
-#ifdef DEBUG
-    hash_lock_counts[idx]++;
-#endif
-    pthread_mutex_unlock(&atomic_locks[idx]);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    PRInt32 rv;
-    PRInt32 idx = _PR_HASH_FOR_LOCK(val);
-
-    pthread_mutex_lock(&atomic_locks[idx]);
-    rv = *val;
-    *val = newval;
-#ifdef DEBUG
-    hash_lock_counts[idx]++;
-#endif
-    pthread_mutex_unlock(&atomic_locks[idx]);
-    return rv;
-}
-#else  /* _PR_PTHREADS && !_PR_DCETHREADS */
-/*
- * We use a single lock for all the emulated atomic operations.
- * The lock contention should be acceptable.
- */
-static PRLock *atomic_lock = NULL;
-void _PR_MD_INIT_ATOMIC(void)
-{
-    if (atomic_lock == NULL) {
-        atomic_lock = PR_NewLock();
-    }
-}
-
-PRInt32
-_PR_MD_ATOMIC_INCREMENT(PRInt32 *val)
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-    PR_Lock(atomic_lock);
-    rv = ++(*val);
-    PR_Unlock(atomic_lock);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val)
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-    PR_Lock(atomic_lock);
-    rv = ((*ptr) += val);
-    PR_Unlock(atomic_lock);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_DECREMENT(PRInt32 *val)
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-    PR_Lock(atomic_lock);
-    rv = --(*val);
-    PR_Unlock(atomic_lock);
-    return rv;
-}
-
-PRInt32
-_PR_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-    PR_Lock(atomic_lock);
-    rv = *val;
-    *val = newval;
-    PR_Unlock(atomic_lock);
-    return rv;
-}
-#endif  /* _PR_PTHREADS && !_PR_DCETHREADS */
-
-#endif  /* !_PR_HAVE_ATOMIC_OPS */
-
-void _PR_InitAtomic(void)
-{
-    _PR_MD_INIT_ATOMIC();
-}
-
-PR_IMPLEMENT(PRInt32)
-PR_AtomicIncrement(PRInt32 *val)
-{
-    return _PR_MD_ATOMIC_INCREMENT(val);
-}
-
-PR_IMPLEMENT(PRInt32)
-PR_AtomicDecrement(PRInt32 *val)
-{
-    return _PR_MD_ATOMIC_DECREMENT(val);
-}
-
-PR_IMPLEMENT(PRInt32)
-PR_AtomicSet(PRInt32 *val, PRInt32 newval)
-{
-    return _PR_MD_ATOMIC_SET(val, newval);
-}
-
-PR_IMPLEMENT(PRInt32)
-PR_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-{
-    return _PR_MD_ATOMIC_ADD(ptr, val);
-}
-/*
- * For platforms, which don't support the CAS (compare-and-swap) instruction
- * (or an equivalent), the stack operations are implemented by use of PRLock
- */
-
-PR_IMPLEMENT(PRStack *)
-PR_CreateStack(const char *stack_name)
-{
-PRStack *stack;
-
-    if (!_pr_initialized) {
-        _PR_ImplicitInitialization();
-    }
-
-    if ((stack = PR_NEW(PRStack)) == NULL) {
-		return NULL;
-	}
-	if (stack_name) {
-		stack->prstk_name = (char *) PR_Malloc(strlen(stack_name) + 1);
-		if (stack->prstk_name == NULL) {
-			PR_DELETE(stack);
-			return NULL;
-		}
-		strcpy(stack->prstk_name, stack_name);
-	} else
-		stack->prstk_name = NULL;
-
-#ifndef _PR_HAVE_ATOMIC_CAS
-    stack->prstk_lock = PR_NewLock();
-	if (stack->prstk_lock == NULL) {
-		PR_Free(stack->prstk_name);
-		PR_DELETE(stack);
-		return NULL;
-	}
-#endif /* !_PR_HAVE_ATOMIC_CAS */
-
-	stack->prstk_head.prstk_elem_next = NULL;
-	
-    return stack;
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_DestroyStack(PRStack *stack)
-{
-	if (stack->prstk_head.prstk_elem_next != NULL) {
-		PR_SetError(PR_INVALID_STATE_ERROR, 0);
-		return PR_FAILURE;
-	}
-
-	if (stack->prstk_name)
-		PR_Free(stack->prstk_name);
-#ifndef _PR_HAVE_ATOMIC_CAS
-	PR_DestroyLock(stack->prstk_lock);
-#endif /* !_PR_HAVE_ATOMIC_CAS */
-	PR_DELETE(stack);
-
-	return PR_SUCCESS;
-}
-
-#ifndef _PR_HAVE_ATOMIC_CAS
-
-PR_IMPLEMENT(void)
-PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
-{
-    PR_Lock(stack->prstk_lock);
-	stack_elem->prstk_elem_next = stack->prstk_head.prstk_elem_next;
-	stack->prstk_head.prstk_elem_next = stack_elem;
-    PR_Unlock(stack->prstk_lock);
-    return;
-}
-
-PR_IMPLEMENT(PRStackElem *)
-PR_StackPop(PRStack *stack)
-{
-PRStackElem *element;
-
-    PR_Lock(stack->prstk_lock);
-	element = stack->prstk_head.prstk_elem_next;
-	if (element != NULL) {
-		stack->prstk_head.prstk_elem_next = element->prstk_elem_next;
-		element->prstk_elem_next = NULL;	/* debugging aid */
-	}
-    PR_Unlock(stack->prstk_lock);
-    return element;
-}
-#endif /* !_PR_HAVE_ATOMIC_CAS */
diff --git a/libs/js/nsprpub/pr/src/misc/prcountr.c b/libs/js/nsprpub/pr/src/misc/prcountr.c
deleted file mode 100644
index a4e4f6cc79..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prcountr.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prcountr.c -- NSPR Instrumentation Counters
-**
-** Implement the interface defined in prcountr.h
-**
-** Design Notes:
-**
-** The Counter Facility (CF) has a single anchor: qNameList.      
-** The anchor is a PRCList. qNameList is a list of links in QName
-** structures. From qNameList any QName structure and its
-** associated RName structure can be located. 
-** 
-** For each QName, a list of RName structures is anchored at
-** rnLink in the QName structure.
-** 
-** The counter itself is embedded in the RName structure.
-** 
-** For manipulating the counter database, single lock is used to
-** protect the entire list: counterLock.
-**
-** A PRCounterHandle, defined in prcountr.h, is really a pointer
-** to a RName structure. References by PRCounterHandle are
-** dead-reconed to the RName structure. The PRCounterHandle is
-** "overloaded" for traversing the QName structures; only the
-** function PR_FindNextQnameHandle() uses this overloading.
-**
-** 
-** ToDo (lth): decide on how to lock or atomically update
-** individual counters. Candidates are: the global lock; a lock
-** per RName structure; Atomic operations (Note that there are
-** not adaquate atomic operations (yet) to achieve this goal). At
-** this writing (6/19/98) , the update of the counter variable in
-** a QName structure is unprotected.
-**
-*/
-
-#include "prcountr.h"
-#include "prclist.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmem.h"
-#include <string.h>
-
-/*
-**
-*/
-typedef struct QName
-{
-    PRCList link;
-    PRCList rNameList;
-    char    name[PRCOUNTER_NAME_MAX+1];
-} QName;
-
-/*
-**
-*/
-typedef struct RName
-{
-    PRCList link;
-    QName   *qName;
-    PRLock  *lock;
-    volatile PRUint32   counter;    
-    char    name[PRCOUNTER_NAME_MAX+1]; 
-    char    desc[PRCOUNTER_DESC_MAX+1]; 
-} RName;
-
-
-/*
-** Define the Counter Facility database
-*/
-static PRLock  *counterLock;
-static PRCList qNameList;
-static PRLogModuleInfo *lm;
-
-/*
-** _PR_CounterInitialize() -- Initialize the Counter Facility
-**
-*/
-static void _PR_CounterInitialize( void )
-{
-    /*
-    ** This function should be called only once
-    */
-    PR_ASSERT( counterLock == NULL );
-    
-    counterLock = PR_NewLock();
-    PR_INIT_CLIST( &qNameList );
-    lm = PR_NewLogModule("counters");
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Initialization complete"));
-
-    return;
-} /* end _PR_CounterInitialize() */
-
-/*
-** PR_CreateCounter() -- Create a counter
-**
-**  ValidateArguments
-**  Lock
-**  if (qName not already in database)
-**      NewQname
-**  if (rName already in database )
-**      Assert
-**  else NewRname
-**  NewCounter
-**  link 'em up
-**  Unlock
-**
-*/
-PR_IMPLEMENT(PRCounterHandle) 
-	PR_CreateCounter( 
-		const char *qName, 
-    	const char *rName, 
-        const char *description 
-) 
-{
-    QName   *qnp;
-    RName   *rnp;
-    PRBool  matchQname = PR_FALSE;
-
-    /* Self initialize, if necessary */
-    if ( counterLock == NULL )
-        _PR_CounterInitialize();
-
-    /* Validate input arguments */
-    PR_ASSERT( strlen(qName) <= PRCOUNTER_NAME_MAX );
-    PR_ASSERT( strlen(rName) <= PRCOUNTER_NAME_MAX );
-    PR_ASSERT( strlen(description) <= PRCOUNTER_DESC_MAX );
-
-    /* Lock the Facility */
-    PR_Lock( counterLock );
-
-    /* Do we already have a matching QName? */
-    if (!PR_CLIST_IS_EMPTY( &qNameList ))
-    {
-        qnp = (QName *) PR_LIST_HEAD( &qNameList );
-        do {
-            if ( strcmp(qnp->name, qName) == 0)
-            {
-                matchQname = PR_TRUE;
-                break;
-            }
-            qnp = (QName *)PR_NEXT_LINK( &qnp->link );
-        } while( qnp != (QName *)PR_LIST_HEAD( &qNameList ));
-    }
-    /*
-    ** If we did not find a matching QName,
-    **    allocate one and initialize it.
-    **    link it onto the qNameList.
-    **
-    */
-    if ( matchQname != PR_TRUE )
-    {
-        qnp = PR_NEWZAP( QName );
-        PR_ASSERT( qnp != NULL );
-        PR_INIT_CLIST( &qnp->link ); 
-        PR_INIT_CLIST( &qnp->rNameList ); 
-        strcpy( qnp->name, qName );
-        PR_APPEND_LINK( &qnp->link, &qNameList ); 
-    }
-
-    /* Do we already have a matching RName? */
-    if (!PR_CLIST_IS_EMPTY( &qnp->rNameList ))
-    {
-        rnp = (RName *) PR_LIST_HEAD( &qnp->rNameList );
-        do {
-            /*
-            ** No duplicate RNames are allowed within a QName
-            **
-            */
-            PR_ASSERT( strcmp(rnp->name, rName));
-            rnp = (RName *)PR_NEXT_LINK( &rnp->link );
-        } while( rnp != (RName *)PR_LIST_HEAD( &qnp->rNameList ));
-    }
-
-    /* Get a new RName structure; initialize its members */
-    rnp = PR_NEWZAP( RName );
-    PR_ASSERT( rnp != NULL );
-    PR_INIT_CLIST( &rnp->link );
-    strcpy( rnp->name, rName );
-    strcpy( rnp->desc, description );
-    rnp->lock = PR_NewLock();
-    if ( rnp->lock == NULL )
-    {
-        PR_ASSERT(0);
-    }
-
-    PR_APPEND_LINK( &rnp->link, &qnp->rNameList ); /* add RName to QName's rnList */    
-    rnp->qName = qnp;                       /* point the RName to the QName */
-
-    /* Unlock the Facility */
-    PR_Unlock( counterLock );
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Create: QName: %s %p, RName: %s %p\n\t",
-        qName, qnp, rName, rnp ));
-
-    return((PRCounterHandle)rnp);
-} /*  end PR_CreateCounter() */
-  
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_DestroyCounter( 
-		PRCounterHandle handle 
-)
-{
-    RName   *rnp = (RName *)handle;
-    QName   *qnp = rnp->qName;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Deleting: QName: %s, RName: %s", 
-        qnp->name, rnp->name));
-
-    /* Lock the Facility */
-    PR_Lock( counterLock );
-
-    /*
-    ** Remove RName from the list of RNames in QName
-    ** and free RName
-    */
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Deleting RName: %s, %p", 
-        rnp->name, rnp));
-    PR_REMOVE_LINK( &rnp->link );
-    PR_Free( rnp->lock );
-    PR_DELETE( rnp );
-
-    /*
-    ** If this is the last RName within QName
-    **   remove QName from the qNameList and free it
-    */
-    if ( PR_CLIST_IS_EMPTY( &qnp->rNameList ) )
-    {
-        PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Deleting unused QName: %s, %p", 
-            qnp->name, qnp));
-        PR_REMOVE_LINK( &qnp->link );
-        PR_DELETE( qnp );
-    } 
-
-    /* Unlock the Facility */
-    PR_Unlock( counterLock );
-    return;
-} /*  end PR_DestroyCounter() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRCounterHandle) 
-	PR_GetCounterHandleFromName( 
-    	const char *qName, 
-    	const char *rName 
-)
-{
-    const char    *qn, *rn, *desc;
-    PRCounterHandle     qh, rh = NULL;
-    RName   *rnp = NULL;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: GetCounterHandleFromName:\n\t"
-        "QName: %s, RName: %s", qName, rName ));
-
-    qh = PR_FindNextCounterQname( NULL );
-    while (qh != NULL)
-    {
-        rh = PR_FindNextCounterRname( NULL, qh );
-        while ( rh != NULL )
-        {
-            PR_GetCounterNameFromHandle( rh, &qn, &rn, &desc );
-            if ( (strcmp( qName, qn ) == 0)
-                && (strcmp( rName, rn ) == 0 ))
-            {
-                rnp = (RName *)rh;
-                goto foundIt;
-            }
-            rh = PR_FindNextCounterRname( rh, qh );
-        }
-        qh = PR_FindNextCounterQname( NULL );
-    }
-
-foundIt:
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: GetConterHandleFromName: %p", rnp ));
-    return(rh);
-} /*  end PR_GetCounterHandleFromName() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_GetCounterNameFromHandle( 
-    	PRCounterHandle handle,  
-	    const char **qName, 
-	    const char **rName, 
-		const char **description 
-)
-{
-    RName   *rnp = (RName *)handle;
-    QName   *qnp = rnp->qName;
-
-    *qName = qnp->name;
-    *rName = rnp->name;
-    *description = rnp->desc;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: GetConterNameFromHandle: "
-        "QNp: %p, RNp: %p,\n\tQName: %s, RName: %s, Desc: %s", 
-        qnp, rnp, qnp->name, rnp->name, rnp->desc ));
-
-    return;
-} /*  end PR_GetCounterNameFromHandle() */
-
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_IncrementCounter( 
-		PRCounterHandle handle
-)
-{
-    PR_Lock(((RName *)handle)->lock);
-    ((RName *)handle)->counter++;
-    PR_Unlock(((RName *)handle)->lock);
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Increment: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return;
-} /*  end PR_IncrementCounter() */
-
-
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_DecrementCounter( 
-		PRCounterHandle handle
-)
-{
-    PR_Lock(((RName *)handle)->lock);
-    ((RName *)handle)->counter--;
-    PR_Unlock(((RName *)handle)->lock);
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: Decrement: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return;
-} /*  end PR_DecrementCounter()  */
-
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_AddToCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-)
-{
-    PR_Lock(((RName *)handle)->lock);
-    ((RName *)handle)->counter += value;
-    PR_Unlock(((RName *)handle)->lock);
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: AddToCounter: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return;
-} /*  end PR_AddToCounter() */
-
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_SubtractFromCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-)
-{
-    PR_Lock(((RName *)handle)->lock);
-    ((RName *)handle)->counter -= value;
-    PR_Unlock(((RName *)handle)->lock);
-    
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: SubtractFromCounter: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return;
-} /*  end  PR_SubtractFromCounter() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRUint32) 
-	PR_GetCounter( 
-		PRCounterHandle handle 
-)
-{
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: GetCounter: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return(((RName *)handle)->counter);
-} /*  end  PR_GetCounter() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_SetCounter( 
-		PRCounterHandle handle, 
-		PRUint32 value 
-)
-{
-    ((RName *)handle)->counter = value;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: SetCounter: %p, %ld", 
-        handle, ((RName *)handle)->counter ));
-
-    return;
-} /*  end  PR_SetCounter() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRCounterHandle) 
-	PR_FindNextCounterQname( 
-        PRCounterHandle handle
-)
-{
-    QName *qnp = (QName *)handle;
-
-    if ( PR_CLIST_IS_EMPTY( &qNameList ))
-            qnp = NULL;
-    else if ( qnp == NULL )
-        qnp = (QName *)PR_LIST_HEAD( &qNameList );
-    else if ( PR_NEXT_LINK( &qnp->link ) ==  &qNameList )
-        qnp = NULL;
-    else  
-        qnp = (QName *)PR_NEXT_LINK( &qnp->link );
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: FindNextQname: Handle: %p, Returns: %p", 
-        handle, qnp ));
-
-    return((PRCounterHandle)qnp);
-} /*  end  PR_FindNextCounterQname() */
-
-
-/*
-**
-*/
-PR_IMPLEMENT(PRCounterHandle) 
-	PR_FindNextCounterRname( 
-        PRCounterHandle rhandle, 
-        PRCounterHandle qhandle 
-)
-{
-    RName *rnp = (RName *)rhandle;
-    QName *qnp = (QName *)qhandle;
-
-
-    if ( PR_CLIST_IS_EMPTY( &qnp->rNameList ))
-        rnp = NULL;
-    else if ( rnp == NULL )
-        rnp = (RName *)PR_LIST_HEAD( &qnp->rNameList );
-    else if ( PR_NEXT_LINK( &rnp->link ) ==  &qnp->rNameList )
-        rnp = NULL;
-    else
-        rnp = (RName *)PR_NEXT_LINK( &rnp->link );
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: FindNextRname: Rhandle: %p, QHandle: %p, Returns: %p", 
-        rhandle, qhandle, rnp ));
-
-    return((PRCounterHandle)rnp);
-} /*  end PR_FindNextCounterRname() */
diff --git a/libs/js/nsprpub/pr/src/misc/prdtoa.c b/libs/js/nsprpub/pr/src/misc/prdtoa.c
deleted file mode 100644
index b7432a2f8a..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prdtoa.c
+++ /dev/null
@@ -1,3515 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#define MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK(n)	PR_Lock(dtoa_lock[n])
-#define FREE_DTOA_LOCK(n)	PR_Unlock(dtoa_lock[n])
-
-static PRLock *dtoa_lock[2];
-
-void _PR_InitDtoa(void)
-{
-    dtoa_lock[0] = PR_NewLock();
-    dtoa_lock[1] = PR_NewLock();
-}
-
-void _PR_CleanupDtoa(void)
-{
-    PR_DestroyLock(dtoa_lock[0]);
-    dtoa_lock[0] = NULL;
-    PR_DestroyLock(dtoa_lock[1]);
-    dtoa_lock[1] = NULL;
-
-    /* FIXME: deal with freelist and p5s. */
-}
-
-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
-    || defined(__arm32__)
-#define IEEE_ARM
-#elif defined(IS_LITTLE_ENDIAN)
-#define IEEE_8087
-#else
-#define IEEE_MC68k
-#endif
-
-#define Long PRInt32
-#define ULong PRUint32
-#define NO_LONG_LONG
-
-/****************************************************************
- *
- * The author of this software is David M. Gay.
- *
- * Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- ***************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* On a machine with IEEE extended-precision registers, it is
- * necessary to specify double-precision (53-bit) rounding precision
- * before invoking strtod or dtoa.  If the machine uses (the equivalent
- * of) Intel 80x87 arithmetic, the call
- *	_control87(PC_53, MCW_PC);
- * does this with many compilers.  Whether this or another call is
- * appropriate depends on the compiler; for this to work, it may be
- * necessary to #include "float.h" or another system-dependent header
- * file.
- */
-
-/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
- *
- * This strtod returns a nearest machine number to the input decimal
- * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
- * broken by the IEEE round-even rule.  Otherwise ties are broken by
- * biased rounding (add half and chop).
- *
- * Inspired loosely by William D. Clinger's paper "How to Read Floating
- * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *
- *	1. We only require IEEE, IBM, or VAX double-precision
- *		arithmetic (not IEEE double-extended).
- *	2. We get by with floating-point arithmetic in a case that
- *		Clinger missed -- when we're computing d * 10^n
- *		for a small integer d and the integer n is not too
- *		much larger than 22 (the maximum integer k for which
- *		we can represent 10^k exactly), we may be able to
- *		compute (d*10^k) * 10^(e-k) with just one roundoff.
- *	3. Rather than a bit-at-a-time adjustment of the binary
- *		result in the hard case, we use floating-point
- *		arithmetic to determine the adjustment to within
- *		one bit; only in really hard cases do we need to
- *		compute a second residual.
- *	4. Because of 3., we don't need a large table of powers of 10
- *		for ten-to-e (just some small tables, e.g. of 10^k
- *		for 0 <= k <= 22).
- */
-
-/*
- * #define IEEE_8087 for IEEE-arithmetic machines where the least
- *	significant byte has the lowest address.
- * #define IEEE_MC68k for IEEE-arithmetic machines where the most
- *	significant byte has the lowest address.
- * #define IEEE_ARM for IEEE-arithmetic machines where the two words
- *	in a double are stored in big endian order but the two shorts
- *	in a word are still stored in little endian order.
- * #define Long int on machines with 32-bit ints and 64-bit longs.
- * #define IBM for IBM mainframe-style floating-point arithmetic.
- * #define VAX for VAX-style floating-point arithmetic (D_floating).
- * #define No_leftright to omit left-right logic in fast floating-point
- *	computation of dtoa.
- * #define Honor_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
- *	and strtod and dtoa should round accordingly.
- * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
- *	and Honor_FLT_ROUNDS is not #defined.
- * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
- *	that use extended-precision instructions to compute rounded
- *	products and quotients) with IBM.
- * #define ROUND_BIASED for IEEE-format with biased rounding.
- * #define Inaccurate_Divide for IEEE-format with correctly rounded
- *	products but inaccurate quotients, e.g., for Intel i860.
- * #define NO_LONG_LONG on machines that do not have a "long long"
- *	integer type (of >= 64 bits).  On such machines, you can
- *	#define Just_16 to store 16 bits per 32-bit Long when doing
- *	high-precision integer arithmetic.  Whether this speeds things
- *	up or slows things down depends on the machine and the number
- *	being converted.  If long long is available and the name is
- *	something other than "long long", #define Llong to be the name,
- *	and if "unsigned Llong" does not work as an unsigned version of
- *	Llong, #define #ULLong to be the corresponding unsigned type.
- * #define KR_headers for old-style C function headers.
- * #define Bad_float_h if your system lacks a float.h or if it does not
- *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
- *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
- *	if memory is available and otherwise does something you deem
- *	appropriate.  If MALLOC is undefined, malloc will be invoked
- *	directly -- and assumed always to succeed.
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- *	memory allocations from a private pool of memory when possible.
- *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
- *	unless #defined to be a different length.  This default length
- *	suffices to get rid of MALLOC calls except for unusual cases,
- *	such as decimal-to-binary conversion of a very long string of
- *	digits.  The longest string dtoa can return is about 751 bytes
- *	long.  For conversions by strtod of strings of 800 digits and
- *	all dtoa conversions in single-threaded executions with 8-byte
- *	pointers, PRIVATE_MEM >= 7400 appears to suffice; with 4-byte
- *	pointers, PRIVATE_MEM >= 7112 appears adequate.
- * #define INFNAN_CHECK on IEEE systems to cause strtod to check for
- *	Infinity and NaN (case insensitively).  On some systems (e.g.,
- *	some HP systems), it may be necessary to #define NAN_WORD0
- *	appropriately -- to the most significant word of a quiet NaN.
- *	(On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
- *	When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined,
- *	strtod also accepts (case insensitively) strings of the form
- *	NaN(x), where x is a string of hexadecimal digits and spaces;
- *	if there is only one string of hexadecimal digits, it is taken
- *	for the 52 fraction bits of the resulting NaN; if there are two
- *	or more strings of hex digits, the first is for the high 20 bits,
- *	the second and subsequent for the low 32 bits, with intervening
- *	white space ignored; but if this results in none of the 52
- *	fraction bits being on (an IEEE Infinity symbol), then NAN_WORD0
- *	and NAN_WORD1 are used instead.
- * #define MULTIPLE_THREADS if the system offers preemptively scheduled
- *	multiple threads.  In this case, you must provide (or suitably
- *	#define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed
- *	by FREE_DTOA_LOCK(n) for n = 0 or 1.  (The second lock, accessed
- *	in pow5mult, ensures lazy evaluation of only one copy of high
- *	powers of 5; omitting this lock would introduce a small
- *	probability of wasting memory, but would otherwise be harmless.)
- *	You must also invoke freedtoa(s) to free the value s returned by
- *	dtoa.  You may do so whether or not MULTIPLE_THREADS is #defined.
- * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that
- *	avoids underflows on inputs whose result does not underflow.
- *	If you #define NO_IEEE_Scale on a machine that uses IEEE-format
- *	floating-point numbers and flushes underflows to zero rather
- *	than implementing gradual underflow, then you must also #define
- *	Sudden_Underflow.
- * #define YES_ALIAS to permit aliasing certain double values with
- *	arrays of ULongs.  This leads to slightly better code with
- *	some compilers and was always used prior to 19990916, but it
- *	is not strictly legal and can cause trouble with aggressively
- *	optimizing compilers (e.g., gcc 2.95.1 under -O2).
- * #define USE_LOCALE to use the current locale's decimal_point value.
- * #define SET_INEXACT if IEEE arithmetic is being used and extra
- *	computation should be done to set the inexact flag when the
- *	result is inexact and avoid setting inexact when the result
- *	is exact.  In this case, dtoa.c must be compiled in
- *	an environment, perhaps provided by #include "dtoa.c" in a
- *	suitable wrapper, that defines two functions,
- *		int get_inexact(void);
- *		void clear_inexact(void);
- *	such that get_inexact() returns a nonzero value if the
- *	inexact bit is already set, and clear_inexact() sets the
- *	inexact bit to 0.  When SET_INEXACT is #defined, strtod
- *	also does extra computations to set the underflow and overflow
- *	flags when appropriate (i.e., when the result is tiny and
- *	inexact or when it is a numeric value rounded to +-infinity).
- * #define NO_ERRNO if strtod should not assign errno = ERANGE when
- *	the result overflows to +-Infinity or underflows to 0.
- */
-
-#ifndef Long
-#define Long long
-#endif
-#ifndef ULong
-typedef unsigned Long ULong;
-#endif
-
-#ifdef DEBUG
-#include "stdio.h"
-#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
-#endif
-
-#include "stdlib.h"
-#include "string.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
-#ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
-extern void *MALLOC(size_t);
-#endif
-#else
-#define MALLOC malloc
-#endif
-
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2304
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
-#undef IEEE_Arith
-#undef Avoid_Underflow
-#ifdef IEEE_MC68k
-#define IEEE_Arith
-#endif
-#ifdef IEEE_8087
-#define IEEE_Arith
-#endif
-#ifdef IEEE_ARM
-#define IEEE_Arith
-#endif
-
-#include "errno.h"
-
-#ifdef Bad_float_h
-
-#ifdef IEEE_Arith
-#define DBL_DIG 15
-#define DBL_MAX_10_EXP 308
-#define DBL_MAX_EXP 1024
-#define FLT_RADIX 2
-#endif /*IEEE_Arith*/
-
-#ifdef IBM
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 75
-#define DBL_MAX_EXP 63
-#define FLT_RADIX 16
-#define DBL_MAX 7.2370055773322621e+75
-#endif
-
-#ifdef VAX
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 38
-#define DBL_MAX_EXP 127
-#define FLT_RADIX 2
-#define DBL_MAX 1.7014118346046923e+38
-#endif
-
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647
-#endif
-
-#else /* ifndef Bad_float_h */
-#include "float.h"
-/*
- * MacOS 10.2 defines the macro FLT_ROUNDS to an internal function
- * which does not exist on 10.1.  We can safely #define it to 1 here
- * to allow 10.2 builds to run on 10.1, since we can't use fesetround()
- * (which does not exist on 10.1 either).
- */
-#if defined(XP_MACOSX) && (!defined(MAC_OS_X_VERSION_10_2) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2)
-#undef FLT_ROUNDS
-#define FLT_ROUNDS 1
-#endif /* DT < 10.2 */
-#endif /* Bad_float_h */
-
-#ifndef __MATH_H__
-#include "math.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
-#define CONST const
-#endif
-#endif
-
-#if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(IEEE_ARM) + defined(VAX) + defined(IBM) != 1
-Exactly one of IEEE_8087, IEEE_MC68k, IEEE_ARM, VAX, or IBM should be defined.
-#endif
-
-typedef union { double d; ULong L[2]; } U;
-
-#ifdef YES_ALIAS
-#define dval(x) x
-#ifdef IEEE_8087
-#define word0(x) ((ULong *)&x)[1]
-#define word1(x) ((ULong *)&x)[0]
-#else
-#define word0(x) ((ULong *)&x)[0]
-#define word1(x) ((ULong *)&x)[1]
-#endif
-#else
-#ifdef IEEE_8087
-#define word0(x) ((U*)&x)->L[1]
-#define word1(x) ((U*)&x)->L[0]
-#else
-#define word0(x) ((U*)&x)->L[0]
-#define word1(x) ((U*)&x)->L[1]
-#endif
-#define dval(x) ((U*)&x)->d
-#endif
-
-/* The following definition of Storeinc is appropriate for MIPS processors.
- * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
- */
-#if defined(IEEE_8087) + defined(IEEE_ARM) + defined(VAX)
-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
-((unsigned short *)a)[0] = (unsigned short)c, a++)
-#else
-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
-((unsigned short *)a)[1] = (unsigned short)c, a++)
-#endif
-
-/* #define P DBL_MANT_DIG */
-/* Ten_pmax = floor(P*log(2)/log(5)) */
-/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
-/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
-/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
-
-#ifdef IEEE_Arith
-#define Exp_shift  20
-#define Exp_shift1 20
-#define Exp_msk1    0x100000
-#define Exp_msk11   0x100000
-#define Exp_mask  0x7ff00000
-#define P 53
-#define Bias 1023
-#define Emin (-1022)
-#define Exp_1  0x3ff00000
-#define Exp_11 0x3ff00000
-#define Ebits 11
-#define Frac_mask  0xfffff
-#define Frac_mask1 0xfffff
-#define Ten_pmax 22
-#define Bletch 0x10
-#define Bndry_mask  0xfffff
-#define Bndry_mask1 0xfffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 1
-#define Tiny0 0
-#define Tiny1 1
-#define Quick_max 14
-#define Int_max 14
-#ifndef NO_IEEE_Scale
-#define Avoid_Underflow
-#ifdef Flush_Denorm	/* debugging option */
-#undef Sudden_Underflow
-#endif
-#endif
-
-#ifndef Flt_Rounds
-#ifdef FLT_ROUNDS
-#define Flt_Rounds FLT_ROUNDS
-#else
-#define Flt_Rounds 1
-#endif
-#endif /*Flt_Rounds*/
-
-#ifdef Honor_FLT_ROUNDS
-#define Rounding rounding
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
-#else /* ifndef IEEE_Arith */
-#undef Check_FLT_ROUNDS
-#undef Honor_FLT_ROUNDS
-#undef SET_INEXACT
-#undef  Sudden_Underflow
-#define Sudden_Underflow
-#ifdef IBM
-#undef Flt_Rounds
-#define Flt_Rounds 0
-#define Exp_shift  24
-#define Exp_shift1 24
-#define Exp_msk1   0x1000000
-#define Exp_msk11  0x1000000
-#define Exp_mask  0x7f000000
-#define P 14
-#define Bias 65
-#define Exp_1  0x41000000
-#define Exp_11 0x41000000
-#define Ebits 8	/* exponent has 7 bits, but 8 is the right value in b2d */
-#define Frac_mask  0xffffff
-#define Frac_mask1 0xffffff
-#define Bletch 4
-#define Ten_pmax 22
-#define Bndry_mask  0xefffff
-#define Bndry_mask1 0xffffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 4
-#define Tiny0 0x100000
-#define Tiny1 0
-#define Quick_max 14
-#define Int_max 15
-#else /* VAX */
-#undef Flt_Rounds
-#define Flt_Rounds 1
-#define Exp_shift  23
-#define Exp_shift1 7
-#define Exp_msk1    0x80
-#define Exp_msk11   0x800000
-#define Exp_mask  0x7f80
-#define P 56
-#define Bias 129
-#define Exp_1  0x40800000
-#define Exp_11 0x4080
-#define Ebits 8
-#define Frac_mask  0x7fffff
-#define Frac_mask1 0xffff007f
-#define Ten_pmax 24
-#define Bletch 2
-#define Bndry_mask  0xffff007f
-#define Bndry_mask1 0xffff007f
-#define LSB 0x10000
-#define Sign_bit 0x8000
-#define Log2P 1
-#define Tiny0 0x80
-#define Tiny1 0
-#define Quick_max 15
-#define Int_max 15
-#endif /* IBM, VAX */
-#endif /* IEEE_Arith */
-
-#ifndef IEEE_Arith
-#define ROUND_BIASED
-#endif
-
-#ifdef RND_PRODQUOT
-#define rounded_product(a,b) a = rnd_prod(a, b)
-#define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
-extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
-#else
-#define rounded_product(a,b) a *= b
-#define rounded_quotient(a,b) a /= b
-#endif
-
-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
-#define Big1 0xffffffff
-
-#ifndef Pack_32
-#define Pack_32
-#endif
-
-#ifdef KR_headers
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
-#else
-#define FFFFFFFF 0xffffffffUL
-#endif
-
-#ifdef NO_LONG_LONG
-#undef ULLong
-#ifdef Just_16
-#undef Pack_32
-/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
- * This makes some inner loops simpler and sometimes saves work
- * during multiplications, but it often seems to make things slightly
- * slower.  Hence the default is now to store 32 bits per Long.
- */
-#endif
-#else	/* long long available */
-#ifndef Llong
-#define Llong long long
-#endif
-#ifndef ULLong
-#define ULLong unsigned Llong
-#endif
-#endif /* NO_LONG_LONG */
-
-#ifndef MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
-#define FREE_DTOA_LOCK(n)	/*nothing*/
-#endif
-
-#define Kmax 15
-
- struct
-Bigint {
-	struct Bigint *next;
-	int k, maxwds, sign, wds;
-	ULong x[1];
-	};
-
- typedef struct Bigint Bigint;
-
- static Bigint *freelist[Kmax+1];
-
- static Bigint *
-Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
-	(int k)
-#endif
-{
-	int x;
-	Bigint *rv;
-#ifndef Omit_Private_Memory
-	unsigned int len;
-#endif
-
-	ACQUIRE_DTOA_LOCK(0);
-	if (rv = freelist[k]) {
-		freelist[k] = rv->next;
-		}
-	else {
-		x = 1 << k;
-#ifdef Omit_Private_Memory
-		rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-			/sizeof(double);
-		if (pmem_next - private_mem + len <= PRIVATE_mem) {
-			rv = (Bigint*)pmem_next;
-			pmem_next += len;
-			}
-		else
-			rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-		rv->k = k;
-		rv->maxwds = x;
-		}
-	FREE_DTOA_LOCK(0);
-	rv->sign = rv->wds = 0;
-	return rv;
-	}
-
- static void
-Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
-	(Bigint *v)
-#endif
-{
-	if (v) {
-		ACQUIRE_DTOA_LOCK(0);
-		v->next = freelist[v->k];
-		freelist[v->k] = v;
-		FREE_DTOA_LOCK(0);
-		}
-	}
-
-#define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
-y->wds*sizeof(Long) + 2*sizeof(int))
-
- static Bigint *
-multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
-	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
-{
-	int i, wds;
-#ifdef ULLong
-	ULong *x;
-	ULLong carry, y;
-#else
-	ULong carry, *x, y;
-#ifdef Pack_32
-	ULong xi, z;
-#endif
-#endif
-	Bigint *b1;
-
-	wds = b->wds;
-	x = b->x;
-	i = 0;
-	carry = a;
-	do {
-#ifdef ULLong
-		y = *x * (ULLong)m + carry;
-		carry = y >> 32;
-		*x++ = y & FFFFFFFF;
-#else
-#ifdef Pack_32
-		xi = *x;
-		y = (xi & 0xffff) * m + carry;
-		z = (xi >> 16) * m + (y >> 16);
-		carry = z >> 16;
-		*x++ = (z << 16) + (y & 0xffff);
-#else
-		y = *x * m + carry;
-		carry = y >> 16;
-		*x++ = y & 0xffff;
-#endif
-#endif
-		}
-		while(++i < wds);
-	if (carry) {
-		if (wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
-			Bcopy(b1, b);
-			Bfree(b);
-			b = b1;
-			}
-		b->x[wds++] = carry;
-		b->wds = wds;
-		}
-	return b;
-	}
-
- static Bigint *
-s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
-	(CONST char *s, int nd0, int nd, ULong y9)
-#endif
-{
-	Bigint *b;
-	int i, k;
-	Long x, y;
-
-	x = (nd + 8) / 9;
-	for(k = 0, y = 1; x > y; y <<= 1, k++) ;
-#ifdef Pack_32
-	b = Balloc(k);
-	b->x[0] = y9;
-	b->wds = 1;
-#else
-	b = Balloc(k+1);
-	b->x[0] = y9 & 0xffff;
-	b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
-#endif
-
-	i = 9;
-	if (9 < nd0) {
-		s += 9;
-		do b = multadd(b, 10, *s++ - '0');
-			while(++i < nd0);
-		s++;
-		}
-	else
-		s += 10;
-	for(; i < nd; i++)
-		b = multadd(b, 10, *s++ - '0');
-	return b;
-	}
-
- static int
-hi0bits
-#ifdef KR_headers
-	(x) register ULong x;
-#else
-	(register ULong x)
-#endif
-{
-	register int k = 0;
-
-	if (!(x & 0xffff0000)) {
-		k = 16;
-		x <<= 16;
-		}
-	if (!(x & 0xff000000)) {
-		k += 8;
-		x <<= 8;
-		}
-	if (!(x & 0xf0000000)) {
-		k += 4;
-		x <<= 4;
-		}
-	if (!(x & 0xc0000000)) {
-		k += 2;
-		x <<= 2;
-		}
-	if (!(x & 0x80000000)) {
-		k++;
-		if (!(x & 0x40000000))
-			return 32;
-		}
-	return k;
-	}
-
- static int
-lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
-	(ULong *y)
-#endif
-{
-	register int k;
-	register ULong x = *y;
-
-	if (x & 7) {
-		if (x & 1)
-			return 0;
-		if (x & 2) {
-			*y = x >> 1;
-			return 1;
-			}
-		*y = x >> 2;
-		return 2;
-		}
-	k = 0;
-	if (!(x & 0xffff)) {
-		k = 16;
-		x >>= 16;
-		}
-	if (!(x & 0xff)) {
-		k += 8;
-		x >>= 8;
-		}
-	if (!(x & 0xf)) {
-		k += 4;
-		x >>= 4;
-		}
-	if (!(x & 0x3)) {
-		k += 2;
-		x >>= 2;
-		}
-	if (!(x & 1)) {
-		k++;
-		x >>= 1;
-		if (!x)
-			return 32;
-		}
-	*y = x;
-	return k;
-	}
-
- static Bigint *
-i2b
-#ifdef KR_headers
-	(i) int i;
-#else
-	(int i)
-#endif
-{
-	Bigint *b;
-
-	b = Balloc(1);
-	b->x[0] = i;
-	b->wds = 1;
-	return b;
-	}
-
- static Bigint *
-mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int k, wa, wb, wc;
-	ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
-	ULong y;
-#ifdef ULLong
-	ULLong carry, z;
-#else
-	ULong carry, z;
-#ifdef Pack_32
-	ULong z2;
-#endif
-#endif
-
-	if (a->wds < b->wds) {
-		c = a;
-		a = b;
-		b = c;
-		}
-	k = a->k;
-	wa = a->wds;
-	wb = b->wds;
-	wc = wa + wb;
-	if (wc > a->maxwds)
-		k++;
-	c = Balloc(k);
-	for(x = c->x, xa = x + wc; x < xa; x++)
-		*x = 0;
-	xa = a->x;
-	xae = xa + wa;
-	xb = b->x;
-	xbe = xb + wb;
-	xc0 = c->x;
-#ifdef ULLong
-	for(; xb < xbe; xc0++) {
-		if (y = *xb++) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * (ULLong)y + *xc + carry;
-				carry = z >> 32;
-				*xc++ = z & FFFFFFFF;
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		}
-#else
-#ifdef Pack_32
-	for(; xb < xbe; xb++, xc0++) {
-		if (y = *xb & 0xffff) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
-				carry = z >> 16;
-				z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
-				carry = z2 >> 16;
-				Storeinc(xc, z2, z);
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		if (y = *xb >> 16) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			z2 = *xc;
-			do {
-				z = (*x & 0xffff) * y + (*xc >> 16) + carry;
-				carry = z >> 16;
-				Storeinc(xc, z, z2);
-				z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
-				carry = z2 >> 16;
-				}
-				while(x < xae);
-			*xc = z2;
-			}
-		}
-#else
-	for(; xb < xbe; xc0++) {
-		if (y = *xb++) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * y + *xc + carry;
-				carry = z >> 16;
-				*xc++ = z & 0xffff;
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		}
-#endif
-#endif
-	for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
-	c->wds = wc;
-	return c;
-	}
-
- static Bigint *p5s;
-
- static Bigint *
-pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	Bigint *b1, *p5, *p51;
-	int i;
-	static int p05[3] = { 5, 25, 125 };
-
-	if (i = k & 3)
-		b = multadd(b, p05[i-1], 0);
-
-	if (!(k >>= 2))
-		return b;
-	if (!(p5 = p5s)) {
-		/* first time */
-#ifdef MULTIPLE_THREADS
-		ACQUIRE_DTOA_LOCK(1);
-		if (!(p5 = p5s)) {
-			p5 = p5s = i2b(625);
-			p5->next = 0;
-			}
-		FREE_DTOA_LOCK(1);
-#else
-		p5 = p5s = i2b(625);
-		p5->next = 0;
-#endif
-		}
-	for(;;) {
-		if (k & 1) {
-			b1 = mult(b, p5);
-			Bfree(b);
-			b = b1;
-			}
-		if (!(k >>= 1))
-			break;
-		if (!(p51 = p5->next)) {
-#ifdef MULTIPLE_THREADS
-			ACQUIRE_DTOA_LOCK(1);
-			if (!(p51 = p5->next)) {
-				p51 = p5->next = mult(p5,p5);
-				p51->next = 0;
-				}
-			FREE_DTOA_LOCK(1);
-#else
-			p51 = p5->next = mult(p5,p5);
-			p51->next = 0;
-#endif
-			}
-		p5 = p51;
-		}
-	return b;
-	}
-
- static Bigint *
-lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	int i, k1, n, n1;
-	Bigint *b1;
-	ULong *x, *x1, *xe, z;
-
-#ifdef Pack_32
-	n = k >> 5;
-#else
-	n = k >> 4;
-#endif
-	k1 = b->k;
-	n1 = n + b->wds + 1;
-	for(i = b->maxwds; n1 > i; i <<= 1)
-		k1++;
-	b1 = Balloc(k1);
-	x1 = b1->x;
-	for(i = 0; i < n; i++)
-		*x1++ = 0;
-	x = b->x;
-	xe = x + b->wds;
-#ifdef Pack_32
-	if (k &= 0x1f) {
-		k1 = 32 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if (*x1 = z)
-			++n1;
-		}
-#else
-	if (k &= 0xf) {
-		k1 = 16 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k  & 0xffff | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if (*x1 = z)
-			++n1;
-		}
-#endif
-	else do
-		*x1++ = *x++;
-		while(x < xe);
-	b1->wds = n1 - 1;
-	Bfree(b);
-	return b1;
-	}
-
- static int
-cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	ULong *xa, *xa0, *xb, *xb0;
-	int i, j;
-
-	i = a->wds;
-	j = b->wds;
-#ifdef DEBUG
-	if (i > 1 && !a->x[i-1])
-		Bug("cmp called with a->x[a->wds-1] == 0");
-	if (j > 1 && !b->x[j-1])
-		Bug("cmp called with b->x[b->wds-1] == 0");
-#endif
-	if (i -= j)
-		return i;
-	xa0 = a->x;
-	xa = xa0 + j;
-	xb0 = b->x;
-	xb = xb0 + j;
-	for(;;) {
-		if (*--xa != *--xb)
-			return *xa < *xb ? -1 : 1;
-		if (xa <= xa0)
-			break;
-		}
-	return 0;
-	}
-
- static Bigint *
-diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int i, wa, wb;
-	ULong *xa, *xae, *xb, *xbe, *xc;
-#ifdef ULLong
-	ULLong borrow, y;
-#else
-	ULong borrow, y;
-#ifdef Pack_32
-	ULong z;
-#endif
-#endif
-
-	i = cmp(a,b);
-	if (!i) {
-		c = Balloc(0);
-		c->wds = 1;
-		c->x[0] = 0;
-		return c;
-		}
-	if (i < 0) {
-		c = a;
-		a = b;
-		b = c;
-		i = 1;
-		}
-	else
-		i = 0;
-	c = Balloc(a->k);
-	c->sign = i;
-	wa = a->wds;
-	xa = a->x;
-	xae = xa + wa;
-	wb = b->wds;
-	xb = b->x;
-	xbe = xb + wb;
-	xc = c->x;
-	borrow = 0;
-#ifdef ULLong
-	do {
-		y = (ULLong)*xa++ - *xb++ - borrow;
-		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = y >> 32 & (ULong)1;
-		*xc++ = y & FFFFFFFF;
-		}
-#else
-#ifdef Pack_32
-	do {
-		y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = (*xa & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-#else
-	do {
-		y = *xa++ - *xb++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-#endif
-#endif
-	while(!*--xc)
-		wa--;
-	c->wds = wa;
-	return c;
-	}
-
- static double
-ulp
-#ifdef KR_headers
-	(x) double x;
-#else
-	(double x)
-#endif
-{
-	register Long L;
-	double a;
-
-	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
-#ifndef Avoid_Underflow
-#ifndef Sudden_Underflow
-	if (L > 0) {
-#endif
-#endif
-#ifdef IBM
-		L |= Exp_msk1 >> 4;
-#endif
-		word0(a) = L;
-		word1(a) = 0;
-#ifndef Avoid_Underflow
-#ifndef Sudden_Underflow
-		}
-	else {
-		L = -L >> Exp_shift;
-		if (L < Exp_shift) {
-			word0(a) = 0x80000 >> L;
-			word1(a) = 0;
-			}
-		else {
-			word0(a) = 0;
-			L -= Exp_shift;
-			word1(a) = L >= 31 ? 1 : 1 << 31 - L;
-			}
-		}
-#endif
-#endif
-	return dval(a);
-	}
-
- static double
-b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
-	(Bigint *a, int *e)
-#endif
-{
-	ULong *xa, *xa0, w, y, z;
-	int k;
-	double d;
-#ifdef VAX
-	ULong d0, d1;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-	xa0 = a->x;
-	xa = xa0 + a->wds;
-	y = *--xa;
-#ifdef DEBUG
-	if (!y) Bug("zero y in b2d");
-#endif
-	k = hi0bits(y);
-	*e = 32 - k;
-#ifdef Pack_32
-	if (k < Ebits) {
-		d0 = Exp_1 | y >> Ebits - k;
-		w = xa > xa0 ? *--xa : 0;
-		d1 = y << (32-Ebits) + k | w >> Ebits - k;
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	if (k -= Ebits) {
-		d0 = Exp_1 | y << k | z >> 32 - k;
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k | y >> 32 - k;
-		}
-	else {
-		d0 = Exp_1 | y;
-		d1 = z;
-		}
-#else
-	if (k < Ebits + 16) {
-		z = xa > xa0 ? *--xa : 0;
-		d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
-		w = xa > xa0 ? *--xa : 0;
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	w = xa > xa0 ? *--xa : 0;
-	k -= Ebits + 16;
-	d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
-	y = xa > xa0 ? *--xa : 0;
-	d1 = w << k + 16 | y << k;
-#endif
- ret_d:
-#ifdef VAX
-	word0(d) = d0 >> 16 | d0 << 16;
-	word1(d) = d1 >> 16 | d1 << 16;
-#else
-#undef d0
-#undef d1
-#endif
-	return dval(d);
-	}
-
- static Bigint *
-d2b
-#ifdef KR_headers
-	(d, e, bits) double d; int *e, *bits;
-#else
-	(double d, int *e, int *bits)
-#endif
-{
-	Bigint *b;
-	int de, k;
-	ULong *x, y, z;
-#ifndef Sudden_Underflow
-	int i;
-#endif
-#ifdef VAX
-	ULong d0, d1;
-	d0 = word0(d) >> 16 | word0(d) << 16;
-	d1 = word1(d) >> 16 | word1(d) << 16;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-#ifdef Pack_32
-	b = Balloc(1);
-#else
-	b = Balloc(2);
-#endif
-	x = b->x;
-
-	z = d0 & Frac_mask;
-	d0 &= 0x7fffffff;	/* clear sign bit, which we ignore */
-#ifdef Sudden_Underflow
-	de = (int)(d0 >> Exp_shift);
-#ifndef IBM
-	z |= Exp_msk11;
-#endif
-#else
-	if (de = (int)(d0 >> Exp_shift))
-		z |= Exp_msk1;
-#endif
-#ifdef Pack_32
-	if (y = d1) {
-		if (k = lo0bits(&y)) {
-			x[0] = y | z << 32 - k;
-			z >>= k;
-			}
-		else
-			x[0] = y;
-#ifndef Sudden_Underflow
-		i =
-#endif
-		    b->wds = (x[1] = z) ? 2 : 1;
-		}
-	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
-		k = lo0bits(&z);
-		x[0] = z;
-#ifndef Sudden_Underflow
-		i =
-#endif
-		    b->wds = 1;
-		k += 32;
-		}
-#else
-	if (y = d1) {
-		if (k = lo0bits(&y))
-			if (k >= 16) {
-				x[0] = y | z << 32 - k & 0xffff;
-				x[1] = z >> k - 16 & 0xffff;
-				x[2] = z >> k;
-				i = 2;
-				}
-			else {
-				x[0] = y & 0xffff;
-				x[1] = y >> 16 | z << 16 - k & 0xffff;
-				x[2] = z >> k & 0xffff;
-				x[3] = z >> k+16;
-				i = 3;
-				}
-		else {
-			x[0] = y & 0xffff;
-			x[1] = y >> 16;
-			x[2] = z & 0xffff;
-			x[3] = z >> 16;
-			i = 3;
-			}
-		}
-	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
-		k = lo0bits(&z);
-		if (k >= 16) {
-			x[0] = z;
-			i = 0;
-			}
-		else {
-			x[0] = z & 0xffff;
-			x[1] = z >> 16;
-			i = 1;
-			}
-		k += 32;
-		}
-	while(!x[i])
-		--i;
-	b->wds = i + 1;
-#endif
-#ifndef Sudden_Underflow
-	if (de) {
-#endif
-#ifdef IBM
-		*e = (de - Bias - (P-1) << 2) + k;
-		*bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
-#else
-		*e = de - Bias - (P-1) + k;
-		*bits = P - k;
-#endif
-#ifndef Sudden_Underflow
-		}
-	else {
-		*e = de - Bias - (P-1) + 1 + k;
-#ifdef Pack_32
-		*bits = 32*i - hi0bits(x[i-1]);
-#else
-		*bits = (i+2)*16 - hi0bits(x[i]);
-#endif
-		}
-#endif
-	return b;
-	}
-#undef d0
-#undef d1
-
- static double
-ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	double da, db;
-	int k, ka, kb;
-
-	dval(da) = b2d(a, &ka);
-	dval(db) = b2d(b, &kb);
-#ifdef Pack_32
-	k = ka - kb + 32*(a->wds - b->wds);
-#else
-	k = ka - kb + 16*(a->wds - b->wds);
-#endif
-#ifdef IBM
-	if (k > 0) {
-		word0(da) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(da) *= 1 << k;
-		}
-	else {
-		k = -k;
-		word0(db) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(db) *= 1 << k;
-		}
-#else
-	if (k > 0)
-		word0(da) += k*Exp_msk1;
-	else {
-		k = -k;
-		word0(db) += k*Exp_msk1;
-		}
-#endif
-	return dval(da) / dval(db);
-	}
-
- static CONST double
-tens[] = {
-		1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
-		1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
-		1e20, 1e21, 1e22
-#ifdef VAX
-		, 1e23, 1e24
-#endif
-		};
-
- static CONST double
-#ifdef IEEE_Arith
-bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
-#ifdef Avoid_Underflow
-		9007199254740992.*9007199254740992.e-256
-		/* = 2^106 * 1e-53 */
-#else
-		1e-256
-#endif
-		};
-/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */
-/* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-#define Scale_Bit 0x10
-#define n_bigtens 5
-#else
-#ifdef IBM
-bigtens[] = { 1e16, 1e32, 1e64 };
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64 };
-#define n_bigtens 3
-#else
-bigtens[] = { 1e16, 1e32 };
-static CONST double tinytens[] = { 1e-16, 1e-32 };
-#define n_bigtens 2
-#endif
-#endif
-
-#ifndef IEEE_Arith
-#undef INFNAN_CHECK
-#endif
-
-#ifdef INFNAN_CHECK
-
-#ifndef NAN_WORD0
-#define NAN_WORD0 0x7ff80000
-#endif
-
-#ifndef NAN_WORD1
-#define NAN_WORD1 0
-#endif
-
- static int
-match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
-	(CONST char **sp, char *t)
-#endif
-{
-	int c, d;
-	CONST char *s = *sp;
-
-	while(d = *t++) {
-		if ((c = *++s) >= 'A' && c <= 'Z')
-			c += 'a' - 'A';
-		if (c != d)
-			return 0;
-		}
-	*sp = s + 1;
-	return 1;
-	}
-
-#ifndef No_Hex_NaN
- static void
-hexnan
-#ifdef KR_headers
-	(rvp, sp) double *rvp; CONST char **sp;
-#else
-	(double *rvp, CONST char **sp)
-#endif
-{
-	ULong c, x[2];
-	CONST char *s;
-	int havedig, udx0, xshift;
-
-	x[0] = x[1] = 0;
-	havedig = xshift = 0;
-	udx0 = 1;
-	s = *sp;
-	while(c = *(CONST unsigned char*)++s) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'a' && c <= 'f')
-			c += 10 - 'a';
-		else if (c >= 'A' && c <= 'F')
-			c += 10 - 'A';
-		else if (c <= ' ') {
-			if (udx0 && havedig) {
-				udx0 = 0;
-				xshift = 1;
-				}
-			continue;
-			}
-		else if (/*(*/ c == ')' && havedig) {
-			*sp = s + 1;
-			break;
-			}
-		else
-			return;	/* invalid form: don't change *sp */
-		havedig = 1;
-		if (xshift) {
-			xshift = 0;
-			x[0] = x[1];
-			x[1] = 0;
-			}
-		if (udx0)
-			x[0] = (x[0] << 4) | (x[1] >> 28);
-		x[1] = (x[1] << 4) | c;
-		}
-	if ((x[0] &= 0xfffff) || x[1]) {
-		word0(*rvp) = Exp_mask | x[0];
-		word1(*rvp) = x[1];
-		}
-	}
-#endif /*No_Hex_NaN*/
-#endif /* INFNAN_CHECK */
-
- PR_IMPLEMENT(double)
-PR_strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
-	(CONST char *s00, char **se)
-#endif
-{
-#ifdef Avoid_Underflow
-	int scale;
-#endif
-	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-	CONST char *s, *s0, *s1;
-	double aadj, aadj1, adj, rv, rv0;
-	Long L;
-	ULong y, z;
-	Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	int rounding;
-#endif
-#ifdef USE_LOCALE
-	CONST char *s2;
-#endif
-
-	if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	sign = nz0 = nz = 0;
-	dval(rv) = 0.;
-	for(s = s00;;s++) switch(*s) {
-		case '-':
-			sign = 1;
-			/* no break */
-		case '+':
-			if (*++s)
-				goto break2;
-			/* no break */
-		case 0:
-			goto ret0;
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case ' ':
-			continue;
-		default:
-			goto break2;
-		}
- break2:
-	if (*s == '0') {
-		nz0 = 1;
-		while(*++s == '0') ;
-		if (!*s)
-			goto ret;
-		}
-	s0 = s;
-	y = z = 0;
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-		if (nd < 9)
-			y = 10*y + c - '0';
-		else if (nd < 16)
-			z = 10*z + c - '0';
-	nd0 = nd;
-#ifdef USE_LOCALE
-	s1 = localeconv()->decimal_point;
-	if (c == *s1) {
-		c = '.';
-		if (*++s1) {
-			s2 = s;
-			for(;;) {
-				if (*++s2 != *s1) {
-					c = 0;
-					break;
-					}
-				if (!*++s1) {
-					s = s2;
-					break;
-					}
-				}
-			}
-		}
-#endif
-	if (c == '.') {
-		c = *++s;
-		if (!nd) {
-			for(; c == '0'; c = *++s)
-				nz++;
-			if (c > '0' && c <= '9') {
-				s0 = s;
-				nf += nz;
-				nz = 0;
-				goto have_dig;
-				}
-			goto dig_done;
-			}
-		for(; c >= '0' && c <= '9'; c = *++s) {
- have_dig:
-			nz++;
-			if (c -= '0') {
-				nf += nz;
-				for(i = 1; i < nz; i++)
-					if (nd++ < 9)
-						y *= 10;
-					else if (nd <= DBL_DIG + 1)
-						z *= 10;
-				if (nd++ < 9)
-					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
-					z = 10*z + c;
-				nz = 0;
-				}
-			}
-		}
- dig_done:
-	e = 0;
-	if (c == 'e' || c == 'E') {
-		if (!nd && !nz && !nz0) {
-			goto ret0;
-			}
-		s00 = s;
-		esign = 0;
-		switch(c = *++s) {
-			case '-':
-				esign = 1;
-			case '+':
-				c = *++s;
-			}
-		if (c >= '0' && c <= '9') {
-			while(c == '0')
-				c = *++s;
-			if (c > '0' && c <= '9') {
-				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
-					/* Avoid confusion from exponents
-					 * so large that e might overflow.
-					 */
-					e = 19999; /* safe for 16 bit ints */
-				else
-					e = (int)L;
-				if (esign)
-					e = -e;
-				}
-			else
-				e = 0;
-			}
-		else
-			s = s00;
-		}
-	if (!nd) {
-		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-			/* Check for Nan and Infinity */
-			switch(c) {
-			  case 'i':
-			  case 'I':
-				if (match(&s,"nf")) {
-					--s;
-					if (!match(&s,"inity"))
-						++s;
-					word0(rv) = 0x7ff00000;
-					word1(rv) = 0;
-					goto ret;
-					}
-				break;
-			  case 'n':
-			  case 'N':
-				if (match(&s, "an")) {
-					word0(rv) = NAN_WORD0;
-					word1(rv) = NAN_WORD1;
-#ifndef No_Hex_NaN
-					if (*s == '(') /*)*/
-						hexnan(&rv, &s);
-#endif
-					goto ret;
-					}
-			  }
-#endif /* INFNAN_CHECK */
- ret0:
-			s = s00;
-			sign = 0;
-			}
-		goto ret;
-		}
-	e1 = e -= nf;
-
-	/* Now we have nd0 digits, starting at s0, followed by a
-	 * decimal point, followed by nd-nd0 digits.  The number we're
-	 * after is the integer represented by those digits times
-	 * 10**e */
-
-	if (!nd0)
-		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-	dval(rv) = y;
-	if (k > 9) {
-#ifdef SET_INEXACT
-		if (k > DBL_DIG)
-			oldinexact = get_inexact();
-#endif
-		dval(rv) = tens[k - 9] * dval(rv) + z;
-		}
-	bd0 = 0;
-	if (nd <= DBL_DIG
-#ifndef RND_PRODQUOT
-#ifndef Honor_FLT_ROUNDS
-		&& Flt_Rounds == 1
-#endif
-#endif
-			) {
-		if (!e)
-			goto ret;
-		if (e > 0) {
-			if (e <= Ten_pmax) {
-#ifdef VAX
-				goto vax_ovfl_check;
-#else
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv = -rv;
-					sign = 0;
-					}
-#endif
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-				goto ret;
-#endif
-				}
-			i = DBL_DIG - nd;
-			if (e <= Ten_pmax + i) {
-				/* A fancier test would sometimes let us do
-				 * this for larger i values.
-				 */
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv = -rv;
-					sign = 0;
-					}
-#endif
-				e -= i;
-				dval(rv) *= tens[i];
-#ifdef VAX
-				/* VAX exponent range is so narrow we must
-				 * worry about overflow here...
-				 */
- vax_ovfl_check:
-				word0(rv) -= P*Exp_msk1;
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-				if ((word0(rv) & Exp_mask)
-				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-					goto ovfl;
-				word0(rv) += P*Exp_msk1;
-#else
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-#endif
-				goto ret;
-				}
-			}
-#ifndef Inaccurate_Divide
-		else if (e >= -Ten_pmax) {
-#ifdef Honor_FLT_ROUNDS
-			/* round correctly FLT_ROUNDS = 2 or 3 */
-			if (sign) {
-				rv = -rv;
-				sign = 0;
-				}
-#endif
-			/* rv = */ rounded_quotient(dval(rv), tens[-e]);
-			goto ret;
-			}
-#endif
-		}
-	e1 += nd - k;
-
-#ifdef IEEE_Arith
-#ifdef SET_INEXACT
-	inexact = 1;
-	if (k <= DBL_DIG)
-		oldinexact = get_inexact();
-#endif
-#ifdef Avoid_Underflow
-	scale = 0;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if ((rounding = Flt_Rounds) >= 2) {
-		if (sign)
-			rounding = rounding == 2 ? 0 : 2;
-		else
-			if (rounding != 2)
-				rounding = 0;
-		}
-#endif
-#endif /*IEEE_Arith*/
-
-	/* Get starting approximation = rv * 10**e1 */
-
-	if (e1 > 0) {
-		if (i = e1 & 15)
-			dval(rv) *= tens[i];
-		if (e1 &= ~15) {
-			if (e1 > DBL_MAX_10_EXP) {
- ovfl:
-#ifndef NO_ERRNO
-				PR_SetError(PR_RANGE_ERROR, 0);
-#endif
-				/* Can't trust HUGE_VAL */
-#ifdef IEEE_Arith
-#ifdef Honor_FLT_ROUNDS
-				switch(rounding) {
-				  case 0: /* toward 0 */
-				  case 3: /* toward -infinity */
-					word0(rv) = Big0;
-					word1(rv) = Big1;
-					break;
-				  default:
-					word0(rv) = Exp_mask;
-					word1(rv) = 0;
-				  }
-#else /*Honor_FLT_ROUNDS*/
-				word0(rv) = Exp_mask;
-				word1(rv) = 0;
-#endif /*Honor_FLT_ROUNDS*/
-#ifdef SET_INEXACT
-				/* set overflow bit */
-				dval(rv0) = 1e300;
-				dval(rv0) *= dval(rv0);
-#endif
-#else /*IEEE_Arith*/
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-#endif /*IEEE_Arith*/
-				if (bd0)
-					goto retfree;
-				goto ret;
-				}
-			e1 >>= 4;
-			for(j = 0; e1 > 1; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= bigtens[j];
-		/* The last multiplication could overflow. */
-			word0(rv) -= P*Exp_msk1;
-			dval(rv) *= bigtens[j];
-			if ((z = word0(rv) & Exp_mask)
-			 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
-				goto ovfl;
-			if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
-				/* set to largest number */
-				/* (Can't trust DBL_MAX) */
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-				}
-			else
-				word0(rv) += P*Exp_msk1;
-			}
-		}
-	else if (e1 < 0) {
-		e1 = -e1;
-		if (i = e1 & 15)
-			dval(rv) /= tens[i];
-		if (e1 >>= 4) {
-			if (e1 >= 1 << n_bigtens)
-				goto undfl;
-#ifdef Avoid_Underflow
-			if (e1 & Scale_Bit)
-				scale = 2*P;
-			for(j = 0; e1 > 0; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= tinytens[j];
-			if (scale && (j = 2*P + 1 - ((word0(rv) & Exp_mask)
-						>> Exp_shift)) > 0) {
-				/* scaled rv is denormal; zap j low bits */
-				if (j >= 32) {
-					word1(rv) = 0;
-					if (j >= 53)
-					 word0(rv) = (P+2)*Exp_msk1;
-					else
-					 word0(rv) &= 0xffffffff << j-32;
-					}
-				else
-					word1(rv) &= 0xffffffff << j;
-				}
-#else
-			for(j = 0; e1 > 1; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= tinytens[j];
-			/* The last multiplication could underflow. */
-			dval(rv0) = dval(rv);
-			dval(rv) *= tinytens[j];
-			if (!dval(rv)) {
-				dval(rv) = 2.*dval(rv0);
-				dval(rv) *= tinytens[j];
-#endif
-				if (!dval(rv)) {
- undfl:
-					dval(rv) = 0.;
-#ifndef NO_ERRNO
-					PR_SetError(PR_RANGE_ERROR, 0);
-#endif
-					if (bd0)
-						goto retfree;
-					goto ret;
-					}
-#ifndef Avoid_Underflow
-				word0(rv) = Tiny0;
-				word1(rv) = Tiny1;
-				/* The refinement below will clean
-				 * this approximation up.
-				 */
-				}
-#endif
-			}
-		}
-
-	/* Now the hard part -- adjusting rv to the correct value.*/
-
-	/* Put digits into bd: true value = bd * 10^e */
-
-	bd0 = s2b(s0, nd0, nd, y);
-
-	for(;;) {
-		bd = Balloc(bd0->k);
-		Bcopy(bd, bd0);
-		bb = d2b(dval(rv), &bbe, &bbbits);	/* rv = bb * 2^bbe */
-		bs = i2b(1);
-
-		if (e >= 0) {
-			bb2 = bb5 = 0;
-			bd2 = bd5 = e;
-			}
-		else {
-			bb2 = bb5 = -e;
-			bd2 = bd5 = 0;
-			}
-		if (bbe >= 0)
-			bb2 += bbe;
-		else
-			bd2 -= bbe;
-		bs2 = bb2;
-#ifdef Honor_FLT_ROUNDS
-		if (rounding != 1)
-			bs2++;
-#endif
-#ifdef Avoid_Underflow
-		j = bbe - scale;
-		i = j + bbbits - 1;	/* logb(rv) */
-		if (i < Emin)	/* denormal */
-			j += P - Emin;
-		else
-			j = P + 1 - bbbits;
-#else /*Avoid_Underflow*/
-#ifdef Sudden_Underflow
-#ifdef IBM
-		j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
-#else
-		j = P + 1 - bbbits;
-#endif
-#else /*Sudden_Underflow*/
-		j = bbe;
-		i = j + bbbits - 1;	/* logb(rv) */
-		if (i < Emin)	/* denormal */
-			j += P - Emin;
-		else
-			j = P + 1 - bbbits;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-		bb2 += j;
-		bd2 += j;
-#ifdef Avoid_Underflow
-		bd2 += scale;
-#endif
-		i = bb2 < bd2 ? bb2 : bd2;
-		if (i > bs2)
-			i = bs2;
-		if (i > 0) {
-			bb2 -= i;
-			bd2 -= i;
-			bs2 -= i;
-			}
-		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			bb1 = mult(bs, bb);
-			Bfree(bb);
-			bb = bb1;
-			}
-		if (bb2 > 0)
-			bb = lshift(bb, bb2);
-		if (bd5 > 0)
-			bd = pow5mult(bd, bd5);
-		if (bd2 > 0)
-			bd = lshift(bd, bd2);
-		if (bs2 > 0)
-			bs = lshift(bs, bs2);
-		delta = diff(bb, bd);
-		dsign = delta->sign;
-		delta->sign = 0;
-		i = cmp(delta, bs);
-#ifdef Honor_FLT_ROUNDS
-		if (rounding != 1) {
-			if (i < 0) {
-				/* Error is less than an ulp */
-				if (!delta->x[0] && delta->wds <= 1) {
-					/* exact */
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					break;
-					}
-				if (rounding) {
-					if (dsign) {
-						adj = 1.;
-						goto apply_adj;
-						}
-					}
-				else if (!dsign) {
-					adj = -1.;
-					if (!word1(rv)
-					 && !(word0(rv) & Frac_mask)) {
-						y = word0(rv) & Exp_mask;
-#ifdef Avoid_Underflow
-						if (!scale || y > 2*P*Exp_msk1)
-#else
-						if (y)
-#endif
-						  {
-						  delta = lshift(delta,Log2P);
-						  if (cmp(delta, bs) <= 0)
-							adj = -0.5;
-						  }
-						}
- apply_adj:
-#ifdef Avoid_Underflow
-					if (scale && (y = word0(rv) & Exp_mask)
-						<= 2*P*Exp_msk1)
-					  word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-					if ((word0(rv) & Exp_mask) <=
-							P*Exp_msk1) {
-						word0(rv) += P*Exp_msk1;
-						dval(rv) += adj*ulp(dval(rv));
-						word0(rv) -= P*Exp_msk1;
-						}
-					else
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-					dval(rv) += adj*ulp(dval(rv));
-					}
-				break;
-				}
-			adj = ratio(delta, bs);
-			if (adj < 1.)
-				adj = 1.;
-			if (adj <= 0x7ffffffe) {
-				/* adj = rounding ? ceil(adj) : floor(adj); */
-				y = adj;
-				if (y != adj) {
-					if (!((rounding>>1) ^ dsign))
-						y++;
-					adj = y;
-					}
-				}
-#ifdef Avoid_Underflow
-			if (scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-				word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-				word0(rv) += P*Exp_msk1;
-				adj *= ulp(dval(rv));
-				if (dsign)
-					dval(rv) += adj;
-				else
-					dval(rv) -= adj;
-				word0(rv) -= P*Exp_msk1;
-				goto cont;
-				}
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			adj *= ulp(dval(rv));
-			if (dsign)
-				dval(rv) += adj;
-			else
-				dval(rv) -= adj;
-			goto cont;
-			}
-#endif /*Honor_FLT_ROUNDS*/
-
-		if (i < 0) {
-			/* Error is less than half an ulp -- check for
-			 * special case of mantissa a power of two.
-			 */
-			if (dsign || word1(rv) || word0(rv) & Bndry_mask
-#ifdef IEEE_Arith
-#ifdef Avoid_Underflow
-			 || (word0(rv) & Exp_mask) <= (2*P+1)*Exp_msk1
-#else
-			 || (word0(rv) & Exp_mask) <= Exp_msk1
-#endif
-#endif
-				) {
-#ifdef SET_INEXACT
-				if (!delta->x[0] && delta->wds <= 1)
-					inexact = 0;
-#endif
-				break;
-				}
-			if (!delta->x[0] && delta->wds <= 1) {
-				/* exact result */
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			delta = lshift(delta,Log2P);
-			if (cmp(delta, bs) > 0)
-				goto drop_down;
-			break;
-			}
-		if (i == 0) {
-			/* exactly half-way between */
-			if (dsign) {
-				if ((word0(rv) & Bndry_mask1) == Bndry_mask1
-				 &&  word1(rv) == (
-#ifdef Avoid_Underflow
-			(scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-		? (0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
-#endif
-						   0xffffffff)) {
-					/*boundary case -- increment exponent*/
-					word0(rv) = (word0(rv) & Exp_mask)
-						+ Exp_msk1
-#ifdef IBM
-						| Exp_msk1 >> 4
-#endif
-						;
-					word1(rv) = 0;
-#ifdef Avoid_Underflow
-					dsign = 0;
-#endif
-					break;
-					}
-				}
-			else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
- drop_down:
-				/* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow /*{{*/
-				L = word0(rv) & Exp_mask;
-#ifdef IBM
-				if (L <  Exp_msk1)
-#else
-#ifdef Avoid_Underflow
-				if (L <= (scale ? (2*P+1)*Exp_msk1 : Exp_msk1))
-#else
-				if (L <= Exp_msk1)
-#endif /*Avoid_Underflow*/
-#endif /*IBM*/
-					goto undfl;
-				L -= Exp_msk1;
-#else /*Sudden_Underflow}{*/
-#ifdef Avoid_Underflow
-				if (scale) {
-					L = word0(rv) & Exp_mask;
-					if (L <= (2*P+1)*Exp_msk1) {
-						if (L > (P+2)*Exp_msk1)
-							/* round even ==> */
-							/* accept rv */
-							break;
-						/* rv = smallest denormal */
-						goto undfl;
-						}
-					}
-#endif /*Avoid_Underflow*/
-				L = (word0(rv) & Exp_mask) - Exp_msk1;
-#endif /*Sudden_Underflow}}*/
-				word0(rv) = L | Bndry_mask1;
-				word1(rv) = 0xffffffff;
-#ifdef IBM
-				goto cont;
-#else
-				break;
-#endif
-				}
-#ifndef ROUND_BIASED
-			if (!(word1(rv) & LSB))
-				break;
-#endif
-			if (dsign)
-				dval(rv) += ulp(dval(rv));
-#ifndef ROUND_BIASED
-			else {
-				dval(rv) -= ulp(dval(rv));
-#ifndef Sudden_Underflow
-				if (!dval(rv))
-					goto undfl;
-#endif
-				}
-#ifdef Avoid_Underflow
-			dsign = 1 - dsign;
-#endif
-#endif
-			break;
-			}
-		if ((aadj = ratio(delta, bs)) <= 2.) {
-			if (dsign)
-				aadj = aadj1 = 1.;
-			else if (word1(rv) || word0(rv) & Bndry_mask) {
-#ifndef Sudden_Underflow
-				if (word1(rv) == Tiny1 && !word0(rv))
-					goto undfl;
-#endif
-				aadj = 1.;
-				aadj1 = -1.;
-				}
-			else {
-				/* special case -- power of FLT_RADIX to be */
-				/* rounded down... */
-
-				if (aadj < 2./FLT_RADIX)
-					aadj = 1./FLT_RADIX;
-				else
-					aadj *= 0.5;
-				aadj1 = -aadj;
-				}
-			}
-		else {
-			aadj *= 0.5;
-			aadj1 = dsign ? aadj : -aadj;
-#ifdef Check_FLT_ROUNDS
-			switch(Rounding) {
-				case 2: /* towards +infinity */
-					aadj1 -= 0.5;
-					break;
-				case 0: /* towards 0 */
-				case 3: /* towards -infinity */
-					aadj1 += 0.5;
-				}
-#else
-			if (Flt_Rounds == 0)
-				aadj1 += 0.5;
-#endif /*Check_FLT_ROUNDS*/
-			}
-		y = word0(rv) & Exp_mask;
-
-		/* Check for overflow */
-
-		if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-			dval(rv0) = dval(rv);
-			word0(rv) -= P*Exp_msk1;
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-			if ((word0(rv) & Exp_mask) >=
-					Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
-				if (word0(rv0) == Big0 && word1(rv0) == Big1)
-					goto ovfl;
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-				goto cont;
-				}
-			else
-				word0(rv) += P*Exp_msk1;
-			}
-		else {
-#ifdef Avoid_Underflow
-			if (scale && y <= 2*P*Exp_msk1) {
-				if (aadj <= 0x7fffffff) {
-					if ((z = aadj) <= 0)
-						z = 1;
-					aadj = z;
-					aadj1 = dsign ? aadj : -aadj;
-					}
-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
-				}
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-#else
-#ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-				dval(rv0) = dval(rv);
-				word0(rv) += P*Exp_msk1;
-				adj = aadj1 * ulp(dval(rv));
-				dval(rv) += adj;
-#ifdef IBM
-				if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
-#else
-				if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
-#endif
-					{
-					if (word0(rv0) == Tiny0
-					 && word1(rv0) == Tiny1)
-						goto undfl;
-					word0(rv) = Tiny0;
-					word1(rv) = Tiny1;
-					goto cont;
-					}
-				else
-					word0(rv) -= P*Exp_msk1;
-				}
-			else {
-				adj = aadj1 * ulp(dval(rv));
-				dval(rv) += adj;
-				}
-#else /*Sudden_Underflow*/
-			/* Compute adj so that the IEEE rounding rules will
-			 * correctly round rv + adj in some half-way cases.
-			 * If rv * ulp(rv) is denormalized (i.e.,
-			 * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
-			 * trouble from bits lost to denormalization;
-			 * example: 1.2e-307 .
-			 */
-			if (y <= (P-1)*Exp_msk1 && aadj > 1.) {
-				aadj1 = (double)(int)(aadj + 0.5);
-				if (!dsign)
-					aadj1 = -aadj1;
-				}
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			}
-		z = word0(rv) & Exp_mask;
-#ifndef SET_INEXACT
-#ifdef Avoid_Underflow
-		if (!scale)
-#endif
-		if (y == z) {
-			/* Can we stop now? */
-			L = (Long)aadj;
-			aadj -= L;
-			/* The tolerances below are conservative. */
-			if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
-				if (aadj < .4999999 || aadj > .5000001)
-					break;
-				}
-			else if (aadj < .4999999/FLT_RADIX)
-				break;
-			}
-#endif
- cont:
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(rv0) = Exp_1 + (70 << Exp_shift);
-			word1(rv0) = 0;
-			dval(rv0) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-#ifdef Avoid_Underflow
-	if (scale) {
-		word0(rv0) = Exp_1 - 2*P*Exp_msk1;
-		word1(rv0) = 0;
-		dval(rv) *= dval(rv0);
-#ifndef NO_ERRNO
-		/* try to avoid the bug of testing an 8087 register value */
-		if (word0(rv) == 0 && word1(rv) == 0)
-			PR_SetError(PR_RANGE_ERROR, 0);
-#endif
-		}
-#endif /* Avoid_Underflow */
-#ifdef SET_INEXACT
-	if (inexact && !(word0(rv) & Exp_mask)) {
-		/* set underflow bit */
-		dval(rv0) = 1e-300;
-		dval(rv0) *= dval(rv0);
-		}
-#endif
- retfree:
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
- ret:
-	if (se)
-		*se = (char *)s;
-	return sign ? -dval(rv) : dval(rv);
-	}
-
- static int
-quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
-	(Bigint *b, Bigint *S)
-#endif
-{
-	int n;
-	ULong *bx, *bxe, q, *sx, *sxe;
-#ifdef ULLong
-	ULLong borrow, carry, y, ys;
-#else
-	ULong borrow, carry, y, ys;
-#ifdef Pack_32
-	ULong si, z, zs;
-#endif
-#endif
-
-	n = S->wds;
-#ifdef DEBUG
-	/*debug*/ if (b->wds > n)
-	/*debug*/	Bug("oversize b in quorem");
-#endif
-	if (b->wds < n)
-		return 0;
-	sx = S->x;
-	sxe = sx + --n;
-	bx = b->x;
-	bxe = bx + n;
-	q = *bxe / (*sxe + 1);	/* ensure q <= true quotient */
-#ifdef DEBUG
-	/*debug*/ if (q > 9)
-	/*debug*/	Bug("oversized quotient in quorem");
-#endif
-	if (q) {
-		borrow = 0;
-		carry = 0;
-		do {
-#ifdef ULLong
-			ys = *sx++ * (ULLong)q + carry;
-			carry = ys >> 32;
-			y = *bx - (ys & FFFFFFFF) - borrow;
-			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) * q + carry;
-			zs = (si >> 16) * q + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ * q + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		if (!*bxe) {
-			bx = b->x;
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	if (cmp(b, S) >= 0) {
-		q++;
-		borrow = 0;
-		carry = 0;
-		bx = b->x;
-		sx = S->x;
-		do {
-#ifdef ULLong
-			ys = *sx++ + carry;
-			carry = ys >> 32;
-			y = *bx - (ys & FFFFFFFF) - borrow;
-			borrow = y >> 32 & (ULong)1;
-			*bx++ = y & FFFFFFFF;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) + carry;
-			zs = (si >> 16) + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		bx = b->x;
-		bxe = bx + n;
-		if (!*bxe) {
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	return q;
-	}
-
-#ifndef MULTIPLE_THREADS
- static char *dtoa_result;
-#endif
-
- static char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
-rv_alloc(int i)
-#endif
-{
-	int j, k, *r;
-
-	j = sizeof(ULong);
-	for(k = 0;
-		sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
-		j <<= 1)
-			k++;
-	r = (int*)Balloc(k);
-	*r = k;
-	return
-#ifndef MULTIPLE_THREADS
-	dtoa_result =
-#endif
-		(char *)(r+1);
-	}
-
- static char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
-nrv_alloc(char *s, char **rve, int n)
-#endif
-{
-	char *rv, *t;
-
-	t = rv = rv_alloc(n);
-	while(*t = *s++) t++;
-	if (rve)
-		*rve = t;
-	return rv;
-	}
-
-/* freedtoa(s) must be used to free values s returned by dtoa
- * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
- * but for consistency with earlier versions of dtoa, it is optional
- * when MULTIPLE_THREADS is not defined.
- */
-
- void
-#ifdef KR_headers
-freedtoa(s) char *s;
-#else
-freedtoa(char *s)
-#endif
-{
-	Bigint *b = (Bigint *)((int *)s - 1);
-	b->maxwds = 1 << (b->k = *(int*)b);
-	Bfree(b);
-#ifndef MULTIPLE_THREADS
-	if (s == dtoa_result)
-		dtoa_result = 0;
-#endif
-	}
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 112-126].
- *
- * Modifications:
- *	1. Rather than iterating, we use a simple numeric overestimate
- *	   to determine k = floor(log10(d)).  We scale relevant
- *	   quantities using O(log2(k)) rather than O(k) multiplications.
- *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *	   try to generate digits strictly left to right.  Instead, we
- *	   compute with fewer bits and propagate the carry if necessary
- *	   when rounding the final digit up.  This is often faster.
- *	3. Under the assumption that input will be rounded nearest,
- *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *	   That is, we allow equality in stopping tests when the
- *	   round-nearest rule will give the same floating-point value
- *	   as would satisfaction of the stopping test with strict
- *	   inequality.
- *	4. We remove common factors of powers of 2 from relevant
- *	   quantities.
- *	5. When converting floating-point integers less than 1e16,
- *	   we use floating-point arithmetic rather than resorting
- *	   to multiple-precision integers.
- *	6. When asked to produce fewer than 15 digits, we first try
- *	   to get by with floating-point arithmetic; we resort to
- *	   multiple-precision integer arithmetic only if we cannot
- *	   guarantee that the floating-point calculation has given
- *	   the correctly rounded result.  For k requested digits and
- *	   "uniformly" distributed input, the probability is
- *	   something like 10^(k-15) that we must resort to the Long
- *	   calculation.
- */
-
- static char *
-dtoa
-#ifdef KR_headers
-	(d, mode, ndigits, decpt, sign, rve)
-	double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
-{
- /*	Arguments ndigits, decpt, sign are similar to those
-	of ecvt and fcvt; trailing zeros are suppressed from
-	the returned string.  If not null, *rve is set to point
-	to the end of the return value.  If d is +-Infinity or NaN,
-	then *decpt is set to 9999.
-
-	mode:
-		0 ==> shortest string that yields d when read in
-			and rounded to nearest.
-		1 ==> like 0, but with Steele & White stopping rule;
-			e.g. with IEEE P754 arithmetic , mode 0 gives
-			1e23 whereas mode 1 gives 9.999999999999999e22.
-		2 ==> max(1,ndigits) significant digits.  This gives a
-			return value similar to that of ecvt, except
-			that trailing zeros are suppressed.
-		3 ==> through ndigits past the decimal point.  This
-			gives a return value similar to that from fcvt,
-			except that trailing zeros are suppressed, and
-			ndigits can be negative.
-		4,5 ==> similar to 2 and 3, respectively, but (in
-			round-nearest mode) with the tests of mode 0 to
-			possibly return a shorter string that rounds to d.
-			With IEEE arithmetic and compilation with
-			-DHonor_FLT_ROUNDS, modes 4 and 5 behave the same
-			as modes 2 and 3 when FLT_ROUNDS != 1.
-		6-9 ==> Debugging modes similar to mode - 4:  don't try
-			fast floating-point estimate (if applicable).
-
-		Values of mode other than 0-9 are treated as mode 0.
-
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
-	*/
-
-	int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
-		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-		spec_case, try_quick;
-	Long L;
-#ifndef Sudden_Underflow
-	int denorm;
-	ULong x;
-#endif
-	Bigint *b, *b1, *delta, *mlo, *mhi, *S;
-	double d2, ds, eps;
-	char *s, *s0;
-#ifdef Honor_FLT_ROUNDS
-	int rounding;
-#endif
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-
-	if (word0(d) & Sign_bit) {
-		/* set sign for everything, including 0's and NaNs */
-		*sign = 1;
-		word0(d) &= ~Sign_bit;	/* clear sign bit */
-		}
-	else
-		*sign = 0;
-
-#if defined(IEEE_Arith) + defined(VAX)
-#ifdef IEEE_Arith
-	if ((word0(d) & Exp_mask) == Exp_mask)
-#else
-	if (word0(d)  == 0x8000)
-#endif
-		{
-		/* Infinity or NaN */
-		*decpt = 9999;
-#ifdef IEEE_Arith
-		if (!word1(d) && !(word0(d) & 0xfffff))
-			return nrv_alloc("Infinity", rve, 8);
-#endif
-		return nrv_alloc("NaN", rve, 3);
-		}
-#endif
-#ifdef IBM
-	dval(d) += 0; /* normalize */
-#endif
-	if (!dval(d)) {
-		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
-		}
-
-#ifdef SET_INEXACT
-	try_quick = oldinexact = get_inexact();
-	inexact = 1;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if ((rounding = Flt_Rounds) >= 2) {
-		if (*sign)
-			rounding = rounding == 2 ? 0 : 2;
-		else
-			if (rounding != 2)
-				rounding = 0;
-		}
-#endif
-
-	b = d2b(dval(d), &be, &bbits);
-#ifdef Sudden_Underflow
-	i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
-#else
-	if (i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) {
-#endif
-		dval(d2) = dval(d);
-		word0(d2) &= Frac_mask1;
-		word0(d2) |= Exp_11;
-#ifdef IBM
-		if (j = 11 - hi0bits(word0(d2) & Frac_mask))
-			dval(d2) /= 1 << j;
-#endif
-
-		/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
-		 * log10(x)	 =  log(x) / log(10)
-		 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-		 * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
-		 *
-		 * This suggests computing an approximation k to log10(d) by
-		 *
-		 * k = (i - Bias)*0.301029995663981
-		 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-		 *
-		 * We want k to be too large rather than too small.
-		 * The error in the first-order Taylor series approximation
-		 * is in our favor, so we just round up the constant enough
-		 * to compensate for any error in the multiplication of
-		 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-		 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-		 * adding 1e-13 to the constant term more than suffices.
-		 * Hence we adjust the constant term to 0.1760912590558.
-		 * (We could get a more accurate k by invoking log10,
-		 *  but this is probably not worthwhile.)
-		 */
-
-		i -= Bias;
-#ifdef IBM
-		i <<= 2;
-		i += j;
-#endif
-#ifndef Sudden_Underflow
-		denorm = 0;
-		}
-	else {
-		/* d is denormalized */
-
-		i = bbits + be + (Bias + (P-1) - 1);
-		x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
-			    : word1(d) << 32 - i;
-		dval(d2) = x;
-		word0(d2) -= 31*Exp_msk1; /* adjust exponent */
-		i -= (Bias + (P-1) - 1) + 1;
-		denorm = 1;
-		}
-#endif
-	ds = (dval(d2)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-	k = (int)ds;
-	if (ds < 0. && ds != k)
-		k--;	/* want k = floor(ds) */
-	k_check = 1;
-	if (k >= 0 && k <= Ten_pmax) {
-		if (dval(d) < tens[k])
-			k--;
-		k_check = 0;
-		}
-	j = bbits - i - 1;
-	if (j >= 0) {
-		b2 = 0;
-		s2 = j;
-		}
-	else {
-		b2 = -j;
-		s2 = 0;
-		}
-	if (k >= 0) {
-		b5 = 0;
-		s5 = k;
-		s2 += k;
-		}
-	else {
-		b2 -= k;
-		b5 = -k;
-		s5 = 0;
-		}
-	if (mode < 0 || mode > 9)
-		mode = 0;
-
-#ifndef SET_INEXACT
-#ifdef Check_FLT_ROUNDS
-	try_quick = Rounding == 1;
-#else
-	try_quick = 1;
-#endif
-#endif /*SET_INEXACT*/
-
-	if (mode > 5) {
-		mode -= 4;
-		try_quick = 0;
-		}
-	leftright = 1;
-	switch(mode) {
-		case 0:
-		case 1:
-			ilim = ilim1 = -1;
-			i = 18;
-			ndigits = 0;
-			break;
-		case 2:
-			leftright = 0;
-			/* no break */
-		case 4:
-			if (ndigits <= 0)
-				ndigits = 1;
-			ilim = ilim1 = i = ndigits;
-			break;
-		case 3:
-			leftright = 0;
-			/* no break */
-		case 5:
-			i = ndigits + k + 1;
-			ilim = i;
-			ilim1 = i - 1;
-			if (i <= 0)
-				i = 1;
-		}
-	s = s0 = rv_alloc(i);
-
-#ifdef Honor_FLT_ROUNDS
-	if (mode > 1 && rounding != 1)
-		leftright = 0;
-#endif
-
-	if (ilim >= 0 && ilim <= Quick_max && try_quick) {
-
-		/* Try to get by with floating-point arithmetic. */
-
-		i = 0;
-		dval(d2) = dval(d);
-		k0 = k;
-		ilim0 = ilim;
-		ieps = 2; /* conservative */
-		if (k > 0) {
-			ds = tens[k&0xf];
-			j = k >> 4;
-			if (j & Bletch) {
-				/* prevent overflows */
-				j &= Bletch - 1;
-				dval(d) /= bigtens[n_bigtens-1];
-				ieps++;
-				}
-			for(; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					ds *= bigtens[i];
-					}
-			dval(d) /= ds;
-			}
-		else if (j1 = -k) {
-			dval(d) *= tens[j1 & 0xf];
-			for(j = j1 >> 4; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					dval(d) *= bigtens[i];
-					}
-			}
-		if (k_check && dval(d) < 1. && ilim > 0) {
-			if (ilim1 <= 0)
-				goto fast_failed;
-			ilim = ilim1;
-			k--;
-			dval(d) *= 10.;
-			ieps++;
-			}
-		dval(eps) = ieps*dval(d) + 7.;
-		word0(eps) -= (P-1)*Exp_msk1;
-		if (ilim == 0) {
-			S = mhi = 0;
-			dval(d) -= 5.;
-			if (dval(d) > dval(eps))
-				goto one_digit;
-			if (dval(d) < -dval(eps))
-				goto no_digits;
-			goto fast_failed;
-			}
-#ifndef No_leftright
-		if (leftright) {
-			/* Use Steele & White method of only
-			 * generating digits needed.
-			 */
-			dval(eps) = 0.5/tens[ilim-1] - dval(eps);
-			for(i = 0;;) {
-				L = dval(d);
-				dval(d) -= L;
-				*s++ = '0' + (int)L;
-				if (dval(d) < dval(eps))
-					goto ret1;
-				if (1. - dval(d) < dval(eps))
-					goto bump_up;
-				if (++i >= ilim)
-					break;
-				dval(eps) *= 10.;
-				dval(d) *= 10.;
-				}
-			}
-		else {
-#endif
-			/* Generate ilim digits, then fix them up. */
-			dval(eps) *= tens[ilim-1];
-			for(i = 1;; i++, dval(d) *= 10.) {
-				L = (Long)(dval(d));
-				if (!(dval(d) -= L))
-					ilim = i;
-				*s++ = '0' + (int)L;
-				if (i == ilim) {
-					if (dval(d) > 0.5 + dval(eps))
-						goto bump_up;
-					else if (dval(d) < 0.5 - dval(eps)) {
-						while(*--s == '0');
-						s++;
-						goto ret1;
-						}
-					break;
-					}
-				}
-#ifndef No_leftright
-			}
-#endif
- fast_failed:
-		s = s0;
-		dval(d) = dval(d2);
-		k = k0;
-		ilim = ilim0;
-		}
-
-	/* Do we have a "small" integer? */
-
-	if (be >= 0 && k <= Int_max) {
-		/* Yes. */
-		ds = tens[k];
-		if (ndigits < 0 && ilim <= 0) {
-			S = mhi = 0;
-			if (ilim < 0 || dval(d) <= 5*ds)
-				goto no_digits;
-			goto one_digit;
-			}
-		for(i = 1;; i++, dval(d) *= 10.) {
-			L = (Long)(dval(d) / ds);
-			dval(d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
-			if (dval(d) < 0) {
-				L--;
-				dval(d) += ds;
-				}
-#endif
-			*s++ = '0' + (int)L;
-			if (!dval(d)) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			if (i == ilim) {
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				switch(rounding) {
-				  case 0: goto ret1;
-				  case 2: goto bump_up;
-				  }
-#endif
-				dval(d) += dval(d);
-				if (dval(d) > ds || dval(d) == ds && L & 1) {
- bump_up:
-					while(*--s == '9')
-						if (s == s0) {
-							k++;
-							*s = '0';
-							break;
-							}
-					++*s++;
-					}
-				break;
-				}
-			}
-		goto ret1;
-		}
-
-	m2 = b2;
-	m5 = b5;
-	mhi = mlo = 0;
-	if (leftright) {
-		i =
-#ifndef Sudden_Underflow
-			denorm ? be + (Bias + (P-1) - 1 + 1) :
-#endif
-#ifdef IBM
-			1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
-#else
-			1 + P - bbits;
-#endif
-		b2 += i;
-		s2 += i;
-		mhi = i2b(1);
-		}
-	if (m2 > 0 && s2 > 0) {
-		i = m2 < s2 ? m2 : s2;
-		b2 -= i;
-		m2 -= i;
-		s2 -= i;
-		}
-	if (b5 > 0) {
-		if (leftright) {
-			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				b1 = mult(mhi, b);
-				Bfree(b);
-				b = b1;
-				}
-			if (j = b5 - m5)
-				b = pow5mult(b, j);
-			}
-		else
-			b = pow5mult(b, b5);
-		}
-	S = i2b(1);
-	if (s5 > 0)
-		S = pow5mult(S, s5);
-
-	/* Check for special case that d is a normalized power of 2. */
-
-	spec_case = 0;
-	if ((mode < 2 || leftright)
-#ifdef Honor_FLT_ROUNDS
-			&& rounding == 1
-#endif
-				) {
-		if (!word1(d) && !(word0(d) & Bndry_mask)
-#ifndef Sudden_Underflow
-		 && word0(d) & (Exp_mask & ~Exp_msk1)
-#endif
-				) {
-			/* The special case */
-			b2 += Log2P;
-			s2 += Log2P;
-			spec_case = 1;
-			}
-		}
-
-	/* Arrange for convenient computation of quotients:
-	 * shift left if necessary so divisor has 4 leading 0 bits.
-	 *
-	 * Perhaps we should just compute leading 28 bits of S once
-	 * and for all and pass them and a shift to quorem, so it
-	 * can do shifts and ors to compute the numerator for q.
-	 */
-#ifdef Pack_32
-	if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f)
-		i = 32 - i;
-#else
-	if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf)
-		i = 16 - i;
-#endif
-	if (i > 4) {
-		i -= 4;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	else if (i < 4) {
-		i += 28;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	if (b2 > 0)
-		b = lshift(b, b2);
-	if (s2 > 0)
-		S = lshift(S, s2);
-	if (k_check) {
-		if (cmp(b,S) < 0) {
-			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
-			if (leftright)
-				mhi = multadd(mhi, 10, 0);
-			ilim = ilim1;
-			}
-		}
-	if (ilim <= 0 && (mode == 3 || mode == 5)) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-			/* no digits, fcvt style */
- no_digits:
-			k = -1 - ndigits;
-			goto ret;
-			}
- one_digit:
-		*s++ = '1';
-		k++;
-		goto ret;
-		}
-	if (leftright) {
-		if (m2 > 0)
-			mhi = lshift(mhi, m2);
-
-		/* Compute mlo -- check for special case
-		 * that d is a normalized power of 2.
-		 */
-
-		mlo = mhi;
-		if (spec_case) {
-			mhi = Balloc(mhi->k);
-			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, Log2P);
-			}
-
-		for(i = 1;;i++) {
-			dig = quorem(b,S) + '0';
-			/* Do we yet have the shortest decimal string
-			 * that will round to d?
-			 */
-			j = cmp(b, mlo);
-			delta = diff(S, mhi);
-			j1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
-#ifndef ROUND_BIASED
-			if (j1 == 0 && mode != 1 && !(word1(d) & 1)
-#ifdef Honor_FLT_ROUNDS
-				&& rounding >= 1
-#endif
-								   ) {
-				if (dig == '9')
-					goto round_9_up;
-				if (j > 0)
-					dig++;
-#ifdef SET_INEXACT
-				else if (!b->x[0] && b->wds <= 1)
-					inexact = 0;
-#endif
-				*s++ = dig;
-				goto ret;
-				}
-#endif
-			if (j < 0 || j == 0 && mode != 1
-#ifndef ROUND_BIASED
-							&& !(word1(d) & 1)
-#endif
-					) {
-				if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					goto accept_dig;
-					}
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				 switch(rounding) {
-				  case 0: goto accept_dig;
-				  case 2: goto keep_dig;
-				  }
-#endif /*Honor_FLT_ROUNDS*/
-				if (j1 > 0) {
-					b = lshift(b, 1);
-					j1 = cmp(b, S);
-					if ((j1 > 0 || j1 == 0 && dig & 1)
-					&& dig++ == '9')
-						goto round_9_up;
-					}
- accept_dig:
-				*s++ = dig;
-				goto ret;
-				}
-			if (j1 > 0) {
-#ifdef Honor_FLT_ROUNDS
-				if (!rounding)
-					goto accept_dig;
-#endif
-				if (dig == '9') { /* possible if i == 1 */
- round_9_up:
-					*s++ = '9';
-					goto roundoff;
-					}
-				*s++ = dig + 1;
-				goto ret;
-				}
-#ifdef Honor_FLT_ROUNDS
- keep_dig:
-#endif
-			*s++ = dig;
-			if (i == ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (mlo == mhi)
-				mlo = mhi = multadd(mhi, 10, 0);
-			else {
-				mlo = multadd(mlo, 10, 0);
-				mhi = multadd(mhi, 10, 0);
-				}
-			}
-		}
-	else
-		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
-			if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				goto ret;
-				}
-			if (i >= ilim)
-				break;
-			b = multadd(b, 10, 0);
-			}
-
-	/* Round off last digit */
-
-#ifdef Honor_FLT_ROUNDS
-	switch(rounding) {
-	  case 0: goto trimzeros;
-	  case 2: goto roundoff;
-	  }
-#endif
-	b = lshift(b, 1);
-	j = cmp(b, S);
-	if (j > 0 || j == 0 && dig & 1) {
- roundoff:
-		while(*--s == '9')
-			if (s == s0) {
-				k++;
-				*s++ = '1';
-				goto ret;
-				}
-		++*s++;
-		}
-	else {
- trimzeros:
-		while(*--s == '0');
-		s++;
-		}
- ret:
-	Bfree(S);
-	if (mhi) {
-		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
-		}
- ret1:
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(d) = Exp_1 + (70 << Exp_shift);
-			word1(d) = 0;
-			dval(d) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-	Bfree(b);
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	return s0;
-	}
-#ifdef __cplusplus
-}
-#endif
-
-PR_IMPLEMENT(PRStatus)
-PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
-	PRIntn *decpt, PRIntn *sign, char **rve, char *buf, PRSize bufsize)
-{
-    char *result;
-    PRSize resultlen;
-    PRStatus rv = PR_FAILURE;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (mode < 0 || mode > 3) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return rv;
-    }
-    result = dtoa(d, mode, ndigits, decpt, sign, rve);
-    if (!result) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return rv;
-    }
-    resultlen = strlen(result)+1;
-    if (bufsize < resultlen) {
-        PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0);
-    } else {
-        memcpy(buf, result, resultlen);
-        if (rve) {
-            *rve = buf + (*rve - result);
-        }
-        rv = PR_SUCCESS;
-    }
-    freedtoa(result);
-    return rv;  
-}
-
-/*
-** conversion routines for floating point
-** prcsn - number of digits of precision to generate floating
-** point value.
-** This should be reparameterized so that you can send in a
-**   prcn for the positive and negative ranges.  For now, 
-**   conform to the ECMA JavaScript spec which says numbers
-**   less than 1e-6 are in scientific notation.
-** Also, the ECMA spec says that there should always be a
-**   '+' or '-' after the 'e' in scientific notation
-*/
-PR_IMPLEMENT(void)
-PR_cnvtf(char *buf,int bufsz, int prcsn,double fval)
-{
-    PRIntn decpt, sign, numdigits;
-    char *num, *nump;
-    char *bufp = buf;
-    char *endnum;
-
-    /* If anything fails, we store an empty string in 'buf' */
-    num = (char*)PR_MALLOC(bufsz);
-    if (num == NULL) {
-        buf[0] = '\0';
-        return;
-    }
-    /* XXX Why use mode 1? */
-    if (PR_dtoa(dval(fval),1,prcsn,&decpt,&sign,&endnum,num,bufsz)
-            == PR_FAILURE) {
-        buf[0] = '\0';
-        goto done;
-    }
-    numdigits = endnum - num;
-    nump = num;
-
-    if (sign &&
-        !(word0(fval) == Sign_bit && word1(fval) == 0) &&
-        !((word0(fval) & Exp_mask) == Exp_mask &&
-          (word1(fval) || (word0(fval) & 0xfffff)))) {
-        *bufp++ = '-';
-    }
-
-    if (decpt == 9999) {
-        while ((*bufp++ = *nump++) != 0) {} /* nothing to execute */
-        goto done;
-    }
-
-    if (decpt > (prcsn+1) || decpt < -(prcsn-1) || decpt < -5) {
-        *bufp++ = *nump++;
-        if (numdigits != 1) {
-            *bufp++ = '.';
-        }
-
-        while (*nump != '\0') {
-            *bufp++ = *nump++;
-        }
-        *bufp++ = 'e';
-        PR_snprintf(bufp, bufsz - (bufp - buf), "%+d", decpt-1);
-    } else if (decpt >= 0) {
-        if (decpt == 0) {
-            *bufp++ = '0';
-        } else {
-            while (decpt--) {
-                if (*nump != '\0') {
-                    *bufp++ = *nump++;
-                } else {
-                    *bufp++ = '0';
-                }
-            }
-        }
-        if (*nump != '\0') {
-            *bufp++ = '.';
-            while (*nump != '\0') {
-                *bufp++ = *nump++;
-            }
-        }
-        *bufp++ = '\0';
-    } else if (decpt < 0) {
-        *bufp++ = '0';
-        *bufp++ = '.';
-        while (decpt++) {
-            *bufp++ = '0';
-        }
-
-        while (*nump != '\0') {
-            *bufp++ = *nump++;
-        }
-        *bufp++ = '\0';
-    }
-done:
-    PR_DELETE(num);
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prenv.c b/libs/js/nsprpub/pr/src/misc/prenv.c
deleted file mode 100644
index 5f16ce1890..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prenv.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <string.h>
-#include "primpl.h"
-
-/* Lock used to lock the environment */
-#if defined(_PR_NO_PREEMPT)
-#define _PR_NEW_LOCK_ENV()
-#define _PR_DELETE_LOCK_ENV()
-#define _PR_LOCK_ENV()
-#define _PR_UNLOCK_ENV()
-#elif defined(_PR_LOCAL_THREADS_ONLY)
-extern _PRCPU * _pr_primordialCPU;
-static PRIntn _is;
-#define _PR_NEW_LOCK_ENV()
-#define _PR_DELETE_LOCK_ENV()
-#define _PR_LOCK_ENV() if (_pr_primordialCPU) _PR_INTSOFF(_is);
-#define _PR_UNLOCK_ENV() if (_pr_primordialCPU) _PR_INTSON(_is);
-#else
-static PRLock *_pr_envLock = NULL;
-#define _PR_NEW_LOCK_ENV() {_pr_envLock = PR_NewLock();}
-#define _PR_DELETE_LOCK_ENV() \
-    { if (_pr_envLock) { PR_DestroyLock(_pr_envLock); _pr_envLock = NULL; } }
-#define _PR_LOCK_ENV() { if (_pr_envLock) PR_Lock(_pr_envLock); }
-#define _PR_UNLOCK_ENV() { if (_pr_envLock) PR_Unlock(_pr_envLock); }
-#endif
-
-/************************************************************************/
-
-void _PR_InitEnv(void)
-{
-	_PR_NEW_LOCK_ENV();
-}
-
-void _PR_CleanupEnv(void)
-{
-    _PR_DELETE_LOCK_ENV();
-}
-
-PR_IMPLEMENT(char*) PR_GetEnv(const char *var)
-{
-    char *ev;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    _PR_LOCK_ENV();
-    ev = _PR_MD_GET_ENV(var);
-    _PR_UNLOCK_ENV();
-    return ev;
-}
-
-PR_IMPLEMENT(PRStatus) PR_SetEnv(const char *string)
-{
-    PRIntn result;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if ( !strchr(string, '=')) return(PR_FAILURE);
-
-    _PR_LOCK_ENV();
-    result = _PR_MD_PUT_ENV(string);
-    _PR_UNLOCK_ENV();
-    return (result)? PR_FAILURE : PR_SUCCESS;
-}
-
-/*
-** DEPRECATED.  Use PR_SetEnv() instead.
-*/
-#ifdef XP_MAC
-PR_IMPLEMENT(PRIntn) PR_PutEnv(const char *string)
-{
-    return (PR_SetEnv(string) == PR_SUCCESS) ? PR_TRUE : PR_FALSE;
-}
-#endif
diff --git a/libs/js/nsprpub/pr/src/misc/prerr.c b/libs/js/nsprpub/pr/src/misc/prerr.c
deleted file mode 100644
index 81baadf3ab..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prerr.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *
- * prerr.c
- * This file is automatically generated; please do not edit it.
- */
-#include "prerror.h"
-static const struct PRErrorMessage text[] = {
-	{"PR_OUT_OF_MEMORY_ERROR",    "Memory allocation attempt failed"},
-	{"PR_BAD_DESCRIPTOR_ERROR",    "Invalid file descriptor"},
-	{"PR_WOULD_BLOCK_ERROR",    "The operation would have blocked"},
-	{"PR_ACCESS_FAULT_ERROR",    "Invalid memory address argument"},
-	{"PR_INVALID_METHOD_ERROR",    "Invalid function for file type"},
-	{"PR_ILLEGAL_ACCESS_ERROR",    "Invalid memory address argument"},
-	{"PR_UNKNOWN_ERROR",    "Some unknown error has occurred"},
-	{"PR_PENDING_INTERRUPT_ERROR",    "Operation interrupted by another thread"},
-	{"PR_NOT_IMPLEMENTED_ERROR",    "function not implemented"},
-	{"PR_IO_ERROR",    "I/O function error"},
-	{"PR_IO_TIMEOUT_ERROR",    "I/O operation timed out"},
-	{"PR_IO_PENDING_ERROR",    "I/O operation on busy file descriptor"},
-	{"PR_DIRECTORY_OPEN_ERROR",    "The directory could not be opened"},
-	{"PR_INVALID_ARGUMENT_ERROR",    "Invalid function argument"},
-	{"PR_ADDRESS_NOT_AVAILABLE_ERROR",    "Network address not available (in use?)"},
-	{"PR_ADDRESS_NOT_SUPPORTED_ERROR",    "Network address type not supported"},
-	{"PR_IS_CONNECTED_ERROR",    "Already connected"},
-	{"PR_BAD_ADDRESS_ERROR",    "Network address is invalid"},
-	{"PR_ADDRESS_IN_USE_ERROR",    "Local Network address is in use"},
-	{"PR_CONNECT_REFUSED_ERROR",    "Connection refused by peer"},
-	{"PR_NETWORK_UNREACHABLE_ERROR",    "Network address is presently unreachable"},
-	{"PR_CONNECT_TIMEOUT_ERROR",    "Connection attempt timed out"},
-	{"PR_NOT_CONNECTED_ERROR",    "Network file descriptor is not connected"},
-	{"PR_LOAD_LIBRARY_ERROR",    "Failure to load dynamic library"},
-	{"PR_UNLOAD_LIBRARY_ERROR",    "Failure to unload dynamic library"},
-	{"PR_FIND_SYMBOL_ERROR",    "Symbol not found in any of the loaded dynamic libraries"},
-	{"PR_INSUFFICIENT_RESOURCES_ERROR",    "Insufficient system resources"},
-	{"PR_DIRECTORY_LOOKUP_ERROR",    "A directory lookup on a network address has failed"},
-	{"PR_TPD_RANGE_ERROR",    "Attempt to access a TPD key that is out of range"},
-	{"PR_PROC_DESC_TABLE_FULL_ERROR",    "Process open FD table is full"},
-	{"PR_SYS_DESC_TABLE_FULL_ERROR",    "System open FD table is full"},
-	{"PR_NOT_SOCKET_ERROR",    "Network operation attempted on non-network file descriptor"},
-	{"PR_NOT_TCP_SOCKET_ERROR",    "TCP-specific function attempted on a non-TCP file descriptor"},
-	{"PR_SOCKET_ADDRESS_IS_BOUND_ERROR",    "TCP file descriptor is already bound"},
-	{"PR_NO_ACCESS_RIGHTS_ERROR",    "Access Denied"},
-	{"PR_OPERATION_NOT_SUPPORTED_ERROR",    "The requested operation is not supported by the platform"},
-	{"PR_PROTOCOL_NOT_SUPPORTED_ERROR",    "The host operating system does not support the protocol requested"},
-	{"PR_REMOTE_FILE_ERROR",    "Access to the remote file has been severed"},
-	{"PR_BUFFER_OVERFLOW_ERROR",    "The value requested is too large to be stored in the data buffer provided"},
-	{"PR_CONNECT_RESET_ERROR",    "TCP connection reset by peer"},
-	{"PR_RANGE_ERROR",    "Unused"},
-	{"PR_DEADLOCK_ERROR",    "The operation would have deadlocked"},
-	{"PR_FILE_IS_LOCKED_ERROR",    "The file is already locked"},
-	{"PR_FILE_TOO_BIG_ERROR",    "Write would result in file larger than the system allows"},
-	{"PR_NO_DEVICE_SPACE_ERROR",    "The device for storing the file is full"},
-	{"PR_PIPE_ERROR",    "Unused"},
-	{"PR_NO_SEEK_DEVICE_ERROR",    "Unused"},
-	{"PR_IS_DIRECTORY_ERROR",    "Cannot perform a normal file operation on a directory"},
-	{"PR_LOOP_ERROR",    "Symbolic link loop"},
-	{"PR_NAME_TOO_LONG_ERROR",    "File name is too long"},
-	{"PR_FILE_NOT_FOUND_ERROR",    "File not found"},
-	{"PR_NOT_DIRECTORY_ERROR",    "Cannot perform directory operation on a normal file"},
-	{"PR_READ_ONLY_FILESYSTEM_ERROR",    "Cannot write to a read-only file system"},
-	{"PR_DIRECTORY_NOT_EMPTY_ERROR",    "Cannot delete a directory that is not empty"},
-	{"PR_FILESYSTEM_MOUNTED_ERROR",    "Cannot delete or rename a file object while the file system is busy"},
-	{"PR_NOT_SAME_DEVICE_ERROR",    "Cannot rename a file to a file system on another device"},
-	{"PR_DIRECTORY_CORRUPTED_ERROR",    "The directory object in the file system is corrupted"},
-	{"PR_FILE_EXISTS_ERROR",    "Cannot create or rename a filename that already exists"},
-	{"PR_MAX_DIRECTORY_ENTRIES_ERROR",    "Directory is full.  No additional filenames may be added"},
-	{"PR_INVALID_DEVICE_STATE_ERROR",    "The required device was in an invalid state"},
-	{"PR_DEVICE_IS_LOCKED_ERROR",    "The device is locked"},
-	{"PR_NO_MORE_FILES_ERROR",    "No more entries in the directory"},
-	{"PR_END_OF_FILE_ERROR",    "Encountered end of file"},
-	{"PR_FILE_SEEK_ERROR",    "Seek error"},
-	{"PR_FILE_IS_BUSY_ERROR",    "The file is busy"},
-	{"PR_OPERATION_ABORTED_ERROR",    "The I/O operation was aborted"},
-	{"PR_IN_PROGRESS_ERROR",    "Operation is still in progress (probably a non-blocking connect)"},
-	{"PR_ALREADY_INITIATED_ERROR",    "Operation has already been initiated (probably a non-blocking connect)"},
-	{"PR_GROUP_EMPTY_ERROR",    "The wait group is empty"},
-	{"PR_INVALID_STATE_ERROR",    "Object state improper for request"},
-	{"PR_NETWORK_DOWN_ERROR",    "Network is down"},
-	{"PR_SOCKET_SHUTDOWN_ERROR",    "Socket shutdown"},
-	{"PR_CONNECT_ABORTED_ERROR",    "Connection aborted"},
-	{"PR_HOST_UNREACHABLE_ERROR",    "Host is unreachable"},
-	{"PR_LIBRARY_NOT_LOADED_ERROR",    "The library is not loaded"},
-	{"PR_MAX_ERROR",    "Placeholder for the end of the list"},
-	{0, 0}
-};
-
-static const struct PRErrorTable et = { text, "prerr", -6000L, 76 };
-
-void nspr_InitializePRErrorTable(void) {
-    PR_ErrorInstallTable(&et);
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prerr.et b/libs/js/nsprpub/pr/src/misc/prerr.et
deleted file mode 100644
index 8c0dde2964..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prerr.et
+++ /dev/null
@@ -1,139 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-et nspr -6000
-
-ec PR_OUT_OF_MEMORY_ERROR,      "Memory allocation attempt failed"
-ec PR_BAD_DESCRIPTOR_ERROR,     "Invalid file descriptor"
-ec PR_WOULD_BLOCK_ERROR,        "The operation would have blocked"
-ec PR_ACCESS_FAULT_ERROR,       "Invalid memory address argument"
-ec PR_INVALID_METHOD_ERROR,     "Invalid function for file type"
-ec PR_ILLEGAL_ACCESS_ERROR,     "Invalid memory address argument"
-ec PR_UNKNOWN_ERROR,            "Some unknown error has occurred"
-ec PR_PENDING_INTERRUPT_ERROR,"Operation interrupted by another thread"
-ec PR_NOT_IMPLEMENTED_ERROR,    "function not implemented"
-ec PR_IO_ERROR,                 "I/O function error"
-ec PR_IO_TIMEOUT_ERROR,         "I/O operation timed out"
-ec PR_IO_PENDING_ERROR,         "I/O operation on busy file descriptor"
-ec PR_DIRECTORY_OPEN_ERROR,     "The directory could not be opened"
-ec PR_INVALID_ARGUMENT_ERROR, "Invalid function argument"
-ec PR_ADDRESS_NOT_AVAILABLE_ERROR, "Network address not available (in use?)"
-ec PR_ADDRESS_NOT_SUPPORTED_ERROR, "Network address type not supported"
-ec PR_IS_CONNECTED_ERROR,       "Already connected"
-ec PR_BAD_ADDRESS_ERROR,        "Network address is invalid"
-ec PR_ADDRESS_IN_USE_ERROR,     "Local Network address is in use"
-ec PR_CONNECT_REFUSED_ERROR,    "Connection refused by peer"
-ec PR_NETWORK_UNREACHABLE_ERROR, "Network address is presently unreachable"
-ec PR_CONNECT_TIMEOUT_ERROR,    "Connection attempt timed out"
-ec PR_NOT_CONNECTED_ERROR,      "Network file descriptor is not connected"
-ec PR_LOAD_LIBRARY_ERROR,       "Failure to load dynamic library"
-ec PR_UNLOAD_LIBRARY_ERROR,     "Failure to unload dynamic library"
-ec PR_FIND_SYMBOL_ERROR,
-"Symbol not found in any of the loaded dynamic libraries"
-ec PR_INSUFFICIENT_RESOURCES_ERROR, "Insufficient system resources"
-ec PR_DIRECTORY_LOOKUP_ERROR,
-"A directory lookup on a network address has failed"
-ec PR_TPD_RANGE_ERROR,
-"Attempt to access a TPD key that is out of range"
-ec PR_PROC_DESC_TABLE_FULL_ERROR, "Process open FD table is full"
-ec PR_SYS_DESC_TABLE_FULL_ERROR, "System open FD table is full"
-ec PR_NOT_SOCKET_ERROR,
-"Network operation attempted on non-network file descriptor"
-ec PR_NOT_TCP_SOCKET_ERROR,
-"TCP-specific function attempted on a non-TCP file descriptor"
-ec PR_SOCKET_ADDRESS_IS_BOUND_ERROR, "TCP file descriptor is already bound"
-ec PR_NO_ACCESS_RIGHTS_ERROR, "Access Denied"
-ec PR_OPERATION_NOT_SUPPORTED_ERROR,
-"The requested operation is not supported by the platform"
-ec PR_PROTOCOL_NOT_SUPPORTED_ERROR,
-"The host operating system does not support the protocol requested"
-ec PR_REMOTE_FILE_ERROR,        "Access to the remote file has been severed"
-ec PR_BUFFER_OVERFLOW_ERROR,
-"The value requested is too large to be stored in the data buffer provided"
-ec PR_CONNECT_RESET_ERROR,      "TCP connection reset by peer"
-ec PR_RANGE_ERROR,              "Unused"
-ec PR_DEADLOCK_ERROR,   "The operation would have deadlocked"
-ec PR_FILE_IS_LOCKED_ERROR,     "The file is already locked"
-ec PR_FILE_TOO_BIG_ERROR,
-"Write would result in file larger than the system allows"
-ec PR_NO_DEVICE_SPACE_ERROR,    "The device for storing the file is full"
-ec PR_PIPE_ERROR,               "Unused"
-ec PR_NO_SEEK_DEVICE_ERROR,     "Unused"
-ec PR_IS_DIRECTORY_ERROR,
-"Cannot perform a normal file operation on a directory"
-ec PR_LOOP_ERROR,               "Symbolic link loop"
-ec PR_NAME_TOO_LONG_ERROR,      "File name is too long"
-ec PR_FILE_NOT_FOUND_ERROR,     "File not found"
-ec PR_NOT_DIRECTORY_ERROR,
-"Cannot perform directory operation on a normal file"
-ec PR_READ_ONLY_FILESYSTEM_ERROR,
-"Cannot write to a read-only file system"
-ec PR_DIRECTORY_NOT_EMPTY_ERROR,
-"Cannot delete a directory that is not empty"
-ec PR_FILESYSTEM_MOUNTED_ERROR,
-"Cannot delete or rename a file object while the file system is busy"
-ec PR_NOT_SAME_DEVICE_ERROR,
-"Cannot rename a file to a file system on another device"
-ec PR_DIRECTORY_CORRUPTED_ERROR,
-"The directory object in the file system is corrupted"
-ec PR_FILE_EXISTS_ERROR,
-"Cannot create or rename a filename that already exists"
-ec PR_MAX_DIRECTORY_ENTRIES_ERROR,
-"Directory is full.  No additional filenames may be added"
-ec PR_INVALID_DEVICE_STATE_ERROR,
-"The required device was in an invalid state"
-ec PR_DEVICE_IS_LOCKED_ERROR, "The device is locked"
-ec PR_NO_MORE_FILES_ERROR,      "No more entries in the directory"
-ec PR_END_OF_FILE_ERROR,        "Encountered end of file"
-ec PR_FILE_SEEK_ERROR,  "Seek error"
-ec PR_FILE_IS_BUSY_ERROR,       "The file is busy"
-ec PR_OPERATION_ABORTED_ERROR,  "The I/O operation was aborted"
-ec PR_IN_PROGRESS_ERROR,
-"Operation is still in progress (probably a non-blocking connect)"
-ec PR_ALREADY_INITIATED_ERROR,
-"Operation has already been initiated (probably a non-blocking connect)"
-ec PR_GROUP_EMPTY_ERROR,        "The wait group is empty"
-ec PR_INVALID_STATE_ERROR,      "Object state improper for request"
-ec PR_NETWORK_DOWN_ERROR,       "Network is down"
-ec PR_SOCKET_SHUTDOWN_ERROR,    "Socket shutdown"
-ec PR_CONNECT_ABORTED_ERROR,    "Connection aborted"
-ec PR_HOST_UNREACHABLE_ERROR,   "Host is unreachable"
-ec PR_LIBRARY_NOT_LOADED_ERROR, "The library is not loaded"
-
-ec PR_MAX_ERROR,                "Placeholder for the end of the list"
-
-end
diff --git a/libs/js/nsprpub/pr/src/misc/prerr.properties b/libs/js/nsprpub/pr/src/misc/prerr.properties
deleted file mode 100644
index c10f7c8bab..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prerr.properties
+++ /dev/null
@@ -1,116 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# prerr.properties
-# This file is automatically generated; please do not edit it.
-PR_OUT_OF_MEMORY_ERROR=Memory allocation attempt failed
-PR_BAD_DESCRIPTOR_ERROR=Invalid file descriptor
-PR_WOULD_BLOCK_ERROR=The operation would have blocked
-PR_ACCESS_FAULT_ERROR=Invalid memory address argument
-PR_INVALID_METHOD_ERROR=Invalid function for file type
-PR_ILLEGAL_ACCESS_ERROR=Invalid memory address argument
-PR_UNKNOWN_ERROR=Some unknown error has occurred
-PR_PENDING_INTERRUPT_ERROR=Operation interrupted by another thread
-PR_NOT_IMPLEMENTED_ERROR=function not implemented
-PR_IO_ERROR=I/O function error
-PR_IO_TIMEOUT_ERROR=I/O operation timed out
-PR_IO_PENDING_ERROR=I/O operation on busy file descriptor
-PR_DIRECTORY_OPEN_ERROR=The directory could not be opened
-PR_INVALID_ARGUMENT_ERROR=Invalid function argument
-PR_ADDRESS_NOT_AVAILABLE_ERROR=Network address not available (in use?)
-PR_ADDRESS_NOT_SUPPORTED_ERROR=Network address type not supported
-PR_IS_CONNECTED_ERROR=Already connected
-PR_BAD_ADDRESS_ERROR=Network address is invalid
-PR_ADDRESS_IN_USE_ERROR=Local Network address is in use
-PR_CONNECT_REFUSED_ERROR=Connection refused by peer
-PR_NETWORK_UNREACHABLE_ERROR=Network address is presently unreachable
-PR_CONNECT_TIMEOUT_ERROR=Connection attempt timed out
-PR_NOT_CONNECTED_ERROR=Network file descriptor is not connected
-PR_LOAD_LIBRARY_ERROR=Failure to load dynamic library
-PR_UNLOAD_LIBRARY_ERROR=Failure to unload dynamic library
-PR_FIND_SYMBOL_ERROR=Symbol not found in any of the loaded dynamic libraries
-PR_INSUFFICIENT_RESOURCES_ERROR=Insufficient system resources
-PR_DIRECTORY_LOOKUP_ERROR=A directory lookup on a network address has failed
-PR_TPD_RANGE_ERROR=Attempt to access a TPD key that is out of range
-PR_PROC_DESC_TABLE_FULL_ERROR=Process open FD table is full
-PR_SYS_DESC_TABLE_FULL_ERROR=System open FD table is full
-PR_NOT_SOCKET_ERROR=Network operation attempted on non-network file descriptor
-PR_NOT_TCP_SOCKET_ERROR=TCP-specific function attempted on a non-TCP file descriptor
-PR_SOCKET_ADDRESS_IS_BOUND_ERROR=TCP file descriptor is already bound
-PR_NO_ACCESS_RIGHTS_ERROR=Access Denied
-PR_OPERATION_NOT_SUPPORTED_ERROR=The requested operation is not supported by the platform
-PR_PROTOCOL_NOT_SUPPORTED_ERROR=The host operating system does not support the protocol requested
-PR_REMOTE_FILE_ERROR=Access to the remote file has been severed
-PR_BUFFER_OVERFLOW_ERROR=The value requested is too large to be stored in the data buffer provided
-PR_CONNECT_RESET_ERROR=TCP connection reset by peer
-PR_RANGE_ERROR=Unused
-PR_DEADLOCK_ERROR=The operation would have deadlocked
-PR_FILE_IS_LOCKED_ERROR=The file is already locked
-PR_FILE_TOO_BIG_ERROR=Write would result in file larger than the system allows
-PR_NO_DEVICE_SPACE_ERROR=The device for storing the file is full
-PR_PIPE_ERROR=Unused
-PR_NO_SEEK_DEVICE_ERROR=Unused
-PR_IS_DIRECTORY_ERROR=Cannot perform a normal file operation on a directory
-PR_LOOP_ERROR=Symbolic link loop
-PR_NAME_TOO_LONG_ERROR=File name is too long
-PR_FILE_NOT_FOUND_ERROR=File not found
-PR_NOT_DIRECTORY_ERROR=Cannot perform directory operation on a normal file
-PR_READ_ONLY_FILESYSTEM_ERROR=Cannot write to a read-only file system
-PR_DIRECTORY_NOT_EMPTY_ERROR=Cannot delete a directory that is not empty
-PR_FILESYSTEM_MOUNTED_ERROR=Cannot delete or rename a file object while the file system is busy
-PR_NOT_SAME_DEVICE_ERROR=Cannot rename a file to a file system on another device
-PR_DIRECTORY_CORRUPTED_ERROR=The directory object in the file system is corrupted
-PR_FILE_EXISTS_ERROR=Cannot create or rename a filename that already exists
-PR_MAX_DIRECTORY_ENTRIES_ERROR=Directory is full.  No additional filenames may be added
-PR_INVALID_DEVICE_STATE_ERROR=The required device was in an invalid state
-PR_DEVICE_IS_LOCKED_ERROR=The device is locked
-PR_NO_MORE_FILES_ERROR=No more entries in the directory
-PR_END_OF_FILE_ERROR=Encountered end of file
-PR_FILE_SEEK_ERROR=Seek error
-PR_FILE_IS_BUSY_ERROR=The file is busy
-PR_OPERATION_ABORTED_ERROR=The I/O operation was aborted
-PR_IN_PROGRESS_ERROR=Operation is still in progress (probably a non-blocking connect)
-PR_ALREADY_INITIATED_ERROR=Operation has already been initiated (probably a non-blocking connect)
-PR_GROUP_EMPTY_ERROR=The wait group is empty
-PR_INVALID_STATE_ERROR=Object state improper for request
-PR_NETWORK_DOWN_ERROR=Network is down
-PR_SOCKET_SHUTDOWN_ERROR=Socket shutdown
-PR_CONNECT_ABORTED_ERROR=Connection aborted
-PR_HOST_UNREACHABLE_ERROR=Host is unreachable
-PR_LIBRARY_NOT_LOADED_ERROR=The library is not loaded
-PR_MAX_ERROR=Placeholder for the end of the list
diff --git a/libs/js/nsprpub/pr/src/misc/prerror.c b/libs/js/nsprpub/pr/src/misc/prerror.c
deleted file mode 100644
index f578f2d24a..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prerror.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-PR_IMPLEMENT(PRErrorCode) PR_GetError(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->errorCode;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetOSError(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->osErrorCode;
-}
-
-PR_IMPLEMENT(void) PR_SetError(PRErrorCode code, PRInt32 osErr)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    thread->errorCode = code;
-    thread->osErrorCode = osErr;
-    thread->errorStringLength = 0;
-}
-
-PR_IMPLEMENT(void) PR_SetErrorText(PRIntn textLength, const char *text)
-{
-    PRThread *thread = PR_GetCurrentThread();
-
-    if (0 == textLength)
-    {
-	    if (NULL != thread->errorString)
-	        PR_DELETE(thread->errorString);
-	    thread->errorStringSize = 0;
-    }
-    else
-    {
-	    PRIntn size = textLength + 31;  /* actual length to allocate. Plus a little extra */
-        if (thread->errorStringSize < textLength+1)  /* do we have room? */
-        {
-	        if (NULL != thread->errorString)
-	            PR_DELETE(thread->errorString);
-		    thread->errorString = (char*)PR_MALLOC(size);
-            if ( NULL == thread->errorString ) {
-                thread->errorStringSize = 0;
-                thread->errorStringLength = 0;
-                return;
-            }
-            thread->errorStringSize = size;
-	    }
-        memcpy(thread->errorString, text, textLength+1 );
-    }
-    thread->errorStringLength = textLength;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetErrorTextLength(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->errorStringLength;
-}  /* PR_GetErrorTextLength */
-
-PR_IMPLEMENT(PRInt32) PR_GetErrorText(char *text)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    if (0 != thread->errorStringLength)
-        memcpy(text, thread->errorString, thread->errorStringLength+1);
-    return thread->errorStringLength;
-}  /* PR_GetErrorText */
-
-
diff --git a/libs/js/nsprpub/pr/src/misc/prerrortable.c b/libs/js/nsprpub/pr/src/misc/prerrortable.c
deleted file mode 100644
index a51b4e8fcf..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prerrortable.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-
-
-/*
-
-Copyright 1987, 1988 by the Student Information Processing Board
-	of the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation,
-and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-M.I.T. and the M.I.T. S.I.P.B. make no representations about
-the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-*/
-
-#include <string.h>
-#ifdef SUNOS4
-#include "md/sunos4.h"  /* for strerror */
-#endif
-#include <assert.h>
-#include <errno.h>
-#include "prmem.h"
-#include "prerror.h"
-
-#define	ERRCODE_RANGE	8	/* # of bits to shift table number */
-#define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
-
-#ifdef NEED_SYS_ERRLIST
-extern char const * const sys_errlist[];
-extern const int sys_nerr;
-#endif
-
-/* List of error tables */
-struct PRErrorTableList {
-    struct PRErrorTableList *next;
-    const struct PRErrorTable *table;
-    struct PRErrorCallbackTablePrivate *table_private;
-};
-static struct PRErrorTableList * Table_List = (struct PRErrorTableList *) NULL;
-
-/* Supported languages */
-static const char * default_languages[] = { "i-default", "en", 0 };
-static const char * const * callback_languages = default_languages;
-
-/* Callback info */
-static struct PRErrorCallbackPrivate *callback_private = 0;
-static PRErrorCallbackLookupFn *callback_lookup = 0;
-static PRErrorCallbackNewTableFn *callback_newtable = 0;
-
-
-static const char char_set[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
-
-static const char *
-error_table_name (PRErrorCode num)
-{
-    static char buf[6];	/* only used if internal code problems exist */
-
-    long ch;
-    int i;
-    char *p;
-
-    /* num = aa aaa abb bbb bcc ccc cdd ddd d?? ??? ??? */
-    p = buf;
-    num >>= ERRCODE_RANGE;
-    /* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */
-    num &= 077777777;
-    /* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */
-    for (i = 4; i >= 0; i--) {
-	ch = (num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1);
-	if (ch != 0)
-	    *p++ = char_set[ch-1];
-    }
-    *p = '\0';
-    return(buf);
-}
-
-PR_IMPLEMENT(const char *)
-PR_ErrorToString(PRErrorCode code, PRLanguageCode language)
-{
-    /* static buffer only used if code is using inconsistent error message
-     * numbers, so just ignore the possible thread contention
-     */
-    static char buffer[25];
-
-    const char *msg;
-    int offset;
-    PRErrorCode table_num;
-    struct PRErrorTableList *et;
-    int started = 0;
-    char *cp;
-
-    for (et = Table_List; et; et = et->next) {
-	if (et->table->base <= code &&
-	    et->table->base + et->table->n_msgs > code) {
-	    /* This is the right table */
-	    if (callback_lookup) {
-		msg = callback_lookup(code, language, et->table,
-		    callback_private, et->table_private);
-		if (msg) return msg;
-	    }
-    
-	    return(et->table->msgs[code - et->table->base].en_text);
-	}
-    }
-
-    if (code >= 0 && code < 256) {
-	return strerror(code);
-    }
-
-    offset = (int) (code & ((1<<ERRCODE_RANGE)-1));
-    table_num = code - offset;
-    strcpy (buffer, "Unknown code ");
-    if (table_num) {
-	strcat(buffer, error_table_name (table_num));
-	strcat(buffer, " ");
-    }
-    for (cp = buffer; *cp; cp++)
-	;
-    if (offset >= 100) {
-	*cp++ = (char)('0' + offset / 100);
-	offset %= 100;
-	started++;
-    }
-    if (started || offset >= 10) {
-	*cp++ = (char)('0' + offset / 10);
-	offset %= 10;
-    }
-    *cp++ = (char)('0' + offset);
-    *cp = '\0';
-    return(buffer);
-}
-
-PR_IMPLEMENT(const char *)
-PR_ErrorToName(PRErrorCode code)
-{
-    struct PRErrorTableList *et;
-
-    for (et = Table_List; et; et = et->next) {
-	if (et->table->base <= code &&
-	    et->table->base + et->table->n_msgs > code) {
-	    /* This is the right table */
-	    return(et->table->msgs[code - et->table->base].name);
-	}
-    }
-
-    return 0;
-}
-
-PR_IMPLEMENT(const char * const *)
-PR_ErrorLanguages(void)
-{
-    return callback_languages;
-}
-
-PR_IMPLEMENT(PRErrorCode)
-PR_ErrorInstallTable(const struct PRErrorTable *table)
-{
-    struct PRErrorTableList * new_et;
-
-    new_et = (struct PRErrorTableList *)
-					PR_Malloc(sizeof(struct PRErrorTableList));
-    if (!new_et)
-	return errno;	/* oops */
-    new_et->table = table;
-    if (callback_newtable) {
-	new_et->table_private = callback_newtable(table, callback_private);
-    } else {
-	new_et->table_private = 0;
-    }
-    new_et->next = Table_List;
-    Table_List = new_et;
-    return 0;
-}
-
-PR_IMPLEMENT(void)
-PR_ErrorInstallCallback(const char * const * languages,
-		       PRErrorCallbackLookupFn *lookup, 
-		       PRErrorCallbackNewTableFn *newtable,
-		       struct PRErrorCallbackPrivate *cb_private)
-{
-    struct PRErrorTableList *et;
-
-    assert(strcmp(languages[0], "i-default") == 0);
-    assert(strcmp(languages[1], "en") == 0);
-    
-    callback_languages = languages;
-    callback_lookup = lookup;
-    callback_newtable = newtable;
-    callback_private = cb_private;
-
-    if (callback_newtable) {
-	for (et = Table_List; et; et = et->next) {
-	    et->table_private = callback_newtable(et->table, callback_private);
-	}
-    }
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prinit.c b/libs/js/nsprpub/pr/src/misc/prinit.c
deleted file mode 100644
index bba575bfe7..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prinit.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <ctype.h>
-#include <string.h>
-
-PRLogModuleInfo *_pr_clock_lm;
-PRLogModuleInfo *_pr_cmon_lm;
-PRLogModuleInfo *_pr_io_lm;
-PRLogModuleInfo *_pr_cvar_lm;
-PRLogModuleInfo *_pr_mon_lm;
-PRLogModuleInfo *_pr_linker_lm;
-PRLogModuleInfo *_pr_sched_lm;
-PRLogModuleInfo *_pr_thread_lm;
-PRLogModuleInfo *_pr_gc_lm;
-PRLogModuleInfo *_pr_shm_lm;
-PRLogModuleInfo *_pr_shma_lm;
-
-PRFileDesc *_pr_stdin;
-PRFileDesc *_pr_stdout;
-PRFileDesc *_pr_stderr;
-
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-
-PRCList _pr_active_local_threadQ =
-			PR_INIT_STATIC_CLIST(&_pr_active_local_threadQ);
-PRCList _pr_active_global_threadQ =
-			PR_INIT_STATIC_CLIST(&_pr_active_global_threadQ);
-
-_MDLock  _pr_cpuLock;           /* lock for the CPU Q */
-PRCList _pr_cpuQ = PR_INIT_STATIC_CLIST(&_pr_cpuQ);
-
-PRUint32 _pr_utid;
-
-PRInt32 _pr_userActive;
-PRInt32 _pr_systemActive;
-PRUintn _pr_maxPTDs;
-
-#ifdef _PR_LOCAL_THREADS_ONLY
-
-struct _PRCPU 	*_pr_currentCPU;
-PRThread 	*_pr_currentThread;
-PRThread 	*_pr_lastThread;
-PRInt32 	_pr_intsOff;
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-/* Lock protecting all "termination" condition variables of all threads */
-PRLock *_pr_terminationCVLock;
-
-#endif /* !defined(_PR_PTHREADS) */
-
-PRLock *_pr_sleeplock;  /* used in PR_Sleep(), classic and pthreads */
-
-static void _PR_InitCallOnce(void);
-
-PRBool _pr_initialized = PR_FALSE;
-
-
-PR_IMPLEMENT(PRBool) PR_VersionCheck(const char *importedVersion)
-{
-    /*
-    ** This is the secret handshake algorithm.
-    **
-    ** This release has a simple version compatibility
-    ** check algorithm.  This release is not backward
-    ** compatible with previous major releases.  It is
-    ** not compatible with future major, minor, or
-    ** patch releases.
-    */
-    int vmajor = 0, vminor = 0, vpatch = 0;
-    const char *ptr = importedVersion;
-
-    while (isdigit(*ptr)) {
-        vmajor = 10 * vmajor + *ptr - '0';
-        ptr++;
-    }
-    if (*ptr == '.') {
-        ptr++;
-        while (isdigit(*ptr)) {
-            vminor = 10 * vminor + *ptr - '0';
-            ptr++;
-        }
-        if (*ptr == '.') {
-            ptr++;
-            while (isdigit(*ptr)) {
-                vpatch = 10 * vpatch + *ptr - '0';
-                ptr++;
-            }
-        }
-    }
-
-    if (vmajor != PR_VMAJOR) {
-        return PR_FALSE;
-    }
-    if (vmajor == PR_VMAJOR && vminor > PR_VMINOR) {
-        return PR_FALSE;
-    }
-    if (vmajor == PR_VMAJOR && vminor == PR_VMINOR && vpatch > PR_VPATCH) {
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}  /* PR_VersionCheck */
-
-
-PR_IMPLEMENT(PRBool) PR_Initialized(void)
-{
-    return _pr_initialized;
-}
-
-PRInt32 _native_threads_only = 0;
-
-#ifdef WINNT
-static void _pr_SetNativeThreadsOnlyMode(void)
-{
-    HMODULE mainExe;
-    PRBool *globalp;
-    char *envp;
-
-    mainExe = GetModuleHandle(NULL);
-    PR_ASSERT(NULL != mainExe);
-    globalp = (PRBool *) GetProcAddress(mainExe, "nspr_native_threads_only");
-    if (globalp) {
-        _native_threads_only = (*globalp != PR_FALSE);
-    } else if (envp = getenv("NSPR_NATIVE_THREADS_ONLY")) {
-        _native_threads_only = (atoi(envp) == 1);
-    }
-}
-#endif
-
-#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-extern PRStatus _pr_init_ipv6(void);
-#endif
-
-static void _PR_InitStuff(void)
-{
-
-    if (_pr_initialized) return;
-    _pr_initialized = PR_TRUE;
-#ifdef _PR_ZONE_ALLOCATOR
-    _PR_InitZones();
-#endif
-#ifdef WINNT
-    _pr_SetNativeThreadsOnlyMode();
-#endif
-
-
-    (void) PR_GetPageSize();
-
-	_pr_clock_lm = PR_NewLogModule("clock");
-	_pr_cmon_lm = PR_NewLogModule("cmon");
-	_pr_io_lm = PR_NewLogModule("io");
-	_pr_mon_lm = PR_NewLogModule("mon");
-	_pr_linker_lm = PR_NewLogModule("linker");
-	_pr_cvar_lm = PR_NewLogModule("cvar");
-	_pr_sched_lm = PR_NewLogModule("sched");
-	_pr_thread_lm = PR_NewLogModule("thread");
-	_pr_gc_lm = PR_NewLogModule("gc");
-	_pr_shm_lm = PR_NewLogModule("shm");
-	_pr_shma_lm = PR_NewLogModule("shma");
-      
-    /* NOTE: These init's cannot depend on _PR_MD_CURRENT_THREAD() */ 
-    _PR_MD_EARLY_INIT();
-
-    _PR_InitLocks();
-    _PR_InitAtomic();
-    _PR_InitSegs();
-    _PR_InitStacks();
-	_PR_InitTPD();
-    _PR_InitLayerCache();
-    _PR_InitClock();
-
-    _pr_sleeplock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_sleeplock);
-
-#ifdef GC_LEAK_DETECTOR
-    _PR_InitGarbageCollector();
-#endif
-
-    _PR_InitThreads(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    
-#ifdef WIN16
-	{
-	PRInt32 top;   /* artificial top of stack, win16 */
-    _pr_top_of_task_stack = (char *) &top;
-	}
-#endif    
-
-#ifndef _PR_GLOBAL_THREADS_ONLY
-	_PR_InitCPUs();
-#endif
-
-/*
- * XXX: call _PR_InitMem only on those platforms for which nspr implements
- *	malloc, for now.
- */
-#ifdef _PR_OVERRIDE_MALLOC
-    _PR_InitMem();
-#endif
-
-    _PR_InitIO();
-    _PR_InitLog();
-    _PR_InitCallOnce();
-    _PR_InitMW();
-    _PR_MD_FINAL_INIT();
-}
-
-void _PR_ImplicitInitialization(void)
-{
-	_PR_InitStuff();
-
-    /* Enable interrupts */
-#if !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY)
-    _PR_MD_START_INTERRUPTS();
-#endif
-
-}
-
-PR_IMPLEMENT(void) PR_DisableClockInterrupts(void)
-{
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-	if (!_pr_initialized) {
-		_PR_InitStuff();
-	} else {
-    	_PR_MD_DISABLE_CLOCK_INTERRUPTS();
-	}
-#endif
-}
-
-PR_IMPLEMENT(void) PR_EnableClockInterrupts(void)
-{
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-	if (!_pr_initialized) {
-		_PR_InitStuff();
-	}
-    _PR_MD_ENABLE_CLOCK_INTERRUPTS();
-#endif
-}
-
-PR_IMPLEMENT(void) PR_BlockClockInterrupts(void)
-{
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-    	_PR_MD_BLOCK_CLOCK_INTERRUPTS();
-#endif
-}
-
-PR_IMPLEMENT(void) PR_UnblockClockInterrupts(void)
-{
-#if !defined(_PR_PTHREADS) && !defined(_PR_BTHREADS)
-    	_PR_MD_UNBLOCK_CLOCK_INTERRUPTS();
-#endif
-}
-
-PR_IMPLEMENT(void) PR_Init(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs)
-{
-#if defined(XP_MAC)
-#pragma unused (type, priority, maxPTDs)
-#endif
-
-    _PR_ImplicitInitialization();
-}
-
-PR_IMPLEMENT(PRIntn) PR_Initialize(
-    PRPrimordialFn prmain, PRIntn argc, char **argv, PRUintn maxPTDs)
-{
-#if defined(XP_MAC)
-#pragma unused (maxPTDs)
-#endif
-
-    PRIntn rv;
-    _PR_ImplicitInitialization();
-    rv = prmain(argc, argv);
-	PR_Cleanup();
-    return rv;
-}  /* PR_Initialize */
-
-/*
- *-----------------------------------------------------------------------
- *
- * _PR_CleanupBeforeExit --
- *
- *   Perform the cleanup work before exiting the process. 
- *   We first do the cleanup generic to all platforms.  Then
- *   we call _PR_MD_CLEANUP_BEFORE_EXIT(), where platform-dependent
- *   cleanup is done.  This function is used by PR_Cleanup().
- *
- * See also: PR_Cleanup().
- *
- *-----------------------------------------------------------------------
- */
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-static void
-_PR_CleanupBeforeExit(void)
-{
-/* 
-Do not make any calls here other than to destroy resources.  For example,
-do not make any calls that eventually may end up in PR_Lock.  Because the
-thread is destroyed, can not access current thread any more.
-*/
-    _PR_CleanupTPD();
-    if (_pr_terminationCVLock)
-    /*
-     * In light of the comment above, this looks real suspicious.
-     * I'd go so far as to say it's just a problem waiting to happen.
-     */
-        PR_DestroyLock(_pr_terminationCVLock);
-
-    _PR_MD_CLEANUP_BEFORE_EXIT();
-}
-#endif /* defined(_PR_PTHREADS) */
-
-/*
- *----------------------------------------------------------------------
- *
- * PR_Cleanup --
- *
- *   Perform a graceful shutdown of the NSPR runtime.  PR_Cleanup() may
- *   only be called from the primordial thread, typically at the
- *   end of the main() function.  It returns when it has completed
- *   its platform-dependent duty and the process must not make any other
- *   NSPR library calls prior to exiting from main().
- *
- *   PR_Cleanup() first blocks the primordial thread until all the
- *   other user (non-system) threads, if any, have terminated.
- *   Then it performs cleanup in preparation for exiting the process.
- *   PR_Cleanup() does not exit the primordial thread (which would
- *   in turn exit the process).
- *   
- *   PR_Cleanup() only responds when it is called by the primordial
- *   thread. Calls by any other thread are silently ignored.
- *
- * See also: PR_ExitProcess()
- *
- *----------------------------------------------------------------------
- */
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-
-PR_IMPLEMENT(PRStatus) PR_Cleanup()
-{
-    PRThread *me = PR_GetCurrentThread();
-    PR_ASSERT((NULL != me) && (me->flags & _PR_PRIMORDIAL));
-    if ((NULL != me) && (me->flags & _PR_PRIMORDIAL))
-    {
-        PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("PR_Cleanup: shutting down NSPR"));
-
-        /*
-         * No more recycling of threads
-         */
-        _pr_recycleThreads = 0;
-
-        /*
-         * Wait for all other user (non-system/daemon) threads
-         * to terminate.
-         */
-        PR_Lock(_pr_activeLock);
-        while (_pr_userActive > _pr_primordialExitCount) {
-            PR_WaitCondVar(_pr_primordialExitCVar, PR_INTERVAL_NO_TIMEOUT);
-        }
-        PR_Unlock(_pr_activeLock);
-
-#ifdef IRIX
-		_PR_MD_PRE_CLEANUP(me);
-		/*
-		 * The primordial thread must now be running on the primordial cpu
-		 */
-    	PR_ASSERT((_PR_IS_NATIVE_THREAD(me)) || (me->cpu->id == 0));
-#endif
-
-        _PR_CleanupMW();
-        _PR_CleanupCallOnce();
-        /* Release the primordial thread's private data, etc. */
-        _PR_CleanupThread(me);
-
-        _PR_MD_STOP_INTERRUPTS();
-
-	    PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-	            ("PR_Cleanup: clean up before destroying thread"));
-	    _PR_LogCleanup();
-
-        /*
-         * This part should look like the end of _PR_NativeRunThread
-         * and _PR_UserRunThread.
-         */
-        if (_PR_IS_NATIVE_THREAD(me)) {
-            _PR_MD_EXIT_THREAD(me);
-            _PR_NativeDestroyThread(me);
-        } else {
-            _PR_UserDestroyThread(me);
-            PR_DELETE(me->stack);
-            PR_DELETE(me);
-        }
-
-        /*
-         * XXX: We are freeing the heap memory here so that Purify won't
-         * complain, but we should also free other kinds of resources
-         * that are allocated by the _PR_InitXXX() functions.
-         * Ideally, for each _PR_InitXXX(), there should be a corresponding
-         * _PR_XXXCleanup() that we can call here.
-         */
-        _PR_CleanupIO();
-#ifdef WINNT
-        _PR_CleanupCPUs();
-#endif
-        _PR_CleanupThreads();
-        PR_DestroyLock(_pr_sleeplock);
-        _pr_sleeplock = NULL;
-        _PR_CleanupLayerCache();
-        _PR_CleanupStacks();
-        _PR_CleanupBeforeExit();
-        _pr_initialized = PR_FALSE;
-        return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-}
-#endif /* defined(_PR_PTHREADS) */
-
-/*
- *------------------------------------------------------------------------
- * PR_ProcessExit --
- * 
- *   Cause an immediate, nongraceful, forced termination of the process.
- *   It takes a PRIntn argument, which is the exit status code of the
- *   process.
- *   
- * See also: PR_Cleanup()
- *
- *------------------------------------------------------------------------
- */
-
-#if defined(_PR_PTHREADS) || defined(_PR_BTHREADS)
-    /* see ptthread.c */
-#else
-PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status)
-{
-    _PR_MD_EXIT(status);
-}
-
-#endif /* defined(_PR_PTHREADS) */
-
-PR_IMPLEMENT(PRProcessAttr *)
-PR_NewProcessAttr(void)
-{
-    PRProcessAttr *attr;
-
-    attr = PR_NEWZAP(PRProcessAttr);
-    if (!attr) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    }
-    return attr;
-}
-
-PR_IMPLEMENT(void)
-PR_ResetProcessAttr(PRProcessAttr *attr)
-{
-    PR_FREEIF(attr->currentDirectory);
-    PR_FREEIF(attr->fdInheritBuffer);
-    memset(attr, 0, sizeof(*attr));
-}
-
-PR_IMPLEMENT(void)
-PR_DestroyProcessAttr(PRProcessAttr *attr)
-{
-    PR_FREEIF(attr->currentDirectory);
-    PR_FREEIF(attr->fdInheritBuffer);
-    PR_DELETE(attr);
-}
-
-PR_IMPLEMENT(void)
-PR_ProcessAttrSetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd)
-{
-    switch (stdioFd) {
-        case PR_StandardInput:
-            attr->stdinFd = redirectFd;
-            break;
-        case PR_StandardOutput:
-            attr->stdoutFd = redirectFd;
-            break;
-        case PR_StandardError:
-            attr->stderrFd = redirectFd;
-            break;
-        default:
-            PR_ASSERT(0);
-    }
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_ProcessAttrSetCurrentDirectory(
-    PRProcessAttr *attr,
-    const char *dir)
-{
-    PR_FREEIF(attr->currentDirectory);
-    attr->currentDirectory = (char *) PR_MALLOC(strlen(dir) + 1);
-    if (!attr->currentDirectory) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return PR_FAILURE;
-    }
-    strcpy(attr->currentDirectory, dir);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_ProcessAttrSetInheritableFD(
-    PRProcessAttr *attr,
-    PRFileDesc *fd,
-    const char *name)
-{
-    /* We malloc the fd inherit buffer in multiples of this number. */
-#define FD_INHERIT_BUFFER_INCR 128
-    /* The length of "NSPR_INHERIT_FDS=" */
-#define NSPR_INHERIT_FDS_STRLEN 17
-    /* The length of osfd (PROsfd) printed in hexadecimal with 0x prefix */
-#ifdef _WIN64
-#define OSFD_STRLEN 18
-#else
-#define OSFD_STRLEN 10
-#endif
-    /* The length of fd type (PRDescType) printed in decimal */
-#define FD_TYPE_STRLEN 1
-    PRSize newSize;
-    int remainder;
-    char *newBuffer;
-    int nwritten;
-    char *cur;
-    int freeSize;
-
-    if (fd->identity != PR_NSPR_IO_LAYER) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if (fd->secret->inheritable == _PR_TRI_UNKNOWN) {
-        _PR_MD_QUERY_FD_INHERITABLE(fd);
-    }
-    if (fd->secret->inheritable != _PR_TRI_TRUE) {
-        PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    /*
-     * We also need to account for the : separators and the
-     * terminating null byte.
-     */
-    if (NULL == attr->fdInheritBuffer) {
-        /* The first time, we print "NSPR_INHERIT_FDS=<name>:<type>:<val>" */
-        newSize = NSPR_INHERIT_FDS_STRLEN + strlen(name)
-                + FD_TYPE_STRLEN + OSFD_STRLEN + 2 + 1;
-    } else {
-        /* At other times, we print ":<name>:<type>:<val>" */
-        newSize = attr->fdInheritBufferUsed + strlen(name)
-                + FD_TYPE_STRLEN + OSFD_STRLEN + 3 + 1;
-    }
-    if (newSize > attr->fdInheritBufferSize) {
-        /* Make newSize a multiple of FD_INHERIT_BUFFER_INCR */
-        remainder = newSize % FD_INHERIT_BUFFER_INCR;
-        if (remainder != 0) {
-            newSize += (FD_INHERIT_BUFFER_INCR - remainder);
-        }
-        if (NULL == attr->fdInheritBuffer) {
-            newBuffer = (char *) PR_MALLOC(newSize);
-        } else {
-            newBuffer = (char *) PR_REALLOC(attr->fdInheritBuffer, newSize);
-        }
-        if (NULL == newBuffer) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return PR_FAILURE;
-        }
-        attr->fdInheritBuffer = newBuffer;
-        attr->fdInheritBufferSize = newSize;
-    }
-    cur = attr->fdInheritBuffer + attr->fdInheritBufferUsed;
-    freeSize = attr->fdInheritBufferSize - attr->fdInheritBufferUsed;
-    if (0 == attr->fdInheritBufferUsed) {
-        nwritten = PR_snprintf(cur, freeSize,
-                "NSPR_INHERIT_FDS=%s:%d:0x%" PR_PRIxOSFD,
-                name, (PRIntn)fd->methods->file_type, fd->secret->md.osfd);
-    } else {
-        nwritten = PR_snprintf(cur, freeSize, ":%s:%d:0x%" PR_PRIxOSFD,
-                name, (PRIntn)fd->methods->file_type, fd->secret->md.osfd);
-    }
-    attr->fdInheritBufferUsed += nwritten; 
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRProcess*) PR_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    return _PR_MD_CREATE_PROCESS(path, argv, envp, attr);
-}  /* PR_CreateProcess */
-
-PR_IMPLEMENT(PRStatus) PR_CreateProcessDetached(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    PRProcess *process;
-    PRStatus rv;
-
-    process = PR_CreateProcess(path, argv, envp, attr);
-    if (NULL == process) {
-	return PR_FAILURE;
-    }
-    rv = PR_DetachProcess(process);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if (rv == PR_FAILURE) {
-	PR_DELETE(process);
-	return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DetachProcess(PRProcess *process)
-{
-    return _PR_MD_DETACH_PROCESS(process);
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitProcess(PRProcess *process, PRInt32 *exitCode)
-{
-    return _PR_MD_WAIT_PROCESS(process, exitCode);
-}  /* PR_WaitProcess */
-
-PR_IMPLEMENT(PRStatus) PR_KillProcess(PRProcess *process)
-{
-    return _PR_MD_KILL_PROCESS(process);
-}
-
-/*
- ********************************************************************
- *
- * Module initialization
- *
- ********************************************************************
- */
-
-static struct {
-    PRLock *ml;
-    PRCondVar *cv;
-} mod_init;
-
-static void _PR_InitCallOnce(void) {
-    mod_init.ml = PR_NewLock();
-    PR_ASSERT(NULL != mod_init.ml);
-    mod_init.cv = PR_NewCondVar(mod_init.ml);
-    PR_ASSERT(NULL != mod_init.cv);
-}
-
-void _PR_CleanupCallOnce()
-{
-    PR_DestroyLock(mod_init.ml);
-    mod_init.ml = NULL;
-    PR_DestroyCondVar(mod_init.cv);
-    mod_init.cv = NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CallOnce(
-    PRCallOnceType *once,
-    PRCallOnceFN    func)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (!once->initialized) {
-	if (PR_AtomicSet(&once->inProgress, 1) == 0) {
-	    once->status = (*func)();
-	    PR_Lock(mod_init.ml);
-	    once->initialized = 1;
-	    PR_NotifyAllCondVar(mod_init.cv);
-	    PR_Unlock(mod_init.ml);
-	} else {
-	    PR_Lock(mod_init.ml);
-	    while (!once->initialized) {
-		PR_WaitCondVar(mod_init.cv, PR_INTERVAL_NO_TIMEOUT);
-            }
-	    PR_Unlock(mod_init.ml);
-	}
-    }
-    return once->status;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg(
-    PRCallOnceType      *once,
-    PRCallOnceWithArgFN  func,
-    void                *arg)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (!once->initialized) {
-	if (PR_AtomicSet(&once->inProgress, 1) == 0) {
-	    once->status = (*func)(arg);
-	    PR_Lock(mod_init.ml);
-	    once->initialized = 1;
-	    PR_NotifyAllCondVar(mod_init.cv);
-	    PR_Unlock(mod_init.ml);
-	} else {
-	    PR_Lock(mod_init.ml);
-	    while (!once->initialized) {
-		PR_WaitCondVar(mod_init.cv, PR_INTERVAL_NO_TIMEOUT);
-            }
-	    PR_Unlock(mod_init.ml);
-	}
-    }
-    return once->status;
-}
-PRBool _PR_Obsolete(const char *obsolete, const char *preferred)
-{
-  return PR_FALSE;
-}  /* _PR_Obsolete */
-
-/* prinit.c */
-
-
diff --git a/libs/js/nsprpub/pr/src/misc/prinrval.c b/libs/js/nsprpub/pr/src/misc/prinrval.c
deleted file mode 100644
index 17229e80fa..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prinrval.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * file:			prinrval.c
- * description:		implementation for the kernel interval timing functions
- */
-
-#include "primpl.h"
-
-/*
- *-----------------------------------------------------------------------
- *
- * _PR_InitClock --
- *
- *
- *-----------------------------------------------------------------------
- */
-
-void _PR_InitClock(void)
-{
-    _PR_MD_INTERVAL_INIT();
-#ifdef DEBUG
-    {
-        PRIntervalTime ticksPerSec = PR_TicksPerSecond();
-
-        PR_ASSERT(ticksPerSec >= PR_INTERVAL_MIN);
-        PR_ASSERT(ticksPerSec <= PR_INTERVAL_MAX);
-    }
-#endif /* DEBUG */
-}
-
-/*
- * This version of interval times is based on the time of day
- * capability offered by system. This isn't valid for two reasons:
- * 1) The time of day is neither linear nor montonically increasing
- * 2) The units here are milliseconds. That's not appropriate for our use.
- */
-
-PR_IMPLEMENT(PRIntervalTime) PR_IntervalNow(void)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    return _PR_MD_GET_INTERVAL();
-}  /* PR_IntervalNow */
-
-PR_EXTERN(PRUint32) PR_TicksPerSecond(void)
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    return _PR_MD_INTERVAL_PER_SEC();
-}  /* PR_TicksPerSecond */
-
-PR_IMPLEMENT(PRIntervalTime) PR_SecondsToInterval(PRUint32 seconds)
-{
-    return seconds * PR_TicksPerSecond();
-}  /* PR_SecondsToInterval */
-
-PR_IMPLEMENT(PRIntervalTime) PR_MillisecondsToInterval(PRUint32 milli)
-{
-    PRIntervalTime ticks;
-    PRUint64 tock, tps, msecPerSec, rounding;
-    LL_UI2L(tock, milli);
-    LL_I2L(msecPerSec, PR_MSEC_PER_SEC);
-    LL_I2L(rounding, (PR_MSEC_PER_SEC >> 1));
-    LL_I2L(tps, PR_TicksPerSecond());
-    LL_MUL(tock, tock, tps);
-    LL_ADD(tock, tock, rounding);
-    LL_DIV(tock, tock, msecPerSec);
-    LL_L2UI(ticks, tock);
-    return ticks;
-}  /* PR_MillisecondsToInterval */
-
-PR_IMPLEMENT(PRIntervalTime) PR_MicrosecondsToInterval(PRUint32 micro)
-{
-    PRIntervalTime ticks;
-    PRUint64 tock, tps, usecPerSec, rounding;
-    LL_UI2L(tock, micro);
-    LL_I2L(usecPerSec, PR_USEC_PER_SEC);
-    LL_I2L(rounding, (PR_USEC_PER_SEC >> 1));
-    LL_I2L(tps, PR_TicksPerSecond());
-    LL_MUL(tock, tock, tps);
-    LL_ADD(tock, tock, rounding);
-    LL_DIV(tock, tock, usecPerSec);
-    LL_L2UI(ticks, tock);
-    return ticks;
-}  /* PR_MicrosecondsToInterval */
-
-PR_IMPLEMENT(PRUint32) PR_IntervalToSeconds(PRIntervalTime ticks)
-{
-    return ticks / PR_TicksPerSecond();
-}  /* PR_IntervalToSeconds */
-
-PR_IMPLEMENT(PRUint32) PR_IntervalToMilliseconds(PRIntervalTime ticks)
-{
-    PRUint32 milli;
-    PRUint64 tock, tps, msecPerSec, rounding;
-    LL_UI2L(tock, ticks);
-    LL_I2L(msecPerSec, PR_MSEC_PER_SEC);
-    LL_I2L(tps, PR_TicksPerSecond());
-    LL_USHR(rounding, tps, 1);
-    LL_MUL(tock, tock, msecPerSec);
-    LL_ADD(tock, tock, rounding);
-    LL_DIV(tock, tock, tps);
-    LL_L2UI(milli, tock);
-    return milli;
-}  /* PR_IntervalToMilliseconds */
-
-PR_IMPLEMENT(PRUint32) PR_IntervalToMicroseconds(PRIntervalTime ticks)
-{
-    PRUint32 micro;
-    PRUint64 tock, tps, usecPerSec, rounding;
-    LL_UI2L(tock, ticks);
-    LL_I2L(usecPerSec, PR_USEC_PER_SEC);
-    LL_I2L(tps, PR_TicksPerSecond());
-    LL_USHR(rounding, tps, 1);
-    LL_MUL(tock, tock, usecPerSec);
-    LL_ADD(tock, tock, rounding);
-    LL_DIV(tock, tock, tps);
-    LL_L2UI(micro, tock);
-    return micro;
-}  /* PR_IntervalToMicroseconds */
-
-/* prinrval.c */
-
diff --git a/libs/js/nsprpub/pr/src/misc/pripc.c b/libs/js/nsprpub/pr/src/misc/pripc.c
deleted file mode 100644
index cb16aad916..0000000000
--- a/libs/js/nsprpub/pr/src/misc/pripc.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pripc.c
- *
- * Description: functions for IPC support
- */
-
-#include "primpl.h"
-
-#include <string.h>
-
-/*
- * A POSIX IPC name must begin with a '/'.
- * A POSIX IPC name on Solaris cannot contain any '/' except
- * the required leading '/'.
- * A POSIX IPC name on HP-UX and OSF1 must be a valid pathname
- * in the file system.
- *
- * The ftok() function for System V IPC requires a valid pathname
- * in the file system.
- *
- * A Win32 IPC name cannot contain '\'.
- */
-
-static void _pr_ConvertSemName(char *result)
-{
-#ifdef _PR_HAVE_POSIX_SEMAPHORES
-#if defined(SOLARIS)
-    char *p;
-
-    /* Convert '/' to '_' except for the leading '/' */
-    for (p = result+1; *p; p++) {
-        if (*p == '/') {
-            *p = '_';
-        }
-    }
-    return;
-#else
-    return;
-#endif
-#elif defined(_PR_HAVE_SYSV_SEMAPHORES)
-    return;
-#elif defined(WIN32)
-    return;
-#endif
-}
-
-static void _pr_ConvertShmName(char *result)
-{
-#if defined(PR_HAVE_POSIX_NAMED_SHARED_MEMORY)
-#if defined(SOLARIS)
-    char *p;
-
-    /* Convert '/' to '_' except for the leading '/' */
-    for (p = result+1; *p; p++) {
-        if (*p == '/') {
-            *p = '_';
-        }
-    }
-    return;
-#else
-    return;
-#endif
-#elif defined(PR_HAVE_SYSV_NAMED_SHARED_MEMORY)
-    return;
-#elif defined(WIN32)
-    return;
-#else
-    return;
-#endif
-}
-
-PRStatus _PR_MakeNativeIPCName(
-    const char *name,
-    char *result,
-    PRIntn size,
-    _PRIPCType type)
-{
-    if (strlen(name) >= (PRSize)size) {
-        PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0);
-        return PR_FAILURE;
-    }
-    strcpy(result, name);
-    switch (type) {
-        case _PRIPCSem:
-            _pr_ConvertSemName(result);
-            break;
-        case _PRIPCShm:
-            _pr_ConvertShmName(result);
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
diff --git a/libs/js/nsprpub/pr/src/misc/pripcsem.c b/libs/js/nsprpub/pr/src/misc/pripcsem.c
deleted file mode 100644
index c6c59ec9f3..0000000000
--- a/libs/js/nsprpub/pr/src/misc/pripcsem.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pripcsem.c
- *
- * Description: implements the named semaphores API in prsemipc.h
- * for classic NSPR.  If _PR_HAVE_NAMED_SEMAPHORES is not defined,
- * the named semaphore functions all fail with the error code
- * PR_NOT_IMPLEMENTED_ERROR.
- */
-
-#include "primpl.h"
-
-#ifdef _PR_PTHREADS
-
-#error "This file should not be compiled for the pthreads version"
-
-#else
-
-#ifndef _PR_HAVE_NAMED_SEMAPHORES
-
-PRSem * _PR_MD_OPEN_SEMAPHORE(
-    const char *osname, PRIntn flags, PRIntn mode, PRUintn value)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PRStatus _PR_MD_WAIT_SEMAPHORE(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _PR_MD_POST_SEMAPHORE(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _PR_MD_CLOSE_SEMAPHORE(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PRStatus _PR_MD_DELETE_SEMAPHORE(const char *osname)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-#endif /* !_PR_HAVE_NAMED_SEMAPHORES */
-
-PR_IMPLEMENT(PRSem *) PR_OpenSemaphore(
-    const char *name, PRIntn flags, PRIntn mode, PRUintn value)
-{
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-            == PR_FAILURE) {
-        return NULL;
-    }
-    return _PR_MD_OPEN_SEMAPHORE(osname, flags, mode, value);
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitSemaphore(PRSem *sem)
-{
-    return _PR_MD_WAIT_SEMAPHORE(sem);
-}
-
-PR_IMPLEMENT(PRStatus) PR_PostSemaphore(PRSem *sem)
-{
-    return _PR_MD_POST_SEMAPHORE(sem);
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseSemaphore(PRSem *sem)
-{
-    return _PR_MD_CLOSE_SEMAPHORE(sem);
-}
-
-PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name)
-{
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-            == PR_FAILURE) {
-        return PR_FAILURE;
-    }
-    return _PR_MD_DELETE_SEMAPHORE(osname);
-}
-
-#endif /* _PR_PTHREADS */
diff --git a/libs/js/nsprpub/pr/src/misc/prlog2.c b/libs/js/nsprpub/pr/src/misc/prlog2.c
deleted file mode 100644
index d1a688ad70..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prlog2.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prbit.h"
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-PR_IMPLEMENT(PRIntn) PR_CeilingLog2(PRUint32 n)
-{
-    PRIntn log2 = 0;
-
-    if (n & (n-1))
-	log2++;
-    if (n >> 16)
-	log2 += 16, n >>= 16;
-    if (n >> 8)
-	log2 += 8, n >>= 8;
-    if (n >> 4)
-	log2 += 4, n >>= 4;
-    if (n >> 2)
-	log2 += 2, n >>= 2;
-    if (n >> 1)
-	log2++;
-    return log2;
-}
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n.
-** This really just finds the highest set bit in the word.
-*/
-PR_IMPLEMENT(PRIntn) PR_FloorLog2(PRUint32 n)
-{
-    PRIntn log2 = 0;
-
-    if (n >> 16)
-	log2 += 16, n >>= 16;
-    if (n >> 8)
-	log2 += 8, n >>= 8;
-    if (n >> 4)
-	log2 += 4, n >>= 4;
-    if (n >> 2)
-	log2 += 2, n >>= 2;
-    if (n >> 1)
-	log2++;
-    return log2;
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prlong.c b/libs/js/nsprpub/pr/src/misc/prlong.c
deleted file mode 100644
index ad1c2a0dae..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prlong.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-static PRInt64 ll_zero = LL_INIT( 0x00000000,0x00000000 );
-static PRInt64 ll_maxint = LL_INIT( 0x7fffffff, 0xffffffff );
-static PRInt64 ll_minint = LL_INIT( 0x80000000, 0x00000000 );
-static PRUint64 ll_maxuint = LL_INIT( 0xffffffff, 0xffffffff );
-
-#if defined(HAVE_WATCOM_BUG_2)
-PRInt64 __pascal __loadds __export
-    LL_Zero(void) { return ll_zero; }
-PRInt64 __pascal __loadds __export
-    LL_MaxInt(void) { return ll_maxint; }
-PRInt64 __pascal __loadds __export
-    LL_MinInt(void) { return ll_minint; }
-PRUint64 __pascal __loadds __export
-    LL_MaxUint(void) { return ll_maxuint; }
-#else
-PR_IMPLEMENT(PRInt64) LL_Zero(void) { return ll_zero; }
-PR_IMPLEMENT(PRInt64) LL_MaxInt(void) { return ll_maxint; }
-PR_IMPLEMENT(PRInt64) LL_MinInt(void) { return ll_minint; }
-PR_IMPLEMENT(PRUint64) LL_MaxUint(void) { return ll_maxuint; }
-#endif
-
-#ifndef HAVE_LONG_LONG
-/*
-** Divide 64-bit a by 32-bit b, which must be normalized so its high bit is 1.
-*/
-static void norm_udivmod32(PRUint32 *qp, PRUint32 *rp, PRUint64 a, PRUint32 b)
-{
-    PRUint32 d1, d0, q1, q0;
-    PRUint32 r1, r0, m;
-
-    d1 = _hi16(b);
-    d0 = _lo16(b);
-    r1 = a.hi % d1;
-    q1 = a.hi / d1;
-    m = q1 * d0;
-    r1 = (r1 << 16) | _hi16(a.lo);
-    if (r1 < m) {
-        q1--, r1 += b;
-        if (r1 >= b	/* i.e., we didn't get a carry when adding to r1 */
-	    && r1 < m) {
-	    q1--, r1 += b;
-	}
-    }
-    r1 -= m;
-    r0 = r1 % d1;
-    q0 = r1 / d1;
-    m = q0 * d0;
-    r0 = (r0 << 16) | _lo16(a.lo);
-    if (r0 < m) {
-        q0--, r0 += b;
-        if (r0 >= b
-	    && r0 < m) {
-	    q0--, r0 += b;
-	}
-    }
-    *qp = (q1 << 16) | q0;
-    *rp = r0 - m;
-}
-
-static PRUint32 CountLeadingZeros(PRUint32 a)
-{
-    PRUint32 t;
-    PRUint32 r = 32;
-
-    if ((t = a >> 16) != 0)
-	r -= 16, a = t;
-    if ((t = a >> 8) != 0)
-	r -= 8, a = t;
-    if ((t = a >> 4) != 0)
-	r -= 4, a = t;
-    if ((t = a >> 2) != 0)
-	r -= 2, a = t;
-    if ((t = a >> 1) != 0)
-	r -= 1, a = t;
-    if (a & 1)
-	r--;
-    return r;
-}
-
-PR_IMPLEMENT(void) ll_udivmod(PRUint64 *qp, PRUint64 *rp, PRUint64 a, PRUint64 b)
-{
-    PRUint32 n0, n1, n2;
-    PRUint32 q0, q1;
-    PRUint32 rsh, lsh;
-
-    n0 = a.lo;
-    n1 = a.hi;
-
-    if (b.hi == 0) {
-	if (b.lo > n1) {
-	    /* (0 q0) = (n1 n0) / (0 D0) */
-
-	    lsh = CountLeadingZeros(b.lo);
-
-	    if (lsh) {
-		/*
-		 * Normalize, i.e. make the most significant bit of the
-		 * denominator be set.
-		 */
-		b.lo = b.lo << lsh;
-		n1 = (n1 << lsh) | (n0 >> (32 - lsh));
-		n0 = n0 << lsh;
-	    }
-
-	    a.lo = n0, a.hi = n1;
-	    norm_udivmod32(&q0, &n0, a, b.lo);
-	    q1 = 0;
-
-	    /* remainder is in n0 >> lsh */
-	} else {
-	    /* (q1 q0) = (n1 n0) / (0 d0) */
-
-	    if (b.lo == 0)		/* user wants to divide by zero! */
-		b.lo = 1 / b.lo;	/* so go ahead and crash */
-
-	    lsh = CountLeadingZeros(b.lo);
-
-	    if (lsh == 0) {
-		/*
-		 * From (n1 >= b.lo)
-		 *   && (the most significant bit of b.lo is set),
-		 * conclude that
-		 *	(the most significant bit of n1 is set)
-		 *   && (the leading quotient digit q1 = 1).
-		 *
-		 * This special case is necessary, not an optimization
-		 * (Shifts counts of 32 are undefined).
-		 */
-		n1 -= b.lo;
-		q1 = 1;
-	    } else {
-		/*
-		 * Normalize.
-		 */
-		rsh = 32 - lsh;
-
-		b.lo = b.lo << lsh;
-		n2 = n1 >> rsh;
-		n1 = (n1 << lsh) | (n0 >> rsh);
-		n0 = n0 << lsh;
-
-		a.lo = n1, a.hi = n2;
-		norm_udivmod32(&q1, &n1, a, b.lo);
-	    }
-
-	    /* n1 != b.lo... */
-
-	    a.lo = n0, a.hi = n1;
-	    norm_udivmod32(&q0, &n0, a, b.lo);
-
-	    /* remainder in n0 >> lsh */
-	}
-
-	if (rp) {
-	    rp->lo = n0 >> lsh;
-	    rp->hi = 0;
-	}
-    } else {
-	if (b.hi > n1) {
-	    /* (0 0) = (n1 n0) / (D1 d0) */
-
-	    q0 = 0;
-	    q1 = 0;
-
-	    /* remainder in (n1 n0) */
-	    if (rp) {
-		rp->lo = n0;
-		rp->hi = n1;
-	    }
-	} else {
-	    /* (0 q0) = (n1 n0) / (d1 d0) */
-
-	    lsh = CountLeadingZeros(b.hi);
-	    if (lsh == 0) {
-		/*
-		 * From (n1 >= b.hi)
-		 *   && (the most significant bit of b.hi is set),
-		 * conclude that
-		 *      (the most significant bit of n1 is set)
-		 *   && (the quotient digit q0 = 0 or 1).
-		 *
-		 * This special case is necessary, not an optimization.
-		 */
-
-		/*
-		 * The condition on the next line takes advantage of that
-		 * n1 >= b.hi (true due to control flow).
-		 */
-		if (n1 > b.hi || n0 >= b.lo) {
-		    q0 = 1;
-		    a.lo = n0, a.hi = n1;
-		    LL_SUB(a, a, b);
-		} else {
-		    q0 = 0;
-		}
-		q1 = 0;
-
-		if (rp) {
-		    rp->lo = n0;
-		    rp->hi = n1;
-		}
-	    } else {
-		PRInt64 m;
-
-		/*
-		 * Normalize.
-		 */
-		rsh = 32 - lsh;
-
-		b.hi = (b.hi << lsh) | (b.lo >> rsh);
-		b.lo = b.lo << lsh;
-		n2 = n1 >> rsh;
-		n1 = (n1 << lsh) | (n0 >> rsh);
-		n0 = n0 << lsh;
-
-		a.lo = n1, a.hi = n2;
-		norm_udivmod32(&q0, &n1, a, b.hi);
-		LL_MUL32(m, q0, b.lo);
-
-		if ((m.hi > n1) || ((m.hi == n1) && (m.lo > n0))) {
-		    q0--;
-		    LL_SUB(m, m, b);
-		}
-
-		q1 = 0;
-
-		/* Remainder is ((n1 n0) - (m1 m0)) >> lsh */
-		if (rp) {
-		    a.lo = n0, a.hi = n1;
-		    LL_SUB(a, a, m);
-		    rp->lo = (a.hi << rsh) | (a.lo >> lsh);
-		    rp->hi = a.hi >> lsh;
-		}
-	    }
-	}
-    }
-
-    if (qp) {
-	qp->lo = q0;
-	qp->hi = q1;
-    }
-}
-#endif /* !HAVE_LONG_LONG */
diff --git a/libs/js/nsprpub/pr/src/misc/prnetdb.c b/libs/js/nsprpub/pr/src/misc/prnetdb.c
deleted file mode 100644
index 31514568e8..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prnetdb.c
+++ /dev/null
@@ -1,2198 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-/*
- * On Unix, the error code for gethostbyname() and gethostbyaddr()
- * is returned in the global variable h_errno, instead of the usual
- * errno.
- */
-#if defined(XP_UNIX)
-#if defined(_PR_NEED_H_ERRNO)
-extern int h_errno;
-#endif
-#define _MD_GETHOST_ERRNO() h_errno
-#else
-#define _MD_GETHOST_ERRNO() _MD_ERRNO()
-#endif
-
-/*
- * The meaning of the macros related to gethostbyname, gethostbyaddr,
- * and gethostbyname2 is defined below.
- * - _PR_HAVE_THREADSAFE_GETHOST: the gethostbyXXX functions return
- *   the result in thread specific storage.  For example, AIX, HP-UX,
- *   and OSF1.
- * -  _PR_HAVE_GETHOST_R: have the gethostbyXXX_r functions. See next
- *   two macros.
- * - _PR_HAVE_GETHOST_R_INT: the gethostbyXXX_r functions return an
- *   int.  For example, Linux glibc.
- * - _PR_HAVE_GETHOST_R_POINTER: the gethostbyXXX_r functions return
- *   a struct hostent* pointer.  For example, Solaris and IRIX.
- */
-#if defined(_PR_NO_PREEMPT) || defined(_PR_HAVE_GETHOST_R) \
-    || defined(_PR_HAVE_THREADSAFE_GETHOST)
-#define _PR_NO_DNS_LOCK
-#endif
-
-#if defined(_PR_NO_DNS_LOCK)
-#define LOCK_DNS()
-#define UNLOCK_DNS()
-#else
-PRLock *_pr_dnsLock = NULL;
-#define LOCK_DNS() PR_Lock(_pr_dnsLock)
-#define UNLOCK_DNS() PR_Unlock(_pr_dnsLock)
-#endif  /* defined(_PR_NO_DNS_LOCK) */
-
-/*
- * Some platforms have the reentrant getprotobyname_r() and
- * getprotobynumber_r().  However, they come in two flavors.
- * Some return a pointer to struct protoent, others return
- * an int.
- */
-#if defined(XP_BEOS) && defined(BONE_VERSION)
-#include <arpa/inet.h>  /* pick up define for inet_addr */
-#include <sys/socket.h>
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_GETPROTO_R_POINTER
-#endif
-
-#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
-	|| (defined(LINUX) && defined(_REENTRANT) \
-        && !(defined(__GLIBC__) && __GLIBC__ >= 2))
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_GETPROTO_R_POINTER
-#endif
-
-#if defined(OSF1) \
-        || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
-	|| (defined(HPUX10_10) && defined(_REENTRANT)) \
-        || (defined(HPUX10_20) && defined(_REENTRANT))
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_GETPROTO_R_INT
-#endif
-
-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_5_ARG_GETPROTO_R
-#endif
-
-#if !defined(_PR_HAVE_GETPROTO_R)
-PRLock* _getproto_lock = NULL;
-#endif
-
-#if defined(_PR_INET6_PROBE)
-PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#endif
-
-#define _PR_IN6_IS_ADDR_UNSPECIFIED(a)				\
-				(((a)->pr_s6_addr32[0] == 0) &&	\
-				((a)->pr_s6_addr32[1] == 0) &&		\
-				((a)->pr_s6_addr32[2] == 0) &&		\
-				((a)->pr_s6_addr32[3] == 0))
- 
-#define _PR_IN6_IS_ADDR_LOOPBACK(a)					\
-               (((a)->pr_s6_addr32[0] == 0)	&&	\
-               ((a)->pr_s6_addr32[1] == 0)		&&	\
-               ((a)->pr_s6_addr32[2] == 0)		&&	\
-               ((a)->pr_s6_addr[12] == 0)		&&	\
-               ((a)->pr_s6_addr[13] == 0)		&&	\
-               ((a)->pr_s6_addr[14] == 0)		&&	\
-               ((a)->pr_s6_addr[15] == 0x1U))
- 
-const PRIPv6Addr _pr_in6addr_any =	{{{ 0, 0, 0, 0,
-										0, 0, 0, 0,
-										0, 0, 0, 0,
-										0, 0, 0, 0 }}};
-
-const PRIPv6Addr _pr_in6addr_loopback = {{{ 0, 0, 0, 0,
-											0, 0, 0, 0,
-											0, 0, 0, 0,
-											0, 0, 0, 0x1U }}};
-/*
- * The values at bytes 10 and 11 are compared using pointers to
- * 8-bit fields, and not 32-bit fields, to make the comparison work on
- * both big-endian and little-endian systems
- */
-
-#define _PR_IN6_IS_ADDR_V4MAPPED(a)			\
-		(((a)->pr_s6_addr32[0] == 0) 	&&	\
-		((a)->pr_s6_addr32[1] == 0)	&&	\
-		((a)->pr_s6_addr[8] == 0)		&&	\
-		((a)->pr_s6_addr[9] == 0)		&&	\
-		((a)->pr_s6_addr[10] == 0xff)	&&	\
-		((a)->pr_s6_addr[11] == 0xff))
-
-#define _PR_IN6_IS_ADDR_V4COMPAT(a)			\
-		(((a)->pr_s6_addr32[0] == 0) &&	\
-		((a)->pr_s6_addr32[1] == 0) &&		\
-		((a)->pr_s6_addr32[2] == 0))
-
-#define _PR_IN6_V4MAPPED_TO_IPADDR(a) ((a)->pr_s6_addr32[3])
-
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-
-/*
- * The _pr_QueryNetIfs() function finds out if the system has
- * IPv4 or IPv6 source addresses configured and sets _pr_have_inet_if
- * and _pr_have_inet6_if accordingly.
- *
- * We have an implementation using SIOCGIFCONF ioctl and a
- * default implementation that simply sets _pr_have_inet_if
- * and _pr_have_inet6_if to true.  A better implementation
- * would be to use the routing sockets (see Chapter 17 of
- * W. Richard Stevens' Unix Network Programming, Vol. 1, 2nd. Ed.)
- */
-
-static PRLock *_pr_query_ifs_lock = NULL;
-static PRBool _pr_have_inet_if = PR_FALSE;
-static PRBool _pr_have_inet6_if = PR_FALSE;
-
-#undef DEBUG_QUERY_IFS
-
-#if defined(AIX) \
-    || (defined(DARWIN) && (!defined(HAVE_GETIFADDRS) \
-        || (defined(XP_MACOSX) && (!defined(MAC_OS_X_VERSION_10_2) || \
-        MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2))))
-
-/*
- * Use SIOCGIFCONF ioctl on platforms that don't have routing
- * sockets.  Warning: whether SIOCGIFCONF ioctl returns AF_INET6
- * network interfaces is not portable.
- *
- * The _pr_QueryNetIfs() function is derived from the code in
- * src/lib/libc/net/getifaddrs.c in BSD Unix and the code in
- * Section 16.6 of W. Richard Stevens' Unix Network Programming,
- * Vol. 1, 2nd. Ed.
- */
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-
-#ifdef DEBUG_QUERY_IFS
-static void
-_pr_PrintIfreq(struct ifreq *ifr)
-{
-    PRNetAddr addr;
-    struct sockaddr *sa;
-    const char* family;
-    char addrstr[64];
-
-    sa = &ifr->ifr_addr;
-    if (sa->sa_family == AF_INET) {
-        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-        family = "inet";
-        memcpy(&addr.inet.ip, &sin->sin_addr, sizeof(sin->sin_addr));
-    } else if (sa->sa_family == AF_INET6) {
-        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
-        family = "inet6";
-        memcpy(&addr.ipv6.ip, &sin6->sin6_addr, sizeof(sin6->sin6_addr));
-    } else {
-        return;  /* skip if not AF_INET or AF_INET6 */
-    }
-    addr.raw.family = sa->sa_family;
-    PR_NetAddrToString(&addr, addrstr, sizeof(addrstr));
-    printf("%s: %s %s\n", ifr->ifr_name, family, addrstr);
-}
-#endif
-
-static void
-_pr_QueryNetIfs(void)
-{
-    int sock;
-    int rv;
-    struct ifconf ifc;
-    struct ifreq *ifr;
-    struct ifreq *lifr;
-    PRUint32 len, lastlen;
-    char *buf;
-
-    if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-        return;
-    }
-
-    /* Issue SIOCGIFCONF request in a loop. */
-    lastlen = 0;
-    len = 100 * sizeof(struct ifreq);  /* initial buffer size guess */
-    for (;;) {
-        buf = (char *)PR_Malloc(len);
-        if (NULL == buf) {
-            close(sock);
-            return;
-        }
-        ifc.ifc_buf = buf;
-        ifc.ifc_len = len;
-        rv = ioctl(sock, SIOCGIFCONF, &ifc);
-        if (rv < 0) {
-            if (errno != EINVAL || lastlen != 0) {
-                close(sock);
-                PR_Free(buf);
-                return;
-            }
-        } else {
-            if (ifc.ifc_len == lastlen)
-                break;  /* success, len has not changed */
-            lastlen = ifc.ifc_len;
-        }
-        len += 10 * sizeof(struct ifreq);  /* increment */
-        PR_Free(buf);
-    }
-    close(sock);
-
-    ifr = ifc.ifc_req;
-    lifr = (struct ifreq *)&ifc.ifc_buf[ifc.ifc_len];
-
-    while (ifr < lifr) {
-        struct sockaddr *sa;
-        int sa_len;
-
-#ifdef DEBUG_QUERY_IFS
-        _pr_PrintIfreq(ifr);
-#endif
-        sa = &ifr->ifr_addr;
-        if (sa->sa_family == AF_INET) {
-            struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-            if (sin->sin_addr.s_addr != htonl(INADDR_LOOPBACK)) {
-                _pr_have_inet_if = PR_TRUE;
-            } 
-        } else if (sa->sa_family == AF_INET6) {
-            struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
-            if (!IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)
-                    && !IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-                _pr_have_inet6_if = PR_TRUE;
-            } 
-        }
-
-#ifdef _PR_HAVE_SOCKADDR_LEN
-        sa_len = PR_MAX(sa->sa_len, sizeof(struct sockaddr));
-#else
-        switch (sa->sa_family) {
-#ifdef AF_LINK
-        case AF_LINK:
-            sa_len = sizeof(struct sockaddr_dl);
-            break;
-#endif
-        case AF_INET6:
-            sa_len = sizeof(struct sockaddr_in6);
-            break;
-        default:
-            sa_len = sizeof(struct sockaddr);
-            break;
-        }
-#endif
-        ifr = (struct ifreq *)(((char *)sa) + sa_len);
-    }
-    PR_Free(buf);
-}
-
-#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
-    || defined(NETBSD) || defined(OPENBSD)
-
-/*
- * Use the BSD getifaddrs function.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <netinet/in.h>
-
-#ifdef DEBUG_QUERY_IFS
-static void
-_pr_PrintIfaddrs(struct ifaddrs *ifa)
-{
-    struct sockaddr *sa;
-    const char* family;
-    void *addrp;
-    char addrstr[64];
-
-    sa = ifa->ifa_addr;
-    if (sa->sa_family == AF_INET) {
-        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-        family = "inet";
-        addrp = &sin->sin_addr;
-    } else if (sa->sa_family == AF_INET6) {
-        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
-        family = "inet6";
-        addrp = &sin6->sin6_addr;
-    } else {
-        return;  /* skip if not AF_INET or AF_INET6 */
-    }
-    inet_ntop(sa->sa_family, addrp, addrstr, sizeof(addrstr));
-    printf("%s: %s %s\n", ifa->ifa_name, family, addrstr);
-}
-#endif
-
-static void
-_pr_QueryNetIfs(void)
-{
-    struct ifaddrs *ifp;
-    struct ifaddrs *ifa;
-
-    if (getifaddrs(&ifp) == -1) {
-        return;
-    }
-    for (ifa = ifp; ifa; ifa = ifa->ifa_next) {
-        struct sockaddr *sa;
-
-#ifdef DEBUG_QUERY_IFS
-        _pr_PrintIfaddrs(ifa);
-#endif
-        sa = ifa->ifa_addr;
-        if (sa->sa_family == AF_INET) {
-            struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-            if (sin->sin_addr.s_addr != htonl(INADDR_LOOPBACK)) {
-                _pr_have_inet_if = 1;
-            } 
-        } else if (sa->sa_family == AF_INET6) {
-            struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
-            if (!IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)
-                    && !IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-                _pr_have_inet6_if = 1;
-            } 
-        }
-    } 
-    freeifaddrs(ifp);
-}
-
-#else  /* default */
-
-/*
- * Emulate the code in NSPR 4.2 or older.  PR_GetIPNodeByName behaves
- * as if the system had both IPv4 and IPv6 source addresses configured.
- */
-static void
-_pr_QueryNetIfs(void)
-{
-    _pr_have_inet_if = PR_TRUE;
-    _pr_have_inet6_if = PR_TRUE;
-}
-
-#endif
-
-#endif  /* _PR_INET6 && _PR_HAVE_GETHOSTBYNAME2 */
-
-void _PR_InitNet(void)
-{
-#if defined(XP_UNIX)
-#ifdef HAVE_NETCONFIG
-	/*
-	 * This one-liner prevents the endless re-open's and re-read's of
-	 * /etc/netconfig on EACH and EVERY call to accept(), connect(), etc.
-	 */
-	 (void)setnetconfig();
-#endif
-#endif
-#if !defined(_PR_NO_DNS_LOCK)
-	_pr_dnsLock = PR_NewLock();
-#endif
-#if !defined(_PR_HAVE_GETPROTO_R)
-	_getproto_lock = PR_NewLock();
-#endif
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-	_pr_query_ifs_lock = PR_NewLock();
-#endif
-}
-
-void _PR_CleanupNet(void)
-{
-#if !defined(_PR_NO_DNS_LOCK)
-    if (_pr_dnsLock) {
-        PR_DestroyLock(_pr_dnsLock);
-        _pr_dnsLock = NULL;
-    }
-#endif
-#if !defined(_PR_HAVE_GETPROTO_R)
-    if (_getproto_lock) {
-        PR_DestroyLock(_getproto_lock);
-        _getproto_lock = NULL;
-    }
-#endif
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-    if (_pr_query_ifs_lock) {
-        PR_DestroyLock(_pr_query_ifs_lock);
-        _pr_query_ifs_lock = NULL;
-    }
-#endif
-}
-
-/*
-** Allocate space from the buffer, aligning it to "align" before doing
-** the allocation. "align" must be a power of 2.
-*/
-static char *Alloc(PRIntn amount, char **bufp, PRIntn *buflenp, PRIntn align)
-{
-	char *buf = *bufp;
-	PRIntn buflen = *buflenp;
-
-	if (align && ((long)buf & (align - 1))) {
-		PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
-		if (buflen < skip) {
-			return 0;
-		}
-		buf += skip;
-		buflen -= skip;
-	}
-	if (buflen < amount) {
-		return 0;
-	}
-	*bufp = buf + amount;
-	*buflenp = buflen - amount;
-	return buf;
-}
-
-typedef enum _PRIPAddrConversion {
-    _PRIPAddrNoConversion,
-    _PRIPAddrIPv4Mapped,
-    _PRIPAddrIPv4Compat
-} _PRIPAddrConversion;
-
-/*
-** Convert an IPv4 address (v4) to an IPv4-mapped IPv6 address (v6).
-*/
-static void MakeIPv4MappedAddr(const char *v4, char *v6)
-{
-    memset(v6, 0, 10);
-    memset(v6 + 10, 0xff, 2);
-    memcpy(v6 + 12, v4, 4);
-}
-
-/*
-** Convert an IPv4 address (v4) to an IPv4-compatible IPv6 address (v6).
-*/
-static void MakeIPv4CompatAddr(const char *v4, char *v6)
-{
-    memset(v6, 0, 12);
-    memcpy(v6 + 12, v4, 4);
-}
-
-/*
-** Copy a hostent, and all of the memory that it refers to into
-** (hopefully) stacked buffers.
-*/
-static PRStatus CopyHostent(
-    struct hostent *from,
-    char **buf,
-    PRIntn *bufsize,
-    _PRIPAddrConversion conversion,
-    PRHostEnt *to)
-{
-	PRIntn len, na;
-	char **ap;
-
-	if (conversion != _PRIPAddrNoConversion
-			&& from->h_addrtype == AF_INET) {
-		PR_ASSERT(from->h_length == 4);
-		to->h_addrtype = PR_AF_INET6;
-		to->h_length = 16;
-	} else {
-#if defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-		if (AF_INET6 == from->h_addrtype)
-			to->h_addrtype = PR_AF_INET6;
-		else
-#endif
-			to->h_addrtype = from->h_addrtype;
-		to->h_length = from->h_length;
-	}
-
-	/* Copy the official name */
-	if (!from->h_name) return PR_FAILURE;
-	len = strlen(from->h_name) + 1;
-	to->h_name = Alloc(len, buf, bufsize, 0);
-	if (!to->h_name) return PR_FAILURE;
-	memcpy(to->h_name, from->h_name, len);
-
-	/* Count the aliases, then allocate storage for the pointers */
-	if (!from->h_aliases) {
-		na = 1;
-	} else {
-		for (na = 1, ap = from->h_aliases; *ap != 0; na++, ap++){;} /* nothing to execute */
-	}
-	to->h_aliases = (char**)Alloc(
-	    na * sizeof(char*), buf, bufsize, sizeof(char**));
-	if (!to->h_aliases) return PR_FAILURE;
-
-	/* Copy the aliases, one at a time */
-	if (!from->h_aliases) {
-		to->h_aliases[0] = 0;
-	} else {
-		for (na = 0, ap = from->h_aliases; *ap != 0; na++, ap++) {
-			len = strlen(*ap) + 1;
-			to->h_aliases[na] = Alloc(len, buf, bufsize, 0);
-			if (!to->h_aliases[na]) return PR_FAILURE;
-			memcpy(to->h_aliases[na], *ap, len);
-		}
-		to->h_aliases[na] = 0;
-	}
-
-	/* Count the addresses, then allocate storage for the pointers */
-	for (na = 1, ap = from->h_addr_list; *ap != 0; na++, ap++){;} /* nothing to execute */
-	to->h_addr_list = (char**)Alloc(
-	    na * sizeof(char*), buf, bufsize, sizeof(char**));
-	if (!to->h_addr_list) return PR_FAILURE;
-
-	/* Copy the addresses, one at a time */
-	for (na = 0, ap = from->h_addr_list; *ap != 0; na++, ap++) {
-		to->h_addr_list[na] = Alloc(to->h_length, buf, bufsize, 0);
-		if (!to->h_addr_list[na]) return PR_FAILURE;
-		if (conversion != _PRIPAddrNoConversion
-				&& from->h_addrtype == AF_INET) {
-			if (conversion == _PRIPAddrIPv4Mapped) {
-				MakeIPv4MappedAddr(*ap, to->h_addr_list[na]);
-			} else {
-				PR_ASSERT(conversion == _PRIPAddrIPv4Compat);
-				MakeIPv4CompatAddr(*ap, to->h_addr_list[na]);
-			}
-		} else {
-			memcpy(to->h_addr_list[na], *ap, to->h_length);
-		}
-	}
-	to->h_addr_list[na] = 0;
-	return PR_SUCCESS;
-}
-
-#if !defined(_PR_HAVE_GETPROTO_R)
-/*
-** Copy a protoent, and all of the memory that it refers to into
-** (hopefully) stacked buffers.
-*/
-static PRStatus CopyProtoent(
-    struct protoent *from, char *buf, PRIntn bufsize, PRProtoEnt *to)
-{
-	PRIntn len, na;
-	char **ap;
-
-	/* Do the easy stuff */
-	to->p_num = from->p_proto;
-
-	/* Copy the official name */
-	if (!from->p_name) return PR_FAILURE;
-	len = strlen(from->p_name) + 1;
-	to->p_name = Alloc(len, &buf, &bufsize, 0);
-	if (!to->p_name) return PR_FAILURE;
-	memcpy(to->p_name, from->p_name, len);
-
-	/* Count the aliases, then allocate storage for the pointers */
-	for (na = 1, ap = from->p_aliases; *ap != 0; na++, ap++){;} /* nothing to execute */
-	to->p_aliases = (char**)Alloc(
-	    na * sizeof(char*), &buf, &bufsize, sizeof(char**));
-	if (!to->p_aliases) return PR_FAILURE;
-
-	/* Copy the aliases, one at a time */
-	for (na = 0, ap = from->p_aliases; *ap != 0; na++, ap++) {
-		len = strlen(*ap) + 1;
-		to->p_aliases[na] = Alloc(len, &buf, &bufsize, 0);
-		if (!to->p_aliases[na]) return PR_FAILURE;
-		memcpy(to->p_aliases[na], *ap, len);
-	}
-	to->p_aliases[na] = 0;
-
-	return PR_SUCCESS;
-}
-#endif /* !defined(_PR_HAVE_GETPROTO_R) */
-
-/*
- * #################################################################
- * NOTE: tmphe, tmpbuf, bufsize, h, and h_err are local variables
- * or arguments of PR_GetHostByName, PR_GetIPNodeByName, and
- * PR_GetHostByAddr.  DO NOT CHANGE THE NAMES OF THESE LOCAL 
- * VARIABLES OR ARGUMENTS.
- * #################################################################
- */
-#if defined(_PR_HAVE_GETHOST_R_INT)
-
-#define GETHOSTBYNAME(name) \
-    (gethostbyname_r(name, &tmphe, tmpbuf, bufsize, &h, &h_err), h)
-#define GETHOSTBYNAME2(name, af) \
-    (gethostbyname2_r(name, af, &tmphe, tmpbuf, bufsize, &h, &h_err), h)
-#define GETHOSTBYADDR(addr, addrlen, af) \
-    (gethostbyaddr_r(addr, addrlen, af, \
-    &tmphe, tmpbuf, bufsize, &h, &h_err), h)
-
-#elif defined(_PR_HAVE_GETHOST_R_POINTER)
-
-#define GETHOSTBYNAME(name) \
-    gethostbyname_r(name, &tmphe, tmpbuf, bufsize, &h_err)
-#define GETHOSTBYNAME2(name, af) \
-    gethostbyname2_r(name, af, &tmphe, tmpbuf, bufsize, &h_err)
-#define GETHOSTBYADDR(addr, addrlen, af) \
-    gethostbyaddr_r(addr, addrlen, af, &tmphe, tmpbuf, bufsize, &h_err)
-
-#else
-
-#define GETHOSTBYNAME(name) gethostbyname(name)
-#define GETHOSTBYNAME2(name, af) gethostbyname2(name, af)
-#define GETHOSTBYADDR(addr, addrlen, af) gethostbyaddr(addr, addrlen, af)
-
-#endif  /* definition of GETHOSTBYXXX */
-
-PR_IMPLEMENT(PRStatus) PR_GetHostByName(
-    const char *name, char *buf, PRIntn bufsize, PRHostEnt *hp)
-{
-	struct hostent *h;
-	PRStatus rv = PR_FAILURE;
-#if defined(_PR_HAVE_GETHOST_R)
-    char localbuf[PR_NETDB_BUF_SIZE];
-    char *tmpbuf;
-    struct hostent tmphe;
-    int h_err;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-#if defined(_PR_HAVE_GETHOST_R)
-    tmpbuf = localbuf;
-    if (bufsize > sizeof(localbuf))
-    {
-        tmpbuf = (char *)PR_Malloc(bufsize);
-        if (NULL == tmpbuf)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return rv;
-        }
-    }
-#endif
-
-	LOCK_DNS();
-
-#ifdef XP_OS2_VACPP
-	h = GETHOSTBYNAME((char *)name);
-#else
-	h = GETHOSTBYNAME(name);
-#endif
-    
-	if (NULL == h)
-	{
-	    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_GETHOST_ERRNO());
-	}
-	else
-	{
-		_PRIPAddrConversion conversion = _PRIPAddrNoConversion;
-		rv = CopyHostent(h, &buf, &bufsize, conversion, hp);
-		if (PR_SUCCESS != rv)
-		    PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-	}
-	UNLOCK_DNS();
-#if defined(_PR_HAVE_GETHOST_R)
-    if (tmpbuf != localbuf)
-        PR_Free(tmpbuf);
-#endif
-	return rv;
-}
-
-#if !defined(_PR_INET6) && \
-        defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYNAME)
-typedef struct hostent  * (*_pr_getipnodebyname_t)(const char *, int,
-										int, int *);
-typedef struct hostent  * (*_pr_getipnodebyaddr_t)(const void *, size_t,
-													int, int *);
-typedef void (*_pr_freehostent_t)(struct hostent *);
-static void * _pr_getipnodebyname_fp;
-static void * _pr_getipnodebyaddr_fp;
-static void * _pr_freehostent_fp;
-
-/*
- * Look up the addresses of getipnodebyname, getipnodebyaddr,
- * and freehostent.
- */
-PRStatus
-_pr_find_getipnodebyname(void)
-{
-    PRLibrary *lib;	
-    PRStatus rv;
-#if defined(VMS)
-#define GETIPNODEBYNAME getenv("GETIPNODEBYNAME")
-#define GETIPNODEBYADDR getenv("GETIPNODEBYADDR")
-#define FREEHOSTENT     getenv("FREEHOSTENT")
-#else
-#define GETIPNODEBYNAME "getipnodebyname"
-#define GETIPNODEBYADDR "getipnodebyaddr"
-#define FREEHOSTENT     "freehostent"
-#endif
-    _pr_getipnodebyname_fp = PR_FindSymbolAndLibrary(GETIPNODEBYNAME, &lib);
-    if (NULL != _pr_getipnodebyname_fp) {
-        _pr_freehostent_fp = PR_FindSymbol(lib, FREEHOSTENT);
-        if (NULL != _pr_freehostent_fp) {
-            _pr_getipnodebyaddr_fp = PR_FindSymbol(lib, GETIPNODEBYADDR);
-            if (NULL != _pr_getipnodebyaddr_fp)
-                rv = PR_SUCCESS;
-            else
-                rv = PR_FAILURE;
-        } else
-            rv = PR_FAILURE;
-        (void)PR_UnloadLibrary(lib);
-    } else
-        rv = PR_FAILURE;
-    return rv;
-}
-#endif
-
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-/*
-** Append the V4 addresses to the end of the list
-*/
-static PRStatus AppendV4AddrsToHostent(
-    struct hostent *from,
-    char **buf,
-    PRIntn *bufsize,
-    PRHostEnt *to)
-{
-    PRIntn na, na_old;
-    char **ap;
-    char **new_addr_list;
-			
-    /* Count the addresses, then grow storage for the pointers */
-    for (na_old = 0, ap = to->h_addr_list; *ap != 0; na_old++, ap++)
-        {;} /* nothing to execute */
-    for (na = na_old + 1, ap = from->h_addr_list; *ap != 0; na++, ap++)
-        {;} /* nothing to execute */
-    new_addr_list = (char**)Alloc(
-        na * sizeof(char*), buf, bufsize, sizeof(char**));
-    if (!new_addr_list) return PR_FAILURE;
-
-    /* Copy the V6 addresses, one at a time */
-    for (na = 0, ap = to->h_addr_list; *ap != 0; na++, ap++) {
-        new_addr_list[na] = to->h_addr_list[na];
-    }
-    to->h_addr_list = new_addr_list;
-
-    /* Copy the V4 addresses, one at a time */
-    for (ap = from->h_addr_list; *ap != 0; na++, ap++) {
-        to->h_addr_list[na] = Alloc(to->h_length, buf, bufsize, 0);
-        if (!to->h_addr_list[na]) return PR_FAILURE;
-        MakeIPv4MappedAddr(*ap, to->h_addr_list[na]);
-    }
-    to->h_addr_list[na] = 0;
-    return PR_SUCCESS;
-}
-#endif
-
-PR_IMPLEMENT(PRStatus) PR_GetIPNodeByName(
-    const char *name, PRUint16 af, PRIntn flags,
-    char *buf, PRIntn bufsize, PRHostEnt *hp)
-{
-	struct hostent *h = 0;
-	PRStatus rv = PR_FAILURE;
-#if defined(_PR_HAVE_GETHOST_R)
-    char localbuf[PR_NETDB_BUF_SIZE];
-    char *tmpbuf;
-    struct hostent tmphe;
-    int h_err;
-#endif
-#if defined(_PR_HAVE_GETIPNODEBYNAME)
-	PRUint16 md_af = af;
-	int error_num;
-	int tmp_flags = 0;
-#endif
-#if defined(_PR_HAVE_GETHOSTBYNAME2)
-    PRBool did_af_inet = PR_FALSE;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (af != PR_AF_INET && af != PR_AF_INET6) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-    PR_Lock(_pr_query_ifs_lock);
-    /*
-     * Keep querying the presence of IPv4 and IPv6 interfaces until
-     * at least one is up.  This allows us to detect the local
-     * machine going from offline to online.
-     */
-    if (!_pr_have_inet_if && !_pr_have_inet6_if) {
-	_pr_QueryNetIfs();
-#ifdef DEBUG_QUERY_IFS
-	if (_pr_have_inet_if)
-		printf("Have IPv4 source address\n");
-	if (_pr_have_inet6_if)
-		printf("Have IPv6 source address\n");
-#endif
-    }
-    PR_Unlock(_pr_query_ifs_lock);
-#endif
-
-#if defined(_PR_HAVE_GETIPNODEBYNAME)
-	if (flags & PR_AI_V4MAPPED)
-		tmp_flags |= AI_V4MAPPED;
-	if (flags & PR_AI_ADDRCONFIG)
-		tmp_flags |= AI_ADDRCONFIG;
-	if (flags & PR_AI_ALL)
-		tmp_flags |= AI_ALL;
-    if (af == PR_AF_INET6)
-    	md_af = AF_INET6;
-	else
-    	md_af = af;
-#endif
-
-#if defined(_PR_HAVE_GETHOST_R)
-    tmpbuf = localbuf;
-    if (bufsize > sizeof(localbuf))
-    {
-        tmpbuf = (char *)PR_Malloc(bufsize);
-        if (NULL == tmpbuf)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return rv;
-        }
-    }
-#endif
-
-    /* Do not need to lock the DNS lock if getipnodebyname() is called */
-#ifdef _PR_INET6
-#ifdef _PR_HAVE_GETHOSTBYNAME2
-    LOCK_DNS();
-    if (af == PR_AF_INET6)
-    {
-        if ((flags & PR_AI_ADDRCONFIG) == 0 || _pr_have_inet6_if)
-        {
-#ifdef _PR_INET6_PROBE
-          if (_pr_ipv6_is_present == PR_TRUE)
-#endif
-            h = GETHOSTBYNAME2(name, AF_INET6); 
-        }
-        if ((NULL == h) && (flags & PR_AI_V4MAPPED)
-        && ((flags & PR_AI_ADDRCONFIG) == 0 || _pr_have_inet_if))
-        {
-            did_af_inet = PR_TRUE;
-            h = GETHOSTBYNAME2(name, AF_INET);
-        }
-    }
-    else
-    {
-        if ((flags & PR_AI_ADDRCONFIG) == 0 || _pr_have_inet_if)
-        {
-            did_af_inet = PR_TRUE;
-            h = GETHOSTBYNAME2(name, af);
-        }
-    }
-#elif defined(_PR_HAVE_GETIPNODEBYNAME)
-    h = getipnodebyname(name, md_af, tmp_flags, &error_num);
-#else
-#error "Unknown name-to-address translation function"
-#endif	/* _PR_HAVE_GETHOSTBYNAME2 */
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYNAME)
-    if (_pr_ipv6_is_present == PR_TRUE)
-    {
-#ifdef PR_GETIPNODE_NOT_THREADSAFE
-        LOCK_DNS();
-#endif
-    	h = (*((_pr_getipnodebyname_t)_pr_getipnodebyname_fp))(name, md_af, tmp_flags, &error_num);
-    }
-    else
-    {
-        LOCK_DNS();
-    	h = GETHOSTBYNAME(name);
-    }
-#else /* _PR_INET6 */
-    LOCK_DNS();
-#ifdef XP_OS2_VACPP
-    h = GETHOSTBYNAME((char *)name);
-#else
-    h = GETHOSTBYNAME(name);
-#endif
-#endif /* _PR_INET6 */
-    
-	if (NULL == h)
-	{
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME)
-	    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, error_num);
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYNAME)
-    	if (_pr_ipv6_is_present == PR_TRUE)
-	    	PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, error_num);
-		else
-	    	PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_GETHOST_ERRNO());
-#else
-	    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_GETHOST_ERRNO());
-#endif
-	}
-	else
-	{
-		_PRIPAddrConversion conversion = _PRIPAddrNoConversion;
-
-		if (af == PR_AF_INET6) conversion = _PRIPAddrIPv4Mapped;
-		rv = CopyHostent(h, &buf, &bufsize, conversion, hp);
-		if (PR_SUCCESS != rv)
-		    PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME)
-		freehostent(h);
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYNAME)
-    	if (_pr_ipv6_is_present == PR_TRUE)
-			(*((_pr_freehostent_t)_pr_freehostent_fp))(h);
-#endif
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETHOSTBYNAME2)
-		if ((PR_SUCCESS == rv) && (flags & PR_AI_V4MAPPED)
-				&& ((flags & PR_AI_ALL)
-				|| ((flags & PR_AI_ADDRCONFIG) && _pr_have_inet_if))
-				&& !did_af_inet && (h = GETHOSTBYNAME2(name, AF_INET)) != 0) {
-			rv = AppendV4AddrsToHostent(h, &buf, &bufsize, hp);
-			if (PR_SUCCESS != rv)
-				PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-		}
-#endif
-	}
-
-    /* Must match the convoluted logic above for LOCK_DNS() */
-#ifdef _PR_INET6
-#ifdef _PR_HAVE_GETHOSTBYNAME2
-    UNLOCK_DNS();
-#endif	/* _PR_HAVE_GETHOSTBYNAME2 */
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYNAME)
-#ifdef PR_GETIPNODE_NOT_THREADSAFE
-    UNLOCK_DNS();
-#else
-    if (_pr_ipv6_is_present == PR_FALSE)
-        UNLOCK_DNS();
-#endif
-#else /* _PR_INET6 */
-    UNLOCK_DNS();
-#endif /* _PR_INET6 */
-
-#if defined(_PR_HAVE_GETHOST_R)
-    if (tmpbuf != localbuf)
-        PR_Free(tmpbuf);
-#endif
-
-	return rv;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetHostByAddr(
-    const PRNetAddr *hostaddr, char *buf, PRIntn bufsize, PRHostEnt *hostentry)
-{
-	struct hostent *h;
-	PRStatus rv = PR_FAILURE;
-	const void *addr;
-	PRUint32 tmp_ip;
-	int addrlen;
-	PRInt32 af;
-#if defined(_PR_HAVE_GETHOST_R)
-    char localbuf[PR_NETDB_BUF_SIZE];
-    char *tmpbuf;
-    struct hostent tmphe;
-    int h_err;
-#endif
-#if defined(_PR_HAVE_GETIPNODEBYADDR)
-	int error_num;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	if (hostaddr->raw.family == PR_AF_INET6)
-	{
-#if defined(_PR_INET6_PROBE)
-		if (_pr_ipv6_is_present == PR_TRUE)
-			af = AF_INET6;
-		else
-			af = AF_INET;
-#elif defined(_PR_INET6)
-		af = AF_INET6;
-#else
-		af = AF_INET;
-#endif
-#if defined(_PR_GHBA_DISALLOW_V4MAPPED)
-		if (_PR_IN6_IS_ADDR_V4MAPPED(&hostaddr->ipv6.ip))
-			af = AF_INET;
-#endif
-	}
-	else
-	{
-		PR_ASSERT(hostaddr->raw.family == AF_INET);
-		af = AF_INET;
-	}
-	if (hostaddr->raw.family == PR_AF_INET6) {
-#if defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-		if (af == AF_INET6) {
-			addr = &hostaddr->ipv6.ip;
-			addrlen = sizeof(hostaddr->ipv6.ip);
-		}
-		else
-#endif
-		{
-			PR_ASSERT(af == AF_INET);
-			if (!_PR_IN6_IS_ADDR_V4MAPPED(&hostaddr->ipv6.ip)) {
-				PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-				return rv;
-			}
-			tmp_ip = _PR_IN6_V4MAPPED_TO_IPADDR((PRIPv6Addr *)
-												&hostaddr->ipv6.ip);
-			addr = &tmp_ip;
-			addrlen = sizeof(tmp_ip);
-		}
-	} else {
-		PR_ASSERT(hostaddr->raw.family == AF_INET);
-		PR_ASSERT(af == AF_INET);
-		addr = &hostaddr->inet.ip;
-		addrlen = sizeof(hostaddr->inet.ip);
-	}
-
-#if defined(_PR_HAVE_GETHOST_R)
-    tmpbuf = localbuf;
-    if (bufsize > sizeof(localbuf))
-    {
-        tmpbuf = (char *)PR_Malloc(bufsize);
-        if (NULL == tmpbuf)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return rv;
-        }
-    }
-#endif
-
-    /* Do not need to lock the DNS lock if getipnodebyaddr() is called */
-#if defined(_PR_HAVE_GETIPNODEBYADDR) && defined(_PR_INET6)
-	h = getipnodebyaddr(addr, addrlen, af, &error_num);
-#elif defined(_PR_HAVE_GETIPNODEBYADDR) && defined(_PR_INET6_PROBE)
-    if (_pr_ipv6_is_present == PR_TRUE)
-    {
-#ifdef PR_GETIPNODE_NOT_THREADSAFE
-        LOCK_DNS();
-#endif
-    	h = (*((_pr_getipnodebyaddr_t)_pr_getipnodebyaddr_fp))(addr, addrlen,
-				af, &error_num);
-    }
-	else
-    {
-        LOCK_DNS();
-		h = GETHOSTBYADDR(addr, addrlen, af);
-    }
-#else	/* _PR_HAVE_GETIPNODEBYADDR */
-    LOCK_DNS();
-#ifdef XP_OS2_VACPP
-	h = GETHOSTBYADDR((char *)addr, addrlen, af);
-#else
-	h = GETHOSTBYADDR(addr, addrlen, af);
-#endif
-#endif /* _PR_HAVE_GETIPNODEBYADDR */
-	if (NULL == h)
-	{
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYADDR)
-		PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, error_num);
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYADDR)
-    	if (_pr_ipv6_is_present == PR_TRUE)
-	    	PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, error_num);
-		else
-	    	PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_GETHOST_ERRNO());
-#else
-		PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_GETHOST_ERRNO());
-#endif
-	}
-	else
-	{
-		_PRIPAddrConversion conversion = _PRIPAddrNoConversion;
-		if (hostaddr->raw.family == PR_AF_INET6) {
-			if (af == AF_INET) {
-				if (_PR_IN6_IS_ADDR_V4MAPPED((PRIPv6Addr*)
-												&hostaddr->ipv6.ip)) {
-					conversion = _PRIPAddrIPv4Mapped;
-				} else if (_PR_IN6_IS_ADDR_V4COMPAT((PRIPv6Addr *)
-													&hostaddr->ipv6.ip)) {
-					conversion = _PRIPAddrIPv4Compat;
-				}
-			}
-		}
-		rv = CopyHostent(h, &buf, &bufsize, conversion, hostentry);
-		if (PR_SUCCESS != rv) {
-		    PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-		}
-#if defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYADDR)
-		freehostent(h);
-#elif defined(_PR_INET6_PROBE) && defined(_PR_HAVE_GETIPNODEBYADDR)
-    	if (_pr_ipv6_is_present == PR_TRUE)
-			(*((_pr_freehostent_t)_pr_freehostent_fp))(h);
-#endif
-	}
-
-    /* Must match the convoluted logic above for LOCK_DNS() */
-#if defined(_PR_HAVE_GETIPNODEBYADDR) && defined(_PR_INET6)
-#elif defined(_PR_HAVE_GETIPNODEBYADDR) && defined(_PR_INET6_PROBE)
-#ifdef PR_GETIPNODE_NOT_THREADSAFE
-    UNLOCK_DNS();
-#else
-    if (_pr_ipv6_is_present == PR_FALSE)
-        UNLOCK_DNS();
-#endif
-#else	/* _PR_HAVE_GETIPNODEBYADDR */
-    UNLOCK_DNS();
-#endif /* _PR_HAVE_GETIPNODEBYADDR */
-
-#if defined(_PR_HAVE_GETHOST_R)
-    if (tmpbuf != localbuf)
-        PR_Free(tmpbuf);
-#endif
-
-	return rv;
-}
-
-/******************************************************************************/
-/*
- * Some systems define a reentrant version of getprotobyname(). Too bad
- * the signature isn't always the same. But hey, they tried. If there
- * is such a definition, use it. Otherwise, grab a lock and do it here.
- */
-/******************************************************************************/
-
-#if !defined(_PR_HAVE_GETPROTO_R)
-/*
- * This may seem like a silly thing to do, but the compiler SHOULD
- * complain if getprotobyname_r() is implemented on some system and
- * we're not using it. For sure these signatures are different than
- * any usable implementation.
- */
-
-static struct protoent *getprotobyname_r(const char* name)
-{
-#ifdef XP_OS2_VACPP
-	return getprotobyname((char *)name);
-#else
-	return getprotobyname(name);
-#endif
-} /* getprotobyname_r */
-
-static struct protoent *getprotobynumber_r(PRInt32 number)
-{
-	return getprotobynumber(number);
-} /* getprotobynumber_r */
-
-#endif /* !defined(_PR_HAVE_GETPROTO_R) */
-
-PR_IMPLEMENT(PRStatus) PR_GetProtoByName(
-    const char* name, char* buffer, PRInt32 buflen, PRProtoEnt* result)
-{
-	PRStatus rv = PR_SUCCESS;
-#if defined(_PR_HAVE_GETPROTO_R)
-	struct protoent* res = (struct protoent*)result;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-#if defined(_PR_HAVE_GETPROTO_R_INT)
-    {
-        /*
-        ** The protoent_data has a pointer as the first field.
-        ** That implies the buffer better be aligned, and char*
-        ** doesn't promise much.
-        */
-        PRUptrdiff aligned = (PRUptrdiff)buffer;
-        if (0 != (aligned & (sizeof(struct protoent_data*) - 1)))
-        {
-            aligned += sizeof(struct protoent_data*) - 1;
-            aligned &= ~(sizeof(struct protoent_data*) - 1);
-            buflen -= (aligned - (PRUptrdiff)buffer);
-            buffer = (char*)aligned;
-        }
-    }
-#endif  /* defined(_PR_HAVE_GETPROTO_R_INT) */
-
-    if (PR_NETDB_BUF_SIZE > buflen)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-#if defined(_PR_HAVE_GETPROTO_R_POINTER)
-    if (NULL == getprotobyname_r(name, res, buffer, buflen))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-#elif defined(_PR_HAVE_GETPROTO_R_INT)
-    /*
-    ** The buffer needs to be zero'd, and it should be
-    ** at least the size of a struct protoent_data.
-    */
-    memset(buffer, 0, buflen);
-	if (-1 == getprotobyname_r(name, res, (struct protoent_data*)buffer))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-#elif defined(_PR_HAVE_5_ARG_GETPROTO_R)
-    /* The 5th argument for getprotobyname_r() cannot be NULL */
-    if (-1 == getprotobyname_r(name, res, buffer, buflen, &res))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-#else  /* do it the hard way */
-	{
-		struct protoent *staticBuf;
-		PR_Lock(_getproto_lock);
-		staticBuf = getprotobyname_r(name);
-		if (NULL == staticBuf)
-		{
-		    rv = PR_FAILURE;
-		    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        }
-		else
-		{
-			rv = CopyProtoent(staticBuf, buffer, buflen, result);
-			if (PR_FAILURE == rv)
-			    PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-        }
-		PR_Unlock(_getproto_lock);
-	}
-#endif  /* all that */
-    return rv;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetProtoByNumber(
-    PRInt32 number, char* buffer, PRInt32 buflen, PRProtoEnt* result)
-{
-	PRStatus rv = PR_SUCCESS;
-#if defined(_PR_HAVE_GETPROTO_R)
-	struct protoent* res = (struct protoent*)result;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-#if defined(_PR_HAVE_GETPROTO_R_INT)
-    {
-        /*
-        ** The protoent_data has a pointer as the first field.
-        ** That implies the buffer better be aligned, and char*
-        ** doesn't promise much.
-        */
-        PRUptrdiff aligned = (PRUptrdiff)buffer;
-        if (0 != (aligned & (sizeof(struct protoent_data*) - 1)))
-        {
-            aligned += sizeof(struct protoent_data*) - 1;
-            aligned &= ~(sizeof(struct protoent_data*) - 1);
-            buflen -= (aligned - (PRUptrdiff)buffer);
-            buffer = (char*)aligned;
-        }
-    }
-#endif /* defined(_PR_HAVE_GETPROTO_R_INT) */
-
-    if (PR_NETDB_BUF_SIZE > buflen)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-#if defined(_PR_HAVE_GETPROTO_R_POINTER)
-    if (NULL == getprotobynumber_r(number, res, buffer, buflen))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-
-#elif defined(_PR_HAVE_GETPROTO_R_INT)
-    /*
-    ** The buffer needs to be zero'd for these OS's.
-    */
-    memset(buffer, 0, buflen);
-	if (-1 == getprotobynumber_r(number, res, (struct protoent_data*)buffer))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-#elif defined(_PR_HAVE_5_ARG_GETPROTO_R)
-    /* The 5th argument for getprotobynumber_r() cannot be NULL */
-    if (-1 == getprotobynumber_r(number, res, buffer, buflen, &res))
-    {
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        return PR_FAILURE;
-    }
-#else  /* do it the hard way */
-	{
-		struct protoent *staticBuf;
-		PR_Lock(_getproto_lock);
-		staticBuf = getprotobynumber_r(number);
-		if (NULL == staticBuf)
-		{
-		    rv = PR_FAILURE;
-		    PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, _MD_ERRNO());
-        }
-		else
-		{
-			rv = CopyProtoent(staticBuf, buffer, buflen, result);
-			if (PR_FAILURE == rv)
-			    PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-        }
-		PR_Unlock(_getproto_lock);
-	}
-#endif  /* all that crap */
-    return rv;
-
-}
-
-PRUintn _PR_NetAddrSize(const PRNetAddr* addr)
-{
-    PRUintn addrsize;
-
-    /*
-     * RFC 2553 added a new field (sin6_scope_id) to
-     * struct sockaddr_in6.  PRNetAddr's ipv6 member has a
-     * scope_id field to match the new field.  In order to
-     * work with older implementations supporting RFC 2133,
-     * we take the size of struct sockaddr_in6 instead of
-     * addr->ipv6.
-     */
-    if (AF_INET == addr->raw.family)
-        addrsize = sizeof(addr->inet);
-    else if (PR_AF_INET6 == addr->raw.family)
-#if defined(_PR_INET6)
-        addrsize = sizeof(struct sockaddr_in6);
-#else
-        addrsize = sizeof(addr->ipv6);
-#endif
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-    else if (AF_UNIX == addr->raw.family)
-        addrsize = sizeof(addr->local);
-#endif
-    else addrsize = 0;
-
-    return addrsize;
-}  /* _PR_NetAddrSize */
-
-PR_IMPLEMENT(PRIntn) PR_EnumerateHostEnt(
-    PRIntn enumIndex, const PRHostEnt *hostEnt, PRUint16 port, PRNetAddr *address)
-{
-    void *addr = hostEnt->h_addr_list[enumIndex++];
-    memset(address, 0, sizeof(PRNetAddr));
-    if (NULL == addr) enumIndex = 0;
-    else
-    {
-        address->raw.family = hostEnt->h_addrtype;
-        if (PR_AF_INET6 == hostEnt->h_addrtype)
-        {
-            address->ipv6.port = htons(port);
-        	address->ipv6.flowinfo = 0;
-        	address->ipv6.scope_id = 0;
-            memcpy(&address->ipv6.ip, addr, hostEnt->h_length);
-        }
-        else
-        {
-            PR_ASSERT(AF_INET == hostEnt->h_addrtype);
-            address->inet.port = htons(port);
-            memcpy(&address->inet.ip, addr, hostEnt->h_length);
-        }
-    }
-    return enumIndex;
-}  /* PR_EnumerateHostEnt */
-
-PR_IMPLEMENT(PRStatus) PR_InitializeNetAddr(
-    PRNetAddrValue val, PRUint16 port, PRNetAddr *addr)
-{
-    PRStatus rv = PR_SUCCESS;
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	if (val != PR_IpAddrNull) memset(addr, 0, sizeof(addr->inet));
-	addr->inet.family = AF_INET;
-	addr->inet.port = htons(port);
-	switch (val)
-	{
-	case PR_IpAddrNull:
-		break;  /* don't overwrite the address */
-	case PR_IpAddrAny:
-		addr->inet.ip = htonl(INADDR_ANY);
-		break;
-	case PR_IpAddrLoopback:
-		addr->inet.ip = htonl(INADDR_LOOPBACK);
-		break;
-	default:
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		rv = PR_FAILURE;
-	}
-    return rv;
-}  /* PR_InitializeNetAddr */
-
-PR_IMPLEMENT(PRStatus) PR_SetNetAddr(
-    PRNetAddrValue val, PRUint16 af, PRUint16 port, PRNetAddr *addr)
-{
-    PRStatus rv = PR_SUCCESS;
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (af == PR_AF_INET6)
-    {
-        if (val != PR_IpAddrNull) memset(addr, 0, sizeof(addr->ipv6));
-        addr->ipv6.family = af;
-        addr->ipv6.port = htons(port);
-        addr->ipv6.flowinfo = 0;
-        addr->ipv6.scope_id = 0;
-        switch (val)
-        {
-        case PR_IpAddrNull:
-            break;  /* don't overwrite the address */
-        case PR_IpAddrAny:
-            addr->ipv6.ip = _pr_in6addr_any;
-            break;
-        case PR_IpAddrLoopback:
-            addr->ipv6.ip = _pr_in6addr_loopback;
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = PR_FAILURE;
-        }
-    }
-    else
-    {
-        if (val != PR_IpAddrNull) memset(addr, 0, sizeof(addr->inet));
-        addr->inet.family = af;
-        addr->inet.port = htons(port);
-        switch (val)
-        {
-        case PR_IpAddrNull:
-            break;  /* don't overwrite the address */
-        case PR_IpAddrAny:
-            addr->inet.ip = htonl(INADDR_ANY);
-            break;
-        case PR_IpAddrLoopback:
-            addr->inet.ip = htonl(INADDR_LOOPBACK);
-            break;
-        default:
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            rv = PR_FAILURE;
-        }
-    }
-    return rv;
-}  /* PR_SetNetAddr */
-
-PR_IMPLEMENT(PRBool)
-PR_IsNetAddrType(const PRNetAddr *addr, PRNetAddrValue val)
-{
-    if (addr->raw.family == PR_AF_INET6) {
-        if (val == PR_IpAddrAny) {
-			if (_PR_IN6_IS_ADDR_UNSPECIFIED((PRIPv6Addr *)&addr->ipv6.ip)) {
-            	return PR_TRUE;
-			} else if (_PR_IN6_IS_ADDR_V4MAPPED((PRIPv6Addr *)&addr->ipv6.ip)
-					&& _PR_IN6_V4MAPPED_TO_IPADDR((PRIPv6Addr *)&addr->ipv6.ip)
-							== htonl(INADDR_ANY)) {
-            	return PR_TRUE;
-			}
-        } else if (val == PR_IpAddrLoopback) {
-            if (_PR_IN6_IS_ADDR_LOOPBACK((PRIPv6Addr *)&addr->ipv6.ip)) {
-            	return PR_TRUE;
-			} else if (_PR_IN6_IS_ADDR_V4MAPPED((PRIPv6Addr *)&addr->ipv6.ip)
-					&& _PR_IN6_V4MAPPED_TO_IPADDR((PRIPv6Addr *)&addr->ipv6.ip)
-							== htonl(INADDR_LOOPBACK)) {
-            	return PR_TRUE;
-			}
-        } else if (val == PR_IpAddrV4Mapped
-                && _PR_IN6_IS_ADDR_V4MAPPED((PRIPv6Addr *)&addr->ipv6.ip)) {
-            return PR_TRUE;
-        }
-    } else {
-        if (addr->raw.family == AF_INET) {
-            if (val == PR_IpAddrAny && addr->inet.ip == htonl(INADDR_ANY)) {
-                return PR_TRUE;
-            } else if (val == PR_IpAddrLoopback
-                    && addr->inet.ip == htonl(INADDR_LOOPBACK)) {
-                return PR_TRUE;
-            }
-        }
-    }
-    return PR_FALSE;
-}
-
-#ifndef _PR_HAVE_INET_NTOP
-#define XX 127
-static const unsigned char index_hex[256] = {
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,XX,XX, XX,XX,XX,XX,
-    XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-    XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
-};
-
-/*
- * StringToV6Addr() returns 1 if the conversion succeeds,
- * or 0 if the input is not a valid IPv6 address string.
- * (Same as inet_pton(AF_INET6, string, addr).)
- */
-static int StringToV6Addr(const char *string, PRIPv6Addr *addr)
-{
-    const unsigned char *s = (const unsigned char *)string;
-    int section = 0;        /* index of the current section (a 16-bit
-                             * piece of the address */
-    int double_colon = -1;  /* index of the section after the first
-                             * 16-bit group of zeros represented by
-                             * the double colon */
-    unsigned int val;
-    int len;
-
-    /* Handle initial (double) colon */
-    if (*s == ':') {
-        if (s[1] != ':') return 0;
-        s += 2;
-        addr->pr_s6_addr16[0] = 0;
-        section = double_colon = 1;
-    }
-
-    while (*s) {
-        if (section == 8) return 0; /* too long */
-        if (*s == ':') {
-            if (double_colon != -1) return 0; /* two double colons */
-            addr->pr_s6_addr16[section++] = 0;
-            double_colon = section;
-            s++;
-            continue;
-        }
-        for (len = val = 0; len < 4 && index_hex[*s] != XX; len++) {
-            val = (val << 4) + index_hex[*s++];
-        }
-        if (*s == '.') {
-            if (len == 0) return 0; /* nothing between : and . */
-            break;
-        }
-        if (*s == ':') {
-            s++;
-            if (!*s) return 0; /* cannot end with single colon */
-        } else if (*s) {
-            return 0; /* bad character */
-        }
-        addr->pr_s6_addr16[section++] = htons((unsigned short)val);
-    }
-    
-    if (*s == '.') {
-        /* Have a trailing v4 format address */
-        if (section > 6) return 0; /* not enough room */
-
-        /*
-         * The number before the '.' is decimal, but we parsed it
-         * as hex.  That means it is in BCD.  Check it for validity
-         * and convert it to binary.
-         */
-        if (val > 0x0255 || (val & 0xf0) > 0x90 || (val & 0xf) > 9) return 0;
-        val = (val >> 8) * 100 + ((val >> 4) & 0xf) * 10 + (val & 0xf);
-        addr->pr_s6_addr[2 * section] = val;
-
-        s++;
-        val = index_hex[*s++];
-        if (val > 9) return 0;
-        while (*s >= '0' && *s <= '9') {
-            val = val * 10 + *s++ - '0';
-            if (val > 255) return 0;
-        }
-        if (*s != '.') return 0; /* must have exactly 4 decimal numbers */
-        addr->pr_s6_addr[2 * section + 1] = val;
-        section++;
-
-        s++;
-        val = index_hex[*s++];
-        if (val > 9) return 0;
-        while (*s >= '0' && *s <= '9') {
-            val = val * 10 + *s++ - '0';
-            if (val > 255) return 0;
-        }
-        if (*s != '.') return 0; /* must have exactly 4 decimal numbers */
-        addr->pr_s6_addr[2 * section] = val;
-
-        s++;
-        val = index_hex[*s++];
-        if (val > 9) return 0;
-        while (*s >= '0' && *s <= '9') {
-            val = val * 10 + *s++ - '0';
-            if (val > 255) return 0;
-        }
-        if (*s) return 0; /* must have exactly 4 decimal numbers */
-        addr->pr_s6_addr[2 * section + 1] = val;
-        section++;
-    }
-    
-    if (double_colon != -1) {
-        /* Stretch the double colon */
-        int tosection;
-        int ncopy = section - double_colon;
-        for (tosection = 7; ncopy--; tosection--) {
-            addr->pr_s6_addr16[tosection] = 
-                addr->pr_s6_addr16[double_colon + ncopy];
-        }
-        while (tosection >= double_colon) {
-            addr->pr_s6_addr16[tosection--] = 0;
-        }
-    } else if (section != 8) {
-        return 0; /* too short */
-    }
-    return 1;
-}
-#undef XX
-            
-static const char *basis_hex = "0123456789abcdef";
-
-/*
- * V6AddrToString() returns a pointer to the buffer containing
- * the text string if the conversion succeeds, and NULL otherwise.
- * (Same as inet_ntop(AF_INET6, addr, buf, size), except that errno
- * is not set on failure.)
- */
-static const char *V6AddrToString(
-    const PRIPv6Addr *addr, char *buf, PRUint32 size)
-{
-#define STUFF(c) do { \
-    if (!size--) return NULL; \
-    *buf++ = (c); \
-} while (0)
-
-    int double_colon = -1;          /* index of the first 16-bit
-                                     * group of zeros represented
-                                     * by the double colon */
-    int double_colon_length = 1;    /* use double colon only if
-                                     * there are two or more 16-bit
-                                     * groups of zeros */
-    int zero_length;
-    int section;
-    unsigned int val;
-    const char *bufcopy = buf;
-
-    /* Scan to find the placement of the double colon */
-    for (section = 0; section < 8; section++) {
-        if (addr->pr_s6_addr16[section] == 0) {
-            zero_length = 1;
-            section++;
-            while (section < 8 && addr->pr_s6_addr16[section] == 0) {
-                zero_length++;
-                section++;
-            }
-            /* Select the longest sequence of zeros */
-            if (zero_length > double_colon_length) {
-                double_colon = section - zero_length;
-                double_colon_length = zero_length;
-            }
-        }
-    }
-
-    /* Now start converting to a string */
-    section = 0;
-
-    if (double_colon == 0) {
-        if (double_colon_length == 6 ||
-            (double_colon_length == 5 && addr->pr_s6_addr16[5] == 0xffff)) {
-            /* ipv4 format address */
-            STUFF(':');
-            STUFF(':');
-            if (double_colon_length == 5) {
-                STUFF('f');
-                STUFF('f');
-                STUFF('f');
-                STUFF('f');
-                STUFF(':');
-            }
-            if (addr->pr_s6_addr[12] > 99) STUFF(addr->pr_s6_addr[12]/100 + '0');
-            if (addr->pr_s6_addr[12] > 9) STUFF((addr->pr_s6_addr[12]%100)/10 + '0');
-            STUFF(addr->pr_s6_addr[12]%10 + '0');
-            STUFF('.');
-            if (addr->pr_s6_addr[13] > 99) STUFF(addr->pr_s6_addr[13]/100 + '0');
-            if (addr->pr_s6_addr[13] > 9) STUFF((addr->pr_s6_addr[13]%100)/10 + '0');
-            STUFF(addr->pr_s6_addr[13]%10 + '0');
-            STUFF('.');
-            if (addr->pr_s6_addr[14] > 99) STUFF(addr->pr_s6_addr[14]/100 + '0');
-            if (addr->pr_s6_addr[14] > 9) STUFF((addr->pr_s6_addr[14]%100)/10 + '0');
-            STUFF(addr->pr_s6_addr[14]%10 + '0');
-            STUFF('.');
-            if (addr->pr_s6_addr[15] > 99) STUFF(addr->pr_s6_addr[15]/100 + '0');
-            if (addr->pr_s6_addr[15] > 9) STUFF((addr->pr_s6_addr[15]%100)/10 + '0');
-            STUFF(addr->pr_s6_addr[15]%10 + '0');
-            STUFF('\0');
-            return bufcopy;
-        }
-    }
-
-    while (section < 8) {
-        if (section == double_colon) {
-            STUFF(':');
-            STUFF(':');
-            section += double_colon_length;
-            continue;
-        }
-        val = ntohs(addr->pr_s6_addr16[section]);
-        if (val > 0xfff) {
-            STUFF(basis_hex[val >> 12]);
-        }
-        if (val > 0xff) {
-            STUFF(basis_hex[(val >> 8) & 0xf]);
-        }
-        if (val > 0xf) {
-            STUFF(basis_hex[(val >> 4) & 0xf]);
-        }
-        STUFF(basis_hex[val & 0xf]);
-        section++;
-        if (section < 8 && section != double_colon) STUFF(':');
-    }
-    STUFF('\0');
-    return bufcopy;
-#undef STUFF    
-}
-
-#endif /* !_PR_HAVE_INET_NTOP */
-
-PR_IMPLEMENT(PRStatus) PR_StringToNetAddr(const char *string, PRNetAddr *addr)
-{
-    PRStatus status = PR_SUCCESS;
-    PRIntn rv;
-
-#if defined(_PR_HAVE_INET_NTOP)
-    rv = inet_pton(AF_INET6, string, &addr->ipv6.ip);
-    if (1 == rv)
-    {
-        addr->raw.family = PR_AF_INET6;
-    }
-    else
-    {
-        PR_ASSERT(0 == rv);
-        /* clean up after the failed inet_pton() call */
-        memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip));
-        rv = inet_pton(AF_INET, string, &addr->inet.ip);
-        if (1 == rv)
-        {
-            addr->raw.family = AF_INET;
-        }
-        else
-        {
-            PR_ASSERT(0 == rv);
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            status = PR_FAILURE;
-        }
-    }
-#else /* _PR_HAVE_INET_NTOP */
-    rv = StringToV6Addr(string, &addr->ipv6.ip);
-    if (1 == rv) {
-        addr->raw.family = PR_AF_INET6;
-        return PR_SUCCESS;
-    }
-    PR_ASSERT(0 == rv);
-    /* clean up after the failed StringToV6Addr() call */
-    memset(&addr->ipv6.ip, 0, sizeof(addr->ipv6.ip));
-
-    addr->inet.family = AF_INET;
-#ifdef XP_OS2_VACPP
-    addr->inet.ip = inet_addr((char *)string);
-#else
-    addr->inet.ip = inet_addr(string);
-#endif
-    if ((PRUint32) -1 == addr->inet.ip)
-    {
-        /*
-         * The string argument is a malformed address string.
-         */
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        status = PR_FAILURE;
-    }
-#endif /* _PR_HAVE_INET_NTOP */
-
-    return status;
-}
-
-PR_IMPLEMENT(PRStatus) PR_NetAddrToString(
-    const PRNetAddr *addr, char *string, PRUint32 size)
-{
-    if (PR_AF_INET6 == addr->raw.family)
-    {
-#if defined(_PR_HAVE_INET_NTOP)
-        if (NULL == inet_ntop(AF_INET6, &addr->ipv6.ip, string, size))
-#else
-        if (NULL == V6AddrToString(&addr->ipv6.ip, string, size))
-#endif
-        {
-            /* the size of the result buffer is inadequate */
-            PR_SetError(PR_BUFFER_OVERFLOW_ERROR, 0);
-            return PR_FAILURE;
-        }
-    }
-    else
-    {
-        if (size < 16) goto failed;
-        if (AF_INET != addr->raw.family) goto failed;
-        else
-        {
-            unsigned char *byte = (unsigned char*)&addr->inet.ip;
-            PR_snprintf(string, size, "%u.%u.%u.%u",
-                byte[0], byte[1], byte[2], byte[3]);
-        }
-    }
-
-    return PR_SUCCESS;
-
-failed:
-    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    return PR_FAILURE;
-
-}  /* PR_NetAddrToString */
-
-/*
- * Convert an IPv4 addr to an (IPv4-mapped) IPv6 addr
- */
-PR_IMPLEMENT(void) PR_ConvertIPv4AddrToIPv6(PRUint32 v4addr, PRIPv6Addr *v6addr)
-{
-    PRUint8 *dstp;
-    dstp = v6addr->pr_s6_addr;
-    memset(dstp, 0, 10);
-    memset(dstp + 10, 0xff, 2);
-    memcpy(dstp + 12,(char *) &v4addr, 4);
-}
-
-PR_IMPLEMENT(PRUint16) PR_ntohs(PRUint16 n) { return ntohs(n); }
-PR_IMPLEMENT(PRUint32) PR_ntohl(PRUint32 n) { return ntohl(n); }
-PR_IMPLEMENT(PRUint16) PR_htons(PRUint16 n) { return htons(n); }
-PR_IMPLEMENT(PRUint32) PR_htonl(PRUint32 n) { return htonl(n); }
-PR_IMPLEMENT(PRUint64) PR_ntohll(PRUint64 n)
-{
-#ifdef IS_BIG_ENDIAN
-    return n;
-#else
-    PRUint64 tmp;
-    PRUint32 hi, lo;
-    LL_L2UI(lo, n);
-    LL_SHR(tmp, n, 32);
-    LL_L2UI(hi, tmp);
-    hi = PR_ntohl(hi);
-    lo = PR_ntohl(lo);
-    LL_UI2L(n, lo);
-    LL_SHL(n, n, 32);
-    LL_UI2L(tmp, hi);
-    LL_ADD(n, n, tmp);
-    return n;
-#endif
-}  /* ntohll */
-
-PR_IMPLEMENT(PRUint64) PR_htonll(PRUint64 n)
-{
-#ifdef IS_BIG_ENDIAN
-    return n;
-#else
-    PRUint64 tmp;
-    PRUint32 hi, lo;
-    LL_L2UI(lo, n);
-    LL_SHR(tmp, n, 32);
-    LL_L2UI(hi, tmp);
-    hi = htonl(hi);
-    lo = htonl(lo);
-    LL_UI2L(n, lo);
-    LL_SHL(n, n, 32);
-    LL_UI2L(tmp, hi);
-    LL_ADD(n, n, tmp);
-    return n;
-#endif
-}  /* htonll */
-
-
-/*
- * Implementation of PR_GetAddrInfoByName and friends
- *
- * Compile-time options:
- *
- *  _PR_HAVE_GETADDRINFO  Define this macro if the target system provides
- *                        getaddrinfo. With this defined, NSPR will require
- *                        getaddrinfo at run time. If this if not defined,
- *                        then NSPR will attempt to dynamically resolve
- *                        getaddrinfo, falling back to PR_GetHostByName if
- *                        getaddrinfo does not exist on the target system.
- *
- * Since getaddrinfo is a relatively new system call on many systems,
- * we are forced to dynamically resolve it at run time in most cases.
- * The exception includes any system (such as Mac OS X) that is known to
- * provide getaddrinfo in all versions that NSPR cares to support.
- */
-
-#if defined(_PR_HAVE_GETADDRINFO)
-
-#if defined(_PR_INET6)
-
-typedef struct addrinfo PRADDRINFO;
-#define GETADDRINFO getaddrinfo
-#define FREEADDRINFO freeaddrinfo
-
-#elif defined(_PR_INET6_PROBE)
-
-typedef struct addrinfo PRADDRINFO;
-
-/* getaddrinfo/freeaddrinfo prototypes */ 
-#if defined(WIN32)
-#define FUNC_MODIFIER __stdcall
-#else
-#define FUNC_MODIFIER
-#endif
-typedef int (FUNC_MODIFIER * FN_GETADDRINFO)
-    (const char *nodename,
-     const char *servname,
-     const PRADDRINFO *hints,
-     PRADDRINFO **res);
-typedef int (FUNC_MODIFIER * FN_FREEADDRINFO)
-    (PRADDRINFO *ai);
-
-/* global state */
-static FN_GETADDRINFO   _pr_getaddrinfo   = NULL;
-static FN_FREEADDRINFO  _pr_freeaddrinfo  = NULL;
-
-#if defined(VMS)
-#define GETADDRINFO_SYMBOL getenv("GETADDRINFO")
-#define FREEADDRINFO_SYMBOL getenv("FREEADDRINFO")
-#else
-#define GETADDRINFO_SYMBOL "getaddrinfo"
-#define FREEADDRINFO_SYMBOL "freeaddrinfo"
-#endif
-
-PRStatus
-_pr_find_getaddrinfo(void)
-{
-    PRLibrary *lib;
-#ifdef WIN32
-    /*
-     * On windows, we need to search ws2_32.dll or wship6.dll
-     * (Microsoft IPv6 Technology Preview for Windows 2000) for
-     * getaddrinfo and freeaddrinfo.  These libraries might not
-     * be loaded yet.
-     */
-    const char *libname[] = { "ws2_32.dll", "wship6.dll" };
-    int i;
-
-    for (i = 0; i < sizeof(libname)/sizeof(libname[0]); i++) {
-        lib = PR_LoadLibrary(libname[i]);
-        if (!lib) {
-            continue;
-        }
-        _pr_getaddrinfo = (FN_GETADDRINFO)
-            PR_FindFunctionSymbol(lib, GETADDRINFO_SYMBOL);
-        if (!_pr_getaddrinfo) {
-            PR_UnloadLibrary(lib);
-            continue;
-        }
-        _pr_freeaddrinfo = (FN_FREEADDRINFO)
-            PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL);
-        PR_ASSERT(_pr_freeaddrinfo);
-        /* Keep the library loaded. */
-        return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-#else
-    /*
-     * Resolve getaddrinfo by searching all loaded libraries.  Then
-     * search library containing getaddrinfo for freeaddrinfo.
-     */
-    _pr_getaddrinfo = (FN_GETADDRINFO)
-        PR_FindFunctionSymbolAndLibrary(GETADDRINFO_SYMBOL, &lib);
-    if (!_pr_getaddrinfo) {
-        return PR_FAILURE;
-    }
-    _pr_freeaddrinfo = (FN_FREEADDRINFO)
-        PR_FindFunctionSymbol(lib, FREEADDRINFO_SYMBOL);
-    PR_UnloadLibrary(lib);
-    if (!_pr_freeaddrinfo) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-#endif
-}
-
-#define GETADDRINFO (*_pr_getaddrinfo)
-#define FREEADDRINFO (*_pr_freeaddrinfo)
-
-#endif /* _PR_INET6 */
-
-#endif /* _PR_HAVE_GETADDRINFO */
-
-/*
- * If getaddrinfo does not exist, then we will fall back on
- * PR_GetHostByName, which requires that we allocate a buffer for the 
- * PRHostEnt data structure and its members.
- */
-typedef struct PRAddrInfoFB {
-    char      buf[PR_NETDB_BUF_SIZE];
-    PRHostEnt hostent;
-    PRBool    has_cname;
-} PRAddrInfoFB;
-
-static PRAddrInfo *
-pr_GetAddrInfoByNameFB(const char  *hostname,
-                       PRUint16     af,
-                       PRIntn       flags)
-{
-    PRStatus rv;
-    PRAddrInfoFB *ai;
-    /* fallback on PR_GetHostByName */
-    ai = PR_NEW(PRAddrInfoFB);
-    if (!ai) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    rv = PR_GetHostByName(hostname, ai->buf, sizeof ai->buf, &ai->hostent);
-    if (rv == PR_FAILURE) {
-        PR_Free(ai);
-        return NULL;
-    }
-    ai->has_cname = !(flags & PR_AI_NOCANONNAME);
-
-    return (PRAddrInfo *) ai;
-}
-
-PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const char  *hostname,
-                                                PRUint16     af,
-                                                PRIntn       flags)
-{
-    /* restrict input to supported values */
-    if ((af != PR_AF_INET && af != PR_AF_UNSPEC) ||
-        (flags & ~ PR_AI_NOCANONNAME) != PR_AI_ADDRCONFIG) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return NULL;
-    }
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-#if !defined(_PR_HAVE_GETADDRINFO)
-    return pr_GetAddrInfoByNameFB(hostname, af, flags);
-#else
-#if defined(_PR_INET6_PROBE)
-    if (!_pr_ipv6_is_present) {
-        return pr_GetAddrInfoByNameFB(hostname, af, flags);
-    }
-#endif
-    {
-        PRADDRINFO *res, hints;
-        PRStatus rv;
-
-        /*
-         * we assume a RFC 2553 compliant getaddrinfo.  this may at some
-         * point need to be customized as platforms begin to adopt the
-         * RFC 3493.
-         */
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME;
-        hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC;
-
-        /*
-         * it is important to select a socket type in the hints, otherwise we
-         * will get back repetitive entries: one for each socket type.  since
-         * we do not expose ai_socktype through our API, it is okay to do this
-         * here.  the application may still choose to create a socket of some
-         * other type.
-         */
-        hints.ai_socktype = SOCK_STREAM;
-
-        rv = GETADDRINFO(hostname, NULL, &hints, &res);
-        if (rv == 0)
-            return (PRAddrInfo *) res;
-
-        PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, rv);
-    }
-    return NULL;
-#endif
-}
-
-PR_IMPLEMENT(void) PR_FreeAddrInfo(PRAddrInfo *ai)
-{
-#if defined(_PR_HAVE_GETADDRINFO)
-#if defined(_PR_INET6_PROBE)
-    if (!_pr_ipv6_is_present)
-        PR_Free((PRAddrInfoFB *) ai);
-    else
-#endif
-        FREEADDRINFO((PRADDRINFO *) ai);
-#else
-    PR_Free((PRAddrInfoFB *) ai);
-#endif
-}
-
-PR_IMPLEMENT(void *) PR_EnumerateAddrInfo(void             *iterPtr,
-                                          const PRAddrInfo *base,
-                                          PRUint16          port,
-                                          PRNetAddr        *result)
-{
-#if defined(_PR_HAVE_GETADDRINFO)
-    PRADDRINFO *ai;
-#if defined(_PR_INET6_PROBE)
-    if (!_pr_ipv6_is_present) {
-        /* using PRAddrInfoFB */
-        PRIntn iter = (PRIntn)(PRPtrdiff) iterPtr;
-        iter = PR_EnumerateHostEnt(iter, &((PRAddrInfoFB *) base)->hostent, port, result);
-        if (iter < 0)
-            iter = 0;
-        return (void *)(PRPtrdiff) iter;
-    }
-#endif
-
-    if (iterPtr)
-        ai = ((PRADDRINFO *) iterPtr)->ai_next;
-    else
-        ai = (PRADDRINFO *) base;
-
-    if (ai) {
-        /* copy sockaddr to PRNetAddr */
-        memcpy(result, ai->ai_addr, ai->ai_addrlen);
-        result->raw.family = ai->ai_addr->sa_family;
-        if (ai->ai_addrlen < sizeof(PRNetAddr))
-            memset(((char*)result)+ai->ai_addrlen, 0, sizeof(PRNetAddr) - ai->ai_addrlen);
-
-        if (result->raw.family == PR_AF_INET)
-            result->inet.port = htons(port);
-        else
-            result->ipv6.port = htons(port);
-    }
-
-    return ai;
-#else
-    /* using PRAddrInfoFB */
-    PRIntn iter = (PRIntn) iterPtr;
-    iter = PR_EnumerateHostEnt(iter, &((PRAddrInfoFB *) base)->hostent, port, result);
-    if (iter < 0)
-        iter = 0;
-    return (void *) iter;
-#endif
-}
-
-PR_IMPLEMENT(const char *) PR_GetCanonNameFromAddrInfo(const PRAddrInfo *ai)
-{
-#if defined(_PR_HAVE_GETADDRINFO)
-#if defined(_PR_INET6_PROBE)
-    if (!_pr_ipv6_is_present) {
-        const PRAddrInfoFB *fb = (const PRAddrInfoFB *) ai;
-        return fb->has_cname ? fb->hostent.h_name : NULL;
-    } 
-#endif
-    return ((const PRADDRINFO *) ai)->ai_canonname;
-#else
-    const PRAddrInfoFB *fb = (const PRAddrInfoFB *) ai;
-    return fb->has_cname ? fb->hostent.h_name : NULL;
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prolock.c b/libs/js/nsprpub/pr/src/misc/prolock.c
deleted file mode 100644
index f7339bacd7..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prolock.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-**  prolock.c -- NSPR Ordered Lock
-** 
-**  Implement the API defined in prolock.h
-** 
-*/
-#include "prolock.h"
-#include "prlog.h"
-#include "prerror.h"
-
-PR_IMPLEMENT(PROrderedLock *) 
-    PR_CreateOrderedLock( 
-        PRInt32 order,
-        const char *name
-)
-{
-#ifdef XP_MAC
-#pragma unused( order, name )
-#endif
-    PR_ASSERT(!"Not implemented"); /* Not implemented yet */
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-} /*  end PR_CreateOrderedLock() */
-
-
-PR_IMPLEMENT(void) 
-    PR_DestroyOrderedLock( 
-        PROrderedLock *lock 
-)
-{
-#ifdef XP_MAC
-#pragma unused( lock )
-#endif
-    PR_ASSERT(!"Not implemented"); /* Not implemented yet */
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-} /*  end PR_DestroyOrderedLock() */
-
-
-PR_IMPLEMENT(void) 
-    PR_LockOrderedLock( 
-        PROrderedLock *lock 
-)
-{
-#ifdef XP_MAC
-#pragma unused( lock )
-#endif
-    PR_ASSERT(!"Not implemented"); /* Not implemented yet */
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-} /*  end PR_LockOrderedLock() */
-
-
-PR_IMPLEMENT(PRStatus) 
-    PR_UnlockOrderedLock( 
-        PROrderedLock *lock 
-)
-{
-#ifdef XP_MAC
-#pragma unused( lock )
-#endif
-    PR_ASSERT(!"Not implemented"); /* Not implemented yet */
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-} /*  end PR_UnlockOrderedLock() */
diff --git a/libs/js/nsprpub/pr/src/misc/prrng.c b/libs/js/nsprpub/pr/src/misc/prrng.c
deleted file mode 100644
index 6cd7e23954..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prrng.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/*
- * We were not including <string.h> in optimized builds.  On AIX this
- * caused libnspr4.so to export memcpy and some binaries linked with
- * libnspr4.so resolved their memcpy references with libnspr4.so.  To
- * be backward compatible with old libnspr4.so binaries, we do not
- * include <string.h> in optimized builds for AIX.  (bug 200561)
- */
-#if !(defined(AIX) && !defined(DEBUG))
-#include <string.h>
-#endif
-
-PRSize _pr_CopyLowBits( 
-    void *dst, 
-    PRSize dstlen, 
-    void *src, 
-    PRSize srclen )
-{
-    if (srclen <= dstlen) {
-    	memcpy(dst, src, srclen);
-	    return srclen;
-    }
-#if defined IS_BIG_ENDIAN
-    memcpy(dst, (char*)src + (srclen - dstlen), dstlen);
-#else
-    memcpy(dst, src, dstlen);
-#endif
-    return dstlen;
-}    
-
-PR_IMPLEMENT(PRSize) PR_GetRandomNoise( 
-    void    *buf,
-    PRSize  size
-)
-{
-    return( _PR_MD_GET_RANDOM_NOISE( buf, size ));
-} /* end PR_GetRandomNoise() */
-/* end prrng.c */
diff --git a/libs/js/nsprpub/pr/src/misc/prsystem.c b/libs/js/nsprpub/pr/src/misc/prsystem.c
deleted file mode 100644
index 1c6c2825be..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prsystem.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include "prsystem.h"
-#include "prprf.h"
-#include "prlong.h"
-
-#if defined(BEOS)
-#include <kernel/OS.h>
-#endif
-
-#if defined(OS2)
-#define INCL_DOS
-#define INCL_DOSMISC
-#include <os2.h>
-/* define the required constant if it is not already defined in the headers */
-#ifndef QSV_NUMPROCESSORS
-#define QSV_NUMPROCESSORS 26
-#endif
-#endif
-
-/* BSD-derived systems use sysctl() to get the number of processors */
-#if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
-    || defined(OPENBSD) || defined(DARWIN)
-#define _PR_HAVE_SYSCTL
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#endif
-
-#if defined(DARWIN)
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#endif
-
-#if defined(HPUX)
-#include <sys/mpctl.h>
-#include <sys/pstat.h>
-#endif
-
-#if defined(XP_UNIX)
-#include <unistd.h>
-#include <sys/utsname.h>
-#endif
-
-#if defined(AIX)
-#include <cf.h>
-#include <sys/cfgodm.h>
-#endif
-
-#if defined(WIN32)
-/* This struct is not present in VC6 headers, so declare it here */
-typedef struct {
-    DWORD dwLength;
-    DWORD dwMemoryLoad;
-    DWORDLONG ullTotalPhys;
-    DWORDLONG ullAvailPhys;
-    DWORDLONG ullToalPageFile;
-    DWORDLONG ullAvailPageFile;
-    DWORDLONG ullTotalVirtual;
-    DWORDLONG ullAvailVirtual;
-    DWORDLONG ullAvailExtendedVirtual;
-} PR_MEMORYSTATUSEX;
-
-/* Typedef for dynamic lookup of GlobalMemoryStatusEx(). */
-typedef BOOL (WINAPI *GlobalMemoryStatusExFn)(PR_MEMORYSTATUSEX *);
-#endif
-
-PR_IMPLEMENT(char) PR_GetDirectorySeparator(void)
-{
-    return PR_DIRECTORY_SEPARATOR;
-}  /* PR_GetDirectorySeparator */
-
-/*
-** OBSOLETE -- the function name is misspelled.
-*/
-PR_IMPLEMENT(char) PR_GetDirectorySepartor(void)
-{
-#if defined(DEBUG)
-    static PRBool warn = PR_TRUE;
-    if (warn) {
-        warn = _PR_Obsolete("PR_GetDirectorySepartor()",
-                "PR_GetDirectorySeparator()");
-    }
-#endif
-    return PR_GetDirectorySeparator();
-}  /* PR_GetDirectorySepartor */
-
-PR_IMPLEMENT(char) PR_GetPathSeparator(void)
-{
-    return PR_PATH_SEPARATOR;
-}  /* PR_GetPathSeparator */
-
-PR_IMPLEMENT(PRStatus) PR_GetSystemInfo(PRSysInfo cmd, char *buf, PRUint32 buflen)
-{
-    PRUintn len = 0;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    switch(cmd)
-    {
-      case PR_SI_HOSTNAME:
-      case PR_SI_HOSTNAME_UNTRUNCATED:
-        if (PR_FAILURE == _PR_MD_GETHOSTNAME(buf, (PRUintn)buflen))
-            return PR_FAILURE;
-
-        if (cmd == PR_SI_HOSTNAME_UNTRUNCATED)
-            break;
-        /*
-         * On some platforms a system does not have a hostname and
-         * its IP address is returned instead.   The following code
-         * should be skipped on those platforms.
-         */
-#ifndef _PR_GET_HOST_ADDR_AS_NAME
-        /* Return the unqualified hostname */
-            while (buf[len] && (len < buflen)) {
-                if (buf[len] == '.') {
-                    buf[len] = '\0';
-                    break;
-                }
-                len += 1;
-            }    
-#endif
-         break;
-
-      case PR_SI_SYSNAME:
-        /* Return the operating system name */
-#if defined(XP_UNIX) || defined(WIN32)
-        if (PR_FAILURE == _PR_MD_GETSYSINFO(cmd, buf, (PRUintn)buflen))
-            return PR_FAILURE;
-#else
-        (void)PR_snprintf(buf, buflen, _PR_SI_SYSNAME);
-#endif
-        break;
-
-      case PR_SI_RELEASE:
-        /* Return the version of the operating system */
-#if defined(XP_UNIX) || defined(WIN32)
-        if (PR_FAILURE == _PR_MD_GETSYSINFO(cmd, buf, (PRUintn)buflen))
-            return PR_FAILURE;
-#endif
-#if defined(XP_OS2)
-        {
-            ULONG os2ver[2] = {0};
-            DosQuerySysInfo(QSV_VERSION_MINOR, QSV_VERSION_REVISION,
-                            &os2ver, sizeof(os2ver));
-            /* Formatting for normal usage (2.11, 3.0, 4.0, 4.5); officially,
-               Warp 4 is version 2.40.00, WSeB 2.45.00 */
-            if (os2ver[0] < 30)
-              (void)PR_snprintf(buf, buflen, "%s%lu",
-                                "2.", os2ver[0]);
-            else if (os2ver[0] < 45)
-              (void)PR_snprintf(buf, buflen, "%lu%s%lu",
-                                os2ver[0]/10, ".", os2ver[1]);
-            else
-              (void)PR_snprintf(buf, buflen, "%.1f",
-                                os2ver[0]/10.0);
-        }
-#endif /* OS2 */
-        break;
-
-      case PR_SI_ARCHITECTURE:
-        /* Return the architecture of the machine (ie. x86, mips, alpha, ...)*/
-        (void)PR_snprintf(buf, buflen, _PR_SI_ARCHITECTURE);
-        break;
-	  default:
-			PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-			return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-/*
-** PR_GetNumberOfProcessors()
-** 
-** Implementation notes:
-**   Every platform does it a bit different.
-**     numCpus is the returned value.
-**   for each platform's "if defined" section
-**     declare your local variable
-**     do your thing, assign to numCpus
-**   order of the if defined()s may be important,
-**     especially for unix variants. Do platform
-**     specific implementations before XP_UNIX.
-** 
-*/
-PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors( void )
-{
-    PRInt32     numCpus;
-#if defined(WIN32)
-    SYSTEM_INFO     info;
-
-    GetSystemInfo( &info );
-    numCpus = info.dwNumberOfProcessors;
-#elif defined(XP_MAC)
-/* Hard-code the number of processors to 1 on the Mac
-** MacOS/9 will always be 1. The MPProcessors() call is for
-** MacOS/X, when issued. Leave it commented out for now. */
-/*  numCpus = MPProcessors(); */
-    numCpus = 1;
-#elif defined(BEOS)
-    system_info sysInfo;
-
-    get_system_info(&sysInfo);
-    numCpus = sysInfo.cpu_count;
-#elif defined(OS2)
-    DosQuerySysInfo( QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &numCpus, sizeof(numCpus));
-#elif defined(_PR_HAVE_SYSCTL)
-    int mib[2];
-    int rc;
-    size_t len = sizeof(numCpus);
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    rc = sysctl( mib, 2, &numCpus, &len, NULL, 0 );
-    if ( -1 == rc )  {
-        numCpus = -1; /* set to -1 for return value on error */
-        _PR_MD_MAP_DEFAULT_ERROR( _MD_ERRNO() );
-    }
-#elif defined(HPUX)
-    numCpus = mpctl( MPC_GETNUMSPUS, 0, 0 );
-    if ( numCpus < 1 )  {
-        numCpus = -1; /* set to -1 for return value on error */
-        _PR_MD_MAP_DEFAULT_ERROR( _MD_ERRNO() );
-    }
-#elif defined(IRIX)
-    numCpus = sysconf( _SC_NPROC_ONLN );
-#elif defined(RISCOS)
-    numCpus = 1;
-#elif defined(XP_UNIX)
-    numCpus = sysconf( _SC_NPROCESSORS_ONLN );
-#else
-#error "An implementation is required"
-#endif
-    return(numCpus);
-} /* end PR_GetNumberOfProcessors() */
-
-/*
-** PR_GetPhysicalMemorySize()
-** 
-** Implementation notes:
-**   Every platform does it a bit different.
-**     bytes is the returned value.
-**   for each platform's "if defined" section
-**     declare your local variable
-**     do your thing, assign to bytes.
-** 
-*/
-PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void)
-{
-    PRUint64 bytes = 0;
-
-#if defined(LINUX) || defined(SOLARIS)
-
-    long pageSize = sysconf(_SC_PAGESIZE);
-    long pageCount = sysconf(_SC_PHYS_PAGES);
-    bytes = (PRUint64) pageSize * pageCount;
-
-#elif defined(HPUX)
-
-    struct pst_static info;
-    int result = pstat_getstatic(&info, sizeof(info), 1, 0);
-    if (result == 1)
-        bytes = (PRUint64) info.physical_memory * info.page_size;
-
-#elif defined(DARWIN)
-
-    struct host_basic_info hInfo;
-    mach_msg_type_number_t count;
-
-    int result = host_info(mach_host_self(),
-                           HOST_BASIC_INFO,
-                           (host_info_t) &hInfo,
-                           &count);
-    if (result == KERN_SUCCESS)
-        bytes = hInfo.memory_size;
-
-#elif defined(WIN32)
-
-    /* Try to use the newer GlobalMemoryStatusEx API for Windows 2000+. */
-    GlobalMemoryStatusExFn globalMemory = (GlobalMemoryStatusExFn) NULL;
-    HMODULE module = GetModuleHandle("kernel32.dll");
-
-    if (module) {
-        globalMemory = (GlobalMemoryStatusExFn)GetProcAddress(module, "GlobalMemoryStatusEx");
-
-        if (globalMemory) {
-            PR_MEMORYSTATUSEX memStat;
-            memStat.dwLength = sizeof(memStat);
-
-            if (globalMemory(&memStat))
-                bytes = memStat.ullTotalPhys;
-        }
-    }
-
-    if (!bytes) {
-        /* Fall back to the older API. */
-        MEMORYSTATUS memStat;
-        memset(&memStat, 0, sizeof(memStat));
-        GlobalMemoryStatus(&memStat);
-        bytes = memStat.dwTotalPhys;
-    }
-
-#elif defined(OS2)
-
-    ULONG ulPhysMem;
-    DosQuerySysInfo(QSV_TOTPHYSMEM,
-                    QSV_TOTPHYSMEM,
-                    &ulPhysMem,
-                    sizeof(ulPhysMem));
-    bytes = ulPhysMem;
-
-#elif defined(AIX)
-
-    if (odm_initialize() == 0) {
-        int how_many;
-        struct CuAt *obj = getattr("sys0", "realmem", 0, &how_many);
-        if (obj != NULL) {
-            bytes = (PRUint64) atoi(obj->value) * 1024;
-            free(obj);
-        }
-        odm_terminate();
-    }
-
-#else
-
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-
-#endif
-
-    return bytes;
-} /* end PR_GetPhysicalMemorySize() */
diff --git a/libs/js/nsprpub/pr/src/misc/prthinfo.c b/libs/js/nsprpub/pr/src/misc/prthinfo.c
deleted file mode 100644
index 76c4488846..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prthinfo.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prlog.h"
-#include "prthread.h"
-#ifdef XP_MAC
-#include "pprthred.h"
-#else
-#include "private/pprthred.h"
-#endif
-#include "primpl.h"
-
-PR_IMPLEMENT(PRWord *)
-PR_GetGCRegisters(PRThread *t, int isCurrent, int *np)
-{
-    return _MD_HomeGCRegisters(t, isCurrent, np);
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_ThreadScanStackPointers(PRThread* t,
-                           PRScanStackFun scanFun, void* scanClosure)
-{
-    PRThread* current = PR_GetCurrentThread();
-    PRWord *sp, *esp, *p0;
-    int n;
-    void **ptd;
-    PRStatus status;
-    PRUint32 index;
-    int stack_end;
-
-    /*
-    ** Store the thread's registers in the thread structure so the GC
-    ** can scan them. Then scan them.
-    */
-    p0 = _MD_HomeGCRegisters(t, t == current, &n);
-    status = scanFun(t, (void**)p0, n, scanClosure);
-    if (status != PR_SUCCESS)
-        return status;
-
-    /* Scan the C stack for pointers into the GC heap */
-#if defined(XP_PC) && defined(WIN16)
-    /*
-    ** Under WIN16, the stack of the current thread is always mapped into
-    ** the "task stack" (at SS:xxxx).  So, if t is the current thread, scan
-    ** the "task stack".  Otherwise, scan the "cached stack" of the inactive
-    ** thread...
-    */
-    if (t == current) {
-        sp  = (PRWord*) &stack_end;
-        esp = (PRWord*) _pr_top_of_task_stack;
-
-        PR_ASSERT(sp <= esp);
-    } else {
-        sp  = (PRWord*) PR_GetSP(t);
-        esp = (PRWord*) t->stack->stackTop;
-
-        PR_ASSERT((t->stack->stackSize == 0) ||
-                  ((sp >  (PRWord*)t->stack->stackBottom) &&
-                   (sp <= (PRWord*)t->stack->stackTop)));
-    }
-#else   /* ! WIN16 */
-#ifdef HAVE_STACK_GROWING_UP
-    if (t == current) {
-        esp = (PRWord*) &stack_end;
-    } else {
-        esp = (PRWord*) PR_GetSP(t);
-    }
-    sp = (PRWord*) t->stack->stackTop;
-    if (t->stack->stackSize) {
-        PR_ASSERT((esp > (PRWord*)t->stack->stackTop) &&
-                  (esp < (PRWord*)t->stack->stackBottom));
-    }
-#else   /* ! HAVE_STACK_GROWING_UP */
-    if (t == current) {
-        sp = (PRWord*) &stack_end;
-    } else {
-        sp = (PRWord*) PR_GetSP(t);
-    }
-    esp = (PRWord*) t->stack->stackTop;
-    if (t->stack->stackSize) {
-        PR_ASSERT((sp > (PRWord*)t->stack->stackBottom) &&
-                  (sp < (PRWord*)t->stack->stackTop));
-    }
-#endif  /* ! HAVE_STACK_GROWING_UP */
-#endif  /* ! WIN16 */
-
-#if defined(WIN16)
-    {
-        prword_t scan;
-        prword_t limit;
-        
-        scan = (prword_t) sp;
-        limit = (prword_t) esp;
-        while (scan < limit) {
-            prword_t *test;
-
-            test = *((prword_t **)scan);
-            status = scanFun(t, (void**)&test, 1, scanClosure);
-            if (status != PR_SUCCESS)
-                return status;
-            scan += sizeof(char);
-        }
-    }
-#else
-    if (sp < esp) {
-        status = scanFun(t, (void**)sp, esp - sp, scanClosure);
-        if (status != PR_SUCCESS)
-            return status;
-    }
-#endif
-
-    /*
-    ** Mark all of the per-thread-data items attached to this thread
-    **
-    ** The execution environment better be accounted for otherwise it
-    ** will be collected
-    */
-    status = scanFun(t, (void**)&t->environment, 1, scanClosure);
-    if (status != PR_SUCCESS)
-        return status;
-
-#ifndef GC_LEAK_DETECTOR
-    /* if thread is not allocated on stack, this is redundant. */
-    ptd = t->privateData;
-    for (index = 0; index < t->tpdLength; index++, ptd++) {
-        status = scanFun(t, (void**)ptd, 1, scanClosure);
-        if (status != PR_SUCCESS)
-            return status;
-    }
-#endif
-    
-    return PR_SUCCESS;
-}
-
-/* transducer for PR_EnumerateThreads */
-typedef struct PRScanStackData {
-    PRScanStackFun      scanFun;
-    void*               scanClosure;
-} PRScanStackData;
-
-static PRStatus PR_CALLBACK
-pr_ScanStack(PRThread* t, int i, void* arg)
-{
-#if defined(XP_MAC)
-#pragma unused (i)
-#endif
-    PRScanStackData* data = (PRScanStackData*)arg;
-    return PR_ThreadScanStackPointers(t, data->scanFun, data->scanClosure);
-}
-
-PR_IMPLEMENT(PRStatus)
-PR_ScanStackPointers(PRScanStackFun scanFun, void* scanClosure)
-{
-    PRScanStackData data;
-    data.scanFun = scanFun;
-    data.scanClosure = scanClosure;
-    return PR_EnumerateThreads(pr_ScanStack, &data);
-}
-
-PR_IMPLEMENT(PRUword)
-PR_GetStackSpaceLeft(PRThread* t)
-{
-    PRThread *current = PR_GetCurrentThread();
-    PRWord *sp, *esp;
-    int stack_end;
-
-#if defined(WIN16)
-    /*
-    ** Under WIN16, the stack of the current thread is always mapped into
-    ** the "task stack" (at SS:xxxx).  So, if t is the current thread, scan
-    ** the "task stack".  Otherwise, scan the "cached stack" of the inactive
-    ** thread...
-    */
-    if (t == current) {
-        sp  = (PRWord*) &stack_end;
-        esp = (PRWord*) _pr_top_of_task_stack;
-
-        PR_ASSERT(sp <= esp);
-    } else {
-        sp  = (PRWord*) PR_GetSP(t);
-        esp = (PRWord*) t->stack->stackTop;
-
-	PR_ASSERT((t->stack->stackSize == 0) ||
-                 ((sp >  (PRWord*)t->stack->stackBottom) &&
-		  (sp <= (PRWord*)t->stack->stackTop)));
-    }
-#else   /* ! WIN16 */
-#ifdef HAVE_STACK_GROWING_UP
-    if (t == current) {
-        esp = (PRWord*) &stack_end;
-    } else {
-        esp = (PRWord*) PR_GetSP(t);
-    }
-    sp = (PRWord*) t->stack->stackTop;
-    if (t->stack->stackSize) {
-        PR_ASSERT((esp > (PRWord*)t->stack->stackTop) &&
-                  (esp < (PRWord*)t->stack->stackBottom));
-    }
-#else   /* ! HAVE_STACK_GROWING_UP */
-    if (t == current) {
-        sp = (PRWord*) &stack_end;
-    } else {
-        sp = (PRWord*) PR_GetSP(t);
-    }
-    esp = (PRWord*) t->stack->stackTop;
-    if (t->stack->stackSize) {
-	PR_ASSERT((sp > (PRWord*)t->stack->stackBottom) &&
-		  (sp < (PRWord*)t->stack->stackTop));
-    }
-#endif  /* ! HAVE_STACK_GROWING_UP */
-#endif  /* ! WIN16 */
-    return (PRUword)t->stack->stackSize - ((PRWord)esp - (PRWord)sp);
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prtime.c b/libs/js/nsprpub/pr/src/misc/prtime.c
deleted file mode 100644
index 67aa2332b0..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prtime.c
+++ /dev/null
@@ -1,1961 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * prtime.c --
- *
- *     NSPR date and time functions
- *
- */
-
-#include "prinit.h"
-#include "prtime.h"
-#include "prlock.h"
-#include "prprf.h"
-#include "prlog.h"
-
-#include <string.h>
-#include <ctype.h>
-
-#ifdef XP_MAC
-#include <time.h>
-#endif
-
-/* 
- * The COUNT_LEAPS macro counts the number of leap years passed by
- * till the start of the given year Y.  At the start of the year 4
- * A.D. the number of leap years passed by is 0, while at the start of
- * the year 5 A.D. this count is 1. The number of years divisible by
- * 100 but not divisible by 400 (the non-leap years) is deducted from
- * the count to get the correct number of leap years.
- *
- * The COUNT_DAYS macro counts the number of days since 01/01/01 till the
- * start of the given year Y. The number of days at the start of the year
- * 1 is 0 while the number of days at the start of the year 2 is 365
- * (which is ((2)-1) * 365) and so on. The reference point is 01/01/01
- * midnight 00:00:00.
- */
-
-#define COUNT_LEAPS(Y)   ( ((Y)-1)/4 - ((Y)-1)/100 + ((Y)-1)/400 )
-#define COUNT_DAYS(Y)  ( ((Y)-1)*365 + COUNT_LEAPS(Y) )
-#define DAYS_BETWEEN_YEARS(A, B)  (COUNT_DAYS(B) - COUNT_DAYS(A))
-
-
-
-
-/*
- * Static variables used by functions in this file
- */
-
-/*
- * The following array contains the day of year for the last day of
- * each month, where index 1 is January, and day 0 is January 1.
- */
-
-static const int lastDayOfMonth[2][13] = {
-    {-1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364},
-    {-1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365}
-};
-
-/*
- * The number of days in a month
- */
-
-static const PRInt8 nDays[2][12] = {
-    {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-    {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-};
-
-/*
- * Declarations for internal functions defined later in this file.
- */
-
-static void        ComputeGMT(PRTime time, PRExplodedTime *gmt);
-static int        IsLeapYear(PRInt16 year);
-static void        ApplySecOffset(PRExplodedTime *time, PRInt32 secOffset);
-
-/*
- *------------------------------------------------------------------------
- *
- * ComputeGMT --
- *
- *     Caveats:
- *     - we ignore leap seconds
- *     - our leap-year calculation is only correct for years 1901-2099
- *
- *------------------------------------------------------------------------
- */
-
-static void
-ComputeGMT(PRTime time, PRExplodedTime *gmt)
-{
-    PRInt32 tmp, rem;
-    PRInt32 numDays;
-    PRInt64 numDays64, rem64;
-    int isLeap;
-    PRInt64 sec;
-    PRInt64 usec;
-    PRInt64 usecPerSec;
-    PRInt64 secPerDay;
-
-    /*
-     * We first do the usec, sec, min, hour thing so that we do not
-     * have to do LL arithmetic.
-     */
-
-    LL_I2L(usecPerSec, 1000000L);
-    LL_DIV(sec, time, usecPerSec);
-    LL_MOD(usec, time, usecPerSec);
-    LL_L2I(gmt->tm_usec, usec);
-    /* Correct for weird mod semantics so the remainder is always positive */
-    if (gmt->tm_usec < 0) {
-        PRInt64 one;
-
-        LL_I2L(one, 1L);
-        LL_SUB(sec, sec, one);
-        gmt->tm_usec += 1000000L;
-    }
-
-    LL_I2L(secPerDay, 86400L);
-    LL_DIV(numDays64, sec, secPerDay);
-    LL_MOD(rem64, sec, secPerDay);
-    /* We are sure both of these numbers can fit into PRInt32 */
-    LL_L2I(numDays, numDays64);
-    LL_L2I(rem, rem64);
-    if (rem < 0) {
-        numDays--;
-        rem += 86400L;
-    }
-
-    /* Compute day of week.  Epoch started on a Thursday. */
-
-    gmt->tm_wday = (numDays + 4) % 7;
-    if (gmt->tm_wday < 0) {
-        gmt->tm_wday += 7;
-    }
-
-    /* Compute the time of day. */
-    
-    gmt->tm_hour = rem / 3600;
-    rem %= 3600;
-    gmt->tm_min = rem / 60;
-    gmt->tm_sec = rem % 60;
-
-    /* Compute the four-year span containing the specified time */
-
-    tmp = numDays / (4 * 365 + 1);
-    rem = numDays % (4 * 365 + 1);
-
-    if (rem < 0) {
-        tmp--;
-        rem += (4 * 365 + 1);
-    }
-
-    /*
-     * Compute the year after 1900 by taking the four-year span and
-     * adjusting for the remainder.  This works because 2000 is a 
-     * leap year, and 1900 and 2100 are out of the range.
-     */
-    
-    tmp = (tmp * 4) + 1970;
-    isLeap = 0;
-
-    /*
-     * 1970 has 365 days
-     * 1971 has 365 days
-     * 1972 has 366 days (leap year)
-     * 1973 has 365 days
-     */
-
-    if (rem >= 365) {                                /* 1971, etc. */
-        tmp++;
-        rem -= 365;
-        if (rem >= 365) {                        /* 1972, etc. */
-            tmp++;
-            rem -= 365;
-            if (rem >= 366) {                        /* 1973, etc. */
-                tmp++;
-                rem -= 366;
-            } else {
-                isLeap = 1;
-            }
-        }
-    }
-
-    gmt->tm_year = tmp;
-    gmt->tm_yday = rem;
-
-    /* Compute the month and day of month. */
-
-    for (tmp = 1; lastDayOfMonth[isLeap][tmp] < gmt->tm_yday; tmp++) {
-    }
-    gmt->tm_month = --tmp;
-    gmt->tm_mday = gmt->tm_yday - lastDayOfMonth[isLeap][tmp];
-
-    gmt->tm_params.tp_gmt_offset = 0;
-    gmt->tm_params.tp_dst_offset = 0;
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * PR_ExplodeTime --
- *
- *     Cf. struct tm *gmtime(const time_t *tp) and
- *         struct tm *localtime(const time_t *tp)
- *
- *------------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(void)
-PR_ExplodeTime(
-        PRTime usecs,
-        PRTimeParamFn params,
-        PRExplodedTime *exploded)
-{
-    ComputeGMT(usecs, exploded);
-    exploded->tm_params = params(exploded);
-    ApplySecOffset(exploded, exploded->tm_params.tp_gmt_offset
-            + exploded->tm_params.tp_dst_offset);
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * PR_ImplodeTime --
- *
- *     Cf. time_t mktime(struct tm *tp)
- *     Note that 1 year has < 2^25 seconds.  So an PRInt32 is large enough.
- *
- *------------------------------------------------------------------------
- */
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-PR_IMPLEMENT(PRTime)
-#endif
-PR_ImplodeTime(const PRExplodedTime *exploded)
-{
-    PRExplodedTime copy;
-    PRTime retVal;
-    PRInt64 secPerDay, usecPerSec;
-    PRInt64 temp;
-    PRInt64 numSecs64;
-    PRInt32 numDays;
-    PRInt32 numSecs;
-
-    /* Normalize first.  Do this on our copy */
-    copy = *exploded;
-    PR_NormalizeTime(&copy, PR_GMTParameters);
-
-    numDays = DAYS_BETWEEN_YEARS(1970, copy.tm_year);
-    
-    numSecs = copy.tm_yday * 86400 + copy.tm_hour * 3600
-            + copy.tm_min * 60 + copy.tm_sec;
-
-    LL_I2L(temp, numDays);
-    LL_I2L(secPerDay, 86400);
-    LL_MUL(temp, temp, secPerDay);
-    LL_I2L(numSecs64, numSecs);
-    LL_ADD(numSecs64, numSecs64, temp);
-
-    /* apply the GMT and DST offsets */
-    LL_I2L(temp,  copy.tm_params.tp_gmt_offset);
-    LL_SUB(numSecs64, numSecs64, temp);
-    LL_I2L(temp,  copy.tm_params.tp_dst_offset);
-    LL_SUB(numSecs64, numSecs64, temp);
-
-    LL_I2L(usecPerSec, 1000000L);
-    LL_MUL(temp, numSecs64, usecPerSec);
-    LL_I2L(retVal, copy.tm_usec);
-    LL_ADD(retVal, retVal, temp);
-
-    return retVal;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * IsLeapYear --
- *
- *     Returns 1 if the year is a leap year, 0 otherwise.
- *
- *-------------------------------------------------------------------------
- */
-
-static int IsLeapYear(PRInt16 year)
-{
-    if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-        return 1;
-    else
-        return 0;
-}
-
-/*
- * 'secOffset' should be less than 86400 (i.e., a day).
- * 'time' should point to a normalized PRExplodedTime.
- */
-
-static void
-ApplySecOffset(PRExplodedTime *time, PRInt32 secOffset)
-{
-    time->tm_sec += secOffset;
-
-    /* Note that in this implementation we do not count leap seconds */
-    if (time->tm_sec < 0 || time->tm_sec >= 60) {
-        time->tm_min += time->tm_sec / 60;
-        time->tm_sec %= 60;
-        if (time->tm_sec < 0) {
-            time->tm_sec += 60;
-            time->tm_min--;
-        }
-    }
-
-    if (time->tm_min < 0 || time->tm_min >= 60) {
-        time->tm_hour += time->tm_min / 60;
-        time->tm_min %= 60;
-        if (time->tm_min < 0) {
-            time->tm_min += 60;
-            time->tm_hour--;
-        }
-    }
-
-    if (time->tm_hour < 0) {
-        /* Decrement mday, yday, and wday */
-        time->tm_hour += 24;
-        time->tm_mday--;
-        time->tm_yday--;
-        if (time->tm_mday < 1) {
-            time->tm_month--;
-            if (time->tm_month < 0) {
-                time->tm_month = 11;
-                time->tm_year--;
-                if (IsLeapYear(time->tm_year))
-                    time->tm_yday = 365;
-                else
-                    time->tm_yday = 364;
-            }
-            time->tm_mday = nDays[IsLeapYear(time->tm_year)][time->tm_month];
-        }
-        time->tm_wday--;
-        if (time->tm_wday < 0)
-            time->tm_wday = 6;
-    } else if (time->tm_hour > 23) {
-        /* Increment mday, yday, and wday */
-        time->tm_hour -= 24;
-        time->tm_mday++;
-        time->tm_yday++;
-        if (time->tm_mday >
-                nDays[IsLeapYear(time->tm_year)][time->tm_month]) {
-            time->tm_mday = 1;
-            time->tm_month++;
-            if (time->tm_month > 11) {
-                time->tm_month = 0;
-                time->tm_year++;
-                time->tm_yday = 0;
-            }
-        }
-        time->tm_wday++;
-        if (time->tm_wday > 6)
-            time->tm_wday = 0;
-    }
-}
-
-PR_IMPLEMENT(void)
-PR_NormalizeTime(PRExplodedTime *time, PRTimeParamFn params)
-{
-    int daysInMonth;
-    PRInt32 numDays;
-
-    /* Get back to GMT */
-    time->tm_sec -= time->tm_params.tp_gmt_offset
-            + time->tm_params.tp_dst_offset;
-    time->tm_params.tp_gmt_offset = 0;
-    time->tm_params.tp_dst_offset = 0;
-
-    /* Now normalize GMT */
-
-    if (time->tm_usec < 0 || time->tm_usec >= 1000000) {
-        time->tm_sec +=  time->tm_usec / 1000000;
-        time->tm_usec %= 1000000;
-        if (time->tm_usec < 0) {
-            time->tm_usec += 1000000;
-            time->tm_sec--;
-        }
-    }
-
-    /* Note that we do not count leap seconds in this implementation */
-    if (time->tm_sec < 0 || time->tm_sec >= 60) {
-        time->tm_min += time->tm_sec / 60;
-        time->tm_sec %= 60;
-        if (time->tm_sec < 0) {
-            time->tm_sec += 60;
-            time->tm_min--;
-        }
-    }
-
-    if (time->tm_min < 0 || time->tm_min >= 60) {
-        time->tm_hour += time->tm_min / 60;
-        time->tm_min %= 60;
-        if (time->tm_min < 0) {
-            time->tm_min += 60;
-            time->tm_hour--;
-        }
-    }
-
-    if (time->tm_hour < 0 || time->tm_hour >= 24) {
-        time->tm_mday += time->tm_hour / 24;
-        time->tm_hour %= 24;
-        if (time->tm_hour < 0) {
-            time->tm_hour += 24;
-            time->tm_mday--;
-        }
-    }
-
-    /* Normalize month and year before mday */
-    if (time->tm_month < 0 || time->tm_month >= 12) {
-        time->tm_year += time->tm_month / 12;
-        time->tm_month %= 12;
-        if (time->tm_month < 0) {
-            time->tm_month += 12;
-            time->tm_year--;
-        }
-    }
-
-    /* Now that month and year are in proper range, normalize mday */
-
-    if (time->tm_mday < 1) {
-        /* mday too small */
-        do {
-            /* the previous month */
-            time->tm_month--;
-            if (time->tm_month < 0) {
-                time->tm_month = 11;
-                time->tm_year--;
-            }
-            time->tm_mday += nDays[IsLeapYear(time->tm_year)][time->tm_month];
-        } while (time->tm_mday < 1);
-    } else {
-        daysInMonth = nDays[IsLeapYear(time->tm_year)][time->tm_month];
-        while (time->tm_mday > daysInMonth) {
-            /* mday too large */
-            time->tm_mday -= daysInMonth;
-            time->tm_month++;
-            if (time->tm_month > 11) {
-                time->tm_month = 0;
-                time->tm_year++;
-            }
-            daysInMonth = nDays[IsLeapYear(time->tm_year)][time->tm_month];
-        }
-    }
-
-    /* Recompute yday and wday */
-    time->tm_yday = time->tm_mday +
-            lastDayOfMonth[IsLeapYear(time->tm_year)][time->tm_month];
-	    
-    numDays = DAYS_BETWEEN_YEARS(1970, time->tm_year) + time->tm_yday;
-    time->tm_wday = (numDays + 4) % 7;
-    if (time->tm_wday < 0) {
-        time->tm_wday += 7;
-    }
-
-    /* Recompute time parameters */
-
-    time->tm_params = params(time);
-
-    ApplySecOffset(time, time->tm_params.tp_gmt_offset
-            + time->tm_params.tp_dst_offset);
-}
-
-
-/*
- *-------------------------------------------------------------------------
- *
- * PR_LocalTimeParameters --
- * 
- *     returns the time parameters for the local time zone
- *
- *     The following uses localtime() from the standard C library.
- *     (time.h)  This is our fallback implementation.  Unix and PC
- *     use this version.  Mac has its own machine-dependent
- *     implementation of this function.
- *
- *-------------------------------------------------------------------------
- */
-
-#include <time.h>
-
-#if defined(HAVE_INT_LOCALTIME_R)
-
-/*
- * In this case we could define the macro as
- *     #define MT_safe_localtime(timer, result) \
- *             (localtime_r(timer, result) == 0 ? result : NULL)
- * I chose to compare the return value of localtime_r with -1 so 
- * that I can catch the cases where localtime_r returns a pointer
- * to struct tm.  The macro definition above would not be able to
- * detect such mistakes because it is legal to compare a pointer
- * with 0.
- */
-
-#define MT_safe_localtime(timer, result) \
-        (localtime_r(timer, result) == -1 ? NULL: result)
-
-#elif defined(HAVE_POINTER_LOCALTIME_R)
-
-#define MT_safe_localtime localtime_r
-
-#else
-
-#if defined(XP_MAC)
-extern struct tm *Maclocaltime(const time_t * t);
-#endif
-
-static PRLock *monitor = NULL;
-
-static struct tm *MT_safe_localtime(const time_t *clock, struct tm *result)
-{
-    struct tm *tmPtr;
-    int needLock = PR_Initialized();  /* We need to use a lock to protect
-                                       * against NSPR threads only when the
-                                       * NSPR thread system is activated. */
-
-    if (needLock) {
-        if (monitor == NULL) {
-            monitor = PR_NewLock();
-        }
-        PR_Lock(monitor);
-    }
-
-    /*
-     * Microsoft (all flavors) localtime() returns a NULL pointer if 'clock'
-     * represents a time before midnight January 1, 1970.  In
-     * that case, we also return a NULL pointer and the struct tm
-     * object pointed to by 'result' is not modified.
-     *
-     * Watcom C/C++ 11.0 localtime() treats time_t as unsigned long
-     * hence, does not recognize negative values of clock as pre-1/1/70.
-     * We have to manually check (WIN16 only) for negative value of
-     * clock and return NULL.
-     *
-     * With negative values of clock, emx returns the struct tm for
-     * clock plus ULONG_MAX. So we also have to check for the invalid
-     * structs returned for timezones west of Greenwich when clock == 0.
-     */
-    
-#if defined(XP_MAC)
-    tmPtr = Maclocaltime(clock);
-#else
-    tmPtr = localtime(clock);
-#endif
-
-#if defined(WIN16) || defined(XP_OS2_EMX)
-    if ( (PRInt32) *clock < 0 ||
-         ( (PRInt32) *clock == 0 && tmPtr->tm_year != 70))
-        result = NULL;
-    else
-        *result = *tmPtr;
-#else
-    if (tmPtr) {
-        *result = *tmPtr;
-    } else {
-        result = NULL;
-    }
-#endif /* WIN16 */
-
-    if (needLock) PR_Unlock(monitor);
-
-    return result;
-}
-
-#endif  /* definition of MT_safe_localtime() */
-
-#if defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS)
-
-PR_IMPLEMENT(PRTimeParameters)
-PR_LocalTimeParameters(const PRExplodedTime *gmt)
-{
-
-    PRTimeParameters retVal;
-    struct tm localTime;
-    time_t secs;
-    PRTime secs64;
-    PRInt64 usecPerSec;
-    PRInt64 usecPerSec_1;
-    PRInt64 maxInt32;
-    PRInt64 minInt32;
-    PRInt32 dayOffset;
-    PRInt32 offset2Jan1970;
-    PRInt32 offsetNew;
-    int isdst2Jan1970;
-
-    /*
-     * Calculate the GMT offset.  First, figure out what is
-     * 00:00:00 Jan. 2, 1970 GMT (which is exactly a day, or 86400
-     * seconds, since the epoch) in local time.  Then we calculate
-     * the difference between local time and GMT in seconds:
-     *     gmt_offset = local_time - GMT
-     *
-     * Caveat: the validity of this calculation depends on two
-     * assumptions:
-     * 1. Daylight saving time was not in effect on Jan. 2, 1970.
-     * 2. The time zone of the geographic location has not changed
-     *    since Jan. 2, 1970.
-     */
-
-    secs = 86400L;
-    (void) MT_safe_localtime(&secs, &localTime);
-
-    /* GMT is 00:00:00, 2nd of Jan. */
-
-    offset2Jan1970 = (PRInt32)localTime.tm_sec 
-            + 60L * (PRInt32)localTime.tm_min
-            + 3600L * (PRInt32)localTime.tm_hour
-            + 86400L * (PRInt32)((PRInt32)localTime.tm_mday - 2L);
-
-    isdst2Jan1970 = localTime.tm_isdst;
-
-    /*
-     * Now compute DST offset.  We calculate the overall offset
-     * of local time from GMT, similar to above.  The overall
-     * offset has two components: gmt offset and dst offset.
-     * We subtract gmt offset from the overall offset to get
-     * the dst offset.
-     *     overall_offset = local_time - GMT
-     *     overall_offset = gmt_offset + dst_offset
-     * ==> dst_offset = local_time - GMT - gmt_offset
-     */
-
-    secs64 = PR_ImplodeTime(gmt);    /* This is still in microseconds */
-    LL_I2L(usecPerSec, PR_USEC_PER_SEC);
-    LL_I2L(usecPerSec_1, PR_USEC_PER_SEC - 1);
-    /* Convert to seconds, truncating down (3.1 -> 3 and -3.1 -> -4) */
-    if (LL_GE_ZERO(secs64)) {
-        LL_DIV(secs64, secs64, usecPerSec);
-    } else {
-        LL_NEG(secs64, secs64);
-        LL_ADD(secs64, secs64, usecPerSec_1);
-        LL_DIV(secs64, secs64, usecPerSec);
-        LL_NEG(secs64, secs64);
-    }
-    LL_I2L(maxInt32, PR_INT32_MAX);
-    LL_I2L(minInt32, PR_INT32_MIN);
-    if (LL_CMP(secs64, >, maxInt32) || LL_CMP(secs64, <, minInt32)) {
-        /* secs64 is too large or too small for time_t (32-bit integer) */
-        retVal.tp_gmt_offset = offset2Jan1970;
-        retVal.tp_dst_offset = 0;
-        return retVal;
-    }
-    LL_L2I(secs, secs64);
-
-    /*
-     * On Windows, localtime() (and our MT_safe_localtime() too)
-     * returns a NULL pointer for time before midnight January 1,
-     * 1970 GMT.  In that case, we just use the GMT offset for
-     * Jan 2, 1970 and assume that DST was not in effect.
-     */
-
-    if (MT_safe_localtime(&secs, &localTime) == NULL) {
-        retVal.tp_gmt_offset = offset2Jan1970;
-        retVal.tp_dst_offset = 0;
-        return retVal;
-    }
-
-    /*
-     * dayOffset is the offset between local time and GMT in 
-     * the day component, which can only be -1, 0, or 1.  We
-     * use the day of the week to compute dayOffset.
-     */
-
-    dayOffset = (PRInt32) localTime.tm_wday - gmt->tm_wday;
-
-    /*
-     * Need to adjust for wrapping around of day of the week from
-     * 6 back to 0.
-     */
-
-    if (dayOffset == -6) {
-        /* Local time is Sunday (0) and GMT is Saturday (6) */
-        dayOffset = 1;
-    } else if (dayOffset == 6) {
-        /* Local time is Saturday (6) and GMT is Sunday (0) */
-        dayOffset = -1;
-    }
-
-    offsetNew = (PRInt32)localTime.tm_sec - gmt->tm_sec
-            + 60L * ((PRInt32)localTime.tm_min - gmt->tm_min)
-            + 3600L * ((PRInt32)localTime.tm_hour - gmt->tm_hour)
-            + 86400L * (PRInt32)dayOffset;
-
-    if (localTime.tm_isdst <= 0) {
-        /* DST is not in effect */
-        retVal.tp_gmt_offset = offsetNew;
-        retVal.tp_dst_offset = 0;
-    } else {
-        /* DST is in effect */
-        if (isdst2Jan1970 <=0) {
-            /*
-             * DST was not in effect back in 2 Jan. 1970.
-             * Use the offset back then as the GMT offset,
-             * assuming the time zone has not changed since then.
-             */
-            retVal.tp_gmt_offset = offset2Jan1970;
-            retVal.tp_dst_offset = offsetNew - offset2Jan1970;
-        } else {
-            /*
-             * DST was also in effect back in 2 Jan. 1970.
-             * Then our clever trick (or rather, ugly hack) fails.
-             * We will just assume DST offset is an hour.
-             */
-            retVal.tp_gmt_offset = offsetNew - 3600;
-            retVal.tp_dst_offset = 3600;
-        }
-    }
-    
-    return retVal;
-}
-
-#endif    /* defined(XP_UNIX) !! defined(XP_PC) */
-
-/*
- *------------------------------------------------------------------------
- *
- * PR_USPacificTimeParameters --
- *
- *     The time parameters function for the US Pacific Time Zone.
- *
- *------------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTimeParameters)
-PR_USPacificTimeParameters(const PRExplodedTime *gmt)
-{
-    PRTimeParameters retVal;
-    PRExplodedTime st;
-
-    /*
-     * Based on geographic location and GMT, figure out offset of
-     * standard time from GMT.  In this example implementation, we
-     * assume the local time zone is US Pacific Time.
-     */
-
-    retVal.tp_gmt_offset = -8L * 3600L;
-
-    /*
-     * Make a copy of GMT.  Note that the tm_params field of this copy
-     * is ignored.
-     */
-
-    st.tm_usec = gmt->tm_usec;
-    st.tm_sec = gmt->tm_sec;
-    st.tm_min = gmt->tm_min;
-    st.tm_hour = gmt->tm_hour;
-    st.tm_mday = gmt->tm_mday;
-    st.tm_month = gmt->tm_month;
-    st.tm_year = gmt->tm_year;
-    st.tm_wday = gmt->tm_wday;
-    st.tm_yday = gmt->tm_yday;
-
-    /* Apply the offset to GMT to obtain the local standard time */
-    ApplySecOffset(&st, retVal.tp_gmt_offset);
-
-    /*
-     * Apply the rules on standard time or GMT to obtain daylight saving
-     * time offset.  In this implementation, we use the US DST rule.
-     */
-    if (st.tm_month < 3) {
-        retVal.tp_dst_offset = 0L;
-    } else if (st.tm_month == 3) {
-        if (st.tm_wday == 0) {
-            /* A Sunday */
-            if (st.tm_mday <= 7) {
-                /* First Sunday */
-                /* 01:59:59 PST -> 03:00:00 PDT */
-                if (st.tm_hour < 2) {
-                    retVal.tp_dst_offset = 0L;
-                } else {
-                    retVal.tp_dst_offset = 3600L;
-                }
-            } else {
-                /* Not first Sunday */
-                retVal.tp_dst_offset = 3600L;
-            }
-        } else {
-            /* Not a Sunday.  See if before first Sunday or after */
-            if (st.tm_wday + 1 <= st.tm_mday) {
-                /* After first Sunday */
-                retVal.tp_dst_offset = 3600L;
-            } else {
-                /* Before first Sunday */
-                retVal.tp_dst_offset = 0L;
-            } 
-        }
-    } else if (st.tm_month < 9) {
-        retVal.tp_dst_offset = 3600L;
-    } else if (st.tm_month == 9) {
-        if (st.tm_wday == 0) {
-            if (31 - st.tm_mday < 7) {
-                /* Last Sunday */
-                /* 01:59:59 PDT -> 01:00:00 PST */
-                if (st.tm_hour < 1) {
-                    retVal.tp_dst_offset = 3600L;
-                } else {
-                    retVal.tp_dst_offset = 0L;
-                }
-            } else {
-                /* Not last Sunday */
-                retVal.tp_dst_offset = 3600L;
-            }
-        } else {
-            /* See if before or after last Sunday */
-            if (7 - st.tm_wday <= 31 - st.tm_mday) {
-                /* before last Sunday */
-                retVal.tp_dst_offset = 3600L;
-            } else {
-                retVal.tp_dst_offset = 0L;
-            }
-        }
-    } else {
-        retVal.tp_dst_offset = 0L;
-    }
-    return retVal;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * PR_GMTParameters --
- *
- *     Returns the PRTimeParameters for Greenwich Mean Time.
- *     Trivially, both the tp_gmt_offset and tp_dst_offset fields are 0.
- *
- *------------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRTimeParameters)
-PR_GMTParameters(const PRExplodedTime *gmt)
-{
-#if defined(XP_MAC)
-#pragma unused (gmt)
-#endif
-
-    PRTimeParameters retVal = { 0, 0 };
-    return retVal;
-}
-
-/*
- * The following code implements PR_ParseTimeString().  It is based on
- * ns/lib/xp/xp_time.c, revision 1.25, by Jamie Zawinski <jwz@netscape.com>.
- */
-
-/*
- * We only recognize the abbreviations of a small subset of time zones
- * in North America, Europe, and Japan.
- *
- * PST/PDT: Pacific Standard/Daylight Time
- * MST/MDT: Mountain Standard/Daylight Time
- * CST/CDT: Central Standard/Daylight Time
- * EST/EDT: Eastern Standard/Daylight Time
- * AST: Atlantic Standard Time
- * NST: Newfoundland Standard Time
- * GMT: Greenwich Mean Time
- * BST: British Summer Time
- * MET: Middle Europe Time
- * EET: Eastern Europe Time
- * JST: Japan Standard Time
- */
-
-typedef enum
-{
-  TT_UNKNOWN,
-
-  TT_SUN, TT_MON, TT_TUE, TT_WED, TT_THU, TT_FRI, TT_SAT,
-
-  TT_JAN, TT_FEB, TT_MAR, TT_APR, TT_MAY, TT_JUN,
-  TT_JUL, TT_AUG, TT_SEP, TT_OCT, TT_NOV, TT_DEC,
-
-  TT_PST, TT_PDT, TT_MST, TT_MDT, TT_CST, TT_CDT, TT_EST, TT_EDT,
-  TT_AST, TT_NST, TT_GMT, TT_BST, TT_MET, TT_EET, TT_JST
-} TIME_TOKEN;
-
-/*
- * This parses a time/date string into a PRTime
- * (microseconds after "1-Jan-1970 00:00:00 GMT").
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- *
- * Many formats are handled, including:
- *
- *   14 Apr 89 03:20:12
- *   14 Apr 89 03:20 GMT
- *   Fri, 17 Mar 89 4:01:33
- *   Fri, 17 Mar 89 4:01 GMT
- *   Mon Jan 16 16:12 PDT 1989
- *   Mon Jan 16 16:12 +0130 1989
- *   6 May 1992 16:41-JST (Wednesday)
- *   22-AUG-1993 10:59:12.82
- *   22-AUG-1993 10:59pm
- *   22-AUG-1993 12:59am
- *   22-AUG-1993 12:59 PM
- *   Friday, August 04, 1995 3:54 PM
- *   06/21/95 04:24:34 PM
- *   20/06/95 21:07
- *   95-06-08 19:32:48 EDT
- *
- * If the input string doesn't contain a description of the timezone,
- * we consult the `default_to_gmt' to decide whether the string should
- * be interpreted relative to the local time zone (PR_FALSE) or GMT (PR_TRUE).
- * The correct value for this argument depends on what standard specified
- * the time string which you are parsing.
- */
-
-PR_IMPLEMENT(PRStatus)
-PR_ParseTimeString(
-        const char *string,
-        PRBool default_to_gmt,
-        PRTime *result)
-{
-  PRExplodedTime tm;
-  TIME_TOKEN dotw = TT_UNKNOWN;
-  TIME_TOKEN month = TT_UNKNOWN;
-  TIME_TOKEN zone = TT_UNKNOWN;
-  int zone_offset = -1;
-  int date = -1;
-  PRInt32 year = -1;
-  int hour = -1;
-  int min = -1;
-  int sec = -1;
-
-  const char *rest = string;
-
-#ifdef DEBUG
-  int iterations = 0;
-#endif
-
-  PR_ASSERT(string && result);
-  if (!string || !result) return PR_FAILURE;
-
-  while (*rest)
-        {
-
-#ifdef DEBUG
-          if (iterations++ > 1000)
-                {
-                  PR_ASSERT(0);
-                  return PR_FAILURE;
-                }
-#endif
-
-          switch (*rest)
-                {
-                case 'a': case 'A':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'p' || rest[1] == 'P') &&
-                          (rest[2] == 'r' || rest[2] == 'R'))
-                        month = TT_APR;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 's') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_AST;
-                  else if (month == TT_UNKNOWN &&
-                                   (rest[1] == 'u' || rest[1] == 'U') &&
-                                   (rest[2] == 'g' || rest[2] == 'G'))
-                        month = TT_AUG;
-                  break;
-                case 'b': case 'B':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 's' || rest[1] == 'S') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_BST;
-                  break;
-                case 'c': case 'C':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 'd' || rest[1] == 'D') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_CDT;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_CST;
-                  break;
-                case 'd': case 'D':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'e' || rest[1] == 'E') &&
-                          (rest[2] == 'c' || rest[2] == 'C'))
-                        month = TT_DEC;
-                  break;
-                case 'e': case 'E':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 'd' || rest[1] == 'D') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_EDT;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 'e' || rest[1] == 'E') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_EET;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_EST;
-                  break;
-                case 'f': case 'F':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'e' || rest[1] == 'E') &&
-                          (rest[2] == 'b' || rest[2] == 'B'))
-                        month = TT_FEB;
-                  else if (dotw == TT_UNKNOWN &&
-                                   (rest[1] == 'r' || rest[1] == 'R') &&
-                                   (rest[2] == 'i' || rest[2] == 'I'))
-                        dotw = TT_FRI;
-                  break;
-                case 'g': case 'G':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 'm' || rest[1] == 'M') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_GMT;
-                  break;
-                case 'j': case 'J':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'a' || rest[1] == 'A') &&
-                          (rest[2] == 'n' || rest[2] == 'N'))
-                        month = TT_JAN;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_JST;
-                  else if (month == TT_UNKNOWN &&
-                                   (rest[1] == 'u' || rest[1] == 'U') &&
-                                   (rest[2] == 'l' || rest[2] == 'L'))
-                        month = TT_JUL;
-                  else if (month == TT_UNKNOWN &&
-                                   (rest[1] == 'u' || rest[1] == 'U') &&
-                                   (rest[2] == 'n' || rest[2] == 'N'))
-                        month = TT_JUN;
-                  break;
-                case 'm': case 'M':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'a' || rest[1] == 'A') &&
-                          (rest[2] == 'r' || rest[2] == 'R'))
-                        month = TT_MAR;
-                  else if (month == TT_UNKNOWN &&
-                                   (rest[1] == 'a' || rest[1] == 'A') &&
-                                   (rest[2] == 'y' || rest[2] == 'Y'))
-                        month = TT_MAY;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 'd' || rest[1] == 'D') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_MDT;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 'e' || rest[1] == 'E') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_MET;
-                  else if (dotw == TT_UNKNOWN &&
-                                   (rest[1] == 'o' || rest[1] == 'O') &&
-                                   (rest[2] == 'n' || rest[2] == 'N'))
-                        dotw = TT_MON;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_MST;
-                  break;
-                case 'n': case 'N':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'o' || rest[1] == 'O') &&
-                          (rest[2] == 'v' || rest[2] == 'V'))
-                        month = TT_NOV;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_NST;
-                  break;
-                case 'o': case 'O':
-                  if (month == TT_UNKNOWN &&
-                          (rest[1] == 'c' || rest[1] == 'C') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        month = TT_OCT;
-                  break;
-                case 'p': case 'P':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 'd' || rest[1] == 'D') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_PDT;
-                  else if (zone == TT_UNKNOWN &&
-                                   (rest[1] == 's' || rest[1] == 'S') &&
-                                   (rest[2] == 't' || rest[2] == 'T'))
-                        zone = TT_PST;
-                  break;
-                case 's': case 'S':
-                  if (dotw == TT_UNKNOWN &&
-                          (rest[1] == 'a' || rest[1] == 'A') &&
-                          (rest[2] == 't' || rest[2] == 'T'))
-                        dotw = TT_SAT;
-                  else if (month == TT_UNKNOWN &&
-                                   (rest[1] == 'e' || rest[1] == 'E') &&
-                                   (rest[2] == 'p' || rest[2] == 'P'))
-                        month = TT_SEP;
-                  else if (dotw == TT_UNKNOWN &&
-                                   (rest[1] == 'u' || rest[1] == 'U') &&
-                                   (rest[2] == 'n' || rest[2] == 'N'))
-                        dotw = TT_SUN;
-                  break;
-                case 't': case 'T':
-                  if (dotw == TT_UNKNOWN &&
-                          (rest[1] == 'h' || rest[1] == 'H') &&
-                          (rest[2] == 'u' || rest[2] == 'U'))
-                        dotw = TT_THU;
-                  else if (dotw == TT_UNKNOWN &&
-                                   (rest[1] == 'u' || rest[1] == 'U') &&
-                                   (rest[2] == 'e' || rest[2] == 'E'))
-                        dotw = TT_TUE;
-                  break;
-                case 'u': case 'U':
-                  if (zone == TT_UNKNOWN &&
-                          (rest[1] == 't' || rest[1] == 'T') &&
-                          !(rest[2] >= 'A' && rest[2] <= 'Z') &&
-                          !(rest[2] >= 'a' && rest[2] <= 'z'))
-                        /* UT is the same as GMT but UTx is not. */
-                        zone = TT_GMT;
-                  break;
-                case 'w': case 'W':
-                  if (dotw == TT_UNKNOWN &&
-                          (rest[1] == 'e' || rest[1] == 'E') &&
-                          (rest[2] == 'd' || rest[2] == 'D'))
-                        dotw = TT_WED;
-                  break;
-
-                case '+': case '-':
-                  {
-                        const char *end;
-                        int sign;
-                        if (zone_offset != -1)
-                          {
-                                /* already got one... */
-                                rest++;
-                                break;
-                          }
-                        if (zone != TT_UNKNOWN && zone != TT_GMT)
-                          {
-                                /* GMT+0300 is legal, but PST+0300 is not. */
-                                rest++;
-                                break;
-                          }
-
-                        sign = ((*rest == '+') ? 1 : -1);
-                        rest++; /* move over sign */
-                        end = rest;
-                        while (*end >= '0' && *end <= '9')
-                          end++;
-                        if (rest == end) /* no digits here */
-                          break;
-
-                        if ((end - rest) == 4)
-                          /* offset in HHMM */
-                          zone_offset = (((((rest[0]-'0')*10) + (rest[1]-'0')) * 60) +
-                                                         (((rest[2]-'0')*10) + (rest[3]-'0')));
-                        else if ((end - rest) == 2)
-                          /* offset in hours */
-                          zone_offset = (((rest[0]-'0')*10) + (rest[1]-'0')) * 60;
-                        else if ((end - rest) == 1)
-                          /* offset in hours */
-                          zone_offset = (rest[0]-'0') * 60;
-                        else
-                          /* 3 or >4 */
-                          break;
-
-                        zone_offset *= sign;
-                        zone = TT_GMT;
-                        break;
-                  }
-
-                case '0': case '1': case '2': case '3': case '4':
-                case '5': case '6': case '7': case '8': case '9':
-                  {
-                        int tmp_hour = -1;
-                        int tmp_min = -1;
-                        int tmp_sec = -1;
-                        const char *end = rest + 1;
-                        while (*end >= '0' && *end <= '9')
-                          end++;
-
-                        /* end is now the first character after a range of digits. */
-
-                        if (*end == ':')
-                          {
-                                if (hour >= 0 && min >= 0) /* already got it */
-                                  break;
-
-                                /* We have seen "[0-9]+:", so this is probably HH:MM[:SS] */
-                                if ((end - rest) > 2)
-                                  /* it is [0-9][0-9][0-9]+: */
-                                  break;
-                                else if ((end - rest) == 2)
-                                  tmp_hour = ((rest[0]-'0')*10 +
-                                                          (rest[1]-'0'));
-                                else
-                                  tmp_hour = (rest[0]-'0');
-
-                                while (*rest && *rest != ':')
-                                  rest++;
-                                rest++;
-
-                                /* move over the colon, and parse minutes */
-
-                                end = rest + 1;
-                                while (*end >= '0' && *end <= '9')
-                                  end++;
-
-                                if (end == rest)
-                                  /* no digits after first colon? */
-                                  break;
-                                else if ((end - rest) > 2)
-                                  /* it is [0-9][0-9][0-9]+: */
-                                  break;
-                                else if ((end - rest) == 2)
-                                  tmp_min = ((rest[0]-'0')*10 +
-                                                         (rest[1]-'0'));
-                                else
-                                  tmp_min = (rest[0]-'0');
-
-                                /* now go for seconds */
-                                rest = end;
-                                if (*rest == ':')
-                                  rest++;
-                                end = rest;
-                                while (*end >= '0' && *end <= '9')
-                                  end++;
-
-                                if (end == rest)
-                                  /* no digits after second colon - that's ok. */
-                                  ;
-                                else if ((end - rest) > 2)
-                                  /* it is [0-9][0-9][0-9]+: */
-                                  break;
-                                else if ((end - rest) == 2)
-                                  tmp_sec = ((rest[0]-'0')*10 +
-                                                         (rest[1]-'0'));
-                                else
-                                  tmp_sec = (rest[0]-'0');
-
-                                /* If we made it here, we've parsed hour and min,
-                                   and possibly sec, so it worked as a unit. */
-
-                                /* skip over whitespace and see if there's an AM or PM
-                                   directly following the time.
-                                 */
-                                if (tmp_hour <= 12)
-                                  {
-                                        const char *s = end;
-                                        while (*s && (*s == ' ' || *s == '\t'))
-                                          s++;
-                                        if ((s[0] == 'p' || s[0] == 'P') &&
-                                                (s[1] == 'm' || s[1] == 'M'))
-                                          /* 10:05pm == 22:05, and 12:05pm == 12:05 */
-                                          tmp_hour = (tmp_hour == 12 ? 12 : tmp_hour + 12);
-                                        else if (tmp_hour == 12 &&
-                                                         (s[0] == 'a' || s[0] == 'A') &&
-                                                         (s[1] == 'm' || s[1] == 'M'))
-                                          /* 12:05am == 00:05 */
-                                          tmp_hour = 0;
-                                  }
-
-                                hour = tmp_hour;
-                                min = tmp_min;
-                                sec = tmp_sec;
-                                rest = end;
-                                break;
-                          }
-                        else if ((*end == '/' || *end == '-') &&
-                                         end[1] >= '0' && end[1] <= '9')
-                          {
-                                /* Perhaps this is 6/16/95, 16/6/95, 6-16-95, or 16-6-95
-                                   or even 95-06-05...
-                                   #### But it doesn't handle 1995-06-22.
-                                 */
-                                int n1, n2, n3;
-                                const char *s;
-
-                                if (month != TT_UNKNOWN)
-                                  /* if we saw a month name, this can't be. */
-                                  break;
-
-                                s = rest;
-
-                                n1 = (*s++ - '0');                                /* first 1 or 2 digits */
-                                if (*s >= '0' && *s <= '9')
-                                  n1 = n1*10 + (*s++ - '0');
-
-                                if (*s != '/' && *s != '-')                /* slash */
-                                  break;
-                                s++;
-
-                                if (*s < '0' || *s > '9')                /* second 1 or 2 digits */
-                                  break;
-                                n2 = (*s++ - '0');
-                                if (*s >= '0' && *s <= '9')
-                                  n2 = n2*10 + (*s++ - '0');
-
-                                if (*s != '/' && *s != '-')                /* slash */
-                                  break;
-                                s++;
-
-                                if (*s < '0' || *s > '9')                /* third 1, 2, or 4 digits */
-                                  break;
-                                n3 = (*s++ - '0');
-                                if (*s >= '0' && *s <= '9')
-                                  n3 = n3*10 + (*s++ - '0');
-
-                                if (*s >= '0' && *s <= '9')                /* optional digits 3 and 4 */
-                                  {
-                                        n3 = n3*10 + (*s++ - '0');
-                                        if (*s < '0' || *s > '9')
-                                          break;
-                                        n3 = n3*10 + (*s++ - '0');
-                                  }
-
-                                if ((*s >= '0' && *s <= '9') ||        /* followed by non-alphanum */
-                                        (*s >= 'A' && *s <= 'Z') ||
-                                        (*s >= 'a' && *s <= 'z'))
-                                  break;
-
-                                /* Ok, we parsed three 1-2 digit numbers, with / or -
-                                   between them.  Now decide what the hell they are
-                                   (DD/MM/YY or MM/DD/YY or YY/MM/DD.)
-                                 */
-
-                                if (n1 > 31 || n1 == 0)  /* must be YY/MM/DD */
-                                  {
-                                        if (n2 > 12) break;
-                                        if (n3 > 31) break;
-                                        year = n1;
-                                        if (year < 70)
-                                            year += 2000;
-                                        else if (year < 100)
-                                            year += 1900;
-                                        month = (TIME_TOKEN)(n2 + ((int)TT_JAN) - 1);
-                                        date = n3;
-                                        rest = s;
-                                        break;
-                                  }
-
-                                if (n1 > 12 && n2 > 12)  /* illegal */
-                                  {
-                                        rest = s;
-                                        break;
-                                  }
-
-                                if (n3 < 70)
-                                    n3 += 2000;
-                                else if (n3 < 100)
-                                    n3 += 1900;
-
-                                if (n1 > 12)  /* must be DD/MM/YY */
-                                  {
-                                        date = n1;
-                                        month = (TIME_TOKEN)(n2 + ((int)TT_JAN) - 1);
-                                        year = n3;
-                                  }
-                                else                  /* assume MM/DD/YY */
-                                  {
-                                        /* #### In the ambiguous case, should we consult the
-                                           locale to find out the local default? */
-                                        month = (TIME_TOKEN)(n1 + ((int)TT_JAN) - 1);
-                                        date = n2;
-                                        year = n3;
-                                  }
-                                rest = s;
-                          }
-                        else if ((*end >= 'A' && *end <= 'Z') ||
-                                         (*end >= 'a' && *end <= 'z'))
-                          /* Digits followed by non-punctuation - what's that? */
-                          ;
-                        else if ((end - rest) == 4)                /* four digits is a year */
-                          year = (year < 0
-                                          ? ((rest[0]-'0')*1000L +
-                                                 (rest[1]-'0')*100L +
-                                                 (rest[2]-'0')*10L +
-                                                 (rest[3]-'0'))
-                                          : year);
-                        else if ((end - rest) == 2)                /* two digits - date or year */
-                          {
-                                int n = ((rest[0]-'0')*10 +
-                                                 (rest[1]-'0'));
-                                /* If we don't have a date (day of the month) and we see a number
-                                     less than 32, then assume that is the date.
-
-                                         Otherwise, if we have a date and not a year, assume this is the
-                                         year.  If it is less than 70, then assume it refers to the 21st
-                                         century.  If it is two digits (>= 70), assume it refers to this
-                                         century.  Otherwise, assume it refers to an unambiguous year.
-
-                                         The world will surely end soon.
-                                   */
-                                if (date < 0 && n < 32)
-                                  date = n;
-                                else if (year < 0)
-                                  {
-                                        if (n < 70)
-                                          year = 2000 + n;
-                                        else if (n < 100)
-                                          year = 1900 + n;
-                                        else
-                                          year = n;
-                                  }
-                                /* else what the hell is this. */
-                          }
-                        else if ((end - rest) == 1)                /* one digit - date */
-                          date = (date < 0 ? (rest[0]-'0') : date);
-                        /* else, three or more than four digits - what's that? */
-
-                        break;
-                  }
-                }
-
-          /* Skip to the end of this token, whether we parsed it or not.
-                 Tokens are delimited by whitespace, or ,;-/
-                 But explicitly not :+-.
-           */
-          while (*rest &&
-                         *rest != ' ' && *rest != '\t' &&
-                         *rest != ',' && *rest != ';' &&
-                         *rest != '-' && *rest != '+' &&
-                         *rest != '/' &&
-                         *rest != '(' && *rest != ')' && *rest != '[' && *rest != ']')
-                rest++;
-          /* skip over uninteresting chars. */
-        SKIP_MORE:
-          while (*rest &&
-                         (*rest == ' ' || *rest == '\t' ||
-                          *rest == ',' || *rest == ';' || *rest == '/' ||
-                          *rest == '(' || *rest == ')' || *rest == '[' || *rest == ']'))
-                rest++;
-
-          /* "-" is ignored at the beginning of a token if we have not yet
-                 parsed a year (e.g., the second "-" in "30-AUG-1966"), or if
-                 the character after the dash is not a digit. */         
-          if (*rest == '-' && ((rest > string && isalpha(rest[-1]) && year < 0)
-              || rest[1] < '0' || rest[1] > '9'))
-                {
-                  rest++;
-                  goto SKIP_MORE;
-                }
-
-        }
-
-  if (zone != TT_UNKNOWN && zone_offset == -1)
-        {
-          switch (zone)
-                {
-                case TT_PST: zone_offset = -8 * 60; break;
-                case TT_PDT: zone_offset = -7 * 60; break;
-                case TT_MST: zone_offset = -7 * 60; break;
-                case TT_MDT: zone_offset = -6 * 60; break;
-                case TT_CST: zone_offset = -6 * 60; break;
-                case TT_CDT: zone_offset = -5 * 60; break;
-                case TT_EST: zone_offset = -5 * 60; break;
-                case TT_EDT: zone_offset = -4 * 60; break;
-                case TT_AST: zone_offset = -4 * 60; break;
-                case TT_NST: zone_offset = -3 * 60 - 30; break;
-                case TT_GMT: zone_offset =  0 * 60; break;
-                case TT_BST: zone_offset =  1 * 60; break;
-                case TT_MET: zone_offset =  1 * 60; break;
-                case TT_EET: zone_offset =  2 * 60; break;
-                case TT_JST: zone_offset =  9 * 60; break;
-                default:
-                  PR_ASSERT (0);
-                  break;
-                }
-        }
-
-  /* If we didn't find a year, month, or day-of-the-month, we can't
-         possibly parse this, and in fact, mktime() will do something random
-         (I'm seeing it return "Tue Feb  5 06:28:16 2036", which is no doubt
-         a numerologically significant date... */
-  if (month == TT_UNKNOWN || date == -1 || year == -1)
-      return PR_FAILURE;
-
-  memset(&tm, 0, sizeof(tm));
-  if (sec != -1)
-        tm.tm_sec = sec;
-  if (min != -1)
-  tm.tm_min = min;
-  if (hour != -1)
-        tm.tm_hour = hour;
-  if (date != -1)
-        tm.tm_mday = date;
-  if (month != TT_UNKNOWN)
-        tm.tm_month = (((int)month) - ((int)TT_JAN));
-  if (year != -1)
-        tm.tm_year = year;
-  if (dotw != TT_UNKNOWN)
-        tm.tm_wday = (((int)dotw) - ((int)TT_SUN));
-
-  if (zone == TT_UNKNOWN && default_to_gmt)
-        {
-          /* No zone was specified, so pretend the zone was GMT. */
-          zone = TT_GMT;
-          zone_offset = 0;
-        }
-
-  if (zone_offset == -1)
-         {
-           /* no zone was specified, and we're to assume that everything
-             is local. */
-          struct tm localTime;
-          time_t secs;
-
-          PR_ASSERT(tm.tm_month > -1 
-                                   && tm.tm_mday > 0 
-                                   && tm.tm_hour > -1
-                                   && tm.tm_min > -1
-                                   && tm.tm_sec > -1);
-
-            /*
-             * To obtain time_t from a tm structure representing the local
-             * time, we call mktime().  However, we need to see if we are
-             * on 1-Jan-1970 or before.  If we are, we can't call mktime()
-             * because mktime() will crash on win16. In that case, we
-             * calculate zone_offset based on the zone offset at 
-             * 00:00:00, 2 Jan 1970 GMT, and subtract zone_offset from the
-             * date we are parsing to transform the date to GMT.  We also
-             * do so if mktime() returns (time_t) -1 (time out of range).
-           */
-
-          /* month, day, hours, mins and secs are always non-negative
-             so we dont need to worry about them. */  
-            if(tm.tm_year >= 1970)
-                {
-                  PRInt64 usec_per_sec;
-
-                  localTime.tm_sec = tm.tm_sec;
-                  localTime.tm_min = tm.tm_min;
-                  localTime.tm_hour = tm.tm_hour;
-                  localTime.tm_mday = tm.tm_mday;
-                  localTime.tm_mon = tm.tm_month;
-                  localTime.tm_year = tm.tm_year - 1900;
-                  /* Set this to -1 to tell mktime "I don't care".  If you set
-                     it to 0 or 1, you are making assertions about whether the
-                     date you are handing it is in daylight savings mode or not;
-                     and if you're wrong, it will "fix" it for you. */
-                  localTime.tm_isdst = -1;
-                  secs = mktime(&localTime);
-                  if (secs != (time_t) -1)
-                    {
-#if defined(XP_MAC) && (__MSL__ < 0x6000)
-                      /*
-                       * The mktime() routine in MetroWerks MSL C
-                       * Runtime library returns seconds since midnight,
-                       * 1 Jan. 1900, not 1970 - in versions of MSL (Metrowerks Standard
-                       * Library) prior to version 6.  Only for older versions of
-                       * MSL do we adjust the value of secs to the NSPR epoch
-                       */
-                      secs -= ((365 * 70UL) + 17) * 24 * 60 * 60;
-#endif
-                      LL_I2L(*result, secs);
-                      LL_I2L(usec_per_sec, PR_USEC_PER_SEC);
-                      LL_MUL(*result, *result, usec_per_sec);
-                      return PR_SUCCESS;
-                    }
-                }
-                
-                /* So mktime() can't handle this case.  We assume the
-                   zone_offset for the date we are parsing is the same as
-                   the zone offset on 00:00:00 2 Jan 1970 GMT. */
-                secs = 86400;
-                (void) MT_safe_localtime(&secs, &localTime);
-                zone_offset = localTime.tm_min
-                              + 60 * localTime.tm_hour
-                              + 1440 * (localTime.tm_mday - 2);
-        }
-
-        /* Adjust the hours and minutes before handing them to
-           PR_ImplodeTime(). Note that it's ok for them to be <0 or >24/60 
-
-           We adjust the time to GMT before going into PR_ImplodeTime().
-           The zone_offset represents the difference between the time
-           zone parsed and GMT
-         */
-        tm.tm_hour -= (zone_offset / 60);
-        tm.tm_min  -= (zone_offset % 60);
-
-  *result = PR_ImplodeTime(&tm);
-
-  return PR_SUCCESS;
-}
-
-/*
- *******************************************************************
- *******************************************************************
- **
- **    OLD COMPATIBILITY FUNCTIONS
- **
- *******************************************************************
- *******************************************************************
- */
-
-
-/*
- *-----------------------------------------------------------------------
- *
- * PR_FormatTime --
- *
- *     Format a time value into a buffer. Same semantics as strftime().
- *
- *-----------------------------------------------------------------------
- */
-
-PR_IMPLEMENT(PRUint32)
-PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
-{
-    struct tm a;
-    a.tm_sec = tm->tm_sec;
-    a.tm_min = tm->tm_min;
-    a.tm_hour = tm->tm_hour;
-    a.tm_mday = tm->tm_mday;
-    a.tm_mon = tm->tm_month;
-    a.tm_wday = tm->tm_wday;
-    a.tm_year = tm->tm_year - 1900;
-    a.tm_yday = tm->tm_yday;
-    a.tm_isdst = tm->tm_params.tp_dst_offset ? 1 : 0;
-
-/*
- * On some platforms, for example SunOS 4, struct tm has two additional
- * fields: tm_zone and tm_gmtoff.
- */
-
-#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
-        || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \
-        || defined(DARWIN)
-    a.tm_zone = NULL;
-    a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
-#endif
-
-    return strftime(buf, buflen, fmt, &a);
-}
-
-
-/*
- * The following string arrays and macros are used by PR_FormatTimeUSEnglish().
- */
-
-static const char* abbrevDays[] =
-{
-   "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
-};
-
-static const char* days[] =
-{
-   "Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"
-};
-
-static const char* abbrevMonths[] =
-{
-   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static const char* months[] =
-{ 
-    "January", "February", "March", "April", "May", "June",
-    "July", "August", "September", "October", "November", "December"
-};
-
-
-/*
- * Add a single character to the given buffer, incrementing the buffer pointer
- * and decrementing the buffer size. Return 0 on error.
- */
-#define ADDCHAR( buf, bufSize, ch )             \
-do                                              \
-{                                               \
-   if( bufSize < 1 )                            \
-   {                                            \
-      *(--buf) = '\0';                          \
-      return 0;                                 \
-   }                                            \
-   *buf++ = ch;                                 \
-   bufSize--;                                   \
-}                                               \
-while(0)
-
-
-/*
- * Add a string to the given buffer, incrementing the buffer pointer
- * and decrementing the buffer size appropriately.  Return 0 on error.
- */
-#define ADDSTR( buf, bufSize, str )             \
-do                                              \
-{                                               \
-   PRUint32 strSize = strlen( str );              \
-   if( strSize > bufSize )                      \
-   {                                            \
-      if( bufSize==0 )                          \
-         *(--buf) = '\0';                       \
-      else                                      \
-         *buf = '\0';                           \
-      return 0;                                 \
-   }                                            \
-   memcpy(buf, str, strSize);                   \
-   buf += strSize;                              \
-   bufSize -= strSize;                          \
-}                                               \
-while(0)
-
-/* Needed by PR_FormatTimeUSEnglish() */
-static unsigned int  pr_WeekOfYear(const PRExplodedTime* time,
-        unsigned int firstDayOfWeek);
-
-
-/***********************************************************************************
- *
- * Description:
- *  This is a dumbed down version of strftime that will format the date in US
- *  English regardless of the setting of the global locale.  This functionality is
- *  needed to write things like MIME headers which must always be in US English.
- *
- **********************************************************************************/
-             
-PR_IMPLEMENT(PRUint32)
-PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
-                        const char* format, const PRExplodedTime* time )
-{
-   char*         bufPtr = buf;
-   const char*   fmtPtr;
-   char          tmpBuf[ 40 ];        
-   const int     tmpBufSize = sizeof( tmpBuf );
-
-   
-   for( fmtPtr=format; *fmtPtr != '\0'; fmtPtr++ )
-   {
-      if( *fmtPtr != '%' )
-      {
-         ADDCHAR( bufPtr, bufSize, *fmtPtr );
-      }
-      else
-      {
-         switch( *(++fmtPtr) )
-         {
-         case '%':
-            /* escaped '%' character */
-            ADDCHAR( bufPtr, bufSize, '%' );
-            break;
-            
-         case 'a':
-            /* abbreviated weekday name */
-            ADDSTR( bufPtr, bufSize, abbrevDays[ time->tm_wday ] );
-            break;
-               
-         case 'A':
-            /* full weekday name */
-            ADDSTR( bufPtr, bufSize, days[ time->tm_wday ] );
-            break;
-        
-         case 'b':
-            /* abbreviated month name */
-            ADDSTR( bufPtr, bufSize, abbrevMonths[ time->tm_month ] );
-            break;
-        
-         case 'B':
-            /* full month name */
-            ADDSTR(bufPtr, bufSize,  months[ time->tm_month ] );
-            break;
-        
-         case 'c':
-            /* Date and time. */
-            PR_FormatTimeUSEnglish( tmpBuf, tmpBufSize, "%a %b %d %H:%M:%S %Y", time );
-            ADDSTR( bufPtr, bufSize, tmpBuf );
-            break;
-        
-         case 'd':
-            /* day of month ( 01 - 31 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",time->tm_mday );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-
-         case 'H':
-            /* hour ( 00 - 23 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",time->tm_hour );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'I':
-            /* hour ( 01 - 12 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",
-                        (time->tm_hour%12) ? time->tm_hour%12 : (PRInt32) 12 );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'j':
-            /* day number of year ( 001 - 366 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.3d",time->tm_yday + 1);
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'm':
-            /* month number ( 01 - 12 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",time->tm_month+1);
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'M':
-            /* minute ( 00 - 59 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",time->tm_min );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-       
-         case 'p':
-            /* locale's equivalent of either AM or PM */
-            ADDSTR( bufPtr, bufSize, (time->tm_hour<12)?"AM":"PM" ); 
-            break;
-        
-         case 'S':
-            /* seconds ( 00 - 61 ), allows for leap seconds */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2ld",time->tm_sec );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-     
-         case 'U':
-            /* week number of year ( 00 - 53  ),  Sunday  is  the first day of week 1 */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2d", pr_WeekOfYear( time, 0 ) );
-            ADDSTR( bufPtr, bufSize, tmpBuf );
-            break;
-        
-         case 'w':
-            /* weekday number ( 0 - 6 ), Sunday = 0 */
-            PR_snprintf(tmpBuf,tmpBufSize,"%d",time->tm_wday );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'W':
-            /* Week number of year ( 00 - 53  ),  Monday  is  the first day of week 1 */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2d", pr_WeekOfYear( time, 1 ) );
-            ADDSTR( bufPtr, bufSize, tmpBuf );
-            break;
-        
-         case 'x':
-            /* Date representation */
-            PR_FormatTimeUSEnglish( tmpBuf, tmpBufSize, "%m/%d/%y", time );
-            ADDSTR( bufPtr, bufSize, tmpBuf );
-            break;
-        
-         case 'X':
-            /* Time representation. */
-            PR_FormatTimeUSEnglish( tmpBuf, tmpBufSize, "%H:%M:%S", time );
-            ADDSTR( bufPtr, bufSize, tmpBuf );
-            break;
-        
-         case 'y':
-            /* year within century ( 00 - 99 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.2d",time->tm_year % 100 );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'Y':
-            /* year as ccyy ( for example 1986 ) */
-            PR_snprintf(tmpBuf,tmpBufSize,"%.4d",time->tm_year );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-        
-         case 'Z':
-            /* Time zone name or no characters if  no  time  zone exists.
-             * Since time zone name is supposed to be independant of locale, we
-             * defer to PR_FormatTime() for this option.
-             */
-            PR_FormatTime( tmpBuf, tmpBufSize, "%Z", time );
-            ADDSTR( bufPtr, bufSize, tmpBuf ); 
-            break;
-
-         default:
-            /* Unknown format.  Simply copy format into output buffer. */
-            ADDCHAR( bufPtr, bufSize, '%' );
-            ADDCHAR( bufPtr, bufSize, *fmtPtr );
-            break;
-            
-         }
-      }
-   }
-
-   ADDCHAR( bufPtr, bufSize, '\0' );
-   return (PRUint32)(bufPtr - buf - 1);
-}
-
-
-
-/***********************************************************************************
- *
- * Description:
- *  Returns the week number of the year (0-53) for the given time.  firstDayOfWeek
- *  is the day on which the week is considered to start (0=Sun, 1=Mon, ...).
- *  Week 1 starts the first time firstDayOfWeek occurs in the year.  In other words,
- *  a partial week at the start of the year is considered week 0.  
- *
- **********************************************************************************/
-
-static unsigned int
-pr_WeekOfYear(const PRExplodedTime* time, unsigned int firstDayOfWeek)
-{
-   int dayOfWeek;
-   int dayOfYear;
-
-  /* Get the day of the year for the given time then adjust it to represent the
-   * first day of the week containing the given time.
-   */
-  dayOfWeek = time->tm_wday - firstDayOfWeek;
-  if (dayOfWeek < 0)
-    dayOfWeek += 7;
-  
-  dayOfYear = time->tm_yday - dayOfWeek;
-
-
-  if( dayOfYear <= 0 )
-  {
-     /* If dayOfYear is <= 0, it is in the first partial week of the year. */
-     return 0;
-  }
-  else
-  {
-     /* Count the number of full weeks ( dayOfYear / 7 ) then add a week if there
-      * are any days left over ( dayOfYear % 7 ).  Because we are only counting to
-      * the first day of the week containing the given time, rather than to the
-      * actual day representing the given time, any days in week 0 will be "absorbed"
-      * as extra days in the given week.
-      */
-     return (dayOfYear / 7) + ( (dayOfYear % 7) == 0 ? 0 : 1 );
-  }
-}
-
diff --git a/libs/js/nsprpub/pr/src/misc/prtpool.c b/libs/js/nsprpub/pr/src/misc/prtpool.c
deleted file mode 100644
index e23bb9d014..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prtpool.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-/*
- * Thread pools
- *	Thread pools create and manage threads to provide support for
- *	scheduling jobs onto one or more threads.
- *
- */
-#ifdef OPT_WINNT
-#include <windows.h>
-#endif
-
-/*
- * worker thread
- */
-typedef struct wthread {
-	PRCList		links;
-	PRThread	*thread;
-} wthread;
-
-/*
- * queue of timer jobs
- */
-typedef struct timer_jobq {
-	PRCList		list;
-	PRLock		*lock;
-	PRCondVar	*cv;
-	PRInt32		cnt;
-	PRCList 	wthreads;
-} timer_jobq;
-
-/*
- * queue of jobs
- */
-typedef struct tp_jobq {
-	PRCList		list;
-	PRInt32		cnt;
-	PRLock		*lock;
-	PRCondVar	*cv;
-	PRCList 	wthreads;
-#ifdef OPT_WINNT
-	HANDLE		nt_completion_port;
-#endif
-} tp_jobq;
-
-/*
- * queue of IO jobs
- */
-typedef struct io_jobq {
-	PRCList		list;
-	PRPollDesc  *pollfds;
-	PRInt32  	npollfds;
-	PRJob		**polljobs;
-	PRLock		*lock;
-	PRInt32		cnt;
-	PRFileDesc	*notify_fd;
-	PRCList 	wthreads;
-} io_jobq;
-
-/*
- * Threadpool
- */
-struct PRThreadPool {
-	PRInt32		init_threads;
-	PRInt32		max_threads;
-	PRInt32		current_threads;
-	PRInt32		idle_threads;
-	PRUint32	stacksize;
-	tp_jobq		jobq;
-	io_jobq		ioq;
-	timer_jobq	timerq;
-	PRLock		*join_lock;		/* used with jobp->join_cv */
-	PRCondVar	*shutdown_cv;
-	PRBool		shutdown;
-};
-
-typedef enum io_op_type
-	{ JOB_IO_READ, JOB_IO_WRITE, JOB_IO_CONNECT, JOB_IO_ACCEPT } io_op_type;
-
-#ifdef OPT_WINNT
-typedef struct NT_notifier {
-	OVERLAPPED overlapped;		/* must be first */
-	PRJob	*jobp;
-} NT_notifier;
-#endif
-
-struct PRJob {
-	PRCList			links;		/* 	for linking jobs */
-	PRBool			on_ioq;		/* job on ioq */
-	PRBool			on_timerq;	/* job on timerq */
-	PRJobFn			job_func;
-	void 			*job_arg;
-	PRCondVar		*join_cv;
-	PRBool			join_wait;	/* == PR_TRUE, when waiting to join */
-	PRCondVar		*cancel_cv;	/* for cancelling IO jobs */
-	PRBool			cancel_io;	/* for cancelling IO jobs */
-	PRThreadPool	*tpool;		/* back pointer to thread pool */
-	PRJobIoDesc		*iod;
-	io_op_type		io_op;
-	PRInt16			io_poll_flags;
-	PRNetAddr		*netaddr;
-	PRIntervalTime	timeout;	/* relative value */
-	PRIntervalTime	absolute;
-#ifdef OPT_WINNT
-	NT_notifier		nt_notifier;	
-#endif
-};
-
-#define JOB_LINKS_PTR(_qp) \
-    ((PRJob *) ((char *) (_qp) - offsetof(PRJob, links)))
-
-#define WTHREAD_LINKS_PTR(_qp) \
-    ((wthread *) ((char *) (_qp) - offsetof(wthread, links)))
-
-#define JOINABLE_JOB(_jobp) (NULL != (_jobp)->join_cv)
-
-#define JOIN_NOTIFY(_jobp)								\
-				PR_BEGIN_MACRO							\
-				PR_Lock(_jobp->tpool->join_lock);		\
-				_jobp->join_wait = PR_FALSE;			\
-				PR_NotifyCondVar(_jobp->join_cv);		\
-				PR_Unlock(_jobp->tpool->join_lock);		\
-				PR_END_MACRO
-
-#define CANCEL_IO_JOB(jobp)								\
-				PR_BEGIN_MACRO							\
-				jobp->cancel_io = PR_FALSE;				\
-				jobp->on_ioq = PR_FALSE;				\
-				PR_REMOVE_AND_INIT_LINK(&jobp->links);	\
-				tp->ioq.cnt--;							\
-				PR_NotifyCondVar(jobp->cancel_cv);		\
-				PR_END_MACRO
-
-static void delete_job(PRJob *jobp);
-static PRThreadPool * alloc_threadpool(void);
-static PRJob * alloc_job(PRBool joinable, PRThreadPool *tp);
-static void notify_ioq(PRThreadPool *tp);
-static void notify_timerq(PRThreadPool *tp);
-
-/*
- * locks are acquired in the following order
- *
- *	tp->ioq.lock,tp->timerq.lock
- *			|
- *			V
- *		tp->jobq->lock		
- */
-
-/*
- * worker thread function
- */
-static void wstart(void *arg)
-{
-PRThreadPool *tp = (PRThreadPool *) arg;
-PRCList *head;
-
-	/*
-	 * execute jobs until shutdown
-	 */
-	while (!tp->shutdown) {
-		PRJob *jobp;
-#ifdef OPT_WINNT
-		BOOL rv;
-		DWORD unused, shutdown;
-		LPOVERLAPPED olp;
-
-		PR_Lock(tp->jobq.lock);
-		tp->idle_threads++;
-		PR_Unlock(tp->jobq.lock);
-		rv = GetQueuedCompletionStatus(tp->jobq.nt_completion_port,
-					&unused, &shutdown, &olp, INFINITE);
-		
-		PR_ASSERT(rv);
-		if (shutdown)
-			break;
-		jobp = ((NT_notifier *) olp)->jobp;
-		PR_Lock(tp->jobq.lock);
-		tp->idle_threads--;
-		tp->jobq.cnt--;
-		PR_Unlock(tp->jobq.lock);
-#else
-
-		PR_Lock(tp->jobq.lock);
-		while (PR_CLIST_IS_EMPTY(&tp->jobq.list) && (!tp->shutdown)) {
-			tp->idle_threads++;
-			PR_WaitCondVar(tp->jobq.cv, PR_INTERVAL_NO_TIMEOUT);
-			tp->idle_threads--;
-		}	
-		if (tp->shutdown) {
-			PR_Unlock(tp->jobq.lock);
-			break;
-		}
-		head = PR_LIST_HEAD(&tp->jobq.list);
-		/*
-		 * remove job from queue
-		 */
-		PR_REMOVE_AND_INIT_LINK(head);
-		tp->jobq.cnt--;
-		jobp = JOB_LINKS_PTR(head);
-		PR_Unlock(tp->jobq.lock);
-#endif
-
-		jobp->job_func(jobp->job_arg);
-		if (!JOINABLE_JOB(jobp)) {
-			delete_job(jobp);
-		} else {
-			JOIN_NOTIFY(jobp);
-		}
-	}
-	PR_Lock(tp->jobq.lock);
-	tp->current_threads--;
-	PR_Unlock(tp->jobq.lock);
-}
-
-/*
- * add a job to the work queue
- */
-static void
-add_to_jobq(PRThreadPool *tp, PRJob *jobp)
-{
-	/*
-	 * add to jobq
-	 */
-#ifdef OPT_WINNT
-	PR_Lock(tp->jobq.lock);
-	tp->jobq.cnt++;
-	PR_Unlock(tp->jobq.lock);
-	/*
-	 * notify worker thread(s)
-	 */
-	PostQueuedCompletionStatus(tp->jobq.nt_completion_port, 0,
-            FALSE, &jobp->nt_notifier.overlapped);
-#else
-	PR_Lock(tp->jobq.lock);
-	PR_APPEND_LINK(&jobp->links,&tp->jobq.list);
-	tp->jobq.cnt++;
-	if ((tp->idle_threads < tp->jobq.cnt) &&
-					(tp->current_threads < tp->max_threads)) {
-		wthread *wthrp;
-		/*
-		 * increment thread count and unlock the jobq lock
-		 */
-		tp->current_threads++;
-		PR_Unlock(tp->jobq.lock);
-		/* create new worker thread */
-		wthrp = PR_NEWZAP(wthread);
-		if (wthrp) {
-			wthrp->thread = PR_CreateThread(PR_USER_THREAD, wstart,
-						tp, PR_PRIORITY_NORMAL,
-						PR_GLOBAL_THREAD,PR_JOINABLE_THREAD,tp->stacksize);
-			if (NULL == wthrp->thread) {
-				PR_DELETE(wthrp);  /* this sets wthrp to NULL */
-			}
-		}
-		PR_Lock(tp->jobq.lock);
-		if (NULL == wthrp) {
-			tp->current_threads--;
-		} else {
-			PR_APPEND_LINK(&wthrp->links, &tp->jobq.wthreads);
-		}
-	}
-	/*
-	 * wakeup a worker thread
-	 */
-	PR_NotifyCondVar(tp->jobq.cv);
-	PR_Unlock(tp->jobq.lock);
-#endif
-}
-
-/*
- * io worker thread function
- */
-static void io_wstart(void *arg)
-{
-PRThreadPool *tp = (PRThreadPool *) arg;
-int pollfd_cnt, pollfds_used;
-int rv;
-PRCList *qp, *nextqp;
-PRPollDesc *pollfds;
-PRJob **polljobs;
-int poll_timeout;
-PRIntervalTime now;
-
-	/*
-	 * scan io_jobq
-	 * construct poll list
-	 * call PR_Poll
-	 * for all fds, for which poll returns true, move the job to
-	 * jobq and wakeup worker thread.
-	 */
-	while (!tp->shutdown) {
-		PRJob *jobp;
-
-		pollfd_cnt = tp->ioq.cnt + 10;
-		if (pollfd_cnt > tp->ioq.npollfds) {
-
-			/*
-			 * re-allocate pollfd array if the current one is not large
-			 * enough
-			 */
-			if (NULL != tp->ioq.pollfds)
-				PR_Free(tp->ioq.pollfds);
-			tp->ioq.pollfds = (PRPollDesc *) PR_Malloc(pollfd_cnt *
-						(sizeof(PRPollDesc) + sizeof(PRJob *)));
-			PR_ASSERT(NULL != tp->ioq.pollfds);
-			/*
-			 * array of pollfds
-			 */
-			pollfds = tp->ioq.pollfds;
-			tp->ioq.polljobs = (PRJob **) (&tp->ioq.pollfds[pollfd_cnt]);
-			/*
-			 * parallel array of jobs
-			 */
-			polljobs = tp->ioq.polljobs;
-			tp->ioq.npollfds = pollfd_cnt;
-		}
-
-		pollfds_used = 0;
-		/*
-		 * add the notify fd; used for unblocking io thread(s)
-		 */
-		pollfds[pollfds_used].fd = tp->ioq.notify_fd;
-		pollfds[pollfds_used].in_flags = PR_POLL_READ;
-		pollfds[pollfds_used].out_flags = 0;
-		polljobs[pollfds_used] = NULL;
-		pollfds_used++;
-		/*
-		 * fill in the pollfd array
-		 */
-		PR_Lock(tp->ioq.lock);
-		for (qp = tp->ioq.list.next; qp != &tp->ioq.list; qp = nextqp) {
-			nextqp = qp->next;
-			jobp = JOB_LINKS_PTR(qp);
-			if (jobp->cancel_io) {
-				CANCEL_IO_JOB(jobp);
-				continue;
-			}
-			if (pollfds_used == (pollfd_cnt))
-				break;
-			pollfds[pollfds_used].fd = jobp->iod->socket;
-			pollfds[pollfds_used].in_flags = jobp->io_poll_flags;
-			pollfds[pollfds_used].out_flags = 0;
-			polljobs[pollfds_used] = jobp;
-
-			pollfds_used++;
-		}
-		if (!PR_CLIST_IS_EMPTY(&tp->ioq.list)) {
-			qp = tp->ioq.list.next;
-			jobp = JOB_LINKS_PTR(qp);
-			if (PR_INTERVAL_NO_TIMEOUT == jobp->timeout)
-				poll_timeout = PR_INTERVAL_NO_TIMEOUT;
-			else if (PR_INTERVAL_NO_WAIT == jobp->timeout)
-				poll_timeout = PR_INTERVAL_NO_WAIT;
-			else {
-				poll_timeout = jobp->absolute - PR_IntervalNow();
-				if (poll_timeout <= 0) /* already timed out */
-					poll_timeout = PR_INTERVAL_NO_WAIT;
-			}
-		} else {
-			poll_timeout = PR_INTERVAL_NO_TIMEOUT;
-		}
-		PR_Unlock(tp->ioq.lock);
-
-		/*
-		 * XXXX
-		 * should retry if more jobs have been added to the queue?
-		 *
-		 */
-		PR_ASSERT(pollfds_used <= pollfd_cnt);
-		rv = PR_Poll(tp->ioq.pollfds, pollfds_used, poll_timeout);
-
-		if (tp->shutdown) {
-			break;
-		}
-
-		if (rv > 0) {
-			/*
-			 * at least one io event is set
-			 */
-			PRStatus rval_status;
-			PRInt32 index;
-
-			PR_ASSERT(pollfds[0].fd == tp->ioq.notify_fd);
-			/*
-			 * reset the pollable event, if notified
-			 */
-			if (pollfds[0].out_flags & PR_POLL_READ) {
-				rval_status = PR_WaitForPollableEvent(tp->ioq.notify_fd);
-				PR_ASSERT(PR_SUCCESS == rval_status);
-			}
-
-			for(index = 1; index < (pollfds_used); index++) {
-                PRInt16 events = pollfds[index].in_flags;
-                PRInt16 revents = pollfds[index].out_flags;	
-				jobp = polljobs[index];	
-
-                if ((revents & PR_POLL_NVAL) ||  /* busted in all cases */
-                	(revents & PR_POLL_ERR) ||
-                			((events & PR_POLL_WRITE) &&
-							(revents & PR_POLL_HUP))) { /* write op & hup */
-					PR_Lock(tp->ioq.lock);
-					if (jobp->cancel_io) {
-						CANCEL_IO_JOB(jobp);
-						PR_Unlock(tp->ioq.lock);
-						continue;
-					}
-					PR_REMOVE_AND_INIT_LINK(&jobp->links);
-					tp->ioq.cnt--;
-					jobp->on_ioq = PR_FALSE;
-					PR_Unlock(tp->ioq.lock);
-
-					/* set error */
-                    if (PR_POLL_NVAL & revents)
-						jobp->iod->error = PR_BAD_DESCRIPTOR_ERROR;
-                    else if (PR_POLL_HUP & revents)
-						jobp->iod->error = PR_CONNECT_RESET_ERROR;
-                    else 
-						jobp->iod->error = PR_IO_ERROR;
-
-					/*
-					 * add to jobq
-					 */
-					add_to_jobq(tp, jobp);
-				} else if (revents) {
-					/*
-					 * add to jobq
-					 */
-					PR_Lock(tp->ioq.lock);
-					if (jobp->cancel_io) {
-						CANCEL_IO_JOB(jobp);
-						PR_Unlock(tp->ioq.lock);
-						continue;
-					}
-					PR_REMOVE_AND_INIT_LINK(&jobp->links);
-					tp->ioq.cnt--;
-					jobp->on_ioq = PR_FALSE;
-					PR_Unlock(tp->ioq.lock);
-
-					if (jobp->io_op == JOB_IO_CONNECT) {
-						if (PR_GetConnectStatus(&pollfds[index]) == PR_SUCCESS)
-							jobp->iod->error = 0;
-						else
-							jobp->iod->error = PR_GetError();
-					} else
-						jobp->iod->error = 0;
-
-					add_to_jobq(tp, jobp);
-				}
-			}
-		}
-		/*
-		 * timeout processing
-		 */
-		now = PR_IntervalNow();
-		PR_Lock(tp->ioq.lock);
-		for (qp = tp->ioq.list.next; qp != &tp->ioq.list; qp = nextqp) {
-			nextqp = qp->next;
-			jobp = JOB_LINKS_PTR(qp);
-			if (jobp->cancel_io) {
-				CANCEL_IO_JOB(jobp);
-				continue;
-			}
-			if (PR_INTERVAL_NO_TIMEOUT == jobp->timeout)
-				break;
-			if ((PR_INTERVAL_NO_WAIT != jobp->timeout) &&
-								((PRInt32)(jobp->absolute - now) > 0))
-				break;
-			PR_REMOVE_AND_INIT_LINK(&jobp->links);
-			tp->ioq.cnt--;
-			jobp->on_ioq = PR_FALSE;
-			jobp->iod->error = PR_IO_TIMEOUT_ERROR;
-			add_to_jobq(tp, jobp);
-		}
-		PR_Unlock(tp->ioq.lock);
-	}
-}
-
-/*
- * timer worker thread function
- */
-static void timer_wstart(void *arg)
-{
-PRThreadPool *tp = (PRThreadPool *) arg;
-PRCList *qp;
-PRIntervalTime timeout;
-PRIntervalTime now;
-
-	/*
-	 * call PR_WaitCondVar with minimum value of all timeouts
-	 */
-	while (!tp->shutdown) {
-		PRJob *jobp;
-
-		PR_Lock(tp->timerq.lock);
-		if (PR_CLIST_IS_EMPTY(&tp->timerq.list)) {
-			timeout = PR_INTERVAL_NO_TIMEOUT;
-		} else {
-			PRCList *qp;
-
-			qp = tp->timerq.list.next;
-			jobp = JOB_LINKS_PTR(qp);
-
-			timeout = jobp->absolute - PR_IntervalNow();
-            if (timeout <= 0)
-				timeout = PR_INTERVAL_NO_WAIT;  /* already timed out */
-		}
-		if (PR_INTERVAL_NO_WAIT != timeout)
-			PR_WaitCondVar(tp->timerq.cv, timeout);
-		if (tp->shutdown) {
-			PR_Unlock(tp->timerq.lock);
-			break;
-		}
-		/*
-		 * move expired-timer jobs to jobq
-		 */
-		now = PR_IntervalNow();	
-		while (!PR_CLIST_IS_EMPTY(&tp->timerq.list)) {
-			qp = tp->timerq.list.next;
-			jobp = JOB_LINKS_PTR(qp);
-
-			if ((PRInt32)(jobp->absolute - now) > 0) {
-				break;
-			}
-			/*
-			 * job timed out
-			 */
-			PR_REMOVE_AND_INIT_LINK(&jobp->links);
-			tp->timerq.cnt--;
-			jobp->on_timerq = PR_FALSE;
-			add_to_jobq(tp, jobp);
-		}
-		PR_Unlock(tp->timerq.lock);
-	}
-}
-
-static void
-delete_threadpool(PRThreadPool *tp)
-{
-	if (NULL != tp) {
-		if (NULL != tp->shutdown_cv)
-			PR_DestroyCondVar(tp->shutdown_cv);
-		if (NULL != tp->jobq.cv)
-			PR_DestroyCondVar(tp->jobq.cv);
-		if (NULL != tp->jobq.lock)
-			PR_DestroyLock(tp->jobq.lock);
-		if (NULL != tp->join_lock)
-			PR_DestroyLock(tp->join_lock);
-#ifdef OPT_WINNT
-		if (NULL != tp->jobq.nt_completion_port)
-			CloseHandle(tp->jobq.nt_completion_port);
-#endif
-		/* Timer queue */
-		if (NULL != tp->timerq.cv)
-			PR_DestroyCondVar(tp->timerq.cv);
-		if (NULL != tp->timerq.lock)
-			PR_DestroyLock(tp->timerq.lock);
-
-		if (NULL != tp->ioq.lock)
-			PR_DestroyLock(tp->ioq.lock);
-		if (NULL != tp->ioq.pollfds)
-			PR_Free(tp->ioq.pollfds);
-		if (NULL != tp->ioq.notify_fd)
-			PR_DestroyPollableEvent(tp->ioq.notify_fd);
-		PR_Free(tp);
-	}
-	return;
-}
-
-static PRThreadPool *
-alloc_threadpool(void)
-{
-PRThreadPool *tp;
-
-	tp = (PRThreadPool *) PR_CALLOC(sizeof(*tp));
-	if (NULL == tp)
-		goto failed;
-	tp->jobq.lock = PR_NewLock();
-	if (NULL == tp->jobq.lock)
-		goto failed;
-	tp->jobq.cv = PR_NewCondVar(tp->jobq.lock);
-	if (NULL == tp->jobq.cv)
-		goto failed;
-	tp->join_lock = PR_NewLock();
-	if (NULL == tp->join_lock)
-		goto failed;
-#ifdef OPT_WINNT
-	tp->jobq.nt_completion_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE,
-									NULL, 0, 0);
-	if (NULL == tp->jobq.nt_completion_port)
-		goto failed;
-#endif
-
-	tp->ioq.lock = PR_NewLock();
-	if (NULL == tp->ioq.lock)
-		goto failed;
-
-	/* Timer queue */
-
-	tp->timerq.lock = PR_NewLock();
-	if (NULL == tp->timerq.lock)
-		goto failed;
-	tp->timerq.cv = PR_NewCondVar(tp->timerq.lock);
-	if (NULL == tp->timerq.cv)
-		goto failed;
-
-	tp->shutdown_cv = PR_NewCondVar(tp->jobq.lock);
-	if (NULL == tp->shutdown_cv)
-		goto failed;
-	tp->ioq.notify_fd = PR_NewPollableEvent();
-	if (NULL == tp->ioq.notify_fd)
-		goto failed;
-	return tp;
-failed:
-	delete_threadpool(tp);
-	PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	return NULL;
-}
-
-/* Create thread pool */
-PR_IMPLEMENT(PRThreadPool *)
-PR_CreateThreadPool(PRInt32 initial_threads, PRInt32 max_threads,
-                                PRUint32 stacksize)
-{
-PRThreadPool *tp;
-PRThread *thr;
-int i;
-wthread *wthrp;
-
-	tp = alloc_threadpool();
-	if (NULL == tp)
-		return NULL;
-
-	tp->init_threads = initial_threads;
-	tp->max_threads = max_threads;
-	tp->stacksize = stacksize;
-	PR_INIT_CLIST(&tp->jobq.list);
-	PR_INIT_CLIST(&tp->ioq.list);
-	PR_INIT_CLIST(&tp->timerq.list);
-	PR_INIT_CLIST(&tp->jobq.wthreads);
-	PR_INIT_CLIST(&tp->ioq.wthreads);
-	PR_INIT_CLIST(&tp->timerq.wthreads);
-	tp->shutdown = PR_FALSE;
-
-	PR_Lock(tp->jobq.lock);
-	for(i=0; i < initial_threads; ++i) {
-
-		thr = PR_CreateThread(PR_USER_THREAD, wstart,
-						tp, PR_PRIORITY_NORMAL,
-						PR_GLOBAL_THREAD, PR_JOINABLE_THREAD,stacksize);
-		PR_ASSERT(thr);
-		wthrp = PR_NEWZAP(wthread);
-		PR_ASSERT(wthrp);
-		wthrp->thread = thr;
-		PR_APPEND_LINK(&wthrp->links, &tp->jobq.wthreads);
-	}
-	tp->current_threads = initial_threads;
-
-	thr = PR_CreateThread(PR_USER_THREAD, io_wstart,
-					tp, PR_PRIORITY_NORMAL,
-					PR_GLOBAL_THREAD,PR_JOINABLE_THREAD,stacksize);
-	PR_ASSERT(thr);
-	wthrp = PR_NEWZAP(wthread);
-	PR_ASSERT(wthrp);
-	wthrp->thread = thr;
-	PR_APPEND_LINK(&wthrp->links, &tp->ioq.wthreads);
-
-	thr = PR_CreateThread(PR_USER_THREAD, timer_wstart,
-					tp, PR_PRIORITY_NORMAL,
-					PR_GLOBAL_THREAD,PR_JOINABLE_THREAD,stacksize);
-	PR_ASSERT(thr);
-	wthrp = PR_NEWZAP(wthread);
-	PR_ASSERT(wthrp);
-	wthrp->thread = thr;
-	PR_APPEND_LINK(&wthrp->links, &tp->timerq.wthreads);
-
-	PR_Unlock(tp->jobq.lock);
-	return tp;
-}
-
-static void
-delete_job(PRJob *jobp)
-{
-	if (NULL != jobp) {
-		if (NULL != jobp->join_cv) {
-			PR_DestroyCondVar(jobp->join_cv);
-			jobp->join_cv = NULL;
-		}
-		if (NULL != jobp->cancel_cv) {
-			PR_DestroyCondVar(jobp->cancel_cv);
-			jobp->cancel_cv = NULL;
-		}
-		PR_DELETE(jobp);
-	}
-}
-
-static PRJob *
-alloc_job(PRBool joinable, PRThreadPool *tp)
-{
-	PRJob *jobp;
-
-	jobp = PR_NEWZAP(PRJob);
-	if (NULL == jobp) 
-		goto failed;
-	if (joinable) {
-		jobp->join_cv = PR_NewCondVar(tp->join_lock);
-		jobp->join_wait = PR_TRUE;
-		if (NULL == jobp->join_cv)
-			goto failed;
-	} else {
-		jobp->join_cv = NULL;
-	}
-#ifdef OPT_WINNT
-	jobp->nt_notifier.jobp = jobp;
-#endif
-	return jobp;
-failed:
-	delete_job(jobp);
-	PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-	return NULL;
-}
-
-/* queue a job */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob(PRThreadPool *tpool, PRJobFn fn, void *arg, PRBool joinable)
-{
-	PRJob *jobp;
-
-	jobp = alloc_job(joinable, tpool);
-	if (NULL == jobp)
-		return NULL;
-
-	jobp->job_func = fn;
-	jobp->job_arg = arg;
-	jobp->tpool = tpool;
-
-	add_to_jobq(tpool, jobp);
-	return jobp;
-}
-
-/* queue a job, when a socket is readable or writeable */
-static PRJob *
-queue_io_job(PRThreadPool *tpool, PRJobIoDesc *iod, PRJobFn fn, void * arg,
-				PRBool joinable, io_op_type op)
-{
-	PRJob *jobp;
-	PRIntervalTime now;
-
-	jobp = alloc_job(joinable, tpool);
-	if (NULL == jobp) {
-		return NULL;
-	}
-
-	/*
-	 * Add a new job to io_jobq
-	 * wakeup io worker thread
-	 */
-
-	jobp->job_func = fn;
-	jobp->job_arg = arg;
-	jobp->tpool = tpool;
-	jobp->iod = iod;
-	if (JOB_IO_READ == op) {
-		jobp->io_op = JOB_IO_READ;
-		jobp->io_poll_flags = PR_POLL_READ;
-	} else if (JOB_IO_WRITE == op) {
-		jobp->io_op = JOB_IO_WRITE;
-		jobp->io_poll_flags = PR_POLL_WRITE;
-	} else if (JOB_IO_ACCEPT == op) {
-		jobp->io_op = JOB_IO_ACCEPT;
-		jobp->io_poll_flags = PR_POLL_READ;
-	} else if (JOB_IO_CONNECT == op) {
-		jobp->io_op = JOB_IO_CONNECT;
-		jobp->io_poll_flags = PR_POLL_WRITE|PR_POLL_EXCEPT;
-	} else {
-		delete_job(jobp);
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return NULL;
-	}
-
-	jobp->timeout = iod->timeout;
-	if ((PR_INTERVAL_NO_TIMEOUT == iod->timeout) ||
-			(PR_INTERVAL_NO_WAIT == iod->timeout)) {
-		jobp->absolute = iod->timeout;
-	} else {
-		now = PR_IntervalNow();
-		jobp->absolute = now + iod->timeout;
-	}
-
-
-	PR_Lock(tpool->ioq.lock);
-
-	if (PR_CLIST_IS_EMPTY(&tpool->ioq.list) ||
-			(PR_INTERVAL_NO_TIMEOUT == iod->timeout)) {
-		PR_APPEND_LINK(&jobp->links,&tpool->ioq.list);
-	} else if (PR_INTERVAL_NO_WAIT == iod->timeout) {
-		PR_INSERT_LINK(&jobp->links,&tpool->ioq.list);
-	} else {
-		PRCList *qp;
-		PRJob *tmp_jobp;
-		/*
-		 * insert into the timeout-sorted ioq
-		 */
-		for (qp = tpool->ioq.list.prev; qp != &tpool->ioq.list;
-							qp = qp->prev) {
-			tmp_jobp = JOB_LINKS_PTR(qp);
-			if ((PRInt32)(jobp->absolute - tmp_jobp->absolute) >= 0) {
-				break;
-			}
-		}
-		PR_INSERT_AFTER(&jobp->links,qp);
-	}
-
-	jobp->on_ioq = PR_TRUE;
-	tpool->ioq.cnt++;
-	/*
-	 * notify io worker thread(s)
-	 */
-	PR_Unlock(tpool->ioq.lock);
-	notify_ioq(tpool);
-	return jobp;
-}
-
-/* queue a job, when a socket is readable */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob_Read(PRThreadPool *tpool, PRJobIoDesc *iod, PRJobFn fn, void * arg,
-											PRBool joinable)
-{
-	return (queue_io_job(tpool, iod, fn, arg, joinable, JOB_IO_READ));
-}
-
-/* queue a job, when a socket is writeable */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob_Write(PRThreadPool *tpool, PRJobIoDesc *iod, PRJobFn fn,void * arg,
-										PRBool joinable)
-{
-	return (queue_io_job(tpool, iod, fn, arg, joinable, JOB_IO_WRITE));
-}
-
-
-/* queue a job, when a socket has a pending connection */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob_Accept(PRThreadPool *tpool, PRJobIoDesc *iod, PRJobFn fn,
-								void * arg, PRBool joinable)
-{
-	return (queue_io_job(tpool, iod, fn, arg, joinable, JOB_IO_ACCEPT));
-}
-
-/* queue a job, when a socket can be connected */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob_Connect(PRThreadPool *tpool, PRJobIoDesc *iod,
-			const PRNetAddr *addr, PRJobFn fn, void * arg, PRBool joinable)
-{
-	PRStatus rv;
-	PRErrorCode err;
-
-	rv = PR_Connect(iod->socket, addr, PR_INTERVAL_NO_WAIT);
-	if ((rv == PR_FAILURE) && ((err = PR_GetError()) == PR_IN_PROGRESS_ERROR)){
-		/* connection pending */
-		return(queue_io_job(tpool, iod, fn, arg, joinable, JOB_IO_CONNECT));
-	} else {
-		/*
-		 * connection succeeded or failed; add to jobq right away
-		 */
-		if (rv == PR_FAILURE)
-			iod->error = err;
-		else
-			iod->error = 0;
-		return(PR_QueueJob(tpool, fn, arg, joinable));
-	}
-}
-
-/* queue a job, when a timer expires */
-PR_IMPLEMENT(PRJob *)
-PR_QueueJob_Timer(PRThreadPool *tpool, PRIntervalTime timeout,
-							PRJobFn fn, void * arg, PRBool joinable)
-{
-	PRIntervalTime now;
-	PRJob *jobp;
-
-	if (PR_INTERVAL_NO_TIMEOUT == timeout) {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return NULL;
-	}
-	if (PR_INTERVAL_NO_WAIT == timeout) {
-		/*
-		 * no waiting; add to jobq right away
-		 */
-		return(PR_QueueJob(tpool, fn, arg, joinable));
-	}
-	jobp = alloc_job(joinable, tpool);
-	if (NULL == jobp) {
-		return NULL;
-	}
-
-	/*
-	 * Add a new job to timer_jobq
-	 * wakeup timer worker thread
-	 */
-
-	jobp->job_func = fn;
-	jobp->job_arg = arg;
-	jobp->tpool = tpool;
-	jobp->timeout = timeout;
-
-	now = PR_IntervalNow();
-	jobp->absolute = now + timeout;
-
-
-	PR_Lock(tpool->timerq.lock);
-	jobp->on_timerq = PR_TRUE;
-	if (PR_CLIST_IS_EMPTY(&tpool->timerq.list))
-		PR_APPEND_LINK(&jobp->links,&tpool->timerq.list);
-	else {
-		PRCList *qp;
-		PRJob *tmp_jobp;
-		/*
-		 * insert into the sorted timer jobq
-		 */
-		for (qp = tpool->timerq.list.prev; qp != &tpool->timerq.list;
-							qp = qp->prev) {
-			tmp_jobp = JOB_LINKS_PTR(qp);
-			if ((PRInt32)(jobp->absolute - tmp_jobp->absolute) >= 0) {
-				break;
-			}
-		}
-		PR_INSERT_AFTER(&jobp->links,qp);
-	}
-	tpool->timerq.cnt++;
-	/*
-	 * notify timer worker thread(s)
-	 */
-	notify_timerq(tpool);
-	PR_Unlock(tpool->timerq.lock);
-	return jobp;
-}
-
-static void
-notify_timerq(PRThreadPool *tp)
-{
-	/*
-	 * wakeup the timer thread(s)
-	 */
-	PR_NotifyCondVar(tp->timerq.cv);
-}
-
-static void
-notify_ioq(PRThreadPool *tp)
-{
-PRStatus rval_status;
-
-	/*
-	 * wakeup the io thread(s)
-	 */
-	rval_status = PR_SetPollableEvent(tp->ioq.notify_fd);
-	PR_ASSERT(PR_SUCCESS == rval_status);
-}
-
-/*
- * cancel a job
- *
- *	XXXX: is this needed? likely to be removed
- */
-PR_IMPLEMENT(PRStatus)
-PR_CancelJob(PRJob *jobp) {
-
-	PRStatus rval = PR_FAILURE;
-	PRThreadPool *tp;
-
-	if (jobp->on_timerq) {
-		/*
-		 * now, check again while holding the timerq lock
-		 */
-		tp = jobp->tpool;
-		PR_Lock(tp->timerq.lock);
-		if (jobp->on_timerq) {
-			jobp->on_timerq = PR_FALSE;
-			PR_REMOVE_AND_INIT_LINK(&jobp->links);
-			tp->timerq.cnt--;
-			PR_Unlock(tp->timerq.lock);
-			if (!JOINABLE_JOB(jobp)) {
-				delete_job(jobp);
-			} else {
-				JOIN_NOTIFY(jobp);
-			}
-			rval = PR_SUCCESS;
-		} else
-			PR_Unlock(tp->timerq.lock);
-	} else if (jobp->on_ioq) {
-		/*
-		 * now, check again while holding the ioq lock
-		 */
-		tp = jobp->tpool;
-		PR_Lock(tp->ioq.lock);
-		if (jobp->on_ioq) {
-			jobp->cancel_cv = PR_NewCondVar(tp->ioq.lock);
-			if (NULL == jobp->cancel_cv) {
-				PR_Unlock(tp->ioq.lock);
-				PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-				return PR_FAILURE;
-			}
-			/*
-			 * mark job 'cancelled' and notify io thread(s)
-			 * XXXX:
-			 *		this assumes there is only one io thread; when there
-			 * 		are multiple threads, the io thread processing this job
-			 * 		must be notified.
-			 */
-			jobp->cancel_io = PR_TRUE;
-			PR_Unlock(tp->ioq.lock);	/* release, reacquire ioq lock */
-			notify_ioq(tp);
-			PR_Lock(tp->ioq.lock);
-			while (jobp->cancel_io)
-				PR_WaitCondVar(jobp->cancel_cv, PR_INTERVAL_NO_TIMEOUT);
-			PR_Unlock(tp->ioq.lock);
-			PR_ASSERT(!jobp->on_ioq);
-			if (!JOINABLE_JOB(jobp)) {
-				delete_job(jobp);
-			} else {
-				JOIN_NOTIFY(jobp);
-			}
-			rval = PR_SUCCESS;
-		} else
-			PR_Unlock(tp->ioq.lock);
-	}
-	if (PR_FAILURE == rval)
-		PR_SetError(PR_INVALID_STATE_ERROR, 0);
-	return rval;
-}
-
-/* join a job, wait until completion */
-PR_IMPLEMENT(PRStatus)
-PR_JoinJob(PRJob *jobp)
-{
-	if (!JOINABLE_JOB(jobp)) {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return PR_FAILURE;
-	}
-	PR_Lock(jobp->tpool->join_lock);
-	while(jobp->join_wait)
-		PR_WaitCondVar(jobp->join_cv, PR_INTERVAL_NO_TIMEOUT);
-	PR_Unlock(jobp->tpool->join_lock);
-	delete_job(jobp);
-	return PR_SUCCESS;
-}
-
-/* shutdown threadpool */
-PR_IMPLEMENT(PRStatus)
-PR_ShutdownThreadPool(PRThreadPool *tpool)
-{
-PRStatus rval = PR_SUCCESS;
-
-	PR_Lock(tpool->jobq.lock);
-	tpool->shutdown = PR_TRUE;
-	PR_NotifyAllCondVar(tpool->shutdown_cv);
-	PR_Unlock(tpool->jobq.lock);
-
-	return rval;
-}
-
-/*
- * join thread pool
- * 	wait for termination of worker threads
- *	reclaim threadpool resources
- */
-PR_IMPLEMENT(PRStatus)
-PR_JoinThreadPool(PRThreadPool *tpool)
-{
-PRStatus rval = PR_SUCCESS;
-PRCList *head;
-PRStatus rval_status;
-
-	PR_Lock(tpool->jobq.lock);
-	while (!tpool->shutdown)
-		PR_WaitCondVar(tpool->shutdown_cv, PR_INTERVAL_NO_TIMEOUT);
-
-	/*
-	 * wakeup worker threads
-	 */
-#ifdef OPT_WINNT
-	/*
-	 * post shutdown notification for all threads
-	 */
-	{
-		int i;
-		for(i=0; i < tpool->current_threads; i++) {
-			PostQueuedCompletionStatus(tpool->jobq.nt_completion_port, 0,
-												TRUE, NULL);
-		}
-	}
-#else
-	PR_NotifyAllCondVar(tpool->jobq.cv);
-#endif
-
-	/*
-	 * wakeup io thread(s)
-	 */
-	notify_ioq(tpool);
-
-	/*
-	 * wakeup timer thread(s)
-	 */
-	PR_Lock(tpool->timerq.lock);
-	notify_timerq(tpool);
-	PR_Unlock(tpool->timerq.lock);
-
-	while (!PR_CLIST_IS_EMPTY(&tpool->jobq.wthreads)) {
-		wthread *wthrp;
-
-		head = PR_LIST_HEAD(&tpool->jobq.wthreads);
-		PR_REMOVE_AND_INIT_LINK(head);
-		PR_Unlock(tpool->jobq.lock);
-		wthrp = WTHREAD_LINKS_PTR(head);
-		rval_status = PR_JoinThread(wthrp->thread);
-		PR_ASSERT(PR_SUCCESS == rval_status);
-		PR_DELETE(wthrp);
-		PR_Lock(tpool->jobq.lock);
-	}
-	PR_Unlock(tpool->jobq.lock);
-	while (!PR_CLIST_IS_EMPTY(&tpool->ioq.wthreads)) {
-		wthread *wthrp;
-
-		head = PR_LIST_HEAD(&tpool->ioq.wthreads);
-		PR_REMOVE_AND_INIT_LINK(head);
-		wthrp = WTHREAD_LINKS_PTR(head);
-		rval_status = PR_JoinThread(wthrp->thread);
-		PR_ASSERT(PR_SUCCESS == rval_status);
-		PR_DELETE(wthrp);
-	}
-
-	while (!PR_CLIST_IS_EMPTY(&tpool->timerq.wthreads)) {
-		wthread *wthrp;
-
-		head = PR_LIST_HEAD(&tpool->timerq.wthreads);
-		PR_REMOVE_AND_INIT_LINK(head);
-		wthrp = WTHREAD_LINKS_PTR(head);
-		rval_status = PR_JoinThread(wthrp->thread);
-		PR_ASSERT(PR_SUCCESS == rval_status);
-		PR_DELETE(wthrp);
-	}
-
-	/*
-	 * Delete queued jobs
-	 */
-	while (!PR_CLIST_IS_EMPTY(&tpool->jobq.list)) {
-		PRJob *jobp;
-
-		head = PR_LIST_HEAD(&tpool->jobq.list);
-		PR_REMOVE_AND_INIT_LINK(head);
-		jobp = JOB_LINKS_PTR(head);
-		tpool->jobq.cnt--;
-		delete_job(jobp);
-	}
-
-	/* delete io jobs */
-	while (!PR_CLIST_IS_EMPTY(&tpool->ioq.list)) {
-		PRJob *jobp;
-
-		head = PR_LIST_HEAD(&tpool->ioq.list);
-		PR_REMOVE_AND_INIT_LINK(head);
-		tpool->ioq.cnt--;
-		jobp = JOB_LINKS_PTR(head);
-		delete_job(jobp);
-	}
-
-	/* delete timer jobs */
-	while (!PR_CLIST_IS_EMPTY(&tpool->timerq.list)) {
-		PRJob *jobp;
-
-		head = PR_LIST_HEAD(&tpool->timerq.list);
-		PR_REMOVE_AND_INIT_LINK(head);
-		tpool->timerq.cnt--;
-		jobp = JOB_LINKS_PTR(head);
-		delete_job(jobp);
-	}
-
-	PR_ASSERT(0 == tpool->jobq.cnt);
-	PR_ASSERT(0 == tpool->ioq.cnt);
-	PR_ASSERT(0 == tpool->timerq.cnt);
-
-	delete_threadpool(tpool);
-	return rval;
-}
diff --git a/libs/js/nsprpub/pr/src/misc/prtrace.c b/libs/js/nsprpub/pr/src/misc/prtrace.c
deleted file mode 100644
index d26f5027b9..0000000000
--- a/libs/js/nsprpub/pr/src/misc/prtrace.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** prtrace.c -- NSPR Trace Instrumentation
-**
-** Implement the API defined in prtrace.h
-**
-**
-**
-*/
-
-#include <string.h>
-#include "prtrace.h"
-#include "prclist.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prenv.h"
-#include "prmem.h"
-#include "prerror.h"
-
-
-#define DEFAULT_TRACE_BUFSIZE ( 1024 * 1024 )
-#define DEFAULT_BUFFER_SEGMENTS    2
-
-/*
-** Enumerate states in a RName structure
-*/
-typedef enum TraceState
-{
-    Running = 1,
-    Suspended = 2
-} TraceState;
-
-/*
-** Define QName structure
-*/
-typedef struct QName
-{
-    PRCList link;
-    PRCList rNameList;
-    char    name[PRTRACE_NAME_MAX+1];
-} QName;
-
-/*
-** Define RName structure
-*/
-typedef struct RName
-{
-    PRCList link;
-    PRLock  *lock;
-    QName   *qName;
-    TraceState state;
-    char    name[PRTRACE_NAME_MAX+1];
-    char    desc[PRTRACE_DESC_MAX+1];
-} RName;
-
-
-/*
-** The Trace Facility database
-**
-*/
-static PRLogModuleInfo *lm;
-
-static PRLock      *traceLock;      /* Facility Lock */
-static PRCList     qNameList;       /* anchor to all QName structures */
-static TraceState traceState = Running;
-
-/*
-** in-memory trace buffer controls
-*/
-static  PRTraceEntry    *tBuf;      /* pointer to buffer */
-static  PRInt32         bufSize;    /* size of buffer, in bytes, rounded up to sizeof(PRTraceEntry) */
-static  volatile PRInt32  next;     /* index to next PRTraceEntry */
-static  PRInt32         last;       /* index of highest numbered trace entry */
-
-/*
-** Real-time buffer capture controls
-*/
-static PRInt32 fetchLastSeen = 0;
-static PRBool  fetchLostData = PR_FALSE;
-
-/*
-** Buffer write-to-file controls
-*/
-static  PRLock      *logLock;               /* Sync lock */
-static  PRCondVar   *logCVar;               /* Sync Condidtion Variable */
-/*
-** Inter-thread state communication.
-** Controling thread writes to logOrder under protection of logCVar
-** the logging thread reads logOrder and sets logState on Notify.
-** 
-** logSegments, logCount, logLostData must be read and written under
-** protection of logLock, logCVar.
-** 
-*/
-static  enum LogState
-{
-    LogNotRunning,  /* Initial state */
-    LogReset,       /* Causes logger to re-calc controls */
-    LogActive,      /* Logging in progress, set only by log thread */
-    LogSuspend,     /* Suspend Logging */ 
-    LogResume,      /* Resume Logging => LogActive */ 
-    LogStop         /* Stop the log thread */
-}   logOrder, logState, localState;         /* controlling state variables */
-static  PRInt32     logSegments;            /* Number of buffer segments */
-static  PRInt32     logEntries;             /* number of Trace Entries in the buffer */
-static  PRInt32     logEntriesPerSegment;   /* number of PRTraceEntries per buffer segment */
-static  PRInt32     logSegSize;             /* size of buffer segment */
-static  PRInt32     logCount;               /* number of segments pending output */
-static  PRInt32     logLostData;            /* number of lost log buffer segments */
-
-/*
-** end Trace Database
-**
-*/
-
-/*
-** _PR_InitializeTrace() -- Initialize the trace facility
-*/
-static void NewTraceBuffer( PRInt32 size )
-{
-    /*
-    ** calculate the size of the buffer
-    ** round down so that each segment has the same number of
-    ** trace entries
-    */
-    logSegments = DEFAULT_BUFFER_SEGMENTS;
-    logEntries = size / sizeof(PRTraceEntry);
-    logEntriesPerSegment = logEntries / logSegments;
-    logEntries = logSegments * logEntriesPerSegment;
-    bufSize = logEntries * sizeof(PRTraceEntry);
-    logSegSize = logEntriesPerSegment * sizeof(PRTraceEntry);
-    PR_ASSERT( bufSize != 0);
-    PR_LOG( lm, PR_LOG_ERROR,
-        ("NewTraceBuffer: logSegments: %ld, logEntries: %ld, logEntriesPerSegment: %ld, logSegSize: %ld",
-            logSegments, logEntries, logEntriesPerSegment, logSegSize ));
-
-
-    tBuf = PR_Malloc( bufSize );
-    if ( tBuf == NULL )
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("PRTrace: Failed to get trace buffer"));
-        PR_ASSERT( 0 );
-    } 
-    else
-    {
-        PR_LOG( lm, PR_LOG_NOTICE,
-            ("PRTrace: Got trace buffer of size: %ld, at %p", bufSize, tBuf));
-    }
-
-    next = 0;
-    last = logEntries -1;
-    logCount = 0;
-    logLostData = PR_TRUE; /* not really on first call */
-    logOrder = LogReset;
-
-} /* end NewTraceBuffer() */
-
-/*
-** _PR_InitializeTrace() -- Initialize the trace facility
-*/
-static void _PR_InitializeTrace( void )
-{
-    /* The lock pointer better be null on this call */
-    PR_ASSERT( traceLock == NULL );
-
-    traceLock = PR_NewLock();
-    PR_ASSERT( traceLock != NULL );
-
-    PR_Lock( traceLock );
-    
-    PR_INIT_CLIST( &qNameList );
-
-    lm = PR_NewLogModule("trace");
-
-    bufSize = DEFAULT_TRACE_BUFSIZE;
-    NewTraceBuffer( bufSize );
-
-    /* Initialize logging controls */
-    logLock = PR_NewLock();
-    logCVar = PR_NewCondVar( logLock );
-
-    PR_Unlock( traceLock );
-    return;    
-} /* end _PR_InitializeTrace() */
-
-/*
-** Create a Trace Handle
-*/
-PR_IMPLEMENT(PRTraceHandle)
-	PR_CreateTrace( 
-    	const char *qName,          /* QName for this trace handle */
-	    const char *rName,          /* RName for this trace handle */
-	    const char *description     /* description for this trace handle */
-)
-{
-    QName   *qnp;
-    RName   *rnp;
-    PRBool  matchQname = PR_FALSE;
-
-    /* Self initialize, if necessary */
-    if ( traceLock == NULL )
-        _PR_InitializeTrace();
-
-    /* Validate input arguments */
-    PR_ASSERT( strlen(qName) <= PRTRACE_NAME_MAX );
-    PR_ASSERT( strlen(rName) <= PRTRACE_NAME_MAX );
-    PR_ASSERT( strlen(description) <= PRTRACE_DESC_MAX );
-
-    PR_LOG( lm, PR_LOG_DEBUG,
-            ("PRTRACE: CreateTrace: Qname: %s, RName: %s", qName, rName));
-
-    /* Lock the Facility */
-    PR_Lock( traceLock );
-
-    /* Do we already have a matching QName? */
-    if (!PR_CLIST_IS_EMPTY( &qNameList ))
-    {
-        qnp = (QName *) PR_LIST_HEAD( &qNameList );
-        do {
-            if ( strcmp(qnp->name, qName) == 0)
-            {
-                matchQname = PR_TRUE;
-                break;
-            }
-            qnp = (QName *)PR_NEXT_LINK( &qnp->link );
-        } while( qnp != (QName *)PR_LIST_HEAD( &qNameList ));
-    }
-    /*
-    ** If we did not find a matching QName,
-    **    allocate one and initialize it.
-    **    link it onto the qNameList.
-    **
-    */
-    if ( matchQname != PR_TRUE )
-    {
-        qnp = PR_NEWZAP( QName );
-        PR_ASSERT( qnp != NULL );
-        PR_INIT_CLIST( &qnp->link ); 
-        PR_INIT_CLIST( &qnp->rNameList ); 
-        strcpy( qnp->name, qName );
-        PR_APPEND_LINK( &qnp->link, &qNameList ); 
-    }
-
-    /* Do we already have a matching RName? */
-    if (!PR_CLIST_IS_EMPTY( &qnp->rNameList ))
-    {
-        rnp = (RName *) PR_LIST_HEAD( &qnp->rNameList );
-        do {
-            /*
-            ** No duplicate RNames are allowed within a QName
-            **
-            */
-            PR_ASSERT( strcmp(rnp->name, rName));
-            rnp = (RName *)PR_NEXT_LINK( &rnp->link );
-        } while( rnp != (RName *)PR_LIST_HEAD( &qnp->rNameList ));
-    }
-
-    /* Get a new RName structure; initialize its members */
-    rnp = PR_NEWZAP( RName );
-    PR_ASSERT( rnp != NULL );
-    PR_INIT_CLIST( &rnp->link );
-    strcpy( rnp->name, rName );
-    strcpy( rnp->desc, description );
-    rnp->lock = PR_NewLock();
-    rnp->state = Running;
-    if ( rnp->lock == NULL )
-    {
-        PR_ASSERT(0);
-    }
-
-    PR_APPEND_LINK( &rnp->link, &qnp->rNameList ); /* add RName to QName's rnList */    
-    rnp->qName = qnp;                       /* point the RName to the QName */
-
-    /* Unlock the Facility */
-    PR_Unlock( traceLock );
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: Create: QName: %s %p, RName: %s %p\n\t",
-        qName, qnp, rName, rnp ));
-
-    return((PRTraceHandle)rnp);
-} /* end  PR_CreateTrace() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_DestroyTrace( 
-		PRTraceHandle handle    /* Handle to be destroyed */
-)
-{
-    RName   *rnp = (RName *)handle;
-    QName   *qnp = rnp->qName;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: Deleting: QName: %s, RName: %s", 
-        qnp->name, rnp->name));
-
-    /* Lock the Facility */
-    PR_Lock( traceLock );
-
-    /*
-    ** Remove RName from the list of RNames in QName
-    ** and free RName
-    */
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: Deleting RName: %s, %p", 
-        rnp->name, rnp));
-    PR_REMOVE_LINK( &rnp->link );
-    PR_Free( rnp->lock );
-    PR_DELETE( rnp );
-
-    /*
-    ** If this is the last RName within QName
-    **   remove QName from the qNameList and free it
-    */
-    if ( PR_CLIST_IS_EMPTY( &qnp->rNameList ) )
-    {
-        PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: Deleting unused QName: %s, %p", 
-            qnp->name, qnp));
-        PR_REMOVE_LINK( &qnp->link );
-        PR_DELETE( qnp );
-    } 
-
-    /* Unlock the Facility */
-    PR_Unlock( traceLock );
-    return;
-} /* end PR_DestroyTrace()  */
-
-/*
-** Create a TraceEntry in the trace buffer
-*/
-PR_IMPLEMENT(void) 
-	PR_Trace( 
-    	PRTraceHandle handle,       /* use this trace handle */
-	    PRUint32    userData0,      /* User supplied data word 0 */
-	    PRUint32    userData1,      /* User supplied data word 1 */
-	    PRUint32    userData2,      /* User supplied data word 2 */
-	    PRUint32    userData3,      /* User supplied data word 3 */
-	    PRUint32    userData4,      /* User supplied data word 4 */
-	    PRUint32    userData5,      /* User supplied data word 5 */
-	    PRUint32    userData6,      /* User supplied data word 6 */
-	    PRUint32    userData7       /* User supplied data word 7 */
-)
-{
-    PRTraceEntry   *tep;
-    PRInt32         mark;
-
-    if ( (traceState == Suspended ) 
-        || ( ((RName *)handle)->state == Suspended )) 
-        return;
-
-    /*
-    ** Get the next trace entry slot w/ minimum delay
-    */
-    PR_Lock( traceLock );
-
-    tep = &tBuf[next++]; 
-    if ( next > last )
-        next = 0;
-    if ( fetchLostData == PR_FALSE && next == fetchLastSeen )
-        fetchLostData = PR_TRUE;
-    
-    mark = next;
-        
-    PR_Unlock( traceLock );
-
-    /*
-    ** We have a trace entry. Fill it in.
-    */
-    tep->thread = PR_GetCurrentThread();
-    tep->handle = handle;
-    tep->time   = PR_Now();
-    tep->userData[0] = userData0;
-    tep->userData[1] = userData1;
-    tep->userData[2] = userData2;
-    tep->userData[3] = userData3;
-    tep->userData[4] = userData4;
-    tep->userData[5] = userData5;
-    tep->userData[6] = userData6;
-    tep->userData[7] = userData7;
-
-    /* When buffer segment is full, signal trace log thread to run */
-    if (( mark % logEntriesPerSegment) == 0 )
-    {
-        PR_Lock( logLock );
-        logCount++;
-        PR_NotifyCondVar( logCVar );
-        PR_Unlock( logLock );
-        /*
-        ** Gh0D! This is awful!
-        ** Anyway, to minimize lost trace data segments,
-        ** I inserted the PR_Sleep(0) to cause a context switch
-        ** so that the log thread could run.
-        ** I know, it perturbs the universe and may cause
-        ** funny things to happen in the optimized builds.
-        ** Take it out, loose data; leave it in risk Heisenberg.
-        */
-        /* PR_Sleep(0); */
-    }
-
-    return;
-} /* end PR_Trace() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_SetTraceOption( 
-	    PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-)
-{
-    RName * rnp;
-
-    switch ( command )
-    {
-        case PRTraceBufSize :
-            PR_Lock( traceLock );
-            PR_Free( tBuf );
-            bufSize = *(PRInt32 *)value;
-            NewTraceBuffer( bufSize );
-            PR_Unlock( traceLock );
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceBufSize: %ld", bufSize));
-            break;
-        
-        case PRTraceEnable :
-            rnp = *(RName **)value;
-            rnp->state = Running;
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceEnable: %p", rnp));
-            break;
-        
-        case PRTraceDisable :
-            rnp = *(RName **)value;
-            rnp->state = Suspended;
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceDisable: %p", rnp));
-            break;
-        
-        case PRTraceSuspend :
-            traceState = Suspended;
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceSuspend"));
-            break;
-        
-        case PRTraceResume :
-            traceState = Running;
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceResume"));
-            break;
-        
-        case PRTraceSuspendRecording :
-            PR_Lock( logLock );
-            logOrder = LogSuspend;
-            PR_NotifyCondVar( logCVar );
-            PR_Unlock( logLock );
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceSuspendRecording"));
-            break;
-        
-        case PRTraceResumeRecording :
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceResumeRecording"));
-            if ( logState != LogSuspend )
-                break;
-            PR_Lock( logLock );
-            logOrder = LogResume;
-            PR_NotifyCondVar( logCVar );
-            PR_Unlock( logLock );
-            break;
-        
-        case PRTraceStopRecording :
-            PR_Lock( logLock );
-            logOrder = LogStop;
-            PR_NotifyCondVar( logCVar );
-            PR_Unlock( logLock );
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceStopRecording"));
-            break;
-
-        case PRTraceLockHandles :
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceLockTraceHandles"));
-            PR_Lock( traceLock );
-            break;
-        
-        case PRTraceUnLockHandles :
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRSetTraceOption: PRTraceUnLockHandles"));
-            PR_Lock( traceLock );
-            break;
-
-        default:
-            PR_LOG( lm, PR_LOG_ERROR,
-                ("PRSetTraceOption: Invalid command %ld", command ));
-            PR_ASSERT( 0 );
-            break;
-    } /* end switch() */
-    return;
-} /* end  PR_SetTraceOption() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_GetTraceOption( 
-    	PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-)
-{
-    switch ( command )
-    {
-        case PRTraceBufSize :
-            *((PRInt32 *)value) = bufSize;
-            PR_LOG( lm, PR_LOG_DEBUG,
-                ("PRGetTraceOption: PRTraceBufSize: %ld", bufSize ));
-            break;
-        
-        default:
-            PR_LOG( lm, PR_LOG_ERROR,
-                ("PRGetTraceOption: Invalid command %ld", command ));
-            PR_ASSERT( 0 );
-            break;
-    } /* end switch() */
-    return;
-} /* end PR_GetTraceOption() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRTraceHandle) 
-	PR_GetTraceHandleFromName( 
-    	const char *qName,      /* QName search argument */
-        const char *rName       /* RName search argument */
-)
-{
-    const char    *qn, *rn, *desc;
-    PRTraceHandle     qh, rh = NULL;
-    RName   *rnp = NULL;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: GetTraceHandleFromName:\n\t"
-        "QName: %s, RName: %s", qName, rName ));
-
-    qh = PR_FindNextTraceQname( NULL );
-    while (qh != NULL)
-    {
-        rh = PR_FindNextTraceRname( NULL, qh );
-        while ( rh != NULL )
-        {
-            PR_GetTraceNameFromHandle( rh, &qn, &rn, &desc );
-            if ( (strcmp( qName, qn ) == 0)
-                && (strcmp( rName, rn ) == 0 ))
-            {
-                rnp = (RName *)rh;
-                goto foundIt;
-            }
-            rh = PR_FindNextTraceRname( rh, qh );
-        }
-        qh = PR_FindNextTraceQname( NULL );
-    }
-
-foundIt:
-    PR_LOG( lm, PR_LOG_DEBUG, ("PR_Counter: GetConterHandleFromName: %p", rnp ));
-    return(rh);
-} /* end PR_GetTraceHandleFromName() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void) 
-	PR_GetTraceNameFromHandle( 
-    	PRTraceHandle handle,       /* handle as search argument */
-	    const char **qName,         /* pointer to associated QName */
-	    const char **rName,         /* pointer to associated RName */
-    	const char **description    /* pointer to associated description */
-)
-{
-    RName   *rnp = (RName *)handle;
-    QName   *qnp = rnp->qName;
-
-    *qName = qnp->name;
-    *rName = rnp->name;
-    *description = rnp->desc;
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: GetConterNameFromHandle: "
-        "QNp: %p, RNp: %p,\n\tQName: %s, RName: %s, Desc: %s", 
-        qnp, rnp, qnp->name, rnp->name, rnp->desc ));
-
-    return;
-} /* end PR_GetTraceNameFromHandle() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRTraceHandle) 
-	PR_FindNextTraceQname( 
-        PRTraceHandle handle
-)
-{
-    QName *qnp = (QName *)handle;
-
-    if ( PR_CLIST_IS_EMPTY( &qNameList ))
-            qnp = NULL;
-    else if ( qnp == NULL )
-        qnp = (QName *)PR_LIST_HEAD( &qNameList );
-    else if ( PR_NEXT_LINK( &qnp->link ) ==  &qNameList )
-        qnp = NULL;
-    else  
-        qnp = (QName *)PR_NEXT_LINK( &qnp->link );
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: FindNextQname: Handle: %p, Returns: %p", 
-        handle, qnp ));
-
-    return((PRTraceHandle)qnp);
-} /* end PR_FindNextTraceQname() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRTraceHandle) 
-	PR_FindNextTraceRname( 
-        PRTraceHandle rhandle,
-        PRTraceHandle qhandle
-)
-{
-    RName *rnp = (RName *)rhandle;
-    QName *qnp = (QName *)qhandle;
-
-
-    if ( PR_CLIST_IS_EMPTY( &qnp->rNameList ))
-        rnp = NULL;
-    else if ( rnp == NULL )
-        rnp = (RName *)PR_LIST_HEAD( &qnp->rNameList );
-    else if ( PR_NEXT_LINK( &rnp->link ) ==  &qnp->rNameList )
-        rnp = NULL;
-    else
-        rnp = (RName *)PR_NEXT_LINK( &rnp->link );
-
-    PR_LOG( lm, PR_LOG_DEBUG, ("PRTrace: FindNextRname: Rhandle: %p, QHandle: %p, Returns: %p", 
-        rhandle, qhandle, rnp ));
-
-    return((PRTraceHandle)rnp);
-} /* end PR_FindNextTraceRname() */
-    
-/*
-**
-*/
-static PRFileDesc * InitializeRecording( void )
-{
-    char    *logFileName;
-    PRFileDesc  *logFile;
-
-    /* Self initialize, if necessary */
-    if ( traceLock == NULL )
-        _PR_InitializeTrace();
-
-    PR_LOG( lm, PR_LOG_DEBUG,
-        ("PR_RecordTraceEntries: begins"));
-
-    logLostData = 0; /* reset at entry */
-    logState = LogReset;
-
-    /* Get the filename for the logfile from the environment */
-    logFileName = PR_GetEnv( "NSPR_TRACE_LOG" );
-    if ( logFileName == NULL )
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("RecordTraceEntries: Environment variable not defined. Exiting"));
-        return NULL;
-    }
-    
-    /* Open the logfile */
-    logFile = PR_Open( logFileName, PR_WRONLY | PR_CREATE_FILE, 0666 );
-    if ( logFile == NULL )
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("RecordTraceEntries: Cannot open %s as trace log file. OS error: %ld", 
-		logFileName, PR_GetOSError()));
-        return NULL;
-    }
-    return logFile;
-} /* end InitializeRecording() */
-
-/*
-**
-*/
-static void ProcessOrders( void )
-{
-    switch ( logOrder )
-    {
-    case LogReset :
-        logOrder = logState = localState;
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("RecordTraceEntries: LogReset"));
-        break;
-
-    case LogSuspend :
-        localState = logOrder = logState = LogSuspend;
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("RecordTraceEntries: LogSuspend"));
-        break;
-
-    case LogResume :
-        localState = logOrder = logState = LogActive;
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("RecordTraceEntries: LogResume"));
-        break;
-
-    case LogStop :
-        logOrder = logState = LogStop;
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("RecordTraceEntries: LogStop"));
-        break;
-
-    default :
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("RecordTraceEntries: Invalid logOrder: %ld", logOrder ));
-        PR_ASSERT( 0 );
-        break;
-    } /* end switch() */
-    return ;
-} /* end ProcessOrders() */
-
-/*
-**
-*/
-static void WriteTraceSegment( PRFileDesc *logFile, void *buf, PRInt32 amount )
-{
-    PRInt32 rc;
-
-
-    PR_LOG( lm, PR_LOG_ERROR,
-        ("WriteTraceSegment: Buffer: %p, Amount: %ld", buf, amount));
-    rc = PR_Write( logFile, buf , amount );
-    if ( rc == -1 )
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("RecordTraceEntries: PR_Write() failed. Error: %ld", PR_GetError() ));
-    else if ( rc != amount )
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("RecordTraceEntries: PR_Write() Tried to write: %ld, Wrote: %ld", amount, rc));
-    else 
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("RecordTraceEntries: PR_Write(): Buffer: %p, bytes: %ld", buf, amount));
-
-    return;
-} /* end WriteTraceSegment() */
-
-/*
-**
-*/
-PR_IMPLEMENT(void)
-	PR_RecordTraceEntries(
-        void 
-)
-{
-    PRFileDesc  *logFile;
-    PRInt32     lostSegments;
-    PRInt32     currentSegment = 0;
-    void        *buf;
-    PRBool      doWrite;
-
-    logFile = InitializeRecording();
-    if ( logFile == NULL )
-    {
-        PR_LOG( lm, PR_LOG_DEBUG,
-            ("PR_RecordTraceEntries: Failed to initialize"));
-        return;
-    }
-
-    /* Do this until told to stop */
-    while ( logState != LogStop )
-    {
-
-        PR_Lock( logLock );
-
-        while ( (logCount == 0) && ( logOrder == logState ) )
-            PR_WaitCondVar( logCVar, PR_INTERVAL_NO_TIMEOUT );
-
-        /* Handle state transitions */
-        if ( logOrder != logState )
-            ProcessOrders();
-
-        /* recalculate local controls */
-        if ( logCount )
-        {
-            lostSegments = logCount - logSegments;
-            if ( lostSegments > 0 )
-            {
-                logLostData += ( logCount - logSegments );
-                logCount = (logCount % logSegments);
-                currentSegment = logCount;
-                PR_LOG( lm, PR_LOG_DEBUG,
-                    ("PR_RecordTraceEntries: LostData segments: %ld", logLostData));
-            }
-            else
-            {
-                logCount--;
-            }
-
-            buf = tBuf + ( logEntriesPerSegment * currentSegment );
-            if (++currentSegment >= logSegments )
-                currentSegment = 0;
-            doWrite = PR_TRUE;
-        }
-        else
-            doWrite = PR_FALSE;
-
-        PR_Unlock( logLock );
-
-        if ( doWrite == PR_TRUE )
-        {
-            if ( localState != LogSuspend )
-                WriteTraceSegment( logFile, buf, logSegSize );
-            else
-                PR_LOG( lm, PR_LOG_DEBUG,
-                    ("RecordTraceEntries: PR_Write(): is suspended" ));
-        }
-
-    } /* end while(logState...) */
-
-    PR_Close( logFile );
-    PR_LOG( lm, PR_LOG_DEBUG,
-        ("RecordTraceEntries: exiting"));
-    return;
-} /* end  PR_RecordTraceEntries() */
-
-/*
-**
-*/
-PR_IMPLEMENT(PRIntn)
-    PR_GetTraceEntries(
-        PRTraceEntry    *buffer,    /* where to write output */
-        PRInt32         count,      /* number to get */
-        PRInt32         *found      /* number you got */
-)
-{
-    PRInt32 rc; 
-    PRInt32 copied = 0;
-    
-    PR_Lock( traceLock );
-    
-    /*
-    ** Depending on where the LastSeen and Next indices are,
-    ** copy the trace buffer in one or two pieces. 
-    */
-    PR_LOG( lm, PR_LOG_ERROR,
-        ("PR_GetTraceEntries: Next: %ld, LastSeen: %ld", next, fetchLastSeen));
-
-    if ( fetchLastSeen <= next )
-    {
-        while (( count-- > 0 ) && (fetchLastSeen < next ))
-        {
-            *(buffer + copied++) = *(tBuf + fetchLastSeen++);
-        }
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("PR_GetTraceEntries: Copied: %ld, LastSeen: %ld", copied, fetchLastSeen));
-    }
-    else /* copy in 2 parts */
-    {
-        while ( count-- > 0  && fetchLastSeen <= last )
-        {
-            *(buffer + copied++) = *(tBuf + fetchLastSeen++);
-        }
-        fetchLastSeen = 0;
-
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("PR_GetTraceEntries: Copied: %ld, LastSeen: %ld", copied, fetchLastSeen));
-
-        while ( count-- > 0  && fetchLastSeen < next )
-        {
-            *(buffer + copied++) = *(tBuf + fetchLastSeen++);
-        }
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("PR_GetTraceEntries: Copied: %ld, LastSeen: %ld", copied, fetchLastSeen));
-    }
-
-    *found = copied;
-    rc = ( fetchLostData == PR_TRUE )? 1 : 0;
-    fetchLostData = PR_FALSE;
-
-    PR_Unlock( traceLock );
-    return rc;
-} /* end PR_GetTraceEntries() */
-
-/* end prtrace.c */
diff --git a/libs/js/nsprpub/pr/src/nspr.def b/libs/js/nsprpub/pr/src/nspr.def
deleted file mode 100644
index c547258552..0000000000
--- a/libs/js/nsprpub/pr/src/nspr.def
+++ /dev/null
@@ -1,346 +0,0 @@
-;+#
-;+# ***** BEGIN LICENSE BLOCK *****
-;+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;+#
-;+# The contents of this file are subject to the Mozilla Public License Version
-;+# 1.1 (the "License"); you may not use this file except in compliance with
-;+# the License. You may obtain a copy of the License at
-;+# http://www.mozilla.org/MPL/
-;+#
-;+# Software distributed under the License is distributed on an "AS IS" basis,
-;+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-;+# for the specific language governing rights and limitations under the
-;+# License.
-;+#
-;+# The Original Code is the Netscape Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is
-;+# Netscape Communications Corporation.
-;+# Portions created by the Initial Developer are Copyright (C) 2002-2003
-;+# the Initial Developer. All Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the terms of
-;+# either the GNU General Public License Version 2 or later (the "GPL"), or
-;+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-;+# in which case the provisions of the GPL or the LGPL are applicable instead
-;+# of those above. If you wish to allow use of your version of this file only
-;+# under the terms of either the GPL or the LGPL, and not to allow others to
-;+# use your version of this file under the terms of the MPL, indicate your
-;+# decision by deleting the provisions above and replace them with the notice
-;+# and other provisions required by the GPL or the LGPL. If you do not delete
-;+# the provisions above, a recipient may use your version of this file under
-;+# the terms of any one of the MPL, the GPL or the LGPL.
-;+#
-;+# ***** END LICENSE BLOCK *****
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+#
-;+NSPR_4.0 {
-;+	global:
-LIBRARY nspr4 ;-
-EXPORTS ;-
-		PR_Abort;
-		PR_Accept;
-		PR_AcceptRead;
-		PR_Access;
-		PR_AddWaitFileDesc;
-		PR_AllocFileDesc;
-		PR_Assert;
-		PR_AtomicAdd;
-		PR_AtomicDecrement;
-		PR_AtomicIncrement;
-		PR_AtomicSet;
-		PR_AttachThread;
-		PR_Available;
-		PR_Available64;
-		PR_Bind;
-		PR_BlockClockInterrupts;
-		PR_BlockInterrupt;
-		PR_CallOnce;
-		PR_Calloc;
-		PR_CancelWaitFileDesc;
-		PR_CancelWaitGroup;
-		PR_ChangeFileDescNativeHandle;
-		PR_Cleanup;
-		PR_ClearInterrupt;
-		PR_ClearThreadGCAble;
-		PR_Close;
-		PR_CloseDir;
-		PR_CloseFileMap;
-		PR_CloseSemaphore;
-		PR_Connect;
-		PR_ConvertIPv4AddrToIPv6;
-		PR_CreateFileMap;
-		PR_CreateIOLayerStub;
-		PR_CreateOrderedLock;
-		PR_CreateMWaitEnumerator;
-		PR_CreatePipe;
-		PR_CreateProcess;
-		PR_CreateProcessDetached;
-		PR_CreateSocketPollFd;
-		PR_CreateStack;
-		PR_CreateThread;
-		PR_CreateThreadGCAble;
-		PR_CreateWaitGroup;
-		PR_Delete;
-		PR_DeleteSemaphore;
-		PR_DestroyCondVar;
-		PR_DestroyLock;
-		PR_DestroyMWaitEnumerator;
-		PR_DestroyOrderedLock;
-		PR_DestroyMonitor;
-		PR_DestroyProcessAttr;
-		PR_DestroySem;
-		PR_DestroySocketPollFd;
-		PR_DestroyStack;
-		PR_DestroyWaitGroup;
-		PR_DetachProcess;
-		PR_DetachThread;
-		PR_DisableClockInterrupts;
-		PR_EnableClockInterrupts;
-		PR_EnterMonitor;
-		PR_EnumerateHostEnt;
-		PR_EnumerateThreads;
-		PR_EnumerateWaitGroup;
-		PR_ExitMonitor;
-		PR_ExplodeTime;
-		PR_FD_CLR;
-		PR_FD_ISSET;
-		PR_FD_NCLR;
-		PR_FD_NISSET;
-		PR_FD_NSET;
-		PR_FD_SET;
-		PR_FD_ZERO;
-		PR_FileDesc2NativeHandle;
-		PR_FormatTime;
-		PR_FormatTimeUSEnglish;
-		PR_Free;
-		PR_GMTParameters;
-		PR_GetConnectStatus;
-		PR_GetCurrentThread;
-		PR_GetDefaultIOMethods;
-		PR_GetDescType;
-		PR_GetError;
-		PR_GetErrorText;
-		PR_GetErrorTextLength;
-		PR_GetFileInfo;
-		PR_GetFileInfo64;
-		PR_GetFileMethods;
-		PR_GetHostByAddr;
-		PR_GetHostByName;
-		PR_GetIPNodeByName;
-		PR_GetIdentitiesLayer;
-		PR_GetLayersIdentity;
-		PR_GetMonitorEntryCount;
-		PR_GetNameForIdentity;
-		PR_GetOSError;
-		PR_GetOpenFileInfo;
-		PR_GetOpenFileInfo64;
-		PR_GetPageShift;
-		PR_GetPageSize;
-		PR_GetPeerName;
-		PR_GetPipeMethods;
-		PR_GetProtoByName;
-		PR_GetProtoByNumber;
-		PR_GetSP;
-		PR_GetSockName;
-		PR_GetSocketOption;
-		PR_GetSpecialFD;
-		PR_GetSysfdTableMax;
-		PR_GetTCPMethods;
-		PR_GetThreadAffinityMask;
-		PR_GetThreadID;
-		PR_GetThreadPriority;
-		PR_GetThreadPrivate;
-		PR_GetThreadScope;
-		PR_GetThreadState;
-		PR_GetThreadType;
-		PR_GetUDPMethods;
-		PR_GetUniqueIdentity;
-		PR_ImplodeTime;
-		PR_ImportFile;
-		PR_ImportTCPSocket;
-		PR_ImportUDPSocket;
-		PR_Init;
-		PR_Initialize;
-		PR_InitializeNetAddr;
-		PR_Initialized;
-		PR_Interrupt;
-		PR_IntervalNow;
-		PR_IntervalToMicroseconds;
-		PR_IntervalToMilliseconds;
-		PR_IntervalToSeconds;
-		PR_IsNetAddrType;
-		PR_JoinThread;
-		PR_KillProcess;
-		PR_Listen;
-		PR_LocalTimeParameters;
-		PR_Lock;
-		PR_LockFile;
-		PR_LogFlush;
-		PR_LogPrint;
-		PR_MakeDir;
-		PR_Malloc;
-		PR_MemMap;
-		PR_MemUnmap;
-		PR_MicrosecondsToInterval;
-		PR_MillisecondsToInterval;
-		PR_LockOrderedLock;
-		PR_MkDir;
-		PR_NetAddrToString;
-		PR_NewCondVar;
-		PR_NewLock;
-		PR_NewLogModule;
-		PR_NewMonitor;
-		PR_NewNamedMonitor;
-		PR_NewProcessAttr;
-		PR_NewSem;
-		PR_NewTCPSocketPair;
-		PR_NewThreadPrivateIndex;
-		PR_NormalizeTime;
-		PR_Notify;
-		PR_NotifyAll;
-		PR_NotifyAllCondVar;
-		PR_NotifyCondVar;
-		PR_Now;
-		PR_Open;
-		PR_OpenDir;
-		PR_OpenFile;
-		PR_OpenSemaphore;
-		PR_ParseTimeString;
-		PR_Poll;
-		PR_PopIOLayer;
-		PR_PostSem;
-		PR_PostSemaphore;
-		PR_ProcessAttrSetCurrentDirectory;
-		PR_ProcessAttrSetInheritableFD;
-		PR_ProcessAttrSetStdioRedirect;
-		PR_ProcessExit;
-		PR_PushIOLayer;
-		PR_Read;
-		PR_ReadDir;
-		PR_Realloc;
-		PR_Recv;
-		PR_RecvFrom;
-		PR_Rename;
-		PR_ResetProcessAttr;
-		PR_ResumeAll;
-		PR_RmDir;
-		PR_SecondsToInterval;
-		PR_Seek;
-		PR_Seek64;
-		PR_Select;
-		PR_Send;
-		PR_SendFile;
-		PR_SendTo;
-		PR_SetConcurrency;
-		PR_SetError;
-		PR_SetErrorText;
-		PR_SetFDCacheSize;
-		PR_SetFDInheritable;
-		PR_SetLogBuffering;
-		PR_SetLogFile;
-		PR_SetNetAddr;
-		PR_SetSocketOption;
-		PR_SetSysfdTableSize;
-		PR_SetThreadAffinityMask;
-		PR_SetThreadDumpProc;
-		PR_SetThreadGCAble;
-		PR_SetThreadPriority;
-		PR_SetThreadPrivate;
-		PR_SetThreadRecycleMode;
-		PR_Shutdown;
-		PR_Sleep;
-		PR_StackPop;
-		PR_StackPush;
-		PR_Stat;
-		PR_StringToNetAddr;
-		PR_SuspendAll;
-		PR_Sync;
-		PR_TLockFile;
-		PR_TicksPerSecond;
-		PR_TransmitFile;
-		PR_USPacificTimeParameters;
-		PR_UnblockClockInterrupts;
-		PR_UnblockInterrupt;
-		PR_Unlock;
-		PR_UnlockFile;
-		PR_VersionCheck;
-		PR_Wait;
-		PR_WaitCondVar;
-		PR_WaitProcess;
-		PR_WaitRecvReady;
-		PR_WaitSem;
-		PR_WaitSemaphore;
-		PR_Write;
-		PR_Writev;
-		PR_Yield;
-		PR_UnlockOrderedLock;
-		PR_htonl;
-		PR_htonll;
-		PR_htons;
-		PR_ntohl;
-		PR_ntohll;
-		PR_ntohs;
-		PR_smprintf;
-		PR_smprintf_free;
-		PR_snprintf;
-		PR_sprintf_append;
-		PR_sxprintf;
-		PR_vsmprintf;
-		PR_vsnprintf;
-		PR_vsprintf_append;
-		PR_vsxprintf;
-		PRP_DestroyNakedCondVar;
-		PRP_NakedBroadcast;
-		PRP_NakedNotify;
-		PRP_NakedWait;
-		PRP_NewNakedCondVar;
-		PRP_TryLock;
-		libVersionPoint;
-;+	local: *;
-;+};
-;+
-;+NSPRprivate {
-;+	global:
-		GetExecutionEnvironment;
-		PT_FPrintStats;
-		SetExecutionEnvironment;
-;+	local: *;
-;+};
-;+
-;+NSPR_4.1 {
-;+	global:
-		PR_ConnectContinue;
-		PR_CreateIOLayer;
-		PR_EmulateAcceptRead;
-		PR_EmulateSendFile;
-		PR_GetMemMapAlignment;
-		PR_ImportPipe;
-;+} NSPR_4.0;
-;+
-;+NSPR_4.3 {
-;+	global:
-		PR_CallOnceWithArg;
-;+} NSPR_4.1;
-;+
-;+NSPR_4.5 {
-;+	global:
-		PR_EnumerateAddrInfo;
-		PR_FreeAddrInfo;
-		PR_GetAddrInfoByName;
-		PR_GetCanonNameFromAddrInfo;
-;+} NSPR_4.3;
diff --git a/libs/js/nsprpub/pr/src/nspr.rc b/libs/js/nsprpub/pr/src/nspr.rc
deleted file mode 100644
index d3cc2ef37b..0000000000
--- a/libs/js/nsprpub/pr/src/nspr.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include <winver.h>
-
-#define MY_LIBNAME "nspr"
-#define MY_FILEDESCRIPTION "NSPR Library"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define PR_VMAJOR_STR STRINGIZE2(PR_VMAJOR)
-
-#ifdef _DEBUG
-#define MY_DEBUG_STR " (debug)"
-#define MY_FILEFLAGS_1 VS_FF_DEBUG
-#else
-#define MY_DEBUG_STR ""
-#define MY_FILEFLAGS_1 0x0L
-#endif
-#if PR_BETA
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
-#else
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
-#endif
-
-#ifdef WINNT
-#define MY_FILEOS VOS_NT_WINDOWS32
-#define MY_INTERNAL_NAME "lib" MY_LIBNAME PR_VMAJOR_STR
-#else
-#define MY_FILEOS VOS__WINDOWS32
-#define MY_INTERNAL_NAME MY_LIBNAME PR_VMAJOR_STR
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version-information resource
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- PRODUCTVERSION PR_VMAJOR,PR_VMINOR,PR_VPATCH,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS MY_FILEFLAGS_2
- FILEOS MY_FILEOS
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L // not used
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
-        BEGIN
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
-            VALUE "FileVersion", PR_VERSION "\0"
-            VALUE "InternalName", MY_INTERNAL_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \251 1996-2000 Netscape Communications Corporation\0"
-            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
-            VALUE "ProductName", "Netscape Portable Runtime\0"
-            VALUE "ProductVersion", PR_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/libs/js/nsprpub/pr/src/nspr_symvec.opt b/libs/js/nsprpub/pr/src/nspr_symvec.opt
deleted file mode 100644
index d9ca566ecf..0000000000
--- a/libs/js/nsprpub/pr/src/nspr_symvec.opt
+++ /dev/null
@@ -1,503 +0,0 @@
-! Fixed section of symbol vector for LIBNSPR4 (non-debug)
-!
-GSMATCH=LEQUAL,2,8
-case_sensitive=YES
-!
-! --------------------------------------------------------------------------
-! Ident 2,1 introduced for Mozilla 0.9.4
-! Based on NSPR 4.1.2
-! --------------------------------------------------------------------------
-! Ident 2,2 introduced for Mozilla 1.2
-! Based on NSPR 4.2.2?
-! PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended has been "removed".
-! Only we can't remove the entry points because OJI is linked against NSPR so
-! we have to make an upwardly compatible change:
-!   PR_ResumeSet is now PR_VMS_Stub1
-!   PR_ResumeTest is now PR_VMS_Stub2
-!   PR_SuspendAllSuspended is PR_VMS_Stub3
-! These are stub functions (defined in openvms.c) solely for the purpose of
-! occupying the slots in our fixed section of the symbol table. 
-! --------------------------------------------------------------------------
-! Ident 2,3 introduced for Mozilla 1.3
-! Previously we were missing some symbols from NSPR 4.0 and 4.1, so now we
-! include everything that's specified in nspr.def.
-! --------------------------------------------------------------------------
-! Ident 2,4 introduced for Mozilla 1.3 final.
-! 2,3 was still missing some symbols, in particular PR_CreateThread, which
-! is used by OJI. So insert stubs to force the PR_CreateThread entry down
-! to its Mozilla 1.1 (and Java 1.4-0) location so that everyone can play
-! together and be happy.
-! --------------------------------------------------------------------------
-! Ident 2,5 introduced for post Mozilla 1.3.
-! LL_MaxUint introduced. Replaces Stub54.
-! --------------------------------------------------------------------------
-! Ident 2,6 introduced for post Mozilla 1.4.
-! PR_GetPathSeparator introduced in NSPR 4.4.
-! This replaces stub 53
-! --------------------------------------------------------------------------
-! Ident 2,7 introduced for post Mozilla 1.4.
-! PR_GetAddrInfoByName, PR_FreeAddrInfo, PR_EnumerateAddrInfo and
-! PR_GetCanonNameFromAddrInfo introduced in NSPR 4.5.
-! These replace stubs 49-52
-! --------------------------------------------------------------------------
-! Ident 2,8 introduced for NSPR 4.6.
-! PR_FindLibrary removed. Replaced by PR_GetPhysicalMemorySize.
-! --------------------------------------------------------------------------
-!
-SYMBOL_VECTOR=(PR_Accept=PROCEDURE)
-SYMBOL_VECTOR=(PR_AcceptRead=PROCEDURE)
-SYMBOL_VECTOR=(PR_Access=PROCEDURE)
-SYMBOL_VECTOR=(PR_AllocFileDesc=PROCEDURE)
-SYMBOL_VECTOR=(PR_Assert=PROCEDURE)
-SYMBOL_VECTOR=(PR_AtomicAdd=PROCEDURE)
-SYMBOL_VECTOR=(PR_AtomicDecrement=PROCEDURE)
-SYMBOL_VECTOR=(PR_AtomicSet=PROCEDURE)
-SYMBOL_VECTOR=(PR_AttachSharedMemory=PROCEDURE)
-SYMBOL_VECTOR=(PR_AttachThread=PROCEDURE)
-SYMBOL_VECTOR=(PR_Available64=PROCEDURE)
-SYMBOL_VECTOR=(PR_Available=PROCEDURE)
-SYMBOL_VECTOR=(PR_Bind=PROCEDURE)
-SYMBOL_VECTOR=(PR_BlockClockInterrupts=PROCEDURE)
-SYMBOL_VECTOR=(PR_BlockInterrupt=PROCEDURE)
-SYMBOL_VECTOR=(PR_CExitMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_CNotify=PROCEDURE)
-SYMBOL_VECTOR=(PR_CNotifyAll=PROCEDURE)
-SYMBOL_VECTOR=(PR_CSetOnMonitorRecycle=PROCEDURE)
-SYMBOL_VECTOR=(PR_CWait=PROCEDURE)
-SYMBOL_VECTOR=(PR_CallOnce=PROCEDURE)
-SYMBOL_VECTOR=(PR_Calloc=PROCEDURE)
-SYMBOL_VECTOR=(PR_CancelJob=PROCEDURE)
-SYMBOL_VECTOR=(PR_CancelWaitFileDesc=PROCEDURE)
-SYMBOL_VECTOR=(PR_CancelWaitGroup=PROCEDURE)
-SYMBOL_VECTOR=(PR_ChangeFileDescNativeHandle=PROCEDURE)
-SYMBOL_VECTOR=(PR_Cleanup=PROCEDURE)
-SYMBOL_VECTOR=(PR_ClearInterrupt=PROCEDURE)
-SYMBOL_VECTOR=(PR_ClearThreadGCAble=PROCEDURE)
-SYMBOL_VECTOR=(PR_Close=PROCEDURE)
-SYMBOL_VECTOR=(PR_CloseDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_CloseFileMap=PROCEDURE)
-SYMBOL_VECTOR=(PR_CloseSemaphore=PROCEDURE)
-SYMBOL_VECTOR=(PR_CloseSharedMemory=PROCEDURE)
-SYMBOL_VECTOR=(PR_Connect=PROCEDURE)
-SYMBOL_VECTOR=(PR_ConnectContinue=PROCEDURE)
-SYMBOL_VECTOR=(PR_ConvertIPv4AddrToIPv6=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateIOLayer=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateIOLayerStub=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateMWaitEnumerator=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreatePipe=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateProcess=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateProcessDetached=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateSocketPollFd=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateStack=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateThreadGCAble=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateWaitGroup=PROCEDURE)
-SYMBOL_VECTOR=(PR_Delete=PROCEDURE)
-SYMBOL_VECTOR=(PR_DeleteSemaphore=PROCEDURE)
-SYMBOL_VECTOR=(PR_DeleteSharedMemory=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyAlarm=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyMWaitEnumerator=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyPollableEvent=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyProcessAttr=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyRWLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroySem=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroySocketPollFd=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyStack=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyWaitGroup=PROCEDURE)
-SYMBOL_VECTOR=(PR_DetachProcess=PROCEDURE)
-SYMBOL_VECTOR=(PR_DetachSharedMemory=PROCEDURE)
-SYMBOL_VECTOR=(PR_DetachThread=PROCEDURE)
-SYMBOL_VECTOR=(PR_DisableClockInterrupts=PROCEDURE)
-SYMBOL_VECTOR=(PR_EmulateAcceptRead=PROCEDURE)
-SYMBOL_VECTOR=(PR_EmulateSendFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_EnableClockInterrupts=PROCEDURE)
-SYMBOL_VECTOR=(PR_EnterMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_EnumerateHostEnt=PROCEDURE)
-SYMBOL_VECTOR=(PR_EnumerateThreads=PROCEDURE)
-SYMBOL_VECTOR=(PR_EnumerateWaitGroup=PROCEDURE)
-SYMBOL_VECTOR=(PR_ErrorInstallCallback=PROCEDURE)
-SYMBOL_VECTOR=(PR_ErrorInstallTable=PROCEDURE)
-SYMBOL_VECTOR=(PR_ErrorLanguages=PROCEDURE)
-SYMBOL_VECTOR=(PR_ErrorToName=PROCEDURE)
-SYMBOL_VECTOR=(PR_ExitMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_ExportFileMapAsString=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_CLR=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_ISSET=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_NCLR=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_NISSET=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_NSET=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_SET=PROCEDURE)
-SYMBOL_VECTOR=(PR_FD_ZERO=PROCEDURE)
-SYMBOL_VECTOR=(PR_FileDesc2NativeHandle=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindFunctionSymbol=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindFunctionSymbolAndLibrary=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetPhysicalMemorySize=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindSymbol=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindSymbolAndLibrary=PROCEDURE)
-SYMBOL_VECTOR=(PR_FloorLog2=PROCEDURE)
-SYMBOL_VECTOR=(PR_FormatTime=PROCEDURE)
-SYMBOL_VECTOR=(PR_FormatTimeUSEnglish=PROCEDURE)
-SYMBOL_VECTOR=(PR_Free=PROCEDURE)
-SYMBOL_VECTOR=(PR_FreeLibraryName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GMTParameters=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetConnectStatus=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetCurrentThread=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetDefaultIOMethods=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetDirectorySepartor=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetError=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetErrorText=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetErrorTextLength=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetFileInfo64=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetFileInfo=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetFileMethods=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetHostByAddr=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetHostByName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetIPNodeByName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetIdentitiesLayer=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetInheritedFD=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetInheritedFileMap=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetLayersIdentity=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetLibraryName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetLibraryPath=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetMemMapAlignment=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetMonitorEntryCount=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetNameForIdentity=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetNumberOfProcessors=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetOSError=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetOpenFileInfo64=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetOpenFileInfo=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetPageShift=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetPeerName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetPipeMethods=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetProtoByName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetProtoByNumber=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSP=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSockName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSocketOption=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetStackSpaceLeft=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSysfdTableMax=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSystemInfo=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetTCPMethods=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadAffinityMask=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadID=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadPriority=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadPrivate=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadScope=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadState=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetThreadType=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetUDPMethods=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImplodeTime=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImportFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImportFileMapFromString=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImportPipe=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImportTCPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_ImportUDPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_Init=PROCEDURE)
-SYMBOL_VECTOR=(PR_Initialize=PROCEDURE)
-SYMBOL_VECTOR=(PR_InitializeNetAddr=PROCEDURE)
-SYMBOL_VECTOR=(PR_Initialized=PROCEDURE)
-SYMBOL_VECTOR=(PR_Interrupt=PROCEDURE)
-SYMBOL_VECTOR=(PR_IntervalToMicroseconds=PROCEDURE)
-SYMBOL_VECTOR=(PR_IntervalToMilliseconds=PROCEDURE)
-SYMBOL_VECTOR=(PR_IntervalToSeconds=PROCEDURE)
-SYMBOL_VECTOR=(PR_IsNetAddrType=PROCEDURE)
-SYMBOL_VECTOR=(PR_JoinJob=PROCEDURE)
-SYMBOL_VECTOR=(PR_JoinThread=PROCEDURE)
-SYMBOL_VECTOR=(PR_JoinThreadPool=PROCEDURE)
-SYMBOL_VECTOR=(PR_KillProcess=PROCEDURE)
-SYMBOL_VECTOR=(PR_Listen=PROCEDURE)
-SYMBOL_VECTOR=(PR_LoadLibrary=PROCEDURE)
-SYMBOL_VECTOR=(PR_LoadLibraryWithFlags=PROCEDURE)
-SYMBOL_VECTOR=(PR_LoadStaticLibrary=PROCEDURE)
-SYMBOL_VECTOR=(PR_LocalTimeParameters=PROCEDURE)
-SYMBOL_VECTOR=(PR_Lock=PROCEDURE)
-SYMBOL_VECTOR=(PR_LockFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_LogFlush=PROCEDURE)
-SYMBOL_VECTOR=(PR_LogPrint=PROCEDURE)
-SYMBOL_VECTOR=(PR_MakeDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_MemMap=PROCEDURE)
-SYMBOL_VECTOR=(PR_MemUnmap=PROCEDURE)
-SYMBOL_VECTOR=(PR_MicrosecondsToInterval=PROCEDURE)
-SYMBOL_VECTOR=(PR_MillisecondsToInterval=PROCEDURE)
-SYMBOL_VECTOR=(PR_MkDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_NetAddrToString=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewLogModule=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewNamedMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewProcessAttr=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewSem=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewTCPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewTCPSocketPair=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewUDPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_NormalizeTime=PROCEDURE)
-SYMBOL_VECTOR=(PR_Notify=PROCEDURE)
-SYMBOL_VECTOR=(PR_NotifyAll=PROCEDURE)
-SYMBOL_VECTOR=(PR_NotifyAllCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PR_NotifyCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PR_Open=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenSemaphore=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenTCPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenUDPSocket=PROCEDURE)
-SYMBOL_VECTOR=(PR_ParseTimeString=PROCEDURE)
-SYMBOL_VECTOR=(PR_Poll=PROCEDURE)
-SYMBOL_VECTOR=(PR_PopIOLayer=PROCEDURE)
-SYMBOL_VECTOR=(PR_PostSem=PROCEDURE)
-SYMBOL_VECTOR=(PR_PostSemaphore=PROCEDURE)
-SYMBOL_VECTOR=(PR_ProcessAttrSetCurren1sb1r7b$=PROCEDURE) ! PR_ProcessAttrSetCurrentDirectory
-SYMBOL_VECTOR=(PR_ProcessAttrSetInheri3dpg1d0$=PROCEDURE) ! PR_ProcessAttrSetInheritableFileMap
-SYMBOL_VECTOR=(PR_ProcessAttrSetInheritableFD=PROCEDURE)
-SYMBOL_VECTOR=(PR_ProcessAttrSetStdioRedirect=PROCEDURE)
-SYMBOL_VECTOR=(PR_ProcessExit=PROCEDURE)
-SYMBOL_VECTOR=(PR_PushIOLayer=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob_Accept=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob_Connect=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob_Read=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob_Timer=PROCEDURE)
-SYMBOL_VECTOR=(PR_QueueJob_Write=PROCEDURE)
-SYMBOL_VECTOR=(PR_RWLock_Rlock=PROCEDURE)
-SYMBOL_VECTOR=(PR_RWLock_Unlock=PROCEDURE)
-SYMBOL_VECTOR=(PR_RWLock_Wlock=PROCEDURE)
-SYMBOL_VECTOR=(PR_Read=PROCEDURE)
-SYMBOL_VECTOR=(PR_ReadDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_Realloc=PROCEDURE)
-SYMBOL_VECTOR=(PR_Recv=PROCEDURE)
-SYMBOL_VECTOR=(PR_RecvFrom=PROCEDURE)
-SYMBOL_VECTOR=(PR_Rename=PROCEDURE)
-SYMBOL_VECTOR=(PR_ResetAlarm=PROCEDURE)
-SYMBOL_VECTOR=(PR_ResetProcessAttr=PROCEDURE)
-SYMBOL_VECTOR=(PR_ResumeAll=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub1=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub2=PROCEDURE)
-SYMBOL_VECTOR=(PR_RmDir=PROCEDURE)
-SYMBOL_VECTOR=(PR_ScanStackPointers=PROCEDURE)
-SYMBOL_VECTOR=(PR_SecondsToInterval=PROCEDURE)
-SYMBOL_VECTOR=(PR_Seek64=PROCEDURE)
-SYMBOL_VECTOR=(PR_Seek=PROCEDURE)
-SYMBOL_VECTOR=(PR_Select=PROCEDURE)
-SYMBOL_VECTOR=(PR_Send=PROCEDURE)
-SYMBOL_VECTOR=(PR_SendFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_SendTo=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetAlarm=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetEnv=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetErrorText=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetFDInheritable=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetLogBuffering=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetLogFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetNetAddr=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetPollableEvent=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetSocketOption=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetStdioRedirect=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetSysfdTableSize=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadAffinityMask=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadDumpProc=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadGCAble=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadPriority=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadPrivate=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetThreadRecycleMode=PROCEDURE)
-SYMBOL_VECTOR=(PR_Shutdown=PROCEDURE)
-SYMBOL_VECTOR=(PR_ShutdownThreadPool=PROCEDURE)
-SYMBOL_VECTOR=(PR_Sleep=PROCEDURE)
-SYMBOL_VECTOR=(PR_Socket=PROCEDURE)
-SYMBOL_VECTOR=(PR_StackPop=PROCEDURE)
-SYMBOL_VECTOR=(PR_StackPush=PROCEDURE)
-SYMBOL_VECTOR=(PR_Stat=PROCEDURE)
-SYMBOL_VECTOR=(PR_SuspendAll=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub3=PROCEDURE)
-SYMBOL_VECTOR=(PR_Sync=PROCEDURE)
-SYMBOL_VECTOR=(PR_TLockFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_ThreadScanStackPointers=PROCEDURE)
-SYMBOL_VECTOR=(PR_TicksPerSecond=PROCEDURE)
-SYMBOL_VECTOR=(PR_TransmitFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_USPacificTimeParameters=PROCEDURE)
-SYMBOL_VECTOR=(PR_UnblockClockInterrupts=PROCEDURE)
-SYMBOL_VECTOR=(PR_UnblockInterrupt=PROCEDURE)
-SYMBOL_VECTOR=(PR_UnloadLibrary=PROCEDURE)
-SYMBOL_VECTOR=(PR_Unlock=PROCEDURE)
-SYMBOL_VECTOR=(PR_UnlockFile=PROCEDURE)
-SYMBOL_VECTOR=(PR_Wait=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitForPollableEvent=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitProcess=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitRecvReady=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitSem=PROCEDURE)
-SYMBOL_VECTOR=(PR_WaitSemaphore=PROCEDURE)
-SYMBOL_VECTOR=(PR_Write=PROCEDURE)
-SYMBOL_VECTOR=(PR_Writev=PROCEDURE)
-SYMBOL_VECTOR=(PR_XIsLocked=PROCEDURE)
-SYMBOL_VECTOR=(PR_XLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_XNotify=PROCEDURE)
-SYMBOL_VECTOR=(PR_XNotifyAll=PROCEDURE)
-SYMBOL_VECTOR=(PR_XUnlock=PROCEDURE)
-SYMBOL_VECTOR=(PR_XWait=PROCEDURE)
-SYMBOL_VECTOR=(PR_Yield=PROCEDURE)
-SYMBOL_VECTOR=(PR_cnvtf=PROCEDURE)
-SYMBOL_VECTOR=(PR_dtoa=PROCEDURE)
-SYMBOL_VECTOR=(PR_htonl=PROCEDURE)
-SYMBOL_VECTOR=(PR_htonll=PROCEDURE)
-SYMBOL_VECTOR=(PR_htons=PROCEDURE)
-SYMBOL_VECTOR=(PR_ntohl=PROCEDURE)
-SYMBOL_VECTOR=(PR_ntohll=PROCEDURE)
-SYMBOL_VECTOR=(PR_ntohs=PROCEDURE)
-SYMBOL_VECTOR=(PR_smprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_smprintf_free=PROCEDURE)
-SYMBOL_VECTOR=(PR_sprintf_append=PROCEDURE)
-SYMBOL_VECTOR=(PR_sxprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_vfprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_vsmprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_vsnprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_vsprintf_append=PROCEDURE)
-SYMBOL_VECTOR=(PR_vsxprintf=PROCEDURE)
-!
-! Start of 2,3 additions
-!
-SYMBOL_VECTOR=(LL_MaxInt=PROCEDURE)
-SYMBOL_VECTOR=(LL_MinInt=PROCEDURE)
-SYMBOL_VECTOR=(LL_Zero=PROCEDURE)
-SYMBOL_VECTOR=(PR_Abort=PROCEDURE)
-SYMBOL_VECTOR=(PR_AddToCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_AddWaitFileDesc=PROCEDURE)
-SYMBOL_VECTOR=(PR_AtomicIncrement=PROCEDURE)
-SYMBOL_VECTOR=(PR_CEnterMonitor=PROCEDURE)
-SYMBOL_VECTOR=(PR_CeilingLog2=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateAlarm=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateFileMap=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateOrderedLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateTrace=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateThreadPool=PROCEDURE)
-SYMBOL_VECTOR=(PR_DecrementCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyOrderedLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_DestroyTrace=PROCEDURE)
-SYMBOL_VECTOR=(PR_ErrorToString=PROCEDURE)
-SYMBOL_VECTOR=(PR_ExplodeTime=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindNextCounterQname=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindNextCounterRname=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindNextTraceQname=PROCEDURE)
-SYMBOL_VECTOR=(PR_FindNextTraceRname=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetDescType=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetDirectorySeparator=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetCounterHandleFromName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetCounterNameFromHandle=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetEnv=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetGCRegisters=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetPageSize=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetRandomNoise=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetSpecialFD=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetUniqueIdentity=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetTraceEntries=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetTraceHandleFromName=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetTraceNameFromHandle=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetTraceOption=PROCEDURE)
-SYMBOL_VECTOR=(PR_IntervalNow=PROCEDURE)
-SYMBOL_VECTOR=(PR_IncrementCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_Malloc=PROCEDURE)
-SYMBOL_VECTOR=(PR_LockOrderedLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewPollableEvent=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewRWLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_NewThreadPrivateIndex=PROCEDURE)
-SYMBOL_VECTOR=(PR_Now=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenAnonFileMap=PROCEDURE)
-SYMBOL_VECTOR=(PR_OpenSharedMemory=PROCEDURE)
-SYMBOL_VECTOR=(PR_RecordTraceEntries=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetConcurrency=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetFDCacheSize=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetLibraryPath=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_StringToNetAddr=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetTraceOption=PROCEDURE)
-SYMBOL_VECTOR=(PR_SubtractFromCounter=PROCEDURE)
-SYMBOL_VECTOR=(PR_VersionCheck=PROCEDURE)
-SYMBOL_VECTOR=(PR_Trace=PROCEDURE)
-SYMBOL_VECTOR=(PR_UnlockOrderedLock=PROCEDURE)
-SYMBOL_VECTOR=(PR_fprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_snprintf=PROCEDURE)
-SYMBOL_VECTOR=(PR_sscanf=PROCEDURE)
-SYMBOL_VECTOR=(PR_strtod=PROCEDURE)
-SYMBOL_VECTOR=(PRP_DestroyNakedCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PRP_NakedBroadcast=PROCEDURE)
-SYMBOL_VECTOR=(PRP_NakedNotify=PROCEDURE)
-SYMBOL_VECTOR=(PRP_NakedWait=PROCEDURE)
-SYMBOL_VECTOR=(PRP_NewNakedCondVar=PROCEDURE)
-SYMBOL_VECTOR=(PRP_TryLock=PROCEDURE)
-SYMBOL_VECTOR=(libVersionPoint=PROCEDURE)
-!
-! NSPR private
-!
-SYMBOL_VECTOR=(GetExecutionEnvironment=PROCEDURE)
-SYMBOL_VECTOR=(PT_FPrintStats=PROCEDURE)
-SYMBOL_VECTOR=(SetExecutionEnvironment=PROCEDURE)
-!
-! Start of 2,4 additions
-! 51 stubs (4 thru 54) so that PR_CreateThread ends up at 1B70.
-! Over time some of these stubs will get replaced by new symbols.
-!
-SYMBOL_VECTOR=(PR_VMS_Stub4=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub5=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub6=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub7=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub8=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub9=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub10=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub11=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub12=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub13=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub14=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub15=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub16=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub17=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub18=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub19=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub20=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub21=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub22=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub23=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub24=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub25=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub26=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub27=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub28=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub29=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub30=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub31=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub32=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub33=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub34=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub35=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub36=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub37=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub38=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub39=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub40=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub41=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub42=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub43=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub44=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub45=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub46=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub47=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub48=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetAddrInfoByName=PROCEDURE)		! was Stub49
-SYMBOL_VECTOR=(PR_FreeAddrInfo=PROCEDURE)		! was Stub50
-SYMBOL_VECTOR=(PR_EnumerateAddrInfo=PROCEDURE)		! was Stub51
-SYMBOL_VECTOR=(PR_GetCanonNameFromAddrInfo=PROCEDURE)	! was Stub52
-SYMBOL_VECTOR=(PR_GetPathSeparator=PROCEDURE)		! was Stub53
-SYMBOL_VECTOR=(LL_MaxUint=PROCEDURE)			! was Stub54
-!
-SYMBOL_VECTOR=(PR_CallOnceWithArg=PROCEDURE)
-SYMBOL_VECTOR=(PR_GetLibraryFilePathname=PROCEDURE)
-SYMBOL_VECTOR=(PR_SetError=PROCEDURE)
-SYMBOL_VECTOR=(PR_CreateThread=PROCEDURE)
-!
-! --------------------------------------------------------------------------
-! End of fixed section
-! --------------------------------------------------------------------------
-!
diff --git a/libs/js/nsprpub/pr/src/os2extra.def b/libs/js/nsprpub/pr/src/os2extra.def
deleted file mode 100644
index 8dbb34dad5..0000000000
--- a/libs/js/nsprpub/pr/src/os2extra.def
+++ /dev/null
@@ -1,16 +0,0 @@
-    ;
-    ; Support plugins that were explicitly linked to the Visual Age
-    ;   version of nspr4.dll.
-    ;
-    PR_NewMonitor
-    PR_EnterMonitor
-    PR_ExitMonitor
-    PR_GetCurrentThread
-    PR_AttachThread
-    PR_DetachThread
-    ;
-    ; Exception handler functions that are used by nsAppRunner.cpp
-    ;
-    _PR_OS2_SetFloatExcpHandler
-    _PR_OS2_UnsetFloatExcpHandler
-
diff --git a/libs/js/nsprpub/pr/src/prvrsion.c b/libs/js/nsprpub/pr/src/prvrsion.c
deleted file mode 100644
index b8f4916dbc..0000000000
--- a/libs/js/nsprpub/pr/src/prvrsion.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prvrsion.h"
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-#ifndef XP_MAC
-#include "_pr_bld.h"
-#endif
-#if !defined(_BUILD_TIME)
-#ifdef HAVE_LONG_LONG
-#define _BUILD_TIME 0
-#else
-#define _BUILD_TIME {0, 0}
-#endif
-#endif
-#if !defined(_BUILD_STRING)
-#define _BUILD_STRING ""
-#endif
-#if !defined(_PRODUCTION)
-#define _PRODUCTION ""
-#endif
-#if defined(DEBUG)
-#define _DEBUG_STRING " (debug)"
-#else
-#define _DEBUG_STRING ""
-#endif
-
-/*
- * A trick to expand the PR_VMAJOR macro before concatenation.
- */
-#define CONCAT(x, y) x ## y
-#define CONCAT2(x, y) CONCAT(x, y)
-#define VERSION_DESC_NAME CONCAT2(prVersionDescription_libnspr, PR_VMAJOR)
-
-PRVersionDescription VERSION_DESC_NAME =
-{
-    /* version          */  2,                  /* this is the only one supported */
-    /* buildTime        */  _BUILD_TIME,        /* usecs since midnight 1/1/1970 GMT */
-    /* buildTimeString  */  _BUILD_STRING,       /*    ditto, but human readable */
-    /* vMajor           */  PR_VMAJOR,          /* NSPR's version number */
-    /* vMinor           */  PR_VMINOR,          /*  and minor version */
-    /* vPatch           */  PR_VPATCH,          /*  and patch */
-    /* beta             */  PR_BETA,            /* beta build boolean */
-#if defined(DEBUG)
-    /* debug            */  PR_TRUE,            /* a debug build */
-#else
-    /* debug            */  PR_FALSE,           /* an optomized build */
-#endif
-    /* special          */  PR_FALSE,           /* they're all special, but ... */
-    /* filename         */  _PRODUCTION,        /* the produced library name */
-    /* description      */ "Portable runtime",  /* what we are */
-    /* security         */ "N/A",               /* not applicable here */
-    /* copywrite        */  "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
-    /* comment          */  "License information: http://www.mozilla.org/MPL/",
-    /* specialString    */ ""
-};
-
-#ifdef XP_UNIX
-
-/*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
- */
-static char rcsid[] = "$Header: NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING " $";
-static char sccsid[] = "@(#)NSPR " PR_VERSION _DEBUG_STRING
-        "  " _BUILD_STRING;
-
-#endif /* XP_UNIX */
-
-PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint(void)
-{
-#ifdef XP_UNIX
-    /*
-     * Add dummy references to rcsid and sccsid to prevent them
-     * from being optimized away as unused variables.
-     */ 
-    const char *dummy;
-
-    dummy = rcsid;
-    dummy = sccsid;
-#endif
-    return &VERSION_DESC_NAME;
-}  /* versionEntryPointType */
-
-/* prvrsion.c */
-
diff --git a/libs/js/nsprpub/pr/src/pthreads/.cvsignore b/libs/js/nsprpub/pr/src/pthreads/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/pthreads/Makefile.in b/libs/js/nsprpub/pr/src/pthreads/Makefile.in
deleted file mode 100644
index 8ff8b07265..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-CSRCS = \
-        ptsynch.c \
-	ptio.c \
-	ptthread.c \
-	ptmisc.c \
-	$(NULL)
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
-
diff --git a/libs/js/nsprpub/pr/src/pthreads/ptio.c b/libs/js/nsprpub/pr/src/pthreads/ptio.c
deleted file mode 100644
index 86a7498352..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/ptio.c
+++ /dev/null
@@ -1,4861 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:   ptio.c
-** Descritpion:  Implemenation of I/O methods for pthreads
-*/
-
-#if defined(_PR_PTHREADS)
-
-#if defined(_PR_POLL_WITH_SELECT)
-#if !(defined(HPUX) && defined(_USE_BIG_FDS))
-/* set fd limit for select(), before including system header files */
-#define FD_SETSIZE (16 * 1024)
-#endif
-#endif
-
-#include <pthread.h>
-#include <string.h>  /* for memset() */
-#include <sys/types.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#if defined(DARWIN)
-#include <sys/utsname.h> /* for uname */
-#endif
-#if defined(SOLARIS) || defined(UNIXWARE)
-#include <sys/filio.h>  /* to pick up FIONREAD */
-#endif
-#ifdef _PR_POLL_AVAILABLE
-#include <poll.h>
-#endif
-#ifdef AIX
-/* To pick up sysconf() */
-#include <unistd.h>
-#include <dlfcn.h>  /* for dlopen */
-#else
-/* To pick up getrlimit() etc. */
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-
-#ifdef SOLARIS
-/*
- * Define HAVE_SENDFILEV if the system has the sendfilev() system call.
- * Code built this way won't run on a system without sendfilev().
- * We can define HAVE_SENDFILEV by default when the minimum release
- * of Solaris that NSPR supports has sendfilev().
- */
-#ifdef HAVE_SENDFILEV
-
-#include <sys/sendfile.h>
-
-#define SOLARIS_SENDFILEV(a, b, c, d) sendfilev((a), (b), (c), (d))
-
-#else
-
-#include <dlfcn.h>  /* for dlopen */
-
-/*
- * Match the definitions in <sys/sendfile.h>.
- */
-typedef struct sendfilevec {
-    int sfv_fd;       /* input fd */
-    uint_t sfv_flag;  /* flags */
-    off_t sfv_off;    /* offset to start reading from */
-    size_t sfv_len;   /* amount of data */
-} sendfilevec_t;
-
-#define SFV_FD_SELF (-2)
-
-/*
- * extern ssize_t sendfilev(int, const struct sendfilevec *, int, size_t *);
- */
-static ssize_t (*pt_solaris_sendfilev_fptr)() = NULL;
-
-#define SOLARIS_SENDFILEV(a, b, c, d) \
-        (*pt_solaris_sendfilev_fptr)((a), (b), (c), (d))
-
-#endif /* HAVE_SENDFILEV */
-#endif /* SOLARIS */
-
-/*
- * The send_file() system call is available in AIX 4.3.2 or later.
- * If this file is compiled on an older AIX system, it attempts to
- * look up the send_file symbol at run time to determine whether
- * we can use the faster PR_SendFile/PR_TransmitFile implementation based on
- * send_file().  On AIX 4.3.2 or later, we can safely skip this
- * runtime function dispatching and just use the send_file based
- * implementation.
- */
-#ifdef AIX
-#ifdef SF_CLOSE
-#define HAVE_SEND_FILE
-#endif
-
-#ifdef HAVE_SEND_FILE
-
-#define AIX_SEND_FILE(a, b, c) send_file(a, b, c)
-
-#else /* HAVE_SEND_FILE */
-
-/*
- * The following definitions match those in <sys/socket.h>
- * on AIX 4.3.2.
- */
-
-/*
- * Structure for the send_file() system call
- */
-struct sf_parms {
-    /* --------- header parms ---------- */
-    void      *header_data;         /* Input/Output. Points to header buf */
-    uint_t    header_length;        /* Input/Output. Length of the header */
-    /* --------- file parms ------------ */
-    int       file_descriptor;      /* Input. File descriptor of the file */
-    unsigned long long file_size;   /* Output. Size of the file */
-    unsigned long long file_offset; /* Input/Output. Starting offset */
-    long long file_bytes;           /* Input/Output. no. of bytes to send */
-    /* --------- trailer parms --------- */
-    void      *trailer_data;        /* Input/Output. Points to trailer buf */
-    uint_t    trailer_length;       /* Input/Output. Length of the trailer */
-    /* --------- return info ----------- */
-    unsigned long long bytes_sent;  /* Output. no. of bytes sent */
-};
-
-/*
- * Flags for the send_file() system call
- */
-#define SF_CLOSE        0x00000001      /* close the socket after completion */
-#define SF_REUSE        0x00000002      /* reuse socket. not supported */
-#define SF_DONT_CACHE   0x00000004      /* don't apply network buffer cache */
-#define SF_SYNC_CACHE   0x00000008      /* sync/update network buffer cache */
-
-/*
- * prototype: size_t send_file(int *, struct sf_parms *, uint_t);
- */
-static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
-
-#define AIX_SEND_FILE(a, b, c) (*pt_aix_sendfile_fptr)(a, b, c)
-
-#endif /* HAVE_SEND_FILE */
-#endif /* AIX */
-
-#ifdef LINUX
-#include <sys/sendfile.h>
-#endif
-
-#include "primpl.h"
-
-#include <netinet/tcp.h>  /* TCP_NODELAY, TCP_MAXSEG */
-#ifdef LINUX
-/* TCP_CORK is not defined in <netinet/tcp.h> on Red Hat Linux 6.0 */
-#ifndef TCP_CORK
-#define TCP_CORK 3
-#endif
-#endif
-
-#ifdef _PR_IPV6_V6ONLY_PROBE
-static PRBool _pr_ipv6_v6only_on_by_default;
-#endif
-
-#if (defined(HPUX) && !defined(HPUX10_30) && !defined(HPUX11))
-#define _PRSelectFdSetArg_t int *
-#elif defined(AIX4_1)
-#define _PRSelectFdSetArg_t void *
-#elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
-    || defined(OSF1) || defined(SOLARIS) \
-    || defined(HPUX10_30) || defined(HPUX11) \
-    || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-    || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-    || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
-    || defined(UNIXWARE) || defined(RISCOS)
-#define _PRSelectFdSetArg_t fd_set *
-#else
-#error "Cannot determine architecture"
-#endif
-
-static PRFileDesc *pt_SetMethods(
-    PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
-
-static PRLock *_pr_flock_lock;  /* For PR_LockFile() etc. */
-static PRCondVar *_pr_flock_cv;  /* For PR_LockFile() etc. */
-static PRLock *_pr_rename_lock;  /* For PR_Rename() */
-
-/**************************************************************************/
-
-/* These two functions are only used in assertions. */
-#if defined(DEBUG)
-
-PRBool IsValidNetAddr(const PRNetAddr *addr)
-{
-    if ((addr != NULL)
-            && (addr->raw.family != AF_UNIX)
-            && (addr->raw.family != PR_AF_INET6)
-            && (addr->raw.family != AF_INET)) {
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-
-static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len)
-{
-    /*
-     * The definition of the length of a Unix domain socket address
-     * is not uniform, so we don't check it.
-     */
-    if ((addr != NULL)
-            && (addr->raw.family != AF_UNIX)
-            && (PR_NETADDR_SIZE(addr) != addr_len)) {
-#if defined(LINUX) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 1
-        /*
-         * In glibc 2.1, struct sockaddr_in6 is 24 bytes.  In glibc 2.2
-         * and in the 2.4 kernel, struct sockaddr_in6 has the scope_id
-         * field and is 28 bytes.  It is possible for socket functions
-         * to return an addr_len greater than sizeof(struct sockaddr_in6).
-         * We need to allow that.  (Bugzilla bug #77264)
-         */
-        if ((PR_AF_INET6 == addr->raw.family)
-                && (sizeof(addr->ipv6) == addr_len)) {
-            return PR_TRUE;
-        }
-#endif
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-
-#endif /* DEBUG */
-
-/*****************************************************************************/
-/************************* I/O Continuation machinery ************************/
-/*****************************************************************************/
-
-/*
- * The polling interval defines the maximum amount of time that a thread
- * might hang up before an interrupt is noticed.
- */
-#define PT_DEFAULT_POLL_MSEC 5000
-#if defined(_PR_POLL_WITH_SELECT)
-#define PT_DEFAULT_SELECT_SEC (PT_DEFAULT_POLL_MSEC/PR_MSEC_PER_SEC)
-#define PT_DEFAULT_SELECT_USEC							\
-		((PT_DEFAULT_POLL_MSEC % PR_MSEC_PER_SEC) * PR_USEC_PER_MSEC)
-#endif
-
-/*
- * pt_SockLen is the type for the length of a socket address
- * structure, used in the address length argument to bind,
- * connect, accept, getsockname, getpeername, etc.  Posix.1g
- * defines this type as socklen_t.  It is size_t or int on
- * most current systems.
- */
-#if defined(HAVE_SOCKLEN_T) \
-    || (defined(__GLIBC__) && __GLIBC__ >= 2)
-typedef socklen_t pt_SockLen;
-#elif (defined(AIX) && !defined(AIX4_1)) \
-    || defined(VMS)
-typedef PRSize pt_SockLen;
-#else
-typedef PRIntn pt_SockLen;
-#endif
-
-typedef struct pt_Continuation pt_Continuation;
-typedef PRBool (*ContinuationFn)(pt_Continuation *op, PRInt16 revents);
-
-typedef enum pr_ContuationStatus
-{
-    pt_continuation_pending,
-    pt_continuation_done
-} pr_ContuationStatus;
-
-struct pt_Continuation
-{
-    /* The building of the continuation operation */
-    ContinuationFn function;                /* what function to continue */
-    union { PRIntn osfd; } arg1;            /* #1 - the op's fd */
-    union { void* buffer; } arg2;           /* #2 - primary transfer buffer */
-    union {
-        PRSize amount;                      /* #3 - size of 'buffer', or */
-        pt_SockLen *addr_len;                  /*    - length of address */
-#ifdef HPUX11
-        /*
-         * For sendfile()
-         */
-		struct file_spec {		
-        	off_t offset;                       /* offset in file to send */
-        	size_t nbytes;                      /* length of file data to send */
-        	size_t st_size;                     /* file size */
-		} file_spec;
-#endif
-    } arg3;
-    union { PRIntn flags; } arg4;           /* #4 - read/write flags */
-    union { PRNetAddr *addr; } arg5;        /* #5 - send/recv address */
-
-#ifdef HPUX11
-    /*
-     * For sendfile()
-     */
-    int filedesc;                           /* descriptor of file to send */
-    int nbytes_to_send;                     /* size of header and file */
-#endif  /* HPUX11 */
-    
-#ifdef SOLARIS
-    /*
-     * For sendfilev()
-     */
-    int nbytes_to_send;                     /* size of header and file */
-#endif  /* SOLARIS */
-
-#ifdef LINUX
-    /*
-     * For sendfile()
-     */
-    int in_fd;                              /* descriptor of file to send */
-    off_t offset;
-    size_t count;
-#endif  /* LINUX */
- 
-    PRIntervalTime timeout;                 /* client (relative) timeout */
-
-    PRInt16 event;                           /* flags for poll()'s events */
-
-    /*
-    ** The representation and notification of the results of the operation.
-    ** These function can either return an int return code or a pointer to
-    ** some object.
-    */
-    union { PRSize code; void *object; } result;
-
-    PRIntn syserrno;                        /* in case it failed, why (errno) */
-    pr_ContuationStatus status;             /* the status of the operation */
-};
-
-#if defined(DEBUG)
-
-PTDebug pt_debug;  /* this is shared between several modules */
-
-#endif  /* DEBUG */
-
-PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg)
-{
-    /* do nothing */
-}  /* PT_FPrintStats */
-
-#if defined(_PR_POLL_WITH_SELECT)
-/*
- * OSF1 and HPUX report the POLLHUP event for a socket when the
- * shutdown(SHUT_WR) operation is called for the remote end, even though
- * the socket is still writeable. Use select(), instead of poll(), to
- * workaround this problem.
- */
-static void pt_poll_now_with_select(pt_Continuation *op)
-{
-    PRInt32 msecs;
-	fd_set rd, wr, *rdp, *wrp;
-	struct timeval tv;
-	PRIntervalTime epoch, now, elapsed, remaining;
-	PRBool wait_for_remaining;
-    PRThread *self = PR_GetCurrentThread();
-    
-	PR_ASSERT(PR_INTERVAL_NO_WAIT != op->timeout);
-	PR_ASSERT(op->arg1.osfd < FD_SETSIZE);
-
-    switch (op->timeout) {
-        case PR_INTERVAL_NO_TIMEOUT:
-			tv.tv_sec = PT_DEFAULT_SELECT_SEC;
-			tv.tv_usec = PT_DEFAULT_SELECT_USEC;
-			do
-			{
-				PRIntn rv;
-
-				if (op->event & POLLIN) {
-					FD_ZERO(&rd);
-					FD_SET(op->arg1.osfd, &rd);
-					rdp = &rd;
-				} else
-					rdp = NULL;
-				if (op->event & POLLOUT) {
-					FD_ZERO(&wr);
-					FD_SET(op->arg1.osfd, &wr);
-					wrp = &wr;
-				} else
-					wrp = NULL;
-
-				rv = select(op->arg1.osfd + 1, rdp, wrp, NULL, &tv);
-
-				if (self->state & PT_THREAD_ABORTED)
-				{
-					self->state &= ~PT_THREAD_ABORTED;
-					op->result.code = -1;
-					op->syserrno = EINTR;
-					op->status = pt_continuation_done;
-					return;
-				}
-
-				if ((-1 == rv) && ((errno == EINTR) || (errno == EAGAIN)))
-					continue; /* go around the loop again */
-
-				if (rv > 0)
-				{
-					PRInt16 revents = 0;
-
-					if ((op->event & POLLIN) && FD_ISSET(op->arg1.osfd, &rd))
-						revents |= POLLIN;
-					if ((op->event & POLLOUT) && FD_ISSET(op->arg1.osfd, &wr))
-						revents |= POLLOUT;
-						
-					if (op->function(op, revents))
-						op->status = pt_continuation_done;
-				} else if (rv == -1) {
-					op->result.code = -1;
-					op->syserrno = errno;
-					op->status = pt_continuation_done;
-				}
-				/* else, select timed out */
-			} while (pt_continuation_done != op->status);
-			break;
-        default:
-            now = epoch = PR_IntervalNow();
-            remaining = op->timeout;
-			do
-			{
-				PRIntn rv;
-
-				if (op->event & POLLIN) {
-					FD_ZERO(&rd);
-					FD_SET(op->arg1.osfd, &rd);
-					rdp = &rd;
-				} else
-					rdp = NULL;
-				if (op->event & POLLOUT) {
-					FD_ZERO(&wr);
-					FD_SET(op->arg1.osfd, &wr);
-					wrp = &wr;
-				} else
-					wrp = NULL;
-
-    			wait_for_remaining = PR_TRUE;
-    			msecs = (PRInt32)PR_IntervalToMilliseconds(remaining);
-				if (msecs > PT_DEFAULT_POLL_MSEC) {
-					wait_for_remaining = PR_FALSE;
-					msecs = PT_DEFAULT_POLL_MSEC;
-				}
-				tv.tv_sec = msecs/PR_MSEC_PER_SEC;
-				tv.tv_usec = (msecs % PR_MSEC_PER_SEC) * PR_USEC_PER_MSEC;
-				rv = select(op->arg1.osfd + 1, rdp, wrp, NULL, &tv);
-
-				if (self->state & PT_THREAD_ABORTED)
-				{
-					self->state &= ~PT_THREAD_ABORTED;
-					op->result.code = -1;
-					op->syserrno = EINTR;
-					op->status = pt_continuation_done;
-					return;
-				}
-
-				if (rv > 0) {
-					PRInt16 revents = 0;
-
-					if ((op->event & POLLIN) && FD_ISSET(op->arg1.osfd, &rd))
-						revents |= POLLIN;
-					if ((op->event & POLLOUT) && FD_ISSET(op->arg1.osfd, &wr))
-						revents |= POLLOUT;
-						
-					if (op->function(op, revents))
-						op->status = pt_continuation_done;
-
-				} else if ((rv == 0) ||
-						((errno == EINTR) || (errno == EAGAIN))) {
-					if (rv == 0) {	/* select timed out */
-						if (wait_for_remaining)
-							now += remaining;
-						else
-							now += PR_MillisecondsToInterval(msecs);
-					} else
-						now = PR_IntervalNow();
-					elapsed = (PRIntervalTime) (now - epoch);
-					if (elapsed >= op->timeout) {
-						op->result.code = -1;
-						op->syserrno = ETIMEDOUT;
-						op->status = pt_continuation_done;
-					} else
-						remaining = op->timeout - elapsed;
-				} else {
-					op->result.code = -1;
-					op->syserrno = errno;
-					op->status = pt_continuation_done;
-				}
-			} while (pt_continuation_done != op->status);
-            break;
-    }
-
-}  /* pt_poll_now_with_select */
-
-#endif	/* _PR_POLL_WITH_SELECT */
-
-static void pt_poll_now(pt_Continuation *op)
-{
-    PRInt32 msecs;
-	PRIntervalTime epoch, now, elapsed, remaining;
-	PRBool wait_for_remaining;
-    PRThread *self = PR_GetCurrentThread();
-    
-	PR_ASSERT(PR_INTERVAL_NO_WAIT != op->timeout);
-#if defined (_PR_POLL_WITH_SELECT)
-	/*
- 	 * If the fd is small enough call the select-based poll operation
-	 */
-	if (op->arg1.osfd < FD_SETSIZE) {
-		pt_poll_now_with_select(op);
-		return;
-	}
-#endif
-
-    switch (op->timeout) {
-        case PR_INTERVAL_NO_TIMEOUT:
-			msecs = PT_DEFAULT_POLL_MSEC;
-			do
-			{
-				PRIntn rv;
-				struct pollfd tmp_pfd;
-
-				tmp_pfd.revents = 0;
-				tmp_pfd.fd = op->arg1.osfd;
-				tmp_pfd.events = op->event;
-
-				rv = poll(&tmp_pfd, 1, msecs);
-				
-				if (self->state & PT_THREAD_ABORTED)
-				{
-					self->state &= ~PT_THREAD_ABORTED;
-					op->result.code = -1;
-					op->syserrno = EINTR;
-					op->status = pt_continuation_done;
-					return;
-				}
-
-				if ((-1 == rv) && ((errno == EINTR) || (errno == EAGAIN)))
-					continue; /* go around the loop again */
-
-				if (rv > 0)
-				{
-					PRInt16 events = tmp_pfd.events;
-					PRInt16 revents = tmp_pfd.revents;
-
-					if ((revents & POLLNVAL)  /* busted in all cases */
-					|| ((events & POLLOUT) && (revents & POLLHUP)))
-						/* write op & hup */
-					{
-						op->result.code = -1;
-						if (POLLNVAL & revents) op->syserrno = EBADF;
-						else if (POLLHUP & revents) op->syserrno = EPIPE;
-						op->status = pt_continuation_done;
-					} else {
-						if (op->function(op, revents))
-							op->status = pt_continuation_done;
-					}
-				} else if (rv == -1) {
-					op->result.code = -1;
-					op->syserrno = errno;
-					op->status = pt_continuation_done;
-				}
-				/* else, poll timed out */
-			} while (pt_continuation_done != op->status);
-			break;
-        default:
-            now = epoch = PR_IntervalNow();
-            remaining = op->timeout;
-			do
-			{
-				PRIntn rv;
-				struct pollfd tmp_pfd;
-
-				tmp_pfd.revents = 0;
-				tmp_pfd.fd = op->arg1.osfd;
-				tmp_pfd.events = op->event;
-
-    			wait_for_remaining = PR_TRUE;
-    			msecs = (PRInt32)PR_IntervalToMilliseconds(remaining);
-				if (msecs > PT_DEFAULT_POLL_MSEC)
-				{
-					wait_for_remaining = PR_FALSE;
-					msecs = PT_DEFAULT_POLL_MSEC;
-				}
-				rv = poll(&tmp_pfd, 1, msecs);
-				
-				if (self->state & PT_THREAD_ABORTED)
-				{
-					self->state &= ~PT_THREAD_ABORTED;
-					op->result.code = -1;
-					op->syserrno = EINTR;
-					op->status = pt_continuation_done;
-					return;
-				}
-
-				if (rv > 0)
-				{
-					PRInt16 events = tmp_pfd.events;
-					PRInt16 revents = tmp_pfd.revents;
-
-					if ((revents & POLLNVAL)  /* busted in all cases */
-						|| ((events & POLLOUT) && (revents & POLLHUP))) 
-											/* write op & hup */
-					{
-						op->result.code = -1;
-						if (POLLNVAL & revents) op->syserrno = EBADF;
-						else if (POLLHUP & revents) op->syserrno = EPIPE;
-						op->status = pt_continuation_done;
-					} else {
-						if (op->function(op, revents))
-						{
-							op->status = pt_continuation_done;
-						}
-					}
-				} else if ((rv == 0) ||
-						((errno == EINTR) || (errno == EAGAIN))) {
-					if (rv == 0)	/* poll timed out */
-					{
-						if (wait_for_remaining)
-							now += remaining;
-						else
-							now += PR_MillisecondsToInterval(msecs);
-					}
-					else
-						now = PR_IntervalNow();
-					elapsed = (PRIntervalTime) (now - epoch);
-					if (elapsed >= op->timeout) {
-						op->result.code = -1;
-						op->syserrno = ETIMEDOUT;
-						op->status = pt_continuation_done;
-					} else
-						remaining = op->timeout - elapsed;
-				} else {
-					op->result.code = -1;
-					op->syserrno = errno;
-					op->status = pt_continuation_done;
-				}
-			} while (pt_continuation_done != op->status);
-            break;
-    }
-
-}  /* pt_poll_now */
-
-static PRIntn pt_Continue(pt_Continuation *op)
-{
-    op->status = pt_continuation_pending;  /* set default value */
-	/*
-	 * let each thread call poll directly
-	 */
-	pt_poll_now(op);
-	PR_ASSERT(pt_continuation_done == op->status);
-    return op->result.code;
-}  /* pt_Continue */
-
-/*****************************************************************************/
-/*********************** specific continuation functions *********************/
-/*****************************************************************************/
-static PRBool pt_connect_cont(pt_Continuation *op, PRInt16 revents)
-{
-    op->syserrno = _MD_unix_get_nonblocking_connect_error(op->arg1.osfd);
-    if (op->syserrno != 0) {
-        op->result.code = -1;
-    } else {
-        op->result.code = 0;
-    }
-    return PR_TRUE; /* this one is cooked */
-}  /* pt_connect_cont */
-
-static PRBool pt_accept_cont(pt_Continuation *op, PRInt16 revents)
-{
-    op->syserrno = 0;
-    op->result.code = accept(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.addr_len);
-    if (-1 == op->result.code)
-    {
-        op->syserrno = errno;
-        if (EWOULDBLOCK == errno || EAGAIN == errno || ECONNABORTED == errno)
-            return PR_FALSE;  /* do nothing - this one ain't finished */
-    }
-    return PR_TRUE;
-}  /* pt_accept_cont */
-
-static PRBool pt_read_cont(pt_Continuation *op, PRInt16 revents)
-{
-    /*
-     * Any number of bytes will complete the operation. It need
-     * not (and probably will not) satisfy the request. The only
-     * error we continue is EWOULDBLOCK|EAGAIN.
-     */
-    op->result.code = read(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount);
-    op->syserrno = errno;
-    return ((-1 == op->result.code) && 
-            (EWOULDBLOCK == op->syserrno || EAGAIN == op->syserrno)) ?
-        PR_FALSE : PR_TRUE;
-}  /* pt_read_cont */
-
-static PRBool pt_recv_cont(pt_Continuation *op, PRInt16 revents)
-{
-    /*
-     * Any number of bytes will complete the operation. It need
-     * not (and probably will not) satisfy the request. The only
-     * error we continue is EWOULDBLOCK|EAGAIN.
-     */
-#if defined(SOLARIS)
-    if (0 == op->arg4.flags)
-        op->result.code = read(
-            op->arg1.osfd, op->arg2.buffer, op->arg3.amount);
-    else
-        op->result.code = recv(
-            op->arg1.osfd, op->arg2.buffer, op->arg3.amount, op->arg4.flags);
-#else
-    op->result.code = recv(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount, op->arg4.flags);
-#endif
-    op->syserrno = errno;
-    return ((-1 == op->result.code) && 
-            (EWOULDBLOCK == op->syserrno || EAGAIN == op->syserrno)) ?
-        PR_FALSE : PR_TRUE;
-}  /* pt_recv_cont */
-
-static PRBool pt_send_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn bytes;
-#if defined(SOLARIS)
-    PRInt32 tmp_amount = op->arg3.amount;
-#endif
-    /*
-     * We want to write the entire amount out, no matter how many
-     * tries it takes. Keep advancing the buffer and the decrementing
-     * the amount until the amount goes away. Return the total bytes
-     * (which should be the original amount) when finished (or an
-     * error).
-     */
-#if defined(SOLARIS)
-retry:
-    bytes = write(op->arg1.osfd, op->arg2.buffer, tmp_amount);
-#else
-    bytes = send(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount, op->arg4.flags);
-#endif
-    op->syserrno = errno;
-
-#if defined(SOLARIS)
-    /*
-     * The write system call has been reported to return the ERANGE error
-     * on occasion. Try to write in smaller chunks to workaround this bug.
-     */
-    if ((bytes == -1) && (op->syserrno == ERANGE))
-    {
-        if (tmp_amount > 1)
-        {
-            tmp_amount = tmp_amount/2;  /* half the bytes */
-            goto retry;
-        }
-    }
-#endif
-
-    if (bytes >= 0)  /* this is progress */
-    {
-        char *bp = (char*)op->arg2.buffer;
-        bp += bytes;  /* adjust the buffer pointer */
-        op->arg2.buffer = bp;
-        op->result.code += bytes;  /* accumulate the number sent */
-        op->arg3.amount -= bytes;  /* and reduce the required count */
-        return (0 == op->arg3.amount) ? PR_TRUE : PR_FALSE;
-    }
-    else if ((EWOULDBLOCK != op->syserrno) && (EAGAIN != op->syserrno))
-    {
-        op->result.code = -1;
-        return PR_TRUE;
-    }
-    else return PR_FALSE;
-}  /* pt_send_cont */
-
-static PRBool pt_write_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn bytes;
-    /*
-     * We want to write the entire amount out, no matter how many
-     * tries it takes. Keep advancing the buffer and the decrementing
-     * the amount until the amount goes away. Return the total bytes
-     * (which should be the original amount) when finished (or an
-     * error).
-     */
-    bytes = write(op->arg1.osfd, op->arg2.buffer, op->arg3.amount);
-    op->syserrno = errno;
-    if (bytes >= 0)  /* this is progress */
-    {
-        char *bp = (char*)op->arg2.buffer;
-        bp += bytes;  /* adjust the buffer pointer */
-        op->arg2.buffer = bp;
-        op->result.code += bytes;  /* accumulate the number sent */
-        op->arg3.amount -= bytes;  /* and reduce the required count */
-        return (0 == op->arg3.amount) ? PR_TRUE : PR_FALSE;
-    }
-    else if ((EWOULDBLOCK != op->syserrno) && (EAGAIN != op->syserrno))
-    {
-        op->result.code = -1;
-        return PR_TRUE;
-    }
-    else return PR_FALSE;
-}  /* pt_write_cont */
-
-static PRBool pt_writev_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn bytes;
-    struct iovec *iov = (struct iovec*)op->arg2.buffer;
-    /*
-     * Same rules as write, but continuing seems to be a bit more
-     * complicated. As the number of bytes sent grows, we have to
-     * redefine the vector we're pointing at. We might have to
-     * modify an individual vector parms or we might have to eliminate
-     * a pair altogether.
-     */
-    bytes = writev(op->arg1.osfd, iov, op->arg3.amount);
-    op->syserrno = errno;
-    if (bytes >= 0)  /* this is progress */
-    {
-        PRIntn iov_index;
-        op->result.code += bytes;  /* accumulate the number sent */
-        for (iov_index = 0; iov_index < op->arg3.amount; ++iov_index)
-        {
-            /* how much progress did we make in the i/o vector? */
-            if (bytes < iov[iov_index].iov_len)
-            {
-                /* this element's not done yet */
-                char **bp = (char**)&(iov[iov_index].iov_base);
-                iov[iov_index].iov_len -= bytes;  /* there's that much left */
-                *bp += bytes;  /* starting there */
-                break;  /* go off and do that */
-            }
-            bytes -= iov[iov_index].iov_len;  /* that element's consumed */
-        }
-        op->arg2.buffer = &iov[iov_index];  /* new start of array */
-        op->arg3.amount -= iov_index;  /* and array length */
-        return (0 == op->arg3.amount) ? PR_TRUE : PR_FALSE;
-    }
-    else if ((EWOULDBLOCK != op->syserrno) && (EAGAIN != op->syserrno))
-    {
-        op->result.code = -1;
-        return PR_TRUE;
-    }
-    else return PR_FALSE;
-}  /* pt_writev_cont */
-
-static PRBool pt_sendto_cont(pt_Continuation *op, PRInt16 revents)
-{
-    PRIntn bytes = sendto(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount, op->arg4.flags,
-        (struct sockaddr*)op->arg5.addr, PR_NETADDR_SIZE(op->arg5.addr));
-    op->syserrno = errno;
-    if (bytes >= 0)  /* this is progress */
-    {
-        char *bp = (char*)op->arg2.buffer;
-        bp += bytes;  /* adjust the buffer pointer */
-        op->arg2.buffer = bp;
-        op->result.code += bytes;  /* accumulate the number sent */
-        op->arg3.amount -= bytes;  /* and reduce the required count */
-        return (0 == op->arg3.amount) ? PR_TRUE : PR_FALSE;
-    }
-    else if ((EWOULDBLOCK != op->syserrno) && (EAGAIN != op->syserrno))
-    {
-        op->result.code = -1;
-        return PR_TRUE;
-    }
-    else return PR_FALSE;
-}  /* pt_sendto_cont */
-
-static PRBool pt_recvfrom_cont(pt_Continuation *op, PRInt16 revents)
-{
-    pt_SockLen addr_len = sizeof(PRNetAddr);
-    op->result.code = recvfrom(
-        op->arg1.osfd, op->arg2.buffer, op->arg3.amount,
-        op->arg4.flags, (struct sockaddr*)op->arg5.addr, &addr_len);
-    op->syserrno = errno;
-    return ((-1 == op->result.code) && 
-            (EWOULDBLOCK == op->syserrno || EAGAIN == op->syserrno)) ?
-        PR_FALSE : PR_TRUE;
-}  /* pt_recvfrom_cont */
-
-#ifdef AIX
-static PRBool pt_aix_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    struct sf_parms *sf_struct = (struct sf_parms *) op->arg2.buffer;
-    ssize_t rv;
-	unsigned long long saved_file_offset;
-	long long saved_file_bytes;
-
-	saved_file_offset = sf_struct->file_offset;
-	saved_file_bytes = sf_struct->file_bytes;
-	sf_struct->bytes_sent = 0;
-
-	if ((sf_struct->file_bytes > 0) && (sf_struct->file_size > 0))
-	PR_ASSERT((sf_struct->file_bytes + sf_struct->file_offset) <=
-									sf_struct->file_size);
-    rv = AIX_SEND_FILE(&op->arg1.osfd, sf_struct, op->arg4.flags);
-    op->syserrno = errno;
-
-    if (rv != -1) {
-        op->result.code += sf_struct->bytes_sent;
-		/*
-		 * A bug in AIX 4.3.2 prevents the 'file_bytes' field from
-		 * being updated. So, 'file_bytes' is maintained by NSPR to
-		 * avoid conflict when this bug is fixed in AIX, in the future.
-		 */
-		if (saved_file_bytes != -1)
-			saved_file_bytes -= (sf_struct->file_offset - saved_file_offset);
-		sf_struct->file_bytes = saved_file_bytes;
-    } else if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
-        op->result.code = -1;
-    } else {
-        return PR_FALSE;
-    }
-
-    if (rv == 1) {    /* more data to send */
-        return PR_FALSE;
-    }
-
-    return PR_TRUE;
-}
-#endif  /* AIX */
-
-#ifdef HPUX11
-static PRBool pt_hpux_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    struct iovec *hdtrl = (struct iovec *) op->arg2.buffer;
-    int count;
-
-    count = sendfile(op->arg1.osfd, op->filedesc, op->arg3.file_spec.offset,
-			op->arg3.file_spec.nbytes, hdtrl, op->arg4.flags);
-    PR_ASSERT(count <= op->nbytes_to_send);
-    op->syserrno = errno;
-
-    if (count != -1) {
-        op->result.code += count;
-    } else if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
-        op->result.code = -1;
-    } else {
-        return PR_FALSE;
-    }
-    if (count != -1 && count < op->nbytes_to_send) {
-        if (count < hdtrl[0].iov_len) {
-			/* header not sent */
-
-            hdtrl[0].iov_base = ((char *) hdtrl[0].iov_len) + count;
-            hdtrl[0].iov_len -= count;
-
-        } else if (count < (hdtrl[0].iov_len + op->arg3.file_spec.nbytes)) {
-			/* header sent, file not sent */
-            PRUint32 file_nbytes_sent = count - hdtrl[0].iov_len;
-
-            hdtrl[0].iov_base = NULL;
-            hdtrl[0].iov_len = 0;
-
-            op->arg3.file_spec.offset += file_nbytes_sent;
-            op->arg3.file_spec.nbytes -= file_nbytes_sent;
-        } else if (count < (hdtrl[0].iov_len + op->arg3.file_spec.nbytes +
-											hdtrl[1].iov_len)) {
-            PRUint32 trailer_nbytes_sent = count - (hdtrl[0].iov_len +
-                                         op->arg3.file_spec.nbytes);
-
-			/* header sent, file sent, trailer not sent */
-
-            hdtrl[0].iov_base = NULL;
-            hdtrl[0].iov_len = 0;
-			/*
-			 * set file offset and len so that no more file data is
-			 * sent
-			 */
-            op->arg3.file_spec.offset = op->arg3.file_spec.st_size;
-            op->arg3.file_spec.nbytes = 0;
-
-            hdtrl[1].iov_base =((char *) hdtrl[1].iov_base)+ trailer_nbytes_sent;
-            hdtrl[1].iov_len -= trailer_nbytes_sent;
-		}
-        op->nbytes_to_send -= count;
-        return PR_FALSE;
-    }
-
-    return PR_TRUE;
-}
-#endif  /* HPUX11 */
-
-#ifdef SOLARIS  
-static PRBool pt_solaris_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    struct sendfilevec *vec = (struct sendfilevec *) op->arg2.buffer;
-    size_t xferred;
-    ssize_t count;
-
-    count = SOLARIS_SENDFILEV(op->arg1.osfd, vec, op->arg3.amount, &xferred);
-    op->syserrno = errno;
-    PR_ASSERT((count == -1) || (count == xferred));
-
-    if (count == -1) {
-        if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN
-                && op->syserrno != EINTR) {
-            op->result.code = -1;
-            return PR_TRUE;
-        }
-        count = xferred;
-    }
-    PR_ASSERT(count <= op->nbytes_to_send);
-    
-    op->result.code += count;
-    if (count < op->nbytes_to_send) {
-        op->nbytes_to_send -= count;
-
-        while (count >= vec->sfv_len) {
-            count -= vec->sfv_len;
-            vec++;
-            op->arg3.amount--;
-        }
-        PR_ASSERT(op->arg3.amount > 0);
-
-        vec->sfv_off += count;
-        vec->sfv_len -= count;
-        PR_ASSERT(vec->sfv_len > 0);
-        op->arg2.buffer = vec;
-
-        return PR_FALSE;
-    }
-
-    return PR_TRUE;
-}
-#endif  /* SOLARIS */
-
-#ifdef LINUX 
-static PRBool pt_linux_sendfile_cont(pt_Continuation *op, PRInt16 revents)
-{
-    ssize_t rv;
-    off_t oldoffset;
-
-    oldoffset = op->offset;
-    rv = sendfile(op->arg1.osfd, op->in_fd, &op->offset, op->count);
-    op->syserrno = errno;
-
-    if (rv == -1) {
-        if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
-            op->result.code = -1;
-            return PR_TRUE;
-        }
-        rv = 0;
-    }
-    PR_ASSERT(rv == op->offset - oldoffset);
-    op->result.code += rv;
-    if (rv < op->count) {
-        op->count -= rv;
-        return PR_FALSE;
-    }
-    return PR_TRUE;
-}
-#endif  /* LINUX */
-
-void _PR_InitIO(void)
-{
-#if defined(DEBUG)
-    memset(&pt_debug, 0, sizeof(PTDebug));
-    pt_debug.timeStarted = PR_Now();
-#endif
-
-    _pr_flock_lock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_flock_lock);
-    _pr_flock_cv = PR_NewCondVar(_pr_flock_lock);
-    PR_ASSERT(NULL != _pr_flock_cv);
-    _pr_rename_lock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_rename_lock); 
-
-    _PR_InitFdCache();  /* do that */   
-
-    _pr_stdin = pt_SetMethods(0, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-    _pr_stdout = pt_SetMethods(1, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-    _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-    PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-
-#ifdef _PR_IPV6_V6ONLY_PROBE
-    /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
-     * is turned on by default, contrary to what RFC 3493, Section
-     * 5.3 says.  So we have to turn it off.  Find out whether we
-     * are running on such a system.
-     */
-    {
-        int osfd;
-        osfd = socket(AF_INET6, SOCK_STREAM, 0);
-        if (osfd != -1) {
-            int on;
-            int optlen = sizeof(on);
-            if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-                    &on, &optlen) == 0) {
-                _pr_ipv6_v6only_on_by_default = on;
-            }
-            close(osfd);
-        }
-    }
-#endif
-}  /* _PR_InitIO */
-
-void _PR_CleanupIO(void)
-{
-    _PR_Putfd(_pr_stdin);
-    _pr_stdin = NULL;
-    _PR_Putfd(_pr_stdout);
-    _pr_stdout = NULL;
-    _PR_Putfd(_pr_stderr); 
-    _pr_stderr = NULL;
-
-    _PR_CleanupFdCache();
-    
-    if (_pr_flock_cv)
-    {
-        PR_DestroyCondVar(_pr_flock_cv);
-        _pr_flock_cv = NULL;
-    }
-    if (_pr_flock_lock)
-    {
-        PR_DestroyLock(_pr_flock_lock);
-        _pr_flock_lock = NULL;
-    }
-    if (_pr_rename_lock)
-    {
-        PR_DestroyLock(_pr_rename_lock);
-        _pr_rename_lock = NULL;
-    }
-}  /* _PR_CleanupIO */
-
-PR_IMPLEMENT(PRFileDesc*) PR_GetSpecialFD(PRSpecialFD osfd)
-{
-    PRFileDesc *result = NULL;
-    PR_ASSERT(osfd >= PR_StandardInput && osfd <= PR_StandardError);
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    
-    switch (osfd)
-    {
-        case PR_StandardInput: result = _pr_stdin; break;
-        case PR_StandardOutput: result = _pr_stdout; break;
-        case PR_StandardError: result = _pr_stderr; break;
-        default:
-            (void)PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    }
-    return result;
-}  /* PR_GetSpecialFD */
-
-/*****************************************************************************/
-/***************************** I/O private methods ***************************/
-/*****************************************************************************/
-
-static PRBool pt_TestAbort(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    if(_PT_THREAD_INTERRUPTED(me))
-    {
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        me->state &= ~PT_THREAD_ABORTED;
-        return PR_TRUE;
-    }
-    return PR_FALSE;
-}  /* pt_TestAbort */
-
-static void pt_MapError(void (*mapper)(PRIntn), PRIntn syserrno)
-{
-    switch (syserrno)
-    {
-        case EINTR:
-            PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0); break;
-        case ETIMEDOUT:
-            PR_SetError(PR_IO_TIMEOUT_ERROR, 0); break;
-        default:
-            mapper(syserrno);
-    }
-}  /* pt_MapError */
-
-static PRStatus pt_Close(PRFileDesc *fd)
-{
-    if ((NULL == fd) || (NULL == fd->secret)
-        || ((_PR_FILEDESC_OPEN != fd->secret->state)
-        && (_PR_FILEDESC_CLOSED != fd->secret->state)))
-    {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    if (_PR_FILEDESC_OPEN == fd->secret->state)
-    {
-        if (-1 == close(fd->secret->md.osfd))
-        {
-#ifdef OSF1
-            /*
-             * Bug 86941: On Tru64 UNIX V5.0A and V5.1, the close()
-             * system call, when called to close a TCP socket, may
-             * return -1 with errno set to EINVAL but the system call
-             * does close the socket successfully.  An application
-             * may safely ignore the EINVAL error.  This bug is fixed
-             * on Tru64 UNIX V5.1A and later.  The defect tracking
-             * number is QAR 81431.
-             */
-            if (PR_DESC_SOCKET_TCP != fd->methods->file_type
-            || EINVAL != errno)
-            {
-                pt_MapError(_PR_MD_MAP_CLOSE_ERROR, errno);
-                return PR_FAILURE;
-            }
-#else
-            pt_MapError(_PR_MD_MAP_CLOSE_ERROR, errno);
-            return PR_FAILURE;
-#endif
-        }
-        fd->secret->state = _PR_FILEDESC_CLOSED;
-    }
-    _PR_Putfd(fd);
-    return PR_SUCCESS;
-}  /* pt_Close */
-
-static PRInt32 pt_Read(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    PRInt32 syserrno, bytes = -1;
-
-    if (pt_TestAbort()) return bytes;
-
-    bytes = read(fd->secret->md.osfd, buf, amount);
-    syserrno = errno;
-
-    if ((bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking))
-    {
-        pt_Continuation op;
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = buf;
-        op.arg3.amount = amount;
-        op.timeout = PR_INTERVAL_NO_TIMEOUT;
-        op.function = pt_read_cont;
-        op.event = POLLIN | POLLPRI;
-        bytes = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-    if (bytes < 0)
-        pt_MapError(_PR_MD_MAP_READ_ERROR, syserrno);
-    return bytes;
-}  /* pt_Read */
-
-static PRInt32 pt_Write(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    PRInt32 syserrno, bytes = -1;
-    PRBool fNeedContinue = PR_FALSE;
-
-    if (pt_TestAbort()) return bytes;
-
-    bytes = write(fd->secret->md.osfd, buf, amount);
-    syserrno = errno;
-
-    if ( (bytes >= 0) && (bytes < amount) && (!fd->secret->nonblocking) )
-    {
-        buf = (char *) buf + bytes;
-        amount -= bytes;
-        fNeedContinue = PR_TRUE;
-    }
-    if ( (bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking) )
-    {
-        bytes = 0;
-        fNeedContinue = PR_TRUE;
-    }
-
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = (void*)buf;
-        op.arg3.amount = amount;
-        op.timeout = PR_INTERVAL_NO_TIMEOUT;
-        op.result.code = bytes;  /* initialize the number sent */
-        op.function = pt_write_cont;
-        op.event = POLLOUT | POLLPRI;
-        bytes = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-    if (bytes == -1)
-        pt_MapError(_PR_MD_MAP_WRITE_ERROR, syserrno);
-    return bytes;
-}  /* pt_Write */
-
-static PRInt32 pt_Writev(
-    PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_len, PRIntervalTime timeout)
-{
-    PRIntn iov_index;
-    PRBool fNeedContinue = PR_FALSE;
-    PRInt32 syserrno, bytes, rv = -1;
-    struct iovec osiov_local[PR_MAX_IOVECTOR_SIZE], *osiov;
-    int osiov_len;
-
-    if (pt_TestAbort()) return rv;
-
-    /* Ensured by PR_Writev */
-    PR_ASSERT(iov_len <= PR_MAX_IOVECTOR_SIZE);
-
-    /*
-     * We can't pass iov to writev because PRIOVec and struct iovec
-     * may not be binary compatible.  Make osiov a copy of iov and
-     * pass osiov to writev.  We can modify osiov if we need to
-     * continue the operation.
-     */
-    osiov = osiov_local;
-    osiov_len = iov_len;
-    for (iov_index = 0; iov_index < osiov_len; iov_index++)
-    {
-        osiov[iov_index].iov_base = iov[iov_index].iov_base;
-        osiov[iov_index].iov_len = iov[iov_index].iov_len;
-    }
-
-    rv = bytes = writev(fd->secret->md.osfd, osiov, osiov_len);
-    syserrno = errno;
-
-    if (!fd->secret->nonblocking)
-    {
-        if (bytes >= 0)
-        {
-            /*
-             * If we moved some bytes, how does that implicate the
-             * i/o vector list?  In other words, exactly where are
-             * we within that array?  What are the parameters for
-             * resumption?  Maybe we're done!
-             */
-            for ( ;osiov_len > 0; osiov++, osiov_len--)
-            {
-                if (bytes < osiov->iov_len)
-                {
-                    /* this one's not done yet */
-                    osiov->iov_base = (char*)osiov->iov_base + bytes;
-                    osiov->iov_len -= bytes;
-                    break;  /* go off and do that */
-                }
-                bytes -= osiov->iov_len;  /* this one's done cooked */
-            }
-            PR_ASSERT(osiov_len > 0 || bytes == 0);
-            if (osiov_len > 0)
-            {
-                if (PR_INTERVAL_NO_WAIT == timeout)
-                {
-                    rv = -1;
-                    syserrno = ETIMEDOUT;
-                }
-                else fNeedContinue = PR_TRUE;
-            }
-        }
-        else if (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        {
-            if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-            else
-            {
-                rv = 0;
-                fNeedContinue = PR_TRUE;
-            }
-        }
-    }
-
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = (void*)osiov;
-        op.arg3.amount = osiov_len;
-        op.timeout = timeout;
-        op.result.code = rv;
-        op.function = pt_writev_cont;
-        op.event = POLLOUT | POLLPRI;
-        rv = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-    if (rv == -1) pt_MapError(_PR_MD_MAP_WRITEV_ERROR, syserrno);
-    return rv;
-}  /* pt_Writev */
-
-static PRInt32 pt_Seek(PRFileDesc *fd, PRInt32 offset, PRSeekWhence whence)
-{
-    return _PR_MD_LSEEK(fd, offset, whence);
-}  /* pt_Seek */
-
-static PRInt64 pt_Seek64(PRFileDesc *fd, PRInt64 offset, PRSeekWhence whence)
-{
-    return _PR_MD_LSEEK64(fd, offset, whence);
-}  /* pt_Seek64 */
-
-static PRInt32 pt_Available_f(PRFileDesc *fd)
-{
-    PRInt32 result, cur, end;
-
-    cur = _PR_MD_LSEEK(fd, 0, PR_SEEK_CUR);
-
-    if (cur >= 0)
-        end = _PR_MD_LSEEK(fd, 0, PR_SEEK_END);
-
-    if ((cur < 0) || (end < 0)) {
-        return -1;
-    }
-
-    result = end - cur;
-    _PR_MD_LSEEK(fd, cur, PR_SEEK_SET);
-
-    return result;
-}  /* pt_Available_f */
-
-static PRInt64 pt_Available64_f(PRFileDesc *fd)
-{
-    PRInt64 result, cur, end;
-    PRInt64 minus_one;
-
-    LL_I2L(minus_one, -1);
-    cur = _PR_MD_LSEEK64(fd, LL_ZERO, PR_SEEK_CUR);
-
-    if (LL_GE_ZERO(cur))
-        end = _PR_MD_LSEEK64(fd, LL_ZERO, PR_SEEK_END);
-
-    if (!LL_GE_ZERO(cur) || !LL_GE_ZERO(end)) return minus_one;
-
-    LL_SUB(result, end, cur);
-    (void)_PR_MD_LSEEK64(fd, cur, PR_SEEK_SET);
-
-    return result;
-}  /* pt_Available64_f */
-
-static PRInt32 pt_Available_s(PRFileDesc *fd)
-{
-    PRInt32 rv, bytes = -1;
-    if (pt_TestAbort()) return bytes;
-
-    rv = ioctl(fd->secret->md.osfd, FIONREAD, &bytes);
-
-    if (rv == -1)
-        pt_MapError(_PR_MD_MAP_SOCKETAVAILABLE_ERROR, errno);
-    return bytes;
-}  /* pt_Available_s */
-
-static PRInt64 pt_Available64_s(PRFileDesc *fd)
-{
-    PRInt64 rv;
-    LL_I2L(rv, pt_Available_s(fd));
-    return rv;
-}  /* pt_Available64_s */
-
-static PRStatus pt_FileInfo(PRFileDesc *fd, PRFileInfo *info)
-{
-    PRInt32 rv = _PR_MD_GETOPENFILEINFO(fd, info);
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* pt_FileInfo */
-
-static PRStatus pt_FileInfo64(PRFileDesc *fd, PRFileInfo64 *info)
-{
-    PRInt32 rv = _PR_MD_GETOPENFILEINFO64(fd, info);
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* pt_FileInfo64 */
-
-static PRStatus pt_Synch(PRFileDesc *fd)
-{
-    return (NULL == fd) ? PR_FAILURE : PR_SUCCESS;
-} /* pt_Synch */
-
-static PRStatus pt_Fsync(PRFileDesc *fd)
-{
-    PRIntn rv = -1;
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = fsync(fd->secret->md.osfd);
-    if (rv < 0) {
-        pt_MapError(_PR_MD_MAP_FSYNC_ERROR, errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_Fsync */
-
-static PRStatus pt_Connect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRIntn rv = -1, syserrno;
-    pt_SockLen addr_len;
-	const PRNetAddr *addrp = addr;
-#if defined(_PR_HAVE_SOCKADDR_LEN) || defined(_PR_INET6)
-	PRUint16 md_af = addr->raw.family;
-    PRNetAddr addrCopy;
-#endif
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-    addr_len = PR_NETADDR_SIZE(addr);
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		md_af = AF_INET6;
-#ifndef _PR_HAVE_SOCKADDR_LEN
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-#endif
-	}
-#endif
-
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    addrCopy = *addr;
-    ((struct sockaddr*)&addrCopy)->sa_len = addr_len;
-    ((struct sockaddr*)&addrCopy)->sa_family = md_af;
-    addrp = &addrCopy;
-#endif
-    rv = connect(fd->secret->md.osfd, (struct sockaddr*)addrp, addr_len);
-    syserrno = errno;
-    if ((-1 == rv) && (EINPROGRESS == syserrno) && (!fd->secret->nonblocking))
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-        else
-        {
-            pt_Continuation op;
-            op.arg1.osfd = fd->secret->md.osfd;
-            op.arg2.buffer = (void*)addrp;
-            op.arg3.amount = addr_len;
-            op.timeout = timeout;
-            op.function = pt_connect_cont;
-            op.event = POLLOUT | POLLPRI;
-            rv = pt_Continue(&op);
-            syserrno = op.syserrno;
-        }
-    }
-    if (-1 == rv) {
-        pt_MapError(_PR_MD_MAP_CONNECT_ERROR, syserrno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_Connect */
-
-static PRStatus pt_ConnectContinue(
-    PRFileDesc *fd, PRInt16 out_flags)
-{
-    int err;
-    PRInt32 osfd;
-
-    if (out_flags & PR_POLL_NVAL)
-    {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0)
-    {
-        PR_ASSERT(out_flags == 0);
-        PR_SetError(PR_IN_PROGRESS_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    osfd = fd->secret->md.osfd;
-
-    err = _MD_unix_get_nonblocking_connect_error(osfd);
-    if (err != 0)
-    {
-        _PR_MD_MAP_CONNECT_ERROR(err);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_ConnectContinue */
-
-PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd)
-{
-    /* Find the NSPR layer and invoke its connectcontinue method */
-    PRFileDesc *bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
-
-    if (NULL == bottom)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    return pt_ConnectContinue(bottom, pd->out_flags);
-}  /* PR_GetConnectStatus */
-
-static PRFileDesc* pt_Accept(
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRFileDesc *newfd = NULL;
-    PRIntn syserrno, osfd = -1;
-    pt_SockLen addr_len = sizeof(PRNetAddr);
-
-    if (pt_TestAbort()) return newfd;
-
-#ifdef _PR_STRICT_ADDR_LEN
-    if (addr)
-    {
-        /*
-         * Set addr->raw.family just so that we can use the
-         * PR_NETADDR_SIZE macro.
-         */
-        addr->raw.family = fd->secret->af;
-        addr_len = PR_NETADDR_SIZE(addr);
-    }
-#endif
-
-    osfd = accept(fd->secret->md.osfd, (struct sockaddr*)addr, &addr_len);
-    syserrno = errno;
-
-    if (osfd == -1)
-    {
-        if (fd->secret->nonblocking) goto failed;
-
-        if (EWOULDBLOCK != syserrno && EAGAIN != syserrno
-        && ECONNABORTED != syserrno)
-            goto failed;
-        else
-        {
-            if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-            else
-            {
-                pt_Continuation op;
-                op.arg1.osfd = fd->secret->md.osfd;
-                op.arg2.buffer = addr;
-                op.arg3.addr_len = &addr_len;
-                op.timeout = timeout;
-                op.function = pt_accept_cont;
-                op.event = POLLIN | POLLPRI;
-                osfd = pt_Continue(&op);
-                syserrno = op.syserrno;
-            }
-            if (osfd < 0) goto failed;
-        }
-    }
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    /* ignore the sa_len field of struct sockaddr */
-    if (addr)
-    {
-        addr->raw.family = ((struct sockaddr*)addr)->sa_family;
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-#ifdef _PR_INET6
-	if (addr && (AF_INET6 == addr->raw.family))
-        addr->raw.family = PR_AF_INET6;
-#endif
-    newfd = pt_SetMethods(osfd, PR_DESC_SOCKET_TCP, PR_TRUE, PR_FALSE);
-    if (newfd == NULL) close(osfd);  /* $$$ whoops! this doesn't work $$$ */
-    else
-    {
-        PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-        PR_ASSERT(IsValidNetAddrLen(addr, addr_len) == PR_TRUE);
-#ifdef LINUX
-        /*
-         * On Linux, experiments showed that the accepted sockets
-         * inherit the TCP_NODELAY socket option of the listening
-         * socket.
-         */
-        newfd->secret->md.tcp_nodelay = fd->secret->md.tcp_nodelay;
-#endif
-    }
-    return newfd;
-
-failed:
-    pt_MapError(_PR_MD_MAP_ACCEPT_ERROR, syserrno);
-    return NULL;
-}  /* pt_Accept */
-
-static PRStatus pt_Bind(PRFileDesc *fd, const PRNetAddr *addr)
-{
-    PRIntn rv;
-    pt_SockLen addr_len;
-	const PRNetAddr *addrp = addr;
-#if defined(_PR_HAVE_SOCKADDR_LEN) || defined(_PR_INET6)
-	PRUint16 md_af = addr->raw.family;
-    PRNetAddr addrCopy;
-#endif
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-    if (addr->raw.family == AF_UNIX)
-    {
-        /* Disallow relative pathnames */
-        if (addr->local.path[0] != '/')
-        {
-            PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-            return PR_FAILURE;
-        }
-    }
-
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		md_af = AF_INET6;
-#ifndef _PR_HAVE_SOCKADDR_LEN
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-#endif
-	}
-#endif
-
-    addr_len = PR_NETADDR_SIZE(addr);
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    addrCopy = *addr;
-    ((struct sockaddr*)&addrCopy)->sa_len = addr_len;
-    ((struct sockaddr*)&addrCopy)->sa_family = md_af;
-    addrp = &addrCopy;
-#endif
-    rv = bind(fd->secret->md.osfd, (struct sockaddr*)addrp, addr_len);
-
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_BIND_ERROR, errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_Bind */
-
-static PRStatus pt_Listen(PRFileDesc *fd, PRIntn backlog)
-{
-    PRIntn rv;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = listen(fd->secret->md.osfd, backlog);
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_LISTEN_ERROR, errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_Listen */
-
-static PRStatus pt_Shutdown(PRFileDesc *fd, PRIntn how)
-{
-    PRIntn rv = -1;
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = shutdown(fd->secret->md.osfd, how);
-
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_SHUTDOWN_ERROR, errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* pt_Shutdown */
-
-static PRInt16 pt_Poll(PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    *out_flags = 0;
-    return in_flags;
-}  /* pt_Poll */
-
-static PRInt32 pt_Recv(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    PRInt32 syserrno, bytes = -1;
-    PRIntn osflags;
-
-    if (0 == flags)
-        osflags = 0;
-    else if (PR_MSG_PEEK == flags)
-        osflags = MSG_PEEK;
-    else
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return bytes;
-    }
-
-    if (pt_TestAbort()) return bytes;
-
-    /* recv() is a much slower call on pre-2.6 Solaris than read(). */
-#if defined(SOLARIS)
-    if (0 == osflags)
-        bytes = read(fd->secret->md.osfd, buf, amount);
-    else
-        bytes = recv(fd->secret->md.osfd, buf, amount, osflags);
-#else
-    bytes = recv(fd->secret->md.osfd, buf, amount, osflags);
-#endif
-    syserrno = errno;
-
-    if ((bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking))
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-        else
-        {
-            pt_Continuation op;
-            op.arg1.osfd = fd->secret->md.osfd;
-            op.arg2.buffer = buf;
-            op.arg3.amount = amount;
-            op.arg4.flags = osflags;
-            op.timeout = timeout;
-            op.function = pt_recv_cont;
-            op.event = POLLIN | POLLPRI;
-            bytes = pt_Continue(&op);
-            syserrno = op.syserrno;
-        }
-    }
-    if (bytes < 0)
-        pt_MapError(_PR_MD_MAP_RECV_ERROR, syserrno);
-    return bytes;
-}  /* pt_Recv */
-
-static PRInt32 pt_SocketRead(PRFileDesc *fd, void *buf, PRInt32 amount)
-{
-    return pt_Recv(fd, buf, amount, 0, PR_INTERVAL_NO_TIMEOUT);
-}  /* pt_SocketRead */
-
-static PRInt32 pt_Send(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    PRInt32 syserrno, bytes = -1;
-    PRBool fNeedContinue = PR_FALSE;
-#if defined(SOLARIS)
-	PRInt32 tmp_amount = amount;
-#endif
-
-    /*
-     * Under HP-UX DCE threads, pthread.h includes dce/cma_ux.h,
-     * which has the following:
-     *     #  define send        cma_send
-     *     extern int  cma_send (int , void *, int, int );
-     * So we need to cast away the 'const' of argument #2 for send().
-     */
-#if defined (HPUX) && defined(_PR_DCETHREADS)
-#define PT_SENDBUF_CAST (void *)
-#else
-#define PT_SENDBUF_CAST
-#endif
-
-    if (pt_TestAbort()) return bytes;
-
-    /*
-     * On pre-2.6 Solaris, send() is much slower than write().
-     * On 2.6 and beyond, with in-kernel sockets, send() and
-     * write() are fairly equivalent in performance.
-     */
-#if defined(SOLARIS)
-    PR_ASSERT(0 == flags);
-retry:
-    bytes = write(fd->secret->md.osfd, PT_SENDBUF_CAST buf, tmp_amount);
-#else
-    bytes = send(fd->secret->md.osfd, PT_SENDBUF_CAST buf, amount, flags);
-#endif
-    syserrno = errno;
-
-#if defined(SOLARIS)
-    /*
-     * The write system call has been reported to return the ERANGE error
-     * on occasion. Try to write in smaller chunks to workaround this bug.
-     */
-    if ((bytes == -1) && (syserrno == ERANGE))
-    {
-        if (tmp_amount > 1)
-        {
-            tmp_amount = tmp_amount/2;  /* half the bytes */
-            goto retry;
-        }
-    }
-#endif
-
-    if ( (bytes >= 0) && (bytes < amount) && (!fd->secret->nonblocking) )
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout)
-        {
-            bytes = -1;
-            syserrno = ETIMEDOUT;
-        }
-        else
-        {
-            buf = (char *) buf + bytes;
-            amount -= bytes;
-            fNeedContinue = PR_TRUE;
-        }
-    }
-    if ( (bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking) )
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-        else
-        {
-            bytes = 0;
-            fNeedContinue = PR_TRUE;
-        }
-    }
-
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = (void*)buf;
-        op.arg3.amount = amount;
-        op.arg4.flags = flags;
-        op.timeout = timeout;
-        op.result.code = bytes;  /* initialize the number sent */
-        op.function = pt_send_cont;
-        op.event = POLLOUT | POLLPRI;
-        bytes = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-    if (bytes == -1)
-        pt_MapError(_PR_MD_MAP_SEND_ERROR, syserrno);
-    return bytes;
-}  /* pt_Send */
-
-static PRInt32 pt_SocketWrite(PRFileDesc *fd, const void *buf, PRInt32 amount)
-{
-    return pt_Send(fd, buf, amount, 0, PR_INTERVAL_NO_TIMEOUT);
-}  /* pt_SocketWrite */
-
-static PRInt32 pt_SendTo(
-    PRFileDesc *fd, const void *buf,
-    PRInt32 amount, PRIntn flags, const PRNetAddr *addr,
-    PRIntervalTime timeout)
-{
-    PRInt32 syserrno, bytes = -1;
-    PRBool fNeedContinue = PR_FALSE;
-    pt_SockLen addr_len;
-	const PRNetAddr *addrp = addr;
-#if defined(_PR_HAVE_SOCKADDR_LEN) || defined(_PR_INET6)
-	PRUint16 md_af = addr->raw.family;
-    PRNetAddr addrCopy;
-#endif
-
-    if (pt_TestAbort()) return bytes;
-
-    PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-#if defined(_PR_INET6)
-	if (addr->raw.family == PR_AF_INET6) {
-		md_af = AF_INET6;
-#ifndef _PR_HAVE_SOCKADDR_LEN
-		addrCopy = *addr;
-		addrCopy.raw.family = AF_INET6;
-		addrp = &addrCopy;
-#endif
-	}
-#endif
-
-    addr_len = PR_NETADDR_SIZE(addr);
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    addrCopy = *addr;
-    ((struct sockaddr*)&addrCopy)->sa_len = addr_len;
-    ((struct sockaddr*)&addrCopy)->sa_family = md_af;
-    addrp = &addrCopy;
-#endif
-    bytes = sendto(
-        fd->secret->md.osfd, buf, amount, flags,
-        (struct sockaddr*)addrp, addr_len);
-    syserrno = errno;
-    if ( (bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking) )
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-        else fNeedContinue = PR_TRUE;
-    }
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = (void*)buf;
-        op.arg3.amount = amount;
-        op.arg4.flags = flags;
-        op.arg5.addr = (PRNetAddr*)addrp;
-        op.timeout = timeout;
-        op.result.code = 0;  /* initialize the number sent */
-        op.function = pt_sendto_cont;
-        op.event = POLLOUT | POLLPRI;
-        bytes = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-    if (bytes < 0)
-        pt_MapError(_PR_MD_MAP_SENDTO_ERROR, syserrno);
-    return bytes;
-}  /* pt_SendTo */
-
-static PRInt32 pt_RecvFrom(PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRBool fNeedContinue = PR_FALSE;
-    PRInt32 syserrno, bytes = -1;
-    pt_SockLen addr_len = sizeof(PRNetAddr);
-
-    if (pt_TestAbort()) return bytes;
-
-    bytes = recvfrom(
-        fd->secret->md.osfd, buf, amount, flags,
-        (struct sockaddr*)addr, &addr_len);
-    syserrno = errno;
-
-    if ( (bytes == -1) && (syserrno == EWOULDBLOCK || syserrno == EAGAIN)
-        && (!fd->secret->nonblocking) )
-    {
-        if (PR_INTERVAL_NO_WAIT == timeout) syserrno = ETIMEDOUT;
-        else fNeedContinue = PR_TRUE;
-    }
-
-    if (fNeedContinue == PR_TRUE)
-    {
-        pt_Continuation op;
-        op.arg1.osfd = fd->secret->md.osfd;
-        op.arg2.buffer = buf;
-        op.arg3.amount = amount;
-        op.arg4.flags = flags;
-        op.arg5.addr = addr;
-        op.timeout = timeout;
-        op.function = pt_recvfrom_cont;
-        op.event = POLLIN | POLLPRI;
-        bytes = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-#ifdef _PR_HAVE_SOCKADDR_LEN
-    if (bytes >= 0)
-    {
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr)
-        {
-            addr->raw.family = ((struct sockaddr*)addr)->sa_family;
-        }
-    }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-#ifdef _PR_INET6
-	if (addr && (AF_INET6 == addr->raw.family))
-        addr->raw.family = PR_AF_INET6;
-#endif
-    if (bytes < 0)
-        pt_MapError(_PR_MD_MAP_RECVFROM_ERROR, syserrno);
-    return bytes;
-}  /* pt_RecvFrom */
-
-#ifdef AIX
-#ifndef HAVE_SEND_FILE
-static pthread_once_t pt_aix_sendfile_once_block = PTHREAD_ONCE_INIT;
-
-static void pt_aix_sendfile_init_routine(void)
-{
-    void *handle = dlopen(NULL, RTLD_NOW | RTLD_GLOBAL);
-    pt_aix_sendfile_fptr = (ssize_t (*)()) dlsym(handle, "send_file");
-    dlclose(handle);
-}
-
-/* 
- * pt_AIXDispatchSendFile
- */
-static PRInt32 pt_AIXDispatchSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-	  PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    int rv;
-
-    rv = pthread_once(&pt_aix_sendfile_once_block,
-            pt_aix_sendfile_init_routine);
-    PR_ASSERT(0 == rv);
-    if (pt_aix_sendfile_fptr) {
-        return pt_AIXSendFile(sd, sfd, flags, timeout);
-    } else {
-        return PR_EmulateSendFile(sd, sfd, flags, timeout);
-    }
-}
-#endif /* !HAVE_SEND_FILE */
-
-
-/*
- * pt_AIXSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively. 
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *    
- *    return number of bytes sent or -1 on error
- *
- *      This implementation takes advantage of the send_file() system
- *      call available in AIX 4.3.2.
- */
-
-static PRInt32 pt_AIXSendFile(PRFileDesc *sd, PRSendFileData *sfd, 
-		PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct sf_parms sf_struct;
-    uint_t send_flags;
-    ssize_t rv;
-    int syserrno;
-    PRInt32 count;
-	unsigned long long saved_file_offset;
-	long long saved_file_bytes;
-
-    sf_struct.header_data = (void *) sfd->header;  /* cast away the 'const' */
-    sf_struct.header_length = sfd->hlen;
-    sf_struct.file_descriptor = sfd->fd->secret->md.osfd;
-    sf_struct.file_size = 0;
-    sf_struct.file_offset = sfd->file_offset;
-    if (sfd->file_nbytes == 0)
-    	sf_struct.file_bytes = -1;
-	else
-    	sf_struct.file_bytes = sfd->file_nbytes;
-    sf_struct.trailer_data = (void *) sfd->trailer;
-    sf_struct.trailer_length = sfd->tlen;
-    sf_struct.bytes_sent = 0;
-
-	saved_file_offset = sf_struct.file_offset;
-    saved_file_bytes = sf_struct.file_bytes;
-
-    send_flags = 0;			/* flags processed at the end */
-
-    /* The first argument to send_file() is int*. */
-    PR_ASSERT(sizeof(int) == sizeof(sd->secret->md.osfd));
-    do {
-        rv = AIX_SEND_FILE(&sd->secret->md.osfd, &sf_struct, send_flags);
-    } while (rv == -1 && (syserrno = errno) == EINTR);
-
-    if (rv == -1) {
-        if (syserrno == EAGAIN || syserrno == EWOULDBLOCK) {
-            count = 0; /* Not a real error.  Need to continue. */
-        } else {
-            count = -1;
-        }
-    } else {
-        count = sf_struct.bytes_sent;
-		/*
-		 * A bug in AIX 4.3.2 prevents the 'file_bytes' field from
-		 * being updated. So, 'file_bytes' is maintained by NSPR to
-		 * avoid conflict when this bug is fixed in AIX, in the future.
-		 */
-		if (saved_file_bytes != -1)
-			saved_file_bytes -= (sf_struct.file_offset - saved_file_offset);
-		sf_struct.file_bytes = saved_file_bytes;
-    }
-
-    if ((rv == 1) || ((rv == -1) && (count == 0))) {
-        pt_Continuation op;
-
-        op.arg1.osfd = sd->secret->md.osfd;
-        op.arg2.buffer = &sf_struct;
-        op.arg4.flags = send_flags;
-        op.result.code = count;
-        op.timeout = timeout;
-        op.function = pt_aix_sendfile_cont;
-        op.event = POLLOUT | POLLPRI;
-        count = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-
-    if (count == -1) {
-        pt_MapError(_MD_aix_map_sendfile_error, syserrno);
-        return -1;
-    }
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-        PR_Close(sd);
-    }
-	PR_ASSERT(count == (sfd->hlen + sfd->tlen +
-						((sfd->file_nbytes ==  0) ?
-						sf_struct.file_size - sfd->file_offset :
-						sfd->file_nbytes)));
-    return count;
-}
-#endif /* AIX */
-
-#ifdef HPUX11
-/*
- * pt_HPUXSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *    
- *    return number of bytes sent or -1 on error
- *
- *      This implementation takes advantage of the sendfile() system
- *      call available in HP-UX B.11.00.
- */
-
-static PRInt32 pt_HPUXSendFile(PRFileDesc *sd, PRSendFileData *sfd, 
-		PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct stat statbuf;
-    size_t nbytes_to_send, file_nbytes_to_send;
-    struct iovec hdtrl[2];  /* optional header and trailer buffers */
-    int send_flags;
-    PRInt32 count;
-    int syserrno;
-
-    if (sfd->file_nbytes == 0) {
-        /* Get file size */
-        if (fstat(sfd->fd->secret->md.osfd, &statbuf) == -1) {
-            _PR_MD_MAP_FSTAT_ERROR(errno);
-            return -1;
-        } 		
-        file_nbytes_to_send = statbuf.st_size - sfd->file_offset;
-    } else {
-        file_nbytes_to_send = sfd->file_nbytes;
-    }
-    nbytes_to_send = sfd->hlen + sfd->tlen + file_nbytes_to_send;
-
-    hdtrl[0].iov_base = (void *) sfd->header;  /* cast away the 'const' */
-    hdtrl[0].iov_len = sfd->hlen;
-    hdtrl[1].iov_base = (void *) sfd->trailer;
-    hdtrl[1].iov_len = sfd->tlen;
-    /*
-     * SF_DISCONNECT seems to close the socket even if sendfile()
-     * only does a partial send on a nonblocking socket.  This
-     * would prevent the subsequent sendfile() calls on that socket
-     * from working.  So we don't use the SD_DISCONNECT flag.
-     */
-    send_flags = 0;
-
-    do {
-        count = sendfile(sd->secret->md.osfd, sfd->fd->secret->md.osfd,
-                sfd->file_offset, file_nbytes_to_send, hdtrl, send_flags);
-    } while (count == -1 && (syserrno = errno) == EINTR);
-
-    if (count == -1 && (syserrno == EAGAIN || syserrno == EWOULDBLOCK)) {
-        count = 0;
-    }
-    if (count != -1 && count < nbytes_to_send) {
-        pt_Continuation op;
-
-        if (count < sfd->hlen) {
-			/* header not sent */
-
-            hdtrl[0].iov_base = ((char *) sfd->header) + count;
-            hdtrl[0].iov_len = sfd->hlen - count;
-            op.arg3.file_spec.offset = sfd->file_offset;
-            op.arg3.file_spec.nbytes = file_nbytes_to_send;
-        } else if (count < (sfd->hlen + file_nbytes_to_send)) {
-			/* header sent, file not sent */
-
-            hdtrl[0].iov_base = NULL;
-            hdtrl[0].iov_len = 0;
-
-            op.arg3.file_spec.offset = sfd->file_offset + count - sfd->hlen;
-            op.arg3.file_spec.nbytes = file_nbytes_to_send - (count - sfd->hlen);
-        } else if (count < (sfd->hlen + file_nbytes_to_send + sfd->tlen)) {
-			PRUint32 trailer_nbytes_sent;
-
-			/* header sent, file sent, trailer not sent */
-
-            hdtrl[0].iov_base = NULL;
-            hdtrl[0].iov_len = 0;
-			/*
-			 * set file offset and len so that no more file data is
-			 * sent
-			 */
-            op.arg3.file_spec.offset = statbuf.st_size;
-            op.arg3.file_spec.nbytes = 0;
-
-			trailer_nbytes_sent = count - sfd->hlen - file_nbytes_to_send;
-            hdtrl[1].iov_base = ((char *) sfd->trailer) + trailer_nbytes_sent;
-            hdtrl[1].iov_len = sfd->tlen - trailer_nbytes_sent;
-		}
-
-        op.arg1.osfd = sd->secret->md.osfd;
-        op.filedesc = sfd->fd->secret->md.osfd;
-        op.arg2.buffer = hdtrl;
-        op.arg3.file_spec.st_size = statbuf.st_size;
-        op.arg4.flags = send_flags;
-        op.nbytes_to_send = nbytes_to_send - count;
-        op.result.code = count;
-        op.timeout = timeout;
-        op.function = pt_hpux_sendfile_cont;
-        op.event = POLLOUT | POLLPRI;
-        count = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-
-    if (count == -1) {
-        pt_MapError(_MD_hpux_map_sendfile_error, syserrno);
-        return -1;
-    }
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-        PR_Close(sd);
-    }
-    PR_ASSERT(count == nbytes_to_send);
-    return count;
-}
-
-#endif  /* HPUX11 */
-
-#ifdef SOLARIS 
-
-/*
- *    pt_SolarisSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *
- *    return number of bytes sent or -1 on error
- *
- *    This implementation takes advantage of the sendfilev() system
- *    call available in Solaris 8.
- */
-
-static PRInt32 pt_SolarisSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-                PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct stat statbuf;
-    size_t nbytes_to_send, file_nbytes_to_send;	
-    struct sendfilevec sfv_struct[3];  
-    int sfvcnt = 0;	
-    size_t xferred;
-    PRInt32 count;
-    int syserrno;
-
-    if (sfd->file_nbytes == 0) {
-        /* Get file size */
-        if (fstat(sfd->fd->secret->md.osfd, &statbuf) == -1) {
-            _PR_MD_MAP_FSTAT_ERROR(errno);
-            return -1;
-        } 		
-        file_nbytes_to_send = statbuf.st_size - sfd->file_offset;
-    } else {
-        file_nbytes_to_send = sfd->file_nbytes;
-    }
-
-    nbytes_to_send = sfd->hlen + sfd->tlen + file_nbytes_to_send;
-
-    if (sfd->hlen != 0) {
-        sfv_struct[sfvcnt].sfv_fd = SFV_FD_SELF;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = (off_t) sfd->header; 
-        sfv_struct[sfvcnt].sfv_len = sfd->hlen;
-        sfvcnt++;
-    }
-
-    if (file_nbytes_to_send != 0) {
-        sfv_struct[sfvcnt].sfv_fd = sfd->fd->secret->md.osfd;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = sfd->file_offset;
-        sfv_struct[sfvcnt].sfv_len = file_nbytes_to_send;
-        sfvcnt++;
-    }
-
-    if (sfd->tlen != 0) {
-        sfv_struct[sfvcnt].sfv_fd = SFV_FD_SELF;
-        sfv_struct[sfvcnt].sfv_flag = 0;
-        sfv_struct[sfvcnt].sfv_off = (off_t) sfd->trailer; 
-        sfv_struct[sfvcnt].sfv_len = sfd->tlen;
-        sfvcnt++;
-    }
-
-    if (0 == sfvcnt) {
-        count = 0;
-        goto done;
-    }
-   	   
-    /*
-     * Strictly speaking, we may have sent some bytes when the
-     * sendfilev() is interrupted and we should retry it from an
-     * updated offset.  We are not doing that here.
-     */
-    count = SOLARIS_SENDFILEV(sd->secret->md.osfd, sfv_struct,
-            sfvcnt, &xferred);
-
-    PR_ASSERT((count == -1) || (count == xferred));
-
-    if (count == -1) {
-        syserrno = errno;
-        if (syserrno == EINTR
-                || syserrno == EAGAIN || syserrno == EWOULDBLOCK) {
-            count = xferred;
-        }
-    }
-
-    if (count != -1 && count < nbytes_to_send) {
-        pt_Continuation op;
-        struct sendfilevec *vec = sfv_struct;
-        PRInt32 rem = count;
-
-        while (rem >= vec->sfv_len) {
-            rem -= vec->sfv_len;
-            vec++;
-            sfvcnt--;
-        }
-        PR_ASSERT(sfvcnt > 0);
-
-        vec->sfv_off += rem;
-        vec->sfv_len -= rem;
-        PR_ASSERT(vec->sfv_len > 0);
-
-        op.arg1.osfd = sd->secret->md.osfd;
-        op.arg2.buffer = vec;
-        op.arg3.amount = sfvcnt;
-        op.arg4.flags = 0;
-        op.nbytes_to_send = nbytes_to_send - count;
-        op.result.code = count;
-        op.timeout = timeout;
-        op.function = pt_solaris_sendfile_cont;
-        op.event = POLLOUT | POLLPRI;
-        count = pt_Continue(&op);
-        syserrno = op.syserrno;
-    }
-
-done:
-    if (count == -1) {
-        pt_MapError(_MD_solaris_map_sendfile_error, syserrno);
-        return -1;
-    }
-    if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-        PR_Close(sd);
-    }
-    PR_ASSERT(count == nbytes_to_send);
-    return count;
-}
-
-#ifndef HAVE_SENDFILEV
-static pthread_once_t pt_solaris_sendfilev_once_block = PTHREAD_ONCE_INIT;
-
-static void pt_solaris_sendfilev_init_routine(void)
-{
-    void *handle;
-    PRBool close_it = PR_FALSE;
- 
-    /*
-     * We do not want to unload libsendfile.so.  This handle is leaked
-     * intentionally.
-     */
-    handle = dlopen("libsendfile.so", RTLD_LAZY | RTLD_GLOBAL);
-    PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-        ("dlopen(libsendfile.so) returns %p", handle));
-
-    if (NULL == handle) {
-        /*
-         * The dlopen(0, mode) call is to allow for the possibility that
-         * sendfilev() may become part of a standard system library in a
-         * future Solaris release.
-         */
-        handle = dlopen(0, RTLD_LAZY | RTLD_GLOBAL);
-        PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-            ("dlopen(0) returns %p", handle));
-        close_it = PR_TRUE;
-    }
-    pt_solaris_sendfilev_fptr = (ssize_t (*)()) dlsym(handle, "sendfilev");
-    PR_LOG(_pr_io_lm, PR_LOG_DEBUG,
-        ("dlsym(sendfilev) returns %p", pt_solaris_sendfilev_fptr));
-    
-    if (close_it) {
-        dlclose(handle);
-    }
-}
-
-/* 
- * pt_SolarisDispatchSendFile
- */
-static PRInt32 pt_SolarisDispatchSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-	  PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    int rv;
-
-    rv = pthread_once(&pt_solaris_sendfilev_once_block,
-            pt_solaris_sendfilev_init_routine);
-    PR_ASSERT(0 == rv);
-    if (pt_solaris_sendfilev_fptr) {
-        return pt_SolarisSendFile(sd, sfd, flags, timeout);
-    } else {
-        return PR_EmulateSendFile(sd, sfd, flags, timeout);
-    }
-}
-#endif /* !HAVE_SENDFILEV */
-
-#endif  /* SOLARIS */
-
-#ifdef LINUX
-/*
- * pt_LinuxSendFile
- *
- *    Send file sfd->fd across socket sd. If specified, header and trailer
- *    buffers are sent before and after the file, respectively.
- *
- *    PR_TRANSMITFILE_CLOSE_SOCKET flag - close socket after sending file
- *    
- *    return number of bytes sent or -1 on error
- *
- *      This implementation takes advantage of the sendfile() system
- *      call available in Linux kernel 2.2 or higher.
- */
-
-static PRInt32 pt_LinuxSendFile(PRFileDesc *sd, PRSendFileData *sfd,
-                PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    struct stat statbuf;
-    size_t file_nbytes_to_send;	
-    PRInt32 count = 0;
-    ssize_t rv;
-    int syserrno;
-    off_t offset;
-    PRBool tcp_cork_enabled = PR_FALSE;
-    int tcp_cork;
-
-    if (sfd->file_nbytes == 0) {
-        /* Get file size */
-        if (fstat(sfd->fd->secret->md.osfd, &statbuf) == -1) {
-            _PR_MD_MAP_FSTAT_ERROR(errno);
-            return -1;
-        } 		
-        file_nbytes_to_send = statbuf.st_size - sfd->file_offset;
-    } else {
-        file_nbytes_to_send = sfd->file_nbytes;
-    }
-
-    if ((sfd->hlen != 0 || sfd->tlen != 0)
-            && sd->secret->md.tcp_nodelay == 0) {
-        tcp_cork = 1;
-        if (setsockopt(sd->secret->md.osfd, SOL_TCP, TCP_CORK,
-                &tcp_cork, sizeof tcp_cork) == 0) {
-            tcp_cork_enabled = PR_TRUE;
-        } else {
-            syserrno = errno;
-            if (syserrno != EINVAL) {
-                _PR_MD_MAP_SETSOCKOPT_ERROR(syserrno);
-                return -1;
-            }
-            /*
-             * The most likely reason for the EINVAL error is that
-             * TCP_NODELAY is set (with a function other than
-             * PR_SetSocketOption).  This is not fatal, so we keep
-             * on going.
-             */
-            PR_LOG(_pr_io_lm, PR_LOG_WARNING,
-                ("pt_LinuxSendFile: "
-                "setsockopt(TCP_CORK) failed with EINVAL\n"));
-        }
-    }
-
-    if (sfd->hlen != 0) {
-        count = PR_Send(sd, sfd->header, sfd->hlen, 0, timeout);
-        if (count == -1) {
-            goto failed;
-        }
-    }
-
-    if (file_nbytes_to_send != 0) {
-        offset = sfd->file_offset;
-        do {
-            rv = sendfile(sd->secret->md.osfd, sfd->fd->secret->md.osfd,
-                &offset, file_nbytes_to_send);
-        } while (rv == -1 && (syserrno = errno) == EINTR);
-        if (rv == -1) {
-            if (syserrno != EAGAIN && syserrno != EWOULDBLOCK) {
-                _MD_linux_map_sendfile_error(syserrno);
-                count = -1;
-                goto failed;
-            }
-            rv = 0;
-        }
-        PR_ASSERT(rv == offset - sfd->file_offset);
-        count += rv;
-
-        if (rv < file_nbytes_to_send) {
-            pt_Continuation op;
-
-            op.arg1.osfd = sd->secret->md.osfd;
-            op.in_fd = sfd->fd->secret->md.osfd;
-            op.offset = offset;
-            op.count = file_nbytes_to_send - rv;
-            op.result.code = count;
-            op.timeout = timeout;
-            op.function = pt_linux_sendfile_cont;
-            op.event = POLLOUT | POLLPRI;
-            count = pt_Continue(&op);
-            syserrno = op.syserrno;
-            if (count == -1) {
-                pt_MapError(_MD_linux_map_sendfile_error, syserrno);
-                goto failed;
-            }
-        }
-    }
-
-    if (sfd->tlen != 0) {
-        rv = PR_Send(sd, sfd->trailer, sfd->tlen, 0, timeout);
-        if (rv == -1) {
-            count = -1;
-            goto failed;
-        }
-        count += rv;
-    }
-
-failed:
-    if (tcp_cork_enabled) {
-        tcp_cork = 0;
-        if (setsockopt(sd->secret->md.osfd, SOL_TCP, TCP_CORK,
-                &tcp_cork, sizeof tcp_cork) == -1 && count != -1) {
-            _PR_MD_MAP_SETSOCKOPT_ERROR(errno);
-            count = -1;
-        }
-    }
-    if (count != -1) {
-        if (flags & PR_TRANSMITFILE_CLOSE_SOCKET) {
-            PR_Close(sd);
-        }
-        PR_ASSERT(count == sfd->hlen + sfd->tlen + file_nbytes_to_send);
-    }
-    return count;
-}
-#endif  /* LINUX */
-
-#ifdef AIX
-extern	int _pr_aix_send_file_use_disabled;
-#endif
-
-static PRInt32 pt_SendFile(
-    PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    if (pt_TestAbort()) return -1;
-    /* The socket must be in blocking mode. */
-    if (sd->secret->nonblocking)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return -1;
-    }
-#ifdef HPUX11
-    return(pt_HPUXSendFile(sd, sfd, flags, timeout));
-#elif defined(AIX)
-#ifdef HAVE_SEND_FILE
-	/*
-	 * A bug in AIX 4.3.2 results in corruption of data transferred by
-	 * send_file(); AIX patch PTF U463956 contains the fix.  A user can
-	 * disable the use of send_file function in NSPR, when this patch is
-	 * not installed on the system, by setting the envionment variable
-	 * NSPR_AIX_SEND_FILE_USE_DISABLED to 1.
-	 */
-	if (_pr_aix_send_file_use_disabled)
-		return(PR_EmulateSendFile(sd, sfd, flags, timeout));
-	else
-    	return(pt_AIXSendFile(sd, sfd, flags, timeout));
-#else
-	return(PR_EmulateSendFile(sd, sfd, flags, timeout));
-    /* return(pt_AIXDispatchSendFile(sd, sfd, flags, timeout));*/
-#endif /* HAVE_SEND_FILE */
-#elif defined(SOLARIS)
-#ifdef HAVE_SENDFILEV
-    	return(pt_SolarisSendFile(sd, sfd, flags, timeout));
-#else
-	return(pt_SolarisDispatchSendFile(sd, sfd, flags, timeout));
-#endif /* HAVE_SENDFILEV */
-#elif defined(LINUX)
-    	return(pt_LinuxSendFile(sd, sfd, flags, timeout));
-#else
-	return(PR_EmulateSendFile(sd, sfd, flags, timeout));
-#endif
-}
-
-static PRInt32 pt_TransmitFile(
-    PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-    PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-	PRSendFileData sfd;
-
-	sfd.fd = fd;
-	sfd.file_offset = 0;
-	sfd.file_nbytes = 0;
-	sfd.header = headers;
-	sfd.hlen = hlen;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-
-	return(pt_SendFile(sd, &sfd, flags, timeout));
-}  /* pt_TransmitFile */
-
-static PRInt32 pt_AcceptRead(
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
-    void *buf, PRInt32 amount, PRIntervalTime timeout)
-{
-    PRInt32 rv = -1;
-
-    if (pt_TestAbort()) return rv;
-    /* The socket must be in blocking mode. */
-    if (sd->secret->nonblocking)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return rv;
-    }
-
-    rv = PR_EmulateAcceptRead(sd, nd, raddr, buf, amount, timeout);
-    return rv;
-}  /* pt_AcceptRead */
-
-static PRStatus pt_GetSockName(PRFileDesc *fd, PRNetAddr *addr)
-{
-    PRIntn rv = -1;
-    pt_SockLen addr_len = sizeof(PRNetAddr);
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = getsockname(
-        fd->secret->md.osfd, (struct sockaddr*)addr, &addr_len);
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_GETSOCKNAME_ERROR, errno);
-        return PR_FAILURE;
-    } else {
-#ifdef _PR_HAVE_SOCKADDR_LEN
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr)
-        {
-            addr->raw.family = ((struct sockaddr*)addr)->sa_family;
-        }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-#ifdef _PR_INET6
-		if (AF_INET6 == addr->raw.family)
-			addr->raw.family = PR_AF_INET6;
-#endif
-        PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-        PR_ASSERT(IsValidNetAddrLen(addr, addr_len) == PR_TRUE);
-        return PR_SUCCESS;
-    }
-}  /* pt_GetSockName */
-
-static PRStatus pt_GetPeerName(PRFileDesc *fd, PRNetAddr *addr)
-{
-    PRIntn rv = -1;
-    pt_SockLen addr_len = sizeof(PRNetAddr);
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = getpeername(
-        fd->secret->md.osfd, (struct sockaddr*)addr, &addr_len);
-
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_GETPEERNAME_ERROR, errno);
-        return PR_FAILURE;
-    } else {
-#ifdef _PR_HAVE_SOCKADDR_LEN
-        /* ignore the sa_len field of struct sockaddr */
-        if (addr)
-        {
-            addr->raw.family = ((struct sockaddr*)addr)->sa_family;
-        }
-#endif /* _PR_HAVE_SOCKADDR_LEN */
-#ifdef _PR_INET6
-		if (AF_INET6 == addr->raw.family)
-        	addr->raw.family = PR_AF_INET6;
-#endif
-        PR_ASSERT(IsValidNetAddr(addr) == PR_TRUE);
-        PR_ASSERT(IsValidNetAddrLen(addr, addr_len) == PR_TRUE);
-        return PR_SUCCESS;
-    }
-}  /* pt_GetPeerName */
-
-static PRStatus pt_GetSocketOption(PRFileDesc *fd, PRSocketOptionData *data)
-{
-    PRIntn rv;
-    pt_SockLen length;
-    PRInt32 level, name;
-
-    /*
-     * PR_SockOpt_Nonblocking is a special case that does not
-     * translate to a getsockopt() call
-     */
-    if (PR_SockOpt_Nonblocking == data->option)
-    {
-        data->value.non_blocking = fd->secret->nonblocking;
-        return PR_SUCCESS;
-    }
-
-    rv = _PR_MapOptionName(data->option, &level, &name);
-    if (PR_SUCCESS == rv)
-    {
-        switch (data->option)
-        {
-            case PR_SockOpt_Linger:
-            {
-                struct linger linger;
-                length = sizeof(linger);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name, (char *) &linger, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(linger) == length));
-                data->value.linger.polarity =
-                    (linger.l_onoff) ? PR_TRUE : PR_FALSE;
-                data->value.linger.linger =
-                    PR_SecondsToInterval(linger.l_linger);
-                break;
-            }
-            case PR_SockOpt_Reuseaddr:
-            case PR_SockOpt_Keepalive:
-            case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
-            {
-                PRIntn value;
-                length = sizeof(PRIntn);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name, (char*)&value, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(PRIntn) == length));
-                data->value.reuse_addr = (0 == value) ? PR_FALSE : PR_TRUE;
-                break;
-            }
-            case PR_SockOpt_McastLoopback:
-            {
-                PRUint8 xbool;
-                length = sizeof(xbool);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&xbool, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(xbool) == length));
-                data->value.mcast_loopback = (0 == xbool) ? PR_FALSE : PR_TRUE;
-                break;
-            }
-            case PR_SockOpt_RecvBufferSize:
-            case PR_SockOpt_SendBufferSize:
-            case PR_SockOpt_MaxSegment:
-            {
-                PRIntn value;
-                length = sizeof(PRIntn);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name, (char*)&value, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(PRIntn) == length));
-                data->value.recv_buffer_size = value;
-                break;
-            }
-            case PR_SockOpt_IpTimeToLive:
-            case PR_SockOpt_IpTypeOfService:
-            {
-                length = sizeof(PRUintn);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&data->value.ip_ttl, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(PRIntn) == length));
-                break;
-            }
-            case PR_SockOpt_McastTimeToLive:
-            {
-                PRUint8 ttl;
-                length = sizeof(ttl);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&ttl, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(ttl) == length));
-                data->value.mcast_ttl = ttl;
-                break;
-            }
-            case PR_SockOpt_AddMember:
-            case PR_SockOpt_DropMember:
-            {
-                struct ip_mreq mreq;
-                length = sizeof(mreq);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name, (char*)&mreq, &length);
-                PR_ASSERT((-1 == rv) || (sizeof(mreq) == length));
-                data->value.add_member.mcaddr.inet.ip =
-                    mreq.imr_multiaddr.s_addr;
-                data->value.add_member.ifaddr.inet.ip =
-                    mreq.imr_interface.s_addr;
-                break;
-            }
-            case PR_SockOpt_McastInterface:
-            {
-                length = sizeof(data->value.mcast_if.inet.ip);
-                rv = getsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&data->value.mcast_if.inet.ip, &length);
-                PR_ASSERT((-1 == rv)
-                    || (sizeof(data->value.mcast_if.inet.ip) == length));
-                break;
-            }
-            default:
-                PR_NOT_REACHED("Unknown socket option");
-                break;
-        }
-        if (-1 == rv) _PR_MD_MAP_GETSOCKOPT_ERROR(errno);
-    }
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* pt_GetSocketOption */
-
-static PRStatus pt_SetSocketOption(PRFileDesc *fd, const PRSocketOptionData *data)
-{
-    PRIntn rv;
-    PRInt32 level, name;
-
-    /*
-     * PR_SockOpt_Nonblocking is a special case that does not
-     * translate to a setsockopt call.
-     */
-    if (PR_SockOpt_Nonblocking == data->option)
-    {
-        fd->secret->nonblocking = data->value.non_blocking;
-        return PR_SUCCESS;
-    }
-
-    rv = _PR_MapOptionName(data->option, &level, &name);
-    if (PR_SUCCESS == rv)
-    {
-        switch (data->option)
-        {
-            case PR_SockOpt_Linger:
-            {
-                struct linger linger;
-                linger.l_onoff = data->value.linger.polarity;
-                linger.l_linger = PR_IntervalToSeconds(data->value.linger.linger);
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name, (char*)&linger, sizeof(linger));
-                break;
-            }
-            case PR_SockOpt_Reuseaddr:
-            case PR_SockOpt_Keepalive:
-            case PR_SockOpt_NoDelay:
-            case PR_SockOpt_Broadcast:
-            {
-                PRIntn value = (data->value.reuse_addr) ? 1 : 0;
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&value, sizeof(PRIntn));
-#ifdef LINUX
-                /* for pt_LinuxSendFile */
-                if (name == TCP_NODELAY && rv == 0) {
-                    fd->secret->md.tcp_nodelay = value;
-                }
-#endif
-                break;
-            }
-            case PR_SockOpt_McastLoopback:
-            {
-                PRUint8 xbool = data->value.mcast_loopback ? 1 : 0;
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&xbool, sizeof(xbool));
-                break;
-            }
-            case PR_SockOpt_RecvBufferSize:
-            case PR_SockOpt_SendBufferSize:
-            case PR_SockOpt_MaxSegment:
-            {
-                PRIntn value = data->value.recv_buffer_size;
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&value, sizeof(PRIntn));
-                break;
-            }
-            case PR_SockOpt_IpTimeToLive:
-            case PR_SockOpt_IpTypeOfService:
-            {
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&data->value.ip_ttl, sizeof(PRUintn));
-                break;
-            }
-            case PR_SockOpt_McastTimeToLive:
-            {
-                PRUint8 ttl = data->value.mcast_ttl;
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&ttl, sizeof(ttl));
-                break;
-            }
-            case PR_SockOpt_AddMember:
-            case PR_SockOpt_DropMember:
-            {
-                struct ip_mreq mreq;
-                mreq.imr_multiaddr.s_addr =
-                    data->value.add_member.mcaddr.inet.ip;
-                mreq.imr_interface.s_addr =
-                    data->value.add_member.ifaddr.inet.ip;
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&mreq, sizeof(mreq));
-                break;
-            }
-            case PR_SockOpt_McastInterface:
-            {
-                rv = setsockopt(
-                    fd->secret->md.osfd, level, name,
-                    (char*)&data->value.mcast_if.inet.ip,
-                    sizeof(data->value.mcast_if.inet.ip));
-                break;
-            }
-            default:
-                PR_NOT_REACHED("Unknown socket option");
-                break;
-        }
-        if (-1 == rv) _PR_MD_MAP_SETSOCKOPT_ERROR(errno);
-    }
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* pt_SetSocketOption */
-
-/*****************************************************************************/
-/****************************** I/O method objects ***************************/
-/*****************************************************************************/
-
-static PRIOMethods _pr_file_methods = {
-    PR_DESC_FILE,
-    pt_Close,
-    pt_Read,
-    pt_Write,
-    pt_Available_f,
-    pt_Available64_f,
-    pt_Fsync,
-    pt_Seek,
-    pt_Seek64,
-    pt_FileInfo,
-    pt_FileInfo64,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    pt_Poll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRIOMethods _pr_pipe_methods = {
-    PR_DESC_PIPE,
-    pt_Close,
-    pt_Read,
-    pt_Write,
-    pt_Available_s,
-    pt_Available64_s,
-    pt_Synch,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    pt_Poll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRIOMethods _pr_tcp_methods = {
-    PR_DESC_SOCKET_TCP,
-    pt_Close,
-    pt_SocketRead,
-    pt_SocketWrite,
-    pt_Available_s,
-    pt_Available64_s,
-    pt_Synch,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    pt_Writev,
-    pt_Connect,
-    pt_Accept,
-    pt_Bind,
-    pt_Listen,
-    pt_Shutdown,
-    pt_Recv,
-    pt_Send,
-    (PRRecvfromFN)_PR_InvalidInt,
-    (PRSendtoFN)_PR_InvalidInt,
-    pt_Poll,
-    pt_AcceptRead,
-    pt_TransmitFile,
-    pt_GetSockName,
-    pt_GetPeerName,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    pt_GetSocketOption,
-    pt_SetSocketOption,
-    pt_SendFile, 
-    pt_ConnectContinue,
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRIOMethods _pr_udp_methods = {
-    PR_DESC_SOCKET_UDP,
-    pt_Close,
-    pt_SocketRead,
-    pt_SocketWrite,
-    pt_Available_s,
-    pt_Available64_s,
-    pt_Synch,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    pt_Writev,
-    pt_Connect,
-    (PRAcceptFN)_PR_InvalidDesc,
-    pt_Bind,
-    pt_Listen,
-    pt_Shutdown,
-    pt_Recv,
-    pt_Send,
-    pt_RecvFrom,
-    pt_SendTo,
-    pt_Poll,
-    (PRAcceptreadFN)_PR_InvalidInt,
-    (PRTransmitfileFN)_PR_InvalidInt,
-    pt_GetSockName,
-    pt_GetPeerName,
-    (PRReservedFN)_PR_InvalidInt,
-    (PRReservedFN)_PR_InvalidInt,
-    pt_GetSocketOption,
-    pt_SetSocketOption,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRIOMethods _pr_socketpollfd_methods = {
-    (PRDescType) 0,
-    (PRCloseFN)_PR_InvalidStatus,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-	pt_Poll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-#if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-    || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-    || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-    || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
-    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-#define _PR_FCNTL_FLAGS O_NONBLOCK
-#else
-#error "Can't determine architecture"
-#endif
-
-/*
- * Put a Unix file descriptor in non-blocking mode.
- */
-static void pt_MakeFdNonblock(PRIntn osfd)
-{
-    PRIntn flags;
-    flags = fcntl(osfd, F_GETFL, 0);
-    flags |= _PR_FCNTL_FLAGS;
-    (void)fcntl(osfd, F_SETFL, flags);
-}
-
-/*
- * Put a Unix socket fd in non-blocking mode that can
- * ideally be inherited by an accepted socket.
- *
- * Why doesn't pt_MakeFdNonblock do?  This is to deal with
- * the special case of HP-UX.  HP-UX has three kinds of
- * non-blocking modes for sockets: the fcntl() O_NONBLOCK
- * and O_NDELAY flags and ioctl() FIOSNBIO request.  Only
- * the ioctl() FIOSNBIO form of non-blocking mode is
- * inherited by an accepted socket.
- *
- * Other platforms just use the generic pt_MakeFdNonblock
- * to put a socket in non-blocking mode.
- */
-#ifdef HPUX
-static void pt_MakeSocketNonblock(PRIntn osfd)
-{
-    PRIntn one = 1;
-    (void)ioctl(osfd, FIOSNBIO, &one);
-}
-#else
-#define pt_MakeSocketNonblock pt_MakeFdNonblock
-#endif
-
-static PRFileDesc *pt_SetMethods(
-    PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported)
-{
-    PRFileDesc *fd = _PR_Getfd();
-    
-    if (fd == NULL) PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    else
-    {
-        fd->secret->md.osfd = osfd;
-        fd->secret->state = _PR_FILEDESC_OPEN;
-        if (imported) fd->secret->inheritable = _PR_TRI_UNKNOWN;
-        else
-        {
-            /* By default, a Unix fd is not closed on exec. */
-#ifdef DEBUG
-            PRIntn flags;
-            flags = fcntl(osfd, F_GETFD, 0);
-            PR_ASSERT(0 == flags);
-#endif
-            fd->secret->inheritable = _PR_TRI_TRUE;
-        }
-        switch (type)
-        {
-            case PR_DESC_FILE:
-                fd->methods = PR_GetFileMethods();
-                break;
-            case PR_DESC_SOCKET_TCP:
-                fd->methods = PR_GetTCPMethods();
-#ifdef _PR_ACCEPT_INHERIT_NONBLOCK
-                if (!isAcceptedSocket) pt_MakeSocketNonblock(osfd);
-#else
-                pt_MakeSocketNonblock(osfd);
-#endif
-                break;
-            case PR_DESC_SOCKET_UDP:
-                fd->methods = PR_GetUDPMethods();
-                pt_MakeFdNonblock(osfd);
-                break;
-            case PR_DESC_PIPE:
-                fd->methods = PR_GetPipeMethods();
-                pt_MakeFdNonblock(osfd);
-                break;
-            default:
-                break;
-        }
-    }
-    return fd;
-}  /* pt_SetMethods */
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetFileMethods(void)
-{
-    return &_pr_file_methods;
-}  /* PR_GetFileMethods */
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetPipeMethods(void)
-{
-    return &_pr_pipe_methods;
-}  /* PR_GetPipeMethods */
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetTCPMethods(void)
-{
-    return &_pr_tcp_methods;
-}  /* PR_GetTCPMethods */
-
-PR_IMPLEMENT(const PRIOMethods*) PR_GetUDPMethods(void)
-{
-    return &_pr_udp_methods;
-}  /* PR_GetUDPMethods */
-
-static const PRIOMethods* PR_GetSocketPollFdMethods(void)
-{
-    return &_pr_socketpollfd_methods;
-}  /* PR_GetSocketPollFdMethods */
-
-PR_IMPLEMENT(PRFileDesc*) PR_AllocFileDesc(
-    PRInt32 osfd, const PRIOMethods *methods)
-{
-    PRFileDesc *fd = _PR_Getfd();
-
-    if (NULL == fd) goto failed;
-
-    fd->methods = methods;
-    fd->secret->md.osfd = osfd;
-    /* Make fd non-blocking */
-    if (osfd > 2)
-    {
-        /* Don't mess around with stdin, stdout or stderr */
-        if (&_pr_tcp_methods == methods) pt_MakeSocketNonblock(osfd);
-        else pt_MakeFdNonblock(osfd);
-    }
-    fd->secret->state = _PR_FILEDESC_OPEN;
-    fd->secret->inheritable = _PR_TRI_UNKNOWN;
-    return fd;
-    
-failed:
-    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    return fd;
-}  /* PR_AllocFileDesc */
-
-#if 0
-
-#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
-PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
-#if defined(_PR_INET6_PROBE)
-PR_EXTERN(PRBool) _pr_ipv6_is_present;
-PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
-{
-PRInt32 osfd;
-
-#if defined(DARWIN)
-    /*
-     * Disable IPv6 if Darwin version is less than 7.0.0 (OS X 10.3).  IPv6 on
-     * lesser versions is not ready for general use (see bug 222031).
-     */
-    {
-        struct utsname u;
-        if (uname(&u) != 0 || atoi(u.release) < 7)
-            return PR_FALSE;
-    }
-#endif
-
-    /*
-     * HP-UX only: HP-UX IPv6 Porting Guide (dated February 2001)
-     * suggests that we call open("/dev/ip6", O_RDWR) to determine
-     * whether IPv6 APIs and the IPv6 stack are on the system.
-     * Our portable test below seems to work fine, so I am using it.
-     */
-    osfd = socket(AF_INET6, SOCK_STREAM, 0);
-    if (osfd != -1) {
-        close(osfd);
-        return PR_TRUE;
-    }
-    return PR_FALSE;
-}
-#endif	/* _PR_INET6_PROBE */
-#endif
-
-PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
-{
-    PRIntn osfd;
-    PRDescType ftype;
-    PRFileDesc *fd = NULL;
-	PRInt32 tmp_domain = domain;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (pt_TestAbort()) return NULL;
-
-    if (PF_INET != domain
-        && PR_AF_INET6 != domain
-        && PF_UNIX != domain)
-    {
-        PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-        return fd;
-    }
-	if (type == SOCK_STREAM) ftype = PR_DESC_SOCKET_TCP;
-	else if (type == SOCK_DGRAM) ftype = PR_DESC_SOCKET_UDP;
-	else
-	{
-		(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
-		return fd;
-	}
-#if defined(_PR_INET6_PROBE)
-	if (PR_AF_INET6 == domain) {
-		if (_pr_ipv6_is_present == PR_FALSE) 
-			domain = AF_INET;
-		else
-			domain = AF_INET6;
-	}
-#elif defined(_PR_INET6) 
-	if (PR_AF_INET6 == domain)
-		domain = AF_INET6;
-#else
-	if (PR_AF_INET6 == domain)
-		domain = AF_INET;
-#endif
-
-    osfd = socket(domain, type, proto);
-    if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-    else
-    {
-#ifdef _PR_IPV6_V6ONLY_PROBE
-        if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
-        {
-            int on = 0;
-            (void)setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-                    &on, sizeof(on));
-        }
-#endif
-        fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-        if (fd == NULL) close(osfd);
-    }
-#ifdef _PR_STRICT_ADDR_LEN
-    if (fd != NULL) fd->secret->af = domain;
-#endif
-#if defined(_PR_INET6_PROBE) || !defined(_PR_INET6)
-	if (fd != NULL) {
-		/*
-		 * For platforms with no support for IPv6 
-		 * create layered socket for IPv4-mapped IPv6 addresses
-		 */
-		if (PR_AF_INET6 == tmp_domain && PR_AF_INET == domain) {
-			if (PR_FAILURE == _pr_push_ipv6toipv4_layer(fd)) {
-				PR_Close(fd);
-				fd = NULL;
-			}
-		}
-	}
-#endif
-    return fd;
-}  /* PR_Socket */
-#endif
-/*****************************************************************************/
-/****************************** I/O public methods ***************************/
-/*****************************************************************************/
-
-PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
-    const char *name, PRIntn flags, PRIntn mode)
-{
-    PRFileDesc *fd = NULL;
-    PRIntn syserrno, osfd = -1, osflags = 0;;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (pt_TestAbort()) return NULL;
-
-    if (flags & PR_RDONLY) osflags |= O_RDONLY;
-    if (flags & PR_WRONLY) osflags |= O_WRONLY;
-    if (flags & PR_RDWR) osflags |= O_RDWR;
-    if (flags & PR_APPEND) osflags |= O_APPEND;
-    if (flags & PR_TRUNCATE) osflags |= O_TRUNC;
-    if (flags & PR_EXCL) osflags |= O_EXCL;
-    if (flags & PR_SYNC)
-    {
-#if defined(O_SYNC)
-        osflags |= O_SYNC;
-#elif defined(O_FSYNC)
-        osflags |= O_FSYNC;
-#else
-#error "Neither O_SYNC nor O_FSYNC is defined on this platform"
-#endif
-    }
-
-    /*
-    ** We have to hold the lock across the creation in order to
-    ** enforce the sematics of PR_Rename(). (see the latter for
-    ** more details)
-    */
-    if (flags & PR_CREATE_FILE)
-    {
-        osflags |= O_CREAT;
-        if (NULL !=_pr_rename_lock)
-            PR_Lock(_pr_rename_lock);
-    }
-
-    osfd = _md_iovector._open64(name, osflags, mode);
-    syserrno = errno;
-
-    if ((flags & PR_CREATE_FILE) && (NULL !=_pr_rename_lock))
-        PR_Unlock(_pr_rename_lock);
-
-    if (osfd == -1)
-        pt_MapError(_PR_MD_MAP_OPEN_ERROR, syserrno);
-    else
-    {
-        fd = pt_SetMethods(osfd, PR_DESC_FILE, PR_FALSE, PR_FALSE);
-        if (fd == NULL) close(osfd);  /* $$$ whoops! this is bad $$$ */
-    }
-    return fd;
-}  /* PR_OpenFile */
-
-PR_IMPLEMENT(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode)
-{
-    return PR_OpenFile(name, flags, mode);
-}  /* PR_Open */
-
-PR_IMPLEMENT(PRStatus) PR_Delete(const char *name)
-{
-    PRIntn rv = -1;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = unlink(name);
-
-    if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_UNLINK_ERROR, errno);
-        return PR_FAILURE;
-    } else
-        return PR_SUCCESS;
-}  /* PR_Delete */
-
-PR_IMPLEMENT(PRStatus) PR_Access(const char *name, PRAccessHow how)
-{
-    PRIntn rv;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    switch (how)
-    {
-    case PR_ACCESS_READ_OK:
-        rv =  access(name, R_OK);
-        break;
-    case PR_ACCESS_WRITE_OK:
-        rv = access(name, W_OK);
-        break;
-    case PR_ACCESS_EXISTS:
-    default:
-        rv = access(name, F_OK);
-    }
-    if (0 == rv) return PR_SUCCESS;
-    pt_MapError(_PR_MD_MAP_ACCESS_ERROR, errno);
-    return PR_FAILURE;
-    
-}  /* PR_Access */
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info)
-{
-    PRInt32 rv = _PR_MD_GETFILEINFO(fn, info);
-    return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-}  /* PR_GetFileInfo */
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info)
-{
-    PRInt32 rv;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    rv = _PR_MD_GETFILEINFO64(fn, info);
-    return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-}  /* PR_GetFileInfo64 */
-
-PR_IMPLEMENT(PRStatus) PR_Rename(const char *from, const char *to)
-{
-    PRIntn rv = -1;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    /*
-    ** We have to acquire a lock here to stiffle anybody trying to create
-    ** a new file at the same time. And we have to hold that lock while we
-    ** test to see if the file exists and do the rename. The other place
-    ** where the lock is held is in PR_Open() when possibly creating a 
-    ** new file.
-    */
-
-    PR_Lock(_pr_rename_lock);
-    rv = access(to, F_OK);
-    if (0 == rv)
-    {
-        PR_SetError(PR_FILE_EXISTS_ERROR, 0);
-        rv = -1;
-    }
-    else
-    {
-        rv = rename(from, to);
-        if (rv == -1)
-            pt_MapError(_PR_MD_MAP_RENAME_ERROR, errno);
-    }
-    PR_Unlock(_pr_rename_lock);
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* PR_Rename */
-
-PR_IMPLEMENT(PRStatus) PR_CloseDir(PRDir *dir)
-{
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    if (NULL != dir->md.d)
-    {
-        if (closedir(dir->md.d) == -1)
-        {
-            _PR_MD_MAP_CLOSEDIR_ERROR(errno);
-            return PR_FAILURE;
-        }
-        dir->md.d = NULL;
-        PR_DELETE(dir);
-    }
-    return PR_SUCCESS;
-}  /* PR_CloseDir */
-
-PR_IMPLEMENT(PRStatus) PR_MakeDir(const char *name, PRIntn mode)
-{
-    PRInt32 rv = -1;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    /*
-    ** This lock is used to enforce rename semantics as described
-    ** in PR_Rename.
-    */
-    if (NULL !=_pr_rename_lock)
-        PR_Lock(_pr_rename_lock);
-    rv = mkdir(name, mode);
-    if (-1 == rv)
-        pt_MapError(_PR_MD_MAP_MKDIR_ERROR, errno);
-    if (NULL !=_pr_rename_lock)
-        PR_Unlock(_pr_rename_lock);
-
-    return (-1 == rv) ? PR_FAILURE : PR_SUCCESS;
-}  /* PR_Makedir */
-
-PR_IMPLEMENT(PRStatus) PR_MkDir(const char *name, PRIntn mode)
-{
-    return PR_MakeDir(name, mode);
-}  /* PR_Mkdir */
-
-PR_IMPLEMENT(PRStatus) PR_RmDir(const char *name)
-{
-    PRInt32 rv;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    rv = rmdir(name);
-    if (0 == rv) {
-    return PR_SUCCESS;
-    } else {
-    pt_MapError(_PR_MD_MAP_RMDIR_ERROR, errno);
-    return PR_FAILURE;
-    }
-}  /* PR_Rmdir */
-
-
-PR_IMPLEMENT(PRDir*) PR_OpenDir(const char *name)
-{
-    DIR *osdir;
-    PRDir *dir = NULL;
-
-    if (pt_TestAbort()) return dir;
-
-    osdir = opendir(name);
-    if (osdir == NULL)
-        pt_MapError(_PR_MD_MAP_OPENDIR_ERROR, errno);
-    else
-    {
-        dir = PR_NEWZAP(PRDir);
-        dir->md.d = osdir;
-    }
-    return dir;
-}  /* PR_OpenDir */
-
-static PRInt32 _pr_poll_with_poll(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    PRInt32 ready = 0;
-    /*
-     * For restarting poll() if it is interrupted by a signal.
-     * We use these variables to figure out how much time has
-     * elapsed and how much of the timeout still remains.
-     */
-    PRIntervalTime start, elapsed, remaining;
-
-    if (pt_TestAbort()) return -1;
-
-    if (0 == npds) PR_Sleep(timeout);
-    else
-    {
-#define STACK_POLL_DESC_COUNT 64
-        struct pollfd stack_syspoll[STACK_POLL_DESC_COUNT];
-        struct pollfd *syspoll;
-        PRIntn index, msecs;
-
-        if (npds <= STACK_POLL_DESC_COUNT)
-        {
-            syspoll = stack_syspoll;
-        }
-        else
-        {
-            PRThread *me = PR_GetCurrentThread();
-            if (npds > me->syspoll_count)
-            {
-                PR_Free(me->syspoll_list);
-                me->syspoll_list =
-                    (struct pollfd*)PR_MALLOC(npds * sizeof(struct pollfd));
-                if (NULL == me->syspoll_list)
-                {
-                    me->syspoll_count = 0;
-                    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                    return -1;
-                }
-                me->syspoll_count = npds;
-            }
-            syspoll = me->syspoll_list;
-        }
-
-        for (index = 0; index < npds; ++index)
-        {
-            PRInt16 in_flags_read = 0, in_flags_write = 0;
-            PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-            if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-            {
-                if (pds[index].in_flags & PR_POLL_READ)
-                {
-                    in_flags_read = (pds[index].fd->methods->poll)(
-                        pds[index].fd,
-                        pds[index].in_flags & ~PR_POLL_WRITE,
-                        &out_flags_read);
-                }
-                if (pds[index].in_flags & PR_POLL_WRITE)
-                {
-                    in_flags_write = (pds[index].fd->methods->poll)(
-                        pds[index].fd,
-                        pds[index].in_flags & ~PR_POLL_READ,
-                        &out_flags_write);
-                }
-                if ((0 != (in_flags_read & out_flags_read))
-                || (0 != (in_flags_write & out_flags_write)))
-                {
-                    /* this one is ready right now */
-                    if (0 == ready)
-                    {
-                        /*
-                         * We will return without calling the system
-                         * poll function.  So zero the out_flags
-                         * fields of all the poll descriptors before
-                         * this one.
-                         */
-                        int i;
-                        for (i = 0; i < index; i++)
-                        {
-                            pds[i].out_flags = 0;
-                        }
-                    }
-                    ready += 1;
-                    pds[index].out_flags = out_flags_read | out_flags_write;
-                }
-                else
-                {
-                    /* now locate the NSPR layer at the bottom of the stack */
-                    PRFileDesc *bottom = PR_GetIdentitiesLayer(
-                        pds[index].fd, PR_NSPR_IO_LAYER);
-                    PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                    pds[index].out_flags = 0;  /* pre-condition */
-                    if ((NULL != bottom)
-                    && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                    {
-                        if (0 == ready)
-                        {
-                            syspoll[index].fd = bottom->secret->md.osfd;
-                            syspoll[index].events = 0;
-                            if (in_flags_read & PR_POLL_READ)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_READ_SYS_READ;
-                                syspoll[index].events |= POLLIN;
-                            }
-                            if (in_flags_read & PR_POLL_WRITE)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_READ_SYS_WRITE;
-                                syspoll[index].events |= POLLOUT;
-                            }
-                            if (in_flags_write & PR_POLL_READ)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_WRITE_SYS_READ;
-                                syspoll[index].events |= POLLIN;
-                            }
-                            if (in_flags_write & PR_POLL_WRITE)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_WRITE_SYS_WRITE;
-                                syspoll[index].events |= POLLOUT;
-                            }
-                            if (pds[index].in_flags & PR_POLL_EXCEPT)
-                                syspoll[index].events |= POLLPRI;
-                        }
-                    }
-                    else
-                    {
-                        if (0 == ready)
-                        {
-                            int i;
-                            for (i = 0; i < index; i++)
-                            {
-                                pds[i].out_flags = 0;
-                            }
-                        }
-                        ready += 1;  /* this will cause an abrupt return */
-                        pds[index].out_flags = PR_POLL_NVAL;  /* bogii */
-                    }
-                }
-            }
-            else
-            {
-                /* make poll() ignore this entry */
-                syspoll[index].fd = -1;
-                syspoll[index].events = 0;
-                pds[index].out_flags = 0;
-            }
-        }
-        if (0 == ready)
-        {
-            switch (timeout)
-            {
-            case PR_INTERVAL_NO_WAIT: msecs = 0; break;
-            case PR_INTERVAL_NO_TIMEOUT: msecs = -1; break;
-            default:
-                msecs = PR_IntervalToMilliseconds(timeout);
-                start = PR_IntervalNow();
-            }
-
-retry:
-            ready = poll(syspoll, npds, msecs);
-            if (-1 == ready)
-            {
-                PRIntn oserror = errno;
-
-                if (EINTR == oserror)
-                {
-                    if (timeout == PR_INTERVAL_NO_TIMEOUT)
-                        goto retry;
-                    else if (timeout == PR_INTERVAL_NO_WAIT)
-                        ready = 0;  /* don't retry, just time out */
-                    else
-                    {
-                        elapsed = (PRIntervalTime) (PR_IntervalNow()
-                                - start);
-                        if (elapsed > timeout)
-                            ready = 0;  /* timed out */
-                        else
-                        {
-                            remaining = timeout - elapsed;
-                            msecs = PR_IntervalToMilliseconds(remaining);
-                            goto retry;
-                        }
-                    }
-                }
-                else
-                {
-                    _PR_MD_MAP_POLL_ERROR(oserror);
-                }
-            }
-            else if (ready > 0)
-            {
-                for (index = 0; index < npds; ++index)
-                {
-                    PRInt16 out_flags = 0;
-                    if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-                    {
-                        if (0 != syspoll[index].revents)
-                        {
-                            if (syspoll[index].revents & POLLIN)
-                            {
-                                if (pds[index].out_flags
-                                & _PR_POLL_READ_SYS_READ)
-                                {
-                                    out_flags |= PR_POLL_READ;
-                                }
-                                if (pds[index].out_flags
-                                & _PR_POLL_WRITE_SYS_READ)
-                                {
-                                    out_flags |= PR_POLL_WRITE;
-                                }
-                            }
-                            if (syspoll[index].revents & POLLOUT)
-                            {
-                                if (pds[index].out_flags
-                                & _PR_POLL_READ_SYS_WRITE)
-                                {
-                                    out_flags |= PR_POLL_READ;
-                                }
-                                if (pds[index].out_flags
-                                & _PR_POLL_WRITE_SYS_WRITE)
-                                {
-                                    out_flags |= PR_POLL_WRITE;
-                                }
-                            }
-                            if (syspoll[index].revents & POLLPRI)
-                                out_flags |= PR_POLL_EXCEPT;
-                            if (syspoll[index].revents & POLLERR)
-                                out_flags |= PR_POLL_ERR;
-                            if (syspoll[index].revents & POLLNVAL)
-                                out_flags |= PR_POLL_NVAL;
-                            if (syspoll[index].revents & POLLHUP)
-                                out_flags |= PR_POLL_HUP;
-                        }
-                    }
-                    pds[index].out_flags = out_flags;
-                }
-            }
-        }
-    }
-    return ready;
-
-} /* _pr_poll_with_poll */
-
-#if defined(_PR_POLL_WITH_SELECT)
-/*
- * OSF1 and HPUX report the POLLHUP event for a socket when the
- * shutdown(SHUT_WR) operation is called for the remote end, even though
- * the socket is still writeable. Use select(), instead of poll(), to
- * workaround this problem.
- */
-static PRInt32 _pr_poll_with_select(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-    PRInt32 ready = 0;
-    /*
-     * For restarting select() if it is interrupted by a signal.
-     * We use these variables to figure out how much time has
-     * elapsed and how much of the timeout still remains.
-     */
-    PRIntervalTime start, elapsed, remaining;
-
-    if (pt_TestAbort()) return -1;
-
-    if (0 == npds) PR_Sleep(timeout);
-    else
-    {
-#define STACK_POLL_DESC_COUNT 64
-        int stack_selectfd[STACK_POLL_DESC_COUNT];
-        int *selectfd;
-		fd_set rd, wr, ex, *rdp = NULL, *wrp = NULL, *exp = NULL;
-		struct timeval tv, *tvp;
-        PRIntn index, msecs, maxfd = 0;
-
-        if (npds <= STACK_POLL_DESC_COUNT)
-        {
-            selectfd = stack_selectfd;
-        }
-        else
-        {
-            PRThread *me = PR_GetCurrentThread();
-            if (npds > me->selectfd_count)
-            {
-                PR_Free(me->selectfd_list);
-                me->selectfd_list = (int *)PR_MALLOC(npds * sizeof(int));
-                if (NULL == me->selectfd_list)
-                {
-                    me->selectfd_count = 0;
-                    PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                    return -1;
-                }
-                me->selectfd_count = npds;
-            }
-            selectfd = me->selectfd_list;
-        }
-		FD_ZERO(&rd);
-		FD_ZERO(&wr);
-		FD_ZERO(&ex);
-
-        for (index = 0; index < npds; ++index)
-        {
-            PRInt16 in_flags_read = 0, in_flags_write = 0;
-            PRInt16 out_flags_read = 0, out_flags_write = 0;
-
-            if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-            {
-                if (pds[index].in_flags & PR_POLL_READ)
-                {
-                    in_flags_read = (pds[index].fd->methods->poll)(
-                        pds[index].fd,
-                        pds[index].in_flags & ~PR_POLL_WRITE,
-                        &out_flags_read);
-                }
-                if (pds[index].in_flags & PR_POLL_WRITE)
-                {
-                    in_flags_write = (pds[index].fd->methods->poll)(
-                        pds[index].fd,
-                        pds[index].in_flags & ~PR_POLL_READ,
-                        &out_flags_write);
-                }
-                if ((0 != (in_flags_read & out_flags_read))
-                || (0 != (in_flags_write & out_flags_write)))
-                {
-                    /* this one is ready right now */
-                    if (0 == ready)
-                    {
-                        /*
-                         * We will return without calling the system
-                         * poll function.  So zero the out_flags
-                         * fields of all the poll descriptors before
-                         * this one.
-                         */
-                        int i;
-                        for (i = 0; i < index; i++)
-                        {
-                            pds[i].out_flags = 0;
-                        }
-                    }
-                    ready += 1;
-                    pds[index].out_flags = out_flags_read | out_flags_write;
-                }
-                else
-                {
-                    /* now locate the NSPR layer at the bottom of the stack */
-                    PRFileDesc *bottom = PR_GetIdentitiesLayer(
-                        pds[index].fd, PR_NSPR_IO_LAYER);
-                    PR_ASSERT(NULL != bottom);  /* what to do about that? */
-                    pds[index].out_flags = 0;  /* pre-condition */
-                    if ((NULL != bottom)
-                    && (_PR_FILEDESC_OPEN == bottom->secret->state))
-                    {
-                        if (0 == ready)
-                        {
-                            PRBool add_to_rd = PR_FALSE;
-                            PRBool add_to_wr = PR_FALSE;
-                            PRBool add_to_ex = PR_FALSE;
-
-                            selectfd[index] = bottom->secret->md.osfd;
-                            if (in_flags_read & PR_POLL_READ)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_READ_SYS_READ;
-                                add_to_rd = PR_TRUE;
-                            }
-                            if (in_flags_read & PR_POLL_WRITE)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_READ_SYS_WRITE;
-                                add_to_wr = PR_TRUE;
-                            }
-                            if (in_flags_write & PR_POLL_READ)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_WRITE_SYS_READ;
-                                add_to_rd = PR_TRUE;
-                            }
-                            if (in_flags_write & PR_POLL_WRITE)
-                            {
-                                pds[index].out_flags |=
-                                    _PR_POLL_WRITE_SYS_WRITE;
-                                add_to_wr = PR_TRUE;
-                            }
-                            if (pds[index].in_flags & PR_POLL_EXCEPT)
-                            {
-                                add_to_ex = PR_TRUE;
-                            }
-                            if ((selectfd[index] > maxfd) &&
-                                    (add_to_rd || add_to_wr || add_to_ex))
-                            {
-                                maxfd = selectfd[index];
-                                /*
-                                 * If maxfd is too large to be used with
-                                 * select, fall back to calling poll.
-                                 */
-                                if (maxfd >= FD_SETSIZE)
-                                    break;
-                            }
-                            if (add_to_rd)
-                            {
-                                FD_SET(bottom->secret->md.osfd, &rd);
-                                rdp = &rd;
-                            }
-                            if (add_to_wr)
-                            {
-                                FD_SET(bottom->secret->md.osfd, &wr);
-                                wrp = &wr;
-                            }
-                            if (add_to_ex)
-                            {
-                                FD_SET(bottom->secret->md.osfd, &ex);
-                                exp = &ex;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (0 == ready)
-                        {
-                            int i;
-                            for (i = 0; i < index; i++)
-                            {
-                                pds[i].out_flags = 0;
-                            }
-                        }
-                        ready += 1;  /* this will cause an abrupt return */
-                        pds[index].out_flags = PR_POLL_NVAL;  /* bogii */
-                    }
-                }
-            }
-            else
-            {
-                pds[index].out_flags = 0;
-            }
-        }
-        if (0 == ready)
-        {
-			if (maxfd >= FD_SETSIZE)
-			{
-				/*
-				 * maxfd too large to be used with select, fall back to
-				 * calling poll
-				 */
-				return(_pr_poll_with_poll(pds, npds, timeout));
-			}
-            switch (timeout)
-            {
-            case PR_INTERVAL_NO_WAIT:
-				tv.tv_sec = 0;
-				tv.tv_usec = 0;
-				tvp = &tv;
-				break;
-            case PR_INTERVAL_NO_TIMEOUT:
-				tvp = NULL;
-				break;
-            default:
-                msecs = PR_IntervalToMilliseconds(timeout);
-				tv.tv_sec = msecs/PR_MSEC_PER_SEC;
-				tv.tv_usec = (msecs % PR_MSEC_PER_SEC) * PR_USEC_PER_MSEC;
-				tvp = &tv;
-                start = PR_IntervalNow();
-            }
-
-retry:
-            ready = select(maxfd + 1, rdp, wrp, exp, tvp);
-            if (-1 == ready)
-            {
-                PRIntn oserror = errno;
-
-                if ((EINTR == oserror) || (EAGAIN == oserror))
-                {
-                    if (timeout == PR_INTERVAL_NO_TIMEOUT)
-                        goto retry;
-                    else if (timeout == PR_INTERVAL_NO_WAIT)
-                        ready = 0;  /* don't retry, just time out */
-                    else
-                    {
-                        elapsed = (PRIntervalTime) (PR_IntervalNow()
-                                - start);
-                        if (elapsed > timeout)
-                            ready = 0;  /* timed out */
-                        else
-                        {
-                            remaining = timeout - elapsed;
-                            msecs = PR_IntervalToMilliseconds(remaining);
-							tv.tv_sec = msecs/PR_MSEC_PER_SEC;
-							tv.tv_usec = (msecs % PR_MSEC_PER_SEC) *
-													PR_USEC_PER_MSEC;
-                            goto retry;
-                        }
-                    }
-                } else if (EBADF == oserror)
-                {
-					/* find all the bad fds */
-					ready = 0;
-                	for (index = 0; index < npds; ++index)
-					{
-                    	pds[index].out_flags = 0;
-            			if ((NULL != pds[index].fd) &&
-											(0 != pds[index].in_flags))
-						{
-							if (fcntl(selectfd[index], F_GETFL, 0) == -1)
-							{
-                    			pds[index].out_flags = PR_POLL_NVAL;
-								ready++;
-							}
-						}
-					}
-                } else 
-                    _PR_MD_MAP_SELECT_ERROR(oserror);
-            }
-            else if (ready > 0)
-            {
-                for (index = 0; index < npds; ++index)
-                {
-                    PRInt16 out_flags = 0;
-                    if ((NULL != pds[index].fd) && (0 != pds[index].in_flags))
-                    {
-						if (FD_ISSET(selectfd[index], &rd))
-						{
-							if (pds[index].out_flags
-							& _PR_POLL_READ_SYS_READ)
-							{
-								out_flags |= PR_POLL_READ;
-							}
-							if (pds[index].out_flags
-							& _PR_POLL_WRITE_SYS_READ)
-							{
-								out_flags |= PR_POLL_WRITE;
-							}
-						}
-						if (FD_ISSET(selectfd[index], &wr))
-						{
-							if (pds[index].out_flags
-							& _PR_POLL_READ_SYS_WRITE)
-							{
-								out_flags |= PR_POLL_READ;
-							}
-							if (pds[index].out_flags
-							& _PR_POLL_WRITE_SYS_WRITE)
-							{
-								out_flags |= PR_POLL_WRITE;
-							}
-						}
-						if (FD_ISSET(selectfd[index], &ex))
-							out_flags |= PR_POLL_EXCEPT;
-                    }
-                    pds[index].out_flags = out_flags;
-                }
-            }
-        }
-    }
-    return ready;
-
-} /* _pr_poll_with_select */
-#endif	/* _PR_POLL_WITH_SELECT */
-
-PR_IMPLEMENT(PRInt32) PR_Poll(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
-{
-#if defined(_PR_POLL_WITH_SELECT)
-	return(_pr_poll_with_select(pds, npds, timeout));
-#else
-	return(_pr_poll_with_poll(pds, npds, timeout));
-#endif
-}
-
-PR_IMPLEMENT(PRDirEntry*) PR_ReadDir(PRDir *dir, PRDirFlags flags)
-{
-    struct dirent *dp;
-
-    if (pt_TestAbort()) return NULL;
-
-    for (;;)
-    {
-        errno = 0;
-        dp = readdir(dir->md.d);
-        if (NULL == dp)
-        {
-            pt_MapError(_PR_MD_MAP_READDIR_ERROR, errno);
-            return NULL;
-        }
-        if ((flags & PR_SKIP_DOT)
-            && ('.' == dp->d_name[0])
-            && (0 == dp->d_name[1])) continue;
-        if ((flags & PR_SKIP_DOT_DOT)
-            && ('.' == dp->d_name[0])
-            && ('.' == dp->d_name[1])
-            && (0 == dp->d_name[2])) continue;
-        if ((flags & PR_SKIP_HIDDEN) && ('.' == dp->d_name[0]))
-            continue;
-        break;
-    }
-    dir->d.name = dp->d_name;
-    return &dir->d;
-}  /* PR_ReadDir */
-
-#if 0
-PR_IMPLEMENT(PRFileDesc*) PR_NewUDPSocket(void)
-{
-    PRIntn domain = PF_INET;
-
-    return PR_Socket(domain, SOCK_DGRAM, 0);
-}  /* PR_NewUDPSocket */
-
-PR_IMPLEMENT(PRFileDesc*) PR_NewTCPSocket(void)
-{
-    PRIntn domain = PF_INET;
-
-    return PR_Socket(domain, SOCK_STREAM, 0);
-}  /* PR_NewTCPSocket */
-
-PR_IMPLEMENT(PRFileDesc*) PR_OpenUDPSocket(PRIntn af)
-{
-    return PR_Socket(af, SOCK_DGRAM, 0);
-}  /* PR_NewUDPSocket */
-
-PR_IMPLEMENT(PRFileDesc*) PR_OpenTCPSocket(PRIntn af)
-{
-    return PR_Socket(af, SOCK_STREAM, 0);
-}  /* PR_NewTCPSocket */
-
-#endif
-
-PR_IMPLEMENT(PRStatus) PR_NewTCPSocketPair(PRFileDesc *fds[2])
-{
-    PRInt32 osfd[2];
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, osfd) == -1) {
-        pt_MapError(_PR_MD_MAP_SOCKETPAIR_ERROR, errno);
-        return PR_FAILURE;
-    }
-
-    fds[0] = pt_SetMethods(osfd[0], PR_DESC_SOCKET_TCP, PR_FALSE, PR_FALSE);
-    if (fds[0] == NULL) {
-        close(osfd[0]);
-        close(osfd[1]);
-        return PR_FAILURE;
-    }
-    fds[1] = pt_SetMethods(osfd[1], PR_DESC_SOCKET_TCP, PR_FALSE, PR_FALSE);
-    if (fds[1] == NULL) {
-        PR_Close(fds[0]);
-        close(osfd[1]);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* PR_NewTCPSocketPair */
-
-PR_IMPLEMENT(PRStatus) PR_CreatePipe(
-    PRFileDesc **readPipe,
-    PRFileDesc **writePipe
-)
-{
-    int pipefd[2];
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    if (pipe(pipefd) == -1)
-    {
-    /* XXX map pipe error */
-        PR_SetError(PR_UNKNOWN_ERROR, errno);
-        return PR_FAILURE;
-    }
-    *readPipe = pt_SetMethods(pipefd[0], PR_DESC_PIPE, PR_FALSE, PR_FALSE);
-    if (NULL == *readPipe)
-    {
-        close(pipefd[0]);
-        close(pipefd[1]);
-        return PR_FAILURE;
-    }
-    *writePipe = pt_SetMethods(pipefd[1], PR_DESC_PIPE, PR_FALSE, PR_FALSE);
-    if (NULL == *writePipe)
-    {
-        PR_Close(*readPipe);
-        close(pipefd[1]);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-/*
-** Set the inheritance attribute of a file descriptor.
-*/
-PR_IMPLEMENT(PRStatus) PR_SetFDInheritable(
-    PRFileDesc *fd,
-    PRBool inheritable)
-{
-    /*
-     * Only a non-layered, NSPR file descriptor can be inherited
-     * by a child process.
-     */
-    if (fd->identity != PR_NSPR_IO_LAYER)
-    {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        return PR_FAILURE;
-    }
-    if (fd->secret->inheritable != inheritable)
-    {
-        if (fcntl(fd->secret->md.osfd, F_SETFD,
-        inheritable ? 0 : FD_CLOEXEC) == -1)
-        {
-            return PR_FAILURE;
-        }
-        fd->secret->inheritable = (_PRTriStateBool) inheritable;
-    }
-    return PR_SUCCESS;
-}
-
-/*****************************************************************************/
-/***************************** I/O friends methods ***************************/
-/*****************************************************************************/
-
-PR_IMPLEMENT(PRFileDesc*) PR_ImportFile(PRInt32 osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    fd = pt_SetMethods(osfd, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-    if (NULL == fd) close(osfd);
-    return fd;
-}  /* PR_ImportFile */
-
-PR_IMPLEMENT(PRFileDesc*) PR_ImportPipe(PRInt32 osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    fd = pt_SetMethods(osfd, PR_DESC_PIPE, PR_FALSE, PR_TRUE);
-    if (NULL == fd) close(osfd);
-    return fd;
-}  /* PR_ImportPipe */
-
-PR_IMPLEMENT(PRFileDesc*) PR_ImportTCPSocket(PRInt32 osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    fd = pt_SetMethods(osfd, PR_DESC_SOCKET_TCP, PR_FALSE, PR_TRUE);
-    if (NULL == fd) close(osfd);
-#ifdef _PR_STRICT_ADDR_LEN
-    if (NULL != fd) fd->secret->af = PF_INET;
-#endif
-    return fd;
-}  /* PR_ImportTCPSocket */
-
-PR_IMPLEMENT(PRFileDesc*) PR_ImportUDPSocket(PRInt32 osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    fd = pt_SetMethods(osfd, PR_DESC_SOCKET_UDP, PR_FALSE, PR_TRUE);
-    if (NULL != fd) close(osfd);
-    return fd;
-}  /* PR_ImportUDPSocket */
-
-PR_IMPLEMENT(PRFileDesc*) PR_CreateSocketPollFd(PRInt32 osfd)
-{
-    PRFileDesc *fd;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    fd = _PR_Getfd();
-
-    if (fd == NULL) PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    else
-    {
-        fd->secret->md.osfd = osfd;
-        fd->secret->inheritable = _PR_TRI_FALSE;
-    	fd->secret->state = _PR_FILEDESC_OPEN;
-        fd->methods = PR_GetSocketPollFdMethods();
-    }
-
-    return fd;
-}  /* PR_CreateSocketPollFD */
-
-PR_IMPLEMENT(PRStatus) PR_DestroySocketPollFd(PRFileDesc *fd)
-{
-    if (NULL == fd)
-    {
-        PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0);
-        return PR_FAILURE;
-    }
-    fd->secret->state = _PR_FILEDESC_CLOSED;
-    _PR_Putfd(fd);
-    return PR_SUCCESS;
-}  /* PR_DestroySocketPollFd */
-
-PR_IMPLEMENT(PRInt32) PR_FileDesc2NativeHandle(PRFileDesc *bottom)
-{
-    PRInt32 osfd = -1;
-    bottom = (NULL == bottom) ?
-        NULL : PR_GetIdentitiesLayer(bottom, PR_NSPR_IO_LAYER);
-    if (NULL == bottom) PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-    else osfd = bottom->secret->md.osfd;
-    return osfd;
-}  /* PR_FileDesc2NativeHandle */
-
-PR_IMPLEMENT(void) PR_ChangeFileDescNativeHandle(PRFileDesc *fd,
-    PRInt32 handle)
-{
-    if (fd) fd->secret->md.osfd = handle;
-}  /*  PR_ChangeFileDescNativeHandle*/
-
-PR_IMPLEMENT(PRStatus) PR_LockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    while (-1 == fd->secret->lockCount)
-        PR_WaitCondVar(_pr_flock_cv, PR_INTERVAL_NO_TIMEOUT);
-    if (0 == fd->secret->lockCount)
-    {
-        fd->secret->lockCount = -1;
-        PR_Unlock(_pr_flock_lock);
-        status = _PR_MD_LOCKFILE(fd->secret->md.osfd);
-        PR_Lock(_pr_flock_lock);
-        fd->secret->lockCount = (PR_SUCCESS == status) ? 1 : 0;
-        PR_NotifyAllCondVar(_pr_flock_cv);
-    }
-    else
-    {
-        fd->secret->lockCount += 1;
-    }
-    PR_Unlock(_pr_flock_lock);
- 
-    return status;
-}  /* PR_LockFile */
-
-PR_IMPLEMENT(PRStatus) PR_TLockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    if (0 == fd->secret->lockCount)
-    {
-        status = _PR_MD_TLOCKFILE(fd->secret->md.osfd);
-        if (PR_SUCCESS == status) fd->secret->lockCount = 1;
-    }
-    else fd->secret->lockCount += 1;
-    PR_Unlock(_pr_flock_lock);
- 
-    return status;
-}  /* PR_TLockFile */
-
-PR_IMPLEMENT(PRStatus) PR_UnlockFile(PRFileDesc *fd)
-{
-    PRStatus status = PR_SUCCESS;
-
-    if (pt_TestAbort()) return PR_FAILURE;
-
-    PR_Lock(_pr_flock_lock);
-    if (fd->secret->lockCount == 1)
-    {
-        status = _PR_MD_UNLOCKFILE(fd->secret->md.osfd);
-        if (PR_SUCCESS == status) fd->secret->lockCount = 0;
-    }
-    else fd->secret->lockCount -= 1;
-    PR_Unlock(_pr_flock_lock);
-
-    return status;
-}
-
-/*
- * The next two entry points should not be in the API, but they are
- * defined here for historical (or hysterical) reasons.
- */
-
-PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
-    struct rlimit rlim;
-
-    if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) 
-       return -1;
-
-    return rlim.rlim_max;
-#elif defined(AIX) || defined(VMS)
-    return sysconf(_SC_OPEN_MAX);
-#endif
-}
-
-PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(PRIntn table_size)
-{
-#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
-    struct rlimit rlim;
-    PRInt32 tableMax = PR_GetSysfdTableMax();
-
-    if (tableMax < 0) return -1;
-    rlim.rlim_max = tableMax;
-
-    /* Grow as much as we can; even if too big */
-    if ( rlim.rlim_max < table_size )
-        rlim.rlim_cur = rlim.rlim_max;
-    else
-        rlim.rlim_cur = table_size;
-
-    if ( setrlimit(RLIMIT_NOFILE, &rlim) < 0) 
-        return -1;
-
-    return rlim.rlim_cur;
-#elif defined(AIX) || defined(VMS)
-    return -1;
-#endif
-}
-
-/*
- * PR_Stat is supported for backward compatibility; some existing Java
- * code uses it.  New code should use PR_GetFileInfo.
- */
-
-#ifndef NO_NSPR_10_SUPPORT
-PR_IMPLEMENT(PRInt32) PR_Stat(const char *name, struct stat *buf)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_Stat", "PR_GetFileInfo");
-
-    if (pt_TestAbort()) return -1;
-
-    if (-1 == stat(name, buf)) {
-        pt_MapError(_PR_MD_MAP_STAT_ERROR, errno);
-        return -1;
-    } else {
-        return 0;
-    }
-}
-#endif /* ! NO_NSPR_10_SUPPORT */
-
-
-PR_IMPLEMENT(void) PR_FD_ZERO(PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_ZERO (PR_Select)", "PR_Poll");
-    memset(set, 0, sizeof(PR_fd_set));
-}
-
-PR_IMPLEMENT(void) PR_FD_SET(PRFileDesc *fh, PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_SET (PR_Select)", "PR_Poll");
-    PR_ASSERT( set->hsize < PR_MAX_SELECT_DESC );
-
-    set->harray[set->hsize++] = fh;
-}
-
-PR_IMPLEMENT(void) PR_FD_CLR(PRFileDesc *fh, PR_fd_set *set)
-{
-    PRUint32 index, index2;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_CLR (PR_Select)", "PR_Poll");
-
-    for (index = 0; index<set->hsize; index++)
-       if (set->harray[index] == fh) {
-           for (index2=index; index2 < (set->hsize-1); index2++) {
-               set->harray[index2] = set->harray[index2+1];
-           }
-           set->hsize--;
-           break;
-       }
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_ISSET(PRFileDesc *fh, PR_fd_set *set)
-{
-    PRUint32 index;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_ISSET (PR_Select)", "PR_Poll");
-    for (index = 0; index<set->hsize; index++)
-       if (set->harray[index] == fh) {
-           return 1;
-       }
-    return 0;
-}
-
-PR_IMPLEMENT(void) PR_FD_NSET(PRInt32 fd, PR_fd_set *set)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NSET (PR_Select)", "PR_Poll");
-    PR_ASSERT( set->nsize < PR_MAX_SELECT_DESC );
-
-    set->narray[set->nsize++] = fd;
-}
-
-PR_IMPLEMENT(void) PR_FD_NCLR(PRInt32 fd, PR_fd_set *set)
-{
-    PRUint32 index, index2;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NCLR (PR_Select)", "PR_Poll");
-
-    for (index = 0; index<set->nsize; index++)
-       if (set->narray[index] == fd) {
-           for (index2=index; index2 < (set->nsize-1); index2++) {
-               set->narray[index2] = set->narray[index2+1];
-           }
-           set->nsize--;
-           break;
-       }
-}
-
-PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PRInt32 fd, PR_fd_set *set)
-{
-    PRUint32 index;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete("PR_FD_NISSET (PR_Select)", "PR_Poll");
-    for (index = 0; index<set->nsize; index++)
-       if (set->narray[index] == fd) {
-           return 1;
-       }
-    return 0;
-}
-
-#include <sys/types.h>
-#include <sys/time.h>
-#if !defined(SUNOS4) && !defined(HPUX) \
-    && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
-#include <sys/select.h>
-#endif
-
-static PRInt32
-_PR_getset(PR_fd_set *pr_set, fd_set *set)
-{
-    PRUint32 index;
-    PRInt32 max = 0;
-
-    if (!pr_set)
-        return 0;
-   
-    FD_ZERO(set);
-
-    /* First set the pr file handle osfds */
-    for (index=0; index<pr_set->hsize; index++) {
-        FD_SET(pr_set->harray[index]->secret->md.osfd, set);
-        if (pr_set->harray[index]->secret->md.osfd > max)
-            max = pr_set->harray[index]->secret->md.osfd;
-    }
-    /* Second set the native osfds */
-    for (index=0; index<pr_set->nsize; index++) {
-        FD_SET(pr_set->narray[index], set);
-        if (pr_set->narray[index] > max)
-            max = pr_set->narray[index];
-    }
-    return max;
-}
-
-static void
-_PR_setset(PR_fd_set *pr_set, fd_set *set)
-{
-    PRUint32 index, last_used;
-
-    if (!pr_set)
-        return;
-
-    for (last_used=0, index=0; index<pr_set->hsize; index++) {
-        if ( FD_ISSET(pr_set->harray[index]->secret->md.osfd, set) ) {
-            pr_set->harray[last_used++] = pr_set->harray[index];
-        }
-    }
-    pr_set->hsize = last_used;
-
-    for (last_used=0, index=0; index<pr_set->nsize; index++) {
-        if ( FD_ISSET(pr_set->narray[index], set) ) {
-            pr_set->narray[last_used++] = pr_set->narray[index];
-        }
-    }
-    pr_set->nsize = last_used;
-}
-
-PR_IMPLEMENT(PRInt32) PR_Select(
-    PRInt32 unused, PR_fd_set *pr_rd, PR_fd_set *pr_wr, 
-    PR_fd_set *pr_ex, PRIntervalTime timeout)
-{
-    fd_set rd, wr, ex;
-    struct timeval tv, *tvp;
-    PRInt32 max, max_fd;
-    PRInt32 rv;
-    /*
-     * For restarting select() if it is interrupted by a Unix signal.
-     * We use these variables to figure out how much time has elapsed
-     * and how much of the timeout still remains.
-     */
-    PRIntervalTime start, elapsed, remaining;
-
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete( "PR_Select", "PR_Poll");
-
-    FD_ZERO(&rd);
-    FD_ZERO(&wr);
-    FD_ZERO(&ex);
-
-    max_fd = _PR_getset(pr_rd, &rd);
-    max_fd = (max = _PR_getset(pr_wr, &wr))>max_fd?max:max_fd;
-    max_fd = (max = _PR_getset(pr_ex, &ex))>max_fd?max:max_fd;
-
-    if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-        tvp = NULL;
-    } else {
-        tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);
-        tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
-                timeout - PR_SecondsToInterval(tv.tv_sec));
-        tvp = &tv;
-        start = PR_IntervalNow();
-    }
-
-retry:
-    rv = select(max_fd + 1, (_PRSelectFdSetArg_t) &rd,
-        (_PRSelectFdSetArg_t) &wr, (_PRSelectFdSetArg_t) &ex, tvp);
-
-    if (rv == -1 && errno == EINTR) {
-        if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-            goto retry;
-        } else {
-            elapsed = (PRIntervalTime) (PR_IntervalNow() - start);
-            if (elapsed > timeout) {
-                rv = 0;  /* timed out */
-            } else {
-                remaining = timeout - elapsed;
-                tv.tv_sec = (PRInt32)PR_IntervalToSeconds(remaining);
-                tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
-                        remaining - PR_SecondsToInterval(tv.tv_sec));
-                goto retry;
-            }
-        }
-    }
-
-    if (rv > 0) {
-        _PR_setset(pr_rd, &rd);
-        _PR_setset(pr_wr, &wr);
-        _PR_setset(pr_ex, &ex);
-    } else if (rv == -1) {
-        pt_MapError(_PR_MD_MAP_SELECT_ERROR, errno);
-    }
-    return rv;
-}
-#endif /* defined(_PR_PTHREADS) */
-
-#ifdef MOZ_UNICODE 
-/* ================ UTF16 Interfaces ================================ */
-PR_IMPLEMENT(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseDirUTF16(PRDir *dir)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-/* ================ UTF16 Interfaces ================================ */
-#endif /* MOZ_UNICODE */
-
-/* ptio.c */
diff --git a/libs/js/nsprpub/pr/src/pthreads/ptmisc.c b/libs/js/nsprpub/pr/src/pthreads/ptmisc.c
deleted file mode 100644
index 920d00dbfa..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/ptmisc.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:   ptmisc.c
-** Descritpion:  Implemenation of miscellaneous methods for pthreads
-*/
-
-#if defined(_PR_PTHREADS)
-
-#include "primpl.h"
-
-#include <stdio.h>
-#ifdef SOLARIS
-#include <thread.h>
-#endif
-
-#define PT_LOG(f)
-
-void _PR_InitCPUs(void) {PT_LOG("_PR_InitCPUs")}
-void _PR_InitStacks(void) {PT_LOG("_PR_InitStacks")}
-
-PR_IMPLEMENT(void) PR_SetConcurrency(PRUintn numCPUs) 
-{
-#ifdef SOLARIS
-	thr_setconcurrency(numCPUs);	
-#else
-	PT_LOG("PR_SetConcurrency");
-#endif
-}
-
-PR_IMPLEMENT(void) PR_SetThreadRecycleMode(PRUint32 flag)
-    {PT_LOG("PR_SetThreadRecycleMode")}
-
-#endif /* defined(_PR_PTHREADS) */
-
-/* ptmisc.c */
diff --git a/libs/js/nsprpub/pr/src/pthreads/ptsynch.c b/libs/js/nsprpub/pr/src/pthreads/ptsynch.c
deleted file mode 100644
index bd0688c2c9..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/ptsynch.c
+++ /dev/null
@@ -1,1139 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:            ptsynch.c
-** Descritpion:        Implemenation for thread synchronization using pthreads
-** Exports:            prlock.h, prcvar.h, prmon.h, prcmon.h
-*/
-
-#if defined(_PR_PTHREADS)
-
-#include "primpl.h"
-#include "obsolete/prsem.h"
-
-#include <string.h>
-#include <pthread.h>
-#include <sys/time.h>
-
-static pthread_mutexattr_t _pt_mattr;
-static pthread_condattr_t _pt_cvar_attr;
-
-#if defined(DEBUG)
-extern PTDebug pt_debug;  /* this is shared between several modules */
-
-#if defined(_PR_DCETHREADS)
-static pthread_t pt_zero_tid;  /* a null pthread_t (pthread_t is a struct
-                                * in DCE threads) to compare with */
-#endif  /* defined(_PR_DCETHREADS) */
-#endif  /* defined(DEBUG) */
-
-#if defined(FREEBSD)
-/*
- * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
- * Newer versions return EBUSY.  We still need to support both.
- */
-static int
-pt_pthread_mutex_is_locked(pthread_mutex_t *m)
-{
-    int rv = pthread_mutex_trylock(m);
-    return (EBUSY == rv || EDEADLK == rv);
-}
-#endif
-
-/**************************************************************/
-/**************************************************************/
-/*****************************LOCKS****************************/
-/**************************************************************/
-/**************************************************************/
-
-void _PR_InitLocks(void)
-{
-    int rv;
-    rv = _PT_PTHREAD_MUTEXATTR_INIT(&_pt_mattr); 
-    PR_ASSERT(0 == rv);
-
-#ifdef LINUX
-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-    rv = pthread_mutexattr_settype(&_pt_mattr, PTHREAD_MUTEX_ADAPTIVE_NP);
-    PR_ASSERT(0 == rv);
-#endif
-#endif
-
-    rv = _PT_PTHREAD_CONDATTR_INIT(&_pt_cvar_attr);
-    PR_ASSERT(0 == rv);
-}
-
-static void pt_PostNotifies(PRLock *lock, PRBool unlock)
-{
-    PRIntn index, rv;
-    _PT_Notified post;
-    _PT_Notified *notified, *prev = NULL;
-    /*
-     * Time to actually notify any conditions that were affected
-     * while the lock was held. Get a copy of the list that's in
-     * the lock structure and then zero the original. If it's
-     * linked to other such structures, we own that storage.
-     */
-    post = lock->notified;  /* a safe copy; we own the lock */
-
-#if defined(DEBUG)
-    memset(&lock->notified, 0, sizeof(_PT_Notified));  /* reset */
-#else
-    lock->notified.length = 0;  /* these are really sufficient */
-    lock->notified.link = NULL;
-#endif
-
-    /* should (may) we release lock before notifying? */
-    if (unlock)
-    {
-        rv = pthread_mutex_unlock(&lock->mutex);
-        PR_ASSERT(0 == rv);
-    }
-
-    notified = &post;  /* this is where we start */
-    do
-    {
-        for (index = 0; index < notified->length; ++index)
-        {
-            PRCondVar *cv = notified->cv[index].cv;
-            PR_ASSERT(NULL != cv);
-            PR_ASSERT(0 != notified->cv[index].times);
-            if (-1 == notified->cv[index].times)
-            {
-                rv = pthread_cond_broadcast(&cv->cv);
-                PR_ASSERT(0 == rv);
-            }
-            else
-            {
-                while (notified->cv[index].times-- > 0)
-                {
-                    rv = pthread_cond_signal(&cv->cv);
-                    PR_ASSERT(0 == rv);
-                }
-            }
-#if defined(DEBUG)
-            pt_debug.cvars_notified += 1;
-            if (0 > PR_AtomicDecrement(&cv->notify_pending))
-            {
-                pt_debug.delayed_cv_deletes += 1;
-                PR_DestroyCondVar(cv);
-            }
-#else  /* defined(DEBUG) */
-            if (0 > PR_AtomicDecrement(&cv->notify_pending))
-                PR_DestroyCondVar(cv);
-#endif  /* defined(DEBUG) */
-        }
-        prev = notified;
-        notified = notified->link;
-        if (&post != prev) PR_DELETE(prev);
-    } while (NULL != notified);
-}  /* pt_PostNotifies */
-
-PR_IMPLEMENT(PRLock*) PR_NewLock(void)
-{
-    PRIntn rv;
-    PRLock *lock;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    lock = PR_NEWZAP(PRLock);
-    if (lock != NULL)
-    {
-        rv = _PT_PTHREAD_MUTEX_INIT(lock->mutex, _pt_mattr); 
-        PR_ASSERT(0 == rv);
-    }
-#if defined(DEBUG)
-    pt_debug.locks_created += 1;
-#endif
-    return lock;
-}  /* PR_NewLock */
-
-PR_IMPLEMENT(void) PR_DestroyLock(PRLock *lock)
-{
-    PRIntn rv;
-    PR_ASSERT(NULL != lock);
-    PR_ASSERT(PR_FALSE == lock->locked);
-    PR_ASSERT(0 == lock->notified.length);
-    PR_ASSERT(NULL == lock->notified.link);
-    rv = pthread_mutex_destroy(&lock->mutex);
-    PR_ASSERT(0 == rv);
-#if defined(DEBUG)
-    memset(lock, 0xaf, sizeof(PRLock));
-    pt_debug.locks_destroyed += 1;
-#endif
-    PR_DELETE(lock);
-}  /* PR_DestroyLock */
-
-PR_IMPLEMENT(void) PR_Lock(PRLock *lock)
-{
-    PRIntn rv;
-    PR_ASSERT(lock != NULL);
-    rv = pthread_mutex_lock(&lock->mutex);
-    PR_ASSERT(0 == rv);
-    PR_ASSERT(0 == lock->notified.length);
-    PR_ASSERT(NULL == lock->notified.link);
-    PR_ASSERT(PR_FALSE == lock->locked);
-    lock->locked = PR_TRUE;
-    lock->owner = pthread_self();
-#if defined(DEBUG)
-    pt_debug.locks_acquired += 1;
-#endif
-}  /* PR_Lock */
-
-PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock *lock)
-{
-    PRIntn rv;
-
-    PR_ASSERT(lock != NULL);
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
-    PR_ASSERT(PR_TRUE == lock->locked);
-    PR_ASSERT(pthread_equal(lock->owner, pthread_self()));
-
-    if (!lock->locked || !pthread_equal(lock->owner, pthread_self()))
-        return PR_FAILURE;
-
-    lock->locked = PR_FALSE;
-    if (0 == lock->notified.length)  /* shortcut */
-    {
-        rv = pthread_mutex_unlock(&lock->mutex);
-        PR_ASSERT(0 == rv);
-    }
-    else pt_PostNotifies(lock, PR_TRUE);
-
-#if defined(DEBUG)
-    pt_debug.locks_released += 1;
-#endif
-    return PR_SUCCESS;
-}  /* PR_Unlock */
-
-
-/**************************************************************/
-/**************************************************************/
-/***************************CONDITIONS*************************/
-/**************************************************************/
-/**************************************************************/
-
-
-/*
- * This code is used to compute the absolute time for the wakeup.
- * It's moderately ugly, so it's defined here and called in a
- * couple of places.
- */
-#define PT_NANOPERMICRO 1000UL
-#define PT_BILLION 1000000000UL
-
-static PRIntn pt_TimedWait(
-    pthread_cond_t *cv, pthread_mutex_t *ml, PRIntervalTime timeout)
-{
-    int rv;
-    struct timeval now;
-    struct timespec tmo;
-    PRUint32 ticks = PR_TicksPerSecond();
-
-    tmo.tv_sec = (PRInt32)(timeout / ticks);
-    tmo.tv_nsec = (PRInt32)(timeout - (tmo.tv_sec * ticks));
-    tmo.tv_nsec = (PRInt32)PR_IntervalToMicroseconds(PT_NANOPERMICRO * tmo.tv_nsec);
-
-    /* pthreads wants this in absolute time, off we go ... */
-    (void)GETTIMEOFDAY(&now);
-    /* that one's usecs, this one's nsecs - grrrr! */
-    tmo.tv_sec += now.tv_sec;
-    tmo.tv_nsec += (PT_NANOPERMICRO * now.tv_usec);
-    tmo.tv_sec += tmo.tv_nsec / PT_BILLION;
-    tmo.tv_nsec %= PT_BILLION;
-
-    rv = pthread_cond_timedwait(cv, ml, &tmo);
-
-    /* NSPR doesn't report timeouts */
-#ifdef _PR_DCETHREADS
-    if (rv == -1) return (errno == EAGAIN) ? 0 : errno;
-    else return rv;
-#else
-    return (rv == ETIMEDOUT) ? 0 : rv;
-#endif
-}  /* pt_TimedWait */
-
-
-/*
- * Notifies just get posted to the protecting mutex. The
- * actual notification is done when the lock is released so that
- * MP systems don't contend for a lock that they can't have.
- */
-static void pt_PostNotifyToCvar(PRCondVar *cvar, PRBool broadcast)
-{
-    PRIntn index = 0;
-    _PT_Notified *notified = &cvar->lock->notified;
-
-    PR_ASSERT(PR_TRUE == cvar->lock->locked);
-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
-
-    while (1)
-    {
-        for (index = 0; index < notified->length; ++index)
-        {
-            if (notified->cv[index].cv == cvar)
-            {
-                if (broadcast)
-                    notified->cv[index].times = -1;
-                else if (-1 != notified->cv[index].times)
-                    notified->cv[index].times += 1;
-                goto finished;  /* we're finished */
-            }
-        }
-        /* if not full, enter new CV in this array */
-        if (notified->length < PT_CV_NOTIFIED_LENGTH) break;
-
-        /* if there's no link, create an empty array and link it */
-        if (NULL == notified->link)
-            notified->link = PR_NEWZAP(_PT_Notified);
-        notified = notified->link;
-    }
-
-    /* A brand new entry in the array */
-    (void)PR_AtomicIncrement(&cvar->notify_pending);
-    notified->cv[index].times = (broadcast) ? -1 : 1;
-    notified->cv[index].cv = cvar;
-    notified->length += 1;
-
-finished:
-    PR_ASSERT(PR_TRUE == cvar->lock->locked);
-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
-}  /* pt_PostNotifyToCvar */
-
-PR_IMPLEMENT(PRCondVar*) PR_NewCondVar(PRLock *lock)
-{
-    PRCondVar *cv = PR_NEW(PRCondVar);
-    PR_ASSERT(lock != NULL);
-    if (cv != NULL)
-    {
-        int rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-        PR_ASSERT(0 == rv);
-        cv->lock = lock;
-        cv->notify_pending = 0;
-#if defined(DEBUG)
-        pt_debug.cvars_created += 1;
-#endif
-    }
-    return cv;
-}  /* PR_NewCondVar */
-
-PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
-{
-    if (0 > PR_AtomicDecrement(&cvar->notify_pending))
-    {
-        PRIntn rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv);
-#if defined(DEBUG)
-        memset(cvar, 0xaf, sizeof(PRCondVar));
-        pt_debug.cvars_destroyed += 1;
-#endif
-        PR_DELETE(cvar);
-    }
-}  /* PR_DestroyCondVar */
-
-PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout)
-{
-    PRIntn rv;
-    PRThread *thred = PR_GetCurrentThread();
-
-    PR_ASSERT(cvar != NULL);
-    /* We'd better be locked */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
-    PR_ASSERT(PR_TRUE == cvar->lock->locked);
-    /* and it better be by us */
-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
-
-    if (_PT_THREAD_INTERRUPTED(thred)) goto aborted;
-
-    /*
-     * The thread waiting is used for PR_Interrupt
-     */
-    thred->waiting = cvar;  /* this is where we're waiting */
-
-    /*
-     * If we have pending notifies, post them now.
-     *
-     * This is not optimal. We're going to post these notifies
-     * while we're holding the lock. That means on MP systems
-     * that they are going to collide for the lock that we will
-     * hold until we actually wait.
-     */
-    if (0 != cvar->lock->notified.length)
-        pt_PostNotifies(cvar->lock, PR_FALSE);
-
-    /*
-     * We're surrendering the lock, so clear out the locked field.
-     */
-    cvar->lock->locked = PR_FALSE;
-
-    if (timeout == PR_INTERVAL_NO_TIMEOUT)
-        rv = pthread_cond_wait(&cvar->cv, &cvar->lock->mutex);
-    else
-        rv = pt_TimedWait(&cvar->cv, &cvar->lock->mutex, timeout);
-
-    /* We just got the lock back - this better be empty */
-    PR_ASSERT(PR_FALSE == cvar->lock->locked);
-    cvar->lock->locked = PR_TRUE;
-    cvar->lock->owner = pthread_self();
-
-    PR_ASSERT(0 == cvar->lock->notified.length);
-    thred->waiting = NULL;  /* and now we're not */
-    if (_PT_THREAD_INTERRUPTED(thred)) goto aborted;
-    if (rv != 0)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(rv);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-
-aborted:
-    PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-    thred->state &= ~PT_THREAD_ABORTED;
-    return PR_FAILURE;
-}  /* PR_WaitCondVar */
-
-PR_IMPLEMENT(PRStatus) PR_NotifyCondVar(PRCondVar *cvar)
-{
-    PR_ASSERT(cvar != NULL);   
-    pt_PostNotifyToCvar(cvar, PR_FALSE);
-    return PR_SUCCESS;
-}  /* PR_NotifyCondVar */
-
-PR_IMPLEMENT(PRStatus) PR_NotifyAllCondVar(PRCondVar *cvar)
-{
-    PR_ASSERT(cvar != NULL);
-    pt_PostNotifyToCvar(cvar, PR_TRUE);
-    return PR_SUCCESS;
-}  /* PR_NotifyAllCondVar */
-
-/**************************************************************/
-/**************************************************************/
-/***************************MONITORS***************************/
-/**************************************************************/
-/**************************************************************/
-
-PR_IMPLEMENT(PRMonitor*) PR_NewMonitor(void)
-{
-    PRMonitor *mon;
-    PRCondVar *cvar;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    cvar = PR_NEWZAP(PRCondVar);
-    if (NULL == cvar)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    mon = PR_NEWZAP(PRMonitor);
-    if (mon != NULL)
-    {
-        int rv;
-        rv = _PT_PTHREAD_MUTEX_INIT(mon->lock.mutex, _pt_mattr); 
-        PR_ASSERT(0 == rv);
-
-        _PT_PTHREAD_INVALIDATE_THR_HANDLE(mon->owner);
-
-        mon->cvar = cvar;
-        rv = _PT_PTHREAD_COND_INIT(mon->cvar->cv, _pt_cvar_attr); 
-        PR_ASSERT(0 == rv);
-        mon->entryCount = 0;
-        mon->cvar->lock = &mon->lock;
-        if (0 != rv)
-        {
-            PR_DELETE(mon);
-            PR_DELETE(cvar);
-            mon = NULL;
-        }
-    }
-    return mon;
-}  /* PR_NewMonitor */
-
-PR_IMPLEMENT(PRMonitor*) PR_NewNamedMonitor(const char* name)
-{
-    PRMonitor* mon = PR_NewMonitor();
-    if (mon)
-        mon->name = name;
-    return mon;
-}
-
-PR_IMPLEMENT(void) PR_DestroyMonitor(PRMonitor *mon)
-{
-    int rv;
-    PR_ASSERT(mon != NULL);
-    PR_DestroyCondVar(mon->cvar);
-    rv = pthread_mutex_destroy(&mon->lock.mutex); PR_ASSERT(0 == rv);
-#if defined(DEBUG)
-        memset(mon, 0xaf, sizeof(PRMonitor));
-#endif
-    PR_DELETE(mon);    
-}  /* PR_DestroyMonitor */
-
-
-/* The GC uses this; it is quite arguably a bad interface.  I'm just 
- * duplicating it for now - XXXMB
- */
-PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryCount(PRMonitor *mon)
-{
-    pthread_t self = pthread_self();
-    if (pthread_equal(mon->owner, self))
-        return mon->entryCount;
-    return 0;
-}
-
-PR_IMPLEMENT(void) PR_EnterMonitor(PRMonitor *mon)
-{
-    pthread_t self = pthread_self();
-
-    PR_ASSERT(mon != NULL);
-    /*
-     * This is safe only if mon->owner (a pthread_t) can be
-     * read in one instruction.  Perhaps mon->owner should be
-     * a "PRThread *"?
-     */
-    if (!pthread_equal(mon->owner, self))
-    {
-        PR_Lock(&mon->lock);
-        /* and now I have the lock */
-        PR_ASSERT(0 == mon->entryCount);
-        PR_ASSERT(_PT_PTHREAD_THR_HANDLE_IS_INVALID(mon->owner));
-        _PT_PTHREAD_COPY_THR_HANDLE(self, mon->owner);
-    }
-    mon->entryCount += 1;
-}  /* PR_EnterMonitor */
-
-PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PRMonitor *mon)
-{
-    pthread_t self = pthread_self();
-
-    PR_ASSERT(mon != NULL);
-    /* The lock better be that - locked */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(mon->lock.mutex));
-    /* we'd better be the owner */
-    PR_ASSERT(pthread_equal(mon->owner, self));
-    if (!pthread_equal(mon->owner, self))
-        return PR_FAILURE;
-
-    /* if it's locked and we have it, then the entries should be > 0 */
-    PR_ASSERT(mon->entryCount > 0);
-    mon->entryCount -= 1;  /* reduce by one */
-    if (mon->entryCount == 0)
-    {
-        /* and if it transitioned to zero - unlock */
-        _PT_PTHREAD_INVALIDATE_THR_HANDLE(mon->owner);  /* make the owner unknown */
-        PR_Unlock(&mon->lock);
-    }
-    return PR_SUCCESS;
-}  /* PR_ExitMonitor */
-
-PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime timeout)
-{
-    PRStatus rv;
-    PRInt16 saved_entries;
-    pthread_t saved_owner;
-
-    PR_ASSERT(mon != NULL);
-    /* we'd better be locked */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(mon->lock.mutex));
-    /* and the entries better be positive */
-    PR_ASSERT(mon->entryCount > 0);
-    /* and it better be by us */
-    PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
-
-    /* tuck these away 'till later */
-    saved_entries = mon->entryCount; 
-    mon->entryCount = 0;
-    _PT_PTHREAD_COPY_THR_HANDLE(mon->owner, saved_owner);
-    _PT_PTHREAD_INVALIDATE_THR_HANDLE(mon->owner);
-    
-    rv = PR_WaitCondVar(mon->cvar, timeout);
-
-    /* reinstate the intresting information */
-    mon->entryCount = saved_entries;
-    _PT_PTHREAD_COPY_THR_HANDLE(saved_owner, mon->owner);
-
-    return rv;
-}  /* PR_Wait */
-
-PR_IMPLEMENT(PRStatus) PR_Notify(PRMonitor *mon)
-{
-    PR_ASSERT(NULL != mon);
-    /* we'd better be locked */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(mon->lock.mutex));
-    /* and the entries better be positive */
-    PR_ASSERT(mon->entryCount > 0);
-    /* and it better be by us */
-    PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
-
-    pt_PostNotifyToCvar(mon->cvar, PR_FALSE);
-
-    return PR_SUCCESS;
-}  /* PR_Notify */
-
-PR_IMPLEMENT(PRStatus) PR_NotifyAll(PRMonitor *mon)
-{
-    PR_ASSERT(mon != NULL);
-    /* we'd better be locked */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(mon->lock.mutex));
-    /* and the entries better be positive */
-    PR_ASSERT(mon->entryCount > 0);
-    /* and it better be by us */
-    PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
-
-    pt_PostNotifyToCvar(mon->cvar, PR_TRUE);
-
-    return PR_SUCCESS;
-}  /* PR_NotifyAll */
-
-/**************************************************************/
-/**************************************************************/
-/**************************SEMAPHORES**************************/
-/**************************************************************/
-/**************************************************************/
-PR_IMPLEMENT(void) PR_PostSem(PRSemaphore *semaphore)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete(
-        "PR_PostSem", "locks & condition variables");
-	PR_Lock(semaphore->cvar->lock);
-	PR_NotifyCondVar(semaphore->cvar);
-	semaphore->count += 1;
-	PR_Unlock(semaphore->cvar->lock);
-}  /* PR_PostSem */
-
-PR_IMPLEMENT(PRStatus) PR_WaitSem(PRSemaphore *semaphore)
-{
-	PRStatus status = PR_SUCCESS;
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete(
-        "PR_WaitSem", "locks & condition variables");
-	PR_Lock(semaphore->cvar->lock);
-	while ((semaphore->count == 0) && (PR_SUCCESS == status))
-		status = PR_WaitCondVar(semaphore->cvar, PR_INTERVAL_NO_TIMEOUT);
-	if (PR_SUCCESS == status) semaphore->count -= 1;
-	PR_Unlock(semaphore->cvar->lock);
-	return status;
-}  /* PR_WaitSem */
-
-PR_IMPLEMENT(void) PR_DestroySem(PRSemaphore *semaphore)
-{
-    static PRBool unwarned = PR_TRUE;
-    if (unwarned) unwarned = _PR_Obsolete(
-        "PR_DestroySem", "locks & condition variables");
-    PR_DestroyLock(semaphore->cvar->lock);
-    PR_DestroyCondVar(semaphore->cvar);
-    PR_DELETE(semaphore);
-}  /* PR_DestroySem */
-
-PR_IMPLEMENT(PRSemaphore*) PR_NewSem(PRUintn value)
-{
-    PRSemaphore *semaphore;
-    static PRBool unwarned = PR_TRUE;
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (unwarned) unwarned = _PR_Obsolete(
-        "PR_NewSem", "locks & condition variables");
-
-    semaphore = PR_NEWZAP(PRSemaphore);
-    if (NULL != semaphore)
-    {
-        PRLock *lock = PR_NewLock();
-        if (NULL != lock)
-        {
-            semaphore->cvar = PR_NewCondVar(lock);
-            if (NULL != semaphore->cvar)
-            {
-                semaphore->count = value;
-                return semaphore;
-            }
-            PR_DestroyLock(lock);
-        }
-        PR_DELETE(semaphore);
-    }
-    return NULL;
-}
-
-/*
- * Define the interprocess named semaphore functions.
- * There are three implementations:
- * 1. POSIX semaphore based;
- * 2. System V semaphore based;
- * 3. unsupported (fails with PR_NOT_IMPLEMENTED_ERROR).
- */
-
-#ifdef _PR_HAVE_POSIX_SEMAPHORES
-#include <fcntl.h>
-
-PR_IMPLEMENT(PRSem *) PR_OpenSemaphore(
-    const char *name,
-    PRIntn flags,
-    PRIntn mode,
-    PRUintn value)
-{
-    PRSem *sem;
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-        == PR_FAILURE)
-    {
-        return NULL;
-    }
-
-    sem = PR_NEW(PRSem);
-    if (NULL == sem)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-
-    if (flags & PR_SEM_CREATE)
-    {
-        int oflag = O_CREAT;
-
-        if (flags & PR_SEM_EXCL) oflag |= O_EXCL;
-        sem->sem = sem_open(osname, oflag, mode, value);
-    }
-    else
-    {
-#ifdef HPUX
-        /* Pass 0 as the mode and value arguments to work around a bug. */
-        sem->sem = sem_open(osname, 0, 0, 0);
-#else
-        sem->sem = sem_open(osname, 0);
-#endif
-    }
-    if ((sem_t *) -1 == sem->sem)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        PR_DELETE(sem);
-        return NULL;
-    }
-    return sem;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitSemaphore(PRSem *sem)
-{
-    int rv;
-    rv = sem_wait(sem->sem);
-    if (0 != rv)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_PostSemaphore(PRSem *sem)
-{
-    int rv;
-    rv = sem_post(sem->sem);
-    if (0 != rv)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseSemaphore(PRSem *sem)
-{
-    int rv;
-    rv = sem_close(sem->sem);
-    if (0 != rv)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    PR_DELETE(sem);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name)
-{
-    int rv;
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-        == PR_FAILURE)
-    {
-        return PR_FAILURE;
-    }
-    rv = sem_unlink(osname);
-    if (0 != rv)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-    
-#elif defined(_PR_HAVE_SYSV_SEMAPHORES)
-
-#include <fcntl.h>
-#include <sys/sem.h>
-
-/*
- * From the semctl(2) man page in glibc 2.0
- */
-#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
-    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI)
-/* union semun is defined by including <sys/sem.h> */
-#else
-/* according to X/OPEN we have to define it ourselves */
-union semun {
-    int val;
-    struct semid_ds *buf;
-    unsigned short  *array;
-};
-#endif
-
-/*
- * 'a' (97) is the final closing price of NSCP stock.
- */
-#define NSPR_IPC_KEY_ID 'a'  /* the id argument for ftok() */
-
-#define NSPR_SEM_MODE 0666
-
-PR_IMPLEMENT(PRSem *) PR_OpenSemaphore(
-    const char *name,
-    PRIntn flags,
-    PRIntn mode,
-    PRUintn value)
-{
-    PRSem *sem;
-    key_t key;
-    union semun arg;
-    struct sembuf sop;
-    struct semid_ds seminfo;
-#define MAX_TRIES 60
-    PRIntn i;
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-        == PR_FAILURE)
-    {
-        return NULL;
-    }
-
-    /* Make sure the file exists before calling ftok. */
-    if (flags & PR_SEM_CREATE)
-    {
-        int osfd = open(osname, O_RDWR|O_CREAT, mode);
-        if (-1 == osfd)
-        {
-            _PR_MD_MAP_OPEN_ERROR(errno);
-            return NULL;
-        }
-        if (close(osfd) == -1)
-        {
-            _PR_MD_MAP_CLOSE_ERROR(errno);
-            return NULL;
-        }
-    }
-    key = ftok(osname, NSPR_IPC_KEY_ID);
-    if ((key_t)-1 == key)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return NULL;
-    }
-
-    sem = PR_NEW(PRSem);
-    if (NULL == sem)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-
-    if (flags & PR_SEM_CREATE)
-    {
-        sem->semid = semget(key, 1, mode|IPC_CREAT|IPC_EXCL);
-        if (sem->semid >= 0)
-        {
-            /* creator of a semaphore is responsible for initializing it */
-            arg.val = 0;
-            if (semctl(sem->semid, 0, SETVAL, arg) == -1)
-            {
-                _PR_MD_MAP_DEFAULT_ERROR(errno);
-                PR_DELETE(sem);
-                return NULL;
-            }
-            /* call semop to set sem_otime to nonzero */
-            sop.sem_num = 0;
-            sop.sem_op = value;
-            sop.sem_flg = 0;
-            if (semop(sem->semid, &sop, 1) == -1)
-            {
-                _PR_MD_MAP_DEFAULT_ERROR(errno);
-                PR_DELETE(sem);
-                return NULL;
-            }
-            return sem;
-        }
-
-        if (errno != EEXIST || flags & PR_SEM_EXCL)
-        {
-            _PR_MD_MAP_DEFAULT_ERROR(errno);
-            PR_DELETE(sem);
-            return NULL;
-        }
-    }
-
-    sem->semid = semget(key, 1, NSPR_SEM_MODE);
-    if (sem->semid == -1)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        PR_DELETE(sem);
-        return NULL;
-    }
-    for (i = 0; i < MAX_TRIES; i++)
-    {
-        arg.buf = &seminfo;
-        semctl(sem->semid, 0, IPC_STAT, arg);
-        if (seminfo.sem_otime != 0) break;
-        sleep(1);
-    }
-    if (i == MAX_TRIES)
-    {
-        PR_SetError(PR_IO_TIMEOUT_ERROR, 0);
-        PR_DELETE(sem);
-        return NULL;
-    }
-    return sem;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitSemaphore(PRSem *sem)
-{
-    struct sembuf sop;
-
-    sop.sem_num = 0;
-    sop.sem_op = -1;
-    sop.sem_flg = 0;
-    if (semop(sem->semid, &sop, 1) == -1)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_PostSemaphore(PRSem *sem)
-{
-    struct sembuf sop;
-
-    sop.sem_num = 0;
-    sop.sem_op = 1;
-    sop.sem_flg = 0;
-    if (semop(sem->semid, &sop, 1) == -1)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseSemaphore(PRSem *sem)
-{
-    PR_DELETE(sem);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name)
-{
-    key_t key;
-    int semid;
-    /* On some systems (e.g., glibc 2.0) semctl requires a fourth argument */
-    union semun unused;
-    char osname[PR_IPC_NAME_SIZE];
-
-    if (_PR_MakeNativeIPCName(name, osname, sizeof(osname), _PRIPCSem)
-        == PR_FAILURE)
-    {
-        return PR_FAILURE;
-    }
-    key = ftok(osname, NSPR_IPC_KEY_ID);
-    if ((key_t) -1 == key)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    if (unlink(osname) == -1)
-    {
-        _PR_MD_MAP_UNLINK_ERROR(errno);
-        return PR_FAILURE;
-    }
-    semid = semget(key, 1, NSPR_SEM_MODE);
-    if (-1 == semid)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    unused.val = 0;
-    if (semctl(semid, 0, IPC_RMID, unused) == -1)
-    { 
-        _PR_MD_MAP_DEFAULT_ERROR(errno);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-#else /* neither POSIX nor System V semaphores are available */
-
-PR_IMPLEMENT(PRSem *) PR_OpenSemaphore(
-    const char *name,
-    PRIntn flags,
-    PRIntn mode,
-    PRUintn value)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitSemaphore(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus) PR_PostSemaphore(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseSemaphore(PRSem *sem)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-#endif /* end of interprocess named semaphore functions */
-
-/**************************************************************/
-/**************************************************************/
-/******************ROUTINES FOR DCE EMULATION******************/
-/**************************************************************/
-/**************************************************************/
-
-#include "prpdce.h"
-
-PR_IMPLEMENT(PRStatus) PRP_TryLock(PRLock *lock)
-{
-    PRIntn rv = pthread_mutex_trylock(&lock->mutex);
-    if (rv == PT_TRYLOCK_SUCCESS)
-    {
-        PR_ASSERT(PR_FALSE == lock->locked);
-        lock->locked = PR_TRUE;
-        lock->owner = pthread_self();
-    }
-    /* XXX set error code? */
-    return (PT_TRYLOCK_SUCCESS == rv) ? PR_SUCCESS : PR_FAILURE;
-}  /* PRP_TryLock */
-
-PR_IMPLEMENT(PRCondVar*) PRP_NewNakedCondVar(void)
-{
-    PRCondVar *cv;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    cv = PR_NEW(PRCondVar);
-    if (cv != NULL)
-    {
-        int rv;
-        rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-        PR_ASSERT(0 == rv);
-        cv->lock = _PR_NAKED_CV_LOCK;
-    }
-    return cv;
-}  /* PRP_NewNakedCondVar */
-
-PR_IMPLEMENT(void) PRP_DestroyNakedCondVar(PRCondVar *cvar)
-{
-    int rv;
-    rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv);
-#if defined(DEBUG)
-        memset(cvar, 0xaf, sizeof(PRCondVar));
-#endif
-    PR_DELETE(cvar);
-}  /* PRP_DestroyNakedCondVar */
-
-PR_IMPLEMENT(PRStatus) PRP_NakedWait(
-    PRCondVar *cvar, PRLock *ml, PRIntervalTime timeout)
-{
-    PRIntn rv;
-    PR_ASSERT(cvar != NULL);
-    /* XXX do we really want to assert this in a naked wait? */
-    PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(ml->mutex));
-    if (timeout == PR_INTERVAL_NO_TIMEOUT)
-        rv = pthread_cond_wait(&cvar->cv, &ml->mutex);
-    else
-        rv = pt_TimedWait(&cvar->cv, &ml->mutex, timeout);
-    if (rv != 0)
-    {
-        _PR_MD_MAP_DEFAULT_ERROR(rv);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}  /* PRP_NakedWait */
-
-PR_IMPLEMENT(PRStatus) PRP_NakedNotify(PRCondVar *cvar)
-{
-    int rv;
-    PR_ASSERT(cvar != NULL);
-    rv = pthread_cond_signal(&cvar->cv);
-    PR_ASSERT(0 == rv);
-    return PR_SUCCESS;
-}  /* PRP_NakedNotify */
-
-PR_IMPLEMENT(PRStatus) PRP_NakedBroadcast(PRCondVar *cvar)
-{
-    int rv;
-    PR_ASSERT(cvar != NULL);
-    rv = pthread_cond_broadcast(&cvar->cv);
-    PR_ASSERT(0 == rv);
-    return PR_SUCCESS;
-}  /* PRP_NakedBroadcast */
-
-#endif  /* defined(_PR_PTHREADS) */
-
-/* ptsynch.c */
diff --git a/libs/js/nsprpub/pr/src/pthreads/ptthread.c b/libs/js/nsprpub/pr/src/pthreads/ptthread.c
deleted file mode 100644
index b44057b16a..0000000000
--- a/libs/js/nsprpub/pr/src/pthreads/ptthread.c
+++ /dev/null
@@ -1,1545 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:            ptthread.c
-** Descritpion:        Implemenation for threds using pthreds
-** Exports:            ptthread.h
-*/
-
-#if defined(_PR_PTHREADS) || defined(_PR_DCETHREADS)
-
-#include "prlog.h"
-#include "primpl.h"
-#include "prpdce.h"
-
-#include <pthread.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-
-/*
- * Record whether or not we have the privilege to set the scheduling
- * policy and priority of threads.  0 means that privilege is available.
- * EPERM means that privilege is not available.
- */
-
-static PRIntn pt_schedpriv = 0;
-extern PRLock *_pr_sleeplock;
-
-static struct _PT_Bookeeping
-{
-    PRLock *ml;                 /* a lock to protect ourselves */
-    PRCondVar *cv;              /* used to signal global things */
-    PRInt32 system, user;       /* a count of the two different types */
-    PRUintn this_many;          /* number of threads allowed for exit */
-    pthread_key_t key;          /* private private data key */
-    PRThread *first, *last;     /* list of threads we know about */
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-    PRInt32 minPrio, maxPrio;   /* range of scheduling priorities */
-#endif
-} pt_book = {0};
-
-static void _pt_thread_death(void *arg);
-static void init_pthread_gc_support(void);
-
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-static PRIntn pt_PriorityMap(PRThreadPriority pri)
-{
-#ifdef NTO
-    /* This priority algorithm causes lots of problems on Neutrino
-     * for now I have just hard coded everything to run at priority 10
-     * until I can come up with a new algorithm.
-     *     Jerry.Kirk@Nexwarecorp.com
-     */
-    return 10;
-#else
-    return pt_book.minPrio +
-	    pri * (pt_book.maxPrio - pt_book.minPrio) / PR_PRIORITY_LAST;
-#endif
-}
-#endif
-
-#if defined(GC_LEAK_DETECTOR) && (__GLIBC__ >= 2) && defined(__i386__) 
-
-#include <setjmp.h>
-
-typedef struct stack_frame stack_frame;
-
-struct stack_frame {
-    stack_frame* next;
-    void* pc;
-};
-
-static stack_frame* GetStackFrame()
-{
-    jmp_buf jb;
-    stack_frame* currentFrame;
-    setjmp(jb);
-    currentFrame = (stack_frame*)(jb[0].__jmpbuf[JB_BP]);
-    currentFrame = currentFrame->next;
-    return currentFrame;
-}
-
-static void* GetStackTop()
-{
-    stack_frame* frame;
-    frame = GetStackFrame();
-    while (frame != NULL)
-    {
-        ptrdiff_t pc = (ptrdiff_t)frame->pc;
-        if ((pc < 0x08000000) || (pc > 0x7fffffff) || (frame->next < frame))
-            return frame;
-        frame = frame->next;
-    }
-    return NULL;
-}
-#endif /* GC_LEAK_DETECTOR && (__GLIBC__ >= 2) && __i386__ */
-
-/*
-** Initialize a stack for a native pthread thread
-*/
-static void _PR_InitializeStack(PRThreadStack *ts)
-{
-    if( ts && (ts->stackTop == 0) ) {
-        ts->allocBase = (char *) &ts;
-        ts->allocSize = ts->stackSize;
-
-        /*
-        ** Setup stackTop and stackBottom values.
-        */
-#ifdef HAVE_STACK_GROWING_UP
-        ts->stackBottom = ts->allocBase + ts->stackSize;
-        ts->stackTop = ts->allocBase;
-#else
-#ifdef GC_LEAK_DETECTOR
-        ts->stackTop    = GetStackTop();
-        ts->stackBottom = ts->stackTop - ts->stackSize;
-#else
-        ts->stackTop    = ts->allocBase;
-        ts->stackBottom = ts->allocBase - ts->stackSize;
-#endif
-#endif
-    }
-}
-
-static void *_pt_root(void *arg)
-{
-    PRIntn rv;
-    PRThread *thred = (PRThread*)arg;
-    PRBool detached = (thred->state & PT_THREAD_DETACHED) ? PR_TRUE : PR_FALSE;
-
-    /*
-     * Both the parent thread and this new thread set thred->id.
-     * The new thread must ensure that thred->id is set before
-     * it executes its startFunc.  The parent thread must ensure
-     * that thred->id is set before PR_CreateThread() returns.
-     * Both threads set thred->id without holding a lock.  Since
-     * they are writing the same value, this unprotected double
-     * write should be safe.
-     */
-    thred->id = pthread_self();
-
-    /*
-    ** DCE Threads can't detach during creation, so do it late.
-    ** I would like to do it only here, but that doesn't seem
-    ** to work.
-    */
-#if defined(_PR_DCETHREADS)
-    if (detached)
-    {
-        /* pthread_detach() modifies its argument, so we must pass a copy */
-        pthread_t self = thred->id;
-        rv = pthread_detach(&self);
-        PR_ASSERT(0 == rv);
-    }
-#endif /* defined(_PR_DCETHREADS) */
-
-    /* Set up the thread stack information */
-    _PR_InitializeStack(thred->stack);
-
-    /*
-     * Set within the current thread the pointer to our object.
-     * This object will be deleted when the thread termintates,
-     * whether in a join or detached (see _PR_InitThreads()).
-     */
-    rv = pthread_setspecific(pt_book.key, thred);
-    PR_ASSERT(0 == rv);
-
-    /* make the thread visible to the rest of the runtime */
-    PR_Lock(pt_book.ml);
-
-    /* If this is a GCABLE thread, set its state appropriately */
-    if (thred->suspend & PT_THREAD_SETGCABLE)
-	    thred->state |= PT_THREAD_GCABLE;
-    thred->suspend = 0;
-
-    thred->prev = pt_book.last;
-    if (pt_book.last)
-        pt_book.last->next = thred;
-    else
-        pt_book.first = thred;
-    thred->next = NULL;
-    pt_book.last = thred;
-    PR_Unlock(pt_book.ml);
-
-    thred->startFunc(thred->arg);  /* make visible to the client */
-
-    /* unhook the thread from the runtime */
-    PR_Lock(pt_book.ml);
-    /*
-     * At this moment, PR_CreateThread() may not have set thred->id yet.
-     * It is safe for a detached thread to free thred only after
-     * PR_CreateThread() has set thred->id.
-     */
-    if (detached)
-    {
-        while (!thred->okToDelete)
-            PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-    if (thred->state & PT_THREAD_SYSTEM)
-        pt_book.system -= 1;
-    else if (--pt_book.user == pt_book.this_many)
-        PR_NotifyAllCondVar(pt_book.cv);
-    if (NULL == thred->prev)
-        pt_book.first = thred->next;
-    else
-        thred->prev->next = thred->next;
-    if (NULL == thred->next)
-        pt_book.last = thred->prev;
-    else
-        thred->next->prev = thred->prev;
-    PR_Unlock(pt_book.ml);
-
-    /*
-    * Here we set the pthread's backpointer to the PRThread to NULL.
-    * Otherwise the destructor would get called eagerly as the thread
-    * returns to the pthread runtime. The joining thread would them be
-    * the proud possessor of a dangling reference. However, this is the
-    * last chance to delete the object if the thread is detached, so
-    * just let the destructor do the work.
-    */
-    if (PR_FALSE == detached)
-    {
-        rv = pthread_setspecific(pt_book.key, NULL);
-        PR_ASSERT(0 == rv);
-    }
-
-    return NULL;
-}  /* _pt_root */
-
-static PRThread* pt_AttachThread(void)
-{
-    PRThread *thred = NULL;
-
-    /*
-     * NSPR must have been initialized when PR_AttachThread is called.
-     * We cannot have PR_AttachThread call implicit initialization
-     * because if multiple threads call PR_AttachThread simultaneously,
-     * NSPR may be initialized more than once.
-     * We can't call any function that calls PR_GetCurrentThread()
-     * either (e.g., PR_SetError()) as that will result in infinite
-     * recursion.
-     */
-    if (!_pr_initialized) return NULL;
-
-    /* PR_NEWZAP must not call PR_GetCurrentThread() */
-    thred = PR_NEWZAP(PRThread);
-    if (NULL != thred)
-    {
-        int rv;
-
-        thred->priority = PR_PRIORITY_NORMAL;
-        thred->id = pthread_self();
-        rv = pthread_setspecific(pt_book.key, thred);
-        PR_ASSERT(0 == rv);
-
-        thred->state = PT_THREAD_GLOBAL | PT_THREAD_FOREIGN;
-        PR_Lock(pt_book.ml);
-
-        /* then put it into the list */
-        thred->prev = pt_book.last;
-        if (pt_book.last)
-            pt_book.last->next = thred;
-        else
-            pt_book.first = thred;
-        thred->next = NULL;
-        pt_book.last = thred;
-        PR_Unlock(pt_book.ml);
-
-    }
-    return thred;  /* may be NULL */
-}  /* pt_AttachThread */
-
-static PRThread* _PR_CreateThread(
-    PRThreadType type, void (*start)(void *arg),
-    void *arg, PRThreadPriority priority, PRThreadScope scope,
-    PRThreadState state, PRUint32 stackSize, PRBool isGCAble)
-{
-    int rv;
-    PRThread *thred;
-    pthread_attr_t tattr;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if ((PRIntn)PR_PRIORITY_FIRST > (PRIntn)priority)
-        priority = PR_PRIORITY_FIRST;
-    else if ((PRIntn)PR_PRIORITY_LAST < (PRIntn)priority)
-        priority = PR_PRIORITY_LAST;
-
-    rv = _PT_PTHREAD_ATTR_INIT(&tattr);
-    PR_ASSERT(0 == rv);
-
-    if (EPERM != pt_schedpriv)
-    {
-#if !defined(_PR_DCETHREADS) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-        struct sched_param schedule;
-#endif
-
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-        rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED);
-        PR_ASSERT(0 == rv);
-#endif
-
-        /* Use the default scheduling policy */
-
-#if defined(_PR_DCETHREADS)
-        rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority));
-        PR_ASSERT(0 == rv);
-#elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-        rv = pthread_attr_getschedparam(&tattr, &schedule);
-        PR_ASSERT(0 == rv);
-        schedule.sched_priority = pt_PriorityMap(priority);
-        rv = pthread_attr_setschedparam(&tattr, &schedule);
-        PR_ASSERT(0 == rv);
-#ifdef NTO
-        rv = pthread_attr_setschedpolicy(&tattr, SCHED_RR); /* Round Robin */
-        PR_ASSERT(0 == rv);
-#endif
-#endif /* !defined(_PR_DCETHREADS) */
-    }
-
-    /*
-     * DCE threads can't set detach state before creating the thread.
-     * AIX can't set detach late. Why can't we all just get along?
-     */
-#if !defined(_PR_DCETHREADS)
-    rv = pthread_attr_setdetachstate(&tattr,
-        ((PR_JOINABLE_THREAD == state) ?
-            PTHREAD_CREATE_JOINABLE : PTHREAD_CREATE_DETACHED));
-    PR_ASSERT(0 == rv);
-#endif /* !defined(_PR_DCETHREADS) */
-
-    /*
-     * If stackSize is 0, we use the default pthread stack size.
-     */
-    if (stackSize)
-    {
-#ifdef _MD_MINIMUM_STACK_SIZE
-        if (stackSize < _MD_MINIMUM_STACK_SIZE)
-            stackSize = _MD_MINIMUM_STACK_SIZE;
-#endif
-        rv = pthread_attr_setstacksize(&tattr, stackSize);
-        PR_ASSERT(0 == rv);
-    }
-
-    thred = PR_NEWZAP(PRThread);
-    if (NULL == thred)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, errno);
-        goto done;
-    }
-    else
-    {
-        pthread_t id;
-
-        thred->arg = arg;
-        thred->startFunc = start;
-        thred->priority = priority;
-        if (PR_UNJOINABLE_THREAD == state)
-            thred->state |= PT_THREAD_DETACHED;
-
-        if (PR_LOCAL_THREAD == scope)
-        	scope = PR_GLOBAL_THREAD;
-			
-        if (PR_GLOBAL_BOUND_THREAD == scope) {
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-    		rv = pthread_attr_setscope(&tattr, PTHREAD_SCOPE_SYSTEM);
-			if (rv) {
-				/*
-				 * system scope not supported
-				 */
-        		scope = PR_GLOBAL_THREAD;
-				/*
-				 * reset scope
-				 */
-    			rv = pthread_attr_setscope(&tattr, PTHREAD_SCOPE_PROCESS);
-    			PR_ASSERT(0 == rv);
-			}
-#endif
-		}
-        if (PR_GLOBAL_THREAD == scope)
-            thred->state |= PT_THREAD_GLOBAL;
-        else if (PR_GLOBAL_BOUND_THREAD == scope)
-            thred->state |= (PT_THREAD_GLOBAL | PT_THREAD_BOUND);
-		else	/* force it global */
-            thred->state |= PT_THREAD_GLOBAL;
-        if (PR_SYSTEM_THREAD == type)
-            thred->state |= PT_THREAD_SYSTEM;
-
-        thred->suspend =(isGCAble) ? PT_THREAD_SETGCABLE : 0;
-
-        thred->stack = PR_NEWZAP(PRThreadStack);
-        if (thred->stack == NULL) {
-            PRIntn oserr = errno;
-            PR_Free(thred);  /* all that work ... poof! */
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, oserr);
-            thred = NULL;  /* and for what? */
-            goto done;
-        }
-        thred->stack->stackSize = stackSize;
-        thred->stack->thr = thred;
-
-#ifdef PT_NO_SIGTIMEDWAIT
-        pthread_mutex_init(&thred->suspendResumeMutex,NULL);
-        pthread_cond_init(&thred->suspendResumeCV,NULL);
-#endif
-
-        /* make the thread counted to the rest of the runtime */
-        PR_Lock(pt_book.ml);
-        if (PR_SYSTEM_THREAD == type)
-            pt_book.system += 1;
-        else pt_book.user += 1;
-        PR_Unlock(pt_book.ml);
-
-        /*
-         * We pass a pointer to a local copy (instead of thred->id)
-         * to pthread_create() because who knows what wacky things
-         * pthread_create() may be doing to its argument.
-         */
-        rv = _PT_PTHREAD_CREATE(&id, tattr, _pt_root, thred);
-
-#if !defined(_PR_DCETHREADS)
-        if (EPERM == rv)
-        {
-#if defined(IRIX)
-        	if (PR_GLOBAL_BOUND_THREAD == scope) {
-				/*
-				 * SCOPE_SYSTEM requires appropriate privilege
-				 * reset to process scope and try again
-				 */
-    			rv = pthread_attr_setscope(&tattr, PTHREAD_SCOPE_PROCESS);
-    			PR_ASSERT(0 == rv);
-            	thred->state &= ~PT_THREAD_BOUND;
-			}
-#else
-            /* Remember that we don't have thread scheduling privilege. */
-            pt_schedpriv = EPERM;
-            PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-                ("_PR_CreateThread: no thread scheduling privilege"));
-            /* Try creating the thread again without setting priority. */
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-            rv = pthread_attr_setinheritsched(&tattr, PTHREAD_INHERIT_SCHED);
-            PR_ASSERT(0 == rv);
-#endif
-#endif	/* IRIX */
-            rv = _PT_PTHREAD_CREATE(&id, tattr, _pt_root, thred);
-        }
-#endif
-
-        if (0 != rv)
-        {
-#if defined(_PR_DCETHREADS)
-            PRIntn oserr = errno;
-#else
-            PRIntn oserr = rv;
-#endif
-            PR_Lock(pt_book.ml);
-            if (thred->state & PT_THREAD_SYSTEM)
-                pt_book.system -= 1;
-            else if (--pt_book.user == pt_book.this_many)
-                PR_NotifyAllCondVar(pt_book.cv);
-            PR_Unlock(pt_book.ml);
-
-            PR_Free(thred->stack);
-            PR_Free(thred);  /* all that work ... poof! */
-            PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, oserr);
-            thred = NULL;  /* and for what? */
-            goto done;
-        }
-
-        /*
-         * Both the parent thread and this new thread set thred->id.
-         * The parent thread must ensure that thred->id is set before
-         * PR_CreateThread() returns.  (See comments in _pt_root().)
-         */
-        thred->id = id;
-
-        /*
-         * If the new thread is detached, tell it that PR_CreateThread()
-         * has set thred->id so it's ok to delete thred.
-         */
-        if (PR_UNJOINABLE_THREAD == state)
-        {
-            PR_Lock(pt_book.ml);
-            thred->okToDelete = PR_TRUE;
-            PR_NotifyAllCondVar(pt_book.cv);
-            PR_Unlock(pt_book.ml);
-        }
-    }
-
-done:
-    rv = _PT_PTHREAD_ATTR_DESTROY(&tattr);
-    PR_ASSERT(0 == rv);
-
-    return thred;
-}  /* _PR_CreateThread */
-
-PR_IMPLEMENT(PRThread*) PR_CreateThread(
-    PRThreadType type, void (*start)(void *arg), void *arg,
-    PRThreadPriority priority, PRThreadScope scope,
-    PRThreadState state, PRUint32 stackSize)
-{
-    return _PR_CreateThread(
-        type, start, arg, priority, scope, state, stackSize, PR_FALSE);
-} /* PR_CreateThread */
-
-PR_IMPLEMENT(PRThread*) PR_CreateThreadGCAble(
-    PRThreadType type, void (*start)(void *arg), void *arg, 
-    PRThreadPriority priority, PRThreadScope scope,
-    PRThreadState state, PRUint32 stackSize)
-{
-    return _PR_CreateThread(
-        type, start, arg, priority, scope, state, stackSize, PR_TRUE);
-}  /* PR_CreateThreadGCAble */
-
-PR_IMPLEMENT(void*) GetExecutionEnvironment(PRThread *thred)
-{
-    return thred->environment;
-}  /* GetExecutionEnvironment */
- 
-PR_IMPLEMENT(void) SetExecutionEnvironment(PRThread *thred, void *env)
-{
-    thred->environment = env;
-}  /* SetExecutionEnvironment */
-
-PR_IMPLEMENT(PRThread*) PR_AttachThread(
-    PRThreadType type, PRThreadPriority priority, PRThreadStack *stack)
-{
-    return PR_GetCurrentThread();
-}  /* PR_AttachThread */
-
-
-PR_IMPLEMENT(PRStatus) PR_JoinThread(PRThread *thred)
-{
-    int rv = -1;
-    void *result = NULL;
-    PR_ASSERT(thred != NULL);
-
-    if ((0xafafafaf == thred->state)
-    || (PT_THREAD_DETACHED == (PT_THREAD_DETACHED & thred->state))
-    || (PT_THREAD_FOREIGN == (PT_THREAD_FOREIGN & thred->state)))
-    {
-        /*
-         * This might be a bad address, but if it isn't, the state should
-         * either be an unjoinable thread or it's already had the object
-         * deleted. However, the client that called join on a detached
-         * thread deserves all the rath I can muster....
-         */
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        PR_LogPrint(
-            "PR_JoinThread: %p not joinable | already smashed\n", thred);
-    }
-    else
-    {
-        pthread_t id = thred->id;
-        rv = pthread_join(id, &result);
-        PR_ASSERT(rv == 0 && result == NULL);
-        if (0 == rv)
-        {
-#ifdef _PR_DCETHREADS
-            rv = pthread_detach(&id);
-            PR_ASSERT(0 == rv);
-#endif
-            _pt_thread_death(thred);
-        }
-        else
-        {
-            PRErrorCode prerror;
-            switch (rv)
-            {
-                case EINVAL:  /* not a joinable thread */
-                case ESRCH:   /* no thread with given ID */
-                    prerror = PR_INVALID_ARGUMENT_ERROR;
-                    break;
-                case EDEADLK: /* a thread joining with itself */
-                    prerror = PR_DEADLOCK_ERROR;
-                    break;
-                default:
-                    prerror = PR_UNKNOWN_ERROR;
-                    break;
-            }
-            PR_SetError(prerror, rv);
-        }
-    }
-    return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-}  /* PR_JoinThread */
-
-PR_IMPLEMENT(void) PR_DetachThread(void) { }  /* PR_DetachThread */
-
-PR_IMPLEMENT(PRThread*) PR_GetCurrentThread(void)
-{
-    void *thred;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    _PT_PTHREAD_GETSPECIFIC(pt_book.key, thred);
-    if (NULL == thred) thred = pt_AttachThread();
-    PR_ASSERT(NULL != thred);
-    return (PRThread*)thred;
-}  /* PR_GetCurrentThread */
-
-PR_IMPLEMENT(PRThreadScope) PR_GetThreadScope(const PRThread *thred)
-{
-    return (thred->state & PT_THREAD_BOUND) ?
-        PR_GLOBAL_BOUND_THREAD : PR_GLOBAL_THREAD;
-}  /* PR_GetThreadScope() */
-
-PR_IMPLEMENT(PRThreadType) PR_GetThreadType(const PRThread *thred)
-{
-    return (thred->state & PT_THREAD_SYSTEM) ?
-        PR_SYSTEM_THREAD : PR_USER_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadState) PR_GetThreadState(const PRThread *thred)
-{
-    return (thred->state & PT_THREAD_DETACHED) ?
-        PR_UNJOINABLE_THREAD : PR_JOINABLE_THREAD;
-}  /* PR_GetThreadState */
-
-PR_IMPLEMENT(PRThreadPriority) PR_GetThreadPriority(const PRThread *thred)
-{
-    PR_ASSERT(thred != NULL);
-    return thred->priority;
-}  /* PR_GetThreadPriority */
-
-PR_IMPLEMENT(void) PR_SetThreadPriority(PRThread *thred, PRThreadPriority newPri)
-{
-    PRIntn rv = -1;
-
-    PR_ASSERT(NULL != thred);
-
-    if ((PRIntn)PR_PRIORITY_FIRST > (PRIntn)newPri)
-        newPri = PR_PRIORITY_FIRST;
-    else if ((PRIntn)PR_PRIORITY_LAST < (PRIntn)newPri)
-        newPri = PR_PRIORITY_LAST;
-
-#if defined(_PR_DCETHREADS)
-    rv = pthread_setprio(thred->id, pt_PriorityMap(newPri));
-    /* pthread_setprio returns the old priority */
-#elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-    if (EPERM != pt_schedpriv)
-    {
-        int policy;
-        struct sched_param schedule;
-
-        rv = pthread_getschedparam(thred->id, &policy, &schedule);
-        if(0 == rv) {
-			schedule.sched_priority = pt_PriorityMap(newPri);
-			rv = pthread_setschedparam(thred->id, policy, &schedule);
-			if (EPERM == rv)
-			{
-				pt_schedpriv = EPERM;
-				PR_LOG(_pr_thread_lm, PR_LOG_MIN,
-					("PR_SetThreadPriority: no thread scheduling privilege"));
-			}
-		}
-		if (rv != 0)
-			rv = -1;
-    }
-#endif
-
-    thred->priority = newPri;
-}  /* PR_SetThreadPriority */
-
-PR_IMPLEMENT(PRStatus) PR_Interrupt(PRThread *thred)
-{
-    /*
-    ** If the target thread indicates that it's waiting,
-    ** find the condition and broadcast to it. Broadcast
-    ** since we don't know which thread (if there are more
-    ** than one). This sounds risky, but clients must
-    ** test their invariants when resumed from a wait and
-    ** I don't expect very many threads to be waiting on
-    ** a single condition and I don't expect interrupt to
-    ** be used very often.
-    **
-    ** I don't know why I thought this would work. Must have
-    ** been one of those weaker momements after I'd been
-    ** smelling the vapors.
-    **
-    ** Even with the followng changes it is possible that
-    ** the pointer to the condition variable is pointing
-    ** at a bogus value. Will the unerlying code detect
-    ** that?
-    */
-    PRCondVar *cv;
-    PR_ASSERT(NULL != thred);
-    if (NULL == thred) return PR_FAILURE;
-
-    thred->state |= PT_THREAD_ABORTED;
-
-    cv = thred->waiting;
-    if ((NULL != cv) && !thred->interrupt_blocked)
-    {
-        PRIntn rv;
-        (void)PR_AtomicIncrement(&cv->notify_pending);
-        rv = pthread_cond_broadcast(&cv->cv);
-        PR_ASSERT(0 == rv);
-        if (0 > PR_AtomicDecrement(&cv->notify_pending))
-            PR_DestroyCondVar(cv);
-    }
-    return PR_SUCCESS;
-}  /* PR_Interrupt */
-
-PR_IMPLEMENT(void) PR_ClearInterrupt(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    me->state &= ~PT_THREAD_ABORTED;
-}  /* PR_ClearInterrupt */
-
-PR_IMPLEMENT(void) PR_BlockInterrupt(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    _PT_THREAD_BLOCK_INTERRUPT(me);
-}  /* PR_BlockInterrupt */
-
-PR_IMPLEMENT(void) PR_UnblockInterrupt(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    _PT_THREAD_UNBLOCK_INTERRUPT(me);
-}  /* PR_UnblockInterrupt */
-
-PR_IMPLEMENT(PRStatus) PR_Yield(void)
-{
-    static PRBool warning = PR_TRUE;
-    if (warning) warning = _PR_Obsolete(
-        "PR_Yield()", "PR_Sleep(PR_INTERVAL_NO_WAIT)");
-    return PR_Sleep(PR_INTERVAL_NO_WAIT);
-}
-
-PR_IMPLEMENT(PRStatus) PR_Sleep(PRIntervalTime ticks)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (PR_INTERVAL_NO_WAIT == ticks)
-    {
-        _PT_PTHREAD_YIELD();
-    }
-    else
-    {
-        PRCondVar *cv;
-        PRIntervalTime timein;
-
-        timein = PR_IntervalNow();
-        cv = PR_NewCondVar(_pr_sleeplock);
-        PR_ASSERT(cv != NULL);
-        PR_Lock(_pr_sleeplock);
-        do
-        {
-            PRIntervalTime now = PR_IntervalNow();
-            PRIntervalTime delta = now - timein;
-            if (delta > ticks) break;
-            rv = PR_WaitCondVar(cv, ticks - delta);
-        } while (PR_SUCCESS == rv);
-        PR_Unlock(_pr_sleeplock);
-        PR_DestroyCondVar(cv);
-    }
-    return rv;
-}  /* PR_Sleep */
-
-static void _pt_thread_death(void *arg)
-{
-    PRThread *thred = (PRThread*)arg;
-
-    if (thred->state & (PT_THREAD_FOREIGN|PT_THREAD_PRIMORD))
-    {
-        PR_Lock(pt_book.ml);
-        if (NULL == thred->prev)
-            pt_book.first = thred->next;
-        else
-            thred->prev->next = thred->next;
-        if (NULL == thred->next)
-            pt_book.last = thred->prev;
-        else
-            thred->next->prev = thred->prev;
-        PR_Unlock(pt_book.ml);
-    }
-    _PR_DestroyThreadPrivate(thred);
-    PR_Free(thred->privateData);
-    if (NULL != thred->errorString)
-        PR_Free(thred->errorString);
-    PR_Free(thred->stack);
-    if (NULL != thred->syspoll_list)
-        PR_Free(thred->syspoll_list);
-#if defined(_PR_POLL_WITH_SELECT)
-    if (NULL != thred->selectfd_list)
-        PR_Free(thred->selectfd_list);
-#endif
-#if defined(DEBUG)
-    memset(thred, 0xaf, sizeof(PRThread));
-#endif /* defined(DEBUG) */
-    PR_Free(thred);
-}  /* _pt_thread_death */
-
-void _PR_InitThreads(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs)
-{
-    int rv;
-    PRThread *thred;
-
-#ifdef _PR_NEED_PTHREAD_INIT
-    /*
-     * On BSD/OS (3.1 and 4.0), the pthread subsystem is lazily
-     * initialized, but pthread_self() fails to initialize
-     * pthreads and hence returns a null thread ID if invoked
-     * by the primordial thread before any other pthread call.
-     * So we explicitly initialize pthreads here.
-     */
-    pthread_init();
-#endif
-
-#if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-#if defined(FREEBSD)
-    {
-    pthread_attr_t attr;
-    int policy;
-    /* get the min and max priorities of the default policy */
-    pthread_attr_init(&attr);
-    pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
-    pthread_attr_getschedpolicy(&attr, &policy);
-    pt_book.minPrio = sched_get_priority_min(policy);
-    PR_ASSERT(-1 != pt_book.minPrio);
-    pt_book.maxPrio = sched_get_priority_max(policy);
-    PR_ASSERT(-1 != pt_book.maxPrio);
-    pthread_attr_destroy(&attr);
-    }
-#else
-    /*
-    ** These might be function evaluations
-    */
-    pt_book.minPrio = PT_PRIO_MIN;
-    pt_book.maxPrio = PT_PRIO_MAX;
-#endif
-#endif
-    
-    PR_ASSERT(NULL == pt_book.ml);
-    pt_book.ml = PR_NewLock();
-    PR_ASSERT(NULL != pt_book.ml);
-    pt_book.cv = PR_NewCondVar(pt_book.ml);
-    PR_ASSERT(NULL != pt_book.cv);
-    thred = PR_NEWZAP(PRThread);
-    PR_ASSERT(NULL != thred);
-    thred->arg = NULL;
-    thred->startFunc = NULL;
-    thred->priority = priority;
-    thred->id = pthread_self();
-
-    thred->state = (PT_THREAD_DETACHED | PT_THREAD_PRIMORD);
-    if (PR_SYSTEM_THREAD == type)
-    {
-        thred->state |= PT_THREAD_SYSTEM;
-        pt_book.system += 1;
-	    pt_book.this_many = 0;
-    }
-    else
-    {
-	    pt_book.user += 1;
-	    pt_book.this_many = 1;
-    }
-    thred->next = thred->prev = NULL;
-    pt_book.first = pt_book.last = thred;
-
-    thred->stack = PR_NEWZAP(PRThreadStack);
-    PR_ASSERT(thred->stack != NULL);
-    thred->stack->stackSize = 0;
-    thred->stack->thr = thred;
-	_PR_InitializeStack(thred->stack);
-
-    /*
-     * Create a key for our use to store a backpointer in the pthread
-     * to our PRThread object. This object gets deleted when the thread
-     * returns from its root in the case of a detached thread. Other
-     * threads delete the objects in Join.
-     *
-     * NB: The destructor logic seems to have a bug so it isn't used.
-     * NBB: Oh really? I'm going to give it a spin - AOF 19 June 1998.
-     * More info - the problem is that pthreads calls the destructor
-     * eagerly as the thread returns from its root, rather than lazily
-     * after the thread is joined. Therefore, threads that are joining
-     * and holding PRThread references are actually holding pointers to
-     * nothing.
-     */
-    rv = _PT_PTHREAD_KEY_CREATE(&pt_book.key, _pt_thread_death);
-    PR_ASSERT(0 == rv);
-    rv = pthread_setspecific(pt_book.key, thred);
-    PR_ASSERT(0 == rv);    
-    PR_SetThreadPriority(thred, priority);
-}  /* _PR_InitThreads */
-
-PR_IMPLEMENT(PRStatus) PR_Cleanup(void)
-{
-    PRThread *me = PR_GetCurrentThread();
-    int rv;
-    PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("PR_Cleanup: shutting down NSPR"));
-    PR_ASSERT(me->state & PT_THREAD_PRIMORD);
-    if (me->state & PT_THREAD_PRIMORD)
-    {
-        PR_Lock(pt_book.ml);
-        while (pt_book.user > pt_book.this_many)
-            PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(pt_book.ml);
-
-        _PR_CleanupMW();
-        _PR_CleanupCallOnce();
-        _PR_LogCleanup();
-        _PR_CleanupNet();
-        /* Close all the fd's before calling _PR_CleanupIO */
-        _PR_CleanupIO();
-
-        _pt_thread_death(me);
-        rv = pthread_setspecific(pt_book.key, NULL);
-        PR_ASSERT(0 == rv);
-        /*
-         * I am not sure if it's safe to delete the cv and lock here,
-         * since there may still be "system" threads around. If this
-         * call isn't immediately prior to exiting, then there's a
-         * problem.
-         */
-        if (0 == pt_book.system)
-        {
-            PR_DestroyCondVar(pt_book.cv); pt_book.cv = NULL;
-            PR_DestroyLock(pt_book.ml); pt_book.ml = NULL;
-        }
-        PR_DestroyLock(_pr_sleeplock);
-        _pr_sleeplock = NULL;
-        _PR_CleanupLayerCache();
-#ifdef _PR_ZONE_ALLOCATOR
-        _PR_DestroyZones();
-#endif
-        _pr_initialized = PR_FALSE;
-        return PR_SUCCESS;
-    }
-    return PR_FAILURE;
-}  /* PR_Cleanup */
-
-PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status)
-{
-    _exit(status);
-}
-
-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
-{
-#if defined(_PR_DCETHREADS)
-    return (PRUint32)&thred->id;  /* this is really a sham! */
-#else
-    return (PRUint32)thred->id;  /* and I don't know what they will do with it */
-#endif
-}
-
-/*
- * $$$
- * The following two thread-to-processor affinity functions are not
- * yet implemented for pthreads.  By the way, these functions should return
- * PRStatus rather than PRInt32 to indicate the success/failure status.
- * $$$
- */
-
-PR_IMPLEMENT(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask)
-{
-    return 0;  /* not implemented */
-}
-
-PR_IMPLEMENT(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask )
-{
-    return 0;  /* not implemented */
-}
-
-PR_IMPLEMENT(void)
-PR_SetThreadDumpProc(PRThread* thread, PRThreadDumpProc dump, void *arg)
-{
-    thread->dump = dump;
-    thread->dumpArg = arg;
-}
-
-/* 
- * Garbage collection support follows.
- */
-
-#if defined(_PR_DCETHREADS)
-
-/*
- * statics for Garbage Collection support.  We don't need to protect these
- * signal masks since the garbage collector itself is protected by a lock
- * and multiple threads will not be garbage collecting at the same time.
- */
-static sigset_t javagc_vtalarm_sigmask;
-static sigset_t javagc_intsoff_sigmask;
-
-#else /* defined(_PR_DCETHREADS) */
-
-/* a bogus signal mask for forcing a timed wait */
-/* Not so bogus in AIX as we really do a sigwait */
-static sigset_t sigwait_set;
-
-static struct timespec onemillisec = {0, 1000000L};
-#ifndef PT_NO_SIGTIMEDWAIT
-static struct timespec hundredmillisec = {0, 100000000L};
-#endif
-
-static void suspend_signal_handler(PRIntn sig);
-
-#ifdef PT_NO_SIGTIMEDWAIT
-static void null_signal_handler(PRIntn sig);
-#endif
-
-#endif /* defined(_PR_DCETHREADS) */
-
-/*
- * Linux pthreads use SIGUSR1 and SIGUSR2 internally, which
- * conflict with the use of these two signals in our GC support.
- * So we don't know how to support GC on Linux pthreads.
- */
-static void init_pthread_gc_support(void)
-{
-    PRIntn rv;
-
-#if defined(_PR_DCETHREADS)
-	rv = sigemptyset(&javagc_vtalarm_sigmask);
-    PR_ASSERT(0 == rv);
-	rv = sigaddset(&javagc_vtalarm_sigmask, SIGVTALRM);
-    PR_ASSERT(0 == rv);
-#else  /* defined(_PR_DCETHREADS) */
-	{
-	    struct sigaction sigact_usr2;
-
-	    sigact_usr2.sa_handler = suspend_signal_handler;
-	    sigact_usr2.sa_flags = SA_RESTART;
-	    sigemptyset (&sigact_usr2.sa_mask);
-
-        rv = sigaction (SIGUSR2, &sigact_usr2, NULL);
-        PR_ASSERT(0 == rv);
-
-        sigemptyset (&sigwait_set);
-#if defined(PT_NO_SIGTIMEDWAIT)
-        sigaddset (&sigwait_set, SIGUSR1);
-#else
-        sigaddset (&sigwait_set, SIGUSR2);
-#endif  /* defined(PT_NO_SIGTIMEDWAIT) */
-	}
-#if defined(PT_NO_SIGTIMEDWAIT)
-	{
-	    struct sigaction sigact_null;
-	    sigact_null.sa_handler = null_signal_handler;
-	    sigact_null.sa_flags = SA_RESTART;
-	    sigemptyset (&sigact_null.sa_mask);
-        rv = sigaction (SIGUSR1, &sigact_null, NULL);
-	    PR_ASSERT(0 ==rv); 
-    }
-#endif  /* defined(PT_NO_SIGTIMEDWAIT) */
-#endif /* defined(_PR_DCETHREADS) */
-}
-
-PR_IMPLEMENT(void) PR_SetThreadGCAble(void)
-{
-    PR_Lock(pt_book.ml);
-	PR_GetCurrentThread()->state |= PT_THREAD_GCABLE;
-    PR_Unlock(pt_book.ml);
-}
-
-PR_IMPLEMENT(void) PR_ClearThreadGCAble(void)
-{
-    PR_Lock(pt_book.ml);
-	PR_GetCurrentThread()->state &= (~PT_THREAD_GCABLE);
-    PR_Unlock(pt_book.ml);
-}
-
-#if defined(DEBUG)
-static PRBool suspendAllOn = PR_FALSE;
-#endif
-
-static PRBool suspendAllSuspended = PR_FALSE;
-
-PR_IMPLEMENT(PRStatus) PR_EnumerateThreads(PREnumerator func, void *arg)
-{
-    PRIntn count = 0;
-    PRStatus rv = PR_SUCCESS;
-    PRThread* thred = pt_book.first;
-    PRThread *me = PR_GetCurrentThread();
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_EnumerateThreads\n"));
-    /*
-     * $$$
-     * Need to suspend all threads other than me before doing this.
-     * This is really a gross and disgusting thing to do. The only
-     * good thing is that since all other threads are suspended, holding
-     * the lock during a callback seems like child's play.
-     * $$$
-     */
-    PR_ASSERT(suspendAllOn);
-
-    while (thred != NULL)
-    {
-        /* Steve Morse, 4-23-97: Note that we can't walk a queue by taking
-         * qp->next after applying the function "func".  In particular, "func"
-         * might remove the thread from the queue and put it into another one in
-         * which case qp->next no longer points to the next entry in the original
-         * queue.
-         *
-         * To get around this problem, we save qp->next in qp_next before applying
-         * "func" and use that saved value as the next value after applying "func".
-         */
-        PRThread* next = thred->next;
-
-        if (_PT_IS_GCABLE_THREAD(thred))
-        {
-#if !defined(_PR_DCETHREADS)
-            PR_ASSERT((thred == me) || (thred->suspend & PT_THREAD_SUSPENDED));
-#endif
-            PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-                   ("In PR_EnumerateThreads callback thread %p thid = %X\n", 
-                    thred, thred->id));
-
-            rv = func(thred, count++, arg);
-            if (rv != PR_SUCCESS)
-                return rv;
-        }
-        thred = next;
-    }
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("End PR_EnumerateThreads count = %d \n", count));
-    return rv;
-}  /* PR_EnumerateThreads */
-
-/*
- * PR_SuspendAll and PR_ResumeAll are called during garbage collection.  The strategy 
- * we use is to send a SIGUSR2 signal to every gc able thread that we intend to suspend.
- * The signal handler will record the stack pointer and will block until resumed by
- * the resume call.  Since the signal handler is the last routine called for the
- * suspended thread, the stack pointer will also serve as a place where all the
- * registers have been saved on the stack for the previously executing routines.
- *
- * Through global variables, we also make sure that PR_Suspend and PR_Resume does not
- * proceed until the thread is suspended or resumed.
- */
-
-#if !defined(_PR_DCETHREADS)
-
-/*
- * In the signal handler, we can not use condition variable notify or wait.
- * This does not work consistently across all pthread platforms.  We also can not 
- * use locking since that does not seem to work reliably across platforms.
- * Only thing we can do is yielding while testing for a global condition
- * to change.  This does work on pthread supported platforms.  We may have
- * to play with priortities if there are any problems detected.
- */
-
- /* 
-  * In AIX, you cannot use ANY pthread calls in the signal handler except perhaps
-  * pthread_yield. But that is horribly inefficient. Hence we use only sigwait, no
-  * sigtimedwait is available. We need to use another user signal, SIGUSR1. Actually
-  * SIGUSR1 is also used by exec in Java. So our usage here breaks the exec in Java,
-  * for AIX. You cannot use pthread_cond_wait or pthread_delay_np in the signal
-  * handler as all synchronization mechanisms just break down. 
-  */
-
-#if defined(PT_NO_SIGTIMEDWAIT)
-static void null_signal_handler(PRIntn sig)
-{
-	return;
-}
-#endif
-
-static void suspend_signal_handler(PRIntn sig)
-{
-	PRThread *me = PR_GetCurrentThread();
-
-	PR_ASSERT(me != NULL);
-	PR_ASSERT(_PT_IS_GCABLE_THREAD(me));
-	PR_ASSERT((me->suspend & PT_THREAD_SUSPENDED) == 0);
-
-	PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-        ("Begin suspend_signal_handler thred %p thread id = %X\n", 
-		me, me->id));
-
-	/*
-	 * save stack pointer
-	 */
-	me->sp = &me;
-
-	/* 
-	   At this point, the thread's stack pointer has been saved,
-	   And it is going to enter a wait loop until it is resumed.
-	   So it is _really_ suspended 
-	*/
-
-	me->suspend |= PT_THREAD_SUSPENDED;
-
-	/*
-	 * now, block current thread
-	 */
-#if defined(PT_NO_SIGTIMEDWAIT)
-	pthread_cond_signal(&me->suspendResumeCV);
-	while (me->suspend & PT_THREAD_SUSPENDED)
-	{
-#if !defined(FREEBSD) && !defined(NETBSD) && !defined(OPENBSD) \
-    && !defined(BSDI) && !defined(VMS) && !defined(UNIXWARE) \
-    && !defined(DARWIN) && !defined(RISCOS) /*XXX*/
-        PRIntn rv;
-	    sigwait(&sigwait_set, &rv);
-#endif
-	}
-	me->suspend |= PT_THREAD_RESUMED;
-	pthread_cond_signal(&me->suspendResumeCV);
-#else /* defined(PT_NO_SIGTIMEDWAIT) */
-	while (me->suspend & PT_THREAD_SUSPENDED)
-	{
-		PRIntn rv = sigtimedwait(&sigwait_set, NULL, &hundredmillisec);
-    	PR_ASSERT(-1 == rv);
-	}
-	me->suspend |= PT_THREAD_RESUMED;
-#endif
-
-    /*
-     * At this point, thread has been resumed, so set a global condition.
-     * The ResumeAll needs to know that this has really been resumed. 
-     * So the signal handler sets a flag which PR_ResumeAll will reset. 
-     * The PR_ResumeAll must reset this flag ...
-     */
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-        ("End suspend_signal_handler thred = %p tid = %X\n", me, me->id));
-}  /* suspend_signal_handler */
-
-static void pt_SuspendSet(PRThread *thred)
-{
-    PRIntn rv;
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("pt_SuspendSet thred %p thread id = %X\n", thred, thred->id));
-
-
-    /*
-     * Check the thread state and signal the thread to suspend
-     */
-
-    PR_ASSERT((thred->suspend & PT_THREAD_SUSPENDED) == 0);
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("doing pthread_kill in pt_SuspendSet thred %p tid = %X\n",
-	   thred, thred->id));
-#if defined(VMS)
-    rv = thread_suspend(thred);
-#else
-    rv = pthread_kill (thred->id, SIGUSR2);
-#endif
-    PR_ASSERT(0 == rv);
-}
-
-static void pt_SuspendTest(PRThread *thred)
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("Begin pt_SuspendTest thred %p thread id = %X\n", thred, thred->id));
-
-
-    /*
-     * Wait for the thread to be really suspended. This happens when the
-     * suspend signal handler stores the stack pointer and sets the state
-     * to suspended. 
-     */
-
-#if defined(PT_NO_SIGTIMEDWAIT)
-    pthread_mutex_lock(&thred->suspendResumeMutex);
-    while ((thred->suspend & PT_THREAD_SUSPENDED) == 0)
-    {
-	    pthread_cond_timedwait(
-	        &thred->suspendResumeCV, &thred->suspendResumeMutex, &onemillisec);
-	}
-	pthread_mutex_unlock(&thred->suspendResumeMutex);
-#else
-    while ((thred->suspend & PT_THREAD_SUSPENDED) == 0)
-    {
-		PRIntn rv = sigtimedwait(&sigwait_set, NULL, &onemillisec);
-    	PR_ASSERT(-1 == rv);
-	}
-#endif
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS,
-        ("End pt_SuspendTest thred %p tid %X\n", thred, thred->id));
-}  /* pt_SuspendTest */
-
-static void pt_ResumeSet(PRThread *thred)
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("pt_ResumeSet thred %p thread id = %X\n", thred, thred->id));
-
-    /*
-     * Clear the global state and set the thread state so that it will
-     * continue past yield loop in the suspend signal handler
-     */
-
-    PR_ASSERT(thred->suspend & PT_THREAD_SUSPENDED);
-
-
-    thred->suspend &= ~PT_THREAD_SUSPENDED;
-
-#if defined(PT_NO_SIGTIMEDWAIT)
-#if defined(VMS)
-	thread_resume(thred);
-#else
-	pthread_kill(thred->id, SIGUSR1);
-#endif
-#endif
-
-}  /* pt_ResumeSet */
-
-static void pt_ResumeTest(PRThread *thred)
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	   ("Begin pt_ResumeTest thred %p thread id = %X\n", thred, thred->id));
-
-    /*
-     * Wait for the threads resume state to change
-     * to indicate it is really resumed 
-     */
-#if defined(PT_NO_SIGTIMEDWAIT)
-    pthread_mutex_lock(&thred->suspendResumeMutex);
-    while ((thred->suspend & PT_THREAD_RESUMED) == 0)
-    {
-	    pthread_cond_timedwait(
-	        &thred->suspendResumeCV, &thred->suspendResumeMutex, &onemillisec);
-    }
-    pthread_mutex_unlock(&thred->suspendResumeMutex);
-#else
-    while ((thred->suspend & PT_THREAD_RESUMED) == 0) {
-		PRIntn rv = sigtimedwait(&sigwait_set, NULL, &onemillisec);
-    	PR_ASSERT(-1 == rv);
-	}
-#endif
-
-    thred->suspend &= ~PT_THREAD_RESUMED;
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, (
-        "End pt_ResumeTest thred %p tid %X\n", thred, thred->id));
-}  /* pt_ResumeTest */
-
-static pthread_once_t pt_gc_support_control = PTHREAD_ONCE_INIT;
-
-PR_IMPLEMENT(void) PR_SuspendAll(void)
-{
-#ifdef DEBUG
-    PRIntervalTime stime, etime;
-#endif
-    PRThread* thred = pt_book.first;
-    PRThread *me = PR_GetCurrentThread();
-    int rv;
-
-    rv = pthread_once(&pt_gc_support_control, init_pthread_gc_support);
-    PR_ASSERT(0 == rv);
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_SuspendAll\n"));
-    /*
-     * Stop all threads which are marked GC able.
-     */
-    PR_Lock(pt_book.ml);
-#ifdef DEBUG
-    suspendAllOn = PR_TRUE;
-    stime = PR_IntervalNow();
-#endif
-    while (thred != NULL)
-    {
-	    if ((thred != me) && _PT_IS_GCABLE_THREAD(thred))
-    		pt_SuspendSet(thred);
-        thred = thred->next;
-    }
-
-    /* Wait till they are really suspended */
-    thred = pt_book.first;
-    while (thred != NULL)
-    {
-	    if ((thred != me) && _PT_IS_GCABLE_THREAD(thred))
-            pt_SuspendTest(thred);
-        thred = thred->next;
-    }
-
-    suspendAllSuspended = PR_TRUE;
-
-#ifdef DEBUG
-    etime = PR_IntervalNow();
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS,\
-        ("End PR_SuspendAll (time %dms)\n",
-        PR_IntervalToMilliseconds(etime - stime)));
-#endif
-}  /* PR_SuspendAll */
-
-PR_IMPLEMENT(void) PR_ResumeAll(void)
-{
-#ifdef DEBUG
-    PRIntervalTime stime, etime;
-#endif
-    PRThread* thred = pt_book.first;
-    PRThread *me = PR_GetCurrentThread();
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_ResumeAll\n"));
-    /*
-     * Resume all previously suspended GC able threads.
-     */
-    suspendAllSuspended = PR_FALSE;
-#ifdef DEBUG
-    stime = PR_IntervalNow();
-#endif
-
-    while (thred != NULL)
-    {
-	    if ((thred != me) && _PT_IS_GCABLE_THREAD(thred))
-    	    pt_ResumeSet(thred);
-        thred = thred->next;
-    }
-
-    thred = pt_book.first;
-    while (thred != NULL)
-    {
-	    if ((thred != me) && _PT_IS_GCABLE_THREAD(thred))
-    	    pt_ResumeTest(thred);
-        thred = thred->next;
-    }
-
-    PR_Unlock(pt_book.ml);
-#ifdef DEBUG
-    suspendAllOn = PR_FALSE;
-    etime = PR_IntervalNow();
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS,
-        ("End PR_ResumeAll (time %dms)\n",
-        PR_IntervalToMilliseconds(etime - stime)));
-#endif
-}  /* PR_ResumeAll */
-
-/* Return the stack pointer for the given thread- used by the GC */
-PR_IMPLEMENT(void *)PR_GetSP(PRThread *thred)
-{
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, 
-	    ("in PR_GetSP thred %p thid = %X, sp = %p\n", 
-	    thred, thred->id, thred->sp));
-    return thred->sp;
-}  /* PR_GetSP */
-
-#else /* !defined(_PR_DCETHREADS) */
-
-static pthread_once_t pt_gc_support_control = pthread_once_init;
-
-/*
- * For DCE threads, there is no pthread_kill or a way of suspending or resuming a
- * particular thread.  We will just disable the preemption (virtual timer alarm) and
- * let the executing thread finish the garbage collection.  This stops all other threads
- * (GC able or not) and is very inefficient but there is no other choice.
- */
-PR_IMPLEMENT(void) PR_SuspendAll()
-{
-    PRIntn rv;
-
-    rv = pthread_once(&pt_gc_support_control, init_pthread_gc_support);
-    PR_ASSERT(0 == rv);  /* returns -1 on failure */
-#ifdef DEBUG
-    suspendAllOn = PR_TRUE;
-#endif
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_SuspendAll\n"));
-    /* 
-     * turn off preemption - i.e add virtual alarm signal to the set of 
-     * blocking signals 
-     */
-    rv = sigprocmask(
-        SIG_BLOCK, &javagc_vtalarm_sigmask, &javagc_intsoff_sigmask);
-    PR_ASSERT(0 == rv);
-    suspendAllSuspended = PR_TRUE;
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End PR_SuspendAll\n"));
-}  /* PR_SuspendAll */
-
-PR_IMPLEMENT(void) PR_ResumeAll()
-{
-    PRIntn rv;
-    
-    suspendAllSuspended = PR_FALSE;
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_ResumeAll\n"));
-    /* turn on preemption - i.e re-enable virtual alarm signal */
-
-    rv = sigprocmask(SIG_SETMASK, &javagc_intsoff_sigmask, (sigset_t *)NULL);
-    PR_ASSERT(0 == rv);
-#ifdef DEBUG
-    suspendAllOn = PR_FALSE;
-#endif
-
-    PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End PR_ResumeAll\n"));
-}  /* PR_ResumeAll */
-
-/* Return the stack pointer for the given thread- used by the GC */
-PR_IMPLEMENT(void*)PR_GetSP(PRThread *thred)
-{
-	pthread_t tid = thred->id;
-	char *thread_tcb, *top_sp;
-
-	/*
-	 * For HPUX DCE threads, pthread_t is a struct with the
-	 * following three fields (see pthread.h, dce/cma.h):
-	 *     cma_t_address       field1;
-	 *     short int           field2;
-	 *     short int           field3;
-	 * where cma_t_address is typedef'd to be either void*
-	 * or char*.
-	 */
-	PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_GetSP\n"));
-	thread_tcb = (char*)tid.field1;
-	top_sp = *(char**)(thread_tcb + 128);
-	PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("End PR_GetSP %p \n", top_sp));
-	return top_sp;
-}  /* PR_GetSP */
-
-#endif /* !defined(_PR_DCETHREADS) */
-
-#endif  /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */
-
-/* ptthread.c */
diff --git a/libs/js/nsprpub/pr/src/threads/.cvsignore b/libs/js/nsprpub/pr/src/threads/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/threads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/threads/Makefile.in b/libs/js/nsprpub/pr/src/threads/Makefile.in
deleted file mode 100644
index 29ad099b20..0000000000
--- a/libs/js/nsprpub/pr/src/threads/Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifdef USE_PTHREADS
-    DIRS =
-else
-ifdef USE_BTHREADS
-    DIRS =
-else
-    DIRS = combined
-endif
-endif
-
-ifdef USE_PTHREADS
-CSRCS = \
-	prtpd.c \
-	$(NULL)
-else
-ifdef USE_BTHREADS
-CSRCS = \
-	prtpd.c \
-	$(NULL)
-else
-CSRCS =	\
-	prcthr.c \
-	prtpd.c \
-	$(NULL)
-endif
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/threads/combined/.cvsignore b/libs/js/nsprpub/pr/src/threads/combined/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/src/threads/combined/Makefile.in b/libs/js/nsprpub/pr/src/threads/combined/Makefile.in
deleted file mode 100644
index 476c6c9ad2..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-ifdef USE_PTHREADS
-CSRCS =         \
-	$(NULL)
-else
-CSRCS =         \
-    prucpu.c      \
-	prucv.c      \
-	prulock.c    \
-	pruthr.c     \
-    prustack.c    \
-	$(NULL)
-endif
-
-TARGETS	= $(OBJS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-DEFINES	+= -D_NSPR_BUILD_
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(TARGETS)
-
diff --git a/libs/js/nsprpub/pr/src/threads/combined/README b/libs/js/nsprpub/pr/src/threads/combined/README
deleted file mode 100644
index aa26665282..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/README
+++ /dev/null
@@ -1,62 +0,0 @@
-NSPR 2.0 evolution
-------------------
-
-
-Phase 1- today
-
-Currently (Oct 10, 1996) NSPR 2.0 has two modes.  Either _PR_NTHREAD 
-is defined, in which case the PR_CreateThread() call always creates a 
-native kernel thread, or _PR_NTHREAD is not defined and PR_CreateThread() 
-always creates user level threads within the single, original process.  This 
-source code is reflected in two directories, nspr20/pr/src/threads/native, and 
-nspr20/pr/src/threads/user.  Although the PR_CreateThread() function has
-a paramter to specify the "scope" of a thread, this parameter is not yet 
-used- except on solaris where it uses it to specify bound vs unbound threads.
-
-Phase 2 - next week
-
-The next step is to provide a combination of user and native threads.  The
-idea, of course, is to have some small number of native threads and each of 
-those threads be able to run user level threads.  The number of native
-threads created will most likely be proportional to the number of CPUs in
-the system.  For this reason, the specific set of native threads which are
-used to run the user-level threads will be called "CPU" threads.  
-
-The user level threads which will be run on the CPU threads are able to
-run on any of the CPU threads available, and over the course of a user-level
-thread's lifetime, it may drift from one CPU thread to another.  All 
-user-level threads will compete for processing time via a single run queue.
-
-Creation of a CPU thread will be primarily controlled by NSPR itself or by
-the user running a function PR_Concurrency().  The details of PR_Concurrency()
-have not yet been worked out; but the idea is that the user can specify to 
-NSPR how many CPU threads are desired.
-
-In this system, user-level threads are created by using PR_CreateThread() and
-specifying the PR_LOCAL_SCOPE option.  LOCAL_SCOPE indicates that the thread
-will be under the control of the "local" scheduler.  Creating threads with
-GLOBAL_SCOPE, on the other hand will create a thread which is under the 
-control of the system's scheduler.  In otherwords, this creates a native thread
-which is not a CPU thread; it runs a single thread task and never has more 
-than one task to run.  LOCAL_SCOPE is much like creating a Solaris unbound 
-thread, while GLOBAL_SCOPE is similar to creating a Solaris bound thread.
-
-To implement this architecture, the source code will still maintain the "user"
-and "native" directories which is has today.  However a third directory 
-"combined" will also exist.  To compile a version of NSPR which only creates
-native threads, the user can define _PR_NTHREAD.  For exclusive user-level
-threads, do not define _PR_NTHREAD.  To get the combined threads, define
-_PR_NTHREAD and _PR_USE_CPUS.
-
-
-Phase 3 - later than next week
-
-The goal is to eliminate the 3 directories.  Once these three models are in
-place, the remaining work will be to eliminate the native and user thread
-directories for all platforms, so that the entire thread model is contained
-within what is today called the "combined" model.  This new and glorious
-source code will attempt to make the "combined" model on any platforms which
-provide the necessary underlying native threading, but will also be 
-capable of using exclusive user-level threads on systems which don't have
-native threads.
-
diff --git a/libs/js/nsprpub/pr/src/threads/combined/prucpu.c b/libs/js/nsprpub/pr/src/threads/combined/prucpu.c
deleted file mode 100644
index a3938b1ffe..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/prucpu.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-_PRCPU *_pr_primordialCPU = NULL;
-
-PRInt32 _pr_md_idle_cpus;       /* number of idle cpus */
-/*
- * The idle threads in MxN models increment/decrement _pr_md_idle_cpus.
- * If _PR_HAVE_ATOMIC_OPS is not defined, they can't use the atomic
- * increment/decrement routines (which are based on PR_Lock/PR_Unlock),
- * because PR_Lock asserts that the calling thread is not an idle thread.
- * So we use a _MDLock to protect _pr_md_idle_cpus.
- */
-#if !defined(_PR_LOCAL_THREADS_ONLY) && !defined(_PR_GLOBAL_THREADS_ONLY)
-#ifndef _PR_HAVE_ATOMIC_OPS
-static _MDLock _pr_md_idle_cpus_lock;
-#endif
-#endif
-PRUintn _pr_numCPU;
-PRInt32 _pr_cpus_exit;
-PRInt32 _pr_cpu_affinity_mask = 0;
-
-#if !defined (_PR_GLOBAL_THREADS_ONLY)
-
-static PRUintn _pr_cpuID;
-
-static void PR_CALLBACK _PR_CPU_Idle(void *);
-
-static _PRCPU *_PR_CreateCPU(void);
-static PRStatus _PR_StartCPU(_PRCPU *cpu, PRThread *thread);
-
-#if !defined(_PR_LOCAL_THREADS_ONLY)
-static void _PR_RunCPU(void *arg);
-#endif
-
-void  _PR_InitCPUs()
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (_native_threads_only)
-        return;
-
-    _pr_cpuID = 0;
-    _MD_NEW_LOCK( &_pr_cpuLock);
-#if !defined(_PR_LOCAL_THREADS_ONLY) && !defined(_PR_GLOBAL_THREADS_ONLY)
-#ifndef _PR_HAVE_ATOMIC_OPS
-    _MD_NEW_LOCK(&_pr_md_idle_cpus_lock);
-#endif
-#endif
-
-#ifdef _PR_LOCAL_THREADS_ONLY
-
-#ifdef HAVE_CUSTOM_USER_THREADS
-    _PR_MD_CREATE_PRIMORDIAL_USER_THREAD(me);
-#endif
-
-    /* Now start the first CPU. */
-    _pr_primordialCPU = _PR_CreateCPU();
-    _pr_numCPU = 1;
-    _PR_StartCPU(_pr_primordialCPU, me);
-
-    _PR_MD_SET_CURRENT_CPU(_pr_primordialCPU);
-
-    /* Initialize cpu for current thread (could be different from me) */
-    _PR_MD_CURRENT_THREAD()->cpu = _pr_primordialCPU;
-
-    _PR_MD_SET_LAST_THREAD(me);
-
-#else /* Combined MxN model */
-
-    _pr_primordialCPU = _PR_CreateCPU();
-    _pr_numCPU = 1;
-    _PR_CreateThread(PR_SYSTEM_THREAD,
-                     _PR_RunCPU,
-                     _pr_primordialCPU,
-                     PR_PRIORITY_NORMAL,
-                     PR_GLOBAL_THREAD,
-                     PR_UNJOINABLE_THREAD,
-                     0,
-                     _PR_IDLE_THREAD);
-
-#endif /* _PR_LOCAL_THREADS_ONLY */
-
-    _PR_MD_INIT_CPUS();
-}
-
-#ifdef WINNT
-/*
- * Right now this function merely stops the CPUs and does
- * not do any other cleanup.
- *
- * It is only implemented for WINNT because bug 161998 only
- * affects the WINNT version of NSPR, but it would be nice
- * to implement this function for other platforms too.
- */
-void _PR_CleanupCPUs(void)
-{
-    PRUintn i;
-    PRCList *qp;
-    _PRCPU *cpu;
-
-    _pr_cpus_exit = 1;
-    for (i = 0; i < _pr_numCPU; i++) {
-        _PR_MD_WAKEUP_WAITER(NULL);
-    }
-    for (qp = _PR_CPUQ().next; qp != &_PR_CPUQ(); qp = qp->next) {
-        cpu = _PR_CPU_PTR(qp);
-        _PR_MD_JOIN_THREAD(&cpu->thread->md);
-    }
-}
-#endif
-
-static _PRCPUQueue *_PR_CreateCPUQueue(void)
-{
-    PRInt32 index;
-    _PRCPUQueue *cpuQueue;
-    cpuQueue = PR_NEWZAP(_PRCPUQueue);
- 
-    _MD_NEW_LOCK( &cpuQueue->runQLock );
-    _MD_NEW_LOCK( &cpuQueue->sleepQLock );
-    _MD_NEW_LOCK( &cpuQueue->miscQLock );
-
-    for (index = 0; index < PR_PRIORITY_LAST + 1; index++)
-        PR_INIT_CLIST( &(cpuQueue->runQ[index]) );
-    PR_INIT_CLIST( &(cpuQueue->sleepQ) );
-    PR_INIT_CLIST( &(cpuQueue->pauseQ) );
-    PR_INIT_CLIST( &(cpuQueue->suspendQ) );
-    PR_INIT_CLIST( &(cpuQueue->waitingToJoinQ) );
-
-    cpuQueue->numCPUs = 1;
-
-    return cpuQueue;
-}
-
-/*
- * Create a new CPU.
- *
- * This function initializes enough of the _PRCPU structure so
- * that it can be accessed safely by a global thread or another
- * CPU.  This function does not create the native thread that
- * will run the CPU nor does it initialize the parts of _PRCPU
- * that must be initialized by that native thread.
- *
- * The reason we cannot simply have the native thread create
- * and fully initialize a new CPU is that we need to be able to
- * create a usable _pr_primordialCPU in _PR_InitCPUs without
- * assuming that the primordial CPU thread we created can run
- * during NSPR initialization.  For example, on Windows while
- * new threads can be created by DllMain, they won't be able
- * to run during DLL initialization.  If NSPR is initialized
- * by DllMain, the primordial CPU thread won't run until DLL
- * initialization is finished.
- */
-static _PRCPU *_PR_CreateCPU(void)
-{
-    _PRCPU *cpu;
-
-    cpu = PR_NEWZAP(_PRCPU);
-    if (cpu) {
-        cpu->queue = _PR_CreateCPUQueue();
-        if (!cpu->queue) {
-            PR_DELETE(cpu);
-            return NULL;
-        }
-    }
-    return cpu;
-}
-
-/*
- * Start a new CPU.
- *
- * 'cpu' is a _PRCPU structure created by _PR_CreateCPU().
- * 'thread' is the native thread that will run the CPU.
- *
- * If this function fails, 'cpu' is destroyed.
- */
-static PRStatus _PR_StartCPU(_PRCPU *cpu, PRThread *thread)
-{
-    /*
-    ** Start a new cpu. The assumption this code makes is that the
-    ** underlying operating system creates a stack to go with the new
-    ** native thread. That stack will be used by the cpu when pausing.
-    */
-
-    PR_ASSERT(!_native_threads_only);
-
-    cpu->last_clock = PR_IntervalNow();
-
-    /* Before we create any threads on this CPU we have to
-     * set the current CPU 
-     */
-    _PR_MD_SET_CURRENT_CPU(cpu);
-    _PR_MD_INIT_RUNNING_CPU(cpu);
-    thread->cpu = cpu;
-
-    cpu->idle_thread = _PR_CreateThread(PR_SYSTEM_THREAD,
-                                        _PR_CPU_Idle,
-                                        (void *)cpu,
-                                        PR_PRIORITY_NORMAL,
-                                        PR_LOCAL_THREAD,
-                                        PR_UNJOINABLE_THREAD,
-                                        0,
-                                        _PR_IDLE_THREAD);
-
-    if (!cpu->idle_thread) {
-        /* didn't clean up CPU queue XXXMB */
-        PR_DELETE(cpu);
-        return PR_FAILURE;
-    } 
-    PR_ASSERT(cpu->idle_thread->cpu == cpu);
-
-    cpu->idle_thread->no_sched = 0;
-
-    cpu->thread = thread;
-
-    if (_pr_cpu_affinity_mask)
-        PR_SetThreadAffinityMask(thread, _pr_cpu_affinity_mask);
-
-    /* Created and started a new CPU */
-    _PR_CPU_LIST_LOCK();
-    cpu->id = _pr_cpuID++;
-    PR_APPEND_LINK(&cpu->links, &_PR_CPUQ());
-    _PR_CPU_LIST_UNLOCK();
-
-    return PR_SUCCESS;
-}
-
-#if !defined(_PR_GLOBAL_THREADS_ONLY) && !defined(_PR_LOCAL_THREADS_ONLY)
-/*
-** This code is used during a cpu's initial creation.
-*/
-static void _PR_RunCPU(void *arg)
-{
-    _PRCPU *cpu = (_PRCPU *)arg;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(NULL != me);
-
-    /*
-     * _PR_StartCPU calls _PR_CreateThread to create the
-     * idle thread.  Because _PR_CreateThread calls PR_Lock,
-     * the current thread has to remain a global thread
-     * during the _PR_StartCPU call so that it can wait for
-     * the lock if the lock is held by another thread.  If
-     * we clear the _PR_GLOBAL_SCOPE flag in
-     * _PR_MD_CREATE_PRIMORDIAL_THREAD, the current thread
-     * will be treated as a local thread and have trouble
-     * waiting for the lock because the CPU is not fully
-     * constructed yet.
-     *
-     * After the CPU is started, it is safe to mark the
-     * current thread as a local thread.
-     */
-
-#ifdef HAVE_CUSTOM_USER_THREADS
-    _PR_MD_CREATE_PRIMORDIAL_USER_THREAD(me);
-#endif
-
-    me->no_sched = 1;
-    _PR_StartCPU(cpu, me);
-
-#ifdef HAVE_CUSTOM_USER_THREADS
-    me->flags &= (~_PR_GLOBAL_SCOPE);
-#endif
-
-    _PR_MD_SET_CURRENT_CPU(cpu);
-    _PR_MD_SET_CURRENT_THREAD(cpu->thread);
-    me->cpu = cpu;
-
-    while(1) {
-        PRInt32 is;
-        if (!_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-	    _PR_MD_START_INTERRUPTS();
-        _PR_MD_SWITCH_CONTEXT(me);
-    }
-}
-#endif
-
-static void PR_CALLBACK _PR_CPU_Idle(void *_cpu)
-{
-    _PRCPU *cpu = (_PRCPU *)_cpu;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(NULL != me);
-
-    me->cpu = cpu;
-    cpu->idle_thread = me;
-    if (_MD_LAST_THREAD())
-        _MD_LAST_THREAD()->no_sched = 0;
-    if (!_PR_IS_NATIVE_THREAD(me)) _PR_MD_SET_INTSOFF(0);
-    while(1) {
-        PRInt32 is;
-        PRIntervalTime timeout;
-        if (!_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-
-        _PR_RUNQ_LOCK(cpu);
-#if !defined(_PR_LOCAL_THREADS_ONLY) && !defined(_PR_GLOBAL_THREADS_ONLY)
-#ifdef _PR_HAVE_ATOMIC_OPS
-        _PR_MD_ATOMIC_INCREMENT(&_pr_md_idle_cpus);
-#else
-        _PR_MD_LOCK(&_pr_md_idle_cpus_lock);
-        _pr_md_idle_cpus++;
-        _PR_MD_UNLOCK(&_pr_md_idle_cpus_lock);
-#endif /* _PR_HAVE_ATOMIC_OPS */
-#endif
-        /* If someone on runq; do a nonblocking PAUSECPU */
-        if (_PR_RUNQREADYMASK(me->cpu) != 0) {
-            _PR_RUNQ_UNLOCK(cpu);
-            timeout = PR_INTERVAL_NO_WAIT;
-        } else {
-            _PR_RUNQ_UNLOCK(cpu);
-
-            _PR_SLEEPQ_LOCK(cpu);
-            if (PR_CLIST_IS_EMPTY(&_PR_SLEEPQ(me->cpu))) {
-                timeout = PR_INTERVAL_NO_TIMEOUT;
-            } else {
-                PRThread *wakeThread;
-                wakeThread = _PR_THREAD_PTR(_PR_SLEEPQ(me->cpu).next);
-                timeout = wakeThread->sleep;
-            }
-            _PR_SLEEPQ_UNLOCK(cpu);
-        }
-
-        /* Wait for an IO to complete */
-        (void)_PR_MD_PAUSE_CPU(timeout);
-
-#ifdef WINNT
-        if (_pr_cpus_exit) {
-            /* _PR_CleanupCPUs tells us to exit */
-            _PR_MD_END_THREAD();
-        }
-#endif
-
-#if !defined(_PR_LOCAL_THREADS_ONLY) && !defined(_PR_GLOBAL_THREADS_ONLY)
-#ifdef _PR_HAVE_ATOMIC_OPS
-        _PR_MD_ATOMIC_DECREMENT(&_pr_md_idle_cpus);
-#else
-        _PR_MD_LOCK(&_pr_md_idle_cpus_lock);
-        _pr_md_idle_cpus--;
-        _PR_MD_UNLOCK(&_pr_md_idle_cpus_lock);
-#endif /* _PR_HAVE_ATOMIC_OPS */
-#endif
-
-		_PR_ClockInterrupt();
-
-		/* Now schedule any thread that is on the runq
-		 * INTS must be OFF when calling PR_Schedule()
-		 */
-		me->state = _PR_RUNNABLE;
-		_PR_MD_SWITCH_CONTEXT(me);
-		if (!_PR_IS_NATIVE_THREAD(me)) _PR_FAST_INTSON(is);
-    }
-}
-#endif /* _PR_GLOBAL_THREADS_ONLY */
-
-PR_IMPLEMENT(void) PR_SetConcurrency(PRUintn numCPUs)
-{
-#if defined(_PR_GLOBAL_THREADS_ONLY) || defined(_PR_LOCAL_THREADS_ONLY)
-#ifdef XP_MAC 
-#pragma unused(numCPUs) 
-#endif
-
-    /* do nothing */
-
-#else /* combined, MxN thread model */
-
-    PRUintn newCPU;
-    _PRCPU *cpu;
-    PRThread *thr;
-
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-	if (_native_threads_only)
-		return;
-    
-    _PR_CPU_LIST_LOCK();
-    if (_pr_numCPU < numCPUs) {
-        newCPU = numCPUs - _pr_numCPU;
-        _pr_numCPU = numCPUs;
-    } else newCPU = 0;
-    _PR_CPU_LIST_UNLOCK();
-
-    for (; newCPU; newCPU--) {
-        cpu = _PR_CreateCPU();
-        thr = _PR_CreateThread(PR_SYSTEM_THREAD,
-                              _PR_RunCPU,
-                              cpu,
-                              PR_PRIORITY_NORMAL,
-                              PR_GLOBAL_THREAD,
-                              PR_UNJOINABLE_THREAD,
-                              0,
-                              _PR_IDLE_THREAD);
-    }
-#endif
-}
-
-PR_IMPLEMENT(_PRCPU *) _PR_GetPrimordialCPU(void)
-{
-    if (_pr_primordialCPU)
-        return _pr_primordialCPU;
-    else
-        return _PR_MD_CURRENT_CPU();
-}
diff --git a/libs/js/nsprpub/pr/src/threads/combined/prucv.c b/libs/js/nsprpub/pr/src/threads/combined/prucv.c
deleted file mode 100644
index 80d919b890..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/prucv.c
+++ /dev/null
@@ -1,681 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#include "primpl.h"
-#include "prinrval.h"
-#include "prtypes.h"
-
-#if defined(WIN95)
-/*
-** Some local variables report warnings on Win95 because the code paths 
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-** 
-*/
-#pragma warning(disable : 4101)
-#endif
-
-
-/*
-** Notify one thread that it has finished waiting on a condition variable
-** Caller must hold the _PR_CVAR_LOCK(cv)
-*/
-PRBool _PR_NotifyThread (PRThread *thread, PRThread *me)
-{
-    PRBool rv;
-
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
-
-    _PR_THREAD_LOCK(thread);
-    PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-    if ( !_PR_IS_NATIVE_THREAD(thread) ) {
-        if (thread->wait.cvar != NULL) {
-            thread->wait.cvar = NULL;
-
-            _PR_SLEEPQ_LOCK(thread->cpu);
-            /* The notify and timeout can collide; in which case both may
-             * attempt to delete from the sleepQ; only let one do it.
-             */
-            if (thread->flags & (_PR_ON_SLEEPQ|_PR_ON_PAUSEQ))
-                _PR_DEL_SLEEPQ(thread, PR_TRUE);
-            _PR_SLEEPQ_UNLOCK(thread->cpu);
-
-	    if (thread->flags & _PR_SUSPENDING) {
-		/*
-		 * set thread state to SUSPENDED; a Resume operation
-		 * on the thread will move it to the runQ
-		 */
-            	thread->state = _PR_SUSPENDED;
-		_PR_MISCQ_LOCK(thread->cpu);
-		_PR_ADD_SUSPENDQ(thread, thread->cpu);
-		_PR_MISCQ_UNLOCK(thread->cpu);
-            	_PR_THREAD_UNLOCK(thread);
-	    } else {
-            	/* Make thread runnable */
-            	thread->state = _PR_RUNNABLE;
-            	_PR_THREAD_UNLOCK(thread);
-
-                _PR_AddThreadToRunQ(me, thread);
-                _PR_MD_WAKEUP_WAITER(thread);
-            }
-
-            rv = PR_TRUE;
-        } else {
-            /* Thread has already been notified */
-            _PR_THREAD_UNLOCK(thread);
-            rv = PR_FALSE;
-        }
-    } else { /* If the thread is a native thread */
-        if (thread->wait.cvar) {
-            thread->wait.cvar = NULL;
-
-	    if (thread->flags & _PR_SUSPENDING) {
-		/*
-		 * set thread state to SUSPENDED; a Resume operation
-		 * on the thread will enable the thread to run
-		 */
-            	thread->state = _PR_SUSPENDED;
-	     } else
-            	thread->state = _PR_RUNNING;
-            _PR_THREAD_UNLOCK(thread);
-            _PR_MD_WAKEUP_WAITER(thread);
-            rv = PR_TRUE;
-        } else {
-            _PR_THREAD_UNLOCK(thread);
-            rv = PR_FALSE;
-        }    
-    }    
-
-    return rv;
-}
-
-/*
- * Notify thread waiting on cvar; called when thread is interrupted
- * 	The thread lock is held on entry and released before return
- */
-void _PR_NotifyLockedThread (PRThread *thread)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRCondVar *cvar;
-    PRThreadPriority pri;
-
-    if ( !_PR_IS_NATIVE_THREAD(me))
-    	PR_ASSERT(_PR_MD_GET_INTSOFF() != 0);
-
-    cvar = thread->wait.cvar;
-    thread->wait.cvar = NULL;
-    _PR_THREAD_UNLOCK(thread);
-
-    _PR_CVAR_LOCK(cvar);
-    _PR_THREAD_LOCK(thread);
-
-    if (!_PR_IS_NATIVE_THREAD(thread)) {
-            _PR_SLEEPQ_LOCK(thread->cpu);
-            /* The notify and timeout can collide; in which case both may
-             * attempt to delete from the sleepQ; only let one do it.
-             */
-            if (thread->flags & (_PR_ON_SLEEPQ|_PR_ON_PAUSEQ))
-                _PR_DEL_SLEEPQ(thread, PR_TRUE);
-            _PR_SLEEPQ_UNLOCK(thread->cpu);
-
-	    /* Make thread runnable */
-	    pri = thread->priority;
-	    thread->state = _PR_RUNNABLE;
-
-	    PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-
-            _PR_AddThreadToRunQ(me, thread);
-            _PR_THREAD_UNLOCK(thread);
-
-            _PR_MD_WAKEUP_WAITER(thread);
-    } else {
-	    if (thread->flags & _PR_SUSPENDING) {
-		/*
-		 * set thread state to SUSPENDED; a Resume operation
-		 * on the thread will enable the thread to run
-		 */
-            	thread->state = _PR_SUSPENDED;
-	     } else
-            	thread->state = _PR_RUNNING;
-            _PR_THREAD_UNLOCK(thread);
-            _PR_MD_WAKEUP_WAITER(thread);
-    }    
-
-    _PR_CVAR_UNLOCK(cvar);
-    return;
-}
-
-/*
-** Make the given thread wait for the given condition variable
-*/
-PRStatus _PR_WaitCondVar(
-    PRThread *thread, PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout)
-{
-    PRIntn is;
-    PRStatus rv = PR_SUCCESS;
-
-    PR_ASSERT(thread == _PR_MD_CURRENT_THREAD());
-    PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    if (_PR_PENDING_INTERRUPT(thread)) {
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        thread->flags &= ~_PR_INTERRUPT;
-        return PR_FAILURE;
-    }
-
-    thread->wait.cvar = cvar;
-    lock->owner = NULL;
-    _PR_MD_WAIT_CV(&cvar->md,&lock->ilock, timeout);
-    thread->wait.cvar = NULL;
-    lock->owner = thread;
-    if (_PR_PENDING_INTERRUPT(thread)) {
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        thread->flags &= ~_PR_INTERRUPT;
-        return PR_FAILURE;
-    }
-
-    return PR_SUCCESS;
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-
-    if ( !_PR_IS_NATIVE_THREAD(thread))
-    	_PR_INTSOFF(is);
-
-    _PR_CVAR_LOCK(cvar);
-    _PR_THREAD_LOCK(thread);
-
-    if (_PR_PENDING_INTERRUPT(thread)) {
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        thread->flags &= ~_PR_INTERRUPT;
-    	_PR_CVAR_UNLOCK(cvar);
-    	_PR_THREAD_UNLOCK(thread);
-    	if ( !_PR_IS_NATIVE_THREAD(thread))
-    		_PR_INTSON(is);
-        return PR_FAILURE;
-    }
-
-    thread->state = _PR_COND_WAIT;
-    thread->wait.cvar = cvar;
-
-    /*
-    ** Put the caller thread on the condition variable's wait Q
-    */
-    PR_APPEND_LINK(&thread->waitQLinks, &cvar->condQ);
-
-    /* Note- for global scope threads, we don't put them on the
-     *       global sleepQ, so each global thread must put itself
-     *       to sleep only for the time it wants to.
-     */
-    if ( !_PR_IS_NATIVE_THREAD(thread) ) {
-        _PR_SLEEPQ_LOCK(thread->cpu);
-        _PR_ADD_SLEEPQ(thread, timeout);
-        _PR_SLEEPQ_UNLOCK(thread->cpu);
-    }
-    _PR_CVAR_UNLOCK(cvar);
-    _PR_THREAD_UNLOCK(thread);
-   
-    /* 
-    ** Release lock protecting the condition variable and thereby giving time 
-    ** to the next thread which can potentially notify on the condition variable
-    */
-    PR_Unlock(lock);
-
-    PR_LOG(_pr_cvar_lm, PR_LOG_MIN,
-	   ("PR_Wait: cvar=%p waiting for %d", cvar, timeout));
-
-    rv = _PR_MD_WAIT(thread, timeout);
-
-    _PR_CVAR_LOCK(cvar);
-    PR_REMOVE_LINK(&thread->waitQLinks);
-    _PR_CVAR_UNLOCK(cvar);
-
-    PR_LOG(_pr_cvar_lm, PR_LOG_MIN,
-	   ("PR_Wait: cvar=%p done waiting", cvar));
-
-    if ( !_PR_IS_NATIVE_THREAD(thread))
-    	_PR_INTSON(is);
-
-    /* Acquire lock again that we had just relinquished */
-    PR_Lock(lock);
-
-    if (_PR_PENDING_INTERRUPT(thread)) {
-        PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
-        thread->flags &= ~_PR_INTERRUPT;
-        return PR_FAILURE;
-    }
-
-    return rv;
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-void _PR_NotifyCondVar(PRCondVar *cvar, PRThread *me)
-{
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    _PR_MD_NOTIFY_CV(&cvar->md, &cvar->lock->ilock);
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-
-    PRCList *q;
-    PRIntn is;
-
-    if ( !_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSOFF(is);
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
-
-    _PR_CVAR_LOCK(cvar);
-    q = cvar->condQ.next;
-    while (q != &cvar->condQ) {
-#ifndef XP_MAC
-        PR_LOG(_pr_cvar_lm, PR_LOG_MIN, ("_PR_NotifyCondVar: cvar=%p", cvar));
-#endif
-        if (_PR_THREAD_CONDQ_PTR(q)->wait.cvar)  {
-            if (_PR_NotifyThread(_PR_THREAD_CONDQ_PTR(q), me) == PR_TRUE)
-                break;
-        }
-        q = q->next;
-    }
-    _PR_CVAR_UNLOCK(cvar);
-
-    if ( !_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSON(is);
-
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-/*
-** Cndition variable debugging log info.
-*/
-PRUint32 _PR_CondVarToString(PRCondVar *cvar, char *buf, PRUint32 buflen)
-{
-    PRUint32 nb;
-
-    if (cvar->lock->owner) {
-	nb = PR_snprintf(buf, buflen, "[%p] owner=%ld[%p]",
-			 cvar, cvar->lock->owner->id, cvar->lock->owner);
-    } else {
-	nb = PR_snprintf(buf, buflen, "[%p]", cvar);
-    }
-    return nb;
-}
-
-/*
-** Expire condition variable waits that are ready to expire. "now" is the current
-** time.
-*/
-void _PR_ClockInterrupt(void)
-{
-    PRThread *thread, *me = _PR_MD_CURRENT_THREAD();
-    _PRCPU *cpu = me->cpu;
-    PRIntervalTime elapsed, now;
- 
-    PR_ASSERT(_PR_MD_GET_INTSOFF() != 0);
-    /* Figure out how much time elapsed since the last clock tick */
-    now = PR_IntervalNow();
-    elapsed = now - cpu->last_clock;
-    cpu->last_clock = now;
-
-#ifndef XP_MAC
-    PR_LOG(_pr_clock_lm, PR_LOG_MAX,
-	   ("ExpireWaits: elapsed=%lld usec", elapsed));
-#endif
-
-    while(1) {
-        _PR_SLEEPQ_LOCK(cpu);
-        if (_PR_SLEEPQ(cpu).next == &_PR_SLEEPQ(cpu)) {
-            _PR_SLEEPQ_UNLOCK(cpu);
-            break;
-        }
-
-        thread = _PR_THREAD_PTR(_PR_SLEEPQ(cpu).next);
-        PR_ASSERT(thread->cpu == cpu);
-
-        if (elapsed < thread->sleep) {
-            thread->sleep -= elapsed;
-            _PR_SLEEPQMAX(thread->cpu) -= elapsed;
-            _PR_SLEEPQ_UNLOCK(cpu);
-            break;
-        }
-        _PR_SLEEPQ_UNLOCK(cpu);
-
-        PR_ASSERT(!_PR_IS_NATIVE_THREAD(thread));
-
-        _PR_THREAD_LOCK(thread);
-
-        if (thread->cpu != cpu) {
-            /*
-            ** The thread was switched to another CPU
-            ** between the time we unlocked the sleep
-            ** queue and the time we acquired the thread
-            ** lock, so it is none of our business now.
-            */
-            _PR_THREAD_UNLOCK(thread);
-            continue;
-        }
-
-        /*
-        ** Consume this sleeper's amount of elapsed time from the elapsed
-        ** time value. The next remaining piece of elapsed time will be
-        ** available for the next sleeping thread's timer.
-        */
-        _PR_SLEEPQ_LOCK(cpu);
-        PR_ASSERT(!(thread->flags & _PR_ON_PAUSEQ));
-        if (thread->flags & _PR_ON_SLEEPQ) {
-            _PR_DEL_SLEEPQ(thread, PR_FALSE);
-            elapsed -= thread->sleep;
-            _PR_SLEEPQ_UNLOCK(cpu);
-        } else {
-            /* Thread was already handled; Go get another one */
-            _PR_SLEEPQ_UNLOCK(cpu);
-            _PR_THREAD_UNLOCK(thread);
-            continue;
-        }
-
-        /* Notify the thread waiting on the condition variable */
-        if (thread->flags & _PR_SUSPENDING) {
-		PR_ASSERT((thread->state == _PR_IO_WAIT) ||
-				(thread->state == _PR_COND_WAIT));
-            /*
-            ** Thread is suspended and its condition timeout
-            ** expired. Transfer thread from sleepQ to suspendQ.
-            */
-            thread->wait.cvar = NULL;
-            _PR_MISCQ_LOCK(cpu);
-            thread->state = _PR_SUSPENDED;
-            _PR_ADD_SUSPENDQ(thread, cpu);
-            _PR_MISCQ_UNLOCK(cpu);
-        } else {
-            if (thread->wait.cvar) {
-                PRThreadPriority pri;
-
-                /* Do work very similar to what _PR_NotifyThread does */
-                PR_ASSERT( !_PR_IS_NATIVE_THREAD(thread) );
-
-                /* Make thread runnable */
-                pri = thread->priority;
-                thread->state = _PR_RUNNABLE;
-                PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-
-                PR_ASSERT(thread->cpu == cpu);
-                _PR_RUNQ_LOCK(cpu);
-                _PR_ADD_RUNQ(thread, cpu, pri);
-                _PR_RUNQ_UNLOCK(cpu);
-
-                if (pri > me->priority)
-                    _PR_SET_RESCHED_FLAG();
-
-                thread->wait.cvar = NULL;
-
-                _PR_MD_WAKEUP_WAITER(thread);
-
-            } else if (thread->io_pending == PR_TRUE) {
-                /* Need to put IO sleeper back on runq */
-                int pri = thread->priority;
-
-                thread->io_suspended = PR_TRUE;
-#ifdef WINNT
-				/*
-				 * For NT, record the cpu on which I/O was issued
-				 * I/O cancellation is done on the same cpu
-				 */
-                thread->md.thr_bound_cpu = cpu;
-#endif
-
-				PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-                PR_ASSERT(thread->cpu == cpu);
-                thread->state = _PR_RUNNABLE;
-                _PR_RUNQ_LOCK(cpu);
-                _PR_ADD_RUNQ(thread, cpu, pri);
-                _PR_RUNQ_UNLOCK(cpu);
-            }
-        }
-        _PR_THREAD_UNLOCK(thread);
-    }
-}
-
-/************************************************************************/
-
-/*
-** Create a new condition variable.
-** 	"lock" is the lock to use with the condition variable.
-**
-** Condition variables are synchronization objects that threads can use
-** to wait for some condition to occur.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-PR_IMPLEMENT(PRCondVar*) PR_NewCondVar(PRLock *lock)
-{
-    PRCondVar *cvar;
-
-    PR_ASSERT(lock != NULL);
-
-    cvar = PR_NEWZAP(PRCondVar);
-    if (cvar) {
-#ifdef _PR_GLOBAL_THREADS_ONLY
-	if(_PR_MD_NEW_CV(&cvar->md)) {
-		PR_DELETE(cvar);
-		PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-		return NULL;
-	}
-#endif
-        if (_PR_MD_NEW_LOCK(&(cvar->ilock)) == PR_FAILURE) {
-		PR_DELETE(cvar);
-		PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-		return NULL;
-	}
-    cvar->lock = lock;
-	PR_INIT_CLIST(&cvar->condQ);
-
-    } else {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-    }
-    return cvar;
-}
-
-/*
-** Destroy a condition variable. There must be no thread
-** waiting on the condvar. The caller is responsible for guaranteeing
-** that the condvar is no longer in use.
-**
-*/
-PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
-{
-    PR_ASSERT(cvar->condQ.next == &cvar->condQ);
-
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    _PR_MD_FREE_CV(&cvar->md);
-#endif
-    _PR_MD_FREE_LOCK(&(cvar->ilock));
- 
-    PR_DELETE(cvar);
-}
-
-/*
-** Wait for a notify on the condition variable. Sleep for "tiemout" amount
-** of ticks (if "timeout" is zero then the sleep is indefinite). While
-** the thread is waiting it unlocks lock. When the wait has
-** finished the thread regains control of the condition variable after
-** locking the associated lock.
-**
-** The thread waiting on the condvar will be resumed when the condvar is
-** notified (assuming the thread is the next in line to receive the
-** notify) or when the timeout elapses.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable or the thread has been interrupted.
-*/
-extern PRThread *suspendAllThread;
-PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	PR_ASSERT(cvar->lock->owner == me);
-	PR_ASSERT(me != suspendAllThread);
-    	if (cvar->lock->owner != me) return PR_FAILURE;
-
-	return _PR_WaitCondVar(me, cvar, cvar->lock, timeout);
-}
-
-/*
-** Notify the highest priority thread waiting on the condition
-** variable. If a thread is waiting on the condition variable (using
-** PR_Wait) then it is awakened and begins waiting on the lock.
-*/
-PR_IMPLEMENT(PRStatus) PR_NotifyCondVar(PRCondVar *cvar)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(cvar->lock->owner == me);
-    PR_ASSERT(me != suspendAllThread);
-    if (cvar->lock->owner != me) return PR_FAILURE;
-
-    _PR_NotifyCondVar(cvar, me);
-    return PR_SUCCESS;
-}
-
-/*
-** Notify all of the threads waiting on the condition variable. All of
-** threads are notified in turn. The highest priority thread will
-** probably acquire the lock.
-*/
-PR_IMPLEMENT(PRStatus) PR_NotifyAllCondVar(PRCondVar *cvar)
-{
-    PRCList *q;
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(cvar->lock->owner == me);
-    if (cvar->lock->owner != me) return PR_FAILURE;
-
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    _PR_MD_NOTIFYALL_CV(&cvar->md, &cvar->lock->ilock);
-    return PR_SUCCESS;
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-    if ( !_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSOFF(is);
-    _PR_CVAR_LOCK(cvar);
-    q = cvar->condQ.next;
-    while (q != &cvar->condQ) {
-		PR_LOG(_pr_cvar_lm, PR_LOG_MIN, ("PR_NotifyAll: cvar=%p", cvar));
-		_PR_NotifyThread(_PR_THREAD_CONDQ_PTR(q), me);
-		q = q->next;
-    }
-    _PR_CVAR_UNLOCK(cvar);
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSON(is);
-
-    return PR_SUCCESS;
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-
-/*********************************************************************/
-/*********************************************************************/
-/********************ROUTINES FOR DCE EMULATION***********************/
-/*********************************************************************/
-/*********************************************************************/
-#include "prpdce.h"
-
-PR_IMPLEMENT(PRCondVar*) PRP_NewNakedCondVar(void)
-{
-    PRCondVar *cvar = PR_NEWZAP(PRCondVar);
-    if (NULL != cvar)
-    {
-        if (_PR_MD_NEW_LOCK(&(cvar->ilock)) == PR_FAILURE)
-        {
-		    PR_DELETE(cvar); cvar = NULL;
-	    }
-	    else
-	    {
-	        PR_INIT_CLIST(&cvar->condQ);
-            cvar->lock = _PR_NAKED_CV_LOCK;
-	    }
-
-    }
-    return cvar;
-}
-
-PR_IMPLEMENT(void) PRP_DestroyNakedCondVar(PRCondVar *cvar)
-{
-    PR_ASSERT(cvar->condQ.next == &cvar->condQ);
-    PR_ASSERT(_PR_NAKED_CV_LOCK == cvar->lock);
-
-    _PR_MD_FREE_LOCK(&(cvar->ilock));
- 
-    PR_DELETE(cvar);
-}
-
-PR_IMPLEMENT(PRStatus) PRP_NakedWait(
-	PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PR_ASSERT(_PR_NAKED_CV_LOCK == cvar->lock);
-	return _PR_WaitCondVar(me, cvar, lock, timeout);
-}  /* PRP_NakedWait */
-
-PR_IMPLEMENT(PRStatus) PRP_NakedNotify(PRCondVar *cvar)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PR_ASSERT(_PR_NAKED_CV_LOCK == cvar->lock);
-
-    _PR_NotifyCondVar(cvar, me);
-
-    return PR_SUCCESS;
-}  /* PRP_NakedNotify */
-
-PR_IMPLEMENT(PRStatus) PRP_NakedBroadcast(PRCondVar *cvar)
-{
-    PRCList *q;
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PR_ASSERT(_PR_NAKED_CV_LOCK == cvar->lock);
-
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-	_PR_MD_LOCK( &(cvar->ilock) );
-    q = cvar->condQ.next;
-    while (q != &cvar->condQ) {
-		PR_LOG(_pr_cvar_lm, PR_LOG_MIN, ("PR_NotifyAll: cvar=%p", cvar));
-		_PR_NotifyThread(_PR_THREAD_CONDQ_PTR(q), me);
-		q = q->next;
-    }
-	_PR_MD_UNLOCK( &(cvar->ilock) );
-    if (!_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
-
-    return PR_SUCCESS;
-}  /* PRP_NakedBroadcast */
-
diff --git a/libs/js/nsprpub/pr/src/threads/combined/prulock.c b/libs/js/nsprpub/pr/src/threads/combined/prulock.c
deleted file mode 100644
index 5ede1c7b7d..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/prulock.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#if defined(WIN95)
-/*
-** Some local variables report warnings on Win95 because the code paths 
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-** 
-*/
-#pragma warning(disable : 4101)
-#endif
-
-
-void _PR_InitLocks(void)
-{
-	_PR_MD_INIT_LOCKS();
-}
-
-/*
-** Deal with delayed interrupts/requested reschedule during interrupt
-** re-enables.
-*/
-void _PR_IntsOn(_PRCPU *cpu)
-{
-    PRUintn missed, pri, i;
-    _PRInterruptTable *it;
-    PRThread *me;
-
-    PR_ASSERT(cpu);   /* Global threads don't have CPUs */
-    PR_ASSERT(_PR_MD_GET_INTSOFF() > 0);
-	me = _PR_MD_CURRENT_THREAD();
-#if !defined(XP_MAC)
-    PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
-#endif
-
-    /*
-    ** Process delayed interrupts. This logic is kinda scary because we
-    ** need to avoid losing an interrupt (it's ok to delay an interrupt
-    ** until later).
-    **
-    ** There are two missed state words. _pr_ints.where indicates to the
-    ** interrupt handler which state word is currently safe for
-    ** modification.
-    **
-    ** This code scans both interrupt state words, using the where flag
-    ** to indicate to the interrupt which state word is safe for writing.
-    ** If an interrupt comes in during a scan the other word will be
-    ** modified. This modification will be noticed during the next
-    ** iteration of the loop or during the next call to this routine.
-    */
-    for (i = 0; i < 2; i++) {
-        cpu->where = (1 - i);
-        missed = cpu->u.missed[i];
-        if (missed != 0) {
-            cpu->u.missed[i] = 0;
-            for (it = _pr_interruptTable; it->name; it++) {
-                if (missed & it->missed_bit) {
-#ifndef XP_MAC
-                    PR_LOG(_pr_sched_lm, PR_LOG_MIN,
-                           ("IntsOn[0]: %s intr", it->name));
-#endif
-                    (*it->handler)();
-                }
-            }
-        }
-    }
-
-    if (cpu->u.missed[3] != 0) {
-        _PRCPU *cpu;
-
-		_PR_THREAD_LOCK(me);
-        me->state = _PR_RUNNABLE;
-        pri = me->priority;
-
-        cpu = me->cpu;
-		_PR_RUNQ_LOCK(cpu);
-        _PR_ADD_RUNQ(me, cpu, pri);
-		_PR_RUNQ_UNLOCK(cpu);
-		_PR_THREAD_UNLOCK(me);
-        _PR_MD_SWITCH_CONTEXT(me);
-    }
-}
-
-/*
-** Unblock the first runnable waiting thread. Skip over
-** threads that are trying to be suspended
-** Note: Caller must hold _PR_LOCK_LOCK()
-*/
-void _PR_UnblockLockWaiter(PRLock *lock)
-{
-    PRThread *t = NULL;
-    PRThread *me;
-    PRCList *q;
-
-    q = lock->waitQ.next;
-    PR_ASSERT(q != &lock->waitQ);
-    while (q != &lock->waitQ) {
-        /* Unblock first waiter */
-        t = _PR_THREAD_CONDQ_PTR(q);
-
-		/* 
-		** We are about to change the thread's state to runnable and for local
-		** threads, we are going to assign a cpu to it.  So, protect thread's
-		** data structure.
-		*/
-        _PR_THREAD_LOCK(t);
-
-        if (t->flags & _PR_SUSPENDING) {
-            q = q->next;
-            _PR_THREAD_UNLOCK(t);
-            continue;
-        }
-
-        /* Found a runnable thread */
-	    PR_ASSERT(t->state == _PR_LOCK_WAIT);
-	    PR_ASSERT(t->wait.lock == lock);
-        t->wait.lock = 0;
-        PR_REMOVE_LINK(&t->waitQLinks);         /* take it off lock's waitQ */
-
-		/*
-		** If this is a native thread, nothing else to do except to wake it
-		** up by calling the machine dependent wakeup routine.
-		**
-		** If this is a local thread, we need to assign it a cpu and
-		** put the thread on that cpu's run queue.  There are two cases to
-		** take care of.  If the currently running thread is also a local
-		** thread, we just assign our own cpu to that thread and put it on
-		** the cpu's run queue.  If the the currently running thread is a
-		** native thread, we assign the primordial cpu to it (on NT,
-		** MD_WAKEUP handles the cpu assignment).  
-		*/
-		
-        if ( !_PR_IS_NATIVE_THREAD(t) ) {
-
-            t->state = _PR_RUNNABLE;
-
-            me = _PR_MD_CURRENT_THREAD();
-
-            _PR_AddThreadToRunQ(me, t);
-            _PR_THREAD_UNLOCK(t);
-        } else {
-            t->state = _PR_RUNNING;
-            _PR_THREAD_UNLOCK(t);
-        }
-        _PR_MD_WAKEUP_WAITER(t);
-        break;
-    }
-    return;
-}
-
-/************************************************************************/
-
-
-PR_IMPLEMENT(PRLock*) PR_NewLock(void)
-{
-    PRLock *lock;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    lock = PR_NEWZAP(PRLock);
-    if (lock) {
-        if (_PR_MD_NEW_LOCK(&lock->ilock) == PR_FAILURE) {
-		PR_DELETE(lock);
-		return(NULL);
-	}
-        PR_INIT_CLIST(&lock->links);
-        PR_INIT_CLIST(&lock->waitQ);
-    }
-    return lock;
-}
-
-/*
-** Destroy the given lock "lock". There is no point in making this race
-** free because if some other thread has the pointer to this lock all
-** bets are off.
-*/
-PR_IMPLEMENT(void) PR_DestroyLock(PRLock *lock)
-{
-    PR_ASSERT(lock->owner == 0);
-	_PR_MD_FREE_LOCK(&lock->ilock);
-    PR_DELETE(lock);
-}
-
-extern PRThread *suspendAllThread;
-/*
-** Lock the lock.
-*/
-PR_IMPLEMENT(void) PR_Lock(PRLock *lock)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntn is;
-    PRThread *t;
-    PRCList *q;
-
-    PR_ASSERT(me != suspendAllThread); 
-#if !defined(XP_MAC)
-    PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
-#endif
-    PR_ASSERT(lock != NULL);
-#ifdef _PR_GLOBAL_THREADS_ONLY 
-    PR_ASSERT(lock->owner != me);
-    _PR_MD_LOCK(&lock->ilock);
-    lock->owner = me;
-    return;
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-
-	if (_native_threads_only) {
-		PR_ASSERT(lock->owner != me);
-		_PR_MD_LOCK(&lock->ilock);
-		lock->owner = me;
-		return;
-	}
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSOFF(is);
-
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
-
-retry:
-    _PR_LOCK_LOCK(lock);
-    if (lock->owner == 0) {
-        /* Just got the lock */
-        lock->owner = me;
-        lock->priority = me->priority;
-		/* Add the granted lock to this owning thread's lock list */
-        PR_APPEND_LINK(&lock->links, &me->lockList);
-        _PR_LOCK_UNLOCK(lock);
-    	if (!_PR_IS_NATIVE_THREAD(me))
-        	_PR_FAST_INTSON(is);
-        return;
-    }
-
-    /* If this thread already owns this lock, then it is a deadlock */
-    PR_ASSERT(lock->owner != me);
-
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
-
-#if 0
-    if (me->priority > lock->owner->priority) {
-        /*
-        ** Give the lock owner a priority boost until we get the
-        ** lock. Record the priority we boosted it to.
-        */
-        lock->boostPriority = me->priority;
-        _PR_SetThreadPriority(lock->owner, me->priority);
-    }
-#endif
-
-    /* 
-    Add this thread to the asked for lock's list of waiting threads.  We
-    add this thread thread in the right priority order so when the unlock
-    occurs, the thread with the higher priority will get the lock.
-    */
-    q = lock->waitQ.next;
-    if (q == &lock->waitQ || _PR_THREAD_CONDQ_PTR(q)->priority ==
-      	_PR_THREAD_CONDQ_PTR(lock->waitQ.prev)->priority) {
-		/*
-		 * If all the threads in the lock waitQ have the same priority,
-		 * then avoid scanning the list:  insert the element at the end.
-		 */
-		q = &lock->waitQ;
-    } else {
-		/* Sort thread into lock's waitQ at appropriate point */
-		/* Now scan the list for where to insert this entry */
-		while (q != &lock->waitQ) {
-			t = _PR_THREAD_CONDQ_PTR(lock->waitQ.next);
-			if (me->priority > t->priority) {
-				/* Found a lower priority thread to insert in front of */
-				break;
-			}
-			q = q->next;
-		}
-	}
-    PR_INSERT_BEFORE(&me->waitQLinks, q);
-
-	/* 
-	Now grab the threadLock since we are about to change the state.  We have
-	to do this since a PR_Suspend or PR_SetThreadPriority type call that takes
-	a PRThread* as an argument could be changing the state of this thread from
-	a thread running on a different cpu.
-	*/
-
-    _PR_THREAD_LOCK(me);
-    me->state = _PR_LOCK_WAIT;
-    me->wait.lock = lock;
-    _PR_THREAD_UNLOCK(me);
-
-    _PR_LOCK_UNLOCK(lock);
-
-    _PR_MD_WAIT(me, PR_INTERVAL_NO_TIMEOUT);
-	goto retry;
-
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-/*
-** Unlock the lock.
-*/
-PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock *lock)
-{
-    PRCList *q;
-    PRThreadPriority pri, boost;
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(lock != NULL);
-    PR_ASSERT(lock->owner == me);
-    PR_ASSERT(me != suspendAllThread); 
-#if !defined(XP_MAC)
-    PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
-#endif
-    if (lock->owner != me) {
-        return PR_FAILURE;
-    }
-
-#ifdef _PR_GLOBAL_THREADS_ONLY 
-    lock->owner = 0;
-    _PR_MD_UNLOCK(&lock->ilock);
-    return PR_SUCCESS;
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-
-	if (_native_threads_only) {
-		lock->owner = 0;
-		_PR_MD_UNLOCK(&lock->ilock);
-		return PR_SUCCESS;
-	}
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSOFF(is);
-    _PR_LOCK_LOCK(lock);
-
-	/* Remove the lock from the owning thread's lock list */
-    PR_REMOVE_LINK(&lock->links);
-    pri = lock->priority;
-    boost = lock->boostPriority;
-    if (boost > pri) {
-        /*
-        ** We received a priority boost during the time we held the lock.
-        ** We need to figure out what priority to move to by scanning
-        ** down our list of lock's that we are still holding and using
-        ** the highest boosted priority found.
-        */
-        q = me->lockList.next;
-        while (q != &me->lockList) {
-            PRLock *ll = _PR_LOCK_PTR(q);
-            if (ll->boostPriority > pri) {
-                pri = ll->boostPriority;
-            }
-            q = q->next;
-        }
-        if (pri != me->priority) {
-            _PR_SetThreadPriority(me, pri);
-        }
-    }
-
-    /* Unblock the first waiting thread */
-    q = lock->waitQ.next;
-    if (q != &lock->waitQ)
-        _PR_UnblockLockWaiter(lock);
-    lock->boostPriority = PR_PRIORITY_LOW;
-    lock->owner = 0;
-    _PR_LOCK_UNLOCK(lock);
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSON(is);
-    return PR_SUCCESS;
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-/*
-** Test and then lock the lock if it's not already locked by some other
-** thread. Return PR_FALSE if some other thread owned the lock at the
-** time of the call.
-*/
-PR_IMPLEMENT(PRBool) PR_TestAndLock(PRLock *lock)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRBool rv = PR_FALSE;
-    PRIntn is;
-
-#ifdef _PR_GLOBAL_THREADS_ONLY 
-    is = _PR_MD_TEST_AND_LOCK(&lock->ilock);
-    if (is == 0) {
-        lock->owner = me;
-        return PR_TRUE;
-    }
-    return PR_FALSE;
-#else  /* _PR_GLOBAL_THREADS_ONLY */
-
-#ifndef _PR_LOCAL_THREADS_ONLY
-	if (_native_threads_only) {
-		is = _PR_MD_TEST_AND_LOCK(&lock->ilock);
-		if (is == 0) {
-			lock->owner = me;
-			return PR_TRUE;
-		}
-    	return PR_FALSE;
-	}
-#endif
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSOFF(is);
-
-    _PR_LOCK_LOCK(lock);
-    if (lock->owner == 0) {
-        /* Just got the lock */
-        lock->owner = me;
-        lock->priority = me->priority;
-		/* Add the granted lock to this owning thread's lock list */
-        PR_APPEND_LINK(&lock->links, &me->lockList);
-        rv = PR_TRUE;
-    }
-    _PR_LOCK_UNLOCK(lock);
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    	_PR_INTSON(is);
-    return rv;
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-/************************************************************************/
-/************************************************************************/
-/***********************ROUTINES FOR DCE EMULATION***********************/
-/************************************************************************/
-/************************************************************************/
-PR_IMPLEMENT(PRStatus) PRP_TryLock(PRLock *lock)
-    { return (PR_TestAndLock(lock)) ? PR_SUCCESS : PR_FAILURE; }
diff --git a/libs/js/nsprpub/pr/src/threads/combined/prustack.c b/libs/js/nsprpub/pr/src/threads/combined/prustack.c
deleted file mode 100644
index fe15843c02..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/prustack.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/* List of free stack virtual memory chunks */
-PRLock *_pr_stackLock;
-PRCList _pr_freeStacks = PR_INIT_STATIC_CLIST(&_pr_freeStacks);
-PRIntn _pr_numFreeStacks;
-PRIntn _pr_maxFreeStacks = 4;
-
-#ifdef DEBUG
-/*
-** A variable that can be set via the debugger...
-*/
-PRBool _pr_debugStacks = PR_FALSE;
-#endif
-
-/* How much space to leave between the stacks, at each end */
-#define REDZONE		(2 << _pr_pageShift)
-
-#define _PR_THREAD_STACK_PTR(_qp) \
-    ((PRThreadStack*) ((char*) (_qp) - offsetof(PRThreadStack,links)))
-
-void _PR_InitStacks(void)
-{
-    _pr_stackLock = PR_NewLock();
-}
-
-void _PR_CleanupStacks(void)
-{
-    if (_pr_stackLock) {
-        PR_DestroyLock(_pr_stackLock);
-        _pr_stackLock = NULL;
-    }
-}
-
-/*
-** Allocate a stack for a thread.
-*/
-PRThreadStack *_PR_NewStack(PRUint32 stackSize)
-{
-    PRCList *qp;
-    PRThreadStack *ts;
-    PRThread *thr;
-
-    /*
-    ** Trim the list of free stacks. Trim it backwards, tossing out the
-    ** oldest stack found first (this way more recent stacks have a
-    ** chance of being present in the data cache).
-    */
-    PR_Lock(_pr_stackLock);
-    qp = _pr_freeStacks.prev;
-    while ((_pr_numFreeStacks > _pr_maxFreeStacks) && (qp != &_pr_freeStacks)) {
-	ts = _PR_THREAD_STACK_PTR(qp);
-	thr = _PR_THREAD_STACK_TO_PTR(ts);
-	qp = qp->prev;
-	/*
-	 * skip stacks which are still being used
-	 */
-	if (thr->no_sched)
-		continue;
-	PR_REMOVE_LINK(&ts->links);
-
-	/* Give platform OS to clear out the stack for debugging */
-	_PR_MD_CLEAR_STACK(ts);
-
-	_pr_numFreeStacks--;
-	_PR_DestroySegment(ts->seg);
-	PR_DELETE(ts);
-    }
-
-    /*
-    ** Find a free thread stack. This searches the list of free'd up
-    ** virtually mapped thread stacks.
-    */
-    qp = _pr_freeStacks.next;
-    ts = 0;
-    while (qp != &_pr_freeStacks) {
-	ts = _PR_THREAD_STACK_PTR(qp);
-	thr = _PR_THREAD_STACK_TO_PTR(ts);
-	qp = qp->next;
-	/*
-	 * skip stacks which are still being used
-	 */
-	if ((!(thr->no_sched)) && ((ts->allocSize - 2*REDZONE) >= stackSize)) {
-	    /*
-	    ** Found a stack that is not in use and is big enough. Change
-	    ** stackSize to fit it.
-	    */
-	    stackSize = ts->allocSize - 2*REDZONE;
-	    PR_REMOVE_LINK(&ts->links);
-	    _pr_numFreeStacks--;
-	    ts->links.next = 0;
-	    ts->links.prev = 0;
-	    PR_Unlock(_pr_stackLock);
-	    goto done;
-	}
-	ts = 0;
-    }
-    PR_Unlock(_pr_stackLock);
-
-    if (!ts) {
-	/* Make a new thread stack object. */
-	ts = PR_NEWZAP(PRThreadStack);
-	if (!ts) {
-	    return NULL;
-	}
-
-	/*
-	** Assign some of the virtual space to the new stack object. We
-	** may not get that piece of VM, but if nothing else we will
-	** advance the pointer so we don't collide (unless the OS screws
-	** up).
-	*/
-	ts->allocSize = stackSize + 2*REDZONE;
-	ts->seg = _PR_NewSegment(ts->allocSize, 0);
-	if (!ts->seg) {
-	    PR_DELETE(ts);
-	    return NULL;
-	}
-	}
-
-  done:
-    ts->allocBase = (char*)ts->seg->vaddr;
-    ts->flags = _PR_STACK_MAPPED;
-    ts->stackSize = stackSize;
-
-#ifdef HAVE_STACK_GROWING_UP
-    ts->stackTop = ts->allocBase + REDZONE;
-    ts->stackBottom = ts->stackTop + stackSize;
-#else
-    ts->stackBottom = ts->allocBase + REDZONE;
-    ts->stackTop = ts->stackBottom + stackSize;
-#endif
-
-    PR_LOG(_pr_thread_lm, PR_LOG_NOTICE,
-	   ("thread stack: base=0x%x limit=0x%x bottom=0x%x top=0x%x\n",
-	    ts->allocBase, ts->allocBase + ts->allocSize - 1,
-	    ts->allocBase + REDZONE,
-	    ts->allocBase + REDZONE + stackSize - 1));
-	    
-    _PR_MD_INIT_STACK(ts,REDZONE);
-
-    return ts;
-}
-
-/*
-** Free the stack for the current thread
-*/
-void _PR_FreeStack(PRThreadStack *ts)
-{
-    if (!ts) {
-	return;
-    }
-    if (ts->flags & _PR_STACK_PRIMORDIAL) {
-	PR_DELETE(ts);
-	return;
-    }
-
-    /*
-    ** Put the stack on the free list. This is done because we are still
-    ** using the stack. Next time a thread is created we will trim the
-    ** list down; it's safe to do it then because we will have had to
-    ** context switch to a live stack before another thread can be
-    ** created.
-    */
-    PR_Lock(_pr_stackLock);
-    PR_APPEND_LINK(&ts->links, _pr_freeStacks.prev);
-    _pr_numFreeStacks++;
-    PR_Unlock(_pr_stackLock);
-}
diff --git a/libs/js/nsprpub/pr/src/threads/combined/pruthr.c b/libs/js/nsprpub/pr/src/threads/combined/pruthr.c
deleted file mode 100644
index 7e31b56bf6..0000000000
--- a/libs/js/nsprpub/pr/src/threads/combined/pruthr.c
+++ /dev/null
@@ -1,1918 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#include <signal.h>
-#include <string.h>
-
-#if defined(WIN95)                                                                         
-/*
-** Some local variables report warnings on Win95 because the code paths
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-**
-*/
-#pragma warning(disable : 4101)
-#endif          
-
-#if defined(XP_MAC)
-#include <LowMem.h>
-#endif
-
-/* _pr_activeLock protects the following global variables */
-PRLock *_pr_activeLock;
-PRInt32 _pr_primordialExitCount;   /* In PR_Cleanup(), the primordial thread
-                    * waits until all other user (non-system)
-                    * threads have terminated before it exits.
-                    * So whenever we decrement _pr_userActive,
-                    * it is compared with
-                    * _pr_primordialExitCount.
-                    * If the primordial thread is a system
-                    * thread, then _pr_primordialExitCount
-                    * is 0.  If the primordial thread is
-                    * itself a user thread, then 
-                    * _pr_primordialThread is 1.
-                    */
-PRCondVar *_pr_primordialExitCVar; /* When _pr_userActive is decremented to
-                    * _pr_primordialExitCount, this condition
-                    * variable is notified.
-                    */
-
-PRLock *_pr_deadQLock;
-PRUint32 _pr_numNativeDead;
-PRUint32 _pr_numUserDead;
-PRCList _pr_deadNativeQ;
-PRCList _pr_deadUserQ;
-
-PRUint32 _pr_join_counter;
-
-PRUint32 _pr_local_threads;
-PRUint32 _pr_global_threads;
-
-PRBool suspendAllOn = PR_FALSE;
-PRThread *suspendAllThread = NULL;
-
-extern PRCList _pr_active_global_threadQ;
-extern PRCList _pr_active_local_threadQ;
-
-static void _PR_DecrActiveThreadCount(PRThread *thread);
-static PRThread *_PR_AttachThread(PRThreadType, PRThreadPriority, PRThreadStack *);
-static void _PR_InitializeNativeStack(PRThreadStack *ts);
-static void _PR_InitializeRecycledThread(PRThread *thread);
-static void _PR_UserRunThread(void);
-
-void _PR_InitThreads(PRThreadType type, PRThreadPriority priority,
-    PRUintn maxPTDs)
-{
-#if defined(XP_MAC)
-#pragma unused (maxPTDs)
-#endif
-
-    PRThread *thread;
-    PRThreadStack *stack;
-
-    _pr_terminationCVLock = PR_NewLock();
-    _pr_activeLock = PR_NewLock();
-
-#ifndef HAVE_CUSTOM_USER_THREADS
-    stack = PR_NEWZAP(PRThreadStack);
-#ifdef HAVE_STACK_GROWING_UP
-    stack->stackTop = (char*) ((((long)&type) >> _pr_pageShift)
-                  << _pr_pageShift);
-#else
-#if defined(SOLARIS) || defined (UNIXWARE) && defined (USR_SVR4_THREADS)
-    stack->stackTop = (char*) &thread;
-#elif defined(XP_MAC)
-    stack->stackTop = (char*) LMGetCurStackBase();
-#else
-    stack->stackTop = (char*) ((((long)&type + _pr_pageSize - 1)
-                >> _pr_pageShift) << _pr_pageShift);
-#endif
-#endif
-#else
-    /* If stack is NULL, we're using custom user threads like NT fibers. */
-    stack = PR_NEWZAP(PRThreadStack);
-    if (stack) {
-        stack->stackSize = 0;
-        _PR_InitializeNativeStack(stack);
-    }
-#endif /* HAVE_CUSTOM_USER_THREADS */
-
-    thread = _PR_AttachThread(type, priority, stack);
-    if (thread) {
-        _PR_MD_SET_CURRENT_THREAD(thread);
-
-        if (type == PR_SYSTEM_THREAD) {
-            thread->flags = _PR_SYSTEM;
-            _pr_systemActive++;
-            _pr_primordialExitCount = 0;
-        } else {
-            _pr_userActive++;
-            _pr_primordialExitCount = 1;
-        }
-    thread->no_sched = 1;
-    _pr_primordialExitCVar = PR_NewCondVar(_pr_activeLock);
-    }
-
-    if (!thread) PR_Abort();
-#ifdef _PR_LOCAL_THREADS_ONLY
-    thread->flags |= _PR_PRIMORDIAL;
-#else
-    thread->flags |= _PR_PRIMORDIAL | _PR_GLOBAL_SCOPE;
-#endif
-
-    /*
-     * Needs _PR_PRIMORDIAL flag set before calling
-     * _PR_MD_INIT_THREAD()
-     */
-    if (_PR_MD_INIT_THREAD(thread) == PR_FAILURE) {
-        /*
-         * XXX do what?
-         */
-    }
-
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-        PR_APPEND_LINK(&thread->active, &_PR_ACTIVE_GLOBAL_THREADQ());
-        _pr_global_threads++;
-    } else {
-        PR_APPEND_LINK(&thread->active, &_PR_ACTIVE_LOCAL_THREADQ());
-        _pr_local_threads++;
-    }
-
-    _pr_recycleThreads = 0;
-    _pr_deadQLock = PR_NewLock();
-    _pr_numNativeDead = 0;
-    _pr_numUserDead = 0;
-    PR_INIT_CLIST(&_pr_deadNativeQ);
-    PR_INIT_CLIST(&_pr_deadUserQ);
-}
-
-void _PR_CleanupThreads(void)
-{
-    if (_pr_terminationCVLock) {
-        PR_DestroyLock(_pr_terminationCVLock);
-        _pr_terminationCVLock = NULL;
-    }
-    if (_pr_activeLock) {
-        PR_DestroyLock(_pr_activeLock);
-        _pr_activeLock = NULL;
-    }
-    if (_pr_primordialExitCVar) {
-        PR_DestroyCondVar(_pr_primordialExitCVar);
-        _pr_primordialExitCVar = NULL;
-    }
-    /* TODO _pr_dead{Native,User}Q need to be deleted */
-    if (_pr_deadQLock) {
-        PR_DestroyLock(_pr_deadQLock);
-        _pr_deadQLock = NULL;
-    }
-}
-
-/*
-** Initialize a stack for a native thread
-*/
-static void _PR_InitializeNativeStack(PRThreadStack *ts)
-{
-    if( ts && (ts->stackTop == 0) ) {
-        ts->allocSize = ts->stackSize;
-
-        /*
-        ** Setup stackTop and stackBottom values.
-        */
-#ifdef HAVE_STACK_GROWING_UP
-    ts->allocBase = (char*) ((((long)&ts) >> _pr_pageShift)
-                  << _pr_pageShift);
-        ts->stackBottom = ts->allocBase + ts->stackSize;
-        ts->stackTop = ts->allocBase;
-#else
-        ts->allocBase = (char*) ((((long)&ts + _pr_pageSize - 1)
-                >> _pr_pageShift) << _pr_pageShift);
-        ts->stackTop    = ts->allocBase;
-        ts->stackBottom = ts->allocBase - ts->stackSize;
-#endif
-    }
-}
-
-void _PR_NotifyJoinWaiters(PRThread *thread)
-{
-    /*
-    ** Handle joinable threads.  Change the state to waiting for join.
-    ** Remove from our run Q and put it on global waiting to join Q.
-    ** Notify on our "termination" condition variable so that joining
-    ** thread will know about our termination.  Switch our context and
-    ** come back later on to continue the cleanup.
-    */    
-    PR_ASSERT(thread == _PR_MD_CURRENT_THREAD());
-    if (thread->term != NULL) {
-        PR_Lock(_pr_terminationCVLock);
-        _PR_THREAD_LOCK(thread);
-        thread->state = _PR_JOIN_WAIT;
-        if ( !_PR_IS_NATIVE_THREAD(thread) ) {
-            _PR_MISCQ_LOCK(thread->cpu);
-            _PR_ADD_JOINQ(thread, thread->cpu);
-            _PR_MISCQ_UNLOCK(thread->cpu);
-        }
-        _PR_THREAD_UNLOCK(thread);
-        PR_NotifyCondVar(thread->term);
-        PR_Unlock(_pr_terminationCVLock);
-        _PR_MD_WAIT(thread, PR_INTERVAL_NO_TIMEOUT);
-        PR_ASSERT(thread->state != _PR_JOIN_WAIT);
-    }
-
-}
-
-/*
- * Zero some of the data members of a recycled thread.
- *
- * Note that we can do this either when a dead thread is added to
- * the dead thread queue or when it is reused.  Here, we are doing
- * this lazily, when the thread is reused in _PR_CreateThread().
- */
-static void _PR_InitializeRecycledThread(PRThread *thread)
-{
-    /*
-     * Assert that the following data members are already zeroed
-     * by _PR_CleanupThread().
-     */
-#ifdef DEBUG
-    if (thread->privateData) {
-        unsigned int i;
-        for (i = 0; i < thread->tpdLength; i++) {
-            PR_ASSERT(thread->privateData[i] == NULL);
-        }
-    }
-#endif
-    PR_ASSERT(thread->dumpArg == 0 && thread->dump == 0);
-    PR_ASSERT(thread->errorString == 0 && thread->errorStringSize == 0);
-    PR_ASSERT(thread->errorStringLength == 0);
-
-    /* Reset data members in thread structure */
-    thread->errorCode = thread->osErrorCode = 0;
-    thread->io_pending = thread->io_suspended = PR_FALSE;
-    thread->environment = 0;
-    PR_INIT_CLIST(&thread->lockList);
-}
-
-PRStatus _PR_RecycleThread(PRThread *thread)
-{
-    if ( _PR_IS_NATIVE_THREAD(thread) &&
-            _PR_NUM_DEADNATIVE < _pr_recycleThreads) {
-        _PR_DEADQ_LOCK;
-        PR_APPEND_LINK(&thread->links, &_PR_DEADNATIVEQ);
-        _PR_INC_DEADNATIVE;
-        _PR_DEADQ_UNLOCK;
-    return (PR_SUCCESS);
-    } else if ( !_PR_IS_NATIVE_THREAD(thread) &&
-                _PR_NUM_DEADUSER < _pr_recycleThreads) {
-        _PR_DEADQ_LOCK;
-        PR_APPEND_LINK(&thread->links, &_PR_DEADUSERQ);
-        _PR_INC_DEADUSER;
-        _PR_DEADQ_UNLOCK;
-    return (PR_SUCCESS);
-    }
-    return (PR_FAILURE);
-}
-
-/*
- * Decrement the active thread count, either _pr_systemActive or
- * _pr_userActive, depending on whether the thread is a system thread
- * or a user thread.  If all the user threads, except possibly
- * the primordial thread, have terminated, we notify the primordial
- * thread of this condition.
- *
- * Since this function will lock _pr_activeLock, do not call this
- * function while holding the _pr_activeLock lock, as this will result
- * in a deadlock.
- */
-
-static void
-_PR_DecrActiveThreadCount(PRThread *thread)
-{
-    PR_Lock(_pr_activeLock);
-    if (thread->flags & _PR_SYSTEM) {
-        _pr_systemActive--;
-    } else {
-        _pr_userActive--;
-        if (_pr_userActive == _pr_primordialExitCount) {
-            PR_NotifyCondVar(_pr_primordialExitCVar);
-        }
-    }
-    PR_Unlock(_pr_activeLock);
-}
-
-/*
-** Detach thread structure
-*/
-static void
-_PR_DestroyThread(PRThread *thread)
-{
-    _PR_MD_FREE_LOCK(&thread->threadLock);
-    PR_DELETE(thread);
-}
-
-void
-_PR_NativeDestroyThread(PRThread *thread)
-{
-    if(thread->term) {
-        PR_DestroyCondVar(thread->term);
-        thread->term = 0;
-    }
-    if (NULL != thread->privateData) {
-        PR_ASSERT(0 != thread->tpdLength);
-        PR_DELETE(thread->privateData);
-        thread->tpdLength = 0;
-    }
-    PR_DELETE(thread->stack);
-    _PR_DestroyThread(thread);
-}
-
-void
-_PR_UserDestroyThread(PRThread *thread)
-{
-    if(thread->term) {
-        PR_DestroyCondVar(thread->term);
-        thread->term = 0;
-    }
-    if (NULL != thread->privateData) {
-        PR_ASSERT(0 != thread->tpdLength);
-        PR_DELETE(thread->privateData);
-        thread->tpdLength = 0;
-    }
-    _PR_MD_FREE_LOCK(&thread->threadLock);
-    if (thread->threadAllocatedOnStack == 1) {
-        _PR_MD_CLEAN_THREAD(thread);
-        /*
-         *  Because the no_sched field is set, this thread/stack will
-         *  will not be re-used until the flag is cleared by the thread
-         *  we will context switch to.
-         */
-        _PR_FreeStack(thread->stack);
-    } else {
-#ifdef WINNT
-        _PR_MD_CLEAN_THREAD(thread);
-#else
-        /*
-         * This assertion does not apply to NT.  On NT, every fiber
-         * has its threadAllocatedOnStack equal to 0.  Elsewhere,
-         * only the primordial thread has its threadAllocatedOnStack
-         * equal to 0.
-         */
-        PR_ASSERT(thread->flags & _PR_PRIMORDIAL);
-#endif
-    }
-}
-
-
-/*
-** Run a thread's start function. When the start function returns the
-** thread is done executing and no longer needs the CPU. If there are no
-** more user threads running then we can exit the program.
-*/
-void _PR_NativeRunThread(void *arg)
-{
-    PRThread *thread = (PRThread *)arg;
-
-    _PR_MD_SET_CURRENT_THREAD(thread);
-
-    _PR_MD_SET_CURRENT_CPU(NULL);
-
-    /* Set up the thread stack information */
-    _PR_InitializeNativeStack(thread->stack);
-
-    /* Set up the thread md information */
-    if (_PR_MD_INIT_THREAD(thread) == PR_FAILURE) {
-        /*
-         * thread failed to initialize itself, possibly due to
-         * failure to allocate per-thread resources
-         */
-        return;
-    }
-
-    while(1) {
-        thread->state = _PR_RUNNING;
-
-        /*
-         * Add to list of active threads
-         */
-        PR_Lock(_pr_activeLock);
-        PR_APPEND_LINK(&thread->active, &_PR_ACTIVE_GLOBAL_THREADQ());
-        _pr_global_threads++;
-        PR_Unlock(_pr_activeLock);
-
-        (*thread->startFunc)(thread->arg);
-
-        /*
-         * The following two assertions are meant for NT asynch io.
-         *
-         * The thread should have no asynch io in progress when it
-         * exits, otherwise the overlapped buffer, which is part of
-         * the thread structure, would become invalid.
-         */
-        PR_ASSERT(thread->io_pending == PR_FALSE);
-        /*
-         * This assertion enforces the programming guideline that
-         * if an io function times out or is interrupted, the thread
-         * should close the fd to force the asynch io to abort
-         * before it exits.  Right now, closing the fd is the only
-         * way to clear the io_suspended flag.
-         */
-        PR_ASSERT(thread->io_suspended == PR_FALSE);
-
-        /*
-         * remove thread from list of active threads
-         */
-        PR_Lock(_pr_activeLock);
-        PR_REMOVE_LINK(&thread->active);
-        _pr_global_threads--;
-        PR_Unlock(_pr_activeLock);
-
-        PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("thread exiting"));
-
-        /* All done, time to go away */
-        _PR_CleanupThread(thread);
-
-        _PR_NotifyJoinWaiters(thread);
-
-        _PR_DecrActiveThreadCount(thread);
-
-        thread->state = _PR_DEAD_STATE;
-
-        if (!_pr_recycleThreads || (_PR_RecycleThread(thread) ==
-                        PR_FAILURE)) {
-            /*
-             * thread not recycled
-             * platform-specific thread exit processing
-             *        - for stuff like releasing native-thread resources, etc.
-             */
-            _PR_MD_EXIT_THREAD(thread);
-            /*
-             * Free memory allocated for the thread
-             */
-            _PR_NativeDestroyThread(thread);
-            /*
-             * thread gone, cannot de-reference thread now
-             */
-            return;
-        }
-
-        /* Now wait for someone to activate us again... */
-        _PR_MD_WAIT(thread, PR_INTERVAL_NO_TIMEOUT);
-    }
-}
-
-static void _PR_UserRunThread(void)
-{
-    PRThread *thread = _PR_MD_CURRENT_THREAD();
-    PRIntn is;
-
-    if (_MD_LAST_THREAD())
-    _MD_LAST_THREAD()->no_sched = 0;
-
-#ifdef HAVE_CUSTOM_USER_THREADS
-    if (thread->stack == NULL) {
-        thread->stack = PR_NEWZAP(PRThreadStack);
-        _PR_InitializeNativeStack(thread->stack);
-    }
-#endif /* HAVE_CUSTOM_USER_THREADS */
-
-    while(1) {
-        /* Run thread main */
-        if ( !_PR_IS_NATIVE_THREAD(thread)) _PR_MD_SET_INTSOFF(0);
-
-    /*
-     * Add to list of active threads
-     */
-    if (!(thread->flags & _PR_IDLE_THREAD)) {
-        PR_Lock(_pr_activeLock);
-        PR_APPEND_LINK(&thread->active, &_PR_ACTIVE_LOCAL_THREADQ());
-        _pr_local_threads++;
-        PR_Unlock(_pr_activeLock);
-    }
-
-        (*thread->startFunc)(thread->arg);
-
-        /*
-         * The following two assertions are meant for NT asynch io.
-         *
-         * The thread should have no asynch io in progress when it
-         * exits, otherwise the overlapped buffer, which is part of
-         * the thread structure, would become invalid.
-         */
-        PR_ASSERT(thread->io_pending == PR_FALSE);
-        /*
-         * This assertion enforces the programming guideline that
-         * if an io function times out or is interrupted, the thread
-         * should close the fd to force the asynch io to abort
-         * before it exits.  Right now, closing the fd is the only
-         * way to clear the io_suspended flag.
-         */
-        PR_ASSERT(thread->io_suspended == PR_FALSE);
-
-        PR_Lock(_pr_activeLock);
-    /*
-     * remove thread from list of active threads
-     */
-    if (!(thread->flags & _PR_IDLE_THREAD)) {
-           PR_REMOVE_LINK(&thread->active);
-        _pr_local_threads--;
-    }
-    PR_Unlock(_pr_activeLock);
-        PR_LOG(_pr_thread_lm, PR_LOG_MIN, ("thread exiting"));
-
-        /* All done, time to go away */
-        _PR_CleanupThread(thread);
-
-        _PR_INTSOFF(is);    
-
-        _PR_NotifyJoinWaiters(thread);
-
-    _PR_DecrActiveThreadCount(thread);
-
-        thread->state = _PR_DEAD_STATE;
-
-        if (!_pr_recycleThreads || (_PR_RecycleThread(thread) ==
-                        PR_FAILURE)) {
-            /*
-            ** Destroy the thread resources
-            */
-        _PR_UserDestroyThread(thread);
-        }
-
-        /*
-        ** Find another user thread to run. This cpu has finished the
-        ** previous threads main and is now ready to run another thread.
-        */
-        {
-            PRInt32 is;
-            _PR_INTSOFF(is);
-            _PR_MD_SWITCH_CONTEXT(thread);
-        }
-
-        /* Will land here when we get scheduled again if we are recycling... */
-    }
-}
-
-void _PR_SetThreadPriority(PRThread *thread, PRThreadPriority newPri)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRIntn is;
-
-    if ( _PR_IS_NATIVE_THREAD(thread) ) {
-        _PR_MD_SET_PRIORITY(&(thread->md), newPri);
-        return;
-    }
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(thread);
-    if (newPri != thread->priority) {
-    _PRCPU *cpu = thread->cpu;
-
-    switch (thread->state) {
-      case _PR_RUNNING:
-        /* Change my priority */
-
-            _PR_RUNQ_LOCK(cpu);
-        thread->priority = newPri;
-        if (_PR_RUNQREADYMASK(cpu) >> (newPri + 1)) {
-            if (!_PR_IS_NATIVE_THREAD(me))
-                    _PR_SET_RESCHED_FLAG();
-        }
-            _PR_RUNQ_UNLOCK(cpu);
-        break;
-
-      case _PR_RUNNABLE:
-
-        _PR_RUNQ_LOCK(cpu);
-            /* Move to different runQ */
-            _PR_DEL_RUNQ(thread);
-            thread->priority = newPri;
-            PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-            _PR_ADD_RUNQ(thread, cpu, newPri);
-        _PR_RUNQ_UNLOCK(cpu);
-
-            if (newPri > me->priority) {
-            if (!_PR_IS_NATIVE_THREAD(me))
-                    _PR_SET_RESCHED_FLAG();
-            }
-
-        break;
-
-      case _PR_LOCK_WAIT:
-      case _PR_COND_WAIT:
-      case _PR_IO_WAIT:
-      case _PR_SUSPENDED:
-
-        thread->priority = newPri;
-        break;
-    }
-    }
-    _PR_THREAD_UNLOCK(thread);
-    if (!_PR_IS_NATIVE_THREAD(me))
-    _PR_INTSON(is);
-}
-
-/*
-** Suspend the named thread and copy its gc registers into regBuf
-*/
-static void _PR_Suspend(PRThread *thread)
-{
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    PR_ASSERT(thread != me);
-    PR_ASSERT(!_PR_IS_NATIVE_THREAD(thread) || (!thread->cpu));
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(thread);
-    switch (thread->state) {
-      case _PR_RUNNABLE:
-        if (!_PR_IS_NATIVE_THREAD(thread)) {
-            _PR_RUNQ_LOCK(thread->cpu);
-            _PR_DEL_RUNQ(thread);
-            _PR_RUNQ_UNLOCK(thread->cpu);
-
-            _PR_MISCQ_LOCK(thread->cpu);
-            _PR_ADD_SUSPENDQ(thread, thread->cpu);
-            _PR_MISCQ_UNLOCK(thread->cpu);
-        } else {
-            /*
-             * Only LOCAL threads are suspended by _PR_Suspend
-             */
-             PR_ASSERT(0);
-        }
-        thread->state = _PR_SUSPENDED;
-        break;
-
-      case _PR_RUNNING:
-        /*
-         * The thread being suspended should be a LOCAL thread with
-         * _pr_numCPUs == 1. Hence, the thread cannot be in RUNNING state
-         */
-        PR_ASSERT(0);
-        break;
-
-      case _PR_LOCK_WAIT:
-      case _PR_IO_WAIT:
-      case _PR_COND_WAIT:
-        if (_PR_IS_NATIVE_THREAD(thread)) {
-            _PR_MD_SUSPEND_THREAD(thread);
-    }
-        thread->flags |= _PR_SUSPENDING;
-        break;
-
-      default:
-        PR_Abort();
-    }
-    _PR_THREAD_UNLOCK(thread);
-    if (!_PR_IS_NATIVE_THREAD(me))
-    _PR_INTSON(is);
-}
-
-static void _PR_Resume(PRThread *thread)
-{
-    PRThreadPriority pri;
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-    _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(thread);
-    switch (thread->state) {
-      case _PR_SUSPENDED:
-        thread->state = _PR_RUNNABLE;
-        thread->flags &= ~_PR_SUSPENDING;
-        if (!_PR_IS_NATIVE_THREAD(thread)) {
-            _PR_MISCQ_LOCK(thread->cpu);
-            _PR_DEL_SUSPENDQ(thread);
-            _PR_MISCQ_UNLOCK(thread->cpu);
-
-            pri = thread->priority;
-
-            _PR_RUNQ_LOCK(thread->cpu);
-            _PR_ADD_RUNQ(thread, thread->cpu, pri);
-            _PR_RUNQ_UNLOCK(thread->cpu);
-
-            if (pri > _PR_MD_CURRENT_THREAD()->priority) {
-                if (!_PR_IS_NATIVE_THREAD(me))
-                    _PR_SET_RESCHED_FLAG();
-            }
-        } else {
-            PR_ASSERT(0);
-        }
-        break;
-
-      case _PR_IO_WAIT:
-      case _PR_COND_WAIT:
-        thread->flags &= ~_PR_SUSPENDING;
-/*      PR_ASSERT(thread->wait.monitor->stickyCount == 0); */
-        break;
-
-      case _PR_LOCK_WAIT: 
-      {
-        PRLock *wLock = thread->wait.lock;
-
-        thread->flags &= ~_PR_SUSPENDING;
- 
-        _PR_LOCK_LOCK(wLock);
-        if (thread->wait.lock->owner == 0) {
-            _PR_UnblockLockWaiter(thread->wait.lock);
-        }
-        _PR_LOCK_UNLOCK(wLock);
-        break;
-      }
-      case _PR_RUNNABLE:
-        break;
-      case _PR_RUNNING:
-        /*
-         * The thread being suspended should be a LOCAL thread with
-         * _pr_numCPUs == 1. Hence, the thread cannot be in RUNNING state
-         */
-        PR_ASSERT(0);
-        break;
-
-      default:
-    /*
-     * thread should have been in one of the above-listed blocked states
-     * (_PR_JOIN_WAIT, _PR_IO_WAIT, _PR_UNBORN, _PR_DEAD_STATE)
-     */
-        PR_Abort();
-    }
-    _PR_THREAD_UNLOCK(thread);
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSON(is);
-
-}
-
-#if !defined(_PR_LOCAL_THREADS_ONLY) && defined(XP_UNIX)
-static PRThread *get_thread(_PRCPU *cpu, PRBool *wakeup_cpus)
-{
-    PRThread *thread;
-    PRIntn pri;
-    PRUint32 r;
-    PRCList *qp;
-    PRIntn priMin, priMax;
-
-    _PR_RUNQ_LOCK(cpu);
-    r = _PR_RUNQREADYMASK(cpu);
-    if (r==0) {
-        priMin = priMax = PR_PRIORITY_FIRST;
-    } else if (r == (1<<PR_PRIORITY_NORMAL) ) {
-        priMin = priMax = PR_PRIORITY_NORMAL;
-    } else {
-        priMin = PR_PRIORITY_FIRST;
-        priMax = PR_PRIORITY_LAST;
-    }
-    thread = NULL;
-    for (pri = priMax; pri >= priMin ; pri-- ) {
-    if (r & (1 << pri)) {
-            for (qp = _PR_RUNQ(cpu)[pri].next; 
-                 qp != &_PR_RUNQ(cpu)[pri];
-                 qp = qp->next) {
-                thread = _PR_THREAD_PTR(qp);
-                /*
-                * skip non-schedulable threads
-                */
-                PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-                if (thread->no_sched) {
-                    thread = NULL;
-                    /*
-                     * Need to wakeup cpus to avoid missing a
-                     * runnable thread
-                     * Waking up all CPU's need happen only once.
-                     */
-
-                    *wakeup_cpus = PR_TRUE;
-                    continue;
-                } else if (thread->flags & _PR_BOUND_THREAD) {
-                    /*
-                     * Thread bound to cpu 0
-                     */
-
-                    thread = NULL;
-#ifdef IRIX
-					_PR_MD_WAKEUP_PRIMORDIAL_CPU();
-#endif
-                    continue;
-                } else if (thread->io_pending == PR_TRUE) {
-                    /*
-                     * A thread that is blocked for I/O needs to run
-                     * on the same cpu on which it was blocked. This is because
-                     * the cpu's ioq is accessed without lock protection and scheduling
-                     * the thread on a different cpu would preclude this optimization.
-                     */
-                    thread = NULL;
-                    continue;
-                } else {
-                    /* Pull thread off of its run queue */
-                    _PR_DEL_RUNQ(thread);
-                    _PR_RUNQ_UNLOCK(cpu);
-                    return(thread);
-                }
-            }
-        }
-        thread = NULL;
-    }
-    _PR_RUNQ_UNLOCK(cpu);
-    return(thread);
-}
-#endif /* !defined(_PR_LOCAL_THREADS_ONLY) && defined(XP_UNIX) */
-
-/*
-** Schedule this native thread by finding the highest priority nspr
-** thread that is ready to run.
-**
-** Note- everyone really needs to call _PR_MD_SWITCH_CONTEXT (which calls
-**       PR_Schedule() rather than calling PR_Schedule.  Otherwise if there
-**       is initialization required for switching from SWITCH_CONTEXT,
-**       it will not get done!
-*/
-void _PR_Schedule(void)
-{
-    PRThread *thread, *me = _PR_MD_CURRENT_THREAD();
-    _PRCPU *cpu = _PR_MD_CURRENT_CPU();
-    PRIntn pri;
-    PRUint32 r;
-    PRCList *qp;
-    PRIntn priMin, priMax;
-#if !defined(_PR_LOCAL_THREADS_ONLY) && defined(XP_UNIX)
-    PRBool wakeup_cpus;
-#endif
-
-    /* Interrupts must be disabled */
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
-
-    /* Since we are rescheduling, we no longer want to */
-    _PR_CLEAR_RESCHED_FLAG();
-
-    /*
-    ** Find highest priority thread to run. Bigger priority numbers are
-    ** higher priority threads
-    */
-    _PR_RUNQ_LOCK(cpu);
-    /*
-     *  if we are in SuspendAll mode, can schedule only the thread
-     *    that called PR_SuspendAll
-     *
-     *  The thread may be ready to run now, after completing an I/O
-     *  operation, for example
-     */
-    if ((thread = suspendAllThread) != 0) {
-    if ((!(thread->no_sched)) && (thread->state == _PR_RUNNABLE)) {
-            /* Pull thread off of its run queue */
-            _PR_DEL_RUNQ(thread);
-            _PR_RUNQ_UNLOCK(cpu);
-            goto found_thread;
-    } else {
-            thread = NULL;
-            _PR_RUNQ_UNLOCK(cpu);
-            goto idle_thread;
-    }
-    }
-    r = _PR_RUNQREADYMASK(cpu);
-    if (r==0) {
-        priMin = priMax = PR_PRIORITY_FIRST;
-    } else if (r == (1<<PR_PRIORITY_NORMAL) ) {
-        priMin = priMax = PR_PRIORITY_NORMAL;
-    } else {
-        priMin = PR_PRIORITY_FIRST;
-        priMax = PR_PRIORITY_LAST;
-    }
-    thread = NULL;
-    for (pri = priMax; pri >= priMin ; pri-- ) {
-    if (r & (1 << pri)) {
-            for (qp = _PR_RUNQ(cpu)[pri].next; 
-                 qp != &_PR_RUNQ(cpu)[pri];
-                 qp = qp->next) {
-                thread = _PR_THREAD_PTR(qp);
-                /*
-                * skip non-schedulable threads
-                */
-#if !defined(XP_MAC)
-                PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD));
-#endif
-                if ((thread->no_sched) && (me != thread)){
-                    thread = NULL;
-                    continue;
-                } else {
-                    /* Pull thread off of its run queue */
-                    _PR_DEL_RUNQ(thread);
-                    _PR_RUNQ_UNLOCK(cpu);
-                    goto found_thread;
-                }
-            }
-        }
-        thread = NULL;
-    }
-    _PR_RUNQ_UNLOCK(cpu);
-
-#if !defined(_PR_LOCAL_THREADS_ONLY) && defined(XP_UNIX)
-
-    wakeup_cpus = PR_FALSE;
-    _PR_CPU_LIST_LOCK();
-    for (qp = _PR_CPUQ().next; qp != &_PR_CPUQ(); qp = qp->next) {
-        if (cpu != _PR_CPU_PTR(qp)) {
-            if ((thread = get_thread(_PR_CPU_PTR(qp), &wakeup_cpus))
-                                        != NULL) {
-                thread->cpu = cpu;
-                _PR_CPU_LIST_UNLOCK();
-                if (wakeup_cpus == PR_TRUE)
-                    _PR_MD_WAKEUP_CPUS();
-                goto found_thread;
-            }
-        }
-    }
-    _PR_CPU_LIST_UNLOCK();
-    if (wakeup_cpus == PR_TRUE)
-        _PR_MD_WAKEUP_CPUS();
-
-#endif        /* _PR_LOCAL_THREADS_ONLY */
-
-idle_thread:
-   /*
-    ** There are no threads to run. Switch to the idle thread
-    */
-    PR_LOG(_pr_sched_lm, PR_LOG_MAX, ("pausing"));
-    thread = _PR_MD_CURRENT_CPU()->idle_thread;
-
-found_thread:
-    PR_ASSERT((me == thread) || ((thread->state == _PR_RUNNABLE) &&
-                    (!(thread->no_sched))));
-
-    /* Resume the thread */
-    PR_LOG(_pr_sched_lm, PR_LOG_MAX,
-       ("switching to %d[%p]", thread->id, thread));
-    PR_ASSERT(thread->state != _PR_RUNNING);
-    thread->state = _PR_RUNNING;
- 
-    /* If we are on the runq, it just means that we went to sleep on some
-     * resource, and by the time we got here another real native thread had
-     * already given us the resource and put us back on the runqueue 
-     */
-	PR_ASSERT(thread->cpu == _PR_MD_CURRENT_CPU());
-    if (thread != me) 
-        _PR_MD_RESTORE_CONTEXT(thread);
-#if 0
-    /* XXXMB; with setjmp/longjmp it is impossible to land here, but 
-     * it is not with fibers... Is this a bad thing?  I believe it is 
-     * still safe.
-     */
-    PR_NOT_REACHED("impossible return from schedule");
-#endif
-}
-
-/*
-** Attaches a thread.  
-** Does not set the _PR_MD_CURRENT_THREAD.  
-** Does not specify the scope of the thread.
-*/
-static PRThread *
-_PR_AttachThread(PRThreadType type, PRThreadPriority priority,
-    PRThreadStack *stack)
-{
-#if defined(XP_MAC)
-#pragma unused (type)
-#endif
-
-    PRThread *thread;
-    char *mem;
-
-    if (priority > PR_PRIORITY_LAST) {
-        priority = PR_PRIORITY_LAST;
-    } else if (priority < PR_PRIORITY_FIRST) {
-        priority = PR_PRIORITY_FIRST;
-    }
-
-    mem = (char*) PR_CALLOC(sizeof(PRThread));
-    if (mem) {
-        thread = (PRThread*) mem;
-        thread->priority = priority;
-        thread->stack = stack;
-        thread->state = _PR_RUNNING;
-        PR_INIT_CLIST(&thread->lockList);
-        if (_PR_MD_NEW_LOCK(&thread->threadLock) == PR_FAILURE) {
-        PR_DELETE(thread);
-        return 0;
-    }
-
-        return thread;
-    }
-    return 0;
-}
-
-
-
-PR_IMPLEMENT(PRThread*) 
-_PR_NativeCreateThread(PRThreadType type,
-                     void (*start)(void *arg),
-                     void *arg,
-                     PRThreadPriority priority,
-                     PRThreadScope scope,
-                     PRThreadState state,
-                     PRUint32 stackSize,
-                     PRUint32 flags)
-{
-#if defined(XP_MAC)
-#pragma unused (scope)
-#endif
-
-    PRThread *thread;
-
-    thread = _PR_AttachThread(type, priority, NULL);
-
-    if (thread) {
-        PR_Lock(_pr_activeLock);
-        thread->flags = (flags | _PR_GLOBAL_SCOPE);
-        thread->id = ++_pr_utid;
-        if (type == PR_SYSTEM_THREAD) {
-            thread->flags |= _PR_SYSTEM;
-            _pr_systemActive++;
-        } else {
-            _pr_userActive++;
-        }
-        PR_Unlock(_pr_activeLock);
-
-        thread->stack = PR_NEWZAP(PRThreadStack);
-        if (!thread->stack) {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            goto done;
-        }
-        thread->stack->stackSize = stackSize?stackSize:_MD_DEFAULT_STACK_SIZE;
-        thread->stack->thr = thread;
-        thread->startFunc = start;
-        thread->arg = arg;
-
-        /* 
-          Set thread flags related to scope and joinable state. If joinable
-          thread, allocate a "termination" conidition variable.
-         */
-        if (state == PR_JOINABLE_THREAD) {
-            thread->term = PR_NewCondVar(_pr_terminationCVLock);
-        if (thread->term == NULL) {
-        PR_DELETE(thread->stack);
-        goto done;
-        }
-        }
-
-    thread->state = _PR_RUNNING;
-        if (_PR_MD_CREATE_THREAD(thread, _PR_NativeRunThread, priority,
-            scope,state,stackSize) == PR_SUCCESS) {
-            return thread;
-        }
-        if (thread->term) {
-            PR_DestroyCondVar(thread->term);
-            thread->term = NULL;
-        }
-    PR_DELETE(thread->stack);
-    }
-
-done:
-    if (thread) {
-    _PR_DecrActiveThreadCount(thread);
-        _PR_DestroyThread(thread);
-    }
-    return NULL;
-}
-
-/************************************************************************/
-
-PR_IMPLEMENT(PRThread*) _PR_CreateThread(PRThreadType type,
-                     void (*start)(void *arg),
-                     void *arg,
-                     PRThreadPriority priority,
-                     PRThreadScope scope,
-                     PRThreadState state,
-                     PRUint32 stackSize,
-                     PRUint32 flags)
-{
-    PRThread *me;
-    PRThread *thread = NULL;
-    PRThreadStack *stack;
-    char *top;
-    PRIntn is;
-    PRIntn native = 0;
-    PRIntn useRecycled = 0;
-    PRBool status;
-
-    /* 
-    First, pin down the priority.  Not all compilers catch passing out of
-    range enum here.  If we let bad values thru, priority queues won't work.
-    */
-    if (priority > PR_PRIORITY_LAST) {
-        priority = PR_PRIORITY_LAST;
-    } else if (priority < PR_PRIORITY_FIRST) {
-        priority = PR_PRIORITY_FIRST;
-    }
-        
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (! (flags & _PR_IDLE_THREAD))
-        me = _PR_MD_CURRENT_THREAD();
-
-#if    defined(_PR_GLOBAL_THREADS_ONLY)
-	/*
-	 * can create global threads only
-	 */
-    if (scope == PR_LOCAL_THREAD)
-    	scope = PR_GLOBAL_THREAD;
-#endif
-
-	if (_native_threads_only)
-		scope = PR_GLOBAL_THREAD;
-
-    native = (((scope == PR_GLOBAL_THREAD)|| (scope == PR_GLOBAL_BOUND_THREAD))
-							&& _PR_IS_NATIVE_THREAD_SUPPORTED());
-
-    _PR_ADJUST_STACKSIZE(stackSize);
-
-    if (native) {
-    /*
-     * clear the IDLE_THREAD flag which applies to LOCAL
-     * threads only
-     */
-    flags &= ~_PR_IDLE_THREAD;
-        flags |= _PR_GLOBAL_SCOPE;
-        if (_PR_NUM_DEADNATIVE > 0) {
-            _PR_DEADQ_LOCK;
-
-            if (_PR_NUM_DEADNATIVE == 0) { /* Thread safe check */
-                _PR_DEADQ_UNLOCK;
-            } else {
-                thread = _PR_THREAD_PTR(_PR_DEADNATIVEQ.next);
-                PR_REMOVE_LINK(&thread->links);
-                _PR_DEC_DEADNATIVE;
-                _PR_DEADQ_UNLOCK;
-
-                _PR_InitializeRecycledThread(thread);
-                thread->startFunc = start;
-                thread->arg = arg;
-            thread->flags = (flags | _PR_GLOBAL_SCOPE);
-            if (type == PR_SYSTEM_THREAD)
-            {
-                thread->flags |= _PR_SYSTEM;
-                PR_AtomicIncrement(&_pr_systemActive);
-            }
-            else PR_AtomicIncrement(&_pr_userActive);
-
-            if (state == PR_JOINABLE_THREAD) {
-                if (!thread->term) 
-                       thread->term = PR_NewCondVar(_pr_terminationCVLock);
-            }
-        else {
-                if(thread->term) {
-                    PR_DestroyCondVar(thread->term);
-                        thread->term = 0;
-            }
-            }
-
-                thread->priority = priority;
-        _PR_MD_SET_PRIORITY(&(thread->md), priority);
-        /* XXX what about stackSize? */
-        thread->state = _PR_RUNNING;
-                _PR_MD_WAKEUP_WAITER(thread);
-        return thread;
-            }
-        }
-        thread = _PR_NativeCreateThread(type, start, arg, priority, 
-                                            scope, state, stackSize, flags);
-    } else {
-        if (_PR_NUM_DEADUSER > 0) {
-            _PR_DEADQ_LOCK;
-
-            if (_PR_NUM_DEADUSER == 0) {  /* thread safe check */
-                _PR_DEADQ_UNLOCK;
-            } else {
-                PRCList *ptr;
-
-                /* Go down list checking for a recycled thread with a 
-                 * large enough stack.  XXXMB - this has a bad degenerate case.
-                 */
-                ptr = _PR_DEADUSERQ.next;
-                while( ptr != &_PR_DEADUSERQ ) {
-                    thread = _PR_THREAD_PTR(ptr);
-                    if ((thread->stack->stackSize >= stackSize) &&
-                (!thread->no_sched)) {
-                        PR_REMOVE_LINK(&thread->links);
-                        _PR_DEC_DEADUSER;
-                        break;
-                    } else {
-                        ptr = ptr->next;
-                        thread = NULL;
-                    }
-                } 
-
-                _PR_DEADQ_UNLOCK;
-
-               if (thread) {
-                    _PR_InitializeRecycledThread(thread);
-                    thread->startFunc = start;
-                    thread->arg = arg;
-                    thread->priority = priority;
-            if (state == PR_JOINABLE_THREAD) {
-            if (!thread->term) 
-               thread->term = PR_NewCondVar(_pr_terminationCVLock);
-            } else {
-            if(thread->term) {
-               PR_DestroyCondVar(thread->term);
-                thread->term = 0;
-            }
-            }
-                    useRecycled++;
-                }
-            }
-        } 
-        if (thread == NULL) {
-#ifndef HAVE_CUSTOM_USER_THREADS
-            stack = _PR_NewStack(stackSize);
-            if (!stack) {
-                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                return NULL;
-            }
-
-            /* Allocate thread object and per-thread data off the top of the stack*/
-            top = stack->stackTop;
-#ifdef HAVE_STACK_GROWING_UP
-            thread = (PRThread*) top;
-            top = top + sizeof(PRThread);
-            /*
-             * Make stack 64-byte aligned
-             */
-            if ((PRUptrdiff)top & 0x3f) {
-                top = (char*)(((PRUptrdiff)top + 0x40) & ~0x3f);
-            }
-#else
-            top = top - sizeof(PRThread);
-            thread = (PRThread*) top;
-            /*
-             * Make stack 64-byte aligned
-             */
-            if ((PRUptrdiff)top & 0x3f) {
-                top = (char*)((PRUptrdiff)top & ~0x3f);
-            }
-#endif
-#if defined(GC_LEAK_DETECTOR)
-            /*
-             * sorry, it is not safe to allocate the thread on the stack,
-             * because we assign to this object before the GC can learn
-             * about this thread. we'll just leak thread objects instead.
-             */
-            thread = PR_NEW(PRThread);
-#endif
-            stack->thr = thread;
-            memset(thread, 0, sizeof(PRThread));
-            thread->threadAllocatedOnStack = 1;
-#else
-            thread = _PR_MD_CREATE_USER_THREAD(stackSize, start, arg);
-            if (!thread) {
-                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-                return NULL;
-            }
-            thread->threadAllocatedOnStack = 0;
-            stack = NULL;
-            top = NULL;
-#endif
-
-            /* Initialize thread */
-            thread->tpdLength = 0;
-            thread->privateData = NULL;
-            thread->stack = stack;
-            thread->priority = priority;
-            thread->startFunc = start;
-            thread->arg = arg;
-            PR_INIT_CLIST(&thread->lockList);
-
-            if (_PR_MD_INIT_THREAD(thread) == PR_FAILURE) {
-                if (thread->threadAllocatedOnStack == 1)
-                    _PR_FreeStack(thread->stack);
-                else {
-                    PR_DELETE(thread);
-                }
-                PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-                return NULL;
-            }
-
-            if (_PR_MD_NEW_LOCK(&thread->threadLock) == PR_FAILURE) {
-                if (thread->threadAllocatedOnStack == 1)
-                    _PR_FreeStack(thread->stack);
-                else {
-                    PR_DELETE(thread->privateData);
-                    PR_DELETE(thread);
-                }
-                PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-                return NULL;
-            }
-
-            _PR_MD_INIT_CONTEXT(thread, top, _PR_UserRunThread, &status);
-
-            if (status == PR_FALSE) {
-                _PR_MD_FREE_LOCK(&thread->threadLock);
-                if (thread->threadAllocatedOnStack == 1)
-                    _PR_FreeStack(thread->stack);
-                else {
-                    PR_DELETE(thread->privateData);
-                    PR_DELETE(thread);
-                }
-                return NULL;
-            }
-
-            /* 
-              Set thread flags related to scope and joinable state. If joinable
-              thread, allocate a "termination" condition variable.
-            */
-            if (state == PR_JOINABLE_THREAD) {
-                thread->term = PR_NewCondVar(_pr_terminationCVLock);
-                if (thread->term == NULL) {
-                    _PR_MD_FREE_LOCK(&thread->threadLock);
-                    if (thread->threadAllocatedOnStack == 1)
-                        _PR_FreeStack(thread->stack);
-                    else {
-                        PR_DELETE(thread->privateData);
-                        PR_DELETE(thread);
-                    }
-                    return NULL;
-                }
-            }
-  
-        }
-  
-        /* Update thread type counter */
-        PR_Lock(_pr_activeLock);
-        thread->flags = flags;
-        thread->id = ++_pr_utid;
-        if (type == PR_SYSTEM_THREAD) {
-            thread->flags |= _PR_SYSTEM;
-            _pr_systemActive++;
-        } else {
-            _pr_userActive++;
-        }
-
-        /* Make thread runnable */
-        thread->state = _PR_RUNNABLE;
-    /*
-     * Add to list of active threads
-     */
-        PR_Unlock(_pr_activeLock);
-
-        if ((! (thread->flags & _PR_IDLE_THREAD)) && _PR_IS_NATIVE_THREAD(me) )
-            thread->cpu = _PR_GetPrimordialCPU();
-        else
-            thread->cpu = _PR_MD_CURRENT_CPU();
-
-        PR_ASSERT(!_PR_IS_NATIVE_THREAD(thread));
-
-        if ((! (thread->flags & _PR_IDLE_THREAD)) && !_PR_IS_NATIVE_THREAD(me)) {
-            _PR_INTSOFF(is);
-            _PR_RUNQ_LOCK(thread->cpu);
-            _PR_ADD_RUNQ(thread, thread->cpu, priority);
-            _PR_RUNQ_UNLOCK(thread->cpu);
-        }
-
-        if (thread->flags & _PR_IDLE_THREAD) {
-            /*
-            ** If the creating thread is a kernel thread, we need to
-            ** awaken the user thread idle thread somehow; potentially
-            ** it could be sleeping in its idle loop, and we need to poke
-            ** it.  To do so, wake the idle thread...  
-            */
-            _PR_MD_WAKEUP_WAITER(NULL);
-        } else if (_PR_IS_NATIVE_THREAD(me)) {
-            _PR_MD_WAKEUP_WAITER(thread);
-        }
-        if ((! (thread->flags & _PR_IDLE_THREAD)) && !_PR_IS_NATIVE_THREAD(me) )
-            _PR_INTSON(is);
-    }
-
-    return thread;
-}
-
-PR_IMPLEMENT(PRThread*) PR_CreateThread(PRThreadType type,
-                     void (*start)(void *arg),
-                     void *arg,
-                     PRThreadPriority priority,
-                     PRThreadScope scope,
-                     PRThreadState state,
-                     PRUint32 stackSize)
-{
-    return _PR_CreateThread(type, start, arg, priority, scope, state, 
-                            stackSize, 0);
-}
-
-/*
-** Associate a thread object with an existing native thread.
-**     "type" is the type of thread object to attach
-**     "priority" is the priority to assign to the thread
-**     "stack" defines the shape of the threads stack
-**
-** This can return NULL if some kind of error occurs, or if memory is
-** tight.
-**
-** This call is not normally needed unless you create your own native
-** thread. PR_Init does this automatically for the primordial thread.
-*/
-PRThread* _PRI_AttachThread(PRThreadType type,
-    PRThreadPriority priority, PRThreadStack *stack, PRUint32 flags)
-{
-    PRThread *thread;
-
-    if ((thread = _PR_MD_GET_ATTACHED_THREAD()) != NULL) {
-        return thread;
-    }
-    _PR_MD_SET_CURRENT_THREAD(NULL);
-
-    /* Clear out any state if this thread was attached before */
-    _PR_MD_SET_CURRENT_CPU(NULL);
-
-    thread = _PR_AttachThread(type, priority, stack);
-    if (thread) {
-        PRIntn is;
-
-        _PR_MD_SET_CURRENT_THREAD(thread);
-
-        thread->flags = flags | _PR_GLOBAL_SCOPE | _PR_ATTACHED;
-
-        if (!stack) {
-            thread->stack = PR_NEWZAP(PRThreadStack);
-            if (!thread->stack) {
-                _PR_DestroyThread(thread);
-                return NULL;
-            }
-            thread->stack->stackSize = _MD_DEFAULT_STACK_SIZE;
-        }
-        PR_INIT_CLIST(&thread->links);
-
-        if (_PR_MD_INIT_ATTACHED_THREAD(thread) == PR_FAILURE) {
-                PR_DELETE(thread->stack);
-                _PR_DestroyThread(thread);
-                return NULL;
-        }
-
-        _PR_MD_SET_CURRENT_CPU(NULL);
-
-        if (_PR_MD_CURRENT_CPU()) {
-            _PR_INTSOFF(is);
-            PR_Lock(_pr_activeLock);
-        }
-        if (type == PR_SYSTEM_THREAD) {
-            thread->flags |= _PR_SYSTEM;
-            _pr_systemActive++;
-        } else {
-            _pr_userActive++;
-        }
-        if (_PR_MD_CURRENT_CPU()) {
-            PR_Unlock(_pr_activeLock);
-            _PR_INTSON(is);
-        }
-    }
-    return thread;
-}
-
-PR_IMPLEMENT(PRThread*) PR_AttachThread(PRThreadType type,
-    PRThreadPriority priority, PRThreadStack *stack)
-{
-#ifdef XP_MAC
-#pragma unused( type, priority, stack )
-#endif
-    return PR_GetCurrentThread();
-}
-
-PR_IMPLEMENT(void) PR_DetachThread(void)
-{
-    /*
-     * On IRIX, Solaris, and Windows, foreign threads are detached when
-     * they terminate.
-     */
-#if !defined(IRIX) && !defined(WIN32) \
-        && !(defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY))
-    PRThread *me;
-    if (_pr_initialized) {
-        me = _PR_MD_GET_ATTACHED_THREAD();
-        if ((me != NULL) && (me->flags & _PR_ATTACHED))
-            _PRI_DetachThread();
-    }
-#endif
-}
-
-void _PRI_DetachThread(void)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-	if (me->flags & _PR_PRIMORDIAL) {
-		/*
-		 * ignore, if primordial thread
-		 */
-		return;
-	}
-    PR_ASSERT(me->flags & _PR_ATTACHED);
-    PR_ASSERT(_PR_IS_NATIVE_THREAD(me));
-    _PR_CleanupThread(me);
-    PR_DELETE(me->privateData);
-
-    _PR_DecrActiveThreadCount(me);
-
-    _PR_MD_CLEAN_THREAD(me);
-    _PR_MD_SET_CURRENT_THREAD(NULL);
-    if (!me->threadAllocatedOnStack) 
-        PR_DELETE(me->stack);
-    _PR_MD_FREE_LOCK(&me->threadLock);
-    PR_DELETE(me);
-}
-
-/*
-** Wait for thread termination:
-**     "thread" is the target thread 
-**
-** This can return PR_FAILURE if no joinable thread could be found 
-** corresponding to the specified target thread.
-**
-** The calling thread is suspended until the target thread completes.
-** Several threads cannot wait for the same thread to complete; one thread
-** will complete successfully and others will terminate with an error PR_FAILURE.
-** The calling thread will not be blocked if the target thread has already
-** terminated.
-*/
-PR_IMPLEMENT(PRStatus) PR_JoinThread(PRThread *thread)
-{
-    PRIntn is;
-    PRCondVar *term;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSOFF(is);
-    term = thread->term;
-    /* can't join a non-joinable thread */
-    if (term == NULL) {
-        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-        goto ErrorExit;
-    }
-
-    /* multiple threads can't wait on the same joinable thread */
-    if (term->condQ.next != &term->condQ) {
-        goto ErrorExit;
-    }
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSON(is);
-
-    /* wait for the target thread's termination cv invariant */
-    PR_Lock (_pr_terminationCVLock);
-    while (thread->state != _PR_JOIN_WAIT) {
-        (void) PR_WaitCondVar(term, PR_INTERVAL_NO_TIMEOUT);
-    }
-    (void) PR_Unlock (_pr_terminationCVLock);
-    
-    /* 
-     Remove target thread from global waiting to join Q; make it runnable
-     again and put it back on its run Q.  When it gets scheduled later in
-     _PR_RunThread code, it will clean up its stack.
-    */    
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSOFF(is);
-    thread->state = _PR_RUNNABLE;
-    if ( !_PR_IS_NATIVE_THREAD(thread) ) {
-        _PR_THREAD_LOCK(thread);
-
-        _PR_MISCQ_LOCK(thread->cpu);
-        _PR_DEL_JOINQ(thread);
-        _PR_MISCQ_UNLOCK(thread->cpu);
-
-        _PR_AddThreadToRunQ(me, thread);
-        _PR_THREAD_UNLOCK(thread);
-    }
-    if (!_PR_IS_NATIVE_THREAD(me))
-        _PR_INTSON(is);
-
-    _PR_MD_WAKEUP_WAITER(thread);
-
-    return PR_SUCCESS;
-
-ErrorExit:
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
-    return PR_FAILURE;   
-}
-
-PR_IMPLEMENT(void) PR_SetThreadPriority(PRThread *thread,
-    PRThreadPriority newPri)
-{
-
-    /* 
-    First, pin down the priority.  Not all compilers catch passing out of
-    range enum here.  If we let bad values thru, priority queues won't work.
-    */
-    if ((PRIntn)newPri > (PRIntn)PR_PRIORITY_LAST) {
-        newPri = PR_PRIORITY_LAST;
-    } else if ((PRIntn)newPri < (PRIntn)PR_PRIORITY_FIRST) {
-        newPri = PR_PRIORITY_FIRST;
-    }
-        
-    if ( _PR_IS_NATIVE_THREAD(thread) ) {
-        thread->priority = newPri;
-        _PR_MD_SET_PRIORITY(&(thread->md), newPri);
-    } else _PR_SetThreadPriority(thread, newPri);
-}
-
-
-/*
-** This routine prevents all other threads from running. This call is needed by 
-** the garbage collector.
-*/
-PR_IMPLEMENT(void) PR_SuspendAll(void)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRCList *qp;
-
-    /*
-     * Stop all user and native threads which are marked GC able.
-     */
-    PR_Lock(_pr_activeLock);
-    suspendAllOn = PR_TRUE;
-    suspendAllThread = _PR_MD_CURRENT_THREAD();
-    _PR_MD_BEGIN_SUSPEND_ALL();
-    for (qp = _PR_ACTIVE_LOCAL_THREADQ().next;
-        qp != &_PR_ACTIVE_LOCAL_THREADQ(); qp = qp->next) {
-        if ((me != _PR_ACTIVE_THREAD_PTR(qp)) && 
-            _PR_IS_GCABLE_THREAD(_PR_ACTIVE_THREAD_PTR(qp))) {
-            _PR_Suspend(_PR_ACTIVE_THREAD_PTR(qp));
-                PR_ASSERT((_PR_ACTIVE_THREAD_PTR(qp))->state != _PR_RUNNING);
-            }
-    }
-    for (qp = _PR_ACTIVE_GLOBAL_THREADQ().next;
-        qp != &_PR_ACTIVE_GLOBAL_THREADQ(); qp = qp->next) {
-        if ((me != _PR_ACTIVE_THREAD_PTR(qp)) &&
-            _PR_IS_GCABLE_THREAD(_PR_ACTIVE_THREAD_PTR(qp)))
-            /* PR_Suspend(_PR_ACTIVE_THREAD_PTR(qp)); */
-                _PR_MD_SUSPEND_THREAD(_PR_ACTIVE_THREAD_PTR(qp)); 
-    }
-    _PR_MD_END_SUSPEND_ALL();
-}
-
-/*
-** This routine unblocks all other threads that were suspended from running by 
-** PR_SuspendAll(). This call is needed by the garbage collector.
-*/
-PR_IMPLEMENT(void) PR_ResumeAll(void)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    PRCList *qp;
-
-    /*
-     * Resume all user and native threads which are marked GC able.
-     */
-    _PR_MD_BEGIN_RESUME_ALL();
-    for (qp = _PR_ACTIVE_LOCAL_THREADQ().next;
-        qp != &_PR_ACTIVE_LOCAL_THREADQ(); qp = qp->next) {
-        if ((me != _PR_ACTIVE_THREAD_PTR(qp)) && 
-            _PR_IS_GCABLE_THREAD(_PR_ACTIVE_THREAD_PTR(qp)))
-            _PR_Resume(_PR_ACTIVE_THREAD_PTR(qp));
-    }
-    for (qp = _PR_ACTIVE_GLOBAL_THREADQ().next;
-        qp != &_PR_ACTIVE_GLOBAL_THREADQ(); qp = qp->next) {
-        if ((me != _PR_ACTIVE_THREAD_PTR(qp)) &&
-            _PR_IS_GCABLE_THREAD(_PR_ACTIVE_THREAD_PTR(qp)))
-                _PR_MD_RESUME_THREAD(_PR_ACTIVE_THREAD_PTR(qp));
-    }
-    _PR_MD_END_RESUME_ALL();
-    suspendAllThread = NULL;
-    suspendAllOn = PR_FALSE;
-    PR_Unlock(_pr_activeLock);
-}
-
-PR_IMPLEMENT(PRStatus) PR_EnumerateThreads(PREnumerator func, void *arg)
-{
-    PRCList *qp, *qp_next;
-    PRIntn i = 0;
-    PRStatus rv = PR_SUCCESS;
-    PRThread* t;
-
-    /*
-    ** Currently Enumerate threads happen only with suspension and
-    ** pr_activeLock held
-    */
-    PR_ASSERT(suspendAllOn);
-
-    /* Steve Morse, 4-23-97: Note that we can't walk a queue by taking
-     * qp->next after applying the function "func".  In particular, "func"
-     * might remove the thread from the queue and put it into another one in
-     * which case qp->next no longer points to the next entry in the original
-     * queue.
-     *
-     * To get around this problem, we save qp->next in qp_next before applying
-     * "func" and use that saved value as the next value after applying "func".
-     */
-
-    /*
-     * Traverse the list of local and global threads
-     */
-    for (qp = _PR_ACTIVE_LOCAL_THREADQ().next;
-         qp != &_PR_ACTIVE_LOCAL_THREADQ(); qp = qp_next)
-    {
-        qp_next = qp->next;
-        t = _PR_ACTIVE_THREAD_PTR(qp);
-        if (_PR_IS_GCABLE_THREAD(t))
-        {
-            rv = (*func)(t, i, arg);
-            if (rv != PR_SUCCESS)
-                return rv;
-            i++;
-        }
-    }
-    for (qp = _PR_ACTIVE_GLOBAL_THREADQ().next;
-         qp != &_PR_ACTIVE_GLOBAL_THREADQ(); qp = qp_next)
-    {
-        qp_next = qp->next;
-        t = _PR_ACTIVE_THREAD_PTR(qp);
-        if (_PR_IS_GCABLE_THREAD(t))
-        {
-            rv = (*func)(t, i, arg);
-            if (rv != PR_SUCCESS)
-                return rv;
-            i++;
-        }
-    }
-    return rv;
-}
-
-/* FUNCTION: _PR_AddSleepQ
-** DESCRIPTION:
-**    Adds a thread to the sleep/pauseQ.
-** RESTRICTIONS:
-**    Caller must have the RUNQ lock.
-**    Caller must be a user level thread
-*/
-PR_IMPLEMENT(void)
-_PR_AddSleepQ(PRThread *thread, PRIntervalTime timeout)
-{
-    _PRCPU *cpu = thread->cpu;
-
-    if (timeout == PR_INTERVAL_NO_TIMEOUT) {
-        /* append the thread to the global pause Q */
-        PR_APPEND_LINK(&thread->links, &_PR_PAUSEQ(thread->cpu));
-        thread->flags |= _PR_ON_PAUSEQ;
-    } else {
-        PRIntervalTime sleep;
-        PRCList *q;
-        PRThread *t;
-
-        /* sort onto global sleepQ */
-        sleep = timeout;
-
-        /* Check if we are longest timeout */
-        if (timeout >= _PR_SLEEPQMAX(cpu)) {
-            PR_INSERT_BEFORE(&thread->links, &_PR_SLEEPQ(cpu));
-            thread->sleep = timeout - _PR_SLEEPQMAX(cpu);
-            _PR_SLEEPQMAX(cpu) = timeout;
-        } else {
-            /* Sort thread into global sleepQ at appropriate point */
-            q = _PR_SLEEPQ(cpu).next;
-
-            /* Now scan the list for where to insert this entry */
-            while (q != &_PR_SLEEPQ(cpu)) {
-                t = _PR_THREAD_PTR(q);
-                if (sleep < t->sleep) {
-                    /* Found sleeper to insert in front of */
-                    break;
-                }
-                sleep -= t->sleep;
-                q = q->next;
-            }
-            thread->sleep = sleep;
-            PR_INSERT_BEFORE(&thread->links, q);
-
-            /*
-            ** Subtract our sleep time from the sleeper that follows us (there
-            ** must be one) so that they remain relative to us.
-            */
-            PR_ASSERT (thread->links.next != &_PR_SLEEPQ(cpu));
-          
-            t = _PR_THREAD_PTR(thread->links.next);
-            PR_ASSERT(_PR_THREAD_PTR(t->links.prev) == thread);
-            t->sleep -= sleep;
-        }
-
-        thread->flags |= _PR_ON_SLEEPQ;
-    }
-}
-
-/* FUNCTION: _PR_DelSleepQ
-** DESCRIPTION:
-**    Removes a thread from the sleep/pauseQ.
-** INPUTS:
-**    If propogate_time is true, then the thread following the deleted
-**    thread will be get the time from the deleted thread.  This is used
-**    when deleting a sleeper that has not timed out.
-** RESTRICTIONS:
-**    Caller must have the RUNQ lock.
-**    Caller must be a user level thread
-*/
-PR_IMPLEMENT(void)
-_PR_DelSleepQ(PRThread *thread, PRBool propogate_time)
-{
-    _PRCPU *cpu = thread->cpu;
-
-    /* Remove from pauseQ/sleepQ */
-    if (thread->flags & (_PR_ON_PAUSEQ|_PR_ON_SLEEPQ)) {
-        if (thread->flags & _PR_ON_SLEEPQ) {
-            PRCList *q = thread->links.next;
-            if (q != &_PR_SLEEPQ(cpu)) {
-                if (propogate_time == PR_TRUE) {
-                    PRThread *after = _PR_THREAD_PTR(q);
-                    after->sleep += thread->sleep;
-                } else 
-                    _PR_SLEEPQMAX(cpu) -= thread->sleep;
-            } else {
-                /* Check if prev is the beggining of the list; if so,
-                 * we are the only element on the list.  
-                 */
-                if (thread->links.prev != &_PR_SLEEPQ(cpu))
-                    _PR_SLEEPQMAX(cpu) -= thread->sleep;
-                else
-                    _PR_SLEEPQMAX(cpu) = 0;
-            }
-            thread->flags &= ~_PR_ON_SLEEPQ;
-        } else {
-            thread->flags &= ~_PR_ON_PAUSEQ;
-        }
-        PR_REMOVE_LINK(&thread->links);
-    } else 
-        PR_ASSERT(0);
-}
-
-void
-_PR_AddThreadToRunQ(
-    PRThread *me,     /* the current thread */
-    PRThread *thread) /* the local thread to be added to a run queue */
-{
-    PRThreadPriority pri = thread->priority;
-    _PRCPU *cpu = thread->cpu;
-
-    PR_ASSERT(!_PR_IS_NATIVE_THREAD(thread));
-
-#if defined(WINNT)
-    /*
-     * On NT, we can only reliably know that the current CPU
-     * is not idle.  We add the awakened thread to the run
-     * queue of its CPU if its CPU is the current CPU.
-     * For any other CPU, we don't really know whether it
-     * is busy or idle.  So in all other cases, we just
-     * "post" the awakened thread to the IO completion port
-     * for the next idle CPU to execute (this is done in
-     * _PR_MD_WAKEUP_WAITER).
-	 * Threads with a suspended I/O operation remain bound to
-	 * the same cpu until I/O is cancelled
-     *
-     * NOTE: the boolean expression below must be the exact
-     * opposite of the corresponding boolean expression in
-     * _PR_MD_WAKEUP_WAITER.
-     */
-    if ((!_PR_IS_NATIVE_THREAD(me) && (cpu == me->cpu)) ||
-					(thread->md.thr_bound_cpu)) {
-		PR_ASSERT(!thread->md.thr_bound_cpu ||
-							(thread->md.thr_bound_cpu == cpu));
-        _PR_RUNQ_LOCK(cpu);
-        _PR_ADD_RUNQ(thread, cpu, pri);
-        _PR_RUNQ_UNLOCK(cpu);
-    }
-#else
-    _PR_RUNQ_LOCK(cpu);
-    _PR_ADD_RUNQ(thread, cpu, pri);
-    _PR_RUNQ_UNLOCK(cpu);
-    if (!_PR_IS_NATIVE_THREAD(me) && (cpu == me->cpu)) {
-        if (pri > me->priority) {
-            _PR_SET_RESCHED_FLAG();
-        }
-    }
-#endif
-}
diff --git a/libs/js/nsprpub/pr/src/threads/prcmon.c b/libs/js/nsprpub/pr/src/threads/prcmon.c
deleted file mode 100644
index 0de8e039d9..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prcmon.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <stdlib.h>
-#include <stddef.h>
-
-/* Lock used to lock the monitor cache */
-#ifdef _PR_NO_PREEMPT
-#define _PR_NEW_LOCK_MCACHE()
-#define _PR_LOCK_MCACHE()
-#define _PR_UNLOCK_MCACHE()
-#else
-#ifdef _PR_LOCAL_THREADS_ONLY
-#define _PR_NEW_LOCK_MCACHE()
-#define _PR_LOCK_MCACHE() { PRIntn _is; _PR_INTSOFF(_is)
-#define _PR_UNLOCK_MCACHE() _PR_INTSON(_is); }
-#else
-PRLock *_pr_mcacheLock;
-#define _PR_NEW_LOCK_MCACHE() (_pr_mcacheLock = PR_NewLock())
-#define _PR_LOCK_MCACHE() PR_Lock(_pr_mcacheLock)
-#define _PR_UNLOCK_MCACHE() PR_Unlock(_pr_mcacheLock)
-#endif
-#endif
-
-/************************************************************************/
-
-typedef struct MonitorCacheEntryStr MonitorCacheEntry;
-
-struct MonitorCacheEntryStr {
-    MonitorCacheEntry*  next;
-    void*               address;
-    PRMonitor*          mon;
-    long                cacheEntryCount;
-};
-
-static PRUint32 hash_mask;
-static PRUintn num_hash_buckets;
-static PRUintn num_hash_buckets_log2;
-static MonitorCacheEntry **hash_buckets;
-static MonitorCacheEntry *free_entries;
-static PRUintn num_free_entries;
-static PRBool expanding;
-int _pr_mcache_ready;
-
-static void (*OnMonitorRecycle)(void *address);
-
-#define HASH(address)                               \
-    ((PRUint32) ( ((PRUptrdiff)(address) >> 2) ^    \
-                  ((PRUptrdiff)(address) >> 10) )   \
-     & hash_mask)
-
-/*
-** Expand the monitor cache. This grows the hash buckets and allocates a
-** new chunk of cache entries and throws them on the free list. We keep
-** as many hash buckets as there are entries.
-**
-** Because we call malloc and malloc may need the monitor cache, we must
-** ensure that there are several free monitor cache entries available for
-** malloc to get. FREE_THRESHOLD is used to prevent monitor cache
-** starvation during monitor cache expansion.
-*/
-
-#define FREE_THRESHOLD  5
-
-static PRStatus ExpandMonitorCache(PRUintn new_size_log2)
-{
-    MonitorCacheEntry **old_hash_buckets, *p;
-    PRUintn i, entries, old_num_hash_buckets, added;
-    MonitorCacheEntry **new_hash_buckets, *new_entries;
-
-    entries = 1L << new_size_log2;
-
-    /*
-    ** Expand the monitor-cache-entry free list
-    */
-    new_entries = (MonitorCacheEntry*)
-        PR_CALLOC(entries * sizeof(MonitorCacheEntry));
-    if (NULL == new_entries) return PR_FAILURE;
-
-    /*
-    ** Allocate system monitors for the new monitor cache entries. If we
-    ** run out of system monitors, break out of the loop.
-    */
-    for (i = 0, added = 0, p = new_entries; i < entries; i++, p++, added++) {
-        p->mon = PR_NewMonitor();
-        if (!p->mon)
-            break;
-    }
-    if (added != entries) {
-        if (added == 0) {
-            /* Totally out of system monitors. Lossage abounds */
-            PR_DELETE(new_entries);
-            return PR_FAILURE;
-        }
-
-        /*
-        ** We were able to allocate some of the system monitors. Use
-        ** realloc to shrink down the new_entries memory
-        */
-        p = (MonitorCacheEntry*)
-            PR_REALLOC(new_entries, added * sizeof(MonitorCacheEntry));
-        if (p == 0) {
-            /*
-            ** Total lossage. We just leaked a bunch of system monitors
-            ** all over the floor. This should never ever happen.
-            */
-            PR_ASSERT(p != 0);
-            return PR_FAILURE;
-        }
-    }
-
-    /*
-    ** Now that we have allocated all of the system monitors, build up
-    ** the new free list. We can just update the free_list because we own
-    ** the mcache-lock and we aren't calling anyone who might want to use
-    ** it.
-    */
-    for (i = 0, p = new_entries; i < added - 1; i++, p++)
-        p->next = p + 1;
-    p->next = free_entries;
-    free_entries = new_entries;
-    num_free_entries += added;
-
-    /* Try to expand the hash table */
-    new_hash_buckets = (MonitorCacheEntry**)
-        PR_CALLOC(entries * sizeof(MonitorCacheEntry*));
-    if (NULL == new_hash_buckets) {
-        /*
-        ** Partial lossage. In this situation we don't get any more hash
-        ** buckets, which just means that the table lookups will take
-        ** longer. This is bad, but not fatal
-        */
-        PR_LOG(_pr_cmon_lm, PR_LOG_WARNING,
-               ("unable to grow monitor cache hash buckets"));
-        return PR_SUCCESS;
-    }
-
-    /*
-    ** Compute new hash mask value. This value is used to mask an address
-    ** until it's bits are in the right spot for indexing into the hash
-    ** table.
-    */
-    hash_mask = entries - 1;
-
-    /*
-    ** Expand the hash table. We have to rehash everything in the old
-    ** table into the new table.
-    */
-    old_hash_buckets = hash_buckets;
-    old_num_hash_buckets = num_hash_buckets;
-    for (i = 0; i < old_num_hash_buckets; i++) {
-        p = old_hash_buckets[i];
-        while (p) {
-            MonitorCacheEntry *next = p->next;
-
-            /* Hash based on new table size, and then put p in the new table */
-            PRUintn hash = HASH(p->address);
-            p->next = new_hash_buckets[hash];
-            new_hash_buckets[hash] = p;
-
-            p = next;
-        }
-    }
-
-    /*
-    ** Switch over to new hash table and THEN call free of the old
-    ** table. Since free might re-enter _pr_mcache_lock, things would
-    ** break terribly if it used the old hash table.
-    */
-    hash_buckets = new_hash_buckets;
-    num_hash_buckets = entries;
-    num_hash_buckets_log2 = new_size_log2;
-    PR_DELETE(old_hash_buckets);
-
-    PR_LOG(_pr_cmon_lm, PR_LOG_NOTICE,
-           ("expanded monitor cache to %d (buckets %d)",
-            num_free_entries, entries));
-
-    return PR_SUCCESS;
-}  /* ExpandMonitorCache */
-
-/*
-** Lookup a monitor cache entry by address. Return a pointer to the
-** pointer to the monitor cache entry on success, null on failure.
-*/
-static MonitorCacheEntry **LookupMonitorCacheEntry(void *address)
-{
-    PRUintn hash;
-    MonitorCacheEntry **pp, *p;
-
-    hash = HASH(address);
-    pp = hash_buckets + hash;
-    while ((p = *pp) != 0) {
-        if (p->address == address) {
-            if (p->cacheEntryCount > 0)
-                return pp;
-            return NULL;
-        }
-        pp = &p->next;
-    }
-    return NULL;
-}
-
-/*
-** Try to create a new cached monitor. If it's already in the cache,
-** great - return it. Otherwise get a new free cache entry and set it
-** up. If the cache free space is getting low, expand the cache.
-*/
-static PRMonitor *CreateMonitor(void *address)
-{
-    PRUintn hash;
-    MonitorCacheEntry **pp, *p;
-
-    hash = HASH(address);
-    pp = hash_buckets + hash;
-    while ((p = *pp) != 0) {
-        if (p->address == address) goto gotit;
-
-        pp = &p->next;
-    }
-
-    /* Expand the monitor cache if we have run out of free slots in the table */
-    if (num_free_entries < FREE_THRESHOLD) {
-        /* Expand monitor cache */
-
-        /*
-        ** This function is called with the lock held. So what's the 'expanding'
-        ** boolean all about? Seems a bit redundant.
-        */
-        if (!expanding) {
-            PRStatus rv;
-
-            expanding = PR_TRUE;
-            rv = ExpandMonitorCache(num_hash_buckets_log2 + 1);
-            expanding = PR_FALSE;
-            if (PR_FAILURE == rv)  return NULL;
-
-            /* redo the hash because it'll be different now */
-            hash = HASH(address);
-        } else {
-            /*
-            ** We are in process of expanding and we need a cache
-            ** monitor.  Make sure we have enough!
-            */
-            PR_ASSERT(num_free_entries > 0);
-        }
-    }
-
-    /* Make a new monitor */
-    p = free_entries;
-    free_entries = p->next;
-    num_free_entries--;
-    if (OnMonitorRecycle && p->address)
-        OnMonitorRecycle(p->address);
-    p->address = address;
-    p->next = hash_buckets[hash];
-    hash_buckets[hash] = p;
-    PR_ASSERT(p->cacheEntryCount == 0);
-
-  gotit:
-    p->cacheEntryCount++;
-    return p->mon;
-}
-
-/*
-** Initialize the monitor cache
-*/
-void _PR_InitCMon(void)
-{
-    _PR_NEW_LOCK_MCACHE();
-    ExpandMonitorCache(3);
-    _pr_mcache_ready = 1;
-}
-
-/*
-** Create monitor for address. Don't enter the monitor while we have the
-** mcache locked because we might block!
-*/
-PR_IMPLEMENT(PRMonitor*) PR_CEnterMonitor(void *address)
-{
-    PRMonitor *mon;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    _PR_LOCK_MCACHE();
-    mon = CreateMonitor(address);
-    _PR_UNLOCK_MCACHE();
-
-    if (!mon) return NULL;
-
-    PR_EnterMonitor(mon);
-    return mon;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CExitMonitor(void *address)
-{
-    MonitorCacheEntry **pp, *p;
-    PRStatus status = PR_SUCCESS;
-
-    _PR_LOCK_MCACHE();
-    pp = LookupMonitorCacheEntry(address);
-    if (pp != NULL) {
-        p = *pp;
-        if (--p->cacheEntryCount == 0) {
-            /*
-            ** Nobody is using the system monitor. Put it on the cached free
-            ** list. We are safe from somebody trying to use it because we
-            ** have the mcache locked.
-            */
-            p->address = 0;             /* defensive move */
-            *pp = p->next;              /* unlink from hash_buckets */
-            p->next = free_entries;     /* link into free list */
-            free_entries = p;
-            num_free_entries++;         /* count it as free */
-        }
-        status = PR_ExitMonitor(p->mon);
-    } else {
-        status = PR_FAILURE;
-    }
-    _PR_UNLOCK_MCACHE();
-
-    return status;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CWait(void *address, PRIntervalTime ticks)
-{
-    MonitorCacheEntry **pp;
-    PRMonitor *mon;
-
-    _PR_LOCK_MCACHE();
-    pp = LookupMonitorCacheEntry(address);
-    mon = pp ? ((*pp)->mon) : NULL;
-    _PR_UNLOCK_MCACHE();
-
-    if (mon == NULL)
-        return PR_FAILURE;
-    return PR_Wait(mon, ticks);
-}
-
-PR_IMPLEMENT(PRStatus) PR_CNotify(void *address)
-{
-    MonitorCacheEntry **pp;
-    PRMonitor *mon;
-
-    _PR_LOCK_MCACHE();
-    pp = LookupMonitorCacheEntry(address);
-    mon = pp ? ((*pp)->mon) : NULL;
-    _PR_UNLOCK_MCACHE();
-
-    if (mon == NULL)
-        return PR_FAILURE;
-    return PR_Notify(mon);
-}
-
-PR_IMPLEMENT(PRStatus) PR_CNotifyAll(void *address)
-{
-    MonitorCacheEntry **pp;
-    PRMonitor *mon;
-
-    _PR_LOCK_MCACHE();
-    pp = LookupMonitorCacheEntry(address);
-    mon = pp ? ((*pp)->mon) : NULL;
-    _PR_UNLOCK_MCACHE();
-
-    if (mon == NULL)
-        return PR_FAILURE;
-    return PR_NotifyAll(mon);
-}
-
-PR_IMPLEMENT(void)
-PR_CSetOnMonitorRecycle(void (*callback)(void *address))
-{
-    OnMonitorRecycle = callback;
-}
diff --git a/libs/js/nsprpub/pr/src/threads/prcthr.c b/libs/js/nsprpub/pr/src/threads/prcthr.c
deleted file mode 100644
index 0b713cac4b..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prcthr.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#if defined(WIN95)
-/*
-** Some local variables report warnings on Win95 because the code paths 
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-** 
-*/
-#pragma warning(disable : 4101)
-#endif
-
-
-extern PRLock *_pr_sleeplock;  /* allocated and initialized in prinit */
-/* 
-** Routines common to both native and user threads.
-**
-**
-** Clean up a thread object, releasing all of the attached data. Do not
-** free the object itself (it may not have been malloc'd)
-*/
-void _PR_CleanupThread(PRThread *thread)
-{
-    /* Free up per-thread-data */
-    _PR_DestroyThreadPrivate(thread);
-
-    /* Free any thread dump procs */
-    if (thread->dumpArg) {
-        PR_DELETE(thread->dumpArg);
-    }
-    thread->dump = 0;
-
-    PR_DELETE(thread->errorString);
-    thread->errorStringSize = 0;
-    thread->errorStringLength = 0;
-    thread->environment = NULL;
-}
-
-/*
-** Make the current thread sleep until "timeout" ticks amount of time
-** has expired. If "timeout" is PR_INTERVAL_NO_WAIT then the call is
-** equivalent to a yield. Waiting for an infinite amount of time is
-** allowed in the expectation that another thread will interrupt().
-**
-** A single lock is used for all threads calling sleep. Each caller
-** does get its own condition variable since each is expected to have
-** a unique 'timeout'.
-*/
-PR_IMPLEMENT(PRStatus) PR_Sleep(PRIntervalTime timeout)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (PR_INTERVAL_NO_WAIT == timeout)
-    {
-        /*
-        ** This is a simple yield, nothing more, nothing less.
-        */
-        PRIntn is;
-        PRThread *me = PR_GetCurrentThread();
-        PRUintn pri = me->priority;
-        _PRCPU *cpu = _PR_MD_CURRENT_CPU();
-
-        if ( _PR_IS_NATIVE_THREAD(me) ) _PR_MD_YIELD();
-        else
-        {
-            _PR_INTSOFF(is);
-            _PR_RUNQ_LOCK(cpu);
-            if (_PR_RUNQREADYMASK(cpu) >> pri) {
-                me->cpu = cpu;
-                me->state = _PR_RUNNABLE;
-                _PR_ADD_RUNQ(me, cpu, pri);
-                _PR_RUNQ_UNLOCK(cpu);
-
-                PR_LOG(_pr_sched_lm, PR_LOG_MIN, ("PR_Yield: yielding"));
-                _PR_MD_SWITCH_CONTEXT(me);
-                PR_LOG(_pr_sched_lm, PR_LOG_MIN, ("PR_Yield: done"));
-
-                _PR_FAST_INTSON(is);
-            }
-            else
-            {
-                _PR_RUNQ_UNLOCK(cpu);
-                _PR_INTSON(is);
-            }
-        }
-    }
-    else
-    {
-        /*
-        ** This is waiting for some finite period of time.
-        ** A thread in this state is interruptible (PR_Interrupt()),
-        ** but the lock and cvar used are local to the implementation
-        ** and not visible to the caller, therefore not notifiable.
-        */
-        PRCondVar *cv;
-        PRIntervalTime timein;
-
-        timein = PR_IntervalNow();
-        cv = PR_NewCondVar(_pr_sleeplock);
-        PR_ASSERT(cv != NULL);
-        PR_Lock(_pr_sleeplock);
-        do
-        {
-            PRIntervalTime delta = PR_IntervalNow() - timein;
-            if (delta > timeout) break;
-            rv = PR_WaitCondVar(cv, timeout - delta);
-        } while (rv == PR_SUCCESS);
-        PR_Unlock(_pr_sleeplock);
-        PR_DestroyCondVar(cv);
-    }
-    return rv;
-}
-
-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thread)
-{
-    return thread->id;
-}
-
-PR_IMPLEMENT(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread)
-{
-    return (PRThreadPriority) thread->priority;
-}
-
-PR_IMPLEMENT(PRThread *) PR_GetCurrentThread()
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    return _PR_MD_CURRENT_THREAD();
-}
-
-/*
-** Set the interrupt flag for a thread. The thread will be unable to
-** block in i/o functions when this happens. Also, any PR_Wait's in
-** progress will be undone. The interrupt remains in force until
-** PR_ClearInterrupt is called.
-*/
-PR_IMPLEMENT(PRStatus) PR_Interrupt(PRThread *thread)
-{
-#ifdef _PR_GLOBAL_THREADS_ONLY
-    PRCondVar *victim;
-
-    _PR_THREAD_LOCK(thread);
-    thread->flags |= _PR_INTERRUPT;
-    victim = thread->wait.cvar;
-    _PR_THREAD_UNLOCK(thread);
-    if ((NULL != victim) && (!(thread->flags & _PR_INTERRUPT_BLOCKED))) {
-        int haveLock = (victim->lock->owner == _PR_MD_CURRENT_THREAD());
-
-        if (!haveLock) PR_Lock(victim->lock);
-        PR_NotifyAllCondVar(victim);
-        if (!haveLock) PR_Unlock(victim->lock);
-    }
-    return PR_SUCCESS;
-#else  /* ! _PR_GLOBAL_THREADS_ONLY */
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-            if (!_PR_IS_NATIVE_THREAD(me))
-            	_PR_INTSOFF(is);
-
-            _PR_THREAD_LOCK(thread);
-            thread->flags |= _PR_INTERRUPT;
-        switch (thread->state) {
-                case _PR_COND_WAIT:
-                        /*
-                         * call is made with thread locked;
-                         * on return lock is released
-                         */
-						if (!(thread->flags & _PR_INTERRUPT_BLOCKED))
-                        	_PR_NotifyLockedThread(thread);
-                        break;
-                case _PR_IO_WAIT:
-                        /*
-                         * Need to hold the thread lock when calling
-                         * _PR_Unblock_IO_Wait().  On return lock is
-                         * released. 
-                         */
-#if defined(XP_UNIX) || defined(WINNT) || defined(WIN16)
-						if (!(thread->flags & _PR_INTERRUPT_BLOCKED))
-                        	_PR_Unblock_IO_Wait(thread);
-#else
-                        _PR_THREAD_UNLOCK(thread);
-#endif
-                        break;
-                case _PR_RUNNING:
-                case _PR_RUNNABLE:
-                case _PR_LOCK_WAIT:
-                default:
-                            _PR_THREAD_UNLOCK(thread);
-                        break;
-        }
-            if (!_PR_IS_NATIVE_THREAD(me))
-            	_PR_INTSON(is);
-            return PR_SUCCESS;
-#endif  /* _PR_GLOBAL_THREADS_ONLY */
-}
-
-/*
-** Clear the interrupt flag for self.
-*/
-PR_IMPLEMENT(void) PR_ClearInterrupt()
-{
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-        if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(me);
-         me->flags &= ~_PR_INTERRUPT;
-    _PR_THREAD_UNLOCK(me);
-        if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
-}
-
-PR_IMPLEMENT(void) PR_BlockInterrupt()
-{
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(me);
-    _PR_THREAD_BLOCK_INTERRUPT(me);
-    _PR_THREAD_UNLOCK(me);
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
-}  /* PR_BlockInterrupt */
-
-PR_IMPLEMENT(void) PR_UnblockInterrupt()
-{
-    PRIntn is;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSOFF(is);
-    _PR_THREAD_LOCK(me);
-    _PR_THREAD_UNBLOCK_INTERRUPT(me);
-    _PR_THREAD_UNLOCK(me);
-    if ( !_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
-}  /* PR_UnblockInterrupt */
-
-/*
-** Return the thread stack pointer of the given thread.
-*/
-PR_IMPLEMENT(void *) PR_GetSP(PRThread *thread)
-{
-        return (void *)_PR_MD_GET_SP(thread);
-}
-
-PR_IMPLEMENT(void*) GetExecutionEnvironment(PRThread *thread)
-{
-        return thread->environment;
-}
-
-PR_IMPLEMENT(void) SetExecutionEnvironment(PRThread *thread, void *env)
-{
-        thread->environment = env;
-}
-
-
-PR_IMPLEMENT(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask)
-{
-#ifdef HAVE_THREAD_AFFINITY
-    return _PR_MD_GETTHREADAFFINITYMASK(thread, mask);
-#else
-
-#if defined(XP_MAC)
-#pragma unused (thread, mask)
-#endif
-
-    return 0;
-#endif
-}
-
-PR_IMPLEMENT(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask )
-{
-#ifdef HAVE_THREAD_AFFINITY
-#ifndef IRIX
-    return _PR_MD_SETTHREADAFFINITYMASK(thread, mask);
-#else
-	return 0;
-#endif
-#else
-
-#if defined(XP_MAC)
-#pragma unused (thread, mask)
-#endif
-
-    return 0;
-#endif
-}
-
-/* This call is thread unsafe if another thread is calling SetConcurrency()
- */
-PR_IMPLEMENT(PRInt32) PR_SetCPUAffinityMask(PRUint32 mask)
-{
-#ifdef HAVE_THREAD_AFFINITY
-    PRCList *qp;
-    extern PRUint32 _pr_cpu_affinity_mask;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    _pr_cpu_affinity_mask = mask;
-
-    qp = _PR_CPUQ().next;
-    while(qp != &_PR_CPUQ()) {
-        _PRCPU *cpu;
-
-        cpu = _PR_CPU_PTR(qp);
-        PR_SetThreadAffinityMask(cpu->thread, mask);
-
-        qp = qp->next;
-    }
-#endif
-
-#if defined(XP_MAC)
-#pragma unused (mask)
-#endif
-
-    return 0;
-}
-
-PRUint32 _pr_recycleThreads = 0;
-PR_IMPLEMENT(void) PR_SetThreadRecycleMode(PRUint32 count)
-{
-    _pr_recycleThreads = count;
-}
-
-PR_IMPLEMENT(PRThread*) PR_CreateThreadGCAble(PRThreadType type,
-                                     void (*start)(void *arg),
-                                     void *arg,
-                                     PRThreadPriority priority,
-                                     PRThreadScope scope,
-                                     PRThreadState state,
-                                     PRUint32 stackSize)
-{
-    return _PR_CreateThread(type, start, arg, priority, scope, state, 
-                            stackSize, _PR_GCABLE_THREAD);
-}
-
-#ifdef SOLARIS
-PR_IMPLEMENT(PRThread*) PR_CreateThreadBound(PRThreadType type,
-                                     void (*start)(void *arg),
-                                     void *arg,
-                                     PRUintn priority,
-                                     PRThreadScope scope,
-                                     PRThreadState state,
-                                     PRUint32 stackSize)
-{
-    return _PR_CreateThread(type, start, arg, priority, scope, state, 
-                            stackSize, _PR_BOUND_THREAD);
-}
-#endif
-
-
-PR_IMPLEMENT(PRThread*) PR_AttachThreadGCAble(
-    PRThreadType type, PRThreadPriority priority, PRThreadStack *stack)
-{
-#ifdef XP_MAC
-#pragma unused (type, priority, stack)
-#endif
-    /* $$$$ not sure how to finese this one */
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(void) PR_SetThreadGCAble()
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    PR_Lock(_pr_activeLock);
-        _PR_MD_CURRENT_THREAD()->flags |= _PR_GCABLE_THREAD;
-        PR_Unlock(_pr_activeLock);        
-}
-
-PR_IMPLEMENT(void) PR_ClearThreadGCAble()
-{
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-    PR_Lock(_pr_activeLock);
-        _PR_MD_CURRENT_THREAD()->flags &= (~_PR_GCABLE_THREAD);
-        PR_Unlock(_pr_activeLock);
-}
-
-PR_IMPLEMENT(PRThreadScope) PR_GetThreadScope(const PRThread *thread)
-{
-#ifdef XP_MAC
-#pragma unused( thread )
-#endif
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (_PR_IS_NATIVE_THREAD(thread)) {
-    	return (thread->flags & _PR_BOUND_THREAD) ? PR_GLOBAL_BOUND_THREAD :
-										PR_GLOBAL_THREAD;
-    } else
-        return PR_LOCAL_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadType) PR_GetThreadType(const PRThread *thread)
-{
-    return (thread->flags & _PR_SYSTEM) ? PR_SYSTEM_THREAD : PR_USER_THREAD;
-}
-
-PR_IMPLEMENT(PRThreadState) PR_GetThreadState(const PRThread *thread)
-{
-    return (NULL == thread->term) ? PR_UNJOINABLE_THREAD : PR_JOINABLE_THREAD;
-}  /* PR_GetThreadState */
diff --git a/libs/js/nsprpub/pr/src/threads/prdump.c b/libs/js/nsprpub/pr/src/threads/prdump.c
deleted file mode 100644
index 3ea884d2a2..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prdump.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#if defined(WIN95)
-/*
-** Some local variables report warnings on Win95 because the code paths 
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-** 
-*/
-#pragma warning(disable : 4101)
-#endif
-
-/* XXX use unbuffered nspr stdio */
-
-PRFileDesc *_pr_dumpOut;
-
-PRUint32 _PR_DumpPrintf(PRFileDesc *fd, const char *fmt, ...)
-{
-    char buf[100];
-    PRUint32 nb;
-    va_list ap;
-
-    va_start(ap, fmt);
-    nb = PR_vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    PR_Write(fd, buf, nb);
-
-    return nb;
-}
-
-void _PR_DumpThread(PRFileDesc *fd, PRThread *thread)
-{
-
-#ifndef _PR_GLOBAL_THREADS_ONLY
-    _PR_DumpPrintf(fd, "%05d[%08p] pri=%2d flags=0x%02x",
-                   thread->id, thread, thread->priority, thread->flags);
-    switch (thread->state) {
-      case _PR_RUNNABLE:
-      case _PR_RUNNING:
-        break;
-      case _PR_LOCK_WAIT:
-        _PR_DumpPrintf(fd, " lock=%p", thread->wait.lock);
-        break;
-      case _PR_COND_WAIT:
-        _PR_DumpPrintf(fd, " condvar=%p sleep=%lldms",
-                       thread->wait.cvar, thread->sleep);
-        break;
-      case _PR_SUSPENDED:
-        _PR_DumpPrintf(fd, " suspended");
-        break;
-    }
-    PR_Write(fd, "\n", 1);
-#endif
-
-    /* Now call dump routine */
-    if (thread->dump) {
-	thread->dump(fd, thread, thread->dumpArg);
-    }
-}
-
-static void DumpThreadQueue(PRFileDesc *fd, PRCList *list)
-{
-#ifndef _PR_GLOBAL_THREADS_ONLY
-    PRCList *q;
-
-    q = list->next;
-    while (q != list) {
-        PRThread *t = _PR_THREAD_PTR(q);
-        _PR_DumpThread(fd, t);
-        q = q->next;
-    }
-#endif
-}
-
-void _PR_DumpThreads(PRFileDesc *fd)
-{
-    PRThread *t;
-    PRIntn i;
-
-    _PR_DumpPrintf(fd, "Current Thread:\n");
-    t = _PR_MD_CURRENT_THREAD();
-    _PR_DumpThread(fd, t);
-
-    _PR_DumpPrintf(fd, "Runnable Threads:\n");
-    for (i = 0; i < 32; i++) {
-        DumpThreadQueue(fd, &_PR_RUNQ(t->cpu)[i]);
-    }
-
-    _PR_DumpPrintf(fd, "CondVar timed wait Threads:\n");
-    DumpThreadQueue(fd, &_PR_SLEEPQ(t->cpu));
-
-    _PR_DumpPrintf(fd, "CondVar wait Threads:\n");
-    DumpThreadQueue(fd, &_PR_PAUSEQ(t->cpu));
-
-    _PR_DumpPrintf(fd, "Suspended Threads:\n");
-    DumpThreadQueue(fd, &_PR_SUSPENDQ(t->cpu));
-}
-
-PR_IMPLEMENT(void) PR_ShowStatus(void)
-{
-    PRIntn is;
-
-    if ( _PR_MD_CURRENT_THREAD()
-    && !_PR_IS_NATIVE_THREAD(_PR_MD_CURRENT_THREAD())) _PR_INTSOFF(is);
-    _pr_dumpOut = _pr_stderr;
-    _PR_DumpThreads(_pr_dumpOut);
-    if ( _PR_MD_CURRENT_THREAD()
-    && !_PR_IS_NATIVE_THREAD(_PR_MD_CURRENT_THREAD())) _PR_FAST_INTSON(is);
-}
-
-PR_IMPLEMENT(void)
-PR_SetThreadDumpProc(PRThread* thread, PRThreadDumpProc dump, void *arg)
-{
-    thread->dump = dump;
-    thread->dumpArg = arg;
-}
diff --git a/libs/js/nsprpub/pr/src/threads/prmon.c b/libs/js/nsprpub/pr/src/threads/prmon.c
deleted file mode 100644
index 69d0f65529..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prmon.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-/************************************************************************/
-
-/*
-** Create a new monitor.
-*/
-PR_IMPLEMENT(PRMonitor*) PR_NewMonitor()
-{
-    PRMonitor *mon;
-	PRCondVar *cvar;
-	PRLock *lock;
-
-    mon = PR_NEWZAP(PRMonitor);
-    if (mon) {
-		lock = PR_NewLock();
-	    if (!lock) {
-			PR_DELETE(mon);
-			return 0;
-    	}
-
-	    cvar = PR_NewCondVar(lock);
-	    if (!cvar) {
-	    	PR_DestroyLock(lock);
-			PR_DELETE(mon);
-			return 0;
-    	}
-    	mon->cvar = cvar;
-	mon->name = NULL;
-    }
-    return mon;
-}
-
-PR_IMPLEMENT(PRMonitor*) PR_NewNamedMonitor(const char* name)
-{
-    PRMonitor* mon = PR_NewMonitor();
-    if (mon)
-        mon->name = name;
-    return mon;
-}
-
-/*
-** Destroy a monitor. There must be no thread waiting on the monitor's
-** condition variable. The caller is responsible for guaranteeing that the
-** monitor is no longer in use.
-*/
-PR_IMPLEMENT(void) PR_DestroyMonitor(PRMonitor *mon)
-{
-	PR_DestroyLock(mon->cvar->lock);
-    PR_DestroyCondVar(mon->cvar);
-    PR_DELETE(mon);
-}
-
-/*
-** Enter the lock associated with the monitor.
-*/
-PR_IMPLEMENT(void) PR_EnterMonitor(PRMonitor *mon)
-{
-    if (mon->cvar->lock->owner == _PR_MD_CURRENT_THREAD()) {
-		mon->entryCount++;
-    } else {
-		PR_Lock(mon->cvar->lock);
-		mon->entryCount = 1;
-    }
-}
-
-/*
-** Test and then enter the lock associated with the monitor if it's not
-** already entered by some other thread. Return PR_FALSE if some other
-** thread owned the lock at the time of the call.
-*/
-PR_IMPLEMENT(PRBool) PR_TestAndEnterMonitor(PRMonitor *mon)
-{
-    if (mon->cvar->lock->owner == _PR_MD_CURRENT_THREAD()) {
-		mon->entryCount++;
-		return PR_TRUE;
-    } else {
-		if (PR_TestAndLock(mon->cvar->lock)) {
-	    	mon->entryCount = 1;
-	   	 	return PR_TRUE;
-		}
-    }
-    return PR_FALSE;
-}
-
-/*
-** Exit the lock associated with the monitor once.
-*/
-PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PRMonitor *mon)
-{
-    if (mon->cvar->lock->owner != _PR_MD_CURRENT_THREAD()) {
-        return PR_FAILURE;
-    }
-    if (--mon->entryCount == 0) {
-		return PR_Unlock(mon->cvar->lock);
-    }
-    return PR_SUCCESS;
-}
-
-/*
-** Return the number of times that the current thread has entered the
-** lock. Returns zero if the current thread has not entered the lock.
-*/
-PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryCount(PRMonitor *mon)
-{
-    return (mon->cvar->lock->owner == _PR_MD_CURRENT_THREAD()) ?
-        mon->entryCount : 0;
-}
-
-/*
-** Wait for a notify on the condition variable. Sleep for "ticks" amount
-** of time (if "tick" is 0 then the sleep is indefinite). While
-** the thread is waiting it exits the monitors lock (as if it called
-** PR_ExitMonitor as many times as it had called PR_EnterMonitor).  When
-** the wait has finished the thread regains control of the monitors lock
-** with the same entry count as before the wait began.
-**
-** The thread waiting on the monitor will be resumed when the monitor is
-** notified (assuming the thread is the next in line to receive the
-** notify) or when the "ticks" elapses.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-** This routine can return PR_PENDING_INTERRUPT if the waiting thread 
-** has been interrupted.
-*/
-PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime ticks)
-{
-    PRUintn entryCount;
-	PRStatus status;
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-
-    if (mon->cvar->lock->owner != me) return PR_FAILURE;
-
-    entryCount = mon->entryCount;
-    mon->entryCount = 0;
-
-	status = _PR_WaitCondVar(me, mon->cvar, mon->cvar->lock, ticks);
-
-    mon->entryCount = entryCount;
-
-    return status;
-}
-
-/*
-** Notify the highest priority thread waiting on the condition
-** variable. If a thread is waiting on the condition variable (using
-** PR_Wait) then it is awakened and begins waiting on the monitor's lock.
-*/
-PR_IMPLEMENT(PRStatus) PR_Notify(PRMonitor *mon)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    if (mon->cvar->lock->owner != me) return PR_FAILURE;
-    PR_NotifyCondVar(mon->cvar);
-    return PR_SUCCESS;
-}
-
-/*
-** Notify all of the threads waiting on the condition variable. All of
-** threads are notified in turn. The highest priority thread will
-** probably acquire the monitor first when the monitor is exited.
-*/
-PR_IMPLEMENT(PRStatus) PR_NotifyAll(PRMonitor *mon)
-{
-    PRThread *me = _PR_MD_CURRENT_THREAD();
-    if (mon->cvar->lock->owner != me) return PR_FAILURE;
-    PR_NotifyAllCondVar(mon->cvar);
-    return PR_SUCCESS;
-}
-
-/************************************************************************/
-
-PRUint32 _PR_MonitorToString(PRMonitor *mon, char *buf, PRUint32 buflen)
-{
-    PRUint32 nb;
-
-    if (mon->cvar->lock->owner) {
-	nb = PR_snprintf(buf, buflen, "[%p] owner=%d[%p] count=%ld",
-			 mon, mon->cvar->lock->owner->id,
-			 mon->cvar->lock->owner, mon->entryCount);
-    } else {
-	nb = PR_snprintf(buf, buflen, "[%p]", mon);
-    }
-    return nb;
-}
diff --git a/libs/js/nsprpub/pr/src/threads/prrwlock.c b/libs/js/nsprpub/pr/src/threads/prrwlock.c
deleted file mode 100644
index 35e0e3e723..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prrwlock.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-
-#include <string.h>
-
-#if defined(HPUX) && defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-
-#include <pthread.h>
-#define HAVE_UNIX98_RWLOCK
-#define RWLOCK_T pthread_rwlock_t
-#define RWLOCK_INIT(lock) pthread_rwlock_init(lock, NULL)
-#define RWLOCK_DESTROY(lock) pthread_rwlock_destroy(lock)
-#define RWLOCK_RDLOCK(lock) pthread_rwlock_rdlock(lock)
-#define RWLOCK_WRLOCK(lock) pthread_rwlock_wrlock(lock)
-#define RWLOCK_UNLOCK(lock) pthread_rwlock_unlock(lock)
-
-#elif defined(SOLARIS) && (defined(_PR_PTHREADS) \
-        || defined(_PR_GLOBAL_THREADS_ONLY))
-
-#include <synch.h>
-#define HAVE_UI_RWLOCK
-#define RWLOCK_T rwlock_t
-#define RWLOCK_INIT(lock) rwlock_init(lock, USYNC_THREAD, NULL)
-#define RWLOCK_DESTROY(lock) rwlock_destroy(lock)
-#define RWLOCK_RDLOCK(lock) rw_rdlock(lock)
-#define RWLOCK_WRLOCK(lock) rw_wrlock(lock)
-#define RWLOCK_UNLOCK(lock) rw_unlock(lock)
-
-#endif
-
-/*
- * Reader-writer lock
- */
-struct PRRWLock {
-	char			*rw_name;			/* lock name					*/
-	PRUint32		rw_rank;			/* rank of the lock				*/
-
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	RWLOCK_T		rw_lock;
-#else
-    PRLock			*rw_lock;
-	PRInt32			rw_lock_cnt;		/* ==  0, if unlocked			*/
-										/* == -1, if write-locked		*/
-										/* > 0	, # of read locks		*/
-	PRUint32		rw_reader_cnt;		/* number of waiting readers	*/
-	PRUint32		rw_writer_cnt;		/* number of waiting writers	*/
-	PRCondVar   	*rw_reader_waitq;	/* cvar for readers 			*/
-	PRCondVar   	*rw_writer_waitq;	/* cvar for writers				*/
-#ifdef DEBUG
-    PRThread 		*rw_owner;			/* lock owner for write-lock	*/
-#endif
-#endif
-};
-
-#ifdef DEBUG
-#define _PR_RWLOCK_RANK_ORDER_DEBUG	/* enable deadlock detection using
-									   rank-order for locks
-									*/
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-
-static PRUintn	pr_thread_rwlock_key;			/* TPD key for lock stack */
-static PRUintn	pr_thread_rwlock_alloc_failed;
-
-#define	_PR_RWLOCK_RANK_ORDER_LIMIT	10
-
-typedef struct thread_rwlock_stack {
-	PRInt32		trs_index;									/* top of stack */
-	PRRWLock	*trs_stack[_PR_RWLOCK_RANK_ORDER_LIMIT];	/* stack of lock
-														 	   pointers */
-
-} thread_rwlock_stack;
-
-static void _PR_SET_THREAD_RWLOCK_RANK(PRRWLock *rwlock);
-static PRUint32 _PR_GET_THREAD_RWLOCK_RANK(void);
-static void _PR_UNSET_THREAD_RWLOCK_RANK(PRRWLock *rwlock);
-static void _PR_RELEASE_LOCK_STACK(void *lock_stack);
-
-#endif
-
-/*
- * Reader/Writer Locks
- */
-
-/*
- * PR_NewRWLock
- *		Create a reader-writer lock, with the given lock rank and lock name
- *	
- */
-
-PR_IMPLEMENT(PRRWLock *)
-PR_NewRWLock(PRUint32 lock_rank, const char *lock_name)
-{
-    PRRWLock *rwlock;
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	int err;
-#endif
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    rwlock = PR_NEWZAP(PRRWLock);
-    if (rwlock == NULL)
-		return NULL;
-
-	rwlock->rw_rank = lock_rank;
-	if (lock_name != NULL) {
-		rwlock->rw_name = (char*) PR_Malloc(strlen(lock_name) + 1);
-    	if (rwlock->rw_name == NULL) {
-			PR_DELETE(rwlock);
-			return(NULL);
-		}
-		strcpy(rwlock->rw_name, lock_name);
-	} else {
-		rwlock->rw_name = NULL;
-	}
-	
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	err = RWLOCK_INIT(&rwlock->rw_lock);
-	if (err != 0) {
-		PR_SetError(PR_UNKNOWN_ERROR, err);
-		PR_Free(rwlock->rw_name);
-		PR_DELETE(rwlock);
-		return NULL;
-	}
-	return rwlock;
-#else
-	rwlock->rw_lock = PR_NewLock();
-    if (rwlock->rw_lock == NULL) {
-		goto failed;
-	}
-	rwlock->rw_reader_waitq = PR_NewCondVar(rwlock->rw_lock);
-    if (rwlock->rw_reader_waitq == NULL) {
-		goto failed;
-	}
-	rwlock->rw_writer_waitq = PR_NewCondVar(rwlock->rw_lock);
-    if (rwlock->rw_writer_waitq == NULL) {
-		goto failed;
-	}
-	rwlock->rw_reader_cnt = 0;
-	rwlock->rw_writer_cnt = 0;
-	rwlock->rw_lock_cnt = 0;
-	return rwlock;
-
-failed:
-	if (rwlock->rw_reader_waitq != NULL) {
-		PR_DestroyCondVar(rwlock->rw_reader_waitq);	
-	}
-	if (rwlock->rw_lock != NULL) {
-		PR_DestroyLock(rwlock->rw_lock);
-	}
-	PR_Free(rwlock->rw_name);
-	PR_DELETE(rwlock);
-	return NULL;
-#endif
-}
-
-/*
-** Destroy the given RWLock "lock".
-*/
-PR_IMPLEMENT(void)
-PR_DestroyRWLock(PRRWLock *rwlock)
-{
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	int err;
-	err = RWLOCK_DESTROY(&rwlock->rw_lock);
-	PR_ASSERT(err == 0);
-#else
-	PR_ASSERT(rwlock->rw_reader_cnt == 0);
-	PR_DestroyCondVar(rwlock->rw_reader_waitq);	
-	PR_DestroyCondVar(rwlock->rw_writer_waitq);	
-	PR_DestroyLock(rwlock->rw_lock);
-#endif
-	if (rwlock->rw_name != NULL)
-		PR_Free(rwlock->rw_name);
-    PR_DELETE(rwlock);
-}
-
-/*
-** Read-lock the RWLock.
-*/
-PR_IMPLEMENT(void)
-PR_RWLock_Rlock(PRRWLock *rwlock)
-{
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-int err;
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-	/*
-	 * assert that rank ordering is not violated; the rank of 'rwlock' should
-	 * be equal to or greater than the highest rank of all the locks held by
-	 * the thread.
-	 */
-	PR_ASSERT((rwlock->rw_rank == PR_RWLOCK_RANK_NONE) || 
-					(rwlock->rw_rank >= _PR_GET_THREAD_RWLOCK_RANK()));
-#endif
-
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	err = RWLOCK_RDLOCK(&rwlock->rw_lock);
-	PR_ASSERT(err == 0);
-#else
-	PR_Lock(rwlock->rw_lock);
-	/*
-	 * wait if write-locked or if a writer is waiting; preference for writers
-	 */
-	while ((rwlock->rw_lock_cnt < 0) ||
-			(rwlock->rw_writer_cnt > 0)) {
-		rwlock->rw_reader_cnt++;
-		PR_WaitCondVar(rwlock->rw_reader_waitq, PR_INTERVAL_NO_TIMEOUT);
-		rwlock->rw_reader_cnt--;
-	}
-	/*
-	 * Increment read-lock count
-	 */
-	rwlock->rw_lock_cnt++;
-
-	PR_Unlock(rwlock->rw_lock);
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-	/*
-	 * update thread's lock rank
-	 */
-	_PR_SET_THREAD_RWLOCK_RANK(rwlock);
-#endif
-}
-
-/*
-** Write-lock the RWLock.
-*/
-PR_IMPLEMENT(void)
-PR_RWLock_Wlock(PRRWLock *rwlock)
-{
-#if defined(DEBUG)
-PRThread *me = PR_GetCurrentThread();
-#endif
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-int err;
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-	/*
-	 * assert that rank ordering is not violated; the rank of 'rwlock' should
-	 * be equal to or greater than the highest rank of all the locks held by
-	 * the thread.
-	 */
-	PR_ASSERT((rwlock->rw_rank == PR_RWLOCK_RANK_NONE) || 
-					(rwlock->rw_rank >= _PR_GET_THREAD_RWLOCK_RANK()));
-#endif
-
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	err = RWLOCK_WRLOCK(&rwlock->rw_lock);
-	PR_ASSERT(err == 0);
-#else
-	PR_Lock(rwlock->rw_lock);
-	/*
-	 * wait if read locked
-	 */
-	while (rwlock->rw_lock_cnt != 0) {
-		rwlock->rw_writer_cnt++;
-		PR_WaitCondVar(rwlock->rw_writer_waitq, PR_INTERVAL_NO_TIMEOUT);
-		rwlock->rw_writer_cnt--;
-	}
-	/*
-	 * apply write lock
-	 */
-	rwlock->rw_lock_cnt--;
-	PR_ASSERT(rwlock->rw_lock_cnt == -1);
-#ifdef DEBUG
-	PR_ASSERT(me != NULL);
-	rwlock->rw_owner = me;
-#endif
-	PR_Unlock(rwlock->rw_lock);
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-	/*
-	 * update thread's lock rank
-	 */
-	_PR_SET_THREAD_RWLOCK_RANK(rwlock);
-#endif
-}
-
-/*
-** Unlock the RW lock.
-*/
-PR_IMPLEMENT(void)
-PR_RWLock_Unlock(PRRWLock *rwlock)
-{
-#if defined(DEBUG)
-PRThread *me = PR_GetCurrentThread();
-#endif
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-int err;
-#endif
-
-#if defined(HAVE_UNIX98_RWLOCK) || defined(HAVE_UI_RWLOCK)
-	err = RWLOCK_UNLOCK(&rwlock->rw_lock);
-	PR_ASSERT(err == 0);
-#else
-	PR_Lock(rwlock->rw_lock);
-	/*
-	 * lock must be read or write-locked
-	 */
-	PR_ASSERT(rwlock->rw_lock_cnt != 0);
-	if (rwlock->rw_lock_cnt > 0) {
-
-		/*
-		 * decrement read-lock count
-		 */
-		rwlock->rw_lock_cnt--;
-		if (rwlock->rw_lock_cnt == 0) {
-			/*
-			 * lock is not read-locked anymore; wakeup a waiting writer
-			 */
-			if (rwlock->rw_writer_cnt > 0)
-				PR_NotifyCondVar(rwlock->rw_writer_waitq);
-		}
-	} else {
-		PR_ASSERT(rwlock->rw_lock_cnt == -1);
-
-		rwlock->rw_lock_cnt = 0;
-#ifdef DEBUG
-    	PR_ASSERT(rwlock->rw_owner == me);
-    	rwlock->rw_owner = NULL;
-#endif
-		/*
-		 * wakeup a writer, if present; preference for writers
-		 */
-		if (rwlock->rw_writer_cnt > 0)
-			PR_NotifyCondVar(rwlock->rw_writer_waitq);
-		/*
-		 * else, wakeup all readers, if any
-		 */
-		else if (rwlock->rw_reader_cnt > 0)
-			PR_NotifyAllCondVar(rwlock->rw_reader_waitq);
-	}
-	PR_Unlock(rwlock->rw_lock);
-#endif
-
-#ifdef _PR_RWLOCK_RANK_ORDER_DEBUG
-	/*
-	 * update thread's lock rank
-	 */
-	_PR_UNSET_THREAD_RWLOCK_RANK(rwlock);
-#endif
-	return;
-}
-
-#ifndef _PR_RWLOCK_RANK_ORDER_DEBUG
-
-void _PR_InitRWLocks(void) { }
-
-#else
-
-void _PR_InitRWLocks(void)
-{
-	/*
-	 * allocated thread-private-data index for rwlock list
-	 */
-	if (PR_NewThreadPrivateIndex(&pr_thread_rwlock_key,
-			_PR_RELEASE_LOCK_STACK) == PR_FAILURE) {
-		pr_thread_rwlock_alloc_failed = 1;
-		return;
-	}
-}
-
-/*
- * _PR_SET_THREAD_RWLOCK_RANK
- *		Set a thread's lock rank, which is the highest of the ranks of all
- *		the locks held by the thread. Pointers to the locks are added to a
- *		per-thread list, which is anchored off a thread-private data key.
- */
-
-static void
-_PR_SET_THREAD_RWLOCK_RANK(PRRWLock *rwlock)
-{
-thread_rwlock_stack *lock_stack;
-PRStatus rv;
-
-	/*
-	 * allocate a lock stack
-	 */
-	if ((lock_stack = PR_GetThreadPrivate(pr_thread_rwlock_key)) == NULL) {
-		lock_stack = (thread_rwlock_stack *)
-						PR_CALLOC(1 * sizeof(thread_rwlock_stack));
-		if (lock_stack) {
-			rv = PR_SetThreadPrivate(pr_thread_rwlock_key, lock_stack);
-			if (rv == PR_FAILURE) {
-				PR_DELETE(lock_stack);
-				pr_thread_rwlock_alloc_failed = 1;
-				return;
-			}
-		} else {
-			pr_thread_rwlock_alloc_failed = 1;
-			return;
-		}
-	}
-	/*
-	 * add rwlock to lock stack, if limit is not exceeded
-	 */
-	if (lock_stack) {
-		if (lock_stack->trs_index < _PR_RWLOCK_RANK_ORDER_LIMIT)
-			lock_stack->trs_stack[lock_stack->trs_index++] = rwlock;	
-	}
-}
-
-static void
-_PR_RELEASE_LOCK_STACK(void *lock_stack)
-{
-	PR_ASSERT(lock_stack);
-	PR_DELETE(lock_stack);
-}
-
-/*
- * _PR_GET_THREAD_RWLOCK_RANK
- *
- *		return thread's lock rank. If thread-private-data for the lock
- *		stack is not allocated, return PR_RWLOCK_RANK_NONE.
- */
-	
-static PRUint32
-_PR_GET_THREAD_RWLOCK_RANK(void)
-{
-	thread_rwlock_stack *lock_stack;
-
-	if ((lock_stack = PR_GetThreadPrivate(pr_thread_rwlock_key)) == NULL)
-		return (PR_RWLOCK_RANK_NONE);
-	else
-		return(lock_stack->trs_stack[lock_stack->trs_index - 1]->rw_rank);
-}
-
-/*
- * _PR_UNSET_THREAD_RWLOCK_RANK
- *
- *		remove the rwlock from the lock stack. Since locks may not be
- *		unlocked in a FIFO order, the entire lock stack is searched.
- */
-	
-static void
-_PR_UNSET_THREAD_RWLOCK_RANK(PRRWLock *rwlock)
-{
-	thread_rwlock_stack *lock_stack;
-	int new_index = 0, index, done = 0;
-
-	lock_stack = PR_GetThreadPrivate(pr_thread_rwlock_key);
-
-	PR_ASSERT(lock_stack != NULL);
-
-	index = lock_stack->trs_index - 1;
-	while (index-- >= 0) {
-		if ((lock_stack->trs_stack[index] == rwlock) && !done)  {
-			/*
-			 * reset the slot for rwlock
-			 */
-			lock_stack->trs_stack[index] = NULL;
-			done = 1;
-		}
-		/*
-		 * search for the lowest-numbered empty slot, above which there are
-		 * no non-empty slots
-		 */
-		if ((lock_stack->trs_stack[index] != NULL) && !new_index)
-			new_index = index + 1;
-		if (done && new_index)
-			break;
-	}
-	/*
-	 * set top of stack to highest numbered empty slot
-	 */
-	lock_stack->trs_index = new_index;
-
-}
-
-#endif 	/* _PR_RWLOCK_RANK_ORDER_DEBUG */
diff --git a/libs/js/nsprpub/pr/src/threads/prsem.c b/libs/js/nsprpub/pr/src/threads/prsem.c
deleted file mode 100644
index 692bc0e99b..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prsem.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "primpl.h"
-#if defined(XP_MAC)
-#include "prsem.h"
-#else
-#include "obsolete/prsem.h"
-#endif
-
-/************************************************************************/
-
-/*
-** Create a new semaphore.
-*/
-PR_IMPLEMENT(PRSemaphore*) PR_NewSem(PRUintn value)
-{
-    PRSemaphore *sem;
-    PRCondVar *cvar;
-    PRLock *lock;
-
-    sem = PR_NEWZAP(PRSemaphore);
-    if (sem) {
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-        _PR_MD_NEW_SEM(&sem->md, value);
-#else
-        lock = PR_NewLock();
-        if (!lock) {
-            PR_DELETE(sem);
-            return NULL;
-    	}
-
-        cvar = PR_NewCondVar(lock);
-        if (!cvar) {
-            PR_DestroyLock(lock);
-            PR_DELETE(sem);
-            return NULL;
-    	}
-    	sem->cvar = cvar;
-    	sem->count = value;
-#endif
-    }
-    return sem;
-}
-
-/*
-** Destroy a semaphore. There must be no thread waiting on the semaphore.
-** The caller is responsible for guaranteeing that the semaphore is
-** no longer in use.
-*/
-PR_IMPLEMENT(void) PR_DestroySem(PRSemaphore *sem)
-{
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-    _PR_MD_DESTROY_SEM(&sem->md);
-#else
-    PR_ASSERT(sem->waiters == 0);
-
-    PR_DestroyLock(sem->cvar->lock);
-    PR_DestroyCondVar(sem->cvar);
-#endif
-    PR_DELETE(sem);
-}
-
-/*
-** Wait on a Semaphore.
-** 
-** This routine allows a calling thread to wait or proceed depending upon the 
-** state of the semahore sem. The thread can proceed only if the counter value 
-** of the semaphore sem is currently greater than 0. If the value of semaphore 
-** sem is positive, it is decremented by one and the routine returns immediately 
-** allowing the calling thread to continue. If the value of semaphore sem is 0, 
-** the calling thread blocks awaiting the semaphore to be released by another 
-** thread.
-** 
-** This routine can return PR_PENDING_INTERRUPT if the waiting thread 
-** has been interrupted.
-*/
-PR_IMPLEMENT(PRStatus) PR_WaitSem(PRSemaphore *sem)
-{
-	PRStatus status = PR_SUCCESS;
-
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-	return _PR_MD_WAIT_SEM(&sem->md);
-#else
-	PR_Lock(sem->cvar->lock);
-	while (sem->count == 0) {
-		sem->waiters++;
-		status = PR_WaitCondVar(sem->cvar, PR_INTERVAL_NO_TIMEOUT);
-		sem->waiters--;
-		if (status != PR_SUCCESS)
-			break;
-	}
-	if (status == PR_SUCCESS)
-		sem->count--;
-	PR_Unlock(sem->cvar->lock);
-#endif
-	
-	return (status);
-}
-
-/*
-** This routine increments the counter value of the semaphore. If other threads 
-** are blocked for the semaphore, then the scheduler will determine which ONE 
-** thread will be unblocked.
-*/
-PR_IMPLEMENT(void) PR_PostSem(PRSemaphore *sem)
-{
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-	_PR_MD_POST_SEM(&sem->md);
-#else
-	PR_Lock(sem->cvar->lock);
-	if (sem->waiters)
-		PR_NotifyCondVar(sem->cvar);
-	sem->count++;
-	PR_Unlock(sem->cvar->lock);
-#endif
-}
-
-#if DEBUG
-/*
-** Returns the value of the semaphore referenced by sem without affecting
-** the state of the semaphore.  The value represents the semaphore vaule
-** at the time of the call, but may not be the actual value when the
-** caller inspects it. (FOR DEBUGGING ONLY)
-*/
-PR_IMPLEMENT(PRUintn) PR_GetValueSem(PRSemaphore *sem)
-{
-	PRUintn rv;
-
-#ifdef HAVE_CVAR_BUILT_ON_SEM
-	rv = _PR_MD_GET_VALUE_SEM(&sem->md);
-#else
-	PR_Lock(sem->cvar->lock);
-	rv = sem->count;
-	PR_Unlock(sem->cvar->lock);
-#endif
-	
-	return rv;
-}
-#endif
diff --git a/libs/js/nsprpub/pr/src/threads/prtpd.c b/libs/js/nsprpub/pr/src/threads/prtpd.c
deleted file mode 100644
index 168c660188..0000000000
--- a/libs/js/nsprpub/pr/src/threads/prtpd.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Thread Private Data
-**
-** There is an aribitrary limit on the number of keys that will be allocated
-** by the runtime. It's largish, so it is intended to be a sanity check, not
-** an impediment.
-**
-** There is a counter, initialized to zero and incremented every time a
-** client asks for a new key, that holds the high water mark for keys. All
-** threads logically have the same high water mark and are permitted to
-** ask for TPD up to that key value.
-**
-** The vector to hold the TPD are allocated when PR_SetThreadPrivate() is
-** called. The size of the vector will be some value greater than or equal
-** to the current high water mark. Each thread has its own TPD length and
-** vector.
-**
-** Threads that get private data for keys they have not set (or perhaps
-** don't even exist for that thread) get a NULL return. If the key is
-** beyond the high water mark, an error will be returned.
-*/
-
-/*
-** As of this time, BeOS has its own TPD implementation.  Integrating
-** this standard one is a TODO for anyone with a bit of spare time on
-** their hand.  For now, we just #ifdef out this whole file and use
-** the routines in pr/src/btthreads/
-*/
-
-#ifndef XP_BEOS
-
-#include "primpl.h"
-
-#include <string.h>
-
-#if defined(WIN95)
-/*
-** Some local variables report warnings on Win95 because the code paths 
-** using them are conditioned on HAVE_CUSTOME_USER_THREADS.
-** The pragma suppresses the warning.
-** 
-*/
-#pragma warning(disable : 4101)
-#endif
-
-#define _PR_TPD_LIMIT 128               /* arbitary limit on the TPD slots */
-static PRInt32 _pr_tpd_length = 0;      /* current length of destructor vector */
-static PRInt32 _pr_tpd_highwater = 0;   /* next TPD key to be assigned */
-static PRThreadPrivateDTOR *_pr_tpd_destructors = NULL;
-                                        /* the destructors are associated with
-                                            the keys, therefore asserting that
-                                            the TPD key depicts the data's 'type' */
-
-/*
-** Initialize the thread private data manipulation
-*/
-void _PR_InitTPD(void)
-{
-    _pr_tpd_destructors = (PRThreadPrivateDTOR*)
-        PR_CALLOC(_PR_TPD_LIMIT * sizeof(PRThreadPrivateDTOR*));
-    PR_ASSERT(NULL != _pr_tpd_destructors);
-    _pr_tpd_length = _PR_TPD_LIMIT;
-}
-
-/*
-** Clean up the thread private data manipulation
-*/
-void _PR_CleanupTPD(void)
-{
-}  /* _PR_CleanupTPD */
-
-/*
-** This routine returns a new index for per-thread-private data table. 
-** The index is visible to all threads within a process. This index can 
-** be used with the PR_SetThreadPrivate() and PR_GetThreadPrivate() routines 
-** to save and retrieve data associated with the index for a thread.
-**
-** The index independently maintains specific values for each binding thread. 
-** A thread can only get access to its own thread-specific-data.
-**
-** Upon a new index return the value associated with the index for all threads
-** is NULL, and upon thread creation the value associated with all indices for 
-** that thread is NULL. 
-**
-**     "dtor" is the destructor function to invoke when the private
-**       data is set or destroyed
-**
-** Returns PR_FAILURE if the total number of indices will exceed the maximun 
-** allowed.
-*/
-
-PR_IMPLEMENT(PRStatus) PR_NewThreadPrivateIndex(
-    PRUintn *newIndex, PRThreadPrivateDTOR dtor)
-{
-    PRStatus rv;
-    PRInt32 index;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    PR_ASSERT(NULL != newIndex);
-    PR_ASSERT(NULL != _pr_tpd_destructors);
-
-    index = PR_AtomicIncrement(&_pr_tpd_highwater) - 1;  /* allocate index */
-    if (_PR_TPD_LIMIT <= index)
-    {
-        PR_SetError(PR_TPD_RANGE_ERROR, 0);
-        rv = PR_FAILURE;  /* that's just wrong */
-    }
-    else
-    {
-        _pr_tpd_destructors[index] = dtor;  /* record destructor @index */
-        *newIndex = (PRUintn)index;  /* copy into client's location */
-        rv = PR_SUCCESS;  /* that's okay */
-    }
-
-    return rv;
-}
-
-/*
-** Define some per-thread-private data.
-**     "index" is an index into the per-thread private data table
-**     "priv" is the per-thread-private data 
-**
-** If the per-thread private data table has a previously registered
-** destructor function and a non-NULL per-thread-private data value,
-** the destructor function is invoked.
-**
-** This can return PR_FAILURE if index is invalid (ie., beyond the current
-** high water mark) or memory is insufficient to allocate an exanded vector.
-*/
-
-PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
-{
-    PRThread *self = PR_GetCurrentThread();
-
-    /*
-    ** The index being set might not have a sufficient vector in this
-    ** thread. But if the index has been allocated, it's okay to go
-    ** ahead and extend this one now.
-    */
-    if ((index >= _PR_TPD_LIMIT) || (index >= _pr_tpd_highwater))
-    {
-        PR_SetError(PR_TPD_RANGE_ERROR, 0);
-        return PR_FAILURE;
-    }
-
-    PR_ASSERT(((NULL == self->privateData) && (0 == self->tpdLength))
-        || ((NULL != self->privateData) && (0 != self->tpdLength)));
-
-    if ((NULL == self->privateData) || (self->tpdLength <= index))
-    {
-        void *extension = PR_CALLOC(_pr_tpd_length * sizeof(void*));
-        if (NULL == extension)
-        {
-            PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-            return PR_FAILURE;
-        }
-        if (self->privateData) {
-            (void)memcpy(
-                extension, self->privateData,
-                self->tpdLength * sizeof(void*));
-            PR_DELETE(self->privateData);
-        }
-        self->tpdLength = _pr_tpd_length;
-        self->privateData = (void**)extension;
-    }
-    /*
-    ** There wasn't much chance of having to call the destructor
-    ** unless the slot already existed.
-    */
-    else if (self->privateData[index] && _pr_tpd_destructors[index])
-    {
-        void *data = self->privateData[index];
-        self->privateData[index] = NULL;
-        (*_pr_tpd_destructors[index])(data);
-    }
-
-    PR_ASSERT(index < self->tpdLength);
-    self->privateData[index] = priv;
-
-    return PR_SUCCESS;
-}
-
-/*
-** Recover the per-thread-private data for the current thread. "index" is
-** the index into the per-thread private data table. 
-**
-** The returned value may be NULL which is indistinguishable from an error 
-** condition.
-**
-*/
-
-PR_IMPLEMENT(void*) PR_GetThreadPrivate(PRUintn index)
-{
-    PRThread *self = PR_GetCurrentThread();
-    void *tpd = ((NULL == self->privateData) || (index >= self->tpdLength)) ?
-        NULL : self->privateData[index];
-
-    return tpd;
-}
-
-/*
-** Destroy the thread's private data, if any exists. This is called at
-** thread termination time only. There should be no threading issues
-** since this is being called by the thread itself.
-*/
-void _PR_DestroyThreadPrivate(PRThread* self)
-{
-#define _PR_TPD_DESTRUCTOR_ITERATIONS 4
-
-    if (NULL != self->privateData)  /* we have some */
-    {
-        PRBool clean;
-        PRUint32 index;
-        PRInt32 passes = _PR_TPD_DESTRUCTOR_ITERATIONS;
-        PR_ASSERT(0 != self->tpdLength);
-        do
-        {
-            clean = PR_TRUE;
-            for (index = 0; index < self->tpdLength; ++index)
-            {
-                void *priv = self->privateData[index];  /* extract */
-                if (NULL != priv)  /* we have data at this index */
-                {
-                    if (NULL != _pr_tpd_destructors[index])
-                    {
-                        self->privateData[index] = NULL;  /* precondition */
-                        (*_pr_tpd_destructors[index])(priv);  /* destroy */
-                        clean = PR_FALSE;  /* unknown side effects */
-                    }
-                }
-            }
-        } while ((--passes > 0) && !clean);  /* limit # of passes */
-        /*
-        ** We give up after a fixed number of passes. Any non-NULL
-        ** thread-private data value with a registered destructor
-        ** function is not destroyed.
-        */
-        memset(self->privateData, 0, self->tpdLength * sizeof(void*));
-    }
-}  /* _PR_DestroyThreadPrivate */
-
-#endif /* !XP_BEOS */
diff --git a/libs/js/nsprpub/pr/tests/.cvsignore b/libs/js/nsprpub/pr/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/tests/Makefile.in b/libs/js/nsprpub/pr/tests/Makefile.in
deleted file mode 100644
index d5fe66eb56..0000000000
--- a/libs/js/nsprpub/pr/tests/Makefile.in
+++ /dev/null
@@ -1,567 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-
-#! gmake
-
-MOD_DEPTH	= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-DIRS = dll
-
-CSRCS =             \
-	accept.c		\
-	acceptread.c	\
-	acceptreademu.c	\
-	addrstr.c		\
-	affinity.c		\
-	alarm.c			\
-	anonfm.c		\
-	append.c		\
-	atomic.c		\
-	attach.c		\
-	bigfile.c		\
-	bigfile2.c		\
-	bigfile3.c		\
-	cleanup.c		\
-	cltsrv.c		\
-	concur.c	    \
-	cvar.c			\
-	cvar2.c			\
-	dceemu.c		\
-	dlltest.c		\
-	dtoa.c			\
-	env.c			\
-	errcodes.c		\
-	errset.c		\
-	exit.c  		\
-	fdcach.c		\
-	fileio.c		\
-	foreign.c	    \
-	forktest.c	    \
-	formattm.c	    \
-	fsync.c	        \
-	getai.c			\
-	gethost.c		\
-	getproto.c		\
-	i2l.c		    \
-	initclk.c		\
-	inrval.c		\
-	instrumt.c      \
-	intrio.c        \
-	intrupt.c       \
-	io_timeout.c    \
-	ioconthr.c      \
-	ipv6.c          \
-	join.c    		\
-	joinkk.c        \
-	joinku.c        \
-	joinuk.c        \
-	joinuu.c        \
-	layer.c		    \
-	lazyinit.c		\
-	libfilename.c	\
-	lltest.c        \
-	lock.c          \
-	lockfile.c      \
-	logger.c		\
-	makedir.c		\
-	mbcs.c			\
-	multiacc.c		\
-	multiwait.c		\
-	many_cv.c		\
-	nameshm1.c      \
-	nbconn.c		\
-	nblayer.c		\
-	nonblock.c		\
-	ntioto.c        \
-	ntoh.c			\
-	obsints.c		\
-	op_2long.c      \
-	op_excl.c		\
-	op_filnf.c		\
-	op_filok.c		\
-	op_noacc.c		\
-	op_nofil.c		\
-	openfile.c		\
-	parent.c    	\
-	peek.c    		\
-	perf.c    		\
-	pipeping.c		\
-	pipeping2.c		\
-	pipepong.c		\
-	pipepong2.c		\
-	pipeself.c		\
-	poll_er.c		\
-	poll_nm.c		\
-	poll_to.c		\
-	pollable.c		\
-	prftest.c		\
-	prftest1.c		\
-	prftest2.c		\
-	primblok.c		\
-	priotest.c		\
-	provider.c		\
-	prpoll.c		\
-	prpollml.c		\
-	ranfile.c       \
-	randseed.c      \
-	rmdir.c			\
-	rwlocktest.c    \
-	sel_spd.c  		\
-	selct_er.c	    \
-	selct_nm.c	    \
-	selct_to.c	    \
-	select2.c  		\
-	selintr.c  		\
-	sem.c 	  		\
-	sema.c 	  		\
-	semaerr.c 		\
-	semaerr1.c 		\
-	semaping.c 		\
-	semapong.c 		\
-	sendzlf.c 		\
-	server_test.c	\
-	servr_kk.c		\
-	servr_ku.c		\
-	servr_uk.c		\
-	servr_uu.c		\
-	short_thread.c	\
-	sigpipe.c		\
-	socket.c		\
-	sockopt.c		\
-	sockping.c		\
-	sockpong.c		\
-	sprintf.c		\
-	sproc_ch.c	    \
-	sproc_p.c	    \
-	stack.c		    \
-	stdio.c		    \
-	str2addr.c		\
-	strod.c			\
-	suspend.c		\
-	switch.c		\
-	system.c		\
-	testbit.c    	\
-	testfile.c    	\
-	thrpool_server.c \
-	thrpool_client.c \
-	threads.c 	  	\
-	thruput.c 	  	\
-	timemac.c		\
-	timetest.c		\
-	tmoacc.c        \
-	tmocon.c        \
-	tpd.c			\
-	vercheck.c		\
-	version.c	    \
-	udpsrv.c	    \
-	writev.c        \
-	xnotify.c       \
-	y2k.c           \
-	y2ktmo.c        \
-	zerolen.c       \
-	$(NULL)
-
-ifeq ($(OS_TARGET),OS2)
-CSRCS +=            \
-	sleep.c			\
-	stat.c		    \
-	yield.c         \
-	$(NULL)
-endif
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS)
-
-INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-  EXTRA_LIBS += -lwsock32
-else
-  EXTRA_LIBS += wsock32.lib
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-  ifdef PROFILE                                                                              
-    LDOPTS += -PROFILE -MAP                                                                  
-  endif # profile
-endif # NS_USE_GCC
-endif
-
-ifeq ($(OS_ARCH),OS2)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-  LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
-else
-  EXTRA_LIBS = $(OS_LIBS)
-  LDOPTS = -Zomf -Zlinker /PM:VIO -Zlinker /ST:0x64000
-endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-# Use an absolute pathname as the runtime library path (for the -R
-# or -rpath linker option or the LD_RUN_PATH environment variable).
-ifeq (,$(patsubst /%,,$(DIST)))
-# $(DIST) is already an absolute pathname.
-ABSOLUTE_LIB_DIR = $(dist_libdir)
-else
-# $(DIST) is a relative pathname: prepend the current directory.
-PWD = $(shell pwd)
-ABSOLUTE_LIB_DIR = $(PWD)/$(dist_libdir)
-endif
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-    ifeq ($(USE_CPLUS), 1)
-        CC = CC
-    endif
-    LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
-    ifdef NS_USE_GCC
-        LDOPTS += -Wl,-rdata_shared
-    else
-        LDOPTS += -rdata_shared
-    endif
-# For 6.x machines, include this flag
-    ifeq ($(basename $(OS_RELEASE)),6)
-        ifndef NS_USE_GCC
-            ifeq ($(USE_N32),1)
-                LDOPTS += -n32
-            else
-                LDOPTS += -32
-            endif
-
-            ifeq ($(USE_PTHREADS), 1)
-                ifeq ($(OS_RELEASE), 6.2)
-                    LDOPTS += -Wl,-woff,85
-                endif
-            endif
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-    ifeq ($(USE_CPLUS), 1)
-        CC = cxx
-    endif
-# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
-# we do static linking.
-    ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-        LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-        LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
-        EXTRA_LIBS = -lc_r
-    else
-        LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
-    endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-    LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR)
-    ifeq ($(USE_64),1)
-        LDOPTS += +DD64
-    endif
-    ifeq ($(USE_PTHREADS),1)
-        EXTRA_LIBS = $(LIBPTHREAD)
-    endif
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-    LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
-    ifneq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-        LDOPTS += -brtl
-        EXTRA_LIBS = -ldl
-    endif
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-    ifneq ($(OS_RELEASE), 4.1.3_U1)
-        ifdef NS_USE_GCC
-            LDOPTS += -Xlinker -R -Xlinker $(ABSOLUTE_LIB_DIR)
-        else
-            ifeq ($(USE_CPLUS), 1)
-                CC = CC
-            endif
-            LDOPTS += -R $(ABSOLUTE_LIB_DIR)
-        endif
-    endif
-
-    ifneq ($(LOCAL_THREADS_ONLY),1)
-        ifdef USE_PTHREADS
-            EXTRA_LIBS = -lpthread -lthread
-        else
-            EXTRA_LIBS = -lthread
-        endif
-    endif # LOCAL_THREADS_ONLY
-endif # SunOS
-
-ifeq ($(OS_ARCH), NEC)
-    EXTRA_LIBS = $(OS_LIBS)
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-    export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH), NCR)
-# NCR needs to link against -lsocket -lnsl -ldl (and -lc, which is
-# linked implicitly by $(CC)).  Note that we did not link with these
-# system libraries when we built libnspr.so.
-    EXTRA_LIBS = -lsocket -lnsl -ldl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-    export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH), NEXTSTEP)
-# balazs.pataki@sztaki.hu: linkage is done in a different pass in the `tests'
-# modeul, so we have to pass the `-posix' flag by "hand" to `ld'
-LDOPTS += -posix
-endif
-
-ifeq ($(OS_ARCH), NEWS-OS)
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-    LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-    LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
-    EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
-endif
-
-ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
-    LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-    ifeq ($(USE_PTHREADS),1)
-        EXTRA_LIBS = -lpthread
-    endif
-endif
-
-ifeq ($(OS_ARCH), SCOOS)
-# SCO Unix needs to link against -lsocket again even though we
-# already linked with these system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH),SINIX)
-EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
-# option for ld on other platforms.
-export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH),OpenUNIX)
-export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-ifeq ($(USE_PTHREADS),1)
-LDOPTS += -pthread
-endif
-endif
-
-ifeq ($(OS_ARCH), UNIXWARE)
-export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH),FreeBSD)
-ifeq ($(USE_PTHREADS),1)
-LDOPTS += -pthread
-endif
-LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
-endif
-
-ifeq ($(OS_ARCH),OpenBSD)
-ifeq ($(USE_PTHREADS),1)
-LDOPTS += -pthread
-endif
-endif
-
-ifeq ($(OS_ARCH),BSD_OS)
-ifneq ($(OS_RELEASE),1.1)
-EXTRA_LIBS = -ldl
-endif
-endif
-
-ifeq ($(USE_PTHREADS),1)
-LIBPTHREAD = -lpthread
-ifeq ($(OS_ARCH),AIX)
-LIBPTHREAD = -lpthreads
-endif
-ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS QNX Darwin OpenUNIX,$(OS_ARCH)))
-LIBPTHREAD =
-endif
-ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)
-LIBPTHREAD = -ldce
-endif
-endif
-
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifeq ($(OS_RELEASE),4.1)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
-	link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -out:$@
-else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LD) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(OS_LIBS) $(EXTRA_LIBS)
-else
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -o $@
-endif # OS/2
-endif # WINNT
-endif # AIX_PRE_4_2
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
-
-# The following tests call BSD socket functions, so they need to link
-# with -lsocket on some platforms.
-ifeq ($(OS_ARCH),SunOS)
-ifneq ($(OS_RELEASE),4.1.3_U1)
-ifeq ($(USE_IPV6),1)
-$(OBJDIR)/gethost: $(OBJDIR)/gethost.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
-endif
-$(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
-endif
-endif
-
-ifeq ($(USE_PTHREADS), 1)
-$(OBJDIR)/attach: $(OBJDIR)/attach.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
-$(OBJDIR)/foreign: $(OBJDIR)/foreign.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
-$(OBJDIR)/provider: $(OBJDIR)/provider.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
-$(OBJDIR)/socket: $(OBJDIR)/socket.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
-$(OBJDIR)/testfile: $(OBJDIR)/testfile.o
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
-endif
-
-#
-# Run the test programs with no arguments
-#
-# Test output goes to the file pointed to by the environment variable
-# NSPR_TEST_LOGFILE, if set, else to /dev/null
-#
-ECHO = echo
-PROGRAMS = $(notdir $(PROGS))
-ifdef NSPR_TEST_LOGFILE
-LOGFILE = $(NSPR_TEST_LOGFILE)
-else
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-LOGFILE = nul
-else
-LOGFILE = /dev/null
-endif
-endif
-
-ifeq ($(OS_TARGET),Linux)
-ECHO = /bin/echo
-endif
-
-ALWAYS:
-
-runtests:: $(PROGS) ALWAYS
-	@$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n"
-	@$(ECHO) "BEGIN\t\t\t`date`"
-	@$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n"
-	@$(ECHO) "Test\t\t\tResult\n"
-	@cd $(OBJDIR); for i in $(PROGRAMS); do					\
-	$(ECHO) "$$i\c";										\
-	./$$i >> $(LOGFILE) 2>&1 ;								\
-	if  [ 0 = $$? ] ; then									\
-		$(ECHO) "\t\t\tPassed";								\
-	else													\
-		$(ECHO) "\t\t\tFAILED";								\
-	fi;														\
-	done
-	@$(ECHO) "\nEND\t\t`date`\n"
diff --git a/libs/js/nsprpub/pr/tests/README.TXT b/libs/js/nsprpub/pr/tests/README.TXT
deleted file mode 100644
index eeb1dd0d22..0000000000
--- a/libs/js/nsprpub/pr/tests/README.TXT
+++ /dev/null
@@ -1,434 +0,0 @@
-File: pr/tests/readme
-
-This document describes the test cases in the NSPR directory
-pr/tests.
-
-=====================================================================
-There are some sub-directories here:
-
-dll
-	sources for the .dll(.so) used by test dlltest.c
-
-macbuild
-	MacIntosh project files
-
-server
-	an empty directory. Does anyone remember why?
-
-w16gui
-	Sources for a modified version of the poppad application from
-	Charles Petzold's book "Programming Windows 3.1". These
-	sources were modified to test the library lib/ds/PLEvent.
-	These files are obsolete and will not be maintained.
-	
-	This test was superceded by lib/tests/windows/winevent.c and
-	lib/event.c and is now owned by CPD.
-
-=====================================================================
-The individual files are described here.
-
-The script 'runtests.ksh' enumerates and runs test cases that are
-expected to run on all platforms.
-
-
-accept.c
-	Tests PR_Accept() and related socket functions.
-
-acceptread.c
-	Tests PR_AcceptRead()
-
-alarm.c
-	Tests alarm functions declared in obsolete/pralarm.h.
-	The alarm functions are obsolete, so is this test.
-
-atomic.c
-	Tests Atomic operations defined in pratom.h
-
-attach.c
-	Test PR_AttachThread()
-	Note: This is an NSPR private function.
-
-bigfile.c
-	Test 64bit file offset functions declared in prio.h
-
-bug1test.c
-	Demonstrates a bug on NT.
-
-cleanup.c
-	Tests PR_Cleanup() declared in prinit.h
-
-cltsrv.c
-	Tests many socket functions.
-
-concur.c
-	Tests threading functions and concurrent operations.
-
-cvar.c
-	Tests condition variables.
-
-cvar2.c
-	Tests condition variables. A rather abusive test.
-
-dbmalloc.c
-	Obsolete. Originally for testing debug builds of NSPR's malloc.
-
-dbmalloc1.c
-	Obsolete. Originally for testing debug builds of NSPR's malloc.
-
-dceemu.c
-	Tests special functions for DCE emulation.
-
-depend.c
-	Obsoltet. Tests early spec for library dependency.
-
-dlltest.c
-	Tests dynamic library fucntions. Used with dll/my.c
-
-dtoa.c
-	Tests conversions of double to string.
-
-exit.c
-	Tests PR_ProcessExit() declared in prinit.h
-
-fileio.c
-	Tests NSPR semaphores a bit of file i/o and threading
-	functions.
-
-foreign.c
-	Test auto-attach of a thread created by something other than
-	NSPR.
-
-forktest.c
-	Limited use. Tests unix fork() and related functions.
-
-fsync.c
-	Tests use of PR_Sync() declared in prio.h
-
-getproto.c
-	Tests socket functions PR_GetProtoByName(), etc.
-
-i2l.c
-	Tests LongLong functions for converting 32bit integer to 64bit
-	integer.
-
-initclk.c
-	Tests timing on minimal use of condition variable
-
-inrval.c
-	Tests interval timing functions.
-
-instrumt.c
-	Tests instrumentation functions. prcountr.h prtrace.h
-
-intrupt.c
-	Tests PR_Interrupt()
-
-ioconthr.c
-	Tests i/o continuation mechanism in pthreads.
-
-io_timeout.c
-	Test socket i/o timeouts.
-
-io_timeoutk.c
-	Obsolete. Subsumed in io_timeout.c
-
-io_timeoutu.c
-	Obsolete. Subsumed in io_timeout.c
-
-ipv6.c
-	Tests IPv6. IPv6 is not used by NSPR clients.
-
-join.c
-	Tests PR_JoinThread()
-
-joinkk.c
-	Tests PR_JoinThread()
-
-joinku.c
-	Tests PR_JoinThread()
-
-joinuk.c
-	Tests PR_JoinThread()
-
-joinuu.c
-	Tests PR_JoinThread()
-
-layer.c
-	Tests layered I/O.
-
-lazyinit.c
-	Tests implicit initialization.
-
-lltest.c
-	Tests LongLong (64bit integer) arithmentic and conversions.
-
-lock.c
-	Tests PR_Lock() in heavily threaded environment.
-
-lockfile.c
-	Test PR_Lockfile().
-
-logger.c
-	Tests PR_LOG()
-
-makefile
-	The makefile that builds all the tests
-
-many_cv.c
-	Tests aquiring a large number of condition variables.
-
-multiwait.c
-	???
-
-nbconn.c
-	Test non-blocking connect.
-
-nblayer.c
-	Tests NSPR's layered I/O capability.
-
-nonblock.c
-	Tests operations on non-blocking socket.
-
-op_2long.c
-	Tests PR_Open() where filename is too long.
-
-op_filnf.c
-	Tests PR_Open() where filename is NotFound.
-
-op_filok.c
-	Tests PR_Open() where filename is accessable.
-
-op_noacc.c
-	Tests PR_Open() where file permissions are wrong.
-	Limited use. Windows has no concept of Unix style file permissions.
-
-op_nofil.c
-	Tests PR_Open() where filename does not exist.
-
-parent.c
-	Test parent/child process capability
-
-perf.c
-	Tests and measures context switch times for various thread
-	syncronization functions.
-
-pipeping.c
-	Tests inter-process pipes. Run with pipepong.c
-
-pipepong.c
-	Tests inter-process pipes. Run with pipeping.c
-
-pipeself.c
-	Tests inter-thread pipes.
-
-pollable.c
-	Tests pollable events. prio.h
-
-poll_er.c
-	Tests PR_Poll() where an error is expected.
-
-poll_nm.c
-	Tests PR_Poll() where normal operation is expected.
-
-poll_to.c
-	Tests PR_Poll() where timeout is expected.
-
-prftest.c
-	Tests printf-like formatting.
-
-prftest1.c
-	Obsolete. Subsumed in prftest.c
-
-prftest2.c
-	Obsolete. Subsumed in prftest.c
-
-priotest.c
-	Limited use. Tests NSPR thread dispatching priority.
-
-provider.c
-
-prpoll.c
-	Tests PR_Poll().
-
-prselect.c
-	Obsolete. PR_Select() is obsolete.
-
-prttools.h
-	Unused file.
-
-ranfile.c
-	Tests random file access.
-
-readme
-	This file.
-
-runtests.ksh
-	A korn shell script that runs a set of tests that should run
-	on any of the NSPR supported platforms.
-
-runtests.pl
-	A perl script to run the test cases. This srcipt runs tests
-	common to all platforms and runs tests applicable to specific
-	platforms. Uses file runtests.txt to control execution.
-
-runtests.txt
-	Control file for perl script: runtests.pl
-
-rwlocktest.c
-	Tests Reader/Writer lock
-
-selct_er.c
-	Obsolete. PR_Select() is obsolete.
-
-selct_nm.c
-	Obsolete. PR_Select() is obsolete.
-
-selct_to.c
-	Obsolete. PR_Select() is obsolete.
-
-select2.c
-	Obsolete. PR_Select() is obsolete.
-
-sel_spd.c
-	Obsolete. PR_Select() is obsolete.
-
-sem.c
-	Obsolete. Semaphores are not supported.
-
-server_test.c
-	Tests sockets by simulating a server in loopback mode.
-	Makes its own client threads.
-
-servr_kk.c
-	Tests client/server sockets, threads using system threads.
-
-servr_ku.c
-	Tests client/server sockets, threads using system and user threads.
-
-servr_uk.c
-	Tests client/server sockets, threads using system and user threads.
-
-servr_uu.c
-	Tests client/server sockets, threads user threads.
-
-short_thread.c
-	Tests short-running threads. Useful for testing for race conditions.
-
-sigpipe.c
-	Tests NSPR's SIGPIPE handler. Unix only.
-
-sleep.c
-	Limited use. Tests sleep capability of platform.
-
-socket.c
-	Tests many socket functions.
-
-sockopt.c
-	Tests setting and getting socket options.
-
-sprintf.c
-	Tests sprintf.
-
-sproc_ch.c
-	Obsolete. Tests IRIX sproc-based threads.
-
-sproc_p.c
-	Obsolete. Tests IRIX sproc-based threads.
-
-stack.c
-	Test atomic stack operations.
-
-stat.c
-	Tests performance of getfileinfo() vs. stat()
-
-stdio.c
-	Tests NSPR's handling of stdin, stdout, stderr.
-
-strod.c
-	Tests formatting of double precision floating point.
-
-suspend.c
-	Private interfaces PR_SuspendAll(), PR_ResumeAll(), etc.
-
-switch.c
-	Tests thread switching
-
-system.c
-	Tests PR_GetSystemInfo()
-
-testbit.c
-	Tests bit arrays.
-
-testfile.c
-	Tests many file I/O functions.
-
-threads.c
-	Tests thread caching.
-
-thruput.c
-	Tests socket thruput. Must be run by hand as client/server.
-	Does not self terminate.
-
-time.c
-	Incomplete. Limited use.
-
-timemac.c
-	Test time and date functions. Originally for Mac.
-
-timetest.c
-	Tests time conversion over a wide range of dates.
-
-tmoacc.c
-	Server to tmocon.c and writev.c
-	Do not run it by itself.
-
-tmocon.c
-	Client thread to tmoacc.c
-
-tpd.c
-	Tests thread private data.
-
-udpsrv.c
-	Tests UDP socket functions.
-
-ut_ttools.h
-	unused file.
-
-version.c
-	Extract and print library version data.
-
-vercheck.c
-	Test PR_VersionCheck().
-
-writev.c
-	Tests gather-write on a socket. Requires tmoacc.c
-
-xnotify.c
-	Tests cached monitors.
-
-yield.c
-	Limited use
-
-y2k.c
-	Test to verify NSPR's date functions as Y2K compliant.
-
-dll\Makefile
-	makefile for mygetval.c, mysetval.c
-
-dll\mygetval.c
-	Dynamic library test. See also dlltest.c
-
-dll\mysetval.c
-	Dynamic library test. See also dlltest.c
-
-w16gui\Makefile
-	Obsolete. Tests for lib/ds/PLEvent on Windows 3.1.
-w16gui\popfile.c
-w16gui\popfind.c
-w16gui\popfont.c
-w16gui\poppad.c
-w16gui\poppad.h
-w16gui\poppad.ico
-w16gui\poppad.rc
-w16gui\popprnt0.c
-w16gui\readme.1st
diff --git a/libs/js/nsprpub/pr/tests/accept.c b/libs/js/nsprpub/pr/tests/accept.c
deleted file mode 100644
index 4fada1aabe..0000000000
--- a/libs/js/nsprpub/pr/tests/accept.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-** Name: accept.c
-**
-** Description: Run accept() sucessful connection tests.
-**
-** Modification History:
-** 04-Jun-97 AGarcia - Reconvert test file to return a 0 for PASS and a 1 for FAIL
-** 13-May-97 AGarcia- Converted the test to accomodate the debug_mode 
-**             The debug mode will print all of the printfs associated with this test.
-**             The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**             have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**            recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-
-#include "nspr.h"
-#include "prpriv.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "plgetopt.h"
-#include "plerror.h"
-
-#define BASE_PORT 10000
-
-#define CLIENT_DATA        128
-
-#define ACCEPT_NORMAL        0x1
-#define ACCEPT_FAST        0x2
-#define ACCEPT_READ        0x3
-#define ACCEPT_READ_FAST    0x4
-#define ACCEPT_READ_FAST_CB    0x5
-
-#define CLIENT_NORMAL        0x1
-#define CLIENT_TIMEOUT_ACCEPT    0x2
-#define CLIENT_TIMEOUT_SEND    0x3
-
-#define SERVER_MAX_BIND_COUNT        100
-
-#if defined(XP_MAC) || defined(XP_OS2)
-#define TIMEOUTSECS 10
-#else
-#define TIMEOUTSECS 2
-#endif
-PRIntervalTime timeoutTime;
-
-static PRInt32 count = 1;
-static PRFileDesc *output;
-static PRNetAddr serverAddr;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-static PRInt32 clientCommand;
-static PRInt32 iterations;
-static PRStatus rv;
-static PRFileDesc *listenSock;
-static PRFileDesc *clientSock = NULL;
-static PRNetAddr listenAddr;
-static PRNetAddr clientAddr;
-static PRThread *clientThread;
-static PRNetAddr *raddr;
-static char buf[4096 + 2*sizeof(PRNetAddr) + 32];
-static PRInt32 status;
-static PRInt32 bytesRead;
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-void Test_Assert(const char *msg, const char *file, PRIntn line)
-{
-    failed_already=1;
-    if (debug_mode) {
-        PR_fprintf(output,  "@%s:%d ", file, line);
-        PR_fprintf(output, msg);
-    }
-}  /* Test_Assert */
-
-#define TEST_ASSERT(expr) \
-    if (!(expr)) Test_Assert(#expr, __FILE__, __LINE__)
-
-#ifdef WINNT
-#define CALLBACK_MAGIC 0x12345678
-
-void timeout_callback(void *magic)
-{
-    TEST_ASSERT(magic == (void *)CALLBACK_MAGIC);
-    if (debug_mode)
-        PR_fprintf(output, "timeout callback called okay\n");
-}
-#endif
-
-
-static void PR_CALLBACK
-ClientThread(void *_action)
-{
-    PRInt32 action = * (PRInt32 *) _action;
-    PRInt32 iterations = count;
-    PRFileDesc *sock = NULL;
-
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = listenAddr.inet.port;
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    for (; iterations--;) {
-        PRInt32 rv;
-        char buf[CLIENT_DATA];
-
-        memset(buf, 0xaf, sizeof(buf)); /* initialize with arbitrary data */
-        sock = PR_NewTCPSocket();
-        if (!sock) {
-            if (!debug_mode)
-                failed_already=1;
-            else    
-                PR_fprintf(output, "client: unable to create socket\n");
-            return;
-        }
-
-        if (action != CLIENT_TIMEOUT_ACCEPT) {
-
-            if ((rv = PR_Connect(sock, &serverAddr,
-                timeoutTime)) < 0) {
-                if (!debug_mode)
-                    failed_already=1;
-                else    
-                    PR_fprintf(output, 
-                        "client: unable to connect to server (%ld, %ld, %ld, %ld)\n",
-                        iterations, rv, PR_GetError(), PR_GetOSError());
-                goto ErrorExit;
-            }
-
-            if (action != CLIENT_TIMEOUT_SEND) {
-                if ((rv = PR_Send(sock, buf, CLIENT_DATA,
-                    0, timeoutTime))< 0) {
-                    if (!debug_mode)
-                        failed_already=1;
-                    else    
-                        PR_fprintf(output, 
-                            "client: unable to send to server (%d, %ld, %ld)\n",
-                            CLIENT_DATA, rv, PR_GetError());
-                	goto ErrorExit;
-                }
-            } else {
-                PR_Sleep(PR_SecondsToInterval(TIMEOUTSECS + 1));
-            }
-        } else {
-            PR_Sleep(PR_SecondsToInterval(TIMEOUTSECS + 1));
-        }
-        if (debug_mode)
-            PR_fprintf(output, ".");
-        PR_Close(sock);
-		sock = NULL;
-    }
-    if (debug_mode)
-        PR_fprintf(output, "\n");
-
-ErrorExit:
-	if (sock != NULL)
-        PR_Close(sock);
-}
-
-
-static void 
-RunTest(PRInt32 acceptType, PRInt32 clientAction)
-{
-int i;
-
-    /* First bind to the socket */
-    listenSock = PR_NewTCPSocket();
-    if (!listenSock) {
-        failed_already=1;
-        if (debug_mode)
-            PR_fprintf(output, "unable to create listen socket\n");
-        return;
-    }
-	memset(&listenAddr, 0 , sizeof(listenAddr));
-    listenAddr.inet.family = PR_AF_INET;
-    listenAddr.inet.port = PR_htons(BASE_PORT);
-    listenAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    /*
-     * try a few times to bind server's address, if addresses are in
-     * use
-     */
-    i = 0;
-    while (PR_Bind(listenSock, &listenAddr) == PR_FAILURE) {
-        if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-            listenAddr.inet.port += 2;
-            if (i++ < SERVER_MAX_BIND_COUNT)
-                continue;
-        }
-        failed_already=1;
-        if (debug_mode)
-        	PR_fprintf(output,"accept: ERROR - PR_Bind failed\n");
-		return;
-    }
-
-
-    rv = PR_Listen(listenSock, 100);
-    if (rv == PR_FAILURE) {
-        failed_already=1;
-        if (debug_mode)
-            PR_fprintf(output, "unable to listen\n");
-        return;
-    }
-
-    clientCommand = clientAction;
-    clientThread = PR_CreateThread(PR_USER_THREAD, ClientThread,
-        (void *)&clientCommand, PR_PRIORITY_NORMAL, thread_scope,
-        PR_JOINABLE_THREAD, 0);
-    if (!clientThread) {
-        failed_already=1;
-        if (debug_mode)
-            PR_fprintf(output, "error creating client thread\n");
-        return;
-    }
-
-    iterations = count;
-    for (;iterations--;) {
-        switch (acceptType) {
-        case ACCEPT_NORMAL:
-            clientSock = PR_Accept(listenSock, &clientAddr,
-                timeoutTime);
-            switch(clientAction) {
-            case CLIENT_TIMEOUT_ACCEPT:
-                TEST_ASSERT(clientSock == 0);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            case CLIENT_NORMAL:
-                TEST_ASSERT(clientSock);
-                bytesRead = PR_Recv(clientSock,
-                    buf,  CLIENT_DATA,  0,  timeoutTime);
-                TEST_ASSERT(bytesRead == CLIENT_DATA);
-                break;
-            case CLIENT_TIMEOUT_SEND:
-                TEST_ASSERT(clientSock);
-                bytesRead = PR_Recv(clientSock,
-                    buf,  CLIENT_DATA,  0,  timeoutTime);
-                TEST_ASSERT(bytesRead == -1);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            }
-            break;
-        case ACCEPT_READ:
-            status = PR_AcceptRead(listenSock, &clientSock,
-                &raddr, buf, CLIENT_DATA, timeoutTime);
-            switch(clientAction) {
-            case CLIENT_TIMEOUT_ACCEPT:
-                /* Invalid test case */
-                TEST_ASSERT(0);
-                break;
-            case CLIENT_NORMAL:
-                TEST_ASSERT(clientSock);
-                TEST_ASSERT(status == CLIENT_DATA);
-                break;
-            case CLIENT_TIMEOUT_SEND:
-                TEST_ASSERT(status == -1);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            }
-            break;
-#ifdef WINNT
-        case ACCEPT_FAST:
-            clientSock = PR_NTFast_Accept(listenSock,
-                &clientAddr, timeoutTime);
-            switch(clientAction) {
-            case CLIENT_TIMEOUT_ACCEPT:
-                TEST_ASSERT(clientSock == 0);
-                if (debug_mode)
-                    PR_fprintf(output, "PR_GetError is %ld\n", PR_GetError());
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            case CLIENT_NORMAL:
-                TEST_ASSERT(clientSock);
-                bytesRead = PR_Recv(clientSock,
-                    buf,  CLIENT_DATA,  0,  timeoutTime);
-                TEST_ASSERT(bytesRead == CLIENT_DATA);
-                break;
-            case CLIENT_TIMEOUT_SEND:
-                TEST_ASSERT(clientSock);
-                bytesRead = PR_Recv(clientSock,
-                    buf,  CLIENT_DATA,  0,  timeoutTime);
-                TEST_ASSERT(bytesRead == -1);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            }
-            break;
-            break;
-        case ACCEPT_READ_FAST:
-            status = PR_NTFast_AcceptRead(listenSock,
-                &clientSock, &raddr, buf, 4096, timeoutTime);
-            switch(clientAction) {
-            case CLIENT_TIMEOUT_ACCEPT:
-                /* Invalid test case */
-                TEST_ASSERT(0);
-                break;
-            case CLIENT_NORMAL:
-                TEST_ASSERT(clientSock);
-                TEST_ASSERT(status == CLIENT_DATA);
-                break;
-            case CLIENT_TIMEOUT_SEND:
-                TEST_ASSERT(clientSock == NULL);
-                TEST_ASSERT(status == -1);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            }
-            break;
-        case ACCEPT_READ_FAST_CB:
-            status = PR_NTFast_AcceptRead_WithTimeoutCallback(
-                listenSock, &clientSock, &raddr, buf, 4096,
-                timeoutTime, timeout_callback, (void *)CALLBACK_MAGIC);
-            switch(clientAction) {
-            case CLIENT_TIMEOUT_ACCEPT:
-                /* Invalid test case */
-                TEST_ASSERT(0);
-                break;
-            case CLIENT_NORMAL:
-                TEST_ASSERT(clientSock);
-                TEST_ASSERT(status == CLIENT_DATA);
-                break;
-            case CLIENT_TIMEOUT_SEND:
-                if (debug_mode)
-                    PR_fprintf(output, "clientSock = 0x%8.8lx\n", clientSock);
-                TEST_ASSERT(clientSock == NULL);
-                TEST_ASSERT(status == -1);
-                TEST_ASSERT(PR_GetError() == PR_IO_TIMEOUT_ERROR);
-                break;
-            }
-            break;
-#endif
-        }
-        if (clientSock != NULL) {
-            PR_Close(clientSock);
-            clientSock = NULL;
-        }
-    }
-    PR_Close(listenSock);
-
-    PR_JoinThread(clientThread);
-}
-
-
-void AcceptUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_NORMAL, CLIENT_NORMAL); 
-}
-void AcceptNotUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_FAST, CLIENT_NORMAL); 
-}
-void AcceptReadTest(void)
-{ 
-    RunTest(ACCEPT_READ, CLIENT_NORMAL); 
-}
-void AcceptReadNotUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_READ_FAST, CLIENT_NORMAL); 
-}
-void AcceptReadCallbackTest(void)
-{ 
-    RunTest(ACCEPT_READ_FAST_CB, CLIENT_NORMAL); 
-}
-
-void TimeoutAcceptUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_NORMAL, CLIENT_TIMEOUT_ACCEPT); 
-}
-void TimeoutAcceptNotUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_FAST, CLIENT_TIMEOUT_ACCEPT); 
-}
-void TimeoutAcceptReadCallbackTest(void)
-{ 
-    RunTest(ACCEPT_READ_FAST_CB, CLIENT_TIMEOUT_ACCEPT); 
-}
-
-void TimeoutReadUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_NORMAL, CLIENT_TIMEOUT_SEND); 
-}
-void TimeoutReadNotUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_FAST, CLIENT_TIMEOUT_SEND); 
-}
-void TimeoutReadReadTest(void)
-{ 
-    RunTest(ACCEPT_READ, CLIENT_TIMEOUT_SEND); 
-}
-void TimeoutReadReadNotUpdatedTest(void)
-{ 
-    RunTest(ACCEPT_READ_FAST, CLIENT_TIMEOUT_SEND); 
-}
-void TimeoutReadReadCallbackTest(void)
-{ 
-    RunTest(ACCEPT_READ_FAST_CB, CLIENT_TIMEOUT_SEND); 
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-    if (debug_mode)
-        PR_fprintf(output, "%40s: %6.2f usec\n", msg, d / count);
-
-}
-
-int main(int argc, char **argv)
-{
-
-    /* The command line argument: -d is used to determine if the test is being run
-    in debug mode. The regress tool requires only one line output:PASS or FAIL.
-    All of the printfs associated with this test has been handled with a if (debug_mode)
-    test.
-    Usage: test_name [-d] [-c n]
-    */
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "Gdc:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'd':  /* debug mode */
-            debug_mode = 1;
-            break;
-        case 'c':  /* loop counter */
-            count = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    output = PR_STDERR;
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("accept.log");
-    debug_mode = 1;
-#endif
-
-    timeoutTime = PR_SecondsToInterval(TIMEOUTSECS);
-    if (debug_mode)
-        PR_fprintf(output, "\nRun accept() sucessful connection tests\n");
-
-    Measure(AcceptUpdatedTest, "PR_Accept()");
-    Measure(AcceptReadTest, "PR_AcceptRead()");
-#ifdef WINNT
-    Measure(AcceptNotUpdatedTest, "PR_NTFast_Accept()");
-    Measure(AcceptReadNotUpdatedTest, "PR_NTFast_AcceptRead()");
-    Measure(AcceptReadCallbackTest, "PR_NTFast_AcceptRead_WithTimeoutCallback()");
-#endif
-    if (debug_mode)
-        PR_fprintf(output, "\nRun accept() timeout in the accept tests\n");
-#ifdef WINNT
-    Measure(TimeoutReadReadCallbackTest, "PR_NTFast_AcceptRead_WithTimeoutCallback()");
-#endif
-    Measure(TimeoutReadUpdatedTest, "PR_Accept()");
-    if (debug_mode)
-        PR_fprintf(output, "\nRun accept() timeout in the read tests\n");
-    Measure(TimeoutReadReadTest, "PR_AcceptRead()");
-#ifdef WINNT
-    Measure(TimeoutReadNotUpdatedTest, "PR_NTFast_Accept()");
-    Measure(TimeoutReadReadNotUpdatedTest, "PR_NTFast_AcceptRead()");
-    Measure(TimeoutReadReadCallbackTest, "PR_NTFast_AcceptRead_WithTimeoutCallback()");
-#endif
-    PR_fprintf(output, "%s\n", (failed_already) ? "FAIL" : "PASS");
-    return failed_already;
-}
diff --git a/libs/js/nsprpub/pr/tests/acceptread.c b/libs/js/nsprpub/pr/tests/acceptread.c
deleted file mode 100644
index ceb445d024..0000000000
--- a/libs/js/nsprpub/pr/tests/acceptread.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <prio.h>
-#include <prprf.h>
-#include <prinit.h>
-#include <prnetdb.h>
-#include <prinrval.h>
-#include <prthread.h>
-
-#include <plerror.h>
-
-#include <stdlib.h>
-
-#define DEFAULT_PORT 12273
-#define GET "GET / HTTP/1.0\n\n"
-static PRFileDesc *std_out, *err_out;
-static PRIntervalTime write_dally, accept_timeout;
-
-static PRStatus PrintAddress(const PRNetAddr* address)
-{
-    char buffer[100];
-    PRStatus rv = PR_NetAddrToString(address, buffer, sizeof(buffer));
-    if (PR_FAILURE == rv) PL_FPrintError(err_out, "PR_NetAddrToString");
-    else PR_fprintf(
-        std_out, "Accepted connection from (0x%p)%s:%d\n",
-        address, buffer, address->inet.port);
-    return rv;
-}  /* PrintAddress */
-
-static void ConnectingThread(void *arg)
-{
-    PRInt32 nbytes;
-    char buf[1024];
-    PRFileDesc *sock;
-    PRNetAddr peer_addr, *addr;
-
-    addr = (PRNetAddr*)arg;
-
-    sock = PR_NewTCPSocket();
-    if (sock == NULL)
-    {
-        PL_FPrintError(err_out, "PR_NewTCPSocket (client) failed");
-        PR_ProcessExit(1);
-    }
-
-    if (PR_Connect(sock, addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE)
-    {
-        PL_FPrintError(err_out, "PR_Connect (client) failed");
-        PR_ProcessExit(1);
-    }
-    if (PR_GetPeerName(sock, &peer_addr) == PR_FAILURE)
-    {
-        PL_FPrintError(err_out, "PR_GetPeerName (client) failed");
-        PR_ProcessExit(1);
-    }
-
-    /*
-    ** Then wait between the connection coming up and sending the expected
-    ** data. At some point in time, the server should fail due to a timeou
-    ** on the AcceptRead() operation, which according to the document is
-    ** only due to the read() portion.
-    */
-    PR_Sleep(write_dally);
-
-    nbytes = PR_Send(sock, GET, sizeof(GET), 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes == -1) PL_FPrintError(err_out, "PR_Send (client) failed");
-
-    nbytes = PR_Recv(sock, buf, sizeof(buf), 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes == -1) PL_FPrintError(err_out, "PR_Recv (client) failed");
-    else
-    {
-        PR_fprintf(std_out, "PR_Recv (client) succeeded: %d bytes\n", nbytes);
-        buf[sizeof(buf) - 1] = '\0';
-        PR_fprintf(std_out, "%s\n", buf);
-    }
-
-    if (PR_FAILURE == PR_Shutdown(sock, PR_SHUTDOWN_BOTH))
-        PL_FPrintError(err_out, "PR_Shutdown (client) failed");
-
-    if (PR_FAILURE == PR_Close(sock))
-        PL_FPrintError(err_out, "PR_Close (client) failed");
-
-    return;
-}  /* ConnectingThread */
-
-#define BUF_SIZE 117
-static void AcceptingThread(void *arg)
-{
-    PRStatus rv;
-    PRInt32 bytes;
-    PRSize buf_size = BUF_SIZE;
-    PRUint8 buf[BUF_SIZE + (2 * sizeof(PRNetAddr)) + 32];
-    PRNetAddr *accept_addr, *listen_addr = (PRNetAddr*)arg;
-    PRFileDesc *accept_sock, *listen_sock = PR_NewTCPSocket();
-    PRSocketOptionData sock_opt;
-
-    if (NULL == listen_sock)
-    {
-        PL_FPrintError(err_out, "PR_NewTCPSocket (server) failed");
-        PR_ProcessExit(1);        
-    }
-    sock_opt.option = PR_SockOpt_Reuseaddr;
-    sock_opt.value.reuse_addr = PR_TRUE;
-    rv = PR_SetSocketOption(listen_sock, &sock_opt);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_SetSocketOption (server) failed");
-        PR_ProcessExit(1);        
-    }
-    rv = PR_Bind(listen_sock, listen_addr);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_Bind (server) failed");
-        PR_ProcessExit(1);        
-    }
-    rv = PR_Listen(listen_sock, 10);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_Listen (server) failed");
-        PR_ProcessExit(1);        
-    }
-    bytes = PR_AcceptRead(
-        listen_sock, &accept_sock, &accept_addr, buf, buf_size, accept_timeout);
-
-    if (-1 == bytes) PL_FPrintError(err_out, "PR_AcceptRead (server) failed");
-    else
-    {
-        PrintAddress(accept_addr);
-        PR_fprintf(
-            std_out, "(Server) read [0x%p..0x%p) %s\n",
-            buf, &buf[BUF_SIZE], buf);
-        bytes = PR_Write(accept_sock, buf, bytes);
-        rv = PR_Shutdown(accept_sock, PR_SHUTDOWN_BOTH);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err_out, "PR_Shutdown (server) failed");
-    }
-
-    if (-1 != bytes)
-    {
-        rv = PR_Close(accept_sock);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err_out, "PR_Close (server) failed");
-    }
-
-    rv = PR_Close(listen_sock);
-    if (PR_FAILURE == rv)
-        PL_FPrintError(err_out, "PR_Close (server) failed");
-}  /* AcceptingThread */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRHostEnt he;
-    PRStatus status;
-    PRIntn next_index;
-    PRUint16 port_number;
-    char netdb_buf[PR_NETDB_BUF_SIZE];
-    PRNetAddr client_addr, server_addr;
-    PRThread *client_thread, *server_thread;
-    PRIntervalTime delta = PR_MillisecondsToInterval(500);
-
-    err_out = PR_STDERR;
-    std_out = PR_STDOUT;
-    accept_timeout = PR_SecondsToInterval(2);
-
-    if (argc != 2 && argc != 3) port_number = DEFAULT_PORT;
-    else port_number = (PRUint16)atoi(argv[(argc == 2) ? 1 : 2]);
-
-    status = PR_InitializeNetAddr(PR_IpAddrAny, port_number, &server_addr);
-    if (PR_SUCCESS != status)
-    {
-        PL_FPrintError(err_out, "PR_InitializeNetAddr failed");
-        PR_ProcessExit(1);
-    }
-    if (argc < 3)
-    {
-        status = PR_InitializeNetAddr(
-            PR_IpAddrLoopback, port_number, &client_addr);
-        if (PR_SUCCESS != status)
-        {
-            PL_FPrintError(err_out, "PR_InitializeNetAddr failed");
-            PR_ProcessExit(1);
-        }
-    }
-    else
-    {
-        status = PR_GetHostByName(
-            argv[1], netdb_buf, sizeof(netdb_buf), &he);
-        if (status == PR_FAILURE)
-        {
-            PL_FPrintError(err_out, "PR_GetHostByName failed");
-            PR_ProcessExit(1);
-        }
-        next_index = PR_EnumerateHostEnt(0, &he, port_number, &client_addr);
-        if (next_index == -1)
-        {
-            PL_FPrintError(err_out, "PR_EnumerateHostEnt failed");
-            PR_ProcessExit(1);
-        }
-    }
-
-    for (
-        write_dally = 0;
-        write_dally < accept_timeout + (2 * delta);
-        write_dally += delta)
-    {
-        PR_fprintf(
-            std_out, "Testing w/ write_dally = %d msec\n",
-            PR_IntervalToMilliseconds(write_dally));
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, AcceptingThread, &server_addr,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (server_thread == NULL)
-        {
-            PL_FPrintError(err_out, "PR_CreateThread (server) failed");
-            PR_ProcessExit(1);
-        }
-
-        PR_Sleep(delta);  /* let the server pot thicken */
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, ConnectingThread, &client_addr,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (client_thread == NULL)
-        {
-            PL_FPrintError(err_out, "PR_CreateThread (client) failed");
-            PR_ProcessExit(1);
-        }
-
-        if (PR_JoinThread(client_thread) == PR_FAILURE)
-            PL_FPrintError(err_out, "PR_JoinThread (client) failed");
-
-        if (PR_JoinThread(server_thread) == PR_FAILURE)
-            PL_FPrintError(err_out, "PR_JoinThread (server) failed");
-    }
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/acceptreademu.c b/libs/js/nsprpub/pr/tests/acceptreademu.c
deleted file mode 100644
index 8d17f31ae2..0000000000
--- a/libs/js/nsprpub/pr/tests/acceptreademu.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This test is the same as acceptread.c except that it uses the
- * emulated acceptread method instead of the regular acceptread.
- */
-
-#include <prio.h>
-#include <prprf.h>
-#include <prinit.h>
-#include <prnetdb.h>
-#include <prinrval.h>
-#include <prthread.h>
-#include <pprio.h>
-
-#include <plerror.h>
-
-#include <stdlib.h>
-
-#define DEFAULT_PORT 12273
-#define GET "GET / HTTP/1.0\n\n"
-static PRFileDesc *std_out, *err_out;
-static PRIntervalTime write_dally, accept_timeout;
-static PRDescIdentity emu_layer_ident;
-static PRIOMethods emu_layer_methods;
-
-/* the acceptread method in emu_layer_methods */
-static PRInt32 PR_CALLBACK emu_AcceptRead(PRFileDesc *sd, PRFileDesc **nd,
-    PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout)
-{
-    return PR_EmulateAcceptRead(sd, nd, raddr, buf, amount, timeout);
-}
-
-static PRStatus PrintAddress(const PRNetAddr* address)
-{
-    char buffer[100];
-    PRStatus rv = PR_NetAddrToString(address, buffer, sizeof(buffer));
-    if (PR_FAILURE == rv) PL_FPrintError(err_out, "PR_NetAddrToString");
-    else PR_fprintf(
-        std_out, "Accepted connection from (0x%p)%s:%d\n",
-        address, buffer, address->inet.port);
-    return rv;
-}  /* PrintAddress */
-
-static void ConnectingThread(void *arg)
-{
-    PRInt32 nbytes;
-    char buf[1024];
-    PRFileDesc *sock;
-    PRNetAddr peer_addr, *addr;
-
-    addr = (PRNetAddr*)arg;
-
-    sock = PR_NewTCPSocket();
-    if (sock == NULL)
-    {
-        PL_FPrintError(err_out, "PR_NewTCPSocket (client) failed");
-        PR_ProcessExit(1);
-    }
-
-    if (PR_Connect(sock, addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE)
-    {
-        PL_FPrintError(err_out, "PR_Connect (client) failed");
-        PR_ProcessExit(1);
-    }
-    if (PR_GetPeerName(sock, &peer_addr) == PR_FAILURE)
-    {
-        PL_FPrintError(err_out, "PR_GetPeerName (client) failed");
-        PR_ProcessExit(1);
-    }
-
-    /*
-    ** Then wait between the connection coming up and sending the expected
-    ** data. At some point in time, the server should fail due to a timeou
-    ** on the AcceptRead() operation, which according to the document is
-    ** only due to the read() portion.
-    */
-    PR_Sleep(write_dally);
-
-    nbytes = PR_Send(sock, GET, sizeof(GET), 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes == -1) PL_FPrintError(err_out, "PR_Send (client) failed");
-
-    nbytes = PR_Recv(sock, buf, sizeof(buf), 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes == -1) PL_FPrintError(err_out, "PR_Recv (client) failed");
-    else
-    {
-        PR_fprintf(std_out, "PR_Recv (client) succeeded: %d bytes\n", nbytes);
-        buf[sizeof(buf) - 1] = '\0';
-        PR_fprintf(std_out, "%s\n", buf);
-    }
-
-    if (PR_FAILURE == PR_Shutdown(sock, PR_SHUTDOWN_BOTH))
-        PL_FPrintError(err_out, "PR_Shutdown (client) failed");
-
-    if (PR_FAILURE == PR_Close(sock))
-        PL_FPrintError(err_out, "PR_Close (client) failed");
-
-    return;
-}  /* ConnectingThread */
-
-#define BUF_SIZE 117
-static void AcceptingThread(void *arg)
-{
-    PRStatus rv;
-    PRInt32 bytes;
-    PRSize buf_size = BUF_SIZE;
-    PRUint8 buf[BUF_SIZE + (2 * sizeof(PRNetAddr)) + 32];
-    PRNetAddr *accept_addr, *listen_addr = (PRNetAddr*)arg;
-    PRFileDesc *accept_sock, *listen_sock = PR_NewTCPSocket();
-    PRFileDesc *layer;
-    PRSocketOptionData sock_opt;
-
-    if (NULL == listen_sock)
-    {
-        PL_FPrintError(err_out, "PR_NewTCPSocket (server) failed");
-        PR_ProcessExit(1);        
-    }
-    layer = PR_CreateIOLayerStub(emu_layer_ident, &emu_layer_methods);
-    if (NULL == layer)
-    {
-        PL_FPrintError(err_out, "PR_CreateIOLayerStub (server) failed");
-        PR_ProcessExit(1);        
-    }
-    if (PR_PushIOLayer(listen_sock, PR_TOP_IO_LAYER, layer) == PR_FAILURE)
-    {
-        PL_FPrintError(err_out, "PR_PushIOLayer (server) failed");
-        PR_ProcessExit(1);        
-    }
-    sock_opt.option = PR_SockOpt_Reuseaddr;
-    sock_opt.value.reuse_addr = PR_TRUE;
-    rv = PR_SetSocketOption(listen_sock, &sock_opt);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_SetSocketOption (server) failed");
-        PR_ProcessExit(1);        
-    }
-    rv = PR_Bind(listen_sock, listen_addr);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_Bind (server) failed");
-        PR_ProcessExit(1);        
-    }
-    rv = PR_Listen(listen_sock, 10);
-    if (PR_FAILURE == rv)
-    {
-        PL_FPrintError(err_out, "PR_Listen (server) failed");
-        PR_ProcessExit(1);        
-    }
-    bytes = PR_AcceptRead(
-        listen_sock, &accept_sock, &accept_addr, buf, buf_size, accept_timeout);
-
-    if (-1 == bytes) PL_FPrintError(err_out, "PR_AcceptRead (server) failed");
-    else
-    {
-        PrintAddress(accept_addr);
-        PR_fprintf(
-            std_out, "(Server) read [0x%p..0x%p) %s\n",
-            buf, &buf[BUF_SIZE], buf);
-        bytes = PR_Write(accept_sock, buf, bytes);
-        rv = PR_Shutdown(accept_sock, PR_SHUTDOWN_BOTH);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err_out, "PR_Shutdown (server) failed");
-    }
-
-    if (-1 != bytes)
-    {
-        rv = PR_Close(accept_sock);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err_out, "PR_Close (server) failed");
-    }
-
-    rv = PR_Close(listen_sock);
-    if (PR_FAILURE == rv)
-        PL_FPrintError(err_out, "PR_Close (server) failed");
-}  /* AcceptingThread */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRHostEnt he;
-    PRStatus status;
-    PRIntn next_index;
-    PRUint16 port_number;
-    char netdb_buf[PR_NETDB_BUF_SIZE];
-    PRNetAddr client_addr, server_addr;
-    PRThread *client_thread, *server_thread;
-    PRIntervalTime delta = PR_MillisecondsToInterval(500);
-
-    err_out = PR_STDERR;
-    std_out = PR_STDOUT;
-    accept_timeout = PR_SecondsToInterval(2);
-    emu_layer_ident = PR_GetUniqueIdentity("Emulated AcceptRead");
-    emu_layer_methods = *PR_GetDefaultIOMethods();
-    emu_layer_methods.acceptread = emu_AcceptRead;
-
-    if (argc != 2 && argc != 3) port_number = DEFAULT_PORT;
-    else port_number = (PRUint16)atoi(argv[(argc == 2) ? 1 : 2]);
-
-    status = PR_InitializeNetAddr(PR_IpAddrAny, port_number, &server_addr);
-    if (PR_SUCCESS != status)
-    {
-        PL_FPrintError(err_out, "PR_InitializeNetAddr failed");
-        PR_ProcessExit(1);
-    }
-    if (argc < 3)
-    {
-        status = PR_InitializeNetAddr(
-            PR_IpAddrLoopback, port_number, &client_addr);
-        if (PR_SUCCESS != status)
-        {
-            PL_FPrintError(err_out, "PR_InitializeNetAddr failed");
-            PR_ProcessExit(1);
-        }
-    }
-    else
-    {
-        status = PR_GetHostByName(
-            argv[1], netdb_buf, sizeof(netdb_buf), &he);
-        if (status == PR_FAILURE)
-        {
-            PL_FPrintError(err_out, "PR_GetHostByName failed");
-            PR_ProcessExit(1);
-        }
-        next_index = PR_EnumerateHostEnt(0, &he, port_number, &client_addr);
-        if (next_index == -1)
-        {
-            PL_FPrintError(err_out, "PR_EnumerateHostEnt failed");
-            PR_ProcessExit(1);
-        }
-    }
-
-    for (
-        write_dally = 0;
-        write_dally < accept_timeout + (2 * delta);
-        write_dally += delta)
-    {
-        PR_fprintf(
-            std_out, "Testing w/ write_dally = %d msec\n",
-            PR_IntervalToMilliseconds(write_dally));
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, AcceptingThread, &server_addr,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (server_thread == NULL)
-        {
-            PL_FPrintError(err_out, "PR_CreateThread (server) failed");
-            PR_ProcessExit(1);
-        }
-
-        PR_Sleep(delta);  /* let the server pot thicken */
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, ConnectingThread, &client_addr,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-        if (client_thread == NULL)
-        {
-            PL_FPrintError(err_out, "PR_CreateThread (client) failed");
-            PR_ProcessExit(1);
-        }
-
-        if (PR_JoinThread(client_thread) == PR_FAILURE)
-            PL_FPrintError(err_out, "PR_JoinThread (client) failed");
-
-        if (PR_JoinThread(server_thread) == PR_FAILURE)
-            PL_FPrintError(err_out, "PR_JoinThread (server) failed");
-    }
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/addrstr.c b/libs/js/nsprpub/pr/tests/addrstr.c
deleted file mode 100644
index a18f9a8ccf..0000000000
--- a/libs/js/nsprpub/pr/tests/addrstr.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prnetdb.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-const char *testaddrs[] = {
-    "::", "::",
-    "::1", "::1",
-    "::ffff", "::ffff",
-    "::1:0", "::0.1.0.0",
-    "::127.0.0.1", "::127.0.0.1",
-    "::FFFF:127.0.0.1", "::ffff:127.0.0.1",
-    "::FFFE:9504:3501", "::fffe:9504:3501",
-    "0:0:1:0:35c:0:0:0", "0:0:1:0:35c::",
-    "0:0:3f4c:0:0:4552:0:0", "::3f4c:0:0:4552:0:0",
-    "0:0:1245:0:0:0:0567:0", "0:0:1245::567:0", 
-    "0:1:2:3:4:5:6:7", "0:1:2:3:4:5:6:7", 
-    "1:2:3:0:4:5:6:7", "1:2:3:0:4:5:6:7", 
-    "1:2:3:4:5:6:7:0", "1:2:3:4:5:6:7:0", 
-    "1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8", 
-    "1:2:3:4:5:6::7", "1:2:3:4:5:6:0:7", 
-    0
-};
-
-const char *badaddrs[] = {
-    "::.1.2.3",
-    "ffff::.1.2.3",
-    "1:2:3:4:5:6:7::8",
-    "1:2:3:4:5:6::7:8",
-    "::ff99.2.3.4",
-    0
-};
-
-int failed_already = 0;
-
-int main()
-{
-    const char **nexttestaddr = testaddrs;
-    const char **nextbadaddr = badaddrs;
-    const char *in, *expected_out;
-    PRNetAddr addr;
-    char buf[256];
-    PRStatus rv;
-
-    while ((in = *nexttestaddr++) != 0) {
-	expected_out = *nexttestaddr++;
-	rv = PR_StringToNetAddr(in, &addr);
-	if (rv) {
-	    printf("cannot convert %s to addr: %d\n", in, rv);
-            failed_already = 1;
-	    continue;
-	}
-	rv = PR_NetAddrToString(&addr, buf, sizeof(buf));
-	if (rv) {
-	    printf("cannot convert %s back to string: %d\n", in, rv);
-            failed_already = 1;
-	    continue;
-	}
-	if (strcmp(buf, expected_out)) {
-            /* This is not necessarily an error */
-	    printf("%s expected %s got %s\n", in, expected_out, buf);
-	}
-    }
-    while ((in = *nextbadaddr++) != 0) {
-        if (PR_StringToNetAddr(in, &addr) == PR_SUCCESS) {
-            printf("converted bad addr %s\n", in);
-            failed_already = 1;
-        }
-    }
-    if (failed_already) {
-        printf("FAIL\n");
-        return 1;
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/affinity.c b/libs/js/nsprpub/pr/tests/affinity.c
deleted file mode 100644
index 46f159bf1e..0000000000
--- a/libs/js/nsprpub/pr/tests/affinity.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "pprthred.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef XP_BEOS
-
-/*
- * Test PR_GetThreadAffinityMask
- *		The function is called by each of local, global and global bound threads
- *		The test should be run on both single and multi-cpu systems
- */
-static void PR_CALLBACK thread_start(void *arg)
-{
-PRUint32 mask = 0;
-
-	if (PR_GetThreadAffinityMask(PR_GetCurrentThread(), &mask)) 
-		printf("\tthread_start: PR_GetCurrentThreadAffinityMask failed\n");
-	else
-		printf("\tthread_start: AffinityMask = 0x%x\n",mask);
-
-}
-
-int main(int argc, char **argv)
-{
-	PRThread *t;
-
-	printf("main: creating local thread\n");
-
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_LOCAL_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create local thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
-
-	printf("main: creating global thread\n");
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_GLOBAL_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create global thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
-
-	printf("main: creating global bound thread\n");
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_GLOBAL_BOUND_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create global bound thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
-
-    return 0;
-}
-
-#else /* !XP_BEOS */
-
-int main()
-{
-	printf( "This test is not supported on the BeOS\n" );
-	return 0;
-}
-#endif /* !XP_BEOS */
diff --git a/libs/js/nsprpub/pr/tests/alarm.c b/libs/js/nsprpub/pr/tests/alarm.c
deleted file mode 100644
index 7af2ed4c03..0000000000
--- a/libs/js/nsprpub/pr/tests/alarm.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-** Name: alarmtst.c
-**
-** Description: Test alarms
-**
-** Modification History:
-** 13-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-
-#include "prlog.h"
-#include "prinit.h"
-#ifdef XP_MAC
-#include "pralarm.h"
-#else
-#include "obsolete/pralarm.h"
-#endif
-#include "prlock.h"
-#include "prlong.h"
-#include "prcvar.h"
-#include "prinrval.h"
-#include "prtime.h"
-
-/* Used to get the command line option */
-#include "plgetopt.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(XP_UNIX)
-#include <sys/time.h>
-#endif
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-static PRIntn debug_mode;
-static PRIntn failed_already=0;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-typedef struct notifyData {
-    PRLock *ml;
-    PRCondVar *child;
-    PRCondVar *parent;
-    PRBool pending;
-    PRUint32 counter;
-} NotifyData;
-
-static void Notifier(void *arg)
-{
-    NotifyData *notifyData = (NotifyData*)arg;
-    PR_Lock(notifyData->ml);
-    while (notifyData->counter > 0)
-    {
-        while (!notifyData->pending)
-            PR_WaitCondVar(notifyData->child, PR_INTERVAL_NO_TIMEOUT);
-        notifyData->counter -= 1;
-        notifyData->pending = PR_FALSE;
-        PR_NotifyCondVar(notifyData->parent);
-    }
-    PR_Unlock(notifyData->ml);
-}  /* Notifier */
-/***********************************************************************
-** PRIVATE FUNCTION:    ConditionNotify
-** DESCRIPTION:
-** 
-** INPUTS:      loops
-** OUTPUTS:     None
-** RETURN:      overhead
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:
-**      
-***********************************************************************/
-
-
-static PRIntervalTime ConditionNotify(PRUint32 loops)
-{
-    PRThread *thread;
-    NotifyData notifyData;
-    PRIntervalTime timein, overhead;
-    
-    timein = PR_IntervalNow();
-
-    notifyData.counter = loops;
-    notifyData.ml = PR_NewLock();
-    notifyData.child = PR_NewCondVar(notifyData.ml);
-    notifyData.parent = PR_NewCondVar(notifyData.ml);
-    thread = PR_CreateThread(
-        PR_USER_THREAD, Notifier, &notifyData,
-        PR_GetThreadPriority(PR_GetCurrentThread()),
-        thread_scope, PR_JOINABLE_THREAD, 0);
-
-    overhead = PR_IntervalNow() - timein;  /* elapsed so far */
-
-    PR_Lock(notifyData.ml);
-    while (notifyData.counter > 0)
-    {
-        notifyData.pending = PR_TRUE;
-        PR_NotifyCondVar(notifyData.child);
-        while (notifyData.pending)
-            PR_WaitCondVar(notifyData.parent, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(notifyData.ml);
-
-    timein = PR_IntervalNow();
-
-    (void)PR_JoinThread(thread);
-    PR_DestroyCondVar(notifyData.child);
-    PR_DestroyCondVar(notifyData.parent);
-    PR_DestroyLock(notifyData.ml);
-    
-    overhead += (PR_IntervalNow() - timein);  /* more overhead */
-
-    return overhead;
-}  /* ConditionNotify */
-
-static PRIntervalTime ConditionTimeout(PRUint32 loops)
-{
-    PRUintn count;
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PR_NewCondVar(ml);
-    PRIntervalTime interval = PR_MillisecondsToInterval(50);
-
-    overhead = PR_IntervalNow() - timein;
-
-    PR_Lock(ml);
-    for (count = 0; count < loops; ++count)
-    {
-        overhead += interval;
-        PR_ASSERT(PR_WaitCondVar(cv, interval) == PR_SUCCESS);
-    }
-    PR_Unlock(ml);
-
-    timein = PR_IntervalNow();
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    overhead += (PR_IntervalNow() - timein);
-
-    return overhead;
-}  /* ConditionTimeout */
-
-typedef struct AlarmData {
-    PRLock *ml;
-    PRCondVar *cv;
-    PRUint32 rate, late, times;
-    PRIntervalTime duration, timein, period;
-} AlarmData;
-
-static PRBool AlarmFn1(PRAlarmID *id, void *clientData, PRUint32 late)
-{
-    PRStatus rv = PR_SUCCESS;
-    PRBool keepGoing, resetAlarm;
-    PRIntervalTime interval, now = PR_IntervalNow();
-    AlarmData *ad = (AlarmData*)clientData;
-
-    PR_Lock(ad->ml);
-    ad->late += late;
-    ad->times += 1;
-    keepGoing = ((PRIntervalTime)(now - ad->timein) < ad->duration) ?
-        PR_TRUE : PR_FALSE;
-    if (!keepGoing)
-        rv = PR_NotifyCondVar(ad->cv);
-    resetAlarm = ((ad->times % 31) == 0) ? PR_TRUE : PR_FALSE;
-                                         
-    interval = (ad->period + ad->rate - 1) / ad->rate;
-    if (!late && (interval > 10))
-    {
-        interval &= (now & 0x03) + 1;
-        PR_WaitCondVar(ad->cv, interval);
-    }
-          
-    PR_Unlock(ad->ml);
-
-    if (rv != PR_SUCCESS)
-    {
-		if (!debug_mode) failed_already=1;
-		else
-		 printf("AlarmFn: notify status: FAIL\n");
-		
-	}
-
-    if (resetAlarm)
-    {   
-        ad->rate += 3;
-        ad->late = ad->times = 0;
-        if (PR_ResetAlarm(id, ad->period, ad->rate) != PR_SUCCESS)
-        {
-			if (!debug_mode)
-				failed_already=1;
-			else		
-				printf("AlarmFn: Resetting alarm status: FAIL\n");
-
-            keepGoing = PR_FALSE;
-        }
-
-    }
-
-    return keepGoing;
-}  /* AlarmFn1 */
-
-static PRIntervalTime Alarms1(PRUint32 loops)
-{
-    PRAlarm *alarm;
-    AlarmData ad;
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-    PRIntervalTime duration = PR_SecondsToInterval(3);
-
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PR_NewCondVar(ml);
-
-    ad.ml = ml;
-    ad.cv = cv;
-    ad.rate = 1;
-    ad.times = loops;
-    ad.late = ad.times = 0;
-    ad.duration = duration;
-    ad.timein = PR_IntervalNow();
-    ad.period = PR_SecondsToInterval(1);
-
-    alarm = PR_CreateAlarm();
-
-    (void)PR_SetAlarm(
-        alarm, ad.period, ad.rate, AlarmFn1, &ad);
-        
-    overhead = PR_IntervalNow() - timein;
-
-    PR_Lock(ml);
-    while ((PRIntervalTime)(PR_IntervalNow() - ad.timein) < duration)
-        PR_WaitCondVar(cv, PR_INTERVAL_NO_TIMEOUT);
-    PR_Unlock(ml);
-
-    timein = PR_IntervalNow();
-    (void)PR_DestroyAlarm(alarm);
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    overhead += (PR_IntervalNow() - timein);
-    
-    return duration + overhead;
-}  /* Alarms1 */
-
-static PRBool AlarmFn2(PRAlarmID *id, void *clientData, PRUint32 late)
-{
-#if defined(XP_MAC)
-#pragma unused (id)
-#endif
-
-    PRBool keepGoing;
-    PRStatus rv = PR_SUCCESS;
-    AlarmData *ad = (AlarmData*)clientData;
-    PRIntervalTime interval, now = PR_IntervalNow();
-
-    PR_Lock(ad->ml);
-    ad->times += 1;
-    keepGoing = ((PRIntervalTime)(now - ad->timein) < ad->duration) ?
-        PR_TRUE : PR_FALSE;
-    interval = (ad->period + ad->rate - 1) / ad->rate;
-
-    if (!late && (interval > 10))
-    {
-        interval &= (now & 0x03) + 1;
-        PR_WaitCondVar(ad->cv, interval);
-    }
-
-    if (!keepGoing) rv = PR_NotifyCondVar(ad->cv);
-
-    PR_Unlock(ad->ml);
-
-
-    if (rv != PR_SUCCESS)
-		failed_already=1;;
-
-    return keepGoing;
-}  /* AlarmFn2 */
-
-static PRIntervalTime Alarms2(PRUint32 loops)
-{
-    PRStatus rv;
-    PRAlarm *alarm;
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-    AlarmData ad;
-    PRIntervalTime duration = PR_SecondsToInterval(30);
-
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PR_NewCondVar(ml);
-
-    ad.ml = ml;
-    ad.cv = cv;
-    ad.rate = 1;
-    ad.times = loops;
-    ad.late = ad.times = 0;
-    ad.duration = duration;
-    ad.timein = PR_IntervalNow();
-    ad.period = PR_SecondsToInterval(1);
-
-    alarm = PR_CreateAlarm();
-
-    (void)PR_SetAlarm(
-        alarm, ad.period, ad.rate, AlarmFn2, &ad);
-        
-    overhead = PR_IntervalNow() - timein;
-
-    PR_Lock(ml);
-    while ((PRIntervalTime)(PR_IntervalNow() - ad.timein) < duration)
-        PR_WaitCondVar(cv, PR_INTERVAL_NO_TIMEOUT);
-    PR_Unlock(ml);
-    
-    timein = PR_IntervalNow();
-
-    rv = PR_DestroyAlarm(alarm);
-    if (rv != PR_SUCCESS)
-    {
-		if (!debug_mode)
-			failed_already=1;
-		else	
-			printf("***Destroying alarm status: FAIL\n");
-    }
-		
-
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    
-    overhead += (PR_IntervalNow() - timein);
-    
-    return duration + overhead;
-}  /* Alarms2 */
-
-static PRIntervalTime Alarms3(PRUint32 loops)
-{
-    PRIntn i;
-    PRStatus rv;
-    PRAlarm *alarm;
-    AlarmData ad[3];
-    PRIntervalTime duration = PR_SecondsToInterval(30);
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PR_NewCondVar(ml);
-
-    for (i = 0; i < 3; ++i)
-    {
-        ad[i].ml = ml;
-        ad[i].cv = cv;
-        ad[i].rate = 1;
-        ad[i].times = loops;
-        ad[i].duration = duration;
-        ad[i].late = ad[i].times = 0;
-        ad[i].timein = PR_IntervalNow();
-        ad[i].period = PR_SecondsToInterval(1);
-
-        /* more loops, faster rate => same elapsed time */
-        ad[i].times = (i + 1) * loops;
-        ad[i].rate = (i + 1) * 10;
-    }
-
-    alarm = PR_CreateAlarm();
-
-    for (i = 0; i < 3; ++i)
-    {
-        (void)PR_SetAlarm(
-            alarm, ad[i].period, ad[i].rate,
-            AlarmFn2, &ad[i]);
-    }
-        
-    overhead = PR_IntervalNow() - timein;
-
-    PR_Lock(ml);
-    for (i = 0; i < 3; ++i)
-    {
-        while ((PRIntervalTime)(PR_IntervalNow() - ad[i].timein) < duration)
-            PR_WaitCondVar(cv, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(ml);
-
-    timein = PR_IntervalNow();
-
-	if (debug_mode)
-	printf
-        ("Alarms3 finished at %u, %u, %u\n",
-        ad[0].timein, ad[1].timein, ad[2].timein);
-    
-    rv = PR_DestroyAlarm(alarm);
-    if (rv != PR_SUCCESS)
-    {
-		if (!debug_mode)		
-			failed_already=1;
-		else	
-		   printf("***Destroying alarm status: FAIL\n");
-	}
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    
-    overhead += (duration / 3);
-    overhead += (PR_IntervalNow() - timein);
-
-    return overhead;
-}  /* Alarms3 */
-
-static PRUint32 TimeThis(
-    const char *msg, PRUint32 (*func)(PRUint32 loops), PRUint32 loops)
-{
-    PRUint32 overhead, usecs;
-    PRIntervalTime predicted, timein, timeout, ticks;
-
- if (debug_mode)
-    printf("Testing %s ...", msg);
-
-    timein = PR_IntervalNow();
-    predicted = func(loops);
-    timeout = PR_IntervalNow();
-
-  if (debug_mode)
-    printf(" done\n");
-
-    ticks = timeout - timein;
-    usecs = PR_IntervalToMicroseconds(ticks);
-    overhead = PR_IntervalToMicroseconds(predicted);
-
-    if(ticks < predicted)
-    {
-		if (debug_mode) {
-        printf("\tFinished in negative time\n");
-        printf("\tpredicted overhead was %d usecs\n", overhead);
-        printf("\ttest completed in %d usecs\n\n", usecs);
-		}
-    }
-    else
-    {
-	if (debug_mode)		
-        printf(
-            "\ttotal: %d usecs\n\toverhead: %d usecs\n\tcost: %6.3f usecs\n\n",
-            usecs, overhead, ((double)(usecs - overhead) / (double)loops));
-    }
-
-    return overhead;
-}  /* TimeThis */
-
-int prmain(int argc, char** argv)
-{
-    PRUint32 cpu, cpus = 0, loops = 0;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name [-d]
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "Gdl:c:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* GLOBAL threads */
-			thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'l':  /* loop count */
-			loops = atoi(opt->value);
-            break;
-        case 'c':  /* concurrency limit */
-			cpus = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-
-    if (cpus == 0) cpus = 1;
-    if (loops == 0) loops = 4;
-
-	if (debug_mode)
-		printf("Alarm: Using %d loops\n", loops);
-
-	if (debug_mode)		
-        printf("Alarm: Using %d cpu(s)\n", cpus);
-#ifdef XP_MAC
-	SetupMacPrintfLog("alarm.log");
-	debug_mode = 1;
-#endif
-
-    for (cpu = 1; cpu <= cpus; ++cpu)
-    {
-    if (debug_mode)
-        printf("\nAlarm: Using %d CPU(s)\n", cpu);
-
-	PR_SetConcurrency(cpu);
-        
-        /* some basic time test */
-        (void)TimeThis("ConditionNotify", ConditionNotify, loops);
-        (void)TimeThis("ConditionTimeout", ConditionTimeout, loops);
-        (void)TimeThis("Alarms1", Alarms1, loops);
-        (void)TimeThis("Alarms2", Alarms2, loops);
-        (void)TimeThis("Alarms3", Alarms3, loops);
-    }
-    return 0;
-}
-
-int main(int argc, char** argv)
-{
-     PR_Initialize(prmain, argc, argv, 0);
-     PR_STDIO_INIT();
-	 if (failed_already) return 1;
-	 else return 0;
-
-}  /* main */
-
-
-/* alarmtst.c */
diff --git a/libs/js/nsprpub/pr/tests/anonfm.c b/libs/js/nsprpub/pr/tests/anonfm.c
deleted file mode 100644
index aeab86b14a..0000000000
--- a/libs/js/nsprpub/pr/tests/anonfm.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: anonfm.c
-** Description: Test anonymous file map 
-**
-** Synopsis: anonfm [options] [dirName]
-**
-** Options:
-** -d   enable debug mode
-** -h   display a help message
-** -s <n>  size of the anonymous memory map, in KBytes. default: 100KBytes.
-** -C 1 Operate this process as ClientOne() 
-** -C 2 Operate this process as ClientTwo()
-**
-** anonfn.c contains two tests, corresponding to the two protocols for
-** passing an anonymous file map to a child process.
-**
-** ServerOne()/ClientOne() tests the passing of "raw" file map; it uses
-** PR_CreateProcess() [for portability of the test case] to create the
-** child process, but does not use the PRProcessAttr structure for
-** passing the file map data.
-**
-** ServerTwo()/ClientTwo() tests the passing of the file map using the
-** PRProcessAttr structure.
-**
-*/
-#include <plgetopt.h> 
-#include <nspr.h> 
-#include <private/primpl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Test harness infrastructure
-*/
-PRLogModuleInfo *lm;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRUint32  failed_already = 0;
-
-PRIntn  debug = 0;
-PRIntn  client = 0; /* invoke client, style */
-char    dirName[512] = "."; /* directory name to contain anon mapped file */
-PRSize  fmSize = (100 * 1024 );
-PRUint32 fmMode = 0600;
-PRFileMapProtect fmProt = PR_PROT_READWRITE;
-const char *fmEnvName = "nsprFileMapEnvVariable";
-
-/*
-** Emit help text for this test
-*/
-static void Help( void )
-{
-    printf("anonfm [options] [dirName]\n");
-    printf("-d -- enable debug mode\n");
-    printf("dirName is alternate directory name. Default: . (current directory)\n");
-    exit(1);
-} /* end Help() */
-
-
-/*
-** ClientOne() --
-*/
-static void ClientOne( void )
-{
-    PRFileMap   *fm;
-    char        *fmString;
-    char        *addr;
-    PRStatus    rc;
-
-    PR_LOG(lm, msgLevel,
-        ("ClientOne() starting"));
-    
-    fmString = PR_GetEnv( fmEnvName );
-    if ( NULL == fmString ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-                ("ClientOne(): PR_Getenv() failed"));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ClientOne(): PR_Getenv(): found: %s", fmString));
-
-    fm = PR_ImportFileMapFromString( fmString );
-    if ( NULL == fm ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-                ("ClientOne(): PR_ImportFileMapFromString() failed"));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ClientOne(): PR_ImportFileMapFromString(): fm: %p", fm ));
-
-    addr = PR_MemMap( fm, LL_ZERO, fmSize );
-    if ( NULL == addr ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("ClientOne(): PR_MemMap() failed, OSError: %d", PR_GetOSError() ));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ClientOne(): PR_MemMap(): addr: %p", addr ));
-
-    /* write to memory map to release server */
-    *addr = 1;
-
-    rc = PR_MemUnmap( addr, fmSize );
-    PR_ASSERT( rc == PR_SUCCESS );
-    PR_LOG(lm, msgLevel,
-        ("ClientOne(): PR_MemUnap(): success" ));
-
-    rc = PR_CloseFileMap( fm );
-    if ( PR_FAILURE == rc ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("ClientOne(): PR_MemUnap() failed, OSError: %d", PR_GetOSError() ));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ClientOne(): PR_CloseFileMap(): success" ));
-
-    return;
-} /* end ClientOne() */
-
-/*
-** ClientTwo() --
-*/
-static void ClientTwo( void )
-{
-    failed_already = 1;
-} /* end ClientTwo() */
-
-/*
-** ServerOne() --
-*/
-static void ServerOne( void )
-{
-    PRFileMap   *fm;
-    PRStatus    rc;
-    PRIntn      i;
-    char        *addr;
-    char        fmString[256];
-    char        envBuf[256];
-    char        *child_argv[8];
-    PRProcess   *proc;
-    PRInt32     exit_status;
-
-    PR_LOG(lm, msgLevel,
-        ("ServerOne() starting"));
-    
-    fm = PR_OpenAnonFileMap( dirName, fmSize, fmProt );
-    if ( NULL == fm )      {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-                ("PR_OpenAnonFileMap() failed"));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): FileMap: %p", fm ));
-    
-    rc = PR_ExportFileMapAsString( fm, sizeof(fmString), fmString );
-    if ( PR_FAILURE == rc )  {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("PR_ExportFileMap() failed"));
-        return;
-    }
-
-    /*
-    ** put the string into the environment
-    */
-    PR_snprintf( envBuf, sizeof(envBuf), "%s=%s", fmEnvName, fmString);
-    putenv( envBuf );
-    
-    addr = PR_MemMap( fm, LL_ZERO, fmSize );
-    if ( NULL == addr ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("PR_MemMap() failed"));
-        return;
-    }
-
-    /* set initial value for client */
-    for (i = 0; i < (PRIntn)fmSize ; i++ )
-        *(addr+i) = 0x00;  
-
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): PR_MemMap(): addr: %p", addr ));
-    
-    /*
-    ** set arguments for child process
-    */
-    child_argv[0] = "anonfm";
-    child_argv[1] = "-C";
-    child_argv[2] = "1";
-    child_argv[3] = NULL;
-
-    proc = PR_CreateProcess(child_argv[0], child_argv, NULL, NULL);
-    PR_ASSERT( proc );
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): PR_CreateProcess(): proc: %x", proc ));
-
-    /*
-    ** ClientOne() will set the memory to 1
-    */
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): waiting on Client, *addr: %x", *addr ));
-    while( *addr == 0x00 ) {
-        if ( debug )
-            fprintf(stderr, ".");
-        PR_Sleep(PR_MillisecondsToInterval(300));
-    }
-    if ( debug )
-        fprintf(stderr, "\n");
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): Client responded" ));
-
-    rc = PR_WaitProcess( proc, &exit_status );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_MemUnmap( addr, fmSize);
-    if ( PR_FAILURE == rc ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("PR_MemUnmap() failed"));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): PR_MemUnmap(): success" ));
-
-    rc = PR_CloseFileMap(fm);
-    if ( PR_FAILURE == rc ) {
-        failed_already = 1;    
-        PR_LOG(lm, msgLevel,
-            ("PR_CloseFileMap() failed"));
-        return;
-    }
-    PR_LOG(lm, msgLevel,
-        ("ServerOne(): PR_CloseFileMap() success" ));
-
-    return;
-} /* end ServerOne() */
-
-/*
-** ServerTwo() --
-*/
-static void ServerTwo( void )
-{
-    PR_LOG(lm, msgLevel,
-        ("ServerTwo(): Not implemented yet" ));
-} /* end ServerTwo() */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    {
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "hdC:");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'C':  /* Client style */
-                client = atol(opt->value);
-                break;
-            case 's':  /* file size */
-                fmSize = atol( opt->value ) * 1024;
-                break;
-            case 'd':  /* debug */
-                debug = 1;
-			    msgLevel = PR_LOG_DEBUG;
-                break;
-            case 'h':  /* help message */
-			    Help();
-                break;
-             default:
-                strcpy(dirName, opt->value);
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    }
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-
-    if ( client == 1 ) {
-        ClientOne();
-    } else if ( client == 2 )  {
-        ClientTwo();
-    } else {
-        ServerOne();
-        if ( failed_already ) goto Finished;
-        ServerTwo();
-    }
-
-Finished:
-    if ( debug )
-        printf("%s\n", (failed_already)? "FAIL" : "PASS");
-    return( (failed_already == PR_TRUE )? 1 : 0 );
-}  /* main() */
-/* end anonfm.c */
-
diff --git a/libs/js/nsprpub/pr/tests/append.c b/libs/js/nsprpub/pr/tests/append.c
deleted file mode 100644
index 3800e2fbce..0000000000
--- a/libs/js/nsprpub/pr/tests/append.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        append.c
-** Description: Testing File writes where PR_APPEND was used on open
-**
-** append attempts to verify that a file opened with PR_APPEND
-** will always append to the end of file, regardless where the
-** current file pointer is positioned. To do this, PR_Seek() is
-** called before each write with the position set to beginning of
-** file. Subsequent writes should always append.
-** The file is read back, summing the integer data written to the
-** file. If the expected result is equal, the test passes.
-**
-** See BugSplat: 4090
-*/
-#include "plgetopt.h"
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-PRIntn  debug = 0;
-PRIntn  verbose = 0;
-PRBool  failedAlready = PR_FALSE;
-const PRInt32 addedBytes = 1000;
-const PRInt32   buf = 1; /* constant written to fd, addedBytes times */
-PRInt32         inBuf;   /* read it back into here */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRStatus    rc;
-    PRInt32     rv;
-    PRFileDesc  *fd;
-    PRIntn      i;
-    PRInt32     sum = 0;
-
-    {   /* Get command line options */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "vd");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-                break;
-            case 'v':  /* verbose */
-                verbose = 1;
-                break;
-             default:
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    } /* end block "Get command line options" */
-/* ---------------------------------------------------------------------- */
-    fd = PR_Open( "/tmp/nsprAppend", (PR_APPEND | PR_CREATE_FILE | PR_TRUNCATE | PR_WRONLY), 0666 );
-    if ( NULL == fd )  {
-        if (debug) printf("PR_Open() failed for writing: %d\n", PR_GetError());
-        failedAlready = PR_TRUE;
-        goto Finished;
-    }
-
-    for ( i = 0; i < addedBytes ; i++ ) {
-        rv = PR_Write( fd, &buf, sizeof(buf));
-        if ( sizeof(buf) != rv )  {
-            if (debug) printf("PR_Write() failed: %d\n", PR_GetError());
-            failedAlready = PR_TRUE;
-            goto Finished;
-        }
-        rv = PR_Seek( fd, 0 , PR_SEEK_SET );
-        if ( -1 == rv )  {
-            if (debug) printf("PR_Seek() failed: %d\n", PR_GetError());
-            failedAlready = PR_TRUE;
-            goto Finished;
-        }
-    }
-    rc = PR_Close( fd );
-    if ( PR_FAILURE == rc ) {
-        if (debug) printf("PR_Close() failed after writing: %d\n", PR_GetError());
-        failedAlready = PR_TRUE;
-        goto Finished;
-    }
-/* ---------------------------------------------------------------------- */
-    fd = PR_Open( "/tmp/nsprAppend", PR_RDONLY, 0 );
-    if ( NULL == fd )  {
-        if (debug) printf("PR_Open() failed for reading: %d\n", PR_GetError());
-        failedAlready = PR_TRUE;
-        goto Finished;
-    }
-
-    for ( i = 0; i < addedBytes ; i++ ) {
-        rv = PR_Read( fd, &inBuf, sizeof(inBuf));
-        if ( sizeof(inBuf) != rv)  {
-            if (debug) printf("PR_Write() failed: %d\n", PR_GetError());
-            failedAlready = PR_TRUE;
-            goto Finished;
-        }
-        sum += inBuf;
-    }
-
-    rc = PR_Close( fd );
-    if ( PR_FAILURE == rc ) {
-        if (debug) printf("PR_Close() failed after reading: %d\n", PR_GetError());
-        failedAlready = PR_TRUE;
-        goto Finished;
-    }
-    if ( sum != addedBytes )  {
-        if (debug) printf("Uh Oh! addedBytes: %d. Sum: %d\n", addedBytes, sum);
-        failedAlready = PR_TRUE;
-        goto Finished;
-    }
-
-/* ---------------------------------------------------------------------- */
-Finished:
-    if (debug || verbose) printf("%s\n", (failedAlready)? "FAILED" : "PASSED" );
-    return( (failedAlready)? 1 : 0 );
-}  /* main() */
-
-/* append.c */
diff --git a/libs/js/nsprpub/pr/tests/atomic.c b/libs/js/nsprpub/pr/tests/atomic.c
deleted file mode 100644
index 1295b29774..0000000000
--- a/libs/js/nsprpub/pr/tests/atomic.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-#include "prio.h"
-#include "prprf.h"
-#include "pratom.h"
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRInt32 rv, oldval, test, result = 0;
-    PRFileDesc *output = PR_GetSpecialFD(PR_StandardOutput);
-
-    oldval = test = -2;
-    rv = PR_AtomicIncrement(&test);
-    result = result | ((rv == -1) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicIncrement(%d) == %d: %s\n",
-        oldval, rv, (rv == -1) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicIncrement(&test);
-    result = result | ((rv == 0) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicIncrement(%d) == %d: %s\n",
-        oldval, rv, (rv == 0) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicIncrement(&test);
-    result = result | ((rv == 1) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicIncrement(%d) == %d: %s\n",
-        oldval, rv, (rv == 1) ? "PASSED" : "FAILED");
-
-    oldval = test = -2;
-    rv = PR_AtomicAdd(&test,1);
-    result = result | ((rv == -1) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicAdd(%d,%d) == %d: %s\n",
-        oldval, 1, rv, (rv == -1) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicAdd(&test, 4);
-    result = result | ((rv == 3) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicAdd(%d,%d) == %d: %s\n",
-        oldval, 4, rv, (rv == 3) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicAdd(&test, -6);
-    result = result | ((rv == -3) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicAdd(%d,%d) == %d: %s\n",
-        oldval, -6, rv, (rv == -3) ? "PASSED" : "FAILED");
-
-    oldval = test = 2;
-    rv = PR_AtomicDecrement(&test);
-    result = result | ((rv == 1) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicDecrement(%d) == %d: %s\n",
-        oldval, rv, (rv == 1) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicDecrement(&test);
-    result = result | ((rv == 0) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicDecrement(%d) == %d: %s\n",
-        oldval, rv, (rv == 0) ? "PASSED" : "FAILED");
-    oldval = test;
-    rv = PR_AtomicDecrement(&test);
-    result = result | ((rv == -1) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicDecrement(%d) == %d: %s\n",
-        oldval, rv, (rv == -1) ? "PASSED" : "FAILED");
-
-    /* set to a different value */
-    oldval = test = -2;
-    rv = PR_AtomicSet(&test, 2);
-    result = result | (((rv == -2) && (test == 2)) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicSet(%d, %d) == %d: %s\n",
-        oldval, 2, rv, ((rv == -2) && (test == 2)) ? "PASSED" : "FAILED");
-
-    /* set to the same value */
-    oldval = test = -2;
-    rv = PR_AtomicSet(&test, -2);
-    result = result | (((rv == -2) && (test == -2)) ? 0 : 1);
-    PR_fprintf(
-        output, "PR_AtomicSet(%d, %d) == %d: %s\n",
-        oldval, -2, rv, ((rv == -2) && (test == -2)) ? "PASSED" : "FAILED");
-
-    PR_fprintf(
-        output, "Atomic operations test %s\n",
-        (result == 0) ? "PASSED" : "FAILED");
-    return result;
-}  /* main */
-
-/* atomic.c */
diff --git a/libs/js/nsprpub/pr/tests/attach.c b/libs/js/nsprpub/pr/tests/attach.c
deleted file mode 100644
index 20da8ec316..0000000000
--- a/libs/js/nsprpub/pr/tests/attach.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-** Name: attach.c
-**
-** Description: Platform-specific code to create a native thread. The native thread will
-**                            repeatedly call PR_AttachThread and PR_DetachThread. The
-**                            primordial thread waits for this new thread to finish.
-**
-** Modification History:
-** 13-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-
-/* Used to get the command line option */
-#include "nspr.h"
-#include "pprthred.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#ifdef WIN32
-#include <windows.h>
-#include <process.h>
-#elif defined(_PR_PTHREADS)
-#include <pthread.h>
-#include "md/_pth.h"
-#elif defined(IRIX)
-#include <sys/types.h>
-#include <sys/prctl.h>
-#include <sys/wait.h>
-#include <errno.h>
-#elif defined(SOLARIS)
-#include <thread.h>
-#elif defined(OS2)
-#define INCL_DOS
-#define INCL_ERRORS
-#include <os2.h>
-#include <process.h>
-#elif defined(XP_BEOS)
-#include <kernel/OS.h>
-#endif
-
-#define DEFAULT_COUNT 1000
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-int count;
-
-
-static void 
-AttachDetach(void)
-{
-    PRThread *me;
-    PRInt32 index;
-
-    for (index=0;index<count; index++) {
-        me = PR_AttachThread(PR_USER_THREAD, 
-                             PR_PRIORITY_NORMAL,
-                             NULL);
- 
-        if (!me) {
-            fprintf(stderr, "Error attaching thread %d: PR_AttachThread failed\n",
-		    count);
-	    	failed_already = 1;
-	    	return;
-        }
-        PR_DetachThread();
-    }
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-	if (debug_mode)
-    printf("%40s: %6.2f usec\n", msg, d / count);
-}
-
-#ifdef WIN32
-static unsigned __stdcall threadStartFunc(void *arg)
-#elif defined(IRIX) && !defined(_PR_PTHREADS)
-static void threadStartFunc(void *arg)
-#elif defined(XP_BEOS)
-static int32 threadStartFunc(void *arg)
-#else
-static void * threadStartFunc(void *arg)
-#endif
-{
-#ifdef _PR_DCETHREADS
-    {
-        int rv;
-        pthread_t self = pthread_self();
-        rv = pthread_detach(&self);
-        if (debug_mode) PR_ASSERT(0 == rv);
-		else if (0 != rv) failed_already=1;
-    }
-#endif
-
-    Measure(AttachDetach, "Attach/Detach");
-
-#ifndef IRIX
-    return 0;
-#endif
-}
-
-int main(int argc, char **argv)
-{
-#ifdef _PR_PTHREADS
-    int rv;
-    pthread_t threadID;
-    pthread_attr_t attr;
-#elif defined(SOLARIS)
-    int rv;
-    thread_t threadID;
-#elif defined(WIN32)
-    DWORD rv;
-    unsigned threadID;
-    HANDLE hThread;
-#elif defined(IRIX)
-    int rv;
-    int threadID;
-#elif defined(OS2)
-    int rv;
-    TID threadID;
-#elif defined(XP_BEOS)
-	thread_id threadID;
-	int32 threadRV;
-	status_t waitRV;
-#endif
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name [-d] [-c n]
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dc:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'c':  /* loop count */
-			count = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-#if defined(WIN16)
-    printf("attach: This test is not valid for Win16\n");
-    goto exit_now;
-#endif
-
-	if(0 == count) count = DEFAULT_COUNT;	
-
-    /*
-     * To force the implicit initialization of nspr20
-     */
-    PR_SetError(0, 0);
-    PR_STDIO_INIT();
-
-    /*
-     * Platform-specific code to create a native thread.  The native
-     * thread will repeatedly call PR_AttachThread and PR_DetachThread.
-     * The primordial thread waits for this new thread to finish.
-     */
-
-#ifdef _PR_PTHREADS
-
-    rv = _PT_PTHREAD_ATTR_INIT(&attr);
-    if (debug_mode) PR_ASSERT(0 == rv);
-	else if (0 != rv) {
-		failed_already=1;
-		goto exit_now;
-	}
-	
-#ifndef _PR_DCETHREADS
-    rv = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-    if (debug_mode) PR_ASSERT(0 == rv);
-	else if (0 != rv) {
-		failed_already=1;
-		goto exit_now;
-	}
-#endif  /* !_PR_DCETHREADS */
-    rv = _PT_PTHREAD_CREATE(&threadID, attr, threadStartFunc, NULL);
-    if (rv != 0) {
-			fprintf(stderr, "thread creation failed: error code %d\n", rv);
-			failed_already=1;
-			goto exit_now;
-	}
-	else {
-		if (debug_mode)
-			printf ("thread creation succeeded \n");
-
-	}
-    rv = _PT_PTHREAD_ATTR_DESTROY(&attr);
-    if (debug_mode) PR_ASSERT(0 == rv);
-	else if (0 != rv) {
-		failed_already=1;
-		goto exit_now;
-	}
-    rv = pthread_join(threadID, NULL);
-    if (debug_mode) PR_ASSERT(0 == rv);
-	else if (0 != rv) {
-		failed_already=1;
-		goto exit_now;
-	}
-
-#elif defined(SOLARIS)
-
-    rv = thr_create(NULL, 0, threadStartFunc, NULL, 0, &threadID);
-    if (rv != 0) {
-	if(!debug_mode) {
-		failed_already=1;
-		goto exit_now;
-	} else	
-		fprintf(stderr, "thread creation failed: error code %d\n", rv);
-    }
-    rv = thr_join(threadID, NULL, NULL);
-    if (debug_mode) PR_ASSERT(0 == rv);
-	else if (0 != rv)
-	{
-		failed_already=1;
-		goto exit_now;
-	}
-
-
-#elif defined(WIN32)
-
-    hThread = (HANDLE) _beginthreadex(NULL, 0, threadStartFunc, NULL,
-            0, &threadID); 
-    if (hThread == 0) {
-        fprintf(stderr, "thread creation failed: error code %d\n",
-                GetLastError());
-		failed_already=1;
-		goto exit_now;
-    }
-    rv = WaitForSingleObject(hThread, INFINITE);
-    if (debug_mode)PR_ASSERT(rv != WAIT_FAILED);
-	else if (rv == WAIT_FAILED) {
-		failed_already=1;
-		goto exit_now;
-	}
-
-#elif defined(IRIX)
-
-    threadID = sproc(threadStartFunc, PR_SALL, NULL);
-    if (threadID == -1) {
-
-			fprintf(stderr, "thread creation failed: error code %d\n",
-					errno);
-			failed_already=1;
-			goto exit_now;
-	
-	}
-	else {
-		if (debug_mode) 
-			printf ("thread creation succeeded \n");
-		sleep(3);
-		goto exit_now;
-	}
-    rv = waitpid(threadID, NULL, 0);
-    if (debug_mode) PR_ASSERT(rv != -1);
-	else  if (rv != -1) {
-		failed_already=1;
-		goto exit_now;
-	}
-
-#elif defined(OS2)
-
-# ifdef __EMX__
-    threadID = (TID) _beginthread((void *)threadStartFunc, NULL,
-            32768, NULL); 
-# else
-    threadID = (TID) _beginthread((void(* _Optlink)(void*))threadStartFunc, NULL,
-            32768, NULL); 
-# endif
-    if (threadID == -1) {
-        fprintf(stderr, "thread creation failed: error code %d\n", errno);
-        failed_already=1;
-        goto exit_now;
-    }
-    rv = DosWaitThread(&threadID, DCWW_WAIT);
-    if (debug_mode) {
-        PR_ASSERT(rv == NO_ERROR);
-    } else if (rv != NO_ERROR) {
-        failed_already=1;
-        goto exit_now;
-    }
-
-#elif defined(XP_BEOS)
-	
-	threadID = spawn_thread(threadStartFunc, NULL, B_NORMAL_PRIORITY, NULL);
-	if (threadID <= B_ERROR) {
-		fprintf(stderr, "thread creation failed: error code %08lx\n", threadID);
-		failed_already = 1;
-		goto exit_now;
-	}
-	if (resume_thread(threadID) != B_OK) {
-		fprintf(stderr, "failed starting thread: error code %08lx\n", threadID);
-		failed_already = 1;
-		goto exit_now;
-	}
-
-	waitRV = wait_for_thread(threadID, &threadRV);
-	if (debug_mode)
-		PR_ASSERT(waitRV == B_OK);
-	else if (waitRV != B_OK) {
-		failed_already = 1;
-		goto exit_now;
-	}
-	
-#else
-	if (!debug_mode)
-		failed_already=1;
-	else	
-		printf("The attach test does not apply to this platform because\n"
-	    "either this platform does not have native threads or the\n"
-	    "test needs to be written for this platform.\n");
-	goto exit_now;
-#endif
-
-exit_now:
-   if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/bigfile.c b/libs/js/nsprpub/pr/tests/bigfile.c
deleted file mode 100644
index 19c0a7f9d6..0000000000
--- a/libs/js/nsprpub/pr/tests/bigfile.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prmem.h"
-#include "prprf.h"
-#include "prinit.h"
-#include "prerror.h"
-#include "prthread.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#define DEFAULT_COUNT 10
-#define DEFAULT_FILESIZE 1
-#define BUFFER_SIZE 1000000
-
-typedef enum {v_silent, v_whisper, v_shout} Verbosity;
-static void Verbose(Verbosity, const char*, const char*, PRIntn);
-
-#define VERBOSE(_l, _m) Verbose(_l, _m, __FILE__, __LINE__)
-
-static PRIntn test_result = 2;
-static PRFileDesc *output = NULL;
-static PRIntn verbose = v_silent;
-static PRIntn filesize = DEFAULT_FILESIZE;
-
-static PRIntn Usage(void)
-{
-    PR_fprintf(output, "Bigfile test usage:\n");
-    PR_fprintf(output, ">bigfile [-G] [-d] [-v[*v]] [-s <n>] <filename>\n");
-    PR_fprintf(output, "\td\tdebug mode (equivalent to -vvv)\t(false)\n");
-    PR_fprintf(output, "\tv\tAdditional levels of output\t(none)\n");
-    PR_fprintf(output, "\tk\tKeep data file after exit\t(false)\n");
-    PR_fprintf(output, "\ts <n>\tFile size in megabytes\t\t(1 megabyte)\n");
-    PR_fprintf(output, "\t<filename>\tName of test file\t(none)\n");
-    return 2;  /* nothing happened */
-}  /* Usage */
-
-static PRStatus DeleteIfFound(const char *filename)
-{
-    PRStatus rv;
-    VERBOSE(v_shout, "Checking for existing file");
-    rv = PR_Access(filename, PR_ACCESS_WRITE_OK);
-    if (PR_SUCCESS == rv)
-    {
-        VERBOSE(v_shout, "Deleting existing file");
-        rv = PR_Delete(filename);
-        if (PR_FAILURE == rv) VERBOSE(v_shout, "Cannot delete big file");
-    }
-    else if (PR_FILE_NOT_FOUND_ERROR !=  PR_GetError())
-        VERBOSE(v_shout, "Cannot access big file");
-    else rv = PR_SUCCESS;
-    return rv;
-}  /* DeleteIfFound */
-
-static PRIntn Error(const char *msg, const char *filename)
-{
-    PRInt32 error = PR_GetError();
-    if (NULL != msg)
-    {
-        if (0 == error) PR_fprintf(output, msg);
-        else PL_FPrintError(output, msg);
-    }
-    (void)DeleteIfFound(filename);
-    if (v_shout == verbose) PR_Abort();
-    return 1;
-}  /* Error */
-
-static void Verbose(
-    Verbosity level, const char *msg, const char *file, PRIntn line)
-{
-    if (level <= verbose)
-        PR_fprintf(output, "[%s : %d]: %s\n", file, line, msg);
-}  /* Verbose */
-
-static void PrintInfo(PRFileInfo64 *info, const char *filename)
-{
-    PRExplodedTime tm;
-    char ctime[40], mtime[40];
-    static const char *types[] = {"FILE", "DIRECTORY", "OTHER"};
-    PR_fprintf(
-        output, "[%s : %d]: File info for %s\n",
-        __FILE__, __LINE__, filename);
-    PR_fprintf(
-        output, "    type: %s, size: %llu bytes,\n",
-        types[info->type - 1], info->size);
-
-    PR_ExplodeTime(info->creationTime, PR_GMTParameters, &tm);
-    (void)PR_FormatTime(ctime, sizeof(ctime), "%c GMT", &tm);
-    PR_ExplodeTime(info->modifyTime, PR_GMTParameters, &tm);
-    (void)PR_FormatTime(mtime, sizeof(mtime), "%c GMT", &tm);
-
-    PR_fprintf(
-        output, "    creation: %s,\n    modify: %s\n", ctime, mtime);
-}  /* PrintInfo */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    char *buffer;
-    PLOptStatus os;
-    PRInt32 loop, bytes;
-    PRFileInfo small_info;
-    PRFileInfo64 big_info;
-    PRBool keep = PR_FALSE;
-    PRFileDesc *file = NULL;
-    const char *filename = NULL;
-    PRIntn count = DEFAULT_COUNT;
-    PRInt64 filesize64, big_answer, big_size, one_meg, zero_meg, big_fragment;
-    PRInt64 sevenFox = LL_INIT(0,0x7fffffff);
-
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dtvhs:");
-
-    output = PR_GetSpecialFD(PR_StandardError);
-    PR_STDIO_INIT();
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:
-            filename = opt->value;
-            break;
-        case 'd':  /* debug mode */
-            verbose = v_shout;
-            break;
-        case 'k':  /* keep file */
-            keep = PR_TRUE;
-            break;
-        case 'v':  /* verbosity */
-            if (v_shout > verbose) verbose += 1;
-            break;
-        case 'c':  /* loop counter */
-            count = atoi(opt->value);
-            break;
-        case 's':  /* filesize */
-            filesize = atoi(opt->value);
-            break;
-        case 'h':  /* confused */
-        default:
-            return Usage();
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (0 == count) count = DEFAULT_COUNT;
-    if (0 == filesize) filesize = DEFAULT_FILESIZE;
-    if (NULL == filename)
-    {
-        if (DEFAULT_FILESIZE != filesize) return Usage();
-        else filename = "bigfile.dat";
-    }
-
-    if (PR_FAILURE == DeleteIfFound(filename)) return 1;
-
-    test_result = 0;
-
-    LL_I2L(zero_meg, 0);
-    LL_I2L(one_meg, 1000000);
-    LL_I2L(filesize64, filesize);
-    buffer = (char*)PR_MALLOC(BUFFER_SIZE);
-    LL_I2L(big_fragment, BUFFER_SIZE);
-    LL_MUL(filesize64, filesize64, one_meg); 
-
-    for (loop = 0; loop < BUFFER_SIZE; ++loop) buffer[loop] = (char)loop;
-
-    VERBOSE(v_whisper, "Creating big file");
-    file = PR_Open(filename, PR_CREATE_FILE | PR_WRONLY, 0666);
-    if (NULL == file) return Error("PR_Open()", filename);
-    
-    VERBOSE(v_whisper, "Testing available space in empty file");
-    big_answer = file->methods->available64(file);
-    if (!LL_IS_ZERO(big_answer)) return Error("empty available64()", filename);
-
-	LL_SUB(big_size, filesize64, one_meg);
-    VERBOSE(v_whisper, "Creating sparse big file by seeking to end");
-	big_answer = file->methods->seek64(file, big_size, PR_SEEK_SET);
-    if (!LL_EQ(big_answer, big_size)) return Error("seek", filename);
-
-    VERBOSE(v_whisper, "Writing block at end of sparse file");
-	bytes = file->methods->write(file, buffer, BUFFER_SIZE);
-    if (bytes != BUFFER_SIZE) return Error("write", filename);
-
-    VERBOSE(v_whisper, "Testing available space at end of sparse file");
-    big_answer = file->methods->available64(file);
-    if (!LL_IS_ZERO(big_answer)) return Error("eof available64()", filename);
-
-    VERBOSE(v_whisper, "Getting big info on sparse big file");
-    rv = file->methods->fileInfo64(file, &big_info);
-    if (PR_FAILURE == rv) return Error("fileInfo64()", filename);
-    if (v_shout <= verbose) PrintInfo(&big_info, filename);
-
-    VERBOSE(v_whisper, "Getting small info on sparse big file");
-    rv = file->methods->fileInfo(file, &small_info);
-    if (LL_CMP(sevenFox, <, filesize64) && (PR_SUCCESS == rv))
-    {
-        VERBOSE(v_whisper, "Should have failed and didn't");
-        return Error("fileInfo()", filename);
-    }
-    else if (LL_CMP(sevenFox, >, filesize64) && (PR_FAILURE == rv))
-    {
-        VERBOSE(v_whisper, "Should have succeeded and didn't");
-        return Error("fileInfo()", filename);
-    }
-
-    VERBOSE(v_whisper, "Rewinding big file");
-    big_answer = file->methods->seek64(file, zero_meg, PR_SEEK_SET);
-    if (!LL_IS_ZERO(big_answer)) return Error("rewind seek64()", filename);
-
-    VERBOSE(v_whisper, "Establishing available space in rewound file");
-    big_answer = file->methods->available64(file);
-    if (LL_NE(filesize64, big_answer))
-        return Error("bof available64()", filename);
-
-    VERBOSE(v_whisper, "Closing big file");
-    rv = file->methods->close(file);
-    if (PR_FAILURE == rv) return Error("close()", filename);
-
-    VERBOSE(v_whisper, "Reopening big file");
-    file = PR_Open(filename, PR_RDWR, 0666);
-    if (NULL == file) return Error("open failed", filename);
-
-    VERBOSE(v_whisper, "Checking available data in reopened file");
-    big_answer = file->methods->available64(file);
-    if (LL_NE(filesize64, big_answer))
-        return Error("reopened available64()", filename);
-
-    big_answer = zero_meg;
-    VERBOSE(v_whisper, "Rewriting every byte of big file data");
-    do
-    {
-        bytes = file->methods->write(file, buffer, BUFFER_SIZE);
-        if (bytes != BUFFER_SIZE)
-            return Error("write", filename);
-        LL_ADD(big_answer, big_answer, big_fragment);
-    } while (LL_CMP(big_answer, <, filesize64));
-
-    VERBOSE(v_whisper, "Checking position at eof");
-    big_answer = file->methods->seek64(file, zero_meg, PR_SEEK_CUR);
-    if (LL_NE(big_answer, filesize64))
-        return Error("file size error", filename);
-
-    VERBOSE(v_whisper, "Testing available space at eof");
-    big_answer = file->methods->available64(file);
-    if (!LL_IS_ZERO(big_answer))
-        return Error("eof available64()", filename);
-
-    VERBOSE(v_whisper, "Rewinding full file");
-    big_answer = file->methods->seek64(file, zero_meg, PR_SEEK_SET);
-    if (!LL_IS_ZERO(big_answer)) return Error("bof seek64()", filename);
-
-    VERBOSE(v_whisper, "Testing available space in rewound file");
-    big_answer = file->methods->available64(file);
-    if (LL_NE(big_answer, filesize64)) return Error("bof available64()", filename);
-
-    VERBOSE(v_whisper, "Seeking to end of big file");
-    big_answer = file->methods->seek64(file, filesize64, PR_SEEK_SET);
-    if (LL_NE(big_answer, filesize64)) return Error("eof seek64()", filename);
-
-    VERBOSE(v_whisper, "Getting info on big file while it's open");
-    rv = file->methods->fileInfo64(file, &big_info);
-    if (PR_FAILURE == rv) return Error("fileInfo64()", filename);
-    if (v_shout <= verbose) PrintInfo(&big_info, filename);
-
-    VERBOSE(v_whisper, "Closing big file");
-    rv = file->methods->close(file);
-    if (PR_FAILURE == rv) return Error("close()", filename);
-
-    VERBOSE(v_whisper, "Getting info on big file after it's closed");
-    rv = PR_GetFileInfo64(filename, &big_info);
-    if (PR_FAILURE == rv) return Error("fileInfo64()", filename);
-    if (v_shout <= verbose) PrintInfo(&big_info, filename);
-
-    VERBOSE(v_whisper, "Deleting big file");
-    rv = PR_Delete(filename);
-    if (PR_FAILURE == rv) return Error("PR_Delete()", filename);
-
-    PR_DELETE(buffer);
-    return test_result;
-} /* main */
-
-/* bigfile.c */
diff --git a/libs/js/nsprpub/pr/tests/bigfile2.c b/libs/js/nsprpub/pr/tests/bigfile2.c
deleted file mode 100644
index 3e8beeeb36..0000000000
--- a/libs/js/nsprpub/pr/tests/bigfile2.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#define TEST_FILE_NAME "bigfile2.txt"
-
-#define MESSAGE "Hello world!"
-#define MESSAGE_SIZE 13
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *fd;
-    PRInt64 offset, position;
-    PRInt32 nbytes;
-    char buf[MESSAGE_SIZE];
-#ifdef _WIN32
-    HANDLE hFile;
-    LARGE_INTEGER li;
-#endif /* _WIN32 */
-
-    LL_I2L(offset, 1);
-    LL_SHL(offset, offset, 32);
-
-    fd = PR_Open(TEST_FILE_NAME,
-            PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0666);
-    if (fd == NULL) {
-        fprintf(stderr, "PR_Open failed\n");
-        exit(1);
-    }
-    position = PR_Seek64(fd, offset, PR_SEEK_SET);
-    if (!LL_GE_ZERO(position)) {
-        fprintf(stderr, "PR_Seek64 failed\n");
-        exit(1);
-    }
-    PR_ASSERT(LL_EQ(position, offset));
-    strcpy(buf, MESSAGE);
-    nbytes = PR_Write(fd, buf, sizeof(buf));
-    if (nbytes != sizeof(buf)) {
-        fprintf(stderr, "PR_Write failed\n");
-        exit(1);
-    }
-    if (PR_Close(fd) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    memset(buf, 0, sizeof(buf));
-
-#ifdef _WIN32
-    hFile = CreateFile(TEST_FILE_NAME, GENERIC_READ, 0, NULL,
-            OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hFile == INVALID_HANDLE_VALUE) {
-        fprintf(stderr, "CreateFile failed\n");
-        exit(1);
-    }
-    li.QuadPart = offset;
-    li.LowPart = SetFilePointer(hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-    if (li.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR) {
-        fprintf(stderr, "SetFilePointer failed\n");
-        exit(1);
-    }
-    PR_ASSERT(li.QuadPart == offset);
-    if (ReadFile(hFile, buf, sizeof(buf), &nbytes, NULL) == 0) {
-        fprintf(stderr, "ReadFile failed\n");
-        exit(1);
-    }
-    PR_ASSERT(nbytes == sizeof(buf));
-    if (strcmp(buf, MESSAGE)) {
-        fprintf(stderr, "corrupt data:$%s$\n", buf);
-        exit(1);
-    }
-    if (CloseHandle(hFile) == 0) {
-        fprintf(stderr, "CloseHandle failed\n");
-        exit(1);
-    }
-#endif /* _WIN32 */
-
-    if (PR_Delete(TEST_FILE_NAME) == PR_FAILURE) {
-        fprintf(stderr, "PR_Delete failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/bigfile3.c b/libs/js/nsprpub/pr/tests/bigfile3.c
deleted file mode 100644
index 3cb806ffc1..0000000000
--- a/libs/js/nsprpub/pr/tests/bigfile3.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#define TEST_FILE_NAME "bigfile3.txt"
-
-#define MESSAGE "Hello world!"
-#define MESSAGE_SIZE 13
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *fd;
-    PRInt64 offset, position;
-    PRInt32 nbytes;
-    char buf[MESSAGE_SIZE];
-#ifdef _WIN32
-    HANDLE hFile;
-    LARGE_INTEGER li;
-#endif /* _WIN32 */
-
-    LL_I2L(offset, 1);
-    LL_SHL(offset, offset, 32);
-
-#ifdef _WIN32
-    hFile = CreateFile(TEST_FILE_NAME, GENERIC_WRITE, 0, NULL,
-            CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hFile == INVALID_HANDLE_VALUE) {
-        fprintf(stderr, "CreateFile failed\n");
-        exit(1);
-    }
-    li.QuadPart = offset;
-    li.LowPart = SetFilePointer(hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-    if (li.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR) {
-        fprintf(stderr, "SetFilePointer failed\n");
-        exit(1);
-    }
-    PR_ASSERT(li.QuadPart == offset);
-    strcpy(buf, MESSAGE);
-    if (WriteFile(hFile, buf, sizeof(buf), &nbytes, NULL) == 0) {
-        fprintf(stderr, "WriteFile failed\n");
-        exit(1);
-    }
-    PR_ASSERT(nbytes == sizeof(buf));
-    if (CloseHandle(hFile) == 0) {
-        fprintf(stderr, "CloseHandle failed\n");
-        exit(1);
-    }
-#endif /* _WIN32 */
-
-    memset(buf, 0, sizeof(buf));
-
-    fd = PR_Open(TEST_FILE_NAME, PR_RDONLY, 0666);
-    if (fd == NULL) {
-        fprintf(stderr, "PR_Open failed\n");
-        exit(1);
-    }
-    position = PR_Seek64(fd, offset, PR_SEEK_SET);
-    if (!LL_GE_ZERO(position)) {
-        fprintf(stderr, "PR_Seek64 failed\n");
-        exit(1);
-    }
-    PR_ASSERT(LL_EQ(position, offset));
-    nbytes = PR_Read(fd, buf, sizeof(buf));
-    if (nbytes != sizeof(buf)) {
-        fprintf(stderr, "PR_Read failed\n");
-        exit(1);
-    }
-    if (strcmp(buf, MESSAGE)) {
-        fprintf(stderr, "corrupt data:$%s$\n", buf);
-        exit(1);
-    }
-    if (PR_Close(fd) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    if (PR_Delete(TEST_FILE_NAME) == PR_FAILURE) {
-        fprintf(stderr, "PR_Delete failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/bug1test.c b/libs/js/nsprpub/pr/tests/bug1test.c
deleted file mode 100644
index fa7d591fcf..0000000000
--- a/libs/js/nsprpub/pr/tests/bug1test.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-Attached is a test program that uses the nspr1 to demonstrate a bug
-under NT4.0. The fix has already been mentioned (add a ResetEvent just
-before leaving the critical section in _PR_CondWait in hwmon.c).
-*/
-
-#include "prthread.h"
-#include "prtypes.h"
-#include "prinit.h"
-#include "prmon.h"
-#include "prlog.h"
-
-typedef struct Arg_s
-{
-	PRInt32 a, b;
-} Arg_t;
-
-PRMonitor*  gMonitor;       // the monitor
-PRInt32     gReading;       // number of read locks
-PRInt32     gWriteWaiting;  // number of threads waiting for write lock
-PRInt32     gReadWaiting;   // number of threads waiting for read lock
-
-PRInt32     gCounter;       // a counter
-
-                            // stats
-PRInt32     gReads;         // number of successful reads
-PRInt32     gMaxReads;      // max number of simultaneous reads
-PRInt32     gMaxWriteWaits; // max number of writes that waited for read
-PRInt32     gMaxReadWaits;  // max number of reads that waited for write wait
-
-
-void spin (PRInt32 aDelay)
-{
-  PRInt32 index;
-  PRInt32 delay = aDelay * 1000;
-
-  PR_Sleep(0);
-
-  // randomize delay a bit
-  delay = (delay / 2) + (PRInt32)((float)delay *
-	  ((float)rand () / (float)RAND_MAX));
-
-  for (index = 0; index < delay * 10; index++)
-	  // consume a bunch of cpu cycles
-    ;
-  PR_Sleep(0); 
-}
-
-void  doWriteThread (void* arg)
-{
-  PRInt32 last;
-  Arg_t *args = (Arg_t*)arg;
-  PRInt32 aWorkDelay = args->a, aWaitDelay = args->b;
-  PR_Sleep(0);
-
-  while (1)
-  {
-    // -- enter write lock
-    PR_EnterMonitor (gMonitor);
-
-    if (0 < gReading)     // wait for read locks to go away
-    {
-      PRIntervalTime fiveSecs = PR_SecondsToInterval(5);
-
-      gWriteWaiting++;
-      if (gWriteWaiting > gMaxWriteWaits) // stats
-        gMaxWriteWaits = gWriteWaiting;
-      while (0 < gReading)
-        PR_Wait (gMonitor, fiveSecs);
-      gWriteWaiting--;
-    }
-    // -- write lock entered
-
-    last = gCounter;
-    gCounter++;
-
-    spin (aWorkDelay);
-
-    PR_ASSERT (gCounter == (last + 1)); // test invariance
-
-    // -- exit write lock        
-//    if (0 < gReadWaiting)   // notify waiting reads (do it anyway to show off the CondWait bug)
-      PR_NotifyAll (gMonitor);
-
-    PR_ExitMonitor (gMonitor);
-    // -- write lock exited
-
-    spin (aWaitDelay);
-  }
-}
-
-void  doReadThread (void* arg)
-{
-  PRInt32 last;
-  Arg_t *args = (Arg_t*)arg;
-  PRInt32 aWorkDelay = args->a, aWaitDelay = args->b;
-  PR_Sleep(0);
-
-  while (1)
-  {
-    // -- enter read lock
-    PR_EnterMonitor (gMonitor); 
-
-    if (0 < gWriteWaiting)  // give up the monitor to waiting writes
-    {
-      PRIntervalTime fiveSecs = PR_SecondsToInterval(5);
-
-      gReadWaiting++;
-      if (gReadWaiting > gMaxReadWaits) // stats
-        gMaxReadWaits = gReadWaiting;
-      while (0 < gWriteWaiting)
-        PR_Wait (gMonitor, fiveSecs);
-      gReadWaiting--;
-    }
-
-    gReading++;
-
-    gReads++;   // stats
-    if (gReading > gMaxReads) // stats
-      gMaxReads = gReading;
-
-    PR_ExitMonitor (gMonitor);
-    // -- read lock entered
-
-    last = gCounter;
-
-    spin (aWorkDelay);
-
-    PR_ASSERT (gCounter == last); // test invariance
-
-    // -- exit read lock
-    PR_EnterMonitor (gMonitor);  // read unlock
-    gReading--;
-
-//    if ((0 == gReading) && (0 < gWriteWaiting))  // notify waiting writes  (do it anyway to show off the CondWait bug)
-      PR_NotifyAll (gMonitor);
-    PR_ExitMonitor (gMonitor);
-    // -- read lock exited
-
-    spin (aWaitDelay);
-  }
-}
-
-
-void fireThread (
-    char* aName, void (*aProc)(void *arg), Arg_t *aArg)
-{
-  PRThread *thread = PR_CreateThread(
-	  PR_USER_THREAD, aProc, aArg, PR_PRIORITY_NORMAL,
-	  PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-}
-
-int pseudoMain (int argc, char** argv, char *pad)
-{
-  PRInt32 lastWriteCount  = gCounter;
-  PRInt32 lastReadCount   = gReads;
-  Arg_t a1 = {500, 250};
-  Arg_t a2 = {500, 500};
-  Arg_t a3 = {250, 500};
-  Arg_t a4 = {750, 250};
-  Arg_t a5 = {100, 750};
-  Arg_t a6 = {100, 500};
-  Arg_t a7 = {100, 750};
-
-  gMonitor = PR_NewMonitor ();
-
-  fireThread ("R1", doReadThread,   &a1);
-  fireThread ("R2", doReadThread,   &a2);
-  fireThread ("R3", doReadThread,   &a3);
-  fireThread ("R4", doReadThread,   &a4);
-
-  fireThread ("W1", doWriteThread,  &a5);
-  fireThread ("W2", doWriteThread,  &a6);
-  fireThread ("W3", doWriteThread,  &a7);
-
-  fireThread ("R5", doReadThread,   &a1);
-  fireThread ("R6", doReadThread,   &a2);
-  fireThread ("R7", doReadThread,   &a3);
-  fireThread ("R8", doReadThread,   &a4);
-
-  fireThread ("W4", doWriteThread,  &a5);
-  fireThread ("W5", doWriteThread,  &a6);
-  fireThread ("W6", doWriteThread,  &a7);
-  
-  while (1)
-  {
-	PRInt32 writeCount, readCount;
-    PRIntervalTime fiveSecs = PR_SecondsToInterval(5);
-    PR_Sleep (fiveSecs);  // get out of the way
-
-    // print some stats, not threadsafe, informative only
-    writeCount = gCounter;
-    readCount   = gReads;
-    printf ("\ntick %d writes (+%d), %d reads (+%d) [max %d, %d, %d]", 
-            writeCount, writeCount - lastWriteCount,
-            readCount, readCount - lastReadCount, 
-            gMaxReads, gMaxWriteWaits, gMaxReadWaits);
-    lastWriteCount = writeCount;
-    lastReadCount = readCount;
-    gMaxReads = gMaxWriteWaits = gMaxReadWaits = 0;
-  }
-  return 0;
-}
-
-
-static void padStack (int argc, char** argv)
-{
-  char pad[512];      /* Work around bug in nspr on windoze */
-  pseudoMain (argc, argv, pad);
-}
-
-void main (int argc, char **argv)
-{
-  PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-  PR_STDIO_INIT();
-  padStack (argc, argv);
-}
-
-
-/* bug1test.c */
diff --git a/libs/js/nsprpub/pr/tests/cleanup.c b/libs/js/nsprpub/pr/tests/cleanup.c
deleted file mode 100644
index e94979e979..0000000000
--- a/libs/js/nsprpub/pr/tests/cleanup.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prprf.h"
-#include "prio.h"
-#include "prinit.h"
-#include "prthread.h"
-#include "prinrval.h"
-
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-static void PR_CALLBACK Thread(void *sleep)
-{
-    PR_Sleep(PR_SecondsToInterval((PRUint32)sleep));
-    printf("Thread exiting\n");
-}
-
-static void Help(void)
-{
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PR_fprintf(err, "Cleanup usage: [-g] [-s n] [-t n] [-c n] [-h]\n");
-    PR_fprintf(err, "\t-c   Call cleanup before exiting     (default: false)\n");
-    PR_fprintf(err, "\t-G   Use global threads only         (default: local)\n");
-    PR_fprintf(err, "\t-t n Number of threads involved      (default: 1)\n");
-    PR_fprintf(err, "\t-s n Seconds thread(s) should dally  (defaut: 10)\n");
-    PR_fprintf(err, "\t-S n Seconds main() should dally     (defaut: 5)\n");
-    PR_fprintf(err, "\t-C n Value to set concurrency        (default 1)\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    PRBool cleanup = PR_FALSE;
-	PRThreadScope type = PR_LOCAL_THREAD;
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:");
-    PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1;
-
-    PR_STDIO_INIT();
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'c':  /* call PR_Cleanup() before exiting */
-            cleanup = PR_TRUE;
-            break;
-        case 'G':  /* local vs global threads */
-            type = PR_GLOBAL_THREAD;
-            break;
-        case 's':  /* time to sleep */
-            child_sleep = atoi(opt->value);
-            break;
-        case 'S':  /* time to sleep */
-            main_sleep = atoi(opt->value);
-            break;
-        case 'C':  /* number of cpus to create */
-            concurrency = atoi(opt->value);
-            break;
-        case 't':  /* number of threads to create */
-            threads = atoi(opt->value);
-            break;
-        case 'h':  /* user wants some guidance */
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-            break;
-         default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_fprintf(err, "Cleanup settings\n");
-    PR_fprintf(err, "\tThread type: %s\n",
-        (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL");
-    PR_fprintf(err, "\tConcurrency: %d\n", concurrency);
-    PR_fprintf(err, "\tNumber of threads: %d\n", threads);
-    PR_fprintf(err, "\tThread sleep: %d\n", child_sleep);
-    PR_fprintf(err, "\tMain sleep: %d\n", main_sleep); 
-    PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT "); 
-
-    PR_SetConcurrency(concurrency);
-
-	while (threads-- > 0)
-		(void)PR_CreateThread(
-        	PR_USER_THREAD, Thread, (void*)child_sleep, PR_PRIORITY_NORMAL,
-       		type, PR_UNJOINABLE_THREAD, 0);
-    PR_Sleep(PR_SecondsToInterval(main_sleep));
-
-    if (cleanup) PR_Cleanup();
-
-    PR_fprintf(err, "main() exiting\n");
-    return 0;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/cltsrv.c b/libs/js/nsprpub/pr/tests/cltsrv.c
deleted file mode 100644
index 022c634a86..0000000000
--- a/libs/js/nsprpub/pr/tests/cltsrv.c
+++ /dev/null
@@ -1,1226 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *
- * Notes:
- * [1] lth. The call to Sleep() is a hack to get the test case to run
- * on Windows 95. Without it, the test case fails with an error
- * WSAECONNRESET following a recv() call. The error is caused by the
- * server side thread termination without a shutdown() or closesocket()
- * call. Windows docmunentation suggests that this is predicted
- * behavior; that other platforms get away with it is ... serindipity.
- * The test case should shutdown() or closesocket() before
- * thread termination. I didn't have time to figure out where or how
- * to do it. The Sleep() call inserts enough delay to allow the
- * client side to recv() all his data before the server side thread
- * terminates. Whew! ...
- *
- ** Modification History:
- * 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
- *             The debug mode will print all of the printfs associated with this test.
- *             The regress mode will be the default mode. Since the regress tool limits
- *           the output to a one line status:PASS or FAIL,all of the printf statements
- *             have been handled with an if (debug_mode) statement. 
- */
-
-#include "prclist.h"
-#include "prcvar.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prtime.h"
-#include "prmem.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prthread.h"
-
-#include "pprio.h"
-#include "primpl.h"
-
-#include "plstr.h"
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-
-#if defined(XP_UNIX)
-#include <math.h>
-#endif
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-/*
-** This is the beginning of the test
-*/
-
-#define RECV_FLAGS 0
-#define SEND_FLAGS 0
-#define DEFAULT_LOW 0
-#define DEFAULT_HIGH 0
-#define BUFFER_SIZE 1024
-#define DEFAULT_BACKLOG 5
-#define DEFAULT_PORT 12849
-#define DEFAULT_CLIENTS 1
-#define ALLOWED_IN_ACCEPT 1
-#define DEFAULT_CLIPPING 1000
-#define DEFAULT_WORKERS_MIN 1
-#define DEFAULT_WORKERS_MAX 1
-#define DEFAULT_SERVER "localhost"
-#define DEFAULT_EXECUTION_TIME 10
-#define DEFAULT_CLIENT_TIMEOUT 4000
-#define DEFAULT_SERVER_TIMEOUT 4000
-#define DEFAULT_SERVER_PRIORITY PR_PRIORITY_HIGH
-
-typedef enum CSState_e {cs_init, cs_run, cs_stop, cs_exit} CSState_t;
-
-static void PR_CALLBACK Worker(void *arg);
-typedef struct CSPool_s CSPool_t;
-typedef struct CSWorker_s CSWorker_t;
-typedef struct CSServer_s CSServer_t;
-typedef enum Verbosity
-{
-    TEST_LOG_ALWAYS,
-    TEST_LOG_ERROR,
-    TEST_LOG_WARNING,
-    TEST_LOG_NOTICE,
-    TEST_LOG_INFO,
-    TEST_LOG_STATUS,
-    TEST_LOG_VERBOSE
-} Verbosity;
-
-static PRInt32 domain = AF_INET;
-static PRInt32 protocol = 6;  /* TCP */
-static PRFileDesc *debug_out = NULL;
-static PRBool debug_mode = PR_FALSE;
-static PRBool pthread_stats = PR_FALSE;
-static Verbosity verbosity = TEST_LOG_ALWAYS;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-struct CSWorker_s
-{
-    PRCList element;        /* list of the server's workers */
-
-    PRThread *thread;       /* this worker objects thread */
-    CSServer_t *server;     /* back pointer to server structure */
-};
-
-struct CSPool_s
-{
-    PRCondVar *exiting;
-    PRCondVar *acceptComplete;
-    PRUint32 accepting, active, workers;
-};
-
-struct CSServer_s
-{
-    PRCList list;           /* head of worker list */
-
-    PRLock *ml;
-    PRThread *thread;       /* the main server thread */
-    PRCondVar *stateChange;
-
-    PRUint16 port;          /* port we're listening on */
-    PRUint32 backlog;       /* size of our listener backlog */
-    PRFileDesc *listener;   /* the fd accepting connections */
-
-    CSPool_t pool;          /* statistics on worker threads */
-    CSState_t state;        /* the server's state */
-    struct                  /* controlling worker counts */
-    {
-        PRUint32 minimum, maximum, accepting;
-    } workers;
-
-    /* statistics */
-    PRIntervalTime started, stopped;
-    PRUint32 operations, bytesTransferred;
-};
-
-typedef struct CSDescriptor_s
-{
-    PRInt32 size;       /* size of transfer */
-    char filename[60];  /* filename, null padded */
-} CSDescriptor_t;
-
-typedef struct CSClient_s
-{
-    PRLock *ml;
-    PRThread *thread;
-    PRCondVar *stateChange;
-    PRNetAddr serverAddress;
-
-    CSState_t state;
-
-    /* statistics */
-    PRIntervalTime started, stopped;
-    PRUint32 operations, bytesTransferred;
-} CSClient_t;
-
-#define TEST_LOG(l, p, a) \
-    do { \
-        if (debug_mode || (p <= verbosity)) printf a; \
-    } while (0)
-
-PRLogModuleInfo *cltsrv_log_file = NULL;
-
-#define MY_ASSERT(_expr) \
-    ((_expr)?((void)0):_MY_Assert(# _expr,__FILE__,__LINE__))
-
-#define TEST_ASSERT(_expr) \
-    ((_expr)?((void)0):_MY_Assert(# _expr,__FILE__,__LINE__))
-
-static void _MY_Assert(const char *s, const char *file, PRIntn ln)
-{
-    PL_PrintError(NULL);
-#if DEBUG
-    PR_Assert(s, file, ln);
-#endif
-}  /* _MW_Assert */
-
-static PRBool Aborted(PRStatus rv)
-{
-    return ((PR_FAILURE == rv) && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) ?
-        PR_TRUE : PR_FALSE;
-}
-
-static void TimeOfDayMessage(const char *msg, PRThread* me)
-{
-    char buffer[100];
-    PRExplodedTime tod;
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &tod);
-    (void)PR_FormatTime(buffer, sizeof(buffer), "%T", &tod);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("%s(0x%p): %s\n", msg, me, buffer));
-}  /* TimeOfDayMessage */
-
-
-static void PR_CALLBACK Client(void *arg)
-{
-    PRStatus rv;
-    PRIntn index;
-    char buffer[1024];
-    PRFileDesc *fd = NULL;
-    PRUintn clipping = DEFAULT_CLIPPING;
-    PRThread *me = PR_GetCurrentThread();
-    CSClient_t *client = (CSClient_t*)arg;
-    CSDescriptor_t *descriptor = PR_NEW(CSDescriptor_t);
-    PRIntervalTime timeout = PR_MillisecondsToInterval(DEFAULT_CLIENT_TIMEOUT);
-
-
-    for (index = 0; index < sizeof(buffer); ++index)
-        buffer[index] = (char)index;
-
-    client->started = PR_IntervalNow();
-
-    PR_Lock(client->ml);
-    client->state = cs_run;
-    PR_NotifyCondVar(client->stateChange);
-    PR_Unlock(client->ml);
-
-    TimeOfDayMessage("Client started at", me);
-
-    while (cs_run == client->state)
-    {
-        PRInt32 bytes, descbytes, filebytes, netbytes;
-
-        (void)PR_NetAddrToString(&client->serverAddress, buffer, sizeof(buffer));
-        TEST_LOG(cltsrv_log_file, TEST_LOG_INFO, 
-            ("\tClient(0x%p): connecting to server at %s\n", me, buffer));
-
-        fd = PR_Socket(domain, SOCK_STREAM, protocol);
-        TEST_ASSERT(NULL != fd);
-        rv = PR_Connect(fd, &client->serverAddress, timeout);
-        if (PR_FAILURE == rv)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tClient(0x%p): conection failed (%d, %d)\n",
-                me, PR_GetError(), PR_GetOSError()));
-            goto aborted;
-        }
-
-        memset(descriptor, 0, sizeof(*descriptor));
-        descriptor->size = PR_htonl(descbytes = rand() % clipping);
-        PR_snprintf(
-            descriptor->filename, sizeof(descriptor->filename),
-            "CS%p%p-%p.dat", client->started, me, client->operations);
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tClient(0x%p): sending descriptor for %u bytes\n", me, descbytes));
-        bytes = PR_Send(
-            fd, descriptor, sizeof(*descriptor), SEND_FLAGS, timeout);
-        if (sizeof(CSDescriptor_t) != bytes)
-        {
-            if (Aborted(PR_FAILURE)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\tClient(0x%p): send descriptor timeout\n", me));
-                goto retry;
-            }
-        }
-        TEST_ASSERT(sizeof(*descriptor) == bytes);
-
-        netbytes = 0;
-        while (netbytes < descbytes)
-        {
-            filebytes = sizeof(buffer);
-            if ((descbytes - netbytes) < filebytes)
-                filebytes = descbytes - netbytes;
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\tClient(0x%p): sending %d bytes\n", me, filebytes));
-            bytes = PR_Send(fd, buffer, filebytes, SEND_FLAGS, timeout);
-            if (filebytes != bytes)
-            {
-                if (Aborted(PR_FAILURE)) goto aborted;
-                if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                {
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): send data timeout\n", me));
-                    goto retry;
-                }
-            }
-            TEST_ASSERT(bytes == filebytes);
-            netbytes += bytes;
-        }
-        filebytes = 0;
-        while (filebytes < descbytes)
-        {
-            netbytes = sizeof(buffer);
-            if ((descbytes - filebytes) < netbytes)
-                netbytes = descbytes - filebytes;
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\tClient(0x%p): receiving %d bytes\n", me, netbytes));
-            bytes = PR_Recv(fd, buffer, netbytes, RECV_FLAGS, timeout);
-            if (-1 == bytes)
-            {
-                if (Aborted(PR_FAILURE))
-                {
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive data aborted\n", me));
-                    goto aborted;
-                }
-                else if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive data timeout\n", me));
-				else
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive error (%d, %d)\n",
-						me, PR_GetError(), PR_GetOSError()));
-                goto retry;
-           }
-            if (0 == bytes)
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tClient(0x%p): unexpected end of stream\n",
-                    PR_GetCurrentThread()));
-                break;
-            }
-            filebytes += bytes;
-        }
-
-        rv = PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-        if (Aborted(rv)) goto aborted;
-        TEST_ASSERT(PR_SUCCESS == rv);
-retry:
-        (void)PR_Close(fd); fd = NULL;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_INFO,
-            ("\tClient(0x%p): disconnected from server\n", me));
-
-        PR_Lock(client->ml);
-        client->operations += 1;
-        client->bytesTransferred += 2 * descbytes;
-        rv = PR_WaitCondVar(client->stateChange, rand() % clipping);
-        PR_Unlock(client->ml);
-        if (Aborted(rv)) break;
-    }
-
-aborted:
-    client->stopped = PR_IntervalNow();
-
-    PR_ClearInterrupt();
-    if (NULL != fd) rv = PR_Close(fd);
-
-    PR_Lock(client->ml);
-    client->state = cs_exit;
-    PR_NotifyCondVar(client->stateChange);
-    PR_Unlock(client->ml);
-    PR_DELETE(descriptor);
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("\tClient(0x%p): stopped after %u operations and %u bytes\n",
-        PR_GetCurrentThread(), client->operations, client->bytesTransferred));
-
-}  /* Client */
-
-static PRStatus ProcessRequest(PRFileDesc *fd, CSServer_t *server)
-{
-    PRStatus drv, rv;
-    char buffer[1024];
-    PRFileDesc *file = NULL;
-    PRThread * me = PR_GetCurrentThread();
-    PRInt32 bytes, descbytes, netbytes, filebytes = 0;
-    CSDescriptor_t *descriptor = PR_NEW(CSDescriptor_t);
-    PRIntervalTime timeout = PR_MillisecondsToInterval(DEFAULT_SERVER_TIMEOUT);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\tProcessRequest(0x%p): receiving desciptor\n", me));
-    bytes = PR_Recv(
-        fd, descriptor, sizeof(*descriptor), RECV_FLAGS, timeout);
-    if (-1 == bytes)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto exit;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tProcessRequest(0x%p): receive timeout\n", me));
-        }
-        goto exit;
-    }
-    if (0 == bytes)
-    {
-        rv = PR_FAILURE;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_ERROR,
-            ("\tProcessRequest(0x%p): unexpected end of file\n", me));
-        goto exit;
-    }
-    descbytes = PR_ntohl(descriptor->size);
-    TEST_ASSERT(sizeof(*descriptor) == bytes);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE, 
-        ("\t\tProcessRequest(0x%p): read descriptor {%d, %s}\n",
-        me, descbytes, descriptor->filename));
-
-    file = PR_Open(
-        descriptor->filename, (PR_CREATE_FILE | PR_WRONLY), 0666);
-    if (NULL == file)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto aborted;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tProcessRequest(0x%p): open file timeout\n", me));
-            goto aborted;
-        }
-    }
-    TEST_ASSERT(NULL != file);
-
-    filebytes = 0;
-    while (filebytes < descbytes)
-    {
-        netbytes = sizeof(buffer);
-        if ((descbytes - filebytes) < netbytes)
-            netbytes = descbytes - filebytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): receive %d bytes\n", me, netbytes));
-        bytes = PR_Recv(fd, buffer, netbytes, RECV_FLAGS, timeout);
-        if (-1 == bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): receive data timeout\n", me));
-                goto aborted;
-            }
-            /*
-             * XXX: I got (PR_CONNECT_RESET_ERROR, ERROR_NETNAME_DELETED)
-             * on NT here.  This is equivalent to ECONNRESET on Unix.
-             *     -wtc
-             */
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_WARNING,
-                ("\t\tProcessRequest(0x%p): unexpected error (%d, %d)\n",
-                me, PR_GetError(), PR_GetOSError()));
-            goto aborted;
-        }
-        if(0 == bytes)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_WARNING,
-                ("\t\tProcessRequest(0x%p): unexpected end of stream\n", me));
-            rv = PR_FAILURE;
-            goto aborted;
-        }
-        filebytes += bytes;
-        netbytes = bytes;
-        /* The byte count for PR_Write should be positive */
-        MY_ASSERT(netbytes > 0);
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): write %d bytes to file\n", me, netbytes));
-        bytes = PR_Write(file, buffer, netbytes);
-        if (netbytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): write file timeout\n", me));
-                goto aborted;
-            }
-        }
-        TEST_ASSERT(bytes > 0);
-    }
-
-    PR_Lock(server->ml);
-    server->operations += 1;
-    server->bytesTransferred += filebytes;
-    PR_Unlock(server->ml);
-
-    rv = PR_Close(file);
-    if (Aborted(rv)) goto aborted;
-    TEST_ASSERT(PR_SUCCESS == rv);
-    file = NULL;
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\t\tProcessRequest(0x%p): opening %s\n", me, descriptor->filename));
-    file = PR_Open(descriptor->filename, PR_RDONLY, 0);
-    if (NULL == file)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto aborted;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\t\tProcessRequest(0x%p): open file timeout\n",
-                PR_GetCurrentThread()));
-            goto aborted;
-        }
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_ERROR,
-            ("\t\tProcessRequest(0x%p): other file open error (%u, %u)\n",
-            me, PR_GetError(), PR_GetOSError()));
-        goto aborted;
-    }
-    TEST_ASSERT(NULL != file);
-
-    netbytes = 0;
-    while (netbytes < descbytes)
-    {
-        filebytes = sizeof(buffer);
-        if ((descbytes - netbytes) < filebytes)
-            filebytes = descbytes - netbytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): read %d bytes from file\n", me, filebytes));
-        bytes = PR_Read(file, buffer, filebytes);
-        if (filebytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): read file timeout\n", me));
-            else
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): other file error (%d, %d)\n",
-                    me, PR_GetError(), PR_GetOSError()));
-            goto aborted;
-        }
-        TEST_ASSERT(bytes > 0);
-        netbytes += bytes;
-        filebytes = bytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\t\tProcessRequest(0x%p): sending %d bytes\n", me, filebytes));
-        bytes = PR_Send(fd, buffer, filebytes, SEND_FLAGS, timeout);
-        if (filebytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): send data timeout\n", me));
-                goto aborted;
-            }
-            break;
-        }
-       TEST_ASSERT(bytes > 0);
-    }
-    
-    PR_Lock(server->ml);
-    server->bytesTransferred += filebytes;
-    PR_Unlock(server->ml);
-
-    rv = PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-    if (Aborted(rv)) goto aborted;
-
-    rv = PR_Close(file);
-    if (Aborted(rv)) goto aborted;
-    TEST_ASSERT(PR_SUCCESS == rv);
-    file = NULL;
-
-aborted:
-    PR_ClearInterrupt();
-    if (NULL != file) PR_Close(file);
-    drv = PR_Delete(descriptor->filename);
-    TEST_ASSERT(PR_SUCCESS == drv);
-exit:
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\t\tProcessRequest(0x%p): Finished\n", me));
-
-    PR_DELETE(descriptor);
-
-#if defined(WIN95)
-    PR_Sleep(PR_MillisecondsToInterval(200)); /* lth. see note [1] */
-#endif
-    return rv;
-}  /* ProcessRequest */
-
-static PRStatus CreateWorker(CSServer_t *server, CSPool_t *pool)
-{
-    CSWorker_t *worker = PR_NEWZAP(CSWorker_t);
-    worker->server = server;
-    PR_INIT_CLIST(&worker->element);
-    worker->thread = PR_CreateThread(
-        PR_USER_THREAD, Worker, worker,
-        DEFAULT_SERVER_PRIORITY, thread_scope,
-        PR_UNJOINABLE_THREAD, 0);
-    if (NULL == worker->thread)
-    {
-        PR_DELETE(worker);
-        return PR_FAILURE;
-    }
-
-    TEST_LOG(cltsrv_log_file, TEST_LOG_STATUS, 
-        ("\tCreateWorker(0x%p): create new worker (0x%p)\n",
-        PR_GetCurrentThread(), worker->thread));
-
-    return PR_SUCCESS;
-}  /* CreateWorker */
-
-static void PR_CALLBACK Worker(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr from;
-    PRFileDesc *fd = NULL;
-    PRThread *me = PR_GetCurrentThread();
-    CSWorker_t *worker = (CSWorker_t*)arg;
-    CSServer_t *server = worker->server;
-    CSPool_t *pool = &server->pool;
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_NOTICE,
-        ("\t\tWorker(0x%p): started [%u]\n", me, pool->workers + 1));
-
-    PR_Lock(server->ml);
-    PR_APPEND_LINK(&worker->element, &server->list);
-    pool->workers += 1;  /* define our existance */
-
-    while (cs_run == server->state)
-    {
-        while (pool->accepting >= server->workers.accepting)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\t\tWorker(0x%p): waiting for accept slot[%d]\n",
-                me, pool->accepting));
-            rv = PR_WaitCondVar(pool->acceptComplete, PR_INTERVAL_NO_TIMEOUT);
-            if (Aborted(rv) || (cs_run != server->state))
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_NOTICE,
-                    ("\tWorker(0x%p): has been %s\n",
-                    me, (Aborted(rv) ? "interrupted" : "stopped")));
-                goto exit;
-            }
-        } 
-        pool->accepting += 1;  /* how many are really in accept */
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\t\tWorker(0x%p): calling accept\n", me));
-        fd = PR_Accept(server->listener, &from, PR_INTERVAL_NO_TIMEOUT);
-
-        PR_Lock(server->ml);        
-        pool->accepting -= 1;
-        PR_NotifyCondVar(pool->acceptComplete);
-
-        if ((NULL == fd) && Aborted(PR_FAILURE))
-        {
-            if (NULL != server->listener)
-            {
-                PR_Close(server->listener);
-                server->listener = NULL;
-            }
-            goto exit;
-        }
-
-        if (NULL != fd)
-        {
-            /*
-            ** Create another worker of the total number of workers is
-            ** less than the minimum specified or we have none left in
-            ** accept() AND we're not over the maximum.
-            ** This sort of presumes that the number allowed in accept
-            ** is at least as many as the minimum. Otherwise we'll keep
-            ** creating new threads and deleting them soon after.
-            */
-            PRBool another =
-                ((pool->workers < server->workers.minimum) ||
-                ((0 == pool->accepting)
-                    && (pool->workers < server->workers.maximum))) ?
-                    PR_TRUE : PR_FALSE;
-            pool->active += 1;
-            PR_Unlock(server->ml);
-
-            if (another) (void)CreateWorker(server, pool);
-
-            rv = ProcessRequest(fd, server);
-            if (PR_SUCCESS != rv)
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tWorker(0x%p): server process ended abnormally\n", me));
-            (void)PR_Close(fd); fd = NULL;
-
-            PR_Lock(server->ml);
-            pool->active -= 1;
-        }
-    }
-
-exit:
-    PR_ClearInterrupt();    
-    PR_Unlock(server->ml);
-
-    if (NULL != fd)
-    {
-        (void)PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-        (void)PR_Close(fd);
-    }
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_NOTICE,
-        ("\t\tWorker(0x%p): exiting [%u]\n", PR_GetCurrentThread(), pool->workers));
-
-    PR_Lock(server->ml);
-    pool->workers -= 1;  /* undefine our existance */
-    PR_REMOVE_AND_INIT_LINK(&worker->element);
-    PR_NotifyCondVar(pool->exiting);
-    PR_Unlock(server->ml);
-
-    PR_DELETE(worker);  /* destruction of the "worker" object */
-
-}  /* Worker */
-
-static void PR_CALLBACK Server(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr serverAddress;
-    PRThread *me = PR_GetCurrentThread();
-    CSServer_t *server = (CSServer_t*)arg;
-    PRSocketOptionData sockOpt;
-
-    server->listener = PR_Socket(domain, SOCK_STREAM, protocol);
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    rv = PR_SetSocketOption(server->listener, &sockOpt);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    memset(&serverAddress, 0, sizeof(serverAddress));
-	if (PR_AF_INET6 != domain)
-		rv = PR_InitializeNetAddr(PR_IpAddrAny, DEFAULT_PORT, &serverAddress);
-	else
-		rv = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, DEFAULT_PORT,
-													&serverAddress);
-    rv = PR_Bind(server->listener, &serverAddress);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    rv = PR_Listen(server->listener, server->backlog);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    server->started = PR_IntervalNow();
-    TimeOfDayMessage("Server started at", me);
-
-    PR_Lock(server->ml);
-    server->state = cs_run;
-    PR_NotifyCondVar(server->stateChange);
-    PR_Unlock(server->ml);
-
-    /*
-    ** Create the first worker (actually, a thread that accepts
-    ** connections and then processes the work load as needed).
-    ** From this point on, additional worker threads are created
-    ** as they are needed by existing worker threads.
-    */
-    rv = CreateWorker(server, &server->pool);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    /*
-    ** From here on this thread is merely hanging around as the contact
-    ** point for the main test driver. It's just waiting for the driver
-    ** to declare the test complete.
-    */
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\tServer(0x%p): waiting for state change\n", me));
-
-    PR_Lock(server->ml);
-    while ((cs_run == server->state) && !Aborted(rv))
-    {
-        rv = PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(server->ml);
-    PR_ClearInterrupt();
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_INFO,
-        ("\tServer(0x%p): shutting down workers\n", me));
-
-    /*
-    ** Get all the worker threads to exit. They know how to
-    ** clean up after themselves, so this is just a matter of
-    ** waiting for clorine in the pool to take effect. During
-    ** this stage we're ignoring interrupts.
-    */
-    server->workers.minimum = server->workers.maximum = 0;
-
-    PR_Lock(server->ml);
-    while (!PR_CLIST_IS_EMPTY(&server->list))
-    {
-        PRCList *head = PR_LIST_HEAD(&server->list);
-        CSWorker_t *worker = (CSWorker_t*)head;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tServer(0x%p): interrupting worker(0x%p)\n", me, worker));
-        rv = PR_Interrupt(worker->thread);
-        TEST_ASSERT(PR_SUCCESS == rv);
-        PR_REMOVE_AND_INIT_LINK(head);
-    }
-
-    while (server->pool.workers > 0)
-    {
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE,
-            ("\tServer(0x%p): waiting for %u workers to exit\n",
-            me, server->pool.workers));
-        (void)PR_WaitCondVar(server->pool.exiting, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-    server->state = cs_exit;
-    PR_NotifyCondVar(server->stateChange);
-    PR_Unlock(server->ml);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("\tServer(0x%p): stopped after %u operations and %u bytes\n",
-        me, server->operations, server->bytesTransferred));
-
-    if (NULL != server->listener) PR_Close(server->listener);
-    server->stopped = PR_IntervalNow();
-
-}  /* Server */
-
-static void WaitForCompletion(PRIntn execution)
-{
-    while (execution > 0)
-    { 
-        PRIntn dally = (execution > 30) ? 30 : execution;
-        PR_Sleep(PR_SecondsToInterval(dally));
-        if (pthread_stats) PT_FPrintStats(debug_out, "\nPThread Statistics\n");
-        execution -= dally;
-    }
-}  /* WaitForCompletion */
-
-static void Help(void)
-{
-    PR_fprintf(debug_out, "cltsrv test program usage:\n");
-    PR_fprintf(debug_out, "\t-a <n>       threads allowed in accept        (5)\n");
-    PR_fprintf(debug_out, "\t-b <n>       backlock for listen              (5)\n");
-    PR_fprintf(debug_out, "\t-c <threads> number of clients to create      (1)\n");
-    PR_fprintf(debug_out, "\t-f <low>     low water mark for fd caching    (0)\n");
-    PR_fprintf(debug_out, "\t-F <high>    high water mark for fd caching   (0)\n");
-    PR_fprintf(debug_out, "\t-w <threads> minimal number of server threads (1)\n");
-    PR_fprintf(debug_out, "\t-W <threads> maximum number of server threads (1)\n");
-    PR_fprintf(debug_out, "\t-e <seconds> duration of the test in seconds  (10)\n");
-    PR_fprintf(debug_out, "\t-s <string>  dsn name of server               (localhost)\n");
-    PR_fprintf(debug_out, "\t-G           use GLOBAL threads               (LOCAL)\n");
-    PR_fprintf(debug_out, "\t-X           use XTP as transport             (TCP)\n");
-    PR_fprintf(debug_out, "\t-6           Use IPv6                         (IPv4)\n");
-    PR_fprintf(debug_out, "\t-v           verbosity (accumulative)         (0)\n");
-    PR_fprintf(debug_out, "\t-p           pthread statistics               (FALSE)\n");
-    PR_fprintf(debug_out, "\t-d           debug mode                       (FALSE)\n");
-    PR_fprintf(debug_out, "\t-h           this message\n");
-}  /* Help */
-
-static Verbosity IncrementVerbosity(void)
-{
-    PRIntn verboge = (PRIntn)verbosity + 1;
-    return (Verbosity)verboge;
-}  /* IncrementVerbosity */
-
-PRIntn main(PRIntn argc, char** argv)
-{
-    PRUintn index;
-    PRBool boolean;
-    CSClient_t *client;
-    PRStatus rv, joinStatus;
-    CSServer_t *server = NULL;
-
-    PRUintn backlog = DEFAULT_BACKLOG;
-    PRUintn clients = DEFAULT_CLIENTS;
-    const char *serverName = DEFAULT_SERVER;
-    PRBool serverIsLocal = PR_TRUE;
-    PRUintn accepting = ALLOWED_IN_ACCEPT;
-    PRUintn workersMin = DEFAULT_WORKERS_MIN;
-    PRUintn workersMax = DEFAULT_WORKERS_MAX;
-    PRIntn execution = DEFAULT_EXECUTION_TIME;
-    PRIntn low = DEFAULT_LOW, high = DEFAULT_HIGH;
-
-    /*
-     * -G           use global threads
-     * -a <n>       threads allowed in accept
-     * -b <n>       backlock for listen
-     * -c <threads> number of clients to create
-     * -f <low>     low water mark for caching FDs
-     * -F <high>    high water mark for caching FDs
-     * -w <threads> minimal number of server threads
-     * -W <threads> maximum number of server threads
-     * -e <seconds> duration of the test in seconds
-     * -s <string>  dsn name of server (implies no server here)
-     * -v           verbosity
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "GX6b:a:c:f:F:w:W:e:s:vdhp");
-
-    debug_out = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'X':  /* use XTP as transport */
-            protocol = 36;
-            break;
-        case '6':  /* Use IPv6 */
-            domain = PR_AF_INET6;
-            break;
-        case 'a':  /* the value for accepting */
-            accepting = atoi(opt->value);
-            break;
-        case 'b':  /* the value for backlock */
-            backlog = atoi(opt->value);
-            break;
-        case 'c':  /* number of client threads */
-            clients = atoi(opt->value);
-            break;
-        case 'f':  /* low water fd cache */
-            low = atoi(opt->value);
-            break;
-        case 'F':  /* low water fd cache */
-            high = atoi(opt->value);
-            break;
-        case 'w':  /* minimum server worker threads */
-            workersMin = atoi(opt->value);
-            break;
-        case 'W':  /* maximum server worker threads */
-            workersMax = atoi(opt->value);
-            break;
-        case 'e':  /* program execution time in seconds */
-            execution = atoi(opt->value);
-            break;
-        case 's':  /* server's address */
-            serverName = opt->value;
-            break;
-        case 'v':  /* verbosity */
-            verbosity = IncrementVerbosity();
-            break;
-        case 'd':  /* debug mode */
-            debug_mode = PR_TRUE;
-            break;
-        case 'p':  /* pthread mode */
-            pthread_stats = PR_TRUE;
-            break;
-        case 'h':
-        default:
-            Help();
-            return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (0 != PL_strcmp(serverName, DEFAULT_SERVER)) serverIsLocal = PR_FALSE;
-    if (0 == execution) execution = DEFAULT_EXECUTION_TIME;
-    if (0 == workersMax) workersMax = DEFAULT_WORKERS_MAX;
-    if (0 == workersMin) workersMin = DEFAULT_WORKERS_MIN;
-    if (0 == accepting) accepting = ALLOWED_IN_ACCEPT;
-    if (0 == backlog) backlog = DEFAULT_BACKLOG;
-
-    if (workersMin > accepting) accepting = workersMin;
-
-    PR_STDIO_INIT();
-    TimeOfDayMessage("Client/Server started at", PR_GetCurrentThread());
-
-    cltsrv_log_file = PR_NewLogModule("cltsrv_log");
-    MY_ASSERT(NULL != cltsrv_log_file);
-    boolean = PR_SetLogFile("cltsrv.log");
-    MY_ASSERT(boolean);
-
-#ifdef XP_MAC
-    debug_mode = PR_TRUE;
-#endif
-
-    rv = PR_SetFDCacheSize(low, high);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    if (serverIsLocal)
-    {
-        /* Establish the server */
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_INFO,
-            ("main(0x%p): starting server\n", PR_GetCurrentThread()));
-
-        server = PR_NEWZAP(CSServer_t);
-        PR_INIT_CLIST(&server->list);
-        server->state = cs_init;
-        server->ml = PR_NewLock();
-        server->backlog = backlog;
-        server->port = DEFAULT_PORT;
-        server->workers.minimum = workersMin;
-        server->workers.maximum = workersMax;
-        server->workers.accepting = accepting;
-        server->stateChange = PR_NewCondVar(server->ml);
-        server->pool.exiting = PR_NewCondVar(server->ml);
-        server->pool.acceptComplete = PR_NewCondVar(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE,
-            ("main(0x%p): creating server thread\n", PR_GetCurrentThread()));
-
-        server->thread = PR_CreateThread(
-            PR_USER_THREAD, Server, server, PR_PRIORITY_HIGH,
-            thread_scope, PR_JOINABLE_THREAD, 0);
-        TEST_ASSERT(NULL != server->thread);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): waiting for server init\n", PR_GetCurrentThread()));
-
-        PR_Lock(server->ml);
-        while (server->state == cs_init)
-            PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): server init complete (port #%d)\n",
-            PR_GetCurrentThread(), server->port));
-    }
-
-    if (clients != 0)
-    {
-        /* Create all of the clients */
-        PRHostEnt host;
-        char buffer[BUFFER_SIZE];
-        client = (CSClient_t*)PR_CALLOC(clients * sizeof(CSClient_t));
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): creating %d client threads\n",
-            PR_GetCurrentThread(), clients));
-        
-        if (!serverIsLocal)
-        {
-            rv = PR_GetHostByName(serverName, buffer, BUFFER_SIZE, &host);
-            if (PR_SUCCESS != rv)
-            {
-                PL_FPrintError(PR_STDERR, "PR_GetHostByName");
-                return 2;
-            }
-        }
-
-        for (index = 0; index < clients; ++index)
-        {
-            client[index].state = cs_init;
-            client[index].ml = PR_NewLock();
-            if (serverIsLocal)
-            {
-				if (PR_AF_INET6 != domain)
-                	(void)PR_InitializeNetAddr(
-                    	PR_IpAddrLoopback, DEFAULT_PORT,
-                    	&client[index].serverAddress);
-				else
-					rv = PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET6,
-							DEFAULT_PORT, &client[index].serverAddress);
-            }
-            else
-            {
-                (void)PR_EnumerateHostEnt(
-                    0, &host, DEFAULT_PORT, &client[index].serverAddress);
-            }
-            client[index].stateChange = PR_NewCondVar(client[index].ml);
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_INFO,
-                ("main(0x%p): creating client threads\n", PR_GetCurrentThread()));
-            client[index].thread = PR_CreateThread(
-                PR_USER_THREAD, Client, &client[index], PR_PRIORITY_NORMAL,
-                thread_scope, PR_JOINABLE_THREAD, 0);
-            TEST_ASSERT(NULL != client[index].thread);
-            PR_Lock(client[index].ml);
-            while (cs_init == client[index].state)
-                PR_WaitCondVar(client[index].stateChange, PR_INTERVAL_NO_TIMEOUT);
-            PR_Unlock(client[index].ml);
-        }
-    }
-
-    /* Then just let them go at it for a bit */
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("main(0x%p): waiting for execution interval (%d seconds)\n",
-        PR_GetCurrentThread(), execution));
-
-    WaitForCompletion(execution);
-
-    TimeOfDayMessage("Shutting down", PR_GetCurrentThread());
-
-    if (clients != 0)
-    {
-        for (index = 0; index < clients; ++index)
-        {
-            TEST_LOG(cltsrv_log_file, TEST_LOG_STATUS, 
-                ("main(0x%p): notifying client(0x%p) to stop\n",
-                PR_GetCurrentThread(), client[index].thread));
-
-            PR_Lock(client[index].ml);
-            if (cs_run == client[index].state)
-            {
-                client[index].state = cs_stop;
-                PR_Interrupt(client[index].thread);
-                while (cs_stop == client[index].state)
-                    PR_WaitCondVar(
-                        client[index].stateChange, PR_INTERVAL_NO_TIMEOUT);
-            }
-            PR_Unlock(client[index].ml);
-
-            TEST_LOG(cltsrv_log_file, TEST_LOG_VERBOSE, 
-                ("main(0x%p): joining client(0x%p)\n",
-                PR_GetCurrentThread(), client[index].thread));
-
-		    joinStatus = PR_JoinThread(client[index].thread);
-		    TEST_ASSERT(PR_SUCCESS == joinStatus);
-            PR_DestroyCondVar(client[index].stateChange);
-            PR_DestroyLock(client[index].ml);
-        }
-        PR_DELETE(client);
-    }
-
-    if (NULL != server)
-    {
-        /* All clients joined - retrieve the server */
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE, 
-            ("main(0x%p): notifying server(0x%p) to stop\n",
-            PR_GetCurrentThread(), server->thread));
-
-        PR_Lock(server->ml);
-        server->state = cs_stop;
-        PR_Interrupt(server->thread);
-        while (cs_exit != server->state)
-            PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE, 
-            ("main(0x%p): joining server(0x%p)\n",
-            PR_GetCurrentThread(), server->thread));
-        joinStatus = PR_JoinThread(server->thread);
-        TEST_ASSERT(PR_SUCCESS == joinStatus);
-
-        PR_DestroyCondVar(server->stateChange);
-        PR_DestroyCondVar(server->pool.exiting);
-        PR_DestroyCondVar(server->pool.acceptComplete);
-        PR_DestroyLock(server->ml);
-        PR_DELETE(server);
-    }
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS, 
-        ("main(0x%p): test complete\n", PR_GetCurrentThread()));
-
-    PT_FPrintStats(debug_out, "\nPThread Statistics\n");
-
-    TimeOfDayMessage("Test exiting at", PR_GetCurrentThread());
-    PR_Cleanup();
-    return 0;
-}  /* main */
-
-/* cltsrv.c */
diff --git a/libs/js/nsprpub/pr/tests/concur.c b/libs/js/nsprpub/pr/tests/concur.c
deleted file mode 100644
index 225b2d28d0..0000000000
--- a/libs/js/nsprpub/pr/tests/concur.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:            concur.c 
-** Description:     test of adding and removing concurrency options
-*/
-
-#include "prcvar.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prlock.h"
-#include "prprf.h"
-#include "prmem.h"
-#include "prlog.h"
-
-#include "plgetopt.h"
-
-#if defined(XP_MAC)
-#include "pprio.h"
-#else
-#include "private/pprio.h"
-#endif
-
-#include <stdlib.h>
-
-#define DEFAULT_RANGE 10
-#define DEFAULT_LOOPS 100
-
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-typedef struct Context
-{
-    PRLock *ml;
-    PRCondVar *cv;
-    PRIntn want, have;
-} Context;
-
-
-/*
-** Make the instance of 'context' static (not on the stack)
-** for Win16 threads
-*/
-static Context context = {NULL, NULL, 0, 0};
-
-static void PR_CALLBACK Dull(void *arg)
-{
-    Context *context = (Context*)arg;
-    PR_Lock(context->ml);
-    context->have += 1;
-    while (context->want >= context->have)
-        PR_WaitCondVar(context->cv, PR_INTERVAL_NO_TIMEOUT);
-    context->have -= 1;
-    PR_Unlock(context->ml);
-}  /* Dull */
-
-PRIntn PR_CALLBACK Concur(PRIntn argc, char **argv)
-{
-    PRUintn cpus;
-	PLOptStatus os;
-	PRThread **threads;
-    PRBool debug = PR_FALSE;
-    PRUintn range = DEFAULT_RANGE;
-	PRStatus rc;
-    PRUintn cnt;
-    PRUintn loops = DEFAULT_LOOPS;
-	PRIntervalTime hundredMills = PR_MillisecondsToInterval(100);
-	PLOptState *opt = PL_CreateOptState(argc, argv, "Gdl:r:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* GLOBAL threads */
-			thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'd':  /* debug mode */
-			debug = PR_TRUE;
-            break;
-        case 'r':  /* range limit */
-			range = atoi(opt->value);
-            break;
-        case 'l':  /* loop counter */
-			loops = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (0 == range) range = DEFAULT_RANGE;
-    if (0 == loops) loops = DEFAULT_LOOPS;
-
-    context.ml = PR_NewLock();
-    context.cv = PR_NewCondVar(context.ml);
-
-    if (debug)
-        PR_fprintf(
-            PR_STDERR, "Testing with %d CPUs and %d interations\n", range, loops);
-
-	threads = (PRThread**) PR_CALLOC(sizeof(PRThread*) * range);
-    while (--loops > 0)
-    {
-        for (cpus = 1; cpus <= range; ++cpus)
-        {
-            PR_SetConcurrency(cpus);
-            context.want = cpus;
-
-            threads[cpus - 1] = PR_CreateThread(
-                PR_USER_THREAD, Dull, &context, PR_PRIORITY_NORMAL,
-				      thread_scope, PR_JOINABLE_THREAD, 0);
-        }
-
-        PR_Sleep(hundredMills);
-
-        for (cpus = range; cpus > 0; cpus--)
-        {
-            PR_SetConcurrency(cpus);
-            context.want = cpus - 1;
-
-            PR_Lock(context.ml);
-            PR_NotifyCondVar(context.cv);
-            PR_Unlock(context.ml);
-        }
-		for(cnt = 0; cnt < range; cnt++) {
-			rc = PR_JoinThread(threads[cnt]);
-			PR_ASSERT(rc == PR_SUCCESS);
-		}
-    }
-
-    
-    if (debug)
-        PR_fprintf(
-            PR_STDERR, "Waiting for %d thread(s) to exit\n", context.have);
-
-    while (context.have > 0) PR_Sleep(hundredMills);
-
-    if (debug)
-        PR_fprintf(
-            PR_STDERR, "Finished [want: %d, have: %d]\n",
-            context.want, context.have);
-
-    PR_DestroyLock(context.ml);
-    PR_DestroyCondVar(context.cv);
-    PR_DELETE(threads);
-
-    PR_fprintf(PR_STDERR, "PASSED\n");
-
-    return 0;
-} /* Concur */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PR_STDIO_INIT();
-    return PR_Initialize(Concur, argc, argv, 0);
-}  /* main */
-
-/* concur.c */
diff --git a/libs/js/nsprpub/pr/tests/cvar.c b/libs/js/nsprpub/pr/tests/cvar.c
deleted file mode 100644
index 32d9f1be50..0000000000
--- a/libs/js/nsprpub/pr/tests/cvar.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-** Name: cvar.c
-**
-** Description: Tests Condition Variable Operations 
-**
-** Modification History:
-** 13-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-
-#include "nspr.h"
-
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-PRMonitor *mon;
-#define DEFAULT_COUNT   1000
-PRInt32 count = 0;
-PRIntn debug_mode;
-
-#define kQSIZE	1
-
-typedef struct {
-	PRLock		*bufLock;
-	int			startIdx;
-	int			numFull;
-	PRCondVar	*notFull;
-	PRCondVar	*notEmpty;
-	void		*data[kQSIZE];
-} CircBuf;
-
-static PRBool failed = PR_FALSE;
-
-/*
-** NewCB creates and initializes a new circular buffer.
-*/
-static CircBuf* NewCB(void)
-{
-	CircBuf		*cbp;
-	
-	cbp = PR_NEW(CircBuf);
-	if (cbp == NULL)
-		return (NULL);
-		
-	cbp->bufLock 	= PR_NewLock();
-	cbp->startIdx 	= 0;
-	cbp->numFull 	= 0;
-	cbp->notFull	= PR_NewCondVar(cbp->bufLock);
-	cbp->notEmpty	= PR_NewCondVar(cbp->bufLock);
-	
-	return (cbp);
-}
-
-/*
-** DeleteCB frees a circular buffer.
-*/
-static void DeleteCB(CircBuf *cbp)
-{
-	PR_DestroyLock(cbp->bufLock);
-	PR_DestroyCondVar(cbp->notFull);
-	PR_DestroyCondVar(cbp->notEmpty);
-	PR_DELETE(cbp);
-}
-
-
-/*
-** PutCBData puts new data on the queue.  If the queue is full, it waits 
-** until there is room.
-*/
-static void PutCBData(CircBuf *cbp, void *data)
-{
-	PR_Lock(cbp->bufLock);
-	/* wait while the buffer is full */
-	while (cbp->numFull == kQSIZE)
-		PR_WaitCondVar(cbp->notFull,PR_INTERVAL_NO_TIMEOUT);
-	cbp->data[(cbp->startIdx + cbp->numFull) % kQSIZE] = data;
-	cbp->numFull += 1;
-	
-	/* let a waiting reader know that there is data */
-	PR_NotifyCondVar(cbp->notEmpty);
-	PR_Unlock(cbp->bufLock);
-
-}
-
-
-/*
-** GetCBData gets the oldest data on the queue.  If the queue is empty, it waits 
-** until new data appears.
-*/
-static void* GetCBData(CircBuf *cbp)
-{
-	void *data;
-	
-	PR_Lock(cbp->bufLock);
-	/* wait while the buffer is empty */
-	while (cbp->numFull == 0)
-		PR_WaitCondVar(cbp->notEmpty,PR_INTERVAL_NO_TIMEOUT);
-	data = cbp->data[cbp->startIdx];
-	cbp->startIdx =(cbp->startIdx + 1) % kQSIZE;
-	cbp->numFull -= 1;
-	
-	/* let a waiting writer know that there is room */
-	PR_NotifyCondVar(cbp->notFull);
-	PR_Unlock(cbp->bufLock);
-	
-	return (data);
-}
-
-
-/************************************************************************/
-
-static int alive;
-
-static void PR_CALLBACK CXReader(void *arg)
-{
-	CircBuf *cbp = (CircBuf *)arg;
-    PRInt32 i, n;
-    void *data;
-
-    n = count / 2;
-    for (i = 0; i < n; i++) {
-		data = GetCBData(cbp);
-		if ((int)data != i)
-    		if (debug_mode) printf("data mismatch at for i = %d usec\n", i);
-    }
- 
-    PR_EnterMonitor(mon);
-    --alive;
-    PR_Notify(mon);
-    PR_ExitMonitor(mon);
-}
-
-static void PR_CALLBACK CXWriter(void *arg)
-{
-	CircBuf *cbp = (CircBuf *)arg;
-    PRInt32 i, n;
-
-    n = count / 2;
-    for (i = 0; i < n; i++)
-		PutCBData(cbp, (void *)i);
-
-    PR_EnterMonitor(mon);
-    --alive;
-    PR_Notify(mon);
-    PR_ExitMonitor(mon);
-}
-
-static void CondWaitContextSwitch(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *t1, *t2;
-	CircBuf *cbp;
-
-    PR_EnterMonitor(mon);
-
-    alive = 2;
-
-	cbp =  NewCB();
-
-	t1 = PR_CreateThread(PR_USER_THREAD,
-				      CXReader, cbp, 
-				      PR_PRIORITY_NORMAL,
-				      scope1,
-    				  PR_UNJOINABLE_THREAD,
-				      0);
-	PR_ASSERT(t1);
-	t2 = PR_CreateThread(PR_USER_THREAD,
-				      CXWriter, cbp, 
-				      PR_PRIORITY_NORMAL,
-				      scope2,
-    				  PR_UNJOINABLE_THREAD,
-				      0);
-	PR_ASSERT(t2);
-
-    /* Wait for both of the threads to exit */
-    while (alive) {
-	PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-	DeleteCB(cbp);
-
-    PR_ExitMonitor(mon);
-}
-
-static void CondWaitContextSwitchUU(void)
-{
-    CondWaitContextSwitch(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void CondWaitContextSwitchUK(void)
-{
-    CondWaitContextSwitch(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-static void CondWaitContextSwitchKK(void)
-{
-    CondWaitContextSwitch(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("%40s: %6.2f usec\n", msg, d / count);
-
-    if (0 ==  d) failed = PR_TRUE;
-}
-
-static PRIntn PR_CALLBACK RealMain(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name [-d] [-c n]
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dc:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'c':  /* loop count */
-            count = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (0 == count) count = DEFAULT_COUNT;
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("cvar.log");
-	debug_mode = 1;
-#endif
-
-    mon = PR_NewMonitor();
-
-    Measure(CondWaitContextSwitchUU, "cond var wait context switch- user/user");
-    Measure(CondWaitContextSwitchUK, "cond var wait context switch- user/kernel");
-    Measure(CondWaitContextSwitchKK, "cond var wait context switch- kernel/kernel");
-
-	PR_DestroyMonitor(mon);
-
-	if (debug_mode) printf("%s\n", (failed) ? "FAILED" : "PASSED");
-
-	if(failed)
-		return 1;
-	else
-		return 0;
-}
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/cvar2.c b/libs/js/nsprpub/pr/tests/cvar2.c
deleted file mode 100644
index 4b01cb4bff..0000000000
--- a/libs/js/nsprpub/pr/tests/cvar2.c
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-** Name: cvar2.c
-**
-** Description: Simple test creates several local and global threads;
-**              half use a single,shared condvar, and the
-**              other half have their own condvar. The main thread then loops
-**				notifying them to wakeup. 
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-#include "nspr.h"
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int _debug_on = 0;
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#define DEFAULT_COUNT   100
-#define DEFAULT_THREADS 5
-PRInt32 count = DEFAULT_COUNT;
-
-typedef struct threadinfo {
-    PRThread        *thread;
-    PRInt32          id;
-    PRBool           internal;
-    PRInt32         *tcount;
-    PRLock          *lock;
-    PRCondVar       *cvar;
-    PRIntervalTime   timeout;
-    PRInt32          loops;
-
-    PRLock          *exitlock;
-    PRCondVar       *exitcvar;
-    PRInt32         *exitcount;
-} threadinfo;
-
-/*
-** Make exitcount, tcount static. for Win16.
-*/
-static PRInt32 exitcount=0;
-static PRInt32 tcount=0;
-
-
-/* Thread that gets notified; many threads share the same condvar */
-void PR_CALLBACK
-SharedCondVarThread(void *_info)
-{
-    threadinfo *info = (threadinfo *)_info;
-    PRInt32 index;
-
-    for (index=0; index<info->loops; index++) {
-        PR_Lock(info->lock);
-        if (*info->tcount == 0)
-            PR_WaitCondVar(info->cvar, info->timeout);
-#if 0
-        printf("shared thread %ld notified in loop %ld\n", info->id, index);
-#endif
-        (*info->tcount)--;
-        PR_Unlock(info->lock);
-
-        PR_Lock(info->exitlock);
-        (*info->exitcount)++;
-        PR_NotifyCondVar(info->exitcvar);
-        PR_Unlock(info->exitlock);
-    }
-#if 0
-    printf("shared thread %ld terminating\n", info->id);
-#endif
-}
-
-/* Thread that gets notified; no other threads use the same condvar */
-void PR_CALLBACK
-PrivateCondVarThread(void *_info)
-{
-    threadinfo *info = (threadinfo *)_info;
-    PRInt32 index;
-
-    for (index=0; index<info->loops; index++) {
-        PR_Lock(info->lock);
-        if (*info->tcount == 0) {
-	    DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n",
-				PR_GetCurrentThread(), info->cvar));
-            PR_WaitCondVar(info->cvar, info->timeout);
-	}
-#if 0
-        printf("solo   thread %ld notified in loop %ld\n", info->id, index);
-#endif
-        (*info->tcount)--;
-        PR_Unlock(info->lock);
-
-        PR_Lock(info->exitlock);
-        (*info->exitcount)++;
-        PR_NotifyCondVar(info->exitcvar);
-DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n",
-			PR_GetCurrentThread(), info->exitcvar,(*info->exitcount)));
-        PR_Unlock(info->exitlock);
-    }
-#if 0
-    printf("solo   thread %ld terminating\n", info->id);
-#endif
-}
-
-void 
-CreateTestThread(threadinfo *info, 
-                 PRInt32 id,
-                 PRLock *lock,
-                 PRCondVar *cvar,
-                 PRInt32 loops,
-                 PRIntervalTime timeout,
-                 PRInt32 *tcount,
-                 PRLock *exitlock,
-                 PRCondVar *exitcvar,
-                 PRInt32 *exitcount,
-                 PRBool shared, 
-                 PRThreadScope scope)
-{
-    info->id = id;
-    info->internal = (shared) ? PR_FALSE : PR_TRUE;
-    info->lock = lock;
-    info->cvar = cvar;
-    info->loops = loops;
-    info->timeout = timeout;
-    info->tcount = tcount;
-    info->exitlock = exitlock;
-    info->exitcvar = exitcvar;
-    info->exitcount = exitcount;
-    info->thread = PR_CreateThread(
-                           PR_USER_THREAD,
-                           shared?SharedCondVarThread:PrivateCondVarThread,
-                           info,
-                           PR_PRIORITY_NORMAL,
-                           scope,
-                           PR_JOINABLE_THREAD,
-                           0);
-    if (!info->thread)
-        PL_PrintError("error creating thread\n");
-}
-
-
-void 
-CondVarTestSUU(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    
-    exitcount=0;
-    tcount=0;
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg; ) {
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_LOCAL_THREAD);
-        index++;
-	DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread));
-    }
-
-    for (loops = 0; loops < count; loops++) {
-        /* Notify the threads */
-        for(index=0; index<(arg); index++) {
-            PR_Lock(list[index].lock);
-            (*list[index].tcount)++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-	    DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n",
-				PR_GetCurrentThread(), list[index].cvar));
-        }
-
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg);
-        exitcount -= arg;
-        PR_Unlock(exitlock);
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg); index++) 
-        PR_JoinThread(list[index].thread);
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-}
-
-void 
-CondVarTestSUK(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    exitcount=0;
-    tcount=0;
-
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg; ) {
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_GLOBAL_THREAD);
-        index++;
-    }
-
-    for (loops = 0; loops < count; loops++) {
-        /* Notify the threads */
-        for(index=0; index<(arg); index++) {
-
-            PR_Lock(list[index].lock);
-            (*list[index].tcount)++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-        }
-
-#if 0
-        printf("wait for threads to be done\n");
-#endif
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg);
-        exitcount -= arg;
-        PR_Unlock(exitlock);
-#if 0
-        printf("threads ready\n");
-#endif
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg); index++) 
-        PR_JoinThread(list[index].thread);
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-}
-
-void 
-CondVarTestPUU(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    PRInt32 *tcount, *saved_tcount;
-
-    exitcount=0;
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-    saved_tcount = tcount = (PRInt32 *)PR_CALLOC(sizeof(*tcount) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg; ) {
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_LOCAL_THREAD);
-
-	DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread));
-        index++;
-	tcount++;
-    }
-
-    for (loops = 0; loops < count; loops++) {
-        /* Notify the threads */
-        for(index=0; index<(arg); index++) {
-
-            PR_Lock(list[index].lock);
-            (*list[index].tcount)++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-        }
-
-	PR_Lock(exitlock);
-        /* Wait for threads to finish */
-        while(exitcount < arg) {
-DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n",
-				PR_GetCurrentThread(), exitcvar, exitcount));
-            	PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-	}
-        PR_ASSERT(exitcount >= arg);
-        exitcount -= arg;
-        PR_Unlock(exitlock);
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg); index++)  {
-	DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread));
-        PR_JoinThread(list[index].thread);
-        if (list[index].internal) {
-            PR_Lock(list[index].lock);
-            PR_DestroyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-            PR_DestroyLock(list[index].lock);
-        }
-    }
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-    PR_DELETE(saved_tcount);
-}
-
-void 
-CondVarTestPUK(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    PRInt32 *tcount, *saved_tcount;
-
-    exitcount=0;
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-    saved_tcount = tcount = (PRInt32 *)PR_CALLOC(sizeof(*tcount) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg; ) {
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_GLOBAL_THREAD);
-
-        index++;
-        tcount++;
-    }
-
-    for (loops = 0; loops < count; loops++) {
-        /* Notify the threads */
-        for(index=0; index<(arg); index++) {
-
-            PR_Lock(list[index].lock);
-            (*list[index].tcount)++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-        }
-
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg);
-        exitcount -= arg;
-        PR_Unlock(exitlock);
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg); index++) {
-        PR_JoinThread(list[index].thread);
-        if (list[index].internal) {
-            PR_Lock(list[index].lock);
-            PR_DestroyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-            PR_DestroyLock(list[index].lock);
-        }
-    }
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-    PR_DELETE(saved_tcount);
-}
-
-void 
-CondVarTest(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    PRInt32 *ptcount, *saved_ptcount;
-
-    exitcount=0;
-    tcount=0;
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-    saved_ptcount = ptcount = (PRInt32 *)PR_CALLOC(sizeof(*ptcount) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg*4; ) {
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_LOCAL_THREAD);
-
-        index++;
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_GLOBAL_THREAD);
-
-        index++;
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         ptcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_LOCAL_THREAD);
-        index++;
-	ptcount++;
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_INTERVAL_NO_TIMEOUT,
-                         ptcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_GLOBAL_THREAD);
-
-        index++;
-	ptcount++;
-    }
-
-    for (loops = 0; loops < count; loops++) {
-
-        /* Notify the threads */
-        for(index=0; index<(arg*4); index++) {
-            PR_Lock(list[index].lock);
-            (*list[index].tcount)++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-        }
-
-#if 0
-        printf("wait for threads done\n");
-#endif
-
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg*4)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg*4);
-        exitcount -= arg*4;
-        PR_Unlock(exitlock);
-#if 0
-        printf("threads ready\n");
-#endif
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg*4); index++) {
-        PR_JoinThread(list[index].thread);
-        if (list[index].internal) {
-            PR_Lock(list[index].lock);
-            PR_DestroyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-            PR_DestroyLock(list[index].lock);
-        }
-    }
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-    PR_DELETE(saved_ptcount);
-}
-
-void 
-CondVarTimeoutTest(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg*4; ) {
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_LOCAL_THREAD);
-        index++;
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_GLOBAL_THREAD);
-        index++;
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_LOCAL_THREAD);
-        index++;
-
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_GLOBAL_THREAD);
-
-        index++;
-    }
-
-    for (loops = 0; loops < count; loops++) {
-
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg*4)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg*4);
-        exitcount -= arg*4;
-        PR_Unlock(exitlock);
-    }
-
-
-    /* Join all the threads */
-    for(index=0; index<(arg*4); index++) {
-        PR_JoinThread(list[index].thread);
-        if (list[index].internal) {
-            PR_Lock(list[index].lock);
-            PR_DestroyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-            PR_DestroyLock(list[index].lock);
-        }
-    }
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-    PR_DestroyCondVar(exitcvar);
-    PR_DestroyLock(exitlock);
-
-    PR_DELETE(list);
-}
-
-void 
-CondVarMixedTest(void *_arg)
-{
-    PRInt32 arg = (PRInt32)_arg;
-    PRInt32 index, loops;
-    threadinfo *list;
-    PRLock *sharedlock;
-    PRCondVar *sharedcvar;
-    PRLock *exitlock;
-    PRCondVar *exitcvar;
-    PRInt32 *ptcount;
-
-    exitcount=0;
-    tcount=0;
-    list = (threadinfo *)PR_MALLOC(sizeof(threadinfo) * (arg * 4));
-    ptcount = (PRInt32 *)PR_CALLOC(sizeof(*ptcount) * (arg * 4));
-
-    sharedlock = PR_NewLock();
-    sharedcvar = PR_NewCondVar(sharedlock);
-    exitlock = PR_NewLock();
-    exitcvar = PR_NewCondVar(exitlock);
-
-    /* Create the threads */
-    for(index=0; index<arg*4; ) {
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_LOCAL_THREAD);
-        index++;
-        CreateTestThread(&list[index],
-                         index,
-                         sharedlock,
-                         sharedcvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         &tcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_TRUE,
-                         PR_GLOBAL_THREAD);
-        index++;
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         ptcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_LOCAL_THREAD);
-        index++;
-	ptcount++;
-
-        list[index].lock = PR_NewLock();
-        list[index].cvar = PR_NewCondVar(list[index].lock);
-        CreateTestThread(&list[index],
-                         index,
-                         list[index].lock,
-                         list[index].cvar,
-                         count,
-                         PR_MillisecondsToInterval(50),
-                         ptcount,
-                         exitlock,
-                         exitcvar,
-                         &exitcount,
-                         PR_FALSE,
-                         PR_GLOBAL_THREAD);
-        index++;
-	ptcount++;
-    }
-
-
-    /* Notify every 3rd thread */
-    for (loops = 0; loops < count; loops++) {
-
-        /* Notify the threads */
-        for(index=0; index<(arg*4); index+=3) {
-
-            PR_Lock(list[index].lock);
-            *list[index].tcount++;
-            PR_NotifyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-
-        }
-        /* Wait for threads to finish */
-        PR_Lock(exitlock);
-        while(exitcount < arg*4)
-            PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
-        PR_ASSERT(exitcount >= arg*4);
-        exitcount -= arg*4;
-        PR_Unlock(exitlock);
-    }
-
-    /* Join all the threads */
-    for(index=0; index<(arg*4); index++) {
-        PR_JoinThread(list[index].thread);
-        if (list[index].internal) {
-            PR_Lock(list[index].lock);
-            PR_DestroyCondVar(list[index].cvar);
-            PR_Unlock(list[index].lock);
-            PR_DestroyLock(list[index].lock);
-        }
-    }
-
-    PR_DestroyCondVar(sharedcvar);
-    PR_DestroyLock(sharedlock);
-
-    PR_DELETE(list);
-}
-
-void 
-CondVarCombinedTest(void *arg)
-{
-    PRThread *threads[3];
-
-    threads[0] = PR_CreateThread(PR_USER_THREAD,
-                                 CondVarTest,
-                                 (void *)arg,
-                                 PR_PRIORITY_NORMAL,
-                                 PR_GLOBAL_THREAD,
-                                 PR_JOINABLE_THREAD,
-                                 0);
-    threads[1] = PR_CreateThread(PR_USER_THREAD,
-                                 CondVarTimeoutTest,
-                                 (void *)arg,
-                                 PR_PRIORITY_NORMAL,
-                                 PR_GLOBAL_THREAD,
-                                 PR_JOINABLE_THREAD,
-                                 0);
-    threads[2] = PR_CreateThread(PR_USER_THREAD,
-                                 CondVarMixedTest,
-                                 (void *)arg,
-                                 PR_PRIORITY_NORMAL,
-                                 PR_GLOBAL_THREAD,
-                                 PR_JOINABLE_THREAD,
-                                 0);
-
-    PR_JoinThread(threads[0]);
-    PR_JoinThread(threads[1]);
-    PR_JoinThread(threads[2]);
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void *), PRInt32 arg, const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)((void *)arg);
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    printf("%40s: %6.2f usec\n", msg, d / count);
-}
-
-static PRIntn PR_CALLBACK RealMain(int argc, char **argv)
-{
-    PRInt32 threads, default_threads = DEFAULT_THREADS;
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "vc:t:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'v':  /* debug mode */
-			_debug_on = 1;
-            break;
-        case 'c':  /* loop counter */
-			count = atoi(opt->value);
-            break;
-        case 't':  /* number of threads involved */
-			default_threads = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (0 == count) count = DEFAULT_COUNT;
-    if (0 == default_threads) default_threads = DEFAULT_THREADS;
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("cvar2.log");
-#endif
-
-    printf("\n\
-CondVar Test:                                                           \n\
-                                                                        \n\
-Simple test creates several local and global threads; half use a single,\n\
-shared condvar, and the other half have their own condvar.  The main    \n\
-thread then loops notifying them to wakeup.                             \n\
-                                                                        \n\
-The timeout test is very similar except that the threads are not        \n\
-notified.  They will all wakeup on a 1 second timeout.                  \n\
-                                                                        \n\
-The mixed test combines the simple test and the timeout test; every     \n\
-third thread is notified, the other threads are expected to timeout     \n\
-correctly.                                                              \n\
-                                                                        \n\
-Lastly, the combined test creates a thread for each of the above three  \n\
-cases and they all run simultaneously.                                  \n\
-                                                                        \n\
-This test is run with %d, %d, %d, and %d threads of each type.\n\n",
-default_threads, default_threads*2, default_threads*3, default_threads*4);
-
-    PR_SetConcurrency(2);
-
-    for (threads = default_threads; threads < default_threads*5; threads+=default_threads) {
-        printf("\n%ld Thread tests\n", threads);
-        Measure(CondVarTestSUU, threads, "Condvar simple test shared UU");
-        Measure(CondVarTestSUK, threads, "Condvar simple test shared UK");
-        Measure(CondVarTestPUU, threads, "Condvar simple test priv UU");
-        Measure(CondVarTestPUK, threads, "Condvar simple test priv UK");
-#ifdef XP_MAC
-	/* Mac heaps can't handle thread*4 stack allocations at a time for (10, 15, 20)*4 */
-        Measure(CondVarTest, 5, "Condvar simple test All");
-        Measure(CondVarTimeoutTest, 5,  "Condvar timeout test");
-#else
-        Measure(CondVarTest, threads, "Condvar simple test All");
-        Measure(CondVarTimeoutTest, threads,  "Condvar timeout test");
-#endif
-#if 0
-        Measure(CondVarMixedTest, threads,  "Condvar mixed timeout test");
-        Measure(CondVarCombinedTest, threads, "Combined condvar test");
-#endif
-    }
-
-    printf("PASS\n");
-
-    return 0;
-}
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/dbmalloc.c b/libs/js/nsprpub/pr/tests/dbmalloc.c
deleted file mode 100644
index 4295d0c0e4..0000000000
--- a/libs/js/nsprpub/pr/tests/dbmalloc.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc.c
-**
-** Description: Testing malloc (OBSOLETE)
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include "nspr.h"
-
-void
-usage
-(
-    void
-)
-{
-    fprintf(stderr, "Usage: dbmalloc ('-m'|'-s') '-f' num_fails ('-d'|'-n') filename [...]\n");
-    exit(0);
-}
-
-typedef struct node_struct
-{
-    struct node_struct *next, *prev;
-    int line;
-    char value[4];
-}
-    node_t,
-   *node_pt;
-
-node_pt get_node(const char *line)
-{
-    node_pt rv;
-    int l = strlen(line);
-    rv = (node_pt)PR_MALLOC(sizeof(node_t) + l + 1 - 4);
-    if( (node_pt)0 == rv ) return (node_pt)0;
-    memcpy(&rv->value[0], line, l+1);
-    rv->next = rv->prev = (node_pt)0;
-    return rv;
-}
-
-void
-dump
-(
-    const char *name,
-    node_pt     node,
-    int         mf,
-    int         debug
-)
-{
-    if( (node_pt)0 != node->prev ) dump(name, node->prev, mf, debug);
-    if( 0 != debug ) printf("[%s]: %6d: %s", name, node->line, node->value);
-    if( node->line == mf ) fprintf(stderr, "[%s]: Line %d was allocated!\n", name, node->line);
-    if( (node_pt)0 != node->next ) dump(name, node->next, mf, debug);
-    return;
-}
-
-void
-release
-(
-    node_pt node
-)
-{
-    if( (node_pt)0 != node->prev ) release(node->prev);
-    if( (node_pt)0 != node->next ) release(node->next);
-    PR_DELETE(node);
-}
-
-int
-t2
-(
-    const char *name,
-    int         mf,
-    int         debug
-)
-{
-    int rv;
-    FILE *fp;
-    int l = 0;
-    node_pt head = (node_pt)0;
-    char buffer[ BUFSIZ ];
-
-    fp = fopen(name, "r");
-    if( (FILE *)0 == fp )
-    {
-        fprintf(stderr, "[%s]: Cannot open \"%s.\"\n", name, name);
-        return -1;
-    }
-
-    /* fgets mallocs a buffer, first time through. */
-    if( (char *)0 == fgets(buffer, BUFSIZ, fp) )
-    {
-        fprintf(stderr, "[%s]: \"%s\" is empty.\n", name, name);
-        (void)fclose(fp);
-        return -1;
-    }
-
-    rewind(fp);
-
-    if( PR_SUCCESS != PR_ClearMallocCount() )
-    {
-        fprintf(stderr, "[%s]: Cannot clear malloc count.\n", name);
-        (void)fclose(fp);
-        return -1;
-    }
-
-    if( PR_SUCCESS != PR_SetMallocCountdown(mf) )
-    {
-        fprintf(stderr, "[%s]: Cannot set malloc countdown to %d\n", name, mf);
-        (void)fclose(fp);
-        return -1;
-    }
-
-    while( fgets(buffer, BUFSIZ, fp) )
-    {
-        node_pt n;
-        node_pt *w = &head;
-
-        if( (strlen(buffer) == (BUFSIZ-1)) && (buffer[BUFSIZ-2] != '\n') )
-            buffer[BUFSIZ-2] == '\n';
-
-        l++;
-
-        n = get_node(buffer);
-        if( (node_pt)0 == n ) 
-        {
-            printf("[%s]: Line %d: malloc failure!\n", name, l);
-            continue;
-        }
-
-        n->line = l;
-
-        while( 1 )
-        {
-            int comp;
-
-            if( (node_pt)0 == *w )
-            {
-                *w = n;
-                break;
-            }
-
-            comp = strcmp((*w)->value, n->value);
-            if( comp < 0 ) w = &(*w)->next;
-            else w = &(*w)->prev;
-        }
-    }
-
-    (void)fclose(fp);
-
-    dump(name, head, mf, debug);
-
-    rv = PR_GetMallocCount();
-    PR_ClearMallocCountdown();
-
-    release(head);
-
-    return rv;
-}
-
-int nf = 0;
-int debug = 0;
-
-void
-test
-(
-    const char *name
-)
-{
-    int n, i;
-
-    extern int nf, debug;
-
-    printf("[%s]: starting test 0\n", name);
-    n = t2(name, 0, debug);
-    if( -1 == n ) return;
-    printf("[%s]: test 0 had %ld allocations.\n", name, n);
-
-    if( 0 >= n ) return;
-
-    for( i = 0; i < nf; i++ )
-    {
-        int which = rand() % n;
-        if( 0 == which ) printf("[%s]: starting test %d -- no allocation should fail\n", name, i+1);
-        else printf("[%s]: starting test %d -- allocation %d should fail\n", name, i+1, which);
-        (void)t2(name, which, debug);
-        printf("[%s]: test %d done.\n", name, i+1);
-    }
-
-    return;
-}
-
-int
-main
-(
-    int     argc,
-    char   *argv[]
-)
-{
-    int okay = 0;
-    int multithread = 0;
-
-    struct threadlist
-    {
-        struct threadlist *next;
-        PRThread *thread;
-    }
-        *threadhead = (struct threadlist *)0;
-
-    extern int nf, debug;
-
-    srand(time(0));
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    printf("[main]: We %s using the debugging malloc.\n",
-           PR_IsDebuggingMalloc() ? "ARE" : "ARE NOT");
-
-    while( argv++, --argc )
-    {
-        if( '-' == argv[0][0] )
-        {
-            switch( argv[0][1] )
-            {
-                case 'f':
-                    nf = atoi(argv[0][2] ? &argv[0][2] :
-                              --argc ? *++argv : "0");
-                    break;
-                case 'd':
-                    debug = 1;
-                    break;
-                case 'n':
-                    debug = 0;
-                    break;
-                case 'm':
-                    multithread = 1;
-                    break;
-                case 's':
-                    multithread = 0;
-                    break;
-                default:
-                    usage();
-                    break;
-            }
-        }
-        else
-        {
-            FILE *fp = fopen(*argv, "r");
-            if( (FILE *)0 == fp )
-            {
-                fprintf(stderr, "Cannot open \"%s.\"\n", *argv);
-                continue;
-            }
-
-            okay++;
-            (void)fclose(fp);
-            if( multithread )
-            {
-                struct threadlist *n;
-
-                n = (struct threadlist *)malloc(sizeof(struct threadlist));
-                if( (struct threadlist *)0 == n ) 
-                {
-                    fprintf(stderr, "This is getting tedious. \"%s\"\n", *argv);
-                    continue;
-                }
-
-                n->next = threadhead;
-                n->thread = PR_CreateThread(PR_USER_THREAD, (void (*)(void *))test, 
-                                            *argv, PR_PRIORITY_NORMAL, 
-                                            PR_LOCAL_THREAD, PR_JOINABLE_THREAD,
-                                            0);
-                if( (PRThread *)0 == n->thread )
-                {
-                    fprintf(stderr, "Can't create thread for \"%s.\"\n", *argv);
-                    continue;
-                }
-                else
-                {
-                    threadhead = n;
-                }
-            }
-            else
-            {
-                test(*argv);
-            }
-        }
-    }
-
-    if( okay == 0 ) usage();
-    else while( (struct threadlist *)0 != threadhead )
-    {
-        struct threadlist *x = threadhead->next;
-        (void)PR_JoinThread(threadhead->thread);
-        PR_DELETE(threadhead);
-        threadhead = x;
-    }
-
-    return 0;
-}
-
diff --git a/libs/js/nsprpub/pr/tests/dbmalloc1.c b/libs/js/nsprpub/pr/tests/dbmalloc1.c
deleted file mode 100644
index ca1b4cb1d0..0000000000
--- a/libs/js/nsprpub/pr/tests/dbmalloc1.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc1.c (OBSOLETE)
-**
-** Description: Tests PR_SetMallocCountdown PR_ClearMallocCountdown functions.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-**
-** 12-June-97 AGarcia Revert to return code 0 and 1, remove debug option (obsolete).
-***********************************************************************/
-
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include "nspr.h"
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-/* variable used for both r1 and r2 tests */
-int should_fail =0;
-int actually_failed=0;
-
-
-void
-r1
-(
-    void
-)
-{
-    int i;
-	actually_failed=0;
-    for(  i = 0; i < 5; i++ )
-    {
-        void *x = PR_MALLOC(128);
-        if( (void *)0 == x ) {
-			if (debug_mode) printf("\tMalloc %d failed.\n", i+1);
-			actually_failed = 1;
-		}
-        PR_DELETE(x);
-    }
-
-	if (((should_fail != actually_failed) & (!debug_mode))) failed_already=1;
-
-
-    return;
-}
-
-void
-r2
-(
-    void
-)
-{
-    int i;
-
-    for( i = 0; i <= 5; i++ )
-    {
-		should_fail =0;
-        if( 0 == i ) {
-			if (debug_mode) printf("No malloc should fail:\n");
-		}
-        else {
-			if (debug_mode) printf("Malloc %d should fail:\n", i);
-			should_fail = 1;
-		}
-        PR_SetMallocCountdown(i);
-        r1();
-        PR_ClearMallocCountdown();
-    }
-}
-
-int
-main
-(
-    int     argc,
-    char   *argv[]
-)
-{
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-    r2();
-
-    if(failed_already)    
-        return 1;
-    else
-        return 0;
-
-    
-}
-
diff --git a/libs/js/nsprpub/pr/tests/dceemu.c b/libs/js/nsprpub/pr/tests/dceemu.c
deleted file mode 100644
index bc037c83bc..0000000000
--- a/libs/js/nsprpub/pr/tests/dceemu.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        dceemu.c
-** Description: testing the DCE emulation api
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**             have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**            recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1, remove debug option (obsolete).
-**/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-
-
-#if defined(_PR_DCETHREADS)
-
-#include "prlog.h"
-#include "prinit.h"
-#include "prpdce.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-PRIntn failed_already=0;
-PRIntn debug_mode=0;
-
-static PRIntn prmain(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PRP_NewNakedCondVar();
-    PRIntervalTime tenmsecs = PR_MillisecondsToInterval(10);
-
-    rv = PRP_TryLock(ml);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1; 
-    
-    rv = PRP_TryLock(ml);
-    PR_ASSERT(PR_FAILURE == rv);
-    if ((rv != PR_FAILURE) & (!debug_mode)) failed_already=1; 
-
-    rv = PRP_NakedNotify(cv);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1; 
-
-    rv = PRP_NakedBroadcast(cv);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1; 
-
-    rv = PRP_NakedWait(cv, ml, tenmsecs);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1;     
-
-    PR_Unlock(ml);    
-        
-    rv = PRP_NakedNotify(cv);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1;     
-
-    rv = PRP_NakedBroadcast(cv);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if ((rv != PR_SUCCESS) & (!debug_mode)) failed_already=1;     
-
-    PRP_DestroyNakedCondVar(cv);
-    PR_DestroyLock(ml);
-
-    if (debug_mode) printf("Test succeeded\n");
-
-    return 0;
-
-}  /* prmain */
-
-#endif /* #if defined(_PR_DCETHREADS) */
-
-int main(int argc, char **argv)
-{
-
-#if defined(_PR_DCETHREADS)
-    PR_Initialize(prmain, argc, argv, 0);
-    if(failed_already)    
-        return 1;
-    else
-        return 0;
-#else
-    return 0;
-#endif
-}  /* main */
-
-
-/* decemu.c */
diff --git a/libs/js/nsprpub/pr/tests/depend.c b/libs/js/nsprpub/pr/tests/depend.c
deleted file mode 100644
index e3fb691e51..0000000000
--- a/libs/js/nsprpub/pr/tests/depend.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1996 - Netscape Communications Corporation
-**
-**
-** Name:		depend.c
-** Description: Test to enumerate the dependencies
-*
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-#include "prinit.h"
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static void PrintVersion(
-    const char *msg, const PRVersion* info, PRIntn tab)
-{
-    static const len = 20;
-    static const char *tabs = {"                    "};
-
-    tab *= 2;
-    if (tab > len) tab = len;
-    printf("%s", &tabs[len - tab]);
-    printf("%s ", msg);
-    printf("%s ", info->id);
-    printf("%d.%d", info->major, info->minor);
-    if (0 != info->patch)
-        printf(".p%d", info->patch);
-    printf("\n");
-}  /* PrintDependency */
-
-static void ChaseDependents(const PRVersionInfo *info, PRIntn tab)
-{
-    PrintVersion("exports", &info->selfExport, tab);
-    if (NULL != info->importEnumerator)
-    {
-        const PRDependencyInfo *dependent = NULL;
-        while (NULL != (dependent = info->importEnumerator(dependent)))
-        {
-            const PRVersionInfo *import = dependent->exportInfoFn();
-            PrintVersion("imports", &dependent->importNeeded, tab);
-            ChaseDependents(import, tab + 1);
-        }
-    }
-}  /* ChaseDependents */
-
-static PRVersionInfo hack_export;
-static PRVersionInfo dummy_export;
-static PRDependencyInfo dummy_imports[2];
-
-static const PRVersionInfo *HackExportInfo(void)
-{
-    hack_export.selfExport.major = 11;
-    hack_export.selfExport.minor = 10;
-    hack_export.selfExport.patch = 200;
-    hack_export.selfExport.id = "Hack";
-    hack_export.importEnumerator = NULL;
-    return &hack_export;
-}
-
-static const PRDependencyInfo *DummyImports(
-    const PRDependencyInfo *previous)
-{
-    if (NULL == previous) return &dummy_imports[0];
-    else if (&dummy_imports[0] == previous) return &dummy_imports[1];
-    else if (&dummy_imports[1] == previous) return NULL;
-}  /* DummyImports */
-
-static const PRVersionInfo *DummyLibVersion(void)
-{
-    dummy_export.selfExport.major = 1;
-    dummy_export.selfExport.minor = 0;
-    dummy_export.selfExport.patch = 0;
-    dummy_export.selfExport.id = "Dumbass application";
-    dummy_export.importEnumerator = DummyImports;
-
-    dummy_imports[0].importNeeded.major = 2;
-    dummy_imports[0].importNeeded.minor = 0;
-    dummy_imports[0].importNeeded.patch = 0;
-    dummy_imports[0].importNeeded.id = "Netscape Portable Runtime";
-    dummy_imports[0].exportInfoFn = PR_ExportInfo;
-
-    dummy_imports[1].importNeeded.major = 5;
-    dummy_imports[1].importNeeded.minor = 1;
-    dummy_imports[1].importNeeded.patch = 2;
-    dummy_imports[1].importNeeded.id = "Hack Library";
-    dummy_imports[1].exportInfoFn = HackExportInfo;
-
-    return &dummy_export;
-}  /* DummyLibVersion */
-
-int main(int argc, char **argv)
-{
-    PRIntn tab = 0;
-    const PRVersionInfo *info = DummyLibVersion();
-    const char *buildDate = __DATE__, *buildTime = __TIME__;
-
-    printf("Depend.c build time is %s %s\n", buildDate, buildTime);
-    
-    if (NULL != info) ChaseDependents(info, tab);
-
-    return 0;
-}  /* main */
-
-/* depend.c */
diff --git a/libs/js/nsprpub/pr/tests/dll/.cvsignore b/libs/js/nsprpub/pr/tests/dll/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/tests/dll/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/tests/dll/Makefile.in b/libs/js/nsprpub/pr/tests/dll/Makefile.in
deleted file mode 100644
index 906f531091..0000000000
--- a/libs/js/nsprpub/pr/tests/dll/Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-# Disable optimization of the nspr on SunOS4.1.3
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-endif
-endif
-
-CSRCS = mygetval.c mysetval.c
-
-INCLUDES = -I$(dist_includedir)
-
-OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \
-	$(OBJDIR)/mysetval.$(OBJ_SUFFIX)
-
-ifeq ($(OS_TARGET), WIN16)
-W16OBJS = $(subst $(space),$(comma)$(space),$(OBJS))
-endif
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-# do nothing
-else
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
-RES=$(OBJDIR)/my.res
-RESNAME=../../../pr/src/nspr.rc
-endif
-endif
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-IMPORT_LIBRARY	= $(OBJDIR)/my.$(LIB_SUFFIX)
-SHARED_LIBRARY	= $(OBJDIR)/my.dll
-ifeq ($(OS_ARCH), OS2)
-MAPFILE		= $(OBJDIR)/my.def
-GARBAGE		+= $(MAPFILE)
-MKSHLIB		+= $(MAPFILE)
-endif
-TARGETS		= $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-else
-ifdef MKSHLIB
-SHARED_LIBRARY	= $(OBJDIR)/libmy.$(DLL_SUFFIX)
-endif
-TARGETS		= $(SHARED_LIBRARY)
-endif
-
-#
-# To create a loadable module on Rhapsody, we must override
-# -dynamiclib with -bundle.
-#
-ifeq ($(OS_ARCH),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_TARGET), WIN16)
-# Note: The Win16 target: my.dll requires these macros
-# to be overridden to build the test .dll
-# default values in win16...mk are for release targets.
-#
-OS_DLL_OPTION = NOCASEEXACT
-OS_LIB_FLAGS = -irn
-endif
-
-ifdef SHARED_LIBRARY
-export:: $(TARGETS)
-
-clean::
-	rm -rf $(TARGETS)
-endif
diff --git a/libs/js/nsprpub/pr/tests/dll/my.def b/libs/js/nsprpub/pr/tests/dll/my.def
deleted file mode 100644
index 76cdfd96f0..0000000000
--- a/libs/js/nsprpub/pr/tests/dll/my.def
+++ /dev/null
@@ -1,58 +0,0 @@
-;+#
-;+# ***** BEGIN LICENSE BLOCK *****
-;+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;+#
-;+# The contents of this file are subject to the Mozilla Public License Version
-;+# 1.1 (the "License"); you may not use this file except in compliance with
-;+# the License. You may obtain a copy of the License at
-;+# http://www.mozilla.org/MPL/
-;+#
-;+# Software distributed under the License is distributed on an "AS IS" basis,
-;+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-;+# for the specific language governing rights and limitations under the
-;+# License.
-;+#
-;+# The Original Code is the Netscape Portable Runtime (NSPR).
-;+#
-;+# The Initial Developer of the Original Code is
-;+# Netscape Communications Corporation.
-;+# Portions created by the Initial Developer are Copyright (C) 2002-2003
-;+# the Initial Developer. All Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the terms of
-;+# either the GNU General Public License Version 2 or later (the "GPL"), or
-;+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-;+# in which case the provisions of the GPL or the LGPL are applicable instead
-;+# of those above. If you wish to allow use of your version of this file only
-;+# under the terms of either the GPL or the LGPL, and not to allow others to
-;+# use your version of this file under the terms of the MPL, indicate your
-;+# decision by deleting the provisions above and replace them with the notice
-;+# and other provisions required by the GPL or the LGPL. If you do not delete
-;+# the provisions above, a recipient may use your version of this file under
-;+# the terms of any one of the MPL, the GPL or the LGPL.
-;+#
-;+# ***** END LICENSE BLOCK *****
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX, OS/2 and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#     line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+#
-;+MY_1.0 {
-;+	global:
-LIBRARY my ;-
-EXPORTS ;-
-		My_GetValue;
-		My_SetValue;
-;+	local: *;
-;+};
diff --git a/libs/js/nsprpub/pr/tests/dll/mygetval.c b/libs/js/nsprpub/pr/tests/dll/mygetval.c
deleted file mode 100644
index 17f3679283..0000000000
--- a/libs/js/nsprpub/pr/tests/dll/mygetval.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#if defined(WIN16)
-#include <windows.h>
-#endif
-#include "prtypes.h"
-
-extern PRIntn my_global;
-
-PR_IMPLEMENT(PRIntn) My_GetValue()
-{
-    return my_global;
-}
-
-#if defined(WIN16)
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg, 
-                      WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-    return TRUE;
-}
-#endif /* WIN16 */
-
diff --git a/libs/js/nsprpub/pr/tests/dll/mysetval.c b/libs/js/nsprpub/pr/tests/dll/mysetval.c
deleted file mode 100644
index 982f077654..0000000000
--- a/libs/js/nsprpub/pr/tests/dll/mysetval.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prtypes.h"
-
-PRIntn my_global = 0;
-
-PR_IMPLEMENT(void) My_SetValue(PRIntn val)
-{
-    my_global = val;
-}
diff --git a/libs/js/nsprpub/pr/tests/dlltest.c b/libs/js/nsprpub/pr/tests/dlltest.c
deleted file mode 100644
index f8a5f53b8b..0000000000
--- a/libs/js/nsprpub/pr/tests/dlltest.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dlltest.c
-**
-** Description: test dll functionality.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-#include "prinit.h"
-#include "prlink.h"
-#include "prmem.h"
-#include "prerror.h"
-
-#include "plstr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-typedef PRIntn (PR_CALLBACK *GetFcnType)(void);
-typedef void (PR_CALLBACK *SetFcnType)(PRIntn);
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-int main(int argc, char** argv)
-{
-    PRLibrary *lib, *lib2;  /* two handles to the same library */
-    GetFcnType getFcn;
-    SetFcnType setFcn;
-    PRIntn value;
-    PRStatus status;
-    char *libName;
-
-    if (argc >= 2 && PL_strcmp(argv[1], "-d") == 0) {
-        debug_mode = 1;
-    }
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    /*
-     * Test 1: load the library, look up the symbols, call the functions,
-     * and check the results.
-     */
-
-    libName = PR_GetLibraryName("dll", "my");
-    if (debug_mode) printf("Loading library %s\n", libName);
-    lib = PR_LoadLibrary(libName);
-    PR_FreeLibraryName(libName);
-    if (lib == NULL) {
-        PRInt32 textLength = PR_GetErrorTextLength();
-        char *text = (char*)PR_MALLOC(textLength);
-        (void)PR_GetErrorText(text);
-        fprintf(
-            stderr, "PR_LoadLibrary failed (%d, %d, %s)\n",
-            PR_GetError(), PR_GetOSError(), text);
-        if (!debug_mode) failed_already=1;
-    }
-    getFcn = (GetFcnType) PR_FindSymbol(lib, "My_GetValue");
-    setFcn = (SetFcnType) PR_FindFunctionSymbol(lib, "My_SetValue");
-    (*setFcn)(888);
-    value = (*getFcn)();
-    if (value != 888) {
-        fprintf(stderr, "Test 1 failed: set value to 888, but got %d\n", value);
-        if (!debug_mode) failed_already=1;
-    }
-    if (debug_mode) printf("Test 1 passed\n");
-
-    /*
-     * Test 2: get a second handle to the same library (this should increment
-     * the reference count), look up the symbols, call the functions, and
-     * check the results.
-     */
-
-    getFcn = (GetFcnType) PR_FindSymbolAndLibrary("My_GetValue", &lib2);
-    if (NULL == getFcn || lib != lib2) {
-        fprintf(stderr, "Test 2 failed: handles for the same library are not "
-            "equal: handle 1: %p, handle 2: %p\n", lib, lib2);
-        if (!debug_mode) failed_already=1;
-    }
-    setFcn = (SetFcnType) PR_FindSymbol(lib2, "My_SetValue");
-    value = (*getFcn)();
-    if (value != 888) {
-        fprintf(stderr, "Test 2 failed: value should be 888, but got %d\n",
-            value);
-        if (!debug_mode) failed_already=1;
-    }
-    (*setFcn)(777);
-    value = (*getFcn)();
-    if (value != 777) {
-        fprintf(stderr, "Test 2 failed: set value to 777, but got %d\n", value);
-        if (!debug_mode) failed_already=1;
-        goto exit_now;
-    }
-    if (debug_mode) printf("Test 2 passed\n");
-
-    /*
-     * Test 3: unload the library.  The library should still be accessible
-     * via the second handle.  do the same things as above.
-     */
-
-    status = PR_UnloadLibrary(lib);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "Test 3 failed: cannot unload library: (%d, %d)\n",
-            PR_GetError(), PR_GetOSError());
-        if (!debug_mode) failed_already=1;
-        goto exit_now;
-    }
-    getFcn = (GetFcnType) PR_FindFunctionSymbol(lib2, "My_GetValue");
-    setFcn = (SetFcnType) PR_FindSymbol(lib2, "My_SetValue");
-    (*setFcn)(666);
-    value = (*getFcn)();
-    if (value != 666) {
-        fprintf(stderr, "Test 3 failed: set value to 666, but got %d\n", value);
-        if (!debug_mode) failed_already=1;
-        goto exit_now;
-    }
-    if (debug_mode) printf("Test 3 passed\n");
-
-    /*
-     * Test 4: unload the library, testing the reference count mechanism.
-     */
-
-    status = PR_UnloadLibrary(lib2);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "Test 4 failed: cannot unload library: (%d, %d)\n",
-            PR_GetError(), PR_GetOSError());
-        if (!debug_mode) failed_already=1;
-        goto exit_now;
-    }
-    getFcn = (GetFcnType) PR_FindFunctionSymbolAndLibrary("My_GetValue", &lib2);
-    if (NULL != getFcn) {
-        fprintf(stderr, "Test 4 failed: how can we find a symbol "
-            "in an already unloaded library?\n");
-        if (!debug_mode) failed_already=1;
-        goto exit_now;
-    }
-    if (debug_mode) {
-        printf("Test 4 passed\n");
-    }
-
-    /*
-    ** Test 5: LoadStaticLibrary()
-    */
-    {
-        PRStaticLinkTable   slt[10];
-        PRLibrary           *lib;
-        
-        lib = PR_LoadStaticLibrary( "my.dll", slt );
-        if ( lib == NULL )
-        {
-            fprintf(stderr, "Test 5: LoadStatiLibrary() failed\n" );
-            goto exit_now;
-        }
-        if (debug_mode)
-        {
-            printf("Test 5 passed\n");
-        }
-    }
-
-    goto exit_now;
-exit_now: 
-    PR_Cleanup();
-
-    if (failed_already) {
-        printf("FAILED\n");
-        return 1;
-    } else {
-        printf("PASSED\n");
-        return 0;
-    }
-}
diff --git a/libs/js/nsprpub/pr/tests/dtoa.c b/libs/js/nsprpub/pr/tests/dtoa.c
deleted file mode 100644
index a9258c0279..0000000000
--- a/libs/js/nsprpub/pr/tests/dtoa.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******************************************************************************
- *
- * This file contains a test program for the function conversion functions
- * for double precision code:
- * PR_strtod
- * PR_dtoa
- * PR_cnvtf
- *
- * This file was ns/nspr/tests/dtoa.c, created by rrj on 1996/06/22.
- *
- *****************************************************************************/
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#include <locale.h>
-#include "prprf.h"
-#include "prdtoa.h"
-
-static int failed_already = 0;
-
-int main( int argc, char* argv[] )
-{
-    double num;
-    double num1;
-    double zero = 0.0;
-    char   cnvt[50];
-    
-    num = 1e24;
-    num1 = PR_strtod("1e24",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","1e24");
-        failed_already = 1;
-    }
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("1e+24",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = 0.001e7;
-    num1 = PR_strtod("0.001e7",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","0.001e7");
-        failed_already = 1;
-    }
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("10000",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = 0.0000000000000753;
-    num1 = PR_strtod("0.0000000000000753",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n",
-		"0.0000000000000753");
-        failed_already = 1;
-    }
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("7.53e-14",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = 1.867e73;
-    num1 = PR_strtod("1.867e73",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","1.867e73");
-        failed_already = 1;
-    }
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("1.867e+73",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-
-    num = -1.867e73;
-    num1 = PR_strtod("-1.867e73",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","-1.867e73");
-        failed_already = 1;
-    }
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("-1.867e+73",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = -1.867e-73;
-    num1 = PR_strtod("-1.867e-73",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","-1.867e-73");
-        failed_already = 1;
-    }
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("-1.867e-73",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    /* Testing for infinity */
-    num = 1.0 / zero;
-    num1 = PR_strtod("1.867e765",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","1.867e765");
-        failed_already = 1;
-    }
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("Infinity",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = -1.0 / zero;
-    num1 = PR_strtod("-1.867e765",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n","-1.867e765");
-        failed_already = 1;
-    }
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("-Infinity",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    /* Testing for NaN. PR_strtod can't parse "NaN" and "Infinity" */
-    num = zero / zero;
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("NaN",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = - zero / zero;
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("NaN",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-    num = 1.0000000001e21;
-    num1 = PR_strtod("1.0000000001e21",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n",
-		"1.0000000001e21");
-        failed_already = 1;
-    }
-
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("1.0000000001e+21",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-
-
-    num = -1.0000000001e-21;
-    num1 = PR_strtod("-1.0000000001e-21",NULL);
-    if(num1 != num){
-	fprintf(stderr,"Failed to convert numeric value %s\n",
-		"-1.0000000001e-21");
-        failed_already = 1;
-    }
-    PR_cnvtf(cnvt,sizeof(cnvt),20,num);
-    if(strcmp("-1.0000000001e-21",cnvt) != 0){
-	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
-        failed_already = 1;
-    }
-    if (failed_already) {
-        printf("FAILED\n");
-    } else {
-        printf("PASSED\n");
-    }
-    return failed_already;
-}
diff --git a/libs/js/nsprpub/pr/tests/env.c b/libs/js/nsprpub/pr/tests/env.c
deleted file mode 100644
index ff2ba93702..0000000000
--- a/libs/js/nsprpub/pr/tests/env.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        env.c
-** Description: Testing environment variable operations
-**
-*/
-#include "prenv.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-PRIntn  debug = 0;
-PRIntn  verbose = 0;
-PRBool  failedAlready = PR_FALSE;
-
-#define  ENVNAME    "NSPR_ENVIRONMENT_TEST_VARIABLE"
-#define  ENVVALUE   "The expected result"
-#define  ENVBUFSIZE 256
-
-char    *envBuf; /* buffer pointer. We leak memory here on purpose! */
-
-static char * NewBuffer( size_t size )
-{
-    char *buf = malloc( size );
-    if ( NULL == buf ) {
-        printf("env: NewBuffer() failed\n");
-        exit(1);
-    }
-    return(buf);
-} /* end NewBuffer() */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    char    *value;
-    PRStatus    rc;
-
-    {   /* Get command line options */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "vd");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-                break;
-            case 'v':  /* verbose */
-                verbose = 1;
-                break;
-             default:
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    } /* end block "Get command line options" */
-
-#if 0 
-    {
-        /*
-        ** This uses Windows native environment manipulation
-        ** as an experiment. Note the separation of namespace!
-        */
-        BOOL rv;
-        DWORD   size;
-        rv = SetEnvironmentVariable( ENVNAME, ENVVALUE );
-        if ( rv == 0 )  {
-            if (debug) printf("env: Shit! SetEnvironmentVariable() failed\n");
-            failedAlready = PR_TRUE;
-        }
-        if (verbose) printf("env: SetEnvironmentVariable() worked\n");
-
-        size = GetEnvironmentVariable( ENVNAME, envBuf, ENVBUFSIZE );    
-        if ( size == 0 )  {
-            if (debug) printf("env: Shit! GetEnvironmentVariable() failed. Found: %s\n", envBuf );
-            failedAlready = PR_TRUE;
-        }
-        if (verbose) printf("env: GetEnvironmentVariable() worked. Found: %s\n", envBuf);
-
-        value = PR_GetEnv( ENVNAME );
-        if ( (NULL == value ) || (strcmp( value, ENVVALUE)))  {
-            if (debug) printf( "env: PR_GetEnv() failed retrieving WinNative. Found: %s\n", value);
-            failedAlready = PR_TRUE;
-        }
-        if (verbose) printf("env: PR_GetEnv() worked. Found: %s\n", value);
-    }
-#endif
-
-    /* set an environment variable, read it back */
-    envBuf = NewBuffer( ENVBUFSIZE );
-    sprintf( envBuf, ENVNAME "=" ENVVALUE );
-    rc = PR_SetEnv( envBuf );
-    if ( PR_FAILURE == rc )  {
-        if (debug) printf( "env: PR_SetEnv() failed setting\n");
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf("env: PR_SetEnv() worked.\n");
-    }
-
-    value = PR_GetEnv( ENVNAME );
-    if ( (NULL == value ) || (strcmp( value, ENVVALUE)))  {
-        if (debug) printf( "env: PR_GetEnv() Failed after setting\n" );
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf("env: PR_GetEnv() worked after setting it. Found: %s\n", value );
-    }
-
-/* ---------------------------------------------------------------------- */
-    /* un-set the variable, using RAW name... should not work */
-    envBuf = NewBuffer( ENVBUFSIZE );
-    sprintf( envBuf, ENVNAME );
-    rc = PR_SetEnv( envBuf );
-    if ( PR_FAILURE == rc )  {
-        if (verbose) printf( "env: PR_SetEnv() not un-set using RAW name. Good!\n");
-    } else {
-        if (debug) printf("env: PR_SetEnv() un-set using RAW name. Bad!\n" );
-        failedAlready = PR_TRUE;
-    }
-
-    value = PR_GetEnv( ENVNAME );
-    if ( NULL == value ) {
-        if (debug) printf("env: PR_GetEnv() after un-set using RAW name. Bad!\n" );
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf( "env: PR_GetEnv() after RAW un-set found: %s\n", value );
-    }
-    
-/* ---------------------------------------------------------------------- */
-    /* set it again ... */
-    envBuf = NewBuffer( ENVBUFSIZE );
-    sprintf( envBuf, ENVNAME "=" ENVVALUE );
-    rc = PR_SetEnv( envBuf );
-    if ( PR_FAILURE == rc )  {
-        if (debug) printf( "env: PR_SetEnv() failed setting the second time.\n");
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf("env: PR_SetEnv() worked.\n");
-    }
-
-    /* un-set the variable using the form name= */
-    envBuf = NewBuffer( ENVBUFSIZE );
-    sprintf( envBuf, ENVNAME "=" );
-    rc = PR_SetEnv( envBuf );
-    if ( PR_FAILURE == rc )  {
-        if (debug) printf( "env: PR_SetEnv() failed un-setting using name=\n");
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf("env: PR_SetEnv() un-set using name= worked\n" );
-    }
-
-    value = PR_GetEnv( ENVNAME );
-    if (( NULL == value ) || ( 0x00 == *value )) {
-        if (verbose) printf("env: PR_GetEnv() after un-set using name= worked\n" );
-    } else {
-        if (debug) printf( "env: PR_GetEnv() after un-set using name=. Found: %s\n", value );
-        failedAlready = PR_TRUE;
-    }
-/* ---------------------------------------------------------------------- */
-    /* un-set the variable using the form name= */
-    envBuf = NewBuffer( ENVBUFSIZE );
-    sprintf( envBuf, ENVNAME "999=" );
-    rc = PR_SetEnv( envBuf );
-    if ( PR_FAILURE == rc )  {
-        if (debug) printf( "env: PR_SetEnv() failed un-setting using name=\n");
-        failedAlready = PR_TRUE;
-    } else {
-        if (verbose) printf("env: PR_SetEnv() un-set using name= worked\n" );
-    }
-
-    value = PR_GetEnv( ENVNAME "999" );
-    if (( NULL == value ) || ( 0x00 == *value )) {
-        if (verbose) printf("env: PR_GetEnv() after un-set using name= worked\n" );
-    } else {
-        if (debug) printf( "env: PR_GetEnv() after un-set using name=. Found: %s\n", value );
-        failedAlready = PR_TRUE;
-    }
-
-/* ---------------------------------------------------------------------- */
-    if (debug || verbose) printf("\n%s\n", (failedAlready)? "FAILED" : "PASSED" );
-    return( (failedAlready)? 1 : 0 );
-}  /* main() */
-
-/* env.c */
diff --git a/libs/js/nsprpub/pr/tests/errcodes.c b/libs/js/nsprpub/pr/tests/errcodes.c
deleted file mode 100644
index 76156848fe..0000000000
--- a/libs/js/nsprpub/pr/tests/errcodes.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: errcodes.c
-**
-** Description: print nspr error codes
-**
-*/
-#include "prerror.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-static int _debug_on = 0;
-
-struct errinfo {
-	PRErrorCode errcode;
-	char 		*errname;
-};
-
-struct errinfo errcodes[] = {
-{PR_OUT_OF_MEMORY_ERROR,			"PR_OUT_OF_MEMORY_ERROR"},
-{PR_BAD_DESCRIPTOR_ERROR,			"PR_BAD_DESCRIPTOR_ERROR"},
-{PR_WOULD_BLOCK_ERROR,				"PR_WOULD_BLOCK_ERROR"},
-{PR_ACCESS_FAULT_ERROR,				"PR_ACCESS_FAULT_ERROR"},
-{PR_INVALID_METHOD_ERROR,			"PR_INVALID_METHOD_ERROR"},
-{PR_ILLEGAL_ACCESS_ERROR,			"PR_ILLEGAL_ACCESS_ERROR"},
-{PR_UNKNOWN_ERROR,					"PR_UNKNOWN_ERROR"},
-{PR_PENDING_INTERRUPT_ERROR,		"PR_PENDING_INTERRUPT_ERROR"},
-{PR_NOT_IMPLEMENTED_ERROR,			"PR_NOT_IMPLEMENTED_ERROR"},
-{PR_IO_ERROR,						"PR_IO_ERROR"},
-{PR_IO_TIMEOUT_ERROR,				"PR_IO_TIMEOUT_ERROR"},
-{PR_IO_PENDING_ERROR,				"PR_IO_PENDING_ERROR"},
-{PR_DIRECTORY_OPEN_ERROR,			"PR_DIRECTORY_OPEN_ERROR"},
-{PR_INVALID_ARGUMENT_ERROR,			"PR_INVALID_ARGUMENT_ERROR"},
-{PR_ADDRESS_NOT_AVAILABLE_ERROR,	"PR_ADDRESS_NOT_AVAILABLE_ERROR"},
-{PR_ADDRESS_NOT_SUPPORTED_ERROR,	"PR_ADDRESS_NOT_SUPPORTED_ERROR"},
-{PR_IS_CONNECTED_ERROR,				"PR_IS_CONNECTED_ERROR"},
-{PR_BAD_ADDRESS_ERROR,				"PR_BAD_ADDRESS_ERROR"},
-{PR_ADDRESS_IN_USE_ERROR,			"PR_ADDRESS_IN_USE_ERROR"},
-{PR_CONNECT_REFUSED_ERROR,			"PR_CONNECT_REFUSED_ERROR"},
-{PR_NETWORK_UNREACHABLE_ERROR,		"PR_NETWORK_UNREACHABLE_ERROR"},
-{PR_CONNECT_TIMEOUT_ERROR,			"PR_CONNECT_TIMEOUT_ERROR"},
-{PR_NOT_CONNECTED_ERROR,			"PR_NOT_CONNECTED_ERROR"},
-{PR_LOAD_LIBRARY_ERROR,				"PR_LOAD_LIBRARY_ERROR"},
-{PR_UNLOAD_LIBRARY_ERROR,			"PR_UNLOAD_LIBRARY_ERROR"},
-{PR_FIND_SYMBOL_ERROR,				"PR_FIND_SYMBOL_ERROR"},
-{PR_INSUFFICIENT_RESOURCES_ERROR,	"PR_INSUFFICIENT_RESOURCES_ERROR"},
-{PR_DIRECTORY_LOOKUP_ERROR,			"PR_DIRECTORY_LOOKUP_ERROR"},
-{PR_TPD_RANGE_ERROR,				"PR_TPD_RANGE_ERROR"},
-{PR_PROC_DESC_TABLE_FULL_ERROR,		"PR_PROC_DESC_TABLE_FULL_ERROR"},
-{PR_SYS_DESC_TABLE_FULL_ERROR,		"PR_SYS_DESC_TABLE_FULL_ERROR"},
-{PR_NOT_SOCKET_ERROR,				"PR_NOT_SOCKET_ERROR"},
-{PR_NOT_TCP_SOCKET_ERROR,			"PR_NOT_TCP_SOCKET_ERROR"},
-{PR_SOCKET_ADDRESS_IS_BOUND_ERROR,	"PR_SOCKET_ADDRESS_IS_BOUND_ERROR"},
-{PR_NO_ACCESS_RIGHTS_ERROR,			"PR_NO_ACCESS_RIGHTS_ERROR"},
-{PR_OPERATION_NOT_SUPPORTED_ERROR,	"PR_OPERATION_NOT_SUPPORTED_ERROR"},
-{PR_PROTOCOL_NOT_SUPPORTED_ERROR,	"PR_PROTOCOL_NOT_SUPPORTED_ERROR"},
-{PR_REMOTE_FILE_ERROR,				"PR_REMOTE_FILE_ERROR"},
-{PR_BUFFER_OVERFLOW_ERROR,			"PR_BUFFER_OVERFLOW_ERROR"},
-{PR_CONNECT_RESET_ERROR,			"PR_CONNECT_RESET_ERROR"},
-{PR_RANGE_ERROR,					"PR_RANGE_ERROR"},
-{PR_DEADLOCK_ERROR,					"PR_DEADLOCK_ERROR"},
-{PR_FILE_IS_LOCKED_ERROR,			"PR_FILE_IS_LOCKED_ERROR"},
-{PR_FILE_TOO_BIG_ERROR,				"PR_FILE_TOO_BIG_ERROR"},
-{PR_NO_DEVICE_SPACE_ERROR,			"PR_NO_DEVICE_SPACE_ERROR"},
-{PR_PIPE_ERROR,						"PR_PIPE_ERROR"},
-{PR_NO_SEEK_DEVICE_ERROR,			"PR_NO_SEEK_DEVICE_ERROR"},
-{PR_IS_DIRECTORY_ERROR,				"PR_IS_DIRECTORY_ERROR"},
-{PR_LOOP_ERROR,						"PR_LOOP_ERROR"},
-{PR_NAME_TOO_LONG_ERROR,			"PR_NAME_TOO_LONG_ERROR"},
-{PR_FILE_NOT_FOUND_ERROR,			"PR_FILE_NOT_FOUND_ERROR"},
-{PR_NOT_DIRECTORY_ERROR,			"PR_NOT_DIRECTORY_ERROR"},
-{PR_READ_ONLY_FILESYSTEM_ERROR,		"PR_READ_ONLY_FILESYSTEM_ERROR"},
-{PR_DIRECTORY_NOT_EMPTY_ERROR,		"PR_DIRECTORY_NOT_EMPTY_ERROR"},
-{PR_FILESYSTEM_MOUNTED_ERROR,		"PR_FILESYSTEM_MOUNTED_ERROR"},
-{PR_NOT_SAME_DEVICE_ERROR,			"PR_NOT_SAME_DEVICE_ERROR"},
-{PR_DIRECTORY_CORRUPTED_ERROR,		"PR_DIRECTORY_CORRUPTED_ERROR"},
-{PR_FILE_EXISTS_ERROR,				"PR_FILE_EXISTS_ERROR"},
-{PR_MAX_DIRECTORY_ENTRIES_ERROR,	"PR_MAX_DIRECTORY_ENTRIES_ERROR"},
-{PR_INVALID_DEVICE_STATE_ERROR,		"PR_INVALID_DEVICE_STATE_ERROR"},
-{PR_DEVICE_IS_LOCKED_ERROR,			"PR_DEVICE_IS_LOCKED_ERROR"},
-{PR_NO_MORE_FILES_ERROR,			"PR_NO_MORE_FILES_ERROR"},
-{PR_END_OF_FILE_ERROR,				"PR_END_OF_FILE_ERROR"},
-{PR_FILE_SEEK_ERROR,				"PR_FILE_SEEK_ERROR"},
-{PR_FILE_IS_BUSY_ERROR,				"PR_FILE_IS_BUSY_ERROR"},
-{PR_IN_PROGRESS_ERROR,				"PR_IN_PROGRESS_ERROR"},
-{PR_ALREADY_INITIATED_ERROR,		"PR_ALREADY_INITIATED_ERROR"},
-{PR_GROUP_EMPTY_ERROR,				"PR_GROUP_EMPTY_ERROR"},
-{PR_INVALID_STATE_ERROR,			"PR_INVALID_STATE_ERROR"},
-{PR_NETWORK_DOWN_ERROR,				"PR_NETWORK_DOWN_ERROR"},
-{PR_SOCKET_SHUTDOWN_ERROR,			"PR_SOCKET_SHUTDOWN_ERROR"},
-{PR_CONNECT_ABORTED_ERROR,			"PR_CONNECT_ABORTED_ERROR"},
-{PR_HOST_UNREACHABLE_ERROR,			"PR_HOST_UNREACHABLE_ERROR"}
-};
-
-int
-main(int argc, char **argv)
-{
-
-	int count, errnum;
-
-    /*
-     * -d           debug mode
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-	count = sizeof(errcodes)/sizeof(errcodes[0]);
-	printf("\nNumber of error codes = %d\n\n",count);
-	for (errnum = 0; errnum < count; errnum++) {
-		printf("%-40s = %d\n",errcodes[errnum].errname,
-						errcodes[errnum].errcode);
-	}
-
-	return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/errset.c b/libs/js/nsprpub/pr/tests/errset.c
deleted file mode 100644
index 7d025f12d2..0000000000
--- a/libs/js/nsprpub/pr/tests/errset.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: errset.c
-**
-** Description: errset.c exercises the functions in prerror.c.
-** This code is a unit test of the prerror.c capability.
-**
-** Note: There's some fluff in here. The guts of the test
-** were plagerized from another test. So, sue me.
-**
-**
-*/
-#include "prerror.h"
-#include "plgetopt.h"
-#include "prlog.h"
-
-#include <stdio.h>
-#include <string.h>
-
-static int _debug_on = 0;
-
-struct errinfo {
-	PRErrorCode errcode;
-	char 		*errname;
-};
-
-struct errinfo errcodes[] = {
-{PR_OUT_OF_MEMORY_ERROR,			"PR_OUT_OF_MEMORY_ERROR"},
-{PR_UNKNOWN_ERROR, "An intentionally long error message text intended to force a delete of the current errorString buffer and get another one."},
-{PR_BAD_DESCRIPTOR_ERROR,			"PR_BAD_DESCRIPTOR_ERROR"},
-{PR_WOULD_BLOCK_ERROR,				"PR_WOULD_BLOCK_ERROR"},
-{PR_ACCESS_FAULT_ERROR,				"PR_ACCESS_FAULT_ERROR"},
-{PR_INVALID_METHOD_ERROR,			"PR_INVALID_METHOD_ERROR"},
-{PR_ILLEGAL_ACCESS_ERROR,			"PR_ILLEGAL_ACCESS_ERROR"},
-{PR_UNKNOWN_ERROR,					"PR_UNKNOWN_ERROR"},
-{PR_PENDING_INTERRUPT_ERROR,		"PR_PENDING_INTERRUPT_ERROR"},
-{PR_NOT_IMPLEMENTED_ERROR,			"PR_NOT_IMPLEMENTED_ERROR"},
-{PR_IO_ERROR,						"PR_IO_ERROR"},
-{PR_IO_TIMEOUT_ERROR,				"PR_IO_TIMEOUT_ERROR"},
-{PR_IO_PENDING_ERROR,				"PR_IO_PENDING_ERROR"},
-{PR_DIRECTORY_OPEN_ERROR,			"PR_DIRECTORY_OPEN_ERROR"},
-{PR_INVALID_ARGUMENT_ERROR,			"PR_INVALID_ARGUMENT_ERROR"},
-{PR_ADDRESS_NOT_AVAILABLE_ERROR,	"PR_ADDRESS_NOT_AVAILABLE_ERROR"},
-{PR_ADDRESS_NOT_SUPPORTED_ERROR,	"PR_ADDRESS_NOT_SUPPORTED_ERROR"},
-{PR_IS_CONNECTED_ERROR,				"PR_IS_CONNECTED_ERROR"},
-{PR_BAD_ADDRESS_ERROR,				"PR_BAD_ADDRESS_ERROR"},
-{PR_ADDRESS_IN_USE_ERROR,			"PR_ADDRESS_IN_USE_ERROR"},
-{PR_CONNECT_REFUSED_ERROR,			"PR_CONNECT_REFUSED_ERROR"},
-{PR_NETWORK_UNREACHABLE_ERROR,		"PR_NETWORK_UNREACHABLE_ERROR"},
-{PR_CONNECT_TIMEOUT_ERROR,			"PR_CONNECT_TIMEOUT_ERROR"},
-{PR_NOT_CONNECTED_ERROR,			"PR_NOT_CONNECTED_ERROR"},
-{PR_LOAD_LIBRARY_ERROR,				"PR_LOAD_LIBRARY_ERROR"},
-{PR_UNLOAD_LIBRARY_ERROR,			"PR_UNLOAD_LIBRARY_ERROR"},
-{PR_FIND_SYMBOL_ERROR,				"PR_FIND_SYMBOL_ERROR"},
-{PR_INSUFFICIENT_RESOURCES_ERROR,	"PR_INSUFFICIENT_RESOURCES_ERROR"},
-{PR_DIRECTORY_LOOKUP_ERROR,			"PR_DIRECTORY_LOOKUP_ERROR"},
-{PR_TPD_RANGE_ERROR,				"PR_TPD_RANGE_ERROR"},
-{PR_PROC_DESC_TABLE_FULL_ERROR,		"PR_PROC_DESC_TABLE_FULL_ERROR"},
-{PR_SYS_DESC_TABLE_FULL_ERROR,		"PR_SYS_DESC_TABLE_FULL_ERROR"},
-{PR_NOT_SOCKET_ERROR,				"PR_NOT_SOCKET_ERROR"},
-{PR_NOT_TCP_SOCKET_ERROR,			"PR_NOT_TCP_SOCKET_ERROR"},
-{PR_SOCKET_ADDRESS_IS_BOUND_ERROR,	"PR_SOCKET_ADDRESS_IS_BOUND_ERROR"},
-{PR_NO_ACCESS_RIGHTS_ERROR,			"PR_NO_ACCESS_RIGHTS_ERROR"},
-{PR_OPERATION_NOT_SUPPORTED_ERROR,	"PR_OPERATION_NOT_SUPPORTED_ERROR"},
-{PR_PROTOCOL_NOT_SUPPORTED_ERROR,	"PR_PROTOCOL_NOT_SUPPORTED_ERROR"},
-{PR_REMOTE_FILE_ERROR,				"PR_REMOTE_FILE_ERROR"},
-{PR_BUFFER_OVERFLOW_ERROR,			"PR_BUFFER_OVERFLOW_ERROR"},
-{PR_CONNECT_RESET_ERROR,			"PR_CONNECT_RESET_ERROR"},
-{PR_RANGE_ERROR,					"PR_RANGE_ERROR"},
-{PR_DEADLOCK_ERROR,					"PR_DEADLOCK_ERROR"},
-{PR_FILE_IS_LOCKED_ERROR,			"PR_FILE_IS_LOCKED_ERROR"},
-{PR_FILE_TOO_BIG_ERROR,				"PR_FILE_TOO_BIG_ERROR"},
-{PR_NO_DEVICE_SPACE_ERROR,			"PR_NO_DEVICE_SPACE_ERROR"},
-{PR_PIPE_ERROR,						"PR_PIPE_ERROR"},
-{PR_NO_SEEK_DEVICE_ERROR,			"PR_NO_SEEK_DEVICE_ERROR"},
-{PR_IS_DIRECTORY_ERROR,				"PR_IS_DIRECTORY_ERROR"},
-{PR_LOOP_ERROR,						"PR_LOOP_ERROR"},
-{PR_NAME_TOO_LONG_ERROR,			"PR_NAME_TOO_LONG_ERROR"},
-{PR_FILE_NOT_FOUND_ERROR,			"PR_FILE_NOT_FOUND_ERROR"},
-{PR_NOT_DIRECTORY_ERROR,			"PR_NOT_DIRECTORY_ERROR"},
-{PR_READ_ONLY_FILESYSTEM_ERROR,		"PR_READ_ONLY_FILESYSTEM_ERROR"},
-{PR_DIRECTORY_NOT_EMPTY_ERROR,		"PR_DIRECTORY_NOT_EMPTY_ERROR"},
-{PR_FILESYSTEM_MOUNTED_ERROR,		"PR_FILESYSTEM_MOUNTED_ERROR"},
-{PR_NOT_SAME_DEVICE_ERROR,			"PR_NOT_SAME_DEVICE_ERROR"},
-{PR_DIRECTORY_CORRUPTED_ERROR,		"PR_DIRECTORY_CORRUPTED_ERROR"},
-{PR_FILE_EXISTS_ERROR,				"PR_FILE_EXISTS_ERROR"},
-{PR_MAX_DIRECTORY_ENTRIES_ERROR,	"PR_MAX_DIRECTORY_ENTRIES_ERROR"},
-{PR_INVALID_DEVICE_STATE_ERROR,		"PR_INVALID_DEVICE_STATE_ERROR"},
-{PR_DEVICE_IS_LOCKED_ERROR,			"PR_DEVICE_IS_LOCKED_ERROR"},
-{PR_NO_MORE_FILES_ERROR,			"PR_NO_MORE_FILES_ERROR"},
-{PR_END_OF_FILE_ERROR,				"PR_END_OF_FILE_ERROR"},
-{PR_FILE_SEEK_ERROR,				"PR_FILE_SEEK_ERROR"},
-{PR_FILE_IS_BUSY_ERROR,				"PR_FILE_IS_BUSY_ERROR"},
-{PR_IN_PROGRESS_ERROR,				"PR_IN_PROGRESS_ERROR"},
-{PR_ALREADY_INITIATED_ERROR,		"PR_ALREADY_INITIATED_ERROR"},
-{PR_GROUP_EMPTY_ERROR,				"PR_GROUP_EMPTY_ERROR"},
-{PR_INVALID_STATE_ERROR,			"PR_INVALID_STATE_ERROR"},
-{PR_NETWORK_DOWN_ERROR,				"PR_NETWORK_DOWN_ERROR"},
-{PR_SOCKET_SHUTDOWN_ERROR,			"PR_SOCKET_SHUTDOWN_ERROR"},
-{PR_CONNECT_ABORTED_ERROR,			"PR_CONNECT_ABORTED_ERROR"},
-{PR_HOST_UNREACHABLE_ERROR,			"PR_HOST_UNREACHABLE_ERROR"}
-};
-
-int
-main(int argc, char **argv)
-{
-
-	int count, errnum;
-
-    /*
-     * -d           debug mode
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-	count = sizeof(errcodes)/sizeof(errcodes[0]);
-	printf("\nNumber of error codes = %d\n\n",count);
-	for (errnum = 0; errnum < count; errnum++) {
-        PRInt32 len1, len2, err;
-        char    msg[256];
-
-        PR_SetError( errnum, -5 );
-        err = PR_GetError();
-        PR_ASSERT( err == errnum );
-        err = PR_GetOSError();
-        PR_ASSERT( err == -5 );
-        PR_SetErrorText( strlen(errcodes[errnum].errname), errcodes[errnum].errname );
-        len1 = PR_GetErrorTextLength();
-        len2 = PR_GetErrorText( msg );
-        PR_ASSERT( len1 == len2 );
-        printf("%5.5d -- %s\n", errnum, msg );
-    }
-
-	return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/exit.c b/libs/js/nsprpub/pr/tests/exit.c
deleted file mode 100644
index 6ccbe86d54..0000000000
--- a/libs/js/nsprpub/pr/tests/exit.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prprf.h"
-#include "prinit.h"
-#include "prthread.h"
-#include "prproces.h"
-#include "prinrval.h"
-
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-static PRInt32 dally = 0;
-static PRFileDesc *err = NULL;
-static PRBool verbose = PR_FALSE, force = PR_FALSE;
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: [-t s] [-h]\n");
-    PR_fprintf(err, "\t-d   Verbose output              (default: FALSE)\n");
-    PR_fprintf(err, "\t-x   Forced termination          (default: FALSE)\n");
-    PR_fprintf(err, "\t-t   Time for thread to block    (default: 10 seconds)\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-static void Dull(void *arg)
-{
-    PR_Sleep(PR_SecondsToInterval(dally));
-    if (verbose && force)
-        PR_fprintf(err, "If you see this, the test failed\n");
-}  /* Dull */
-
-static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "ht:dx");
-
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* verbosity */
-            verbose = PR_TRUE;
-            break;
-        case 'x':  /* force exit */
-            force = PR_TRUE;
-            break;
-        case 't':  /* seconds to dally in child */
-            dally = atoi(opt->value);
-            break;
-        case 'h':  /* user wants some guidance */
-        default:
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (0 == dally) dally = 10;
-
-	/*
-	 * Create LOCAL and GLOBAL threads
-	 */
-    (void)PR_CreateThread(
-        PR_USER_THREAD, Dull, NULL, PR_PRIORITY_NORMAL,
-			  PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    (void)PR_CreateThread(
-        PR_USER_THREAD, Dull, NULL, PR_PRIORITY_NORMAL,
-			  PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    if (verbose)
-        PR_fprintf(
-            err, "Main is exiting now. Program should exit %s.\n",
-            (force) ? "immediately" : "after child dally time");
-
-    if (force)
-    {
-        PR_ProcessExit(0);
-        if (verbose)
-        {
-            PR_fprintf(err, "You should not have gotten here.\n");
-            return 1;
-        }
-    }
-    return 0;
-        
-}
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/fdcach.c b/libs/js/nsprpub/pr/tests/fdcach.c
deleted file mode 100644
index 33382fa8a7..0000000000
--- a/libs/js/nsprpub/pr/tests/fdcach.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: fdcach.c
- * Description:
- *   This test verifies that the fd cache and stack are working
- *   correctly.
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * Define ORDER_PRESERVED if the implementation of PR_SetFDCacheSize
- * preserves the ordering of the fd's when moving them between the
- * cache and the stack.
- */
-#define ORDER_PRESERVED 1
-
-/*
- * NUM_FDS must be <= FD_CACHE_SIZE.
- */
-#define FD_CACHE_SIZE 1024
-#define NUM_FDS 20
-
-int main(int argc, char **argv)
-{
-    int i;
-    PRFileDesc *fds[NUM_FDS];
-    PRFileDesc *savefds[NUM_FDS];
-    int numfds = sizeof(fds)/sizeof(fds[0]);
-
-    /*
-     * Switch between cache and stack when they are empty.
-     * Then start with the fd cache.
-     */
-    PR_SetFDCacheSize(0, FD_CACHE_SIZE);
-    PR_SetFDCacheSize(0, 0);
-    PR_SetFDCacheSize(0, FD_CACHE_SIZE);
-
-    /* Add some fd's to the fd cache. */
-    for (i = 0; i < numfds; i++) {
-        savefds[i] = PR_NewTCPSocket();
-        if (NULL == savefds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-    }
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    /*
-     * Create some fd's.  These fd's should come from
-     * the fd cache.  Verify the FIFO ordering of the fd
-     * cache.
-     */
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-        if (fds[i] != savefds[i]) {
-            fprintf(stderr, "fd cache malfunctioned\n");
-            exit(1);
-        }
-    }
-    /* Put the fd's back to the fd cache. */
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    /* Switch to the fd stack. */
-    PR_SetFDCacheSize(0, 0);
-
-    /*
-     * Create some fd's.  These fd's should come from
-     * the fd stack.
-     */
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-#ifdef ORDER_PRESERVED
-        if (fds[i] != savefds[numfds-1-i]) {
-            fprintf(stderr, "fd stack malfunctioned\n");
-            exit(1);
-        }
-#else
-        savefds[numfds-1-i] = fds[i];
-#endif
-    }
-    /* Put the fd's back to the fd stack. */
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    /*
-     * Now create some fd's and verify the LIFO ordering of
-     * the fd stack.
-     */
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-        if (fds[i] != savefds[numfds-1-i]) {
-            fprintf(stderr, "fd stack malfunctioned\n");
-            exit(1);
-        }
-    }
-    /* Put the fd's back to the fd stack. */
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    /* Switch to the fd cache. */
-    PR_SetFDCacheSize(0, FD_CACHE_SIZE);
-
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-#ifdef ORDER_PRESERVED
-        if (fds[i] != savefds[i]) {
-            fprintf(stderr, "fd cache malfunctioned\n");
-            exit(1);
-        }
-#else
-        savefds[i] = fds[i];
-#endif
-    }
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-        if (fds[i] != savefds[i]) {
-            fprintf(stderr, "fd cache malfunctioned\n");
-            exit(1);
-        }
-    }
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    /* Switch to the fd stack. */
-    PR_SetFDCacheSize(0, 0);
-
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-#ifdef ORDER_PRESERVED
-        if (fds[i] != savefds[numfds-1-i]) {
-            fprintf(stderr, "fd stack malfunctioned\n");
-            exit(1);
-        }
-#else
-        savefds[numfds-1-i];
-#endif
-    }
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    for (i = 0; i < numfds; i++) {
-        fds[i] = PR_NewTCPSocket();
-        if (NULL == fds[i]) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-        if (fds[i] != savefds[numfds-1-i]) {
-            fprintf(stderr, "fd stack malfunctioned\n");
-            exit(1);
-        }
-    }
-    for (i = 0; i < numfds; i++) {
-        if (PR_Close(savefds[i]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        } 
-    }
-
-    PR_Cleanup();
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/fileio.c b/libs/js/nsprpub/pr/tests/fileio.c
deleted file mode 100644
index 0b154047ac..0000000000
--- a/libs/js/nsprpub/pr/tests/fileio.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: fileio.c
-**
-** Description: Program to copy one file to another. 
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-** 12-June-97 Revert to return code 0 and 1, remove debug option (obsolete).
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-#include "prinit.h"
-#include "prthread.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "prmon.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prlog.h"
-
-#include <stdio.h>
-
-#ifdef XP_MAC
-#include "prsem.h"
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-
-#define TBSIZE 1024
-
-static PRUint8 tbuf[TBSIZE];
-
-static PRFileDesc *t1, *t2;
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-static void InitialSetup(void)
-{
-	PRUintn	i;
-	PRInt32 nWritten, rv;
-	
-	t1 = PR_Open("t1.tmp", PR_CREATE_FILE | PR_RDWR, 0);
-	PR_ASSERT(t1 != NULL);	
-	
-	for (i=0; i<TBSIZE; i++)
-		tbuf[i] = i;
-		
-	nWritten = PR_Write((PRFileDesc*)t1, tbuf, TBSIZE);
-	PR_ASSERT(nWritten == TBSIZE);	
-   		
-	rv = PR_Seek(t1,0,PR_SEEK_SET);
-	PR_ASSERT(rv == 0);	
-
-   	t2 = PR_Open("t2.tmp", PR_CREATE_FILE | PR_RDWR, 0);
-	PR_ASSERT(t2 != NULL);	
-}
-
-
-static void VerifyAndCleanup(void)
-{
-	PRUintn	i;
-	PRInt32 nRead, rv;
-	
-	for (i=0; i<TBSIZE; i++)
-		tbuf[i] = 0;
-		
-	rv = PR_Seek(t2,0,PR_SEEK_SET);
-	PR_ASSERT(rv == 0);	
-
-	nRead = PR_Read((PRFileDesc*)t2, tbuf, TBSIZE);
-	PR_ASSERT(nRead == TBSIZE);	
-   		
-	for (i=0; i<TBSIZE; i++)
-		if (tbuf[i] != (PRUint8)i) {
-			if (debug_mode) printf("data mismatch for index= %d \n", i);
-			else failed_already=1;
-		}
-   	PR_Close(t1);
-   	PR_Close(t2);
-
-   	PR_Delete("t1.tmp");
-   	PR_Delete("t2.tmp");
-
-    if (debug_mode) printf("fileio test passed\n");
-}
-
-
-/*------------------ Following is the real test program ---------*/
-/*
-	Program to copy one file to another.  Two temporary files get
-	created.  First one gets written in one write call.  Then,
-	a reader thread reads from this file into a double buffer.
-	The writer thread writes from double buffer into the other
-	temporary file.  The second temporary file gets verified
-	for accurate data.
-*/
-
-PRSemaphore	*emptyBufs;	/* number of empty buffers */
-PRSemaphore *fullBufs;	/* number of buffers that are full */
-
-#define BSIZE	100
-
-struct {
-	char data[BSIZE];
-	PRUintn nbytes;		/* number of bytes in this buffer */
-} buf[2];
-
-static void PR_CALLBACK reader(void *arg)
-{
-	PRUintn	i = 0;
-	PRInt32	nbytes;
-	
-	do {
-		(void) PR_WaitSem(emptyBufs);
-		nbytes = PR_Read((PRFileDesc*)arg, buf[i].data, BSIZE);
-		if (nbytes >= 0) {
-			buf[i].nbytes = nbytes;
-			PR_PostSem(fullBufs);
-			i = (i + 1) % 2;
-		}
-	} while (nbytes > 0);
-}
-
-static void PR_CALLBACK writer(void *arg)
-{
-	PRUintn	i = 0;
-	PRInt32	nbytes;
-	
-	do {
-		(void) PR_WaitSem(fullBufs);
-		nbytes = buf[i].nbytes;
-		if (nbytes > 0) {
-			nbytes = PR_Write((PRFileDesc*)arg, buf[i].data, nbytes);
-			PR_PostSem(emptyBufs);
-			i = (i + 1) % 2;
-		}
-	} while (nbytes > 0);
-}
-
-int main(int argc, char **argv)
-{
-	PRThread *r, *w;
-
-
-	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("fileio.log");
-	debug_mode = 1;
-#endif
-
-    emptyBufs = PR_NewSem(2);	/* two empty buffers */
-
-    fullBufs = PR_NewSem(0);	/* zero full buffers */
-
-	/* Create initial temp file setup */
-	InitialSetup();
-	
-	/* create the reader thread */
-	
-	r = PR_CreateThread(PR_USER_THREAD,
-				      reader, t1, 
-				      PR_PRIORITY_NORMAL,
-				      PR_LOCAL_THREAD,
-    				  PR_JOINABLE_THREAD,
-				      0);
-
-	w = PR_CreateThread(PR_USER_THREAD,
-				      writer, t2, 
-				      PR_PRIORITY_NORMAL,
-                      PR_LOCAL_THREAD,
-                      PR_JOINABLE_THREAD,
-                      0);
-
-    /* Do the joining for both threads */
-    (void) PR_JoinThread(r);
-    (void) PR_JoinThread(w);
-
-    /* Do the verification and clean up */
-    VerifyAndCleanup();
-
-    PR_DestroySem(emptyBufs);
-    PR_DestroySem(fullBufs);
-
-    PR_Cleanup();
-
-    if(failed_already)
-    {
-        printf("Fail\n");
-        return 1;
-    }
-    else
-    {
-        printf("PASS\n");
-        return 0;
-    }
-
-
-}
diff --git a/libs/js/nsprpub/pr/tests/foreign.c b/libs/js/nsprpub/pr/tests/foreign.c
deleted file mode 100644
index 7ba4dee99a..0000000000
--- a/libs/js/nsprpub/pr/tests/foreign.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        foreign.c
-** Description: Testing various functions w/ foreign threads
-**
-**      We create a thread and get it to call exactly one runtime function.
-**      The thread is allowed to be created by some other environment that
-**      NSPR, but it does not announce itself to the runtime prior to calling
-**      in.
-**
-**      The goal: try to survive.
-**      
-*/
-
-#include "prcvar.h"
-#include "prenv.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmem.h"
-#include "prthread.h"
-#include "prtypes.h"
-#include "prprf.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static enum {
-    thread_nspr, thread_pthread, thread_uithread, thread_sproc, thread_win32
-} thread_provider;
-
-typedef void (*StartFn)(void*);
-typedef struct StartObject
-{
-    StartFn start;
-    void *arg;
-} StartObject;
-
-static PRFileDesc *output;
-
-static int _debug_on = 0;
-
-#define DEFAULT_THREAD_COUNT	10
-
-#define DPRINTF(arg)	if (_debug_on) PR_fprintf arg
-
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include <pthread.h>
-#include "md/_pth.h"
-static void *pthread_start(void *arg)
-{
-    StartFn start = ((StartObject*)arg)->start;
-    void *data = ((StartObject*)arg)->arg;
-    PR_Free(arg);
-    start(data);
-    return NULL;
-}  /* pthread_start */
-#endif /* defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) */
-
-#if defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-#include <thread.h>
-static void *uithread_start(void *arg)
-{
-    StartFn start = ((StartObject*)arg)->start;
-    void *data = ((StartObject*)arg)->arg;
-    PR_Free(arg);
-    start(data);
-    return NULL;
-}  /* uithread_start */
-#endif /* defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY) */
-
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-#include <sys/types.h>
-#include <sys/prctl.h>
-static void sproc_start(void *arg, PRSize size)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-}  /* sproc_start */
-#endif  /* defined(IRIX) && !defined(_PR_PTHREADS) */
-
-#if defined(WIN32)
-#include <process.h>  /* for _beginthreadex() */
-
-static PRUintn __stdcall windows_start(void *arg)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-    return 0;
-}  /* windows_start */
-#endif /* defined(WIN32) */
-
-static PRStatus CreateThread(StartFn start, void *arg)
-{
-    PRStatus rv;
-
-    switch (thread_provider)
-    {
-    case thread_nspr:
-        {
-            PRThread *thread = PR_CreateThread(
-                PR_USER_THREAD, start, arg,
-                PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-                PR_UNJOINABLE_THREAD, 0);
-            rv = (NULL == thread) ? PR_FAILURE : PR_SUCCESS;
-        }
-        break;
-    case thread_pthread:
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-        {
-            int rv;
-            pthread_t id;
-            pthread_attr_t tattr;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-
-            rv = _PT_PTHREAD_ATTR_INIT(&tattr);
-            PR_ASSERT(0 == rv);
-
-            rv = pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
-            PR_ASSERT(0 == rv);
-
-            rv = pthread_attr_setstacksize(&tattr, 64 * 1024);
-            PR_ASSERT(0 == rv);
-
-            rv = _PT_PTHREAD_CREATE(&id, tattr, pthread_start, start_object);
-            (void)_PT_PTHREAD_ATTR_DESTROY(&tattr);
-            return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-        break;
-#endif /* defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) */
-
-    case thread_uithread:
-#if defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-        {
-            int rv;
-            thread_t id;
-            long flags;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-
-            flags = THR_DETACHED;
-
-            rv = thr_create(NULL, NULL, uithread_start, start_object, flags, &id);
-            return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-        break;
-#endif /* defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY) */
-
-    case thread_sproc:
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-        {
-            PRInt32 pid;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-            pid = sprocsp(
-                sproc_start, PR_SALL, start_object, NULL, 64 * 1024);
-            rv = (0 < pid) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif  /* defined(IRIX) && !defined(_PR_PTHREADS) */
-        break;
-    case thread_win32:
-#if defined(WIN32)
-        {
-            void *th;
-            PRUintn id;       
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-            th = (void*)_beginthreadex(
-                NULL, /* LPSECURITY_ATTRIBUTES - pointer to thread security attributes */  
-                0U, /* DWORD - initial thread stack size, in bytes */
-                windows_start, /* LPTHREAD_START_ROUTINE - pointer to thread function */
-                start_object, /* LPVOID - argument for new thread */
-                0U, /*DWORD dwCreationFlags - creation flags */
-                &id /* LPDWORD - pointer to returned thread identifier */ );
-
-            rv = (NULL == th) ? PR_FAILURE : PR_SUCCESS;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif
-        break;
-    default:
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-    }
-    return rv;
-}  /* CreateThread */
-
-static void PR_CALLBACK lazyEntry(void *arg)
-{
-    PR_ASSERT(NULL == arg);
-}  /* lazyEntry */
-
-
-static void OneShot(void *arg)
-{
-    PRUintn pdkey;
-    PRLock *lock;
-    PRFileDesc *fd;
-    PRDir *dir;
-    PRFileDesc *pair[2];
-    PRIntn test = (PRIntn)arg;
-
-	for (test = 0; test < 12; ++test) {
-
-    switch (test)
-    {
-        case 0:
-            lock = PR_NewLock(); 
-			DPRINTF((output,"Thread[0x%x] called PR_NewLock\n",
-			PR_GetCurrentThread()));
-            PR_DestroyLock(lock);
-            break;
-            
-        case 1:
-            (void)PR_SecondsToInterval(1);
-			DPRINTF((output,"Thread[0x%x] called PR_SecondsToInterval\n",
-			PR_GetCurrentThread()));
-            break;
-            
-        case 2: (void)PR_CreateThread(
-            PR_USER_THREAD, lazyEntry, NULL, PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0); 
-			DPRINTF((output,"Thread[0x%x] called PR_CreateThread\n",
-			PR_GetCurrentThread()));
-            break;
-            
-        case 3:
-            fd = PR_Open("foreign.tmp", PR_CREATE_FILE | PR_RDWR, 0666); 
-			DPRINTF((output,"Thread[0x%x] called PR_Open\n",
-			PR_GetCurrentThread()));
-            PR_Close(fd);
-            break;
-            
-        case 4:
-            fd = PR_NewUDPSocket(); 
-			DPRINTF((output,"Thread[0x%x] called PR_NewUDPSocket\n",
-			PR_GetCurrentThread()));
-            PR_Close(fd);
-            break;
-            
-        case 5:
-            fd = PR_NewTCPSocket(); 
-			DPRINTF((output,"Thread[0x%x] called PR_NewTCPSocket\n",
-			PR_GetCurrentThread()));
-            PR_Close(fd);
-            break;
-            
-        case 6:
-            dir = PR_OpenDir("/tmp/"); 
-			DPRINTF((output,"Thread[0x%x] called PR_OpenDir\n",
-			PR_GetCurrentThread()));
-            PR_CloseDir(dir);
-            break;
-            
-        case 7:
-            (void)PR_NewThreadPrivateIndex(&pdkey, NULL);
-			DPRINTF((output,"Thread[0x%x] called PR_NewThreadPrivateIndex\n",
-			PR_GetCurrentThread()));
-            break;
-        
-        case 8:
-            (void)PR_GetEnv("PATH");
-			DPRINTF((output,"Thread[0x%x] called PR_GetEnv\n",
-			PR_GetCurrentThread()));
-            break;
-            
-        case 9:
-            (void)PR_NewTCPSocketPair(pair);
-			DPRINTF((output,"Thread[0x%x] called PR_NewTCPSocketPair\n",
-			PR_GetCurrentThread()));
-            PR_Close(pair[0]);
-            PR_Close(pair[1]);
-            break;
-            
-        case 10:
-            PR_SetConcurrency(2);
-			DPRINTF((output,"Thread[0x%x] called PR_SetConcurrency\n",
-			PR_GetCurrentThread()));
-            break;
-
-        case 11:
-            PR_SetThreadPriority(PR_GetCurrentThread(), PR_PRIORITY_HIGH);
-			DPRINTF((output,"Thread[0x%x] called PR_SetThreadPriority\n",
-			PR_GetCurrentThread()));
-            break;
-            
-        default: 
-            break;
-    } /* switch() */
-	}
-}  /* OneShot */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-	PRInt32	thread_cnt = DEFAULT_THREAD_COUNT;
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
-
-#if defined(WIN32)
-	thread_provider = thread_win32;
-#elif defined(_PR_PTHREADS)
-	thread_provider = thread_pthread;
-#elif defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-	thread_provider = thread_uithread;
-#elif defined(IRIX)
-	thread_provider = thread_sproc;
-#else
-    thread_provider = thread_nspr;
-#endif
-
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			_debug_on = 1;
-            break;
-        case 't':  /* thread count */
-            thread_cnt = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-	PR_SetConcurrency(2);
-
-	output = PR_GetSpecialFD(PR_StandardOutput);
-
-    while (thread_cnt-- > 0)
-    {
-        rv = CreateThread(OneShot, (void*)thread_cnt);
-        PR_ASSERT(PR_SUCCESS == rv);
-        PR_Sleep(PR_MillisecondsToInterval(5));
-    }
-    PR_Sleep(PR_SecondsToInterval(3));
-    return (PR_SUCCESS == PR_Cleanup()) ? 0 : 1;
-}  /* main */
-
-/* foreign.c */
diff --git a/libs/js/nsprpub/pr/tests/forktest.c b/libs/js/nsprpub/pr/tests/forktest.c
deleted file mode 100644
index ad260ad742..0000000000
--- a/libs/js/nsprpub/pr/tests/forktest.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: forktest.c
-**
-** Description: UNIX test for fork functions.
-**
-** Modification History:
-** 15-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**                 The debug mode will print all of the printfs associated with this test.
-**                         The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**                         have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**                        recognize the return code from tha main program.
-** 12-June-97 AGarcic - Revert to return code 0 and 1, remove debug option (obsolete).
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-PRIntn failed_already=0;
-
-#ifdef XP_UNIX
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
-
-static char *message = "Hello world!";
-
-static void
-ClientThreadFunc(void *arg)
-{
-    PRNetAddr addr;
-    PRFileDesc *sock = NULL;
-    PRInt32 tmp = (PRInt32)arg;
-
-    /*
-     * Make sure the PR_Accept call will block
-     */
-
-    printf("Wait one second before connect\n");
-    fflush(stdout);
-    PR_Sleep(PR_SecondsToInterval(1));
-
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = 0;
-    if ((sock = PR_NewTCPSocket()) == NULL) {
-        fprintf(stderr, "failed to create TCP socket: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    if (PR_Bind(sock, &addr) != PR_SUCCESS) {
-        fprintf(stderr, "PR_Bind failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    addr.inet.ip = PR_htonl(INADDR_LOOPBACK);
-    addr.inet.port = PR_htons((PRInt16)tmp);
-    printf("Connecting to port %hu\n", PR_ntohs(addr.inet.port));
-    fflush(stdout);
-    if (PR_Connect(sock, &addr, PR_SecondsToInterval(5)) !=
-        PR_SUCCESS) {
-        fprintf(stderr, "PR_Connect failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    printf("Writing message \"%s\"\n", message);
-    fflush(stdout);
-    if (PR_Send(sock, message, strlen(message) + 1, 0, PR_INTERVAL_NO_TIMEOUT) ==
-        -1) {
-        fprintf(stderr, "PR_Send failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-finish:
-    if (sock) {
-        PR_Close(sock);
-    }
-    return;
-}
-
-/*
- * DoIO --
- *     This function creates a thread that acts as a client and itself.
- *     acts as a server.  Then it joins the client thread.
- */
-static void
-DoIO(void)
-{
-    PRThread *clientThread;
-    PRFileDesc *listenSock = NULL;
-    PRFileDesc *sock = NULL;
-    PRNetAddr addr;
-    PRInt32 nBytes;
-    char buf[128];
-
-    listenSock = PR_NewTCPSocket();
-    if (!listenSock) {
-        fprintf(stderr, "failed to create a TCP socket: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = 0;
-    if (PR_Bind(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "failed to bind socket: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    if (PR_GetSockName(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "failed to get socket port number: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    clientThread = PR_CreateThread( PR_USER_THREAD, ClientThreadFunc,
-        (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-        PR_JOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-        fprintf(stderr, "Cannot create client thread: (%d, %d)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already = 1;
-        goto finish;
-    }
-    printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
-    fflush(stdout);
-    sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
-    if (!sock) {
-        fprintf(stderr, "PR_Accept failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-    nBytes = PR_Recv(sock, buf, sizeof(buf), 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nBytes == -1) {
-        fprintf(stderr, "PR_Recv failed: error code %d\n",
-            PR_GetError());
-        failed_already = 1;
-        goto finish;
-    }
-
-    /*
-     * Make sure it has proper null byte to mark end of string 
-     */
-
-    buf[sizeof(buf) - 1] = '\0';
-    printf("Received \"%s\" from the client\n", buf);
-    fflush(stdout);
-    if (!strcmp(buf, message)) {
-        PR_JoinThread(clientThread);
-
-        printf("The message is received correctly\n");
-        fflush(stdout);
-    } else {
-        fprintf(stderr, "The message should be \"%s\"\n",
-            message);
-        failed_already = 1;
-    }
-
-finish:
-    if (listenSock) {
-        PR_Close(listenSock);
-    }
-    if (sock) {
-        PR_Close(sock);
-    }
-    return;
-}
-
-#ifdef _PR_DCETHREADS
-
-#include <syscall.h>
-
-pid_t PR_UnixFork1(void)
-{
-    pid_t parent = getpid();
-    int rv = syscall(SYS_fork);
-
-    if (rv == -1) {
-        return (pid_t) -1;
-    } else {
-        /* For each process, rv is the pid of the other process */
-        if (rv == parent) {
-            /* the child */
-            return 0;
-        } else {
-            /* the parent */
-            return rv;
-        }
-    }
-}
-
-#elif defined(SOLARIS)
-
-/*
- * It seems like that in Solaris 2.4 one must call fork1() if the
- * the child process is going to use thread functions.  Solaris 2.5
- * doesn't have this problem. Calling fork() also works. 
- */
-
-pid_t PR_UnixFork1(void)
-{
-    return fork1();
-}
-
-#else
-
-pid_t PR_UnixFork1(void)
-{
-    return fork();
-}
-
-#endif  /* PR_DCETHREADS */
-
-int main(
-int     argc,
-char   *argv[]
-)
-{
-    pid_t pid;
-	int rv;
-
-    /* main test program */
-
-    DoIO();
-
-    pid = PR_UnixFork1();
-
-    if (pid  == (pid_t) -1) {
-        fprintf(stderr, "Fork failed: errno %d\n", errno);
-        failed_already=1;
-        return 1;
-    } else if (pid > 0) {
-        int childStatus;
-
-        printf("Fork succeeded.  Parent process continues.\n");
-        DoIO();
-        if ((rv = waitpid(pid, &childStatus, 0)) != pid) {
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-			/*
-			 * nspr may handle SIGCLD signal
-			 */
-			if ((rv < 0) && (errno == ECHILD)) {
-			} else 
-#endif
-			{
-				fprintf(stderr, "waitpid failed: %d\n", errno);
-				failed_already = 1;
-			}
-        } else if (!WIFEXITED(childStatus)
-                || WEXITSTATUS(childStatus) != 0) {
-            failed_already = 1;
-        }
-        printf("Parent process exits.\n");
-        if (!failed_already) {
-            printf("PASSED\n");
-        } else {
-            printf("FAILED\n");
-        }
-        return failed_already;
-    } else {
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-		extern void _PR_IRIX_CHILD_PROCESS(void);
-		_PR_IRIX_CHILD_PROCESS();
-#endif
-        printf("Fork succeeded.  Child process continues.\n");
-        DoIO();
-        printf("Child process exits.\n");
-        return failed_already;
-    }
-}
-
-#else  /* XP_UNIX */
-
-int main(    int     argc,
-char   *argv[]
-)
-{
-
-    printf("The fork test is applicable to Unix only.\n");
-    return 0;
-
-}
-
-#endif  /* XP_UNIX */
diff --git a/libs/js/nsprpub/pr/tests/formattm.c b/libs/js/nsprpub/pr/tests/formattm.c
deleted file mode 100644
index c3c758b5f2..0000000000
--- a/libs/js/nsprpub/pr/tests/formattm.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* A test program for PR_FormatTime and PR_FormatTimeUSEnglish */
-
-#include "prtime.h"
-
-#include <stdio.h>
-
-int main()
-{
-    char buffer[256];
-    PRTime now;
-    PRExplodedTime tod;
-
-    now = PR_Now();
-    PR_ExplodeTime(now, PR_LocalTimeParameters, &tod);
-    (void)PR_FormatTime(buffer, sizeof(buffer),
-        "%a %b %d %H:%M:%S %Z %Y", &tod);
-    printf("%s\n", buffer);
-    (void)PR_FormatTimeUSEnglish(buffer, sizeof(buffer),
-        "%a %b %d %H:%M:%S %Z %Y", &tod);
-    printf("%s\n", buffer);
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/freeif.c b/libs/js/nsprpub/pr/tests/freeif.c
deleted file mode 100644
index 7aa16b491e..0000000000
--- a/libs/js/nsprpub/pr/tests/freeif.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A test to see if the macros PR_DELETE and PR_FREEIF are
- * properly defined.  (See Bugzilla bug #39110.)
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static void Noop(void) { }
-
-static void Fail(void)
-{
-    printf("FAIL\n");
-    exit(1);
-}
-
-int main()
-{
-    int foo = 1;
-    char *ptr = NULL;
-
-    /* this fails to compile with the old definition of PR_DELETE */
-    if (foo)
-        PR_DELETE(ptr);
-    else
-        Noop();
-
-    /* this nests incorrectly with the old definition of PR_FREEIF */
-    if (foo)
-        PR_FREEIF(ptr);
-    else
-        Fail();
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/fsync.c b/libs/js/nsprpub/pr/tests/fsync.c
deleted file mode 100644
index cea298b3e4..0000000000
--- a/libs/js/nsprpub/pr/tests/fsync.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prmem.h"
-#include "prprf.h"
-#include "prinrval.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-static PRFileDesc *err = NULL;
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: [-S] [-K <n>] [-h] <filename>\n");
-    PR_fprintf(err, "\t-c   Nuber of iterations     (default: 10)\n");
-    PR_fprintf(err, "\t-S   Sync the file           (default: FALSE)\n");
-    PR_fprintf(err, "\t-K   Size of file (K bytes)  (default: 10)\n");
-    PR_fprintf(err, "\t     Name of file to write   (default: /usr/tmp/sync.dat)\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PLOptStatus os;
-    PRUint8 *buffer;
-    PRFileDesc *file = NULL;
-    const char *filename = "sync.dat";
-    PRUint32 index, loops, iterations = 10, filesize = 10;
-    PRIntn flags = PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hSK:c:");
-    PRIntervalTime time, total = 0, shortest = 0x7fffffff, longest = 0;
-
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:       /* Name of file to create */
-            filename = opt->value;
-            break;
-        case 'S':       /* Use sych option on file */
-            flags |= PR_SYNC;
-            break;
-        case 'K':       /* Size of file to write */
-            filesize = atoi(opt->value);
-            break;
-        case 'c':       /* Number of iterations */
-            iterations = atoi(opt->value);
-            break;
-        case 'h':       /* user wants some guidance */
-        default:        /* user needs some guidance */
-            Help();     /* so give him an earful */
-            return 2;   /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    file = PR_Open(filename, flags, 0666);
-    if (NULL == file)
-    {
-        PL_FPrintError(err, "Failed to open file");
-        return 1;
-    }
-
-    buffer = (PRUint8*)PR_CALLOC(1024);
-    if (NULL == buffer)
-    {
-        PL_FPrintError(err, "Cannot allocate buffer");
-        return 1;
-    }
-
-    for (index = 0; index < sizeof(buffer); ++index)
-        buffer[index] = (PRUint8)index;
-
-    for (loops = 0; loops < iterations; ++loops)
-    {
-        time = PR_IntervalNow();
-        for (index = 0; index < filesize; ++index)
-        {
-            PR_Write(file, buffer, 1024);
-        }
-        time = (PR_IntervalNow() - time);
-
-        total += time;
-        if (time < shortest) shortest = time;
-        else if (time > longest) longest = time;
-        if (0 != PR_Seek(file, 0, PR_SEEK_SET))
-        {
-           PL_FPrintError(err, "Rewinding file");
-           return 1;
-        }
-    }
-
-    total = total / iterations;
-    PR_fprintf(
-        err, "%u iterations over a %u kbyte %sfile: %u [%u] %u\n",
-        iterations, filesize, ((flags & PR_SYNC) ? "SYNCH'd " : ""),
-        PR_IntervalToMicroseconds(shortest),
-        PR_IntervalToMicroseconds(total),
-        PR_IntervalToMicroseconds(longest));
-
-    PR_DELETE(buffer);
-    rv = PR_Close(file);
-    if (PR_SUCCESS != rv)
-    {
-        PL_FPrintError(err, "Closing file failed");
-        return 1;
-    }
-    rv = PR_Delete(filename);
-    if (PR_SUCCESS != rv)
-    {
-        PL_FPrintError(err, "Deleting file failed");
-        return 1;
-    }
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/getai.c b/libs/js/nsprpub/pr/tests/getai.c
deleted file mode 100644
index bc4a59a7de..0000000000
--- a/libs/js/nsprpub/pr/tests/getai.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[])
-{
-    PRAddrInfo *ai;
-    void *iter;
-    PRNetAddr addr;
-
-    ai = PR_GetAddrInfoByName(argv[1], PR_AF_UNSPEC, PR_AI_ADDRCONFIG);
-    if (ai == NULL) {
-        fprintf(stderr, "PR_GetAddrInfoByName failed: (%d, %d)\n",
-            PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    printf("%s\n", PR_GetCanonNameFromAddrInfo(ai));
-    iter = NULL;
-    while ((iter = PR_EnumerateAddrInfo(iter, ai, 0, &addr)) != NULL) {
-        char buf[128];
-        PR_NetAddrToString(&addr, buf, sizeof buf);
-        printf("%s\n", buf);
-    }
-    PR_FreeAddrInfo(ai);
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/gethost.c b/libs/js/nsprpub/pr/tests/gethost.c
deleted file mode 100644
index 3af41a3fcb..0000000000
--- a/libs/js/nsprpub/pr/tests/gethost.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: gethost.c
- *
- * Description: tests various functions in prnetdb.h
- *
- * Usage: gethost [-6] [hostname]
- */
-
-#include "prio.h"
-#include "prnetdb.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define DEFAULT_HOST_NAME "mcom.com"
-
-static void Help(void)
-{
-    fprintf(stderr, "Usage: gethost [-h] [hostname]\n");
-    fprintf(stderr, "\t-h          help\n");
-    fprintf(stderr, "\thostname    Name of host    (default: %s)\n",
-            DEFAULT_HOST_NAME);
-}  /* Help */
-
-/*
- * Prints the contents of a PRHostEnt structure
- */
-void PrintHostent(const PRHostEnt *he)
-{
-    int i;
-    int j;
-
-    printf("h_name: %s\n", he->h_name);
-    for (i = 0; he->h_aliases[i]; i++) {
-        printf("h_aliases[%d]: %s\n", i, he->h_aliases[i]);
-    }
-    printf("h_addrtype: %d\n", he->h_addrtype);
-    printf("h_length: %d\n", he->h_length);
-    for (i = 0; he->h_addr_list[i]; i++) {
-        printf("h_addr_list[%d]: ", i);
-        for (j = 0; j < he->h_length; j++) {
-            if (j != 0) printf(".");
-            printf("%u", (unsigned char)he->h_addr_list[i][j]);
-        }
-        printf("\n");
-    }
-}
-
-int main(int argc, char **argv)
-{
-    const char *hostName = DEFAULT_HOST_NAME;
-    PRHostEnt he, reversehe;
-    char buf[PR_NETDB_BUF_SIZE];
-    char reversebuf[PR_NETDB_BUF_SIZE];
-    PRIntn idx;
-    PRNetAddr addr;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "h");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 0:  /* naked */
-                hostName = opt->value;
-                break;
-            case 'h':  /* Help message */
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (PR_GetHostByName(hostName, buf, sizeof(buf), &he) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetHostByName failed\n");
-        exit(1);
-    }
-    PrintHostent(&he);
-    idx = 0;
-    while (1) {
-        idx = PR_EnumerateHostEnt(idx, &he, 0, &addr);
-        if (idx == -1) {
-            fprintf(stderr, "PR_EnumerateHostEnt failed\n");
-            exit(1);
-        }
-        if (idx == 0) break;  /* normal loop termination */
-        printf("reverse lookup\n");
-        if (PR_GetHostByAddr(&addr, reversebuf, sizeof(reversebuf),
-                &reversehe) == PR_FAILURE) {
-            fprintf(stderr, "PR_GetHostByAddr failed\n");
-            exit(1);
-        }
-        PrintHostent(&reversehe);
-    }
-
-    printf("PR_GetIPNodeByName with PR_AF_INET\n");
-    if (PR_GetIPNodeByName(hostName, PR_AF_INET, PR_AI_DEFAULT,
-            buf, sizeof(buf), &he) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetIPNodeByName failed\n");
-        exit(1);
-    }
-    PrintHostent(&he);
-    printf("PR_GetIPNodeByName with PR_AF_INET6\n");
-    if (PR_GetIPNodeByName(hostName, PR_AF_INET6, PR_AI_DEFAULT,
-            buf, sizeof(buf), &he) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetIPNodeByName failed\n");
-        exit(1);
-    }
-    PrintHostent(&he);
-    idx = 0;
-    printf("PR_GetHostByAddr with PR_AF_INET6\n");
-    while (1) {
-        idx = PR_EnumerateHostEnt(idx, &he, 0, &addr);
-        if (idx == -1) {
-            fprintf(stderr, "PR_EnumerateHostEnt failed\n");
-            exit(1);
-        }
-        if (idx == 0) break;  /* normal loop termination */
-        printf("reverse lookup\n");
-        if (PR_GetHostByAddr(&addr, reversebuf, sizeof(reversebuf),
-                &reversehe) == PR_FAILURE) {
-            fprintf(stderr, "PR_GetHostByAddr failed\n");
-            exit(1);
-        }
-        PrintHostent(&reversehe);
-    }
-    printf("PR_GetHostByAddr with PR_AF_INET6 done\n");
-  
-    PR_StringToNetAddr("::1", &addr);
-    if (PR_IsNetAddrType(&addr, PR_IpAddrV4Mapped) == PR_TRUE) {
-        fprintf(stderr, "addr should not be ipv4 mapped address\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-
-    PR_StringToNetAddr("127.0.0.1", &addr);
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-    PR_StringToNetAddr("::FFFF:127.0.0.1", &addr);
-    if (PR_IsNetAddrType(&addr, PR_IpAddrV4Mapped) == PR_FALSE) {
-        fprintf(stderr, "addr should be ipv4 mapped address\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-
-    if (PR_InitializeNetAddr(PR_IpAddrAny, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrAny) == PR_FALSE) {
-        fprintf(stderr, "addr should be unspecified address\n");
-        exit(1);
-    }
-    if (PR_InitializeNetAddr(PR_IpAddrLoopback, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-
-    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrAny) == PR_FALSE) {
-        fprintf(stderr, "addr should be unspecified address\n");
-        exit(1);
-    }
-    if (PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = 0;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    if (PR_IsNetAddrType(&addr, PR_IpAddrAny) == PR_FALSE) {
-        fprintf(stderr, "addr should be unspecified address\n");
-        exit(1);
-    }
-	{
-		char buf[256];
-		PR_NetAddrToString(&addr, buf, 256);
-		printf("IPv4 INADDRANY: %s\n", buf);
-	}
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = 0;
-    addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-	{
-		char buf[256];
-		PR_NetAddrToString(&addr, buf, 256);
-		printf("IPv4 LOOPBACK: %s\n", buf);
-	}
-
-    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrAny) == PR_FALSE) {
-        fprintf(stderr, "addr should be unspecified address\n");
-        exit(1);
-    }
-	{
-		char buf[256];
-		PR_NetAddrToString(&addr, buf, 256);
-		printf("IPv6 INADDRANY: %s\n", buf);
-	}
-    if (PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET6, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_IsNetAddrType(&addr, PR_IpAddrLoopback) == PR_FALSE) {
-        fprintf(stderr, "addr should be loopback address\n");
-        exit(1);
-    }
-	{
-		char buf[256];
-		PR_NetAddrToString(&addr, buf, 256);
-		printf("IPv6 LOOPBACK: %s\n", buf);
-	}
-	{
-		PRIPv6Addr v6addr;
-		char tmp_buf[256];
-
-    	PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET, 0, &addr);
-
-		PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &v6addr);
-    	PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &addr);
-		addr.ipv6.ip = v6addr;
-		PR_NetAddrToString(&addr, tmp_buf, 256);
-		printf("IPv4-mapped IPv6 LOOPBACK: %s\n", tmp_buf);
-	}
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/getproto.c b/libs/js/nsprpub/pr/tests/getproto.c
deleted file mode 100644
index 7381bbd8e1..0000000000
--- a/libs/js/nsprpub/pr/tests/getproto.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *************************************************************************
- *
- * File: getproto.c
- *
- * A test program for PR_GetProtoByName and PR_GetProtoByNumber
- *
- *************************************************************************
- */
-
-#include "plstr.h"
-#include "plerror.h"
-#include "prinit.h"
-#include "prprf.h"
-#include "prnetdb.h"
-#include "prerror.h"
-
-int main()
-{
-    PRFileDesc *prstderr = PR_GetSpecialFD(PR_StandardError);
-    PRBool failed = PR_FALSE;
-    PRProtoEnt proto;
-    char buf[2048];
-    PRStatus rv;
-
-    PR_STDIO_INIT();
-    rv = PR_GetProtoByName("tcp", buf, sizeof(buf), &proto);
-    if (PR_FAILURE == rv) {
-        failed = PR_TRUE;
-        PL_FPrintError(prstderr, "PR_GetProtoByName failed");
-    }
-    else if (6 != proto.p_num) {
-        PR_fprintf(
-            prstderr,"tcp is usually 6, but is %d on this machine\n",
-            proto.p_num);
-    }
-    else PR_fprintf(prstderr, "tcp is protocol number %d\n", proto.p_num);
-
-    rv = PR_GetProtoByName("udp", buf, sizeof(buf), &proto);
-    if (PR_FAILURE == rv) {
-        failed = PR_TRUE;
-        PL_FPrintError(prstderr, "PR_GetProtoByName failed");
-    }
-    else if (17 != proto.p_num) {
-        PR_fprintf(
-            prstderr, "udp is usually 17, but is %d on this machine\n",
-            proto.p_num);
-    }
-    else PR_fprintf(prstderr, "udp is protocol number %d\n", proto.p_num);
-
-    rv = PR_GetProtoByNumber(6, buf, sizeof(buf), &proto);
-    if (PR_FAILURE == rv) {
-        failed = PR_TRUE;
-        PL_FPrintError(prstderr, "PR_GetProtoByNumber failed");
-    }
-    else if (PL_strcmp("tcp", proto.p_name)) {
-        PR_fprintf(
-            prstderr, "Protocol number 6 is usually tcp, but is %s"
-            " on this platform\n", proto.p_name);
-    }
-    else PR_fprintf(prstderr, "Protocol number 6 is %s\n", proto.p_name);
-
-    rv = PR_GetProtoByNumber(17, buf, sizeof(buf), &proto);
-    if (PR_FAILURE == rv) {
-        failed = PR_TRUE;
-        PL_FPrintError(prstderr, "PR_GetProtoByNumber failed");
-    }
-    else if (PL_strcmp("udp", proto.p_name)) {
-        PR_fprintf(
-            prstderr, "Protocol number 17 is usually udp, but is %s"
-            " on this platform\n", proto.p_name);
-    }
-    else PR_fprintf(prstderr, "Protocol number 17 is %s\n", proto.p_name);
-
-    PR_fprintf(prstderr, (failed) ? "FAILED\n" : "PASSED\n");
-    return (failed) ? 1 : 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/i2l.c b/libs/js/nsprpub/pr/tests/i2l.c
deleted file mode 100644
index 4ff67bc0e3..0000000000
--- a/libs/js/nsprpub/pr/tests/i2l.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdlib.h>
-
-#include "prio.h"
-#include "prinit.h"
-#include "prprf.h"
-#include "prlong.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-typedef union Overlay_i
-{
-    PRInt32 i;
-    PRInt64 l;
-} Overlay_i;
-
-typedef union Overlay_u
-{
-    PRUint32 i;
-    PRUint64 l;
-} Overlay_u;
-
-static PRFileDesc *err = NULL;
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: -i n | -u n | -h\n");
-    PR_fprintf(err, "\t-i n treat following number as signed integer\n");
-    PR_fprintf(err, "\t-u n treat following number as unsigned integer\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
-{
-    Overlay_i si;
-    Overlay_u ui;
-    PLOptStatus os;
-    PRBool bsi = PR_FALSE, bui = PR_FALSE;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hi:u:");
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'i':  /* signed integer */
-            si.i = (PRInt32)atoi(opt->value);
-            bsi = PR_TRUE;
-            break;
-        case 'u':  /* unsigned */
-            ui.i = (PRUint32)atoi(opt->value);
-            bui = PR_TRUE;
-            break;
-        case 'h':  /* user wants some guidance */
-         default:
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-#if defined(HAVE_LONG_LONG)
-    PR_fprintf(err, "We have long long\n");
-#else
-    PR_fprintf(err, "We don't have long long\n");
-#endif
-
-    if (bsi)
-    {
-        PR_fprintf(err, "Converting %ld: ", si.i);
-        LL_I2L(si.l, si.i);
-        PR_fprintf(err, "%lld\n", si.l);
-    }
-
-    if (bui)
-    {
-        PR_fprintf(err, "Converting %lu: ", ui.i);
-        LL_I2L(ui.l, ui.i);
-        PR_fprintf(err, "%llu\n", ui.l);
-    }
-    return 0;
-
-}  /* main */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
-
-/* i2l.c */
diff --git a/libs/js/nsprpub/pr/tests/initclk.c b/libs/js/nsprpub/pr/tests/initclk.c
deleted file mode 100644
index 6540519e6a..0000000000
--- a/libs/js/nsprpub/pr/tests/initclk.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This is a regression test for the bug that the interval timer
- * is not initialized when _PR_CreateCPU calls PR_IntervalNow.
- * The bug would make this test program finish prematurely,
- * when the SHORT_TIMEOUT period expires.  The correct behavior
- * is for the test to finish when the LONG_TIMEOUT period expires.
- */
-
-#include "prlock.h"
-#include "prcvar.h"
-#include "prthread.h"
-#include "prinrval.h"
-#include "prlog.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-/* The timeouts, in milliseconds */
-#define SHORT_TIMEOUT 1000
-#define LONG_TIMEOUT 3000
-
-PRLock *lock1, *lock2;
-PRCondVar *cv1, *cv2;
-
-void ThreadFunc(void *arg)
-{
-    PR_Lock(lock1);
-    PR_WaitCondVar(cv1, PR_MillisecondsToInterval(SHORT_TIMEOUT));
-    PR_Unlock(lock1);
-}
-
-int main()
-{
-    PRThread *thread;
-    PRIntervalTime start, end;
-    PRUint32 elapsed_ms;
-
-    lock1 = PR_NewLock();
-    PR_ASSERT(NULL != lock1);
-    cv1 = PR_NewCondVar(lock1);
-    PR_ASSERT(NULL != cv1);
-    lock2 = PR_NewLock();
-    PR_ASSERT(NULL != lock2);
-    cv2 = PR_NewCondVar(lock2);
-    PR_ASSERT(NULL != cv2);
-    start = PR_IntervalNow();
-    thread = PR_CreateThread(
-            PR_USER_THREAD,
-            ThreadFunc,
-            NULL,
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_JOINABLE_THREAD,
-            0);
-    PR_ASSERT(NULL != thread);
-    PR_Lock(lock2);
-    PR_WaitCondVar(cv2, PR_MillisecondsToInterval(LONG_TIMEOUT));
-    PR_Unlock(lock2);
-    PR_JoinThread(thread);
-    end = PR_IntervalNow();
-    elapsed_ms = PR_IntervalToMilliseconds((PRIntervalTime)(end - start));
-    /* Allow 100ms imprecision */
-    if (elapsed_ms < LONG_TIMEOUT - 100 || elapsed_ms > LONG_TIMEOUT + 100) {
-        printf("Elapsed time should be %u ms but is %u ms\n",
-                LONG_TIMEOUT, elapsed_ms);
-        printf("FAIL\n");
-        exit(1);
-    }
-	printf("Elapsed time: %u ms, expected time: %u ms\n",
-               LONG_TIMEOUT, elapsed_ms);
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/inrval.c b/libs/js/nsprpub/pr/tests/inrval.c
deleted file mode 100644
index b057c68535..0000000000
--- a/libs/js/nsprpub/pr/tests/inrval.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** file:            inrval.c
-** description:     Interval conversion test.
-** Modification History:
-** 15-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-**/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#ifdef XP_MAC
-#include "pralarm.h"
-#else
-#include "obsolete/pralarm.h"
-#endif
-
-#include "prio.h"
-#include "prprf.h"
-#include "prlock.h"
-#include "prlong.h"
-#include "prcvar.h"
-#include "prinrval.h"
-#include "prtime.h"
-
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static PRIntn debug_mode;
-static PRFileDesc *output;
-
-
-static void TestConversions(void)
-{
-    PRIntervalTime ticks = PR_TicksPerSecond();
-
-	if (debug_mode) {
-    PR_fprintf(output, "PR_TicksPerSecond: %ld\n\n", ticks);
-    PR_fprintf(output, "PR_SecondsToInterval(1): %ld\n", PR_SecondsToInterval(1));
-    PR_fprintf(output, "PR_MillisecondsToInterval(1000): %ld\n", PR_MillisecondsToInterval(1000));
-    PR_fprintf(output, "PR_MicrosecondsToInterval(1000000): %ld\n\n", PR_MicrosecondsToInterval(1000000));
-
-    PR_fprintf(output, "PR_SecondsToInterval(3): %ld\n", PR_SecondsToInterval(3));
-    PR_fprintf(output, "PR_MillisecondsToInterval(3000): %ld\n", PR_MillisecondsToInterval(3000));
-    PR_fprintf(output, "PR_MicrosecondsToInterval(3000000): %ld\n\n", PR_MicrosecondsToInterval(3000000));
-
-    PR_fprintf(output, "PR_IntervalToSeconds(%ld): %ld\n", ticks, PR_IntervalToSeconds(ticks));
-    PR_fprintf(output, "PR_IntervalToMilliseconds(%ld): %ld\n", ticks, PR_IntervalToMilliseconds(ticks));
-    PR_fprintf(output, "PR_IntervalToMicroseconds(%ld): %ld\n\n", ticks, PR_IntervalToMicroseconds(ticks));
-
-    ticks *= 3;
-    PR_fprintf(output, "PR_IntervalToSeconds(%ld): %ld\n", ticks, PR_IntervalToSeconds(ticks));
-    PR_fprintf(output, "PR_IntervalToMilliseconds(%ld): %ld\n", ticks, PR_IntervalToMilliseconds(ticks));
-    PR_fprintf(output, "PR_IntervalToMicroseconds(%ld): %ld\n\n", ticks, PR_IntervalToMicroseconds(ticks));
-	} /*end debug mode */
-}  /* TestConversions */
-
-static void TestIntervalOverhead(void)
-{
-    /* Hopefully the optimizer won't delete this function */
-    PRUint32 elapsed, per_call, loops = 1000000;
-
-    PRIntervalTime timeout, timein = PR_IntervalNow();
-    while (--loops > 0)
-        timeout = PR_IntervalNow();
-
-    elapsed = 1000U * PR_IntervalToMicroseconds(timeout - timein);
-    per_call = elapsed / 1000000U;
-    PR_fprintf(
-        output, "Overhead of 'PR_IntervalNow()' is %u nsecs\n\n", per_call);
-}  /* TestIntervalOverhead */
-
-static void TestNowOverhead(void)
-{
-    PRTime timeout, timein;
-    PRInt32 overhead, loops = 1000000;
-    PRInt64 elapsed, per_call, ten23rd, ten26th;
-
-    LL_I2L(ten23rd, 1000);
-    LL_I2L(ten26th, 1000000);
-
-    timein = PR_Now();
-    while (--loops > 0)
-        timeout = PR_Now();
-
-    LL_SUB(elapsed, timeout, timein);
-    LL_MUL(elapsed, elapsed, ten23rd);
-    LL_DIV(per_call, elapsed, ten26th);
-    LL_L2I(overhead, per_call);
-    PR_fprintf(
-        output, "Overhead of 'PR_Now()' is %u nsecs\n\n", overhead);
-}  /* TestNowOverhead */
-
-static void TestIntervals(void)
-{
-    PRStatus rv;
-    PRUint32 delta;
-    PRInt32 seconds;
-    PRUint64 elapsed, thousand;
-    PRTime timein, timeout;
-    PRLock *ml = PR_NewLock();
-    PRCondVar *cv = PR_NewCondVar(ml);
-    for (seconds = 0; seconds < 10; ++seconds)
-    {
-        PRIntervalTime ticks = PR_SecondsToInterval(seconds);
-        PR_Lock(ml);
-        timein = PR_Now();
-        rv = PR_WaitCondVar(cv, ticks);
-        timeout = PR_Now();
-        PR_Unlock(ml);
-        LL_SUB(elapsed, timeout, timein);
-        LL_I2L(thousand, 1000);
-        LL_DIV(elapsed, elapsed, thousand);
-        LL_L2UI(delta, elapsed);
-        if (debug_mode) PR_fprintf(output, 
-            "TestIntervals: %swaiting %ld seconds took %ld msecs\n",
-            ((rv == PR_SUCCESS) ? "" : "FAILED "), seconds, delta);
-    }
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    if (debug_mode) PR_fprintf(output, "\n");
-}  /* TestIntervals */
-
-static PRIntn PR_CALLBACK RealMain(int argc, char** argv)
-{
-    PRUint32 vcpu, cpus = 0, loops = 1000;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-
- /* main test */
-	
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dl:c:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'c':  /* concurrency counter */
-			cpus = atoi(opt->value);
-            break;
-        case 'l':  /* loop counter */
-			loops = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-	
-    output = PR_GetSpecialFD(PR_StandardOutput);
-    PR_fprintf(output, "inrval: Examine stdout to determine results.\n");
-
-    if (cpus == 0) cpus = 8;
-    if (loops == 0) loops = 1000;
-
-    if (debug_mode > 0)
-    {
-        PR_fprintf(output, "Inrval: Using %d loops\n", loops);
-        PR_fprintf(output, "Inrval: Using 1 and %d cpu(s)\n", cpus);
-    }
-
-    for (vcpu = 1; vcpu <= cpus; vcpu += cpus - 1)
-    {
-        if (debug_mode)
-            PR_fprintf(output, "\nInrval: Using %d CPU(s)\n\n", vcpu);
-        PR_SetConcurrency(vcpu);
-
-        TestNowOverhead();
-        TestIntervalOverhead();
-        TestConversions();
-        TestIntervals();
-    }
-        
-    return 0;
-}
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
-
diff --git a/libs/js/nsprpub/pr/tests/instrumt.c b/libs/js/nsprpub/pr/tests/instrumt.c
deleted file mode 100644
index f157760947..0000000000
--- a/libs/js/nsprpub/pr/tests/instrumt.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:    instrumt.c
-** Description: This test is for the NSPR debug aids defined in
-** prcountr.h, prtrace.h, prolock.h
-**
-** The test case tests the three debug aids in NSPR:
-**
-** Diagnostic messages can be enabled using "instrumt -v 6"
-** This sets the msgLevel to something that PR_LOG() likes.
-** Also define in the environment "NSPR_LOG_MODULES=Test:6"
-**
-** CounterTest() tests the counter facility. This test
-** creates 4 threads. Each thread either increments, decrements,
-** adds to or subtracts from a counter, depending on an argument
-** passed to the thread at thread-create time. Each of these threads
-** does COUNT_LIMIT iterations doing its thing. When all 4 threads
-** are done, the result of the counter is evaluated. If all was atomic,
-** the the value of the counter should be zero.
-**
-** TraceTest():
-** This test mingles with the counter test. Counters trace.
-** A thread to extract trace entries on the fly is started.
-** A thread to dump trace entries to a file is started.
-**
-** OrderedLockTest():
-**
-**
-**
-**
-**
-*/
-
-#include <stdio.h>
-#include <plstr.h>
-#include <prclist.h>
-#include <prmem.h>
-#include <plgetopt.h> 
-#include <prlog.h> 
-#include <prmon.h> 
-#include <pratom.h> 
-#include <prtrace.h> 
-#include <prcountr.h> 
-#include <prolock.h> 
-
-#define COUNT_LIMIT  (10 * ( 1024))
-
-#define SMALL_TRACE_BUFSIZE  ( 60 * 1024 )
-
-typedef enum 
-{
-    CountLoop = 1,
-    TraceLoop = 2,
-    TraceFlow = 3
-} TraceTypes;
-
-
-PRLogModuleLevel msgLevel = PR_LOG_ALWAYS;
-
-PRBool  help = PR_FALSE;
-PRBool  failed = PR_FALSE;
-
-
-PRLogModuleInfo *lm;
-PRMonitor   *mon;
-PRInt32     activeThreads = 0;
-PR_DEFINE_COUNTER( hCounter );
-PR_DEFINE_TRACE( hTrace );
-
-static void Help(void)
-{
-    printf("Help? ... Ha!\n");
-}    
-
-static void ListCounters(void)
-{
-    PR_DEFINE_COUNTER( qh );
-    PR_DEFINE_COUNTER( rh );
-    const char *qn, *rn, *dn;
-    const char **qname = &qn, **rname = &rn, **desc = &dn;
-    PRUint32    tCtr;
-
-    PR_INIT_COUNTER_HANDLE( qh, NULL );
-    PR_FIND_NEXT_COUNTER_QNAME(qh, qh );
-    while ( qh != NULL )
-    {
-        PR_INIT_COUNTER_HANDLE( rh, NULL );
-        PR_FIND_NEXT_COUNTER_RNAME(rh, rh, qh );
-        while ( rh != NULL )
-        {
-            PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc );
-            tCtr = PR_GET_COUNTER(tCtr, rh);
-            PR_LOG( lm, msgLevel,
-                ( "QName: %s  RName: %s  Desc: %s  Value: %ld\n", 
-                qn, rn, dn, tCtr ));
-            PR_FIND_NEXT_COUNTER_RNAME(rh, rh, qh );
-        } 
-        PR_FIND_NEXT_COUNTER_QNAME(qh, qh);
-    }
-    return;    
-} /* end ListCounters() */
-
-static void ListTraces(void)
-{
-    PR_DEFINE_TRACE( qh );
-    PR_DEFINE_TRACE( rh );
-    const char *qn, *rn, *dn;
-    const char **qname = &qn, **rname = &rn, **desc = &dn;
-
-    PR_INIT_TRACE_HANDLE( qh, NULL );
-    PR_FIND_NEXT_TRACE_QNAME(qh, qh );
-    while ( qh != NULL )
-    {
-        PR_INIT_TRACE_HANDLE( rh, NULL );
-        PR_FIND_NEXT_TRACE_RNAME(rh, rh, qh );
-        while ( rh != NULL )
-        {
-            PR_GET_TRACE_NAME_FROM_HANDLE( rh, qname, rname, desc );
-            PR_LOG( lm, msgLevel,
-                ( "QName: %s  RName: %s  Desc: %s", 
-                qn, rn, dn ));
-            PR_FIND_NEXT_TRACE_RNAME(rh, rh, qh );
-        } 
-        PR_FIND_NEXT_TRACE_QNAME(qh, qh);
-    }
-    return;    
-} /* end ListCounters() */
-
-
-static PRInt32 one = 1;
-static PRInt32 two = 2;
-static PRInt32 three = 3;
-static PRInt32 four = 4;
-
-/*
-** Thread to iteratively count something.
-*/
-static void PR_CALLBACK CountSomething( void *arg )
-{
-    PRInt32 switchVar = *((PRInt32 *)arg);
-    PRInt32 i;
-
-    PR_LOG( lm, msgLevel,
-        ("CountSomething: begin thread %ld", switchVar ));
-    
-    for ( i = 0; i < COUNT_LIMIT ; i++)
-    {
-        switch ( switchVar )
-        {
-        case 1 :
-            PR_INCREMENT_COUNTER( hCounter );
-            break;
-        case 2 :
-            PR_DECREMENT_COUNTER( hCounter );
-            break;
-        case 3 :
-            PR_ADD_TO_COUNTER( hCounter, 1 );
-            break;
-        case 4 :
-            PR_SUBTRACT_FROM_COUNTER( hCounter, 1 );
-            break;
-        default :
-            PR_ASSERT( 0 );
-            break;
-        }
-        PR_TRACE( hTrace, CountLoop, switchVar, i, 0, 0, 0, 0, 0 );
-    } /* end for() */
-
-    PR_LOG( lm, msgLevel,
-        ("CounterSomething: end thread %ld", switchVar ));
-    
-    PR_EnterMonitor(mon);
-    --activeThreads;
-    PR_Notify( mon );
-    PR_ExitMonitor(mon);
-
-    return;    
-} /* end CountSomething() */
-
-/*
-** Create the counter threads.
-*/
-static void CounterTest( void )
-{
-    PRThread *t1, *t2, *t3, *t4;
-    PRIntn i = 0;
-    PR_DEFINE_COUNTER( tc );
-    PR_DEFINE_COUNTER( zCounter );
-
-    PR_LOG( lm, msgLevel,
-        ("Begin CounterTest"));
-    
-    /*
-    ** Test Get and Set of a counter.
-    **
-    */
-    PR_CREATE_COUNTER( zCounter, "Atomic", "get/set test", "test get and set of counter" );
-    PR_SET_COUNTER( zCounter, 9 );
-    PR_GET_COUNTER( i, zCounter );
-    if ( i != 9 )
-    {
-        failed = PR_TRUE;
-        PR_LOG( lm, msgLevel,
-            ("Counter set/get failed"));
-    }
-
-    activeThreads += 4;
-    PR_CREATE_COUNTER( hCounter, "Atomic", "SMP Tests", "test atomic nature of counter" );
-
-    PR_GET_COUNTER_HANDLE_FROM_NAME( tc, "Atomic", "SMP Tests" );
-    PR_ASSERT( tc == hCounter );
-
-	t1 = PR_CreateThread(PR_USER_THREAD,
-	        CountSomething, &one, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t1);
-
-	t2 = PR_CreateThread(PR_USER_THREAD,
-			CountSomething, &two, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t2);
-        
-	t3 = PR_CreateThread(PR_USER_THREAD,
-			CountSomething, &three, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t3);
-        
-	t4 = PR_CreateThread(PR_USER_THREAD,
-			CountSomething, &four, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t4);
-
-    PR_LOG( lm, msgLevel,
-        ("Counter Threads started"));
-
-    ListCounters();
-    return;
-} /* end CounterTest() */
-
-/*
-** Thread to dump trace buffer to a file.
-*/
-static void PR_CALLBACK RecordTrace(void *arg )
-{
-    PR_RECORD_TRACE_ENTRIES();
-
-    PR_EnterMonitor(mon);
-    --activeThreads;
-    PR_Notify( mon );
-    PR_ExitMonitor(mon);
-
-    return;    
-} /* end RecordTrace() */
-
-
-
-#define NUM_TRACE_RECORDS ( 10000 )
-/*
-** Thread to extract and print trace entries from the buffer.
-*/
-static void PR_CALLBACK SampleTrace( void *arg )
-{
-#if defined(DEBUG) || defined(FORCE_NSPR_TRACE)
-    PRInt32 found, rc;
-    PRTraceEntry    *foundEntries;
-    PRInt32 i;
-    
-    foundEntries = (PRTraceEntry *)PR_Malloc( NUM_TRACE_RECORDS * sizeof(PRTraceEntry));
-    PR_ASSERT(foundEntries != NULL );
-
-    do
-    {
-        rc = PR_GetTraceEntries( foundEntries, NUM_TRACE_RECORDS, &found);
-        PR_LOG( lm, msgLevel,
-            ("SampleTrace: Lost Data: %ld found: %ld", rc, found ));
-
-        if ( found != 0)
-        {
-            for ( i = 0 ; i < found; i++ )
-            {
-                PR_LOG( lm, msgLevel,
-                    ("SampleTrace, detail: Thread: %p, Time: %llX, UD0: %ld, UD1: %ld, UD2: %8.8ld",
-                        (foundEntries +i)->thread,
-                        (foundEntries +i)->time,
-                        (foundEntries +i)->userData[0], 
-                        (foundEntries +i)->userData[1], 
-                        (foundEntries +i)->userData[2] )); 
-            }
-        }
-        PR_Sleep(PR_MillisecondsToInterval(50));
-    }
-    while( found != 0 && activeThreads >= 1 );
-
-    PR_Free( foundEntries );
-
-    PR_EnterMonitor(mon);
-    --activeThreads;
-    PR_Notify( mon );
-    PR_ExitMonitor(mon);
-
-    PR_LOG( lm, msgLevel,
-        ("SampleTrace(): exiting"));
-
-#endif
-    return;    
-} /* end RecordTrace() */
-
-/*
-** Basic trace test.
-*/
-static void TraceTest( void )
-{
-    PRInt32 i;
-    PRInt32 size;
-    PR_DEFINE_TRACE( th );
-    PRThread *t1, *t2;
-    
-    PR_LOG( lm, msgLevel,
-        ("Begin TraceTest"));    
-
-    size = SMALL_TRACE_BUFSIZE;
-    PR_SET_TRACE_OPTION( PRTraceBufSize, &size );
-    PR_GET_TRACE_OPTION( PRTraceBufSize, &i );
-    
-    PR_CREATE_TRACE( th, "TraceTest", "tt2", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt3", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt4", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt5", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt6", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt7", "A description for the trace test" );
-    PR_CREATE_TRACE( th, "TraceTest", "tt8", "A description for the trace test" );
-
-    PR_CREATE_TRACE( th, "Trace Test", "tt0", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt1", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt2", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt3", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt4", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt5", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt6", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt7", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt8", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt9", "QName is Trace Test, not TraceTest" );
-    PR_CREATE_TRACE( th, "Trace Test", "tt10", "QName is Trace Test, not TraceTest" );
-
-
-
-    activeThreads += 2;
-	t1 = PR_CreateThread(PR_USER_THREAD,
-			RecordTrace, NULL, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t1);
-
-	t2 = PR_CreateThread(PR_USER_THREAD,
-			SampleTrace, 0, 
-			PR_PRIORITY_NORMAL,
-			PR_GLOBAL_THREAD,
-    		PR_UNJOINABLE_THREAD,
-			0);
-	PR_ASSERT(t2);
-        
-    ListTraces();
-
-    PR_GET_TRACE_HANDLE_FROM_NAME( th, "TraceTest","tt1" );
-    PR_ASSERT( th == hTrace );
-
-    PR_LOG( lm, msgLevel,
-        ("End TraceTest"));    
-    return;
-} /* end TraceTest() */
-
-
-/*
-** Ordered lock test.
-*/
-static void OrderedLockTest( void )
-{
-    PR_LOG( lm, msgLevel,
-        ("Begin OrderedLockTest"));    
-
-    
-} /* end OrderedLockTest() */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-#if defined(DEBUG) || defined(FORCE_NSPR_TRACE)
-    PRUint32    counter;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hdv:");
-    lm = PR_NewLogModule("Test");
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'v':  /* verbose mode */
-			msgLevel = (PRLogModuleLevel)atol( opt->value);
-            break;
-        case 'h':  /* help message */
-			Help();
-			help = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    PR_CREATE_TRACE( hTrace, "TraceTest", "tt1", "A description for the trace test" );
-    mon = PR_NewMonitor();
-    PR_EnterMonitor( mon );
-
-    TraceTest();
-    CounterTest();
-    OrderedLockTest();
-
-    /* Wait for all threads to exit */
-    while ( activeThreads > 0 ) {
-        if ( activeThreads == 1 )
-            PR_SET_TRACE_OPTION( PRTraceStopRecording, NULL );
-    	PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-        PR_GET_COUNTER( counter, hCounter );
-    }
-    PR_ExitMonitor( mon );
-
-    /*
-    ** Evaluate results
-    */
-    PR_GET_COUNTER( counter, hCounter );
-    if ( counter != 0 )
-    {
-        failed = PR_TRUE;
-        PR_LOG( lm, msgLevel,
-            ("Expected counter == 0, found: %ld", counter));
-        printf("FAIL\n");
-    }
-    else
-    {
-        printf("PASS\n");
-    }
-
-
-    PR_DESTROY_COUNTER( hCounter );
-
-    PR_DestroyMonitor( mon );
-
-    PR_TRACE( hTrace, TraceFlow, 0xfff,0,0,0,0,0,0);
-    PR_DESTROY_TRACE( hTrace );
-#else
-    printf("Test not defined\n");
-#endif
-    return 0;
-}  /* main() */
-/* end instrumt.c */
-
diff --git a/libs/js/nsprpub/pr/tests/intrio.c b/libs/js/nsprpub/pr/tests/intrio.c
deleted file mode 100644
index e1dcf661df..0000000000
--- a/libs/js/nsprpub/pr/tests/intrio.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        intrio.c
- * Purpose:     testing i/o interrupts (see Bugzilla bug #31120)
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-/* for synchronization between the main thread and iothread */
-static PRLock *lock;
-static PRCondVar *cvar;
-static PRBool iothread_ready;
-
-static void PR_CALLBACK AbortIO(void *arg)
-{
-    PRStatus rv;
-    PR_Sleep(PR_SecondsToInterval(2));
-    rv = PR_Interrupt((PRThread*)arg);
-    PR_ASSERT(PR_SUCCESS == rv);
-}  /* AbortIO */
-
-static void PR_CALLBACK IOThread(void *arg)
-{
-    PRFileDesc *sock, *newsock;
-    PRNetAddr addr;
-
-    sock = PR_OpenTCPSocket(PR_AF_INET6);
-    if (sock == NULL) {
-        fprintf(stderr, "PR_OpenTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&addr, 0, sizeof(addr));
-    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Bind(sock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    if (PR_Listen(sock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-    /* tell the main thread that we are ready */
-    PR_Lock(lock);
-    iothread_ready = PR_TRUE;
-    PR_NotifyCondVar(cvar);
-    PR_Unlock(lock);
-    newsock = PR_Accept(sock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (newsock != NULL) {
-        fprintf(stderr, "PR_Accept shouldn't have succeeded\n");
-        exit(1);
-    }
-    if (PR_GetError() != PR_PENDING_INTERRUPT_ERROR) {
-        fprintf(stderr, "PR_Accept failed (%d, %d)\n",
-            PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    printf("PR_Accept() is interrupted as expected\n");
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-static void Test(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *iothread, *abortio;
-
-    printf("A %s thread will be interrupted by a %s thread\n",
-        (scope1 == PR_LOCAL_THREAD ? "local" : "global"),
-        (scope2 == PR_LOCAL_THREAD ? "local" : "global"));
-    iothread_ready = PR_FALSE;
-    iothread = PR_CreateThread(
-        PR_USER_THREAD, IOThread, NULL, PR_PRIORITY_NORMAL,
-        scope1, PR_JOINABLE_THREAD, 0);
-    if (iothread == NULL) {
-        fprintf(stderr, "cannot create thread\n");
-        exit(1);
-    }
-    PR_Lock(lock);
-    while (!iothread_ready)
-        PR_WaitCondVar(cvar, PR_INTERVAL_NO_TIMEOUT);
-    PR_Unlock(lock);
-    abortio = PR_CreateThread(
-        PR_USER_THREAD, AbortIO, iothread, PR_PRIORITY_NORMAL,
-        scope2, PR_JOINABLE_THREAD, 0);
-    if (abortio == NULL) {
-        fprintf(stderr, "cannot create thread\n");
-        exit(1);
-    }
-    if (PR_JoinThread(iothread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(abortio) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-}
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PR_STDIO_INIT();
-    lock = PR_NewLock();
-    if (lock == NULL) {
-        fprintf(stderr, "PR_NewLock failed\n");
-        exit(1);
-    }
-    cvar = PR_NewCondVar(lock);
-    if (cvar == NULL) {
-        fprintf(stderr, "PR_NewCondVar failed\n");
-        exit(1);
-    }
-    /* test all four combinations */
-    Test(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-    Test(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-    Test(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-    Test(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-    printf("PASSED\n");
-    return 0;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/intrupt.c b/libs/js/nsprpub/pr/tests/intrupt.c
deleted file mode 100644
index a4d62f7734..0000000000
--- a/libs/js/nsprpub/pr/tests/intrupt.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        intrupt.c
- * Purpose:     testing thread interrupts
- */
-
-#include "plgetopt.h"
-#include "prcvar.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prthread.h"
-#include "prtypes.h"
-#include "prnetdb.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#define DEFAULT_TCP_PORT 12500
-
-static PRLock *ml = NULL;
-static PRCondVar *cv = NULL;
-
-static PRBool passed = PR_TRUE;
-static PRBool debug_mode = PR_FALSE;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-static void PR_CALLBACK AbortCV(void *arg)
-{
-    PRStatus rv;
-    PRThread *me = PR_GetCurrentThread();
-
-    /* some other thread (main) is doing the interrupt */
-    PR_Lock(ml);
-    rv = PR_WaitCondVar(cv, PR_INTERVAL_NO_TIMEOUT);
-    if (debug_mode) printf( "Expected interrupt on wait CV and ");
-    if (PR_FAILURE == rv)
-    {
-        if (PR_PENDING_INTERRUPT_ERROR == PR_GetError())
-        {
-            if (debug_mode) printf("got it\n");
-        }
-        else
-        {
-            if (debug_mode) printf("got random error\n");
-            passed = PR_FALSE;
-        }
-    }
-    else
-    {
-        if (debug_mode) printf("got a successful completion\n");
-        passed = PR_FALSE;
-    }
-
-    rv = PR_WaitCondVar(cv, 10);
-    if (debug_mode)
-    {
-        printf(
-            "Expected success on wait CV and %s\n",
-            (PR_SUCCESS == rv) ? "got it" : "failed");
-    }
-    passed = ((PR_TRUE == passed) && (PR_SUCCESS == rv)) ? PR_TRUE : PR_FALSE;
-
-    /* interrupt myself, then clear */
-    PR_Interrupt(me);
-    PR_ClearInterrupt();
-    rv = PR_WaitCondVar(cv, 10);
-    if (debug_mode)
-    {
-        printf("Expected success on wait CV and ");
-        if (PR_FAILURE == rv)
-        {
-            printf(
-                "%s\n", (PR_PENDING_INTERRUPT_ERROR == PR_GetError()) ?
-                "got interrupted" : "a random failure");
-        }
-        printf("got it\n");
-    }
-    passed = ((PR_TRUE == passed) && (PR_SUCCESS == rv)) ? PR_TRUE : PR_FALSE;
-
-    /* set, then wait - interrupt - then wait again */
-    PR_Interrupt(me);
-    rv = PR_WaitCondVar(cv, 10);
-    if (debug_mode) printf( "Expected interrupt on wait CV and ");
-    if (PR_FAILURE == rv)
-    {
-        if (PR_PENDING_INTERRUPT_ERROR == PR_GetError())
-        {
-            if (debug_mode) printf("got it\n");
-        }
-        else
-        {
-            if (debug_mode) printf("failed\n");
-            passed = PR_FALSE;
-        }
-    }
-    else
-    {
-        if (debug_mode) printf("got a successful completion\n");
-        passed = PR_FALSE;
-    }
-
-    rv = PR_WaitCondVar(cv, 10);
-    if (debug_mode)
-    {
-        printf(
-            "Expected success on wait CV and %s\n",
-            (PR_SUCCESS == rv) ? "got it" : "failed");
-    }
-    passed = ((PR_TRUE == passed) && (PR_SUCCESS == rv)) ? PR_TRUE : PR_FALSE;
-
-    PR_Unlock(ml);
-
-}  /* AbortCV */
-
-static void PR_CALLBACK AbortIO(void *arg)
-{
-    PRStatus rv;
-    PR_Sleep(PR_SecondsToInterval(2));
-    rv = PR_Interrupt((PRThread*)arg);
-    PR_ASSERT(PR_SUCCESS == rv);
-}  /* AbortIO */
-
-static void PR_CALLBACK AbortJoin(void *arg)
-{
-}  /* AbortJoin */
-
-static void setup_listen_socket(PRFileDesc **listner, PRNetAddr *netaddr)
-{
-    PRStatus rv;
-    PRInt16 port = DEFAULT_TCP_PORT;
-
-    *listner = PR_NewTCPSocket();
-    PR_ASSERT(*listner != NULL);
-    memset(netaddr, 0, sizeof(*netaddr));
-    (*netaddr).inet.ip = PR_htonl(PR_INADDR_ANY);
-    (*netaddr).inet.family = PR_AF_INET;
-    do
-    {
-        (*netaddr).inet.port = PR_htons(port);
-        rv = PR_Bind(*listner, netaddr);
-        port += 1;
-        PR_ASSERT(port < (DEFAULT_TCP_PORT + 10));
-    } while (PR_FAILURE == rv);
-
-    rv = PR_Listen(*listner, 5);
-
-	if (PR_GetSockName(*listner, netaddr) < 0) {
-		if (debug_mode) printf("intrupt: ERROR - PR_GetSockName failed\n");
-		passed = PR_FALSE;
-		return;
-	}
-
-}
-
-static void PR_CALLBACK IntrBlock(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr netaddr;
-    PRFileDesc *listner;
-
-    /* some other thread (main) is doing the interrupt */
-	/* block the interrupt */
-	PR_BlockInterrupt();
-    PR_Lock(ml);
-    rv = PR_WaitCondVar(cv, PR_SecondsToInterval(4));
-	PR_Unlock(ml);
-    if (debug_mode)
-    {
-        printf("Expected success on wait CV and ");
-        if (PR_FAILURE == rv)
-        {
-            printf(
-                "%s\n", (PR_PENDING_INTERRUPT_ERROR == PR_GetError()) ?
-                "got interrupted" : "got a random failure");
-        } else
-        	printf("got it\n");
-    }
-    passed = ((PR_TRUE == passed) && (PR_SUCCESS == rv)) ? PR_TRUE : PR_FALSE;
-
-	setup_listen_socket(&listner, &netaddr);
-	PR_UnblockInterrupt();
-    if (PR_Accept(listner, &netaddr, PR_INTERVAL_NO_TIMEOUT) == NULL)
-    {
-        PRInt32 error = PR_GetError();
-        if (debug_mode) printf("Expected interrupt on PR_Accept() and ");
-        if (PR_PENDING_INTERRUPT_ERROR == error)
-        {
-            if (debug_mode) printf("got it\n");
-        }
-        else
-        {
-            if (debug_mode) printf("failed\n");
-            passed = PR_FALSE;
-        }
-    }
-    else
-    {
-        if (debug_mode) printf("Failed to interrupt PR_Accept()\n");
-        passed = PR_FALSE;
-    }
-
-    (void)PR_Close(listner); listner = NULL;
-}  /* TestIntrBlock */
-
-void PR_CALLBACK Intrupt(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr netaddr;
-    PRFileDesc *listner;
-    PRThread *abortCV, *abortIO, *abortJoin, *intrBlock;
-
-    ml = PR_NewLock();
-    cv = PR_NewCondVar(ml);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("intrupt.log");
-	debug_mode = PR_TRUE;
-#endif
-
-    /* Part I */
-    if (debug_mode) printf("Part I\n");
-    abortCV = PR_CreateThread(
-        PR_USER_THREAD, AbortCV, 0, PR_PRIORITY_NORMAL,
-        thread_scope, PR_JOINABLE_THREAD, 0);
-
-    PR_Sleep(PR_SecondsToInterval(2));
-    rv = PR_Interrupt(abortCV);
-    PR_ASSERT(PR_SUCCESS == rv);
-    rv = PR_JoinThread(abortCV);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    /* Part II */
-    if (debug_mode) printf("Part II\n");
-    abortJoin = PR_CreateThread(
-        PR_USER_THREAD, AbortJoin, 0, PR_PRIORITY_NORMAL,
-        thread_scope, PR_JOINABLE_THREAD, 0);
-    PR_Sleep(PR_SecondsToInterval(2));
-    if (debug_mode) printf("Expecting to interrupt an exited thread ");
-    rv = PR_Interrupt(abortJoin);
-    PR_ASSERT(PR_SUCCESS == rv);
-    rv = PR_JoinThread(abortJoin);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if (debug_mode) printf("and succeeded\n");
-
-    /* Part III */
-    if (debug_mode) printf("Part III\n");
-	setup_listen_socket(&listner, &netaddr);
-    abortIO = PR_CreateThread(
-        PR_USER_THREAD, AbortIO, PR_GetCurrentThread(), PR_PRIORITY_NORMAL,
-        thread_scope, PR_JOINABLE_THREAD, 0);
-
-    if (PR_Accept(listner, &netaddr, PR_INTERVAL_NO_TIMEOUT) == NULL)
-    {
-        PRInt32 error = PR_GetError();
-        if (debug_mode) printf("Expected interrupt on PR_Accept() and ");
-        if (PR_PENDING_INTERRUPT_ERROR == error)
-        {
-            if (debug_mode) printf("got it\n");
-        }
-        else
-        {
-            if (debug_mode) printf("failed\n");
-            passed = PR_FALSE;
-        }
-    }
-    else
-    {
-        if (debug_mode) printf("Failed to interrupt PR_Accept()\n");
-        passed = PR_FALSE;
-    }
-
-    (void)PR_Close(listner); listner = NULL;
-
-    rv = PR_JoinThread(abortIO);
-    PR_ASSERT(PR_SUCCESS == rv);
-    /* Part VI */
-    if (debug_mode) printf("Part VI\n");
-    intrBlock = PR_CreateThread(
-        PR_USER_THREAD, IntrBlock, 0, PR_PRIORITY_NORMAL,
-        thread_scope, PR_JOINABLE_THREAD, 0);
-
-    PR_Sleep(PR_SecondsToInterval(2));
-    rv = PR_Interrupt(intrBlock);
-    PR_ASSERT(PR_SUCCESS == rv);
-    rv = PR_JoinThread(intrBlock);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);    
-}  /* Intrupt */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRThread *intrupt;
-	PLOptStatus os;
-  	PLOptState *opt = PL_CreateOptState(argc, argv, "dG");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-    PR_STDIO_INIT();
-    intrupt = PR_CreateThread(
-        PR_USER_THREAD, Intrupt, NULL, PR_PRIORITY_NORMAL,
-        thread_scope, PR_JOINABLE_THREAD, 0);
-    if (intrupt == NULL) {
-        fprintf(stderr, "cannot create thread\n");
-        passed = PR_FALSE;
-    } else {
-        PRStatus rv;
-        rv = PR_JoinThread(intrupt);
-        PR_ASSERT(rv == PR_SUCCESS);
-    }
-    printf("%s\n", ((passed) ? "PASSED" : "FAILED"));
-	return ((passed) ? 0 : 1);
-}  /* main */
-
-/* intrupt.c */
diff --git a/libs/js/nsprpub/pr/tests/io_timeout.c b/libs/js/nsprpub/pr/tests/io_timeout.c
deleted file mode 100644
index 2a680aa5c1..0000000000
--- a/libs/js/nsprpub/pr/tests/io_timeout.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Test socket IO timeouts
-**
-**
-**
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include "nspr.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#define NUM_THREADS 1
-#define BASE_PORT   8000
-#define DEFAULT_ACCEPT_TIMEOUT 2
-
-typedef struct threadInfo {
-    PRInt16 id;
-    PRInt16 accept_timeout;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32   *alive;
-} threadInfo;
-
-PRIntn failed_already = 0;
-PRIntn debug_mode = 0;
-
-#define	LOCAL_SCOPE_STRING			"LOCAL scope"
-#define	GLOBAL_SCOPE_STRING			"GLOBAL scope"
-#define	GLOBAL_BOUND_SCOPE_STRING	"GLOBAL_BOUND scope"
-
-void 
-thread_main(void *_info)
-{
-    threadInfo *info = (threadInfo *)_info;
-    PRNetAddr listenAddr;
-    PRNetAddr clientAddr;
-    PRFileDesc *listenSock = NULL;
-    PRFileDesc *clientSock;
-    PRStatus rv;
-	PRThreadScope tscope;
-	char *scope_str;
-
- 
-	if (debug_mode)
-    	printf("thread %d is alive\n", info->id);
-	tscope = PR_GetThreadScope(PR_GetCurrentThread());
-
-	switch(tscope) {
-		case PR_LOCAL_THREAD:
-			scope_str = LOCAL_SCOPE_STRING;
-			break;
-		case PR_GLOBAL_THREAD:
-			scope_str = GLOBAL_SCOPE_STRING;
-			break;
-		case PR_GLOBAL_BOUND_THREAD:
-			scope_str = GLOBAL_BOUND_SCOPE_STRING;
-			break;
-		default:
-			PR_ASSERT(!"Invalid thread scope");
-			break;
-	}
-	printf("thread id %d, scope %s\n", info->id, scope_str);
-
-    listenSock = PR_NewTCPSocket();
-    if (!listenSock) {
-		if (debug_mode)
-        	printf("unable to create listen socket\n");
-		failed_already=1;
-        goto dead;
-    }
-  
-    listenAddr.inet.family = PR_AF_INET;
-    listenAddr.inet.port = PR_htons(BASE_PORT + info->id);
-    listenAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    rv = PR_Bind(listenSock, &listenAddr);
-    if (rv == PR_FAILURE) {
-		if (debug_mode)
-        	printf("unable to bind\n");
-		failed_already=1;
-        goto dead;
-    }
-
-    rv = PR_Listen(listenSock, 4);
-    if (rv == PR_FAILURE) {
-		if (debug_mode)
-        	printf("unable to listen\n");
-		failed_already=1;
-        goto dead;
-    }
-
-	if (debug_mode)
-    	printf("thread %d going into accept for %d seconds\n", 
-        	info->id, info->accept_timeout + info->id);
-
-    clientSock = PR_Accept(listenSock, &clientAddr, PR_SecondsToInterval(info->accept_timeout +info->id));
-
-    if (clientSock == NULL) {
-        if (PR_GetError() == PR_IO_TIMEOUT_ERROR) {
-			if (debug_mode) {	
-            	printf("PR_Accept() timeout worked!\n"); 
-				printf("TEST PASSED! PR_Accept() returned error %d\n",
-							PR_IO_TIMEOUT_ERROR);
-			}
-    	} else {
-			if (debug_mode)
-            	printf("TEST FAILED! PR_Accept() returned error %d\n",
-														PR_GetError());
-			failed_already=1;
-		}
-    } else {
-		if (debug_mode)
-        	printf ("TEST FAILED! PR_Accept() succeeded?\n");
-		failed_already=1;
-		PR_Close(clientSock);
-    }
-
-dead:
-    if (listenSock) {
-		PR_Close(listenSock);
-    }
-    PR_Lock(info->dead_lock);
-    (*info->alive)--;
-    PR_NotifyCondVar(info->dead_cv);
-    PR_Unlock(info->dead_lock);
-
-	if (debug_mode)
-    	printf("thread %d is dead\n", info->id);
-
-    PR_Free(info);
-}
-
-void
-thread_test(PRThreadScope scope, PRInt32 num_threads)
-{
-    PRInt32 index;
-    PRThread *thr;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32 alive;
-
-	if (debug_mode)
-    	printf("IO Timeout test started with %d threads\n", num_threads);
-
-    dead_lock = PR_NewLock();
-    dead_cv = PR_NewCondVar(dead_lock);
-    alive = num_threads;
-    
-    for (index = 0; index < num_threads; index++) {
-        threadInfo *info = (threadInfo *)PR_Malloc(sizeof(threadInfo));
-
-        info->id = index;
-        info->dead_lock = dead_lock;
-        info->dead_cv = dead_cv;
-        info->alive = &alive;
-        info->accept_timeout = DEFAULT_ACCEPT_TIMEOUT;
-        
-        thr = PR_CreateThread( PR_USER_THREAD,
-                               thread_main,
-                               (void *)info,
-                               PR_PRIORITY_NORMAL,
-                               scope,
-                               PR_UNJOINABLE_THREAD,
-                               0);
-
-        if (!thr) {
-        	printf("Failed to create thread, error = %d(%d)\n",
-											PR_GetError(), PR_GetOSError());
-			failed_already=1;
-
-            PR_Lock(dead_lock);
-            alive--;
-            PR_Unlock(dead_lock);
-        }
-    }
-
-    PR_Lock(dead_lock);
-    while(alive) {
-		if (debug_mode)
-        	printf("main loop awake; alive = %d\n", alive);
-        PR_WaitCondVar(dead_cv, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(dead_lock);
-
-    PR_DestroyCondVar(dead_cv);
-    PR_DestroyLock(dead_lock);
-}
-
-int main(int argc, char **argv)
-{
-    PRInt32 num_threads = 0;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name [-d] [-t <threads>]
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 't':  /* threads to involve */
-			num_threads = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    if (0 == num_threads)
-        num_threads = NUM_THREADS;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_LOW, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("io_timeout.log");
-	debug_mode = 1;
-#endif
-
-    printf("test with global bound thread\n");
-    thread_test(PR_GLOBAL_BOUND_THREAD, num_threads);
-
-    printf("test with local thread\n");
-    thread_test(PR_LOCAL_THREAD, num_threads);
-
-    printf("test with global thread\n");
-    thread_test(PR_GLOBAL_THREAD, num_threads);
-
-    PR_Cleanup();
-
-	if (failed_already)
-		return 1;
-	else
-    	return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/io_timeoutk.c b/libs/js/nsprpub/pr/tests/io_timeoutk.c
deleted file mode 100644
index 26e3beeb6f..0000000000
--- a/libs/js/nsprpub/pr/tests/io_timeoutk.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** name io_timeoutk.c
-** Description:Test socket IO timeouts (kernel level)
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include "nspr.h"
-
-#define NUM_THREADS 1
-#define BASE_PORT   8000
-#define DEFAULT_ACCEPT_TIMEOUT 2
-
-typedef struct threadInfo {
-    PRInt16 id;
-    PRInt16 accept_timeout;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32   *alive;
-} threadInfo;
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-void 
-thread_main(void *_info)
-{
-    threadInfo *info = (threadInfo *)_info;
-    PRNetAddr listenAddr;
-    PRNetAddr clientAddr;
-    PRFileDesc *listenSock = NULL;
-    PRFileDesc *clientSock;
-    PRStatus rv;
- 
-    if (debug_mode) printf("thread %d is alive\n", info->id);
-
-    listenSock = PR_NewTCPSocket();
-    if (!listenSock) {
-        if (debug_mode) printf("unable to create listen socket\n");
-        goto dead;
-    }
-  
-    listenAddr.inet.family = AF_INET;
-    listenAddr.inet.port = PR_htons(BASE_PORT + info->id);
-    listenAddr.inet.ip = PR_htonl(INADDR_ANY);
-    rv = PR_Bind(listenSock, &listenAddr);
-    if (rv == PR_FAILURE) {
-        if (debug_mode) printf("unable to bind\n");
-        goto dead;
-    }
-
-    rv = PR_Listen(listenSock, 4);
-    if (rv == PR_FAILURE) {
-        if (debug_mode) printf("unable to listen\n");
-        goto dead;
-    }
-
-    if (debug_mode) printf("thread %d going into accept for %d seconds\n", 
-        info->id, info->accept_timeout + info->id);
-
-    clientSock = PR_Accept(listenSock, &clientAddr, PR_SecondsToInterval(info->accept_timeout +info->id));
-
-    if (clientSock == NULL) {
-        if (PR_GetError() == PR_IO_TIMEOUT_ERROR) 
-            if (debug_mode) {
-				printf("PR_Accept() timeout worked!\n");
-                printf("TEST FAILED! PR_Accept() returned error %d\n",
-								   PR_GetError());
-			}
-			else failed_already=1;
-    } else {
-        if (debug_mode) printf ("TEST FAILED! PR_Accept() succeeded?\n");
-		else failed_already=1;
-	PR_Close(clientSock);
-    }
-
-dead:
-    if (listenSock) {
-	PR_Close(listenSock);
-    }
-    PR_Lock(info->dead_lock);
-    (*info->alive)--;
-    PR_NotifyCondVar(info->dead_cv);
-    PR_Unlock(info->dead_lock);
-
-    if (debug_mode) printf("thread %d is dead\n", info->id);
-}
-
-void
-thread_test(PRInt32 scope, PRInt32 num_threads)
-{
-    PRInt32 index;
-    PRThread *thr;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32 alive;
-
-    if (debug_mode) printf("IO Timeout test started with %d threads\n", num_threads);
-
-    dead_lock = PR_NewLock();
-    dead_cv = PR_NewCondVar(dead_lock);
-    alive = num_threads;
-    
-    for (index = 0; index < num_threads; index++) {
-        threadInfo *info = (threadInfo *)malloc(sizeof(threadInfo));
-
-        info->id = index;
-        info->dead_lock = dead_lock;
-        info->dead_cv = dead_cv;
-        info->alive = &alive;
-        info->accept_timeout = DEFAULT_ACCEPT_TIMEOUT;
-        
-        thr = PR_CreateThread( PR_USER_THREAD,
-                               thread_main,
-                               (void *)info,
-                               PR_PRIORITY_NORMAL,
-                               scope,
-                               PR_UNJOINABLE_THREAD,
-                               0);
-
-        if (!thr) {
-            PR_Lock(dead_lock);
-            alive--;
-            PR_Unlock(dead_lock);
-        }
-    }
-
-    PR_Lock(dead_lock);
-    while(alive) {
-        if (debug_mode) printf("main loop awake; alive = %d\n", alive);
-        PR_WaitCondVar(dead_cv, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(dead_lock);
-}
-
-int main(int argc, char **argv)
-{
-    PRInt32 num_threads;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    if (argc > 2)
-        num_threads = atoi(argv[2]);
-    else
-        num_threads = NUM_THREADS;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_LOW, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode)     printf("kernel level test\n");
-    thread_test(PR_GLOBAL_THREAD, num_threads);
-
-     PR_Cleanup();
-     
-     if(failed_already)    
-        return 1;
-    else
-        return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/io_timeoutu.c b/libs/js/nsprpub/pr/tests/io_timeoutu.c
deleted file mode 100644
index c17a93f759..0000000000
--- a/libs/js/nsprpub/pr/tests/io_timeoutu.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
-** name io_timeoutu.c
-** Description: Test socket IO timeouts (user level)
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include "nspr.h"
-
-#define NUM_THREADS 1
-#define BASE_PORT   8000
-#define DEFAULT_ACCEPT_TIMEOUT 2
-
-typedef struct threadInfo {
-    PRInt16 id;
-    PRInt16 accept_timeout;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32   *alive;
-} threadInfo;
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-void 
-thread_main(void *_info)
-{
-    threadInfo *info = (threadInfo *)_info;
-    PRNetAddr listenAddr;
-    PRNetAddr clientAddr;
-    PRFileDesc *listenSock = NULL;
-    PRFileDesc *clientSock;
-    PRStatus rv;
- 
-    if (debug_mode) printf("thread %d is alive\n", info->id);
-
-    listenSock = PR_NewTCPSocket();
-    if (!listenSock) {
-        if (debug_mode) printf("unable to create listen socket\n");
-        goto dead;
-    }
-  
-    listenAddr.inet.family = AF_INET;
-    listenAddr.inet.port = PR_htons(BASE_PORT + info->id);
-    listenAddr.inet.ip = PR_htonl(INADDR_ANY);
-    rv = PR_Bind(listenSock, &listenAddr);
-    if (rv == PR_FAILURE) {
-        if (debug_mode) printf("unable to bind\n");
-        goto dead;
-    }
-
-    rv = PR_Listen(listenSock, 4);
-    if (rv == PR_FAILURE) {
-        if (debug_mode) printf("unable to listen\n");
-        goto dead;
-    }
-
-    if (debug_mode) printf("thread %d going into accept for %d seconds\n", 
-        info->id, info->accept_timeout + info->id);
-
-    clientSock = PR_Accept(
-		listenSock, &clientAddr, PR_SecondsToInterval(
-			info->accept_timeout + info->id));
-
-    if (clientSock == NULL) {
-        if (PR_GetError() == PR_IO_TIMEOUT_ERROR) 
-            if (debug_mode) {
-				printf("PR_Accept() timeout worked!\n");
-                printf("TEST FAILED! PR_Accept() returned error %d\n",
-			}
-								   PR_GetError());
-			else failed_already=1;
-    } else {
-        if (debug_mode) printf ("TEST FAILED! PR_Accept() succeeded?\n");
-		else failed_already=1;
-	PR_Close(clientSock);
-    }
-
-dead:
-    if (listenSock) {
-	PR_Close(listenSock);
-    }
-    PR_Lock(info->dead_lock);
-    (*info->alive)--;
-    PR_NotifyCondVar(info->dead_cv);
-    PR_Unlock(info->dead_lock);
-
-    if (debug_mode) printf("thread %d is dead\n", info->id);
-}
-
-void
-thread_test(PRInt32 scope, PRInt32 num_threads)
-{
-    PRInt32 index;
-    PRThread *thr;
-    PRLock *dead_lock;
-    PRCondVar *dead_cv;
-    PRInt32 alive;
-
-    if (debug_mode) printf("IO Timeout test started with %d threads\n", num_threads);
-
-    dead_lock = PR_NewLock();
-    dead_cv = PR_NewCondVar(dead_lock);
-    alive = num_threads;
-    
-    for (index = 0; index < num_threads; index++) {
-        threadInfo *info = (threadInfo *)malloc(sizeof(threadInfo));
-
-        info->id = index;
-        info->dead_lock = dead_lock;
-        info->dead_cv = dead_cv;
-        info->alive = &alive;
-        info->accept_timeout = DEFAULT_ACCEPT_TIMEOUT;
-        
-        thr = PR_CreateThread( PR_USER_THREAD,
-                               thread_main,
-                               (void *)info,
-                               PR_PRIORITY_NORMAL,
-                               scope,
-                               PR_UNJOINABLE_THREAD,
-                               0);
-
-        if (!thr) {
-            PR_Lock(dead_lock);
-            alive--;
-            PR_Unlock(dead_lock);
-        }
-    }
-
-    PR_Lock(dead_lock);
-    while(alive) {
-        if (debug_mode) printf("main loop awake; alive = %d\n", alive);
-        PR_WaitCondVar(dead_cv, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(dead_lock);
-}
-
-int main(int argc, char **argv)
-{
-    PRInt32 num_threads;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    if (argc > 2)
-        num_threads = atoi(argv[2]);
-    else
-        num_threads = NUM_THREADS;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_LOW, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) printf("user level test\n");
-    thread_test(PR_LOCAL_THREAD, num_threads);
-
-     PR_Cleanup();
-     if(failed_already)    
-        return 1;
-     else
-        return 0;
-     
-
-}
diff --git a/libs/js/nsprpub/pr/tests/ioconthr.c b/libs/js/nsprpub/pr/tests/ioconthr.c
deleted file mode 100644
index 2e39522dfb..0000000000
--- a/libs/js/nsprpub/pr/tests/ioconthr.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This is a test for the io continuation thread machinery
- * in pthreads.
- */
-
-#include "nspr.h"
-#include <stdio.h>
-
-int num_threads = 10;  /* must be an even number */
-PRThreadScope thread_scope = PR_GLOBAL_THREAD;
-
-void ThreadFunc(void *arg)
-{
-    PRFileDesc *fd = (PRFileDesc *) arg;
-    char buf[1024];
-    PRInt32 nbytes;
-    PRErrorCode err;
-
-    nbytes = PR_Recv(fd, buf, sizeof(buf), 0, PR_SecondsToInterval(20));
-    if (nbytes == -1) {
-        err = PR_GetError();
-        if (err != PR_PENDING_INTERRUPT_ERROR) {
-            fprintf(stderr, "PR_Recv failed: (%d, %d)\n",
-                    err, PR_GetOSError());
-            PR_ProcessExit(1);
-        }
-        /*
-         * After getting an I/O interrupt, this thread must
-         * close the fd before it exits due to a limitation
-         * of our NT implementation.
-         */
-        if (PR_Close(fd) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            PR_ProcessExit(1);
-        }
-    } else {
-        fprintf(stderr, "PR_Recv received %d bytes!?\n", nbytes);
-        PR_ProcessExit(1);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc **fds;
-    PRThread **threads;
-    PRIntervalTime start, elapsed;
-    int index;
-
-    fds = (PRFileDesc **) PR_MALLOC(2 * num_threads * sizeof(PRFileDesc *));
-    PR_ASSERT(fds != NULL);
-    threads = (PRThread **) PR_MALLOC(num_threads * sizeof(PRThread *));
-    PR_ASSERT(threads != NULL);
-
-    for (index = 0; index < num_threads; index++) {
-        if (PR_NewTCPSocketPair(&fds[2 * index]) == PR_FAILURE) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            PR_ProcessExit(1);
-        }
-        threads[index] = PR_CreateThread(
-                PR_USER_THREAD, ThreadFunc, fds[2 * index],
-                PR_PRIORITY_NORMAL, thread_scope, PR_JOINABLE_THREAD, 0);
-        if (NULL == threads[index]) {
-            fprintf(stderr, "PR_CreateThread failed\n");
-            PR_ProcessExit(1);
-        }
-    }
-
-    /* Let the threads block in PR_Recv */
-    PR_Sleep(PR_SecondsToInterval(2));
-
-    printf("Interrupting the threads\n");
-    fflush(stdout);
-    start = PR_IntervalNow();
-    for (index = 0; index < num_threads; index++) {
-        if (PR_Interrupt(threads[index]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Interrupt failed\n");
-            PR_ProcessExit(1);
-        }
-    }
-    for (index = 0; index < num_threads; index++) {
-        if (PR_JoinThread(threads[index]) == PR_FAILURE) {
-            fprintf(stderr, "PR_JoinThread failed\n");
-            PR_ProcessExit(1);
-        }
-    }
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start);
-    printf("Threads terminated in %d milliseconds\n",
-            PR_IntervalToMilliseconds(elapsed));
-    fflush(stdout);
-    
-    /* We are being very generous and allow 10 seconds. */
-    if (elapsed >= PR_SecondsToInterval(10)) {
-        fprintf(stderr, "Interrupting threads took longer than 10 seconds!!\n");
-        PR_ProcessExit(1);
-    }
-
-    for (index = 0; index < num_threads; index++) {
-        /* fds[2 * index] was passed to and closed by threads[index]. */
-        if (PR_Close(fds[2 * index + 1]) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            PR_ProcessExit(1);
-        }
-    }
-    PR_DELETE(threads);
-    PR_DELETE(fds);
-    printf("PASS\n");
-    PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/ipv6.c b/libs/js/nsprpub/pr/tests/ipv6.c
deleted file mode 100644
index 742239ae44..0000000000
--- a/libs/js/nsprpub/pr/tests/ipv6.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prenv.h"
-#include "prmem.h"
-#include "prlink.h"
-#include "prsystem.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prvrsion.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-#include "obsolete/probslet.h"
-
-#include <string.h>
-
-#define DNS_BUFFER 100
-#define ADDR_BUFFER 100
-#define HOST_BUFFER 1024
-#define PROTO_BUFFER 1500
-
-#define NETADDR_SIZE(addr) \
-    (PR_AF_INET == (addr)->raw.family ? \
-    sizeof((addr)->inet) : sizeof((addr)->ipv6))
-
-static PRFileDesc *err = NULL;
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: [-V] [-h]\n");
-    PR_fprintf(err, "\t<nul>    Name of host to lookup          (default: self)\n");
-    PR_fprintf(err, "\t-V       Display runtime version info    (default: FALSE)\n");
-    PR_fprintf(err, "\t-h       This message and nothing else\n");
-}  /* Help */
-
-static void DumpAddr(const PRNetAddr* address, const char *msg)
-{
-    PRUint32 *word = (PRUint32*)address;
-    PRUint32 addr_len = sizeof(PRNetAddr);
-    PR_fprintf(err, "%s[%d]\t", msg, NETADDR_SIZE(address));
-    while (addr_len > 0)
-    {
-        PR_fprintf(err, " %08x", *word++);
-        addr_len -= sizeof(PRUint32);
-    }
-    PR_fprintf(err, "\n");
-}  /* DumpAddr */
-
-static PRStatus PrintAddress(const PRNetAddr* address)
-{
-    PRNetAddr translation;
-    char buffer[ADDR_BUFFER];
-    PRStatus rv = PR_NetAddrToString(address, buffer, sizeof(buffer));
-    if (PR_FAILURE == rv) PL_FPrintError(err, "PR_NetAddrToString");
-    else
-    {
-        PR_fprintf(err, "\t%s\n", buffer);
-        memset(&translation, 0, sizeof(translation));
-        rv = PR_StringToNetAddr(buffer, &translation);
-        if (PR_FAILURE == rv) PL_FPrintError(err, "PR_StringToNetAddr");
-        else
-        {
-            PRSize addr_len = NETADDR_SIZE(address);
-            if (0 != memcmp(address, &translation, addr_len))
-            {
-                PR_fprintf(err, "Address translations do not match\n");
-                DumpAddr(address, "original");
-                DumpAddr(&translation, "translate");
-                rv = PR_FAILURE;
-            }
-        }
-    }
-    return rv;
-}  /* PrintAddress */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PLOptStatus os;
-    PRHostEnt host;
-    PRProtoEnt proto;
-    const char *name = NULL;
-    PRBool failed = PR_FALSE, version = PR_FALSE;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "Vh");
-
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:  /* Name of host to lookup */
-            name = opt->value;
-            break;
-         case 'V':  /* Do version discovery */
-            version = PR_TRUE;
-            break;
-        case 'h':  /* user wants some guidance */
-         default:
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (version)
-    {
-#if defined(WINNT)
-#define NSPR_LIB "libnspr4"
-#else
-#define NSPR_LIB "nspr4"
-#endif
-        const PRVersionDescription *version_info;
-        char *nspr_path = PR_GetEnv("LD_LIBRARY_PATH");
-        char *nspr_name = PR_GetLibraryName(nspr_path, NSPR_LIB);
-        PRLibrary *runtime = PR_LoadLibrary(nspr_name);
-        if (NULL == runtime)
-            PL_FPrintError(err, "PR_LoadLibrary");
-        else
-        {
-            versionEntryPointType versionPoint = (versionEntryPointType)
-                PR_FindSymbol(runtime, "libVersionPoint");
-            if (NULL == versionPoint)
-                PL_FPrintError(err, "PR_FindSymbol");
-            else
-            {
-                char buffer[100];
-                PRExplodedTime exploded;
-                version_info = versionPoint();
-                (void)PR_fprintf(err, "Runtime library version information\n");
-                PR_ExplodeTime(
-                    version_info->buildTime, PR_GMTParameters, &exploded);
-                (void)PR_FormatTime(
-                    buffer, sizeof(buffer), "%d %b %Y %H:%M:%S", &exploded);
-                (void)PR_fprintf(err, "  Build time: %s GMT\n", buffer);
-                (void)PR_fprintf(
-                    err, "  Build time: %s\n", version_info->buildTimeString);
-                (void)PR_fprintf(
-                    err, "  %s V%u.%u.%u (%s%s%s)\n",
-                    version_info->description,
-                    version_info->vMajor,
-                    version_info->vMinor,
-                    version_info->vPatch,
-                    (version_info->beta ? " beta " : ""),
-                    (version_info->debug ? " debug " : ""),
-                    (version_info->special ? " special" : ""));
-                (void)PR_fprintf(err, "  filename: %s\n", version_info->filename);
-                (void)PR_fprintf(err, "  security: %s\n", version_info->security);
-                (void)PR_fprintf(err, "  copyright: %s\n", version_info->copyright);
-                (void)PR_fprintf(err, "  comment: %s\n", version_info->comment);
-            }
-        }
-        if (NULL != nspr_name) PR_FreeLibraryName(nspr_name);
-    }
-
-    {
-        if (NULL == name)
-        {
-            char *me = (char*)PR_MALLOC(DNS_BUFFER);
-            rv = PR_GetSystemInfo(PR_SI_HOSTNAME, me, DNS_BUFFER);
-            if (PR_FAILURE == rv)
-            {
-                failed = PR_TRUE;
-                PL_FPrintError(err, "PR_GetSystemInfo");
-                return 2;
-            }
-            name = me;  /* just leak the storage */
-        }
-    }
-
-    {
-        char buffer[HOST_BUFFER];
-        PR_fprintf(err, "Translating the name %s ...", name);
-
-        rv = PR_GetHostByName(name, buffer, sizeof(buffer), &host);
-        if (PR_FAILURE == rv)
-        {
-            failed = PR_TRUE;
-            PL_FPrintError(err, "PR_GetHostByName");
-        }
-        else
-        {
-            PRIntn index = 0;
-            PRNetAddr address;
-            memset(&address, 0, sizeof(PRNetAddr));
-            PR_fprintf(err, "success .. enumerating results\n");
-            do
-            {
-                index = PR_EnumerateHostEnt(index, &host, 0, &address);
-                if (index > 0) PrintAddress(&address);
-                else if (-1 == index)
-                {
-                    failed = PR_TRUE;
-                    PL_FPrintError(err, "PR_EnumerateHostEnt");
-                }
-            } while (index > 0);
-        }
-    }
-
-
-    {
-        char buffer[PROTO_BUFFER];
-        /*
-        ** Get Proto by name/number
-        */
-        rv = PR_GetProtoByName("tcp", &buffer[1], sizeof(buffer) - 1, &proto);
-        rv = PR_GetProtoByNumber(6, &buffer[3], sizeof(buffer) - 3, &proto);
-    }
-
-    return (failed) ? 1 : 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/join.c b/libs/js/nsprpub/pr/tests/join.c
deleted file mode 100644
index 73d7eb83e6..0000000000
--- a/libs/js/nsprpub/pr/tests/join.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc1.c
-**
-** Description: Tests PR_SetMallocCountdown PR_ClearMallocCountdown functions.
-**
-** Modification History:
-** 
-** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**		    AGarcia- Converted the test to accomodate the debug_mode flag.
-**          The debug mode will print all of the printfs associated with this test.
-**		    The regress mode will be the default mode. Since the regress tool limits
-**          the output to a one line status:PASS or FAIL,all of the printf statements
-**		    have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-#include "prttools.h"
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-/***********************************************************************
-** PRIVATE FUNCTION:    Test_Result
-** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**		        status of the test case.
-** INPUTS:      PASS/FAIL
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:   Determine what the status is and print accordingly.
-**      
-***********************************************************************/
-
-
-static void Test_Result (int result)
-{
-    if (result == PASS)
-        printf ("PASS\n");
-    else
-        printf ("FAIL\n");
-    exit (1);
-}
-
-
-/*
-    Program to test joining of threads.  Two threads are created.  One
-    to be waited upon until it has started.  The other to join after it has
-    completed.
-*/
-
-
-static void PR_CALLBACK lowPriority(void *arg)
-{
-}
-
-static void PR_CALLBACK highPriority(void *arg)
-{
-}
-
-static void PR_CALLBACK unjoinable(void *arg)
-{
-    PR_Sleep(PR_INTERVAL_NO_TIMEOUT);
-}
-
-void runTest(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *low,*high;
-
-    /* create the low and high priority threads */
-    
-    low = PR_CreateThread(PR_USER_THREAD,
-                     lowPriority, 0, 
-                     PR_PRIORITY_LOW,
-                     scope1,
-                     PR_JOINABLE_THREAD,
-                     0);
-    if (!low) {
-        if (debug_mode) printf("\tcannot create low priority thread\n");
-        else Test_Result(FAIL);
-        return;
-    }
-
-    high = PR_CreateThread(PR_USER_THREAD,
-                     highPriority, 0, 
-                     PR_PRIORITY_HIGH,
-                     scope2,
-                     PR_JOINABLE_THREAD,
-                     0);
-    if (!high) {
-        if (debug_mode) printf("\tcannot create high priority thread\n");
-        else Test_Result(FAIL);
-        return;
-    }
-
-    /* Do the joining for both threads */
-    if (PR_JoinThread(low) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot join low priority thread\n");
-        else Test_Result (FAIL);
-        return;
-    } else {
-        if (debug_mode) printf("\tjoined low priority thread\n");
-    }
-    if (PR_JoinThread(high) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot join high priority thread\n");
-        else Test_Result(FAIL);
-        return;
-    } else {
-        if (debug_mode) printf("\tjoined high priority thread\n");
-    }
-}
-
-void joinWithUnjoinable(void)
-{
-    PRThread *thread;
-
-    /* create the unjoinable thread */
-    
-    thread = PR_CreateThread(PR_USER_THREAD,
-                     unjoinable, 0, 
-                     PR_PRIORITY_NORMAL,
-                     PR_GLOBAL_THREAD,
-                     PR_UNJOINABLE_THREAD,
-                     0);
-    if (!thread) {
-        if (debug_mode) printf("\tcannot create unjoinable thread\n");
-        else Test_Result(FAIL);
-        return;
-    }
-
-    if (PR_JoinThread(thread) == PR_SUCCESS) {
-        if (debug_mode) printf("\tsuccessfully joined with unjoinable thread?!\n");
-        else Test_Result(FAIL);
-        return;
-    } else {
-        if (debug_mode) printf("\tcannot join with unjoinable thread, as expected\n");
-        if (PR_GetError() != PR_INVALID_ARGUMENT_ERROR) {
-            if (debug_mode) printf("\tWrong error code\n");
-            else Test_Result(FAIL);
-            return;
-        }
-    }
-    if (PR_Interrupt(thread) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot interrupt unjoinable thread\n");
-        else Test_Result(FAIL);
-        return;
-    } else {
-        if (debug_mode) printf("\tinterrupted unjoinable thread\n");
-    }
-}
-
-static PRIntn PR_CALLBACK RealMain(int argc, char **argv)
-{
-    /* The command line argument: -d is used to determine if the test is being run
-    in debug mode. The regress tool requires only one line output:PASS or FAIL.
-    All of the printfs associated with this test has been handled with a if (debug_mode)
-    test.
-    Usage: test_name -d
-    */
-    
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("join.log");
-    debug_mode = 1;
-#endif
-
-    
-    
- /* main test */
-    printf("User-User test\n");
-    runTest(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-    printf("User-Kernel test\n");
-    runTest(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-    printf("Kernel-User test\n");
-    runTest(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-    printf("Kernel-Kernel test\n");
-    runTest(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-    printf("Join with unjoinable thread\n");
-    joinWithUnjoinable();
-
-    printf("PASSED\n");
-
-    return 0;
-}
-
-
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/joinkk.c b/libs/js/nsprpub/pr/tests/joinkk.c
deleted file mode 100644
index 0fd991e516..0000000000
--- a/libs/js/nsprpub/pr/tests/joinkk.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc1.c
-**
-** Description: Tests PR_SetMallocCountdown PR_ClearMallocCountdown functions.
-**
-** Modification History:
-** 
-** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**			 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-/*
-	Program to test joining of threads.  Two threads are created.  One
-	to be waited upon until it has started.  The other to join after it has
-	completed.
-*/
-
-
-static void lowPriority(void *arg)
-{
-}
-
-static void highPriority(void *arg)
-{
-}
-
-void runTest(PRThreadScope scope1, PRThreadScope scope2)
-{
-	PRThread *low,*high;
-
-	/* create the low and high priority threads */
-	
-	low = PR_CreateThread(PR_USER_THREAD,
-				      lowPriority, 0, 
-				      PR_PRIORITY_LOW,
-				      scope1,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!low) {
-		if (debug_mode) printf("\tcannot create low priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	high = PR_CreateThread(PR_USER_THREAD,
-				      highPriority, 0, 
-				      PR_PRIORITY_HIGH,
-				      scope2,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!high) {
-		if (debug_mode) printf("\tcannot create high priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	/* Do the joining for both threads */
-	if (PR_JoinThread(low) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join low priority thread\n");
-		else  failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined low priority thread\n");
-    }
-	if (PR_JoinThread(high) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join high priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined high priority thread\n");
-    }
-}
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("join.log");
-#endif
-
-	
-	
- /* main test */
-
-    if (debug_mode) printf("Kernel-Kernel test\n");
-    runTest(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-
-	if(failed_already)	
-	{
-        printf("FAIL\n");
-		return 1;
-	}
-	else
-	{
-        printf("PASS\n");
-		return 0;
-	}
-
-}
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/joinku.c b/libs/js/nsprpub/pr/tests/joinku.c
deleted file mode 100644
index ecaa24c9ce..0000000000
--- a/libs/js/nsprpub/pr/tests/joinku.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc1.c
-**
-** Description: Tests PR_SetMallocCountdown PR_ClearMallocCountdown functions.
-**
-** Modification History:
-** 
-** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**			 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-/*
-	Program to test joining of threads.  Two threads are created.  One
-	to be waited upon until it has started.  The other to join after it has
-	completed.
-*/
-
-
-static void lowPriority(void *arg)
-{
-}
-
-static void highPriority(void *arg)
-{
-}
-
-void runTest(PRThreadScope scope1, PRThreadScope scope2)
-{
-	PRThread *low,*high;
-
-	/* create the low and high priority threads */
-	
-	low = PR_CreateThread(PR_USER_THREAD,
-				      lowPriority, 0, 
-				      PR_PRIORITY_LOW,
-				      scope1,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!low) {
-		if (debug_mode) printf("\tcannot create low priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	high = PR_CreateThread(PR_USER_THREAD,
-				      highPriority, 0, 
-				      PR_PRIORITY_HIGH,
-				      scope2,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!high) {
-		if (debug_mode) printf("\tcannot create high priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	/* Do the joining for both threads */
-	if (PR_JoinThread(low) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join low priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined low priority thread\n");
-    }
-	if (PR_JoinThread(high) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join high priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined high priority thread\n");
-    }
-}
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("joinku.log");
-#endif
-
-	
-	
- /* main test */
-
-    if (debug_mode) printf("Kernel-User test\n");
-    runTest(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-
-
-	if(failed_already)	
-    {
-		printf("FAIL\n");    
-		return 1;
-	}
-	else
-	{
-		printf("PASS\n");    
-		return 0;
-	}
-
-}
-
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/joinuk.c b/libs/js/nsprpub/pr/tests/joinuk.c
deleted file mode 100644
index 1564731dd7..0000000000
--- a/libs/js/nsprpub/pr/tests/joinuk.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: joinuk.c
-**
-** Description: Join kernel - user
-**
-** Modification History:
-** 
-** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**			 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-PRIntn failed_already=0;
-PRIntn debug_mode;
-/*
-	Program to test joining of threads.  Two threads are created.  One
-	to be waited upon until it has started.  The other to join after it has
-	completed.
-*/
-
-
-static void lowPriority(void *arg)
-{
-}
-
-static void highPriority(void *arg)
-{
-}
-
-void runTest(PRThreadScope scope1, PRThreadScope scope2)
-{
-	PRThread *low,*high;
-
-	/* create the low and high priority threads */
-	
-	low = PR_CreateThread(PR_USER_THREAD,
-				      lowPriority, 0, 
-				      PR_PRIORITY_LOW,
-				      scope1,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!low) {
-		if (debug_mode) printf("\tcannot create low priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	high = PR_CreateThread(PR_USER_THREAD,
-				      highPriority, 0, 
-				      PR_PRIORITY_HIGH,
-				      scope2,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!high) {
-		if (debug_mode) printf("\tcannot create high priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	/* Do the joining for both threads */
-	if (PR_JoinThread(low) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join low priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined low priority thread\n");
-    }
-	if (PR_JoinThread(high) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join high priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined high priority thread\n");
-    }
-}
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("joinuk.log");
-#endif
-
-	
-	
- /* main test */
-
-    if (debug_mode) printf("User-Kernel test\n");
-    runTest(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-
-
-	if(failed_already)	
-	{
-        printf("FAIL\n");
-		return 1;
-    } else 
-    {
-        printf("PASS\n");
-		return 0;
-    }
-}
-
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/joinuu.c b/libs/js/nsprpub/pr/tests/joinuu.c
deleted file mode 100644
index ea0d2d705e..0000000000
--- a/libs/js/nsprpub/pr/tests/joinuu.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: dbmalloc1.c
-**
-** Description: Join tests user - user
-**
-** Modification History:
-** 
-** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**			 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-/*
-	Program to test joining of threads.  Two threads are created.  One
-	to be waited upon until it has started.  The other to join after it has
-	completed.
-*/
-
-
-static void lowPriority(void *arg)
-{
-}
-
-static void highPriority(void *arg)
-{
-}
-
-void runTest(PRThreadScope scope1, PRThreadScope scope2)
-{
-	PRThread *low,*high;
-
-	/* create the low and high priority threads */
-	
-	low = PR_CreateThread(PR_USER_THREAD,
-				      lowPriority, 0, 
-				      PR_PRIORITY_LOW,
-				      scope1,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!low) {
-		if (debug_mode) printf("\tcannot create low priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	high = PR_CreateThread(PR_USER_THREAD,
-				      highPriority, 0, 
-				      PR_PRIORITY_HIGH,
-				      scope2,
-    				  PR_JOINABLE_THREAD,
-				      0);
-	if (!high) {
-		if (debug_mode) printf("\tcannot create high priority thread\n");
-		else failed_already=1;
-		return;
-	}
-
-	/* Do the joining for both threads */
-	if (PR_JoinThread(low) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join low priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined low priority thread\n");
-    }
-	if (PR_JoinThread(high) == PR_FAILURE) {
-		if (debug_mode) printf("\tcannot join high priority thread\n");
-		else failed_already=1;
-		return;
-	} else {
-    	if (debug_mode) printf("\tjoined high priority thread\n");
-    }
-}
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("joinuu.log");
-#endif
-
-	
-	
- /* main test */
-    if (debug_mode) printf("User-User test\n");
-    runTest(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-
-	if(failed_already)	
-	{
-        printf("FAIL\n");
-		return 1;
-    } else 
-    {
-        printf("PASS\n");
-		return 0;
-    }
-
-
-}
-
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/layer.c b/libs/js/nsprpub/pr/tests/layer.c
deleted file mode 100644
index cb914ba016..0000000000
--- a/libs/js/nsprpub/pr/tests/layer.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prprf.h"
-#include "prlog.h"
-#include "prnetdb.h"
-#include "prthread.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-#include "prwin16.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Testing layering of I/O
-**
-**      The layered server
-** A thread that acts as a server. It creates a TCP listener with a dummy
-** layer pushed on top. Then listens for incoming connections. Each connection
-** request for connection will be layered as well, accept one request, echo
-** it back and close.
-**
-**      The layered client
-** Pretty much what you'd expect.
-*/
-
-static PRFileDesc *logFile;
-static PRDescIdentity identity;
-static PRNetAddr server_address;
-
-static PRIOMethods myMethods;
-
-typedef enum Verbosity {silent, quiet, chatty, noisy} Verbosity;
-
-static PRIntn minor_iterations = 5;
-static PRIntn major_iterations = 1;
-static Verbosity verbosity = quiet;
-static PRUint16 default_port = 12273;
-
-static PRFileDesc *PushLayer(PRFileDesc *stack)
-{
-    PRFileDesc *layer = PR_CreateIOLayerStub(identity, &myMethods);
-    PRStatus rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer, stack);
-    PR_ASSERT(PR_SUCCESS == rv);
-    return stack;
-}  /* PushLayer */
-
-static PRFileDesc *PushNewLayers(PRFileDesc *stack)
-{
-	PRDescIdentity tmp_identity;
-    PRFileDesc *layer;
-    PRStatus rv;
-
-	/* push a dummy layer */
-    tmp_identity = PR_GetUniqueIdentity("Dummy 1");
-    layer = PR_CreateIOLayerStub(tmp_identity, PR_GetDefaultIOMethods());
-    rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer,
-															stack);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-	/* push a data procesing layer */
-    layer = PR_CreateIOLayerStub(identity, &myMethods);
-    rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer,
-													stack);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-	/* push another dummy layer */
-    tmp_identity = PR_GetUniqueIdentity("Dummy 2");
-    layer = PR_CreateIOLayerStub(tmp_identity, PR_GetDefaultIOMethods());
-    rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer,
-															stack);
-    PR_ASSERT(PR_SUCCESS == rv);
-    return stack;
-}  /* PushLayer */
-
-#if 0
-static PRFileDesc *PopLayer(PRFileDesc *stack)
-{
-    PRFileDesc *popped = PR_PopIOLayer(stack, identity);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Popped layer(0x%x) from stack(0x%x)\n", popped, stack);
-    popped->dtor(popped);
-    
-    return stack;
-}  /* PopLayer */
-#endif
-
-static void PR_CALLBACK Client(void *arg)
-{
-    PRStatus rv;
-    PRUint8 buffer[100];
-    PRIntn empty_flags = 0;
-    PRIntn bytes_read, bytes_sent;
-    PRFileDesc *stack = (PRFileDesc*)arg;
-
-    /* Initialize the buffer so that Purify won't complain */
-    memset(buffer, 0, sizeof(buffer));
-
-    rv = PR_Connect(stack, &server_address, PR_INTERVAL_NO_TIMEOUT);
-    PR_ASSERT(PR_SUCCESS == rv);
-    while (minor_iterations-- > 0)
-    {
-        bytes_sent = PR_Send(
-            stack, buffer, sizeof(buffer), empty_flags, PR_INTERVAL_NO_TIMEOUT);
-        PR_ASSERT(sizeof(buffer) == bytes_sent);
-        if (verbosity > chatty)
-            PR_fprintf(logFile, "Client sending %d bytes\n", bytes_sent);
-        bytes_read = PR_Recv(
-            stack, buffer, bytes_sent, empty_flags, PR_INTERVAL_NO_TIMEOUT);
-        if (verbosity > chatty)
-            PR_fprintf(logFile, "Client receiving %d bytes\n", bytes_read);
-        PR_ASSERT(bytes_read == bytes_sent);
-    }
-
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Client shutting down stack\n");
-    
-    rv = PR_Shutdown(stack, PR_SHUTDOWN_BOTH); PR_ASSERT(PR_SUCCESS == rv);
-}  /* Client */
-
-static void PR_CALLBACK Server(void *arg)
-{
-    PRStatus rv;
-    PRUint8 buffer[100];
-    PRFileDesc *service;
-    PRUintn empty_flags = 0;
-    PRIntn bytes_read, bytes_sent;
-    PRFileDesc *stack = (PRFileDesc*)arg;
-    PRNetAddr client_address;
-
-    service = PR_Accept(stack, &client_address, PR_INTERVAL_NO_TIMEOUT);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Server accepting connection\n");
-
-    do
-    {
-        bytes_read = PR_Recv(
-            service, buffer, sizeof(buffer), empty_flags, PR_INTERVAL_NO_TIMEOUT);
-        if (0 != bytes_read)
-        {
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Server receiving %d bytes\n", bytes_read);
-            PR_ASSERT(bytes_read > 0);
-            bytes_sent = PR_Send(
-                service, buffer, bytes_read, empty_flags, PR_INTERVAL_NO_TIMEOUT);
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Server sending %d bytes\n", bytes_sent);
-            PR_ASSERT(bytes_read == bytes_sent);
-        }
-
-    } while (0 != bytes_read);
-
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Server shutting down and closing stack\n");
-    rv = PR_Shutdown(service, PR_SHUTDOWN_BOTH); PR_ASSERT(PR_SUCCESS == rv);
-    rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
-
-}  /* Server */
-
-static PRInt32 PR_CALLBACK MyRecv(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    char *b = (char*)buf;
-    PRFileDesc *lo = fd->lower;
-    PRInt32 rv, readin = 0, request = 0;
-    rv = lo->methods->recv(lo, &request, sizeof(request), flags, timeout);
-    if (verbosity > chatty) PR_fprintf(
-        logFile, "MyRecv sending permission for %d bytes\n", request);
-    if (0 < rv)
-    {
-        if (verbosity > chatty) PR_fprintf(
-            logFile, "MyRecv received permission request for %d bytes\n", request);
-        rv = lo->methods->send(
-            lo, &request, sizeof(request), flags, timeout);
-        if (0 < rv)
-        {
-            if (verbosity > chatty) PR_fprintf(
-                logFile, "MyRecv sending permission for %d bytes\n", request);
-            while (readin < request)
-            {
-                rv = lo->methods->recv(
-                    lo, b + readin, amount - readin, flags, timeout);
-                if (rv <= 0) break;
-                if (verbosity > chatty) PR_fprintf(
-                    logFile, "MyRecv received %d bytes\n", rv);
-                readin += rv;
-            }
-            rv = readin;
-        }
-    }
-    return rv;
-}  /* MyRecv */
-
-static PRInt32 PR_CALLBACK MySend(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    PRFileDesc *lo = fd->lower;
-    const char *b = (const char*)buf;
-    PRInt32 rv, wroteout = 0, request;
-    if (verbosity > chatty) PR_fprintf(
-        logFile, "MySend asking permission to send %d bytes\n", amount);
-    rv = lo->methods->send(lo, &amount, sizeof(amount), flags, timeout);
-    if (0 < rv)
-    {
-        rv = lo->methods->recv(
-            lo, &request, sizeof(request), flags, timeout);
-        if (0 < rv)
-        {
-            PR_ASSERT(request == amount);
-            if (verbosity > chatty) PR_fprintf(
-                logFile, "MySend got permission to send %d bytes\n", request);
-            while (wroteout < request)
-            {
-                rv = lo->methods->send(
-                    lo, b + wroteout, request - wroteout, flags, timeout);
-                if (rv <= 0) break;
-                if (verbosity > chatty) PR_fprintf(
-                    logFile, "MySend wrote %d bytes\n", rv);
-                wroteout += rv;
-            }
-            rv = amount;
-        }
-    }
-    return rv;
-}  /* MySend */
-
-static Verbosity ChangeVerbosity(Verbosity verbosity, PRIntn delta)
-{
-    PRIntn verbage = (PRIntn)verbosity + delta;
-    if (verbage < (PRIntn)silent) verbage = (PRIntn)silent;
-    else if (verbage > (PRIntn)noisy) verbage = (PRIntn)noisy;
-    return (Verbosity)verbage;
-}  /* ChangeVerbosity */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PRIntn mits;
-    PLOptStatus os;
-    PRFileDesc *client, *service;
-    PRFileDesc *client_stack, *service_stack;
-    PRNetAddr any_address;
-    const char *server_name = NULL;
-    const PRIOMethods *stubMethods;
-    PRThread *client_thread, *server_thread;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dqGC:c:p:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:
-            server_name = opt->value;
-            break;
-        case 'd':  /* debug mode */
-            if (verbosity < noisy)
-                verbosity = ChangeVerbosity(verbosity, 1);
-            break;
-        case 'q':  /* debug mode */
-            if (verbosity > silent)
-                verbosity = ChangeVerbosity(verbosity, -1);
-            break;
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'C':  /* number of threads waiting */
-            major_iterations = atoi(opt->value);
-            break;
-        case 'c':  /* number of client threads */
-            minor_iterations = atoi(opt->value);
-            break;
-        case 'p':  /* default port */
-            default_port = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-    PR_STDIO_INIT();
-
-    logFile = PR_GetSpecialFD(PR_StandardError);
-
-    identity = PR_GetUniqueIdentity("Dummy");
-    stubMethods = PR_GetDefaultIOMethods();
-
-    /*
-    ** The protocol we're going to implement is one where in order to initiate
-    ** a send, the sender must first solicit permission. Therefore, every
-    ** send is really a send - receive - send sequence.
-    */
-    myMethods = *stubMethods;  /* first get the entire batch */
-    myMethods.recv = MyRecv;  /* then override the ones we care about */
-    myMethods.send = MySend;  /* then override the ones we care about */
-
-    if (NULL == server_name)
-        rv = PR_InitializeNetAddr(
-            PR_IpAddrLoopback, default_port, &server_address);
-    else
-    {
-        rv = PR_StringToNetAddr(server_name, &server_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_InitializeNetAddr(
-            PR_IpAddrNull, default_port, &server_address);
-    }
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    /* one type w/o layering */
-
-    mits = minor_iterations;
-    while (major_iterations-- > 0)
-    {
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Beginning non-layered test\n");
-        client = PR_NewTCPSocket(); PR_ASSERT(NULL != client);
-        service = PR_NewTCPSocket(); PR_ASSERT(NULL != service);
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &any_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(service, &any_address); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Listen(service, 10); PR_ASSERT(PR_SUCCESS == rv);
-
-        minor_iterations = mits;
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, Server, service,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != server_thread);
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, Client, client,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != client_thread);
-
-        rv = PR_JoinThread(client_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(server_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_Close(client); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Ending non-layered test\n");
-
-        /* with layering */
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Beginning layered test\n");
-        client = PR_NewTCPSocket(); PR_ASSERT(NULL != client);
-        PushLayer(client);
-        service = PR_NewTCPSocket(); PR_ASSERT(NULL != service);
-        PushLayer(service);
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &any_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(service, &any_address); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Listen(service, 10); PR_ASSERT(PR_SUCCESS == rv);
-
-        minor_iterations = mits;
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, Server, service,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != server_thread);
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, Client, client,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != client_thread);
-
-        rv = PR_JoinThread(client_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(server_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_Close(client); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
-        /* with layering, using new style stack */
-        if (verbosity > silent)
-            PR_fprintf(logFile,
-							"Beginning layered test with new style stack\n");
-        client = PR_NewTCPSocket(); PR_ASSERT(NULL != client);
-    	client_stack = PR_CreateIOLayer(client);
-        PushNewLayers(client_stack);
-        service = PR_NewTCPSocket(); PR_ASSERT(NULL != service);
-    	service_stack = PR_CreateIOLayer(service);
-        PushNewLayers(service_stack);
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &any_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(service, &any_address); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Listen(service, 10); PR_ASSERT(PR_SUCCESS == rv);
-
-        minor_iterations = mits;
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, Server, service_stack,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != server_thread);
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, Client, client_stack,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != client_thread);
-
-        rv = PR_JoinThread(client_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(server_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_Close(client_stack); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Close(service_stack); PR_ASSERT(PR_SUCCESS == rv);
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Ending layered test\n");
-    }
-    return 0;
-}  /* main */
-
-/* layer.c */
diff --git a/libs/js/nsprpub/pr/tests/lazyinit.c b/libs/js/nsprpub/pr/tests/lazyinit.c
deleted file mode 100644
index 09f0b6fa2a..0000000000
--- a/libs/js/nsprpub/pr/tests/lazyinit.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        lazyinit.c
-** Description: Testing lazy initialization
-**
-**      Since you only get to initialize once, you have to rerun the test
-**      for each test case. The test cases are numbered. If you want to
-**      add more tests, take the next number and add it to the switch
-**      statement.
-**
-**      This test is problematic on systems that don't support the notion
-**      of console output. The workarounds to emulate that feature include
-**      initializations themselves, which defeats the purpose here.
-*/
-
-#include "prcvar.h"
-#include "prenv.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prthread.h"
-#include "prtypes.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static void PR_CALLBACK lazyEntry(void *arg)
-{
-    PR_ASSERT(NULL == arg);
-}  /* lazyEntry */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRUintn pdkey;
-    PRStatus status;
-    char *path = NULL;
-    PRDir *dir = NULL;
-    PRLock *ml = NULL;
-    PRCondVar *cv = NULL;
-    PRThread *thread = NULL;
-    PRIntervalTime interval = 0;
-    PRFileDesc *file, *udp, *tcp, *pair[2];
-    PRIntn test;
-
-    if ( argc < 2)
-    {
-        test = 0;
-    }
-    else
-        test = atoi(argv[1]);
-        
-    switch (test)
-    {
-        case 0: ml = PR_NewLock(); 
-            break;
-            
-        case 1: interval = PR_SecondsToInterval(1);
-            break;
-            
-        case 2: thread = PR_CreateThread(
-            PR_USER_THREAD, lazyEntry, NULL, PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0); 
-            break;
-            
-        case 3: file = PR_Open("/usr/tmp/", PR_RDONLY, 0); 
-            break;
-            
-        case 4: udp = PR_NewUDPSocket(); 
-            break;
-            
-        case 5: tcp = PR_NewTCPSocket(); 
-            break;
-            
-        case 6: dir = PR_OpenDir("/usr/tmp/"); 
-            break;
-            
-        case 7: (void)PR_NewThreadPrivateIndex(&pdkey, NULL);
-            break;
-        
-        case 8: path = PR_GetEnv("PATH");
-            break;
-            
-        case 9: status = PR_NewTCPSocketPair(pair);
-            break;
-            
-        case 10: PR_SetConcurrency(2);
-            break;
-            
-        default: 
-            printf(
-                "lazyinit: unrecognized command line argument: %s\n", 
-                argv[1] );
-            printf( "FAIL\n" );
-            exit( 1 );
-            break;
-    } /* switch() */
-    return 0;
-}  /* Lazy */
-
-/* lazyinit.c */
diff --git a/libs/js/nsprpub/pr/tests/libfilename.c b/libs/js/nsprpub/pr/tests/libfilename.c
deleted file mode 100644
index ab482936dc..0000000000
--- a/libs/js/nsprpub/pr/tests/libfilename.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: libfilename.c
-**
-** Description: test PR_GetLibraryFilePathname.
-**
-***********************************************************************/
-
-#include "nspr.h"
-#include "pprio.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-PRBool debug_mode = PR_FALSE;
-
-static PRStatus RunTest(const char *name, PRFuncPtr addr)
-{
-    char *pathname;
-    PRFileDesc *fd;
-
-    pathname = PR_GetLibraryFilePathname(name, addr);
-    if (pathname == NULL) {
-        fprintf(stderr, "PR_GetLibraryFilePathname failed\n");
-        /* we let this test pass if this function is not implemented */
-        if (PR_GetError() == PR_NOT_IMPLEMENTED_ERROR) {
-            return PR_SUCCESS;
-        }
-        return PR_FAILURE;
-    }
-
-    if (debug_mode) printf("Pathname is %s\n", pathname);
-    fd = PR_OpenFile(pathname, PR_RDONLY, 0);
-    if (fd == NULL) {
-        fprintf(stderr, "PR_Open failed: %d\n", (int)PR_GetError());
-        return PR_FAILURE;
-    }
-    if (PR_Close(fd) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed: %d\n", (int)PR_GetError());
-        return PR_FAILURE;
-    }
-    PR_Free(pathname);
-    return PR_SUCCESS;
-}
-
-int main(int argc, char *argv[])
-{
-    char *name;
-    PRFuncPtr addr;
-    PRLibrary *lib;
-    PRBool failed = PR_FALSE;
-
-    if (argc >= 2 && strcmp(argv[1], "-d") == 0) {
-        debug_mode = PR_TRUE;
-    }
-
-    /* First test a library that is implicitly linked. */
-#ifdef WINNT
-    name = PR_Malloc(strlen("libnspr4.dll")+1);
-    strcpy(name, "libnspr4.dll");
-#else
-    name = PR_GetLibraryName(NULL, "nspr4");
-#endif
-    addr = (PRFuncPtr)PR_GetTCPMethods()->close;
-    if (RunTest(name, addr) == PR_FAILURE) {
-        failed = PR_TRUE;
-    }
-    PR_FreeLibraryName(name);
-
-    /* Next test a library that is dynamically loaded. */
-    name = PR_GetLibraryName("dll", "my");
-    if (debug_mode) printf("Loading library %s\n", name);
-    lib = PR_LoadLibrary(name);
-    if (!lib) {
-        fprintf(stderr, "PR_LoadLibrary failed\n");
-        exit(1);
-    }
-    PR_FreeLibraryName(name);
-    name = PR_GetLibraryName(NULL, "my");
-    addr = PR_FindFunctionSymbol(lib, "My_GetValue");
-    if (RunTest(name, addr) == PR_FAILURE) {
-        failed = PR_TRUE;
-    }
-    PR_FreeLibraryName(name);
-    PR_UnloadLibrary(lib);
-    if (failed) {
-        printf("FAIL\n");
-        return 1;
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/lltest.c b/libs/js/nsprpub/pr/tests/lltest.c
deleted file mode 100644
index f8ce4c6ab9..0000000000
--- a/libs/js/nsprpub/pr/tests/lltest.c
+++ /dev/null
@@ -1,859 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-/*
-** testll.c -- test suite for 64bit integer (longlong) operations
-**
-** Summary: testll [-d] | [-h]
-**
-** Where:
-** -d       set debug mode on; displays individual test failures
-** -v       verbose mode; displays progress in test, plus -d
-** -h       gives usage message.
-**
-** Description:
-** lltest.c tests the functions defined in NSPR 2.0's prlong.h.
-** 
-** Successive tests begin to depend on other LL functions working
-** correctly. So, ... Do not change the order of the tests as run
-** from main().
-** 
-** Caveats:
-** Do not even begin to think that this is an exhaustive test!
-**
-** These tests try a little of everything, but not all boundary
-** conditions and limits are tested.
-** You want better coverage? ... Add it.
-**
-** ---
-** Author: Lawrence Hardiman <larryh@netscape.com>.
-** ---
-** Revision History:
-** 01-Oct-1997. Original implementation.
-**
-*/
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-/* --- Local Definitions --- */
-#define ReportProgress(m) if (verboseMode) PR_fprintf(output, (m));
-
-
-/* --- Global variables --- */
-static PRIntn  failedAlready = 0;
-static PRFileDesc* output = NULL;
-static PRBool  debugMode = PR_FALSE;
-static PRBool  verboseMode = PR_FALSE;
-
-/*
-** Constants used in tests.
-*/
-const PRInt64 bigZero        = LL_INIT( 0, 0 );
-const PRInt64 bigOne         = LL_INIT( 0, 1 );
-const PRInt64 bigTwo         = LL_INIT( 0, 2 );
-const PRInt64 bigSixTeen     = LL_INIT( 0, 16 );        
-const PRInt64 bigThirtyTwo   = LL_INIT( 0, 32 );        
-const PRInt64 bigMinusOne    = LL_INIT( 0xffffffff, 0xffffffff );
-const PRInt64 bigMinusTwo    = LL_INIT( 0xffffffff, 0xfffffffe );
-const PRInt64 bigNumber      = LL_INIT( 0x7fffffff, 0xffffffff );
-const PRInt64 bigMinusNumber = LL_INIT( 0x80000000, 0x00000001 );
-const PRInt64 bigMaxInt32    = LL_INIT( 0x00000000, 0x7fffffff );
-const PRInt64 big2To31       = LL_INIT( 0x00000000, 0x80000000 );
-const PRUint64 bigZeroFox    = LL_INIT( 0x00000000, 0xffffffff );
-const PRUint64 bigFoxFox     = LL_INIT( 0xffffffff, 0xffffffff );
-const PRUint64 bigFoxZero    = LL_INIT( 0xffffffff, 0x00000000 );
-const PRUint64 bigEightZero  = LL_INIT( 0x80000000, 0x00000000 );
-const PRUint64 big64K        = LL_INIT( 0x00000000, 0x00010000 );
-const PRInt64 bigInt0        = LL_INIT( 0x01a00000, 0x00001000 );
-const PRInt64 bigInt1        = LL_INIT( 0x01a00000, 0x00001100 );
-const PRInt64 bigInt2        = LL_INIT( 0x01a00000, 0x00000100 );
-const PRInt64 bigInt3        = LL_INIT( 0x01a00001, 0x00001000 );
-const PRInt64 bigInt4        = LL_INIT( 0x01a00001, 0x00001100 );
-const PRInt64 bigInt5        = LL_INIT( 0x01a00001, 0x00000100 );
-const PRInt64 bigInt6        = LL_INIT( 0xb1a00000, 0x00001000 );
-const PRInt64 bigInt7        = LL_INIT( 0xb1a00000, 0x00001100 );
-const PRInt64 bigInt8        = LL_INIT( 0xb1a00000, 0x00000100 );
-const PRInt64 bigInt9        = LL_INIT( 0xb1a00001, 0x00001000 );
-const PRInt64 bigInt10       = LL_INIT( 0xb1a00001, 0x00001100 );
-const PRInt64 bigInt11       = LL_INIT( 0xb1a00001, 0x00000100 );
-const PRInt32 one = 1l;
-const PRInt32 minusOne = -1l;
-const PRInt32 sixteen  = 16l;
-const PRInt32 thirtyTwo = 32l;
-const PRInt32   sixtyThree = 63l;
-
-/*
-** SetFailed() -- Report individual test failure
-**
-*/
-static void
-SetFailed( char *what, char *how )
-{
-    failedAlready = 1;
-    if ( debugMode )
-        PR_fprintf(output, "%s: failed: %s\n", what, how );
-    return;
-}
-
-static void
-ResultFailed( char *what, char *how, PRInt64 expected, PRInt64 got)
-{
-    if ( debugMode)
-    {
-        SetFailed( what, how );
-        PR_fprintf(output, "Expected: 0x%llx   Got: 0x%llx\n", expected, got );
-    }
-    return;
-}    
-
-
-/*
-** TestAssignment() -- Test the assignment
-*/
-static void TestAssignment( void )
-{
-    PRInt64 zero = LL_Zero();
-    PRInt64 min = LL_MinInt();
-    PRInt64 max = LL_MaxInt();
-    if (!LL_EQ(zero, bigZero))
-        SetFailed("LL_EQ(zero, bigZero)", "!=");
-    if (!LL_CMP(max, >, min))
-        SetFailed("LL_CMP(max, >, min)", "!>");
-}
-
-/*
-** TestComparisons() -- Test the longlong comparison operations
-*/
-static void    
-TestComparisons( void )
-{
-    ReportProgress("Testing Comparisons Operations\n");
-         
-    /* test for zero */   
-    if ( !LL_IS_ZERO( bigZero ))
-        SetFailed( "LL_IS_ZERO", "Zero is not zero" );
-        
-    if ( LL_IS_ZERO( bigOne ))
-        SetFailed( "LL_IS_ZERO", "One tests as zero" );
-    
-    if ( LL_IS_ZERO( bigMinusOne ))
-        SetFailed( "LL_IS_ZERO", "Minus One tests as zero" );
-        
-    /* test equal */
-    if ( !LL_EQ( bigZero, bigZero ))
-        SetFailed( "LL_EQ", "zero EQ zero");
-        
-    if ( !LL_EQ( bigOne, bigOne ))
-        SetFailed( "LL_EQ", "one EQ one" );
-        
-    if ( !LL_EQ( bigNumber, bigNumber ))
-        SetFailed( "LL_EQ", "bigNumber EQ bigNumber" );
-        
-    if ( !LL_EQ( bigMinusOne, bigMinusOne ))
-        SetFailed( "LL_EQ", "minus one EQ minus one");
-    
-    if ( LL_EQ( bigZero, bigOne ))
-        SetFailed( "LL_EQ", "zero EQ one");
-        
-    if ( LL_EQ( bigOne, bigZero ))
-        SetFailed( "LL_EQ", "one EQ zero" );
-        
-    if ( LL_EQ( bigMinusOne, bigOne ))
-        SetFailed( "LL_EQ", "minus one EQ one");
-        
-    if ( LL_EQ( bigNumber, bigOne ))
-        SetFailed( "LL_EQ", "bigNumber EQ one");
-    
-    /* test not equal */
-    if ( LL_NE( bigZero, bigZero ))
-        SetFailed( "LL_NE", "0 NE 0");
-    
-    if ( LL_NE( bigOne, bigOne ))
-        SetFailed( "LL_NE", "1 NE 1");
-    
-    if ( LL_NE( bigMinusOne, bigMinusOne ))
-        SetFailed( "LL_NE", "-1 NE -1");
-    
-    if ( LL_NE( bigNumber, bigNumber ))
-        SetFailed( "LL_NE", "n NE n");
-    
-    if ( LL_NE( bigMinusNumber, bigMinusNumber ))
-        SetFailed( "LL_NE", "-n NE -n");
-        
-    if ( !LL_NE( bigZero, bigOne))
-        SetFailed( "LL_NE", "0 NE 1");
-    
-    if ( !LL_NE( bigOne, bigMinusNumber))
-        SetFailed( "LL_NE", "1 NE -n");
-        
-    /* Greater than or equal to zero */
-    if ( !LL_GE_ZERO( bigZero ))
-        SetFailed( "LL_GE_ZERO", "0");
-    
-    if ( !LL_GE_ZERO( bigOne ))
-        SetFailed( "LL_GE_ZERO", "1");
-    
-    if ( !LL_GE_ZERO( bigNumber ))
-        SetFailed( "LL_GE_ZERO", "n");
-    
-    if ( LL_GE_ZERO( bigMinusOne ))
-        SetFailed( "LL_GE_ZERO", "-1");
-        
-    if ( LL_GE_ZERO( bigMinusNumber ))
-        SetFailed( "LL_GE_ZERO", "-n");
-        
-    /* Algebraic Compare two values */
-    if ( !LL_CMP( bigZero, ==, bigZero ))
-        SetFailed( "LL_CMP", "0 == 0");
-    
-    if ( LL_CMP( bigZero, >, bigZero ))
-        SetFailed( "LL_CMP", "0 > 0");
-        
-    if ( LL_CMP( bigZero, <, bigZero ))
-        SetFailed( "LL_CMP", "0 < 0");
-        
-    if ( LL_CMP( bigNumber, <, bigOne ))
-        SetFailed( "LL_CMP", "n < 1");
-        
-    if ( !LL_CMP( bigNumber, >, bigOne ))
-        SetFailed( "LL_CMP", "n <= 1");
-        
-    if ( LL_CMP( bigOne, >, bigNumber ))
-        SetFailed( "LL_CMP", "1 > n");
-        
-    if ( LL_CMP( bigMinusNumber, >, bigNumber ))
-        SetFailed( "LL_CMP", "-n > n");
-        
-    if ( LL_CMP( bigNumber, !=, bigNumber))
-        SetFailed( "LL_CMP", "n != n");
-
-    if ( !LL_CMP( bigMinusOne, >, bigMinusTwo ))
-        SetFailed( "LL_CMP", "-1 <= -2");
-
-    if ( !LL_CMP( bigMaxInt32, <, big2To31 ))
-        SetFailed( "LL_CMP", "Max 32-bit signed int >= 2^31");
-
-    /* Two positive numbers */
-    if ( !LL_CMP( bigInt0, <=, bigInt0 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt0, <=, bigInt1 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( LL_CMP( bigInt0, <=, bigInt2 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt0, <=, bigInt3 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt0, <=, bigInt4 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt0, <=, bigInt5 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    /* Two negative numbers */
-    if ( !LL_CMP( bigInt6, <=, bigInt6 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt6, <=, bigInt7 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( LL_CMP( bigInt6, <=, bigInt8 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt6, <=, bigInt9 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt6, <=, bigInt10 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( !LL_CMP( bigInt6, <=, bigInt11 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    /* One positive, one negative */
-    if ( LL_CMP( bigInt0, <=, bigInt6 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( LL_CMP( bigInt0, <=, bigInt7 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    if ( LL_CMP( bigInt0, <=, bigInt8 ))
-        SetFailed( "LL_CMP", "LL_CMP(<=) failed");
-
-    /* Bitwise Compare two numbers */
-    if ( !LL_UCMP( bigZero, ==, bigZero ))
-        SetFailed( "LL_UCMP", "0 == 0");
-    
-    if ( LL_UCMP( bigZero, >, bigZero ))
-        SetFailed( "LL_UCMP", "0 > 0");
-        
-    if ( LL_UCMP( bigZero, <, bigZero ))
-        SetFailed( "LL_UCMP", "0 < 0");
-        
-    if ( LL_UCMP( bigNumber, <, bigOne ))
-        SetFailed( "LL_UCMP", "n < 1");
-        
-    if ( !LL_UCMP( bigNumber, >, bigOne ))
-        SetFailed( "LL_UCMP", "n < 1");
-        
-    if ( LL_UCMP( bigOne, >, bigNumber ))
-        SetFailed( "LL_UCMP", "1 > n");
-        
-    if ( LL_UCMP( bigMinusNumber, <, bigNumber ))
-        SetFailed( "LL_UCMP", "-n < n");
-
-    /* Two positive numbers */
-    if ( !LL_UCMP( bigInt0, <=, bigInt0 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt1 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( LL_UCMP( bigInt0, <=, bigInt2 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt3 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt4 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt5 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    /* Two negative numbers */
-    if ( !LL_UCMP( bigInt6, <=, bigInt6 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt6, <=, bigInt7 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( LL_UCMP( bigInt6, <=, bigInt8 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt6, <=, bigInt9 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt6, <=, bigInt10 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt6, <=, bigInt11 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    /* One positive, one negative */
-    if ( !LL_UCMP( bigInt0, <=, bigInt6 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt7 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    if ( !LL_UCMP( bigInt0, <=, bigInt8 ))
-        SetFailed( "LL_UCMP", "LL_UCMP(<=) failed");
-
-    return;
-}
-
-/*
-**  TestLogicalOperations() -- Tests for AND, OR, ...
-**
-*/
-static void
-TestLogicalOperations( void )
-{
-    PRUint64    result, result2;
-    
-    ReportProgress("Testing Logical Operations\n");
-    
-    /* Test AND */
-    LL_AND( result, bigZero, bigZero );
-    if ( !LL_IS_ZERO( result ))
-        ResultFailed( "LL_AND", "0 & 0", bigZero, result );
-    
-    LL_AND( result, bigOne, bigOne );
-    if ( LL_IS_ZERO( result ))
-        ResultFailed( "LL_AND", "1 & 1", bigOne, result );
-
-    LL_AND( result, bigZero, bigOne );
-    if ( !LL_IS_ZERO( result ))
-        ResultFailed( "LL_AND", "1 & 1", bigZero, result );
-
-    LL_AND( result, bigMinusOne, bigMinusOne );
-    if ( !LL_UCMP( result, ==, bigMinusOne ))
-        ResultFailed( "LL_AND", "-1 & -1", bigMinusOne, result );
-        
-    /* test OR */
-    LL_OR( result, bigZero, bigZero );
-    if ( !LL_IS_ZERO( result ))
-        ResultFailed( "LL_OR", "0 | 1", bigZero, result);
-    
-    LL_OR( result, bigZero, bigOne );
-    if ( LL_IS_ZERO( result ))
-        ResultFailed( "LL_OR", "0 | 1", bigOne, result );
-    
-    LL_OR( result, bigZero, bigMinusNumber );
-    if ( !LL_UCMP( result, ==, bigMinusNumber ))
-        ResultFailed( "LL_OR", "0 | -n", bigMinusNumber, result);
-    
-    LL_OR( result, bigMinusNumber, bigZero );
-    if ( !LL_UCMP( result, ==, bigMinusNumber ))
-        ResultFailed( "LL_OR", "-n | 0", bigMinusNumber, result );
-    
-    /* test XOR */
-    LL_XOR( result, bigZero, bigZero );
-    if ( LL_UCMP( result, !=, bigZero ))
-        ResultFailed( "LL_XOR", "0 ^ 0", bigZero, result);
-    
-    LL_XOR( result, bigOne, bigZero );
-    if ( LL_UCMP( result, !=, bigOne ))
-        ResultFailed( "LL_XOR", "1 ^ 0", bigZero, result );
-        
-    LL_XOR( result, bigMinusNumber, bigZero );
-    if ( LL_UCMP( result, !=, bigMinusNumber ))
-        ResultFailed( "LL_XOR", "-n ^ 0", bigMinusNumber, result );
-    
-    LL_XOR( result, bigMinusNumber, bigMinusNumber );
-    if ( LL_UCMP( result, !=, bigZero ))
-        ResultFailed( "LL_XOR", "-n ^ -n", bigMinusNumber, result);
-        
-    /* test OR2.  */
-    result = bigZero;
-    LL_OR2( result, bigOne );
-    if ( LL_UCMP( result, !=, bigOne ))
-        ResultFailed( "LL_OR2", "(r=0) |= 1", bigOne, result);
-        
-    result = bigOne;
-    LL_OR2( result, bigNumber );
-    if ( LL_UCMP( result, !=, bigNumber ))
-        ResultFailed( "LL_OR2", "(r=1) |= n", bigNumber, result);
-
-    result = bigMinusNumber;
-    LL_OR2( result, bigMinusNumber );
-    if ( LL_UCMP( result, !=, bigMinusNumber ))
-        ResultFailed( "LL_OR2", "(r=-n) |= -n", bigMinusNumber, result);
-
-    /* test NOT */
-    LL_NOT( result, bigMinusNumber);
-    LL_NOT( result2, result);
-    if ( LL_UCMP( result2, !=, bigMinusNumber ))
-        ResultFailed( "LL_NOT", "r != ~(~-n)", bigMinusNumber, result);
-            
-    /* test Negation */
-    LL_NEG( result, bigMinusNumber );
-    LL_NEG( result2, result );
-    if ( LL_CMP( result2, !=, bigMinusNumber ))
-        ResultFailed( "LL_NEG", "r != -(-(-n))", bigMinusNumber, result);
-
-    return;
-}
-
-
-
-/*
-**  TestConversion() -- Test Conversion Operations
-**
-*/
-static void
-TestConversion( void )
-{
-    PRInt64     result;
-    PRInt64     resultU;
-    PRInt32     result32;
-    PRUint32    resultU32;
-    float       resultF;
-    PRFloat64   resultD;
-    
-    ReportProgress("Testing Conversion Operations\n");
-    
-    /* LL_L2I  -- Convert to signed 32bit */
-    LL_L2I(result32, bigOne );
-    if ( result32 != one )  
-        SetFailed( "LL_L2I", "r != 1");
-    
-    LL_L2I(result32, bigMinusOne );
-    if ( result32 != minusOne )  
-        SetFailed( "LL_L2I", "r != -1");
-    
-    /* LL_L2UI -- Convert 64bit to unsigned 32bit */
-    LL_L2UI( resultU32, bigMinusOne );
-    if ( resultU32 != (PRUint32) minusOne )
-        SetFailed( "LL_L2UI", "r != -1");
-    
-    LL_L2UI( resultU32, bigOne );
-    if ( resultU32 != (PRUint32) one )
-        SetFailed( "LL_L2UI", "r != 1");
-        
-    /* LL_L2F  -- Convert to 32bit floating point */
-    LL_L2F( resultF, bigOne );
-    if ( resultF != 1.0 )
-        SetFailed( "LL_L2F", "r != 1.0");
-        
-    LL_L2F( resultF, bigMinusOne );
-    if ( resultF != -1.0 )
-        SetFailed( "LL_L2F", "r != 1.0");
-    
-    /* LL_L2D  -- Convert to 64bit floating point */
-    LL_L2D( resultD, bigOne );
-    if ( resultD != 1.0L )
-        SetFailed( "LL_L2D", "r != 1.0");
-        
-    LL_L2D( resultD, bigMinusOne );
-    if ( resultD != -1.0L )
-        SetFailed( "LL_L2D", "r != -1.0");
-        
-    /* LL_I2L  -- Convert 32bit signed to 64bit signed */
-    LL_I2L( result, one );
-    if ( LL_CMP(result, !=, bigOne ))
-        SetFailed( "LL_I2L", "r != 1");
-        
-    LL_I2L( result, minusOne );
-    if ( LL_CMP(result, !=, bigMinusOne ))
-        SetFailed( "LL_I2L", "r != -1");
-        
-    /* LL_UI2L -- Convert 32bit unsigned to 64bit unsigned */
-    LL_UI2L( resultU, (PRUint32) one );
-    if ( LL_CMP(resultU, !=, bigOne ))
-        SetFailed( "LL_UI2L", "r != 1");
-        
-    /* [lth.] This did not behave as expected, but it is correct 
-    */
-    LL_UI2L( resultU, (PRUint32) minusOne );
-    if ( LL_CMP(resultU, !=, bigZeroFox ))
-        ResultFailed( "LL_UI2L", "r != -1", bigZeroFox, resultU);
-        
-    /* LL_F2L  -- Convert 32bit float to 64bit signed */
-    LL_F2L( result, 1.0 );
-    if ( LL_CMP(result, !=, bigOne ))
-        SetFailed( "LL_F2L", "r != 1");
-        
-    LL_F2L( result, -1.0 );
-    if ( LL_CMP(result, !=, bigMinusOne ))
-        SetFailed( "LL_F2L", "r != -1");
-    
-    /* LL_D2L  -- Convert 64bit Float to 64bit signed */
-    LL_D2L( result, 1.0L );
-    if ( LL_CMP(result, !=, bigOne ))
-        SetFailed( "LL_D2L", "r != 1");
-        
-    LL_D2L( result, -1.0L );
-    if ( LL_CMP(result, !=, bigMinusOne ))
-        SetFailed( "LL_D2L", "r != -1");
-
-    return;
-}
-
-static void ShiftCompileOnly()
-{
-    /*
-    ** This function is only compiled, never called.
-    ** The real test is to see if it compiles w/o
-    ** warnings. This is no small feat, by the way.
-    */
-    PRInt64 ia, ib;
-    PRUint64 ua, ub;
-    LL_SHR(ia, ib, 32);
-    LL_SHL(ia, ib, 32);
-
-    LL_USHR(ua, ub, 32);
-    LL_ISHL(ia, 49, 32);
-
-}  /* ShiftCompileOnly */
-   
-
-/*
-**  TestShift() -- Test Shifting Operations
-**
-*/
-static void
-TestShift( void )
-{
-    static const PRInt64 largeTwoZero = LL_INIT( 0x00000002, 0x00000000 );
-    PRInt64     result;
-    PRUint64    resultU;
-
-    ReportProgress("Testing Shifting Operations\n");
-    
-    /* LL_SHL  -- Shift left algebraic */
-    LL_SHL( result, bigOne, one );
-    if ( LL_CMP( result, !=, bigTwo ))
-        ResultFailed( "LL_SHL", "r != 2", bigOne, result );
-    
-    LL_SHL( result, bigTwo, thirtyTwo );
-    if ( LL_CMP( result, !=, largeTwoZero ))
-        ResultFailed( "LL_SHL", "r != twoZero", largeTwoZero, result);
-    
-    /* LL_SHR  -- Shift right algebraic */
-    LL_SHR( result, bigFoxZero, thirtyTwo );
-    if ( LL_CMP( result, !=, bigMinusOne ))
-        ResultFailed( "LL_SHR", "r != -1", bigMinusOne, result);
-    
-    LL_SHR( result, bigTwo, one );
-    if ( LL_CMP( result, !=, bigOne ))
-        ResultFailed( "LL_SHR", "r != 1", bigOne, result);
-
-    LL_SHR( result, bigFoxFox, thirtyTwo );
-    if ( LL_CMP( result, !=, bigMinusOne ))
-        ResultFailed( "LL_SHR", "r != -1 (was ff,ff)", bigMinusOne, result);
-    
-    /* LL_USHR -- Logical shift right */
-    LL_USHR( resultU, bigZeroFox, thirtyTwo );
-    if ( LL_UCMP( resultU, !=, bigZero ))
-        ResultFailed( "LL_USHR", "r != 0 ", bigZero, result);
-    
-    LL_USHR( resultU, bigFoxFox, thirtyTwo );
-    if ( LL_UCMP( resultU, !=, bigZeroFox ))
-        ResultFailed( "LL_USHR", "r != 0 ", bigZeroFox, result);
-    
-    /* LL_ISHL -- Shift a 32bit integer into a 64bit result */
-    LL_ISHL( resultU, minusOne, thirtyTwo );
-    if ( LL_UCMP( resultU, !=, bigFoxZero ))
-        ResultFailed( "LL_ISHL", "r != ff,00 ", bigFoxZero, result);
-    
-    LL_ISHL( resultU, one, sixtyThree );
-    if ( LL_UCMP( resultU, !=, bigEightZero ))
-        ResultFailed( "LL_ISHL", "r != 80,00 ", bigEightZero, result);
-    
-    LL_ISHL( resultU, one, sixteen );
-    if ( LL_UCMP( resultU, !=, big64K ))
-        ResultFailed( "LL_ISHL", "r != 64K ", big64K, resultU);
-    
-    return;
-}    
-
-
-/*
-**  TestArithmetic() -- Test arithmetic operations.
-**
-*/
-static void
-TestArithmetic( void )
-{
-    PRInt64 largeVal          = LL_INIT( 0x00000001, 0xffffffff );
-    PRInt64 largeValPlusOne   = LL_INIT( 0x00000002, 0x00000000 );
-    PRInt64 largeValTimesTwo  = LL_INIT( 0x00000003, 0xfffffffe );
-    PRInt64 largeMultCand     = LL_INIT( 0x00000000, 0x7fffffff );
-    PRInt64 largeMinusMultCand = LL_INIT( 0xffffffff, 0x10000001 );
-    PRInt64 largeMultCandx64K = LL_INIT( 0x00007fff, 0xffff0000 );
-    PRInt64 largeNumSHL5      = LL_INIT( 0x0000001f, 0xffffffe0 );        
-    PRInt64 result, result2;
-
-    /* Addition */    
-    LL_ADD( result, bigOne, bigOne );
-    if ( LL_CMP( result, !=, bigTwo ))
-        ResultFailed( "LL_ADD", "r != 1 + 1", bigTwo, result);
-
-    LL_ADD( result, bigMinusOne, bigOne );
-    if ( LL_CMP( result, !=, bigZero ))
-        ResultFailed( "LL_ADD", "r != -1 + 1", bigOne, result);
-
-    LL_ADD( result, largeVal, bigOne );
-    if ( LL_CMP( result, !=, largeValPlusOne ))
-        ResultFailed( "LL_ADD", "lVP1 != lV + 1", largeValPlusOne, result);
-            
-    /* Subtraction */
-    LL_SUB( result, bigOne, bigOne );
-    if ( LL_CMP( result, !=, bigZero ))
-        ResultFailed( "LL_SUB", "r != 1 - 1", bigZero, result);
-            
-    LL_SUB( result, bigTwo, bigOne );
-    if ( LL_CMP( result, !=, bigOne ))
-        ResultFailed( "LL_SUB", "r != 2 - 1", bigOne, result);
-            
-    LL_SUB( result, largeValPlusOne, bigOne );
-    if ( LL_CMP( result, !=, largeVal ))
-        ResultFailed( "LL_SUB", "r != lVP1 - 1", largeVal, result);
-            
-    
-    /* Multiply */
-    LL_MUL( result, largeVal, bigTwo );
-    if ( LL_CMP( result, !=, largeValTimesTwo ))
-        ResultFailed( "LL_MUL", "r != lV*2", largeValTimesTwo, result);
-    
-    LL_MUL( result, largeMultCand, big64K );
-    if ( LL_CMP( result, !=, largeMultCandx64K ))
-        ResultFailed( "LL_MUL", "r != lV*64K", largeMultCandx64K, result);
-        
-    LL_NEG( result2, largeMultCand );
-    LL_MUL( result, largeMultCand, bigMinusOne );
-    if ( LL_CMP( result, !=, result2  ))
-        ResultFailed( "LL_MUL", "r != -lMC", result2, result);
-
-    LL_SHL( result2, bigZeroFox, 5);
-    LL_MUL( result, bigZeroFox, bigThirtyTwo );
-    if ( LL_CMP( result, !=, largeNumSHL5  ))
-        ResultFailed( "LL_MUL", "r != 0f<<5", largeNumSHL5, result );
-
-    
-
-    /* LL_DIV() Division */
-    LL_DIV( result, bigOne, bigOne);
-    if ( LL_CMP( result, !=, bigOne ))
-        ResultFailed( "LL_DIV", "1 != 1", bigOne, result);
-    
-    LL_DIV( result, bigNumber, bigOne );
-    if ( LL_CMP( result, !=, bigNumber  ))
-        ResultFailed( "LL_DIV", "r != n / 1", bigNumber, result);
-
-    LL_DIV( result, bigNumber, bigMinusOne );
-    if ( LL_CMP( result, !=, bigMinusNumber  ))
-        ResultFailed( "LL_DIV", "r != n / -1", bigMinusNumber, result);
-
-    LL_DIV( result, bigMinusNumber, bigMinusOne );
-    if ( LL_CMP( result, !=, bigNumber  ))
-        ResultFailed( "LL_DIV", "r != -n / -1", bigNumber, result);
-        
-    LL_SHL( result2, bigZeroFox, 5 );
-    LL_DIV( result, result2, bigOne );
-    if ( LL_CMP( result, !=, result2  ))
-        ResultFailed( "LL_DIV", "0f<<5 != 0f<<5", result2, result);
-    
-    LL_SHL( result2, bigZeroFox, 5 );
-    LL_NEG( result2, result2 );
-    LL_DIV( result, result2, bigOne );
-    if ( LL_CMP( result, !=, result2  ))
-        ResultFailed( "LL_DIV", "-0f<<5 != -0f<<5", result2, result);
-    
-    LL_SHL( result2, bigZeroFox, 17 );
-    LL_DIV( result, result2, bigMinusOne );
-    LL_NEG( result2, result2 );
-    if ( LL_CMP( result, !=, result2  ))
-        ResultFailed( "LL_DIV", "-0f<<17 != -0f<<17", result2, result);
-    
-    
-    /* LL_MOD() Modulo Division */
-    LL_ADD( result2, bigThirtyTwo, bigOne );
-    LL_MOD( result, result2, bigSixTeen );
-    if ( LL_CMP( result, !=, bigOne ))
-        ResultFailed( "LL_MOD", "r != 1", bigSixTeen, result);
-    
-    
-    LL_MUL( result2, bigZeroFox, bigThirtyTwo );
-    LL_ADD( result2, result2, bigSixTeen);
-    LL_MOD( result, result2, bigThirtyTwo );
-    if ( LL_CMP( result, !=, bigSixTeen ))
-        ResultFailed( "LL_MOD", "r != 16", bigSixTeen, result);
-
-    /* LL_UDIVMOD */
-    LL_DIV( result, bigOne, bigOne);
-    if ( LL_CMP( result, !=, bigOne ))
-        ResultFailed( "LL_DIV", "r != 16", bigSixTeen, result);
-    
-
-    return;
-} 
-
-static void TestWellknowns(void)
-{
-    PRInt64 max = LL_MAXINT, min = LL_MININT, zero = LL_ZERO;
-    PRInt64 mmax = LL_MaxInt(), mmin = LL_MinInt(), mzero = LL_Zero();
-    if (LL_NE(max, mmax))
-        ResultFailed( "max, mmax", "max != mmax", max, mmax);
-    if (LL_NE(min, mmin))
-        ResultFailed( "min, mmin", "min != mmin", max, mmin);
-    if (LL_NE(zero, mzero))
-        ResultFailed( "zero, mzero", "zero != mzero", zero, mzero);
-}  /* TestWellknowns */ 
-
-/*
-** Initialize() -- Initialize the test case
-**
-** Parse command line options
-**
-*/
-static PRIntn
-Initialize( PRIntn argc, char **argv )
-{
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dvh");
-    PLOptStatus os;
-
-    /*
-    ** Parse command line options
-    */    
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* set debug mode */
-            debugMode = PR_TRUE;
-            break;
-            
-        case 'v':  /* set verbose mode */
-            verboseMode = PR_TRUE;
-            debugMode = PR_TRUE;
-            break;
-            
-        case 'h':  /* user wants some guidance */
-        default:
-            PR_fprintf(output, "You get help.\n");
-            return(1);
-        }
-    }
-    PL_DestroyOptState(opt);
-    return(0);
-}    
-
-PRIntn main( int argc, char **argv )
-{
-    PR_STDIO_INIT();
-    output = PR_GetSpecialFD(PR_StandardError);
-
-    if ( Initialize( argc, argv ))
-        return(1);
-
-    TestAssignment();
-    TestComparisons();
-    TestLogicalOperations();
-    TestConversion();
-    TestShift();
-    TestArithmetic();
-    TestWellknowns();
-    
-    /*
-    ** That's all folks!
-    */
-    if ( failedAlready )
-    {
-        PR_fprintf(output, "FAIL\n");\
-    } 
-    else
-    {
-        PR_fprintf(output, "PASS\n");\
-    }
-    return failedAlready;
-} /* end main() */
diff --git a/libs/js/nsprpub/pr/tests/lock.c b/libs/js/nsprpub/pr/tests/lock.c
deleted file mode 100644
index e0e23d018c..0000000000
--- a/libs/js/nsprpub/pr/tests/lock.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        lock.c
-** Purpose:     test basic locking functions
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-**
-** 11-Aug-97 LarryH. Win16 port of NSPR.
-**           - Added "PASS", "FAIL" messages on completion.
-**           - Change stack variables to static scope variables
-**             because of shadow-stack use by Win16
-**           - Added PR_CALLBACK attribute to functions called by NSPR
-**           - Added command line arguments:
-**             - l <num> to control the number of loops
-**             - c <num> to control the number of CPUs.
-**             (was positional argv).
-** 
-**
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prio.h"
-#include "prcmon.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prprf.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmon.h"
-#include "prmem.h"
-#include "prthread.h"
-#include "prtypes.h"
-
-#include "plstr.h"
-
-#include <stdlib.h>
-
-#if defined(XP_UNIX)
-#include <string.h>
-#endif
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-static PRIntn failed_already=0;
-static PRFileDesc *std_err = NULL;
-static PRBool verbosity = PR_FALSE;
-static PRBool debug_mode = PR_FALSE;
-
-const static PRIntervalTime contention_interval = 50;
-
-typedef struct LockContentious_s {
-    PRLock *ml;
-    PRInt32 loops;
-    PRUint32 contender;
-    PRUint32 contentious;
-    PRIntervalTime overhead;
-    PRIntervalTime interval;
-} LockContentious_t;
-
-typedef struct MonitorContentious_s {
-    PRMonitor *ml;
-    PRInt32 loops;
-    PRUint32 contender;
-    PRUint32 contentious;
-    PRIntervalTime overhead;
-    PRIntervalTime interval;
-} MonitorContentious_t;
-
-
-static PRIntervalTime Sleeper(PRUint32 loops)
-{
-    PRIntervalTime predicted = 0;
-    while (loops-- > 0)
-    {
-        predicted += contention_interval;
-        (void)PR_Sleep(contention_interval);
-    }
-    return predicted;
-}  /* Sleeper */
-
-/*
-** BASIC LOCKS
-*/
-static PRIntervalTime MakeLock(PRUint32 loops)
-{
-    PRLock *ml = NULL;
-    while (loops-- > 0)
-    {
-        ml = PR_NewLock();
-        PR_DestroyLock(ml);
-        ml = NULL;
-    }
-    return 0;
-}  /* MakeLock */
-
-static PRIntervalTime NonContentiousLock(PRUint32 loops)
-{
-    PRLock *ml = NULL;
-    ml = PR_NewLock();
-    while (loops-- > 0)
-    {
-        PR_Lock(ml);
-        PR_Unlock(ml);
-    }
-    PR_DestroyLock(ml);
-    return 0;
-}  /* NonContentiousLock */
-
-static void PR_CALLBACK LockContender(void *arg)
-{
-    LockContentious_t *contention = (LockContentious_t*)arg;
-    while (contention->loops-- > 0)
-    {
-        PR_Lock(contention->ml);
-        contention->contender+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_Unlock(contention->ml);
-    }
-}  /* LockContender */
-
-static PRIntervalTime ContentiousLock(PRUint32 loops)
-{
-    PRStatus status;
-    PRThread *thread = NULL;
-    LockContentious_t * contention;
-    PRIntervalTime rv, overhead, timein = PR_IntervalNow();
-
-    contention = PR_NEWZAP(LockContentious_t);
-    contention->loops = loops;
-    contention->overhead = 0;
-    contention->ml = PR_NewLock();
-    contention->interval = contention_interval;
-    thread = PR_CreateThread(
-        PR_USER_THREAD, LockContender, contention,
-        PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(thread != NULL);
-
-    overhead = PR_IntervalNow() - timein;
-
-    while (contention->loops-- > 0)
-    {
-        PR_Lock(contention->ml);
-        contention->contentious+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_Unlock(contention->ml);
-    }
-
-    timein = PR_IntervalNow();
-    status = PR_JoinThread(thread);
-    PR_DestroyLock(contention->ml);
-    overhead += (PR_IntervalNow() - timein);
-    rv = overhead + contention->overhead;
-    if (verbosity)
-        PR_fprintf(
-            std_err, "Access ratio: %u to %u\n",
-            contention->contentious, contention->contender);
-    PR_Free(contention);
-    return rv;
-}  /* ContentiousLock */
-
-/*
-** MONITORS
-*/
-static PRIntervalTime MakeMonitor(PRUint32 loops)
-{
-    PRMonitor *ml = NULL;
-    while (loops-- > 0)
-    {
-        ml = PR_NewMonitor();
-        PR_DestroyMonitor(ml);
-        ml = NULL;
-    }
-    return 0;
-}  /* MakeMonitor */
-
-static PRIntervalTime NonContentiousMonitor(PRUint32 loops)
-{
-    PRMonitor *ml = NULL;
-    ml = PR_NewMonitor();
-    while (loops-- > 0)
-    {
-        PR_EnterMonitor(ml);
-        PR_ExitMonitor(ml);
-    }
-    PR_DestroyMonitor(ml);
-    return 0;
-}  /* NonContentiousMonitor */
-
-static void PR_CALLBACK TryEntry(void *arg)
-{
-    PRMonitor *ml = (PRMonitor*)arg;
-    if (debug_mode) PR_fprintf(std_err, "Reentrant thread created\n");
-    PR_EnterMonitor(ml);
-    if (debug_mode) PR_fprintf(std_err, "Reentrant thread acquired monitor\n");
-    PR_ExitMonitor(ml);
-    if (debug_mode) PR_fprintf(std_err, "Reentrant thread released monitor\n");
-}  /* TryEntry */
-
-static PRIntervalTime ReentrantMonitor(PRUint32 loops)
-{
-    PRStatus status;
-    PRThread *thread;
-    PRMonitor *ml = PR_NewMonitor();
-    if (debug_mode) PR_fprintf(std_err, "\nMonitor created for reentrant test\n");
-
-    PR_EnterMonitor(ml);
-    PR_EnterMonitor(ml);
-    if (debug_mode) PR_fprintf(std_err, "Monitor acquired twice\n");
-
-    thread = PR_CreateThread(
-        PR_USER_THREAD, TryEntry, ml,
-        PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(thread != NULL);
-    PR_Sleep(PR_SecondsToInterval(1));
-
-    PR_ExitMonitor(ml);
-    if (debug_mode) PR_fprintf(std_err, "Monitor released first time\n");
-
-    PR_ExitMonitor(ml);
-    if (debug_mode) PR_fprintf(std_err, "Monitor released second time\n");
-
-    status = PR_JoinThread(thread);
-    if (debug_mode) PR_fprintf(std_err, 
-        "Reentrant thread joined %s\n",
-        (status == PR_SUCCESS) ? "successfully" : "in error");
-
-    PR_DestroyMonitor(ml);
-    return 0;
-}  /* ReentrantMonitor */
-
-static void PR_CALLBACK MonitorContender(void *arg)
-{
-    MonitorContentious_t *contention = (MonitorContentious_t*)arg;
-    while (contention->loops-- > 0)
-    {
-        PR_EnterMonitor(contention->ml);
-        contention->contender+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_ExitMonitor(contention->ml);
-    }
-}  /* MonitorContender */
-
-static PRUint32 ContentiousMonitor(PRUint32 loops)
-{
-    PRStatus status;
-    PRThread *thread = NULL;
-    MonitorContentious_t * contention;
-    PRIntervalTime rv, overhead, timein = PR_IntervalNow();
-
-    contention = PR_NEWZAP(MonitorContentious_t);
-    contention->loops = loops;
-    contention->overhead = 0;
-    contention->ml = PR_NewMonitor();
-    contention->interval = contention_interval;
-    thread = PR_CreateThread(
-        PR_USER_THREAD, MonitorContender, contention,
-        PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(thread != NULL);
-
-    overhead = PR_IntervalNow() - timein;
-
-    while (contention->loops-- > 0)
-    {
-        PR_EnterMonitor(contention->ml);
-        contention->contentious+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_ExitMonitor(contention->ml);
-    }
-
-    timein = PR_IntervalNow();
-    status = PR_JoinThread(thread);
-    PR_DestroyMonitor(contention->ml);
-    overhead += (PR_IntervalNow() - timein);
-    rv = overhead + contention->overhead;
-    if (verbosity)
-        PR_fprintf(
-            std_err, "Access ratio: %u to %u\n",
-            contention->contentious, contention->contender);
-    PR_Free(contention);
-    return rv;
-}  /* ContentiousMonitor */
-
-/*
-** CACHED MONITORS
-*/
-static PRIntervalTime NonContentiousCMonitor(PRUint32 loops)
-{
-    MonitorContentious_t contention;
-    while (loops-- > 0)
-    {
-        PR_CEnterMonitor(&contention);
-        PR_CExitMonitor(&contention);
-    }
-    return 0;
-}  /* NonContentiousCMonitor */
-
-static void PR_CALLBACK Contender(void *arg)
-{
-    MonitorContentious_t *contention = (MonitorContentious_t*)arg;
-    while (contention->loops-- > 0)
-    {
-        PR_CEnterMonitor(contention);
-        contention->contender+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_CExitMonitor(contention);
-    }
-}  /* Contender */
-
-static PRIntervalTime ContentiousCMonitor(PRUint32 loops)
-{
-    PRStatus status;
-    PRThread *thread = NULL;
-    MonitorContentious_t * contention;
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-
-    contention = PR_NEWZAP(MonitorContentious_t);
-    contention->ml = NULL;
-    contention->loops = loops;
-    contention->interval = contention_interval;
-    thread = PR_CreateThread(
-        PR_USER_THREAD, Contender, contention,
-        PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(thread != NULL);
-
-    overhead = PR_IntervalNow() - timein;
-
-    while (contention->loops-- > 0)
-    {
-        PR_CEnterMonitor(contention);
-        contention->contentious+= 1;
-        contention->overhead += contention->interval;
-        PR_Sleep(contention->interval);
-        PR_CExitMonitor(contention);
-    }
-
-    timein = PR_IntervalNow();
-    status = PR_JoinThread(thread);
-    overhead += (PR_IntervalNow() - timein);
-    overhead += overhead + contention->overhead;
-    if (verbosity)
-        PR_fprintf(
-            std_err, "Access ratio: %u to %u\n",
-            contention->contentious, contention->contender);
-    PR_Free(contention);
-    return overhead;
-}  /* ContentiousCMonitor */
-
-static PRIntervalTime Test(
-    const char* msg, PRUint32 (*test)(PRUint32 loops),
-    PRUint32 loops, PRIntervalTime overhead)
-{ 
-    /*
-     * overhead - overhead not measured by the test.
-     * duration - wall clock time it took to perform test.
-     * predicted - extra time test says should not be counted 
-     *
-     * Time accountable to the test is duration - overhead - predicted
-     * All times are Intervals and accumulated for all iterations.
-     */
-    PRFloat64 elapsed;
-    PRIntervalTime accountable, duration;    
-    PRUintn spaces = PL_strlen(msg);
-    PRIntervalTime timeout, timein = PR_IntervalNow();
-    PRIntervalTime predicted = test(loops);
-    timeout = PR_IntervalNow();
-    duration = timeout - timein;
-
-    if (debug_mode)
-    {
-        accountable = duration - predicted;
-        accountable -= overhead;
-        elapsed = (PRFloat64)PR_IntervalToMicroseconds(accountable);
-        PR_fprintf(PR_STDOUT, "%s:", msg);
-        while (spaces++ < 50) PR_fprintf(PR_STDOUT, " ");
-        if ((PRInt32)accountable < 0)
-            PR_fprintf(PR_STDOUT, "*****.** usecs/iteration\n");
-        else
-            PR_fprintf(PR_STDOUT, "%8.2f usecs/iteration\n", elapsed/loops);
-    }
-    return duration;
-}  /* Test */
-
-int main(int argc,  char **argv)
-{
-    PRBool rv = PR_TRUE;
-    PRIntervalTime duration;
-    PRUint32 cpu, cpus = 2, loops = 100;
-
-	
-    PR_STDIO_INIT();
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    {
-    	/* The command line argument: -d is used to determine if the test is being run
-    	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-    	All of the printfs associated with this test has been handled with a if (debug_mode)
-    	test.
-        Command line argument -l <num> sets the number of loops.
-        Command line argument -c <num> sets the number of cpus.
-        Usage: lock [-d] [-l <num>] [-c <num>]
-    	*/
-    	PLOptStatus os;
-    	PLOptState *opt = PL_CreateOptState(argc, argv, "dvl:c:");
-    	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-    		if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug mode */
-    			debug_mode = PR_TRUE;
-                break;
-            case 'v':  /* debug mode */
-    			verbosity = PR_TRUE;
-                break;
-            case 'l':  /* number of loops */
-                loops = atoi(opt->value);
-                break;
-            case 'c':  /* number of cpus */
-                cpus = atoi(opt->value);
-                break;
-             default:
-                break;
-            }
-        }
-    	PL_DestroyOptState(opt);
-    }
-
- /* main test */
-    PR_SetConcurrency(8);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("lock.log");
-	debug_mode = 1;
-#endif
-
-    if (loops == 0) loops = 100;
-    if (debug_mode)
-    {
-        std_err = PR_STDERR;
-        PR_fprintf(std_err, "Lock: Using %d loops\n", loops);
-    }
-
-    if (cpus == 0) cpus = 2;
-    if (debug_mode) PR_fprintf(std_err, "Lock: Using %d cpu(s)\n", cpus);
-
-    (void)Sleeper(10);  /* try filling in the caches */
-
-    for (cpu = 1; cpu <= cpus; ++cpu)
-    {
-        if (debug_mode) PR_fprintf(std_err, "\nLock: Using %d CPU(s)\n", cpu);
-        PR_SetConcurrency(cpu);
-
-        duration = Test("Overhead of PR_Sleep", Sleeper, loops, 0);
-        duration = 0;
-
-        (void)Test("Lock creation/deletion", MakeLock, loops, 0);
-        (void)Test("Lock non-contentious locking/unlocking", NonContentiousLock, loops, 0);
-        (void)Test("Lock contentious locking/unlocking", ContentiousLock, loops, duration);
-        (void)Test("Monitor creation/deletion", MakeMonitor, loops, 0);
-        (void)Test("Monitor non-contentious locking/unlocking", NonContentiousMonitor, loops, 0);
-        (void)Test("Monitor contentious locking/unlocking", ContentiousMonitor, loops, duration);
-
-        (void)Test("Cached monitor non-contentious locking/unlocking", NonContentiousCMonitor, loops, 0);
-        (void)Test("Cached monitor contentious locking/unlocking", ContentiousCMonitor, loops, duration);
-
-        (void)ReentrantMonitor(loops);
-    }
-
-    if (debug_mode)
-        PR_fprintf(
-            std_err, "%s: test %s\n", "Lock(mutex) test",
-            ((rv) ? "passed" : "failed"));
-	else {
-		 if (!rv)
-			 failed_already=1;
-	}
-
-	if(failed_already)	
-	{
-	    PR_fprintf(PR_STDOUT, "FAIL\n"); 
-		return 1;
-    } 
-	else
-    {
-	    PR_fprintf(PR_STDOUT, "PASS\n"); 
-		return 0;
-    }
-
-}  /* main */
-
-/* testlock.c */
diff --git a/libs/js/nsprpub/pr/tests/lockfile.c b/libs/js/nsprpub/pr/tests/lockfile.c
deleted file mode 100644
index 27f8821e53..0000000000
--- a/libs/js/nsprpub/pr/tests/lockfile.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        lockfile.c
-** Purpose:     test basic locking functions
-**              Just because this times stuff, don't think its a perforamnce
-**              test!!!
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prcmon.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmon.h"
-#include "prthread.h"
-#include "prtypes.h"
-
-#ifndef XP_MAC
-#include "private/pprio.h"
-#else
-#include "pprio.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-const static PRIntervalTime contention_interval = 50;
-
-typedef struct LockContentious_s {
-    PRLock *ml;
-    PRInt32 loops;
-    PRIntervalTime overhead;
-    PRIntervalTime interval;
-} LockContentious_t;
-
-#define LOCKFILE "prlock.fil"
-
-
-
-static PRIntervalTime NonContentiousLock(PRInt32 loops)
-{
-    PRFileDesc *_lockfile;
-    while (loops-- > 0)
-    {
-        _lockfile = PR_Open(LOCKFILE, PR_CREATE_FILE|PR_RDWR, 0666);
-        if (!_lockfile) {
-            if (debug_mode) printf(
-                "could not create lockfile: %d [%d]\n",
-                PR_GetError(), PR_GetOSError());
-            return PR_INTERVAL_NO_TIMEOUT;
-        }
-        PR_LockFile(_lockfile);
-        PR_UnlockFile(_lockfile);
-        PR_Close(_lockfile);
-    }
-    return 0;
-}  /* NonContentiousLock */
-
-static void PR_CALLBACK LockContender(void *arg)
-{
-    LockContentious_t *contention = (LockContentious_t*)arg;
-    PRFileDesc *_lockfile;
-    while (contention->loops-- > 0)
-    {
-        _lockfile = PR_Open(LOCKFILE, PR_CREATE_FILE|PR_RDWR, 0666);
-        if (!_lockfile) {
-            if (debug_mode) printf(
-                "could not create lockfile: %d [%d]\n",
-                PR_GetError(), PR_GetOSError());
-            break;
-        }
-        PR_LockFile(_lockfile);
-        PR_Sleep(contention->interval);
-        PR_UnlockFile(_lockfile);
-        PR_Close(_lockfile);
-    }
-
-}  /* LockContender */
-
-/*
-** Win16 requires things passed to Threads not be on the stack
-*/
-static LockContentious_t contention;
-
-static PRIntervalTime ContentiousLock(PRInt32 loops)
-{
-    PRStatus status;
-    PRThread *thread = NULL;
-    PRIntervalTime overhead, timein = PR_IntervalNow();
-
-    contention.loops = loops;
-    contention.overhead = 0;
-    contention.ml = PR_NewLock();
-    contention.interval = contention_interval;
-    thread = PR_CreateThread(
-        PR_USER_THREAD, LockContender, &contention,
-        PR_PRIORITY_LOW, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_ASSERT(thread != NULL);
-
-    overhead = PR_IntervalNow() - timein;
-
-    while (contention.loops > 0)
-    {
-        PR_Lock(contention.ml);
-        contention.overhead += contention.interval;
-        PR_Sleep(contention.interval);
-        PR_Unlock(contention.ml);
-    }
-
-    timein = PR_IntervalNow();
-    status = PR_JoinThread(thread);
-    PR_DestroyLock(contention.ml);
-    overhead += (PR_IntervalNow() - timein);
-    return overhead + contention.overhead;
-}  /* ContentiousLock */
-
-static PRIntervalTime Test(
-    const char* msg, PRIntervalTime (*test)(PRInt32 loops),
-    PRInt32 loops, PRIntervalTime overhead)
-{ 
-    /*
-     * overhead - overhead not measured by the test.
-     * duration - wall clock time it took to perform test.
-     * predicted - extra time test says should not be counted 
-     *
-     * Time accountable to the test is duration - overhead - predicted
-     * All times are Intervals and accumulated for all iterations.
-     */
-    PRFloat64 elapsed;
-    PRIntervalTime accountable, duration;    
-    PRUintn spaces = strlen(msg);
-    PRIntervalTime timeout, timein = PR_IntervalNow();
-    PRIntervalTime predicted = test(loops);
-    timeout = PR_IntervalNow();
-    duration = timeout - timein;
-    accountable = duration - predicted;
-    accountable -= overhead;
-    elapsed = (PRFloat64)PR_IntervalToMicroseconds(accountable);
-    if (debug_mode) printf("%s:", msg);
-    while (spaces++ < 50) if (debug_mode) printf(" ");
-    if ((PRInt32)accountable < 0) {
-        if (debug_mode) printf("*****.** usecs/iteration\n");
-    } else {
-        if (debug_mode) printf("%8.2f usecs/iteration\n", elapsed/loops);
-    }
-    return duration;
-}  /* Test */
-
-int main(int argc,  char **argv)
-{
-    PRIntervalTime duration;
-    PRUint32 cpu, cpus = 2;
-    PRInt32 loops = 100;
-
-	
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("lockfile.log");
-	debug_mode = 1;
-#endif
-
-    if (argc > 1) loops = atoi(argv[1]);
-    if (loops == 0) loops = 100;
-    if (debug_mode) printf("Lock: Using %d loops\n", loops);
-
-    cpus = (argc < 3) ? 2 : atoi(argv[2]);
-    if (cpus == 0) cpus = 2;
-    if (debug_mode) printf("Lock: Using %d cpu(s)\n", cpus);
-
-
-    for (cpu = 1; cpu <= cpus; ++cpu)
-    {
-        if (debug_mode) printf("\nLockFile: Using %d CPU(s)\n", cpu);
-        PR_SetConcurrency(cpu);
-        
-        duration = Test("LockFile non-contentious locking/unlocking", NonContentiousLock, loops, 0);
-        (void)Test("LockFile contentious locking/unlocking", ContentiousLock, loops, duration);
-    }
-
-    PR_Delete(LOCKFILE);  /* try to get rid of evidence */
-
-    if (debug_mode) printf("%s: test %s\n", "Lock(mutex) test", ((failed_already) ? "failed" : "passed"));
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}  /* main */
-
-/* testlock.c */
diff --git a/libs/js/nsprpub/pr/tests/logger.c b/libs/js/nsprpub/pr/tests/logger.c
deleted file mode 100644
index 58c55d3e1d..0000000000
--- a/libs/js/nsprpub/pr/tests/logger.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        logger.c
- * Description: test program for logging's basic functions
- */
-
-#include "prinit.h"
-#include "prlog.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "prthread.h"
-#include "prinrval.h"
-
-#include <stdio.h>
-
-#ifdef XP_MAC
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-/* lth. re-define PR_LOG() */
-#if 0
-#undef PR_LOG_TEST
-#undef PR_LOG
-#define PR_LOG_TEST(_module,_level) ((_module)->level <= (_level))
-#define PR_LOG(_module,_level,_args)    \
-  {                                     \
-    if (PR_LOG_TEST(_module,_level))    \
-       PR_LogPrint _args   ;             \
-  }
-#endif
-
-
-static void Error(const char* msg)
-{
-    printf("\t%s\n", msg);
-}  /* Error */
-
-static void PR_CALLBACK forked(void *arg)
-{
-    PRIntn i;
-	PRLock *ml;
-	PRCondVar *cv;
-	
-    PR_LogPrint("%s logging creating mutex\n", (const char*)arg);
-    ml = PR_NewLock();
-    PR_LogPrint("%s logging creating condition variable\n", (const char*)arg);
-    cv = PR_NewCondVar(ml);
-
-    PR_LogPrint("%s waiting on condition timeout 10 times\n", (const char*)arg);
-    for (i = 0; i < 10; ++i)
-    {
-        PR_Lock(ml);
-        PR_WaitCondVar(cv, PR_SecondsToInterval(1));
-        PR_Unlock(ml);
-    }
-    
-    PR_LogPrint("%s logging destroying condition variable\n", (const char*)arg);
-    PR_DestroyCondVar(cv);
-    PR_LogPrint("%s logging destroying mutex\n", (const char*)arg);
-    PR_DestroyLock(ml);
-    PR_LogPrint("%s forked thread exiting\n", (const char*)arg);
-}
-
-static void UserLogStuff( void )
-{
-    PRLogModuleInfo *myLM;
-    PRIntn i;
-
-    myLM = PR_NewLogModule( "userStuff" );
-    if (! myLM )
-      {
-        printf("UserLogStuff(): can't create new log module\n" );
-        return;
-      }
-
-    PR_LOG( myLM, PR_LOG_NOTICE, ("Log a Notice %d\n", 1 ));
-
-    for (i = 0; i < 10 ; i++ )
-      {
-        PR_LOG( myLM, PR_LOG_DEBUG, ("Log Debug number: %d\n", i));
-        PR_Sleep( 300 );
-      }
-
-} /* end UserLogStuff() */
-
-int main(PRIntn argc, const char **argv)
-{
-    PRThread *thread;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifndef XP_MAC
-    if (argc > 1)
-    {
-        if (!PR_SetLogFile(argv[1]))
-        {
-            Error("Access: Cannot create log file");
-            goto exit;
-        }
-    }
-#else
-	SetupMacPrintfLog("logger.log");
-#endif
-
-    /* Start logging something here */
-    PR_LogPrint("%s logging into %s\n", argv[0], argv[1]);
-
-    PR_LogPrint("%s creating new thread\n", argv[0]);
-
-    /*
-    ** Now change buffering.
-    */
-    PR_SetLogBuffering( 65500 );    
-	thread = PR_CreateThread(
-	    PR_USER_THREAD, forked, (void*)argv[0], PR_PRIORITY_NORMAL,
-	    PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    PR_LogPrint("%s joining thread\n", argv[0]);
-
-    UserLogStuff();
-
-    PR_JoinThread(thread);
-
-    PR_LogFlush();
-    return 0;
-
-exit:
-    return -1;
-}
-
-/* logger.c */
diff --git a/libs/js/nsprpub/pr/tests/macbuild/.empty b/libs/js/nsprpub/pr/tests/macbuild/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/js/nsprpub/pr/tests/makedir.c b/libs/js/nsprpub/pr/tests/makedir.c
deleted file mode 100644
index 2720f13e6d..0000000000
--- a/libs/js/nsprpub/pr/tests/makedir.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This test calls PR_MakeDir to create a bunch of directories
- * with various mode bits.
- */
-
-#include "prio.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main()
-{
-    if (PR_MakeDir("tdir0400", 0400) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0200", 0200) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0100", 0100) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0500", 0500) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0600", 0600) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0300", 0300) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0700", 0700) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0640", 0640) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0660", 0660) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0644", 0644) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0664", 0664) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    if (PR_MakeDir("tdir0666", 0666) == PR_FAILURE) {
-        fprintf(stderr, "PR_MakeDir failed\n");
-        exit(1);
-    }
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/many_cv.c b/libs/js/nsprpub/pr/tests/many_cv.c
deleted file mode 100644
index c61b714d97..0000000000
--- a/libs/js/nsprpub/pr/tests/many_cv.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prprf.h"
-#include "prthread.h"
-#include "prcvar.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmem.h"
-
-#include "primpl.h"
-
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-static PRInt32 Random(void)
-{
-    PRInt32 ran = rand() >> 16;
-    return ran;
-}  /* Random */
-
-static void Help(void)
-{
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PR_fprintf(err, "many_cv usage: [-c n] [-l n] [-h]\n");
-    PR_fprintf(err, "\t-c n Number of conditions per lock       (default: 10)\n");
-    PR_fprintf(err, "\t-l n Number of times to loop the test    (default:  1)\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-    PLOptStatus os;
-    PRIntn index, nl;
-    PRLock *ml = NULL;
-    PRCondVar **cv = NULL;
-    PRBool stats = PR_FALSE;
-    PRIntn nc, loops = 1, cvs = 10;
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hsc:l:");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 's':  /* number of CVs to association with lock */
-            stats = PR_TRUE;
-            break;
-        case 'c':  /* number of CVs to association with lock */
-            cvs = atoi(opt->value);
-            break;
-        case 'l':  /* number of times to run the tests */
-            loops = atoi(opt->value);
-            break;
-        case 'h':  /* user wants some guidance */
-         default:
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_fprintf(err, "Settings\n");
-    PR_fprintf(err, "\tConditions / lock: %d\n", cvs);
-    PR_fprintf(err, "\tLoops to run test: %d\n", loops);
-
-    ml = PR_NewLock();
-    PR_ASSERT(NULL != ml);
-
-    cv = (PRCondVar**)PR_CALLOC(sizeof(PRCondVar*) * cvs);
-    PR_ASSERT(NULL != cv);
-
-    for (index = 0; index < cvs; ++index)
-    {
-        cv[index] = PR_NewCondVar(ml);
-        PR_ASSERT(NULL != cv[index]);
-    }
-
-    for (index = 0; index < loops; ++index)
-    {
-        PR_Lock(ml);
-        for (nl = 0; nl < cvs; ++nl)
-        {
-            PRInt32 ran = Random() % 8;
-            if (0 == ran) PR_NotifyAllCondVar(cv[nl]);
-            else for (nc = 0; nc < ran; ++nc)
-                PR_NotifyCondVar(cv[nl]);
-        }
-        PR_Unlock(ml);
-    }
-
-    for (index = 0; index < cvs; ++index)
-        PR_DestroyCondVar(cv[index]);
-
-    PR_DELETE(cv);
-
-    PR_DestroyLock(ml);
-    
-    printf("PASS\n");
-
-    PT_FPrintStats(err, "\nPThread Statistics\n");
-    return 0;
-}
-
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/mbcs.c b/libs/js/nsprpub/pr/tests/mbcs.c
deleted file mode 100644
index 7ab89118c3..0000000000
--- a/libs/js/nsprpub/pr/tests/mbcs.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: mbcs.c
-**
-** Synopsis: mbcs {dirName}
-**
-** where dirName is the directory to be traversed. dirName is required.
-**
-** Description: 
-** mbcs.c tests use of multi-byte characters, as would be passed to
-** NSPR funtions by internationalized applications. 
-**
-** mbcs.c, when run on any single-byte platform, should run correctly.
-** In truth, running the mbcs test on a single-byte platform is
-** really meaningless. mbcs.c, nor any NSPR library or test is not
-** intended for use with any wide character set, including Unicode.
-** mbcs.c should not be included in runtests.ksh because it requires
-** extensive user intervention to set-up and run.
-**
-** mbcs.c should be run on a platform using some form of multi-byte
-** characters. The initial platform for this test is a Japanese
-** language Windows NT 4.0 machine. ... Thank you Noriko Hoshi.
-**
-** To run mbcs.c, the tester should create a directory tree containing
-** some files in the same directory from which the test is run; i.e.
-** the current working directory. The directory and files should be
-** named such that when represented in the local multi-byte character
-** set, one or more characters of the name is longer than a single
-** byte.
-** 
-*/
-
-#include <plgetopt.h> 
-#include <nspr.h> 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Test harness infrastructure
-*/
-PRLogModuleInfo *lm;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRIntn  debug = 0;
-PRUint32  failed_already = 0;
-/* end Test harness infrastructure */
-
-char *dirName =  NULL;  /* directory name to traverse */
-
-/*
-** Traverse directory
-*/
-static void TraverseDirectory( unsigned char *dir )
-{
-    PRDir *cwd;
-    PRDirEntry *dirEntry;
-    PRFileInfo info;
-    PRStatus rc;
-    PRInt32 err;
-    PRFileDesc *fd;
-    char    nextDir[256];
-    char    file[256];
-
-    printf("Directory: %s\n", dir );
-    cwd = PR_OpenDir( dir );
-    if ( NULL == cwd )  {
-        printf("PR_OpenDir() failed on directory: %s, with error: %d, %d\n", 
-            dir, PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    while( NULL != (dirEntry = PR_ReadDir( cwd, PR_SKIP_BOTH | PR_SKIP_HIDDEN )))  {
-        sprintf( file, "%s/%s", dir, dirEntry->name );
-        rc = PR_GetFileInfo( file, &info );
-        if ( PR_FAILURE == rc ) {
-            printf("PR_GetFileInfo() failed on file: %s, with error: %d, %d\n", 
-                dirEntry->name, PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        if ( PR_FILE_FILE == info.type )  {
-            printf("File: %s \tsize: %ld\n", dirEntry->name, info.size );
-            fd = PR_Open( file, PR_RDONLY, 0 );
-            if ( NULL == fd )  {
-                printf("PR_Open() failed. Error: %ld, OSError: %ld\n", 
-                    PR_GetError(), PR_GetOSError());
-            }
-            rc = PR_Close( fd );
-            if ( PR_FAILURE == rc )  {
-                printf("PR_Close() failed. Error: %ld, OSError: %ld\n", 
-                    PR_GetError(), PR_GetOSError());
-            }
-        } else if ( PR_FILE_DIRECTORY == info.type ) {
-            sprintf( nextDir, "%s/%s", dir, dirEntry->name );
-            TraverseDirectory(nextDir);
-        } else {
-            printf("type is not interesting for file: %s\n", dirEntry->name );
-            /* keep going */
-        }
-    }
-    /* assume end-of-file, actually could be error */
-
-    rc = PR_CloseDir( cwd );
-    if ( PR_FAILURE == rc ) {
-        printf("PR_CloseDir() failed on directory: %s, with error: %d, %d\n", 
-            dir, PR_GetError(), PR_GetOSError());
-    }
-
-} /* end TraverseDirectory() */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    { /* get command line options */
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "dv");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-			    msgLevel = PR_LOG_ERROR;
-                break;
-            case 'v':  /* verbose mode */
-			    msgLevel = PR_LOG_DEBUG;
-                break;
-             default:
-                dirName = strdup(opt->value); 
-                break; 
-            }
-        }
-	    PL_DestroyOptState(opt);
-    } /* end get command line options */
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-
-    
-    if ( dirName == NULL )  {
-        printf("you gotta specify a directory as an operand!\n");
-        exit(1);
-    }
-
-    TraverseDirectory( dirName );
-
-    if (debug) printf("%s\n", (failed_already)? "FAIL" : "PASS");
-    return( (failed_already == PR_TRUE )? 1 : 0 );
-}  /* main() */
-/* end template.c */
diff --git a/libs/js/nsprpub/pr/tests/multiacc.c b/libs/js/nsprpub/pr/tests/multiacc.c
deleted file mode 100644
index ccae270be6..0000000000
--- a/libs/js/nsprpub/pr/tests/multiacc.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: multiacc.c
- *
- * Description:
- * This test creates multiple threads that accept on the
- * same listening socket.
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define NUM_SERVER_THREADS 10
-
-static int num_server_threads = NUM_SERVER_THREADS;
-static PRThreadScope thread_scope = PR_GLOBAL_THREAD;
-static PRBool exit_flag = PR_FALSE;
-
-static void ServerThreadFunc(void *arg)
-{
-    PRFileDesc *listenSock = (PRFileDesc *) arg;
-    PRFileDesc *acceptSock;
-    PRErrorCode err;
-    PRStatus status;
-
-    while (!exit_flag) {
-        acceptSock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-        if (NULL == acceptSock) {
-            err = PR_GetError();
-            if (PR_PENDING_INTERRUPT_ERROR == err) {
-                printf("server thread is interrupted\n");
-                fflush(stdout);
-                continue;
-            }
-            fprintf(stderr, "PR_Accept failed: %d\n", err);
-            exit(1);
-        }
-        status = PR_Close(acceptSock);
-        if (PR_FAILURE == status) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        }
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *dummySock;
-    PRFileDesc *listenSock;
-    PRFileDesc *clientSock;
-    PRThread *dummyThread;
-    PRThread **serverThreads;
-    PRStatus status;
-    PRUint16 port;
-    int idx;
-    PRInt32 nbytes;
-    char buf[1024];
-
-    serverThreads = (PRThread **)
-            PR_Malloc(num_server_threads * sizeof(PRThread *));
-    if (NULL == serverThreads) {
-        fprintf(stderr, "PR_Malloc failed\n");
-        exit(1);
-    }
-
-    /*
-     * Create a dummy listening socket and have the first
-     * (dummy) thread listen on it.  This is to ensure that
-     * the first thread becomes the I/O continuation thread
-     * in the pthreads implementation (see ptio.c) and remains
-     * so throughout the test, so that we never have to
-     * recycle the I/O continuation thread.
-     */
-    dummySock = PR_NewTCPSocket();
-    if (NULL == dummySock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&serverAddr, 0, sizeof(serverAddr));
-    status = PR_InitializeNetAddr(PR_IpAddrAny, 0, &serverAddr);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    status = PR_Bind(dummySock, &serverAddr);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    status = PR_Listen(dummySock, 5);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-
-    listenSock = PR_NewTCPSocket();
-    if (NULL == listenSock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&serverAddr, 0, sizeof(serverAddr));
-    status = PR_InitializeNetAddr(PR_IpAddrAny, 0, &serverAddr);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    status = PR_Bind(listenSock, &serverAddr);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    status = PR_GetSockName(listenSock, &serverAddr);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_GetSockName failed\n");
-        exit(1);
-    }
-    port = PR_ntohs(serverAddr.inet.port);
-    status = PR_Listen(listenSock, 5);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-
-    printf("creating dummy thread\n");
-    fflush(stdout);
-    dummyThread = PR_CreateThread(PR_USER_THREAD,
-            ServerThreadFunc, dummySock, PR_PRIORITY_NORMAL,
-            thread_scope, PR_JOINABLE_THREAD, 0);
-    if (NULL == dummyThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    printf("sleeping one second before creating server threads\n");
-    fflush(stdout);
-    PR_Sleep(PR_SecondsToInterval(1));
-    for (idx = 0; idx < num_server_threads; idx++) {
-        serverThreads[idx] = PR_CreateThread(PR_USER_THREAD,
-                ServerThreadFunc, listenSock, PR_PRIORITY_NORMAL,
-                thread_scope, PR_JOINABLE_THREAD, 0);
-        if (NULL == serverThreads[idx]) {
-            fprintf(stderr, "PR_CreateThread failed\n");
-            exit(1);
-        }
-    }
-
-    memset(&serverAddr, 0, sizeof(serverAddr));
-    PR_InitializeNetAddr(PR_IpAddrLoopback, port, &serverAddr);
-    clientSock = PR_NewTCPSocket();
-    if (NULL == clientSock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    printf("sleeping one second before connecting\n");
-    fflush(stdout);
-    PR_Sleep(PR_SecondsToInterval(1));
-    status = PR_Connect(clientSock, &serverAddr, PR_INTERVAL_NO_TIMEOUT);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Connect failed\n");
-        exit(1);
-    }
-    nbytes = PR_Read(clientSock, buf, sizeof(buf));
-    if (nbytes != 0) {
-        fprintf(stderr, "expected 0 bytes but got %d bytes\n", nbytes);
-        exit(1);
-    }
-    status = PR_Close(clientSock);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    printf("sleeping one second before shutting down server threads\n");
-    fflush(stdout);
-    PR_Sleep(PR_SecondsToInterval(1));
-
-    exit_flag = PR_TRUE;
-    status = PR_Interrupt(dummyThread);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Interrupt failed\n");
-        exit(1);
-    }
-    status = PR_JoinThread(dummyThread);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    for (idx = 0; idx < num_server_threads; idx++) {
-        status = PR_Interrupt(serverThreads[idx]);
-        if (PR_FAILURE == status) {
-            fprintf(stderr, "PR_Interrupt failed\n");
-            exit(1);
-        }
-        status = PR_JoinThread(serverThreads[idx]);
-        if (PR_FAILURE == status) {
-            fprintf(stderr, "PR_JoinThread failed\n");
-            exit(1);
-        }
-    }
-    PR_Free(serverThreads);
-    status = PR_Close(dummySock);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(listenSock);
-    if (PR_FAILURE == status) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/multiwait.c b/libs/js/nsprpub/pr/tests/multiwait.c
deleted file mode 100644
index 10e22dad1d..0000000000
--- a/libs/js/nsprpub/pr/tests/multiwait.c
+++ /dev/null
@@ -1,725 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prprf.h"
-#include "prlog.h"
-#include "prmem.h"
-#include "pratom.h"
-#include "prlock.h"
-#include "prmwait.h"
-#include "prclist.h"
-#include "prerror.h"
-#include "prinrval.h"
-#include "prnetdb.h"
-#include "prthread.h"
-
-#include "plstr.h"
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <string.h>
-
-typedef struct Shared
-{
-    const char *title;
-    PRLock *list_lock;
-    PRWaitGroup *group;
-    PRIntervalTime timeout;
-} Shared;
-
-typedef enum Verbosity {silent, quiet, chatty, noisy} Verbosity;
-
-static PRFileDesc *debug = NULL;
-static PRInt32 desc_allocated = 0;
-static PRUint16 default_port = 12273;
-static enum Verbosity verbosity = quiet;
-static PRInt32 ops_required = 1000, ops_done = 0;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-static PRIntn client_threads = 20, worker_threads = 2, wait_objects = 50;
-
-#if defined(DEBUG)
-#define MW_ASSERT(_expr) \
-    ((_expr)?((void)0):_MW_Assert(# _expr,__FILE__,__LINE__))
-static void _MW_Assert(const char *s, const char *file, PRIntn ln)
-{
-    if (NULL != debug) PL_FPrintError(debug, NULL);
-    PR_Assert(s, file, ln);
-}  /* _MW_Assert */
-#else
-#define MW_ASSERT(_expr)
-#endif
-
-static void PrintRecvDesc(PRRecvWait *desc, const char *msg)
-{
-    const char *tag[] = {
-        "PR_MW_INTERRUPT", "PR_MW_TIMEOUT",
-        "PR_MW_FAILURE", "PR_MW_SUCCESS", "PR_MW_PENDING"};
-    PR_fprintf(
-        debug, "%s: PRRecvWait(@0x%x): {fd: 0x%x, outcome: %s, tmo: %u}\n",
-        msg, desc, desc->fd, tag[desc->outcome + 3], desc->timeout);
-}  /* PrintRecvDesc */
-
-static Shared *MakeShared(const char *title)
-{
-    Shared *shared = PR_NEWZAP(Shared);
-    shared->group = PR_CreateWaitGroup(1);
-    shared->timeout = PR_SecondsToInterval(1);
-    shared->list_lock = PR_NewLock();
-    shared->title = title;
-    return shared;
-}  /* MakeShared */
-
-static void DestroyShared(Shared *shared)
-{
-    PRStatus rv;
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: destroying group\n", shared->title);
-    rv = PR_DestroyWaitGroup(shared->group);
-    MW_ASSERT(PR_SUCCESS == rv);
-    PR_DestroyLock(shared->list_lock);
-    PR_DELETE(shared);
-}  /* DestroyShared */
-
-static PRRecvWait *CreateRecvWait(PRFileDesc *fd, PRIntervalTime timeout)
-{
-    PRRecvWait *desc_out = PR_NEWZAP(PRRecvWait);
-    MW_ASSERT(NULL != desc_out);
-
-    MW_ASSERT(NULL != fd);
-    desc_out->fd = fd;
-    desc_out->timeout = timeout;
-    desc_out->buffer.length = 120;
-    desc_out->buffer.start = PR_CALLOC(120);
-
-    PR_AtomicIncrement(&desc_allocated);
-
-    if (verbosity > chatty)
-        PrintRecvDesc(desc_out, "Allocated");
-    return desc_out;
-}  /* CreateRecvWait */
-
-static void DestroyRecvWait(PRRecvWait *desc_out)
-{
-    if (verbosity > chatty)
-        PrintRecvDesc(desc_out, "Destroying");
-    PR_Close(desc_out->fd);
-    if (NULL != desc_out->buffer.start)
-        PR_DELETE(desc_out->buffer.start);
-    PR_Free(desc_out);
-    (void)PR_AtomicDecrement(&desc_allocated);
-}  /* DestroyRecvWait */
-
-static void CancelGroup(Shared *shared)
-{
-    PRRecvWait *desc_out;
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s Reclaiming wait descriptors\n", shared->title);
-
-    do
-    {
-        desc_out = PR_CancelWaitGroup(shared->group);
-        if (NULL != desc_out) DestroyRecvWait(desc_out);
-    } while (NULL != desc_out);
-
-    MW_ASSERT(0 == desc_allocated);
-    MW_ASSERT(PR_GROUP_EMPTY_ERROR == PR_GetError());
-}  /* CancelGroup */
-
-static void PR_CALLBACK ClientThread(void* arg)
-{
-    PRStatus rv;
-    PRInt32 bytes;
-    PRIntn empty_flags = 0;
-    PRNetAddr server_address;
-    unsigned char buffer[100];
-    Shared *shared = (Shared*)arg;
-    PRFileDesc *server = PR_NewTCPSocket();
-    if ((NULL == server)
-    && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) return;
-    MW_ASSERT(NULL != server);
-
-    if (verbosity > chatty)
-        PR_fprintf(debug, "%s: Server socket @0x%x\n", shared->title, server);
-
-    /* Initialize the buffer so that Purify won't complain */
-    memset(buffer, 0, sizeof(buffer));
-
-    rv = PR_InitializeNetAddr(PR_IpAddrLoopback, default_port, &server_address);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: Client opening connection\n", shared->title);
-    rv = PR_Connect(server, &server_address, PR_INTERVAL_NO_TIMEOUT);
-
-    if (PR_FAILURE == rv)
-    {
-        if (verbosity > silent) PL_FPrintError(debug, "Client connect failed");
-        return;
-    }
-
-    while (ops_done < ops_required)
-    {
-        bytes = PR_Send(
-            server, buffer, sizeof(buffer), empty_flags, PR_INTERVAL_NO_TIMEOUT);
-        if ((-1 == bytes) && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) break;
-        MW_ASSERT(sizeof(buffer) == bytes);
-        if (verbosity > chatty)
-            PR_fprintf(
-                debug, "%s: Client sent %d bytes\n",
-                shared->title, sizeof(buffer));
-        bytes = PR_Recv(
-            server, buffer, sizeof(buffer), empty_flags, PR_INTERVAL_NO_TIMEOUT);
-        if (verbosity > chatty)
-            PR_fprintf(
-                debug, "%s: Client received %d bytes\n",
-                shared->title, sizeof(buffer));
-        if ((-1 == bytes) && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) break;
-        MW_ASSERT(sizeof(buffer) == bytes);
-        PR_Sleep(shared->timeout);
-    }
-    rv = PR_Close(server);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-}  /* ClientThread */
-
-static void OneInThenCancelled(Shared *shared)
-{
-    PRStatus rv;
-    PRRecvWait *desc_out, *desc_in = PR_NEWZAP(PRRecvWait);
-
-    shared->timeout = PR_INTERVAL_NO_TIMEOUT;
-
-    desc_in->fd = PR_NewTCPSocket();
-    desc_in->timeout = shared->timeout;
-
-    if (verbosity > chatty) PrintRecvDesc(desc_in, "Adding desc");
-
-    rv = PR_AddWaitFileDesc(shared->group, desc_in);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    if (verbosity > chatty) PrintRecvDesc(desc_in, "Cancelling");
-    rv = PR_CancelWaitFileDesc(shared->group, desc_in);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    desc_out = PR_WaitRecvReady(shared->group);
-    MW_ASSERT(desc_out == desc_in);
-    MW_ASSERT(PR_MW_INTERRUPT == desc_out->outcome);
-    MW_ASSERT(PR_PENDING_INTERRUPT_ERROR == PR_GetError());
-    if (verbosity > chatty) PrintRecvDesc(desc_out, "Ready");
-
-    rv = PR_Close(desc_in->fd);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: destroying group\n", shared->title);
-
-    PR_DELETE(desc_in);
-}  /* OneInThenCancelled */
-
-static void OneOpOneThread(Shared *shared)
-{
-    PRStatus rv;
-    PRRecvWait *desc_out, *desc_in = PR_NEWZAP(PRRecvWait);
-
-    desc_in->fd = PR_NewTCPSocket();
-    desc_in->timeout = shared->timeout;
-
-    if (verbosity > chatty) PrintRecvDesc(desc_in, "Adding desc");
-
-    rv = PR_AddWaitFileDesc(shared->group, desc_in);
-    MW_ASSERT(PR_SUCCESS == rv);
-    desc_out = PR_WaitRecvReady(shared->group);
-    MW_ASSERT(desc_out == desc_in);
-    MW_ASSERT(PR_MW_TIMEOUT == desc_out->outcome);
-    MW_ASSERT(PR_IO_TIMEOUT_ERROR == PR_GetError());
-    if (verbosity > chatty) PrintRecvDesc(desc_out, "Ready");
-
-    rv = PR_Close(desc_in->fd);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    PR_DELETE(desc_in);
-}  /* OneOpOneThread */
-
-static void ManyOpOneThread(Shared *shared)
-{
-    PRStatus rv;
-    PRIntn index;
-    PRRecvWait *desc_in;
-    PRRecvWait *desc_out;
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: adding %d descs\n", shared->title, wait_objects);
-
-    for (index = 0; index < wait_objects; ++index)
-    {
-        desc_in = CreateRecvWait(PR_NewTCPSocket(), shared->timeout);
-
-        rv = PR_AddWaitFileDesc(shared->group, desc_in);
-        MW_ASSERT(PR_SUCCESS == rv);
-    }
-
-    while (ops_done < ops_required)
-    {
-        desc_out = PR_WaitRecvReady(shared->group);
-        MW_ASSERT(PR_MW_TIMEOUT == desc_out->outcome);
-        MW_ASSERT(PR_IO_TIMEOUT_ERROR == PR_GetError());
-        if (verbosity > chatty) PrintRecvDesc(desc_out, "Ready/readding");
-        rv = PR_AddWaitFileDesc(shared->group, desc_out);
-        MW_ASSERT(PR_SUCCESS == rv);
-        (void)PR_AtomicIncrement(&ops_done);
-    }
-
-    CancelGroup(shared);
-}  /* ManyOpOneThread */
-
-static void PR_CALLBACK SomeOpsThread(void *arg)
-{
-    PRRecvWait *desc_out;
-    PRStatus rv = PR_SUCCESS;
-    Shared *shared = (Shared*)arg;
-    do  /* until interrupted */
-    {
-        desc_out = PR_WaitRecvReady(shared->group);
-        if (NULL == desc_out)
-        {
-            MW_ASSERT(PR_PENDING_INTERRUPT_ERROR == PR_GetError());
-            if (verbosity > quiet) PR_fprintf(debug, "Aborted\n");
-            break;
-        }
-        MW_ASSERT(PR_MW_TIMEOUT == desc_out->outcome);
-        MW_ASSERT(PR_IO_TIMEOUT_ERROR == PR_GetError());
-        if (verbosity > chatty) PrintRecvDesc(desc_out, "Ready");
-
-        if (verbosity > chatty) PrintRecvDesc(desc_out, "Re-Adding");
-        desc_out->timeout = shared->timeout;
-        rv = PR_AddWaitFileDesc(shared->group, desc_out);
-        PR_AtomicIncrement(&ops_done);
-        if (ops_done > ops_required) break;
-    } while (PR_SUCCESS == rv);
-    MW_ASSERT(PR_SUCCESS == rv);
-}  /* SomeOpsThread */
-
-static void SomeOpsSomeThreads(Shared *shared)
-{
-    PRStatus rv;
-    PRThread **thread;
-    PRIntn index;
-    PRRecvWait *desc_in;
-
-    thread = (PRThread**)PR_CALLOC(sizeof(PRThread*) * worker_threads);
-
-    /* Create some threads */
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: creating threads\n", shared->title);
-    for (index = 0; index < worker_threads; ++index)
-    {
-        thread[index] = PR_CreateThread(
-            PR_USER_THREAD, SomeOpsThread, shared,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-    }
-
-    /* then create some operations */
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: creating desc\n", shared->title);
-    for (index = 0; index < wait_objects; ++index)
-    {
-        desc_in = CreateRecvWait(PR_NewTCPSocket(), shared->timeout);
-        rv = PR_AddWaitFileDesc(shared->group, desc_in);
-        MW_ASSERT(PR_SUCCESS == rv);
-    }
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: sleeping\n", shared->title);
-    while (ops_done < ops_required) PR_Sleep(shared->timeout);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: interrupting/joining threads\n", shared->title);
-    for (index = 0; index < worker_threads; ++index)
-    {
-        rv = PR_Interrupt(thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-    }
-    PR_DELETE(thread);
-
-    CancelGroup(shared);
-}  /* SomeOpsSomeThreads */
-
-static PRStatus ServiceRequest(Shared *shared, PRRecvWait *desc)
-{
-    PRInt32 bytes_out;
-
-    if (verbosity > chatty)
-        PR_fprintf(
-            debug, "%s: Service received %d bytes\n",
-            shared->title, desc->bytesRecv);
-
-    if (0 == desc->bytesRecv) goto quitting;
-    if ((-1 == desc->bytesRecv)
-    && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) goto aborted;
-
-    bytes_out = PR_Send(
-        desc->fd, desc->buffer.start, desc->bytesRecv, 0, shared->timeout);
-    if (verbosity > chatty)
-        PR_fprintf(
-            debug, "%s: Service sent %d bytes\n",
-            shared->title, bytes_out);
-
-    if ((-1 == bytes_out)
-    && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) goto aborted;
-    MW_ASSERT(bytes_out == desc->bytesRecv);
-
-    return PR_SUCCESS;
-
-aborted:
-quitting:
-    return PR_FAILURE;
-}  /* ServiceRequest */
-
-static void PR_CALLBACK ServiceThread(void *arg)
-{
-    PRStatus rv = PR_SUCCESS;
-    PRRecvWait *desc_out = NULL;
-    Shared *shared = (Shared*)arg;
-    do  /* until interrupted */
-    {
-        if (NULL != desc_out)
-        {
-            desc_out->timeout = PR_INTERVAL_NO_TIMEOUT;
-            if (verbosity > chatty)
-                PrintRecvDesc(desc_out, "Service re-adding");
-            rv = PR_AddWaitFileDesc(shared->group, desc_out);
-            MW_ASSERT(PR_SUCCESS == rv);
-        }
-
-        desc_out = PR_WaitRecvReady(shared->group);
-        if (NULL == desc_out)
-        {
-            MW_ASSERT(PR_PENDING_INTERRUPT_ERROR == PR_GetError());
-            break;
-        }
-
-        switch (desc_out->outcome)
-        {
-            case PR_MW_SUCCESS:
-            {
-                PR_AtomicIncrement(&ops_done);
-                if (verbosity > chatty)
-                    PrintRecvDesc(desc_out, "Service ready");
-                rv = ServiceRequest(shared, desc_out);
-                break;
-            }
-            case PR_MW_INTERRUPT:
-                MW_ASSERT(PR_PENDING_INTERRUPT_ERROR == PR_GetError());
-                rv = PR_FAILURE;  /* if interrupted, then exit */
-                break;
-            case PR_MW_TIMEOUT:
-                MW_ASSERT(PR_IO_TIMEOUT_ERROR == PR_GetError());
-            case PR_MW_FAILURE:
-                if (verbosity > silent)
-                    PL_FPrintError(debug, "RecvReady failure");
-                break;
-            default:
-                break;
-        }
-    } while (PR_SUCCESS == rv);
-
-    if (NULL != desc_out) DestroyRecvWait(desc_out);
-
-}  /* ServiceThread */
-
-static void PR_CALLBACK EnumerationThread(void *arg)
-{
-    PRStatus rv;
-    PRIntn count;
-    PRRecvWait *desc;
-    Shared *shared = (Shared*)arg;
-    PRIntervalTime five_seconds = PR_SecondsToInterval(5);
-    PRMWaitEnumerator *enumerator = PR_CreateMWaitEnumerator(shared->group);
-    MW_ASSERT(NULL != enumerator);
-
-    while (PR_SUCCESS == PR_Sleep(five_seconds))
-    {
-        count = 0;
-        desc = NULL;
-        while (NULL != (desc = PR_EnumerateWaitGroup(enumerator, desc)))
-        {
-            if (verbosity > chatty) PrintRecvDesc(desc, shared->title);
-            count += 1;
-        }
-        if (verbosity > silent)
-            PR_fprintf(debug,
-                "%s Enumerated %d objects\n", shared->title, count);
-    }
-
-    MW_ASSERT(PR_PENDING_INTERRUPT_ERROR == PR_GetError());
-
-
-    rv = PR_DestroyMWaitEnumerator(enumerator);
-    MW_ASSERT(PR_SUCCESS == rv);
-}  /* EnumerationThread */
-
-static void PR_CALLBACK ServerThread(void *arg)
-{
-    PRStatus rv;
-    PRIntn index;
-    PRRecvWait *desc_in;
-    PRThread **worker_thread;
-    Shared *shared = (Shared*)arg;
-    PRFileDesc *listener, *service;
-    PRNetAddr server_address, client_address;
-
-    worker_thread = (PRThread**)PR_CALLOC(sizeof(PRThread*) * worker_threads);
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: Server creating worker_threads\n", shared->title);
-    for (index = 0; index < worker_threads; ++index)
-    {
-        worker_thread[index] = PR_CreateThread(
-            PR_USER_THREAD, ServiceThread, shared,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-    }
-
-    rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &server_address);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    listener = PR_NewTCPSocket(); MW_ASSERT(NULL != listener);
-    if (verbosity > chatty)
-        PR_fprintf(
-            debug, "%s: Server listener socket @0x%x\n",
-            shared->title, listener);
-    rv = PR_Bind(listener, &server_address); MW_ASSERT(PR_SUCCESS == rv);
-    rv = PR_Listen(listener, 10); MW_ASSERT(PR_SUCCESS == rv);
-    while (ops_done < ops_required)
-    {
-        if (verbosity > quiet)
-            PR_fprintf(debug, "%s: Server accepting connection\n", shared->title);
-        service = PR_Accept(listener, &client_address, PR_INTERVAL_NO_TIMEOUT);
-        if (NULL == service)
-        {
-            if (PR_PENDING_INTERRUPT_ERROR == PR_GetError()) break;
-            PL_PrintError("Accept failed");
-            MW_ASSERT(!"Accept failed");
-        }
-        else
-        {
-            desc_in = CreateRecvWait(service, shared->timeout);
-            desc_in->timeout = PR_INTERVAL_NO_TIMEOUT;
-            if (verbosity > chatty)
-                PrintRecvDesc(desc_in, "Service adding");
-            rv = PR_AddWaitFileDesc(shared->group, desc_in);
-            MW_ASSERT(PR_SUCCESS == rv);
-        }
-    }
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: Server interrupting worker_threads\n", shared->title);
-    for (index = 0; index < worker_threads; ++index)
-    {
-        rv = PR_Interrupt(worker_thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(worker_thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-    }
-    PR_DELETE(worker_thread);
-
-    PR_Close(listener);
-
-    CancelGroup(shared);
-
-}  /* ServerThread */
-
-static void RealOneGroupIO(Shared *shared)
-{
-    /*
-    ** Create a server that listens for connections and then services
-    ** requests that come in over those connections. The server never
-    ** deletes a connection and assumes a basic RPC model of operation.
-    **
-    ** Use worker_threads threads to service how every many open ports
-    ** there might be.
-    **
-    ** Oh, ya. Almost forget. Create (some) clients as well.
-    */
-    PRStatus rv;
-    PRIntn index;
-    PRThread *server_thread, *enumeration_thread, **client_thread;
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: creating server_thread\n", shared->title);
-
-    server_thread = PR_CreateThread(
-        PR_USER_THREAD, ServerThread, shared,
-        PR_PRIORITY_HIGH, thread_scope,
-        PR_JOINABLE_THREAD, 16 * 1024);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: creating enumeration_thread\n", shared->title);
-
-    enumeration_thread = PR_CreateThread(
-        PR_USER_THREAD, EnumerationThread, shared,
-        PR_PRIORITY_HIGH, thread_scope,
-        PR_JOINABLE_THREAD, 16 * 1024);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: snoozing before creating clients\n", shared->title);
-    PR_Sleep(5 * shared->timeout);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: creating client_threads\n", shared->title);
-    client_thread = (PRThread**)PR_CALLOC(sizeof(PRThread*) * client_threads);
-    for (index = 0; index < client_threads; ++index)
-    {
-        client_thread[index] = PR_CreateThread(
-            PR_USER_THREAD, ClientThread, shared,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-    }
-
-    while (ops_done < ops_required) PR_Sleep(shared->timeout);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: interrupting/joining client_threads\n", shared->title);
-    for (index = 0; index < client_threads; ++index)
-    {
-        rv = PR_Interrupt(client_thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(client_thread[index]);
-        MW_ASSERT(PR_SUCCESS == rv);
-    }
-    PR_DELETE(client_thread);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: interrupting/joining enumeration_thread\n", shared->title);
-    rv = PR_Interrupt(enumeration_thread);
-    MW_ASSERT(PR_SUCCESS == rv);
-    rv = PR_JoinThread(enumeration_thread);
-    MW_ASSERT(PR_SUCCESS == rv);
-
-    if (verbosity > quiet)
-        PR_fprintf(debug, "%s: interrupting/joining server_thread\n", shared->title);
-    rv = PR_Interrupt(server_thread);
-    MW_ASSERT(PR_SUCCESS == rv);
-    rv = PR_JoinThread(server_thread);
-    MW_ASSERT(PR_SUCCESS == rv);
-}  /* RealOneGroupIO */
-
-static void RunThisOne(
-    void (*func)(Shared*), const char *name, const char *test_name)
-{
-    Shared *shared;
-    if ((NULL == test_name) || (0 == PL_strcmp(name, test_name)))
-    {
-        if (verbosity > silent)
-            PR_fprintf(debug, "%s()\n", name);
-        shared = MakeShared(name);
-        ops_done = 0;
-        func(shared);  /* run the test */
-        MW_ASSERT(0 == desc_allocated);
-        DestroyShared(shared);
-    }
-}  /* RunThisOne */
-
-static Verbosity ChangeVerbosity(Verbosity verbosity, PRIntn delta)
-{
-    PRIntn verbage = (PRIntn)verbosity;
-    return (Verbosity)(verbage += delta);
-}  /* ChangeVerbosity */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    const char *test_name = NULL;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dqGc:o:p:t:w:");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:
-            test_name = opt->value;
-            break;
-        case 'd':  /* debug mode */
-            if (verbosity < noisy)
-                verbosity = ChangeVerbosity(verbosity, 1);
-            break;
-        case 'q':  /* debug mode */
-            if (verbosity > silent)
-                verbosity = ChangeVerbosity(verbosity, -1);
-            break;
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'c':  /* number of client threads */
-            client_threads = atoi(opt->value);
-            break;
-        case 'o':  /* operations to compelete */
-            ops_required = atoi(opt->value);
-            break;
-        case 'p':  /* default port */
-            default_port = atoi(opt->value);
-            break;
-        case 't':  /* number of threads waiting */
-            worker_threads = atoi(opt->value);
-            break;
-        case 'w':  /* number of wait objects */
-            wait_objects = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (verbosity > 0)
-        debug = PR_GetSpecialFD(PR_StandardError);
-
-    RunThisOne(OneInThenCancelled, "OneInThenCancelled", test_name);
-    RunThisOne(OneOpOneThread, "OneOpOneThread", test_name);
-    RunThisOne(ManyOpOneThread, "ManyOpOneThread", test_name);
-    RunThisOne(SomeOpsSomeThreads, "SomeOpsSomeThreads", test_name);
-    RunThisOne(RealOneGroupIO, "RealOneGroupIO", test_name);
-    return 0;
-}  /* main */
-
-/* multwait.c */
diff --git a/libs/js/nsprpub/pr/tests/nameshm1.c b/libs/js/nsprpub/pr/tests/nameshm1.c
deleted file mode 100644
index e70f0e2afa..0000000000
--- a/libs/js/nsprpub/pr/tests/nameshm1.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: nameshm1.c -- Test Named Shared Memory
-**
-** Description: 
-** nameshm1 tests Named Shared Memory. nameshm1 performs two tests of
-** named shared memory. 
-** 
-** The first test is a basic test. The basic test operates as a single
-** process. The process exercises all the API elements of the facility.
-** This test also attempts to write to all locations in the shared
-** memory.
-**
-** The second test is a client-server test. The client-server test
-** creates a new instance of nameshm1, passing the -C argument to the
-** new process; this creates the client-side process. The server-side
-** (the instance of nameshm1 created from the command line) and the
-** client-side interact via inter-process semaphores to verify that the
-** shared memory segment can be read and written by both sides in a
-** synchronized maner.
-**
-** Note: Because this test runs in two processes, the log files created
-** by the test are not in chronological sequence; makes it hard to read.
-** As a temporary circumvention, I changed the definition(s) of the
-** _PUT_LOG() macro in prlog.c to force a flushall(), or equivalent.
-** This causes the log entries to be emitted in true chronological
-** order.
-**
-** Synopsis: nameshm1 [options] [name]
-** 
-** Options:
-** -d       Enables debug trace via PR_LOG()
-** -v       Enables verbose mode debug trace via PR_LOG()
-** -w       Causes the basic test to attempt to write to the segment
-**          mapped as read-only. When this option is specified, the
-**          test should crash with a seg-fault; this is a destructive
-**          test and is considered successful when it seg-faults.
-** 
-** -C       Causes nameshm1 to start as the client-side of a
-**          client-server pair of processes. Only the instance
-**          of nameshm1 operating as the server-side process should
-**          specify the -C option when creating the client-side process;
-**          the -C option should not be specified at the command line.
-**          The client-side uses the shared memory segment created by
-**          the server-side to communicate with the server-side
-**          process.
-**          
-** -p <n>   Specify the number of iterations the client-server tests
-**          should perform. Default: 1000.
-**
-** -s <n>   Size, in KBytes (1024), of the shared memory segment.
-**          Default: (10 * 1024)
-**
-** -i <n>   Number of client-side iterations. Default: 3
-**
-** name     specifies the name of the shared memory segment to be used.
-**          Default: /tmp/xxxNSPRshm
-**
-**
-** See also: prshm.h
-**
-** /lth. Aug-1999.
-*/
-
-#include <plgetopt.h> 
-#include <nspr.h>
-#include <stdlib.h>
-#include <string.h>
-#include <private/primpl.h>
-
-#define SEM_NAME1 "/tmp/nameshmSEM1"
-#define SEM_NAME2 "/tmp/nameshmSEM2"
-#define SEM_MODE  0666
-#define SHM_MODE  0666
-
-#define NameSize (1024)
-
-PRIntn  debug = 0;
-PRIntn  failed_already = 0;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRLogModuleInfo *lm;
-
-/* command line options */
-PRIntn      optDebug = 0;
-PRIntn      optVerbose = 0;
-PRUint32    optWriteRO = 0;     /* test write to read-only memory. should crash  */
-PRUint32    optClient = 0;
-PRUint32    optCreate = 1;
-PRUint32    optAttachRW = 1;
-PRUint32    optAttachRO = 1;
-PRUint32    optClose = 1;
-PRUint32    optDelete = 1;
-PRInt32     optPing = 1000;
-PRUint32    optSize = (10 * 1024 );
-PRInt32     optClientIterations = 3;
-char        optName[NameSize] = "/tmp/xxxNSPRshm";
-
-char buf[1024] = "";
-
-
-static void BasicTest( void ) 
-{
-    PRSharedMemory  *shm;
-    char *addr; /* address of shared memory segment */
-    PRUint32  i;
-    PRInt32 rc;
-
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Begin BasicTest" ));
-
-    if ( PR_FAILURE == PR_DeleteSharedMemory( optName )) {
-        PR_LOG( lm, msgLevel,
-            ("nameshm1: Initial PR_DeleteSharedMemory() failed. No problem"));
-    } else
-        PR_LOG( lm, msgLevel,
-            ("nameshm1: Initial PR_DeleteSharedMemory() success"));
-
-
-    shm = PR_OpenSharedMemory( optName, optSize, (PR_SHM_CREATE | PR_SHM_EXCL), SHM_MODE );
-    if ( NULL == shm )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RW Create: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RW Create: success: %p", shm ));
-
-    addr = PR_AttachSharedMemory( shm , 0 );
-    if ( NULL == addr ) 
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RW Attach: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RW Attach: success: %p", addr ));
-
-    /* fill memory with i */
-    for ( i = 0; i < optSize ;  i++ )
-    {
-         *(addr + i) = i;
-    }
-
-    rc = PR_DetachSharedMemory( shm, addr );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RW Detach: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RW Detach: success: " ));
-
-    rc = PR_CloseSharedMemory( shm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RW Close: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RW Close: success: " ));
-
-    rc = PR_DeleteSharedMemory( optName );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RW Delete: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RW Delete: success: " ));
-
-    PR_LOG( lm, msgLevel,
-            ("nameshm1: BasicTest(): Passed"));
-
-    return;
-} /* end BasicTest() */
-
-static void ReadOnlyTest( void )
-{
-    PRSharedMemory  *shm;
-    char *roAddr; /* read-only address of shared memory segment */
-    PRInt32 rc;
-
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Begin ReadOnlyTest" ));
-
-    shm = PR_OpenSharedMemory( optName, optSize, (PR_SHM_CREATE | PR_SHM_EXCL), SHM_MODE);
-    if ( NULL == shm )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RO Create: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RO Create: success: %p", shm ));
-
-
-    roAddr = PR_AttachSharedMemory( shm , PR_SHM_READONLY );
-    if ( NULL == roAddr ) 
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RO Attach: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RO Attach: success: %p", roAddr ));
-
-    if ( optWriteRO )
-    {
-        *roAddr = 0x00; /* write to read-only memory */
-        failed_already = 1;
-        PR_LOG( lm, msgLevel, ("nameshm1: Wrote to read-only memory segment!"));
-        return;
-    }
-
-    rc = PR_DetachSharedMemory( shm, roAddr );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RO Detach: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RO Detach: success: " ));
-
-    rc = PR_CloseSharedMemory( shm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RO Close: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RO Close: success: " ));
-
-    rc = PR_DeleteSharedMemory( optName );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: RO Destroy: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: RO Destroy: success: " ));
-
-    PR_LOG( lm, msgLevel,
-        ("nameshm1: ReadOnlyTest(): Passed"));
-
-    return;
-} /* end ReadOnlyTest() */
-
-static void DoClient( void )
-{
-    PRStatus rc;
-    PRSem *sem1, *sem2;
-    PRSharedMemory  *shm;
-    PRUint32 *addr; 
-    PRInt32 i;
-
-    PR_LOG( lm, msgLevel,
-            ("nameshm1: DoClient(): Starting"));
-
-    sem1 = PR_OpenSemaphore( SEM_NAME1, 0, 0, 0 );
-    PR_ASSERT( sem1 );
-
-    sem2 = PR_OpenSemaphore( SEM_NAME2, 0, 0, 0 );
-    PR_ASSERT( sem1 );
-
-    shm = PR_OpenSharedMemory( optName, optSize, 0, SHM_MODE );
-    if ( NULL == shm )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: DoClient(): Create: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: DoClient(): Create: success: %p", shm ));
-
-    addr = PR_AttachSharedMemory( shm , 0 );
-    if ( NULL == addr ) 
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: DoClient(): Attach: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: DoClient(): Attach: success: %p", addr ));
-
-    PR_LOG( lm, msgLevel,
-        ( "Client found: %s", addr));
-
-    PR_Sleep(PR_SecondsToInterval(4));
-    for ( i = 0 ; i < optPing ; i++ )
-    {
-        rc = PR_WaitSemaphore( sem2 );
-        PR_ASSERT( PR_FAILURE != rc );
-        
-        (*addr)++;
-        PR_ASSERT( (*addr % 2) == 0 );        
-        if ( optVerbose )
-            PR_LOG( lm, msgLevel,
-                 ( "nameshm1: Client ping: %d, i: %d", *addr, i));
-
-        rc = PR_PostSemaphore( sem1 );
-        PR_ASSERT( PR_FAILURE != rc );
-    }
-
-    rc = PR_CloseSemaphore( sem1 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_CloseSemaphore( sem2 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_DetachSharedMemory( shm, addr );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: DoClient(): Detach: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: DoClient(): Detach: success: " ));
-
-    rc = PR_CloseSharedMemory( shm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: DoClient(): Close: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: DoClient(): Close: success: " ));
-
-    return;
-}    /* end DoClient() */
-
-static void ClientServerTest( void )
-{
-    PRStatus rc;
-    PRSem *sem1, *sem2;
-    PRProcess *proc;
-    PRInt32 exit_status;
-    PRSharedMemory  *shm;
-    PRUint32 *addr; 
-    PRInt32 i;
-    char *child_argv[8];
-    char buf[24];
-
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Begin ClientServerTest" ));
-
-    rc = PR_DeleteSharedMemory( optName );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: Server: Destroy: failed. No problem"));
-    } else
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: Server: Destroy: success" ));
-
-
-    shm = PR_OpenSharedMemory( optName, optSize, (PR_SHM_CREATE | PR_SHM_EXCL), SHM_MODE);
-    if ( NULL == shm )
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: Server: Create: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Server: Create: success: %p", shm ));
-
-    addr = PR_AttachSharedMemory( shm , 0 );
-    if ( NULL == addr ) 
-    {
-        PR_LOG( lm, msgLevel,
-                 ( "nameshm1: Server: Attach: Error: %ld. OSError: %ld", PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Server: Attach: success: %p", addr ));
-
-    sem1 = PR_OpenSemaphore( SEM_NAME1, PR_SEM_CREATE, SEM_MODE, 0 );
-    PR_ASSERT( sem1 );
-
-    sem2 = PR_OpenSemaphore( SEM_NAME2, PR_SEM_CREATE, SEM_MODE, 1 );
-    PR_ASSERT( sem1 );
-
-    strcpy( (char*)addr, "FooBar" );
-
-    child_argv[0] = "nameshm1";
-    child_argv[1] = "-C";
-    child_argv[2] = "-p";
-    sprintf( buf, "%d", optPing );
-    child_argv[3] = buf;
-    child_argv[4] = optName;
-    child_argv[5] = NULL;
-
-    proc = PR_CreateProcess(child_argv[0], child_argv, NULL, NULL);
-    PR_ASSERT( proc );
-
-    PR_Sleep( PR_SecondsToInterval(4));
-
-    *addr = 1;
-    for ( i = 0 ; i < optPing ; i++ )
-    { 
-        rc = PR_WaitSemaphore( sem1 );
-        PR_ASSERT( PR_FAILURE != rc );
-
-        (*addr)++;
-        PR_ASSERT( (*addr % 2) == 1 );
-        if ( optVerbose )
-            PR_LOG( lm, msgLevel,
-                 ( "nameshm1: Server pong: %d, i: %d", *addr, i));
-
-    
-        rc = PR_PostSemaphore( sem2 );
-        PR_ASSERT( PR_FAILURE != rc );
-    }
-
-    rc = PR_WaitProcess( proc, &exit_status );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_CloseSemaphore( sem1 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_CloseSemaphore( sem2 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_DeleteSemaphore( SEM_NAME1 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_DeleteSemaphore( SEM_NAME2 );
-    PR_ASSERT( PR_FAILURE != rc );
-
-    rc = PR_DetachSharedMemory( shm, addr );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: Server: Detach: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Server: Detach: success: " ));
-
-    rc = PR_CloseSharedMemory( shm );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: Server: Close: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-        ( "nameshm1: Server: Close: success: " ));
-
-    rc = PR_DeleteSharedMemory( optName );
-    if ( PR_FAILURE == rc )
-    {
-        PR_LOG( lm, msgLevel,
-            ( "nameshm1: Server: Destroy: Error: %ld. OSError: %ld", 
-                PR_GetError(), PR_GetOSError()));
-        failed_already = 1;
-        return;
-    }
-    PR_LOG( lm, msgLevel,
-        ( "nameshm1: Server: Destroy: success" ));
-
-    return;
-} /* end ClientServerTest() */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    {
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "Cdvw:s:p:i:");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'v':  /* debug mode */
-                optVerbose = 1;
-                /* no break! fall into debug option */
-            case 'd':  /* debug mode */
-                debug = 1;
-			    msgLevel = PR_LOG_DEBUG;
-                break;
-            case 'w':  /* try writing to memory mapped read-only */
-                optWriteRO = 1;
-                break;
-            case 'C':
-                optClient = 1;
-                break;
-            case 's':
-                optSize = atol(opt->value) * 1024;
-                break;
-            case 'p':
-                optPing = atol(opt->value);
-                break;
-            case 'i':
-                optClientIterations = atol(opt->value);
-                break;
-            default:
-                strcpy( optName, opt->value );
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    }
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-    
-    PR_LOG( lm, msgLevel,
-             ( "nameshm1: Starting" ));
-
-    if ( optClient )
-    {
-        DoClient();
-    } else {
-        BasicTest();
-        if ( failed_already != 0 )
-            goto Finished;
-        ReadOnlyTest();
-        if ( failed_already != 0 )
-            goto Finished;
-        ClientServerTest();
-    }
-
-Finished:
-    if ( debug ) printf("%s\n", (failed_already)? "FAIL" : "PASS" );
-    return( (failed_already)? 1 : 0 );
-}  /* main() */
-/* end instrumt.c */
diff --git a/libs/js/nsprpub/pr/tests/nbconn.c b/libs/js/nsprpub/pr/tests/nbconn.c
deleted file mode 100644
index 099150a516..0000000000
--- a/libs/js/nsprpub/pr/tests/nbconn.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A test for nonblocking connect.  Functions tested include PR_Connect,
- * PR_Poll, and PR_GetConnectStatus.
- *
- * The test should be invoked with a host name, for example:
- *     nbconn www.netscape.com
- * It will do a nonblocking connect to port 80 (HTTP) on that host,
- * and when connected, issue the "GET /" HTTP command.
- *
- * You should run this test in three ways:
- * 1. To a known web site, such as www.netscape.com.  The HTML of the
- *    top-level page at the web site should be printed.
- * 2. To a machine not running a web server at port 80.  This test should
- *    fail.  Ideally the error code should be PR_CONNECT_REFUSED_ERROR.
- *    But it is possible to return PR_UNKNOWN_ERROR on certain platforms.
- * 3. To an unreachable machine, for example, a machine that is off line.
- *    The test should fail after the connect times out.  Ideally the
- *    error code should be PR_IO_TIMEOUT_ERROR, but it is possible to
- *    return PR_UNKNOWN_ERROR on certain platforms.
- */
-
-#include "nspr.h"
-#include "plgetopt.h"
-#include <stdio.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-static char *hosts[4] = {"cynic", "warp", "gandalf", "neon"};
-#endif
-
-#define SERVER_MAX_BIND_COUNT        100
-#define DATA_BUF_SIZE        		 256
-#define TCP_SERVER_PORT            10000
-#define TCP_UNUSED_PORT            211
-
-typedef struct Server_Param {
-    PRFileDesc *sp_fd;		/* server port */
-} Server_Param;
-static void PR_CALLBACK TCP_Server(void *arg);
-
-int _debug_on;
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-static PRIntn connection_success_test();
-static PRIntn connection_failure_test();
-
-int main(int argc, char **argv)
-{
-    PRHostEnt he;
-    char buf[1024];
-    PRNetAddr addr;
-    PRPollDesc pd;
-    PRStatus rv;
-    PRSocketOptionData optData;
-	const char *hostname = NULL;
-    PRIntn default_case, n, bytes_read, bytes_sent;
-	PRInt32 failed_already = 0;
-#ifdef XP_MAC
-	int index;
-	PRIntervalTime timeout;
-#endif
-
-    /*
-     * -d           debug mode
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:  /* debug mode */
-            hostname = opt->value;
-            break;
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("nbconn.log");
-	for (index=0; index<4; index++) {
-	argv[1] = hosts[index];
-	timeout = PR_INTERVAL_NO_TIMEOUT;
-	if (index == 3)
-		timeout = PR_SecondsToInterval(10UL);
-#endif
-
-
-    PR_STDIO_INIT();
-#ifndef XP_MAC
-    if (hostname)
-		default_case = 0;
-	else
-		default_case = 1;
-#endif
-
-	if (default_case) {
-
-		/*
-		 * In the default case the following tests are executed:
-		 *	1. successful connection: a server thread accepts a connection
-		 *	   from the main thread
-		 *	2. unsuccessful connection: the main thread tries to connect to a
-		 *	   non-existent port and expects to get an error
-		 */
-		rv = connection_success_test();
-		if (rv == 0)
-			rv = connection_failure_test();
-		return rv;
-	} else {
-    	PRFileDesc *sock;
-
-		if (PR_GetHostByName(argv[1], buf, sizeof(buf), &he) == PR_FAILURE) {
-			printf( "Unknown host: %s\n", argv[1]);
-			exit(1);
-		} else {
-			printf( "host: %s\n", buf);
-		}
-		PR_EnumerateHostEnt(0, &he, 80, &addr);
-
-		sock = PR_NewTCPSocket();
-		optData.option = PR_SockOpt_Nonblocking;
-		optData.value.non_blocking = PR_TRUE;
-		PR_SetSocketOption(sock, &optData);
-		rv = PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-		if (rv == PR_FAILURE && PR_GetError() == PR_IN_PROGRESS_ERROR) {
-			printf( "Connect in progress\n");
-		}
-
-		pd.fd = sock;
-		pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-#ifndef XP_MAC
-		n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-#else
-		n = PR_Poll(&pd, 1, timeout);
-#endif
-		if (n == -1) {
-			printf( "PR_Poll failed\n");
-			exit(1);
-		}
-		printf( "PR_Poll returns %d\n", n);
-		if (pd.out_flags & PR_POLL_READ) {
-			printf( "PR_POLL_READ\n");
-		}
-		if (pd.out_flags & PR_POLL_WRITE) {
-			printf( "PR_POLL_WRITE\n");
-		}
-		if (pd.out_flags & PR_POLL_EXCEPT) {
-			printf( "PR_POLL_EXCEPT\n");
-		}
-		if (pd.out_flags & PR_POLL_ERR) {
-			printf( "PR_POLL_ERR\n");
-		}
-		if (pd.out_flags & PR_POLL_NVAL) {
-			printf( "PR_POLL_NVAL\n");
-		}
-
-		if (PR_GetConnectStatus(&pd) == PR_SUCCESS) {
-			printf("PR_GetConnectStatus: connect succeeded\n");
-			/* Mac and Win16 have trouble printing to the console. */
-#if !defined(XP_MAC) && !defined(WIN16)
-			PR_Write(sock, "GET /\r\n\r\n", 9);
-			PR_Shutdown(sock, PR_SHUTDOWN_SEND);
-			pd.in_flags = PR_POLL_READ;
-			while (1) {
-				n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-				printf( "poll returns %d\n", n);
-				n = PR_Read(sock, buf, sizeof(buf));
-				printf( "read returns %d\n", n);
-				if (n <= 0) {
-					break;
-				}
-				PR_Write(PR_STDOUT, buf, n);
-			}
-#endif
-		} else {
-			if (PR_GetError() == PR_IN_PROGRESS_ERROR) {
-				printf( "PR_GetConnectStatus: connect still in progress\n");
-				exit(1);
-			}
-			printf( "PR_GetConnectStatus: connect failed: (%ld, %ld)\n",
-					PR_GetError(), PR_GetOSError());
-		}
-		PR_Close(sock);
-#ifdef XP_MAC
-		} /* end of for loop */
-#endif
-    	printf( "PASS\n");
-    	return 0;
-
-	}
-}
-
-
-/*
- * TCP Server
- *    Server Thread
- *    Accept a connection from the client and write some data
- */
-static void PR_CALLBACK
-TCP_Server(void *arg)
-{
-    Server_Param *sp = (Server_Param *) arg;
-    PRFileDesc *sockfd, *newsockfd;
-	char data_buf[DATA_BUF_SIZE];
-    PRIntn rv, bytes_read;
-
-	sockfd = sp->sp_fd;
-	if ((newsockfd = PR_Accept(sockfd, NULL,
-		PR_INTERVAL_NO_TIMEOUT)) == NULL) {
-		fprintf(stderr,"ERROR - PR_Accept failed: (%d,%d)\n",
-										PR_GetError(), PR_GetOSError());
-		return;
-	}
-	bytes_read = 0;
-	while (bytes_read != DATA_BUF_SIZE) {
-		rv = PR_Read(newsockfd, data_buf + bytes_read ,
-									DATA_BUF_SIZE - bytes_read);
-		if (rv < 0) {
-			fprintf(stderr,"Error - PR_Read failed: (%d, %d)\n",
-							PR_GetError(), PR_GetOSError());
-			PR_Close(newsockfd);
-			return;
-		}
-		PR_ASSERT(rv != 0);
-		bytes_read += rv;
-	}
-	DPRINTF(("Bytes read from client - %d\n",bytes_read));
-	rv = PR_Write(newsockfd, data_buf,DATA_BUF_SIZE);
-	if (rv < 0) {
-		fprintf(stderr,"Error - PR_Write failed: (%d, %d)\n",
-						PR_GetError(), PR_GetOSError());
-		PR_Close(newsockfd);
-		return;
-	}
-	PR_ASSERT(rv == DATA_BUF_SIZE);
-	DPRINTF(("Bytes written to client - %d\n",rv));
-	PR_Close(newsockfd);
-}
-
-
-/*
- * test for successful connection using a non-blocking socket
- */
-static PRIntn
-connection_success_test()
-{
-	PRFileDesc *sockfd = NULL, *conn_fd = NULL;
-	PRNetAddr netaddr;
-	PRInt32 i, rv;
-    PRPollDesc pd;
-    PRSocketOptionData optData;
-	PRThread *thr = NULL;
-	Server_Param sp;
-	char send_buf[DATA_BUF_SIZE], recv_buf[DATA_BUF_SIZE];
-    PRIntn default_case, n, bytes_read, bytes_sent;
-    PRIntn failed_already = 0;
-
-	/*
-	 * Create a tcp socket
-	 */
-	if ((sockfd = PR_NewTCPSocket()) == NULL) {
-		fprintf(stderr,"Error - PR_NewTCPSocket failed\n");
-		failed_already=1;
-		goto def_exit;
-	}
-	memset(&netaddr, 0 , sizeof(netaddr));
-	netaddr.inet.family = PR_AF_INET;
-	netaddr.inet.port = PR_htons(TCP_SERVER_PORT);
-	netaddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-	/*
-	 * try a few times to bind server's address, if addresses are in
-	 * use
-	 */
-	i = 0;
-	while (PR_Bind(sockfd, &netaddr) < 0) {
-		if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-			netaddr.inet.port += 2;
-			if (i++ < SERVER_MAX_BIND_COUNT)
-				continue;
-		}
-		fprintf(stderr,"ERROR - PR_Bind failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-
-	if (PR_Listen(sockfd, 32) < 0) {
-		fprintf(stderr,"ERROR - PR_Listen failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-
-	if (PR_GetSockName(sockfd, &netaddr) < 0) {
-		fprintf(stderr,"ERROR - PR_GetSockName failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-	if ((conn_fd = PR_NewTCPSocket()) == NULL) {
-		fprintf(stderr,"Error - PR_NewTCPSocket failed\n");
-		failed_already=1;
-		goto def_exit;
-	}
-	optData.option = PR_SockOpt_Nonblocking;
-	optData.value.non_blocking = PR_TRUE;
-	PR_SetSocketOption(conn_fd, &optData);
-	rv = PR_Connect(conn_fd, &netaddr, PR_INTERVAL_NO_TIMEOUT);
-	if (rv == PR_FAILURE) {
-		if (PR_GetError() == PR_IN_PROGRESS_ERROR) {
-			DPRINTF(("Connect in progress\n"));
-		} else  {
-			fprintf(stderr,"Error - PR_Connect failed: (%d, %d)\n",
-									PR_GetError(), PR_GetOSError());
-			failed_already=1;
-			goto def_exit;
-		}
-	}
-	/*
-	 * Now create a thread to accept a connection
-	 */
-	sp.sp_fd = sockfd;
-	thr = PR_CreateThread(PR_USER_THREAD, TCP_Server, (void *)&sp, 
-			PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-	if (thr == NULL) {
-		fprintf(stderr,"Error - PR_CreateThread failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-	DPRINTF(("Created TCP_Server thread [0x%x]\n",thr));
-	pd.fd = conn_fd;
-	pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-#ifndef XP_MAC
-	n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-#else
-	n = PR_Poll(&pd, 1, timeout);
-#endif
-	if (n == -1) {
-		fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-	if (PR_GetConnectStatus(&pd) == PR_SUCCESS) {
-		PRInt32 rv;
-
-		DPRINTF(("Connection successful\n"));
-
-		/*
-		 * Write some data, read it back and check data integrity to
-		 * make sure the connection is good
-		 */
-		pd.in_flags = PR_POLL_WRITE;
-		bytes_sent = 0;
-		memset(send_buf, 'a', DATA_BUF_SIZE);
-		while (bytes_sent != DATA_BUF_SIZE) {
-			rv = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-			if (rv < 0) {
-				fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n",
-								PR_GetError(), PR_GetOSError());
-				failed_already=1;
-				goto def_exit;
-			}
-			PR_ASSERT((rv == 1) && (pd.out_flags == PR_POLL_WRITE));
-			rv = PR_Write(conn_fd, send_buf + bytes_sent,
-										DATA_BUF_SIZE - bytes_sent);
-			if (rv < 0) {
-				fprintf(stderr,"Error - PR_Write failed: (%d, %d)\n",
-								PR_GetError(), PR_GetOSError());
-				failed_already=1;
-				goto def_exit;
-			}
-			PR_ASSERT(rv > 0);
-			bytes_sent += rv;
-		}
-		DPRINTF(("Bytes written to server - %d\n",bytes_sent));
-		PR_Shutdown(conn_fd, PR_SHUTDOWN_SEND);
-		pd.in_flags = PR_POLL_READ;
-		bytes_read = 0;
-		memset(recv_buf, 0, DATA_BUF_SIZE);
-		while (bytes_read != DATA_BUF_SIZE) {
-			rv = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-			if (rv < 0) {
-				fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n",
-								PR_GetError(), PR_GetOSError());
-				failed_already=1;
-				goto def_exit;
-			}
-			PR_ASSERT((rv == 1) && (pd.out_flags == PR_POLL_READ));
-			rv = PR_Read(conn_fd, recv_buf + bytes_read ,
-										DATA_BUF_SIZE - bytes_read);
-			if (rv < 0) {
-				fprintf(stderr,"Error - PR_Read failed: (%d, %d)\n",
-								PR_GetError(), PR_GetOSError());
-				failed_already=1;
-				goto def_exit;
-			}
-			PR_ASSERT(rv != 0);
-			bytes_read += rv;
-		}
-		DPRINTF(("Bytes read from server - %d\n",bytes_read));
-		/*
-		 * verify the data read
-		 */
-		if (memcmp(send_buf, recv_buf, DATA_BUF_SIZE) != 0) {
-			fprintf(stderr,"ERROR - data corruption\n");
-			failed_already=1;
-			goto def_exit;
-		}
-		DPRINTF(("Data integrity verified\n"));
-	} else {
-		fprintf(stderr,"PR_GetConnectStatus: connect failed: (%ld, %ld)\n",
-				PR_GetError(), PR_GetOSError());
-		failed_already = 1;
-		goto def_exit;
-	}
-def_exit:
-	if (thr) {
-		PR_JoinThread(thr);
-		thr = NULL;
-	}
-	if (sockfd) {
-		PR_Close(sockfd);
-		sockfd = NULL;
-	}
-	if (conn_fd) {
-		PR_Close(conn_fd);
-		conn_fd = NULL;
-	}
-	if (failed_already)
-		return 1;
-	else
-		return 0;
-
-}
-
-/*
- * test for connection to a non-existent port using a non-blocking socket
- */
-static PRIntn
-connection_failure_test()
-{
-	PRFileDesc *sockfd = NULL, *conn_fd = NULL;
-	PRNetAddr netaddr;
-	PRInt32 i, rv;
-    PRPollDesc pd;
-    PRSocketOptionData optData;
-    PRIntn n, failed_already = 0;
-
-	/*
-	 * Create a tcp socket
-	 */
-	if ((sockfd = PR_NewTCPSocket()) == NULL) {
-		fprintf(stderr,"Error - PR_NewTCPSocket failed\n");
-		failed_already=1;
-		goto def_exit;
-	}
-	memset(&netaddr, 0 , sizeof(netaddr));
-	netaddr.inet.family = PR_AF_INET;
-	netaddr.inet.port = PR_htons(TCP_SERVER_PORT);
-	netaddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-	/*
-	 * try a few times to bind server's address, if addresses are in
-	 * use
-	 */
-	i = 0;
-	while (PR_Bind(sockfd, &netaddr) < 0) {
-		if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-			netaddr.inet.port += 2;
-			if (i++ < SERVER_MAX_BIND_COUNT)
-				continue;
-		}
-		fprintf(stderr,"ERROR - PR_Bind failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-
-	if (PR_GetSockName(sockfd, &netaddr) < 0) {
-		fprintf(stderr,"ERROR - PR_GetSockName failed: (%d,%d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-#ifdef AIX
-	/*
-	 * On AIX, set to unused/reserved port
-	 */
-	netaddr.inet.port = PR_htons(TCP_UNUSED_PORT);
-#endif
-	if ((conn_fd = PR_NewTCPSocket()) == NULL) {
-		fprintf(stderr,"Error - PR_NewTCPSocket failed\n");
-		failed_already=1;
-		goto def_exit;
-	}
-	optData.option = PR_SockOpt_Nonblocking;
-	optData.value.non_blocking = PR_TRUE;
-	PR_SetSocketOption(conn_fd, &optData);
-	rv = PR_Connect(conn_fd, &netaddr, PR_INTERVAL_NO_TIMEOUT);
-	if (rv == PR_FAILURE) {
-		DPRINTF(("PR_Connect to a non-listen port failed: (%d, %d)\n",
-									PR_GetError(), PR_GetOSError()));
-	} else {
-		PR_ASSERT(rv == PR_SUCCESS);
-		fprintf(stderr,"Error - PR_Connect succeeded, expected to fail\n");
-		failed_already=1;
-		goto def_exit;
-	}
-	pd.fd = conn_fd;
-	pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-#ifndef XP_MAC
-	n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-#else
-	n = PR_Poll(&pd, 1, timeout);
-#endif
-	if (n == -1) {
-		fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n",
-									PR_GetError(), PR_GetOSError());
-		failed_already=1;
-		goto def_exit;
-	}
-	if (PR_GetConnectStatus(&pd) == PR_SUCCESS) {
-		PRInt32 rv;
-		fprintf(stderr,"PR_GetConnectStatus succeeded, expected to fail\n");
-		failed_already = 1;
-		goto def_exit;
-	}
-	rv = PR_GetError();
-	DPRINTF(("Connection failed, successfully with PR_Error %d\n",rv));
-def_exit:
-	if (sockfd) {
-		PR_Close(sockfd);
-		sockfd = NULL;
-	}
-	if (conn_fd) {
-		PR_Close(conn_fd);
-		conn_fd = NULL;
-	}
-	if (failed_already)
-		return 1;
-	else
-		return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/nblayer.c b/libs/js/nsprpub/pr/tests/nblayer.c
deleted file mode 100644
index 4ecc955c3e..0000000000
--- a/libs/js/nsprpub/pr/tests/nblayer.c
+++ /dev/null
@@ -1,707 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prmem.h"
-#include "prprf.h"
-#include "prlog.h"
-#include "prerror.h"
-#include "prnetdb.h"
-#include "prthread.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-#include "prwin16.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Testing layering of I/O
-**
-**      The layered server
-** A thread that acts as a server. It creates a TCP listener with a dummy
-** layer pushed on top. Then listens for incoming connections. Each connection
-** request for connection will be layered as well, accept one request, echo
-** it back and close.
-**
-**      The layered client
-** Pretty much what you'd expect.
-*/
-
-static PRFileDesc *logFile;
-static PRDescIdentity identity;
-static PRNetAddr server_address;
-
-static PRIOMethods myMethods;
-
-typedef enum {rcv_get_debit, rcv_send_credit, rcv_data} RcvState;
-typedef enum {xmt_send_debit, xmt_recv_credit, xmt_data} XmtState;
-
-struct PRFilePrivate
-{
-    RcvState rcvstate;
-    XmtState xmtstate;
-    PRInt32 rcvreq, rcvinprogress;
-    PRInt32 xmtreq, xmtinprogress;
-};
-
-typedef enum Verbosity {silent, quiet, chatty, noisy} Verbosity;
-
-static PRIntn minor_iterations = 5;
-static PRIntn major_iterations = 1;
-static Verbosity verbosity = quiet;
-static PRUint16 default_port = 12273;
-
-static PRFileDesc *PushLayer(PRFileDesc *stack)
-{
-    PRStatus rv;
-    PRFileDesc *layer = PR_CreateIOLayerStub(identity, &myMethods);
-    layer->secret = PR_NEWZAP(PRFilePrivate);
-    rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), layer);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Pushed layer(0x%x) onto stack(0x%x)\n", layer, stack);
-    return stack;
-}  /* PushLayer */
-
-static PRFileDesc *PopLayer(PRFileDesc *stack)
-{
-    PRFileDesc *popped = PR_PopIOLayer(stack, identity);
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Popped layer(0x%x) from stack(0x%x)\n", popped, stack);
-    PR_DELETE(popped->secret);
-    popped->dtor(popped);
-    return stack;
-}  /* PopLayer */
-
-static void PR_CALLBACK Client(void *arg)
-{
-    PRStatus rv;
-    PRIntn mits;
-    PRInt32 ready;
-    PRUint8 buffer[100];
-    PRPollDesc polldesc;
-    PRIntn empty_flags = 0;
-    PRIntn bytes_read, bytes_sent;
-    PRFileDesc *stack = (PRFileDesc*)arg;
-
-    /* Initialize the buffer so that Purify won't complain */
-    memset(buffer, 0, sizeof(buffer));
-
-    rv = PR_Connect(stack, &server_address, PR_INTERVAL_NO_TIMEOUT);
-    if ((PR_FAILURE == rv) && (PR_IN_PROGRESS_ERROR == PR_GetError()))
-    {
-        if (verbosity > quiet)
-            PR_fprintf(logFile, "Client connect 'in progress'\n");
-        do
-        {
-            polldesc.fd = stack;
-            polldesc.out_flags = 0;
-            polldesc.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-            ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-            if ((1 != ready)  /* if not 1, then we're dead */
-            || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                { PR_ASSERT(!"Whoa!"); break; }
-            if (verbosity > quiet)
-                PR_fprintf(
-                    logFile, "Client connect 'in progress' [0x%x]\n",
-                    polldesc.out_flags);
-            rv = PR_GetConnectStatus(&polldesc);
-            if ((PR_FAILURE == rv)
-            && (PR_IN_PROGRESS_ERROR != PR_GetError())) break;
-        } while (PR_FAILURE == rv);
-    }
-    PR_ASSERT(PR_SUCCESS == rv);
-    if (verbosity > chatty)
-        PR_fprintf(logFile, "Client created connection\n");
-
-    for (mits = 0; mits < minor_iterations; ++mits)
-    {
-        bytes_sent = 0;
-        if (verbosity > quiet)
-            PR_fprintf(logFile, "Client sending %d bytes\n", sizeof(buffer));
-        do
-        {
-            if (verbosity > chatty)
-                PR_fprintf(
-                    logFile, "Client sending %d bytes\n",
-                    sizeof(buffer) - bytes_sent);
-            ready = PR_Send(
-                stack, buffer + bytes_sent, sizeof(buffer) - bytes_sent,
-                empty_flags, PR_INTERVAL_NO_TIMEOUT);
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Client send status [%d]\n", ready);
-            if (0 < ready) bytes_sent += ready;
-            else if ((-1 == ready) && (PR_WOULD_BLOCK_ERROR == PR_GetError()))
-            {
-                polldesc.fd = stack;
-                polldesc.out_flags = 0;
-                polldesc.in_flags = PR_POLL_WRITE;
-                ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-                if ((1 != ready)  /* if not 1, then we're dead */
-                || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                    { PR_ASSERT(!"Whoa!"); break; }
-            }
-            else break;
-        } while (bytes_sent < sizeof(buffer));
-        PR_ASSERT(sizeof(buffer) == bytes_sent);
-
-        bytes_read = 0;
-        do
-        {
-            if (verbosity > chatty)
-                PR_fprintf(
-                    logFile, "Client receiving %d bytes\n",
-                    bytes_sent - bytes_read);
-            ready = PR_Recv(
-                stack, buffer + bytes_read, bytes_sent - bytes_read,
-                empty_flags, PR_INTERVAL_NO_TIMEOUT);
-            if (verbosity > chatty)
-                PR_fprintf(
-                    logFile, "Client receive status [%d]\n", ready);
-            if (0 < ready) bytes_read += ready;
-            else if ((-1 == ready) && (PR_WOULD_BLOCK_ERROR == PR_GetError()))
-            {
-                polldesc.fd = stack;
-                polldesc.out_flags = 0;
-                polldesc.in_flags = PR_POLL_READ;
-                ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-                if ((1 != ready)  /* if not 1, then we're dead */
-                || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                    { PR_ASSERT(!"Whoa!"); break; }
-            }
-            else break;
-        } while (bytes_read < bytes_sent);
-        if (verbosity > chatty)
-            PR_fprintf(logFile, "Client received %d bytes\n", bytes_read);
-        PR_ASSERT(bytes_read == bytes_sent);
-    }
-
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Client shutting down stack\n");
-    
-    rv = PR_Shutdown(stack, PR_SHUTDOWN_BOTH); PR_ASSERT(PR_SUCCESS == rv);
-}  /* Client */
-
-static void PR_CALLBACK Server(void *arg)
-{
-    PRStatus rv;
-    PRInt32 ready;
-    PRUint8 buffer[100];
-    PRFileDesc *service;
-    PRUintn empty_flags = 0;
-    struct PRPollDesc polldesc;
-    PRIntn bytes_read, bytes_sent;
-    PRFileDesc *stack = (PRFileDesc*)arg;
-    PRNetAddr client_address;
-
-    do
-    {
-        if (verbosity > chatty)
-            PR_fprintf(logFile, "Server accepting connection\n");
-        service = PR_Accept(stack, &client_address, PR_INTERVAL_NO_TIMEOUT);
-        if (verbosity > chatty)
-            PR_fprintf(logFile, "Server accept status [0x%p]\n", service);
-        if ((NULL == service) && (PR_WOULD_BLOCK_ERROR == PR_GetError()))
-        {
-            polldesc.fd = stack;
-            polldesc.out_flags = 0;
-            polldesc.in_flags = PR_POLL_READ | PR_POLL_EXCEPT;
-            ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-            if ((1 != ready)  /* if not 1, then we're dead */
-            || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                { PR_ASSERT(!"Whoa!"); break; }
-        }
-    } while (NULL == service);
-    PR_ASSERT(NULL != service);
-        
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Server accepting connection\n");
-
-    do
-    {
-        bytes_read = 0;
-        do
-        {
-            if (verbosity > chatty)
-                PR_fprintf(
-                    logFile, "Server receiving %d bytes\n",
-                    sizeof(buffer) - bytes_read);
-            ready = PR_Recv(
-                service, buffer + bytes_read, sizeof(buffer) - bytes_read,
-                empty_flags, PR_INTERVAL_NO_TIMEOUT);
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Server receive status [%d]\n", ready);
-            if (0 < ready) bytes_read += ready;
-            else if ((-1 == ready) && (PR_WOULD_BLOCK_ERROR == PR_GetError()))
-            {
-                polldesc.fd = service;
-                polldesc.out_flags = 0;
-                polldesc.in_flags = PR_POLL_READ;
-                ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-                if ((1 != ready)  /* if not 1, then we're dead */
-                || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                    { PR_ASSERT(!"Whoa!"); break; }
-            }
-            else break;
-        } while (bytes_read < sizeof(buffer));
-
-        if (0 != bytes_read)
-        {
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Server received %d bytes\n", bytes_read);
-            PR_ASSERT(bytes_read > 0);
-
-            bytes_sent = 0;
-            do
-            {
-                ready = PR_Send(
-                    service, buffer + bytes_sent, bytes_read - bytes_sent,
-                    empty_flags, PR_INTERVAL_NO_TIMEOUT);
-                if (0 < ready)
-                {
-                    bytes_sent += ready;
-                }
-                else if ((-1 == ready) && (PR_WOULD_BLOCK_ERROR == PR_GetError()))
-                {
-                    polldesc.fd = service;
-                    polldesc.out_flags = 0;
-                    polldesc.in_flags = PR_POLL_WRITE;
-                    ready = PR_Poll(&polldesc, 1, PR_INTERVAL_NO_TIMEOUT);
-                    if ((1 != ready)  /* if not 1, then we're dead */
-                    || (0 == (polldesc.in_flags & polldesc.out_flags)))
-                        { PR_ASSERT(!"Whoa!"); break; }
-                }
-                else break;
-            } while (bytes_sent < bytes_read);
-            PR_ASSERT(bytes_read == bytes_sent);
-            if (verbosity > chatty)
-                PR_fprintf(logFile, "Server sent %d bytes\n", bytes_sent);
-        }
-    } while (0 != bytes_read);
-
-    if (verbosity > quiet)
-        PR_fprintf(logFile, "Server shutting down stack\n");
-    rv = PR_Shutdown(service, PR_SHUTDOWN_BOTH); PR_ASSERT(PR_SUCCESS == rv);
-    rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
-
-}  /* Server */
-
-static PRStatus PR_CALLBACK MyClose(PRFileDesc *fd)
-{
-    PR_DELETE(fd->secret);  /* manage my secret file object */
-    return (PR_GetDefaultIOMethods())->close(fd);  /* let him do all the work */
-}  /* MyClose */
-
-static PRInt16 PR_CALLBACK MyPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    PRInt16 my_flags, new_flags;
-    PRFilePrivate *mine = (PRFilePrivate*)fd->secret;
-    if (0 != (PR_POLL_READ & in_flags))
-    {
-        /* client thinks he's reading */
-        switch (mine->rcvstate)
-        {
-            case rcv_send_credit:
-                my_flags = (in_flags & ~PR_POLL_READ) | PR_POLL_WRITE;
-                break;
-            case rcv_data:
-            case rcv_get_debit:
-                my_flags = in_flags;
-            default: break;
-        }
-    }
-    else if (0 != (PR_POLL_WRITE & in_flags))
-    {
-        /* client thinks he's writing */
-        switch (mine->xmtstate)
-        {
-            case xmt_recv_credit:
-                my_flags = (in_flags & ~PR_POLL_WRITE) | PR_POLL_READ;
-                break;
-            case xmt_send_debit:
-            case xmt_data:
-                my_flags = in_flags;
-            default: break;
-        }
-    }
-    else PR_ASSERT(!"How'd I get here?");
-    new_flags = (fd->lower->methods->poll)(fd->lower, my_flags, out_flags);
-    if (verbosity > chatty)
-        PR_fprintf(
-            logFile, "Poll [i: 0x%x, m: 0x%x, o: 0x%x, n: 0x%x]\n",
-            in_flags, my_flags, *out_flags, new_flags);
-    return new_flags;
-}  /* MyPoll */
-
-static PRFileDesc * PR_CALLBACK MyAccept(
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
-{
-    PRStatus rv;
-    PRFileDesc *newfd, *layer = fd;
-    PRFileDesc *newstack;
-    PRFilePrivate *newsecret;
-
-    PR_ASSERT(fd != NULL);
-    PR_ASSERT(fd->lower != NULL);
-
-    newstack = PR_NEW(PRFileDesc);
-    if (NULL == newstack)
-    {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    newsecret = PR_NEW(PRFilePrivate);
-    if (NULL == newsecret)
-    {
-        PR_DELETE(newstack);
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        return NULL;
-    }
-    *newstack = *fd;  /* make a copy of the accepting layer */
-    *newsecret = *fd->secret;
-    newstack->secret = newsecret;
-
-    newfd = (fd->lower->methods->accept)(fd->lower, addr, timeout);
-    if (NULL == newfd)
-    {
-        PR_DELETE(newsecret);
-        PR_DELETE(newstack);
-        return NULL;
-    }
-
-    /* this PR_PushIOLayer call cannot fail */
-    rv = PR_PushIOLayer(newfd, PR_TOP_IO_LAYER, newstack);
-    PR_ASSERT(PR_SUCCESS == rv);
-    return newfd;  /* that's it */
-}
-
-static PRInt32 PR_CALLBACK MyRecv(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    char *b;
-    PRInt32 rv;
-    PRFileDesc *lo = fd->lower;
-    PRFilePrivate *mine = (PRFilePrivate*)fd->secret;
-
-    do
-    {
-        switch (mine->rcvstate)
-        {
-        case rcv_get_debit:
-            b = (char*)&mine->rcvreq;
-            mine->rcvreq = amount;
-            rv = lo->methods->recv(
-                lo, b + mine->rcvinprogress,
-                sizeof(mine->rcvreq) - mine->rcvinprogress, flags, timeout);
-            if (0 == rv) goto closed;
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->rcvinprogress += rv;  /* accumulate the read */
-            if (mine->rcvinprogress < sizeof(mine->rcvreq)) break;  /* loop */
-            mine->rcvstate = rcv_send_credit;
-            mine->rcvinprogress = 0;
-        case rcv_send_credit:
-            b = (char*)&mine->rcvreq;
-            rv = lo->methods->send(
-                lo, b + mine->rcvinprogress,
-                sizeof(mine->rcvreq) - mine->rcvinprogress, flags, timeout);
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->rcvinprogress += rv;  /* accumulate the read */
-            if (mine->rcvinprogress < sizeof(mine->rcvreq)) break;  /* loop */
-            mine->rcvstate = rcv_data;
-            mine->rcvinprogress = 0;
-        case rcv_data:
-            b = (char*)buf;
-            rv = lo->methods->recv(
-                lo, b + mine->rcvinprogress,
-                mine->rcvreq - mine->rcvinprogress, flags, timeout);
-            if (0 == rv) goto closed;
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->rcvinprogress += rv;  /* accumulate the read */
-            if (mine->rcvinprogress < amount) break;  /* loop */
-            mine->rcvstate = rcv_get_debit;
-            mine->rcvinprogress = 0;
-            return mine->rcvreq;  /* << -- that's it! */
-        default:
-            break;
-        }
-    } while (-1 != rv);
-    return rv;
-closed:
-    mine->rcvinprogress = 0;
-    mine->rcvstate = rcv_get_debit;
-    return 0;
-}  /* MyRecv */
-
-static PRInt32 PR_CALLBACK MySend(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout)
-{
-    char *b;
-    PRInt32 rv;
-    PRFileDesc *lo = fd->lower;
-    PRFilePrivate *mine = (PRFilePrivate*)fd->secret;
-
-    do
-    {
-        switch (mine->xmtstate)
-        {
-        case xmt_send_debit:
-            b = (char*)&mine->xmtreq;
-            mine->xmtreq = amount;
-            rv = lo->methods->send(
-                lo, b - mine->xmtinprogress,
-                sizeof(mine->xmtreq) - mine->xmtinprogress, flags, timeout);
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->xmtinprogress += rv;
-            if (mine->xmtinprogress < sizeof(mine->xmtreq)) break;
-            mine->xmtstate = xmt_recv_credit;
-            mine->xmtinprogress = 0;
-        case xmt_recv_credit:
-             b = (char*)&mine->xmtreq;
-             rv = lo->methods->recv(
-                lo, b + mine->xmtinprogress,
-                sizeof(mine->xmtreq) - mine->xmtinprogress, flags, timeout);
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->xmtinprogress += rv;
-            if (mine->xmtinprogress < sizeof(mine->xmtreq)) break;
-            mine->xmtstate = xmt_data;
-            mine->xmtinprogress = 0;
-        case xmt_data:
-            b = (char*)buf;
-            rv = lo->methods->send(
-                lo, b + mine->xmtinprogress,
-                mine->xmtreq - mine->xmtinprogress, flags, timeout);
-            if ((-1 == rv) && (PR_WOULD_BLOCK_ERROR == PR_GetError())) break;
-            mine->xmtinprogress += rv;
-            if (mine->xmtinprogress < amount) break;
-            mine->xmtstate = xmt_send_debit;
-            mine->xmtinprogress = 0;
-            return mine->xmtreq;  /* <<-- That's the one! */
-        default:
-            break;
-        }
-    } while (-1 != rv);
-    return rv;
-}  /* MySend */
-
-static Verbosity ChangeVerbosity(Verbosity verbosity, PRIntn delta)
-{
-    PRIntn verbage = (PRIntn)verbosity + delta;
-    if (verbage < (PRIntn)silent) verbage = (PRIntn)silent;
-    else if (verbage > (PRIntn)noisy) verbage = (PRIntn)noisy;
-    return (Verbosity)verbage;
-}  /* ChangeVerbosity */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PLOptStatus os;
-    PRFileDesc *client, *service;
-    PRNetAddr any_address;
-    const char *server_name = NULL;
-    const PRIOMethods *stubMethods;
-    PRThread *client_thread, *server_thread;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-    PRSocketOptionData socket_noblock, socket_nodelay;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dqGC:c:p:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:
-            server_name = opt->value;
-            break;
-        case 'd':  /* debug mode */
-            if (verbosity < noisy)
-                verbosity = ChangeVerbosity(verbosity, 1);
-            break;
-        case 'q':  /* debug mode */
-            if (verbosity > silent)
-                verbosity = ChangeVerbosity(verbosity, -1);
-            break;
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'C':  /* number of threads waiting */
-            major_iterations = atoi(opt->value);
-            break;
-        case 'c':  /* number of client threads */
-            minor_iterations = atoi(opt->value);
-            break;
-        case 'p':  /* default port */
-            default_port = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-    PR_STDIO_INIT();
-
-    logFile = PR_GetSpecialFD(PR_StandardError);
-    identity = PR_GetUniqueIdentity("Dummy");
-    stubMethods = PR_GetDefaultIOMethods();
-
-    /*
-    ** The protocol we're going to implement is one where in order to initiate
-    ** a send, the sender must first solicit permission. Therefore, every
-    ** send is really a send - receive - send sequence.
-    */
-    myMethods = *stubMethods;  /* first get the entire batch */
-    myMethods.accept = MyAccept;  /* then override the ones we care about */
-    myMethods.recv = MyRecv;  /* then override the ones we care about */
-    myMethods.send = MySend;  /* then override the ones we care about */
-    myMethods.close = MyClose;  /* then override the ones we care about */
-    myMethods.poll = MyPoll;  /* then override the ones we care about */
-
-    if (NULL == server_name)
-        rv = PR_InitializeNetAddr(
-            PR_IpAddrLoopback, default_port, &server_address);
-    else
-    {
-        rv = PR_StringToNetAddr(server_name, &server_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_InitializeNetAddr(
-            PR_IpAddrNull, default_port, &server_address);
-    }
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    socket_noblock.value.non_blocking = PR_TRUE;
-    socket_noblock.option = PR_SockOpt_Nonblocking;
-    socket_nodelay.value.no_delay = PR_TRUE;
-    socket_nodelay.option = PR_SockOpt_NoDelay;
-
-    /* one type w/o layering */
-
-    while (major_iterations-- > 0)
-    {
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Beginning non-layered test\n");
-
-        client = PR_NewTCPSocket(); PR_ASSERT(NULL != client);
-        service = PR_NewTCPSocket(); PR_ASSERT(NULL != service);
-
-        rv = PR_SetSocketOption(client, &socket_noblock);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(service, &socket_noblock);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(client, &socket_nodelay);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(service, &socket_nodelay);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &any_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(service, &any_address); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Listen(service, 10); PR_ASSERT(PR_SUCCESS == rv);
-
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, Server, service,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != server_thread);
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, Client, client,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != client_thread);
-
-        rv = PR_JoinThread(client_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(server_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_Close(client); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Ending non-layered test\n");
-
-        /* with layering */
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Beginning layered test\n");
-        client = PR_NewTCPSocket(); PR_ASSERT(NULL != client);
-        service = PR_NewTCPSocket(); PR_ASSERT(NULL != service);
-
-        rv = PR_SetSocketOption(client, &socket_noblock);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(service, &socket_noblock);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(client, &socket_nodelay);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetSocketOption(service, &socket_nodelay);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        PushLayer(client);
-        PushLayer(service);
-
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, default_port, &any_address);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(service, &any_address); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Listen(service, 10); PR_ASSERT(PR_SUCCESS == rv);
-
-        server_thread = PR_CreateThread(
-            PR_USER_THREAD, Server, service,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != server_thread);
-
-        client_thread = PR_CreateThread(
-            PR_USER_THREAD, Client, client,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 16 * 1024);
-        PR_ASSERT(NULL != client_thread);
-
-        rv = PR_JoinThread(client_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_JoinThread(server_thread);
-        PR_ASSERT(PR_SUCCESS == rv);
-
-        rv = PR_Close(PopLayer(client)); PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Close(PopLayer(service)); PR_ASSERT(PR_SUCCESS == rv);
-        if (verbosity > silent)
-            PR_fprintf(logFile, "Ending layered test\n");
-    }
-    return 0;
-}  /* main */
-
-/* nblayer.c */
diff --git a/libs/js/nsprpub/pr/tests/nonblock.c b/libs/js/nsprpub/pr/tests/nonblock.c
deleted file mode 100644
index 102fd84b24..0000000000
--- a/libs/js/nsprpub/pr/tests/nonblock.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "prio.h"
-#include "prerror.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prnetdb.h"
-#include "plerror.h"
-#ifndef XP_MAC
-#include "obsolete/probslet.h"
-#else
-#include "probslet.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUMBER_ROUNDS 5
-
-#if defined(WIN16)
-/*
-** Make win16 unit_time interval 300 milliseconds, others get 100
-*/
-#define UNIT_TIME  200       /* unit time in milliseconds */
-#else
-#define UNIT_TIME  100       /* unit time in milliseconds */
-#endif
-#define CHUNK_SIZE 10
-#undef USE_PR_SELECT         /* If defined, we use PR_Select.
-                              * If not defined, use PR_Poll instead. */
-
-#if defined(USE_PR_SELECT)
-#include "pprio.h"
-#endif
-
-#ifdef XP_MAC
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-PR_LogPrint(fmt);
-return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-static void PR_CALLBACK
-clientThreadFunc(void *arg)
-{
-    PRUintn port = (PRUintn)arg;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    char buf[CHUNK_SIZE];
-    int i;
-    PRIntervalTime unitTime = PR_MillisecondsToInterval(UNIT_TIME);
-    PRSocketOptionData optval;
-    PRStatus retVal;
-    PRInt32 nBytes;
-
-    /* Initialize the buffer so that Purify won't complain */
-    memset(buf, 0, sizeof(buf));
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons((PRUint16)port);
-    addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    PR_snprintf(buf, sizeof(buf), "%hu", addr.inet.ip);
-
-    /* time 1 */
-    PR_Sleep(unitTime);
-    sock = PR_NewTCPSocket();
-    optval.option = PR_SockOpt_Nonblocking;
-    optval.value.non_blocking = PR_TRUE;
-    PR_SetSocketOption(sock, &optval);
-    retVal = PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-    if (retVal == PR_FAILURE && PR_GetError() == PR_IN_PROGRESS_ERROR) {
-#if !defined(USE_PR_SELECT)
-	PRPollDesc pd;
-	PRInt32 n;
-	fprintf(stderr, "connect: EWOULDBLOCK, good\n");
-	pd.fd = sock;
-	pd.in_flags = PR_POLL_WRITE;
-	n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(n == 1);
-        PR_ASSERT(pd.out_flags == PR_POLL_WRITE);
-#else
-        PR_fd_set writeSet;
-        PRInt32 n;
-        fprintf(stderr, "connect: EWOULDBLOCK, good\n");
-        PR_FD_ZERO(&writeSet);
-        PR_FD_SET(sock, &writeSet);
-        n = PR_Select(0, NULL, &writeSet, NULL, PR_INTERVAL_NO_TIMEOUT);
-        PR_ASSERT(n == 1);
-        PR_ASSERT(PR_FD_ISSET(sock, &writeSet));
-#endif
-    }
-    printf("client connected\n");
-    fflush(stdout);
-
-    /* time 4, 7, 11, etc. */
-    for (i = 0; i < NUMBER_ROUNDS; i++) {
-        PR_Sleep(3 * unitTime);
-    	nBytes = PR_Write(sock, buf, sizeof(buf));
-	    if (nBytes == -1) {
-	    if (PR_GetError() == PR_WOULD_BLOCK_ERROR) {
-		fprintf(stderr, "write: EWOULDBLOCK\n");
-		exit(1);
-            } else {
-		fprintf(stderr, "write: failed\n");
-            }
-	}
-	printf("client sent %d bytes\n", nBytes);
-	fflush(stdout);
-    }
-
-    PR_Close(sock);
-}
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-    PRFileDesc *listenSock, *sock;
-    PRUint16 listenPort;
-    PRNetAddr addr;
-    char buf[CHUNK_SIZE];
-    PRThread *clientThread;
-    PRInt32 retVal;
-    PRSocketOptionData optval;
-    PRIntn i;
-    PRIntervalTime unitTime = PR_MillisecondsToInterval(UNIT_TIME);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("nonblock.log");
-#endif
-
-    /* Create a listening socket */
-    if ((listenSock = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	exit(1);
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	exit(1);
-    }
-    if (PR_GetSockName(listenSock, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	exit(1);
-    }
-    listenPort = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	exit(1);
-    }
-
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on port %hu\n\n",
-	    listenPort);
-    printf("%s", buf);
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-    printf("client thread created.\n");
-
-    optval.option = PR_SockOpt_Nonblocking;
-    optval.value.non_blocking = PR_TRUE;
-    PR_SetSocketOption(listenSock, &optval);
-    /* time 0 */
-    sock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (sock != NULL || PR_GetError() != PR_WOULD_BLOCK_ERROR) {
-        PL_PrintError("First Accept\n");
-        fprintf(stderr, "First PR_Accept() xxx\n" );
-		    exit(1);
-    }
-    printf("accept: EWOULDBLOCK, good\n");
-    fflush(stdout);
-    /* time 2 */
-    PR_Sleep(2 * unitTime);
-    sock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (sock == NULL) {
-        PL_PrintError("Second Accept\n");
-        fprintf(stderr, "Second PR_Accept() failed: (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-		    exit(1);
-    }
-    printf("accept: succeeded, good\n");
-    fflush(stdout);
-    PR_Close(listenSock);
-
-    PR_SetSocketOption(sock, &optval);
-
-    /* time 3, 5, 6, 8, etc. */
-    for (i = 0; i < NUMBER_ROUNDS; i++) {
-	PR_Sleep(unitTime);
-	retVal = PR_Recv(sock, buf, sizeof(buf), 0, PR_INTERVAL_NO_TIMEOUT);
-	if (retVal != -1 || PR_GetError() != PR_WOULD_BLOCK_ERROR) {
-        PL_PrintError("First Receive:\n");
-	    fprintf(stderr, "First PR_Recv: retVal: %ld, Error: %ld\n",
-            retVal, PR_GetError());
-	    exit(1);
-        }
-	printf("read: EWOULDBLOCK, good\n");
-	fflush(stdout);
-	PR_Sleep(2 * unitTime);
-	retVal = PR_Recv(sock, buf, sizeof(buf), 0, PR_INTERVAL_NO_TIMEOUT);
-	if (retVal != CHUNK_SIZE) {
-        PL_PrintError("Second Receive:\n");
-	    fprintf(stderr, "Second PR_Recv: retVal: %ld, Error: %ld\n", 
-            retVal, PR_GetError());
-	    exit(1);
-        }
-	printf("read: %d bytes, good\n", retVal);
-	fflush(stdout);
-    }
-    PR_Close(sock);
-
-    printf("All tests finished\n");
-    printf("PASS\n");
-    return 0;
-}
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
-
diff --git a/libs/js/nsprpub/pr/tests/ntioto.c b/libs/js/nsprpub/pr/tests/ntioto.c
deleted file mode 100644
index 0dc0072aff..0000000000
--- a/libs/js/nsprpub/pr/tests/ntioto.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: ntioto.c
-** Description: 
-** This test, ntioto.c, was designed to reproduce a bug reported by NES
-** on WindowsNT (fibers implementation). NSPR was asserting in ntio.c
-** after PR_AcceptRead() had timed out. I/O performed subsequent to the
-** call to PR_AcceptRead() could complete on a CPU other than the one
-** on which it was started. The assert in ntio.c detected this, then
-** asserted.
-**
-** Design:
-** This test will fail with an assert in ntio.c if the problem it was
-** designed to catch occurs. It returns 0 otherwise.
-** 
-** The main() thread initializes and tears things down. A file is
-** opened for writing; this file will be written to by AcceptThread()
-** and JitterThread().  Main() creates a socket for reading, listens
-** and binds the socket.
-** 
-** ConnectThread() connects to the socket created by main, then polls
-** the "state" variable. When state is AllDone, ConnectThread() exits.
-**
-** AcceptThread() calls PR_AcceptRead() on the socket. He fully expects
-** it to time out. After the timeout, AccpetThread() interacts with
-** JitterThread() via a common condition variable and the state
-** variable. The two threads ping-pong back and forth, each thread
-** writes the the file opened by main. This should provoke the
-** condition reported by NES (if we didn't fix it).
-**
-** The failure is not solid. It may fail within a few ping-pongs between
-** AcceptThread() and JitterThread() or may take a while. The default
-** iteration count, jitter, is set by DEFAULT_JITTER. This may be
-** modified at the command line with the -j option.
-** 
-*/
-
-#include <plgetopt.h> 
-#include <nspr.h> 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Test harness infrastructure
-*/
-PRLogModuleInfo *lm;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRIntn  debug = 0;
-PRIntn  verbose = 0;
-PRUint32  failed_already = 0;
-/* end Test harness infrastructure */
-
-/* JITTER_DEFAULT: the number of times AcceptThread() and JitterThread() ping-pong */
-#define JITTER_DEFAULT  100000
-#define BASE_PORT 9867
-
-PRIntervalTime timeout;
-PRNetAddr   listenAddr;
-PRFileDesc  *listenSock;
-PRLock      *ml;
-PRCondVar   *cv;
-volatile enum  {
-    RunJitter,
-    RunAcceptRead,
-    AllDone
-} state = RunAcceptRead;
-PRFileDesc  *file1;
-PRIntn  iCounter = 0;
-PRIntn  jitter = JITTER_DEFAULT;
-PRBool  resume = PR_FALSE;
-
-/*
-** Emit help text for this test
-*/
-static void Help( void )
-{
-    printf("Template: Help(): display your help message(s) here");
-    exit(1);
-} /* end Help() */
-
-
-/*
-** static computation of PR_AcceptRead() buffer size.
-*/
-#define ACCEPT_READ_DATASIZE 10
-#define ACCEPT_READ_BUFSIZE (PR_ACCEPT_READ_BUF_OVERHEAD + ACCEPT_READ_DATASIZE)
-
-static void AcceptThread(void *arg)
-{
-    PRIntn bytesRead;
-    char dataBuf[ACCEPT_READ_BUFSIZE];
-    PRFileDesc  *arSock;
-    PRNetAddr   *arAddr;
-
-    bytesRead = PR_AcceptRead( listenSock, 
-        &arSock,
-        &arAddr,
-        dataBuf,
-        ACCEPT_READ_DATASIZE,
-        PR_SecondsToInterval(1));
-
-    if ( bytesRead == -1 && PR_GetError() == PR_IO_TIMEOUT_ERROR ) {
-        if ( debug ) printf("AcceptRead timed out\n");
-    } else {
-        if ( debug ) printf("Oops! read: %d, error: %d\n", bytesRead, PR_GetError());
-    }
-
-    while( state != AllDone )  {
-        PR_Lock( ml );
-        while( state != RunAcceptRead )
-            PR_WaitCondVar( cv, PR_INTERVAL_NO_TIMEOUT );
-        if ( ++iCounter >= jitter )
-            state = AllDone;
-        else
-            state = RunJitter;
-        if ( verbose ) printf(".");
-        PR_NotifyCondVar( cv );
-        PR_Unlock( ml );
-        PR_Write( file1, ".", 1 );
-    }
-
-    return;
-} /* end AcceptThread() */
-
-static void JitterThread(void *arg)
-{
-    while( state != AllDone )  {
-        PR_Lock( ml );
-        while( state != RunJitter && state != AllDone )
-            PR_WaitCondVar( cv, PR_INTERVAL_NO_TIMEOUT );
-        if ( state != AllDone)
-            state = RunAcceptRead;
-        if ( verbose ) printf("+");
-        PR_NotifyCondVar( cv );
-        PR_Unlock( ml );
-        PR_Write( file1, "+", 1 );
-    }
-    return;
-} /* end Goofy() */
-
-static void ConnectThread( void *arg )
-{
-    PRStatus    rv;
-    PRFileDesc  *clientSock;
-    PRNetAddr   serverAddress;
-    clientSock = PR_NewTCPSocket();
-
-    PR_ASSERT(clientSock);
-
-    if ( resume ) {
-        if ( debug ) printf("pausing 3 seconds before connect\n");
-        PR_Sleep( PR_SecondsToInterval(3));
-    }
-
-    memset(&serverAddress, 0, sizeof(serverAddress));
-    rv = PR_InitializeNetAddr(PR_IpAddrLoopback, BASE_PORT, &serverAddress);
-    PR_ASSERT( PR_SUCCESS == rv );
-    rv = PR_Connect( clientSock, 
-        &serverAddress, 
-        PR_SecondsToInterval(1));
-    PR_ASSERT( PR_SUCCESS == rv );
-
-    /* that's all we do. ... Wait for the acceptread() to timeout */
-    while( state != AllDone )
-        PR_Sleep( PR_SecondsToInterval(1));
-    return;
-} /* end ConnectThread() */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRThread *tJitter;
-    PRThread *tAccept;
-    PRThread *tConnect;
-    PRStatus rv;
-    /* This test if valid for WinNT only! */
-
-#if !defined(WINNT)
-    return 0;
-#endif
-
-    {
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "hdrvj:");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-			    msgLevel = PR_LOG_ERROR;
-                break;
-            case 'v':  /* verbose mode */
-                verbose = 1;
-			    msgLevel = PR_LOG_DEBUG;
-                break;
-            case 'j':
-                jitter = atoi(opt->value);
-                if ( jitter == 0)
-                    jitter = JITTER_DEFAULT;
-                break;
-            case 'r':
-                resume = PR_TRUE;
-                break;
-            case 'h':  /* help message */
-			    Help();
-                break;
-             default:
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    }
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-
-    /* set concurrency */
-    PR_SetConcurrency( 4 );
-
-    /* setup thread synchronization mechanics */
-    ml = PR_NewLock();
-    cv = PR_NewCondVar( ml );
-
-    /* setup a tcp socket */
-    memset(&listenAddr, 0, sizeof(listenAddr));
-    rv = PR_InitializeNetAddr(PR_IpAddrAny, BASE_PORT, &listenAddr);
-    PR_ASSERT( PR_SUCCESS == rv );
-
-    listenSock = PR_NewTCPSocket();
-    PR_ASSERT( listenSock );
-
-    rv = PR_Bind( listenSock, &listenAddr);
-    PR_ASSERT( PR_SUCCESS == rv );
-
-    rv = PR_Listen( listenSock, 5 );
-    PR_ASSERT( PR_SUCCESS == rv );
-
-    /* open a file for writing, provoke bug */
-    file1 = PR_Open("xxxTestFile", PR_CREATE_FILE | PR_RDWR, 666);
-
-    /* create Connect thread */
-    tConnect = PR_CreateThread(
-        PR_USER_THREAD, ConnectThread, NULL,
-        PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-        PR_JOINABLE_THREAD, 0 );
-    PR_ASSERT( tConnect );
-
-    /* create jitter off thread */
-    tJitter = PR_CreateThread(
-        PR_USER_THREAD, JitterThread, NULL,
-        PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-        PR_JOINABLE_THREAD, 0 );
-    PR_ASSERT( tJitter );
-
-    /* create acceptread thread */
-    tAccept = PR_CreateThread(
-        PR_USER_THREAD, AcceptThread, NULL,
-        PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-        PR_JOINABLE_THREAD, 0 );
-    PR_ASSERT( tAccept );
-
-    /* wait for all threads to quit, then terminate gracefully */
-    PR_JoinThread( tConnect );
-    PR_JoinThread( tAccept );
-    PR_JoinThread( tJitter );
-    PR_Close( listenSock );
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    PR_Close( file1 );
-    PR_Delete( "xxxTestFile");
-
-    /* test return and exit */
-    if (debug) printf("%s\n", (failed_already)? "FAIL" : "PASS");
-    return( (failed_already == PR_TRUE )? 1 : 0 );
-}  /* main() */
-/* end ntioto.c */
diff --git a/libs/js/nsprpub/pr/tests/ntoh.c b/libs/js/nsprpub/pr/tests/ntoh.c
deleted file mode 100644
index e424f54801..0000000000
--- a/libs/js/nsprpub/pr/tests/ntoh.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A test program for PR_htons, PR_ntohs, PR_htonl, PR_ntohl,
- * PR_htonll, and PR_ntohll.
- */
-
-#include "prnetdb.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-/* Byte sequence in network byte order */
-static unsigned char bytes_n[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
-
-/* Integers in host byte order */
-static PRUint16 s_h = 0x0102;
-static PRUint32 l_h = 0x01020304;
-static PRUint64 ll_h = LL_INIT(0x01020304, 0x05060708);
-
-int main()
-{
-    union {
-        PRUint16 s;
-        PRUint32 l;
-        PRUint64 ll;
-        unsigned char bytes[8];
-    } un;
-
-    un.s = s_h;
-    printf("%u %u\n",
-        un.bytes[0], un.bytes[1]);
-    un.s = PR_htons(un.s);
-    printf("%u %u\n",
-        un.bytes[0], un.bytes[1]);
-    if (memcmp(un.bytes, bytes_n, 2)) {
-        fprintf(stderr, "PR_htons failed\n");
-        exit(1);
-    }
-    un.s = PR_ntohs(un.s);
-    printf("%u %u\n",
-        un.bytes[0], un.bytes[1]);
-    if (un.s != s_h) {
-        fprintf(stderr, "PR_ntohs failed\n");
-        exit(1);
-    }
-
-    un.l = l_h;
-    printf("%u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3]);
-    un.l = PR_htonl(un.l);
-    printf("%u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3]);
-    if (memcmp(un.bytes, bytes_n, 4)) {
-        fprintf(stderr, "PR_htonl failed\n");
-        exit(1);
-    }
-    un.l = PR_ntohl(un.l);
-    printf("%u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3]);
-    if (un.l != l_h) {
-        fprintf(stderr, "PR_ntohl failed\n");
-        exit(1);
-    }
-
-    un.ll = ll_h;
-    printf("%u %u %u %u %u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3],
-        un.bytes[4], un.bytes[5], un.bytes[6], un.bytes[7]);
-    un.ll = PR_htonll(un.ll);
-    printf("%u %u %u %u %u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3],
-        un.bytes[4], un.bytes[5], un.bytes[6], un.bytes[7]);
-    if (memcmp(un.bytes, bytes_n, 8)) {
-        fprintf(stderr, "PR_htonll failed\n");
-        exit(1);
-    }
-    un.ll = PR_ntohll(un.ll);
-    printf("%u %u %u %u %u %u %u %u\n",
-        un.bytes[0], un.bytes[1], un.bytes[2], un.bytes[3],
-        un.bytes[4], un.bytes[5], un.bytes[6], un.bytes[7]);
-    if (LL_NE(un.ll, ll_h)) {
-        fprintf(stderr, "PR_ntohll failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/obsints.c b/libs/js/nsprpub/pr/tests/obsints.c
deleted file mode 100644
index 87182f557c..0000000000
--- a/libs/js/nsprpub/pr/tests/obsints.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test: obsints.c 
- *
- * Description: make sure that protypes.h defines the obsolete integer
- * types intn, uintn, uint, int8, uint8, int16, uint16, int32, uint32,
- * int64, and uint64.
- */
-
-#include <stdio.h>
-
-#ifdef NO_NSPR_10_SUPPORT
-
-/* nothing to do */
-int main()
-{
-    printf("PASS\n");
-    return 0;
-}
-
-#else /* NO_NSPR_10_SUPPORT */
-
-#include "prtypes.h"  /* which includes protypes.h */
-
-int main()
-{
-    /*
-     * Compilation fails if any of these integer types are not
-     * defined by protypes.h.
-     */
-    intn in;
-    uintn uin;
-    uint ui;
-    int8 i8;
-    uint8 ui8;
-    int16 i16;
-    uint16 ui16;
-    int32 i32;
-    uint32 ui32;
-    int64 i64;
-    uint64 ui64;
-
-    printf("PASS\n");
-    return 0;
-}
-
-#endif /* NO_NSPR_10_SUPPORT */
diff --git a/libs/js/nsprpub/pr/tests/op_2long.c b/libs/js/nsprpub/pr/tests/op_2long.c
deleted file mode 100644
index 27f64d7907..0000000000
--- a/libs/js/nsprpub/pr/tests/op_2long.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_2long.c
-**
-** Description: Test Program to verify the PR_NAME_TOO_LONG_ERROR
-**
-** Modification History:
-** 03-June-97 AGarcia- Initial version
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "prinit.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prerror.h"
-#include <stdio.h>
-#include "plerror.h"
-#include "plgetopt.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#else
-#endif
-
-static PRFileDesc *t1;
-PRIntn error_code;
-
-/*
- * should exceed any system's maximum file name length
- * Note: was set at 4096. This is legal on some unix (Linux 2.1+) platforms.
- * 
- */
-#define TOO_LONG 5000
-
-int main(int argc, char **argv)
-{
-	char nameTooLong[TOO_LONG];
-	int i;
-
-	/* Generate a really long pathname */
-	for (i = 0; i < TOO_LONG - 1; i++) {
-		if (i % 10 == 0) {
-			nameTooLong[i] = '/';
-		} else {
-			nameTooLong[i] = 'a';
-		}
-	}
-	nameTooLong[TOO_LONG - 1] = 0;
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("pr_open_re.log");
-#endif
-	
-    PR_STDIO_INIT();
-	t1 = PR_Open(nameTooLong, PR_RDWR, 0666);
-	if (t1 == NULL) {
-		if (PR_GetError() == PR_NAME_TOO_LONG_ERROR) {
-            PL_PrintError("error code is");
-			printf ("PASS\n");
-			return 0;
-		}
-		else {
-            PL_PrintError("error code is");
-			printf ("FAIL\n");
-			return 1;
-		}
-	}
-	
-		else {
-			printf ("Test passed\n");
-			return 0;
-		}
-	
-
-
-}			
diff --git a/libs/js/nsprpub/pr/tests/op_excl.c b/libs/js/nsprpub/pr/tests/op_excl.c
deleted file mode 100644
index b0bb6ace94..0000000000
--- a/libs/js/nsprpub/pr/tests/op_excl.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_excl.c
-**
-** Description: Test Program to verify function of PR_EXCL open flag
-**
-** Modification History:
-** 27-Oct-1999 lth. Initial version
-***********************************************************************/
-
-#include <plgetopt.h> 
-#include <nspr.h> 
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
-** Test harness infrastructure
-*/
-PRLogModuleInfo *lm;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRIntn  debug = 0;
-PRUint32  failed_already = 0;
-/* end Test harness infrastructure */
-/*
-** Emit help text for this test
-*/
-static void Help( void )
-{
-    printf("op_excl: Help");
-    printf("op_excl [-d]");
-    printf("-d enables debug messages");
-    exit(1);
-} /* end Help() */
-
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRFileDesc  *fd;
-    PRStatus    rv;
-    PRInt32     written;
-    char        outBuf[] = "op_excl.c test file";
-#define OUT_SIZE sizeof(outBuf)
-#define NEW_FILENAME "xxxExclNewFile"
-
-    {
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "hd");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-			    msgLevel = PR_LOG_ERROR;
-                break;
-            case 'h':  /* help message */
-			    Help();
-                break;
-             default:
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    }
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-
-    /*
-    ** First, open a file, PR_EXCL, we believe not to exist
-    */
-    fd = PR_Open( NEW_FILENAME, PR_CREATE_FILE | PR_EXCL | PR_WRONLY, 0666 );
-    if ( NULL == fd )  {
-        if (debug) fprintf( stderr, "Open exclusive. Expected success, got failure\n");
-        failed_already = 1;
-        goto Finished;
-    }
-
-    written = PR_Write( fd, outBuf, OUT_SIZE );
-    if ( OUT_SIZE != written )  {
-        if (debug) fprintf( stderr, "Write after open exclusive failed\n");
-        failed_already = 1;
-        goto Finished;
-    }
-
-    rv = PR_Close(fd);
-    if ( PR_FAILURE == rv )  {
-        if (debug) fprintf( stderr, "Close after open exclusive failed\n");
-        failed_already = 1;
-        goto Finished;
-    }
-
-    /*
-    ** Second, open the same file, PR_EXCL, expect it to fail
-    */
-    fd = PR_Open( NEW_FILENAME, PR_CREATE_FILE | PR_EXCL | PR_WRONLY, 0666 );
-    if ( NULL != fd )  {
-        if (debug) fprintf( stderr, "Open exclusive. Expected failure, got success\n");
-        failed_already = 1;
-        PR_Close(fd);
-    }
-
-    rv = PR_Delete( NEW_FILENAME );
-    if ( PR_FAILURE == rv ) {
-        if (debug) fprintf( stderr, "PR_Delete() failed\n");
-        failed_already = 1;
-    }
-
-Finished:
-    if (debug) printf("%s\n", (failed_already)? "FAIL" : "PASS");
-    return( (failed_already == PR_TRUE )? 1 : 0 );
-}  /* main() */
-/* end op_excl.c */
-
diff --git a/libs/js/nsprpub/pr/tests/op_filnf.c b/libs/js/nsprpub/pr/tests/op_filnf.c
deleted file mode 100644
index 5f6762500b..0000000000
--- a/libs/js/nsprpub/pr/tests/op_filnf.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_filnf.c
-**
-** Description: Test Program to verify the PR_FILE_NOT_FOUND_ERROR
-**				This test program also uses the TRUNCATE option
-**
-** Modification History:
-** 03-June-97 AGarcia- Initial version
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "prinit.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prerror.h"
-#include <stdio.h>
-#include "plgetopt.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#else
-#endif
-
-static PRFileDesc *t1;
-PRIntn error_code;
-
-int main(int argc, char **argv)
-{
-
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("pr_open_re.log");
-#endif
-	
-
-    PR_STDIO_INIT();
-	t1 = PR_Open("/usr/tmp/ttools/err03.tmp", PR_TRUNCATE | PR_RDWR, 0666);
-	if (t1 == NULL) {
-		if (PR_GetError() == PR_FILE_NOT_FOUND_ERROR) {
-				printf ("error code is %d \n", PR_GetError());
-				printf ("PASS\n");
-				return 0;
-		}
-		else {
-				printf ("error code is %d \n", PR_GetError());
-				printf ("FAIL\n");
-			return 1;
-		}
-	}
-	PR_Close(t1);
-	printf ("opened a file that should not exist\n");
-	printf ("FAIL\n");
-	return 1;
-}			
diff --git a/libs/js/nsprpub/pr/tests/op_filok.c b/libs/js/nsprpub/pr/tests/op_filok.c
deleted file mode 100644
index acb86a7ef5..0000000000
--- a/libs/js/nsprpub/pr/tests/op_filok.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_filok.c
-**
-** Description: Test Program to verify the PR_Open finding an existing file.
-**
-** Modification History:
-** 03-June-97 AGarcia- Initial version
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "prinit.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prerror.h"
-#include <stdio.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#else
-#endif
-
-/*
- * The name of a file that is guaranteed to exist
- * on every machine of a particular OS.
- */
-#ifdef VMS
-#define EXISTING_FILENAME "SYS$LOGIN:LOGIN.COM"
-#elif XP_UNIX
-#define EXISTING_FILENAME "/bin/sh"
-#elif defined(WIN32)
-#define EXISTING_FILENAME "c:/autoexec.bat"
-#elif defined(OS2)
-#define EXISTING_FILENAME "c:/config.sys"
-#elif defined(BEOS)
-#define EXISTING_FILENAME "/boot/beos/bin/sh"
-#else
-#error "Unknown OS"
-#endif
-
-static PRFileDesc *t1;
-
-int main(int argc, char **argv)
-{
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("pr_open_re.log");
-#endif
-	
-    PR_STDIO_INIT();
-
-	t1 = PR_Open(EXISTING_FILENAME, PR_RDONLY, 0666);
-
-	if (t1 == NULL) {
-		printf ("error code is %d \n", PR_GetError());
-		printf ("File %s should be found\n",
-				EXISTING_FILENAME);
-		return 1;
-	} else {
-		if (PR_Close(t1) == PR_SUCCESS) {
-			printf ("Test passed \n");
-			return 0;
-		} else {
-			printf ("cannot close file\n");
-			printf ("error code is %d\n", PR_GetError());
-			return 1;
-		}
-	}
-}			
diff --git a/libs/js/nsprpub/pr/tests/op_noacc.c b/libs/js/nsprpub/pr/tests/op_noacc.c
deleted file mode 100644
index ab1254dec3..0000000000
--- a/libs/js/nsprpub/pr/tests/op_noacc.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_noacc.c
-**
-** Description: Test Program to verify the PR_NO_ACCESS_RIGHTS_ERROR in PR_Open
-**
-** Modification History:
-** 03-June-97 AGarcia- Initial version
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "prinit.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prerror.h"
-#include <stdio.h>
-#include "plgetopt.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#else
-#endif
-
-static PRFileDesc *err01;
-PRIntn error_code;
-
-int main(int argc, char **argv)
-{
-
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("pr_open_re.log");
-#endif
-	
-#ifdef XP_PC
-    printf("op_noacc: Test not valid on MS-Windows.\n\tNo concept of 'mode' on Open() call\n");
-    return(0);
-#endif
-
-	
-    PR_STDIO_INIT();
-	err01 = PR_Open("err01.tmp", PR_CREATE_FILE | PR_RDWR, 0);
-	if (err01 == NULL) 
-		if (PR_GetError() == PR_NO_ACCESS_RIGHTS_ERROR) {
-				printf ("error code is %d\n",PR_GetError());
-				printf ("PASS\n");
-			return 0;
-		}
-		else {
-			printf ("FAIL\n");
-			return 1;
-		}
-}			
diff --git a/libs/js/nsprpub/pr/tests/op_nofil.c b/libs/js/nsprpub/pr/tests/op_nofil.c
deleted file mode 100644
index 20bc11e151..0000000000
--- a/libs/js/nsprpub/pr/tests/op_nofil.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: op_nofil.c
-**
-** Description: Test Program to verify the PR_FILE_NOT_FOUND_ERROR
-**
-** Modification History:
-** 03-June-97 AGarcia- Initial version
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "prinit.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prerror.h"
-#include <stdio.h>
-#include "plgetopt.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#else
-#endif
-
-/*
- * A file name that cannot exist
- */
-#define NO_SUCH_FILE "/no/such/file.tmp"
-
-static PRFileDesc *t1;
-
-int main(int argc, char **argv)
-{
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("pr_open_re.log");
-#endif
-	
-    PR_STDIO_INIT();
-	t1 = PR_Open(NO_SUCH_FILE,  PR_RDONLY, 0666);
-	if (t1 == NULL) {
-		if (PR_GetError() == PR_FILE_NOT_FOUND_ERROR) {
-			printf ("error code is PR_FILE_NOT_FOUND_ERROR, as expected\n");
-			printf ("PASS\n");
-			return 0;
-		} else {
-			printf ("error code is %d \n", PR_GetError());
-			printf ("FAIL\n");
-			return 1;
-		}
-	}
-	printf ("File %s exists on this machine!?\n", NO_SUCH_FILE);
-	if (PR_Close(t1) == PR_FAILURE) {
-		printf ("cannot close file\n");
-		printf ("error code is %d \n", PR_GetError());
-	}
-	printf ("FAIL\n");
-	return 1;
-}			
diff --git a/libs/js/nsprpub/pr/tests/openfile.c b/libs/js/nsprpub/pr/tests/openfile.c
deleted file mode 100644
index 8f863c06da..0000000000
--- a/libs/js/nsprpub/pr/tests/openfile.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This test calls PR_OpenFile to create a bunch of files
- * with various file modes.
- */
-
-#include "prio.h"
-#include "prerror.h"
-#include "prinit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define TEMPLATE_FILE_NAME "template.txt"
-
-int main()
-{
-    FILE *template;
-    char buf[32];
-    PRInt32 nbytes;
-    PRFileDesc *fd;
-
-    
-    /* Write in text mode.  Let stdio deal with line endings. */
-    template = fopen(TEMPLATE_FILE_NAME, "w");
-    fputs("line 1\nline 2\n", template);
-    fclose(template);
-
-    /* Read in binary mode */
-    fd = PR_OpenFile(TEMPLATE_FILE_NAME, PR_RDONLY, 0666);
-    nbytes = PR_Read(fd, buf, sizeof(buf));
-    PR_Close(fd);
-    PR_Delete(TEMPLATE_FILE_NAME);
-
-    fd = PR_OpenFile("tfil0700.txt", PR_RDWR | PR_CREATE_FILE, 0700);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0500.txt", PR_RDWR | PR_CREATE_FILE, 0500);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0400.txt", PR_RDWR | PR_CREATE_FILE, 0400);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0644.txt", PR_RDWR | PR_CREATE_FILE, 0644);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0664.txt", PR_RDWR | PR_CREATE_FILE, 0664);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0660.txt", PR_RDWR | PR_CREATE_FILE, 0660);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0666.txt", PR_RDWR | PR_CREATE_FILE, 0666);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    fd = PR_OpenFile("tfil0640.txt", PR_RDWR | PR_CREATE_FILE, 0640);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_OpenFile failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    PR_Write(fd, buf, nbytes);
-    PR_Close(fd);
-
-    PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/parent.c b/libs/js/nsprpub/pr/tests/parent.c
deleted file mode 100644
index a81d5ec668..0000000000
--- a/libs/js/nsprpub/pr/tests/parent.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** file:        parent.c
-** description: test the process machinery
-*/
-
-#include "prmem.h"
-#include "prprf.h"
-#include "prinit.h"
-#include "prproces.h"
-#include "prinrval.h"
-
-typedef struct Child
-{
-    const char *name;
-    char **argv;
-    PRProcess *process;
-    PRProcessAttr *attr;
-} Child;
-
-/* for the default test 'cvar -c 2000' */
-static char *default_argv[] = {"cvar", "-c", "2000", NULL};
-
-static void PrintUsage(void)
-{
-    PR_fprintf(PR_GetSpecialFD(PR_StandardError),
-        "Usage: parent [-d] child [options]\n");
-}
-
-PRIntn main (PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PRInt32 test_status = 1;
-    PRIntervalTime t_start, t_elapsed;
-    PRFileDesc *debug = NULL;
-    Child *child = PR_NEWZAP(Child);
-
-    if (1 == argc)
-    {
-        /* no command-line arguments: run the default test */
-        child->argv = default_argv;
-    }
-    else
-    {
-        argv += 1;  /* don't care about our program name */
-        while (*argv != NULL && argv[0][0] == '-')
-        {
-            if (argv[0][1] == 'd')
-                debug = PR_GetSpecialFD(PR_StandardError);
-            else
-            {
-                PrintUsage();
-                return 2;  /* not sufficient */
-            }
-            argv += 1;
-        }
-        child->argv = argv;
-    }
-
-    if (NULL == *child->argv)
-    {
-        PrintUsage();
-        return 2;
-    }
-
-    child->name = *child->argv;
-    if (NULL != debug) PR_fprintf(debug, "Forking %s\n", child->name);
-
-    child->attr = PR_NewProcessAttr();
-    PR_ProcessAttrSetStdioRedirect(
-        child->attr, PR_StandardOutput,
-        PR_GetSpecialFD(PR_StandardOutput));
-    PR_ProcessAttrSetStdioRedirect(
-        child->attr, PR_StandardError,
-        PR_GetSpecialFD(PR_StandardError));
-
-    t_start = PR_IntervalNow();
-    child->process = PR_CreateProcess(
-        child->name, child->argv, NULL, child->attr);
-    t_elapsed = (PRIntervalTime) (PR_IntervalNow() - t_start);
-
-    PR_DestroyProcessAttr(child->attr);
-
-    test_status = (NULL == child->process) ? 1 : 0;
-    if (NULL != debug)
-    {
-        PR_fprintf(
-            debug, "Child was %sforked\n",
-            (0 == test_status) ? "" : "NOT ");
-        if (0 == test_status)
-            PR_fprintf(
-                debug, "PR_CreateProcess took %lu microseconds\n",
-                PR_IntervalToMicroseconds(t_elapsed));
-    }
-
-    if (0 == test_status)
-    {
-        if (NULL != debug) PR_fprintf(debug, "Waiting for child to exit\n");
-        rv = PR_WaitProcess(child->process, &test_status);
-        if (PR_SUCCESS == rv)
-        {
-            if (NULL != debug)
-                PR_fprintf(
-                    debug, "Child exited %s\n",
-                    (0 == test_status) ? "successfully" : "with error");
-        }
-        else
-        {
-            test_status = 1;
-            if (NULL != debug)
-                PR_fprintf(debug, "PR_WaitProcess failed\n");
-        }
-    }
-    PR_DELETE(child);
-    PR_Cleanup();
-    return test_status;
-    
-}  /* main */
-
-/* parent.c */
-
diff --git a/libs/js/nsprpub/pr/tests/peek.c b/libs/js/nsprpub/pr/tests/peek.c
deleted file mode 100644
index 22fcfec699..0000000000
--- a/libs/js/nsprpub/pr/tests/peek.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A test case for the PR_MSG_PEEK flag of PR_Recv().
- *
- * Test both blocking and non-blocking sockets.
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define BUFFER_SIZE 1024
-
-static int iterations = 10;
-
-/*
- * In iteration i, recv_amount[i] is the number of bytes we
- * wish to receive, and send_amount[i] is the number of bytes
- * we actually send.  Therefore, the number of elements in the
- * recv_amount or send_amount array should equal to 'iterations'.
- * For this test to pass we need to ensure that
- *     recv_amount[i] <= BUFFER_SIZE,
- *     send_amount[i] <= BUFFER_SIZE,
- *     send_amount[i] <= recv_amount[i].
- */
-static PRInt32 recv_amount[10] = {
-    16, 128, 256, 1024, 512, 512, 128, 256, 32, 32};
-static PRInt32 send_amount[10] = {
-    16,  64, 128, 1024, 512, 256, 128,  64, 16, 32};
-
-/* Blocking I/O */
-static void ServerB(void *arg)
-{
-    PRFileDesc *listenSock = (PRFileDesc *) arg;
-    PRFileDesc *sock;
-    char buf[BUFFER_SIZE];
-    PRInt32 nbytes;
-    int i;
-    int j;
-
-    sock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == sock) {
-        fprintf(stderr, "PR_Accept failed\n");
-        exit(1);
-    }
-
-    for (i = 0; i < iterations; i++) {
-        memset(buf, 0, sizeof(buf));
-        nbytes = PR_Recv(sock, buf, recv_amount[i],
-                PR_MSG_PEEK, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Recv failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "server: peeked expected data\n");
-
-        memset(buf, 0, sizeof(buf));
-        nbytes = PR_Recv(sock, buf, recv_amount[i],
-                PR_MSG_PEEK, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Recv failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "server: peeked expected data\n");
-
-        memset(buf, 0, sizeof(buf));
-        nbytes = PR_Recv(sock, buf, recv_amount[i],
-                0, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Recv failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "server: received expected data\n");
-
-        PR_Sleep(PR_SecondsToInterval(1));
-        memset(buf, 2*i+1, send_amount[i]);
-        nbytes = PR_Send(sock, buf, send_amount[i],
-                0, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Send failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Send returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-    }
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-/* Non-blocking I/O */
-static void ClientNB(void *arg)
-{
-    PRFileDesc *sock;
-    PRSocketOptionData opt;
-    PRUint16 port = (PRUint16) arg;
-    PRNetAddr addr;
-    char buf[BUFFER_SIZE];
-    PRPollDesc pd;
-    PRInt32 npds;
-    PRInt32 nbytes;
-    int i;
-    int j;
-
-    sock = PR_OpenTCPSocket(PR_AF_INET6);
-    if (NULL == sock) {
-        fprintf(stderr, "PR_OpenTCPSocket failed\n");
-        exit(1);
-    }
-    opt.option = PR_SockOpt_Nonblocking;
-    opt.value.non_blocking = PR_TRUE;
-    if (PR_SetSocketOption(sock, &opt) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetSocketOption failed\n");
-        exit(1);
-    }
-    memset(&addr, 0, sizeof(addr));
-    if (PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET6, port, &addr)
-            == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-        if (PR_GetError() != PR_IN_PROGRESS_ERROR) {
-            fprintf(stderr, "PR_Connect failed\n");
-            exit(1);
-        }
-        pd.fd = sock;
-        pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
-        npds = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == npds) {
-            fprintf(stderr, "PR_Poll failed\n");
-            exit(1);
-        }
-        if (1 != npds) {
-            fprintf(stderr, "PR_Poll returned %d, absurd!\n", npds);
-            exit(1);
-        }
-        if (PR_GetConnectStatus(&pd) == PR_FAILURE) {
-            fprintf(stderr, "PR_GetConnectStatus failed\n");
-            exit(1);
-        }
-    }
-
-    for (i = 0; i < iterations; i++) {
-        PR_Sleep(PR_SecondsToInterval(1));
-        memset(buf, 2*i, send_amount[i]);
-        while ((nbytes = PR_Send(sock, buf, send_amount[i],
-                0, PR_INTERVAL_NO_TIMEOUT)) == -1) {
-            if (PR_GetError() != PR_WOULD_BLOCK_ERROR) {
-                fprintf(stderr, "PR_Send failed\n");
-                exit(1);
-            }
-            pd.fd = sock;
-            pd.in_flags = PR_POLL_WRITE;
-            npds = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-            if (-1 == npds) {
-                fprintf(stderr, "PR_Poll failed\n");
-                exit(1);
-            }
-            if (1 != npds) {
-                fprintf(stderr, "PR_Poll returned %d, absurd!\n", npds);
-                exit(1);
-            }
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Send returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-
-        memset(buf, 0, sizeof(buf));
-        while ((nbytes = PR_Recv(sock, buf, recv_amount[i],
-                PR_MSG_PEEK, PR_INTERVAL_NO_TIMEOUT)) == -1) {
-            if (PR_GetError() != PR_WOULD_BLOCK_ERROR) {
-                fprintf(stderr, "PR_Recv failed\n");
-                exit(1);
-            }
-            pd.fd = sock;
-            pd.in_flags = PR_POLL_READ;
-            npds = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-            if (-1 == npds) {
-                fprintf(stderr, "PR_Poll failed\n");
-                exit(1);
-            }
-            if (1 != npds) {
-                fprintf(stderr, "PR_Poll returned %d, absurd!\n", npds);
-                exit(1);
-            }
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i+1) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i+1, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "client: peeked expected data\n");
-
-        memset(buf, 0, sizeof(buf));
-        nbytes = PR_Recv(sock, buf, recv_amount[i],
-                PR_MSG_PEEK, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Recv failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i+1) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i+1, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "client: peeked expected data\n");
-
-        memset(buf, 0, sizeof(buf));
-        nbytes = PR_Recv(sock, buf, recv_amount[i],
-                0, PR_INTERVAL_NO_TIMEOUT);
-        if (-1 == nbytes) {
-            fprintf(stderr, "PR_Recv failed\n");
-            exit(1);
-        }
-        if (send_amount[i] != nbytes) {
-            fprintf(stderr, "PR_Recv returned %d, absurd!\n", nbytes);
-            exit(1);
-        }
-        for (j = 0; j < nbytes; j++) {
-            if (buf[j] != 2*i+1) {
-                fprintf(stderr, "byte %d should be %d but is %d\n",
-                        j, 2*i+1, buf[j]);
-                exit(1);
-            }
-        }
-        fprintf(stderr, "client: received expected data\n");
-    }
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-static void
-RunTest(PRThreadScope scope, PRFileDesc *listenSock, PRUint16 port)
-{
-    PRThread *server, *client;
-
-    server = PR_CreateThread(PR_USER_THREAD, ServerB, listenSock,
-            PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
-    if (NULL == server) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    client = PR_CreateThread(
-            PR_USER_THREAD, ClientNB, (void *) port,
-            PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
-    if (NULL == client) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-
-    if (PR_JoinThread(server) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(client) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock;
-    PRNetAddr addr;
-    PRUint16 port;
-
-    listenSock = PR_OpenTCPSocket(PR_AF_INET6);
-    if (NULL == listenSock) {
-        fprintf(stderr, "PR_OpenTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&addr, 0, sizeof(addr));
-    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_SetNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Bind(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    if (PR_GetSockName(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetSockName failed\n");
-        exit(1);
-    }
-    port = PR_ntohs(addr.ipv6.port);
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-
-    fprintf(stderr, "Running the test with local threads\n");
-    RunTest(PR_LOCAL_THREAD, listenSock, port);
-    fprintf(stderr, "Running the test with global threads\n");
-    RunTest(PR_GLOBAL_THREAD, listenSock, port);
-
-    if (PR_Close(listenSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/perf.c b/libs/js/nsprpub/pr/tests/perf.c
deleted file mode 100644
index dda696820b..0000000000
--- a/libs/js/nsprpub/pr/tests/perf.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int _debug_on = 0;
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "prsem.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-PRLock *lock;
-PRMonitor *mon;
-PRMonitor *mon2;
-
-#define DEFAULT_COUNT    1000
-
-PRInt32 count;
-
-static void nop(int a, int b, int c)
-{
-}
-
-static void LocalProcedureCall(void)
-{
-    PRInt32 i;
-
-    for (i = 0; i < count; i++) {
-    nop(i, i, 5);
-    }
-}
-
-static void DLLProcedureCall(void)
-{
-    PRInt32 i;
-	PRThreadState state;
-	PRThread *self = PR_GetCurrentThread();
-
-    for (i = 0; i < count; i++) {
-    	state = PR_GetThreadState(self);
-    }
-}
-
-static void Now(void)
-{
-    PRInt32 i;
-    PRTime time;
-
-    for (i = 0; i < count; i++) {
-        time = PR_Now();
-    }
-}
-
-static void Interval(void)
-{
-    PRInt32 i;
-    PRIntervalTime time;
-
-    for (i = 0; i < count; i++) {
-        time = PR_IntervalNow();
-    }
-}
-
-static void IdleLock(void)
-{
-    PRInt32 i;
-
-    for (i = 0; i < count; i++) {
-    PR_Lock(lock);
-    PR_Unlock(lock);
-    }
-}
-
-static void IdleMonitor(void)
-{
-    PRInt32 i;
-
-    for (i = 0; i < count; i++) {
-    PR_EnterMonitor(mon);
-    PR_ExitMonitor(mon);
-    }
-}
-
-static void IdleCMonitor(void)
-{
-    PRInt32 i;
-
-    for (i = 0; i < count; i++) {
-    PR_CEnterMonitor((void*)7);
-    PR_CExitMonitor((void*)7);
-    }
-}
-
-/************************************************************************/
-
-static void PR_CALLBACK dull(void *arg)
-{
-}
-
-static void CDThread(void)
-{
-    PRInt32 i;
-    int num_threads = count;
-
-    /*
-     * Cannot create too many threads
-     */
-    if (num_threads > 1000)
-    num_threads = 1000;
-
-    for (i = 0; i < num_threads; i++) {
-        PRThread *t = PR_CreateThread(PR_USER_THREAD,
-                      dull, 0, 
-                      PR_PRIORITY_NORMAL,
-                      PR_LOCAL_THREAD,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-        if (NULL == t) {
-            fprintf(stderr, "CDThread: cannot create thread %3d\n", i);
-        } else {
-            DPRINTF(("CDThread: created thread %3d \n",i));
-        }
-        PR_Sleep(0);
-    }
-}
-
-static int alive;
-static int cxq;
-
-static void PR_CALLBACK CXReader(void *arg)
-{
-    PRInt32 i, n;
-
-    PR_EnterMonitor(mon);
-    n = count / 2;
-    for (i = 0; i < n; i++) {
-    while (cxq == 0) {
-            DPRINTF(("CXReader: thread = 0x%lx waiting\n",
-                    PR_GetCurrentThread()));
-        PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-    --cxq;
-    PR_Notify(mon);
-    }
-    PR_ExitMonitor(mon);
-
-    PR_EnterMonitor(mon2);
-    --alive;
-    PR_Notify(mon2);
-    PR_ExitMonitor(mon2);
-    DPRINTF(("CXReader: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
-}
-
-static void PR_CALLBACK CXWriter(void *arg)
-{
-    PRInt32 i, n;
-
-    PR_EnterMonitor(mon);
-    n = count / 2;
-    for (i = 0; i < n; i++) {
-    while (cxq == 1) {
-            DPRINTF(("CXWriter: thread = 0x%lx waiting\n",
-                    PR_GetCurrentThread()));
-        PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-    ++cxq;
-    PR_Notify(mon);
-    }
-    PR_ExitMonitor(mon);
-
-    PR_EnterMonitor(mon2);
-    --alive;
-    PR_Notify(mon2);
-    PR_ExitMonitor(mon2);
-    DPRINTF(("CXWriter: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
-}
-
-static void ContextSwitch(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *t1, *t2;
-
-    PR_EnterMonitor(mon2);
-    alive = 2;
-    cxq = 0;
-
-    t1 = PR_CreateThread(PR_USER_THREAD,
-                      CXReader, 0, 
-                      PR_PRIORITY_NORMAL,
-                      scope1,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-    if (NULL == t1) {
-        fprintf(stderr, "ContextSwitch: cannot create thread\n");
-    } else {
-        DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n",
-                (scope1 == PR_GLOBAL_THREAD ?
-                "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
-                            t1));
-    }
-    t2 = PR_CreateThread(PR_USER_THREAD,
-                      CXWriter, 0, 
-                      PR_PRIORITY_NORMAL,
-                      scope2,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-    if (NULL == t2) {
-        fprintf(stderr, "ContextSwitch: cannot create thread\n");
-    } else {
-        DPRINTF(("ContextSwitch: created %s thread = 0x%lx\n",
-                (scope2 == PR_GLOBAL_THREAD ?
-                "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
-                            t2));
-    }
-
-    /* Wait for both of the threads to exit */
-    while (alive) {
-    PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_ExitMonitor(mon2);
-}
-
-static void ContextSwitchUU(void)
-{
-    ContextSwitch(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void ContextSwitchUK(void)
-{
-    ContextSwitch(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-static void ContextSwitchKU(void)
-{
-    ContextSwitch(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void ContextSwitchKK(void)
-{
-    ContextSwitch(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-/************************************************************************/
-
-static void PR_CALLBACK SemaThread(void *argSema)
-{
-    PRSemaphore **sem = (PRSemaphore **)argSema;
-    PRInt32 i, n;
-
-    n = count / 2;
-    for (i = 0; i < n; i++) {
-        DPRINTF(("SemaThread: thread = 0x%lx waiting on sem = 0x%lx\n",
-                PR_GetCurrentThread(), sem[0]));
-        PR_WaitSem(sem[0]);
-        DPRINTF(("SemaThread: thread = 0x%lx posting on sem = 0x%lx\n",
-                PR_GetCurrentThread(), sem[1]));
-        PR_PostSem(sem[1]);
-    }
-
-    PR_EnterMonitor(mon2);
-    --alive;
-    PR_Notify(mon2);
-    PR_ExitMonitor(mon2);
-    DPRINTF(("SemaThread: thread = 0x%lx exiting\n", PR_GetCurrentThread()));
-}
-
-static  PRSemaphore *sem_set1[2];
-static  PRSemaphore *sem_set2[2];
-
-static void SemaContextSwitch(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *t1, *t2;
-    sem_set1[0] = PR_NewSem(1);
-    sem_set1[1] = PR_NewSem(0);
-    sem_set2[0] = sem_set1[1];
-    sem_set2[1] = sem_set1[0];
-
-    PR_EnterMonitor(mon2);
-    alive = 2;
-    cxq = 0;
-
-    t1 = PR_CreateThread(PR_USER_THREAD,
-                      SemaThread, 
-                      sem_set1, 
-                      PR_PRIORITY_NORMAL,
-                      scope1,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-    if (NULL == t1) {
-        fprintf(stderr, "SemaContextSwitch: cannot create thread\n");
-    } else {
-        DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n",
-                (scope1 == PR_GLOBAL_THREAD ?
-                "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
-                            t1));
-    }
-    t2 = PR_CreateThread(PR_USER_THREAD,
-                      SemaThread, 
-                      sem_set2, 
-                      PR_PRIORITY_NORMAL,
-                      scope2,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-    if (NULL == t2) {
-        fprintf(stderr, "SemaContextSwitch: cannot create thread\n");
-    } else {
-        DPRINTF(("SemaContextSwitch: created %s thread = 0x%lx\n",
-                (scope2 == PR_GLOBAL_THREAD ?
-                "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD"),
-                            t2));
-    }
-
-    /* Wait for both of the threads to exit */
-    while (alive) {
-        PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_ExitMonitor(mon2);
-
-    PR_DestroySem(sem_set1[0]);
-    PR_DestroySem(sem_set1[1]);
-}
-
-static void SemaContextSwitchUU(void)
-{
-    SemaContextSwitch(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void SemaContextSwitchUK(void)
-{
-    SemaContextSwitch(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-static void SemaContextSwitchKU(void)
-{
-    SemaContextSwitch(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void SemaContextSwitchKK(void)
-{
-    SemaContextSwitch(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow() - start;
-    d = (double)PR_IntervalToMicroseconds(stop);
-
-    printf("%40s: %6.2f usec\n", msg, d / count);
-}
-
-int main(int argc, char **argv)
-{
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dc:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			_debug_on = 1;
-            break;
-        case 'c':  /* loop count */
-            count = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (0 == count) count = DEFAULT_COUNT;
-    
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-	PR_BlockClockInterrupts();
-	PR_UnblockClockInterrupts();
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("perf.log");
-#endif
-
-    lock = PR_NewLock();
-    mon = PR_NewMonitor();
-    mon2 = PR_NewMonitor();
-
-    Measure(LocalProcedureCall, "local procedure call overhead");
-    Measure(DLLProcedureCall, "DLL procedure call overhead");
-    Measure(Now, "current calendar time");
-    Measure(Interval, "interval time");
-    Measure(IdleLock, "idle lock lock/unlock pair");
-    Measure(IdleMonitor, "idle monitor entry/exit pair");
-    Measure(IdleCMonitor, "idle cache monitor entry/exit pair");
-    Measure(CDThread, "create/destroy thread pair");
-    Measure(ContextSwitchUU, "context switch - user/user");
-    Measure(ContextSwitchUK, "context switch - user/kernel");
-    Measure(ContextSwitchKU, "context switch - kernel/user");
-    Measure(ContextSwitchKK, "context switch - kernel/kernel");
-    Measure(SemaContextSwitchUU, "sema context switch - user/user");
-    Measure(SemaContextSwitchUK, "sema context switch - user/kernel");
-    Measure(SemaContextSwitchKU, "sema context switch - kernel/user");
-    Measure(SemaContextSwitchKK, "sema context switch - kernel/kernel");
-
-    printf("--------------\n");
-    printf("Adding 7 additional CPUs\n");
-
-    PR_SetConcurrency(8);
-    printf("--------------\n");
-
-    Measure(LocalProcedureCall, "local procedure call overhead");
-    Measure(DLLProcedureCall, "DLL procedure call overhead");
-    Measure(Now, "current calendar time");
-    Measure(Interval, "interval time");
-    Measure(IdleLock, "idle lock lock/unlock pair");
-    Measure(IdleMonitor, "idle monitor entry/exit pair");
-    Measure(IdleCMonitor, "idle cache monitor entry/exit pair");
-    Measure(CDThread, "create/destroy thread pair");
-    Measure(ContextSwitchUU, "context switch - user/user");
-    Measure(ContextSwitchUK, "context switch - user/kernel");
-    Measure(ContextSwitchKU, "context switch - kernel/user");
-    Measure(ContextSwitchKK, "context switch - kernel/kernel");
-    Measure(SemaContextSwitchUU, "sema context switch - user/user");
-    Measure(SemaContextSwitchUK, "sema context switch - user/kernel");
-    Measure(SemaContextSwitchKU, "sema context switch - kernel/user");
-    Measure(SemaContextSwitchKK, "sema context switch - kernel/kernel");
-
-    PR_DestroyLock(lock);
-    PR_DestroyMonitor(mon);
-    PR_DestroyMonitor(mon2);
-
-    PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/pipeping.c b/libs/js/nsprpub/pr/tests/pipeping.c
deleted file mode 100644
index dd18eb6f42..0000000000
--- a/libs/js/nsprpub/pr/tests/pipeping.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pipeping.c
- *
- * Description:
- * This test runs in conjunction with the pipepong test.
- * This test creates two pipes and redirects the stdin and
- * stdout of the pipepong test to the pipes.  Then this
- * test writes "ping" to the pipepong test and the pipepong
- * test writes "pong" back.  To run this pair of tests,
- * just invoke pipeping.
- *
- * Tested areas: process creation, pipes, file descriptor
- * inheritance, standard I/O redirection.
- */
-
-#include "prerror.h"
-#include "prio.h"
-#include "prproces.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_OS2
-static char *child_argv[] = { "pipepong.exe", NULL };
-#else
-static char *child_argv[] = { "pipepong", NULL };
-#endif
-
-#define NUM_ITERATIONS 10
-
-int main()
-{
-    PRFileDesc *in_pipe[2];
-    PRFileDesc *out_pipe[2];
-    PRStatus status;
-    PRProcess *process;
-    PRProcessAttr *attr;
-    char buf[1024];
-    PRInt32 nBytes;
-    PRInt32 exitCode;
-    int idx;
-
-    status = PR_CreatePipe(&in_pipe[0], &in_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-    status = PR_CreatePipe(&out_pipe[0], &out_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-
-    status = PR_SetFDInheritable(in_pipe[0], PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(in_pipe[1], PR_TRUE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(out_pipe[0], PR_TRUE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(out_pipe[1], PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-
-    attr = PR_NewProcessAttr();
-    if (attr == NULL) {
-        fprintf(stderr, "PR_NewProcessAttr failed\n");
-        exit(1);
-    }
-
-    PR_ProcessAttrSetStdioRedirect(attr, PR_StandardInput, out_pipe[0]);
-    PR_ProcessAttrSetStdioRedirect(attr, PR_StandardOutput, in_pipe[1]);
-
-    process = PR_CreateProcess(child_argv[0], child_argv, NULL, attr);
-    if (process == NULL) {
-        fprintf(stderr, "PR_CreateProcess failed\n");
-        exit(1);
-    }
-    PR_DestroyProcessAttr(attr);
-    status = PR_Close(out_pipe[0]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(in_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        strcpy(buf, "ping");
-        printf("ping process: sending \"%s\"\n", buf);
-        nBytes = PR_Write(out_pipe[1], buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed: (%d, %d)\n", PR_GetError(),
-                    PR_GetOSError());
-            exit(1);
-        }
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(in_pipe[0], buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        printf("ping process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "ping process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "pong") != 0) {
-            fprintf(stderr, "ping process: expected \"pong\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-    }
-
-    status = PR_Close(in_pipe[0]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(out_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_WaitProcess(process, &exitCode);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_WaitProcess failed\n");
-        exit(1);
-    }
-    if (exitCode == 0) {
-        printf("PASS\n");
-        return 0;
-    } else {
-        printf("FAIL\n");
-        return 1;
-    }
-}
diff --git a/libs/js/nsprpub/pr/tests/pipeping2.c b/libs/js/nsprpub/pr/tests/pipeping2.c
deleted file mode 100644
index b1f2b4207a..0000000000
--- a/libs/js/nsprpub/pr/tests/pipeping2.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pipeping2.c
- *
- * Description:
- * This test runs in conjunction with the pipepong2 test.
- * This test creates two pipes and passes two pipe fd's
- * to the pipepong2 test.  Then this test writes "ping" to
- * to the pipepong2 test and the pipepong2 test writes "pong"
- * back.  To run this pair of tests, just invoke pipeping2.
- *
- * Tested areas: process creation, pipes, file descriptor
- * inheritance.
- */
-
-#include "prerror.h"
-#include "prio.h"
-#include "prproces.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUM_ITERATIONS 10
-
-static char *child_argv[] = { "pipepong2", NULL };
-
-int main()
-{
-    PRFileDesc *in_pipe[2];
-    PRFileDesc *out_pipe[2];
-    PRStatus status;
-    PRProcess *process;
-    PRProcessAttr *attr;
-    char buf[1024];
-    PRInt32 nBytes;
-    PRInt32 exitCode;
-    int idx;
-
-    status = PR_CreatePipe(&in_pipe[0], &in_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-    status = PR_CreatePipe(&out_pipe[0], &out_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-
-    status = PR_SetFDInheritable(in_pipe[0], PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(in_pipe[1], PR_TRUE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(out_pipe[0], PR_TRUE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(out_pipe[1], PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-
-    attr = PR_NewProcessAttr();
-    if (attr == NULL) {
-        fprintf(stderr, "PR_NewProcessAttr failed\n");
-        exit(1);
-    }
-
-    status = PR_ProcessAttrSetInheritableFD(attr, out_pipe[0], "PIPE_READ");
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_ProcessAttrSetInheritableFD failed\n");
-        exit(1);
-    }
-    status = PR_ProcessAttrSetInheritableFD(attr, in_pipe[1], "PIPE_WRITE");
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_ProcessAttrSetInheritableFD failed\n");
-        exit(1);
-    }
-
-    process = PR_CreateProcess(child_argv[0], child_argv, NULL, attr);
-    if (process == NULL) {
-        fprintf(stderr, "PR_CreateProcess failed\n");
-        exit(1);
-    }
-    PR_DestroyProcessAttr(attr);
-    status = PR_Close(out_pipe[0]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(in_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        strcpy(buf, "ping");
-        printf("ping process: sending \"%s\"\n", buf);
-        nBytes = PR_Write(out_pipe[1], buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(in_pipe[0], buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed\n");
-            exit(1);
-        }
-        printf("ping process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "ping process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "pong") != 0) {
-            fprintf(stderr, "ping process: expected \"pong\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-    }
-
-    status = PR_Close(in_pipe[0]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(out_pipe[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_WaitProcess(process, &exitCode);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_WaitProcess failed\n");
-        exit(1);
-    }
-    if (exitCode == 0) {
-        printf("PASS\n");
-        return 0;
-    } else {
-        printf("FAIL\n");
-        return 1;
-    }
-}
diff --git a/libs/js/nsprpub/pr/tests/pipepong.c b/libs/js/nsprpub/pr/tests/pipepong.c
deleted file mode 100644
index 66771601f9..0000000000
--- a/libs/js/nsprpub/pr/tests/pipepong.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pipepong.c
- *
- * Description:
- * This test runs in conjunction with the pipeping test.
- * The pipeping test creates two pipes and redirects the
- * stdin and stdout of this test to the pipes.  Then the
- * pipeping test writes "ping" to this test and this test
- * writes "pong" back.  Note that this test does not depend
- * on NSPR at all.  To run this pair of tests, just invoke
- * pipeping.
- *
- * Tested areas: process creation, pipes, file descriptor
- * inheritance, standard I/O redirection.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUM_ITERATIONS 10
-
-int main()
-{
-    char buf[1024];
-    size_t nBytes;
-    int idx;
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        memset(buf, 0, sizeof(buf));
-        nBytes = fread(buf, 1, 5, stdin);
-        fprintf(stderr, "pong process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "ping") != 0) {
-            fprintf(stderr, "pong process: expected \"ping\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-
-        strcpy(buf, "pong");
-        fprintf(stderr, "pong process: sending \"%s\"\n", buf);
-        nBytes = fwrite(buf, 1, 5, stdout);
-        if (nBytes != 5) {
-            fprintf(stderr, "pong process: fwrite failed\n");
-            exit(1);
-        }
-        fflush(stdout);
-    }
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/pipepong2.c b/libs/js/nsprpub/pr/tests/pipepong2.c
deleted file mode 100644
index 19494bbd27..0000000000
--- a/libs/js/nsprpub/pr/tests/pipepong2.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pipepong2.c
- *
- * Description:
- * This test runs in conjunction with the pipeping2 test.
- * The pipeping2 test creates two pipes and passes two
- * pipe fd's to this test.  Then the pipeping2 test writes
- * "ping" to this test and this test writes "pong" back.
- * To run this pair of tests, just invoke pipeping2.
- *
- * Tested areas: process creation, pipes, file descriptor
- * inheritance.
- */
-
-#include "prerror.h"
-#include "prio.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUM_ITERATIONS 10
-
-int main()
-{
-    PRFileDesc *pipe_read, *pipe_write;
-    PRStatus status;
-    char buf[1024];
-    PRInt32 nBytes;
-    int idx;
-
-    pipe_read = PR_GetInheritedFD("PIPE_READ");
-    if (pipe_read == NULL) {
-        fprintf(stderr, "PR_GetInheritedFD failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(pipe_read, PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-    pipe_write = PR_GetInheritedFD("PIPE_WRITE");
-    if (pipe_write == NULL) {
-        fprintf(stderr, "PR_GetInheritedFD failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(pipe_write, PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(pipe_read, buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        printf("pong process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "ping") != 0) {
-            fprintf(stderr, "pong process: expected \"ping\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-
-        strcpy(buf, "pong");
-        printf("pong process: sending \"%s\"\n", buf);
-        nBytes = PR_Write(pipe_write, buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed\n");
-            exit(1);
-        }
-    }
-
-    status = PR_Close(pipe_read);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(pipe_write);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/pipeself.c b/libs/js/nsprpub/pr/tests/pipeself.c
deleted file mode 100644
index 5bb9791acc..0000000000
--- a/libs/js/nsprpub/pr/tests/pipeself.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: pipeself.c
- *
- * Description:
- * This test has two threads communicating with each other using
- * two unidirectional pipes.  The primordial thread is the ping
- * thread and the other thread is the pong thread.  The ping
- * thread writes "ping" to the pong thread and the pong thread
- * writes "pong" back.
- */
-
-#include "prio.h"
-#include "prerror.h"
-#include "prthread.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define NUM_ITERATIONS 10
-
-static PRFileDesc *ping_in, *ping_out;
-static PRFileDesc *pong_in, *pong_out;
-
-static void PongThreadFunc(void *arg)
-{
-    char buf[1024];
-    int idx;
-    PRInt32 nBytes;
-    PRStatus status;
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(pong_in, buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed\n");
-            exit(1);
-        }
-        printf("pong thread: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "pong thread: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "ping") != 0) {
-            fprintf(stderr, "pong thread: expected \"ping\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-        strcpy(buf, "pong");
-        printf("pong thread: sending \"%s\"\n", buf);
-        nBytes = PR_Write(pong_out, buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed: (%d, %d)\n", PR_GetError(),
-                    PR_GetOSError());
-            exit(1);
-        }
-    }
-
-    status = PR_Close(pong_in);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(pong_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-int main()
-{
-    PRStatus status;
-    PRThread *pongThread;
-    char buf[1024];
-    PRInt32 nBytes;
-    int idx;
-
-    status = PR_CreatePipe(&ping_in, &pong_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-    status = PR_CreatePipe(&pong_in, &ping_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-
-    pongThread = PR_CreateThread(PR_USER_THREAD, PongThreadFunc, NULL,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (pongThread == NULL) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        strcpy(buf, "ping");
-        printf("ping thread: sending \"%s\"\n", buf);
-        nBytes = PR_Write(ping_out, buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed: (%d, %d)\n", PR_GetError(),
-                    PR_GetOSError());
-            exit(1);
-        }
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(ping_in, buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed\n");
-            exit(1);
-        }
-        printf("ping thread: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "ping thread: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "pong") != 0) {
-            fprintf(stderr, "ping thread: expected \"pong\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-    }
-
-    status = PR_Close(ping_in);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(ping_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_JoinThread(pongThread);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-
-#ifdef XP_UNIX
-	/*
-	 * Test PR_Available for pipes
-	 */
-    status = PR_CreatePipe(&ping_in, &ping_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_CreatePipe failed\n");
-        exit(1);
-    }
-	nBytes = PR_Write(ping_out, buf, 250);
-	if (nBytes == -1) {
-		fprintf(stderr, "PR_Write failed: (%d, %d)\n", PR_GetError(),
-				PR_GetOSError());
-		exit(1);
-	}
-	nBytes = PR_Available(ping_in);
-	if (nBytes < 0) {
-		fprintf(stderr, "PR_Available failed: (%d, %d)\n", PR_GetError(),
-				PR_GetOSError());
-		exit(1);
-	} else if (nBytes != 250) {
-		fprintf(stderr, "PR_Available: expected 250 bytes but got %d bytes\n",
-				nBytes);
-		exit(1);
-	}
-	printf("PR_Available: expected %d, got %d bytes\n",250, nBytes);
-	/* read some data */
-	nBytes = PR_Read(ping_in, buf, 7);
-	if (nBytes == -1) {
-		fprintf(stderr, "PR_Read failed\n");
-		exit(1);
-	}
-	/* check available data */
-	nBytes = PR_Available(ping_in);
-	if (nBytes < 0) {
-		fprintf(stderr, "PR_Available failed: (%d, %d)\n", PR_GetError(),
-				PR_GetOSError());
-		exit(1);
-	} else if (nBytes != (250 - 7)) {
-		fprintf(stderr, "PR_Available: expected 243 bytes but got %d bytes\n",
-				nBytes);
-		exit(1);
-	}
-	printf("PR_Available: expected %d, got %d bytes\n",243, nBytes);
-	/* read all data */
-	nBytes = PR_Read(ping_in, buf, sizeof(buf));
-	if (nBytes == -1) {
-		fprintf(stderr, "PR_Read failed\n");
-		exit(1);
-	} else if (nBytes != 243) {
-		fprintf(stderr, "PR_Read failed: expected %d, got %d bytes\n",
-							243, nBytes);
-		exit(1);
-	}
-	/* check available data */
-	nBytes = PR_Available(ping_in);
-	if (nBytes < 0) {
-		fprintf(stderr, "PR_Available failed: (%d, %d)\n", PR_GetError(),
-				PR_GetOSError());
-		exit(1);
-	} else if (nBytes != 0) {
-		fprintf(stderr, "PR_Available: expected 0 bytes but got %d bytes\n",
-				nBytes);
-		exit(1);
-	}
-	printf("PR_Available: expected %d, got %d bytes\n", 0, nBytes);
-
-    status = PR_Close(ping_in);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_Close(ping_out);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-#endif /* XP_UNIX */
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/poll_er.c b/libs/js/nsprpub/pr/tests/poll_er.c
deleted file mode 100755
index b68c798685..0000000000
--- a/libs/js/nsprpub/pr/tests/poll_er.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: prpoll_err.c
-**
-** Description: This program tests PR_Poll with sockets.
-**              error reporting operation is tested
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-#ifdef XP_BEOS
-#include <stdio.h>
-int main()
-{
-    printf( "This test is not ported to the BeOS\n" );
-    return 0;
-}
-#else
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "primpl.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-static void
-ClientThreadFunc(void *arg)
-{
-    PRFileDesc *badFD = (PRFileDesc *) arg;
-    /*
-     * Make the fd invalid
-     */
-#if defined(XP_UNIX)
-    close(PR_FileDesc2NativeHandle(badFD));
-#elif defined(XP_OS2)
-    soclose(PR_FileDesc2NativeHandle(badFD));
-#elif defined(WIN32) || defined(WIN16)
-    closesocket(PR_FileDesc2NativeHandle(badFD));
-#elif defined(XP_MAC)
-    _PR_MD_CLOSE_SOCKET(PR_FileDesc2NativeHandle(badFD));
-#else
-#error "Unknown architecture"
-#endif
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRFileDesc *badFD;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    char buf[128];
-    PRPollDesc pds0[10], pds1[10], *pds, *other_pds;
-    PRIntn npds;
-    PRInt32 retVal;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Poll with sockets.\n");
-		printf("error reporting is  tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    /* Set up the poll descriptor array */
-    pds = pds0;
-    other_pds = pds1;
-    memset(pds, 0, sizeof(pds));
-    pds[0].fd = listenSock1;
-    pds[0].in_flags = PR_POLL_READ;
-    pds[1].fd = listenSock2;
-    pds[1].in_flags = PR_POLL_READ;
-    npds = 2;
-
-
-    /* Testing bad fd */
-    if (debug_mode) printf("PR_Poll should detect a bad file descriptor\n");
-    if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	goto exit_now;
-    }
-
-    pds[2].fd = badFD;
-    pds[2].in_flags = PR_POLL_READ;
-    npds = 3;
-
-    if (PR_CreateThread(PR_USER_THREAD, ClientThreadFunc,
-            badFD, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD, 0) == NULL) {
-        fprintf(stderr, "cannot create thread\n");
-        exit(1);
-    }
-
-    retVal = PR_Poll(pds, npds, PR_INTERVAL_NO_TIMEOUT);
-    if (retVal != 1 || (unsigned short) pds[2].out_flags != PR_POLL_NVAL) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Poll returns %d, out_flags is 0x%hx\n",
-		retVal, pds[2].out_flags);
-	failed_already=1;	
-	goto exit_now;
-    }
-    if (debug_mode) printf("PR_Poll detected the bad fd.  Test passed.\n\n");
-    PR_Cleanup();
-	goto exit_now;
-exit_now:
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
-
-#endif /* XP_BEOS */
diff --git a/libs/js/nsprpub/pr/tests/poll_nm.c b/libs/js/nsprpub/pr/tests/poll_nm.c
deleted file mode 100644
index 63a64a630d..0000000000
--- a/libs/js/nsprpub/pr/tests/poll_nm.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: prpoll_norm.c
-**
-** Description: This program tests PR_Poll with sockets.
-**              Normal operation are tested
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prnetdb.h"
-#ifndef XP_MAC
-#include "obsolete/probslet.h"
-#else
-#include "probslet.h"
-#endif
-
-#ifndef XP_MAC
-#include "private/pprio.h"
-#else
-#include "pprio.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-#define NUM_ITERATIONS 5
-
-#ifdef XP_MAC
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-PR_LogPrint(fmt);
-return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-static void PR_CALLBACK
-clientThreadFunc(void *arg)
-{
-    PRUintn port = (PRUintn) arg;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    char buf[128];
-    int i;
-    PRStatus sts;
-    PRInt32 n;
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons((PRUint16)port);
-    addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    memset(buf, 0, sizeof(buf));
-    PR_snprintf(buf, sizeof(buf), "%hu", port);
-
-    for (i = 0; i < NUM_ITERATIONS; i++) {
-	sock = PR_NewTCPSocket();
-	PR_ASSERT(sock != NULL);
-	
-    sts = PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(sts == PR_SUCCESS);
-
-	n = PR_Write(sock, buf, sizeof(buf));
-	PR_ASSERT(n >= 0);
-
-	sts = PR_Close(sock);
-	PR_ASSERT(sts == PR_SUCCESS);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1 = NULL, *listenSock2 = NULL;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    char buf[128];
-    PRThread *clientThread;
-    PRPollDesc pds0[20], pds1[20], *pds, *other_pds;
-    PRIntn npds;
-    PRInt32 retVal;
-    PRIntn i, j;
-    PRSocketOptionData optval;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	debug_mode = 1;
-	SetupMacPrintfLog("poll_nm.log");
-#endif
-
-    if (debug_mode) {
-		printf("This program tests PR_Poll with sockets.\n");
-		printf("Normal operation are tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    memset(&addr, 0, sizeof(addr));
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    optval.option = PR_SockOpt_Nonblocking;
-    optval.value.non_blocking = PR_TRUE;
-    PR_SetSocketOption(listenSock1, &optval);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    PR_SetSocketOption(listenSock2, &optval);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    /* Set up the poll descriptor array */
-    pds = pds0;
-    other_pds = pds1;
-    memset(pds, 0, sizeof(pds));
-    pds[0].fd = listenSock1;
-    pds[0].in_flags = PR_POLL_READ;
-    pds[1].fd = listenSock2;
-    pds[1].in_flags = PR_POLL_READ;
-    /* Add some unused entries to test if they are ignored by PR_Poll() */
-    memset(&pds[2], 0, sizeof(pds[2]));
-    memset(&pds[3], 0, sizeof(pds[3]));
-    memset(&pds[4], 0, sizeof(pds[4]));
-    npds = 5;
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort1,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	failed_already=1;	
-	goto exit_now;
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort2,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	failed_already=1;		
-	goto exit_now;
-    }
-
-    if (debug_mode) {
-		printf("Two client threads are created.  Each of them will\n");
-		printf("send data to one of the two ports the server is listening on.\n");
-		printf("The data they send is the port number.  Each of them send\n");
-		printf("the data five times, so you should see ten lines below,\n");
-		printf("interleaved in an arbitrary order.\n");
-	}
-
-    /* two clients, three events per iteration: accept, read, close */
-    i = 0;
-    while (i < 2 * 3 * NUM_ITERATIONS) {
-	PRPollDesc *tmp;
-	int nextIndex;
-	int nEvents = 0;
-
-	retVal = PR_Poll(pds, npds, PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(retVal != 0);  /* no timeout */
-	if (retVal == -1) {
-	    fprintf(stderr, "PR_Poll failed\n");
-		failed_already=1;			
-	    goto exit_now;
-	}
-
-	nextIndex = 2;
-	/* the two listening sockets */
-	for (j = 0; j < 2; j++) {
-	    other_pds[j] = pds[j];
-	    PR_ASSERT((pds[j].out_flags & PR_POLL_WRITE) == 0
-		    && (pds[j].out_flags & PR_POLL_EXCEPT) == 0);
-	    if (pds[j].out_flags & PR_POLL_READ) {
-		PRFileDesc *sock;
-
-		nEvents++;
-		sock = PR_Accept(pds[j].fd, NULL, PR_INTERVAL_NO_TIMEOUT);
-		if (sock == NULL) {
-		    fprintf(stderr, "PR_Accept() failed\n");
-			failed_already=1;	
-		    goto exit_now;
-		}
-		other_pds[nextIndex].fd = sock;
-		other_pds[nextIndex].in_flags = PR_POLL_READ;
-		nextIndex++;
-	    } else if (pds[j].out_flags & PR_POLL_ERR) {
-		fprintf(stderr, "PR_Poll() indicates that an fd has error\n");
-		failed_already=1;	
-		goto exit_now;
-	    } else if (pds[j].out_flags & PR_POLL_NVAL) {
-		fprintf(stderr, "PR_Poll() indicates that fd %d is invalid\n",
-			PR_FileDesc2NativeHandle(pds[j].fd));
-		failed_already=1;	
-		goto exit_now;
-	    }
-	}
-
-	for (j = 2; j < npds; j++) {
-            if (NULL == pds[j].fd) {
-                /*
-                 * Keep the unused entries in the poll descriptor array
-                 * for testing purposes.
-                 */
-                other_pds[nextIndex] = pds[j];
-                nextIndex++;
-                continue;
-            }
-
-	    PR_ASSERT((pds[j].out_flags & PR_POLL_WRITE) == 0
-		    && (pds[j].out_flags & PR_POLL_EXCEPT) == 0);
-	    if (pds[j].out_flags & PR_POLL_READ) {
-                PRInt32 nAvail;
-		PRInt32 nRead;
-
-		nEvents++;
-                nAvail = PR_Available(pds[j].fd);
-		nRead = PR_Read(pds[j].fd, buf, sizeof(buf));
-                PR_ASSERT(nAvail == nRead);
-		if (nRead == -1) {
-		    fprintf(stderr, "PR_Read() failed\n");
-			failed_already=1;	
-		    goto exit_now;
-                } else if (nRead == 0) {
-                    PR_Close(pds[j].fd);
-                    continue;
-                } else {
-                    /* Just to be safe */
-                    buf[127] = '\0';
-                    if (debug_mode) printf("The server received \"%s\" from a client\n", buf);
-                }
-	    } else if (pds[j].out_flags & PR_POLL_ERR) {
-		fprintf(stderr, "PR_Poll() indicates that an fd has error\n");
-		failed_already=1;			
-		goto exit_now;
-	    } else if (pds[j].out_flags & PR_POLL_NVAL) {
-		fprintf(stderr, "PR_Poll() indicates that an fd is invalid\n");
-		failed_already=1;			
-		goto exit_now;
-	    }
-            other_pds[nextIndex] = pds[j];
-            nextIndex++;
-	}
-
-	PR_ASSERT(retVal == nEvents);
-	/* swap */
-	tmp = pds;
-	pds = other_pds;
-	other_pds = tmp;
-	npds = nextIndex;
-	i += nEvents;
-    }
-
-    if (debug_mode) printf("Tests passed\n");
-
-exit_now:
-
-    if (listenSock1) {
-        PR_Close(listenSock1);
-    }
-    if (listenSock2) {
-        PR_Close(listenSock2);
-    }
-
-    PR_Cleanup();
-	
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/poll_to.c b/libs/js/nsprpub/pr/tests/poll_to.c
deleted file mode 100644
index 93fcc79dcf..0000000000
--- a/libs/js/nsprpub/pr/tests/poll_to.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: prpoll_to.c
-**
-** Description: This program tests PR_Poll with sockets.
-**              Timeout operation is tested
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prnetdb.h"
-
-#ifndef XP_MAC
-#include "private/pprio.h"
-#else
-#include "pprio.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1 = NULL, *listenSock2 = NULL;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    char buf[128];
-    PRPollDesc pds0[10], pds1[10], *pds, *other_pds;
-    PRIntn npds;
-    PRInt32 retVal;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Poll with sockets.\n");
-		printf("Timeout is tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode)  failed_already=1;
-	goto exit_now;
-    }
-    memset(&addr, 0, sizeof(addr));
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode)  failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode)  failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode)  failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode)  failed_already=1;	
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode)  failed_already=1;	
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode)  failed_already=1;	
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode)  failed_already=1;	
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    /* Set up the poll descriptor array */
-    pds = pds0;
-    other_pds = pds1;
-    memset(pds, 0, sizeof(pds));
-    pds[0].fd = listenSock1;
-    pds[0].in_flags = PR_POLL_READ;
-    pds[1].fd = listenSock2;
-    pds[1].in_flags = PR_POLL_READ;
-    npds = 2;
-
-    /* Testing timeout */
-    if (debug_mode) printf("PR_Poll should time out in 5 seconds\n");
-    retVal = PR_Poll(pds, npds, PR_SecondsToInterval(5));
-    if (retVal != 0) {
-	PR_snprintf(buf, sizeof(buf),
-		"PR_Poll should time out and return 0, but it returns %ld\n",
-		retVal);
-	fprintf(stderr, "%s", buf);
-	if (!debug_mode)  failed_already=1;	
-	goto exit_now;
-    }
-    if (debug_mode) printf("PR_Poll timed out.  Test passed.\n\n");
-
-exit_now:
-
-    if (listenSock1) {
-        PR_Close(listenSock1);
-    }
-    if (listenSock2) {
-        PR_Close(listenSock2);
-    }
-
-    PR_Cleanup();
-
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/pollable.c b/libs/js/nsprpub/pr/tests/pollable.c
deleted file mode 100644
index 20da55a379..0000000000
--- a/libs/js/nsprpub/pr/tests/pollable.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * A test for the pollable events.
- *
- * A number of threads are in a ring configuration, each waiting on
- * a pollable event that is set by its upstream neighbor.
- */
-
-#include "prinit.h"
-#include "prio.h"
-#include "prthread.h"
-#include "prerror.h"
-#include "prmem.h"
-#include "prlog.h"
-#include "prprf.h"
-
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-#define DEFAULT_THREADS 10
-#define DEFAULT_LOOPS 100
-
-PRIntn numThreads = DEFAULT_THREADS;
-PRIntn numIterations = DEFAULT_LOOPS;
-PRIntervalTime dally = PR_INTERVAL_NO_WAIT;
-PRFileDesc *debug_out = NULL;
-PRBool debug_mode = PR_FALSE;
-PRBool verbosity = PR_FALSE;
-
-typedef struct ThreadData {
-    PRFileDesc *event;
-    int index;
-    struct ThreadData *next;
-} ThreadData;
-
-void ThreadRoutine(void *arg)
-{
-    ThreadData *data = (ThreadData *) arg;
-    PRIntn i;
-    PRPollDesc pd;
-    PRInt32 rv;
-
-    pd.fd = data->event;
-    pd.in_flags = PR_POLL_READ;
-
-    for (i = 0; i < numIterations; i++) {
-        rv = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-        if (rv == -1) {
-            PR_fprintf(PR_STDERR, "PR_Poll failed\n");
-            exit(1);
-        }
-        if (verbosity) {
-            PR_fprintf(debug_out, "thread %d awakened\n", data->index);
-        }
-        PR_ASSERT(rv != 0);
-        PR_ASSERT(pd.out_flags & PR_POLL_READ);
-        if (PR_WaitForPollableEvent(data->event) == PR_FAILURE) {
-            PR_fprintf(PR_STDERR, "consume event failed\n");
-            exit(1);
-        }
-        if (dally != PR_INTERVAL_NO_WAIT) {
-            PR_Sleep(dally);
-        }
-        if (verbosity) {
-            PR_fprintf(debug_out, "thread %d posting event\n", data->index);
-        }
-        if (PR_SetPollableEvent(data->next->event) == PR_FAILURE) {
-            PR_fprintf(PR_STDERR, "post event failed\n");
-            exit(1);
-        }
-    }
-}
-
-static void Help(void)
-{
-    debug_out = PR_STDOUT;
-
-    PR_fprintf(
-            debug_out, "Usage: pollable [-c n] [-t n] [-d] [-v] [-G] [-C n] [-D n]\n");
-    PR_fprintf(
-            debug_out, "-c n\tloops at thread level (default: %d)\n", DEFAULT_LOOPS);
-    PR_fprintf(
-            debug_out, "-t n\tnumber of threads (default: %d)\n", DEFAULT_THREADS);
-    PR_fprintf(debug_out, "-d\tturn on debugging output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-v\tturn on verbose output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-G\tglobal threads only (default: FALSE)\n");
-    PR_fprintf(debug_out, "-C n\tconcurrency setting (default: 1)\n");
-    PR_fprintf(debug_out, "-D n\tdally setting (msecs) (default: 0)\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    ThreadData selfData;
-    ThreadData *data;
-    PRThread **thread;
-    void *block;
-    PRIntn i;
-    PRIntervalTime timeStart, timeEnd;
-    PRPollDesc pd;
-    PRInt32 rv;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-    PRBool help = PR_FALSE;
-    PRUintn concurrency = 1;
-    PRUintn average;
-    PLOptStatus os;
-    PLOptState *opt;
-
-    PR_STDIO_INIT();
-
-    opt = PL_CreateOptState(argc, argv, "hdvc:t:C:GD:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) {
-            continue;
-        }
-        switch (opt->option) {
-            case 'v':  /* verbose mode */
-                verbosity = PR_TRUE;
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'c':  /* loop counter */
-                numIterations = atoi(opt->value);
-                break;
-            case 't':  /* thread limit */
-                numThreads = atoi(opt->value);
-                break;
-            case 'C':  /* Concurrency limit */
-                concurrency = atoi(opt->value);
-                break;
-            case 'G':  /* global threads only */
-                thread_scope = PR_GLOBAL_THREAD;
-                break;
-            case 'D':  /* dally */
-                dally = PR_MillisecondsToInterval(atoi(opt->value));
-                break;
-            case 'h':  /* help message */
-                Help();
-                help = PR_TRUE;
-                break;
-            default:
-                break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (help) {
-        return 1;
-    }
-
-    if (concurrency > 1) {
-        PR_SetConcurrency(concurrency);
-    }
-
-    if (PR_TRUE == debug_mode) {
-        debug_out = PR_STDOUT;
-	PR_fprintf(debug_out, "Test parameters\n");
-        PR_fprintf(debug_out, "\tThreads involved: %d\n", numThreads);
-        PR_fprintf(debug_out, "\tIteration limit: %d\n", numIterations);
-        PR_fprintf(debug_out, "\tConcurrency: %d\n", concurrency);
-        PR_fprintf(debug_out, "\tThread type: %s\n",
-                (PR_GLOBAL_THREAD == thread_scope) ? "GLOBAL" : "LOCAL");
-    }
-
-    /*
-     * Malloc a block of memory and divide it into data and thread.
-     */
-    block = PR_MALLOC(numThreads * (sizeof(ThreadData) + sizeof(PRThread *)));
-    if (block == NULL) {
-        PR_fprintf(PR_STDERR, "cannot malloc, failed\n");
-        exit(1);
-    }
-    data = (ThreadData *) block;
-    thread = (PRThread **) &data[numThreads];
-
-    /* Pollable event */
-    selfData.event = PR_NewPollableEvent();
-    if (selfData.event == NULL) {
-        PR_fprintf(PR_STDERR, "cannot create event: (%ld, %ld)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    selfData.next = &data[0];
-    for (i = 0; i < numThreads; i++) {
-        data[i].event = PR_NewPollableEvent();
-        if (data[i].event == NULL) {
-            PR_fprintf(PR_STDERR, "cannot create event: (%ld, %ld)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        data[i].index = i;
-        if (i != numThreads - 1) {
-            data[i].next = &data[i + 1];
-        } else {
-            data[i].next = &selfData;
-        }
-
-        thread[i] = PR_CreateThread(PR_USER_THREAD,
-                ThreadRoutine, &data[i], PR_PRIORITY_NORMAL,
-                thread_scope, PR_JOINABLE_THREAD, 0);
-        if (thread[i] == NULL) {
-            PR_fprintf(PR_STDERR, "cannot create thread\n");
-            exit(1);
-        }
-    }
-
-    timeStart = PR_IntervalNow();
-    pd.fd = selfData.event;
-    pd.in_flags = PR_POLL_READ;
-    for (i = 0; i < numIterations; i++) {
-        if (dally != PR_INTERVAL_NO_WAIT) {
-            PR_Sleep(dally);
-        }
-        if (verbosity) {
-            PR_fprintf(debug_out, "main thread posting event\n");
-        }
-        if (PR_SetPollableEvent(selfData.next->event) == PR_FAILURE) {
-            PR_fprintf(PR_STDERR, "set event failed\n");
-            exit(1);
-        }
-        rv = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT);
-        if (rv == -1) {
-            PR_fprintf(PR_STDERR, "wait failed\n");
-            exit(1);
-        }
-        PR_ASSERT(rv != 0);
-        PR_ASSERT(pd.out_flags & PR_POLL_READ);
-        if (verbosity) {
-            PR_fprintf(debug_out, "main thread awakened\n");
-        }
-	if (PR_WaitForPollableEvent(selfData.event) == PR_FAILURE) {
-            PR_fprintf(PR_STDERR, "consume event failed\n");
-            exit(1);
-        }
-    }
-    timeEnd = PR_IntervalNow();
-
-    if (debug_mode) {
-        average = PR_IntervalToMicroseconds(timeEnd - timeStart)
-                / (numIterations * numThreads);
-        PR_fprintf(debug_out, "Average switch times %d usecs for %d threads\n",
-                average, numThreads);
-    }
-
-    for (i = 0; i < numThreads; i++) {
-        if (PR_JoinThread(thread[i]) == PR_FAILURE) {
-            PR_fprintf(PR_STDERR, "join thread failed\n");
-            exit(1);
-        }
-        PR_DestroyPollableEvent(data[i].event);
-    }
-    PR_DELETE(block);
-	PR_DestroyPollableEvent(selfData.event);
-
-    PR_fprintf(PR_STDOUT, "PASSED\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/prftest.c b/libs/js/nsprpub/pr/tests/prftest.c
deleted file mode 100644
index d3e7407d15..0000000000
--- a/libs/js/nsprpub/pr/tests/prftest.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:	prftest.c
- * Description:
- *     This is a simple test of the PR_snprintf() function defined
- *     in prprf.c.
- */
-
-#include "prlong.h"
-#include "prprf.h"
-
-#include <string.h>
-
-#define BUF_SIZE 128
-
-int main() {
-    PRInt16 i16;
-    PRIntn n;
-    PRInt32 i32;
-    PRInt64 i64;
-    char buf[BUF_SIZE];
-    char answer[BUF_SIZE];
-    int i, rv = 0;
-
-    i16 = -1;
-    n = -1;
-    i32 = -1;
-    LL_I2L(i64, i32);
-
-    PR_snprintf(buf, BUF_SIZE, "%hx %x %lx %llx", i16, n, i32, i64);
-    strcpy(answer, "ffff ");
-    for (i = PR_BYTES_PER_INT * 2; i; i--) {
-		strcat(answer, "f");
-    }
-    strcat(answer, " ffffffff ffffffffffffffff");
-
-    if (!strcmp(buf, answer)) {
-		printf("PR_snprintf test 1 passed\n");
-    } else {
-		printf("PR_snprintf test 1 failed\n");
-		printf("Converted string is %s\n", buf);
-		printf("Should be %s\n", answer);
-		rv = 1;
-    }
-
-    i16 = -32;
-    n = 30;
-    i32 = 64;
-    LL_I2L(i64, 333);
-    PR_snprintf(buf, BUF_SIZE, "%d %hd %lld %ld", n, i16, i64, i32);
-    if (!strcmp(buf, "30 -32 333 64")) {
-		printf("PR_snprintf test 2 passed\n");
-    } else {
-		printf("PR_snprintf test 2 failed\n");
-		printf("Converted string is %s\n", buf);
-		printf("Should be 30 -32 333 64\n");
-		rv = 1;
-    }
-
-    return rv;
-}
diff --git a/libs/js/nsprpub/pr/tests/prftest1.c b/libs/js/nsprpub/pr/tests/prftest1.c
deleted file mode 100644
index 5ea26f65ec..0000000000
--- a/libs/js/nsprpub/pr/tests/prftest1.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:	prftest1.c
-** Description:
-**     This is a simple test of the PR_snprintf() function defined
-**     in prprf.c.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-#include "prttools.h"
-
-#include "prinit.h"
-#include "prlong.h"
-#include "prprf.h"
-
-#include <string.h>
-
-#define BUF_SIZE 128
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Test_Result
-** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**				status of the test case.
-** INPUTS:      PASS/FAIL
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:   Determine what the status is and print accordingly.
-**      
-***********************************************************************/
-
-
-static void Test_Result (int result)
-{
-	if (result == PASS)
-		printf ("PASS\n");
-	else
-		printf ("FAIL\n");
-}
-
-int main(    int     argc,    char   *argv[])
-{
-    PRInt16 i16;
-    PRIntn n;
-    PRInt32 i32;
-    PRInt64 i64;
-    char buf[BUF_SIZE];
-    char answer[BUF_SIZE];
-    int i;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-	/* main test */
-    PR_STDIO_INIT();
-	
-    i16 = -1;
-    n = -1;
-    i32 = -1;
-    LL_I2L(i64, i32);
-
-    PR_snprintf(buf, BUF_SIZE, "%hx %x %lx %llx", i16, n, i32, i64);
-    strcpy(answer, "ffff ");
-    for (i = PR_BYTES_PER_INT * 2; i; i--) {
-	strcat(answer, "f");
-    }
-    strcat(answer, " ffffffff ffffffffffffffff");
-
-    if (!strcmp(buf, answer)) {
-	if (debug_mode) printf("PR_snprintf test 1 passed\n");
-	else Test_Result (PASS);
-    } else {
-		if (debug_mode) {
-			printf("PR_snprintf test 1 failed\n");
-			printf("Converted string is %s\n", buf);
-			printf("Should be %s\n", answer);
-		}
-		else
-			Test_Result (FAIL);
-    }
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/prftest2.c b/libs/js/nsprpub/pr/tests/prftest2.c
deleted file mode 100644
index 0e5b2244b6..0000000000
--- a/libs/js/nsprpub/pr/tests/prftest2.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:	prftest2.c
-** Description:
-**     This is a simple test of the PR_snprintf() function defined
-**     in prprf.c.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prlong.h"
-#include "prinit.h"
-#include "prprf.h"
-
-#include <string.h>
-
-#define BUF_SIZE 128
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-int main(    int     argc,    char   *argv[])
-{
-    PRInt16 i16;
-    PRIntn n;
-    PRInt32 i32;
-    PRInt64 i64;
-    char buf[BUF_SIZE];
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-	/* main test */
-	
-
-    PR_STDIO_INIT();
-    i16 = -32;
-    n = 30;
-    i32 = 64;
-    LL_I2L(i64, 333);
-    PR_snprintf(buf, BUF_SIZE, "%d %hd %lld %ld", n, i16, i64, i32);
-    if (!strcmp(buf, "30 -32 333 64")) {
-		if (debug_mode) printf("PR_snprintf test 2 passed\n");
-    } else {
-		if (debug_mode) {
-			printf("PR_snprintf test 2 failed\n");
-			printf("Converted string is %s\n", buf);
-			printf("Should be 30 -32 333 64\n");
-		}
-		else failed_already=1;
-    }
-	if(failed_already)
-	{
-        printf("FAILED\n");
-		return 1;
-	}
-	else
-	{
-        printf("PASSED\n");
-		return 0;
-	}
-}
diff --git a/libs/js/nsprpub/pr/tests/primblok.c b/libs/js/nsprpub/pr/tests/primblok.c
deleted file mode 100644
index 8a188834c8..0000000000
--- a/libs/js/nsprpub/pr/tests/primblok.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        primblok.c
- * Purpose:     testing whether the primordial thread can block in a
- *              native blocking function without affecting the correct
- *              functioning of NSPR I/O functions (Bugzilla bug #30746)
- */
-
-#if !defined(WINNT)
-
-#include <stdio.h>
-
-int main()
-{
-    printf("This test is not relevant on this platform\n");
-    return 0;
-}
-
-#else /* WINNT */
-
-#include "nspr.h"
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define TEST_FILE_NAME "primblok.dat"
-
-/* use InterlockedExchange to update this variable */
-static LONG iothread_done;
-
-static void PR_CALLBACK IOThread(void *arg)
-{
-    PRFileDesc *fd;
-    char buf[32];
-    PRInt32 nbytes;
-
-    /* Give the primordial thread one second to block */
-    Sleep(1000);
-
-    /*
-     * See if our PR_Write call will hang when the primordial
-     * thread is blocking in a native blocking function.
-     */
-    fd = PR_Open(TEST_FILE_NAME, PR_WRONLY|PR_CREATE_FILE, 0666);
-    if (NULL == fd) {
-        fprintf(stderr, "PR_Open failed\n");
-        exit(1);
-    }
-    memset(buf, 0xaf, sizeof(buf));
-    fprintf(stderr, "iothread: calling PR_Write\n");
-    nbytes = PR_Write(fd, buf, sizeof(buf));
-    fprintf(stderr, "iothread: PR_Write returned\n");
-    if (nbytes != sizeof(buf)) {
-        fprintf(stderr, "PR_Write returned %d\n", nbytes);
-        exit(1);
-    }
-    if (PR_Close(fd) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_Delete(TEST_FILE_NAME) == PR_FAILURE) {
-        fprintf(stderr, "PR_Delete failed\n");
-        exit(1);
-    }
-
-    /* Tell the main thread that we are done */
-    InterlockedExchange(&iothread_done, 1);
-}
-
-int main()
-{
-    PRThread *iothread;
-
-    /* Must be a global thread */
-    iothread = PR_CreateThread(
-        PR_USER_THREAD, IOThread, NULL, PR_PRIORITY_NORMAL,
-        PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (iothread == NULL) {
-        fprintf(stderr, "cannot create thread\n");
-        exit(1);
-    }
-
-    /*
-     * Block in a native blocking function.
-     * Give iothread 5 seconds to finish its task.
-     */
-    Sleep(5000);
-
-    /*
-     * Is iothread done or is it hung?
-     *
-     * I'm actually only interested in reading the value
-     * of iothread_done.  I'm using InterlockedExchange as
-     * a thread-safe way to read iothread_done.
-     */
-    if (InterlockedExchange(&iothread_done, 1) == 0) {
-        fprintf(stderr, "iothread is hung\n");
-        fprintf(stderr, "FAILED\n");
-        exit(1);
-    }
-
-    if (PR_JoinThread(iothread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    printf("PASSED\n");
-    return 0;
-}  /* main */
-
-#endif /* WINNT */
diff --git a/libs/js/nsprpub/pr/tests/priotest.c b/libs/js/nsprpub/pr/tests/priotest.c
deleted file mode 100644
index 16def03d15..0000000000
--- a/libs/js/nsprpub/pr/tests/priotest.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        priotest.c
- * Purpose:     testing priorities
- */
-
-#ifdef XP_MAC
-#error "This test does not run on Macintosh"
-#else
-
-
-#include "prcmon.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prmon.h"
-#include "prprf.h"
-#include "prthread.h"
-#include "prtypes.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define DEFAULT_DURATION 5
-
-static PRBool failed = PR_FALSE;
-static PRIntervalTime oneSecond;
-static PRFileDesc *debug_out = NULL;
-static PRBool debug_mode = PR_FALSE;
-
-static PRUint32 PerSecond(PRIntervalTime timein)
-{
-    PRUint32 loop = 0;
-    while (((PRIntervalTime)(PR_IntervalNow()) - timein) < oneSecond)
-        loop += 1;
-    return loop;
-}  /* PerSecond */
-
-static void PR_CALLBACK Low(void *arg)
-{
-    PRUint32 t3 = 0, t2 = 0, t1 = 0, t0, *tn = (PRUint32*)arg;
-    while (1)
-    {
-        t0 = PerSecond(PR_IntervalNow());
-        *tn = (t3 + 3 * t2 + 3 * t1 + t0) / 8;
-        t3 = t2; t2 = t1; t1 = t0;
-    }
-}  /* Low */
-
-static void PR_CALLBACK High(void *arg)
-{
-    PRUint32 t3 = 0, t2 = 0, t1 = 0, t0, *tn = (PRUint32*)arg;
-    while (1)
-    {
-        PRIntervalTime timein = PR_IntervalNow();
-        PR_Sleep(oneSecond >> 2);  /* 0.25 seconds */
-        t0 = PerSecond(timein);
-        *tn = (t3 + 3 * t2 + 3 * t1 + t0) / 8;
-        t3 = t2; t2 = t1; t1 = t0;
-    }
-}  /* High */
-
-static void Help(void)
-{
-    PR_fprintf(
-		debug_out, "Usage: priotest [-d] [-c n]\n");
-    PR_fprintf(
-		debug_out, "-c n\tduration of test in seconds (default: %d)\n", DEFAULT_DURATION);
-    PR_fprintf(
-        debug_out, "-d\tturn on debugging output (default: FALSE)\n");
-}  /* Help */
-
-static void RudimentaryTests(void)
-{
-    /*
-    ** Try some rudimentary tests like setting valid priority and
-    ** getting it back, or setting invalid priorities and getting
-    ** back a valid answer.
-    */
-    PRThreadPriority priority;
-    PR_SetThreadPriority(PR_GetCurrentThread(), PR_PRIORITY_URGENT);
-    priority = PR_GetThreadPriority(PR_GetCurrentThread());
-    failed = ((PR_TRUE == failed) || (PR_PRIORITY_URGENT != priority))
-        ? PR_TRUE : PR_FALSE;
-    if (debug_mode && (PR_PRIORITY_URGENT != priority))
-    {
-        PR_fprintf(debug_out, "PR_[S/G]etThreadPriority() failed\n");
-    }
-
-
-    PR_SetThreadPriority(
-        PR_GetCurrentThread(), (PRThreadPriority)(PR_PRIORITY_FIRST - 1));
-    priority = PR_GetThreadPriority(PR_GetCurrentThread());
-    failed = ((PR_TRUE == failed) || (PR_PRIORITY_FIRST != priority))
-        ? PR_TRUE : PR_FALSE;
-    if (debug_mode && (PR_PRIORITY_FIRST != priority))
-    {
-        PR_fprintf(debug_out, "PR_SetThreadPriority(-1) failed\n");
-    }
-
-    PR_SetThreadPriority(
-        PR_GetCurrentThread(), (PRThreadPriority)(PR_PRIORITY_LAST + 1));
-    priority = PR_GetThreadPriority(PR_GetCurrentThread());
-    failed = ((PR_TRUE == failed) || (PR_PRIORITY_LAST != priority))
-        ? PR_TRUE : PR_FALSE;
-    if (debug_mode && (PR_PRIORITY_LAST != priority))
-    {
-        PR_fprintf(debug_out, "PR_SetThreadPriority(+1) failed\n");
-    }
-
-}  /* RudimentataryTests */
-
-static void CreateThreads(PRUint32 *lowCount, PRUint32 *highCount)
-{
-    (void)PR_CreateThread(
-        PR_USER_THREAD, Low, lowCount, PR_PRIORITY_LOW,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    (void)PR_CreateThread(
-        PR_USER_THREAD, High, highCount, PR_PRIORITY_HIGH,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-} /* CreateThreads */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    PRIntn duration = DEFAULT_DURATION;
-    PRUint32 totalCount, highCount = 0, lowCount = 0;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "hdc:");
-
-    debug_out = PR_STDOUT;
-    oneSecond = PR_SecondsToInterval(1);
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-        case 'c':  /* test duration */
-			duration = atoi(opt->value);
-            break;
-        case 'h':  /* help message */
-         default:
-			Help();
-			return 2;
-        }
-    }
-	PL_DestroyOptState(opt);
-    PR_STDIO_INIT();
-
-    if (duration == 0) duration = DEFAULT_DURATION;
-
-    RudimentaryTests();
-
-    printf("Priority test: running for %d seconds\n\n", duration);
-
-    (void)PerSecond(PR_IntervalNow());
-    totalCount = PerSecond(PR_IntervalNow());
-
-    PR_SetThreadPriority(PR_GetCurrentThread(), PR_PRIORITY_URGENT);
-
-    if (debug_mode)
-    {
-        PR_fprintf(debug_out,
-		    "The high priority thread should get approximately three\n");
-        PR_fprintf( debug_out,
-		    "times what the low priority thread manages. A maximum of \n");
-        PR_fprintf( debug_out, "%d cycles are available.\n\n", totalCount);
-    }
-
-    duration = (duration + 4) / 5;
-    CreateThreads(&lowCount, &highCount);
-    while (duration--)
-    {
-        PRIntn loop = 5;
-        while (loop--) PR_Sleep(oneSecond);
-        if (debug_mode)
-            PR_fprintf(debug_out, "high : low :: %d : %d\n", highCount, lowCount);
-    }
-
-
-    PR_ProcessExit((failed) ? 1 : 0);
-
-	PR_ASSERT(!"You can't get here -- but you did!");
-	return 1;  /* or here */
-
-}  /* main */
-
-#endif  /* ifdef XP_MAC */
-
-/* priotest.c */
diff --git a/libs/js/nsprpub/pr/tests/provider.c b/libs/js/nsprpub/pr/tests/provider.c
deleted file mode 100644
index ab3ff72478..0000000000
--- a/libs/js/nsprpub/pr/tests/provider.c
+++ /dev/null
@@ -1,1445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *
- * Notes:
- * [1] lth. The call to Sleep() is a hack to get the test case to run
- * on Windows 95. Without it, the test case fails with an error
- * WSAECONNRESET following a recv() call. The error is caused by the
- * server side thread termination without a shutdown() or closesocket()
- * call. Windows docmunentation suggests that this is predicted
- * behavior; that other platforms get away with it is ... serindipity.
- * The test case should shutdown() or closesocket() before
- * thread termination. I didn't have time to figure out where or how
- * to do it. The Sleep() call inserts enough delay to allow the
- * client side to recv() all his data before the server side thread
- * terminates. Whew! ...
- *
- ** Modification History:
- * 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
- *             The debug mode will print all of the printfs associated with this test.
- *             The regress mode will be the default mode. Since the regress tool limits
- *           the output to a one line status:PASS or FAIL,all of the printf statements
- *             have been handled with an if (debug_mode) statement. 
- */
-
-#include "prclist.h"
-#include "prcvar.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prtime.h"
-#include "prmem.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prthread.h"
-
-#include "pprio.h"
-#include "primpl.h"
-
-#include "plstr.h"
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-
-#if defined(XP_UNIX)
-#include <math.h>
-#endif
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-/*
-** This is the beginning of the test
-*/
-
-#define RECV_FLAGS 0
-#define SEND_FLAGS 0
-#define BUFFER_SIZE 1024
-#define DEFAULT_BACKLOG 5
-#define DEFAULT_PORT 13000
-#define DEFAULT_CLIENTS 1
-#define ALLOWED_IN_ACCEPT 1
-#define DEFAULT_CLIPPING 1000
-#define DEFAULT_WORKERS_MIN 1
-#define DEFAULT_WORKERS_MAX 1
-#define DEFAULT_SERVER "localhost"
-#define DEFAULT_EXECUTION_TIME 10
-#define DEFAULT_CLIENT_TIMEOUT 4000
-#define DEFAULT_SERVER_TIMEOUT 4000
-#define DEFAULT_SERVER_PRIORITY PR_PRIORITY_HIGH
-
-typedef enum CSState_e {cs_init, cs_run, cs_stop, cs_exit} CSState_t;
-
-static void PR_CALLBACK Worker(void *arg);
-typedef struct CSPool_s CSPool_t;
-typedef struct CSWorker_s CSWorker_t;
-typedef struct CSServer_s CSServer_t;
-typedef enum Verbosity
-{
-    TEST_LOG_ALWAYS,
-    TEST_LOG_ERROR,
-    TEST_LOG_WARNING,
-    TEST_LOG_NOTICE,
-    TEST_LOG_INFO,
-    TEST_LOG_STATUS,
-    TEST_LOG_VERBOSE
-} Verbosity;
-
-static enum {
-    thread_nspr, thread_pthread, thread_uithread, thread_sproc, thread_win32
-} thread_provider;
-
-static PRInt32 domain = AF_INET;
-static PRInt32 protocol = 6;  /* TCP */
-static PRFileDesc *debug_out = NULL;
-static PRBool debug_mode = PR_FALSE;
-static PRBool pthread_stats = PR_FALSE;
-static Verbosity verbosity = TEST_LOG_ALWAYS;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-struct CSWorker_s
-{
-    PRCList element;        /* list of the server's workers */
-
-    PRThread *thread;       /* this worker objects thread */
-    CSServer_t *server;     /* back pointer to server structure */
-};
-
-struct CSPool_s
-{
-    PRCondVar *exiting;
-    PRCondVar *acceptComplete;
-    PRUint32 accepting, active, workers;
-};
-
-struct CSServer_s
-{
-    PRCList list;           /* head of worker list */
-
-    PRLock *ml;
-    PRThread *thread;       /* the main server thread */
-    PRCondVar *stateChange;
-
-    PRUint16 port;          /* port we're listening on */
-    PRUint32 backlog;       /* size of our listener backlog */
-    PRFileDesc *listener;   /* the fd accepting connections */
-
-    CSPool_t pool;          /* statistics on worker threads */
-    CSState_t state;        /* the server's state */
-    struct                  /* controlling worker counts */
-    {
-        PRUint32 minimum, maximum, accepting;
-    } workers;
-
-    /* statistics */
-    PRIntervalTime started, stopped;
-    PRUint32 operations, bytesTransferred;
-};
-
-typedef struct CSDescriptor_s
-{
-    PRInt32 size;       /* size of transfer */
-    char filename[60];  /* filename, null padded */
-} CSDescriptor_t;
-
-typedef struct CSClient_s
-{
-    PRLock *ml;
-    PRThread *thread;
-    PRCondVar *stateChange;
-    PRNetAddr serverAddress;
-
-    CSState_t state;
-
-    /* statistics */
-    PRIntervalTime started, stopped;
-    PRUint32 operations, bytesTransferred;
-} CSClient_t;
-
-#define TEST_LOG(l, p, a) \
-    do { \
-        if (debug_mode || (p <= verbosity)) printf a; \
-    } while (0)
-
-PRLogModuleInfo *cltsrv_log_file = NULL;
-
-#define MY_ASSERT(_expr) \
-    ((_expr)?((void)0):_MY_Assert(# _expr,__FILE__,__LINE__))
-
-#define TEST_ASSERT(_expr) \
-    ((_expr)?((void)0):_MY_Assert(# _expr,__FILE__,__LINE__))
-
-static void _MY_Assert(const char *s, const char *file, PRIntn ln)
-{
-    PL_PrintError(NULL);
-#if DEBUG
-    PR_Assert(s, file, ln);
-#endif
-}  /* _MW_Assert */
-
-static PRBool Aborted(PRStatus rv)
-{
-    return ((PR_FAILURE == rv) && (PR_PENDING_INTERRUPT_ERROR == PR_GetError())) ?
-        PR_TRUE : PR_FALSE;
-}
-
-static void TimeOfDayMessage(const char *msg, PRThread* me)
-{
-    char buffer[100];
-    PRExplodedTime tod;
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &tod);
-    (void)PR_FormatTime(buffer, sizeof(buffer), "%T", &tod);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("%s(0x%p): %s\n", msg, me, buffer));
-}  /* TimeOfDayMessage */
-
-
-static void PR_CALLBACK Client(void *arg)
-{
-    PRStatus rv;
-    PRIntn index;
-    char buffer[1024];
-    PRFileDesc *fd = NULL;
-    PRUintn clipping = DEFAULT_CLIPPING;
-    CSClient_t *client = (CSClient_t*)arg;
-    PRThread *me = client->thread = PR_GetCurrentThread();
-    CSDescriptor_t *descriptor = PR_NEW(CSDescriptor_t);
-    PRIntervalTime timeout = PR_MillisecondsToInterval(DEFAULT_CLIENT_TIMEOUT);
-
-
-    for (index = 0; index < sizeof(buffer); ++index)
-        buffer[index] = (char)index;
-
-    client->started = PR_IntervalNow();
-
-    PR_Lock(client->ml);
-    client->state = cs_run;
-    PR_NotifyCondVar(client->stateChange);
-    PR_Unlock(client->ml);
-
-    TimeOfDayMessage("Client started at", me);
-
-    while (cs_run == client->state)
-    {
-        PRInt32 bytes, descbytes, filebytes, netbytes;
-
-        (void)PR_NetAddrToString(&client->serverAddress, buffer, sizeof(buffer));
-        TEST_LOG(cltsrv_log_file, TEST_LOG_INFO, 
-            ("\tClient(0x%p): connecting to server at %s\n", me, buffer));
-
-        fd = PR_Socket(domain, SOCK_STREAM, protocol);
-        TEST_ASSERT(NULL != fd);
-        rv = PR_Connect(fd, &client->serverAddress, timeout);
-        if (PR_FAILURE == rv)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tClient(0x%p): conection failed\n", me));
-            goto aborted;
-        }
-
-        memset(descriptor, 0, sizeof(*descriptor));
-        descriptor->size = PR_htonl(descbytes = rand() % clipping);
-        PR_snprintf(
-            descriptor->filename, sizeof(descriptor->filename),
-            "CS%p%p-%p.dat", client->started, me, client->operations);
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tClient(0x%p): sending descriptor for %u bytes\n", me, descbytes));
-        bytes = PR_Send(
-            fd, descriptor, sizeof(*descriptor), SEND_FLAGS, timeout);
-        if (sizeof(CSDescriptor_t) != bytes)
-        {
-            if (Aborted(PR_FAILURE)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\tClient(0x%p): send descriptor timeout\n", me));
-                goto retry;
-            }
-        }
-        TEST_ASSERT(sizeof(*descriptor) == bytes);
-
-        netbytes = 0;
-        while (netbytes < descbytes)
-        {
-            filebytes = sizeof(buffer);
-            if ((descbytes - netbytes) < filebytes)
-                filebytes = descbytes - netbytes;
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\tClient(0x%p): sending %d bytes\n", me, filebytes));
-            bytes = PR_Send(fd, buffer, filebytes, SEND_FLAGS, timeout);
-            if (filebytes != bytes)
-            {
-                if (Aborted(PR_FAILURE)) goto aborted;
-                if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                {
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): send data timeout\n", me));
-                    goto retry;
-                }
-            }
-            TEST_ASSERT(bytes == filebytes);
-            netbytes += bytes;
-        }
-        filebytes = 0;
-        while (filebytes < descbytes)
-        {
-            netbytes = sizeof(buffer);
-            if ((descbytes - filebytes) < netbytes)
-                netbytes = descbytes - filebytes;
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\tClient(0x%p): receiving %d bytes\n", me, netbytes));
-            bytes = PR_Recv(fd, buffer, netbytes, RECV_FLAGS, timeout);
-            if (-1 == bytes)
-            {
-                if (Aborted(PR_FAILURE))
-                {
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive data aborted\n", me));
-                    goto aborted;
-                }
-                else if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive data timeout\n", me));
-				else
-                    TEST_LOG(
-                        cltsrv_log_file, TEST_LOG_ERROR,
-                        ("\tClient(0x%p): receive error (%d, %d)\n",
-						me, PR_GetError(), PR_GetOSError()));
-                goto retry;
-           }
-            if (0 == bytes)
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tClient(0x%p): unexpected end of stream\n",
-                    PR_GetCurrentThread()));
-                break;
-            }
-            filebytes += bytes;
-        }
-
-        rv = PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-        if (Aborted(rv)) goto aborted;
-        TEST_ASSERT(PR_SUCCESS == rv);
-retry:
-        (void)PR_Close(fd); fd = NULL;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_INFO,
-            ("\tClient(0x%p): disconnected from server\n", me));
-
-        PR_Lock(client->ml);
-        client->operations += 1;
-        client->bytesTransferred += 2 * descbytes;
-        rv = PR_WaitCondVar(client->stateChange, rand() % clipping);
-        PR_Unlock(client->ml);
-        if (Aborted(rv)) break;
-    }
-
-aborted:
-    client->stopped = PR_IntervalNow();
-
-    PR_ClearInterrupt();
-    if (NULL != fd) rv = PR_Close(fd);
-
-    PR_Lock(client->ml);
-    client->state = cs_exit;
-    PR_NotifyCondVar(client->stateChange);
-    PR_Unlock(client->ml);
-    PR_DELETE(descriptor);
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("\tClient(0x%p): stopped after %u operations and %u bytes\n",
-        PR_GetCurrentThread(), client->operations, client->bytesTransferred));
-
-}  /* Client */
-
-static PRStatus ProcessRequest(PRFileDesc *fd, CSServer_t *server)
-{
-    PRStatus drv, rv;
-    char buffer[1024];
-    PRFileDesc *file = NULL;
-    PRThread * me = PR_GetCurrentThread();
-    PRInt32 bytes, descbytes, netbytes, filebytes = 0;
-    CSDescriptor_t *descriptor = PR_NEW(CSDescriptor_t);
-    PRIntervalTime timeout = PR_MillisecondsToInterval(DEFAULT_SERVER_TIMEOUT);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\tProcessRequest(0x%p): receiving desciptor\n", me));
-    bytes = PR_Recv(
-        fd, descriptor, sizeof(*descriptor), RECV_FLAGS, timeout);
-    if (-1 == bytes)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto exit;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tProcessRequest(0x%p): receive timeout\n", me));
-        }
-        goto exit;
-    }
-    if (0 == bytes)
-    {
-        rv = PR_FAILURE;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_ERROR,
-            ("\tProcessRequest(0x%p): unexpected end of file\n", me));
-        goto exit;
-    }
-    descbytes = PR_ntohl(descriptor->size);
-    TEST_ASSERT(sizeof(*descriptor) == bytes);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE, 
-        ("\t\tProcessRequest(0x%p): read descriptor {%d, %s}\n",
-        me, descbytes, descriptor->filename));
-
-    file = PR_Open(
-        descriptor->filename, (PR_CREATE_FILE | PR_WRONLY), 0666);
-    if (NULL == file)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto aborted;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\tProcessRequest(0x%p): open file timeout\n", me));
-            goto aborted;
-        }
-    }
-    TEST_ASSERT(NULL != file);
-
-    filebytes = 0;
-    while (filebytes < descbytes)
-    {
-        netbytes = sizeof(buffer);
-        if ((descbytes - filebytes) < netbytes)
-            netbytes = descbytes - filebytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): receive %d bytes\n", me, netbytes));
-        bytes = PR_Recv(fd, buffer, netbytes, RECV_FLAGS, timeout);
-        if (-1 == bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): receive data timeout\n", me));
-                goto aborted;
-            }
-            /*
-             * XXX: I got (PR_CONNECT_RESET_ERROR, ERROR_NETNAME_DELETED)
-             * on NT here.  This is equivalent to ECONNRESET on Unix.
-             *     -wtc
-             */
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_WARNING,
-                ("\t\tProcessRequest(0x%p): unexpected error (%d, %d)\n",
-                me, PR_GetError(), PR_GetOSError()));
-            goto aborted;
-        }
-        if(0 == bytes)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_WARNING,
-                ("\t\tProcessRequest(0x%p): unexpected end of stream\n", me));
-            rv = PR_FAILURE;
-            goto aborted;
-        }
-        filebytes += bytes;
-        netbytes = bytes;
-        /* The byte count for PR_Write should be positive */
-        MY_ASSERT(netbytes > 0);
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): write %d bytes to file\n", me, netbytes));
-        bytes = PR_Write(file, buffer, netbytes);
-        if (netbytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): write file timeout\n", me));
-                goto aborted;
-            }
-        }
-        TEST_ASSERT(bytes > 0);
-    }
-
-    PR_Lock(server->ml);
-    server->operations += 1;
-    server->bytesTransferred += filebytes;
-    PR_Unlock(server->ml);
-
-    rv = PR_Close(file); file = NULL;
-    if (Aborted(rv)) goto aborted;
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\t\tProcessRequest(0x%p): opening %s\n", me, descriptor->filename));
-    file = PR_Open(descriptor->filename, PR_RDONLY, 0);
-    if (NULL == file)
-    {
-        rv = PR_FAILURE;
-        if (Aborted(rv)) goto aborted;
-        if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_ERROR,
-                ("\t\tProcessRequest(0x%p): open file timeout\n",
-                PR_GetCurrentThread()));
-            goto aborted;
-        }
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_ERROR,
-            ("\t\tProcessRequest(0x%p): other file open error (%u, %u)\n",
-            me, PR_GetError(), PR_GetOSError()));
-        goto aborted;
-    }
-    TEST_ASSERT(NULL != file);
-
-    netbytes = 0;
-    while (netbytes < descbytes)
-    {
-        filebytes = sizeof(buffer);
-        if ((descbytes - netbytes) < filebytes)
-            filebytes = descbytes - netbytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tProcessRequest(0x%p): read %d bytes from file\n", me, filebytes));
-        bytes = PR_Read(file, buffer, filebytes);
-        if (filebytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): read file timeout\n", me));
-            else
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): other file error (%d, %d)\n",
-                    me, PR_GetError(), PR_GetOSError()));
-            goto aborted;
-        }
-        TEST_ASSERT(bytes > 0);
-        netbytes += bytes;
-        filebytes = bytes;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\t\tProcessRequest(0x%p): sending %d bytes\n", me, filebytes));
-        bytes = PR_Send(fd, buffer, filebytes, SEND_FLAGS, timeout);
-        if (filebytes != bytes)
-        {
-            rv = PR_FAILURE;
-            if (Aborted(rv)) goto aborted;
-            if (PR_IO_TIMEOUT_ERROR == PR_GetError())
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tProcessRequest(0x%p): send data timeout\n", me));
-                goto aborted;
-            }
-            break;
-        }
-       TEST_ASSERT(bytes > 0);
-    }
-    
-    PR_Lock(server->ml);
-    server->bytesTransferred += filebytes;
-    PR_Unlock(server->ml);
-
-    rv = PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-    if (Aborted(rv)) goto aborted;
-
-    rv = PR_Close(file); file = NULL;
-    if (Aborted(rv)) goto aborted;
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-aborted:
-    PR_ClearInterrupt();
-    if (NULL != file) PR_Close(file);
-    drv = PR_Delete(descriptor->filename);
-    TEST_ASSERT(PR_SUCCESS == drv);
-exit:
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\t\tProcessRequest(0x%p): Finished\n", me));
-
-    PR_DELETE(descriptor);
-
-#if defined(WIN95)
-    PR_Sleep(PR_MillisecondsToInterval(200)); /* lth. see note [1] */
-#endif
-    return rv;
-}  /* ProcessRequest */
-
-typedef void (*StartFn)(void*);
-typedef struct StartObject
-{
-    StartFn start;
-    void *arg;
-} StartObject;
-
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include "md/_pth.h"
-#include <pthread.h>
-
-static void *pthread_start(void *arg)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-    return NULL;
-}  /* pthread_start */
-#endif /* defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) */
-
-#if defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-#include <thread.h>
-
-static void *uithread_start(void *arg)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-    return NULL;
-}  /* uithread_start */
-#endif /* defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY) */
-
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-#include <sys/types.h>
-#include <sys/prctl.h>
-static void sproc_start(void *arg, PRSize size)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-}  /* sproc_start */
-#endif  /* defined(IRIX) && !defined(_PR_PTHREADS) */
-
-#if defined(WIN32)
-#include <process.h>  /* for _beginthreadex() */
-
-static PRUintn __stdcall windows_start(void *arg)
-{
-    StartObject *so = (StartObject*)arg;
-    StartFn start = so->start;
-    void *data = so->arg;
-    PR_Free(so);
-    start(data);
-    return 0;
-}  /* windows_start */
-#endif /* defined(WIN32) */
-
-static PRStatus JoinThread(PRThread *thread)
-{
-    PRStatus rv;
-    switch (thread_provider)
-    {
-    case thread_nspr:
-        rv = PR_JoinThread(thread);
-        break;
-    case thread_pthread:
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-        rv = PR_SUCCESS;
-        break;
-#endif /* defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) */
-    case thread_uithread:
-#if defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-        rv = PR_SUCCESS;
-        break;
-#endif /* defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY) */
-    case thread_win32:
-#if defined(WIN32)
-        rv = PR_SUCCESS;
-        break;
-#endif
-    default:
-        rv = PR_FAILURE;
-        break;
-    }
-    return rv;    
-}  /* JoinThread */
-
-static PRStatus NewThread(
-    StartFn start, void *arg, PRThreadPriority prio, PRThreadState state)
-{
-    PRStatus rv;
-
-    switch (thread_provider)
-    {
-    case thread_nspr:
-        {
-            PRThread *thread = PR_CreateThread(
-                PR_USER_THREAD, start, arg,
-                PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-                PR_JOINABLE_THREAD, 0);
-            rv = (NULL == thread) ? PR_FAILURE : PR_SUCCESS;
-        }
-        break;
-    case thread_pthread:
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-        {
-            int rv;
-            pthread_t id;
-            pthread_attr_t tattr;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-
-            rv = _PT_PTHREAD_ATTR_INIT(&tattr);
-            PR_ASSERT(0 == rv);
-
-            rv = pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
-            PR_ASSERT(0 == rv);
-
-            rv = pthread_attr_setstacksize(&tattr, 64 * 1024);
-            PR_ASSERT(0 == rv);
-
-            rv = _PT_PTHREAD_CREATE(&id, tattr, pthread_start, start_object);
-            (void)_PT_PTHREAD_ATTR_DESTROY(&tattr);
-            return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif /* defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) */
-        break;
-
-    case thread_uithread:
-#if defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-        {
-            int rv;
-            thread_t id;
-            long flags;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-
-            flags = THR_DETACHED;
-
-            rv = thr_create(NULL, NULL, uithread_start, start_object, flags, &id);
-            return (0 == rv) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif /* defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY) */
-        break;
-
-    case thread_sproc:
-#if defined(IRIX) && !defined(_PR_PTHREADS)
-        {
-            PRInt32 pid;
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-            pid = sprocsp(
-                sproc_start, PR_SALL, start_object, NULL, 64 * 1024);
-            rv = (0 < pid) ? PR_SUCCESS : PR_FAILURE;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif  /* defined(IRIX) && !defined(_PR_PTHREADS) */
-        break;
-    case thread_win32:
-#if defined(WIN32)
-        {
-            void *th;
-            PRUintn id;       
-            StartObject *start_object;
-            start_object = PR_NEW(StartObject);
-            PR_ASSERT(NULL != start_object);
-            start_object->start = start;
-            start_object->arg = arg;
-            th = (void*)_beginthreadex(
-                NULL, /* LPSECURITY_ATTRIBUTES - pointer to thread security attributes */  
-                0U, /* DWORD - initial thread stack size, in bytes */
-                windows_start, /* LPTHREAD_START_ROUTINE - pointer to thread function */
-                start_object, /* LPVOID - argument for new thread */
-                0U, /*DWORD dwCreationFlags - creation flags */
-                &id /* LPDWORD - pointer to returned thread identifier */ );
-
-            rv = (NULL == th) ? PR_FAILURE : PR_SUCCESS;
-        }
-#else
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-#endif
-        break;
-    default:
-        PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-        rv = PR_FAILURE;
-    }
-    return rv;
-}  /* NewThread */
-
-static PRStatus CreateWorker(CSServer_t *server, CSPool_t *pool)
-{
-    PRStatus rv;
-    CSWorker_t *worker = PR_NEWZAP(CSWorker_t);
-    worker->server = server;
-    PR_INIT_CLIST(&worker->element);
-    rv = NewThread(
-        Worker, worker, DEFAULT_SERVER_PRIORITY, PR_UNJOINABLE_THREAD);
-    if (PR_FAILURE == rv) PR_DELETE(worker);
-
-    TEST_LOG(cltsrv_log_file, TEST_LOG_STATUS, 
-        ("\tCreateWorker(0x%p): create new worker (0x%p)\n",
-        PR_GetCurrentThread(), worker->thread));
-
-    return rv;
-}  /* CreateWorker */
-
-static void PR_CALLBACK Worker(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr from;
-    PRFileDesc *fd = NULL;
-    CSWorker_t *worker = (CSWorker_t*)arg;
-    CSServer_t *server = worker->server;
-    CSPool_t *pool = &server->pool;
-
-    PRThread *me = worker->thread = PR_GetCurrentThread();
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_NOTICE,
-        ("\t\tWorker(0x%p): started [%u]\n", me, pool->workers + 1));
-
-    PR_Lock(server->ml);
-    PR_APPEND_LINK(&worker->element, &server->list);
-    pool->workers += 1;  /* define our existance */
-
-    while (cs_run == server->state)
-    {
-        while (pool->accepting >= server->workers.accepting)
-        {
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_VERBOSE,
-                ("\t\tWorker(0x%p): waiting for accept slot[%d]\n",
-                me, pool->accepting));
-            rv = PR_WaitCondVar(pool->acceptComplete, PR_INTERVAL_NO_TIMEOUT);
-            if (Aborted(rv) || (cs_run != server->state))
-            {
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_NOTICE,
-                    ("\tWorker(0x%p): has been %s\n",
-                    me, (Aborted(rv) ? "interrupted" : "stopped")));
-                goto exit;
-            }
-        } 
-        pool->accepting += 1;  /* how many are really in accept */
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\t\tWorker(0x%p): calling accept\n", me));
-        fd = PR_Accept(server->listener, &from, PR_INTERVAL_NO_TIMEOUT);
-
-        PR_Lock(server->ml);        
-        pool->accepting -= 1;
-        PR_NotifyCondVar(pool->acceptComplete);
-
-        if ((NULL == fd) && Aborted(PR_FAILURE))
-        {
-            if (NULL != server->listener)
-            {
-                PR_Close(server->listener);
-                server->listener = NULL;
-            }
-            goto exit;
-        }
-
-        if (NULL != fd)
-        {
-            /*
-            ** Create another worker of the total number of workers is
-            ** less than the minimum specified or we have none left in
-            ** accept() AND we're not over the maximum.
-            ** This sort of presumes that the number allowed in accept
-            ** is at least as many as the minimum. Otherwise we'll keep
-            ** creating new threads and deleting them soon after.
-            */
-            PRBool another =
-                ((pool->workers < server->workers.minimum) ||
-                ((0 == pool->accepting)
-                    && (pool->workers < server->workers.maximum))) ?
-                    PR_TRUE : PR_FALSE;
-            pool->active += 1;
-            PR_Unlock(server->ml);
-
-            if (another) (void)CreateWorker(server, pool);
-
-            rv = ProcessRequest(fd, server);
-            if (PR_SUCCESS != rv)
-                TEST_LOG(
-                    cltsrv_log_file, TEST_LOG_ERROR,
-                    ("\t\tWorker(0x%p): server process ended abnormally\n", me));
-            (void)PR_Close(fd); fd = NULL;
-
-            PR_Lock(server->ml);
-            pool->active -= 1;
-        }
-    }
-
-exit:
-    PR_ClearInterrupt();    
-    PR_Unlock(server->ml);
-
-    if (NULL != fd)
-    {
-        (void)PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
-        (void)PR_Close(fd);
-    }
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_NOTICE,
-        ("\t\tWorker(0x%p): exiting [%u]\n", PR_GetCurrentThread(), pool->workers));
-
-    PR_Lock(server->ml);
-    pool->workers -= 1;  /* undefine our existance */
-    PR_REMOVE_AND_INIT_LINK(&worker->element);
-    PR_NotifyCondVar(pool->exiting);
-    PR_Unlock(server->ml);
-
-    PR_DELETE(worker);  /* destruction of the "worker" object */
-
-}  /* Worker */
-
-static void PR_CALLBACK Server(void *arg)
-{
-    PRStatus rv;
-    PRNetAddr serverAddress;
-    CSServer_t *server = (CSServer_t*)arg;
-    PRThread *me = server->thread = PR_GetCurrentThread();
-    PRSocketOptionData sockOpt;
-
-    server->listener = PR_Socket(domain, SOCK_STREAM, protocol);
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    rv = PR_SetSocketOption(server->listener, &sockOpt);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    memset(&serverAddress, 0, sizeof(serverAddress));
-    rv = PR_InitializeNetAddr(PR_IpAddrAny, DEFAULT_PORT, &serverAddress);
-
-    rv = PR_Bind(server->listener, &serverAddress);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    rv = PR_Listen(server->listener, server->backlog);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    server->started = PR_IntervalNow();
-    TimeOfDayMessage("Server started at", me);
-
-    PR_Lock(server->ml);
-    server->state = cs_run;
-    PR_NotifyCondVar(server->stateChange);
-    PR_Unlock(server->ml);
-
-    /*
-    ** Create the first worker (actually, a thread that accepts
-    ** connections and then processes the work load as needed).
-    ** From this point on, additional worker threads are created
-    ** as they are needed by existing worker threads.
-    */
-    rv = CreateWorker(server, &server->pool);
-    TEST_ASSERT(PR_SUCCESS == rv);
-
-    /*
-    ** From here on this thread is merely hanging around as the contact
-    ** point for the main test driver. It's just waiting for the driver
-    ** to declare the test complete.
-    */
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_VERBOSE,
-        ("\tServer(0x%p): waiting for state change\n", me));
-
-    PR_Lock(server->ml);
-    while ((cs_run == server->state) && !Aborted(rv))
-    {
-        rv = PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-    }
-    PR_Unlock(server->ml);
-    PR_ClearInterrupt();
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_INFO,
-        ("\tServer(0x%p): shutting down workers\n", me));
-
-    /*
-    ** Get all the worker threads to exit. They know how to
-    ** clean up after themselves, so this is just a matter of
-    ** waiting for clorine in the pool to take effect. During
-    ** this stage we're ignoring interrupts.
-    */
-    server->workers.minimum = server->workers.maximum = 0;
-
-    PR_Lock(server->ml);
-    while (!PR_CLIST_IS_EMPTY(&server->list))
-    {
-        PRCList *head = PR_LIST_HEAD(&server->list);
-        CSWorker_t *worker = (CSWorker_t*)head;
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("\tServer(0x%p): interrupting worker(0x%p)\n", me, worker));
-        rv = PR_Interrupt(worker->thread);
-        TEST_ASSERT(PR_SUCCESS == rv);
-        PR_REMOVE_AND_INIT_LINK(head);
-    }
-
-    while (server->pool.workers > 0)
-    {
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE,
-            ("\tServer(0x%p): waiting for %u workers to exit\n",
-            me, server->pool.workers));
-        (void)PR_WaitCondVar(server->pool.exiting, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-    server->state = cs_exit;
-    PR_NotifyCondVar(server->stateChange);
-    PR_Unlock(server->ml);
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("\tServer(0x%p): stopped after %u operations and %u bytes\n",
-        me, server->operations, server->bytesTransferred));
-
-    if (NULL != server->listener) PR_Close(server->listener);
-    server->stopped = PR_IntervalNow();
-
-}  /* Server */
-
-static void WaitForCompletion(PRIntn execution)
-{
-    while (execution > 0)
-    { 
-        PRIntn dally = (execution > 30) ? 30 : execution;
-        PR_Sleep(PR_SecondsToInterval(dally));
-        if (pthread_stats) PT_FPrintStats(debug_out, "\nPThread Statistics\n");
-        execution -= dally;
-    }
-}  /* WaitForCompletion */
-
-static void Help(void)
-{
-    PR_fprintf(debug_out, "cltsrv test program usage:\n");
-    PR_fprintf(debug_out, "\t-a <n>       threads allowed in accept        (5)\n");
-    PR_fprintf(debug_out, "\t-b <n>       backlock for listen              (5)\n");
-    PR_fprintf(debug_out, "\t-c <threads> number of clients to create      (1)\n");
-    PR_fprintf(debug_out, "\t-w <threads> minimal number of server threads (1)\n");
-    PR_fprintf(debug_out, "\t-W <threads> maximum number of server threads (1)\n");
-    PR_fprintf(debug_out, "\t-e <seconds> duration of the test in seconds  (10)\n");
-    PR_fprintf(debug_out, "\t-s <string>  dsn name of server               (localhost)\n");
-    PR_fprintf(debug_out, "\t-G           use GLOBAL threads               (LOCAL)\n");
-    PR_fprintf(debug_out, "\t-T <string>  thread provider ('n' | 'p' | 'u' | 'w')(n)\n");
-    PR_fprintf(debug_out, "\t-X           use XTP as transport             (TCP)\n");
-    PR_fprintf(debug_out, "\t-6           Use IPv6                         (IPv4)\n");
-    PR_fprintf(debug_out, "\t-v           verbosity (accumulative)         (0)\n");
-    PR_fprintf(debug_out, "\t-p           pthread statistics               (FALSE)\n");
-    PR_fprintf(debug_out, "\t-d           debug mode                       (FALSE)\n");
-    PR_fprintf(debug_out, "\t-h           this message\n");
-}  /* Help */
-
-static Verbosity IncrementVerbosity(void)
-{
-    PRIntn verboge = (PRIntn)verbosity + 1;
-    return (Verbosity)verboge;
-}  /* IncrementVerbosity */
-
-PRIntn main(PRIntn argc, char** argv)
-{
-    PRUintn index;
-    PRBool boolean;
-    CSClient_t *client;
-    PRStatus rv, joinStatus;
-    CSServer_t *server = NULL;
-	char *thread_type;
-
-    PRUintn backlog = DEFAULT_BACKLOG;
-    PRUintn clients = DEFAULT_CLIENTS;
-    const char *serverName = DEFAULT_SERVER;
-    PRBool serverIsLocal = PR_TRUE;
-    PRUintn accepting = ALLOWED_IN_ACCEPT;
-    PRUintn workersMin = DEFAULT_WORKERS_MIN;
-    PRUintn workersMax = DEFAULT_WORKERS_MAX;
-    PRIntn execution = DEFAULT_EXECUTION_TIME;
-
-    /*
-     * -G           use global threads
-     * -a <n>       threads allowed in accept
-     * -b <n>       backlock for listen
-     * -c <threads> number of clients to create
-     * -w <threads> minimal number of server threads
-     * -W <threads> maximum number of server threads
-     * -e <seconds> duration of the test in seconds
-     * -s <string>  dsn name of server (implies no server here)
-     * -v           verbosity
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "GX6b:a:c:w:W:e:s:T:vdhp");
-
-#if defined(WIN32)
-	thread_provider = thread_win32;
-#elif defined(_PR_PTHREADS)
-	thread_provider = thread_pthread;
-#elif defined(SOLARIS) && defined(_PR_GLOBAL_THREADS_ONLY)
-	thread_provider = thread_uithread;
-#elif defined(IRIX)
-	thread_provider = thread_sproc;
-#else
-    thread_provider = thread_nspr;
-#endif
-
-    debug_out = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'X':  /* use XTP as transport */
-            protocol = 36;
-            break;
-		case '6':  /* Use IPv6 */
-            domain = PR_AF_INET6;
-            break;
-        case 'a':  /* the value for accepting */
-            accepting = atoi(opt->value);
-            break;
-        case 'b':  /* the value for backlock */
-            backlog = atoi(opt->value);
-            break;
-        case 'T':  /* the thread provider */
-            if ('n' == *opt->value) thread_provider = thread_nspr;
-            else if ('p' == *opt->value) thread_provider = thread_pthread;
-            else if ('u' == *opt->value) thread_provider = thread_uithread;
-            else if ('w' == *opt->value) thread_provider = thread_win32;
-            else {Help(); return 2; }
-            break;
-        case 'c':  /* number of client threads */
-            clients = atoi(opt->value);
-            break;
-        case 'w':  /* minimum server worker threads */
-            workersMin = atoi(opt->value);
-            break;
-        case 'W':  /* maximum server worker threads */
-            workersMax = atoi(opt->value);
-            break;
-        case 'e':  /* program execution time in seconds */
-            execution = atoi(opt->value);
-            break;
-        case 's':  /* server's address */
-            serverName = opt->value;
-            break;
-        case 'v':  /* verbosity */
-            verbosity = IncrementVerbosity();
-            break;
-        case 'd':  /* debug mode */
-            debug_mode = PR_TRUE;
-            break;
-        case 'p':  /* pthread mode */
-            pthread_stats = PR_TRUE;
-            break;
-        case 'h':
-        default:
-            Help();
-            return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (0 != PL_strcmp(serverName, DEFAULT_SERVER)) serverIsLocal = PR_FALSE;
-    if (0 == execution) execution = DEFAULT_EXECUTION_TIME;
-    if (0 == workersMax) workersMax = DEFAULT_WORKERS_MAX;
-    if (0 == workersMin) workersMin = DEFAULT_WORKERS_MIN;
-    if (0 == accepting) accepting = ALLOWED_IN_ACCEPT;
-    if (0 == backlog) backlog = DEFAULT_BACKLOG;
-
-    if (workersMin > accepting) accepting = workersMin;
-
-    PR_STDIO_INIT();
-    TimeOfDayMessage("Client/Server started at", PR_GetCurrentThread());
-
-    cltsrv_log_file = PR_NewLogModule("cltsrv_log");
-    MY_ASSERT(NULL != cltsrv_log_file);
-    boolean = PR_SetLogFile("cltsrv.log");
-    MY_ASSERT(boolean);
-
-#ifdef XP_MAC
-    debug_mode = PR_TRUE;
-#endif
-
-    if (serverIsLocal)
-    {
-        /* Establish the server */
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_INFO,
-            ("main(0x%p): starting server\n", PR_GetCurrentThread()));
-
-        server = PR_NEWZAP(CSServer_t);
-        PR_INIT_CLIST(&server->list);
-        server->state = cs_init;
-        server->ml = PR_NewLock();
-        server->backlog = backlog;
-        server->port = DEFAULT_PORT;
-        server->workers.minimum = workersMin;
-        server->workers.maximum = workersMax;
-        server->workers.accepting = accepting;
-        server->stateChange = PR_NewCondVar(server->ml);
-        server->pool.exiting = PR_NewCondVar(server->ml);
-        server->pool.acceptComplete = PR_NewCondVar(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE,
-            ("main(0x%p): creating server thread\n", PR_GetCurrentThread()));
-
-        rv = NewThread(
-            Server, server, PR_PRIORITY_HIGH, PR_JOINABLE_THREAD);
-        TEST_ASSERT(PR_SUCCESS == rv);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): waiting for server init\n", PR_GetCurrentThread()));
-
-        PR_Lock(server->ml);
-        while (server->state == cs_init)
-            PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): server init complete (port #%d)\n",
-            PR_GetCurrentThread(), server->port));
-    }
-
-    if (clients != 0)
-    {
-        /* Create all of the clients */
-        PRHostEnt host;
-        char buffer[BUFFER_SIZE];
-        client = (CSClient_t*)PR_CALLOC(clients * sizeof(CSClient_t));
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_VERBOSE,
-            ("main(0x%p): creating %d client threads\n",
-            PR_GetCurrentThread(), clients));
-        
-        if (!serverIsLocal)
-        {
-            rv = PR_GetHostByName(serverName, buffer, BUFFER_SIZE, &host);
-            if (PR_SUCCESS != rv)
-            {
-                PL_FPrintError(PR_STDERR, "PR_GetHostByName");
-                return 2;
-            }
-        }
-
-        for (index = 0; index < clients; ++index)
-        {
-            client[index].state = cs_init;
-            client[index].ml = PR_NewLock();
-            if (serverIsLocal)
-            {
-                (void)PR_InitializeNetAddr(
-                    PR_IpAddrLoopback, DEFAULT_PORT,
-                    &client[index].serverAddress);
-            }
-            else
-            {
-                (void)PR_EnumerateHostEnt(
-                    0, &host, DEFAULT_PORT, &client[index].serverAddress);
-            }
-            client[index].stateChange = PR_NewCondVar(client[index].ml);
-            TEST_LOG(
-                cltsrv_log_file, TEST_LOG_INFO,
-                ("main(0x%p): creating client threads\n", PR_GetCurrentThread()));
-            rv = NewThread(
-                Client, &client[index], PR_PRIORITY_NORMAL, PR_JOINABLE_THREAD);
-            TEST_ASSERT(PR_SUCCESS == rv);
-            PR_Lock(client[index].ml);
-            while (cs_init == client[index].state)
-                PR_WaitCondVar(client[index].stateChange, PR_INTERVAL_NO_TIMEOUT);
-            PR_Unlock(client[index].ml);
-        }
-    }
-
-    /* Then just let them go at it for a bit */
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS,
-        ("main(0x%p): waiting for execution interval (%d seconds)\n",
-        PR_GetCurrentThread(), execution));
-
-    WaitForCompletion(execution);
-
-    TimeOfDayMessage("Shutting down", PR_GetCurrentThread());
-
-    if (clients != 0)
-    {
-        for (index = 0; index < clients; ++index)
-        {
-            TEST_LOG(cltsrv_log_file, TEST_LOG_STATUS, 
-                ("main(0x%p): notifying client(0x%p) to stop\n",
-                PR_GetCurrentThread(), client[index].thread));
-
-            PR_Lock(client[index].ml);
-            if (cs_run == client[index].state)
-            {
-                client[index].state = cs_stop;
-                PR_Interrupt(client[index].thread);
-                while (cs_stop == client[index].state)
-                    PR_WaitCondVar(
-                        client[index].stateChange, PR_INTERVAL_NO_TIMEOUT);
-            }
-            PR_Unlock(client[index].ml);
-
-            TEST_LOG(cltsrv_log_file, TEST_LOG_VERBOSE, 
-                ("main(0x%p): joining client(0x%p)\n",
-                PR_GetCurrentThread(), client[index].thread));
-
-		    joinStatus = JoinThread(client[index].thread);
-		    TEST_ASSERT(PR_SUCCESS == joinStatus);
-            PR_DestroyCondVar(client[index].stateChange);
-            PR_DestroyLock(client[index].ml);
-        }
-        PR_DELETE(client);
-    }
-
-    if (NULL != server)
-    {
-        /* All clients joined - retrieve the server */
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE, 
-            ("main(0x%p): notifying server(0x%p) to stop\n",
-            PR_GetCurrentThread(), server->thread));
-
-        PR_Lock(server->ml);
-        server->state = cs_stop;
-        PR_Interrupt(server->thread);
-        while (cs_exit != server->state)
-            PR_WaitCondVar(server->stateChange, PR_INTERVAL_NO_TIMEOUT);
-        PR_Unlock(server->ml);
-
-        TEST_LOG(
-            cltsrv_log_file, TEST_LOG_NOTICE, 
-            ("main(0x%p): joining server(0x%p)\n",
-            PR_GetCurrentThread(), server->thread));
-        joinStatus = JoinThread(server->thread);
-        TEST_ASSERT(PR_SUCCESS == joinStatus);
-
-        PR_DestroyCondVar(server->stateChange);
-        PR_DestroyCondVar(server->pool.exiting);
-        PR_DestroyCondVar(server->pool.acceptComplete);
-        PR_DestroyLock(server->ml);
-        PR_DELETE(server);
-    }
-
-    TEST_LOG(
-        cltsrv_log_file, TEST_LOG_ALWAYS, 
-        ("main(0x%p): test complete\n", PR_GetCurrentThread()));
-
-	if (thread_provider == thread_win32)
-		thread_type = "\nWin32 Thread Statistics\n";
-	else if (thread_provider == thread_pthread)
-		thread_type = "\npthread Statistics\n";
-	else if (thread_provider == thread_uithread)
-		thread_type = "\nUnix International (UI) Thread Statistics\n";
-	else if (thread_provider == thread_sproc)
-		thread_type = "\nsproc Statistics\n";
-    else {
-		PR_ASSERT(thread_provider == thread_nspr);
-		thread_type = "\nPRThread Statistics\nn";
-	}
-
-    PT_FPrintStats(debug_out, thread_type);
-
-    TimeOfDayMessage("Test exiting at", PR_GetCurrentThread());
-    PR_Cleanup();
-    return 0;
-}  /* main */
-
-/* cltsrv.c */
diff --git a/libs/js/nsprpub/pr/tests/prpoll.c b/libs/js/nsprpub/pr/tests/prpoll.c
deleted file mode 100644
index 1dfdb074b3..0000000000
--- a/libs/js/nsprpub/pr/tests/prpoll.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#ifdef XP_OS2_VACPP
-#include <io.h>      /* for close() */
-#endif
-
-#ifdef XP_UNIX
-#include <unistd.h>  /* for close() */
-#endif
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prnetdb.h"
-
-#ifndef XP_MAC
-#include "private/pprio.h"
-#else
-#include "pprio.h"
-#endif
-
-#define CLIENT_LOOPS	5
-#define BUF_SIZE		128
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-static void
-clientThreadFunc(void *arg)
-{
-    PRUint16 port = (PRUint16) arg;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    char buf[BUF_SIZE];
-    int i;
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons(port);
-    addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    PR_snprintf(buf, sizeof(buf), "%hu", port);
-
-    for (i = 0; i < 5; i++) {
-	sock = PR_NewTCPSocket();
-        PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-
-	PR_Write(sock, buf, sizeof(buf));
-	PR_Close(sock);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRFileDesc *badFD;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    char buf[BUF_SIZE];
-    PRThread *clientThread;
-    PRPollDesc pds0[10], pds1[10], *pds, *other_pds;
-    PRIntn npds;
-    PRInt32 retVal;
-    PRInt32 rv;
-    PROsfd sd;
-    struct sockaddr_in saddr;
-    PRIntn saddr_len;
-    PRUint16 listenPort3;
-    PRFileDesc *socket_poll_fd;
-    PRIntn i, j;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    printf("This program tests PR_Poll with sockets.\n");
-    printf("Timeout, error reporting, and normal operation are tested.\n\n");
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	exit(1);
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	exit(1);
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	exit(1);
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	exit(1);
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	exit(1);
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	exit(1);
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	exit(1);
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	exit(1);
-    }
-    /* Set up the poll descriptor array */
-    pds = pds0;
-    other_pds = pds1;
-    memset(pds, 0, sizeof(pds));
-	npds = 0;
-    pds[npds].fd = listenSock1;
-    pds[npds].in_flags = PR_POLL_READ;
-	npds++;
-    pds[npds].fd = listenSock2;
-    pds[npds].in_flags = PR_POLL_READ;
-	npds++;
-
-	sd = socket(AF_INET, SOCK_STREAM, 0);
-	PR_ASSERT(sd >= 0);
-	memset((char *) &saddr, 0, sizeof(saddr));
-	saddr.sin_family = AF_INET;
-	saddr.sin_addr.s_addr = htonl(INADDR_ANY);
-	saddr.sin_port = htons(0);
-
-	rv = bind(sd, (struct sockaddr *)&saddr, sizeof(saddr));
-	PR_ASSERT(rv == 0);
-	saddr_len = sizeof(saddr);
-	rv = getsockname(sd, (struct sockaddr *) &saddr, &saddr_len);
-	PR_ASSERT(rv == 0);
-    listenPort3 = ntohs(saddr.sin_port);
-
-	rv = listen(sd, 5);
-	PR_ASSERT(rv == 0);
-    pds[npds].fd = socket_poll_fd = PR_CreateSocketPollFd(sd);
-	PR_ASSERT(pds[npds].fd);
-    pds[npds].in_flags = PR_POLL_READ;
-    npds++;
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu, %hu and %hu\n\n",
-	    listenPort1, listenPort2, listenPort3);
-    printf("%s", buf);
-
-    /* Testing timeout */
-    printf("PR_Poll should time out in 5 seconds\n");
-    retVal = PR_Poll(pds, npds, PR_SecondsToInterval(5));
-    if (retVal != 0) {
-	PR_snprintf(buf, sizeof(buf),
-		"PR_Poll should time out and return 0, but it returns %ld\n",
-		retVal);
-	fprintf(stderr, "%s", buf);
-	exit(1);
-    }
-    printf("PR_Poll timed out.  Test passed.\n\n");
-
-    /* Testing bad fd */
-    printf("PR_Poll should detect a bad file descriptor\n");
-    if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	exit(1);
-    }
-
-    pds[npds].fd = badFD;
-    pds[npds].in_flags = PR_POLL_READ;
-    npds++;
-    PR_Close(badFD);  /* make the fd bad */
-#if 0
-    retVal = PR_Poll(pds, npds, PR_INTERVAL_NO_TIMEOUT);
-    if (retVal != 1 || (unsigned short) pds[2].out_flags != PR_POLL_NVAL) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Poll returns %d, out_flags is 0x%hx\n",
-		retVal, pds[npds - 1].out_flags);
-	exit(1);
-    }
-    printf("PR_Poll detected the bad fd.  Test passed.\n\n");
-#endif
-    npds--;
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort1,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort2,
-	    PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort3,
-	    PR_PRIORITY_NORMAL, PR_GLOBAL_BOUND_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-
-    printf("Three client threads are created.  Each of them will\n");
-    printf("send data to one of the three ports the server is listening on.\n");
-    printf("The data they send is the port number.  Each of them send\n");
-    printf("the data five times, so you should see ten lines below,\n");
-    printf("interleaved in an arbitrary order.\n");
-
-    /* 30 events total */
-    i = 0;
-    while (i < 30) {
-		PRPollDesc *tmp;
-		int nextIndex;
-		int nEvents = 0;
-
-		retVal = PR_Poll(pds, npds, PR_INTERVAL_NO_TIMEOUT);
-		PR_ASSERT(retVal != 0);  /* no timeout */
-		if (retVal == -1) {
-			fprintf(stderr, "PR_Poll failed\n");
-			exit(1);
-		}
-
-		nextIndex = 3;
-		/* the three listening sockets */
-		for (j = 0; j < 3; j++) {
-			other_pds[j] = pds[j];
-			PR_ASSERT((pds[j].out_flags & PR_POLL_WRITE) == 0
-				&& (pds[j].out_flags & PR_POLL_EXCEPT) == 0);
-			if (pds[j].out_flags & PR_POLL_READ) {
-				PRFileDesc *sock;
-
-				nEvents++;
-				if (j == 2) {
-					PROsfd newsd;
-					newsd = accept(PR_FileDesc2NativeHandle(pds[j].fd), NULL, 0);
-					if (newsd == -1) {
-						fprintf(stderr, "accept() failed\n");
-						exit(1);
-					}
-					other_pds[nextIndex].fd  = PR_CreateSocketPollFd(newsd);
-					PR_ASSERT(other_pds[nextIndex].fd);
-					other_pds[nextIndex].in_flags = PR_POLL_READ;
-				} else {
-					sock = PR_Accept(pds[j].fd, NULL, PR_INTERVAL_NO_TIMEOUT);
-					if (sock == NULL) {
-						fprintf(stderr, "PR_Accept() failed\n");
-						exit(1);
-					}
-					other_pds[nextIndex].fd = sock;
-					other_pds[nextIndex].in_flags = PR_POLL_READ;
-				}
-				nextIndex++;
-			} else if (pds[j].out_flags & PR_POLL_ERR) {
-				fprintf(stderr, "PR_Poll() indicates that an fd has error\n");
-				exit(1);
-			} else if (pds[j].out_flags & PR_POLL_NVAL) {
-				fprintf(stderr, "PR_Poll() indicates that fd %d is invalid\n",
-					PR_FileDesc2NativeHandle(pds[j].fd));
-				exit(1);
-			}
-		}
-
-		for (j = 3; j < npds; j++) {
-			PR_ASSERT((pds[j].out_flags & PR_POLL_WRITE) == 0
-				&& (pds[j].out_flags & PR_POLL_EXCEPT) == 0);
-			if (pds[j].out_flags & PR_POLL_READ) {
-				PRInt32 nBytes;
-
-				nEvents++;
-				/* XXX: This call is a hack and should be fixed */
-				if (PR_GetDescType(pds[j].fd) == (PRDescType) 0) {
-					nBytes = recv(PR_FileDesc2NativeHandle(pds[j].fd), buf,
-										sizeof(buf), 0);
-					if (nBytes == -1) {
-						fprintf(stderr, "recv() failed\n");
-						exit(1);
-					}
-					printf("Server read %d bytes from native fd %d\n",nBytes,
-										PR_FileDesc2NativeHandle(pds[j].fd));
-#ifdef WIN32
-					closesocket((SOCKET)PR_FileDesc2NativeHandle(pds[j].fd));
-#else
-					close(PR_FileDesc2NativeHandle(pds[j].fd));
-#endif
-					PR_DestroySocketPollFd(pds[j].fd);
-				} else {
-					nBytes = PR_Read(pds[j].fd, buf, sizeof(buf));
-					if (nBytes == -1) {
-						fprintf(stderr, "PR_Read() failed\n");
-						exit(1);
-					}
-					PR_Close(pds[j].fd);
-				}
-				/* Just to be safe */
-				buf[BUF_SIZE - 1] = '\0';
-				printf("The server received \"%s\" from a client\n", buf);
-			} else if (pds[j].out_flags & PR_POLL_ERR) {
-				fprintf(stderr, "PR_Poll() indicates that an fd has error\n");
-				exit(1);
-			} else if (pds[j].out_flags & PR_POLL_NVAL) {
-				fprintf(stderr, "PR_Poll() indicates that an fd is invalid\n");
-				exit(1);
-			} else {
-				other_pds[nextIndex] = pds[j];
-				nextIndex++;
-			}
-		}
-
-		PR_ASSERT(retVal == nEvents);
-		/* swap */
-		tmp = pds;
-		pds = other_pds;
-		other_pds = tmp;
-		npds = nextIndex;
-		i += nEvents;
-    }
-    PR_DestroySocketPollFd(socket_poll_fd);
-
-    printf("All tests finished\n");
-    PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/prpollml.c b/libs/js/nsprpub/pr/tests/prpollml.c
deleted file mode 100644
index 720b525c26..0000000000
--- a/libs/js/nsprpub/pr/tests/prpollml.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This test exercises the code that allocates and frees the syspoll_list
- * array of PRThread in the pthreads version.  This test is intended to be
- * run under Purify to verify that there is no memory leak.
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define POLL_DESC_COUNT 256  /* This should be greater than the
-                              * STACK_POLL_DESC_COUNT macro in
-                              * ptio.c to cause syspoll_list to
-                              * be created. */
-
-static PRPollDesc pd[POLL_DESC_COUNT];
-
-static void Test(void)
-{
-    int i;
-    PRInt32 rv;
-    PRIntervalTime timeout;
-
-    timeout = PR_MillisecondsToInterval(10);
-    /* cause syspoll_list to grow */
-    for (i = 1; i <= POLL_DESC_COUNT; i++) {
-        rv = PR_Poll(pd, i, timeout);
-        if (rv != 0) {
-            fprintf(stderr,
-                "PR_Poll should time out but returns %d (%d, %d)\n",
-                rv, PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-    }
-    /* syspoll_list should be large enough for all these */
-    for (i = POLL_DESC_COUNT; i >= 1; i--) {
-        rv = PR_Poll(pd, i, timeout);
-        if (rv != 0) {
-            fprintf(stderr, "PR_Poll should time out but returns %d\n", rv);
-            exit(1);
-        }
-    }
-}
-
-static void ThreadFunc(void *arg)
-{
-    Test();
-}
-
-int main(int argc, char **argv)
-{
-    int i;
-    PRThread *thread;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-
-    memset(&addr, 0, sizeof(addr));
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons(0);
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    for (i = 0; i < POLL_DESC_COUNT; i++) {
-        sock = PR_NewTCPSocket();
-        if (sock == NULL) {
-            fprintf(stderr, "PR_NewTCPSocket failed\n");
-            exit(1);
-        }
-        if (PR_Bind(sock, &addr) == PR_FAILURE) {
-            fprintf(stderr, "PR_Bind failed\n");
-            exit(1);
-        }
-        if (PR_Listen(sock, 5) == PR_FAILURE) {
-            fprintf(stderr, "PR_Listen failed\n");
-            exit(1);
-        }
-    
-        pd[i].fd = sock;
-        pd[i].in_flags = PR_POLL_READ;
-    }
-
-    /* first run the test on the primordial thread */
-    Test();
-
-    /* then run the test on all three kinds of threads */
-    thread = PR_CreateThread(PR_USER_THREAD, ThreadFunc, NULL,
-            PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == thread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(thread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    thread = PR_CreateThread(PR_USER_THREAD, ThreadFunc, NULL,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == thread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(thread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    thread = PR_CreateThread(PR_USER_THREAD, ThreadFunc, NULL,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_BOUND_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == thread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(thread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    for (i = 0; i < POLL_DESC_COUNT; i++) {
-        if (PR_Close(pd[i].fd) == PR_FAILURE) {
-            fprintf(stderr, "PR_Close failed\n");
-            exit(1);
-        }
-    }
-    PR_Cleanup();
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/prselect.c b/libs/js/nsprpub/pr/tests/prselect.c
deleted file mode 100644
index ff6ebdc681..0000000000
--- a/libs/js/nsprpub/pr/tests/prselect.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1997 - Netscape Communications Corporation
-**
-** Name: prselect_err.c
-**
-** Description: tests PR_Select with sockets Error condition functions.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-#include "prttools.h"
-
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prerror.h"
-#include "prnetdb.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Test_Result
-** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**				status of the test case.
-** INPUTS:      PASS/FAIL
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:   Determine what the status is and print accordingly.
-**      
-***********************************************************************/
-
-
-static Test_Result (int result)
-{
-	if (result == PASS)
-		printf ("PASS\n");
-	else
-		printf ("FAIL\n");
-}
-
-static void
-clientThreadFunc(void *arg)
-{
-    PRUint16 port = (PRUint16) arg;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    char buf[128];
-    int i;
-
-    addr.inet.family = AF_INET;
-    addr.inet.port = PR_htons(port);
-    addr.inet.ip = PR_htonl(INADDR_LOOPBACK);
-    PR_snprintf(buf, sizeof(buf), "%hu", port);
-
-    for (i = 0; i < 5; i++) {
-	sock = PR_NewTCPSocket();
-        PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-	PR_Write(sock, buf, sizeof(buf));
-	PR_Close(sock);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRFileDesc *badFD;
-    PRFileDesc *fds0[10], *fds1[10], **fds, **other_fds;
-    PRIntn nfds;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    PR_fd_set readFdSet;
-    char buf[128];
-    PRThread *clientThread;
-    PRInt32 retVal;
-    PRIntn i, j;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Select with sockets.  Timeout, error\n");
-		printf("reporting, and normal operation are tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    printf("%s", buf);
-
-    /* Set up the fd set */
-    PR_FD_ZERO(&readFdSet);
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-
-    /* Testing timeout */
-    if (debug_mode) printf("PR_Select should time out in 5 seconds\n");
-    retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_SecondsToInterval(5));
-    if (retVal != 0) {
-	PR_snprintf(buf, sizeof(buf),
-		"PR_Select should time out and return 0, but it returns %ld\n",
-		retVal);
-	fprintf(stderr, "%s", buf);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-			if (!debug_mode) Test_Result(FAIL);
-	}
-	exit(1);
-    }
-    if (debug_mode) printf("PR_Select timed out.  Test passed.\n\n");
-	else Test_Result(PASS);
-
-    /* Testing bad fd */
-    printf("PR_Select should detect a bad file descriptor\n");
-    if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	exit(1);
-    }
-
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-    PR_FD_SET(badFD, &readFdSet);
-    PR_Close(badFD);  /* make the fd bad */
-    retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_INTERVAL_NO_TIMEOUT);
-    if (retVal != -1 || PR_GetError() != PR_BAD_DESCRIPTOR_ERROR) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Select returns %d\n", retVal);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-	}
-	exit(1);
-    }
-    printf("PR_Select detected a bad fd.  Test passed.\n\n");
-    PR_FD_CLR(badFD, &readFdSet);
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort1,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort2,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
-    }
-
-    printf("Two client threads are created.  Each of them will\n");
-    printf("send data to one of the two ports the server is listening on.\n");
-    printf("The data they send is the port number.  Each of them send\n");
-    printf("the data five times, so you should see ten lines below,\n");
-    printf("interleaved in an arbitrary order.\n");
-
-    /* set up the fd array */
-    fds = fds0;
-    other_fds = fds1;
-    fds[0] = listenSock1;
-    fds[1] = listenSock2;
-    nfds = 2;
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-
-    /* 20 events total */
-    i = 0;
-    while (i < 20) {
-	PRFileDesc **tmp;
-	int nextIndex;
-	int nEvents = 0;
-
-	retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-		PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(retVal != 0);  /* no timeout */
-	if (retVal == -1) {
-	    fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
-		    PR_GetOSError());
-	    exit(1);
-	}
-
-	nextIndex = 2;
-	/* the two listening sockets */
-	for (j = 0; j < 2; j++) {
-	    other_fds[j] = fds[j];
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRFileDesc *sock;
-
-		nEvents++;
-		sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
-		if (sock == NULL) {
-		    fprintf(stderr, "PR_Accept() failed\n");
-		    exit(1);
-		}
-		other_fds[nextIndex] = sock;
-		PR_FD_SET(sock, &readFdSet);
-		nextIndex++;
-	    }
-	    PR_FD_SET(fds[j], &readFdSet);
-	}
-
-	for (j = 2; j < nfds; j++) {
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRInt32 nBytes;
-
-		PR_FD_CLR(fds[j], &readFdSet);
-		nEvents++;
-		nBytes = PR_Read(fds[j], buf, sizeof(buf));
-		if (nBytes == -1) {
-		    fprintf(stderr, "PR_Read() failed\n");
-		    exit(1);
-		}
-		/* Just to be safe */
-		buf[127] = '\0';
-		PR_Close(fds[j]);
-		printf("The server received \"%s\" from a client\n", buf);
-	    } else {
-		PR_FD_SET(fds[j], &readFdSet);
-		other_fds[nextIndex] = fds[j];
-		nextIndex++;
-	    }
-	}
-
-	PR_ASSERT(retVal == nEvents);
-	/* swap */
-	tmp = fds;
-	fds = other_fds;
-	other_fds = tmp;
-	nfds = nextIndex;
-	i += nEvents;
-    }
-
-    printf("All tests finished\n");
-    PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/prttools.h b/libs/js/nsprpub/pr/tests/prttools.h
deleted file mode 100644
index dc38f316a0..0000000000
--- a/libs/js/nsprpub/pr/tests/prttools.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Used in Regress Tool */
-#define NOSTATUS 2
-#define PASS 1
-#define FAIL 0
-
-PRIntn debug_mode=0;
diff --git a/libs/js/nsprpub/pr/tests/randseed.c b/libs/js/nsprpub/pr/tests/randseed.c
deleted file mode 100644
index fc1fbaebd8..0000000000
--- a/libs/js/nsprpub/pr/tests/randseed.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File: rngseed.c
-** Description: 
-** Test NSPR's Random Number Seed generator
-**
-** Initial test: Just make sure it outputs some data.
-** 
-** ... more? ... check some iterations to ensure it is random (no dupes)
-** ... more? ... histogram distribution of random numbers
-*/
-
-#include "plgetopt.h"
-#include "nspr.h" 
-#include "prrng.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
-** Test harness infrastructure
-*/
-PRLogModuleInfo *lm;
-PRLogModuleLevel msgLevel = PR_LOG_NONE;
-PRIntn  debug = 0;
-PRUint32  failed_already = 0;
-/* end Test harness infrastructure */
-
-PRIntn  optRandCount = 30;
-char    buf[40];
-PRSize  bufSize = sizeof(buf);
-PRSize  rSize;
-PRIntn  i;
-
-/*
-** Emit help text for this test
-*/
-static void Help( void )
-{
-    printf("Template: Help(): display your help message(s) here");
-    exit(1);
-} /* end Help() */
-
-static void PrintRand( void *buf, PRIntn size )
-{
-    PRUint32 *rp = buf;
-    PRIntn   i;
-
-    printf("%4.4d--\n", size );
-    while (size > 0 ) {
-        switch( size )  {
-            case 1 :
-                printf("%2.2X\n", *(rp++) );
-                size -= 4;    
-                break;
-            case 2 :
-                printf("%4.4X\n", *(rp++) );
-                size -= 4;    
-                break;
-            case 3 :
-                printf("%6.6X\n", *(rp++) );
-                size -= 4;    
-                break;
-            default:
-                while ( size >= 4) {
-                    PRIntn i = 3;
-                    do {
-                        printf("%8.8X ", *(rp++) );
-                        size -= 4;    
-                    } while( i-- );
-                    i = 3;
-                    printf("\n");
-                }
-                break;
-        } /* end switch() */
-    } /* end while() */
-} /* end PrintRand() */
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    {
-        /*
-        ** Get command line options
-        */
-        PLOptStatus os;
-        PLOptState *opt = PL_CreateOptState(argc, argv, "hdv");
-
-	    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-		    if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug */
-                debug = 1;
-			    msgLevel = PR_LOG_ERROR;
-                break;
-            case 'v':  /* verbose mode */
-			    msgLevel = PR_LOG_DEBUG;
-                break;
-            case 'h':  /* help message */
-			    Help();
-                break;
-             default:
-                break;
-            }
-        }
-	    PL_DestroyOptState(opt);
-    }
-
-    lm = PR_NewLogModule("Test");       /* Initialize logging */
-    for ( i = 0; i < optRandCount ; i++ ) {
-        memset( buf, 0, bufSize );
-        rSize = PR_GetRandomNoise( buf, bufSize );
-        if (!rSize) {
-            fprintf(stderr, "Not implemented\n" );
-            failed_already = PR_TRUE;
-            break;
-        }
-        if (debug) PrintRand( buf, rSize );
-    }
-
-    if (debug) printf("%s\n", (failed_already)? "FAIL" : "PASS");
-    return( (failed_already == PR_TRUE )? 1 : 0 );
-}  /* main() */
-/* end template.c */
-
diff --git a/libs/js/nsprpub/pr/tests/ranfile.c b/libs/js/nsprpub/pr/tests/ranfile.c
deleted file mode 100644
index a024bcd8b1..0000000000
--- a/libs/js/nsprpub/pr/tests/ranfile.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Contact:     AOF<freier@netscape.com>
-**
-** Name: ranfile.c
-**
-** Description: Test to hammer on various components of NSPR
-** Modification History:
-** 20-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prthread.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "prmem.h"
-#include "prinrval.h"
-#include "prio.h"
-
-#include <string.h>
-#include <stdio.h>
-
-static PRIntn debug_mode = 0;
-static PRIntn failed_already=0;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-typedef enum {sg_go, sg_stop, sg_done} Action;
-typedef enum {sg_okay, sg_open, sg_close, sg_delete, sg_write, sg_seek} Problem;
-
-typedef struct Hammer_s {
-    PRLock *ml;
-    PRCondVar *cv;
-    PRUint32 id;
-    PRUint32 limit;
-    PRUint32 writes;
-    PRThread *thread;
-    PRIntervalTime timein;
-    Action action;
-    Problem problem;
-} Hammer_t;
-
-#define DEFAULT_LIMIT		10
-#define DEFAULT_THREADS		2
-#define DEFAULT_LOOPS		1
-
-static PRInt32 pageSize = 1024;
-static const char* baseName = "./";
-static const char *programName = "Random File";
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Random
-** DESCRIPTION:
-**   Generate a pseudo-random number
-** INPUTS:      None
-** OUTPUTS:     None
-** RETURN:      A pseudo-random unsigned number, 32-bits wide
-** SIDE EFFECTS:
-**      Updates random seed (a static)
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:
-**      Uses the current interval timer value, promoted to a 64 bit
-**      float as a multiplier for a static residue (which begins
-**      as an uninitialized variable). The result is bits [16..48)
-**      of the product. Seed is then updated with the return value
-**      promoted to a float-64.
-***********************************************************************/
-static PRUint32 Random(void)
-{
-    PRUint32 rv;
-    PRUint64 shift;
-    static PRFloat64 seed = 0x58a9382;  /* Just make sure it isn't 0! */
-    PRFloat64 random = seed * (PRFloat64)PR_IntervalNow();
-    LL_USHR(shift, *((PRUint64*)&random), 16);
-    LL_L2UI(rv, shift);
-    seed = (PRFloat64)rv;
-    return rv;
-}  /* Random */
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Thread
-** DESCRIPTION:
-**   Hammer on the file I/O system
-** INPUTS:      A pointer to the thread's private data
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      Creates, accesses and deletes a file
-** RESTRICTIONS:
-**      (Currently) must have file create permission in "/usr/tmp".
-** MEMORY:      NA
-** ALGORITHM:
-**      This function is a root of a thread
-**      1) Creates a (hopefully) unique file in /usr/tmp/
-**      2) Writes a zero to a random number of sequential pages
-**      3) Closes the file
-**      4) Reopens the file
-**      5) Seeks to a random page within the file
-**      6) Writes a one byte on that page
-**      7) Repeat steps [5..6] for each page in the file
-**      8) Close and delete the file
-**      9) Repeat steps [1..8] until told to stop
-**     10) Notify complete and return
-***********************************************************************/
-static void PR_CALLBACK Thread(void *arg)
-{
-    PRUint32 index;
-    char filename[30];
-    const char zero = 0;
-    PRFileDesc *file = NULL;
-    PRStatus rv = PR_SUCCESS;
-    Hammer_t *cd = (Hammer_t*)arg;
-
-    (void)sprintf(filename, "%ssg%04ld.dat", baseName, cd->id);
-
-    if (debug_mode) printf("Starting work on %s\n", filename);
-
-    while (PR_TRUE)
-    {
-        PRUint32 bytes;
-        PRUint32 minor = (Random() % cd->limit) + 1;
-        PRUint32 random = (Random() % cd->limit) + 1;
-        PRUint32 pages = (Random() % cd->limit) + 10;
-        while (minor-- > 0)
-        {
-            cd->problem = sg_okay;
-            if (cd->action != sg_go) goto finished;
-            cd->problem = sg_open;
-            file = PR_Open(filename, PR_RDWR|PR_CREATE_FILE, 0666);
-            if (file == NULL) goto finished;
-            for (index = 0; index < pages; index++)
-            {
-                cd->problem = sg_okay;
-                if (cd->action != sg_go) goto close;
-                cd->problem = sg_seek;
-                bytes = PR_Seek(file, pageSize * index, PR_SEEK_SET);
-                if (bytes != pageSize * index) goto close;
-                cd->problem = sg_write;
-                bytes = PR_Write(file, &zero, sizeof(zero));
-                if (bytes <= 0) goto close;
-                cd->writes += 1;
-            }
-            cd->problem = sg_close;
-            rv = PR_Close(file);
-            if (rv != PR_SUCCESS) goto purge;
-
-            cd->problem = sg_okay;
-            if (cd->action != sg_go) goto purge;
-
-            cd->problem = sg_open;
-            file = PR_Open(filename, PR_RDWR, 0666);
-            for (index = 0; index < pages; index++)
-            {
-                cd->problem = sg_okay;
-                if (cd->action != sg_go) goto close;
-                cd->problem = sg_seek;
-                bytes = PR_Seek(file, pageSize * index, PR_SEEK_SET);
-                if (bytes != pageSize * index) goto close;
-                cd->problem = sg_write;
-                bytes = PR_Write(file, &zero, sizeof(zero));
-                if (bytes <= 0) goto close;
-                cd->writes += 1;
-                random = (random + 511) % pages;
-            }
-            cd->problem = sg_close;
-            rv = PR_Close(file);
-            if (rv != PR_SUCCESS) goto purge;
-            cd->problem = sg_delete;
-            rv = PR_Delete(filename);
-            if (rv != PR_SUCCESS) goto finished;
-       }
-    }
-
-close:
-    (void)PR_Close(file);
-purge:
-    (void)PR_Delete(filename);
-finished:
-    PR_Lock(cd->ml);
-    cd->action = sg_done;
-    PR_NotifyCondVar(cd->cv);
-    PR_Unlock(cd->ml);
-
-    if (debug_mode) printf("Ending work on %s\n", filename);
-
-    return;
-}  /* Thread */
-
-static Hammer_t hammer[100];
-static PRCondVar *cv;
-/***********************************************************************
-** PRIVATE FUNCTION:    main
-** DESCRIPTION:
-**   Hammer on the file I/O system
-** INPUTS:      The usual argc and argv
-**              argv[0] - program name (not used)
-**              argv[1] - the number of times to execute the major loop
-**              argv[2] - the number of threads to toss into the batch
-**              argv[3] - the clipping number applied to randoms
-**              default values: loops = 2, threads = 10, limit = 57
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      Creates, accesses and deletes lots of files
-** RESTRICTIONS:
-**      (Currently) must have file create permission in "/usr/tmp".
-** MEMORY:      NA
-** ALGORITHM:
-**      1) Fork a "Thread()"
-**      2) Wait for 'interleave' seconds
-**      3) For [0..'threads') repeat [1..2]
-**      4) Mark all objects to stop
-**      5) Collect the threads, accumulating the results
-**      6) For [0..'loops') repeat [1..5]
-**      7) Print accumulated results and exit
-**
-**      Characteristic output (from IRIX)
-**          Random File: Using loops = 2, threads = 10, limit = 57
-**          Random File: [min [avg] max] writes/sec average
-***********************************************************************/
-int main (int argc,      char   *argv[])
-{
-    PRLock *ml;
-    PRUint32 id = 0;
-    int active, poll;
-    PRIntervalTime interleave;
-    PRIntervalTime duration = 0;
-    int limit = 0, loops = 0, threads = 0, times;
-    PRUint32 writes, writesMin = 0x7fffffff, writesTot = 0, durationTot = 0, writesMax = 0;
-
-    const char *where[] = {"okay", "open", "close", "delete", "write", "seek"};
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "Gdl:t:i:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'G':  /* global threads */
-			thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'l':  /* limiting number */
-			limit = atoi(opt->value);
-            break;
-        case 't':  /* number of threads */
-			threads = atoi(opt->value);
-            break;
-        case 'i':  /* iteration counter */
-			loops = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    interleave = PR_SecondsToInterval(10);
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("ranfile.log");
-	debug_mode = 1;
-#endif
-
-    ml = PR_NewLock();
-    cv = PR_NewCondVar(ml);
-
-    if (loops == 0) loops = DEFAULT_LOOPS;
-    if (limit == 0) limit = DEFAULT_LIMIT;
-    if (threads == 0) threads = DEFAULT_THREADS;
-
-    if (debug_mode) printf(
-        "%s: Using loops = %d, threads = %d, limit = %d and %s threads\n",
-        programName, loops, threads, limit,
-        (thread_scope == PR_LOCAL_THREAD) ? "LOCAL" : "GLOBAL");
-
-    for (times = 0; times < loops; ++times)
-    {
-        if (debug_mode) printf("%s: Setting concurrency level to %d\n", programName, times + 1);
-        PR_SetConcurrency(times + 1);
-        for (active = 0; active < threads; active++)
-        {
-            hammer[active].ml = ml;
-            hammer[active].cv = cv;
-            hammer[active].id = id++;
-            hammer[active].writes = 0;
-            hammer[active].action = sg_go;
-            hammer[active].problem = sg_okay;
-            hammer[active].limit = (Random() % limit) + 1;
-            hammer[active].timein = PR_IntervalNow();
-            hammer[active].thread = PR_CreateThread(
-                PR_USER_THREAD, Thread, &hammer[active],
-                PR_GetThreadPriority(PR_GetCurrentThread()),
-                thread_scope, PR_JOINABLE_THREAD, 0);
-
-            PR_Lock(ml);
-            PR_WaitCondVar(cv, interleave);  /* start new ones slowly */
-            PR_Unlock(ml);
-        }
-
-        /*
-         * The last thread started has had the opportunity to run for
-         * 'interleave' seconds. Now gather them all back in.
-         */
-        PR_Lock(ml);
-        for (poll = 0; poll < threads; poll++)
-        {
-            if (hammer[poll].action == sg_go)  /* don't overwrite done */
-                hammer[poll].action = sg_stop;  /* ask him to stop */
-        }
-        PR_Unlock(ml);
-
-        while (active > 0)
-        {
-            for (poll = 0; poll < threads; poll++)
-            {
-                PR_Lock(ml);
-                while (hammer[poll].action < sg_done)
-                    PR_WaitCondVar(cv, PR_INTERVAL_NO_TIMEOUT);
-                PR_Unlock(ml);
-
-                active -= 1;  /* this is another one down */
-                (void)PR_JoinThread(hammer[poll].thread);
-                hammer[poll].thread = NULL;
-                if (hammer[poll].problem == sg_okay)
-                {
-                    duration = PR_IntervalToMilliseconds(
-                        PR_IntervalNow() - hammer[poll].timein);
-                    writes = hammer[poll].writes * 1000 / duration;
-                    if (writes < writesMin) 
-                        writesMin = writes;
-                    if (writes > writesMax) 
-                        writesMax = writes;
-                    writesTot += hammer[poll].writes;
-                    durationTot += duration;
-                }
-                else
-                    if (debug_mode) printf(
-                        "%s: test failed %s after %ld seconds\n",
-                        programName, where[hammer[poll].problem], duration);
-					else failed_already=1;
-            }
-        }
-    }
-    if (debug_mode) printf(
-        "%s: [%ld [%ld] %ld] writes/sec average\n",
-        programName, writesMin, writesTot * 1000 / durationTot, writesMax);
-
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-
-	if (failed_already) 
-	{
-	    printf("FAIL\n");
-		return 1;
-	}
-    else
-    {
-        printf("PASS\n");
-		return 0;
-    }
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/rmdir.c b/libs/js/nsprpub/pr/tests/rmdir.c
deleted file mode 100644
index 81689e8d8d..0000000000
--- a/libs/js/nsprpub/pr/tests/rmdir.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        rmdir.c
-** Description: Demonstrate bugzilla 80884. 
-**
-** after fix to unix_errors.c, message should report correct 
-** failure of PR_Rmdir().
-**
-**
-**
-*/
-
-#include <prio.h>
-#include <stdio.h>
-#include <prerror.h>
-#include <prlog.h>
-#include "plgetopt.h"
-
-#define DIRNAME "xxxBug80884/"
-#define FILENAME "file80883"
-
-PRBool  failed_already = PR_FALSE;
-PRBool	debug_mode = PR_FALSE;
-
-PRLogModuleInfo     *lm;
-
-/*
-** Help() -- print Usage information
-*/
-static void Help( void )  {
-    fprintf(stderr, "template usage:\n"
-                    "\t-d     debug mode\n"
-                    );
-} /* --- end Help() */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dh");
-    PRFileDesc* fd;
-    PRErrorCode err;
-
-    /* parse command line options */
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    lm = PR_NewLogModule( "testcase" );
-
-    (void) PR_MkDir( DIRNAME, 0777);
-    fd = PR_Open( DIRNAME FILENAME, PR_CREATE_FILE|PR_RDWR, 0666);
-    if (fd == 0) {
-        PRErrorCode err = PR_GetError();
-        fprintf(stderr, "create file fails: %d: %s\n", err,
-            PR_ErrorToString(err, PR_LANGUAGE_I_DEFAULT));
-        failed_already = PR_TRUE;
-        goto Finished;
-    }
- 
-    PR_Close(fd);
-
-    if (PR_RmDir( DIRNAME ) == PR_SUCCESS) {
-        fprintf(stderr, "remove directory succeeds\n");
-        failed_already = PR_TRUE;
-        goto Finished;
-    }
- 
-    err = PR_GetError();
-    fprintf(stderr, "remove directory fails with: %d: %s\n", err,
-        PR_ErrorToString(err, PR_LANGUAGE_I_DEFAULT));
-
-    (void) PR_Delete( DIRNAME FILENAME);
-    (void) PR_RmDir( DIRNAME );
-
-    return 0;
-
-Finished:
-    if ( debug_mode ) printf("%s\n", ( failed_already ) ? "FAILED" : "PASS" );
-    return( (failed_already)? 1 : 0 );
-}  /* --- end main() */
-/* --- end template.c */
diff --git a/libs/js/nsprpub/pr/tests/runtests.ksh b/libs/js/nsprpub/pr/tests/runtests.ksh
deleted file mode 100755
index 3af86d394c..0000000000
--- a/libs/js/nsprpub/pr/tests/runtests.ksh
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/bin/ksh
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# tests.ksh
-#	korn shell script for nspr tests
-#
-
-SYSTEM_INFO=`uname -a`
-OS_ARCH=`uname -s`
-if [ $OS_ARCH = "Windows_NT" ] || [ $OS_ARCH = "OS/2" ]
-then
-	NULL_DEVICE=nul
-else
-	NULL_DEVICE=/dev/null
-fi
-
-#
-# Irrevelant tests
-#
-#bug1test 	- used to demonstrate a bug on NT
-#bigfile2   - requires 4Gig file creation. See BugZilla #5451
-#bigfile3   - requires 4Gig file creation. See BugZilla #5451
-#dbmalloc	- obsolete; originally for testing debug version of nspr's malloc
-#dbmalloc1	- obsolete; originally for testing debug version of nspr's malloc
-#depend		- obsolete; used to test a initial spec for library dependencies
-#dceemu		- used to tests special functions in NSPR for DCE emulation
-#ipv6		- IPV6 not in use by NSPR clients
-#mbcs       - tests use of multi-byte charset for filenames. See BugZilla #25140
-#sproc_ch	- obsolete; sproc-based tests for Irix
-#sproc_p	- obsolete; sproc-based tests for Irix
-#io_timeoutk - obsolete; subsumed in io_timeout
-#io_timeoutu - obsolete; subsumed in io_timeout
-#prftest1	- obsolete; subsumed by prftest
-#prftest2	- obsolete; subsumed by prftest
-#prselect	- obsolete; PR_Select is obsolete
-#select2	- obsolete; PR_Select is obsolete
-#sem		- obsolete; PRSemaphore is obsolete
-#stat		- for OS2?
-#suspend	- private interfaces PR_SuspendAll, PR_ResumeAll, etc..
-#thruput	- needs to be run manually as client/server
-#time		- used to measure time with native calls and nspr calls
-#tmoacc		- should be run with tmocon
-#tmocon		- should be run with tmoacc
-#op_noacc	- limited use
-#yield		- limited use for PR_Yield
-
-#
-# Tests not run (but should)
-#
-
-#forktest (failed on IRIX)
-#nbconn - fails on some platforms 
-#poll_er - fails on some platforms? limited use?
-#prpoll -  the bad-FD test needs to be moved to a different test
-#sleep	-  specific to OS/2
-
-LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
-
-#
-# Tests run on all platforms
-#
-
-TESTS="
-accept
-acceptread
-acceptreademu
-affinity
-alarm
-anonfm
-atomic
-attach
-bigfile
-cleanup
-cltsrv
-concur
-cvar
-cvar2
-dlltest
-dtoa
-errcodes
-exit
-fdcach
-fileio
-foreign
-formattm
-fsync
-gethost
-getproto
-i2l
-initclk
-inrval
-instrumt
-intrio
-intrupt
-io_timeout
-ioconthr
-join
-joinkk
-joinku
-joinuk
-joinuu
-layer
-lazyinit
-libfilename
-lltest
-lock
-lockfile
-logger
-many_cv
-multiwait
-nameshm1
-nblayer
-nonblock
-ntioto
-ntoh
-op_2long
-op_excl
-op_filnf
-op_filok
-op_nofil
-parent
-peek
-perf
-pipeping
-pipeping2
-pipeself
-poll_nm
-poll_to
-pollable
-prftest
-primblok
-provider
-prpollml
-ranfile
-randseed
-rwlocktest
-sel_spd
-selct_er
-selct_nm
-selct_to
-selintr
-sema
-semaerr
-semaping
-sendzlf
-server_test
-servr_kk
-servr_uk
-servr_ku
-servr_uu
-short_thread
-sigpipe
-socket
-sockopt
-sockping
-sprintf
-stack
-stdio
-str2addr
-strod
-switch
-system
-testbit
-testfile
-threads
-timemac
-timetest
-tpd
-udpsrv
-vercheck
-version
-writev
-xnotify
-zerolen"
-
-rval=0
-
-
-#
-# When set, value of the environment variable TEST_TIMEOUT is the maximum
-# time (secs) allowed for a test program beyond which it is terminated.
-# If TEST_TIMEOUT is not set or if it's value is 0, then test programs
-# don't timeout.
-#
-# Running runtests.ksh under MKS toolkit on NT, 95, 98 does not cause
-# timeout detection correctly. For these platforms, do not attempt timeout
-# test. (lth).
-#
-#
-
-OS_PLATFORM=`uname`
-OBJDIR=`basename $PWD`
-echo "\nNSPR Test Results - $OBJDIR\n"
-echo "BEGIN\t\t\t`date`"
-echo "NSPR_TEST_LOGFILE\t${LOGFILE}\n"
-echo "Test\t\t\tResult\n"
-if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
-	for prog in $TESTS
-	do
-		echo "$prog\c"
-		echo "\nBEGIN TEST: $prog\n" >> ${LOGFILE} 2>&1
-		./$prog >> ${LOGFILE} 2>&1
-		if [ 0 = $? ] ; then
-			echo "\t\t\tPassed";
-		else
-			echo "\t\t\tFAILED";
-			rval=1
-		fi;
-		echo "\nEND TEST: $prog\n" >> ${LOGFILE} 2>&1
-	done
-else
-	for prog in $TESTS
-	do
-		echo "$prog\c"
-		echo "\nBEGIN TEST: $prog\n" >> ${LOGFILE} 2>&1
-		export test_rval
-		./$prog >> ${LOGFILE} 2>&1 &
-		test_pid=$!
-		sleep_pid=0
-		if [ "$TEST_TIMEOUT" -gt 0 ]
-		then
-		(sleep  $TEST_TIMEOUT; kill $test_pid >/dev/null 2>&1 ) &
-		sleep_pid=$!
-		fi
-		wait $test_pid
-		test_rval=$?
-		[ $sleep_pid -eq 0 ] || kill $sleep_pid >/dev/null 2>&1
-		if [ 0 = $test_rval ] ; then
-			echo "\t\t\tPassed";
-		else
-			echo "\t\t\tFAILED";
-			rval=1
-		fi;
-		echo "\nEND TEST: $prog\n" >> ${LOGFILE} 2>&1
-	done
-fi;
-
-echo "END\t\t\t`date`"
-exit $rval
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libs/js/nsprpub/pr/tests/runtests.sh b/libs/js/nsprpub/pr/tests/runtests.sh
deleted file mode 100755
index bb4a65eba4..0000000000
--- a/libs/js/nsprpub/pr/tests/runtests.sh
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/bin/sh
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# tests.ksh
-#	korn shell script for nspr tests
-#
-
-SYSTEM_INFO=`uname -a`
-OS_ARCH=`uname -s`
-if [ $OS_ARCH = "Windows_NT" ] || [ $OS_ARCH = "OS/2" ]
-then
-	NULL_DEVICE=nul
-else
-	NULL_DEVICE=/dev/null
-fi
-
-#
-# Irrevelant tests
-#
-#bug1test 	- used to demonstrate a bug on NT
-#bigfile2   - requires 4Gig file creation. See BugZilla #5451
-#bigfile3   - requires 4Gig file creation. See BugZilla #5451
-#dbmalloc	- obsolete; originally for testing debug version of nspr's malloc
-#dbmalloc1	- obsolete; originally for testing debug version of nspr's malloc
-#depend		- obsolete; used to test a initial spec for library dependencies
-#dceemu		- used to tests special functions in NSPR for DCE emulation
-#ipv6		- IPV6 not in use by NSPR clients
-#mbcs       - tests use of multi-byte charset for filenames. See BugZilla #25140
-#sproc_ch	- obsolete; sproc-based tests for Irix
-#sproc_p	- obsolete; sproc-based tests for Irix
-#io_timeoutk - obsolete; subsumed in io_timeout
-#io_timeoutu - obsolete; subsumed in io_timeout
-#prftest1	- obsolete; subsumed by prftest
-#prftest2	- obsolete; subsumed by prftest
-#prselect	- obsolete; PR_Select is obsolete
-#select2	- obsolete; PR_Select is obsolete
-#sem		- obsolete; PRSemaphore is obsolete
-#stat		- for OS2?
-#suspend	- private interfaces PR_SuspendAll, PR_ResumeAll, etc..
-#thruput	- needs to be run manually as client/server
-#time		- used to measure time with native calls and nspr calls
-#tmoacc		- should be run with tmocon
-#tmocon		- should be run with tmoacc
-#op_noacc	- limited use
-#yield		- limited use for PR_Yield
-
-#
-# Tests not run (but should)
-#
-
-#forktest (failed on IRIX)
-#nbconn - fails on some platforms 
-#poll_er - fails on some platforms? limited use?
-#prpoll -  the bad-FD test needs to be moved to a different test
-#sleep	-  specific to OS/2
-
-LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
-
-#
-# Tests run on all platforms
-#
-
-TESTS="
-accept
-acceptread
-acceptreademu
-affinity
-alarm
-anonfm
-atomic
-attach
-bigfile
-cleanup
-cltsrv
-concur
-cvar
-cvar2
-dlltest
-dtoa
-errcodes
-exit
-fdcach
-fileio
-foreign
-formattm
-fsync
-gethost
-getproto
-i2l
-initclk
-inrval
-instrumt
-intrio
-intrupt
-io_timeout
-ioconthr
-join
-joinkk
-joinku
-joinuk
-joinuu
-layer
-lazyinit
-libfilename
-lltest
-lock
-lockfile
-logger
-many_cv
-multiwait
-nameshm1
-nblayer
-nonblock
-ntioto
-ntoh
-op_2long
-op_excl
-op_filnf
-op_filok
-op_nofil
-parent
-peek
-perf
-pipeping
-pipeping2
-pipeself
-poll_nm
-poll_to
-pollable
-prftest
-primblok
-provider
-prpollml
-ranfile
-randseed
-rwlocktest
-sel_spd
-selct_er
-selct_nm
-selct_to
-selintr
-sema
-semaerr
-semaping
-sendzlf
-server_test
-servr_kk
-servr_uk
-servr_ku
-servr_uu
-short_thread
-sigpipe
-socket
-sockopt
-sockping
-sprintf
-stack
-stdio
-str2addr
-strod
-switch
-system
-testbit
-testfile
-threads
-timemac
-timetest
-tpd
-udpsrv
-vercheck
-version
-writev
-xnotify
-zerolen"
-
-rval=0
-
-
-#
-# When set, value of the environment variable TEST_TIMEOUT is the maximum
-# time (secs) allowed for a test program beyond which it is terminated.
-# If TEST_TIMEOUT is not set or if it's value is 0, then test programs
-# don't timeout.
-#
-# Running runtests.ksh under MKS toolkit on NT, 95, 98 does not cause
-# timeout detection correctly. For these platforms, do not attempt timeout
-# test. (lth).
-#
-#
-
-OS_PLATFORM=`uname`
-OBJDIR=`basename $PWD`
-printf "\nNSPR Test Results - $OBJDIR\n\n"
-printf "BEGIN\t\t\t`date`\n"
-printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n"
-printf "Test\t\t\tResult\n\n"
-if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
-	for prog in $TESTS
-	do
-		printf "$prog"
-		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
-		./$prog >> ${LOGFILE} 2>&1
-		if [ 0 = $? ] ; then
-			printf "\t\t\tPassed\n";
-		else
-			printf "\t\t\tFAILED\n";
-			rval=1
-		fi;
-		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
-	done
-else
-	for prog in $TESTS
-	do
-		printf "$prog"
-		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
-		export test_rval
-		./$prog >> ${LOGFILE} 2>&1 &
-		test_pid=$!
-		sleep_pid=0
-		if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0
-		then
-		(sleep  $TEST_TIMEOUT; kill $test_pid >/dev/null 2>&1 ) &
-		sleep_pid=$!
-		fi
-		wait $test_pid
-		test_rval=$?
-		[ $sleep_pid -eq 0 ] || kill $sleep_pid >/dev/null 2>&1
-		if [ 0 = $test_rval ] ; then
-			printf "\t\t\tPassed\n";
-		else
-			printf "\t\t\tFAILED\n";
-			rval=1
-		fi;
-		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
-	done
-fi;
-
-printf "END\t\t\t`date`\n"
-exit $rval
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libs/js/nsprpub/pr/tests/runy2ktests.ksh b/libs/js/nsprpub/pr/tests/runy2ktests.ksh
deleted file mode 100644
index e7a325019d..0000000000
--- a/libs/js/nsprpub/pr/tests/runy2ktests.ksh
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/bin/ksh
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1999-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# runy2ktests.ksh
-#	Set system clock to Y2K dates of interest and run the Y2K tests.
-#	Needs root/administrator privilege
-#
-# WARNING: Because this script needs to be run with root/administrator
-#	privilege, thorough understanding of the script and extreme
-#	caution are urged.
-#
-
-#
-# SECTION I
-#	Define variables
-#
-
-SYSTEM_INFO=`uname -a`
-OS_ARCH=`uname -s`
-if [ $OS_ARCH = "Windows_NT" ] || [ $OS_ARCH = "Windows_95" ]
-then
-	NULL_DEVICE=nul
-else
-	NULL_DEVICE=/dev/null
-fi
-
-#
-# Test dates for NSPR Y2K tests
-#
-Y2KDATES="	123123591998.55
-			090923591999.55
-			123123591999.55
-			022823592000.55
-			022923592000.55
-			123123592000.55"
-
-Y2KDATES_AIX="	12312359.5598
-				09092359.5599
-				12312359.5599
-				02282359.5500
-				02292359.5500
-				12312359.5500"
-
-Y2KDATES_HPUX="	123123591998
-				090923591999
-				123123591999
-				022823592000
-				022923592000
-				123123592000"
-
-Y2KDATES_MKS="	1231235998.55
-				0909235999.55
-				1231235999.55
-				0228235900.55
-				0229235900.55
-				1231235900.55"
-
-#
-# NSPR Y2K tests
-#
-Y2KTESTS="
-y2k		\n
-y2ktmo	\n
-y2k		\n
-../runtests.ksh"
-
-Y2KTESTS_HPUX="
-y2k			\n
-y2ktmo -l 60\n
-y2k			\n
-../runtests.ksh"
-
-#
-# SECTION II
-#	Define functions
-#
-
-save_date()
-{
-	case $OS_ARCH in
-	AIX)
-		SAVED_DATE=`date "+%m%d%H%M.%S%y"`
-	;;
-	HP-UX)
-		SAVED_DATE=`date "+%m%d%H%M%Y"`
-	;;
-	Windows_NT)
-		SAVED_DATE=`date "+%m%d%H%M%y.%S"`
-	;;
-	Windows_95)
-		SAVED_DATE=`date "+%m%d%H%M%y.%S"`
-	;;
-	*)
-		SAVED_DATE=`date "+%m%d%H%M%Y.%S"`
-	;;
-	esac
-}
-
-set_date()
-{
-	case $OS_ARCH in
-	Windows_NT)
-#
-# The date command in MKS Toolkit releases 5.1 and 5.2
-# uses the current DST status for the date we want to
-# set the system clock to.  However, the DST status for
-# that date may be different from the current DST status.
-# We can work around this problem by invoking the date
-# command with the same date twice.
-#
-		date "$1" > $NULL_DEVICE
-		date "$1" > $NULL_DEVICE
-	;;
-	*)
-		date "$1" > $NULL_DEVICE
-	;;
-	esac
-}
-
-restore_date()
-{
-	set_date "$SAVED_DATE"
-}
-
-savedate()
-{
-	case $OS_ARCH in
-	AIX)
-		SAVED_DATE=`date "+%m%d%H%M.%S%y"`
-	;;
-	HP-UX)
-		SAVED_DATE=`date "+%m%d%H%M%Y"`
-	;;
-	Windows_NT)
-		SAVED_DATE=`date "+%m%d%H%M%y.%S"`
-	;;
-	Windows_95)
-		SAVED_DATE=`date "+%m%d%H%M%y.%S"`
-	;;
-	*)
-		SAVED_DATE=`date "+%m%d%H%M%Y.%S"`
-	;;
-	esac
-}
-
-set_y2k_test_parameters()
-{
-#
-# set dates
-#
-	case $OS_ARCH in
-	AIX)
-		DATES=$Y2KDATES_AIX
-	;;
-	HP-UX)
-		DATES=$Y2KDATES_HPUX
-	;;
-	Windows_NT)
-		DATES=$Y2KDATES_MKS
-	;;
-	Windows_95)
-		DATES=$Y2KDATES_MKS
-	;;
-	*)
-		DATES=$Y2KDATES
-	;;
-	esac
-
-#
-# set tests
-#
-	case $OS_ARCH in
-	HP-UX)
-		TESTS=$Y2KTESTS_HPUX
-	;;
-	*)
-		TESTS=$Y2KTESTS
-	;;
-	esac
-}
-
-#
-# runtests:
-#	-	runs each test in $TESTS after setting the
-#		system clock to each date in $DATES
-#
-
-runtests()
-{
-for newdate in ${DATES}
-do
-	set_date $newdate
-	echo $newdate
-	echo "BEGIN\t\t\t`date`"
-	echo "Date\t\t\t\t\tTest\t\t\tResult"
-	echo $TESTS | while read prog
-	do
-		echo "`date`\t\t\c"
-		echo "$prog\c"
-		./$prog >> ${LOGFILE} 2>&1
-		if [ 0 = $? ] ; then
-			echo "\t\t\tPassed";
-		else
-			echo "\t\t\tFAILED";
-		fi;
-	done
-	echo "END\t\t\t`date`\n"
-done
-
-}
-
-#
-# SECTION III
-#	Run tests
-#
-
-LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
-OBJDIR=`basename $PWD`
-echo "\nNSPR Year 2000 Test Results - $OBJDIR\n"
-echo "SYSTEM:\t\t\t${SYSTEM_INFO}"
-echo "NSPR_TEST_LOGFILE:\t${LOGFILE}\n"
-
-
-save_date
-
-#
-# Run NSPR Y2k and standard tests
-#
-
-set_y2k_test_parameters
-runtests
-
-restore_date
diff --git a/libs/js/nsprpub/pr/tests/rwlocktest.c b/libs/js/nsprpub/pr/tests/rwlocktest.c
deleted file mode 100644
index b7c4f1e879..0000000000
--- a/libs/js/nsprpub/pr/tests/rwlocktest.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- *
- * RWLock tests
- *
- *	Several threads are created to access and modify data arrays using
- * 	PRRWLocks for synchronization. Two data arrays, array_A and array_B, are
- *	initialized with random data and a third array, array_C, is initialized
- *	with the sum of the first 2 arrays.
- *
- *	Each one of the threads acquires a read lock to verify that the sum of
- *	the arrays A and B is equal to array C, and acquires a write lock to
- *	consistently update arrays A and B so that their is equal to array C.
- *		
- */
- 
-#include "nspr.h"
-#include "plgetopt.h"
-#include "prrwlock.h"
-
-static int _debug_on;
-static void rwtest(void *args);
-static PRInt32 *array_A,*array_B,*array_C;
-static void update_array(void);
-static void check_array(void);
-
-typedef struct thread_args {
-	PRRWLock	*rwlock;
-	PRInt32		loop_cnt;
-} thread_args;
-
-PRFileDesc  *output;
-PRFileDesc  *errhandle;
-
-#define	DEFAULT_THREAD_CNT	4
-#define	DEFAULT_LOOP_CNT	100
-#define	TEST_ARRAY_SIZE		100
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRInt32 cnt;
-	PRStatus rc;
-	PRInt32 i;
-
-	PRInt32 thread_cnt = DEFAULT_THREAD_CNT;
-	PRInt32 loop_cnt = DEFAULT_LOOP_CNT;
-	PRThread **threads;
-	thread_args *params;
-	PRRWLock	*rwlock1;
-
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:c:");
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			_debug_on = 1;
-            break;
-        case 't':  /* thread count */
-            thread_cnt = atoi(opt->value);
-            break;
-        case 'c':  /* loop count */
-            loop_cnt = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-	PR_SetConcurrency(4);
-
-    output = PR_GetSpecialFD(PR_StandardOutput);
-    errhandle = PR_GetSpecialFD(PR_StandardError);
-
-	rwlock1 = PR_NewRWLock(0,"Lock 1");
-	if (rwlock1 == NULL) {
-		PR_fprintf(errhandle, "PR_NewRWLock failed - error %d\n",
-								PR_GetError());
-		return 1;
-	}
-
-	threads = (PRThread**) PR_CALLOC(sizeof(PRThread*) * thread_cnt);
-	params = (thread_args *) PR_CALLOC(sizeof(thread_args) * thread_cnt);
-
-	/*
-	 * allocate and initialize data arrays
-	 */
-	array_A =(PRInt32 *) PR_MALLOC(sizeof(PRInt32) * TEST_ARRAY_SIZE);
-	array_B =(PRInt32 *) PR_MALLOC(sizeof(PRInt32) * TEST_ARRAY_SIZE);
-	array_C =(PRInt32 *) PR_MALLOC(sizeof(PRInt32) * TEST_ARRAY_SIZE);
-	cnt = 0;
-	for (i=0; i < TEST_ARRAY_SIZE;i++) {
-		array_A[i] = cnt++;
-		array_B[i] = cnt++;
-		array_C[i] = array_A[i] + array_B[i];
-	}
-
-	if (_debug_on)
-		PR_fprintf(output,"%s: thread_cnt = %d loop_cnt = %d\n", argv[0],
-							thread_cnt, loop_cnt);
-	for(cnt = 0; cnt < thread_cnt; cnt++) {
-		PRThreadScope scope;
-
-		params[cnt].rwlock = rwlock1;
-		params[cnt].loop_cnt = loop_cnt;
-
-		/*
-		 * create LOCAL and GLOBAL threads alternately
-		 */
-		if (cnt & 1)
-			scope = PR_LOCAL_THREAD;
-		else
-			scope = PR_GLOBAL_THREAD;
-
-		threads[cnt] = PR_CreateThread(PR_USER_THREAD,
-						  rwtest, &params[cnt],
-						  PR_PRIORITY_NORMAL,
-						  scope,
-						  PR_JOINABLE_THREAD,
-						  0);
-		if (threads[cnt] == NULL) {
-			PR_fprintf(errhandle, "PR_CreateThread failed - error %d\n",
-								PR_GetError());
-			PR_ProcessExit(2);
-		}
-		if (_debug_on)
-			PR_fprintf(output,"%s: created thread = 0x%x\n", argv[0],
-										threads[cnt]);
-	}
-
-	for(cnt = 0; cnt < thread_cnt; cnt++) {
-    	rc = PR_JoinThread(threads[cnt]);
-		PR_ASSERT(rc == PR_SUCCESS);
-
-	}
-
-	PR_DELETE(threads);
-	PR_DELETE(params);
-
-	PR_DELETE(array_A);	
-	PR_DELETE(array_B);	
-	PR_DELETE(array_C);	
-
-	PR_DestroyRWLock(rwlock1);
-
-	
-	printf("PASS\n");
-	return 0;
-}
-
-static void rwtest(void *args)
-{
-    PRInt32 index;
-	thread_args *arg = (thread_args *) args;
-
-
-	for (index = 0; index < arg->loop_cnt; index++) {
-
-		/*
-		 * verify sum, update arrays and verify sum again
-		 */
-
-		PR_RWLock_Rlock(arg->rwlock);
-		check_array();
-		PR_RWLock_Unlock(arg->rwlock);
-
-		PR_RWLock_Wlock(arg->rwlock);
-		update_array();
-		PR_RWLock_Unlock(arg->rwlock);
-
-		PR_RWLock_Rlock(arg->rwlock);
-		check_array();
-		PR_RWLock_Unlock(arg->rwlock);
-	}
-	if (_debug_on)
-		PR_fprintf(output,
-		"Thread[0x%x] lock = 0x%x exiting\n",
-				PR_GetCurrentThread(), arg->rwlock);
-
-}
-
-static void check_array(void)
-{
-PRInt32 i;
-
-	for (i=0; i < TEST_ARRAY_SIZE;i++)
-		if (array_C[i] != (array_A[i] + array_B[i])) {
-			PR_fprintf(output, "Error - data check failed\n");
-			PR_ProcessExit(1);
-		}
-}
-
-static void update_array(void)
-{
-PRInt32 i;
-
-	for (i=0; i < TEST_ARRAY_SIZE;i++) {
-		array_A[i] += i;
-		array_B[i] -= i;
-	}
-}
diff --git a/libs/js/nsprpub/pr/tests/sel_spd.c b/libs/js/nsprpub/pr/tests/sel_spd.c
deleted file mode 100644
index c3b7965287..0000000000
--- a/libs/js/nsprpub/pr/tests/sel_spd.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test the speed of select within NSPR
- *
- */
-
-#include "nspr.h"
-#include "prpriv.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-PR_LogPrint(fmt);
-return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#define PORT_BASE 19000
-
-typedef struct timer_slot_t {
-	unsigned long d_connect;
-	unsigned long d_cl_data;
-	unsigned long d_sv_data;
-	unsigned long d_close;
-	unsigned long d_total;
-	unsigned long requests;
-} timer_slot_t;
-
-static long _iterations = 5;
-static long _client_data = 8192;
-
-#if defined(XP_MAC)
-/*
- * Mac does not scale well specially the requirement for thread stack
- * space and buffer allocation space.  It is easy to get into a fragmented
- * memory and not be able to allocate thread stack or client/server data
- * buffer.
-*/
-static long _server_data = (8*1024);
-static long _threads_max = 10, _threads = 10;
-#else
-static long _server_data = (128*1024);
-static long _threads_max = 10, _threads = 10;
-#endif
-
-static int verbose=0;
-static PRMonitor *exit_cv;
-static long _thread_exit_count;
-static timer_slot_t *timer_data;
-static PRThreadScope scope1, scope2;
-
-void tally_results(int);
-
-/* return the diff in microseconds */
-unsigned long _delta(PRIntervalTime *start, PRIntervalTime *stop)
-{
-	/*
-	 * Will C do the right thing with unsigned arithemtic?
-	 */
-	return PR_IntervalToMicroseconds(*stop - *start);
-}
-
-int _readn(PRFileDesc *sock, char *buf, int len)
-{
-	int rem;
-	int bytes;
-
-	for (rem=len; rem; rem -= bytes) {
-		bytes = PR_Recv(sock, buf+len-rem, rem, 0, PR_INTERVAL_NO_TIMEOUT);
-		if (bytes <= 0)
-            return -1;
-	}
-	return len;
-}
-
-void
-_thread_exit(int id)
-{
-	PR_EnterMonitor(exit_cv);
-#ifdef DEBUG
-	fprintf(stdout, "Thread %d EXIT\n", id);
-#endif
-
-	_thread_exit_count--;
-	if (_thread_exit_count == 0) {
-#ifdef DEBUG
-	fprintf(stdout, "Thread %d EXIT triggered notify\n", id);
-#endif
-		PR_Notify(exit_cv);
-	}
-	PR_ExitMonitor(exit_cv);
-}
-
-void
-_server_thread(void *arg_id)
-{
-	void _client_thread(void *);
-	PRThread *thread;
-	int *id =  (int *)arg_id;
-	PRFileDesc *sock;
-	PRSocketOptionData sockopt;
-	PRNetAddr sa;
-	PRFileDesc * newsock;
-	char *data_buffer = NULL;
-	int data_buffer_size;
-	int index;
-	PRIntervalTime start,
-	      connect_done,
-	      read_done,
-	      write_done,
-	      close_done;
-	
-
-#ifdef DEBUG
-	fprintf(stdout, "server thread %d alive\n", *id);
-#endif
-
-	data_buffer_size = (_client_data>_server_data?_client_data:_server_data);
-
-	if ( (data_buffer = (char *)PR_Malloc(data_buffer_size * sizeof(char))) == NULL ) {
-		fprintf(stderr, "Error creating buffer in server thread %d\n", *id);
-		goto done;
-	}
-
-
-	if ( (sock = PR_NewTCPSocket()) == NULL) {
-		fprintf(stderr, "Error creating socket in server thread %d\n", *id);
-		goto done;
-	}
-
-	sockopt.option = PR_SockOpt_Reuseaddr;
-	sockopt.value.reuse_addr = PR_TRUE;
-	if ( PR_SetSocketOption(sock, &sockopt) == PR_FAILURE) {
-		fprintf(stderr, "Error setting socket option in server thread %d\n", *id);
-		goto done;
-	}
-
-	memset(&sa, 0 , sizeof(sa));
-	sa.inet.family = PR_AF_INET;
-	sa.inet.port = PR_htons(PORT_BASE + *id);
-	sa.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-	if ( PR_Bind(sock, &sa) < 0) {
-		fprintf(stderr, "Error binding socket in server thread %d errno = %d\n", *id, errno);
-		goto done;
-	}
-
-	if ( PR_Listen(sock, 32) < 0 ) {
-		fprintf(stderr, "Error listening to socket in server thread %d\n", *id);
-		goto done;
-	}
-
-	/* Tell the client to start */
-	if ( (thread = PR_CreateThread(PR_USER_THREAD, 
-                                      _client_thread, 
-                                      id, 
-                                      PR_PRIORITY_NORMAL, 
-                                      scope2, 
-                                      PR_UNJOINABLE_THREAD, 
-                                      0)) == NULL)
-		fprintf(stderr, "Error creating client thread %d\n", *id);
-
-	for (index = 0; index< _iterations; index++) {
-
-#ifdef DEBUG
-	fprintf(stdout, "server thread %d loop %d\n", *id, index);
-#endif
-
-		start = PR_IntervalNow();
-
-		if ( (newsock = PR_Accept(sock, &sa,
-					PR_INTERVAL_NO_TIMEOUT)) == NULL) {
-			fprintf(stderr, "Error accepting connection %d in server thread %d\n",
-				index, *id);
-			goto done;
-		}
-#ifdef DEBUG
-	fprintf(stdout, "server thread %d got connection %d\n", *id, newsock);
-#endif
-
-
-		connect_done = PR_IntervalNow();
-		
-		if ( _readn(newsock, data_buffer, _client_data) < _client_data) {
-			fprintf(stderr, "Error reading client data for iteration %d in server thread %d\n", index, *id );
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "server thread %d read %d bytes\n", *id, _client_data);
-#endif
-		read_done = PR_IntervalNow();
-
-		if ( PR_Send(newsock, data_buffer, _server_data, 0,
-				PR_INTERVAL_NO_TIMEOUT) < _server_data) {
-			fprintf(stderr, "Error sending client data for iteration %d in server thread %d\n", index, *id );
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "server thread %d write %d bytes\n", *id, _server_data);
-#endif
-
-		write_done = PR_IntervalNow();
-
-		PR_Close(newsock);
-
-		close_done = PR_IntervalNow();
-
-		timer_data[2*(*id)].d_connect += _delta(&start, &connect_done);
-		timer_data[2*(*id)].d_cl_data += _delta(&connect_done, &read_done);
-		timer_data[2*(*id)].d_sv_data += _delta(&read_done, &write_done);
-		timer_data[2*(*id)].d_close += _delta(&write_done, &close_done);
-		timer_data[2*(*id)].d_total += _delta(&start, &close_done);
-		timer_data[2*(*id)].requests++;
-
-
-#ifdef DEBUG
-		fprintf(stdout, "server: %d %d %d %d %d\n",
-			 _delta(&start, &connect_done), _delta(&connect_done, &read_done),
-			 _delta(&read_done, &write_done), _delta(&write_done, &close_done),
-			_delta(&start, &close_done));
-#endif
-	}
-
-done:
-	if (data_buffer != NULL) PR_Free (data_buffer);
-	if (sock) PR_Close(sock);
-	_thread_exit(*id);
-	return;
-}
-
-void
-_client_thread(void *arg_id)
-{
-	int *id =  (int *)arg_id;
-	int index;
-	PRNetAddr sa;
-	PRFileDesc *sock_h;
-	char *data_buffer = NULL;
-	int data_buffer_size;
-	int bytes;
-	PRIntervalTime start,
-	      connect_done,
-	      read_done,
-	      write_done,
-	      close_done;
-	PRStatus rv;
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d alive\n", *id);
-#endif
-
-	data_buffer_size = (_client_data>_server_data?_client_data:_server_data);
-
-	if ( (data_buffer = (char *)PR_Malloc(data_buffer_size * sizeof(char))) == NULL) {
-		fprintf(stderr, "Error creating buffer in server thread %d\n", *id);
-		goto done;
-	}
-
-	memset(&sa, 0 , sizeof(sa));
-	rv = PR_InitializeNetAddr(PR_IpAddrLoopback, PORT_BASE + *id, &sa);
-	PR_ASSERT(PR_SUCCESS == rv);
-	
-	for (index = 0; index< _iterations; index++) {
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d loop %d\n", *id, index);
-#endif
-
-		start = PR_IntervalNow();
-		if ( (sock_h = PR_NewTCPSocket()) == NULL) {
-			fprintf(stderr, "Error creating socket %d in client thread %d\n",
-				index, *id);
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d socket created %d\n", *id, sock_h);
-#endif
-
-		if ( PR_Connect(sock_h, &sa,
-				PR_INTERVAL_NO_TIMEOUT) < 0) {
-			fprintf(stderr, "Error accepting connection %d in client thread %d\n",
-				index, *id);
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d socket connected %d\n", *id, sock_h);
-#endif
-
-		connect_done = PR_IntervalNow();
-		if ( PR_Send(sock_h, data_buffer, _client_data, 0,
-				PR_INTERVAL_NO_TIMEOUT) < _client_data) {
-			fprintf(stderr, "Error sending client data for iteration %d in client thread %d\n", index, *id );
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d socket wrote %d\n", *id, _client_data);
-#endif
-
-		write_done = PR_IntervalNow();
-		if ( (bytes = _readn(sock_h, data_buffer, _server_data)) < _server_data) {
-			fprintf(stderr, "Error reading server data for iteration %d in client thread %d (read %d bytes)\n", index, *id, bytes );
-			goto done;
-		}
-
-#ifdef DEBUG
-	fprintf(stdout, "client thread %d socket read %d\n", *id, _server_data);
-#endif
-
-		read_done = PR_IntervalNow();
-		PR_Close(sock_h);
-		close_done = PR_IntervalNow();
-
-		timer_data[2*(*id)+1].d_connect += _delta(&start, &connect_done);
-		timer_data[2*(*id)+1].d_cl_data += _delta(&connect_done, &write_done);
-		timer_data[2*(*id)+1].d_sv_data += _delta(&write_done, &read_done);
-		timer_data[2*(*id)+1].d_close += _delta(&read_done, &close_done);
-		timer_data[2*(*id)+1].d_total += _delta(&start, &close_done);
-		timer_data[2*(*id)+1].requests++;
-	}
-done:
-	if (data_buffer != NULL) PR_Free (data_buffer);
-	_thread_exit(*id);
-
-	return;
-}
-
-static
-void do_work(void)
-{
-    int index;
-
-	_thread_exit_count = _threads * 2;
-	for (index=0; index<_threads; index++) {
-		PRThread *thread;
-		int *id = (int *)PR_Malloc(sizeof(int));
-
-		*id = index;
-
-		if ( (thread = PR_CreateThread(PR_USER_THREAD, 
-                                       _server_thread, 
-                                       id, 
-                                       PR_PRIORITY_NORMAL, 
-                                       scope1, 
-                                       PR_UNJOINABLE_THREAD, 
-                                       0)) == NULL)
-			fprintf(stderr, "Error creating server thread %d\n", index);
-	}
-	
-	PR_EnterMonitor(exit_cv);
-	while (_thread_exit_count > 0)
-		PR_Wait(exit_cv, PR_INTERVAL_NO_TIMEOUT);
-	PR_ExitMonitor(exit_cv);
-
-	fprintf(stdout, "TEST COMPLETE!\n");
-
-	tally_results(verbose);
-
-}
-
-static void do_workUU(void)
-{
-    scope1 = PR_LOCAL_THREAD;
-    scope2 = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workUK(void)
-{
-    scope1 = PR_LOCAL_THREAD;
-    scope2 = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-static void do_workKU(void)
-{
-    scope1 = PR_GLOBAL_THREAD;
-    scope2 = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workKK(void)
-{
-    scope1 = PR_GLOBAL_THREAD;
-    scope2 = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    printf("%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-int main(int argc, char **argv)
-{
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-	int opt;
-	PR_IMPORT_DATA(char *) optarg;
-#endif
-
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-	while ( (opt = getopt(argc, argv, "c:s:i:t:v")) != EOF) {
-		switch(opt) {
-			case 'i':
-				_iterations = atoi(optarg);
-				break;
-			case 't':
-				_threads_max = _threads = atoi(optarg);
-				break;
-			case 'c':
-				_client_data = atoi(optarg);
-				break;
-			case 's':
-				_server_data = atoi(optarg);
-				break;
-			case 'v':
-				verbose = 1;
-				break;
-			default: 
-				break;
-		}
-	}
-#endif
-
-	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("sel_spd.log");
-#endif
-
-	fprintf(stdout, "Running test for %d iterations with %d simultaneous threads.\n", 
-		_iterations, _threads);
-	fprintf(stdout, "\tWill send %d bytes of client data and %d bytes of server data\n", 
-		_client_data, _server_data);
-
-	if ( (exit_cv = PR_NewMonitor()) == NULL) 
-		fprintf(stderr, "Error creating monitor for exit cv\n");
-	if ( (timer_data = (timer_slot_t *)PR_Malloc(2*_threads * sizeof(timer_slot_t))) == NULL) 
-		fprintf(stderr, "error allocating thread time results array\n");
-	memset(timer_data, 0 , 2*_threads*sizeof(timer_slot_t));
-
-    Measure(do_workUU, "select loop user/user");
-    Measure(do_workUK, "select loop user/kernel");
-    Measure(do_workKU, "select loop kernel/user");
-    Measure(do_workKK, "select loop kernel/kernel");
-
-
-	return 0;
-}
-
-void
-tally_results(int verbose)
-{
-	int index;
-	unsigned long tot_connect = 0;
-	unsigned long tot_cl_data = 0;
-	unsigned long tot_sv_data = 0;
-	unsigned long tot_close = 0;
-	unsigned long tot_all = 0;
-	unsigned long tot_requests = 0;
-
-	fprintf(stdout, "Server results:\n\n");
-	for (index=0; index<_threads_max*2; index+=2) {
-
-		if (verbose)
-			fprintf(stdout, "server thread %u\t%u\t%u\t%u\t%u\t%u\t%u\n",
-				index, timer_data[index].requests, timer_data[index].d_connect,
-				timer_data[index].d_cl_data, timer_data[index].d_sv_data,
-				timer_data[index].d_close, timer_data[index].d_total);
-
-		tot_connect += timer_data[index].d_connect / _threads;
-		tot_cl_data += timer_data[index].d_cl_data / _threads;
-		tot_sv_data += timer_data[index].d_sv_data / _threads;
-		tot_close += timer_data[index].d_close / _threads;
-		tot_all += timer_data[index].d_total / _threads;
-		tot_requests += timer_data[index].requests / _threads;
-	}
-	fprintf(stdout, "----------\n");
-	fprintf(stdout, "server per thread totals %u\t%u\t%u\t%u\t%u\n",
-		tot_requests, tot_connect, tot_cl_data, tot_sv_data, tot_close);
-	fprintf(stdout, "server per thread elapsed time %u\n", tot_all);
-	fprintf(stdout, "----------\n");
-
-	tot_connect = tot_cl_data = tot_sv_data = tot_close = tot_all = tot_requests = 0;
-	fprintf(stdout, "Client results:\n\n");
-	for (index=1; index<_threads_max*2; index+=2) {
-
-		if (verbose)
-			fprintf(stdout, "client thread %u\t%u\t%u\t%u\t%u\t%u\t%u\n",
-				index, timer_data[index].requests, timer_data[index].d_connect,
-				timer_data[index].d_cl_data, timer_data[index].d_sv_data,
-				timer_data[index].d_close, timer_data[index].d_total);
-
-		tot_connect += timer_data[index].d_connect / _threads;
-		tot_cl_data += timer_data[index].d_cl_data / _threads;
-		tot_sv_data += timer_data[index].d_sv_data / _threads;
-		tot_close += timer_data[index].d_close / _threads;
-		tot_all += timer_data[index].d_total / _threads;
-		tot_requests += timer_data[index].requests / _threads;
-	}
-	fprintf(stdout, "----------\n");
-	fprintf(stdout, "client per thread totals %u\t%u\t%u\t%u\t%u\n",
-		tot_requests, tot_connect, tot_cl_data, tot_sv_data, tot_close);
-	fprintf(stdout, "client per thread elapsed time %u\n", tot_all);
-}
-
diff --git a/libs/js/nsprpub/pr/tests/selct_er.c b/libs/js/nsprpub/pr/tests/selct_er.c
deleted file mode 100755
index e658813f6e..0000000000
--- a/libs/js/nsprpub/pr/tests/selct_er.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1997 - Netscape Communications Corporation
-**
-** Name: prselect_err.c
-**
-** Description: tests PR_Select with sockets Error condition functions.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-#ifdef XP_BEOS
-#include <stdio.h>
-int main()
-{
-    printf( "This test is not ported to the BeOS\n" );
-    return 0;
-}
-#else
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "primpl.h"
-#include "pprio.h"
-#include "prnetdb.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRFileDesc *badFD;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    PR_fd_set readFdSet;
-    char buf[128];
-    PRInt32 retVal;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Select with sockets.  Error\n");
-		printf("reporting operations are tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = AF_INET;
-    addr.inet.ip = PR_htonl(INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    /* Set up the fd set */
-    PR_FD_ZERO(&readFdSet);
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-
-
-    /* Testing bad fd */
-    if (debug_mode) printf("PR_Select should detect a bad file descriptor\n");
-    if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    PR_FD_SET(badFD, &readFdSet);
-    /*
-     * Make the fd invalid
-     */
-#if defined(XP_UNIX)
-    close(PR_FileDesc2NativeHandle(badFD));
-#elif defined(XP_OS2)
-    soclose(PR_FileDesc2NativeHandle(badFD));
-#elif defined(WIN32) || defined(WIN16)
-    closesocket(PR_FileDesc2NativeHandle(badFD));
-#elif defined(XP_MAC)
-    _PR_MD_CLOSE_SOCKET(PR_FileDesc2NativeHandle(badFD));
-#else
-#error "Unknown architecture"
-#endif
-
-    retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_INTERVAL_NO_TIMEOUT);
-    if (retVal != -1 || PR_GetError() != PR_BAD_DESCRIPTOR_ERROR) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Select returns %d\n", retVal);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-		failed_already=1;
-	}
-	goto exit_now;
-    }
-    if (debug_mode) printf("PR_Select detected a bad fd.  Test passed.\n\n");
-	PR_FD_CLR(badFD, &readFdSet);
-
-	PR_Cleanup();
-	goto exit_now;
-exit_now:
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-
-}
-
-#endif /* XP_BEOS */
diff --git a/libs/js/nsprpub/pr/tests/selct_nm.c b/libs/js/nsprpub/pr/tests/selct_nm.c
deleted file mode 100644
index 56a80a76fb..0000000000
--- a/libs/js/nsprpub/pr/tests/selct_nm.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1997 - Netscape Communications Corporation
-**
-** Name: prselect_norm.c
-**
-** Description: tests PR_Select with sockets - Normal operations.
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prerror.h"
-#include "prnetdb.h"
-
-#ifdef XP_MAC
-#include "probslet.h"
-#else
-#include "obsolete/probslet.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-static void
-clientThreadFunc(void *arg)
-{
-    PRUintn port = (PRUintn) arg;
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    char buf[128];
-    int i;
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons((PRUint16)port);
-    addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    PR_snprintf(buf, sizeof(buf), "%hu", addr.inet.port);
-
-    for (i = 0; i < 5; i++) {
-	sock = PR_NewTCPSocket();
-        PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-	PR_Write(sock, buf, sizeof(buf));
-	PR_Close(sock);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRFileDesc *fds0[10], *fds1[10], **fds, **other_fds;
-    PRIntn nfds;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    PR_fd_set readFdSet;
-    char buf[128];
-    PRThread *clientThread;
-    PRInt32 retVal;
-    PRIntn i, j;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Select with sockets.  \n");
-		printf(" Normal operation are tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-failed_already=1;
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort1,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort2,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
-    if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if (debug_mode) {
-		printf("Two client threads are created.  Each of them will\n");
-		printf("send data to one of the two ports the server is listening on.\n");
-		printf("The data they send is the port number.  Each of them send\n");
-		printf("the data five times, so you should see ten lines below,\n");
-		printf("interleaved in an arbitrary order.\n");
-	}
-    /* set up the fd array */
-    fds = fds0;
-    other_fds = fds1;
-    fds[0] = listenSock1;
-    fds[1] = listenSock2;
-    nfds = 2;
-    /* Set up the fd set */
-    PR_FD_ZERO(&readFdSet);
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-
-    /* 20 events total */
-    i = 0;
-    while (i < 20) {
-	PRFileDesc **tmp;
-	int nextIndex;
-	int nEvents = 0;
-
-	retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-		PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(retVal != 0);  /* no timeout */
-	if (retVal == -1) {
-	    fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
-		    PR_GetOSError());
-	failed_already=1;
-	    goto exit_now;
-	}
-
-	nextIndex = 2;
-	/* the two listening sockets */
-	for (j = 0; j < 2; j++) {
-	    other_fds[j] = fds[j];
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRFileDesc *sock;
-
-		nEvents++;
-		sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
-		if (sock == NULL) {
-		    fprintf(stderr, "PR_Accept() failed\n");
-		failed_already=1;
-		    goto exit_now;
-		}
-		other_fds[nextIndex] = sock;
-		PR_FD_SET(sock, &readFdSet);
-		nextIndex++;
-	    }
-	    PR_FD_SET(fds[j], &readFdSet);
-	}
-
-	for (j = 2; j < nfds; j++) {
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRInt32 nBytes;
-
-		PR_FD_CLR(fds[j], &readFdSet);
-		nEvents++;
-		nBytes = PR_Read(fds[j], buf, sizeof(buf));
-		if (nBytes == -1) {
-		    fprintf(stderr, "PR_Read() failed\n");
-		failed_already=1;
-		    goto exit_now;
-		}
-		/* Just to be safe */
-		buf[127] = '\0';
-		PR_Close(fds[j]);
-		if (debug_mode) printf("The server received \"%s\" from a client\n", buf);
-	    } else {
-		PR_FD_SET(fds[j], &readFdSet);
-		other_fds[nextIndex] = fds[j];
-		nextIndex++;
-	    }
-	}
-
-	PR_ASSERT(retVal == nEvents);
-	/* swap */
-	tmp = fds;
-	fds = other_fds;
-	other_fds = tmp;
-	nfds = nextIndex;
-	i += nEvents;
-    }
-
-    if (debug_mode) printf("Test passed\n");
-
-    PR_Cleanup();
-	goto exit_now;
-exit_now:
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/selct_to.c b/libs/js/nsprpub/pr/tests/selct_to.c
deleted file mode 100644
index b5600fa9fe..0000000000
--- a/libs/js/nsprpub/pr/tests/selct_to.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**  1997 - Netscape Communications Corporation
-**
-** Name: prselect_to.c
-**
-** Description: tests PR_Select with sockets. Time out functions
-**
-** Modification History:
-** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prnetdb.h"
-
-#ifdef XP_MAC
-#include "probslet.h"
-#else
-#include "obsolete/probslet.h"
-#endif
-
-#include "prerror.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-int main(int argc, char **argv)
-{
-    PRFileDesc *listenSock1, *listenSock2;
-    PRUint16 listenPort1, listenPort2;
-    PRNetAddr addr;
-    PR_fd_set readFdSet;
-    char buf[128];
-    PRInt32 retVal;
-
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (debug_mode) {
-		printf("This program tests PR_Select with sockets.  Timeout \n");
-		printf("operations are tested.\n\n");
-	}
-
-    /* Create two listening sockets */
-    if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort1 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-
-    if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    addr.inet.family = PR_AF_INET;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    addr.inet.port = PR_htons(0);
-    if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    listenPort2 = PR_ntohs(addr.inet.port);
-    if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
-    }
-    PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
-
-    /* Set up the fd set */
-    PR_FD_ZERO(&readFdSet);
-    PR_FD_SET(listenSock1, &readFdSet);
-    PR_FD_SET(listenSock2, &readFdSet);
-
-    /* Testing timeout */
-    if (debug_mode) printf("PR_Select should time out in 5 seconds\n");
-    retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_SecondsToInterval(5));
-    if (retVal != 0) {
-	PR_snprintf(buf, sizeof(buf),
-		"PR_Select should time out and return 0, but it returns %ld\n",
-		retVal);
-	fprintf(stderr, "%s", buf);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-			failed_already=1;
-	}
-	goto exit_now;
-    }
-    if (debug_mode) printf("PR_Select timed out.  Test passed.\n\n");
-
-    PR_Cleanup();
-
-exit_now:
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/select2.c b/libs/js/nsprpub/pr/tests/select2.c
deleted file mode 100644
index 0651c45053..0000000000
--- a/libs/js/nsprpub/pr/tests/select2.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: select2.c
-**
-** Description: Measure PR_Select and Empty_Select performance.
-**
-** Modification History:
-** 20-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-#include "prttools.h"
-#include "primpl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if defined(OS2)
-#include <sys/time.h>
-#endif
-
-#define PORT 8000
-#define DEFAULT_COUNT 10
-PRInt32 count;
-
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Test_Result
-** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**				status of the test case.
-** INPUTS:      PASS/FAIL
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:   Determine what the status is and print accordingly.
-**      
-***********************************************************************/
-
-
-static void Test_Result (int result)
-{
-	switch (result)
-	{
-		case PASS:
-			printf ("PASS\n");
-			break;
-		case FAIL:
-			printf ("FAIL\n");
-			break;
-		default:
-			printf ("NOSTATUS\n");
-			break;
-	}
-}
-
-static void EmptyPRSelect(void)
-{
-    PRInt32 index = count;
-    PRInt32 rv;
-
-    for (; index--;)
-        rv = PR_Select(0, NULL, NULL, NULL, PR_INTERVAL_NO_WAIT);
-}
-
-static void EmptyNativeSelect(void)
-{
-    PRInt32 rv;
-    PRInt32 index = count;
-    struct timeval timeout;
-
-    timeout.tv_sec = timeout.tv_usec = 0;
-    for (; index--;)
-        rv = select(0, NULL, NULL, NULL, &timeout);
-}
-
-static void PRSelectTest(void)
-{
-    PRFileDesc *listenSocket;
-    PRNetAddr serverAddr;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-        return;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address\n");
-        PR_Close(listenSocket);
-        return;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-        PR_Close(listenSocket);
-        return;
-    }
-    if (debug_mode) printf("Listening on port %d\n", PORT);
-
-    {
-        PRFileDesc *newSock;
-        PRNetAddr rAddr;
-        PRInt32 loops = 0;
-        PR_fd_set rdset;
-        PRInt32 rv;
-        PRInt32 bytesRead;
-        char buf[11];
-
-        loops++;
-
-        if (debug_mode) printf("Going into accept\n"); 
-
-        newSock = PR_Accept(listenSocket, 
-                              &rAddr,
-                              PR_INTERVAL_NO_TIMEOUT);
-
-	if (newSock) {
-            if (debug_mode) printf("Got connection!\n");
-        } else {
-	    if (debug_mode) printf("PR_Accept failed: error code %d\n", PR_GetError());
-		else Test_Result (FAIL);
-        }
-
-        PR_FD_ZERO(&rdset);
-        PR_FD_SET(newSock, &rdset);
-
-        if (debug_mode) printf("Going into select \n");
-
-        rv = PR_Select(0, &rdset, 0, 0, PR_INTERVAL_NO_TIMEOUT);
-
-        if (debug_mode) printf("return from select is %d\n", rv);
-
-        if (PR_FD_ISSET(newSock, &rdset)) {
-            if (debug_mode) printf("I can't believe it- the socket is ready okay!\n");
-        } else {
-            if (debug_mode) printf("Damn; the select test failed...\n");
-			else Test_Result (FAIL);
-        }
-
-        strcpy(buf, "XXXXXXXXXX");
-        bytesRead = PR_Recv(newSock, buf, 10, 0, PR_INTERVAL_NO_TIMEOUT);
-	buf[10] = '\0';
-
-        if (debug_mode) printf("Recv completed with %d bytes, %s\n", bytesRead, buf);
-
-        PR_Close(newSock);
-    }
-
-}
-
-#if defined(XP_UNIX)
-
-static void NativeSelectTest(void)
-{
-    PRFileDesc *listenSocket;
-    PRNetAddr serverAddr;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-        return;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address\n");
-        PR_Close(listenSocket);
-        return;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-        PR_Close(listenSocket);
-        return;
-    }
-    if (debug_mode) printf("Listening on port %d\n", PORT);
-
-    {
-        PRIntn osfd;
-        char buf[11];
-        fd_set rdset;
-        PRNetAddr rAddr;
-        PRFileDesc *newSock;
-        struct timeval timeout;
-        PRInt32 bytesRead, rv, loops = 0;
-
-        loops++;
-
-        if (debug_mode) printf("Going into accept\n"); 
-
-        newSock = PR_Accept(listenSocket, &rAddr, PR_INTERVAL_NO_TIMEOUT);
-
-	if (newSock) {
-            if (debug_mode) printf("Got connection!\n");
-        } else {
-	    if (debug_mode) printf("PR_Accept failed: error code %d\n", PR_GetError());
-		else Test_Result (FAIL);
-        }
-
-        osfd = PR_FileDesc2NativeHandle(newSock);
-        FD_ZERO(&rdset);
-        FD_SET(osfd, &rdset);
-
-        if (debug_mode) printf("Going into select \n");
-
-
-        timeout.tv_sec = 2; timeout.tv_usec = 0;
-        rv = select(osfd + 1, &rdset, NULL, NULL, &timeout);
-
-        if (debug_mode) printf("return from select is %d\n", rv);
-
-        if (FD_ISSET(osfd, &rdset)) {
-            if (debug_mode)
-                printf("I can't believe it- the socket is ready okay!\n");
-        } else {
-            if (debug_mode) printf("Damn; the select test failed...\n");
-			else Test_Result (FAIL);
-        }
-
-        strcpy(buf, "XXXXXXXXXX");
-        bytesRead = PR_Recv(newSock, buf, 10, 0, PR_INTERVAL_NO_TIMEOUT);
-	buf[10] = '\0';
-
-        if (debug_mode) printf("Recv completed with %d bytes, %s\n", bytesRead, buf);
-
-        PR_Close(newSock);
-    }
-
-}  /* NativeSelectTest */
-
-#endif /* defined(XP_UNIX) */
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-    PRInt32 tot;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-    tot = PR_IntervalToMilliseconds(stop-start);
-
-    if (debug_mode) printf("%40s: %6.2f usec avg, %d msec total\n", msg, d / count, tot);
-}
-
-void main(int argc, char **argv)
-{
-	
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (argc > 2) {
-	count = atoi(argv[2]);
-    } else {
-	count = DEFAULT_COUNT;
-    }
-
-#if defined(XP_UNIX)
-    Measure(NativeSelectTest, "time to call 1 element select()");
-#endif
-    Measure(EmptyPRSelect, "time to call Empty PR_select()");
-    Measure(EmptyNativeSelect, "time to call Empty select()");
-    Measure(PRSelectTest, "time to call 1 element PR_select()");
-
-	if (!debug_mode) Test_Result (NOSTATUS);
-    PR_Cleanup();
-
-
-}
diff --git a/libs/js/nsprpub/pr/tests/selintr.c b/libs/js/nsprpub/pr/tests/selintr.c
deleted file mode 100644
index f47efca431..0000000000
--- a/libs/js/nsprpub/pr/tests/selintr.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test whether classic NSPR's select() wrapper properly blocks
- * the periodic SIGALRM clocks.  On some platforms (such as
- * HP-UX and SINIX) an interrupted select() system call is
- * restarted with the originally specified timeout, ignoring
- * the time that has elapsed.  If a select() call is interrupted
- * repeatedly, it will never time out.  (See Bugzilla bug #39674.)
- */
-
-#if !defined(XP_UNIX)
-
-/*
- * This test is applicable to Unix only.
- */
-
-int main()
-{
-    return 0;
-}
-
-#else /* XP_UNIX */
-
-#include "nspr.h"
-
-#include <sys/time.h>
-#include <stdio.h>
-
-int main()
-{
-    struct timeval timeout;
-    int rv;
-
-    PR_SetError(0, 0);  /* force NSPR to initialize */
-    PR_EnableClockInterrupts();
-
-    /* 2 seconds timeout */
-    timeout.tv_sec = 2;
-    timeout.tv_usec = 0;
-    rv = select(1, NULL, NULL, NULL, &timeout);
-    printf("select returned %d\n", rv);
-    return 0;
-}
-
-#endif /* XP_UNIX */
diff --git a/libs/js/nsprpub/pr/tests/sem.c b/libs/js/nsprpub/pr/tests/sem.c
deleted file mode 100644
index 09c9f3cde5..0000000000
--- a/libs/js/nsprpub/pr/tests/sem.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: sem.c
-**
-** Description: Tests Semaphonre functions.
-**
-** Modification History:
-** 20-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "prpriv.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-/* 
-	Since we don't have stdin, stdout everywhere, we will fake 
-	it with our in-memory buffers called stdin and stdout.
-*/
-
-#define SBSIZE 1024
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "prsem.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-static char stdinBuf[SBSIZE];
-static char stdoutBuf[SBSIZE];
-
-static PRUintn stdinBufIdx = 0;
-static PRUintn stdoutBufIdx = 0;
-static PRStatus finalResult = PR_SUCCESS;
-
-
-static size_t dread (PRUintn device, char *buf, size_t bufSize)
-{
-	PRUintn	i;
-	
-	/* during first read call, initialize the stdinBuf buffer*/
-	if (stdinBufIdx == 0) {
-		for (i=0; i<SBSIZE; i++)
-			stdinBuf[i] = i;
-	}
-
-	/* now copy data from stdinBuf to the given buffer upto bufSize */
-	for (i=0; i<bufSize; i++) {
-		if (stdinBufIdx == SBSIZE)
-			break;
-		buf[i] = stdinBuf[stdinBufIdx++];
-	}
-
-	return i;
-}
-
-static size_t dwrite (PRUintn device, char *buf, size_t bufSize)
-{
-	PRUintn	i, j;
-	
-	/* copy data from the given buffer upto bufSize to stdoutBuf */
-	for (i=0; i<bufSize; i++) {
-		if (stdoutBufIdx == SBSIZE)
-			break;
-		stdoutBuf[stdoutBufIdx++] = buf[i];
-	}
-
-	/* during last write call, compare the two buffers */
-	if (stdoutBufIdx == SBSIZE)
-		for (j=0; j<SBSIZE; j++)
-			if (stdinBuf[j] != stdoutBuf[j]) {
-				if (debug_mode) printf("data mismatch for index= %d \n", j);
-				finalResult = PR_FAILURE;
-			}
-
-	return i;
-}
-
-/*------------------ Following is the real test program ---------*/
-/*
-	Program to copy standard input to standard output.  The program
-	uses two threads.  One reads the input and puts the data in a 
-	double buffer.  The other reads the buffer contents and writes 
-	it to standard output.
-*/
-
-PRSemaphore	*emptyBufs;	/* number of empty buffers */
-PRSemaphore *fullBufs;	/* number of buffers that are full */
-
-#define BSIZE	100
-
-struct {
-	char data[BSIZE];
-	PRUintn nbytes;		/* number of bytes in this buffer */
-} buf[2];
-
-static void PR_CALLBACK reader(void *arg)
-{
-	PRUintn	i = 0;
-	size_t	nbytes;
-	
-	do {
-		(void) PR_WaitSem(emptyBufs);
-		nbytes = dread(0, buf[i].data, BSIZE);
-		buf[i].nbytes = nbytes;
-		PR_PostSem(fullBufs);
-		i = (i + 1) % 2;
-	} while (nbytes > 0);
-}
-
-static void writer(void)
-{
-	PRUintn	i = 0;
-	size_t	nbytes;
-	
-	do {
-		(void) PR_WaitSem(fullBufs);
-		nbytes = buf[i].nbytes;
-		if (nbytes > 0) {
-			nbytes = dwrite(1, buf[i].data, nbytes);
-			PR_PostSem(emptyBufs);
-			i = (i + 1) % 2;
-		}
-	} while (nbytes > 0);
-}
-
-int main(int argc, char **argv)
-{
-	PRThread *r;
-
-    PR_STDIO_INIT();
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-
-    {
-    	/* The command line argument: -d is used to determine if the test is being run
-    	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-    	All of the printfs associated with this test has been handled with a if (debug_mode)
-    	test.
-    	Usage: test_name -d
-    	*/
-    	PLOptStatus os;
-    	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-    	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-    		if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug mode */
-    			debug_mode = 1;
-                break;
-             default:
-                break;
-            }
-        }
-    	PL_DestroyOptState(opt);
-    }        
-
- /* main test */
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("sem.log");
-	debug_mode = 1;
-#endif
-
-    emptyBufs = PR_NewSem(2);	/* two empty buffers */
-
-    fullBufs = PR_NewSem(0);	/* zero full buffers */
-
-	/* create the reader thread */
-	
-	r = PR_CreateThread(PR_USER_THREAD,
-				      reader, 0, 
-				      PR_PRIORITY_NORMAL,
-				      PR_LOCAL_THREAD,
-    				  PR_UNJOINABLE_THREAD,
-				      0);
-
-	/* Do the writer operation in this thread */
-	writer();
-
-	PR_DestroySem(emptyBufs);
-	PR_DestroySem(fullBufs);
-
-	if (finalResult == PR_SUCCESS) {
-		if (debug_mode) printf("sem Test Passed.\n");
-	}
-	else{
-		if (debug_mode) printf("sem Test Failed.\n");
-		failed_already=1;
-	}
-    PR_Cleanup();
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/sema.c b/libs/js/nsprpub/pr/tests/sema.c
deleted file mode 100644
index 3dff8a00c7..0000000000
--- a/libs/js/nsprpub/pr/tests/sema.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
-#define SEM_MODE  0666
-#define ITERATIONS 1000
-
-static PRBool debug_mode = PR_FALSE;
-static PRIntn iterations = ITERATIONS;
-static PRIntn counter;
-static PRSem *sem1, *sem2;
-
-/*
- * Thread 2 waits on semaphore 2 and posts to semaphore 1.
- */
-void ThreadFunc(void *arg)
-{
-    PRIntn i;
-
-    for (i = 0; i < iterations; i++) {
-        if (PR_WaitSemaphore(sem2) == PR_FAILURE) {
-            fprintf(stderr, "PR_WaitSemaphore failed\n");
-            exit(1);
-        }
-        if (counter == 2*i+1) {
-            if (debug_mode) printf("thread 2: counter = %d\n", counter);
-        } else {
-            fprintf(stderr, "thread 2: counter should be %d but is %d\n",
-                    2*i+1, counter);
-            exit(1);
-        }
-        counter++;
-        if (PR_PostSemaphore(sem1) == PR_FAILURE) {
-            fprintf(stderr, "PR_PostSemaphore failed\n");
-            exit(1);
-        }
-    }
-}
-
-static void Help(void)
-{
-    fprintf(stderr, "sema test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-c <count>   loop count         (%d)\n", ITERATIONS);
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PRThread *thred;
-    PRIntn i;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dc:h");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'c':  /* loop count */
-                iterations = atoi(opt->value);
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_SUCCESS) {
-        fprintf(stderr, "warning: removed semaphore %s left over "
-                "from previous run\n", SEM_NAME1);
-    }
-    if (PR_DeleteSemaphore(SEM_NAME2) == PR_SUCCESS) {
-        fprintf(stderr, "warning: removed semaphore %s left over "
-                "from previous run\n", SEM_NAME2);
-    }
-
-    sem1 = PR_OpenSemaphore(SEM_NAME1, PR_SEM_CREATE, SEM_MODE, 1);
-    if (NULL == sem1) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    sem2 = PR_OpenSemaphore(SEM_NAME2, PR_SEM_CREATE, SEM_MODE, 0);
-    if (NULL == sem2) {
-        fprintf(stderr, "PR_OpenSemaphore failed\n");
-        exit(1);
-    }
-    thred = PR_CreateThread(PR_USER_THREAD, ThreadFunc, NULL,
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == thred) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-
-    /*
-     * Thread 1 waits on semaphore 1 and posts to semaphore 2.
-     */
-    for (i = 0; i < iterations; i++) {
-        if (PR_WaitSemaphore(sem1) == PR_FAILURE) {
-            fprintf(stderr, "PR_WaitSemaphore failed\n");
-            exit(1);
-        }
-        if (counter == 2*i) {
-            if (debug_mode) printf("thread 1: counter = %d\n", counter);
-        } else {
-            fprintf(stderr, "thread 1: counter should be %d but is %d\n",
-                    2*i, counter);
-            exit(1);
-        }
-        counter++;
-        if (PR_PostSemaphore(sem2) == PR_FAILURE) {
-            fprintf(stderr, "PR_PostSemaphore failed\n");
-            exit(1);
-        }
-    }
-
-    if (PR_JoinThread(thred) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-
-    if (PR_CloseSemaphore(sem1) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-    if (PR_CloseSemaphore(sem2) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-    }
-    if (PR_DeleteSemaphore(SEM_NAME2) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/semaerr.c b/libs/js/nsprpub/pr/tests/semaerr.c
deleted file mode 100644
index 8feb8d81b7..0000000000
--- a/libs/js/nsprpub/pr/tests/semaerr.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#define NO_SUCH_SEM_NAME "/tmp/nosuchsem.sem"
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_MODE  0666
-
-static PRBool debug_mode = PR_FALSE;
-
-static void Help(void)
-{
-    fprintf(stderr, "semaerr test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dh");
-    PRSem *sem;
-    char *child_argv[32];
-    char **child_arg;
-    PRProcess *proc;
-    PRInt32 exit_code;
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    /*
-     * Open a nonexistent semaphore without the PR_SEM_CREATE
-     * flag should fail with PR_FILE_NOT_FOUND_ERROR.
-     */
-    (void) PR_DeleteSemaphore(NO_SUCH_SEM_NAME);
-    sem = PR_OpenSemaphore(NO_SUCH_SEM_NAME, 0, 0, 0);
-    if (NULL != sem) {
-        fprintf(stderr, "Opening nonexistent semaphore %s "
-                "without the PR_SEM_CREATE flag should fail "
-                "but succeeded\n", NO_SUCH_SEM_NAME);
-        exit(1);
-    }
-    if (PR_GetError() != PR_FILE_NOT_FOUND_ERROR) {
-        fprintf(stderr, "Expected error is %d but got (%d, %d)\n",
-                PR_FILE_NOT_FOUND_ERROR, PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-
-    /*
-     * Create a semaphore and let the another process
-     * try PR_SEM_CREATE and PR_SEM_CREATE|PR_SEM_EXCL.
-     */
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_SUCCESS) {
-        fprintf(stderr, "warning: deleted semaphore %s from previous "
-                "run of the test\n", SEM_NAME1);
-    }
-    sem = PR_OpenSemaphore(SEM_NAME1, PR_SEM_CREATE, SEM_MODE, 0);
-    if (sem == NULL) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    child_arg = child_argv;
-    *child_arg++ = "semaerr1";
-    if (debug_mode) {
-        *child_arg++ = "-d";
-    }
-    *child_arg = NULL;
-    proc = PR_CreateProcess(child_argv[0], child_argv, NULL, NULL);
-    if (proc == NULL) {
-        fprintf(stderr, "PR_CreateProcess failed\n");
-        exit(1);
-    }
-    if (PR_WaitProcess(proc, &exit_code) == PR_FAILURE) {
-        fprintf(stderr, "PR_WaitProcess failed\n");
-        exit(1);
-    }
-    if (exit_code != 0) {
-        fprintf(stderr, "process semaerr1 failed\n");
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-        exit(1);
-    }
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/semaerr1.c b/libs/js/nsprpub/pr/tests/semaerr1.c
deleted file mode 100644
index eeccdc43be..0000000000
--- a/libs/js/nsprpub/pr/tests/semaerr1.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
-#define SEM_MODE  0666
-
-static PRBool debug_mode = PR_FALSE;
-
-static void Help(void)
-{
-    fprintf(stderr, "semaerr1 test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dh");
-    PRSem *sem;
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    /*
-     * PR_SEM_CREATE|PR_SEM_EXCL should be able to
-     * create a nonexistent semaphore.
-     */
-    (void) PR_DeleteSemaphore(SEM_NAME2);
-    sem = PR_OpenSemaphore(SEM_NAME2, PR_SEM_CREATE|PR_SEM_EXCL, SEM_MODE, 0);
-    if (sem == NULL) {
-        fprintf(stderr, "PR_OpenSemaphore failed\n");
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-        exit(1);
-    }
-    if (PR_DeleteSemaphore(SEM_NAME2) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-        exit(1);
-    }
-    
-    /*
-     * Opening an existing semaphore with PR_SEM_CREATE|PR_SEM_EXCL.
-     * should fail with PR_FILE_EXISTS_ERROR.
-     */
-    sem = PR_OpenSemaphore(SEM_NAME1, PR_SEM_CREATE|PR_SEM_EXCL, SEM_MODE, 0);
-    if (sem != NULL) {
-        fprintf(stderr, "PR_OpenSemaphore should fail but succeeded\n");
-        exit(1);
-    }
-    if (PR_GetError() != PR_FILE_EXISTS_ERROR) {
-        fprintf(stderr, "Expect %d but got %d\n", PR_FILE_EXISTS_ERROR,
-                PR_GetError());
-        exit(1);
-    }
-
-    /*
-     * Try again, with just PR_SEM_CREATE.  This should succeed.
-     */
-    sem = PR_OpenSemaphore(SEM_NAME1, PR_SEM_CREATE, SEM_MODE, 0);
-    if (sem == NULL) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-        exit(1);
-    }
-
-    sem = PR_OpenSemaphore(SEM_NAME2, PR_SEM_CREATE|PR_SEM_EXCL, SEM_MODE, 0);
-    if (sem == NULL) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-        exit(1);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/semaping.c b/libs/js/nsprpub/pr/tests/semaping.c
deleted file mode 100644
index 7b145fc5fd..0000000000
--- a/libs/js/nsprpub/pr/tests/semaping.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#define SHM_NAME "/tmp/counter"
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
-#define SEM_MODE  0666
-#define SHM_MODE  0666
-#define ITERATIONS 1000
-
-static PRBool debug_mode = PR_FALSE;
-static PRIntn iterations = ITERATIONS;
-static PRSem *sem1, *sem2;
-
-static void Help(void)
-{
-    fprintf(stderr, "semaping test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-c <count>   loop count         (%d)\n", ITERATIONS);
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PRProcess *proc;
-    PRIntn i;
-    char *child_argv[32];
-    char **child_arg;
-    char iterations_buf[32];
-    PRSharedMemory *shm;
-    PRIntn *counter_addr;
-    PRInt32 exit_code;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dc:h");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'c':  /* loop count */
-                iterations = atoi(opt->value);
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (PR_DeleteSharedMemory(SHM_NAME) == PR_SUCCESS) {
-        fprintf(stderr, "warning: removed shared memory %s left over "
-                "from previous run\n", SHM_NAME);
-    }
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_SUCCESS) {
-        fprintf(stderr, "warning: removed semaphore %s left over "
-                "from previous run\n", SEM_NAME1);
-    }
-    if (PR_DeleteSemaphore(SEM_NAME2) == PR_SUCCESS) {
-        fprintf(stderr, "warning: removed semaphore %s left over "
-                "from previous run\n", SEM_NAME2);
-    }
-
-    shm = PR_OpenSharedMemory(SHM_NAME, sizeof(*counter_addr), PR_SHM_CREATE, SHM_MODE);
-    if (NULL == shm) {
-        fprintf(stderr, "PR_OpenSharedMemory failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    counter_addr = PR_AttachSharedMemory(shm, 0);
-    if (NULL == counter_addr) {
-        fprintf(stderr, "PR_AttachSharedMemory failed\n");
-        exit(1);
-    }
-    *counter_addr = 0;
-    sem1 = PR_OpenSemaphore(SEM_NAME1, PR_SEM_CREATE, SEM_MODE, 1);
-    if (NULL == sem1) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    sem2 = PR_OpenSemaphore(SEM_NAME2, PR_SEM_CREATE, SEM_MODE, 0);
-    if (NULL == sem2) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-
-    child_arg = &child_argv[0];
-    *child_arg++ = "semapong";
-    if (debug_mode != PR_FALSE) {
-        *child_arg++ = "-d";
-    }
-    if (iterations != ITERATIONS) {
-        *child_arg++ = "-c";
-        PR_snprintf(iterations_buf, sizeof(iterations_buf), "%d", iterations);
-        *child_arg++ = iterations_buf;
-    }
-    *child_arg = NULL;
-    proc = PR_CreateProcess(child_argv[0], child_argv, NULL, NULL);
-    if (NULL == proc) {
-        fprintf(stderr, "PR_CreateProcess failed\n");
-        exit(1);
-    }
-
-    /*
-     * Process 1 waits on semaphore 1 and posts to semaphore 2.
-     */
-    for (i = 0; i < iterations; i++) {
-        if (PR_WaitSemaphore(sem1) == PR_FAILURE) {
-            fprintf(stderr, "PR_WaitSemaphore failed\n");
-            exit(1);
-        }
-        if (*counter_addr == 2*i) {
-            if (debug_mode) printf("process 1: counter = %d\n", *counter_addr);
-        } else {
-            fprintf(stderr, "process 1: counter should be %d but is %d\n",
-                    2*i, *counter_addr);
-            exit(1);
-        }
-        (*counter_addr)++;
-        if (PR_PostSemaphore(sem2) == PR_FAILURE) {
-            fprintf(stderr, "PR_PostSemaphore failed\n");
-            exit(1);
-        }
-    }
-    if (PR_DetachSharedMemory(shm, counter_addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_DetachSharedMemory failed\n");
-        exit(1);
-    }
-    if (PR_CloseSharedMemory(shm) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSharedMemory failed\n");
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem1) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-    if (PR_CloseSemaphore(sem2) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-
-    if (PR_WaitProcess(proc, &exit_code) == PR_FAILURE) {
-        fprintf(stderr, "PR_WaitProcess failed\n");
-        exit(1);
-    }
-    if (exit_code != 0) {
-        fprintf(stderr, "process 2 failed with exit code %d\n", exit_code);
-        exit(1);
-    }
-
-    if (PR_DeleteSharedMemory(SHM_NAME) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSharedMemory failed\n");
-    }
-    if (PR_DeleteSemaphore(SEM_NAME1) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-    }
-    if (PR_DeleteSemaphore(SEM_NAME2) == PR_FAILURE) {
-        fprintf(stderr, "PR_DeleteSemaphore failed\n");
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/semapong.c b/libs/js/nsprpub/pr/tests/semapong.c
deleted file mode 100644
index d3733290bb..0000000000
--- a/libs/js/nsprpub/pr/tests/semapong.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-
-#define SHM_NAME "/tmp/counter"
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
-#define ITERATIONS 1000
-
-static PRBool debug_mode = PR_FALSE;
-static PRIntn iterations = ITERATIONS;
-static PRSem *sem1, *sem2;
-
-static void Help(void)
-{
-    fprintf(stderr, "semapong test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-c <count>   loop count         (%d)\n", ITERATIONS);
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PRIntn i;
-    PRSharedMemory *shm;
-    PRIntn *counter_addr;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dc:h");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'c':  /* loop count */
-                iterations = atoi(opt->value);
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    shm = PR_OpenSharedMemory(SHM_NAME, sizeof(*counter_addr), 0, 0666);
-    if (NULL == shm) {
-        fprintf(stderr, "PR_OpenSharedMemory failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    sem1 = PR_OpenSemaphore(SEM_NAME1, 0, 0, 0);
-    if (NULL == sem1) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    sem2 = PR_OpenSemaphore(SEM_NAME2, 0, 0, 0);
-    if (NULL == sem2) {
-        fprintf(stderr, "PR_OpenSemaphore failed (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-
-    counter_addr = PR_AttachSharedMemory(shm, 0);
-    if (NULL == counter_addr) {
-        fprintf(stderr, "PR_AttachSharedMemory failed\n");
-        exit(1);
-    }
-
-    /*
-     * Process 2 waits on semaphore 2 and posts to semaphore 1.
-     */
-    for (i = 0; i < iterations; i++) {
-        if (PR_WaitSemaphore(sem2) == PR_FAILURE) {
-            fprintf(stderr, "PR_WaitSemaphore failed\n");
-            exit(1);
-        }
-        if (*counter_addr == 2*i+1) {
-            if (debug_mode) printf("process 2: counter = %d\n", *counter_addr);
-        } else {
-            fprintf(stderr, "process 2: counter should be %d but is %d\n",
-                    2*i+1, *counter_addr);
-            exit(1);
-        }
-        (*counter_addr)++;
-        if (PR_PostSemaphore(sem1) == PR_FAILURE) {
-            fprintf(stderr, "PR_PostSemaphore failed\n");
-            exit(1);
-        }
-    }
-    if (PR_DetachSharedMemory(shm, counter_addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_DetachSharedMemory failed\n");
-        exit(1);
-    }
-    if (PR_CloseSharedMemory(shm) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSharedMemory failed\n");
-        exit(1);
-    }
-    if (PR_CloseSemaphore(sem1) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-    if (PR_CloseSemaphore(sem2) == PR_FAILURE) {
-        fprintf(stderr, "PR_CloseSemaphore failed\n");
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/sendzlf.c b/libs/js/nsprpub/pr/tests/sendzlf.c
deleted file mode 100644
index 5416475b27..0000000000
--- a/libs/js/nsprpub/pr/tests/sendzlf.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test: sendzlf.c 
- *
- * Description: send a zero-length file with PR_SendFile and
- * PR_TransmitFile.
- */
-
-#define ZERO_LEN_FILE_NAME "zerolen.tmp"
-#define HEADER_STR "Header"
-#define HEADER_LEN 6 /* length of HEADER_STR, not counting the null byte */
-#define TRAILER_STR "Trailer"
-#define TRAILER_LEN 7 /* length of TRAILER_STR, not counting the null byte */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void ClientThread(void *arg)
-{
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    PRUint16 port = (PRUint16) arg;
-    char buf[1024];
-    char *bufPtr;
-    PRInt32 nbytes;
-    PRInt32 ntotal;
-    PRInt32 nexpected;
-
-    sock = PR_NewTCPSocket();
-    if (NULL == sock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    if (PR_InitializeNetAddr(PR_IpAddrLoopback, port, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-        fprintf(stderr, "PR_Connect failed\n");
-        exit(1);
-    }
-    ntotal = 0;
-    bufPtr = buf;
-    while ((nbytes = PR_Read(sock, bufPtr, sizeof(buf)-ntotal)) > 0) {
-        ntotal += nbytes;
-        bufPtr += nbytes;
-    }
-    if (-1 == nbytes) {
-        fprintf(stderr, "PR_Read failed\n");
-        exit(1);
-    }
-    nexpected = HEADER_LEN+TRAILER_LEN+TRAILER_LEN+HEADER_LEN+HEADER_LEN;
-    if (ntotal != nexpected) {
-        fprintf(stderr, "total bytes read should be %d but is %d\n",
-                nexpected, ntotal);
-        exit(1);
-    }
-    if (memcmp(buf, HEADER_STR TRAILER_STR TRAILER_STR HEADER_STR HEADER_STR,
-            nexpected) != 0) {
-        fprintf(stderr, "wrong data is received\n");
-        exit(1);
-    }
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-static void ServerThread(void *arg)
-{
-    PRFileDesc *listenSock = (PRFileDesc *) arg;
-    PRFileDesc *acceptSock;
-    PRFileDesc *file;
-    PRSendFileData sfd;
-    char header[1024], trailer[1024];
-    PRInt32 nbytes;
-
-    /* Create a zero-length file */
-    file = PR_Open(ZERO_LEN_FILE_NAME,
-            PR_CREATE_FILE|PR_TRUNCATE|PR_RDWR, 0666);
-    if (NULL == file) {
-        fprintf(stderr, "PR_Open failed\n");
-        exit(1);
-    }
-    sfd.fd = file;
-    sfd.file_offset = 0;
-    sfd.file_nbytes = 0;
-    memcpy(header, HEADER_STR, HEADER_LEN);
-    memcpy(trailer, TRAILER_STR, TRAILER_LEN);
-    sfd.header = header;
-    sfd.hlen = HEADER_LEN;
-    sfd.trailer = trailer;
-    sfd.tlen = TRAILER_LEN;
-    acceptSock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == acceptSock) {
-        fprintf(stderr, "PR_Accept failed\n");
-        exit(1);
-    }
-    /* Send both header and trailer */
-    nbytes = PR_SendFile(acceptSock, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-            PR_INTERVAL_NO_TIMEOUT);
-    if (HEADER_LEN+TRAILER_LEN != nbytes) {
-        fprintf(stderr, "PR_SendFile should return %d but returned %d\n",
-                HEADER_LEN+TRAILER_LEN, nbytes);
-        exit(1);
-    }
-    /* Trailer only, no header */
-    sfd.hlen = 0;
-    nbytes = PR_SendFile(acceptSock, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-            PR_INTERVAL_NO_TIMEOUT);
-    if (TRAILER_LEN != nbytes) {
-        fprintf(stderr, "PR_SendFile should return %d but returned %d\n",
-                TRAILER_LEN, nbytes);
-        exit(1);
-    }
-    /* Header only, no trailer */
-    sfd.hlen = HEADER_LEN;
-    sfd.tlen = 0;
-    nbytes = PR_SendFile(acceptSock, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-            PR_INTERVAL_NO_TIMEOUT);
-    if (HEADER_LEN != nbytes) {
-        fprintf(stderr, "PR_SendFile should return %d but returned %d\n",
-                HEADER_LEN, nbytes);
-        exit(1);
-    }
-    /* Try PR_TransmitFile */
-    nbytes = PR_TransmitFile(acceptSock, file, header, HEADER_LEN,
-            PR_TRANSMITFILE_KEEP_OPEN, PR_INTERVAL_NO_TIMEOUT);
-    if (HEADER_LEN != nbytes) {
-        fprintf(stderr, "PR_TransmitFile should return %d but returned %d\n",
-                HEADER_LEN, nbytes);
-        exit(1);
-    }
-    if (PR_Close(acceptSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_Close(file) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_Delete(ZERO_LEN_FILE_NAME) == PR_FAILURE) {
-        fprintf(stderr, "PR_Delete failed\n");
-        exit(1);
-    }
-}
-
-int main()
-{
-    PRFileDesc *listenSock;
-    PRThread *clientThread;
-    PRThread *serverThread;
-    PRNetAddr addr;
-    PRThreadScope scope = PR_GLOBAL_THREAD;
-
-    listenSock = PR_NewTCPSocket();
-    if (NULL == listenSock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    if (PR_InitializeNetAddr(PR_IpAddrAny, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Bind(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    /* Find out what port number we are bound to. */
-    if (PR_GetSockName(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetSockName failed\n");
-        exit(1);
-    }
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
-            PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
-    if (NULL == clientThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    serverThread = PR_CreateThread(PR_USER_THREAD,
-            ServerThread, listenSock,
-            PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
-    if (NULL == serverThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(clientThread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(serverThread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    if (PR_Close(listenSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/server_test.c b/libs/js/nsprpub/pr/tests/server_test.c
deleted file mode 100644
index 8bb6d99b6c..0000000000
--- a/libs/js/nsprpub/pr/tests/server_test.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** This server simulates a server running in loopback mode.
-**
-** The idea is that a single server is created.  The server initially creates
-** a number of worker threads.  Then, with the server running, a number of 
-** clients are created which start requesting service from the server.
-**
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprthred.h"
-
-#include <string.h>
-
-#define PORT 15004
-#define THREAD_STACKSIZE 0
-
-#define PASS 0
-#define FAIL 1
-static int debug_mode = 0;
-
-static int _iterations = 1000;
-static int _clients = 1;
-static int _client_data = 250;
-static int _server_data = (8*1024);
-
-static PRThreadScope ServerScope, ClientScope;
-
-#define SERVER "Server"
-#define MAIN   "Main"
-
-#define SERVER_STATE_STARTUP 0
-#define SERVER_STATE_READY   1
-#define SERVER_STATE_DYING   2
-#define SERVER_STATE_DEAD    4
-int       ServerState;
-PRLock    *ServerStateCVLock;
-PRCondVar *ServerStateCV;
-
-#undef DEBUGPRINTS
-#ifdef DEBUGPRINTS
-#define DPRINTF printf
-#else
-#define DPRINTF
-#endif
-
-
-/***********************************************************************
-** PRIVATE FUNCTION:    Test_Result
-** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**				status of the test case.
-** INPUTS:      PASS/FAIL
-** OUTPUTS:     None
-** RETURN:      None
-** SIDE EFFECTS:
-**      
-** RESTRICTIONS:
-**      None
-** MEMORY:      NA
-** ALGORITHM:   Determine what the status is and print accordingly.
-**      
-***********************************************************************/
-
-
-static void Test_Result (int result)
-{
-	switch (result)
-	{
-		case PASS:
-			printf ("PASS\n");
-			break;
-		case FAIL:
-			printf ("FAIL\n");
-			break;
-		default:
-			break;
-	}
-}
-
-static void do_work(void);
-
-/* --- Server state functions --------------------------------------------- */
-void
-SetServerState(char *waiter, PRInt32 state)
-{
-    PR_Lock(ServerStateCVLock);
-    ServerState = state;
-    PR_NotifyCondVar(ServerStateCV);
-
-	if (debug_mode) DPRINTF("\t%s changed state to %d\n", waiter, state);
-
-    PR_Unlock(ServerStateCVLock);
-}
-
-int
-WaitServerState(char *waiter, PRInt32 state)
-{
-    PRInt32 rv;
-
-    PR_Lock(ServerStateCVLock);
-
-    if (debug_mode) DPRINTF("\t%s waiting for state %d\n", waiter, state);
-
-    while(!(ServerState & state))
-        PR_WaitCondVar(ServerStateCV, PR_INTERVAL_NO_TIMEOUT);
-    rv = ServerState;
-
-    if (debug_mode) DPRINTF("\t%s resuming from wait for state %d; state now %d\n", 
-        waiter, state, ServerState);
-    PR_Unlock(ServerStateCVLock);
-
-    return rv;
-}
-
-/* --- Server Functions ------------------------------------------- */
-
-PRLock *workerThreadsLock;
-PRInt32 workerThreads;
-PRInt32 workerThreadsBusy;
-
-void
-WorkerThreadFunc(void *_listenSock)
-{
-    PRFileDesc *listenSock = (PRFileDesc *)_listenSock;
-    PRInt32 bytesRead;
-    PRInt32 bytesWritten;
-    char *dataBuf;
-    char *sendBuf;
-
-    if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
-    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
-    if (!dataBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-    sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-
-    if (debug_mode) DPRINTF("\tServer worker thread running\n");
-
-    while(1) {
-        PRInt32 bytesToRead = _client_data;
-        PRInt32 bytesToWrite = _server_data;
-        PRFileDesc *newSock;
-        PRNetAddr *rAddr;
-        PRInt32 loops = 0;
-
-        loops++;
-
-        if (debug_mode) DPRINTF("\tServer thread going into accept\n");
-
-        bytesRead = PR_AcceptRead(listenSock, 
-                                  &newSock,
-                                  &rAddr,
-                                  dataBuf,
-                                  bytesToRead,
-                                  PR_INTERVAL_NO_TIMEOUT);
-
-        if (bytesRead < 0) {
-            if (debug_mode) printf("\tServer error in accept (%d)\n", bytesRead);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tServer accepted connection (%d bytes)\n", bytesRead);
-        
-        PR_AtomicIncrement(&workerThreadsBusy);
-        if (workerThreadsBusy == workerThreads) {
-
-            PR_Lock(workerThreadsLock);
-            if (workerThreadsBusy == workerThreads) {
-                PRThread *WorkerThread;
-
-                WorkerThread = PR_CreateThread(
-                                  PR_SYSTEM_THREAD,
-                                  WorkerThreadFunc,
-                                  listenSock,
-                                  PR_PRIORITY_NORMAL,
-                                  ServerScope,
-                                  PR_UNJOINABLE_THREAD,
-                                  THREAD_STACKSIZE);
-
-                if (!WorkerThread) {
-                    if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                } else {
-                    PR_AtomicIncrement(&workerThreads);
-                    if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
-                }
-            }
-            PR_Unlock(workerThreadsLock);
-        }
- 
-        bytesToRead -= bytesRead;
-        while (bytesToRead) {
-            bytesRead = PR_Recv(newSock, 
-                                dataBuf, 
-                                bytesToRead, 
-                                0, 
-                                PR_INTERVAL_NO_TIMEOUT);
-            if (bytesRead < 0) {
-                if (debug_mode) printf("\tServer error receiving data (%d)\n", bytesRead);
-                continue;
-            }
-            if (debug_mode) DPRINTF("\tServer received %d bytes\n", bytesRead);
-        }
-
-        bytesWritten = PR_Send(newSock,
-                               sendBuf, 
-                               bytesToWrite, 
-                               0, 
-                               PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data) {
-            if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
-                bytesWritten, PR_GetOSError());
-        } else {
-            if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
-        }	
-
-        PR_Close(newSock);
-        PR_AtomicDecrement(&workerThreadsBusy);
-    }
-}
-
-PRFileDesc *
-ServerSetup(void)
-{
-    PRFileDesc *listenSocket;
-    PRNetAddr serverAddr;
-    PRThread *WorkerThread;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-		else Test_Result(FAIL);
-        return NULL;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address: OS error %d\n",
-                PR_GetOSError());
-		else Test_Result(FAIL);
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-		else Test_Result(FAIL);
-        PR_Close(listenSocket);
-
-        return NULL;
-    }
-
-    /* Create Clients */
-    workerThreads = 0;
-    workerThreadsBusy = 0;
-
-    workerThreadsLock = PR_NewLock();
-
-    WorkerThread = PR_CreateThread(
-                      PR_SYSTEM_THREAD,
-                      WorkerThreadFunc,
-                      listenSocket,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_UNJOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-
-    if (!WorkerThread) {
-        if (debug_mode) printf("error creating working thread\n");
-        PR_Close(listenSocket);
-        return NULL;
-    }
-    PR_AtomicIncrement(&workerThreads);
-    if (debug_mode) DPRINTF("\tServer created primordial worker thread\n");
-
-    return listenSocket;
-}
-
-/* The main server loop */
-void
-ServerThreadFunc(void *unused)
-{
-    PRFileDesc *listenSocket;
-
-    /* Do setup */
-    listenSocket = ServerSetup();
-
-    if (!listenSocket) {
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    } else {
-
-        if (debug_mode) DPRINTF("\tServer up\n");
-
-        /* Tell clients they can start now. */
-        SetServerState(SERVER, SERVER_STATE_READY);
-
-        /* Now wait for server death signal */
-        WaitServerState(SERVER, SERVER_STATE_DYING);
-
-        /* Cleanup */
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    }
-}
-
-/* --- Client Functions ------------------------------------------- */
-
-PRInt32 numRequests;
-PRInt32 numClients;
-PRMonitor *clientMonitor;
-
-void
-ClientThreadFunc(void *unused)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSocket;
-    char *sendBuf;
-    char *recvBuf;
-    PRInt32 rv;
-    PRInt32 bytesNeeded;
-
-    sendBuf = (char *)PR_MALLOC(_client_data * sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-    recvBuf = (char *)PR_MALLOC(_server_data * sizeof(char));
-    if (!recvBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    while(numRequests > 0) {
-
-        if ( (numRequests % 10) == 0 )
-            if (debug_mode) printf(".");
-        if (debug_mode) DPRINTF("\tClient starting request %d\n", numRequests);
-
-        clientSocket = PR_NewTCPSocket();
-        if (!clientSocket) {
-            if (debug_mode) printf("Client error creating socket: OS error %d\n",
-		    PR_GetOSError());
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connecting\n");
-
-        rv = PR_Connect(clientSocket, 
-                        &serverAddr,
-                        PR_INTERVAL_NO_TIMEOUT);
-        if (!clientSocket) {
-            if (debug_mode) printf("\tClient error connecting\n");
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connected\n");
-
-        rv = PR_Send(clientSocket, 
-                     sendBuf, 
-                     _client_data, 
-                     0, 
-                     PR_INTERVAL_NO_TIMEOUT);
-        if (rv != _client_data) {
-            if (debug_mode) printf("Client error sending data (%d)\n", rv);
-            PR_Close(clientSocket);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient sent %d bytes\n", rv);
-
-        bytesNeeded = _server_data;
-        while(bytesNeeded) {
-            rv = PR_Recv(clientSocket, 
-                         recvBuf, 
-                         bytesNeeded, 
-                         0, 
-                         PR_INTERVAL_NO_TIMEOUT);
-            if (rv <= 0) {
-                if (debug_mode) printf("Client error receiving data (%d) (%d/%d)\n", 
-                    rv, (_server_data - bytesNeeded), _server_data);
-                break;
-            }
-            if (debug_mode) DPRINTF("\tClient received %d bytes; need %d more\n", rv, bytesNeeded - rv);
-            bytesNeeded -= rv;
-        }
-
-        PR_Close(clientSocket);
- 
-        PR_AtomicDecrement(&numRequests);
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    --numClients;
-    PR_Notify(clientMonitor);
-    PR_ExitMonitor(clientMonitor);
-
-    PR_DELETE(sendBuf);
-    PR_DELETE(recvBuf);
-}
-
-void
-RunClients(void)
-{
-    PRInt32 index;
-
-    numRequests = _iterations;
-    numClients = _clients;
-    clientMonitor = PR_NewMonitor();
-
-    for (index=0; index<_clients; index++) {
-        PRThread *clientThread;
-
-  
-        clientThread = PR_CreateThread(
-                          PR_USER_THREAD,
-                          ClientThreadFunc,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          ClientScope,
-                          PR_UNJOINABLE_THREAD,
-                          THREAD_STACKSIZE);
-
-        if (!clientThread) {
-            if (debug_mode) printf("\terror creating client thread %d\n", index);
-        } else
-            if (debug_mode) DPRINTF("\tMain created client %d/%d\n", index+1, _clients);
-
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    while(numClients)
-        PR_Wait(clientMonitor, PR_INTERVAL_NO_TIMEOUT);
-    PR_ExitMonitor(clientMonitor);
-}
-
-/* --- Main Function ---------------------------------------------- */
-
-static
-void do_work()
-{
-    PRThread *ServerThread;
-    PRInt32 state;
-
-    SetServerState(MAIN, SERVER_STATE_STARTUP);
-    ServerThread = PR_CreateThread(
-                      PR_USER_THREAD,
-                      ServerThreadFunc,
-                      NULL,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_JOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-    if (!ServerThread) {
-        if (debug_mode) printf("error creating main server thread\n");
-        return;
-    }
-
-    /* Wait for server to be ready */
-    state = WaitServerState(MAIN, SERVER_STATE_READY|SERVER_STATE_DEAD);
-
-    if (!(state & SERVER_STATE_DEAD)) {
-        /* Run Test Clients */
-        RunClients();
-
-        /* Send death signal to server */
-        SetServerState(MAIN, SERVER_STATE_DYING);
-    }
-
-    PR_JoinThread(ServerThread);
-}
-
-static void do_workUU(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workUK(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-static void do_workKU(void)
-{
-    ServerScope = PR_GLOBAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workKK(void)
-{
-    ServerScope = PR_GLOBAL_THREAD;
-    ClientScope = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("\n%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-    if (debug_mode) {
-		printf("Enter number of iterations: \n");
-		scanf("%d", &_iterations);
-		printf("Enter number of clients   : \n");
-		scanf("%d", &_clients);
-		printf("Enter size of client data : \n");
-		scanf("%d", &_client_data);
-		printf("Enter size of server data : \n");
-		scanf("%d", &_server_data);
-	}
-	else {
-		_iterations = 10;
-	    _clients = 1;
-		_client_data = 10;
-		_server_data = 10;
-	}
-	
-    if (debug_mode) {
-		printf("\n\n%d iterations with %d client threads.\n", 
-        _iterations, _clients);
-		printf("Sending %d bytes of client data and %d bytes of server data\n", 
-        _client_data, _server_data);
-	}
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    ServerStateCVLock = PR_NewLock();
-    ServerStateCV = PR_NewCondVar(ServerStateCVLock);
-
-    Measure(do_workUU, "server loop user/user");
- #if 0 
-    Measure(do_workUK, "server loop user/kernel");
-    Measure(do_workKU, "server loop kernel/user");
-    Measure(do_workKK, "server loop kernel/kernel");
- #endif 
-
-    PR_Cleanup();
-
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/servr_kk.c b/libs/js/nsprpub/pr/tests/servr_kk.c
deleted file mode 100644
index 9fbb9b00e6..0000000000
--- a/libs/js/nsprpub/pr/tests/servr_kk.c
+++ /dev/null
@@ -1,614 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** This server simulates a server running in loopback mode.
-**
-** The idea is that a single server is created.  The server initially creates
-** a number of worker threads.  Then, with the server running, a number of 
-** clients are created which start requesting service from the server.
-**
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprthred.h"
-
-#include <string.h>
-
-#define PORT 15004
-#define THREAD_STACKSIZE 0
-
-static int _iterations = 1000;
-static int _clients = 1;
-static int _client_data = 250;
-static int _server_data = (8*1024);
-
-static PRThreadScope ServerScope, ClientScope;
-
-#define SERVER "Server"
-#define MAIN   "Main"
-
-#define SERVER_STATE_STARTUP 0
-#define SERVER_STATE_READY   1
-#define SERVER_STATE_DYING   2
-#define SERVER_STATE_DEAD    4
-int       ServerState;
-PRLock    *ServerStateCVLock;
-PRCondVar *ServerStateCV;
-
-#ifdef DEBUGPRINTS
-#define DPRINTF printf
-#else
-#define DPRINTF
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-static void do_work(void);
-
-/* --- Server state functions --------------------------------------------- */
-void
-SetServerState(char *waiter, PRInt32 state)
-{
-    PR_Lock(ServerStateCVLock);
-    ServerState = state;
-    PR_NotifyCondVar(ServerStateCV);
-
-	if (debug_mode) DPRINTF("\t%s changed state to %d\n", waiter, state);
-
-    PR_Unlock(ServerStateCVLock);
-}
-
-int
-WaitServerState(char *waiter, PRInt32 state)
-{
-    PRInt32 rv;
-
-    PR_Lock(ServerStateCVLock);
-
-    if (debug_mode) DPRINTF("\t%s waiting for state %d\n", waiter, state);
-
-    while(!(ServerState & state))
-        PR_WaitCondVar(ServerStateCV, PR_INTERVAL_NO_TIMEOUT);
-    rv = ServerState;
-
-    if (debug_mode) DPRINTF("\t%s resuming from wait for state %d; state now %d\n", 
-        waiter, state, ServerState);
-    PR_Unlock(ServerStateCVLock);
-
-    return rv;
-}
-
-/* --- Server Functions ------------------------------------------- */
-
-PRLock *workerThreadsLock;
-PRInt32 workerThreads;
-PRInt32 workerThreadsBusy;
-
-void
-WorkerThreadFunc(void *_listenSock)
-{
-    PRFileDesc *listenSock = (PRFileDesc *)_listenSock;
-    PRInt32 bytesRead;
-    PRInt32 bytesWritten;
-    char *dataBuf;
-    char *sendBuf;
-
-    if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
-    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
-    if (!dataBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-    sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-
-    if (debug_mode) DPRINTF("\tServer worker thread running\n");
-
-    while(1) {
-        PRInt32 bytesToRead = _client_data;
-        PRInt32 bytesToWrite = _server_data;
-        PRFileDesc *newSock;
-        PRNetAddr *rAddr;
-        PRInt32 loops = 0;
-
-        loops++;
-
-        if (debug_mode) DPRINTF("\tServer thread going into accept\n");
-
-        bytesRead = PR_AcceptRead(listenSock, 
-                                  &newSock,
-                                  &rAddr,
-                                  dataBuf,
-                                  bytesToRead,
-                                  PR_INTERVAL_NO_TIMEOUT);
-
-        if (bytesRead < 0) {
-            if (debug_mode) printf("\tServer error in accept (%d)\n", bytesRead);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tServer accepted connection (%d bytes)\n", bytesRead);
-        
-        PR_AtomicIncrement(&workerThreadsBusy);
-        if (workerThreadsBusy == workerThreads) {
-
-            PR_Lock(workerThreadsLock);
-            if (workerThreadsBusy == workerThreads) {
-                PRThread *WorkerThread;
-
-                WorkerThread = PR_CreateThread(
-                                  PR_SYSTEM_THREAD,
-                                  WorkerThreadFunc,
-                                  listenSock,
-                                  PR_PRIORITY_NORMAL,
-                                  ServerScope,
-                                  PR_UNJOINABLE_THREAD,
-                                  THREAD_STACKSIZE);
-
-                if (!WorkerThread) {
-                    if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                } else {
-                    PR_AtomicIncrement(&workerThreads);
-                    if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
-                }
-            }
-            PR_Unlock(workerThreadsLock);
-        }
- 
-        bytesToRead -= bytesRead;
-        while (bytesToRead) {
-            bytesRead = PR_Recv(newSock, 
-                                dataBuf, 
-                                bytesToRead, 
-                                0, 
-                                PR_INTERVAL_NO_TIMEOUT);
-            if (bytesRead < 0) {
-                if (debug_mode) printf("\tServer error receiving data (%d)\n", bytesRead);
-                continue;
-            }
-            if (debug_mode) DPRINTF("\tServer received %d bytes\n", bytesRead);
-        }
-
-        bytesWritten = PR_Send(newSock,
-                               sendBuf, 
-                               bytesToWrite, 
-                               0, 
-                               PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data) {
-            if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
-                bytesWritten, PR_GetOSError());
-        } else {
-            if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
-        }
-
-        PR_Close(newSock);
-        PR_AtomicDecrement(&workerThreadsBusy);
-    }
-}
-
-PRFileDesc *
-ServerSetup(void)
-{
-    PRFileDesc *listenSocket;
-    PRSocketOptionData sockOpt;
-    PRNetAddr serverAddr;
-    PRThread *WorkerThread;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-		else failed_already=1;
-        return NULL;
-    }
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    if ( PR_SetSocketOption(listenSocket, &sockOpt) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error setting socket option: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-		else failed_already=1;
-        PR_Close(listenSocket);
-
-        return NULL;
-    }
-
-    /* Create Clients */
-    workerThreads = 0;
-    workerThreadsBusy = 0;
-
-    workerThreadsLock = PR_NewLock();
-
-    WorkerThread = PR_CreateThread(
-                      PR_SYSTEM_THREAD,
-                      WorkerThreadFunc,
-                      listenSocket,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_UNJOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-
-    if (!WorkerThread) {
-        if (debug_mode) printf("error creating working thread\n");
-        PR_Close(listenSocket);
-        return NULL;
-    }
-    PR_AtomicIncrement(&workerThreads);
-    if (debug_mode) DPRINTF("\tServer created primordial worker thread\n");
-
-    return listenSocket;
-}
-
-/* The main server loop */
-void
-ServerThreadFunc(void *unused)
-{
-    PRFileDesc *listenSocket;
-
-    /* Do setup */
-    listenSocket = ServerSetup();
-
-    if (!listenSocket) {
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    } else {
-
-        if (debug_mode) DPRINTF("\tServer up\n");
-
-        /* Tell clients they can start now. */
-        SetServerState(SERVER, SERVER_STATE_READY);
-
-        /* Now wait for server death signal */
-        WaitServerState(SERVER, SERVER_STATE_DYING);
-
-        /* Cleanup */
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    }
-}
-
-/* --- Client Functions ------------------------------------------- */
-
-PRInt32 numRequests;
-PRInt32 numClients;
-PRMonitor *clientMonitor;
-
-void
-ClientThreadFunc(void *unused)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSocket;
-    char *sendBuf;
-    char *recvBuf;
-    PRInt32 rv;
-    PRInt32 bytesNeeded;
-
-    sendBuf = (char *)PR_MALLOC(_client_data * sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-    recvBuf = (char *)PR_MALLOC(_server_data * sizeof(char));
-    if (!recvBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    while(numRequests > 0) {
-
-        if ( (numRequests % 10) == 0 )
-            if (debug_mode) printf(".");
-        if (debug_mode) DPRINTF("\tClient starting request %d\n", numRequests);
-
-        clientSocket = PR_NewTCPSocket();
-        if (!clientSocket) {
-            if (debug_mode) printf("Client error creating socket: OS error %d\n",
-		    PR_GetOSError());
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connecting\n");
-
-        rv = PR_Connect(clientSocket, 
-                        &serverAddr,
-                        PR_INTERVAL_NO_TIMEOUT);
-        if (!clientSocket) {
-            if (debug_mode) printf("\tClient error connecting\n");
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connected\n");
-
-        rv = PR_Send(clientSocket, 
-                     sendBuf, 
-                     _client_data, 
-                     0, 
-                     PR_INTERVAL_NO_TIMEOUT);
-        if (rv != _client_data) {
-            if (debug_mode) printf("Client error sending data (%d)\n", rv);
-            PR_Close(clientSocket);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient sent %d bytes\n", rv);
-
-        bytesNeeded = _server_data;
-        while(bytesNeeded) {
-            rv = PR_Recv(clientSocket, 
-                         recvBuf, 
-                         bytesNeeded, 
-                         0, 
-                         PR_INTERVAL_NO_TIMEOUT);
-            if (rv <= 0) {
-                if (debug_mode) printf("Client error receiving data (%d) (%d/%d)\n", 
-                    rv, (_server_data - bytesNeeded), _server_data);
-                break;
-            }
-            if (debug_mode) DPRINTF("\tClient received %d bytes; need %d more\n", rv, bytesNeeded - rv);
-            bytesNeeded -= rv;
-        }
-
-        PR_Close(clientSocket);
- 
-        PR_AtomicDecrement(&numRequests);
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    --numClients;
-    PR_Notify(clientMonitor);
-    PR_ExitMonitor(clientMonitor);
-
-    PR_DELETE(sendBuf);
-    PR_DELETE(recvBuf);
-}
-
-void
-RunClients(void)
-{
-    PRInt32 index;
-
-    numRequests = _iterations;
-    numClients = _clients;
-    clientMonitor = PR_NewMonitor();
-
-    for (index=0; index<_clients; index++) {
-        PRThread *clientThread;
-
-  
-        clientThread = PR_CreateThread(
-                          PR_USER_THREAD,
-                          ClientThreadFunc,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          ClientScope,
-                          PR_UNJOINABLE_THREAD,
-                          THREAD_STACKSIZE);
-
-        if (!clientThread) {
-            if (debug_mode) printf("\terror creating client thread %d\n", index);
-        } else
-            if (debug_mode) DPRINTF("\tMain created client %d/%d\n", index+1, _clients);
-
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    while(numClients)
-        PR_Wait(clientMonitor, PR_INTERVAL_NO_TIMEOUT);
-    PR_ExitMonitor(clientMonitor);
-}
-
-/* --- Main Function ---------------------------------------------- */
-
-static
-void do_work()
-{
-    PRThread *ServerThread;
-    PRInt32 state;
-
-    SetServerState(MAIN, SERVER_STATE_STARTUP);
-    ServerThread = PR_CreateThread(
-                      PR_USER_THREAD,
-                      ServerThreadFunc,
-                      NULL,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_JOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-    if (!ServerThread) {
-        if (debug_mode) printf("error creating main server thread\n");
-        return;
-    }
-
-    /* Wait for server to be ready */
-    state = WaitServerState(MAIN, SERVER_STATE_READY|SERVER_STATE_DEAD);
-
-    if (!(state & SERVER_STATE_DEAD)) {
-        /* Run Test Clients */
-        RunClients();
-
-        /* Send death signal to server */
-        SetServerState(MAIN, SERVER_STATE_DYING);
-    }
-
-    PR_JoinThread(ServerThread);
-}
-
-static void do_workUU(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workUK(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-static void do_workKU(void)
-{
-    ServerScope = PR_GLOBAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-static void do_workKK(void)
-{
-    ServerScope = PR_GLOBAL_THREAD;
-    ClientScope = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("\n%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-int main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-    if (debug_mode) {
-		printf("Enter number of iterations: \n");
-		scanf("%d", &_iterations);
-		printf("Enter number of clients   : \n");
-		scanf("%d", &_clients);
-		printf("Enter size of client data : \n");
-		scanf("%d", &_client_data);
-		printf("Enter size of server data : \n");
-		scanf("%d", &_server_data);
-	}
-	else {
-		_iterations = 7;
-		_clients = 7;
-		_client_data = 100;
-		_server_data = 100;
-	}
-
-    if (debug_mode) {
-		printf("\n\n%d iterations with %d client threads.\n", 
-        _iterations, _clients);
-		printf("Sending %d bytes of client data and %d bytes of server data\n", 
-        _client_data, _server_data);
-	}
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    PR_SetThreadRecycleMode(64);
-
-    ServerStateCVLock = PR_NewLock();
-    ServerStateCV = PR_NewCondVar(ServerStateCVLock);
-
-
-    Measure(do_workKK, "server loop kernel/kernel");
-
-	PR_Cleanup();
-
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-    
-}
diff --git a/libs/js/nsprpub/pr/tests/servr_ku.c b/libs/js/nsprpub/pr/tests/servr_ku.c
deleted file mode 100644
index ab2083d0f6..0000000000
--- a/libs/js/nsprpub/pr/tests/servr_ku.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** This server simulates a server running in loopback mode.
-**
-** The idea is that a single server is created.  The server initially creates
-** a number of worker threads.  Then, with the server running, a number of 
-** clients are created which start requesting service from the server.
-**
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprthred.h"
-
-#include <string.h>
-
-#define PORT 15004
-#define THREAD_STACKSIZE 0
-
-static int _iterations = 1000;
-static int _clients = 1;
-static int _client_data = 250;
-static int _server_data = (8*1024);
-
-static PRThreadScope ServerScope, ClientScope;
-
-#define SERVER "Server"
-#define MAIN   "Main"
-
-#define SERVER_STATE_STARTUP 0
-#define SERVER_STATE_READY   1
-#define SERVER_STATE_DYING   2
-#define SERVER_STATE_DEAD    4
-int       ServerState;
-PRLock    *ServerStateCVLock;
-PRCondVar *ServerStateCV;
-
-#ifdef DEBUGPRINTS
-#define DPRINTF printf
-#else
-#define DPRINTF
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-static void do_work(void);
-
-/* --- Server state functions --------------------------------------------- */
-void
-SetServerState(char *waiter, PRInt32 state)
-{
-    PR_Lock(ServerStateCVLock);
-    ServerState = state;
-    PR_NotifyCondVar(ServerStateCV);
-
-	if (debug_mode) DPRINTF("\t%s changed state to %d\n", waiter, state);
-
-    PR_Unlock(ServerStateCVLock);
-}
-
-int
-WaitServerState(char *waiter, PRInt32 state)
-{
-    PRInt32 rv;
-
-    PR_Lock(ServerStateCVLock);
-
-    if (debug_mode) DPRINTF("\t%s waiting for state %d\n", waiter, state);
-
-    while(!(ServerState & state))
-        PR_WaitCondVar(ServerStateCV, PR_INTERVAL_NO_TIMEOUT);
-    rv = ServerState;
-
-    if (debug_mode) DPRINTF("\t%s resuming from wait for state %d; state now %d\n", 
-        waiter, state, ServerState);
-    PR_Unlock(ServerStateCVLock);
-
-    return rv;
-}
-
-/* --- Server Functions ------------------------------------------- */
-
-PRLock *workerThreadsLock;
-PRInt32 workerThreads;
-PRInt32 workerThreadsBusy;
-
-void
-WorkerThreadFunc(void *_listenSock)
-{
-    PRFileDesc *listenSock = (PRFileDesc *)_listenSock;
-    PRInt32 bytesRead;
-    PRInt32 bytesWritten;
-    char *dataBuf;
-    char *sendBuf;
-
-    if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
-    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
-    if (!dataBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-    sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-
-    if (debug_mode) DPRINTF("\tServer worker thread running\n");
-
-    while(1) {
-        PRInt32 bytesToRead = _client_data;
-        PRInt32 bytesToWrite = _server_data;
-        PRFileDesc *newSock;
-        PRNetAddr *rAddr;
-        PRInt32 loops = 0;
-
-        loops++;
-
-        if (debug_mode) DPRINTF("\tServer thread going into accept\n");
-
-        bytesRead = PR_AcceptRead(listenSock, 
-                                  &newSock,
-                                  &rAddr,
-                                  dataBuf,
-                                  bytesToRead,
-                                  PR_INTERVAL_NO_TIMEOUT);
-
-        if (bytesRead < 0) {
-            if (debug_mode) printf("\tServer error in accept (%d)\n", bytesRead);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tServer accepted connection (%d bytes)\n", bytesRead);
-        
-        PR_AtomicIncrement(&workerThreadsBusy);
-        if (workerThreadsBusy == workerThreads) {
-
-            PR_Lock(workerThreadsLock);
-            if (workerThreadsBusy == workerThreads) {
-                PRThread *WorkerThread;
-
-                WorkerThread = PR_CreateThread(
-                                  PR_SYSTEM_THREAD,
-                                  WorkerThreadFunc,
-                                  listenSock,
-                                  PR_PRIORITY_NORMAL,
-                                  ServerScope,
-                                  PR_UNJOINABLE_THREAD,
-                                  THREAD_STACKSIZE);
-
-                if (!WorkerThread) {
-                    if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                } else {
-                    PR_AtomicIncrement(&workerThreads);
-                    if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
-                }
-            }
-            PR_Unlock(workerThreadsLock);
-        }
- 
-        bytesToRead -= bytesRead;
-        while (bytesToRead) {
-            bytesRead = PR_Recv(newSock, 
-                                dataBuf, 
-                                bytesToRead, 
-                                0, 
-                                PR_INTERVAL_NO_TIMEOUT);
-            if (bytesRead < 0) {
-                if (debug_mode) printf("\tServer error receiving data (%d)\n", bytesRead);
-                continue;
-            }
-            if (debug_mode) DPRINTF("\tServer received %d bytes\n", bytesRead);
-        }
-
-        bytesWritten = PR_Send(newSock,
-                               sendBuf, 
-                               bytesToWrite, 
-                               0, 
-                               PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data) {
-            if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
-                bytesWritten, PR_GetOSError());
-        } else {
-            if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
-        }
-
-        PR_Close(newSock);
-        PR_AtomicDecrement(&workerThreadsBusy);
-    }
-}
-
-PRFileDesc *
-ServerSetup(void)
-{
-    PRFileDesc *listenSocket;
-    PRSocketOptionData sockOpt;
-    PRNetAddr serverAddr;
-    PRThread *WorkerThread;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-		else failed_already=1;
-        return NULL;
-    }
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    if ( PR_SetSocketOption(listenSocket, &sockOpt) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error setting socket option: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-		else failed_already=1;
-        PR_Close(listenSocket);
-
-        return NULL;
-    }
-
-    /* Create Clients */
-    workerThreads = 0;
-    workerThreadsBusy = 0;
-
-    workerThreadsLock = PR_NewLock();
-
-    WorkerThread = PR_CreateThread(
-                      PR_SYSTEM_THREAD,
-                      WorkerThreadFunc,
-                      listenSocket,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_UNJOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-
-    if (!WorkerThread) {
-        if (debug_mode) printf("error creating working thread\n");
-        PR_Close(listenSocket);
-        return NULL;
-    }
-    PR_AtomicIncrement(&workerThreads);
-    if (debug_mode) DPRINTF("\tServer created primordial worker thread\n");
-
-    return listenSocket;
-}
-
-/* The main server loop */
-void
-ServerThreadFunc(void *unused)
-{
-    PRFileDesc *listenSocket;
-
-    /* Do setup */
-    listenSocket = ServerSetup();
-
-    if (!listenSocket) {
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    } else {
-
-        if (debug_mode) DPRINTF("\tServer up\n");
-
-        /* Tell clients they can start now. */
-        SetServerState(SERVER, SERVER_STATE_READY);
-
-        /* Now wait for server death signal */
-        WaitServerState(SERVER, SERVER_STATE_DYING);
-
-        /* Cleanup */
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    }
-}
-
-/* --- Client Functions ------------------------------------------- */
-
-PRInt32 numRequests;
-PRInt32 numClients;
-PRMonitor *clientMonitor;
-
-void
-ClientThreadFunc(void *unused)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSocket;
-    char *sendBuf;
-    char *recvBuf;
-    PRInt32 rv;
-    PRInt32 bytesNeeded;
-
-    sendBuf = (char *)PR_MALLOC(_client_data * sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-    recvBuf = (char *)PR_MALLOC(_server_data * sizeof(char));
-    if (!recvBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    while(numRequests > 0) {
-
-        if ( (numRequests % 10) == 0 )
-            if (debug_mode) printf(".");
-        if (debug_mode) DPRINTF("\tClient starting request %d\n", numRequests);
-
-        clientSocket = PR_NewTCPSocket();
-        if (!clientSocket) {
-            if (debug_mode) printf("Client error creating socket: OS error %d\n",
-		    PR_GetOSError());
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connecting\n");
-
-        rv = PR_Connect(clientSocket, 
-                        &serverAddr,
-                        PR_INTERVAL_NO_TIMEOUT);
-        if (!clientSocket) {
-            if (debug_mode) printf("\tClient error connecting\n");
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connected\n");
-
-        rv = PR_Send(clientSocket, 
-                     sendBuf, 
-                     _client_data, 
-                     0, 
-                     PR_INTERVAL_NO_TIMEOUT);
-        if (rv != _client_data) {
-            if (debug_mode) printf("Client error sending data (%d)\n", rv);
-            PR_Close(clientSocket);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient sent %d bytes\n", rv);
-
-        bytesNeeded = _server_data;
-        while(bytesNeeded) {
-            rv = PR_Recv(clientSocket, 
-                         recvBuf, 
-                         bytesNeeded, 
-                         0, 
-                         PR_INTERVAL_NO_TIMEOUT);
-            if (rv <= 0) {
-                if (debug_mode) printf("Client error receiving data (%d) (%d/%d)\n", 
-                    rv, (_server_data - bytesNeeded), _server_data);
-                break;
-            }
-            if (debug_mode) DPRINTF("\tClient received %d bytes; need %d more\n", rv, bytesNeeded - rv);
-            bytesNeeded -= rv;
-        }
-
-        PR_Close(clientSocket);
- 
-        PR_AtomicDecrement(&numRequests);
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    --numClients;
-    PR_Notify(clientMonitor);
-    PR_ExitMonitor(clientMonitor);
-
-    PR_DELETE(sendBuf);
-    PR_DELETE(recvBuf);
-}
-
-void
-RunClients(void)
-{
-    PRInt32 index;
-
-    numRequests = _iterations;
-    numClients = _clients;
-    clientMonitor = PR_NewMonitor();
-
-    for (index=0; index<_clients; index++) {
-        PRThread *clientThread;
-
-  
-        clientThread = PR_CreateThread(
-                          PR_USER_THREAD,
-                          ClientThreadFunc,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          ClientScope,
-                          PR_UNJOINABLE_THREAD,
-                          THREAD_STACKSIZE);
-
-        if (!clientThread) {
-            if (debug_mode) printf("\terror creating client thread %d\n", index);
-        } else
-            if (debug_mode) DPRINTF("\tMain created client %d/%d\n", index+1, _clients);
-
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    while(numClients)
-        PR_Wait(clientMonitor, PR_INTERVAL_NO_TIMEOUT);
-    PR_ExitMonitor(clientMonitor);
-}
-
-/* --- Main Function ---------------------------------------------- */
-
-static
-void do_work()
-{
-    PRThread *ServerThread;
-    PRInt32 state;
-
-    SetServerState(MAIN, SERVER_STATE_STARTUP);
-    ServerThread = PR_CreateThread(
-                      PR_USER_THREAD,
-                      ServerThreadFunc,
-                      NULL,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_JOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-    if (!ServerThread) {
-        if (debug_mode) printf("error creating main server thread\n");
-        return;
-    }
-
-    /* Wait for server to be ready */
-    state = WaitServerState(MAIN, SERVER_STATE_READY|SERVER_STATE_DEAD);
-
-    if (!(state & SERVER_STATE_DEAD)) {
-        /* Run Test Clients */
-        RunClients();
-
-        /* Send death signal to server */
-        SetServerState(MAIN, SERVER_STATE_DYING);
-    }
-
-    PR_JoinThread(ServerThread);
-}
-
-
-static void do_workKU(void)
-{
-    ServerScope = PR_GLOBAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("\n%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-    if (debug_mode) {
-		printf("Enter number of iterations: \n");
-		scanf("%d", &_iterations);
-		printf("Enter number of clients   : \n");
-		scanf("%d", &_clients);
-		printf("Enter size of client data : \n");
-		scanf("%d", &_client_data);
-		printf("Enter size of server data : \n");
-		scanf("%d", &_server_data);
-	}
-	else {
-		_iterations = 7;
-		_clients = 7;
-		_client_data = 100;
-		_server_data = 100;
-	}
-
-    if (debug_mode) {
-		printf("\n\n%d iterations with %d client threads.\n", 
-        _iterations, _clients);
-		printf("Sending %d bytes of client data and %d bytes of server data\n", 
-        _client_data, _server_data);
-	}
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    PR_SetThreadRecycleMode(64);
-
-    ServerStateCVLock = PR_NewLock();
-    ServerStateCV = PR_NewCondVar(ServerStateCVLock);
-
-    Measure(do_workKU, "server loop kernel/user");
-
-    PR_Cleanup();
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/servr_uk.c b/libs/js/nsprpub/pr/tests/servr_uk.c
deleted file mode 100644
index 727b7b472a..0000000000
--- a/libs/js/nsprpub/pr/tests/servr_uk.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** This server simulates a server running in loopback mode.
-**
-** The idea is that a single server is created.  The server initially creates
-** a number of worker threads.  Then, with the server running, a number of 
-** clients are created which start requesting service from the server.
-**
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprthred.h"
-
-#include <string.h>
-
-#define PORT 15004
-#define THREAD_STACKSIZE 0
-
-static int _iterations = 1000;
-static int _clients = 1;
-static int _client_data = 250;
-static int _server_data = (8*1024);
-
-static PRThreadScope ServerScope, ClientScope;
-
-#define SERVER "Server"
-#define MAIN   "Main"
-
-#define SERVER_STATE_STARTUP 0
-#define SERVER_STATE_READY   1
-#define SERVER_STATE_DYING   2
-#define SERVER_STATE_DEAD    4
-int       ServerState;
-PRLock    *ServerStateCVLock;
-PRCondVar *ServerStateCV;
-
-#ifdef DEBUGPRINTS
-#define DPRINTF printf
-#else
-#define DPRINTF
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-
-
-static void do_work(void);
-
-/* --- Server state functions --------------------------------------------- */
-void
-SetServerState(char *waiter, PRInt32 state)
-{
-    PR_Lock(ServerStateCVLock);
-    ServerState = state;
-    PR_NotifyCondVar(ServerStateCV);
-
-	if (debug_mode) DPRINTF("\t%s changed state to %d\n", waiter, state);
-
-    PR_Unlock(ServerStateCVLock);
-}
-
-int
-WaitServerState(char *waiter, PRInt32 state)
-{
-    PRInt32 rv;
-
-    PR_Lock(ServerStateCVLock);
-
-    if (debug_mode) DPRINTF("\t%s waiting for state %d\n", waiter, state);
-
-    while(!(ServerState & state))
-        PR_WaitCondVar(ServerStateCV, PR_INTERVAL_NO_TIMEOUT);
-    rv = ServerState;
-
-    if (debug_mode) DPRINTF("\t%s resuming from wait for state %d; state now %d\n", 
-        waiter, state, ServerState);
-    PR_Unlock(ServerStateCVLock);
-
-    return rv;
-}
-
-/* --- Server Functions ------------------------------------------- */
-
-PRLock *workerThreadsLock;
-PRInt32 workerThreads;
-PRInt32 workerThreadsBusy;
-
-void
-WorkerThreadFunc(void *_listenSock)
-{
-    PRFileDesc *listenSock = (PRFileDesc *)_listenSock;
-    PRInt32 bytesRead;
-    PRInt32 bytesWritten;
-    char *dataBuf;
-    char *sendBuf;
-
-    if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
-    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
-    if (!dataBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-    sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-
-    if (debug_mode) DPRINTF("\tServer worker thread running\n");
-
-    while(1) {
-        PRInt32 bytesToRead = _client_data;
-        PRInt32 bytesToWrite = _server_data;
-        PRFileDesc *newSock;
-        PRNetAddr *rAddr;
-        PRInt32 loops = 0;
-
-        loops++;
-
-        if (debug_mode) DPRINTF("\tServer thread going into accept\n");
-
-        bytesRead = PR_AcceptRead(listenSock, 
-                                  &newSock,
-                                  &rAddr,
-                                  dataBuf,
-                                  bytesToRead,
-                                  PR_INTERVAL_NO_TIMEOUT);
-
-        if (bytesRead < 0) {
-            if (debug_mode) printf("\tServer error in accept (%d)\n", bytesRead);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tServer accepted connection (%d bytes)\n", bytesRead);
-        
-        PR_AtomicIncrement(&workerThreadsBusy);
-        if (workerThreadsBusy == workerThreads) {
-
-            PR_Lock(workerThreadsLock);
-            if (workerThreadsBusy == workerThreads) {
-                PRThread *WorkerThread;
-
-                WorkerThread = PR_CreateThread(
-                                  PR_SYSTEM_THREAD,
-                                  WorkerThreadFunc,
-                                  listenSock,
-                                  PR_PRIORITY_NORMAL,
-                                  ServerScope,
-                                  PR_UNJOINABLE_THREAD,
-                                  THREAD_STACKSIZE);
-
-                if (!WorkerThread) {
-                    if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                } else {
-                    PR_AtomicIncrement(&workerThreads);
-                    if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
-                }
-            }
-            PR_Unlock(workerThreadsLock);
-        }
- 
-        bytesToRead -= bytesRead;
-        while (bytesToRead) {
-            bytesRead = PR_Recv(newSock, 
-                                dataBuf, 
-                                bytesToRead, 
-                                0, 
-                                PR_INTERVAL_NO_TIMEOUT);
-            if (bytesRead < 0) {
-                if (debug_mode) printf("\tServer error receiving data (%d)\n", bytesRead);
-                continue;
-            }
-            if (debug_mode) DPRINTF("\tServer received %d bytes\n", bytesRead);
-        }
-
-        bytesWritten = PR_Send(newSock,
-                               sendBuf, 
-                               bytesToWrite, 
-                               0, 
-                               PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data) {
-            if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
-                bytesWritten, PR_GetOSError());
-        } else {
-            if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
-        }
-
-        PR_Close(newSock);
-        PR_AtomicDecrement(&workerThreadsBusy);
-    }
-}
-
-PRFileDesc *
-ServerSetup(void)
-{
-    PRFileDesc *listenSocket;
-    PRSocketOptionData sockOpt;
-    PRNetAddr serverAddr;
-    PRThread *WorkerThread;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-		else 
-        return NULL;
-    }
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    if ( PR_SetSocketOption(listenSocket, &sockOpt) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error setting socket option: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-		else failed_already=1;
-        PR_Close(listenSocket);
-
-        return NULL;
-    }
-
-    /* Create Clients */
-    workerThreads = 0;
-    workerThreadsBusy = 0;
-
-    workerThreadsLock = PR_NewLock();
-
-    WorkerThread = PR_CreateThread(
-                      PR_SYSTEM_THREAD,
-                      WorkerThreadFunc,
-                      listenSocket,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_UNJOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-
-    if (!WorkerThread) {
-        if (debug_mode) printf("error creating working thread\n");
-        PR_Close(listenSocket);
-        return NULL;
-    }
-    PR_AtomicIncrement(&workerThreads);
-    if (debug_mode) DPRINTF("\tServer created primordial worker thread\n");
-
-    return listenSocket;
-}
-
-/* The main server loop */
-void
-ServerThreadFunc(void *unused)
-{
-    PRFileDesc *listenSocket;
-
-    /* Do setup */
-    listenSocket = ServerSetup();
-
-    if (!listenSocket) {
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    } else {
-
-        if (debug_mode) DPRINTF("\tServer up\n");
-
-        /* Tell clients they can start now. */
-        SetServerState(SERVER, SERVER_STATE_READY);
-
-        /* Now wait for server death signal */
-        WaitServerState(SERVER, SERVER_STATE_DYING);
-
-        /* Cleanup */
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    }
-}
-
-/* --- Client Functions ------------------------------------------- */
-
-PRInt32 numRequests;
-PRInt32 numClients;
-PRMonitor *clientMonitor;
-
-void
-ClientThreadFunc(void *unused)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSocket;
-    char *sendBuf;
-    char *recvBuf;
-    PRInt32 rv;
-    PRInt32 bytesNeeded;
-
-    sendBuf = (char *)PR_MALLOC(_client_data * sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-    recvBuf = (char *)PR_MALLOC(_server_data * sizeof(char));
-    if (!recvBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    while(numRequests > 0) {
-
-        if ( (numRequests % 10) == 0 )
-            if (debug_mode) printf(".");
-        if (debug_mode) DPRINTF("\tClient starting request %d\n", numRequests);
-
-        clientSocket = PR_NewTCPSocket();
-        if (!clientSocket) {
-            if (debug_mode) printf("Client error creating socket: OS error %d\n",
-		    PR_GetOSError());
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connecting\n");
-
-        rv = PR_Connect(clientSocket, 
-                        &serverAddr,
-                        PR_INTERVAL_NO_TIMEOUT);
-        if (!clientSocket) {
-            if (debug_mode) printf("\tClient error connecting\n");
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connected\n");
-
-        rv = PR_Send(clientSocket, 
-                     sendBuf, 
-                     _client_data, 
-                     0, 
-                     PR_INTERVAL_NO_TIMEOUT);
-        if (rv != _client_data) {
-            if (debug_mode) printf("Client error sending data (%d)\n", rv);
-            PR_Close(clientSocket);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient sent %d bytes\n", rv);
-
-        bytesNeeded = _server_data;
-        while(bytesNeeded) {
-            rv = PR_Recv(clientSocket, 
-                         recvBuf, 
-                         bytesNeeded, 
-                         0, 
-                         PR_INTERVAL_NO_TIMEOUT);
-            if (rv <= 0) {
-                if (debug_mode) printf("Client error receiving data (%d) (%d/%d)\n", 
-                    rv, (_server_data - bytesNeeded), _server_data);
-                break;
-            }
-            if (debug_mode) DPRINTF("\tClient received %d bytes; need %d more\n", rv, bytesNeeded - rv);
-            bytesNeeded -= rv;
-        }
-
-        PR_Close(clientSocket);
- 
-        PR_AtomicDecrement(&numRequests);
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    --numClients;
-    PR_Notify(clientMonitor);
-    PR_ExitMonitor(clientMonitor);
-
-    PR_DELETE(sendBuf);
-    PR_DELETE(recvBuf);
-}
-
-void
-RunClients(void)
-{
-    PRInt32 index;
-
-    numRequests = _iterations;
-    numClients = _clients;
-    clientMonitor = PR_NewMonitor();
-
-    for (index=0; index<_clients; index++) {
-        PRThread *clientThread;
-
-  
-        clientThread = PR_CreateThread(
-                          PR_USER_THREAD,
-                          ClientThreadFunc,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          ClientScope,
-                          PR_UNJOINABLE_THREAD,
-                          THREAD_STACKSIZE);
-
-        if (!clientThread) {
-            if (debug_mode) printf("\terror creating client thread %d\n", index);
-        } else
-            if (debug_mode) DPRINTF("\tMain created client %d/%d\n", index+1, _clients);
-
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    while(numClients)
-        PR_Wait(clientMonitor, PR_INTERVAL_NO_TIMEOUT);
-    PR_ExitMonitor(clientMonitor);
-}
-
-/* --- Main Function ---------------------------------------------- */
-
-static
-void do_work()
-{
-    PRThread *ServerThread;
-    PRInt32 state;
-
-    SetServerState(MAIN, SERVER_STATE_STARTUP);
-    ServerThread = PR_CreateThread(
-                      PR_USER_THREAD,
-                      ServerThreadFunc,
-                      NULL,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_JOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-    if (!ServerThread) {
-        if (debug_mode) printf("error creating main server thread\n");
-        return;
-    }
-
-    /* Wait for server to be ready */
-    state = WaitServerState(MAIN, SERVER_STATE_READY|SERVER_STATE_DEAD);
-
-    if (!(state & SERVER_STATE_DEAD)) {
-        /* Run Test Clients */
-        RunClients();
-
-        /* Send death signal to server */
-        SetServerState(MAIN, SERVER_STATE_DYING);
-    }
-
-    PR_JoinThread(ServerThread);
-}
-
-
-static void do_workUK(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_GLOBAL_THREAD;
-    do_work();
-}
-
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("\n%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-    if (debug_mode) {
-		printf("Enter number of iterations: \n");
-		scanf("%d", &_iterations);
-		printf("Enter number of clients   : \n");
-		scanf("%d", &_clients);
-		printf("Enter size of client data : \n");
-		scanf("%d", &_client_data);
-		printf("Enter size of server data : \n");
-		scanf("%d", &_server_data);
-	}
-	else {
-		_iterations = 7;
-		_clients = 7;
-		_client_data = 100;
-		_server_data = 100;
-	}
-
-    if (debug_mode) {
-		printf("\n\n%d iterations with %d client threads.\n", 
-        _iterations, _clients);
-		printf("Sending %d bytes of client data and %d bytes of server data\n", 
-        _client_data, _server_data);
-	}
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    PR_SetThreadRecycleMode(64);
-
-    ServerStateCVLock = PR_NewLock();
-    ServerStateCV = PR_NewCondVar(ServerStateCVLock);
-
-    Measure(do_workUK, "server loop user/kernel");
-
-    PR_Cleanup();
-
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/servr_uu.c b/libs/js/nsprpub/pr/tests/servr_uu.c
deleted file mode 100644
index 020fadf669..0000000000
--- a/libs/js/nsprpub/pr/tests/servr_uu.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** This server simulates a server running in loopback mode.
-**
-** The idea is that a single server is created.  The server initially creates
-** a number of worker threads.  Then, with the server running, a number of 
-** clients are created which start requesting service from the server.
-**
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement.
-** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprthred.h"
-
-#include <string.h>
-
-#define PORT 15004
-#define THREAD_STACKSIZE 0
-
-static int _iterations = 1000;
-static int _clients = 1;
-static int _client_data = 250;
-static int _server_data = (8*1024);
-
-static PRThreadScope ServerScope, ClientScope;
-
-#define SERVER "Server"
-#define MAIN   "Main"
-
-#define SERVER_STATE_STARTUP 0
-#define SERVER_STATE_READY   1
-#define SERVER_STATE_DYING   2
-#define SERVER_STATE_DEAD    4
-int       ServerState;
-PRLock    *ServerStateCVLock;
-PRCondVar *ServerStateCV;
-
-#ifdef DEBUGPRINTS
-#define DPRINTF printf
-#else
-#define DPRINTF
-#endif
-
-PRIntn failed_already=0;
-PRIntn debug_mode;
-
-static void do_work(void);
-
-/* --- Server state functions --------------------------------------------- */
-void
-SetServerState(char *waiter, PRInt32 state)
-{
-    PR_Lock(ServerStateCVLock);
-    ServerState = state;
-    PR_NotifyCondVar(ServerStateCV);
-
-	if (debug_mode) DPRINTF("\t%s changed state to %d\n", waiter, state);
-
-    PR_Unlock(ServerStateCVLock);
-}
-
-int
-WaitServerState(char *waiter, PRInt32 state)
-{
-    PRInt32 rv;
-
-    PR_Lock(ServerStateCVLock);
-
-    if (debug_mode) DPRINTF("\t%s waiting for state %d\n", waiter, state);
-
-    while(!(ServerState & state))
-        PR_WaitCondVar(ServerStateCV, PR_INTERVAL_NO_TIMEOUT);
-    rv = ServerState;
-
-    if (debug_mode) DPRINTF("\t%s resuming from wait for state %d; state now %d\n", 
-        waiter, state, ServerState);
-    PR_Unlock(ServerStateCVLock);
-
-    return rv;
-}
-
-/* --- Server Functions ------------------------------------------- */
-
-PRLock *workerThreadsLock;
-PRInt32 workerThreads;
-PRInt32 workerThreadsBusy;
-
-void
-WorkerThreadFunc(void *_listenSock)
-{
-    PRFileDesc *listenSock = (PRFileDesc *)_listenSock;
-    PRInt32 bytesRead;
-    PRInt32 bytesWritten;
-    char *dataBuf;
-    char *sendBuf;
-
-    if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
-    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
-    if (!dataBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-    sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tServer could not malloc space!?\n");
-
-    if (debug_mode) DPRINTF("\tServer worker thread running\n");
-
-    while(1) {
-        PRInt32 bytesToRead = _client_data;
-        PRInt32 bytesToWrite = _server_data;
-        PRFileDesc *newSock;
-        PRNetAddr *rAddr;
-        PRInt32 loops = 0;
-
-        loops++;
-
-        if (debug_mode) DPRINTF("\tServer thread going into accept\n");
-
-        bytesRead = PR_AcceptRead(listenSock, 
-                                  &newSock,
-                                  &rAddr,
-                                  dataBuf,
-                                  bytesToRead,
-                                  PR_INTERVAL_NO_TIMEOUT);
-
-        if (bytesRead < 0) {
-            if (debug_mode) printf("\tServer error in accept (%d)\n", bytesRead);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tServer accepted connection (%d bytes)\n", bytesRead);
-        
-        PR_AtomicIncrement(&workerThreadsBusy);
-        if (workerThreadsBusy == workerThreads) {
-
-            PR_Lock(workerThreadsLock);
-            if (workerThreadsBusy == workerThreads) {
-                PRThread *WorkerThread;
-
-                WorkerThread = PR_CreateThread(
-                                  PR_SYSTEM_THREAD,
-                                  WorkerThreadFunc,
-                                  listenSock,
-                                  PR_PRIORITY_NORMAL,
-                                  ServerScope,
-                                  PR_UNJOINABLE_THREAD,
-                                  THREAD_STACKSIZE);
-
-                if (!WorkerThread) {
-                    if (debug_mode) printf("Error creating client thread %d\n", workerThreads);
-                } else {
-                    PR_AtomicIncrement(&workerThreads);
-                    if (debug_mode) DPRINTF("\tServer creates worker (%d)\n", workerThreads);
-                }
-            }
-            PR_Unlock(workerThreadsLock);
-        }
- 
-        bytesToRead -= bytesRead;
-        while (bytesToRead) {
-            bytesRead = PR_Recv(newSock, 
-                                dataBuf, 
-                                bytesToRead, 
-                                0, 
-                                PR_INTERVAL_NO_TIMEOUT);
-            if (bytesRead < 0) {
-                if (debug_mode) printf("\tServer error receiving data (%d)\n", bytesRead);
-                continue;
-            }
-            if (debug_mode) DPRINTF("\tServer received %d bytes\n", bytesRead);
-        }
-
-        bytesWritten = PR_Send(newSock,
-                               sendBuf, 
-                               bytesToWrite, 
-                               0, 
-                               PR_INTERVAL_NO_TIMEOUT);
-        if (bytesWritten != _server_data) {
-            if (debug_mode) printf("\tError sending data to client (%d, %d)\n", 
-                bytesWritten, PR_GetOSError());
-        } else {
-            if (debug_mode) DPRINTF("\tServer sent %d bytes\n", bytesWritten);
-        } 
-
-        PR_Close(newSock);
-        PR_AtomicDecrement(&workerThreadsBusy);
-    }
-}
-
-PRFileDesc *
-ServerSetup(void)
-{
-    PRFileDesc *listenSocket;
-    PRSocketOptionData sockOpt;
-    PRNetAddr serverAddr;
-    PRThread *WorkerThread;
-
-    if ( (listenSocket = PR_NewTCPSocket()) == NULL) {
-        if (debug_mode) printf("\tServer error creating listen socket\n");
-		else failed_already=1;
-        return NULL;
-    }
-
-    sockOpt.option = PR_SockOpt_Reuseaddr;
-    sockOpt.value.reuse_addr = PR_TRUE;
-    if ( PR_SetSocketOption(listenSocket, &sockOpt) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error setting socket option: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-
-    if ( PR_Bind(listenSocket, &serverAddr) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error binding to server address: OS error %d\n",
-                PR_GetOSError());
-		else failed_already=1;
-        PR_Close(listenSocket);
-        return NULL;
-    }
-
-    if ( PR_Listen(listenSocket, 128) == PR_FAILURE) {
-        if (debug_mode) printf("\tServer error listening to server socket\n");
-		else failed_already=1;
-        PR_Close(listenSocket);
-
-        return NULL;
-    }
-
-    /* Create Clients */
-    workerThreads = 0;
-    workerThreadsBusy = 0;
-
-    workerThreadsLock = PR_NewLock();
-
-    WorkerThread = PR_CreateThread(
-                      PR_SYSTEM_THREAD,
-                      WorkerThreadFunc,
-                      listenSocket,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_UNJOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-
-    if (!WorkerThread) {
-        if (debug_mode) printf("error creating working thread\n");
-        PR_Close(listenSocket);
-        return NULL;
-    }
-    PR_AtomicIncrement(&workerThreads);
-    if (debug_mode) DPRINTF("\tServer created primordial worker thread\n");
-
-    return listenSocket;
-}
-
-/* The main server loop */
-void
-ServerThreadFunc(void *unused)
-{
-    PRFileDesc *listenSocket;
-
-    /* Do setup */
-    listenSocket = ServerSetup();
-
-    if (!listenSocket) {
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    } else {
-
-        if (debug_mode) DPRINTF("\tServer up\n");
-
-        /* Tell clients they can start now. */
-        SetServerState(SERVER, SERVER_STATE_READY);
-
-        /* Now wait for server death signal */
-        WaitServerState(SERVER, SERVER_STATE_DYING);
-
-        /* Cleanup */
-        SetServerState(SERVER, SERVER_STATE_DEAD);
-    }
-}
-
-/* --- Client Functions ------------------------------------------- */
-
-PRInt32 numRequests;
-PRInt32 numClients;
-PRMonitor *clientMonitor;
-
-void
-ClientThreadFunc(void *unused)
-{
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSocket;
-    char *sendBuf;
-    char *recvBuf;
-    PRInt32 rv;
-    PRInt32 bytesNeeded;
-
-    sendBuf = (char *)PR_MALLOC(_client_data * sizeof(char));
-    if (!sendBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-    recvBuf = (char *)PR_MALLOC(_server_data * sizeof(char));
-    if (!recvBuf)
-        if (debug_mode) printf("\tClient could not malloc space!?\n");
-
-    memset(&serverAddr, 0, sizeof(PRNetAddr));
-    serverAddr.inet.family = PR_AF_INET;
-    serverAddr.inet.port = PR_htons(PORT);
-    serverAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-
-    while(numRequests > 0) {
-
-        if ( (numRequests % 10) == 0 )
-            if (debug_mode) printf(".");
-        if (debug_mode) DPRINTF("\tClient starting request %d\n", numRequests);
-
-        clientSocket = PR_NewTCPSocket();
-        if (!clientSocket) {
-            if (debug_mode) printf("Client error creating socket: OS error %d\n",
-		    PR_GetOSError());
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connecting\n");
-
-        rv = PR_Connect(clientSocket, 
-                        &serverAddr,
-                        PR_INTERVAL_NO_TIMEOUT);
-        if (!clientSocket) {
-            if (debug_mode) printf("\tClient error connecting\n");
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient connected\n");
-
-        rv = PR_Send(clientSocket, 
-                     sendBuf, 
-                     _client_data, 
-                     0, 
-                     PR_INTERVAL_NO_TIMEOUT);
-        if (rv != _client_data) {
-            if (debug_mode) printf("Client error sending data (%d)\n", rv);
-            PR_Close(clientSocket);
-            continue;
-        }
-
-        if (debug_mode) DPRINTF("\tClient sent %d bytes\n", rv);
-
-        bytesNeeded = _server_data;
-        while(bytesNeeded) {
-            rv = PR_Recv(clientSocket, 
-                         recvBuf, 
-                         bytesNeeded, 
-                         0, 
-                         PR_INTERVAL_NO_TIMEOUT);
-            if (rv <= 0) {
-                if (debug_mode) printf("Client error receiving data (%d) (%d/%d)\n", 
-                    rv, (_server_data - bytesNeeded), _server_data);
-                break;
-            }
-            if (debug_mode) DPRINTF("\tClient received %d bytes; need %d more\n", rv, bytesNeeded - rv);
-            bytesNeeded -= rv;
-        }
-
-        PR_Close(clientSocket);
- 
-        PR_AtomicDecrement(&numRequests);
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    --numClients;
-    PR_Notify(clientMonitor);
-    PR_ExitMonitor(clientMonitor);
-
-    PR_DELETE(sendBuf);
-    PR_DELETE(recvBuf);
-}
-
-void
-RunClients(void)
-{
-    PRInt32 index;
-
-    numRequests = _iterations;
-    numClients = _clients;
-    clientMonitor = PR_NewMonitor();
-
-    for (index=0; index<_clients; index++) {
-        PRThread *clientThread;
-
-  
-        clientThread = PR_CreateThread(
-                          PR_USER_THREAD,
-                          ClientThreadFunc,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          ClientScope,
-                          PR_UNJOINABLE_THREAD,
-                          THREAD_STACKSIZE);
-
-        if (!clientThread) {
-            if (debug_mode) printf("\terror creating client thread %d\n", index);
-        } else
-            if (debug_mode) DPRINTF("\tMain created client %d/%d\n", index+1, _clients);
-
-    }
-
-    PR_EnterMonitor(clientMonitor);
-    while(numClients)
-        PR_Wait(clientMonitor, PR_INTERVAL_NO_TIMEOUT);
-    PR_ExitMonitor(clientMonitor);
-}
-
-/* --- Main Function ---------------------------------------------- */
-
-static
-void do_work()
-{
-    PRThread *ServerThread;
-    PRInt32 state;
-
-    SetServerState(MAIN, SERVER_STATE_STARTUP);
-    ServerThread = PR_CreateThread(
-                      PR_USER_THREAD,
-                      ServerThreadFunc,
-                      NULL,
-                      PR_PRIORITY_NORMAL,
-                      ServerScope,
-                      PR_JOINABLE_THREAD,
-                      THREAD_STACKSIZE);
-    if (!ServerThread) {
-        if (debug_mode) printf("error creating main server thread\n");
-        return;
-    }
-
-    /* Wait for server to be ready */
-    state = WaitServerState(MAIN, SERVER_STATE_READY|SERVER_STATE_DEAD);
-
-    if (!(state & SERVER_STATE_DEAD)) {
-        /* Run Test Clients */
-        RunClients();
-
-        /* Send death signal to server */
-        SetServerState(MAIN, SERVER_STATE_DYING);
-    }
-
-    PR_JoinThread(ServerThread);
-}
-
-static void do_workUU(void)
-{
-    ServerScope = PR_LOCAL_THREAD;
-    ClientScope = PR_LOCAL_THREAD;
-    do_work();
-}
-
-
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-
-    if (debug_mode) printf("\n%40s: %6.2f usec\n", msg, d / _iterations);
-}
-
-
-main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-    if (debug_mode) {
-		printf("Enter number of iterations: \n");
-		scanf("%d", &_iterations);
-		printf("Enter number of clients   : \n");
-		scanf("%d", &_clients);
-		printf("Enter size of client data : \n");
-		scanf("%d", &_client_data);
-		printf("Enter size of server data : \n");
-		scanf("%d", &_server_data);
-	}
-	else {
-		_iterations = 7;
-		_clients = 7;
-		_client_data = 100;
-		_server_data = 100;
-	}
-
-    if (debug_mode) {
-		printf("\n\n%d iterations with %d client threads.\n", 
-        _iterations, _clients);
-		printf("Sending %d bytes of client data and %d bytes of server data\n", 
-        _client_data, _server_data);
-	}
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    PR_SetThreadRecycleMode(64);
-
-    ServerStateCVLock = PR_NewLock();
-    ServerStateCV = PR_NewCondVar(ServerStateCVLock);
-
-    Measure(do_workUU, "server loop user/user");
-
-    PR_Cleanup();
-	
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
-    
-}
diff --git a/libs/js/nsprpub/pr/tests/short_thread.c b/libs/js/nsprpub/pr/tests/short_thread.c
deleted file mode 100644
index 42a52d7ce8..0000000000
--- a/libs/js/nsprpub/pr/tests/short_thread.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-#include "nspr.h"
-#include "plgetopt.h"
-
-/*
- * Create a thread that exits right away; useful for testing race conditions in thread
- * creation
- */
-
-int _debug_on = 0;
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-static void housecleaning(void *cur_time);
-
-int main (int argc, char **argv)
-{
-	static PRIntervalTime thread_start_time;
-	static PRThread *housekeeping_tid = NULL;
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-	{
-		if (PL_OPT_BAD == os) continue;
-		switch (opt->option)
-		{
-			case 'd':  /* debug mode */
-				_debug_on = 1;
-				break;
-			default:
-				break;
-		}
-	}
-	PL_DestroyOptState(opt);
-
-	if (( housekeeping_tid = 
-		PR_CreateThread (PR_USER_THREAD, housecleaning,  (void*)&thread_start_time,
-						 PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0)) 
-																		== NULL ) {
-		fprintf(stderr,
-			"simple_test: Error - PR_CreateThread failed: (%ld, %ld)\n",
-									  PR_GetError(), PR_GetOSError());
-		exit( 1 );
-	}
-	PR_Cleanup();
-	return(0);
-}
-
-static void
-housecleaning (void *cur_time) 
-{
-  DPRINTF(("Child Thread exiting\n"));
-}
diff --git a/libs/js/nsprpub/pr/tests/sigpipe.c b/libs/js/nsprpub/pr/tests/sigpipe.c
deleted file mode 100644
index ecb9689c81..0000000000
--- a/libs/js/nsprpub/pr/tests/sigpipe.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *************************************************************************
- *
- * Test: sigpipe.c
- *
- *     Test the SIGPIPE handler in NSPR.  This test applies to Unix only.
- *
- *************************************************************************
- */
-
-#if !defined(XP_UNIX) && !defined(XP_OS2)
-
-int main(void)
-{
-    /* This test applies to Unix and OS/2 (emx build). */
-    return 0;
-}
-
-#else /* XP_UNIX && OS/2 */
-
-#include "nspr.h"
-
-#ifdef XP_OS2
-#define INCL_DOSQUEUES
-#define INCL_DOSERRORS
-#include <os2.h>
-#endif
-
-#include <stdio.h>
-#ifdef XP_OS2_VACPP
-#define EPIPE EBADF  /* IBM's write() doesn't return EPIPE */
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-static void Test(void *arg)
-{
-#ifdef XP_OS2
-    HFILE pipefd[2];
-#else
-    int pipefd[2];
-#endif
-    int rv;
-    char c = '\0';
-
-#ifdef XP_OS2
-    if (DosCreatePipe(&pipefd[0], &pipefd[1], 4096) != 0) {
-#else
-    if (pipe(pipefd) == -1) {
-#endif
-        fprintf(stderr, "cannot create pipe: %d\n", errno);
-        exit(1);
-    }
-    close(pipefd[0]);
-
-    rv = write(pipefd[1], &c, 1);
-    if (rv != -1) {
-        fprintf(stderr, "write to broken pipe should have failed with EPIPE but returned %d\n", rv);
-        exit(1);
-    }
-    if (errno != EPIPE) {
-        fprintf(stderr, "write to broken pipe failed but with wrong errno: %d\n", errno);
-        exit(1);
-    }
-    close(pipefd[1]);
-    printf("write to broken pipe failed with EPIPE, as expected\n");
-}
-
-int main(void)
-{
-    PRThread *thread;
-
-    /* This initializes NSPR. */
-    PR_SetError(0, 0);
-
-    thread = PR_CreateThread(PR_USER_THREAD, Test, NULL, PR_PRIORITY_NORMAL,
-            PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (thread == NULL) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(thread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-    Test(NULL);
-
-    printf("PASSED\n");
-    return 0;
-}
-
-#endif /* XP_UNIX */
diff --git a/libs/js/nsprpub/pr/tests/sleep.c b/libs/js/nsprpub/pr/tests/sleep.c
deleted file mode 100644
index 518473677d..0000000000
--- a/libs/js/nsprpub/pr/tests/sleep.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#if defined(XP_UNIX) || defined(XP_OS2)
-
-#include <stdio.h>
-
-#ifndef XP_OS2
-#include <unistd.h>
-#endif
-#include <sys/time.h>
-
-#if defined(HAVE_SVID_GETTOD)
-#define GTOD(_a) gettimeofday(_a)
-#else
-#define GTOD(_a) gettimeofday((_a), NULL)
-#endif
-
-#if defined (XP_OS2_VACPP)
-#define INCL_DOSPROCESS
-#include <os2.h>
-#endif
-
-static PRIntn rv = 0;
-
-static void Other(void *unused)
-{
-    PRIntn didit = 0;
-    while (PR_SUCCESS == PR_Sleep(PR_MillisecondsToInterval(250)))
-    {
-        fprintf(stderr, ".");
-        didit += 1;
-    }
-    if (didit < 5) rv = 1;
-}
-
-PRIntn main ()
-{
-    PRUint32 elapsed;
-    PRThread *thread;
-	struct timeval timein, timeout;
-    PRInt32 onePercent = 3000000UL / 100UL;
-
-	fprintf (stderr, "First sleep will sleep 3 seconds.\n");
-	fprintf (stderr, "   sleep 1 begin\n");
-    (void)GTOD(&timein);
-	sleep (3);
-    (void)GTOD(&timeout);
-	fprintf (stderr, "   sleep 1 end\n");
-    elapsed = 1000000UL * (timeout.tv_sec - timein.tv_sec);
-    elapsed += (timeout.tv_usec - timein.tv_usec);
-    fprintf(stderr, "elapsed %u usecs\n", elapsed);
-    if (labs(elapsed - 3000000UL) > onePercent) rv = 1;
-
-	PR_Init (PR_USER_THREAD, PR_PRIORITY_NORMAL, 100);
-    PR_STDIO_INIT();
-
-	fprintf (stderr, "Second sleep should do the same (does it?).\n");
-	fprintf (stderr, "   sleep 2 begin\n");
-    (void)GTOD(&timein);
-	sleep (3);
-    (void)GTOD(&timeout);
-	fprintf (stderr, "   sleep 2 end\n");
-    elapsed = 1000000UL * (timeout.tv_sec - timein.tv_sec);
-    elapsed += (timeout.tv_usec - timein.tv_usec);
-    fprintf(stderr, "elapsed %u usecs\n", elapsed);
-    if (labs(elapsed - 3000000UL) > onePercent) rv = 1;
-
-	fprintf (stderr, "What happens to other threads?\n");
-	fprintf (stderr, "You should see dots every quarter second.\n");
-	fprintf (stderr, "If you don't, you're probably running on classic NSPR.\n");
-    thread = PR_CreateThread(
-        PR_USER_THREAD, Other, NULL, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-	fprintf (stderr, "   sleep 2 begin\n");
-    (void)GTOD(&timein);
-	sleep (3);
-    (void)GTOD(&timeout);
-	fprintf (stderr, "   sleep 2 end\n");
-    PR_Interrupt(thread);
-    PR_JoinThread(thread);
-    elapsed = 1000000UL * (timeout.tv_sec - timein.tv_sec);
-    elapsed += (timeout.tv_usec - timein.tv_usec);
-    fprintf(stderr, "elapsed %u usecs\n", elapsed);
-    if (labs(elapsed - 3000000UL) > onePercent) rv = 1;
-    fprintf(stderr, "%s\n", (0 == rv) ? "PASSED" : "FAILED");
-    return rv;
-}
-
-#else /* defined(XP_UNIX) */
-
-PRIntn main()
-{
-	return 2;
-}
-
-#endif /*  defined(XP_UNIX) */
-
diff --git a/libs/js/nsprpub/pr/tests/socket.c b/libs/js/nsprpub/pr/tests/socket.c
deleted file mode 100644
index 8e4a899b39..0000000000
--- a/libs/js/nsprpub/pr/tests/socket.c
+++ /dev/null
@@ -1,2354 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: socket.c
-**
-** Description: Test socket functionality.
-**
-** Modification History:
-*/
-#include "primpl.h"
-
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#ifdef XP_UNIX
-#include <sys/mman.h>
-#endif
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include <pthread.h>
-#endif
-
-#ifdef WIN32
-#include <process.h>
-#endif
-
-static int _debug_on = 0;
-static int test_cancelio = 0;
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "prsem.h"
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-    PR_LogPrint(fmt);
-    return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-#ifdef XP_PC
-#define mode_t int
-#endif
-
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-#ifdef XP_PC
-char *TEST_DIR = "prdir";
-char *SMALL_FILE_NAME = "prsmallf";
-char *LARGE_FILE_NAME = "prlargef";
-#else
-char *TEST_DIR = "/tmp/prsocket_test_dir";
-char *SMALL_FILE_NAME = "/tmp/prsocket_test_dir/small_file";
-char *LARGE_FILE_NAME = "/tmp/prsocket_test_dir/large_file";
-#endif
-#define SMALL_FILE_SIZE				(3 * 1024)        /* 3 KB        */
-#define SMALL_FILE_OFFSET_1			(512)
-#define SMALL_FILE_LEN_1			(1 * 1024)        /* 1 KB        */
-#define SMALL_FILE_OFFSET_2			(75)
-#define SMALL_FILE_LEN_2			(758)
-#define SMALL_FILE_OFFSET_3			(1024)
-#define SMALL_FILE_LEN_3			(SMALL_FILE_SIZE - SMALL_FILE_OFFSET_3)
-#define SMALL_FILE_HEADER_SIZE    	(64)            /* 64 bytes    */
-#define SMALL_FILE_TRAILER_SIZE   	(128)           /* 128 bytes    */
-
-#define LARGE_FILE_SIZE				(3 * 1024 * 1024)    /* 3 MB        */
-#define LARGE_FILE_OFFSET_1			(0)
-#define LARGE_FILE_LEN_1			(2 * 1024 * 1024)    /* 2 MB        */
-#define LARGE_FILE_OFFSET_2			(64)
-#define LARGE_FILE_LEN_2			(1 * 1024 * 1024 + 75)
-#define LARGE_FILE_OFFSET_3			(2 * 1024 * 1024 - 128)
-#define LARGE_FILE_LEN_3			(LARGE_FILE_SIZE - LARGE_FILE_OFFSET_3)
-#define LARGE_FILE_OFFSET_4			PR_GetPageSize()
-#define LARGE_FILE_LEN_4			769
-#define LARGE_FILE_HEADER_SIZE    	(512)
-#define LARGE_FILE_TRAILER_SIZE   	(64)
-
-#define    BUF_DATA_SIZE    (2 * 1024)
-#define TCP_MESG_SIZE    1024
-/*
- * set UDP datagram size small enough that datagrams sent to a port on the
- * local host will not be lost
- */
-#define UDP_DGRAM_SIZE            128
-#define NUM_TCP_CLIENTS            5	/* for a listen queue depth of 5 */
-#define NUM_UDP_CLIENTS            10
-
-#ifndef XP_MAC
-#define NUM_TRANSMITFILE_CLIENTS    4
-#else
-/* Mac can't handle more than 2* (3Mb) allocations for large file size buffers */
-#define NUM_TRANSMITFILE_CLIENTS    2
-#endif
-
-#define NUM_TCP_CONNECTIONS_PER_CLIENT    5
-#define NUM_TCP_MESGS_PER_CONNECTION    10
-#define NUM_UDP_DATAGRAMS_PER_CLIENT    5
-#define TCP_SERVER_PORT            10000
-#define UDP_SERVER_PORT            TCP_SERVER_PORT
-#define SERVER_MAX_BIND_COUNT        100
-
-static PRInt32 num_tcp_clients = NUM_TCP_CLIENTS;
-static PRInt32 num_udp_clients = NUM_UDP_CLIENTS;
-static PRInt32 num_transmitfile_clients = NUM_TRANSMITFILE_CLIENTS;
-static PRInt32 num_tcp_connections_per_client = NUM_TCP_CONNECTIONS_PER_CLIENT;
-static PRInt32 tcp_mesg_size = TCP_MESG_SIZE;
-static PRInt32 num_tcp_mesgs_per_connection = NUM_TCP_MESGS_PER_CONNECTION;
-static PRInt32 num_udp_datagrams_per_client = NUM_UDP_DATAGRAMS_PER_CLIENT;
-static PRInt32 udp_datagram_size = UDP_DGRAM_SIZE;
-
-static PRInt32 thread_count;
-PRUint16 server_domain = PR_AF_INET, client_domain = PR_AF_INET;
-
-/* an I/O layer that uses the emulated senfile method */
-static PRDescIdentity emuSendFileIdentity;
-static PRIOMethods emuSendFileMethods;
-
-int failed_already=0;
-typedef struct buffer {
-    char    data[BUF_DATA_SIZE];
-} buffer;
-
-PRNetAddr tcp_server_addr, udp_server_addr;
-
-typedef struct Serve_Client_Param {
-    PRFileDesc *sockfd;    /* socket to read from/write to    */
-    PRInt32    datalen;    /* bytes of data transfered in each read/write */
-} Serve_Client_Param;
-
-typedef struct Server_Param {
-    PRSemaphore *addr_sem;    /* sem to post on, after setting up the address */
-    PRMonitor *exit_mon;    /* monitor to signal on exit            */
-    PRInt32 *exit_counter;    /* counter to decrement, before exit        */
-    PRInt32    datalen;    /* bytes of data transfered in each read/write    */
-} Server_Param;
-
-
-typedef struct Client_Param {
-    PRNetAddr server_addr;
-    PRMonitor *exit_mon;    /* monitor to signal on exit */
-    PRInt32 *exit_counter;    /* counter to decrement, before exit */
-    PRInt32    datalen;
-    PRInt32    udp_connect;    /* if set clients connect udp sockets */
-} Client_Param;
-
-/* the sendfile method in emuSendFileMethods */
-static PRInt32 PR_CALLBACK
-emu_SendFile(PRFileDesc *sd, PRSendFileData *sfd,
-    PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    return PR_EmulateSendFile(sd, sfd, flags, timeout);
-}
-
-/* the transmitfile method in emuSendFileMethods */
-static PRInt32 PR_CALLBACK
-emu_TransmitFile(PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-    PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime timeout)
-{
-    PRSendFileData sfd;
-
-    sfd.fd = fd;
-    sfd.file_offset = 0;
-    sfd.file_nbytes = 0;
-    sfd.header = headers;
-    sfd.hlen = hlen;
-    sfd.trailer = NULL;
-    sfd.tlen = 0;
-    return emu_SendFile(sd, &sfd, flags, timeout);
-}
-
-/*
- * readn
- *    read data from sockfd into buf
- */
-static PRInt32
-readn(PRFileDesc *sockfd, char *buf, int len)
-{
-    int rem;
-    int bytes;
-    int offset = 0;
-	int err;
-	PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
-
-	if (test_cancelio)
-		timeout = PR_SecondsToInterval(2);
-
-    for (rem=len; rem; offset += bytes, rem -= bytes) {
-        DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n",
-            PR_GetCurrentThread(), rem));
-retry:
-        bytes = PR_Recv(sockfd, buf + offset, rem, 0,
-            	timeout);
-        DPRINTF(("thread = 0x%lx: returning from PR_Recv, bytes = %d\n",
-            PR_GetCurrentThread(), bytes));
-        if (bytes < 0) {
-#ifdef WINNT
-			printf("PR_Recv: error = %d oserr = %d\n",(err = PR_GetError()),
-									PR_GetOSError());
-			if ((test_cancelio) && (err == PR_IO_TIMEOUT_ERROR)) {
-				if (PR_NT_CancelIo(sockfd) != PR_SUCCESS)
-					printf("PR_NT_CancelIO: error = %d\n",PR_GetError());
-				timeout = PR_INTERVAL_NO_TIMEOUT;
-				goto retry;
-			}
-#endif
-			return -1;
-		}	
-    }
-    return len;
-}
-
-/*
- * writen
- *    write data from buf to sockfd
- */
-static PRInt32
-writen(PRFileDesc *sockfd, char *buf, int len)
-{
-    int rem;
-    int bytes;
-    int offset = 0;
-
-    for (rem=len; rem; offset += bytes, rem -= bytes) {
-        DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n",
-            PR_GetCurrentThread(), rem));
-        bytes = PR_Send(sockfd, buf + offset, rem, 0,
-            PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("thread = 0x%lx: returning from PR_Send, bytes = %d\n",
-            PR_GetCurrentThread(), bytes));
-        if (bytes <= 0)
-            return -1;
-    }
-    return len;
-}
-
-/*
- * Serve_Client
- *    Thread, started by the server, for serving a client connection.
- *    Reads data from socket and writes it back, unmodified, and
- *    closes the socket
- */
-static void PR_CALLBACK
-Serve_Client(void *arg)
-{
-    Serve_Client_Param *scp = (Serve_Client_Param *) arg;
-    PRFileDesc *sockfd;
-    buffer *in_buf;
-    PRInt32 bytes, j;
-
-    sockfd = scp->sockfd;
-    bytes = scp->datalen;
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        goto exit;
-    }
-
-
-    for (j = 0; j < num_tcp_mesgs_per_connection; j++) {
-        /*
-         * Read data from client and send it back to the client unmodified
-         */
-        if (readn(sockfd, in_buf->data, bytes) < bytes) {
-            fprintf(stderr,"prsocket_test: ERROR - Serve_Client:readn\n");
-            failed_already=1;
-            goto exit;
-        }
-        /*
-         * shutdown reads, after the last read
-         */
-        if (j == num_tcp_mesgs_per_connection - 1)
-            if (PR_Shutdown(sockfd, PR_SHUTDOWN_RCV) < 0) {
-                fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n");
-            }
-        DPRINTF(("Serve_Client [0x%lx]: inbuf[0] = 0x%lx\n",PR_GetCurrentThread(),
-            (*((int *) in_buf->data))));
-        if (writen(sockfd, in_buf->data, bytes) < bytes) {
-            fprintf(stderr,"prsocket_test: ERROR - Serve_Client:writen\n");
-            failed_already=1;
-            goto exit;
-        }
-    }
-    /*
-     * shutdown reads and writes
-     */
-    if (PR_Shutdown(sockfd, PR_SHUTDOWN_BOTH) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n");
-        failed_already=1;
-    }
-
-exit:
-    PR_Close(sockfd);
-    if (in_buf) {
-        PR_DELETE(in_buf);
-    }
-}
-
-PRThread* create_new_thread(PRThreadType type,
-							void (*start)(void *arg),
-							void *arg,
-							PRThreadPriority priority,
-							PRThreadScope scope,
-							PRThreadState state,
-							PRUint32 stackSize, PRInt32 index)
-{
-PRInt32 native_thread = 0;
-
-	PR_ASSERT(state == PR_UNJOINABLE_THREAD);
-#if (defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)) || defined(WIN32)
-	switch(index %  4) {
-		case 0:
-			scope = (PR_LOCAL_THREAD);
-			break;
-		case 1:
-			scope = (PR_GLOBAL_THREAD);
-			break;
-		case 2:
-			scope = (PR_GLOBAL_BOUND_THREAD);
-			break;
-		case 3:
-			native_thread = 1;
-			break;
-		default:
-			PR_ASSERT(!"Invalid scope");
-			break;
-	}
-	if (native_thread) {
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-		pthread_t tid;
-		if (!pthread_create(&tid, NULL, (void * (*)(void *)) start, arg))
-			return((PRThread *) tid);
-		else
-			return (NULL);
-#else
-		HANDLE thandle;
-		unsigned tid;
-		
-		thandle = (HANDLE) _beginthreadex(
-						NULL,
-						stackSize,
-						(unsigned (__stdcall *)(void *))start,
-						arg,
-						0,
-						&tid);		
-		return((PRThread *) thandle);
-#endif
-	} else {
-		return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
-	}
-#else
-	return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
-#endif
-}
-
-/*
- * TCP Server
- *    Server Thread
- *    Bind an address to a socket and listen for incoming connections
- *    Start a Serve_Client thread for each incoming connection.
- */
-static void PR_CALLBACK
-TCP_Server(void *arg)
-{
-    PRThread *t;
-    Server_Param *sp = (Server_Param *) arg;
-    Serve_Client_Param *scp;
-    PRFileDesc *sockfd, *newsockfd;
-    PRNetAddr netaddr;
-    PRInt32 i;
-    /*
-     * Create a tcp socket
-     */
-	if ((sockfd = PR_OpenTCPSocket(server_domain)) == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewTCPSocket failed\n");
-        goto exit;
-    }
-    memset(&netaddr, 0 , sizeof(netaddr));
-	
-	if (PR_SetNetAddr(PR_IpAddrAny, server_domain, TCP_SERVER_PORT,
-									&netaddr) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: PR_SetNetAddr failed\n");
-        goto exit;
-	}
-    /*
-     * try a few times to bind server's address, if addresses are in
-     * use
-     */
-    i = 0;
-	
-    while (PR_Bind(sockfd, &netaddr) < 0) {
-        if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-            netaddr.inet.port += 2;
-            if (i++ < SERVER_MAX_BIND_COUNT)
-                continue;
-        }
-        fprintf(stderr,"prsocket_test: ERROR - PR_Bind failed\n");
-        perror("PR_Bind");
-        failed_already=1;
-        goto exit;
-    }
-
-    if (PR_Listen(sockfd, 32) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_Listen failed\n");
-        failed_already=1;
-        goto exit;
-    }
-
-    if (PR_GetSockName(sockfd, &netaddr) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_GetSockName failed\n");
-        failed_already=1;
-        goto exit;
-    }
-
-    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
-        netaddr.inet.ip, netaddr.inet.port));
-	if (PR_SetNetAddr(PR_IpAddrLoopback, client_domain,
-									PR_ntohs(PR_NetAddrInetPort(&netaddr)),
-									&tcp_server_addr) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: PR_SetNetAddr failed\n");
-        goto exit;
-	}
-	if ((client_domain == PR_AF_INET6) && (server_domain == PR_AF_INET))
-		PR_ConvertIPv4AddrToIPv6(PR_htonl(INADDR_LOOPBACK),
-								&tcp_server_addr.ipv6.ip);
-
-    /*
-     * Wake up parent thread because server address is bound and made
-     * available in the global variable 'tcp_server_addr'
-     */
-    PR_PostSem(sp->addr_sem);
-
-    for (i = 0; i < (num_tcp_clients * num_tcp_connections_per_client); i++) {
-        /* test both null and non-null 'addr' argument to PR_Accept */
-        PRNetAddr *addrp = (i%2 ? &netaddr: NULL);
-
-    DPRINTF(("TCP_Server: Accepting connection\n"));
-        if ((newsockfd = PR_Accept(sockfd, addrp,
-            PR_INTERVAL_NO_TIMEOUT)) == NULL) {
-            fprintf(stderr,"prsocket_test: ERROR - PR_Accept failed\n");
-            goto exit;
-        }
-    DPRINTF(("TCP_Server: Accepted connection\n"));
-        scp = PR_NEW(Serve_Client_Param);
-        if (scp == NULL) {
-            fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-            goto exit;
-        }
-
-        /*
-         * Start a Serve_Client thread for each incoming connection
-         */
-        scp->sockfd = newsockfd;
-        scp->datalen = sp->datalen;
-
-        t = create_new_thread(PR_USER_THREAD,
-            Serve_Client, (void *)scp, 
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD,
-            0, i);
-        if (t == NULL) {
-            fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-            failed_already=1;
-            goto exit;
-        }
-        DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", t));
-    }
-
-exit:
-    if (sockfd) {
-        PR_Close(sockfd);
-    }
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(sp->exit_mon);
-    --(*sp->exit_counter);
-    PR_Notify(sp->exit_mon);
-    PR_ExitMonitor(sp->exit_mon);
-    DPRINTF(("TCP_Server [0x%lx] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * UDP Server
- *    Server Thread
- *    Bind an address to a socket, read data from clients and send data
- *    back to clients
- */
-static void PR_CALLBACK
-UDP_Server(void *arg)
-{
-    Server_Param *sp = (Server_Param *) arg;
-    PRFileDesc *sockfd;
-    buffer *in_buf;
-    PRNetAddr netaddr;
-    PRInt32 bytes, i, rv = 0;
-
-
-    bytes = sp->datalen;
-    /*
-     * Create a udp socket
-     */
-	if ((sockfd = PR_OpenUDPSocket(server_domain)) == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewUDPSocket failed\n");
-        failed_already=1;
-        return;
-    }
-    memset(&netaddr, 0 , sizeof(netaddr));
-	if (PR_SetNetAddr(PR_IpAddrAny, server_domain, UDP_SERVER_PORT,
-									&netaddr) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: PR_SetNetAddr failed\n");
-        failed_already=1;
-        return;
-	}
-    /*
-     * try a few times to bind server's address, if addresses are in
-     * use
-     */
-    i = 0;
-    while (PR_Bind(sockfd, &netaddr) < 0) {
-        if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-            netaddr.inet.port += 2;
-            if (i++ < SERVER_MAX_BIND_COUNT)
-                continue;
-        }
-        fprintf(stderr,"prsocket_test: ERROR - PR_Bind failed\n");
-        perror("PR_Bind");
-        failed_already=1;
-        return;
-    }
-
-    if (PR_GetSockName(sockfd, &netaddr) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_GetSockName failed\n");
-        failed_already=1;
-        return;
-    }
-
-    DPRINTF(("PR_Bind: UDP Server netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
-        netaddr.inet.ip, netaddr.inet.port));
-    /*
-     * We can't use the IP address returned by PR_GetSockName in
-     * netaddr.inet.ip because netaddr.inet.ip is returned
-     * as 0 (= PR_INADDR_ANY).
-     */
-
-	if (PR_SetNetAddr(PR_IpAddrLoopback, client_domain,
-									PR_ntohs(PR_NetAddrInetPort(&netaddr)),
-									&udp_server_addr) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: PR_SetNetAddr failed\n");
-        failed_already=1;
-        return;
-	}
-	if ((client_domain == PR_AF_INET6) && (server_domain == PR_AF_INET))
-		PR_ConvertIPv4AddrToIPv6(PR_htonl(INADDR_LOOPBACK),
-								&udp_server_addr.ipv6.ip);
-		
-    /*
-     * Wake up parent thread because server address is bound and made
-     * available in the global variable 'udp_server_addr'
-     */
-    PR_PostSem(sp->addr_sem);
-
-    bytes = sp->datalen;
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        return;
-    }
-    /*
-     * Receive datagrams from clients and send them back, unmodified, to the
-     * clients
-     */
-    memset(&netaddr, 0 , sizeof(netaddr));
-    for (i = 0; i < (num_udp_clients * num_udp_datagrams_per_client); i++) {
-        DPRINTF(("UDP_Server: calling PR_RecvFrom client  - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n",
-            netaddr.inet.ip, netaddr.inet.port, bytes, in_buf->data,
-            in_buf->data[0]));
-
-        rv = PR_RecvFrom(sockfd, in_buf->data, bytes, 0, &netaddr,
-            PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("UDP_Server: PR_RecvFrom client  - ip = 0x%lx, port = %d bytes = %d inbuf = 0x%lx, inbuf[0] = 0x%lx\n",
-            netaddr.inet.ip, netaddr.inet.port, rv, in_buf->data,
-            in_buf->data[0]));
-        if (rv != bytes) {
-            return;
-        }
-        rv = PR_SendTo(sockfd, in_buf->data, bytes, 0, &netaddr,
-            PR_INTERVAL_NO_TIMEOUT);
-        if (rv != bytes) {
-            return;
-        }
-    }
-
-    PR_DELETE(in_buf);
-    PR_Close(sockfd);
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-    PR_EnterMonitor(sp->exit_mon);
-    --(*sp->exit_counter);
-    PR_Notify(sp->exit_mon);
-    PR_ExitMonitor(sp->exit_mon);
-    DPRINTF(("UDP_Server [0x%x] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * TCP_Client
- *    Client Thread
- *    Connect to the server at the address specified in the argument.
- *    Fill in a buffer, write data to server, read it back and check
- *    for data corruption.
- *    Close the socket for server connection
- */
-static void PR_CALLBACK
-TCP_Client(void *arg)
-{
-    Client_Param *cp = (Client_Param *) arg;
-    PRFileDesc *sockfd;
-    buffer *in_buf, *out_buf;
-    union PRNetAddr netaddr;
-    PRInt32 bytes, i, j;
-
-
-    bytes = cp->datalen;
-    out_buf = PR_NEW(buffer);
-    if (out_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        return;
-    }
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        return;
-    }
-    netaddr = cp->server_addr;
-
-    for (i = 0; i < num_tcp_connections_per_client; i++) {
-        if ((sockfd = PR_OpenTCPSocket(client_domain)) == NULL) {
-            fprintf(stderr,"prsocket_test: PR_OpenTCPSocket failed\n");
-            failed_already=1;
-            return;
-        }
-        if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
-        	fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n",
-            		PR_GetError(), PR_GetOSError());
-            failed_already=1;
-            return;
-        }
-        for (j = 0; j < num_tcp_mesgs_per_connection; j++) {
-            /*
-             * fill in random data
-             */
-            memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes);
-            /*
-             * write to server
-             */
-#ifdef WINNT
-			if (test_cancelio && (j == 0))
-				PR_Sleep(PR_SecondsToInterval(12));
-#endif
-            if (writen(sockfd, out_buf->data, bytes) < bytes) {
-                fprintf(stderr,"prsocket_test: ERROR - TCP_Client:writen\n");
-                failed_already=1;
-                return;
-            }
-            DPRINTF(("TCP Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n",
-                PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data))));
-            if (readn(sockfd, in_buf->data, bytes) < bytes) {
-                fprintf(stderr,"prsocket_test: ERROR - TCP_Client:readn\n");
-                failed_already=1;
-                return;
-            }
-            /*
-             * verify the data read
-             */
-            if (memcmp(in_buf->data, out_buf->data, bytes) != 0) {
-                fprintf(stderr,"prsocket_test: ERROR - data corruption\n");
-                failed_already=1;
-                return;
-            }
-        }
-        /*
-         * shutdown reads and writes
-         */
-        if (PR_Shutdown(sockfd, PR_SHUTDOWN_BOTH) < 0) {
-            fprintf(stderr,"prsocket_test: ERROR - PR_Shutdown\n");
-            failed_already=1;
-        }
-        PR_Close(sockfd);
-    }
-
-    PR_DELETE(out_buf);
-    PR_DELETE(in_buf);
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(cp->exit_mon);
-    --(*cp->exit_counter);
-    PR_Notify(cp->exit_mon);
-    PR_ExitMonitor(cp->exit_mon);
-    DPRINTF(("TCP_Client [0x%x] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * UDP_Client
- *    Client Thread
- *    Create a socket and bind an address 
- *    Communicate with the server at the address specified in the argument.
- *    Fill in a buffer, write data to server, read it back and check
- *    for data corruption.
- *    Close the socket
- */
-static void PR_CALLBACK
-UDP_Client(void *arg)
-{
-    Client_Param *cp = (Client_Param *) arg;
-    PRFileDesc *sockfd;
-    buffer *in_buf, *out_buf;
-    union PRNetAddr netaddr;
-    PRInt32 bytes, i, rv;
-
-
-    bytes = cp->datalen;
-    out_buf = PR_NEW(buffer);
-    if (out_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        return;
-    }
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer struct\n");
-        failed_already=1;
-        return;
-    }
-    if ((sockfd = PR_OpenUDPSocket(client_domain)) == NULL) {
-        fprintf(stderr,"prsocket_test: PR_OpenUDPSocket failed\n");
-        failed_already=1;
-        return;
-    }
-
-    /*
-     * bind an address for the client, let the system chose the port
-     * number
-     */
-    memset(&netaddr, 0 , sizeof(netaddr));
-	if (PR_SetNetAddr(PR_IpAddrAny, client_domain, 0,
-									&netaddr) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: PR_SetNetAddr failed\n");
-        failed_already=1;
-        return;
-	}
-    if (PR_Bind(sockfd, &netaddr) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_Bind failed\n");
-        perror("PR_Bind");
-        return;
-    }
-
-    if (PR_GetSockName(sockfd, &netaddr) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_GetSockName failed\n");
-        failed_already=1;
-        return;
-    }
-
-    DPRINTF(("PR_Bind: UDP Client netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
-        netaddr.inet.ip, netaddr.inet.port));
-
-    netaddr = cp->server_addr;
-
-    if (cp->udp_connect) {
-        if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
-            fprintf(stderr,"prsocket_test: PR_Connect failed\n");
-            failed_already=1;
-            return;
-        }
-    }
-
-    for (i = 0; i < num_udp_datagrams_per_client; i++) {
-        /*
-         * fill in random data
-         */
-        DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx bytes = 0x%lx\n",
-            PR_GetCurrentThread(), out_buf->data, bytes));
-        memset(out_buf->data, ((PRInt32) (&netaddr)) + i, bytes);
-        /*
-         * write to server
-         */
-        if (cp->udp_connect)
-            rv = PR_Send(sockfd, out_buf->data, bytes, 0,
-                PR_INTERVAL_NO_TIMEOUT);
-        else
-            rv = PR_SendTo(sockfd, out_buf->data, bytes, 0, &netaddr,
-                PR_INTERVAL_NO_TIMEOUT);
-        if (rv != bytes) {
-            return;
-        }
-        DPRINTF(("UDP_Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n",
-            PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data))));
-        if (cp->udp_connect)
-            rv = PR_Recv(sockfd, in_buf->data, bytes, 0,
-                PR_INTERVAL_NO_TIMEOUT);
-        else
-            rv = PR_RecvFrom(sockfd, in_buf->data, bytes, 0, &netaddr,
-                PR_INTERVAL_NO_TIMEOUT);
-        if (rv != bytes) {
-            return;
-        }
-        DPRINTF(("UDP_Client [0x%lx]: in_buf = 0x%lx in_buf[0] = 0x%lx\n",
-            PR_GetCurrentThread(), in_buf, (*((int *) in_buf->data))));
-        /*
-         * verify the data read
-         */
-        if (memcmp(in_buf->data, out_buf->data, bytes) != 0) {
-            fprintf(stderr,"prsocket_test: ERROR - UDP data corruption\n");
-            failed_already=1;
-            return;
-        }
-    }
-    PR_Close(sockfd);
-
-    PR_DELETE(in_buf);
-    PR_DELETE(out_buf);
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(cp->exit_mon);
-    --(*cp->exit_counter);
-    PR_Notify(cp->exit_mon);
-    PR_ExitMonitor(cp->exit_mon);
-    PR_DELETE(cp);
-    DPRINTF(("UDP_Client [0x%x] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * TCP_Socket_Client_Server_Test    - concurrent server test
- *    
- *    One server and several clients are started
- *    Each client connects to the server and sends a chunk of data
- *    For each connection, server starts another thread to read the data
- *    from the client and send it back to the client, unmodified.
- *    Each client checks that data received from server is same as the
- *    data it sent to the server.
- *
- */
-
-static PRInt32
-TCP_Socket_Client_Server_Test(void)
-{
-    int i;
-    PRThread *t;
-    PRSemaphore *server_sem;
-    Server_Param *sparamp;
-    Client_Param *cparamp;
-    PRMonitor *mon2;
-    PRInt32    datalen;
-
-
-    datalen = tcp_mesg_size;
-    thread_count = 0;
-    /*
-     * start the server thread
-     */
-    sparamp = PR_NEW(Server_Param);
-    if (sparamp == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-        failed_already=1;
-        return -1;
-    }
-    server_sem = PR_NewSem(0);
-    if (server_sem == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewSem failed\n");
-        failed_already=1;
-        return -1;
-    }
-    mon2 = PR_NewMonitor();
-    if (mon2 == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewMonitor failed\n");
-        failed_already=1;
-        return -1;
-    }
-    PR_EnterMonitor(mon2);
-
-    sparamp->addr_sem = server_sem;
-    sparamp->exit_mon = mon2;
-    sparamp->exit_counter = &thread_count;
-    sparamp->datalen = datalen;
-    t = PR_CreateThread(PR_USER_THREAD,
-        TCP_Server, (void *)sparamp, 
-        PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD,
-        PR_UNJOINABLE_THREAD,
-        0);
-    if (t == NULL) {
-        fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-        failed_already=1;
-        return -1;
-    }
-    DPRINTF(("Created TCP server = 0x%lx\n", t));
-    thread_count++;
-
-    /*
-     * wait till the server address is setup
-     */
-    PR_WaitSem(server_sem);
-
-    /*
-     * Now start a bunch of client threads
-     */
-
-    cparamp = PR_NEW(Client_Param);
-    if (cparamp == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-        failed_already=1;
-        return -1;
-    }
-    cparamp->server_addr = tcp_server_addr;
-    cparamp->exit_mon = mon2;
-    cparamp->exit_counter = &thread_count;
-    cparamp->datalen = datalen;
-    for (i = 0; i < num_tcp_clients; i++) {
-        t = create_new_thread(PR_USER_THREAD,
-            TCP_Client, (void *) cparamp,
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD,
-            0, i);
-        if (t == NULL) {
-            fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-            failed_already=1;
-            return -1;
-        }
-        DPRINTF(("Created TCP client = 0x%lx\n", t));
-        thread_count++;
-    }
-    /* Wait for server and client threads to exit */
-    while (thread_count) {
-        PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("TCP Server - thread_count  = %d\n", thread_count));
-    }
-    PR_ExitMonitor(mon2);
-    printf("%30s","TCP_Socket_Client_Server_Test:");
-    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
-        num_tcp_clients, num_tcp_connections_per_client);
-    printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":",
-        num_tcp_mesgs_per_connection, tcp_mesg_size);
-
-    return 0;
-}
-
-/*
- * UDP_Socket_Client_Server_Test    - iterative server test
- *    
- *    One server and several clients are started
- *    Each client connects to the server and sends a chunk of data
- *    For each connection, server starts another thread to read the data
- *    from the client and send it back to the client, unmodified.
- *    Each client checks that data received from server is same as the
- *    data it sent to the server.
- *
- */
-
-static PRInt32
-UDP_Socket_Client_Server_Test(void)
-{
-    int i;
-    PRThread *t;
-    PRSemaphore *server_sem;
-    Server_Param *sparamp;
-    Client_Param *cparamp;
-    PRMonitor *mon2;
-    PRInt32    datalen;
-    PRInt32    udp_connect = 1;
-
-
-    datalen = udp_datagram_size;
-    thread_count = 0;
-    /*
-     * start the server thread
-     */
-    sparamp = PR_NEW(Server_Param);
-    if (sparamp == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-        failed_already=1;
-        return -1;
-    }
-    server_sem = PR_NewSem(0);
-    if (server_sem == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewSem failed\n");
-        failed_already=1;
-        return -1;
-    }
-    mon2 = PR_NewMonitor();
-    if (mon2 == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewMonitor failed\n");
-        failed_already=1;
-        return -1;
-    }
-    PR_EnterMonitor(mon2);
-
-    sparamp->addr_sem = server_sem;
-    sparamp->exit_mon = mon2;
-    sparamp->exit_counter = &thread_count;
-    sparamp->datalen = datalen;
-    DPRINTF(("Creating UDP server"));
-    t = PR_CreateThread(PR_USER_THREAD,
-        UDP_Server, (void *)sparamp, 
-        PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD,
-        PR_UNJOINABLE_THREAD,
-        0);
-    if (t == NULL) {
-        fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-        failed_already=1;
-        return -1;
-    }
-    thread_count++;
-
-    /*
-     * wait till the server address is setup
-     */
-    PR_WaitSem(server_sem);
-
-    /*
-     * Now start a bunch of client threads
-     */
-
-    for (i = 0; i < num_udp_clients; i++) {
-        cparamp = PR_NEW(Client_Param);
-        if (cparamp == NULL) {
-            fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-            failed_already=1;
-            return -1;
-        }
-        cparamp->server_addr = udp_server_addr;
-        cparamp->exit_mon = mon2;
-        cparamp->exit_counter = &thread_count;
-        cparamp->datalen = datalen;
-        /*
-         * Cause every other client thread to connect udp sockets
-         */
-#ifndef XP_MAC
-        cparamp->udp_connect = udp_connect;
-#else
-        /* No support for UDP connects on Mac */
-        cparamp->udp_connect = 0;
-#endif
-        if (udp_connect)
-            udp_connect = 0;
-        else
-            udp_connect = 1;
-        DPRINTF(("Creating UDP client %d\n", i));
-        t = PR_CreateThread(PR_USER_THREAD,
-            UDP_Client, (void *) cparamp,
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD,
-            0);
-        if (t == NULL) {
-            fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-            failed_already=1;
-            return -1;
-        }
-        thread_count++;
-    }
-    /* Wait for server and client threads to exit */
-    while (thread_count) {
-        PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("UDP Server - thread_count  = %d\n", thread_count));
-    }
-    PR_ExitMonitor(mon2);
-    printf("%30s","UDP_Socket_Client_Server_Test: ");
-    printf("%2ld Server %2ld Clients\n",1l, num_udp_clients);
-    printf("%30s %2ld datagrams_per_client %4ld bytes_per_datagram\n",":",
-        num_udp_datagrams_per_client, udp_datagram_size);
-
-    return 0;
-}
-
-static PRFileDesc *small_file_fd, *large_file_fd;
-static void *small_file_addr, *small_file_header, *large_file_addr;
-static void *small_file_trailer, *large_file_header, *large_file_trailer;
-/*
- * TransmitFile_Client
- *    Client Thread
- */
-static void
-TransmitFile_Client(void *arg)
-{
-    PRFileDesc *sockfd;
-    union PRNetAddr netaddr;
-    char *small_buf, *large_buf;
-    Client_Param *cp = (Client_Param *) arg;
-	PRInt32 rlen;
-
-    small_buf = (char*)PR_Malloc(SMALL_FILE_SIZE + SMALL_FILE_HEADER_SIZE +
-										SMALL_FILE_TRAILER_SIZE);
-    if (small_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer\n");
-        failed_already=1;
-        return;
-    }
-    large_buf = (char*)PR_Malloc(LARGE_FILE_SIZE + LARGE_FILE_HEADER_SIZE +
-												LARGE_FILE_TRAILER_SIZE);
-    if (large_buf == NULL) {
-        fprintf(stderr,"prsocket_test: failed to alloc buffer\n");
-        failed_already=1;
-        return;
-    }
-    netaddr.inet.family = cp->server_addr.inet.family;
-    netaddr.inet.port = cp->server_addr.inet.port;
-    netaddr.inet.ip = cp->server_addr.inet.ip;
-
-    if ((sockfd = PR_NewTCPSocket()) == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewTCPSocket failed\n");
-        failed_already=1;
-        return;
-    }
-
-    if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
-        fprintf(stderr,"prsocket_test: PR_Connect failed\n");
-        failed_already=1;
-        return;
-    }
-    /*
-     * read the small file and verify the data
-     */
-    if (readn(sockfd, small_buf, SMALL_FILE_SIZE + SMALL_FILE_HEADER_SIZE)
-        != (SMALL_FILE_SIZE + SMALL_FILE_HEADER_SIZE)) {
-        fprintf(stderr,
-            "prsocket_test: TransmitFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(small_file_header, small_buf, SMALL_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "prsocket_test: TransmitFile_Client ERROR - small file header data corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(small_file_addr, small_buf + SMALL_FILE_HEADER_SIZE,
-        SMALL_FILE_SIZE) != 0) {
-        fprintf(stderr,
-            "prsocket_test: TransmitFile_Client ERROR - small file data corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-    /*
-     * read the large file and verify the data
-     */
-    if (readn(sockfd, large_buf, LARGE_FILE_SIZE) != LARGE_FILE_SIZE) {
-        fprintf(stderr,
-            "prsocket_test: TransmitFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(large_file_addr, large_buf, LARGE_FILE_SIZE) != 0) {
-        fprintf(stderr,
-            "prsocket_test: TransmitFile_Client ERROR - large file data corruption\n");
-        failed_already=1;
-    }
-#endif
-
-
-	/*
-	 * receive data from PR_SendFile
-	 */
-	/*
-	 * case 1: small file with header and trailer
-	 */
-    rlen = SMALL_FILE_SIZE + SMALL_FILE_HEADER_SIZE +
-									SMALL_FILE_TRAILER_SIZE;
-    if (readn(sockfd, small_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(small_file_header, small_buf, SMALL_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 1. ERROR - small file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(small_file_addr, small_buf + SMALL_FILE_HEADER_SIZE,
-        								SMALL_FILE_SIZE) != 0) {
-        fprintf(stderr,
-            "SendFile 1. ERROR - small file data corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(small_file_trailer,
-				small_buf + SMALL_FILE_HEADER_SIZE + SMALL_FILE_SIZE,
-        				SMALL_FILE_TRAILER_SIZE) != 0) {
-        fprintf(stderr,
-            "SendFile 1. ERROR - small file trailer corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 2: partial large file at zero offset, file with header and trailer
-	 */
-    rlen = LARGE_FILE_LEN_1 + LARGE_FILE_HEADER_SIZE +
-									LARGE_FILE_TRAILER_SIZE;
-    if (readn(sockfd, large_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(large_file_header, large_buf, LARGE_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(large_file_addr, large_buf + LARGE_FILE_HEADER_SIZE,
-        								LARGE_FILE_LEN_1) != 0) {
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file data corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(large_file_trailer,
-				large_buf + LARGE_FILE_HEADER_SIZE + LARGE_FILE_LEN_1,
-        				LARGE_FILE_TRAILER_SIZE) != 0) {
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file trailer corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 3: partial small file at non-zero offset, with header
-	 */
-    rlen = SMALL_FILE_LEN_1 + SMALL_FILE_HEADER_SIZE;
-    if (readn(sockfd, small_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(small_file_header, small_buf, SMALL_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 3. ERROR - small file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp((char *) small_file_addr + SMALL_FILE_OFFSET_1,
-				small_buf + SMALL_FILE_HEADER_SIZE, SMALL_FILE_LEN_1) != 0) {
-        fprintf(stderr,
-            "SendFile 3. ERROR - small file data corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 4: partial small file at non-zero offset, with trailer
-	 */
-    rlen = SMALL_FILE_LEN_2 + SMALL_FILE_TRAILER_SIZE;
-    if (readn(sockfd, small_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp((char *) small_file_addr + SMALL_FILE_OFFSET_2, small_buf,
-        								SMALL_FILE_LEN_2) != 0) {
-        fprintf(stderr,
-            "SendFile 4. ERROR - small file data corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(small_file_trailer, small_buf + SMALL_FILE_LEN_2,
-        				SMALL_FILE_TRAILER_SIZE) != 0) {
-        fprintf(stderr,
-            "SendFile 4. ERROR - small file trailer corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 5: partial large file at non-zero offset, file with header
-	 */
-    rlen = LARGE_FILE_LEN_2 + LARGE_FILE_HEADER_SIZE;
-    if (readn(sockfd, large_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(large_file_header, large_buf, LARGE_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 5. ERROR - large file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp((char *)large_file_addr + LARGE_FILE_OFFSET_2,
-					large_buf + LARGE_FILE_HEADER_SIZE,
-        								LARGE_FILE_LEN_2) != 0) {
-        fprintf(stderr,
-            "SendFile 5. ERROR - large file data corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 6: partial small file at non-zero offset, with header
-	 */
-    rlen = SMALL_FILE_LEN_3 + SMALL_FILE_HEADER_SIZE;
-    if (readn(sockfd, small_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(small_file_header, small_buf, SMALL_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 6. ERROR - small file header corruption\n");
-        return;
-    }
-    if (memcmp((char *) small_file_addr + SMALL_FILE_OFFSET_3,
-				small_buf + SMALL_FILE_HEADER_SIZE, SMALL_FILE_LEN_3) != 0) {
-#if 0
-		char *i, *j;
-		int k;
-
-		i = (char *) small_file_addr + SMALL_FILE_OFFSET_3;
-		j = small_buf + SMALL_FILE_HEADER_SIZE;
-		k = SMALL_FILE_LEN_3;
-		while (k-- > 0) {
-			if (*i++ != *j++)
-			printf("i = %d j = %d\n",
-				(int) (i - ((char *) small_file_addr + SMALL_FILE_OFFSET_3)),
-				(int) (j - (small_buf + SMALL_FILE_HEADER_SIZE)));
-		}
-#endif
-        fprintf(stderr,
-            "SendFile 6. ERROR - small file data corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 7: partial large file at non-zero offset, with header
-	 */
-    rlen = LARGE_FILE_LEN_3 + LARGE_FILE_HEADER_SIZE;
-    if (readn(sockfd, large_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(large_file_header, large_buf, LARGE_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 7. ERROR - large file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp((char *)large_file_addr + LARGE_FILE_OFFSET_3,
-					large_buf + LARGE_FILE_HEADER_SIZE,
-        								LARGE_FILE_LEN_3) != 0) {
-        fprintf(stderr,
-            "SendFile 7. ERROR - large file data corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-	/*
-	 * case 8: partial large file at non-zero, page-aligned offset, with
-	 * header and trailer
-	 */
-    rlen = LARGE_FILE_LEN_4 + LARGE_FILE_HEADER_SIZE +
-									LARGE_FILE_TRAILER_SIZE;
-    if (readn(sockfd, large_buf, rlen) != rlen) {
-        fprintf(stderr,
-            "prsocket_test: SendFile_Client failed to receive file\n");
-        failed_already=1;
-        return;
-    }
-#ifdef XP_UNIX
-    if (memcmp(large_file_header, large_buf, LARGE_FILE_HEADER_SIZE) != 0){
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file header corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp((char *)large_file_addr + LARGE_FILE_OFFSET_4,
-				large_buf + LARGE_FILE_HEADER_SIZE,
-        								LARGE_FILE_LEN_4) != 0) {
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file data corruption\n");
-        failed_already=1;
-        return;
-    }
-    if (memcmp(large_file_trailer,
-				large_buf + LARGE_FILE_HEADER_SIZE + LARGE_FILE_LEN_4,
-        				LARGE_FILE_TRAILER_SIZE) != 0) {
-        fprintf(stderr,
-            "SendFile 2. ERROR - large file trailer corruption\n");
-        failed_already=1;
-        return;
-    }
-#endif
-    PR_DELETE(small_buf);
-    PR_DELETE(large_buf);
-    PR_Close(sockfd);
-
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(cp->exit_mon);
-    --(*cp->exit_counter);
-    PR_Notify(cp->exit_mon);
-    PR_ExitMonitor(cp->exit_mon);
-    DPRINTF(("TransmitFile_Client [0x%lx] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * Serve_TransmitFile_Client
- *    Thread, started by the server, for serving a client connection.
- *    Trasmits a small file, with a header, and a large file, without
- *    a header
- */
-static void
-Serve_TransmitFile_Client(void *arg)
-{
-    Serve_Client_Param *scp = (Serve_Client_Param *) arg;
-    PRFileDesc *sockfd;
-    PRInt32 bytes;
-    PRFileDesc *local_small_file_fd=NULL;
-    PRFileDesc *local_large_file_fd=NULL;
-	PRSendFileData sfd;
-	PRInt32 slen;
-
-    sockfd = scp->sockfd;
-    local_small_file_fd = PR_Open(SMALL_FILE_NAME, PR_RDONLY,0);
-
-    if (local_small_file_fd == NULL) {
-        fprintf(stderr,"prsocket_test failed to open file for transmitting %s\n",
-            SMALL_FILE_NAME);
-        failed_already=1;
-        goto done;
-    }
-    local_large_file_fd = PR_Open(LARGE_FILE_NAME, PR_RDONLY,0);
-
-    if (local_large_file_fd == NULL) {
-        fprintf(stderr,"prsocket_test failed to open file for transmitting %s\n",
-            LARGE_FILE_NAME);
-        failed_already=1;
-        goto done;
-    }
-    bytes = PR_TransmitFile(sockfd, local_small_file_fd, small_file_header,
-        SMALL_FILE_HEADER_SIZE, PR_TRANSMITFILE_KEEP_OPEN,
-        PR_INTERVAL_NO_TIMEOUT);
-    if (bytes != (SMALL_FILE_SIZE+ SMALL_FILE_HEADER_SIZE)) {
-        fprintf(stderr,
-            "prsocet_test: PR_TransmitFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-    bytes = PR_TransmitFile(sockfd, local_large_file_fd, NULL, 0,
-        PR_TRANSMITFILE_KEEP_OPEN, PR_INTERVAL_NO_TIMEOUT);
-    if (bytes != LARGE_FILE_SIZE) {
-        fprintf(stderr,
-            "prsocket_test: PR_TransmitFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-
-	/*
-	 * PR_SendFile test cases
-	 */
-
-	/*
-	 * case 1: small file with header and trailer
-	 */
-	sfd.fd = local_small_file_fd;
-	sfd.file_offset = 0;
-	sfd.file_nbytes = 0;
-	sfd.header = small_file_header;
-	sfd.hlen = SMALL_FILE_HEADER_SIZE;
-	sfd.trailer = small_file_trailer;
-	sfd.tlen = SMALL_FILE_TRAILER_SIZE;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = SMALL_FILE_SIZE+ SMALL_FILE_HEADER_SIZE +
-						SMALL_FILE_TRAILER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 1. PR_SendFile  send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-
-	/*
-	 * case 2: partial large file at zero offset, file with header and trailer
-	 */
-	sfd.fd = local_large_file_fd;
-	sfd.file_offset = 0;
-	sfd.file_nbytes = LARGE_FILE_LEN_1;
-	sfd.header = large_file_header;
-	sfd.hlen = LARGE_FILE_HEADER_SIZE;
-	sfd.trailer = large_file_trailer;
-	sfd.tlen = LARGE_FILE_TRAILER_SIZE;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = LARGE_FILE_LEN_1 + LARGE_FILE_HEADER_SIZE +
-						LARGE_FILE_TRAILER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 2. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 3: partial small file at non-zero offset, with header
-	 */
-	sfd.fd = local_small_file_fd;
-	sfd.file_offset = SMALL_FILE_OFFSET_1;
-	sfd.file_nbytes = SMALL_FILE_LEN_1;
-	sfd.header = small_file_header;
-	sfd.hlen = SMALL_FILE_HEADER_SIZE;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = SMALL_FILE_LEN_1 + SMALL_FILE_HEADER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 3. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 4: partial small file at non-zero offset, with trailer
-	 */
-	sfd.fd = local_small_file_fd;
-	sfd.file_offset = SMALL_FILE_OFFSET_2;
-	sfd.file_nbytes = SMALL_FILE_LEN_2;
-	sfd.header = NULL;
-	sfd.hlen = 0;
-	sfd.trailer = small_file_trailer;
-	sfd.tlen = SMALL_FILE_TRAILER_SIZE;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = SMALL_FILE_LEN_2 + SMALL_FILE_TRAILER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 4. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 5: partial large file at non-zero offset, file with header
-	 */
-	sfd.fd = local_large_file_fd;
-	sfd.file_offset = LARGE_FILE_OFFSET_2;
-	sfd.file_nbytes = LARGE_FILE_LEN_2;
-	sfd.header = large_file_header;
-	sfd.hlen = LARGE_FILE_HEADER_SIZE;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = LARGE_FILE_LEN_2 + LARGE_FILE_HEADER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 5. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 6: partial small file from non-zero offset till end of file, with header
-	 */
-	sfd.fd = local_small_file_fd;
-	sfd.file_offset = SMALL_FILE_OFFSET_3;
-	sfd.file_nbytes = 0;				/* data from offset to end-of-file */
-	sfd.header = small_file_header;
-	sfd.hlen = SMALL_FILE_HEADER_SIZE;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = SMALL_FILE_LEN_3 + SMALL_FILE_HEADER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 6. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 7: partial large file at non-zero offset till end-of-file, with header
-	 */
-	sfd.fd = local_large_file_fd;
-	sfd.file_offset = LARGE_FILE_OFFSET_3;
-	sfd.file_nbytes = 0;				/* data until end-of-file */
-	sfd.header = large_file_header;
-	sfd.hlen = LARGE_FILE_HEADER_SIZE;
-	sfd.trailer = NULL;
-	sfd.tlen = 0;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_KEEP_OPEN,
-        									PR_INTERVAL_NO_TIMEOUT);
-    slen = LARGE_FILE_LEN_3 + LARGE_FILE_HEADER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 7. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-	/*
-	 * case 8: partial large file at non-zero page-aligned offset,
-	 * with header and trailer
-	 */
-	sfd.fd = local_large_file_fd;
-	sfd.file_offset = LARGE_FILE_OFFSET_4;
-	sfd.file_nbytes = LARGE_FILE_LEN_4;
-	sfd.header = large_file_header;
-	sfd.hlen = LARGE_FILE_HEADER_SIZE;
-	sfd.trailer = large_file_trailer;
-	sfd.tlen = LARGE_FILE_TRAILER_SIZE;
-    bytes = PR_SendFile(sockfd, &sfd, PR_TRANSMITFILE_CLOSE_SOCKET,
-        				PR_INTERVAL_NO_TIMEOUT);
-    slen = LARGE_FILE_LEN_4 + LARGE_FILE_HEADER_SIZE +
-						LARGE_FILE_TRAILER_SIZE;
-    if (bytes != slen) {
-        fprintf(stderr,
-			"socket: Error - 2. PR_SendFile send_size = %d, bytes sent = %d\n",
-									slen, bytes);
-        fprintf(stderr,
-            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-            PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-done:
-    if (local_small_file_fd != NULL)
-        PR_Close(local_small_file_fd);
-    if (local_large_file_fd != NULL)
-        PR_Close(local_large_file_fd);
-}
-
-/*
- * TransmitFile Server
- *    Server Thread
- *    Bind an address to a socket and listen for incoming connections
- *    Create worker threads to service clients
- */
-static void
-TransmitFile_Server(void *arg)
-{
-    PRThread **t = NULL;  /* an array of PRThread pointers */
-    Server_Param *sp = (Server_Param *) arg;
-    Serve_Client_Param *scp;
-    PRFileDesc *sockfd = NULL, *newsockfd;
-    PRNetAddr netaddr;
-    PRInt32 i;
-
-    t = (PRThread**)PR_MALLOC(num_transmitfile_clients * sizeof(PRThread *));
-    if (t == NULL) {
-        fprintf(stderr, "prsocket_test: run out of memory\n");
-        failed_already=1;
-        goto exit;
-    }
-    /*
-     * Create a tcp socket
-     */
-    if ((sockfd = PR_OpenTCPSocket(PR_AF_INET)) == NULL) {
-        fprintf(stderr,"prsocket_test: PR_OpenTCPSocket failed\n");
-        failed_already=1;
-        goto exit;
-    }
-    memset(&netaddr, 0 , sizeof(netaddr));
-    netaddr.inet.family = PR_AF_INET;
-    netaddr.inet.port = PR_htons(TCP_SERVER_PORT);
-    netaddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    /*
-     * try a few times to bind server's address, if addresses are in
-     * use
-     */
-    i = 0;
-    while (PR_Bind(sockfd, &netaddr) < 0) {
-        if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-            netaddr.inet.port += 2;
-            if (i++ < SERVER_MAX_BIND_COUNT)
-                continue;
-        }
-        fprintf(stderr,"prsocket_test: ERROR - PR_Bind failed\n");
-        failed_already=1;
-        perror("PR_Bind");
-        goto exit;
-    }
-
-    if (PR_Listen(sockfd, 32) < 0) {
-        fprintf(stderr,"prsocket_test: ERROR - PR_Listen failed\n");
-        failed_already=1;
-        goto exit;
-    }
-
-    if (PR_GetSockName(sockfd, &netaddr) < 0) {
-        fprintf(stderr,
-            "prsocket_test: ERROR - PR_GetSockName failed\n");
-        failed_already=1;
-        goto exit;
-    }
-
-    DPRINTF(("TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
-        netaddr.inet.ip, netaddr.inet.port));
-    tcp_server_addr.inet.family = netaddr.inet.family;
-    tcp_server_addr.inet.port = netaddr.inet.port;
-    tcp_server_addr.inet.ip = netaddr.inet.ip;
-
-    /*
-     * Wake up parent thread because server address is bound and made
-     * available in the global variable 'tcp_server_addr'
-     */
-    PR_PostSem(sp->addr_sem);
-
-    for (i = 0; i < num_transmitfile_clients ; i++) {
-        /* test both null and non-null 'addr' argument to PR_Accept */
-        PRNetAddr *addrp = (i%2 ? &netaddr: NULL);
-
-        if ((newsockfd = PR_Accept(sockfd, addrp,
-            PR_INTERVAL_NO_TIMEOUT)) == NULL) {
-            fprintf(stderr,
-                "prsocket_test: ERROR - PR_Accept failed\n");
-            failed_already=1;
-            goto exit;
-        }
-        /* test both regular and emulated PR_SendFile */
-        if (i%2) {
-            PRFileDesc *layer = PR_CreateIOLayerStub(
-                emuSendFileIdentity, &emuSendFileMethods);
-            if (layer == NULL) {
-                fprintf(stderr,
-                    "prsocket_test: ERROR - PR_CreateIOLayerStub failed\n");
-                failed_already=1;
-                goto exit;
-            }
-            if (PR_PushIOLayer(newsockfd, PR_TOP_IO_LAYER, layer)
-                    == PR_FAILURE) {
-                fprintf(stderr,
-                    "prsocket_test: ERROR - PR_PushIOLayer failed\n");
-                failed_already=1;
-                goto exit;
-            }
-        }
-        scp = PR_NEW(Serve_Client_Param);
-        if (scp == NULL) {
-            fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-            failed_already=1;
-            goto exit;
-        }
-
-        /*
-         * Start a Serve_Client thread for each incoming connection
-         */
-        scp->sockfd = newsockfd;
-        scp->datalen = sp->datalen;
-
-        t[i] = PR_CreateThread(PR_USER_THREAD,
-            Serve_TransmitFile_Client, (void *)scp, 
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_JOINABLE_THREAD,
-            0);
-        if (t[i] == NULL) {
-            fprintf(stderr,
-                "prsocket_test: PR_CreateThread failed\n");
-            failed_already=1;
-            goto exit;
-        }
-        DPRINTF(("TransmitFile_Server: Created Serve_TransmitFile_Client = 0x%lx\n", t));
-    }
-
-    /*
-     * Wait for all the worker threads to end, so that we know
-     * they are no longer using the small and large file fd's.
-     */
-
-    for (i = 0; i < num_transmitfile_clients; i++) {
-        PR_JoinThread(t[i]);
-    }
-
-exit:
-    if (t) {
-        PR_DELETE(t);
-    }
-    if (sockfd) {
-        PR_Close(sockfd);
-    }
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(sp->exit_mon);
-    --(*sp->exit_counter);
-    PR_Notify(sp->exit_mon);
-    PR_ExitMonitor(sp->exit_mon);
-    DPRINTF(("TransmitFile_Server [0x%lx] exiting\n", PR_GetCurrentThread()));
-}
-
-/*
- * Socket_Misc_Test    - test miscellaneous functions 
- *    
- */
-static PRInt32
-Socket_Misc_Test(void)
-{
-    PRIntn i, rv = 0, bytes, count, len;
-    PRThread *t;
-    PRSemaphore *server_sem;
-    Server_Param *sparamp;
-    Client_Param *cparamp;
-    PRMonitor *mon2;
-    PRInt32    datalen;
-
-    /*
- * We deliberately pick a buffer size that is not a nice multiple
- * of 1024.
- */
-#define TRANSMITFILE_BUF_SIZE    (4 * 1024 - 11)
-
-    typedef struct {
-        char    data[TRANSMITFILE_BUF_SIZE];
-    } file_buf;
-    file_buf *buf = NULL;
-
-    /*
-     * create file(s) to be transmitted
-     */
-    if ((PR_MkDir(TEST_DIR, 0777)) < 0) {
-        printf("prsocket_test failed to create dir %s\n",TEST_DIR);
-        failed_already=1;
-        return -1;
-    }
-
-    small_file_fd = PR_Open(SMALL_FILE_NAME, PR_RDWR | PR_CREATE_FILE,0777);
-
-    if (small_file_fd == NULL) {
-        fprintf(stderr,"prsocket_test failed to create/open file %s\n",
-            SMALL_FILE_NAME);
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    buf = PR_NEW(file_buf);
-    if (buf == NULL) {
-        fprintf(stderr,"prsocket_test failed to allocate buffer\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    /*
-     * fill in random data
-     */
-    for (i = 0; i < TRANSMITFILE_BUF_SIZE; i++) {
-        buf->data[i] = i;
-    }
-    count = 0;
-    do {
-        len = (SMALL_FILE_SIZE - count) > TRANSMITFILE_BUF_SIZE ?
-            TRANSMITFILE_BUF_SIZE : (SMALL_FILE_SIZE - count);
-        bytes = PR_Write(small_file_fd, buf->data, len);
-        if (bytes <= 0) {
-            fprintf(stderr,
-                "prsocket_test failed to write to file %s\n",
-                SMALL_FILE_NAME);
-            failed_already=1;
-            rv = -1;
-            goto done;
-        }
-        count += bytes;
-    } while (count < SMALL_FILE_SIZE);
-#ifdef XP_UNIX
-    /*
-     * map the small file; used in checking for data corruption
-     */
-    small_file_addr = mmap(0, SMALL_FILE_SIZE, PROT_READ,
-        MAP_SHARED, small_file_fd->secret->md.osfd, 0);
-    if (small_file_addr == (void *) -1) {
-        fprintf(stderr,"prsocket_test failed to mmap file %s\n",
-            SMALL_FILE_NAME);
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-#endif
-    /*
-     * header for small file
-     */
-    small_file_header = PR_MALLOC(SMALL_FILE_HEADER_SIZE);
-    if (small_file_header == NULL) {
-        fprintf(stderr,"prsocket_test failed to malloc header file\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    memset(small_file_header, (int) PR_IntervalNow(),
-        SMALL_FILE_HEADER_SIZE);
-    /*
-     * trailer for small file
-     */
-    small_file_trailer = PR_MALLOC(SMALL_FILE_TRAILER_SIZE);
-    if (small_file_trailer == NULL) {
-        fprintf(stderr,"prsocket_test failed to malloc header trailer\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    memset(small_file_trailer, (int) PR_IntervalNow(),
-        SMALL_FILE_TRAILER_SIZE);
-    /*
-     * setup large file
-     */
-    large_file_fd = PR_Open(LARGE_FILE_NAME, PR_RDWR | PR_CREATE_FILE,0777);
-
-    if (large_file_fd == NULL) {
-        fprintf(stderr,"prsocket_test failed to create/open file %s\n",
-            LARGE_FILE_NAME);
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    /*
-     * fill in random data
-     */
-    for (i = 0; i < TRANSMITFILE_BUF_SIZE; i++) {
-        buf->data[i] = i;
-    }
-    count = 0;
-    do {
-        len = (LARGE_FILE_SIZE - count) > TRANSMITFILE_BUF_SIZE ?
-            TRANSMITFILE_BUF_SIZE : (LARGE_FILE_SIZE - count);
-        bytes = PR_Write(large_file_fd, buf->data, len);
-        if (bytes <= 0) {
-            fprintf(stderr,
-                "prsocket_test failed to write to file %s: (%ld, %ld)\n",
-                LARGE_FILE_NAME,
-                PR_GetError(), PR_GetOSError());
-            failed_already=1;
-            rv = -1;
-            goto done;
-        }
-        count += bytes;
-    } while (count < LARGE_FILE_SIZE);
-#ifdef XP_UNIX
-    /*
-     * map the large file; used in checking for data corruption
-     */
-    large_file_addr = mmap(0, LARGE_FILE_SIZE, PROT_READ,
-        MAP_SHARED, large_file_fd->secret->md.osfd, 0);
-    if (large_file_addr == (void *) -1) {
-        fprintf(stderr,"prsocket_test failed to mmap file %s\n",
-            LARGE_FILE_NAME);
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-#endif
-    /*
-     * header for large file
-     */
-    large_file_header = PR_MALLOC(LARGE_FILE_HEADER_SIZE);
-    if (large_file_header == NULL) {
-        fprintf(stderr,"prsocket_test failed to malloc header file\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    memset(large_file_header, (int) PR_IntervalNow(),
-        LARGE_FILE_HEADER_SIZE);
-    /*
-     * trailer for large file
-     */
-    large_file_trailer = PR_MALLOC(LARGE_FILE_TRAILER_SIZE);
-    if (large_file_trailer == NULL) {
-        fprintf(stderr,"prsocket_test failed to malloc header trailer\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    memset(large_file_trailer, (int) PR_IntervalNow(),
-        LARGE_FILE_TRAILER_SIZE);
-
-    datalen = tcp_mesg_size;
-    thread_count = 0;
-    /*
-     * start the server thread
-     */
-    sparamp = PR_NEW(Server_Param);
-    if (sparamp == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    server_sem = PR_NewSem(0);
-    if (server_sem == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewSem failed\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    mon2 = PR_NewMonitor();
-    if (mon2 == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NewMonitor failed\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    PR_EnterMonitor(mon2);
-
-    sparamp->addr_sem = server_sem;
-    sparamp->exit_mon = mon2;
-    sparamp->exit_counter = &thread_count;
-    sparamp->datalen = datalen;
-    t = PR_CreateThread(PR_USER_THREAD,
-        TransmitFile_Server, (void *)sparamp, 
-        PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD,
-        PR_UNJOINABLE_THREAD,
-        0);
-    if (t == NULL) {
-        fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    DPRINTF(("Created TCP server = 0x%x\n", t));
-    thread_count++;
-
-    /*
-     * wait till the server address is setup
-     */
-    PR_WaitSem(server_sem);
-
-    /*
-     * Now start a bunch of client threads
-     */
-
-    cparamp = PR_NEW(Client_Param);
-    if (cparamp == NULL) {
-        fprintf(stderr,"prsocket_test: PR_NEW failed\n");
-        failed_already=1;
-        rv = -1;
-        goto done;
-    }
-    cparamp->server_addr = tcp_server_addr;
-    cparamp->server_addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    cparamp->exit_mon = mon2;
-    cparamp->exit_counter = &thread_count;
-    cparamp->datalen = datalen;
-    for (i = 0; i < num_transmitfile_clients; i++) {
-        t = create_new_thread(PR_USER_THREAD,
-            TransmitFile_Client, (void *) cparamp,
-            PR_PRIORITY_NORMAL,
-            PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD,
-            0, i);
-        if (t == NULL) {
-            fprintf(stderr,"prsocket_test: PR_CreateThread failed\n");
-            rv = -1;
-            failed_already=1;
-            goto done;
-        }
-        DPRINTF(("Created TransmitFile client = 0x%lx\n", t));
-        thread_count++;
-    }
-    /* Wait for server and client threads to exit */
-    while (thread_count) {
-        PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("Socket_Misc_Test - thread_count  = %d\n", thread_count));
-    }
-    PR_ExitMonitor(mon2);
-done:
-    if (buf) {
-        PR_DELETE(buf);
-    }
-#ifdef XP_UNIX
-    munmap((char*)small_file_addr, SMALL_FILE_SIZE);
-    munmap((char*)large_file_addr, LARGE_FILE_SIZE);
-#endif
-    PR_Close(small_file_fd);
-    PR_Close(large_file_fd);
-    if ((PR_Delete(SMALL_FILE_NAME)) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: failed to unlink file %s\n",
-            SMALL_FILE_NAME);
-        failed_already=1;
-    }
-    if ((PR_Delete(LARGE_FILE_NAME)) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test: failed to unlink file %s\n",
-            LARGE_FILE_NAME);
-        failed_already=1;
-    }
-    if ((PR_RmDir(TEST_DIR)) == PR_FAILURE) {
-        fprintf(stderr,"prsocket_test failed to rmdir %s: (%ld, %ld)\n",
-            TEST_DIR, PR_GetError(), PR_GetOSError());
-        failed_already=1;
-    }
-
-    printf("%-29s%s","Socket_Misc_Test",":");
-    printf("%2d Server %2d Clients\n",1, num_transmitfile_clients);
-    printf("%30s Sizes of Transmitted Files  - %4d KB, %2d MB \n",":",
-        SMALL_FILE_SIZE/1024, LARGE_FILE_SIZE/(1024 * 1024));
-
-
-    return rv;
-}
-/************************************************************************/
-
-/*
- * Test Socket NSPR APIs
- */
-
-int
-main(int argc, char **argv)
-{
-    /*
-     * -d           debug mode
-     */
-
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("socket.log");
-#endif
-    PR_SetConcurrency(4);
-
-    emuSendFileIdentity = PR_GetUniqueIdentity("Emulated SendFile");
-    emuSendFileMethods = *PR_GetDefaultIOMethods();
-    emuSendFileMethods.transmitfile = emu_TransmitFile;
-    emuSendFileMethods.sendfile = emu_SendFile;
-
-    /*
-     * run client-server test with TCP, Ipv4-Ipv4
-     */
-	printf("TCP Client/Server Test - IPv4/Ipv4\n");
-    if (TCP_Socket_Client_Server_Test() < 0) {
-        printf("TCP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("TCP_Socket_Client_Server_Test Passed\n");
-    /*
-     * client-server test, Ipv6-Ipv4
-     */
-	client_domain = PR_AF_INET6;
-	printf("TCP Client/Server Test - IPv6/Ipv4\n");
-    if (TCP_Socket_Client_Server_Test() < 0) {
-        printf("TCP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("TCP_Socket_Client_Server_Test Passed\n");
-    /*
-     * client-server test, Ipv4-Ipv6
-     */
-	client_domain = PR_AF_INET;
-	server_domain = PR_AF_INET6;
-	printf("TCP Client/Server Test - IPv4/Ipv6\n");
-    if (TCP_Socket_Client_Server_Test() < 0) {
-        printf("TCP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("TCP_Socket_Client_Server_Test Passed\n");
-    /*
-     * client-server test, Ipv6-Ipv6
-     */
-	client_domain = PR_AF_INET6;
-	server_domain = PR_AF_INET6;
-	printf("TCP Client/Server Test - IPv6/Ipv6\n");
-    if (TCP_Socket_Client_Server_Test() < 0) {
-        printf("TCP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("TCP_Socket_Client_Server_Test Passed\n");
-	test_cancelio = 0;
-    /*
-     * run client-server test with UDP, IPv4/IPv4
-     */
-	printf("UDP Client/Server Test - IPv4/Ipv4\n");
-	client_domain = PR_AF_INET;
-	server_domain = PR_AF_INET;
-    if (UDP_Socket_Client_Server_Test() < 0) {
-        printf("UDP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("UDP_Socket_Client_Server_Test Passed\n");
-    /*
-     * run client-server test with UDP, IPv6/IPv4
-     */
-	printf("UDP Client/Server Test - IPv6/Ipv4\n");
-	client_domain = PR_AF_INET6;
-	server_domain = PR_AF_INET;
-    if (UDP_Socket_Client_Server_Test() < 0) {
-        printf("UDP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("UDP_Socket_Client_Server_Test Passed\n");
-    /*
-     * run client-server test with UDP,IPv4-IPv6
-     */
-	printf("UDP Client/Server Test - IPv4/Ipv6\n");
-	client_domain = PR_AF_INET;
-	server_domain = PR_AF_INET6;
-    if (UDP_Socket_Client_Server_Test() < 0) {
-        printf("UDP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("UDP_Socket_Client_Server_Test Passed\n");
-    /*
-     * run client-server test with UDP,IPv6-IPv6
-     */
-	printf("UDP Client/Server Test - IPv6/Ipv6\n");
-	client_domain = PR_AF_INET6;
-	server_domain = PR_AF_INET6;
-    if (UDP_Socket_Client_Server_Test() < 0) {
-        printf("UDP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("UDP_Socket_Client_Server_Test Passed\n");
-    /*
-     * Misc socket tests - including transmitfile, etc.
-     */
-
-#if !defined(WIN16)
-    /*
-** The 'transmit file' test does not run because
-** transmit file is not implemented in NSPR yet.
-**
-*/
-    if (Socket_Misc_Test() < 0) {
-        printf("Socket_Misc_Test failed\n");
-        failed_already=1;
-        goto done;
-    } else
-        printf("Socket_Misc_Test passed\n");
-
-    /*
-     * run client-server test with TCP again to test
-     * recycling used sockets from PR_TransmitFile().
-     */
-    if (TCP_Socket_Client_Server_Test() < 0) {
-        printf("TCP_Socket_Client_Server_Test failed\n");
-        goto done;
-    } else
-        printf("TCP_Socket_Client_Server_Test Passed\n");
-#endif
-
-done:
-    PR_Cleanup();
-    if (failed_already) return 1;
-    else return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/sockopt.c b/libs/js/nsprpub/pr/tests/sockopt.c
deleted file mode 100644
index 905e23875d..0000000000
--- a/libs/js/nsprpub/pr/tests/sockopt.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "prio.h"
-#include "prinit.h"
-#include "prprf.h"
-#ifdef XP_MAC
-#include "probslet.h"
-#else
-#include "obsolete/probslet.h"
-#endif
-
-#include "plerror.h"
-
-static PRFileDesc *err = NULL;
-static PRBool failed = PR_FALSE;
-
-#ifndef XP_MAC
-static void Failed(const char *msg1, const char *msg2)
-{
-    if (NULL != msg1) PR_fprintf(err, "%s ", msg1);
-    PL_FPrintError(err, msg2);
-    failed = PR_TRUE;
-}  /* Failed */
-
-#else
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-static void Failed(const char *msg1, const char *msg2)
-{
-    if (NULL != msg1) printf("%s ", msg1);
-    printf (msg2);
-    failed |= PR_TRUE;
-}  /* Failed */
-
-#endif
-
-static PRSockOption Incr(PRSockOption *option)
-{
-    PRIntn val = ((PRIntn)*option) + 1;
-    *option = (PRSockOption)val;
-    return (PRSockOption)val;
-}  /* Incr */
-
-PRIntn main(PRIntn argc, char *argv)
-{
-    PRStatus rv;
-    PRFileDesc *udp = PR_NewUDPSocket();
-    PRFileDesc *tcp = PR_NewTCPSocket();
-    const char *tag[] =
-    {
-        "PR_SockOpt_Nonblocking",     /* nonblocking io */
-        "PR_SockOpt_Linger",          /* linger on close if data present */
-        "PR_SockOpt_Reuseaddr",       /* allow local address reuse */
-        "PR_SockOpt_Keepalive",       /* keep connections alive */
-        "PR_SockOpt_RecvBufferSize",  /* send buffer size */
-        "PR_SockOpt_SendBufferSize",  /* receive buffer size */
-
-        "PR_SockOpt_IpTimeToLive",    /* time to live */
-        "PR_SockOpt_IpTypeOfService", /* type of service and precedence */
-
-        "PR_SockOpt_AddMember",       /* add an IP group membership */
-        "PR_SockOpt_DropMember",      /* drop an IP group membership */
-        "PR_SockOpt_McastInterface",  /* multicast interface address */
-        "PR_SockOpt_McastTimeToLive", /* multicast timetolive */
-        "PR_SockOpt_McastLoopback",   /* multicast loopback */
-
-        "PR_SockOpt_NoDelay",         /* don't delay send to coalesce packets */
-        "PR_SockOpt_MaxSegment",      /* maximum segment size */
-        "PR_SockOpt_Broadcast",       /* Enable broadcast */
-        "PR_SockOpt_Last"
-    };
-
-    err = PR_GetSpecialFD(PR_StandardError);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("sockopt.log");
-#endif
-
-    if (NULL == udp) Failed("PR_NewUDPSocket()", NULL);
-    else if (NULL == tcp) Failed("PR_NewTCPSocket()", NULL);
-    else
-    {
-        PRSockOption option;
-        PRUint32 segment = 1024;
-        PRNetAddr addr;
-
-        rv = PR_InitializeNetAddr(PR_IpAddrAny, 0, &addr);
-        if (PR_FAILURE == rv) Failed("PR_InitializeNetAddr()", NULL);
-        rv = PR_Bind(udp, &addr);
-        if (PR_FAILURE == rv) Failed("PR_Bind()", NULL);
-        for(option = PR_SockOpt_Linger; option < PR_SockOpt_Last; Incr(&option))
-        {
-            PRSocketOptionData data;
-            PRFileDesc *fd = tcp;
-            data.option = option;
-            switch (option)
-            {
-                case PR_SockOpt_Nonblocking:
-                    data.value.non_blocking = PR_TRUE;
-                    break;    
-                case PR_SockOpt_Linger:
-                    data.value.linger.polarity = PR_TRUE;
-                    data.value.linger.linger = PR_SecondsToInterval(2);          
-                    break;    
-                case PR_SockOpt_Reuseaddr:
-                    data.value.reuse_addr = PR_TRUE;      
-                    break;    
-                case PR_SockOpt_Keepalive:       
-                    data.value.keep_alive = PR_TRUE;      
-                    break;    
-                case PR_SockOpt_RecvBufferSize:
-                    data.value.recv_buffer_size = segment;  
-                    break;    
-                case PR_SockOpt_SendBufferSize:  
-                    data.value.send_buffer_size = segment;  
-                    break;    
-                case PR_SockOpt_IpTimeToLive:
-                    data.value.ip_ttl = 64;  
-                    break;    
-                case PR_SockOpt_IpTypeOfService:
-                    data.value.tos = 0; 
-                    break;    
-                case PR_SockOpt_McastTimeToLive:
-                    fd = udp; 
-                    data.value.mcast_ttl = 4; 
-                    break;    
-                case PR_SockOpt_McastLoopback:
-                    fd = udp; 
-                    data.value.mcast_loopback = PR_TRUE; 
-                    break;    
-                case PR_SockOpt_NoDelay:
-                    data.value.no_delay = PR_TRUE;         
-                    break;    
-#ifndef WIN32
-                case PR_SockOpt_MaxSegment:
-                    data.value.max_segment = segment;      
-                    break;    
-#endif
-                case PR_SockOpt_Broadcast:
-                    fd = udp; 
-                    data.value.broadcast = PR_TRUE;         
-                    break;    
-                default: continue;
-            }
-
-			/*
-			 * TCP_MAXSEG can only be read, not set
-			 */
-            if (option != PR_SockOpt_MaxSegment) {
-#ifdef WIN32
-            	if (option != PR_SockOpt_McastLoopback)
-#endif
-				{
-            		rv = PR_SetSocketOption(fd, &data);
-            		if (PR_FAILURE == rv)
-							Failed("PR_SetSocketOption()", tag[option]);
-				}
-			}
-
-            rv = PR_GetSocketOption(fd, &data);
-            if (PR_FAILURE == rv) Failed("PR_GetSocketOption()", tag[option]);
-        }
-        PR_Close(udp);
-        PR_Close(tcp);
-    }
-#ifndef XP_MAC
-    PR_fprintf(err, "%s\n", (failed) ? "FAILED" : "PASSED");
-#else
-   printf("%s\n", (failed) ? "FAILED" : "PASSED");
-#endif
-    return (failed) ? 1 : 0;
-}  /* main */
-
-/* sockopt.c */
-
diff --git a/libs/js/nsprpub/pr/tests/sockping.c b/libs/js/nsprpub/pr/tests/sockping.c
deleted file mode 100644
index 093651389c..0000000000
--- a/libs/js/nsprpub/pr/tests/sockping.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: sockping.c
- *
- * Description:
- * This test runs in conjunction with the sockpong test.
- * This test creates a socket pair and passes one socket
- * to the sockpong test.  Then this test writes "ping" to
- * to the sockpong test and the sockpong test writes "pong"
- * back.  To run this pair of tests, just invoke sockping.
- *
- * Tested areas: process creation, socket pairs, file
- * descriptor inheritance.
- */
-
-#include "prerror.h"
-#include "prio.h"
-#include "prproces.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUM_ITERATIONS 10
-
-static char *child_argv[] = { "sockpong", NULL };
-
-int main()
-{
-    PRFileDesc *sock[2];
-    PRStatus status;
-    PRProcess *process;
-    PRProcessAttr *attr;
-    char buf[1024];
-    PRInt32 nBytes;
-    PRInt32 exitCode;
-    int idx;
-
-    status = PR_NewTCPSocketPair(sock);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_NewTCPSocketPair failed\n");
-        exit(1);
-    }
-
-    status = PR_SetFDInheritable(sock[0], PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed: (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-    status = PR_SetFDInheritable(sock[1], PR_TRUE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed: (%d, %d)\n",
-                PR_GetError(), PR_GetOSError());
-        exit(1);
-    }
-
-    attr = PR_NewProcessAttr();
-    if (attr == NULL) {
-        fprintf(stderr, "PR_NewProcessAttr failed\n");
-        exit(1);
-    }
-
-    status = PR_ProcessAttrSetInheritableFD(attr, sock[1], "SOCKET");
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_ProcessAttrSetInheritableFD failed\n");
-        exit(1);
-    }
-
-    process = PR_CreateProcess(child_argv[0], child_argv, NULL, attr);
-    if (process == NULL) {
-        fprintf(stderr, "PR_CreateProcess failed\n");
-        exit(1);
-    }
-    PR_DestroyProcessAttr(attr);
-    status = PR_Close(sock[1]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        strcpy(buf, "ping");
-        printf("ping process: sending \"%s\"\n", buf);
-        nBytes = PR_Write(sock[0], buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(sock[0], buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        printf("ping process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "ping process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "pong") != 0) {
-            fprintf(stderr, "ping process: expected \"pong\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-    }
-
-    status = PR_Close(sock[0]);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    status = PR_WaitProcess(process, &exitCode);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_WaitProcess failed\n");
-        exit(1);
-    }
-    if (exitCode == 0) {
-        printf("PASS\n");
-        return 0;
-    } else {
-        printf("FAIL\n");
-        return 1;
-    }
-}
diff --git a/libs/js/nsprpub/pr/tests/sockpong.c b/libs/js/nsprpub/pr/tests/sockpong.c
deleted file mode 100644
index e54e34233c..0000000000
--- a/libs/js/nsprpub/pr/tests/sockpong.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: sockpong.c
- *
- * Description:
- * This test runs in conjunction with the sockping test.
- * The sockping test creates a socket pair and passes one
- * socket to this test.  Then the sockping test writes
- * "ping" to this test and this test writes "pong" back.
- * To run this pair of tests, just invoke sockping.
- *
- * Tested areas: process creation, socket pairs, file
- * descriptor inheritance.
- */
-
-#include "prerror.h"
-#include "prio.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define NUM_ITERATIONS 10
-
-int main()
-{
-    PRFileDesc *sock;
-    PRStatus status;
-    char buf[1024];
-    PRInt32 nBytes;
-    int idx;
-
-    sock = PR_GetInheritedFD("SOCKET");
-    if (sock == NULL) {
-        fprintf(stderr, "PR_GetInheritedFD failed\n");
-        exit(1);
-    }
-    status = PR_SetFDInheritable(sock, PR_FALSE);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_SetFDInheritable failed\n");
-        exit(1);
-    }
-
-    for (idx = 0; idx < NUM_ITERATIONS; idx++) {
-        memset(buf, 0, sizeof(buf));
-        nBytes = PR_Read(sock, buf, sizeof(buf));
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Read failed: (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-            exit(1);
-        }
-        printf("pong process: received \"%s\"\n", buf);
-        if (nBytes != 5) {
-            fprintf(stderr, "pong process: expected 5 bytes but got %d bytes\n",
-                    nBytes);
-            exit(1);
-        }
-        if (strcmp(buf, "ping") != 0) {
-            fprintf(stderr, "pong process: expected \"ping\" but got \"%s\"\n",
-                    buf);
-            exit(1);
-        }
-
-        strcpy(buf, "pong");
-        printf("pong process: sending \"%s\"\n", buf);
-        nBytes = PR_Write(sock, buf, 5);
-        if (nBytes == -1) {
-            fprintf(stderr, "PR_Write failed\n");
-            exit(1);
-        }
-    }
-
-    status = PR_Close(sock);
-    if (status == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/sprintf.c b/libs/js/nsprpub/pr/tests/sprintf.c
deleted file mode 100644
index 7fe2ac1949..0000000000
--- a/libs/js/nsprpub/pr/tests/sprintf.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:	sprintf.c
- * Description:
- *     This is a test program for the PR_snprintf() functions defined
- *     in prprf.c.  This test program is based on ns/nspr/tests/sprintf.c,
- *     revision 1.10.
- * Modification History:
- *	20-May-1997 AGarcia replaced printf statment to return PASS\n. This is to be used by the
- *				regress tool parsing routine.
- ** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
- *			recognize the return code from tha main program.
- */
-
-#include "prinit.h"
-#include "prprf.h"
-#include "prlog.h"
-#include "prlong.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define countof(a) (sizeof(a)/sizeof(a[0]))
-
-static char sbuf[20000];
-
-
-/*
-** Perform a three way test against PR_smprintf, PR_snprintf, and sprintf.
-** Make sure the results are identical
-*/
-static void test_i(char *pattern, int i)
-{
-    char *s;
-    char buf[200];
-    int n;
-
-    /* try all three routines */
-    s = PR_smprintf(pattern, i);
-    PR_ASSERT(s != 0);
-    n = PR_snprintf(buf, sizeof(buf), pattern, i);
-    PR_ASSERT(n <= sizeof(buf));
-    sprintf(sbuf, pattern, i);
-
-    /* compare results */
-    if ((strncmp(s, buf, sizeof(buf)) != 0) ||
-	(strncmp(s, sbuf, sizeof(sbuf)) != 0)) {
-	fprintf(stderr,
-	   "pattern='%s' i=%d\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
-	   pattern, i, s, buf, sbuf);
-	   PR_smprintf_free(s);
-	exit(-1);
-    }
-	PR_smprintf_free(s);
-}
-
-static void TestI(void)
-{
-    static int nums[] = {
-	0, 1, -1, 10, -10,
-	32767, -32768,
-    };
-    static char *signs[] = {
-	"",
-	"0",	"-",	"+", " ",
-	"0-",	"0+",	"0 ",	"-0",	"-+",	"- ",
-	"+0",	"+-",	"+ ",	" 0",	" -",	" +",
-	"0-+",	"0- ",	"0+-",	"0+ ",	"0 -",	"0 +",
-	"-0+",	"-0 ",	"-+0",	"-+ ",	"- 0",	"- +",
-	"+0-",	"+0 ",	"+-0",	"+- ",	"+ 0",	"+ -",
-	" 0-",	" 0+",	" -0",	" -+",	" +0",	" +-",
-	"0-+ ",	"0- +",	"0+- ",	"0+ -",	"0 -+",	"0 +-",
-	"-0+ ",	"-0 +",	"-+0 ",	"-+ 0",	"- 0+",	"- +0",
-	"+0- ",	"+0 -",	"+-0 ",	"+- 0",	"+ 0-",	"+ -0",
-	" 0-+",	" 0+-",	" -0+",	" -+0",	" +0-",	" +-0",
-    };
-    static char *precs[] = {
-	"", "3", "5", "43",
-	"7.3", "7.5", "7.11", "7.43",
-    };
-    static char *formats[] = {
-	"d", "o", "x", "u",
-	"hd", "ho", "hx", "hu"
-    };
-    int f, s, n, p;
-    char fmt[20];
-
-    for (f = 0; f < countof(formats); f++) {
-	for (s = 0; s < countof(signs); s++) {
-	    for (p = 0; p < countof(precs); p++) {
-		fmt[0] = '%';
-		fmt[1] = 0;
-		if (signs[s]) strcat(fmt, signs[s]);
-		if (precs[p]) strcat(fmt, precs[p]);
-		if (formats[f]) strcat(fmt, formats[f]);
-		for (n = 0; n < countof(nums); n++) {
-		    test_i(fmt, nums[n]);
-		}
-	    }
-	}
-    }
-}
-
-/************************************************************************/
-
-/*
-** Perform a three way test against PR_smprintf, PR_snprintf, and sprintf.
-** Make sure the results are identical
-*/
-static void test_l(char *pattern, char *spattern, PRInt32 l)
-{
-    char *s;
-    char buf[200];
-    int n;
-
-    /* try all three routines */
-    s = PR_smprintf(pattern, l);
-    PR_ASSERT(s != 0);
-    n = PR_snprintf(buf, sizeof(buf), pattern, l);
-    PR_ASSERT(n <= sizeof(buf));
-    sprintf(sbuf, spattern, l);
-
-    /* compare results */
-    if ((strncmp(s, buf, sizeof(buf)) != 0) ||
-	(strncmp(s, sbuf, sizeof(sbuf)) != 0)) {
-	fprintf(stderr,
-	   "pattern='%s' l=%ld\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
-	   pattern, l, s, buf, sbuf);
-	PR_smprintf_free(s);
-	exit(-1);
-    }
-	PR_smprintf_free(s);
-}
-
-static void TestL(void)
-{
-    static PRInt32 nums[] = {
-	0,
-	1,
-	-1,
-	10,
-	-10,
-	32767,
-	-32768,
-	PR_INT32(0x7fffffff), /* 2147483647L */
-	-1 - PR_INT32(0x7fffffff)  /* -2147483648L */
-    };
-    static char *signs[] = {
-	"",
-	"0",	"-",	"+", " ",
-	"0-",	"0+",	"0 ",	"-0",	"-+",	"- ",
-	"+0",	"+-",	"+ ",	" 0",	" -",	" +",
-	"0-+",	"0- ",	"0+-",	"0+ ",	"0 -",	"0 +",
-	"-0+",	"-0 ",	"-+0",	"-+ ",	"- 0",	"- +",
-	"+0-",	"+0 ",	"+-0",	"+- ",	"+ 0",	"+ -",
-	" 0-",	" 0+",	" -0",	" -+",	" +0",	" +-",
-	"0-+ ",	"0- +",	"0+- ",	"0+ -",	"0 -+",	"0 +-",
-	"-0+ ",	"-0 +",	"-+0 ",	"-+ 0",	"- 0+",	"- +0",
-	"+0- ",	"+0 -",	"+-0 ",	"+- 0",	"+ 0-",	"+ -0",
-	" 0-+",	" 0+-",	" -0+",	" -+0",	" +0-",	" +-0",
-    };
-    static char *precs[] = {
-	"", "3", "5", "43",
-	".3", ".43",
-	"7.3", "7.5", "7.11", "7.43",
-    };
-    static char *formats[] = { "ld", "lo", "lx", "lu" };
-
-#if PR_BYTES_PER_INT == 4
-    static char *sformats[] = { "d", "o", "x", "u" };
-#elif PR_BYTES_PER_LONG == 4
-    static char *sformats[] = { "ld", "lo", "lx", "lu" };
-#else
-#error Neither int nor long is 4 bytes on this platform
-#endif
-
-    int f, s, n, p;
-    char fmt[40], sfmt[40];
-
-    for (f = 0; f < countof(formats); f++) {
-	for (s = 0; s < countof(signs); s++) {
-	    for (p = 0; p < countof(precs); p++) {
-		fmt[0] = '%';
-		fmt[1] = 0;
-		if (signs[s]) strcat(fmt, signs[s]);
-		if (precs[p]) strcat(fmt, precs[p]);
-		strcpy(sfmt, fmt);
-		if (formats[f]) strcat(fmt, formats[f]);
-		if (sformats[f]) strcat(sfmt, sformats[f]);
-		for (n = 0; n < countof(nums); n++) {
-		    test_l(fmt, sfmt, nums[n]);
-		}
-	    }
-	}
-    }
-}
-
-/************************************************************************/
-
-/*
-** Perform a three way test against PR_smprintf, PR_snprintf, and sprintf.
-** Make sure the results are identical
-*/
-static void test_ll(char *pattern, char *spattern, PRInt64 l)
-{
-    char *s;
-    char buf[200];
-    int n;
-
-    /* try all three routines */
-    s = PR_smprintf(pattern, l);
-    PR_ASSERT(s != 0);
-    n = PR_snprintf(buf, sizeof(buf), pattern, l);
-    PR_ASSERT(n <= sizeof(buf));
-#if defined(HAVE_LONG_LONG)
-    sprintf(sbuf, spattern, l);
-
-    /* compare results */
-    if ((strncmp(s, buf, sizeof(buf)) != 0) ||
-	(strncmp(s, sbuf, sizeof(sbuf)) != 0)) {
-#if PR_BYTES_PER_LONG == 8
-#define FORMAT_SPEC "%ld"
-#elif defined(WIN16)
-#define FORMAT_SPEC "%Ld"
-#elif defined(WIN32)
-#define FORMAT_SPEC "%I64d"
-#else
-#define FORMAT_SPEC "%lld"
-#endif
-	fprintf(stderr,
-	    "pattern='%s' ll=" FORMAT_SPEC "\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
-	    pattern, l, s, buf, sbuf);
-	printf("FAIL\n");
-	PR_smprintf_free(s);
-	exit(-1);
-    }
-	PR_smprintf_free(s);
-#else
-    /* compare results */
-    if ((strncmp(s, buf, sizeof(buf)) != 0)) {
-	fprintf(stderr,
-	    "pattern='%s'\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
-	    pattern, s, buf, sbuf);
-	printf("FAIL\n");
-	PR_smprintf_free(s);
-        exit(-1);
-    }
-	PR_smprintf_free(s);
-#endif
-}
-
-static void TestLL(void)
-{
-    static PRInt64 nums[] = {
-	LL_INIT(0, 0),
-	LL_INIT(0, 1),
-	LL_INIT(0xffffffff, 0xffffffff),  /* -1 */
-	LL_INIT(0, 10),
-	LL_INIT(0xffffffff, 0xfffffff6),  /* -10 */
-	LL_INIT(0, 32767),
-	LL_INIT(0xffffffff, 0xffff8000),  /* -32768 */
-	LL_INIT(0, 0x7fffffff),  /* 2147483647 */
-	LL_INIT(0xffffffff, 0x80000000),  /* -2147483648 */
-	LL_INIT(0x7fffffff, 0xffffffff),  /* 9223372036854775807 */
-	LL_INIT(0x80000000, 0)            /* -9223372036854775808 */
-    };
-
-    static char *signs[] = {
-	"",
-	"0",	"-",	"+", " ",
-	"0-",	"0+",	"0 ",	"-0",	"-+",	"- ",
-	"+0",	"+-",	"+ ",	" 0",	" -",	" +",
-	"0-+",	"0- ",	"0+-",	"0+ ",	"0 -",	"0 +",
-	"-0+",	"-0 ",	"-+0",	"-+ ",	"- 0",	"- +",
-	"+0-",	"+0 ",	"+-0",	"+- ",	"+ 0",	"+ -",
-	" 0-",	" 0+",	" -0",	" -+",	" +0",	" +-",
-	"0-+ ",	"0- +",	"0+- ",	"0+ -",	"0 -+",	"0 +-",
-	"-0+ ",	"-0 +",	"-+0 ",	"-+ 0",	"- 0+",	"- +0",
-	"+0- ",	"+0 -",	"+-0 ",	"+- 0",	"+ 0-",	"+ -0",
-	" 0-+",	" 0+-",	" -0+",	" -+0",	" +0-",	" +-0",
-    };
-    static char *precs[] = {
-	"", "3", "5", "43",
-	".3", ".43",
-	"7.3", "7.5", "7.11", "7.43",
-    };
-    static char *formats[] = { "lld", "llo", "llx", "llu" };
-
-#if PR_BYTES_PER_LONG == 8
-    static char *sformats[] = { "ld", "lo", "lx", "lu" };
-#elif defined(WIN16)
-    /* Watcom uses the format string "%Ld" instead of "%lld". */
-    static char *sformats[] = { "Ld", "Lo", "Lx", "Lu" };
-#elif defined(WIN32)
-    static char *sformats[] = { "I64d", "I64o", "I64x", "I64u" };
-#else
-    static char *sformats[] = { "lld", "llo", "llx", "llu" };
-#endif
-
-    int f, s, n, p;
-    char fmt[40], sfmt[40];
-
-    for (f = 0; f < countof(formats); f++) {
-	for (s = 0; s < countof(signs); s++) {
-	    for (p = 0; p < countof(precs); p++) {
-		fmt[0] = '%';
-		fmt[1] = 0;
-		if (signs[s]) strcat(fmt, signs[s]);
-		if (precs[p]) strcat(fmt, precs[p]);
-		strcpy(sfmt, fmt);
-		if (formats[f]) strcat(fmt, formats[f]);
-		if (sformats[f]) strcat(sfmt, sformats[f]);
-		for (n = 0; n < countof(nums); n++) {
-		    test_ll(fmt, sfmt, nums[n]);
-		}
-	    }
-	}
-    }
-}
-
-/************************************************************************/
-
-/*
-** Perform a three way test against PR_smprintf, PR_snprintf, and sprintf.
-** Make sure the results are identical
-*/
-static void test_s(char *pattern, char *ss)
-{
-    char *s;
-    unsigned char before[8];
-    char buf[200];
-    unsigned char after[8];
-    int n;
-
-    memset(before, 0xBB, 8);
-    memset(after, 0xAA, 8);
-
-    /* try all three routines */
-    s = PR_smprintf(pattern, ss);
-    PR_ASSERT(s != 0);
-    n = PR_snprintf(buf, sizeof(buf), pattern, ss);
-    PR_ASSERT(n <= sizeof(buf));
-    sprintf(sbuf, pattern, ss);
-
-    for (n = 0; n < 8; n++) {
-	PR_ASSERT(before[n] == 0xBB);
-	PR_ASSERT(after[n] == 0xAA);
-    }
-
-    /* compare results */
-    if ((strncmp(s, buf, sizeof(buf)) != 0) ||
-	(strncmp(s, sbuf, sizeof(sbuf)) != 0)) {
-	fprintf(stderr,
-	   "pattern='%s' ss=%.20s\nPR_smprintf='%s'\nPR_snprintf='%s'\n    sprintf='%s'\n",
-	   pattern, ss, s, buf, sbuf);
-	printf("FAIL\n");
-	PR_smprintf_free(s);
-	exit(-1);
-    }
-	PR_smprintf_free(s);
-}
-
-static void TestS(void)
-{
-    static char *strs[] = {
-	"",
-	"a",
-	"abc",
-	"abcde",
-	"abcdefABCDEF",
-	"abcdefghijklmnopqrstuvwxyz0123456789!@#$"
-	    "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$"
-	    "abcdefghijklmnopqrstuvwxyz0123456789!@#$",
-    };
-    /* '0' is not relevant to printing strings */
-    static char *signs[] = {
-	"",
-	"-",	"+",	" ",
-	"-+",	"- ",	"+-",	"+ ",	" -",	" +",
-	"-+ ",	"- +",	"+- ",	"+ -",	" -+",	" +-",
-    };
-    static char *precs[] = {
-	"", "3", "5", "43",
-	".3", ".43",
-	"7.3", "7.5", "7.11", "7.43",
-    };
-    static char *formats[] = { "s" };
-    int f, s, n, p;
-    char fmt[40];
-
-    for (f = 0; f < countof(formats); f++) {
-	for (s = 0; s < countof(signs); s++) {
-	    for (p = 0; p < countof(precs); p++) {
-		fmt[0] = '%';
-		fmt[1] = 0;
-		if (signs[s]) strcat(fmt+strlen(fmt), signs[s]);
-		if (precs[p]) strcat(fmt+strlen(fmt), precs[p]);
-		if (formats[f]) strcat(fmt+strlen(fmt), formats[f]);
-		for (n = 0; n < countof(strs); n++) {
-		    test_s(fmt, strs[n]);
-		}
-	    }
-	}
-    }
-}
-
-/************************************************************************/
-
-int main(int argc, char **argv)
-{
-    PR_STDIO_INIT();
-    TestI();
-    TestL();
-    TestLL();
-    TestS();
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/sproc_ch.c b/libs/js/nsprpub/pr/tests/sproc_ch.c
deleted file mode 100644
index 98dee0836d..0000000000
--- a/libs/js/nsprpub/pr/tests/sproc_ch.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test sproc_ch.c
- *
- * The purpose of this test and the sproc_p.c test is to test the shutdown
- * of all the IRIX sprocs in a program when one of them dies due to an error.
- *
- * There are three sprocs in this test: the parent, the child, and the 
- * grandchild.  The parent and child sprocs never stop on their own.
- * The grandchild sproc gets a segmentation fault and dies.  You should
- * You should use "ps" to see if the parent and child sprocs are killed
- * after the grandchild dies.
- */
-
-#include "prinit.h"
-#include <stdio.h>
-
-#if !defined(IRIX)
-
-int main()
-{
-    printf("This test applies to IRIX only.\n");
-    return 0;
-}
-
-#else  /* IRIX */
-
-#include "prthread.h"
-#include <sys/types.h>
-#include <unistd.h>
-
-void SegFault(void *unused)
-{
-    int *p = 0;
-
-    printf("The grandchild sproc has pid %d.\n", getpid());
-    printf("The grandchild sproc will get a segmentation fault and die.\n");
-    printf("The parent and child sprocs should be killed after the "
-            "grandchild sproc dies.\n");
-    printf("Use 'ps' to make sure this is so.\n");
-    fflush(stdout);
-    /* Force a segmentation fault */
-    *p = 0;
-}
-
-void NeverStops(void *unused)
-{
-    int i = 0;
-
-    printf("The child sproc has pid %d.\n", getpid());
-    printf("The child sproc won't stop on its own.\n");
-    fflush(stdout);
-
-    /* create the grandchild sproc */
-    PR_CreateThread(PR_USER_THREAD, SegFault, NULL,
-	    PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    while (1) {
-	i++;
-    }
-}
-
-int main()
-{
-    int i= 0;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-
-    printf("The parent sproc has pid %d.\n", getpid());
-    printf("The parent sproc won't stop on its own.\n");
-    fflush(stdout);
-
-    /* create the child sproc */
-    PR_CreateThread(PR_USER_THREAD, NeverStops, NULL,
-	    PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    while (1) {
-	i++;
-    }
-    return 0;
-}
-
-#endif  /* IRIX */
diff --git a/libs/js/nsprpub/pr/tests/sproc_p.c b/libs/js/nsprpub/pr/tests/sproc_p.c
deleted file mode 100644
index e8ded66b11..0000000000
--- a/libs/js/nsprpub/pr/tests/sproc_p.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test sproc_p.c
- *
- * The purpose of this test and the sproc_ch.c test is to test the shutdown
- * of all the IRIX sprocs in a program when one of them dies due to an error.
- *
- * In this test, the parent sproc gets a segmentation fault and dies.
- * The child sproc never stops on its own.  You should use "ps" to see if
- * the child sproc is killed after the parent dies.
- */
-
-#include "prinit.h"
-#include <stdio.h>
-
-#if !defined(IRIX)
-
-int main()
-{
-    printf("This test applies to IRIX only.\n");
-    return 0;
-}
-
-#else  /* IRIX */
-
-#include "prthread.h"
-#include <sys/types.h>
-#include <unistd.h>
-
-void NeverStops(void *unused)
-{
-    int i = 0;
-
-    printf("The child sproc has pid %d.\n", getpid());
-    printf("The child sproc won't stop on its own.\n");
-    fflush(stdout);
-
-    /* I never stop */
-    while (1) {
-	i++;
-    }
-}
-
-int main()
-{
-    int *p = 0;
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-
-    printf("The parent sproc has pid %d.\n", getpid());
-    printf("The parent sproc will first create a child sproc.\n");
-    printf("Then the parent sproc will get a segmentation fault and die.\n");
-    printf("The child sproc should be killed after the parent sproc dies.\n");
-    printf("Use 'ps' to make sure this is so.\n");
-    fflush(stdout);
-
-    PR_CreateThread(PR_USER_THREAD, NeverStops, NULL,
-	    PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    /* Force a segmentation fault */
-    *p = 0;
-    return 0;
-}
-
-#endif /* IRIX */
diff --git a/libs/js/nsprpub/pr/tests/stack.c b/libs/js/nsprpub/pr/tests/stack.c
deleted file mode 100644
index c47cb71f92..0000000000
--- a/libs/js/nsprpub/pr/tests/stack.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- *
- * Test atomic stack operations
- *		
- *		Two stacks are created and threads add data items (each containing
- *		one of the first n integers) to the first stack, remove data items
- *		from the first stack and add them to the second stack. The primordial
- *		thread compares the sum of the first n integers to the sum of the
- *		integers in the data items in the second stack. The test succeeds if
- *		they are equal.
- */
- 
-#include "nspr.h"
-#include "plgetopt.h"
-
-typedef struct _DataRecord {
-	PRInt32	data;
-	PRStackElem	link;
-} DataRecord;
-
-#define RECORD_LINK_PTR(lp) ((DataRecord*) ((char*) (lp) - offsetof(DataRecord,link)))
-
-#define MAX_THREAD_CNT		100
-#define DEFAULT_THREAD_CNT	4
-#define DEFAULT_DATA_CNT	100
-#define DEFAULT_LOOP_CNT	10000
-
-/*
- * sum of the first n numbers using the formula n*(n+1)/2
- */
-#define SUM_OF_NUMBERS(n) ((n & 1) ? (((n + 1)/2) * n) : ((n/2) * (n+1)))
-
-typedef struct stack_data {
-	PRStack		*list1;
-	PRStack		*list2;
-	PRInt32		initial_data_value;
-	PRInt32		data_cnt;
-	PRInt32		loops;
-} stack_data;
-
-static void stackop(void *arg);
-
-static int _debug_on;
-
-PRFileDesc  *output;
-PRFileDesc  *errhandle;
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRInt32 rv, cnt, sum;
-	DataRecord	*Item;
-	PRStack		*list1, *list2;
-	PRStackElem	*node;
-	PRStatus rc;
-
-	PRInt32 thread_cnt = DEFAULT_THREAD_CNT;
-	PRInt32 data_cnt = DEFAULT_DATA_CNT;
-	PRInt32 loops = DEFAULT_LOOP_CNT;
-	PRThread **threads;
-	stack_data *thread_args;
-
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:c:l:");
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			_debug_on = 1;
-            break;
-        case 't':  /* thread count */
-            thread_cnt = atoi(opt->value);
-            break;
-        case 'c':  /* data count */
-            data_cnt = atoi(opt->value);
-            break;
-        case 'l':  /* loop count */
-            loops = atoi(opt->value);
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-	PR_SetConcurrency(4);
-
-    output = PR_GetSpecialFD(PR_StandardOutput);
-    errhandle = PR_GetSpecialFD(PR_StandardError);
-	list1 = PR_CreateStack("Stack_1");
-	if (list1 == NULL) {
-		PR_fprintf(errhandle, "PR_CreateStack failed - error %d\n",
-								PR_GetError());
-		return 1;
-	}
-
-	list2 = PR_CreateStack("Stack_2");
-	if (list2 == NULL) {
-		PR_fprintf(errhandle, "PR_CreateStack failed - error %d\n",
-								PR_GetError());
-		return 1;
-	}
-
-
-	threads = (PRThread**) PR_CALLOC(sizeof(PRThread*) * thread_cnt);
-	thread_args = (stack_data *) PR_CALLOC(sizeof(stack_data) * thread_cnt);
-
-	if (_debug_on)
-		PR_fprintf(output,"%s: thread_cnt = %d data_cnt = %d\n", argv[0],
-							thread_cnt, data_cnt);
-	for(cnt = 0; cnt < thread_cnt; cnt++) {
-		PRThreadScope scope;
-
-		thread_args[cnt].list1 = list1;
-		thread_args[cnt].list2 = list2;
-		thread_args[cnt].loops = loops;
-		thread_args[cnt].data_cnt = data_cnt;	
-		thread_args[cnt].initial_data_value = 1 + cnt * data_cnt;
-
-		if (cnt & 1)
-			scope = PR_GLOBAL_THREAD;
-		else
-			scope = PR_LOCAL_THREAD;
-
-
-		threads[cnt] = PR_CreateThread(PR_USER_THREAD,
-						  stackop, &thread_args[cnt],
-						  PR_PRIORITY_NORMAL,
-						  scope,
-						  PR_JOINABLE_THREAD,
-						  0);
-		if (threads[cnt] == NULL) {
-			PR_fprintf(errhandle, "PR_CreateThread failed - error %d\n",
-								PR_GetError());
-			PR_ProcessExit(2);
-		}
-		if (_debug_on)
-			PR_fprintf(output,"%s: created thread = 0x%x\n", argv[0],
-										threads[cnt]);
-	}
-
-	for(cnt = 0; cnt < thread_cnt; cnt++) {
-    	rc = PR_JoinThread(threads[cnt]);
-		PR_ASSERT(rc == PR_SUCCESS);
-	}
-
-	node = PR_StackPop(list1);
-	/*
-	 * list1 should be empty
-	 */
-	if (node != NULL) {
-		PR_fprintf(errhandle, "Error - Stack 1 not empty\n");
-		PR_ASSERT(node == NULL);
-		PR_ProcessExit(4);
-	}
-
-	cnt = data_cnt * thread_cnt;
-	sum = 0;
-	while (cnt-- > 0) {
-		node = PR_StackPop(list2);
-		/*
-		 * There should be at least 'cnt' number of records
-		 */
-		if (node == NULL) {
-			PR_fprintf(errhandle, "Error - PR_StackPop returned NULL\n");
-			PR_ProcessExit(3);
-		}
-		Item = RECORD_LINK_PTR(node);
-		sum += Item->data;
-	}
-	node = PR_StackPop(list2);
-	/*
-	 * there should be exactly 'cnt' number of records
-	 */
-	if (node != NULL) {
-		PR_fprintf(errhandle, "Error - Stack 2 not empty\n");
-		PR_ASSERT(node == NULL);
-		PR_ProcessExit(4);
-	}
-	PR_DELETE(threads);
-	PR_DELETE(thread_args);
-
-	PR_DestroyStack(list1);
-	PR_DestroyStack(list2);
-
-	if (sum == SUM_OF_NUMBERS(data_cnt * thread_cnt)) {
-		PR_fprintf(output, "%s successful\n", argv[0]);
-		PR_fprintf(output, "\t\tsum = 0x%x, expected = 0x%x\n", sum,
-							SUM_OF_NUMBERS(thread_cnt * data_cnt));
-		return 0;
-	} else {
-		PR_fprintf(output, "%s failed: sum = 0x%x, expected = 0x%x\n",
-							argv[0], sum,
-								SUM_OF_NUMBERS(data_cnt * thread_cnt));
-		return 2;
-	}
-}
-
-static void stackop(void *thread_arg)
-{
-    PRInt32 val, cnt, index, loops;
-	DataRecord	*Items, *Item;
-	PRStack		*list1, *list2;
-	PRStackElem	*node;
-	stack_data *arg = (stack_data *) thread_arg;
-
-	val = arg->initial_data_value;
-	cnt = arg->data_cnt;
-	loops = arg->loops;
-	list1 = arg->list1;
-	list2 = arg->list2;
-
-	/*
-	 * allocate memory for the data records
-	 */
-	Items = (DataRecord *) PR_CALLOC(sizeof(DataRecord) * cnt);
-	PR_ASSERT(Items != NULL);
-	index = 0;
-
-	if (_debug_on)
-		PR_fprintf(output,
-		"Thread[0x%x] init_val = %d cnt = %d data1 = 0x%x datan = 0x%x\n",
-				PR_GetCurrentThread(), val, cnt, &Items[0], &Items[cnt-1]);
-
-
-	/*
-	 * add the data records to list1
-	 */
-	while (cnt-- > 0) {
-		Items[index].data = val++;
-		PR_StackPush(list1, &Items[index].link);
-		index++;
-	}
-
-	/*
-	 * pop data records from list1 and add them back to list1
-	 * generates contention for the stack accesses
-	 */
-	while (loops-- > 0) {
-		cnt = arg->data_cnt;
-		while (cnt-- > 0) {
-			node = PR_StackPop(list1);
-			if (node == NULL) {
-				PR_fprintf(errhandle, "Error - PR_StackPop returned NULL\n");
-				PR_ASSERT(node != NULL);
-				PR_ProcessExit(3);
-			}
-			PR_StackPush(list1, node);
-		}
-	}
-	/*
-	 * remove the data records from list1 and add them to list2
-	 */
-	cnt = arg->data_cnt;
-	while (cnt-- > 0) {
-		node = PR_StackPop(list1);
-		if (node == NULL) {
-			PR_fprintf(errhandle, "Error - PR_StackPop returned NULL\n");
-			PR_ASSERT(node != NULL);
-			PR_ProcessExit(3);
-		}
-		PR_StackPush(list2, node);
-	}
-	if (_debug_on)
-		PR_fprintf(output,
-		"Thread[0x%x] init_val = %d cnt = %d exiting\n",
-				PR_GetCurrentThread(), val, cnt);
-
-}
-
diff --git a/libs/js/nsprpub/pr/tests/stat.c b/libs/js/nsprpub/pr/tests/stat.c
deleted file mode 100644
index 73803d0575..0000000000
--- a/libs/js/nsprpub/pr/tests/stat.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Program to test different ways to get file info; right now it 
- * only works for solaris and OS/2.
- *
- */
-#include "nspr.h"
-#include "prpriv.h"
-#include "prinrval.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_OS2
-#include <io.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
-#define DEFAULT_COUNT 100000
-PRInt32 count;
-
-#ifndef XP_PC
-char *filename = "/etc/passwd";
-#else
-char *filename = "..\\stat.c";
-#endif
-
-static void statPRStat(void)
-{
-    PRFileInfo finfo;
-    PRInt32 index = count;
- 
-    for (;index--;) {
-         PR_GetFileInfo(filename, &finfo);
-    }
-}
-
-static void statStat(void)
-{
-    struct stat finfo;
-    PRInt32 index = count;
- 
-    for (;index--;) {
-        stat(filename, &finfo);
-    }
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-    PRInt32 tot;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-    tot = PR_IntervalToMilliseconds(stop-start);
-
-    printf("%40s: %6.2f usec avg, %d msec total\n", msg, d / count, tot);
-}
-
-void main(int argc, char **argv)
-{
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (argc > 1) {
-	count = atoi(argv[1]);
-    } else {
-	count = DEFAULT_COUNT;
-    }
-
-    Measure(statPRStat, "time to call PR_GetFileInfo()");
-    Measure(statStat, "time to call stat()");
-
-    PR_Cleanup();
-}
diff --git a/libs/js/nsprpub/pr/tests/stdio.c b/libs/js/nsprpub/pr/tests/stdio.c
deleted file mode 100644
index d0d84e4ec1..0000000000
--- a/libs/js/nsprpub/pr/tests/stdio.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File:        stdio.c
- * Description: testing the "special" fds
- * Modification History:
- * 20-May-1997 AGarcia - Replace Test succeeded status with PASS. This is used by the
- *						regress tool parsing code.
- ** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
- */
-
-
-#include "prlog.h"
-#include "prinit.h"
-#include "prio.h"
-
-#include <stdio.h>
-#include <string.h>
-
-static PRIntn PR_CALLBACK stdio(PRIntn argc, char **argv)
-{
-    PRInt32 rv;
-
-    PRFileDesc *out = PR_GetSpecialFD(PR_StandardOutput);
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-
-    rv = PR_Write(
-        out, "This to standard out\n",
-        strlen("This to standard out\n"));
-    PR_ASSERT((PRInt32)strlen("This to standard out\n") == rv);
-    rv = PR_Write(
-        err, "This to standard err\n",
-        strlen("This to standard err\n"));
-    PR_ASSERT((PRInt32)strlen("This to standard err\n") == rv);
-
-    return 0;
-
-}  /* stdio */
-
-int main(int argc, char **argv)
-{
-    PR_STDIO_INIT();
-    return PR_Initialize(stdio, argc, argv, 0);
-}  /* main */
-
-
-/* stdio.c */
diff --git a/libs/js/nsprpub/pr/tests/str2addr.c b/libs/js/nsprpub/pr/tests/str2addr.c
deleted file mode 100644
index b1d4cf4acc..0000000000
--- a/libs/js/nsprpub/pr/tests/str2addr.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: str2addr.c
- * Description: a test for PR_StringToNetAddr
- */
-
-#include "nspr.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/* Address string to convert */
-#define DEFAULT_IPV4_ADDR_STR "207.200.73.41"
-
-/* Expected conversion result, in network byte order */
-static unsigned char default_ipv4_addr[] = {207, 200, 73, 41};
-
-int main(int argc, char **argv)
-{
-    PRNetAddr addr;
-    const char *addrStr;
-    unsigned char *bytes;
-    int idx;
-
-    addrStr = DEFAULT_IPV4_ADDR_STR;
-    if (PR_StringToNetAddr(addrStr, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_StringToNetAddr failed\n");
-        exit(1);
-    }
-    if (addr.inet.family != PR_AF_INET) {
-        fprintf(stderr, "addr.inet.family should be %d but is %d\n",
-                PR_AF_INET, addr.inet.family);
-        exit(1);
-    }
-    bytes = (unsigned char *) &addr.inet.ip;
-    for (idx = 0; idx < 4; idx++) {
-        if (bytes[idx] != default_ipv4_addr[idx]) {
-            fprintf(stderr, "byte %d of IPv4 addr should be %d but is %d\n",
-                    idx, default_ipv4_addr[idx], bytes[idx]);
-            exit(1);
-        }
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/strod.c b/libs/js/nsprpub/pr/tests/strod.c
deleted file mode 100644
index 242617a717..0000000000
--- a/libs/js/nsprpub/pr/tests/strod.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prinit.h"
-#include "prio.h"
-#include "prprf.h"
-#include "prdtoa.h"
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-static void Help(void)
-{
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PR_fprintf(err, "Usage: /.strod [-n n] [-l n] [-h]\n");
-    PR_fprintf(err, "\t-n n Number to translate    (default: 1234567890123456789)\n");
-    PR_fprintf(err, "\t-l n Times to loop the test (default: 1)\n");
-    PR_fprintf(err, "\t-h   This message and nothing else\n");
-}  /* Help */
-
-static PRIntn PR_CALLBACK RealMain(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    PRIntn loops = 1;
-    PRFloat64 answer;
-    const char *number = "1234567890123456789";
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hc:l:");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'n':  /* number to translate */
-            number = opt->value;
-            break;
-        case 'l':  /* number of times to run the tests */
-            loops = atoi(opt->value);
-            break;
-        case 'h':  /* user wants some guidance */
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-            break;
-         default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_fprintf(err, "Settings\n");
-    PR_fprintf(err, "\tNumber to translate %s\n", number);
-    PR_fprintf(err, "\tLoops to run test: %d\n", loops);
-
-    while (loops--)
-    {
-        answer = PR_strtod(number, NULL);
-        PR_fprintf(err, "Translation = %20.0f\n", answer);
-    }
-    return 0;
-}
-
-
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
diff --git a/libs/js/nsprpub/pr/tests/suspend.c b/libs/js/nsprpub/pr/tests/suspend.c
deleted file mode 100644
index 44ba6f8712..0000000000
--- a/libs/js/nsprpub/pr/tests/suspend.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef XP_BEOS
-#include <stdio.h>
-int main()
-{
-    printf( "This test is not ported to the BeOS\n" );
-    return 0;
-}
-#else
-
-#include "nspr.h"
-#include "prpriv.h"
-#include "prinrval.h"
-
-#if defined(XP_MAC)
-#include "gcint.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "gcint.h"
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-PRMonitor *mon;
-PRInt32 count;
-PRInt32 alive;
-
-#define SLEEP_TIME    4    /* secs */
-
-void PR_CALLBACK
-Level_2_Thread(void *arg)
-{
-    PR_Sleep(PR_MillisecondsToInterval(4 * 1000));
-    printf("Level_2_Thread[0x%lx] exiting\n",PR_GetCurrentThread());
-    return;
-}
-
-void PR_CALLBACK
-Level_1_Thread(void *arg)
-{
-    PRUint32 tmp = (PRUint32)arg;
-    PRThreadScope scope = (PRThreadScope) tmp;
-    PRThread *thr;
-
-    thr = PR_CreateThreadGCAble(PR_USER_THREAD,
-        Level_2_Thread,
-        NULL,
-        PR_PRIORITY_HIGH,
-        scope,
-        PR_JOINABLE_THREAD,
-        0);
-
-    if (!thr) {
-        printf("Could not create thread!\n");
-    } else {
-        printf("Level_1_Thread[0x%lx] created %15s thread 0x%lx\n",
-            PR_GetCurrentThread(),
-            (scope == PR_GLOBAL_THREAD) ?
-            "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
-            thr);
-        PR_JoinThread(thr);
-    }
-    PR_EnterMonitor(mon);
-    alive--;
-    PR_Notify(mon);
-    PR_ExitMonitor(mon);
-    printf("Thread[0x%lx] exiting\n",PR_GetCurrentThread());
-}
-
-static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg)
-{
-    PRInt32 words;
-    PRWord *registers;
-
-    printf(
-        "\nprint_thread[0x%lx]: %-20s - i = %ld\n",thread, 
-        (PR_GLOBAL_THREAD == PR_GetThreadScope(thread)) ?
-        "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", i);
-    registers = PR_GetGCRegisters(thread, 0, (int *)&words);
-    printf("Regsters R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
-        registers[0],registers[1],registers[2],registers[3]);
-    printf("Stack Pointer = 0x%lx\n", PR_GetSP(thread));
-    return PR_SUCCESS;
-}
-
-static void Level_0_Thread(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *thr;
-    PRThread *me = PR_GetCurrentThread();
-    int n;
-    PRInt32 words;
-    PRWord *registers;
-
-    alive = 0;
-    mon = PR_NewMonitor();
-
-    alive = count;
-    for (n=0; n<count; n++) {
-        thr = PR_CreateThreadGCAble(PR_USER_THREAD,
-            Level_1_Thread, 
-            (void *)scope2, 
-            PR_PRIORITY_NORMAL,
-            scope1,
-            PR_UNJOINABLE_THREAD,
-            0);
-        if (!thr) {
-            printf("Could not create thread!\n");
-            alive--;
-        }
-        printf("Level_0_Thread[0x%lx] created %15s thread 0x%lx\n",
-            PR_GetCurrentThread(),
-            (scope1 == PR_GLOBAL_THREAD) ?
-            "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
-            thr);
-
-        PR_Sleep(0);
-    }
-    PR_SuspendAll();
-    PR_EnumerateThreads(print_thread, NULL);
-    registers = PR_GetGCRegisters(me, 1, (int *)&words);
-    printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
-        registers[0],registers[1],registers[2],registers[3]);
-    printf("My Stack Pointer = 0x%lx\n", PR_GetSP(me));
-    PR_ResumeAll();
-
-    /* Wait for all threads to exit */
-    PR_EnterMonitor(mon);
-    while (alive) {
-        PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-    PR_ExitMonitor(mon);
-    PR_DestroyMonitor(mon);
-}
-
-static void CreateThreadsUU(void)
-{
-    Level_0_Thread(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void CreateThreadsUK(void)
-{
-    Level_0_Thread(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-static void CreateThreadsKU(void)
-{
-    Level_0_Thread(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void CreateThreadsKK(void)
-{
-    Level_0_Thread(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-
-void
-main(int argc, char **argv)
-{
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("suspend.log");
-#endif
-
-    if (argc > 1) {
-        count = atoi(argv[1]);
-    } else {
-        count = 5;
-    }
-
-    printf("\n\n%20s%30s\n\n"," ","Suspend_Resume Test");
-    CreateThreadsUU();
-    CreateThreadsUK();
-    CreateThreadsKU();
-    CreateThreadsKK();
-    PR_SetConcurrency(2);
-
-    printf("\n%20s%30s\n\n"," ","Added 2nd CPU\n");
-
-    CreateThreadsUK();
-    CreateThreadsKK();
-    CreateThreadsUU();
-    CreateThreadsKU();
-    PR_Cleanup();
-}
-
-#endif /* XP_BEOS */
diff --git a/libs/js/nsprpub/pr/tests/switch.c b/libs/js/nsprpub/pr/tests/switch.c
deleted file mode 100644
index 2e42b79314..0000000000
--- a/libs/js/nsprpub/pr/tests/switch.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:            switch.c
-** Description:     trying to time context switches
-*/
-
-#include "prinit.h"
-#include "prcvar.h"
-#include "prmem.h"
-#include "prinrval.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prthread.h"
-#include "prprf.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#if defined(XP_MAC)
-#include "pprio.h"
-#define printf PR_LogPrint
-#else
-#include "private/pprio.h"
-#endif
-
-#include <stdlib.h>
-
-#define INNER_LOOPS 100
-#define DEFAULT_LOOPS 100
-#define DEFAULT_THREADS 10
-
-static PRFileDesc *debug_out = NULL;
-static PRBool debug_mode = PR_FALSE, verbosity = PR_FALSE, failed = PR_FALSE;
-
-typedef struct Shared
-{
-    PRLock *ml;
-    PRCondVar *cv;
-    PRBool twiddle;
-    PRThread *thread;
-    struct Shared *next;
-} Shared;
-
-static void Help(void)
-{
-    debug_out = PR_STDOUT;
-
-    PR_fprintf(
-		debug_out, "Usage: >./switch [-c n] [-t n] [-d] [-v] [-G] [-C n]\n");
-    PR_fprintf(
-		debug_out, "-c n\tloops at thread level (default: %d)\n", DEFAULT_LOOPS);
-    PR_fprintf(
-		debug_out, "-t n\tnumber of threads (default: %d)\n", DEFAULT_THREADS);
-    PR_fprintf(debug_out, "-d\tturn on debugging output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-v\tturn on verbose output (default: FALSE)\n");
-    PR_fprintf(debug_out, "-G\tglobal threads only (default: FALSE)\n");
-    PR_fprintf(debug_out, "-C n\tconcurrency setting (default: 1)\n");
-}  /* Help */
-
-static void PR_CALLBACK Notified(void *arg)
-{
-    Shared *shared = (Shared*)arg;
-    PRStatus status = PR_SUCCESS;
-    while (PR_SUCCESS == status)
-    {
-        PR_Lock(shared->ml);
-        while (shared->twiddle && (PR_SUCCESS == status))
-            status = PR_WaitCondVar(shared->cv, PR_INTERVAL_NO_TIMEOUT);
-		if (verbosity) PR_fprintf(debug_out, "+");
-        shared->twiddle = PR_TRUE;
-        shared->next->twiddle = PR_FALSE;
-        PR_NotifyCondVar(shared->next->cv);
-        PR_Unlock(shared->ml);
-    }
-}  /* Notified */
-
-static Shared home;
-PRIntn PR_CALLBACK Switch(PRIntn argc, char **argv)
-{
-	PLOptStatus os;
-    PRStatus status;
-    PRBool help = PR_FALSE;
-    PRUintn concurrency = 1;
-    Shared *shared, *link;
-    PRIntervalTime timein, timeout;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-    PRUintn thread_count, inner_count, loop_count, average;
-    PRUintn thread_limit = DEFAULT_THREADS, loop_limit = DEFAULT_LOOPS;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "hdvc:t:C:G");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'v':  /* verbose mode */
-			verbosity = PR_TRUE;
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-        case 'c':  /* loop counter */
-			loop_limit = atoi(opt->value);
-            break;
-        case 't':  /* thread limit */
-			thread_limit = atoi(opt->value);
-            break;
-        case 'C':  /* Concurrency limit */
-			concurrency = atoi(opt->value);
-            break;
-        case 'G':  /* global threads only */
-			thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'h':  /* help message */
-			Help();
-			help = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    if (help) return -1;
-
-	if (PR_TRUE == debug_mode)
-	{
-		debug_out = PR_STDOUT;
-		PR_fprintf(debug_out, "Test parameters\n");
-		PR_fprintf(debug_out, "\tThreads involved: %d\n", thread_limit);
-		PR_fprintf(debug_out, "\tIteration limit: %d\n", loop_limit);
-		PR_fprintf(debug_out, "\tConcurrency: %d\n", concurrency);
-		PR_fprintf(
-			debug_out, "\tThread type: %s\n",
-			(PR_GLOBAL_THREAD == thread_scope) ? "GLOBAL" : "LOCAL");
-	}
-
-    PR_SetConcurrency(concurrency);
-
-    link = &home;
-    home.ml = PR_NewLock();
-    home.cv = PR_NewCondVar(home.ml);
-    home.twiddle = PR_FALSE;
-    home.next = NULL;
-
-    timeout = 0;
-
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        shared = PR_NEWZAP(Shared);
-
-        shared->ml = home.ml;
-        shared->cv = PR_NewCondVar(home.ml);
-        shared->twiddle = PR_TRUE;
-        shared->next = link;
-        link = shared;
-
-        shared->thread = PR_CreateThread(
-            PR_USER_THREAD, Notified, shared,
-            PR_PRIORITY_HIGH, thread_scope,
-            PR_JOINABLE_THREAD, 0);
-        PR_ASSERT(shared->thread != NULL);
-        if (NULL == shared->thread)
-            failed = PR_TRUE;
-	}
-
-    for (loop_count = 1; loop_count <= loop_limit; ++loop_count)
-    {
-		timein = PR_IntervalNow();
-		for (inner_count = 0; inner_count < INNER_LOOPS; ++inner_count)
-		{
-			PR_Lock(home.ml);
-			home.twiddle = PR_TRUE;
-			shared->twiddle = PR_FALSE;
-			PR_NotifyCondVar(shared->cv);
-			while (home.twiddle)
-            {
-				status = PR_WaitCondVar(home.cv, PR_INTERVAL_NO_TIMEOUT);
-				if (PR_FAILURE == status)
-				    failed = PR_TRUE;
-            }
-			PR_Unlock(home.ml);
-		}
-		timeout += (PR_IntervalNow() - timein);
-	}
-
-	if (debug_mode)
-	{
-		average = PR_IntervalToMicroseconds(timeout)
-			/ (INNER_LOOPS * loop_limit * thread_count);
-		PR_fprintf(
-			debug_out, "Average switch times %d usecs for %d threads\n",
-            average, thread_limit);
-	}
-
-    link = shared;
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        if (&home == link) break;
-        status = PR_Interrupt(link->thread);
-		if (PR_SUCCESS != status)
-        {
-            failed = PR_TRUE;
-            if (debug_mode)
-			    PL_FPrintError(debug_out, "Failed to interrupt");
-        }
-		link = link->next; 
-    }
-
-    for (thread_count = 1; thread_count <= thread_limit; ++thread_count)
-    {
-        link = shared->next;
-        status = PR_JoinThread(shared->thread);
-		if (PR_SUCCESS != status)
-		{
-            failed = PR_TRUE;
-            if (debug_mode)
-			    PL_FPrintError(debug_out, "Failed to join");
-        }
-        PR_DestroyCondVar(shared->cv);
-        PR_DELETE(shared);
-        if (&home == link) break;
-        shared = link;
-    }
-    PR_DestroyCondVar(home.cv);
-    PR_DestroyLock(home.ml);
-
-    PR_fprintf(PR_STDOUT, ((failed) ? "FAILED\n" : "PASSED\n"));
-    return ((failed) ? 1 : 0);
-}  /* Switch */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn result;
-    PR_STDIO_INIT();
-    result = PR_Initialize(Switch, argc, argv, 0);
-    return result;
-}  /* main */
-
-/* switch.c */
diff --git a/libs/js/nsprpub/pr/tests/system.c b/libs/js/nsprpub/pr/tests/system.c
deleted file mode 100644
index e75a452071..0000000000
--- a/libs/js/nsprpub/pr/tests/system.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prmem.h"
-#include "prprf.h"
-#include "prsystem.h"
-
-#include "plerror.h"
-
-static char *tag[] =
-{
-    "PR_SI_HOSTNAME",
-    "PR_SI_SYSNAME",
-    "PR_SI_RELEASE",
-    "PR_SI_ARCHITECTURE"
-};
-
-static PRSysInfo Incr(PRSysInfo *cmd)
-{
-    PRIntn tmp = (PRIntn)*cmd + 1;
-    *cmd = (PRSysInfo)tmp;
-    return (PRSysInfo)tmp;
-}  /* Incr */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PRSysInfo cmd;
-    PRFileDesc *output = PR_GetSpecialFD(PR_StandardOutput);
-
-    char *info = (char*)PR_Calloc(SYS_INFO_BUFFER_LENGTH, 1);
-    for (cmd = PR_SI_HOSTNAME; cmd <= PR_SI_ARCHITECTURE; Incr(&cmd))
-    {
-        rv = PR_GetSystemInfo(cmd, info, SYS_INFO_BUFFER_LENGTH);
-        if (PR_SUCCESS == rv) PR_fprintf(output, "%s: %s\n", tag[cmd], info);
-        else PL_FPrintError(output, tag[cmd]);
-    }
-    PR_DELETE(info);
-
-    PR_fprintf(output, "Host page size is %d\n", PR_GetPageSize());
-    PR_fprintf(output, "Page shift is %d\n", PR_GetPageShift());
-    PR_fprintf(output, "Number of processors is: %d\n", PR_GetNumberOfProcessors());
-    PR_fprintf(output, "Physical memory size is: %llu\n", PR_GetPhysicalMemorySize());
-
-    return 0;
-}  /* main */
-
-/* system.c */
diff --git a/libs/js/nsprpub/pr/tests/testbit.c b/libs/js/nsprpub/pr/tests/testbit.c
deleted file mode 100644
index 1ad0b8f4ce..0000000000
--- a/libs/js/nsprpub/pr/tests/testbit.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        lazyinit.c
-** Description: Test the functions and macros declared in prbit.h
-**
-*/
-
-#include "nspr.h"
-
-#define ErrorReport(x) { printf((x)); failed = 1; }
-
-prbitmap_t myMap[512/32] = { 0 };
-
-PRInt32 rc;
-PRInt32 i;
-PRIntn  failed = 0;
-
-PRIntn main(PRIntn argc, char **argv )
-{
-    /*
-    ** Test bitmap things.
-    */
-    if ( PR_TEST_BIT( myMap, 0 ))
-        ErrorReport("Test 0.0: Failed\n");
-
-    if ( PR_TEST_BIT( myMap, 31 ))
-        ErrorReport("Test 0.1: Failed\n");
-
-    if ( PR_TEST_BIT( myMap, 128 ))
-        ErrorReport("Test 0.2: Failed\n");
-
-    if ( PR_TEST_BIT( myMap, 129 ))
-        ErrorReport("Test 0.3: Failed\n");
-
-
-    PR_SET_BIT( myMap, 0 );
-    if ( !PR_TEST_BIT( myMap, 0 ))
-        ErrorReport("Test 1.0: Failed\n");
-
-    PR_CLEAR_BIT( myMap, 0 );
-    if ( PR_TEST_BIT( myMap, 0 ))
-        ErrorReport("Test 1.0.1: Failed\n");
-
-    PR_SET_BIT( myMap, 31 );
-    if ( !PR_TEST_BIT( myMap, 31 ))
-        ErrorReport("Test 1.1: Failed\n");
-
-    PR_CLEAR_BIT( myMap, 31 );
-    if ( PR_TEST_BIT( myMap, 31 ))
-        ErrorReport("Test 1.1.1: Failed\n");
-
-    PR_SET_BIT( myMap, 128 );
-    if ( !PR_TEST_BIT( myMap, 128 ))
-        ErrorReport("Test 1.2: Failed\n");
-
-    PR_CLEAR_BIT( myMap, 128 );
-    if ( PR_TEST_BIT( myMap, 128 ))
-        ErrorReport("Test 1.2.1: Failed\n");
-
-    PR_SET_BIT( myMap, 129 );
-    if ( !PR_TEST_BIT( myMap, 129 ))
-        ErrorReport("Test 1.3: Failed\n");
-
-    PR_CLEAR_BIT( myMap, 129 );
-    if ( PR_TEST_BIT( myMap, 129 ))
-        ErrorReport("Test 1.3.1: Failed\n");
-
-
-    /*
-    ** Test Ceiling and Floor functions and macros
-    */
-    if ((rc = PR_CeilingLog2(32)) != 5 )
-        ErrorReport("Test 10.0: Failed\n");
-
-    if ((rc = PR_FloorLog2(32)) != 5 )
-        ErrorReport("Test 10.1: Failed\n");
-
-
-    /*
-    ** Evaluate results and exit
-    */
-    if (failed)
-      {
-        printf("FAILED\n");
-        return(1);
-      }
-    else
-      {
-        printf("PASSED\n");
-        return(0);
-      }
-}  /* end main() */
-/* end testbit.c */
diff --git a/libs/js/nsprpub/pr/tests/testfile.c b/libs/js/nsprpub/pr/tests/testfile.c
deleted file mode 100644
index 9c9aa56632..0000000000
--- a/libs/js/nsprpub/pr/tests/testfile.c
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nspr.h"
-#include "prpriv.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef WIN32
-#include <windows.h>
-#include <process.h>
-#endif
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include <pthread.h>
-#endif
-
-#if defined(XP_OS2)
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#ifdef XP_OS2_EMX
-#include <getopt.h>
-#include <errno.h>
-#endif /* XP_OS2_EMX */
-#endif /* XP_OS2 */
-
-static int _debug_on = 0;
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "primpl.h"
-#define printf PR_LogPrint
-#define setbuf(x,y)
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#ifdef XP_WIN
-#define mode_t int
-#endif
-
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-PRLock *lock;
-PRMonitor *mon;
-PRInt32 count;
-int thread_count;
-
-#ifdef WIN16
-#define	BUF_DATA_SIZE	256 * 120
-#else
-#define	BUF_DATA_SIZE	256 * 1024
-#endif
-
-#define NUM_RDWR_THREADS	10
-#define NUM_DIRTEST_THREADS	4
-#define CHUNK_SIZE 512
-
-typedef struct buffer {
-	char	data[BUF_DATA_SIZE];
-} buffer;
-
-typedef struct File_Rdwr_Param {
-	char	*pathname;
-	char	*buf;
-	int	offset;
-	int	len;
-} File_Rdwr_Param;
-
-#ifdef XP_PC
-#ifdef XP_OS2
-char *TEST_DIR = "prdir";
-#else
-char *TEST_DIR = "C:\\temp\\prdir";
-#endif
-char *FILE_NAME = "pr_testfile";
-char *HIDDEN_FILE_NAME = "hidden_pr_testfile";
-#else
-char *TEST_DIR = "/tmp/testfile_dir";
-char *FILE_NAME = "pr_testfile";
-char *HIDDEN_FILE_NAME = ".hidden_pr_testfile";
-#endif
-buffer *in_buf, *out_buf;
-char pathname[256], renamename[256];
-#define TMPDIR_LEN	64
-char testdir[TMPDIR_LEN];
-static PRInt32 PR_CALLBACK DirTest(void *argunused);
-PRInt32 dirtest_failed = 0;
-
-PRThread* create_new_thread(PRThreadType type,
-							void (*start)(void *arg),
-							void *arg,
-							PRThreadPriority priority,
-							PRThreadScope scope,
-							PRThreadState state,
-							PRUint32 stackSize, PRInt32 index)
-{
-PRInt32 native_thread = 0;
-
-	PR_ASSERT(state == PR_UNJOINABLE_THREAD);
-
-#if (defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)) || defined(WIN32) || defined(XP_OS2)
-
-	switch(index %  4) {
-		case 0:
-			scope = (PR_LOCAL_THREAD);
-			break;
-		case 1:
-			scope = (PR_GLOBAL_THREAD);
-			break;
-		case 2:
-			scope = (PR_GLOBAL_BOUND_THREAD);
-			break;
-		case 3:
-			native_thread = 1;
-			break;
-		default:
-			PR_ASSERT(!"Invalid scope");
-			break;
-	}
-	if (native_thread) {
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-		pthread_t tid;
-		if (!pthread_create(&tid, NULL, start, arg))
-			return((PRThread *) tid);
-		else
-			return (NULL);
-#elif defined(XP_OS2)
-        TID tid;
-
-        tid = (TID)_beginthread((void(* _Optlink)(void*))start,
-                                NULL, 32768, arg);
-        if (tid == -1) {
-          printf("_beginthread failed. errno %d\n", errno);
-          return (NULL);
-        }
-        else
-          return((PRThread *) tid);
-#else
-		HANDLE thandle;
-		unsigned tid;
-		
-		thandle = (HANDLE) _beginthreadex(
-						NULL,
-						stackSize,
-						(unsigned (__stdcall *)(void *))start,
-						arg,
-						0,
-						&tid);		
-		return((PRThread *) thandle);
-#endif
-	} else {
-		return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
-	}
-#else
-	return(PR_CreateThread(type,start,arg,priority,scope,state,stackSize));
-#endif
-}
-
-static void PR_CALLBACK File_Write(void *arg)
-{
-PRFileDesc *fd_file;
-File_Rdwr_Param *fp = (File_Rdwr_Param *) arg;
-char *name, *buf;
-int offset, len;
-
-	setbuf(stdout, NULL);
-	name = fp->pathname;
-	buf = fp->buf;
-	offset = fp->offset;
-	len = fp->len;
-	
-	fd_file = PR_Open(name, PR_RDWR | PR_CREATE_FILE, 0777);
-	if (fd_file == NULL) {
-		printf("testfile failed to create/open file %s\n",name);
-		return;
-	}
-	if (PR_Seek(fd_file, offset, PR_SEEK_SET) < 0) {
-		printf("testfile failed to seek in file %s\n",name);
-		return;
-	}	
-	if ((PR_Write(fd_file, buf, len)) < 0) {
-		printf("testfile failed to write to file %s\n",name);
-		return;
-	}	
-	DPRINTF(("Write out_buf[0] = 0x%x\n",(*((int *) buf))));
-	PR_Close(fd_file);
-	PR_DELETE(fp);
-
-	PR_EnterMonitor(mon);
-	--thread_count;
-	PR_Notify(mon);
-	PR_ExitMonitor(mon);
-}
-
-static void PR_CALLBACK File_Read(void *arg)
-{
-PRFileDesc *fd_file;
-File_Rdwr_Param *fp = (File_Rdwr_Param *) arg;
-char *name, *buf;
-int offset, len;
-
-	setbuf(stdout, NULL);
-	name = fp->pathname;
-	buf = fp->buf;
-	offset = fp->offset;
-	len = fp->len;
-	
-	fd_file = PR_Open(name, PR_RDONLY, 0);
-	if (fd_file == NULL) {
-		printf("testfile failed to open file %s\n",name);
-		return;
-	}
-	if (PR_Seek(fd_file, offset, PR_SEEK_SET) < 0) {
-		printf("testfile failed to seek in file %s\n",name);
-		return;
-	}	
-	if ((PR_Read(fd_file, buf, len)) < 0) {
-		printf("testfile failed to read to file %s\n",name);
-		return;
-	}	
-	DPRINTF(("Read in_buf[0] = 0x%x\n",(*((int *) buf))));
-	PR_Close(fd_file);
-	PR_DELETE(fp);
-
-	PR_EnterMonitor(mon);
-	--thread_count;
-	PR_Notify(mon);
-	PR_ExitMonitor(mon);
-}
-
-
-static PRInt32 Misc_File_Tests(char *pathname)
-{
-PRFileDesc *fd_file;
-int len, rv = 0;
-PRFileInfo file_info, file_info1;
-char tmpname[1024];
-
-	setbuf(stdout, NULL);
-	/*
-	 * Test PR_Available, PR_Seek, PR_GetFileInfo, PR_Rename, PR_Access
-	 */
-
-	fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, 0777);
-
-	if (fd_file == NULL) {
-		printf("testfile failed to create/open file %s\n",pathname);
-		return -1;
-	}
-	if (PR_GetOpenFileInfo(fd_file, &file_info) < 0) {
-		printf("testfile PR_GetFileInfo failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (PR_Access(pathname, PR_ACCESS_EXISTS) != 0) {
-		printf("testfile PR_Access failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (PR_Access(pathname, PR_ACCESS_WRITE_OK) != 0) {
-		printf("testfile PR_Access failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (PR_Access(pathname, PR_ACCESS_READ_OK) != 0) {
-		printf("testfile PR_Access failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-
-
-	if (PR_GetFileInfo(pathname, &file_info) < 0) {
-		printf("testfile PR_GetFileInfo failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (file_info.type != PR_FILE_FILE) {
-	printf(
-	"testfile: Error - PR_GetFileInfo returned incorrect type for file %s\n",
-		pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (file_info.size != 0) {
-		printf(
-		"testfile PR_GetFileInfo returned incorrect size (%d should be 0) for file %s\n",
-		file_info.size, pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	file_info1 = file_info;
-
-	len = PR_Available(fd_file);
-	if (len < 0) {
-		printf("testfile PR_Available failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	} else if (len != 0) {
-		printf(
-		"testfile PR_Available failed: expected/returned = %d/%d bytes\n",
-			0, len);
-		rv = -1;
-		goto cleanup;
-	}
-	if (PR_GetOpenFileInfo(fd_file, &file_info) < 0) {
-		printf("testfile PR_GetFileInfo failed on file %s\n",pathname);
-		goto cleanup;
-	}
-	if (LL_NE(file_info.creationTime , file_info1.creationTime)) {
-		printf(
-		"testfile PR_GetFileInfo returned incorrect status-change time: %s\n",
-		pathname);
-		printf("ft = %lld, ft1 = %lld\n",file_info.creationTime,
-									file_info1.creationTime);
-		rv = -1;
-		goto cleanup;
-	}
-	len = PR_Write(fd_file, out_buf->data, CHUNK_SIZE);
-	if (len < 0) {
-		printf("testfile failed to write to file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (PR_GetOpenFileInfo(fd_file, &file_info) < 0) {
-		printf("testfile PR_GetFileInfo failed on file %s\n",pathname);
-		goto cleanup;
-	}
-	if (file_info.size != CHUNK_SIZE) {
-		printf(
-		"testfile PR_GetFileInfo returned incorrect size (%d should be %d) for file %s\n",
-		file_info.size, CHUNK_SIZE, pathname);
-		rv = -1;
-		goto cleanup;
-	}
-	if (LL_CMP(file_info.modifyTime, < , file_info1.modifyTime)) {
-		printf(
-		"testfile PR_GetFileInfo returned incorrect modify time: %s\n",
-		pathname);
-		printf("ft = %lld, ft1 = %lld\n",file_info.modifyTime,
-									file_info1.modifyTime);
-		rv = -1;
-		goto cleanup;
-	}
-
-	len = PR_Available(fd_file);
-	if (len < 0) {
-		printf("testfile PR_Available failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	} else if (len != 0) {
-		printf(
-		"testfile PR_Available failed: expected/returned = %d/%d bytes\n",
-			0, len);
-		rv = -1;
-		goto cleanup;
-	}
-	
-	PR_Seek(fd_file, 0, PR_SEEK_SET);
-	len = PR_Available(fd_file);
-	if (len < 0) {
-		printf("testfile PR_Available failed on file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	} else if (len != CHUNK_SIZE) {
-		printf(
-		"testfile PR_Available failed: expected/returned = %d/%d bytes\n",
-			CHUNK_SIZE, len);
-		rv = -1;
-		goto cleanup;
-	}
-    PR_Close(fd_file);
-
-	strcpy(tmpname,pathname);
-	strcat(tmpname,".RENAMED");
-	if (PR_FAILURE == PR_Rename(pathname, tmpname)) {
-		printf("testfile failed to rename file %s\n",pathname);
-		rv = -1;
-		goto cleanup;
-	}
-
-	fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, 0777);
-	len = PR_Write(fd_file, out_buf->data, CHUNK_SIZE);
-    PR_Close(fd_file);
-	if (PR_SUCCESS == PR_Rename(pathname, tmpname)) {
-		printf("testfile renamed to existing file %s\n",pathname);
-	}
-
-	if ((PR_Delete(tmpname)) < 0) {
-		printf("testfile failed to unlink file %s\n",tmpname);
-		rv = -1;
-	}
-
-cleanup:
-	if ((PR_Delete(pathname)) < 0) {
-		printf("testfile failed to unlink file %s\n",pathname);
-		rv = -1;
-	}
-	return rv;
-}
-
-
-static PRInt32 PR_CALLBACK FileTest(void)
-{
-PRDir *fd_dir;
-int i, offset, len, rv = 0;
-PRThread *t;
-PRThreadScope scope = PR_GLOBAL_THREAD;
-File_Rdwr_Param *fparamp;
-
-	/*
-	 * Create Test dir
-	 */
-	if ((PR_MkDir(TEST_DIR, 0777)) < 0) {
-		printf("testfile failed to create dir %s\n",TEST_DIR);
-		return -1;
-	}
-	fd_dir = PR_OpenDir(TEST_DIR);
-	if (fd_dir == NULL) {
-		printf("testfile failed to open dir %s\n",TEST_DIR);
-		rv =  -1;
-		goto cleanup;	
-	}
-
-    PR_CloseDir(fd_dir);
-
-	strcat(pathname, TEST_DIR);
-	strcat(pathname, "/");
-	strcat(pathname, FILE_NAME);
-
-	in_buf = PR_NEW(buffer);
-	if (in_buf == NULL) {
-		printf(
-		"testfile failed to alloc buffer struct\n");
-		rv =  -1;
-		goto cleanup;	
-	}
-	out_buf = PR_NEW(buffer);
-	if (out_buf == NULL) {
-		printf(
-		"testfile failed to alloc buffer struct\n");
-		rv =  -1;
-		goto cleanup;	
-	}
-
-	/*
-	 * Start a bunch of writer threads
-	 */
-	offset = 0;
-	len = CHUNK_SIZE;
-	PR_EnterMonitor(mon);
-	for (i = 0; i < NUM_RDWR_THREADS; i++) {
-		fparamp = PR_NEW(File_Rdwr_Param);
-		if (fparamp == NULL) {
-			printf(
-			"testfile failed to alloc File_Rdwr_Param struct\n");
-			rv =  -1;
-			goto cleanup;	
-		}
-		fparamp->pathname = pathname;
-		fparamp->buf = out_buf->data + offset;
-		fparamp->offset = offset;
-		fparamp->len = len;
-		memset(fparamp->buf, i, len);
-
-		t = create_new_thread(PR_USER_THREAD,
-			      File_Write, (void *)fparamp, 
-			      PR_PRIORITY_NORMAL,
-			      scope,
-			      PR_UNJOINABLE_THREAD,
-			      0, i);
-		offset += len;
-	}
-	thread_count = i;
-	/* Wait for writer threads to exit */
-	while (thread_count) {
-		PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-	}
-	PR_ExitMonitor(mon);
-
-
-	/*
-	 * Start a bunch of reader threads
-	 */
-	offset = 0;
-	len = CHUNK_SIZE;
-	PR_EnterMonitor(mon);
-	for (i = 0; i < NUM_RDWR_THREADS; i++) {
-		fparamp = PR_NEW(File_Rdwr_Param);
-		if (fparamp == NULL) {
-			printf(
-			"testfile failed to alloc File_Rdwr_Param struct\n");
-			rv =  -1;
-			goto cleanup;	
-		}
-		fparamp->pathname = pathname;
-		fparamp->buf = in_buf->data + offset;
-		fparamp->offset = offset;
-		fparamp->len = len;
-
-		t = create_new_thread(PR_USER_THREAD,
-			      File_Read, (void *)fparamp, 
-			      PR_PRIORITY_NORMAL,
-			      scope,
-			      PR_UNJOINABLE_THREAD,
-			      0, i);
-		offset += len;
-		if ((offset + len) > BUF_DATA_SIZE)
-			break;
-	}
-	thread_count = i;
-
-	/* Wait for reader threads to exit */
-	while (thread_count) {
-		PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-	}
-	PR_ExitMonitor(mon);
-
-	if (memcmp(in_buf->data, out_buf->data, offset) != 0) {
-		printf("File Test failed: file data corrupted\n");
-		rv =  -1;
-		goto cleanup;	
-	}
-
-	if ((PR_Delete(pathname)) < 0) {
-		printf("testfile failed to unlink file %s\n",pathname);
-		rv =  -1;
-		goto cleanup;	
-	}
-
-	/*
-	 * Test PR_Available, PR_Seek, PR_GetFileInfo, PR_Rename, PR_Access
-	 */
-	if (Misc_File_Tests(pathname) < 0) {
-		rv = -1;
-	}
-
-cleanup:
-	if ((PR_RmDir(TEST_DIR)) < 0) {
-		printf("testfile failed to rmdir %s\n", TEST_DIR);
-		rv = -1;
-	}
-	return rv;
-}
-
-struct dirtest_arg {
-	PRMonitor	*mon;
-	PRInt32		done;
-};
-
-static PRInt32 RunDirTest(void)
-{
-int i;
-PRThread *t;
-PRMonitor *mon;
-struct dirtest_arg thrarg;
-
-	mon = PR_NewMonitor();
-	if (!mon) {
-		printf("RunDirTest: Error - failed to create monitor\n");
-		dirtest_failed = 1;
-		return -1;
-	}
-	thrarg.mon = mon;
-
-	for (i = 0; i < NUM_DIRTEST_THREADS; i++) {
-
-		thrarg.done= 0;
-		t = create_new_thread(PR_USER_THREAD,
-			      DirTest, &thrarg, 
-			      PR_PRIORITY_NORMAL,
-			      PR_LOCAL_THREAD,
-			      PR_UNJOINABLE_THREAD,
-			      0, i);
-		if (!t) {
-			printf("RunDirTest: Error - failed to create thread\n");
-			dirtest_failed = 1;
-			return -1;
-		}
-		PR_EnterMonitor(mon);
-		while (!thrarg.done)
-			PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-		PR_ExitMonitor(mon);
-
-	}
-	PR_DestroyMonitor(mon);
-	return 0;
-}
-
-static PRInt32 PR_CALLBACK DirTest(void *arg)
-{
-struct dirtest_arg *tinfo = (struct dirtest_arg *) arg;
-PRFileDesc *fd_file;
-PRDir *fd_dir;
-int i;
-int path_len;
-PRDirEntry *dirEntry;
-PRFileInfo info;
-PRInt32 num_files = 0;
-#if defined(XP_PC) && defined(WIN32)
-HANDLE hfile;
-#endif
-
-#define  FILES_IN_DIR 20
-
-	/*
-	 * Create Test dir
-	 */
-	DPRINTF(("Creating test dir %s\n",TEST_DIR));
-	if ((PR_MkDir(TEST_DIR, 0777)) < 0) {
-		printf(
-			"testfile failed to create dir %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	fd_dir = PR_OpenDir(TEST_DIR);
-	if (fd_dir == NULL) {
-		printf(
-			"testfile failed to open dirctory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-	strcpy(pathname, TEST_DIR);
-	strcat(pathname, "/");
-	strcat(pathname, FILE_NAME);
-	path_len = strlen(pathname);
-	
-	for (i = 0; i < FILES_IN_DIR; i++) {
-
-		sprintf(pathname + path_len,"%d%s",i,"");
-
-		DPRINTF(("Creating test file %s\n",pathname));
-
-		fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, 0777);
-
-		if (fd_file == NULL) {
-			printf(
-					"testfile failed to create/open file %s [%d, %d]\n",
-					pathname, PR_GetError(), PR_GetOSError());
-			return -1;
-		}
-        PR_Close(fd_file);
-	}
-#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS)
-	/*
-	 * Create a hidden file - a platform-dependent operation
-	 */
-	strcpy(pathname, TEST_DIR);
-	strcat(pathname, "/");
-	strcat(pathname, HIDDEN_FILE_NAME);
-#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS)
-	DPRINTF(("Creating hidden test file %s\n",pathname));
-	fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, 0777);
-
-	if (fd_file == NULL) {
-		printf(
-				"testfile failed to create/open hidden file %s [%d, %d]\n",
-				pathname, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-#if defined(XP_MAC)
-	{
-#include <files.h>
-
-	OSErr			err;
-	FCBPBRec		fcbpb;
-	CInfoPBRec		pb;
-	Str255			pascalMacPath;
-
-	fcbpb.ioNamePtr = pascalMacPath;
-	fcbpb.ioVRefNum = 0;
-	fcbpb.ioRefNum = fd_file->secret->md.osfd;
-	fcbpb.ioFCBIndx = 0;
-	
-	err = PBGetFCBInfoSync(&fcbpb);
-	if (err != noErr) {
-    	PR_Close(fd_file);
-    	return -1;
-	}
-	
-	pb.hFileInfo.ioNamePtr = pascalMacPath;
-	pb.hFileInfo.ioVRefNum = fcbpb.ioFCBVRefNum;
-	pb.hFileInfo.ioDirID = fcbpb.ioFCBParID;
-	pb.hFileInfo.ioFDirIndex = 0;
-	
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr) {
-    	PR_Close(fd_file);
-    	return -1;
-	}
-
-	pb.hFileInfo.ioNamePtr = pascalMacPath;
-	pb.hFileInfo.ioVRefNum = fcbpb.ioFCBVRefNum;
-	pb.hFileInfo.ioDirID = fcbpb.ioFCBParID;
-	pb.hFileInfo.ioFDirIndex = 0;
-	
-	pb.hFileInfo.ioFlFndrInfo.fdFlags |= fInvisible;
-
-	err = PBSetCatInfoSync(&pb);
-	if (err != noErr) {
-    	PR_Close(fd_file);
-    	return -1;
-	}
-
-	}
-#endif
-
-    PR_Close(fd_file);
-
-	
-#elif defined(XP_PC) && defined(WIN32)
-	DPRINTF(("Creating hidden test file %s\n",pathname));
-	hfile = CreateFile(pathname, GENERIC_READ,
-						FILE_SHARE_READ|FILE_SHARE_WRITE,
-						NULL,
-						CREATE_NEW,
-						FILE_ATTRIBUTE_HIDDEN,
-						NULL);
-	if (hfile == INVALID_HANDLE_VALUE) {
-		printf("testfile failed to create/open hidden file %s [0, %d]\n",
-				pathname, GetLastError());
-		return -1;
-	}
-	CloseHandle(hfile);
-						
-#elif defined(OS2)
-	DPRINTF(("Creating hidden test file %s\n",pathname));
-	fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, (int)FILE_HIDDEN);
-
-	if (fd_file == NULL) {
-		printf("testfile failed to create/open hidden file %s [%d, %d]\n",
-				pathname, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	PR_Close(fd_file);
-#endif	/* XP _UNIX || XP_MAC*/
-
-#endif	/* XP_UNIX || XP_MAC ||(XP_PC && WIN32) */
-
-
-	if (PR_FAILURE == PR_CloseDir(fd_dir))
-	{
-		printf(
-			"testfile failed to close dirctory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	fd_dir = PR_OpenDir(TEST_DIR);
-	if (fd_dir == NULL) {
-		printf(
-			"testfile failed to reopen dirctory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-  
-	/*
-	 * List all files, including hidden files
-	 */
-	DPRINTF(("Listing all files in directory %s\n",TEST_DIR));
-#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS)
-	num_files = FILES_IN_DIR + 1;
-#else
-	num_files = FILES_IN_DIR;
-#endif
-	while ((dirEntry = PR_ReadDir(fd_dir, PR_SKIP_BOTH)) != NULL) {
-		num_files--;
-		strcpy(pathname, TEST_DIR);
-		strcat(pathname, "/");
-		strcat(pathname, dirEntry->name);
-		DPRINTF(("\t%s\n",dirEntry->name));
-
-		if ((PR_GetFileInfo(pathname, &info)) < 0) {
-			printf(
-				"testfile failed to GetFileInfo file %s [%d, %d]\n",
-				pathname, PR_GetError(), PR_GetOSError());
-			return -1;
-		}
-		
-		if (info.type != PR_FILE_FILE) {
-			printf(
-				"testfile incorrect fileinfo for file %s [%d, %d]\n",
-				pathname, PR_GetError(), PR_GetOSError());
-			return -1;
-		}
-	}
-	if (num_files != 0)
-	{
-		printf(
-			"testfile failed to find all files in directory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-    PR_CloseDir(fd_dir);
-
-#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS)
-
-	/*
-	 * List all files, except hidden files
-	 */
-
-	fd_dir = PR_OpenDir(TEST_DIR);
-	if (fd_dir == NULL) {
-		printf(
-			"testfile failed to reopen dirctory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-  
-	DPRINTF(("Listing non-hidden files in directory %s\n",TEST_DIR));
-	while ((dirEntry = PR_ReadDir(fd_dir, PR_SKIP_HIDDEN)) != NULL) {
-		DPRINTF(("\t%s\n",dirEntry->name));
-		if (!strcmp(HIDDEN_FILE_NAME, dirEntry->name)) {
-			printf("testfile found hidden file %s\n", pathname);
-			return -1;
-		}
-
-	}
-	/*
-	 * Delete hidden file
-	 */
-	strcpy(pathname, TEST_DIR);
-	strcat(pathname, "/");
-	strcat(pathname, HIDDEN_FILE_NAME);
-	if (PR_FAILURE == PR_Delete(pathname)) {
-		printf(
-			"testfile failed to delete hidden file %s [%d, %d]\n",
-			pathname, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-    PR_CloseDir(fd_dir);
-#endif	/* XP_UNIX || XP_MAC || (XP_PC && WIN32) */
-
-	strcpy(renamename, TEST_DIR);
-	strcat(renamename, ".RENAMED");
-	if (PR_FAILURE == PR_Rename(TEST_DIR, renamename)) {
-		printf(
-			"testfile failed to rename directory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-    
-	if (PR_FAILURE == PR_MkDir(TEST_DIR, 0777)) {
-		printf(
-			"testfile failed to recreate dir %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	if (PR_SUCCESS == PR_Rename(renamename, TEST_DIR)) {
-		printf(
-			"testfile renamed directory to existing name %s\n",
-			renamename);
-		return -1;
-	}
-
-	if (PR_FAILURE == PR_RmDir(TEST_DIR)) {
-		printf(
-			"testfile failed to rmdir %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-	if (PR_FAILURE == PR_Rename(renamename, TEST_DIR)) {
-		printf(
-			"testfile failed to rename directory %s [%d, %d]\n",
-			renamename, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	fd_dir = PR_OpenDir(TEST_DIR);
-	if (fd_dir == NULL) {
-		printf(
-			"testfile failed to reopen directory %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-
-	strcpy(pathname, TEST_DIR);
-	strcat(pathname, "/");
-	strcat(pathname, FILE_NAME);
-	path_len = strlen(pathname);
-	
-	for (i = 0; i < FILES_IN_DIR; i++) {
-
-		sprintf(pathname + path_len,"%d%s",i,"");
-
-		if (PR_FAILURE == PR_Delete(pathname)) {
-			printf(
-				"testfile failed to delete file %s [%d, %d]\n",
-				pathname, PR_GetError(), PR_GetOSError());
-			return -1;
-		}
-	}
-
-    PR_CloseDir(fd_dir);
-
-	if (PR_FAILURE == PR_RmDir(TEST_DIR)) {
-		printf(
-			"testfile failed to rmdir %s [%d, %d]\n",
-			TEST_DIR, PR_GetError(), PR_GetOSError());
-		return -1;
-	}
-	PR_EnterMonitor(tinfo->mon);
-	tinfo->done = 1;
-	PR_Notify(tinfo->mon);
-	PR_ExitMonitor(tinfo->mon);
-
-	return 0;
-}
-/************************************************************************/
-
-/*
- * Test file and directory NSPR APIs
- */
-
-int main(int argc, char **argv)
-{
-#ifdef WIN32
-	PRUint32 len;
-#endif
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-        int opt;
-        extern char *optarg;
-	extern int optind;
-#endif
-#if defined(XP_UNIX) || defined(XP_OS2_EMX)
-        while ((opt = getopt(argc, argv, "d")) != EOF) {
-                switch(opt) {
-                        case 'd':
-                                _debug_on = 1;
-                                break;
-                        default:
-                                break;
-                }
-        }
-#endif
-	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("testfile.log");
-#endif
-
-	mon = PR_NewMonitor();
-	if (mon == NULL) {
-		printf("testfile: PR_NewMonitor failed\n");
-		exit(2);
-	}
-#ifdef WIN32
-	len = GetTempPath(TMPDIR_LEN, testdir);
-	if ((len > 0) && (len < (TMPDIR_LEN - 6))) {
-		/*
-		 * enough space for prdir
-		 */
-		strcpy((testdir + len),"prdir");
-		TEST_DIR = testdir;
-		printf("TEST_DIR = %s\n",TEST_DIR);
-	}
-	
-#endif
-
-	if (FileTest() < 0) {
-		printf("File Test failed\n");
-		exit(2);
-	}
-	printf("File Test passed\n");
-	if ((RunDirTest() < 0) || dirtest_failed) {
-		printf("Dir Test failed\n");
-		exit(2);
-	}
-	printf("Dir Test passed\n");
-
-	PR_DestroyMonitor(mon);
-	PR_Cleanup();
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/threads.c b/libs/js/nsprpub/pr/tests/threads.c
deleted file mode 100644
index e1d188d4c3..0000000000
--- a/libs/js/nsprpub/pr/tests/threads.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-#include "prinrval.h"
-#include "plgetopt.h"
-#include "pprthred.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-PRMonitor *mon;
-PRInt32 count, iterations, alive;
-
-PRBool debug_mode = PR_FALSE, passed = PR_TRUE;
-
-void 
-PR_CALLBACK
-ReallyDumbThread(void *arg)
-{
-    return;
-}
-
-void
-PR_CALLBACK
-DumbThread(void *arg)
-{
-    PRInt32 tmp = (PRInt32)arg;
-    PRThreadScope scope = (PRThreadScope)tmp;
-    PRThread *thr;
-
-    thr = PR_CreateThread(PR_USER_THREAD,
-                          ReallyDumbThread,
-                          NULL,
-                          PR_PRIORITY_NORMAL,
-                          scope,
-                          PR_JOINABLE_THREAD,
-                          0);
-
-    if (!thr) {
-        if (debug_mode) {
-            printf("Could not create really dumb thread (%d, %d)!\n",
-                    PR_GetError(), PR_GetOSError());
-        }
-        passed = PR_FALSE;
-    } else {
-        PR_JoinThread(thr);
-    }
-    PR_EnterMonitor(mon);
-    alive--;
-    PR_Notify(mon);
-    PR_ExitMonitor(mon);
-}
-
-static void CreateThreads(PRThreadScope scope1, PRThreadScope scope2)
-{
-    PRThread *thr;
-    int n;
-
-    alive = 0;
-    mon = PR_NewMonitor();
-
-    alive = count;
-    for (n=0; n<count; n++) {
-        thr = PR_CreateThread(PR_USER_THREAD,
-                              DumbThread, 
-                              (void *)scope2, 
-                              PR_PRIORITY_NORMAL,
-                              scope1,
-                              PR_UNJOINABLE_THREAD,
-                              0);
-        if (!thr) {
-            if (debug_mode) {
-                printf("Could not create dumb thread (%d, %d)!\n",
-                        PR_GetError(), PR_GetOSError());
-            }
-            passed = PR_FALSE;
-            alive--;
-        }
-         
-        PR_Sleep(0);
-    }
-
-    /* Wait for all threads to exit */
-    PR_EnterMonitor(mon);
-    while (alive) {
-        PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
-    }
-
-    PR_ExitMonitor(mon);
-	PR_DestroyMonitor(mon);
-}
-
-static void CreateThreadsUU(void)
-{
-    CreateThreads(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void CreateThreadsUK(void)
-{
-    CreateThreads(PR_LOCAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-static void CreateThreadsKU(void)
-{
-    CreateThreads(PR_GLOBAL_THREAD, PR_LOCAL_THREAD);
-}
-
-static void CreateThreadsKK(void)
-{
-    CreateThreads(PR_GLOBAL_THREAD, PR_GLOBAL_THREAD);
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    if (debug_mode)
-    {
-        d = (double)PR_IntervalToMicroseconds(stop - start);
-        printf("%40s: %6.2f usec\n", msg, d / count);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    int index;
-
-    PR_STDIO_INIT();
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_HIGH, 0);
-    
-    {
-    	PLOptStatus os;
-    	PLOptState *opt = PL_CreateOptState(argc, argv, "dc:i:");
-    	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-        {
-    		if (PL_OPT_BAD == os) continue;
-            switch (opt->option)
-            {
-            case 'd':  /* debug mode */
-    			debug_mode = PR_TRUE;
-                break;
-            case 'c':  /* loop counter */
-    			count = atoi(opt->value);
-                break;
-            case 'i':  /* loop counter */
-    			iterations = atoi(opt->value);
-                break;
-             default:
-                break;
-            }
-        }
-    	PL_DestroyOptState(opt);
-    }
-
-#ifdef XP_MAC
-	SetupMacPrintfLog("threads.log");
-	count = 10;
-	iterations = 10;
-	debug_mode = PR_TRUE;
-#else
-    if (0 == count) count = 50;
-    if (0 == iterations) iterations = 10;
-
-#endif
-
-    if (debug_mode)
-    {
-    printf("\
-** Tests lots of thread creations.  \n\
-** Create %ld native threads %ld times. \n\
-** Create %ld user threads %ld times \n", iterations,count,iterations,count);
-    }
-
-    for (index=0; index<iterations; index++) {
-        Measure(CreateThreadsUU, "Create user/user threads");
-        Measure(CreateThreadsUK, "Create user/native threads");
-        Measure(CreateThreadsKU, "Create native/user threads");
-        Measure(CreateThreadsKK, "Create native/native threads");
-    }
-
-    if (debug_mode) printf("\nNow switch to recycling threads \n\n");
-    PR_SetThreadRecycleMode(1);
-
-    for (index=0; index<iterations; index++) {
-        Measure(CreateThreadsUU, "Create user/user threads");
-        Measure(CreateThreadsUK, "Create user/native threads");
-        Measure(CreateThreadsKU, "Create native/user threads");
-        Measure(CreateThreadsKK, "Create native/native threads");
-    }
-
-
-    printf("%s\n", ((passed) ? "PASS" : "FAIL"));
-
-    PR_Cleanup();
-
-    if (passed) {
-        return 0;
-    } else {
-        return 1;
-    }
-}
diff --git a/libs/js/nsprpub/pr/tests/thrpool_client.c b/libs/js/nsprpub/pr/tests/thrpool_client.c
deleted file mode 100644
index 9f6ceb69ce..0000000000
--- a/libs/js/nsprpub/pr/tests/thrpool_client.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: thrpool_client.c
-**
-** Description: Test threadpool functionality.
-**
-** Modification History:
-*/
-#include "primpl.h"
-
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#ifdef XP_UNIX
-#include <sys/mman.h>
-#endif
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include <pthread.h>
-#endif
-
-#ifdef WIN32
-#include <process.h>
-#endif
-
-static int _debug_on = 0;
-static int server_port = -1;
-static char *program_name = NULL;
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "prsem.h"
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-    PR_LogPrint(fmt);
-    return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-#ifdef XP_PC
-#define mode_t int
-#endif
-
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-#define    BUF_DATA_SIZE    (2 * 1024)
-#define TCP_MESG_SIZE    1024
-#define NUM_TCP_CLIENTS            10	/* for a listen queue depth of 5 */
-
-#define NUM_TCP_CONNECTIONS_PER_CLIENT    10
-#define NUM_TCP_MESGS_PER_CONNECTION    10
-#define TCP_SERVER_PORT            10000
-
-static PRInt32 num_tcp_clients = NUM_TCP_CLIENTS;
-static PRInt32 num_tcp_connections_per_client = NUM_TCP_CONNECTIONS_PER_CLIENT;
-static PRInt32 tcp_mesg_size = TCP_MESG_SIZE;
-static PRInt32 num_tcp_mesgs_per_connection = NUM_TCP_MESGS_PER_CONNECTION;
-
-int failed_already=0;
-
-typedef struct buffer {
-    char    data[BUF_DATA_SIZE];
-} buffer;
-
-PRNetAddr tcp_server_addr, udp_server_addr;
-
-typedef struct Client_Param {
-    PRNetAddr server_addr;
-    PRMonitor *exit_mon;    /* monitor to signal on exit */
-    PRInt32 *exit_counter;    /* counter to decrement, before exit */
-    PRInt32    datalen;
-} Client_Param;
-
-/*
- * readn
- *    read data from sockfd into buf
- */
-static PRInt32
-readn(PRFileDesc *sockfd, char *buf, int len)
-{
-    int rem;
-    int bytes;
-    int offset = 0;
-	PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
-
-    for (rem=len; rem; offset += bytes, rem -= bytes) {
-        DPRINTF(("thread = 0x%lx: calling PR_Recv, bytes = %d\n",
-            PR_GetCurrentThread(), rem));
-        bytes = PR_Recv(sockfd, buf + offset, rem, 0,
-            	timeout);
-        DPRINTF(("thread = 0x%lx: returning from PR_Recv, bytes = %d\n",
-            PR_GetCurrentThread(), bytes));
-        if (bytes < 0) {
-			return -1;
-		}	
-    }
-    return len;
-}
-
-/*
- * writen
- *    write data from buf to sockfd
- */
-static PRInt32
-writen(PRFileDesc *sockfd, char *buf, int len)
-{
-    int rem;
-    int bytes;
-    int offset = 0;
-
-    for (rem=len; rem; offset += bytes, rem -= bytes) {
-        DPRINTF(("thread = 0x%lx: calling PR_Send, bytes = %d\n",
-            PR_GetCurrentThread(), rem));
-        bytes = PR_Send(sockfd, buf + offset, rem, 0,
-            PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("thread = 0x%lx: returning from PR_Send, bytes = %d\n",
-            PR_GetCurrentThread(), bytes));
-        if (bytes <= 0)
-            return -1;
-    }
-    return len;
-}
-
-/*
- * TCP_Client
- *    Client job
- *    Connect to the server at the address specified in the argument.
- *    Fill in a buffer, write data to server, read it back and check
- *    for data corruption.
- *    Close the socket for server connection
- */
-static void PR_CALLBACK
-TCP_Client(void *arg)
-{
-    Client_Param *cp = (Client_Param *) arg;
-    PRFileDesc *sockfd;
-    buffer *in_buf, *out_buf;
-    union PRNetAddr netaddr;
-    PRInt32 bytes, i, j;
-
-
-    DPRINTF(("TCP client started\n"));
-    bytes = cp->datalen;
-    out_buf = PR_NEW(buffer);
-    if (out_buf == NULL) {
-        fprintf(stderr,"%s: failed to alloc buffer struct\n", program_name);
-        failed_already=1;
-        return;
-    }
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"%s: failed to alloc buffer struct\n", program_name);
-        failed_already=1;
-        return;
-    }
-    netaddr.inet.family = cp->server_addr.inet.family;
-    netaddr.inet.port = cp->server_addr.inet.port;
-    netaddr.inet.ip = cp->server_addr.inet.ip;
-
-    for (i = 0; i < num_tcp_connections_per_client; i++) {
-        if ((sockfd = PR_OpenTCPSocket(PR_AF_INET)) == NULL) {
-            fprintf(stderr,"%s: PR_OpenTCPSocket failed\n", program_name);
-            failed_already=1;
-            return;
-        }
-
-        DPRINTF(("TCP client connecting to server:%d\n", server_port));
-        if (PR_Connect(sockfd, &netaddr,PR_INTERVAL_NO_TIMEOUT) < 0){
-        	fprintf(stderr, "PR_Connect failed: (%ld, %ld)\n",
-            		PR_GetError(), PR_GetOSError());
-            failed_already=1;
-            return;
-        }
-        for (j = 0; j < num_tcp_mesgs_per_connection; j++) {
-            /*
-             * fill in random data
-             */
-            memset(out_buf->data, ((PRInt32) (&netaddr)) + i + j, bytes);
-            /*
-             * write to server
-             */
-            if (writen(sockfd, out_buf->data, bytes) < bytes) {
-                fprintf(stderr,"%s: ERROR - TCP_Client:writen\n", program_name);
-                failed_already=1;
-                return;
-            }
-			/*
-            DPRINTF(("TCP Client [0x%lx]: out_buf = 0x%lx out_buf[0] = 0x%lx\n",
-                PR_GetCurrentThread(), out_buf, (*((int *) out_buf->data))));
-			*/
-            if (readn(sockfd, in_buf->data, bytes) < bytes) {
-                fprintf(stderr,"%s: ERROR - TCP_Client:readn\n", program_name);
-                failed_already=1;
-                return;
-            }
-            /*
-             * verify the data read
-             */
-            if (memcmp(in_buf->data, out_buf->data, bytes) != 0) {
-                fprintf(stderr,"%s: ERROR - data corruption\n", program_name);
-                failed_already=1;
-                return;
-            }
-        }
-        /*
-         * shutdown reads and writes
-         */
-        if (PR_Shutdown(sockfd, PR_SHUTDOWN_BOTH) < 0) {
-            fprintf(stderr,"%s: ERROR - PR_Shutdown\n", program_name);
-            failed_already=1;
-        }
-        PR_Close(sockfd);
-    }
-
-    PR_DELETE(out_buf);
-    PR_DELETE(in_buf);
-
-    /*
-     * Decrement exit_counter and notify parent thread
-     */
-
-    PR_EnterMonitor(cp->exit_mon);
-    --(*cp->exit_counter);
-    PR_Notify(cp->exit_mon);
-    PR_ExitMonitor(cp->exit_mon);
-    DPRINTF(("TCP_Client exiting\n"));
-}
-
-/*
- * TCP_Socket_Client_Server_Test    - concurrent server test
- *    
- *    Each client connects to the server and sends a chunk of data
- *    For each connection, server reads the data
- *    from the client and sends it back to the client, unmodified.
- *    Each client checks that data received from server is same as the
- *    data it sent to the server.
- *
- */
-
-static PRInt32
-TCP_Socket_Client_Server_Test(void)
-{
-    int i;
-    Client_Param *cparamp;
-    PRMonitor *mon2;
-    PRInt32    datalen;
-    PRInt32    connections = 0;
-	PRThread *thr;
-
-    datalen = tcp_mesg_size;
-    connections = 0;
-
-    mon2 = PR_NewMonitor();
-    if (mon2 == NULL) {
-        fprintf(stderr,"%s: PR_NewMonitor failed\n", program_name);
-        failed_already=1;
-        return -1;
-    }
-
-    /*
-     * Start client jobs
-     */
-    cparamp = PR_NEW(Client_Param);
-    if (cparamp == NULL) {
-        fprintf(stderr,"%s: PR_NEW failed\n", program_name);
-        failed_already=1;
-        return -1;
-    }
-    cparamp->server_addr.inet.family = PR_AF_INET;
-    cparamp->server_addr.inet.port = PR_htons(server_port);
-    cparamp->server_addr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-    cparamp->exit_mon = mon2;
-    cparamp->exit_counter = &connections;
-    cparamp->datalen = datalen;
-    for (i = 0; i < num_tcp_clients; i++) {
-		thr = PR_CreateThread(PR_USER_THREAD, TCP_Client, (void *)cparamp,
-        		PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-        if (NULL == thr) {
-            fprintf(stderr,"%s: PR_CreateThread failed\n", program_name);
-            failed_already=1;
-            return -1;
-        }
-    	PR_EnterMonitor(mon2);
-        connections++;
-    	PR_ExitMonitor(mon2);
-        DPRINTF(("Created TCP client = 0x%lx\n", thr));
-    }
-    /* Wait for client jobs to exit */
-    PR_EnterMonitor(mon2);
-    while (0 != connections) {
-        PR_Wait(mon2, PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("Client job count = %d\n", connections));
-    }
-    PR_ExitMonitor(mon2);
-    printf("%30s","TCP_Socket_Client_Server_Test:");
-    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
-        num_tcp_clients, num_tcp_connections_per_client);
-    printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":",
-        num_tcp_mesgs_per_connection, tcp_mesg_size);
-
-    PR_DELETE(cparamp);
-    return 0;
-}
-
-/************************************************************************/
-
-int
-main(int argc, char **argv)
-{
-    /*
-     * -d           debug mode
-     */
-    PLOptStatus os;
-    PLOptState *opt;
-	program_name = argv[0];
-
-    opt = PL_CreateOptState(argc, argv, "dp:");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        case 'p':
-            server_port = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("socket.log");
-#endif
-    PR_SetConcurrency(4);
-
-	TCP_Socket_Client_Server_Test();
-
-    PR_Cleanup();
-    if (failed_already)
-		return 1;
-    else
-		return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/thrpool_server.c b/libs/js/nsprpub/pr/tests/thrpool_server.c
deleted file mode 100644
index cafa67ad21..0000000000
--- a/libs/js/nsprpub/pr/tests/thrpool_server.c
+++ /dev/null
@@ -1,607 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/***********************************************************************
-**
-** Name: thrpool.c
-**
-** Description: Test threadpool functionality.
-**
-** Modification History:
-*/
-#include "primpl.h"
-
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#ifdef XP_UNIX
-#include <sys/mman.h>
-#endif
-#if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS)
-#include <pthread.h>
-#endif
-
-/* for getcwd */
-#if defined(XP_UNIX) || defined (XP_OS2_EMX) || defined(XP_BEOS)
-#include <unistd.h>
-#elif defined(XP_PC)
-#include <direct.h>
-#endif
-
-#ifdef WIN32
-#include <process.h>
-#endif
-
-static int _debug_on = 0;
-static char *program_name = NULL;
-static void serve_client_write(void *arg);
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "prsem.h"
-int fprintf(FILE *stream, const char *fmt, ...)
-{
-    PR_LogPrint(fmt);
-    return 0;
-}
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#else
-#include "obsolete/prsem.h"
-#endif
-
-#ifdef XP_PC
-#define mode_t int
-#endif
-
-#define DPRINTF(arg) if (_debug_on) printf arg
-
-
-#define BUF_DATA_SIZE    (2 * 1024)
-#define TCP_MESG_SIZE    1024
-#define NUM_TCP_CLIENTS  10	/* for a listen queue depth of 5 */
-
-
-#define NUM_TCP_CONNECTIONS_PER_CLIENT  10
-#define NUM_TCP_MESGS_PER_CONNECTION    10
-#define TCP_SERVER_PORT            		10000
-#define SERVER_MAX_BIND_COUNT        	100
-
-static PRInt32 num_tcp_clients = NUM_TCP_CLIENTS;
-static PRInt32 num_tcp_connections_per_client = NUM_TCP_CONNECTIONS_PER_CLIENT;
-static PRInt32 tcp_mesg_size = TCP_MESG_SIZE;
-static PRInt32 num_tcp_mesgs_per_connection = NUM_TCP_MESGS_PER_CONNECTION;
-static void TCP_Server_Accept(void *arg);
-
-
-int failed_already=0;
-typedef struct buffer {
-    char    data[BUF_DATA_SIZE];
-} buffer;
-
-
-typedef struct Server_Param {
-    PRJobIoDesc iod;    /* socket to read from/write to    */
-    PRInt32    	datalen;    /* bytes of data transfered in each read/write */
-    PRNetAddr	netaddr;
-    PRMonitor	*exit_mon;    /* monitor to signal on exit            */
-    PRInt32		*job_counterp;    /* counter to decrement, before exit        */
-    PRInt32		conn_counter;    /* counter to decrement, before exit        */
-	PRThreadPool *tp;
-} Server_Param;
-
-typedef struct Serve_Client_Param {
-    PRJobIoDesc iod;    /* socket to read from/write to    */
-    PRInt32    datalen;    /* bytes of data transfered in each read/write */
-    PRMonitor *exit_mon;    /* monitor to signal on exit            */
-    PRInt32 *job_counterp;    /* counter to decrement, before exit        */
-	PRThreadPool *tp;
-} Serve_Client_Param;
-
-typedef struct Session {
-    PRJobIoDesc iod;    /* socket to read from/write to    */
-	buffer 	*in_buf;
-	PRInt32 bytes;
-	PRInt32 msg_num;
-	PRInt32 bytes_read;
-    PRMonitor *exit_mon;    /* monitor to signal on exit            */
-    PRInt32 *job_counterp;    /* counter to decrement, before exit        */
-	PRThreadPool *tp;
-} Session;
-
-static void
-serve_client_read(void *arg)
-{
-	Session *sp = (Session *) arg;
-    int rem;
-    int bytes;
-    int offset;
-	PRFileDesc *sockfd;
-	char *buf;
-	PRJob *jobp;
-
-	PRIntervalTime timeout = PR_INTERVAL_NO_TIMEOUT;
-
-	sockfd = sp->iod.socket;
-	buf = sp->in_buf->data;
-
-    PR_ASSERT(sp->msg_num < num_tcp_mesgs_per_connection);
-	PR_ASSERT(sp->bytes_read < sp->bytes);
-
-	offset = sp->bytes_read;
-	rem = sp->bytes - offset;
-	bytes = PR_Recv(sockfd, buf + offset, rem, 0, timeout);
-	if (bytes < 0) {
-		return;
-	}
-	sp->bytes_read += bytes;
-	sp->iod.timeout = PR_SecondsToInterval(60);
-	if (sp->bytes_read <  sp->bytes) {
-		jobp = PR_QueueJob_Read(sp->tp, &sp->iod, serve_client_read, sp,
-							PR_FALSE);
-		PR_ASSERT(NULL != jobp);
-		return;
-	}
-	PR_ASSERT(sp->bytes_read == sp->bytes);
-	DPRINTF(("serve_client: read complete, msg(%d) \n", sp->msg_num));
-
-	sp->iod.timeout = PR_SecondsToInterval(60);
-	jobp = PR_QueueJob_Write(sp->tp, &sp->iod, serve_client_write, sp,
-							PR_FALSE);
-	PR_ASSERT(NULL != jobp);
-
-    return;
-}
-
-static void
-serve_client_write(void *arg)
-{
-	Session *sp = (Session *) arg;
-    int bytes;
-	PRFileDesc *sockfd;
-	char *buf;
-	PRJob *jobp;
-
-	sockfd = sp->iod.socket;
-	buf = sp->in_buf->data;
-
-    PR_ASSERT(sp->msg_num < num_tcp_mesgs_per_connection);
-
-	bytes = PR_Send(sockfd, buf, sp->bytes, 0, PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(bytes == sp->bytes);
-
-	if (bytes < 0) {
-		return;
-	}
-	DPRINTF(("serve_client: write complete, msg(%d) \n", sp->msg_num));
-    sp->msg_num++;
-    if (sp->msg_num < num_tcp_mesgs_per_connection) {
-		sp->bytes_read = 0;
-		sp->iod.timeout = PR_SecondsToInterval(60);
-		jobp = PR_QueueJob_Read(sp->tp, &sp->iod, serve_client_read, sp,
-							PR_FALSE);
-		PR_ASSERT(NULL != jobp);
-		return;
-	}
-
-	DPRINTF(("serve_client: read/write complete, msg(%d) \n", sp->msg_num));
-    if (PR_Shutdown(sockfd, PR_SHUTDOWN_BOTH) < 0) {
-        fprintf(stderr,"%s: ERROR - PR_Shutdown\n", program_name);
-    }
-
-    PR_Close(sockfd);
-    PR_EnterMonitor(sp->exit_mon);
-    --(*sp->job_counterp);
-    PR_Notify(sp->exit_mon);
-    PR_ExitMonitor(sp->exit_mon);
-
-    PR_DELETE(sp->in_buf);
-    PR_DELETE(sp);
-
-    return;
-}
-
-/*
- * Serve_Client
- *    Thread, started by the server, for serving a client connection.
- *    Reads data from socket and writes it back, unmodified, and
- *    closes the socket
- */
-static void PR_CALLBACK
-Serve_Client(void *arg)
-{
-    Serve_Client_Param *scp = (Serve_Client_Param *) arg;
-    buffer *in_buf;
-	Session *sp;
-	PRJob *jobp;
-
-	sp = PR_NEW(Session);
-	sp->iod = scp->iod;
-
-    in_buf = PR_NEW(buffer);
-    if (in_buf == NULL) {
-        fprintf(stderr,"%s: failed to alloc buffer struct\n",program_name);
-        failed_already=1;
-        return;
-    }
-
-	sp->in_buf = in_buf;
-	sp->bytes = scp->datalen;
-	sp->msg_num = 0;
-	sp->bytes_read = 0;
-	sp->tp = scp->tp;
-   	sp->exit_mon = scp->exit_mon;
-    sp->job_counterp = scp->job_counterp;
-
-	sp->iod.timeout = PR_SecondsToInterval(60);
-	jobp = PR_QueueJob_Read(sp->tp, &sp->iod, serve_client_read, sp,
-							PR_FALSE);
-	PR_ASSERT(NULL != jobp);
-	PR_DELETE(scp);
-}
-
-static void
-print_stats(void *arg)
-{
-    Server_Param *sp = (Server_Param *) arg;
-    PRThreadPool *tp = sp->tp;
-    PRInt32 counter;
-	PRJob *jobp;
-
-	PR_EnterMonitor(sp->exit_mon);
-	counter = (*sp->job_counterp);
-	PR_ExitMonitor(sp->exit_mon);
-
-	printf("PRINT_STATS: #client connections = %d\n",counter);
-
-
-	jobp = PR_QueueJob_Timer(tp, PR_MillisecondsToInterval(500),
-						print_stats, sp, PR_FALSE);
-
-	PR_ASSERT(NULL != jobp);
-}
-
-static int job_counter = 0;
-/*
- * TCP Server
- *    Server binds an address to a socket, starts a client process and
- *	  listens for incoming connections.
- *    Each client connects to the server and sends a chunk of data
- *    Starts a Serve_Client job for each incoming connection, to read
- *    the data from the client and send it back to the client, unmodified.
- *    Each client checks that data received from server is same as the
- *    data it sent to the server.
- *	  Finally, the threadpool is shutdown
- */
-static void PR_CALLBACK
-TCP_Server(void *arg)
-{
-    PRThreadPool *tp = (PRThreadPool *) arg;
-    Server_Param *sp;
-    PRFileDesc *sockfd;
-    PRNetAddr netaddr;
-	PRMonitor *sc_mon;
-	PRJob *jobp;
-	int i;
-	PRStatus rval;
-
-    /*
-     * Create a tcp socket
-     */
-    if ((sockfd = PR_NewTCPSocket()) == NULL) {
-        fprintf(stderr,"%s: PR_NewTCPSocket failed\n", program_name);
-        return;
-    }
-    memset(&netaddr, 0 , sizeof(netaddr));
-    netaddr.inet.family = PR_AF_INET;
-    netaddr.inet.port = PR_htons(TCP_SERVER_PORT);
-    netaddr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    /*
-     * try a few times to bind server's address, if addresses are in
-     * use
-     */
-	i = 0;
-    while (PR_Bind(sockfd, &netaddr) < 0) {
-        if (PR_GetError() == PR_ADDRESS_IN_USE_ERROR) {
-            netaddr.inet.port += 2;
-            if (i++ < SERVER_MAX_BIND_COUNT)
-                continue;
-        }
-        fprintf(stderr,"%s: ERROR - PR_Bind failed\n", program_name);
-        perror("PR_Bind");
-        failed_already=1;
-        return;
-    }
-
-    if (PR_Listen(sockfd, 32) < 0) {
-        fprintf(stderr,"%s: ERROR - PR_Listen failed\n", program_name);
-        failed_already=1;
-        return;
-    }
-
-    if (PR_GetSockName(sockfd, &netaddr) < 0) {
-        fprintf(stderr,"%s: ERROR - PR_GetSockName failed\n", program_name);
-        failed_already=1;
-        return;
-    }
-
-    DPRINTF((
-	"TCP_Server: PR_BIND netaddr.inet.ip = 0x%lx, netaddr.inet.port = %d\n",
-        netaddr.inet.ip, netaddr.inet.port));
-
-	sp = PR_NEW(Server_Param);
-	if (sp == NULL) {
-		fprintf(stderr,"%s: PR_NEW failed\n", program_name);
-		failed_already=1;
-		return;
-	}
-	sp->iod.socket = sockfd;
-	sp->iod.timeout = PR_SecondsToInterval(60);
-	sp->datalen = tcp_mesg_size;
-	sp->exit_mon = sc_mon;
-	sp->job_counterp = &job_counter;
-	sp->conn_counter = 0;
-	sp->tp = tp;
-	sp->netaddr = netaddr;
-
-	/* create and cancel an io job */
-	jobp = PR_QueueJob_Accept(tp, &sp->iod, TCP_Server_Accept, sp,
-							PR_FALSE);
-	PR_ASSERT(NULL != jobp);
-	rval = PR_CancelJob(jobp);
-	PR_ASSERT(PR_SUCCESS == rval);
-
-	/*
-	 * create the client process
-	 */
-	{
-#define MAX_ARGS 4
-		char *argv[MAX_ARGS + 1];
-		int index = 0;
-		char port[32];
-        char path[1024 + sizeof("/thrpool_client")];
-        (void)getcwd(path, sizeof(path));
-        (void)strcat(path, "/thrpool_client");
-#ifdef XP_PC
-        (void)strcat(path, ".exe");
-#endif
-        argv[index++] = path;
-		sprintf(port,"%d",PR_ntohs(netaddr.inet.port));
-        if (_debug_on)
-        {
-            argv[index++] = "-d";
-            argv[index++] = "-p";
-            argv[index++] = port;
-            argv[index++] = NULL;
-        } else {
-            argv[index++] = "-p";
-            argv[index++] = port;
-			argv[index++] = NULL;
-		}
-		PR_ASSERT(MAX_ARGS >= (index - 1));
-        
-        DPRINTF(("creating client process %s ...\n", path));
-        if (PR_FAILURE == PR_CreateProcessDetached(path, argv, NULL, NULL)) {
-        	fprintf(stderr,
-				"thrpool_server: ERROR - PR_CreateProcessDetached failed\n");
-        	failed_already=1;
-        	return;
-		}
-	}
-
-    sc_mon = PR_NewMonitor();
-    if (sc_mon == NULL) {
-        fprintf(stderr,"%s: PR_NewMonitor failed\n", program_name);
-        failed_already=1;
-        return;
-    }
-
-	sp->iod.socket = sockfd;
-	sp->iod.timeout = PR_SecondsToInterval(60);
-	sp->datalen = tcp_mesg_size;
-	sp->exit_mon = sc_mon;
-	sp->job_counterp = &job_counter;
-	sp->conn_counter = 0;
-	sp->tp = tp;
-	sp->netaddr = netaddr;
-
-	/* create and cancel a timer job */
-	jobp = PR_QueueJob_Timer(tp, PR_MillisecondsToInterval(5000),
-						print_stats, sp, PR_FALSE);
-	PR_ASSERT(NULL != jobp);
-	rval = PR_CancelJob(jobp);
-	PR_ASSERT(PR_SUCCESS == rval);
-
-    DPRINTF(("TCP_Server: Accepting connections \n"));
-
-	jobp = PR_QueueJob_Accept(tp, &sp->iod, TCP_Server_Accept, sp,
-							PR_FALSE);
-	PR_ASSERT(NULL != jobp);
-	return;
-}
-
-static void
-TCP_Server_Accept(void *arg)
-{
-    Server_Param *sp = (Server_Param *) arg;
-    PRThreadPool *tp = sp->tp;
-    Serve_Client_Param *scp;
-	PRFileDesc *newsockfd;
-	PRJob *jobp;
-
-	if ((newsockfd = PR_Accept(sp->iod.socket, &sp->netaddr,
-		PR_INTERVAL_NO_TIMEOUT)) == NULL) {
-		fprintf(stderr,"%s: ERROR - PR_Accept failed\n", program_name);
-		failed_already=1;
-		goto exit;
-	}
-	scp = PR_NEW(Serve_Client_Param);
-	if (scp == NULL) {
-		fprintf(stderr,"%s: PR_NEW failed\n", program_name);
-		failed_already=1;
-		goto exit;
-	}
-
-	/*
-	 * Start a Serve_Client job for each incoming connection
-	 */
-	scp->iod.socket = newsockfd;
-	scp->iod.timeout = PR_SecondsToInterval(60);
-	scp->datalen = tcp_mesg_size;
-	scp->exit_mon = sp->exit_mon;
-	scp->job_counterp = sp->job_counterp;
-	scp->tp = sp->tp;
-
-	PR_EnterMonitor(sp->exit_mon);
-	(*sp->job_counterp)++;
-	PR_ExitMonitor(sp->exit_mon);
-	jobp = PR_QueueJob(tp, Serve_Client, scp,
-						PR_FALSE);
-
-	PR_ASSERT(NULL != jobp);
-	DPRINTF(("TCP_Server: Created Serve_Client = 0x%lx\n", jobp));
-
-	/*
-	 * single-threaded update; no lock needed
-	 */
-    sp->conn_counter++;
-    if (sp->conn_counter <
-			(num_tcp_clients * num_tcp_connections_per_client)) {
-		jobp = PR_QueueJob_Accept(tp, &sp->iod, TCP_Server_Accept, sp,
-								PR_FALSE);
-		PR_ASSERT(NULL != jobp);
-		return;
-	}
-	jobp = PR_QueueJob_Timer(tp, PR_MillisecondsToInterval(500),
-						print_stats, sp, PR_FALSE);
-
-	PR_ASSERT(NULL != jobp);
-	DPRINTF(("TCP_Server: Created print_stats timer job = 0x%lx\n", jobp));
-
-exit:
-	PR_EnterMonitor(sp->exit_mon);
-    /* Wait for server jobs to finish */
-    while (0 != *sp->job_counterp) {
-        PR_Wait(sp->exit_mon, PR_INTERVAL_NO_TIMEOUT);
-        DPRINTF(("TCP_Server: conn_counter = %d\n",
-												*sp->job_counterp));
-    }
-
-    PR_ExitMonitor(sp->exit_mon);
-    if (sp->iod.socket) {
-        PR_Close(sp->iod.socket);
-    }
-	PR_DestroyMonitor(sp->exit_mon);
-    printf("%30s","TCP_Socket_Client_Server_Test:");
-    printf("%2ld Server %2ld Clients %2ld connections_per_client\n",1l,
-        num_tcp_clients, num_tcp_connections_per_client);
-    printf("%30s %2ld messages_per_connection %4ld bytes_per_message\n",":",
-        num_tcp_mesgs_per_connection, tcp_mesg_size);
-
-	DPRINTF(("%s: calling PR_ShutdownThreadPool\n", program_name));
-	PR_ShutdownThreadPool(sp->tp);
-	PR_DELETE(sp);
-}
-
-/************************************************************************/
-
-#define DEFAULT_INITIAL_THREADS		4
-#define DEFAULT_MAX_THREADS			100
-#define DEFAULT_STACKSIZE			(512 * 1024)
-
-int
-main(int argc, char **argv)
-{
-	PRInt32 initial_threads = DEFAULT_INITIAL_THREADS;
-	PRInt32 max_threads = DEFAULT_MAX_THREADS;
-	PRInt32 stacksize = DEFAULT_STACKSIZE;
-	PRThreadPool *tp = NULL;
-	PRStatus rv;
-	PRJob *jobp;
-
-    /*
-     * -d           debug mode
-     */
-    PLOptStatus os;
-    PLOptState *opt;
-
-	program_name = argv[0];
-    opt = PL_CreateOptState(argc, argv, "d");
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("socket.log");
-#endif
-    PR_SetConcurrency(4);
-
-	tp = PR_CreateThreadPool(initial_threads, max_threads, stacksize);
-    if (NULL == tp) {
-        printf("PR_CreateThreadPool failed\n");
-        failed_already=1;
-        goto done;
-	}
-	jobp = PR_QueueJob(tp, TCP_Server, tp, PR_TRUE);
-	rv = PR_JoinJob(jobp);		
-	PR_ASSERT(PR_SUCCESS == rv);
-
-	DPRINTF(("%s: calling PR_JoinThreadPool\n", program_name));
-	rv = PR_JoinThreadPool(tp);
-	PR_ASSERT(PR_SUCCESS == rv);
-	DPRINTF(("%s: returning from PR_JoinThreadPool\n", program_name));
-
-done:
-    PR_Cleanup();
-    if (failed_already) return 1;
-    else return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/thruput.c b/libs/js/nsprpub/pr/tests/thruput.c
deleted file mode 100644
index e6319dbecc..0000000000
--- a/libs/js/nsprpub/pr/tests/thruput.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        thruput.c
-** Description: Test server's throughput capability comparing various
-**              implmentation strategies.
-**
-** Note:        Requires a server machine and an aribitrary number of
-**              clients to bang on it. Trust the numbers on the server
-**              more than those being displayed by the various clients.
-*/
-
-#include "prerror.h"
-#include "prinrval.h"
-#include "prinit.h"
-#include "prio.h"
-#include "prlock.h"
-#include "prmem.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prthread.h"
-
-#include "pprio.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#define ADDR_BUFFER 100
-#define PORT_NUMBER 51877
-#define SAMPLING_INTERVAL 10
-#define BUFFER_SIZE (32 * 1024)
-
-static PRInt32 domain = PR_AF_INET;
-static PRInt32 protocol = 6;  /* TCP */
-static PRFileDesc *err = NULL;
-static PRIntn concurrency = 1;
-static PRInt32 xport_buffer = -1;
-static PRUint32 initial_streams = 1;
-static PRInt32 buffer_size = BUFFER_SIZE;
-static PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-typedef struct Shared
-{
-    PRLock *ml;
-    PRUint32 sampled;
-    PRUint32 threads;
-    PRIntervalTime timein;
-    PRNetAddr server_address;
-} Shared;
-
-static Shared *shared = NULL;
-
-static PRStatus PrintAddress(const PRNetAddr* address)
-{
-    char buffer[ADDR_BUFFER];
-    PRStatus rv = PR_NetAddrToString(address, buffer, sizeof(buffer));
-    if (PR_SUCCESS == rv)
-        PR_fprintf(err, "%s:%u\n", buffer, PR_ntohs(address->inet.port));
-    else PL_FPrintError(err, "PR_NetAddrToString");
-    return rv;
-}  /* PrintAddress */
-
-
-static void PR_CALLBACK Clientel(void *arg)
-{
-    PRStatus rv;
-    PRFileDesc *xport;
-    PRInt32 bytes, sampled;
-    PRIntervalTime now, interval;
-    PRBool do_display = PR_FALSE;
-    Shared *shared = (Shared*)arg;
-    char *buffer = (char*)PR_Malloc(buffer_size);
-    PRNetAddr *server_address = &shared->server_address;
-    PRIntervalTime connect_timeout = PR_SecondsToInterval(5);
-    PRIntervalTime sampling_interval = PR_SecondsToInterval(SAMPLING_INTERVAL);
-
-    PR_fprintf(err, "Client connecting to ");
-    (void)PrintAddress(server_address);
-
-    do
-    {
-        xport = PR_Socket(domain, PR_SOCK_STREAM, protocol);
-        if (NULL == xport)
-        {
-            PL_FPrintError(err, "PR_Socket");
-            return;
-        }
-
-        if (xport_buffer != -1)
-        {
-            PRSocketOptionData data;
-            data.option = PR_SockOpt_RecvBufferSize;
-            data.value.recv_buffer_size = (PRSize)xport_buffer;
-            rv = PR_SetSocketOption(xport, &data);
-            if (PR_FAILURE == rv)
-                PL_FPrintError(err, "PR_SetSocketOption - ignored");
-            data.option = PR_SockOpt_SendBufferSize;
-            data.value.send_buffer_size = (PRSize)xport_buffer;
-            rv = PR_SetSocketOption(xport, &data);
-            if (PR_FAILURE == rv)
-                PL_FPrintError(err, "PR_SetSocketOption - ignored");
-        }
-
-        rv = PR_Connect(xport, server_address, connect_timeout);
-        if (PR_FAILURE == rv)
-        {
-            PL_FPrintError(err, "PR_Connect");
-            if (PR_IO_TIMEOUT_ERROR != PR_GetError())
-                PR_Sleep(connect_timeout);
-            PR_Close(xport);  /* delete it and start over */
-        }
-    } while (PR_FAILURE == rv);
-
-    do
-    {
-        bytes = PR_Recv(
-            xport, buffer, buffer_size, 0, PR_INTERVAL_NO_TIMEOUT);
-        PR_Lock(shared->ml);
-        now = PR_IntervalNow();
-        shared->sampled += bytes;
-        interval = now - shared->timein;
-        if (interval > sampling_interval)
-        {
-            sampled = shared->sampled;
-            shared->timein = now;
-            shared->sampled = 0;
-            do_display = PR_TRUE;
-        }
-        PR_Unlock(shared->ml);
-
-        if (do_display)
-        {
-            PRUint32 rate = sampled / PR_IntervalToMilliseconds(interval);
-            PR_fprintf(err, "%u streams @ %u Kbytes/sec\n", shared->threads, rate);
-            do_display = PR_FALSE;
-        }
-
-    } while (bytes > 0);
-}  /* Clientel */
-
-static void Client(const char *server_name)
-{
-    PRStatus rv;
-    PRHostEnt host;
-    char buffer[PR_NETDB_BUF_SIZE];
-    PRIntervalTime dally = PR_SecondsToInterval(60);
-    PR_fprintf(err, "Translating the name %s\n", server_name);
-    rv = PR_GetHostByName(server_name, buffer, sizeof(buffer), &host);
-    if (PR_FAILURE == rv)
-        PL_FPrintError(err, "PR_GetHostByName");
-    else
-    {
-        if (PR_EnumerateHostEnt(
-            0, &host, PORT_NUMBER, &shared->server_address) < 0)
-            PL_FPrintError(err, "PR_EnumerateHostEnt");
-        else
-        {
-            do
-            {
-                shared->threads += 1;
-                (void)PR_CreateThread(
-                    PR_USER_THREAD, Clientel, shared,
-                    PR_PRIORITY_NORMAL, thread_scope,
-                    PR_UNJOINABLE_THREAD, 8 * 1024);
-                if (shared->threads == initial_streams)
-                {
-                    PR_Sleep(dally);
-                    initial_streams += 1;
-                }
-            } while (PR_TRUE);
-        }
-    }
-}
-
-static void PR_CALLBACK Servette(void *arg)
-{
-    PRInt32 bytes, sampled;
-    PRIntervalTime now, interval;
-    PRBool do_display = PR_FALSE;
-    PRFileDesc *client = (PRFileDesc*)arg;
-    char *buffer = (char*)PR_Malloc(buffer_size);
-    PRIntervalTime sampling_interval = PR_SecondsToInterval(SAMPLING_INTERVAL);
-
-    if (xport_buffer != -1)
-    {
-        PRStatus rv;
-        PRSocketOptionData data;
-        data.option = PR_SockOpt_RecvBufferSize;
-        data.value.recv_buffer_size = (PRSize)xport_buffer;
-        rv = PR_SetSocketOption(client, &data);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err, "PR_SetSocketOption - ignored");
-        data.option = PR_SockOpt_SendBufferSize;
-        data.value.send_buffer_size = (PRSize)xport_buffer;
-        rv = PR_SetSocketOption(client, &data);
-        if (PR_FAILURE == rv)
-            PL_FPrintError(err, "PR_SetSocketOption - ignored");
-    }
-
-    do
-    {
-        bytes = PR_Send(
-            client, buffer, buffer_size, 0, PR_INTERVAL_NO_TIMEOUT);
-
-        PR_Lock(shared->ml);
-        now = PR_IntervalNow();
-        shared->sampled += bytes;
-        interval = now - shared->timein;
-        if (interval > sampling_interval)
-        {
-            sampled = shared->sampled;
-            shared->timein = now;
-            shared->sampled = 0;
-            do_display = PR_TRUE;
-        }
-        PR_Unlock(shared->ml);
-
-        if (do_display)
-        {
-            PRUint32 rate = sampled / PR_IntervalToMilliseconds(interval);
-            PR_fprintf(err, "%u streams @ %u Kbytes/sec\n", shared->threads, rate);
-            do_display = PR_FALSE;
-        }
-    } while (bytes > 0);
-}  /* Servette */
-
-static void Server(void)
-{
-    PRStatus rv;
-    PRNetAddr server_address, client_address;
-    PRFileDesc *xport = PR_Socket(domain, PR_SOCK_STREAM, protocol);
-
-    if (NULL == xport)
-    {
-        PL_FPrintError(err, "PR_Socket");
-        return;
-    }
-
-    rv = PR_InitializeNetAddr(PR_IpAddrAny, PORT_NUMBER, &server_address);
-    if (PR_FAILURE == rv) PL_FPrintError(err, "PR_InitializeNetAddr");
-    else
-    {
-        rv = PR_Bind(xport, &server_address);
-        if (PR_FAILURE == rv) PL_FPrintError(err, "PR_Bind");
-        else
-        {
-            PRFileDesc *client;
-            rv = PR_Listen(xport, 10);
-            PR_fprintf(err, "Server listening on ");
-            (void)PrintAddress(&server_address);
-            do
-            {
-                client = PR_Accept(
-                    xport, &client_address, PR_INTERVAL_NO_TIMEOUT);
-                if (NULL == client) PL_FPrintError(err, "PR_Accept");
-                else
-                {
-                    PR_fprintf(err, "Server accepting from ");
-                    (void)PrintAddress(&client_address);
-                    shared->threads += 1;
-                    (void)PR_CreateThread(
-                        PR_USER_THREAD, Servette, client,
-                        PR_PRIORITY_NORMAL, thread_scope,
-                        PR_UNJOINABLE_THREAD, 8 * 1024);
-                }
-            } while (PR_TRUE);
-
-        }
-    }
-}  /* Server */
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: [-h] [<server>]\n");
-    PR_fprintf(err, "\t-s <n>   Initial # of connections        (default: 1)\n");
-    PR_fprintf(err, "\t-C <n>   Set 'concurrency'               (default: 1)\n");
-    PR_fprintf(err, "\t-b <nK>  Client buffer size              (default: 32k)\n");
-    PR_fprintf(err, "\t-B <nK>  Transport recv/send buffer size (default: sys)\n");
-    PR_fprintf(err, "\t-G       Use GLOBAL threads              (default: LOCAL)\n");
-    PR_fprintf(err, "\t-X       Use XTP transport               (default: TCP)\n");
-    PR_fprintf(err, "\t-6       Use IPv6                        (default: IPv4)\n");
-    PR_fprintf(err, "\t-h       This message and nothing else\n");
-    PR_fprintf(err, "\t<server> DNS name of server\n");
-    PR_fprintf(err, "\t\tIf <server> is not specified, this host will be\n");
-    PR_fprintf(err, "\t\tthe server and not act as a client.\n");
-}  /* Help */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PLOptStatus os;
-    const char *server_name = NULL;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hGX6C:b:s:B:");
-
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:  /* Name of server */
-            server_name = opt->value;
-            break;
-        case 'G':  /* Globular threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'X':  /* Use XTP as the transport */
-            protocol = 36;
-            break;
-        case '6':  /* Use IPv6 */
-            domain = PR_AF_INET6;
-            break;
-        case 's':  /* initial_streams */
-            initial_streams = atoi(opt->value);
-            break;
-        case 'C':  /* concurrency */
-            concurrency = atoi(opt->value);
-            break;
-        case 'b':  /* buffer size */
-            buffer_size = 1024 * atoi(opt->value);
-            break;
-        case 'B':  /* buffer size */
-            xport_buffer = 1024 * atoi(opt->value);
-            break;
-        case 'h':  /* user wants some guidance */
-        default:
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    shared = PR_NEWZAP(Shared);
-    shared->ml = PR_NewLock();
-
-    PR_fprintf(err,
-        "This machine is %s\n",
-        (NULL == server_name) ? "the SERVER" : "a CLIENT");
-
-    PR_fprintf(err,
-        "Transport being used is %s\n",
-        (6 == protocol) ? "TCP" : "XTP");
-
-    if (PR_GLOBAL_THREAD == thread_scope)
-    {
-        if (1 != concurrency)
-        {
-            PR_fprintf(err, "  **Concurrency > 1 and GLOBAL threads!?!?\n");
-            PR_fprintf(err, "  **Ignoring concurrency\n");
-            concurrency = 1;
-        }
-    }
-
-    if (1 != concurrency)
-    {
-        PR_SetConcurrency(concurrency);
-        PR_fprintf(err, "Concurrency set to %u\n", concurrency);
-    }
-
-    PR_fprintf(err,
-        "All threads will be %s\n",
-        (PR_GLOBAL_THREAD == thread_scope) ? "GLOBAL" : "LOCAL");
-
-    PR_fprintf(err, "Client buffer size will be %u\n", buffer_size);
-   
-    if (-1 != xport_buffer)
-    PR_fprintf(
-        err, "Transport send & receive buffer size will be %u\n", xport_buffer);
-    
-
-    if (NULL == server_name) Server();
-    else Client(server_name);
-
-}  /* main */
-
-/* thruput.c */
-
diff --git a/libs/js/nsprpub/pr/tests/time.c b/libs/js/nsprpub/pr/tests/time.c
deleted file mode 100644
index b8e7d61afc..0000000000
--- a/libs/js/nsprpub/pr/tests/time.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Program to test different ways to get the time; right now it is tuned
- * only for solaris.
- *   solaris results (100000 iterations):
- *          time to get time with time():   4.63 usec avg, 463 msec total
- *     time to get time with gethrtime():   2.17 usec avg, 217 msec total
- *  time to get time with gettimeofday():   1.25 usec avg, 125 msec total
- *
- *
- */
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "prpriv.h"
-#include "prinrval.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#define DEFAULT_COUNT 100000
-PRInt32 count;
-
-time_t itime;
-hrtime_t ihrtime;
-
-void
-ftime_init()
-{
-   itime = time(NULL);
-   ihrtime = gethrtime();
-}
-
-time_t
-ftime()
-{
-        hrtime_t now = gethrtime();
-
-        return itime + ((now - ihrtime) / 1000000000ll);
-}
-
-static void timeTime(void)
-{
-    PRInt32 index = count;
-    time_t rv;
- 
-    for (;index--;)
-        rv = time(NULL);
-}
-
-static void timeGethrtime(void)
-{
-    PRInt32 index = count;
-    time_t rv;
- 
-    for (;index--;)
-        rv = ftime();
-}
-
-static void timeGettimeofday(void)
-{
-    PRInt32 index = count;
-    time_t rv;
-    struct timeval tp;
- 
-    for (;index--;)
-        rv = gettimeofday(&tp, NULL);
-}
-
-static void timePRTime32(void)
-{
-    PRInt32 index = count;
-    PRInt32 rv32;
-    PRTime q;
-    PRTime rv;
-
-    LL_I2L(q, 1000000);
- 
-    for (;index--;) {
-        rv = PR_Now();
-        LL_DIV(rv, rv, q);
-        LL_L2I(rv32, rv);
-    }
-}
-
-static void timePRTime64(void)
-{
-    PRInt32 index = count;
-    PRTime rv;
- 
-    for (;index--;)
-        rv = PR_Now();
-}
-
-/************************************************************************/
-
-static void Measure(void (*func)(void), const char *msg)
-{
-    PRIntervalTime start, stop;
-    double d;
-    PRInt32 tot;
-
-    start = PR_IntervalNow();
-    (*func)();
-    stop = PR_IntervalNow();
-
-    d = (double)PR_IntervalToMicroseconds(stop - start);
-    tot = PR_IntervalToMilliseconds(stop-start);
-
-    if (debug_mode) printf("%40s: %6.2f usec avg, %d msec total\n", msg, d / count, tot);
-}
-
-void main(int argc, char **argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-
-    if (argc > 1) {
-	count = atoi(argv[1]);
-    } else {
-	count = DEFAULT_COUNT;
-    }
-
-    ftime_init();
-
-    Measure(timeTime, "time to get time with time()");
-    Measure(timeGethrtime, "time to get time with gethrtime()");
-    Measure(timeGettimeofday, "time to get time with gettimeofday()");
-    Measure(timePRTime32, "time to get time with PR_Time() (32bit)");
-    Measure(timePRTime64, "time to get time with PR_Time() (64bit)");
-
-	PR_Cleanup();
-	return 0;
-}
-
-
-
diff --git a/libs/js/nsprpub/pr/tests/timemac.c b/libs/js/nsprpub/pr/tests/timemac.c
deleted file mode 100644
index c58c24bdd3..0000000000
--- a/libs/js/nsprpub/pr/tests/timemac.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * file: timemac.c
- * description: test time and date routines on the Mac
- */
-#include <stdio.h>
-#include "prinit.h"
-#include "prtime.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-
-static char *dayOfWeek[] =
-	{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "???" };
-static char *month[] =
-	{ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "???" };
-
-static void printExplodedTime(const PRExplodedTime *et) {
-    PRInt32 totalOffset;
-    PRInt32 hourOffset, minOffset;
-    const char *sign;
-
-    /* Print day of the week, month, day, hour, minute, and second */
-    printf( "%s %s %ld %02ld:%02ld:%02ld ",
-	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
-	    et->tm_hour, et->tm_min, et->tm_sec);
-
-    /* Print time zone */
-    totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset;
-    if (totalOffset == 0) {
-	printf("UTC ");
-    } else {
-        sign = "";
-        if (totalOffset < 0) {
-	    totalOffset = -totalOffset;
-	    sign = "-";
-        }
-        hourOffset = totalOffset / 3600;
-        minOffset = (totalOffset % 3600) / 60;
-        printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
-    }
-
-    /* Print year */
-    printf("%d", et->tm_year);
-}
-
-int main(int argc, char** argv)
-{
-    PR_STDIO_INIT();
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-
- 
-#ifdef XP_MAC
-	SetupMacPrintfLog("timemac.log");
-#endif
-
-   /*
-     *************************************************************
-     **
-     **  Testing PR_Now(), PR_ExplodeTime, and PR_ImplodeTime
-     **  on the current time
-     **
-     *************************************************************
-     */
-
-    {
-	PRTime t1, t2;
-	PRExplodedTime et;
-
-	printf("*********************************************\n");
-	printf("**                                         **\n");
-        printf("** Testing PR_Now(), PR_ExplodeTime, and   **\n");
-	printf("** PR_ImplodeTime on the current time      **\n");
-	printf("**                                         **\n");
-	printf("*********************************************\n\n");
-        t1 = PR_Now();
-
-        /* First try converting to UTC */
-
-        PR_ExplodeTime(t1, PR_GMTParameters, &et);
-        if (et.tm_params.tp_gmt_offset || et.tm_params.tp_dst_offset) {
-	    printf("ERROR: UTC has nonzero gmt or dst offset.\n");
-	    return 1;
-        }
-        printf("Current UTC is ");
-	printExplodedTime(&et);
-	printf("\n");
-
-        t2 = PR_ImplodeTime(&et);
-        if (LL_NE(t1, t2)) {
-	    printf("ERROR: Explode and implode are NOT inverse.\n");
-	    return 1;
-        }
-
-        /* Next, try converting to local (US Pacific) time */
-
-        PR_ExplodeTime(t1, PR_LocalTimeParameters, &et);
-        printf("Current local time is ");
-	printExplodedTime(&et);
-	printf("\n");
-	printf("GMT offset is %ld, DST offset is %ld\n",
-		et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset);
-        t2 = PR_ImplodeTime(&et);
-        if (LL_NE(t1, t2)) {
-	    printf("ERROR: Explode and implode are NOT inverse.\n");
-	    return 1;
-	}
-    }
-
-    printf("Please examine the results\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/timetest.c b/libs/js/nsprpub/pr/tests/timetest.c
deleted file mode 100644
index 8560b719ef..0000000000
--- a/libs/js/nsprpub/pr/tests/timetest.c
+++ /dev/null
@@ -1,782 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * file: timetest.c
- * description: test time and date routines
- */
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prtime.h"
-#include "prprf.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "macstdlibextras.h"
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-int failed_already=0;
-PRBool debug_mode = PR_FALSE;
-
-static char *dayOfWeek[] =
-	{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "???" };
-static char *month[] =
-	{ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "???" };
-
-static void PrintExplodedTime(const PRExplodedTime *et) {
-    PRInt32 totalOffset;
-    PRInt32 hourOffset, minOffset;
-    const char *sign;
-
-    /* Print day of the week, month, day, hour, minute, and second */
-    if (debug_mode) printf("%s %s %ld %02ld:%02ld:%02ld ",
-	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
-	    et->tm_hour, et->tm_min, et->tm_sec);
-
-    /* Print time zone */
-    totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset;
-    if (totalOffset == 0) {
-	if (debug_mode) printf("UTC ");
-    } else {
-        sign = "+";
-        if (totalOffset < 0) {
-	    totalOffset = -totalOffset;
-	    sign = "-";
-        }
-        hourOffset = totalOffset / 3600;
-        minOffset = (totalOffset % 3600) / 60;
-        if (debug_mode) 
-            printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
-    }
-
-    /* Print year */
-    if (debug_mode) printf("%hd", et->tm_year);
-}
-
-static int ExplodedTimeIsEqual(const PRExplodedTime *et1,
-	const PRExplodedTime *et2)
-{
-    if (et1->tm_usec == et2->tm_usec &&
-	    et1->tm_sec == et2->tm_sec &&
-	    et1->tm_min == et2->tm_min &&
-	    et1->tm_hour == et2->tm_hour &&
-	    et1->tm_mday == et2->tm_mday &&
-	    et1->tm_month == et2->tm_month &&
-	    et1->tm_year == et2->tm_year &&
-	    et1->tm_wday == et2->tm_wday &&
-	    et1->tm_yday == et2->tm_yday &&
-	    et1->tm_params.tp_gmt_offset == et2->tm_params.tp_gmt_offset &&
-	    et1->tm_params.tp_dst_offset == et2->tm_params.tp_dst_offset) {
-        return 1;
-    } else {
-	return 0;
-    }
-}
-
-static void
-testParseTimeString(PRTime t)
-{
-    PRExplodedTime et;
-    PRTime t2;
-    char timeString[128];
-    char buf[128];
-    PRInt32 totalOffset;
-    PRInt32 hourOffset, minOffset;
-    const char *sign;
-    PRInt64 usec_per_sec;
-
-    /* Truncate the microsecond part of PRTime */
-    LL_I2L(usec_per_sec, PR_USEC_PER_SEC);
-    LL_DIV(t, t, usec_per_sec);
-    LL_MUL(t, t, usec_per_sec);
-
-    PR_ExplodeTime(t, PR_LocalTimeParameters, &et);
-
-    /* Print day of the week, month, day, hour, minute, and second */
-    PR_snprintf(timeString, 128, "%s %s %ld %02ld:%02ld:%02ld ",
-	    dayOfWeek[et.tm_wday], month[et.tm_month], et.tm_mday,
-	    et.tm_hour, et.tm_min, et.tm_sec);
-    /* Print time zone */
-    totalOffset = et.tm_params.tp_gmt_offset + et.tm_params.tp_dst_offset;
-    if (totalOffset == 0) {
-	strcat(timeString, "GMT ");  /* I wanted to use "UTC" here, but
-                                      * PR_ParseTimeString doesn't 
-                                      * understand "UTC".  */
-    } else {
-        sign = "+";
-        if (totalOffset < 0) {
-	    totalOffset = -totalOffset;
-	    sign = "-";
-        }
-        hourOffset = totalOffset / 3600;
-        minOffset = (totalOffset % 3600) / 60;
-        PR_snprintf(buf, 128, "%s%02ld%02ld ", sign, hourOffset, minOffset);
-	strcat(timeString, buf);
-    }
-    /* Print year */
-    PR_snprintf(buf, 128, "%hd", et.tm_year);
-    strcat(timeString, buf);
-
-    if (PR_ParseTimeString(timeString, PR_FALSE, &t2) == PR_FAILURE) {
-	fprintf(stderr, "PR_ParseTimeString() failed\n");
-	exit(1);
-    }
-    if (LL_NE(t, t2)) {
-	fprintf(stderr, "PR_ParseTimeString() incorrect\n");
-	PR_snprintf(buf, 128, "t is %lld, t2 is %lld, time string is %s\n",
-                t, t2, timeString);
-	fprintf(stderr, "%s\n", buf);
-	exit(1);
-    }
-}
-
-int main(int argc, char** argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt;
-    
-    PR_STDIO_INIT();
-	opt = PL_CreateOptState(argc, argv, "d");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-
-#ifdef XP_MAC
-	/* Set up the console */
-	InitializeSIOUX(true);
-	debug_mode = PR_TRUE;
-#endif
-    /* Testing zero PRTime (the epoch) */
-    {
-	PRTime t;
-	PRExplodedTime et;
-
-	LL_I2L(t, 0);
-	if (debug_mode) printf("The NSPR epoch is:\n");
-        PR_ExplodeTime(t, PR_LocalTimeParameters, &et);
-	PrintExplodedTime(&et);
-	if (debug_mode) printf("\n");
-	PR_ExplodeTime(t, PR_GMTParameters, &et);
-	PrintExplodedTime(&et);
-	if (debug_mode) printf("\n\n");
-	testParseTimeString(t);
-    }
-
-    /*
-     *************************************************************
-     **
-     **  Testing PR_Now(), PR_ExplodeTime, and PR_ImplodeTime
-     **  on the current time
-     **
-     *************************************************************
-     */
-
-    {
-	PRTime t1, t2;
-	PRExplodedTime et;
-
-	if (debug_mode) {
-	printf("*********************************************\n");
-	printf("**                                         **\n");
-    printf("** Testing PR_Now(), PR_ExplodeTime, and   **\n");
-	printf("** PR_ImplodeTime on the current time      **\n");
-	printf("**                                         **\n");
-	printf("*********************************************\n\n");
-	}
-	t1 = PR_Now();
-
-        /* First try converting to UTC */
-
-        PR_ExplodeTime(t1, PR_GMTParameters, &et);
-        if (et.tm_params.tp_gmt_offset || et.tm_params.tp_dst_offset) {
-	    if (debug_mode) printf("ERROR: UTC has nonzero gmt or dst offset.\n");
-		else failed_already=1;
-	    return 1;
-        }
-        if (debug_mode) printf("Current UTC is ");
-	PrintExplodedTime(&et);
-	if (debug_mode) printf("\n");
-
-        t2 = PR_ImplodeTime(&et);
-        if (LL_NE(t1, t2)) {
-	    if (debug_mode) printf("ERROR: Explode and implode are NOT inverse.\n");
-		else printf("FAIL\n");
-	    return 1;
-        }
-
-        /* Next, try converting to local (US Pacific) time */
-
-        PR_ExplodeTime(t1, PR_LocalTimeParameters, &et);
-        if (debug_mode) printf("Current local time is ");
-	PrintExplodedTime(&et);
-	if (debug_mode) printf("\n");
-	if (debug_mode) printf("GMT offset is %ld, DST offset is %ld\n",
-		et.tm_params.tp_gmt_offset, et.tm_params.tp_dst_offset);
-        t2 = PR_ImplodeTime(&et);
-        if (LL_NE(t1, t2)) {
-	    if (debug_mode) printf("ERROR: Explode and implode are NOT inverse.\n");
-	    return 1;
-	}
-
-	if (debug_mode) printf("Please examine the results\n");
-	testParseTimeString(t1);
-    }
-
-
-    /*
-     *******************************************
-     **
-     ** Testing PR_NormalizeTime()
-     **
-     *******************************************
-     */
-
-    /* July 4, 2001 is Wednesday */
-    {
-	PRExplodedTime et;
-
-	if (debug_mode)  {
-	printf("\n");
-	printf("**********************************\n");
-	printf("**                              **\n");
-	printf("** Testing PR_NormalizeTime()   **\n");
-	printf("**                              **\n");
-	printf("**********************************\n\n");
-	}
-        et.tm_year    = 2001;
-        et.tm_month   = 7 - 1;
-        et.tm_mday    = 4;
-        et.tm_hour    = 0;
-        et.tm_min     = 0;
-        et.tm_sec     = 0;
-	et.tm_usec    = 0;
-        et.tm_params  = PR_GMTParameters(&et);
-
-	PR_NormalizeTime(&et, PR_GMTParameters);
-
-	if (debug_mode) printf("July 4, 2001 is %s.\n", dayOfWeek[et.tm_wday]);
-	if (et.tm_wday == 3) {
-	    if (debug_mode) printf("PASS\n");
-        } else {
-            if (debug_mode) printf("ERROR: It should be Wednesday\n");
-			else failed_already=1;
-	    return 1;
-	}
-	testParseTimeString(PR_ImplodeTime(&et));
-
-        /* June 12, 1997 23:00 PST == June 13, 1997 00:00 PDT */
-        et.tm_year    = 1997;
-        et.tm_month   = 6 - 1;
-        et.tm_mday    = 12;
-        et.tm_hour    = 23;
-        et.tm_min     = 0;
-        et.tm_sec     = 0;
-	et.tm_usec    = 0;
-        et.tm_params.tp_gmt_offset = -8 * 3600;
-	et.tm_params.tp_dst_offset = 0;
-
-	PR_NormalizeTime(&et, PR_USPacificTimeParameters);
-
-	if (debug_mode) {
-	    printf("Thu Jun 12, 1997 23:00:00 PST is ");
-	}
-	PrintExplodedTime(&et);
-	if (debug_mode) printf(".\n");
-	if (et.tm_wday == 5) {
-	    if (debug_mode) printf("PASS\n");
-        } else {
-            if (debug_mode) printf("ERROR: It should be Friday\n");
-			else failed_already=1;
-	    return 1;
-	}
-	testParseTimeString(PR_ImplodeTime(&et));
-
-        /* Feb 14, 1997 00:00:00 PDT == Feb 13, 1997 23:00:00 PST */
-        et.tm_year    = 1997;
-        et.tm_month   = 2 - 1;
-        et.tm_mday    = 14;
-        et.tm_hour    = 0;
-        et.tm_min     = 0;
-        et.tm_sec     = 0;
-	et.tm_usec    = 0;
-        et.tm_params.tp_gmt_offset = -8 * 3600;
-	et.tm_params.tp_dst_offset = 3600;
-
-	PR_NormalizeTime(&et, PR_USPacificTimeParameters);
-
-	if (debug_mode) {
-	    printf("Fri Feb 14, 1997 00:00:00 PDT is ");
-	}
-	PrintExplodedTime(&et);
-	if (debug_mode) printf(".\n");
-	if (et.tm_wday == 4) {
-	    if (debug_mode) printf("PASS\n");
-        } else {
-            if (debug_mode) printf("ERROR: It should be Thursday\n");
-			else failed_already=1;
-	    return 1;
-	}
-	testParseTimeString(PR_ImplodeTime(&et));
-
-        /* What time is Nov. 7, 1996, 18:29:23 PDT? */
-        et.tm_year    = 1996;
-        et.tm_month   = 11 - 1;
-        et.tm_mday    = 7;
-        et.tm_hour    = 18;
-        et.tm_min     = 29;
-        et.tm_sec     = 23;
-	et.tm_usec    = 0;
-        et.tm_params.tp_gmt_offset = -8 * 3600;  /* PDT */
-	et.tm_params.tp_dst_offset = 3600; 
-
-	PR_NormalizeTime(&et, PR_LocalTimeParameters);
-        if (debug_mode) printf("Nov 7 18:29:23 PDT 1996 is ");
-	PrintExplodedTime(&et);
-	if (debug_mode) printf(".\n");
-	testParseTimeString(PR_ImplodeTime(&et));
-
-        /* What time is Oct. 7, 1995, 18:29:23 PST? */
-        et.tm_year    = 1995;
-        et.tm_month   = 10 - 1;
-        et.tm_mday    = 7;
-        et.tm_hour    = 18;
-        et.tm_min     = 29;
-        et.tm_sec     = 23;
-        et.tm_params.tp_gmt_offset = -8 * 3600;  /* PST */
-	et.tm_params.tp_dst_offset = 0;
-
-	PR_NormalizeTime(&et, PR_LocalTimeParameters);
-        if (debug_mode) printf("Oct 7 18:29:23 PST 1995 is ");
-	PrintExplodedTime(&et);
-	if (debug_mode) printf(".\n");
-	testParseTimeString(PR_ImplodeTime(&et));
-
-	if (debug_mode) printf("Please examine the results\n");
-    }
-
-    /*
-     **************************************************************
-     **
-     ** Testing range of years
-     **
-     **************************************************************
-     */
-
-    {
-	PRExplodedTime et1, et2;
-    PRTime  ttt;
-	PRTime secs;
-
-	if (debug_mode) {
-	printf("\n");
-	printf("***************************************\n");
-	printf("**                                   **\n");
-	printf("**  Testing range of years           **\n");
-	printf("**                                   **\n");
-	printf("***************************************\n\n");
-	}
-	/* April 4, 1917 GMT */
-	et1.tm_usec = 0;
-	et1.tm_sec = 0;
-	et1.tm_min = 0;
-	et1.tm_hour = 0;
-	et1.tm_mday = 4;
-	et1.tm_month = 4 - 1;
-	et1.tm_year = 1917;
-	et1.tm_params = PR_GMTParameters(&et1);
-	PR_NormalizeTime(&et1, PR_LocalTimeParameters);
-	secs = PR_ImplodeTime(&et1);
-	if (LL_GE_ZERO(secs)) {
-	    if (debug_mode)
-		printf("ERROR: April 4, 1917 GMT returns a nonnegative second count\n");
-		failed_already = 1;
-	    return 1;
-        }
-	PR_ExplodeTime(secs, PR_LocalTimeParameters, &et2);
-	if (!ExplodedTimeIsEqual(&et1, &et2)) {
-		if (debug_mode)
-		printf("ERROR: PR_ImplodeTime and PR_ExplodeTime are not inverse for April 4, 1917 GMT\n");
-		failed_already=1;
-	    return 1;
-        }
-    ttt = PR_ImplodeTime(&et1);
-	testParseTimeString( ttt );
-
-	if (debug_mode) printf("Test passed for April 4, 1917\n");
-
-	/* July 4, 2050 */
-	et1.tm_usec = 0;
-	et1.tm_sec = 0;
-	et1.tm_min = 0;
-	et1.tm_hour = 0;
-	et1.tm_mday = 4;
-	et1.tm_month = 7 - 1;
-	et1.tm_year = 2050;
-	et1.tm_params = PR_GMTParameters(&et1);
-	PR_NormalizeTime(&et1, PR_LocalTimeParameters);
-	secs = PR_ImplodeTime(&et1);
-	if (!LL_GE_ZERO(secs)) {
-	    if (debug_mode)
-			printf("ERROR: July 4, 2050 GMT returns a negative second count\n");
-		failed_already = 1;
-	    return 1;
-        }
-	PR_ExplodeTime(secs, PR_LocalTimeParameters, &et2);
-	if (!ExplodedTimeIsEqual(&et1, &et2)) {
-	    if (debug_mode)
-		printf("ERROR: PR_ImplodeTime and PR_ExplodeTime are not inverse for July 4, 2050 GMT\n");
-		failed_already=1;
-	    return 1;
-        }
-	testParseTimeString(PR_ImplodeTime(&et1));
-
-	if (debug_mode) printf("Test passed for July 4, 2050\n");
-
-    }
-
-    /*
-     **************************************************************
-     **
-     **  Stress test
-     *
-     **      Go through four years, starting from
-     **      00:00:00 PST Jan. 1, 1993, incrementing
-     **      every 10 minutes.
-     **
-     **************************************************************
-     */
-
-    {
-	PRExplodedTime et, et1, et2;
-	PRInt64 usecPer10Min;
-	int day, hour, min;
-	PRTime usecs;
-	int dstInEffect = 0;
-
-	if (debug_mode) {
-	printf("\n");
-	printf("*******************************************************\n");
-	printf("**                                                   **\n");
-	printf("**                 Stress test                       **\n");
-	printf("**  Starting from midnight Jan. 1, 1993 PST,         **\n");
-	printf("**  going through four years in 10-minute increment  **\n");
-	printf("**                                                   **\n");
-	printf("*******************************************************\n\n");
-	}
-	LL_I2L(usecPer10Min, 600000000L);
-
-	/* 00:00:00 PST Jan. 1, 1993 */
-	et.tm_usec = 0;
-	et.tm_sec = 0;
-	et.tm_min = 0;
-	et.tm_hour = 0;
-	et.tm_mday = 1;
-	et.tm_month = 0;
-	et.tm_year = 1993;
-	et.tm_params.tp_gmt_offset = -8 * 3600;
-	et.tm_params.tp_dst_offset = 0;
-	usecs = PR_ImplodeTime(&et);
-
-        for (day = 0; day < 4 * 365 + 1; day++) {
-	    for (hour = 0; hour < 24; hour++) {
-		for (min = 0; min < 60; min += 10) {
-	            LL_ADD(usecs, usecs, usecPer10Min);
-		    PR_ExplodeTime(usecs, PR_USPacificTimeParameters, &et1);
-
-		    et2 = et;
-		    et2.tm_usec += 600000000L;
-		    PR_NormalizeTime(&et2, PR_USPacificTimeParameters);
-
-		    if (!ExplodedTimeIsEqual(&et1, &et2)) {
-		        if (debug_mode) printf("ERROR: componentwise comparison failed\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			PrintExplodedTime(&et2);
-			if (debug_mode) printf("\n");
-			failed_already=1;
-		        return 1;
-		    }
-
-		    if (LL_NE(usecs, PR_ImplodeTime(&et1))) { 
-                        if (debug_mode)
-					printf("ERROR: PR_ExplodeTime and PR_ImplodeTime are not inverse\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			failed_already=1;
-		        return 1;
-		    }
-		    testParseTimeString(usecs);
-
-		    if (!dstInEffect && et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 1;
-		        if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    } else if (dstInEffect && !et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 0;
-			if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    }
-
-		    et = et1;
-		}
-	    }
-        }
-	if (debug_mode) printf("Test passed\n");
-    }
-
-
-    /* Same stress test, but with PR_LocalTimeParameters */
-
-    {
-	PRExplodedTime et, et1, et2;
-	PRInt64 usecPer10Min;
-	int day, hour, min;
-	PRTime usecs;
-	int dstInEffect = 0;
-
-	if (debug_mode) {
-	printf("\n");
-	printf("*******************************************************\n");
-	printf("**                                                   **\n");
-	printf("**                 Stress test                       **\n");
-	printf("**  Starting from midnight Jan. 1, 1993 PST,         **\n");
-	printf("**  going through four years in 10-minute increment  **\n");
-	printf("**                                                   **\n");
-	printf("*******************************************************\n\n");
-	}
-	
-	LL_I2L(usecPer10Min, 600000000L);
-
-	/* 00:00:00 PST Jan. 1, 1993 */
-	et.tm_usec = 0;
-	et.tm_sec = 0;
-	et.tm_min = 0;
-	et.tm_hour = 0;
-	et.tm_mday = 1;
-	et.tm_month = 0;
-	et.tm_year = 1993;
-	et.tm_params.tp_gmt_offset = -8 * 3600;
-	et.tm_params.tp_dst_offset = 0;
-	usecs = PR_ImplodeTime(&et);
-
-        for (day = 0; day < 4 * 365 + 1; day++) {
-	    for (hour = 0; hour < 24; hour++) {
-		for (min = 0; min < 60; min += 10) {
-	            LL_ADD(usecs, usecs, usecPer10Min);
-		    PR_ExplodeTime(usecs, PR_LocalTimeParameters, &et1);
-
-		    et2 = et;
-		    et2.tm_usec += 600000000L;
-		    PR_NormalizeTime(&et2, PR_LocalTimeParameters);
-
-		    if (!ExplodedTimeIsEqual(&et1, &et2)) {
-		        if (debug_mode) printf("ERROR: componentwise comparison failed\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			PrintExplodedTime(&et2);
-			if (debug_mode) printf("\n");
-		        return 1;
-		    }
-
-		    if (LL_NE(usecs, PR_ImplodeTime(&et1))) {
-                        printf("ERROR: PR_ExplodeTime and PR_ImplodeTime are not inverse\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			failed_already=1;
-		        return 1;
-		    }
-		    testParseTimeString(usecs);
-
-		    if (!dstInEffect && et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 1;
-		        if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    } else if (dstInEffect && !et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 0;
-			if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    }
-
-		    et = et1;
-		}
-	    }
-        }
-	if (debug_mode) printf("Test passed\n");
-    }
-
-    /* Same stress test, but with PR_LocalTimeParameters and going backward */
-
-    {
-	PRExplodedTime et, et1, et2;
-	PRInt64 usecPer10Min;
-	int day, hour, min;
-	PRTime usecs;
-	int dstInEffect = 0;
-
-	if (debug_mode) {
-	printf("\n");
-	printf("*******************************************************\n");
-	printf("**                                                   **\n");
-	printf("**                 Stress test                       **\n");
-	printf("**  Starting from midnight Jan. 1, 1997 PST,         **\n");
-	printf("**  going back four years in 10-minute increment     **\n");
-	printf("**                                                   **\n");
-	printf("*******************************************************\n\n");
-	}
-
-	LL_I2L(usecPer10Min, 600000000L);
-
-	/* 00:00:00 PST Jan. 1, 1997 */
-	et.tm_usec = 0;
-	et.tm_sec = 0;
-	et.tm_min = 0;
-	et.tm_hour = 0;
-	et.tm_mday = 1;
-	et.tm_month = 0;
-	et.tm_year = 1997;
-	et.tm_params.tp_gmt_offset = -8 * 3600;
-	et.tm_params.tp_dst_offset = 0;
-	usecs = PR_ImplodeTime(&et);
-
-        for (day = 0; day < 4 * 365 + 1; day++) {
-	    for (hour = 0; hour < 24; hour++) {
-		for (min = 0; min < 60; min += 10) {
-	            LL_SUB(usecs, usecs, usecPer10Min);
-		    PR_ExplodeTime(usecs, PR_LocalTimeParameters, &et1);
-
-		    et2 = et;
-		    et2.tm_usec -= 600000000L;
-		    PR_NormalizeTime(&et2, PR_LocalTimeParameters);
-
-		    if (!ExplodedTimeIsEqual(&et1, &et2)) {
-		        if (debug_mode) printf("ERROR: componentwise comparison failed\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			PrintExplodedTime(&et2);
-			if (debug_mode) printf("\n");
-		        return 1;
-		    }
-
-		    if (LL_NE(usecs, PR_ImplodeTime(&et1))) {
-                   if (debug_mode)
-					printf("ERROR: PR_ExplodeTime and PR_ImplodeTime are not inverse\n");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf("\n");
-			failed_already=1;
-		        return 1;
-		    }
-		    testParseTimeString(usecs);
-
-		    if (!dstInEffect && et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 1;
-		        if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    } else if (dstInEffect && !et1.tm_params.tp_dst_offset) {
-		        dstInEffect = 0;
-			if (debug_mode) printf("DST changeover from ");
-			PrintExplodedTime(&et);
-			if (debug_mode) printf(" to ");
-			PrintExplodedTime(&et1);
-			if (debug_mode) printf(".\n");
-                    }
-
-		    et = et1;
-		}
-	    }
-        }
-    }
-
-#ifdef XP_MAC
-	if (1)
-	{
-		char dummyChar;
-		
-		printf("Press return to exit\n\n");
-		scanf("%c", &dummyChar);
-	}
-#endif
-
-	if (failed_already) return 1;
-	else return 0;
-
-}
diff --git a/libs/js/nsprpub/pr/tests/tmoacc.c b/libs/js/nsprpub/pr/tests/tmoacc.c
deleted file mode 100644
index fa974a136a..0000000000
--- a/libs/js/nsprpub/pr/tests/tmoacc.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-#define BASE_PORT 9867
-#define DEFAULT_THREADS 1
-#define DEFAULT_BACKLOG 10
-#define DEFAULT_TIMEOUT 10
-#define RANDOM_RANGE 100  /* should be significantly smaller than RAND_MAX */
-
-typedef enum {running, stopped} Status;
-
-typedef struct Shared
-{
-    PRLock *ml;
-    PRCondVar *cv;
-    PRBool passed;
-    PRBool random;
-    PRFileDesc *debug;
-    PRIntervalTime timeout;
-    PRFileDesc *listenSock;
-    Status status;
-} Shared;
-
-static PRIntervalTime Timeout(const Shared *shared)
-{
-    PRIntervalTime timeout = shared->timeout;
-    if (shared->random)
-    {
-        PRIntervalTime half = timeout >> 1;  /* one half of the interval */
-        PRIntervalTime quarter = half >> 1;  /* one quarter of the interval */
-        /* something in [0..timeout / 2) */
-        PRUint32 random = (rand() % RANDOM_RANGE) * half / RANDOM_RANGE;
-        timeout = (3 * quarter) + random;  /* [75..125)% */
-    }
-    return timeout;
-}  /* Timeout */
-
-static void Accept(void *arg)
-{
-    PRStatus rv;
-    char *buffer = NULL;
-    PRNetAddr clientAddr;
-    Shared *shared = (Shared*)arg;
-    PRInt32 recv_length = 0, flags = 0;
-    PRFileDesc *clientSock;
-    PRIntn toread, byte, bytes, loop = 0;
-    struct Descriptor { PRInt32 length; PRUint32 checksum; } descriptor;
-
-    do
-    {
-        PRUint32 checksum = 0;
-        if (NULL != shared->debug)
-            PR_fprintf(shared->debug, "[%d]accepting ... ", loop++);
-        clientSock = PR_Accept(
-            shared->listenSock, &clientAddr, Timeout(shared));
-        if (clientSock != NULL)
-        {
-            if (NULL != shared->debug)
-                PR_fprintf(shared->debug, "reading length ... ");
-            bytes = PR_Recv(
-                clientSock, &descriptor, sizeof(descriptor),
-                flags, Timeout(shared));
-            if (sizeof(descriptor) == bytes)
-            {
-                /* and, before doing something stupid ... */
-                descriptor.length = PR_ntohl(descriptor.length);
-                descriptor.checksum = PR_ntohl(descriptor.checksum);
-                if (NULL != shared->debug)
-                    PR_fprintf(shared->debug, "%d bytes ... ", descriptor.length);
-                toread = descriptor.length;
-                if (recv_length < descriptor.length)
-                {
-                    if (NULL != buffer) PR_DELETE(buffer);
-                    buffer = (char*)PR_MALLOC(descriptor.length);
-                    recv_length = descriptor.length;
-                }
-                for (toread = descriptor.length; toread > 0; toread -= bytes)
-                {
-                    bytes = PR_Recv(
-                        clientSock, &buffer[descriptor.length - toread],
-                        toread, flags, Timeout(shared));
-                    if (-1 == bytes)
-                    {
-                        if (NULL != shared->debug)
-                            PR_fprintf(shared->debug, "read data failed...");
-                        bytes = 0;
-                    }
-                }
-            }
-            else if (NULL != shared->debug)
-            {
-                PR_fprintf(shared->debug, "read desciptor failed...");
-                descriptor.length = -1;
-            }
-            if (NULL != shared->debug)
-                PR_fprintf(shared->debug, "closing");
-            rv = PR_Shutdown(clientSock, PR_SHUTDOWN_BOTH);
-            if ((PR_FAILURE == rv) && (NULL != shared->debug))
-            {
-                PR_fprintf(shared->debug, " failed");
-                shared->passed = PR_FALSE;
-            }
-            rv = PR_Close(clientSock);
-            if (PR_FAILURE == rv) if (NULL != shared->debug)
-            {
-                PR_fprintf(shared->debug, " failed");
-                shared->passed = PR_FALSE;
-            }
-            if (descriptor.length > 0)
-            {
-                for (byte = 0; byte < descriptor.length; ++byte)
-                {
-                    PRUint32 overflow = checksum & 0x80000000;
-                    checksum = (checksum << 1);
-                    if (0x00000000 != overflow) checksum += 1;
-                    checksum += buffer[byte];
-                }
-                if ((descriptor.checksum != checksum) && (NULL != shared->debug))
-                {
-                    PR_fprintf(shared->debug, " ... data mismatch");
-                    shared->passed = PR_FALSE;
-                }
-            }
-            else if (0 == descriptor.length)
-            {
-                PR_Lock(shared->ml);
-                shared->status = stopped;
-                PR_NotifyCondVar(shared->cv);
-                PR_Unlock(shared->ml);
-            }
-            if (NULL != shared->debug)
-                PR_fprintf(shared->debug, "\n");
-        }
-        else
-        {
-            if (PR_PENDING_INTERRUPT_ERROR != PR_GetError())
-            {
-                if (NULL != shared->debug) PL_PrintError("Accept");
-                shared->passed = PR_FALSE;
-            }
-        }        
-    } while (running == shared->status);
-    if (NULL != buffer) PR_DELETE(buffer);
-}  /* Accept */
-
-PRIntn Tmoacc(PRIntn argc, char **argv)
-{
-    PRStatus rv;
-    PRIntn exitStatus;
-    PRIntn index;
-	Shared *shared;
-	PLOptStatus os;
-	PRThread **thread;
-    PRNetAddr listenAddr;
-    PRSocketOptionData sockOpt;
-    PRIntn timeout = DEFAULT_TIMEOUT;
-    PRIntn threads = DEFAULT_THREADS;
-    PRIntn backlog = DEFAULT_BACKLOG;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dGb:t:T:R");
-
-    shared = PR_NEWZAP(Shared);
-
-    shared->debug = NULL;
-    shared->passed = PR_TRUE;
-    shared->random = PR_TRUE;
-    shared->status = running;
-    shared->ml = PR_NewLock();
-    shared->cv = PR_NewCondVar(shared->ml);
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-            shared->debug = PR_GetSpecialFD(PR_StandardError);
-            break;
-        case 'G':  /* use global threads */
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'b':  /* size of listen backlog */
-            backlog = atoi(opt->value);
-            break;
-        case 't':  /* number of threads doing accept */
-            threads = atoi(opt->value);
-            break;
-        case 'T':  /* timeout used for network operations */
-            timeout = atoi(opt->value);
-            break;
-        case 'R':  /* randomize the timeout values */
-            shared->random = PR_TRUE;
-            break;
-        default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-    if (0 == threads) threads = DEFAULT_THREADS;
-    if (0 == backlog) backlog = DEFAULT_BACKLOG;
-    if (0 == timeout) timeout = DEFAULT_TIMEOUT;
-    
-    PR_STDIO_INIT();
-    memset(&listenAddr, 0, sizeof(listenAddr));
-    rv = PR_InitializeNetAddr(PR_IpAddrAny, BASE_PORT, &listenAddr);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-    shared->timeout = PR_SecondsToInterval(timeout);
-
-    /* First bind to the socket */
-    shared->listenSock = PR_NewTCPSocket();
-    if (shared->listenSock)
-    {
-        sockOpt.option = PR_SockOpt_Reuseaddr;
-        sockOpt.value.reuse_addr = PR_TRUE;
-        rv = PR_SetSocketOption(shared->listenSock, &sockOpt);
-        PR_ASSERT(PR_SUCCESS == rv);
-        rv = PR_Bind(shared->listenSock, &listenAddr);
-        if (rv != PR_FAILURE)
-        {
-            rv = PR_Listen(shared->listenSock, threads + backlog);
-            if (PR_SUCCESS == rv)
-            {
-                thread = (PRThread**)PR_CALLOC(threads * sizeof(PRThread*));
-                for (index = 0; index < threads; ++index)
-                {
-                    thread[index] = PR_CreateThread(
-                        PR_USER_THREAD, Accept, shared,
-                        PR_PRIORITY_NORMAL, thread_scope,
-                        PR_JOINABLE_THREAD, 0);
-                    PR_ASSERT(NULL != thread[index]);
-                }
-
-                PR_Lock(shared->ml);
-                while (shared->status == running)
-                    PR_WaitCondVar(shared->cv, PR_INTERVAL_NO_TIMEOUT);
-                PR_Unlock(shared->ml);
-                for (index = 0; index < threads; ++index)
-                {
-                    rv = PR_Interrupt(thread[index]);
-                    PR_ASSERT(PR_SUCCESS== rv);
-                    rv = PR_JoinThread(thread[index]);
-                    PR_ASSERT(PR_SUCCESS== rv);
-                }
-                PR_DELETE(thread);
-            }
-            else
-            {
-                if (shared->debug) PL_PrintError("Listen");
-                shared->passed = PR_FALSE;
-            }
-        }
-        else
-        {
-            if (shared->debug) PL_PrintError("Bind");
-            shared->passed = PR_FALSE;
-        }
-
-        PR_Close(shared->listenSock);
-    }
-    else
-    {
-        if (shared->debug) PL_PrintError("Create");
-        shared->passed = PR_FALSE;
-    }
-
-    PR_DestroyCondVar(shared->cv);
-    PR_DestroyLock(shared->ml);
-
-    PR_fprintf(
-        PR_GetSpecialFD(PR_StandardError), "%s\n",
-        ((shared->passed) ? "PASSED" : "FAILED"));
-
-    exitStatus = (shared->passed) ? 0 : 1;
-    PR_DELETE(shared);
-    return exitStatus;
-}
-
-int main(int argc, char **argv)
-{
-    return (PR_VersionCheck(PR_VERSION)) ?
-        PR_Initialize(Tmoacc, argc, argv, 4) : -1;
-}  /* main */
-
-/* tmoacc */
diff --git a/libs/js/nsprpub/pr/tests/tmocon.c b/libs/js/nsprpub/pr/tests/tmocon.c
deleted file mode 100644
index 269e300312..0000000000
--- a/libs/js/nsprpub/pr/tests/tmocon.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Portable Runtime (NSPR).
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-/***********************************************************************
-**
-** Name: tmocon.c
-**
-** Description: test client socket connection.
-**
-** Modification History:
-** 19-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
-**	         The debug mode will print all of the printfs associated with this test.
-**			 The regress mode will be the default mode. Since the regress tool limits
-**           the output to a one line status:PASS or FAIL,all of the printf statements
-**			 have been handled with an if (debug_mode) statement. 
-***********************************************************************/
-
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "nspr.h"
-#include "pprio.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* for getcwd */
-#if defined(XP_UNIX) || defined (XP_OS2_EMX) || defined(XP_BEOS)
-#include <unistd.h>
-#elif defined(XP_PC)
-#include <direct.h>
-#endif
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-
-#define BASE_PORT 9867
-
-#define DEFAULT_DALLY 1
-#define DEFAULT_THREADS 1
-#define DEFAULT_TIMEOUT 10
-#define DEFAULT_MESSAGES 100
-#define DEFAULT_MESSAGESIZE 100
-
-static PRFileDesc *debug_out = NULL;
-
-typedef struct Shared
-{
-    PRBool random;
-    PRBool failed;
-    PRBool intermittant;
-    PRIntn debug;
-    PRInt32 messages;
-    PRIntervalTime dally;
-    PRIntervalTime timeout;
-    PRInt32 message_length;
-    PRNetAddr serverAddress;
-} Shared;
-
-static PRIntervalTime Timeout(const Shared *shared)
-{
-    PRIntervalTime timeout = shared->timeout;
-    if (shared->random)
-    {
-        PRIntervalTime quarter = timeout >> 2;  /* one quarter of the interval */
-        PRUint32 random = rand() % quarter;  /* something in[0..timeout / 4) */
-        timeout = (((3 * quarter) + random) >> 2) + quarter;  /* [75..125)% */
-    }
-    return timeout;
-}  /* Timeout */
-
-static void CauseTimeout(const Shared *shared)
-{
-    if (shared->intermittant) PR_Sleep(Timeout(shared));
-}  /* CauseTimeout */
-
-static PRStatus MakeReceiver(Shared *shared)
-{
-    PRStatus rv = PR_FAILURE;
-    if (PR_IsNetAddrType(&shared->serverAddress, PR_IpAddrLoopback))
-    {
-        char *argv[3];
-        char path[1024 + sizeof("/tmoacc")];
-        (void)getcwd(path, sizeof(path));
-        (void)strcat(path, "/tmoacc");
-#ifdef XP_PC
-        (void)strcat(path, ".exe");
-#endif
-        argv[0] = path;
-        if (shared->debug > 0)
-        {
-            argv[1] = "-d";
-            argv[2] = NULL;
-        }
-        else argv[1] = NULL;
-        if (shared->debug > 1)
-            PR_fprintf(debug_out, " creating accept process %s ...", path);
-        fflush(stdout);
-        rv = PR_CreateProcessDetached(path, argv, NULL, NULL);
-        if (PR_SUCCESS == rv)
-        {
-            if (shared->debug > 1)
-                PR_fprintf(debug_out, " wait 5 seconds");
-            if (shared->debug > 1)
-                PR_fprintf(debug_out, " before connecting to accept process ...");
-            fflush(stdout);
-            PR_Sleep(PR_SecondsToInterval(5));
-            return rv;
-        }
-        shared->failed = PR_TRUE;
-        if (shared->debug > 0)
-            PL_FPrintError(debug_out, "PR_CreateProcessDetached failed");
-    }
-    return rv;
-}  /* MakeReceiver */
-
-static void Connect(void *arg)
-{
-    PRStatus rv;
-    char *buffer = NULL;
-    PRFileDesc *clientSock;
-    Shared *shared = (Shared*)arg;
-    PRInt32 loop, bytes, flags = 0;
-    struct Descriptor { PRInt32 length; PRUint32 checksum; } descriptor;
-    debug_out = (0 == shared->debug) ? NULL : PR_GetSpecialFD(PR_StandardError);
-
-    buffer = (char*)PR_MALLOC(shared->message_length);
-
-    for (bytes = 0; bytes < shared->message_length; ++bytes)
-        buffer[bytes] = (char)bytes;
-
-    descriptor.checksum = 0;
-    for (bytes = 0; bytes < shared->message_length; ++bytes)
-    {
-        PRUint32 overflow = descriptor.checksum & 0x80000000;
-        descriptor.checksum = (descriptor.checksum << 1);
-        if (0x00000000 != overflow) descriptor.checksum += 1;
-        descriptor.checksum += buffer[bytes];
-    }
-    descriptor.checksum = PR_htonl(descriptor.checksum);
-
-    for (loop = 0; loop < shared->messages; ++loop)
-    {
-        if (shared->debug > 1)
-            PR_fprintf(debug_out, "[%d]socket ... ", loop);
-        clientSock = PR_NewTCPSocket();
-        if (clientSock)
-        {
-            /*
-             * We need to slow down the rate of generating connect requests,
-             * otherwise the listen backlog queue on the accept side may
-             * become full and we will get connection refused or timeout
-             * error.
-             */
-
-            PR_Sleep(shared->dally);
-            if (shared->debug > 1)
-            {
-                char buf[128];
-                PR_NetAddrToString(&shared->serverAddress, buf, sizeof(buf));
-                PR_fprintf(debug_out, "connecting to %s ... ", buf);
-            }
-            rv = PR_Connect(
-                clientSock, &shared->serverAddress, Timeout(shared));
-            if (PR_SUCCESS == rv)
-            {
-                PRInt32 descriptor_length = (loop < (shared->messages - 1)) ?
-                    shared->message_length : 0;
-                descriptor.length = PR_htonl(descriptor_length);
-                if (shared->debug > 1)
-                    PR_fprintf(
-                        debug_out, "sending %d bytes ... ", descriptor_length);
-                CauseTimeout(shared);  /* might cause server to timeout */
-                bytes = PR_Send(
-                    clientSock, &descriptor, sizeof(descriptor),
-                    flags, Timeout(shared));
-                if (bytes != sizeof(descriptor))
-                {
-                    shared->failed = PR_TRUE;
-                    if (shared->debug > 0)
-                        PL_FPrintError(debug_out, "PR_Send failed");
-                }
-                if (0 != descriptor_length)
-                {
-                    CauseTimeout(shared);
-                    bytes = PR_Send(
-                        clientSock, buffer, descriptor_length,
-                        flags, Timeout(shared));
-                    if (bytes != descriptor_length)
-                    {
-                        shared->failed = PR_TRUE;
-                        if (shared->debug > 0)
-                            PL_FPrintError(debug_out, "PR_Send failed");
-                    }
-                }
-                if (shared->debug > 1) PR_fprintf(debug_out, "closing ... ");
-                rv = PR_Shutdown(clientSock, PR_SHUTDOWN_BOTH);
-                rv = PR_Close(clientSock);
-                if (shared->debug > 1)
-                {
-                    if (PR_SUCCESS == rv) PR_fprintf(debug_out, "\n");
-                    else PL_FPrintError(debug_out, "shutdown failed");
-                }
-            }
-            else
-            {
-                if (shared->debug > 1) PL_FPrintError(debug_out, "connect failed");
-                PR_Close(clientSock);
-                if ((loop == 0) && (PR_GetError() == PR_CONNECT_REFUSED_ERROR))
-                {
-                    if (MakeReceiver(shared) == PR_FAILURE) break;
-                }
-                else
-                {
-                    if (shared->debug > 1) PR_fprintf(debug_out, " exiting\n");
-                    break;
-                }
-            }
-        }
-        else
-        {
-            shared->failed = PR_TRUE;
-            if (shared->debug > 0) PL_FPrintError(debug_out, "create socket");
-            break;
-        }
-    }
-
-    PR_DELETE(buffer);
-}  /* Connect */
-
-int Tmocon(int argc, char **argv)
-{
-    /*
-     * USAGE
-     * -d       turn on debugging output                (default = off)
-     * -v       turn on verbose output                  (default = off)
-     * -h <n>   dns name of host serving the connection (default = self)
-     * -i       dally intermittantly to cause timeouts  (default = off)
-     * -m <n>   number of messages to send              (default = 100)
-     * -s <n>   size of each message                    (default = 100)
-     * -t <n>   number of threads sending               (default = 1)
-     * -G       use global threads                      (default = local)
-     * -T <n>   timeout on I/O operations (seconds)     (default = 10)
-     * -D <n>   dally between connect requests (seconds)(default = 0)
-     * -R       randomize the dally types around 'T'    (default = no)
-     */
-
-    PRStatus rv;
-    int exitStatus;
-    PLOptStatus os;
-    Shared *shared = NULL;
-    PRThread **thread = NULL;
-    PRIntn index, threads = DEFAULT_THREADS;
-    PRThreadScope thread_scope = PR_LOCAL_THREAD;
-    PRInt32 dally = DEFAULT_DALLY, timeout = DEFAULT_TIMEOUT;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "divGRh:m:s:t:T:D:");
-
-    shared = PR_NEWZAP(Shared);
-
-    shared->debug = 0;
-    shared->failed = PR_FALSE;
-    shared->random = PR_FALSE;
-    shared->messages = DEFAULT_MESSAGES;
-    shared->message_length = DEFAULT_MESSAGESIZE;
-
-    PR_STDIO_INIT();
-    memset(&shared->serverAddress, 0, sizeof(shared->serverAddress));
-    rv = PR_InitializeNetAddr(PR_IpAddrLoopback, BASE_PORT, &shared->serverAddress);
-    PR_ASSERT(PR_SUCCESS == rv);
-    
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':
-            if (0 == shared->debug) shared->debug = 1;
-            break;
-        case 'v':
-            if (0 == shared->debug) shared->debug = 2;
-            break;
-        case 'i':
-            shared->intermittant = PR_TRUE;
-            break;
-        case 'R':
-            shared->random = PR_TRUE;
-            break;
-        case 'G':
-            thread_scope = PR_GLOBAL_THREAD;
-            break;
-        case 'h':  /* the value for backlock */
-            {
-                PRIntn es = 0;
-                PRHostEnt host;
-                char buffer[1024];
-                (void)PR_GetHostByName(
-                    opt->value, buffer, sizeof(buffer), &host);
-                es = PR_EnumerateHostEnt(
-                    es, &host, BASE_PORT, &shared->serverAddress);
-                PR_ASSERT(es > 0);
-            }
-            break;
-        case 'm':  /* number of messages to send */
-            shared->messages = atoi(opt->value);
-            break;
-        case 't':  /* number of threads sending */
-            threads = atoi(opt->value);
-            break;
-        case 'D':  /* dally time between transmissions */
-            dally = atoi(opt->value);
-            break;
-        case 'T':  /* timeout on I/O operations */
-            timeout = atoi(opt->value);
-            break;
-        case 's':  /* total size of each message */
-            shared->message_length = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-        PL_DestroyOptState(opt);
-
-    if (0 == timeout) timeout = DEFAULT_TIMEOUT;
-    if (0 == threads) threads = DEFAULT_THREADS;
-    if (0 == shared->messages) shared->messages = DEFAULT_MESSAGES;
-    if (0 == shared->message_length) shared->message_length = DEFAULT_MESSAGESIZE;
-
-    shared->dally = PR_SecondsToInterval(dally);
-    shared->timeout = PR_SecondsToInterval(timeout);
-
-    thread = (PRThread**)PR_CALLOC(threads * sizeof(PRThread*));
-
-    for (index = 0; index < threads; ++index)
-        thread[index] = PR_CreateThread(
-            PR_USER_THREAD, Connect, shared,
-            PR_PRIORITY_NORMAL, thread_scope,
-            PR_JOINABLE_THREAD, 0);
-    for (index = 0; index < threads; ++index)
-        rv = PR_JoinThread(thread[index]);
-
-    PR_DELETE(thread);
-
-    PR_fprintf(
-        PR_GetSpecialFD(PR_StandardError), "%s\n",
-        ((shared->failed) ? "FAILED" : "PASSED"));
-    exitStatus = (shared->failed) ? 1 : 0;
-    PR_DELETE(shared);
-    return exitStatus;
-}
-
-int main(int argc, char **argv)
-{
-    return (PR_VersionCheck(PR_VERSION)) ?
-        PR_Initialize(Tmocon, argc, argv, 4) : -1;
-}  /* main */
-
-/* tmocon.c */
-
-
diff --git a/libs/js/nsprpub/pr/tests/tpd.c b/libs/js/nsprpub/pr/tests/tpd.c
deleted file mode 100644
index c9bc5c7820..0000000000
--- a/libs/js/nsprpub/pr/tests/tpd.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:        tpd.c
-** Description: Exercising the thread private data bailywick.
-*/
-
-#include "prmem.h"
-#include "prinit.h"
-#include "prlog.h"
-#include "prprf.h"
-#include "prthread.h"
-#include "prtypes.h"
-
-#if defined(XP_MAC)
-#include "pprio.h"
-#else
-#include "private/pprio.h"
-#endif
-
-#include "plgetopt.h"
-
-static PRUintn key[128];
-static PRIntn debug = 0;
-static PRBool failed = PR_FALSE;
-static PRBool should = PR_TRUE;
-static PRBool did = PR_TRUE;
-static PRFileDesc *fout = NULL;
-
-static void PrintProgress(PRIntn line)
-{
-    failed = failed || (should && !did);
-    failed = failed || (!should && did);
-    if (debug > 0)
-    {
-#if defined(WIN16)
-        printf(
-            "@ line %d destructor should%s have been called and was%s\n",
-            line, ((should) ? "" : " NOT"), ((did) ? "" : " NOT"));
-#else    
-        PR_fprintf(
-            fout, "@ line %d destructor should%s have been called and was%s\n",
-            line, ((should) ? "" : " NOT"), ((did) ? "" : " NOT"));
-#endif
-    }
-}  /* PrintProgress */
-
-static void MyAssert(const char *expr, const char *file, PRIntn line)
-{
-    if (debug > 0)
-        (void)PR_fprintf(fout, "'%s' in file: %s: %d\n", expr, file, line);
-}  /* MyAssert */
-
-#define MY_ASSERT(_expr) \
-    ((_expr)?((void)0):MyAssert(# _expr,__FILE__,__LINE__))
-
-
-static void PR_CALLBACK Destructor(void *data)
-{
-    MY_ASSERT(NULL != data);
-    if (should) did = PR_TRUE;
-    else failed = PR_TRUE;
-    /*
-     * We don't actually free the storage since it's actually allocated
-     * on the stack. Normally, this would not be the case and this is
-     * the opportunity to free whatever.
-    PR_Free(data);
-     */
-}  /* Destructor */
-
-static void PR_CALLBACK Thread(void *null)
-{
-    void *pd;
-    PRStatus rv;
-    PRUintn keys;
-    char *key_string[] = {
-        "Key #0", "Key #1", "Key #2", "Key #3",
-        "Bogus #5", "Bogus #6", "Bogus #7", "Bogus #8"};
-    
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 8; ++keys)
-    {
-        pd = PR_GetThreadPrivate(key[keys]);
-        MY_ASSERT(NULL == pd);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 4; keys < 8; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_FAILURE == rv);
-    }
-    PrintProgress(__LINE__);
-    
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], "EXTENSION");
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-
-    /* put in keys and leave them there for thread exit */
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-    did = PR_FALSE; should = PR_TRUE;
-
-}  /* Thread */
-
-static PRIntn PR_CALLBACK Tpd(PRIntn argc, char **argv)
-{
-    void *pd;
-    PRStatus rv;
-    PRUintn keys;
-    PRThread *thread;
-    char *key_string[] = {
-        "Key #0", "Key #1", "Key #2", "Key #3",
-        "Bogus #5", "Bogus #6", "Bogus #7", "Bogus #8"};
-    
-    fout = PR_STDOUT;
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_NewThreadPrivateIndex(&key[keys], Destructor);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 8; ++keys)
-    {
-        pd = PR_GetThreadPrivate(key[keys]);
-        MY_ASSERT(NULL == pd);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    for (keys = 4; keys < 8; ++keys)
-		key[keys] = 4096;		/* set to invalid value */
-    did = should = PR_FALSE;
-    for (keys = 4; keys < 8; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_FAILURE == rv);
-    }
-    PrintProgress(__LINE__);
-    
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], key_string[keys]);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 0; keys < 4; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_NewThreadPrivateIndex(&key[keys], Destructor);
-        MY_ASSERT(PR_SUCCESS == rv);
-        rv = PR_SetThreadPrivate(key[keys], "EXTENSION");
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = PR_FALSE; should = PR_TRUE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-    PrintProgress(__LINE__);
-
-    did = should = PR_FALSE;
-    for (keys = 8; keys < 127; ++keys)
-    {
-        rv = PR_SetThreadPrivate(key[keys], NULL);
-        MY_ASSERT(PR_SUCCESS == rv);
-    }
-
-    thread = PR_CreateThread(
-        PR_USER_THREAD, Thread, NULL, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    (void)PR_JoinThread(thread);
-
-    PrintProgress(__LINE__);
-
-#if defined(WIN16)
-    printf(
-        "%s\n",((PR_TRUE == failed) ? "FAILED" : "PASSED"));
-#else
-    (void)PR_fprintf(
-        fout, "%s\n",((PR_TRUE == failed) ? "FAILED" : "PASSED"));
-#endif    
-
-    return 0;
-
-}  /* Tpd */
-
-PRIntn main(PRIntn argc, char *argv[])
-{
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dl:r:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-    PR_STDIO_INIT();
-    return PR_Initialize(Tpd, argc, argv, 0);
-}  /* main */
-
-/* tpd.c */
diff --git a/libs/js/nsprpub/pr/tests/udpsrv.c b/libs/js/nsprpub/pr/tests/udpsrv.c
deleted file mode 100644
index b9b615a249..0000000000
--- a/libs/js/nsprpub/pr/tests/udpsrv.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*******************************************************************
-** udpsrc.c -- Test basic function of UDP server
-**
-** udpsrv operates on the same machine with program udpclt.
-** udpsrv is the server side of a udp sockets application.
-** udpclt is the client side of a udp sockets application.
-**
-** The test is designed to assist developers in porting/debugging
-** the UDP socket functions of NSPR.
-**
-** This test is not a stress test.
-**
-** main() starts two threads: UDP_Server() and UDP_Client();
-** main() uses PR_JoinThread() to wait for the threads to complete.
-**
-** UDP_Server() does repeated recvfrom()s from a socket.
-** He detects an EOF condition set by UDP_Client(). For each
-** packet received by UDP_Server(), he checks its content for
-** expected content, then sends the packet back to UDP_Client().
-** 
-** UDP_Client() sends packets to UDP_Server() using sendto()
-** he recieves packets back from the server via recvfrom().
-** After he sends enough packets containing UDP_AMOUNT_TO_WRITE
-** bytes of data, he sends an EOF message.
-** 
-** The test issues a pass/fail message at end.
-** 
-** Notes:
-** The variable "_debug_on" can be set to 1 to cause diagnostic
-** messages related to client/server synchronization. Useful when
-** the test hangs.
-** 
-** Error messages are written to stdout.
-** 
-********************************************************************
-*/
-/* --- include files --- */
-#include "nspr.h"
-#include "prpriv.h"
-
-#include "plgetopt.h"
-#include "prttools.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef XP_PC
-#define mode_t int
-#endif
-
-#define UDP_BUF_SIZE            4096
-#define UDP_DGRAM_SIZE          128
-#define UDP_AMOUNT_TO_WRITE     (PRInt32)((UDP_DGRAM_SIZE * 1000l) +1)
-#define NUM_UDP_CLIENTS         1
-#define NUM_UDP_DATAGRAMS_PER_CLIENT    5
-#define UDP_SERVER_PORT         9050
-#define UDP_CLIENT_PORT         9053
-#define MY_INADDR               PR_INADDR_ANY
-#define PEER_INADDR             PR_INADDR_LOOPBACK
-
-#define UDP_TIMEOUT             400000
-/* #define UDP_TIMEOUT             PR_INTERVAL_NO_TIMEOUT */
-
-/* --- static data --- */
-static PRIntn _debug_on      = 0;
-static PRBool passed         = PR_TRUE;
-static PRUint32 cltBytesRead = 0;
-static PRUint32 srvBytesRead = 0;
-static PRFileDesc *output    = NULL;
-
-/* --- static function declarations --- */
-#define DPRINTF(arg) if (_debug_on) PR_fprintf(output, arg)
-
-
-
-/*******************************************************************
-** ListNetAddr() -- Display the Net Address on stdout
-**
-** Description: displays the component parts of a PRNetAddr struct
-**
-** Arguments:   address of PRNetAddr structure to display
-**
-** Returns: void
-**
-** Notes:
-**
-********************************************************************
-*/
-void ListNetAddr( char *msg, PRNetAddr *na )
-{
-    char    mbuf[256];
-    
-    sprintf( mbuf, "ListNetAddr: %s family: %d, port: %d, ip: %8.8X\n",
-            msg, na->inet.family, PR_ntohs( na->inet.port), PR_ntohl(na->inet.ip) );
-#if 0            
-    DPRINTF( mbuf );            
-#endif
-} /* --- end ListNetAddr() --- */
-
-/********************************************************************
-** UDP_Server() -- Test a UDP server application
-**
-** Description: The Server side of a UDP Client/Server application.
-**
-** Arguments: none
-**
-** Returns: void
-**
-** Notes:
-**
-**
-********************************************************************
-*/
-static void PR_CALLBACK UDP_Server( void *arg )
-{
-    static char     svrBuf[UDP_BUF_SIZE];
-    PRFileDesc      *svrSock;
-    PRInt32         rv;
-    PRNetAddr       netaddr;
-    PRBool          bound = PR_FALSE;
-    PRBool          endOfInput = PR_FALSE;
-    PRInt32         numBytes = UDP_DGRAM_SIZE;
-    
-    DPRINTF("udpsrv: UDP_Server(): starting\n" );
-
-    /* --- Create the socket --- */
-    DPRINTF("udpsrv: UDP_Server(): Creating UDP Socket\n" );
-    svrSock = PR_NewUDPSocket();
-    if ( svrSock == NULL )
-    {
-        passed = PR_FALSE;
-        if (debug_mode)
-            PR_fprintf(output,
-                "udpsrv: UDP_Server(): PR_NewUDPSocket() returned NULL\n" );
-        return;
-    }
-    
-    /* --- Initialize the sockaddr_in structure --- */
-    memset( &netaddr, 0, sizeof( netaddr )); 
-    netaddr.inet.family = PR_AF_INET;
-    netaddr.inet.port   = PR_htons( UDP_SERVER_PORT );
-    netaddr.inet.ip     = PR_htonl( MY_INADDR );
-    
-    /* --- Bind the socket --- */
-    while ( !bound )
-    {
-        DPRINTF("udpsrv: UDP_Server(): Binding socket\n" );
-        rv = PR_Bind( svrSock, &netaddr );
-        if ( rv < 0 )
-        {
-            if ( PR_GetError() == PR_ADDRESS_IN_USE_ERROR )
-            {
-                if (debug_mode) PR_fprintf(output, "udpsrv: UDP_Server(): \
-						PR_Bind(): reports: PR_ADDRESS_IN_USE_ERROR\n");
-                PR_Sleep( PR_MillisecondsToInterval( 2000 ));
-                continue;
-            }
-            else
-            {
-                passed = PR_FALSE;
-                if (debug_mode) PR_fprintf(output, "udpsrv: UDP_Server(): \
-						PR_Bind(): failed: %ld with error: %ld\n",
-                        rv, PR_GetError() );
-                PR_Close( svrSock );
-                return;
-            }
-        }
-        else
-            bound = PR_TRUE;
-    }
-    ListNetAddr( "UDP_Server: after bind", &netaddr );
-    
-    /* --- Recv the socket --- */
-    while( !endOfInput )
-    {
-        DPRINTF("udpsrv: UDP_Server(): RecvFrom() socket\n" );
-        rv = PR_RecvFrom( svrSock, svrBuf, numBytes, 0, &netaddr, UDP_TIMEOUT );
-        if ( rv == -1 )
-        {
-            passed = PR_FALSE;
-            if (debug_mode)
-                PR_fprintf(output,
-                    "udpsrv: UDP_Server(): PR_RecvFrom(): failed with error: %ld\n",
-                    PR_GetError() );
-            PR_Close( svrSock );
-            return;
-        }
-        ListNetAddr( "UDP_Server after RecvFrom", &netaddr );
-        
-        srvBytesRead += rv;
-        
-        if ( svrBuf[0] == 'E' )
-        {
-            DPRINTF("udpsrv: UDP_Server(): EOF on input detected\n" );
-            endOfInput = PR_TRUE;
-        }
-            
-        /* --- Send the socket --- */
-        DPRINTF("udpsrv: UDP_Server(): SendTo(): socket\n" );
-        rv = PR_SendTo( svrSock, svrBuf, rv, 0, &netaddr, PR_INTERVAL_NO_TIMEOUT );
-        if ( rv == -1 )
-        {
-            passed = PR_FALSE;
-            if (debug_mode)
-                PR_fprintf(output,
-                    "udpsrv: UDP_Server(): PR_SendTo(): failed with error: %ld\n",
-                    PR_GetError() );
-            PR_Close( svrSock );
-            return;
-        }
-        ListNetAddr( "UDP_Server after SendTo", &netaddr );
-    }
-    
-    /* --- Close the socket --- */
-    DPRINTF("udpsrv: UDP_Server(): Closing socket\n" );
-    rv = PR_Close( svrSock );
-    if ( rv != PR_SUCCESS )
-    {
-        passed = PR_FALSE;
-        if (debug_mode)
-            PR_fprintf(output,
-                "udpsrv: UDP_Server(): PR_Close(): failed to close socket\n" );
-        return;
-    }
-    
-    DPRINTF("udpsrv: UDP_Server(): Normal end\n" );
-} /* --- end UDP_Server() --- */
-
-
-static char         cltBuf[UDP_BUF_SIZE];
-static char         cltBufin[UDP_BUF_SIZE];
-/********************************************************************
-** UDP_Client() -- Test a UDP client application
-**
-** Description:
-**
-** Arguments:
-**
-**
-** Returns:
-** 0 -- Successful execution
-** 1 -- Test failed.
-**
-** Notes:
-**
-**
-********************************************************************
-*/
-static void PR_CALLBACK UDP_Client( void *arg )
-{
-    PRFileDesc   *cltSock;
-    PRInt32      rv;
-    PRBool       bound = PR_FALSE;
-    PRNetAddr    netaddr;
-    PRNetAddr    netaddrx;
-    PRBool       endOfInput = PR_FALSE;
-    PRInt32      numBytes = UDP_DGRAM_SIZE;
-    PRInt32      writeThisMany = UDP_AMOUNT_TO_WRITE;
-    int          i;
-    
-    
-    DPRINTF("udpsrv: UDP_Client(): starting\n" );
-    
-    /* --- Create the socket --- */
-    cltSock = PR_NewUDPSocket();
-    if ( cltSock == NULL )
-    {
-        passed = PR_FALSE;
-        if (debug_mode)
-            PR_fprintf(output,
-                "udpsrv: UDP_Client(): PR_NewUDPSocket() returned NULL\n" );
-        return;
-    }
-    
-    /* --- Initialize the sockaddr_in structure --- */
-    memset( &netaddr, 0, sizeof( netaddr )); 
-    netaddr.inet.family = PR_AF_INET;
-    netaddr.inet.ip     = PR_htonl( MY_INADDR );
-    netaddr.inet.port   = PR_htons( UDP_CLIENT_PORT );
-    
-    /* --- Initialize the write buffer --- */    
-    for ( i = 0; i < UDP_BUF_SIZE ; i++ )
-        cltBuf[i] = i;
-    
-    /* --- Bind the socket --- */
-    while ( !bound )
-    {
-        DPRINTF("udpsrv: UDP_Client(): Binding socket\n" );
-        rv = PR_Bind( cltSock, &netaddr );
-        if ( rv < 0 )
-        {
-            if ( PR_GetError() == PR_ADDRESS_IN_USE_ERROR )
-            {
-                if (debug_mode)
-                    PR_fprintf(output,
-                        "udpsrv: UDP_Client(): PR_Bind(): reports: PR_ADDRESS_IN_USE_ERROR\n");
-                PR_Sleep( PR_MillisecondsToInterval( 2000 ));
-                continue;
-            }
-            else
-            {
-                passed = PR_FALSE;
-                if (debug_mode)
-                    PR_fprintf(output,
-                        "udpsrv: UDP_Client(): PR_Bind(): failed: %ld with error: %ld\n",
-                        rv, PR_GetError() );
-                PR_Close( cltSock );
-                return;
-            }
-        }
-        else
-            bound = PR_TRUE;
-    }
-    ListNetAddr( "UDP_Client after Bind", &netaddr );
-    
-    /* --- Initialize the sockaddr_in structure --- */
-    memset( &netaddr, 0, sizeof( netaddr )); 
-    netaddr.inet.family = PR_AF_INET;
-    netaddr.inet.ip     = PR_htonl( PEER_INADDR );
-    netaddr.inet.port   = PR_htons( UDP_SERVER_PORT );
-    
-    /* --- send and receive packets until no more data left */    
-    while( !endOfInput )
-    {
-        /*
-        ** Signal EOF in the data stream on the last packet
-        */        
-        if ( writeThisMany <= UDP_DGRAM_SIZE )
-        {
-            DPRINTF("udpsrv: UDP_Client(): Send EOF packet\n" );
-            cltBuf[0] = 'E';
-            endOfInput = PR_TRUE;
-        }
-        
-        /* --- SendTo the socket --- */
-        if ( writeThisMany > UDP_DGRAM_SIZE )
-            numBytes = UDP_DGRAM_SIZE;
-        else
-            numBytes = writeThisMany;
-        writeThisMany -= numBytes;
-        {
-            char   mbuf[256];
-            sprintf( mbuf, "udpsrv: UDP_Client(): write_this_many: %d, numbytes: %d\n", 
-                writeThisMany, numBytes );
-            DPRINTF( mbuf );
-        }
-        
-        DPRINTF("udpsrv: UDP_Client(): SendTo(): socket\n" );
-        rv = PR_SendTo( cltSock, cltBuf, numBytes, 0, &netaddr, UDP_TIMEOUT );
-        if ( rv == -1 )
-        {
-            passed = PR_FALSE;
-            if (debug_mode)
-                PR_fprintf(output,
-                    "udpsrv: UDP_Client(): PR_SendTo(): failed with error: %ld\n",
-                        PR_GetError() );
-            PR_Close( cltSock );
-            return;
-        }
-        ListNetAddr( "UDP_Client after SendTo", &netaddr );
-
-        /* --- RecvFrom the socket --- */
-        memset( cltBufin, 0, UDP_BUF_SIZE );
-        DPRINTF("udpsrv: UDP_Client(): RecvFrom(): socket\n" );
-        rv = PR_RecvFrom( cltSock, cltBufin, numBytes, 0, &netaddrx, UDP_TIMEOUT );
-        if ( rv == -1 )
-        {
-            passed = PR_FALSE;
-            if (debug_mode) PR_fprintf(output,
-                "udpsrv: UDP_Client(): PR_RecvFrom(): failed with error: %ld\n",
-                   PR_GetError() );
-            PR_Close( cltSock );
-            return;
-        }
-        ListNetAddr( "UDP_Client after RecvFrom()", &netaddr );
-        cltBytesRead += rv;
-        
-        /* --- verify buffer --- */
-        for ( i = 0; i < rv ; i++ )
-        {
-            if ( cltBufin[i] != i )
-            {
-                /* --- special case, end of input --- */
-                if ( endOfInput && i == 0 && cltBufin[0] == 'E' )
-                    continue;
-                passed = PR_FALSE;
-                if (debug_mode) PR_fprintf(output,
-                    "udpsrv: UDP_Client(): return data mismatch\n" );
-                PR_Close( cltSock );
-                return;
-            }
-        }
-        if (debug_mode) PR_fprintf(output, ".");
-    }
-    
-    /* --- Close the socket --- */
-    DPRINTF("udpsrv: UDP_Server(): Closing socket\n" );
-    rv = PR_Close( cltSock );
-    if ( rv != PR_SUCCESS )
-    {
-        passed = PR_FALSE;
-        if (debug_mode) PR_fprintf(output,
-            "udpsrv: UDP_Client(): PR_Close(): failed to close socket\n" );
-        return;
-    }
-    DPRINTF("udpsrv: UDP_Client(): ending\n" );
-} /* --- end UDP_Client() --- */
-
-/********************************************************************
-** main() -- udpsrv
-**
-** arguments:
-**
-** Returns:
-** 0 -- Successful execution
-** 1 -- Test failed.
-**
-** Description:
-**
-** Standard test case setup.
-**
-** Calls the function UDP_Server()
-**
-********************************************************************
-*/
-
-int main(int argc, char **argv)
-{
-    PRThread    *srv, *clt;
-/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d -v
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dv");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = 1;
-            break;
-        case 'v':  /* verbose mode */
-			_debug_on = 1;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-		
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    PR_STDIO_INIT();
-    output = PR_STDERR;
-
-#ifdef XP_MAC
-    SetupMacPrintfLog("udpsrv.log");
-#endif
-
-    PR_SetConcurrency(4);
-    
-    /*
-    ** Create the Server thread
-    */    
-    DPRINTF( "udpsrv: Creating Server Thread\n" );
-    srv =  PR_CreateThread( PR_USER_THREAD,
-            UDP_Server,
-            (void *) 0,
-            PR_PRIORITY_LOW,
-            PR_LOCAL_THREAD,
-            PR_JOINABLE_THREAD,
-            0 );
-    if ( srv == NULL )
-    {
-        if (debug_mode) PR_fprintf(output, "udpsrv: Cannot create server thread\n" );
-        passed = PR_FALSE;
-    }
-    
-    /*
-    ** Give the Server time to Start
-    */    
-    DPRINTF( "udpsrv: Pausing to allow Server to start\n" );
-    PR_Sleep( PR_MillisecondsToInterval(200) );
-    
-    /*
-    ** Create the Client thread
-    */    
-    DPRINTF( "udpsrv: Creating Client Thread\n" );
-    clt = PR_CreateThread( PR_USER_THREAD,
-            UDP_Client,
-            (void *) 0,
-            PR_PRIORITY_LOW,
-            PR_LOCAL_THREAD,
-            PR_JOINABLE_THREAD,
-            0 );
-    if ( clt == NULL )
-    {
-        if (debug_mode) PR_fprintf(output, "udpsrv: Cannot create server thread\n" );
-        passed = PR_FALSE;
-    }
-    
-    /*
-    **
-    */
-    DPRINTF("udpsrv: Waiting to join Server & Client Threads\n" );
-    PR_JoinThread( srv );
-    PR_JoinThread( clt );    
-    
-    /*
-    ** Evaluate test results
-    */
-    if (debug_mode) PR_fprintf(output, "\n\nudpsrv: main(): cltBytesRead(%ld), \
-		srvBytesRead(%ld), expected(%ld)\n",
-         cltBytesRead, srvBytesRead, UDP_AMOUNT_TO_WRITE );
-    if ( cltBytesRead != srvBytesRead || cltBytesRead != UDP_AMOUNT_TO_WRITE )
-    {
-        passed = PR_FALSE;
-    }
-    PR_Cleanup();
-    if ( passed )
-        return 0;
-    else
-		return 1;
-} /* --- end main() --- */
diff --git a/libs/js/nsprpub/pr/tests/ut_ttools.h b/libs/js/nsprpub/pr/tests/ut_ttools.h
deleted file mode 100644
index dc38f316a0..0000000000
--- a/libs/js/nsprpub/pr/tests/ut_ttools.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Used in Regress Tool */
-#define NOSTATUS 2
-#define PASS 1
-#define FAIL 0
-
-PRIntn debug_mode=0;
diff --git a/libs/js/nsprpub/pr/tests/vercheck.c b/libs/js/nsprpub/pr/tests/vercheck.c
deleted file mode 100644
index 2a335bb12d..0000000000
--- a/libs/js/nsprpub/pr/tests/vercheck.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * File: vercheck.c
- *
- * Description:
- * This test tests the PR_VersionCheck() function.  The
- * compatible_version and incompatible_version arrays
- * need to be updated for each patch or release.
- *
- * Tested areas: library version compatibility check.
- */
-
-#include "prinit.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * This release (4.7) is backward compatible with the
- * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, and 4.6.x releases.
- * It, of course, is compatible with itself.
- */
-static char *compatible_version[] = {
-    "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
-    "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1",
-    "4.5", "4.5.1", "4.6", "4.6.1", PR_VERSION
-};
-
-/*
- * This release is not backward compatible with the old
- * NSPR 2.1 and 3.x releases.
- *
- * Any release is incompatible with future releases and
- * patches.
- */
-static char *incompatible_version[] = {
-    "2.1 19980529",
-    "3.0", "3.0.1",
-    "3.1", "3.1.1", "3.1.2", "3.1.3",
-    "3.5", "3.5.1",
-    "4.7.3",
-    "4.8", "4.8.1",
-    "10.0", "11.1", "12.14.20"
-};
-
-int main()
-{
-    int idx;
-    int num_compatible = sizeof(compatible_version) / sizeof(char *);
-    int num_incompatible = sizeof(incompatible_version) / sizeof(char *);
-
-    printf("NSPR release %s:\n", PR_VERSION);
-    for (idx = 0; idx < num_compatible; idx++) {
-        if (PR_VersionCheck(compatible_version[idx]) == PR_FALSE) {
-            fprintf(stderr, "Should be compatible with version %s\n",
-                    compatible_version[idx]);
-            exit(1);
-        }
-        printf("Compatible with version %s\n", compatible_version[idx]);
-    }
-
-    for (idx = 0; idx < num_incompatible; idx++) {
-        if (PR_VersionCheck(incompatible_version[idx]) == PR_TRUE) {
-            fprintf(stderr, "Should be incompatible with version %s\n",
-                    incompatible_version[idx]);
-            exit(1);
-        }
-        printf("Incompatible with version %s\n", incompatible_version[idx]);
-    }
-
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/version.c b/libs/js/nsprpub/pr/tests/version.c
deleted file mode 100644
index 597f5571ff..0000000000
--- a/libs/js/nsprpub/pr/tests/version.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prprf.h"
-#include "prlink.h"
-#include "prvrsion.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-PR_IMPORT(const PRVersionDescription *) libVersionPoint(void);
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv = 1;
-    PLOptStatus os;
-    PRIntn verbosity = 0;
-    PRLibrary *runtime = NULL;
-    const char *library_name = NULL;
-    const PRVersionDescription *version_info;
-	char buffer[100];
-	PRExplodedTime exploded;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "d");
-
-    PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 0:  /* fully qualified library name */
-            library_name = opt->value;
-            break;
-        case 'd':  /* verbodity */
-            verbosity += 1;
-            break;
-         default:
-            PR_fprintf(err, "Usage: version [-d] {fully qualified library name}\n");
-            return 2;  /* but not a lot else */
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (NULL != library_name)
-    {
-        runtime = PR_LoadLibrary(library_name);
-        if (NULL == runtime) {
-			PL_FPrintError(err, "PR_LoadLibrary");
-			return 3;
-		} else {
-            versionEntryPointType versionPoint = (versionEntryPointType)
-                PR_FindSymbol(runtime, "libVersionPoint");
-            if (NULL == versionPoint) {
-				PL_FPrintError(err, "PR_FindSymbol");
-				return 4;
-			}	
-			version_info = versionPoint();
-		}
-	} else
-		version_info = libVersionPoint();	/* NSPR's version info */
-
-	(void)PR_fprintf(err, "Runtime library version information\n");
-	PR_ExplodeTime(
-		version_info->buildTime, PR_GMTParameters, &exploded);
-	(void)PR_FormatTime(
-		buffer, sizeof(buffer), "%d %b %Y %H:%M:%S", &exploded);
-	(void)PR_fprintf(err, "  Build time: %s GMT\n", buffer);
-	(void)PR_fprintf(
-		err, "  Build time: %s\n", version_info->buildTimeString);
-	(void)PR_fprintf(
-		err, "  %s V%u.%u.%u (%s%s%s)\n",
-		version_info->description,
-		version_info->vMajor,
-		version_info->vMinor,
-		version_info->vPatch,
-		(version_info->beta ? " beta " : ""),
-		(version_info->debug ? " debug " : ""),
-		(version_info->special ? " special" : ""));
-	(void)PR_fprintf(err, "  filename: %s\n", version_info->filename);
-	(void)PR_fprintf(err, "  security: %s\n", version_info->security);
-	(void)PR_fprintf(err, "  copyright: %s\n", version_info->copyright);
-	(void)PR_fprintf(err, "  comment: %s\n", version_info->comment);
-	rv = 0;
-    return rv;
-}
-
-/* version.c */
diff --git a/libs/js/nsprpub/pr/tests/w16gui/.cvsignore b/libs/js/nsprpub/pr/tests/w16gui/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/pr/tests/w16gui/Makefile.in b/libs/js/nsprpub/pr/tests/w16gui/Makefile.in
deleted file mode 100644
index ead153ea50..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/Makefile.in
+++ /dev/null
@@ -1,99 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-
-
-MOD_DEPTH	= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX)
-
-CSRCS = poppad.c \
-       popfile.c \
-       popfont.c \
-       popfind.c \
-       popprnt0.c
-          
-
-INCLUDES = -I$(dist_includedir) 
-LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
-LIBPLDS = $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib
-TARGETS = $(OBJDIR)/poppad.exe
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
-
-
-ifeq ($(OS_TARGET),WIN16)    
-$(OBJDIR)/poppad.exe: $(OBJS)
-	@$(MAKE_OBJDIR)
-	echo system windows >w16link
-	echo name $@  >>w16link
-	echo option map >>w16link
-	echo option stack=16K >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo file >>w16link
-	echo $(OBJDIR)\\poppad.$(OBJ_SUFFIX), >>w16link
-	echo $(OBJDIR)\\popfile.$(OBJ_SUFFIX), >>w16link
-	echo $(OBJDIR)\\popfont.$(OBJ_SUFFIX), >>w16link
-	echo $(OBJDIR)\\popfind.$(OBJ_SUFFIX), >>w16link
-	echo $(OBJDIR)\\popprnt0.$(OBJ_SUFFIX), >>w16link
-	echo $(W16STDIO) >>w16link
-	echo library $(LIBPR)      >>w16link
-	echo library $(LIBPLDS)	   >>w16link
-	echo library clibl, commdlg >>w16link
-	echo library winsock.lib   >>w16link
-	wlink @w16link.
-	wrc -bt=windows poppad.rc $(OBJDIR)\\poppad.exe
-else    
-$(OBJDIR)/poppad.exe: $(OBJS)
-	link $(LDOPTS) $< $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
-endif
-
-export:: $(TARGETS)
-
-
-clean::
-	rm -rf $(TARGETS)
diff --git a/libs/js/nsprpub/pr/tests/w16gui/popfile.c b/libs/js/nsprpub/pr/tests/w16gui/popfile.c
deleted file mode 100644
index 9aa7187d0b..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/popfile.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*------------------------------------------
-   POPFILE.C -- Popup Editor File Functions
-   (c) Charles Petzold, 1992
-  ------------------------------------------*/
-
-#include <windows.h>
-#include <commdlg.h>
-#include <stdlib.h>
-
-static OPENFILENAME ofn ;
-
-void PopFileInitialize (HWND hwnd)
-     {
-     static char *szFilter[] = { "Text Files (*.TXT)",  "*.txt",
-                                 "ASCII Files (*.ASC)", "*.asc",
-                                 "All Files (*.*)",     "*.*",
-                                 "" } ;
-
-     ofn.lStructSize       = sizeof (OPENFILENAME) ;
-     ofn.hwndOwner         = hwnd ;
-     ofn.hInstance         = NULL ;
-     ofn.lpstrFilter       = szFilter [0] ;
-     ofn.lpstrCustomFilter = NULL ;
-     ofn.nMaxCustFilter    = 0 ;
-     ofn.nFilterIndex      = 0 ;
-     ofn.lpstrFile         = NULL ;          // Set in Open and Close functions
-     ofn.nMaxFile          = _MAX_PATH ;
-     ofn.lpstrFileTitle    = NULL ;          // Set in Open and Close functions
-     ofn.nMaxFileTitle     = _MAX_FNAME + _MAX_EXT ;
-     ofn.lpstrInitialDir   = NULL ;
-     ofn.lpstrTitle        = NULL ;
-     ofn.Flags             = 0 ;             // Set in Open and Close functions
-     ofn.nFileOffset       = 0 ;
-     ofn.nFileExtension    = 0 ;
-     ofn.lpstrDefExt       = "txt" ;
-     ofn.lCustData         = 0L ;
-     ofn.lpfnHook          = NULL ;
-     ofn.lpTemplateName    = NULL ;
-     }
-
-BOOL PopFileOpenDlg (HWND hwnd, LPSTR lpstrFileName, LPSTR lpstrTitleName)
-     {
-     ofn.hwndOwner         = hwnd ;
-     ofn.lpstrFile         = lpstrFileName ;
-     ofn.lpstrFileTitle    = lpstrTitleName ;
-     ofn.Flags             = OFN_CREATEPROMPT ;
-
-     return GetOpenFileName (&ofn) ;
-     }
-
-BOOL PopFileSaveDlg (HWND hwnd, LPSTR lpstrFileName, LPSTR lpstrTitleName)
-     {
-     ofn.hwndOwner         = hwnd ;
-     ofn.lpstrFile         = lpstrFileName ;
-     ofn.lpstrFileTitle    = lpstrTitleName ;
-     ofn.Flags             = OFN_OVERWRITEPROMPT ;
-
-     return GetSaveFileName (&ofn) ;
-     }
-
-static long PopFileLength (int hFile)
-     {
-     long lCurrentPos = _llseek (hFile, 0L, 1) ;
-     long lFileLength = _llseek (hFile, 0L, 2) ;
-     
-     _llseek (hFile, lCurrentPos, 0) ;
-
-     return lFileLength ;
-     }
-
-BOOL PopFileRead (HWND hwndEdit, LPSTR lpstrFileName)
-     {
-     long   lLength ;
-     HANDLE hBuffer ;
-     int    hFile ;
-     LPSTR  lpstrBuffer ;
-
-     if (-1 == (hFile = _lopen (lpstrFileName, OF_READ | OF_SHARE_DENY_WRITE)))
-          return FALSE ;
-
-     if ((lLength = PopFileLength (hFile)) >= 32000)
-          {
-          _lclose (hFile) ;
-          return FALSE ;
-          }
-
-     if (NULL == (hBuffer = GlobalAlloc (GHND, lLength + 1)))
-          {
-          _lclose (hFile) ;
-          return FALSE ;
-          }
-
-     lpstrBuffer = GlobalLock (hBuffer) ;
-     _lread (hFile, lpstrBuffer, (WORD) lLength) ;
-     _lclose (hFile) ;
-     lpstrBuffer [(WORD) lLength] = '\0' ;
-
-     SetWindowText (hwndEdit, lpstrBuffer) ;
-     GlobalUnlock (hBuffer) ;
-     GlobalFree (hBuffer) ;
-
-     return TRUE ;
-     }
-
-BOOL PopFileWrite (HWND hwndEdit, LPSTR lpstrFileName)
-     {
-     HANDLE hBuffer ;
-     int    hFile ;
-     LPSTR  lpstrBuffer ;
-     WORD   wLength ;
-
-     if (-1 == (hFile = _lopen (lpstrFileName, OF_WRITE | OF_SHARE_EXCLUSIVE)))
-          if (-1 == (hFile = _lcreat (lpstrFileName, 0)))
-               return FALSE ;
-
-     wLength = GetWindowTextLength (hwndEdit) ;
-     hBuffer = (HANDLE) SendMessage (hwndEdit, EM_GETHANDLE, 0, 0L) ;
-     lpstrBuffer = (LPSTR) LocalLock (hBuffer) ;
-
-     if (wLength != _lwrite (hFile, lpstrBuffer, wLength))
-          {
-          _lclose (hFile) ;
-          return FALSE ;
-          }
-
-     _lclose (hFile) ;
-     LocalUnlock (hBuffer) ;
-
-     return TRUE ;
-     }
diff --git a/libs/js/nsprpub/pr/tests/w16gui/popfind.c b/libs/js/nsprpub/pr/tests/w16gui/popfind.c
deleted file mode 100644
index 023095ea7e..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/popfind.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*--------------------------------------------------------
-   POPFIND.C -- Popup Editor Search and Replace Functions
-   (c) Charles Petzold, 1992
-  --------------------------------------------------------*/
-
-#include <windows.h>
-#include <commdlg.h>
-#include <string.h>
-#define MAX_STRING_LEN   256
-
-static char szFindText [MAX_STRING_LEN] ;
-static char szReplText [MAX_STRING_LEN] ;
-
-HWND PopFindFindDlg (HWND hwnd)
-     {
-     static FINDREPLACE fr ;       // must be static for modeless dialog!!!
-
-     fr.lStructSize      = sizeof (FINDREPLACE) ;
-     fr.hwndOwner        = hwnd ;
-     fr.hInstance        = NULL ;
-     fr.Flags            = FR_HIDEUPDOWN | FR_HIDEMATCHCASE | FR_HIDEWHOLEWORD ;
-     fr.lpstrFindWhat    = szFindText ;
-     fr.lpstrReplaceWith = NULL ;
-     fr.wFindWhatLen     = sizeof (szFindText) ;
-     fr.wReplaceWithLen  = 0 ;
-     fr.lCustData        = 0 ;
-     fr.lpfnHook         = NULL ;
-     fr.lpTemplateName   = NULL ;
-
-     return FindText (&fr) ;
-     }
-
-HWND PopFindReplaceDlg (HWND hwnd)
-     {
-     static FINDREPLACE fr ;       // must be static for modeless dialog!!!
-
-     fr.lStructSize      = sizeof (FINDREPLACE) ;
-     fr.hwndOwner        = hwnd ;
-     fr.hInstance        = NULL ;
-     fr.Flags            = FR_HIDEUPDOWN | FR_HIDEMATCHCASE | FR_HIDEWHOLEWORD ;
-     fr.lpstrFindWhat    = szFindText ;
-     fr.lpstrReplaceWith = szReplText ;
-     fr.wFindWhatLen     = sizeof (szFindText) ;
-     fr.wReplaceWithLen  = sizeof (szReplText) ;
-     fr.lCustData        = 0 ;
-     fr.lpfnHook         = NULL ;
-     fr.lpTemplateName   = NULL ;
-
-     return ReplaceText (&fr) ;
-     }
-
-BOOL PopFindFindText (HWND hwndEdit, int *piSearchOffset, LPFINDREPLACE lpfr)
-     {
-     int         iPos ;
-     LOCALHANDLE hLocal ;
-     LPSTR       lpstrDoc, lpstrPos ;
-
-               // Get a pointer to the edit document
-
-     hLocal   = (HWND) SendMessage (hwndEdit, EM_GETHANDLE, 0, 0L) ;
-     lpstrDoc = (LPSTR) LocalLock (hLocal) ;
-
-               // Search the document for the find string
-
-     lpstrPos = _fstrstr (lpstrDoc + *piSearchOffset, lpfr->lpstrFindWhat) ;
-     LocalUnlock (hLocal) ;
-
-               // Return an error code if the string cannot be found
-
-     if (lpstrPos == NULL)
-          return FALSE ;
-
-               // Find the position in the document and the new start offset
-
-     iPos = lpstrPos - lpstrDoc ;
-     *piSearchOffset = iPos + _fstrlen (lpfr->lpstrFindWhat) ;
-
-               // Select the found text
-
-     SendMessage (hwndEdit, EM_SETSEL, 0,
-                  MAKELONG (iPos, *piSearchOffset)) ;
-
-     return TRUE ;
-     }
-
-BOOL PopFindNextText (HWND hwndEdit, int *piSearchOffset)
-     {
-     FINDREPLACE fr ;
-
-     fr.lpstrFindWhat = szFindText ;
-
-     return PopFindFindText (hwndEdit, piSearchOffset, &fr) ;
-     }
-
-BOOL PopFindReplaceText (HWND hwndEdit, int *piSearchOffset, LPFINDREPLACE lpfr)
-     {
-               // Find the text
-
-     if (!PopFindFindText (hwndEdit, piSearchOffset, lpfr))
-          return FALSE ;
-
-               // Replace it
-
-     SendMessage (hwndEdit, EM_REPLACESEL, 0, (long) lpfr->lpstrReplaceWith) ;
-
-     return TRUE ;
-     }
-
-BOOL PopFindValidFind (void)
-     {
-     return *szFindText != '\0' ;
-     }
diff --git a/libs/js/nsprpub/pr/tests/w16gui/popfont.c b/libs/js/nsprpub/pr/tests/w16gui/popfont.c
deleted file mode 100644
index 5f28af703b..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/popfont.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*------------------------------------------
-   POPFONT.C -- Popup Editor Font Functions
-   (c) Charles Petzold, 1992
-  ------------------------------------------*/
-
-#include <windows.h>
-#include <commdlg.h>
-
-static LOGFONT logfont ;
-static HFONT   hFont ;
-
-BOOL PopFontChooseFont (HWND hwnd)
-     {
-     CHOOSEFONT cf ;
-
-     cf.lStructSize      = sizeof (CHOOSEFONT) ;
-     cf.hwndOwner        = hwnd ;
-     cf.hDC              = NULL ;
-     cf.lpLogFont        = &logfont ;
-     cf.iPointSize       = 0 ;
-     cf.Flags            = CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS
-                                                  | CF_EFFECTS ;
-     cf.rgbColors        = 0L ;
-     cf.lCustData        = 0L ;
-     cf.lpfnHook         = NULL ;
-     cf.lpTemplateName   = NULL ;
-     cf.hInstance        = NULL ;
-     cf.lpszStyle        = NULL ;
-     cf.nFontType        = 0 ;               // Returned from ChooseFont
-     cf.nSizeMin         = 0 ;
-     cf.nSizeMax         = 0 ;
-
-     return ChooseFont (&cf) ;
-     }
-
-void PopFontInitialize (HWND hwndEdit)
-     {
-     GetObject (GetStockObject (SYSTEM_FONT), sizeof (LOGFONT),
-                                              (LPSTR) &logfont) ;
-     hFont = CreateFontIndirect (&logfont) ;
-     SendMessage (hwndEdit, WM_SETFONT, hFont, 0L) ;
-     }
-
-void PopFontSetFont (HWND hwndEdit)
-     {
-     HFONT hFontNew ;
-
-     hFontNew = CreateFontIndirect (&logfont) ;
-     SendMessage (hwndEdit, WM_SETFONT, hFontNew, 0L) ;
-     DeleteObject (hFont) ;
-     hFont = hFontNew ;
-     }
-
-void PopFontDeinitialize (void)
-     {
-     DeleteObject (hFont) ;
-     }
diff --git a/libs/js/nsprpub/pr/tests/w16gui/poppad.c b/libs/js/nsprpub/pr/tests/w16gui/poppad.c
deleted file mode 100644
index c62ef23b27..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/poppad.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*---------------------------------------
-   POPPAD.C -- Popup Editor
-   (c) Charles Petzold, 1992
-  ---------------------------------------*/
-
-#include "nspr.h"
-#include "plevent.h"
-#include <windows.h>
-#include <commdlg.h>
-#include <stdlib.h>
-#include "poppad.h"
-#include <time.h>
-
-#define EDITID   1
-#define UNTITLED "(untitled)"
-
-long FAR PASCAL _export WndProc      (HWND, UINT, UINT, LONG) ;
-BOOL FAR PASCAL _export AboutDlgProc (HWND, UINT, UINT, LONG) ;
-
-/* Declarations for NSPR customization
-** 
-*/
-typedef struct PadEvent
-{
-    PLEvent plEvent;
-    int     unused;    
-} PadEvent;
-
-static void PR_CALLBACK TimerThread( void *arg);
-static void PR_CALLBACK HandlePadEvent( PadEvent *padEvent );
-static void PR_CALLBACK DestroyPadEvent( PadEvent *padevent );
-static PRThread *tThread;
-static PLEventQueue *padQueue; 
-static int  quitSwitch = 0;
-static long ThreadSleepTime = 1000;
-static long timerCount = 0;
-static char *startMessage = "Poppad: NSPR GUI and event test program.\n"
-                            "You should see lines of 50 characters\n"
-                            "with a new character appearing at 1 second intervals.\n"
-                            "Every 10 seconds gets a '+'; every 5 seconds gets a '_';\n"
-                            "every 1 second gets a '.'.\n\n"
-                            "You should be able to type in the window.\n\n\n";
-
-
-          // Functions in POPFILE.C
-
-void PopFileInitialize (HWND) ;
-BOOL PopFileOpenDlg    (HWND, LPSTR, LPSTR) ;
-BOOL PopFileSaveDlg    (HWND, LPSTR, LPSTR) ;
-BOOL PopFileRead       (HWND, LPSTR) ;
-BOOL PopFileWrite      (HWND, LPSTR) ;
-
-          // Functions in POPFIND.C
-
-HWND PopFindFindDlg     (HWND) ;
-HWND PopFindReplaceDlg  (HWND) ;
-BOOL PopFindFindText    (HWND, int *, LPFINDREPLACE) ;
-BOOL PopFindReplaceText (HWND, int *, LPFINDREPLACE) ;
-BOOL PopFindNextText    (HWND, int *) ;
-BOOL PopFindValidFind   (void) ;
-
-          // Functions in POPFONT.C
-
-void PopFontInitialize   (HWND) ;
-BOOL PopFontChooseFont   (HWND) ;
-void PopFontSetFont      (HWND) ;
-void PopFontDeinitialize (void) ;
-
-          // Functions in POPPRNT.C
-
-BOOL PopPrntPrintFile (HANDLE, HWND, HWND, LPSTR) ;
-
-          // Global variables
-
-static char szAppName [] = "PopPad" ;
-static HWND hDlgModeless ;
-static HWND hwndEdit ;
-
-int PASCAL WinMain (HANDLE hInstance, HANDLE hPrevInstance,
-                    LPSTR lpszCmdLine, int nCmdShow)
-    {
-    MSG      msg;
-    HWND     hwnd ;
-    HANDLE   hAccel ;
-    WNDCLASS wndclass ;
-
-    PR_STDIO_INIT();
-    PR_Init(0, 0, 0);
-          
-    if (!hPrevInstance) 
-          {
-          wndclass.style         = CS_HREDRAW | CS_VREDRAW ;
-          wndclass.lpfnWndProc   = WndProc ;
-          wndclass.cbClsExtra    = 0 ;
-          wndclass.cbWndExtra    = 0 ;
-          wndclass.hInstance     = hInstance ;
-          wndclass.hIcon         = LoadIcon (hInstance, szAppName) ;
-          wndclass.hCursor       = LoadCursor (NULL, IDC_ARROW) ;
-          wndclass.hbrBackground = GetStockObject (WHITE_BRUSH) ;
-          wndclass.lpszMenuName  = szAppName ;
-          wndclass.lpszClassName = szAppName ;
-
-          RegisterClass (&wndclass) ;
-          }
-
-     hwnd = CreateWindow (szAppName, NULL,
-                          WS_OVERLAPPEDWINDOW,
-                          CW_USEDEFAULT, CW_USEDEFAULT,
-                          CW_USEDEFAULT, CW_USEDEFAULT,
-                          NULL, NULL, hInstance, lpszCmdLine) ;
-
-     ShowWindow (hwnd, nCmdShow) ;
-     UpdateWindow (hwnd); 
-
-     hAccel = LoadAccelerators (hInstance, szAppName) ;
-     
-     for(;;)
-     {
-        if ( PeekMessage( &msg, NULL, 0, 0, PM_NOREMOVE  ))
-        {
-            if (GetMessage(&msg, NULL, 0, 0))
-            {
-                if (hDlgModeless == NULL || !IsDialogMessage (hDlgModeless, &msg))
-                {
-                    if (!TranslateAccelerator (hwnd, hAccel, &msg))
-                    {
-                        TranslateMessage (&msg) ;
-                        DispatchMessage (&msg) ;
-                    } /* end if !TranslateAccelerator */
-                } 
-            }
-            else
-            {
-                break;    
-            } /* end if GetMessage() */
-        } 
-        else /* !PeekMessage */
-        {
-            PR_Sleep(50);
-        }/* end if PeekMessage() */
-     } /* end for() */
-
-     PR_JoinThread( tThread );
-     PL_DestroyEventQueue( padQueue );
-     PR_Cleanup();
-     return msg.wParam ;
-     }
-
-void DoCaption (HWND hwnd, char *szTitleName)
-     {
-     char szCaption [64 + _MAX_FNAME + _MAX_EXT] ;
-
-     wsprintf (szCaption, "%s - %s", (LPSTR) szAppName,
-               (LPSTR) (szTitleName [0] ? szTitleName : UNTITLED)) ;
-
-     SetWindowText (hwnd, szCaption) ;
-     }
-
-void OkMessage (HWND hwnd, char *szMessage, char *szTitleName)
-     {
-     char szBuffer [64 + _MAX_FNAME + _MAX_EXT] ;
-
-     wsprintf (szBuffer, szMessage,
-               (LPSTR) (szTitleName [0] ? szTitleName : UNTITLED)) ;
-
-     MessageBox (hwnd, szBuffer, szAppName, MB_OK | MB_ICONEXCLAMATION) ;
-     }
-
-short AskAboutSave (HWND hwnd, char *szTitleName)
-     {
-     char  szBuffer [64 + _MAX_FNAME + _MAX_EXT] ;
-     short nReturn ;
-
-     wsprintf (szBuffer, "Save current changes in %s?",
-               (LPSTR) (szTitleName [0] ? szTitleName : UNTITLED)) ;
-
-     nReturn = MessageBox (hwnd, szBuffer, szAppName,
-                           MB_YESNOCANCEL | MB_ICONQUESTION) ;
-
-     if (nReturn == IDYES)
-          if (!SendMessage (hwnd, WM_COMMAND, IDM_SAVE, 0L))
-               nReturn = IDCANCEL ;
-
-     return nReturn ;
-     }
-
-long FAR PASCAL _export WndProc (HWND hwnd, UINT message, UINT wParam,
-                                                          LONG lParam)
-     {
-     static BOOL    bNeedSave = FALSE ;
-     static char    szFileName  [_MAX_PATH] ;
-     static char    szTitleName [_MAX_FNAME + _MAX_EXT] ;
-     static FARPROC lpfnAboutDlgProc ;
-     static HANDLE  hInst ;
-     static int     iOffset ;
-     static UINT    messageFindReplace ;
-     LONG           lSelect ;
-     LPFINDREPLACE  lpfr ;
-     WORD           wEnable ;
-
-     switch (message)
-          {
-          case WM_CREATE:
-                         // Get About dialog instance address
-
-               hInst = ((LPCREATESTRUCT) lParam)->hInstance ;
-               lpfnAboutDlgProc = MakeProcInstance ((FARPROC) AboutDlgProc,
-                                                    hInst) ;
-
-                         // Create the edit control child window
-
-               hwndEdit = CreateWindow ("edit", NULL,
-                         WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL |
-                              WS_BORDER | ES_LEFT | ES_MULTILINE |
-                              ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL,
-                         0, 0, 0, 0,
-                         hwnd, EDITID, hInst, NULL) ;
-
-               SendMessage (hwndEdit, EM_LIMITTEXT, 32000, 0L) ;
-
-                         // Initialize common dialog box stuff
-
-               PopFileInitialize (hwnd) ;
-               PopFontInitialize (hwndEdit) ;
-
-               messageFindReplace = RegisterWindowMessage (FINDMSGSTRING) ;
-
-                         // Process command line
-
-               lstrcpy (szFileName, (LPSTR)
-                        (((LPCREATESTRUCT) lParam)->lpCreateParams)) ;
-
-               if (lstrlen (szFileName) > 0)
-                    {
-                    GetFileTitle (szFileName, szTitleName,
-                                  sizeof (szTitleName)) ;
-
-                    if (!PopFileRead (hwndEdit, szFileName))
-                         OkMessage (hwnd, "File %s cannot be read!",
-                                          szTitleName) ;
-                    }
-
-               DoCaption (hwnd, szTitleName) ;
-
-               /* Initialize Event Processing for NSPR
-               ** Retrieve the event queue just created
-               ** Create the TimerThread
-               */               
-               PL_InitializeEventsLib("someName");
-               padQueue = PL_GetMainEventQueue();
-               tThread = PR_CreateThread(PR_USER_THREAD,
-                        TimerThread,
-                        NULL,
-                        PR_PRIORITY_NORMAL,
-                        PR_LOCAL_THREAD,
-                        PR_JOINABLE_THREAD,
-                        0 );
-               return 0 ;
-
-          case WM_SETFOCUS:
-               SetFocus (hwndEdit) ;
-               return 0 ;
-
-          case WM_SIZE: 
-               MoveWindow (hwndEdit, 0, 0, LOWORD (lParam),
-                                           HIWORD (lParam), TRUE) ;
-               return 0 ;
-
-          case WM_INITMENUPOPUP:
-               switch (lParam)
-                    {
-                    case 1:        // Edit menu
-
-                              // Enable Undo if edit control can do it
-
-                         EnableMenuItem (wParam, IDM_UNDO,
-                              SendMessage (hwndEdit, EM_CANUNDO, 0, 0L) ?
-                                   MF_ENABLED : MF_GRAYED) ;
-
-                              // Enable Paste if text is in the clipboard
-
-                         EnableMenuItem (wParam, IDM_PASTE,
-                              IsClipboardFormatAvailable (CF_TEXT) ?
-                                   MF_ENABLED : MF_GRAYED) ;
-
-                              // Enable Cut, Copy, and Del if text is selected
-
-                         lSelect = SendMessage (hwndEdit, EM_GETSEL, 0, 0L) ;
-                         wEnable = HIWORD (lSelect) != LOWORD (lSelect) ?
-                                        MF_ENABLED : MF_GRAYED ;
-
-                         EnableMenuItem (wParam, IDM_CUT,  wEnable) ;
-                         EnableMenuItem (wParam, IDM_COPY, wEnable) ;
-                         EnableMenuItem (wParam, IDM_DEL,  wEnable) ;
-                         break ;
-
-                    case 2:        // Search menu
-
-                              // Enable Find, Next, and Replace if modeless
-                              //   dialogs are not already active
-
-                         wEnable = hDlgModeless == NULL ?
-                                        MF_ENABLED : MF_GRAYED ;
-
-                         EnableMenuItem (wParam, IDM_FIND,    wEnable) ;
-                         EnableMenuItem (wParam, IDM_NEXT,    wEnable) ;
-                         EnableMenuItem (wParam, IDM_REPLACE, wEnable) ;
-                         break ;
-                    }
-               return 0 ;
-
-          case WM_COMMAND :
-                              // Messages from edit control
-
-               if (LOWORD (lParam) && wParam == EDITID)
-                    {
-                    switch (HIWORD (lParam))
-                         {
-                         case EN_UPDATE:
-                              bNeedSave = TRUE ;
-                              return 0 ;
-
-                         case EN_ERRSPACE:
-                         case EN_MAXTEXT:
-                              MessageBox (hwnd, "Edit control out of space.",
-                                        szAppName, MB_OK | MB_ICONSTOP) ;
-                              return 0 ;
-                         }
-                    break ;
-                    }
-
-               switch (wParam)
-                    {
-                              // Messages from File menu
-
-                    case IDM_NEW:
-                         if (bNeedSave && IDCANCEL ==
-                                   AskAboutSave (hwnd, szTitleName))
-                              return 0 ;
-
-                         SetWindowText (hwndEdit, "\0") ;
-                         szFileName [0]  = '\0' ;
-                         szTitleName [0] = '\0' ;
-                         DoCaption (hwnd, szTitleName) ;
-                         bNeedSave = FALSE ;
-                         return 0 ;
-
-                    case IDM_OPEN:
-                         if (bNeedSave && IDCANCEL ==
-                                   AskAboutSave (hwnd, szTitleName))
-                              return 0 ;
-
-                         if (PopFileOpenDlg (hwnd, szFileName, szTitleName))
-                              {
-                              if (!PopFileRead (hwndEdit, szFileName))
-                                   {
-                                   OkMessage (hwnd, "Could not read file %s!",
-                                                    szTitleName) ;
-                                   szFileName  [0] = '\0' ;
-                                   szTitleName [0] = '\0' ;
-                                   }
-                              }
-
-                         DoCaption (hwnd, szTitleName) ;
-                         bNeedSave = FALSE ;
-                         return 0 ;
-
-                    case IDM_SAVE:
-                         if (szFileName [0])
-                              {
-                              if (PopFileWrite (hwndEdit, szFileName))
-                                   {
-                                   bNeedSave = FALSE ;
-                                   return 1 ;
-                                   }
-                              else
-                                   OkMessage (hwnd, "Could not write file %s",
-                                                    szTitleName) ;
-                              return 0 ;
-                              }
-                                                  // fall through
-                    case IDM_SAVEAS:
-                         if (PopFileSaveDlg (hwnd, szFileName, szTitleName))
-                              {
-                              DoCaption (hwnd, szTitleName) ;
-
-                              if (PopFileWrite (hwndEdit, szFileName))
-                                   {
-                                   bNeedSave = FALSE ;
-                                   return 1 ;
-                                   }
-                              else
-                                   OkMessage (hwnd, "Could not write file %s",
-                                                    szTitleName) ;
-                              }
-                         return 0 ;
-
-                    case IDM_PRINT:
-                         if (!PopPrntPrintFile (hInst, hwnd, hwndEdit,
-                                                szTitleName))
-                              OkMessage (hwnd, "Could not print file %s",
-                                         szTitleName) ;
-                         return 0 ;
-
-                    case IDM_EXIT:
-                         SendMessage (hwnd, WM_CLOSE, 0, 0L) ;
-                         return 0 ;
-
-                              // Messages from Edit menu
-
-                    case IDM_UNDO:
-                         SendMessage (hwndEdit, WM_UNDO, 0, 0L) ;
-                         return 0 ;
-
-                    case IDM_CUT:
-                         SendMessage (hwndEdit, WM_CUT, 0, 0L) ;
-                         return 0 ;
-
-                    case IDM_COPY:
-                         SendMessage (hwndEdit, WM_COPY, 0, 0L) ;
-                         return 0 ;
-
-                    case IDM_PASTE:
-                         SendMessage (hwndEdit, WM_PASTE, 0, 0L) ;
-                         return 0 ;
-
-                    case IDM_DEL:
-                         SendMessage (hwndEdit, WM_CLEAR, 0, 0L) ;
-                         return 0 ;
-
-                    case IDM_SELALL:
-                         SendMessage (hwndEdit, EM_SETSEL, 0,
-                                        MAKELONG (0, 32767)) ;
-                         return 0 ;
-
-                              // Messages from Search menu
-
-                    case IDM_FIND:
-                         iOffset = HIWORD (
-                              SendMessage (hwndEdit, EM_GETSEL, 0, 0L)) ;
-                         hDlgModeless = PopFindFindDlg (hwnd) ;
-                         return 0 ;
-
-                    case IDM_NEXT:
-                         iOffset = HIWORD (
-                              SendMessage (hwndEdit, EM_GETSEL, 0, 0L)) ;
-
-                         if (PopFindValidFind ())
-                              PopFindNextText (hwndEdit, &iOffset) ;
-                         else
-                              hDlgModeless = PopFindFindDlg (hwnd) ;
-
-                         return 0 ;
-
-                    case IDM_REPLACE:
-                         iOffset = HIWORD (
-                              SendMessage (hwndEdit, EM_GETSEL, 0, 0L)) ;
-
-                         hDlgModeless = PopFindReplaceDlg (hwnd) ;
-                         return 0 ;
-
-                    case IDM_FONT:
-                         if (PopFontChooseFont (hwnd))
-                              PopFontSetFont (hwndEdit) ;
-
-                         return 0 ;
-
-                              // Messages from Help menu
-
-                    case IDM_HELP:
-                         OkMessage (hwnd, "Help not yet implemented!", NULL) ;
-                         return 0 ;
-
-                    case IDM_ABOUT:
-                         DialogBox (hInst, "AboutBox", hwnd, lpfnAboutDlgProc);
-                         return 0 ;
-                    }
-               break ;
-
-          case WM_CLOSE:
-               if (!bNeedSave || IDCANCEL != AskAboutSave (hwnd, szTitleName))
-                    DestroyWindow (hwnd) ;
-
-               return 0 ;
-
-          case WM_QUERYENDSESSION:
-               if (!bNeedSave || IDCANCEL != AskAboutSave (hwnd, szTitleName))
-                    return 1L ;
-
-               return 0 ;
-
-          case WM_DESTROY:
-               PopFontDeinitialize () ;
-               PostQuitMessage (0) ;
-               quitSwitch = 1;
-               return 0 ;
-
-          default:
-                         // Process "Find-Replace" messages
-
-               if (message == messageFindReplace)
-                    {
-                    lpfr = (LPFINDREPLACE) lParam ;
-
-                    if (lpfr->Flags & FR_DIALOGTERM)
-                         hDlgModeless = NULL ;
-
-                    if (lpfr->Flags & FR_FINDNEXT)
-                         if (!PopFindFindText (hwndEdit, &iOffset, lpfr))
-                              OkMessage (hwnd, "Text not found!", NULL) ;
-
-                    if (lpfr->Flags & FR_REPLACE ||
-                        lpfr->Flags & FR_REPLACEALL)
-                         if (!PopFindReplaceText (hwndEdit, &iOffset, lpfr))
-                              OkMessage (hwnd, "Text not found!", NULL) ;
-
-                    if (lpfr->Flags & FR_REPLACEALL)
-                         while (PopFindReplaceText (hwndEdit, &iOffset, lpfr));
-
-                    return 0 ;
-                    }
-               break ;
-          }
-     return DefWindowProc (hwnd, message, wParam, lParam) ;
-     }
-
-BOOL FAR PASCAL _export AboutDlgProc (HWND hDlg, UINT message, UINT wParam,
-                                                               LONG lParam)
-     {
-     switch (message)
-          {
-          case WM_INITDIALOG:
-               return TRUE ;
-
-          case WM_COMMAND:
-               switch (wParam)
-                    {
-                    case IDOK:
-                         EndDialog (hDlg, 0) ;
-                         return TRUE ;
-                    }
-               break ;
-          }
-     return FALSE ;
-     }
-/*
-** TimerThread() -- The Main function of the timer pop thread
-**
-*/
-static void PR_CALLBACK TimerThread( void *arg)
-{
-    do {
-        PadEvent   *ev;
-        
-        /*
-        ** Should we quit now?
-        */
-        if ( quitSwitch )
-            break;
-        /*
-        ** Create and Post the event the event
-        */
-        PL_ENTER_EVENT_QUEUE_MONITOR( padQueue );
-        ev = (PadEvent *) PR_NEW( PadEvent );
-        PL_InitEvent( &ev->plEvent, NULL, 
-                (PLHandleEventProc)HandlePadEvent, 
-                (PLDestroyEventProc)DestroyPadEvent );
-        PL_PostEvent( padQueue, &ev->plEvent );
-        PL_EXIT_EVENT_QUEUE_MONITOR( padQueue );
-            
-        PR_Sleep( ThreadSleepTime );
-    } while(1);
-    return;
-}    
-
-/*
-** HandlePadEvent() -- gets called because of PostEvent
-*/
-static void PR_CALLBACK HandlePadEvent( PadEvent *padEvent )
-{
-    if ( timerCount++ == 0 )
-    {
-        char *cp;
-        
-        for ( cp = startMessage; *cp != 0 ; cp++ )
-        {
-            SendMessage( hwndEdit, WM_CHAR, *cp, MAKELONG( *cp, 1 ));
-        }
-    }
-    /* 
-    ** Send a WM_CHAR event the edit Window
-    */
-    if ((timerCount % 10) == 0)
-    {
-        SendMessage( hwndEdit, WM_CHAR, '+', MAKELONG( '+', 1 ));
-    }
-    else if ((timerCount % 5) == 0)
-    {
-        SendMessage( hwndEdit, WM_CHAR, '_', MAKELONG( '_', 1 ));
-    }
-    else
-    {
-        SendMessage( hwndEdit, WM_CHAR, '.', MAKELONG( '.', 1 ));
-    }
-    
-    if ( (timerCount % 50) == 0)
-    {
-        SendMessage( hwndEdit, WM_CHAR, '\n', MAKELONG( '\n', 1 ));
-    }
-
-    /*
-    ** PL_RevokeEvents() is broken. Test to fix it.
-    */
-    {
-        static long revokeCounter = 0;
-
-        if (revokeCounter++ > 10 )
-        {
-            PR_Sleep( ThreadSleepTime * 10 );
-            SendMessage( hwndEdit, WM_CHAR, '*', MAKELONG( '\n', 1 ));
-            PL_RevokeEvents( padQueue, NULL );
-            revokeCounter = 0;
-        }
-    }
-    return;
-}
-
-/*
-** DestroyPadEvent() -- Called after HandlePadEvent()
-*/
-static void PR_CALLBACK DestroyPadEvent( PadEvent *padevent )
-{
-   PR_Free( padevent );
-   return;
-}    
diff --git a/libs/js/nsprpub/pr/tests/w16gui/poppad.h b/libs/js/nsprpub/pr/tests/w16gui/poppad.h
deleted file mode 100644
index 202095e593..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/poppad.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-/*----------------------
-   POPPAD.H header file
-   (c) Charles Petzold, 1992
-  ----------------------*/
-
-#define IDM_NEW          10
-#define IDM_OPEN         11
-#define IDM_SAVE         12
-#define IDM_SAVEAS       13
-#define IDM_PRINT        14
-#define IDM_EXIT         15
-
-#define IDM_UNDO         20
-#define IDM_CUT          21
-#define IDM_COPY         22
-#define IDM_PASTE        23
-#define IDM_DEL          24
-#define IDM_SELALL       25
-
-#define IDM_FIND         30
-#define IDM_NEXT         31
-#define IDM_REPLACE      32
-
-#define IDM_FONT         40
-
-#define IDM_HELP         50
-#define IDM_ABOUT        51
-
-#define IDD_FNAME        10
diff --git a/libs/js/nsprpub/pr/tests/w16gui/poppad.ico b/libs/js/nsprpub/pr/tests/w16gui/poppad.ico
deleted file mode 100644
index fe7097c5ece255c384f349797d1db392de87d97e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmZQzU<5)11tta%Fkob05ChU0K&$}74nPc&2LmVt;ULKW|NnzH^7a4!pLbwjV2}U*
z|8oFPTloL~e?ou~q5uE?L%}`ld~p7QLN+-212cquzycxPaPSyd{sBWBh!zFnsX+Oo
tK>8^Ve+1$mAlrfV12I1kvjZ_R5aVzyP=-R#0Mvf~h#vs)2OtL74*;c7SoZ(`

diff --git a/libs/js/nsprpub/pr/tests/w16gui/poppad.rc b/libs/js/nsprpub/pr/tests/w16gui/poppad.rc
deleted file mode 100644
index 227f5e4ad8..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/poppad.rc
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*---------------------------
-   POPPAD.RC resource script
-  ---------------------------*/
-
-#include <windows.h>
-#include "poppad.h"
-
-PopPad ICON "poppad.ico"
-
-PopPad MENU
-     {
-     POPUP "&File"
-          {
-          MENUITEM "&New",              IDM_NEW
-          MENUITEM "&Open...",          IDM_OPEN
-          MENUITEM "&Save",             IDM_SAVE
-          MENUITEM "Save &As...",       IDM_SAVEAS
-          MENUITEM SEPARATOR
-          MENUITEM "&Print...",         IDM_PRINT
-          MENUITEM SEPARATOR
-          MENUITEM "E&xit",             IDM_EXIT
-          }
-     POPUP "&Edit"
-          {
-          MENUITEM "&Undo\tCtrl+Z",     IDM_UNDO
-          MENUITEM SEPARATOR
-          MENUITEM "Cu&t\tCtrl+X",      IDM_CUT
-          MENUITEM "&Copy\tCtrl+C",     IDM_COPY
-          MENUITEM "&Paste\tCtrl+V",    IDM_PASTE
-          MENUITEM "De&lete\tDel",      IDM_DEL
-          MENUITEM SEPARATOR
-          MENUITEM "&Select All",       IDM_SELALL
-          }
-     POPUP "&Search"
-          {
-          MENUITEM "&Find...",          IDM_FIND
-          MENUITEM "Find &Next\tF3",    IDM_NEXT
-          MENUITEM "&Replace...",       IDM_REPLACE
-          }
-     POPUP "&Character"
-          {
-          MENUITEM "&Font...",          IDM_FONT
-          }
-     POPUP "&Help"
-          {
-          MENUITEM "&Help",             IDM_HELP
-          MENUITEM "&About PopPad...",  IDM_ABOUT
-          }
-     }
-
-PopPad ACCELERATORS
-     {
-     "^Z",      IDM_UNDO
-     VK_BACK,   IDM_UNDO,  VIRTKEY, ALT
-     "^X",      IDM_CUT
-     VK_DELETE, IDM_CUT,   VIRTKEY, SHIFT
-     "^C",      IDM_COPY
-     VK_INSERT, IDM_COPY,  VIRTKEY, CONTROL
-     "^V",      IDM_PASTE
-     VK_INSERT, IDM_PASTE, VIRTKEY, SHIFT
-     VK_DELETE, IDM_DEL,   VIRTKEY
-     VK_F3,     IDM_NEXT,  VIRTKEY
-     VK_F1,     IDM_HELP,  VIRTKEY
-     }
-
-AboutBox DIALOG  20, 20, 160, 80
-     STYLE WS_POPUP | WS_DLGFRAME
-     {
-     CTEXT "PopPad"                              -1,   0, 12, 160,  8
-     ICON  "PopPad"                              -1,   8,  8,   0,  0
-     CTEXT "Popup Editor for Microsoft Windows"  -1,   0, 36, 160,  8
-     CTEXT "Copyright (c) Charles Petzold, 1992" -1,   0, 48, 160,  8
-     DEFPUSHBUTTON "OK"                        IDOK,  64, 60,  32, 14, WS_GROUP
-     } 
-
-PrintDlgBox DIALOG 20, 20, 100, 76
-     STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-     CAPTION "PopPad"
-     {
-     CTEXT "Sending",                  -1,  0, 10, 100,  8
-     CTEXT "",                  IDD_FNAME,  0, 20, 100,  8
-     CTEXT "to print spooler.",        -1,  0, 30, 100,  8
-     DEFPUSHBUTTON  "Cancel",    IDCANCEL, 34, 50,  32, 14, WS_GROUP
-     }
diff --git a/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c b/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c
deleted file mode 100644
index 4e76377f98..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/popprnt0.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*---------------------------------------------------------------
-   POPPRNT0.C -- Popup Editor Printing Functions (dummy version)
-   (c) Charles Petzold, 1992
-  ---------------------------------------------------------------*/
-
-#include <windows.h>
-
-BOOL PopPrntPrintFile (HANDLE hInst, HWND hwnd, HWND hwndEdit,
-                                     LPSTR lpstrTitleName)
-     {
-     return FALSE ;
-     }
diff --git a/libs/js/nsprpub/pr/tests/w16gui/readme.1st b/libs/js/nsprpub/pr/tests/w16gui/readme.1st
deleted file mode 100644
index afdf847f96..0000000000
--- a/libs/js/nsprpub/pr/tests/w16gui/readme.1st
+++ /dev/null
@@ -1,37 +0,0 @@
-readme.1st.
-
-The files in the pr/tests/w16gui directory are taken
-from "Programming Windows 3.1" by Charles Petzold,
-specifically, the programs in chapter 14 related
-to the "poppad4" sample application.
-
-These programs are compiled with nspr20 to test nspr 2.0
-and to demostrate the use of nspr in a gui application.
-
-Library (DLL) PLDSxx.lib PLDSxx.dll is required to be
-linked with this test case. Functions in this dll are
-in the source ns/nspr20/lib/ds/plevent.* files.
-
-Permission to use.
-
-The source for poppad.c are used under license from
-Petzold. The license to use is stated in the book.
-The following paragraph of the license grants that
-use.
-
- 5. SAMPLE CODE.  If the SOFTWARE includes Sample Code, then
-    Microsoft grants you a royalty-free right to reproduce and
-    distribute the sample code of the SOFTWARE provided that you:
-    (a) distribute the sample code only in conjunction with and
-    as part of your software product; (b) do not use Microsoft's
-    or its authors' names, logos, or trademarks to market your
-    software product; (c) include the copyright notice that appears
-    on the SOFTWARE on your product label and as a part of the
-    sign-on message for your software product; and (d) agree to
-    idemnify, hold harmless, and defend Microsoft and its authors
-    from and against any claims or lawsuits, including attorneys'
-    fees, that arise or result from the use or distribution of
-    your software product.
-
-lth. 9/24/97.
-
diff --git a/libs/js/nsprpub/pr/tests/writev.c b/libs/js/nsprpub/pr/tests/writev.c
deleted file mode 100644
index 603526c9f1..0000000000
--- a/libs/js/nsprpub/pr/tests/writev.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nspr.h"
-
-#include "plgetopt.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#define printf PR_LogPrint
-#endif
-
-
-#ifndef IOV_MAX
-#define IOV_MAX 16
-#endif
-
-#define BASE_PORT 9867
-
-int PR_CALLBACK Writev(int argc, char **argv)
-{
-
-    PRStatus rv;
-    PRNetAddr serverAddr;
-    PRFileDesc *clientSock, *debug = NULL;
-
-    char *buffer = NULL;
-    PRIOVec *iov = NULL;
-    PRBool passed = PR_TRUE;
-    PRIntervalTime timein, elapsed, timeout;
-    PRIntervalTime tmo_min = 0x7fffffff, tmo_max = 0, tmo_elapsed = 0;
-    PRInt32 tmo_counted = 0, iov_index, loop, bytes, number_fragments;
-    PRInt32 message_length = 100, fragment_length = 100, messages = 100;
-    struct Descriptor { PRInt32 length; PRUint32 checksum; } descriptor;
-
-    /*
-     * USAGE
-     * -h       dns name of host serving the connection (default = self)
-     * -m       number of messages to send              (default = 100)
-     * -s       size of each message                    (default = 100)
-     * -f       size of each message fragment           (default = 100)
-     */
-
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "dh:m:s:f:");
-
-    PR_STDIO_INIT();
-    rv = PR_InitializeNetAddr(PR_IpAddrLoopback, BASE_PORT, &serverAddr);
-    PR_ASSERT(PR_SUCCESS == rv);
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'h':  /* the remote host */
-            {
-                PRIntn es = 0;
-                PRHostEnt host;
-                char buffer[1024];
-                (void)PR_GetHostByName(opt->value, buffer, sizeof(buffer), &host);
-                es = PR_EnumerateHostEnt(es, &host, BASE_PORT, &serverAddr);
-                PR_ASSERT(es > 0);
-            }
-            break;
-        case 'd':  /* debug mode */
-            debug = PR_GetSpecialFD(PR_StandardError);
-            break;
-        case 'm':  /* number of messages to send */
-            messages = atoi(opt->value);
-            break;
-        case 's':  /* total size of each message */
-            message_length = atoi(opt->value);
-            break;
-        case 'f':  /* size of each message fragment */
-            fragment_length = atoi(opt->value);
-            break;
-        default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    buffer = (char*)malloc(message_length);
-
-    number_fragments = (message_length + fragment_length - 1) / fragment_length + 1;
-    while (IOV_MAX < number_fragments)
-    {
-        fragment_length = message_length / (IOV_MAX - 2);
-        number_fragments = (message_length + fragment_length - 1) /
-            fragment_length + 1;
-        if (NULL != debug) PR_fprintf(debug, 
-            "Too many fragments - reset fragment length to %ld\n", fragment_length);
-    }
-    iov = (PRIOVec*)malloc(number_fragments * sizeof(PRIOVec));
-
-    iov[0].iov_base = (char*)&descriptor;
-    iov[0].iov_len = sizeof(descriptor);
-    for (iov_index = 1; iov_index < number_fragments; ++iov_index)
-    {
-        iov[iov_index].iov_base = buffer + (iov_index - 1) * fragment_length;
-        iov[iov_index].iov_len = fragment_length;
-    }
-
-    for (bytes = 0; bytes < message_length; ++bytes)
-        buffer[bytes] = (char)bytes;
-
-    timeout = PR_SecondsToInterval(1);
-
-    for (loop = 0; loop < messages; ++loop)
-    {
-        if (NULL != debug)
-            PR_fprintf(debug, "[%d]socket ... ", loop);
-        clientSock = PR_NewTCPSocket();
-        if (clientSock)
-        {
-            timein = PR_IntervalNow();
-            if (NULL != debug)
-                PR_fprintf(debug, "connecting ... ");
-            rv = PR_Connect(clientSock, &serverAddr, timeout);
-            if (PR_SUCCESS == rv)
-            {
-                descriptor.checksum = 0;
-                descriptor.length = (loop < (messages - 1)) ? message_length : 0;
-                if (0 == descriptor.length) number_fragments = 1;
-                else
-                    for (iov_index = 0; iov_index < descriptor.length; ++iov_index)
-                    {
-                        PRUint32 overflow = descriptor.checksum & 0x80000000;
-                        descriptor.checksum = (descriptor.checksum << 1);
-                        if (0x00000000 != overflow) descriptor.checksum += 1;
-                        descriptor.checksum += buffer[iov_index];
-                    }
-                if (NULL != debug) PR_fprintf(
-                    debug, "sending %d bytes ... ", descriptor.length);
-
-                /* then, at the last moment ... */
-                descriptor.length = PR_ntohl(descriptor.length);
-                descriptor.checksum = PR_ntohl(descriptor.checksum);
-
-                bytes = PR_Writev(clientSock, iov, number_fragments, timeout);
-                if (NULL != debug)
-                    PR_fprintf(debug, "closing ... ");
-                rv = PR_Shutdown(clientSock, PR_SHUTDOWN_BOTH);
-                rv = PR_Close(clientSock);
-                if (NULL != debug) PR_fprintf(
-                    debug, "%s\n", ((PR_SUCCESS == rv) ? "good" : "bad"));
-                elapsed = PR_IntervalNow() - timein;
-                if (elapsed < tmo_min) tmo_min = elapsed;
-                else if (elapsed > tmo_max) tmo_max = elapsed;
-                tmo_elapsed += elapsed;
-                tmo_counted += 1;
-            }
-            else
-            {
-                if (NULL != debug) PR_fprintf(
-                    debug, "failed - retrying (%d, %d)\n",
-                    PR_GetError(), PR_GetOSError());
-                PR_Close(clientSock);
-            }
-        }
-        else if (NULL != debug)
-        {
-            PR_fprintf(debug, "unable to create client socket\n");
-            passed = PR_FALSE;
-        }
-    }
-    if (NULL != debug) {
-        if (0 == tmo_counted) {
-            PR_fprintf(debug, "No connection made\n");
-        } else {
-        PR_fprintf(
-            debug, "\nTimings: %d [%d] %d (microseconds)\n",
-            PR_IntervalToMicroseconds(tmo_min),
-            PR_IntervalToMicroseconds(tmo_elapsed / tmo_counted),
-            PR_IntervalToMicroseconds(tmo_max));
-	}
-    }
-
-    PR_DELETE(buffer);
-    PR_DELETE(iov);
-
-    PR_fprintf(
-        PR_GetSpecialFD(PR_StandardError),
-        "%s\n", (passed) ? "PASSED" : "FAILED");
-    return (passed) ? 0 : 1;
-}
-
-int main(int argc, char **argv)
-{
-    return (PR_VersionCheck(PR_VERSION)) ?
-        PR_Initialize(Writev, argc, argv, 4) : -1;
-}  /* main */
-
-/* writev.c */
-
-
diff --git a/libs/js/nsprpub/pr/tests/xnotify.c b/libs/js/nsprpub/pr/tests/xnotify.c
deleted file mode 100644
index 97f6491780..0000000000
--- a/libs/js/nsprpub/pr/tests/xnotify.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prprf.h"
-#include "prio.h"
-#include "prcvar.h"
-#include "prmon.h"
-#include "prcmon.h"
-#include "prlock.h"
-#include "prerror.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prthread.h"
-
-static PRLock *ml = NULL;
-static PRIntervalTime base;
-static PRFileDesc *err = NULL;
-
-typedef struct CMonShared
-{
-    PRInt32 o1, o2;
-} CMonShared;
-
-typedef struct MonShared
-{
-    PRMonitor *o1, *o2;
-} MonShared;
-
-typedef struct LockShared
-{
-    PRLock *o1, *o2;
-    PRCondVar *cv1, *cv2;
-} LockShared;
-
-static void LogNow(const char *msg, PRStatus rv)
-{
-    PRIntervalTime now = PR_IntervalNow();
-    PR_Lock(ml);
-    PR_fprintf(err, "%6ld: %s", (now - base), msg);
-    if (PR_FAILURE == rv) PL_FPrintError(err, " ");
-    else PR_fprintf(err, "\n");
-    PR_Unlock(ml);
-}  /* LogNow */
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: [-[d][l][m][c]] [-h]\n");
-    PR_fprintf(err, "\t-d   debug mode                  (default: FALSE)\n");
-    PR_fprintf(err, "\t-l   test with locks             (default: FALSE)\n");
-    PR_fprintf(err, "\t-m   tests with monitors         (default: FALSE)\n");
-    PR_fprintf(err, "\t-c   tests with cmonitors        (default: FALSE)\n");
-    PR_fprintf(err, "\t-h   help\n");
-}  /* Help */
-
-static void PR_CALLBACK T2CMon(void *arg)
-{
-    PRStatus rv;
-    CMonShared *shared = (CMonShared*)arg;
-
-    PR_CEnterMonitor(&shared->o1);
-    LogNow("T2 waiting 5 seconds on o1", PR_SUCCESS);
-    rv = PR_CWait(&shared->o1, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T2 resuming on o1", rv);
-    else LogNow("T2 wait failed on o1", rv);
-
-    rv = PR_CNotify(&shared->o1);
-    if (PR_SUCCESS == rv) LogNow("T2 notified o1", rv);
-    else LogNow("T2 notify on o1 failed", rv);
-
-    PR_CExitMonitor(&shared->o1);
-}  /* T2CMon */
-
-static void PR_CALLBACK T3CMon(void *arg)
-{
-    PRStatus rv;
-    CMonShared *shared = (CMonShared*)arg;
-
-    PR_CEnterMonitor(&shared->o2);
-    LogNow("T3 waiting 5 seconds on o2", PR_SUCCESS);
-    rv = PR_CWait(&shared->o2, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T3 resuming on o2", rv);
-    else LogNow("T3 wait failed on o2", rv);
-    rv = PR_CNotify(&shared->o2);
-    LogNow("T3 notify on o2", rv);
-    PR_CExitMonitor(&shared->o2);
-
-}  /* T3CMon */
-
-static CMonShared sharedCM;
-
-static void T1CMon(void)
-{
-    PRStatus rv;
-    PRThread *t2, *t3;
-
-    PR_fprintf(err, "\n**********************************\n");
-    PR_fprintf(err, "         CACHED MONITORS\n");
-    PR_fprintf(err, "**********************************\n");
-
-    base =  PR_IntervalNow();
-
-    PR_CEnterMonitor(&sharedCM.o1);
-    LogNow("T1 waiting 3 seconds on o1", PR_SUCCESS);
-    rv = PR_CWait(&sharedCM.o1, PR_SecondsToInterval(3));
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o1", rv);
-    else LogNow("T1 wait on o1 failed", rv);
-    PR_CExitMonitor(&sharedCM.o1);
-
-    LogNow("T1 creating T2", PR_SUCCESS);
-    t2 = PR_CreateThread(
-        PR_USER_THREAD, T2CMon, &sharedCM, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    LogNow("T1 creating T3", PR_SUCCESS);
-    t3 = PR_CreateThread(
-        PR_USER_THREAD, T3CMon, &sharedCM, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    PR_CEnterMonitor(&sharedCM.o2);
-    LogNow("T1 waiting forever on o2", PR_SUCCESS);
-    rv = PR_CWait(&sharedCM.o2, PR_INTERVAL_NO_TIMEOUT);
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o2", rv);
-    else LogNow("T1 wait on o2 failed", rv);
-    PR_CExitMonitor(&sharedCM.o2);
-
-    (void)PR_JoinThread(t2);
-    (void)PR_JoinThread(t3);
-
-}  /* T1CMon */
-
-static void PR_CALLBACK T2Mon(void *arg)
-{
-    PRStatus rv;
-    MonShared *shared = (MonShared*)arg;
-
-    PR_EnterMonitor(shared->o1);
-    LogNow("T2 waiting 5 seconds on o1", PR_SUCCESS);
-    rv = PR_Wait(shared->o1, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T2 resuming on o1", rv);
-    else LogNow("T2 wait failed on o1", rv);
-
-    rv = PR_Notify(shared->o1);
-    if (PR_SUCCESS == rv) LogNow("T2 notified o1", rv);
-    else LogNow("T2 notify on o1 failed", rv);
-
-    PR_ExitMonitor(shared->o1);
-}  /* T2Mon */
-
-static void PR_CALLBACK T3Mon(void *arg)
-{
-    PRStatus rv;
-    MonShared *shared = (MonShared*)arg;
-
-    PR_EnterMonitor(shared->o2);
-    LogNow("T3 waiting 5 seconds on o2", PR_SUCCESS);
-    rv = PR_Wait(shared->o2, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T3 resuming on o2", rv);
-    else LogNow("T3 wait failed on o2", rv);
-    rv = PR_Notify(shared->o2);
-    LogNow("T3 notify on o2", rv);
-    PR_ExitMonitor(shared->o2);
-
-}  /* T3Mon */
-
-static MonShared sharedM;
-static void T1Mon(void)
-{
-    PRStatus rv;
-    PRThread *t2, *t3;
-
-    PR_fprintf(err, "\n**********************************\n");
-    PR_fprintf(err, "            MONITORS\n");
-    PR_fprintf(err, "**********************************\n");
-
-    sharedM.o1 = PR_NewMonitor();
-    sharedM.o2 = PR_NewMonitor();
-
-    base =  PR_IntervalNow();
-
-    PR_EnterMonitor(sharedM.o1);
-    LogNow("T1 waiting 3 seconds on o1", PR_SUCCESS);
-    rv = PR_Wait(sharedM.o1, PR_SecondsToInterval(3));
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o1", rv);
-    else LogNow("T1 wait on o1 failed", rv);
-    PR_ExitMonitor(sharedM.o1);
-
-    LogNow("T1 creating T2", PR_SUCCESS);
-    t2 = PR_CreateThread(
-        PR_USER_THREAD, T2Mon, &sharedM, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    LogNow("T1 creating T3", PR_SUCCESS);
-    t3 = PR_CreateThread(
-        PR_USER_THREAD, T3Mon, &sharedM, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    PR_EnterMonitor(sharedM.o2);
-    LogNow("T1 waiting forever on o2", PR_SUCCESS);
-    rv = PR_Wait(sharedM.o2, PR_INTERVAL_NO_TIMEOUT);
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o2", rv);
-    else LogNow("T1 wait on o2 failed", rv);
-    PR_ExitMonitor(sharedM.o2);
-
-    (void)PR_JoinThread(t2);
-    (void)PR_JoinThread(t3);
-
-    PR_DestroyMonitor(sharedM.o1);
-    PR_DestroyMonitor(sharedM.o2);
-
-}  /* T1Mon */
-
-static void PR_CALLBACK T2Lock(void *arg)
-{
-    PRStatus rv;
-    LockShared *shared = (LockShared*)arg;
-
-    PR_Lock(shared->o1);
-    LogNow("T2 waiting 5 seconds on o1", PR_SUCCESS);
-    rv = PR_WaitCondVar(shared->cv1, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T2 resuming on o1", rv);
-    else LogNow("T2 wait failed on o1", rv);
-
-    rv = PR_NotifyCondVar(shared->cv1);
-    if (PR_SUCCESS == rv) LogNow("T2 notified o1", rv);
-    else LogNow("T2 notify on o1 failed", rv);
-
-    PR_Unlock(shared->o1);
-}  /* T2Lock */
-
-static void PR_CALLBACK T3Lock(void *arg)
-{
-    PRStatus rv;
-    LockShared *shared = (LockShared*)arg;
-
-    PR_Lock(shared->o2);
-    LogNow("T3 waiting 5 seconds on o2", PR_SUCCESS);
-    rv = PR_WaitCondVar(shared->cv2, PR_SecondsToInterval(5));
-    if (PR_SUCCESS == rv) LogNow("T3 resuming on o2", rv);
-    else LogNow("T3 wait failed on o2", rv);
-    rv = PR_NotifyCondVar(shared->cv2);
-    LogNow("T3 notify on o2", rv);
-    PR_Unlock(shared->o2);
-
-}  /* T3Lock */
-
-/*
-** Make shared' a static variable for Win16
-*/
-static LockShared sharedL;
-
-static void T1Lock(void)
-{
-    PRStatus rv;
-    PRThread *t2, *t3;
-    sharedL.o1 = PR_NewLock();
-    sharedL.o2 = PR_NewLock();
-    sharedL.cv1 = PR_NewCondVar(sharedL.o1);
-    sharedL.cv2 = PR_NewCondVar(sharedL.o2);
-
-    PR_fprintf(err, "\n**********************************\n");
-    PR_fprintf(err, "             LOCKS\n");
-    PR_fprintf(err, "**********************************\n");
-
-    base =  PR_IntervalNow();
-
-    PR_Lock(sharedL.o1);
-    LogNow("T1 waiting 3 seconds on o1", PR_SUCCESS);
-    rv = PR_WaitCondVar(sharedL.cv1, PR_SecondsToInterval(3));
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o1", rv);
-    else LogNow("T1 wait on o1 failed", rv);
-    PR_Unlock(sharedL.o1);
-
-    LogNow("T1 creating T2", PR_SUCCESS);
-    t2 = PR_CreateThread(
-        PR_USER_THREAD, T2Lock, &sharedL, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    LogNow("T1 creating T3", PR_SUCCESS);
-    t3 = PR_CreateThread(
-        PR_USER_THREAD, T3Lock, &sharedL, PR_PRIORITY_NORMAL,
-        PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-
-    PR_Lock(sharedL.o2);
-    LogNow("T1 waiting forever on o2", PR_SUCCESS);
-    rv = PR_WaitCondVar(sharedL.cv2, PR_INTERVAL_NO_TIMEOUT);
-    if (PR_SUCCESS == rv) LogNow("T1 resuming on o2", rv);
-    else LogNow("T1 wait on o2 failed", rv);
-    PR_Unlock(sharedL.o2);
-
-    (void)PR_JoinThread(t2);
-    (void)PR_JoinThread(t3);
-
-    PR_DestroyLock(sharedL.o1);
-    PR_DestroyLock(sharedL.o2);
-    PR_DestroyCondVar(sharedL.cv1);
-    PR_DestroyCondVar(sharedL.cv2);
-}  /* T1Lock */
-
-static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv )
-{
-	PLOptStatus os;
-  	PLOptState *opt = PL_CreateOptState(argc, argv, "dhlmc");
-	PRBool locks = PR_FALSE, monitors = PR_FALSE, cmonitors = PR_FALSE;
-
-    err = PR_GetSpecialFD(PR_StandardError);
-
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode (noop) */
-            break;
-        case 'l':  /* locks */
-			locks = PR_TRUE;
-            break;
-        case 'm':  /* monitors */
-			monitors = PR_TRUE;
-            break;
-        case 'c':  /* cached monitors */
-			cmonitors = PR_TRUE;
-            break;
-        case 'h':  /* needs guidance */
-         default:
-            Help();
-            return 2;
-        }
-    }
-	PL_DestroyOptState(opt);
-
-    ml = PR_NewLock();
-    if (locks) T1Lock();
-    if (monitors) T1Mon();
-    if (cmonitors) T1CMon();
-
-    PR_DestroyLock(ml);
-
-    PR_fprintf(err, "Done!\n");    
-    return 0;
-}  /* main */
-
-
-PRIntn main(PRIntn argc, char **argv)
-{
-    PRIntn rv;
-    
-    PR_STDIO_INIT();
-    rv = PR_Initialize(RealMain, argc, argv, 0);
-    return rv;
-}  /* main */
-/* xnotify.c */
diff --git a/libs/js/nsprpub/pr/tests/y2k.c b/libs/js/nsprpub/pr/tests/y2k.c
deleted file mode 100644
index 80fc10a54f..0000000000
--- a/libs/js/nsprpub/pr/tests/y2k.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * file: y2k.c
- * description: Test for y2k compliance for NSPR.
- *
- * Sep 1999. lth. Added "Sun" specified dates to the test data.
- */
-/***********************************************************************
-** Includes
-***********************************************************************/
-/* Used to get the command line option */
-#include "plgetopt.h"
-
-#include "prinit.h"
-#include "prtime.h"
-#include "prprf.h"
-#include "prlog.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef XP_MAC
-#include "prlog.h"
-#include "macstdlibextras.h"
-extern void SetupMacPrintfLog(char *logFile);
-#endif
-
-#define PRINT_DETAILS
-
-int failed_already=0;
-PRBool debug_mode = PR_FALSE;
-
-static char *dayOfWeek[] =
-	{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "???" };
-static char *month[] =
-	{ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "???" };
-
-PRLogModuleInfo *lm;
-
-static void PrintExplodedTime(const PRExplodedTime *et) {
-    PRInt32 totalOffset;
-    PRInt32 hourOffset, minOffset;
-    const char *sign;
-
-    /* Print day of the week, month, day, hour, minute, and second */
-    printf("%s %s %2ld %02ld:%02ld:%02ld ",
-	    dayOfWeek[et->tm_wday], month[et->tm_month], et->tm_mday,
-	    et->tm_hour, et->tm_min, et->tm_sec);
-
-    /* Print year */
-    printf("%hd ", et->tm_year);
-
-    /* Print time zone */
-    totalOffset = et->tm_params.tp_gmt_offset + et->tm_params.tp_dst_offset;
-    if (totalOffset == 0) {
-	printf("UTC ");
-    } else {
-        sign = "+";
-        if (totalOffset < 0) {
-	    totalOffset = -totalOffset;
-	    sign = "-";
-        }
-        hourOffset = totalOffset / 3600;
-        minOffset = (totalOffset % 3600) / 60;
-        printf("%s%02ld%02ld ", sign, hourOffset, minOffset);
-    }
-#ifdef PRINT_DETAILS
-	printf("{%d, %d, %d, %d, %d, %d, %d, %d, %d, { %d, %d}}\n",et->tm_usec,
-											et->tm_sec,
-											et->tm_min,
-											et->tm_hour,
-											et->tm_mday,
-											et->tm_month,
-											et->tm_year,
-											et->tm_wday,
-											et->tm_yday,
-											et->tm_params.tp_gmt_offset,
-											et->tm_params.tp_dst_offset);
-#endif
-}
-
-static int ExplodedTimeIsEqual(const PRExplodedTime *et1,
-	const PRExplodedTime *et2)
-{
-    if (et1->tm_usec == et2->tm_usec &&
-	    et1->tm_sec == et2->tm_sec &&
-	    et1->tm_min == et2->tm_min &&
-	    et1->tm_hour == et2->tm_hour &&
-	    et1->tm_mday == et2->tm_mday &&
-	    et1->tm_month == et2->tm_month &&
-	    et1->tm_year == et2->tm_year &&
-	    et1->tm_wday == et2->tm_wday &&
-	    et1->tm_yday == et2->tm_yday &&
-	    et1->tm_params.tp_gmt_offset == et2->tm_params.tp_gmt_offset &&
-	    et1->tm_params.tp_dst_offset == et2->tm_params.tp_dst_offset) {
-        return 1;
-    } else {
-	return 0;
-    }
-}
-
-/*
- * TEST 1: TestExplodeImplodeTime
- * Description:
- * For each given timestamp T (a PRTime value), call PR_ExplodeTime
- * with GMT, US Pacific, and local time parameters.  Compare the
- * resulting calendar (exploded) time values with the expected
- * values.
- *
- * Note: the expected local time values depend on the local time
- * zone.  The local time values stored in this test are for the US
- * Pacific Time Zone.  If you are running this test in a different
- * time zone, you need to modify the values in the localt array.
- * An example is provided below.
- *
- * Call PR_ImplodeTime for each of the exploded values and compare
- * the resulting PRTime values with the original input.
- * 
- * This test is run for the values of time T corresponding to the
- * following dates:
- * - 12/31/99 - before 2000 
- * - 01/01/00 - after 2000 
- * - Leap year - Feb 29, 2000 
- * - March 1st, 2001 (after 1 year) 
- * - March 1st, 2005 (after second leap year) 
- * - 09/09/99 (used by some programs as an end of file marker)
- *
- * Call PR_Now, convert to calendar time using PR_ExplodeTime and
- * manually check the result for correctness. The time should match
- * the system clock.
- *
- * Tested functions: PR_Now, PR_ExplodeTime, PR_ImplodeTime,
- * PR_LocalTimeParameters, PR_GMTParameters. 
- */
-
-static PRTime prt[] = {
-    LL_INIT(220405, 2133125120),  /* 946634400000000 */
-    LL_INIT(220425, 2633779200),  /* 946720800000000 */
-    LL_INIT(221612, 2107598848),  /* 951818400000000 */
-    LL_INIT(228975, 663398400),  /* 983440800000000 */
-    LL_INIT(258365, 1974568960),  /* 1109671200000000 */
-    LL_INIT(218132, 1393788928),  /* 936871200000000 */
-    /* Sun's dates follow */
-    LL_INIT( 213062, 4077979648 ), /* Dec 31 1998 10:00:00 */
-    LL_INIT( 218152, 1894443008 ), /* Sep 10 1999 10:00:00 */
-    LL_INIT( 221592, 1606944768 ), /* Feb 28 2000 10:00:00 */
-    LL_INIT( 227768, 688924672 ), /* Dec 31 2000 10:00:00 */
-    LL_INIT( 227788, 1189578752 ), /* Jan 1  2001 10:00:00 */
-};
-
-static PRExplodedTime gmt[] = {
-    { 0, 0, 0, 10, 31, 11, 1999, 5, 364, {0, 0}}, /* 1999/12/31 10:00:00 GMT */
-    { 0, 0, 0, 10, 1, 0, 2000, 6, 0, {0, 0}}, /* 2000/01/01 10:00:00 GMT */
-    { 0, 0, 0, 10, 29, 1, 2000, 2, 59, {0, 0}}, /* 2000/02/29 10:00:00 GMT */
-    { 0, 0, 0, 10, 1, 2, 2001, 4, 59, {0, 0}}, /* 2001/3/1 10:00:00 GMT */
-    { 0, 0, 0, 10, 1, 2, 2005, 2, 59, {0, 0}}, /* 2005/3/1 10:00:00 GMT */
-    { 0, 0, 0, 10, 9, 8, 1999, 4, 251, {0, 0}},  /* 1999/9/9 10:00:00 GMT */
-    /* Sun's dates follow */
-    { 0, 0, 0, 10, 31, 11, 1998, 4, 364, {0, 0}},  /* 12/31/1998 10:00:00 GMT */
-    { 0, 0, 0, 10, 10, 8, 1999, 5, 252, {0, 0}},  /* 9/10/1999 10:00:00 GMT */
-    { 0, 0, 0, 10, 28, 1, 2000, 1, 58, {0, 0}},  /* 2/28/2000 10:00:00 GMT */
-    { 0, 0, 0, 10, 31, 11, 2000, 0, 365, {0, 0}},  /* 12/31/2000 10:00:00 GMT */
-    { 0, 0, 0, 10, 1, 0, 2001, 1, 0, {0, 0}}  /* 1/1/2001 10:00:00 GMT */
-};
-
-static PRExplodedTime uspt[] = {
-{ 0, 0, 0, 2, 31, 11, 1999, 5, 364, {-28800, 0}}, /* 1999/12/31 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 0, 2000, 6, 0, {-28800, 0}}, /* 2000/01/01 2:00:00 PST */
-{ 0, 0, 0, 2, 29, 1, 2000, 2, 59, {-28800, 0}}, /* 2000/02/29 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 2, 2001, 4, 59, {-28800, 0}}, /* 2001/3/1 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 2, 2005, 2, 59, {-28800, 0}}, /* 2005/3/1 2:00:00 PST */
-{ 0, 0, 0, 3, 9, 8, 1999, 4, 251, {-28800, 3600}},  /* 1999/9/9 3:00:00 PDT */
-    /* Sun's dates follow */
-    { 0, 0, 0, 2, 31, 11, 1998, 4, 364, {-28800, 0}},  /* 12/31/1998 00:00:00 GMT */
-    { 0, 0, 0, 3, 10, 8, 1999, 5, 252, {-28800, 3600}},  /* 9/10/1999 00:00:00 GMT */
-    { 0, 0, 0, 2, 28, 1, 2000, 1, 58, {-28800, 0}},  /* 2/28/2000 00:00:00 GMT */
-    { 0, 0, 0, 2, 31, 11, 2000, 0, 365, {-28800, 0}},  /* 12/31/2000 00:00:00 GMT */
-    { 0, 0, 0, 2, 1, 0, 2001, 1, 0, {-28800, 0}}  /* 1/1/2001 00:00:00 GMT */
-};
-
-/*
- * This test assumes that we are in US Pacific Time Zone.
- * If you are running this test in a different time zone,
- * you need to modify the localt array and fill in the
- * expected results.  The localt array for US Eastern Time
- * Zone is provided as an example.
- */
-static PRExplodedTime localt[] = {
-{ 0, 0, 0, 2, 31, 11, 1999, 5, 364, {-28800, 0}}, /* 1999/12/31 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 0, 2000, 6, 0, {-28800, 0}}, /* 2000/01/01 2:00:00 PST */
-{ 0, 0, 0, 2, 29, 1, 2000, 2, 59, {-28800, 0}}, /* 2000/02/29 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 2, 2001, 4, 59, {-28800, 0}}, /* 2001/3/1 2:00:00 PST */
-{ 0, 0, 0, 2, 1, 2, 2005, 2, 59, {-28800, 0}}, /* 2005/3/1 2:00:00 PST */
-{ 0, 0, 0, 3, 9, 8, 1999, 4, 251, {-28800, 3600}},  /* 1999/9/9 3:00:00 PDT */
-    /* Sun's dates follow */
-    { 0, 0, 0, 2, 31, 11, 1998, 4, 364, {-28800, 0}},  /* 12/31/1998 00:00:00 GMT */
-    { 0, 0, 0, 3, 10, 8, 1999, 5, 252, {-28800, 3600}},  /* 9/10/1999 00:00:00 GMT */
-    { 0, 0, 0, 2, 28, 1, 2000, 1, 58, {-28800, 0}},  /* 2/28/2000 00:00:00 GMT */
-    { 0, 0, 0, 2, 31, 11, 2000, 0, 365, {-28800, 0}},  /* 12/31/2000 00:00:00 GMT */
-    { 0, 0, 0, 2, 1, 0, 2001, 1, 0, {-28800, 0}}  /* 1/1/2001 00:00:00 GMT */
-};
-
-#ifdef US_EASTERN_TIME
-static PRExplodedTime localt[] = {
-{ 0, 0, 0, 5, 31, 11, 1999, 5, 364, {-18000, 0}}, /* 1999/12/31 2:00:00 EST */
-{ 0, 0, 0, 5, 1, 0, 2000, 6, 0, {-18000, 0}}, /* 2000/01/01 2:00:00 EST */
-{ 0, 0, 0, 5, 29, 1, 2000, 2, 59, {-18000, 0}}, /* 2000/02/29 2:00:00 EST */
-{ 0, 0, 0, 5, 1, 2, 2001, 4, 59, {-18000, 0}}, /* 2001/3/1 2:00:00 EST */
-{ 0, 0, 0, 5, 1, 2, 2005, 2, 59, {-18000, 0}}, /* 2005/3/1 2:00:00 EST */
-{ 0, 0, 0, 6, 9, 8, 1999, 4, 251, {-18000, 3600}},  /* 1999/9/9 3:00:00 EDT */
-    /* Sun's dates follow */
-    { 0, 0, 0, 5, 31, 11, 1998, 4, 364, {-18000 0}},  /* 12/31/1998 00:00:00 GMT */
-    { 0, 0, 0, 6, 10, 8, 1999, 5, 252, {-18000 3600}},  /* 9/10/1999 00:00:00 GMT */
-    { 0, 0, 0, 5, 28, 1, 2000, 1, 58, {-18000 0}},  /* 2/28/2000 00:00:00 GMT */
-    { 0, 0, 0, 5, 31, 11, 2000, 0, 365, {-18000 0}},  /* 12/31/2000 00:00:00 GMT */
-    { 0, 0, 0, 5, 1, 0, 2001, 1, 0, {-18000 0}}  /* 1/1/2001 00:00:00 GMT */
-};
-#endif
-
-static PRStatus TestExplodeImplodeTime(void)
-{
-    PRTime prt_tmp;
-    PRTime now;
-    int idx;
-    int array_size = sizeof(prt) / sizeof(PRTime);
-    PRExplodedTime et_tmp;
-    char buf[1024];
-
-    for (idx = 0; idx < array_size; idx++) {
-        PR_snprintf(buf, sizeof(buf), "%lld", prt[idx]);
-        if (debug_mode) printf("Time stamp %s\n", buf); 
-        PR_ExplodeTime(prt[idx], PR_GMTParameters, &et_tmp);
-        if (!ExplodedTimeIsEqual(&et_tmp, &gmt[idx])) {
-            fprintf(stderr, "GMT not equal\n");
-            PrintExplodedTime(&et_tmp);
-            PrintExplodedTime(&gmt[idx]);
-            exit(1);
-        }
-        prt_tmp = PR_ImplodeTime(&et_tmp);
-        if (LL_NE(prt_tmp, prt[idx])) {
-            fprintf(stderr, "PRTime not equal\n");
-            exit(1);
-        }
-        if (debug_mode) {
-            printf("GMT: ");
-            PrintExplodedTime(&et_tmp);
-            printf("\n");
-        }
-
-        PR_ExplodeTime(prt[idx], PR_USPacificTimeParameters, &et_tmp);
-        if (!ExplodedTimeIsEqual(&et_tmp, &uspt[idx])) {
-            fprintf(stderr, "US Pacific Time not equal\n");
-            PrintExplodedTime(&et_tmp);
-            PrintExplodedTime(&uspt[idx]);
-            exit(1);
-        }
-        prt_tmp = PR_ImplodeTime(&et_tmp);
-        if (LL_NE(prt_tmp, prt[idx])) {
-            fprintf(stderr, "PRTime not equal\n");
-            exit(1);
-        }
-        if (debug_mode) {
-            printf("US Pacific Time: ");
-            PrintExplodedTime(&et_tmp);
-            printf("\n");
-        }
-
-        PR_ExplodeTime(prt[idx], PR_LocalTimeParameters, &et_tmp);
-        if (!ExplodedTimeIsEqual(&et_tmp, &localt[idx])) {
-            fprintf(stderr, "not equal\n");
-            PrintExplodedTime(&et_tmp);
-            PrintExplodedTime(&localt[idx]);
-            exit(1);
-        }
-        prt_tmp = PR_ImplodeTime(&et_tmp);
-        if (LL_NE(prt_tmp, prt[idx])) {
-            fprintf(stderr, "not equal\n");
-            exit(1);
-        }
-        if (debug_mode) {
-            printf("Local time:");
-            PrintExplodedTime(&et_tmp);
-            printf("\n\n");
-        }
-    }
-
-    now = PR_Now();
-    PR_ExplodeTime(now, PR_GMTParameters, &et_tmp);
-    printf("Current GMT is ");
-    PrintExplodedTime(&et_tmp);
-    printf("\n");
-    prt_tmp = PR_ImplodeTime(&et_tmp);
-    if (LL_NE(prt_tmp, now)) {
-        fprintf(stderr, "not equal\n");
-        exit(1);
-    }
-    PR_ExplodeTime(now, PR_USPacificTimeParameters, &et_tmp);
-    printf("Current US Pacific Time is ");
-    PrintExplodedTime(&et_tmp);
-    printf("\n");
-    prt_tmp = PR_ImplodeTime(&et_tmp);
-    if (LL_NE(prt_tmp, now)) {
-        fprintf(stderr, "not equal\n");
-        exit(1);
-    }
-    PR_ExplodeTime(now, PR_LocalTimeParameters, &et_tmp);
-    printf("Current local time is ");
-    PrintExplodedTime(&et_tmp);
-    printf("\n");
-    prt_tmp = PR_ImplodeTime(&et_tmp);
-    if (LL_NE(prt_tmp, now)) {
-        fprintf(stderr, "not equal\n");
-        exit(1);
-    }
-    printf("Please verify the results\n\n");
-
-    if (debug_mode) printf("Test 1 passed\n");
-    return PR_SUCCESS;
-}
-/* End of Test 1: TestExplodeImplodeTime */
-
-/*
- * Test 2: Normalize Time
- */
-
-/*
- * time increment for addition to PRExplodeTime
- */
-typedef struct time_increment {
-	PRInt32 ti_usec;
-	PRInt32 ti_sec;
-	PRInt32 ti_min;
-	PRInt32 ti_hour;
-} time_increment_t;
-
-/*
- * Data for testing PR_Normalize
- *		Add the increment to base_time, normalize it to GMT and US Pacific
- *		Time zone.
- */
-typedef struct normalize_test_data {
-    PRExplodedTime		base_time; 
-    time_increment_t  	increment;
-    PRExplodedTime		expected_gmt_time;
-    PRExplodedTime		expected_uspt_time;
-} normalize_test_data_t;
-
-
-/*
- * Test data -	the base time values cover dates of interest including y2k - 1,
- *				y2k + 1, y2k leap year, y2k leap date + 1year,
- *				y2k leap date + 4 years
- */
-normalize_test_data_t normalize_test_array[] = {
-  /*usec sec min hour  mday  mo  year  wday yday {gmtoff, dstoff }*/
-
-	/* Fri 12/31/1999 19:32:48 PST */
-	{{0, 48, 32, 19, 31, 11, 1999, 5, 364, { -28800, 0}},
-    {0, 0, 30, 20},
-	{0, 48, 2, 0, 2, 0, 2000, 0, 1, { 0, 0}},	/*Sun Jan 2 00:02:48 UTC 2000*/
-	{0, 48, 2, 16, 1, 0, 2000, 6, 0, { -28800, 0}},/* Sat Jan 1 16:02:48
-														PST 2000*/
-	},
-	/* Fri 99-12-31 23:59:02 GMT */
-	{{0, 2, 59, 23, 31, 11, 1999, 5, 364, { 0, 0}},
-    {0, 0, 45, 0},
-	{0, 2, 44, 0, 1, 0, 2000, 6, 0, { 0, 0}},/* Sat Jan 1 00:44:02 UTC 2000*/
-	{0, 2, 44, 16, 31, 11, 1999, 5, 364, { -28800, 0}}/*Fri Dec 31 16:44:02
-														PST 1999*/
-	},
-	/* 99-12-25 12:00:00 GMT */
-	{{0, 0, 0, 12, 25, 11, 1999, 6, 358, { 0, 0}},
-    {0, 0, 0, 364 * 24},
-	{0, 0, 0, 12, 23, 11, 2000, 6, 357, { 0, 0}},/*Sat Dec 23 12:00:00
-													2000 UTC*/
-	{0, 0, 0, 4, 23, 11, 2000, 6, 357, { -28800, 0}}/*Sat Dec 23 04:00:00
-														2000 -0800*/
-	},
-	/* 00-01-1 00:00:00 PST */
-    {{0, 0, 0, 0, 1, 0, 2000, 6, 0, { -28800, 0}},
-    {0, 0, 0, 48},
-    {0, 0, 0, 8, 3, 0, 2000, 1, 2, { 0, 0}},/*Mon Jan  3 08:00:00 2000 UTC*/
-    {0, 0, 0, 0, 3, 0, 2000, 1, 2, { -28800, 0}}/*Mon Jan  3 00:00:00 2000
-																-0800*/
-	},
-	/* 00-01-10 12:00:00 PST */
-    {{0, 0, 0, 12, 10, 0, 2000, 1, 9, { -28800, 0}},
-    {0, 0, 0, 364 * 5 * 24},
-    {0, 0, 0, 20, 3, 0, 2005, 1, 2, { 0, 0}},/*Mon Jan  3 20:00:00 2005 UTC */
-    {0, 0, 0, 12, 3, 0, 2005, 1, 2, { -28800, 0}}/*Mon Jan  3 12:00:00
-														2005 -0800*/
-	},
-	/* 00-02-28 15:39 GMT */
-	{{0, 0, 39, 15, 28, 1, 2000, 1, 58, { 0, 0}},
-    {0,  0, 0, 24},
-	{0, 0, 39, 15, 29, 1, 2000, 2, 59, { 0, 0}}, /*Tue Feb 29 15:39:00 2000
-														UTC*/
-	{0, 0, 39, 7, 29, 1, 2000, 2, 59, { -28800, 0}}/*Tue Feb 29 07:39:00
-														2000 -0800*/
-	},
-	/* 01-03-01 12:00 PST */
-    {{0, 0, 0, 12, 3, 0, 2001, 3, 2, { -28800, 0}},/*Wed Jan 3 12:00:00
-													-0800 2001*/
-    {0, 30, 30,45},
-    {0, 30, 30, 17, 5, 0, 2001, 5, 4, { 0, 0}}, /*Fri Jan  5 17:30:30 2001
-													UTC*/
-    {0, 30, 30, 9, 5, 0, 2001, 5, 4, { -28800, 0}} /*Fri Jan  5 09:30:30
-														2001 -0800*/
-	},
-	/* 2004-04-26 12:00 GMT */
-	{{0, 0, 0, 20, 3, 0, 2001, 3, 2, { 0, 0}},
-    {0, 0, 30,0},
-	{0, 0, 30, 20, 3, 0, 2001, 3, 2, { 0, 0}},/*Wed Jan  3 20:30:00 2001 UTC*/ 
-    {0, 0, 30, 12, 3, 0, 2001, 3, 2, { -28800, 0}}/*Wed Jan  3 12:30:00
-														2001 -0800*/
-	},
-	/* 99-09-09 00:00 GMT */
-	{{0, 0, 0, 0, 9, 8, 1999, 4, 251, { 0, 0}},
-    {0, 0, 0, 12},
-    {0, 0, 0, 12, 9, 8, 1999, 4, 251, { 0, 0}},/*Thu Sep  9 12:00:00 1999 UTC*/
-    {0, 0, 0, 5, 9, 8, 1999, 4, 251, { -28800, 3600}}/*Thu Sep  9 05:00:00
-														1999 -0700*/
-	}
-};
-
-void add_time_increment(PRExplodedTime *et1, time_increment_t *it)
-{
-	et1->tm_usec += it->ti_usec;
-	et1->tm_sec	+= it->ti_sec;
-	et1->tm_min += it->ti_min;
-	et1->tm_hour += it->ti_hour;
-}
-
-/*
-** TestNormalizeTime() -- Test PR_NormalizeTime()
-**		For each data item, add the time increment to the base_time and then
-**		normalize it for GMT and local time zones. This test assumes that
-**		the local time zone is the Pacific Time Zone. The normalized values
-**		should match the expected values in the data item.
-**
-*/
-PRStatus TestNormalizeTime(void)
-{
-int idx, count;
-normalize_test_data_t *itemp;
-time_increment_t *itp;
-
-	count = sizeof(normalize_test_array)/sizeof(normalize_test_array[0]);
-	for (idx = 0; idx < count; idx++) {
-		itemp = &normalize_test_array[idx];
-		if (debug_mode) {
-			printf("%2d. %15s",idx +1,"Base time: ");
-			PrintExplodedTime(&itemp->base_time);
-			printf("\n");
-		}
-		itp = &itemp->increment;
-		if (debug_mode) {
-			printf("%20s %2d hrs %2d min %3d sec\n","Add",itp->ti_hour,
-												itp->ti_min, itp->ti_sec);
-		}
-		add_time_increment(&itemp->base_time, &itemp->increment);
-		PR_NormalizeTime(&itemp->base_time, PR_LocalTimeParameters);
-		if (debug_mode) {
-			printf("%19s","PST time: ");
-			PrintExplodedTime(&itemp->base_time);
-			printf("\n");
-		}
-		if (!ExplodedTimeIsEqual(&itemp->base_time,
-									&itemp->expected_uspt_time)) {
-			printf("PR_NormalizeTime failed\n");
-			if (debug_mode)
-				PrintExplodedTime(&itemp->expected_uspt_time);
-			return PR_FAILURE;
-		}
-		PR_NormalizeTime(&itemp->base_time, PR_GMTParameters);
-		if (debug_mode) {
-			printf("%19s","GMT time: ");
-			PrintExplodedTime(&itemp->base_time);
-			printf("\n");
-		}
-
-		if (!ExplodedTimeIsEqual(&itemp->base_time,
-									&itemp->expected_gmt_time)) {
-			printf("PR_NormalizeTime failed\n");
-			return PR_FAILURE;
-		}
-	}
-	return PR_SUCCESS;
-}
-
-
-/*
-** ParseTest. Structure defining a string time and a matching exploded time
-**
-*/
-typedef struct ParseTest
-{
-    char            *sDate;     /* string to be converted using PR_ParseTimeString() */
-    PRExplodedTime  et;         /* expected result of the conversion */
-} ParseTest;
-
-static ParseTest parseArray[] = 
-{
-    /*                                  |<----- expected result ------------------------------------------->| */
-    /* "string to test"                   usec     sec min hour   day  mo  year  wday julian {gmtoff, dstoff }*/
-    { "Thursday 1 Jan 1970 00:00:00",   { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "1 Jan 1970 00:00:00",            { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "1-Jan-1970 00:00:00",            { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "01-Jan-1970 00:00:00",           { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "January 1, 1970",                { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "January 1, 1970 00:00",          { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "January 01, 1970 00:00",         { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "January 01 1970 00:00",          { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "January 01 1970 00:00:00",       { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "01-01-1970",                     { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "01/01/1970",                     { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "01/01/70",                       { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "01/01/70 00:00:00",              { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "70/01/01 00:00:00",              { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "70/1/1 00:00:",                  { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "00:00 Thursday, January 1, 1970",{ 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "1-Jan-70 00:00:00",              { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "70-01-01 00:00:00",              { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-    { "70/01/01 00:00:00",              { 000000,  00, 00, 00,     1,   0, 1970, 4,     0,   {-28800, 0 }}},
-
-    /* 31-Dec-1969 */
-    { "Wed 31 Dec 1969 00:00:00",       { 000000,  00, 00, 00,    31,  11, 1969, 3,   364,   {-28800, 0 }}},
-    { "31 Dec 1969 00:00:00",           { 000000,  00, 00, 00,    31,  11, 1969, 3,   364,   {-28800, 0 }}},
-    { "12/31/69    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2069, 2,   364,   {-28800, 0 }}},
-    { "12/31/1969  00:00:00",           { 000000,  00, 00, 00,    31,  11, 1969, 3,   364,   {-28800, 0 }}},
-    { "12-31-69    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2069, 2,   364,   {-28800, 0 }}},
-    { "12-31-1969  00:00:00",           { 000000,  00, 00, 00,    31,  11, 1969, 3,   364,   {-28800, 0 }}},
-    { "69-12-31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2069, 2,   364,   {-28800, 0 }}},
-    { "69/12/31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2069, 2,   364,   {-28800, 0 }}},
-
-    /* "Sun". 31-Dec-1998 (?) */ 
-    { "Thu 31 Dec 1998 00:00:00",        { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "12/31/98    00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "12/31/1998  00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "12-31-98    00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "12-31-1998  00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "98-12-31    00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-    { "98/12/31    00:00:00",            { 00000,  00, 00, 00,    31,  11, 1998, 4,   364,    {-28800, 0 }}},
-
-    /* 09-Sep-1999. Interesting because of its use as an eof marker? */
-    { "09 Sep 1999 00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "9/9/99      00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "9/9/1999    00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "9-9-99      00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "9-9-1999    00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "09-09-99    00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "09-09-1999  00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    { "99-09-09    00:00:00",           { 000000,  00, 00, 00,     9,   8, 1999, 4,   251,   {-28800, 3600 }}},
-    
-    /* "Sun". 10-Sep-1999. Because Sun said so. */
-    { "10 Sep 1999 00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "9/10/99     00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "9/10/1999   00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "9-10-99     00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "9-10-1999   00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "09-10-99    00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "09-10-1999  00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-    { "99-09-10    00:00:00",           { 000000,  00, 00, 00,    10,   8, 1999, 5,   252,   {-28800, 3600 }}},
-
-    /* 31-Dec-1999 */
-    { "31 Dec 1999 00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "12/31/99    00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "12/31/1999  00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "12-31-99    00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "12-31-1999  00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "99-12-31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-    { "99/12/31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 1999, 5,   364,   {-28800, 0 }}},
-
-    /* 01-Jan-2000 */
-    { "01 Jan 2000 00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "1/1/00      00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "1/1/2000    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "1-1-00      00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "1-1-2000    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "01-01-00    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-    { "Saturday 01-01-2000  00:00:00",  { 000000,  00, 00, 00,     1,   0, 2000, 6,     0,   {-28800, 0 }}},
-
-    /* "Sun". 28-Feb-2000 */
-    { "28 Feb 2000 00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "2/28/00     00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "2/28/2000   00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "2-28-00     00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "2-28-2000   00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "02-28-00    00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-    { "02-28-2000  00:00:00",           { 000000,  00, 00, 00,    28,   1, 2000, 1,    58,   {-28800, 0 }}},
-
-    /* 29-Feb-2000 */
-    { "29 Feb 2000 00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "2/29/00     00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "2/29/2000   00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "2-29-00     00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "2-29-2000   00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "02-29-00    00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-    { "02-29-2000  00:00:00",           { 000000,  00, 00, 00,    29,   1, 2000, 2,    59,   {-28800, 0 }}},
-
-    /* 01-Mar-2000 */
-    { "01 Mar 2000 00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-    { "3/1/00      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-    { "3/1/2000    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-    { "3-1-00      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-    { "03-01-00    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-    { "03-01-2000  00:00:00",           { 000000,  00, 00, 00,     1,   2, 2000, 3,    60,   {-28800, 0 }}},
-
-    /* "Sun". 31-Dec-2000 */
-    { "31 Dec 2000 00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "12/31/00    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "12/31/2000  00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "12-31-00    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "12-31-2000  00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "00-12-31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-    { "00/12/31    00:00:00",           { 000000,  00, 00, 00,    31,  11, 2000, 0,   365,   {-28800, 0 }}},
-
-    /* "Sun". 01-Jan-2001 */
-    { "01 Jan 2001 00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "1/1/01      00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "1/1/2001    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "1-1-01      00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "1-1-2001    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "01-01-01    00:00:00",           { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-    { "Saturday 01-01-2001  00:00:00",  { 000000,  00, 00, 00,     1,   0, 2001, 1,     0,   {-28800, 0 }}},
-
-    /* 01-Mar-2001 */
-    { "01 Mar 2001 00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "3/1/01      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "3/1/2001    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "3-1-01      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "3-1-2001    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "03-01-01    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-    { "03-01-2001  00:00:00",           { 000000,  00, 00, 00,     1,   2, 2001, 4,    59,   {-28800, 0 }}},
-
-    /* 29-Feb-2004 */
-    { "29 Feb 2004 00:00:00",           { 000000,  00, 00, 00,    29,   1, 2004, 0,    59,   {-28800, 0 }}},
-    { "2/29/04     00:00:00",           { 000000,  00, 00, 00,    29,   1, 2004, 0,    59,   {-28800, 0 }}},
-    { "2/29/2004   00:00:00",           { 000000,  00, 00, 00,    29,   1, 2004, 0,    59,   {-28800, 0 }}},
-    { "2-29-04     00:00:00",           { 000000,  00, 00, 00,    29,   1, 2004, 0,    59,   {-28800, 0 }}},
-    { "2-29-2004   00:00:00",           { 000000,  00, 00, 00,    29,   1, 2004, 0,    59,   {-28800, 0 }}},
-
-    /* 01-Mar-2004 */
-    { "01 Mar 2004 00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "3/1/04      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "3/1/2004    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "3-1-04      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "3-1-2004    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "03-01-04    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-    { "03-01-2004  00:00:00",           { 000000,  00, 00, 00,     1,   2, 2004, 1,    60,   {-28800, 0 }}},
-
-    /* 01-Mar-2005 */
-    { "01 Mar 2005 00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "3/1/05      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "3/1/2005    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "3-1-05      00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "3-1-2005    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "03-01-05    00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-    { "03-01-2005  00:00:00",           { 000000,  00, 00, 00,     1,   2, 2005, 2,    59,   {-28800, 0 }}},
-
-    /* last element. string must be null */
-    { NULL }        
-}; /* end array of ParseTest */
-
-/*
-** TestParseTime() -- Test PR_ParseTimeString() for y2k compliance
-**
-** TestParseTime() loops thru the array parseArray. For each element in
-** the array, he calls PR_ParseTimeString() with sDate as the conversion
-** argument. The result (ct) is then converted to a PRExplodedTime structure
-** and compared with the exploded time value (parseArray[n].et) in the
-** array element; if equal, the element passes the test.
-**
-** The array parseArray[] contains entries that are interesting to the
-** y2k problem.
-**
-**
-*/
-static PRStatus TestParseTime( void )
-{
-    ParseTest       *ptp = parseArray;
-    PRTime          ct;
-    PRExplodedTime  cet;
-    char            *sp = ptp->sDate;
-    PRStatus        rc;
-    PRStatus        rv = PR_SUCCESS;
-
-    while ( sp != NULL)
-    {
-        rc = PR_ParseTimeString( sp, PR_FALSE, &ct );
-        if ( PR_FAILURE == rc )
-        {
-            printf("TestParseTime(): PR_ParseTimeString() failed to convert: %s\n", sp );
-            rv = PR_FAILURE;
-            failed_already = 1;
-        }
-        else
-        {
-            PR_ExplodeTime( ct, PR_LocalTimeParameters , &cet );
-
-            if ( !ExplodedTimeIsEqual( &cet, &ptp->et ))
-            {
-                printf("TestParseTime(): Exploded time compare failed: %s\n", sp );
-                if ( debug_mode )
-                {
-                    PrintExplodedTime( &cet );
-                    printf("\n");
-                    PrintExplodedTime( &ptp->et );
-                    printf("\n");
-                }
-                
-                rv = PR_FAILURE;
-                failed_already = 1;
-            }
-        }
-                
-        /* point to next element in array, keep going */
-        ptp++;
-        sp = ptp->sDate;
-    } /* end while() */
-
-    return( rv );
-} /* end TestParseTime() */
-
-int main(int argc, char** argv)
-{
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt;
-    
-    PR_STDIO_INIT();
-	opt = PL_CreateOptState(argc, argv, "d");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-		if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-        case 'd':  /* debug mode */
-			debug_mode = PR_TRUE;
-            break;
-         default:
-            break;
-        }
-    }
-	PL_DestroyOptState(opt);
-
- /* main test */
-	
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
-    lm = PR_NewLogModule("test");
-
-#ifdef XP_MAC
-	/* Set up the console */
-	InitializeSIOUX(true);
-	debug_mode = PR_TRUE;
-#endif
-
-    if ( PR_FAILURE == TestExplodeImplodeTime())
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("TestExplodeImplodeTime() failed"));
-    }
-    else
-    	printf("Test 1: Calendar Time Test passed\n");
-
-    if ( PR_FAILURE == TestNormalizeTime())
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("TestNormalizeTime() failed"));
-    }
-    else
-    	printf("Test 2: Normalize Time Test passed\n");
-
-    if ( PR_FAILURE == TestParseTime())
-    {
-        PR_LOG( lm, PR_LOG_ERROR,
-            ("TestParseTime() failed"));
-    }
-    else
-    	printf("Test 3: Parse Time Test passed\n");
-
-#ifdef XP_MAC
-	if (1)
-	{
-		char dummyChar;
-		
-		printf("Press return to exit\n\n");
-		scanf("%c", &dummyChar);
-	}
-#endif
-
-	if (failed_already) 
-	    return 1;
-	else 
-	    return 0;
-} /* end main() y2k.c */
-
diff --git a/libs/js/nsprpub/pr/tests/y2ktmo.c b/libs/js/nsprpub/pr/tests/y2ktmo.c
deleted file mode 100644
index a37ae07217..0000000000
--- a/libs/js/nsprpub/pr/tests/y2ktmo.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test: y2ktmo
- *
- * Description:
- *   This test tests the interval time facilities in NSPR for Y2K
- *   compliance.  All the functions that take a timeout argument
- *   are tested: PR_Sleep, socket I/O (PR_Accept is taken as a
- *   representative), PR_Poll, PR_WaitCondVar, PR_Wait, and
- *   PR_CWait.  A thread of each thread scope (local, global, and
- *   global bound) is created to call each of these functions.
- *   The test should be started at the specified number of seconds
- *   (called the lead time) before a Y2K rollover test date.  The
- *   timeout values for these threads will span over the rollover
- *   date by at least the specified number of seconds.  For
- *   example, if the lead time is 5 seconds, the test should
- *   be started at time (D - 5), where D is a rollover date, and
- *   the threads will time out at or after time (D + 5).  The
- *   timeout values for the threads are spaced one second apart.
- *
- *   When a thread times out, it calls PR_IntervalNow() to verify
- *   that it did wait for the specified time.  In addition, it
- *   calls a platform-native function to verify the actual elapsed
- *   time again, to rule out the possibility that PR_IntervalNow()
- *   is broken.  We allow the actual elapsed time to deviate from
- *   the specified timeout by a certain tolerance (in milliseconds).
- */ 
-
-#include "nspr.h"
-#include "plgetopt.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if defined(XP_UNIX)
-#include <sys/time.h> /* for gettimeofday */
-#endif
-#if defined(WIN32)
-#include <sys/types.h>
-#include <sys/timeb.h>  /* for _ftime */
-#endif
-
-#define DEFAULT_LEAD_TIME_SECS 5
-#define DEFAULT_TOLERANCE_MSECS 500
-
-static PRBool debug_mode = PR_FALSE;
-static PRInt32 lead_time_secs = DEFAULT_LEAD_TIME_SECS;
-static PRInt32 tolerance_msecs = DEFAULT_TOLERANCE_MSECS;
-static PRIntervalTime start_time;
-static PRIntervalTime tolerance;
-
-#if defined(XP_UNIX)
-static struct timeval start_time_tv;
-#endif
-#if defined(WIN32)
-static struct _timeb start_time_tb;
-#endif
-
-static void SleepThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-
-    if (PR_Sleep(timeout) == PR_FAILURE) {
-        fprintf(stderr, "PR_Sleep failed\n");
-        exit(1);
-    }
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    if (debug_mode) {
-        fprintf(stderr, "Sleep thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-static void AcceptThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    PRFileDesc *accepted;
-
-    sock = PR_NewTCPSocket();
-    if (sock == NULL) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&addr, 0, sizeof(addr));
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = 0;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    if (PR_Bind(sock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    if (PR_Listen(sock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-    accepted = PR_Accept(sock, NULL, timeout);
-    if (accepted != NULL || PR_GetError() != PR_IO_TIMEOUT_ERROR) {
-        fprintf(stderr, "PR_Accept did not time out\n");
-        exit(1);
-    }
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (debug_mode) {
-        fprintf(stderr, "Accept thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-static void PollThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    PRPollDesc pd;
-    PRIntn rv;
-
-    sock = PR_NewTCPSocket();
-    if (sock == NULL) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    memset(&addr, 0, sizeof(addr));
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = 0;
-    addr.inet.ip = PR_htonl(PR_INADDR_ANY);
-    if (PR_Bind(sock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    if (PR_Listen(sock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-    pd.fd = sock;
-    pd.in_flags = PR_POLL_READ;
-    rv = PR_Poll(&pd, 1, timeout);
-    if (rv != 0) {
-        fprintf(stderr, "PR_Poll did not time out\n");
-        exit(1);
-    }
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (debug_mode) {
-        fprintf(stderr, "Poll thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-static void WaitCondVarThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-    PRLock *ml;
-    PRCondVar *cv;
-
-    ml = PR_NewLock();
-    if (ml == NULL) {
-        fprintf(stderr, "PR_NewLock failed\n");
-        exit(1);
-    }
-    cv = PR_NewCondVar(ml);
-    if (cv == NULL) {
-        fprintf(stderr, "PR_NewCondVar failed\n");
-        exit(1);
-    }
-    PR_Lock(ml);
-    PR_WaitCondVar(cv, timeout);
-    PR_Unlock(ml);
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    PR_DestroyCondVar(cv);
-    PR_DestroyLock(ml);
-    if (debug_mode) {
-        fprintf(stderr, "wait cond var thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-static void WaitMonitorThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-    PRMonitor *mon;
-
-    mon = PR_NewMonitor();
-    if (mon == NULL) {
-        fprintf(stderr, "PR_NewMonitor failed\n");
-        exit(1);
-    }
-    PR_EnterMonitor(mon);
-    PR_Wait(mon, timeout);
-    PR_ExitMonitor(mon);
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    PR_DestroyMonitor(mon);
-    if (debug_mode) {
-        fprintf(stderr, "wait monitor thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-static void WaitCMonitorThread(void *arg)
-{
-    PRIntervalTime timeout = (PRIntervalTime) arg;
-    PRIntervalTime elapsed;
-#if defined(XP_UNIX) || defined(WIN32)
-    PRInt32 timeout_msecs = PR_IntervalToMilliseconds(timeout);
-    PRInt32 elapsed_msecs;
-#endif
-#if defined(XP_UNIX)
-    struct timeval end_time_tv;
-#endif
-#if defined(WIN32)
-    struct _timeb end_time_tb;
-#endif
-    int dummy;
-
-    PR_CEnterMonitor(&dummy);
-    PR_CWait(&dummy, timeout);
-    PR_CExitMonitor(&dummy);
-    elapsed = (PRIntervalTime)(PR_IntervalNow() - start_time);
-    if (elapsed + tolerance < timeout || elapsed > timeout + tolerance) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#if defined(XP_UNIX)
-    gettimeofday(&end_time_tv, NULL);
-    elapsed_msecs = 1000*(end_time_tv.tv_sec - start_time_tv.tv_sec)
-            + (end_time_tv.tv_usec - start_time_tv.tv_usec)/1000;
-#endif
-#if defined(WIN32)
-    _ftime(&end_time_tb);
-    elapsed_msecs = 1000*(end_time_tb.time - start_time_tb.time)
-            + (end_time_tb.millitm - start_time_tb.millitm);
-#endif
-#if defined(XP_UNIX) || defined(WIN32)
-    if (elapsed_msecs + tolerance_msecs < timeout_msecs
-            || elapsed_msecs > timeout_msecs + tolerance_msecs) {
-        fprintf(stderr, "timeout wrong\n");
-        exit(1);
-    }
-#endif
-    if (debug_mode) {
-        fprintf(stderr, "wait cached monitor thread (scope %d) done\n",
-                PR_GetThreadScope(PR_GetCurrentThread()));
-    }
-}
-
-typedef void (*NSPRThreadFunc)(void*);
-
-static NSPRThreadFunc threadFuncs[] = {
-    SleepThread, AcceptThread, PollThread,
-    WaitCondVarThread, WaitMonitorThread, WaitCMonitorThread};
-
-static PRThreadScope threadScopes[] = {
-    PR_LOCAL_THREAD, PR_GLOBAL_THREAD, PR_GLOBAL_BOUND_THREAD};
-
-static void Help(void)
-{
-    fprintf(stderr, "y2ktmo test program usage:\n");
-    fprintf(stderr, "\t-d           debug mode         (FALSE)\n");
-    fprintf(stderr, "\t-l <secs>    lead time          (%d)\n",
-            DEFAULT_LEAD_TIME_SECS);
-    fprintf(stderr, "\t-t <msecs>   tolerance          (%d)\n",
-            DEFAULT_TOLERANCE_MSECS);
-    fprintf(stderr, "\t-h           this message\n");
-}  /* Help */
-
-int main(int argc, char **argv)
-{
-    PRThread **threads;
-    int num_thread_funcs = sizeof(threadFuncs)/sizeof(NSPRThreadFunc);
-    int num_thread_scopes = sizeof(threadScopes)/sizeof(PRThreadScope);
-    int i, j;
-    int idx;
-    PRInt32 secs;
-    PLOptStatus os;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "dl:t:h");
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt))) {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option) {
-            case 'd':  /* debug mode */
-                debug_mode = PR_TRUE;
-                break;
-            case 'l':  /* lead time */
-                lead_time_secs = atoi(opt->value);
-                break;
-            case 't':  /* tolerance */
-                tolerance_msecs = atoi(opt->value);
-                break;
-            case 'h':
-            default:
-                Help();
-                return 2;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-    if (debug_mode) {
-        fprintf(stderr, "lead time: %d secs\n", lead_time_secs);
-        fprintf(stderr, "tolerance: %d msecs\n", tolerance_msecs);
-    }
-
-    start_time = PR_IntervalNow();
-#if defined(XP_UNIX)
-    gettimeofday(&start_time_tv, NULL);
-#endif
-#if defined(WIN32)
-    _ftime(&start_time_tb);
-#endif
-    tolerance = PR_MillisecondsToInterval(tolerance_msecs);
-
-    threads = PR_Malloc(
-            num_thread_scopes * num_thread_funcs * sizeof(PRThread*));
-    if (threads == NULL) {
-        fprintf(stderr, "PR_Malloc failed\n");
-        exit(1);
-    }
-
-    /* start to time out 5 seconds after a rollover date */
-    secs = lead_time_secs + 5;
-    idx = 0;
-    for (i = 0; i < num_thread_scopes; i++) { 
-        for (j = 0; j < num_thread_funcs; j++) {
-            threads[idx] = PR_CreateThread(PR_USER_THREAD, threadFuncs[j],
-                (void*)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL,
-                threadScopes[i], PR_JOINABLE_THREAD, 0);
-            if (threads[idx] == NULL) {
-                fprintf(stderr, "PR_CreateThread failed\n");
-                exit(1);
-            }
-            secs++;
-            idx++;
-        }
-    }
-    for (idx = 0; idx < num_thread_scopes*num_thread_funcs; idx++) {
-        if (PR_JoinThread(threads[idx]) == PR_FAILURE) {
-            fprintf(stderr, "PR_JoinThread failed\n");
-            exit(1);
-        }
-    }
-    PR_Free(threads);
-    printf("PASS\n");
-    return 0;
-}
diff --git a/libs/js/nsprpub/pr/tests/yield.c b/libs/js/nsprpub/pr/tests/yield.c
deleted file mode 100644
index 5f441a19a7..0000000000
--- a/libs/js/nsprpub/pr/tests/yield.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <stdio.h>
-#include "prthread.h"
-#include "prinit.h"
-#ifndef XP_OS2
-#include "private/pprmisc.h"
-#include <windows.h>
-#else
-#include "primpl.h"
-#include <os2.h>
-#endif
-
-#define THREADS 10
-
-
-void 
-threadmain(void *_id)
-{
-    int id = (int)_id;
-    int index;
-
-    printf("thread %d alive\n", id);
-    for (index=0; index<10; index++) {
-        printf("thread %d yielding\n", id);
-        PR_Sleep(0);
-        printf("thread %d awake\n", id);
-    }
-    printf("thread %d dead\n", id);
-
-}
-
-main()
-{
-    int index;
-    PRThread *a[THREADS];
-
-    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 5);
-    PR_STDIO_INIT();
-
-    for (index=0; index<THREADS; index++) {
-        a[index] = PR_CreateThread(PR_USER_THREAD,
-                              threadmain,
-                              (void *)index,
-                              PR_PRIORITY_NORMAL,
-                              index%2?PR_LOCAL_THREAD:PR_GLOBAL_THREAD,
-                              PR_JOINABLE_THREAD,
-                              0);
-    }
-    for(index=0; index<THREADS; index++)
-        PR_JoinThread(a[index]);
-    printf("main dying\n");
-}
diff --git a/libs/js/nsprpub/pr/tests/zerolen.c b/libs/js/nsprpub/pr/tests/zerolen.c
deleted file mode 100644
index f43f60fd5e..0000000000
--- a/libs/js/nsprpub/pr/tests/zerolen.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Test: zerolen.c 
- *
- * Description: a test for Bugzilla bug #17699.  We perform
- * the same test for PR_Writev, PR_Write, and PR_Send.  In
- * each test the server thread first fills up the connection
- * to the client so that the next write operation will fail
- * with EAGAIN.  Then it calls PR_Writev, PR_Write, or PR_Send
- * with a zero-length buffer.  The client thread initially
- * does not read so that the connection can be filled up.
- * Then it empties the connection so that the server thread's
- * PR_Writev, PR_Write, or PR_Send call can succeed.
- *
- * Bug #17699 is specific to the pthreads version on Unix,
- * so on other platforms this test does nothing.
- */
-
-#ifndef XP_UNIX
-
-#include <stdio.h>
-
-int main()
-{
-    printf("PASS\n");
-    return 0;
-}
-
-#else /* XP_UNIX */
-
-#include "nspr.h"
-#include "private/pprio.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-static void ClientThread(void *arg)
-{
-    PRFileDesc *sock;
-    PRNetAddr addr;
-    PRUint16 port = (PRUint16) arg;
-    char buf[1024];
-    PRInt32 nbytes;
-
-    sock = PR_NewTCPSocket();
-    if (NULL == sock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    if (PR_InitializeNetAddr(PR_IpAddrLoopback, port, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-        fprintf(stderr, "PR_Connect failed\n");
-        exit(1);
-    }
-    /*
-     * Sleep 5 seconds to force the server thread to get EAGAIN.
-     */
-    if (PR_Sleep(PR_SecondsToInterval(5)) == PR_FAILURE) {
-        fprintf(stderr, "PR_Sleep failed\n");
-        exit(1);
-    }
-    /*
-     * Then start reading.
-     */
-    while ((nbytes = PR_Read(sock, buf, sizeof(buf))) > 0) {
-        /* empty loop body */
-    }
-    if (-1 == nbytes) {
-        fprintf(stderr, "PR_Read failed\n");
-        exit(1);
-    }
-    if (PR_Close(sock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-}
-
-int main()
-{
-    PRFileDesc *listenSock;
-    PRFileDesc *acceptSock;
-    int osfd;
-    PRThread *clientThread;
-    PRNetAddr addr;
-    char buf[1024];
-    PRInt32 nbytes;
-    PRIOVec iov;
-
-    memset(buf, 0, sizeof(buf)); /* Initialize the buffer. */
-    listenSock = PR_NewTCPSocket();
-    if (NULL == listenSock) {
-        fprintf(stderr, "PR_NewTCPSocket failed\n");
-        exit(1);
-    }
-    if (PR_InitializeNetAddr(PR_IpAddrAny, 0, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_InitializeNetAddr failed\n");
-        exit(1);
-    }
-    if (PR_Bind(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_Bind failed\n");
-        exit(1);
-    }
-    /* Find out what port number we are bound to. */
-    if (PR_GetSockName(listenSock, &addr) == PR_FAILURE) {
-        fprintf(stderr, "PR_GetSockName failed\n");
-        exit(1);
-    }
-    if (PR_Listen(listenSock, 5) == PR_FAILURE) {
-        fprintf(stderr, "PR_Listen failed\n");
-        exit(1);
-    }
-
-    /*
-     * First test PR_Writev.
-     */
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == clientThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    acceptSock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == acceptSock) {
-        fprintf(stderr, "PR_Accept failed\n");
-        exit(1);
-    }
-    osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
-        /* empty loop body */
-    }
-    if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {
-        fprintf(stderr, "write failed\n");
-        exit(1);
-    }
-    iov.iov_base = buf;
-    iov.iov_len = 0;
-    printf("calling PR_Writev with a zero-length buffer\n");
-    fflush(stdout);
-    nbytes = PR_Writev(acceptSock, &iov, 1, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes != 0) {
-        fprintf(stderr, "PR_Writev should return 0 but returns %d\n", nbytes);
-        exit(1);
-    }
-    if (PR_Close(acceptSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(clientThread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-
-    /*
-     * Then test PR_Write.
-     */
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == clientThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    acceptSock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == acceptSock) {
-        fprintf(stderr, "PR_Accept failed\n");
-        exit(1);
-    }
-    osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
-        /* empty loop body */
-    }
-    if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {
-        fprintf(stderr, "write failed\n");
-        exit(1);
-    }
-    printf("calling PR_Write with a zero-length buffer\n");
-    fflush(stdout);
-    nbytes = PR_Write(acceptSock, buf, 0);
-    if (nbytes != 0) {
-        fprintf(stderr, "PR_Write should return 0 but returns %d\n", nbytes);
-        exit(1);
-    }
-    if (PR_Close(acceptSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(clientThread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-
-    /*
-     * Finally test PR_Send.
-     */
-    clientThread = PR_CreateThread(PR_USER_THREAD,
-            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
-            PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
-    if (NULL == clientThread) {
-        fprintf(stderr, "PR_CreateThread failed\n");
-        exit(1);
-    }
-    acceptSock = PR_Accept(listenSock, NULL, PR_INTERVAL_NO_TIMEOUT);
-    if (NULL == acceptSock) {
-        fprintf(stderr, "PR_Accept failed\n");
-        exit(1);
-    }
-    osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
-        /* empty loop body */
-    }
-    if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {
-        fprintf(stderr, "write failed\n");
-        exit(1);
-    }
-    printf("calling PR_Send with a zero-length buffer\n");
-    fflush(stdout);
-    nbytes = PR_Send(acceptSock, buf, 0, 0, PR_INTERVAL_NO_TIMEOUT);
-    if (nbytes != 0) {
-        fprintf(stderr, "PR_Send should return 0 but returns %d\n", nbytes);
-        exit(1);
-    }
-    if (PR_Close(acceptSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    if (PR_JoinThread(clientThread) == PR_FAILURE) {
-        fprintf(stderr, "PR_JoinThread failed\n");
-        exit(1);
-    }
-
-    if (PR_Close(listenSock) == PR_FAILURE) {
-        fprintf(stderr, "PR_Close failed\n");
-        exit(1);
-    }
-    printf("PASS\n");
-    return 0;
-}
-
-#endif /* XP_UNIX */
diff --git a/libs/js/nsprpub/tools/.cvsignore b/libs/js/nsprpub/tools/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/libs/js/nsprpub/tools/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/libs/js/nsprpub/tools/Makefile.in b/libs/js/nsprpub/tools/Makefile.in
deleted file mode 100644
index c01b0a648f..0000000000
--- a/libs/js/nsprpub/tools/Makefile.in
+++ /dev/null
@@ -1,249 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#! gmake
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-endif
-
-
-DIRS =
-
-CSRCS =             \
-	httpget.c	    \
-	tail.c		    \
-	$(NULL)
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
-
-TARGETS = $(PROGS)
-
-INCLUDES = -I$(dist_includedir) 
-
-NSPR_VERSION = 3
-
-# Setting the variables LDOPTS and LIBPR.  We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(dist_libdir)
-LIBPR = -lnspr$(NSPR_VERSION)
-LIBPLC = -lplc$(NSPR_VERSION)
-
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
-  LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib
-  LIBPLC= $(dist_libdir)/plc$(NSPR_VERSION).lib
-else
-LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
-LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
-LIBPLC= $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
-endif
-endif
-
-ifeq ($(OS_ARCH),OS2)
-  ifeq ($(MOZ_OS2_TOOLS),VACPP)
-    LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
-    LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib
-    LIBPLC= $(dist_libdir)/plc$(NSPR_VERSION).lib
-  else
-    LDOPTS += -Zomf -Zlinker /PM:VIO
-  endif
-endif
-
-ifneq ($(OS_ARCH), WINNT)
-PWD = $(shell pwd)
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-LDOPTS += -rpath $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir)
-endif
-
-# AIX
-ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-LIBPR = -lnspr$(NSPR_VERSION)_shr
-LIBPLC = -lplc$(NSPR_VERSION)_shr
-endif
-
-# Solaris
-ifeq ($(OS_ARCH), SunOS)
-ifneq ($(OS_RELEASE), 4.1.3_U1)
-ifdef NS_USE_GCC
-LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
-else
-LDOPTS += -R $(PWD)/$(dist_libdir)
-endif
-endif
-
-# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
-# even though we already linked with these system libraries
-# when we built libnspr.so.
-ifeq ($(OS_RELEASE), 5.4)
-EXTRA_LIBS = -lthread
-endif
-
-ifeq ($(OS_RELEASE), 5.5)
-ifdef USE_PTHREADS
-EXTRA_LIBS = -lpthread
-else
-EXTRA_LIBS = -lthread
-endif
-endif
-endif # SunOS
-
-ifeq ($(OS_ARCH), NCR)
-# XXX: We see some strange problems when we link with libnspr.so.
-# So for now we use static libraries on NCR.  The shared library
-# stuff below is commented out.
-LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a
-LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a
-EXTRA_LIBS = -lsocket -lnsl -ldl
-
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-#EXTRA_LIBS = -lsocket -lnsl
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-ifeq ($(OS_ARCH), SCOOS)
-# SCO Unix needs to link against -lsocket again even though we
-# already linked with these system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket
-# This hardcodes in the executable programs the directory to find
-# libnspr.so etc. at program startup.  Equivalent to the -R or -rpath 
-# option for ld on other platforms.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
-#####################################################
-#
-# The rules
-#
-#####################################################
-
-include $(topsrcdir)/config/rules.mk
-
-AIX_PRE_4_2 = 0
-ifeq ($(OS_ARCH),AIX)
-ifneq ($(OS_RELEASE),4.2)
-ifneq ($(USE_PTHREADS), 1)
-#AIX_PRE_4_2 = 1
-endif
-endif
-endif
-
-ifeq ($(AIX_PRE_4_2),1)
-
-# AIX releases prior to 4.2 need a special two-step linking hack
-# in order to both override the system select() and be able to 
-# get at the original system select().
-#
-# We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .$(OBJ_SUFFIX) file from the .c source file, then do the
-# two-step linking hack below.
-
-$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-	rm -f $@ $(AIX_TMP)
-	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(NSPR_VERSION).a
-	$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
-	rm -f $(AIX_TMP)
-
-else
-
-# All platforms that are not AIX pre-4.2.
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
-	echo system windows >w16link
-	echo option map >>w16link
-	echo option stack=10K >>w16link
-	echo option heapsize=32K >>w16link
-	echo debug $(DEBUGTYPE) all >>w16link
-	echo name $@  >>w16link
-	echo file >>w16link
-	echo $<  >>w16link
-	echo library  >>w16link
-	echo $(LIBPR),	     >>w16link
-	echo $(LIBPLC),		 >>w16link
-	echo winsock.lib     >>w16link
-	wlink @w16link.
-else
-	link $(LDOPTS) $< $(LIBPR) $(LIBPLC) wsock32.lib -out:$@
-endif
-else
-ifeq ($(OS_ARCH),OS2)
-	$(LINK) $(LDOPTS) $< $(LIBPR) $(LIBPLC) $(OS_LIBS) $(EXTRA_LIBS) -o $@
-else
-	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPR) $(LIBPLC) $(EXTRA_LIBS) -o $@
-endif
-endif
-endif
-
-export:: $(TARGETS)
-clean::
-	rm -f $(TARGETS)
-
diff --git a/libs/js/nsprpub/tools/httpget.c b/libs/js/nsprpub/tools/httpget.c
deleted file mode 100644
index 774a4c7a7b..0000000000
--- a/libs/js/nsprpub/tools/httpget.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- * Author: Wan-Teh Chang
- *
- * Given an HTTP URL, httpget uses the GET method to fetch the file.
- * The fetched file is written to stdout by default, or can be
- * saved in an output file.
- *
- * This is a single-threaded program.
- */
-
-#include "prio.h"
-#include "prnetdb.h"
-#include "prlog.h"
-#include "prerror.h"
-#include "prprf.h"
-#include "prinit.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>  /* for atoi */
-
-#define FCOPY_BUFFER_SIZE (16 * 1024)
-#define INPUT_BUFFER_SIZE 1024
-#define LINE_SIZE 512
-#define HOST_SIZE 256
-#define PORT_SIZE 32
-#define PATH_SIZE 512
-
-/*
- * A buffer for storing the excess input data for ReadLine.
- * The data in the buffer starts from (including) the element pointed to
- * by inputHead, and ends just before (not including) the element pointed
- * to by inputTail.  The buffer is empty if inputHead == inputTail.
- */
-
-static char inputBuf[INPUT_BUFFER_SIZE];
-/*
- * inputBufEnd points just past the end of inputBuf
- */
-static char *inputBufEnd = inputBuf + sizeof(inputBuf);
-static char *inputHead = inputBuf;
-static char *inputTail = inputBuf;
-
-static PRBool endOfStream = PR_FALSE;
-
-/*
- * ReadLine --
- *
- * Read in a line of text, terminated by CRLF or LF, from fd into buf.
- * The terminating CRLF or LF is included (always as '\n').  The text
- * in buf is terminated by a null byte.  The excess bytes are stored in
- * inputBuf for use in the next ReadLine call or FetchFile call.
- * Returns the number of bytes in buf.  0 means end of stream.  Returns
- * -1 if read fails.
- */
-
-PRInt32 ReadLine(PRFileDesc *fd, char *buf, PRUint32 bufSize)
-{
-    char *dst = buf;
-    char *bufEnd = buf + bufSize;  /* just past the end of buf */
-    PRBool lineFound = PR_FALSE;
-    char *crPtr = NULL;  /* points to the CR ('\r') character */
-    PRInt32 nRead;
-
-loop:
-    PR_ASSERT(inputBuf <= inputHead && inputHead <= inputTail
-	    && inputTail <= inputBufEnd);
-    while (lineFound == PR_FALSE && inputHead != inputTail
-	    && dst < bufEnd - 1) {
-	if (*inputHead == '\r') {
-	    crPtr = dst;
-	} else if (*inputHead == '\n') {
-	    lineFound = PR_TRUE;
-	    if (crPtr == dst - 1) {
-		dst--; 
-	    }
-	}
-	*(dst++) = *(inputHead++);
-    }
-    if (lineFound == PR_TRUE || dst == bufEnd - 1 || endOfStream == PR_TRUE) {
-	*dst = '\0';
-	return dst - buf;
-    }
-
-    /*
-     * The input buffer should be empty now
-     */
-    PR_ASSERT(inputHead == inputTail);
-
-    nRead = PR_Read(fd, inputBuf, sizeof(inputBuf));
-    if (nRead == -1) {
-	*dst = '\0';
-	return -1;
-    } else if (nRead == 0) {
-	endOfStream = PR_TRUE;
-	*dst = '\0';
-	return dst - buf;
-    }
-    inputHead = inputBuf;
-    inputTail = inputBuf + nRead;
-    goto loop;
-}
-
-PRInt32 DrainInputBuffer(char *buf, PRUint32 bufSize)
-{
-    PRInt32 nBytes = inputTail - inputHead;
-
-    if (nBytes == 0) {
-	if (endOfStream) {
-	    return -1;
-	} else {
-	    return 0;
-	}
-    }
-    if ((PRInt32) bufSize < nBytes) {
-	nBytes = bufSize;
-    }
-    memcpy(buf, inputHead, nBytes);
-    inputHead += nBytes;
-    return nBytes;
-}
-
-PRStatus FetchFile(PRFileDesc *in, PRFileDesc *out)
-{
-    char buf[FCOPY_BUFFER_SIZE];
-    PRInt32 nBytes;
-
-    while ((nBytes = DrainInputBuffer(buf, sizeof(buf))) > 0) {
-	if (PR_Write(out, buf, nBytes) != nBytes) {
-            fprintf(stderr, "httpget: cannot write to file\n");
-	    return PR_FAILURE;
-	}
-    }
-    if (nBytes < 0) {
-	/* Input buffer is empty and end of stream */
-	return PR_SUCCESS;
-    }
-    while ((nBytes = PR_Read(in, buf, sizeof(buf))) > 0) {
-	if (PR_Write(out, buf, nBytes) != nBytes) {
-	    fprintf(stderr, "httpget: cannot write to file\n");
-	    return PR_FAILURE;
-        }
-    }
-    if (nBytes < 0) {
-	fprintf(stderr, "httpget: cannot read from socket\n");
-	return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-PRStatus FastFetchFile(PRFileDesc *in, PRFileDesc *out, PRUint32 size)
-{
-    PRInt32 nBytes;
-    PRFileMap *outfMap;
-    void *addr;
-    char *start;
-    PRUint32 rem;
-    PRUint32 bytesToRead;
-    PRStatus rv;
-    PRInt64 sz64;
-
-    LL_UI2L(sz64, size);
-    outfMap = PR_CreateFileMap(out, sz64, PR_PROT_READWRITE);
-    PR_ASSERT(outfMap);
-    addr = PR_MemMap(outfMap, LL_ZERO, size);
-    if (addr == (void *) -1) {
-	fprintf(stderr, "cannot memory-map file: (%d, %d)\n", PR_GetError(),
-		PR_GetOSError());
-
-	PR_CloseFileMap(outfMap);
-	return PR_FAILURE;
-    }
-    PR_ASSERT(addr != (void *) -1);
-    start = (char *) addr;
-    rem = size;
-    while ((nBytes = DrainInputBuffer(start, rem)) > 0) {
-	start += nBytes;
-	rem -= nBytes;
-    }
-    if (nBytes < 0) {
-	/* Input buffer is empty and end of stream */
-	return PR_SUCCESS;
-    }
-    bytesToRead = (rem < FCOPY_BUFFER_SIZE) ? rem : FCOPY_BUFFER_SIZE;
-    while (rem > 0 && (nBytes = PR_Read(in, start, bytesToRead)) > 0) {
-	start += nBytes;
-	rem -= nBytes;
-        bytesToRead = (rem < FCOPY_BUFFER_SIZE) ? rem : FCOPY_BUFFER_SIZE;
-    }
-    if (nBytes < 0) {
-	fprintf(stderr, "httpget: cannot read from socket\n");
-	return PR_FAILURE;
-    }
-    rv = PR_MemUnmap(addr, size);
-    PR_ASSERT(rv == PR_SUCCESS);
-    rv = PR_CloseFileMap(outfMap);
-    PR_ASSERT(rv == PR_SUCCESS);
-    return PR_SUCCESS;
-}
-
-PRStatus ParseURL(char *url, char *host, PRUint32 hostSize,
-    char *port, PRUint32 portSize, char *path, PRUint32 pathSize)
-{
-    char *start, *end;
-    char *dst;
-    char *hostEnd;
-    char *portEnd;
-    char *pathEnd;
-
-    if (strncmp(url, "http", 4)) {
-	fprintf(stderr, "httpget: the protocol must be http\n");
-	return PR_FAILURE;
-    }
-    if (strncmp(url + 4, "://", 3) || url[7] == '\0') {
-	fprintf(stderr, "httpget: malformed URL: %s\n", url);
-	return PR_FAILURE;
-    }
-
-    start = end = url + 7;
-    dst = host;
-    hostEnd = host + hostSize;
-    while (*end && *end != ':' && *end != '/') {
-	if (dst == hostEnd - 1) {
-	    fprintf(stderr, "httpget: host name too long\n");
-	    return PR_FAILURE;
-	}
-	*(dst++) = *(end++);
-    }
-    *dst = '\0';
-
-    if (*end == '\0') {
-	PR_snprintf(port, portSize, "%d", 80);
-	PR_snprintf(path, pathSize, "%s", "/");
-	return PR_SUCCESS;
-    }
-
-    if (*end == ':') {
-	end++;
-	dst = port;
-	portEnd = port + portSize;
-	while (*end && *end != '/') {
-	    if (dst == portEnd - 1) {
-		fprintf(stderr, "httpget: port number too long\n");
-		return PR_FAILURE;
-	    }
-	    *(dst++) = *(end++);
-        }
-	*dst = '\0';
-	if (*end == '\0') {
-	    PR_snprintf(path, pathSize, "%s", "/");
-	    return PR_SUCCESS;
-        }
-    } else {
-	PR_snprintf(port, portSize, "%d", 80);
-    }
-
-    dst = path;
-    pathEnd = path + pathSize;
-    while (*end) {
-	if (dst == pathEnd - 1) {
-	    fprintf(stderr, "httpget: file pathname too long\n");
-	    return PR_FAILURE;
-	}
-	*(dst++) = *(end++);
-    }
-    *dst = '\0';
-    return PR_SUCCESS;
-}
-
-void PrintUsage(void) {
-    fprintf(stderr, "usage: httpget url\n"
-		    "       httpget -o outputfile url\n"
-		    "       httpget url -o outputfile\n");
-}
-
-int main(int argc, char **argv)
-{
-    PRHostEnt hostentry;
-    char buf[PR_NETDB_BUF_SIZE];
-    PRNetAddr addr;
-    PRFileDesc *socket = NULL, *file = NULL;
-    PRIntn cmdSize;
-    char host[HOST_SIZE];
-    char port[PORT_SIZE];
-    char path[PATH_SIZE];
-    char line[LINE_SIZE];
-    int exitStatus = 0;
-    PRBool endOfHeader = PR_FALSE;
-    char *url;
-    char *fileName = NULL;
-    PRUint32 fileSize;
-
-    if (argc != 2 && argc != 4) {
-	PrintUsage();
-	exit(1);
-    }
-
-    if (argc == 2) {
-	/*
-	 * case 1: httpget url
-	 */
-	url = argv[1];
-    } else {
-	if (strcmp(argv[1], "-o") == 0) {
-	    /*
-	     * case 2: httpget -o outputfile url
-	     */
-	    fileName = argv[2];
-	    url = argv[3];
-        } else {
-	    /*
-	     * case 3: httpget url -o outputfile
-	     */
-	    url = argv[1];
-	    if (strcmp(argv[2], "-o") != 0) {
-		PrintUsage();
-		exit(1);
-            }
-	    fileName = argv[3];
-	}
-    }
-
-    if (ParseURL(url, host, sizeof(host), port, sizeof(port),
-	    path, sizeof(path)) == PR_FAILURE) {
-	exit(1);
-    }
-
-    if (PR_GetHostByName(host, buf, sizeof(buf), &hostentry)
-	    == PR_FAILURE) {
-        fprintf(stderr, "httpget: unknown host name: %s\n", host);
-	exit(1);
-    }
-
-    addr.inet.family = PR_AF_INET;
-    addr.inet.port = PR_htons((short) atoi(port));
-    addr.inet.ip = *((PRUint32 *) hostentry.h_addr_list[0]);
-
-    socket = PR_NewTCPSocket();
-    if (socket == NULL) {
-	fprintf(stderr, "httpget: cannot create new tcp socket\n");
-	exit(1);
-    }
-
-    if (PR_Connect(socket, &addr, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) {
-	fprintf(stderr, "httpget: cannot connect to http server\n");
-	exitStatus = 1;
-	goto done;
-    }
-
-    if (fileName == NULL) {
-	file = PR_STDOUT;
-    } else {
-        file = PR_Open(fileName, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE,
-		00777);
-        if (file == NULL) {
-	    fprintf(stderr, "httpget: cannot open file %s: (%d, %d)\n",
-		    fileName, PR_GetError(), PR_GetOSError());
-	    exitStatus = 1;
-	    goto done;
-	}
-    }
-
-    cmdSize = PR_snprintf(buf, sizeof(buf), "GET %s HTTP/1.0\r\n\r\n", path);
-    PR_ASSERT(cmdSize == (PRIntn) strlen("GET  HTTP/1.0\r\n\r\n")
-            + (PRIntn) strlen(path));
-    if (PR_Write(socket, buf, cmdSize) != cmdSize) {
-	fprintf(stderr, "httpget: cannot write to http server\n");
-	exitStatus = 1;
-	goto done;
-    }
-
-    if (ReadLine(socket, line, sizeof(line)) <= 0) {
-	fprintf(stderr, "httpget: cannot read line from http server\n");
-	exitStatus = 1;
-	goto done;
-    }
-
-    /* HTTP response: 200 == OK */
-    if (strstr(line, "200") == NULL) {
-	fprintf(stderr, "httpget: %s\n", line);
-	exitStatus = 1;
-	goto done;
-    }
-
-    while (ReadLine(socket, line, sizeof(line)) > 0) {
-	if (line[0] == '\n') {
-	    endOfHeader = PR_TRUE;
-	    break;
-	}
-	if (strncmp(line, "Content-Length", 14) == 0
-		|| strncmp(line, "Content-length", 14) == 0) {
-	    char *p = line + 14;
-
-	    while (*p == ' ' || *p == '\t') {
-		p++;
-	    }
-	    if (*p != ':') {
-		continue;
-            }
-	    p++;
-	    while (*p == ' ' || *p == '\t') {
-		p++;
-	    }
-	    fileSize = 0;
-	    while ('0' <= *p && *p <= '9') {
-		fileSize = 10 * fileSize + (*p - '0');
-		p++;
-            }
-	}
-    }
-    if (endOfHeader == PR_FALSE) {
-	fprintf(stderr, "httpget: cannot read line from http server\n");
-	exitStatus = 1;
-	goto done;
-    }
-
-    if (fileName == NULL || fileSize == 0) {
-        FetchFile(socket, file);
-    } else {
-	FastFetchFile(socket, file, fileSize);
-    }
-
-done:
-    if (socket) PR_Close(socket);
-    if (file) PR_Close(file);
-    PR_Cleanup();
-    return exitStatus;
-}
diff --git a/libs/js/nsprpub/tools/tail.c b/libs/js/nsprpub/tools/tail.c
deleted file mode 100644
index dc729c1598..0000000000
--- a/libs/js/nsprpub/tools/tail.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prio.h"
-#include "prprf.h"
-#include "prinit.h"
-#include "prthread.h"
-#include "prinrval.h"
-
-#include "plerror.h"
-#include "plgetopt.h"
-
-#include <stdlib.h>
-
-#define BUFFER_SIZE 500
-
-static PRFileDesc *out = NULL, *err = NULL;
-
-static void Help(void)
-{
-    PR_fprintf(err, "Usage: tail [-n <n>] [-f] [-h] <filename>\n");
-    PR_fprintf(err, "\t-t <n>	Dally time in milliseconds\n");
-    PR_fprintf(err, "\t-n <n>	Number of bytes before <eof>\n");
-    PR_fprintf(err, "\t-f   	Follow the <eof>\n");
-    PR_fprintf(err, "\t-h   	This message and nothing else\n");
-}  /* Help */
-
-PRIntn main(PRIntn argc, char **argv)
-{
-	PRIntn rv = 0;
-    PLOptStatus os;
-	PRStatus status;
-	PRFileDesc *file;
-	PRFileInfo fileInfo;
-	PRIntervalTime dally;
-	char buffer[BUFFER_SIZE];
-	PRBool follow = PR_FALSE;
-	const char *filename = NULL;
-	PRUint32 position = 0, seek = 0, time = 0;
-    PLOptState *opt = PL_CreateOptState(argc, argv, "hfn:");
-
-    out = PR_GetSpecialFD(PR_StandardOutput);
-    err = PR_GetSpecialFD(PR_StandardError);
-
-    while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-    {
-        if (PL_OPT_BAD == os) continue;
-        switch (opt->option)
-        {
-		case 0:  /* it's the filename */
-			filename = opt->value;
-			break;
-        case 'n':  /* bytes before end of file */
-            seek = atoi(opt->value);
-            break;
-        case 't':  /* dally time */
-            time = atoi(opt->value);
-            break;
-        case 'f':  /* follow the end of file */
-            follow = PR_TRUE;
-            break;
-        case 'h':  /* user wants some guidance */
-            Help();  /* so give him an earful */
-            return 2;  /* but not a lot else */
-            break;
-         default:
-            break;
-        }
-    }
-    PL_DestroyOptState(opt);
-
-	if (0 == time) time = 1000;
-	dally = PR_MillisecondsToInterval(time);
-
-    if (NULL == filename)
-    {
-        (void)PR_fprintf(out, "Input file not specified\n");
-        rv = 1; goto done;
-    }
-	file = PR_Open(filename, PR_RDONLY, 0);
-	if (NULL == file)
-	{
-		PL_FPrintError(err, "File cannot be opened for reading");
-		return 1;
-	}
-
-	status = PR_GetOpenFileInfo(file, &fileInfo);
-	if (PR_FAILURE == status)
-	{
-		PL_FPrintError(err, "Cannot acquire status of file");
-		rv = 1; goto done;
-	}
-	if (seek > 0)
-	{
-	    if (seek > fileInfo.size) seek = 0;
-		position = PR_Seek(file, (fileInfo.size - seek), PR_SEEK_SET);
-		if (-1 == (PRInt32)position)
-			PL_FPrintError(err, "Cannot seek to starting position");
-	}
-
-	do
-	{
-		while (position < fileInfo.size)
-		{
-			PRInt32 read, bytes = fileInfo.size - position;
-			if (bytes > sizeof(buffer)) bytes = sizeof(buffer);
-			read = PR_Read(file, buffer, bytes);
-			if (read != bytes)
-				PL_FPrintError(err, "Cannot read to eof");
-			position += read;
-			PR_Write(out, buffer, read);
-		}
-
-		if (follow)
-		{
-			PR_Sleep(dally);
-			status = PR_GetOpenFileInfo(file, &fileInfo);
-			if (PR_FAILURE == status)
-			{
-				PL_FPrintError(err, "Cannot acquire status of file");
-				rv = 1; goto done;
-			}
-		}
-	} while (follow);
-
-done:
-	PR_Close(file);
-
-	return rv;
-}  /* main */
-
-/* tail.c */
diff --git a/libs/js/shtool b/libs/js/shtool
deleted file mode 100755
index 39500bf951..0000000000
--- a/libs/js/shtool
+++ /dev/null
@@ -1,3990 +0,0 @@
-#!/bin/sh
-##
-##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-2006 Ralf S. Engelschall <rse@engelschall.com>
-##
-##  See http://www.gnu.org/software/shtool/ for more information.
-##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
-##
-##  Version:  2.0.6 (19-Apr-2006)
-##  Contents: all available modules
-##
-
-##
-##  This program is free software; you can redistribute it and/or modify
-##  it under the terms of the GNU General Public License as published by
-##  the Free Software Foundation; either version 2 of the License, or
-##  (at your option) any later version.
-##
-##  This program is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-##  General Public License for more details.
-##
-##  You should have received a copy of the GNU General Public License
-##  along with this program; if not, write to the Free Software
-##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-##  USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
-##
-##  NOTICE: Given that you include this file verbatim into your own
-##  source tree, you are justified in saying that it remains separate
-##  from your package, and that this way you are simply just using GNU
-##  shtool. So, in this situation, there is no requirement that your
-##  package itself is licensed under the GNU General Public License in
-##  order to take advantage of GNU shtool.
-##
-
-##
-##  Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]
-##
-##  Available commands:
-##    echo       Print string with optional construct expansion
-##    mdate      Pretty-print modification time of a file or dir
-##    table      Pretty-print a field-separated list as a table
-##    prop       Display progress with a running propeller
-##    move       Move files with simultaneous substitution
-##    install    Install a program, script or datafile
-##    mkdir      Make one or more directories
-##    mkln       Make link with calculation of relative paths
-##    mkshadow   Make a shadow tree through symbolic links
-##    fixperm    Fix file permissions inside a source tree
-##    rotate     Logfile rotation
-##    tarball    Roll distribution tarballs
-##    subst      Apply sed(1) substitution operations
-##    platform   Platform Identification Utility
-##    arx        Extended archive command
-##    slo        Separate linker options by library class
-##    scpp       Sharing C Pre-Processor
-##    version    Maintain a version information file
-##    path       Deal with program paths
-##
-
-#   maximum Bourne-Shell compatibility
-if [ ".$ZSH_VERSION" != . ] && (emulate sh) >/dev/null 2>&1; then
-    #   reconfigure zsh(1)
-    emulate sh
-    NULLCMD=:
-    alias -g '${1+"$@"}'='"$@"'
-elif [ ".$BASH_VERSION" != . ] && (set -o posix) >/dev/null 2>&1; then
-    #   reconfigure bash(1)
-    set -o posix
-fi
-
-#   maximum independence of NLS nuisances
-for var in \
-    LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-    LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-    LC_TELEPHONE LC_TIME
-do
-    if (set +x; test -z "`(eval $var=C; export $var) 2>&1`"); then
-        eval $var=C; export $var
-    else
-        unset $var
-    fi
-done
-
-#   initial command line handling
-if [ $# -eq 0 ]; then
-    echo "$0:Error: invalid command line" 1>&2
-    echo "$0:Hint:  run \`$0 -h' for usage" 1>&2
-    exit 1
-fi
-if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
-    echo "This is GNU shtool, version 2.0.6 (19-Apr-2006)"
-    echo 'Copyright (c) 1994-2006 Ralf S. Engelschall <rse@engelschall.com>'
-    echo 'Report bugs to <bug-shtool@gnu.org>'
-    echo ''
-    echo 'Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]'
-    echo ''
-    echo 'Available global <options>:'
-    echo '  -v, --version   display shtool version information'
-    echo '  -h, --help      display shtool usage help page (this one)'
-    echo '  -d, --debug     display shell trace information'
-    echo '  -r, --recreate  recreate this shtool script via shtoolize'
-    echo ''
-    echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
-    echo '  echo     [-n|--newline] [-e|--expand] [<string> ...]'
-    echo '  mdate    [-n|--newline] [-z|--zero] [-s|--shorten] [-d|--digits]'
-    echo '           [-f|--field-sep <str>] [-o|--order <spec>] <path>'
-    echo '  table    [-F|--field-sep <sep>] [-w|--width <width>] [-c|--columns'
-    echo '           <cols>] [-s|--strip <strip>] <str><sep><str>...'
-    echo '  prop     [-p|--prefix <str>]'
-    echo '  move     [-v|--verbose] [-t|--trace] [-e|--expand] [-p|--preserve]'
-    echo '           <src-file> <dst-file>'
-    echo '  install  [-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy]'
-    echo '           [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>]'
-    echo '           [-o|--owner <owner>] [-g|--group <group>] [-e|--exec'
-    echo '           <sed-cmd>] <file> [<file> ...] <path>'
-    echo '  mkdir    [-t|--trace] [-f|--force] [-p|--parents] [-m|--mode'
-    echo '           <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir>'
-    echo '           [<dir> ...]'
-    echo '  mkln     [-t|--trace] [-f|--force] [-s|--symbolic] <src-path>'
-    echo '           [<src-path> ...] <dst-path>'
-    echo '  mkshadow [-v|--verbose] [-t|--trace] [-a|--all] <src-dir> <dst-dir>'
-    echo '  fixperm  [-v|--verbose] [-t|--trace] <path> [<path> ...]'
-    echo '  rotate   [-v|--verbose] [-t|--trace] [-f|--force] [-n|--num-files'
-    echo '           <count>] [-s|--size <size>] [-c|--copy] [-r|--remove]'
-    echo '           [-a|--archive-dir <dir>] [-z|--compress [<tool>:]<level>]'
-    echo '           [-b|--background] [-d|--delay] [-p|--pad <len>] [-m|--mode'
-    echo '           <mode>] [-o|--owner <owner>] [-g|--group <group>] [-M|--migrate'
-    echo '           <cmd>] [-P|--prolog <cmd>] [-E|--epilog <cmd>] <file> [...]'
-    echo '  tarball  [-t|--trace] [-v|--verbose] [-o|--output <tarball>]'
-    echo '           [-c|--compress <prog>] [-d|--directory <dir>] [-u|--user'
-    echo '           <user>] [-g|--group <group>] [-e|--exclude <pattern>]'
-    echo '           <path> [<path> ...]'
-    echo '  subst    [-v|--verbose] [-t|--trace] [-n|--nop] [-w|--warning]'
-    echo '           [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup'
-    echo '           <ext>] [-e|--exec <cmd>] [-f|--file <cmd-file>] [<file>]'
-    echo '           [...]'
-    echo '  platform [-F|--format <format>] [-S|--sep <string>] [-C|--conc'
-    echo '           <string>] [-L|--lower] [-U|--upper] [-v|--verbose]'
-    echo '           [-c|--concise] [-n|--no-newline] [-t|--type <type>]'
-    echo '           [-V|--version] [-h|--help]'
-    echo '  arx      [-t|--trace] [-C|--command <cmd>] <op> <archive> [<file>'
-    echo '           ...]'
-    echo '  slo      [-p|--prefix <str>] -- -L<dir> -l<lib> [-L<dir> -l<lib>'
-    echo '           ...]'
-    echo '  scpp     [-v|--verbose] [-p|--preserve] [-f|--filter <filter>]'
-    echo '           [-o|--output <ofile>] [-t|--template <tfile>] [-M|--mark'
-    echo '           <mark>] [-D|--define <dname>] [-C|--class <cname>]'
-    echo '           <file> [<file> ...]'
-    echo '  version  [-l|--language <lang>] [-n|--name <name>] [-p|--prefix'
-    echo '           <prefix>] [-s|--set <version>] [-e|--edit] [-i|--increase'
-    echo '           <knob>] [-d|--display <type>] <file>'
-    echo '  path     [-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename]'
-    echo '           [-m|--magic] [-p|--path <path>] <str> [<str> ...]'
-    echo ''
-    exit 0
-fi
-if [ ".$1" = ".-v" ] || [ ".$1" = ".--version" ]; then
-    echo "GNU shtool 2.0.6 (19-Apr-2006)"
-    exit 0
-fi
-if [ ".$1" = ".-r" ] || [ ".$1" = ".--recreate" ]; then
-    shtoolize -oshtool all
-    exit 0
-fi
-if [ ".$1" = ".-d" ] || [ ".$1" = ".--debug" ]; then
-    shift
-    set -x
-fi
-name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'`
-case "$name" in
-    echo|mdate|table|prop|move|install|mkdir|mkln|mkshadow|fixperm|rotate|tarball|subst|platform|arx|slo|scpp|version|path )
-        #   implicit tool command selection
-        tool="$name"
-        ;;
-    * )
-        #   explicit tool command selection
-        tool="$1"
-        shift
-        ;;
-esac
-arg_spec=""
-opt_spec=""
-gen_tmpfile=no
-
-##
-##  DISPATCH INTO SCRIPT PROLOG
-##
-
-case $tool in
-    echo )
-        str_tool="echo"
-        str_usage="[-n|--newline] [-e|--expand] [<string> ...]"
-        arg_spec="0+"
-        opt_spec="n.e."
-        opt_alias="n:newline,e:expand"
-        opt_n=no
-        opt_e=no
-        ;;
-    mdate )
-        str_tool="mdate"
-        str_usage="[-n|--newline] [-z|--zero] [-s|--shorten] [-d|--digits] [-f|--field-sep <str>] [-o|--order <spec>] <path>"
-        arg_spec="1="
-        opt_spec="n.z.s.d.f:o:"
-        opt_alias="n:newline,z:zero,s:shorten,d:digits,f:field-sep,o:order"
-        opt_n=no
-        opt_z=no
-        opt_s=no
-        opt_d=no
-        opt_f=" "
-        opt_o="dmy"
-        ;;
-    table )
-        str_tool="table"
-        str_usage="[-F|--field-sep <sep>] [-w|--width <width>] [-c|--columns <cols>] [-s|--strip <strip>] <str><sep><str>..."
-        arg_spec="1+"
-        opt_spec="F:w:c:s:"
-        opt_alias="F:field-sep,w:width,c:columns,s:strip"
-        opt_F=":"
-        opt_w=15
-        opt_c=3
-        opt_s=79
-        ;;
-    prop )
-        str_tool="prop"
-        str_usage="[-p|--prefix <str>]"
-        arg_spec="0="
-        opt_spec="p:"
-        opt_alias="p:prefix"
-        opt_p=""
-        ;;
-    move )
-        str_tool="move"
-        str_usage="[-v|--verbose] [-t|--trace] [-e|--expand] [-p|--preserve] <src-file> <dst-file>"
-        arg_spec="2="
-        opt_spec="v.t.e.p."
-        opt_alias="v:verbose,t:trace,e:expand,p:preserve"
-        opt_v=no
-        opt_t=no
-        opt_e=no
-        opt_p=no
-        ;;
-    install )
-        str_tool="install"
-        str_usage="[-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy] [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] [-e|--exec <sed-cmd>] <file> [<file> ...] <path>"
-        arg_spec="1+"
-        opt_spec="v.t.d.c.C.s.m:o:g:e+"
-        opt_alias="v:verbose,t:trace,d:mkdir,c:copy,C:compare-copy,s:strip,m:mode,o:owner,g:group,e:exec"
-        opt_v=no
-        opt_t=no
-        opt_d=no
-        opt_c=no
-        opt_C=no
-        opt_s=no
-        opt_m="0755"
-        opt_o=""
-        opt_g=""
-        opt_e=""
-        ;;
-    mkdir )
-        str_tool="mkdir"
-        str_usage="[-t|--trace] [-f|--force] [-p|--parents] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir> [<dir> ...]"
-        arg_spec="1+"
-        opt_spec="t.f.p.m:o:g:"
-        opt_alias="t:trace,f:force,p:parents,m:mode,o:owner,g:group"
-        opt_t=no
-        opt_f=no
-        opt_p=no
-        opt_m=""
-        opt_o=""
-        opt_g=""
-        ;;
-    mkln )
-        str_tool="mkln"
-        str_usage="[-t|--trace] [-f|--force] [-s|--symbolic] <src-path> [<src-path> ...] <dst-path>"
-        arg_spec="2+"
-        opt_spec="t.f.s."
-        opt_alias="t:trace,f:force,s:symbolic"
-        opt_t=no
-        opt_f=no
-        opt_s=no
-        ;;
-    mkshadow )
-        str_tool="mkshadow"
-        str_usage="[-v|--verbose] [-t|--trace] [-a|--all] <src-dir> <dst-dir>"
-        arg_spec="2="
-        opt_spec="v.t.a."
-        opt_alias="v:verbose,t:trace,a:all"
-        opt_v=no
-        opt_t=no
-        opt_a=no
-        ;;
-    fixperm )
-        str_tool="fixperm"
-        str_usage="[-v|--verbose] [-t|--trace] <path> [<path> ...]"
-        arg_spec="1+"
-        opt_spec="v.t."
-        opt_alias="v:verbose,t:trace"
-        opt_v=no
-        opt_t=no
-        ;;
-    rotate )
-        str_tool="rotate"
-        str_usage="[-v|--verbose] [-t|--trace] [-f|--force] [-n|--num-files <count>] [-s|--size <size>] [-c|--copy] [-r|--remove] [-a|--archive-dir <dir>] [-z|--compress [<tool>:]<level>] [-b|--background] [-d|--delay] [-p|--pad <len>] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] [-M|--migrate <cmd>] [-P|--prolog <cmd>] [-E|--epilog <cmd>] <file> [...]"
-        arg_spec="1+"
-        opt_spec="v.t.f.n:s:c.r.a:z:b.d.p:o:g:m:M:P:E:"
-        opt_alias="v:verbose,t:trace,f:force,n:num-files,s:size,c:copy,r:remove,a:archive-dir,z:compress,b:background,d:delay,p:pad,o:owner,g:group,m:mode,M:migrate,P:prolog,E:epilog"
-        opt_v=no
-        opt_t=no
-        opt_f=no
-        opt_n=10
-        opt_s=""
-        opt_c=no
-        opt_r=no
-        opt_a=""
-        opt_z=""
-        opt_b=no
-        opt_d=no
-        opt_p=1
-        opt_o=""
-        opt_g=""
-        opt_m=""
-        opt_M=""
-        opt_P=""
-        opt_E=""
-        ;;
-    tarball )
-        str_tool="tarball"
-        str_usage="[-t|--trace] [-v|--verbose] [-o|--output <tarball>] [-c|--compress <prog>] [-d|--directory <dir>] [-u|--user <user>] [-g|--group <group>] [-e|--exclude <pattern>] <path> [<path> ...]"
-        gen_tmpfile=yes
-        arg_spec="1+"
-        opt_spec="t.v.o:c:d:u:g:e:"
-        opt_alias="t:trace,v:verbose,o:output,c:compress,d:directory,u:user,g:group,e:exclude"
-        opt_t=no
-        opt_v=no
-        opt_o=""
-        opt_c=""
-        opt_d=""
-        opt_u=""
-        opt_g=""
-        opt_e="CVS,\\.cvsignore,\\.svn,\\.[oa]\$"
-        ;;
-    subst )
-        str_tool="subst"
-        str_usage="[-v|--verbose] [-t|--trace] [-n|--nop] [-w|--warning] [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup <ext>] [-e|--exec <cmd>] [-f|--file <cmd-file>] [<file>] [...]"
-        gen_tmpfile=yes
-        arg_spec="0+"
-        opt_spec="v.t.n.w.q.s.i.b:e+f:"
-        opt_alias="v:verbose,t:trace,n:nop,w:warning,q:quiet,s:stealth,i:interactive,b:backup,e:exec,f:file"
-        opt_v=no
-        opt_t=no
-        opt_n=no
-        opt_w=no
-        opt_q=no
-        opt_s=no
-        opt_i=no
-        opt_b=""
-        opt_e=""
-        opt_f=""
-        ;;
-    platform )
-        str_tool="platform"
-        str_usage="[-F|--format <format>] [-S|--sep <string>] [-C|--conc <string>] [-L|--lower] [-U|--upper] [-v|--verbose] [-c|--concise] [-n|--no-newline] [-t|--type <type>] [-V|--version] [-h|--help]"
-        arg_spec="0="
-        opt_spec="F:S:C:L.U.v.c.n.t:d.V.h."
-        opt_alias="F:format,S:sep,C:conc,L:lower,U:upper,v:verbose,c:consise,t:type,n:no-newline,V:version,h:help"
-        opt_F="%{sp} (%{ap})"
-        opt_S=" "
-        opt_C="/"
-        opt_L=no
-        opt_U=no
-        opt_t=""
-        opt_v=no
-        opt_c=no
-        opt_n=no
-        opt_V=no
-        opt_h=no
-        ;;
-    arx )
-        str_tool="arx"
-        str_usage="[-t|--trace] [-C|--command <cmd>] <op> <archive> [<file> ...]"
-        arg_spec="2+"
-        opt_spec="t.C:"
-        opt_alias="t:trace,C:command"
-        opt_t=no
-        opt_C="ar"
-        ;;
-    slo )
-        str_tool="slo"
-        str_usage="[-p|--prefix <str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]"
-        arg_spec="1+"
-        opt_spec="p:"
-        opt_alias="p:prefix"
-        opt_p="SLO_"
-        ;;
-    scpp )
-        str_tool="scpp"
-        str_usage="[-v|--verbose] [-p|--preserve] [-f|--filter <filter>] [-o|--output <ofile>] [-t|--template <tfile>] [-M|--mark <mark>] [-D|--define <dname>] [-C|--class <cname>] <file> [<file> ...]"
-        gen_tmpfile=yes
-        arg_spec="1+"
-        opt_spec="v.p.f+o:t:M:D:C:"
-        opt_alias="v:verbose,p:preserve,f:filter,o:output,t:template,M:mark,D:define,C:class"
-        opt_v=no
-        opt_p=no
-        opt_f=""
-        opt_o="lib.h"
-        opt_t="lib.h.in"
-        opt_M="%%MARK%%"
-        opt_D="cpp"
-        opt_C="intern"
-        ;;
-    version )
-        str_tool="version"
-        str_usage="[-l|--language <lang>] [-n|--name <name>] [-p|--prefix <prefix>] [-s|--set <version>] [-e|--edit] [-i|--increase <knob>] [-d|--display <type>] <file>"
-        arg_spec="1="
-        opt_spec="l:n:p:s:i:e.d:"
-        opt_alias="l:language,n:name,p:prefix,s:set,e:edit,i:increase,d:display"
-        opt_l="txt"
-        opt_n="unknown"
-        opt_p=""
-        opt_s=""
-        opt_e="no"
-        opt_i=""
-        opt_d="short"
-        ;;
-    path )
-        str_tool="path"
-        str_usage="[-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename] [-m|--magic] [-p|--path <path>] <str> [<str> ...]"
-        gen_tmpfile=yes
-        arg_spec="1+"
-        opt_spec="s.r.d.b.m.p:"
-        opt_alias="s:suppress,r:reverse,d:dirname,b:basename,m:magic,p:path"
-        opt_s=no
-        opt_r=no
-        opt_d=no
-        opt_b=no
-        opt_m=no
-        opt_p="$PATH"
-        ;;
-    -* )
-        echo "$0:Error: unknown option \`$tool'" 2>&1
-        echo "$0:Hint:  run \`$0 -h' for usage" 2>&1
-        exit 1
-        ;;
-    * )
-        echo "$0:Error: unknown command \`$tool'" 2>&1
-        echo "$0:Hint:  run \`$0 -h' for usage" 2>&1
-        exit 1
-        ;;
-esac
-
-##
-##  COMMON UTILITY CODE
-##
-
-#   commonly used ASCII values
-ASC_TAB="	"
-ASC_NL="
-"
-
-#   determine name of tool
-if [ ".$tool" != . ]; then
-    #   used inside shtool script
-    toolcmd="$0 $tool"
-    toolcmdhelp="shtool $tool"
-    msgprefix="shtool:$tool"
-else
-    #   used as standalone script
-    toolcmd="$0"
-    toolcmdhelp="sh $0"
-    msgprefix="$str_tool"
-fi
-
-#   parse argument specification string
-eval `echo $arg_spec |\
-      sed -e 's/^\([0-9]*\)\([+=]\)/arg_NUMS=\1; arg_MODE=\2/'`
-
-#   parse option specification string
-eval `echo h.$opt_spec |\
-      sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'`
-
-#   parse option alias string
-eval `echo h:help,$opt_alias |\
-      sed -e 's/-/_/g' -e 's/\([a-zA-Z0-9]\):\([^,]*\),*/opt_ALIAS_\2=\1;/g'`
-
-#   interate over argument line
-opt_PREV=''
-while [ $# -gt 0 ]; do
-    #   special option stops processing
-    if [ ".$1" = ".--" ]; then
-        shift
-        break
-    fi
-
-    #   determine option and argument
-    opt_ARG_OK=no
-    if [ ".$opt_PREV" != . ]; then
-        #   merge previous seen option with argument
-        opt_OPT="$opt_PREV"
-        opt_ARG="$1"
-        opt_ARG_OK=yes
-        opt_PREV=''
-    else
-        #   split argument into option and argument
-        case "$1" in
-            --[a-zA-Z0-9]*=*)
-                eval `echo "x$1" |\
-                      sed -e 's/^x--\([a-zA-Z0-9-]*\)=\(.*\)$/opt_OPT="\1";opt_ARG="\2"/'`
-                opt_STR=`echo $opt_OPT | sed -e 's/-/_/g'`
-                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
-                ;;
-            --[a-zA-Z0-9]*)
-                opt_OPT=`echo "x$1" | cut -c4-`
-                opt_STR=`echo $opt_OPT | sed -e 's/-/_/g'`
-                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
-                opt_ARG=''
-                ;;
-            -[a-zA-Z0-9]*)
-                eval `echo "x$1" |\
-                      sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \
-                          -e 's/";\(.*\)$/"; opt_ARG="\1"/'`
-                ;;
-            -[a-zA-Z0-9])
-                opt_OPT=`echo "x$1" | cut -c3-`
-                opt_ARG=''
-                ;;
-            *)
-                break
-                ;;
-        esac
-    fi
-
-    #   eat up option
-    shift
-
-    #   determine whether option needs an argument
-    eval "opt_MODE=\$opt_MODE_${opt_OPT}"
-    if [ ".$opt_ARG" = . ] && [ ".$opt_ARG_OK" != .yes ]; then
-        if [ ".$opt_MODE" = ".:" ] || [ ".$opt_MODE" = ".+" ]; then
-            opt_PREV="$opt_OPT"
-            continue
-        fi
-    fi
-
-    #   process option
-    case $opt_MODE in
-        '.' )
-            #   boolean option
-            eval "opt_${opt_OPT}=yes"
-            ;;
-        ':' )
-            #   option with argument (multiple occurances override)
-            eval "opt_${opt_OPT}=\"\$opt_ARG\""
-            ;;
-        '+' )
-            #   option with argument (multiple occurances append)
-            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
-            ;;
-        * )
-            echo "$msgprefix:Error: unknown option: \`$opt_OPT'" 1>&2
-            echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
-            exit 1
-            ;;
-    esac
-done
-if [ ".$opt_PREV" != . ]; then
-    echo "$msgprefix:Error: missing argument to option \`$opt_PREV'" 1>&2
-    echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
-    exit 1
-fi
-
-#   process help option
-if [ ".$opt_h" = .yes ]; then
-    echo "Usage: $toolcmdhelp $str_usage"
-    exit 0
-fi
-
-#   complain about incorrect number of arguments
-case $arg_MODE in
-    '=' )
-        if [ $# -ne $arg_NUMS ]; then
-            echo "$msgprefix:Error: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2
-            echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
-            exit 1
-        fi
-        ;;
-    '+' )
-        if [ $# -lt $arg_NUMS ]; then
-            echo "$msgprefix:Error: invalid number of arguments (at least $arg_NUMS expected)" 1>&2
-            echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
-            exit 1
-        fi
-        ;;
-esac
-
-#   establish a temporary file on request
-if [ ".$gen_tmpfile" = .yes ]; then
-    #   create (explicitly) secure temporary directory
-    if [ ".$TMPDIR" != . ]; then
-        tmpdir="$TMPDIR"
-    elif [ ".$TEMPDIR" != . ]; then
-        tmpdir="$TEMPDIR"
-    else
-        tmpdir="/tmp"
-    fi
-    tmpdir="$tmpdir/.shtool.$$"
-    ( umask 077
-      rm -rf "$tmpdir" >/dev/null 2>&1 || true
-      mkdir  "$tmpdir" >/dev/null 2>&1
-      if [ $? -ne 0 ]; then
-          echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2
-          exit 1
-      fi
-    )
-
-    #   create (implicitly) secure temporary file
-    tmpfile="$tmpdir/shtool.tmp"
-    touch "$tmpfile"
-fi
-
-#   utility function: map string to lower case
-util_lower () {
-    echo "$1" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
-}
-
-#   utility function: map string to upper case
-util_upper () {
-    echo "$1" | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-}
-
-#   cleanup procedure
-shtool_exit () {
-    rc="$1"
-    if [ ".$gen_tmpfile" = .yes ]; then
-        rm -rf "$tmpdir" >/dev/null 2>&1 || true
-    fi
-    exit $rc
-}
-
-##
-##  DISPATCH INTO SCRIPT BODY
-##
-
-case $tool in
-
-echo )
-    ##
-    ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    text="$*"
-
-    #   check for broken escape sequence expansion
-    seo=''
-    bytes=`echo '\1' | wc -c | awk '{ printf("%s", $1); }'`
-    if [ ".$bytes" != .3 ]; then
-        bytes=`echo -E '\1' | wc -c | awk '{ printf("%s", $1); }'`
-        if [ ".$bytes" = .3 ]; then
-            seo='-E'
-        fi
-    fi
-
-    #   check for existing -n option (to suppress newline)
-    minusn=''
-    bytes=`echo -n 123 2>/dev/null | wc -c | awk '{ printf("%s", $1); }'`
-    if [ ".$bytes" = .3 ]; then
-        minusn='-n'
-    fi
-
-    #   determine terminal bold sequence
-    term_bold=''
-    term_norm=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%[Bb]'`" != . ]; then
-        case $TERM in
-            #   for the most important terminal types we directly know the sequences
-            xterm|xterm*|vt220|vt220*)
-                term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
-                term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
-                ;;
-            vt100|vt100*|cygwin)
-                term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
-                term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
-                ;;
-            #   for all others, we try to use a possibly existing `tput' or `tcout' utility
-            * )
-                paths=`echo $PATH | sed -e 's/:/ /g'`
-                for tool in tput tcout; do
-                    for dir in $paths; do
-                        if [ -r "$dir/$tool" ]; then
-                            for seq in bold md smso; do # 'smso' is last
-                                bold="`$dir/$tool $seq 2>/dev/null`"
-                                if [ ".$bold" != . ]; then
-                                    term_bold="$bold"
-                                    break
-                                fi
-                            done
-                            if [ ".$term_bold" != . ]; then
-                                for seq in sgr0 me rmso init reset; do # 'reset' is last
-                                    norm="`$dir/$tool $seq 2>/dev/null`"
-                                    if [ ".$norm" != . ]; then
-                                        term_norm="$norm"
-                                        break
-                                    fi
-                                done
-                            fi
-                            break
-                        fi
-                    done
-                    if [ ".$term_bold" != . ] && [ ".$term_norm" != . ]; then
-                        break;
-                    fi
-                done
-                ;;
-        esac
-        if [ ".$term_bold" = . ] || [ ".$term_norm" = . ]; then
-            echo "$msgprefix:Warning: unable to determine terminal sequence for bold mode" 1>&2
-            term_bold=''
-            term_norm=''
-        fi
-    fi
-
-    #   determine user name
-    username=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%[uUgG]'`" != . ]; then
-        username="`(id -un) 2>/dev/null`"
-        if [ ".$username" = . ]; then
-            str="`(id) 2>/dev/null`"
-            if [ ".`echo $str | grep '^uid[ 	]*=[ 	]*[0-9]*('`" != . ]; then
-                username=`echo $str | sed -e 's/^uid[ 	]*=[ 	]*[0-9]*(//' -e 's/).*$//'`
-            fi
-            if [ ".$username" = . ]; then
-                username="$LOGNAME"
-                if [ ".$username" = . ]; then
-                    username="$USER"
-                    if [ ".$username" = . ]; then
-                        username="`(whoami) 2>/dev/null |\
-                                   awk '{ printf("%s", $1); }'`"
-                        if [ ".$username" = . ]; then
-                            username="`(who am i) 2>/dev/null |\
-                                       awk '{ printf("%s", $1); }'`"
-                            if [ ".$username" = . ]; then
-                                username='unknown'
-                            fi
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-
-    #   determine user id
-    userid=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%U'`" != . ]; then
-        userid="`(id -u) 2>/dev/null`"
-        if [ ".$userid" = . ]; then
-            userid="`(id -u ${username}) 2>/dev/null`"
-            if [ ".$userid" = . ]; then
-                str="`(id) 2>/dev/null`"
-                if [ ".`echo $str | grep '^uid[ 	]*=[ 	]*[0-9]*('`" != . ]; then
-                    userid=`echo $str | sed -e 's/^uid[ 	]*=[ 	]*//' -e 's/(.*$//'`
-                fi
-                if [ ".$userid" = . ]; then
-                    userid=`(getent passwd ${username}) 2>/dev/null | \
-                            sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
-                    if [ ".$userid" = . ]; then
-                        userid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
-                                sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
-                        if [ ".$userid" = . ]; then
-                            userid=`(ypcat passwd) 2>/dev/null |
-                                    grep "^${username}:" | \
-                                    sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
-                            if [ ".$userid" = . ]; then
-                                userid='?'
-                            fi
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-
-    #   determine (primary) group id
-    groupid=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%[gG]'`" != . ]; then
-        groupid="`(id -g ${username}) 2>/dev/null`"
-        if [ ".$groupid" = . ]; then
-            str="`(id) 2>/dev/null`"
-            if [ ".`echo $str | grep 'gid[ 	]*=[ 	]*[0-9]*('`" != . ]; then
-                groupid=`echo $str | sed -e 's/^.*gid[ 	]*=[ 	]*//' -e 's/(.*$//'`
-            fi
-            if [ ".$groupid" = . ]; then
-                groupid=`(getent passwd ${username}) 2>/dev/null | \
-                         sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
-                if [ ".$groupid" = . ]; then
-                    groupid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
-                             sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
-                    if [ ".$groupid" = . ]; then
-                        groupid=`(ypcat passwd) 2>/dev/null | grep "^${username}:" | \
-                                 sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
-                        if [ ".$groupid" = . ]; then
-                            groupid='?'
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-
-    #   determine (primary) group name
-    groupname=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%g'`" != . ]; then
-        groupname="`(id -gn ${username}) 2>/dev/null`"
-        if [ ".$groupname" = . ]; then
-            str="`(id) 2>/dev/null`"
-            if [ ".`echo $str | grep 'gid[ 	]*=[ 	]*[0-9]*('`" != . ]; then
-                groupname=`echo $str | sed -e 's/^.*gid[ 	]*=[ 	]*[0-9]*(//' -e 's/).*$//'`
-            fi
-            if [ ".$groupname" = . ]; then
-                groupname=`(getent group) 2>/dev/null | \
-                           grep "^[^:]*:[^:]*:${groupid}:" | \
-                           sed -e 's/:.*$//'`
-                if [ ".$groupname" = . ]; then
-                    groupname=`grep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \
-                               sed -e 's/:.*$//'`
-                    if [ ".$groupname" = . ]; then
-                        groupname=`(ypcat group) 2>/dev/null | \
-                                   grep "^[^:]*:[^:]*:${groupid}:" | \
-                                   sed -e 's/:.*$//'`
-                        if [ ".$groupname" = . ]; then
-                            groupname='?'
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-
-    #   determine host and domain name
-    hostname=''
-    domainname=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%h'`" != . ]; then
-        hostname="`(uname -n) 2>/dev/null |\
-                   awk '{ printf("%s", $1); }'`"
-        if [ ".$hostname" = . ]; then
-            hostname="`(hostname) 2>/dev/null |\
-                       awk '{ printf("%s", $1); }'`"
-            if [ ".$hostname" = . ]; then
-                hostname='unknown'
-            fi
-        fi
-        case $hostname in
-            *.* )
-                domainname=".`echo $hostname | cut -d. -f2-`"
-                hostname="`echo $hostname | cut -d. -f1`"
-                ;;
-        esac
-    fi
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%d'`" != . ]; then
-        if [ ".$domainname" = . ]; then
-            if [ -f /etc/resolv.conf ]; then
-                domainname="`grep '^[ 	]*domain' /etc/resolv.conf | sed -e 'q' |\
-                             sed -e 's/.*domain//' \
-                                 -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
-                                 -e 's/^\.//' -e 's/^/./' |\
-                             awk '{ printf("%s", $1); }'`"
-                if [ ".$domainname" = . ]; then
-                    domainname="`grep '^[ 	]*search' /etc/resolv.conf | sed -e 'q' |\
-                                 sed -e 's/.*search//' \
-                                     -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
-                                     -e 's/ .*//' -e 's/	.*//' \
-                                     -e 's/^\.//' -e 's/^/./' |\
-                                 awk '{ printf("%s", $1); }'`"
-                fi
-            fi
-        fi
-    fi
-
-    #   determine current time
-    time_day=''
-    time_month=''
-    time_year=''
-    time_monthname=''
-    if [ ".$opt_e" = .yes ] && [ ".`echo $text | grep '%[DMYm]'`" != . ]; then
-        time_day=`date '+%d'`
-        time_month=`date '+%m'`
-        time_year=`date '+%Y' 2>/dev/null`
-        if [ ".$time_year" = . ]; then
-            time_year=`date '+%y'`
-            case $time_year in
-                [5-9][0-9]) time_year="19$time_year" ;;
-                [0-4][0-9]) time_year="20$time_year" ;;
-            esac
-        fi
-        case $time_month in
-            1|01) time_monthname='Jan' ;;
-            2|02) time_monthname='Feb' ;;
-            3|03) time_monthname='Mar' ;;
-            4|04) time_monthname='Apr' ;;
-            5|05) time_monthname='May' ;;
-            6|06) time_monthname='Jun' ;;
-            7|07) time_monthname='Jul' ;;
-            8|08) time_monthname='Aug' ;;
-            9|09) time_monthname='Sep' ;;
-              10) time_monthname='Oct' ;;
-              11) time_monthname='Nov' ;;
-              12) time_monthname='Dec' ;;
-        esac
-    fi
-
-    #   expand special ``%x'' constructs
-    if [ ".$opt_e" = .yes ]; then
-        text=`echo $seo "$text" |\
-              sed -e "s/%B/${term_bold}/g" \
-                  -e "s/%b/${term_norm}/g" \
-                  -e "s/%u/${username}/g" \
-                  -e "s/%U/${userid}/g" \
-                  -e "s/%g/${groupname}/g" \
-                  -e "s/%G/${groupid}/g" \
-                  -e "s/%h/${hostname}/g" \
-                  -e "s/%d/${domainname}/g" \
-                  -e "s/%D/${time_day}/g" \
-                  -e "s/%M/${time_month}/g" \
-                  -e "s/%Y/${time_year}/g" \
-                  -e "s/%m/${time_monthname}/g" 2>/dev/null`
-    fi
-
-    #   create output
-    if [ .$opt_n = .no ]; then
-        echo $seo "$text"
-    else
-        #   the harder part: echo -n is best, because
-        #   awk may complain about some \xx sequences.
-        if [ ".$minusn" != . ]; then
-            echo $seo $minusn "$text"
-        else
-            echo dummy | awk '{ printf("%s", TEXT); }' TEXT="$text"
-        fi
-    fi
-
-    shtool_exit 0
-    ;;
-
-mdate )
-    ##
-    ##  mdate -- Pretty-print modification time of a file or dir
-    ##  Copyright (c) 1995-1997 Free Software Foundation, Inc.
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    fod="$1"
-    case "$opt_o" in
-        [dmy][dmy][dmy] )
-            ;;
-        * ) echo "$msgprefix:Error: invalid argument to option \`-o': $opt_o" 1>&2
-            shtool_exit 1
-            ;;
-    esac
-    if [ ! -r "$fod" ]; then
-        echo "$msgprefix:Error: file or directory not found: $fod" 1>&2
-        shtool_exit 1
-    fi
-
-    #   GNU ls changes its time format in response to the TIME_STYLE
-    #   variable. Since we cannot assume "unset" works, revert this
-    #   variable to its documented default.
-    if [ ".$TIME_STYLE" != . ]; then
-        TIME_STYLE=posix-long-iso
-        export TIME_STYLE
-    fi
-
-    #   get the extended ls output of the file or directory.
-    if /bin/ls -L /dev/null >/dev/null 2>&1; then
-        set - x`/bin/ls -L -l -d $fod`
-    else
-        set - x`/bin/ls -l -d $fod`
-    fi
-
-    #   The month is at least the fourth argument
-    #   (3 shifts here, the next inside the loop).
-    shift; shift; shift
-
-    #   Find the month. Next argument is day, followed by the year or time.
-    month=""
-    while [ ".$month" = . ]; do
-        shift
-        case $1 in
-            Jan) month=January;   nummonth=1  ;;
-            Feb) month=February;  nummonth=2  ;;
-            Mar) month=March;     nummonth=3  ;;
-            Apr) month=April;     nummonth=4  ;;
-            May) month=May;       nummonth=5  ;;
-            Jun) month=June;      nummonth=6  ;;
-            Jul) month=July;      nummonth=7  ;;
-            Aug) month=August;    nummonth=8  ;;
-            Sep) month=September; nummonth=9  ;;
-            Oct) month=October;   nummonth=10 ;;
-            Nov) month=November;  nummonth=11 ;;
-            Dec) month=December;  nummonth=12 ;;
-        esac
-    done
-    day="$2"
-    year="$3"
-
-    #   We finally have to deal with the problem that the "ls" output
-    #   gives either the time of the day or the year.
-    case $year in
-        *:*)
-            this_year=`date '+%Y' 2>/dev/null`
-            if [ ".$this_year" = . ]; then
-                this_year=`date '+%y'`
-                case $this_year in
-                    [5-9][0-9]) this_year="19$this_year" ;;
-                    [0-4][0-9]) this_year="20$this_year" ;;
-                esac
-            fi
-            #   for the following months of the last year the time notation
-            #   is usually also used for files modified in the last year.
-            this_month=`date '+%m'`
-            if (expr $nummonth \> $this_month) >/dev/null; then
-                this_year=`expr $this_year - 1`
-            fi
-            year="$this_year"
-            ;;
-    esac
-
-    #   Optionally fill day and month with leeding zeros
-    if [ ".$opt_z" = .yes ]; then
-        case $day in
-            [0-9][0-9] ) ;;
-                 [0-9] ) day="0$day" ;;
-        esac
-        case $nummonth in
-            [0-9][0-9] ) ;;
-                 [0-9] ) nummonth="0$nummonth" ;;
-        esac
-    fi
-
-    #   Optionally use digits for month
-    if [ ".$opt_d" = .yes ]; then
-        month="$nummonth"
-    fi
-
-    #   Optionally shorten the month name to three characters
-    if [ ".$opt_s" = .yes ]; then
-        month=`echo $month | cut -c1-3`
-    fi
-
-    #   Output the resulting date string
-    echo dummy | awk '{
-        for (i = 0; i < 3; i++) {
-            now = substr(order, 1, 1);
-            order = substr(order, 2);
-            if (now == "d")
-                out = day;
-            else if (now == "m")
-                out = month;
-            else if (now == "y")
-                out = year;
-            if (i < 2)
-                printf("%s%s", out, field);
-            else
-                printf("%s", out);
-        }
-        if (newline != "yes")
-            printf("\n");
-    }' "day=$day" "month=$month" "year=$year" \
-       "field=$opt_f" "order=$opt_o" "newline=$opt_n"
-
-    shtool_exit 0
-    ;;
-
-table )
-    ##
-    ##  table -- Pretty-print a field-separated list as a table
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    if [ $opt_c -gt 4 ]; then
-        echo "$msgprefix:Error: Invalid number of colums (1..4 allowed only)" 1>&2
-        shtool_exit 1
-    fi
-    case "x$opt_F" in
-        x? ) ;;
-        *  ) echo "$msgprefix:Error: Invalid separator (one char allowed only)" 1>&2; shtool_exit 1 ;;
-    esac
-
-    #   split the list into a table
-    list=`
-        IFS="$opt_F"
-        for entry in $*; do
-            if [ ".$entry" != . ]; then
-                echo "$entry"
-            fi
-        done |\
-        awk "
-            BEGIN { list = \"\"; n = 0; }
-            {
-                list = list \\$1;
-                n = n + 1;
-                if (n < $opt_c) {
-                    list = list \":\";
-                }
-                if (n == $opt_c) {
-                    list = list \"\\n\";
-                    n = 0;
-                }
-            }
-            END { print list; }
-         "
-    `
-
-    #   format table cells and make sure table
-    #   doesn't exceed maximum width
-    OIFS="$IFS"
-    IFS='
-'
-    for entry in $list; do
-        case $opt_c in
-            1 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s\\n\", \$1); }'" ;;
-            2 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s %-${opt_w}s\\n\", \$1, \$2); }'" ;;
-            3 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s %-${opt_w}s %-${opt_w}s\\n\", \$1, \$2, \$3); }'" ;;
-            4 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s %-${opt_w}s %-${opt_w}s %-${opt_w}s\\n\", \$1, \$2, \$3, \$4); }'" ;;
-        esac
-    done |\
-    awk "{
-        if (length(\$0) > $opt_s) {
-            printf(\"%s\\n\", substr(\$0, 0, $opt_s-1));
-        } else {
-            print \$0;
-        }
-    }"
-    IFS="$OIFS"
-
-    shtool_exit 0
-    ;;
-
-prop )
-    ##
-    ##  prop -- Display progress with a running propeller
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    perl=''
-    for dir in `echo $PATH | sed -e 's/:/ /g'` .; do
-        if [ -f "$dir/perl" ]; then
-            perl="$dir/perl"
-            break
-        fi
-    done
-    if [ ".$perl" != . ]; then
-        #   Perl is preferred because writing to STDERR in
-        #   Perl really writes immediately as one would expect
-        $perl -e '
-            @p = ("|","/","-","\\");
-            $i = 0;
-            while (<STDIN>) {
-                printf(STDERR "\r%s...%s\b", $ARGV[0], $p[$i++]);
-                $i = 0 if ($i > 3);
-            }
-            printf(STDERR "\r%s    \n", $ARGV[0]);
-        ' "$opt_p"
-    else
-        #   But if Perl doesn't exists we use Awk even
-        #   some Awk's buffer even the /dev/stderr writing :-(
-        awk '
-            BEGIN {
-                split("|#/#-#\\", p, "#");
-                i = 1;
-            }
-            {
-                printf("\r%s%c\b", prefix, p[i++]) > "/dev/stderr";
-                if (i > 4) { i = 1; }
-            }
-            END {
-                printf("\r%s    \n", prefix) > "/dev/stderr";
-            }
-        ' "prefix=$opt_p"
-    fi
-
-    shtool_exit 0
-    ;;
-
-move )
-    ##
-    ##  move -- Move files with simultaneous substitution
-    ##  Copyright (c) 1999-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    src="$1"
-    dst="$2"
-
-    #   consistency checks
-    if [ ".$src" = . ] || [ ".$dst" = . ]; then
-        echo "$msgprefix:Error: Invalid arguments" 1>&2
-        shtool_exit 1
-    fi
-    if [ ".$src" = ".$dst" ]; then
-        echo "$msgprefix:Error: Source and destination files are the same" 1>&2
-        shtool_exit 1
-    fi
-    expsrc="$src"
-    if [ ".$opt_e" = .yes ]; then
-        expsrc="`echo $expsrc`"
-    fi
-    if [ ".$opt_e" = .yes ]; then
-        if [ ".`echo "$src" | sed -e 's;^.*\\*.*$;;'`" = ".$src" ]; then
-            echo "$msgprefix:Error: Source doesn't contain wildcard ('*'): $dst" 1>&2
-            shtool_exit 1
-        fi
-        if [ ".`echo "$dst" | sed -e 's;^.*%[1-9].*$;;'`" = ".$dst" ]; then
-            echo "$msgprefix:Error: Destination doesn't contain substitution ('%N'): $dst" 1>&2
-            shtool_exit 1
-        fi
-        if [ ".$expsrc" = ".$src" ]; then
-            echo "$msgprefix:Error: Sources not found or no asterisk : $src" 1>&2
-            shtool_exit 1
-        fi
-    else
-        if [ ! -r "$src" ]; then
-            echo "$msgprefix:Error: Source not found: $src" 1>&2
-            shtool_exit 1
-        fi
-    fi
-
-    #   determine substitution patterns
-    if [ ".$opt_e" = .yes ]; then
-        srcpat=`echo "$src" | sed -e 's/\\./\\\\./g' -e 's/;/\\;/g' -e 's;\\*;\\\\(.*\\\\);g'`
-        dstpat=`echo "$dst" | sed -e 's;%\([1-9]\);\\\\\1;g'`
-    fi
-
-    #   iterate over source(s)
-    for onesrc in $expsrc; do
-        if [ .$opt_e = .yes ]; then
-            onedst=`echo $onesrc | sed -e "s;$srcpat;$dstpat;"`
-        else
-            onedst="$dst"
-        fi
-        errorstatus=0
-        if [ ".$opt_v" = .yes ]; then
-            echo "$onesrc -> $onedst"
-        fi
-        if [ ".$opt_p" = .yes ]; then
-            if [ -r $onedst ]; then
-                if cmp -s $onesrc $onedst; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "rm -f $onesrc" 1>&2
-                    fi
-                    rm -f $onesrc || errorstatus=$?
-                else
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "mv -f $onesrc $onedst" 1>&2
-                    fi
-                    mv -f $onesrc $onedst || errorstatus=$?
-                fi
-            else
-                if [ ".$opt_t" = .yes ]; then
-                    echo "mv -f $onesrc $onedst" 1>&2
-                fi
-                mv -f $onesrc $onedst || errorstatus=$?
-            fi
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "mv -f $onesrc $onedst" 1>&2
-            fi
-            mv -f $onesrc $onedst || errorstatus=$?
-        fi
-        if [ $errorstatus -ne 0 ]; then
-            break;
-        fi
-    done
-
-    shtool_exit $errorstatus
-    ;;
-
-install )
-    ##
-    ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   special case: "shtool install -d <dir> [...]" internally
-    #   maps to "shtool mkdir -f -p -m 755 <dir> [...]"
-    if [ "$opt_d" = yes ]; then
-        cmd="$0 mkdir -f -p -m 755"
-        if [ ".$opt_o" != . ]; then
-            cmd="$cmd -o '$opt_o'"
-        fi
-        if [ ".$opt_g" != . ]; then
-            cmd="$cmd -g '$opt_g'"
-        fi
-        if [ ".$opt_v" = .yes ]; then
-            cmd="$cmd -v"
-        fi
-        if [ ".$opt_t" = .yes ]; then
-            cmd="$cmd -t"
-        fi
-        for dir in "$@"; do
-            eval "$cmd $dir" || shtool_exit $?
-        done
-        shtool_exit 0
-    fi
-
-    #   determine source(s) and destination
-    argc=$#
-    srcs=""
-    while [ $# -gt 1 ]; do
-        srcs="$srcs $1"
-        shift
-    done
-    dstpath="$1"
-
-    #   type check for destination
-    dstisdir=0
-    if [ -d $dstpath ]; then
-        dstpath=`echo "$dstpath" | sed -e 's:/$::'`
-        dstisdir=1
-    fi
-
-    #   consistency check for destination
-    if [ $argc -gt 2 ] && [ $dstisdir = 0 ]; then
-        echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2
-        shtool_exit 1
-    fi
-
-    #   iterate over all source(s)
-    for src in $srcs; do
-        dst=$dstpath
-
-        #   if destination is a directory, append the input filename
-        if [ $dstisdir = 1 ]; then
-            dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
-            dst="$dst/$dstfile"
-        fi
-
-        #   check for correct arguments
-        if [ ".$src" = ".$dst" ]; then
-            echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2
-            continue
-        fi
-        if [ -d "$src" ]; then
-            echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2
-            continue
-        fi
-
-        #   make a temp file name in the destination directory
-        dsttmp=`echo $dst |\
-                sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \
-                    -e "s;\$;/#INST@$$#;"`
-
-        #   verbosity
-        if [ ".$opt_v" = .yes ]; then
-            echo "$src -> $dst" 1>&2
-        fi
-
-        #   copy or move the file name to the temp name
-        #   (because we might be not allowed to change the source)
-        if [ ".$opt_C" = .yes ]; then
-            opt_c=yes
-        fi
-        if [ ".$opt_c" = .yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "cp $src $dsttmp" 1>&2
-            fi
-            cp $src $dsttmp || shtool_exit $?
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "mv $src $dsttmp" 1>&2
-            fi
-            mv $src $dsttmp || shtool_exit $?
-        fi
-
-        #   adjust the target file
-        if [ ".$opt_e" != . ]; then
-            sed='sed'
-            OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS"
-            for e
-            do
-                sed="$sed -e '$e'"
-            done
-            cp $dsttmp $dsttmp.old
-            chmod u+w $dsttmp
-            eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $?
-            rm -f $dsttmp.old
-        fi
-        if [ ".$opt_s" = .yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "strip $dsttmp" 1>&2
-            fi
-            strip $dsttmp || shtool_exit $?
-        fi
-        if [ ".$opt_o" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chown $opt_o $dsttmp" 1>&2
-            fi
-            chown $opt_o $dsttmp || shtool_exit $?
-        fi
-        if [ ".$opt_g" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chgrp $opt_g $dsttmp" 1>&2
-            fi
-            chgrp $opt_g $dsttmp || shtool_exit $?
-        fi
-        if [ ".$opt_m" != ".-" ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chmod $opt_m $dsttmp" 1>&2
-            fi
-            chmod $opt_m $dsttmp || shtool_exit $?
-        fi
-
-        #   determine whether to do a quick install
-        #   (has to be done _after_ the strip was already done)
-        quick=no
-        if [ ".$opt_C" = .yes ]; then
-            if [ -r $dst ]; then
-                if cmp -s $src $dst; then
-                    quick=yes
-                fi
-            fi
-        fi
-
-        #   finally, install the file to the real destination
-        if [ $quick = yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "rm -f $dsttmp" 1>&2
-            fi
-            rm -f $dsttmp
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "rm -f $dst && mv $dsttmp $dst" 1>&2
-            fi
-            rm -f $dst && mv $dsttmp $dst
-        fi
-    done
-
-    shtool_exit 0
-    ;;
-
-mkdir )
-    ##
-    ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    errstatus=0
-    for p in ${1+"$@"}; do
-        #   if the directory already exists...
-        if [ -d "$p" ]; then
-            if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then
-                echo "$msgprefix:Error: directory already exists: $p" 1>&2
-                errstatus=1
-                break
-            else
-                continue
-            fi
-        fi
-        #   if the directory has to be created...
-        if [ ".$opt_p" = .no ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "mkdir $p" 1>&2
-            fi
-            mkdir $p || errstatus=$?
-            if [ ".$opt_o" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chown $opt_o $p" 1>&2
-                fi
-                chown $opt_o $p || errstatus=$?
-            fi
-            if [ ".$opt_g" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chgrp $opt_g $p" 1>&2
-                fi
-                chgrp $opt_g $p || errstatus=$?
-            fi
-            if [ ".$opt_m" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chmod $opt_m $p" 1>&2
-                fi
-                chmod $opt_m $p || errstatus=$?
-            fi
-        else
-            #   the smart situation
-            set fnord `echo ":$p" |\
-                       sed -e 's/^:\//%/' \
-                           -e 's/^://' \
-                           -e 's/\// /g' \
-                           -e 's/^%/\//'`
-            shift
-            pathcomp=''
-            for d in ${1+"$@"}; do
-                pathcomp="$pathcomp$d"
-                case "$pathcomp" in
-                    -* ) pathcomp="./$pathcomp" ;;
-                esac
-                if [ ! -d "$pathcomp" ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "mkdir $pathcomp" 1>&2
-                    fi
-                    mkdir $pathcomp || errstatus=$?
-                    if [ ".$opt_o" != . ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "chown $opt_o $pathcomp" 1>&2
-                        fi
-                        chown $opt_o $pathcomp || errstatus=$?
-                    fi
-                    if [ ".$opt_g" != . ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "chgrp $opt_g $pathcomp" 1>&2
-                        fi
-                        chgrp $opt_g $pathcomp || errstatus=$?
-                    fi
-                    if [ ".$opt_m" != . ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "chmod $opt_m $pathcomp" 1>&2
-                        fi
-                        chmod $opt_m $pathcomp || errstatus=$?
-                    fi
-                fi
-                pathcomp="$pathcomp/"
-            done
-        fi
-    done
-
-    shtool_exit $errstatus
-    ;;
-
-mkln )
-    ##
-    ##  mkln -- Make link with calculation of relative paths
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   determine source(s) and destination
-    args=$?
-    srcs=""
-    while [ $# -gt 1 ]; do
-        srcs="$srcs $1"
-        shift
-    done
-    dst="$1"
-    if [ ! -d $dst ]; then
-        if [ $args -gt 2 ]; then
-            echo "$msgprefix:Error: multiple sources not allowed when target isn't a directory" 1>&2
-            shtool_exit 1
-        fi
-    fi
-
-    #   determine link options
-    lnopt=""
-    if [ ".$opt_f" = .yes ]; then
-        lnopt="$lnopt -f"
-    fi
-    if [ ".$opt_s" = .yes ]; then
-        lnopt="$lnopt -s"
-    fi
-
-    #   iterate over sources
-    for src in $srcs; do
-        #   determine if one of the paths is an absolute path,
-        #   because then we _have_ to use an absolute symlink
-        oneisabs=0
-        srcisabs=0
-        dstisabs=0
-        case $src in
-            /* ) oneisabs=1; srcisabs=1 ;;
-        esac
-        case $dst in
-            /* ) oneisabs=1; dstisabs=1 ;;
-        esac
-
-        #   split source and destination into dir and base name
-        if [ -d $src ]; then
-            srcdir=`echo $src | sed -e 's;/*$;;'`
-            srcbase=""
-        else
-            srcdir=`echo  $src | sed -e 's;^[^/]*$;;' -e 's;^\(.*/\)[^/]*$;\1;' -e 's;\(.\)/$;\1;'`
-            srcbase=`echo $src | sed -e 's;.*/\([^/]*\)$;\1;'`
-        fi
-        if [ -d $dst ]; then
-            dstdir=`echo $dst | sed -e 's;/*$;;'`
-            dstbase=""
-        else
-            dstdir=`echo  $dst | sed -e 's;^[^/]*$;;' -e 's;^\(.*/\)[^/]*$;\1;' -e 's;\(.\)/$;\1;'`
-            dstbase=`echo $dst | sed -e 's;.*/\([^/]*\)$;\1;'`
-        fi
-
-        #   consistency check
-        if [ ".$dstdir" != . ]; then
-            if [ ! -d $dstdir ]; then
-                echo "$msgprefix:Error: destination directory not found: $dstdir" 1>&2
-                shtool_exit 1
-            fi
-        fi
-
-        #   make sure the source is reachable from the destination
-        if [ $dstisabs = 1 ]; then
-            if [ $srcisabs = 0 ]; then
-                if [ ".$srcdir" = . ]; then
-                    srcdir="`pwd | sed -e 's;/*$;;'`"
-                    srcisabs=1
-                    oneisabs=1
-                elif [ -d $srcdir ]; then
-                    srcdir="`cd $srcdir; pwd | sed -e 's;/*$;;'`"
-                    srcisabs=1
-                    oneisabs=1
-                fi
-            fi
-        fi
-
-        #   split away a common prefix
-        prefix=""
-        if [ ".$srcdir" = ".$dstdir" ] && [ ".$srcdir" != . ]; then
-            prefix="$srcdir/"
-            srcdir=""
-            dstdir=""
-        else
-            while [ ".$srcdir" != . ] && [ ".$dstdir" != . ]; do
-                presrc=`echo $srcdir | sed -e 's;^\([^/]*\)/.*;\1;'`
-                predst=`echo $dstdir | sed -e 's;^\([^/]*\)/.*;\1;'`
-                if [ ".$presrc" != ".$predst" ]; then
-                    break
-                fi
-                prefix="$prefix$presrc/"
-                srcdir=`echo $srcdir | sed -e 's;^[^/]*/*;;'`
-                dstdir=`echo $dstdir | sed -e 's;^[^/]*/*;;'`
-            done
-        fi
-
-        #   destination prefix is just the common prefix
-        dstpre="$prefix"
-
-        #   determine source prefix which is the reverse directory
-        #   step-up corresponding to the destination directory
-        srcpre=""
-
-        isroot=0
-        if [ ".$prefix" = . ] || [ ".$prefix" = ./ ]; then
-            isroot=1
-        fi
-        if [ $oneisabs = 0 ] || [ $isroot = 0 ]; then
-            pl="$dstdir/"
-            OIFS="$IFS"; IFS='/'
-            for pe in $pl; do
-                [ ".$pe" = .  ] && continue
-                [ ".$pe" = .. ] && continue
-                srcpre="../$srcpre"
-            done
-            IFS="$OIFS"
-        else
-            if [ $srcisabs = 1 ]; then
-                srcpre="$prefix"
-            fi
-        fi
-
-        #   determine destination symlink name
-        if [ ".$dstbase" = . ]; then
-            if [ ".$srcbase" != . ]; then
-                dstbase="$srcbase"
-            else
-                dstbase=`echo "$prefix$srcdir" | sed -e 's;/*$;;' -e 's;.*/\([^/]*\)$;\1;'`
-            fi
-        fi
-
-        #   now finalize source and destination directory paths
-        srcdir=`echo $srcdir | sed -e 's;\([^/]\)$;\1/;'`
-        dstdir=`echo $dstdir | sed -e 's;\([^/]\)$;\1/;'`
-
-        #   run the final link command
-        if [ ".$opt_t" = .yes ]; then
-            echo "ln$lnopt $srcpre$srcdir$srcbase $dstpre$dstdir$dstbase"
-        fi
-        eval ln$lnopt $srcpre$srcdir$srcbase $dstpre$dstdir$dstbase
-    done
-
-    shtool_exit 0
-    ;;
-
-mkshadow )
-    ##
-    ##  mkshadow -- Make a shadow tree through symbolic links
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   source and destination directory
-    src=`echo "$1" | sed -e 's:/$::' -e 's:^\./\(.\):\1:'`
-    dst=`echo "$2" | sed -e 's:/$::' -e 's:^\./\(.\):\1:'`
-
-    #   check whether source exists
-    if [ ! -d $src ]; then
-        echo "$msgprefix:Error: source directory not found: \`$src'" 1>&2
-        shtool_exit 1
-    fi
-
-    #   determine if one of the paths is an absolute path,
-    #   because then we have to use an absolute symlink
-    oneisabs=0
-    case $src in
-        /* ) oneisabs=1 ;;
-    esac
-    case $dst in
-        /* ) oneisabs=1 ;;
-    esac
-
-    #   determine reverse directory for destination directory
-    dstrevdir=''
-    if [ $oneisabs = 0 ]; then
-        #   derive reverse path from forward path
-        pwd=`pwd`
-        OIFS="$IFS"; IFS='/'
-        for pe in $dst; do
-            if [ "x$pe" = "x.." ]; then
-                OIFS2="$IFS"; IFS="$DIFS"
-                eval `echo "$pwd" |\
-                      sed -e 's:\([^/]*\)$:; dir="\1":' \
-                          -e 's:^\(.*\)/[^/]*;:pwd="\1";:'\
-                          -e 's:^;:pwd="";:'`
-                dstrevdir="$dir/$dstrevdir"
-                IFS="$OIFS2"
-            else
-                dstrevdir="../$dstrevdir"
-            fi
-        done
-        IFS="$OIFS"
-    else
-        src="`cd $src; pwd`";
-    fi
-
-    #   create directory tree at destination
-    if [ ! -d $dst ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "mkdir $dst" 1>&2
-        fi
-        mkdir $dst
-    fi
-    if [ ".$opt_a" = .yes ]; then
-        DIRS=`cd $src; find . -type d -print |\
-              sed -e '/^\.$/d' -e 's:^\./::'`
-    else
-        DIRS=`cd $src; find . -type d -print |\
-              sed -e '/\/CVS/d' -e '/^\.$/d' -e 's:^\./::'`
-    fi
-    for dir in $DIRS; do
-        if [ ".$opt_t" = .yes ]; then
-            echo "mkdir $dst/$dir" 1>&2
-        fi
-        mkdir $dst/$dir
-    done
-
-    #   fill directory tree with symlinks to files
-    if [ ".$opt_a" = .yes ]; then
-        FILES="`cd $src; find . -depth -print |\
-                sed -e 's/^\.\///'`"
-    else
-        FILES="`cd $src; find . -depth -print |\
-                sed -e '/\.o$/d' -e '/\.a$/d' -e '/\.so$/d' \
-                    -e '/\.cvsignore$/d' -e '/\/CVS/d' \
-                    -e '/\/\.#/d' -e '/\.orig$/d' \
-                    -e 's/^\.\///'`"
-    fi
-    for file in $FILES; do
-         #  don't use `-type f' above for find because of symlinks
-         if [ -d "$src/$file" ]; then
-             continue
-         fi
-         basename=`echo $file | sed -e 's:^.*/::'`
-         dir=`echo $file | sed -e 's:[^/]*$::' -e 's:/$::' -e 's:$:/:' -e 's:^/$::'`
-         from=`echo "$src/$file" | sed -e 's/^\.\///'`
-         to="$dst/$dir$basename"
-         if [ $oneisabs = 0 ]; then
-             if [ ".$dir" != . ]; then
-                 subdir=`echo $dir | sed -e 's:/$::'`
-                 #   derive reverse path from forward path
-                 revdir=''
-                 OIFS="$IFS"; IFS='/'
-                 for pe in $subdir; do
-                     revdir="../$revdir"
-                 done
-                 IFS="$OIFS"
-                 #   finalize from
-                 from="$revdir$from"
-             fi
-             from="$dstrevdir$from"
-         fi
-         if [ ".$opt_v" = .yes ]; then
-             echo "    $to" 1>&2
-         fi
-         if [ ".$opt_t" = .yes ]; then
-             echo "ln -s $from $to" 1>&2
-         fi
-         ln -s $from $to
-    done
-
-    shtool_exit 0
-    ;;
-
-fixperm )
-    ##
-    ##  fixperm -- Fix file permissions inside a source tree
-    ##  Copyright (c) 1996-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    paths="$*"
-
-    #   check whether the test command supports the -x option
-    if [ -x /bin/sh ] 2>/dev/null; then
-        minusx="-x"
-    else
-        minusx="-r"
-    fi
-
-    #   iterate over paths
-    for p in $paths; do
-        for file in `find $p -depth -print`; do
-            if [ -f $file ]; then
-                if [ $minusx $file ]; then
-                    if [ ".$opt_v" = .yes ]; then
-                        echo "-rwxr-xr-x $file" 2>&1
-                    fi
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chmod 755 $file" 2>&1
-                    fi
-                    chmod 755 $file
-                else
-                    if [ ".$opt_v" = .yes ]; then
-                        echo "-rw-r--r-- $file" 2>&1
-                    fi
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chmod 644 $file" 2>&1
-                    fi
-                    chmod 644 $file
-                fi
-                continue
-            fi
-            if [ -d $file ]; then
-                if [ ".$opt_v" = .yes ]; then
-                    echo "drwxr-xr-x $file" 2>&1
-                fi
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chmod 755 $file" 2>&1
-                fi
-                chmod 755 $file
-                continue
-            fi
-            if [ ".$opt_v" = .yes ]; then
-                echo "?????????? $file" 2>&1
-            fi
-        done
-    done
-
-    shtool_exit 0
-    ;;
-
-rotate )
-    ##
-    ##  rotate -- Logfile rotation
-    ##  Copyright (c) 2001-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   make sure we have at least one file to rotate
-    if [ ".$opt_n" = .0 ]; then
-        echo "$msgprefix:Error: invalid argument \`$opt_n' to option -n." 1>&2
-        shtool_exit 1
-    fi
-
-    #   canonicalize -s option argument
-    if [ ".$opt_s" != . ]; then
-        if [ ".`expr $opt_s : '[0-9]*$'`" != .0 ]; then
-            :
-        elif [ ".`expr $opt_s : '[0-9]*[Kk]$'`" != .0 ]; then
-            opt_s=`expr $opt_s : '\([0-9]*\)[Kk]$'`
-            opt_s=`expr $opt_s \* 1024`
-        elif [ ".`expr $opt_s : '[0-9]*[Mm]$'`" != .0 ]; then
-            opt_s=`expr $opt_s : '\([0-9]*\)[Mm]$'`
-            opt_s=`expr $opt_s \* 1048576` # 1024*1024
-        elif [ ".`expr $opt_s : '[0-9]*[Gg]$'`" != .0 ]; then
-            opt_s=`expr $opt_s : '\([0-9]*\)[Gg]$'`
-            opt_s=`expr $opt_s \* 1073741824` # 1024*1024*1024
-        else
-            echo "$msgprefix:Error: invalid argument \`$opt_s' to option -s." 1>&2
-            shtool_exit 1
-        fi
-    fi
-
-    #   option -d/-z consistency
-    if [ ".$opt_d" = .yes ] && [ ".$opt_z" = . ]; then
-        echo "$msgprefix:Error: option -d requires option -z." 1>&2
-        shtool_exit 1
-    fi
-
-    #   make sure target directory exists
-    if [ ".$opt_a" != . ]; then
-        if [ ! -d $opt_a ]; then
-            if [ ".$opt_f" = .no ]; then
-                echo "$msgprefix:Error: archive directory \`$opt_a' does not exist." 1>&2
-                shtool_exit 1
-            fi
-            mkdir $opt_a || shtool_exit $?
-            chmod 755 $opt_a
-        fi
-        if [ ! -w $opt_a ]; then
-            echo "$msgprefix:Error: archive directory \`$opt_a' not writable." 1>&2
-            shtool_exit 1
-        fi
-    fi
-
-    #   determine compression approach
-    if [ ".$opt_z" != . ]; then
-        comp_lvl="$opt_z"
-        comp_prg=""
-        case $comp_lvl in
-            *:* ) eval `echo $comp_lvl |\
-                        sed -e 's%^\(.*\):\(.*\)$%comp_prg="\1"; comp_lvl="\2"%'` ;;
-        esac
-
-        #   compression level consistency
-        case $comp_lvl in
-            [0-9] )
-                ;;
-            * ) echo "$msgprefix:Error: invalid compression level \`$comp_lvl'" 1>&2
-                shtool_exit 1
-                ;;
-        esac
-
-        #   determine a suitable compression tool
-        if [ ".$comp_prg" = . ]; then
-            #   check whether the test command supports the -x option
-            if [ -x /bin/sh ] 2>/dev/null; then
-                minusx="-x"
-            else
-                minusx="-r"
-            fi
-            #   search for tools in $PATH
-            paths="`echo $PATH |\
-                    sed -e 's%/*:%:%g' -e 's%/*$%%' \
-                        -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
-                        -e 's/:/ /g'`"
-            for prg in bzip2 gzip compress; do
-                for path in $paths; do
-                    if [ $minusx "$path/$prg" ] && [ ! -d "$path/$prg" ]; then
-                        comp_prg="$prg"
-                        break
-                    fi
-                done
-                if [ ".$comp_prg" != . ]; then
-                    break
-                fi
-            done
-            if [ ".$comp_prg" = . ]; then
-                echo "$msgprefix:Error: no suitable compression tool found in \$PATH" 1>&2
-                shtool_exit 1
-            fi
-        fi
-
-        #   determine standard compression extension
-        #   and make sure it is a known tool
-        case $comp_prg in
-            */bzip2    | bzip2    ) comp_ext="bz2" comp_lvl="-$comp_lvl" ;;
-            */gzip     | gzip     ) comp_ext="gz"  comp_lvl="-$comp_lvl" ;;
-            */compress | compress ) comp_ext="Z";  comp_lvl=""           ;;
-            * ) echo "$msgprefix:Error: tool \`$comp_prg' is not a known compression tool" 1>&2
-                shtool_exit 1
-                ;;
-        esac
-        comp_suf=".$comp_ext"
-    fi
-
-    #   iterate over all given logfile arguments
-    for file in $*; do
-        #   make sure the logfile exists
-        if [ ! -f $file ]; then
-            if [ ".$opt_f" = .yes ]; then
-                continue
-            fi
-            echo "$msgprefix:Error: logfile \`$file' not found" 1>&2
-            shtool_exit 1
-        fi
-
-        #   determine log directory (where original logfile is placed)
-        ldir="."
-        case $file in
-            */* ) eval `echo $file | sed -e 's%^\(.*\)/\([^/]*\)$%ldir="\1"; file="\2";%'` ;;
-        esac
-
-        #   determine archive directory (where rotated logfiles are placed)
-        adir="$ldir"
-        if [ ".$opt_a" != . ]; then
-            case "$opt_a" in
-                /* | ./* ) adir="$opt_a" ;;
-                * ) adir="$ldir/$opt_a"  ;;
-            esac
-        fi
-
-        #   optionally take logfile size into account
-        if [ ".$opt_s" != . ]; then
-            #   determine size of logfile
-            set -- `env -i /bin/ls -l "$ldir/$file" | sed -e "s;$ldir/$file;;" |\
-                    sed -e 's; -> .*$;;' -e 's;[ 	][ 	]*; ;g'`
-            n=`expr $# - 3`
-            eval "size=\`echo \${$n}\`"
-
-            #   skip logfile if size is still too small
-            if [ $size -lt $opt_s ]; then
-                if [ ".$opt_v" = .yes ]; then
-                    echo "$ldir/$file: still too small in size -- skipping"
-                fi
-                continue
-            fi
-        fi
-
-        #   verbosity
-        if [ ".$opt_v" = .yes ]; then
-            echo "rotating $ldir/$file"
-        fi
-
-        #   execute prolog
-        if [ ".$opt_P" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "$opt_P"
-            fi
-            eval $opt_P
-            [ $? -ne 0 ] && shtool_exit $?
-        fi
-
-        #   kick away out-rotated logfile
-        n=`expr $opt_n - 1`
-        n=`echo dummy | awk "{ printf(\"%0${opt_p}d\", n); }" n=$n`
-        if [ -f "${adir}/${file}.${n}${comp_suf}" ]; then
-            #   optionally migrate away the out-rotated logfile
-            if [ ".$opt_M" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "$opt_M ${adir}/${file}.${n}${comp_suf}"
-                fi
-                eval "$opt_M ${adir}/${file}.${n}${comp_suf}"
-                [ $? -ne 0 ] && shtool_exit $?
-            fi
-            #   finally get rid of the out-rotated logfile
-            if [ ".$opt_t" = .yes ]; then
-                echo "rm -f ${adir}/${file}.${n}${comp_suf}"
-            fi
-            rm -f ${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-        fi
-
-        #   rotate already archived logfiles
-        while [ $n -gt 0 ]; do
-            m=$n
-            n=`expr $n - 1`
-            n=`echo dummy | awk "{ printf(\"%0${opt_p}d\", n); }" n=$n`
-            if [ $n -eq 0 ] && [ ".$opt_d" = .yes ]; then
-                #   special case: first rotation file under delayed compression situation
-                if [ ! -f "${adir}/${file}.${n}" ]; then
-                    continue
-                fi
-
-                #   compress file (delayed)
-                if [ ".$opt_b" = .yes ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "mv ${adir}/${file}.${n} ${adir}/${file}.${m}"
-                    fi
-                    mv ${adir}/${file}.${n} ${adir}/${file}.${m} || shtool_exit $?
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "(${comp_prg} ${comp_lvl} <${adir}/${file}.${m} >${adir}/${file}.${m}${comp_suf}; rm -f ${adir}/${file}.${m}) &"
-                    fi
-                    ( ${comp_prg} ${comp_lvl} \
-                          <${adir}/${file}.${m} \
-                          >${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-                      rm -f ${adir}/${file}.${m} || shtool_exit $?
-                    ) </dev/null >/dev/null 2>&1 &
-                else
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "${comp_prg} ${comp_lvl} <${adir}/${file}.${n} >${adir}/${file}.${m}${comp_suf}"
-                    fi
-                    ${comp_prg} ${comp_lvl} \
-                        <${adir}/${file}.${n} \
-                        >${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "rm -f ${adir}/${file}.${n}"
-                    fi
-                    rm -f ${adir}/${file}.${n} || shtool_exit $?
-                fi
-
-                #   fix file attributes
-                if [ ".$opt_o" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chown $opt_o ${adir}/${file}.${m}${comp_suf}"
-                    fi
-                    chown $opt_o ${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-                fi
-                if [ ".$opt_g" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chgrp $opt_g ${adir}/${file}.${m}${comp_suf}"
-                    fi
-                    chgrp $opt_g ${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-                fi
-                if [ ".$opt_m" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chmod $opt_m ${adir}/${file}.${m}${comp_suf}"
-                    fi
-                    chmod $opt_m ${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-                fi
-            else
-                #   standard case: second and following rotation file
-                if [ ! -f "${adir}/${file}.${n}${comp_suf}" ]; then
-                    continue
-                fi
-                if [ ".$opt_t" = .yes ]; then
-                    echo "mv ${adir}/${file}.${n}${comp_suf} ${adir}/${file}.${m}${comp_suf}"
-                fi
-                mv ${adir}/${file}.${n}${comp_suf} ${adir}/${file}.${m}${comp_suf} || shtool_exit $?
-            fi
-        done
-
-        #   move away current logfile
-        if [ ".$opt_c" = .yes ]; then
-            #   approach: copy[+truncate]
-            if [ ".$opt_t" = .yes ]; then
-                echo "cp -p ${ldir}/${file} ${adir}/${file}.${n}"
-            fi
-            cp -p ${ldir}/${file} ${adir}/${file}.${n} || shtool_exit $?
-            if [ ".$opt_r" = .no ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "cp /dev/null ${ldir}/${file}"
-                fi
-                cp /dev/null ${ldir}/${file} || shtool_exit $?
-            fi
-        else
-            #   approach: move[+touch]
-            if [ ".$opt_t" = .yes ]; then
-                echo "mv ${ldir}/${file} ${adir}/${file}.${n}"
-            fi
-            mv ${ldir}/${file} ${adir}/${file}.${n} || shtool_exit $?
-            if [ ".$opt_r" = .no ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "touch ${ldir}/${file}"
-                fi
-                touch ${ldir}/${file} || shtool_exit $?
-                #   fix file attributes
-                if [ ".$opt_o" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chown $opt_o ${ldir}/${file}"
-                    fi
-                    chown $opt_o ${ldir}/${file} || shtool_exit $?
-                fi
-                if [ ".$opt_g" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chgrp $opt_g ${ldir}/${file}"
-                    fi
-                    chgrp $opt_g ${ldir}/${file} || shtool_exit $?
-                fi
-                if [ ".$opt_m" != . ]; then
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "chmod $opt_m ${ldir}/${file}"
-                    fi
-                    chmod $opt_m ${ldir}/${file} || shtool_exit $?
-                fi
-            fi
-        fi
-
-        #   regular compression step
-        if [ ".$opt_z" != . ] && [ ".$opt_d" = .no ]; then
-            #   compress file
-            if [ ".$opt_b" = .yes ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "(${comp_prg} ${comp_lvl} <${adir}/${file}.${n} >${adir}/${file}.${n}${comp_suf}; rm -f ${adir}/${file}.${n}) &"
-                fi
-                ( ${comp_prg} ${comp_lvl} \
-                      <${adir}/${file}.${n} \
-                      >${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-                  rm -f ${adir}/${file}.${n} || shtool_exit $?
-                ) </dev/null >/dev/null 2>&1 &
-            else
-                if [ ".$opt_t" = .yes ]; then
-                    echo "${comp_prg} ${comp_lvl} <${adir}/${file}.${n} >${adir}/${file}.${n}${comp_suf}"
-                fi
-                ${comp_prg} ${comp_lvl} \
-                    <${adir}/${file}.${n} \
-                    >${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-                if [ ".$opt_t" = .yes ]; then
-                    echo "rm -f ${opt_a}${file}.${n}"
-                fi
-                rm -f ${adir}/${file}.${n} || shtool_exit $?
-            fi
-
-            #   fix file attributes
-            if [ ".$opt_o" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chown $opt_o ${adir}/${file}.${n}${comp_suf}"
-                fi
-                chown $opt_o ${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-            fi
-            if [ ".$opt_g" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chgrp $opt_g ${adir}/${file}.${n}${comp_suf}"
-                fi
-                chgrp $opt_g ${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-            fi
-            if [ ".$opt_m" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chmod $opt_m ${adir}/${file}.${n}${comp_suf}"
-                fi
-                chmod $opt_m ${adir}/${file}.${n}${comp_suf} || shtool_exit $?
-            fi
-        fi
-
-        #   execute epilog
-        if [ ".$opt_E" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "$opt_E"
-            fi
-            eval $opt_E
-            [ $? -ne 0 ] && shtool_exit $?
-        fi
-    done
-
-    shtool_exit 0
-    ;;
-
-tarball )
-    ##
-    ##  tarball -- Roll distribution tarballs
-    ##  Copyright (c) 1999-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    srcs="$*"
-
-    #   check whether the test command supports the -x option
-    if [ -x /bin/sh ] 2>/dev/null; then
-        minusx="-x"
-    else
-        minusx="-r"
-    fi
-
-    #   find the tools
-    paths="`echo $PATH |\
-            sed -e 's%/*:%:%g' -e 's%/*$%%' \
-                -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
-                -e 's/:/ /g'`"
-    for spec in find:gfind,find tar:gtar,tar tardy:tardy,tarcust; do
-        prg=`echo $spec | sed -e 's/:.*$//'`
-        tools=`echo $spec | sed -e 's/^.*://'`
-        eval "prg_${prg}=''"
-        #   iterate over tools
-        for tool in `echo $tools | sed -e 's/,/ /g'`; do
-            #   iterate over paths
-            for path in $paths; do
-                if [ $minusx "$path/$tool" ] && [ ! -d "$path/$tool" ]; then
-                    eval "prg_${prg}=\"$path/$tool\""
-                    break
-                fi
-            done
-            eval "val=\$prg_${prg}"
-            if [ ".$val" != . ]; then
-                break
-            fi
-        done
-    done
-
-    #   expand source paths
-    exclude=''
-    for pat in `echo $opt_e | sed 's/,/ /g'`; do
-        exclude="$exclude | grep -v '$pat'"
-    done
-    if [ ".$opt_t" = .yes ]; then
-        echo "cp /dev/null $tmpfile.lst" 1>&2
-    fi
-    cp /dev/null $tmpfile.lst
-    for src in $srcs; do
-        if [ -d $src ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "(cd $src && $prg_find . -type f -depth -print) | sed -e 's:^\\.\$::' -e 's:^\\./::' | cat $exclude >>$tmpfile.lst" 1>&2
-            fi
-            (cd $src && $prg_find . -type f -depth -print) |\
-            sed -e 's:^\.$::' -e 's:^\./::' | eval cat $exclude >>$tmpfile.lst
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "echo $src >>$tmpfile.lst" 1>&2
-            fi
-            echo $src >>$tmpfile.lst
-        fi
-    done
-    sort <$tmpfile.lst >$tmpfile.lst.n
-    mv $tmpfile.lst.n $tmpfile.lst
-    if [ ".$opt_v" = .yes ]; then
-        cat $tmpfile.lst | sed -e 's/^/  /' 1>&2
-    fi
-
-    #   determine tarball file and directory name
-    if [ ".$opt_o" != . ]; then
-        tarfile="$opt_o"
-        if [ ".$opt_d" != . ]; then
-            tarname="$opt_d"
-        else
-            tarname=`echo $tarfile | sed -e 's/\.tar.*$//' -e 's;.*/\([^/]*\)$;\1;'`
-        fi
-    else
-        if [ ".$opt_d" != . ]; then
-            tarname="$opt_d"
-        elif [ -d "$from" ]; then
-            tarname=`echo $from | sed -e 's;.*/\([^/]*\)$;\1;'`
-        else
-            tarname="out"
-        fi
-        tarfile="$tarname.tar"
-    fi
-
-    #   roll the tarball
-    compress=''
-    if [ ".$opt_c" != . ]; then
-        compress="| $opt_c"
-    fi
-    if [ ".$prg_tardy" != . ]; then
-        #   the elegant hackers way
-        tardy_opt="--prefix=$tarname"
-        tardy_opt="$tardy_opt --user_number=0 --group_number=0" # security!
-        if [ ".$opt_u" != . ]; then
-            tardy_opt="$tardy_opt --user_name=$opt_u"
-        fi
-        if [ ".$opt_g" != . ]; then
-            tardy_opt="$tardy_opt --group_name=$opt_g"
-        fi
-        if [ ".$opt_t" = .yes ]; then
-            echo "cat $tmpfile.lst | xargs $prg_tar cf - | $prg_tardy $tardy_opt | cat $compress >$tmpfile.out" 1>&2
-        fi
-        cat $tmpfile.lst |\
-        xargs $prg_tar cf - |\
-        $prg_tardy $tardy_opt |\
-        eval cat $compress >$tmpfile.out
-        if [ ".$opt_t" = .yes ]; then
-            echo "cp $tmpfile.out $tarfile" 1>&2
-        fi
-        cp $tmpfile.out $tarfile
-    else
-        #  the portable standard way
-        if [ ".$opt_t" = .yes ]; then
-            echo "mkdir $tmpdir/$tarname" 1>&2
-        fi
-        mkdir $tmpdir/$tarname || shtool_exit 1
-        if [ ".$opt_t" = .yes ]; then
-            echo "cat $tmpfile.lst | xargs $prg_tar cf - | (cd $tmpdir/$tarname && $prg_tar xf -)" 1>&2
-        fi
-        cat $tmpfile.lst |\
-        xargs $prg_tar cf - |\
-        (cd $tmpdir/$tarname && $prg_tar xf -)
-        if [ ".$opt_u" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chown -R $opt_u $tmpdir/$tarname >/dev/null 2>&1" 2>&1
-            fi
-            chown -R $opt_u $tmpdir/$tarname >/dev/null 2>&1 ||\
-            echo "$msgprefix:Warning: cannot set user name \`$opt_u' (would require root privileges)"
-        fi
-        if [ ".$opt_g" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chgrp -R $opt_g $tmpdir/$tarname >/dev/null 2>&1" 2>&1
-            fi
-            chgrp -R $opt_g $tmpdir/$tarname >/dev/null 2>&1 ||\
-            echo "$msgprefix:Warning: cannot set group name \`$opt_g' (would require root privileges)"
-        fi
-        if [ ".$opt_t" = .yes ]; then
-            echo "(cd $tmpdir && $prg_find $tarname -type f -depth -print | sort | xargs $prg_tar cf -) | cat $compress >$tmpfile.out" 1>&2
-        fi
-        (cd $tmpdir && $prg_find $tarname -type f -depth -print | sort | xargs $prg_tar cf -) |\
-        eval cat $compress >$tmpfile.out
-        if [ ".$opt_t" = .yes ]; then
-            echo "cp $tmpfile.out $tarfile" 1>&2
-        fi
-        cp $tmpfile.out $tarfile
-        if [ ".$opt_t" = .yes ]; then
-            echo "rm -rf $tmpdir/$tarname" 1>&2
-        fi
-        rm -rf $tmpdir/$tarname
-    fi
-
-    #   cleanup
-    if [ ".$opt_t" = .yes ]; then
-        echo "rm -f $tmpfile.lst $tmpfile.out" 1>&2
-    fi
-    rm -f $tmpfile.lst $tmpfile.out
-
-    shtool_exit 0
-    ;;
-
-subst )
-    ##
-    ##  subst -- Apply sed(1) substitution operations
-    ##  Copyright (c) 2001-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   remember optional list of file(s)
-    files="$*"
-    files_num="$#"
-
-    #   parameter consistency check
-    if [ $# -eq 0 ] && [ ".$opt_b" != . ]; then
-        echo "$msgprefix:Error: option -b cannot be applied to stdin" 1>&2
-        shtool_exit 1
-    fi
-    if [ $# -eq 0 ] && [ ".$opt_s" = .yes ]; then
-        echo "$msgprefix:Error: option -s cannot be applied to stdin" 1>&2
-        shtool_exit 1
-    fi
-
-    #   build underlying sed(1) command
-    sedcmd='sed'
-    if [ ".$opt_e" != . ]; then
-        OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS"
-        for e
-        do
-            sedcmd="$sedcmd -e '$e'"
-        done
-    elif [ ".$opt_f" != . ]; then
-        if [ ! -f $opt_f ]; then
-            echo "$msgprefix:Error: command file \`$opt_f' not found or not a regular file" 1>&2
-            shtool_exit 1
-        fi
-        sedcmd="$sedcmd -f '$opt_f'"
-    else
-        echo "$msgprefix:Error: either -e option(s) or -f option required" 1>&2
-        shtool_exit 1
-    fi
-
-    #   determine extension for original file
-    orig=".orig"
-    if [ ".$opt_b" != . ]; then
-        orig="$opt_b"
-    fi
-
-    #   apply sed(1) operation(s)
-    if [ ".$files" != . ]; then
-        #   apply operation(s) to files
-        substdone=no
-        for file in $files; do
-            test ".$file" = . && continue
-            if [ ! -f $file ]; then
-                echo "$msgprefix:Warning: file \`$file' not found or not a regular file" 1>&2
-                continue
-            fi
-
-            #   handle interactive mode
-            if [ ".$opt_i" = .yes ]; then
-                eval "$sedcmd <$file >$file.new"
-                skip=no
-                if cmp $file $file.new >/dev/null 2>&1; then
-                    rm -f $file.new
-                    skip=yes
-                else
-                    (diff -U1 $file $file.new >$tmpfile) 2>/dev/null
-                    if [ ".`cat $tmpfile`" = . ]; then
-                        (diff -C1 $file $file.new >$tmpfile) 2>/dev/null
-                        if [ ".`cat $tmpfile`" = . ]; then
-                            echo "$msgprefix:Warning: unable to show difference for file \`$file'" 1>&2
-                            cp /dev/null $tmpfile
-                        fi
-                    fi
-                    rm -f $file.new
-                    cat $tmpfile
-                    echo dummy | awk '{ printf("%s", TEXT); }' TEXT=">>> Apply [Y/n]: "
-                    read input
-                    if [ ".$input" != .Y ] &&\
-                       [ ".$input" != .y ] &&\
-                       [ ".$input" != . ]; then
-                       skip=yes
-                    fi
-                fi
-                if [ ".$skip" = .yes ]; then
-                    if [ ".$opt_v" = .yes ]; then
-                        echo "file \`$file' -- skipped" 1>&2
-                    fi
-                    continue
-                fi
-            fi
-
-            #   apply sed(1) operation(s)
-            if [ ".$opt_v" = .yes ]; then
-                echo "patching \`$file'" 1>&2
-            fi
-            if [ ".$opt_t" = .yes ]; then
-                echo "\$ cp -p $file $file$orig"
-                echo "\$ chmod u+w $file"
-                echo "\$ $sedcmd <$file$orig >$file"
-            fi
-            if [ ".$opt_n" = .no ]; then
-                cp -p $file $file$orig
-                chmod u+w $file >/dev/null 2>&1 || true
-                eval "$sedcmd <$file$orig >$file"
-            fi
-
-            #   optionally fix timestamp
-            if [ ".$opt_s" = .yes ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "\$ touch -r $file$orig $file"
-                fi
-                if [ ".$opt_n" = .no ]; then
-                    touch -r $file$orig $file
-                fi
-            fi
-
-            #   optionally check whether any content change actually occurred 
-            if [ ".$opt_q" = .no ]; then
-                if cmp $file$orig $file >/dev/null 2>&1; then
-                    if [ ".$opt_w" = .yes ]; then
-                        echo "$msgprefix:Warning: substitution resulted in no content change on file \"$file\"" 1>&2
-                    fi
-                else
-                    substdone=yes
-                fi
-            fi
-
-            #   optionally remove preserved original file
-            if [ ".$opt_b" = . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "\$ rm -f $file$orig"
-                fi
-                if [ ".$opt_n" = .no ]; then
-                    rm -f $file$orig
-                fi
-            fi
-        done
-        if [ ".$opt_q" = .no ] && [ ".$opt_w" = .no ]; then
-            if [ ".$substdone" = .no ]; then
-                if [ ".$files_num" = .1 ]; then
-                    echo "$msgprefix:Warning: substitution resulted in no content change on file \"$file\"" 1>&2
-                else
-                    echo "$msgprefix:Warning: substitution resulted in no content change on any file" 1>&2
-                fi
-            fi
-        fi
-    else
-        #   apply operation(s) to stdin/stdout
-        if [ ".$opt_v" = .yes ]; then
-            echo "patching <stdin>" 1>&2
-        fi
-        if [ ".$opt_t" = .yes ]; then
-            echo "\$ $sedcmd"
-        fi
-        if [ ".$opt_n" = .no ]; then
-            eval "$sedcmd"
-        fi
-    fi
-
-    shtool_exit 0
-    ;;
-
-platform )
-    ##
-    ##  platform -- Platform Identification Utility
-    ##  Copyright (c) 2003-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    #   option post-processing
-    if [ ".$opt_t" != . ]; then
-        case "$opt_t" in
-            binary )
-                #   binary package id (OpenPKG RPM)
-                opt_F="%<ap>-%<sp>"
-                opt_L=yes
-                opt_S=""
-                opt_C="+"
-                ;;
-            build )
-                #   build time checking (OpenPKG RPM)
-                opt_F="%<at>-%<st>"
-                opt_L=yes
-                opt_S=""
-                opt_C="+"
-                ;;
-            gnu )
-                #   GNU config.guess style <arch>-<vendor>-<os><osversion>
-                opt_F="%<at>-unknown-%<st>"
-                opt_L=yes
-                opt_S=""
-                opt_C="+"
-                ;;
-            web )
-                #   non-whitespace HTTP Server-header id
-                opt_F="%<sp>-%<ap>"
-                opt_S="/"
-                opt_C="+"
-                ;;
-            summary)
-                #   human readable verbose summary information
-                opt_F="Class:      %[sc] (%[ac])\\nProduct:    %[sp] (%[ap])\\nTechnology: %[st] (%[at])"
-                opt_S=" "
-                opt_C="/"
-                ;;
-            all-in-one )
-                #   full-table all-in-one information
-                opt_F=""
-                opt_F="${opt_F}concise architecture class:      %<ac>\\n"
-                opt_F="${opt_F}regular architecture class:      %{ac}\\n"
-                opt_F="${opt_F}verbose architecture class:      %[ac]\\n"
-                opt_F="${opt_F}concise architecture product:    %<ap>\\n"
-                opt_F="${opt_F}regular architecture product:    %{ap}\\n"
-                opt_F="${opt_F}verbose architecture product:    %[ap]\\n"
-                opt_F="${opt_F}concise architecture technology: %<at>\\n"
-                opt_F="${opt_F}regular architecture technology: %{at}\\n"
-                opt_F="${opt_F}verbose architecture technology: %[at]\\n"
-                opt_F="${opt_F}concise system class:            %<sc>\\n"
-                opt_F="${opt_F}regular system class:            %{sc}\\n"
-                opt_F="${opt_F}verbose system class:            %[sc]\\n"
-                opt_F="${opt_F}concise system product:          %<sp>\\n"
-                opt_F="${opt_F}regular system product:          %{sp}\\n"
-                opt_F="${opt_F}verbose system product:          %[sp]\\n"
-                opt_F="${opt_F}concise system technology:       %<st>\\n"
-                opt_F="${opt_F}regular system technology:       %{st}\\n"
-                opt_F="${opt_F}verbose system technology:       %[st]"
-                ;;
-            * )
-                echo "$msgprefix:Error: invalid type \`$opt_t'" 1>&2
-                exit 1
-                ;;
-        esac
-    fi
-
-    #   assemble initial platform information
-    UNAME_MACHINE=`(uname -m) 2>/dev/null` ||\
-    UNAME_MACHINE=`(uname -p) 2>/dev/null` ||\
-    UNAME_MACHINE='unknown'
-    UNAME_SYSTEM=`(uname -s) 2>/dev/null`  ||\
-    UNAME_SYSTEM='unknown'
-    UNAME_RELEASE=`(uname -r) 2>/dev/null` ||\
-    UNAME_RELEASE=`(uname -v) 2>/dev/null` ||\
-    UNAME_RELEASE='unknown'
-
-    UNAME="${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}"
-
-    AC=""; AP=""; AT=""
-    SC=""; SP=""; ST=""
-
-    #    dispatch into platform specific sections
-    case "${UNAME}" in
-
-        #   FreeBSD
-        *:FreeBSD:* )
-            #   determine architecture
-            AC="${UNAME_MACHINE}"
-            case "${AC}" in
-                i386 ) AC="iX86" ;;
-            esac
-            AP="${AC}"
-            AT="${AP}"
-            if [ ".${AT}" = ".iX86" ]; then
-                case "`(/sbin/sysctl -n hw.model) 2>&1`" in
-                    *"Xeon"* | *"Pentium Pro"* | *"Cyrix 6x86MX"* | *"Pentium II"* | *"Pentium III"* | *"Pentium 4"* | *"Celeron"* ) AT="i686" ;;
-                    *"Pentium"* ) AT="i586" ;; *"i486[SD]X"* | *"Cyrix 486"* | *"Cyrix [56]x86"* | *"Blue Lightning" | *"Cyrix 486S/DX" ) AT="i486" ;;
-                    *"i386[SD]X"* | *"NexGen 586"* ) AT="i386" ;;
-                esac
-            fi
-            #   determine system
-            r=`echo "${UNAME_RELEASE}" |\
-               sed -e 's;[()];;' -e 's/\(-.*\)$/[\1]/'`
-            ST="FreeBSD ${r}"
-            SP="${ST}"
-            case "${r}" in
-                1.* ) SC="4.3BSD" ;;
-                *   ) SC="4.4BSD" ;;
-            esac
-            ;;
-
-        #   NetBSD
-        *:NetBSD:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            AP="${AT}"
-            case "${AP}" in
-                i[3-6]86 ) AP="iX86" ;;
-            esac
-            AC="${AP}"
-            #   determine system
-            r=`echo "${UNAME_RELEASE}" | sed -e 's/\([-_].*\)$/[\1]/'`
-            ST="NetBSD ${r}"
-            SP="${ST}"
-            case "${r}" in
-                0.* ) SC="4.3BSD" ;;
-                *   ) SC="4.4BSD" ;;
-            esac
-            ;;
-
-        #   OpenBSD
-        *:OpenBSD:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            AP="${AT}"
-            case "${AP}" in
-                i[3-6]86 ) AP="iX86" ;;
-            esac
-            AC="${AP}"
-            #   determine system
-            r=`echo "${UNAME_RELEASE}" | sed -e 's/\([-_].*\)$/[\1]/'`
-            ST="OpenBSD ${r}"
-            SP="${ST}"
-            SC="4.4BSD"
-            ;;
-
-        #   GNU/Linux
-        *:Linux:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            case "${AT}" in
-               ia64     ) AT="IA64"   ;;
-               x86_64   ) AT='AMD64'  ;;
-               parisc   ) AT="HPPA32" ;;
-               parisc64 ) AT="HPPA64" ;;
-            esac
-            AP="${AT}"
-            case "${AP}" in
-               i[3-6]86 ) AP='iX86' ;;
-            esac
-            AC="${AP}"
-            #   determine system
-            v_kern=`echo "${UNAME_RELEASE}" |\
-                sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`
-            v_libc=`(strings /lib/libc.so.* | grep '^GLIBC_' | sed -e 's/^GLIBC_//' |\
-                env -i sort -n | sed -n -e '$p' | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') 2>/dev/null`
-            ST="GNU/<Linux >${v_libc}/<${v_kern}>"
-            if [ -f /etc/lsb-release ]; then
-                eval `( . /etc/lsb-release
-                    echo "SC=\"LSB${LSB_VERSION}\""
-                    if [ ".${DISTRIB_ID}" != . -a ".${DISTRIB_RELEASE}" != . ]; then
-                        echo "SP=\"${DISTRIB_ID} ${DISTRIB_RELEASE}\""
-                    fi
-                ) 2>/dev/null`
-            fi
-            if [ ".$SP" = . ]; then
-                for tagfile in x \
-                    `cd /etc && \
-                    /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \
-                    sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \
-                    echo redhat-release lsb-release`
-                do
-                    [ ".${tagfile}" = .x ] && continue
-                    [ ! -f "/etc/${tagfile}" ] && continue
-                    n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'`
-                    v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | sed -e 'q' |\
-                       sed -e 's/^/#/' \
-                           -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-                           -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-                           -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-                           -e 's/^#.*$//'`
-                    case "`util_lower ${n}`" in
-                        redhat )
-                            if [ ".`grep 'Red Hat Enterprise Linux' /etc/${tagfile}`" != . ]; then
-                                n="<R>ed <H>at <E>nterprise <L>inux"
-                            else
-                                n="<R>ed <H>at <L>inux"
-                            fi
-                            ;;
-                        debian             ) n="Debian[ GNU/Linux]"        ;;
-                        ubuntu             ) n="Ubuntu[ GNU/Linux]"        ;;
-                        fedora             ) n="<Fedora> Core[ GNU/Linux]" ;;
-                        suse               ) n="SuSE[ Linux]"              ;;
-                        mandrake*|mandriva ) n="Mandriva[ Linux]"          ;;
-                        gentoo             ) n="Gentoo[ GNU/Linux]"        ;;
-                        slackware          ) n="Slackware[ Linux]"         ;;
-                        turbolinux         ) n="TurboLinux"                ;;
-                        unitedlinux        ) n="UnitedLinux"               ;;
-                        *                  ) n="${n}[ GNU/Linux]"          ;;
-                    esac
-                    case "$n" in
-                        *"<"*">"* ) SP="$n <$v>" ;;
-                        *         ) SP="$n $v"   ;;
-                    esac
-                    break
-                done
-            fi
-            [ ".$SP" = . ] && SP="${ST}"
-            [ ".$SC" = . ] && SC="LSB"
-            ;;
-
-        #   Sun Solaris
-        *:SunOS:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            case "${AT}" in
-                i86pc )
-                    AT="iX86"
-                    case "`(/bin/isainfo -k) 2>&1`" in
-                        amd64 ) AT="AMD64" ;;
-                    esac
-                    ;;
-            esac
-            AP="${AT}"
-            case "${AP}" in
-                sun4[cdm] ) AP="SPARC32" ;;
-                sun4[uv]  ) AP="SPARC64" ;;
-                sun4*     ) AP="SPARC"   ;;
-            esac
-            AC="${AP}"
-            case "${AC}" in
-                SPARC* ) AC="SPARC" ;;
-            esac
-            #   determine system
-            ST="[Sun ]SunOS ${UNAME_RELEASE}"
-            v=`echo "${UNAME_RELEASE}" |\
-               sed -e 's;^4\.;1.;' \
-                   -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \
-                   -e 's;^5\.\([0-9][0-9]*\).*;\1;'`
-            SP="[Sun ]Solaris $v"
-            case "${UNAME_RELEASE}" in
-                4.* ) SC="4.3BSD" ;;
-                5.* ) SC="SVR4"   ;;
-            esac
-            ;;
-
-        #   SCO UnixWare
-        *:UnixWare:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            case "${AT}" in
-                i[3-6]86 | ix86at ) AT="iX86" ;;
-            esac
-            AP="${AT}"
-            #   determine system
-            v=`/sbin/uname -v`
-            ST="[SCO ]UnixWare ${v}"
-            SP="${ST}"
-            SC="SVR${UNAME_RELEASE}"
-            ;;
-
-        #   QNX
-        *:QNX:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            case "${AT}" in
-                x86pc ) AT="iX86" ;;
-            esac
-            AP="${AT}"
-            #   determine system
-            v="${UNAME_RELEASE}"
-            ST="QNX[ Neutrino RTOS] ${v}"
-            v=`echo "${v}" | sed -e 's;^\([0-9][0-9]*\.[0-9][0-9]*\).*$;\1;'`
-            SP="QNX[ Neutrino RTOS] ${v}"
-            SC="QNX"
-            ;;
-
-        #   SGI IRIX
-        *:IRIX*:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            AP="${AT}"
-            case "${AP}:${UNAME_SYSTEM}" in
-                IP*:IRIX64 ) AP="MIPS64" ;;
-                IP*:*      ) AP="MIPS"   ;;
-            esac
-            AC="${AP}"
-            #   determine system
-            v=`(/bin/uname -R || /bin/uname -r) 2>/dev/null | sed -e 's;[0-9.]* ;;'`
-            ST="[SGI ]IRIX ${v}"
-            v="${UNAME_RELEASE}"
-            SP="[SGI ]IRIX ${v}"
-            SC="4.2BSD/SVR3"
-            ;;
-
-        #   HP HP-UX
-        *:HP-UX:* )
-            #   determine architecture
-            AT="${UNAME_MACHINE}"
-            case "${AT}" in
-                ia64 ) AT="IA64" ;;
-                9000/[34]?? ) AT=M68K ;;
-                9000/[678][0-9][0-9])
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                        523 ) AT="HPPA1.0" ;;
-                        528 ) AT="HPPA1.1" ;;
-                        532 ) AT="HPPA2.0"
-                            case "${sc_kernel_bits}" in
-                                32 ) AT="${AT}n" ;;
-                                64 ) AT="${AT}w" ;;
-                            esac
-                            ;;
-                    esac
-                    ;;
-            esac
-            AP="${AT}"
-            case "${AP}" in
-                HPPA* ) AP="HPPA" ;;
-            esac
-            AC="${AP}"
-            #   determine system
-            v=`echo "${UNAME_RELEASE}" | sed -e 's;^[^0-9]*;;'`
-            ST="[HP ]<HP>-<UX ${v}>"
-            SP="${ST}"
-            case "${v}" in
-                10.*   ) SC="SVR4.2" ;;
-                [7-9]* ) SC="SVR4"   ;;
-            esac
-            ;;
-
-        #   HP Tru64 (OSF1)
-        *:OSF1:* )
-            #   determine architecture
-            AP="${UNAME_MACHINE}"
-            case "${AP}" in
-                alpha ) AP="Alpha" ;;
-            esac
-            alpha_type=`(/usr/sbin/psrinfo -v) 2>/dev/null |\
-                sed -n -e 's/^.*The alpha \([^ ][^ ]*\).*processor.*$/\1/p' | sed -e 'q'`
-            AT="${AP}${alpha_type}"
-            AC="${AP}"
-            #   determine system
-            v=`echo "${UNAME_RELEASE}" | sed -e 's;^[VTX];;'`
-            ST="[HP ]Tru64 ${v}"
-            SP="${ST}"
-            SC="OSF1"
-            ;;
-
-        #   IBM AIX
-        *:AIX:* )
-            cpu_arch=rs6000
-            if [ -x /usr/sbin/lsdev -a -x /usr/sbin/lsattr ]; then
-                cpu_id=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-                if [ ".`/usr/sbin/lsattr -El ${cpu_id} | grep -i powerpc`" != . ]; then
-                    cpu_arch=powerpc
-                fi
-            elif [ -d /QOpenSys ]; then
-                #   IBM i5/OS (aka OS/400) with PASE (Portable Application Solutions Environment)
-                cpu_arch=powerpc
-            fi
-            if [ -x /usr/bin/oslevel ]; then
-                os_level=`/usr/bin/oslevel`
-            else
-                os_level="`uname -v`.`uname -r`"
-            fi
-            os_level=`echo "${os_level}" |\
-                      sed -e 's;^\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\)\(.*\)$;<\1>\2[\3];' \
-                          -e 's;^\([0-9][0-9]*\.[0-9][0-9]*\)\(.*\)$;<\1>\2;'`
-            AT="${cpu_arch}"
-            AP="${AT}"
-            AC="${AP}"
-            ST="[IBM ]<AIX >${os_level}"
-            SP="${ST}"
-            case "${os_level}" in
-                [12]* ) SC="SVR2" ;;
-                *     ) SC="SVR4" ;;
-            esac
-            ;;
-
-        #   Apple MacOS X Darwin
-        *:Darwin:* )
-            AT=`uname -p`
-            case "${AT}" in
-                powerpc ) AT="PPC" ;;
-            esac
-            AP="${AT}"
-            AC="${AP}"
-            case "${AC}" in
-                i?86 ) AC="iX86" ;;
-            esac
-            ST="[Apple ]${UNAME_SYSTEM} ${UNAME_RELEASE}"
-            SP="${ST}"
-            SC="4.4BSD/Mach3"
-            ;;
-
-        #   TODO ...ADD YOUR NEW PLATFORM CHECK HERE... TODO
-        # *:XXX:* )
-        #   ...
-        #   ;;
-
-        #   ...A STILL UNKNOWN PLATFORM...
-        * )
-            AT=`echo "${UNAME_MACHINE}" | sed -e "s; ;${opt_C};g"`
-            AP="${AT}"
-            AC="${AP}"
-            v=`echo "${UNAME_RELEASE}" |\
-               sed -e 's/^/#/' \
-                   -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-                   -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-                   -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-                   -e 's/^#.*$/?/'`
-            ST="${UNAME_SYSTEM} ${v}"
-            SP="${ST}"
-            SC="${SP}"
-            ;;
-
-    esac
-
-    #   provide fallback values
-    [ ".$AT" = . ] && AT="${AP:-${AC}}"
-    [ ".$AP" = . ] && AP="${AT:-${AC}}"
-    [ ".$AC" = . ] && AC="${AP:-${AT}}"
-    [ ".$ST" = . ] && ST="${SP:-${SC}}"
-    [ ".$SP" = . ] && SP="${ST:-${SC}}"
-    [ ".$SC" = . ] && SC="${SP:-${ST}}"
-
-    #   support explicit enforced verbose/concise output
-    if [ ".$opt_v" = .yes ]; then
-        opt_F=`echo ":$opt_F" | sed -e 's/^://' -e 's/%\([as][cpt]\)/%[\1]/g'`
-    elif [ ".$opt_c" = .yes ]; then
-        opt_F=`echo ":$opt_F" | sed -e 's/^://' -e 's/%\([as][cpt]\)/%<\1>/g'`
-    fi
-
-    #   provide verbose and concise variants
-    AC_V=""; AC_N=""; AC_C=""
-    AP_V=""; AP_N=""; AP_C=""
-    AT_V=""; AT_N=""; AT_C=""
-    SC_V=""; SC_N=""; SC_C=""
-    SP_V=""; SP_N=""; SP_C=""
-    ST_V=""; ST_N=""; ST_C=""
-    for var_lc in at ap ac st sp sc; do
-        case "$opt_F" in
-            *"%[${val_lc}]"* | *"%{${val_lc}}"* | *"%${val_lc}"* | *"%<${val_lc}>"* )
-            var_uc=`util_upper "$var_lc"`
-            eval "val=\"\$${var_uc}\""
-            val_V=""; val_N=""; val_C=""
-            case "$opt_F" in
-                *"%[${var_lc}]"* )
-                    val_V=`echo ":$val" | \
-                           sed -e 's/^://' \
-                               -e 's;\[\([^]]*\)\];\1;g' \
-                               -e 's;<\([^>]*\)>;\1;g' \
-                               -e "s; ;§§;g" \
-                               -e "s;/;%%;g" \
-                               -e "s;§§;${opt_S};g" \
-                               -e "s;%%;${opt_C};g"`
-                    eval "${var_uc}_V=\"\${val_V}\""
-                    ;;
-            esac
-            case "$opt_F" in
-                *"%{${var_lc}}"* | *"%${var_lc}"* )
-                    val_N=`echo ":$val" | \
-                           sed -e 's/^://' \
-                               -e 's;\[\([^]]*\)\];;g' \
-                               -e 's;<\([^>]*\)>;\1;g' \
-                               -e "s; ;§§;g" \
-                               -e "s;/;%%;g" \
-                               -e "s;§§;${opt_S};g" \
-                               -e "s;%%;${opt_C};g"`
-                    eval "${var_uc}_N=\"\${val_N}\""
-                    ;;
-            esac
-            case "$opt_F" in
-                *"%<${var_lc}>"* )
-                    val_C=`echo ":$val" | \
-                           sed -e 's/^://' \
-                               -e 's;\[\([^]]*\)\];;g' \
-                               -e 's;[^<]*<\([^>]*\)>[^<]*;\1;g' \
-                               -e "s; ;§§;g" \
-                               -e "s;/;%%;g" \
-                               -e "s;§§;${opt_S};g" \
-                               -e "s;%%;${opt_C};g"`
-                    eval "${var_uc}_C=\"\${val_C}\""
-                    ;;
-            esac
-            ;;
-        esac
-    done
-
-    #   create output string
-    output=`echo ":$opt_F" |\
-            sed -e "s/^://" \
-                -e "s;%\\[ac\\];${AC_V};g" \
-                -e "s;%{ac};${AC_N};g" \
-                -e "s;%ac;${AC_N};g" \
-                -e "s;%<ac>;${AC_C};g" \
-                -e "s;%\\[ap\\];${AP_V};g" \
-                -e "s;%{ap};${AP_N};g" \
-                -e "s;%ap;${AP_N};g" \
-                -e "s;%<ap>;${AP_C};g" \
-                -e "s;%\\[at\\];${AT_V};g" \
-                -e "s;%{at};${AT_N};g" \
-                -e "s;%at;${AT_N};g" \
-                -e "s;%<at>;${AT_C};g" \
-                -e "s;%\\[sc\\];${SC_V};g" \
-                -e "s;%{sc};${SC_N};g" \
-                -e "s;%sc;${SC_N};g" \
-                -e "s;%<sc>;${SC_C};g" \
-                -e "s;%\\[sp\\];${SP_V};g" \
-                -e "s;%{sp};${SP_N};g" \
-                -e "s;%sp;${SP_N};g" \
-                -e "s;%<sp>;${SP_C};g" \
-                -e "s;%\\[st\\];${ST_V};g" \
-                -e "s;%{st};${ST_N};g" \
-                -e "s;%st;${ST_N};g" \
-                -e "s;%<st>;${ST_C};g" \
-                -e 's/\\\\n/^/g' |\
-             tr '^' '\012'`
-
-    #   support lower/upper-case mapping
-    if [ ".$opt_L" = .yes ]; then
-        output=`util_lower "$output"`
-    elif [ ".$opt_U" = .yes ]; then
-        output=`util_upper "$output"`
-    fi
-
-    #   display output string
-    if [ ".$opt_n" = .yes ]; then
-        echo . | awk '{ printf("%s", output); }' output="$output"
-    else
-        echo "$output"
-    fi
-
-    shtool_exit 0
-    ;;
-
-arx )
-    ##
-    ##  arx -- Extended archive command
-    ##  Copyright (c) 1999-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    ar_prg="$opt_C"
-    ar_cmd="$1"; shift
-    archive="$1"; shift
-    files="$*"
-
-    #   walk through the file list and expand archives members
-    ar_tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
-    nfiles=''
-    if [ ".$files" != . ]; then
-        for file in $files; do
-            if [ ! -f $file ]; then
-                echo "$msgprefix:Error: input file not found: $file" 1>&2
-                shtool_exit 1
-            fi
-            case $file in
-                *.a )
-                    if [ ! -d $ar_tmpdir ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "mkdir $ar_tmpdir" 1>&2
-                        fi
-                        mkdir $ar_tmpdir
-                    fi
-                    case $ar_tmpdir in
-                         .arx )
-                             from="../$file"
-                             ;;
-                         * )
-                             dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
-                             base=`echo $file | sed -e 's;.*/\([^/]*\)$;\1;'`
-                             from="`cd $dir; pwd`/$base"
-                             ;;
-                    esac
-                    if [ ".$opt_t" = .yes ]; then
-                        echo "(cd $ar_tmpdir && $ar_prg x $from)" 1>&2
-                    fi
-                    (cd $ar_tmpdir && eval $ar_prg x $from)
-                    if [ $? -ne 0 ]; then
-                        echo "$msgprefix:Error: member extraction failed for archive: $file" 1>&2
-                        shtool_exit 1
-                    fi
-                    for member in - `eval $ar_prg t $file | sed -e '/_\.SYMDEF/d'`; do
-                        [ ".$member" = .- ] && continue
-                        nfiles="$nfiles $ar_tmpdir/$member"
-                    done
-                    ;;
-                * )
-                    nfiles="$nfiles $file"
-                    ;;
-            esac
-        done
-    fi
-
-    #   run the final archive command
-    if [ ".$opt_t" = .yes ]; then
-        echo "$ar_prg $ar_cmd $archive $nfiles" 1>&2
-    fi
-    eval $ar_prg $ar_cmd $archive $nfiles
-    if [ $? -ne 0 ]; then
-        echo "$msgprefix:Error: archive command failed" 1>&2
-        shtool_exit $?
-    fi
-
-    #   cleanup and die gracefully
-    if [ -d $ar_tmpdir ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "rm -rf $ar_tmpdir" 1>&2
-        fi
-        rm -rf $ar_tmpdir
-    fi
-
-    shtool_exit 0
-    ;;
-
-slo )
-    ##
-    ##  slo -- Separate linker options by library class
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    DIFS="$IFS"
-
-    #   parse out -L and -l options from command line
-    DIRS=''
-    LIBS=''
-    ARGV=''
-    optprev=''
-    for opt
-    do
-        #   concatenate with previous option if exists
-        if [ ".$optprev" != . ]; then
-            opt="${optprev}${opt}";
-            optprev=''
-        fi
-        #   remember options for arg if used stand-alone
-        if [ ".$opt" = ".-L" ] || [ ".$opt" = ".-l" ]; then
-            optprev="$opt"
-            continue;
-        fi
-        #   split argument into option plus option argument
-        arg="`echo $opt | cut -c3-`"
-        opt="`echo $opt | cut -c1-2`"
-        #   store into containers
-        case $opt in
-            -L) DIRS="$DIRS:$arg" ;;
-            -l) LIBS="$LIBS:$arg" ;;
-             *) ARGV="$ARGV $opt" ;;
-        esac
-    done
-
-    #   set linker default directories
-    DIRS_DEFAULT='/lib:/usr/lib'
-    if [ ".$LD_LIBRARY_PATH" != . ]; then
-        DIRS_DEFAULT="$DIRS_DEFAULT:$LD_LIBRARY_PATH"
-    fi
-
-    #   sort options by class
-    DIRS_OBJ=''
-    LIBS_OBJ=''
-    DIRS_PIC=''
-    LIBS_PIC=''
-    DIRS_DSO=''
-    LIBS_DSO=''
-
-    #    for each library...
-    OIFS="$IFS"; IFS=':'
-    for lib in $LIBS; do
-        [ ".$lib" = . ] && continue
-
-        found='no'
-        found_indefdir='no'
-        found_type=''
-        found_dir=''
-
-        #    for each directory...
-        OIFS2="$IFS"; IFS=":$DIFS"
-        for dir in ${DIRS} switch-to-defdirs ${DIRS_DEFAULT}; do
-            [ ".$dir" = . ] && continue
-            [ ".$dir" = .switch-to-defdirs ] && found_indefdir=yes
-            [ ! -d $dir ] && continue
-
-            #    search the file
-            OIFS3="$IFS"; IFS="$DIFS"
-            for file in '' `cd $dir && env -i /bin/ls lib${lib}.* 2>/dev/null`; do
-                 [ ".$file" = . ] && continue
-                 case $file in
-                     *.so|*.so.[0-9]*|*.sl|*.sl.[0-9]* )
-                          found=yes;
-                          found_type=DSO;
-                          break
-                          ;;
-                     *.lo|*.la )
-                          found=yes;
-                          found_type=PIC
-                          ;;
-                     *.a )
-                          if [ ".$found_type" = . ]; then
-                              found=yes
-                              found_type=OBJ
-                          fi
-                          ;;
-                 esac
-            done
-            IFS="$OIFS3"
-            if [ ".$found" = .yes ]; then
-                found_dir="$dir"
-                break
-            fi
-        done
-        IFS="$OIFS2"
-
-        if [ ".$found" = .yes ]; then
-            if [ ".$found_indefdir" != .yes ]; then
-                eval "dirlist=\"\${DIRS_${found_type}}:\""
-                case "$dirlist" in
-                    *:$found_dir:* ) ;;
-                    * ) eval "DIRS_${found_type}=\"\$DIRS_${found_type}:${found_dir}\"" ;;
-                esac
-                eval "LIBS_${found_type}=\"\$LIBS_${found_type}:$lib\""
-            else
-                eval "LIBS_${found_type}=\"\$LIBS_${found_type}:$lib\""
-            fi
-        else
-            LIBS_OBJ="$LIBS_OBJ:$lib"
-            #dirlist="`echo $DIRS $DIRS_DEFAULT | sed -e 's/:/ /g'`"
-            #echo "slo:Warning: library \"$lib\" not found in any of the following dirs:" 2>&1
-            #echo "slo:Warning: $dirlist" 1>&1
-        fi
-    done
-    IFS="$OIFS"
-
-    #   also pass-through unused dirs even if it's useless
-    OIFS="$IFS"; IFS=':'
-    for dir in $DIRS; do
-        dirlist="${DIRS_OBJ}:${DIRS_PIC}:${DIRS_DSO}:"
-        case "$dirlist" in
-            *:$dir:* ) ;;
-            * ) DIRS_OBJ="$DIRS_OBJ:$dir" ;;
-        esac
-    done
-    IFS="$OIFS"
-
-    #   reassemble the options but separated by type
-    for type in OBJ PIC DSO; do
-        OIFS="$IFS"; IFS=':'
-        eval "libs=\"\$LIBS_${type}\""
-        opts=''
-        for lib in $libs; do
-            [ ".$lib" = . ] && continue
-            opts="$opts -l$lib"
-        done
-        eval "LIBS_${type}=\"$opts\""
-
-        eval "dirs=\"\$DIRS_${type}\""
-        opts=''
-        for dir in $dirs; do
-            [ ".$dir" = . ] && continue
-            opts="$opts -L$dir"
-        done
-        eval "DIRS_${type}=\"$opts\""
-        IFS="$OIFS"
-    done
-
-    #   give back results
-    for var in ARGV DIRS_OBJ LIBS_OBJ DIRS_PIC LIBS_PIC DIRS_DSO LIBS_DSO; do
-        eval "val=\"\$${var}\""
-        val="`echo $val | sed -e 's/^ *//'`"
-        echo "${opt_p}${var}=\"${val}\""
-    done
-
-    shtool_exit 0
-    ;;
-
-scpp )
-    ##
-    ##  scpp -- Sharing C Pre-Processor
-    ##  Copyright (c) 1999-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    srcs="$*"
-    output="${opt_o}.n"
-
-    #   find a reasonable Awk
-    awk=''
-    paths=`echo $PATH |\
-           sed -e 's%/*:%:%g' -e 's%/$%%' \
-               -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
-               -e 's/:/ /g'`
-    for name in gawk nawk awk; do
-        for path in $paths; do
-            if [ -r "$path/$name" ]; then
-                awk="$path/$name"
-                break
-            fi
-        done
-        if [ ".$awk" != . ]; then
-            break
-        fi
-    done
-    if [ ".$awk" = . ]; then
-        echo "$msgprefix:Error: cannot find a reasonable Awk" 1>&2
-        shtool_exit 1
-    fi
-
-    #   parse source file(s)
-    if [ ".$opt_v" = .yes ]; then
-        echo "Parsing:" | $awk '{ printf("%s", $0); }' 1>&2
-    fi
-    for src in $srcs; do
-        if [ ".$opt_v" = .yes ]; then
-            echo $src | $awk '{ printf(" %s", $0); }' 1>&2
-        fi
-        if [ ".$opt_f" != . ]; then
-            inputcmd="sed"
-            OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_f; IFS="$OIFS"
-            for e
-            do
-                inputcmd="$inputcmd -e '$e'"
-            done
-            inputcmd="$inputcmd '$src'"
-        else
-            inputcmd="cat '$src'"
-        fi
-        eval $inputcmd |\
-        $awk '
-           BEGIN {
-               ln    = 0;
-               fln   = 0;
-               level = 0;
-               mode  = "";
-               store = "";
-           }
-           {
-               ln++;
-           }
-           /^#if.*/ {
-               level++;
-           }
-           /^#if [a-zA-Z_][a-zA-Z0-9_]* *$/ {
-               if ($2 == define) {
-                   mode = "D";
-                   printf("D:#line %d \"%s\"\n", ln, src);
-                   next;
-               }
-           }
-           /^#endif.*/ {
-               level--;
-               if (mode == "D" && level == 0) {
-                   mode = "";
-                   next;
-               }
-           }
-           /^[a-zA-Z_][a-zA-Z0-9_].*;.*/ {
-               if ($1 == class) {
-                   printf("V:#line %d \"%s\"\n", ln, src);
-                   printf("V:%s\n", $0);
-                   printf("J:%s\n", $0);
-                   next;
-               }
-           }
-           /^[a-zA-Z_][a-zA-Z0-9_].*=.*/ {
-               if ($1 == class) {
-                   printf("V:#line %d \"%s\"\n", ln, src);
-                   printf("V:%s\n", $0);
-                   printf("J:%s\n", $0);
-                   next;
-               }
-           }
-           /^[a-zA-Z_][a-zA-Z0-9_]*/ {
-               if ($1 == class) {
-                   fln = ln;
-                   store = $0;
-                   mode = "F";
-                   next;
-               }
-           }
-           /^\{ *$/ {
-               if (mode == "F") {
-                   printf("F:#line %d \"%s\"\n", fln, src);
-                   printf("F:%s;\n", store);
-                   printf("I:%s;\n", store);
-                   store = "";
-                   mode = "";
-                   next;
-               }
-           }
-           {
-               if (mode == "D")
-                   printf("D:%s\n", $0);
-               else if (mode == "F")
-                   store = store " " $0;
-           }
-        ' "src=$src" "define=$opt_D" "class=$opt_C" >>$tmpfile
-    done
-    if [ ".$opt_v" = .yes ]; then
-        echo "" 1>&2
-    fi
-
-    #   start generating output header
-    echo "/* $opt_o -- autogenerated from $opt_t, DO NOT EDIT! */" >$output
-    echo "#line 1 \"$opt_t\"" >>$output
-    sed <$opt_t -e "1,/^${opt_M} *\$/p" -e 'd' |\
-    sed -e "/^${opt_M} *\$/d" >>$output
-
-    #   merge in the define blocks
-    grep '^D:' $tmpfile | sed -e 's/^D://' >>$output
-
-    #   generate standard prolog
-    echo "#line 1 \"_ON_THE_FLY_\"" >>$output
-    echo "" >>$output
-    echo "/* make sure the scpp source extensions are skipped */" >>$output
-    echo "#define $opt_D 0" >>$output
-    echo "#define $opt_C /**/" >>$output
-
-    #   generate namespace hiding for variables
-    echo "" >>$output
-    echo "/* move intern variables to hidden namespace */" >>$output
-    grep '^J:' $tmpfile | sed >>$output \
-        -e 's/^J://' \
-        -e 's/  */ /g' \
-        -e 's/^[^=;]*[ *]\([a-zA-Z0-9_]*\)\[\];.*$/#define \1 __\1/' \
-        -e 's/^[^=;]*[ *]\([a-zA-Z0-9_]*\)\[\] =.*$/#define \1 __\1/' \
-        -e 's/^[^=;]*[ *]\([a-zA-Z0-9_]*\);.*$/#define \1 __\1/' \
-        -e 's/^[^=;]*[ *]\([a-zA-Z0-9_]*\) =.*$/#define \1 __\1/'
-
-    #   generate namespace hiding for functions
-    echo "" >>$output
-    echo "/* move intern functions to hidden namespace */" >>$output
-    grep '^I:' $tmpfile | sed >>$output \
-        -e 's/^I://' \
-        -e 's/\([ (]\) */\1/g' \
-        -e 's/ *\([),]\)/\1/g' \
-        -e 's/^[^(]*[ *]\([a-zA-Z0-9_]*\)(.*$/#define \1 __\1/'
-
-    #   generate prototypes for variables
-    echo "" >>$output
-    echo "/* prototypes for intern variables */" >>$output
-    grep '^V:' $tmpfile | sed >>$output \
-        -e 's/^V://' \
-        -e 's/  */ /g' \
-        -e 's/^\([^=;]*[ *][a-zA-Z0-9_]*\[\]\);.*$/\1;/' \
-        -e 's/^\([^=;]*[ *][a-zA-Z0-9_]*\[\]\) =.*$/\1;/' \
-        -e 's/^\([^=;]*[ *][a-zA-Z0-9_]*\);.*$/\1;/' \
-        -e 's/^\([^=;]*[ *][a-zA-Z0-9_]*\) =.*$/\1;/' \
-        -e 's/ ;/;/g' \
-        -e "s/^$opt_C /extern /"
-
-    #   generate prototypes for functions
-    echo "" >>$output
-    echo "/* prototypes for intern functions */" >>$output
-    grep '^F:' $tmpfile | sed >>$output \
-        -e 's/^F://' \
-        -e 's/\([ (]\) */\1/g' \
-        -e 's/ *\([),]\)/\1/g' \
-        -e 's/\([* ]\)[a-zA-Z0-9_]*,/\1,/g' \
-        -e 's/\([* ]\)[a-zA-Z0-9_]*);/\1);/g' \
-        -e 's/(\*[a-zA-Z0-9_]*)(/(*)(/g' \
-        -e 's/\([ (]\) */\1/g' \
-        -e 's/ *\([),]\)/\1/g' \
-        -e "s/^$opt_C /extern /"
-
-    #   finish generating output header
-    n=`(echo ''; sed <$opt_t -e "1,/^${opt_M} *\$/p" -e 'd') |\
-       wc -l | sed -e 's;^ *\([0-9]*\) *$;\1;'`
-    echo "#line $n \"$opt_t\"" >>$output
-    sed <$opt_t -e "/^${opt_M} *\$/,\$p" -e 'd' |\
-    sed -e "/^${opt_M} *\$/d" >>$output
-
-    #   create final output file
-    if [ -f $opt_o ]; then
-        if [ ".$opt_p" = .yes ]; then
-            grep -v '^#line' $opt_o  >$tmpfile.o
-            grep -v '^#line' $output >$tmpfile.n
-            out_old="$tmpfile.o"
-            out_new="$tmpfile.n"
-        else
-            out_old="$opt_o"
-            out_new="$output"
-        fi
-        if cmp -s $out_old $out_new; then
-            :
-        else
-            cp $output $opt_o
-        fi
-    else
-        cp $output $opt_o
-    fi
-    rm -f $output
-    rm -f $tmpfile $tmpfile.* >/dev/null 2>&1
-
-    shtool_exit 0
-    ;;
-
-version )
-    ##
-    ##  version -- Maintain a version information file
-    ##  Copyright (c) 1994-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    file="$1"
-
-    #   determine prefix and name
-    name="$opt_n"
-    prefix="$opt_p"
-
-    #   determine current version
-    triple="$opt_s"
-    if [ ".$triple" != . ]; then
-        #   use given triple
-        if [ ".`echo $triple | grep '[0-9]*.[0-9]*[sabp.][0-9]*'`" = . ]; then
-            echo "$msgprefix:Error: invalid argument to option \`-s': \`$opt_s'" 1>&2
-            shtool_exit 1
-        fi
-        eval `echo $triple |\
-              sed -e 's%\([0-9]*\)\.\([0-9]*\)\([sabp.]\)\([0-9]*\).*%\
-              ver="\1";rev="\2";typ="\3";lev="\4"%'`
-        tim=calc
-    elif [ -r $file ]; then
-        #   determine triple from given file
-        eval `grep 'Version [0-9]*.[0-9]*[sabp.][0-9]* ([0-9]*-[a-zA-Z]*-[0-9]*)' $file |\
-              sed -e 's%.*Version \([0-9]*\)\.\([0-9]*\)\([sabp.]\)\([0-9]*\) (\([0-9]*-[a-zA-Z]*-[0-9]*\)).*%\
-              ver="\1";rev="\2";typ="\3";lev="\4";tim="\5"%' -e 'q'`
-    else
-        #   intialise to first version
-        ver=0
-        rev=1
-        typ=.
-        lev=0
-        tim=calc
-    fi
-
-    #   determine new version in batch
-    if [ ".$opt_i" != . ]; then
-        case $opt_i in
-            v ) ver=`expr $ver + 1`
-                rev=0
-                lev=0
-                ;;
-            r ) rev=`expr $rev + 1`
-                lev=0
-                ;;
-            l ) lev=`expr $lev + 1`
-                ;;
-            * ) echo "$msgprefix:Error: invalid argument to option \`-i': \`$opt_i'" 1>&2
-                shtool_exit 1
-                ;;
-        esac
-        tim=calc
-    fi
-
-    #   determine new version interactively
-    if [ ".$opt_e" = .yes ]; then
-        echo "old version: ${ver}.${rev}${typ}${lev}"
-        while [ 1 ]; do
-            echo dummy | awk '{ printf("new version: "); }'
-            read triple
-            case $triple in
-                [0-9]*.[0-9]*[sabp.][0-9]* )
-                    ;;
-                * ) echo "$msgprefix:Error: invalid version string entered: \`$triple'" 1>&2
-                    continue
-                    ;;
-            esac
-            break
-        done
-        eval `echo $triple |\
-              sed -e 's%^\([0-9]*\)\.\([0-9]*\)\([sabp.]\)\([0-9]*\)$%\
-              ver="\1";rev="\2";typ="\3";lev="\4"%'`
-        tim=calc
-    fi
-
-    #   determine hexadecimal and libtool value of version
-    case $typ in
-        a     ) typnum=0;  levnum=$lev ;;
-        b     ) typnum=1;  levnum=$lev ;;
-        p | . ) typnum=2;  levnum=$lev ;;
-        s     ) typnum=15; levnum=255  ;; # snapshots are special
-    esac
-    hex=`echo "$ver:$rev:$typnum:$levnum" |\
-         awk -F: '{ printf("0x%x%02x%1x%02x", $1, $2, $3, $4); }' |\
-         tr 'abcdef' 'ABCDEF'`
-    ltv=`echo "$ver:$rev:$typnum:$levnum" |\
-         awk -F: '{ printf("%d:%d", $1*10 + $2, $3*10 + $4); }'`
-
-    #   determine date
-    if [ ".$tim" = .calc ]; then
-        day=`date '+%d'`
-        month=`date '+%m'`
-        year=`date '+%Y' 2>/dev/null`
-        if [ ".$time_year" = . ]; then
-            year=`date '+%y'`
-            case $year in
-                [5-9][0-9]) year="19$year" ;;
-                [0-4][0-9]) year="20$year" ;;
-            esac
-        fi
-        case $month in
-            1|01) month='Jan' ;;
-            2|02) month='Feb' ;;
-            3|03) month='Mar' ;;
-            4|04) month='Apr' ;;
-            5|05) month='May' ;;
-            6|06) month='Jun' ;;
-            7|07) month='Jul' ;;
-            8|08) month='Aug' ;;
-            9|09) month='Sep' ;;
-              10) month='Oct' ;;
-              11) month='Nov' ;;
-              12) month='Dec' ;;
-        esac
-        tim="${day}-${month}-${year}"
-    fi
-
-    #   perform result actions
-    mode=show
-    if [ ".$opt_i" != . ]; then
-        mode=edit
-    elif [ ".$opt_e" = .yes ]; then
-        mode=edit
-    elif [ ".$opt_s" != . ]; then
-        mode=edit
-    fi
-    if [ ".$mode" = .show ]; then
-        #   just display the current version
-        case $opt_d in
-            short )
-                echo "${ver}.${rev}${typ}${lev}"
-                ;;
-            long )
-                echo "${ver}.${rev}${typ}${lev} ($tim)"
-                ;;
-            libtool )
-                echo "${ltv}"
-                ;;
-            hex )
-                echo "${hex}"
-                ;;
-            * ) echo "$msgprefix:Error: invalid argument to option \`-d': \`$opt_d'" 1>&2
-                shtool_exit 1
-                ;;
-        esac
-    else
-        #   update the version file
-
-        #   pre-generate various strings
-        triple="${ver}.${rev}${typ}${lev}"
-        vHex="$hex"
-        vShort="${triple}"
-        vLong="${triple} (${tim})"
-        vTeX="This is ${name}, Version ${triple} (${tim})"
-        vGNU="${name} ${triple} (${tim})"
-        vWeb="${name}/${triple}"
-        vSCCS="@(#)${name} ${triple} (${tim})"
-        vRCS="\$Id: ${name} ${triple} (${tim}) \$"
-
-        #   determine string out of filename
-        #   (do NOT try to optimize this in any way because of portability)
-        filestr=`util_upper "$file" | tr './%+' '____' | sed -e 's/-/_/g'`
-
-        #   generate uppercase prefix
-        prefixupper=`util_upper "$prefix"`
-
-        #   create the version file according the the selected language
-        echo "new version: ${vLong}"
-
-        cp /dev/null $file
-        case $opt_l in
-            txt )
-                echo >>$file ""
-                echo >>$file "  ${file} -- Version Information for ${name} (syntax: Text)"
-                echo >>$file "  [automatically generated and maintained by GNU shtool]"
-                echo >>$file ""
-                echo >>$file "  $vTeX"
-                echo >>$file ""
-                ;;
-            c )
-                echo >>$file "/*"
-                echo >>$file "**  ${file} -- Version Information for ${name} (syntax: C/C++)"
-                echo >>$file "**  [automatically generated and maintained by GNU shtool]"
-                echo >>$file "*/"
-                echo >>$file ""
-                echo >>$file "#ifdef _${filestr}_AS_HEADER_"
-                echo >>$file ""
-                echo >>$file "#ifndef _${filestr}_"
-                echo >>$file "#define _${filestr}_"
-                echo >>$file ""
-                echo >>$file "#define ${prefixupper}VERSION ${vHex}"
-                echo >>$file ""
-                echo >>$file "typedef struct {"
-                echo >>$file "    const int   v_hex;"
-                echo >>$file "    const char *v_short;"
-                echo >>$file "    const char *v_long;"
-                echo >>$file "    const char *v_tex;"
-                echo >>$file "    const char *v_gnu;"
-                echo >>$file "    const char *v_web;"
-                echo >>$file "    const char *v_sccs;"
-                echo >>$file "    const char *v_rcs;"
-                echo >>$file "} ${prefix}version_t;"
-                echo >>$file ""
-                echo >>$file "extern ${prefix}version_t ${prefix}version;"
-                echo >>$file ""
-                echo >>$file "#endif /* _${filestr}_ */"
-                echo >>$file ""
-                echo >>$file "#else /* _${filestr}_AS_HEADER_ */"
-                echo >>$file ""
-                echo >>$file "#define _${filestr}_AS_HEADER_"
-                echo >>$file "#include \"${file}\""
-                echo >>$file "#undef  _${filestr}_AS_HEADER_"
-                echo >>$file ""
-                echo >>$file "${prefix}version_t ${prefix}version = {"
-                echo >>$file "    ${vHex},"
-                echo >>$file "    \"${vShort}\","
-                echo >>$file "    \"${vLong}\","
-                echo >>$file "    \"${vTeX}\","
-                echo >>$file "    \"${vGNU}\","
-                echo >>$file "    \"${vWeb}\","
-                echo >>$file "    \"${vSCCS}\","
-                echo >>$file "    \"${vRCS}\""
-                echo >>$file "};"
-                echo >>$file ""
-                echo >>$file "#endif /* _${filestr}_AS_HEADER_ */"
-                echo >>$file ""
-                ;;
-            m4 )
-                echo >>$file "##"
-                echo >>$file "##  ${file} -- Version Information for ${name} (syntax: M4)"
-                echo >>$file "##  [automatically generated and maintained by GNU shtool]"
-                echo >>$file "##"
-                echo >>$file ""
-                echo >>$file "m4_define([v_hex],   [${vHex}])"
-                echo >>$file "m4_define([v_short], [${vShort}])"
-                echo >>$file "m4_define([v_long],  [${vLong}])"
-                echo >>$file "m4_define([v_tex],   [${vTeX}])"
-                echo >>$file "m4_define([v_gnu],   [${vGNU}])"
-                echo >>$file "m4_define([v_web],   [${vWeb}])"
-                echo >>$file "m4_define([v_sccs],  [${vSCCS}])"
-                echo >>$file "m4_define([v_rcs],   [${vRCS}])"
-                echo >>$file ""
-                ;;
-            perl )
-                echo >>$file "##"
-                echo >>$file "##  ${file} -- Version Information for ${name} (syntax: Perl)"
-                echo >>$file "##  [automatically generated and maintained by GNU shtool]"
-                echo >>$file "##"
-                echo >>$file ""
-                echo >>$file "our \$${prefix}version = {"
-                echo >>$file "    'v_hex'   => ${vHex},"
-                echo >>$file "    'v_short' => \"${vShort}\","
-                echo >>$file "    'v_long'  => \"${vLong}\","
-                echo >>$file "    'v_tex'   => \"${vTeX}\","
-                echo >>$file "    'v_gnu'   => \"${vGNU}\","
-                echo >>$file "    'v_web'   => \"${vWeb}\","
-                echo >>$file "    'v_sccs'  => \"${vSCCS}\","
-                echo >>$file "    'v_rcs'   => \"\\${vRCS}/\""
-                echo >>$file "};"
-                echo >>$file ""
-                echo >>$file "1;"
-                echo >>$file ""
-                ;;
-            python )
-                echo >>$file "##"
-                echo >>$file "##  ${file} -- Version Information for ${name} (syntax: Python)"
-                echo >>$file "##  [automatically generated and maintained by GNU shtool]"
-                echo >>$file "##"
-                echo >>$file ""
-                echo >>$file "class ${prefix}version:"
-                echo >>$file "    v_hex       = ${vHex}"
-                echo >>$file "    v_short     = \"${vShort}\""
-                echo >>$file "    v_long      = \"${vLong}\""
-                echo >>$file "    v_tex       = \"${vTeX}\""
-                echo >>$file "    v_gnu       = \"${vGNU}\""
-                echo >>$file "    v_web       = \"${vWeb}\""
-                echo >>$file "    v_sccs      = \"${vSCCS}\""
-                echo >>$file "    v_rcs       = \"${vRCS}\""
-                echo >>$file ""
-                ;;
-            * ) echo "$msgprefix:Error: invalid argument to option \`-l': \`$opt_l'" 1>&2
-                shtool_exit 1
-                ;;
-        esac
-    fi
-
-    shtool_exit 0
-    ;;
-
-path )
-    ##
-    ##  path -- Deal with program paths
-    ##  Copyright (c) 1998-2006 Ralf S. Engelschall <rse@engelschall.com>
-    ##
-
-    namelist="$*"
-
-    #   check whether the test command supports the -x option
-    if [ -x /bin/sh ] 2>/dev/null; then
-        minusx="-x"
-    else
-        minusx="-r"
-    fi
-
-    #   split path string
-    paths="`echo $opt_p |\
-            sed -e 's/^:/.:/' \
-                -e 's/::/:.:/g' \
-                -e 's/:$/:./' \
-                -e 's/:/ /g'`"
-
-    #   SPECIAL REQUEST
-    #   translate forward to reverse path
-    if [ ".$opt_r" = .yes ]; then
-        if [ "x$namelist" = "x." ]; then
-            rp='.'
-        else
-            rp=''
-            for pe in `IFS="$IFS/"; echo $namelist`; do
-                rp="../$rp"
-            done
-        fi
-        echo $rp | sed -e 's:/$::'
-        shtool_exit 0
-    fi
-
-    #   SPECIAL REQUEST
-    #   strip out directory or base name
-    if [ ".$opt_d" = .yes ]; then
-        echo "$namelist" |\
-        sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'
-        shtool_exit 0
-    fi
-    if [ ".$opt_b" = .yes ]; then
-        echo "$namelist" |\
-        sed -e 's;.*/\([^/]*\)$;\1;'
-        shtool_exit 0
-    fi
-
-    #   MAGIC SITUATION
-    #   Perl Interpreter (perl)
-    if [ ".$opt_m" = .yes ] && [ ".$namelist" = .perl ]; then
-        rm -f $tmpfile >/dev/null 2>&1
-        touch $tmpfile
-        found=0
-        pc=99
-        for dir in $paths; do
-            dir=`echo $dir | sed -e 's;/*$;;'`
-            nc=99
-            for name in perl perl5 miniperl; do
-                 if [ $minusx "$dir/$name" ] && [ ! -d "$dir/$name" ]; then
-                     perl="$dir/$name"
-                     pv=`$perl -e 'printf("%.3f", $]);'`
-                     echo "$pv:$pc:$nc:$perl" >>$tmpfile
-                     found=1
-                 fi
-                 nc=`expr $nc - 1`
-            done
-            pc=`expr $pc - 1`
-        done
-        if [ $found = 1 ]; then
-            perl="`cat $tmpfile | sort -r -u | sed -e 'q' | cut -d: -f4`"
-            rm -f $tmpfile >/dev/null 2>&1
-            echo "$perl"
-            shtool_exit 0
-        fi
-        rm -f $tmpfile >/dev/null 2>&1
-        shtool_exit 1
-    fi
-
-    #   MAGIC SITUATION
-    #   C pre-processor (cpp)
-    if [ ".$opt_m" = .yes ] && [ ".$namelist" = .cpp ]; then
-        echo >$tmpfile.c "#include <assert.h>"
-        echo >>$tmpfile.c "Syntax Error"
-        #   1. try the standard cc -E approach
-        cpp="${CC-cc} -E"
-        (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-        my_error=`grep -v '^ *+' $tmpfile.out`
-        if [ ".$my_error" != . ]; then
-            #   2. try the cc -E approach and GCC's -traditional-ccp option
-            cpp="${CC-cc} -E -traditional-cpp"
-            (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-            my_error=`grep -v '^ *+' $tmpfile.out`
-            if [ ".$my_error" != . ]; then
-                #   3. try a standalone cpp command in path and lib dirs
-                for path in $paths /lib /usr/lib /usr/local/lib; do
-                    path=`echo $path | sed -e 's;/*$;;'`
-                    if [ $minusx "$path/cpp" ] && [ ! -d "$path/cpp" ]; then
-                        cpp="$path/cpp"
-                        break
-                    fi
-                done
-                if [ ".$cpp" != . ]; then
-                    (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-                    my_error=`grep -v '^ *+' $tmpfile.out`
-                    if [ ".$my_error" != . ]; then
-                        #   ok, we gave up...
-                        cpp=''
-                    fi
-                fi
-            fi
-        fi
-        rm -f $tmpfile >/dev/null 2>&1
-        rm -f $tmpfile.c $tmpfile.out >/dev/null 2>&1
-        if [ ".$cpp" != . ]; then
-            echo "$cpp"
-            shtool_exit 0
-        fi
-        shtool_exit 1
-    fi
-
-    #   STANDARD SITUATION
-    #   iterate over names
-    for name in $namelist; do
-        #   iterate over paths
-        for path in $paths; do
-            path=`echo $path | sed -e 's;/*$;;'`
-            if [ $minusx "$path/$name" ] && [ ! -d "$path/$name" ]; then
-                if [ ".$opt_s" != .yes ]; then
-                    echo "$path/$name"
-                fi
-                shtool_exit 0
-            fi
-        done
-    done
-
-    shtool_exit 1
-    ;;
-
-esac
-
-shtool_exit 0
-
diff --git a/libs/js/src/fdlibm/e_acos.c b/libs/js/src/fdlibm/e_acos.c
deleted file mode 100644
index a07c1eebc7..0000000000
--- a/libs/js/src/fdlibm/e_acos.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_acos.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_acos(x)
- * Method :                  
- *	acos(x)  = pi/2 - asin(x)
- *	acos(-x) = pi/2 + asin(x)
- * For |x|<=0.5
- *	acos(x) = pi/2 - (x + x*x^2*R(x^2))	(see asin.c)
- * For x>0.5
- * 	acos(x) = pi/2 - (pi/2 - 2asin(sqrt((1-x)/2)))
- *		= 2asin(sqrt((1-x)/2))  
- *		= 2s + 2s*z*R(z) 	...z=(1-x)/2, s=sqrt(z)
- *		= 2f + (2c + 2s*z*R(z))
- *     where f=hi part of s, and c = (z-f*f)/(s+f) is the correction term
- *     for f so that f+c ~ sqrt(z).
- * For x<-0.5
- *	acos(x) = pi - 2asin(sqrt((1-|x|)/2))
- *		= pi - 0.5*(s+s*z*R(z)), where z=(1-|x|)/2,s=sqrt(z)
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN with invalid signal.
- *
- * Function needed: sqrt
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one=  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-pi =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
-pio2_hi =  1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */
-pio2_lo =  6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */
-pS0 =  1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */
-pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */
-pS2 =  2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */
-pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */
-pS4 =  7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */
-pS5 =  3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */
-qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
-qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
-qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
-qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
-
-#ifdef __STDC__
-	double __ieee754_acos(double x)
-#else
-	double __ieee754_acos(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-        double df;
-	double z,p,q,r,w,s,c;
-	int hx,ix;
-        u.d = x;
-	hx = __HI(u);
-	ix = hx&0x7fffffff;
-	if(ix>=0x3ff00000) {	/* |x| >= 1 */
-	    if(((ix-0x3ff00000)|__LO(u))==0) {	/* |x|==1 */
-		if(hx>0) return 0.0;		/* acos(1) = 0  */
-		else return pi+2.0*pio2_lo;	/* acos(-1)= pi */
-	    }
-	    return (x-x)/(x-x);		/* acos(|x|>1) is NaN */
-	}
-	if(ix<0x3fe00000) {	/* |x| < 0.5 */
-	    if(ix<=0x3c600000) return pio2_hi+pio2_lo;/*if|x|<2**-57*/
-	    z = x*x;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    return pio2_hi - (x - (pio2_lo-x*r));
-	} else  if (hx<0) {		/* x < -0.5 */
-	    z = (one+x)*0.5;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    s = fd_sqrt(z);
-	    r = p/q;
-	    w = r*s-pio2_lo;
-	    return pi - 2.0*(s+w);
-	} else {			/* x > 0.5 */
-	    z = (one-x)*0.5;
-	    s = fd_sqrt(z);
-	    u.d = s;
-	    __LO(u) = 0;
-            df = u.d;
-	    c  = (z-df*df)/(s+df);
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    w = r*s+c;
-	    return 2.0*(df+w);
-	}
-}
diff --git a/libs/js/src/fdlibm/e_acosh.c b/libs/js/src/fdlibm/e_acosh.c
deleted file mode 100644
index 725cceefb4..0000000000
--- a/libs/js/src/fdlibm/e_acosh.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_acosh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_acosh(x)
- * Method :
- *	Based on 
- *		acosh(x) = log [ x + sqrt(x*x-1) ]
- *	we have
- *		acosh(x) := log(x)+ln2,	if x is large; else
- *		acosh(x) := log(2x-1/(sqrt(x*x-1)+x)) if x>2; else
- *		acosh(x) := log1p(t+sqrt(2.0*t+t*t)); where t=x-1.
- *
- * Special cases:
- *	acosh(x) is NaN with signal if x<1.
- *	acosh(NaN) is NaN without signal.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one	= 1.0,
-ln2	= 6.93147180559945286227e-01;  /* 0x3FE62E42, 0xFEFA39EF */
-
-#ifdef __STDC__
-	double __ieee754_acosh(double x)
-#else
-	double __ieee754_acosh(x)
-	double x;
-#endif
-{	
-        fd_twoints u;
-	double t;
-	int hx;
-        u.d = x;
-	hx = __HI(u);
-	if(hx<0x3ff00000) {		/* x < 1 */
-	    return (x-x)/(x-x);
-	} else if(hx >=0x41b00000) {	/* x > 2**28 */
-	    if(hx >=0x7ff00000) {	/* x is inf of NaN */
-	        return x+x;
-	    } else 
-		return __ieee754_log(x)+ln2;	/* acosh(huge)=log(2x) */
-	} else if(((hx-0x3ff00000)|__LO(u))==0) {
-	    return 0.0;			/* acosh(1) = 0 */
-	} else if (hx > 0x40000000) {	/* 2**28 > x > 2 */
-	    t=x*x;
-	    return __ieee754_log(2.0*x-one/(x+fd_sqrt(t-one)));
-	} else {			/* 1<x<2 */
-	    t = x-one;
-	    return fd_log1p(t+fd_sqrt(2.0*t+t*t));
-	}
-}
diff --git a/libs/js/src/fdlibm/e_asin.c b/libs/js/src/fdlibm/e_asin.c
deleted file mode 100644
index 624c4d2ce6..0000000000
--- a/libs/js/src/fdlibm/e_asin.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_asin.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_asin(x)
- * Method :                  
- *	Since  asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
- *	we approximate asin(x) on [0,0.5] by
- *		asin(x) = x + x*x^2*R(x^2)
- *	where
- *		R(x^2) is a rational approximation of (asin(x)-x)/x^3 
- *	and its remez error is bounded by
- *		|(asin(x)-x)/x^3 - R(x^2)| < 2^(-58.75)
- *
- *	For x in [0.5,1]
- *		asin(x) = pi/2-2*asin(sqrt((1-x)/2))
- *	Let y = (1-x), z = y/2, s := sqrt(z), and pio2_hi+pio2_lo=pi/2;
- *	then for x>0.98
- *		asin(x) = pi/2 - 2*(s+s*z*R(z))
- *			= pio2_hi - (2*(s+s*z*R(z)) - pio2_lo)
- *	For x<=0.98, let pio4_hi = pio2_hi/2, then
- *		f = hi part of s;
- *		c = sqrt(z) - f = (z-f*f)/(s+f) 	...f+c=sqrt(z)
- *	and
- *		asin(x) = pi/2 - 2*(s+s*z*R(z))
- *			= pio4_hi+(pio4-2s)-(2s*z*R(z)-pio2_lo)
- *			= pio4_hi+(pio4-2f)-(2s*z*R(z)-(pio2_lo+2c))
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN with invalid signal.
- *
- */
-
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-really_big =  1.000e+300,
-pio2_hi =  1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */
-pio2_lo =  6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */
-pio4_hi =  7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */
-	/* coefficient for R(x^2) */
-pS0 =  1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */
-pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */
-pS2 =  2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */
-pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */
-pS4 =  7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */
-pS5 =  3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */
-qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
-qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
-qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
-qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
-
-#ifdef __STDC__
-	double __ieee754_asin(double x)
-#else
-	double __ieee754_asin(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double w,t,p,q,c,r,s;
-	int hx,ix;
-        u.d = x;
-	hx = __HI(u);
-        x = u.d;
-	ix = hx&0x7fffffff;
-	if(ix>= 0x3ff00000) {		/* |x|>= 1 */
-	    if(((ix-0x3ff00000)|__LO(u))==0)
-		    /* asin(1)=+-pi/2 with inexact */
-		return x*pio2_hi+x*pio2_lo;	
-	    return (x-x)/(x-x);		/* asin(|x|>1) is NaN */   
-	} else if (ix<0x3fe00000) {	/* |x|<0.5 */
-	    if(ix<0x3e400000) {		/* if |x| < 2**-27 */
-		if(really_big+x>one) return x;/* return x with inexact if x!=0*/
-	    } else 
-		t = x*x;
-		p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-		q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-		w = p/q;
-		return x+x*w;
-	}
-	/* 1> |x|>= 0.5 */
-	w = one-fd_fabs(x);
-	t = w*0.5;
-	p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-	q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-	s = fd_sqrt(t);
-	if(ix>=0x3FEF3333) { 	/* if |x| > 0.975 */
-	    w = p/q;
-	    t = pio2_hi-(2.0*(s+s*w)-pio2_lo);
-	} else {
-	    u.d  = s;
-	    __LO(u) = 0;
-            w = u.d;
-	    c  = (t-w*w)/(s+w);
-	    r  = p/q;
-	    p  = 2.0*s*r-(pio2_lo-2.0*c);
-	    q  = pio4_hi-2.0*w;
-	    t  = pio4_hi-(p-q);
-	}    
-	if(hx>0) return t; else return -t;    
-}
diff --git a/libs/js/src/fdlibm/e_atan2.c b/libs/js/src/fdlibm/e_atan2.c
deleted file mode 100644
index 9c9a2c01f3..0000000000
--- a/libs/js/src/fdlibm/e_atan2.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_atan2.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_atan2(y,x)
- * Method :
- *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
- *	2. Reduce x to positive by (if x and y are unexceptional): 
- *		ARG (x+iy) = arctan(y/x)   	   ... if x > 0,
- *		ARG (x+iy) = pi - arctan[y/(-x)]   ... if x < 0,
- *
- * Special cases:
- *
- *	ATAN2((anything), NaN ) is NaN;
- *	ATAN2(NAN , (anything) ) is NaN;
- *	ATAN2(+-0, +(anything but NaN)) is +-0  ;
- *	ATAN2(+-0, -(anything but NaN)) is +-pi ;
- *	ATAN2(+-(anything but 0 and NaN), 0) is +-pi/2;
- *	ATAN2(+-(anything but INF and NaN), +INF) is +-0 ;
- *	ATAN2(+-(anything but INF and NaN), -INF) is +-pi;
- *	ATAN2(+-INF,+INF ) is +-pi/4 ;
- *	ATAN2(+-INF,-INF ) is +-3pi/4;
- *	ATAN2(+-INF, (anything but,0,NaN, and INF)) is +-pi/2;
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-tiny  = 1.0e-300,
-zero  = 0.0,
-pi_o_4  = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */
-pi_o_2  = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */
-pi      = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */
-pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
-
-#ifdef __STDC__
-	double __ieee754_atan2(double y, double x)
-#else
-	double __ieee754_atan2(y,x)
-	double  y,x;
-#endif
-{  
-        fd_twoints ux, uy, uz;
-	double z;
-	int k,m,hx,hy,ix,iy;
-	unsigned lx,ly;
-
-        ux.d = x; uy.d = y;
-	hx = __HI(ux); ix = hx&0x7fffffff;
-	lx = __LO(ux);
-	hy = __HI(uy); iy = hy&0x7fffffff;
-	ly = __LO(uy);
-	if(((ix|((lx|-(int)lx)>>31))>0x7ff00000)||
-	   ((iy|((ly|-(int)ly)>>31))>0x7ff00000))	/* x or y is NaN */
-	   return x+y;
-	if(((hx-0x3ff00000)|lx)==0) return fd_atan(y);   /* x=1.0 */
-	m = ((hy>>31)&1)|((hx>>30)&2);	/* 2*sign(x)+sign(y) */
-
-    /* when y = 0 */
-	if((iy|ly)==0) {
-	    switch(m) {
-		case 0: 
-		case 1: return y; 	/* atan(+-0,+anything)=+-0 */
-		case 2: return  pi+tiny;/* atan(+0,-anything) = pi */
-		case 3: return -pi-tiny;/* atan(-0,-anything) =-pi */
-	    }
-	}
-    /* when x = 0 */
-	if((ix|lx)==0) return (hy<0)?  -pi_o_2-tiny: pi_o_2+tiny;
-	    
-    /* when x is INF */
-	if(ix==0x7ff00000) {
-	    if(iy==0x7ff00000) {
-		switch(m) {
-		    case 0: return  pi_o_4+tiny;/* atan(+INF,+INF) */
-		    case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
-		    case 2: return  3.0*pi_o_4+tiny;/*atan(+INF,-INF)*/
-		    case 3: return -3.0*pi_o_4-tiny;/*atan(-INF,-INF)*/
-		}
-	    } else {
-		switch(m) {
-		    case 0: return  zero  ;	/* atan(+...,+INF) */
-		    case 1: return -zero  ;	/* atan(-...,+INF) */
-		    case 2: return  pi+tiny  ;	/* atan(+...,-INF) */
-		    case 3: return -pi-tiny  ;	/* atan(-...,-INF) */
-		}
-	    }
-	}
-    /* when y is INF */
-	if(iy==0x7ff00000) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny;
-
-    /* compute y/x */
-	k = (iy-ix)>>20;
-	if(k > 60) z=pi_o_2+0.5*pi_lo; 	/* |y/x| >  2**60 */
-	else if(hx<0&&k<-60) z=0.0; 	/* |y|/x < -2**60 */
-	else z=fd_atan(fd_fabs(y/x));		/* safe to do y/x */
-	switch (m) {
-	    case 0: return       z  ;	/* atan(+,+) */
-	    case 1: uz.d = z;
-                    __HI(uz) ^= 0x80000000;
-                    z = uz.d;
-		    return       z  ;	/* atan(-,+) */
-	    case 2: return  pi-(z-pi_lo);/* atan(+,-) */
-	    default: /* case 3 */
-	    	    return  (z-pi_lo)-pi;/* atan(-,-) */
-	}
-}
diff --git a/libs/js/src/fdlibm/e_atanh.c b/libs/js/src/fdlibm/e_atanh.c
deleted file mode 100644
index dc4a90c8e0..0000000000
--- a/libs/js/src/fdlibm/e_atanh.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_atanh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_atanh(x)
- * Method :
- *    1.Reduced x to positive by atanh(-x) = -atanh(x)
- *    2.For x>=0.5
- *                  1              2x                          x
- *	atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------)
- *                  2             1 - x                      1 - x
- *	
- * 	For x<0.5
- *	atanh(x) = 0.5*log1p(2x+2x*x/(1-x))
- *
- * Special cases:
- *	atanh(x) is NaN if |x| > 1 with signal;
- *	atanh(NaN) is that NaN with no signal;
- *	atanh(+-1) is +-INF with signal.
- *
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double one = 1.0, really_big = 1e300;
-#else
-static double one = 1.0, really_big = 1e300;
-#endif
-
-static double zero = 0.0;
-
-#ifdef __STDC__
-	double __ieee754_atanh(double x)
-#else
-	double __ieee754_atanh(x)
-	double x;
-#endif
-{
-	double t;
-	int hx,ix;
-	unsigned lx;
-        fd_twoints u;
-        u.d = x;
-	hx = __HI(u);		/* high word */
-	lx = __LO(u);		/* low word */
-	ix = hx&0x7fffffff;
-	if ((ix|((lx|(-(int)lx))>>31))>0x3ff00000) /* |x|>1 */
-	    return (x-x)/(x-x);
-	if(ix==0x3ff00000) 
-	    return x/zero;
-	if(ix<0x3e300000&&(really_big+x)>zero) return x;	/* x<2**-28 */
-        u.d = x;
-	__HI(u) = ix;		/* x <- |x| */
-        x = u.d;
-	if(ix<0x3fe00000) {		/* x < 0.5 */
-	    t = x+x;
-	    t = 0.5*fd_log1p(t+t*x/(one-x));
-	} else 
-	    t = 0.5*fd_log1p((x+x)/(one-x));
-	if(hx>=0) return t; else return -t;
-}
diff --git a/libs/js/src/fdlibm/e_cosh.c b/libs/js/src/fdlibm/e_cosh.c
deleted file mode 100644
index 4f8d4f7697..0000000000
--- a/libs/js/src/fdlibm/e_cosh.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_cosh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_cosh(x)
- * Method : 
- * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2
- *	1. Replace x by |x| (cosh(x) = cosh(-x)). 
- *	2. 
- *		                                        [ exp(x) - 1 ]^2 
- *	    0        <= x <= ln2/2  :  cosh(x) := 1 + -------------------
- *			       			           2*exp(x)
- *
- *		                                  exp(x) +  1/exp(x)
- *	    ln2/2    <= x <= 22     :  cosh(x) := -------------------
- *			       			          2
- *	    22       <= x <= lnovft :  cosh(x) := exp(x)/2 
- *	    lnovft   <= x <= ln2ovft:  cosh(x) := exp(x/2)/2 * exp(x/2)
- *	    ln2ovft  <  x	    :  cosh(x) := huge*huge (overflow)
- *
- * Special cases:
- *	cosh(x) is |x| if x is +INF, -INF, or NaN.
- *	only cosh(0)=1 is exact for finite x.
- */
-
-#include "fdlibm.h"
-
-#ifdef _WIN32
-#define huge myhuge
-#endif
-
-#ifdef __STDC__
-static const double one = 1.0, half=0.5, really_big = 1.0e300;
-#else
-static double one = 1.0, half=0.5, really_big = 1.0e300;
-#endif
-
-#ifdef __STDC__
-	double __ieee754_cosh(double x)
-#else
-	double __ieee754_cosh(x)
-	double x;
-#endif
-{	
-        fd_twoints u;
-	double t,w;
-	int ix;
-	unsigned lx;
-        
-    /* High word of |x|. */
-        u.d = x;
-	ix = __HI(u);
-	ix &= 0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) return x*x;	
-
-    /* |x| in [0,0.5*ln2], return 1+expm1(|x|)^2/(2*exp(|x|)) */
-	if(ix<0x3fd62e43) {
-	    t = fd_expm1(fd_fabs(x));
-	    w = one+t;
-	    if (ix<0x3c800000) return w;	/* cosh(tiny) = 1 */
-	    return one+(t*t)/(w+w);
-	}
-
-    /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */
-	if (ix < 0x40360000) {
-		t = __ieee754_exp(fd_fabs(x));
-		return half*t+half/t;
-	}
-
-    /* |x| in [22, log(maxdouble)] return half*exp(|x|) */
-	if (ix < 0x40862E42)  return half*__ieee754_exp(fd_fabs(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x);
-	if (ix<0x408633CE || 
-	      (ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d)) {
-	    w = __ieee754_exp(half*fd_fabs(x));
-	    t = half*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, cosh(x) overflow */
-	return really_big*really_big;
-}
diff --git a/libs/js/src/fdlibm/e_exp.c b/libs/js/src/fdlibm/e_exp.c
deleted file mode 100644
index ad9cec1241..0000000000
--- a/libs/js/src/fdlibm/e_exp.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_exp.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_exp(x)
- * Returns the exponential of x.
- *
- * Method
- *   1. Argument reduction:
- *      Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658.
- *	Given x, find r and integer k such that
- *
- *               x = k*ln2 + r,  |r| <= 0.5*ln2.  
- *
- *      Here r will be represented as r = hi-lo for better 
- *	accuracy.
- *
- *   2. Approximation of exp(r) by a special rational function on
- *	the interval [0,0.34658]:
- *	Write
- *	    R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ...
- *      We use a special Reme algorithm on [0,0.34658] to generate 
- * 	a polynomial of degree 5 to approximate R. The maximum error 
- *	of this polynomial approximation is bounded by 2**-59. In
- *	other words,
- *	    R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5
- *  	(where z=r*r, and the values of P1 to P5 are listed below)
- *	and
- *	    |                  5          |     -59
- *	    | 2.0+P1*z+...+P5*z   -  R(z) | <= 2 
- *	    |                             |
- *	The computation of exp(r) thus becomes
- *                             2*r
- *		exp(r) = 1 + -------
- *		              R - r
- *                                 r*R1(r)	
- *		       = 1 + r + ----------- (for better accuracy)
- *		                  2 - R1(r)
- *	where
- *			         2       4             10
- *		R1(r) = r - (P1*r  + P2*r  + ... + P5*r   ).
- *	
- *   3. Scale back to obtain exp(x):
- *	From step 1, we have
- *	   exp(x) = 2^k * exp(r)
- *
- * Special cases:
- *	exp(INF) is INF, exp(NaN) is NaN;
- *	exp(-INF) is 0, and
- *	for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Misc. info.
- *	For IEEE double 
- *	    if x >  7.09782712893383973096e+02 then exp(x) overflow
- *	    if x < -7.45133219101941108420e+02 then exp(x) underflow
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-one	= 1.0,
-halF[2]	= {0.5,-0.5,},
-really_big	= 1.0e+300,
-twom1000= 9.33263618503218878990e-302,     /* 2**-1000=0x01700000,0*/
-o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */
-u_threshold= -7.45133219101941108420e+02,  /* 0xc0874910, 0xD52D3051 */
-ln2HI[2]   ={ 6.93147180369123816490e-01,  /* 0x3fe62e42, 0xfee00000 */
-	     -6.93147180369123816490e-01,},/* 0xbfe62e42, 0xfee00000 */
-ln2LO[2]   ={ 1.90821492927058770002e-10,  /* 0x3dea39ef, 0x35793c76 */
-	     -1.90821492927058770002e-10,},/* 0xbdea39ef, 0x35793c76 */
-invln2 =  1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */
-P1   =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2   = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3   =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4   = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5   =  4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
-
-
-#ifdef __STDC__
-	double __ieee754_exp(double x)	/* default IEEE double exp */
-#else
-	double __ieee754_exp(x)	/* default IEEE double exp */
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y,hi,lo,c,t;
-	int k, xsb;
-	unsigned hx;
-
-        u.d = x;
-	hx  = __HI(u);	/* high word of x */
-	xsb = (hx>>31)&1;		/* sign bit of x */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out non-finite argument */
-	if(hx >= 0x40862E42) {			/* if |x|>=709.78... */
-            if(hx>=0x7ff00000) {
-                u.d = x;
-		if(((hx&0xfffff)|__LO(u))!=0)
-		     return x+x; 		/* NaN */
-		else return (xsb==0)? x:0.0;	/* exp(+-inf)={inf,0} */
-	    }
-	    if(x > o_threshold) return really_big*really_big; /* overflow */
-	    if(x < u_threshold) return twom1000*twom1000; /* underflow */
-	}
-
-    /* argument reduction */
-	if(hx > 0x3fd62e42) {		/* if  |x| > 0.5 ln2 */ 
-	    if(hx < 0x3FF0A2B2) {	/* and |x| < 1.5 ln2 */
-		hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb;
-	    } else {
-		k  = (int)(invln2*x+halF[xsb]);
-		t  = k;
-		hi = x - t*ln2HI[0];	/* t*ln2HI is exact here */
-		lo = t*ln2LO[0];
-	    }
-	    x  = hi - lo;
-	} 
-	else if(hx < 0x3e300000)  {	/* when |x|<2**-28 */
-	    if(really_big+x>one) return one+x;/* trigger inexact */
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	t  = x*x;
-	c  = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	if(k==0) 	return one-((x*c)/(c-2.0)-x); 
-	else 		y = one-((lo-(x*c)/(2.0-c))-hi);
-	if(k >= -1021) {
-            u.d = y;
-	    __HI(u) += (k<<20);	/* add k to y's exponent */
-            y = u.d;
-	    return y;
-	} else {
-            u.d = y;
-	    __HI(u) += ((k+1000)<<20);/* add k to y's exponent */
-            y = u.d;
-	    return y*twom1000;
-	}
-}
diff --git a/libs/js/src/fdlibm/e_fmod.c b/libs/js/src/fdlibm/e_fmod.c
deleted file mode 100644
index 7b5ce780f3..0000000000
--- a/libs/js/src/fdlibm/e_fmod.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_fmod.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * __ieee754_fmod(x,y)
- * Return x mod y in exact arithmetic
- * Method: shift and subtract
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double one = 1.0, Zero[] = {0.0, -0.0,};
-#else
-static double one = 1.0, Zero[] = {0.0, -0.0,};
-#endif
-
-#ifdef __STDC__
-	double __ieee754_fmod(double x, double y)
-#else
-	double __ieee754_fmod(x,y)
-	double x,y ;
-#endif
-{
-        fd_twoints ux, uy;
-	int n,hx,hy,hz,ix,iy,sx,i;
-	unsigned lx,ly,lz;
-
-        ux.d = x; uy.d = y;
-	hx = __HI(ux);		/* high word of x */
-	lx = __LO(ux);		/* low  word of x */
-	hy = __HI(uy);		/* high word of y */
-	ly = __LO(uy);		/* low  word of y */
-	sx = hx&0x80000000;		/* sign of x */
-	hx ^=sx;		/* |x| */
-	hy &= 0x7fffffff;	/* |y| */
-
-    /* purge off exception values */
-	if((hy|ly)==0||(hx>=0x7ff00000)||	/* y=0,or x not finite */
-	  ((hy|((ly|-(int)ly)>>31))>0x7ff00000))	/* or y is NaN */
-	    return (x*y)/(x*y);
-	if(hx<=hy) {
-	    if((hx<hy)||(lx<ly)) return x;	/* |x|<|y| return x */
-	    if(lx==ly) 
-		return Zero[(unsigned)sx>>31];	/* |x|=|y| return x*0*/
-	}
-
-    /* determine ix = ilogb(x) */
-	if(hx<0x00100000) {	/* subnormal x */
-	    if(hx==0) {
-		for (ix = -1043, i=lx; i>0; i<<=1) ix -=1;
-	    } else {
-		for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1;
-	    }
-	} else ix = (hx>>20)-1023;
-
-    /* determine iy = ilogb(y) */
-	if(hy<0x00100000) {	/* subnormal y */
-	    if(hy==0) {
-		for (iy = -1043, i=ly; i>0; i<<=1) iy -=1;
-	    } else {
-		for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1;
-	    }
-	} else iy = (hy>>20)-1023;
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	if(ix >= -1022) 
-	    hx = 0x00100000|(0x000fffff&hx);
-	else {		/* subnormal x, shift x to normal */
-	    n = -1022-ix;
-	    if(n<=31) {
-	        hx = (hx<<n)|(lx>>(32-n));
-	        lx <<= n;
-	    } else {
-		hx = lx<<(n-32);
-		lx = 0;
-	    }
-	}
-	if(iy >= -1022) 
-	    hy = 0x00100000|(0x000fffff&hy);
-	else {		/* subnormal y, shift y to normal */
-	    n = -1022-iy;
-	    if(n<=31) {
-	        hy = (hy<<n)|(ly>>(32-n));
-	        ly <<= n;
-	    } else {
-		hy = ly<<(n-32);
-		ly = 0;
-	    }
-	}
-
-    /* fix point fmod */
-	n = ix - iy;
-	while(n--) {
-	    hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	    if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
-	    else {
-	    	if((hz|lz)==0) 		/* return sign(x)*0 */
-		    return Zero[(unsigned)sx>>31];
-	    	hx = hz+hz+(lz>>31); lx = lz+lz;
-	    }
-	}
-	hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	if(hz>=0) {hx=hz;lx=lz;}
-
-    /* convert back to floating value and restore the sign */
-	if((hx|lx)==0) 			/* return sign(x)*0 */
-	    return Zero[(unsigned)sx>>31];	
-	while(hx<0x00100000) {		/* normalize x */
-	    hx = hx+hx+(lx>>31); lx = lx+lx;
-	    iy -= 1;
-	}
-	if(iy>= -1022) {	/* normalize output */
-	    hx = ((hx-0x00100000)|((iy+1023)<<20));
-            ux.d = x;
-	    __HI(ux) = hx|sx;
-	    __LO(ux) = lx;
-            x = ux.d;
-	} else {		/* subnormal output */
-	    n = -1022 - iy;
-	    if(n<=20) {
-		lx = (lx>>n)|((unsigned)hx<<(32-n));
-		hx >>= n;
-	    } else if (n<=31) {
-		lx = (hx<<(32-n))|(lx>>n); hx = sx;
-	    } else {
-		lx = hx>>(n-32); hx = sx;
-	    }
-            ux.d = x;
-	    __HI(ux) = hx|sx;
-	    __LO(ux) = lx;
-            x = ux.d;
-	    x *= one;		/* create necessary signal */
-	}
-	return x;		/* exact output */
-}
diff --git a/libs/js/src/fdlibm/e_gamma.c b/libs/js/src/fdlibm/e_gamma.c
deleted file mode 100644
index a34faa32cf..0000000000
--- a/libs/js/src/fdlibm/e_gamma.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_gamma.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_gamma(x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call __ieee754_gamma_r
- */
-
-#include "fdlibm.h"
-
-extern int signgam;
-
-#ifdef __STDC__
-	double __ieee754_gamma(double x)
-#else
-	double __ieee754_gamma(x)
-	double x;
-#endif
-{
-	return __ieee754_gamma_r(x,&signgam);
-}
diff --git a/libs/js/src/fdlibm/e_gamma_r.c b/libs/js/src/fdlibm/e_gamma_r.c
deleted file mode 100644
index f10e32e361..0000000000
--- a/libs/js/src/fdlibm/e_gamma_r.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_gamma_r.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_gamma_r(x, signgamp)
- * Reentrant version of the logarithm of the Gamma function 
- * with user provide pointer for the sign of Gamma(x). 
- *
- * Method: See __ieee754_lgamma_r
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double __ieee754_gamma_r(double x, int *signgamp)
-#else
-	double __ieee754_gamma_r(x,signgamp)
-	double x; int *signgamp;
-#endif
-{
-	return __ieee754_lgamma_r(x,signgamp);
-}
diff --git a/libs/js/src/fdlibm/e_hypot.c b/libs/js/src/fdlibm/e_hypot.c
deleted file mode 100644
index 3900230878..0000000000
--- a/libs/js/src/fdlibm/e_hypot.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_hypot.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_hypot(x,y)
- *
- * Method :                  
- *	If (assume round-to-nearest) z=x*x+y*y 
- *	has error less than sqrt(2)/2 ulp, than 
- *	sqrt(z) has error less than 1 ulp (exercise).
- *
- *	So, compute sqrt(x*x+y*y) with some care as 
- *	follows to get the error below 1 ulp:
- *
- *	Assume x>y>0;
- *	(if possible, set rounding to round-to-nearest)
- *	1. if x > 2y  use
- *		x1*x1+(y*y+(x2*(x+x1))) for x*x+y*y
- *	where x1 = x with lower 32 bits cleared, x2 = x-x1; else
- *	2. if x <= 2y use
- *		t1*y1+((x-y)*(x-y)+(t1*y2+t2*y))
- *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1, 
- *	y1= y with lower 32 bits chopped, y2 = y-y1.
- *		
- *	NOTE: scaling may be necessary if some argument is too 
- *	      large or too tiny
- *
- * Special cases:
- *	hypot(x,y) is INF if x or y is +INF or -INF; else
- *	hypot(x,y) is NAN if x or y is NAN.
- *
- * Accuracy:
- * 	hypot(x,y) returns sqrt(x^2+y^2) with error less 
- * 	than 1 ulps (units in the last place) 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double __ieee754_hypot(double x, double y)
-#else
-	double __ieee754_hypot(x,y)
-	double x, y;
-#endif
-{
-        fd_twoints ux, uy;
-	double a=x,b=y,t1,t2,y1,y2,w;
-	int j,k,ha,hb;
-        
-        ux.d = x; uy.d = y;
-	ha = __HI(ux)&0x7fffffff;	/* high word of  x */
-	hb = __HI(uy)&0x7fffffff;	/* high word of  y */
-	if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
-        ux.d = a; uy.d = b;
-	__HI(ux) = ha;	/* a <- |a| */
-	__HI(uy) = hb;	/* b <- |b| */
-        a = ux.d; b = uy.d;
-	if((ha-hb)>0x3c00000) {return a+b;} /* x/y > 2**60 */
-	k=0;
-	if(ha > 0x5f300000) {	/* a>2**500 */
-	   if(ha >= 0x7ff00000) {	/* Inf or NaN */
-	       w = a+b;			/* for sNaN */
-               ux.d = a; uy.d = b;
-	       if(((ha&0xfffff)|__LO(ux))==0) w = a;
-	       if(((hb^0x7ff00000)|__LO(uy))==0) w = b;
-	       return w;
-	   }
-	   /* scale a and b by 2**-600 */
-	   ha -= 0x25800000; hb -= 0x25800000;	k += 600;
-           ux.d = a; uy.d = b;
-	   __HI(ux) = ha;
-	   __HI(uy) = hb;
-           a = ux.d; b = uy.d;
-	}
-	if(hb < 0x20b00000) {	/* b < 2**-500 */
-	    if(hb <= 0x000fffff) {	/* subnormal b or 0 */	
-                uy.d = b;
-		if((hb|(__LO(uy)))==0) return a;
-		t1=0;
-                ux.d = t1;
-		__HI(ux) = 0x7fd00000;	/* t1=2^1022 */
-                t1 = ux.d;
-		b *= t1;
-		a *= t1;
-		k -= 1022;
-	    } else {		/* scale a and b by 2^600 */
-	        ha += 0x25800000; 	/* a *= 2^600 */
-		hb += 0x25800000;	/* b *= 2^600 */
-		k -= 600;
-                ux.d = a; uy.d = b;
-	   	__HI(ux) = ha;
-	   	__HI(uy) = hb;
-                a = ux.d; b = uy.d;
-	    }
-	}
-    /* medium size a and b */
-	w = a-b;
-	if (w>b) {
-	    t1 = 0;
-            ux.d = t1;
-	    __HI(ux) = ha;
-            t1 = ux.d;
-	    t2 = a-t1;
-	    w  = fd_sqrt(t1*t1-(b*(-b)-t2*(a+t1)));
-	} else {
-	    a  = a+a;
-	    y1 = 0;
-            ux.d = y1;
-	    __HI(ux) = hb;
-            y1 = ux.d;
-	    y2 = b - y1;
-	    t1 = 0;
-            ux.d = t1;
-	    __HI(ux) = ha+0x00100000;
-            t1 = ux.d;
-	    t2 = a - t1;
-	    w  = fd_sqrt(t1*y1-(w*(-w)-(t1*y2+t2*b)));
-	}
-	if(k!=0) {
-	    t1 = 1.0;
-            ux.d = t1;
-	    __HI(ux) += (k<<20);
-            t1 = ux.d;
-	    return t1*w;
-	} else return w;
-}
diff --git a/libs/js/src/fdlibm/e_j0.c b/libs/js/src/fdlibm/e_j0.c
deleted file mode 100644
index 078e096415..0000000000
--- a/libs/js/src/fdlibm/e_j0.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_j0.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_j0(x), __ieee754_y0(x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j0(x):
- *	1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ...
- *	2. Reduce x to |x| since j0(x)=j0(-x),  and
- *	   for x in (0,2)
- *		j0(x) = 1-z/4+ z^2*R0/S0,  where z = x*x;
- *	   (precision:  |j0-1+z/4-z^2R0/S0 |<2**-63.67 )
- *	   for x in (2,inf)
- * 		j0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)-q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   as follow:
- *		cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
- *			= 1/sqrt(2) * (cos(x) + sin(x))
- *		sin(x0) = sin(x)cos(pi/4)-cos(x)sin(pi/4)
- *			= 1/sqrt(2) * (sin(x) - cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *	   
- *	3 Special cases
- *		j0(nan)= nan
- *		j0(0) = 1
- *		j0(inf) = 0
- *		
- * Method -- y0(x):
- *	1. For x<2.
- *	   Since 
- *		y0(x) = 2/pi*(j0(x)*(ln(x/2)+Euler) + x^2/4 - ...)
- *	   therefore y0(x)-2/pi*j0(x)*ln(x) is an even function.
- *	   We use the following function to approximate y0,
- *		y0(x) = U(z)/V(z) + (2/pi)*(j0(x)*ln(x)), z= x^2
- *	   where 
- *		U(z) = u00 + u01*z + ... + u06*z^6
- *		V(z) = 1  + v01*z + ... + v04*z^4
- *	   with absolute approximation error bounded by 2**-72.
- *	   Note: For tiny x, U/V = u0 and j0(x)~1, hence
- *		y0(tiny) = u0 + (2/pi)*ln(tiny), (choose tiny<2**-27)
- *	2. For x>=2.
- * 		y0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)+q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   by the method mentioned above.
- *	3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static double pzero(double), qzero(double);
-#else
-static double pzero(), qzero();
-#endif
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-really_big 	= 1e300,
-one	= 1.0,
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-tpi      =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
- 		/* R0/S0 on [0, 2.00] */
-R02  =  1.56249999999999947958e-02, /* 0x3F8FFFFF, 0xFFFFFFFD */
-R03  = -1.89979294238854721751e-04, /* 0xBF28E6A5, 0xB61AC6E9 */
-R04  =  1.82954049532700665670e-06, /* 0x3EBEB1D1, 0x0C503919 */
-R05  = -4.61832688532103189199e-09, /* 0xBE33D5E7, 0x73D63FCE */
-S01  =  1.56191029464890010492e-02, /* 0x3F8FFCE8, 0x82C8C2A4 */
-S02  =  1.16926784663337450260e-04, /* 0x3F1EA6D2, 0xDD57DBF4 */
-S03  =  5.13546550207318111446e-07, /* 0x3EA13B54, 0xCE84D5A9 */
-S04  =  1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */
-
-static double zero = 0.0;
-
-#ifdef __STDC__
-	double __ieee754_j0(double x) 
-#else
-	double __ieee754_j0(x) 
-	double x;
-#endif
-{
-        fd_twoints un;
-	double z, s,c,ss,cc,r,u,v;
-	int hx,ix;
-
-        un.d = x;
-	hx = __HI(un);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return one/(x*x);
-	x = fd_fabs(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = fd_sin(x);
-		c = fd_cos(x);
-		ss = s-c;
-		cc = s+c;
-		if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-		    z = -fd_cos(x+x);
-		    if ((s*c)<zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-		if(ix>0x48000000) z = (invsqrtpi*cc)/fd_sqrt(x);
-		else {
-		    u = pzero(x); v = qzero(x);
-		    z = invsqrtpi*(u*cc-v*ss)/fd_sqrt(x);
-		}
-		return z;
-	}
-	if(ix<0x3f200000) {	/* |x| < 2**-13 */
-	    if(really_big+x>one) {	/* raise inexact if x != 0 */
-	        if(ix<0x3e400000) return one;	/* |x|<2**-27 */
-	        else 	      return one - 0.25*x*x;
-	    }
-	}
-	z = x*x;
-	r =  z*(R02+z*(R03+z*(R04+z*R05)));
-	s =  one+z*(S01+z*(S02+z*(S03+z*S04)));
-	if(ix < 0x3FF00000) {	/* |x| < 1.00 */
-	    return one + z*(-0.25+(r/s));
-	} else {
-	    u = 0.5*x;
-	    return((one+u)*(one-u)+z*(r/s));
-	}
-}
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-u00  = -7.38042951086872317523e-02, /* 0xBFB2E4D6, 0x99CBD01F */
-u01  =  1.76666452509181115538e-01, /* 0x3FC69D01, 0x9DE9E3FC */
-u02  = -1.38185671945596898896e-02, /* 0xBF8C4CE8, 0xB16CFA97 */
-u03  =  3.47453432093683650238e-04, /* 0x3F36C54D, 0x20B29B6B */
-u04  = -3.81407053724364161125e-06, /* 0xBECFFEA7, 0x73D25CAD */
-u05  =  1.95590137035022920206e-08, /* 0x3E550057, 0x3B4EABD4 */
-u06  = -3.98205194132103398453e-11, /* 0xBDC5E43D, 0x693FB3C8 */
-v01  =  1.27304834834123699328e-02, /* 0x3F8A1270, 0x91C9C71A */
-v02  =  7.60068627350353253702e-05, /* 0x3F13ECBB, 0xF578C6C1 */
-v03  =  2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */
-v04  =  4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */
-
-#ifdef __STDC__
-	double __ieee754_y0(double x) 
-#else
-	double __ieee754_y0(x) 
-	double x;
-#endif
-{
-        fd_twoints un;
-	double z, s,c,ss,cc,u,v;
-	int hx,ix,lx;
-
-        un.d = x;
-        hx = __HI(un);
-        ix = 0x7fffffff&hx;
-        lx = __LO(un);
-    /* Y0(NaN) is NaN, y0(-inf) is Nan, y0(inf) is 0  */
-	if(ix>=0x7ff00000) return  one/(x+x*x); 
-        if((ix|lx)==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-        /* y0(x) = sqrt(2/(pi*x))*(p0(x)*sin(x0)+q0(x)*cos(x0))
-         * where x0 = x-pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
-         *                      =  1/sqrt(2) * (sin(x) + cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                s = fd_sin(x);
-                c = fd_cos(x);
-                ss = s-c;
-                cc = s+c;
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-                if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-                    z = -fd_cos(x+x);
-                    if ((s*c)<zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-                if(ix>0x48000000) z = (invsqrtpi*ss)/fd_sqrt(x);
-                else {
-                    u = pzero(x); v = qzero(x);
-                    z = invsqrtpi*(u*ss+v*cc)/fd_sqrt(x);
-                }
-                return z;
-	}
-	if(ix<=0x3e400000) {	/* x < 2**-27 */
-	    return(u00 + tpi*__ieee754_log(x));
-	}
-	z = x*x;
-	u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06)))));
-	v = one+z*(v01+z*(v02+z*(v03+z*v04)));
-	return(u/v + tpi*(__ieee754_j0(x)*__ieee754_log(x)));
-}
-
-/* The asymptotic expansions of pzero is
- *	1 - 9/128 s^2 + 11025/98304 s^4 - ...,	where s = 1/x.
- * For x >= 2, We approximate pzero by
- * 	pzero(x) = 1 + (R/S)
- * where  R = pR0 + pR1*s^2 + pR2*s^4 + ... + pR5*s^10
- * 	  S = 1 + pS0*s^2 + ... + pS4*s^10
- * and
- *	| pzero(x)-1-R/S | <= 2  ** ( -60.26)
- */
-#ifdef __STDC__
-static const double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#else
-static double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#endif
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
- -7.03124999999900357484e-02, /* 0xBFB1FFFF, 0xFFFFFD32 */
- -8.08167041275349795626e+00, /* 0xC02029D0, 0xB44FA779 */
- -2.57063105679704847262e+02, /* 0xC0701102, 0x7B19E863 */
- -2.48521641009428822144e+03, /* 0xC0A36A6E, 0xCD4DCAFC */
- -5.25304380490729545272e+03, /* 0xC0B4850B, 0x36CC643D */
-};
-#ifdef __STDC__
-static const double pS8[5] = {
-#else
-static double pS8[5] = {
-#endif
-  1.16534364619668181717e+02, /* 0x405D2233, 0x07A96751 */
-  3.83374475364121826715e+03, /* 0x40ADF37D, 0x50596938 */
-  4.05978572648472545552e+04, /* 0x40E3D2BB, 0x6EB6B05F */
-  1.16752972564375915681e+05, /* 0x40FC810F, 0x8F9FA9BD */
-  4.76277284146730962675e+04, /* 0x40E74177, 0x4F2C49DC */
-};
-
-#ifdef __STDC__
-static const double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#else
-static double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#endif
- -1.14125464691894502584e-11, /* 0xBDA918B1, 0x47E495CC */
- -7.03124940873599280078e-02, /* 0xBFB1FFFF, 0xE69AFBC6 */
- -4.15961064470587782438e+00, /* 0xC010A370, 0xF90C6BBF */
- -6.76747652265167261021e+01, /* 0xC050EB2F, 0x5A7D1783 */
- -3.31231299649172967747e+02, /* 0xC074B3B3, 0x6742CC63 */
- -3.46433388365604912451e+02, /* 0xC075A6EF, 0x28A38BD7 */
-};
-#ifdef __STDC__
-static const double pS5[5] = {
-#else
-static double pS5[5] = {
-#endif
-  6.07539382692300335975e+01, /* 0x404E6081, 0x0C98C5DE */
-  1.05125230595704579173e+03, /* 0x40906D02, 0x5C7E2864 */
-  5.97897094333855784498e+03, /* 0x40B75AF8, 0x8FBE1D60 */
-  9.62544514357774460223e+03, /* 0x40C2CCB8, 0xFA76FA38 */
-  2.40605815922939109441e+03, /* 0x40A2CC1D, 0xC70BE864 */
-};
-
-#ifdef __STDC__
-static const double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#else
-static double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#endif
- -2.54704601771951915620e-09, /* 0xBE25E103, 0x6FE1AA86 */
- -7.03119616381481654654e-02, /* 0xBFB1FFF6, 0xF7C0E24B */
- -2.40903221549529611423e+00, /* 0xC00345B2, 0xAEA48074 */
- -2.19659774734883086467e+01, /* 0xC035F74A, 0x4CB94E14 */
- -5.80791704701737572236e+01, /* 0xC04D0A22, 0x420A1A45 */
- -3.14479470594888503854e+01, /* 0xC03F72AC, 0xA892D80F */
-};
-#ifdef __STDC__
-static const double pS3[5] = {
-#else
-static double pS3[5] = {
-#endif
-  3.58560338055209726349e+01, /* 0x4041ED92, 0x84077DD3 */
-  3.61513983050303863820e+02, /* 0x40769839, 0x464A7C0E */
-  1.19360783792111533330e+03, /* 0x4092A66E, 0x6D1061D6 */
-  1.12799679856907414432e+03, /* 0x40919FFC, 0xB8C39B7E */
-  1.73580930813335754692e+02, /* 0x4065B296, 0xFC379081 */
-};
-
-#ifdef __STDC__
-static const double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#else
-static double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#endif
- -8.87534333032526411254e-08, /* 0xBE77D316, 0xE927026D */
- -7.03030995483624743247e-02, /* 0xBFB1FF62, 0x495E1E42 */
- -1.45073846780952986357e+00, /* 0xBFF73639, 0x8A24A843 */
- -7.63569613823527770791e+00, /* 0xC01E8AF3, 0xEDAFA7F3 */
- -1.11931668860356747786e+01, /* 0xC02662E6, 0xC5246303 */
- -3.23364579351335335033e+00, /* 0xC009DE81, 0xAF8FE70F */
-};
-#ifdef __STDC__
-static const double pS2[5] = {
-#else
-static double pS2[5] = {
-#endif
-  2.22202997532088808441e+01, /* 0x40363865, 0x908B5959 */
-  1.36206794218215208048e+02, /* 0x4061069E, 0x0EE8878F */
-  2.70470278658083486789e+02, /* 0x4070E786, 0x42EA079B */
-  1.53875394208320329881e+02, /* 0x40633C03, 0x3AB6FAFF */
-  1.46576176948256193810e+01, /* 0x402D50B3, 0x44391809 */
-};
-
-#ifdef __STDC__
-	static double pzero(double x)
-#else
-	static double pzero(x)
-	double x;
-#endif
-{
-#ifdef __STDC__
-	const double *p,*q;
-#else
-	double *p,*q;
-#endif
-        fd_twoints u;
-	double z,r,s;
-	int ix;
-        u.d = x;
-	ix = 0x7fffffff&__HI(u);
-	if(ix>=0x40200000)     {p = pR8; q= pS8;}
-	else if(ix>=0x40122E8B){p = pR5; q= pS5;}
-	else if(ix>=0x4006DB6D){p = pR3; q= pS3;}
-	else if(ix>=0x40000000){p = pR2; q= pS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-	return one+ r/s;
-}
-		
-
-/* For x >= 8, the asymptotic expansions of qzero is
- *	-1/8 s + 75/1024 s^3 - ..., where s = 1/x.
- * We approximate pzero by
- * 	qzero(x) = s*(-1.25 + (R/S))
- * where  R = qR0 + qR1*s^2 + qR2*s^4 + ... + qR5*s^10
- * 	  S = 1 + qS0*s^2 + ... + qS5*s^12
- * and
- *	| qzero(x)/s +1.25-R/S | <= 2  ** ( -61.22)
- */
-#ifdef __STDC__
-static const double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#else
-static double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#endif
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-  7.32421874999935051953e-02, /* 0x3FB2BFFF, 0xFFFFFE2C */
-  1.17682064682252693899e+01, /* 0x40278952, 0x5BB334D6 */
-  5.57673380256401856059e+02, /* 0x40816D63, 0x15301825 */
-  8.85919720756468632317e+03, /* 0x40C14D99, 0x3E18F46D */
-  3.70146267776887834771e+04, /* 0x40E212D4, 0x0E901566 */
-};
-#ifdef __STDC__
-static const double qS8[6] = {
-#else
-static double qS8[6] = {
-#endif
-  1.63776026895689824414e+02, /* 0x406478D5, 0x365B39BC */
-  8.09834494656449805916e+03, /* 0x40BFA258, 0x4E6B0563 */
-  1.42538291419120476348e+05, /* 0x41016652, 0x54D38C3F */
-  8.03309257119514397345e+05, /* 0x412883DA, 0x83A52B43 */
-  8.40501579819060512818e+05, /* 0x4129A66B, 0x28DE0B3D */
- -3.43899293537866615225e+05, /* 0xC114FD6D, 0x2C9530C5 */
-};
-
-#ifdef __STDC__
-static const double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#else
-static double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#endif
-  1.84085963594515531381e-11, /* 0x3DB43D8F, 0x29CC8CD9 */
-  7.32421766612684765896e-02, /* 0x3FB2BFFF, 0xD172B04C */
-  5.83563508962056953777e+00, /* 0x401757B0, 0xB9953DD3 */
-  1.35111577286449829671e+02, /* 0x4060E392, 0x0A8788E9 */
-  1.02724376596164097464e+03, /* 0x40900CF9, 0x9DC8C481 */
-  1.98997785864605384631e+03, /* 0x409F17E9, 0x53C6E3A6 */
-};
-#ifdef __STDC__
-static const double qS5[6] = {
-#else
-static double qS5[6] = {
-#endif
-  8.27766102236537761883e+01, /* 0x4054B1B3, 0xFB5E1543 */
-  2.07781416421392987104e+03, /* 0x40A03BA0, 0xDA21C0CE */
-  1.88472887785718085070e+04, /* 0x40D267D2, 0x7B591E6D */
-  5.67511122894947329769e+04, /* 0x40EBB5E3, 0x97E02372 */
-  3.59767538425114471465e+04, /* 0x40E19118, 0x1F7A54A0 */
- -5.35434275601944773371e+03, /* 0xC0B4EA57, 0xBEDBC609 */
-};
-
-#ifdef __STDC__
-static const double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#else
-static double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#endif
-  4.37741014089738620906e-09, /* 0x3E32CD03, 0x6ADECB82 */
-  7.32411180042911447163e-02, /* 0x3FB2BFEE, 0x0E8D0842 */
-  3.34423137516170720929e+00, /* 0x400AC0FC, 0x61149CF5 */
-  4.26218440745412650017e+01, /* 0x40454F98, 0x962DAEDD */
-  1.70808091340565596283e+02, /* 0x406559DB, 0xE25EFD1F */
-  1.66733948696651168575e+02, /* 0x4064D77C, 0x81FA21E0 */
-};
-#ifdef __STDC__
-static const double qS3[6] = {
-#else
-static double qS3[6] = {
-#endif
-  4.87588729724587182091e+01, /* 0x40486122, 0xBFE343A6 */
-  7.09689221056606015736e+02, /* 0x40862D83, 0x86544EB3 */
-  3.70414822620111362994e+03, /* 0x40ACF04B, 0xE44DFC63 */
-  6.46042516752568917582e+03, /* 0x40B93C6C, 0xD7C76A28 */
-  2.51633368920368957333e+03, /* 0x40A3A8AA, 0xD94FB1C0 */
- -1.49247451836156386662e+02, /* 0xC062A7EB, 0x201CF40F */
-};
-
-#ifdef __STDC__
-static const double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#else
-static double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#endif
-  1.50444444886983272379e-07, /* 0x3E84313B, 0x54F76BDB */
-  7.32234265963079278272e-02, /* 0x3FB2BEC5, 0x3E883E34 */
-  1.99819174093815998816e+00, /* 0x3FFFF897, 0xE727779C */
-  1.44956029347885735348e+01, /* 0x402CFDBF, 0xAAF96FE5 */
-  3.16662317504781540833e+01, /* 0x403FAA8E, 0x29FBDC4A */
-  1.62527075710929267416e+01, /* 0x403040B1, 0x71814BB4 */
-};
-#ifdef __STDC__
-static const double qS2[6] = {
-#else
-static double qS2[6] = {
-#endif
-  3.03655848355219184498e+01, /* 0x403E5D96, 0xF7C07AED */
-  2.69348118608049844624e+02, /* 0x4070D591, 0xE4D14B40 */
-  8.44783757595320139444e+02, /* 0x408A6645, 0x22B3BF22 */
-  8.82935845112488550512e+02, /* 0x408B977C, 0x9C5CC214 */
-  2.12666388511798828631e+02, /* 0x406A9553, 0x0E001365 */
- -5.31095493882666946917e+00, /* 0xC0153E6A, 0xF8B32931 */
-};
-
-#ifdef __STDC__
-	static double qzero(double x)
-#else
-	static double qzero(x)
-	double x;
-#endif
-{
-#ifdef __STDC__
-	const double *p,*q;
-#else
-	double *p,*q;
-#endif
-        fd_twoints u;
-	double s,r,z;
-	int ix;
-        u.d = x;
-	ix = 0x7fffffff&__HI(u);
-	if(ix>=0x40200000)     {p = qR8; q= qS8;}
-	else if(ix>=0x40122E8B){p = qR5; q= qS5;}
-	else if(ix>=0x4006DB6D){p = qR3; q= qS3;}
-	else if(ix>=0x40000000){p = qR2; q= qS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (-.125 + r/s)/x;
-}
diff --git a/libs/js/src/fdlibm/e_j1.c b/libs/js/src/fdlibm/e_j1.c
deleted file mode 100644
index 8982ac86a3..0000000000
--- a/libs/js/src/fdlibm/e_j1.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_j1.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_j1(x), __ieee754_y1(x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j1(x):
- *	1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ...
- *	2. Reduce x to |x| since j1(x)=-j1(-x),  and
- *	   for x in (0,2)
- *		j1(x) = x/2 + x*z*R0/S0,  where z = x*x;
- *	   (precision:  |j1/x - 1/2 - R0/S0 |<2**-61.51 )
- *	   for x in (2,inf)
- * 		j1(x) = sqrt(2/(pi*x))*(p1(x)*cos(x1)-q1(x)*sin(x1))
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   as follow:
- *		cos(x1) =  cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
- *			=  1/sqrt(2) * (sin(x) - cos(x))
- *		sin(x1) =  sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
- *			= -1/sqrt(2) * (sin(x) + cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *	   
- *	3 Special cases
- *		j1(nan)= nan
- *		j1(0) = 0
- *		j1(inf) = 0
- *		
- * Method -- y1(x):
- *	1. screen out x<=0 cases: y1(0)=-inf, y1(x<0)=NaN 
- *	2. For x<2.
- *	   Since 
- *		y1(x) = 2/pi*(j1(x)*(ln(x/2)+Euler)-1/x-x/2+5/64*x^3-...)
- *	   therefore y1(x)-2/pi*j1(x)*ln(x)-1/x is an odd function.
- *	   We use the following function to approximate y1,
- *		y1(x) = x*U(z)/V(z) + (2/pi)*(j1(x)*ln(x)-1/x), z= x^2
- *	   where for x in [0,2] (abs err less than 2**-65.89)
- *		U(z) = U0[0] + U0[1]*z + ... + U0[4]*z^4
- *		V(z) = 1  + v0[0]*z + ... + v0[4]*z^5
- *	   Note: For tiny x, 1/x dominate y1 and hence
- *		y1(tiny) = -2/pi/tiny, (choose tiny<2**-54)
- *	3. For x>=2.
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   by method mentioned above.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static double pone(double), qone(double);
-#else
-static double pone(), qone();
-#endif
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-really_big    = 1e300,
-one	= 1.0,
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-tpi      =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
-	/* R0/S0 on [0,2] */
-r00  = -6.25000000000000000000e-02, /* 0xBFB00000, 0x00000000 */
-r01  =  1.40705666955189706048e-03, /* 0x3F570D9F, 0x98472C61 */
-r02  = -1.59955631084035597520e-05, /* 0xBEF0C5C6, 0xBA169668 */
-r03  =  4.96727999609584448412e-08, /* 0x3E6AAAFA, 0x46CA0BD9 */
-s01  =  1.91537599538363460805e-02, /* 0x3F939D0B, 0x12637E53 */
-s02  =  1.85946785588630915560e-04, /* 0x3F285F56, 0xB9CDF664 */
-s03  =  1.17718464042623683263e-06, /* 0x3EB3BFF8, 0x333F8498 */
-s04  =  5.04636257076217042715e-09, /* 0x3E35AC88, 0xC97DFF2C */
-s05  =  1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */
-
-static double zero    = 0.0;
-
-#ifdef __STDC__
-	double __ieee754_j1(double x) 
-#else
-	double __ieee754_j1(x) 
-	double x;
-#endif
-{
-        fd_twoints un;
-	double z, s,c,ss,cc,r,u,v,y;
-	int hx,ix;
-
-        un.d = x;
-	hx = __HI(un);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return one/x;
-	y = fd_fabs(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = fd_sin(y);
-		c = fd_cos(y);
-		ss = -s-c;
-		cc = s-c;
-		if(ix<0x7fe00000) {  /* make sure y+y not overflow */
-		    z = fd_cos(y+y);
-		    if ((s*c)>zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j1(x) = 1/sqrt(pi) * (P(1,x)*cc - Q(1,x)*ss) / sqrt(x)
-	 * y1(x) = 1/sqrt(pi) * (P(1,x)*ss + Q(1,x)*cc) / sqrt(x)
-	 */
-		if(ix>0x48000000) z = (invsqrtpi*cc)/fd_sqrt(y);
-		else {
-		    u = pone(y); v = qone(y);
-		    z = invsqrtpi*(u*cc-v*ss)/fd_sqrt(y);
-		}
-		if(hx<0) return -z;
-		else  	 return  z;
-	}
-	if(ix<0x3e400000) {	/* |x|<2**-27 */
-	    if(really_big+x>one) return 0.5*x;/* inexact if x!=0 necessary */
-	}
-	z = x*x;
-	r =  z*(r00+z*(r01+z*(r02+z*r03)));
-	s =  one+z*(s01+z*(s02+z*(s03+z*(s04+z*s05))));
-	r *= x;
-	return(x*0.5+r/s);
-}
-
-#ifdef __STDC__
-static const double U0[5] = {
-#else
-static double U0[5] = {
-#endif
- -1.96057090646238940668e-01, /* 0xBFC91866, 0x143CBC8A */
-  5.04438716639811282616e-02, /* 0x3FA9D3C7, 0x76292CD1 */
- -1.91256895875763547298e-03, /* 0xBF5F55E5, 0x4844F50F */
-  2.35252600561610495928e-05, /* 0x3EF8AB03, 0x8FA6B88E */
- -9.19099158039878874504e-08, /* 0xBE78AC00, 0x569105B8 */
-};
-#ifdef __STDC__
-static const double V0[5] = {
-#else
-static double V0[5] = {
-#endif
-  1.99167318236649903973e-02, /* 0x3F94650D, 0x3F4DA9F0 */
-  2.02552581025135171496e-04, /* 0x3F2A8C89, 0x6C257764 */
-  1.35608801097516229404e-06, /* 0x3EB6C05A, 0x894E8CA6 */
-  6.22741452364621501295e-09, /* 0x3E3ABF1D, 0x5BA69A86 */
-  1.66559246207992079114e-11, /* 0x3DB25039, 0xDACA772A */
-};
-
-#ifdef __STDC__
-	double __ieee754_y1(double x) 
-#else
-	double __ieee754_y1(x) 
-	double x;
-#endif
-{
-        fd_twoints un;
-	double z, s,c,ss,cc,u,v;
-	int hx,ix,lx;
-
-        un.d = x;
-        hx = __HI(un);
-        ix = 0x7fffffff&hx;
-        lx = __LO(un);
-    /* if Y1(NaN) is NaN, Y1(-inf) is NaN, Y1(inf) is 0 */
-	if(ix>=0x7ff00000) return  one/(x+x*x); 
-        if((ix|lx)==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-                s = fd_sin(x);
-                c = fd_cos(x);
-                ss = -s-c;
-                cc = s-c;
-                if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-                    z = fd_cos(x+x);
-                    if ((s*c)>zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-        /* y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x0)+q1(x)*cos(x0))
-         * where x0 = x-3pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      = -1/sqrt(2) * (cos(x) + sin(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                if(ix>0x48000000) z = (invsqrtpi*ss)/fd_sqrt(x);
-                else {
-                    u = pone(x); v = qone(x);
-                    z = invsqrtpi*(u*ss+v*cc)/fd_sqrt(x);
-                }
-                return z;
-        } 
-        if(ix<=0x3c900000) {    /* x < 2**-54 */
-            return(-tpi/x);
-        } 
-        z = x*x;
-        u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4])));
-        v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4]))));
-        return(x*(u/v) + tpi*(__ieee754_j1(x)*__ieee754_log(x)-one/x));
-}
-
-/* For x >= 8, the asymptotic expansions of pone is
- *	1 + 15/128 s^2 - 4725/2^15 s^4 - ...,	where s = 1/x.
- * We approximate pone by
- * 	pone(x) = 1 + (R/S)
- * where  R = pr0 + pr1*s^2 + pr2*s^4 + ... + pr5*s^10
- * 	  S = 1 + ps0*s^2 + ... + ps4*s^10
- * and
- *	| pone(x)-1-R/S | <= 2  ** ( -60.06)
- */
-
-#ifdef __STDC__
-static const double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#else
-static double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#endif
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-  1.17187499999988647970e-01, /* 0x3FBDFFFF, 0xFFFFFCCE */
-  1.32394806593073575129e+01, /* 0x402A7A9D, 0x357F7FCE */
-  4.12051854307378562225e+02, /* 0x4079C0D4, 0x652EA590 */
-  3.87474538913960532227e+03, /* 0x40AE457D, 0xA3A532CC */
-  7.91447954031891731574e+03, /* 0x40BEEA7A, 0xC32782DD */
-};
-#ifdef __STDC__
-static const double ps8[5] = {
-#else
-static double ps8[5] = {
-#endif
-  1.14207370375678408436e+02, /* 0x405C8D45, 0x8E656CAC */
-  3.65093083420853463394e+03, /* 0x40AC85DC, 0x964D274F */
-  3.69562060269033463555e+04, /* 0x40E20B86, 0x97C5BB7F */
-  9.76027935934950801311e+04, /* 0x40F7D42C, 0xB28F17BB */
-  3.08042720627888811578e+04, /* 0x40DE1511, 0x697A0B2D */
-};
-
-#ifdef __STDC__
-static const double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#else
-static double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#endif
-  1.31990519556243522749e-11, /* 0x3DAD0667, 0xDAE1CA7D */
-  1.17187493190614097638e-01, /* 0x3FBDFFFF, 0xE2C10043 */
-  6.80275127868432871736e+00, /* 0x401B3604, 0x6E6315E3 */
-  1.08308182990189109773e+02, /* 0x405B13B9, 0x452602ED */
-  5.17636139533199752805e+02, /* 0x40802D16, 0xD052D649 */
-  5.28715201363337541807e+02, /* 0x408085B8, 0xBB7E0CB7 */
-};
-#ifdef __STDC__
-static const double ps5[5] = {
-#else
-static double ps5[5] = {
-#endif
-  5.92805987221131331921e+01, /* 0x404DA3EA, 0xA8AF633D */
-  9.91401418733614377743e+02, /* 0x408EFB36, 0x1B066701 */
-  5.35326695291487976647e+03, /* 0x40B4E944, 0x5706B6FB */
-  7.84469031749551231769e+03, /* 0x40BEA4B0, 0xB8A5BB15 */
-  1.50404688810361062679e+03, /* 0x40978030, 0x036F5E51 */
-};
-
-#ifdef __STDC__
-static const double pr3[6] = {
-#else
-static double pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#endif
-  3.02503916137373618024e-09, /* 0x3E29FC21, 0xA7AD9EDD */
-  1.17186865567253592491e-01, /* 0x3FBDFFF5, 0x5B21D17B */
-  3.93297750033315640650e+00, /* 0x400F76BC, 0xE85EAD8A */
-  3.51194035591636932736e+01, /* 0x40418F48, 0x9DA6D129 */
-  9.10550110750781271918e+01, /* 0x4056C385, 0x4D2C1837 */
-  4.85590685197364919645e+01, /* 0x4048478F, 0x8EA83EE5 */
-};
-#ifdef __STDC__
-static const double ps3[5] = {
-#else
-static double ps3[5] = {
-#endif
-  3.47913095001251519989e+01, /* 0x40416549, 0xA134069C */
-  3.36762458747825746741e+02, /* 0x40750C33, 0x07F1A75F */
-  1.04687139975775130551e+03, /* 0x40905B7C, 0x5037D523 */
-  8.90811346398256432622e+02, /* 0x408BD67D, 0xA32E31E9 */
-  1.03787932439639277504e+02, /* 0x4059F26D, 0x7C2EED53 */
-};
-
-#ifdef __STDC__
-static const double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#else
-static double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#endif
-  1.07710830106873743082e-07, /* 0x3E7CE9D4, 0xF65544F4 */
-  1.17176219462683348094e-01, /* 0x3FBDFF42, 0xBE760D83 */
-  2.36851496667608785174e+00, /* 0x4002F2B7, 0xF98FAEC0 */
-  1.22426109148261232917e+01, /* 0x40287C37, 0x7F71A964 */
-  1.76939711271687727390e+01, /* 0x4031B1A8, 0x177F8EE2 */
-  5.07352312588818499250e+00, /* 0x40144B49, 0xA574C1FE */
-};
-#ifdef __STDC__
-static const double ps2[5] = {
-#else
-static double ps2[5] = {
-#endif
-  2.14364859363821409488e+01, /* 0x40356FBD, 0x8AD5ECDC */
-  1.25290227168402751090e+02, /* 0x405F5293, 0x14F92CD5 */
-  2.32276469057162813669e+02, /* 0x406D08D8, 0xD5A2DBD9 */
-  1.17679373287147100768e+02, /* 0x405D6B7A, 0xDA1884A9 */
-  8.36463893371618283368e+00, /* 0x4020BAB1, 0xF44E5192 */
-};
-
-#ifdef __STDC__
-	static double pone(double x)
-#else
-	static double pone(x)
-	double x;
-#endif
-{
-#ifdef __STDC__
-	const double *p,*q;
-#else
-	double *p,*q;
-#endif
-        fd_twoints un;
-	double z,r,s;
-        int ix;
-        un.d = x;
-        ix = 0x7fffffff&__HI(un);
-        if(ix>=0x40200000)     {p = pr8; q= ps8;}
-        else if(ix>=0x40122E8B){p = pr5; q= ps5;}
-        else if(ix>=0x4006DB6D){p = pr3; q= ps3;}
-        else if(ix>=0x40000000){p = pr2; q= ps2;}
-        z = one/(x*x);
-        r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-        s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-        return one+ r/s;
-}
-		
-
-/* For x >= 8, the asymptotic expansions of qone is
- *	3/8 s - 105/1024 s^3 - ..., where s = 1/x.
- * We approximate pone by
- * 	qone(x) = s*(0.375 + (R/S))
- * where  R = qr1*s^2 + qr2*s^4 + ... + qr5*s^10
- * 	  S = 1 + qs1*s^2 + ... + qs6*s^12
- * and
- *	| qone(x)/s -0.375-R/S | <= 2  ** ( -61.13)
- */
-
-#ifdef __STDC__
-static const double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#else
-static double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-#endif
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
- -1.02539062499992714161e-01, /* 0xBFBA3FFF, 0xFFFFFDF3 */
- -1.62717534544589987888e+01, /* 0xC0304591, 0xA26779F7 */
- -7.59601722513950107896e+02, /* 0xC087BCD0, 0x53E4B576 */
- -1.18498066702429587167e+04, /* 0xC0C724E7, 0x40F87415 */
- -4.84385124285750353010e+04, /* 0xC0E7A6D0, 0x65D09C6A */
-};
-#ifdef __STDC__
-static const double qs8[6] = {
-#else
-static double qs8[6] = {
-#endif
-  1.61395369700722909556e+02, /* 0x40642CA6, 0xDE5BCDE5 */
-  7.82538599923348465381e+03, /* 0x40BE9162, 0xD0D88419 */
-  1.33875336287249578163e+05, /* 0x4100579A, 0xB0B75E98 */
-  7.19657723683240939863e+05, /* 0x4125F653, 0x72869C19 */
-  6.66601232617776375264e+05, /* 0x412457D2, 0x7719AD5C */
- -2.94490264303834643215e+05, /* 0xC111F969, 0x0EA5AA18 */
-};
-
-#ifdef __STDC__
-static const double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#else
-static double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-#endif
- -2.08979931141764104297e-11, /* 0xBDB6FA43, 0x1AA1A098 */
- -1.02539050241375426231e-01, /* 0xBFBA3FFF, 0xCB597FEF */
- -8.05644828123936029840e+00, /* 0xC0201CE6, 0xCA03AD4B */
- -1.83669607474888380239e+02, /* 0xC066F56D, 0x6CA7B9B0 */
- -1.37319376065508163265e+03, /* 0xC09574C6, 0x6931734F */
- -2.61244440453215656817e+03, /* 0xC0A468E3, 0x88FDA79D */
-};
-#ifdef __STDC__
-static const double qs5[6] = {
-#else
-static double qs5[6] = {
-#endif
-  8.12765501384335777857e+01, /* 0x405451B2, 0xFF5A11B2 */
-  1.99179873460485964642e+03, /* 0x409F1F31, 0xE77BF839 */
-  1.74684851924908907677e+04, /* 0x40D10F1F, 0x0D64CE29 */
-  4.98514270910352279316e+04, /* 0x40E8576D, 0xAABAD197 */
-  2.79480751638918118260e+04, /* 0x40DB4B04, 0xCF7C364B */
- -4.71918354795128470869e+03, /* 0xC0B26F2E, 0xFCFFA004 */
-};
-
-#ifdef __STDC__
-static const double qr3[6] = {
-#else
-static double qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-#endif
- -5.07831226461766561369e-09, /* 0xBE35CFA9, 0xD38FC84F */
- -1.02537829820837089745e-01, /* 0xBFBA3FEB, 0x51AEED54 */
- -4.61011581139473403113e+00, /* 0xC01270C2, 0x3302D9FF */
- -5.78472216562783643212e+01, /* 0xC04CEC71, 0xC25D16DA */
- -2.28244540737631695038e+02, /* 0xC06C87D3, 0x4718D55F */
- -2.19210128478909325622e+02, /* 0xC06B66B9, 0x5F5C1BF6 */
-};
-#ifdef __STDC__
-static const double qs3[6] = {
-#else
-static double qs3[6] = {
-#endif
-  4.76651550323729509273e+01, /* 0x4047D523, 0xCCD367E4 */
-  6.73865112676699709482e+02, /* 0x40850EEB, 0xC031EE3E */
-  3.38015286679526343505e+03, /* 0x40AA684E, 0x448E7C9A */
-  5.54772909720722782367e+03, /* 0x40B5ABBA, 0xA61D54A6 */
-  1.90311919338810798763e+03, /* 0x409DBC7A, 0x0DD4DF4B */
- -1.35201191444307340817e+02, /* 0xC060E670, 0x290A311F */
-};
-
-#ifdef __STDC__
-static const double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#else
-static double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-#endif
- -1.78381727510958865572e-07, /* 0xBE87F126, 0x44C626D2 */
- -1.02517042607985553460e-01, /* 0xBFBA3E8E, 0x9148B010 */
- -2.75220568278187460720e+00, /* 0xC0060484, 0x69BB4EDA */
- -1.96636162643703720221e+01, /* 0xC033A9E2, 0xC168907F */
- -4.23253133372830490089e+01, /* 0xC04529A3, 0xDE104AAA */
- -2.13719211703704061733e+01, /* 0xC0355F36, 0x39CF6E52 */
-};
-#ifdef __STDC__
-static const double qs2[6] = {
-#else
-static double qs2[6] = {
-#endif
-  2.95333629060523854548e+01, /* 0x403D888A, 0x78AE64FF */
-  2.52981549982190529136e+02, /* 0x406F9F68, 0xDB821CBA */
-  7.57502834868645436472e+02, /* 0x4087AC05, 0xCE49A0F7 */
-  7.39393205320467245656e+02, /* 0x40871B25, 0x48D4C029 */
-  1.55949003336666123687e+02, /* 0x40637E5E, 0x3C3ED8D4 */
- -4.95949898822628210127e+00, /* 0xC013D686, 0xE71BE86B */
-};
-
-#ifdef __STDC__
-	static double qone(double x)
-#else
-	static double qone(x)
-	double x;
-#endif
-{
-#ifdef __STDC__
-	const double *p,*q;
-#else
-	double *p,*q;
-#endif
-        fd_twoints un;
-	double  s,r,z;
-	int ix;
-        un.d = x;
-	ix = 0x7fffffff&__HI(un);
-	if(ix>=0x40200000)     {p = qr8; q= qs8;}
-	else if(ix>=0x40122E8B){p = qr5; q= qs5;}
-	else if(ix>=0x4006DB6D){p = qr3; q= qs3;}
-	else if(ix>=0x40000000){p = qr2; q= qs2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (.375 + r/s)/x;
-}
diff --git a/libs/js/src/fdlibm/e_jn.c b/libs/js/src/fdlibm/e_jn.c
deleted file mode 100644
index 2b61b44399..0000000000
--- a/libs/js/src/fdlibm/e_jn.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_jn.c 1.4 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __ieee754_jn(n, x), __ieee754_yn(n, x)
- * floating point Bessel's function of the 1st and 2nd kind
- * of order n
- *          
- * Special cases:
- *	y0(0)=y1(0)=yn(n,0) = -inf with division by zero signal;
- *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
- * Note 2. About jn(n,x), yn(n,x)
- *	For n=0, j0(x) is called,
- *	for n=1, j1(x) is called,
- *	for n<x, forward recursion us used starting
- *	from values of j0(x) and j1(x).
- *	for n>x, a continued fraction approximation to
- *	j(n,x)/j(n-1,x) is evaluated and then backward
- *	recursion is used starting from a supposed value
- *	for j(n,x). The resulting value of j(0,x) is
- *	compared with the actual value to correct the
- *	supposed value of j(n,x).
- *
- *	yn(n,x) is similar in all respects, except
- *	that forward recursion is used for all
- *	values of n>1.
- *	
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-two   =  2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */
-one   =  1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */
-
-static double zero  =  0.00000000000000000000e+00;
-
-#ifdef __STDC__
-	double __ieee754_jn(int n, double x)
-#else
-	double __ieee754_jn(n,x)
-	int n; double x;
-#endif
-{
-        fd_twoints u;
-	int i,hx,ix,lx, sgn;
-	double a, b, temp, di;
-	double z, w;
-
-    /* J(-n,x) = (-1)^n * J(n, x), J(n, -x) = (-1)^n * J(n, x)
-     * Thus, J(-n,x) = J(n,-x)
-     */
-        u.d = x;
-	hx = __HI(u);
-	ix = 0x7fffffff&hx;
-	lx = __LO(u);
-    /* if J(n,NaN) is NaN */
-	if((ix|((unsigned)(lx|-lx))>>31)>0x7ff00000) return x+x;
-	if(n<0){		
-		n = -n;
-		x = -x;
-		hx ^= 0x80000000;
-	}
-	if(n==0) return(__ieee754_j0(x));
-	if(n==1) return(__ieee754_j1(x));
-	sgn = (n&1)&(hx>>31);	/* even n -- 0, odd n -- sign(x) */
-	x = fd_fabs(x);
-	if((ix|lx)==0||ix>=0x7ff00000) 	/* if x is 0 or inf */
-	    b = zero;
-	else if((double)n<=x) {   
-		/* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */
-	    if(ix>=0x52D00000) { /* x > 2**302 */
-    /* (x >> n**2) 
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x), 
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch(n&3) {
-		    case 0: temp =  fd_cos(x)+fd_sin(x); break;
-		    case 1: temp = -fd_cos(x)+fd_sin(x); break;
-		    case 2: temp = -fd_cos(x)-fd_sin(x); break;
-		    case 3: temp =  fd_cos(x)-fd_sin(x); break;
-		}
-		b = invsqrtpi*temp/fd_sqrt(x);
-	    } else {	
-	        a = __ieee754_j0(x);
-	        b = __ieee754_j1(x);
-	        for(i=1;i<n;i++){
-		    temp = b;
-		    b = b*((double)(i+i)/x) - a; /* avoid underflow */
-		    a = temp;
-	        }
-	    }
-	} else {
-	    if(ix<0x3e100000) {	/* x < 2**-29 */
-    /* x is tiny, return the first Taylor expansion of J(n,x) 
-     * J(n,x) = 1/n!*(x/2)^n  - ...
-     */
-		if(n>33)	/* underflow */
-		    b = zero;
-		else {
-		    temp = x*0.5; b = temp;
-		    for (a=one,i=2;i<=n;i++) {
-			a *= (double)i;		/* a = n! */
-			b *= temp;		/* b = (x/2)^n */
-		    }
-		    b = b/a;
-		}
-	    } else {
-		/* use backward recurrence */
-		/* 			x      x^2      x^2       
-		 *  J(n,x)/J(n-1,x) =  ----   ------   ------   .....
-		 *			2n  - 2(n+1) - 2(n+2)
-		 *
-		 * 			1      1        1       
-		 *  (for large x)   =  ----  ------   ------   .....
-		 *			2n   2(n+1)   2(n+2)
-		 *			-- - ------ - ------ - 
-		 *			 x     x         x
-		 *
-		 * Let w = 2n/x and h=2/x, then the above quotient
-		 * is equal to the continued fraction:
-		 *		    1
-		 *	= -----------------------
-		 *		       1
-		 *	   w - -----------------
-		 *			  1
-		 * 	        w+h - ---------
-		 *		       w+2h - ...
-		 *
-		 * To determine how many terms needed, let
-		 * Q(0) = w, Q(1) = w(w+h) - 1,
-		 * Q(k) = (w+k*h)*Q(k-1) - Q(k-2),
-		 * When Q(k) > 1e4	good for single 
-		 * When Q(k) > 1e9	good for double 
-		 * When Q(k) > 1e17	good for quadruple 
-		 */
-	    /* determine k */
-		double t,v;
-		double q0,q1,h,tmp; int k,m;
-		w  = (n+n)/(double)x; h = 2.0/(double)x;
-		q0 = w;  z = w+h; q1 = w*z - 1.0; k=1;
-		while(q1<1.0e9) {
-			k += 1; z += h;
-			tmp = z*q1 - q0;
-			q0 = q1;
-			q1 = tmp;
-		}
-		m = n+n;
-		for(t=zero, i = 2*(n+k); i>=m; i -= 2) t = one/(i/x-t);
-		a = t;
-		b = one;
-		/*  estimate log((2/x)^n*n!) = n*log(2/x)+n*ln(n)
-		 *  Hence, if n*(log(2n/x)) > ...
-		 *  single 8.8722839355e+01
-		 *  double 7.09782712893383973096e+02
-		 *  long double 1.1356523406294143949491931077970765006170e+04
-		 *  then recurrent value may overflow and the result is 
-		 *  likely underflow to zero
-		 */
-		tmp = n;
-		v = two/x;
-		tmp = tmp*__ieee754_log(fd_fabs(v*tmp));
-		if(tmp<7.09782712893383973096e+02) {
-	    	    for(i=n-1,di=(double)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-	     	    }
-		} else {
-	    	    for(i=n-1,di=(double)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-		    /* scale b to avoid spurious overflow */
-			if(b>1e100) {
-			    a /= b;
-			    t /= b;
-			    b  = one;
-			}
-	     	    }
-		}
-	    	b = (t*__ieee754_j0(x)/b);
-	    }
-	}
-	if(sgn==1) return -b; else return b;
-}
-
-#ifdef __STDC__
-	double __ieee754_yn(int n, double x) 
-#else
-	double __ieee754_yn(n,x) 
-	int n; double x;
-#endif
-{
-        fd_twoints u;
-	int i,hx,ix,lx;
-	int sign;
-	double a, b, temp;
-
-        u.d = x;
-	hx = __HI(u);
-	ix = 0x7fffffff&hx;
-	lx = __LO(u);
-    /* if Y(n,NaN) is NaN */
-	if((ix|((unsigned)(lx|-lx))>>31)>0x7ff00000) return x+x;
-	if((ix|lx)==0) return -one/zero;
-	if(hx<0) return zero/zero;
-	sign = 1;
-	if(n<0){
-		n = -n;
-		sign = 1 - ((n&1)<<1);
-	}
-	if(n==0) return(__ieee754_y0(x));
-	if(n==1) return(sign*__ieee754_y1(x));
-	if(ix==0x7ff00000) return zero;
-	if(ix>=0x52D00000) { /* x > 2**302 */
-    /* (x >> n**2) 
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x), 
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch(n&3) {
-		    case 0: temp =  fd_sin(x)-fd_cos(x); break;
-		    case 1: temp = -fd_sin(x)-fd_cos(x); break;
-		    case 2: temp = -fd_sin(x)+fd_cos(x); break;
-		    case 3: temp =  fd_sin(x)+fd_cos(x); break;
-		}
-		b = invsqrtpi*temp/fd_sqrt(x);
-	} else {
-	    a = __ieee754_y0(x);
-	    b = __ieee754_y1(x);
-	/* quit if b is -inf */
-            u.d = b;
-	    for(i=1;i<n&&(__HI(u) != 0xfff00000);i++){ 
-		temp = b;
-		b = ((double)(i+i)/x)*b - a;
-		a = temp;
-	    }
-	}
-	if(sign>0) return b; else return -b;
-}
diff --git a/libs/js/src/fdlibm/e_lgamma.c b/libs/js/src/fdlibm/e_lgamma.c
deleted file mode 100644
index beb3bd9321..0000000000
--- a/libs/js/src/fdlibm/e_lgamma.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_lgamma.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_lgamma(x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call __ieee754_lgamma_r
- */
-
-#include "fdlibm.h"
-
-extern int signgam;
-
-#ifdef __STDC__
-	double __ieee754_lgamma(double x)
-#else
-	double __ieee754_lgamma(x)
-	double x;
-#endif
-{
-	return __ieee754_lgamma_r(x,&signgam);
-}
diff --git a/libs/js/src/fdlibm/e_lgamma_r.c b/libs/js/src/fdlibm/e_lgamma_r.c
deleted file mode 100644
index df92e7a26c..0000000000
--- a/libs/js/src/fdlibm/e_lgamma_r.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_lgamma_r.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_lgamma_r(x, signgamp)
- * Reentrant version of the logarithm of the Gamma function 
- * with user provide pointer for the sign of Gamma(x). 
- *
- * Method:
- *   1. Argument Reduction for 0 < x <= 8
- * 	Since gamma(1+s)=s*gamma(s), for x in [0,8], we may 
- * 	reduce x to a number in [1.5,2.5] by
- * 		lgamma(1+s) = log(s) + lgamma(s)
- *	for example,
- *		lgamma(7.3) = log(6.3) + lgamma(6.3)
- *			    = log(6.3*5.3) + lgamma(5.3)
- *			    = log(6.3*5.3*4.3*3.3*2.3) + lgamma(2.3)
- *   2. Polynomial approximation of lgamma around its
- *	minimun ymin=1.461632144968362245 to maintain monotonicity.
- *	On [ymin-0.23, ymin+0.27] (i.e., [1.23164,1.73163]), use
- *		Let z = x-ymin;
- *		lgamma(x) = -1.214862905358496078218 + z^2*poly(z)
- *	where
- *		poly(z) is a 14 degree polynomial.
- *   2. Rational approximation in the primary interval [2,3]
- *	We use the following approximation:
- *		s = x-2.0;
- *		lgamma(x) = 0.5*s + s*P(s)/Q(s)
- *	with accuracy
- *		|P/Q - (lgamma(x)-0.5s)| < 2**-61.71
- *	Our algorithms are based on the following observation
- *
- *                             zeta(2)-1    2    zeta(3)-1    3
- * lgamma(2+s) = s*(1-Euler) + --------- * s  -  --------- * s  + ...
- *                                 2                 3
- *
- *	where Euler = 0.5771... is the Euler constant, which is very
- *	close to 0.5.
- *
- *   3. For x>=8, we have
- *	lgamma(x)~(x-0.5)log(x)-x+0.5*log(2pi)+1/(12x)-1/(360x**3)+....
- *	(better formula:
- *	   lgamma(x)~(x-0.5)*(log(x)-1)-.5*(log(2pi)-1) + ...)
- *	Let z = 1/x, then we approximation
- *		f(z) = lgamma(x) - (x-0.5)(log(x)-1)
- *	by
- *	  			    3       5             11
- *		w = w0 + w1*z + w2*z  + w3*z  + ... + w6*z
- *	where 
- *		|w - f(z)| < 2**-58.74
- *		
- *   4. For negative x, since (G is gamma function)
- *		-x*G(-x)*G(x) = pi/sin(pi*x),
- * 	we have
- * 		G(x) = pi/(sin(pi*x)*(-x)*G(-x))
- *	since G(-x) is positive, sign(G(x)) = sign(sin(pi*x)) for x<0
- *	Hence, for x<0, signgam = sign(sin(pi*x)) and 
- *		lgamma(x) = log(|Gamma(x)|)
- *			  = log(pi/(|x*sin(pi*x)|)) - lgamma(-x);
- *	Note: one should avoid compute pi*(-x) directly in the 
- *	      computation of sin(pi*(-x)).
- *		
- *   5. Special Cases
- *		lgamma(2+s) ~ s*(1-Euler) for tiny s
- *		lgamma(1)=lgamma(2)=0
- *		lgamma(x) ~ -log(x) for tiny x
- *		lgamma(0) = lgamma(inf) = inf
- *	 	lgamma(-integer) = +-inf
- *	
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-two52=  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
-half=  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
-a0  =  7.72156649015328655494e-02, /* 0x3FB3C467, 0xE37DB0C8 */
-a1  =  3.22467033424113591611e-01, /* 0x3FD4A34C, 0xC4A60FAD */
-a2  =  6.73523010531292681824e-02, /* 0x3FB13E00, 0x1A5562A7 */
-a3  =  2.05808084325167332806e-02, /* 0x3F951322, 0xAC92547B */
-a4  =  7.38555086081402883957e-03, /* 0x3F7E404F, 0xB68FEFE8 */
-a5  =  2.89051383673415629091e-03, /* 0x3F67ADD8, 0xCCB7926B */
-a6  =  1.19270763183362067845e-03, /* 0x3F538A94, 0x116F3F5D */
-a7  =  5.10069792153511336608e-04, /* 0x3F40B6C6, 0x89B99C00 */
-a8  =  2.20862790713908385557e-04, /* 0x3F2CF2EC, 0xED10E54D */
-a9  =  1.08011567247583939954e-04, /* 0x3F1C5088, 0x987DFB07 */
-a10 =  2.52144565451257326939e-05, /* 0x3EFA7074, 0x428CFA52 */
-a11 =  4.48640949618915160150e-05, /* 0x3F07858E, 0x90A45837 */
-tc  =  1.46163214496836224576e+00, /* 0x3FF762D8, 0x6356BE3F */
-tf  = -1.21486290535849611461e-01, /* 0xBFBF19B9, 0xBCC38A42 */
-/* tt = -(tail of tf) */
-tt  = -3.63867699703950536541e-18, /* 0xBC50C7CA, 0xA48A971F */
-t0  =  4.83836122723810047042e-01, /* 0x3FDEF72B, 0xC8EE38A2 */
-t1  = -1.47587722994593911752e-01, /* 0xBFC2E427, 0x8DC6C509 */
-t2  =  6.46249402391333854778e-02, /* 0x3FB08B42, 0x94D5419B */
-t3  = -3.27885410759859649565e-02, /* 0xBFA0C9A8, 0xDF35B713 */
-t4  =  1.79706750811820387126e-02, /* 0x3F9266E7, 0x970AF9EC */
-t5  = -1.03142241298341437450e-02, /* 0xBF851F9F, 0xBA91EC6A */
-t6  =  6.10053870246291332635e-03, /* 0x3F78FCE0, 0xE370E344 */
-t7  = -3.68452016781138256760e-03, /* 0xBF6E2EFF, 0xB3E914D7 */
-t8  =  2.25964780900612472250e-03, /* 0x3F6282D3, 0x2E15C915 */
-t9  = -1.40346469989232843813e-03, /* 0xBF56FE8E, 0xBF2D1AF1 */
-t10 =  8.81081882437654011382e-04, /* 0x3F4CDF0C, 0xEF61A8E9 */
-t11 = -5.38595305356740546715e-04, /* 0xBF41A610, 0x9C73E0EC */
-t12 =  3.15632070903625950361e-04, /* 0x3F34AF6D, 0x6C0EBBF7 */
-t13 = -3.12754168375120860518e-04, /* 0xBF347F24, 0xECC38C38 */
-t14 =  3.35529192635519073543e-04, /* 0x3F35FD3E, 0xE8C2D3F4 */
-u0  = -7.72156649015328655494e-02, /* 0xBFB3C467, 0xE37DB0C8 */
-u1  =  6.32827064025093366517e-01, /* 0x3FE4401E, 0x8B005DFF */
-u2  =  1.45492250137234768737e+00, /* 0x3FF7475C, 0xD119BD6F */
-u3  =  9.77717527963372745603e-01, /* 0x3FEF4976, 0x44EA8450 */
-u4  =  2.28963728064692451092e-01, /* 0x3FCD4EAE, 0xF6010924 */
-u5  =  1.33810918536787660377e-02, /* 0x3F8B678B, 0xBF2BAB09 */
-v1  =  2.45597793713041134822e+00, /* 0x4003A5D7, 0xC2BD619C */
-v2  =  2.12848976379893395361e+00, /* 0x40010725, 0xA42B18F5 */
-v3  =  7.69285150456672783825e-01, /* 0x3FE89DFB, 0xE45050AF */
-v4  =  1.04222645593369134254e-01, /* 0x3FBAAE55, 0xD6537C88 */
-v5  =  3.21709242282423911810e-03, /* 0x3F6A5ABB, 0x57D0CF61 */
-s0  = -7.72156649015328655494e-02, /* 0xBFB3C467, 0xE37DB0C8 */
-s1  =  2.14982415960608852501e-01, /* 0x3FCB848B, 0x36E20878 */
-s2  =  3.25778796408930981787e-01, /* 0x3FD4D98F, 0x4F139F59 */
-s3  =  1.46350472652464452805e-01, /* 0x3FC2BB9C, 0xBEE5F2F7 */
-s4  =  2.66422703033638609560e-02, /* 0x3F9B481C, 0x7E939961 */
-s5  =  1.84028451407337715652e-03, /* 0x3F5E26B6, 0x7368F239 */
-s6  =  3.19475326584100867617e-05, /* 0x3F00BFEC, 0xDD17E945 */
-r1  =  1.39200533467621045958e+00, /* 0x3FF645A7, 0x62C4AB74 */
-r2  =  7.21935547567138069525e-01, /* 0x3FE71A18, 0x93D3DCDC */
-r3  =  1.71933865632803078993e-01, /* 0x3FC601ED, 0xCCFBDF27 */
-r4  =  1.86459191715652901344e-02, /* 0x3F9317EA, 0x742ED475 */
-r5  =  7.77942496381893596434e-04, /* 0x3F497DDA, 0xCA41A95B */
-r6  =  7.32668430744625636189e-06, /* 0x3EDEBAF7, 0xA5B38140 */
-w0  =  4.18938533204672725052e-01, /* 0x3FDACFE3, 0x90C97D69 */
-w1  =  8.33333333333329678849e-02, /* 0x3FB55555, 0x5555553B */
-w2  = -2.77777777728775536470e-03, /* 0xBF66C16C, 0x16B02E5C */
-w3  =  7.93650558643019558500e-04, /* 0x3F4A019F, 0x98CF38B6 */
-w4  = -5.95187557450339963135e-04, /* 0xBF4380CB, 0x8C0FE741 */
-w5  =  8.36339918996282139126e-04, /* 0x3F4B67BA, 0x4CDAD5D1 */
-w6  = -1.63092934096575273989e-03; /* 0xBF5AB89D, 0x0B9E43E4 */
-
-static double zero=  0.00000000000000000000e+00;
-
-#ifdef __STDC__
-	static double sin_pi(double x)
-#else
-	static double sin_pi(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y,z;
-	int n,ix;
-
-        u.d = x;
-	ix = 0x7fffffff&__HI(u);
-
-	if(ix<0x3fd00000) return __kernel_sin(pi*x,zero,0);
-	y = -x;		/* x is assume negative */
-
-    /*
-     * argument reduction, make sure inexact flag not raised if input
-     * is an integer
-     */
-	z = fd_floor(y);
-	if(z!=y) {				/* inexact anyway */
-	    y  *= 0.5;
-	    y   = 2.0*(y - fd_floor(y));		/* y = |x| mod 2.0 */
-	    n   = (int) (y*4.0);
-	} else {
-            if(ix>=0x43400000) {
-                y = zero; n = 0;                 /* y must be even */
-            } else {
-                if(ix<0x43300000) z = y+two52;	/* exact */
-                u.d = z;
-                n   = __LO(u)&1;        /* lower word of z */
-                y  = n;
-                n<<= 2;
-            }
-        }
-	switch (n) {
-	    case 0:   y =  __kernel_sin(pi*y,zero,0); break;
-	    case 1:   
-	    case 2:   y =  __kernel_cos(pi*(0.5-y),zero); break;
-	    case 3:  
-	    case 4:   y =  __kernel_sin(pi*(one-y),zero,0); break;
-	    case 5:
-	    case 6:   y = -__kernel_cos(pi*(y-1.5),zero); break;
-	    default:  y =  __kernel_sin(pi*(y-2.0),zero,0); break;
-	    }
-	return -y;
-}
-
-
-#ifdef __STDC__
-	double __ieee754_lgamma_r(double x, int *signgamp)
-#else
-	double __ieee754_lgamma_r(x,signgamp)
-	double x; int *signgamp;
-#endif
-{
-        fd_twoints u;
-	double t,y,z,nadj,p,p1,p2,p3,q,r,w;
-	int i,hx,lx,ix;
-
-        u.d = x;
-	hx = __HI(u);
-	lx = __LO(u);
-
-    /* purge off +-inf, NaN, +-0, and negative arguments */
-	*signgamp = 1;
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return x*x;
-	if((ix|lx)==0) return one/zero;
-	if(ix<0x3b900000) {	/* |x|<2**-70, return -log(|x|) */
-	    if(hx<0) {
-	        *signgamp = -1;
-	        return -__ieee754_log(-x);
-	    } else return -__ieee754_log(x);
-	}
-	if(hx<0) {
-	    if(ix>=0x43300000) 	/* |x|>=2**52, must be -integer */
-		return one/zero;
-	    t = sin_pi(x);
-	    if(t==zero) return one/zero; /* -integer */
-	    nadj = __ieee754_log(pi/fd_fabs(t*x));
-	    if(t<zero) *signgamp = -1;
-	    x = -x;
-	}
-
-    /* purge off 1 and 2 */
-	if((((ix-0x3ff00000)|lx)==0)||(((ix-0x40000000)|lx)==0)) r = 0;
-    /* for x < 2.0 */
-	else if(ix<0x40000000) {
-	    if(ix<=0x3feccccc) { 	/* lgamma(x) = lgamma(x+1)-log(x) */
-		r = -__ieee754_log(x);
-		if(ix>=0x3FE76944) {y = one-x; i= 0;}
-		else if(ix>=0x3FCDA661) {y= x-(tc-one); i=1;}
-	  	else {y = x; i=2;}
-	    } else {
-	  	r = zero;
-	        if(ix>=0x3FFBB4C3) {y=2.0-x;i=0;} /* [1.7316,2] */
-	        else if(ix>=0x3FF3B4C4) {y=x-tc;i=1;} /* [1.23,1.73] */
-		else {y=x-one;i=2;}
-	    }
-	    switch(i) {
-	      case 0:
-		z = y*y;
-		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*a10))));
-		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*a11)))));
-		p  = y*p1+p2;
-		r  += (p-0.5*y); break;
-	      case 1:
-		z = y*y;
-		w = z*y;
-		p1 = t0+w*(t3+w*(t6+w*(t9 +w*t12)));	/* parallel comp */
-		p2 = t1+w*(t4+w*(t7+w*(t10+w*t13)));
-		p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
-		p  = z*p1-(tt-w*(p2+y*p3));
-		r += (tf + p); break;
-	      case 2:	
-		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5)))));
-		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5))));
-		r += (-0.5*y + p1/p2);
-	    }
-	}
-	else if(ix<0x40200000) { 			/* x < 8.0 */
-	    i = (int)x;
-	    t = zero;
-	    y = x-(double)i;
-	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*s6))))));
-	    q = one+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*r6)))));
-	    r = half*y+p/q;
-	    z = one;	/* lgamma(1+s) = log(s) + lgamma(s) */
-	    switch(i) {
-	    case 7: z *= (y+6.0);	/* FALLTHRU */
-	    case 6: z *= (y+5.0);	/* FALLTHRU */
-	    case 5: z *= (y+4.0);	/* FALLTHRU */
-	    case 4: z *= (y+3.0);	/* FALLTHRU */
-	    case 3: z *= (y+2.0);	/* FALLTHRU */
-		    r += __ieee754_log(z); break;
-	    }
-    /* 8.0 <= x < 2**58 */
-	} else if (ix < 0x43900000) {
-	    t = __ieee754_log(x);
-	    z = one/x;
-	    y = z*z;
-	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6)))));
-	    r = (x-half)*(t-one)+w;
-	} else 
-    /* 2**58 <= x <= inf */
-	    r =  x*(__ieee754_log(x)-one);
-	if(hx<0) r = nadj - r;
-	return r;
-}
diff --git a/libs/js/src/fdlibm/e_log.c b/libs/js/src/fdlibm/e_log.c
deleted file mode 100644
index 8645d6efdc..0000000000
--- a/libs/js/src/fdlibm/e_log.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_log.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_log(x)
- * Return the logrithm of x
- *
- * Method :                  
- *   1. Argument Reduction: find k and f such that 
- *			x = 2^k * (1+f), 
- *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *   2. Approximation of log(1+f).
- *	Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *	     	 = 2s + s*R
- *      We use a special Reme algorithm on [0,0.1716] to generate 
- * 	a polynomial of degree 14 to approximate R The maximum error 
- *	of this polynomial approximation is bounded by 2**-58.45. In
- *	other words,
- *		        2      4      6      8      10      12      14
- *	    R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s  +Lg6*s  +Lg7*s
- *  	(the values of Lg1 to Lg7 are listed in the program)
- *	and
- *	    |      2          14          |     -58.45
- *	    | Lg1*s +...+Lg7*s    -  R(z) | <= 2 
- *	    |                             |
- *	Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- *	In order to guarantee error in log below 1ulp, we compute log
- *	by
- *		log(1+f) = f - s*(f - R)	(if f is not too large)
- *		log(1+f) = f - (hfsq - s*(hfsq+R)).	(better accuracy)
- *	
- *	3. Finally,  log(x) = k*ln2 + log(1+f).  
- *			    = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- *	   Here ln2 is split into two floating point number: 
- *			ln2_hi + ln2_lo,
- *	   where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- *	log(x) is NaN with signal if x < 0 (including -INF) ; 
- *	log(+INF) is +INF; log(0) is -INF with signal;
- *	log(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-ln2_hi  =  6.93147180369123816490e-01,	/* 3fe62e42 fee00000 */
-ln2_lo  =  1.90821492927058770002e-10,	/* 3dea39ef 35793c76 */
-two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-static double zero   =  0.0;
-
-#ifdef __STDC__
-	double __ieee754_log(double x)
-#else
-	double __ieee754_log(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double hfsq,f,s,z,R,w,t1,t2,dk;
-	int k,hx,i,j;
-	unsigned lx;
-
-        u.d = x;
-	hx = __HI(u);		/* high word of x */
-	lx = __LO(u);		/* low  word of x */
-
-	k=0;
-	if (hx < 0x00100000) {			/* x < 2**-1022  */
-	    if (((hx&0x7fffffff)|lx)==0) 
-		return -two54/zero;		/* log(+-0)=-inf */
-	    if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
-	    k -= 54; x *= two54; /* subnormal number, scale up x */
-            u.d = x;
-	    hx = __HI(u);		/* high word of x */
-	} 
-	if (hx >= 0x7ff00000) return x+x;
-	k += (hx>>20)-1023;
-	hx &= 0x000fffff;
-	i = (hx+0x95f64)&0x100000;
-        u.d = x;
-	__HI(u) = hx|(i^0x3ff00000);	/* normalize x or x/2 */
-        x = u.d;
-	k += (i>>20);
-	f = x-1.0;
-	if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-	    if(f==zero) { 
-                if(k==0) return zero; else {dk=(double)k;
-                                            return dk*ln2_hi+dk*ln2_lo;} 
-            }
-	    R = f*f*(0.5-0.33333333333333333*f);
-	    if(k==0) return f-R; else {dk=(double)k;
-	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
-	}
- 	s = f/(2.0+f); 
-	dk = (double)k;
-	z = s*s;
-	i = hx-0x6147a;
-	w = z*z;
-	j = 0x6b851-hx;
-	t1= w*(Lg2+w*(Lg4+w*Lg6)); 
-	t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); 
-	i |= j;
-	R = t2+t1;
-	if(i>0) {
-	    hfsq=0.5*f*f;
-	    if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		     return dk*ln2_hi-((hfsq-(s*(hfsq+R)+dk*ln2_lo))-f);
-	} else {
-	    if(k==0) return f-s*(f-R); else
-		     return dk*ln2_hi-((s*(f-R)-dk*ln2_lo)-f);
-	}
-}
diff --git a/libs/js/src/fdlibm/e_log10.c b/libs/js/src/fdlibm/e_log10.c
deleted file mode 100644
index 5f88f4b4cf..0000000000
--- a/libs/js/src/fdlibm/e_log10.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_log10.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_log10(x)
- * Return the base 10 logarithm of x
- * 
- * Method :
- *	Let log10_2hi = leading 40 bits of log10(2) and
- *	    log10_2lo = log10(2) - log10_2hi,
- *	    ivln10   = 1/log(10) rounded.
- *	Then
- *		n = ilogb(x), 
- *		if(n<0)  n = n+1;
- *		x = scalbn(x,-n);
- *		log10(x) := n*log10_2hi + (n*log10_2lo + ivln10*log(x))
- *
- * Note 1:
- *	To guarantee log10(10**n)=n, where 10**n is normal, the rounding 
- *	mode must set to Round-to-Nearest.
- * Note 2:
- *	[1/log(10)] rounded to 53 bits has error  .198   ulps;
- *	log10 is monotonic at all binary break points.
- *
- * Special cases:
- *	log10(x) is NaN with signal if x < 0; 
- *	log10(+INF) is +INF with no signal; log10(0) is -INF with signal;
- *	log10(NaN) is that NaN with no signal;
- *	log10(10**N) = N  for N=0,1,...,22.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-two54      =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-ivln10     =  4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */
-log10_2hi  =  3.01029995663611771306e-01, /* 0x3FD34413, 0x509F6000 */
-log10_2lo  =  3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */
-
-static double zero   =  0.0;
-
-#ifdef __STDC__
-	double __ieee754_log10(double x)
-#else
-	double __ieee754_log10(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y,z;
-	int i,k,hx;
-	unsigned lx;
-
-        u.d = x;
-	hx = __HI(u);	/* high word of x */
-	lx = __LO(u);	/* low word of x */
-
-        k=0;
-        if (hx < 0x00100000) {                  /* x < 2**-1022  */
-            if (((hx&0x7fffffff)|lx)==0)
-                return -two54/zero;             /* log(+-0)=-inf */
-            if (hx<0) return (x-x)/zero;        /* log(-#) = NaN */
-            k -= 54; x *= two54; /* subnormal number, scale up x */
-            u.d = x;
-            hx = __HI(u);                /* high word of x */
-        }
-	if (hx >= 0x7ff00000) return x+x;
-	k += (hx>>20)-1023;
-	i  = ((unsigned)k&0x80000000)>>31;
-        hx = (hx&0x000fffff)|((0x3ff-i)<<20);
-        y  = (double)(k+i);
-        u.d = x;
-        __HI(u) = hx;
-        x = u.d;
-	z  = y*log10_2lo + ivln10*__ieee754_log(x);
-	return  z+y*log10_2hi;
-}
diff --git a/libs/js/src/fdlibm/e_pow.c b/libs/js/src/fdlibm/e_pow.c
deleted file mode 100644
index 18c8d06950..0000000000
--- a/libs/js/src/fdlibm/e_pow.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_pow.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_pow(x,y) return x**y
- *
- *		      n
- * Method:  Let x =  2   * (1+f)
- *	1. Compute and return log2(x) in two pieces:
- *		log2(x) = w1 + w2,
- *	   where w1 has 53-24 = 29 bit trailing zeros.
- *	2. Perform y*log2(x) = n+y' by simulating muti-precision 
- *	   arithmetic, where |y'|<=0.5.
- *	3. Return x**y = 2**n*exp(y'*log2)
- *
- * Special cases:
- *	1.  (anything) ** 0  is 1
- *	2.  (anything) ** 1  is itself
- *	3.  (anything) ** NAN is NAN
- *	4.  NAN ** (anything except 0) is NAN
- *	5.  +-(|x| > 1) **  +INF is +INF
- *	6.  +-(|x| > 1) **  -INF is +0
- *	7.  +-(|x| < 1) **  +INF is +0
- *	8.  +-(|x| < 1) **  -INF is +INF
- *	9.  +-1         ** +-INF is NAN
- *	10. +0 ** (+anything except 0, NAN)               is +0
- *	11. -0 ** (+anything except 0, NAN, odd integer)  is +0
- *	12. +0 ** (-anything except 0, NAN)               is +INF
- *	13. -0 ** (-anything except 0, NAN, odd integer)  is +INF
- *	14. -0 ** (odd integer) = -( +0 ** (odd integer) )
- *	15. +INF ** (+anything except 0,NAN) is +INF
- *	16. +INF ** (-anything except 0,NAN) is +0
- *	17. -INF ** (anything)  = -0 ** (-anything)
- *	18. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer)
- *	19. (-anything except 0 and inf) ** (non-integer) is NAN
- *
- * Accuracy:
- *	pow(x,y) returns x**y nearly rounded. In particular
- *			pow(integer,integer)
- *	always returns the correct integer provided it is 
- *	representable.
- *
- * Constants :
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#if defined(_MSC_VER)
-/* Microsoft Compiler */
-#pragma warning( disable : 4723 ) /* disables potential divide by 0 warning */
-#endif
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-bp[] = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */
-dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */
-zero    =  0.0,
-one	=  1.0,
-two	=  2.0,
-two53	=  9007199254740992.0,	/* 0x43400000, 0x00000000 */
-really_big	=  1.0e300,
-tiny    =  1.0e-300,
-	/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1  =  5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */
-L2  =  4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */
-L3  =  3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */
-L4  =  2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */
-L5  =  2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */
-L6  =  2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */
-P1   =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2   = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3   =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4   = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5   =  4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */
-lg2  =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
-lg2_h  =  6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */
-lg2_l  = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */
-ovt =  8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */
-cp    =  9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */
-cp_h  =  9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */
-cp_l  = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/
-ivln2    =  1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */
-ivln2_h  =  1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/
-ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
-
-#ifdef __STDC__
-	double __ieee754_pow(double x, double y)
-#else
-	double __ieee754_pow(x,y)
-	double x, y;
-#endif
-{
-        fd_twoints ux, uy, uz;
-        double y1,t1,p_h,t,z,ax;
-	double z_h,z_l,p_l;
-	double t2,r,s,u,v,w;
-	int i,j,k,yisint,n;
-	int hx,hy,ix,iy;
-	unsigned lx,ly;
-
-        ux.d = x; uy.d = y;
-	hx = __HI(ux); lx = __LO(ux);
-	hy = __HI(uy); ly = __LO(uy);
-	ix = hx&0x7fffffff;  iy = hy&0x7fffffff;
-
-    /* y==zero: x**0 = 1 */
-	if((iy|ly)==0) return one; 	
-
-    /* +-NaN return x+y */
-	if(ix > 0x7ff00000 || ((ix==0x7ff00000)&&(lx!=0)) ||
-	   iy > 0x7ff00000 || ((iy==0x7ff00000)&&(ly!=0))) 
-		return x+y;	
-
-    /* determine if y is an odd int when x < 0
-     * yisint = 0	... y is not an integer
-     * yisint = 1	... y is an odd int
-     * yisint = 2	... y is an even int
-     */
-	yisint  = 0;
-	if(hx<0) {	
-	    if(iy>=0x43400000) yisint = 2; /* even integer y */
-	    else if(iy>=0x3ff00000) {
-		k = (iy>>20)-0x3ff;	   /* exponent */
-		if(k>20) {
-		    j = ly>>(52-k);
-		    if((j<<(52-k))==(int)ly) yisint = 2-(j&1);
-		} else if(ly==0) {
-		    j = iy>>(20-k);
-		    if((j<<(20-k))==iy) yisint = 2-(j&1);
-		}
-	    }		
-	} 
-
-    /* special value of y */
-	if(ly==0) { 	
-	    if (iy==0x7ff00000) {	/* y is +-inf */
-	        if(((ix-0x3ff00000)|lx)==0)
-#ifdef _WIN32
-/* VC++ optimizer reduces y - y to 0 */ 
-                    return y / y;
-#else
-		    return  y - y;	/* inf**+-1 is NaN */
-#endif
-	        else if (ix >= 0x3ff00000)/* (|x|>1)**+-inf = inf,0 */
-		    return (hy>=0)? y: zero;
-	        else			/* (|x|<1)**-,+inf = inf,0 */
-		    return (hy<0)?-y: zero;
-	    } 
-	    if(iy==0x3ff00000) {	/* y is  +-1 */
-		if(hy<0) return one/x; else return x;
-	    }
-	    if(hy==0x40000000) return x*x; /* y is  2 */
-	    if(hy==0x3fe00000) {	/* y is  0.5 */
-		if(hx>=0)	/* x >= +0 */
-		return fd_sqrt(x);	
-	    }
-	}
-
-	ax   = fd_fabs(x);
-    /* special value of x */
-	if(lx==0) {
-	    if(ix==0x7ff00000||ix==0||ix==0x3ff00000){
-		z = ax;			/*x is +-0,+-inf,+-1*/
-		if(hy<0) z = one/z;	/* z = (1/|x|) */
-		if(hx<0) {
-		    if(((ix-0x3ff00000)|yisint)==0) {
-			z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-		    } else if(yisint==1) {
-#ifdef HPUX
-                        uz.d = z;
-			__HI(uz) ^= 1<<31; /* some HPUXes cannot negate 0.. */
-                        z = uz.d;
-#else
-			z = -z;		/* (x<0)**odd = -(|x|**odd) */
-#endif
-			}
-		}
-		return z;
-	    }
-	}
-    
-    /* (x<0)**(non-int) is NaN */
-	if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x);
-
-    /* |y| is really_big */
-	if(iy>0x41e00000) { /* if |y| > 2**31 */
-	    if(iy>0x43f00000){	/* if |y| > 2**64, must o/uflow */
-		if(ix<=0x3fefffff) return (hy<0)? really_big*really_big:tiny*tiny;
-		if(ix>=0x3ff00000) return (hy>0)? really_big*really_big:tiny*tiny;
-	    }
-	/* over/underflow if x is not close to one */
-	    if(ix<0x3fefffff) return (hy<0)? really_big*really_big:tiny*tiny;
-	    if(ix>0x3ff00000) return (hy>0)? really_big*really_big:tiny*tiny;
-	/* now |1-x| is tiny <= 2**-20, suffice to compute 
-	   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = x-1;		/* t has 20 trailing zeros */
-	    w = (t*t)*(0.5-t*(0.3333333333333333333333-t*0.25));
-	    u = ivln2_h*t;	/* ivln2_h has 21 sig. bits */
-	    v = t*ivln2_l-w*ivln2;
-	    t1 = u+v;
-            uz.d = t1;
-	    __LO(uz) = 0;
-            t1 = uz.d;
-	    t2 = v-(t1-u);
-	} else {
-	    double s_h,t_h;
-	    double s2,s_l,t_l;
-	    n = 0;
-	/* take care subnormal number */
-	    if(ix<0x00100000) 
-		{ax *= two53; n -= 53; uz.d = ax; ix = __HI(uz); }
-	    n  += ((ix)>>20)-0x3ff;
-	    j  = ix&0x000fffff;
-	/* determine interval */
-	    ix = j|0x3ff00000;		/* normalize ix */
-	    if(j<=0x3988E) k=0;		/* |x|<sqrt(3/2) */
-	    else if(j<0xBB67A) k=1;	/* |x|<sqrt(3)   */
-	    else {k=0;n+=1;ix -= 0x00100000;}
-            uz.d = ax;
-	    __HI(uz) = ix;
-            ax = uz.d;
-
-	/* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
-	    u = ax-bp[k];		/* bp[0]=1.0, bp[1]=1.5 */
-	    v = one/(ax+bp[k]);
-	    s = u*v;
-	    s_h = s;
-            uz.d = s_h;
-	    __LO(uz) = 0;
-            s_h = uz.d;
-	/* t_h=ax+bp[k] High */
-	    t_h = zero;
-            uz.d = t_h;
-	    __HI(uz)=((ix>>1)|0x20000000)+0x00080000+(k<<18); 
-            t_h = uz.d;
-	    t_l = ax - (t_h-bp[k]);
-	    s_l = v*((u-s_h*t_h)-s_h*t_l);
-	/* compute log(ax) */
-	    s2 = s*s;
-	    r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-	    r += s_l*(s_h+s);
-	    s2  = s_h*s_h;
-	    t_h = 3.0+s2+r;
-            uz.d = t_h;
-	    __LO(uz) = 0;
-            t_h = uz.d;
-	    t_l = r-((t_h-3.0)-s2);
-	/* u+v = s*(1+...) */
-	    u = s_h*t_h;
-	    v = s_l*t_h+t_l*s;
-	/* 2/(3log2)*(s+...) */
-	    p_h = u+v;
-            uz.d = p_h;
-	    __LO(uz) = 0;
-            p_h = uz.d;
-	    p_l = v-(p_h-u);
-	    z_h = cp_h*p_h;		/* cp_h+cp_l = 2/(3*log2) */
-	    z_l = cp_l*p_h+p_l*cp+dp_l[k];
-	/* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */
-	    t = (double)n;
-	    t1 = (((z_h+z_l)+dp_h[k])+t);
-            uz.d = t1;
-	    __LO(uz) = 0;
-            t1 = uz.d;
-	    t2 = z_l-(((t1-t)-dp_h[k])-z_h);
-	}
-
-	s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-	if((((hx>>31)+1)|(yisint-1))==0) s = -one;/* (-ve)**(odd int) */
-
-    /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
-	y1  = y;
-        uy.d = y1;
-	__LO(uy) = 0;
-        y1 = uy.d;
-	p_l = (y-y1)*t1+y*t2;
-	p_h = y1*t1;
-	z = p_l+p_h;
-        uz.d = z;
-	j = __HI(uz);
-	i = __LO(uz);
-
-	if (j>=0x40900000) {				/* z >= 1024 */
-	    if(((j-0x40900000)|i)!=0)			/* if z > 1024 */
-		return s*really_big*really_big;			/* overflow */
-	    else {
-		if(p_l+ovt>z-p_h) return s*really_big*really_big;	/* overflow */
-	    }
-	} else if((j&0x7fffffff)>=0x4090cc00 ) {	/* z <= -1075 */
-	    if(((j-0xc090cc00)|i)!=0) 		/* z < -1075 */
-		return s*tiny*tiny;		/* underflow */
-	    else {
-		if(p_l<=z-p_h) return s*tiny*tiny;	/* underflow */
-	    }
-	}
-    /*
-     * compute 2**(p_h+p_l)
-     */
-	i = j&0x7fffffff;
-	k = (i>>20)-0x3ff;
-	n = 0;
-	if(i>0x3fe00000) {		/* if |z| > 0.5, set n = [z+0.5] */
-	    n = j+(0x00100000>>(k+1));
-	    k = ((n&0x7fffffff)>>20)-0x3ff;	/* new k for n */
-	    t = zero;
-            uz.d = t;
-	    __HI(uz) = (n&~(0x000fffff>>k));
-            t = uz.d;
-	    n = ((n&0x000fffff)|0x00100000)>>(20-k);
-	    if(j<0) n = -n;
-	    p_h -= t;
-	} 
-	t = p_l+p_h;
-        uz.d = t;
-	__LO(uz) = 0;
-        t = uz.d;
-	u = t*lg2_h;
-	v = (p_l-(t-p_h))*lg2+t*lg2_l;
-	z = u+v;
-	w = v-(z-u);
-	t  = z*z;
-	t1  = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	r  = (z*t1)/(t1-two)-(w+z*w);
-	z  = one-(r-z);
-        uz.d = z;
-	j  = __HI(uz);
-	j += (n<<20);
-	if((j>>20)<=0) z = fd_scalbn(z,n);	/* subnormal output */
-	else { uz.d = z; __HI(uz) += (n<<20); z = uz.d; }
-	return s*z;
-}
diff --git a/libs/js/src/fdlibm/e_rem_pio2.c b/libs/js/src/fdlibm/e_rem_pio2.c
deleted file mode 100644
index c9d2618751..0000000000
--- a/libs/js/src/fdlibm/e_rem_pio2.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_rem_pio2.c 1.4 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* __ieee754_rem_pio2(x,y)
- * 
- * return the remainder of x rem pi/2 in y[0]+y[1] 
- * use __kernel_rem_pio2()
- */
-
-#include "fdlibm.h"
-
-/*
- * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi 
- */
-#ifdef __STDC__
-static const int two_over_pi[] = {
-#else
-static int two_over_pi[] = {
-#endif
-0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, 
-0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A, 
-0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, 
-0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41, 
-0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8, 
-0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF, 
-0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5, 
-0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08, 
-0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3, 
-0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880, 
-0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, 
-};
-
-#ifdef __STDC__
-static const int npio2_hw[] = {
-#else
-static int npio2_hw[] = {
-#endif
-0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C,
-0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C,
-0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A,
-0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C,
-0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB,
-0x404858EB, 0x404921FB,
-};
-
-/*
- * invpio2:  53 bits of 2/pi
- * pio2_1:   first  33 bit of pi/2
- * pio2_1t:  pi/2 - pio2_1
- * pio2_2:   second 33 bit of pi/2
- * pio2_2t:  pi/2 - (pio2_1+pio2_2)
- * pio2_3:   third  33 bit of pi/2
- * pio2_3t:  pi/2 - (pio2_1+pio2_2+pio2_3)
- */
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-zero =  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-half =  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-two24 =  1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
-invpio2 =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
-pio2_1  =  1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */
-pio2_1t =  6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */
-pio2_2  =  6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */
-pio2_2t =  2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */
-pio2_3  =  2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
-pio2_3t =  8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
-
-#ifdef __STDC__
-	int __ieee754_rem_pio2(double x, double *y)
-#else
-	int __ieee754_rem_pio2(x,y)
-	double x,y[];
-#endif
-{
-        fd_twoints u, ux, uz;
-        double z = 0;
-	double w,t,r,fn;
-	double tx[3];
-	int e0,i,j,nx,n,ix,hx;
-
-        u.d = x;
-	hx = __HI(u);		/* high word of x */
-	ix = hx&0x7fffffff;
-	if(ix<=0x3fe921fb)   /* |x| ~<= pi/4 , no need for reduction */
-	    {y[0] = x; y[1] = 0; return 0;}
-	if(ix<0x4002d97c) {  /* |x| < 3pi/4, special case with n=+-1 */
-	    if(hx>0) { 
-		z = x - pio2_1;
-		if(ix!=0x3ff921fb) { 	/* 33+53 bit pi is good enough */
-		    y[0] = z - pio2_1t;
-		    y[1] = (z-y[0])-pio2_1t;
-		} else {		/* near pi/2, use 33+33+53 bit pi */
-		    z -= pio2_2;
-		    y[0] = z - pio2_2t;
-		    y[1] = (z-y[0])-pio2_2t;
-		}
-		return 1;
-	    } else {	/* negative x */
-		z = x + pio2_1;
-		if(ix!=0x3ff921fb) { 	/* 33+53 bit pi is good enough */
-		    y[0] = z + pio2_1t;
-		    y[1] = (z-y[0])+pio2_1t;
-		} else {		/* near pi/2, use 33+33+53 bit pi */
-		    z += pio2_2;
-		    y[0] = z + pio2_2t;
-		    y[1] = (z-y[0])+pio2_2t;
-		}
-		return -1;
-	    }
-	}
-	if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */
-	    t  = fd_fabs(x);
-	    n  = (int) (t*invpio2+half);
-	    fn = (double)n;
-	    r  = t-fn*pio2_1;
-	    w  = fn*pio2_1t;	/* 1st round good to 85 bit */
-	    if(n<32&&ix!=npio2_hw[n-1]) {	
-		y[0] = r-w;	/* quick check no cancellation */
-	    } else {
-	        j  = ix>>20;
-	        y[0] = r-w;
-                u.d = y[0];
-	        i = j-(((__HI(u))>>20)&0x7ff);
-	        if(i>16) {  /* 2nd iteration needed, good to 118 */
-		    t  = r;
-		    w  = fn*pio2_2;	
-		    r  = t-w;
-		    w  = fn*pio2_2t-((t-r)-w);	
-		    y[0] = r-w;
-                    u.d = y[0];
-		    i = j-(((__HI(u))>>20)&0x7ff);
-		    if(i>49)  {	/* 3rd iteration need, 151 bits acc */
-		    	t  = r;	/* will cover all possible cases */
-		    	w  = fn*pio2_3;	
-		    	r  = t-w;
-		    	w  = fn*pio2_3t-((t-r)-w);	
-		    	y[0] = r-w;
-		    }
-		}
-	    }
-	    y[1] = (r-y[0])-w;
-	    if(hx<0) 	{y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	    else	 return n;
-	}
-    /* 
-     * all other (large) arguments
-     */
-	if(ix>=0x7ff00000) {		/* x is inf or NaN */
-	    y[0]=y[1]=x-x; return 0;
-	}
-    /* set z = scalbn(|x|,ilogb(x)-23) */
-        ux.d = x; uz.d = z;
-	__LO(uz) = __LO(ux);
-        z = uz.d;
-	e0 	= (ix>>20)-1046;	/* e0 = ilogb(z)-23; */
-        uz.d = z;
-	__HI(uz) = ix - (e0<<20);
-        z = uz.d;
-	for(i=0;i<2;i++) {
-		tx[i] = (double)((int)(z));
-		z     = (z-tx[i])*two24;
-	}
-	tx[2] = z;
-	nx = 3;
-	while(tx[nx-1]==zero) nx--;	/* skip zero term */
-	n  =  __kernel_rem_pio2(tx,y,e0,nx,2,two_over_pi);
-	if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	return n;
-}
diff --git a/libs/js/src/fdlibm/e_remainder.c b/libs/js/src/fdlibm/e_remainder.c
deleted file mode 100644
index de40f0c2a5..0000000000
--- a/libs/js/src/fdlibm/e_remainder.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_remainder.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_remainder(x,p)
- * Return :                  
- * 	returns  x REM p  =  x - [x/p]*p as if in infinite 
- * 	precise arithmetic, where [x/p] is the (infinite bit) 
- *	integer nearest x/p (in half way case choose the even one).
- * Method : 
- *	Based on fmod() return x-[x/p]chopped*p exactlp.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double zero = 0.0;
-#else
-static double zero = 0.0;
-#endif
-
-
-#ifdef __STDC__
-	double __ieee754_remainder(double x, double p)
-#else
-	double __ieee754_remainder(x,p)
-	double x,p;
-#endif
-{
-        fd_twoints u;
-	int hx,hp;
-	unsigned sx,lx,lp;
-	double p_half;
-
-        u.d = x;
-	hx = __HI(u);		/* high word of x */
-	lx = __LO(u);		/* low  word of x */
-        u.d = p;
-	hp = __HI(u);		/* high word of p */
-	lp = __LO(u);		/* low  word of p */
-	sx = hx&0x80000000;
-	hp &= 0x7fffffff;
-	hx &= 0x7fffffff;
-
-    /* purge off exception values */
-	if((hp|lp)==0) return (x*p)/(x*p); 	/* p = 0 */
-	if((hx>=0x7ff00000)||			/* x not finite */
-	  ((hp>=0x7ff00000)&&			/* p is NaN */
-	  (((hp-0x7ff00000)|lp)!=0)))
-	    return (x*p)/(x*p);
-
-
-	if (hp<=0x7fdfffff) x = __ieee754_fmod(x,p+p);	/* now x < 2p */
-	if (((hx-hp)|(lx-lp))==0) return zero*x;
-	x  = fd_fabs(x);
-	p  = fd_fabs(p);
-	if (hp<0x00200000) {
-	    if(x+x>p) {
-		x-=p;
-		if(x+x>=p) x -= p;
-	    }
-	} else {
-	    p_half = 0.5*p;
-	    if(x>p_half) {
-		x-=p;
-		if(x>=p_half) x -= p;
-	    }
-	}
-        u.d = x;
-	__HI(u) ^= sx;
-        x = u.d;
-	return x;
-}
diff --git a/libs/js/src/fdlibm/e_scalb.c b/libs/js/src/fdlibm/e_scalb.c
deleted file mode 100644
index 621704ea04..0000000000
--- a/libs/js/src/fdlibm/e_scalb.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_scalb.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __ieee754_scalb(x, fn) is provide for
- * passing various standard test suite. One 
- * should use scalbn() instead.
- */
-
-#include "fdlibm.h"
-
-#ifdef _SCALB_INT
-#ifdef __STDC__
-	double __ieee754_scalb(double x, int fn)
-#else
-	double __ieee754_scalb(x,fn)
-	double x; int fn;
-#endif
-#else
-#ifdef __STDC__
-	double __ieee754_scalb(double x, double fn)
-#else
-	double __ieee754_scalb(x,fn)
-	double x, fn;
-#endif
-#endif
-{
-#ifdef _SCALB_INT
-	return fd_scalbn(x,fn);
-#else
-	if (fd_isnan(x)||fd_isnan(fn)) return x*fn;
-	if (!fd_finite(fn)) {
-	    if(fn>0.0) return x*fn;
-	    else       return x/(-fn);
-	}
-	if (fd_rint(fn)!=fn) return (fn-fn)/(fn-fn);
-	if ( fn > 65000.0) return fd_scalbn(x, 65000);
-	if (-fn > 65000.0) return fd_scalbn(x,-65000);
-	return fd_scalbn(x,(int)fn);
-#endif
-}
diff --git a/libs/js/src/fdlibm/e_sinh.c b/libs/js/src/fdlibm/e_sinh.c
deleted file mode 100644
index 98ab9b5a32..0000000000
--- a/libs/js/src/fdlibm/e_sinh.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)e_sinh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_sinh(x)
- * Method : 
- * mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
- *	1. Replace x by |x| (sinh(-x) = -sinh(x)). 
- *	2. 
- *		                                    E + E/(E+1)
- *	    0        <= x <= 22     :  sinh(x) := --------------, E=expm1(x)
- *			       			        2
- *
- *	    22       <= x <= lnovft :  sinh(x) := exp(x)/2 
- *	    lnovft   <= x <= ln2ovft:  sinh(x) := exp(x/2)/2 * exp(x/2)
- *	    ln2ovft  <  x	    :  sinh(x) := x*shuge (overflow)
- *
- * Special cases:
- *	sinh(x) is |x| if x is +INF, -INF, or NaN.
- *	only sinh(0)=0 is exact for finite x.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double one = 1.0, shuge = 1.0e307;
-#else
-static double one = 1.0, shuge = 1.0e307;
-#endif
-
-#ifdef __STDC__
-	double __ieee754_sinh(double x)
-#else
-	double __ieee754_sinh(x)
-	double x;
-#endif
-{	
-        fd_twoints u;
-	double t,w,h;
-	int ix,jx;
-	unsigned lx;
-
-    /* High word of |x|. */
-        u.d = x;
-	jx = __HI(u);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) return x+x;	
-
-	h = 0.5;
-	if (jx<0) h = -h;
-    /* |x| in [0,22], return sign(x)*0.5*(E+E/(E+1))) */
-	if (ix < 0x40360000) {		/* |x|<22 */
-	    if (ix<0x3e300000) 		/* |x|<2**-28 */
-		if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */
-	    t = fd_expm1(fd_fabs(x));
-	    if(ix<0x3ff00000) return h*(2.0*t-t*t/(t+one));
-	    return h*(t+t/(t+one));
-	}
-
-    /* |x| in [22, log(maxdouble)] return 0.5*exp(|x|) */
-	if (ix < 0x40862E42)  return h*__ieee754_exp(fd_fabs(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x);
-	if (ix<0x408633CE || (ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d)) {
-	    w = __ieee754_exp(0.5*fd_fabs(x));
-	    t = h*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, sinh(x) overflow */
-	return x*shuge;
-}
diff --git a/libs/js/src/fdlibm/e_sqrt.c b/libs/js/src/fdlibm/e_sqrt.c
deleted file mode 100644
index 91802839b0..0000000000
--- a/libs/js/src/fdlibm/e_sqrt.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/* @(#)e_sqrt.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __ieee754_sqrt(x)
- * Return correctly rounded sqrt.
- *           ------------------------------------------
- *	     |  Use the hardware sqrt if you have one |
- *           ------------------------------------------
- * Method: 
- *   Bit by bit method using integer arithmetic. (Slow, but portable) 
- *   1. Normalization
- *	Scale x to y in [1,4) with even powers of 2: 
- *	find an integer k such that  1 <= (y=x*2^(2k)) < 4, then
- *		sqrt(y) = 2^k * sqrt(x)
- *   2. Bit by bit computation
- *	Let q  = sqrt(y) truncated to i bit after binary point (q = 1),
- *	     i							 0
- *                                     i+1         2
- *	    s  = 2*q , and	y  =  2   * ( y - q  ).		(1)
- *	     i      i            i                 i
- *                                                        
- *	To compute q    from q , one checks whether 
- *		    i+1       i                       
- *
- *			      -(i+1) 2
- *			(q + 2      ) <= y.			(2)
- *     			  i
- *							      -(i+1)
- *	If (2) is false, then q   = q ; otherwise q   = q  + 2      .
- *		 	       i+1   i             i+1   i
- *
- *	With some algebric manipulation, it is not difficult to see
- *	that (2) is equivalent to 
- *                             -(i+1)
- *			s  +  2       <= y			(3)
- *			 i                i
- *
- *	The advantage of (3) is that s  and y  can be computed by 
- *				      i      i
- *	the following recurrence formula:
- *	    if (3) is false
- *
- *	    s     =  s  ,	y    = y   ;			(4)
- *	     i+1      i		 i+1    i
- *
- *	    otherwise,
- *                         -i                     -(i+1)
- *	    s	  =  s  + 2  ,  y    = y  -  s  - 2  		(5)
- *           i+1      i          i+1    i     i
- *				
- *	One may easily use induction to prove (4) and (5). 
- *	Note. Since the left hand side of (3) contain only i+2 bits,
- *	      it does not necessary to do a full (53-bit) comparison 
- *	      in (3).
- *   3. Final rounding
- *	After generating the 53 bits result, we compute one more bit.
- *	Together with the remainder, we can decide whether the
- *	result is exact, bigger than 1/2ulp, or less than 1/2ulp
- *	(it will never equal to 1/2ulp).
- *	The rounding mode can be detected by checking whether
- *	huge + tiny is equal to huge, and whether huge - tiny is
- *	equal to huge for some floating point number "huge" and "tiny".
- *		
- * Special cases:
- *	sqrt(+-0) = +-0 	... exact
- *	sqrt(inf) = inf
- *	sqrt(-ve) = NaN		... with invalid signal
- *	sqrt(NaN) = NaN		... with invalid signal for signaling NaN
- *
- * Other methods : see the appended file at the end of the program below.
- *---------------
- */
-
-#include "fdlibm.h"
-
-#if defined(_MSC_VER)
-/* Microsoft Compiler */
-#pragma warning( disable : 4723 ) /* disables potential divide by 0 warning */
-#endif
-
-#ifdef __STDC__
-static	const double	one	= 1.0, tiny=1.0e-300;
-#else
-static	double	one	= 1.0, tiny=1.0e-300;
-#endif
-
-#ifdef __STDC__
-	double __ieee754_sqrt(double x)
-#else
-	double __ieee754_sqrt(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double z;
-	int 	sign = (int)0x80000000; 
-	unsigned r,t1,s1,ix1,q1;
-	int ix0,s0,q,m,t,i;
-
-        u.d = x;
-	ix0 = __HI(u);			/* high word of x */
-	ix1 = __LO(u);		/* low word of x */
-
-    /* take care of Inf and NaN */
-	if((ix0&0x7ff00000)==0x7ff00000) {			
-	    return x*x+x;		/* sqrt(NaN)=NaN, sqrt(+inf)=+inf
-					   sqrt(-inf)=sNaN */
-	} 
-    /* take care of zero */
-	if(ix0<=0) {
-	    if(((ix0&(~sign))|ix1)==0) return x;/* sqrt(+-0) = +-0 */
-	    else if(ix0<0)
-		return (x-x)/(x-x);		/* sqrt(-ve) = sNaN */
-	}
-    /* normalize x */
-	m = (ix0>>20);
-	if(m==0) {				/* subnormal x */
-	    while(ix0==0) {
-		m -= 21;
-		ix0 |= (ix1>>11); ix1 <<= 21;
-	    }
-	    for(i=0;(ix0&0x00100000)==0;i++) ix0<<=1;
-	    m -= i-1;
-	    ix0 |= (ix1>>(32-i));
-	    ix1 <<= i;
-	}
-	m -= 1023;	/* unbias exponent */
-	ix0 = (ix0&0x000fffff)|0x00100000;
-	if(m&1){	/* odd m, double x to make it even */
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	}
-	m >>= 1;	/* m = [m/2] */
-
-    /* generate sqrt(x) bit by bit */
-	ix0 += ix0 + ((ix1&sign)>>31);
-	ix1 += ix1;
-	q = q1 = s0 = s1 = 0;	/* [q,q1] = sqrt(x) */
-	r = 0x00200000;		/* r = moving bit from right to left */
-
-	while(r!=0) {
-	    t = s0+r; 
-	    if(t<=ix0) { 
-		s0   = t+r; 
-		ix0 -= t; 
-		q   += r; 
-	    } 
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	    r>>=1;
-	}
-
-	r = sign;
-	while(r!=0) {
-	    t1 = s1+r; 
-	    t  = s0;
-	    if((t<ix0)||((t==ix0)&&(t1<=ix1))) { 
-		s1  = t1+r;
-		if(((int)(t1&sign)==sign)&&(s1&sign)==0) s0 += 1;
-		ix0 -= t;
-		if (ix1 < t1) ix0 -= 1;
-		ix1 -= t1;
-		q1  += r;
-	    }
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	    r>>=1;
-	}
-
-    /* use floating add to find out rounding direction */
-	if((ix0|ix1)!=0) {
-	    z = one-tiny; /* trigger inexact flag */
-	    if (z>=one) {
-	        z = one+tiny;
-	        if (q1==(unsigned)0xffffffff) { q1=0; q += 1;}
-		else if (z>one) {
-		    if (q1==(unsigned)0xfffffffe) q+=1;
-		    q1+=2; 
-		} else
-	            q1 += (q1&1);
-	    }
-	}
-	ix0 = (q>>1)+0x3fe00000;
-	ix1 =  q1>>1;
-	if ((q&1)==1) ix1 |= sign;
-	ix0 += (m <<20);
-        u.d = z;
-	__HI(u) = ix0;
-	__LO(u) = ix1;
-        z = u.d;
-	return z;
-}
-
-/*
-Other methods  (use floating-point arithmetic)
--------------
-(This is a copy of a drafted paper by Prof W. Kahan 
-and K.C. Ng, written in May, 1986)
-
-	Two algorithms are given here to implement sqrt(x) 
-	(IEEE double precision arithmetic) in software.
-	Both supply sqrt(x) correctly rounded. The first algorithm (in
-	Section A) uses newton iterations and involves four divisions.
-	The second one uses reciproot iterations to avoid division, but
-	requires more multiplications. Both algorithms need the ability
-	to chop results of arithmetic operations instead of round them, 
-	and the INEXACT flag to indicate when an arithmetic operation
-	is executed exactly with no roundoff error, all part of the 
-	standard (IEEE 754-1985). The ability to perform shift, add,
-	subtract and logical AND operations upon 32-bit words is needed
-	too, though not part of the standard.
-
-A.  sqrt(x) by Newton Iteration
-
-   (1)	Initial approximation
-
-	Let x0 and x1 be the leading and the trailing 32-bit words of
-	a floating point number x (in IEEE double format) respectively 
-
-	    1    11		     52				  ...widths
-	   ------------------------------------------------------
-	x: |s|	  e     |	      f				|
-	   ------------------------------------------------------
-	      msb    lsb  msb				      lsb ...order
-
- 
-	     ------------------------  	     ------------------------
-	x0:  |s|   e    |    f1     |	 x1: |          f2           |
-	     ------------------------  	     ------------------------
-
-	By performing shifts and subtracts on x0 and x1 (both regarded
-	as integers), we obtain an 8-bit approximation of sqrt(x) as
-	follows.
-
-		k  := (x0>>1) + 0x1ff80000;
-		y0 := k - T1[31&(k>>15)].	... y ~ sqrt(x) to 8 bits
-	Here k is a 32-bit integer and T1[] is an integer array containing
-	correction terms. Now magically the floating value of y (y's
-	leading 32-bit word is y0, the value of its trailing word is 0)
-	approximates sqrt(x) to almost 8-bit.
-
-	Value of T1:
-	static int T1[32]= {
-	0,	1024,	3062,	5746,	9193,	13348,	18162,	23592,
-	29598,	36145,	43202,	50740,	58733,	67158,	75992,	85215,
-	83599,	71378,	60428,	50647,	41945,	34246,	27478,	21581,
-	16499,	12183,	8588,	5674,	3403,	1742,	661,	130,};
-
-    (2)	Iterative refinement
-
-	Apply Heron's rule three times to y, we have y approximates 
-	sqrt(x) to within 1 ulp (Unit in the Last Place):
-
-		y := (y+x/y)/2		... almost 17 sig. bits
-		y := (y+x/y)/2		... almost 35 sig. bits
-		y := y-(y-x/y)/2	... within 1 ulp
-
-
-	Remark 1.
-	    Another way to improve y to within 1 ulp is:
-
-		y := (y+x/y)		... almost 17 sig. bits to 2*sqrt(x)
-		y := y - 0x00100006	... almost 18 sig. bits to sqrt(x)
-
-				2
-			    (x-y )*y
-		y := y + 2* ----------	...within 1 ulp
-			       2
-			     3y  + x
-
-
-	This formula has one division fewer than the one above; however,
-	it requires more multiplications and additions. Also x must be
-	scaled in advance to avoid spurious overflow in evaluating the
-	expression 3y*y+x. Hence it is not recommended uless division
-	is slow. If division is very slow, then one should use the 
-	reciproot algorithm given in section B.
-
-    (3) Final adjustment
-
-	By twiddling y's last bit it is possible to force y to be 
-	correctly rounded according to the prevailing rounding mode
-	as follows. Let r and i be copies of the rounding mode and
-	inexact flag before entering the square root program. Also we
-	use the expression y+-ulp for the next representable floating
-	numbers (up and down) of y. Note that y+-ulp = either fixed
-	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
-	mode.
-
-		I := FALSE;	... reset INEXACT flag I
-		R := RZ;	... set rounding mode to round-toward-zero
-		z := x/y;	... chopped quotient, possibly inexact
-		If(not I) then {	... if the quotient is exact
-		    if(z=y) {
-		        I := i;	 ... restore inexact flag
-		        R := r;  ... restore rounded mode
-		        return sqrt(x):=y.
-		    } else {
-			z := z - ulp;	... special rounding
-		    }
-		}
-		i := TRUE;		... sqrt(x) is inexact
-		If (r=RN) then z=z+ulp	... rounded-to-nearest
-		If (r=RP) then {	... round-toward-+inf
-		    y = y+ulp; z=z+ulp;
-		}
-		y := y+z;		... chopped sum
-		y0:=y0-0x00100000;	... y := y/2 is correctly rounded.
-	        I := i;	 		... restore inexact flag
-	        R := r;  		... restore rounded mode
-	        return sqrt(x):=y.
-		    
-    (4)	Special cases
-
-	Square root of +inf, +-0, or NaN is itself;
-	Square root of a negative number is NaN with invalid signal.
-
-
-B.  sqrt(x) by Reciproot Iteration
-
-   (1)	Initial approximation
-
-	Let x0 and x1 be the leading and the trailing 32-bit words of
-	a floating point number x (in IEEE double format) respectively
-	(see section A). By performing shifs and subtracts on x0 and y0,
-	we obtain a 7.8-bit approximation of 1/sqrt(x) as follows.
-
-	    k := 0x5fe80000 - (x0>>1);
-	    y0:= k - T2[63&(k>>14)].	... y ~ 1/sqrt(x) to 7.8 bits
-
-	Here k is a 32-bit integer and T2[] is an integer array 
-	containing correction terms. Now magically the floating
-	value of y (y's leading 32-bit word is y0, the value of
-	its trailing word y1 is set to zero) approximates 1/sqrt(x)
-	to almost 7.8-bit.
-
-	Value of T2:
-	static int T2[64]= {
-	0x1500,	0x2ef8,	0x4d67,	0x6b02,	0x87be,	0xa395,	0xbe7a,	0xd866,
-	0xf14a,	0x1091b,0x11fcd,0x13552,0x14999,0x15c98,0x16e34,0x17e5f,
-	0x18d03,0x19a01,0x1a545,0x1ae8a,0x1b5c4,0x1bb01,0x1bfde,0x1c28d,
-	0x1c2de,0x1c0db,0x1ba73,0x1b11c,0x1a4b5,0x1953d,0x18266,0x16be0,
-	0x1683e,0x179d8,0x18a4d,0x19992,0x1a789,0x1b445,0x1bf61,0x1c989,
-	0x1d16d,0x1d77b,0x1dddf,0x1e2ad,0x1e5bf,0x1e6e8,0x1e654,0x1e3cd,
-	0x1df2a,0x1d635,0x1cb16,0x1be2c,0x1ae4e,0x19bde,0x1868e,0x16e2e,
-	0x1527f,0x1334a,0x11051,0xe951,	0xbe01,	0x8e0d,	0x5924,	0x1edd,};
-
-    (2)	Iterative refinement
-
-	Apply Reciproot iteration three times to y and multiply the
-	result by x to get an approximation z that matches sqrt(x)
-	to about 1 ulp. To be exact, we will have 
-		-1ulp < sqrt(x)-z<1.0625ulp.
-	
-	... set rounding mode to Round-to-nearest
-	   y := y*(1.5-0.5*x*y*y)	... almost 15 sig. bits to 1/sqrt(x)
-	   y := y*((1.5-2^-30)+0.5*x*y*y)... about 29 sig. bits to 1/sqrt(x)
-	... special arrangement for better accuracy
-	   z := x*y			... 29 bits to sqrt(x), with z*y<1
-	   z := z + 0.5*z*(1-z*y)	... about 1 ulp to sqrt(x)
-
-	Remark 2. The constant 1.5-2^-30 is chosen to bias the error so that
-	(a) the term z*y in the final iteration is always less than 1; 
-	(b) the error in the final result is biased upward so that
-		-1 ulp < sqrt(x) - z < 1.0625 ulp
-	    instead of |sqrt(x)-z|<1.03125ulp.
-
-    (3)	Final adjustment
-
-	By twiddling y's last bit it is possible to force y to be 
-	correctly rounded according to the prevailing rounding mode
-	as follows. Let r and i be copies of the rounding mode and
-	inexact flag before entering the square root program. Also we
-	use the expression y+-ulp for the next representable floating
-	numbers (up and down) of y. Note that y+-ulp = either fixed
-	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
-	mode.
-
-	R := RZ;		... set rounding mode to round-toward-zero
-	switch(r) {
-	    case RN:		... round-to-nearest
-	       if(x<= z*(z-ulp)...chopped) z = z - ulp; else
-	       if(x<= z*(z+ulp)...chopped) z = z; else z = z+ulp;
-	       break;
-	    case RZ:case RM:	... round-to-zero or round-to--inf
-	       R:=RP;		... reset rounding mod to round-to-+inf
-	       if(x<z*z ... rounded up) z = z - ulp; else
-	       if(x>=(z+ulp)*(z+ulp) ...rounded up) z = z+ulp;
-	       break;
-	    case RP:		... round-to-+inf
-	       if(x>(z+ulp)*(z+ulp)...chopped) z = z+2*ulp; else
-	       if(x>z*z ...chopped) z = z+ulp;
-	       break;
-	}
-
-	Remark 3. The above comparisons can be done in fixed point. For
-	example, to compare x and w=z*z chopped, it suffices to compare
-	x1 and w1 (the trailing parts of x and w), regarding them as
-	two's complement integers.
-
-	...Is z an exact square root?
-	To determine whether z is an exact square root of x, let z1 be the
-	trailing part of z, and also let x0 and x1 be the leading and
-	trailing parts of x.
-
-	If ((z1&0x03ffffff)!=0)	... not exact if trailing 26 bits of z!=0
-	    I := 1;		... Raise Inexact flag: z is not exact
-	else {
-	    j := 1 - [(x0>>20)&1]	... j = logb(x) mod 2
-	    k := z1 >> 26;		... get z's 25-th and 26-th 
-					    fraction bits
-	    I := i or (k&j) or ((k&(j+j+1))!=(x1&3));
-	}
-	R:= r		... restore rounded mode
-	return sqrt(x):=z.
-
-	If multiplication is cheaper then the foregoing red tape, the 
-	Inexact flag can be evaluated by
-
-	    I := i;
-	    I := (z*z!=x) or I.
-
-	Note that z*z can overwrite I; this value must be sensed if it is 
-	True.
-
-	Remark 4. If z*z = x exactly, then bit 25 to bit 0 of z1 must be
-	zero.
-
-		    --------------------
-		z1: |        f2        | 
-		    --------------------
-		bit 31		   bit 0
-
-	Further more, bit 27 and 26 of z1, bit 0 and 1 of x1, and the odd
-	or even of logb(x) have the following relations:
-
-	-------------------------------------------------
-	bit 27,26 of z1		bit 1,0 of x1	logb(x)
-	-------------------------------------------------
-	00			00		odd and even
-	01			01		even
-	10			10		odd
-	10			00		even
-	11			01		even
-	-------------------------------------------------
-
-    (4)	Special cases (see (4) of Section A).	
- 
- */
- 
diff --git a/libs/js/src/fdlibm/fdlibm.h b/libs/js/src/fdlibm/fdlibm.h
deleted file mode 100644
index 992137a7bd..0000000000
--- a/libs/js/src/fdlibm/fdlibm.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)fdlibm.h 1.5 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#ifdef OSSP
-/* select functionality */
-#define _IEEE_LIBM
-/* avoid namespace pollution */
-#define __ieee754_acos          js___ieee754_acos
-#define __ieee754_acosh         js___ieee754_acosh
-#define __ieee754_asin          js___ieee754_asin
-#define __ieee754_atan2         js___ieee754_atan2
-#define __ieee754_atanh         js___ieee754_atanh
-#define __ieee754_cosh          js___ieee754_cosh
-#define __ieee754_exp           js___ieee754_exp
-#define __ieee754_fmod          js___ieee754_fmod
-#define __ieee754_gamma         js___ieee754_gamma
-#define __ieee754_gamma_r       js___ieee754_gamma_r
-#define __ieee754_hypot         js___ieee754_hypot
-#define __ieee754_j0            js___ieee754_j0
-#define __ieee754_j1            js___ieee754_j1
-#define __ieee754_jn            js___ieee754_jn
-#define __ieee754_lgamma        js___ieee754_lgamma
-#define __ieee754_lgamma_r      js___ieee754_lgamma_r
-#define __ieee754_log           js___ieee754_log
-#define __ieee754_log10         js___ieee754_log10
-#define __ieee754_pow           js___ieee754_pow
-#define __ieee754_rem_pio2      js___ieee754_rem_pio2
-#define __ieee754_remainder     js___ieee754_remainder
-#define __ieee754_scalb         js___ieee754_scalb
-#define __ieee754_sinh          js___ieee754_sinh
-#define __ieee754_sqrt          js___ieee754_sqrt
-#define __ieee754_y0            js___ieee754_y0
-#define __ieee754_y1            js___ieee754_y1
-#define __ieee754_yn            js___ieee754_yn
-#define __kernel_cos            js___kernel_cos
-#define __kernel_rem_pio2       js___kernel_rem_pio2
-#define __kernel_sin            js___kernel_sin
-#define __kernel_standard       js___kernel_standard
-#define __kernel_tan            js___kernel_tan
-#define fd_acos                 js_fd_acos
-#define fd_acosh                js_fd_acosh
-#define fd_asin                 js_fd_asin
-#define fd_asinh                js_fd_asinh
-#define fd_atan                 js_fd_atan
-#define fd_atan2                js_fd_atan2
-#define fd_atanh                js_fd_atanh
-#define fd_cbrt                 js_fd_cbrt
-#define fd_ceil                 js_fd_ceil
-#define fd_copysign             js_fd_copysign
-#define fd_cos                  js_fd_cos
-#define fd_cosh                 js_fd_cosh
-#define fd_erf                  js_fd_erf
-#define fd_erfc                 js_fd_erfc
-#define fd_exp                  js_fd_exp
-#define fd_expm1                js_fd_expm1
-#define fd_fabs                 js_fd_fabs
-#define fd_finite               js_fd_finite
-#define fd_floor                js_fd_floor
-#define fd_fmod                 js_fd_fmod
-#define fd_frexp                js_fd_frexp
-#define fd_gamma                js_fd_gamma
-#define fd_hypot                js_fd_hypot
-#define fd_ilogb                js_fd_ilogb
-#define fd_isnan                js_fd_isnan
-#define fd_j0                   js_fd_j0
-#define fd_j1                   js_fd_j1
-#define fd_jn                   js_fd_jn
-#define fd_ldexp                js_fd_ldexp
-#define fd_lgamma               js_fd_lgamma
-#define fd_log                  js_fd_log
-#define fd_log10                js_fd_log10
-#define fd_log1p                js_fd_log1p
-#define fd_logb                 js_fd_logb
-#define fd_matherr              js_fd_matherr
-#define fd_modf                 js_fd_modf
-#define fd_nextafter            js_fd_nextafter
-#define fd_pow                  js_fd_pow
-#define fd_remainder            js_fd_remainder
-#define fd_rint                 js_fd_rint
-#define fd_scalb                js_fd_scalb
-#define fd_scalbn               js_fd_scalbn
-#define fd_sin                  js_fd_sin
-#define fd_sinh                 js_fd_sinh
-#define fd_sqrt                 js_fd_sqrt
-#define fd_tan                  js_fd_tan
-#define fd_tanh                 js_fd_tanh
-#define fd_y0                   js_fd_y0
-#define fd_y1                   js_fd_y1
-#define fd_yn                   js_fd_yn
-#define gamma_r                 js_gamma_r
-#define lgamma_r                js_lgamma_r
-#define significand             js_significand
-#endif
-
-/* Modified defines start here.. */
-#undef __LITTLE_ENDIAN
-
-#ifdef _WIN32
-#define huge myhuge
-#define __LITTLE_ENDIAN
-#endif
-
-#ifdef XP_OS2
-#define __LITTLE_ENDIAN
-#endif
-
-#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64))
-#define __LITTLE_ENDIAN
-#endif
-
-/* End here. The rest is the standard file. */
-
-#ifdef SOLARIS	/* special setup for Sun test regime */
-#if defined(i386) || defined(i486) || \
-	defined(intel) || defined(x86) || defined(i86pc)
-#define __LITTLE_ENDIAN
-#endif
-#endif
-
-typedef union {
-#ifdef __LITTLE_ENDIAN
-    struct { int lo, hi; } ints;
-#else
-    struct { int hi, lo; } ints;
-#endif
-    double d;
-} fd_twoints;
-
-#define __HI(x) x.ints.hi
-#define __LO(x) x.ints.lo
-
-#undef __P
-#ifdef __STDC__
-#define	__P(p)	p
-#else
-#define	__P(p)	()
-#endif
-
-/*
- * ANSI/POSIX
- */
-
-extern int signgam;
-
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
-
-enum fdversion {fdlibm_ieee = -1, fdlibm_svid, fdlibm_xopen, fdlibm_posix};
-
-#define _LIB_VERSION_TYPE enum fdversion
-#define _LIB_VERSION _fdlib_version  
-
-/* if global variable _LIB_VERSION is not desirable, one may 
- * change the following to be a constant by: 
- *	#define _LIB_VERSION_TYPE const enum version
- * In that case, after one initializes the value _LIB_VERSION (see
- * s_lib_version.c) during compile time, it cannot be modified
- * in the middle of a program
- */ 
-extern  _LIB_VERSION_TYPE  _LIB_VERSION;
-
-#define _IEEE_  fdlibm_ieee
-#define _SVID_  fdlibm_svid
-#define _XOPEN_ fdlibm_xopen
-#define _POSIX_ fdlibm_posix
-
-struct exception {
-	int type;
-	char *name;
-	double arg1;
-	double arg2;
-	double retval;
-};
-
-#define	HUGE		MAXFLOAT
-
-/* 
- * set X_TLOSS = pi*2**52, which is possibly defined in <values.h>
- * (one may replace the following line by "#include <values.h>")
- */
-
-#define X_TLOSS		1.41484755040568800000e+16 
-
-#define	DOMAIN		1
-#define	SING		2
-#define	OVERFLOW	3
-#define	UNDERFLOW	4
-#define	TLOSS		5
-#define	PLOSS		6
-
-/*
- * ANSI/POSIX
- */
-
-extern double fd_acos __P((double));
-extern double fd_asin __P((double));
-extern double fd_atan __P((double));
-extern double fd_atan2 __P((double, double));
-extern double fd_cos __P((double));
-extern double fd_sin __P((double));
-extern double fd_tan __P((double));
- 
-extern double fd_cosh __P((double));
-extern double fd_sinh __P((double));
-extern double fd_tanh __P((double));
-
-extern double fd_exp __P((double));
-extern double fd_frexp __P((double, int *));
-extern double fd_ldexp __P((double, int));
-extern double fd_log __P((double));
-extern double fd_log10 __P((double));
-extern double fd_modf __P((double, double *));
-
-extern double fd_pow __P((double, double));
-extern double fd_sqrt __P((double));
-
-extern double fd_ceil __P((double));
-extern double fd_fabs __P((double));
-extern double fd_floor __P((double));
-extern double fd_fmod __P((double, double));
-
-extern double fd_erf __P((double));
-extern double fd_erfc __P((double));
-extern double fd_gamma __P((double));
-extern double fd_hypot __P((double, double));
-extern int fd_isnan __P((double));
-extern int fd_finite __P((double));
-extern double fd_j0 __P((double));
-extern double fd_j1 __P((double));
-extern double fd_jn __P((int, double));
-extern double fd_lgamma __P((double));
-extern double fd_y0 __P((double));
-extern double fd_y1 __P((double));
-extern double fd_yn __P((int, double));
-
-extern double fd_acosh __P((double));
-extern double fd_asinh __P((double));
-extern double fd_atanh __P((double));
-extern double fd_cbrt __P((double));
-extern double fd_logb __P((double));
-extern double fd_nextafter __P((double, double));
-extern double fd_remainder __P((double, double));
-#ifdef _SCALB_INT
-extern double fd_scalb __P((double, int));
-#else
-extern double fd_scalb __P((double, double));
-#endif
-
-extern int fd_matherr __P((struct exception *));
-
-/*
- * IEEE Test Vector
- */
-extern double significand __P((double));
-
-/*
- * Functions callable from C, intended to support IEEE arithmetic.
- */
-extern double fd_copysign __P((double, double));
-extern int fd_ilogb __P((double));
-extern double fd_rint __P((double));
-extern double fd_scalbn __P((double, int));
-
-/*
- * BSD math library entry points
- */
-extern double fd_expm1 __P((double));
-extern double fd_log1p __P((double));
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-#ifdef _REENTRANT
-extern double gamma_r __P((double, int *));
-extern double lgamma_r __P((double, int *));
-#endif	/* _REENTRANT */
-
-/* ieee style elementary functions */
-extern double __ieee754_sqrt __P((double));			
-extern double __ieee754_acos __P((double));			
-extern double __ieee754_acosh __P((double));			
-extern double __ieee754_log __P((double));			
-extern double __ieee754_atanh __P((double));			
-extern double __ieee754_asin __P((double));			
-extern double __ieee754_atan2 __P((double,double));			
-extern double __ieee754_exp __P((double));
-extern double __ieee754_cosh __P((double));
-extern double __ieee754_fmod __P((double,double));
-extern double __ieee754_pow __P((double,double));
-extern double __ieee754_lgamma_r __P((double,int *));
-extern double __ieee754_gamma_r __P((double,int *));
-extern double __ieee754_lgamma __P((double));
-extern double __ieee754_gamma __P((double));
-extern double __ieee754_log10 __P((double));
-extern double __ieee754_sinh __P((double));
-extern double __ieee754_hypot __P((double,double));
-extern double __ieee754_j0 __P((double));
-extern double __ieee754_j1 __P((double));
-extern double __ieee754_y0 __P((double));
-extern double __ieee754_y1 __P((double));
-extern double __ieee754_jn __P((int,double));
-extern double __ieee754_yn __P((int,double));
-extern double __ieee754_remainder __P((double,double));
-extern int    __ieee754_rem_pio2 __P((double,double*));
-#ifdef _SCALB_INT
-extern double __ieee754_scalb __P((double,int));
-#else
-extern double __ieee754_scalb __P((double,double));
-#endif
-
-/* fdlibm kernel function */
-extern double __kernel_standard __P((double,double,int,int*));
-extern double __kernel_sin __P((double,double,int));
-extern double __kernel_cos __P((double,double));
-extern double __kernel_tan __P((double,double,int));
-extern int    __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*));
diff --git a/libs/js/src/fdlibm/k_cos.c b/libs/js/src/fdlibm/k_cos.c
deleted file mode 100644
index 1d18c80343..0000000000
--- a/libs/js/src/fdlibm/k_cos.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)k_cos.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __kernel_cos( x,  y )
- * kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x. 
- *
- * Algorithm
- *	1. Since cos(-x) = cos(x), we need only to consider positive x.
- *	2. if x < 2^-27 (hx<0x3e400000 0), return 1 with inexact if x!=0.
- *	3. cos(x) is approximated by a polynomial of degree 14 on
- *	   [0,pi/4]
- *		  	                 4            14
- *	   	cos(x) ~ 1 - x*x/2 + C1*x + ... + C6*x
- *	   where the remez error is
- *	
- * 	|              2     4     6     8     10    12     14 |     -58
- * 	|cos(x)-(1-.5*x +C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  )| <= 2
- * 	|    					               | 
- * 
- * 	               4     6     8     10    12     14 
- *	4. let r = C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  , then
- *	       cos(x) = 1 - x*x/2 + r
- *	   since cos(x+y) ~ cos(x) - sin(x)*y 
- *			  ~ cos(x) - x*y,
- *	   a correction term is necessary in cos(x) and hence
- *		cos(x+y) = 1 - (x*x/2 - (r - x*y))
- *	   For better accuracy when x > 0.3, let qx = |x|/4 with
- *	   the last 32 bits mask off, and if x > 0.78125, let qx = 0.28125.
- *	   Then
- *		cos(x+y) = (1-qx) - ((x*x/2-qx) - (r-x*y)).
- *	   Note that 1-qx and (x*x/2-qx) is EXACT here, and the
- *	   magnitude of the latter is at least a quarter of x*x/2,
- *	   thus, reducing the rounding error in the subtraction.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-C1  =  4.16666666666666019037e-02, /* 0x3FA55555, 0x5555554C */
-C2  = -1.38888888888741095749e-03, /* 0xBF56C16C, 0x16C15177 */
-C3  =  2.48015872894767294178e-05, /* 0x3EFA01A0, 0x19CB1590 */
-C4  = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */
-C5  =  2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */
-C6  = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */
-
-#ifdef __STDC__
-	double __kernel_cos(double x, double y)
-#else
-	double __kernel_cos(x, y)
-	double x,y;
-#endif
-{
-        fd_twoints u;
-        double qx = 0;
-	double a,hz,z,r;
-	int ix;
-        u.d = x;
-	ix = __HI(u)&0x7fffffff;	/* ix = |x|'s high word*/
-	if(ix<0x3e400000) {			/* if x < 2**27 */
-	    if(((int)x)==0) return one;		/* generate inexact */
-	}
-	z  = x*x;
-	r  = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))));
-	if(ix < 0x3FD33333) 			/* if |x| < 0.3 */ 
-	    return one - (0.5*z - (z*r - x*y));
-	else {
-	    if(ix > 0x3fe90000) {		/* x > 0.78125 */
-		qx = 0.28125;
-	    } else {
-                u.d = qx;
-	        __HI(u) = ix-0x00200000;	/* x/4 */
-	        __LO(u) = 0;
-                qx = u.d;
-	    }
-	    hz = 0.5*z-qx;
-	    a  = one-qx;
-	    return a - (hz - (z*r-x*y));
-	}
-}
diff --git a/libs/js/src/fdlibm/k_rem_pio2.c b/libs/js/src/fdlibm/k_rem_pio2.c
deleted file mode 100644
index d261e190af..0000000000
--- a/libs/js/src/fdlibm/k_rem_pio2.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)k_rem_pio2.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
- * double x[],y[]; int e0,nx,prec; int ipio2[];
- * 
- * __kernel_rem_pio2 return the last three digits of N with 
- *		y = x - N*pi/2
- * so that |y| < pi/2.
- *
- * The method is to compute the integer (mod 8) and fraction parts of 
- * (2/pi)*x without doing the full multiplication. In general we
- * skip the part of the product that are known to be a huge integer (
- * more accurately, = 0 mod 8 ). Thus the number of operations are
- * independent of the exponent of the input.
- *
- * (2/pi) is represented by an array of 24-bit integers in ipio2[].
- *
- * Input parameters:
- * 	x[]	The input value (must be positive) is broken into nx 
- *		pieces of 24-bit integers in double precision format.
- *		x[i] will be the i-th 24 bit of x. The scaled exponent 
- *		of x[0] is given in input parameter e0 (i.e., x[0]*2^e0 
- *		match x's up to 24 bits.
- *
- *		Example of breaking a double positive z into x[0]+x[1]+x[2]:
- *			e0 = ilogb(z)-23
- *			z  = scalbn(z,-e0)
- *		for i = 0,1,2
- *			x[i] = floor(z)
- *			z    = (z-x[i])*2**24
- *
- *
- *	y[]	ouput result in an array of double precision numbers.
- *		The dimension of y[] is:
- *			24-bit  precision	1
- *			53-bit  precision	2
- *			64-bit  precision	2
- *			113-bit precision	3
- *		The actual value is the sum of them. Thus for 113-bit
- *		precison, one may have to do something like:
- *
- *		long double t,w,r_head, r_tail;
- *		t = (long double)y[2] + (long double)y[1];
- *		w = (long double)y[0];
- *		r_head = t+w;
- *		r_tail = w - (r_head - t);
- *
- *	e0	The exponent of x[0]
- *
- *	nx	dimension of x[]
- *
- *  	prec	an integer indicating the precision:
- *			0	24  bits (single)
- *			1	53  bits (double)
- *			2	64  bits (extended)
- *			3	113 bits (quad)
- *
- *	ipio2[]
- *		integer array, contains the (24*i)-th to (24*i+23)-th 
- *		bit of 2/pi after binary point. The corresponding 
- *		floating value is
- *
- *			ipio2[i] * 2^(-24(i+1)).
- *
- * External function:
- *	double scalbn(), floor();
- *
- *
- * Here is the description of some local variables:
- *
- * 	jk	jk+1 is the initial number of terms of ipio2[] needed
- *		in the computation. The recommended value is 2,3,4,
- *		6 for single, double, extended,and quad.
- *
- * 	jz	local integer variable indicating the number of 
- *		terms of ipio2[] used. 
- *
- *	jx	nx - 1
- *
- *	jv	index for pointing to the suitable ipio2[] for the
- *		computation. In general, we want
- *			( 2^e0*x[0] * ipio2[jv-1]*2^(-24jv) )/8
- *		is an integer. Thus
- *			e0-3-24*jv >= 0 or (e0-3)/24 >= jv
- *		Hence jv = max(0,(e0-3)/24).
- *
- *	jp	jp+1 is the number of terms in PIo2[] needed, jp = jk.
- *
- * 	q[]	double array with integral value, representing the
- *		24-bits chunk of the product of x and 2/pi.
- *
- *	q0	the corresponding exponent of q[0]. Note that the
- *		exponent for q[i] would be q0-24*i.
- *
- *	PIo2[]	double precision array, obtained by cutting pi/2
- *		into 24 bits chunks. 
- *
- *	f[]	ipio2[] in floating point 
- *
- *	iq[]	integer array by breaking up q[] in 24-bits chunk.
- *
- *	fq[]	final product of x*(2/pi) in fq[0],..,fq[jk]
- *
- *	ih	integer. If >0 it indicates q[] is >= 0.5, hence
- *		it also indicates the *sign* of the result.
- *
- */
-
-
-/*
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const int init_jk[] = {2,3,4,6}; /* initial value for jk */
-#else
-static int init_jk[] = {2,3,4,6}; 
-#endif
-
-#ifdef __STDC__
-static const double PIo2[] = {
-#else
-static double PIo2[] = {
-#endif
-  1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */
-  7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */
-  5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */
-  3.28200341580791294123e-22, /* 0x3B78CC51, 0x60000000 */
-  1.27065575308067607349e-29, /* 0x39F01B83, 0x80000000 */
-  1.22933308981111328932e-36, /* 0x387A2520, 0x40000000 */
-  2.73370053816464559624e-44, /* 0x36E38222, 0x80000000 */
-  2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */
-};
-
-#ifdef __STDC__
-static const double			
-#else
-static double			
-#endif
-zero   = 0.0,
-one    = 1.0,
-two24   =  1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
-twon24  =  5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */
-
-#ifdef __STDC__
-	int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int *ipio2) 
-#else
-	int __kernel_rem_pio2(x,y,e0,nx,prec,ipio2) 	
-	double x[], y[]; int e0,nx,prec; int ipio2[];
-#endif
-{
-	int jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
-	double z,fw,f[20],fq[20],q[20];
-
-    /* initialize jk*/
-	jk = init_jk[prec];
-	jp = jk;
-
-    /* determine jx,jv,q0, note that 3>q0 */
-	jx =  nx-1;
-	jv = (e0-3)/24; if(jv<0) jv=0;
-	q0 =  e0-24*(jv+1);
-
-    /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */
-	j = jv-jx; m = jx+jk;
-	for(i=0;i<=m;i++,j++) f[i] = (j<0)? zero : (double) ipio2[j];
-
-    /* compute q[0],q[1],...q[jk] */
-	for (i=0;i<=jk;i++) {
-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-	}
-
-	jz = jk;
-recompute:
-    /* distill q[] into iq[] reversingly */
-	for(i=0,j=jz,z=q[jz];j>0;i++,j--) {
-	    fw    =  (double)((int)(twon24* z));
-	    iq[i] =  (int)(z-two24*fw);
-	    z     =  q[j-1]+fw;
-	}
-
-    /* compute n */
-	z  = fd_scalbn(z,q0);		/* actual value of z */
-	z -= 8.0*fd_floor(z*0.125);		/* trim off integer >= 8 */
-	n  = (int) z;
-	z -= (double)n;
-	ih = 0;
-	if(q0>0) {	/* need iq[jz-1] to determine n */
-	    i  = (iq[jz-1]>>(24-q0)); n += i;
-	    iq[jz-1] -= i<<(24-q0);
-	    ih = iq[jz-1]>>(23-q0);
-	} 
-	else if(q0==0) ih = iq[jz-1]>>23;
-	else if(z>=0.5) ih=2;
-
-	if(ih>0) {	/* q > 0.5 */
-	    n += 1; carry = 0;
-	    for(i=0;i<jz ;i++) {	/* compute 1-q */
-		j = iq[i];
-		if(carry==0) {
-		    if(j!=0) {
-			carry = 1; iq[i] = 0x1000000- j;
-		    }
-		} else  iq[i] = 0xffffff - j;
-	    }
-	    if(q0>0) {		/* rare case: chance is 1 in 12 */
-	        switch(q0) {
-	        case 1:
-	    	   iq[jz-1] &= 0x7fffff; break;
-	    	case 2:
-	    	   iq[jz-1] &= 0x3fffff; break;
-	        }
-	    }
-	    if(ih==2) {
-		z = one - z;
-		if(carry!=0) z -= fd_scalbn(one,q0);
-	    }
-	}
-
-    /* check if recomputation is needed */
-	if(z==zero) {
-	    j = 0;
-	    for (i=jz-1;i>=jk;i--) j |= iq[i];
-	    if(j==0) { /* need recomputation */
-		for(k=1;iq[jk-k]==0;k++);   /* k = no. of terms needed */
-
-		for(i=jz+1;i<=jz+k;i++) {   /* add q[jz+1] to q[jz+k] */
-		    f[jx+i] = (double) ipio2[jv+i];
-		    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];
-		    q[i] = fw;
-		}
-		jz += k;
-		goto recompute;
-	    }
-	}
-
-    /* chop off zero terms */
-	if(z==0.0) {
-	    jz -= 1; q0 -= 24;
-	    while(iq[jz]==0) { jz--; q0-=24;}
-	} else { /* break z into 24-bit if necessary */
-	    z = fd_scalbn(z,-q0);
-	    if(z>=two24) { 
-		fw = (double)((int)(twon24*z));
-		iq[jz] = (int)(z-two24*fw);
-		jz += 1; q0 += 24;
-		iq[jz] = (int) fw;
-	    } else iq[jz] = (int) z ;
-	}
-
-    /* convert integer "bit" chunk to floating-point value */
-	fw = fd_scalbn(one,q0);
-	for(i=jz;i>=0;i--) {
-	    q[i] = fw*(double)iq[i]; fw*=twon24;
-	}
-
-    /* compute PIo2[0,...,jp]*q[jz,...,0] */
-	for(i=jz;i>=0;i--) {
-	    for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k];
-	    fq[jz-i] = fw;
-	}
-
-    /* compress fq[] into y[] */
-	switch(prec) {
-	    case 0:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i];
-		y[0] = (ih==0)? fw: -fw; 
-		break;
-	    case 1:
-	    case 2:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i]; 
-		y[0] = (ih==0)? fw: -fw; 
-		fw = fq[0]-fw;
-		for (i=1;i<=jz;i++) fw += fq[i];
-		y[1] = (ih==0)? fw: -fw; 
-		break;
-	    case 3:	/* painful */
-		for (i=jz;i>0;i--) {
-		    fw      = fq[i-1]+fq[i]; 
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (i=jz;i>1;i--) {
-		    fw      = fq[i-1]+fq[i]; 
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (fw=0.0,i=jz;i>=2;i--) fw += fq[i]; 
-		if(ih==0) {
-		    y[0] =  fq[0]; y[1] =  fq[1]; y[2] =  fw;
-		} else {
-		    y[0] = -fq[0]; y[1] = -fq[1]; y[2] = -fw;
-		}
-	}
-	return n&7;
-}
diff --git a/libs/js/src/fdlibm/k_sin.c b/libs/js/src/fdlibm/k_sin.c
deleted file mode 100644
index d2bdabd6da..0000000000
--- a/libs/js/src/fdlibm/k_sin.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)k_sin.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __kernel_sin( x, y, iy)
- * kernel sin function on [-pi/4, pi/4], pi/4 ~ 0.7854
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x.
- * Input iy indicates whether y is 0. (if iy=0, y assume to be 0). 
- *
- * Algorithm
- *	1. Since sin(-x) = -sin(x), we need only to consider positive x. 
- *	2. if x < 2^-27 (hx<0x3e400000 0), return x with inexact if x!=0.
- *	3. sin(x) is approximated by a polynomial of degree 13 on
- *	   [0,pi/4]
- *		  	         3            13
- *	   	sin(x) ~ x + S1*x + ... + S6*x
- *	   where
- *	
- * 	|sin(x)         2     4     6     8     10     12  |     -58
- * 	|----- - (1+S1*x +S2*x +S3*x +S4*x +S5*x  +S6*x   )| <= 2
- * 	|  x 					           | 
- * 
- *	4. sin(x+y) = sin(x) + sin'(x')*y
- *		    ~ sin(x) + (1-x*x/2)*y
- *	   For better accuracy, let 
- *		     3      2      2      2      2
- *		r = x *(S2+x *(S3+x *(S4+x *(S5+x *S6))))
- *	   then                   3    2
- *		sin(x) = x + (S1*x + (x *(r-y/2)+y))
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-half =  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-S1  = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */
-S2  =  8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */
-S3  = -1.98412698298579493134e-04, /* 0xBF2A01A0, 0x19C161D5 */
-S4  =  2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */
-S5  = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */
-S6  =  1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */
-
-#ifdef __STDC__
-	double __kernel_sin(double x, double y, int iy)
-#else
-	double __kernel_sin(x, y, iy)
-	double x,y; int iy;		/* iy=0 if y is zero */
-#endif
-{
-        fd_twoints u;
-	double z,r,v;
-	int ix;
-        u.d = x;
-	ix = __HI(u)&0x7fffffff;	/* high word of x */
-	if(ix<0x3e400000)			/* |x| < 2**-27 */
-	   {if((int)x==0) return x;}		/* generate inexact */
-	z	=  x*x;
-	v	=  z*x;
-	r	=  S2+z*(S3+z*(S4+z*(S5+z*S6)));
-	if(iy==0) return x+v*(S1+z*r);
-	else      return x-((z*(half*y-v*r)-y)-v*S1);
-}
diff --git a/libs/js/src/fdlibm/k_standard.c b/libs/js/src/fdlibm/k_standard.c
deleted file mode 100644
index 720109c9d6..0000000000
--- a/libs/js/src/fdlibm/k_standard.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)k_standard.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-#include "fdlibm.h"
-
-/* XXX ugly hack to get msvc to link without error. */
-#if _LIB_VERSION == _IEEE_ && !(defined(DARWIN) || defined(XP_MACOSX))
-   int errno;
-#  define EDOM 0
-#  define ERANGE 0
-#else
-#  include <errno.h>
-#endif
-
-
-#ifndef _USE_WRITE
-#include <stdio.h>			/* fputs(), stderr */
-#define	WRITE2(u,v)	fputs(u, stderr)
-#else	/* !defined(_USE_WRITE) */
-#include <unistd.h>			/* write */
-#define	WRITE2(u,v)	write(2, u, v)
-#undef fflush
-#endif	/* !defined(_USE_WRITE) */
-
-static double zero = 0.0;	/* used as const */
-
-/* 
- * Standard conformance (non-IEEE) on exception cases.
- * Mapping:
- *	1 -- acos(|x|>1)
- *	2 -- asin(|x|>1)
- *	3 -- atan2(+-0,+-0)
- *	4 -- hypot overflow
- *	5 -- cosh overflow
- *	6 -- exp overflow
- *	7 -- exp underflow
- *	8 -- y0(0)
- *	9 -- y0(-ve)
- *	10-- y1(0)
- *	11-- y1(-ve)
- *	12-- yn(0)
- *	13-- yn(-ve)
- *	14-- lgamma(finite) overflow
- *	15-- lgamma(-integer)
- *	16-- log(0)
- *	17-- log(x<0)
- *	18-- log10(0)
- *	19-- log10(x<0)
- *	20-- pow(0.0,0.0)
- *	21-- pow(x,y) overflow
- *	22-- pow(x,y) underflow
- *	23-- pow(0,negative) 
- *	24-- pow(neg,non-integral)
- *	25-- sinh(finite) overflow
- *	26-- sqrt(negative)
- *      27-- fmod(x,0)
- *      28-- remainder(x,0)
- *	29-- acosh(x<1)
- *	30-- atanh(|x|>1)
- *	31-- atanh(|x|=1)
- *	32-- scalb overflow
- *	33-- scalb underflow
- *	34-- j0(|x|>X_TLOSS)
- *	35-- y0(x>X_TLOSS)
- *	36-- j1(|x|>X_TLOSS)
- *	37-- y1(x>X_TLOSS)
- *	38-- jn(|x|>X_TLOSS, n)
- *	39-- yn(x>X_TLOSS, n)
- *	40-- gamma(finite) overflow
- *	41-- gamma(-integer)
- *	42-- pow(NaN,0.0)
- */
-
-
-#ifdef __STDC__
-	double __kernel_standard(double x, double y, int type, int *err)
-#else
-	double __kernel_standard(x,y,type, err)
-     double x,y; int type;int *err;
-#endif
-{
-	struct exception exc;
-#ifndef HUGE_VAL	/* this is the only routine that uses HUGE_VAL */ 
-#define HUGE_VAL inf
-	double inf = 0.0;
-        fd_twoints u;
-
-        u.d = inf;
-	__HI(u) = 0x7ff00000;	/* set inf to infinite */
-        inf = u.d;
-#endif
-
-    *err = 0;
-
-#ifdef _USE_WRITE
-	(void) fflush(stdout);
-#endif
-	exc.arg1 = x;
-	exc.arg2 = y;
-	switch(type) {
-	    case 1:
-		/* acos(|x|>1) */
-		exc.type = DOMAIN;
-		exc.name = "acos";
-		exc.retval = zero;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-		    (void) WRITE2("acos: DOMAIN error\n", 19);
-		  }
-		  *err = EDOM;
-		}
-		break;
-	    case 2:
-		/* asin(|x|>1) */
-		exc.type = DOMAIN;
-		exc.name = "asin";
-		exc.retval = zero;
-		if(_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-		    	(void) WRITE2("asin: DOMAIN error\n", 19);
-		  }
-		  *err = EDOM;
-		}
-		break;
-	    case 3:
-		/* atan2(+-0,+-0) */
-		exc.arg1 = y;
-		exc.arg2 = x;
-		exc.type = DOMAIN;
-		exc.name = "atan2";
-		exc.retval = zero;
-		if(_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-			(void) WRITE2("atan2: DOMAIN error\n", 20);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 4:
-		/* hypot(finite,finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "hypot";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 5:
-		/* cosh(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "cosh";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 6:
-		/* exp(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "exp";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 7:
-		/* exp(finite) underflow */
-		exc.type = UNDERFLOW;
-		exc.name = "exp";
-		exc.retval = zero;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 8:
-		/* y0(0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = "y0";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y0: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 9:
-		/* y0(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = "y0";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y0: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 10:
-		/* y1(0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = "y1";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y1: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 11:
-		/* y1(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = "y1";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y1: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 12:
-		/* yn(n,0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = "yn";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("yn: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 13:
-		/* yn(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = "yn";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("yn: DOMAIN error\n", 17);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 14:
-		/* lgamma(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "lgamma";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-                if (_LIB_VERSION == _POSIX_)
-			*err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        *err = ERANGE;
-		}
-		break;
-	    case 15:
-		/* lgamma(-integer) or lgamma(0) */
-		exc.type = SING;
-		exc.name = "lgamma";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("lgamma: SING error\n", 19);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 16:
-		/* log(0) */
-		exc.type = SING;
-		exc.name = "log";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log: SING error\n", 16);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 17:
-		/* log(x<0) */
-		exc.type = DOMAIN;
-		exc.name = "log";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log: DOMAIN error\n", 18);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 18:
-		/* log10(0) */
-		exc.type = SING;
-		exc.name = "log10";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log10: SING error\n", 18);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 19:
-		/* log10(x<0) */
-		exc.type = DOMAIN;
-		exc.name = "log10";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log10: DOMAIN error\n", 20);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 20:
-		/* pow(0.0,0.0) */
-		/* error only if _LIB_VERSION == _SVID_ */
-		exc.type = DOMAIN;
-		exc.name = "pow";
-		exc.retval = zero;
-		if (_LIB_VERSION != _SVID_) exc.retval = 1.0;
-		else if (!fd_matherr(&exc)) {
-			(void) WRITE2("pow(0,0): DOMAIN error\n", 23);
-			*err = EDOM;
-		}
-		break;
-	    case 21:
-		/* pow(x,y) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "pow";
-		if (_LIB_VERSION == _SVID_) {
-		  exc.retval = HUGE;
-		  y *= 0.5;
-		  if(x<zero&&fd_rint(y)!=y) exc.retval = -HUGE;
-		} else {
-		  exc.retval = HUGE_VAL;
-		  y *= 0.5;
-		  if(x<zero&&fd_rint(y)!=y) exc.retval = -HUGE_VAL;
-		}
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 22:
-		/* pow(x,y) underflow */
-		exc.type = UNDERFLOW;
-		exc.name = "pow";
-		exc.retval =  zero;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 23:
-		/* 0**neg */
-		exc.type = DOMAIN;
-		exc.name = "pow";
-		if (_LIB_VERSION == _SVID_) 
-		  exc.retval = zero;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("pow(0,neg): DOMAIN error\n", 25);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 24:
-		/* neg**non-integral */
-		exc.type = DOMAIN;
-		exc.name = "pow";
-		if (_LIB_VERSION == _SVID_) 
-		    exc.retval = zero;
-		else 
-		    exc.retval = zero/zero;	/* X/Open allow NaN */
-		if (_LIB_VERSION == _POSIX_) 
-		   *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("neg**non-integral: DOMAIN error\n", 32);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 25:
-		/* sinh(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "sinh";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = ( (x>zero) ? HUGE : -HUGE);
-		else
-		  exc.retval = ( (x>zero) ? HUGE_VAL : -HUGE_VAL);
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 26:
-		/* sqrt(x<0) */
-		exc.type = DOMAIN;
-		exc.name = "sqrt";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = zero;
-		else
-		  exc.retval = zero/zero;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("sqrt: DOMAIN error\n", 19);
-		      }
-		  *err = EDOM;
-		}
-		break;
-            case 27:
-                /* fmod(x,0) */
-                exc.type = DOMAIN;
-                exc.name = "fmod";
-                if (_LIB_VERSION == _SVID_)
-                    exc.retval = x;
-		else
-		    exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  *err = EDOM;
-                else if (!fd_matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("fmod:  DOMAIN error\n", 20);
-                  }
-                  *err = EDOM;
-                }
-                break;
-            case 28:
-                /* remainder(x,0) */
-                exc.type = DOMAIN;
-                exc.name = "remainder";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  *err = EDOM;
-                else if (!fd_matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("remainder: DOMAIN error\n", 24);
-                  }
-                  *err = EDOM;
-                }
-                break;
-            case 29:
-                /* acosh(x<1) */
-                exc.type = DOMAIN;
-                exc.name = "acosh";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  *err = EDOM;
-                else if (!fd_matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("acosh: DOMAIN error\n", 20);
-                  }
-                  *err = EDOM;
-                }
-                break;
-            case 30:
-                /* atanh(|x|>1) */
-                exc.type = DOMAIN;
-                exc.name = "atanh";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  *err = EDOM;
-                else if (!fd_matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("atanh: DOMAIN error\n", 20);
-                  }
-                  *err = EDOM;
-                }
-                break;
-            case 31:
-                /* atanh(|x|=1) */
-                exc.type = SING;
-                exc.name = "atanh";
-		exc.retval = x/zero;	/* sign(x)*inf */
-                if (_LIB_VERSION == _POSIX_)
-                  *err = EDOM;
-                else if (!fd_matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("atanh: SING error\n", 18);
-                  }
-                  *err = EDOM;
-                }
-                break;
-	    case 32:
-		/* scalb overflow; SVID also returns +-HUGE_VAL */
-		exc.type = OVERFLOW;
-		exc.name = "scalb";
-		exc.retval = x > zero ? HUGE_VAL : -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 33:
-		/* scalb underflow */
-		exc.type = UNDERFLOW;
-		exc.name = "scalb";
-		exc.retval = fd_copysign(zero,x);
-		if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-		else if (!fd_matherr(&exc)) {
-			*err = ERANGE;
-		}
-		break;
-	    case 34:
-		/* j0(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "j0";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 35:
-		/* y0(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "y0";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 36:
-		/* j1(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "j1";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 37:
-		/* y1(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "y1";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 38:
-		/* jn(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "jn";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 39:
-		/* yn(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = "yn";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        *err = ERANGE;
-                }        
-		break;
-	    case 40:
-		/* gamma(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = "gamma";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-                if (_LIB_VERSION == _POSIX_)
-		  *err = ERANGE;
-                else if (!fd_matherr(&exc)) {
-                  *err = ERANGE;
-                }
-		break;
-	    case 41:
-		/* gamma(-integer) or gamma(0) */
-		exc.type = SING;
-		exc.name = "gamma";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  *err = EDOM;
-		else if (!fd_matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("gamma: SING error\n", 18);
-		      }
-		  *err = EDOM;
-		}
-		break;
-	    case 42:
-		/* pow(NaN,0.0) */
-		/* error only if _LIB_VERSION == _SVID_ & _XOPEN_ */
-		exc.type = DOMAIN;
-		exc.name = "pow";
-		exc.retval = x;
-		if (_LIB_VERSION == _IEEE_ ||
-		    _LIB_VERSION == _POSIX_) exc.retval = 1.0;
-		else if (!fd_matherr(&exc)) {
-			*err = EDOM;
-		}
-		break;
-	}
-	return exc.retval; 
-}
diff --git a/libs/js/src/fdlibm/k_tan.c b/libs/js/src/fdlibm/k_tan.c
deleted file mode 100644
index 1e7681b888..0000000000
--- a/libs/js/src/fdlibm/k_tan.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)k_tan.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* __kernel_tan( x, y, k )
- * kernel tan function on [-pi/4, pi/4], pi/4 ~ 0.7854
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x.
- * Input k indicates whether tan (if k=1) or 
- * -1/tan (if k= -1) is returned.
- *
- * Algorithm
- *	1. Since tan(-x) = -tan(x), we need only to consider positive x. 
- *	2. if x < 2^-28 (hx<0x3e300000 0), return x with inexact if x!=0.
- *	3. tan(x) is approximated by a odd polynomial of degree 27 on
- *	   [0,0.67434]
- *		  	         3             27
- *	   	tan(x) ~ x + T1*x + ... + T13*x
- *	   where
- *	
- * 	        |tan(x)         2     4            26   |     -59.2
- * 	        |----- - (1+T1*x +T2*x +.... +T13*x    )| <= 2
- * 	        |  x 					| 
- * 
- *	   Note: tan(x+y) = tan(x) + tan'(x)*y
- *		          ~ tan(x) + (1+x*x)*y
- *	   Therefore, for better accuracy in computing tan(x+y), let 
- *		     3      2      2       2       2
- *		r = x *(T2+x *(T3+x *(...+x *(T12+x *T13))))
- *	   then
- *		 		    3    2
- *		tan(x+y) = x + (T1*x + (x *(r+y)+y))
- *
- *      4. For x in [0.67434,pi/4],  let y = pi/4 - x, then
- *		tan(x) = tan(pi/4-y) = (1-tan(y))/(1+tan(y))
- *		       = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y)))
- */
-
-#include "fdlibm.h"
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one   =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-pio4  =  7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */
-pio4lo=  3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */
-T[] =  {
-  3.33333333333334091986e-01, /* 0x3FD55555, 0x55555563 */
-  1.33333333333201242699e-01, /* 0x3FC11111, 0x1110FE7A */
-  5.39682539762260521377e-02, /* 0x3FABA1BA, 0x1BB341FE */
-  2.18694882948595424599e-02, /* 0x3F9664F4, 0x8406D637 */
-  8.86323982359930005737e-03, /* 0x3F8226E3, 0xE96E8493 */
-  3.59207910759131235356e-03, /* 0x3F6D6D22, 0xC9560328 */
-  1.45620945432529025516e-03, /* 0x3F57DBC8, 0xFEE08315 */
-  5.88041240820264096874e-04, /* 0x3F4344D8, 0xF2F26501 */
-  2.46463134818469906812e-04, /* 0x3F3026F7, 0x1A8D1068 */
-  7.81794442939557092300e-05, /* 0x3F147E88, 0xA03792A6 */
-  7.14072491382608190305e-05, /* 0x3F12B80F, 0x32F0A7E9 */
- -1.85586374855275456654e-05, /* 0xBEF375CB, 0xDB605373 */
-  2.59073051863633712884e-05, /* 0x3EFB2A70, 0x74BF7AD4 */
-};
-
-#ifdef __STDC__
-	double __kernel_tan(double x, double y, int iy)
-#else
-	double __kernel_tan(x, y, iy)
-	double x,y; int iy;
-#endif
-{
-        fd_twoints u;
-	double z,r,v,w,s;
-	int ix,hx;
-        u.d = x;
-	hx = __HI(u);	/* high word of x */
-	ix = hx&0x7fffffff;	/* high word of |x| */
-	if(ix<0x3e300000)			/* x < 2**-28 */
-	    {if((int)x==0) {			/* generate inexact */
-                u.d =x;
-		if(((ix|__LO(u))|(iy+1))==0) return one/fd_fabs(x);
-		else return (iy==1)? x: -one/x;
-	    }
-	    }
-	if(ix>=0x3FE59428) { 			/* |x|>=0.6744 */
-	    if(hx<0) {x = -x; y = -y;}
-	    z = pio4-x;
-	    w = pio4lo-y;
-	    x = z+w; y = 0.0;
-	}
-	z	=  x*x;
-	w 	=  z*z;
-    /* Break x^5*(T[1]+x^2*T[2]+...) into
-     *	  x^5(T[1]+x^4*T[3]+...+x^20*T[11]) +
-     *	  x^5(x^2*(T[2]+x^4*T[4]+...+x^22*[T12]))
-     */
-	r = T[1]+w*(T[3]+w*(T[5]+w*(T[7]+w*(T[9]+w*T[11]))));
-	v = z*(T[2]+w*(T[4]+w*(T[6]+w*(T[8]+w*(T[10]+w*T[12])))));
-	s = z*x;
-	r = y + z*(s*(r+v)+y);
-	r += T[0]*s;
-	w = x+r;
-	if(ix>=0x3FE59428) {
-	    v = (double)iy;
-	    return (double)(1-((hx>>30)&2))*(v-2.0*(x-(w*w/(w+v)-r)));
-	}
-	if(iy==1) return w;
-	else {		/* if allow error up to 2 ulp, 
-			   simply return -1.0/(x+r) here */
-     /*  compute -1.0/(x+r) accurately */
-	    double a,t;
-	    z  = w;
-            u.d = z;
-	    __LO(u) = 0;
-            z = u.d;
-	    v  = r-(z - x); 	/* z+v = r+x */
-	    t = a  = -1.0/w;	/* a = -1.0/w */
-            u.d = t;
-	    __LO(u) = 0;
-            t = u.d;
-	    s  = 1.0+t*z;
-	    return t+a*(s+t*v);
-	}
-}
diff --git a/libs/js/src/fdlibm/s_asinh.c b/libs/js/src/fdlibm/s_asinh.c
deleted file mode 100644
index fdf70a91cf..0000000000
--- a/libs/js/src/fdlibm/s_asinh.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_asinh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* asinh(x)
- * Method :
- *	Based on 
- *		asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ]
- *	we have
- *	asinh(x) := x  if  1+x*x=1,
- *		 := sign(x)*(log(x)+ln2)) for large |x|, else
- *		 := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else
- *		 := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))  
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double 
-#else
-static double 
-#endif
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-ln2 =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
-really_big=  1.00000000000000000000e+300; 
-
-#ifdef __STDC__
-	double fd_asinh(double x)
-#else
-	double fd_asinh(x)
-	double x;
-#endif
-{	
-        fd_twoints u;
-	double t,w;
-	int hx,ix;
-        u.d = x;
-	hx = __HI(u);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return x+x;	/* x is inf or NaN */
-	if(ix< 0x3e300000) {	/* |x|<2**-28 */
-	    if(really_big+x>one) return x;	/* return x inexact except 0 */
-	} 
-	if(ix>0x41b00000) {	/* |x| > 2**28 */
-	    w = __ieee754_log(fd_fabs(x))+ln2;
-	} else if (ix>0x40000000) {	/* 2**28 > |x| > 2.0 */
-	    t = fd_fabs(x);
-	    w = __ieee754_log(2.0*t+one/(fd_sqrt(x*x+one)+t));
-	} else {		/* 2.0 > |x| > 2**-28 */
-	    t = x*x;
-	    w =fd_log1p(fd_fabs(x)+t/(one+fd_sqrt(one+t)));
-	}
-	if(hx>0) return w; else return -w;
-}
diff --git a/libs/js/src/fdlibm/s_atan.c b/libs/js/src/fdlibm/s_atan.c
deleted file mode 100644
index 99a00c6864..0000000000
--- a/libs/js/src/fdlibm/s_atan.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_atan.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* atan(x)
- * Method
- *   1. Reduce x to positive by atan(x) = -atan(-x).
- *   2. According to the integer k=4t+0.25 chopped, t=x, the argument
- *      is further reduced to one of the following intervals and the
- *      arctangent of t is evaluated by the corresponding formula:
- *
- *      [0,7/16]      atan(x) = t-t^3*(a1+t^2*(a2+...(a10+t^2*a11)...)
- *      [7/16,11/16]  atan(x) = atan(1/2) + atan( (t-0.5)/(1+t/2) )
- *      [11/16.19/16] atan(x) = atan( 1 ) + atan( (t-1)/(1+t) )
- *      [19/16,39/16] atan(x) = atan(3/2) + atan( (t-1.5)/(1+1.5t) )
- *      [39/16,INF]   atan(x) = atan(INF) + atan( -1/t )
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double atanhi[] = {
-#else
-static double atanhi[] = {
-#endif
-  4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */
-  7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */
-  9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */
-  1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */
-};
-
-#ifdef __STDC__
-static const double atanlo[] = {
-#else
-static double atanlo[] = {
-#endif
-  2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */
-  3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */
-  1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */
-  6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */
-};
-
-#ifdef __STDC__
-static const double aT[] = {
-#else
-static double aT[] = {
-#endif
-  3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */
- -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */
-  1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */
- -1.11111104054623557880e-01, /* 0xBFBC71C6, 0xFE231671 */
-  9.09088713343650656196e-02, /* 0x3FB745CD, 0xC54C206E */
- -7.69187620504482999495e-02, /* 0xBFB3B0F2, 0xAF749A6D */
-  6.66107313738753120669e-02, /* 0x3FB10D66, 0xA0D03D51 */
- -5.83357013379057348645e-02, /* 0xBFADDE2D, 0x52DEFD9A */
-  4.97687799461593236017e-02, /* 0x3FA97B4B, 0x24760DEB */
- -3.65315727442169155270e-02, /* 0xBFA2B444, 0x2C6A6C2F */
-  1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */
-};
-
-#ifdef __STDC__
-	static const double 
-#else
-	static double 
-#endif
-one   = 1.0,
-really_big   = 1.0e300;
-
-#ifdef __STDC__
-	double fd_atan(double x)
-#else
-	double fd_atan(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double w,s1,s2,z;
-	int ix,hx,id;
-
-        u.d = x;
-	hx = __HI(u);
-	ix = hx&0x7fffffff;
-	if(ix>=0x44100000) {	/* if |x| >= 2^66 */
-            u.d = x;
-	    if(ix>0x7ff00000||
-		(ix==0x7ff00000&&(__LO(u)!=0)))
-		return x+x;		/* NaN */
-	    if(hx>0) return  atanhi[3]+atanlo[3];
-	    else     return -atanhi[3]-atanlo[3];
-	} if (ix < 0x3fdc0000) {	/* |x| < 0.4375 */
-	    if (ix < 0x3e200000) {	/* |x| < 2^-29 */
-		if(really_big+x>one) return x;	/* raise inexact */
-	    }
-	    id = -1;
-	} else {
-	x = fd_fabs(x);
-	if (ix < 0x3ff30000) {		/* |x| < 1.1875 */
-	    if (ix < 0x3fe60000) {	/* 7/16 <=|x|<11/16 */
-		id = 0; x = (2.0*x-one)/(2.0+x); 
-	    } else {			/* 11/16<=|x|< 19/16 */
-		id = 1; x  = (x-one)/(x+one); 
-	    }
-	} else {
-	    if (ix < 0x40038000) {	/* |x| < 2.4375 */
-		id = 2; x  = (x-1.5)/(one+1.5*x);
-	    } else {			/* 2.4375 <= |x| < 2^66 */
-		id = 3; x  = -1.0/x;
-	    }
-	}}
-    /* end of argument reduction */
-	z = x*x;
-	w = z*z;
-    /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */
-	s1 = z*(aT[0]+w*(aT[2]+w*(aT[4]+w*(aT[6]+w*(aT[8]+w*aT[10])))));
-	s2 = w*(aT[1]+w*(aT[3]+w*(aT[5]+w*(aT[7]+w*aT[9]))));
-	if (id<0) return x - x*(s1+s2);
-	else {
-	    z = atanhi[id] - ((x*(s1+s2) - atanlo[id]) - x);
-	    return (hx<0)? -z:z;
-	}
-}
diff --git a/libs/js/src/fdlibm/s_cbrt.c b/libs/js/src/fdlibm/s_cbrt.c
deleted file mode 100644
index 4aed19b1bb..0000000000
--- a/libs/js/src/fdlibm/s_cbrt.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_cbrt.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-#include "fdlibm.h"
-
-/* cbrt(x)
- * Return cube root of x
- */
-#ifdef __STDC__
-static const unsigned 
-#else
-static unsigned 
-#endif
-	B1 = 715094163, /* B1 = (682-0.03306235651)*2**20 */
-	B2 = 696219795; /* B2 = (664-0.03306235651)*2**20 */
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-C =  5.42857142857142815906e-01, /* 19/35     = 0x3FE15F15, 0xF15F15F1 */
-D = -7.05306122448979611050e-01, /* -864/1225 = 0xBFE691DE, 0x2532C834 */
-E =  1.41428571428571436819e+00, /* 99/70     = 0x3FF6A0EA, 0x0EA0EA0F */
-F =  1.60714285714285720630e+00, /* 45/28     = 0x3FF9B6DB, 0x6DB6DB6E */
-G =  3.57142857142857150787e-01; /* 5/14      = 0x3FD6DB6D, 0xB6DB6DB7 */
-
-#ifdef __STDC__
-	double fd_cbrt(double x) 
-#else
-	double fd_cbrt(x) 
-	double x;
-#endif
-{
-        fd_twoints u;
-	int	hx;
-	double r,s,t=0.0,w;
-	unsigned sign;
-
-        u.d = x;
-	hx = __HI(u);		/* high word of x */
-	sign=hx&0x80000000; 		/* sign= sign(x) */
-	hx  ^=sign;
-	if(hx>=0x7ff00000) return(x+x); /* cbrt(NaN,INF) is itself */
-	if((hx|__LO(u))==0) {
-            x = u.d;
-	    return(x);		/* cbrt(0) is itself */
-        }
-        u.d = x;
-	__HI(u) = hx;	/* x <- |x| */
-        x = u.d;
-    /* rough cbrt to 5 bits */
-	if(hx<0x00100000) 		/* subnormal number */
-	  {u.d = t; __HI(u)=0x43500000; t=u.d;		/* set t= 2**54 */
-	   t*=x; __HI(u)=__HI(u)/3+B2;
-	  }
-	else {
-	  u.d = t; __HI(u)=hx/3+B1; t = u.d;
-        }
-
-
-    /* new cbrt to 23 bits, may be implemented in single precision */
-	r=t*t/x;
-	s=C+r*t;
-	t*=G+F/(s+E+D/s);	
-
-    /* chopped to 20 bits and make it larger than cbrt(x) */ 
-        u.d = t;
-	__LO(u)=0; __HI(u)+=0x00000001;
-        t = u.d;
-
-    /* one step newton iteration to 53 bits with error less than 0.667 ulps */
-	s=t*t;		/* t*t is exact */
-	r=x/s;
-	w=t+t;
-	r=(r-t)/(w+r);	/* r-s is exact */
-	t=t+t*r;
-
-    /* retore the sign bit */
-        u.d = t;
-	__HI(u) |= sign;
-        t = u.d;
-	return(t);
-}
diff --git a/libs/js/src/fdlibm/s_ceil.c b/libs/js/src/fdlibm/s_ceil.c
deleted file mode 100644
index 826bcac6c4..0000000000
--- a/libs/js/src/fdlibm/s_ceil.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_ceil.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * ceil(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to ceil(x).
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double really_big = 1.0e300;
-#else
-static double really_big = 1.0e300;
-#endif
-
-#ifdef __STDC__
-	double fd_ceil(double x)
-#else
-	double fd_ceil(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	int i0,i1,j0;
-	unsigned i,j;
-        u.d = x;
-	i0 =  __HI(u);
-	i1 =  __LO(u);
-	j0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(j0<20) {
-	    if(j0<0) { 	/* raise inexact if x != 0 */
-		if(really_big+x>0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0<0) {i0=0x80000000;i1=0;} 
-		    else if((i0|i1)!=0) { i0=0x3ff00000;i1=0;}
-		}
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		if(really_big+x>0.0) {	/* raise inexact flag */
-		    if(i0>0) i0 += (0x00100000)>>j0;
-		    i0 &= (~i); i1=0;
-		}
-	    }
-	} else if (j0>51) {
-	    if(j0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((unsigned)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    if(really_big+x>0.0) { 		/* raise inexact flag */
-		if(i0>0) {
-		    if(j0==20) i0+=1; 
-		    else {
-			j = i1 + (1<<(52-j0));
-			if((int)j<i1) i0+=1;	/* got a carry */
-			i1 = j;
-		    }
-		}
-		i1 &= (~i);
-	    }
-	}
-        u.d = x;
-	__HI(u) = i0;
-	__LO(u) = i1;
-        x = u.d;
-	return x;
-}
diff --git a/libs/js/src/fdlibm/s_copysign.c b/libs/js/src/fdlibm/s_copysign.c
deleted file mode 100644
index 8869a1233b..0000000000
--- a/libs/js/src/fdlibm/s_copysign.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_copysign.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * copysign(double x, double y)
- * copysign(x,y) returns a value with the magnitude of x and
- * with the sign bit of y.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_copysign(double x, double y)
-#else
-	double fd_copysign(x,y)
-	double x,y;
-#endif
-{
-        fd_twoints ux, uy;
-        ux.d = x; uy.d = y;
-	__HI(ux) = (__HI(ux)&0x7fffffff)|(__HI(uy)&0x80000000);
-        x = ux.d;
-        return x;
-}
diff --git a/libs/js/src/fdlibm/s_cos.c b/libs/js/src/fdlibm/s_cos.c
deleted file mode 100644
index 3fb0a6b15a..0000000000
--- a/libs/js/src/fdlibm/s_cos.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_cos.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* cos(x)
- * Return cosine function of x.
- *
- * kernel function:
- *	__kernel_sin		... sine function on [-pi/4,pi/4]
- *	__kernel_cos		... cosine function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on 
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2 
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_cos(double x)
-#else
-	double fd_cos(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y[2],z=0.0;
-	int n, ix;
-
-    /* High word of x. */
-        u.d = x;
-	ix = __HI(u);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_cos(x,z);
-
-    /* cos(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_cos(y[0],y[1]);
-		case 1: return -__kernel_sin(y[0],y[1],1);
-		case 2: return -__kernel_cos(y[0],y[1]);
-		default:
-		        return  __kernel_sin(y[0],y[1],1);
-	    }
-	}
-}
diff --git a/libs/js/src/fdlibm/s_erf.c b/libs/js/src/fdlibm/s_erf.c
deleted file mode 100644
index 6eae8de3b1..0000000000
--- a/libs/js/src/fdlibm/s_erf.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_erf.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* double erf(double x)
- * double erfc(double x)
- *			     x
- *		      2      |\
- *     erf(x)  =  ---------  | exp(-t*t)dt
- *	 	   sqrt(pi) \| 
- *			     0
- *
- *     erfc(x) =  1-erf(x)
- *  Note that 
- *		erf(-x) = -erf(x)
- *		erfc(-x) = 2 - erfc(x)
- *
- * Method:
- *	1. For |x| in [0, 0.84375]
- *	    erf(x)  = x + x*R(x^2)
- *          erfc(x) = 1 - erf(x)           if x in [-.84375,0.25]
- *                  = 0.5 + ((0.5-x)-x*R)  if x in [0.25,0.84375]
- *	   where R = P/Q where P is an odd poly of degree 8 and
- *	   Q is an odd poly of degree 10.
- *						 -57.90
- *			| R - (erf(x)-x)/x | <= 2
- *	
- *
- *	   Remark. The formula is derived by noting
- *          erf(x) = (2/sqrt(pi))*(x - x^3/3 + x^5/10 - x^7/42 + ....)
- *	   and that
- *          2/sqrt(pi) = 1.128379167095512573896158903121545171688
- *	   is close to one. The interval is chosen because the fix
- *	   point of erf(x) is near 0.6174 (i.e., erf(x)=x when x is
- *	   near 0.6174), and by some experiment, 0.84375 is chosen to
- * 	   guarantee the error is less than one ulp for erf.
- *
- *      2. For |x| in [0.84375,1.25], let s = |x| - 1, and
- *         c = 0.84506291151 rounded to single (24 bits)
- *         	erf(x)  = sign(x) * (c  + P1(s)/Q1(s))
- *         	erfc(x) = (1-c)  - P1(s)/Q1(s) if x > 0
- *			  1+(c+P1(s)/Q1(s))    if x < 0
- *         	|P1/Q1 - (erf(|x|)-c)| <= 2**-59.06
- *	   Remark: here we use the taylor series expansion at x=1.
- *		erf(1+s) = erf(1) + s*Poly(s)
- *			 = 0.845.. + P1(s)/Q1(s)
- *	   That is, we use rational approximation to approximate
- *			erf(1+s) - (c = (single)0.84506291151)
- *	   Note that |P1/Q1|< 0.078 for x in [0.84375,1.25]
- *	   where 
- *		P1(s) = degree 6 poly in s
- *		Q1(s) = degree 6 poly in s
- *
- *      3. For x in [1.25,1/0.35(~2.857143)], 
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R1/S1)
- *         	erf(x)  = 1 - erfc(x)
- *	   where 
- *		R1(z) = degree 7 poly in z, (z=1/x^2)
- *		S1(z) = degree 8 poly in z
- *
- *      4. For x in [1/0.35,28]
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R2/S2) if x > 0
- *			= 2.0 - (1/x)*exp(-x*x-0.5625+R2/S2) if -6<x<0
- *			= 2.0 - tiny		(if x <= -6)
- *         	erf(x)  = sign(x)*(1.0 - erfc(x)) if x < 6, else
- *         	erf(x)  = sign(x)*(1.0 - tiny)
- *	   where
- *		R2(z) = degree 6 poly in z, (z=1/x^2)
- *		S2(z) = degree 7 poly in z
- *
- *      Note1:
- *	   To compute exp(-x*x-0.5625+R/S), let s be a single
- *	   precision number and s := x; then
- *		-x*x = -s*s + (s-x)*(s+x)
- *	        exp(-x*x-0.5626+R/S) = 
- *			exp(-s*s-0.5625)*exp((s-x)*(s+x)+R/S);
- *      Note2:
- *	   Here 4 and 5 make use of the asymptotic series
- *			  exp(-x*x)
- *		erfc(x) ~ ---------- * ( 1 + Poly(1/x^2) )
- *			  x*sqrt(pi)
- *	   We use rational approximation to approximate
- *      	g(s)=f(1/x^2) = log(erfc(x)*x) - x*x + 0.5625
- *	   Here is the error bound for R1/S1 and R2/S2
- *      	|R1/S1 - f(x)|  < 2**(-62.57)
- *      	|R2/S2 - f(x)|  < 2**(-61.52)
- *
- *      5. For inf > x >= 28
- *         	erf(x)  = sign(x) *(1 - tiny)  (raise inexact)
- *         	erfc(x) = tiny*tiny (raise underflow) if x > 0
- *			= 2 - tiny if x<0
- *
- *      7. Special case:
- *         	erf(0)  = 0, erf(inf)  = 1, erf(-inf) = -1,
- *         	erfc(0) = 1, erfc(inf) = 0, erfc(-inf) = 2, 
- *	   	erfc/erf(NaN) is NaN
- */
-
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-tiny	    = 1e-300,
-half=  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-two =  2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */
-	/* c = (float)0.84506291151 */
-erx =  8.45062911510467529297e-01, /* 0x3FEB0AC1, 0x60000000 */
-/*
- * Coefficients for approximation to  erf on [0,0.84375]
- */
-efx =  1.28379167095512586316e-01, /* 0x3FC06EBA, 0x8214DB69 */
-efx8=  1.02703333676410069053e+00, /* 0x3FF06EBA, 0x8214DB69 */
-pp0  =  1.28379167095512558561e-01, /* 0x3FC06EBA, 0x8214DB68 */
-pp1  = -3.25042107247001499370e-01, /* 0xBFD4CD7D, 0x691CB913 */
-pp2  = -2.84817495755985104766e-02, /* 0xBF9D2A51, 0xDBD7194F */
-pp3  = -5.77027029648944159157e-03, /* 0xBF77A291, 0x236668E4 */
-pp4  = -2.37630166566501626084e-05, /* 0xBEF8EAD6, 0x120016AC */
-qq1  =  3.97917223959155352819e-01, /* 0x3FD97779, 0xCDDADC09 */
-qq2  =  6.50222499887672944485e-02, /* 0x3FB0A54C, 0x5536CEBA */
-qq3  =  5.08130628187576562776e-03, /* 0x3F74D022, 0xC4D36B0F */
-qq4  =  1.32494738004321644526e-04, /* 0x3F215DC9, 0x221C1A10 */
-qq5  = -3.96022827877536812320e-06, /* 0xBED09C43, 0x42A26120 */
-/*
- * Coefficients for approximation to  erf  in [0.84375,1.25] 
- */
-pa0  = -2.36211856075265944077e-03, /* 0xBF6359B8, 0xBEF77538 */
-pa1  =  4.14856118683748331666e-01, /* 0x3FDA8D00, 0xAD92B34D */
-pa2  = -3.72207876035701323847e-01, /* 0xBFD7D240, 0xFBB8C3F1 */
-pa3  =  3.18346619901161753674e-01, /* 0x3FD45FCA, 0x805120E4 */
-pa4  = -1.10894694282396677476e-01, /* 0xBFBC6398, 0x3D3E28EC */
-pa5  =  3.54783043256182359371e-02, /* 0x3FA22A36, 0x599795EB */
-pa6  = -2.16637559486879084300e-03, /* 0xBF61BF38, 0x0A96073F */
-qa1  =  1.06420880400844228286e-01, /* 0x3FBB3E66, 0x18EEE323 */
-qa2  =  5.40397917702171048937e-01, /* 0x3FE14AF0, 0x92EB6F33 */
-qa3  =  7.18286544141962662868e-02, /* 0x3FB2635C, 0xD99FE9A7 */
-qa4  =  1.26171219808761642112e-01, /* 0x3FC02660, 0xE763351F */
-qa5  =  1.36370839120290507362e-02, /* 0x3F8BEDC2, 0x6B51DD1C */
-qa6  =  1.19844998467991074170e-02, /* 0x3F888B54, 0x5735151D */
-/*
- * Coefficients for approximation to  erfc in [1.25,1/0.35]
- */
-ra0  = -9.86494403484714822705e-03, /* 0xBF843412, 0x600D6435 */
-ra1  = -6.93858572707181764372e-01, /* 0xBFE63416, 0xE4BA7360 */
-ra2  = -1.05586262253232909814e+01, /* 0xC0251E04, 0x41B0E726 */
-ra3  = -6.23753324503260060396e+01, /* 0xC04F300A, 0xE4CBA38D */
-ra4  = -1.62396669462573470355e+02, /* 0xC0644CB1, 0x84282266 */
-ra5  = -1.84605092906711035994e+02, /* 0xC067135C, 0xEBCCABB2 */
-ra6  = -8.12874355063065934246e+01, /* 0xC0545265, 0x57E4D2F2 */
-ra7  = -9.81432934416914548592e+00, /* 0xC023A0EF, 0xC69AC25C */
-sa1  =  1.96512716674392571292e+01, /* 0x4033A6B9, 0xBD707687 */
-sa2  =  1.37657754143519042600e+02, /* 0x4061350C, 0x526AE721 */
-sa3  =  4.34565877475229228821e+02, /* 0x407B290D, 0xD58A1A71 */
-sa4  =  6.45387271733267880336e+02, /* 0x40842B19, 0x21EC2868 */
-sa5  =  4.29008140027567833386e+02, /* 0x407AD021, 0x57700314 */
-sa6  =  1.08635005541779435134e+02, /* 0x405B28A3, 0xEE48AE2C */
-sa7  =  6.57024977031928170135e+00, /* 0x401A47EF, 0x8E484A93 */
-sa8  = -6.04244152148580987438e-02, /* 0xBFAEEFF2, 0xEE749A62 */
-/*
- * Coefficients for approximation to  erfc in [1/.35,28]
- */
-rb0  = -9.86494292470009928597e-03, /* 0xBF843412, 0x39E86F4A */
-rb1  = -7.99283237680523006574e-01, /* 0xBFE993BA, 0x70C285DE */
-rb2  = -1.77579549177547519889e+01, /* 0xC031C209, 0x555F995A */
-rb3  = -1.60636384855821916062e+02, /* 0xC064145D, 0x43C5ED98 */
-rb4  = -6.37566443368389627722e+02, /* 0xC083EC88, 0x1375F228 */
-rb5  = -1.02509513161107724954e+03, /* 0xC0900461, 0x6A2E5992 */
-rb6  = -4.83519191608651397019e+02, /* 0xC07E384E, 0x9BDC383F */
-sb1  =  3.03380607434824582924e+01, /* 0x403E568B, 0x261D5190 */
-sb2  =  3.25792512996573918826e+02, /* 0x40745CAE, 0x221B9F0A */
-sb3  =  1.53672958608443695994e+03, /* 0x409802EB, 0x189D5118 */
-sb4  =  3.19985821950859553908e+03, /* 0x40A8FFB7, 0x688C246A */
-sb5  =  2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */
-sb6  =  4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */
-sb7  = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */
-
-#ifdef __STDC__
-	double fd_erf(double x) 
-#else
-	double fd_erf(x) 
-	double x;
-#endif
-{
-        fd_twoints u;
-	int hx,ix,i;
-	double R,S,P,Q,s,y,z,r;
-        u.d = x;
-	hx = __HI(u);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {		/* erf(nan)=nan */
-	    i = ((unsigned)hx>>31)<<1;
-	    return (double)(1-i)+one/x;	/* erf(+-inf)=+-1 */
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3e300000) { 	/* |x|<2**-28 */
-	        if (ix < 0x00800000) 
-		    return 0.125*(8.0*x+efx8*x);  /*avoid underflow */
-		return x + efx*x;
-	    }
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    return x + x*y;
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fd_fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
-	}
-	if (ix >= 0x40180000) {		/* inf>|x|>=6 */
-	    if(hx>=0) return one-tiny; else return tiny-one;
-	}
-	x = fd_fabs(x);
- 	s = one/(x*x);
-	if(ix< 0x4006DB6E) {	/* |x| < 1/0.35 */
-	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	} else {	/* |x| >= 1/0.35 */
-	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	}
-	z  = x;  
-        u.d = z;
-	__LO(u) = 0;
-        z = u.d;
-	r  =  __ieee754_exp(-z*z-0.5625)*__ieee754_exp((z-x)*(z+x)+R/S);
-	if(hx>=0) return one-r/x; else return  r/x-one;
-}
-
-#ifdef __STDC__
-	double erfc(double x) 
-#else
-	double erfc(x) 
-	double x;
-#endif
-{
-        fd_twoints u;
-	int hx,ix;
-	double R,S,P,Q,s,y,z,r;
-        u.d = x;
-	hx = __HI(u);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {			/* erfc(nan)=nan */
-						/* erfc(+-inf)=0,2 */
-	    return (double)(((unsigned)hx>>31)<<1)+one/x;
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3c700000)  	/* |x|<2**-56 */
-		return one-x;
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    if(hx < 0x3fd00000) {  	/* x<1/4 */
-		return one-(x+x*y);
-	    } else {
-		r = x*y;
-		r += (x-half);
-	        return half - r ;
-	    }
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fd_fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) {
-	        z  = one-erx; return z - P/Q; 
-	    } else {
-		z = erx+P/Q; return one+z;
-	    }
-	}
-	if (ix < 0x403c0000) {		/* |x|<28 */
-	    x = fd_fabs(x);
- 	    s = one/(x*x);
-	    if(ix< 0x4006DB6D) {	/* |x| < 1/.35 ~ 2.857143*/
-	        R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	        S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
-		if(hx<0&&ix>=0x40180000) return two-tiny;/* x < -6 */
-	        R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	        S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	    }
-	    z  = x;
-            u.d = z;
-	    __LO(u)  = 0;
-            z = u.d;
-	    r  =  __ieee754_exp(-z*z-0.5625)*
-			__ieee754_exp((z-x)*(z+x)+R/S);
-	    if(hx>0) return r/x; else return two-r/x;
-	} else {
-	    if(hx>0) return tiny*tiny; else return two-tiny;
-	}
-}
diff --git a/libs/js/src/fdlibm/s_expm1.c b/libs/js/src/fdlibm/s_expm1.c
deleted file mode 100644
index 578d2e144a..0000000000
--- a/libs/js/src/fdlibm/s_expm1.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_expm1.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* expm1(x)
- * Returns exp(x)-1, the exponential of x minus 1.
- *
- * Method
- *   1. Argument reduction:
- *	Given x, find r and integer k such that
- *
- *               x = k*ln2 + r,  |r| <= 0.5*ln2 ~ 0.34658  
- *
- *      Here a correction term c will be computed to compensate 
- *	the error in r when rounded to a floating-point number.
- *
- *   2. Approximating expm1(r) by a special rational function on
- *	the interval [0,0.34658]:
- *	Since
- *	    r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 - r^4/360 + ...
- *	we define R1(r*r) by
- *	    r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 * R1(r*r)
- *	That is,
- *	    R1(r**2) = 6/r *((exp(r)+1)/(exp(r)-1) - 2/r)
- *		     = 6/r * ( 1 + 2.0*(1/(exp(r)-1) - 1/r))
- *		     = 1 - r^2/60 + r^4/2520 - r^6/100800 + ...
- *      We use a special Reme algorithm on [0,0.347] to generate 
- * 	a polynomial of degree 5 in r*r to approximate R1. The 
- *	maximum error of this polynomial approximation is bounded 
- *	by 2**-61. In other words,
- *	    R1(z) ~ 1.0 + Q1*z + Q2*z**2 + Q3*z**3 + Q4*z**4 + Q5*z**5
- *	where 	Q1  =  -1.6666666666666567384E-2,
- * 		Q2  =   3.9682539681370365873E-4,
- * 		Q3  =  -9.9206344733435987357E-6,
- * 		Q4  =   2.5051361420808517002E-7,
- * 		Q5  =  -6.2843505682382617102E-9;
- *  	(where z=r*r, and the values of Q1 to Q5 are listed below)
- *	with error bounded by
- *	    |                  5           |     -61
- *	    | 1.0+Q1*z+...+Q5*z   -  R1(z) | <= 2 
- *	    |                              |
- *	
- *	expm1(r) = exp(r)-1 is then computed by the following 
- * 	specific way which minimize the accumulation rounding error: 
- *			       2     3
- *			      r     r    [ 3 - (R1 + R1*r/2)  ]
- *	      expm1(r) = r + --- + --- * [--------------------]
- *		              2     2    [ 6 - r*(3 - R1*r/2) ]
- *	
- *	To compensate the error in the argument reduction, we use
- *		expm1(r+c) = expm1(r) + c + expm1(r)*c 
- *			   ~ expm1(r) + c + r*c 
- *	Thus c+r*c will be added in as the correction terms for
- *	expm1(r+c). Now rearrange the term to avoid optimization 
- * 	screw up:
- *		        (      2                                    2 )
- *		        ({  ( r    [ R1 -  (3 - R1*r/2) ]  )  }    r  )
- *	 expm1(r+c)~r - ({r*(--- * [--------------------]-c)-c} - --- )
- *	                ({  ( 2    [ 6 - r*(3 - R1*r/2) ]  )  }    2  )
- *                      (                                             )
- *    	
- *		   = r - E
- *   3. Scale back to obtain expm1(x):
- *	From step 1, we have
- *	   expm1(x) = either 2^k*[expm1(r)+1] - 1
- *		    = or     2^k*[expm1(r) + (1-2^-k)]
- *   4. Implementation notes:
- *	(A). To save one multiplication, we scale the coefficient Qi
- *	     to Qi*2^i, and replace z by (x^2)/2.
- *	(B). To achieve maximum accuracy, we compute expm1(x) by
- *	  (i)   if x < -56*ln2, return -1.0, (raise inexact if x!=inf)
- *	  (ii)  if k=0, return r-E
- *	  (iii) if k=-1, return 0.5*(r-E)-0.5
- *        (iv)	if k=1 if r < -0.25, return 2*((r+0.5)- E)
- *	       	       else	     return  1.0+2.0*(r-E);
- *	  (v)   if (k<-2||k>56) return 2^k(1-(E-r)) - 1 (or exp(x)-1)
- *	  (vi)  if k <= 20, return 2^k((1-2^-k)-(E-r)), else
- *	  (vii) return 2^k(1-((E+2^-k)-r)) 
- *
- * Special cases:
- *	expm1(INF) is INF, expm1(NaN) is NaN;
- *	expm1(-INF) is -1, and
- *	for finite argument, only expm1(0)=0 is exact.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Misc. info.
- *	For IEEE double 
- *	    if x >  7.09782712893383973096e+02 then expm1(x) overflow
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-one		= 1.0,
-really_big		= 1.0e+300,
-tiny		= 1.0e-300,
-o_threshold	= 7.09782712893383973096e+02,/* 0x40862E42, 0xFEFA39EF */
-ln2_hi		= 6.93147180369123816490e-01,/* 0x3fe62e42, 0xfee00000 */
-ln2_lo		= 1.90821492927058770002e-10,/* 0x3dea39ef, 0x35793c76 */
-invln2		= 1.44269504088896338700e+00,/* 0x3ff71547, 0x652b82fe */
-	/* scaled coefficients related to expm1 */
-Q1  =  -3.33333333333331316428e-02, /* BFA11111 111110F4 */
-Q2  =   1.58730158725481460165e-03, /* 3F5A01A0 19FE5585 */
-Q3  =  -7.93650757867487942473e-05, /* BF14CE19 9EAADBB7 */
-Q4  =   4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */
-Q5  =  -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */
-
-#ifdef __STDC__
-	double fd_expm1(double x)
-#else
-	double fd_expm1(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y,hi,lo,c,t,e,hxs,hfx,r1;
-	int k,xsb;
-	unsigned hx;
-
-        u.d = x;
-	hx  = __HI(u);	/* high word of x */
-	xsb = hx&0x80000000;		/* sign bit of x */
-	if(xsb==0) y=x; else y= -x;	/* y = |x| */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out huge and non-finite argument */
-	if(hx >= 0x4043687A) {			/* if |x|>=56*ln2 */
-	    if(hx >= 0x40862E42) {		/* if |x|>=709.78... */
-                if(hx>=0x7ff00000) {
-                    u.d = x;
-		    if(((hx&0xfffff)|__LO(u))!=0) 
-		         return x+x; 	 /* NaN */
-		    else return (xsb==0)? x:-1.0;/* exp(+-inf)={inf,-1} */
-	        }
-	        if(x > o_threshold) return really_big*really_big; /* overflow */
-	    }
-	    if(xsb!=0) { /* x < -56*ln2, return -1.0 with inexact */
-		if(x+tiny<0.0)		/* raise inexact */
-		return tiny-one;	/* return -1 */
-	    }
-	}
-
-    /* argument reduction */
-	if(hx > 0x3fd62e42) {		/* if  |x| > 0.5 ln2 */ 
-	    if(hx < 0x3FF0A2B2) {	/* and |x| < 1.5 ln2 */
-		if(xsb==0)
-		    {hi = x - ln2_hi; lo =  ln2_lo;  k =  1;}
-		else
-		    {hi = x + ln2_hi; lo = -ln2_lo;  k = -1;}
-	    } else {
-		k  = (int)(invln2*x+((xsb==0)?0.5:-0.5));
-		t  = k;
-		hi = x - t*ln2_hi;	/* t*ln2_hi is exact here */
-		lo = t*ln2_lo;
-	    }
-	    x  = hi - lo;
-	    c  = (hi-x)-lo;
-	} 
-	else if(hx < 0x3c900000) {  	/* when |x|<2**-54, return x */
-	    t = really_big+x;	/* return x with inexact flags when x!=0 */
-	    return x - (t-(really_big+x));	
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	hfx = 0.5*x;
-	hxs = x*hfx;
-	r1 = one+hxs*(Q1+hxs*(Q2+hxs*(Q3+hxs*(Q4+hxs*Q5))));
-	t  = 3.0-r1*hfx;
-	e  = hxs*((r1-t)/(6.0 - x*t));
-	if(k==0) return x - (x*e-hxs);		/* c is 0 */
-	else {
-	    e  = (x*(e-c)-c);
-	    e -= hxs;
-	    if(k== -1) return 0.5*(x-e)-0.5;
-	    if(k==1) 
-	       	if(x < -0.25) return -2.0*(e-(x+0.5));
-	       	else 	      return  one+2.0*(x-e);
-	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
-	        y = one-(e-x);
-                u.d = y;
-	        __HI(u) += (k<<20);	/* add k to y's exponent */
-                y = u.d;
-	        return y-one;
-	    }
-	    t = one;
-	    if(k<20) {
-                u.d = t;
-	       	__HI(u) = 0x3ff00000 - (0x200000>>k);  /* t=1-2^-k */
-                t = u.d;
-	       	y = t-(e-x);
-                u.d = y;
-	       	__HI(u) += (k<<20);	/* add k to y's exponent */
-                y = u.d;
-	   } else {
-               u.d = t;
-	       	__HI(u)  = ((0x3ff-k)<<20);	/* 2^-k */
-                t = u.d;
-	       	y = x-(e+t);
-	       	y += one;
-                u.d = y;
-	       	__HI(u) += (k<<20);	/* add k to y's exponent */
-                y = u.d;
-	    }
-	}
-	return y;
-}
diff --git a/libs/js/src/fdlibm/s_fabs.c b/libs/js/src/fdlibm/s_fabs.c
deleted file mode 100644
index 6b029da101..0000000000
--- a/libs/js/src/fdlibm/s_fabs.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_fabs.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * fabs(x) returns the absolute value of x.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_fabs(double x)
-#else
-	double fd_fabs(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-        u.d = x;
-	__HI(u) &= 0x7fffffff;
-        x = u.d;
-        return x;
-}
diff --git a/libs/js/src/fdlibm/s_finite.c b/libs/js/src/fdlibm/s_finite.c
deleted file mode 100644
index 4a0a4d3c60..0000000000
--- a/libs/js/src/fdlibm/s_finite.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_finite.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * finite(x) returns 1 is x is finite, else 0;
- * no branching!
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	int fd_finite(double x)
-#else
-	int fd_finite(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	int hx; 
-        u.d = x;
-	hx = __HI(u);
-	return  (unsigned)((hx&0x7fffffff)-0x7ff00000)>>31;
-}
diff --git a/libs/js/src/fdlibm/s_floor.c b/libs/js/src/fdlibm/s_floor.c
deleted file mode 100644
index 6c23495f0e..0000000000
--- a/libs/js/src/fdlibm/s_floor.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_floor.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * floor(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to floor(x).
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double really_big = 1.0e300;
-#else
-static double really_big = 1.0e300;
-#endif
-
-#ifdef __STDC__
-	double fd_floor(double x)
-#else
-	double fd_floor(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	int i0,i1,j0;
-	unsigned i,j;
-        u.d = x;
-	i0 =  __HI(u);
-	i1 =  __LO(u);
-	j0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(j0<20) {
-	    if(j0<0) { 	/* raise inexact if x != 0 */
-		if(really_big+x>0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0>=0) {i0=i1=0;} 
-		    else if(((i0&0x7fffffff)|i1)!=0)
-			{ i0=0xbff00000;i1=0;}
-		}
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		if(really_big+x>0.0) {	/* raise inexact flag */
-		    if(i0<0) i0 += (0x00100000)>>j0;
-		    i0 &= (~i); i1=0;
-		}
-	    }
-	} else if (j0>51) {
-	    if(j0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((unsigned)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    if(really_big+x>0.0) { 		/* raise inexact flag */
-		if(i0<0) {
-		    if(j0==20) i0+=1; 
-		    else {
-			j = i1+(1<<(52-j0));
-			if((int)j<i1) i0 +=1 ; 	/* got a carry */
-			i1=j;
-		    }
-		}
-		i1 &= (~i);
-	    }
-	}
-        u.d = x;
-	__HI(u) = i0;
-	__LO(u) = i1;
-        x = u.d;
-	return x;
-}
diff --git a/libs/js/src/fdlibm/s_frexp.c b/libs/js/src/fdlibm/s_frexp.c
deleted file mode 100644
index bec2ecebc6..0000000000
--- a/libs/js/src/fdlibm/s_frexp.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_frexp.c 1.4 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * for non-zero x 
- *	x = frexp(arg,&exp);
- * return a double fp quantity x such that 0.5 <= |x| <1.0
- * and the corresponding binary exponent "exp". That is
- *	arg = x*2^exp.
- * If arg is inf, 0.0, or NaN, then frexp(arg,&exp) returns arg 
- * with *exp=0. 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-two54 =  1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */
-
-#ifdef __STDC__
-	double fd_frexp(double x, int *eptr)
-#else
-	double fd_frexp(x, eptr)
-	double x; int *eptr;
-#endif
-{
-	int  hx, ix, lx;
-        fd_twoints u;
-        u.d = x;
-	hx = __HI(u);
-	ix = 0x7fffffff&hx;
-	lx = __LO(u);
-	*eptr = 0;
-	if(ix>=0x7ff00000||((ix|lx)==0)) return x;	/* 0,inf,nan */
-	if (ix<0x00100000) {		/* subnormal */
-	    x *= two54;
-            u.d = x;
-	    hx = __HI(u);
-	    ix = hx&0x7fffffff;
-	    *eptr = -54;
-	}
-	*eptr += (ix>>20)-1022;
-	hx = (hx&0x800fffff)|0x3fe00000;
-        u.d = x;
-	__HI(u) = hx;
-        x = u.d;
-	return x;
-}
diff --git a/libs/js/src/fdlibm/s_ilogb.c b/libs/js/src/fdlibm/s_ilogb.c
deleted file mode 100644
index f769781a62..0000000000
--- a/libs/js/src/fdlibm/s_ilogb.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_ilogb.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* ilogb(double x)
- * return the binary exponent of non-zero x
- * ilogb(0) = 0x80000001
- * ilogb(inf/NaN) = 0x7fffffff (no signal is raised)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	int fd_ilogb(double x)
-#else
-	int fd_ilogb(x)
-	double x;
-#endif
-{
-	int hx,lx,ix;
-        fd_twoints u;
-        u.d = x;
-	hx  = (__HI(u))&0x7fffffff;	/* high word of x */
-	if(hx<0x00100000) {
-	    lx = __LO(u);
-	    if((hx|lx)==0) 
-		return 0x80000001;	/* ilogb(0) = 0x80000001 */
-	    else			/* subnormal x */
-		if(hx==0) {
-		    for (ix = -1043; lx>0; lx<<=1) ix -=1;
-		} else {
-		    for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1;
-		}
-	    return ix;
-	}
-	else if (hx<0x7ff00000) return (hx>>20)-1023;
-	else return 0x7fffffff;
-}
diff --git a/libs/js/src/fdlibm/s_isnan.c b/libs/js/src/fdlibm/s_isnan.c
deleted file mode 100644
index 52f8759c79..0000000000
--- a/libs/js/src/fdlibm/s_isnan.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_isnan.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * isnan(x) returns 1 is x is nan, else 0;
- * no branching!
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	int fd_isnan(double x)
-#else
-	int fd_isnan(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	int hx,lx;
-        u.d = x;
-	hx = (__HI(u)&0x7fffffff);
-	lx = __LO(u);
-	hx |= (unsigned)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return ((unsigned)(hx))>>31;
-}
diff --git a/libs/js/src/fdlibm/s_ldexp.c b/libs/js/src/fdlibm/s_ldexp.c
deleted file mode 100644
index 9475520d48..0000000000
--- a/libs/js/src/fdlibm/s_ldexp.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_ldexp.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-#include <errno.h>
-
-#ifdef __STDC__
-	double fd_ldexp(double value, int exp)
-#else
-	double fd_ldexp(value, exp)
-	double value; int exp;
-#endif
-{
-	if(!fd_finite(value)||value==0.0) return value;
-	value = fd_scalbn(value,exp);
-	if(!fd_finite(value)||value==0.0) errno = ERANGE;
-	return value;
-}
diff --git a/libs/js/src/fdlibm/s_lib_version.c b/libs/js/src/fdlibm/s_lib_version.c
deleted file mode 100644
index 2ccf67d51c..0000000000
--- a/libs/js/src/fdlibm/s_lib_version.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_lib_version.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * MACRO for standards
- */
-
-#include "fdlibm.h"
-
-/*
- * define and initialize _LIB_VERSION
- */
-#ifdef _POSIX_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _POSIX_;
-#else
-#ifdef _XOPEN_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_;
-#else
-#ifdef _SVID3_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _SVID_;
-#else					/* default _IEEE_MODE */
-_LIB_VERSION_TYPE _LIB_VERSION = _IEEE_;
-#endif
-#endif
-#endif
diff --git a/libs/js/src/fdlibm/s_log1p.c b/libs/js/src/fdlibm/s_log1p.c
deleted file mode 100644
index 1840156b1c..0000000000
--- a/libs/js/src/fdlibm/s_log1p.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_log1p.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* double log1p(double x)
- *
- * Method :                  
- *   1. Argument Reduction: find k and f such that 
- *			1+x = 2^k * (1+f), 
- *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *      Note. If k=0, then f=x is exact. However, if k!=0, then f
- *	may not be representable exactly. In that case, a correction
- *	term is need. Let u=1+x rounded. Let c = (1+x)-u, then
- *	log(1+x) - log(u) ~ c/u. Thus, we proceed to compute log(u),
- *	and add back the correction term c/u.
- *	(Note: when x > 2**53, one can simply return log(x))
- *
- *   2. Approximation of log1p(f).
- *	Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *	     	 = 2s + s*R
- *      We use a special Reme algorithm on [0,0.1716] to generate 
- * 	a polynomial of degree 14 to approximate R The maximum error 
- *	of this polynomial approximation is bounded by 2**-58.45. In
- *	other words,
- *		        2      4      6      8      10      12      14
- *	    R(z) ~ Lp1*s +Lp2*s +Lp3*s +Lp4*s +Lp5*s  +Lp6*s  +Lp7*s
- *  	(the values of Lp1 to Lp7 are listed in the program)
- *	and
- *	    |      2          14          |     -58.45
- *	    | Lp1*s +...+Lp7*s    -  R(z) | <= 2 
- *	    |                             |
- *	Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- *	In order to guarantee error in log below 1ulp, we compute log
- *	by
- *		log1p(f) = f - (hfsq - s*(hfsq+R)).
- *	
- *	3. Finally, log1p(x) = k*ln2 + log1p(f).  
- *		 	     = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- *	   Here ln2 is split into two floating point number: 
- *			ln2_hi + ln2_lo,
- *	   where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- *	log1p(x) is NaN with signal if x < -1 (including -INF) ; 
- *	log1p(+INF) is +INF; log1p(-1) is -INF with signal;
- *	log1p(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following 
- * constants. The decimal values may be used, provided that the 
- * compiler will convert from decimal to binary accurately enough 
- * to produce the hexadecimal values shown.
- *
- * Note: Assuming log() return accurate answer, the following
- * 	 algorithm can be used to compute log1p(x) to within a few ULP:
- *	
- *		u = 1+x;
- *		if(u==1.0) return x ; else
- *			   return log(u)*(x/(u-1.0));
- *
- *	 See HP-15C Advanced Functions Handbook, p.193.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-ln2_hi  =  6.93147180369123816490e-01,	/* 3fe62e42 fee00000 */
-ln2_lo  =  1.90821492927058770002e-10,	/* 3dea39ef 35793c76 */
-two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-Lp1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lp2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lp3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lp4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lp5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lp6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lp7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-static double zero = 0.0;
-
-#ifdef __STDC__
-	double fd_log1p(double x)
-#else
-	double fd_log1p(x)
-	double x;
-#endif
-{
-	double hfsq,f,c,s,z,R,u;
-	int k,hx,hu,ax;
-        fd_twoints un;
-
-        un.d = x;
-	hx = __HI(un);		/* high word of x */
-	ax = hx&0x7fffffff;
-
-	k = 1;
-	if (hx < 0x3FDA827A) {			/* x < 0.41422  */
-	    if(ax>=0x3ff00000) {		/* x <= -1.0 */
-		if(x==-1.0) return -two54/zero; /* log1p(-1)=+inf */
-		else return (x-x)/(x-x);	/* log1p(x<-1)=NaN */
-	    }
-	    if(ax<0x3e200000) {			/* |x| < 2**-29 */
-		if(two54+x>zero			/* raise inexact */
-	            &&ax<0x3c900000) 		/* |x| < 2**-54 */
-		    return x;
-		else
-		    return x - x*x*0.5;
-	    }
-	    if(hx>0||hx<=((int)0xbfd2bec3)) {
-		k=0;f=x;hu=1;}	/* -0.2929<x<0.41422 */
-	} 
-	if (hx >= 0x7ff00000) return x+x;
-	if(k!=0) {
-	    if(hx<0x43400000) {
-		u  = 1.0+x; 
-                un.d = u;
-	        hu = __HI(un);		/* high word of u */
-	        k  = (hu>>20)-1023;
-	        c  = (k>0)? 1.0-(u-x):x-(u-1.0);/* correction term */
-		c /= u;
-	    } else {
-		u  = x;
-                un.d = u;
-	        hu = __HI(un);		/* high word of u */
-	        k  = (hu>>20)-1023;
-		c  = 0;
-	    }
-	    hu &= 0x000fffff;
-	    if(hu<0x6a09e) {
-                un.d = u;
-	        __HI(un) = hu|0x3ff00000;	/* normalize u */
-                u = un.d;
-	    } else {
-	        k += 1; 
-                un.d = u;
-	        __HI(un) = hu|0x3fe00000;	/* normalize u/2 */
-                u = un.d;
-	        hu = (0x00100000-hu)>>2;
-	    }
-	    f = u-1.0;
-	}
-	hfsq=0.5*f*f;
-	if(hu==0) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;  
-			else {c += k*ln2_lo; return k*ln2_hi+c;}
-	    R = hfsq*(1.0-0.66666666666666666*f);
-	    if(k==0) return f-R; else
-	    	     return k*ln2_hi-((R-(k*ln2_lo+c))-f);
-	}
- 	s = f/(2.0+f); 
-	z = s*s;
-	R = z*(Lp1+z*(Lp2+z*(Lp3+z*(Lp4+z*(Lp5+z*(Lp6+z*Lp7))))));
-	if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		 return k*ln2_hi-((hfsq-(s*(hfsq+R)+(k*ln2_lo+c)))-f);
-}
diff --git a/libs/js/src/fdlibm/s_logb.c b/libs/js/src/fdlibm/s_logb.c
deleted file mode 100644
index f885c4dc38..0000000000
--- a/libs/js/src/fdlibm/s_logb.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_logb.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * double logb(x)
- * IEEE 754 logb. Included to pass IEEE test suite. Not recommend.
- * Use ilogb instead.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_logb(double x)
-#else
-	double fd_logb(x)
-	double x;
-#endif
-{
-	int lx,ix;
-        fd_twoints u;
-
-        u.d = x;
-	ix = (__HI(u))&0x7fffffff;	/* high |x| */
-	lx = __LO(u);			/* low x */
-	if((ix|lx)==0) return -1.0/fd_fabs(x);
-	if(ix>=0x7ff00000) return x*x;
-	if((ix>>=20)==0) 			/* IEEE 754 logb */
-		return -1022.0; 
-	else
-		return (double) (ix-1023); 
-}
diff --git a/libs/js/src/fdlibm/s_matherr.c b/libs/js/src/fdlibm/s_matherr.c
deleted file mode 100644
index cd99ca88f3..0000000000
--- a/libs/js/src/fdlibm/s_matherr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_matherr.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	int fd_matherr(struct exception *x)
-#else
-	int fd_matherr(x)
-	struct exception *x;
-#endif
-{
-	int n=0;
-	if(x->arg1!=x->arg1) return 0;
-	return n;
-}
diff --git a/libs/js/src/fdlibm/s_modf.c b/libs/js/src/fdlibm/s_modf.c
deleted file mode 100644
index 3b182bd3bb..0000000000
--- a/libs/js/src/fdlibm/s_modf.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_modf.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * modf(double x, double *iptr) 
- * return fraction part of x, and return x's integral part in *iptr.
- * Method:
- *	Bit twiddling.
- *
- * Exception:
- *	No exception.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double one = 1.0;
-#else
-static double one = 1.0;
-#endif
-
-#ifdef __STDC__
-	double fd_modf(double x, double *iptr)
-#else
-	double fd_modf(x, iptr)
-	double x,*iptr;
-#endif
-{
-	int i0,i1,j0;
-	unsigned i;
-        fd_twoints u;
-        u.d = x;
-	i0 =  __HI(u);		/* high x */
-	i1 =  __LO(u);		/* low  x */
-	j0 = ((i0>>20)&0x7ff)-0x3ff;	/* exponent of x */
-	if(j0<20) {			/* integer part in high x */
-	    if(j0<0) {			/* |x|<1 */
-                u.d = *iptr;
-		__HI(u) = i0&0x80000000;
-		__LO(u) = 0;		/* *iptr = +-0 */
-                *iptr = u.d;
-		return x;
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) {		/* x is integral */
-		    *iptr = x;
-                    u.d = x;
-		    __HI(u) &= 0x80000000;
-		    __LO(u)  = 0;	/* return +-0 */
-                    x = u.d;
-		    return x;
-		} else {
-                    u.d = *iptr;
-		    __HI(u) = i0&(~i);
-		    __LO(u) = 0;
-                    *iptr = u.d;
-		    return x - *iptr;
-		}
-	    }
-	} else if (j0>51) {		/* no fraction part */
-	    *iptr = x*one;
-            u.d = x;
-	    __HI(u) &= 0x80000000;
-	    __LO(u)  = 0;	/* return +-0 */
-            x = u.d;
-	    return x;
-	} else {			/* fraction part in low x */
-	    i = ((unsigned)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) { 		/* x is integral */
-		*iptr = x;
-                u.d = x;
-		__HI(u) &= 0x80000000;
-		__LO(u)  = 0;	/* return +-0 */
-                x = u.d;
-		return x;
-	    } else {
-                u.d = *iptr;
-		__HI(u) = i0;
-		__LO(u) = i1&(~i);
-                *iptr = u.d;
-		return x - *iptr;
-	    }
-	}
-}
diff --git a/libs/js/src/fdlibm/s_nextafter.c b/libs/js/src/fdlibm/s_nextafter.c
deleted file mode 100644
index f71c5c8359..0000000000
--- a/libs/js/src/fdlibm/s_nextafter.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_nextafter.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* IEEE functions
- *	nextafter(x,y)
- *	return the next machine floating-point number of x in the
- *	direction toward y.
- *   Special cases:
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_nextafter(double x, double y)
-#else
-	double fd_nextafter(x,y)
-	double x,y;
-#endif
-{
-	int	hx,hy,ix,iy;
-	unsigned lx,ly;
-        fd_twoints ux, uy;
-
-        ux.d = x; uy.d = y;
-	hx = __HI(ux);		/* high word of x */
-	lx = __LO(ux);		/* low  word of x */
-	hy = __HI(uy);		/* high word of y */
-	ly = __LO(uy);		/* low  word of y */
-	ix = hx&0x7fffffff;		/* |x| */
-	iy = hy&0x7fffffff;		/* |y| */
-
-	if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) ||   /* x is nan */ 
-	   ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))     /* y is nan */ 
-	   return x+y;				
-	if(x==y) return x;		/* x=y, return x */
-	if((ix|lx)==0) {			/* x == 0 */
-            ux.d = x;
-	    __HI(ux) = hy&0x80000000;	/* return +-minsubnormal */
-	    __LO(ux) = 1;
-            x = ux.d;
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
-	} 
-	if(hx>=0) {				/* x > 0 */
-	    if(hx>hy||((hx==hy)&&(lx>ly))) {	/* x > y, x -= ulp */
-		if(lx==0) hx -= 1;
-		lx -= 1;
-	    } else {				/* x < y, x += ulp */
-		lx += 1;
-		if(lx==0) hx += 1;
-	    }
-	} else {				/* x < 0 */
-	    if(hy>=0||hx>hy||((hx==hy)&&(lx>ly))){/* x < y, x -= ulp */
-		if(lx==0) hx -= 1;
-		lx -= 1;
-	    } else {				/* x > y, x += ulp */
-		lx += 1;
-		if(lx==0) hx += 1;
-	    }
-	}
-	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
-	if(hy<0x00100000) {		/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-                uy.d = y;
-		__HI(uy) = hx; __LO(uy) = lx;
-                y = uy.d;
-		return y;
-	    }
-	}
-        ux.d = x;
-	__HI(ux) = hx; __LO(ux) = lx;
-        x = ux.d;
-	return x;
-}
diff --git a/libs/js/src/fdlibm/s_rint.c b/libs/js/src/fdlibm/s_rint.c
deleted file mode 100644
index 3c4fab6d9d..0000000000
--- a/libs/js/src/fdlibm/s_rint.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_rint.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * rint(x)
- * Return x rounded to integral value according to the prevailing
- * rounding mode.
- * Method:
- *	Using floating addition.
- * Exception:
- *	Inexact flag raised if x not equal to rint(x).
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double 
-#endif
-TWO52[2]={
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
-};
-
-#ifdef __STDC__
-	double fd_rint(double x)
-#else
-	double fd_rint(x)
-	double x;
-#endif
-{
-	int i0,j0,sx;
-	unsigned i,i1;
-	double w,t;
-        fd_twoints u;
-
-        u.d = x;
-	i0 =  __HI(u);
-	sx = (i0>>31)&1;
-	i1 =  __LO(u);
-	j0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(j0<20) {
-	    if(j0<0) { 	
-		if(((i0&0x7fffffff)|i1)==0) return x;
-		i1 |= (i0&0x0fffff);
-		i0 &= 0xfffe0000;
-		i0 |= ((i1|-(int)i1)>>12)&0x80000;
-                u.d = x;
-		__HI(u)=i0;
-                x = u.d;
-	        w = TWO52[sx]+x;
-	        t =  w-TWO52[sx];
-                u.d = t;
-	        i0 = __HI(u);
-	        __HI(u) = (i0&0x7fffffff)|(sx<<31);
-                t = u.d;
-	        return t;
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		i>>=1;
-		if(((i0&i)|i1)!=0) {
-		    if(j0==19) i1 = 0x40000000; else
-		    i0 = (i0&(~i))|((0x20000)>>j0);
-		}
-	    }
-	} else if (j0>51) {
-	    if(j0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((unsigned)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    i>>=1;
-	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20));
-	}
-        u.d = x;
-	__HI(u) = i0;
-	__LO(u) = i1;
-        x = u.d;
-	w = TWO52[sx]+x;
-	return w-TWO52[sx];
-}
diff --git a/libs/js/src/fdlibm/s_scalbn.c b/libs/js/src/fdlibm/s_scalbn.c
deleted file mode 100644
index 3deeaa3057..0000000000
--- a/libs/js/src/fdlibm/s_scalbn.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_scalbn.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * scalbn (double x, int n)
- * scalbn(x,n) returns x* 2**n  computed by  exponent  
- * manipulation rather than by actually performing an 
- * exponentiation or a multiplication.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-two54   =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
-really_big   = 1.0e+300,
-tiny   = 1.0e-300;
-
-#ifdef __STDC__
-	double fd_scalbn (double x, int n)
-#else
-	double fd_scalbn (x,n)
-	double x; int n;
-#endif
-{
-        fd_twoints u;
-	int  k,hx,lx;
-        u.d = x;
-	hx = __HI(u);
-	lx = __LO(u);
-        k = (hx&0x7ff00000)>>20;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
-	    x *= two54;
-            u.d = x;
-	    hx = __HI(u);
-	    k = ((hx&0x7ff00000)>>20) - 54; 
-            if (n< -50000) return tiny*x; 	/*underflow*/
-	    }
-        if (k==0x7ff) return x+x;		/* NaN or Inf */
-        k = k+n; 
-        if (k >  0x7fe) return really_big*fd_copysign(really_big,x); /* overflow  */
-        if (k > 0) 				/* normal result */
-	    {u.d = x; __HI(u) = (hx&0x800fffff)|(k<<20); x = u.d; return x;}
-        if (k <= -54) {
-            if (n > 50000) 	/* in case integer overflow in n+k */
-		return really_big*fd_copysign(really_big,x);	/*overflow*/
-	    else return tiny*fd_copysign(tiny,x); 	/*underflow*/
-        }
-        k += 54;				/* subnormal result */
-        u.d = x;
-        __HI(u) = (hx&0x800fffff)|(k<<20);
-        x = u.d;
-        return x*twom54;
-}
diff --git a/libs/js/src/fdlibm/s_signgam.c b/libs/js/src/fdlibm/s_signgam.c
deleted file mode 100644
index 4eb8ce72f8..0000000000
--- a/libs/js/src/fdlibm/s_signgam.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "fdlibm.h"
-int signgam = 0;
diff --git a/libs/js/src/fdlibm/s_significand.c b/libs/js/src/fdlibm/s_significand.c
deleted file mode 100644
index 2e1c0b28fb..0000000000
--- a/libs/js/src/fdlibm/s_significand.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_significand.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * significand(x) computes just
- * 	scalb(x, (double) -ilogb(x)),
- * for exercising the fraction-part(F) IEEE 754-1985 test vector.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_significand(double x)
-#else
-	double fd_significand(x)
-	double x;
-#endif
-{
-	return __ieee754_scalb(x,(double) -fd_ilogb(x));
-}
diff --git a/libs/js/src/fdlibm/s_sin.c b/libs/js/src/fdlibm/s_sin.c
deleted file mode 100644
index 8bbc5c62d9..0000000000
--- a/libs/js/src/fdlibm/s_sin.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_sin.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* sin(x)
- * Return sine function of x.
- *
- * kernel function:
- *	__kernel_sin		... sine function on [-pi/4,pi/4]
- *	__kernel_cos		... cose function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on 
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2 
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_sin(double x)
-#else
-	double fd_sin(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y[2],z=0.0;
-	int n, ix;
-
-    /* High word of x. */
-        u.d = x;
-	ix = __HI(u);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_sin(x,z,0);
-
-    /* sin(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_sin(y[0],y[1],1);
-		case 1: return  __kernel_cos(y[0],y[1]);
-		case 2: return -__kernel_sin(y[0],y[1],1);
-		default:
-			return -__kernel_cos(y[0],y[1]);
-	    }
-	}
-}
diff --git a/libs/js/src/fdlibm/s_tan.c b/libs/js/src/fdlibm/s_tan.c
deleted file mode 100644
index ded36c1d7c..0000000000
--- a/libs/js/src/fdlibm/s_tan.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_tan.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* tan(x)
- * Return tangent function of x.
- *
- * kernel function:
- *	__kernel_tan		... tangent function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on 
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2 
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_tan(double x)
-#else
-	double fd_tan(x)
-	double x;
-#endif
-{
-        fd_twoints u;
-	double y[2],z=0.0;
-	int n, ix;
-
-    /* High word of x. */
-        u.d = x;
-	ix = __HI(u);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_tan(x,z,1);
-
-    /* tan(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;		/* NaN */
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    return __kernel_tan(y[0],y[1],1-((n&1)<<1)); /*   1 -- n even
-							-1 -- n odd */
-	}
-}
diff --git a/libs/js/src/fdlibm/s_tanh.c b/libs/js/src/fdlibm/s_tanh.c
deleted file mode 100644
index aa6809f851..0000000000
--- a/libs/js/src/fdlibm/s_tanh.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)s_tanh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* Tanh(x)
- * Return the Hyperbolic Tangent of x
- *
- * Method :
- *				       x    -x
- *				      e  - e
- *	0. tanh(x) is defined to be -----------
- *				       x    -x
- *				      e  + e
- *	1. reduce x to non-negative by tanh(-x) = -tanh(x).
- *	2.  0      <= x <= 2**-55 : tanh(x) := x*(one+x)
- *					        -t
- *	    2**-55 <  x <=  1     : tanh(x) := -----; t = expm1(-2x)
- *					       t + 2
- *						     2
- *	    1      <= x <=  22.0  : tanh(x) := 1-  ----- ; t=expm1(2x)
- *						   t + 2
- *	    22.0   <  x <= INF    : tanh(x) := 1.
- *
- * Special cases:
- *	tanh(NaN) is NaN;
- *	only tanh(0)=0 is exact for finite argument.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double one=1.0, two=2.0, tiny = 1.0e-300;
-#else
-static double one=1.0, two=2.0, tiny = 1.0e-300;
-#endif
-
-#ifdef __STDC__
-	double fd_tanh(double x)
-#else
-	double fd_tanh(x)
-	double x;
-#endif
-{
-	double t,z;
-	int jx,ix;
-        fd_twoints u;
-
-    /* High word of |x|. */
-        u.d = x;
-	jx = __HI(u);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) { 
-	    if (jx>=0) return one/x+one;    /* tanh(+-inf)=+-1 */
-	    else       return one/x-one;    /* tanh(NaN) = NaN */
-	}
-
-    /* |x| < 22 */
-	if (ix < 0x40360000) {		/* |x|<22 */
-	    if (ix<0x3c800000) 		/* |x|<2**-55 */
-		return x*(one+x);    	/* tanh(small) = small */
-	    if (ix>=0x3ff00000) {	/* |x|>=1  */
-		t = fd_expm1(two*fd_fabs(x));
-		z = one - two/(t+two);
-	    } else {
-	        t = fd_expm1(-two*fd_fabs(x));
-	        z= -t/(t+two);
-	    }
-    /* |x| > 22, return +-1 */
-	} else {
-	    z = one - tiny;		/* raised inexact flag */
-	}
-	return (jx>=0)? z: -z;
-}
diff --git a/libs/js/src/fdlibm/w_acos.c b/libs/js/src/fdlibm/w_acos.c
deleted file mode 100644
index 872c81d208..0000000000
--- a/libs/js/src/fdlibm/w_acos.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_acos.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrap_acos(x)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_acos(double x)		/* wrapper acos */
-#else
-	double fd_acos(x)			/* wrapper acos */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acos(x);
-#else
-	double z;
-	z = __ieee754_acos(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(fd_fabs(x)>1.0) {
-        int err;
-        return __kernel_standard(x,x,1,&err); /* acos(|x|>1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_acosh.c b/libs/js/src/fdlibm/w_acosh.c
deleted file mode 100644
index 745d402eab..0000000000
--- a/libs/js/src/fdlibm/w_acosh.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_acosh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* 
- * wrapper acosh(x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_acosh(double x)		/* wrapper acosh */
-#else
-	double fd_acosh(x)			/* wrapper acosh */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acosh(x);
-#else
-	double z;
-	z = __ieee754_acosh(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(x<1.0) {
-        int err;
-        return __kernel_standard(x,x,29,&err); /* acosh(x<1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_asin.c b/libs/js/src/fdlibm/w_asin.c
deleted file mode 100644
index 18aaefde9b..0000000000
--- a/libs/js/src/fdlibm/w_asin.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_asin.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* 
- * wrapper asin(x)
- */
-
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_asin(double x)		/* wrapper asin */
-#else
-	double fd_asin(x)			/* wrapper asin */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_asin(x);
-#else
-	double z;
-	z = __ieee754_asin(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(fd_fabs(x)>1.0) {
-        int err;
-        return __kernel_standard(x,x,2,&err); /* asin(|x|>1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_atan2.c b/libs/js/src/fdlibm/w_atan2.c
deleted file mode 100644
index 8cfa4bbbde..0000000000
--- a/libs/js/src/fdlibm/w_atan2.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_atan2.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* 
- * wrapper atan2(y,x)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_atan2(double y, double x)	/* wrapper atan2 */
-#else
-	double fd_atan2(y,x)			/* wrapper atan2 */
-	double y,x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atan2(y,x);
-#else
-	double z;
-	z = __ieee754_atan2(y,x);
-	if(_LIB_VERSION == _IEEE_||fd_isnan(x)||fd_isnan(y)) return z;
-	if(x==0.0&&y==0.0) {
-        int err;
-        return __kernel_standard(y,x,3,&err); /* atan2(+-0,+-0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_atanh.c b/libs/js/src/fdlibm/w_atanh.c
deleted file mode 100644
index 6ba52d1e26..0000000000
--- a/libs/js/src/fdlibm/w_atanh.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_atanh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-/* 
- * wrapper atanh(x)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_atanh(double x)		/* wrapper atanh */
-#else
-	double fd_atanh(x)			/* wrapper atanh */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atanh(x);
-#else
-	double z,y;
-	z = __ieee754_atanh(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	y = fd_fabs(x);
-	if(y>=1.0) {
-        int err;
-	    if(y>1.0)
-	        return __kernel_standard(x,x,30,&err); /* atanh(|x|>1) */
-	    else 
-	        return __kernel_standard(x,x,31,&err); /* atanh(|x|==1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_cosh.c b/libs/js/src/fdlibm/w_cosh.c
deleted file mode 100644
index 146449e020..0000000000
--- a/libs/js/src/fdlibm/w_cosh.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_cosh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper cosh(x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_cosh(double x)		/* wrapper cosh */
-#else
-	double fd_cosh(x)			/* wrapper cosh */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_cosh(x);
-#else
-	double z;
-	z = __ieee754_cosh(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(fd_fabs(x)>7.10475860073943863426e+02) {	
-        int err;
-        return __kernel_standard(x,x,5,&err); /* cosh overflow */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_exp.c b/libs/js/src/fdlibm/w_exp.c
deleted file mode 100644
index f5dea0b011..0000000000
--- a/libs/js/src/fdlibm/w_exp.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_exp.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper exp(x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */
-u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
-
-#ifdef __STDC__
-	double fd_exp(double x)		/* wrapper exp */
-#else
-	double fd_exp(x)			/* wrapper exp */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_exp(x);
-#else
-	double z;
-	z = __ieee754_exp(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(fd_finite(x)) {
-        int err;
-	    if(x>o_threshold)
-	        return __kernel_standard(x,x,6,&err); /* exp overflow */
-	    else if(x<u_threshold)
-	        return __kernel_standard(x,x,7,&err); /* exp underflow */
-	} 
-	return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_fmod.c b/libs/js/src/fdlibm/w_fmod.c
deleted file mode 100644
index 76862096d6..0000000000
--- a/libs/js/src/fdlibm/w_fmod.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_fmod.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper fmod(x,y)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_fmod(double x, double y)	/* wrapper fmod */
-#else
-	double fd_fmod(x,y)		/* wrapper fmod */
-	double x,y;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_fmod(x,y);
-#else
-	double z;
-	z = __ieee754_fmod(x,y);
-	if(_LIB_VERSION == _IEEE_ ||fd_isnan(y)||fd_isnan(x)) return z;
-	if(y==0.0) {
-        int err;
-        return __kernel_standard(x,y,27,&err); /* fmod(x,0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_gamma.c b/libs/js/src/fdlibm/w_gamma.c
deleted file mode 100644
index 9eb8e429c4..0000000000
--- a/libs/js/src/fdlibm/w_gamma.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_gamma.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* double gamma(double x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call gamma_r
- */
-
-#include "fdlibm.h"
-
-extern int signgam;
-
-#ifdef __STDC__
-	double fd_gamma(double x)
-#else
-	double fd_gamma(x)
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_gamma_r(x,&signgam);
-#else
-        double y;
-        y = __ieee754_gamma_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!fd_finite(y)&&fd_finite(x)) {
-            int err;
-            if(fd_floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,41,&err); /* gamma pole */
-            else
-                return __kernel_standard(x,x,40,&err); /* gamma overflow */
-        } else
-            return y;
-#endif
-}             
diff --git a/libs/js/src/fdlibm/w_gamma_r.c b/libs/js/src/fdlibm/w_gamma_r.c
deleted file mode 100644
index 2669b4f596..0000000000
--- a/libs/js/src/fdlibm/w_gamma_r.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_gamma_r.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper double gamma_r(double x, int *signgamp)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_gamma_r(double x, int *signgamp) /* wrapper lgamma_r */
-#else
-	double fd_gamma_r(x,signgamp)              /* wrapper lgamma_r */
-        double x; int *signgamp;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_gamma_r(x,signgamp);
-#else
-        double y;
-        y = __ieee754_gamma_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!fd_finite(y)&&fd_finite(x)) {
-            int err;
-            if(fd_floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,41,&err); /* gamma pole */
-            else
-                return __kernel_standard(x,x,40,&err); /* gamma overflow */
-        } else
-            return y;
-#endif
-}             
diff --git a/libs/js/src/fdlibm/w_hypot.c b/libs/js/src/fdlibm/w_hypot.c
deleted file mode 100644
index bfaac66c02..0000000000
--- a/libs/js/src/fdlibm/w_hypot.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_hypot.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrapper hypot(x,y)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_hypot(double x, double y)/* wrapper hypot */
-#else
-	double fd_hypot(x,y)		/* wrapper hypot */
-	double x,y;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_hypot(x,y);
-#else
-	double z;
-	z = __ieee754_hypot(x,y);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if((!fd_finite(z))&&fd_finite(x)&&fd_finite(y)) { 
-        int err;
-	    return __kernel_standard(x,y,4,&err); /* hypot overflow */
-    } else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_j0.c b/libs/js/src/fdlibm/w_j0.c
deleted file mode 100644
index 5e676ff602..0000000000
--- a/libs/js/src/fdlibm/w_j0.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_j0.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrapper j0(double x), y0(double x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_j0(double x)		/* wrapper j0 */
-#else
-	double fd_j0(x)			/* wrapper j0 */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j0(x);
-#else
-	double z = __ieee754_j0(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(fd_fabs(x)>X_TLOSS) {
-        int err;
-        return __kernel_standard(x,x,34,&err); /* j0(|x|>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
-
-#ifdef __STDC__
-	double y0(double x)		/* wrapper y0 */
-#else
-	double y0(x)			/* wrapper y0 */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y0(x);
-#else
-	double z;
-    int err;
-	z = __ieee754_y0(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard(x,x,8,&err);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard(x,x,9,&err);
-        }
-	if(x>X_TLOSS) {
-	        return __kernel_standard(x,x,35,&err); /* y0(x>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_j1.c b/libs/js/src/fdlibm/w_j1.c
deleted file mode 100644
index 86a506bc28..0000000000
--- a/libs/js/src/fdlibm/w_j1.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_j1.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper of j1,y1 
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_j1(double x)		/* wrapper j1 */
-#else
-	double fd_j1(x)			/* wrapper j1 */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j1(x);
-#else
-	double z;
-	z = __ieee754_j1(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) ) return z;
-	if(fd_fabs(x)>X_TLOSS) {
-        int err;
-        return __kernel_standard(x,x,36,&err); /* j1(|x|>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
-
-#ifdef __STDC__
-	double y1(double x)		/* wrapper y1 */
-#else
-	double y1(x)			/* wrapper y1 */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y1(x);
-#else
-	double z;
-    int err;
-	z = __ieee754_y1(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard(x,x,10,&err);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard(x,x,11,&err);
-        }
-	if(x>X_TLOSS) {
-	        return __kernel_standard(x,x,37,&err); /* y1(x>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_jn.c b/libs/js/src/fdlibm/w_jn.c
deleted file mode 100644
index 6926b0da87..0000000000
--- a/libs/js/src/fdlibm/w_jn.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_jn.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrapper jn(int n, double x), yn(int n, double x)
- * floating point Bessel's function of the 1st and 2nd kind
- * of order n
- *          
- * Special cases:
- *	y0(0)=y1(0)=yn(n,0) = -inf with division by zero signal;
- *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
- * Note 2. About jn(n,x), yn(n,x)
- *	For n=0, j0(x) is called,
- *	for n=1, j1(x) is called,
- *	for n<x, forward recursion us used starting
- *	from values of j0(x) and j1(x).
- *	for n>x, a continued fraction approximation to
- *	j(n,x)/j(n-1,x) is evaluated and then backward
- *	recursion is used starting from a supposed value
- *	for j(n,x). The resulting value of j(0,x) is
- *	compared with the actual value to correct the
- *	supposed value of j(n,x).
- *
- *	yn(n,x) is similar in all respects, except
- *	that forward recursion is used for all
- *	values of n>1.
- *	
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_jn(int n, double x)	/* wrapper jn */
-#else
-	double fd_jn(n,x)			/* wrapper jn */
-	double x; int n;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_jn(n,x);
-#else
-	double z;
-	z = __ieee754_jn(n,x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) ) return z;
-	if(fd_fabs(x)>X_TLOSS) {
-        int err;
-	    return __kernel_standard((double)n,x,38,&err); /* jn(|x|>X_TLOSS,n) */
-	} else
-	    return z;
-#endif
-}
-
-#ifdef __STDC__
-	double yn(int n, double x)	/* wrapper yn */
-#else
-	double yn(n,x)			/* wrapper yn */
-	double x; int n;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_yn(n,x);
-#else
-	double z;
-    int err;
-	z = __ieee754_yn(n,x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard((double)n,x,12,&err);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard((double)n,x,13,&err);
-        }
-	if(x>X_TLOSS) {
-	    return __kernel_standard((double)n,x,39,&err); /* yn(x>X_TLOSS,n) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_lgamma.c b/libs/js/src/fdlibm/w_lgamma.c
deleted file mode 100644
index f7576e8921..0000000000
--- a/libs/js/src/fdlibm/w_lgamma.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_lgamma.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- *
- */
-
-/* double lgamma(double x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call __ieee754_lgamma_r
- */
-
-#include "fdlibm.h"
-
-extern int signgam;
-
-#ifdef __STDC__
-	double fd_lgamma(double x)
-#else
-	double fd_lgamma(x)
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,&signgam);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!fd_finite(y)&&fd_finite(x)) {
-            int err;
-            if(fd_floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,15,&err); /* lgamma pole */
-            else
-                return __kernel_standard(x,x,14,&err); /* lgamma overflow */
-        } else
-            return y;
-#endif
-}             
diff --git a/libs/js/src/fdlibm/w_lgamma_r.c b/libs/js/src/fdlibm/w_lgamma_r.c
deleted file mode 100644
index ba2ad5933d..0000000000
--- a/libs/js/src/fdlibm/w_lgamma_r.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_lgamma_r.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper double lgamma_r(double x, int *signgamp)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_lgamma_r(double x, int *signgamp) /* wrapper lgamma_r */
-#else
-	double fd_lgamma_r(x,signgamp)              /* wrapper lgamma_r */
-        double x; int *signgamp;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,signgamp);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!fd_finite(y)&&fd_finite(x)) {
-            int err;
-            if(fd_floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,15,&err); /* lgamma pole */
-            else
-                return __kernel_standard(x,x,14,&err); /* lgamma overflow */
-        } else
-            return y;
-#endif
-}             
diff --git a/libs/js/src/fdlibm/w_log.c b/libs/js/src/fdlibm/w_log.c
deleted file mode 100644
index 7e358fcf11..0000000000
--- a/libs/js/src/fdlibm/w_log.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_log.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrapper log(x)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_log(double x)		/* wrapper log */
-#else
-	double fd_log(x)			/* wrapper log */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log(x);
-#else
-	double z;
-    int err;
-	z = __ieee754_log(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x) || x > 0.0) return z;
-	if(x==0.0)
-	    return __kernel_standard(x,x,16,&err); /* log(0) */
-	else 
-	    return __kernel_standard(x,x,17,&err); /* log(x<0) */
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_log10.c b/libs/js/src/fdlibm/w_log10.c
deleted file mode 100644
index 6b298b236f..0000000000
--- a/libs/js/src/fdlibm/w_log10.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_log10.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper log10(X)
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_log10(double x)		/* wrapper log10 */
-#else
-	double fd_log10(x)			/* wrapper log10 */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log10(x);
-#else
-	double z;
-	z = __ieee754_log10(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(x<=0.0) {
-        int err;
-	    if(x==0.0)
-	        return __kernel_standard(x,x,18,&err); /* log10(0) */
-	    else 
-	        return __kernel_standard(x,x,19,&err); /* log10(x<0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_pow.c b/libs/js/src/fdlibm/w_pow.c
deleted file mode 100644
index 3d2c15ad30..0000000000
--- a/libs/js/src/fdlibm/w_pow.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/* @(#)w_pow.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper pow(x,y) return x**y
- */
-
-#include "fdlibm.h"
-
-
-#ifdef __STDC__
-	double fd_pow(double x, double y)	/* wrapper pow */
-#else
-	double fd_pow(x,y)			/* wrapper pow */
-	double x,y;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return  __ieee754_pow(x,y);
-#else
-	double z;
-    int err;
-	z=__ieee754_pow(x,y);
-	if(_LIB_VERSION == _IEEE_|| fd_isnan(y)) return z;
-	if(fd_isnan(x)) {
-	    if(y==0.0) 
-	        return __kernel_standard(x,y,42,&err); /* pow(NaN,0.0) */
-	    else 
-		return z;
-	}
-	if(x==0.0){ 
-	    if(y==0.0)
-	        return __kernel_standard(x,y,20,&err); /* pow(0.0,0.0) */
-	    if(fd_finite(y)&&y<0.0)
-	        return __kernel_standard(x,y,23,&err); /* pow(0.0,negative) */
-	    return z;
-	}
-	if(!fd_finite(z)) {
-	    if(fd_finite(x)&&fd_finite(y)) {
-	        if(fd_isnan(z))
-	            return __kernel_standard(x,y,24,&err); /* pow neg**non-int */
-	        else 
-	            return __kernel_standard(x,y,21,&err); /* pow overflow */
-	    }
-	} 
-	if(z==0.0&&fd_finite(x)&&fd_finite(y))
-	    return __kernel_standard(x,y,22,&err); /* pow underflow */
-	return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_remainder.c b/libs/js/src/fdlibm/w_remainder.c
deleted file mode 100644
index 25d1ba171f..0000000000
--- a/libs/js/src/fdlibm/w_remainder.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_remainder.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper remainder(x,p)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_remainder(double x, double y)	/* wrapper remainder */
-#else
-	double fd_remainder(x,y)			/* wrapper remainder */
-	double x,y;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_remainder(x,y);
-#else
-	double z;
-	z = __ieee754_remainder(x,y);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(y)) return z;
-	if(y==0.0) {
-	    int err;
-	    return __kernel_standard(x,y,28,&err); /* remainder(x,0) */
-    } else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_scalb.c b/libs/js/src/fdlibm/w_scalb.c
deleted file mode 100644
index 35c16a5001..0000000000
--- a/libs/js/src/fdlibm/w_scalb.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_scalb.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * wrapper scalb(double x, double fn) is provide for
- * passing various standard test suite. One 
- * should use scalbn() instead.
- */
-
-#include "fdlibm.h"
-
-#include <errno.h>
-
-#ifdef __STDC__
-#ifdef _SCALB_INT
-	double fd_scalb(double x, int fn)		/* wrapper scalb */
-#else
-	double fd_scalb(double x, double fn)	/* wrapper scalb */
-#endif
-#else
-	double fd_scalb(x,fn)			/* wrapper scalb */
-#ifdef _SCALB_INT
-	double x; int fn;
-#else
-	double x,fn;
-#endif
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_scalb(x,fn);
-#else
-	double z;
-    int err;
-	z = __ieee754_scalb(x,fn);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!(fd_finite(z)||fd_isnan(z))&&fd_finite(x)) {
-	    return __kernel_standard(x,(double)fn,32,&err); /* scalb overflow */
-	}
-	if(z==0.0&&z!=x) {
-	    return __kernel_standard(x,(double)fn,33,&err); /* scalb underflow */
-	} 
-#ifndef _SCALB_INT
-	if(!fd_finite(fn)) errno = ERANGE;
-#endif
-	return z;
-#endif 
-}
diff --git a/libs/js/src/fdlibm/w_sinh.c b/libs/js/src/fdlibm/w_sinh.c
deleted file mode 100644
index 8b04ecb7fe..0000000000
--- a/libs/js/src/fdlibm/w_sinh.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_sinh.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper sinh(x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_sinh(double x)		/* wrapper sinh */
-#else
-	double fd_sinh(x)			/* wrapper sinh */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sinh(x);
-#else
-	double z; 
-	z = __ieee754_sinh(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!fd_finite(z)&&fd_finite(x)) {
-        int err;
-	    return __kernel_standard(x,x,25,&err); /* sinh overflow */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/fdlibm/w_sqrt.c b/libs/js/src/fdlibm/w_sqrt.c
deleted file mode 100644
index 462d776f8e..0000000000
--- a/libs/js/src/fdlibm/w_sqrt.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Sun Microsystems, Inc.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* @(#)w_sqrt.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper sqrt(x)
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double fd_sqrt(double x)		/* wrapper sqrt */
-#else
-	double fd_sqrt(x)			/* wrapper sqrt */
-	double x;
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sqrt(x);
-#else
-	double z;
-	z = __ieee754_sqrt(x);
-	if(_LIB_VERSION == _IEEE_ || fd_isnan(x)) return z;
-	if(x<0.0) {
-	    int err;
-	    return __kernel_standard(x,x,26,&err); /* sqrt(negative) */
-	} else
-	    return z;
-#endif
-}
diff --git a/libs/js/src/js.c b/libs/js/src/js.c
deleted file mode 100644
index 5dbecf570e..0000000000
--- a/libs/js/src/js.c
+++ /dev/null
@@ -1,2639 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS shell.
- */
-#include "jsstddef.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h"
-#include "jsutil.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsdbgapi.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jslock.h"
-#include "jsobj.h"
-#include "jsparse.h"
-#include "jsscope.h"
-#include "jsscript.h"
-
-#ifdef OSSP
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-#include "jsfile.h"
-#endif
-#if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT -0)
-#include "jsdso.h"
-#endif
-#endif
-
-#ifdef PERLCONNECT
-#include "perlconnect/jsperl.h"
-#endif
-
-#ifdef LIVECONNECT
-#include "jsjava.h"
-#endif
-
-#ifdef JSDEBUGGER
-#include "jsdebug.h"
-#ifdef JSDEBUGGER_JAVA_UI
-#include "jsdjava.h"
-#endif /* JSDEBUGGER_JAVA_UI */
-#ifdef JSDEBUGGER_C_UI
-#include "jsdb.h"
-#endif /* JSDEBUGGER_C_UI */
-#endif /* JSDEBUGGER */
-
-#ifdef XP_UNIX
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#endif
-
-#if defined(XP_WIN) || defined(XP_OS2)
-#include <io.h>     /* for isatty() */
-#endif
-
-#define EXITCODE_RUNTIME_ERROR 3
-#define EXITCODE_FILE_NOT_FOUND 4
-
-size_t gStackChunkSize = 8192;
-static size_t gMaxStackSize = 0;
-static jsuword gStackBase;
-int gExitCode = 0;
-JSBool gQuitting = JS_FALSE;
-FILE *gErrFile = NULL;
-FILE *gOutFile = NULL;
-
-#ifdef JSDEBUGGER
-static JSDContext *_jsdc;
-#ifdef JSDEBUGGER_JAVA_UI
-static JSDJContext *_jsdjc;
-#endif /* JSDEBUGGER_JAVA_UI */
-#endif /* JSDEBUGGER */
-
-static JSBool reportWarnings = JS_TRUE;
-static JSBool compileOnly = JS_FALSE;
-
-typedef enum JSShellErrNum {
-#define MSG_DEF(name, number, count, exception, format) \
-    name = number,
-#include "jsshell.msg"
-#undef MSG_DEF
-    JSShellErr_Limit
-#undef MSGDEF
-} JSShellErrNum;
-
-static const JSErrorFormatString *
-my_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber);
-
-#ifdef EDITLINE
-extern char     *readline(const char *prompt);
-extern void     add_history(char *line);
-#endif
-
-static JSBool
-GetLine(JSContext *cx, char *bufp, FILE *file, const char *prompt) {
-#ifdef EDITLINE
-    /*
-     * Use readline only if file is stdin, because there's no way to specify
-     * another handle.  Are other filehandles interactive?
-     */
-    if (file == stdin) {
-        char *linep = readline(prompt);
-        if (!linep)
-            return JS_FALSE;
-        if (linep[0] != '\0')
-            add_history(linep);
-        strcpy(bufp, linep);
-        JS_free(cx, linep);
-        bufp += strlen(bufp);
-        *bufp++ = '\n';
-        *bufp = '\0';
-    } else
-#endif
-    {
-        char line[256];
-        fprintf(gOutFile, prompt);
-        fflush(gOutFile);
-        if (!fgets(line, sizeof line, file))
-            return JS_FALSE;
-        strcpy(bufp, line);
-    }
-    return JS_TRUE;
-}
-
-static void
-Process(JSContext *cx, JSObject *obj, char *filename)
-{
-    JSBool ok, hitEOF;
-    JSScript *script;
-    jsval result;
-    JSString *str;
-    char buffer[4096];
-    char *bufp;
-    int lineno;
-    int startline;
-    FILE *file;
-    jsuword stackLimit;
-
-    if (!filename || strcmp(filename, "-") == 0) {
-        file = stdin;
-    } else {
-        file = fopen(filename, "r");
-        if (!file) {
-            JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
-                                 JSSMSG_CANT_OPEN, filename, strerror(errno));
-            gExitCode = EXITCODE_FILE_NOT_FOUND;
-            return;
-        }
-    }
-
-    if (gMaxStackSize == 0) {
-        /*
-         * Disable checking for stack overflow if limit is zero.
-         */
-        stackLimit = 0;
-    } else {
-#if JS_STACK_GROWTH_DIRECTION > 0
-        stackLimit = gStackBase + gMaxStackSize;
-#else
-        stackLimit = gStackBase - gMaxStackSize;
-#endif
-    }
-    JS_SetThreadStackLimit(cx, stackLimit);
-
-#if defined(OSSP) && defined(XP_WIN)
-    if (filename) {
-#else
-    if (!isatty(fileno(file))) {
-#endif
-        /*
-         * It's not interactive - just execute it.
-         *
-         * Support the UNIX #! shell hack; gobble the first line if it starts
-         * with '#'.  TODO - this isn't quite compatible with sharp variables,
-         * as a legal js program (using sharp variables) might start with '#'.
-         * But that would require multi-character lookahead.
-         */
-        int ch = fgetc(file);
-        if (ch == '#') {
-            while((ch = fgetc(file)) != EOF) {
-                if (ch == '\n' || ch == '\r')
-                    break;
-            }
-        }
-        ungetc(ch, file);
-        script = JS_CompileFileHandle(cx, obj, filename, file);
-        if (script) {
-            if (!compileOnly)
-                (void)JS_ExecuteScript(cx, obj, script, &result);
-            JS_DestroyScript(cx, script);
-        }
-        return;
-    }
-
-    /* It's an interactive filehandle; drop into read-eval-print loop. */
-    lineno = 1;
-    hitEOF = JS_FALSE;
-    do {
-        bufp = buffer;
-        *bufp = '\0';
-
-        /*
-         * Accumulate lines until we get a 'compilable unit' - one that either
-         * generates an error (before running out of source) or that compiles
-         * cleanly.  This should be whenever we get a complete statement that
-         * coincides with the end of a line.
-         */
-        startline = lineno;
-        do {
-            if (!GetLine(cx, bufp, file, startline == lineno ? "js> " : "")) {
-                hitEOF = JS_TRUE;
-                break;
-            }
-            bufp += strlen(bufp);
-            lineno++;
-        } while (!JS_BufferIsCompilableUnit(cx, obj, buffer, strlen(buffer)));
-
-        /* Clear any pending exception from previous failed compiles.  */
-        JS_ClearPendingException(cx);
-        script = JS_CompileScript(cx, obj, buffer, strlen(buffer), "typein",
-                                  startline);
-        if (script) {
-            if (!compileOnly) {
-                ok = JS_ExecuteScript(cx, obj, script, &result);
-                if (ok && result != JSVAL_VOID) {
-                    str = JS_ValueToString(cx, result);
-                    if (str)
-                        fprintf(gOutFile, "%s\n", JS_GetStringBytes(str));
-                    else
-                        ok = JS_FALSE;
-                }
-            }
-            JS_DestroyScript(cx, script);
-        }
-    } while (!hitEOF && !gQuitting);
-    fprintf(gOutFile, "\n");
-    return;
-}
-
-static int
-usage(void)
-{
-    fprintf(gErrFile, "%s\n", JS_GetImplementationVersion());
-    fprintf(gErrFile, "usage: js [-PswWxC] [-b branchlimit] [-c stackchunksize] [-v version] [-f scriptfile] [-e script] [-S maxstacksize] [scriptfile] [scriptarg...]\n");
-    return 2;
-}
-
-static uint32 gBranchCount;
-static uint32 gBranchLimit;
-
-static JSBool
-my_BranchCallback(JSContext *cx, JSScript *script)
-{
-    if (++gBranchCount == gBranchLimit) {
-        if (script) {
-            if (script->filename)
-                fprintf(gErrFile, "%s:", script->filename);
-            fprintf(gErrFile, "%u: script branch callback (%u callbacks)\n",
-                    script->lineno, gBranchLimit);
-        } else {
-            fprintf(gErrFile, "native branch callback (%u callbacks)\n",
-                    gBranchLimit);
-        }
-        gBranchCount = 0;
-        return JS_FALSE;
-    }
-    if ((gBranchCount & 0x3fff) == 1)
-        JS_MaybeGC(cx);
-    return JS_TRUE;
-}
-
-extern JSClass global_class;
-
-static int
-ProcessArgs(JSContext *cx, JSObject *obj, char **argv, int argc)
-{
-    int i, j, length;
-    JSObject *argsObj;
-    char *filename = NULL;
-    JSBool isInteractive = JS_TRUE;
-
-    /*
-     * Scan past all optional arguments so we can create the arguments object
-     * before processing any -f options, which must interleave properly with
-     * -v and -w options.  This requires two passes, and without getopt, we'll
-     * have to keep the option logic here and in the second for loop in sync.
-     */
-    for (i = 0; i < argc; i++) {
-        if (argv[i][0] != '-' || argv[i][1] == '\0') {
-            ++i;
-            break;
-        }
-        switch (argv[i][1]) {
-          case 'b':
-          case 'c':
-          case 'f':
-          case 'e':
-          case 'v':
-          case 'S':
-            ++i;
-            break;
-          default:;
-        }
-    }
-
-    /*
-     * Create arguments early and define it to root it, so it's safe from any
-     * GC calls nested below, and so it is available to -f <file> arguments.
-     */
-    argsObj = JS_NewArrayObject(cx, 0, NULL);
-    if (!argsObj)
-        return 1;
-    if (!JS_DefineProperty(cx, obj, "arguments", OBJECT_TO_JSVAL(argsObj),
-                           NULL, NULL, 0)) {
-        return 1;
-    }
-
-    length = argc - i;
-    for (j = 0; j < length; j++) {
-        JSString *str = JS_NewStringCopyZ(cx, argv[i++]);
-        if (!str)
-            return 1;
-        if (!JS_DefineElement(cx, argsObj, j, STRING_TO_JSVAL(str),
-                              NULL, NULL, JSPROP_ENUMERATE)) {
-            return 1;
-        }
-    }
-
-    for (i = 0; i < argc; i++) {
-        if (argv[i][0] != '-' || argv[i][1] == '\0') {
-            filename = argv[i++];
-            isInteractive = JS_FALSE;
-            break;
-        }
-
-        switch (argv[i][1]) {
-        case 'v':
-            if (++i == argc) {
-                return usage();
-            }
-            JS_SetVersion(cx, (JSVersion) atoi(argv[i]));
-            break;
-
-        case 'w':
-            reportWarnings = JS_TRUE;
-            break;
-
-        case 'W':
-            reportWarnings = JS_FALSE;
-            break;
-
-        case 's':
-            JS_ToggleOptions(cx, JSOPTION_STRICT);
-            break;
-
-        case 'x':
-            JS_ToggleOptions(cx, JSOPTION_XML);
-            break;
-
-        case 'P':
-            if (JS_GET_CLASS(cx, JS_GetPrototype(cx, obj)) != &global_class) {
-                JSObject *gobj;
-
-                if (!JS_SealObject(cx, obj, JS_TRUE))
-                    return JS_FALSE;
-                gobj = JS_NewObject(cx, &global_class, NULL, NULL);
-                if (!gobj)
-                    return JS_FALSE;
-                if (!JS_SetPrototype(cx, gobj, obj))
-                    return JS_FALSE;
-                JS_SetParent(cx, gobj, NULL);
-                JS_SetGlobalObject(cx, gobj);
-                obj = gobj;
-            }
-            break;
-
-        case 'b':
-            gBranchLimit = atoi(argv[++i]);
-            JS_SetBranchCallback(cx, my_BranchCallback);
-            JS_ToggleOptions(cx, JSOPTION_NATIVE_BRANCH_CALLBACK);
-            break;
-
-        case 'c':
-            /* set stack chunk size */
-            gStackChunkSize = atoi(argv[++i]);
-            break;
-
-        case 'f':
-            if (++i == argc) {
-                return usage();
-            }
-            Process(cx, obj, argv[i]);
-            /*
-             * XXX: js -f foo.js should interpret foo.js and then
-             * drop into interactive mode, but that breaks the test
-             * harness. Just execute foo.js for now.
-             */
-            isInteractive = JS_FALSE;
-            break;
-
-        case 'e':
-        {
-            jsval rval;
-
-            if (++i == argc) {
-                return usage();
-            }
-
-            /* Pass a filename of -e to imitate PERL */
-            JS_EvaluateScript(cx, obj, argv[i], strlen(argv[i]),
-                              "-e", 1, &rval);
-
-            isInteractive = JS_FALSE;
-            break;
-
-        }
-        case 'C':
-            compileOnly = JS_TRUE;
-            isInteractive = JS_FALSE;
-            break;
-
-        case 'S':
-            if (++i == argc) {
-                return usage();
-            }
-            /* Set maximum stack size. */
-            gMaxStackSize = atoi(argv[i]);
-            break;
-
-        default:
-            return usage();
-        }
-    }
-
-    if (filename || isInteractive)
-        Process(cx, obj, filename);
-    return gExitCode;
-}
-
-
-static JSBool
-Version(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (argc > 0 && JSVAL_IS_INT(argv[0]))
-        *rval = INT_TO_JSVAL(JS_SetVersion(cx, (JSVersion) JSVAL_TO_INT(argv[0])));
-    else
-        *rval = INT_TO_JSVAL(JS_GetVersion(cx));
-    return JS_TRUE;
-}
-
-static struct {
-    const char  *name;
-    uint32      flag;
-} js_options[] = {
-    {"strict",          JSOPTION_STRICT},
-    {"werror",          JSOPTION_WERROR},
-    {"atline",          JSOPTION_ATLINE},
-    {"xml",             JSOPTION_XML},
-    {0,                 0}
-};
-
-static JSBool
-Options(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uint32 optset, flag;
-    uintN i, j, found;
-    JSString *str;
-    const char *opt;
-    char *names;
-
-    optset = 0;
-    for (i = 0; i < argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        if (!str)
-            return JS_FALSE;
-        opt = JS_GetStringBytes(str);
-        for (j = 0; js_options[j].name; j++) {
-            if (strcmp(js_options[j].name, opt) == 0) {
-                optset |= js_options[j].flag;
-                break;
-            }
-        }
-    }
-    optset = JS_ToggleOptions(cx, optset);
-
-    names = NULL;
-    found = 0;
-    while (optset != 0) {
-        flag = optset;
-        optset &= optset - 1;
-        flag &= ~optset;
-        for (j = 0; js_options[j].name; j++) {
-            if (js_options[j].flag == flag) {
-                names = JS_sprintf_append(names, "%s%s",
-                                          names ? "," : "", js_options[j].name);
-                found++;
-                break;
-            }
-        }
-    }
-    if (!found)
-        names = strdup("");
-    if (!names) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    str = JS_NewString(cx, names, strlen(names));
-    if (!str) {
-        free(names);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-Load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uintN i;
-    JSString *str;
-    const char *filename;
-    JSScript *script;
-    JSBool ok;
-    jsval result;
-    uint32 oldopts;
-
-    for (i = 0; i < argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        if (!str)
-            return JS_FALSE;
-        argv[i] = STRING_TO_JSVAL(str);
-        filename = JS_GetStringBytes(str);
-        errno = 0;
-        oldopts = JS_GetOptions(cx);
-        JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO);
-        script = JS_CompileFile(cx, obj, filename);
-        if (!script) {
-            ok = JS_FALSE;
-        } else {
-            ok = !compileOnly
-                 ? JS_ExecuteScript(cx, obj, script, &result)
-                 : JS_TRUE;
-            JS_DestroyScript(cx, script);
-        }
-        JS_SetOptions(cx, oldopts);
-        if (!ok)
-            return JS_FALSE;
-    }
-
-    return JS_TRUE;
-}
-
-/*
- * function readline()
- * Provides a hook for scripts to read a line from stdin.
- */
-static JSBool
-ReadLine(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-#define BUFSIZE 256
-    FILE *from;
-    char *buf, *tmp;
-    size_t bufsize, buflength, gotlength;
-    JSString *str;
-
-    from = stdin;
-    buflength = 0;
-    bufsize = BUFSIZE;
-    buf = JS_malloc(cx, bufsize);
-    if (!buf)
-        return JS_FALSE;
-
-    while ((gotlength = 
-            js_fgets(buf + buflength, bufsize - buflength, from)) > 0) {
-        buflength += gotlength;
-
-        /* Are we done? */
-        if (buf[buflength - 1] == '\n') {
-            buf[buflength - 1] = '\0';
-            break;
-        }
-
-        /* Else, grow our buffer for another pass. */
-        tmp = JS_realloc(cx, buf, bufsize * 2);
-        if (!tmp) {
-            JS_free(cx, buf);
-            return JS_FALSE;
-        }
-
-        bufsize *= 2;
-        buf = tmp;
-    }
-
-    /* Treat the empty string specially. */
-    if (buflength == 0) {
-        *rval = JS_GetEmptyStringValue(cx);
-        JS_free(cx, buf);
-        return JS_TRUE;
-    }
-
-    /* Shrink the buffer to the real size. */
-    tmp = JS_realloc(cx, buf, buflength);
-    if (!tmp) {
-        JS_free(cx, buf);
-        return JS_FALSE;
-    }
-
-    buf = tmp;
-
-    /* 
-     * Turn buf into a JSString. Note that buflength includes the trailing null
-     * character.
-     */
-    str = JS_NewString(cx, buf, buflength - 1);
-    if (!str) {
-        JS_free(cx, buf);
-        return JS_FALSE;
-    }
-
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-Print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uintN i, n;
-    JSString *str;
-
-    for (i = n = 0; i < argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        if (!str)
-            return JS_FALSE;
-        fprintf(gOutFile, "%s%s", i ? " " : "", JS_GetStringBytes(str));
-    }
-    n++;
-    if (n)
-        fputc('\n', gOutFile);
-    return JS_TRUE;
-}
-
-static JSBool
-Help(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-static JSBool
-Quit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-#ifdef LIVECONNECT
-    JSJ_SimpleShutdown();
-#endif
-
-    JS_ConvertArguments(cx, argc, argv,"/ i", &gExitCode);
-
-    gQuitting = JS_TRUE;
-    return JS_FALSE;
-}
-
-#ifdef GC_MARK_DEBUG
-extern JS_FRIEND_DATA(FILE *) js_DumpGCHeap;
-#endif
-
-static JSBool
-GC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSRuntime *rt;
-    uint32 preBytes;
-
-    rt = cx->runtime;
-    preBytes = rt->gcBytes;
-#ifdef GC_MARK_DEBUG
-    if (argc && JSVAL_IS_STRING(argv[0])) {
-        char *name = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
-        FILE *file = fopen(name, "w");
-        if (!file) {
-            fprintf(gErrFile, "gc: can't open %s: %s\n", strerror(errno));
-            return JS_FALSE;
-        }
-        js_DumpGCHeap = file;
-    } else {
-        js_DumpGCHeap = stdout;
-    }
-#endif
-    JS_GC(cx);
-#ifdef GC_MARK_DEBUG
-    if (js_DumpGCHeap != stdout)
-        fclose(js_DumpGCHeap);
-    js_DumpGCHeap = NULL;
-#endif
-    fprintf(gOutFile, "before %lu, after %lu, break %08lx\n",
-            (unsigned long)preBytes, (unsigned long)rt->gcBytes,
-#ifdef XP_UNIX
-            (unsigned long)sbrk(0)
-#else
-            0
-#endif
-            );
-#ifdef JS_GCMETER
-    js_DumpGCStats(rt, stdout);
-#endif
-    return JS_TRUE;
-}
-
-static JSScript *
-ValueToScript(JSContext *cx, jsval v)
-{
-    JSScript *script;
-    JSFunction *fun;
-
-    if (!JSVAL_IS_PRIMITIVE(v) &&
-        JS_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_ScriptClass) {
-        script = (JSScript *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-    } else {
-        fun = JS_ValueToFunction(cx, v);
-        if (!fun)
-            return NULL;
-        script = FUN_SCRIPT(fun);
-    }
-    return script;
-}
-
-static JSBool
-GetTrapArgs(JSContext *cx, uintN argc, jsval *argv, JSScript **scriptp,
-            int32 *ip)
-{
-    jsval v;
-    uintN intarg;
-    JSScript *script;
-
-    *scriptp = cx->fp->down->script;
-    *ip = 0;
-    if (argc != 0) {
-        v = argv[0];
-        intarg = 0;
-        if (!JSVAL_IS_PRIMITIVE(v) &&
-            (JS_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_FunctionClass ||
-             JS_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_ScriptClass)) {
-            script = ValueToScript(cx, v);
-            if (!script)
-                return JS_FALSE;
-            *scriptp = script;
-            intarg++;
-        }
-        if (argc > intarg) {
-            if (!JS_ValueToInt32(cx, argv[intarg], ip))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSTrapStatus
-TrapHandler(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval,
-            void *closure)
-{
-    JSString *str;
-    JSStackFrame *caller;
-
-    str = (JSString *) closure;
-    caller = JS_GetScriptedCaller(cx, NULL);
-    if (!JS_EvaluateScript(cx, caller->scopeChain,
-                           JS_GetStringBytes(str), JS_GetStringLength(str),
-                           caller->script->filename, caller->script->lineno,
-                           rval)) {
-        return JSTRAP_ERROR;
-    }
-    if (*rval != JSVAL_VOID)
-        return JSTRAP_RETURN;
-    return JSTRAP_CONTINUE;
-}
-
-static JSBool
-Trap(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    JSScript *script;
-    int32 i;
-
-    if (argc == 0) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_TRAP_USAGE);
-        return JS_FALSE;
-    }
-    argc--;
-    str = JS_ValueToString(cx, argv[argc]);
-    if (!str)
-        return JS_FALSE;
-    argv[argc] = STRING_TO_JSVAL(str);
-    if (!GetTrapArgs(cx, argc, argv, &script, &i))
-        return JS_FALSE;
-    return JS_SetTrap(cx, script, script->code + i, TrapHandler, str);
-}
-
-static JSBool
-Untrap(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSScript *script;
-    int32 i;
-
-    if (!GetTrapArgs(cx, argc, argv, &script, &i))
-        return JS_FALSE;
-    JS_ClearTrap(cx, script, script->code + i, NULL, NULL);
-    return JS_TRUE;
-}
-
-static JSBool
-LineToPC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSScript *script;
-    int32 i;
-    uintN lineno;
-    jsbytecode *pc;
-
-    if (argc == 0) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_LINE2PC_USAGE);
-        return JS_FALSE;
-    }
-    script = cx->fp->down->script;
-    if (!GetTrapArgs(cx, argc, argv, &script, &i))
-        return JS_FALSE;
-    lineno = (i == 0) ? script->lineno : (uintN)i;
-    pc = JS_LineNumberToPC(cx, script, lineno);
-    if (!pc)
-        return JS_FALSE;
-    *rval = INT_TO_JSVAL(PTRDIFF(pc, script->code, jsbytecode));
-    return JS_TRUE;
-}
-
-static JSBool
-PCToLine(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSScript *script;
-    int32 i;
-    uintN lineno;
-
-    if (!GetTrapArgs(cx, argc, argv, &script, &i))
-        return JS_FALSE;
-    lineno = JS_PCToLineNumber(cx, script, script->code + i);
-    if (!lineno)
-        return JS_FALSE;
-    *rval = INT_TO_JSVAL(lineno);
-    return JS_TRUE;
-}
-
-#ifdef DEBUG
-
-static void
-SrcNotes(JSContext *cx, JSScript *script)
-{
-    uintN offset, delta, caseOff;
-    jssrcnote *notes, *sn;
-    JSSrcNoteType type;
-    jsatomid atomIndex;
-    JSAtom *atom;
-
-    fprintf(gOutFile, "\nSource notes:\n");
-    offset = 0;
-    notes = SCRIPT_NOTES(script);
-    for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
-        delta = SN_DELTA(sn);
-        offset += delta;
-        fprintf(gOutFile, "%3u: %5u [%4u] %-8s",
-                PTRDIFF(sn, notes, jssrcnote), offset, delta,
-                js_SrcNoteSpec[SN_TYPE(sn)].name);
-        type = (JSSrcNoteType) SN_TYPE(sn);
-        switch (type) {
-          case SRC_SETLINE:
-            fprintf(gOutFile, " lineno %u", (uintN) js_GetSrcNoteOffset(sn, 0));
-            break;
-          case SRC_FOR:
-            fprintf(gOutFile, " cond %u update %u tail %u",
-                   (uintN) js_GetSrcNoteOffset(sn, 0),
-                   (uintN) js_GetSrcNoteOffset(sn, 1),
-                   (uintN) js_GetSrcNoteOffset(sn, 2));
-            break;
-          case SRC_COND:
-          case SRC_IF_ELSE:
-          case SRC_WHILE:
-          case SRC_PCBASE:
-          case SRC_PCDELTA:
-            fprintf(gOutFile, " offset %u", (uintN) js_GetSrcNoteOffset(sn, 0));
-            break;
-          case SRC_LABEL:
-          case SRC_LABELBRACE:
-          case SRC_BREAK2LABEL:
-          case SRC_CONT2LABEL:
-          case SRC_FUNCDEF: {
-            const char *bytes;
-            JSFunction *fun;
-            JSString *str;
-
-            atomIndex = (jsatomid) js_GetSrcNoteOffset(sn, 0);
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            if (type != SRC_FUNCDEF) {
-                bytes = js_AtomToPrintableString(cx, atom);
-            } else {
-                fun = (JSFunction *)
-                    JS_GetPrivate(cx, ATOM_TO_OBJECT(atom));
-                str = JS_DecompileFunction(cx, fun, JS_DONT_PRETTY_PRINT);
-                bytes = str ? JS_GetStringBytes(str) : "N/A";
-            }
-            fprintf(gOutFile, " atom %u (%s)", (uintN)atomIndex, bytes);
-            break;
-          }
-          case SRC_SWITCH:
-            fprintf(gOutFile, " length %u", (uintN) js_GetSrcNoteOffset(sn, 0));
-            caseOff = (uintN) js_GetSrcNoteOffset(sn, 1);
-            if (caseOff)
-                fprintf(gOutFile, " first case offset %u", caseOff);
-            break;
-          case SRC_CATCH:
-            delta = (uintN) js_GetSrcNoteOffset(sn, 0);
-            if (delta)
-                fprintf(gOutFile, " guard size %u", delta);
-            break;
-          default:;
-        }
-        fputc('\n', gOutFile);
-    }
-}
-
-static JSBool
-Notes(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uintN i;
-    JSScript *script;
-
-    for (i = 0; i < argc; i++) {
-        script = ValueToScript(cx, argv[i]);
-        if (!script)
-            continue;
-
-        SrcNotes(cx, script);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-TryNotes(JSContext *cx, JSScript *script)
-{
-    JSTryNote *tn = script->trynotes;
-
-    if (!tn)
-        return JS_TRUE;
-    fprintf(gOutFile, "\nException table:\nstart\tend\tcatch\n");
-    while (tn->start && tn->catchStart) {
-        fprintf(gOutFile, "  %d\t%d\t%d\n",
-               tn->start, tn->start + tn->length, tn->catchStart);
-        tn++;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-Disassemble(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSBool lines;
-    uintN i;
-    JSScript *script;
-
-    if (argc > 0 &&
-        JSVAL_IS_STRING(argv[0]) &&
-        !strcmp(JS_GetStringBytes(JSVAL_TO_STRING(argv[0])), "-l")) {
-        lines = JS_TRUE;
-        argv++, argc--;
-    } else {
-        lines = JS_FALSE;
-    }
-    for (i = 0; i < argc; i++) {
-        script = ValueToScript(cx, argv[i]);
-        if (!script)
-            continue;
-
-        if (JSVAL_IS_FUNCTION(cx, argv[i])) {
-            JSFunction *fun = JS_ValueToFunction(cx, argv[i]);
-            if (fun && (fun->flags & JSFUN_FLAGS_MASK)) {
-                uint8 flags = fun->flags;
-                fputs("flags:", stdout);
-
-#define SHOW_FLAG(flag) if (flags & JSFUN_##flag) fputs(" " #flag, stdout);
-
-                SHOW_FLAG(LAMBDA);
-                SHOW_FLAG(SETTER);
-                SHOW_FLAG(GETTER);
-                SHOW_FLAG(BOUND_METHOD);
-                SHOW_FLAG(HEAVYWEIGHT);
-
-#undef SHOW_FLAG
-                putchar('\n');
-            }
-        }
-
-        if (!js_Disassemble(cx, script, lines, stdout))
-            return JS_FALSE;
-        SrcNotes(cx, script);
-        TryNotes(cx, script);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-DisassWithSrc(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-#define LINE_BUF_LEN 512
-    uintN i, len, line1, line2, bupline;
-    JSScript *script;
-    FILE *file;
-    char linebuf[LINE_BUF_LEN];
-    jsbytecode *pc, *end;
-    static char sep[] = ";-------------------------";
-
-    for (i = 0; i < argc; i++) {
-        script = ValueToScript(cx, argv[i]);
-        if (!script)
-            continue;
-
-        if (!script || !script->filename) {
-            JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
-                                            JSSMSG_FILE_SCRIPTS_ONLY);
-            return JS_FALSE;
-        }
-
-        file = fopen(script->filename, "r");
-        if (!file) {
-            JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
-                            JSSMSG_CANT_OPEN,
-                            script->filename, strerror(errno));
-            return JS_FALSE;
-        }
-
-        pc = script->code;
-        end = pc + script->length;
-
-        /* burn the leading lines */
-        line2 = JS_PCToLineNumber(cx, script, pc);
-        for (line1 = 0; line1 < line2 - 1; line1++)
-            fgets(linebuf, LINE_BUF_LEN, file);
-
-        bupline = 0;
-        while (pc < end) {
-            line2 = JS_PCToLineNumber(cx, script, pc);
-
-            if (line2 < line1) {
-                if (bupline != line2) {
-                    bupline = line2;
-                    fprintf(gOutFile, "%s %3u: BACKUP\n", sep, line2);
-                }
-            } else {
-                if (bupline && line1 == line2)
-                    fprintf(gOutFile, "%s %3u: RESTORE\n", sep, line2);
-                bupline = 0;
-                while (line1 < line2) {
-                    if (!fgets(linebuf, LINE_BUF_LEN, file)) {
-                        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
-                                             JSSMSG_UNEXPECTED_EOF,
-                                             script->filename);
-                        goto bail;
-                    }
-                    line1++;
-                    fprintf(gOutFile, "%s %3u: %s", sep, line1, linebuf);
-                }
-            }
-
-            len = js_Disassemble1(cx, script, pc,
-                                  PTRDIFF(pc, script->code, jsbytecode),
-                                  JS_TRUE, stdout);
-            if (!len)
-                return JS_FALSE;
-            pc += len;
-        }
-
-      bail:
-        fclose(file);
-    }
-    return JS_TRUE;
-#undef LINE_BUF_LEN
-}
-
-static JSBool
-Tracing(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSBool bval;
-    JSString *str;
-
-    if (argc == 0) {
-        *rval = BOOLEAN_TO_JSVAL(cx->tracefp != 0);
-        return JS_TRUE;
-    }
-
-    switch (JS_TypeOfValue(cx, argv[0])) {
-      case JSTYPE_NUMBER:
-        bval = JSVAL_IS_INT(argv[0])
-               ? JSVAL_TO_INT(argv[0])
-               : (jsint) *JSVAL_TO_DOUBLE(argv[0]);
-        break;
-      case JSTYPE_BOOLEAN:
-        bval = JSVAL_TO_BOOLEAN(argv[0]);
-        break;
-      default:
-        str = JS_ValueToString(cx, argv[0]);
-        if (!str)
-            return JS_FALSE;
-        fprintf(gErrFile, "tracing: illegal argument %s\n",
-                JS_GetStringBytes(str));
-        return JS_TRUE;
-    }
-    cx->tracefp = bval ? stderr : NULL;
-    return JS_TRUE;
-}
-
-typedef struct DumpAtomArgs {
-    JSContext   *cx;
-    FILE        *fp;
-} DumpAtomArgs;
-
-static int
-DumpAtom(JSHashEntry *he, int i, void *arg)
-{
-    DumpAtomArgs *args = (DumpAtomArgs *)arg;
-    FILE *fp = args->fp;
-    JSAtom *atom = (JSAtom *)he;
-
-    fprintf(fp, "%3d %08x %5lu ",
-            i, (uintN)he->keyHash, (unsigned long)atom->number);
-    if (ATOM_IS_STRING(atom))
-        fprintf(fp, "\"%s\"\n", js_AtomToPrintableString(args->cx, atom));
-    else if (ATOM_IS_INT(atom))
-        fprintf(fp, "%ld\n", (long)ATOM_TO_INT(atom));
-    else
-        fprintf(fp, "%.16g\n", *ATOM_TO_DOUBLE(atom));
-    return HT_ENUMERATE_NEXT;
-}
-
-static void
-DumpScope(JSContext *cx, JSObject *obj, FILE *fp)
-{
-    uintN i;
-    JSScope *scope;
-    JSScopeProperty *sprop;
-
-    i = 0;
-    scope = OBJ_SCOPE(obj);
-    for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-        if (SCOPE_HAD_MIDDLE_DELETE(scope) && !SCOPE_HAS_PROPERTY(scope, sprop))
-            continue;
-#ifdef OSSP
-        fprintf(fp, "%3u %lx", i, (unsigned long)sprop);
-#else
-        fprintf(fp, "%3u %p", i, sprop);
-#endif
-        if (JSID_IS_INT(sprop->id)) {
-            fprintf(fp, " [%ld]", (long)JSVAL_TO_INT(sprop->id));
-        } else if (JSID_IS_ATOM(sprop->id)) {
-            JSAtom *atom = JSID_TO_ATOM(sprop->id);
-            fprintf(fp, " \"%s\"", js_AtomToPrintableString(cx, atom));
-        } else {
-            jsval v = OBJECT_TO_JSVAL(JSID_TO_OBJECT(sprop->id));
-            fprintf(fp, " \"%s\"", js_ValueToPrintableString(cx, v));
-        }
-
-#define DUMP_ATTR(name) if (sprop->attrs & JSPROP_##name) fputs(" " #name, fp)
-        DUMP_ATTR(ENUMERATE);
-        DUMP_ATTR(READONLY);
-        DUMP_ATTR(PERMANENT);
-        DUMP_ATTR(EXPORTED);
-        DUMP_ATTR(GETTER);
-        DUMP_ATTR(SETTER);
-#undef  DUMP_ATTR
-
-        fprintf(fp, " slot %lu flags %x shortid %d\n",
-#ifdef OSSP
-                (unsigned long)sprop->slot, sprop->flags, sprop->shortid);
-#else
-                sprop->slot, sprop->flags, sprop->shortid);
-#endif
-    }
-}
-
-static JSBool
-DumpStats(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uintN i;
-    JSString *str;
-    const char *bytes;
-    JSAtom *atom;
-    JSObject *obj2;
-    JSProperty *prop;
-    jsval value;
-
-    for (i = 0; i < argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        if (!str)
-            return JS_FALSE;
-        bytes = JS_GetStringBytes(str);
-        if (strcmp(bytes, "arena") == 0) {
-#ifdef JS_ARENAMETER
-            JS_DumpArenaStats(stdout);
-#endif
-        } else if (strcmp(bytes, "atom") == 0) {
-            DumpAtomArgs args;
-
-            fprintf(gOutFile, "\natom table contents:\n");
-            args.cx = cx;
-            args.fp = stdout;
-            JS_HashTableEnumerateEntries(cx->runtime->atomState.table,
-                                         DumpAtom,
-                                         &args);
-#ifdef HASHMETER
-            JS_HashTableDumpMeter(cx->runtime->atomState.table,
-                                  DumpAtom,
-                                  stdout);
-#endif
-        } else if (strcmp(bytes, "global") == 0) {
-            DumpScope(cx, cx->globalObject, stdout);
-        } else {
-            atom = js_Atomize(cx, bytes, JS_GetStringLength(str), 0);
-            if (!atom)
-                return JS_FALSE;
-            if (!js_FindProperty(cx, ATOM_TO_JSID(atom), &obj, &obj2, &prop))
-                return JS_FALSE;
-            if (prop) {
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-                if (!OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &value))
-                    return JS_FALSE;
-            }
-            if (!prop || !JSVAL_IS_OBJECT(value)) {
-                fprintf(gErrFile, "js: invalid stats argument %s\n",
-                        bytes);
-                continue;
-            }
-            obj = JSVAL_TO_OBJECT(value);
-            if (obj)
-                DumpScope(cx, obj, stdout);
-        }
-    }
-    return JS_TRUE;
-}
-
-#endif /* DEBUG */
-
-#ifdef TEST_EXPORT
-static JSBool
-DoExport(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSAtom *atom;
-    JSObject *obj2;
-    JSProperty *prop;
-    JSBool ok;
-    uintN attrs;
-
-    if (argc != 2) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_DOEXP_USAGE);
-        return JS_FALSE;
-    }
-    if (!JS_ValueToObject(cx, argv[0], &obj))
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(obj);
-    atom = js_ValueToStringAtom(cx, argv[1]);
-    if (!atom)
-        return JS_FALSE;
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &obj2, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        ok = OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID, NULL, NULL,
-                                 JSPROP_EXPORTED, NULL);
-    } else {
-        ok = OBJ_GET_ATTRIBUTES(cx, obj, ATOM_TO_JSID(atom), prop, &attrs);
-        if (ok) {
-            attrs |= JSPROP_EXPORTED;
-            ok = OBJ_SET_ATTRIBUTES(cx, obj, ATOM_TO_JSID(atom), prop, &attrs);
-        }
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-    }
-    return ok;
-}
-#endif
-
-#ifdef TEST_CVTARGS
-#include <ctype.h>
-
-static const char *
-EscapeWideString(jschar *w)
-{
-    static char enuf[80];
-    static char hex[] = "0123456789abcdef";
-    jschar u;
-    unsigned char b, c;
-    int i, j;
-
-    if (!w)
-        return "";
-    for (i = j = 0; i < sizeof enuf - 1; i++, j++) {
-        u = w[j];
-        if (u == 0)
-            break;
-        b = (unsigned char)(u >> 8);
-        c = (unsigned char)(u);
-        if (b) {
-            if (i >= sizeof enuf - 6)
-                break;
-            enuf[i++] = '\\';
-            enuf[i++] = 'u';
-            enuf[i++] = hex[b >> 4];
-            enuf[i++] = hex[b & 15];
-            enuf[i++] = hex[c >> 4];
-            enuf[i] = hex[c & 15];
-        } else if (!isprint(c)) {
-            if (i >= sizeof enuf - 4)
-                break;
-            enuf[i++] = '\\';
-            enuf[i++] = 'x';
-            enuf[i++] = hex[c >> 4];
-            enuf[i] = hex[c & 15];
-        } else {
-            enuf[i] = (char)c;
-        }
-    }
-    enuf[i] = 0;
-    return enuf;
-}
-
-#include <stdarg.h>
-
-static JSBool
-ZZ_formatter(JSContext *cx, const char *format, JSBool fromJS, jsval **vpp,
-             va_list *app)
-{
-    jsval *vp;
-    va_list ap;
-    jsdouble re, im;
-
-    printf("entering ZZ_formatter");
-    vp = *vpp;
-    ap = *app;
-    if (fromJS) {
-        if (!JS_ValueToNumber(cx, vp[0], &re))
-            return JS_FALSE;
-        if (!JS_ValueToNumber(cx, vp[1], &im))
-            return JS_FALSE;
-        *va_arg(ap, jsdouble *) = re;
-        *va_arg(ap, jsdouble *) = im;
-    } else {
-        re = va_arg(ap, jsdouble);
-        im = va_arg(ap, jsdouble);
-        if (!JS_NewNumberValue(cx, re, &vp[0]))
-            return JS_FALSE;
-        if (!JS_NewNumberValue(cx, im, &vp[1]))
-            return JS_FALSE;
-    }
-    *vpp = vp + 2;
-    *app = ap;
-    printf("leaving ZZ_formatter");
-    return JS_TRUE;
-}
-
-static JSBool
-ConvertArgs(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSBool b = JS_FALSE;
-    jschar c = 0;
-    int32 i = 0, j = 0;
-    uint32 u = 0;
-    jsdouble d = 0, I = 0, re = 0, im = 0;
-    char *s = NULL;
-    JSString *str = NULL;
-    jschar *w = NULL;
-    JSObject *obj2 = NULL;
-    JSFunction *fun = NULL;
-    jsval v = JSVAL_VOID;
-    JSBool ok;
-
-    if (!JS_AddArgumentFormatter(cx, "ZZ", ZZ_formatter))
-        return JS_FALSE;;
-    ok = JS_ConvertArguments(cx, argc, argv, "b/ciujdIsSWofvZZ*",
-                             &b, &c, &i, &u, &j, &d, &I, &s, &str, &w, &obj2,
-                             &fun, &v, &re, &im);
-    JS_RemoveArgumentFormatter(cx, "ZZ");
-    if (!ok)
-        return JS_FALSE;
-    fprintf(gOutFile,
-            "b %u, c %x (%c), i %ld, u %lu, j %ld\n",
-            b, c, (char)c, i, u, j);
-    fprintf(gOutFile,
-            "d %g, I %g, s %s, S %s, W %s, obj %s, fun %s\n"
-            "v %s, re %g, im %g\n",
-            d, I, s, str ? JS_GetStringBytes(str) : "", EscapeWideString(w),
-            JS_GetStringBytes(JS_ValueToString(cx, OBJECT_TO_JSVAL(obj2))),
-            fun ? JS_GetStringBytes(JS_DecompileFunction(cx, fun, 4)) : "",
-            JS_GetStringBytes(JS_ValueToString(cx, v)), re, im);
-    return JS_TRUE;
-}
-#endif
-
-static JSBool
-BuildDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    fprintf(gOutFile, "built on %s at %s\n", __DATE__, __TIME__);
-    return JS_TRUE;
-}
-
-static JSBool
-Clear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (argc != 0 && !JS_ValueToObject(cx, argv[0], &obj))
-        return JS_FALSE;
-    JS_ClearScope(cx, obj);
-    return JS_TRUE;
-}
-
-static JSBool
-Intern(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-
-    str = JS_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    if (!JS_InternUCStringN(cx, JS_GetStringChars(str),
-                                JS_GetStringLength(str))) {
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-Clone(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFunction *fun;
-    JSObject *funobj, *parent, *clone;
-
-    fun = JS_ValueToFunction(cx, argv[0]);
-    if (!fun)
-        return JS_FALSE;
-    funobj = JS_GetFunctionObject(fun);
-    if (argc > 1) {
-        if (!JS_ValueToObject(cx, argv[1], &parent))
-            return JS_FALSE;
-    } else {
-        parent = JS_GetParent(cx, funobj);
-    }
-    clone = JS_CloneFunctionObject(cx, funobj, parent);
-    if (!clone)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(clone);
-    return JS_TRUE;
-}
-
-static JSBool
-Seal(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *target;
-    JSBool deep = JS_FALSE;
-
-    if (!JS_ConvertArguments(cx, argc, argv, "o/b", &target, &deep))
-        return JS_FALSE;
-    if (!target)
-        return JS_TRUE;
-    return JS_SealObject(cx, target, deep);
-}
-
-static JSBool
-GetPDA(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *vobj, *aobj, *pdobj;
-    JSBool ok;
-    JSPropertyDescArray pda;
-    JSPropertyDesc *pd;
-    uint32 i;
-    jsval v;
-
-    if (!JS_ValueToObject(cx, argv[0], &vobj))
-        return JS_FALSE;
-    if (!vobj)
-        return JS_TRUE;
-
-    aobj = JS_NewArrayObject(cx, 0, NULL);
-    if (!aobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(aobj);
-
-    ok = JS_GetPropertyDescArray(cx, vobj, &pda);
-    if (!ok)
-        return JS_FALSE;
-    pd = pda.array;
-    for (i = 0; i < pda.length; i++) {
-        pdobj = JS_NewObject(cx, NULL, NULL, NULL);
-        if (!pdobj) {
-            ok = JS_FALSE;
-            break;
-        }
-
-        ok = JS_SetProperty(cx, pdobj, "id", &pd->id) &&
-             JS_SetProperty(cx, pdobj, "value", &pd->value) &&
-             (v = INT_TO_JSVAL(pd->flags),
-              JS_SetProperty(cx, pdobj, "flags", &v)) &&
-             (v = INT_TO_JSVAL(pd->slot),
-              JS_SetProperty(cx, pdobj, "slot", &v)) &&
-             JS_SetProperty(cx, pdobj, "alias", &pd->alias);
-        if (!ok)
-            break;
-
-        v = OBJECT_TO_JSVAL(pdobj);
-        ok = JS_SetElement(cx, aobj, i, &v);
-        if (!ok)
-            break;
-    }
-    JS_PutPropertyDescArray(cx, &pda);
-    return ok;
-}
-
-static JSBool
-GetSLX(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSScript *script;
-
-    script = ValueToScript(cx, argv[0]);
-    if (!script)
-        return JS_FALSE;
-    *rval = INT_TO_JSVAL(js_GetScriptLineExtent(script));
-    return JS_TRUE;
-}
-
-static JSBool
-ToInt32(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    int32 i;
-
-    if (!JS_ValueToInt32(cx, argv[0], &i))
-        return JS_FALSE;
-    return JS_NewNumberValue(cx, i, rval);
-}
-
-static JSBool
-StringsAreUtf8(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    *rval = JS_CStringsAreUTF8() ? JSVAL_TRUE : JSVAL_FALSE;
-    return JS_TRUE;
-}
-
-static const char* badUtf8 = "...\xC0...";
-static const char* bigUtf8 = "...\xFB\xBF\xBF\xBF\xBF...";
-static const jschar badSurrogate[] = { 'A', 'B', 'C', 0xDEEE, 'D', 'E', 0 };
-
-static JSBool
-TestUtf8(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    intN mode = 1;
-    jschar chars[20];
-    size_t charsLength = 5;
-    char bytes[20];
-    size_t bytesLength = 20;
-    if (argc && !JS_ValueToInt32(cx, *argv, &mode))
-        return JS_FALSE;
-
-    /* The following throw errors if compiled with UTF-8. */
-    switch (mode) {
-      /* mode 1: malformed UTF-8 string. */
-      case 1: 
-        JS_NewStringCopyZ(cx, badUtf8); 
-        break;
-      /* mode 2: big UTF-8 character. */
-      case 2: 
-        JS_NewStringCopyZ(cx, bigUtf8); 
-        break;
-      /* mode 3: bad surrogate character. */
-      case 3: 
-        JS_EncodeCharacters(cx, badSurrogate, 6, bytes, &bytesLength); 
-        break;
-      /* mode 4: use a too small buffer. */
-      case 4: 
-        JS_DecodeBytes(cx, "1234567890", 10, chars, &charsLength); 
-        break;
-      default:
-        JS_ReportError(cx, "invalid mode parameter");
-        return JS_FALSE;
-    }
-    return !JS_IsExceptionPending (cx);
-}
-
-static JSFunctionSpec shell_functions[] = {
-    {"version",         Version,        0},
-    {"options",         Options,        0},
-    {"load",            Load,           1},
-    {"readline",        ReadLine,       0},
-    {"print",           Print,          0},
-    {"help",            Help,           0},
-    {"quit",            Quit,           0},
-    {"gc",              GC,             0},
-    {"trap",            Trap,           3},
-    {"untrap",          Untrap,         2},
-    {"line2pc",         LineToPC,       0},
-    {"pc2line",         PCToLine,       0},
-    {"stringsAreUtf8",  StringsAreUtf8, 0},
-    {"testUtf8",        TestUtf8,       1},
-#ifdef DEBUG
-    {"dis",             Disassemble,    1},
-    {"dissrc",          DisassWithSrc,  1},
-    {"notes",           Notes,          1},
-    {"tracing",         Tracing,        0},
-    {"stats",           DumpStats,      1},
-#endif
-#ifdef TEST_EXPORT
-    {"xport",           DoExport,       2},
-#endif
-#ifdef TEST_CVTARGS
-    {"cvtargs",         ConvertArgs,    0, 0, 12},
-#endif
-    {"build",           BuildDate,      0},
-    {"clear",           Clear,          0},
-    {"intern",          Intern,         1},
-    {"clone",           Clone,          1},
-    {"seal",            Seal,           1, 0, 1},
-    {"getpda",          GetPDA,         1},
-    {"getslx",          GetSLX,         1},
-    {"toint32",         ToInt32,        1},
-    {0}
-};
-
-/* NOTE: These must be kept in sync with the above. */
-
-static char *shell_help_messages[] = {
-    "version([number])      Get or set JavaScript version number",
-    "options([option ...])  Get or toggle JavaScript options",
-    "load(['foo.js' ...])   Load files named by string arguments",
-    "readline()             Read a single line from stdin",
-    "print([exp ...])       Evaluate and print expressions",
-    "help([name ...])       Display usage and help messages",
-    "quit()                 Quit the shell",
-    "gc()                   Run the garbage collector",
-    "trap([fun, [pc,]] exp) Trap bytecode execution",
-    "untrap(fun[, pc])      Remove a trap",
-    "line2pc([fun,] line)   Map line number to PC",
-    "pc2line(fun[, pc])     Map PC to line number",
-    "stringsAreUTF8()       Check if strings are UTF-8 encoded",
-    "testUTF8(mode)         Perform UTF-8 tests (modes are 1 to 4)",
-#ifdef DEBUG
-    "dis([fun])             Disassemble functions into bytecodes",
-    "dissrc([fun])          Disassemble functions with source lines",
-    "notes([fun])           Show source notes for functions",
-    "tracing([toggle])      Turn tracing on or off",
-    "stats([string ...])    Dump 'arena', 'atom', 'global' stats",
-#endif
-#ifdef TEST_EXPORT
-    "xport(obj, id)         Export identified property from object",
-#endif
-#ifdef TEST_CVTARGS
-    "cvtargs(b, c, ...)     Test JS_ConvertArguments",
-#endif
-    "build()                Show build date and time",
-    "clear([obj])           Clear properties of object",
-    "intern(str)            Internalize str in the atom table",
-    "clone(fun[, scope])    Clone function object",
-    "seal(obj[, deep])      Seal object, or object graph if deep",
-    "getpda(obj)            Get the property descriptors for obj",
-    "getslx(obj)            Get script line extent",
-    "toint32(n)             Testing hook for JS_ValueToInt32",
-    0
-};
-
-static void
-ShowHelpHeader(void)
-{
-    fprintf(gOutFile, "%-14s %-22s %s\n", "Command", "Usage", "Description");
-    fprintf(gOutFile, "%-14s %-22s %s\n", "=======", "=====", "===========");
-}
-
-static void
-ShowHelpForCommand(uintN n)
-{
-    fprintf(gOutFile, "%-14.14s %s\n", shell_functions[n].name, shell_help_messages[n]);
-}
-
-static JSBool
-Help(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    uintN i, j;
-    int did_header, did_something;
-    JSType type;
-    JSFunction *fun;
-    JSString *str;
-    const char *bytes;
-
-    fprintf(gOutFile, "%s\n", JS_GetImplementationVersion());
-    if (argc == 0) {
-        ShowHelpHeader();
-        for (i = 0; shell_functions[i].name; i++)
-            ShowHelpForCommand(i);
-    } else {
-        did_header = 0;
-        for (i = 0; i < argc; i++) {
-            did_something = 0;
-            type = JS_TypeOfValue(cx, argv[i]);
-            if (type == JSTYPE_FUNCTION) {
-                fun = JS_ValueToFunction(cx, argv[i]);
-                str = fun->atom ? ATOM_TO_STRING(fun->atom) : NULL;
-            } else if (type == JSTYPE_STRING) {
-                str = JSVAL_TO_STRING(argv[i]);
-            } else {
-                str = NULL;
-            }
-            if (str) {
-                bytes = JS_GetStringBytes(str);
-                for (j = 0; shell_functions[j].name; j++) {
-                    if (!strcmp(bytes, shell_functions[j].name)) {
-                        if (!did_header) {
-                            did_header = 1;
-                            ShowHelpHeader();
-                        }
-                        did_something = 1;
-                        ShowHelpForCommand(j);
-                        break;
-                    }
-                }
-            }
-            if (!did_something) {
-                str = JS_ValueToString(cx, argv[i]);
-                if (!str)
-                    return JS_FALSE;
-                fprintf(gErrFile, "Sorry, no help for %s\n",
-                        JS_GetStringBytes(str));
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-/*
- * Define a JS object called "it".  Give it class operations that printf why
- * they're being called for tutorial purposes.
- */
-enum its_tinyid {
-    ITS_COLOR, ITS_HEIGHT, ITS_WIDTH, ITS_FUNNY, ITS_ARRAY, ITS_RDONLY
-};
-
-static JSPropertySpec its_props[] = {
-    {"color",           ITS_COLOR,      JSPROP_ENUMERATE},
-    {"height",          ITS_HEIGHT,     JSPROP_ENUMERATE},
-    {"width",           ITS_WIDTH,      JSPROP_ENUMERATE},
-    {"funny",           ITS_FUNNY,      JSPROP_ENUMERATE},
-    {"array",           ITS_ARRAY,      JSPROP_ENUMERATE},
-    {"rdonly",          ITS_RDONLY,     JSPROP_READONLY},
-    {0}
-};
-
-static JSBool
-its_item(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    *rval = OBJECT_TO_JSVAL(obj);
-    if (argc != 0)
-        JS_SetCallReturnValue2(cx, argv[0]);
-    return JS_TRUE;
-}
-
-static JSBool
-its_bindMethod(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    char *name;
-    JSObject *method;
-
-    if (!JS_ConvertArguments(cx, argc, argv, "so", &name, &method))
-        return JS_FALSE;
-
-    *rval = OBJECT_TO_JSVAL(method);
-
-    if (JS_TypeOfValue(cx, *rval) != JSTYPE_FUNCTION) {
-        JSString *valstr = JS_ValueToString(cx, *rval);
-        if (valstr) {
-            JS_ReportError(cx, "can't bind method %s to non-callable object %s",
-                           name, JS_GetStringBytes(valstr));
-        }
-        return JS_FALSE;
-    }
-
-    if (!JS_DefineProperty(cx, obj, name, *rval, NULL, NULL, JSPROP_ENUMERATE))
-        return JS_FALSE;
-
-    return JS_SetParent(cx, method, obj);
-}
-
-static JSFunctionSpec its_methods[] = {
-    {"item",            its_item,       0},
-    {"bindMethod",      its_bindMethod, 2},
-    {0}
-};
-
-#ifdef JSD_LOWLEVEL_SOURCE
-/*
- * This facilitates sending source to JSD (the debugger system) in the shell
- * where the source is loaded using the JSFILE hack in jsscan. The function
- * below is used as a callback for the jsdbgapi JS_SetSourceHandler hook.
- * A more normal embedding (e.g. mozilla) loads source itself and can send
- * source directly to JSD without using this hook scheme.
- */
-static void
-SendSourceToJSDebugger(const char *filename, uintN lineno,
-                       jschar *str, size_t length,
-                       void **listenerTSData, JSDContext* jsdc)
-{
-    JSDSourceText *jsdsrc = (JSDSourceText *) *listenerTSData;
-
-    if (!jsdsrc) {
-        if (!filename)
-            filename = "typein";
-        if (1 == lineno) {
-            jsdsrc = JSD_NewSourceText(jsdc, filename);
-        } else {
-            jsdsrc = JSD_FindSourceForURL(jsdc, filename);
-            if (jsdsrc && JSD_SOURCE_PARTIAL !=
-                JSD_GetSourceStatus(jsdc, jsdsrc)) {
-                jsdsrc = NULL;
-            }
-        }
-    }
-    if (jsdsrc) {
-        jsdsrc = JSD_AppendUCSourceText(jsdc,jsdsrc, str, length,
-                                        JSD_SOURCE_PARTIAL);
-    }
-    *listenerTSData = jsdsrc;
-}
-#endif /* JSD_LOWLEVEL_SOURCE */
-
-static JSBool its_noisy;    /* whether to be noisy when finalizing it */
-
-static JSBool
-its_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    if (its_noisy) {
-        fprintf(gOutFile, "adding its property %s,",
-               JS_GetStringBytes(JS_ValueToString(cx, id)));
-        fprintf(gOutFile, " initial value %s\n",
-               JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-its_delProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    if (its_noisy) {
-        fprintf(gOutFile, "deleting its property %s,",
-               JS_GetStringBytes(JS_ValueToString(cx, id)));
-        fprintf(gOutFile, " current value %s\n",
-               JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-its_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    if (its_noisy) {
-        fprintf(gOutFile, "getting its property %s,",
-               JS_GetStringBytes(JS_ValueToString(cx, id)));
-        fprintf(gOutFile, " current value %s\n",
-               JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-its_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    if (its_noisy) {
-        fprintf(gOutFile, "setting its property %s,",
-               JS_GetStringBytes(JS_ValueToString(cx, id)));
-        fprintf(gOutFile, " new value %s\n",
-               JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-    }
-    if (JSVAL_IS_STRING(id) &&
-        !strcmp(JS_GetStringBytes(JSVAL_TO_STRING(id)), "noisy")) {
-        return JS_ValueToBoolean(cx, *vp, &its_noisy);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-its_enumerate(JSContext *cx, JSObject *obj)
-{
-    if (its_noisy)
-        fprintf(gOutFile, "enumerate its properties\n");
-    return JS_TRUE;
-}
-
-static JSBool
-its_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-            JSObject **objp)
-{
-    if (its_noisy) {
-        fprintf(gOutFile, "resolving its property %s, flags {%s,%s,%s}\n",
-               JS_GetStringBytes(JS_ValueToString(cx, id)),
-               (flags & JSRESOLVE_QUALIFIED) ? "qualified" : "",
-               (flags & JSRESOLVE_ASSIGNING) ? "assigning" : "",
-               (flags & JSRESOLVE_DETECTING) ? "detecting" : "");
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-its_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
-{
-    if (its_noisy)
-        fprintf(gOutFile, "converting it to %s type\n", JS_GetTypeName(cx, type));
-    return JS_TRUE;
-}
-
-static void
-its_finalize(JSContext *cx, JSObject *obj)
-{
-    if (its_noisy)
-        fprintf(gOutFile, "finalizing it\n");
-}
-
-static JSClass its_class = {
-    "It", JSCLASS_NEW_RESOLVE,
-    its_addProperty,  its_delProperty,  its_getProperty,  its_setProperty,
-    its_enumerate,    (JSResolveOp)its_resolve,
-                                        its_convert,      its_finalize
-};
-
-JSErrorFormatString jsShell_ErrorFormatString[JSErr_Limit] = {
-#if JS_HAS_DFLT_MSG_STRINGS
-#define MSG_DEF(name, number, count, exception, format) \
-    { format, count } ,
-#else
-#define MSG_DEF(name, number, count, exception, format) \
-    { NULL, count } ,
-#endif
-#include "jsshell.msg"
-#undef MSG_DEF
-};
-
-static const JSErrorFormatString *
-my_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber)
-{
-    if ((errorNumber > 0) && (errorNumber < JSShellErr_Limit))
-        return &jsShell_ErrorFormatString[errorNumber];
-    return NULL;
-}
-
-static void
-my_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
-{
-    int i, j, k, n;
-    char *prefix, *tmp;
-    const char *ctmp;
-
-    if (!report) {
-        fprintf(gErrFile, "%s\n", message);
-        return;
-    }
-
-    /* Conditionally ignore reported warnings. */
-    if (JSREPORT_IS_WARNING(report->flags) && !reportWarnings)
-        return;
-
-    prefix = NULL;
-    if (report->filename)
-        prefix = JS_smprintf("%s:", report->filename);
-    if (report->lineno) {
-        tmp = prefix;
-        prefix = JS_smprintf("%s%u: ", tmp ? tmp : "", report->lineno);
-        JS_free(cx, tmp);
-    }
-    if (JSREPORT_IS_WARNING(report->flags)) {
-        tmp = prefix;
-        prefix = JS_smprintf("%s%swarning: ",
-                             tmp ? tmp : "",
-                             JSREPORT_IS_STRICT(report->flags) ? "strict " : "");
-        JS_free(cx, tmp);
-    }
-
-    /* embedded newlines -- argh! */
-    while ((ctmp = strchr(message, '\n')) != 0) {
-        ctmp++;
-        if (prefix)
-            fputs(prefix, gErrFile);
-        fwrite(message, 1, ctmp - message, gErrFile);
-        message = ctmp;
-    }
-
-    /* If there were no filename or lineno, the prefix might be empty */
-    if (prefix)
-        fputs(prefix, gErrFile);
-    fputs(message, gErrFile);
-
-    if (!report->linebuf) {
-        fputc('\n', gErrFile);
-        goto out;
-    }
-
-    /* report->linebuf usually ends with a newline. */
-    n = strlen(report->linebuf);
-    fprintf(gErrFile, ":\n%s%s%s%s",
-            prefix,
-            report->linebuf,
-            (n > 0 && report->linebuf[n-1] == '\n') ? "" : "\n",
-            prefix);
-    n = PTRDIFF(report->tokenptr, report->linebuf, char);
-    for (i = j = 0; i < n; i++) {
-        if (report->linebuf[i] == '\t') {
-            for (k = (j + 8) & ~7; j < k; j++) {
-                fputc('.', gErrFile);
-            }
-            continue;
-        }
-        fputc('.', gErrFile);
-        j++;
-    }
-    fputs("^\n", gErrFile);
- out:
-    if (!JSREPORT_IS_WARNING(report->flags))
-        gExitCode = EXITCODE_RUNTIME_ERROR;
-    JS_free(cx, prefix);
-}
-
-#if defined(SHELL_HACK) && defined(DEBUG) && defined(XP_UNIX)
-static JSBool
-Exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFunction *fun;
-    const char *name, **nargv;
-    uintN i, nargc;
-    JSString *str;
-    pid_t pid;
-    int status;
-
-    fun = JS_ValueToFunction(cx, argv[-2]);
-    if (!fun)
-        return JS_FALSE;
-    if (!fun->atom)
-        return JS_TRUE;
-    name = JS_GetStringBytes(ATOM_TO_STRING(fun->atom));
-    nargc = 1 + argc;
-    nargv = JS_malloc(cx, (nargc + 1) * sizeof(char *));
-    if (!nargv)
-        return JS_FALSE;
-    nargv[0] = name;
-    for (i = 1; i < nargc; i++) {
-        str = JS_ValueToString(cx, argv[i-1]);
-        if (!str) {
-            JS_free(cx, nargv);
-            return JS_FALSE;
-        }
-        nargv[i] = JS_GetStringBytes(str);
-    }
-    nargv[nargc] = 0;
-    pid = fork();
-    switch (pid) {
-      case -1:
-        perror("js");
-        break;
-      case 0:
-        (void) execvp(name, (char **)nargv);
-        perror("js");
-        exit(127);
-      default:
-        while (waitpid(pid, &status, 0) < 0 && errno == EINTR)
-            continue;
-        break;
-    }
-    JS_free(cx, nargv);
-    return JS_TRUE;
-}
-#endif
-
-#define LAZY_STANDARD_CLASSES
-
-static JSBool
-global_enumerate(JSContext *cx, JSObject *obj)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    return JS_EnumerateStandardClasses(cx, obj);
-#else
-    return JS_TRUE;
-#endif
-}
-
-static JSBool
-global_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-               JSObject **objp)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    if ((flags & JSRESOLVE_ASSIGNING) == 0) {
-        JSBool resolved;
-
-        if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-            return JS_FALSE;
-        if (resolved) {
-            *objp = obj;
-            return JS_TRUE;
-        }
-    }
-#endif
-
-#if defined(SHELL_HACK) && defined(DEBUG) && defined(XP_UNIX)
-    if ((flags & (JSRESOLVE_QUALIFIED | JSRESOLVE_ASSIGNING)) == 0) {
-        /*
-         * Do this expensive hack only for unoptimized Unix builds, which are
-         * not used for benchmarking.
-         */
-        char *path, *comp, *full;
-        const char *name;
-        JSBool ok, found;
-        JSFunction *fun;
-
-        if (!JSVAL_IS_STRING(id))
-            return JS_TRUE;
-        path = getenv("PATH");
-        if (!path)
-            return JS_TRUE;
-        path = JS_strdup(cx, path);
-        if (!path)
-            return JS_FALSE;
-        name = JS_GetStringBytes(JSVAL_TO_STRING(id));
-        ok = JS_TRUE;
-        for (comp = strtok(path, ":"); comp; comp = strtok(NULL, ":")) {
-            if (*comp != '\0') {
-                full = JS_smprintf("%s/%s", comp, name);
-                if (!full) {
-                    JS_ReportOutOfMemory(cx);
-                    ok = JS_FALSE;
-                    break;
-                }
-            } else {
-                full = (char *)name;
-            }
-            found = (access(full, X_OK) == 0);
-            if (*comp != '\0')
-                free(full);
-            if (found) {
-                fun = JS_DefineFunction(cx, obj, name, Exec, 0,
-                                        JSPROP_ENUMERATE);
-                ok = (fun != NULL);
-                if (ok)
-                    *objp = obj;
-                break;
-            }
-        }
-        JS_free(cx, path);
-        return ok;
-    }
-#else
-    return JS_TRUE;
-#endif
-}
-
-JSClass global_class = {
-    "global", JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
-    JS_PropertyStub,  JS_PropertyStub,
-    global_enumerate, (JSResolveOp) global_resolve,
-    JS_ConvertStub,   JS_FinalizeStub
-};
-
-static JSBool
-env_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-/* XXX porting may be easy, but these don't seem to supply setenv by default */
-#if !defined XP_BEOS && !defined XP_OS2 && !defined SOLARIS
-    JSString *idstr, *valstr;
-    const char *name, *value;
-    int rv;
-
-    idstr = JS_ValueToString(cx, id);
-    valstr = JS_ValueToString(cx, *vp);
-    if (!idstr || !valstr)
-        return JS_FALSE;
-    name = JS_GetStringBytes(idstr);
-    value = JS_GetStringBytes(valstr);
-#if defined XP_WIN || defined HPUX || defined OSF1 || defined IRIX
-    {
-        char *waste = JS_smprintf("%s=%s", name, value);
-        if (!waste) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-        rv = putenv(waste);
-#ifdef XP_WIN
-        /*
-         * HPUX9 at least still has the bad old non-copying putenv.
-         *
-         * Per mail from <s.shanmuganathan@digital.com>, OSF1 also has a putenv
-         * that will crash if you pass it an auto char array (so it must place
-         * its argument directly in the char *environ[] array).
-         */
-        free(waste);
-#endif
-    }
-#else
-    rv = setenv(name, value, 1);
-#endif
-    if (rv < 0) {
-        JS_ReportError(cx, "can't set envariable %s to %s", name, value);
-        return JS_FALSE;
-    }
-    *vp = STRING_TO_JSVAL(valstr);
-#endif /* !defined XP_BEOS && !defined XP_OS2 && !defined SOLARIS */
-    return JS_TRUE;
-}
-
-static JSBool
-env_enumerate(JSContext *cx, JSObject *obj)
-{
-    static JSBool reflected;
-    char **evp, *name, *value;
-    JSString *valstr;
-    JSBool ok;
-
-    if (reflected)
-        return JS_TRUE;
-
-    for (evp = (char **)JS_GetPrivate(cx, obj); (name = *evp) != NULL; evp++) {
-        value = strchr(name, '=');
-        if (!value)
-            continue;
-        *value++ = '\0';
-        valstr = JS_NewStringCopyZ(cx, value);
-        if (!valstr) {
-            ok = JS_FALSE;
-        } else {
-            ok = JS_DefineProperty(cx, obj, name, STRING_TO_JSVAL(valstr),
-                                   NULL, NULL, JSPROP_ENUMERATE);
-        }
-        value[-1] = '=';
-        if (!ok)
-            return JS_FALSE;
-    }
-
-    reflected = JS_TRUE;
-    return JS_TRUE;
-}
-
-static JSBool
-env_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-            JSObject **objp)
-{
-    JSString *idstr, *valstr;
-    const char *name, *value;
-
-    if (flags & JSRESOLVE_ASSIGNING)
-        return JS_TRUE;
-
-    idstr = JS_ValueToString(cx, id);
-    if (!idstr)
-        return JS_FALSE;
-    name = JS_GetStringBytes(idstr);
-    value = getenv(name);
-    if (value) {
-        valstr = JS_NewStringCopyZ(cx, value);
-        if (!valstr)
-            return JS_FALSE;
-        if (!JS_DefineProperty(cx, obj, name, STRING_TO_JSVAL(valstr),
-                               NULL, NULL, JSPROP_ENUMERATE)) {
-            return JS_FALSE;
-        }
-        *objp = obj;
-    }
-    return JS_TRUE;
-}
-
-static JSClass env_class = {
-    "environment", JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
-    JS_PropertyStub,  env_setProperty,
-    env_enumerate, (JSResolveOp) env_resolve,
-    JS_ConvertStub,   JS_FinalizeStub
-};
-
-#ifdef NARCISSUS
-
-static JSBool
-defineProperty(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSString *str;
-    jsval value;
-    JSBool dontDelete, readOnly, dontEnum;
-    const jschar *chars;
-    size_t length;
-    uintN attrs;
-
-    dontDelete = readOnly = dontEnum = JS_FALSE;
-    if (!JS_ConvertArguments(cx, argc, argv, "Sv/bbb",
-                             &str, &value, &dontDelete, &readOnly, &dontEnum)) {
-        return JS_FALSE;
-    }
-    chars = JS_GetStringChars(str);
-    length = JS_GetStringLength(str);
-    attrs = dontEnum ? 0 : JSPROP_ENUMERATE;
-    if (dontDelete)
-        attrs |= JSPROP_PERMANENT;
-    if (readOnly)
-        attrs |= JSPROP_READONLY;
-    return JS_DefineUCProperty(cx, obj, chars, length, value, NULL, NULL,
-                               attrs);
-}
-
-static JSBool
-Evaluate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    /* function evaluate(source, filename, lineno) { ... } */
-    JSString *source;
-    const char *filename = "";
-    jsuint lineno = 0;
-    uint32 oldopts;
-    JSBool ok;
-
-    if (argc == 0) {
-        *rval = JSVAL_VOID;
-        return JS_TRUE;
-    }
-
-    if (!JS_ConvertArguments(cx, argc, argv, "S/su",
-                             &source, &filename, &lineno)) {
-        return JS_FALSE;
-    }
-
-    oldopts = JS_GetOptions(cx);
-    JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO);
-    ok = JS_EvaluateUCScript(cx, obj, JS_GetStringChars(source),
-                             JS_GetStringLength(source), filename,
-                             lineno, rval);
-    JS_SetOptions(cx, oldopts);
-    
-    return ok;
-}
-
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/*
- * Returns a JS_malloc'd string (that the caller needs to JS_free)
- * containing the directory (non-leaf) part of |from| prepended to |leaf|.
- * If |from| is empty or a leaf, MakeAbsolutePathname returns a copy of leaf.
- * Returns NULL to indicate an error.
- */
-static char *
-MakeAbsolutePathname(JSContext *cx, const char *from, const char *leaf)
-{
-    size_t dirlen;
-    char *dir;
-    const char *slash = NULL, *cp;
-
-    cp = from;
-    while (*cp) {
-        if (*cp == '/'
-#ifdef XP_WIN
-            || *cp == '\\'
-#endif
-           ) {
-            slash = cp;
-        }
-
-        ++cp;
-    }
-
-    if (!slash) {
-        /* We were given a leaf or |from| was empty. */
-        return JS_strdup(cx, leaf);
-    }
-
-    /* Else, we were given a real pathname, return that + the leaf. */
-    dirlen = slash - from + 1;
-    dir = JS_malloc(cx, dirlen + strlen(leaf) + 1);
-    if (!dir)
-        return NULL;
-
-    strncpy(dir, from, dirlen);
-    strcpy(dir + dirlen, leaf); /* Note: we can't use strcat here. */
-
-    return dir;
-}
-
-static JSBool
-snarf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    const char *filename;
-    char *pathname;
-    JSStackFrame *fp;
-    int fd, cc;
-    JSBool ok;
-    size_t len;
-    char *buf;
-    struct stat sb;
-
-    str = JS_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    filename = JS_GetStringBytes(str);
-    
-    /* Get the currently executing script's name. */
-    fp = JS_GetScriptedCaller(cx, NULL);
-    JS_ASSERT(fp && fp->script->filename);
-    pathname = MakeAbsolutePathname(cx, fp->script->filename, filename);
-    if (!pathname)
-        return JS_FALSE;
-
-    fd = open(pathname, O_RDONLY);
-    ok = JS_TRUE;
-    len = 0;
-    buf = NULL;
-    if (fd < 0) {
-        JS_ReportError(cx, "can't open %s: %s", pathname, strerror(errno));
-        ok = JS_FALSE;
-    } else if (fstat(fd, &sb) < 0) {
-        JS_ReportError(cx, "can't stat %s", pathname);
-        ok = JS_FALSE;
-    } else {
-        len = sb.st_size;
-        buf = JS_malloc(cx, len + 1);
-        if (!buf) {
-            ok = JS_FALSE;
-        } else if ((cc = read(fd, buf, len)) != len) {
-            JS_free(cx, buf);
-            JS_ReportError(cx, "can't read %s: %s", pathname,
-                           (cc < 0) ? strerror(errno) : "short read");
-            ok = JS_FALSE;
-        }
-    }
-    close(fd);
-    JS_free(cx, pathname);
-    if (!ok)
-        return ok;
-    buf[len] = '\0';
-    str = JS_NewString(cx, buf, len);
-    if (!str) {
-        JS_free(cx, buf);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-#endif /* NARCISSUS */
-
-int
-main(int argc, char **argv, char **envp)
-{
-    int stackDummy;
-    JSRuntime *rt;
-    JSContext *cx;
-    JSObject *glob, *it, *envobj;
-    int result;
-#ifdef LIVECONNECT
-    JavaVM *java_vm = NULL;
-#endif
-#ifdef JSDEBUGGER_JAVA_UI
-    JNIEnv *java_env;
-#endif
-
-    gStackBase = (jsuword)&stackDummy;
-
-#ifdef XP_OS2
-   /* these streams are normally line buffered on OS/2 and need a \n, *
-    * so we need to unbuffer then to get a reasonable prompt          */
-    setbuf(stdout,0);
-    setbuf(stderr,0);
-#endif
-
-#if defined(OSSP) && defined(XP_WIN)
-    setvbuf(stderr, 0, _IONBF, 0);
-    setvbuf(stdout, 0, _IONBF, 0);
-#endif
-
-    gErrFile = stderr;
-    gOutFile = stdout;
-
-    argc--;
-    argv++;
-
-    rt = JS_NewRuntime(64L * 1024L * 1024L);
-    if (!rt)
-        return 1;
-
-    cx = JS_NewContext(rt, gStackChunkSize);
-    if (!cx)
-        return 1;
-    JS_SetErrorReporter(cx, my_ErrorReporter);
-
-    glob = JS_NewObject(cx, &global_class, NULL, NULL);
-    if (!glob)
-        return 1;
-#ifdef LAZY_STANDARD_CLASSES
-    JS_SetGlobalObject(cx, glob);
-#else
-    if (!JS_InitStandardClasses(cx, glob))
-        return 1;
-#ifdef OSSP
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-    if (!js_InitFileClass(cx, glob))
-        return 1;
-#endif
-#if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-    if (!js_InitDSOClass(cx, glob))
-        return 1;
-#endif
-#endif
-#endif
-    if (!JS_DefineFunctions(cx, glob, shell_functions))
-        return 1;
-
-    it = JS_DefineObject(cx, glob, "it", &its_class, NULL, 0);
-    if (!it)
-        return 1;
-    if (!JS_DefineProperties(cx, it, its_props))
-        return 1;
-    if (!JS_DefineFunctions(cx, it, its_methods))
-        return 1;
-
-#ifdef PERLCONNECT
-    if (!JS_InitPerlClass(cx, glob))
-        return 1;
-#endif
-
-#ifdef JSDEBUGGER
-    /*
-    * XXX A command line option to enable debugging (or not) would be good
-    */
-    _jsdc = JSD_DebuggerOnForUser(rt, NULL, NULL);
-    if (!_jsdc)
-        return 1;
-    JSD_JSContextInUse(_jsdc, cx);
-#ifdef JSD_LOWLEVEL_SOURCE
-    JS_SetSourceHandler(rt, SendSourceToJSDebugger, _jsdc);
-#endif /* JSD_LOWLEVEL_SOURCE */
-#ifdef JSDEBUGGER_JAVA_UI
-    _jsdjc = JSDJ_CreateContext();
-    if (! _jsdjc)
-        return 1;
-    JSDJ_SetJSDContext(_jsdjc, _jsdc);
-    java_env = JSDJ_CreateJavaVMAndStartDebugger(_jsdjc);
-#ifdef LIVECONNECT
-    if (java_env)
-        (*java_env)->GetJavaVM(java_env, &java_vm);
-#endif
-    /*
-    * XXX This would be the place to wait for the debugger to start.
-    * Waiting would be nice in general, but especially when a js file
-    * is passed on the cmd line.
-    */
-#endif /* JSDEBUGGER_JAVA_UI */
-#ifdef JSDEBUGGER_C_UI
-    JSDB_InitDebugger(rt, _jsdc, 0);
-#endif /* JSDEBUGGER_C_UI */
-#endif /* JSDEBUGGER */
-
-#ifdef LIVECONNECT
-    if (!JSJ_SimpleInit(cx, glob, java_vm, getenv("CLASSPATH")))
-        return 1;
-#endif
-
-    envobj = JS_DefineObject(cx, glob, "environment", &env_class, NULL, 0);
-    if (!envobj || !JS_SetPrivate(cx, envobj, envp))
-        return 1;
-
-#ifdef NARCISSUS
-    {
-        jsval v;
-        static const char Object_prototype[] = "Object.prototype";
-
-        if (!JS_DefineFunction(cx, glob, "snarf", snarf, 1, 0))
-            return 1;
-        if (!JS_DefineFunction(cx, glob, "evaluate", Evaluate, 3, 0))
-            return 1;
-
-        if (!JS_EvaluateScript(cx, glob,
-                               Object_prototype, sizeof Object_prototype - 1,
-                               NULL, 0, &v)) {
-            return 1;
-        }
-        if (!JS_DefineFunction(cx, JSVAL_TO_OBJECT(v), "__defineProperty__",
-                               defineProperty, 5, 0)) {
-            return 1;
-        }
-    }
-#endif
-
-    result = ProcessArgs(cx, glob, argv, argc);
-
-#ifdef JSDEBUGGER
-    if (_jsdc)
-        JSD_DebuggerOff(_jsdc);
-#endif  /* JSDEBUGGER */
-
-    JS_DestroyContext(cx);
-    JS_DestroyRuntime(rt);
-    JS_ShutDown();
-    return result;
-}
diff --git a/libs/js/src/js.msg b/libs/js/src/js.msg
deleted file mode 100644
index 2037b5e2b7..0000000000
--- a/libs/js/src/js.msg
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This is the JavaScript error message file.
- *
- * The format for each JS error message is:
- *
- * MSG_DEF(<SYMBOLIC_NAME>, <ERROR_NUMBER>, <ARGUMENT_COUNT>, <EXCEPTION_NAME>,
- *         <FORMAT_STRING>)
- *
- * where ;
- * <SYMBOLIC_NAME> is a legal C identifer that will be used in the
- * JS engine source.
- *
- * <ERROR_NUMBER> is an unique integral value identifying this error.
- *
- * <ARGUMENT_COUNT> is an integer literal specifying the total number of
- * replaceable arguments in the following format string.
- *
- * <EXCEPTION_NAME> is an exception index from the enum in jsexn.c;
- * JSEXN_NONE for none.  The given exception index will be raised by the
- * engine when the corresponding error occurs.
- *
- * <FORMAT_STRING> is a string literal, optionally containing sequences
- * {X} where X  is an integer representing the argument number that will
- * be replaced with a string value when the error is reported.
- *
- * e.g.
- *
- * MSG_DEF(JSMSG_NOT_A_SUBSPECIES, 73, JSEXN_NONE, 2,
- *         "{0} is not a member of the {1} family")
- *
- * can be used:
- *
- * JS_ReportErrorNumber(JSMSG_NOT_A_SUBSPECIES, "Rhino", "Monkey");
- *
- * to report:
- *
- * "Rhino is not a member of the Monkey family"
- *
- * Before adding a new MSG_DEF at the end, look for JSMSG_UNUSED<n> free
- * index placeholders in the middle of the list.
- */
-
-MSG_DEF(JSMSG_NOT_AN_ERROR,             0, 0, JSEXN_NONE, "<Error #0 is reserved>")
-MSG_DEF(JSMSG_NOT_DEFINED,              1, 1, JSEXN_REFERENCEERR, "{0} is not defined")
-MSG_DEF(JSMSG_NO_REG_EXPS,              2, 1, JSEXN_INTERNALERR, "sorry, regular expression are not supported")
-MSG_DEF(JSMSG_MORE_ARGS_NEEDED,         3, 3, JSEXN_NONE, "{0} requires more than {1} argument{2}")
-MSG_DEF(JSMSG_BAD_CHAR,                 4, 1, JSEXN_NONE, "invalid format character {0}")
-MSG_DEF(JSMSG_BAD_TYPE,                 5, 1, JSEXN_NONE, "unknown type {0}")
-MSG_DEF(JSMSG_CANT_LOCK,                6, 0, JSEXN_NONE, "can't lock memory")
-MSG_DEF(JSMSG_CANT_UNLOCK,              7, 0, JSEXN_NONE, "can't unlock memory")
-MSG_DEF(JSMSG_INCOMPATIBLE_PROTO,       8, 3, JSEXN_TYPEERR, "{0}.prototype.{1} called on incompatible {2}")
-MSG_DEF(JSMSG_NO_CONSTRUCTOR,           9, 1, JSEXN_NONE, "{0} has no constructor")
-MSG_DEF(JSMSG_CANT_ALIAS,              10, 3, JSEXN_NONE, "can't alias {0} to {1} in class {2}")
-MSG_DEF(JSMSG_NOT_SCRIPTED_FUNCTION,   11, 1, JSEXN_TYPEERR, "{0} is not a scripted function")
-MSG_DEF(JSMSG_BAD_SORT_ARG,            12, 0, JSEXN_TYPEERR, "invalid Array.prototype.sort argument")
-MSG_DEF(JSMSG_BAD_ATOMIC_NUMBER,       13, 1, JSEXN_INTERNALERR, "internal error: no index for atom {0}")
-MSG_DEF(JSMSG_TOO_MANY_LITERALS,       14, 0, JSEXN_INTERNALERR, "too many literals")
-MSG_DEF(JSMSG_CANT_WATCH,              15, 1, JSEXN_NONE, "can't watch non-native objects of class {0}")
-MSG_DEF(JSMSG_STACK_UNDERFLOW,         16, 2, JSEXN_INTERNALERR, "internal error compiling {0}: stack underflow at pc {1}")
-MSG_DEF(JSMSG_NEED_DIET,               17, 1, JSEXN_INTERNALERR, "{0} too large")
-MSG_DEF(JSMSG_TOO_MANY_LOCAL_ROOTS,    18, 0, JSEXN_ERR, "out of local root space")
-MSG_DEF(JSMSG_READ_ONLY,               19, 1, JSEXN_ERR, "{0} is read-only")
-MSG_DEF(JSMSG_BAD_FORMAL,              20, 0, JSEXN_SYNTAXERR, "malformed formal parameter")
-MSG_DEF(JSMSG_SAME_FORMAL,             21, 1, JSEXN_NONE, "duplicate formal argument {0}")
-MSG_DEF(JSMSG_NOT_FUNCTION,            22, 1, JSEXN_TYPEERR, "{0} is not a function")
-MSG_DEF(JSMSG_NOT_CONSTRUCTOR,         23, 1, JSEXN_TYPEERR, "{0} is not a constructor")
-MSG_DEF(JSMSG_STACK_OVERFLOW,          24, 1, JSEXN_INTERNALERR, "stack overflow in {0}")
-MSG_DEF(JSMSG_NOT_EXPORTED,            25, 1, JSEXN_NONE, "{0} is not exported")
-MSG_DEF(JSMSG_OVER_RECURSED,           26, 0, JSEXN_INTERNALERR, "too much recursion")
-MSG_DEF(JSMSG_IN_NOT_OBJECT,           27, 1, JSEXN_TYPEERR, "invalid 'in' operand {0}")
-MSG_DEF(JSMSG_BAD_NEW_RESULT,          28, 1, JSEXN_NONE, "invalid new expression result {0}")
-MSG_DEF(JSMSG_BAD_SHARP_DEF,           29, 1, JSEXN_ERR, "invalid sharp variable definition #{0}=")
-MSG_DEF(JSMSG_BAD_SHARP_USE,           30, 1, JSEXN_ERR, "invalid sharp variable use #{0}#")
-MSG_DEF(JSMSG_BAD_INSTANCEOF_RHS,      31, 1, JSEXN_TYPEERR, "invalid 'instanceof' operand {0}")
-MSG_DEF(JSMSG_BAD_BYTECODE,            32, 1, JSEXN_INTERNALERR, "unimplemented JavaScript bytecode {0}")
-MSG_DEF(JSMSG_BAD_RADIX,               33, 1, JSEXN_ERR, "illegal radix {0}")
-MSG_DEF(JSMSG_NAN,                     34, 1, JSEXN_ERR, "{0} is not a number")
-MSG_DEF(JSMSG_CANT_CONVERT,            35, 1, JSEXN_NONE, "can't convert {0} to an integer")
-MSG_DEF(JSMSG_CYCLIC_VALUE,            36, 1, JSEXN_ERR, "cyclic {0} value")
-MSG_DEF(JSMSG_PERMANENT,               37, 1, JSEXN_ERR, "{0} is permanent")
-MSG_DEF(JSMSG_CANT_CONVERT_TO,         38, 2, JSEXN_TYPEERR, "can't convert {0} to {1}")
-MSG_DEF(JSMSG_NO_PROPERTIES,           39, 1, JSEXN_TYPEERR, "{0} has no properties")
-MSG_DEF(JSMSG_CANT_FIND_CLASS,         40, 1, JSEXN_NONE, "can't find class id {0}")
-MSG_DEF(JSMSG_CANT_XDR_CLASS,          41, 1, JSEXN_NONE, "can't XDR class {0}")
-MSG_DEF(JSMSG_BYTECODE_TOO_BIG,        42, 2, JSEXN_INTERNALERR, "bytecode {0} too large (limit {1})")
-MSG_DEF(JSMSG_UNKNOWN_FORMAT,          43, 1, JSEXN_INTERNALERR, "unknown bytecode format {0}")
-MSG_DEF(JSMSG_TOO_MANY_CON_ARGS,       44, 0, JSEXN_SYNTAXERR, "too many constructor arguments")
-MSG_DEF(JSMSG_TOO_MANY_FUN_ARGS,       45, 0, JSEXN_SYNTAXERR, "too many function arguments")
-MSG_DEF(JSMSG_BAD_QUANTIFIER,          46, 1, JSEXN_SYNTAXERR, "invalid quantifier {0}")
-MSG_DEF(JSMSG_MIN_TOO_BIG,             47, 1, JSEXN_SYNTAXERR, "overlarge minimum {0}")
-MSG_DEF(JSMSG_MAX_TOO_BIG,             48, 1, JSEXN_SYNTAXERR, "overlarge maximum {0}")
-MSG_DEF(JSMSG_OUT_OF_ORDER,            49, 1, JSEXN_SYNTAXERR, "maximum {0} less than minimum")
-MSG_DEF(JSMSG_ZERO_QUANTIFIER,         50, 1, JSEXN_SYNTAXERR, "zero quantifier {0}")
-MSG_DEF(JSMSG_UNTERM_QUANTIFIER,       51, 1, JSEXN_SYNTAXERR, "unterminated quantifier {0}")
-MSG_DEF(JSMSG_EMPTY_BEFORE_STAR,       52, 0, JSEXN_SYNTAXERR, "regular expression before * could be empty")
-MSG_DEF(JSMSG_EMPTY_BEFORE_PLUS,       53, 0, JSEXN_SYNTAXERR, "regular expression before + could be empty")
-MSG_DEF(JSMSG_MISSING_PAREN,           54, 0, JSEXN_SYNTAXERR, "unterminated parenthetical")
-MSG_DEF(JSMSG_UNTERM_CLASS,            55, 1, JSEXN_SYNTAXERR, "unterminated character class {0}")
-MSG_DEF(JSMSG_TRAILING_SLASH,          56, 0, JSEXN_SYNTAXERR, "trailing \\ in regular expression")
-MSG_DEF(JSMSG_BAD_CLASS_RANGE,         57, 0, JSEXN_SYNTAXERR, "invalid range in character class")
-MSG_DEF(JSMSG_BAD_FLAG,                58, 1, JSEXN_SYNTAXERR, "invalid regular expression flag {0}")
-MSG_DEF(JSMSG_NO_INPUT,                59, 3, JSEXN_SYNTAXERR, "no input for /{0}/{1}{2}")
-MSG_DEF(JSMSG_CANT_OPEN,               60, 2, JSEXN_NONE, "can't open {0}: {1}")
-MSG_DEF(JSMSG_BAD_STRING_MASK,         61, 1, JSEXN_ERR, "invalid string escape mask {0}")
-MSG_DEF(JSMSG_UNMATCHED_RIGHT_PAREN,   62, 0, JSEXN_SYNTAXERR, "unmatched ) in regular expression")
-MSG_DEF(JSMSG_END_OF_DATA,             63, 0, JSEXN_NONE, "unexpected end of data")
-MSG_DEF(JSMSG_SEEK_BEYOND_START,       64, 0, JSEXN_NONE, "illegal seek beyond start")
-MSG_DEF(JSMSG_SEEK_BEYOND_END,         65, 0, JSEXN_NONE, "illegal seek beyond end")
-MSG_DEF(JSMSG_END_SEEK,                66, 0, JSEXN_NONE, "illegal end-based seek")
-MSG_DEF(JSMSG_WHITHER_WHENCE,          67, 1, JSEXN_NONE, "unknown seek whence: {0}")
-MSG_DEF(JSMSG_BAD_SCRIPT_MAGIC,        68, 0, JSEXN_NONE, "bad script XDR magic number")
-MSG_DEF(JSMSG_PAREN_BEFORE_FORMAL,     69, 0, JSEXN_SYNTAXERR, "missing ( before formal parameters")
-MSG_DEF(JSMSG_MISSING_FORMAL,          70, 0, JSEXN_SYNTAXERR, "missing formal parameter")
-MSG_DEF(JSMSG_PAREN_AFTER_FORMAL,      71, 0, JSEXN_SYNTAXERR, "missing ) after formal parameters")
-MSG_DEF(JSMSG_CURLY_BEFORE_BODY,       72, 0, JSEXN_SYNTAXERR, "missing { before function body")
-MSG_DEF(JSMSG_CURLY_AFTER_BODY,        73, 0, JSEXN_SYNTAXERR, "missing } after function body")
-MSG_DEF(JSMSG_PAREN_BEFORE_COND,       74, 0, JSEXN_SYNTAXERR, "missing ( before condition")
-MSG_DEF(JSMSG_PAREN_AFTER_COND,        75, 0, JSEXN_SYNTAXERR, "missing ) after condition")
-MSG_DEF(JSMSG_NO_IMPORT_NAME,          76, 0, JSEXN_SYNTAXERR, "missing name in import statement")
-MSG_DEF(JSMSG_NAME_AFTER_DOT,          77, 0, JSEXN_SYNTAXERR, "missing name after . operator")
-MSG_DEF(JSMSG_BRACKET_IN_INDEX,        78, 0, JSEXN_SYNTAXERR, "missing ] in index expression")
-MSG_DEF(JSMSG_NO_EXPORT_NAME,          79, 0, JSEXN_SYNTAXERR, "missing name in export statement")
-MSG_DEF(JSMSG_PAREN_BEFORE_SWITCH,     80, 0, JSEXN_SYNTAXERR, "missing ( before switch expression")
-MSG_DEF(JSMSG_PAREN_AFTER_SWITCH,      81, 0, JSEXN_SYNTAXERR, "missing ) after switch expression")
-MSG_DEF(JSMSG_CURLY_BEFORE_SWITCH,     82, 0, JSEXN_SYNTAXERR, "missing { before switch body")
-MSG_DEF(JSMSG_COLON_AFTER_CASE,        83, 0, JSEXN_SYNTAXERR, "missing : after case label")
-MSG_DEF(JSMSG_WHILE_AFTER_DO,          84, 0, JSEXN_SYNTAXERR, "missing while after do-loop body")
-MSG_DEF(JSMSG_PAREN_AFTER_FOR,         85, 0, JSEXN_SYNTAXERR, "missing ( after for")
-MSG_DEF(JSMSG_SEMI_AFTER_FOR_INIT,     86, 0, JSEXN_SYNTAXERR, "missing ; after for-loop initializer")
-MSG_DEF(JSMSG_SEMI_AFTER_FOR_COND,     87, 0, JSEXN_SYNTAXERR, "missing ; after for-loop condition")
-MSG_DEF(JSMSG_PAREN_AFTER_FOR_CTRL,    88, 0, JSEXN_SYNTAXERR, "missing ) after for-loop control")
-MSG_DEF(JSMSG_CURLY_BEFORE_TRY,        89, 0, JSEXN_SYNTAXERR, "missing { before try block")
-MSG_DEF(JSMSG_CURLY_AFTER_TRY,         90, 0, JSEXN_SYNTAXERR, "missing } after try block")
-MSG_DEF(JSMSG_PAREN_BEFORE_CATCH,      91, 0, JSEXN_SYNTAXERR, "missing ( before catch")
-MSG_DEF(JSMSG_CATCH_IDENTIFIER,        92, 0, JSEXN_SYNTAXERR, "missing identifier in catch")
-MSG_DEF(JSMSG_PAREN_AFTER_CATCH,       93, 0, JSEXN_SYNTAXERR, "missing ) after catch")
-MSG_DEF(JSMSG_CURLY_BEFORE_CATCH,      94, 0, JSEXN_SYNTAXERR, "missing { before catch block")
-MSG_DEF(JSMSG_CURLY_AFTER_CATCH,       95, 0, JSEXN_SYNTAXERR, "missing } after catch block")
-MSG_DEF(JSMSG_CURLY_BEFORE_FINALLY,    96, 0, JSEXN_SYNTAXERR, "missing { before finally block")
-MSG_DEF(JSMSG_CURLY_AFTER_FINALLY,     97, 0, JSEXN_SYNTAXERR, "missing } after finally block")
-MSG_DEF(JSMSG_CATCH_OR_FINALLY,        98, 0, JSEXN_SYNTAXERR, "missing catch or finally after try")
-MSG_DEF(JSMSG_PAREN_BEFORE_WITH,       99, 0, JSEXN_SYNTAXERR, "missing ( before with-statement object")
-MSG_DEF(JSMSG_PAREN_AFTER_WITH,       100, 0, JSEXN_SYNTAXERR, "missing ) after with-statement object")
-MSG_DEF(JSMSG_CURLY_IN_COMPOUND,      101, 0, JSEXN_SYNTAXERR, "missing } in compound statement")
-MSG_DEF(JSMSG_NO_VARIABLE_NAME,       102, 0, JSEXN_SYNTAXERR, "missing variable name")
-MSG_DEF(JSMSG_COLON_IN_COND,          103, 0, JSEXN_SYNTAXERR, "missing : in conditional expression")
-MSG_DEF(JSMSG_PAREN_AFTER_ARGS,       104, 0, JSEXN_SYNTAXERR, "missing ) after argument list")
-MSG_DEF(JSMSG_BRACKET_AFTER_LIST,     105, 0, JSEXN_SYNTAXERR, "missing ] after element list")
-MSG_DEF(JSMSG_COLON_AFTER_ID,         106, 0, JSEXN_SYNTAXERR, "missing : after property id")
-MSG_DEF(JSMSG_CURLY_AFTER_LIST,       107, 0, JSEXN_SYNTAXERR, "missing } after property list")
-MSG_DEF(JSMSG_PAREN_IN_PAREN,         108, 0, JSEXN_SYNTAXERR, "missing ) in parenthetical")
-MSG_DEF(JSMSG_SEMI_BEFORE_STMNT,      109, 0, JSEXN_SYNTAXERR, "missing ; before statement")
-MSG_DEF(JSMSG_NO_RETURN_VALUE,        110, 1, JSEXN_TYPEERR, "function {0} does not always return a value")
-MSG_DEF(JSMSG_DUPLICATE_FORMAL,       111, 1, JSEXN_TYPEERR, "duplicate formal argument {0}")
-MSG_DEF(JSMSG_EQUAL_AS_ASSIGN,        112, 1, JSEXN_NONE, "test for equality (==) mistyped as assignment (=)?{0}")
-MSG_DEF(JSMSG_BAD_IMPORT,             113, 0, JSEXN_SYNTAXERR, "invalid import expression")
-MSG_DEF(JSMSG_TOO_MANY_DEFAULTS,      114, 0, JSEXN_SYNTAXERR, "more than one switch default")
-MSG_DEF(JSMSG_TOO_MANY_CASES,         115, 0, JSEXN_INTERNALERR, "too many switch cases")
-MSG_DEF(JSMSG_BAD_SWITCH,             116, 0, JSEXN_SYNTAXERR, "invalid switch statement")
-MSG_DEF(JSMSG_BAD_FOR_LEFTSIDE,       117, 0, JSEXN_SYNTAXERR, "invalid for/in left-hand side")
-MSG_DEF(JSMSG_CATCH_AFTER_GENERAL,    118, 0, JSEXN_SYNTAXERR, "catch after unconditional catch")
-MSG_DEF(JSMSG_CATCH_WITHOUT_TRY,      119, 0, JSEXN_SYNTAXERR, "catch without try")
-MSG_DEF(JSMSG_FINALLY_WITHOUT_TRY,    120, 0, JSEXN_SYNTAXERR, "finally without try")
-MSG_DEF(JSMSG_LABEL_NOT_FOUND,        121, 0, JSEXN_SYNTAXERR, "label not found")
-MSG_DEF(JSMSG_TOUGH_BREAK,            122, 0, JSEXN_SYNTAXERR, "invalid break")
-MSG_DEF(JSMSG_BAD_CONTINUE,           123, 0, JSEXN_SYNTAXERR, "invalid continue")
-MSG_DEF(JSMSG_BAD_RETURN,             124, 0, JSEXN_SYNTAXERR, "invalid return")
-MSG_DEF(JSMSG_BAD_LABEL,              125, 0, JSEXN_SYNTAXERR, "invalid label")
-MSG_DEF(JSMSG_DUPLICATE_LABEL,        126, 0, JSEXN_SYNTAXERR, "duplicate label")
-MSG_DEF(JSMSG_VAR_HIDES_ARG,          127, 1, JSEXN_TYPEERR, "variable {0} hides argument")
-MSG_DEF(JSMSG_BAD_VAR_INIT,           128, 0, JSEXN_SYNTAXERR, "invalid variable initialization")
-MSG_DEF(JSMSG_BAD_LEFTSIDE_OF_ASS,    129, 0, JSEXN_SYNTAXERR, "invalid assignment left-hand side")
-MSG_DEF(JSMSG_BAD_OPERAND,            130, 1, JSEXN_SYNTAXERR, "invalid {0} operand")
-MSG_DEF(JSMSG_BAD_PROP_ID,            131, 0, JSEXN_SYNTAXERR, "invalid property id")
-MSG_DEF(JSMSG_RESERVED_ID,            132, 1, JSEXN_SYNTAXERR, "{0} is a reserved identifier")
-MSG_DEF(JSMSG_SYNTAX_ERROR,           133, 0, JSEXN_SYNTAXERR, "syntax error")
-MSG_DEF(JSMSG_BAD_SHARP_VAR_DEF,      134, 0, JSEXN_SYNTAXERR, "invalid sharp variable definition")
-MSG_DEF(JSMSG_BAD_PROTOTYPE,          135, 1, JSEXN_TYPEERR,   "'prototype' property of {0} is not an object")
-MSG_DEF(JSMSG_MISSING_EXPONENT,       136, 0, JSEXN_SYNTAXERR, "missing exponent")
-MSG_DEF(JSMSG_OUT_OF_MEMORY,          137, 0, JSEXN_ERR, "out of memory")
-MSG_DEF(JSMSG_UNTERMINATED_STRING,    138, 0, JSEXN_SYNTAXERR, "unterminated string literal")
-MSG_DEF(JSMSG_TOO_MANY_PARENS,        139, 0, JSEXN_INTERNALERR, "too many parentheses in regular expression")
-MSG_DEF(JSMSG_UNTERMINATED_COMMENT,   140, 0, JSEXN_SYNTAXERR, "unterminated comment")
-MSG_DEF(JSMSG_UNTERMINATED_REGEXP,    141, 0, JSEXN_SYNTAXERR, "unterminated regular expression literal")
-MSG_DEF(JSMSG_BAD_REGEXP_FLAG,        142, 0, JSEXN_SYNTAXERR, "invalid flag after regular expression")
-MSG_DEF(JSMSG_SHARPVAR_TOO_BIG,       143, 0, JSEXN_SYNTAXERR, "overlarge sharp variable number")
-MSG_DEF(JSMSG_ILLEGAL_CHARACTER,      144, 0, JSEXN_SYNTAXERR, "illegal character")
-MSG_DEF(JSMSG_BAD_OCTAL,              145, 1, JSEXN_SYNTAXERR, "{0} is not a legal ECMA-262 octal constant")
-MSG_DEF(JSMSG_BAD_INDIRECT_CALL,      146, 1, JSEXN_EVALERR, "function {0} must be called directly, and not by way of a function of another name")
-MSG_DEF(JSMSG_UNCAUGHT_EXCEPTION,     147, 1, JSEXN_NONE, "uncaught exception: {0}")
-MSG_DEF(JSMSG_INVALID_BACKREF,        148, 0, JSEXN_SYNTAXERR, "non-octal digit in an escape sequence that doesn't match a back-reference")
-MSG_DEF(JSMSG_BAD_BACKREF,            149, 0, JSEXN_SYNTAXERR, "back-reference exceeds number of capturing parentheses")
-MSG_DEF(JSMSG_PRECISION_RANGE,        150, 1, JSEXN_RANGEERR, "precision {0} out of range")
-MSG_DEF(JSMSG_BAD_GETTER_OR_SETTER,   151, 1, JSEXN_SYNTAXERR, "invalid {0} usage")
-MSG_DEF(JSMSG_BAD_ARRAY_LENGTH,       152, 0, JSEXN_RANGEERR, "invalid array length")
-MSG_DEF(JSMSG_CANT_DESCRIBE_PROPS,    153, 1, JSEXN_NONE, "can't describe non-native properties of class {0}")
-MSG_DEF(JSMSG_BAD_APPLY_ARGS,         154, 0, JSEXN_TYPEERR, "second argument to Function.prototype.apply must be an array")
-MSG_DEF(JSMSG_REDECLARED_VAR,         155, 2, JSEXN_TYPEERR, "redeclaration of {0} {1}")
-MSG_DEF(JSMSG_UNDECLARED_VAR,         156, 1, JSEXN_TYPEERR, "assignment to undeclared variable {0}")
-MSG_DEF(JSMSG_ANON_NO_RETURN_VALUE,   157, 0, JSEXN_TYPEERR, "anonymous function does not always return a value")
-MSG_DEF(JSMSG_DEPRECATED_USAGE,       158, 1, JSEXN_REFERENCEERR, "deprecated {0} usage")
-MSG_DEF(JSMSG_BAD_URI,                159, 0, JSEXN_URIERR, "malformed URI sequence")
-MSG_DEF(JSMSG_GETTER_ONLY,            160, 0, JSEXN_TYPEERR, "setting a property that has only a getter")
-MSG_DEF(JSMSG_TRAILING_COMMA,         161, 0, JSEXN_SYNTAXERR, "trailing comma is not legal in ECMA-262 object initializers")
-MSG_DEF(JSMSG_UNDEFINED_PROP,         162, 1, JSEXN_TYPEERR, "reference to undefined property {0}")
-MSG_DEF(JSMSG_USELESS_EXPR,           163, 0, JSEXN_TYPEERR, "useless expression")
-MSG_DEF(JSMSG_REDECLARED_PARAM,       164, 1, JSEXN_TYPEERR, "redeclaration of formal parameter {0}")
-MSG_DEF(JSMSG_NEWREGEXP_FLAGGED,      165, 0, JSEXN_TYPEERR, "can't supply flags when constructing one RegExp from another")
-MSG_DEF(JSMSG_RESERVED_SLOT_RANGE,    166, 0, JSEXN_RANGEERR, "reserved slot index out of range")
-MSG_DEF(JSMSG_CANT_DECODE_PRINCIPALS, 167, 0, JSEXN_INTERNALERR, "can't decode JSPrincipals")
-MSG_DEF(JSMSG_CANT_SEAL_OBJECT,       168, 1, JSEXN_ERR, "can't seal {0} objects")
-MSG_DEF(JSMSG_CANT_UNSEAL_OBJECT,     169, 1, JSEXN_ERR, "can't unseal {0} objects")
-MSG_DEF(JSMSG_BAD_XML_MARKUP,         170, 0, JSEXN_SYNTAXERR, "invalid XML markup")
-MSG_DEF(JSMSG_BAD_XML_CHARACTER,      171, 0, JSEXN_SYNTAXERR, "illegal XML character")
-MSG_DEF(JSMSG_BAD_DEFAULT_XML_NAMESPACE,172,0,JSEXN_SYNTAXERR, "invalid default XML namespace")
-MSG_DEF(JSMSG_BAD_XML_NAME_SYNTAX,    173, 0, JSEXN_SYNTAXERR, "invalid XML name")
-MSG_DEF(JSMSG_BRACKET_AFTER_ATTR_EXPR,174, 0, JSEXN_SYNTAXERR, "missing ] after attribute expression")
-MSG_DEF(JSMSG_NAME_AFTER_DBLDOT,      175, 0, JSEXN_SYNTAXERR, "missing name after .. operator")
-MSG_DEF(JSMSG_CURLY_IN_XML_EXPR,      176, 0, JSEXN_SYNTAXERR, "missing } in XML expression")
-MSG_DEF(JSMSG_BAD_XML_NAMESPACE,      177, 1, JSEXN_TYPEERR, "invalid XML namespace {0}")
-MSG_DEF(JSMSG_BAD_XML_ATTR_NAME,      178, 1, JSEXN_TYPEERR, "invalid XML attribute name {0}")
-MSG_DEF(JSMSG_BAD_XML_NAME,           179, 1, JSEXN_TYPEERR, "invalid XML name {0}")
-MSG_DEF(JSMSG_BAD_XML_CONVERSION,     180, 1, JSEXN_TYPEERR, "can't convert {0} to XML")
-MSG_DEF(JSMSG_BAD_XMLLIST_CONVERSION, 181, 1, JSEXN_TYPEERR, "can't convert {0} to XMLList")
-MSG_DEF(JSMSG_IS_NOT_XML_OBJECT,      182, 1, JSEXN_TYPEERR, "{0} is not an XML object")
-MSG_DEF(JSMSG_NO_ASSIGN_IN_XML_ATTR,  183, 0, JSEXN_SYNTAXERR, "missing = in XML attribute")
-MSG_DEF(JSMSG_BAD_XML_ATTR_VALUE,     184, 0, JSEXN_SYNTAXERR, "invalid XML attribute value")
-MSG_DEF(JSMSG_XML_TAG_NAME_MISMATCH,  185, 0, JSEXN_SYNTAXERR, "XML tag name mismatch")
-MSG_DEF(JSMSG_BAD_XML_TAG_SYNTAX,     186, 0, JSEXN_SYNTAXERR, "invalid XML tag syntax")
-MSG_DEF(JSMSG_BAD_XML_LIST_SYNTAX,    187, 0, JSEXN_SYNTAXERR, "invalid XML list syntax")
-MSG_DEF(JSMSG_INCOMPATIBLE_METHOD,    188, 3, JSEXN_TYPEERR, "{0} {1} called on incompatible {2}")
-MSG_DEF(JSMSG_CANT_SET_XML_ATTRS,     189, 0, JSEXN_INTERNALERR, "can't set XML property attributes")
-MSG_DEF(JSMSG_END_OF_XML_SOURCE,      190, 0, JSEXN_SYNTAXERR, "unexpected end of XML source")
-MSG_DEF(JSMSG_END_OF_XML_ENTITY,      191, 0, JSEXN_SYNTAXERR, "unexpected end of XML entity")
-MSG_DEF(JSMSG_BAD_XML_QNAME,          192, 0, JSEXN_SYNTAXERR, "invalid XML qualified name")
-MSG_DEF(JSMSG_BAD_FOR_EACH_LOOP,      193, 0, JSEXN_SYNTAXERR, "invalid for each loop")
-MSG_DEF(JSMSG_BAD_XMLLIST_PUT,        194, 1, JSEXN_TYPEERR, "can't set property {0} in XMLList")
-MSG_DEF(JSMSG_UNKNOWN_XML_ENTITY,     195, 1, JSEXN_TYPEERR, "unknown XML entity {0}")
-MSG_DEF(JSMSG_BAD_XML_NCR,            196, 1, JSEXN_TYPEERR, "malformed XML character {0}")
-MSG_DEF(JSMSG_UNDEFINED_XML_NAME,     197, 1, JSEXN_REFERENCEERR, "reference to undefined XML name {0}")
-MSG_DEF(JSMSG_DUPLICATE_XML_ATTR,     198, 1, JSEXN_TYPEERR, "duplicate XML attribute {0}")
-MSG_DEF(JSMSG_TOO_MANY_FUN_VARS,      199, 0, JSEXN_SYNTAXERR, "too many local variables")
-MSG_DEF(JSMSG_ARRAY_INIT_TOO_BIG,     200, 0, JSEXN_INTERNALERR, "array initialiser too large")
-MSG_DEF(JSMSG_REGEXP_TOO_COMPLEX,     201, 0, JSEXN_INTERNALERR, "regular expression too complex")
-MSG_DEF(JSMSG_BUFFER_TOO_SMALL,       202, 0, JSEXN_INTERNALERR, "buffer too small")
-MSG_DEF(JSMSG_BAD_SURROGATE_CHAR,     203, 1, JSEXN_TYPEERR, "bad surrogate character {0}")
-MSG_DEF(JSMSG_UTF8_CHAR_TOO_LARGE,    204, 1, JSEXN_TYPEERR, "UTF-8 character {0} too large")
-MSG_DEF(JSMSG_MALFORMED_UTF8_CHAR,    205, 1, JSEXN_TYPEERR, "malformed UTF-8 character sequence at offset {0}")
diff --git a/libs/js/src/jsapi.c b/libs/js/src/jsapi.c
deleted file mode 100644
index 50fb5f7576..0000000000
--- a/libs/js/src/jsapi.c
+++ /dev/null
@@ -1,4860 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JavaScript API.
- */
-#include "jsstddef.h"
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsclist.h"
-#include "jsdhash.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdate.h"
-#include "jsdtoa.h"
-#include "jsemit.h"
-#include "jsexn.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsmath.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsparse.h"
-#include "jsregexp.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-#include "prmjtime.h"
-
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-#include "jsfile.h"
-#endif
-
-#if defined(OSSP) && defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-#include "jsdso.h"
-#endif
-
-#if JS_HAS_XML_SUPPORT
-#include "jsxml.h"
-#endif
-
-#ifdef HAVE_VA_LIST_AS_ARRAY
-#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap))
-#else
-#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
-#endif
-
-#if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)
-#define CHECK_REQUEST(cx)       JS_ASSERT(cx->requestDepth)
-#else
-#define CHECK_REQUEST(cx)       ((void)0)
-#endif
-
-JS_PUBLIC_API(int64)
-#ifdef OSSP /* CLEANUP */
-JS_Now(void)
-#else
-JS_Now()
-#endif
-{
-    return PRMJ_Now();
-}
-
-JS_PUBLIC_API(jsval)
-JS_GetNaNValue(JSContext *cx)
-{
-    return DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-}
-
-JS_PUBLIC_API(jsval)
-JS_GetNegativeInfinityValue(JSContext *cx)
-{
-    return DOUBLE_TO_JSVAL(cx->runtime->jsNegativeInfinity);
-}
-
-JS_PUBLIC_API(jsval)
-JS_GetPositiveInfinityValue(JSContext *cx)
-{
-    return DOUBLE_TO_JSVAL(cx->runtime->jsPositiveInfinity);
-}
-
-JS_PUBLIC_API(jsval)
-JS_GetEmptyStringValue(JSContext *cx)
-{
-    return STRING_TO_JSVAL(cx->runtime->emptyString);
-}
-
-static JSBool
-TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
-#ifdef OSSP /* BUGFIX */
-                     jsval **vpp, va_list app)
-#else
-                     jsval **vpp, va_list *app)
-#endif
-{
-    const char *format;
-    JSArgumentFormatMap *map;
-
-    format = *formatp;
-    for (map = cx->argumentFormatMap; map; map = map->next) {
-        if (!strncmp(format, map->format, map->length)) {
-            *formatp = format + map->length;
-            return map->formatter(cx, format, fromJS, vpp, app);
-        }
-    }
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_CHAR, format);
-    return JS_FALSE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ConvertArguments(JSContext *cx, uintN argc, jsval *argv, const char *format,
-                    ...)
-{
-    va_list ap;
-    JSBool ok;
-
-    va_start(ap, format);
-    ok = JS_ConvertArgumentsVA(cx, argc, argv, format, ap);
-    va_end(ap);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval *argv,
-                      const char *format, va_list ap)
-{
-    jsval *sp;
-    JSBool required;
-    char c;
-    JSFunction *fun;
-    jsdouble d;
-    JSString *str;
-    JSObject *obj;
-
-    CHECK_REQUEST(cx);
-    sp = argv;
-    required = JS_TRUE;
-    while ((c = *format++) != '\0') {
-        if (isspace(c))
-            continue;
-        if (c == '/') {
-            required = JS_FALSE;
-            continue;
-        }
-        if (sp == argv + argc) {
-            if (required) {
-                fun = js_ValueToFunction(cx, &argv[-2], 0);
-                if (fun) {
-                    char numBuf[12];
-                    JS_snprintf(numBuf, sizeof numBuf, "%u", argc);
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_MORE_ARGS_NEEDED,
-                                         JS_GetFunctionName(fun), numBuf,
-                                         (argc == 1) ? "" : "s");
-                }
-                return JS_FALSE;
-            }
-            break;
-        }
-        switch (c) {
-          case 'b':
-            if (!js_ValueToBoolean(cx, *sp, va_arg(ap, JSBool *)))
-                return JS_FALSE;
-            break;
-          case 'c':
-            if (!js_ValueToUint16(cx, *sp, va_arg(ap, uint16 *)))
-                return JS_FALSE;
-            break;
-          case 'i':
-            if (!js_ValueToECMAInt32(cx, *sp, va_arg(ap, int32 *)))
-                return JS_FALSE;
-            break;
-          case 'u':
-            if (!js_ValueToECMAUint32(cx, *sp, va_arg(ap, uint32 *)))
-                return JS_FALSE;
-            break;
-          case 'j':
-            if (!js_ValueToInt32(cx, *sp, va_arg(ap, int32 *)))
-                return JS_FALSE;
-            break;
-          case 'd':
-            if (!js_ValueToNumber(cx, *sp, va_arg(ap, jsdouble *)))
-                return JS_FALSE;
-            break;
-          case 'I':
-            if (!js_ValueToNumber(cx, *sp, &d))
-                return JS_FALSE;
-            *va_arg(ap, jsdouble *) = js_DoubleToInteger(d);
-            break;
-          case 's':
-          case 'S':
-          case 'W':
-            str = js_ValueToString(cx, *sp);
-            if (!str)
-                return JS_FALSE;
-            *sp = STRING_TO_JSVAL(str);
-            if (c == 's')
-                *va_arg(ap, char **) = JS_GetStringBytes(str);
-            else if (c == 'W')
-                *va_arg(ap, jschar **) = JS_GetStringChars(str);
-            else
-                *va_arg(ap, JSString **) = str;
-            break;
-          case 'o':
-            if (!js_ValueToObject(cx, *sp, &obj))
-                return JS_FALSE;
-            *sp = OBJECT_TO_JSVAL(obj);
-            *va_arg(ap, JSObject **) = obj;
-            break;
-          case 'f':
-            obj = js_ValueToFunctionObject(cx, sp, 0);
-            if (!obj)
-                return JS_FALSE;
-            *va_arg(ap, JSFunction **) = (JSFunction *) JS_GetPrivate(cx, obj);
-            break;
-          case 'v':
-            *va_arg(ap, jsval *) = *sp;
-            break;
-          case '*':
-            break;
-          default:
-            format--;
-            if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp,
-#ifdef OSSP /* BUGFIX */
-                                      ap)) {
-#else
-                                      JS_ADDRESSOF_VA_LIST(ap))) {
-#endif
-                return JS_FALSE;
-            }
-            /* NB: the formatter already updated sp, so we continue here. */
-            continue;
-        }
-        sp++;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(jsval *)
-JS_PushArguments(JSContext *cx, void **markp, const char *format, ...)
-{
-    va_list ap;
-    jsval *argv;
-
-    va_start(ap, format);
-    argv = JS_PushArgumentsVA(cx, markp, format, ap);
-    va_end(ap);
-    return argv;
-}
-
-JS_PUBLIC_API(jsval *)
-JS_PushArgumentsVA(JSContext *cx, void **markp, const char *format, va_list ap)
-{
-    uintN argc;
-    jsval *argv, *sp;
-    char c;
-    const char *cp;
-    JSString *str;
-    JSFunction *fun;
-    JSStackHeader *sh;
-
-    CHECK_REQUEST(cx);
-    *markp = NULL;
-    argc = 0;
-    for (cp = format; (c = *cp) != '\0'; cp++) {
-        /*
-         * Count non-space non-star characters as individual jsval arguments.
-         * This may over-allocate stack, but we'll fix below.
-         */
-        if (isspace(c) || c == '*')
-            continue;
-        argc++;
-    }
-    sp = js_AllocStack(cx, argc, markp);
-    if (!sp)
-        return NULL;
-    argv = sp;
-    while ((c = *format++) != '\0') {
-        if (isspace(c) || c == '*')
-            continue;
-        switch (c) {
-          case 'b':
-            *sp = BOOLEAN_TO_JSVAL((JSBool) va_arg(ap, int));
-            break;
-          case 'c':
-            *sp = INT_TO_JSVAL((uint16) va_arg(ap, unsigned int));
-            break;
-          case 'i':
-          case 'j':
-            if (!js_NewNumberValue(cx, (jsdouble) va_arg(ap, int32), sp))
-                goto bad;
-            break;
-          case 'u':
-            if (!js_NewNumberValue(cx, (jsdouble) va_arg(ap, uint32), sp))
-                goto bad;
-            break;
-          case 'd':
-          case 'I':
-            if (!js_NewDoubleValue(cx, va_arg(ap, jsdouble), sp))
-                goto bad;
-            break;
-          case 's':
-            str = JS_NewStringCopyZ(cx, va_arg(ap, char *));
-            if (!str)
-                goto bad;
-            *sp = STRING_TO_JSVAL(str);
-            break;
-          case 'W':
-            str = JS_NewUCStringCopyZ(cx, va_arg(ap, jschar *));
-            if (!str)
-                goto bad;
-            *sp = STRING_TO_JSVAL(str);
-            break;
-          case 'S':
-            str = va_arg(ap, JSString *);
-            *sp = STRING_TO_JSVAL(str);
-            break;
-          case 'o':
-            *sp = OBJECT_TO_JSVAL(va_arg(ap, JSObject *));
-            break;
-          case 'f':
-            fun = va_arg(ap, JSFunction *);
-            *sp = fun ? OBJECT_TO_JSVAL(fun->object) : JSVAL_NULL;
-            break;
-          case 'v':
-            *sp = va_arg(ap, jsval);
-            break;
-          default:
-            format--;
-            if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp,
-#ifdef OSSP /* BUGFIX */
-                                      ap)) {
-#else
-                                      JS_ADDRESSOF_VA_LIST(ap))) {
-#endif
-                goto bad;
-            }
-            /* NB: the formatter already updated sp, so we continue here. */
-            continue;
-        }
-        sp++;
-    }
-
-    /*
-     * We may have overallocated stack due to a multi-character format code
-     * handled by a JSArgumentFormatter.  Give back that stack space!
-     */
-    JS_ASSERT(sp <= argv + argc);
-    if (sp < argv + argc) {
-        /* Return slots not pushed to the current stack arena. */
-        cx->stackPool.current->avail = (jsuword)sp;
-
-        /* Reduce the count of slots the GC will scan in this stack segment. */
-        sh = cx->stackHeaders;
-        JS_ASSERT(JS_STACK_SEGMENT(sh) + sh->nslots == argv + argc);
-        sh->nslots -= argc - (sp - argv);
-    }
-    return argv;
-
-bad:
-    js_FreeStack(cx, *markp);
-    return NULL;
-}
-
-JS_PUBLIC_API(void)
-JS_PopArguments(JSContext *cx, void *mark)
-{
-    CHECK_REQUEST(cx);
-    js_FreeStack(cx, mark);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_AddArgumentFormatter(JSContext *cx, const char *format,
-                        JSArgumentFormatter formatter)
-{
-    size_t length;
-    JSArgumentFormatMap **mpp, *map;
-
-    length = strlen(format);
-    mpp = &cx->argumentFormatMap;
-    while ((map = *mpp) != NULL) {
-        /* Insert before any shorter string to match before prefixes. */
-        if (map->length < length)
-            break;
-        if (map->length == length && !strcmp(map->format, format))
-            goto out;
-        mpp = &map->next;
-    }
-    map = (JSArgumentFormatMap *) JS_malloc(cx, sizeof *map);
-    if (!map)
-        return JS_FALSE;
-    map->format = format;
-    map->length = length;
-    map->next = *mpp;
-    *mpp = map;
-out:
-    map->formatter = formatter;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(void)
-JS_RemoveArgumentFormatter(JSContext *cx, const char *format)
-{
-    size_t length;
-    JSArgumentFormatMap **mpp, *map;
-
-    length = strlen(format);
-    mpp = &cx->argumentFormatMap;
-    while ((map = *mpp) != NULL) {
-        if (map->length == length && !strcmp(map->format, format)) {
-            *mpp = map->next;
-            JS_free(cx, map);
-            return;
-        }
-        mpp = &map->next;
-    }
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ConvertValue(JSContext *cx, jsval v, JSType type, jsval *vp)
-{
-    JSBool ok, b;
-    JSObject *obj;
-    JSString *str;
-    jsdouble d, *dp;
-
-    CHECK_REQUEST(cx);
-    switch (type) {
-      case JSTYPE_VOID:
-        *vp = JSVAL_VOID;
-        ok = JS_TRUE;
-        break;
-      case JSTYPE_OBJECT:
-        ok = js_ValueToObject(cx, v, &obj);
-        if (ok)
-            *vp = OBJECT_TO_JSVAL(obj);
-        break;
-      case JSTYPE_FUNCTION:
-        *vp = v;
-        obj = js_ValueToFunctionObject(cx, vp, JSV2F_SEARCH_STACK);
-        ok = (obj != NULL);
-        break;
-      case JSTYPE_STRING:
-        str = js_ValueToString(cx, v);
-        ok = (str != NULL);
-        if (ok)
-            *vp = STRING_TO_JSVAL(str);
-        break;
-      case JSTYPE_NUMBER:
-        ok = js_ValueToNumber(cx, v, &d);
-        if (ok) {
-            dp = js_NewDouble(cx, d, 0);
-            ok = (dp != NULL);
-            if (ok)
-                *vp = DOUBLE_TO_JSVAL(dp);
-        }
-        break;
-      case JSTYPE_BOOLEAN:
-        ok = js_ValueToBoolean(cx, v, &b);
-        if (ok)
-            *vp = BOOLEAN_TO_JSVAL(b);
-        break;
-      default: {
-        char numBuf[12];
-        JS_snprintf(numBuf, sizeof numBuf, "%d", (int)type);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_TYPE,
-                             numBuf);
-        ok = JS_FALSE;
-        break;
-      }
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToObject(JSContext *cx, jsval v, JSObject **objp)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToObject(cx, v, objp);
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_ValueToFunction(JSContext *cx, jsval v)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToFunction(cx, &v, JSV2F_SEARCH_STACK);
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_ValueToConstructor(JSContext *cx, jsval v)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToFunction(cx, &v, JSV2F_SEARCH_STACK);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_ValueToString(JSContext *cx, jsval v)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToString(cx, v);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToNumber(cx, v, dp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToECMAInt32(cx, v, ip);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToECMAUint32(cx, v, ip);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToInt32(JSContext *cx, jsval v, int32 *ip)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToInt32(cx, v, ip);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToUint16(JSContext *cx, jsval v, uint16 *ip)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToUint16(cx, v, ip);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp)
-{
-    CHECK_REQUEST(cx);
-    return js_ValueToBoolean(cx, v, bp);
-}
-
-JS_PUBLIC_API(JSType)
-JS_TypeOfValue(JSContext *cx, jsval v)
-{
-    JSType type;
-    JSObject *obj;
-    JSObjectOps *ops;
-    JSClass *clasp;
-
-    CHECK_REQUEST(cx);
-    if (JSVAL_IS_OBJECT(v)) {
-        type = JSTYPE_OBJECT;           /* XXXbe JSTYPE_NULL for JS2 */
-        obj = JSVAL_TO_OBJECT(v);
-        if (obj) {
-            ops = obj->map->ops;
-#if JS_HAS_XML_SUPPORT
-            if (ops == &js_XMLObjectOps.base) {
-                type = JSTYPE_XML;
-            } else
-#endif
-            {
-                /*
-                 * ECMA 262, 11.4.3 says that any native object that implements
-                 * [[Call]] should be of type "function". Note that RegExp and
-                 * Script are both of type "function" for compatibility with
-                 * older SpiderMonkeys.
-                 */
-                clasp = OBJ_GET_CLASS(cx, obj);
-                if ((ops == &js_ObjectOps)
-                    ? (clasp->call
-                       ? (clasp == &js_RegExpClass || clasp == &js_ScriptClass)
-                       : clasp == &js_FunctionClass)
-                    : ops->call != NULL) {
-                    type = JSTYPE_FUNCTION;
-                } else {
-#ifdef NARCISSUS
-                    if (!OBJ_GET_PROPERTY(cx, obj,
-                                          ATOM_TO_JSID(cx->runtime->atomState
-                                                       .callAtom),
-                                          &v)) {
-                        JS_ClearPendingException(cx);
-                    } else if (JSVAL_IS_FUNCTION(cx, v)) {
-                        type = JSTYPE_FUNCTION;
-                    }
-#endif
-                }
-            }
-        }
-    } else if (JSVAL_IS_NUMBER(v)) {
-        type = JSTYPE_NUMBER;
-    } else if (JSVAL_IS_STRING(v)) {
-        type = JSTYPE_STRING;
-    } else if (JSVAL_IS_BOOLEAN(v)) {
-        type = JSTYPE_BOOLEAN;
-    } else {
-        type = JSTYPE_VOID;
-    }
-    return type;
-}
-
-JS_PUBLIC_API(const char *)
-JS_GetTypeName(JSContext *cx, JSType type)
-{
-    if ((uintN)type >= (uintN)JSTYPE_LIMIT)
-        return NULL;
-    return js_type_str[type];
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(JSRuntime *)
-JS_NewRuntime(uint32 maxbytes)
-{
-    JSRuntime *rt;
-
-#ifdef DEBUG
-    JS_BEGIN_MACRO
-    /*
-     * This code asserts that the numbers associated with the error names in
-     * jsmsg.def are monotonically increasing.  It uses values for the error
-     * names enumerated in jscntxt.c.  It's not a compiletime check, but it's
-     * better than nothing.
-     */
-    int errorNumber = 0;
-#define MSG_DEF(name, number, count, exception, format) \
-    JS_ASSERT(name == errorNumber++);
-#include "js.msg"
-#undef MSG_DEF
-    JS_END_MACRO;
-#endif /* DEBUG */
-
-    if (!js_InitStringGlobals())
-        return NULL;
-    rt = (JSRuntime *) malloc(sizeof(JSRuntime));
-    if (!rt)
-        return NULL;
-
-    /* Initialize infallibly first, so we can goto bad and JS_DestroyRuntime. */
-    memset(rt, 0, sizeof(JSRuntime));
-    JS_INIT_CLIST(&rt->contextList);
-    JS_INIT_CLIST(&rt->trapList);
-    JS_INIT_CLIST(&rt->watchPointList);
-
-    if (!js_InitGC(rt, maxbytes))
-        goto bad;
-#ifdef JS_THREADSAFE
-    rt->gcLock = JS_NEW_LOCK();
-    if (!rt->gcLock)
-        goto bad;
-    rt->gcDone = JS_NEW_CONDVAR(rt->gcLock);
-    if (!rt->gcDone)
-        goto bad;
-    rt->requestDone = JS_NEW_CONDVAR(rt->gcLock);
-    if (!rt->requestDone)
-        goto bad;
-    /* this is asymmetric with JS_ShutDown: */
-    if (!js_SetupLocks(8, 16))
-        goto bad;
-    rt->rtLock = JS_NEW_LOCK();
-    if (!rt->rtLock)
-        goto bad;
-    rt->stateChange = JS_NEW_CONDVAR(rt->gcLock);
-    if (!rt->stateChange)
-        goto bad;
-    rt->setSlotLock = JS_NEW_LOCK();
-    if (!rt->setSlotLock)
-        goto bad;
-    rt->setSlotDone = JS_NEW_CONDVAR(rt->setSlotLock);
-    if (!rt->setSlotDone)
-        goto bad;
-    rt->scopeSharingDone = JS_NEW_CONDVAR(rt->gcLock);
-    if (!rt->scopeSharingDone)
-        goto bad;
-    rt->scopeSharingTodo = NO_SCOPE_SHARING_TODO;
-#endif
-    rt->propertyCache.empty = JS_TRUE;
-    if (!js_InitPropertyTree(rt))
-        goto bad;
-    return rt;
-
-bad:
-    JS_DestroyRuntime(rt);
-    return NULL;
-}
-
-JS_PUBLIC_API(void)
-JS_DestroyRuntime(JSRuntime *rt)
-{
-#ifdef DEBUG
-    /* Don't hurt everyone in leaky ol' Mozilla with a fatal JS_ASSERT! */
-    if (!JS_CLIST_IS_EMPTY(&rt->contextList)) {
-        JSContext *cx, *iter = NULL;
-        uintN cxcount = 0;
-        while ((cx = js_ContextIterator(rt, JS_TRUE, &iter)) != NULL)
-            cxcount++;
-        fprintf(stderr,
-"JS API usage error: %u contexts left in runtime upon JS_DestroyRuntime.\n",
-                cxcount);
-    }
-#endif
-
-    js_FreeRuntimeScriptState(rt);
-    js_FinishAtomState(&rt->atomState);
-    js_FinishGC(rt);
-#ifdef JS_THREADSAFE
-    if (rt->gcLock)
-        JS_DESTROY_LOCK(rt->gcLock);
-    if (rt->gcDone)
-        JS_DESTROY_CONDVAR(rt->gcDone);
-    if (rt->requestDone)
-        JS_DESTROY_CONDVAR(rt->requestDone);
-    if (rt->rtLock)
-        JS_DESTROY_LOCK(rt->rtLock);
-    if (rt->stateChange)
-        JS_DESTROY_CONDVAR(rt->stateChange);
-    if (rt->setSlotLock)
-        JS_DESTROY_LOCK(rt->setSlotLock);
-    if (rt->setSlotDone)
-        JS_DESTROY_CONDVAR(rt->setSlotDone);
-    if (rt->scopeSharingDone)
-        JS_DESTROY_CONDVAR(rt->scopeSharingDone);
-#endif
-    js_FinishPropertyTree(rt);
-    free(rt);
-}
-
-JS_PUBLIC_API(void)
-JS_ShutDown(void)
-{
-    JS_ArenaShutDown();
-    js_FinishDtoa();
-    js_FreeStringGlobals();
-#ifdef JS_THREADSAFE
-    js_CleanupLocks();
-#endif
-}
-
-JS_PUBLIC_API(void *)
-JS_GetRuntimePrivate(JSRuntime *rt)
-{
-    return rt->data;
-}
-
-JS_PUBLIC_API(void)
-JS_SetRuntimePrivate(JSRuntime *rt, void *data)
-{
-    rt->data = data;
-}
-
-#ifdef JS_THREADSAFE
-
-JS_PUBLIC_API(void)
-JS_BeginRequest(JSContext *cx)
-{
-    JSRuntime *rt;
-
-    JS_ASSERT(cx->thread);
-    if (!cx->requestDepth) {
-        /* Wait until the GC is finished. */
-        rt = cx->runtime;
-        JS_LOCK_GC(rt);
-
-        /* NB: we use cx->thread here, not js_CurrentThreadId(). */
-        if (rt->gcThread != cx->thread) {
-            while (rt->gcLevel > 0)
-                JS_AWAIT_GC_DONE(rt);
-        }
-
-        /* Indicate that a request is running. */
-        rt->requestCount++;
-        cx->requestDepth = 1;
-        JS_UNLOCK_GC(rt);
-        return;
-    }
-    cx->requestDepth++;
-}
-
-JS_PUBLIC_API(void)
-JS_EndRequest(JSContext *cx)
-{
-    JSRuntime *rt;
-    JSScope *scope, **todop;
-    uintN nshares;
-
-    CHECK_REQUEST(cx);
-    JS_ASSERT(cx->requestDepth > 0);
-    if (cx->requestDepth == 1) {
-        /* Lock before clearing to interlock with ClaimScope, in jslock.c. */
-        rt = cx->runtime;
-        JS_LOCK_GC(rt);
-        cx->requestDepth = 0;
-
-        /* See whether cx has any single-threaded scopes to start sharing. */
-        todop = &rt->scopeSharingTodo;
-        nshares = 0;
-        while ((scope = *todop) != NO_SCOPE_SHARING_TODO) {
-            if (scope->ownercx != cx) {
-                todop = &scope->u.link;
-                continue;
-            }
-            *todop = scope->u.link;
-            scope->u.link = NULL;       /* null u.link for sanity ASAP */
-
-            /*
-             * If js_DropObjectMap returns null, we held the last ref to scope.
-             * The waiting thread(s) must have been killed, after which the GC
-             * collected the object that held this scope.  Unlikely, because it
-             * requires that the GC ran (e.g., from a branch callback) during
-             * this request, but possible.
-             */
-            if (js_DropObjectMap(cx, &scope->map, NULL)) {
-                js_InitLock(&scope->lock);
-                scope->u.count = 0;                 /* NULL may not pun as 0 */
-                js_FinishSharingScope(rt, scope);   /* set ownercx = NULL */
-                nshares++;
-            }
-        }
-        if (nshares)
-            JS_NOTIFY_ALL_CONDVAR(rt->scopeSharingDone);
-
-        /* Give the GC a chance to run if this was the last request running. */
-        JS_ASSERT(rt->requestCount > 0);
-        rt->requestCount--;
-        if (rt->requestCount == 0)
-            JS_NOTIFY_REQUEST_DONE(rt);
-
-        JS_UNLOCK_GC(rt);
-        return;
-    }
-
-    cx->requestDepth--;
-}
-
-/* Yield to pending GC operations, regardless of request depth */
-JS_PUBLIC_API(void)
-JS_YieldRequest(JSContext *cx)
-{
-    JSRuntime *rt;
-
-    JS_ASSERT(cx->thread);
-    CHECK_REQUEST(cx);
-
-    rt = cx->runtime;
-    JS_LOCK_GC(rt);
-    JS_ASSERT(rt->requestCount > 0);
-    rt->requestCount--;
-    if (rt->requestCount == 0)
-        JS_NOTIFY_REQUEST_DONE(rt);
-    JS_UNLOCK_GC(rt);
-    /* XXXbe give the GC or another request calling it a chance to run here?
-             Assumes FIFO scheduling */
-    JS_LOCK_GC(rt);
-    if (rt->gcThread != cx->thread) {
-        while (rt->gcLevel > 0)
-            JS_AWAIT_GC_DONE(rt);
-    }
-    rt->requestCount++;
-    JS_UNLOCK_GC(rt);
-}
-
-JS_PUBLIC_API(jsrefcount)
-JS_SuspendRequest(JSContext *cx)
-{
-    jsrefcount saveDepth = cx->requestDepth;
-
-    while (cx->requestDepth)
-        JS_EndRequest(cx);
-    return saveDepth;
-}
-
-JS_PUBLIC_API(void)
-JS_ResumeRequest(JSContext *cx, jsrefcount saveDepth)
-{
-    JS_ASSERT(!cx->requestDepth);
-    while (--saveDepth >= 0)
-        JS_BeginRequest(cx);
-}
-
-#endif /* JS_THREADSAFE */
-
-JS_PUBLIC_API(void)
-JS_Lock(JSRuntime *rt)
-{
-    JS_LOCK_RUNTIME(rt);
-}
-
-JS_PUBLIC_API(void)
-JS_Unlock(JSRuntime *rt)
-{
-    JS_UNLOCK_RUNTIME(rt);
-}
-
-JS_PUBLIC_API(JSContext *)
-JS_NewContext(JSRuntime *rt, size_t stackChunkSize)
-{
-    return js_NewContext(rt, stackChunkSize);
-}
-
-JS_PUBLIC_API(void)
-JS_DestroyContext(JSContext *cx)
-{
-    js_DestroyContext(cx, JS_FORCE_GC);
-}
-
-JS_PUBLIC_API(void)
-JS_DestroyContextNoGC(JSContext *cx)
-{
-    js_DestroyContext(cx, JS_NO_GC);
-}
-
-JS_PUBLIC_API(void)
-JS_DestroyContextMaybeGC(JSContext *cx)
-{
-    js_DestroyContext(cx, JS_MAYBE_GC);
-}
-
-JS_PUBLIC_API(void *)
-JS_GetContextPrivate(JSContext *cx)
-{
-    return cx->data;
-}
-
-JS_PUBLIC_API(void)
-JS_SetContextPrivate(JSContext *cx, void *data)
-{
-    cx->data = data;
-}
-
-JS_PUBLIC_API(JSRuntime *)
-JS_GetRuntime(JSContext *cx)
-{
-    return cx->runtime;
-}
-
-JS_PUBLIC_API(JSContext *)
-JS_ContextIterator(JSRuntime *rt, JSContext **iterp)
-{
-    return js_ContextIterator(rt, JS_TRUE, iterp);
-}
-
-JS_PUBLIC_API(JSVersion)
-JS_GetVersion(JSContext *cx)
-{
-    return cx->version & JSVERSION_MASK;
-}
-
-JS_PUBLIC_API(JSVersion)
-JS_SetVersion(JSContext *cx, JSVersion version)
-{
-    JSVersion oldVersion;
-
-    JS_ASSERT(version != JSVERSION_UNKNOWN);
-    JS_ASSERT((version & ~JSVERSION_MASK) == 0);
-
-    oldVersion = cx->version & JSVERSION_MASK;
-    if (version == oldVersion)
-        return oldVersion;
-
-    cx->version = (cx->version & ~JSVERSION_MASK) | version;
-    js_OnVersionChange(cx);
-    return oldVersion;
-}
-
-static struct v2smap {
-    JSVersion   version;
-    const char  *string;
-} v2smap[] = {
-    {JSVERSION_1_0,     "1.0"},
-    {JSVERSION_1_1,     "1.1"},
-    {JSVERSION_1_2,     "1.2"},
-    {JSVERSION_1_3,     "1.3"},
-    {JSVERSION_1_4,     "1.4"},
-    {JSVERSION_ECMA_3,  "ECMAv3"},
-    {JSVERSION_1_5,     "1.5"},
-    {JSVERSION_1_6,     "1.6"},
-    {JSVERSION_DEFAULT, js_default_str},
-    {JSVERSION_UNKNOWN, NULL},          /* must be last, NULL is sentinel */
-};
-
-JS_PUBLIC_API(const char *)
-JS_VersionToString(JSVersion version)
-{
-    int i;
-
-    for (i = 0; v2smap[i].string; i++)
-        if (v2smap[i].version == version)
-            return v2smap[i].string;
-    return "unknown";
-}
-
-JS_PUBLIC_API(JSVersion)
-JS_StringToVersion(const char *string)
-{
-    int i;
-
-    for (i = 0; v2smap[i].string; i++)
-        if (strcmp(v2smap[i].string, string) == 0)
-            return v2smap[i].version;
-    return JSVERSION_UNKNOWN;
-}
-
-JS_PUBLIC_API(uint32)
-JS_GetOptions(JSContext *cx)
-{
-    return cx->options;
-}
-
-#define SYNC_OPTIONS_TO_VERSION(cx)                                           \
-    JS_BEGIN_MACRO                                                            \
-        if ((cx)->options & JSOPTION_XML)                                     \
-            (cx)->version |= JSVERSION_HAS_XML;                               \
-        else                                                                  \
-            (cx)->version &= ~JSVERSION_HAS_XML;                              \
-    JS_END_MACRO
-
-JS_PUBLIC_API(uint32)
-JS_SetOptions(JSContext *cx, uint32 options)
-{
-    uint32 oldopts = cx->options;
-    cx->options = options;
-    SYNC_OPTIONS_TO_VERSION(cx);
-    return oldopts;
-}
-
-JS_PUBLIC_API(uint32)
-JS_ToggleOptions(JSContext *cx, uint32 options)
-{
-    uint32 oldopts = cx->options;
-    cx->options ^= options;
-    SYNC_OPTIONS_TO_VERSION(cx);
-    return oldopts;
-}
-
-JS_PUBLIC_API(const char *)
-JS_GetImplementationVersion(void)
-{
-#ifdef OSSP
-    return "JavaScript-C 1.6 pre-release 1 2006-04-04 (OSSP js 1.6.20060820)";
-#else
-    return "JavaScript-C 1.6 pre-release 1 2006-04-04";
-#endif
-}
-
-
-JS_PUBLIC_API(JSObject *)
-JS_GetGlobalObject(JSContext *cx)
-{
-    return cx->globalObject;
-}
-
-JS_PUBLIC_API(void)
-JS_SetGlobalObject(JSContext *cx, JSObject *obj)
-{
-    cx->globalObject = obj;
-#if JS_HAS_XML_SUPPORT
-    cx->xmlSettingFlags = 0;
-#endif
-}
-
-static JSObject *
-InitFunctionAndObjectClasses(JSContext *cx, JSObject *obj)
-{
-    JSDHashTable *table;
-    JSBool resolving;
-    JSRuntime *rt;
-    JSResolvingKey key;
-    JSResolvingEntry *entry;
-    JSObject *fun_proto, *obj_proto;
-
-    /* If cx has no global object, use obj so prototypes can be found. */
-    if (!cx->globalObject)
-        JS_SetGlobalObject(cx, obj);
-
-    /* Record Function and Object in cx->resolvingTable, if we are resolving. */
-    table = cx->resolvingTable;
-    resolving = (table && table->entryCount);
-    if (resolving) {
-        rt = cx->runtime;
-        key.obj = obj;
-        key.id = ATOM_TO_JSID(rt->atomState.FunctionAtom);
-        entry = (JSResolvingEntry *)
-                JS_DHashTableOperate(table, &key, JS_DHASH_ADD);
-        if (entry && entry->key.obj && (entry->flags & JSRESFLAG_LOOKUP)) {
-            /* Already resolving Function, record Object too. */
-            JS_ASSERT(entry->key.obj == obj);
-            key.id = ATOM_TO_JSID(rt->atomState.ObjectAtom);
-            entry = (JSResolvingEntry *)
-                    JS_DHashTableOperate(table, &key, JS_DHASH_ADD);
-        }
-        if (!entry) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-        JS_ASSERT(!entry->key.obj && entry->flags == 0);
-        entry->key = key;
-        entry->flags = JSRESFLAG_LOOKUP;
-    }
-
-    /* Initialize the function class first so constructors can be made. */
-    fun_proto = js_InitFunctionClass(cx, obj);
-    if (!fun_proto)
-        goto out;
-
-    /* Initialize the object class next so Object.prototype works. */
-    obj_proto = js_InitObjectClass(cx, obj);
-    if (!obj_proto) {
-        fun_proto = NULL;
-        goto out;
-    }
-
-    /* Function.prototype and the global object delegate to Object.prototype. */
-    OBJ_SET_PROTO(cx, fun_proto, obj_proto);
-    if (!OBJ_GET_PROTO(cx, obj))
-        OBJ_SET_PROTO(cx, obj, obj_proto);
-
-out:
-    /* If resolving, remove the other entry (Object or Function) from table. */
-    if (resolving)
-        JS_DHashTableOperate(table, &key, JS_DHASH_REMOVE);
-    return fun_proto;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_InitStandardClasses(JSContext *cx, JSObject *obj)
-{
-    CHECK_REQUEST(cx);
-
-#if JS_HAS_UNDEFINED
-{
-    /* Define a top-level property 'undefined' with the undefined value. */
-    JSAtom *atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
-    if (!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                             NULL, NULL, JSPROP_PERMANENT, NULL)) {
-        return JS_FALSE;
-    }
-}
-#endif
-
-    /* Function and Object require cooperative bootstrapping magic. */
-    if (!InitFunctionAndObjectClasses(cx, obj))
-        return JS_FALSE;
-
-    /* Initialize the rest of the standard objects and functions. */
-    return js_InitArrayClass(cx, obj) &&
-           js_InitBooleanClass(cx, obj) &&
-           js_InitMathClass(cx, obj) &&
-           js_InitNumberClass(cx, obj) &&
-           js_InitStringClass(cx, obj) &&
-#if JS_HAS_CALL_OBJECT
-           js_InitCallClass(cx, obj) &&
-#endif
-#if JS_HAS_REGEXPS
-           js_InitRegExpClass(cx, obj) &&
-#endif
-#if JS_HAS_SCRIPT_OBJECT
-           js_InitScriptClass(cx, obj) &&
-#endif
-#if JS_HAS_ERROR_EXCEPTIONS
-           js_InitExceptionClasses(cx, obj) &&
-#endif
-#if JS_HAS_XML_SUPPORT
-           js_InitXMLClasses(cx, obj) &&
-#endif
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-           js_InitFileClass(cx, obj) &&
-#endif
-#ifndef OSSP
-#if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-           js_InitDSOClass(cx, obj) &&
-#endif
-#endif
-           js_InitDateClass(cx, obj);
-}
-
-#define ATOM_OFFSET(name)       offsetof(JSAtomState, name##Atom)
-#define OFFSET_TO_ATOM(rt,off)  (*(JSAtom **)((char*)&(rt)->atomState + (off)))
-
-/*
- * Table of class initializers and their atom offsets in rt->atomState.
- * If you add a "standard" class, remember to update this table.
- */
-static struct {
-    JSObjectOp  init;
-    size_t      atomOffset;
-} standard_class_atoms[] = {
-    {InitFunctionAndObjectClasses,  ATOM_OFFSET(Function)},
-    {InitFunctionAndObjectClasses,  ATOM_OFFSET(Object)},
-    {js_InitArrayClass,             ATOM_OFFSET(Array)},
-    {js_InitBooleanClass,           ATOM_OFFSET(Boolean)},
-    {js_InitDateClass,              ATOM_OFFSET(Date)},
-    {js_InitMathClass,              ATOM_OFFSET(Math)},
-    {js_InitNumberClass,            ATOM_OFFSET(Number)},
-    {js_InitStringClass,            ATOM_OFFSET(String)},
-#if JS_HAS_CALL_OBJECT
-    {js_InitCallClass,              ATOM_OFFSET(Call)},
-#endif
-#if JS_HAS_ERROR_EXCEPTIONS
-    {js_InitExceptionClasses,       ATOM_OFFSET(Error)},
-#endif
-#if JS_HAS_REGEXPS
-    {js_InitRegExpClass,            ATOM_OFFSET(RegExp)},
-#endif
-#if JS_HAS_SCRIPT_OBJECT
-    {js_InitScriptClass,            ATOM_OFFSET(Script)},
-#endif
-#if JS_HAS_XML_SUPPORT
-    {js_InitXMLClass,               ATOM_OFFSET(XML)},
-    {js_InitNamespaceClass,         ATOM_OFFSET(Namespace)},
-    {js_InitQNameClass,             ATOM_OFFSET(QName)},
-#endif
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-    {js_InitFileClass,              ATOM_OFFSET(File)},
-#endif
-#if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-    {js_InitDSOClass,               ATOM_OFFSET(DSO)},
-#endif
-    {NULL,                          0}
-};
-
-/*
- * Table of top-level function and constant names and their init functions.
- * If you add a "standard" global function or property, remember to update
- * this table.
- */
-typedef struct JSStdName {
-    JSObjectOp  init;
-    size_t      atomOffset;     /* offset of atom pointer in JSAtomState */
-    const char  *name;          /* null if atom is pre-pinned, else name */
-} JSStdName;
-
-static JSAtom *
-StdNameToAtom(JSContext *cx, JSStdName *stdn)
-{
-    size_t offset;
-    JSAtom *atom;
-    const char *name;
-
-    offset = stdn->atomOffset;
-    atom = OFFSET_TO_ATOM(cx->runtime, offset);
-    if (!atom) {
-        name = stdn->name;
-        if (name) {
-            atom = js_Atomize(cx, name, strlen(name), ATOM_PINNED);
-            OFFSET_TO_ATOM(cx->runtime, offset) = atom;
-        }
-    }
-    return atom;
-}
-
-#define EAGERLY_PINNED_ATOM(name)   ATOM_OFFSET(name), NULL
-#define LAZILY_PINNED_ATOM(name)    ATOM_OFFSET(lazy.name), js_##name##_str
-
-static JSStdName standard_class_names[] = {
-    /* ECMA requires that eval be a direct property of the global object. */
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(eval)},
-
-    /* Global properties and functions defined by the Number class. */
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(NaN)},
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(Infinity)},
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(isNaN)},
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(isFinite)},
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(parseFloat)},
-    {js_InitNumberClass,        LAZILY_PINNED_ATOM(parseInt)},
-
-    /* String global functions. */
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(escape)},
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(unescape)},
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(decodeURI)},
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(encodeURI)},
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(decodeURIComponent)},
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(encodeURIComponent)},
-#if JS_HAS_UNEVAL
-    {js_InitStringClass,        LAZILY_PINNED_ATOM(uneval)},
-#endif
-
-    /* Exception constructors. */
-#if JS_HAS_ERROR_EXCEPTIONS
-    {js_InitExceptionClasses,   EAGERLY_PINNED_ATOM(Error)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(InternalError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(EvalError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(RangeError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(ReferenceError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(SyntaxError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(TypeError)},
-    {js_InitExceptionClasses,   LAZILY_PINNED_ATOM(URIError)},
-#endif
-
-#if JS_HAS_XML_SUPPORT
-    {js_InitAnyNameClass,       LAZILY_PINNED_ATOM(AnyName)},
-    {js_InitAttributeNameClass, LAZILY_PINNED_ATOM(AttributeName)},
-    {js_InitXMLClass,           LAZILY_PINNED_ATOM(XMLList)},
-    {js_InitXMLClass,           LAZILY_PINNED_ATOM(isXMLName)},
-#endif
-
-    {NULL,                      0, NULL}
-};
-
-static JSStdName object_prototype_names[] = {
-    /* Object.prototype properties (global delegates to Object.prototype). */
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(proto)},
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(parent)},
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(count)},
-#if JS_HAS_TOSOURCE
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(toSource)},
-#endif
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(toString)},
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(toLocaleString)},
-    {js_InitObjectClass,        EAGERLY_PINNED_ATOM(valueOf)},
-#if JS_HAS_OBJ_WATCHPOINT
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(watch)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(unwatch)},
-#endif
-#if JS_HAS_NEW_OBJ_METHODS
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(hasOwnProperty)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(isPrototypeOf)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(propertyIsEnumerable)},
-#endif
-#if JS_HAS_GETTER_SETTER
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(defineGetter)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(defineSetter)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(lookupGetter)},
-    {js_InitObjectClass,        LAZILY_PINNED_ATOM(lookupSetter)},
-#endif
-
-    {NULL,                      0, NULL}
-};
-
-#undef EAGERLY_PINNED_ATOM
-#undef LAZILY_PINNED_ATOM
-
-JS_PUBLIC_API(JSBool)
-JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id,
-                        JSBool *resolved)
-{
-    JSString *idstr;
-    JSRuntime *rt;
-    JSAtom *atom;
-    JSObjectOp init;
-    uintN i;
-
-    CHECK_REQUEST(cx);
-    *resolved = JS_FALSE;
-
-    if (!JSVAL_IS_STRING(id))
-        return JS_TRUE;
-    idstr = JSVAL_TO_STRING(id);
-    rt = cx->runtime;
-
-#if JS_HAS_UNDEFINED
-    /* Check whether we're resolving 'undefined', and define it if so. */
-    atom = rt->atomState.typeAtoms[JSTYPE_VOID];
-    if (idstr == ATOM_TO_STRING(atom)) {
-        *resolved = JS_TRUE;
-        return OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                                   NULL, NULL, JSPROP_PERMANENT, NULL);
-    }
-#endif
-
-    /* Try for class constructors/prototypes named by well-known atoms. */
-    init = NULL;
-    for (i = 0; standard_class_atoms[i].init; i++) {
-        atom = OFFSET_TO_ATOM(rt, standard_class_atoms[i].atomOffset);
-        if (idstr == ATOM_TO_STRING(atom)) {
-            init = standard_class_atoms[i].init;
-            break;
-        }
-    }
-
-    if (!init) {
-        /* Try less frequently used top-level functions and constants. */
-        for (i = 0; standard_class_names[i].init; i++) {
-            atom = StdNameToAtom(cx, &standard_class_names[i]);
-            if (!atom)
-                return JS_FALSE;
-            if (idstr == ATOM_TO_STRING(atom)) {
-                init = standard_class_names[i].init;
-                break;
-            }
-        }
-
-        if (!init && !OBJ_GET_PROTO(cx, obj)) {
-            /*
-             * Try even less frequently used names delegated from the global
-             * object to Object.prototype, but only if the Object class hasn't
-             * yet been initialized.
-             */
-            for (i = 0; object_prototype_names[i].init; i++) {
-                atom = StdNameToAtom(cx, &object_prototype_names[i]);
-                if (!atom)
-                    return JS_FALSE;
-                if (idstr == ATOM_TO_STRING(atom)) {
-                    init = standard_class_names[i].init;
-                    break;
-                }
-            }
-        }
-    }
-
-    if (init) {
-        if (!init(cx, obj))
-            return JS_FALSE;
-        *resolved = JS_TRUE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-AlreadyHasOwnProperty(JSObject *obj, JSAtom *atom)
-{
-    JS_ASSERT(OBJ_IS_NATIVE(obj));
-    return SCOPE_GET_PROPERTY(OBJ_SCOPE(obj), ATOM_TO_JSID(atom)) != NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj)
-{
-    JSRuntime *rt;
-    JSAtom *atom;
-    uintN i;
-
-    CHECK_REQUEST(cx);
-    rt = cx->runtime;
-
-#if JS_HAS_UNDEFINED
-    /* Check whether we need to bind 'undefined' and define it if so. */
-    atom = rt->atomState.typeAtoms[JSTYPE_VOID];
-    if (!AlreadyHasOwnProperty(obj, atom) &&
-        !OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                             NULL, NULL, JSPROP_PERMANENT, NULL)) {
-        return JS_FALSE;
-    }
-#endif
-
-    /* Initialize any classes that have not been resolved yet. */
-    for (i = 0; standard_class_atoms[i].init; i++) {
-        atom = OFFSET_TO_ATOM(rt, standard_class_atoms[i].atomOffset);
-        if (!AlreadyHasOwnProperty(obj, atom) &&
-            !standard_class_atoms[i].init(cx, obj)) {
-            return JS_FALSE;
-        }
-    }
-
-    return JS_TRUE;
-}
-
-static JSIdArray *
-AddAtomToArray(JSContext *cx, JSAtom *atom, JSIdArray *ida, jsint *ip)
-{
-    jsint i, length;
-
-    i = *ip;
-    length = ida->length;
-    if (i >= length) {
-        ida = js_SetIdArrayLength(cx, ida, JS_MAX(length * 2, 8));
-        if (!ida)
-            return NULL;
-        JS_ASSERT(i < ida->length);
-    }
-    ida->vector[i] = ATOM_TO_JSID(atom);
-    *ip = i + 1;
-    return ida;
-}
-
-static JSIdArray *
-EnumerateIfResolved(JSContext *cx, JSObject *obj, JSAtom *atom, JSIdArray *ida,
-                    jsint *ip, JSBool *foundp)
-{
-    *foundp = AlreadyHasOwnProperty(obj, atom);
-    if (*foundp)
-        ida = AddAtomToArray(cx, atom, ida, ip);
-    return ida;
-}
-
-JS_PUBLIC_API(JSIdArray *)
-JS_EnumerateResolvedStandardClasses(JSContext *cx, JSObject *obj,
-                                    JSIdArray *ida)
-{
-    JSRuntime *rt;
-    jsint i, j, k;
-    JSAtom *atom;
-    JSBool found;
-    JSObjectOp init;
-
-    CHECK_REQUEST(cx);
-    rt = cx->runtime;
-    if (ida) {
-        i = ida->length;
-    } else {
-        ida = js_NewIdArray(cx, 8);
-        if (!ida)
-            return NULL;
-        i = 0;
-    }
-
-#if JS_HAS_UNDEFINED
-    /* Check whether 'undefined' has been resolved and enumerate it if so. */
-    atom = rt->atomState.typeAtoms[JSTYPE_VOID];
-    ida = EnumerateIfResolved(cx, obj, atom, ida, &i, &found);
-    if (!ida)
-        return NULL;
-#endif
-
-    /* Enumerate only classes that *have* been resolved. */
-    for (j = 0; standard_class_atoms[j].init; j++) {
-        atom = OFFSET_TO_ATOM(rt, standard_class_atoms[j].atomOffset);
-        ida = EnumerateIfResolved(cx, obj, atom, ida, &i, &found);
-        if (!ida)
-            return NULL;
-
-        if (found) {
-            init = standard_class_atoms[j].init;
-
-            for (k = 0; standard_class_names[k].init; k++) {
-                if (standard_class_names[k].init == init) {
-                    atom = StdNameToAtom(cx, &standard_class_names[k]);
-                    ida = AddAtomToArray(cx, atom, ida, &i);
-                    if (!ida)
-                        return NULL;
-                }
-            }
-
-            if (init == js_InitObjectClass) {
-                for (k = 0; object_prototype_names[k].init; k++) {
-                    atom = StdNameToAtom(cx, &object_prototype_names[k]);
-                    ida = AddAtomToArray(cx, atom, ida, &i);
-                    if (!ida)
-                        return NULL;
-                }
-            }
-        }
-    }
-
-    /* Trim to exact length via js_SetIdArrayLength. */
-    return js_SetIdArrayLength(cx, ida, i);
-}
-
-#undef ATOM_OFFSET
-#undef OFFSET_TO_ATOM
-
-JS_PUBLIC_API(JSObject *)
-JS_GetScopeChain(JSContext *cx)
-{
-    return cx->fp ? cx->fp->scopeChain : NULL;
-}
-
-JS_PUBLIC_API(void *)
-JS_malloc(JSContext *cx, size_t nbytes)
-{
-    void *p;
-
-    JS_ASSERT(nbytes != 0);
-    if (nbytes == 0)
-        nbytes = 1;
-    cx->runtime->gcMallocBytes += nbytes;
-    p = malloc(nbytes);
-    if (!p)
-        JS_ReportOutOfMemory(cx);
-    return p;
-}
-
-JS_PUBLIC_API(void *)
-JS_realloc(JSContext *cx, void *p, size_t nbytes)
-{
-    p = realloc(p, nbytes);
-    if (!p)
-        JS_ReportOutOfMemory(cx);
-    return p;
-}
-
-JS_PUBLIC_API(void)
-JS_free(JSContext *cx, void *p)
-{
-    if (p)
-        free(p);
-}
-
-JS_PUBLIC_API(char *)
-JS_strdup(JSContext *cx, const char *s)
-{
-    size_t n;
-    void *p;
-
-    n = strlen(s) + 1;
-    p = JS_malloc(cx, n);
-    if (!p)
-        return NULL;
-    return (char *)memcpy(p, s, n);
-}
-
-JS_PUBLIC_API(jsdouble *)
-JS_NewDouble(JSContext *cx, jsdouble d)
-{
-    CHECK_REQUEST(cx);
-    return js_NewDouble(cx, d, 0);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval)
-{
-    CHECK_REQUEST(cx);
-    return js_NewDoubleValue(cx, d, rval);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval)
-{
-    CHECK_REQUEST(cx);
-    return js_NewNumberValue(cx, d, rval);
-}
-
-#undef JS_AddRoot
-JS_PUBLIC_API(JSBool)
-JS_AddRoot(JSContext *cx, void *rp)
-{
-    CHECK_REQUEST(cx);
-    return js_AddRoot(cx, rp, NULL);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_AddNamedRootRT(JSRuntime *rt, void *rp, const char *name)
-{
-    return js_AddRootRT(rt, rp, name);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_RemoveRoot(JSContext *cx, void *rp)
-{
-    CHECK_REQUEST(cx);
-    return js_RemoveRoot(cx->runtime, rp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_RemoveRootRT(JSRuntime *rt, void *rp)
-{
-    return js_RemoveRoot(rt, rp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_AddNamedRoot(JSContext *cx, void *rp, const char *name)
-{
-    CHECK_REQUEST(cx);
-    return js_AddRoot(cx, rp, name);
-}
-
-JS_PUBLIC_API(void)
-JS_ClearNewbornRoots(JSContext *cx)
-{
-    uintN i;
-
-    for (i = 0; i < GCX_NTYPES; i++)
-        cx->newborn[i] = NULL;
-    cx->lastAtom = NULL;
-    cx->lastInternalResult = JSVAL_NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EnterLocalRootScope(JSContext *cx)
-{
-    CHECK_REQUEST(cx);
-    return js_EnterLocalRootScope(cx);
-}
-
-JS_PUBLIC_API(void)
-JS_LeaveLocalRootScope(JSContext *cx)
-{
-    CHECK_REQUEST(cx);
-    js_LeaveLocalRootScope(cx);
-}
-
-JS_PUBLIC_API(void)
-JS_ForgetLocalRoot(JSContext *cx, void *thing)
-{
-    CHECK_REQUEST(cx);
-    js_ForgetLocalRoot(cx, (jsval) thing);
-}
-
-#include "jshash.h" /* Added by JSIFY */
-
-#ifdef DEBUG
-
-typedef struct NamedRootDumpArgs {
-    void (*dump)(const char *name, void *rp, void *data);
-    void *data;
-} NamedRootDumpArgs;
-
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-js_named_root_dumper(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 number,
-                     void *arg)
-{
-    NamedRootDumpArgs *args = (NamedRootDumpArgs *) arg;
-    JSGCRootHashEntry *rhe = (JSGCRootHashEntry *)hdr;
-
-    if (rhe->name)
-        args->dump(rhe->name, rhe->root, args->data);
-    return JS_DHASH_NEXT;
-}
-
-JS_PUBLIC_API(void)
-JS_DumpNamedRoots(JSRuntime *rt,
-                  void (*dump)(const char *name, void *rp, void *data),
-                  void *data)
-{
-    NamedRootDumpArgs args;
-
-    args.dump = dump;
-    args.data = data;
-    JS_DHashTableEnumerate(&rt->gcRootsHash, js_named_root_dumper, &args);
-}
-
-#endif /* DEBUG */
-
-typedef struct GCRootMapArgs {
-    JSGCRootMapFun map;
-    void *data;
-} GCRootMapArgs;
-
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-js_gcroot_mapper(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 number,
-                 void *arg)
-{
-    GCRootMapArgs *args = (GCRootMapArgs *) arg;
-    JSGCRootHashEntry *rhe = (JSGCRootHashEntry *)hdr;
-    intN mapflags;
-    JSDHashOperator op;
-
-    mapflags = args->map(rhe->root, rhe->name, args->data);
-
-#if JS_MAP_GCROOT_NEXT == JS_DHASH_NEXT &&                                     \
-    JS_MAP_GCROOT_STOP == JS_DHASH_STOP &&                                     \
-    JS_MAP_GCROOT_REMOVE == JS_DHASH_REMOVE
-    op = (JSDHashOperator)mapflags;
-#else
-    op = JS_DHASH_NEXT;
-    if (mapflags & JS_MAP_GCROOT_STOP)
-        op |= JS_DHASH_STOP;
-    if (mapflags & JS_MAP_GCROOT_REMOVE)
-        op |= JS_DHASH_REMOVE;
-#endif
-
-    return op;
-}
-
-JS_PUBLIC_API(uint32)
-JS_MapGCRoots(JSRuntime *rt, JSGCRootMapFun map, void *data)
-{
-    GCRootMapArgs args;
-    uint32 rv;
-
-    args.map = map;
-    args.data = data;
-    JS_LOCK_GC(rt);
-    rv = JS_DHashTableEnumerate(&rt->gcRootsHash, js_gcroot_mapper, &args);
-    JS_UNLOCK_GC(rt);
-    return rv;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LockGCThing(JSContext *cx, void *thing)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    ok = js_LockGCThing(cx, thing);
-    if (!ok)
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_LOCK);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LockGCThingRT(JSRuntime *rt, void *thing)
-{
-    return js_LockGCThingRT(rt, thing);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_UnlockGCThing(JSContext *cx, void *thing)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    ok = js_UnlockGCThingRT(cx->runtime, thing);
-    if (!ok)
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_UNLOCK);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_UnlockGCThingRT(JSRuntime *rt, void *thing)
-{
-    return js_UnlockGCThingRT(rt, thing);
-}
-
-JS_PUBLIC_API(void)
-JS_MarkGCThing(JSContext *cx, void *thing, const char *name, void *arg)
-{
-    JS_ASSERT(cx->runtime->gcLevel > 0);
-#ifdef JS_THREADSAFE
-    JS_ASSERT(cx->runtime->gcThread == js_CurrentThreadId());
-#endif
-
-    GC_MARK(cx, thing, name, arg);
-}
-
-JS_PUBLIC_API(void)
-JS_GC(JSContext *cx)
-{
-    /* Don't nuke active arenas if executing or compiling. */
-    if (cx->stackPool.current == &cx->stackPool.first)
-        JS_FinishArenaPool(&cx->stackPool);
-    if (cx->tempPool.current == &cx->tempPool.first)
-        JS_FinishArenaPool(&cx->tempPool);
-    js_ForceGC(cx, 0);
-}
-
-JS_PUBLIC_API(void)
-JS_MaybeGC(JSContext *cx)
-{
-#ifdef WAY_TOO_MUCH_GC
-    JS_GC(cx);
-#else
-    JSRuntime *rt;
-    uint32 bytes, lastBytes;
-
-    rt = cx->runtime;
-    bytes = rt->gcBytes;
-    lastBytes = rt->gcLastBytes;
-    if ((bytes > 8192 && bytes > lastBytes + lastBytes / 2) ||
-        rt->gcMallocBytes > rt->gcMaxBytes) {
-        /*
-         * Run the GC if we have half again as many bytes of GC-things as
-         * the last time we GC'd, or if we have malloc'd more bytes through
-         * JS_malloc than we were told to allocate by JS_NewRuntime.
-         */
-        JS_GC(cx);
-    }
-#endif
-}
-
-JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallback(JSContext *cx, JSGCCallback cb)
-{
-    return JS_SetGCCallbackRT(cx->runtime, cb);
-}
-
-JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallbackRT(JSRuntime *rt, JSGCCallback cb)
-{
-    JSGCCallback oldcb;
-
-    oldcb = rt->gcCallback;
-    rt->gcCallback = cb;
-    return oldcb;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsAboutToBeFinalized(JSContext *cx, void *thing)
-{
-    JS_ASSERT(thing);
-    return js_IsAboutToBeFinalized(cx, thing);
-}
-
-JS_PUBLIC_API(intN)
-JS_AddExternalStringFinalizer(JSStringFinalizeOp finalizer)
-{
-    return js_ChangeExternalStringFinalizer(NULL, finalizer);
-}
-
-JS_PUBLIC_API(intN)
-JS_RemoveExternalStringFinalizer(JSStringFinalizeOp finalizer)
-{
-    return js_ChangeExternalStringFinalizer(finalizer, NULL);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewExternalString(JSContext *cx, jschar *chars, size_t length, intN type)
-{
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    JS_ASSERT(GCX_EXTERNAL_STRING <= type && type < (intN) GCX_NTYPES);
-
-    str = (JSString *) js_NewGCThing(cx, (uintN) type, sizeof(JSString));
-    if (!str)
-        return NULL;
-    str->length = length;
-    str->chars = chars;
-    return str;
-}
-
-JS_PUBLIC_API(intN)
-JS_GetExternalStringGCType(JSRuntime *rt, JSString *str)
-{
-    uint8 type = (uint8) (*js_GetGCThingFlags(str) & GCF_TYPEMASK);
-
-    if (type >= GCX_EXTERNAL_STRING)
-        return (intN)type;
-    JS_ASSERT(type == GCX_STRING || type == GCX_MUTABLE_STRING);
-    return -1;
-}
-
-JS_PUBLIC_API(void)
-JS_SetThreadStackLimit(JSContext *cx, jsuword limitAddr)
-{
-#if JS_STACK_GROWTH_DIRECTION > 0
-    if (limitAddr == 0)
-        limitAddr = (jsuword)-1;
-#endif
-    cx->stackLimit = limitAddr;
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(void)
-JS_DestroyIdArray(JSContext *cx, JSIdArray *ida)
-{
-    JS_free(cx, ida);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ValueToId(JSContext *cx, jsval v, jsid *idp)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    if (JSVAL_IS_INT(v)) {
-        *idp = v;
-    } else {
-        atom = js_ValueToStringAtom(cx, v);
-        if (!atom)
-            return JS_FALSE;
-        *idp = ATOM_TO_JSID(atom);
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IdToValue(JSContext *cx, jsid id, jsval *vp)
-{
-    CHECK_REQUEST(cx);
-    *vp = ID_TO_VALUE(id);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_PropertyStub(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EnumerateStub(JSContext *cx, JSObject *obj)
-{
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ResolveStub(JSContext *cx, JSObject *obj, jsval id)
-{
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ConvertStub(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
-{
-#if JS_BUG_EAGER_TOSTRING
-    if (type == JSTYPE_STRING)
-        return JS_TRUE;
-#endif
-    js_TryValueOf(cx, obj, type, vp);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(void)
-JS_FinalizeStub(JSContext *cx, JSObject *obj)
-{
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_InitClass(JSContext *cx, JSObject *obj, JSObject *parent_proto,
-             JSClass *clasp, JSNative constructor, uintN nargs,
-             JSPropertySpec *ps, JSFunctionSpec *fs,
-             JSPropertySpec *static_ps, JSFunctionSpec *static_fs)
-{
-    JSAtom *atom;
-    JSObject *proto, *ctor;
-    JSTempValueRooter tvr;
-    jsval cval, rval;
-    JSBool named;
-    JSFunction *fun;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, clasp->name, strlen(clasp->name), 0);
-    if (!atom)
-        return NULL;
-
-    /* Create a prototype object for this class. */
-    proto = js_NewObject(cx, clasp, parent_proto, obj);
-    if (!proto)
-        return NULL;
-
-    /* After this point, control must exit via label bad or out. */
-    JS_PUSH_SINGLE_TEMP_ROOT(cx, OBJECT_TO_JSVAL(proto), &tvr);
-
-    if (!constructor) {
-        /* Lacking a constructor, name the prototype (e.g., Math). */
-        named = OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom),
-                                    OBJECT_TO_JSVAL(proto),
-                                    NULL, NULL, 0, NULL);
-        if (!named)
-            goto bad;
-        ctor = proto;
-    } else {
-        /* Define the constructor function in obj's scope. */
-        fun = js_DefineFunction(cx, obj, atom, constructor, nargs, 0);
-        named = (fun != NULL);
-        if (!fun)
-            goto bad;
-
-        /*
-         * Remember the class this function is a constructor for so that
-         * we know to create an object of this class when we call the
-         * constructor.
-         */
-        fun->clasp = clasp;
-
-        /*
-         * Optionally construct the prototype object, before the class has
-         * been fully initialized.  Allow the ctor to replace proto with a
-         * different object, as is done for operator new -- and as at least
-         * XML support requires.
-         */
-        ctor = fun->object;
-        if (clasp->flags & JSCLASS_CONSTRUCT_PROTOTYPE) {
-            cval = OBJECT_TO_JSVAL(ctor);
-            if (!js_InternalConstruct(cx, proto, cval, 0, NULL, &rval))
-                goto bad;
-            if (!JSVAL_IS_PRIMITIVE(rval) && JSVAL_TO_OBJECT(rval) != proto)
-                proto = JSVAL_TO_OBJECT(rval);
-        }
-
-        /* Connect constructor and prototype by named properties. */
-        if (!js_SetClassPrototype(cx, ctor, proto,
-                                  JSPROP_READONLY | JSPROP_PERMANENT)) {
-            goto bad;
-        }
-
-        /* Bootstrap Function.prototype (see also JS_InitStandardClasses). */
-        if (OBJ_GET_CLASS(cx, ctor) == clasp) {
-            /* XXXMLM - this fails in framesets that are writing over
-             *           themselves!
-             * JS_ASSERT(!OBJ_GET_PROTO(cx, ctor));
-             */
-            OBJ_SET_PROTO(cx, ctor, proto);
-        }
-    }
-
-    /* Add properties and methods to the prototype and the constructor. */
-    if ((ps && !JS_DefineProperties(cx, proto, ps)) ||
-        (fs && !JS_DefineFunctions(cx, proto, fs)) ||
-        (static_ps && !JS_DefineProperties(cx, ctor, static_ps)) ||
-        (static_fs && !JS_DefineFunctions(cx, ctor, static_fs))) {
-        goto bad;
-    }
-
-out:
-    JS_POP_TEMP_ROOT(cx, &tvr);
-    return proto;
-
-bad:
-    if (named)
-        (void) OBJ_DELETE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &rval);
-    proto = NULL;
-    goto out;
-}
-
-#ifdef JS_THREADSAFE
-JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSContext *cx, JSObject *obj)
-{
-    return (JSClass *)
-        JSVAL_TO_PRIVATE(GC_AWARE_GET_SLOT(cx, obj, JSSLOT_CLASS));
-}
-#else
-JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSObject *obj)
-{
-    return LOCKED_OBJ_GET_CLASS(obj);
-}
-#endif
-
-JS_PUBLIC_API(JSBool)
-JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv)
-{
-    JSFunction *fun;
-
-    CHECK_REQUEST(cx);
-    if (OBJ_GET_CLASS(cx, obj) == clasp)
-        return JS_TRUE;
-    if (argv) {
-        fun = js_ValueToFunction(cx, &argv[-2], 0);
-        if (fun) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_INCOMPATIBLE_PROTO,
-                                 clasp->name, JS_GetFunctionName(fun),
-                                 OBJ_GET_CLASS(cx, obj)->name);
-        }
-    }
-    return JS_FALSE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    return js_HasInstance(cx, obj, v, bp);
-}
-
-JS_PUBLIC_API(void *)
-JS_GetPrivate(JSContext *cx, JSObject *obj)
-{
-    jsval v;
-
-    JS_ASSERT(OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE);
-    v = GC_AWARE_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (!JSVAL_IS_INT(v))
-        return NULL;
-    return JSVAL_TO_PRIVATE(v);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetPrivate(JSContext *cx, JSObject *obj, void *data)
-{
-    JS_ASSERT(OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE);
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, PRIVATE_TO_JSVAL(data));
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(void *)
-JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp,
-                      jsval *argv)
-{
-    if (!JS_InstanceOf(cx, obj, clasp, argv))
-        return NULL;
-    return JS_GetPrivate(cx, obj);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetPrototype(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-
-    CHECK_REQUEST(cx);
-    proto = JSVAL_TO_OBJECT(GC_AWARE_GET_SLOT(cx, obj, JSSLOT_PROTO));
-
-    /* Beware ref to dead object (we may be called from obj's finalizer). */
-    return proto && proto->map ? proto : NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto)
-{
-    CHECK_REQUEST(cx);
-    if (obj->map->ops->setProto)
-        return obj->map->ops->setProto(cx, obj, JSSLOT_PROTO, proto);
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PROTO, OBJECT_TO_JSVAL(proto));
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetParent(JSContext *cx, JSObject *obj)
-{
-    JSObject *parent;
-
-    parent = JSVAL_TO_OBJECT(GC_AWARE_GET_SLOT(cx, obj, JSSLOT_PARENT));
-
-    /* Beware ref to dead object (we may be called from obj's finalizer). */
-    return parent && parent->map ? parent : NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent)
-{
-    CHECK_REQUEST(cx);
-    if (obj->map->ops->setParent)
-        return obj->map->ops->setParent(cx, obj, JSSLOT_PARENT, parent);
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PARENT, OBJECT_TO_JSVAL(parent));
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetConstructor(JSContext *cx, JSObject *proto)
-{
-    jsval cval;
-
-    CHECK_REQUEST(cx);
-    if (!OBJ_GET_PROPERTY(cx, proto,
-                          ATOM_TO_JSID(cx->runtime->atomState.constructorAtom),
-                          &cval)) {
-        return NULL;
-    }
-    if (!JSVAL_IS_FUNCTION(cx, cval)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NO_CONSTRUCTOR,
-                             OBJ_GET_CLASS(cx, proto)->name);
-        return NULL;
-    }
-    return JSVAL_TO_OBJECT(cval);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp)
-{
-    JS_ASSERT(((jsid)obj & JSID_TAGMASK) == 0);
-    *idp = OBJECT_TO_JSID(obj);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent)
-{
-    CHECK_REQUEST(cx);
-    if (!clasp)
-        clasp = &js_ObjectClass;    /* default class is Object */
-    return js_NewObject(cx, clasp, proto, parent);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SealObject(JSContext *cx, JSObject *obj, JSBool deep)
-{
-    JSScope *scope;
-    JSIdArray *ida;
-    uint32 nslots;
-    jsval v, *vp, *end;
-
-    if (!OBJ_IS_NATIVE(obj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_CANT_SEAL_OBJECT,
-                             OBJ_GET_CLASS(cx, obj)->name);
-        return JS_FALSE;
-    }
-
-    scope = OBJ_SCOPE(obj);
-
-#if defined JS_THREADSAFE && defined DEBUG
-    /* Insist on scope being used exclusively by cx's thread. */
-    if (scope->ownercx != cx) {
-        JS_LOCK_OBJ(cx, obj);
-        JS_ASSERT(OBJ_SCOPE(obj) == scope);
-        JS_ASSERT(scope->ownercx == cx);
-        JS_UNLOCK_SCOPE(cx, scope);
-    }
-#endif
-
-    /* Nothing to do if obj's scope is already sealed. */
-    if (SCOPE_IS_SEALED(scope))
-        return JS_TRUE;
-
-    /* XXX Enumerate lazy properties now, as they can't be added later. */
-    ida = JS_Enumerate(cx, obj);
-    if (!ida)
-        return JS_FALSE;
-    JS_DestroyIdArray(cx, ida);
-
-    /* Ensure that obj has its own, mutable scope, and seal that scope. */
-    JS_LOCK_OBJ(cx, obj);
-    scope = js_GetMutableScope(cx, obj);
-    if (scope)
-        SCOPE_SET_SEALED(scope);
-    JS_UNLOCK_OBJ(cx, obj);
-    if (!scope)
-        return JS_FALSE;
-
-    /* If we are not sealing an entire object graph, we're done. */
-    if (!deep)
-        return JS_TRUE;
-
-    /* Walk obj->slots and if any value is a non-null object, seal it. */
-    nslots = JS_MIN(scope->map.freeslot, scope->map.nslots);
-    for (vp = obj->slots, end = vp + nslots; vp < end; vp++) {
-        v = *vp;
-        if (JSVAL_IS_PRIMITIVE(v))
-            continue;
-        if (!JS_SealObject(cx, JSVAL_TO_OBJECT(v), deep))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
-                   JSObject *parent)
-{
-    CHECK_REQUEST(cx);
-    if (!clasp)
-        clasp = &js_ObjectClass;    /* default class is Object */
-    return js_ConstructObject(cx, clasp, proto, parent, 0, NULL);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_ConstructObjectWithArguments(JSContext *cx, JSClass *clasp, JSObject *proto,
-                                JSObject *parent, uintN argc, jsval *argv)
-{
-    CHECK_REQUEST(cx);
-    if (!clasp)
-        clasp = &js_ObjectClass;    /* default class is Object */
-    return js_ConstructObject(cx, clasp, proto, parent, argc, argv);
-}
-
-static JSBool
-DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
-               JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-               uintN flags, intN tinyid)
-{
-    jsid id;
-    JSAtom *atom;
-
-    if (attrs & JSPROP_INDEX) {
-        id = INT_TO_JSID(JS_PTR_TO_INT32(name));
-        atom = NULL;
-        attrs &= ~JSPROP_INDEX;
-    } else {
-        atom = js_Atomize(cx, name, strlen(name), 0);
-        if (!atom)
-            return JS_FALSE;
-        id = ATOM_TO_JSID(atom);
-    }
-    if (flags != 0 && OBJ_IS_NATIVE(obj)) {
-        return js_DefineNativeProperty(cx, obj, id, value, getter, setter,
-                                       attrs, flags, tinyid, NULL);
-    }
-    return OBJ_DEFINE_PROPERTY(cx, obj, id, value, getter, setter, attrs,
-                               NULL);
-}
-
-#define AUTO_NAMELEN(s,n)   (((n) == (size_t)-1) ? js_strlen(s) : (n))
-
-static JSBool
-DefineUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen, jsval value,
-                 JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                 uintN flags, intN tinyid)
-{
-    JSAtom *atom;
-
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return JS_FALSE;
-    if (flags != 0 && OBJ_IS_NATIVE(obj)) {
-        return js_DefineNativeProperty(cx, obj, ATOM_TO_JSID(atom), value,
-                                       getter, setter, attrs, flags, tinyid,
-                                       NULL);
-    }
-    return OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), value,
-                               getter, setter, attrs, NULL);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_DefineObject(JSContext *cx, JSObject *obj, const char *name, JSClass *clasp,
-                JSObject *proto, uintN attrs)
-{
-    JSObject *nobj;
-
-    CHECK_REQUEST(cx);
-    if (!clasp)
-        clasp = &js_ObjectClass;    /* default class is Object */
-    nobj = js_NewObject(cx, clasp, proto, obj);
-    if (!nobj)
-        return NULL;
-    if (!DefineProperty(cx, obj, name, OBJECT_TO_JSVAL(nobj), NULL, NULL, attrs,
-                        0, 0)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    return nobj;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineConstDoubles(JSContext *cx, JSObject *obj, JSConstDoubleSpec *cds)
-{
-    JSBool ok;
-    jsval value;
-    uintN flags;
-
-    CHECK_REQUEST(cx);
-    for (ok = JS_TRUE; cds->name; cds++) {
-        ok = js_NewNumberValue(cx, cds->dval, &value);
-        if (!ok)
-            break;
-        flags = cds->flags;
-        if (!flags)
-            flags = JSPROP_READONLY | JSPROP_PERMANENT;
-        ok = DefineProperty(cx, obj, cds->name, value, NULL, NULL, flags, 0, 0);
-        if (!ok)
-            break;
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineProperties(JSContext *cx, JSObject *obj, JSPropertySpec *ps)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    for (ok = JS_TRUE; ps->name; ps++) {
-        ok = DefineProperty(cx, obj, ps->name, JSVAL_VOID,
-                            ps->getter, ps->setter, ps->flags,
-                            SPROP_HAS_SHORTID, ps->tinyid);
-        if (!ok)
-            break;
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
-                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs)
-{
-    CHECK_REQUEST(cx);
-    return DefineProperty(cx, obj, name, value, getter, setter, attrs, 0, 0);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,
-                            int8 tinyid, jsval value,
-                            JSPropertyOp getter, JSPropertyOp setter,
-                            uintN attrs)
-{
-    CHECK_REQUEST(cx);
-    return DefineProperty(cx, obj, name, value, getter, setter, attrs,
-                          SPROP_HAS_SHORTID, tinyid);
-}
-
-static JSBool
-LookupProperty(JSContext *cx, JSObject *obj, const char *name, JSObject **objp,
-               JSProperty **propp)
-{
-    JSAtom *atom;
-
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), objp, propp);
-}
-
-static JSBool
-LookupUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 JSObject **objp, JSProperty **propp)
-{
-    JSAtom *atom;
-
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), objp, propp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_AliasProperty(JSContext *cx, JSObject *obj, const char *name,
-                 const char *alias)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    JSAtom *atom;
-    JSBool ok;
-    JSScopeProperty *sprop;
-
-    CHECK_REQUEST(cx);
-    if (!LookupProperty(cx, obj, name, &obj2, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        js_ReportIsNotDefined(cx, name);
-        return JS_FALSE;
-    }
-    if (obj2 != obj || !OBJ_IS_NATIVE(obj)) {
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_ALIAS,
-                             alias, name, OBJ_GET_CLASS(cx, obj2)->name);
-        return JS_FALSE;
-    }
-    atom = js_Atomize(cx, alias, strlen(alias), 0);
-    if (!atom) {
-        ok = JS_FALSE;
-    } else {
-        sprop = (JSScopeProperty *)prop;
-        ok = (js_AddNativeProperty(cx, obj, ATOM_TO_JSID(atom),
-                                   sprop->getter, sprop->setter, sprop->slot,
-                                   sprop->attrs, sprop->flags | SPROP_IS_ALIAS,
-                                   sprop->shortid)
-              != NULL);
-    }
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-}
-
-static jsval
-LookupResult(JSContext *cx, JSObject *obj, JSObject *obj2, JSProperty *prop)
-{
-    JSScopeProperty *sprop;
-    jsval rval;
-
-    if (!prop) {
-        /* XXX bad API: no way to tell "not defined" from "void value" */
-        return JSVAL_VOID;
-    }
-    if (OBJ_IS_NATIVE(obj2)) {
-        /* Peek at the native property's slot value, without doing a Get. */
-        sprop = (JSScopeProperty *)prop;
-        rval = SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj2))
-               ? LOCKED_OBJ_GET_SLOT(obj2, sprop->slot)
-               : JSVAL_TRUE;
-    } else {
-        /* XXX bad API: no way to return "defined but value unknown" */
-        rval = JSVAL_TRUE;
-    }
-    OBJ_DROP_PROPERTY(cx, obj2, prop);
-    return rval;
-}
-
-static JSBool
-GetPropertyAttributes(JSContext *cx, JSObject *obj, JSAtom *atom,
-                      uintN *attrsp, JSBool *foundp,
-                      JSPropertyOp *getterp, JSPropertyOp *setterp)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    JSBool ok;
-
-    if (!atom)
-        return JS_FALSE;
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &obj2, &prop))
-        return JS_FALSE;
-
-    if (!prop || obj != obj2) {
-        *attrsp = 0;
-        *foundp = JS_FALSE;
-        if (getterp)
-            *getterp = NULL;
-        if (setterp)
-            *setterp = NULL;
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-        return JS_TRUE;
-    }
-
-    *foundp = JS_TRUE;
-    ok = OBJ_GET_ATTRIBUTES(cx, obj, ATOM_TO_JSID(atom), prop, attrsp);
-    if (ok && OBJ_IS_NATIVE(obj)) {
-        JSScopeProperty *sprop = (JSScopeProperty *) prop;
-
-        if (getterp)
-            *getterp = sprop->getter;
-        if (setterp)
-            *setterp = sprop->setter;
-    }
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-}
-
-static JSBool
-SetPropertyAttributes(JSContext *cx, JSObject *obj, JSAtom *atom,
-                      uintN attrs, JSBool *foundp)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    JSBool ok;
-
-    if (!atom)
-        return JS_FALSE;
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &obj2, &prop))
-        return JS_FALSE;
-    if (!prop || obj != obj2) {
-        *foundp = JS_FALSE;
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-        return JS_TRUE;
-    }
-
-    *foundp = JS_TRUE;
-    ok = OBJ_SET_ATTRIBUTES(cx, obj, ATOM_TO_JSID(atom), prop, &attrs);
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN *attrsp, JSBool *foundp)
-{
-    CHECK_REQUEST(cx);
-    return GetPropertyAttributes(cx, obj,
-                                 js_Atomize(cx, name, strlen(name), 0),
-                                 attrsp, foundp, NULL, NULL);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                   const char *name,
-                                   uintN *attrsp, JSBool *foundp,
-                                   JSPropertyOp *getterp,
-                                   JSPropertyOp *setterp)
-{
-    CHECK_REQUEST(cx);
-    return GetPropertyAttributes(cx, obj,
-                                 js_Atomize(cx, name, strlen(name), 0),
-                                 attrsp, foundp, getterp, setterp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN attrs, JSBool *foundp)
-{
-    CHECK_REQUEST(cx);
-    return SetPropertyAttributes(cx, obj,
-                                 js_Atomize(cx, name, strlen(name), 0),
-                                 attrs, foundp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HasProperty(JSContext *cx, JSObject *obj, const char *name, JSBool *foundp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = LookupProperty(cx, obj, name, &obj2, &prop);
-    if (ok) {
-        *foundp = (prop != NULL);
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LookupProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = LookupProperty(cx, obj, name, &obj2, &prop);
-    if (ok)
-        *vp = LookupResult(cx, obj, obj2, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, const char *name,
-                           uintN flags, jsval *vp)
-{
-    JSAtom *atom;
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    ok = OBJ_IS_NATIVE(obj)
-         ? js_LookupPropertyWithFlags(cx, obj, ATOM_TO_JSID(atom), flags,
-                                      &obj2, &prop)
-         : OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &obj2, &prop);
-    if (ok)
-        *vp = LookupResult(cx, obj, obj2, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetMethod(JSContext *cx, JSObject *obj, const char *name, JSObject **objp,
-             jsval *vp)
-{
-    JSAtom *atom;
-    jsid id;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    id = ATOM_TO_JSID(atom);
-
-#if JS_HAS_XML_SUPPORT
-    if (OBJECT_IS_XML(cx, obj)) {
-        JSXMLObjectOps *ops;
-
-        ops = (JSXMLObjectOps *) obj->map->ops;
-        obj = ops->getMethod(cx, obj, id, vp);
-        if (!obj)
-            return JS_FALSE;
-    } else
-#endif
-    {
-        if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-            return JS_FALSE;
-    }
-
-    *objp = obj;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_SET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DeleteProperty(JSContext *cx, JSObject *obj, const char *name)
-{
-    jsval junk;
-
-    CHECK_REQUEST(cx);
-    return JS_DeleteProperty2(cx, obj, name, &junk);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DeleteProperty2(JSContext *cx, JSObject *obj, const char *name,
-                   jsval *rval)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_DELETE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), rval);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, jsval value,
-                    JSPropertyOp getter, JSPropertyOp setter,
-                    uintN attrs)
-{
-    CHECK_REQUEST(cx);
-    return DefineUCProperty(cx, obj, name, namelen, value, getter, setter,
-                            attrs, 0, 0);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN *attrsp, JSBool *foundp)
-{
-    CHECK_REQUEST(cx);
-    return GetPropertyAttributes(cx, obj,
-                    js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0),
-                    attrsp, foundp, NULL, NULL);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                     const jschar *name, size_t namelen,
-                                     uintN *attrsp, JSBool *foundp,
-                                     JSPropertyOp *getterp,
-                                     JSPropertyOp *setterp)
-{
-    CHECK_REQUEST(cx);
-    return GetPropertyAttributes(cx, obj,
-                    js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0),
-                    attrsp, foundp, getterp, setterp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN attrs, JSBool *foundp)
-{
-    CHECK_REQUEST(cx);
-    return SetPropertyAttributes(cx, obj,
-                    js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0),
-                    attrs, foundp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,
-                              const jschar *name, size_t namelen,
-                              int8 tinyid, jsval value,
-                              JSPropertyOp getter, JSPropertyOp setter,
-                              uintN attrs)
-{
-    CHECK_REQUEST(cx);
-    return DefineUCProperty(cx, obj, name, namelen, value, getter, setter,
-                            attrs, SPROP_HAS_SHORTID, tinyid);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HasUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 JSBool *vp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = LookupUCProperty(cx, obj, name, namelen, &obj2, &prop);
-    if (ok) {
-        *vp = (prop != NULL);
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LookupUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen,
-                    jsval *vp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = LookupUCProperty(cx, obj, name, namelen, &obj2, &prop);
-    if (ok)
-        *vp = LookupResult(cx, obj, obj2, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_SET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DeleteUCProperty2(JSContext *cx, JSObject *obj,
-                     const jschar *name, size_t namelen,
-                     jsval *rval)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return JS_FALSE;
-    return OBJ_DELETE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), rval);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_NewArrayObject(JSContext *cx, jsint length, jsval *vector)
-{
-    CHECK_REQUEST(cx);
-    /* NB: jsuint cast does ToUint32. */
-    return js_NewArrayObject(cx, (jsuint)length, vector);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsArrayObject(JSContext *cx, JSObject *obj)
-{
-    return OBJ_GET_CLASS(cx, obj) == &js_ArrayClass;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp)
-{
-    CHECK_REQUEST(cx);
-    return js_GetLengthProperty(cx, obj, lengthp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetArrayLength(JSContext *cx, JSObject *obj, jsuint length)
-{
-    CHECK_REQUEST(cx);
-    return js_SetLengthProperty(cx, obj, length);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HasArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp)
-{
-    CHECK_REQUEST(cx);
-    return js_HasLengthProperty(cx, obj, lengthp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,
-                 JSPropertyOp getter, JSPropertyOp setter, uintN attrs)
-{
-    CHECK_REQUEST(cx);
-    return OBJ_DEFINE_PROPERTY(cx, obj, INT_TO_JSID(index), value,
-                               getter, setter, attrs, NULL);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    if (!LookupProperty(cx, obj, name, &obj2, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        js_ReportIsNotDefined(cx, name);
-        return JS_FALSE;
-    }
-    if (obj2 != obj || !OBJ_IS_NATIVE(obj)) {
-        char numBuf[12];
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-        JS_snprintf(numBuf, sizeof numBuf, "%ld", (long)alias);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_ALIAS,
-                             numBuf, name, OBJ_GET_CLASS(cx, obj2)->name);
-        return JS_FALSE;
-    }
-    sprop = (JSScopeProperty *)prop;
-    ok = (js_AddNativeProperty(cx, obj, INT_TO_JSID(alias),
-                               sprop->getter, sprop->setter, sprop->slot,
-                               sprop->attrs, sprop->flags | SPROP_IS_ALIAS,
-                               sprop->shortid)
-          != NULL);
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HasElement(JSContext *cx, JSObject *obj, jsint index, JSBool *foundp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = OBJ_LOOKUP_PROPERTY(cx, obj, INT_TO_JSID(index), &obj2, &prop);
-    if (ok) {
-        *foundp = (prop != NULL);
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_LookupElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp)
-{
-    JSBool ok;
-    JSObject *obj2;
-    JSProperty *prop;
-
-    CHECK_REQUEST(cx);
-    ok = OBJ_LOOKUP_PROPERTY(cx, obj, INT_TO_JSID(index), &obj2, &prop);
-    if (ok)
-        *vp = LookupResult(cx, obj, obj2, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp)
-{
-    CHECK_REQUEST(cx);
-    return OBJ_GET_PROPERTY(cx, obj, INT_TO_JSID(index), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp)
-{
-    CHECK_REQUEST(cx);
-    return OBJ_SET_PROPERTY(cx, obj, INT_TO_JSID(index), vp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DeleteElement(JSContext *cx, JSObject *obj, jsint index)
-{
-    jsval junk;
-
-    CHECK_REQUEST(cx);
-    return JS_DeleteElement2(cx, obj, index, &junk);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DeleteElement2(JSContext *cx, JSObject *obj, jsint index, jsval *rval)
-{
-    CHECK_REQUEST(cx);
-    return OBJ_DELETE_PROPERTY(cx, obj, INT_TO_JSID(index), rval);
-}
-
-JS_PUBLIC_API(void)
-JS_ClearScope(JSContext *cx, JSObject *obj)
-{
-    CHECK_REQUEST(cx);
-
-    if (obj->map->ops->clear)
-        obj->map->ops->clear(cx, obj);
-}
-
-JS_PUBLIC_API(JSIdArray *)
-JS_Enumerate(JSContext *cx, JSObject *obj)
-{
-    jsint i, n;
-    jsval iter_state, num_properties;
-    jsid id;
-    JSIdArray *ida;
-    jsval *vector;
-
-    CHECK_REQUEST(cx);
-
-    ida = NULL;
-    iter_state = JSVAL_NULL;
-
-    /* Get the number of properties to enumerate. */
-    if (!OBJ_ENUMERATE(cx, obj, JSENUMERATE_INIT, &iter_state, &num_properties))
-        goto error;
-    if (!JSVAL_IS_INT(num_properties)) {
-        JS_ASSERT(0);
-        goto error;
-    }
-
-    /* Grow as needed if we don't know the exact amount ahead of time. */
-    n = JSVAL_TO_INT(num_properties);
-    if (n <= 0)
-        n = 8;
-
-    /* Create an array of jsids large enough to hold all the properties */
-    ida = js_NewIdArray(cx, n);
-    if (!ida)
-        goto error;
-
-    i = 0;
-    vector = &ida->vector[0];
-    for (;;) {
-        if (!OBJ_ENUMERATE(cx, obj, JSENUMERATE_NEXT, &iter_state, &id))
-            goto error;
-
-        /* No more jsid's to enumerate ? */
-        if (iter_state == JSVAL_NULL)
-            break;
-
-        if (i == ida->length) {
-            ida = js_SetIdArrayLength(cx, ida, ida->length * 2);
-            if (!ida)
-                goto error;
-            vector = &ida->vector[0];
-        }
-        vector[i++] = id;
-    }
-    return js_SetIdArrayLength(cx, ida, i);
-
-error:
-    if (iter_state != JSVAL_NULL)
-        OBJ_ENUMERATE(cx, obj, JSENUMERATE_DESTROY, &iter_state, 0);
-    if (ida)
-        JS_DestroyIdArray(cx, ida);
-    return NULL;
-}
-
-/*
- * XXX reverse iterator for properties, unreverse and meld with jsinterp.c's
- *     prop_iterator_class somehow...
- * + preserve the OBJ_ENUMERATE API while optimizing the native object case
- * + native case here uses a JSScopeProperty *, but that iterates in reverse!
- * + so we make non-native match, by reverse-iterating after JS_Enumerating
- */
-#define JSSLOT_ITER_INDEX       (JSSLOT_PRIVATE + 1)
-
-#if JSSLOT_ITER_INDEX >= JS_INITIAL_NSLOTS
-# error "JSSLOT_ITER_INDEX botch!"
-#endif
-
-static void
-prop_iter_finalize(JSContext *cx, JSObject *obj)
-{
-    jsval v;
-    jsint i;
-    JSIdArray *ida;
-
-    v = GC_AWARE_GET_SLOT(cx, obj, JSSLOT_ITER_INDEX);
-    if (JSVAL_IS_VOID(v))
-        return;
-
-    i = JSVAL_TO_INT(v);
-    if (i >= 0) {
-        /* Non-native case: destroy the ida enumerated when obj was created. */
-        ida = (JSIdArray *) JS_GetPrivate(cx, obj);
-        if (ida)
-            JS_DestroyIdArray(cx, ida);
-    }
-}
-
-static uint32
-prop_iter_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    jsval v;
-    jsint i, n;
-    JSScopeProperty *sprop;
-    JSIdArray *ida;
-    jsid id;
-
-    v = GC_AWARE_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    JS_ASSERT(!JSVAL_IS_VOID(v));
-
-    i = JSVAL_TO_INT(OBJ_GET_SLOT(cx, obj, JSSLOT_ITER_INDEX));
-    if (i < 0) {
-        /* Native case: just mark the next property to visit. */
-        sprop = (JSScopeProperty *) JSVAL_TO_PRIVATE(v);
-        if (sprop)
-            MARK_SCOPE_PROPERTY(sprop);
-    } else {
-        /* Non-native case: mark each id in the JSIdArray private. */
-        ida = (JSIdArray *) JSVAL_TO_PRIVATE(v);
-        for (i = 0, n = ida->length; i < n; i++) {
-            id = ida->vector[i];
-            if (JSID_IS_ATOM(id))
-                GC_MARK_ATOM(cx, JSID_TO_ATOM(id), arg);
-            else if (JSID_IS_OBJECT(id))
-                GC_MARK(cx, JSID_TO_OBJECT(id), "id", arg);
-        }
-    }
-    return 0;
-}
-
-static JSClass prop_iter_class = {
-    "PropertyIterator",
-    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(1),
-    JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,  JS_ConvertStub,  prop_iter_finalize,
-    NULL,             NULL,            NULL,            NULL,
-    NULL,             NULL,            prop_iter_mark,  NULL
-};
-
-JS_PUBLIC_API(JSObject *)
-JS_NewPropertyIterator(JSContext *cx, JSObject *obj)
-{
-    JSObject *iterobj;
-    JSScope *scope;
-    void *pdata;
-    jsint index;
-    JSIdArray *ida;
-
-    CHECK_REQUEST(cx);
-    iterobj = js_NewObject(cx, &prop_iter_class, NULL, obj);
-    if (!iterobj)
-        return NULL;
-
-    if (OBJ_IS_NATIVE(obj)) {
-        /* Native case: start with the last property in obj's own scope. */
-        scope = OBJ_SCOPE(obj);
-        pdata = (scope->object == obj) ? scope->lastProp : NULL;
-        index = -1;
-    } else {
-        /* Non-native case: enumerate a JSIdArray and keep it via private. */
-        ida = JS_Enumerate(cx, obj);
-        if (!ida)
-            goto bad;
-        pdata = ida;
-        index = ida->length;
-    }
-
-    if (!JS_SetPrivate(cx, iterobj, pdata))
-        goto bad;
-    OBJ_SET_SLOT(cx, iterobj, JSSLOT_ITER_INDEX, INT_TO_JSVAL(index));
-    return iterobj;
-
-bad:
-    cx->newborn[GCX_OBJECT] = NULL;
-    return NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_NextProperty(JSContext *cx, JSObject *iterobj, jsid *idp)
-{
-    jsint i;
-    JSObject *obj;
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    JSIdArray *ida;
-
-    CHECK_REQUEST(cx);
-    i = JSVAL_TO_INT(OBJ_GET_SLOT(cx, iterobj, JSSLOT_ITER_INDEX));
-    if (i < 0) {
-        /* Native case: private data is a property tree node pointer. */
-        obj = OBJ_GET_PARENT(cx, iterobj);
-        JS_ASSERT(OBJ_IS_NATIVE(obj));
-        scope = OBJ_SCOPE(obj);
-        JS_ASSERT(scope->object == obj);
-        sprop = (JSScopeProperty *) JS_GetPrivate(cx, iterobj);
-
-        /*
-         * If the next property mapped by scope in the property tree ancestor
-         * line is not enumerable, or it's an alias, or one or more properties
-         * were deleted from the "middle" of the scope-mapped ancestor line
-         * and the next property was among those deleted, skip it and keep on
-         * trying to find an enumerable property that is still in scope.
-         */
-        while (sprop &&
-               (!(sprop->attrs & JSPROP_ENUMERATE) ||
-                (sprop->flags & SPROP_IS_ALIAS) ||
-                (SCOPE_HAD_MIDDLE_DELETE(scope) &&
-                 !SCOPE_HAS_PROPERTY(scope, sprop)))) {
-            sprop = sprop->parent;
-        }
-
-        if (!sprop) {
-            *idp = JSVAL_VOID;
-        } else {
-            if (!JS_SetPrivate(cx, iterobj, sprop->parent))
-                return JS_FALSE;
-            *idp = sprop->id;
-        }
-    } else {
-        /* Non-native case: use the ida enumerated when iterobj was created. */
-        ida = (JSIdArray *) JS_GetPrivate(cx, iterobj);
-        JS_ASSERT(i <= ida->length);
-        if (i == 0) {
-            *idp = JSVAL_VOID;
-        } else {
-            *idp = ida->vector[--i];
-            OBJ_SET_SLOT(cx, iterobj, JSSLOT_ITER_INDEX, INT_TO_JSVAL(i));
-        }
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-               jsval *vp, uintN *attrsp)
-{
-    CHECK_REQUEST(cx);
-    return OBJ_CHECK_ACCESS(cx, obj, id, mode, vp, attrsp);
-}
-
-JS_PUBLIC_API(JSCheckAccessOp)
-JS_SetCheckObjectAccessCallback(JSRuntime *rt, JSCheckAccessOp acb)
-{
-    JSCheckAccessOp oldacb;
-
-    oldacb = rt->checkObjectAccess;
-    rt->checkObjectAccess = acb;
-    return oldacb;
-}
-
-static JSBool
-ReservedSlotIndexOK(JSContext *cx, JSObject *obj, JSClass *clasp,
-                    uint32 index, uint32 limit)
-{
-    /* Check the computed, possibly per-instance, upper bound. */
-    if (clasp->reserveSlots)
-        JS_LOCK_OBJ_VOID(cx, obj, limit += clasp->reserveSlots(cx, obj));
-    if (index >= limit) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_RESERVED_SLOT_RANGE);
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval *vp)
-{
-    JSClass *clasp;
-    uint32 limit, slot;
-
-    CHECK_REQUEST(cx);
-    clasp = OBJ_GET_CLASS(cx, obj);
-    limit = JSCLASS_RESERVED_SLOTS(clasp);
-    if (index >= limit && !ReservedSlotIndexOK(cx, obj, clasp, index, limit))
-        return JS_FALSE;
-    slot = JSSLOT_START(clasp) + index;
-    *vp = OBJ_GET_REQUIRED_SLOT(cx, obj, slot);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval v)
-{
-    JSClass *clasp;
-    uint32 limit, slot;
-
-    CHECK_REQUEST(cx);
-    clasp = OBJ_GET_CLASS(cx, obj);
-    limit = JSCLASS_RESERVED_SLOTS(clasp);
-    if (index >= limit && !ReservedSlotIndexOK(cx, obj, clasp, index, limit))
-        return JS_FALSE;
-    slot = JSSLOT_START(clasp) + index;
-    return OBJ_SET_REQUIRED_SLOT(cx, obj, slot, v);
-}
-
-#ifdef JS_THREADSAFE
-JS_PUBLIC_API(jsrefcount)
-JS_HoldPrincipals(JSContext *cx, JSPrincipals *principals)
-{
-    return JS_ATOMIC_INCREMENT(&principals->refcount);
-}
-
-JS_PUBLIC_API(jsrefcount)
-JS_DropPrincipals(JSContext *cx, JSPrincipals *principals)
-{
-    jsrefcount rc = JS_ATOMIC_DECREMENT(&principals->refcount);
-    if (rc == 0)
-        principals->destroy(cx, principals);
-    return rc;
-}
-#endif
-
-JS_PUBLIC_API(JSPrincipalsTranscoder)
-JS_SetPrincipalsTranscoder(JSRuntime *rt, JSPrincipalsTranscoder px)
-{
-    JSPrincipalsTranscoder oldpx;
-
-    oldpx = rt->principalsTranscoder;
-    rt->principalsTranscoder = px;
-    return oldpx;
-}
-
-JS_PUBLIC_API(JSObjectPrincipalsFinder)
-JS_SetObjectPrincipalsFinder(JSRuntime *rt, JSObjectPrincipalsFinder fop)
-{
-    JSObjectPrincipalsFinder oldfop;
-
-    oldfop = rt->findObjectPrincipals;
-    rt->findObjectPrincipals = fop;
-    return oldfop;
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_NewFunction(JSContext *cx, JSNative native, uintN nargs, uintN flags,
-               JSObject *parent, const char *name)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-
-    if (!name) {
-        atom = NULL;
-    } else {
-        atom = js_Atomize(cx, name, strlen(name), 0);
-        if (!atom)
-            return NULL;
-    }
-    return js_NewFunction(cx, NULL, native, nargs, flags, parent, atom);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
-{
-    CHECK_REQUEST(cx);
-    if (OBJ_GET_CLASS(cx, funobj) != &js_FunctionClass) {
-        /* Indicate we cannot clone this object. */
-        return funobj;
-    }
-    return js_CloneFunctionObject(cx, funobj, parent);
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFunctionObject(JSFunction *fun)
-{
-    return fun->object;
-}
-
-JS_PUBLIC_API(const char *)
-JS_GetFunctionName(JSFunction *fun)
-{
-    return fun->atom
-           ? JS_GetStringBytes(ATOM_TO_STRING(fun->atom))
-           : js_anonymous_str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_GetFunctionId(JSFunction *fun)
-{
-    return fun->atom ? ATOM_TO_STRING(fun->atom) : NULL;
-}
-
-JS_PUBLIC_API(uintN)
-JS_GetFunctionFlags(JSFunction *fun)
-{
-    return fun->flags;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ObjectIsFunction(JSContext *cx, JSObject *obj)
-{
-    return OBJ_GET_CLASS(cx, obj) == &js_FunctionClass;
-}
-
-JS_STATIC_DLL_CALLBACK(JSBool)
-js_generic_native_method_dispatcher(JSContext *cx, JSObject *obj,
-                                    uintN argc, jsval *argv, jsval *rval)
-{
-    jsval fsv;
-    JSFunctionSpec *fs;
-    JSObject *tmp;
-
-    if (!JS_GetReservedSlot(cx, JSVAL_TO_OBJECT(argv[-2]), 0, &fsv))
-        return JS_FALSE;
-    fs = (JSFunctionSpec *) JSVAL_TO_PRIVATE(fsv);
-
-    /*
-     * We know that argv[0] is valid because JS_DefineFunctions, which is our
-     * only (indirect) referrer, defined us as requiring at least one argument
-     * (notice how it passes fs->nargs + 1 as the next-to-last argument to
-     * JS_DefineFunction).
-     */
-    if (JSVAL_IS_PRIMITIVE(argv[0])) {
-        /*
-         * Make sure that this is an object or null, as required by the generic
-         * functions.
-         */
-        if (!js_ValueToObject(cx, argv[0], &tmp))
-            return JS_FALSE;
-        argv[0] = OBJECT_TO_JSVAL(tmp);
-    }
-
-    /*
-     * Copy all actual (argc) and required but missing (fs->nargs + 1 - argc)
-     * args down over our |this| parameter, argv[-1], which is almost always
-     * the class constructor object, e.g. Array.  Then call the corresponding
-     * prototype native method with our first argument passed as |this|.
-     */
-    memmove(argv - 1, argv, JS_MAX(fs->nargs + 1U, argc) * sizeof(jsval));
-
-    /*
-     * Follow Function.prototype.apply and .call by using the global object as
-     * the 'this' param if no args.
-     */
-    JS_ASSERT(cx->fp->argv == argv);
-    if (!js_ComputeThis(cx, JSVAL_TO_OBJECT(argv[-1]), cx->fp))
-        return JS_FALSE;
-
-    /*
-     * Protect against argc - 1 underflowing below. By calling js_ComputeThis,
-     * we made it as if the static was called with one parameter.
-     */
-    if (argc == 0)
-        argc = 1;
-
-    return fs->call(cx, JSVAL_TO_OBJECT(argv[-1]), argc - 1, argv, rval);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DefineFunctions(JSContext *cx, JSObject *obj, JSFunctionSpec *fs)
-{
-    uintN flags;
-    JSObject *ctor;
-    JSFunction *fun;
-
-    CHECK_REQUEST(cx);
-    ctor = NULL;
-    for (; fs->name; fs++) {
-        flags = fs->flags;
-
-        /*
-         * Define a generic arity N+1 static method for the arity N prototype
-         * method if flags contains JSFUN_GENERIC_NATIVE.
-         */
-        if (flags & JSFUN_GENERIC_NATIVE) {
-            if (!ctor) {
-                ctor = JS_GetConstructor(cx, obj);
-                if (!ctor)
-                    return JS_FALSE;
-            }
-
-            flags &= ~JSFUN_GENERIC_NATIVE;
-            fun = JS_DefineFunction(cx, ctor, fs->name,
-                                    js_generic_native_method_dispatcher,
-                                    fs->nargs + 1, flags);
-            if (!fun)
-                return JS_FALSE;
-            fun->extra = fs->extra;
-
-            /*
-             * As jsapi.h notes, fs must point to storage that lives as long
-             * as fun->object lives.
-             */
-            if (!JS_SetReservedSlot(cx, fun->object, 0, PRIVATE_TO_JSVAL(fs)))
-                return JS_FALSE;
-        }
-
-        fun = JS_DefineFunction(cx, obj, fs->name, fs->call, fs->nargs, flags);
-        if (!fun)
-            return JS_FALSE;
-        fun->extra = fs->extra;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_DefineFunction(JSContext *cx, JSObject *obj, const char *name, JSNative call,
-                  uintN nargs, uintN attrs)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return NULL;
-    return js_DefineFunction(cx, obj, atom, call, nargs, attrs);
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_DefineUCFunction(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, JSNative call,
-                    uintN nargs, uintN attrs)
-{
-    JSAtom *atom;
-
-    atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
-    if (!atom)
-        return NULL;
-    return js_DefineFunction(cx, obj, atom, call, nargs, attrs);
-}
-
-static JSScript *
-CompileTokenStream(JSContext *cx, JSObject *obj, JSTokenStream *ts,
-                   void *tempMark, JSBool *eofp)
-{
-    JSBool eof;
-    JSArenaPool codePool, notePool;
-    JSCodeGenerator cg;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    eof = JS_FALSE;
-    JS_InitArenaPool(&codePool, "code", 1024, sizeof(jsbytecode));
-    JS_InitArenaPool(&notePool, "note", 1024, sizeof(jssrcnote));
-    if (!js_InitCodeGenerator(cx, &cg, &codePool, &notePool,
-                              ts->filename, ts->lineno,
-                              ts->principals)) {
-        script = NULL;
-    } else if (!js_CompileTokenStream(cx, obj, ts, &cg)) {
-        script = NULL;
-        eof = (ts->flags & TSF_EOF) != 0;
-    } else {
-        script = js_NewScriptFromCG(cx, &cg, NULL);
-    }
-    if (eofp)
-        *eofp = eof;
-    if (!js_CloseTokenStream(cx, ts)) {
-        if (script)
-            js_DestroyScript(cx, script);
-        script = NULL;
-    }
-    cg.tempMark = tempMark;
-    js_FinishCodeGenerator(cx, &cg);
-    JS_FinishArenaPool(&codePool);
-    JS_FinishArenaPool(&notePool);
-    return script;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileScript(JSContext *cx, JSObject *obj,
-                 const char *bytes, size_t length,
-                 const char *filename, uintN lineno)
-{
-    jschar *chars;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &length);
-    if (!chars)
-        return NULL;
-    script = JS_CompileUCScript(cx, obj, chars, length, filename, lineno);
-    JS_free(cx, chars);
-    return script;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileScriptForPrincipals(JSContext *cx, JSObject *obj,
-                              JSPrincipals *principals,
-                              const char *bytes, size_t length,
-                              const char *filename, uintN lineno)
-{
-    jschar *chars;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &length);
-    if (!chars)
-        return NULL;
-    script = JS_CompileUCScriptForPrincipals(cx, obj, principals,
-                                             chars, length, filename, lineno);
-    JS_free(cx, chars);
-    return script;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileUCScript(JSContext *cx, JSObject *obj,
-                   const jschar *chars, size_t length,
-                   const char *filename, uintN lineno)
-{
-    CHECK_REQUEST(cx);
-    return JS_CompileUCScriptForPrincipals(cx, obj, NULL, chars, length,
-                                           filename, lineno);
-}
-
-#if JS_HAS_EXCEPTIONS
-# define LAST_FRAME_EXCEPTION_CHECK(cx,result)                                \
-    JS_BEGIN_MACRO                                                            \
-        if (!(result))                                                        \
-            js_ReportUncaughtException(cx);                                   \
-    JS_END_MACRO
-#else
-# define LAST_FRAME_EXCEPTION_CHECK(cx,result)  /* nothing */
-#endif
-
-#define LAST_FRAME_CHECKS(cx,result)                                          \
-    JS_BEGIN_MACRO                                                            \
-        if (!(cx)->fp) {                                                      \
-            (cx)->lastInternalResult = JSVAL_NULL;                            \
-            LAST_FRAME_EXCEPTION_CHECK(cx, result);                           \
-        }                                                                     \
-    JS_END_MACRO
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals,
-                                const jschar *chars, size_t length,
-                                const char *filename, uintN lineno)
-{
-    void *mark;
-    JSTokenStream *ts;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewTokenStream(cx, chars, length, filename, lineno, principals);
-    if (!ts)
-        return NULL;
-    script = CompileTokenStream(cx, obj, ts, mark, NULL);
-    LAST_FRAME_CHECKS(cx, script);
-    return script;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_BufferIsCompilableUnit(JSContext *cx, JSObject *obj,
-                          const char *bytes, size_t length)
-{
-    jschar *chars;
-    JSBool result;
-    JSExceptionState *exnState;
-    void *tempMark;
-    JSTokenStream *ts;
-    JSErrorReporter older;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &length);
-    if (!chars)
-        return JS_TRUE;
-
-    /*
-     * Return true on any out-of-memory error, so our caller doesn't try to
-     * collect more buffered source.
-     */
-    result = JS_TRUE;
-    exnState = JS_SaveExceptionState(cx);
-    tempMark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewTokenStream(cx, chars, length, NULL, 0, NULL);
-    if (ts) {
-        older = JS_SetErrorReporter(cx, NULL);
-        if (!js_ParseTokenStream(cx, obj, ts) &&
-            (ts->flags & TSF_UNEXPECTED_EOF)) {
-            /*
-             * We ran into an error.  If it was because we ran out of source,
-             * we return false, so our caller will know to try to collect more
-             * buffered source.
-             */
-            result = JS_FALSE;
-        }
-
-        JS_SetErrorReporter(cx, older);
-        js_CloseTokenStream(cx, ts);
-        JS_ARENA_RELEASE(&cx->tempPool, tempMark);
-    }
-
-    JS_free(cx, chars);
-    JS_RestoreExceptionState(cx, exnState);
-    return result;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileFile(JSContext *cx, JSObject *obj, const char *filename)
-{
-    void *mark;
-    JSTokenStream *ts;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewFileTokenStream(cx, filename, stdin);
-    if (!ts)
-        return NULL;
-    script = CompileTokenStream(cx, obj, ts, mark, NULL);
-    LAST_FRAME_CHECKS(cx, script);
-    return script;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandle(JSContext *cx, JSObject *obj, const char *filename,
-                     FILE *file)
-{
-    return JS_CompileFileHandleForPrincipals(cx, obj, filename, file, NULL);
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandleForPrincipals(JSContext *cx, JSObject *obj,
-                                  const char *filename, FILE *file,
-                                  JSPrincipals *principals)
-{
-    void *mark;
-    JSTokenStream *ts;
-    JSScript *script;
-
-    CHECK_REQUEST(cx);
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewFileTokenStream(cx, NULL, file);
-    if (!ts)
-        return NULL;
-    ts->filename = filename;
-    /* XXXshaver js_NewFileTokenStream should do this, because it drops */
-    if (principals) {
-        ts->principals = principals;
-        JSPRINCIPALS_HOLD(cx, ts->principals);
-    }
-    script = CompileTokenStream(cx, obj, ts, mark, NULL);
-    LAST_FRAME_CHECKS(cx, script);
-    return script;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_NewScriptObject(JSContext *cx, JSScript *script)
-{
-    JSObject *obj;
-
-    obj = js_NewObject(cx, &js_ScriptClass, NULL, NULL);
-    if (!obj)
-        return NULL;
-
-    if (script) {
-        if (!JS_SetPrivate(cx, obj, script))
-            return NULL;
-        script->object = obj;
-    }
-    return obj;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetScriptObject(JSScript *script)
-{
-    return script->object;
-}
-
-JS_PUBLIC_API(void)
-JS_DestroyScript(JSContext *cx, JSScript *script)
-{
-    CHECK_REQUEST(cx);
-    js_DestroyScript(cx, script);
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_CompileFunction(JSContext *cx, JSObject *obj, const char *name,
-                   uintN nargs, const char **argnames,
-                   const char *bytes, size_t length,
-                   const char *filename, uintN lineno)
-{
-    jschar *chars;
-    JSFunction *fun;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &length);
-    if (!chars)
-        return NULL;
-    fun = JS_CompileUCFunction(cx, obj, name, nargs, argnames, chars, length,
-                               filename, lineno);
-    JS_free(cx, chars);
-    return fun;
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_CompileFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals, const char *name,
-                                uintN nargs, const char **argnames,
-                                const char *bytes, size_t length,
-                                const char *filename, uintN lineno)
-{
-    jschar *chars;
-    JSFunction *fun;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &length);
-    if (!chars)
-        return NULL;
-    fun = JS_CompileUCFunctionForPrincipals(cx, obj, principals, name,
-                                            nargs, argnames, chars, length,
-                                            filename, lineno);
-    JS_free(cx, chars);
-    return fun;
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunction(JSContext *cx, JSObject *obj, const char *name,
-                     uintN nargs, const char **argnames,
-                     const jschar *chars, size_t length,
-                     const char *filename, uintN lineno)
-{
-    CHECK_REQUEST(cx);
-    return JS_CompileUCFunctionForPrincipals(cx, obj, NULL, name,
-                                             nargs, argnames,
-                                             chars, length,
-                                             filename, lineno);
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                  JSPrincipals *principals, const char *name,
-                                  uintN nargs, const char **argnames,
-                                  const jschar *chars, size_t length,
-                                  const char *filename, uintN lineno)
-{
-    void *mark;
-    JSTokenStream *ts;
-    JSFunction *fun;
-    JSAtom *funAtom, *argAtom;
-    uintN i;
-
-    CHECK_REQUEST(cx);
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewTokenStream(cx, chars, length, filename, lineno, principals);
-    if (!ts) {
-        fun = NULL;
-        goto out;
-    }
-    if (!name) {
-        funAtom = NULL;
-    } else {
-        funAtom = js_Atomize(cx, name, strlen(name), 0);
-        if (!funAtom) {
-            fun = NULL;
-            goto out;
-        }
-    }
-    fun = js_NewFunction(cx, NULL, NULL, nargs, 0, obj, funAtom);
-    if (!fun)
-        goto out;
-    if (nargs) {
-        for (i = 0; i < nargs; i++) {
-            argAtom = js_Atomize(cx, argnames[i], strlen(argnames[i]), 0);
-            if (!argAtom)
-                break;
-            if (!js_AddHiddenProperty(cx, fun->object, ATOM_TO_JSID(argAtom),
-                                      js_GetArgument, js_SetArgument,
-                                      SPROP_INVALID_SLOT,
-                                      JSPROP_PERMANENT | JSPROP_SHARED,
-                                      SPROP_HAS_SHORTID, i)) {
-                break;
-            }
-        }
-        if (i < nargs) {
-            fun = NULL;
-            goto out;
-        }
-    }
-    if (!js_CompileFunctionBody(cx, ts, fun)) {
-        fun = NULL;
-        goto out;
-    }
-    if (obj && funAtom) {
-        if (!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(funAtom),
-                                 OBJECT_TO_JSVAL(fun->object),
-                                 NULL, NULL, JSPROP_ENUMERATE, NULL)) {
-            return NULL;
-        }
-    }
-out:
-    if (ts)
-        js_CloseTokenStream(cx, ts);
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    LAST_FRAME_CHECKS(cx, fun);
-    return fun;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_DecompileScript(JSContext *cx, JSScript *script, const char *name,
-                   uintN indent)
-{
-    JSPrinter *jp;
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    jp = js_NewPrinter(cx, name,
-                       indent & ~JS_DONT_PRETTY_PRINT,
-                       !(indent & JS_DONT_PRETTY_PRINT));
-    if (!jp)
-        return NULL;
-    if (js_DecompileScript(jp, script))
-        str = js_GetPrinterOutput(jp);
-    else
-        str = NULL;
-    js_DestroyPrinter(jp);
-    return str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_DecompileFunction(JSContext *cx, JSFunction *fun, uintN indent)
-{
-    JSPrinter *jp;
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    jp = js_NewPrinter(cx, JS_GetFunctionName(fun),
-                       indent & ~JS_DONT_PRETTY_PRINT,
-                       !(indent & JS_DONT_PRETTY_PRINT));
-    if (!jp)
-        return NULL;
-    if (js_DecompileFunction(jp, fun))
-        str = js_GetPrinterOutput(jp);
-    else
-        str = NULL;
-    js_DestroyPrinter(jp);
-    return str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_DecompileFunctionBody(JSContext *cx, JSFunction *fun, uintN indent)
-{
-    JSPrinter *jp;
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    jp = js_NewPrinter(cx, JS_GetFunctionName(fun),
-                       indent & ~JS_DONT_PRETTY_PRINT,
-                       !(indent & JS_DONT_PRETTY_PRINT));
-    if (!jp)
-        return NULL;
-    if (js_DecompileFunctionBody(jp, fun))
-        str = js_GetPrinterOutput(jp);
-    else
-        str = NULL;
-    js_DestroyPrinter(jp);
-    return str;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ExecuteScript(JSContext *cx, JSObject *obj, JSScript *script, jsval *rval)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    ok = js_Execute(cx, obj, script, NULL, 0, rval);
-    LAST_FRAME_CHECKS(cx, ok);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ExecuteScriptPart(JSContext *cx, JSObject *obj, JSScript *script,
-                     JSExecPart part, jsval *rval)
-{
-    JSScript tmp;
-    JSRuntime *rt;
-    JSBool ok;
-
-    /* Make a temporary copy of the JSScript structure and farble it a bit. */
-    tmp = *script;
-    if (part == JSEXEC_PROLOG) {
-        tmp.length = PTRDIFF(tmp.main, tmp.code, jsbytecode);
-    } else {
-        tmp.length -= PTRDIFF(tmp.main, tmp.code, jsbytecode);
-        tmp.code = tmp.main;
-    }
-
-    /* Tell the debugger about our temporary copy of the script structure. */
-    rt = cx->runtime;
-    if (rt->newScriptHook) {
-        rt->newScriptHook(cx, tmp.filename, tmp.lineno, &tmp, NULL,
-                          rt->newScriptHookData);
-    }
-
-    /* Execute the farbled struct and tell the debugger to forget about it. */
-    ok = JS_ExecuteScript(cx, obj, &tmp, rval);
-    if (rt->destroyScriptHook)
-        rt->destroyScriptHook(cx, &tmp, rt->destroyScriptHookData);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateScript(JSContext *cx, JSObject *obj,
-                  const char *bytes, uintN length,
-                  const char *filename, uintN lineno,
-                  jsval *rval)
-{
-    jschar *chars;
-    JSBool ok;
-	size_t slength = length;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &slength);
-    if (!chars)
-        return JS_FALSE;
-    ok = JS_EvaluateUCScript(cx, obj, chars, slength, filename, lineno, rval);
-    JS_free(cx, chars);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
-                               JSPrincipals *principals,
-                               const char *bytes, uintN length,
-                               const char *filename, uintN lineno,
-                               jsval *rval)
-{
-    jschar *chars;
-    JSBool ok;
-	size_t slength = length;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &slength);
-    if (!chars)
-        return JS_FALSE;
-    ok = JS_EvaluateUCScriptForPrincipals(cx, obj, principals, chars, slength,
-                                          filename, lineno, rval);
-    JS_free(cx, chars);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScript(JSContext *cx, JSObject *obj,
-                    const jschar *chars, uintN length,
-                    const char *filename, uintN lineno,
-                    jsval *rval)
-{
-    CHECK_REQUEST(cx);
-    return JS_EvaluateUCScriptForPrincipals(cx, obj, NULL, chars, length,
-                                            filename, lineno, rval);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                 JSPrincipals *principals,
-                                 const jschar *chars, uintN length,
-                                 const char *filename, uintN lineno,
-                                 jsval *rval)
-{
-    uint32 options;
-    JSScript *script;
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    options = cx->options;
-    cx->options = options | JSOPTION_COMPILE_N_GO;
-    script = JS_CompileUCScriptForPrincipals(cx, obj, principals, chars, length,
-                                             filename, lineno);
-    cx->options = options;
-    if (!script)
-        return JS_FALSE;
-    ok = js_Execute(cx, obj, script, NULL, 0, rval);
-    LAST_FRAME_CHECKS(cx, ok);
-    JS_DestroyScript(cx, script);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_CallFunction(JSContext *cx, JSObject *obj, JSFunction *fun, uintN argc,
-                jsval *argv, jsval *rval)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    ok = js_InternalCall(cx, obj, OBJECT_TO_JSVAL(fun->object), argc, argv,
-                         rval);
-    LAST_FRAME_CHECKS(cx, ok);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_CallFunctionName(JSContext *cx, JSObject *obj, const char *name, uintN argc,
-                    jsval *argv, jsval *rval)
-{
-    JSBool ok;
-    jsval fval;
-
-    CHECK_REQUEST(cx);
-#if JS_HAS_XML_SUPPORT
-    if (OBJECT_IS_XML(cx, obj)) {
-        JSXMLObjectOps *ops;
-        JSAtom *atom;
-
-        ops = (JSXMLObjectOps *) obj->map->ops;
-        atom = js_Atomize(cx, name, strlen(name), 0);
-        if (!atom)
-            return JS_FALSE;
-        obj = ops->getMethod(cx, obj, ATOM_TO_JSID(atom), &fval);
-        if (!obj)
-            return JS_FALSE;
-    } else
-#endif
-    if (!JS_GetProperty(cx, obj, name, &fval))
-        return JS_FALSE;
-    ok = js_InternalCall(cx, obj, fval, argc, argv, rval);
-    LAST_FRAME_CHECKS(cx, ok);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
-                     jsval *argv, jsval *rval)
-{
-    JSBool ok;
-
-    CHECK_REQUEST(cx);
-    ok = js_InternalCall(cx, obj, fval, argc, argv, rval);
-    LAST_FRAME_CHECKS(cx, ok);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBranchCallback)
-JS_SetBranchCallback(JSContext *cx, JSBranchCallback cb)
-{
-    JSBranchCallback oldcb;
-
-    oldcb = cx->branchCallback;
-    cx->branchCallback = cb;
-    return oldcb;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsRunning(JSContext *cx)
-{
-    return cx->fp != NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsConstructing(JSContext *cx)
-{
-    return cx->fp && (cx->fp->flags & JSFRAME_CONSTRUCTING);
-}
-
-JS_FRIEND_API(JSBool)
-JS_IsAssigning(JSContext *cx)
-{
-    JSStackFrame *fp;
-    jsbytecode *pc;
-
-    for (fp = cx->fp; fp && !fp->script; fp = fp->down)
-        continue;
-    if (!fp || !(pc = fp->pc))
-        return JS_FALSE;
-    return (js_CodeSpec[*pc].format & JOF_ASSIGNING) != 0;
-}
-
-JS_PUBLIC_API(void)
-JS_SetCallReturnValue2(JSContext *cx, jsval v)
-{
-#if JS_HAS_LVALUE_RETURN
-    cx->rval2 = v;
-    cx->rval2set = JS_TRUE;
-#endif
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(JSString *)
-JS_NewString(JSContext *cx, char *bytes, size_t length)
-{
-    jschar *chars;
-    JSString *str;
-    size_t charsLength = length;
-
-    CHECK_REQUEST(cx);
-    /* Make a Unicode vector from the 8-bit char codes in bytes. */
-    chars = js_InflateString(cx, bytes, &charsLength);
-    if (!chars)
-        return NULL;
-
-    /* Free chars (but not bytes, which caller frees on error) if we fail. */
-    str = js_NewString(cx, chars, charsLength, 0);
-    if (!str) {
-        JS_free(cx, chars);
-        return NULL;
-    }
-
-    /* Hand off bytes to the deflated string cache, if possible. */
-    if (!js_SetStringBytes(str, bytes, length))
-        JS_free(cx, bytes);
-    return str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewStringCopyN(JSContext *cx, const char *s, size_t n)
-{
-    jschar *js;
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    js = js_InflateString(cx, s, &n);
-    if (!js)
-        return NULL;
-    str = js_NewString(cx, js, n, 0);
-    if (!str)
-        JS_free(cx, js);
-    return str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewStringCopyZ(JSContext *cx, const char *s)
-{
-    size_t n;
-    jschar *js;
-    JSString *str;
-
-    CHECK_REQUEST(cx);
-    if (!s)
-        return cx->runtime->emptyString;
-    n = strlen(s);
-    js = js_InflateString(cx, s, &n);
-    if (!js)
-        return NULL;
-    str = js_NewString(cx, js, n, 0);
-    if (!str)
-        JS_free(cx, js);
-    return str;
-}
-
-JS_PUBLIC_API(JSString *)
-JS_InternString(JSContext *cx, const char *s)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_Atomize(cx, s, strlen(s), ATOM_INTERNED);
-    if (!atom)
-        return NULL;
-    return ATOM_TO_STRING(atom);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewUCString(JSContext *cx, jschar *chars, size_t length)
-{
-    CHECK_REQUEST(cx);
-    return js_NewString(cx, chars, length, 0);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyN(JSContext *cx, const jschar *s, size_t n)
-{
-    CHECK_REQUEST(cx);
-    return js_NewStringCopyN(cx, s, n, 0);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyZ(JSContext *cx, const jschar *s)
-{
-    CHECK_REQUEST(cx);
-    if (!s)
-        return cx->runtime->emptyString;
-    return js_NewStringCopyZ(cx, s, 0);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_InternUCStringN(JSContext *cx, const jschar *s, size_t length)
-{
-    JSAtom *atom;
-
-    CHECK_REQUEST(cx);
-    atom = js_AtomizeChars(cx, s, length, ATOM_INTERNED);
-    if (!atom)
-        return NULL;
-    return ATOM_TO_STRING(atom);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_InternUCString(JSContext *cx, const jschar *s)
-{
-    return JS_InternUCStringN(cx, s, js_strlen(s));
-}
-
-JS_PUBLIC_API(char *)
-JS_GetStringBytes(JSString *str)
-{
-    char *bytes;
-
-    bytes = js_GetStringBytes(str);
-    return bytes ? bytes : "";
-}
-
-JS_PUBLIC_API(jschar *)
-JS_GetStringChars(JSString *str)
-{
-    /*
-     * API botch (again, shades of JS_GetStringBytes): we have no cx to pass
-     * to js_UndependString (called by js_GetStringChars) for out-of-memory
-     * error reports, so js_UndependString passes NULL and suppresses errors.
-     * If it fails to convert a dependent string into an independent one, our
-     * caller will not be guaranteed a \u0000 terminator as a backstop.  This
-     * may break some clients who already misbehave on embedded NULs.
-     *
-     * The gain of dependent strings, which cure quadratic and cubic growth
-     * rate bugs in string concatenation, is worth this slight loss in API
-     * compatibility.
-     */
-    jschar *chars;
-
-    chars = js_GetStringChars(str);
-    return chars ? chars : JSSTRING_CHARS(str);
-}
-
-JS_PUBLIC_API(size_t)
-JS_GetStringLength(JSString *str)
-{
-    return JSSTRING_LENGTH(str);
-}
-
-JS_PUBLIC_API(intN)
-JS_CompareStrings(JSString *str1, JSString *str2)
-{
-    return js_CompareStrings(str1, str2);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewGrowableString(JSContext *cx, jschar *chars, size_t length)
-{
-    CHECK_REQUEST(cx);
-    return js_NewString(cx, chars, length, GCF_MUTABLE);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_NewDependentString(JSContext *cx, JSString *str, size_t start,
-                      size_t length)
-{
-    CHECK_REQUEST(cx);
-    return js_NewDependentString(cx, str, start, length, 0);
-}
-
-JS_PUBLIC_API(JSString *)
-JS_ConcatStrings(JSContext *cx, JSString *left, JSString *right)
-{
-    CHECK_REQUEST(cx);
-    return js_ConcatStrings(cx, left, right);
-}
-
-JS_PUBLIC_API(const jschar *)
-JS_UndependString(JSContext *cx, JSString *str)
-{
-    CHECK_REQUEST(cx);
-    return js_UndependString(cx, str);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_MakeStringImmutable(JSContext *cx, JSString *str)
-{
-    CHECK_REQUEST(cx);
-    if (!js_UndependString(cx, str))
-        return JS_FALSE;
-
-    *js_GetGCThingFlags(str) &= ~GCF_MUTABLE;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EncodeCharacters(JSContext *cx, const jschar *src, size_t srclen, char *dst,
-                    size_t *dstlenp)
-{
-    return js_DeflateStringToBuffer(cx, src, srclen, dst, dstlenp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DecodeBytes(JSContext *cx, const char *src, size_t srclen, jschar *dst,
-               size_t *dstlenp)
-{
-    return js_InflateStringToBuffer(cx, src, srclen, dst, dstlenp);
-}
-
-JS_PUBLIC_API(JSBool)
-#ifdef OSSP /* CLEANUP */
-JS_CStringsAreUTF8(void)
-#else
-JS_CStringsAreUTF8()
-#endif
-{
-#ifdef JS_C_STRINGS_ARE_UTF8
-    return JS_TRUE;
-#else
-    return JS_FALSE;
-#endif
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(void)
-JS_ReportError(JSContext *cx, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    js_ReportErrorVA(cx, JSREPORT_ERROR, format, ap);
-    va_end(ap);
-}
-
-JS_PUBLIC_API(void)
-JS_ReportErrorNumber(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...)
-{
-    va_list ap;
-
-    va_start(ap, errorNumber);
-    js_ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
-                           errorNumber, JS_TRUE, ap);
-    va_end(ap);
-}
-
-JS_PUBLIC_API(void)
-JS_ReportErrorNumberUC(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...)
-{
-    va_list ap;
-
-    va_start(ap, errorNumber);
-    js_ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
-                           errorNumber, JS_FALSE, ap);
-    va_end(ap);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ReportWarning(JSContext *cx, const char *format, ...)
-{
-    va_list ap;
-    JSBool ok;
-
-    va_start(ap, format);
-    ok = js_ReportErrorVA(cx, JSREPORT_WARNING, format, ap);
-    va_end(ap);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumber(JSContext *cx, uintN flags,
-                             JSErrorCallback errorCallback, void *userRef,
-                             const uintN errorNumber, ...)
-{
-    va_list ap;
-    JSBool ok;
-
-    va_start(ap, errorNumber);
-    ok = js_ReportErrorNumberVA(cx, flags, errorCallback, userRef,
-                                errorNumber, JS_TRUE, ap);
-    va_end(ap);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumberUC(JSContext *cx, uintN flags,
-                               JSErrorCallback errorCallback, void *userRef,
-                               const uintN errorNumber, ...)
-{
-    va_list ap;
-    JSBool ok;
-
-    va_start(ap, errorNumber);
-    ok = js_ReportErrorNumberVA(cx, flags, errorCallback, userRef,
-                                errorNumber, JS_FALSE, ap);
-    va_end(ap);
-    return ok;
-}
-
-JS_PUBLIC_API(void)
-JS_ReportOutOfMemory(JSContext *cx)
-{
-    js_ReportOutOfMemory(cx);
-}
-
-JS_PUBLIC_API(JSErrorReporter)
-JS_SetErrorReporter(JSContext *cx, JSErrorReporter er)
-{
-    JSErrorReporter older;
-
-    older = cx->errorReporter;
-    cx->errorReporter = er;
-    return older;
-}
-
-/************************************************************************/
-
-/*
- * Regular Expressions.
- */
-JS_PUBLIC_API(JSObject *)
-JS_NewRegExpObject(JSContext *cx, char *bytes, size_t length, uintN flags)
-{
-#if JS_HAS_REGEXPS
-    jschar *chars;
-    JSObject *obj;
-	size_t slength = length;
-
-    CHECK_REQUEST(cx);
-    chars = js_InflateString(cx, bytes, &slength);
-    if (!chars)
-        return NULL;
-    obj = js_NewRegExpObject(cx, NULL, chars, slength, flags);
-    JS_free(cx, chars);
-    return obj;
-#else
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NO_REG_EXPS);
-    return NULL;
-#endif
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_NewUCRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags)
-{
-    CHECK_REQUEST(cx);
-#if JS_HAS_REGEXPS
-    return js_NewRegExpObject(cx, NULL, chars, length, flags);
-#else
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NO_REG_EXPS);
-    return NULL;
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_SetRegExpInput(JSContext *cx, JSString *input, JSBool multiline)
-{
-    JSRegExpStatics *res;
-
-    CHECK_REQUEST(cx);
-    /* No locking required, cx is thread-private and input must be live. */
-    res = &cx->regExpStatics;
-    res->input = input;
-    res->multiline = multiline;
-    cx->runtime->gcPoke = JS_TRUE;
-}
-
-JS_PUBLIC_API(void)
-JS_ClearRegExpStatics(JSContext *cx)
-{
-    JSRegExpStatics *res;
-
-    /* No locking required, cx is thread-private and input must be live. */
-    res = &cx->regExpStatics;
-    res->input = NULL;
-    res->multiline = JS_FALSE;
-    res->parenCount = 0;
-    res->lastMatch = res->lastParen = js_EmptySubString;
-    res->leftContext = res->rightContext = js_EmptySubString;
-    cx->runtime->gcPoke = JS_TRUE;
-}
-
-JS_PUBLIC_API(void)
-JS_ClearRegExpRoots(JSContext *cx)
-{
-    JSRegExpStatics *res;
-
-    /* No locking required, cx is thread-private and input must be live. */
-    res = &cx->regExpStatics;
-    res->input = NULL;
-    cx->runtime->gcPoke = JS_TRUE;
-}
-
-/* TODO: compile, execute, get/set other statics... */
-
-/************************************************************************/
-
-JS_PUBLIC_API(void)
-JS_SetLocaleCallbacks(JSContext *cx, JSLocaleCallbacks *callbacks)
-{
-    cx->localeCallbacks = callbacks;
-}
-
-JS_PUBLIC_API(JSLocaleCallbacks *)
-JS_GetLocaleCallbacks(JSContext *cx)
-{
-    return cx->localeCallbacks;
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(JSBool)
-JS_IsExceptionPending(JSContext *cx)
-{
-#if JS_HAS_EXCEPTIONS
-    return (JSBool) cx->throwing;
-#else
-    return JS_FALSE;
-#endif
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetPendingException(JSContext *cx, jsval *vp)
-{
-#if JS_HAS_EXCEPTIONS
-    CHECK_REQUEST(cx);
-    if (!cx->throwing)
-        return JS_FALSE;
-    *vp = cx->exception;
-    return JS_TRUE;
-#else
-    return JS_FALSE;
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_SetPendingException(JSContext *cx, jsval v)
-{
-    CHECK_REQUEST(cx);
-#if JS_HAS_EXCEPTIONS
-    cx->throwing = JS_TRUE;
-    cx->exception = v;
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_ClearPendingException(JSContext *cx)
-{
-#if JS_HAS_EXCEPTIONS
-    cx->throwing = JS_FALSE;
-    cx->exception = JSVAL_VOID;
-#endif
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ReportPendingException(JSContext *cx)
-{
-#if JS_HAS_EXCEPTIONS
-    JSBool save, ok;
-
-    CHECK_REQUEST(cx);
-
-    /*
-     * Set cx->creatingException to suppress the standard error-to-exception
-     * conversion done by all {js,JS}_Report* functions except for OOM.  The
-     * cx->creatingException flag was added to suppress recursive divergence
-     * under js_ErrorToException, but it serves for our purposes here too.
-     */
-    save = cx->creatingException;
-    cx->creatingException = JS_TRUE;
-    ok = js_ReportUncaughtException(cx);
-    cx->creatingException = save;
-    return ok;
-#else
-    return JS_TRUE;
-#endif
-}
-
-#if JS_HAS_EXCEPTIONS
-struct JSExceptionState {
-    JSBool throwing;
-    jsval  exception;
-};
-#endif
-
-JS_PUBLIC_API(JSExceptionState *)
-JS_SaveExceptionState(JSContext *cx)
-{
-#if JS_HAS_EXCEPTIONS
-    JSExceptionState *state;
-
-    CHECK_REQUEST(cx);
-    state = (JSExceptionState *) JS_malloc(cx, sizeof(JSExceptionState));
-    if (state) {
-        state->throwing = JS_GetPendingException(cx, &state->exception);
-        if (state->throwing && JSVAL_IS_GCTHING(state->exception))
-            js_AddRoot(cx, &state->exception, "JSExceptionState.exception");
-    }
-    return state;
-#else
-    return NULL;
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_RestoreExceptionState(JSContext *cx, JSExceptionState *state)
-{
-#if JS_HAS_EXCEPTIONS
-    CHECK_REQUEST(cx);
-    if (state) {
-        if (state->throwing)
-            JS_SetPendingException(cx, state->exception);
-        else
-            JS_ClearPendingException(cx);
-        JS_DropExceptionState(cx, state);
-    }
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_DropExceptionState(JSContext *cx, JSExceptionState *state)
-{
-#if JS_HAS_EXCEPTIONS
-    CHECK_REQUEST(cx);
-    if (state) {
-        if (state->throwing && JSVAL_IS_GCTHING(state->exception))
-            JS_RemoveRoot(cx, &state->exception);
-        JS_free(cx, state);
-    }
-#endif
-}
-
-JS_PUBLIC_API(JSErrorReport *)
-JS_ErrorFromException(JSContext *cx, jsval v)
-{
-#if JS_HAS_ERROR_EXCEPTIONS
-    CHECK_REQUEST(cx);
-    return js_ErrorFromException(cx, v);
-#else
-    return NULL;
-#endif
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ThrowReportedError(JSContext *cx, const char *message,
-                      JSErrorReport *reportp)
-{
-    return js_ErrorToException(cx, message, reportp);
-}
-
-#ifdef JS_THREADSAFE
-JS_PUBLIC_API(jsword)
-JS_GetContextThread(JSContext *cx)
-{
-    return cx->thread;
-}
-
-JS_PUBLIC_API(jsword)
-JS_SetContextThread(JSContext *cx)
-{
-    jsword old = cx->thread;
-    cx->thread = js_CurrentThreadId();
-    return old;
-}
-
-JS_PUBLIC_API(jsword)
-JS_ClearContextThread(JSContext *cx)
-{
-    jsword old = cx->thread;
-    cx->thread = 0;
-    return old;
-}
-#endif
-
-/************************************************************************/
-
-#if defined(XP_WIN)
-#include <windows.h>
-/*
- * Initialization routine for the JS DLL...
- */
-
-/*
- * Global Instance handle...
- * In Win32 this is the module handle of the DLL.
- *
- * In Win16 this is the instance handle of the application
- * which loaded the DLL.
- */
-
-#ifdef _WIN32
-BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
-{
-    return TRUE;
-}
-
-#else  /* !_WIN32 */
-
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg,
-                      WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-    return TRUE;
-}
-
-BOOL CALLBACK __loadds WEP(BOOL fSystemExit)
-{
-    return TRUE;
-}
-
-#endif /* !_WIN32 */
-#endif /* XP_WIN */
diff --git a/libs/js/src/jsapi.h b/libs/js/src/jsapi.h
deleted file mode 100644
index 90c9ced80a..0000000000
--- a/libs/js/src/jsapi.h
+++ /dev/null
@@ -1,2030 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsapi_h___
-#define jsapi_h___
-
-#ifndef OSSP
-#define OSSP
-#endif
-#if !defined(XP_UNIX) && !defined(XP_WIN)
-#define XP_UNIX
-#endif
-
-/*
- * JavaScript API.
- */
-#include <stddef.h>
-#include <stdio.h>
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Type tags stored in the low bits of a jsval.
- */
-#define JSVAL_OBJECT            0x0     /* untagged reference to object */
-#define JSVAL_INT               0x1     /* tagged 31-bit integer value */
-#define JSVAL_DOUBLE            0x2     /* tagged reference to double */
-#define JSVAL_STRING            0x4     /* tagged reference to string */
-#define JSVAL_BOOLEAN           0x6     /* tagged boolean value */
-
-/* Type tag bitfield length and derived macros. */
-#define JSVAL_TAGBITS           3
-#define JSVAL_TAGMASK           JS_BITMASK(JSVAL_TAGBITS)
-#define JSVAL_TAG(v)            ((v) & JSVAL_TAGMASK)
-#define JSVAL_SETTAG(v,t)       ((v) | (t))
-#define JSVAL_CLRTAG(v)         ((v) & ~(jsval)JSVAL_TAGMASK)
-#define JSVAL_ALIGN             JS_BIT(JSVAL_TAGBITS)
-
-/* Predicates for type testing. */
-#define JSVAL_IS_OBJECT(v)      (JSVAL_TAG(v) == JSVAL_OBJECT)
-#define JSVAL_IS_NUMBER(v)      (JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v))
-#define JSVAL_IS_INT(v)         (((v) & JSVAL_INT) && (v) != JSVAL_VOID)
-#define JSVAL_IS_DOUBLE(v)      (JSVAL_TAG(v) == JSVAL_DOUBLE)
-#define JSVAL_IS_STRING(v)      (JSVAL_TAG(v) == JSVAL_STRING)
-#define JSVAL_IS_BOOLEAN(v)     (JSVAL_TAG(v) == JSVAL_BOOLEAN)
-#define JSVAL_IS_NULL(v)        ((v) == JSVAL_NULL)
-#define JSVAL_IS_VOID(v)        ((v) == JSVAL_VOID)
-#define JSVAL_IS_PRIMITIVE(v)   (!JSVAL_IS_OBJECT(v) || JSVAL_IS_NULL(v))
-
-/* Objects, strings, and doubles are GC'ed. */
-#define JSVAL_IS_GCTHING(v)     (!((v) & JSVAL_INT) && !JSVAL_IS_BOOLEAN(v))
-#define JSVAL_TO_GCTHING(v)     ((void *)JSVAL_CLRTAG(v))
-#define JSVAL_TO_OBJECT(v)      ((JSObject *)JSVAL_TO_GCTHING(v))
-#define JSVAL_TO_DOUBLE(v)      ((jsdouble *)JSVAL_TO_GCTHING(v))
-#define JSVAL_TO_STRING(v)      ((JSString *)JSVAL_TO_GCTHING(v))
-#define OBJECT_TO_JSVAL(obj)    ((jsval)(obj))
-#define DOUBLE_TO_JSVAL(dp)     JSVAL_SETTAG((jsval)(dp), JSVAL_DOUBLE)
-#define STRING_TO_JSVAL(str)    JSVAL_SETTAG((jsval)(str), JSVAL_STRING)
-
-/* Lock and unlock the GC thing held by a jsval. */
-#define JSVAL_LOCK(cx,v)        (JSVAL_IS_GCTHING(v)                          \
-                                 ? JS_LockGCThing(cx, JSVAL_TO_GCTHING(v))    \
-                                 : JS_TRUE)
-#define JSVAL_UNLOCK(cx,v)      (JSVAL_IS_GCTHING(v)                          \
-                                 ? JS_UnlockGCThing(cx, JSVAL_TO_GCTHING(v))  \
-                                 : JS_TRUE)
-
-/* Domain limits for the jsval int type. */
-#define JSVAL_INT_BITS          31
-#define JSVAL_INT_POW2(n)       ((jsval)1 << (n))
-#define JSVAL_INT_MIN           ((jsval)1 - JSVAL_INT_POW2(30))
-#define JSVAL_INT_MAX           (JSVAL_INT_POW2(30) - 1)
-#define INT_FITS_IN_JSVAL(i)    ((jsuint)((i)+JSVAL_INT_MAX) <= 2*JSVAL_INT_MAX)
-#define JSVAL_TO_INT(v)         ((jsint)(v) >> 1)
-#define INT_TO_JSVAL(i)         (((jsval)(i) << 1) | JSVAL_INT)
-
-/* Convert between boolean and jsval. */
-#define JSVAL_TO_BOOLEAN(v)     ((JSBool)((v) >> JSVAL_TAGBITS))
-#define BOOLEAN_TO_JSVAL(b)     JSVAL_SETTAG((jsval)(b) << JSVAL_TAGBITS,     \
-                                             JSVAL_BOOLEAN)
-
-/* A private data pointer (2-byte-aligned) can be stored as an int jsval. */
-#define JSVAL_TO_PRIVATE(v)     ((void *)((v) & ~JSVAL_INT))
-#define PRIVATE_TO_JSVAL(p)     ((jsval)(p) | JSVAL_INT)
-
-/* Property attributes, set in JSPropertySpec and passed to API functions. */
-#define JSPROP_ENUMERATE        0x01    /* property is visible to for/in loop */
-#define JSPROP_READONLY         0x02    /* not settable: assignment is no-op */
-#define JSPROP_PERMANENT        0x04    /* property cannot be deleted */
-#define JSPROP_EXPORTED         0x08    /* property is exported from object */
-#define JSPROP_GETTER           0x10    /* property holds getter function */
-#define JSPROP_SETTER           0x20    /* property holds setter function */
-#define JSPROP_SHARED           0x40    /* don't allocate a value slot for this
-                                           property; don't copy the property on
-                                           set of the same-named property in an
-                                           object that delegates to a prototype
-                                           containing this property */
-#define JSPROP_INDEX            0x80    /* name is actually (jsint) index */
-
-/* Function flags, set in JSFunctionSpec and passed to JS_NewFunction etc. */
-#define JSFUN_LAMBDA            0x08    /* expressed, not declared, function */
-#define JSFUN_GETTER            JSPROP_GETTER
-#define JSFUN_SETTER            JSPROP_SETTER
-#define JSFUN_BOUND_METHOD      0x40    /* bind this to fun->object's parent */
-#define JSFUN_HEAVYWEIGHT       0x80    /* activation requires a Call object */
-#define JSFUN_FLAGS_MASK        0xf8    /* overlay JSFUN_* attributes */
-
-/*
- * Re-use JSFUN_LAMBDA, which applies only to scripted functions, for use in
- * JSFunctionSpec arrays that specify generic native prototype methods, i.e.,
- * methods of a class prototype that are exposed as static methods taking an
- * extra leading argument: the generic |this| parameter.
- *
- * If you set this flag in a JSFunctionSpec struct's flags initializer, then
- * that struct must live at least as long as the native static method object
- * created due to this flag by JS_DefineFunctions or JS_InitClass.  Typically
- * JSFunctionSpec structs are allocated in static arrays.
- */
-#define JSFUN_GENERIC_NATIVE    JSFUN_LAMBDA
-
-/*
- * Well-known JS values.  The extern'd variables are initialized when the
- * first JSContext is created by JS_NewContext (see below).
- */
-#define JSVAL_VOID              INT_TO_JSVAL(0 - JSVAL_INT_POW2(30))
-#define JSVAL_NULL              OBJECT_TO_JSVAL(0)
-#define JSVAL_ZERO              INT_TO_JSVAL(0)
-#define JSVAL_ONE               INT_TO_JSVAL(1)
-#define JSVAL_FALSE             BOOLEAN_TO_JSVAL(JS_FALSE)
-#define JSVAL_TRUE              BOOLEAN_TO_JSVAL(JS_TRUE)
-
-/*
- * Microseconds since the epoch, midnight, January 1, 1970 UTC.  See the
- * comment in jstypes.h regarding safe int64 usage.
- */
-extern JS_PUBLIC_API(int64)
-#ifdef OSSP /* CLEANUP */
-JS_Now(void);
-#else
-JS_Now();
-#endif
-
-/* Don't want to export data, so provide accessors for non-inline jsvals. */
-extern JS_PUBLIC_API(jsval)
-JS_GetNaNValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetNegativeInfinityValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetPositiveInfinityValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetEmptyStringValue(JSContext *cx);
-
-/*
- * Format is a string of the following characters (spaces are insignificant),
- * specifying the tabulated type conversions:
- *
- *   b      JSBool          Boolean
- *   c      uint16/jschar   ECMA uint16, Unicode char
- *   i      int32           ECMA int32
- *   u      uint32          ECMA uint32
- *   j      int32           Rounded int32 (coordinate)
- *   d      jsdouble        IEEE double
- *   I      jsdouble        Integral IEEE double
- *   s      char *          C string
- *   S      JSString *      Unicode string, accessed by a JSString pointer
- *   W      jschar *        Unicode character vector, 0-terminated (W for wide)
- *   o      JSObject *      Object reference
- *   f      JSFunction *    Function private
- *   v      jsval           Argument value (no conversion)
- *   *      N/A             Skip this argument (no vararg)
- *   /      N/A             End of required arguments
- *
- * The variable argument list after format must consist of &b, &c, &s, e.g.,
- * where those variables have the types given above.  For the pointer types
- * char *, JSString *, and JSObject *, the pointed-at memory returned belongs
- * to the JS runtime, not to the calling native code.  The runtime promises
- * to keep this memory valid so long as argv refers to allocated stack space
- * (so long as the native function is active).
- *
- * Fewer arguments than format specifies may be passed only if there is a /
- * in format after the last required argument specifier and argc is at least
- * the number of required arguments.  More arguments than format specifies
- * may be passed without error; it is up to the caller to deal with trailing
- * unconverted arguments.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertArguments(JSContext *cx, uintN argc, jsval *argv, const char *format,
-                    ...);
-
-#ifdef va_start
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval *argv,
-                      const char *format, va_list ap);
-#endif
-
-/*
- * Inverse of JS_ConvertArguments: scan format and convert trailing arguments
- * into jsvals, GC-rooted if necessary by the JS stack.  Return null on error,
- * and a pointer to the new argument vector on success.  Also return a stack
- * mark on success via *markp, in which case the caller must eventually clean
- * up by calling JS_PopArguments.
- *
- * Note that the number of actual arguments supplied is specified exclusively
- * by format, so there is no argc parameter.
- */
-extern JS_PUBLIC_API(jsval *)
-JS_PushArguments(JSContext *cx, void **markp, const char *format, ...);
-
-#ifdef va_start
-extern JS_PUBLIC_API(jsval *)
-JS_PushArgumentsVA(JSContext *cx, void **markp, const char *format, va_list ap);
-#endif
-
-extern JS_PUBLIC_API(void)
-JS_PopArguments(JSContext *cx, void *mark);
-
-#ifdef JS_ARGUMENT_FORMATTER_DEFINED
-
-/*
- * Add and remove a format string handler for JS_{Convert,Push}Arguments{,VA}.
- * The handler function has this signature (see jspubtd.h):
- *
- *   JSBool MyArgumentFormatter(JSContext *cx, const char *format,
- *                              JSBool fromJS, jsval **vpp, va_list *app);
- *
- * It should return true on success, and return false after reporting an error
- * or detecting an already-reported error.
- *
- * For a given format string, for example "AA", the formatter is called from
- * JS_ConvertArgumentsVA like so:
- *
- *   formatter(cx, "AA...", JS_TRUE, &sp, &ap);
- *
- * sp points into the arguments array on the JS stack, while ap points into
- * the stdarg.h va_list on the C stack.  The JS_TRUE passed for fromJS tells
- * the formatter to convert zero or more jsvals at sp to zero or more C values
- * accessed via pointers-to-values at ap, updating both sp (via *vpp) and ap
- * (via *app) to point past the converted arguments and their result pointers
- * on the C stack.
- *
- * When called from JS_PushArgumentsVA, the formatter is invoked thus:
- *
- *   formatter(cx, "AA...", JS_FALSE, &sp, &ap);
- *
- * where JS_FALSE for fromJS means to wrap the C values at ap according to the
- * format specifier and store them at sp, updating ap and sp appropriately.
- *
- * The "..." after "AA" is the rest of the format string that was passed into
- * JS_{Convert,Push}Arguments{,VA}.  The actual format trailing substring used
- * in each Convert or PushArguments call is passed to the formatter, so that
- * one such function may implement several formats, in order to share code.
- *
- * Remove just forgets about any handler associated with format.  Add does not
- * copy format, it points at the string storage allocated by the caller, which
- * is typically a string constant.  If format is in dynamic storage, it is up
- * to the caller to keep the string alive until Remove is called.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_AddArgumentFormatter(JSContext *cx, const char *format,
-                        JSArgumentFormatter formatter);
-
-extern JS_PUBLIC_API(void)
-JS_RemoveArgumentFormatter(JSContext *cx, const char *format);
-
-#endif /* JS_ARGUMENT_FORMATTER_DEFINED */
-
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertValue(JSContext *cx, jsval v, JSType type, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToObject(JSContext *cx, jsval v, JSObject **objp);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_ValueToFunction(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_ValueToConstructor(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSString *)
-JS_ValueToString(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp);
-
-/*
- * Convert a value to a number, then to an int32, according to the ECMA rules
- * for ToInt32.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip);
-
-/*
- * Convert a value to a number, then to a uint32, according to the ECMA rules
- * for ToUint32.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip);
-
-/*
- * Convert a value to a number, then to an int32 if it fits by rounding to
- * nearest; but failing with an error report if the double is out of range
- * or unordered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToInt32(JSContext *cx, jsval v, int32 *ip);
-
-/*
- * ECMA ToUint16, for mapping a jsval to a Unicode point.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToUint16(JSContext *cx, jsval v, uint16 *ip);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp);
-
-extern JS_PUBLIC_API(JSType)
-JS_TypeOfValue(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(const char *)
-JS_GetTypeName(JSContext *cx, JSType type);
-
-/************************************************************************/
-
-/*
- * Initialization, locking, contexts, and memory allocation.
- */
-#define JS_NewRuntime       JS_Init
-#define JS_DestroyRuntime   JS_Finish
-#define JS_LockRuntime      JS_Lock
-#define JS_UnlockRuntime    JS_Unlock
-
-extern JS_PUBLIC_API(JSRuntime *)
-JS_NewRuntime(uint32 maxbytes);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyRuntime(JSRuntime *rt);
-
-extern JS_PUBLIC_API(void)
-JS_ShutDown(void);
-
-JS_PUBLIC_API(void *)
-JS_GetRuntimePrivate(JSRuntime *rt);
-
-JS_PUBLIC_API(void)
-JS_SetRuntimePrivate(JSRuntime *rt, void *data);
-
-#ifdef JS_THREADSAFE
-
-extern JS_PUBLIC_API(void)
-JS_BeginRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_EndRequest(JSContext *cx);
-
-/* Yield to pending GC operations, regardless of request depth */
-extern JS_PUBLIC_API(void)
-JS_YieldRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_SuspendRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_ResumeRequest(JSContext *cx, jsrefcount saveDepth);
-
-#endif /* JS_THREADSAFE */
-
-extern JS_PUBLIC_API(void)
-JS_Lock(JSRuntime *rt);
-
-extern JS_PUBLIC_API(void)
-JS_Unlock(JSRuntime *rt);
-
-extern JS_PUBLIC_API(JSContext *)
-JS_NewContext(JSRuntime *rt, size_t stackChunkSize);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContext(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContextNoGC(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContextMaybeGC(JSContext *cx);
-
-extern JS_PUBLIC_API(void *)
-JS_GetContextPrivate(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_SetContextPrivate(JSContext *cx, void *data);
-
-extern JS_PUBLIC_API(JSRuntime *)
-JS_GetRuntime(JSContext *cx);
-
-extern JS_PUBLIC_API(JSContext *)
-JS_ContextIterator(JSRuntime *rt, JSContext **iterp);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_GetVersion(JSContext *cx);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_SetVersion(JSContext *cx, JSVersion version);
-
-extern JS_PUBLIC_API(const char *)
-JS_VersionToString(JSVersion version);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_StringToVersion(const char *string);
-
-/*
- * JS options are orthogonal to version, and may be freely composed with one
- * another as well as with version.
- *
- * JSOPTION_VAROBJFIX is recommended -- see the comments associated with the
- * prototypes for JS_ExecuteScript, JS_EvaluateScript, etc.
- */
-#define JSOPTION_STRICT         JS_BIT(0)       /* warn on dubious practice */
-#define JSOPTION_WERROR         JS_BIT(1)       /* convert warning to error */
-#define JSOPTION_VAROBJFIX      JS_BIT(2)       /* make JS_EvaluateScript use
-                                                   the last object on its 'obj'
-                                                   param's scope chain as the
-                                                   ECMA 'variables object' */
-#define JSOPTION_PRIVATE_IS_NSISUPPORTS \
-                                JS_BIT(3)       /* context private data points
-                                                   to an nsISupports subclass */
-#define JSOPTION_COMPILE_N_GO   JS_BIT(4)       /* caller of JS_Compile*Script
-                                                   promises to execute compiled
-                                                   script once only; enables
-                                                   compile-time scope chain
-                                                   resolution of consts. */
-#define JSOPTION_ATLINE         JS_BIT(5)       /* //@line number ["filename"]
-                                                   option supported for the
-                                                   XUL preprocessor and kindred
-                                                   beasts. */
-#define JSOPTION_XML            JS_BIT(6)       /* EMCAScript for XML support:
-                                                   parse <!-- --> as a token,
-                                                   not backward compatible with
-                                                   the comment-hiding hack used
-                                                   in HTML script tags. */
-#define JSOPTION_NATIVE_BRANCH_CALLBACK \
-                                JS_BIT(7)       /* the branch callback set by
-                                                   JS_SetBranchCallback may be
-                                                   called with a null script
-                                                   parameter, by native code
-                                                   that loops intensively */
-
-extern JS_PUBLIC_API(uint32)
-JS_GetOptions(JSContext *cx);
-
-extern JS_PUBLIC_API(uint32)
-JS_SetOptions(JSContext *cx, uint32 options);
-
-extern JS_PUBLIC_API(uint32)
-JS_ToggleOptions(JSContext *cx, uint32 options);
-
-extern JS_PUBLIC_API(const char *)
-JS_GetImplementationVersion(void);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetGlobalObject(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_SetGlobalObject(JSContext *cx, JSObject *obj);
-
-/*
- * Initialize standard JS class constructors, prototypes, and any top-level
- * functions and constants associated with the standard classes (e.g. isNaN
- * for Number).
- *
- * NB: This sets cx's global object to obj if it was null.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_InitStandardClasses(JSContext *cx, JSObject *obj);
-
-/*
- * Resolve id, which must contain either a string or an int, to a standard
- * class name in obj if possible, defining the class's constructor and/or
- * prototype and storing true in *resolved.  If id does not name a standard
- * class or a top-level property induced by initializing a standard class,
- * store false in *resolved and just return true.  Return false on error,
- * as usual for JSBool result-typed API entry points.
- *
- * This API can be called directly from a global object class's resolve op,
- * to define standard classes lazily.  The class's enumerate op should call
- * JS_EnumerateStandardClasses(cx, obj), to define eagerly during for..in
- * loops any classes not yet resolved lazily.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id,
-                        JSBool *resolved);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj);
-
-/*
- * Enumerate any already-resolved standard class ids into ida, or into a new
- * JSIdArray if ida is null.  Return the augmented array on success, null on
- * failure with ida (if it was non-null on entry) destroyed.
- */
-extern JS_PUBLIC_API(JSIdArray *)
-JS_EnumerateResolvedStandardClasses(JSContext *cx, JSObject *obj,
-                                    JSIdArray *ida);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetScopeChain(JSContext *cx);
-
-extern JS_PUBLIC_API(void *)
-JS_malloc(JSContext *cx, size_t nbytes);
-
-extern JS_PUBLIC_API(void *)
-JS_realloc(JSContext *cx, void *p, size_t nbytes);
-
-extern JS_PUBLIC_API(void)
-JS_free(JSContext *cx, void *p);
-
-extern JS_PUBLIC_API(char *)
-JS_strdup(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(jsdouble *)
-JS_NewDouble(JSContext *cx, jsdouble d);
-
-extern JS_PUBLIC_API(JSBool)
-JS_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval);
-
-/*
- * A JS GC root is a pointer to a JSObject *, JSString *, or jsdouble * that
- * itself points into the GC heap (more recently, we support this extension:
- * a root may be a pointer to a jsval v for which JSVAL_IS_GCTHING(v) is true).
- *
- * Therefore, you never pass JSObject *obj to JS_AddRoot(cx, obj).  You always
- * call JS_AddRoot(cx, &obj), passing obj by reference.  And later, before obj
- * or the structure it is embedded within goes out of scope or is freed, you
- * must call JS_RemoveRoot(cx, &obj).
- *
- * Also, use JS_AddNamedRoot(cx, &structPtr->memberObj, "structPtr->memberObj")
- * in preference to JS_AddRoot(cx, &structPtr->memberObj), in order to identify
- * roots by their source callsites.  This way, you can find the callsite while
- * debugging if you should fail to do JS_RemoveRoot(cx, &structPtr->memberObj)
- * before freeing structPtr's memory.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_AddRoot(JSContext *cx, void *rp);
-
-#ifdef NAME_ALL_GC_ROOTS
-#define JS_DEFINE_TO_TOKEN(def) #def
-#define JS_DEFINE_TO_STRING(def) JS_DEFINE_TO_TOKEN(def)
-#define JS_AddRoot(cx,rp) JS_AddNamedRoot((cx), (rp), (__FILE__ ":" JS_TOKEN_TO_STRING(__LINE__))
-#endif
-
-extern JS_PUBLIC_API(JSBool)
-JS_AddNamedRoot(JSContext *cx, void *rp, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AddNamedRootRT(JSRuntime *rt, void *rp, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_RemoveRoot(JSContext *cx, void *rp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_RemoveRootRT(JSRuntime *rt, void *rp);
-
-/*
- * The last GC thing of each type (object, string, double, external string
- * types) created on a given context is kept alive until another thing of the
- * same type is created, using a newborn root in the context.  These newborn
- * roots help native code protect newly-created GC-things from GC invocations
- * activated before those things can be rooted using local or global roots.
- *
- * However, the newborn roots can also entrain great gobs of garbage, so the
- * JS_GC entry point clears them for the context on which GC is being forced.
- * Embeddings may need to do likewise for all contexts.
- *
- * See the scoped local root API immediately below for a better way to manage
- * newborns in cases where native hooks (functions, getters, setters, etc.)
- * create many GC-things, potentially without connecting them to predefined
- * local roots such as *rval or argv[i] in an active native function.  Using
- * JS_EnterLocalRootScope disables updating of the context's per-gc-thing-type
- * newborn roots, until control flow unwinds and leaves the outermost nesting
- * local root scope.
- */
-extern JS_PUBLIC_API(void)
-JS_ClearNewbornRoots(JSContext *cx);
-
-/*
- * Scoped local root management allows native functions, getter/setters, etc.
- * to avoid worrying about the newborn root pigeon-holes, overloading local
- * roots allocated in argv and *rval, or ending up having to call JS_Add*Root
- * and JS_RemoveRoot to manage global roots temporarily.
- *
- * Instead, calling JS_EnterLocalRootScope and JS_LeaveLocalRootScope around
- * the body of the native hook causes the engine to allocate a local root for
- * each newborn created in between the two API calls, using a local root stack
- * associated with cx.  For example:
- *
- *    JSBool
- *    my_GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
- *    {
- *        JSBool ok;
- *
- *        if (!JS_EnterLocalRootScope(cx))
- *            return JS_FALSE;
- *        ok = my_GetPropertyBody(cx, obj, id, vp);
- *        JS_LeaveLocalRootScope(cx);
- *        return ok;
- *    }
- *
- * NB: JS_LeaveLocalRootScope must be called once for every prior successful
- * call to JS_EnterLocalRootScope.  If JS_EnterLocalRootScope fails, you must
- * not make the matching JS_LeaveLocalRootScope call.
- *
- * In case a native hook allocates many objects or other GC-things, but the
- * native protects some of those GC-things by storing them as property values
- * in an object that is itself protected, the hook can call JS_ForgetLocalRoot
- * to free the local root automatically pushed for the now-protected GC-thing.
- *
- * JS_ForgetLocalRoot works on any GC-thing allocated in the current local
- * root scope, but it's more time-efficient when called on references to more
- * recently created GC-things.  Calling it successively on other than the most
- * recently allocated GC-thing will tend to average the time inefficiency, and
- * may risk O(n^2) growth rate, but in any event, you shouldn't allocate too
- * many local roots if you can root as you go (build a tree of objects from
- * the top down, forgetting each latest-allocated GC-thing immediately upon
- * linking it to its parent).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_EnterLocalRootScope(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_LeaveLocalRootScope(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_ForgetLocalRoot(JSContext *cx, void *thing);
-
-#ifdef DEBUG
-extern JS_PUBLIC_API(void)
-JS_DumpNamedRoots(JSRuntime *rt,
-                  void (*dump)(const char *name, void *rp, void *data),
-                  void *data);
-#endif
-
-/*
- * Call JS_MapGCRoots to map the GC's roots table using map(rp, name, data).
- * The root is pointed at by rp; if the root is unnamed, name is null; data is
- * supplied from the third parameter to JS_MapGCRoots.
- *
- * The map function should return JS_MAP_GCROOT_REMOVE to cause the currently
- * enumerated root to be removed.  To stop enumeration, set JS_MAP_GCROOT_STOP
- * in the return value.  To keep on mapping, return JS_MAP_GCROOT_NEXT.  These
- * constants are flags; you can OR them together.
- *
- * This function acquires and releases rt's GC lock around the mapping of the
- * roots table, so the map function should run to completion in as few cycles
- * as possible.  Of course, map cannot call JS_GC, JS_MaybeGC, JS_BeginRequest,
- * or any JS API entry point that acquires locks, without double-tripping or
- * deadlocking on the GC lock.
- *
- * JS_MapGCRoots returns the count of roots that were successfully mapped.
- */
-#define JS_MAP_GCROOT_NEXT      0       /* continue mapping entries */
-#define JS_MAP_GCROOT_STOP      1       /* stop mapping entries */
-#define JS_MAP_GCROOT_REMOVE    2       /* remove and free the current entry */
-
-typedef intN
-(* JS_DLL_CALLBACK JSGCRootMapFun)(void *rp, const char *name, void *data);
-
-extern JS_PUBLIC_API(uint32)
-JS_MapGCRoots(JSRuntime *rt, JSGCRootMapFun map, void *data);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LockGCThing(JSContext *cx, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LockGCThingRT(JSRuntime *rt, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_UnlockGCThing(JSContext *cx, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_UnlockGCThingRT(JSRuntime *rt, void *thing);
-
-/*
- * For implementors of JSObjectOps.mark, to mark a GC-thing reachable via a
- * property or other strong ref identified for debugging purposes by name.
- * The name argument's storage needs to live only as long as the call to
- * this routine.
- *
- * The final arg is used by GC_MARK_DEBUG code to build a ref path through
- * the GC's live thing graph.  Implementors of JSObjectOps.mark should pass
- * its final arg through to this function when marking all GC-things that are
- * directly reachable from the object being marked.
- *
- * See the JSMarkOp typedef in jspubtd.h, and the JSObjectOps struct below.
- */
-extern JS_PUBLIC_API(void)
-JS_MarkGCThing(JSContext *cx, void *thing, const char *name, void *arg);
-
-extern JS_PUBLIC_API(void)
-JS_GC(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_MaybeGC(JSContext *cx);
-
-extern JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallback(JSContext *cx, JSGCCallback cb);
-
-extern JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallbackRT(JSRuntime *rt, JSGCCallback cb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsAboutToBeFinalized(JSContext *cx, void *thing);
-
-/*
- * Add a finalizer for external strings created by JS_NewExternalString (see
- * below) using a type-code returned from this function, and that understands
- * how to free or release the memory pointed at by JS_GetStringChars(str).
- *
- * Return a nonnegative type index if there is room for finalizer in the
- * global GC finalizers table, else return -1.  If the engine is compiled
- * JS_THREADSAFE and used in a multi-threaded environment, this function must
- * be invoked on the primordial thread only, at startup -- or else the entire
- * program must single-thread itself while loading a module that calls this
- * function.
- */
-extern JS_PUBLIC_API(intN)
-JS_AddExternalStringFinalizer(JSStringFinalizeOp finalizer);
-
-/*
- * Remove finalizer from the global GC finalizers table, returning its type
- * code if found, -1 if not found.
- *
- * As with JS_AddExternalStringFinalizer, there is a threading restriction
- * if you compile the engine JS_THREADSAFE: this function may be called for a
- * given finalizer pointer on only one thread; different threads may call to
- * remove distinct finalizers safely.
- *
- * You must ensure that all strings with finalizer's type have been collected
- * before calling this function.  Otherwise, string data will be leaked by the
- * GC, for want of a finalizer to call.
- */
-extern JS_PUBLIC_API(intN)
-JS_RemoveExternalStringFinalizer(JSStringFinalizeOp finalizer);
-
-/*
- * Create a new JSString whose chars member refers to external memory, i.e.,
- * memory requiring special, type-specific finalization.  The type code must
- * be a nonnegative return value from JS_AddExternalStringFinalizer.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewExternalString(JSContext *cx, jschar *chars, size_t length, intN type);
-
-/*
- * Returns the external-string finalizer index for this string, or -1 if it is
- * an "internal" (native to JS engine) string.
- */
-extern JS_PUBLIC_API(intN)
-JS_GetExternalStringGCType(JSRuntime *rt, JSString *str);
-
-/*
- * Sets maximum (if stack grows upward) or minimum (downward) legal stack byte
- * address in limitAddr for the thread or process stack used by cx.  To disable
- * stack size checking, pass 0 for limitAddr.
- */
-extern JS_PUBLIC_API(void)
-JS_SetThreadStackLimit(JSContext *cx, jsuword limitAddr);
-
-/************************************************************************/
-
-/*
- * Classes, objects, and properties.
- */
-
-/* For detailed comments on the function pointer types, see jspubtd.h. */
-struct JSClass {
-    const char          *name;
-    uint32              flags;
-
-    /* Mandatory non-null function pointer members. */
-    JSPropertyOp        addProperty;
-    JSPropertyOp        delProperty;
-    JSPropertyOp        getProperty;
-    JSPropertyOp        setProperty;
-    JSEnumerateOp       enumerate;
-    JSResolveOp         resolve;
-    JSConvertOp         convert;
-    JSFinalizeOp        finalize;
-
-    /* Optionally non-null members start here. */
-    JSGetObjectOps      getObjectOps;
-    JSCheckAccessOp     checkAccess;
-    JSNative            call;
-    JSNative            construct;
-    JSXDRObjectOp       xdrObject;
-    JSHasInstanceOp     hasInstance;
-    JSMarkOp            mark;
-    JSReserveSlotsOp    reserveSlots;
-};
-
-struct JSExtendedClass {
-    JSClass             base;
-    JSEqualityOp        equality;
-    JSObjectOp          outerObject;
-    JSObjectOp          innerObject;
-    jsword              reserved0;
-    jsword              reserved1;
-    jsword              reserved2;
-    jsword              reserved3;
-    jsword              reserved4;
-};
-
-#define JSCLASS_HAS_PRIVATE             (1<<0)  /* objects have private slot */
-#define JSCLASS_NEW_ENUMERATE           (1<<1)  /* has JSNewEnumerateOp hook */
-#define JSCLASS_NEW_RESOLVE             (1<<2)  /* has JSNewResolveOp hook */
-#define JSCLASS_PRIVATE_IS_NSISUPPORTS  (1<<3)  /* private is (nsISupports *) */
-#define JSCLASS_SHARE_ALL_PROPERTIES    (1<<4)  /* all properties are SHARED */
-#define JSCLASS_NEW_RESOLVE_GETS_START  (1<<5)  /* JSNewResolveOp gets starting
-                                                   object in prototype chain
-                                                   passed in via *objp in/out
-                                                   parameter */
-#define JSCLASS_CONSTRUCT_PROTOTYPE     (1<<6)  /* call constructor on class
-                                                   prototype */
-#define JSCLASS_DOCUMENT_OBSERVER       (1<<7)  /* DOM document observer */
-
-/*
- * To reserve slots fetched and stored via JS_Get/SetReservedSlot, bitwise-or
- * JSCLASS_HAS_RESERVED_SLOTS(n) into the initializer for JSClass.flags, where
- * n is a constant in [1, 255].  Reserved slots are indexed from 0 to n-1.
- */
-#define JSCLASS_RESERVED_SLOTS_SHIFT    8       /* room for 8 flags below */
-#define JSCLASS_RESERVED_SLOTS_WIDTH    8       /* and 16 above this field */
-#define JSCLASS_RESERVED_SLOTS_MASK     JS_BITMASK(JSCLASS_RESERVED_SLOTS_WIDTH)
-#define JSCLASS_HAS_RESERVED_SLOTS(n)   (((n) & JSCLASS_RESERVED_SLOTS_MASK)  \
-                                         << JSCLASS_RESERVED_SLOTS_SHIFT)
-#define JSCLASS_RESERVED_SLOTS(clasp)   (((clasp)->flags                      \
-                                          >> JSCLASS_RESERVED_SLOTS_SHIFT)    \
-                                         & JSCLASS_RESERVED_SLOTS_MASK)
-
-#define JSCLASS_HIGH_FLAGS_SHIFT        (JSCLASS_RESERVED_SLOTS_SHIFT +       \
-                                         JSCLASS_RESERVED_SLOTS_WIDTH)
-
-/* True if JSClass is really a JSExtendedClass. */
-#define JSCLASS_IS_EXTENDED             (1<<(JSCLASS_HIGH_FLAGS_SHIFT+0))
-
-/* Initializer for unused members of statically initialized JSClass structs. */
-#define JSCLASS_NO_OPTIONAL_MEMBERS     0,0,0,0,0,0,0,0
-#define JSCLASS_NO_RESERVED_MEMBERS     0,0,0,0,0
-
-/* For detailed comments on these function pointer types, see jspubtd.h. */
-struct JSObjectOps {
-    /* Mandatory non-null function pointer members. */
-    JSNewObjectMapOp    newObjectMap;
-    JSObjectMapOp       destroyObjectMap;
-    JSLookupPropOp      lookupProperty;
-    JSDefinePropOp      defineProperty;
-    JSPropertyIdOp      getProperty;
-    JSPropertyIdOp      setProperty;
-    JSAttributesOp      getAttributes;
-    JSAttributesOp      setAttributes;
-    JSPropertyIdOp      deleteProperty;
-    JSConvertOp         defaultValue;
-    JSNewEnumerateOp    enumerate;
-    JSCheckAccessIdOp   checkAccess;
-
-    /* Optionally non-null members start here. */
-    JSObjectOp          thisObject;
-    JSPropertyRefOp     dropProperty;
-    JSNative            call;
-    JSNative            construct;
-    JSXDRObjectOp       xdrObject;
-    JSHasInstanceOp     hasInstance;
-    JSSetObjectSlotOp   setProto;
-    JSSetObjectSlotOp   setParent;
-    JSMarkOp            mark;
-    JSFinalizeOp        clear;
-    JSGetRequiredSlotOp getRequiredSlot;
-    JSSetRequiredSlotOp setRequiredSlot;
-};
-
-struct JSXMLObjectOps {
-    JSObjectOps         base;
-    JSGetMethodOp       getMethod;
-    JSSetMethodOp       setMethod;
-    JSEnumerateValuesOp enumerateValues;
-    JSEqualityOp        equality;
-    JSConcatenateOp     concatenate;
-};
-
-/*
- * Classes that expose JSObjectOps via a non-null getObjectOps class hook may
- * derive a property structure from this struct, return a pointer to it from
- * lookupProperty and defineProperty, and use the pointer to avoid rehashing
- * in getAttributes and setAttributes.
- *
- * The jsid type contains either an int jsval (see JSVAL_IS_INT above), or an
- * internal pointer that is opaque to users of this API, but which users may
- * convert from and to a jsval using JS_ValueToId and JS_IdToValue.
- */
-struct JSProperty {
-    jsid id;
-};
-
-struct JSIdArray {
-    jsint length;
-    jsid  vector[1];    /* actually, length jsid words */
-};
-
-extern JS_PUBLIC_API(void)
-JS_DestroyIdArray(JSContext *cx, JSIdArray *ida);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToId(JSContext *cx, jsval v, jsid *idp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IdToValue(JSContext *cx, jsid id, jsval *vp);
-
-/*
- * The magic XML namespace id is int-tagged, but not a valid integer jsval.
- * Global object classes in embeddings that enable JS_HAS_XML_SUPPORT (E4X)
- * should handle this id specially before converting id via JSVAL_TO_INT.
- */
-#define JS_DEFAULT_XML_NAMESPACE_ID ((jsid) JSVAL_VOID)
-
-/*
- * JSNewResolveOp flag bits.
- */
-#define JSRESOLVE_QUALIFIED     0x01    /* resolve a qualified property id */
-#define JSRESOLVE_ASSIGNING     0x02    /* resolve on the left of assignment */
-#define JSRESOLVE_DETECTING     0x04    /* 'if (o.p)...' or '(o.p) ?...:...' */
-#define JSRESOLVE_DECLARING     0x08    /* var, const, or function prolog op */
-#define JSRESOLVE_CLASSNAME     0x10    /* class name used when constructing */
-
-extern JS_PUBLIC_API(JSBool)
-JS_PropertyStub(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EnumerateStub(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ResolveStub(JSContext *cx, JSObject *obj, jsval id);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertStub(JSContext *cx, JSObject *obj, JSType type, jsval *vp);
-
-extern JS_PUBLIC_API(void)
-JS_FinalizeStub(JSContext *cx, JSObject *obj);
-
-struct JSConstDoubleSpec {
-    jsdouble        dval;
-    const char      *name;
-    uint8           flags;
-    uint8           spare[3];
-};
-
-/*
- * To define an array element rather than a named property member, cast the
- * element's index to (const char *) and initialize name with it, and set the
- * JSPROP_INDEX bit in flags.
- */
-struct JSPropertySpec {
-    const char      *name;
-    int8            tinyid;
-    uint8           flags;
-    JSPropertyOp    getter;
-    JSPropertyOp    setter;
-};
-
-struct JSFunctionSpec {
-    const char      *name;
-    JSNative        call;
-    uint8           nargs;
-    uint8           flags;
-    uint16          extra;      /* number of arg slots for local GC roots */
-};
-
-extern JS_PUBLIC_API(JSObject *)
-JS_InitClass(JSContext *cx, JSObject *obj, JSObject *parent_proto,
-             JSClass *clasp, JSNative constructor, uintN nargs,
-             JSPropertySpec *ps, JSFunctionSpec *fs,
-             JSPropertySpec *static_ps, JSFunctionSpec *static_fs);
-
-#ifdef JS_THREADSAFE
-extern JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSContext *cx, JSObject *obj);
-
-#define JS_GET_CLASS(cx,obj) JS_GetClass(cx, obj)
-#else
-extern JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSObject *obj);
-
-#define JS_GET_CLASS(cx,obj) JS_GetClass(obj)
-#endif
-
-extern JS_PUBLIC_API(JSBool)
-JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
-
-extern JS_PUBLIC_API(void *)
-JS_GetPrivate(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetPrivate(JSContext *cx, JSObject *obj, void *data);
-
-extern JS_PUBLIC_API(void *)
-JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp,
-                      jsval *argv);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetPrototype(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetParent(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetConstructor(JSContext *cx, JSObject *proto);
-
-/*
- * Get a unique identifier for obj, good for the lifetime of obj (even if it
- * is moved by a copying GC).  Return false on failure (likely out of memory),
- * and true with *idp containing the unique id on success.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SealObject(JSContext *cx, JSObject *obj, JSBool deep);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
-                   JSObject *parent);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_ConstructObjectWithArguments(JSContext *cx, JSClass *clasp, JSObject *proto,
-                                JSObject *parent, uintN argc, jsval *argv);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_DefineObject(JSContext *cx, JSObject *obj, const char *name, JSClass *clasp,
-                JSObject *proto, uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineConstDoubles(JSContext *cx, JSObject *obj, JSConstDoubleSpec *cds);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineProperties(JSContext *cx, JSObject *obj, JSPropertySpec *ps);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
-                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
-
-/*
- * Determine the attributes (JSPROP_* flags) of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and the value of *attrsp is undefined.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN *attrsp, JSBool *foundp);
-
-/*
- * The same, but if the property is native, return its getter and setter via
- * *getterp and *setterp, respectively (and only if the out parameter pointer
- * is not null).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                   const char *name,
-                                   uintN *attrsp, JSBool *foundp,
-                                   JSPropertyOp *getterp,
-                                   JSPropertyOp *setterp);
-
-/*
- * Set the attributes of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and nothing will be altered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_SetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN attrs, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,
-                            int8 tinyid, jsval value,
-                            JSPropertyOp getter, JSPropertyOp setter,
-                            uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AliasProperty(JSContext *cx, JSObject *obj, const char *name,
-                 const char *alias);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasProperty(JSContext *cx, JSObject *obj, const char *name, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, const char *name,
-                           uintN flags, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetMethod(JSContext *cx, JSObject *obj, const char *name, JSObject **objp,
-             jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteProperty(JSContext *cx, JSObject *obj, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteProperty2(JSContext *cx, JSObject *obj, const char *name,
-                   jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, jsval value,
-                    JSPropertyOp getter, JSPropertyOp setter,
-                    uintN attrs);
-
-/*
- * Determine the attributes (JSPROP_* flags) of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and the value of *attrsp is undefined.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN *attrsp, JSBool *foundp);
-
-/*
- * The same, but if the property is native, return its getter and setter via
- * *getterp and *setterp, respectively (and only if the out parameter pointer
- * is not null).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                     const jschar *name, size_t namelen,
-                                     uintN *attrsp, JSBool *foundp,
-                                     JSPropertyOp *getterp,
-                                     JSPropertyOp *setterp);
-
-/*
- * Set the attributes of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and nothing will be altered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_SetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN attrs, JSBool *foundp);
-
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,
-                              const jschar *name, size_t namelen,
-                              int8 tinyid, jsval value,
-                              JSPropertyOp getter, JSPropertyOp setter,
-                              uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 JSBool *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen,
-                    jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteUCProperty2(JSContext *cx, JSObject *obj,
-                     const jschar *name, size_t namelen,
-                     jsval *rval);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewArrayObject(JSContext *cx, jsint length, jsval *vector);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsArrayObject(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetArrayLength(JSContext *cx, JSObject *obj, jsuint length);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,
-                 JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasElement(JSContext *cx, JSObject *obj, jsint index, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteElement(JSContext *cx, JSObject *obj, jsint index);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteElement2(JSContext *cx, JSObject *obj, jsint index, jsval *rval);
-
-extern JS_PUBLIC_API(void)
-JS_ClearScope(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSIdArray *)
-JS_Enumerate(JSContext *cx, JSObject *obj);
-
-/*
- * Create an object to iterate over enumerable properties of obj, in arbitrary
- * property definition order.  NB: This differs from longstanding for..in loop
- * order, which uses order of property definition in obj.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_NewPropertyIterator(JSContext *cx, JSObject *obj);
-
-/*
- * Return true on success with *idp containing the id of the next enumerable
- * property to visit using iterobj, or JSVAL_VOID if there is no such property
- * left to visit.  Return false on error.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_NextProperty(JSContext *cx, JSObject *iterobj, jsid *idp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-               jsval *vp, uintN *attrsp);
-
-extern JS_PUBLIC_API(JSCheckAccessOp)
-JS_SetCheckObjectAccessCallback(JSRuntime *rt, JSCheckAccessOp acb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval v);
-
-/************************************************************************/
-
-/*
- * Security protocol.
- */
-struct JSPrincipals {
-    char *codebase;
-
-    /* XXX unspecified and unused by Mozilla code -- can we remove these? */
-    void * (* JS_DLL_CALLBACK getPrincipalArray)(JSContext *cx, JSPrincipals *);
-    JSBool (* JS_DLL_CALLBACK globalPrivilegesEnabled)(JSContext *cx, JSPrincipals *);
-
-    /* Don't call "destroy"; use reference counting macros below. */
-    jsrefcount refcount;
-
-    void   (* JS_DLL_CALLBACK destroy)(JSContext *cx, JSPrincipals *);
-    JSBool (* JS_DLL_CALLBACK subsume)(JSPrincipals *, JSPrincipals *);
-};
-
-#ifdef JS_THREADSAFE
-#define JSPRINCIPALS_HOLD(cx, principals)   JS_HoldPrincipals(cx,principals)
-#define JSPRINCIPALS_DROP(cx, principals)   JS_DropPrincipals(cx,principals)
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_HoldPrincipals(JSContext *cx, JSPrincipals *principals);
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_DropPrincipals(JSContext *cx, JSPrincipals *principals);
-
-#else
-#define JSPRINCIPALS_HOLD(cx, principals)   (++(principals)->refcount)
-#define JSPRINCIPALS_DROP(cx, principals)                                     \
-    ((--(principals)->refcount == 0)                                          \
-     ? ((*(principals)->destroy)((cx), (principals)), 0)                      \
-     : (principals)->refcount)
-#endif
-
-extern JS_PUBLIC_API(JSPrincipalsTranscoder)
-JS_SetPrincipalsTranscoder(JSRuntime *rt, JSPrincipalsTranscoder px);
-
-extern JS_PUBLIC_API(JSObjectPrincipalsFinder)
-JS_SetObjectPrincipalsFinder(JSRuntime *rt, JSObjectPrincipalsFinder fop);
-
-/************************************************************************/
-
-/*
- * Functions and scripts.
- */
-extern JS_PUBLIC_API(JSFunction *)
-JS_NewFunction(JSContext *cx, JSNative call, uintN nargs, uintN flags,
-               JSObject *parent, const char *name);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFunctionObject(JSFunction *fun);
-
-/*
- * Deprecated, useful only for diagnostics.  Use JS_GetFunctionId instead for
- * anonymous vs. "anonymous" disambiguation and Unicode fidelity.
- */
-extern JS_PUBLIC_API(const char *)
-JS_GetFunctionName(JSFunction *fun);
-
-/*
- * Return the function's identifier as a JSString, or null if fun is unnamed.
- * The returned string lives as long as fun, so you don't need to root a saved
- * reference to it if fun is well-connected or rooted, and provided you bound
- * the use of the saved reference by fun's lifetime.
- *
- * Prefer JS_GetFunctionId over JS_GetFunctionName because it returns null for
- * truly anonymous functions, and because it doesn't chop to ISO-Latin-1 chars
- * from UTF-16-ish jschars.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_GetFunctionId(JSFunction *fun);
-
-/*
- * Return JSFUN_* flags for fun.
- */
-extern JS_PUBLIC_API(uintN)
-JS_GetFunctionFlags(JSFunction *fun);
-
-/*
- * Infallible predicate to test whether obj is a function object (faster than
- * comparing obj's class name to "Function", but equivalent unless someone has
- * overwritten the "Function" identifier with a different constructor and then
- * created instances using that constructor that might be passed in as obj).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ObjectIsFunction(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineFunctions(JSContext *cx, JSObject *obj, JSFunctionSpec *fs);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_DefineFunction(JSContext *cx, JSObject *obj, const char *name, JSNative call,
-                  uintN nargs, uintN attrs);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_DefineUCFunction(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, JSNative call,
-                    uintN nargs, uintN attrs);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent);
-
-/*
- * Given a buffer, return JS_FALSE if the buffer might become a valid
- * javascript statement with the addition of more lines.  Otherwise return
- * JS_TRUE.  The intent is to support interactive compilation - accumulate
- * lines in a buffer until JS_BufferIsCompilableUnit is true, then pass it to
- * the compiler.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_BufferIsCompilableUnit(JSContext *cx, JSObject *obj,
-                          const char *bytes, size_t length);
-
-/*
- * The JSScript objects returned by the following functions refer to string and
- * other kinds of literals, including doubles and RegExp objects.  These
- * literals are vulnerable to garbage collection; to root script objects and
- * prevent literals from being collected, create a rootable object using
- * JS_NewScriptObject, and root the resulting object using JS_Add[Named]Root.
- */
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileScript(JSContext *cx, JSObject *obj,
-                 const char *bytes, size_t length,
-                 const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileScriptForPrincipals(JSContext *cx, JSObject *obj,
-                              JSPrincipals *principals,
-                              const char *bytes, size_t length,
-                              const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileUCScript(JSContext *cx, JSObject *obj,
-                   const jschar *chars, size_t length,
-                   const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals,
-                                const jschar *chars, size_t length,
-                                const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFile(JSContext *cx, JSObject *obj, const char *filename);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandle(JSContext *cx, JSObject *obj, const char *filename,
-                     FILE *fh);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandleForPrincipals(JSContext *cx, JSObject *obj,
-                                  const char *filename, FILE *fh,
-                                  JSPrincipals *principals);
-
-/*
- * NB: you must use JS_NewScriptObject and root a pointer to its return value
- * in order to keep a JSScript and its atoms safe from garbage collection after
- * creating the script via JS_Compile* and before a JS_ExecuteScript* call.
- * E.g., and without error checks:
- *
- *    JSScript *script = JS_CompileFile(cx, global, filename);
- *    JSObject *scrobj = JS_NewScriptObject(cx, script);
- *    JS_AddNamedRoot(cx, &scrobj, "scrobj");
- *    do {
- *        jsval result;
- *        JS_ExecuteScript(cx, global, script, &result);
- *        JS_GC();
- *    } while (!JSVAL_IS_BOOLEAN(result) || JSVAL_TO_BOOLEAN(result));
- *    JS_RemoveRoot(cx, &scrobj);
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_NewScriptObject(JSContext *cx, JSScript *script);
-
-/*
- * Infallible getter for a script's object.  If JS_NewScriptObject has not been
- * called on script yet, the return value will be null.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetScriptObject(JSScript *script);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyScript(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileFunction(JSContext *cx, JSObject *obj, const char *name,
-                   uintN nargs, const char **argnames,
-                   const char *bytes, size_t length,
-                   const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals, const char *name,
-                                uintN nargs, const char **argnames,
-                                const char *bytes, size_t length,
-                                const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunction(JSContext *cx, JSObject *obj, const char *name,
-                     uintN nargs, const char **argnames,
-                     const jschar *chars, size_t length,
-                     const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                  JSPrincipals *principals, const char *name,
-                                  uintN nargs, const char **argnames,
-                                  const jschar *chars, size_t length,
-                                  const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileScript(JSContext *cx, JSScript *script, const char *name,
-                   uintN indent);
-
-/*
- * API extension: OR this into indent to avoid pretty-printing the decompiled
- * source resulting from JS_DecompileFunction{,Body}.
- */
-#define JS_DONT_PRETTY_PRINT    ((uintN)0x8000)
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileFunction(JSContext *cx, JSFunction *fun, uintN indent);
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileFunctionBody(JSContext *cx, JSFunction *fun, uintN indent);
-
-/*
- * NB: JS_ExecuteScript, JS_ExecuteScriptPart, and the JS_Evaluate*Script*
- * quadruplets all use the obj parameter as the initial scope chain header,
- * the 'this' keyword value, and the variables object (ECMA parlance for where
- * 'var' and 'function' bind names) of the execution context for script.
- *
- * Using obj as the variables object is problematic if obj's parent (which is
- * the scope chain link; see JS_SetParent and JS_NewObject) is not null: in
- * this case, variables created by 'var x = 0', e.g., go in obj, but variables
- * created by assignment to an unbound id, 'x = 0', go in the last object on
- * the scope chain linked by parent.
- *
- * ECMA calls that last scoping object the "global object", but note that many
- * embeddings have several such objects.  ECMA requires that "global code" be
- * executed with the variables object equal to this global object.  But these
- * JS API entry points provide freedom to execute code against a "sub-global",
- * i.e., a parented or scoped object, in which case the variables object will
- * differ from the last object on the scope chain, resulting in confusing and
- * non-ECMA explicit vs. implicit variable creation.
- *
- * Caveat embedders: unless you already depend on this buggy variables object
- * binding behavior, you should call JS_SetOptions(cx, JSOPTION_VAROBJFIX) or
- * JS_SetOptions(cx, JS_GetOptions(cx) | JSOPTION_VAROBJFIX) -- the latter if
- * someone may have set other options on cx already -- for each context in the
- * application, if you pass parented objects as the obj parameter, or may ever
- * pass such objects in the future.
- *
- * Why a runtime option?  The alternative is to add six or so new API entry
- * points with signatures matching the following six, and that doesn't seem
- * worth the code bloat cost.  Such new entry points would probably have less
- * obvious names, too, so would not tend to be used.  The JS_SetOption call,
- * OTOH, can be more easily hacked into existing code that does not depend on
- * the bug; such code can continue to use the familiar JS_EvaluateScript,
- * etc., entry points.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ExecuteScript(JSContext *cx, JSObject *obj, JSScript *script, jsval *rval);
-
-/*
- * Execute either the function-defining prolog of a script, or the script's
- * main body, but not both.
- */
-typedef enum JSExecPart { JSEXEC_PROLOG, JSEXEC_MAIN } JSExecPart;
-
-extern JS_PUBLIC_API(JSBool)
-JS_ExecuteScriptPart(JSContext *cx, JSObject *obj, JSScript *script,
-                     JSExecPart part, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateScript(JSContext *cx, JSObject *obj,
-                  const char *bytes, uintN length,
-                  const char *filename, uintN lineno,
-                  jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
-                               JSPrincipals *principals,
-                               const char *bytes, uintN length,
-                               const char *filename, uintN lineno,
-                               jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScript(JSContext *cx, JSObject *obj,
-                    const jschar *chars, uintN length,
-                    const char *filename, uintN lineno,
-                    jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                 JSPrincipals *principals,
-                                 const jschar *chars, uintN length,
-                                 const char *filename, uintN lineno,
-                                 jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunction(JSContext *cx, JSObject *obj, JSFunction *fun, uintN argc,
-                jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunctionName(JSContext *cx, JSObject *obj, const char *name, uintN argc,
-                    jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
-                     jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBranchCallback)
-JS_SetBranchCallback(JSContext *cx, JSBranchCallback cb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsRunning(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsConstructing(JSContext *cx);
-
-/*
- * Returns true if a script is executing and its current bytecode is a set
- * (assignment) operation, even if there are native (no script) stack frames
- * between the script and the caller to JS_IsAssigning.
- */
-extern JS_FRIEND_API(JSBool)
-JS_IsAssigning(JSContext *cx);
-
-/*
- * Set the second return value, which should be a string or int jsval that
- * identifies a property in the returned object, to form an ECMA reference
- * type value (obj, id).  Only native methods can return reference types,
- * and if the returned value is used on the left-hand side of an assignment
- * op, the identified property will be set.  If the return value is in an
- * r-value, the interpreter just gets obj[id]'s value.
- */
-extern JS_PUBLIC_API(void)
-JS_SetCallReturnValue2(JSContext *cx, jsval v);
-
-/************************************************************************/
-
-/*
- * Strings.
- *
- * NB: JS_NewString takes ownership of bytes on success, avoiding a copy; but
- * on error (signified by null return), it leaves bytes owned by the caller.
- * So the caller must free bytes in the error case, if it has no use for them.
- * In contrast, all the JS_New*StringCopy* functions do not take ownership of
- * the character memory passed to them -- they copy it.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewString(JSContext *cx, char *bytes, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewStringCopyN(JSContext *cx, const char *s, size_t n);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewStringCopyZ(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternString(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCString(JSContext *cx, jschar *chars, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyN(JSContext *cx, const jschar *s, size_t n);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyZ(JSContext *cx, const jschar *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternUCStringN(JSContext *cx, const jschar *s, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternUCString(JSContext *cx, const jschar *s);
-
-extern JS_PUBLIC_API(char *)
-JS_GetStringBytes(JSString *str);
-
-extern JS_PUBLIC_API(jschar *)
-JS_GetStringChars(JSString *str);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetStringLength(JSString *str);
-
-extern JS_PUBLIC_API(intN)
-JS_CompareStrings(JSString *str1, JSString *str2);
-
-/*
- * Mutable string support.  A string's characters are never mutable in this JS
- * implementation, but a growable string has a buffer that can be reallocated,
- * and a dependent string is a substring of another (growable, dependent, or
- * immutable) string.  The direct data members of the (opaque to API clients)
- * JSString struct may be changed in a single-threaded way for growable and
- * dependent strings.
- *
- * Therefore mutable strings cannot be used by more than one thread at a time.
- * You may call JS_MakeStringImmutable to convert the string from a mutable
- * (growable or dependent) string to an immutable (and therefore thread-safe)
- * string.  The engine takes care of converting growable and dependent strings
- * to immutable for you if you store strings in multi-threaded objects using
- * JS_SetProperty or kindred API entry points.
- *
- * If you store a JSString pointer in a native data structure that is (safely)
- * accessible to multiple threads, you must call JS_MakeStringImmutable before
- * retiring the store.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewGrowableString(JSContext *cx, jschar *chars, size_t length);
-
-/*
- * Create a dependent string, i.e., a string that owns no character storage,
- * but that refers to a slice of another string's chars.  Dependent strings
- * are mutable by definition, so the thread safety comments above apply.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewDependentString(JSContext *cx, JSString *str, size_t start,
-                      size_t length);
-
-/*
- * Concatenate two strings, resulting in a new growable string.  If you create
- * the left string and pass it to JS_ConcatStrings on a single thread, try to
- * use JS_NewGrowableString to create the left string -- doing so helps Concat
- * avoid allocating a new buffer for the result and copying left's chars into
- * the new buffer.  See above for thread safety comments.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_ConcatStrings(JSContext *cx, JSString *left, JSString *right);
-
-/*
- * Convert a dependent string into an independent one.  This function does not
- * change the string's mutability, so the thread safety comments above apply.
- */
-extern JS_PUBLIC_API(const jschar *)
-JS_UndependString(JSContext *cx, JSString *str);
-
-/*
- * Convert a mutable string (either growable or dependent) into an immutable,
- * thread-safe one.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_MakeStringImmutable(JSContext *cx, JSString *str);
-
-/*
- * Return JS_TRUE if C (char []) strings passed via the API and internally
- * are UTF-8. The source must be compiled with JS_C_STRINGS_ARE_UTF8 defined
- * to get UTF-8 support.
- */
-JS_PUBLIC_API(JSBool)
-#ifdef OSSP /* CLEANUP */
-JS_CStringsAreUTF8(void);
-#else
-JS_CStringsAreUTF8();
-#endif
-
-/*
- * Character encoding support.
- *
- * For both JS_EncodeCharacters and JS_DecodeBytes, set *dstlenp to the size
- * of the destination buffer before the call; on return, *dstlenp contains the
- * number of bytes (JS_EncodeCharacters) or jschars (JS_DecodeBytes) actually
- * stored.  To determine the necessary destination buffer size, make a sizing
- * call that passes NULL for dst.
- *
- * On errors, the functions report the error. In that case, *dstlenp contains
- * the number of characters or bytes transferred so far.  If cx is NULL, no
- * error is reported on failure, and the functions simply return JS_FALSE.
- *
- * NB: Neither function stores an additional zero byte or jschar after the
- * transcoded string.
- *
- * If the source has been compiled with the #define JS_C_STRINGS_ARE_UTF8 to
- * enable UTF-8 interpretation of C char[] strings, then JS_EncodeCharacters
- * encodes to UTF-8, and JS_DecodeBytes decodes from UTF-8, which may create
- * addititional errors if the character sequence is malformed.  If UTF-8
- * support is disabled, the functions deflate and inflate, respectively.
- */
-JS_PUBLIC_API(JSBool)
-JS_EncodeCharacters(JSContext *cx, const jschar *src, size_t srclen, char *dst,
-                    size_t *dstlenp);
-
-JS_PUBLIC_API(JSBool)
-JS_DecodeBytes(JSContext *cx, const char *src, size_t srclen, jschar *dst,
-               size_t *dstlenp);
-
-/************************************************************************/
-
-/*
- * Locale specific string conversion and error message callbacks.
- */
-struct JSLocaleCallbacks {
-    JSLocaleToUpperCase     localeToUpperCase;
-    JSLocaleToLowerCase     localeToLowerCase;
-    JSLocaleCompare         localeCompare;
-    JSLocaleToUnicode       localeToUnicode;
-    JSErrorCallback         localeGetErrorMessage;
-};
-
-/*
- * Establish locale callbacks. The pointer must persist as long as the
- * JSContext.  Passing NULL restores the default behaviour.
- */
-extern JS_PUBLIC_API(void)
-JS_SetLocaleCallbacks(JSContext *cx, JSLocaleCallbacks *callbacks);
-
-/*
- * Return the address of the current locale callbacks struct, which may
- * be NULL.
- */
-extern JS_PUBLIC_API(JSLocaleCallbacks *)
-JS_GetLocaleCallbacks(JSContext *cx);
-
-/************************************************************************/
-
-/*
- * Error reporting.
- */
-
-/*
- * Report an exception represented by the sprintf-like conversion of format
- * and its arguments.  This exception message string is passed to a pre-set
- * JSErrorReporter function (set by JS_SetErrorReporter; see jspubtd.h for
- * the JSErrorReporter typedef).
- */
-extern JS_PUBLIC_API(void)
-JS_ReportError(JSContext *cx, const char *format, ...);
-
-/*
- * Use an errorNumber to retrieve the format string, args are char *
- */
-extern JS_PUBLIC_API(void)
-JS_ReportErrorNumber(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...);
-
-/*
- * Use an errorNumber to retrieve the format string, args are jschar *
- */
-extern JS_PUBLIC_API(void)
-JS_ReportErrorNumberUC(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...);
-
-/*
- * As above, but report a warning instead (JSREPORT_IS_WARNING(report.flags)).
- * Return true if there was no error trying to issue the warning, and if the
- * warning was not converted into an error due to the JSOPTION_WERROR option
- * being set, false otherwise.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ReportWarning(JSContext *cx, const char *format, ...);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumber(JSContext *cx, uintN flags,
-                             JSErrorCallback errorCallback, void *userRef,
-                             const uintN errorNumber, ...);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumberUC(JSContext *cx, uintN flags,
-                               JSErrorCallback errorCallback, void *userRef,
-                               const uintN errorNumber, ...);
-
-/*
- * Complain when out of memory.
- */
-extern JS_PUBLIC_API(void)
-JS_ReportOutOfMemory(JSContext *cx);
-
-struct JSErrorReport {
-    const char      *filename;      /* source file name, URL, etc., or null */
-    uintN           lineno;         /* source line number */
-    const char      *linebuf;       /* offending source line without final \n */
-    const char      *tokenptr;      /* pointer to error token in linebuf */
-    const jschar    *uclinebuf;     /* unicode (original) line buffer */
-    const jschar    *uctokenptr;    /* unicode (original) token pointer */
-    uintN           flags;          /* error/warning, etc. */
-    uintN           errorNumber;    /* the error number, e.g. see js.msg */
-    const jschar    *ucmessage;     /* the (default) error message */
-    const jschar    **messageArgs;  /* arguments for the error message */
-};
-
-/*
- * JSErrorReport flag values.  These may be freely composed.
- */
-#define JSREPORT_ERROR      0x0     /* pseudo-flag for default case */
-#define JSREPORT_WARNING    0x1     /* reported via JS_ReportWarning */
-#define JSREPORT_EXCEPTION  0x2     /* exception was thrown */
-#define JSREPORT_STRICT     0x4     /* error or warning due to strict option */
-
-/*
- * If JSREPORT_EXCEPTION is set, then a JavaScript-catchable exception
- * has been thrown for this runtime error, and the host should ignore it.
- * Exception-aware hosts should also check for JS_IsExceptionPending if
- * JS_ExecuteScript returns failure, and signal or propagate the exception, as
- * appropriate.
- */
-#define JSREPORT_IS_WARNING(flags)      (((flags) & JSREPORT_WARNING) != 0)
-#define JSREPORT_IS_EXCEPTION(flags)    (((flags) & JSREPORT_EXCEPTION) != 0)
-#define JSREPORT_IS_STRICT(flags)       (((flags) & JSREPORT_STRICT) != 0)
-
-extern JS_PUBLIC_API(JSErrorReporter)
-JS_SetErrorReporter(JSContext *cx, JSErrorReporter er);
-
-/************************************************************************/
-
-/*
- * Regular Expressions.
- */
-#define JSREG_FOLD      0x01    /* fold uppercase to lowercase */
-#define JSREG_GLOB      0x02    /* global exec, creates array of matches */
-#define JSREG_MULTILINE 0x04    /* treat ^ and $ as begin and end of line */
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewRegExpObject(JSContext *cx, char *bytes, size_t length, uintN flags);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewUCRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags);
-
-extern JS_PUBLIC_API(void)
-JS_SetRegExpInput(JSContext *cx, JSString *input, JSBool multiline);
-
-extern JS_PUBLIC_API(void)
-JS_ClearRegExpStatics(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_ClearRegExpRoots(JSContext *cx);
-
-/* TODO: compile, exec, get/set other statics... */
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsExceptionPending(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPendingException(JSContext *cx, jsval *vp);
-
-extern JS_PUBLIC_API(void)
-JS_SetPendingException(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(void)
-JS_ClearPendingException(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportPendingException(JSContext *cx);
-
-/*
- * Save the current exception state.  This takes a snapshot of cx's current
- * exception state without making any change to that state.
- *
- * The returned state pointer MUST be passed later to JS_RestoreExceptionState
- * (to restore that saved state, overriding any more recent state) or else to
- * JS_DropExceptionState (to free the state struct in case it is not correct
- * or desirable to restore it).  Both Restore and Drop free the state struct,
- * so callers must stop using the pointer returned from Save after calling the
- * Release or Drop API.
- */
-extern JS_PUBLIC_API(JSExceptionState *)
-JS_SaveExceptionState(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_RestoreExceptionState(JSContext *cx, JSExceptionState *state);
-
-extern JS_PUBLIC_API(void)
-JS_DropExceptionState(JSContext *cx, JSExceptionState *state);
-
-/*
- * If the given value is an exception object that originated from an error,
- * the exception will contain an error report struct, and this API will return
- * the address of that struct.  Otherwise, it returns NULL.  The lifetime of
- * the error report struct that might be returned is the same as the lifetime
- * of the exception object.
- */
-extern JS_PUBLIC_API(JSErrorReport *)
-JS_ErrorFromException(JSContext *cx, jsval v);
-
-/*
- * Given a reported error's message and JSErrorReport struct pointer, throw
- * the corresponding exception on cx.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ThrowReportedError(JSContext *cx, const char *message,
-                      JSErrorReport *reportp);
-
-#ifdef JS_THREADSAFE
-
-/*
- * Associate the current thread with the given context.  This is done
- * implicitly by JS_NewContext.
- *
- * Returns the old thread id for this context, which should be treated as
- * an opaque value.  This value is provided for comparison to 0, which
- * indicates that ClearContextThread has been called on this context
- * since the last SetContextThread, or non-0, which indicates the opposite.
- */
-extern JS_PUBLIC_API(jsword)
-JS_GetContextThread(JSContext *cx);
-
-extern JS_PUBLIC_API(jsword)
-JS_SetContextThread(JSContext *cx);
-
-extern JS_PUBLIC_API(jsword)
-JS_ClearContextThread(JSContext *cx);
-
-#endif /* JS_THREADSAFE */
-
-/************************************************************************/
-
-JS_END_EXTERN_C
-
-#endif /* jsapi_h___ */
diff --git a/libs/js/src/jsarena.c b/libs/js/src/jsarena.c
deleted file mode 100644
index c7ea0c11b8..0000000000
--- a/libs/js/src/jsarena.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Lifetime-based fast allocation, inspired by much prior art, including
- * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jslock.h"
-
-static JSArena *arena_freelist;
-
-#ifdef JS_THREADSAFE
-static JSLock *arena_freelist_lock;
-#endif
-
-#ifdef JS_ARENAMETER
-static JSArenaStats *arena_stats_list;
-
-#define COUNT(pool,what)  (pool)->stats.what++
-#else
-#define COUNT(pool,what)  /* nothing */
-#endif
-
-#define JS_ARENA_DEFAULT_ALIGN  sizeof(double)
-
-JS_PUBLIC_API(void)
-JS_InitArenaPool(JSArenaPool *pool, const char *name, size_t size, size_t align)
-{
-#ifdef JS_THREADSAFE
-    /* Must come through here once in primordial thread to init safely! */
-    if (!arena_freelist_lock) {
-        arena_freelist_lock = JS_NEW_LOCK();
-        JS_ASSERT(arena_freelist_lock);
-    }
-#endif
-    if (align == 0)
-        align = JS_ARENA_DEFAULT_ALIGN;
-    pool->mask = JS_BITMASK(JS_CeilingLog2(align));
-    pool->first.next = NULL;
-    pool->first.base = pool->first.avail = pool->first.limit =
-        JS_ARENA_ALIGN(pool, &pool->first + 1);
-    pool->current = &pool->first;
-    pool->arenasize = size;
-#ifdef JS_ARENAMETER
-    memset(&pool->stats, 0, sizeof pool->stats);
-    pool->stats.name = strdup(name);
-    pool->stats.next = arena_stats_list;
-    arena_stats_list = &pool->stats;
-#endif
-}
-
-/*
- * An allocation that consumes more than pool->arenasize also has a header
- * pointing back to its previous arena's next member.  This header is not
- * included in [a->base, a->limit), so its space can't be wrongly claimed.
- *
- * As the header is a pointer, it must be well-aligned.  If pool->mask is
- * greater than or equal to POINTER_MASK, the header just preceding a->base
- * for an oversized arena a is well-aligned, because a->base is well-aligned.
- * However, we may need to add more space to pad the JSArena ** back-pointer
- * so that it lies just behind a->base, because a might not be aligned such
- * that (jsuword)(a + 1) is on a pointer boundary.
- *
- * By how much must we pad?  Let M be the alignment modulus for pool and P
- * the modulus for a pointer.  Given M >= P, the greatest distance between a
- * pointer aligned on an M boundary and one aligned on a P boundary is M-P.
- * If M and P are powers of two, then M-P = (pool->mask - POINTER_MASK).
- *
- * How much extra padding might spill over unused into the remainder of the
- * allocation, in the worst case (where M > P)?
- *
- * If we add M-P to the nominal back-pointer address and then round down to
- * align on a P boundary, we will use at most M-P bytes of padding, and at
- * least P (M > P => M >= 2P; M == 2P gives the least padding, P).  So if we
- * use P bytes of padding, then we will overallocate a by P+M-1 bytes, as we
- * also add M-1 to the estimated size in case malloc returns an odd pointer.
- * a->limit must include this overestimation to satisfy a->avail in [a->base,
- * a->limit].
- *
- * Similarly, if pool->mask is less than POINTER_MASK, we must include enough
- * space in the header size to align the back-pointer on a P boundary so that
- * it can be found by subtracting P from a->base.  This means a->base must be
- * on a P boundary, even though subsequent allocations from a may be aligned
- * on a lesser (M) boundary.  Given powers of two M and P as above, the extra
- * space needed when P > M is P-M or POINTER_MASK - pool->mask.
- *
- * The size of a header including padding is given by the HEADER_SIZE macro,
- * below, for any pool (for any value of M).
- *
- * The mask to align a->base for any pool is (pool->mask | POINTER_MASK), or
- * HEADER_BASE_MASK(pool).
- *
- * PTR_TO_HEADER computes the address of the back-pointer, given an oversized
- * allocation at p.  By definition, p must be a->base for the arena a that
- * contains p.  GET_HEADER and SET_HEADER operate on an oversized arena a, in
- * the case of SET_HEADER with back-pointer ap.
- */
-#define POINTER_MASK            ((jsuword)(JS_ALIGN_OF_POINTER - 1))
-#define HEADER_SIZE(pool)       (sizeof(JSArena **)                           \
-                                 + (((pool)->mask < POINTER_MASK)             \
-                                    ? POINTER_MASK - (pool)->mask             \
-                                    : (pool)->mask - POINTER_MASK))
-#define HEADER_BASE_MASK(pool)  ((pool)->mask | POINTER_MASK)
-#define PTR_TO_HEADER(pool,p)   (JS_ASSERT(((jsuword)(p)                      \
-                                            & HEADER_BASE_MASK(pool))         \
-                                           == 0),                             \
-                                 (JSArena ***)(p) - 1)
-#define GET_HEADER(pool,a)      (*PTR_TO_HEADER(pool, (a)->base))
-#define SET_HEADER(pool,a,ap)   (*PTR_TO_HEADER(pool, (a)->base) = (ap))
-
-JS_PUBLIC_API(void *)
-JS_ArenaAllocate(JSArenaPool *pool, size_t nb)
-{
-    JSArena **ap, **bp, *a, *b;
-    jsuword extra, hdrsz, gross, sz;
-    void *p;
-
-    /*
-     * Search pool from current forward till we find or make enough space.
-     *
-     * NB: subtract nb from a->limit in the loop condition, instead of adding
-     * nb to a->avail, to avoid overflowing a 32-bit address space (possible
-     * when running a 32-bit program on a 64-bit system where the kernel maps
-     * the heap up against the top of the 32-bit address space).
-     *
-     * Thanks to Juergen Kreileder <jk@blackdown.de>, who brought this up in
-     * https://bugzilla.mozilla.org/show_bug.cgi?id=279273.
-     */
-    JS_ASSERT((nb & pool->mask) == 0);
-    for (a = pool->current; a->avail > a->limit - nb; pool->current = a) {
-        ap = &a->next;
-        if (!*ap) {
-            /* Not enough space in pool -- try to reclaim a free arena. */
-            extra = (nb > pool->arenasize) ? HEADER_SIZE(pool) : 0;
-            hdrsz = sizeof *a + extra + pool->mask;
-            gross = hdrsz + JS_MAX(nb, pool->arenasize);
-            bp = &arena_freelist;
-            JS_ACQUIRE_LOCK(arena_freelist_lock);
-            while ((b = *bp) != NULL) {
-                /*
-                 * Insist on exact arenasize match to avoid leaving alloc'able
-                 * space after an oversized allocation as it grows.
-                 */
-                sz = JS_UPTRDIFF(b->limit, b);
-                if (sz == gross) {
-                    *bp = b->next;
-                    JS_RELEASE_LOCK(arena_freelist_lock);
-                    b->next = NULL;
-                    COUNT(pool, nreclaims);
-                    goto claim;
-                }
-                bp = &b->next;
-            }
-
-            /* Nothing big enough on the freelist, so we must malloc. */
-            JS_RELEASE_LOCK(arena_freelist_lock);
-            b = (JSArena *) malloc(gross);
-            if (!b)
-                return 0;
-            b->next = NULL;
-            b->limit = (jsuword)b + gross;
-            JS_COUNT_ARENA(pool,++);
-            COUNT(pool, nmallocs);
-
-        claim:
-            /* If oversized, store ap in the header, just before a->base. */
-            *ap = a = b;
-            JS_ASSERT(gross <= JS_UPTRDIFF(a->limit, a));
-            if (extra) {
-                a->base = a->avail =
-                    ((jsuword)a + hdrsz) & ~HEADER_BASE_MASK(pool);
-                SET_HEADER(pool, a, ap);
-            } else {
-                a->base = a->avail = JS_ARENA_ALIGN(pool, a + 1);
-            }
-            continue;
-        }
-        a = *ap;                                /* move to next arena */
-    }
-
-    p = (void *)a->avail;
-    a->avail += nb;
-    JS_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-    return p;
-}
-
-JS_PUBLIC_API(void *)
-JS_ArenaRealloc(JSArenaPool *pool, void *p, size_t size, size_t incr)
-{
-    JSArena **ap, *a, *b;
-    jsuword boff, aoff, extra, hdrsz, gross;
-
-    /*
-     * Use the oversized-single-allocation header to avoid searching for ap.
-     * See JS_ArenaAllocate, the SET_HEADER call.
-     */
-    if (size > pool->arenasize) {
-        ap = *PTR_TO_HEADER(pool, p);
-        a = *ap;
-    } else {
-        ap = &pool->first.next;
-        while ((a = *ap) != pool->current)
-            ap = &a->next;
-    }
-
-    JS_ASSERT(a->base == (jsuword)p);
-    boff = JS_UPTRDIFF(a->base, a);
-    aoff = size + incr;
-    JS_ASSERT(aoff > pool->arenasize);
-    extra = HEADER_SIZE(pool);                  /* oversized header holds ap */
-    hdrsz = sizeof *a + extra + pool->mask;     /* header and alignment slop */
-    gross = hdrsz + aoff;
-    a = (JSArena *) realloc(a, gross);
-    if (!a)
-        return NULL;
-#ifdef JS_ARENAMETER
-    pool->stats.nreallocs++;
-#endif
-
-    if (a != *ap) {
-        /* Oops, realloc moved the allocation: update other pointers to a. */
-        if (pool->current == *ap)
-            pool->current = a;
-        b = a->next;
-        if (b && b->avail - b->base > pool->arenasize) {
-            JS_ASSERT(GET_HEADER(pool, b) == &(*ap)->next);
-            SET_HEADER(pool, b, &a->next);
-        }
-
-        /* Now update *ap, the next link of the arena before a. */
-        *ap = a;
-    }
-
-    a->base = ((jsuword)a + hdrsz) & ~HEADER_BASE_MASK(pool);
-    a->limit = (jsuword)a + gross;
-    a->avail = JS_ARENA_ALIGN(pool, a->base + aoff);
-    JS_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-
-    /* Check whether realloc aligned differently, and copy if necessary. */
-    if (boff != JS_UPTRDIFF(a->base, a))
-        memmove((void *)a->base, (char *)a + boff, size);
-
-    /* Store ap in the oversized-load arena header. */
-    SET_HEADER(pool, a, ap);
-    return (void *)a->base;
-}
-
-JS_PUBLIC_API(void *)
-JS_ArenaGrow(JSArenaPool *pool, void *p, size_t size, size_t incr)
-{
-    void *newp;
-
-    /*
-     * If p points to an oversized allocation, it owns an entire arena, so we
-     * can simply realloc the arena.
-     */
-    if (size > pool->arenasize)
-        return JS_ArenaRealloc(pool, p, size, incr);
-
-    JS_ARENA_ALLOCATE(newp, pool, size + incr);
-    if (newp)
-        memcpy(newp, p, size);
-    return newp;
-}
-
-/*
- * Free tail arenas linked after head, which may not be the true list head.
- * Reset pool->current to point to head in case it pointed at a tail arena.
- */
-static void
-FreeArenaList(JSArenaPool *pool, JSArena *head, JSBool reallyFree)
-{
-    JSArena **ap, *a;
-
-    ap = &head->next;
-    a = *ap;
-    if (!a)
-        return;
-
-#ifdef DEBUG
-    do {
-        JS_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-        a->avail = a->base;
-        JS_CLEAR_UNUSED(a);
-    } while ((a = a->next) != NULL);
-    a = *ap;
-#endif
-
-    if (reallyFree) {
-        do {
-            *ap = a->next;
-            JS_CLEAR_ARENA(a);
-            JS_COUNT_ARENA(pool,--);
-            free(a);
-        } while ((a = *ap) != NULL);
-    } else {
-        /* Insert the whole arena chain at the front of the freelist. */
-        do {
-            ap = &(*ap)->next;
-        } while (*ap);
-        JS_ACQUIRE_LOCK(arena_freelist_lock);
-        *ap = arena_freelist;
-        arena_freelist = a;
-        JS_RELEASE_LOCK(arena_freelist_lock);
-        head->next = NULL;
-    }
-
-    pool->current = head;
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaRelease(JSArenaPool *pool, char *mark)
-{
-    JSArena *a;
-
-    for (a = &pool->first; a; a = a->next) {
-        JS_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-
-        if (JS_UPTRDIFF(mark, a->base) <= JS_UPTRDIFF(a->avail, a->base)) {
-            a->avail = JS_ARENA_ALIGN(pool, mark);
-            JS_ASSERT(a->avail <= a->limit);
-            FreeArenaList(pool, a, JS_TRUE);
-            return;
-        }
-    }
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaFreeAllocation(JSArenaPool *pool, void *p, size_t size)
-{
-    JSArena **ap, *a, *b;
-    jsuword q;
-
-    /*
-     * If the allocation is oversized, it consumes an entire arena, and it has
-     * a header just before the allocation pointing back to its predecessor's
-     * next member.  Otherwise, we have to search pool for a.
-     */
-    if (size > pool->arenasize) {
-        ap = *PTR_TO_HEADER(pool, p);
-        a = *ap;
-    } else {
-        q = (jsuword)p + size;
-        q = JS_ARENA_ALIGN(pool, q);
-        ap = &pool->first.next;
-        while ((a = *ap) != NULL) {
-            JS_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-
-            if (a->avail == q) {
-                /*
-                 * If a is consumed by the allocation at p, we can free it to
-                 * the malloc heap.
-                 */
-                if (a->base == (jsuword)p)
-                    break;
-
-                /*
-                 * We can't free a, but we can "retract" its avail cursor --
-                 * whether there are others after it in pool.
-                 */
-                a->avail = (jsuword)p;
-                return;
-            }
-            ap = &a->next;
-        }
-    }
-
-    /*
-     * At this point, a is doomed, so ensure that pool->current doesn't point
-     * at it.  We must preserve LIFO order of mark/release cursors, so we use
-     * the oversized-allocation arena's back pointer (or if not oversized, we
-     * use the result of searching the entire pool) to compute the address of
-     * the arena that precedes a.
-     */
-    if (pool->current == a)
-        pool->current = (JSArena *) ((char *)ap - offsetof(JSArena, next));
-
-    /*
-     * This is a non-LIFO deallocation, so take care to fix up a->next's back
-     * pointer in its header, if a->next is oversized.
-     */
-    *ap = b = a->next;
-    if (b && b->avail - b->base > pool->arenasize) {
-        JS_ASSERT(GET_HEADER(pool, b) == &a->next);
-        SET_HEADER(pool, b, ap);
-    }
-    JS_CLEAR_ARENA(a);
-    JS_COUNT_ARENA(pool,--);
-    free(a);
-}
-
-JS_PUBLIC_API(void)
-JS_FreeArenaPool(JSArenaPool *pool)
-{
-    FreeArenaList(pool, &pool->first, JS_FALSE);
-    COUNT(pool, ndeallocs);
-}
-
-JS_PUBLIC_API(void)
-JS_FinishArenaPool(JSArenaPool *pool)
-{
-    FreeArenaList(pool, &pool->first, JS_TRUE);
-#ifdef JS_ARENAMETER
-    {
-        JSArenaStats *stats, **statsp;
-
-        if (pool->stats.name)
-            free(pool->stats.name);
-        for (statsp = &arena_stats_list; (stats = *statsp) != 0;
-             statsp = &stats->next) {
-            if (stats == &pool->stats) {
-                *statsp = stats->next;
-                return;
-            }
-        }
-    }
-#endif
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaFinish()
-{
-    JSArena *a, *next;
-
-    JS_ACQUIRE_LOCK(arena_freelist_lock);
-    a = arena_freelist;
-    arena_freelist = NULL;
-    JS_RELEASE_LOCK(arena_freelist_lock);
-    for (; a; a = next) {
-        next = a->next;
-        free(a);
-    }
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaShutDown(void)
-{
-#ifdef JS_THREADSAFE
-    /* Must come through here once in the process's last thread! */
-    if (arena_freelist_lock) {
-        JS_DESTROY_LOCK(arena_freelist_lock);
-        arena_freelist_lock = NULL;
-    }
-#endif
-}
-
-#ifdef JS_ARENAMETER
-JS_PUBLIC_API(void)
-JS_ArenaCountAllocation(JSArenaPool *pool, size_t nb)
-{
-    pool->stats.nallocs++;
-    pool->stats.nbytes += nb;
-    if (nb > pool->stats.maxalloc)
-        pool->stats.maxalloc = nb;
-    pool->stats.variance += nb * nb;
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaCountInplaceGrowth(JSArenaPool *pool, size_t size, size_t incr)
-{
-    pool->stats.ninplace++;
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaCountGrowth(JSArenaPool *pool, size_t size, size_t incr)
-{
-    pool->stats.ngrows++;
-    pool->stats.nbytes += incr;
-    pool->stats.variance -= size * size;
-    size += incr;
-    if (size > pool->stats.maxalloc)
-        pool->stats.maxalloc = size;
-    pool->stats.variance += size * size;
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaCountRelease(JSArenaPool *pool, char *mark)
-{
-    pool->stats.nreleases++;
-}
-
-JS_PUBLIC_API(void)
-JS_ArenaCountRetract(JSArenaPool *pool, char *mark)
-{
-    pool->stats.nfastrels++;
-}
-
-#include <math.h>
-#include <stdio.h>
-
-JS_PUBLIC_API(void)
-JS_DumpArenaStats(FILE *fp)
-{
-    JSArenaStats *stats;
-    uint32 nallocs, nbytes;
-    double mean, variance, sigma;
-
-    for (stats = arena_stats_list; stats; stats = stats->next) {
-        nallocs = stats->nallocs;
-        if (nallocs != 0) {
-            nbytes = stats->nbytes;
-            mean = (double)nbytes / nallocs;
-            variance = stats->variance * nallocs - nbytes * nbytes;
-            if (variance < 0 || nallocs == 1)
-                variance = 0;
-            else
-                variance /= nallocs * (nallocs - 1);
-            sigma = sqrt(variance);
-        } else {
-            mean = variance = sigma = 0;
-        }
-
-        fprintf(fp, "\n%s allocation statistics:\n", stats->name);
-        fprintf(fp, "              number of arenas: %u\n", stats->narenas);
-        fprintf(fp, "         number of allocations: %u\n", stats->nallocs);
-        fprintf(fp, " number of free arena reclaims: %u\n", stats->nreclaims);
-        fprintf(fp, "        number of malloc calls: %u\n", stats->nmallocs);
-        fprintf(fp, "       number of deallocations: %u\n", stats->ndeallocs);
-        fprintf(fp, "  number of allocation growths: %u\n", stats->ngrows);
-        fprintf(fp, "    number of in-place growths: %u\n", stats->ninplace);
-        fprintf(fp, " number of realloc'ing growths: %u\n", stats->nreallocs);
-        fprintf(fp, "number of released allocations: %u\n", stats->nreleases);
-        fprintf(fp, "       number of fast releases: %u\n", stats->nfastrels);
-        fprintf(fp, "         total bytes allocated: %u\n", stats->nbytes);
-        fprintf(fp, "          mean allocation size: %g\n", mean);
-        fprintf(fp, "            standard deviation: %g\n", sigma);
-        fprintf(fp, "       maximum allocation size: %u\n", stats->maxalloc);
-    }
-}
-#endif /* JS_ARENAMETER */
diff --git a/libs/js/src/jsarena.h b/libs/js/src/jsarena.h
deleted file mode 100644
index 394aa16390..0000000000
--- a/libs/js/src/jsarena.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsarena_h___
-#define jsarena_h___
-/*
- * Lifetime-based fast allocation, inspired by much prior art, including
- * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
- *
- * Also supports LIFO allocation (JS_ARENA_MARK/JS_ARENA_RELEASE).
- */
-#include <stdlib.h>
-#include "jstypes.h"
-#include "jscompat.h"
-
-JS_BEGIN_EXTERN_C
-
-typedef struct JSArena JSArena;
-typedef struct JSArenaPool JSArenaPool;
-
-struct JSArena {
-    JSArena     *next;          /* next arena for this lifetime */
-    jsuword     base;           /* aligned base address, follows this header */
-    jsuword     limit;          /* one beyond last byte in arena */
-    jsuword     avail;          /* points to next available byte */
-};
-
-#ifdef JS_ARENAMETER
-typedef struct JSArenaStats JSArenaStats;
-
-struct JSArenaStats {
-    JSArenaStats *next;         /* next in arenaStats list */
-    char        *name;          /* name for debugging */
-    uint32      narenas;        /* number of arenas in pool */
-    uint32      nallocs;        /* number of JS_ARENA_ALLOCATE() calls */
-    uint32      nreclaims;      /* number of reclaims from freeArenas */
-    uint32      nmallocs;       /* number of malloc() calls */
-    uint32      ndeallocs;      /* number of lifetime deallocations */
-    uint32      ngrows;         /* number of JS_ARENA_GROW() calls */
-    uint32      ninplace;       /* number of in-place growths */
-    uint32      nreallocs;      /* number of arena grow extending reallocs */
-    uint32      nreleases;      /* number of JS_ARENA_RELEASE() calls */
-    uint32      nfastrels;      /* number of "fast path" releases */
-    size_t      nbytes;         /* total bytes allocated */
-    size_t      maxalloc;       /* maximum allocation size in bytes */
-    double      variance;       /* size variance accumulator */
-};
-#endif
-
-struct JSArenaPool {
-    JSArena     first;          /* first arena in pool list */
-    JSArena     *current;       /* arena from which to allocate space */
-    size_t      arenasize;      /* net exact size of a new arena */
-    jsuword     mask;           /* alignment mask (power-of-2 - 1) */
-#ifdef JS_ARENAMETER
-    JSArenaStats stats;
-#endif
-};
-
-/*
- * If the including .c file uses only one power-of-2 alignment, it may define
- * JS_ARENA_CONST_ALIGN_MASK to the alignment mask and save a few instructions
- * per ALLOCATE and GROW.
- */
-#ifdef JS_ARENA_CONST_ALIGN_MASK
-#define JS_ARENA_ALIGN(pool, n) (((jsuword)(n) + JS_ARENA_CONST_ALIGN_MASK)   \
-                                 & ~(jsuword)JS_ARENA_CONST_ALIGN_MASK)
-
-#define JS_INIT_ARENA_POOL(pool, name, size) \
-        JS_InitArenaPool(pool, name, size, JS_ARENA_CONST_ALIGN_MASK + 1)
-#else
-#define JS_ARENA_ALIGN(pool, n) (((jsuword)(n) + (pool)->mask) & ~(pool)->mask)
-#endif
-
-#define JS_ARENA_ALLOCATE(p, pool, nb)                                        \
-    JS_ARENA_ALLOCATE_CAST(p, void *, pool, nb)
-
-#define JS_ARENA_ALLOCATE_TYPE(p, type, pool)                                 \
-    JS_ARENA_ALLOCATE_CAST(p, type *, pool, sizeof(type))
-
-/*
- *
- * NB: In JS_ARENA_ALLOCATE_CAST and JS_ARENA_GROW_CAST, always subtract _nb
- * from a->limit rather than adding _nb to _p, to avoid overflowing a 32-bit
- * address space (possible when running a 32-bit program on a 64-bit system
- * where the kernel maps the heap up against the top of the 32-bit address
- * space).
- *
- * Thanks to Juergen Kreileder <jk@blackdown.de>, who brought this up in
- * https://bugzilla.mozilla.org/show_bug.cgi?id=279273.
- */
-#define JS_ARENA_ALLOCATE_CAST(p, type, pool, nb)                             \
-    JS_BEGIN_MACRO                                                            \
-        JSArena *_a = (pool)->current;                                        \
-        size_t _nb = JS_ARENA_ALIGN(pool, nb);                                \
-        jsuword _p = _a->avail;                                               \
-        if (_p > _a->limit - _nb)                                             \
-            _p = (jsuword)JS_ArenaAllocate(pool, _nb);                        \
-        else                                                                  \
-            _a->avail = _p + _nb;                                             \
-        p = (type) _p;                                                        \
-        JS_ArenaCountAllocation(pool, nb);                                    \
-    JS_END_MACRO
-
-#define JS_ARENA_GROW(p, pool, size, incr)                                    \
-    JS_ARENA_GROW_CAST(p, void *, pool, size, incr)
-
-#define JS_ARENA_GROW_CAST(p, type, pool, size, incr)                         \
-    JS_BEGIN_MACRO                                                            \
-        JSArena *_a = (pool)->current;                                        \
-        if (_a->avail == (jsuword)(p) + JS_ARENA_ALIGN(pool, size)) {         \
-            size_t _nb = (size) + (incr);                                     \
-            _nb = JS_ARENA_ALIGN(pool, _nb);                                  \
-            if ((jsuword)(p) <= _a->limit - _nb) {                            \
-                _a->avail = (jsuword)(p) + _nb;                               \
-                JS_ArenaCountInplaceGrowth(pool, size, incr);                 \
-            } else if ((jsuword)(p) == _a->base) {                            \
-                p = (type) JS_ArenaRealloc(pool, p, size, incr);              \
-            } else {                                                          \
-                p = (type) JS_ArenaGrow(pool, p, size, incr);                 \
-            }                                                                 \
-        } else {                                                              \
-            p = (type) JS_ArenaGrow(pool, p, size, incr);                     \
-        }                                                                     \
-        JS_ArenaCountGrowth(pool, size, incr);                                \
-    JS_END_MACRO
-
-#define JS_ARENA_MARK(pool)     ((void *) (pool)->current->avail)
-#define JS_UPTRDIFF(p,q)        ((jsuword)(p) - (jsuword)(q))
-
-#ifdef DEBUG
-#define JS_FREE_PATTERN         0xDA
-#define JS_CLEAR_UNUSED(a)      (JS_ASSERT((a)->avail <= (a)->limit),         \
-                                 memset((void*)(a)->avail, JS_FREE_PATTERN,   \
-                                        (a)->limit - (a)->avail))
-#define JS_CLEAR_ARENA(a)       memset((void*)(a), JS_FREE_PATTERN,           \
-                                       (a)->limit - (jsuword)(a))
-#else
-#define JS_CLEAR_UNUSED(a)      /* nothing */
-#define JS_CLEAR_ARENA(a)       /* nothing */
-#endif
-
-#define JS_ARENA_RELEASE(pool, mark)                                          \
-    JS_BEGIN_MACRO                                                            \
-        char *_m = (char *)(mark);                                            \
-        JSArena *_a = (pool)->current;                                        \
-        if (_a != &(pool)->first &&                                           \
-            JS_UPTRDIFF(_m, _a->base) <= JS_UPTRDIFF(_a->avail, _a->base)) {  \
-            _a->avail = (jsuword)JS_ARENA_ALIGN(pool, _m);                    \
-            JS_ASSERT(_a->avail <= _a->limit);                                \
-            JS_CLEAR_UNUSED(_a);                                              \
-            JS_ArenaCountRetract(pool, _m);                                   \
-        } else {                                                              \
-            JS_ArenaRelease(pool, _m);                                        \
-        }                                                                     \
-        JS_ArenaCountRelease(pool, _m);                                       \
-    JS_END_MACRO
-
-#ifdef JS_ARENAMETER
-#define JS_COUNT_ARENA(pool,op) ((pool)->stats.narenas op)
-#else
-#define JS_COUNT_ARENA(pool,op)
-#endif
-
-#define JS_ARENA_DESTROY(pool, a, pnext)                                      \
-    JS_BEGIN_MACRO                                                            \
-        JS_COUNT_ARENA(pool,--);                                              \
-        if ((pool)->current == (a)) (pool)->current = &(pool)->first;         \
-        *(pnext) = (a)->next;                                                 \
-        JS_CLEAR_ARENA(a);                                                    \
-        free(a);                                                              \
-        (a) = NULL;                                                           \
-    JS_END_MACRO
-
-/*
- * Initialize an arena pool with the given name for debugging and metering,
- * with a minimum size per arena of size bytes.
- */
-extern JS_PUBLIC_API(void)
-JS_InitArenaPool(JSArenaPool *pool, const char *name, size_t size,
-                 size_t align);
-
-/*
- * Free the arenas in pool.  The user may continue to allocate from pool
- * after calling this function.  There is no need to call JS_InitArenaPool()
- * again unless JS_FinishArenaPool(pool) has been called.
- */
-extern JS_PUBLIC_API(void)
-JS_FreeArenaPool(JSArenaPool *pool);
-
-/*
- * Free the arenas in pool and finish using it altogether.
- */
-extern JS_PUBLIC_API(void)
-JS_FinishArenaPool(JSArenaPool *pool);
-
-/*
- * Finish using arenas, freeing all memory associated with them except for
- * any locks needed for thread safety.
- */
-extern JS_PUBLIC_API(void)
-JS_ArenaFinish(void);
-
-/*
- * Free any locks or other memory needed for thread safety, just before
- * shutting down.  At that point, we must be called by a single thread.
- *
- * After shutting down, the next thread to call JS_InitArenaPool must not
- * race with any other thread.  Once a pool has been initialized, threads
- * may safely call jsarena.c functions on thread-local pools.  The upshot
- * is that pools are per-thread, but the underlying global freelist is
- * thread-safe, provided that both the first pool initialization and the
- * shut-down call are single-threaded.
- */
-extern JS_PUBLIC_API(void)
-JS_ArenaShutDown(void);
-
-/*
- * Friend functions used by the JS_ARENA_*() macros.
- */
-extern JS_PUBLIC_API(void *)
-JS_ArenaAllocate(JSArenaPool *pool, size_t nb);
-
-extern JS_PUBLIC_API(void *)
-JS_ArenaRealloc(JSArenaPool *pool, void *p, size_t size, size_t incr);
-
-extern JS_PUBLIC_API(void *)
-JS_ArenaGrow(JSArenaPool *pool, void *p, size_t size, size_t incr);
-
-extern JS_PUBLIC_API(void)
-JS_ArenaRelease(JSArenaPool *pool, char *mark);
-
-/*
- * Function to be used directly when an allocation has likely grown to consume
- * an entire JSArena, in which case the arena is returned to the malloc heap.
- */
-extern JS_PUBLIC_API(void)
-JS_ArenaFreeAllocation(JSArenaPool *pool, void *p, size_t size);
-
-#ifdef JS_ARENAMETER
-
-#include <stdio.h>
-
-extern JS_PUBLIC_API(void)
-JS_ArenaCountAllocation(JSArenaPool *pool, size_t nb);
-
-extern JS_PUBLIC_API(void)
-JS_ArenaCountInplaceGrowth(JSArenaPool *pool, size_t size, size_t incr);
-
-extern JS_PUBLIC_API(void)
-JS_ArenaCountGrowth(JSArenaPool *pool, size_t size, size_t incr);
-
-extern JS_PUBLIC_API(void)
-JS_ArenaCountRelease(JSArenaPool *pool, char *mark);
-
-extern JS_PUBLIC_API(void)
-JS_ArenaCountRetract(JSArenaPool *pool, char *mark);
-
-extern JS_PUBLIC_API(void)
-JS_DumpArenaStats(FILE *fp);
-
-#else  /* !JS_ARENAMETER */
-
-#define JS_ArenaCountAllocation(ap, nb)                 /* nothing */
-#define JS_ArenaCountInplaceGrowth(ap, size, incr)      /* nothing */
-#define JS_ArenaCountGrowth(ap, size, incr)             /* nothing */
-#define JS_ArenaCountRelease(ap, mark)                  /* nothing */
-#define JS_ArenaCountRetract(ap, mark)                  /* nothing */
-
-#endif /* !JS_ARENAMETER */
-
-JS_END_EXTERN_C
-
-#endif /* jsarena_h___ */
diff --git a/libs/js/src/jsarray.c b/libs/js/src/jsarray.c
deleted file mode 100644
index 50400fa3d2..0000000000
--- a/libs/js/src/jsarray.c
+++ /dev/null
@@ -1,1829 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS array class.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsstr.h"
-
-/* 2^32 - 1 as a number and a string */
-#define MAXINDEX 4294967295u
-#define MAXSTR   "4294967295"
-
-/* A useful value for identifying a hole in an array */
-#define JSVAL_HOLE BOOLEAN_TO_JSVAL(2)
-
-/*
- * Determine if the id represents an array index or an XML property index.
- *
- * An id is an array index according to ECMA by (15.4):
- *
- * "Array objects give special treatment to a certain class of property names.
- * A property name P (in the form of a string value) is an array index if and
- * only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal
- * to 2^32-1."
- *
- * In our implementation, it would be sufficient to check for JSVAL_IS_INT(id)
- * except that by using signed 32-bit integers we miss the top half of the
- * valid range. This function checks the string representation itself; note
- * that calling a standard conversion routine might allow strings such as
- * "08" or "4.0" as array indices, which they are not.
- */
-JSBool
-js_IdIsIndex(jsval id, jsuint *indexp)
-{
-    JSString *str;
-    jschar *cp;
-
-    if (JSVAL_IS_INT(id)) {
-        jsint i;
-        i = JSVAL_TO_INT(id);
-        if (i < 0)
-            return JS_FALSE;
-        *indexp = (jsuint)i;
-        return JS_TRUE;
-    }
-
-    /* NB: id should be a string, but jsxml.c may call us with an object id. */
-    if (!JSVAL_IS_STRING(id))
-        return JS_FALSE;
-
-    str = JSVAL_TO_STRING(id);
-    cp = JSSTRING_CHARS(str);
-    if (JS7_ISDEC(*cp) && JSSTRING_LENGTH(str) < sizeof(MAXSTR)) {
-        jsuint index = JS7_UNDEC(*cp++);
-        jsuint oldIndex = 0;
-        jsuint c = 0;
-        if (index != 0) {
-            while (JS7_ISDEC(*cp)) {
-                oldIndex = index;
-                c = JS7_UNDEC(*cp);
-                index = 10*index + c;
-                cp++;
-            }
-        }
-
-        /* Ensure that all characters were consumed and we didn't overflow. */
-        if (*cp == 0 &&
-             (oldIndex < (MAXINDEX / 10) ||
-              (oldIndex == (MAXINDEX / 10) && c < (MAXINDEX % 10))))
-        {
-            *indexp = index;
-            return JS_TRUE;
-        }
-    }
-    return JS_FALSE;
-}
-
-static JSBool
-ValueIsLength(JSContext *cx, jsval v, jsuint *lengthp)
-{
-    jsint i;
-    jsdouble d;
-
-    if (JSVAL_IS_INT(v)) {
-        i = JSVAL_TO_INT(v);
-        if (i < 0) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_ARRAY_LENGTH);
-            return JS_FALSE;
-        }
-        *lengthp = (jsuint) i;
-        return JS_TRUE;
-    }
-
-    if (!js_ValueToNumber(cx, v, &d)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_ARRAY_LENGTH);
-        return JS_FALSE;
-    }
-    if (!js_DoubleToECMAUint32(cx, d, (uint32 *)lengthp)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_ARRAY_LENGTH);
-        return JS_FALSE;
-    }
-    if (JSDOUBLE_IS_NaN(d) || d != *lengthp) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_ARRAY_LENGTH);
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_GetLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp)
-{
-    jsid id;
-    jsint i;
-    jsval v;
-
-    id = ATOM_TO_JSID(cx->runtime->atomState.lengthAtom);
-    if (!OBJ_GET_PROPERTY(cx, obj, id, &v))
-        return JS_FALSE;
-
-    /* Short-circuit, because js_ValueToECMAUint32 fails when
-     * called during init time.
-     */
-    if (JSVAL_IS_INT(v)) {
-        i = JSVAL_TO_INT(v);
-        /* jsuint cast does ToUint32. */
-        *lengthp = (jsuint)i;
-        return JS_TRUE;
-    }
-    return js_ValueToECMAUint32(cx, v, (uint32 *)lengthp);
-}
-
-static JSBool
-IndexToValue(JSContext *cx, jsuint index, jsval *vp)
-{
-    if (index <= JSVAL_INT_MAX) {
-        *vp = INT_TO_JSVAL(index);
-        return JS_TRUE;
-    }
-    return js_NewDoubleValue(cx, (jsdouble)index, vp);
-}
-
-static JSBool
-IndexToId(JSContext *cx, jsuint index, jsid *idp)
-{
-    JSString *str;
-    JSAtom *atom;
-
-    if (index <= JSVAL_INT_MAX) {
-        *idp = INT_TO_JSID(index);
-    } else {
-        str = js_NumberToString(cx, (jsdouble)index);
-        if (!str)
-            return JS_FALSE;
-        atom = js_AtomizeString(cx, str, 0);
-        if (!atom)
-            return JS_FALSE;
-        *idp = ATOM_TO_JSID(atom);
-
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-PropertyExists(JSContext *cx, JSObject *obj, jsid id, JSBool *foundp)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
-        return JS_FALSE;
-
-    *foundp = prop != NULL;
-    if (*foundp) {
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-    }
-
-    return JS_TRUE;
-}
-
-#define JSID_HOLE       JSVAL_NULL
-
-static JSBool
-IndexToExistingId(JSContext *cx, JSObject *obj, jsuint index, jsid *idp)
-{
-    JSBool exists;
-
-    if (!IndexToId(cx, index, idp))
-        return JS_FALSE;
-    if (!PropertyExists(cx, obj, *idp, &exists))
-        return JS_FALSE;
-    if (!exists)
-        *idp = JSID_HOLE;
-    return JS_TRUE;
-}
-
-JSBool
-js_SetLengthProperty(JSContext *cx, JSObject *obj, jsuint length)
-{
-    jsval v;
-    jsid id;
-
-    if (!IndexToValue(cx, length, &v))
-        return JS_FALSE;
-    id = ATOM_TO_JSID(cx->runtime->atomState.lengthAtom);
-    return OBJ_SET_PROPERTY(cx, obj, id, &v);
-}
-
-JSBool
-js_HasLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp)
-{
-    JSErrorReporter older;
-    jsid id;
-    JSBool ok;
-    jsval v;
-
-    older = JS_SetErrorReporter(cx, NULL);
-    id = ATOM_TO_JSID(cx->runtime->atomState.lengthAtom);
-    ok = OBJ_GET_PROPERTY(cx, obj, id, &v);
-    JS_SetErrorReporter(cx, older);
-    if (!ok)
-        return JS_FALSE;
-    return ValueIsLength(cx, v, lengthp);
-}
-
-/*
- * This get function is specific to Array.prototype.length and other array
- * instance length properties.  It calls back through the class get function
- * in case some magic happens there (see call_getProperty in jsfun.c).
- */
-static JSBool
-array_length_getter(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return OBJ_GET_CLASS(cx, obj)->getProperty(cx, obj, id, vp);
-}
-
-static JSBool
-array_length_setter(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsuint newlen, oldlen, slot;
-    jsid id2;
-    jsval junk;
-
-    if (!ValueIsLength(cx, *vp, &newlen))
-        return JS_FALSE;
-    if (!js_GetLengthProperty(cx, obj, &oldlen))
-        return JS_FALSE;
-    slot = oldlen;
-    while (slot > newlen) {
-        --slot;
-        if (!IndexToId(cx, slot, &id2))
-            return JS_FALSE;
-        if (!OBJ_DELETE_PROPERTY(cx, obj, id2, &junk))
-            return JS_FALSE;
-    }
-    return IndexToValue(cx, newlen, vp);
-}
-
-static JSBool
-array_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsuint index, length;
-
-    if (!js_IdIsIndex(id, &index))
-        return JS_TRUE;
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    if (index >= length) {
-        length = index + 1;
-        return js_SetLengthProperty(cx, obj, length);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-array_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
-{
-    jsuint length;
-
-    if (JS_VERSION_IS_1_2(cx)) {
-        if (!js_GetLengthProperty(cx, obj, &length))
-            return JS_FALSE;
-        switch (type) {
-          case JSTYPE_NUMBER:
-            return IndexToValue(cx, length, vp);
-          case JSTYPE_BOOLEAN:
-            *vp = BOOLEAN_TO_JSVAL(length > 0);
-            return JS_TRUE;
-          default:
-            return JS_TRUE;
-        }
-    }
-    return js_TryValueOf(cx, obj, type, vp);
-}
-
-JSClass js_ArrayClass = {
-    "Array",
-    0,
-    array_addProperty, JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,
-    JS_EnumerateStub,  JS_ResolveStub,    array_convert,     JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-static JSBool
-array_join_sub(JSContext *cx, JSObject *obj, JSString *sep, JSBool literalize,
-               jsval *rval, JSBool localeString)
-{
-    JSBool ok;
-    jsuint length, index;
-    jschar *chars, *ochars;
-    size_t nchars, growth, seplen, tmplen;
-    const jschar *sepstr;
-    JSString *str;
-    JSHashEntry *he;
-    JSObject *obj2;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return JS_FALSE;
-    }
-
-    ok = js_GetLengthProperty(cx, obj, &length);
-    if (!ok)
-        return JS_FALSE;
-
-    he = js_EnterSharpObject(cx, obj, NULL, &chars);
-    if (!he)
-        return JS_FALSE;
-    if (literalize) {
-        if (IS_SHARP(he)) {
-#if JS_HAS_SHARP_VARS
-            nchars = js_strlen(chars);
-#else
-            chars[0] = '[';
-            chars[1] = ']';
-            chars[2] = 0;
-            nchars = 2;
-#endif
-            goto make_string;
-        }
-
-        /*
-         * Allocate 1 + 3 + 1 for "[", the worst-case closing ", ]", and the
-         * terminating 0.
-         */
-        growth = (1 + 3 + 1) * sizeof(jschar);
-        if (!chars) {
-            nchars = 0;
-            chars = (jschar *) malloc(growth);
-            if (!chars)
-                goto done;
-        } else {
-            MAKE_SHARP(he);
-            nchars = js_strlen(chars);
-            chars = (jschar *)
-                realloc((ochars = chars), nchars * sizeof(jschar) + growth);
-            if (!chars) {
-                free(ochars);
-                goto done;
-            }
-        }
-        chars[nchars++] = '[';
-    } else {
-        /*
-         * Free any sharp variable definition in chars.  Normally, we would
-         * MAKE_SHARP(he) so that only the first sharp variable annotation is
-         * a definition, and all the rest are references, but in the current
-         * case of (!literalize), we don't need chars at all.
-         */
-        if (chars)
-            JS_free(cx, chars);
-        chars = NULL;
-        nchars = 0;
-
-        /* Return the empty string on a cycle as well as on empty join. */
-        if (IS_BUSY(he) || length == 0) {
-            js_LeaveSharpObject(cx, NULL);
-            *rval = JS_GetEmptyStringValue(cx);
-            return ok;
-        }
-
-        /* Flag he as BUSY so we can distinguish a cycle from a join-point. */
-        MAKE_BUSY(he);
-    }
-    sepstr = NULL;
-    seplen = JSSTRING_LENGTH(sep);
-
-    /* Use rval to locally root each element value as we loop and convert. */
-#define v (*rval)
-
-    v = JSVAL_NULL;
-    for (index = 0; index < length; index++) {
-        ok = JS_GetElement(cx, obj, index, &v);
-        if (!ok)
-            goto done;
-
-        if ((!literalize || JS_VERSION_IS_1_2(cx)) &&
-            (JSVAL_IS_VOID(v) || JSVAL_IS_NULL(v))) {
-            str = cx->runtime->emptyString;
-        } else {
-            if (localeString) {
-                if (!js_ValueToObject(cx, v, &obj2) ||
-                    !js_TryMethod(cx, obj2,
-                                  cx->runtime->atomState.toLocaleStringAtom,
-                                  0, NULL, &v)) {
-                    str = NULL;
-                } else {
-                    str = js_ValueToString(cx, v);
-                }
-            } else {
-                str = (literalize ? js_ValueToSource : js_ValueToString)(cx, v);
-            }
-            if (!str) {
-                ok = JS_FALSE;
-                goto done;
-            }
-        }
-
-        /* Allocate 3 + 1 at end for ", ", closing bracket, and zero. */
-        growth = (nchars + (sepstr ? seplen : 0) +
-                  JSSTRING_LENGTH(str) +
-                  3 + 1) * sizeof(jschar);
-        if (!chars) {
-            chars = (jschar *) malloc(growth);
-            if (!chars)
-                goto done;
-        } else {
-            chars = (jschar *) realloc((ochars = chars), growth);
-            if (!chars) {
-                free(ochars);
-                goto done;
-            }
-        }
-
-        if (sepstr) {
-            js_strncpy(&chars[nchars], sepstr, seplen);
-            nchars += seplen;
-        }
-        sepstr = JSSTRING_CHARS(sep);
-
-        tmplen = JSSTRING_LENGTH(str);
-        js_strncpy(&chars[nchars], JSSTRING_CHARS(str), tmplen);
-        nchars += tmplen;
-    }
-
-  done:
-    if (literalize) {
-        if (chars) {
-            if (JSVAL_IS_VOID(v)) {
-                chars[nchars++] = ',';
-                chars[nchars++] = ' ';
-            }
-            chars[nchars++] = ']';
-        }
-    } else {
-        CLEAR_BUSY(he);
-    }
-    js_LeaveSharpObject(cx, NULL);
-    if (!ok) {
-        if (chars)
-            free(chars);
-        return ok;
-    }
-
-#undef v
-
-  make_string:
-    if (!chars) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    chars[nchars] = 0;
-    str = js_NewString(cx, chars, nchars, 0);
-    if (!str) {
-        free(chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static jschar   comma_space_ucstr[] = {',', ' ', 0};
-static jschar   comma_ucstr[]       = {',', 0};
-static JSString comma_space         = {2, comma_space_ucstr};
-static JSString comma               = {1, comma_ucstr};
-
-#if JS_HAS_TOSOURCE
-static JSBool
-array_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    return array_join_sub(cx, obj, &comma_space, JS_TRUE, rval, JS_FALSE);
-}
-#endif
-
-static JSBool
-array_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSBool literalize;
-
-    /*
-     * JS1.2 arrays convert to array literals, with a comma followed by a space
-     * between each element.
-     */
-    literalize = JS_VERSION_IS_1_2(cx);
-    return array_join_sub(cx, obj, literalize ? &comma_space : &comma,
-                          literalize, rval, JS_FALSE);
-}
-
-static JSBool
-array_toLocaleString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    /*
-     *  Passing comma here as the separator. Need a way to get a
-     *  locale-specific version.
-     */
-    return array_join_sub(cx, obj, &comma, JS_FALSE, rval, JS_TRUE);
-}
-
-static JSBool
-InitArrayElements(JSContext *cx, JSObject *obj, jsuint length, jsval *vector)
-{
-    jsuint index;
-    jsid id;
-
-    for (index = 0; index < length; index++) {
-        JS_ASSERT(vector[index] != JSVAL_HOLE);
-
-        if (!IndexToId(cx, index, &id))
-            return JS_FALSE;
-        if (!OBJ_SET_PROPERTY(cx, obj, id, &vector[index]))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-InitArrayObject(JSContext *cx, JSObject *obj, jsuint length, jsval *vector)
-{
-    jsval v;
-    jsid id;
-
-    if (!IndexToValue(cx, length, &v))
-        return JS_FALSE;
-    id = ATOM_TO_JSID(cx->runtime->atomState.lengthAtom);
-    if (!OBJ_DEFINE_PROPERTY(cx, obj, id, v,
-                             array_length_getter, array_length_setter,
-                             JSPROP_PERMANENT,
-                             NULL)) {
-          return JS_FALSE;
-    }
-    if (!vector)
-        return JS_TRUE;
-    return InitArrayElements(cx, obj, length, vector);
-}
-
-#if JS_HAS_SOME_PERL_FUN
-/*
- * Perl-inspired join, reverse, and sort.
- */
-static JSBool
-array_join(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-
-    if (JSVAL_IS_VOID(argv[0]))
-        return array_join_sub(cx, obj, &comma, JS_FALSE, rval, JS_FALSE);
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-    return array_join_sub(cx, obj, str, JS_FALSE, rval, JS_FALSE);
-}
-
-static JSBool
-array_reverse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsuint len, half, i;
-    jsid id, id2;
-    jsval *tmproot, *tmproot2;
-    JSBool idexists, id2exists;
-
-    if (!js_GetLengthProperty(cx, obj, &len))
-        return JS_FALSE;
-
-    /*
-     * Use argv[argc] and argv[argc + 1] as local roots to hold temporarily
-     * array elements for GC-safe swap.
-     */
-    tmproot = argv + argc;
-    tmproot2 = argv + argc + 1;
-    half = len / 2;
-    for (i = 0; i < half; i++) {
-        if (!IndexToId(cx, i, &id))
-            return JS_FALSE;
-        if (!IndexToId(cx, len - i - 1, &id2))
-            return JS_FALSE;
-
-        /* Check for holes to make sure they don't get filled. */
-        if (!PropertyExists(cx, obj, id, &idexists) ||
-            !PropertyExists(cx, obj, id2, &id2exists)) {
-            return JS_FALSE;
-        }
-
-        /*
-         * Get both of the values now. Note that we don't use v, or v2 based on
-         * idexists and id2exists.
-         */
-        if (!OBJ_GET_PROPERTY(cx, obj, id, tmproot) ||
-            !OBJ_GET_PROPERTY(cx, obj, id2, tmproot2)) {
-            return JS_FALSE;
-        }
-
-        if (idexists) {
-            if (!OBJ_SET_PROPERTY(cx, obj, id2, tmproot))
-                return JS_FALSE;
-        } else {
-            if (!OBJ_DELETE_PROPERTY(cx, obj, id2, tmproot))
-                return JS_FALSE;
-        }
-        if (id2exists) {
-            if (!OBJ_SET_PROPERTY(cx, obj, id, tmproot2))
-                return JS_FALSE;
-        } else {
-            if (!OBJ_DELETE_PROPERTY(cx, obj, id, tmproot2))
-                return JS_FALSE;
-        }
-    }
-
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-typedef struct HSortArgs {
-    void         *vec;
-    size_t       elsize;
-    void         *pivot;
-    JSComparator cmp;
-    void         *arg;
-    JSBool       fastcopy;
-} HSortArgs;
-
-static int
-sort_compare(const void *a, const void *b, void *arg);
-
-static int
-sort_compare_strings(const void *a, const void *b, void *arg);
-
-static void
-HeapSortHelper(JSBool building, HSortArgs *hsa, size_t lo, size_t hi)
-{
-    void *pivot, *vec, *vec2, *arg, *a, *b;
-    size_t elsize;
-    JSComparator cmp;
-    JSBool fastcopy;
-    size_t j, hiDiv2;
-
-    pivot = hsa->pivot;
-    vec = hsa->vec;
-    elsize = hsa->elsize;
-    vec2 =  (char *)vec - 2 * elsize;
-    cmp = hsa->cmp;
-    arg = hsa->arg;
-
-    fastcopy = hsa->fastcopy;
-#define MEMCPY(p,q,n) \
-    (fastcopy ? (void)(*(jsval*)(p) = *(jsval*)(q)) : (void)memcpy(p, q, n))
-
-    if (lo == 1) {
-        j = 2;
-        b = (char *)vec + elsize;
-        if (j < hi && cmp(vec, b, arg) < 0)
-            j++;
-        a = (char *)vec + (hi - 1) * elsize;
-        b = (char *)vec2 + j * elsize;
-
-        /*
-         * During sorting phase b points to a member of heap that cannot be
-         * bigger then biggest of vec[0] and vec[1], and cmp(a, b, arg) <= 0
-         * always holds.
-         */
-        if ((building || hi == 2) && cmp(a, b, arg) >= 0)
-            return;
-
-        MEMCPY(pivot, a, elsize);
-        MEMCPY(a, b, elsize);
-        lo = j;
-    } else {
-        a = (char *)vec2 + lo * elsize;
-        MEMCPY(pivot, a, elsize);
-    }
-
-    hiDiv2 = hi/2;
-    while (lo <= hiDiv2) {
-        j = lo + lo;
-        a = (char *)vec2 + j * elsize;
-        b = (char *)vec + (j - 1) * elsize;
-        if (j < hi && cmp(a, b, arg) < 0)
-            j++;
-        b = (char *)vec2 + j * elsize;
-        if (cmp(pivot, b, arg) >= 0)
-            break;
-
-        a = (char *)vec2 + lo * elsize;
-        MEMCPY(a, b, elsize);
-        lo = j;
-    }
-
-    a = (char *)vec2 + lo * elsize;
-    MEMCPY(a, pivot, elsize);
-#undef MEMCPY
-}
-
-void
-js_HeapSort(void *vec, size_t nel, void *pivot, size_t elsize,
-            JSComparator cmp, void *arg)
-{
-    HSortArgs hsa;
-    size_t i;
-
-    hsa.vec = vec;
-    hsa.elsize = elsize;
-    hsa.pivot = pivot;
-    hsa.cmp = cmp;
-    hsa.arg = arg;
-    hsa.fastcopy = (cmp == sort_compare || cmp == sort_compare_strings);
-
-    for (i = nel/2; i != 0; i--)
-        HeapSortHelper(JS_TRUE, &hsa, i, nel);
-    while (nel > 2)
-        HeapSortHelper(JS_FALSE, &hsa, 1, --nel);
-}
-
-typedef struct CompareArgs {
-    JSContext   *context;
-    jsval       fval;
-    jsval       *localroot;     /* need one local root, for sort_compare */
-    JSBool      status;
-} CompareArgs;
-
-static int
-sort_compare(const void *a, const void *b, void *arg)
-{
-    jsval av = *(const jsval *)a, bv = *(const jsval *)b;
-    CompareArgs *ca = (CompareArgs *) arg;
-    JSContext *cx = ca->context;
-    jsdouble cmp = -1;
-    jsval fval, argv[2], rval, special;
-    JSBool ok;
-
-    fval = ca->fval;
-
-    /*
-     * By ECMA 262, 15.4.4.11, existence of the property with value undefined
-     * takes precedence over an undefined property (which we call a "hole").
-     */
-    if (av == JSVAL_HOLE || bv == JSVAL_HOLE)
-        special = JSVAL_HOLE;
-    else if (av == JSVAL_VOID || bv == JSVAL_VOID)
-        special = JSVAL_VOID;
-    else
-        special = JSVAL_NULL;
-
-    if (special != JSVAL_NULL) {
-        if (av == bv)
-            cmp = 0;
-        else if (av != special)
-            cmp = -1;
-        else
-            cmp = 1;
-    } else if (fval == JSVAL_NULL) {
-        JSString *astr, *bstr;
-
-        if (av == bv) {
-            cmp = 0;
-        } else {
-            /*
-             * Set our local root to astr in case the second js_ValueToString
-             * displaces the newborn root in cx, and the GC nests under that
-             * call.  Don't bother guarding the local root store with an astr
-             * non-null test.  If we tag null as a string, the GC will untag,
-             * null-test, and avoid dereferencing null.
-             */
-            astr = js_ValueToString(cx, av);
-            *ca->localroot = STRING_TO_JSVAL(astr);
-            if (astr && (bstr = js_ValueToString(cx, bv)))
-                cmp = js_CompareStrings(astr, bstr);
-            else
-                ca->status = JS_FALSE;
-        }
-    } else {
-        argv[0] = av;
-        argv[1] = bv;
-        ok = js_InternalCall(cx,
-                             OBJ_GET_PARENT(cx, JSVAL_TO_OBJECT(fval)),
-                             fval, 2, argv, &rval);
-        if (ok) {
-            ok = js_ValueToNumber(cx, rval, &cmp);
-
-            /* Clamp cmp to -1, 0, 1. */
-            if (ok) {
-                if (JSDOUBLE_IS_NaN(cmp)) {
-                    /*
-                     * XXX report some kind of error here?  ECMA talks about
-                     * 'consistent compare functions' that don't return NaN,
-                     * but is silent about what the result should be.  So we
-                     * currently ignore it.
-                     */
-                    cmp = 0;
-                } else if (cmp != 0) {
-                    cmp = cmp > 0 ? 1 : -1;
-                }
-            }
-        }
-        if (!ok)
-            ca->status = ok;
-    }
-    return (int)cmp;
-}
-
-static int
-sort_compare_strings(const void *a, const void *b, void *arg)
-{
-    jsval av = *(const jsval *)a, bv = *(const jsval *)b;
-
-    return (int) js_CompareStrings(JSVAL_TO_STRING(av), JSVAL_TO_STRING(bv));
-}
-
-static JSBool
-array_sort(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval fval, *vec, *pivotroot;
-    CompareArgs ca;
-    jsuint len, newlen, i;
-    JSStackFrame *fp;
-    jsid id;
-    size_t nbytes;
-
-    /*
-     * Optimize the default compare function case if all of obj's elements
-     * have values of type string.
-     */
-    JSBool all_strings;
-
-    if (argc > 0) {
-        if (JSVAL_IS_PRIMITIVE(argv[0])) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_SORT_ARG);
-            return JS_FALSE;
-        }
-        fval = argv[0];
-        all_strings = JS_FALSE; /* non-default compare function */
-    } else {
-        fval = JSVAL_NULL;
-        all_strings = JS_TRUE;  /* check for all string values */
-    }
-
-    if (!js_GetLengthProperty(cx, obj, &len))
-        return JS_FALSE;
-    if (len == 0) {
-        *rval = OBJECT_TO_JSVAL(obj);
-        return JS_TRUE;
-    }
-
-    /*
-     * We need a temporary array of len jsvals to hold elements of the array.
-     * Check that its size does not overflow size_t, which would allow for
-     * indexing beyond the end of the malloc'd vector.
-     */
-    if (len > ((size_t) -1) / sizeof(jsval)) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    nbytes = ((size_t) len) * sizeof(jsval);
-
-    vec = (jsval *) JS_malloc(cx, nbytes);
-    if (!vec)
-        return JS_FALSE;
-
-    /* Root vec, clearing it first in case a GC nests while we're filling it. */
-    memset(vec, 0, nbytes);
-    fp = cx->fp;
-    fp->vars = vec;
-    fp->nvars = len;
-
-    newlen = 0;
-    for (i = 0; i < len; i++) {
-        ca.status = IndexToExistingId(cx, obj, i, &id);
-        if (!ca.status)
-            goto out;
-
-        if (id == JSID_HOLE) {
-            vec[i] = JSVAL_HOLE;
-            all_strings = JS_FALSE;
-            continue;
-        }
-        newlen++;
-
-        ca.status = OBJ_GET_PROPERTY(cx, obj, id, &vec[i]);
-        if (!ca.status)
-            goto out;
-
-        /* We know JSVAL_IS_STRING yields 0 or 1, so avoid a branch via &=. */
-        all_strings &= JSVAL_IS_STRING(vec[i]);
-    }
-
-    ca.context = cx;
-    ca.fval = fval;
-    ca.localroot = argv + argc;       /* local GC root for temporary string */
-    pivotroot    = argv + argc + 1;   /* local GC root for pivot val */
-    ca.status = JS_TRUE;
-    js_HeapSort(vec, (size_t) len, pivotroot, sizeof(jsval),
-                all_strings ? sort_compare_strings : sort_compare,
-                &ca);
-
-    if (ca.status) {
-        ca.status = InitArrayElements(cx, obj, newlen, vec);
-        if (ca.status)
-            *rval = OBJECT_TO_JSVAL(obj);
-
-        /* Re-create any holes that sorted to the end of the array. */
-        while (len > newlen) {
-            jsval junk;
-
-            if (!IndexToId(cx, --len, &id))
-                return JS_FALSE;
-            if (!OBJ_DELETE_PROPERTY(cx, obj, id, &junk))
-                return JS_FALSE;
-        }
-    }
-
-out:
-    if (vec)
-        JS_free(cx, vec);
-    return ca.status;
-}
-#endif /* JS_HAS_SOME_PERL_FUN */
-
-#if JS_HAS_MORE_PERL_FUN
-/*
- * Perl-inspired push, pop, shift, unshift, and splice methods.
- */
-static JSBool
-array_push(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsuint length;
-    uintN i;
-    jsid id;
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    for (i = 0; i < argc; i++) {
-        if (!IndexToId(cx, length + i, &id))
-            return JS_FALSE;
-        if (!OBJ_SET_PROPERTY(cx, obj, id, &argv[i]))
-            return JS_FALSE;
-    }
-
-    /*
-     * If JS1.2, follow Perl4 by returning the last thing pushed.  Otherwise,
-     * return the new array length.
-     */
-    length += argc;
-    if (JS_VERSION_IS_1_2(cx)) {
-        *rval = argc ? argv[argc-1] : JSVAL_VOID;
-    } else {
-        if (!IndexToValue(cx, length, rval))
-            return JS_FALSE;
-    }
-    return js_SetLengthProperty(cx, obj, length);
-}
-
-static JSBool
-array_pop(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsuint index;
-    jsid id;
-    jsval junk;
-
-    if (!js_GetLengthProperty(cx, obj, &index))
-        return JS_FALSE;
-    if (index > 0) {
-        index--;
-        if (!IndexToId(cx, index, &id))
-            return JS_FALSE;
-
-        /* Get the to-be-deleted property's value into rval. */
-        if (!OBJ_GET_PROPERTY(cx, obj, id, rval))
-            return JS_FALSE;
-
-        if (!OBJ_DELETE_PROPERTY(cx, obj, id, &junk))
-            return JS_FALSE;
-    }
-    return js_SetLengthProperty(cx, obj, index);
-}
-
-static JSBool
-array_shift(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsuint length, i;
-    jsid id, id2;
-    jsval junk;
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    if (length > 0) {
-        length--;
-        id = JSVAL_ZERO;
-
-        /* Get the to-be-deleted property's value into rval ASAP. */
-        if (!OBJ_GET_PROPERTY(cx, obj, id, rval))
-            return JS_FALSE;
-
-        /*
-         * Slide down the array above the first element.
-         */
-        if (length > 0) {
-            for (i = 1; i <= length; i++) {
-                if (!IndexToId(cx, i, &id))
-                    return JS_FALSE;
-                if (!IndexToId(cx, i - 1, &id2))
-                    return JS_FALSE;
-                if (!OBJ_GET_PROPERTY(cx, obj, id, &argv[0]))
-                    return JS_FALSE;
-                if (!OBJ_SET_PROPERTY(cx, obj, id2, &argv[0]))
-                    return JS_FALSE;
-            }
-        }
-
-        /* Delete the only or last element. */
-        if (!OBJ_DELETE_PROPERTY(cx, obj, id, &junk))
-            return JS_FALSE;
-    }
-    return js_SetLengthProperty(cx, obj, length);
-}
-
-static JSBool
-array_unshift(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsuint length, last;
-    uintN i;
-    jsid id, id2;
-    jsval *vp, junk;
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    if (argc > 0) {
-        /* Slide up the array to make room for argc at the bottom. */
-        if (length > 0) {
-            last = length;
-            vp = argv + argc;
-            while (last--) {
-                if (!IndexToExistingId(cx, obj, last, &id))
-                    return JS_FALSE;
-                if (id == JSID_HOLE) {
-                    OBJ_DELETE_PROPERTY(cx, obj, id2, &junk);
-                    continue;
-                }
-                if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-                    return JS_FALSE;
-                if (!IndexToId(cx, last + argc, &id2))
-                    return JS_FALSE;
-                if (!OBJ_SET_PROPERTY(cx, obj, id2, vp))
-                    return JS_FALSE;
-            }
-        }
-
-        /* Copy from argv to the bottom of the array. */
-        for (i = 0; i < argc; i++) {
-            if (!IndexToId(cx, i, &id))
-                return JS_FALSE;
-            if (!OBJ_SET_PROPERTY(cx, obj, id, &argv[i]))
-                return JS_FALSE;
-        }
-
-        /* Follow Perl by returning the new array length. */
-        length += argc;
-        if (!js_SetLengthProperty(cx, obj, length))
-            return JS_FALSE;
-    }
-    return IndexToValue(cx, length, rval);
-}
-
-static JSBool
-array_splice(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval *vp, junk;
-    jsuint length, begin, end, count, delta, last;
-    jsdouble d;
-    jsid id, id2;
-    JSObject *obj2;
-    uintN i;
-
-    /*
-     * Nothing to do if no args.  Otherwise point vp at our one explicit local
-     * root and get length.
-     */
-    if (argc == 0)
-        return JS_TRUE;
-    vp = argv + argc;
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-
-    /* Convert the first argument into a starting index. */
-    if (!js_ValueToNumber(cx, *argv, &d))
-        return JS_FALSE;
-    d = js_DoubleToInteger(d);
-    if (d < 0) {
-        d += length;
-        if (d < 0)
-            d = 0;
-    } else if (d > length) {
-        d = length;
-    }
-    begin = (jsuint)d; /* d has been clamped to uint32 */
-    argc--;
-    argv++;
-
-    /* Convert the second argument from a count into a fencepost index. */
-    delta = length - begin;
-    if (argc == 0) {
-        count = delta;
-        end = length;
-    } else {
-        if (!js_ValueToNumber(cx, *argv, &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
-        if (d < 0)
-            d = 0;
-        else if (d > delta)
-            d = delta;
-        count = (jsuint)d;
-        end = begin + count;
-        argc--;
-        argv++;
-    }
-
-    if (count == 1 && JS_VERSION_IS_1_2(cx)) {
-        /*
-         * JS lacks "list context", whereby in Perl one turns the single
-         * scalar that's spliced out into an array just by assigning it to
-         * @single instead of $single, or by using it as Perl push's first
-         * argument, for instance.
-         *
-         * JS1.2 emulated Perl too closely and returned a non-Array for
-         * the single-splice-out case, requiring callers to test and wrap
-         * in [] if necessary.  So JS1.3, default, and other versions all
-         * return an array of length 1 for uniformity.
-         */
-        if (!IndexToId(cx, begin, &id))
-            return JS_FALSE;
-        if (!OBJ_GET_PROPERTY(cx, obj, id, rval))
-            return JS_FALSE;
-    } else {
-        if (!JS_VERSION_IS_1_2(cx) || count > 0) {
-            /*
-             * Create a new array value to return.  Our ECMA v2 proposal specs
-             * that splice always returns an array value, even when given no
-             * arguments.  We think this is best because it eliminates the need
-             * for callers to do an extra test to handle the empty splice case.
-             */
-            obj2 = js_NewArrayObject(cx, 0, NULL);
-            if (!obj2)
-                return JS_FALSE;
-            *rval = OBJECT_TO_JSVAL(obj2);
-
-            /* If there are elements to remove, put them into the return value. */
-            if (count > 0) {
-                for (last = begin; last < end; last++) {
-                    if (!IndexToExistingId(cx, obj, last, &id))
-                        return JS_FALSE;
-                    if (id == JSID_HOLE)
-                        continue;       /* don't fill holes in the new array */
-                    if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-                        return JS_FALSE;
-                    if (!IndexToId(cx, last - begin, &id2))
-                        return JS_FALSE;
-                    if (!OBJ_SET_PROPERTY(cx, obj2, id2, vp))
-                        return JS_FALSE;
-                }
-
-                if (!js_SetLengthProperty(cx, obj2, end - begin))
-                    return JS_FALSE;
-            }
-        }
-    }
-
-    /* Find the direction (up or down) to copy and make way for argv. */
-    if (argc > count) {
-        delta = (jsuint)argc - count;
-        last = length;
-        /* (uint) end could be 0, so can't use vanilla >= test */
-        while (last-- > end) {
-            if (!IndexToExistingId(cx, obj, last, &id))
-                return JS_FALSE;
-            if (!IndexToId(cx, last + delta, &id2))
-                return JS_FALSE;
-            if (id != JSID_HOLE) {
-                if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-                    return JS_FALSE;
-                if (!OBJ_SET_PROPERTY(cx, obj, id2, vp))
-                    return JS_FALSE;
-            } else {
-                if (!OBJ_DELETE_PROPERTY(cx, obj, id2, &junk))
-                    return JS_FALSE;
-            }
-        }
-        length += delta;
-    } else if (argc < count) {
-        delta = count - (jsuint)argc;
-        for (last = end; last < length; last++) {
-            if (!IndexToExistingId(cx, obj, last, &id))
-                return JS_FALSE;
-            if (!IndexToId(cx, last - delta, &id2))
-                return JS_FALSE;
-            if (id != JSID_HOLE) {
-                if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-                    return JS_FALSE;
-                if (!OBJ_SET_PROPERTY(cx, obj, id2, vp))
-                    return JS_FALSE;
-            } else {
-                if (!OBJ_DELETE_PROPERTY(cx, obj, id2, &junk))
-                    return JS_FALSE;
-            }
-        }
-        length -= delta;
-    }
-
-    /* Copy from argv into the hole to complete the splice. */
-    for (i = 0; i < argc; i++) {
-        if (!IndexToId(cx, begin + i, &id))
-            return JS_FALSE;
-        if (!OBJ_SET_PROPERTY(cx, obj, id, &argv[i]))
-            return JS_FALSE;
-    }
-
-    /* Update length in case we deleted elements from the end. */
-    return js_SetLengthProperty(cx, obj, length);
-}
-#endif /* JS_HAS_MORE_PERL_FUN */
-
-#if JS_HAS_SEQUENCE_OPS
-/*
- * Python-esque sequence operations.
- */
-static JSBool
-array_concat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval *vp, v;
-    JSObject *nobj, *aobj;
-    jsuint length, alength, slot;
-    uintN i;
-    jsid id, id2;
-
-    /* Hoist the explicit local root address computation. */
-    vp = argv + argc;
-
-    /* Treat obj as the first argument; see ECMA 15.4.4.4. */
-    --argv;
-    JS_ASSERT(obj == JSVAL_TO_OBJECT(argv[0]));
-
-    /* Create a new Array object and store it in the rval local root. */
-    nobj = js_NewArrayObject(cx, 0, NULL);
-    if (!nobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(nobj);
-
-    /* Loop over [0, argc] to concat args into nobj, expanding all Arrays. */
-    length = 0;
-    for (i = 0; i <= argc; i++) {
-        v = argv[i];
-        if (JSVAL_IS_OBJECT(v)) {
-            aobj = JSVAL_TO_OBJECT(v);
-            if (aobj && OBJ_GET_CLASS(cx, aobj) == &js_ArrayClass) {
-                if (!OBJ_GET_PROPERTY(cx, aobj,
-                                      ATOM_TO_JSID(cx->runtime->atomState
-                                                   .lengthAtom),
-                                      vp)) {
-                    return JS_FALSE;
-                }
-                if (!ValueIsLength(cx, *vp, &alength))
-                    return JS_FALSE;
-                for (slot = 0; slot < alength; slot++) {
-                    if (!IndexToExistingId(cx, aobj, slot, &id))
-                        return JS_FALSE;
-                    if (id == JSID_HOLE) {
-                        /*
-                         * Per ECMA 262, 15.4.4.4, step 9, ignore non-existent
-                         * properties.
-                         */
-                        continue;
-                    }
-                    if (!OBJ_GET_PROPERTY(cx, aobj, id, vp))
-                        return JS_FALSE;
-                    if (!IndexToId(cx, length + slot, &id2))
-                        return JS_FALSE;
-                    if (!OBJ_SET_PROPERTY(cx, nobj, id2, vp))
-                        return JS_FALSE;
-                }
-                length += alength;
-                continue;
-            }
-        }
-
-        *vp = v;
-        if (!IndexToId(cx, length, &id))
-            return JS_FALSE;
-        if (!OBJ_SET_PROPERTY(cx, nobj, id, vp))
-            return JS_FALSE;
-        length++;
-    }
-
-    return js_SetLengthProperty(cx, nobj, length);
-}
-
-static JSBool
-array_slice(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval *vp;
-    JSObject *nobj;
-    jsuint length, begin, end, slot;
-    jsdouble d;
-    jsid id, id2;
-
-    /* Hoist the explicit local root address computation. */
-    vp = argv + argc;
-
-    /* Create a new Array object and store it in the rval local root. */
-    nobj = js_NewArrayObject(cx, 0, NULL);
-    if (!nobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(nobj);
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    begin = 0;
-    end = length;
-
-    if (argc > 0) {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
-        if (d < 0) {
-            d += length;
-            if (d < 0)
-                d = 0;
-        } else if (d > length) {
-            d = length;
-        }
-        begin = (jsuint)d;
-
-        if (argc > 1) {
-            if (!js_ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-            d = js_DoubleToInteger(d);
-            if (d < 0) {
-                d += length;
-                if (d < 0)
-                    d = 0;
-            } else if (d > length) {
-                d = length;
-            }
-            end = (jsuint)d;
-        }
-    }
-
-    if (begin > end)
-        begin = end;
-
-    for (slot = begin; slot < end; slot++) {
-        if (!IndexToExistingId(cx, obj, slot, &id))
-            return JS_FALSE;
-        if (id == JSID_HOLE)
-            continue;
-        if (!OBJ_GET_PROPERTY(cx, obj, id, vp))
-            return JS_FALSE;
-        if (!IndexToId(cx, slot - begin, &id2))
-            return JS_FALSE;
-        if (!OBJ_SET_PROPERTY(cx, nobj, id2, vp))
-            return JS_FALSE;
-    }
-    return js_SetLengthProperty(cx, nobj, end - begin);
-}
-#endif /* JS_HAS_SEQUENCE_OPS */
-
-#if JS_HAS_ARRAY_EXTRAS
-
-static JSBool
-array_indexOfHelper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                    jsval *rval, JSBool isLast)
-{
-    jsuint length, i, stop;
-    jsint direction;
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-    if (length == 0)
-        goto not_found;
-
-    if (argc <= 1) {
-        i = isLast ? length - 1 : 0;
-    } else {
-        jsdouble start;
-
-        if (!js_ValueToNumber(cx, argv[1], &start))
-            return JS_FALSE;
-        start = js_DoubleToInteger(start);
-        if (start < 0) {
-            start += length;
-            i = (start < 0) ? 0 : (jsuint)start;
-        } else if (start >= length) {
-            i = length - 1;
-        } else {
-            i = (jsuint)start;
-        }
-    }
-
-    if (isLast) {
-        stop = 0;
-        direction = -1;
-    } else {
-        stop = length - 1;
-        direction = 1;
-    }
-
-    for (;;) {
-        jsid id;
-        jsval v;
-
-        if (!IndexToExistingId(cx, obj, (jsuint)i, &id))
-            return JS_FALSE;
-        if (id != JSID_HOLE) {
-            if (!OBJ_GET_PROPERTY(cx, obj, id, &v))
-                return JS_FALSE;
-            if (js_StrictlyEqual(v, argv[0]))
-                return js_NewNumberValue(cx, i, rval);
-        }
-
-        if (i == stop)
-            goto not_found;
-        i += direction;
-    }
-
-  not_found:
-    *rval = INT_TO_JSVAL(-1);
-    return JS_TRUE;
-}
-
-static JSBool
-array_indexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    return array_indexOfHelper(cx, obj, argc, argv, rval, JS_FALSE);
-}
-
-static JSBool
-array_lastIndexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                  jsval *rval)
-{
-    return array_indexOfHelper(cx, obj, argc, argv, rval, JS_TRUE);
-}
-
-/* Order is important; extras that use a caller's predicate must follow MAP. */
-typedef enum ArrayExtraMode {
-    FOREACH,
-    MAP,
-    FILTER,
-    SOME,
-    EVERY
-} ArrayExtraMode;
-
-static JSBool
-array_extra(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval,
-            ArrayExtraMode mode)
-{
-    jsval *vp, *sp, *origsp, *oldsp;
-    jsuint length, newlen, i;
-    JSObject *callable, *thisp, *newarr;
-    void *mark;
-    JSStackFrame *fp;
-    JSBool ok, b;
-
-    /* Hoist the explicit local root address computation. */
-    vp = argv + argc;
-
-    if (!js_GetLengthProperty(cx, obj, &length))
-        return JS_FALSE;
-
-    /*
-     * First, get or compute our callee, so that we error out consistently
-     * when passed a non-callable object.
-     */
-    callable = js_ValueToCallableObject(cx, &argv[0], 0);
-    if (!callable)
-        return JS_FALSE;
-
-    /*
-     * Set our initial return condition, used for zero-length array cases
-     * (and pre-size our map return to match our known length, for all cases).
-     */
-#ifdef __GNUC__ /* quell GCC overwarning */
-    newlen = 0;
-    newarr = NULL;
-    ok = JS_TRUE;
-#endif
-    switch (mode) {
-      case MAP:
-      case FILTER:
-        newlen = (mode == MAP) ? length : 0;
-        newarr = js_NewArrayObject(cx, newlen, NULL);
-        if (!newarr)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(newarr);
-        break;
-      case SOME:
-        *rval = JSVAL_FALSE;
-        break;
-      case EVERY:
-        *rval = JSVAL_TRUE;
-        break;
-      case FOREACH:
-        break;
-    }
-
-    if (length == 0)
-        return JS_TRUE;
-
-    if (argc > 1) {
-        if (!js_ValueToObject(cx, argv[1], &thisp))
-            return JS_FALSE;
-        argv[1] = OBJECT_TO_JSVAL(thisp);
-    } else {
-        JSObject *tmp;
-        thisp = callable;
-        while ((tmp = OBJ_GET_PARENT(cx, thisp)) != NULL)
-            thisp = tmp;
-    }
-
-    /* We call with 3 args (value, index, array), plus room for rval. */
-    origsp = js_AllocStack(cx, 2 + 3 + 1, &mark);
-    if (!origsp)
-        return JS_FALSE;
-
-    /* Lift current frame to include our args. */
-    fp = cx->fp;
-    oldsp = fp->sp;
-
-    for (i = 0; i < length; i++) {
-        jsid id;
-        jsval rval2;
-
-        ok = IndexToExistingId(cx, obj, i, &id);
-        if (!ok)
-            break;
-        if (id == JSID_HOLE)
-            continue;
-        ok = OBJ_GET_PROPERTY(cx, obj, id, vp);
-        if (!ok)
-            break;
-
-        /* Push callable and 'this', then args. */
-        sp = origsp;
-        *sp++ = OBJECT_TO_JSVAL(callable);
-        *sp++ = OBJECT_TO_JSVAL(thisp);
-        *sp++ = *vp;
-        *sp++ = INT_TO_JSVAL(i);
-        *sp++ = OBJECT_TO_JSVAL(obj);
-
-        /* Do the call. */
-        fp->sp = sp;
-        ok = js_Invoke(cx, 3, JSINVOKE_INTERNAL);
-        rval2 = fp->sp[-1];
-        fp->sp = oldsp;
-        if (!ok)
-            break;
-
-        if (mode > MAP) {
-            if (rval2 == JSVAL_NULL) {
-                b = JS_FALSE;
-            } else if (JSVAL_IS_BOOLEAN(rval2)) {
-                b = JSVAL_TO_BOOLEAN(rval2);
-            } else {
-                ok = js_ValueToBoolean(cx, rval2, &b);
-                if (!ok)
-                    goto out;
-            }
-        }
-
-        switch (mode) {
-          case FOREACH:
-            break;
-          case MAP:
-            ok = OBJ_SET_PROPERTY(cx, newarr, id, &rval2);
-            if (!ok)
-                goto out;
-            break;
-          case FILTER:
-            if (!b)
-                break;
-            /* Filter passed *vp, push as result. */
-            ok = IndexToId(cx, newlen++, &id);
-            if (!ok)
-                goto out;
-            ok = OBJ_SET_PROPERTY(cx, newarr, id, vp);
-            if (!ok)
-                goto out;
-            break;
-          case SOME:
-            if (b) {
-                *rval = JSVAL_TRUE;
-                goto out;
-            }
-            break;
-          case EVERY:
-            if (!b) {
-                *rval = JSVAL_FALSE;
-                goto out;
-            }
-            break;
-        }
-    }
-
- out:
-    js_FreeStack(cx, mark);
-    if (ok && mode == FILTER)
-        ok = js_SetLengthProperty(cx, newarr, newlen);
-    return ok;
-}
-
-static JSBool
-array_forEach(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    return array_extra(cx, obj, argc, argv, rval, FOREACH);
-}
-
-static JSBool
-array_map(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-          jsval *rval)
-{
-    return array_extra(cx, obj, argc, argv, rval, MAP);
-}
-
-static JSBool
-array_filter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    return array_extra(cx, obj, argc, argv, rval, FILTER);
-}
-
-static JSBool
-array_some(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-           jsval *rval)
-{
-    return array_extra(cx, obj, argc, argv, rval, SOME);
-}
-
-static JSBool
-array_every(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-           jsval *rval)
-{
-    return array_extra(cx, obj, argc, argv, rval, EVERY);
-}
-#endif
-
-static JSFunctionSpec array_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,       array_toSource,         0,0,0},
-#endif
-    {js_toString_str,       array_toString,         0,0,0},
-    {js_toLocaleString_str, array_toLocaleString,   0,0,0},
-
-    /* Perl-ish methods. */
-#if JS_HAS_SOME_PERL_FUN
-    {"join",                array_join,             1,JSFUN_GENERIC_NATIVE,0},
-    {"reverse",             array_reverse,          0,JSFUN_GENERIC_NATIVE,2},
-    {"sort",                array_sort,             1,JSFUN_GENERIC_NATIVE,2},
-#endif
-#if JS_HAS_MORE_PERL_FUN
-    {"push",                array_push,             1,JSFUN_GENERIC_NATIVE,0},
-    {"pop",                 array_pop,              0,JSFUN_GENERIC_NATIVE,0},
-    {"shift",               array_shift,            0,JSFUN_GENERIC_NATIVE,1},
-    {"unshift",             array_unshift,          1,JSFUN_GENERIC_NATIVE,1},
-    {"splice",              array_splice,           2,JSFUN_GENERIC_NATIVE,1},
-#endif
-
-    /* Python-esque sequence methods. */
-#if JS_HAS_SEQUENCE_OPS
-    {"concat",              array_concat,           1,JSFUN_GENERIC_NATIVE,1},
-    {"slice",               array_slice,            2,JSFUN_GENERIC_NATIVE,1},
-#endif
-
-#if JS_HAS_ARRAY_EXTRAS
-    {"indexOf",             array_indexOf,          1,JSFUN_GENERIC_NATIVE,0},
-    {"lastIndexOf",         array_lastIndexOf,      1,JSFUN_GENERIC_NATIVE,0},
-    {"forEach",             array_forEach,          1,JSFUN_GENERIC_NATIVE,1},
-    {"map",                 array_map,              1,JSFUN_GENERIC_NATIVE,1},
-    {"filter",              array_filter,           1,JSFUN_GENERIC_NATIVE,1},
-    {"some",                array_some,             1,JSFUN_GENERIC_NATIVE,1},
-    {"every",               array_every,            1,JSFUN_GENERIC_NATIVE,1},
-#endif
-
-    {0,0,0,0,0}
-};
-
-static JSBool
-Array(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsuint length;
-    jsval *vector;
-
-    /* If called without new, replace obj with a new Array object. */
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        obj = js_NewObject(cx, &js_ArrayClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-
-    if (argc == 0) {
-        length = 0;
-        vector = NULL;
-    } else if (JS_VERSION_IS_1_2(cx)) {
-        length = (jsuint) argc;
-        vector = argv;
-    } else if (argc > 1) {
-        length = (jsuint) argc;
-        vector = argv;
-    } else if (!JSVAL_IS_NUMBER(argv[0])) {
-        length = 1;
-        vector = argv;
-    } else {
-        if (!ValueIsLength(cx, argv[0], &length))
-            return JS_FALSE;
-        vector = NULL;
-    }
-    return InitArrayObject(cx, obj, length, vector);
-}
-
-JSObject *
-js_InitArrayClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_ArrayClass, Array, 1,
-                         NULL, array_methods, NULL, NULL);
-
-    /* Initialize the Array prototype object so it gets a length property. */
-    if (!proto || !InitArrayObject(cx, proto, 0, NULL))
-        return NULL;
-    return proto;
-}
-
-JSObject *
-js_NewArrayObject(JSContext *cx, jsuint length, jsval *vector)
-{
-    JSObject *obj;
-
-    obj = js_NewObject(cx, &js_ArrayClass, NULL, NULL);
-    if (!obj)
-        return NULL;
-    if (!InitArrayObject(cx, obj, length, vector)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    return obj;
-}
diff --git a/libs/js/src/jsarray.h b/libs/js/src/jsarray.h
deleted file mode 100644
index 0f43bee079..0000000000
--- a/libs/js/src/jsarray.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsarray_h___
-#define jsarray_h___
-/*
- * JS Array interface.
- */
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-extern JSBool
-js_IdIsIndex(jsval id, jsuint *indexp);
-
-extern JSClass js_ArrayClass;
-
-extern JSObject *
-js_InitArrayClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_NewArrayObject(JSContext *cx, jsuint length, jsval *vector);
-
-extern JSBool
-js_GetLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-extern JSBool
-js_SetLengthProperty(JSContext *cx, JSObject *obj, jsuint length);
-
-extern JSBool
-js_HasLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-/*
- * JS-specific heap sort function.
- */
-typedef int (*JSComparator)(const void *a, const void *b, void *arg);
-
-extern void
-js_HeapSort(void *vec, size_t nel, void *pivot, size_t elsize,
-            JSComparator cmp, void *arg);
-
-JS_END_EXTERN_C
-
-#endif /* jsarray_h___ */
diff --git a/libs/js/src/jsatom.c b/libs/js/src/jsatom.c
deleted file mode 100644
index 128476e0f1..0000000000
--- a/libs/js/src/jsatom.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS atom table.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jshash.h" /* Added by JSIFY */
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsgc.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsopcode.h"
-#include "jsstr.h"
-
-JS_FRIEND_API(const char *)
-js_AtomToPrintableString(JSContext *cx, JSAtom *atom)
-{
-    return js_ValueToPrintableString(cx, ATOM_KEY(atom));
-}
-
-#if JS_HAS_ERROR_EXCEPTIONS
-extern const char js_Error_str[];       /* trivial, from jsexn.h */
-#endif
-
-/*
- * Keep this in sync with jspubtd.h -- an assertion below will insist that
- * its length match the JSType enum's JSTYPE_LIMIT limit value.
- */
-const char *js_type_str[] = {
-    "undefined",
-    js_object_str,
-    "function",
-    "string",
-    "number",
-    "boolean",
-    "null",
-    "xml",
-};
-
-const char *js_boolean_str[] = {
-    js_false_str,
-    js_true_str
-};
-
-const char js_Arguments_str[]       = "Arguments";
-const char js_Array_str[]           = "Array";
-const char js_Boolean_str[]         = "Boolean";
-const char js_Call_str[]            = "Call";
-const char js_Date_str[]            = "Date";
-const char js_Function_str[]        = "Function";
-const char js_Math_str[]            = "Math";
-const char js_Namespace_str[]       = "Namespace";
-const char js_Number_str[]          = "Number";
-const char js_Object_str[]          = "Object";
-const char js_QName_str[]           = "QName";
-const char js_RegExp_str[]          = "RegExp";
-const char js_Script_str[]          = "Script";
-const char js_String_str[]          = "String";
-const char js_XML_str[]             = "XML";
-const char js_File_str[]            = "File";
-const char js_anonymous_str[]       = "anonymous";
-const char js_arguments_str[]       = "arguments";
-const char js_arity_str[]           = "arity";
-const char js_callee_str[]          = "callee";
-const char js_caller_str[]          = "caller";
-const char js_class_prototype_str[] = "prototype";
-const char js_constructor_str[]     = "constructor";
-const char js_count_str[]           = "__count__";
-const char js_each_str[]            = "each";
-const char js_eval_str[]            = "eval";
-const char js_getter_str[]          = "getter";
-const char js_get_str[]             = "get";
-const char js_index_str[]           = "index";
-const char js_input_str[]           = "input";
-const char js_length_str[]          = "length";
-const char js_name_str[]            = "name";
-const char js_noSuchMethod_str[]    = "__noSuchMethod__";
-const char js_object_str[]          = "object";
-const char js_parent_str[]          = "__parent__";
-const char js_private_str[]         = "private";
-const char js_proto_str[]           = "__proto__";
-const char js_setter_str[]          = "setter";
-const char js_set_str[]             = "set";
-const char js_toSource_str[]        = "toSource";
-const char js_toString_str[]        = "toString";
-const char js_toLocaleString_str[]  = "toLocaleString";
-const char js_valueOf_str[]         = "valueOf";
-
-#if JS_HAS_XML_SUPPORT
-const char js_etago_str[]           = "</";
-const char js_namespace_str[]       = "namespace";
-const char js_ptagc_str[]           = "/>";
-const char js_qualifier_str[]       = "::";
-const char js_space_str[]           = " ";
-const char js_stago_str[]           = "<";
-const char js_star_str[]            = "*";
-const char js_starQualifier_str[]   = "*::";
-const char js_tagc_str[]            = ">";
-const char js_xml_str[]             = "xml";
-#endif
-
-#if defined(OSSP) && defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-const char js_DSO_str[]             = "DSO";
-#endif
-
-#ifdef NARCISSUS
-const char js_call_str[]             = "__call__";
-const char js_construct_str[]        = "__construct__";
-const char js_hasInstance_str[]      = "__hasInstance__";
-const char js_ExecutionContext_str[] = "ExecutionContext";
-const char js_current_str[]          = "current";
-#endif
-
-#define HASH_OBJECT(o)  (JS_PTR_TO_UINT32(o) >> JSVAL_TAGBITS)
-#define HASH_INT(i)     ((JSHashNumber)(i))
-#define HASH_DOUBLE(dp) ((JSDOUBLE_HI32(*dp) ^ JSDOUBLE_LO32(*dp)))
-#define HASH_BOOLEAN(b) ((JSHashNumber)(b))
-
-JS_STATIC_DLL_CALLBACK(JSHashNumber)
-js_hash_atom_key(const void *key)
-{
-    jsval v;
-    jsdouble *dp;
-
-    /* Order JSVAL_IS_* tests by likelihood of success. */
-    v = (jsval)key;
-    if (JSVAL_IS_STRING(v))
-        return js_HashString(JSVAL_TO_STRING(v));
-    if (JSVAL_IS_INT(v))
-        return HASH_INT(JSVAL_TO_INT(v));
-    if (JSVAL_IS_DOUBLE(v)) {
-        dp = JSVAL_TO_DOUBLE(v);
-        return HASH_DOUBLE(dp);
-    }
-    if (JSVAL_IS_OBJECT(v))
-        return HASH_OBJECT(JSVAL_TO_OBJECT(v));
-    if (JSVAL_IS_BOOLEAN(v))
-        return HASH_BOOLEAN(JSVAL_TO_BOOLEAN(v));
-    return (JSHashNumber)v;
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_compare_atom_keys(const void *k1, const void *k2)
-{
-    jsval v1, v2;
-
-    v1 = (jsval)k1, v2 = (jsval)k2;
-    if (JSVAL_IS_STRING(v1) && JSVAL_IS_STRING(v2))
-        return !js_CompareStrings(JSVAL_TO_STRING(v1), JSVAL_TO_STRING(v2));
-    if (JSVAL_IS_DOUBLE(v1) && JSVAL_IS_DOUBLE(v2)) {
-        double d1 = *JSVAL_TO_DOUBLE(v1);
-        double d2 = *JSVAL_TO_DOUBLE(v2);
-        if (JSDOUBLE_IS_NaN(d1))
-            return JSDOUBLE_IS_NaN(d2);
-#if defined(XP_WIN)
-        /* XXX MSVC miscompiles such that (NaN == 0) */
-        if (JSDOUBLE_IS_NaN(d2))
-            return JS_FALSE;
-#endif
-        return d1 == d2;
-    }
-    return v1 == v2;
-}
-
-JS_STATIC_DLL_CALLBACK(int)
-js_compare_stub(const void *v1, const void *v2)
-{
-    return 1;
-}
-
-/* These next two are exported to jsscript.c and used similarly there. */
-#ifdef OSSP /* CLEANUP */
-void * JS_DLL_CALLBACK js_alloc_table_space(void *, size_t);
-void   JS_DLL_CALLBACK js_free_table_space(void *, void *);
-#endif
-void * JS_DLL_CALLBACK
-js_alloc_table_space(void *priv, size_t size)
-{
-    return malloc(size);
-}
-
-void JS_DLL_CALLBACK
-js_free_table_space(void *priv, void *item)
-{
-    free(item);
-}
-
-JS_STATIC_DLL_CALLBACK(JSHashEntry *)
-js_alloc_atom(void *priv, const void *key)
-{
-    JSAtomState *state = (JSAtomState *) priv;
-    JSAtom *atom;
-
-    atom = (JSAtom *) malloc(sizeof(JSAtom));
-    if (!atom)
-        return NULL;
-#ifdef JS_THREADSAFE
-    state->tablegen++;
-#endif
-    atom->entry.key = key;
-    atom->entry.value = NULL;
-    atom->flags = 0;
-    atom->number = state->number++;
-    return &atom->entry;
-}
-
-JS_STATIC_DLL_CALLBACK(void)
-js_free_atom(void *priv, JSHashEntry *he, uintN flag)
-{
-    if (flag != HT_FREE_ENTRY)
-        return;
-#ifdef JS_THREADSAFE
-    ((JSAtomState *)priv)->tablegen++;
-#endif
-    free(he);
-}
-
-static JSHashAllocOps atom_alloc_ops = {
-    js_alloc_table_space,   js_free_table_space,
-    js_alloc_atom,          js_free_atom
-};
-
-#define JS_ATOM_HASH_SIZE   1024
-
-JSBool
-js_InitAtomState(JSContext *cx, JSAtomState *state)
-{
-    state->table = JS_NewHashTable(JS_ATOM_HASH_SIZE, js_hash_atom_key,
-                                   js_compare_atom_keys, js_compare_stub,
-                                   &atom_alloc_ops, state);
-    if (!state->table) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    state->runtime = cx->runtime;
-#ifdef JS_THREADSAFE
-    js_InitLock(&state->lock);
-    state->tablegen = 0;
-#endif
-
-    if (!js_InitPinnedAtoms(cx, state)) {
-        js_FreeAtomState(cx, state);
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_InitPinnedAtoms(JSContext *cx, JSAtomState *state)
-{
-    uintN i;
-
-#define FROB(lval,str)                                                        \
-    JS_BEGIN_MACRO                                                            \
-        if (!(state->lval = js_Atomize(cx, str, strlen(str), ATOM_PINNED)))   \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-    JS_ASSERT(sizeof js_type_str / sizeof js_type_str[0] == JSTYPE_LIMIT);
-    for (i = 0; i < JSTYPE_LIMIT; i++)
-        FROB(typeAtoms[i],        js_type_str[i]);
-
-    FROB(booleanAtoms[0],         js_false_str);
-    FROB(booleanAtoms[1],         js_true_str);
-    FROB(nullAtom,                js_null_str);
-
-    FROB(ArgumentsAtom,           js_Arguments_str);
-    FROB(ArrayAtom,               js_Array_str);
-    FROB(BooleanAtom,             js_Boolean_str);
-    FROB(CallAtom,                js_Call_str);
-    FROB(DateAtom,                js_Date_str);
-#if JS_HAS_ERROR_EXCEPTIONS
-    FROB(ErrorAtom,               js_Error_str);
-#endif
-    FROB(FunctionAtom,            js_Function_str);
-    FROB(MathAtom,                js_Math_str);
-    FROB(NamespaceAtom,           js_Namespace_str);
-    FROB(NumberAtom,              js_Number_str);
-    FROB(ObjectAtom,              js_Object_str);
-    FROB(QNameAtom,               js_QName_str);
-    FROB(RegExpAtom,              js_RegExp_str);
-    FROB(ScriptAtom,              js_Script_str);
-    FROB(StringAtom,              js_String_str);
-    FROB(XMLAtom,                 js_XML_str);
-    FROB(FileAtom,                js_File_str);
-    FROB(anonymousAtom,           js_anonymous_str);
-    FROB(argumentsAtom,           js_arguments_str);
-    FROB(arityAtom,               js_arity_str);
-    FROB(calleeAtom,              js_callee_str);
-    FROB(callerAtom,              js_caller_str);
-    FROB(classPrototypeAtom,      js_class_prototype_str);
-    FROB(constructorAtom,         js_constructor_str);
-    FROB(countAtom,               js_count_str);
-    FROB(eachAtom,                js_each_str);
-    FROB(evalAtom,                js_eval_str);
-    FROB(getAtom,                 js_get_str);
-    FROB(getterAtom,              js_getter_str);
-    FROB(indexAtom,               js_index_str);
-    FROB(inputAtom,               js_input_str);
-    FROB(lengthAtom,              js_length_str);
-    FROB(nameAtom,                js_name_str);
-    FROB(noSuchMethodAtom,        js_noSuchMethod_str);
-    FROB(parentAtom,              js_parent_str);
-    FROB(protoAtom,               js_proto_str);
-    FROB(setAtom,                 js_set_str);
-    FROB(setterAtom,              js_setter_str);
-    FROB(toSourceAtom,            js_toSource_str);
-    FROB(toStringAtom,            js_toString_str);
-    FROB(toLocaleStringAtom,      js_toLocaleString_str);
-    FROB(valueOfAtom,             js_valueOf_str);
-
-#if JS_HAS_XML_SUPPORT
-    FROB(etagoAtom,               js_etago_str);
-    FROB(namespaceAtom,           js_namespace_str);
-    FROB(ptagcAtom,               js_ptagc_str);
-    FROB(qualifierAtom,           js_qualifier_str);
-    FROB(spaceAtom,               js_space_str);
-    FROB(stagoAtom,               js_stago_str);
-    FROB(starAtom,                js_star_str);
-    FROB(starQualifierAtom,       js_starQualifier_str);
-    FROB(tagcAtom,                js_tagc_str);
-    FROB(xmlAtom,                 js_xml_str);
-#endif
-    
-#if defined(OSSP) && defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)
-    FROB(DSOAtom,                 js_DSO_str);
-#endif
-
-#ifdef NARCISSUS
-    FROB(callAtom,                js_call_str);
-    FROB(constructAtom,           js_construct_str);
-    FROB(hasInstanceAtom,         js_hasInstance_str);
-    FROB(ExecutionContextAtom,    js_ExecutionContext_str);
-    FROB(currentAtom,             js_current_str);
-#endif
-
-#undef FROB
-
-    memset(&state->lazy, 0, sizeof state->lazy);
-    return JS_TRUE;
-}
-
-/* NB: cx unused; js_FinishAtomState calls us with null cx. */
-void
-js_FreeAtomState(JSContext *cx, JSAtomState *state)
-{
-    if (state->table)
-        JS_HashTableDestroy(state->table);
-#ifdef JS_THREADSAFE
-    js_FinishLock(&state->lock);
-#endif
-    memset(state, 0, sizeof *state);
-}
-
-typedef struct UninternArgs {
-    JSRuntime   *rt;
-    jsatomid    leaks;
-} UninternArgs;
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_atom_uninterner(JSHashEntry *he, intN i, void *arg)
-{
-    JSAtom *atom;
-    UninternArgs *args;
-
-    atom = (JSAtom *)he;
-    args = (UninternArgs *)arg;
-    if (ATOM_IS_STRING(atom))
-        js_FinalizeStringRT(args->rt, ATOM_TO_STRING(atom));
-    else if (ATOM_IS_OBJECT(atom))
-        args->leaks++;
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_FinishAtomState(JSAtomState *state)
-{
-    UninternArgs args;
-
-    if (!state->table)
-        return;
-    args.rt = state->runtime;
-    args.leaks = 0;
-    JS_HashTableEnumerateEntries(state->table, js_atom_uninterner, &args);
-#ifdef DEBUG
-    if (args.leaks != 0) {
-        fprintf(stderr,
-"JS engine warning: %lu atoms remain after destroying the JSRuntime.\n"
-"                   These atoms may point to freed memory. Things reachable\n"
-"                   through them have not been finalized.\n",
-                (unsigned long) args.leaks);
-    }
-#endif
-    js_FreeAtomState(NULL, state);
-}
-
-typedef struct MarkArgs {
-    uintN           gcflags;
-    JSGCThingMarker mark;
-    void            *data;
-} MarkArgs;
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_atom_marker(JSHashEntry *he, intN i, void *arg)
-{
-    JSAtom *atom;
-    MarkArgs *args;
-    jsval key;
-
-    atom = (JSAtom *)he;
-    args = (MarkArgs *)arg;
-    if ((atom->flags & (ATOM_PINNED | ATOM_INTERNED)) ||
-        (args->gcflags & GC_KEEP_ATOMS)) {
-        atom->flags |= ATOM_MARK;
-        key = ATOM_KEY(atom);
-        if (JSVAL_IS_GCTHING(key))
-            args->mark(JSVAL_TO_GCTHING(key), args->data);
-    }
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_MarkAtomState(JSAtomState *state, uintN gcflags, JSGCThingMarker mark,
-                 void *data)
-{
-    MarkArgs args;
-
-    if (!state->table)
-        return;
-    args.gcflags = gcflags;
-    args.mark = mark;
-    args.data = data;
-    JS_HashTableEnumerateEntries(state->table, js_atom_marker, &args);
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_atom_sweeper(JSHashEntry *he, intN i, void *arg)
-{
-    JSAtom *atom;
-    JSAtomState *state;
-
-    atom = (JSAtom *)he;
-    if (atom->flags & ATOM_MARK) {
-        atom->flags &= ~ATOM_MARK;
-        state = (JSAtomState *)arg;
-        state->liveAtoms++;
-        return HT_ENUMERATE_NEXT;
-    }
-    JS_ASSERT((atom->flags & (ATOM_PINNED | ATOM_INTERNED)) == 0);
-    atom->entry.key = atom->entry.value = NULL;
-    atom->flags = 0;
-    return HT_ENUMERATE_REMOVE;
-}
-
-void
-js_SweepAtomState(JSAtomState *state)
-{
-    state->liveAtoms = 0;
-    if (state->table)
-        JS_HashTableEnumerateEntries(state->table, js_atom_sweeper, state);
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_atom_unpinner(JSHashEntry *he, intN i, void *arg)
-{
-    JSAtom *atom;
-
-    atom = (JSAtom *)he;
-    atom->flags &= ~ATOM_PINNED;
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_UnpinPinnedAtoms(JSAtomState *state)
-{
-    if (state->table)
-        JS_HashTableEnumerateEntries(state->table, js_atom_unpinner, NULL);
-}
-
-static JSAtom *
-js_AtomizeHashedKey(JSContext *cx, jsval key, JSHashNumber keyHash, uintN flags)
-{
-    JSAtomState *state;
-    JSHashTable *table;
-    JSHashEntry *he, **hep;
-    JSAtom *atom;
-
-    state = &cx->runtime->atomState;
-    JS_LOCK(&state->lock, cx);
-    table = state->table;
-    hep = JS_HashTableRawLookup(table, keyHash, (void *)key);
-    if ((he = *hep) == NULL) {
-        he = JS_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
-        if (!he) {
-            JS_ReportOutOfMemory(cx);
-            atom = NULL;
-            goto out;
-        }
-    }
-
-    atom = (JSAtom *)he;
-    atom->flags |= flags;
-    cx->lastAtom = atom;
-out:
-    JS_UNLOCK(&state->lock,cx);
-    return atom;
-}
-
-JSAtom *
-js_AtomizeObject(JSContext *cx, JSObject *obj, uintN flags)
-{
-    jsval key;
-    JSHashNumber keyHash;
-
-    /* XXX must be set in the following order or MSVC1.52 will crash */
-    keyHash = HASH_OBJECT(obj);
-    key = OBJECT_TO_JSVAL(obj);
-    return js_AtomizeHashedKey(cx, key, keyHash, flags);
-}
-
-JSAtom *
-js_AtomizeBoolean(JSContext *cx, JSBool b, uintN flags)
-{
-    jsval key;
-    JSHashNumber keyHash;
-
-    key = BOOLEAN_TO_JSVAL(b);
-    keyHash = HASH_BOOLEAN(b);
-    return js_AtomizeHashedKey(cx, key, keyHash, flags);
-}
-
-JSAtom *
-js_AtomizeInt(JSContext *cx, jsint i, uintN flags)
-{
-    jsval key;
-    JSHashNumber keyHash;
-
-    key = INT_TO_JSVAL(i);
-    keyHash = HASH_INT(i);
-    return js_AtomizeHashedKey(cx, key, keyHash, flags);
-}
-
-/* Worst-case alignment grain and aligning macro for 2x-sized buffer. */
-#define ALIGNMENT(t)    JS_MAX(JSVAL_ALIGN, sizeof(t))
-#define ALIGN(b,t)      ((t*) &(b)[ALIGNMENT(t) - (jsuword)(b) % ALIGNMENT(t)])
-
-JSAtom *
-js_AtomizeDouble(JSContext *cx, jsdouble d, uintN flags)
-{
-    jsdouble *dp;
-    JSHashNumber keyHash;
-    jsval key;
-    JSAtomState *state;
-    JSHashTable *table;
-    JSHashEntry *he, **hep;
-    JSAtom *atom;
-    char buf[2 * ALIGNMENT(double)];
-
-    dp = ALIGN(buf, double);
-    *dp = d;
-    keyHash = HASH_DOUBLE(dp);
-    key = DOUBLE_TO_JSVAL(dp);
-    state = &cx->runtime->atomState;
-    JS_LOCK(&state->lock, cx);
-    table = state->table;
-    hep = JS_HashTableRawLookup(table, keyHash, (void *)key);
-    if ((he = *hep) == NULL) {
-#ifdef JS_THREADSAFE
-        uint32 gen = state->tablegen;
-#endif
-        JS_UNLOCK(&state->lock,cx);
-        if (!js_NewDoubleValue(cx, d, &key))
-            return NULL;
-        JS_LOCK(&state->lock, cx);
-#ifdef JS_THREADSAFE
-        if (state->tablegen != gen) {
-            hep = JS_HashTableRawLookup(table, keyHash, (void *)key);
-            if ((he = *hep) != NULL) {
-                atom = (JSAtom *)he;
-                goto out;
-            }
-        }
-#endif
-        he = JS_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
-        if (!he) {
-            JS_ReportOutOfMemory(cx);
-            atom = NULL;
-            goto out;
-        }
-    }
-
-    atom = (JSAtom *)he;
-    atom->flags |= flags;
-    cx->lastAtom = atom;
-out:
-    JS_UNLOCK(&state->lock,cx);
-    return atom;
-}
-
-/*
- * To put an atom into the hidden subspace. XOR its keyHash with this value,
- * which is (sqrt(2)-1) in 32-bit fixed point.
- */
-#define HIDDEN_ATOM_SUBSPACE_KEYHASH    0x6A09E667
-
-JSAtom *
-js_AtomizeString(JSContext *cx, JSString *str, uintN flags)
-{
-    JSHashNumber keyHash;
-    jsval key;
-    JSAtomState *state;
-    JSHashTable *table;
-    JSHashEntry *he, **hep;
-    JSAtom *atom;
-
-    keyHash = js_HashString(str);
-    if (flags & ATOM_HIDDEN)
-        keyHash ^= HIDDEN_ATOM_SUBSPACE_KEYHASH;
-    key = STRING_TO_JSVAL(str);
-    state = &cx->runtime->atomState;
-    JS_LOCK(&state->lock, cx);
-    table = state->table;
-    hep = JS_HashTableRawLookup(table, keyHash, (void *)key);
-    if ((he = *hep) == NULL) {
-#ifdef JS_THREADSAFE
-        uint32 gen = state->tablegen;
-        JS_UNLOCK(&state->lock, cx);
-#endif
-
-        if (flags & ATOM_TMPSTR) {
-            str = (flags & ATOM_NOCOPY)
-                  ? js_NewString(cx, str->chars, str->length, 0)
-                  : js_NewStringCopyN(cx, str->chars, str->length, 0);
-            if (!str)
-                return NULL;
-            key = STRING_TO_JSVAL(str);
-        } else {
-            if (!JS_MakeStringImmutable(cx, str))
-                return NULL;
-        }
-
-#ifdef JS_THREADSAFE
-        JS_LOCK(&state->lock, cx);
-        if (state->tablegen != gen) {
-            hep = JS_HashTableRawLookup(table, keyHash, (void *)key);
-            if ((he = *hep) != NULL) {
-                atom = (JSAtom *)he;
-                if (flags & ATOM_NOCOPY)
-                    str->chars = NULL;
-                goto out;
-            }
-        }
-#endif
-
-        he = JS_HashTableRawAdd(table, hep, keyHash, (void *)key, NULL);
-        if (!he) {
-            JS_ReportOutOfMemory(cx);
-            atom = NULL;
-            goto out;
-        }
-    }
-
-    atom = (JSAtom *)he;
-    atom->flags |= flags & (ATOM_PINNED | ATOM_INTERNED | ATOM_HIDDEN);
-    cx->lastAtom = atom;
-out:
-    JS_UNLOCK(&state->lock,cx);
-    return atom;
-}
-
-JS_FRIEND_API(JSAtom *)
-js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags)
-{
-    jschar *chars;
-    JSString *str;
-    JSAtom *atom;
-    char buf[2 * ALIGNMENT(JSString)];
-
-    /*
-     * Avoiding the malloc in js_InflateString on shorter strings saves us
-     * over 20,000 malloc calls on mozilla browser startup. This compares to
-     * only 131 calls where the string is longer than a 31 char (net) buffer.
-     * The vast majority of atomized strings are already in the hashtable. So
-     * js_AtomizeString rarely has to copy the temp string we make.
-     */
-#define ATOMIZE_BUF_MAX 32
-    jschar inflated[ATOMIZE_BUF_MAX];
-    size_t inflatedLength = ATOMIZE_BUF_MAX - 1;
-
-    if (length < ATOMIZE_BUF_MAX) {
-        js_InflateStringToBuffer(cx, bytes, length, inflated, &inflatedLength);
-        inflated[inflatedLength] = 0;
-        chars = inflated;
-    } else {
-        inflatedLength = length;
-        chars = js_InflateString(cx, bytes, &inflatedLength);
-        if (!chars)
-            return NULL;
-        flags |= ATOM_NOCOPY;
-    }
-
-    str = ALIGN(buf, JSString);
-
-    str->chars = chars;
-    str->length = inflatedLength;
-    atom = js_AtomizeString(cx, str, ATOM_TMPSTR | flags);
-    if (chars != inflated && (!atom || ATOM_TO_STRING(atom)->chars != chars))
-        JS_free(cx, chars);
-    return atom;
-}
-
-JS_FRIEND_API(JSAtom *)
-js_AtomizeChars(JSContext *cx, const jschar *chars, size_t length, uintN flags)
-{
-    JSString *str;
-    char buf[2 * ALIGNMENT(JSString)];
-
-    str = ALIGN(buf, JSString);
-    str->chars = (jschar *)chars;
-    str->length = length;
-    return js_AtomizeString(cx, str, ATOM_TMPSTR | flags);
-}
-
-JSAtom *
-js_AtomizeValue(JSContext *cx, jsval value, uintN flags)
-{
-    if (JSVAL_IS_STRING(value))
-        return js_AtomizeString(cx, JSVAL_TO_STRING(value), flags);
-    if (JSVAL_IS_INT(value))
-        return js_AtomizeInt(cx, JSVAL_TO_INT(value), flags);
-    if (JSVAL_IS_DOUBLE(value))
-        return js_AtomizeDouble(cx, *JSVAL_TO_DOUBLE(value), flags);
-    if (JSVAL_IS_OBJECT(value))
-        return js_AtomizeObject(cx, JSVAL_TO_OBJECT(value), flags);
-    if (JSVAL_IS_BOOLEAN(value))
-        return js_AtomizeBoolean(cx, JSVAL_TO_BOOLEAN(value), flags);
-    return js_AtomizeHashedKey(cx, value, (JSHashNumber)value, flags);
-}
-
-JSAtom *
-js_ValueToStringAtom(JSContext *cx, jsval v)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, v);
-    if (!str)
-        return NULL;
-    return js_AtomizeString(cx, str, 0);
-}
-
-JS_STATIC_DLL_CALLBACK(JSHashNumber)
-js_hash_atom_ptr(const void *key)
-{
-    const JSAtom *atom = key;
-    return atom->number;
-}
-
-JS_STATIC_DLL_CALLBACK(void *)
-js_alloc_temp_space(void *priv, size_t size)
-{
-    JSContext *cx = priv;
-    void *space;
-
-    JS_ARENA_ALLOCATE(space, &cx->tempPool, size);
-    if (!space)
-        JS_ReportOutOfMemory(cx);
-    return space;
-}
-
-JS_STATIC_DLL_CALLBACK(void)
-js_free_temp_space(void *priv, void *item)
-{
-}
-
-JS_STATIC_DLL_CALLBACK(JSHashEntry *)
-js_alloc_temp_entry(void *priv, const void *key)
-{
-    JSContext *cx = priv;
-    JSAtomListElement *ale;
-
-    JS_ARENA_ALLOCATE_TYPE(ale, JSAtomListElement, &cx->tempPool);
-    if (!ale) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-    return &ale->entry;
-}
-
-JS_STATIC_DLL_CALLBACK(void)
-js_free_temp_entry(void *priv, JSHashEntry *he, uintN flag)
-{
-}
-
-static JSHashAllocOps temp_alloc_ops = {
-    js_alloc_temp_space,    js_free_temp_space,
-    js_alloc_temp_entry,    js_free_temp_entry
-};
-
-JSAtomListElement *
-js_IndexAtom(JSContext *cx, JSAtom *atom, JSAtomList *al)
-{
-    JSAtomListElement *ale, *ale2, *next;
-    JSHashEntry **hep;
-
-    ATOM_LIST_LOOKUP(ale, hep, al, atom);
-    if (!ale) {
-        if (al->count < 10) {
-            /* Few enough for linear search, no hash table needed. */
-            JS_ASSERT(!al->table);
-            ale = (JSAtomListElement *)js_alloc_temp_entry(cx, atom);
-            if (!ale)
-                return NULL;
-            ALE_SET_ATOM(ale, atom);
-            ALE_SET_NEXT(ale, al->list);
-            al->list = ale;
-        } else {
-            /* We want to hash.  Have we already made a hash table? */
-            if (!al->table) {
-                /* No hash table yet, so hep had better be null! */
-                JS_ASSERT(!hep);
-                al->table = JS_NewHashTable(al->count + 1, js_hash_atom_ptr,
-                                            JS_CompareValues, JS_CompareValues,
-                                            &temp_alloc_ops, cx);
-                if (!al->table)
-                    return NULL;
-
-                /*
-                 * Set ht->nentries explicitly, because we are moving entries
-                 * from al to ht, not calling JS_HashTable(Raw|)Add.
-                 */
-                al->table->nentries = al->count;
-
-                /* Insert each ale on al->list into the new hash table. */
-                for (ale2 = al->list; ale2; ale2 = next) {
-                    next = ALE_NEXT(ale2);
-                    ale2->entry.keyHash = ALE_ATOM(ale2)->number;
-                    hep = JS_HashTableRawLookup(al->table, ale2->entry.keyHash,
-                                                ale2->entry.key);
-                    ALE_SET_NEXT(ale2, *hep);
-                    *hep = &ale2->entry;
-                }
-                al->list = NULL;
-
-                /* Set hep for insertion of atom's ale, immediately below. */
-                hep = JS_HashTableRawLookup(al->table, atom->number, atom);
-            }
-
-            /* Finally, add an entry for atom into the hash bucket at hep. */
-            ale = (JSAtomListElement *)
-                  JS_HashTableRawAdd(al->table, hep, atom->number, atom, NULL);
-            if (!ale)
-                return NULL;
-        }
-
-        ALE_SET_INDEX(ale, al->count++);
-    }
-    return ale;
-}
-
-JS_FRIEND_API(JSAtom *)
-js_GetAtom(JSContext *cx, JSAtomMap *map, jsatomid i)
-{
-    JSAtom *atom;
-    static JSAtom dummy;
-
-    JS_ASSERT(map->vector && i < map->length);
-    if (!map->vector || i >= map->length) {
-        char numBuf[12];
-        JS_snprintf(numBuf, sizeof numBuf, "%lu", (unsigned long)i);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_ATOMIC_NUMBER, numBuf);
-        return &dummy;
-    }
-    atom = map->vector[i];
-    JS_ASSERT(atom);
-    return atom;
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_map_atom(JSHashEntry *he, intN i, void *arg)
-{
-    JSAtomListElement *ale = (JSAtomListElement *)he;
-    JSAtom **vector = arg;
-
-    vector[ALE_INDEX(ale)] = ALE_ATOM(ale);
-    return HT_ENUMERATE_NEXT;
-}
-
-#ifdef DEBUG
-jsrefcount js_atom_map_count;
-jsrefcount js_atom_map_hash_table_count;
-#endif
-
-JS_FRIEND_API(JSBool)
-js_InitAtomMap(JSContext *cx, JSAtomMap *map, JSAtomList *al)
-{
-    JSAtom **vector;
-    JSAtomListElement *ale;
-    uint32 count;
-
-#ifdef DEBUG
-    JS_ATOMIC_INCREMENT(&js_atom_map_count);
-#endif
-    ale = al->list;
-    if (!ale && !al->table) {
-        map->vector = NULL;
-        map->length = 0;
-        return JS_TRUE;
-    }
-
-    count = al->count;
-    if (count >= ATOM_INDEX_LIMIT) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_TOO_MANY_LITERALS);
-        return JS_FALSE;
-    }
-    vector = (JSAtom **) JS_malloc(cx, (size_t) count * sizeof *vector);
-    if (!vector)
-        return JS_FALSE;
-
-    if (al->table) {
-#ifdef DEBUG
-        JS_ATOMIC_INCREMENT(&js_atom_map_hash_table_count);
-#endif
-        JS_HashTableEnumerateEntries(al->table, js_map_atom, vector);
-    } else {
-        do {
-            vector[ALE_INDEX(ale)] = ALE_ATOM(ale);
-        } while ((ale = ALE_NEXT(ale)) != NULL);
-    }
-    ATOM_LIST_INIT(al);
-
-    map->vector = vector;
-    map->length = (jsatomid)count;
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(void)
-js_FreeAtomMap(JSContext *cx, JSAtomMap *map)
-{
-    if (map->vector) {
-        JS_free(cx, map->vector);
-        map->vector = NULL;
-    }
-    map->length = 0;
-}
diff --git a/libs/js/src/jsatom.h b/libs/js/src/jsatom.h
deleted file mode 100644
index d292cfb220..0000000000
--- a/libs/js/src/jsatom.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsatom_h___
-#define jsatom_h___
-/*
- * JS atom table.
- */
-#include <stddef.h>
-#include "jstypes.h"
-#include "jshash.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-#ifdef JS_THREADSAFE
-#include "jslock.h"
-#endif
-
-JS_BEGIN_EXTERN_C
-
-#define ATOM_PINNED     0x01            /* atom is pinned against GC */
-#define ATOM_INTERNED   0x02            /* pinned variant for JS_Intern* API */
-#define ATOM_MARK       0x04            /* atom is reachable via GC */
-#define ATOM_HIDDEN     0x08            /* atom is in special hidden subspace */
-#define ATOM_NOCOPY     0x40            /* don't copy atom string bytes */
-#define ATOM_TMPSTR     0x80            /* internal, to avoid extra string */
-
-struct JSAtom {
-    JSHashEntry         entry;          /* key is jsval, value keyword info or
-                                           unhidden atom if ATOM_HIDDEN */
-    uint32              flags;          /* pinned, interned, and mark flags */
-    jsatomid            number;         /* atom serial number and hash code */
-};
-
-#define ATOM_KEY(atom)            ((jsval)(atom)->entry.key)
-#define ATOM_IS_OBJECT(atom)      JSVAL_IS_OBJECT(ATOM_KEY(atom))
-#define ATOM_TO_OBJECT(atom)      JSVAL_TO_OBJECT(ATOM_KEY(atom))
-#define ATOM_IS_INT(atom)         JSVAL_IS_INT(ATOM_KEY(atom))
-#define ATOM_TO_INT(atom)         JSVAL_TO_INT(ATOM_KEY(atom))
-#define ATOM_IS_DOUBLE(atom)      JSVAL_IS_DOUBLE(ATOM_KEY(atom))
-#define ATOM_TO_DOUBLE(atom)      JSVAL_TO_DOUBLE(ATOM_KEY(atom))
-#define ATOM_IS_STRING(atom)      JSVAL_IS_STRING(ATOM_KEY(atom))
-#define ATOM_TO_STRING(atom)      JSVAL_TO_STRING(ATOM_KEY(atom))
-#define ATOM_IS_BOOLEAN(atom)     JSVAL_IS_BOOLEAN(ATOM_KEY(atom))
-#define ATOM_TO_BOOLEAN(atom)     JSVAL_TO_BOOLEAN(ATOM_KEY(atom))
-
-/*
- * Return a printable, lossless char[] representation of a string-type atom.
- * The lifetime of the result extends at least until the next GC activation,
- * longer if cx's string newborn root is not overwritten.
- */
-extern JS_FRIEND_API(const char *)
-js_AtomToPrintableString(JSContext *cx, JSAtom *atom);
-
-#define ATOM_KEYWORD(atom)        ((struct keyword *)(atom)->entry.value)
-#define ATOM_SET_KEYWORD(atom,kw) ((atom)->entry.value = (kw))
-
-struct JSAtomListElement {
-    JSHashEntry         entry;
-};
-
-#define ALE_ATOM(ale)   ((JSAtom *) (ale)->entry.key)
-#define ALE_INDEX(ale)  ((jsatomid) JS_PTR_TO_UINT32((ale)->entry.value))
-#define ALE_JSOP(ale)   ((JSOp) (ale)->entry.value)
-#define ALE_VALUE(ale)  ((jsval) (ale)->entry.value)
-#define ALE_NEXT(ale)   ((JSAtomListElement *) (ale)->entry.next)
-
-#define ALE_SET_ATOM(ale,atom)  ((ale)->entry.key = (const void *)(atom))
-#define ALE_SET_INDEX(ale,index)((ale)->entry.value = JS_UINT32_TO_PTR(index))
-#define ALE_SET_JSOP(ale,op)    ((ale)->entry.value = JS_UINT32_TO_PTR(op))
-#define ALE_SET_VALUE(ale,val)  ((ale)->entry.value = (JSHashEntry *)(val))
-#define ALE_SET_NEXT(ale,link)  ((ale)->entry.next = (JSHashEntry *)(link))
-
-struct JSAtomList {
-    JSAtomListElement   *list;          /* literals indexed for mapping */
-    JSHashTable         *table;         /* hash table if list gets too long */
-    jsuint              count;          /* count of indexed literals */
-};
-
-#define ATOM_LIST_INIT(al)  ((al)->list = NULL, (al)->table = NULL,           \
-                             (al)->count = 0)
-
-#define ATOM_LIST_SEARCH(_ale,_al,_atom)                                      \
-    JS_BEGIN_MACRO                                                            \
-        JSHashEntry **_hep;                                                   \
-        ATOM_LIST_LOOKUP(_ale, _hep, _al, _atom);                             \
-    JS_END_MACRO
-
-#define ATOM_LIST_LOOKUP(_ale,_hep,_al,_atom)                                 \
-    JS_BEGIN_MACRO                                                            \
-        if ((_al)->table) {                                                   \
-            _hep = JS_HashTableRawLookup((_al)->table, _atom->number, _atom); \
-            _ale = *_hep ? (JSAtomListElement *) *_hep : NULL;                \
-        } else {                                                              \
-            JSAtomListElement **_alep = &(_al)->list;                         \
-            _hep = NULL;                                                      \
-            while ((_ale = *_alep) != NULL) {                                 \
-                if (ALE_ATOM(_ale) == (_atom)) {                              \
-                    /* Hit, move atom's element to the front of the list. */  \
-                    *_alep = ALE_NEXT(_ale);                                  \
-                    ALE_SET_NEXT(_ale, (_al)->list);                          \
-                    (_al)->list = _ale;                                       \
-                    break;                                                    \
-                }                                                             \
-                _alep = (JSAtomListElement **)&_ale->entry.next;              \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-struct JSAtomMap {
-    JSAtom              **vector;       /* array of ptrs to indexed atoms */
-    jsatomid            length;         /* count of (to-be-)indexed atoms */
-};
-
-struct JSAtomState {
-    JSRuntime           *runtime;       /* runtime that owns us */
-    JSHashTable         *table;         /* hash table containing all atoms */
-    jsatomid            number;         /* one beyond greatest atom number */
-    jsatomid            liveAtoms;      /* number of live atoms after last GC */
-
-    /* The rt->emptyString atom, see jsstr.c's js_InitRuntimeStringState. */
-    JSAtom              *emptyAtom;
-
-    /* Type names and value literals. */
-    JSAtom              *typeAtoms[JSTYPE_LIMIT];
-    JSAtom              *booleanAtoms[2];
-    JSAtom              *nullAtom;
-
-    /* Various built-in or commonly-used atoms, pinned on first context. */
-    JSAtom              *ArgumentsAtom;
-    JSAtom              *ArrayAtom;
-    JSAtom              *BooleanAtom;
-    JSAtom              *CallAtom;
-    JSAtom              *DateAtom;
-    JSAtom              *ErrorAtom;
-    JSAtom              *FunctionAtom;
-    JSAtom              *MathAtom;
-    JSAtom              *NamespaceAtom;
-    JSAtom              *NumberAtom;
-    JSAtom              *ObjectAtom;
-    JSAtom              *QNameAtom;
-    JSAtom              *RegExpAtom;
-    JSAtom              *ScriptAtom;
-    JSAtom              *StringAtom;
-    JSAtom              *XMLAtom;
-    JSAtom              *FileAtom;
-    JSAtom              *anonymousAtom;
-    JSAtom              *argumentsAtom;
-    JSAtom              *arityAtom;
-    JSAtom              *calleeAtom;
-    JSAtom              *callerAtom;
-    JSAtom              *classPrototypeAtom;
-    JSAtom              *constructorAtom;
-    JSAtom              *countAtom;
-    JSAtom              *eachAtom;
-    JSAtom              *etagoAtom;
-    JSAtom              *evalAtom;
-    JSAtom              *getAtom;
-    JSAtom              *getterAtom;
-    JSAtom              *indexAtom;
-    JSAtom              *inputAtom;
-    JSAtom              *lengthAtom;
-    JSAtom              *nameAtom;
-    JSAtom              *namespaceAtom;
-    JSAtom              *noSuchMethodAtom;
-    JSAtom              *parentAtom;
-    JSAtom              *protoAtom;
-    JSAtom              *ptagcAtom;
-    JSAtom              *qualifierAtom;
-    JSAtom              *setAtom;
-    JSAtom              *setterAtom;
-    JSAtom              *spaceAtom;
-    JSAtom              *stagoAtom;
-    JSAtom              *starAtom;
-    JSAtom              *starQualifierAtom;
-    JSAtom              *tagcAtom;
-    JSAtom              *toLocaleStringAtom;
-    JSAtom              *toSourceAtom;
-    JSAtom              *toStringAtom;
-    JSAtom              *valueOfAtom;
-    JSAtom              *xmlAtom;
-#ifdef OSSP
-    JSAtom              *DSOAtom;
-#endif
-
-    /* Less frequently used atoms, pinned lazily by JS_ResolveStandardClass. */
-    struct {
-        JSAtom          *AnyNameAtom;
-        JSAtom          *AttributeNameAtom;
-        JSAtom          *EvalErrorAtom;
-        JSAtom          *InfinityAtom;
-        JSAtom          *InternalErrorAtom;
-        JSAtom          *NaNAtom;
-        JSAtom          *RangeErrorAtom;
-        JSAtom          *ReferenceErrorAtom;
-        JSAtom          *SyntaxErrorAtom;
-        JSAtom          *TypeErrorAtom;
-        JSAtom          *URIErrorAtom;
-        JSAtom          *XMLListAtom;
-        JSAtom          *decodeURIAtom;
-        JSAtom          *decodeURIComponentAtom;
-        JSAtom          *defineGetterAtom;
-        JSAtom          *defineSetterAtom;
-        JSAtom          *encodeURIAtom;
-        JSAtom          *encodeURIComponentAtom;
-        JSAtom          *escapeAtom;
-        JSAtom          *functionNamespaceURIAtom;
-        JSAtom          *hasOwnPropertyAtom;
-        JSAtom          *isFiniteAtom;
-        JSAtom          *isNaNAtom;
-        JSAtom          *isPrototypeOfAtom;
-        JSAtom          *isXMLNameAtom;
-        JSAtom          *lookupGetterAtom;
-        JSAtom          *lookupSetterAtom;
-        JSAtom          *parseFloatAtom;
-        JSAtom          *parseIntAtom;
-        JSAtom          *propertyIsEnumerableAtom;
-        JSAtom          *unescapeAtom;
-        JSAtom          *unevalAtom;
-        JSAtom          *unwatchAtom;
-        JSAtom          *watchAtom;
-    } lazy;
-
-#ifdef JS_THREADSAFE
-    JSThinLock          lock;
-    volatile uint32     tablegen;
-#endif
-#ifdef NARCISSUS
-    JSAtom              *callAtom;
-    JSAtom              *constructAtom;
-    JSAtom              *hasInstanceAtom;
-    JSAtom              *ExecutionContextAtom;
-    JSAtom              *currentAtom;
-#endif
-};
-
-/* Well-known predefined strings and their atoms. */
-extern const char   *js_type_str[];
-extern const char   *js_boolean_str[];
-
-extern const char   js_Arguments_str[];
-extern const char   js_Array_str[];
-extern const char   js_Boolean_str[];
-extern const char   js_Call_str[];
-extern const char   js_Date_str[];
-extern const char   js_Function_str[];
-extern const char   js_Math_str[];
-extern const char   js_Namespace_str[];
-extern const char   js_Number_str[];
-extern const char   js_Object_str[];
-extern const char   js_QName_str[];
-extern const char   js_RegExp_str[];
-extern const char   js_Script_str[];
-extern const char   js_String_str[];
-extern const char   js_XML_str[];
-extern const char   js_File_str[];
-extern const char   js_anonymous_str[];
-extern const char   js_arguments_str[];
-extern const char   js_arity_str[];
-extern const char   js_callee_str[];
-extern const char   js_caller_str[];
-extern const char   js_class_prototype_str[];
-extern const char   js_constructor_str[];
-extern const char   js_count_str[];
-extern const char   js_etago_str[];
-extern const char   js_each_str[];
-extern const char   js_eval_str[];
-extern const char   js_getter_str[];
-extern const char   js_get_str[];
-extern const char   js_index_str[];
-extern const char   js_input_str[];
-extern const char   js_length_str[];
-extern const char   js_name_str[];
-extern const char   js_namespace_str[];
-extern const char   js_noSuchMethod_str[];
-extern const char   js_object_str[];
-extern const char   js_parent_str[];
-extern const char   js_private_str[];
-extern const char   js_proto_str[];
-extern const char   js_ptagc_str[];
-extern const char   js_qualifier_str[];
-extern const char   js_setter_str[];
-extern const char   js_set_str[];
-extern const char   js_space_str[];
-extern const char   js_stago_str[];
-extern const char   js_star_str[];
-extern const char   js_starQualifier_str[];
-extern const char   js_tagc_str[];
-extern const char   js_toSource_str[];
-extern const char   js_toString_str[];
-extern const char   js_toLocaleString_str[];
-extern const char   js_valueOf_str[];
-extern const char   js_xml_str[];
-
-#ifdef NARCISSUS
-extern const char   js_call_str[];
-extern const char   js_construct_str[];
-extern const char   js_hasInstance_str[];
-extern const char   js_ExecutionContext_str[];
-extern const char   js_current_str[];
-#endif
-
-/*
- * Initialize atom state.  Return true on success, false with an out of
- * memory error report on failure.
- */
-extern JSBool
-js_InitAtomState(JSContext *cx, JSAtomState *state);
-
-/*
- * Free and clear atom state (except for any interned string atoms).
- */
-extern void
-js_FreeAtomState(JSContext *cx, JSAtomState *state);
-
-/*
- * Interned strings are atoms that live until state's runtime is destroyed.
- * This function frees all interned string atoms, and then frees and clears
- * state's members (just as js_FreeAtomState does), unless there aren't any
- * interned strings in state -- in which case state must be "free" already.
- *
- * NB: js_FreeAtomState is called for each "last" context being destroyed in
- * a runtime, where there may yet be another context created in the runtime;
- * whereas js_FinishAtomState is called from JS_DestroyRuntime, when we know
- * that no more contexts will be created.  Thus we minimize garbage during
- * context-free episodes on a runtime, while preserving atoms created by the
- * JS_Intern*String APIs for the life of the runtime.
- */
-extern void
-js_FinishAtomState(JSAtomState *state);
-
-/*
- * Atom garbage collection hooks.
- */
-typedef void
-(*JSGCThingMarker)(void *thing, void *data);
-
-extern void
-js_MarkAtomState(JSAtomState *state, uintN gcflags, JSGCThingMarker mark,
-                 void *data);
-
-extern void
-js_SweepAtomState(JSAtomState *state);
-
-extern JSBool
-js_InitPinnedAtoms(JSContext *cx, JSAtomState *state);
-
-extern void
-js_UnpinPinnedAtoms(JSAtomState *state);
-
-/*
- * Find or create the atom for an object.  If we create a new atom, give it the
- * type indicated in flags.  Return 0 on failure to allocate memory.
- */
-extern JSAtom *
-js_AtomizeObject(JSContext *cx, JSObject *obj, uintN flags);
-
-/*
- * Find or create the atom for a Boolean value.  If we create a new atom, give
- * it the type indicated in flags.  Return 0 on failure to allocate memory.
- */
-extern JSAtom *
-js_AtomizeBoolean(JSContext *cx, JSBool b, uintN flags);
-
-/*
- * Find or create the atom for an integer value.  If we create a new atom, give
- * it the type indicated in flags.  Return 0 on failure to allocate memory.
- */
-extern JSAtom *
-js_AtomizeInt(JSContext *cx, jsint i, uintN flags);
-
-/*
- * Find or create the atom for a double value.  If we create a new atom, give
- * it the type indicated in flags.  Return 0 on failure to allocate memory.
- */
-extern JSAtom *
-js_AtomizeDouble(JSContext *cx, jsdouble d, uintN flags);
-
-/*
- * Find or create the atom for a string.  If we create a new atom, give it the
- * type indicated in flags.  Return 0 on failure to allocate memory.
- */
-extern JSAtom *
-js_AtomizeString(JSContext *cx, JSString *str, uintN flags);
-
-extern JS_FRIEND_API(JSAtom *)
-js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags);
-
-extern JS_FRIEND_API(JSAtom *)
-js_AtomizeChars(JSContext *cx, const jschar *chars, size_t length, uintN flags);
-
-/*
- * This variant handles all value tag types.
- */
-extern JSAtom *
-js_AtomizeValue(JSContext *cx, jsval value, uintN flags);
-
-/*
- * Convert v to an atomized string.
- */
-extern JSAtom *
-js_ValueToStringAtom(JSContext *cx, jsval v);
-
-/*
- * Assign atom an index and insert it on al.
- */
-extern JSAtomListElement *
-js_IndexAtom(JSContext *cx, JSAtom *atom, JSAtomList *al);
-
-/*
- * Get the atom with index i from map.
- */
-extern JS_FRIEND_API(JSAtom *)
-js_GetAtom(JSContext *cx, JSAtomMap *map, jsatomid i);
-
-/*
- * For all unmapped atoms recorded in al, add a mapping from the atom's index
- * to its address.  The GC must not run until all indexed atoms in atomLists
- * have been mapped by scripts connected to live objects (Function and Script
- * class objects have scripts as/in their private data -- the GC knows about
- * these two classes).
- */
-extern JS_FRIEND_API(JSBool)
-js_InitAtomMap(JSContext *cx, JSAtomMap *map, JSAtomList *al);
-
-/*
- * Free map->vector and clear map.
- */
-extern JS_FRIEND_API(void)
-js_FreeAtomMap(JSContext *cx, JSAtomMap *map);
-
-JS_END_EXTERN_C
-
-#endif /* jsatom_h___ */
diff --git a/libs/js/src/jsautocfg.hw b/libs/js/src/jsautocfg.hw
deleted file mode 100644
index 7dccf19bb9..0000000000
--- a/libs/js/src/jsautocfg.hw
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  1L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */
diff --git a/libs/js/src/jsbit.h b/libs/js/src/jsbit.h
deleted file mode 100644
index db41acf9f1..0000000000
--- a/libs/js/src/jsbit.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsbit_h___
-#define jsbit_h___
-
-#include "jstypes.h"
-JS_BEGIN_EXTERN_C
-
-/*
-** A jsbitmap_t is a long integer that can be used for bitmaps
-*/
-typedef JSUword     jsbitmap_t;     /* NSPR name, a la Unix system types */
-typedef jsbitmap_t  jsbitmap;       /* JS-style scalar typedef name */
-
-#define JS_TEST_BIT(_map,_bit) \
-    ((_map)[(_bit)>>JS_BITS_PER_WORD_LOG2] & (1L << ((_bit) & (JS_BITS_PER_WORD-1))))
-#define JS_SET_BIT(_map,_bit) \
-    ((_map)[(_bit)>>JS_BITS_PER_WORD_LOG2] |= (1L << ((_bit) & (JS_BITS_PER_WORD-1))))
-#define JS_CLEAR_BIT(_map,_bit) \
-    ((_map)[(_bit)>>JS_BITS_PER_WORD_LOG2] &= ~(1L << ((_bit) & (JS_BITS_PER_WORD-1))))
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-extern JS_PUBLIC_API(JSIntn) JS_CeilingLog2(JSUint32 i);
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n
-*/
-extern JS_PUBLIC_API(JSIntn) JS_FloorLog2(JSUint32 i);
-
-/*
-** Macro version of JS_CeilingLog2: Compute the log of the least power of
-** 2 greater than or equal to _n. The result is returned in _log2.
-*/
-#define JS_CEILING_LOG2(_log2,_n)                                             \
-    JS_BEGIN_MACRO                                                            \
-        JSUint32 j_ = (JSUint32)(_n);                                         \
-        (_log2) = 0;                                                          \
-        if ((j_) & ((j_)-1))                                                  \
-            (_log2) += 1;                                                     \
-        if ((j_) >> 16)                                                       \
-            (_log2) += 16, (j_) >>= 16;                                       \
-        if ((j_) >> 8)                                                        \
-            (_log2) += 8, (j_) >>= 8;                                         \
-        if ((j_) >> 4)                                                        \
-            (_log2) += 4, (j_) >>= 4;                                         \
-        if ((j_) >> 2)                                                        \
-            (_log2) += 2, (j_) >>= 2;                                         \
-        if ((j_) >> 1)                                                        \
-            (_log2) += 1;                                                     \
-    JS_END_MACRO
-
-/*
-** Macro version of JS_FloorLog2: Compute the log of the greatest power of
-** 2 less than or equal to _n. The result is returned in _log2.
-**
-** This is equivalent to finding the highest set bit in the word.
-*/
-#define JS_FLOOR_LOG2(_log2,_n)                                               \
-    JS_BEGIN_MACRO                                                            \
-        JSUint32 j_ = (JSUint32)(_n);                                         \
-        (_log2) = 0;                                                          \
-        if ((j_) >> 16)                                                       \
-            (_log2) += 16, (j_) >>= 16;                                       \
-        if ((j_) >> 8)                                                        \
-            (_log2) += 8, (j_) >>= 8;                                         \
-        if ((j_) >> 4)                                                        \
-            (_log2) += 4, (j_) >>= 4;                                         \
-        if ((j_) >> 2)                                                        \
-            (_log2) += 2, (j_) >>= 2;                                         \
-        if ((j_) >> 1)                                                        \
-            (_log2) += 1;                                                     \
-    JS_END_MACRO
-
-JS_END_EXTERN_C
-#endif /* jsbit_h___ */
diff --git a/libs/js/src/jsbool.c b/libs/js/src/jsbool.c
deleted file mode 100644
index 33d5c507ee..0000000000
--- a/libs/js/src/jsbool.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS boolean implementation.
- */
-#include "jsstddef.h"
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsstr.h"
-
-JSClass js_BooleanClass = {
-    "Boolean",
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-#if JS_HAS_TOSOURCE
-#include "jsprf.h"
-
-static JSBool
-bool_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsval v;
-    char buf[32];
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_BooleanClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (!JSVAL_IS_BOOLEAN(v))
-        return js_obj_toSource(cx, obj, argc, argv, rval);
-    JS_snprintf(buf, sizeof buf, "(new %s(%s))",
-                js_BooleanClass.name,
-                js_boolean_str[JSVAL_TO_BOOLEAN(v) ? 1 : 0]);
-    str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif
-
-static JSBool
-bool_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsval v;
-    JSAtom *atom;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_BooleanClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (!JSVAL_IS_BOOLEAN(v))
-        return js_obj_toString(cx, obj, argc, argv, rval);
-    atom = cx->runtime->atomState.booleanAtoms[JSVAL_TO_BOOLEAN(v) ? 1 : 0];
-    str = ATOM_TO_STRING(atom);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-bool_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (!JS_InstanceOf(cx, obj, &js_BooleanClass, argv))
-        return JS_FALSE;
-    *rval = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec boolean_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   bool_toSource,          0,0,0},
-#endif
-    {js_toString_str,   bool_toString,          0,0,0},
-    {js_valueOf_str,    bool_valueOf,           0,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-Boolean(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSBool b;
-    jsval bval;
-
-    if (argc != 0) {
-        if (!js_ValueToBoolean(cx, argv[0], &b))
-            return JS_FALSE;
-        bval = BOOLEAN_TO_JSVAL(b);
-    } else {
-        bval = JSVAL_FALSE;
-    }
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        *rval = bval;
-        return JS_TRUE;
-    }
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, bval);
-    return JS_TRUE;
-}
-
-JSObject *
-js_InitBooleanClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_BooleanClass, Boolean, 1,
-                        NULL, boolean_methods, NULL, NULL);
-    if (!proto)
-        return NULL;
-    OBJ_SET_SLOT(cx, proto, JSSLOT_PRIVATE, JSVAL_FALSE);
-    return proto;
-}
-
-JSObject *
-js_BooleanToObject(JSContext *cx, JSBool b)
-{
-    JSObject *obj;
-
-    obj = js_NewObject(cx, &js_BooleanClass, NULL, NULL);
-    if (!obj)
-        return NULL;
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, BOOLEAN_TO_JSVAL(b));
-    return obj;
-}
-
-JSString *
-js_BooleanToString(JSContext *cx, JSBool b)
-{
-    return ATOM_TO_STRING(cx->runtime->atomState.booleanAtoms[b ? 1 : 0]);
-}
-
-JSBool
-js_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp)
-{
-    JSBool b;
-    jsdouble d;
-
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)) {
-        b = JS_FALSE;
-    } else if (JSVAL_IS_OBJECT(v)) {
-        if (!JS_VERSION_IS_ECMA(cx)) {
-            if (!OBJ_DEFAULT_VALUE(cx, JSVAL_TO_OBJECT(v), JSTYPE_BOOLEAN, &v))
-                return JS_FALSE;
-            if (!JSVAL_IS_BOOLEAN(v))
-                v = JSVAL_TRUE;         /* non-null object is true */
-            b = JSVAL_TO_BOOLEAN(v);
-        } else {
-            b = JS_TRUE;
-        }
-    } else if (JSVAL_IS_STRING(v)) {
-        b = JSSTRING_LENGTH(JSVAL_TO_STRING(v)) ? JS_TRUE : JS_FALSE;
-    } else if (JSVAL_IS_INT(v)) {
-        b = JSVAL_TO_INT(v) ? JS_TRUE : JS_FALSE;
-    } else if (JSVAL_IS_DOUBLE(v)) {
-        d = *JSVAL_TO_DOUBLE(v);
-        b = (!JSDOUBLE_IS_NaN(d) && d != 0) ? JS_TRUE : JS_FALSE;
-    } else {
-        JS_ASSERT(JSVAL_IS_BOOLEAN(v));
-        b = JSVAL_TO_BOOLEAN(v);
-    }
-
-    *bp = b;
-    return JS_TRUE;
-}
diff --git a/libs/js/src/jsbool.h b/libs/js/src/jsbool.h
deleted file mode 100644
index 552bdef1ad..0000000000
--- a/libs/js/src/jsbool.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsbool_h___
-#define jsbool_h___
-/*
- * JS boolean interface.
- */
-
-JS_BEGIN_EXTERN_C
-
-extern JSClass js_BooleanClass;
-
-extern JSObject *
-js_InitBooleanClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_BooleanToObject(JSContext *cx, JSBool b);
-
-extern JSString *
-js_BooleanToString(JSContext *cx, JSBool b);
-
-extern JSBool
-js_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp);
-
-JS_END_EXTERN_C
-
-#endif /* jsbool_h___ */
diff --git a/libs/js/src/jsclist.h b/libs/js/src/jsclist.h
deleted file mode 100644
index 604ec0ec95..0000000000
--- a/libs/js/src/jsclist.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsclist_h___
-#define jsclist_h___
-
-#include "jstypes.h"
-
-/*
-** Circular linked list
-*/
-typedef struct JSCListStr {
-    struct JSCListStr *next;
-    struct JSCListStr *prev;
-} JSCList;
-
-/*
-** Insert element "_e" into the list, before "_l".
-*/
-#define JS_INSERT_BEFORE(_e,_l)  \
-    JS_BEGIN_MACRO               \
-        (_e)->next = (_l);       \
-        (_e)->prev = (_l)->prev; \
-        (_l)->prev->next = (_e); \
-        (_l)->prev = (_e);       \
-    JS_END_MACRO
-
-/*
-** Insert element "_e" into the list, after "_l".
-*/
-#define JS_INSERT_AFTER(_e,_l)   \
-    JS_BEGIN_MACRO               \
-        (_e)->next = (_l)->next; \
-        (_e)->prev = (_l);       \
-        (_l)->next->prev = (_e); \
-        (_l)->next = (_e);       \
-    JS_END_MACRO
-
-/*
-** Return the element following element "_e"
-*/
-#define JS_NEXT_LINK(_e)         \
-        ((_e)->next)
-/*
-** Return the element preceding element "_e"
-*/
-#define JS_PREV_LINK(_e)         \
-        ((_e)->prev)
-
-/*
-** Append an element "_e" to the end of the list "_l"
-*/
-#define JS_APPEND_LINK(_e,_l) JS_INSERT_BEFORE(_e,_l)
-
-/*
-** Insert an element "_e" at the head of the list "_l"
-*/
-#define JS_INSERT_LINK(_e,_l) JS_INSERT_AFTER(_e,_l)
-
-/* Return the head/tail of the list */
-#define JS_LIST_HEAD(_l) (_l)->next
-#define JS_LIST_TAIL(_l) (_l)->prev
-
-/*
-** Remove the element "_e" from it's circular list.
-*/
-#define JS_REMOVE_LINK(_e)             \
-    JS_BEGIN_MACRO                     \
-        (_e)->prev->next = (_e)->next; \
-        (_e)->next->prev = (_e)->prev; \
-    JS_END_MACRO
-
-/*
-** Remove the element "_e" from it's circular list. Also initializes the
-** linkage.
-*/
-#define JS_REMOVE_AND_INIT_LINK(_e)    \
-    JS_BEGIN_MACRO                     \
-        (_e)->prev->next = (_e)->next; \
-        (_e)->next->prev = (_e)->prev; \
-        (_e)->next = (_e);             \
-        (_e)->prev = (_e);             \
-    JS_END_MACRO
-
-/*
-** Return non-zero if the given circular list "_l" is empty, zero if the
-** circular list is not empty
-*/
-#define JS_CLIST_IS_EMPTY(_l) \
-    ((_l)->next == (_l))
-
-/*
-** Initialize a circular list
-*/
-#define JS_INIT_CLIST(_l)  \
-    JS_BEGIN_MACRO         \
-        (_l)->next = (_l); \
-        (_l)->prev = (_l); \
-    JS_END_MACRO
-
-#define JS_INIT_STATIC_CLIST(_l) \
-    {(_l), (_l)}
-
-#endif /* jsclist_h___ */
diff --git a/libs/js/src/jscntxt.c b/libs/js/src/jscntxt.c
deleted file mode 100644
index 257cf9140d..0000000000
--- a/libs/js/src/jscntxt.c
+++ /dev/null
@@ -1,1091 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS execution context.
- */
-#include "jsstddef.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsclist.h"
-#include "jsprf.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsexn.h"
-#include "jsgc.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsscan.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-void
-js_OnVersionChange(JSContext *cx)
-{
-#if !JS_BUG_FALLIBLE_EQOPS
-    if (JS_VERSION_IS_1_2(cx)) {
-        cx->jsop_eq = JSOP_NEW_EQ;
-        cx->jsop_ne = JSOP_NEW_NE;
-    } else {
-        cx->jsop_eq = JSOP_EQ;
-        cx->jsop_ne = JSOP_NE;
-    }
-#endif /* !JS_BUG_FALLIBLE_EQOPS */
-}
-
-void
-js_SetVersion(JSContext *cx, JSVersion version)
-{
-    cx->version = version;
-    js_OnVersionChange(cx);
-}
-
-JSContext *
-js_NewContext(JSRuntime *rt, size_t stackChunkSize)
-{
-    JSContext *cx;
-    JSBool ok, first;
-
-    cx = (JSContext *) malloc(sizeof *cx);
-    if (!cx)
-        return NULL;
-    memset(cx, 0, sizeof *cx);
-
-    cx->runtime = rt;
-#if JS_STACK_GROWTH_DIRECTION > 0
-    cx->stackLimit = (jsuword)-1;
-#endif
-#ifdef JS_THREADSAFE
-    js_InitContextForLocking(cx);
-#endif
-
-    JS_LOCK_GC(rt);
-    for (;;) {
-        first = (rt->contextList.next == &rt->contextList);
-        if (rt->state == JSRTS_UP) {
-            JS_ASSERT(!first);
-            break;
-        }
-        if (rt->state == JSRTS_DOWN) {
-            JS_ASSERT(first);
-            rt->state = JSRTS_LAUNCHING;
-            break;
-        }
-        JS_WAIT_CONDVAR(rt->stateChange, JS_NO_TIMEOUT);
-    }
-    JS_APPEND_LINK(&cx->links, &rt->contextList);
-    JS_UNLOCK_GC(rt);
-
-    /*
-     * First we do the infallible, every-time per-context initializations.
-     * Should a later, fallible initialization (js_InitRegExpStatics, e.g.,
-     * or the stuff under 'if (first)' below) fail, at least the version
-     * and arena-pools will be valid and safe to use (say, from the last GC
-     * done by js_DestroyContext).
-     */
-    cx->version = JSVERSION_DEFAULT;
-    cx->jsop_eq = JSOP_EQ;
-    cx->jsop_ne = JSOP_NE;
-    JS_InitArenaPool(&cx->stackPool, "stack", stackChunkSize, sizeof(jsval));
-    JS_InitArenaPool(&cx->tempPool, "temp", 1024, sizeof(jsdouble));
-
-#if JS_HAS_REGEXPS
-    if (!js_InitRegExpStatics(cx, &cx->regExpStatics)) {
-        js_DestroyContext(cx, JS_NO_GC);
-        return NULL;
-    }
-#endif
-#if JS_HAS_EXCEPTIONS
-    cx->throwing = JS_FALSE;
-#endif
-
-    /*
-     * If cx is the first context on this runtime, initialize well-known atoms,
-     * keywords, numbers, and strings.  If one of these steps should fail, the
-     * runtime will be left in a partially initialized state, with zeroes and
-     * nulls stored in the default-initialized remainder of the struct.  We'll
-     * clean the runtime up under js_DestroyContext, because cx will be "last"
-     * as well as "first".
-     */
-    if (first) {
-        /*
-         * Both atomState and the scriptFilenameTable may be left over from a
-         * previous episode of non-zero contexts alive in rt, so don't re-init
-         * either table if it's not necessary.  Just repopulate atomState with
-         * well-known internal atoms, and with the reserved identifiers added
-         * by the scanner.
-         */
-        ok = (rt->atomState.liveAtoms == 0)
-             ? js_InitAtomState(cx, &rt->atomState)
-             : js_InitPinnedAtoms(cx, &rt->atomState);
-        if (ok)
-            ok = js_InitScanner(cx);
-        if (ok && !rt->scriptFilenameTable)
-            ok = js_InitRuntimeScriptState(rt);
-        if (ok)
-            ok = js_InitRuntimeNumberState(cx);
-        if (ok)
-            ok = js_InitRuntimeStringState(cx);
-        if (!ok) {
-            js_DestroyContext(cx, JS_NO_GC);
-            return NULL;
-        }
-
-        JS_LOCK_GC(rt);
-        rt->state = JSRTS_UP;
-        JS_NOTIFY_ALL_CONDVAR(rt->stateChange);
-        JS_UNLOCK_GC(rt);
-    }
-
-    return cx;
-}
-
-void
-js_DestroyContext(JSContext *cx, JSGCMode gcmode)
-{
-    JSRuntime *rt;
-    JSBool last;
-    JSArgumentFormatMap *map;
-    JSLocalRootStack *lrs;
-    JSLocalRootChunk *lrc;
-
-    rt = cx->runtime;
-
-    /* Remove cx from context list first. */
-    JS_LOCK_GC(rt);
-    JS_ASSERT(rt->state == JSRTS_UP || rt->state == JSRTS_LAUNCHING);
-    JS_REMOVE_LINK(&cx->links);
-    last = (rt->contextList.next == &rt->contextList);
-    if (last)
-        rt->state = JSRTS_LANDING;
-    JS_UNLOCK_GC(rt);
-
-    if (last) {
-#ifdef JS_THREADSAFE
-        /*
-         * If cx is not in a request already, begin one now so that we wait
-         * for any racing GC started on a not-last context to finish, before
-         * we plow ahead and unpin atoms.  Note that even though we begin a
-         * request here if necessary, we end all requests on cx below before
-         * forcing a final GC.  This lets any not-last context destruction
-         * racing in another thread try to force or maybe run the GC, but by
-         * that point, rt->state will not be JSRTS_UP, and that GC attempt
-         * will return early.
-         */
-        if (cx->requestDepth == 0)
-            JS_BeginRequest(cx);
-#endif
-
-        /* Unpin all pinned atoms before final GC. */
-        js_UnpinPinnedAtoms(&rt->atomState);
-
-        /* Unlock and clear GC things held by runtime pointers. */
-        js_FinishRuntimeNumberState(cx);
-        js_FinishRuntimeStringState(cx);
-
-        /* Clear debugging state to remove GC roots. */
-        JS_ClearAllTraps(cx);
-        JS_ClearAllWatchPoints(cx);
-    }
-
-#if JS_HAS_REGEXPS
-    /*
-     * Remove more GC roots in regExpStatics, then collect garbage.
-     * XXX anti-modularity alert: we rely on the call to js_RemoveRoot within
-     * XXX this function call to wait for any racing GC to complete, in the
-     * XXX case where JS_DestroyContext is called outside of a request on cx
-     */
-    js_FreeRegExpStatics(cx, &cx->regExpStatics);
-#endif
-
-#ifdef JS_THREADSAFE
-    /*
-     * Destroying a context implicitly calls JS_EndRequest().  Also, we must
-     * end our request here in case we are "last" -- in that event, another
-     * js_DestroyContext that was not last might be waiting in the GC for our
-     * request to end.  We'll let it run below, just before we do the truly
-     * final GC and then free atom state.
-     *
-     * At this point, cx must be inaccessible to other threads.  It's off the
-     * rt->contextList, and it should not be reachable via any object private
-     * data structure.
-     */
-    while (cx->requestDepth != 0)
-        JS_EndRequest(cx);
-#endif
-
-    if (last) {
-        /* Always force, so we wait for any racing GC to finish. */
-        js_ForceGC(cx, GC_LAST_CONTEXT);
-
-        /* Iterate until no finalizer removes a GC root or lock. */
-        while (rt->gcPoke)
-            js_GC(cx, GC_LAST_CONTEXT);
-
-        /* Try to free atom state, now that no unrooted scripts survive. */
-        if (rt->atomState.liveAtoms == 0)
-            js_FreeAtomState(cx, &rt->atomState);
-
-        /* Also free the script filename table if it exists and is empty. */
-        if (rt->scriptFilenameTable && rt->scriptFilenameTable->nentries == 0)
-            js_FinishRuntimeScriptState(rt);
-
-        /* Take the runtime down, now that it has no contexts or atoms. */
-        JS_LOCK_GC(rt);
-        rt->state = JSRTS_DOWN;
-        JS_NOTIFY_ALL_CONDVAR(rt->stateChange);
-        JS_UNLOCK_GC(rt);
-    } else {
-        if (gcmode == JS_FORCE_GC)
-            js_ForceGC(cx, 0);
-        else if (gcmode == JS_MAYBE_GC)
-            JS_MaybeGC(cx);
-    }
-
-    /* Free the stuff hanging off of cx. */
-    JS_FinishArenaPool(&cx->stackPool);
-    JS_FinishArenaPool(&cx->tempPool);
-    if (cx->lastMessage)
-        free(cx->lastMessage);
-
-    /* Remove any argument formatters. */
-    map = cx->argumentFormatMap;
-    while (map) {
-        JSArgumentFormatMap *temp = map;
-        map = map->next;
-        JS_free(cx, temp);
-    }
-
-    /* Destroy the resolve recursion damper. */
-    if (cx->resolvingTable) {
-        JS_DHashTableDestroy(cx->resolvingTable);
-        cx->resolvingTable = NULL;
-    }
-
-    lrs = cx->localRootStack;
-    if (lrs) {
-        while ((lrc = lrs->topChunk) != &lrs->firstChunk) {
-            lrs->topChunk = lrc->down;
-            JS_free(cx, lrc);
-        }
-        JS_free(cx, lrs);
-    }
-
-    /* Finally, free cx itself. */
-    free(cx);
-}
-
-JSBool
-js_ValidContextPointer(JSRuntime *rt, JSContext *cx)
-{
-    JSCList *cl;
-
-    for (cl = rt->contextList.next; cl != &rt->contextList; cl = cl->next) {
-        if (cl == &cx->links)
-            return JS_TRUE;
-    }
-    JS_RUNTIME_METER(rt, deadContexts);
-    return JS_FALSE;
-}
-
-JSContext *
-js_ContextIterator(JSRuntime *rt, JSBool unlocked, JSContext **iterp)
-{
-    JSContext *cx = *iterp;
-
-    if (unlocked)
-        JS_LOCK_GC(rt);
-    if (!cx)
-        cx = (JSContext *)&rt->contextList;
-    cx = (JSContext *)cx->links.next;
-    if (&cx->links == &rt->contextList)
-        cx = NULL;
-    *iterp = cx;
-    if (unlocked)
-        JS_UNLOCK_GC(rt);
-    return cx;
-}
-
-JS_STATIC_DLL_CALLBACK(const void *)
-resolving_GetKey(JSDHashTable *table, JSDHashEntryHdr *hdr)
-{
-    JSResolvingEntry *entry = (JSResolvingEntry *)hdr;
-
-    return &entry->key;
-}
-
-JS_STATIC_DLL_CALLBACK(JSDHashNumber)
-resolving_HashKey(JSDHashTable *table, const void *ptr)
-{
-    const JSResolvingKey *key = (const JSResolvingKey *)ptr;
-
-    return ((JSDHashNumber)JS_PTR_TO_UINT32(key->obj) >> JSVAL_TAGBITS) ^ key->id;
-}
-
-#ifdef OSSP /* BUGFIX */
-JS_STATIC_DLL_CALLBACK(JSBool)
-#else
-JS_PUBLIC_API(JSBool)
-#endif
-resolving_MatchEntry(JSDHashTable *table,
-                     const JSDHashEntryHdr *hdr,
-                     const void *ptr)
-{
-    const JSResolvingEntry *entry = (const JSResolvingEntry *)hdr;
-    const JSResolvingKey *key = (const JSResolvingKey *)ptr;
-
-    return entry->key.obj == key->obj && entry->key.id == key->id;
-}
-
-static const JSDHashTableOps resolving_dhash_ops = {
-    JS_DHashAllocTable,
-    JS_DHashFreeTable,
-    resolving_GetKey,
-    resolving_HashKey,
-    resolving_MatchEntry,
-    JS_DHashMoveEntryStub,
-    JS_DHashClearEntryStub,
-    JS_DHashFinalizeStub,
-    NULL
-};
-
-JSBool
-js_StartResolving(JSContext *cx, JSResolvingKey *key, uint32 flag,
-                  JSResolvingEntry **entryp)
-{
-    JSDHashTable *table;
-    JSResolvingEntry *entry;
-
-    table = cx->resolvingTable;
-    if (!table) {
-        table = JS_NewDHashTable(&resolving_dhash_ops, NULL,
-                                 sizeof(JSResolvingEntry),
-                                 JS_DHASH_MIN_SIZE);
-        if (!table)
-            goto outofmem;
-        cx->resolvingTable = table;
-    }
-
-    entry = (JSResolvingEntry *)
-            JS_DHashTableOperate(table, key, JS_DHASH_ADD);
-    if (!entry)
-        goto outofmem;
-
-    if (entry->flags & flag) {
-        /* An entry for (key, flag) exists already -- dampen recursion. */
-        entry = NULL;
-    } else {
-        /* Fill in key if we were the first to add entry, then set flag. */
-        if (!entry->key.obj)
-            entry->key = *key;
-        entry->flags |= flag;
-    }
-    *entryp = entry;
-    return JS_TRUE;
-
-outofmem:
-    JS_ReportOutOfMemory(cx);
-    return JS_FALSE;
-}
-
-void
-js_StopResolving(JSContext *cx, JSResolvingKey *key, uint32 flag,
-                 JSResolvingEntry *entry, uint32 generation)
-{
-    JSDHashTable *table;
-
-    /*
-     * Clear flag from entry->flags and return early if other flags remain.
-     * We must take care to re-lookup entry if the table has changed since
-     * it was found by js_StartResolving.
-     */
-    table = cx->resolvingTable;
-    if (!entry || table->generation != generation) {
-        entry = (JSResolvingEntry *)
-                JS_DHashTableOperate(table, key, JS_DHASH_LOOKUP);
-    }
-    JS_ASSERT(JS_DHASH_ENTRY_IS_BUSY(&entry->hdr));
-    entry->flags &= ~flag;
-    if (entry->flags)
-        return;
-
-    /*
-     * Do a raw remove only if fewer entries were removed than would cause
-     * alpha to be less than .5 (alpha is at most .75).  Otherwise, we just
-     * call JS_DHashTableOperate to re-lookup the key and remove its entry,
-     * compressing or shrinking the table as needed.
-     */
-    if (table->removedCount < JS_DHASH_TABLE_SIZE(table) >> 2)
-        JS_DHashTableRawRemove(table, &entry->hdr);
-    else
-        JS_DHashTableOperate(table, key, JS_DHASH_REMOVE);
-}
-
-JSBool
-js_EnterLocalRootScope(JSContext *cx)
-{
-    JSLocalRootStack *lrs;
-    int mark;
-
-    lrs = cx->localRootStack;
-    if (!lrs) {
-        lrs = (JSLocalRootStack *) JS_malloc(cx, sizeof *lrs);
-        if (!lrs)
-            return JS_FALSE;
-        lrs->scopeMark = JSLRS_NULL_MARK;
-        lrs->rootCount = 0;
-        lrs->topChunk = &lrs->firstChunk;
-        lrs->firstChunk.down = NULL;
-        cx->localRootStack = lrs;
-    }
-
-    /* Push lrs->scopeMark to save it for restore when leaving. */
-    mark = js_PushLocalRoot(cx, lrs, INT_TO_JSVAL(lrs->scopeMark));
-    if (mark < 0)
-        return JS_FALSE;
-    lrs->scopeMark = (uint32) mark;
-    return JS_TRUE;
-}
-
-void
-js_LeaveLocalRootScope(JSContext *cx)
-{
-    JSLocalRootStack *lrs;
-    unsigned mark, m, n;
-    JSLocalRootChunk *lrc;
-
-    /* Defend against buggy native callers. */
-    lrs = cx->localRootStack;
-    JS_ASSERT(lrs && lrs->rootCount != 0);
-    if (!lrs || lrs->rootCount == 0)
-        return;
-
-    mark = lrs->scopeMark;
-    JS_ASSERT(mark != JSLRS_NULL_MARK);
-    if (mark == JSLRS_NULL_MARK)
-        return;
-
-    /* Free any chunks being popped by this leave operation. */
-    m = mark >> JSLRS_CHUNK_SHIFT;
-    n = (lrs->rootCount - 1) >> JSLRS_CHUNK_SHIFT;
-    while (n > m) {
-        lrc = lrs->topChunk;
-        JS_ASSERT(lrc != &lrs->firstChunk);
-        lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
-        --n;
-    }
-
-    /* Pop the scope, restoring lrs->scopeMark. */
-    lrc = lrs->topChunk;
-    m = mark & JSLRS_CHUNK_MASK;
-    lrs->scopeMark = (uint32) JSVAL_TO_INT(lrc->roots[m]);
-    lrc->roots[m] = JSVAL_NULL;
-    lrs->rootCount = (uint32) mark;
-
-    /*
-     * Free the stack eagerly, risking malloc churn.  The alternative would
-     * require an lrs->entryCount member, maintained by Enter and Leave, and
-     * tested by the GC in addition to the cx->localRootStack non-null test.
-     *
-     * That approach would risk hoarding 264 bytes (net) per context.  Right
-     * now it seems better to give fresh (dirty in CPU write-back cache, and
-     * the data is no longer needed) memory back to the malloc heap.
-     */
-    if (mark == 0) {
-        cx->localRootStack = NULL;
-        JS_free(cx, lrs);
-    } else if (m == 0) {
-        lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
-    }
-}
-
-void
-js_ForgetLocalRoot(JSContext *cx, jsval v)
-{
-    JSLocalRootStack *lrs;
-    unsigned i, j, m, n, mark;
-    JSLocalRootChunk *lrc, *lrc2;
-    jsval top;
-
-    lrs = cx->localRootStack;
-    JS_ASSERT(lrs && lrs->rootCount);
-    if (!lrs || lrs->rootCount == 0)
-        return;
-
-    /* Prepare to pop the top-most value from the stack. */
-    n = lrs->rootCount - 1;
-    m = n & JSLRS_CHUNK_MASK;
-    lrc = lrs->topChunk;
-    top = lrc->roots[m];
-
-    /* Be paranoid about calls on an empty scope. */
-    mark = lrs->scopeMark;
-    JS_ASSERT(mark < n);
-    if (mark >= n)
-        return;
-
-    /* If v was not the last root pushed in the top scope, find it. */
-    if (top != v) {
-        /* Search downward in case v was recently pushed. */
-        i = n;
-        j = m;
-        lrc2 = lrc;
-        while (--i > mark) {
-            if (j == 0)
-                lrc2 = lrc2->down;
-            j = i & JSLRS_CHUNK_MASK;
-            if (lrc2->roots[j] == v)
-                break;
-        }
-
-        /* If we didn't find v in this scope, assert and bail out. */
-        JS_ASSERT(i != mark);
-        if (i == mark)
-            return;
-
-        /* Swap top and v so common tail code can pop v. */
-        lrc2->roots[j] = top;
-    }
-
-    /* Pop the last value from the stack. */
-    lrc->roots[m] = JSVAL_NULL;
-    lrs->rootCount = n;
-    if (m == 0) {
-        JS_ASSERT(n != 0);
-        JS_ASSERT(lrc != &lrs->firstChunk);
-        lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
-    }
-}
-
-int
-js_PushLocalRoot(JSContext *cx, JSLocalRootStack *lrs, jsval v)
-{
-    unsigned n, m;
-    JSLocalRootChunk *lrc;
-
-    n = lrs->rootCount;
-    m = n & JSLRS_CHUNK_MASK;
-    if (n == 0 || m != 0) {
-        /*
-         * At start of first chunk, or not at start of a non-first top chunk.
-         * Check for lrs->rootCount overflow.
-         */
-        if ((uint32)(n + 1) == 0) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_TOO_MANY_LOCAL_ROOTS);
-            return -1;
-        }
-        lrc = lrs->topChunk;
-        JS_ASSERT(n != 0 || lrc == &lrs->firstChunk);
-    } else {
-        /*
-         * After lrs->firstChunk, trying to index at a power-of-two chunk
-         * boundary: need a new chunk.
-         */
-        lrc = (JSLocalRootChunk *) JS_malloc(cx, sizeof *lrc);
-        if (!lrc)
-            return -1;
-        lrc->down = lrs->topChunk;
-        lrs->topChunk = lrc;
-    }
-    lrs->rootCount = n + 1;
-    lrc->roots[m] = v;
-    return (int) n;
-}
-
-void
-js_MarkLocalRoots(JSContext *cx, JSLocalRootStack *lrs)
-{
-    unsigned n, m, mark;
-    JSLocalRootChunk *lrc;
-
-    n = lrs->rootCount;
-    if (n == 0)
-        return;
-
-    mark = lrs->scopeMark;
-    lrc = lrs->topChunk;
-    do {
-        while (--n > mark) {
-#ifdef GC_MARK_DEBUG
-            char name[22];
-            JS_snprintf(name, sizeof name, "<local root %u>", n);
-#else
-            const char *name = NULL;
-#endif
-            m = n & JSLRS_CHUNK_MASK;
-            JS_ASSERT(JSVAL_IS_GCTHING(lrc->roots[m]));
-            JS_MarkGCThing(cx, JSVAL_TO_GCTHING(lrc->roots[m]), name, NULL);
-            if (m == 0)
-                lrc = lrc->down;
-        }
-        m = n & JSLRS_CHUNK_MASK;
-        mark = JSVAL_TO_INT(lrc->roots[m]);
-        if (m == 0)
-            lrc = lrc->down;
-    } while (n != 0);
-    JS_ASSERT(!lrc);
-}
-
-static void
-ReportError(JSContext *cx, const char *message, JSErrorReport *reportp)
-{
-    /*
-     * Check the error report, and set a JavaScript-catchable exception
-     * if the error is defined to have an associated exception.  If an
-     * exception is thrown, then the JSREPORT_EXCEPTION flag will be set
-     * on the error report, and exception-aware hosts should ignore it.
-     */
-    if (reportp && reportp->errorNumber == JSMSG_UNCAUGHT_EXCEPTION)
-        reportp->flags |= JSREPORT_EXCEPTION;
-
-#if JS_HAS_ERROR_EXCEPTIONS
-    /*
-     * Call the error reporter only if an exception wasn't raised.
-     *
-     * If an exception was raised, then we call the debugErrorHook
-     * (if present) to give it a chance to see the error before it
-     * propagates out of scope.  This is needed for compatability
-     * with the old scheme.
-     */
-    if (!js_ErrorToException(cx, message, reportp)) {
-        js_ReportErrorAgain(cx, message, reportp);
-    } else if (cx->runtime->debugErrorHook && cx->errorReporter) {
-        JSDebugErrorHook hook = cx->runtime->debugErrorHook;
-        /* test local in case debugErrorHook changed on another thread */
-        if (hook)
-            hook(cx, message, reportp, cx->runtime->debugErrorHookData);
-    }
-#else
-    js_ReportErrorAgain(cx, message, reportp);
-#endif
-}
-
-/*
- * We don't post an exception in this case, since doing so runs into
- * complications of pre-allocating an exception object which required
- * running the Exception class initializer early etc.
- * Instead we just invoke the errorReporter with an "Out Of Memory"
- * type message, and then hope the process ends swiftly.
- */
-void
-js_ReportOutOfMemory(JSContext *cx)
-{
-    JSStackFrame *fp;
-    JSErrorReport report;
-    JSErrorReporter onError = cx->errorReporter;
-
-    /* Get the message for this error, but we won't expand any arguments. */
-    const JSErrorFormatString *efs = 
-        js_GetLocalizedErrorMessage(cx, NULL, NULL, JSMSG_OUT_OF_MEMORY);
-    const char *msg = efs ? efs->format : "Out of memory";
-
-    /* Fill out the report, but don't do anything that requires allocation. */
-    memset(&report, 0, sizeof (struct JSErrorReport));
-    report.flags = JSREPORT_ERROR;
-    report.errorNumber = JSMSG_OUT_OF_MEMORY;
-
-    /*
-     * Walk stack until we find a frame that is associated with some script
-     * rather than a native frame.
-     */
-    for (fp = cx->fp; fp; fp = fp->down) {
-        if (fp->script && fp->pc) {
-            report.filename = fp->script->filename;
-            report.lineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-            break;
-        }
-    }
-
-    /*
-     * If debugErrorHook is present then we give it a chance to veto
-     * sending the error on to the regular ErrorReporter.
-     */
-    if (onError) {
-        JSDebugErrorHook hook = cx->runtime->debugErrorHook;
-        if (hook &&
-            !hook(cx, msg, &report, cx->runtime->debugErrorHookData)) {
-            onError = NULL;
-        }
-    }
-
-    if (onError)
-        onError(cx, msg, &report);
-}
-
-JSBool
-js_ReportErrorVA(JSContext *cx, uintN flags, const char *format, va_list ap)
-{
-    char *last;
-    JSStackFrame *fp;
-    JSErrorReport report;
-    JSBool warning;
-
-    if ((flags & JSREPORT_STRICT) && !JS_HAS_STRICT_OPTION(cx))
-        return JS_TRUE;
-
-    last = JS_vsmprintf(format, ap);
-    if (!last)
-        return JS_FALSE;
-
-    memset(&report, 0, sizeof (struct JSErrorReport));
-    report.flags = flags;
-
-    /* Find the top-most active script frame, for best line number blame. */
-    for (fp = cx->fp; fp; fp = fp->down) {
-        if (fp->script && fp->pc) {
-            report.filename = fp->script->filename;
-            report.lineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-            break;
-        }
-    }
-
-    warning = JSREPORT_IS_WARNING(report.flags);
-    if (warning && JS_HAS_WERROR_OPTION(cx)) {
-        report.flags &= ~JSREPORT_WARNING;
-        warning = JS_FALSE;
-    }
-
-    ReportError(cx, last, &report);
-    free(last);
-    return warning;
-}
-
-/*
- * The arguments from ap need to be packaged up into an array and stored
- * into the report struct.
- *
- * The format string addressed by the error number may contain operands
- * identified by the format {N}, where N is a decimal digit. Each of these
- * is to be replaced by the Nth argument from the va_list. The complete
- * message is placed into reportp->ucmessage converted to a JSString.
- *
- * Returns true if the expansion succeeds (can fail if out of memory).
- */
-JSBool
-js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
-                        void *userRef, const uintN errorNumber,
-                        char **messagep, JSErrorReport *reportp,
-                        JSBool *warningp, JSBool charArgs, va_list ap)
-{
-    const JSErrorFormatString *efs;
-    int i;
-    int argCount;
-
-    *warningp = JSREPORT_IS_WARNING(reportp->flags);
-    if (*warningp && JS_HAS_WERROR_OPTION(cx)) {
-        reportp->flags &= ~JSREPORT_WARNING;
-        *warningp = JS_FALSE;
-    }
-
-    *messagep = NULL;
-
-    /* Most calls supply js_GetErrorMessage; if this is so, assume NULL. */
-    if (!callback || callback == js_GetErrorMessage)
-        efs = js_GetLocalizedErrorMessage(cx, userRef, NULL, errorNumber);
-    else
-        efs = callback(userRef, NULL, errorNumber);
-    if (efs) {
-        size_t totalArgsLength = 0;
-        size_t argLengths[10]; /* only {0} thru {9} supported */
-        argCount = efs->argCount;
-        JS_ASSERT(argCount <= 10);
-        if (argCount > 0) {
-            /*
-             * Gather the arguments into an array, and accumulate
-             * their sizes. We allocate 1 more than necessary and
-             * null it out to act as the caboose when we free the
-             * pointers later.
-             */
-            reportp->messageArgs = (const jschar **)
-                JS_malloc(cx, sizeof(jschar *) * (argCount + 1));
-            if (!reportp->messageArgs)
-                return JS_FALSE;
-            reportp->messageArgs[argCount] = NULL;
-            for (i = 0; i < argCount; i++) {
-                if (charArgs) {
-                    char *charArg = va_arg(ap, char *);
-                    size_t charArgLength = strlen(charArg);
-                    reportp->messageArgs[i]
-                        = js_InflateString(cx, charArg, &charArgLength);
-                    if (!reportp->messageArgs[i])
-                        goto error;
-                } else {
-                    reportp->messageArgs[i] = va_arg(ap, jschar *);
-                }
-                argLengths[i] = js_strlen(reportp->messageArgs[i]);
-                totalArgsLength += argLengths[i];
-            }
-            /* NULL-terminate for easy copying. */
-            reportp->messageArgs[i] = NULL;
-        }
-        /*
-         * Parse the error format, substituting the argument X
-         * for {X} in the format.
-         */
-        if (argCount > 0) {
-            if (efs->format) {
-                jschar *buffer, *fmt, *out;
-                int expandedArgs = 0;
-                size_t expandedLength;
-                size_t len = strlen(efs->format);
-
-                buffer = fmt = js_InflateString (cx, efs->format, &len);
-                if (!buffer)
-                    goto error;
-                expandedLength = len
-                                 - (3 * argCount)       /* exclude the {n} */
-                                 + totalArgsLength;
-
-                /*
-                * Note - the above calculation assumes that each argument
-                * is used once and only once in the expansion !!!
-                */
-                reportp->ucmessage = out = (jschar *)
-                    JS_malloc(cx, (expandedLength + 1) * sizeof(jschar));
-                if (!out) {
-                    JS_free (cx, buffer);
-                    goto error;
-                }
-                while (*fmt) {
-                    if (*fmt == '{') {
-                        if (isdigit(fmt[1])) {
-                            int d = JS7_UNDEC(fmt[1]);
-                            JS_ASSERT(d < argCount);
-                            js_strncpy(out, reportp->messageArgs[d],
-                                       argLengths[d]);
-                            out += argLengths[d];
-                            fmt += 3;
-                            expandedArgs++;
-                            continue;
-                        }
-                    }
-                    *out++ = *fmt++;
-                }
-                JS_ASSERT(expandedArgs == argCount);
-                *out = 0;
-                JS_free (cx, buffer);
-                *messagep =
-                    js_DeflateString(cx, reportp->ucmessage,
-                                     (size_t)(out - reportp->ucmessage));
-                if (!*messagep)
-                    goto error;
-            }
-        } else {
-            /*
-             * Zero arguments: the format string (if it exists) is the
-             * entire message.
-             */
-            if (efs->format) {
-                size_t len;
-                *messagep = JS_strdup(cx, efs->format);
-                if (!*messagep)
-                    goto error;
-                len = strlen(*messagep);
-                reportp->ucmessage = js_InflateString(cx, *messagep, &len);
-                if (!reportp->ucmessage)
-                    goto error;
-            }
-        }
-    }
-    if (*messagep == NULL) {
-        /* where's the right place for this ??? */
-        const char *defaultErrorMessage
-            = "No error message available for error number %d";
-        size_t nbytes = strlen(defaultErrorMessage) + 16;
-        *messagep = (char *)JS_malloc(cx, nbytes);
-        if (!*messagep)
-            goto error;
-        JS_snprintf(*messagep, nbytes, defaultErrorMessage, errorNumber);
-    }
-    return JS_TRUE;
-
-error:
-    if (reportp->messageArgs) {
-        i = 0;
-        while (reportp->messageArgs[i])
-            JS_free(cx, (void *)reportp->messageArgs[i++]);
-        JS_free(cx, (void *)reportp->messageArgs);
-        reportp->messageArgs = NULL;
-    }
-    if (reportp->ucmessage) {
-        JS_free(cx, (void *)reportp->ucmessage);
-        reportp->ucmessage = NULL;
-    }
-    if (*messagep) {
-        JS_free(cx, (void *)*messagep);
-        *messagep = NULL;
-    }
-    return JS_FALSE;
-}
-
-JSBool
-js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
-                       void *userRef, const uintN errorNumber,
-                       JSBool charArgs, va_list ap)
-{
-    JSStackFrame *fp;
-    JSErrorReport report;
-    char *message;
-    JSBool warning;
-
-    if ((flags & JSREPORT_STRICT) && !JS_HAS_STRICT_OPTION(cx))
-        return JS_TRUE;
-
-    memset(&report, 0, sizeof (struct JSErrorReport));
-    report.flags = flags;
-    report.errorNumber = errorNumber;
-
-    /*
-     * If we can't find out where the error was based on the current frame,
-     * see if the next frame has a script/pc combo we can use.
-     */
-    for (fp = cx->fp; fp; fp = fp->down) {
-        if (fp->script && fp->pc) {
-            report.filename = fp->script->filename;
-            report.lineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-            break;
-        }
-    }
-
-    if (!js_ExpandErrorArguments(cx, callback, userRef, errorNumber,
-                                 &message, &report, &warning, charArgs, ap)) {
-        return JS_FALSE;
-    }
-
-    ReportError(cx, message, &report);
-
-    if (message)
-        JS_free(cx, message);
-    if (report.messageArgs) {
-        /*
-         * js_ExpandErrorArguments owns its messageArgs only if it had to
-         * inflate the arguments (from regular |char *|s).
-         */
-        if (charArgs) {
-            int i = 0;
-            while (report.messageArgs[i])
-                JS_free(cx, (void *)report.messageArgs[i++]);
-        }
-        JS_free(cx, (void *)report.messageArgs);
-    }
-    if (report.ucmessage)
-        JS_free(cx, (void *)report.ucmessage);
-
-    return warning;
-}
-
-JS_FRIEND_API(void)
-js_ReportErrorAgain(JSContext *cx, const char *message, JSErrorReport *reportp)
-{
-    JSErrorReporter onError;
-
-    if (!message)
-        return;
-
-    if (cx->lastMessage)
-        free(cx->lastMessage);
-    cx->lastMessage = JS_strdup(cx, message);
-    if (!cx->lastMessage)
-        return;
-    onError = cx->errorReporter;
-
-    /*
-     * If debugErrorHook is present then we give it a chance to veto
-     * sending the error on to the regular ErrorReporter.
-     */
-    if (onError) {
-        JSDebugErrorHook hook = cx->runtime->debugErrorHook;
-        if (hook &&
-            !hook(cx, cx->lastMessage, reportp,
-                  cx->runtime->debugErrorHookData)) {
-            onError = NULL;
-        }
-    }
-    if (onError)
-        onError(cx, cx->lastMessage, reportp);
-}
-
-void
-js_ReportIsNotDefined(JSContext *cx, const char *name)
-{
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NOT_DEFINED, name);
-}
-
-#if defined DEBUG && defined XP_UNIX
-/* For gdb usage. */
-#ifdef OSSP
-void js_traceon(JSContext *cx);
-void js_traceoff(JSContext *cx);
-#endif
-void js_traceon(JSContext *cx)  { cx->tracefp = stderr; }
-void js_traceoff(JSContext *cx) { cx->tracefp = NULL; }
-#endif
-
-JSErrorFormatString js_ErrorFormatString[JSErr_Limit] = {
-#if JS_HAS_DFLT_MSG_STRINGS
-#define MSG_DEF(name, number, count, exception, format) \
-    { format, count, exception } ,
-#else
-#define MSG_DEF(name, number, count, exception, format) \
-    { NULL, count, exception } ,
-#endif
-#include "js.msg"
-#undef MSG_DEF
-};
-
-const JSErrorFormatString *
-js_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber)
-{
-    if ((errorNumber > 0) && (errorNumber < JSErr_Limit))
-        return &js_ErrorFormatString[errorNumber];
-    return NULL;
-}
diff --git a/libs/js/src/jscntxt.h b/libs/js/src/jscntxt.h
deleted file mode 100644
index e86b2f0bf7..0000000000
--- a/libs/js/src/jscntxt.h
+++ /dev/null
@@ -1,726 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jscntxt_h___
-#define jscntxt_h___
-/*
- * JS execution context.
- */
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsclist.h"
-#include "jslong.h"
-#include "jsatom.h"
-#include "jsconfig.h"
-#include "jsdhash.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jsobj.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-#include "jsregexp.h"
-
-JS_BEGIN_EXTERN_C
-
-typedef enum JSGCMode { JS_NO_GC, JS_MAYBE_GC, JS_FORCE_GC } JSGCMode;
-
-typedef enum JSRuntimeState {
-    JSRTS_DOWN,
-    JSRTS_LAUNCHING,
-    JSRTS_UP,
-    JSRTS_LANDING
-} JSRuntimeState;
-
-typedef struct JSPropertyTreeEntry {
-    JSDHashEntryHdr     hdr;
-    JSScopeProperty     *child;
-} JSPropertyTreeEntry;
-
-struct JSRuntime {
-    /* Runtime state, synchronized by the stateChange/gcLock condvar/lock. */
-    JSRuntimeState      state;
-
-    /* Garbage collector state, used by jsgc.c. */
-    JSArenaPool         gcArenaPool[GC_NUM_FREELISTS];
-    JSGCThing           *gcFreeList[GC_NUM_FREELISTS];
-    JSDHashTable        gcRootsHash;
-    JSDHashTable        *gcLocksHash;
-    jsrefcount          gcKeepAtoms;
-    uint32              gcBytes;
-    uint32              gcLastBytes;
-    uint32              gcMaxBytes;
-    uint32              gcLevel;
-    uint32              gcNumber;
-    JSPackedBool        gcPoke;
-    JSPackedBool        gcRunning;
-    JSGCCallback        gcCallback;
-    uint32              gcMallocBytes;
-
-    /*
-     * API compatibility requires keeping GCX_PRIVATE bytes separate from the
-     * original GC types' byte tally.  Otherwise embeddings that configure a
-     * good limit for pre-GCX_PRIVATE versions of the engine will see memory
-     * over-pressure too often, possibly leading to failed last-ditch GCs.
-     *
-     * The new XML GC-thing types do add to gcBytes, and they're larger than
-     * the original GC-thing type size (8 bytes on most architectures).  So a
-     * user who enables E4X may want to increase the maxbytes value passed to
-     * JS_NewRuntime.  TODO: Note this in the API docs.
-     */
-    uint32              gcPrivateBytes;
-
-#if JS_HAS_XML_SUPPORT
-    /* Lists of JSXML private data structures to be finalized. */
-    JSXMLNamespace      *gcDoomedNamespaces;
-    JSXMLQName          *gcDoomedQNames;
-    JSXML               *gcDoomedXML;
-#endif
-#ifdef JS_GCMETER
-    JSGCStats           gcStats;
-#endif
-
-    /* Literal table maintained by jsatom.c functions. */
-    JSAtomState         atomState;
-
-    /* Random number generator state, used by jsmath.c. */
-    JSBool              rngInitialized;
-    int64               rngMultiplier;
-    int64               rngAddend;
-    int64               rngMask;
-    int64               rngSeed;
-    jsdouble            rngDscale;
-
-    /* Well-known numbers held for use by this runtime's contexts. */
-    jsdouble            *jsNaN;
-    jsdouble            *jsNegativeInfinity;
-    jsdouble            *jsPositiveInfinity;
-
-    /* Empty string held for use by this runtime's contexts. */
-    JSString            *emptyString;
-
-    /* List of active contexts sharing this runtime; protected by gcLock. */
-    JSCList             contextList;
-
-    /* These are used for debugging -- see jsprvtd.h and jsdbgapi.h. */
-    JSTrapHandler       interruptHandler;
-    void                *interruptHandlerData;
-    JSNewScriptHook     newScriptHook;
-    void                *newScriptHookData;
-    JSDestroyScriptHook destroyScriptHook;
-    void                *destroyScriptHookData;
-    JSTrapHandler       debuggerHandler;
-    void                *debuggerHandlerData;
-    JSSourceHandler     sourceHandler;
-    void                *sourceHandlerData;
-    JSInterpreterHook   executeHook;
-    void                *executeHookData;
-    JSInterpreterHook   callHook;
-    void                *callHookData;
-    JSObjectHook        objectHook;
-    void                *objectHookData;
-    JSTrapHandler       throwHook;
-    void                *throwHookData;
-    JSDebugErrorHook    debugErrorHook;
-    void                *debugErrorHookData;
-
-    /* More debugging state, see jsdbgapi.c. */
-    JSCList             trapList;
-    JSCList             watchPointList;
-
-    /* Weak links to properties, indexed by quickened get/set opcodes. */
-    /* XXX must come after JSCLists or MSVC alignment bug bites empty lists */
-    JSPropertyCache     propertyCache;
-
-    /* Client opaque pointer */
-    void                *data;
-
-#ifdef JS_THREADSAFE
-    /* These combine to interlock the GC and new requests. */
-    PRLock              *gcLock;
-    PRCondVar           *gcDone;
-    PRCondVar           *requestDone;
-    uint32              requestCount;
-    jsword              gcThread;
-
-    /* Lock and owning thread pointer for JS_LOCK_RUNTIME. */
-    PRLock              *rtLock;
-#ifdef DEBUG
-    jsword              rtLockOwner;
-#endif
-
-    /* Used to synchronize down/up state change; protected by gcLock. */
-    PRCondVar           *stateChange;
-
-    /* Used to serialize cycle checks when setting __proto__ or __parent__. */
-    PRLock              *setSlotLock;
-    PRCondVar           *setSlotDone;
-    JSBool              setSlotBusy;
-    JSScope             *setSlotScope;  /* deadlock avoidance, see jslock.c */
-
-    /*
-     * State for sharing single-threaded scopes, once a second thread tries to
-     * lock a scope.  The scopeSharingDone condvar is protected by rt->gcLock,
-     * to minimize number of locks taken in JS_EndRequest.
-     *
-     * The scopeSharingTodo linked list is likewise "global" per runtime, not
-     * one-list-per-context, to conserve space over all contexts, optimizing
-     * for the likely case that scopes become shared rarely, and among a very
-     * small set of threads (contexts).
-     */
-    PRCondVar           *scopeSharingDone;
-    JSScope             *scopeSharingTodo;
-
-/*
- * Magic terminator for the rt->scopeSharingTodo linked list, threaded through
- * scope->u.link.  This hack allows us to test whether a scope is on the list
- * by asking whether scope->u.link is non-null.  We use a large, likely bogus
- * pointer here to distinguish this value from any valid u.count (small int)
- * value.
- */
-#define NO_SCOPE_SHARING_TODO   ((JSScope *) 0xfeedbeef)
-#endif /* JS_THREADSAFE */
-
-    /*
-     * Check property accessibility for objects of arbitrary class.  Used at
-     * present to check f.caller accessibility for any function object f.
-     */
-    JSCheckAccessOp     checkObjectAccess;
-
-    /* Security principals serialization support. */
-    JSPrincipalsTranscoder principalsTranscoder;
-
-    /* Optional hook to find principals for an object in this runtime. */
-    JSObjectPrincipalsFinder findObjectPrincipals;
-
-    /* Shared scope property tree, and allocator for its nodes. */
-    JSDHashTable        propertyTreeHash;
-    JSScopeProperty     *propertyFreeList;
-    JSArenaPool         propertyArenaPool;
-
-    /* Script filename table. */
-    struct JSHashTable  *scriptFilenameTable;
-    JSCList             scriptFilenamePrefixes;
-#ifdef JS_THREADSAFE
-    PRLock              *scriptFilenameTableLock;
-#endif
-
-    /* Number localization, used by jsnum.c */
-    const char          *thousandsSeparator;
-    const char          *decimalSeparator;
-    const char          *numGrouping;
-
-    /*
-     * Weak references to lazily-created, well-known XML singletons.
-     *
-     * NB: Singleton objects must be carefully disconnected from the rest of
-     * the object graph usually associated with a JSContext's global object,
-     * including the set of standard class objects.  See jsxml.c for details.
-     */
-    JSObject            *anynameObject;
-    JSObject            *functionNamespaceObject;
-
-#ifdef DEBUG
-    /* Function invocation metering. */
-    jsrefcount          inlineCalls;
-    jsrefcount          nativeCalls;
-    jsrefcount          nonInlineCalls;
-    jsrefcount          constructs;
-
-    /* Scope lock and property metering. */
-    jsrefcount          claimAttempts;
-    jsrefcount          claimedScopes;
-    jsrefcount          deadContexts;
-    jsrefcount          deadlocksAvoided;
-    jsrefcount          liveScopes;
-    jsrefcount          sharedScopes;
-    jsrefcount          totalScopes;
-    jsrefcount          badUndependStrings;
-    jsrefcount          liveScopeProps;
-    jsrefcount          totalScopeProps;
-    jsrefcount          livePropTreeNodes;
-    jsrefcount          duplicatePropTreeNodes;
-    jsrefcount          totalPropTreeNodes;
-    jsrefcount          propTreeKidsChunks;
-    jsrefcount          middleDeleteFixups;
-
-    /* String instrumentation. */
-    jsrefcount          liveStrings;
-    jsrefcount          totalStrings;
-    jsrefcount          liveDependentStrings;
-    jsrefcount          totalDependentStrings;
-    double              lengthSum;
-    double              lengthSquaredSum;
-    double              strdepLengthSum;
-    double              strdepLengthSquaredSum;
-#endif
-};
-
-#ifdef DEBUG
-# define JS_RUNTIME_METER(rt, which)    JS_ATOMIC_INCREMENT(&(rt)->which)
-# define JS_RUNTIME_UNMETER(rt, which)  JS_ATOMIC_DECREMENT(&(rt)->which)
-#else
-# define JS_RUNTIME_METER(rt, which)    /* nothing */
-# define JS_RUNTIME_UNMETER(rt, which)  /* nothing */
-#endif
-
-#define JS_KEEP_ATOMS(rt)   JS_ATOMIC_INCREMENT(&(rt)->gcKeepAtoms);
-#define JS_UNKEEP_ATOMS(rt) JS_ATOMIC_DECREMENT(&(rt)->gcKeepAtoms);
-
-#ifdef JS_ARGUMENT_FORMATTER_DEFINED
-/*
- * Linked list mapping format strings for JS_{Convert,Push}Arguments{,VA} to
- * formatter functions.  Elements are sorted in non-increasing format string
- * length order.
- */
-struct JSArgumentFormatMap {
-    const char          *format;
-    size_t              length;
-    JSArgumentFormatter formatter;
-    JSArgumentFormatMap *next;
-};
-#endif
-
-struct JSStackHeader {
-    uintN               nslots;
-    JSStackHeader       *down;
-};
-
-#define JS_STACK_SEGMENT(sh)    ((jsval *)(sh) + 2)
-
-/*
- * Key and entry types for the JSContext.resolvingTable hash table, typedef'd
- * here because all consumers need to see these declarations (and not just the
- * typedef names, as would be the case for an opaque pointer-to-typedef'd-type
- * declaration), along with cx->resolvingTable.
- */
-typedef struct JSResolvingKey {
-    JSObject            *obj;
-    jsid                id;
-} JSResolvingKey;
-
-typedef struct JSResolvingEntry {
-    JSDHashEntryHdr     hdr;
-    JSResolvingKey      key;
-    uint32              flags;
-} JSResolvingEntry;
-
-#define JSRESFLAG_LOOKUP        0x1     /* resolving id from lookup */
-#define JSRESFLAG_WATCH         0x2     /* resolving id from watch */
-
-typedef struct JSLocalRootChunk JSLocalRootChunk;
-
-#define JSLRS_CHUNK_SHIFT       8
-#define JSLRS_CHUNK_SIZE        JS_BIT(JSLRS_CHUNK_SHIFT)
-#define JSLRS_CHUNK_MASK        JS_BITMASK(JSLRS_CHUNK_SHIFT)
-
-struct JSLocalRootChunk {
-    jsval               roots[JSLRS_CHUNK_SIZE];
-    JSLocalRootChunk    *down;
-};
-
-typedef struct JSLocalRootStack {
-    uint32              scopeMark;
-    uint32              rootCount;
-    JSLocalRootChunk    *topChunk;
-    JSLocalRootChunk    firstChunk;
-} JSLocalRootStack;
-
-#define JSLRS_NULL_MARK ((uint32) -1)
-
-typedef struct JSTempValueRooter JSTempValueRooter;
-
-/*
- * If count is -1, then u.value contains the single value to root.  Otherwise
- * u.array points to a stack-allocated vector of jsvals.  Note that the vector
- * may have length 0 or 1 for full generality, so we need -1 to discriminate
- * the union.
- *
- * If you need to protect a result value that flows out of a C function across
- * several layers of other functions, use the js_LeaveLocalRootScopeWithResult
- * internal API (see further below) instead.
- */
-struct JSTempValueRooter {
-    JSTempValueRooter   *down;
-    jsint               count;
-    union {
-        jsval           value;
-        jsval           *array;
-    } u;
-};
-
-#define JS_PUSH_TEMP_ROOT_COMMON(cx,tvr)                                      \
-    JS_BEGIN_MACRO                                                            \
-        JS_ASSERT((cx)->tempValueRooters != (tvr));                           \
-        (tvr)->down = (cx)->tempValueRooters;                                 \
-        (cx)->tempValueRooters = (tvr);                                       \
-    JS_END_MACRO
-
-#define JS_PUSH_SINGLE_TEMP_ROOT(cx,val,tvr)                                  \
-    JS_BEGIN_MACRO                                                            \
-        JS_PUSH_TEMP_ROOT_COMMON(cx, tvr);                                    \
-        (tvr)->count = -1;                                                    \
-        (tvr)->u.value = (val);                                               \
-    JS_END_MACRO
-
-#define JS_PUSH_TEMP_ROOT(cx,cnt,arr,tvr)                                     \
-    JS_BEGIN_MACRO                                                            \
-        JS_PUSH_TEMP_ROOT_COMMON(cx, tvr);                                    \
-        (tvr)->count = (cnt);                                                 \
-        (tvr)->u.array = (arr);                                               \
-    JS_END_MACRO
-
-#define JS_POP_TEMP_ROOT(cx,tvr)                                              \
-    JS_BEGIN_MACRO                                                            \
-        JS_ASSERT((cx)->tempValueRooters == (tvr));                           \
-        (cx)->tempValueRooters = (tvr)->down;                                 \
-    JS_END_MACRO
-
-#define JS_TEMP_ROOT_EVAL(cx,cnt,val,expr)                                    \
-    JS_BEGIN_MACRO                                                            \
-        JSTempValueRooter tvr;                                                \
-        JS_PUSH_TEMP_ROOT(cx, cnt, val, &tvr);                                \
-        (expr);                                                               \
-        JS_POP_TEMP_ROOT(cx, &tvr);                                           \
-    JS_END_MACRO
-
-struct JSContext {
-    JSCList             links;
-
-    /* Interpreter activation count. */
-    uintN               interpLevel;
-
-    /* Limit pointer for checking stack consumption during recursion. */
-    jsuword             stackLimit;
-
-    /* Runtime version control identifier and equality operators. */
-    uint16              version;
-    jsbytecode          jsop_eq;
-    jsbytecode          jsop_ne;
-
-    /* Data shared by threads in an address space. */
-    JSRuntime           *runtime;
-
-    /* Stack arena pool and frame pointer register. */
-    JSArenaPool         stackPool;
-    JSStackFrame        *fp;
-
-    /* Temporary arena pool used while compiling and decompiling. */
-    JSArenaPool         tempPool;
-
-    /* Top-level object and pointer to top stack frame's scope chain. */
-    JSObject            *globalObject;
-
-    /* Most recently created things by type, members of the GC's root set. */
-    JSGCThing           *newborn[GCX_NTYPES];
-
-    /* Atom root for the last-looked-up atom on this context. */
-    JSAtom              *lastAtom;
-
-    /* Root for the result of the most recent js_InternalInvoke call. */
-    jsval               lastInternalResult;
-
-    /* Regular expression class statics (XXX not shared globally). */
-    JSRegExpStatics     regExpStatics;
-
-    /* State for object and array toSource conversion. */
-    JSSharpObjectMap    sharpObjectMap;
-
-    /* Argument formatter support for JS_{Convert,Push}Arguments{,VA}. */
-    JSArgumentFormatMap *argumentFormatMap;
-
-    /* Last message string and trace file for debugging. */
-    char                *lastMessage;
-#ifdef DEBUG
-    void                *tracefp;
-#endif
-
-    /* Per-context optional user callbacks. */
-    JSBranchCallback    branchCallback;
-    JSErrorReporter     errorReporter;
-
-    /* Client opaque pointer */
-    void                *data;
-
-    /* GC and thread-safe state. */
-    JSStackFrame        *dormantFrameChain; /* dormant stack frame to scan */
-#ifdef JS_THREADSAFE
-    jsword              thread;
-    jsrefcount          requestDepth;
-    JSScope             *scopeToShare;      /* weak reference, see jslock.c */
-    JSScope             *lockedSealedScope; /* weak ref, for low-cost sealed
-                                               scope locking */
-#endif
-
-#if JS_HAS_LVALUE_RETURN
-    /*
-     * Secondary return value from native method called on the left-hand side
-     * of an assignment operator.  The native should store the object in which
-     * to set a property in *rval, and return the property's id expressed as a
-     * jsval by calling JS_SetCallReturnValue2(cx, idval).
-     */
-    jsval               rval2;
-    JSPackedBool        rval2set;
-#endif
-
-#if JS_HAS_XML_SUPPORT
-    /*
-     * Bit-set formed from binary exponentials of the XML_* tiny-ids defined
-     * for boolean settings in jsxml.c, plus an XSF_CACHE_VALID bit.  Together
-     * these act as a cache of the boolean XML.ignore* and XML.prettyPrinting
-     * property values associated with this context's global object.
-     */
-    uint8               xmlSettingFlags;
-#endif
-
-    /*
-     * True if creating an exception object, to prevent runaway recursion.
-     * NB: creatingException packs with rval2set, #if JS_HAS_LVALUE_RETURN;
-     * with xmlSettingFlags, #if JS_HAS_XML_SUPPORT; and with throwing below.
-     */
-    JSPackedBool        creatingException;
-
-    /*
-     * Exception state -- the exception member is a GC root by definition.
-     * NB: throwing packs with creatingException and rval2set, above.
-     */
-    JSPackedBool        throwing;           /* is there a pending exception? */
-    jsval               exception;          /* most-recently-thrown exception */
-
-    /* Per-context options. */
-    uint32              options;            /* see jsapi.h for JSOPTION_* */
-
-    /* Locale specific callbacks for string conversion. */
-    JSLocaleCallbacks   *localeCallbacks;
-
-    /*
-     * cx->resolvingTable is non-null and non-empty if we are initializing
-     * standard classes lazily, or if we are otherwise recursing indirectly
-     * from js_LookupProperty through a JSClass.resolve hook.  It is used to
-     * limit runaway recursion (see jsapi.c and jsobj.c).
-     */
-    JSDHashTable        *resolvingTable;
-
-    /* PDL of stack headers describing stack slots not rooted by argv, etc. */
-    JSStackHeader       *stackHeaders;
-
-    /* Optional stack of heap-allocated scoped local GC roots. */
-    JSLocalRootStack    *localRootStack;
-
-    /* Stack of thread-stack-allocated temporary GC roots. */
-    JSTempValueRooter   *tempValueRooters;
-};
-
-/*
- * Slightly more readable macros for testing per-context option settings (also
- * to hide bitset implementation detail).
- *
- * JSOPTION_XML must be handled specially in order to propagate from compile-
- * to run-time (from cx->options to script->version/cx->version).  To do that,
- * we copy JSOPTION_XML from cx->options into cx->version as JSVERSION_HAS_XML
- * whenever options are set, and preserve this XML flag across version number
- * changes done via the JS_SetVersion API.
- *
- * But when executing a script or scripted function, the interpreter changes
- * cx->version, including the XML flag, to script->version.  Thus JSOPTION_XML
- * is a compile-time option that causes a run-time version change during each
- * activation of the compiled script.  That version change has the effect of
- * changing JS_HAS_XML_OPTION, so that any compiling done via eval enables XML
- * support.  If an XML-enabled script or function calls a non-XML function,
- * the flag bit will be cleared during the callee's activation.
- *
- * Note that JS_SetVersion API calls never pass JSVERSION_HAS_XML or'd into
- * that API's version parameter.
- * 
- * Note also that script->version must contain this XML option flag in order
- * for XDR'ed scripts to serialize and deserialize with that option preserved
- * for detection at run-time.  We can't copy other compile-time options into
- * script->version because that would break backward compatibility (certain
- * other options, e.g. JSOPTION_VAROBJFIX, are analogous to JSOPTION_XML).
- */
-#define JS_HAS_OPTION(cx,option)        (((cx)->options & (option)) != 0)
-#define JS_HAS_STRICT_OPTION(cx)        JS_HAS_OPTION(cx, JSOPTION_STRICT)
-#define JS_HAS_WERROR_OPTION(cx)        JS_HAS_OPTION(cx, JSOPTION_WERROR)
-#define JS_HAS_COMPILE_N_GO_OPTION(cx)  JS_HAS_OPTION(cx, JSOPTION_COMPILE_N_GO)
-#define JS_HAS_ATLINE_OPTION(cx)        JS_HAS_OPTION(cx, JSOPTION_ATLINE)
-
-#define JSVERSION_MASK                  0x0FFF  /* see JSVersion in jspubtd.h */
-#define JSVERSION_HAS_XML               0x1000  /* flag induced by XML option */
-
-#define JSVERSION_NUMBER(cx)            ((cx)->version & JSVERSION_MASK)
-#define JS_HAS_XML_OPTION(cx)           ((cx)->version & JSVERSION_HAS_XML || \
-                                         JSVERSION_NUMBER(cx) >= JSVERSION_1_6)
-
-#define JS_HAS_NATIVE_BRANCH_CALLBACK_OPTION(cx)                              \
-    JS_HAS_OPTION(cx, JSOPTION_NATIVE_BRANCH_CALLBACK)
-
-/*
- * Wrappers for the JSVERSION_IS_* macros from jspubtd.h taking JSContext *cx
- * and masking off the XML flag and any other high order bits.
- */
-#define JS_VERSION_IS_ECMA(cx)          JSVERSION_IS_ECMA(JSVERSION_NUMBER(cx))
-#define JS_VERSION_IS_1_2(cx)           (JSVERSION_NUMBER(cx) == JSVERSION_1_2)
-
-/*
- * Common subroutine of JS_SetVersion and js_SetVersion, to update per-context
- * data that depends on version.
- */
-extern void
-js_OnVersionChange(JSContext *cx);
-
-/*
- * Unlike the JS_SetVersion API, this function stores JSVERSION_HAS_XML and
- * any future non-version-number flags induced by compiler options.
- */
-extern void
-js_SetVersion(JSContext *cx, JSVersion version);
-
-/*
- * Create and destroy functions for JSContext, which is manually allocated
- * and exclusively owned.
- */
-extern JSContext *
-js_NewContext(JSRuntime *rt, size_t stackChunkSize);
-
-extern void
-js_DestroyContext(JSContext *cx, JSGCMode gcmode);
-
-/*
- * Return true if cx points to a context in rt->contextList, else return false.
- * NB: the caller (see jslock.c:ClaimScope) must hold rt->gcLock.
- */
-extern JSBool
-js_ValidContextPointer(JSRuntime *rt, JSContext *cx);
-
-/*
- * If unlocked, acquire and release rt->gcLock around *iterp update; otherwise
- * the caller must be holding rt->gcLock.
- */
-extern JSContext *
-js_ContextIterator(JSRuntime *rt, JSBool unlocked, JSContext **iterp);
-
-/*
- * JSClass.resolve and watchpoint recursion damping machinery.
- */
-extern JSBool
-js_StartResolving(JSContext *cx, JSResolvingKey *key, uint32 flag,
-                  JSResolvingEntry **entryp);
-
-extern void
-js_StopResolving(JSContext *cx, JSResolvingKey *key, uint32 flag,
-                 JSResolvingEntry *entry, uint32 generation);
-
-/*
- * Local root set management.
- */
-extern JSBool
-js_EnterLocalRootScope(JSContext *cx);
-
-extern void
-js_LeaveLocalRootScope(JSContext *cx);
-
-extern void
-js_ForgetLocalRoot(JSContext *cx, jsval v);
-
-extern int
-js_PushLocalRoot(JSContext *cx, JSLocalRootStack *lrs, jsval v);
-
-extern void
-js_MarkLocalRoots(JSContext *cx, JSLocalRootStack *lrs);
-
-/*
- * Report an exception, which is currently realized as a printf-style format
- * string and its arguments.
- */
-typedef enum JSErrNum {
-#define MSG_DEF(name, number, count, exception, format) \
-    name = number,
-#include "js.msg"
-#undef MSG_DEF
-    JSErr_Limit
-} JSErrNum;
-
-extern const JSErrorFormatString *
-js_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber);
-
-#ifdef va_start
-extern JSBool
-js_ReportErrorVA(JSContext *cx, uintN flags, const char *format, va_list ap);
-
-extern JSBool
-js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
-                       void *userRef, const uintN errorNumber,
-                       JSBool charArgs, va_list ap);
-
-extern JSBool
-js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
-                        void *userRef, const uintN errorNumber,
-                        char **message, JSErrorReport *reportp,
-                        JSBool *warningp, JSBool charArgs, va_list ap);
-#endif
-
-extern void
-js_ReportOutOfMemory(JSContext *cx);
-
-/*
- * Report an exception using a previously composed JSErrorReport.
- * XXXbe remove from "friend" API
- */
-extern JS_FRIEND_API(void)
-js_ReportErrorAgain(JSContext *cx, const char *message, JSErrorReport *report);
-
-extern void
-js_ReportIsNotDefined(JSContext *cx, const char *name);
-
-extern JSErrorFormatString js_ErrorFormatString[JSErr_Limit];
-
-/*
- * See JS_SetThreadStackLimit in jsapi.c, where we check that the stack grows
- * in the expected direction.  On Unix-y systems, JS_STACK_GROWTH_DIRECTION is
- * computed on the build host by jscpucfg.c and written into jsautocfg.h.  The
- * macro is hardcoded in jscpucfg.h on Windows and Mac systems (for historical
- * reasons pre-dating autoconf usage).
- */
-#if JS_STACK_GROWTH_DIRECTION > 0
-# define JS_CHECK_STACK_SIZE(cx, lval)  ((jsuword)&(lval) < (cx)->stackLimit)
-#else
-# define JS_CHECK_STACK_SIZE(cx, lval)  ((jsuword)&(lval) > (cx)->stackLimit)
-#endif
-
-JS_END_EXTERN_C
-
-#endif /* jscntxt_h___ */
diff --git a/libs/js/src/jscompat.h b/libs/js/src/jscompat.h
deleted file mode 100644
index 80d86056ec..0000000000
--- a/libs/js/src/jscompat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* -*- Mode: C; tab-width: 8 -*-
- * Copyright (C) 1996-1999 Netscape Communications Corporation, All Rights Reserved.
- */
-#ifndef jscompat_h___
-#define jscompat_h___
-/*
- * Compatibility glue for various NSPR versions.  We must always define int8,
- * int16, jsword, and so on to minimize differences with js/ref, no matter what
- * the NSPR typedef names may be.
- */
-#include "jstypes.h"
-#include "jslong.h"
-
-typedef JSIntn intN;
-typedef JSUintn uintN;
-typedef JSUword jsuword;
-typedef JSWord jsword;
-typedef float float32;
-#define allocPriv allocPool
-#endif /* jscompat_h___ */
diff --git a/libs/js/src/jsconfig.h b/libs/js/src/jsconfig.h
deleted file mode 100644
index 5902499f90..0000000000
--- a/libs/js/src/jsconfig.h
+++ /dev/null
@@ -1,563 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS configuration macros.
- */
-#ifndef JS_VERSION
-#define JS_VERSION 160
-#endif
-
-/*
- * Compile-time JS version configuration.  The JS version numbers lie on the
- * number line like so:
- *
- *      1.0     1.1     1.2     1.3     1.4     ECMAv3  1.5     1.6
- *              ^                       ^
- *              |                       |
- *              basis for ECMAv1        close to ECMAv2
- *
- * where ECMAv3 stands for ECMA-262 Edition 3.  See the runtime version enum
- * JSVersion in jspubtd.h.  Code in the engine can therefore count on version
- * <= JSVERSION_1_4 to mean "before the Third Edition of ECMA-262" and version
- * > JSVERSION_1_4 to mean "at or after the Third Edition".
- *
- * In the unlikely event that SpiderMonkey ever implements JavaScript 2.0, or
- * ECMA-262 Edition 4 (JS2 without certain extensions), the version number to
- * use would be near 200, or greater.
- *
- * The JS_VERSION_ECMA_3 version is the minimal configuration conforming to
- * the ECMA-262 Edition 3 specification.  Use it for minimal embeddings, where
- * you're sure you don't need any of the extensions disabled in this version.
- * In order to facilitate testing, JS_HAS_OBJ_PROTO_PROP is defined as part of
- * the JS_VERSION_ECMA_3_TEST version.
- */
-#define JS_VERSION_ECMA_3       148
-#define JS_VERSION_ECMA_3_TEST  149
-
-#if JS_VERSION == JS_VERSION_ECMA_3 ||                                        \
-    JS_VERSION == JS_VERSION_ECMA_3_TEST
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, array.pop, etc */
-#define JS_HAS_STR_HTML_HELPERS 0       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      0       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has fun.apply(obj, argArray) */
-#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
-#if JS_VERSION == JS_VERSION_ECMA_3_TEST
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#else
-#define JS_HAS_OBJ_PROTO_PROP   0       /* has o.__proto__ etc. */
-#endif
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   0       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    0       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  0       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              0       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       1       /* has exception handling */
-#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      1       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       1       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 1       /* has error object hierarchy */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  1       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   1       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    1       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 100
-
-#define JS_BUG_NULL_INDEX_PROPS 1       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 1       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   1       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   1       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   1       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      0       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      0       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  0       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    0       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 0       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    0       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    0       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      0       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     0       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  0       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   0       /* has fun.apply(obj, argArray) */
-#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   0       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          0       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     0       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     0       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   0       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    0       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  0       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              0       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       0       /* has exception handling */
-#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 0       /* has error object hierarchy */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  0       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   0       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    0       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 110
-
-#define JS_BUG_NULL_INDEX_PROPS 1       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 1       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   1       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    1       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  1       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   1       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   1       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      0       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      0       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  0       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    0       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 0       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    0       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      0       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     0       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  0       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   0       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   0       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          0       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     0       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     0       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   0       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    0       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  0       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              0       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       0       /* has exception handling */
-#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 0       /* has error object hierarchy */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  0       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   0       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    0       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 120
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    1       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      1       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    0       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     0       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       0       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   0       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    0       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              0       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       0       /* has exception handling */
-#define JS_HAS_UNDEFINED        0       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         0       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      0       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 0       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 0       /* has error object hierarchy */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  0       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   0       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    0       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 130
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      1       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              1       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       0       /* has exception handling */
-#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      0       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       0       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 0       /* has error object hierarchy */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  0       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   0       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    0       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 140
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     1       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      1       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              1       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       1       /* has exception handling */
-#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      1       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       1       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 0       /* rt errors reflected as exceptions */
-#define JS_HAS_CATCH_GUARD      0       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  0       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   0       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    0       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           0       /* has uneval() top-level function */
-#define JS_HAS_CONST            0       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    0       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    0       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   0       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 150
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      1       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              1       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       1       /* has exception handling */
-#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      1       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       1       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 1       /* rt errors reflected as exceptions */
-#define JS_HAS_CATCH_GUARD      1       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  1       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   1       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    1       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           1       /* has uneval() top-level function */
-#define JS_HAS_CONST            1       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    1       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    1       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   1       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      0       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     0       /* has indexOf and Lispy extras */
-
-#elif JS_VERSION == 160
-
-#define JS_BUG_NULL_INDEX_PROPS 0       /* o[0] defaults to null, not void */
-#define JS_BUG_EMPTY_INDEX_ZERO 0       /* o[""] is equivalent to o[0] */
-#define JS_BUG_EAGER_TOSTRING   0       /* o.toString() trumps o.valueOf() */
-#define JS_BUG_VOID_TOSTRING    0       /* void 0 + 0 == "undefined0" */
-#define JS_BUG_EVAL_THIS_FUN    0       /* eval('this') in function f is f */
-#define JS_BUG_EVAL_THIS_SCOPE  0       /* Math.eval('sin(x)') vs. local x */
-#define JS_BUG_FALLIBLE_EQOPS   0       /* fallible/intransitive equality ops */
-#define JS_BUG_FALLIBLE_TONUM   0       /* fallible ValueToNumber primitive */
-#define JS_BUG_WITH_CLOSURE     0       /* with(o)function f(){} sets o.f */
-
-#define JS_HAS_PROP_DELETE      1       /* delete o.p removes p from o */
-#define JS_HAS_CALL_OBJECT      1       /* fun.caller is stack frame obj */
-#define JS_HAS_LABEL_STATEMENT  1       /* has break/continue to label: */
-#define JS_HAS_DO_WHILE_LOOP    1       /* has do {...} while (b) */
-#define JS_HAS_SWITCH_STATEMENT 1       /* has switch (v) {case c: ...} */
-#define JS_HAS_SOME_PERL_FUN    1       /* has array.join/reverse/sort */
-#define JS_HAS_MORE_PERL_FUN    1       /* has array.push, str.substr, etc */
-#define JS_HAS_STR_HTML_HELPERS 1       /* has str.anchor, str.bold, etc. */
-#define JS_HAS_PERL_SUBSTR      1       /* has str.substr */
-#define JS_HAS_VALUEOF_HINT     1       /* valueOf(hint) where hint is typeof */
-#define JS_HAS_LEXICAL_CLOSURE  1       /* nested functions, lexically closed */
-#define JS_HAS_APPLY_FUNCTION   1       /* has apply(fun, arg1, ... argN) */
-#define JS_HAS_CALL_FUNCTION    1       /* has fun.call(obj, arg1, ... argN) */
-#define JS_HAS_OBJ_PROTO_PROP   1       /* has o.__proto__ etc. */
-#define JS_HAS_REGEXPS          1       /* has perl r.e.s via RegExp, /pat/ */
-#define JS_HAS_SEQUENCE_OPS     1       /* has array.slice, string.concat */
-#define JS_HAS_INITIALIZERS     1       /* has var o = {'foo': 42, 'bar':3} */
-#define JS_HAS_OBJ_WATCHPOINT   1       /* has o.watch and o.unwatch */
-#define JS_HAS_EXPORT_IMPORT    1       /* has export fun; import obj.fun */
-#define JS_HAS_EVAL_THIS_SCOPE  1       /* Math.eval is same as with (Math) */
-#define JS_HAS_TRIPLE_EQOPS     1       /* has === and !== identity eqops */
-#define JS_HAS_SHARP_VARS       1       /* has #n=, #n# for object literals */
-#define JS_HAS_REPLACE_LAMBDA   1       /* has string.replace(re, lambda) */
-#define JS_HAS_SCRIPT_OBJECT    1       /* has (new Script("x++")).exec() */
-#define JS_HAS_XDR              1       /* has XDR API and internal support */
-#define JS_HAS_XDR_FREEZE_THAW  0       /* has XDR freeze/thaw script methods */
-#define JS_HAS_EXCEPTIONS       1       /* has exception handling */
-#define JS_HAS_UNDEFINED        1       /* has global "undefined" property */
-#define JS_HAS_TOSOURCE         1       /* has Object/Array toSource method */
-#define JS_HAS_IN_OPERATOR      1       /* has in operator ('p' in {p:1}) */
-#define JS_HAS_INSTANCEOF       1       /* has {p:1} instanceof Object */
-#define JS_HAS_ARGS_OBJECT      1       /* has minimal ECMA arguments object */
-#define JS_HAS_DEBUGGER_KEYWORD 1       /* has hook for debugger keyword */
-#define JS_HAS_ERROR_EXCEPTIONS 1       /* rt errors reflected as exceptions */
-#define JS_HAS_CATCH_GUARD      1       /* has exception handling catch guard */
-#define JS_HAS_NEW_OBJ_METHODS  1       /* has Object.prototype query methods */
-#define JS_HAS_SPARSE_ARRAYS    0       /* array methods preserve empty elems */
-#define JS_HAS_DFLT_MSG_STRINGS 1       /* provides English error messages */
-#define JS_HAS_NUMBER_FORMATS   1       /* numbers have formatting methods */
-#define JS_HAS_GETTER_SETTER    1       /* has JS2 getter/setter functions */
-#define JS_HAS_UNEVAL           1       /* has uneval() top-level function */
-#define JS_HAS_CONST            1       /* has JS2 const as alternative var */
-#define JS_HAS_FUN_EXPR_STMT    1       /* has function expression statement */
-#define JS_HAS_LVALUE_RETURN    1       /* has o.item(i) = j; for native item */
-#define JS_HAS_NO_SUCH_METHOD   1       /* has o.__noSuchMethod__ handler */
-#define JS_HAS_XML_SUPPORT      1       /* has ECMAScript for XML support */
-#define JS_HAS_ARRAY_EXTRAS     1       /* has indexOf and Lispy extras */
-
-#else
-
-#error "unknown JS_VERSION"
-
-#endif
diff --git a/libs/js/src/jscpucfg.c b/libs/js/src/jscpucfg.c
deleted file mode 100644
index e02f33615d..0000000000
--- a/libs/js/src/jscpucfg.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Generate CPU-specific bit-size and similar #defines.
- */
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef CROSS_COMPILE
-#include <prtypes.h>
-#define INT64 PRInt64
-#else
-
-/************************************************************************/
-
-/* Generate cpucfg.h */
-
-#if defined(XP_WIN) || defined(XP_OS2)
-#ifdef WIN32
-#if defined(__GNUC__)
-#define INT64   long long
-#else
-#define INT64   _int64
-#endif /* __GNUC__ */
-#else
-#define INT64   long
-#endif
-#else
-#if defined(HPUX) || defined(__QNX__) || defined(_SCO_DS) || defined(UNIXWARE)
-#define INT64   long
-#else
-#define INT64   long long
-#endif
-#endif
-
-#endif /* CROSS_COMPILE */
-
-#ifdef __GNUC__
-#define NS_NEVER_INLINE __attribute__((noinline))
-#else
-#define NS_NEVER_INLINE
-#endif
-
-typedef void *prword;
-
-struct align_short {
-    char c;
-    short a;
-};
-struct align_int {
-    char c;
-    int a;
-};
-struct align_long {
-    char c;
-    long a;
-};
-struct align_int64 {
-    char c;
-    INT64 a;
-};
-struct align_fakelonglong {
-    char c;
-    struct {
-        long hi, lo;
-    } a;
-};
-struct align_float {
-    char c;
-    float a;
-};
-struct align_double {
-    char c;
-    double a;
-};
-struct align_pointer {
-    char c;
-    void *a;
-};
-struct align_prword {
-    char c;
-    prword a;
-};
-
-#define ALIGN_OF(type) \
-    (((char*)&(((struct align_##type *)0)->a)) - ((char*)0))
-
-unsigned int bpb;
-
-static int Log2(unsigned int n)
-{
-    int log2 = 0;
-
-    if (n & (n-1))
-        log2++;
-    if (n >> 16)
-        log2 += 16, n >>= 16;
-    if (n >> 8)
-        log2 += 8, n >>= 8;
-    if (n >> 4)
-        log2 += 4, n >>= 4;
-    if (n >> 2)
-        log2 += 2, n >>= 2;
-    if (n >> 1)
-        log2++;
-    return log2;
-}
-
-/*
- * Conceivably this could actually be used, but there is lots of code out
- * there with ands and shifts in it that assumes a byte is exactly 8 bits,
- * so forget about porting THIS code to all those non 8 bit byte machines.
- */
-static void BitsPerByte(void)
-{
-    bpb = 8;
-}
-
-static int NS_NEVER_INLINE StackGrowthDirection(int *dummy1addr)
-{
-    int dummy2;
-
-    return (&dummy2 < dummy1addr) ? -1 : 1;
-}
-
-int main(int argc, char **argv)
-{
-    int sizeof_char, sizeof_short, sizeof_int, sizeof_int64, sizeof_long,
-        sizeof_float, sizeof_double, sizeof_word, sizeof_dword;
-    int bits_per_int64_log2, align_of_short, align_of_int, align_of_long,
-        align_of_int64, align_of_float, align_of_double, align_of_pointer,
-        align_of_word;
-    int dummy1;
-
-    BitsPerByte();
-
-    printf("#ifndef js_cpucfg___\n");
-    printf("#define js_cpucfg___\n\n");
-
-    printf("/* AUTOMATICALLY GENERATED - DO NOT EDIT */\n\n");
-
-#ifdef CROSS_COMPILE
-#if defined(IS_LITTLE_ENDIAN)
-    printf("#define IS_LITTLE_ENDIAN 1\n");
-    printf("#undef  IS_BIG_ENDIAN\n\n");
-#elif defined(IS_BIG_ENDIAN)
-    printf("#undef  IS_LITTLE_ENDIAN\n");
-    printf("#define IS_BIG_ENDIAN 1\n\n");
-#else
-#error "Endianess not defined."
-#endif
-
-    sizeof_char         = PR_BYTES_PER_BYTE;
-    sizeof_short        = PR_BYTES_PER_SHORT;
-    sizeof_int          = PR_BYTES_PER_INT;
-    sizeof_int64        = PR_BYTES_PER_INT64;
-    sizeof_long         = PR_BYTES_PER_LONG;
-    sizeof_float        = PR_BYTES_PER_FLOAT;
-    sizeof_double       = PR_BYTES_PER_DOUBLE;
-    sizeof_word         = PR_BYTES_PER_WORD;
-    sizeof_dword        = PR_BYTES_PER_DWORD;
-
-    bits_per_int64_log2 = PR_BITS_PER_INT64_LOG2;
-
-    align_of_short      = PR_ALIGN_OF_SHORT;
-    align_of_int        = PR_ALIGN_OF_INT;
-    align_of_long       = PR_ALIGN_OF_LONG;
-    align_of_int64      = PR_ALIGN_OF_INT64;
-    align_of_float      = PR_ALIGN_OF_FLOAT;
-    align_of_double     = PR_ALIGN_OF_DOUBLE;
-    align_of_pointer    = PR_ALIGN_OF_POINTER;
-    align_of_word       = PR_ALIGN_OF_WORD;
-
-#else /* !CROSS_COMPILE */
-
-    /*
-     * We don't handle PDP-endian or similar orders: if a short is big-endian,
-     * so must int and long be big-endian for us to generate the IS_BIG_ENDIAN
-     * #define and the IS_LITTLE_ENDIAN #undef.
-     */
-    {
-        int big_endian = 0, little_endian = 0, ntests = 0;
-
-        if (sizeof(short) == 2) {
-            /* force |volatile| here to get rid of any compiler optimisations
-             * (var in register etc.) which may be appiled to |auto| vars -
-             * even those in |union|s...
-             * (|static| is used to get the same functionality for compilers
-             * which do not honor |volatile|...).
-             */
-            volatile static union {
-                short i;
-                char c[2];
-            } u;
-
-            u.i = 0x0102;
-            big_endian += (u.c[0] == 0x01 && u.c[1] == 0x02);
-            little_endian += (u.c[0] == 0x02 && u.c[1] == 0x01);
-            ntests++;
-        }
-
-        if (sizeof(int) == 4) {
-            /* force |volatile| here ... */
-            volatile static union {
-                int i;
-                char c[4];
-            } u;
-
-            u.i = 0x01020304;
-            big_endian += (u.c[0] == 0x01 && u.c[1] == 0x02 &&
-                           u.c[2] == 0x03 && u.c[3] == 0x04);
-            little_endian += (u.c[0] == 0x04 && u.c[1] == 0x03 &&
-                              u.c[2] == 0x02 && u.c[3] == 0x01);
-            ntests++;
-        }
-
-        if (sizeof(long) == 8) {
-            /* force |volatile| here ... */
-            volatile static union {
-                long i;
-                char c[8];
-            } u;
-
-            /*
-             * Write this as portably as possible: avoid 0x0102030405060708L
-             * and <<= 32.
-             */
-            u.i = 0x01020304;
-            u.i <<= 16, u.i <<= 16;
-            u.i |= 0x05060708;
-            big_endian += (u.c[0] == 0x01 && u.c[1] == 0x02 &&
-                           u.c[2] == 0x03 && u.c[3] == 0x04 &&
-                           u.c[4] == 0x05 && u.c[5] == 0x06 &&
-                           u.c[6] == 0x07 && u.c[7] == 0x08);
-            little_endian += (u.c[0] == 0x08 && u.c[1] == 0x07 &&
-                              u.c[2] == 0x06 && u.c[3] == 0x05 &&
-                              u.c[4] == 0x04 && u.c[5] == 0x03 &&
-                              u.c[6] == 0x02 && u.c[7] == 0x01);
-            ntests++;
-        }
-
-        if (big_endian && big_endian == ntests) {
-            printf("#undef  IS_LITTLE_ENDIAN\n");
-            printf("#define IS_BIG_ENDIAN 1\n\n");
-        } else if (little_endian && little_endian == ntests) {
-            printf("#define IS_LITTLE_ENDIAN 1\n");
-            printf("#undef  IS_BIG_ENDIAN\n\n");
-        } else {
-            fprintf(stderr, "%s: unknown byte order"
-                    "(big_endian=%d, little_endian=%d, ntests=%d)!\n",
-                    argv[0], big_endian, little_endian, ntests);
-            return EXIT_FAILURE;
-        }
-    }
-
-    sizeof_char         = sizeof(char);
-    sizeof_short        = sizeof(short);
-    sizeof_int          = sizeof(int);
-    sizeof_int64        = 8;
-    sizeof_long         = sizeof(long);
-    sizeof_float        = sizeof(float);
-    sizeof_double       = sizeof(double);
-    sizeof_word         = sizeof(prword);
-    sizeof_dword        = 8;
-
-    bits_per_int64_log2 = 6;
-
-    align_of_short      = ALIGN_OF(short);
-    align_of_int        = ALIGN_OF(int);
-    align_of_long       = ALIGN_OF(long);
-    if (sizeof(INT64) < 8) {
-        /* this machine doesn't actually support int64's */
-        align_of_int64  = ALIGN_OF(fakelonglong);
-    } else {
-        align_of_int64  = ALIGN_OF(int64);
-    }
-    align_of_float      = ALIGN_OF(float);
-    align_of_double     = ALIGN_OF(double);
-    align_of_pointer    = ALIGN_OF(pointer);
-    align_of_word       = ALIGN_OF(prword);
-
-#endif /* CROSS_COMPILE */
-
-    printf("#define JS_BYTES_PER_BYTE   %dL\n", sizeof_char);
-    printf("#define JS_BYTES_PER_SHORT  %dL\n", sizeof_short);
-    printf("#define JS_BYTES_PER_INT    %dL\n", sizeof_int);
-    printf("#define JS_BYTES_PER_INT64  %dL\n", sizeof_int64);
-    printf("#define JS_BYTES_PER_LONG   %dL\n", sizeof_long);
-    printf("#define JS_BYTES_PER_FLOAT  %dL\n", sizeof_float);
-    printf("#define JS_BYTES_PER_DOUBLE %dL\n", sizeof_double);
-    printf("#define JS_BYTES_PER_WORD   %dL\n", sizeof_word);
-    printf("#define JS_BYTES_PER_DWORD  %dL\n", sizeof_dword);
-    printf("\n");
-
-    printf("#define JS_BITS_PER_BYTE    %dL\n", bpb);
-    printf("#define JS_BITS_PER_SHORT   %dL\n", bpb * sizeof_short);
-    printf("#define JS_BITS_PER_INT     %dL\n", bpb * sizeof_int);
-    printf("#define JS_BITS_PER_INT64   %dL\n", bpb * sizeof_int64);
-    printf("#define JS_BITS_PER_LONG    %dL\n", bpb * sizeof_long);
-    printf("#define JS_BITS_PER_FLOAT   %dL\n", bpb * sizeof_float);
-    printf("#define JS_BITS_PER_DOUBLE  %dL\n", bpb * sizeof_double);
-    printf("#define JS_BITS_PER_WORD    %dL\n", bpb * sizeof_word);
-    printf("\n");
-
-    printf("#define JS_BITS_PER_BYTE_LOG2   %dL\n", Log2(bpb));
-    printf("#define JS_BITS_PER_SHORT_LOG2  %dL\n", Log2(bpb * sizeof_short));
-    printf("#define JS_BITS_PER_INT_LOG2    %dL\n", Log2(bpb * sizeof_int));
-    printf("#define JS_BITS_PER_INT64_LOG2  %dL\n", bits_per_int64_log2);
-    printf("#define JS_BITS_PER_LONG_LOG2   %dL\n", Log2(bpb * sizeof_long));
-    printf("#define JS_BITS_PER_FLOAT_LOG2  %dL\n", Log2(bpb * sizeof_float));
-    printf("#define JS_BITS_PER_DOUBLE_LOG2 %dL\n", Log2(bpb * sizeof_double));
-    printf("#define JS_BITS_PER_WORD_LOG2   %dL\n", Log2(bpb * sizeof_word));
-    printf("\n");
-
-    printf("#define JS_ALIGN_OF_SHORT   %dL\n", align_of_short);
-    printf("#define JS_ALIGN_OF_INT     %dL\n", align_of_int);
-    printf("#define JS_ALIGN_OF_LONG    %dL\n", align_of_long);
-    printf("#define JS_ALIGN_OF_INT64   %dL\n", align_of_int64);
-    printf("#define JS_ALIGN_OF_FLOAT   %dL\n", align_of_float);
-    printf("#define JS_ALIGN_OF_DOUBLE  %dL\n", align_of_double);
-    printf("#define JS_ALIGN_OF_POINTER %dL\n", align_of_pointer);
-    printf("#define JS_ALIGN_OF_WORD    %dL\n", align_of_word);
-    printf("\n");
-
-    printf("#define JS_BYTES_PER_WORD_LOG2   %dL\n", Log2(sizeof_word));
-    printf("#define JS_BYTES_PER_DWORD_LOG2  %dL\n", Log2(sizeof_dword));
-    printf("#define JS_WORDS_PER_DWORD_LOG2  %dL\n", Log2(sizeof_dword/sizeof_word));
-    printf("\n");
-
-    printf("#define JS_STACK_GROWTH_DIRECTION (%d)\n", StackGrowthDirection(&dummy1));
-    printf("\n");
-
-    printf("#endif /* js_cpucfg___ */\n");
-
-    return EXIT_SUCCESS;
-}
-
diff --git a/libs/js/src/jscpucfg.h b/libs/js/src/jscpucfg.h
deleted file mode 100644
index f8b25d1ef7..0000000000
--- a/libs/js/src/jscpucfg.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-#include "jsosdep.h"
-
-#if defined(XP_WIN) || defined(XP_OS2) || defined(WINCE)
-
-#if defined(_WIN64)
-
-#if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1Ll
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   8L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    64L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   6L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  8L
-#define JS_ALIGN_OF_POINTER 8L
-#define JS_ALIGN_OF_WORD    8L
-
-#define JS_BYTES_PER_WORD_LOG2   3L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  0L
-#else  /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
-#error "CPU type is unknown"
-#endif /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
-
-#elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE)
-
-#ifdef __WATCOMC__
-#define HAVE_VA_LIST_AS_ARRAY
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-#endif /* _WIN32 || XP_OS2 || WINCE*/
-
-#if defined(_WINDOWS) && !defined(_WIN32) /* WIN16 */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    2L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     16L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    4L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     2L
-#define JS_ALIGN_OF_LONG    2L
-#define JS_ALIGN_OF_INT64   2L
-#define JS_ALIGN_OF_FLOAT   2L
-#define JS_ALIGN_OF_DOUBLE  2L
-#define JS_ALIGN_OF_POINTER 2L
-#define JS_ALIGN_OF_WORD    2L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#endif /* defined(_WINDOWS) && !defined(_WIN32) */
-
-#elif defined(XP_UNIX) || defined(XP_BEOS)
-
-#error "This file is supposed to be auto-generated on UNIX platforms, but the"
-#error "static version for Mac and Windows platforms is being used."
-#error "Something's probably wrong with paths/headers/dependencies/Makefiles."
-
-#else
-
-#error "Must define one of XP_BEOS, XP_OS2, XP_WIN, or XP_UNIX"
-
-#endif
-
-#ifndef JS_STACK_GROWTH_DIRECTION
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#endif
-
-#endif /* js_cpucfg___ */
diff --git a/libs/js/src/jsdate.c b/libs/js/src/jsdate.c
deleted file mode 100644
index a76502c38e..0000000000
--- a/libs/js/src/jsdate.c
+++ /dev/null
@@ -1,2386 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS date methods.
- */
-
-/*
- * "For example, OS/360 devotes 26 bytes of the permanently
- *  resident date-turnover routine to the proper handling of
- *  December 31 on leap years (when it is Day 366).  That
- *  might have been left to the operator."
- *
- * Frederick Brooks, 'The Second-System Effect'.
- */
-
-#include "jsstddef.h"
-#include <ctype.h>
-#include <locale.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsprf.h"
-#include "prmjtime.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsconfig.h"
-#include "jscntxt.h"
-#include "jsdate.h"
-#include "jsinterp.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsstr.h"
-
-/*
- * The JS 'Date' object is patterned after the Java 'Date' object.
- * Here is an script:
- *
- *    today = new Date();
- *
- *    print(today.toLocaleString());
- *
- *    weekDay = today.getDay();
- *
- *
- * These Java (and ECMA-262) methods are supported:
- *
- *     UTC
- *     getDate (getUTCDate)
- *     getDay (getUTCDay)
- *     getHours (getUTCHours)
- *     getMinutes (getUTCMinutes)
- *     getMonth (getUTCMonth)
- *     getSeconds (getUTCSeconds)
- *     getMilliseconds (getUTCMilliseconds)
- *     getTime
- *     getTimezoneOffset
- *     getYear
- *     getFullYear (getUTCFullYear)
- *     parse
- *     setDate (setUTCDate)
- *     setHours (setUTCHours)
- *     setMinutes (setUTCMinutes)
- *     setMonth (setUTCMonth)
- *     setSeconds (setUTCSeconds)
- *     setMilliseconds (setUTCMilliseconds)
- *     setTime
- *     setYear (setFullYear, setUTCFullYear)
- *     toGMTString (toUTCString)
- *     toLocaleString
- *     toString
- *
- *
- * These Java methods are not supported
- *
- *     setDay
- *     before
- *     after
- *     equals
- *     hashCode
- */
-
-/*
- * 11/97 - jsdate.c has been rewritten to conform to the ECMA-262 language
- * definition and reduce dependence on NSPR.  NSPR is used to get the current
- * time in milliseconds, the time zone offset, and the daylight savings time
- * offset for a given time.  NSPR is also used for Date.toLocaleString(), for
- * locale-specific formatting, and to get a string representing the timezone.
- * (Which turns out to be platform-dependent.)
- *
- * To do:
- * (I did some performance tests by timing how long it took to run what
- *  I had of the js ECMA conformance tests.)
- *
- * - look at saving results across multiple calls to supporting
- * functions; the toString functions compute some of the same values
- * multiple times.  Although - I took a quick stab at this, and I lost
- * rather than gained.  (Fractionally.)  Hard to tell what compilers/processors
- * are doing these days.
- *
- * - look at tweaking function return types to return double instead
- * of int; this seems to make things run slightly faster sometimes.
- * (though it could be architecture-dependent.)  It'd be good to see
- * how this does on win32.  (Tried it on irix.)  Types could use a
- * general going-over.
- */
-
-/*
- * Supporting functions - ECMA 15.9.1.*
- */
-
-#define HalfTimeDomain  8.64e15
-#define HoursPerDay     24.0
-#define MinutesPerDay   (HoursPerDay * MinutesPerHour)
-#define MinutesPerHour  60.0
-#define SecondsPerDay   (MinutesPerDay * SecondsPerMinute)
-#define SecondsPerHour  (MinutesPerHour * SecondsPerMinute)
-#define SecondsPerMinute 60.0
-
-#if defined(XP_WIN) || defined(XP_OS2)
-/* Work around msvc double optimization bug by making these runtime values; if
- * they're available at compile time, msvc optimizes division by them by
- * computing the reciprocal and multiplying instead of dividing - this loses
- * when the reciprocal isn't representable in a double.
- */
-static jsdouble msPerSecond = 1000.0;
-static jsdouble msPerDay = SecondsPerDay * 1000.0;
-static jsdouble msPerHour = SecondsPerHour * 1000.0;
-static jsdouble msPerMinute = SecondsPerMinute * 1000.0;
-#else
-#define msPerDay        (SecondsPerDay * msPerSecond)
-#define msPerHour       (SecondsPerHour * msPerSecond)
-#define msPerMinute     (SecondsPerMinute * msPerSecond)
-#define msPerSecond     1000.0
-#endif
-
-#define Day(t)          floor((t) / msPerDay)
-
-static jsdouble
-TimeWithinDay(jsdouble t)
-{
-    jsdouble result;
-    result = fmod(t, msPerDay);
-    if (result < 0)
-        result += msPerDay;
-    return result;
-}
-
-#define DaysInYear(y)   ((y) % 4 == 0 && ((y) % 100 || ((y) % 400 == 0))  \
-                         ? 366 : 365)
-
-/* math here has to be f.p, because we need
- *  floor((1968 - 1969) / 4) == -1
- */
-#define DayFromYear(y)  (365 * ((y)-1970) + floor(((y)-1969)/4.0)            \
-                         - floor(((y)-1901)/100.0) + floor(((y)-1601)/400.0))
-#define TimeFromYear(y) (DayFromYear(y) * msPerDay)
-
-static jsint
-YearFromTime(jsdouble t)
-{
-    jsint y = (jsint) floor(t /(msPerDay*365.2425)) + 1970;
-    jsdouble t2 = (jsdouble) TimeFromYear(y);
-
-    if (t2 > t) {
-        y--;
-    } else {
-        if (t2 + msPerDay * DaysInYear(y) <= t)
-            y++;
-    }
-    return y;
-}
-
-#define InLeapYear(t)   (JSBool) (DaysInYear(YearFromTime(t)) == 366)
-
-#define DayWithinYear(t, year) ((intN) (Day(t) - DayFromYear(year)))
-
-/*
- * The following array contains the day of year for the first day of
- * each month, where index 0 is January, and day 0 is January 1.
- */
-static jsdouble firstDayOfMonth[2][12] = {
-    {0.0, 31.0, 59.0, 90.0, 120.0, 151.0, 181.0, 212.0, 243.0, 273.0, 304.0, 334.0},
-    {0.0, 31.0, 60.0, 91.0, 121.0, 152.0, 182.0, 213.0, 244.0, 274.0, 305.0, 335.0}
-};
-
-#define DayFromMonth(m, leap) firstDayOfMonth[leap][(intN)m];
-
-static intN
-MonthFromTime(jsdouble t)
-{
-    intN d, step;
-    jsint year = YearFromTime(t);
-    d = DayWithinYear(t, year);
-
-    if (d < (step = 31))
-        return 0;
-    step += (InLeapYear(t) ? 29 : 28);
-    if (d < step)
-        return 1;
-    if (d < (step += 31))
-        return 2;
-    if (d < (step += 30))
-        return 3;
-    if (d < (step += 31))
-        return 4;
-    if (d < (step += 30))
-        return 5;
-    if (d < (step += 31))
-        return 6;
-    if (d < (step += 31))
-        return 7;
-    if (d < (step += 30))
-        return 8;
-    if (d < (step += 31))
-        return 9;
-    if (d < (step += 30))
-        return 10;
-    return 11;
-}
-
-static intN
-DateFromTime(jsdouble t)
-{
-    intN d, step, next;
-    jsint year = YearFromTime(t);
-    d = DayWithinYear(t, year);
-
-    if (d <= (next = 30))
-        return d + 1;
-    step = next;
-    next += (InLeapYear(t) ? 29 : 28);
-    if (d <= next)
-        return d - step;
-    step = next;
-    if (d <= (next += 31))
-        return d - step;
-    step = next;
-    if (d <= (next += 30))
-        return d - step;
-    step = next;
-    if (d <= (next += 31))
-        return d - step;
-    step = next;
-    if (d <= (next += 30))
-        return d - step;
-    step = next;
-    if (d <= (next += 31))
-        return d - step;
-    step = next;
-    if (d <= (next += 31))
-        return d - step;
-    step = next;
-    if (d <= (next += 30))
-        return d - step;
-    step = next;
-    if (d <= (next += 31))
-        return d - step;
-    step = next;
-    if (d <= (next += 30))
-        return d - step;
-    step = next;
-    return d - step;
-}
-
-static intN
-WeekDay(jsdouble t)
-{
-    jsint result;
-    result = (jsint) Day(t) + 4;
-    result = result % 7;
-    if (result < 0)
-        result += 7;
-    return (intN) result;
-}
-
-#define MakeTime(hour, min, sec, ms) \
-((((hour) * MinutesPerHour + (min)) * SecondsPerMinute + (sec)) * msPerSecond + (ms))
-
-static jsdouble
-MakeDay(jsdouble year, jsdouble month, jsdouble date)
-{
-    JSBool leap;
-    jsdouble yearday;
-    jsdouble monthday;
-
-    year += floor(month / 12);
-
-    month = fmod(month, 12.0);
-    if (month < 0)
-        month += 12;
-
-    leap = (DaysInYear((jsint) year) == 366);
-
-    yearday = floor(TimeFromYear(year) / msPerDay);
-    monthday = DayFromMonth(month, leap);
-
-    return yearday + monthday + date - 1;
-}
-
-#define MakeDate(day, time) ((day) * msPerDay + (time))
-
-/* 
- * Years and leap years on which Jan 1 is a Sunday, Monday, etc. 
- *
- * yearStartingWith[0][i] is an example non-leap year where
- * Jan 1 appears on Sunday (i == 0), Monday (i == 1), etc.
- *
- * yearStartingWith[1][i] is an example leap year where
- * Jan 1 appears on Sunday (i == 0), Monday (i == 1), etc.
- */
-static jsint yearStartingWith[2][7] = {
-    {1978, 1973, 1974, 1975, 1981, 1971, 1977},
-    {1984, 1996, 1980, 1992, 1976, 1988, 1972}
-};
-
-/*
- * Find a year for which any given date will fall on the same weekday.
- *
- * This function should be used with caution when used other than
- * for determining DST; it hasn't been proven not to produce an
- * incorrect year for times near year boundaries.
- */
-static jsint
-EquivalentYearForDST(jsint year) {
-    jsint day;
-    JSBool isLeapYear;
-
-    day = (jsint) DayFromYear(year) + 4;
-    day = day % 7;
-    if (day < 0)
-	day += 7;
-
-    isLeapYear = (DaysInYear(year) == 366);
-
-    return yearStartingWith[isLeapYear][day];
-}
-
-/* LocalTZA gets set by js_InitDateClass() */
-static jsdouble LocalTZA;
-
-static jsdouble
-DaylightSavingTA(jsdouble t)
-{
-    volatile int64 PR_t;
-    int64 ms2us;
-    int64 offset;
-    jsdouble result;
-
-    /* abort if NaN */
-    if (JSDOUBLE_IS_NaN(t))
-        return t;
-
-    /*
-     * If earlier than 1970 or after 2038, potentially beyond the ken of
-     * many OSes, map it to an equivalent year before asking.
-     */
-    if (t < 0.0 || t > 2145916800000.0) {
-        jsint year;
-        jsdouble day;
-
-        year = EquivalentYearForDST(YearFromTime(t));
-        day = MakeDay(year, MonthFromTime(t), DateFromTime(t));
-        t = MakeDate(day, TimeWithinDay(t));
-    }
-
-    /* put our t in an LL, and map it to usec for prtime */
-    JSLL_D2L(PR_t, t);
-    JSLL_I2L(ms2us, PRMJ_USEC_PER_MSEC);
-    JSLL_MUL(PR_t, PR_t, ms2us);
-
-    offset = PRMJ_DSTOffset(PR_t);
-
-    JSLL_DIV(offset, offset, ms2us);
-    JSLL_L2D(result, offset);
-    return result;
-}
-
-
-#define AdjustTime(t)   fmod(LocalTZA + DaylightSavingTA(t), msPerDay)
-
-#define LocalTime(t)    ((t) + AdjustTime(t))
-
-static jsdouble
-UTC(jsdouble t)
-{
-    return t - AdjustTime(t - LocalTZA);
-}
-
-static intN
-HourFromTime(jsdouble t)
-{
-    intN result = (intN) fmod(floor(t/msPerHour), HoursPerDay);
-    if (result < 0)
-        result += (intN)HoursPerDay;
-    return result;
-}
-
-static intN
-MinFromTime(jsdouble t)
-{
-    intN result = (intN) fmod(floor(t / msPerMinute), MinutesPerHour);
-    if (result < 0)
-        result += (intN)MinutesPerHour;
-    return result;
-}
-
-static intN
-SecFromTime(jsdouble t)
-{
-    intN result = (intN) fmod(floor(t / msPerSecond), SecondsPerMinute);
-    if (result < 0)
-        result += (intN)SecondsPerMinute;
-    return result;
-}
-
-static intN
-msFromTime(jsdouble t)
-{
-    intN result = (intN) fmod(t, msPerSecond);
-    if (result < 0)
-        result += (intN)msPerSecond;
-    return result;
-}
-
-#define TIMECLIP(d) ((JSDOUBLE_IS_FINITE(d) \
-                      && !((d < 0 ? -d : d) > HalfTimeDomain)) \
-                     ? js_DoubleToInteger(d + (+0.)) : *cx->runtime->jsNaN)
-
-/**
- * end of ECMA 'support' functions
- */
-
-/*
- * Other Support routines and definitions
- */
-
-static JSClass date_class = {
-    js_Date_str,
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-/* for use by date_parse */
-
-static const char* wtb[] = {
-    "am", "pm",
-    "monday", "tuesday", "wednesday", "thursday", "friday",
-    "saturday", "sunday",
-    "january", "february", "march", "april", "may", "june",
-    "july", "august", "september", "october", "november", "december",
-    "gmt", "ut", "utc",
-    "est", "edt",
-    "cst", "cdt",
-    "mst", "mdt",
-    "pst", "pdt"
-    /* time zone table needs to be expanded */
-};
-
-static int ttb[] = {
-    -1, -2, 0, 0, 0, 0, 0, 0, 0,       /* AM/PM */
-    2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-    10000 + 0, 10000 + 0, 10000 + 0,   /* GMT/UT/UTC */
-    10000 + 5 * 60, 10000 + 4 * 60,    /* EST/EDT */
-    10000 + 6 * 60, 10000 + 5 * 60,    /* CST/CDT */
-    10000 + 7 * 60, 10000 + 6 * 60,    /* MST/MDT */
-    10000 + 8 * 60, 10000 + 7 * 60     /* PST/PDT */
-};
-
-/* helper for date_parse */
-static JSBool
-date_regionMatches(const char* s1, int s1off, const jschar* s2, int s2off,
-                   int count, int ignoreCase)
-{
-    JSBool result = JS_FALSE;
-    /* return true if matches, otherwise, false */
-
-    while (count > 0 && s1[s1off] && s2[s2off]) {
-        if (ignoreCase) {
-            if (JS_TOLOWER((jschar)s1[s1off]) != JS_TOLOWER(s2[s2off])) {
-                break;
-            }
-        } else {
-            if ((jschar)s1[s1off] != s2[s2off]) {
-                break;
-            }
-        }
-        s1off++;
-        s2off++;
-        count--;
-    }
-
-    if (count == 0) {
-        result = JS_TRUE;
-    }
-
-    return result;
-}
-
-/* find UTC time from given date... no 1900 correction! */
-static jsdouble
-date_msecFromDate(jsdouble year, jsdouble mon, jsdouble mday, jsdouble hour,
-                  jsdouble min, jsdouble sec, jsdouble msec)
-{
-    jsdouble day;
-    jsdouble msec_time;
-    jsdouble result;
-
-    day = MakeDay(year, mon, mday);
-    msec_time = MakeTime(hour, min, sec, msec);
-    result = MakeDate(day, msec_time);
-    return result;
-}
-
-/*
- * See ECMA 15.9.4.[3-10];
- */
-/* XXX this function must be above date_parseString to avoid a
-   horrid bug in the Win16 1.52 compiler */
-#define MAXARGS        7
-static JSBool
-date_UTC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble array[MAXARGS];
-    uintN loop;
-    jsdouble d;
-
-    for (loop = 0; loop < MAXARGS; loop++) {
-        if (loop < argc) {
-            if (!js_ValueToNumber(cx, argv[loop], &d))
-                return JS_FALSE;
-            /* return NaN if any arg is NaN */
-            if (!JSDOUBLE_IS_FINITE(d)) {
-                return js_NewNumberValue(cx, d, rval);
-            }
-            array[loop] = floor(d);
-        } else {
-            array[loop] = 0;
-        }
-    }
-
-    /* adjust 2-digit years into the 20th century */
-    if (array[0] >= 0 && array[0] <= 99)
-        array[0] += 1900;
-
-    /* if we got a 0 for 'date' (which is out of range)
-     * pretend it's a 1.  (So Date.UTC(1972, 5) works) */
-    if (array[2] < 1)
-        array[2] = 1;
-
-    d = date_msecFromDate(array[0], array[1], array[2],
-                              array[3], array[4], array[5], array[6]);
-    d = TIMECLIP(d);
-
-    return js_NewNumberValue(cx, d, rval);
-}
-
-static JSBool
-date_parseString(JSString *str, jsdouble *result)
-{
-    jsdouble msec;
-
-    const jschar *s = JSSTRING_CHARS(str);
-    size_t limit = JSSTRING_LENGTH(str);
-    size_t i = 0;
-    int year = -1;
-    int mon = -1;
-    int mday = -1;
-    int hour = -1;
-    int min = -1;
-    int sec = -1;
-    int c = -1;
-    int n = -1;
-    jsdouble tzoffset = -1;  /* was an int, overflowed on win16!!! */
-    int prevc = 0;
-    JSBool seenplusminus = JS_FALSE;
-    int temp;
-    JSBool seenmonthname = JS_FALSE;
-
-    if (limit == 0)
-        goto syntax;
-    while (i < limit) {
-        c = s[i];
-        i++;
-        if (c <= ' ' || c == ',' || c == '-') {
-            if (c == '-' && '0' <= s[i] && s[i] <= '9') {
-              prevc = c;
-            }
-            continue;
-        }
-        if (c == '(') { /* comments) */
-            int depth = 1;
-            while (i < limit) {
-                c = s[i];
-                i++;
-                if (c == '(') depth++;
-                else if (c == ')')
-                    if (--depth <= 0)
-                        break;
-            }
-            continue;
-        }
-        if ('0' <= c && c <= '9') {
-            n = c - '0';
-            while (i < limit && '0' <= (c = s[i]) && c <= '9') {
-                n = n * 10 + c - '0';
-                i++;
-            }
-
-            /* allow TZA before the year, so
-             * 'Wed Nov 05 21:49:11 GMT-0800 1997'
-             * works */
-
-            /* uses of seenplusminus allow : in TZA, so Java
-             * no-timezone style of GMT+4:30 works
-             */
-
-            if ((prevc == '+' || prevc == '-')/*  && year>=0 */) {
-                /* make ':' case below change tzoffset */
-                seenplusminus = JS_TRUE;
-
-                /* offset */
-                if (n < 24)
-                    n = n * 60; /* EG. "GMT-3" */
-                else
-                    n = n % 100 + n / 100 * 60; /* eg "GMT-0430" */
-                if (prevc == '+')       /* plus means east of GMT */
-                    n = -n;
-                if (tzoffset != 0 && tzoffset != -1)
-                    goto syntax;
-                tzoffset = n;
-            } else if (prevc == '/' && mon >= 0 && mday >= 0 && year < 0) {
-                if (c <= ' ' || c == ',' || c == '/' || i >= limit)
-                    year = n;
-                else
-                    goto syntax;
-            } else if (c == ':') {
-                if (hour < 0)
-                    hour = /*byte*/ n;
-                else if (min < 0)
-                    min = /*byte*/ n;
-                else
-                    goto syntax;
-            } else if (c == '/') {
-                /* until it is determined that mon is the actual
-                   month, keep it as 1-based rather than 0-based */
-                if (mon < 0)
-                    mon = /*byte*/ n;
-                else if (mday < 0)
-                    mday = /*byte*/ n;
-                else
-                    goto syntax;
-            } else if (i < limit && c != ',' && c > ' ' && c != '-' && c != '(') {
-                goto syntax;
-            } else if (seenplusminus && n < 60) {  /* handle GMT-3:30 */
-                if (tzoffset < 0)
-                    tzoffset -= n;
-                else
-                    tzoffset += n;
-            } else if (hour >= 0 && min < 0) {
-                min = /*byte*/ n;
-            } else if (prevc == ':' && min >= 0 && sec < 0) {
-                sec = /*byte*/ n;
-            } else if (mon < 0) {
-                mon = /*byte*/n;
-            } else if (mon >= 0 && mday < 0) {
-                mday = /*byte*/ n;
-            } else if (mon >= 0 && mday >= 0 && year < 0) {
-                year = n;
-            } else {
-                goto syntax;
-            }
-            prevc = 0;
-        } else if (c == '/' || c == ':' || c == '+' || c == '-') {
-            prevc = c;
-        } else {
-            size_t st = i - 1;
-            int k;
-            while (i < limit) {
-                c = s[i];
-                if (!(('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z')))
-                    break;
-                i++;
-            }
-            if (i <= st + 1)
-                goto syntax;
-            for (k = (sizeof(wtb)/sizeof(char*)); --k >= 0;)
-                if (date_regionMatches(wtb[k], 0, s, st, i-st, 1)) {
-                    int action = ttb[k];
-                    if (action != 0) {
-                        if (action < 0) {
-                            /*
-                             * AM/PM. Count 12:30 AM as 00:30, 12:30 PM as
-                             * 12:30, instead of blindly adding 12 if PM.
-                             */
-                            JS_ASSERT(action == -1 || action == -2);
-                            if (hour > 12 || hour < 0) {
-                                goto syntax;
-                            } else {
-                                if (action == -1 && hour == 12) { /* am */
-                                    hour = 0;
-                                } else if (action == -2 && hour != 12) { /* pm */
-                                    hour += 12;
-                                }
-                            }
-                        } else if (action <= 13) { /* month! */
-                            /* Adjust mon to be 1-based until the final values
-                               for mon, mday and year are adjusted below */
-                            if (seenmonthname) {
-                                goto syntax;
-                            }
-                            seenmonthname = JS_TRUE;
-                            temp = /*byte*/ (action - 2) + 1;
-
-                            if (mon < 0) {
-                                mon = temp;
-                            } else if (mday < 0) {
-                                mday = mon;
-                                mon = temp;
-                            } else if (year < 0) {
-                                year = mon;
-                                mon = temp;
-                            } else {
-                                goto syntax;
-                            }
-                        } else {
-                            tzoffset = action - 10000;
-                        }
-                    }
-                    break;
-                }
-            if (k < 0)
-                goto syntax;
-            prevc = 0;
-        }
-    }
-    if (year < 0 || mon < 0 || mday < 0)
-        goto syntax;
-    /*
-      Case 1. The input string contains an English month name.
-              The form of the string can be month f l, or f month l, or
-              f l month which each evaluate to the same date. 
-              If f and l are both greater than or equal to 70, or
-              both less than 70, the date is invalid.
-              The year is taken to be the greater of the values f, l.
-              If the year is greater than or equal to 70 and less than 100,
-              it is considered to be the number of years after 1900.
-      Case 2. The input string is of the form "f/m/l" where f, m and l are
-              integers, e.g. 7/16/45.
-              Adjust the mon, mday and year values to achieve 100% MSIE 
-              compatibility.
-              a. If 0 <= f < 70, f/m/l is interpreted as month/day/year.
-                 i.  If year < 100, it is the number of years after 1900
-                 ii. If year >= 100, it is the number of years after 0.
-              b. If 70 <= f < 100
-                 i.  If m < 70, f/m/l is interpreted as
-                     year/month/day where year is the number of years after
-                     1900.
-                 ii. If m >= 70, the date is invalid.
-              c. If f >= 100
-                 i.  If m < 70, f/m/l is interpreted as
-                     year/month/day where year is the number of years after 0.
-                 ii. If m >= 70, the date is invalid.
-    */
-    if (seenmonthname) {
-        if ((mday >= 70 && year >= 70) || (mday < 70 && year < 70)) {
-            goto syntax;
-        }
-        if (mday > year) {
-            temp = year;
-            year = mday;
-            mday = temp;
-        }
-        if (year >= 70 && year < 100) {
-            year += 1900;
-        }
-    } else if (mon < 70) { /* (a) month/day/year */
-        if (year < 100) {
-            year += 1900;
-        }
-    } else if (mon < 100) { /* (b) year/month/day */
-        if (mday < 70) { 
-            temp = year;
-            year = mon + 1900;
-            mon = mday;
-            mday = temp;
-        } else {
-            goto syntax;
-        }
-    } else { /* (c) year/month/day */
-        if (mday < 70) {
-            temp = year;
-            year = mon;
-            mon = mday;
-            mday = temp;
-        } else {
-            goto syntax;
-        }
-    }
-    mon -= 1; /* convert month to 0-based */
-    if (sec < 0)
-        sec = 0;
-    if (min < 0)
-        min = 0;
-    if (hour < 0)
-        hour = 0;
-    if (tzoffset == -1) { /* no time zone specified, have to use local */
-        jsdouble msec_time;
-        msec_time = date_msecFromDate(year, mon, mday, hour, min, sec, 0);
-
-        *result = UTC(msec_time);
-        return JS_TRUE;
-    }
-
-    msec = date_msecFromDate(year, mon, mday, hour, min, sec, 0);
-    msec += tzoffset * msPerMinute;
-    *result = msec;
-    return JS_TRUE;
-
-syntax:
-    /* syntax error */
-    *result = 0;
-    return JS_FALSE;
-}
-
-static JSBool
-date_parse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    jsdouble result;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    if (!date_parseString(str, &result)) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-        return JS_TRUE;
-    }
-
-    result = TIMECLIP(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_now(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    int64 us, ms, us2ms;
-    jsdouble msec_time;
-
-    us = PRMJ_Now();
-    JSLL_UI2L(us2ms, PRMJ_USEC_PER_MSEC);
-    JSLL_DIV(ms, us, us2ms);
-    JSLL_L2D(msec_time, ms);
-
-    return js_NewDoubleValue(cx, msec_time, rval);
-}
-
-/*
- * Check that obj is an object of class Date, and get the date value.
- * Return NULL on failure.
- */
-static jsdouble *
-date_getProlog(JSContext *cx, JSObject *obj, jsval *argv)
-{
-    if (!JS_InstanceOf(cx, obj, &date_class, argv))
-        return NULL;
-    return JSVAL_TO_DOUBLE(OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE));
-}
-
-/*
- * See ECMA 15.9.5.4 thru 15.9.5.23
- */
-static JSBool
-date_getTime(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    return js_NewNumberValue(cx, *date, rval);
-}
-
-static JSBool
-date_getYear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble *date;
-    jsdouble result;
-    JSVersion version;
-
-    date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    result = *date;
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = YearFromTime(LocalTime(result));
-
-    /*
-     * During the great date rewrite of 1.3, we tried to track the evolving ECMA
-     * standard, which then had a definition of getYear which always subtracted
-     * 1900.  Which we implemented, not realizing that it was incompatible with
-     * the old behavior...  now, rather than thrash the behavior yet again,
-     * we've decided to leave it with the - 1900 behavior and point people to
-     * the getFullYear method.  But we try to protect existing scripts that
-     * have specified a version...
-     */
-    version = cx->version & JSVERSION_MASK;
-    if (version == JSVERSION_1_0 ||
-        version == JSVERSION_1_1 ||
-        version == JSVERSION_1_2)
-    {
-        if (result >= 1900 && result < 2000)
-            result -= 1900;
-    } else {
-        result -= 1900;
-    }
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getFullYear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = YearFromTime(LocalTime(result));
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCFullYear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                    jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = YearFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getMonth(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = MonthFromTime(LocalTime(result));
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCMonth(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = MonthFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = LocalTime(result);
-    result = DateFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = DateFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getDay(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = LocalTime(result);
-    result = WeekDay(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCDay(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = WeekDay(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getHours(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = HourFromTime(LocalTime(result));
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCHours(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = HourFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getMinutes(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = MinFromTime(LocalTime(result));
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getUTCMinutes(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = MinFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-/* Date.getSeconds is mapped to getUTCSeconds */
-
-static JSBool
-date_getUTCSeconds(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = SecFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-/* Date.getMilliseconds is mapped to getUTCMilliseconds */
-
-static JSBool
-date_getUTCMilliseconds(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    result = msFromTime(result);
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_getTimezoneOffset(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                       jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    result = *date;
-
-    /*
-     * Return the time zone offset in minutes for the current locale
-     * that is appropriate for this time. This value would be a
-     * constant except for daylight savings time.
-     */
-    result = (result - LocalTime(result)) / msPerMinute;
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_setTime(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble result;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    if (!js_ValueToNumber(cx, argv[0], &result))
-        return JS_FALSE;
-
-    result = TIMECLIP(result);
-
-    *date = result;
-    return js_NewNumberValue(cx, result, rval);
-}
-
-static JSBool
-date_makeTime(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              uintN maxargs, JSBool local, jsval *rval)
-{
-    uintN i;
-    jsdouble args[4], *argp, *stop;
-    jsdouble hour, min, sec, msec;
-    jsdouble lorutime; /* Local or UTC version of *date */
-
-    jsdouble msec_time;
-    jsdouble result;
-
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    result = *date;
-
-    /* just return NaN if the date is already NaN */
-    if (!JSDOUBLE_IS_FINITE(result))
-        return js_NewNumberValue(cx, result, rval);
-
-    /* Satisfy the ECMA rule that if a function is called with
-     * fewer arguments than the specified formal arguments, the
-     * remaining arguments are set to undefined.  Seems like all
-     * the Date.setWhatever functions in ECMA are only varargs
-     * beyond the first argument; this should be set to undefined
-     * if it's not given.  This means that "d = new Date();
-     * d.setMilliseconds()" returns NaN.  Blech.
-     */
-    if (argc == 0)
-        argc = 1;   /* should be safe, because length of all setters is 1 */
-    else if (argc > maxargs)
-        argc = maxargs;  /* clamp argc */
-
-    for (i = 0; i < argc; i++) {
-        if (!js_ValueToNumber(cx, argv[i], &args[i]))
-            return JS_FALSE;
-        if (!JSDOUBLE_IS_FINITE(args[i])) {
-            *date = *cx->runtime->jsNaN;
-            return js_NewNumberValue(cx, *date, rval);
-        }
-        args[i] = js_DoubleToInteger(args[i]);
-    }
-
-    if (local)
-        lorutime = LocalTime(result);
-    else
-        lorutime = result;
-
-    argp = args;
-    stop = argp + argc;
-    if (maxargs >= 4 && argp < stop)
-        hour = *argp++;
-    else
-        hour = HourFromTime(lorutime);
-
-    if (maxargs >= 3 && argp < stop)
-        min = *argp++;
-    else
-        min = MinFromTime(lorutime);
-
-    if (maxargs >= 2 && argp < stop)
-        sec = *argp++;
-    else
-        sec = SecFromTime(lorutime);
-
-    if (maxargs >= 1 && argp < stop)
-        msec = *argp;
-    else
-        msec = msFromTime(lorutime);
-
-    msec_time = MakeTime(hour, min, sec, msec);
-    result = MakeDate(Day(lorutime), msec_time);
-
-/*     fprintf(stderr, "%f\n", result); */
-
-    if (local)
-        result = UTC(result);
-
-/*     fprintf(stderr, "%f\n", result); */
-
-    *date = TIMECLIP(result);
-    return js_NewNumberValue(cx, *date, rval);
-}
-
-static JSBool
-date_setMilliseconds(JSContext *cx, JSObject *obj, uintN argc,
-                     jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 1, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCMilliseconds(JSContext *cx, JSObject *obj, uintN argc,
-                        jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 1, JS_FALSE, rval);
-}
-
-static JSBool
-date_setSeconds(JSContext *cx, JSObject *obj, uintN argc,
-                jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 2, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCSeconds(JSContext *cx, JSObject *obj, uintN argc,
-                   jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 2, JS_FALSE, rval);
-}
-
-static JSBool
-date_setMinutes(JSContext *cx, JSObject *obj, uintN argc,
-                jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 3, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCMinutes(JSContext *cx, JSObject *obj, uintN argc,
-                   jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 3, JS_FALSE, rval);
-}
-
-static JSBool
-date_setHours(JSContext *cx, JSObject *obj, uintN argc,
-              jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 4, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCHours(JSContext *cx, JSObject *obj, uintN argc,
-                 jsval *argv, jsval *rval)
-{
-    return date_makeTime(cx, obj, argc, argv, 4, JS_FALSE, rval);
-}
-
-static JSBool
-date_makeDate(JSContext *cx, JSObject *obj, uintN argc,
-              jsval *argv, uintN maxargs, JSBool local, jsval *rval)
-{
-    uintN i;
-    jsdouble lorutime; /* local or UTC version of *date */
-    jsdouble args[3], *argp, *stop;
-    jsdouble year, month, day;
-    jsdouble result;
-
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    result = *date;
-
-    /* see complaint about ECMA in date_MakeTime */
-    if (argc == 0)
-        argc = 1;   /* should be safe, because length of all setters is 1 */
-    else if (argc > maxargs)
-        argc = maxargs;   /* clamp argc */
-
-    for (i = 0; i < argc; i++) {
-        if (!js_ValueToNumber(cx, argv[i], &args[i]))
-            return JS_FALSE;
-        if (!JSDOUBLE_IS_FINITE(args[i])) {
-            *date = *cx->runtime->jsNaN;
-            return js_NewNumberValue(cx, *date, rval);
-        }
-        args[i] = js_DoubleToInteger(args[i]);
-    }
-
-    /* return NaN if date is NaN and we're not setting the year,
-     * If we are, use 0 as the time. */
-    if (!(JSDOUBLE_IS_FINITE(result))) {
-        if (argc < 3)
-            return js_NewNumberValue(cx, result, rval);
-        else
-            lorutime = +0.;
-    } else {
-        if (local)
-            lorutime = LocalTime(result);
-        else
-            lorutime = result;
-    }
-
-    argp = args;
-    stop = argp + argc;
-    if (maxargs >= 3 && argp < stop)
-        year = *argp++;
-    else
-        year = YearFromTime(lorutime);
-
-    if (maxargs >= 2 && argp < stop)
-        month = *argp++;
-    else
-        month = MonthFromTime(lorutime);
-
-    if (maxargs >= 1 && argp < stop)
-        day = *argp++;
-    else
-        day = DateFromTime(lorutime);
-
-    day = MakeDay(year, month, day); /* day within year */
-    result = MakeDate(day, TimeWithinDay(lorutime));
-
-    if (local)
-        result = UTC(result);
-
-    *date = TIMECLIP(result);
-    return js_NewNumberValue(cx, *date, rval);
-}
-
-static JSBool
-date_setDate(JSContext *cx, JSObject *obj, uintN argc,
-             jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 1, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCDate(JSContext *cx, JSObject *obj, uintN argc,
-                jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 1, JS_FALSE, rval);
-}
-
-static JSBool
-date_setMonth(JSContext *cx, JSObject *obj, uintN argc,
-              jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 2, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCMonth(JSContext *cx, JSObject *obj, uintN argc,
-                 jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 2, JS_FALSE, rval);
-}
-
-static JSBool
-date_setFullYear(JSContext *cx, JSObject *obj, uintN argc,
-                 jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 3, JS_TRUE, rval);
-}
-
-static JSBool
-date_setUTCFullYear(JSContext *cx, JSObject *obj, uintN argc,
-                    jsval *argv, jsval *rval)
-{
-    return date_makeDate(cx, obj, argc, argv, 3, JS_FALSE, rval);
-}
-
-static JSBool
-date_setYear(JSContext *cx, JSObject *obj, uintN argc,
-             jsval *argv, jsval *rval)
-{
-    jsdouble t;
-    jsdouble year;
-    jsdouble day;
-    jsdouble result;
-
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    result = *date;
-
-    if (!js_ValueToNumber(cx, argv[0], &year))
-        return JS_FALSE;
-    if (!JSDOUBLE_IS_FINITE(year)) {
-        *date = *cx->runtime->jsNaN;
-        return js_NewNumberValue(cx, *date, rval);
-    }
-
-    year = js_DoubleToInteger(year);
-
-    if (!JSDOUBLE_IS_FINITE(result)) {
-        t = +0.0;
-    } else {
-        t = LocalTime(result);
-    }
-
-    if (year >= 0 && year <= 99)
-        year += 1900;
-
-    day = MakeDay(year, MonthFromTime(t), DateFromTime(t));
-    result = MakeDate(day, TimeWithinDay(t));
-    result = UTC(result);
-
-    *date = TIMECLIP(result);
-    return js_NewNumberValue(cx, *date, rval);
-}
-
-/* constants for toString, toUTCString */
-static char js_NaN_date_str[] = "Invalid Date";
-static const char* days[] =
-{
-   "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
-};
-static const char* months[] =
-{
-   "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static JSBool
-date_toGMTString(JSContext *cx, JSObject *obj, uintN argc,
-                 jsval *argv, jsval *rval)
-{
-    char buf[100];
-    JSString *str;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    if (!JSDOUBLE_IS_FINITE(*date)) {
-        JS_snprintf(buf, sizeof buf, js_NaN_date_str);
-    } else {
-        jsdouble temp = *date;
-
-        /* Avoid dependence on PRMJ_FormatTimeUSEnglish, because it
-         * requires a PRMJTime... which only has 16-bit years.  Sub-ECMA.
-         */
-        JS_snprintf(buf, sizeof buf, "%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
-                    days[WeekDay(temp)],
-                    DateFromTime(temp),
-                    months[MonthFromTime(temp)],
-                    YearFromTime(temp),
-                    HourFromTime(temp),
-                    MinFromTime(temp),
-                    SecFromTime(temp));
-    }
-    str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-/* for Date.toLocaleString; interface to PRMJTime date struct.
- * If findEquivalent is true, then try to map the year to an equivalent year
- * that's in range.
- */
-static void
-new_explode(jsdouble timeval, PRMJTime *split, JSBool findEquivalent)
-{
-    jsint year = YearFromTime(timeval);
-    int16 adjustedYear;
-
-    /* If the year doesn't fit in a PRMJTime, find something to do about it. */
-    if (year > 32767 || year < -32768) {
-        if (findEquivalent) {
-            /* We're really just trying to get a timezone string; map the year
-             * to some equivalent year in the range 0 to 2800.  Borrowed from
-             * A. D. Olsen.
-             */
-            jsint cycles;
-#define CYCLE_YEARS 2800L
-            cycles = (year >= 0) ? year / CYCLE_YEARS
-                                 : -1 - (-1 - year) / CYCLE_YEARS;
-            adjustedYear = (int16)(year - cycles * CYCLE_YEARS);
-        } else {
-            /* Clamp it to the nearest representable year. */
-            adjustedYear = (int16)((year > 0) ? 32767 : - 32768);
-        }
-    } else {
-        adjustedYear = (int16)year;
-    }
-
-    split->tm_usec = (int32) msFromTime(timeval) * 1000;
-    split->tm_sec = (int8) SecFromTime(timeval);
-    split->tm_min = (int8) MinFromTime(timeval);
-    split->tm_hour = (int8) HourFromTime(timeval);
-    split->tm_mday = (int8) DateFromTime(timeval);
-    split->tm_mon = (int8) MonthFromTime(timeval);
-    split->tm_wday = (int8) WeekDay(timeval);
-    split->tm_year = (int16) adjustedYear;
-    split->tm_yday = (int16) DayWithinYear(timeval, year);
-
-    /* not sure how this affects things, but it doesn't seem
-       to matter. */
-    split->tm_isdst = (DaylightSavingTA(timeval) != 0);
-}
-
-typedef enum formatspec {
-    FORMATSPEC_FULL, FORMATSPEC_DATE, FORMATSPEC_TIME
-} formatspec;
-
-/* helper function */
-static JSBool
-date_format(JSContext *cx, jsdouble date, formatspec format, jsval *rval)
-{
-    char buf[100];
-    JSString *str;
-    char tzbuf[100];
-    JSBool usetz;
-    size_t i, tzlen;
-    PRMJTime split;
-
-    if (!JSDOUBLE_IS_FINITE(date)) {
-        JS_snprintf(buf, sizeof buf, js_NaN_date_str);
-    } else {
-        jsdouble local = LocalTime(date);
-
-        /* offset from GMT in minutes.  The offset includes daylight savings,
-           if it applies. */
-        jsint minutes = (jsint) floor(AdjustTime(date) / msPerMinute);
-
-        /* map 510 minutes to 0830 hours */
-        intN offset = (minutes / 60) * 100 + minutes % 60;
-
-        /* print as "Wed Nov 05 19:38:03 GMT-0800 (PST) 1997" The TZA is
-         * printed as 'GMT-0800' rather than as 'PST' to avoid
-         * operating-system dependence on strftime (which
-         * PRMJ_FormatTimeUSEnglish calls, for %Z only.)  win32 prints
-         * PST as 'Pacific Standard Time.'  This way we always know
-         * what we're getting, and can parse it if we produce it.
-         * The OS TZA string is included as a comment.
-         */
-
-        /* get a timezone string from the OS to include as a
-           comment. */
-        new_explode(date, &split, JS_TRUE);
-        if (PRMJ_FormatTime(tzbuf, sizeof tzbuf, "(%Z)", &split) != 0) {
-
-            /* Decide whether to use the resulting timezone string.
-             *
-             * Reject it if it contains any non-ASCII, non-alphanumeric
-             * characters.  It's then likely in some other character
-             * encoding, and we probably won't display it correctly.
-             */
-            usetz = JS_TRUE;
-            tzlen = strlen(tzbuf);
-            if (tzlen > 100) {
-                usetz = JS_FALSE;
-            } else {
-                for (i = 0; i < tzlen; i++) {
-                    jschar c = tzbuf[i];
-                    if (c > 127 ||
-                        !(isalpha(c) || isdigit(c) ||
-                          c == ' ' || c == '(' || c == ')')) {
-                        usetz = JS_FALSE;
-                    }
-                }
-            }
-
-            /* Also reject it if it's not parenthesized or if it's '()'. */
-            if (tzbuf[0] != '(' || tzbuf[1] == ')')
-                usetz = JS_FALSE;
-        } else
-            usetz = JS_FALSE;
-
-        switch (format) {
-          case FORMATSPEC_FULL:
-            /*
-             * Avoid dependence on PRMJ_FormatTimeUSEnglish, because it
-             * requires a PRMJTime... which only has 16-bit years.  Sub-ECMA.
-             */
-            /* Tue Oct 31 2000 09:41:40 GMT-0800 (PST) */
-            JS_snprintf(buf, sizeof buf,
-                        "%s %s %.2d %.4d %.2d:%.2d:%.2d GMT%+.4d%s%s",
-                        days[WeekDay(local)],
-                        months[MonthFromTime(local)],
-                        DateFromTime(local),
-                        YearFromTime(local),
-                        HourFromTime(local),
-                        MinFromTime(local),
-                        SecFromTime(local),
-                        offset,
-                        usetz ? " " : "",
-                        usetz ? tzbuf : "");
-            break;
-          case FORMATSPEC_DATE:
-            /* Tue Oct 31 2000 */
-            JS_snprintf(buf, sizeof buf,
-                        "%s %s %.2d %.4d",
-                        days[WeekDay(local)],
-                        months[MonthFromTime(local)],
-                        DateFromTime(local),
-                        YearFromTime(local));
-            break;
-          case FORMATSPEC_TIME:
-            /* 09:41:40 GMT-0800 (PST) */
-            JS_snprintf(buf, sizeof buf,
-                        "%.2d:%.2d:%.2d GMT%+.4d%s%s",
-                        HourFromTime(local),
-                        MinFromTime(local),
-                        SecFromTime(local),
-                        offset,
-                        usetz ? " " : "",
-                        usetz ? tzbuf : "");
-            break;
-        }
-    }
-
-    str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-date_toLocaleHelper(JSContext *cx, JSObject *obj, uintN argc,
-                    jsval *argv, jsval *rval, char *format)
-{
-    char buf[100];
-    JSString *str;
-    PRMJTime split;
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    if (!JSDOUBLE_IS_FINITE(*date)) {
-        JS_snprintf(buf, sizeof buf, js_NaN_date_str);
-    } else {
-        intN result_len;
-        jsdouble local = LocalTime(*date);
-        new_explode(local, &split, JS_FALSE);
-
-        /* let PRMJTime format it.       */
-        result_len = PRMJ_FormatTime(buf, sizeof buf, format, &split);
-
-        /* If it failed, default to toString. */
-        if (result_len == 0)
-            return date_format(cx, *date, FORMATSPEC_FULL, rval);
-
-        /* Hacked check against undesired 2-digit year 00/00/00 form. */
-        if (buf[result_len - 3] == '/' &&
-            isdigit(buf[result_len - 2]) && isdigit(buf[result_len - 1])) {
-            JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2),
-                        "%d", js_DateGetYear(cx, obj));
-        }
-
-    }
-
-    if (cx->localeCallbacks && cx->localeCallbacks->localeToUnicode)
-        return cx->localeCallbacks->localeToUnicode(cx, buf, rval);
-
-    str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-date_toLocaleString(JSContext *cx, JSObject *obj, uintN argc,
-                    jsval *argv, jsval *rval)
-{
-    /* Use '%#c' for windows, because '%c' is
-     * backward-compatible and non-y2k with msvc; '%#c' requests that a
-     * full year be used in the result string.
-     */
-    return date_toLocaleHelper(cx, obj, argc, argv, rval,
-#if defined(_WIN32) && !defined(__MWERKS__)
-                                   "%#c"
-#else
-                                   "%c"
-#endif
-                                   );
-}
-
-static JSBool
-date_toLocaleDateString(JSContext *cx, JSObject *obj, uintN argc,
-                    jsval *argv, jsval *rval)
-{
-    /* Use '%#x' for windows, because '%x' is
-     * backward-compatible and non-y2k with msvc; '%#x' requests that a
-     * full year be used in the result string.
-     */
-    return date_toLocaleHelper(cx, obj, argc, argv, rval,
-#if defined(_WIN32) && !defined(__MWERKS__)
-                                   "%#x"
-#else
-                                   "%x"
-#endif
-                                   );
-}
-
-static JSBool
-date_toLocaleTimeString(JSContext *cx, JSObject *obj, uintN argc,
-                        jsval *argv, jsval *rval)
-{
-    return date_toLocaleHelper(cx, obj, argc, argv, rval, "%X");
-}
-
-static JSBool
-date_toLocaleFormat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                    jsval *rval)
-{
-    JSString *fmt;
-
-    if (argc == 0)
-        return date_toLocaleString(cx, obj, argc, argv, rval);
-
-    fmt = JS_ValueToString(cx, argv[0]);
-    if (!fmt)
-        return JS_FALSE;
-
-    return date_toLocaleHelper(cx, obj, argc, argv, rval,
-                               JS_GetStringBytes(fmt));
-}
-
-static JSBool
-date_toTimeString(JSContext *cx, JSObject *obj, uintN argc,
-                  jsval *argv, jsval *rval)
-{
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    return date_format(cx, *date, FORMATSPEC_TIME, rval);
-}
-
-static JSBool
-date_toDateString(JSContext *cx, JSObject *obj, uintN argc,
-                  jsval *argv, jsval *rval)
-{
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    return date_format(cx, *date, FORMATSPEC_DATE, rval);
-}
-
-#if JS_HAS_TOSOURCE
-#include <string.h>
-#include "jsdtoa.h"
-
-static JSBool
-date_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsdouble *date;
-    char buf[DTOSTR_STANDARD_BUFFER_SIZE], *numStr, *bytes;
-    JSString *str;
-
-    date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-
-    numStr = JS_dtostr(buf, sizeof buf, DTOSTR_STANDARD, 0, *date);
-    if (!numStr) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    bytes = JS_smprintf("(new %s(%s))", date_class.name, numStr);
-    if (!bytes) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    str = JS_NewString(cx, bytes, strlen(bytes));
-    if (!str) {
-        free(bytes);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif
-
-static JSBool
-date_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    jsdouble *date = date_getProlog(cx, obj, argv);
-    if (!date)
-        return JS_FALSE;
-    return date_format(cx, *date, FORMATSPEC_FULL, rval);
-}
-
-#if JS_HAS_VALUEOF_HINT
-static JSBool
-date_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    /* It is an error to call date_valueOf on a non-date object, but we don't
-     * need to check for that explicitly here because every path calls
-     * date_getProlog, which does the check.
-     */
-
-    /* If called directly with no arguments, convert to a time number. */
-    if (argc == 0)
-        return date_getTime(cx, obj, argc, argv, rval);
-
-    /* Convert to number only if the hint was given, otherwise favor string. */
-    if (argc == 1) {
-        JSString *str, *str2;
-
-        str = js_ValueToString(cx, argv[0]);
-        if (!str)
-            return JS_FALSE;
-        str2 = ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_NUMBER]);
-        if (!js_CompareStrings(str, str2))
-            return date_getTime(cx, obj, argc, argv, rval);
-    }
-    return date_toString(cx, obj, argc, argv, rval);
-}
-#else
-#define date_valueOf date_getTime
-#endif
-
-
-/*
- * creation and destruction
- */
-
-static JSFunctionSpec date_static_methods[] = {
-    {"UTC",               date_UTC,               MAXARGS,0,0 },
-    {"parse",             date_parse,             1,0,0 },
-    {"now",               date_now,               0,0,0 },
-    {0,0,0,0,0}
-};
-
-static JSFunctionSpec date_methods[] = {
-    {"getTime",             date_getTime,           0,0,0 },
-    {"getTimezoneOffset",   date_getTimezoneOffset, 0,0,0 },
-    {"getYear",             date_getYear,           0,0,0 },
-    {"getFullYear",         date_getFullYear,       0,0,0 },
-    {"getUTCFullYear",      date_getUTCFullYear,    0,0,0 },
-    {"getMonth",            date_getMonth,          0,0,0 },
-    {"getUTCMonth",         date_getUTCMonth,       0,0,0 },
-    {"getDate",             date_getDate,           0,0,0 },
-    {"getUTCDate",          date_getUTCDate,        0,0,0 },
-    {"getDay",              date_getDay,            0,0,0 },
-    {"getUTCDay",           date_getUTCDay,         0,0,0 },
-    {"getHours",            date_getHours,          0,0,0 },
-    {"getUTCHours",         date_getUTCHours,       0,0,0 },
-    {"getMinutes",          date_getMinutes,        0,0,0 },
-    {"getUTCMinutes",       date_getUTCMinutes,     0,0,0 },
-    {"getSeconds",          date_getUTCSeconds,     0,0,0 },
-    {"getUTCSeconds",       date_getUTCSeconds,     0,0,0 },
-    {"getMilliseconds",     date_getUTCMilliseconds,0,0,0 },
-    {"getUTCMilliseconds",  date_getUTCMilliseconds,0,0,0 },
-    {"setTime",             date_setTime,           1,0,0 },
-    {"setYear",             date_setYear,           1,0,0 },
-    {"setFullYear",         date_setFullYear,       3,0,0 },
-    {"setUTCFullYear",      date_setUTCFullYear,    3,0,0 },
-    {"setMonth",            date_setMonth,          2,0,0 },
-    {"setUTCMonth",         date_setUTCMonth,       2,0,0 },
-    {"setDate",             date_setDate,           1,0,0 },
-    {"setUTCDate",          date_setUTCDate,        1,0,0 },
-    {"setHours",            date_setHours,          4,0,0 },
-    {"setUTCHours",         date_setUTCHours,       4,0,0 },
-    {"setMinutes",          date_setMinutes,        3,0,0 },
-    {"setUTCMinutes",       date_setUTCMinutes,     3,0,0 },
-    {"setSeconds",          date_setSeconds,        2,0,0 },
-    {"setUTCSeconds",       date_setUTCSeconds,     2,0,0 },
-    {"setMilliseconds",     date_setMilliseconds,   1,0,0 },
-    {"setUTCMilliseconds",  date_setUTCMilliseconds,1,0,0 },
-    {"toUTCString",         date_toGMTString,       0,0,0 },
-    {js_toLocaleString_str, date_toLocaleString,    0,0,0 },
-    {"toLocaleDateString",  date_toLocaleDateString,0,0,0 },
-    {"toLocaleTimeString",  date_toLocaleTimeString,0,0,0 },
-    {"toLocaleFormat",      date_toLocaleFormat,    1,0,0 },
-    {"toDateString",        date_toDateString,      0,0,0 },
-    {"toTimeString",        date_toTimeString,      0,0,0 },
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,       date_toSource,          0,0,0 },
-#endif
-    {js_toString_str,       date_toString,          0,0,0 },
-    {js_valueOf_str,        date_valueOf,           0,0,0 },
-    {0,0,0,0,0}
-};
-
-static jsdouble *
-date_constructor(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date;
-
-    date = js_NewDouble(cx, 0.0, 0);
-    if (!date)
-        return NULL;
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, DOUBLE_TO_JSVAL(date));
-    return date;
-}
-
-static JSBool
-Date(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble *date;
-    JSString *str;
-    jsdouble d;
-
-    /* Date called as function. */
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        int64 us, ms, us2ms;
-        jsdouble msec_time;
-
-        /* NSPR 2.0 docs say 'We do not support PRMJ_NowMS and PRMJ_NowS',
-         * so compute ms from PRMJ_Now.
-         */
-        us = PRMJ_Now();
-        JSLL_UI2L(us2ms, PRMJ_USEC_PER_MSEC);
-        JSLL_DIV(ms, us, us2ms);
-        JSLL_L2D(msec_time, ms);
-
-        return date_format(cx, msec_time, FORMATSPEC_FULL, rval);
-    }
-
-    /* Date called as constructor. */
-    if (argc == 0) {
-        int64 us, ms, us2ms;
-        jsdouble msec_time;
-
-        date = date_constructor(cx, obj);
-        if (!date)
-            return JS_FALSE;
-
-        us = PRMJ_Now();
-        JSLL_UI2L(us2ms, PRMJ_USEC_PER_MSEC);
-        JSLL_DIV(ms, us, us2ms);
-        JSLL_L2D(msec_time, ms);
-
-        *date = msec_time;
-    } else if (argc == 1) {
-        if (!JSVAL_IS_STRING(argv[0])) {
-            /* the argument is a millisecond number */
-            if (!js_ValueToNumber(cx, argv[0], &d))
-                    return JS_FALSE;
-            date = date_constructor(cx, obj);
-            if (!date)
-                return JS_FALSE;
-            *date = TIMECLIP(d);
-        } else {
-            /* the argument is a string; parse it. */
-            date = date_constructor(cx, obj);
-            if (!date)
-                return JS_FALSE;
-
-            str = js_ValueToString(cx, argv[0]);
-            if (!str)
-                return JS_FALSE;
-
-            if (!date_parseString(str, date))
-                *date = *cx->runtime->jsNaN;
-            *date = TIMECLIP(*date);
-        }
-    } else {
-        jsdouble array[MAXARGS];
-        uintN loop;
-        jsdouble double_arg;
-        jsdouble day;
-        jsdouble msec_time;
-
-        for (loop = 0; loop < MAXARGS; loop++) {
-            if (loop < argc) {
-                if (!js_ValueToNumber(cx, argv[loop], &double_arg))
-                    return JS_FALSE;
-                /* if any arg is NaN, make a NaN date object
-                   and return */
-                if (!JSDOUBLE_IS_FINITE(double_arg)) {
-                    date = date_constructor(cx, obj);
-                    if (!date)
-                        return JS_FALSE;
-                    *date = *cx->runtime->jsNaN;
-                    return JS_TRUE;
-                }
-                array[loop] = js_DoubleToInteger(double_arg);
-            } else {
-                if (loop == 2) {
-                    array[loop] = 1; /* Default the date argument to 1. */
-                } else {
-                    array[loop] = 0;
-                }
-            }
-        }
-
-        date = date_constructor(cx, obj);
-        if (!date)
-            return JS_FALSE;
-
-        /* adjust 2-digit years into the 20th century */
-        if (array[0] >= 0 && array[0] <= 99)
-            array[0] += 1900;
-
-        day = MakeDay(array[0], array[1], array[2]);
-        msec_time = MakeTime(array[3], array[4], array[5], array[6]);
-        msec_time = MakeDate(day, msec_time);
-        msec_time = UTC(msec_time);
-        *date = TIMECLIP(msec_time);
-    }
-    return JS_TRUE;
-}
-
-JSObject *
-js_InitDateClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-    jsdouble *proto_date;
-
-    /* set static LocalTZA */
-    LocalTZA = -(PRMJ_LocalGMTDifference() * msPerSecond);
-    proto = JS_InitClass(cx, obj, NULL, &date_class, Date, MAXARGS,
-                         NULL, date_methods, NULL, date_static_methods);
-    if (!proto)
-        return NULL;
-
-    /* Alias toUTCString with toGMTString.  (ECMA B.2.6) */
-    if (!JS_AliasProperty(cx, proto, "toUTCString", "toGMTString"))
-        return NULL;
-
-    /* Set the value of the Date.prototype date to NaN */
-    proto_date = date_constructor(cx, proto);
-    if (!proto_date)
-        return NULL;
-    *proto_date = *cx->runtime->jsNaN;
-
-    return proto;
-}
-
-JS_FRIEND_API(JSObject *)
-js_NewDateObjectMsec(JSContext *cx, jsdouble msec_time)
-{
-    JSObject *obj;
-    jsdouble *date;
-
-    obj = js_NewObject(cx, &date_class, NULL, NULL);
-    if (!obj)
-        return NULL;
-
-    date = date_constructor(cx, obj);
-    if (!date)
-        return NULL;
-
-    *date = msec_time;
-    return obj;
-}
-
-JS_FRIEND_API(JSObject *)
-js_NewDateObject(JSContext* cx, int year, int mon, int mday,
-                 int hour, int min, int sec)
-{
-    JSObject *obj;
-    jsdouble msec_time;
-
-    msec_time = date_msecFromDate(year, mon, mday, hour, min, sec, 0);
-    obj = js_NewDateObjectMsec(cx, UTC(msec_time));
-    return obj;
-}
-
-JS_FRIEND_API(JSBool)
-js_DateIsValid(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return JS_FALSE;
-    else
-        return JS_TRUE;
-}
-
-JS_FRIEND_API(int)
-js_DateGetYear(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    /* Preserve legacy API behavior of returning 0 for invalid dates. */
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) YearFromTime(LocalTime(*date));
-}
-
-JS_FRIEND_API(int)
-js_DateGetMonth(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) MonthFromTime(LocalTime(*date));
-}
-
-JS_FRIEND_API(int)
-js_DateGetDate(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) DateFromTime(LocalTime(*date));
-}
-
-JS_FRIEND_API(int)
-js_DateGetHours(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) HourFromTime(LocalTime(*date));
-}
-
-JS_FRIEND_API(int)
-js_DateGetMinutes(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) MinFromTime(LocalTime(*date));
-}
-
-JS_FRIEND_API(int)
-js_DateGetSeconds(JSContext *cx, JSObject* obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (int) SecFromTime(*date);
-}
-
-JS_FRIEND_API(void)
-js_DateSetYear(JSContext *cx, JSObject *obj, int year)
-{
-    jsdouble local;
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date)
-        return;
-    local = LocalTime(*date);
-    /* reset date if it was NaN */
-    if (JSDOUBLE_IS_NaN(local))
-        local = 0;
-    local = date_msecFromDate(year,
-                              MonthFromTime(local),
-                              DateFromTime(local),
-                              HourFromTime(local),
-                              MinFromTime(local),
-                              SecFromTime(local),
-                              msFromTime(local));
-    *date = UTC(local);
-}
-
-JS_FRIEND_API(void)
-js_DateSetMonth(JSContext *cx, JSObject *obj, int month)
-{
-    jsdouble local;
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date)
-        return;
-    local = LocalTime(*date);
-    /* bail if date was NaN */
-    if (JSDOUBLE_IS_NaN(local))
-        return;
-    local = date_msecFromDate(YearFromTime(local),
-                              month,
-                              DateFromTime(local),
-                              HourFromTime(local),
-                              MinFromTime(local),
-                              SecFromTime(local),
-                              msFromTime(local));
-    *date = UTC(local);
-}
-
-JS_FRIEND_API(void)
-js_DateSetDate(JSContext *cx, JSObject *obj, int date)
-{
-    jsdouble local;
-    jsdouble *datep = date_getProlog(cx, obj, NULL);
-    if (!datep)
-        return;
-    local = LocalTime(*datep);
-    if (JSDOUBLE_IS_NaN(local))
-        return;
-    local = date_msecFromDate(YearFromTime(local),
-                              MonthFromTime(local),
-                              date,
-                              HourFromTime(local),
-                              MinFromTime(local),
-                              SecFromTime(local),
-                              msFromTime(local));
-    *datep = UTC(local);
-}
-
-JS_FRIEND_API(void)
-js_DateSetHours(JSContext *cx, JSObject *obj, int hours)
-{
-    jsdouble local;
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date)
-        return;
-    local = LocalTime(*date);
-    if (JSDOUBLE_IS_NaN(local))
-        return;
-    local = date_msecFromDate(YearFromTime(local),
-                              MonthFromTime(local),
-                              DateFromTime(local),
-                              hours,
-                              MinFromTime(local),
-                              SecFromTime(local),
-                              msFromTime(local));
-    *date = UTC(local);
-}
-
-JS_FRIEND_API(void)
-js_DateSetMinutes(JSContext *cx, JSObject *obj, int minutes)
-{
-    jsdouble local;
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date)
-        return;
-    local = LocalTime(*date);
-    if (JSDOUBLE_IS_NaN(local))
-        return;
-    local = date_msecFromDate(YearFromTime(local),
-                              MonthFromTime(local),
-                              DateFromTime(local),
-                              HourFromTime(local),
-                              minutes,
-                              SecFromTime(local),
-                              msFromTime(local));
-    *date = UTC(local);
-}
-
-JS_FRIEND_API(void)
-js_DateSetSeconds(JSContext *cx, JSObject *obj, int seconds)
-{
-    jsdouble local;
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date)
-        return;
-    local = LocalTime(*date);
-    if (JSDOUBLE_IS_NaN(local))
-        return;
-    local = date_msecFromDate(YearFromTime(local),
-                              MonthFromTime(local),
-                              DateFromTime(local),
-                              HourFromTime(local),
-                              MinFromTime(local),
-                              seconds,
-                              msFromTime(local));
-    *date = UTC(local);
-}
-
-JS_FRIEND_API(jsdouble)
-js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj)
-{
-    jsdouble *date = date_getProlog(cx, obj, NULL);
-    if (!date || JSDOUBLE_IS_NaN(*date))
-        return 0;
-    return (*date);
-}
diff --git a/libs/js/src/jsdate.h b/libs/js/src/jsdate.h
deleted file mode 100644
index 343314fab3..0000000000
--- a/libs/js/src/jsdate.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS Date class interface.
- */
-
-#ifndef jsdate_h___
-#define jsdate_h___
-
-JS_BEGIN_EXTERN_C
-
-extern JSObject *
-js_InitDateClass(JSContext *cx, JSObject *obj);
-
-/*
- * These functions provide a C interface to the date/time object
- */
-
-/*
- * Construct a new Date Object from a time value given in milliseconds UTC
- * since the epoch.
- */
-extern JS_FRIEND_API(JSObject*)
-js_NewDateObjectMsec(JSContext* cx, jsdouble msec_time);
-
-/*
- * Construct a new Date Object from an exploded local time value.
- */
-extern JS_FRIEND_API(JSObject*)
-js_NewDateObject(JSContext* cx, int year, int mon, int mday,
-                 int hour, int min, int sec);
-
-/*
- * Detect whether the internal date value is NaN.  (Because failure is
- * out-of-band for js_DateGet*)
- */
-extern JS_FRIEND_API(JSBool)
-js_DateIsValid(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetYear(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetMonth(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetDate(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetHours(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetMinutes(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(int)
-js_DateGetSeconds(JSContext *cx, JSObject* obj);
-
-extern JS_FRIEND_API(void)
-js_DateSetYear(JSContext *cx, JSObject *obj, int year);
-
-extern JS_FRIEND_API(void)
-js_DateSetMonth(JSContext *cx, JSObject *obj, int year);
-
-extern JS_FRIEND_API(void)
-js_DateSetDate(JSContext *cx, JSObject *obj, int date);
-
-extern JS_FRIEND_API(void)
-js_DateSetHours(JSContext *cx, JSObject *obj, int hours);
-
-extern JS_FRIEND_API(void)
-js_DateSetMinutes(JSContext *cx, JSObject *obj, int minutes);
-
-extern JS_FRIEND_API(void)
-js_DateSetSeconds(JSContext *cx, JSObject *obj, int seconds);
-
-extern JS_FRIEND_API(jsdouble)
-js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jsdate_h___ */
diff --git a/libs/js/src/jsdbgapi.c b/libs/js/src/jsdbgapi.c
deleted file mode 100644
index 5f25968603..0000000000
--- a/libs/js/src/jsdbgapi.c
+++ /dev/null
@@ -1,1343 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS debugging API.
- */
-#include "jsstddef.h"
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsclist.h"
-#include "jsapi.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-typedef struct JSTrap {
-    JSCList         links;
-    JSScript        *script;
-    jsbytecode      *pc;
-    JSOp            op;
-    JSTrapHandler   handler;
-    void            *closure;
-} JSTrap;
-
-static JSTrap *
-FindTrap(JSRuntime *rt, JSScript *script, jsbytecode *pc)
-{
-    JSTrap *trap;
-
-    for (trap = (JSTrap *)rt->trapList.next;
-         trap != (JSTrap *)&rt->trapList;
-         trap = (JSTrap *)trap->links.next) {
-        if (trap->script == script && trap->pc == pc)
-            return trap;
-    }
-    return NULL;
-}
-
-void
-js_PatchOpcode(JSContext *cx, JSScript *script, jsbytecode *pc, JSOp op)
-{
-    JSTrap *trap;
-
-    trap = FindTrap(cx->runtime, script, pc);
-    if (trap)
-        trap->op = op;
-    else
-        *pc = (jsbytecode)op;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-           JSTrapHandler handler, void *closure)
-{
-    JSRuntime *rt;
-    JSTrap *trap;
-
-    rt = cx->runtime;
-    trap = FindTrap(rt, script, pc);
-    if (trap) {
-        JS_ASSERT(trap->script == script && trap->pc == pc);
-        JS_ASSERT(*pc == JSOP_TRAP);
-    } else {
-        trap = (JSTrap *) JS_malloc(cx, sizeof *trap);
-        if (!trap || !js_AddRoot(cx, &trap->closure, "trap->closure")) {
-            if (trap)
-                JS_free(cx, trap);
-            return JS_FALSE;
-        }
-        JS_APPEND_LINK(&trap->links, &rt->trapList);
-        trap->script = script;
-        trap->pc = pc;
-        trap->op = (JSOp)*pc;
-        *pc = JSOP_TRAP;
-    }
-    trap->handler = handler;
-    trap->closure = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSOp)
-JS_GetTrapOpcode(JSContext *cx, JSScript *script, jsbytecode *pc)
-{
-    JSTrap *trap;
-
-    trap = FindTrap(cx->runtime, script, pc);
-    if (!trap) {
-        JS_ASSERT(0);   /* XXX can't happen */
-        return JSOP_LIMIT;
-    }
-    return trap->op;
-}
-
-static void
-DestroyTrap(JSContext *cx, JSTrap *trap)
-{
-    JS_REMOVE_LINK(&trap->links);
-    *trap->pc = (jsbytecode)trap->op;
-    js_RemoveRoot(cx->runtime, &trap->closure);
-    JS_free(cx, trap);
-}
-
-JS_PUBLIC_API(void)
-JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-             JSTrapHandler *handlerp, void **closurep)
-{
-    JSTrap *trap;
-
-    trap = FindTrap(cx->runtime, script, pc);
-    if (handlerp)
-        *handlerp = trap ? trap->handler : NULL;
-    if (closurep)
-        *closurep = trap ? trap->closure : NULL;
-    if (trap)
-        DestroyTrap(cx, trap);
-}
-
-JS_PUBLIC_API(void)
-JS_ClearScriptTraps(JSContext *cx, JSScript *script)
-{
-    JSRuntime *rt;
-    JSTrap *trap, *next;
-
-    rt = cx->runtime;
-    for (trap = (JSTrap *)rt->trapList.next;
-         trap != (JSTrap *)&rt->trapList;
-         trap = next) {
-        next = (JSTrap *)trap->links.next;
-        if (trap->script == script)
-            DestroyTrap(cx, trap);
-    }
-}
-
-JS_PUBLIC_API(void)
-JS_ClearAllTraps(JSContext *cx)
-{
-    JSRuntime *rt;
-    JSTrap *trap, *next;
-
-    rt = cx->runtime;
-    for (trap = (JSTrap *)rt->trapList.next;
-         trap != (JSTrap *)&rt->trapList;
-         trap = next) {
-        next = (JSTrap *)trap->links.next;
-        DestroyTrap(cx, trap);
-    }
-}
-
-JS_PUBLIC_API(JSTrapStatus)
-JS_HandleTrap(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval)
-{
-    JSTrap *trap;
-    JSTrapStatus status;
-    jsint op;
-
-    trap = FindTrap(cx->runtime, script, pc);
-    if (!trap) {
-        JS_ASSERT(0);   /* XXX can't happen */
-        return JSTRAP_ERROR;
-    }
-    /*
-     * It's important that we not use 'trap->' after calling the callback --
-     * the callback might remove the trap!
-     */
-    op = (jsint)trap->op;
-    status = trap->handler(cx, script, pc, rval, trap->closure);
-    if (status == JSTRAP_CONTINUE) {
-        /* By convention, return the true op to the interpreter in rval. */
-        *rval = INT_TO_JSVAL(op);
-    }
-    return status;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure)
-{
-    rt->interruptHandler = handler;
-    rt->interruptHandlerData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep)
-{
-    if (handlerp)
-        *handlerp = (JSTrapHandler)rt->interruptHandler;
-    if (closurep)
-        *closurep = rt->interruptHandlerData;
-    rt->interruptHandler = 0;
-    rt->interruptHandlerData = 0;
-    return JS_TRUE;
-}
-
-/************************************************************************/
-
-typedef struct JSWatchPoint {
-    JSCList             links;
-    JSObject            *object;        /* weak link, see js_FinalizeObject */
-    JSScopeProperty     *sprop;
-    JSPropertyOp        setter;
-    JSWatchPointHandler handler;
-    void                *closure;
-    jsrefcount          nrefs;
-} JSWatchPoint;
-
-#define HoldWatchPoint(wp) ((wp)->nrefs++)
-
-static JSBool
-DropWatchPoint(JSContext *cx, JSWatchPoint *wp)
-{
-    JSScopeProperty *sprop;
-
-    if (--wp->nrefs != 0)
-        return JS_TRUE;
-
-    /*
-     * Remove wp from the list, then if there are no other watchpoints for
-     * wp->sprop in any scope, restore wp->sprop->setter from wp.
-     */
-    JS_REMOVE_LINK(&wp->links);
-    sprop = wp->sprop;
-    if (!js_GetWatchedSetter(cx->runtime, NULL, sprop)) {
-        sprop = js_ChangeNativePropertyAttrs(cx, wp->object, sprop,
-                                             0, sprop->attrs,
-                                             sprop->getter, wp->setter);
-        if (!sprop)
-            return JS_FALSE;
-    }
-    js_RemoveRoot(cx->runtime, &wp->closure);
-    JS_free(cx, wp);
-    return JS_TRUE;
-}
-
-void
-js_MarkWatchPoints(JSRuntime *rt)
-{
-    JSWatchPoint *wp;
-
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = (JSWatchPoint *)wp->links.next) {
-        MARK_SCOPE_PROPERTY(wp->sprop);
-    }
-}
-
-static JSWatchPoint *
-FindWatchPoint(JSRuntime *rt, JSScope *scope, jsid id)
-{
-    JSWatchPoint *wp;
-
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = (JSWatchPoint *)wp->links.next) {
-        if (wp->object == scope->object && wp->sprop->id == id)
-            return wp;
-    }
-    return NULL;
-}
-
-JSScopeProperty *
-js_FindWatchPoint(JSRuntime *rt, JSScope *scope, jsid id)
-{
-    JSWatchPoint *wp;
-
-    wp = FindWatchPoint(rt, scope, id);
-    if (!wp)
-        return NULL;
-    return wp->sprop;
-}
-
-JSPropertyOp
-js_GetWatchedSetter(JSRuntime *rt, JSScope *scope,
-                    const JSScopeProperty *sprop)
-{
-    JSWatchPoint *wp;
-
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = (JSWatchPoint *)wp->links.next) {
-        if ((!scope || wp->object == scope->object) && wp->sprop == sprop)
-            return wp->setter;
-    }
-    return NULL;
-}
-
-JSBool JS_DLL_CALLBACK
-js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSRuntime *rt;
-    JSWatchPoint *wp;
-    JSScopeProperty *sprop;
-    jsval propid, userid;
-    JSScope *scope;
-    JSBool ok;
-
-    rt = cx->runtime;
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = (JSWatchPoint *)wp->links.next) {
-        sprop = wp->sprop;
-        if (wp->object == obj && SPROP_USERID(sprop) == id) {
-            JS_LOCK_OBJ(cx, obj);
-            propid = ID_TO_VALUE(sprop->id);
-            userid = (sprop->flags & SPROP_HAS_SHORTID)
-                     ? INT_TO_JSVAL(sprop->shortid)
-                     : propid;
-            scope = OBJ_SCOPE(obj);
-            JS_UNLOCK_OBJ(cx, obj);
-            HoldWatchPoint(wp);
-            ok = wp->handler(cx, obj, propid,
-                             SPROP_HAS_VALID_SLOT(sprop, scope)
-                             ? OBJ_GET_SLOT(cx, obj, wp->sprop->slot)
-                             : JSVAL_VOID,
-                             vp, wp->closure);
-            if (ok) {
-                /*
-                 * Create pseudo-frame for call to setter so that any
-                 * stack-walking security code in the setter will correctly
-                 * identify the guilty party.
-                 */
-                JSObject *funobj = (JSObject *) wp->closure;
-                JSFunction *fun = (JSFunction *) JS_GetPrivate(cx, funobj);
-                JSStackFrame frame;
-
-                memset(&frame, 0, sizeof(frame));
-                frame.script = FUN_SCRIPT(fun);
-                frame.fun = fun;
-                frame.down = cx->fp;
-                cx->fp = &frame;
-                ok = !wp->setter ||
-                     ((sprop->attrs & JSPROP_SETTER)
-                      ? js_InternalCall(cx, obj, OBJECT_TO_JSVAL(wp->setter),
-                                        1, vp, vp)
-                      : wp->setter(cx, OBJ_THIS_OBJECT(cx, obj), userid, vp));
-                cx->fp = frame.down;
-            }
-            return DropWatchPoint(cx, wp);
-        }
-    }
-    JS_ASSERT(0);       /* XXX can't happen */
-    return JS_FALSE;
-}
-
-JSBool JS_DLL_CALLBACK
-js_watch_set_wrapper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval)
-{
-    JSObject *funobj;
-    JSFunction *wrapper;
-    jsval userid;
-
-    funobj = JSVAL_TO_OBJECT(argv[-2]);
-    wrapper = (JSFunction *) JS_GetPrivate(cx, funobj);
-    userid = ATOM_KEY(wrapper->atom);
-    *rval = argv[0];
-    return js_watch_set(cx, obj, userid, rval);
-}
-
-JSPropertyOp
-js_WrapWatchedSetter(JSContext *cx, jsid id, uintN attrs, JSPropertyOp setter)
-{
-    JSAtom *atom;
-    JSFunction *wrapper;
-
-    if (!(attrs & JSPROP_SETTER))
-        return &js_watch_set;   /* & to silence schoolmarmish MSVC */
-
-    if (JSID_IS_ATOM(id)) {
-        atom = JSID_TO_ATOM(id);
-    } else if (JSID_IS_INT(id)) {
-        atom = js_AtomizeInt(cx, JSID_TO_INT(id), 0);
-        if (!atom)
-            return NULL;
-    } else {
-        atom = NULL;
-    }
-    wrapper = js_NewFunction(cx, NULL, js_watch_set_wrapper, 1, 0,
-                             OBJ_GET_PARENT(cx, (JSObject *)setter),
-                             atom);
-    if (!wrapper)
-        return NULL;
-    return (JSPropertyOp) wrapper->object;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                 JSWatchPointHandler handler, void *closure)
-{
-    JSAtom *atom;
-    jsid propid;
-    JSObject *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSRuntime *rt;
-    JSBool ok;
-    JSWatchPoint *wp;
-    JSPropertyOp watcher;
-
-    if (!OBJ_IS_NATIVE(obj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_WATCH,
-                             OBJ_GET_CLASS(cx, obj)->name);
-        return JS_FALSE;
-    }
-
-    if (JSVAL_IS_INT(id)) {
-        propid = INT_JSVAL_TO_JSID(id);
-        atom = NULL;
-    } else {
-        atom = js_ValueToStringAtom(cx, id);
-        if (!atom)
-            return JS_FALSE;
-        propid = ATOM_TO_JSID(atom);
-    }
-
-    if (!js_LookupProperty(cx, obj, propid, &pobj, &prop))
-        return JS_FALSE;
-    sprop = (JSScopeProperty *) prop;
-    rt = cx->runtime;
-    if (!sprop) {
-        /* Check for a deleted symbol watchpoint, which holds its property. */
-        sprop = js_FindWatchPoint(rt, OBJ_SCOPE(obj), propid);
-        if (!sprop) {
-            /* Make a new property in obj so we can watch for the first set. */
-            if (!js_DefineProperty(cx, obj, propid, JSVAL_VOID,
-                                   NULL, NULL, JSPROP_ENUMERATE,
-                                   &prop)) {
-                return JS_FALSE;
-            }
-            sprop = (JSScopeProperty *) prop;
-        }
-    } else if (pobj != obj) {
-        /* Clone the prototype property so we can watch the right object. */
-        jsval value;
-        JSPropertyOp getter, setter;
-        uintN attrs, flags;
-        intN shortid;
-
-        if (OBJ_IS_NATIVE(pobj)) {
-            value = SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj))
-                    ? LOCKED_OBJ_GET_SLOT(pobj, sprop->slot)
-                    : JSVAL_VOID;
-            getter = sprop->getter;
-            setter = sprop->setter;
-            attrs = sprop->attrs;
-            flags = sprop->flags;
-            shortid = sprop->shortid;
-        } else {
-            if (!OBJ_GET_PROPERTY(cx, pobj, id, &value) ||
-                !OBJ_GET_ATTRIBUTES(cx, pobj, id, prop, &attrs)) {
-                OBJ_DROP_PROPERTY(cx, pobj, prop);
-                return JS_FALSE;
-            }
-            getter = setter = NULL;
-            flags = 0;
-            shortid = 0;
-        }
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-
-        /* Recall that obj is native, whether or not pobj is native. */
-        if (!js_DefineNativeProperty(cx, obj, propid, value, getter, setter,
-                                     attrs, flags, shortid, &prop)) {
-            return JS_FALSE;
-        }
-        sprop = (JSScopeProperty *) prop;
-    }
-
-    /*
-     * At this point, prop/sprop exists in obj, obj is locked, and we must
-     * OBJ_DROP_PROPERTY(cx, obj, prop) before returning.
-     */
-    ok = JS_TRUE;
-    wp = FindWatchPoint(rt, OBJ_SCOPE(obj), propid);
-    if (!wp) {
-        watcher = js_WrapWatchedSetter(cx, propid, sprop->attrs, sprop->setter);
-        if (!watcher) {
-            ok = JS_FALSE;
-            goto out;
-        }
-
-        wp = (JSWatchPoint *) JS_malloc(cx, sizeof *wp);
-        if (!wp) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        wp->handler = NULL;
-        wp->closure = NULL;
-        ok = js_AddRoot(cx, &wp->closure, "wp->closure");
-        if (!ok) {
-            JS_free(cx, wp);
-            goto out;
-        }
-        JS_APPEND_LINK(&wp->links, &rt->watchPointList);
-        wp->object = obj;
-        wp->sprop = sprop;
-        JS_ASSERT(sprop->setter != js_watch_set);
-        wp->setter = sprop->setter;
-        wp->nrefs = 1;
-
-        /* XXXbe nest in obj lock here */
-        sprop = js_ChangeNativePropertyAttrs(cx, obj, sprop, 0, sprop->attrs,
-                                             sprop->getter, watcher);
-        if (!sprop) {
-            DropWatchPoint(cx, wp);
-            ok = JS_FALSE;
-            goto out;
-        }
-    }
-    wp->handler = handler;
-    wp->closure = closure;
-
-out:
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ClearWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                   JSWatchPointHandler *handlerp, void **closurep)
-{
-    JSRuntime *rt;
-    JSWatchPoint *wp;
-
-    rt = cx->runtime;
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = (JSWatchPoint *)wp->links.next) {
-        if (wp->object == obj && SPROP_USERID(wp->sprop) == id) {
-            if (handlerp)
-                *handlerp = wp->handler;
-            if (closurep)
-                *closurep = wp->closure;
-            return DropWatchPoint(cx, wp);
-        }
-    }
-    if (handlerp)
-        *handlerp = NULL;
-    if (closurep)
-        *closurep = NULL;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ClearWatchPointsForObject(JSContext *cx, JSObject *obj)
-{
-    JSRuntime *rt;
-    JSWatchPoint *wp, *next;
-
-    rt = cx->runtime;
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = next) {
-        next = (JSWatchPoint *)wp->links.next;
-        if (wp->object == obj && !DropWatchPoint(cx, wp))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_ClearAllWatchPoints(JSContext *cx)
-{
-    JSRuntime *rt;
-    JSWatchPoint *wp, *next;
-
-    rt = cx->runtime;
-    for (wp = (JSWatchPoint *)rt->watchPointList.next;
-         wp != (JSWatchPoint *)&rt->watchPointList;
-         wp = next) {
-        next = (JSWatchPoint *)wp->links.next;
-        if (!DropWatchPoint(cx, wp))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(uintN)
-JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc)
-{
-    return js_PCToLineNumber(cx, script, pc);
-}
-
-JS_PUBLIC_API(jsbytecode *)
-JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno)
-{
-    return js_LineNumberToPC(script, lineno);
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_GetFunctionScript(JSContext *cx, JSFunction *fun)
-{
-    return FUN_SCRIPT(fun);
-}
-
-JS_PUBLIC_API(JSNative)
-JS_GetFunctionNative(JSContext *cx, JSFunction *fun)
-{
-    return FUN_NATIVE(fun);
-}
-
-JS_PUBLIC_API(JSPrincipals *)
-JS_GetScriptPrincipals(JSContext *cx, JSScript *script)
-{
-    return script->principals;
-}
-
-/************************************************************************/
-
-/*
- *  Stack Frame Iterator
- */
-JS_PUBLIC_API(JSStackFrame *)
-JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp)
-{
-    *iteratorp = (*iteratorp == NULL) ? cx->fp : (*iteratorp)->down;
-    return *iteratorp;
-}
-
-JS_PUBLIC_API(JSScript *)
-JS_GetFrameScript(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->script;
-}
-
-JS_PUBLIC_API(jsbytecode *)
-JS_GetFramePC(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->pc;
-}
-
-JS_PUBLIC_API(JSStackFrame *)
-JS_GetScriptedCaller(JSContext *cx, JSStackFrame *fp)
-{
-    if (!fp)
-        fp = cx->fp;
-    while ((fp = fp->down) != NULL) {
-        if (fp->script)
-            return fp;
-    }
-    return NULL;
-}
-
-JS_PUBLIC_API(JSPrincipals *)
-JS_StackFramePrincipals(JSContext *cx, JSStackFrame *fp)
-{
-    if (fp->fun) {
-        JSRuntime *rt = cx->runtime;
-
-        if (rt->findObjectPrincipals) {
-            JSObject *callee = JSVAL_TO_OBJECT(fp->argv[-2]);
-
-            if (fp->fun->object != callee)
-                return rt->findObjectPrincipals(cx, callee);
-            /* FALL THROUGH */
-        }
-    }
-    if (fp->script)
-        return fp->script->principals;
-    return NULL;
-}
-
-JS_PUBLIC_API(JSPrincipals *)
-JS_EvalFramePrincipals(JSContext *cx, JSStackFrame *fp, JSStackFrame *caller)
-{
-    JSRuntime *rt;
-    JSObject *callee;
-    JSPrincipals *principals, *callerPrincipals;
-
-    rt = cx->runtime;
-    if (rt->findObjectPrincipals) {
-        callee = JSVAL_TO_OBJECT(fp->argv[-2]);
-        principals = rt->findObjectPrincipals(cx, callee);
-    } else {
-        principals = NULL;
-    }
-    if (!caller)
-        return principals;
-    callerPrincipals = JS_StackFramePrincipals(cx, caller);
-    return (callerPrincipals && principals &&
-            callerPrincipals->subsume(callerPrincipals, principals))
-           ? principals
-           : callerPrincipals;
-}
-
-JS_PUBLIC_API(void *)
-JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp)
-{
-    if (fp->annotation && fp->script) {
-        JSPrincipals *principals = JS_StackFramePrincipals(cx, fp);
-
-        if (principals && principals->globalPrivilegesEnabled(cx, principals)) {
-            /*
-             * Give out an annotation only if privileges have not been revoked
-             * or disabled globally.
-             */
-            return fp->annotation;
-        }
-    }
-
-    return NULL;
-}
-
-JS_PUBLIC_API(void)
-JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation)
-{
-    fp->annotation = annotation;
-}
-
-JS_PUBLIC_API(void *)
-JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp)
-{
-    JSPrincipals *principals;
-
-    principals = JS_StackFramePrincipals(cx, fp);
-    if (!principals)
-        return NULL;
-    return principals->getPrincipalArray(cx, principals);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsNativeFrame(JSContext *cx, JSStackFrame *fp)
-{
-    return !fp->script;
-}
-
-/* this is deprecated, use JS_GetFrameScopeChain instead */
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameObject(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->scopeChain;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameScopeChain(JSContext *cx, JSStackFrame *fp)
-{
-    /* Force creation of argument and call objects if not yet created */
-    (void) JS_GetFrameCallObject(cx, fp);
-    return fp->scopeChain;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fp)
-{
-    if (! fp->fun)
-        return NULL;
-#if JS_HAS_ARGS_OBJECT
-    /* Force creation of argument object if not yet created */
-    (void) js_GetArgsObject(cx, fp);
-#endif
-#if JS_HAS_CALL_OBJECT
-    /*
-     * XXX ill-defined: null return here means error was reported, unlike a
-     *     null returned above or in the #else
-     */
-    return js_GetCallObject(cx, fp, NULL);
-#else
-    return NULL;
-#endif /* JS_HAS_CALL_OBJECT */
-}
-
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameThis(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->thisp;
-}
-
-JS_PUBLIC_API(JSFunction *)
-JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->fun;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->argv && fp->fun ? JSVAL_TO_OBJECT(fp->argv[-2]) : NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsConstructorFrame(JSContext *cx, JSStackFrame *fp)
-{
-    return (fp->flags & JSFRAME_CONSTRUCTING) != 0;
-}
-
-JS_PUBLIC_API(JSObject *)
-JS_GetFrameCalleeObject(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->argv ? JSVAL_TO_OBJECT(fp->argv[-2]) : NULL;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsDebuggerFrame(JSContext *cx, JSStackFrame *fp)
-{
-    return (fp->flags & JSFRAME_DEBUGGER) != 0;
-}
-
-JS_PUBLIC_API(jsval)
-JS_GetFrameReturnValue(JSContext *cx, JSStackFrame *fp)
-{
-    return fp->rval;
-}
-
-JS_PUBLIC_API(void)
-JS_SetFrameReturnValue(JSContext *cx, JSStackFrame *fp, jsval rval)
-{
-    fp->rval = rval;
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(const char *)
-JS_GetScriptFilename(JSContext *cx, JSScript *script)
-{
-    return script->filename;
-}
-
-JS_PUBLIC_API(uintN)
-JS_GetScriptBaseLineNumber(JSContext *cx, JSScript *script)
-{
-    return script->lineno;
-}
-
-JS_PUBLIC_API(uintN)
-JS_GetScriptLineExtent(JSContext *cx, JSScript *script)
-{
-    return js_GetScriptLineExtent(script);
-}
-
-JS_PUBLIC_API(JSVersion)
-JS_GetScriptVersion(JSContext *cx, JSScript *script)
-{
-    return script->version & JSVERSION_MASK;
-}
-
-/***************************************************************************/
-
-JS_PUBLIC_API(void)
-JS_SetNewScriptHook(JSRuntime *rt, JSNewScriptHook hook, void *callerdata)
-{
-    rt->newScriptHook = hook;
-    rt->newScriptHookData = callerdata;
-}
-
-JS_PUBLIC_API(void)
-JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
-                        void *callerdata)
-{
-    rt->destroyScriptHook = hook;
-    rt->destroyScriptHookData = callerdata;
-}
-
-/***************************************************************************/
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
-                          const jschar *bytes, uintN length,
-                          const char *filename, uintN lineno,
-                          jsval *rval)
-{
-    uint32 flags, options;
-    JSScript *script;
-    JSBool ok;
-
-    /*
-     * XXX Hack around ancient compiler API to propagate the JSFRAME_SPECIAL
-     * flags to the code generator (see js_EmitTree's TOK_SEMI case).
-     */
-    flags = fp->flags;
-    fp->flags |= JSFRAME_DEBUGGER | JSFRAME_EVAL;
-    options = cx->options;
-    cx->options = options | JSOPTION_COMPILE_N_GO;
-    script = JS_CompileUCScriptForPrincipals(cx, fp->scopeChain,
-                                             JS_StackFramePrincipals(cx, fp),
-                                             bytes, length, filename, lineno);
-    fp->flags = flags;
-    cx->options = options;
-    if (!script)
-        return JS_FALSE;
-
-    ok = js_Execute(cx, fp->scopeChain, script, fp,
-                    JSFRAME_DEBUGGER | JSFRAME_EVAL, rval);
-    js_DestroyScript(cx, script);
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
-                        const char *bytes, uintN length,
-                        const char *filename, uintN lineno,
-                        jsval *rval)
-{
-    jschar *chars;
-    JSBool ok;
-	size_t slength = length;
-
-    chars = js_InflateString(cx, bytes, &slength);
-    if (!chars)
-        return JS_FALSE;
-    ok = JS_EvaluateUCInStackFrame(cx, fp, chars, slength, filename, lineno,
-                                   rval);
-    JS_free(cx, chars);
-
-    return ok;
-}
-
-/************************************************************************/
-
-/* XXXbe this all needs to be reworked to avoid requiring JSScope types. */
-
-JS_PUBLIC_API(JSScopeProperty *)
-JS_PropertyIterator(JSObject *obj, JSScopeProperty **iteratorp)
-{
-    JSScopeProperty *sprop;
-    JSScope *scope;
-
-    sprop = *iteratorp;
-    scope = OBJ_SCOPE(obj);
-
-    /* XXXbe minor(?) incompatibility: iterate in reverse definition order */
-    if (!sprop) {
-        sprop = SCOPE_LAST_PROP(scope);
-    } else {
-        while ((sprop = sprop->parent) != NULL) {
-            if (!SCOPE_HAD_MIDDLE_DELETE(scope))
-                break;
-            if (SCOPE_HAS_PROPERTY(scope, sprop))
-                break;
-        }
-    }
-    *iteratorp = sprop;
-    return sprop;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
-                   JSPropertyDesc *pd)
-{
-    JSPropertyOp getter;
-    JSScope *scope;
-    JSScopeProperty *aprop;
-    jsval lastException;
-    JSBool wasThrowing;
-
-    pd->id = ID_TO_VALUE(sprop->id);
-
-    wasThrowing = cx->throwing;
-    if (wasThrowing) {
-        lastException = cx->exception;
-        if (JSVAL_IS_GCTHING(lastException) &&
-            !js_AddRoot(cx, &lastException, "lastException")) {
-                return JS_FALSE;
-        }
-        cx->throwing = JS_FALSE;
-    }
-
-    if (!js_GetProperty(cx, obj, sprop->id, &pd->value)) {
-        if (!cx->throwing) {
-            pd->flags = JSPD_ERROR;
-            pd->value = JSVAL_VOID;
-        } else {
-            pd->flags = JSPD_EXCEPTION;
-            pd->value = cx->exception;
-        }
-    } else {
-        pd->flags = 0;
-    }
-
-    cx->throwing = wasThrowing;
-    if (wasThrowing) {
-        cx->exception = lastException;
-        if (JSVAL_IS_GCTHING(lastException))
-            js_RemoveRoot(cx->runtime, &lastException);
-    }
-
-    getter = sprop->getter;
-    pd->flags |= ((sprop->attrs & JSPROP_ENUMERATE) ? JSPD_ENUMERATE : 0)
-              | ((sprop->attrs & JSPROP_READONLY)  ? JSPD_READONLY  : 0)
-              | ((sprop->attrs & JSPROP_PERMANENT) ? JSPD_PERMANENT : 0)
-#if JS_HAS_CALL_OBJECT
-              | ((getter == js_GetCallVariable)    ? JSPD_VARIABLE  : 0)
-#endif /* JS_HAS_CALL_OBJECT */
-              | ((getter == js_GetArgument)        ? JSPD_ARGUMENT  : 0)
-              | ((getter == js_GetLocalVariable)   ? JSPD_VARIABLE  : 0);
-#if JS_HAS_CALL_OBJECT
-    /* for Call Object 'real' getter isn't passed in to us */
-    if (OBJ_GET_CLASS(cx, obj) == &js_CallClass &&
-        getter == js_CallClass.getProperty) {
-        /*
-         * Property of a heavyweight function's variable object having the
-         * class-default getter.  It's either an argument if permanent, or a
-         * nested function if impermanent.  Local variables have a special
-         * getter (js_GetCallVariable, tested above) and setter, and not the
-         * class default.
-         */
-        pd->flags |= (sprop->attrs & JSPROP_PERMANENT)
-                     ? JSPD_ARGUMENT
-                     : JSPD_VARIABLE;
-    }
-#endif /* JS_HAS_CALL_OBJECT */
-    pd->spare = 0;
-    pd->slot = (pd->flags & (JSPD_ARGUMENT | JSPD_VARIABLE))
-               ? sprop->shortid
-               : 0;
-    pd->alias = JSVAL_VOID;
-    scope = OBJ_SCOPE(obj);
-    if (SPROP_HAS_VALID_SLOT(sprop, scope)) {
-        for (aprop = SCOPE_LAST_PROP(scope); aprop; aprop = aprop->parent) {
-            if (aprop != sprop && aprop->slot == sprop->slot) {
-                pd->alias = ID_TO_VALUE(aprop->id);
-                break;
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda)
-{
-    JSClass *clasp;
-    JSScope *scope;
-    uint32 i, n;
-    JSPropertyDesc *pd;
-    JSScopeProperty *sprop;
-
-    clasp = OBJ_GET_CLASS(cx, obj);
-    if (!OBJ_IS_NATIVE(obj) || (clasp->flags & JSCLASS_NEW_ENUMERATE)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_CANT_DESCRIBE_PROPS, clasp->name);
-        return JS_FALSE;
-    }
-    if (!clasp->enumerate(cx, obj))
-        return JS_FALSE;
-
-    /* have no props, or object's scope has not mutated from that of proto */
-    scope = OBJ_SCOPE(obj);
-    if (scope->object != obj || scope->entryCount == 0) {
-        pda->length = 0;
-        pda->array = NULL;
-        return JS_TRUE;
-    }
-
-    n = scope->entryCount;
-    if (n > scope->map.nslots)
-        n = scope->map.nslots;
-    pd = (JSPropertyDesc *) JS_malloc(cx, (size_t)n * sizeof(JSPropertyDesc));
-    if (!pd)
-        return JS_FALSE;
-    i = 0;
-    for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-        if (SCOPE_HAD_MIDDLE_DELETE(scope) && !SCOPE_HAS_PROPERTY(scope, sprop))
-            continue;
-        if (!js_AddRoot(cx, &pd[i].id, NULL))
-            goto bad;
-        if (!js_AddRoot(cx, &pd[i].value, NULL))
-            goto bad;
-        if (!JS_GetPropertyDesc(cx, obj, sprop, &pd[i]))
-            goto bad;
-        if ((pd[i].flags & JSPD_ALIAS) && !js_AddRoot(cx, &pd[i].alias, NULL))
-            goto bad;
-        if (++i == n)
-            break;
-    }
-    pda->length = i;
-    pda->array = pd;
-    return JS_TRUE;
-
-bad:
-    pda->length = i + 1;
-    pda->array = pd;
-    JS_PutPropertyDescArray(cx, pda);
-    return JS_FALSE;
-}
-
-JS_PUBLIC_API(void)
-JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda)
-{
-    JSPropertyDesc *pd;
-    uint32 i;
-
-    pd = pda->array;
-    for (i = 0; i < pda->length; i++) {
-        js_RemoveRoot(cx->runtime, &pd[i].id);
-        js_RemoveRoot(cx->runtime, &pd[i].value);
-        if (pd[i].flags & JSPD_ALIAS)
-            js_RemoveRoot(cx->runtime, &pd[i].alias);
-    }
-    JS_free(cx, pd);
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(JSBool)
-JS_SetDebuggerHandler(JSRuntime *rt, JSTrapHandler handler, void *closure)
-{
-    rt->debuggerHandler = handler;
-    rt->debuggerHandlerData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetSourceHandler(JSRuntime *rt, JSSourceHandler handler, void *closure)
-{
-    rt->sourceHandler = handler;
-    rt->sourceHandlerData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetExecuteHook(JSRuntime *rt, JSInterpreterHook hook, void *closure)
-{
-    rt->executeHook = hook;
-    rt->executeHookData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetCallHook(JSRuntime *rt, JSInterpreterHook hook, void *closure)
-{
-    rt->callHook = hook;
-    rt->callHookData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetObjectHook(JSRuntime *rt, JSObjectHook hook, void *closure)
-{
-    rt->objectHook = hook;
-    rt->objectHookData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetThrowHook(JSRuntime *rt, JSTrapHandler hook, void *closure)
-{
-    rt->throwHook = hook;
-    rt->throwHookData = closure;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_SetDebugErrorHook(JSRuntime *rt, JSDebugErrorHook hook, void *closure)
-{
-    rt->debugErrorHook = hook;
-    rt->debugErrorHookData = closure;
-    return JS_TRUE;
-}
-
-/************************************************************************/
-
-JS_PUBLIC_API(size_t)
-JS_GetObjectTotalSize(JSContext *cx, JSObject *obj)
-{
-    size_t nbytes;
-    JSScope *scope;
-
-    nbytes = sizeof *obj + obj->map->nslots * sizeof obj->slots[0];
-    if (OBJ_IS_NATIVE(obj)) {
-        scope = OBJ_SCOPE(obj);
-        if (scope->object == obj) {
-            nbytes += sizeof *scope;
-            nbytes += SCOPE_CAPACITY(scope) * sizeof(JSScopeProperty *);
-        }
-    }
-    return nbytes;
-}
-
-static size_t
-GetAtomTotalSize(JSContext *cx, JSAtom *atom)
-{
-    size_t nbytes;
-
-    nbytes = sizeof *atom;
-    if (ATOM_IS_STRING(atom)) {
-        nbytes += sizeof(JSString);
-        nbytes += (ATOM_TO_STRING(atom)->length + 1) * sizeof(jschar);
-    } else if (ATOM_IS_DOUBLE(atom)) {
-        nbytes += sizeof(jsdouble);
-    } else if (ATOM_IS_OBJECT(atom)) {
-        nbytes += JS_GetObjectTotalSize(cx, ATOM_TO_OBJECT(atom));
-    }
-    return nbytes;
-}
-
-JS_PUBLIC_API(size_t)
-JS_GetFunctionTotalSize(JSContext *cx, JSFunction *fun)
-{
-    size_t nbytes, obytes;
-    JSObject *obj;
-    JSAtom *atom;
-
-    nbytes = sizeof *fun;
-    JS_ASSERT(fun->nrefs);
-    obj = fun->object;
-    if (obj) {
-        obytes = JS_GetObjectTotalSize(cx, obj);
-        if (fun->nrefs > 1)
-            obytes = JS_HOWMANY(obytes, fun->nrefs);
-        nbytes += obytes;
-    }
-    if (fun->interpreted)
-        nbytes += JS_GetScriptTotalSize(cx, fun->u.script);
-    atom = fun->atom;
-    if (atom)
-        nbytes += GetAtomTotalSize(cx, atom);
-    return nbytes;
-}
-
-#include "jsemit.h"
-
-JS_PUBLIC_API(size_t)
-JS_GetScriptTotalSize(JSContext *cx, JSScript *script)
-{
-    size_t nbytes, pbytes;
-    JSObject *obj;
-    jsatomid i;
-    jssrcnote *sn, *notes;
-    JSTryNote *tn, *tnotes;
-    JSPrincipals *principals;
-
-    nbytes = sizeof *script;
-    obj = script->object;
-    if (obj)
-        nbytes += JS_GetObjectTotalSize(cx, obj);
-
-    nbytes += script->length * sizeof script->code[0];
-    nbytes += script->atomMap.length * sizeof script->atomMap.vector[0];
-    for (i = 0; i < script->atomMap.length; i++)
-        nbytes += GetAtomTotalSize(cx, script->atomMap.vector[i]);
-
-    if (script->filename)
-        nbytes += strlen(script->filename) + 1;
-
-    notes = SCRIPT_NOTES(script);
-    for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn))
-        continue;
-    nbytes += (sn - notes + 1) * sizeof *sn;
-
-    tnotes = script->trynotes;
-    if (tnotes) {
-        for (tn = tnotes; tn->catchStart; tn++)
-            continue;
-        nbytes += (tn - tnotes + 1) * sizeof *tn;
-    }
-
-    principals = script->principals;
-    if (principals) {
-        JS_ASSERT(principals->refcount);
-        pbytes = sizeof *principals;
-        if (principals->refcount > 1)
-            pbytes = JS_HOWMANY(pbytes, principals->refcount);
-        nbytes += pbytes;
-    }
-
-    return nbytes;
-}
-
-JS_PUBLIC_API(uint32)
-JS_GetTopScriptFilenameFlags(JSContext *cx, JSStackFrame *fp)
-{
-    if (!fp)
-        fp = cx->fp;
-    while (fp) {
-        if (fp->script) {
-            if (!fp->script->filename)
-                return JSFILENAME_NULL;
-            return js_GetScriptFilenameFlags(fp->script->filename);
-        }
-        fp = fp->down;
-    }
-    return 0;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_FlagScriptFilenamePrefix(JSRuntime *rt, const char *prefix, uint32 flags)
-{
-    if (!js_SaveScriptFilenameRT(rt, prefix, flags))
-        return JS_FALSE;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_IsSystemObject(JSContext *cx, JSObject *obj)
-{
-    return (*js_GetGCThingFlags(obj) & GCF_SYSTEM) != 0;
-}
-
-JS_PUBLIC_API(void)
-JS_FlagSystemObject(JSContext *cx, JSObject *obj)
-{
-    uint8 *flagp;
-    
-    flagp = js_GetGCThingFlags(obj);
-    *flagp |= GCF_SYSTEM;
-}
diff --git a/libs/js/src/jsdbgapi.h b/libs/js/src/jsdbgapi.h
deleted file mode 100644
index bf47075bd3..0000000000
--- a/libs/js/src/jsdbgapi.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsdbgapi_h___
-#define jsdbgapi_h___
-/*
- * JS debugger API.
- */
-#include "jsapi.h"
-#include "jsopcode.h"
-#include "jsprvtd.h"
-
-JS_BEGIN_EXTERN_C
-
-extern void
-js_PatchOpcode(JSContext *cx, JSScript *script, jsbytecode *pc, JSOp op);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-           JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSOp)
-JS_GetTrapOpcode(JSContext *cx, JSScript *script, jsbytecode *pc);
-
-extern JS_PUBLIC_API(void)
-JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-             JSTrapHandler *handlerp, void **closurep);
-
-extern JS_PUBLIC_API(void)
-JS_ClearScriptTraps(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(void)
-JS_ClearAllTraps(JSContext *cx);
-
-extern JS_PUBLIC_API(JSTrapStatus)
-JS_HandleTrap(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                 JSWatchPointHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                   JSWatchPointHandler *handlerp, void **closurep);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearWatchPointsForObject(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearAllWatchPoints(JSContext *cx);
-
-#ifdef JS_HAS_OBJ_WATCHPOINT
-/*
- * Hide these non-API function prototypes by testing whether the internal
- * header file "jsconfig.h" has been included.
- */
-extern void
-js_MarkWatchPoints(JSRuntime *rt);
-
-extern JSScopeProperty *
-js_FindWatchPoint(JSRuntime *rt, JSScope *scope, jsid id);
-
-extern JSPropertyOp
-js_GetWatchedSetter(JSRuntime *rt, JSScope *scope,
-                    const JSScopeProperty *sprop);
-
-extern JSBool JS_DLL_CALLBACK
-js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool JS_DLL_CALLBACK
-js_watch_set_wrapper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval);
-
-extern JSPropertyOp
-js_WrapWatchedSetter(JSContext *cx, jsid id, uintN attrs, JSPropertyOp setter);
-
-#endif /* JS_HAS_OBJ_WATCHPOINT */
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(uintN)
-JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
-
-extern JS_PUBLIC_API(jsbytecode *)
-JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_GetFunctionScript(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(JSNative)
-JS_GetFunctionNative(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_GetScriptPrincipals(JSContext *cx, JSScript *script);
-
-/*
- * Stack Frame Iterator
- *
- * Used to iterate through the JS stack frames to extract
- * information from the frames.
- */
-
-extern JS_PUBLIC_API(JSStackFrame *)
-JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_GetFrameScript(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(jsbytecode *)
-JS_GetFramePC(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Get the closest scripted frame below fp.  If fp is null, start from cx->fp.
- */
-extern JS_PUBLIC_API(JSStackFrame *)
-JS_GetScriptedCaller(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Return a weak reference to fp's principals.  A null return does not denote
- * an error, it means there are no principals.
- */
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_StackFramePrincipals(JSContext *cx, JSStackFrame *fp);
-
-/*
- * This API is like JS_StackFramePrincipals(cx, caller), except that if
- * cx->runtime->findObjectPrincipals is non-null, it returns the weaker of
- * the caller's principals and the object principals of fp's callee function
- * object (fp->argv[-2]), which is eval, Function, or a similar eval-like
- * method.  The caller parameter should be JS_GetScriptedCaller(cx, fp).
- *
- * All eval-like methods must use JS_EvalFramePrincipals to acquire a weak
- * reference to the correct principals for the eval call to be secure, given
- * an embedding that calls JS_SetObjectPrincipalsFinder (see jsapi.h).
- */
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_EvalFramePrincipals(JSContext *cx, JSStackFrame *fp, JSStackFrame *caller);
-
-extern JS_PUBLIC_API(void *)
-JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(void)
-JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation);
-
-extern JS_PUBLIC_API(void *)
-JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsNativeFrame(JSContext *cx, JSStackFrame *fp);
-
-/* this is deprecated, use JS_GetFrameScopeChain instead */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameObject(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameScopeChain(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameThis(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp);
-
-/* XXXrginda Initially published with typo */
-#define JS_IsContructorFrame JS_IsConstructorFrame
-extern JS_PUBLIC_API(JSBool)
-JS_IsConstructorFrame(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsDebuggerFrame(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetFrameReturnValue(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(void)
-JS_SetFrameReturnValue(JSContext *cx, JSStackFrame *fp, jsval rval);
-
-/**
- * Return fp's callee function object (fp->argv[-2]) if it has one.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameCalleeObject(JSContext *cx, JSStackFrame *fp);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(const char *)
-JS_GetScriptFilename(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(uintN)
-JS_GetScriptBaseLineNumber(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(uintN)
-JS_GetScriptLineExtent(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_GetScriptVersion(JSContext *cx, JSScript *script);
-
-/************************************************************************/
-
-/*
- * Hook setters for script creation and destruction, see jsprvtd.h for the
- * typedefs.  These macros provide binary compatibility and newer, shorter
- * synonyms.
- */
-#define JS_SetNewScriptHook     JS_SetNewScriptHookProc
-#define JS_SetDestroyScriptHook JS_SetDestroyScriptHookProc
-
-extern JS_PUBLIC_API(void)
-JS_SetNewScriptHook(JSRuntime *rt, JSNewScriptHook hook, void *callerdata);
-
-extern JS_PUBLIC_API(void)
-JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
-                        void *callerdata);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
-                          const jschar *bytes, uintN length,
-                          const char *filename, uintN lineno,
-                          jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
-                        const char *bytes, uintN length,
-                        const char *filename, uintN lineno,
-                        jsval *rval);
-
-/************************************************************************/
-
-typedef struct JSPropertyDesc {
-    jsval           id;         /* primary id, a string or int */
-    jsval           value;      /* property value */
-    uint8           flags;      /* flags, see below */
-    uint8           spare;      /* unused */
-    uint16          slot;       /* argument/variable slot */
-    jsval           alias;      /* alias id if JSPD_ALIAS flag */
-} JSPropertyDesc;
-
-#define JSPD_ENUMERATE  0x01    /* visible to for/in loop */
-#define JSPD_READONLY   0x02    /* assignment is error */
-#define JSPD_PERMANENT  0x04    /* property cannot be deleted */
-#define JSPD_ALIAS      0x08    /* property has an alias id */
-#define JSPD_ARGUMENT   0x10    /* argument to function */
-#define JSPD_VARIABLE   0x20    /* local variable in function */
-#define JSPD_EXCEPTION  0x40    /* exception occurred fetching the property, */
-                                /* value is exception */
-#define JSPD_ERROR      0x80    /* native getter returned JS_FALSE without */
-                                /* throwing an exception */
-
-typedef struct JSPropertyDescArray {
-    uint32          length;     /* number of elements in array */
-    JSPropertyDesc  *array;     /* alloc'd by Get, freed by Put */
-} JSPropertyDescArray;
-
-extern JS_PUBLIC_API(JSScopeProperty *)
-JS_PropertyIterator(JSObject *obj, JSScopeProperty **iteratorp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
-                   JSPropertyDesc *pd);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda);
-
-extern JS_PUBLIC_API(void)
-JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetDebuggerHandler(JSRuntime *rt, JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetSourceHandler(JSRuntime *rt, JSSourceHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetExecuteHook(JSRuntime *rt, JSInterpreterHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetCallHook(JSRuntime *rt, JSInterpreterHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetObjectHook(JSRuntime *rt, JSObjectHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetThrowHook(JSRuntime *rt, JSTrapHandler hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetDebugErrorHook(JSRuntime *rt, JSDebugErrorHook hook, void *closure);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(size_t)
-JS_GetObjectTotalSize(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetFunctionTotalSize(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetScriptTotalSize(JSContext *cx, JSScript *script);
-
-/*
- * Get the top-most running script on cx starting from fp, or from the top of
- * cx's frame stack if fp is null, and return its script filename flags.  If
- * the script has a null filename member, return JSFILENAME_NULL.
- */
-extern JS_PUBLIC_API(uint32)
-JS_GetTopScriptFilenameFlags(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Associate flags with a script filename prefix in rt, so that any subsequent
- * script compilation will inherit those flags if the script's filename is the
- * same as prefix, or if prefix is a substring of the script's filename.
- *
- * The API defines only one flag bit, JSFILENAME_SYSTEM, leaving the remaining
- * 31 bits up to the API client to define.  The union of all 32 bits must not
- * be a legal combination, however, in order to preserve JSFILENAME_NULL as a
- * unique value.  API clients may depend on JSFILENAME_SYSTEM being a set bit
- * in JSFILENAME_NULL -- a script with a null filename member is presumed to
- * be a "system" script.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_FlagScriptFilenamePrefix(JSRuntime *rt, const char *prefix, uint32 flags);
-
-#define JSFILENAME_NULL         0xffffffff      /* null script filename */
-#define JSFILENAME_SYSTEM       0x00000001      /* "system" script, see below */
-
-/*
- * Return true if obj is a "system" object, that is, one flagged by a prior
- * call to JS_FlagSystemObject(cx, obj).  What "system" means is up to the API
- * client, but it can be used to coordinate access control policies based on
- * script filenames and their prefixes, using JS_FlagScriptFilenamePrefix and
- * JS_GetTopScriptFilenameFlags.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_IsSystemObject(JSContext *cx, JSObject *obj);
-
-/*
- * Flag obj as a "system" object.  The API client can flag system objects to
- * optimize access control checks.  The engine stores but does not interpret
- * the per-object flag set by this call.
- */
-extern JS_PUBLIC_API(void)
-JS_FlagSystemObject(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jsdbgapi_h___ */
diff --git a/libs/js/src/jsdhash.c b/libs/js/src/jsdhash.c
deleted file mode 100644
index cd3006685a..0000000000
--- a/libs/js/src/jsdhash.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla JavaScript code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brendan Eich <brendan@mozilla.org> (Original Author)
- *   Chris Waterson <waterson@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Double hashing implementation.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jsbit.h"
-#include "jsdhash.h"
-#include "jsutil.h"     /* for JS_ASSERT */
-
-#ifdef JS_DHASHMETER
-# if defined MOZILLA_CLIENT && defined DEBUG_XXXbrendan
-#  include "nsTraceMalloc.h"
-# endif
-# define METER(x)       x
-#else
-# define METER(x)       /* nothing */
-#endif
-
-JS_PUBLIC_API(void *)
-JS_DHashAllocTable(JSDHashTable *table, uint32 nbytes)
-{
-    return malloc(nbytes);
-}
-
-JS_PUBLIC_API(void)
-JS_DHashFreeTable(JSDHashTable *table, void *ptr)
-{
-    free(ptr);
-}
-
-JS_PUBLIC_API(JSDHashNumber)
-JS_DHashStringKey(JSDHashTable *table, const void *key)
-{
-    JSDHashNumber h;
-    const unsigned char *s;
-
-    h = 0;
-    for (s = key; *s != '\0'; s++)
-        h = (h >> (JS_DHASH_BITS - 4)) ^ (h << 4) ^ *s;
-    return h;
-}
-
-JS_PUBLIC_API(const void *)
-JS_DHashGetKeyStub(JSDHashTable *table, JSDHashEntryHdr *entry)
-{
-    JSDHashEntryStub *stub = (JSDHashEntryStub *)entry;
-
-    return stub->key;
-}
-
-JS_PUBLIC_API(JSDHashNumber)
-JS_DHashVoidPtrKeyStub(JSDHashTable *table, const void *key)
-{
-    return (JSDHashNumber)(unsigned long)key >> 2;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DHashMatchEntryStub(JSDHashTable *table,
-                       const JSDHashEntryHdr *entry,
-                       const void *key)
-{
-    const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
-
-    return stub->key == key;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DHashMatchStringKey(JSDHashTable *table,
-                       const JSDHashEntryHdr *entry,
-                       const void *key)
-{
-    const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
-
-    /* XXX tolerate null keys on account of sloppy Mozilla callers. */
-    return stub->key == key ||
-           (stub->key && key && strcmp(stub->key, key) == 0);
-}
-
-JS_PUBLIC_API(void)
-JS_DHashMoveEntryStub(JSDHashTable *table,
-                      const JSDHashEntryHdr *from,
-                      JSDHashEntryHdr *to)
-{
-    memcpy(to, from, table->entrySize);
-}
-
-JS_PUBLIC_API(void)
-JS_DHashClearEntryStub(JSDHashTable *table, JSDHashEntryHdr *entry)
-{
-    memset(entry, 0, table->entrySize);
-}
-
-JS_PUBLIC_API(void)
-JS_DHashFreeStringKey(JSDHashTable *table, JSDHashEntryHdr *entry)
-{
-    const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
-
-    free((void *) stub->key);
-    memset(entry, 0, table->entrySize);
-}
-
-JS_PUBLIC_API(void)
-JS_DHashFinalizeStub(JSDHashTable *table)
-{
-}
-
-static const JSDHashTableOps stub_ops = {
-    JS_DHashAllocTable,
-    JS_DHashFreeTable,
-    JS_DHashGetKeyStub,
-    JS_DHashVoidPtrKeyStub,
-    JS_DHashMatchEntryStub,
-    JS_DHashMoveEntryStub,
-    JS_DHashClearEntryStub,
-    JS_DHashFinalizeStub,
-    NULL
-};
-
-JS_PUBLIC_API(const JSDHashTableOps *)
-JS_DHashGetStubOps(void)
-{
-    return &stub_ops;
-}
-
-JS_PUBLIC_API(JSDHashTable *)
-JS_NewDHashTable(const JSDHashTableOps *ops, void *data, uint32 entrySize,
-                 uint32 capacity)
-{
-    JSDHashTable *table;
-
-    table = (JSDHashTable *) malloc(sizeof *table);
-    if (!table)
-        return NULL;
-    if (!JS_DHashTableInit(table, ops, data, entrySize, capacity)) {
-        free(table);
-        return NULL;
-    }
-    return table;
-}
-
-JS_PUBLIC_API(void)
-JS_DHashTableDestroy(JSDHashTable *table)
-{
-    JS_DHashTableFinish(table);
-    free(table);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_DHashTableInit(JSDHashTable *table, const JSDHashTableOps *ops, void *data,
-                  uint32 entrySize, uint32 capacity)
-{
-    int log2;
-    uint32 nbytes;
-
-#ifdef DEBUG
-    if (entrySize > 10 * sizeof(void *)) {
-        fprintf(stderr,
-                "jsdhash: for the table at address %p, the given entrySize"
-                " of %lu %s favors chaining over double hashing.\n",
-                (void *)table,
-                (unsigned long) entrySize,
-                (entrySize > 16 * sizeof(void*)) ? "definitely" : "probably");
-    }
-#endif
-
-    table->ops = ops;
-    table->data = data;
-    if (capacity < JS_DHASH_MIN_SIZE)
-        capacity = JS_DHASH_MIN_SIZE;
-
-    JS_CEILING_LOG2(log2, capacity);
-
-    capacity = JS_BIT(log2);
-    if (capacity >= JS_DHASH_SIZE_LIMIT)
-        return JS_FALSE;
-    table->hashShift = JS_DHASH_BITS - log2;
-    table->maxAlphaFrac = 0xC0;                 /* .75 */
-    table->minAlphaFrac = 0x40;                 /* .25 */
-    table->entrySize = entrySize;
-    table->entryCount = table->removedCount = 0;
-    table->generation = 0;
-    nbytes = capacity * entrySize;
-
-    table->entryStore = ops->allocTable(table, nbytes);
-    if (!table->entryStore)
-        return JS_FALSE;
-    memset(table->entryStore, 0, nbytes);
-    METER(memset(&table->stats, 0, sizeof table->stats));
-    return JS_TRUE;
-}
-
-/*
- * Compute max and min load numbers (entry counts) from table params.
- */
-#define MAX_LOAD(table, size)   (((table)->maxAlphaFrac * (size)) >> 8)
-#define MIN_LOAD(table, size)   (((table)->minAlphaFrac * (size)) >> 8)
-
-JS_PUBLIC_API(void)
-JS_DHashTableSetAlphaBounds(JSDHashTable *table,
-                            float maxAlpha,
-                            float minAlpha)
-{
-    uint32 size;
-
-    /*
-     * Reject obviously insane bounds, rather than trying to guess what the
-     * buggy caller intended.
-     */
-    JS_ASSERT(0.5 <= maxAlpha && maxAlpha < 1 && 0 <= minAlpha);
-    if (maxAlpha < 0.5 || 1 <= maxAlpha || minAlpha < 0)
-        return;
-
-    /*
-     * Ensure that at least one entry will always be free.  If maxAlpha at
-     * minimum size leaves no entries free, reduce maxAlpha based on minimum
-     * size and the precision limit of maxAlphaFrac's fixed point format.
-     */
-    JS_ASSERT(JS_DHASH_MIN_SIZE - (maxAlpha * JS_DHASH_MIN_SIZE) >= 1);
-    if (JS_DHASH_MIN_SIZE - (maxAlpha * JS_DHASH_MIN_SIZE) < 1) {
-        maxAlpha = (float)
-                   (JS_DHASH_MIN_SIZE - JS_MAX(JS_DHASH_MIN_SIZE / 256, 1))
-                   / JS_DHASH_MIN_SIZE;
-    }
-
-    /*
-     * Ensure that minAlpha is strictly less than half maxAlpha.  Take care
-     * not to truncate an entry's worth of alpha when storing in minAlphaFrac
-     * (8-bit fixed point format).
-     */
-    JS_ASSERT(minAlpha < maxAlpha / 2);
-    if (minAlpha >= maxAlpha / 2) {
-        size = JS_DHASH_TABLE_SIZE(table);
-        minAlpha = (size * maxAlpha - JS_MAX(size / 256, 1)) / (2 * size);
-    }
-
-    table->maxAlphaFrac = (uint8)(maxAlpha * 256);
-    table->minAlphaFrac = (uint8)(minAlpha * 256);
-}
-
-/*
- * Double hashing needs the second hash code to be relatively prime to table
- * size, so we simply make hash2 odd.
- */
-#define HASH1(hash0, shift)         ((hash0) >> (shift))
-#define HASH2(hash0,log2,shift)     ((((hash0) << (log2)) >> (shift)) | 1)
-
-/*
- * Reserve keyHash 0 for free entries and 1 for removed-entry sentinels.  Note
- * that a removed-entry sentinel need be stored only if the removed entry had
- * a colliding entry added after it.  Therefore we can use 1 as the collision
- * flag in addition to the removed-entry sentinel value.  Multiplicative hash
- * uses the high order bits of keyHash, so this least-significant reservation
- * should not hurt the hash function's effectiveness much.
- *
- * If you change any of these magic numbers, also update JS_DHASH_ENTRY_IS_LIVE
- * in jsdhash.h.  It used to be private to jsdhash.c, but then became public to
- * assist iterator writers who inspect table->entryStore directly.
- */
-#define COLLISION_FLAG              ((JSDHashNumber) 1)
-#define MARK_ENTRY_FREE(entry)      ((entry)->keyHash = 0)
-#define MARK_ENTRY_REMOVED(entry)   ((entry)->keyHash = 1)
-#define ENTRY_IS_REMOVED(entry)     ((entry)->keyHash == 1)
-#define ENTRY_IS_LIVE(entry)        JS_DHASH_ENTRY_IS_LIVE(entry)
-#define ENSURE_LIVE_KEYHASH(hash0)  if (hash0 < 2) hash0 -= 2; else (void)0
-
-/* Match an entry's keyHash against an unstored one computed from a key. */
-#define MATCH_ENTRY_KEYHASH(entry,hash0) \
-    (((entry)->keyHash & ~COLLISION_FLAG) == (hash0))
-
-/* Compute the address of the indexed entry in table. */
-#define ADDRESS_ENTRY(table, index) \
-    ((JSDHashEntryHdr *)((table)->entryStore + (index) * (table)->entrySize))
-
-JS_PUBLIC_API(void)
-JS_DHashTableFinish(JSDHashTable *table)
-{
-    char *entryAddr, *entryLimit;
-    uint32 entrySize;
-    JSDHashEntryHdr *entry;
-
-#ifdef DEBUG_XXXbrendan
-    static FILE *dumpfp = NULL;
-    if (!dumpfp) dumpfp = fopen("/tmp/jsdhash.bigdump", "w");
-    if (dumpfp) {
-#ifdef MOZILLA_CLIENT
-        NS_TraceStack(1, dumpfp);
-#endif
-        JS_DHashTableDumpMeter(table, NULL, dumpfp);
-        fputc('\n', dumpfp);
-    }
-#endif
-
-    /* Call finalize before clearing entries, so it can enumerate them. */
-    table->ops->finalize(table);
-
-    /* Clear any remaining live entries. */
-    entryAddr = table->entryStore;
-    entrySize = table->entrySize;
-    entryLimit = entryAddr + JS_DHASH_TABLE_SIZE(table) * entrySize;
-    while (entryAddr < entryLimit) {
-        entry = (JSDHashEntryHdr *)entryAddr;
-        if (ENTRY_IS_LIVE(entry)) {
-            METER(table->stats.removeEnums++);
-            table->ops->clearEntry(table, entry);
-        }
-        entryAddr += entrySize;
-    }
-
-    /* Free entry storage last. */
-    table->ops->freeTable(table, table->entryStore);
-}
-
-static JSDHashEntryHdr * JS_DHASH_FASTCALL
-SearchTable(JSDHashTable *table, const void *key, JSDHashNumber keyHash,
-            JSDHashOperator op)
-{
-    JSDHashNumber hash1, hash2;
-    int hashShift, sizeLog2;
-    JSDHashEntryHdr *entry, *firstRemoved;
-    JSDHashMatchEntry matchEntry;
-    uint32 sizeMask;
-
-    METER(table->stats.searches++);
-    JS_ASSERT(!(keyHash & COLLISION_FLAG));
-
-    /* Compute the primary hash address. */
-    hashShift = table->hashShift;
-    hash1 = HASH1(keyHash, hashShift);
-    entry = ADDRESS_ENTRY(table, hash1);
-
-    /* Miss: return space for a new entry. */
-    if (JS_DHASH_ENTRY_IS_FREE(entry)) {
-        METER(table->stats.misses++);
-        return entry;
-    }
-
-    /* Hit: return entry. */
-    matchEntry = table->ops->matchEntry;
-    if (MATCH_ENTRY_KEYHASH(entry, keyHash) && matchEntry(table, entry, key)) {
-        METER(table->stats.hits++);
-        return entry;
-    }
-
-    /* Collision: double hash. */
-    sizeLog2 = JS_DHASH_BITS - table->hashShift;
-    hash2 = HASH2(keyHash, sizeLog2, hashShift);
-    sizeMask = JS_BITMASK(sizeLog2);
-
-    /* Save the first removed entry pointer so JS_DHASH_ADD can recycle it. */
-    if (ENTRY_IS_REMOVED(entry)) {
-        firstRemoved = entry;
-    } else {
-        firstRemoved = NULL;
-        if (op == JS_DHASH_ADD)
-            entry->keyHash |= COLLISION_FLAG;
-    }
-
-    for (;;) {
-        METER(table->stats.steps++);
-        hash1 -= hash2;
-        hash1 &= sizeMask;
-
-        entry = ADDRESS_ENTRY(table, hash1);
-        if (JS_DHASH_ENTRY_IS_FREE(entry)) {
-            METER(table->stats.misses++);
-            return (firstRemoved && op == JS_DHASH_ADD) ? firstRemoved : entry;
-        }
-
-        if (MATCH_ENTRY_KEYHASH(entry, keyHash) &&
-            matchEntry(table, entry, key)) {
-            METER(table->stats.hits++);
-            return entry;
-        }
-
-        if (ENTRY_IS_REMOVED(entry)) {
-            if (!firstRemoved)
-                firstRemoved = entry;
-        } else {
-            if (op == JS_DHASH_ADD)
-                entry->keyHash |= COLLISION_FLAG;
-        }
-    }
-
-    /* NOTREACHED */
-    return NULL;
-}
-
-static JSBool
-ChangeTable(JSDHashTable *table, int deltaLog2)
-{
-    int oldLog2, newLog2;
-    uint32 oldCapacity, newCapacity;
-    char *newEntryStore, *oldEntryStore, *oldEntryAddr;
-    uint32 entrySize, i, nbytes;
-    JSDHashEntryHdr *oldEntry, *newEntry;
-    JSDHashGetKey getKey;
-    JSDHashMoveEntry moveEntry;
-
-    /* Look, but don't touch, until we succeed in getting new entry store. */
-    oldLog2 = JS_DHASH_BITS - table->hashShift;
-    newLog2 = oldLog2 + deltaLog2;
-    oldCapacity = JS_BIT(oldLog2);
-    newCapacity = JS_BIT(newLog2);
-    if (newCapacity >= JS_DHASH_SIZE_LIMIT)
-        return JS_FALSE;
-    entrySize = table->entrySize;
-    nbytes = newCapacity * entrySize;
-
-    newEntryStore = table->ops->allocTable(table, nbytes);
-    if (!newEntryStore)
-        return JS_FALSE;
-
-    /* We can't fail from here on, so update table parameters. */
-    table->hashShift = JS_DHASH_BITS - newLog2;
-    table->removedCount = 0;
-    table->generation++;
-
-    /* Assign the new entry store to table. */
-    memset(newEntryStore, 0, nbytes);
-    oldEntryAddr = oldEntryStore = table->entryStore;
-    table->entryStore = newEntryStore;
-    getKey = table->ops->getKey;
-    moveEntry = table->ops->moveEntry;
-
-    /* Copy only live entries, leaving removed ones behind. */
-    for (i = 0; i < oldCapacity; i++) {
-        oldEntry = (JSDHashEntryHdr *)oldEntryAddr;
-        if (ENTRY_IS_LIVE(oldEntry)) {
-            oldEntry->keyHash &= ~COLLISION_FLAG;
-            newEntry = SearchTable(table, getKey(table, oldEntry),
-                                   oldEntry->keyHash, JS_DHASH_ADD);
-            JS_ASSERT(JS_DHASH_ENTRY_IS_FREE(newEntry));
-            moveEntry(table, oldEntry, newEntry);
-            newEntry->keyHash = oldEntry->keyHash;
-        }
-        oldEntryAddr += entrySize;
-    }
-
-    table->ops->freeTable(table, oldEntryStore);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSDHashEntryHdr *) JS_DHASH_FASTCALL
-JS_DHashTableOperate(JSDHashTable *table, const void *key, JSDHashOperator op)
-{
-    JSDHashNumber keyHash;
-    JSDHashEntryHdr *entry;
-    uint32 size;
-    int deltaLog2;
-
-    keyHash = table->ops->hashKey(table, key);
-    keyHash *= JS_DHASH_GOLDEN_RATIO;
-
-    /* Avoid 0 and 1 hash codes, they indicate free and removed entries. */
-    ENSURE_LIVE_KEYHASH(keyHash);
-    keyHash &= ~COLLISION_FLAG;
-
-    switch (op) {
-      case JS_DHASH_LOOKUP:
-        METER(table->stats.lookups++);
-        entry = SearchTable(table, key, keyHash, op);
-        break;
-
-      case JS_DHASH_ADD:
-        /*
-         * If alpha is >= .75, grow or compress the table.  If key is already
-         * in the table, we may grow once more than necessary, but only if we
-         * are on the edge of being overloaded.
-         */
-        size = JS_DHASH_TABLE_SIZE(table);
-        if (table->entryCount + table->removedCount >= MAX_LOAD(table, size)) {
-            /* Compress if a quarter or more of all entries are removed. */
-            if (table->removedCount >= size >> 2) {
-                METER(table->stats.compresses++);
-                deltaLog2 = 0;
-            } else {
-                METER(table->stats.grows++);
-                deltaLog2 = 1;
-            }
-
-            /*
-             * Grow or compress table, returning null if ChangeTable fails and
-             * falling through might claim the last free entry.
-             */
-            if (!ChangeTable(table, deltaLog2) &&
-                table->entryCount + table->removedCount == size - 1) {
-                METER(table->stats.addFailures++);
-                return NULL;
-            }
-        }
-
-        /*
-         * Look for entry after possibly growing, so we don't have to add it,
-         * then skip it while growing the table and re-add it after.
-         */
-        entry = SearchTable(table, key, keyHash, op);
-        if (!ENTRY_IS_LIVE(entry)) {
-            /* Initialize the entry, indicating that it's no longer free. */
-            METER(table->stats.addMisses++);
-            if (ENTRY_IS_REMOVED(entry)) {
-                METER(table->stats.addOverRemoved++);
-                table->removedCount--;
-                keyHash |= COLLISION_FLAG;
-            }
-            if (table->ops->initEntry &&
-                !table->ops->initEntry(table, entry, key)) {
-                /* We haven't claimed entry yet; fail with null return. */
-                memset(entry + 1, 0, table->entrySize - sizeof *entry);
-                return NULL;
-            }
-            entry->keyHash = keyHash;
-            table->entryCount++;
-        }
-        METER(else table->stats.addHits++);
-        break;
-
-      case JS_DHASH_REMOVE:
-        entry = SearchTable(table, key, keyHash, op);
-        if (ENTRY_IS_LIVE(entry)) {
-            /* Clear this entry and mark it as "removed". */
-            METER(table->stats.removeHits++);
-            JS_DHashTableRawRemove(table, entry);
-
-            /* Shrink if alpha is <= .25 and table isn't too small already. */
-            size = JS_DHASH_TABLE_SIZE(table);
-            if (size > JS_DHASH_MIN_SIZE &&
-                table->entryCount <= MIN_LOAD(table, size)) {
-                METER(table->stats.shrinks++);
-                (void) ChangeTable(table, -1);
-            }
-        }
-        METER(else table->stats.removeMisses++);
-        entry = NULL;
-        break;
-
-      default:
-        JS_ASSERT(0);
-        entry = NULL;
-    }
-
-    return entry;
-}
-
-JS_PUBLIC_API(void)
-JS_DHashTableRawRemove(JSDHashTable *table, JSDHashEntryHdr *entry)
-{
-    JSDHashNumber keyHash;      /* load first in case clearEntry goofs it */
-
-    JS_ASSERT(JS_DHASH_ENTRY_IS_LIVE(entry));
-    keyHash = entry->keyHash;
-    table->ops->clearEntry(table, entry);
-    if (keyHash & COLLISION_FLAG) {
-        MARK_ENTRY_REMOVED(entry);
-        table->removedCount++;
-    } else {
-        METER(table->stats.removeFrees++);
-        MARK_ENTRY_FREE(entry);
-    }
-    table->entryCount--;
-}
-
-JS_PUBLIC_API(uint32)
-JS_DHashTableEnumerate(JSDHashTable *table, JSDHashEnumerator etor, void *arg)
-{
-    char *entryAddr, *entryLimit;
-    uint32 i, capacity, entrySize, ceiling;
-    JSBool didRemove;
-    JSDHashEntryHdr *entry;
-    JSDHashOperator op;
-
-    entryAddr = table->entryStore;
-    entrySize = table->entrySize;
-    capacity = JS_DHASH_TABLE_SIZE(table);
-    entryLimit = entryAddr + capacity * entrySize;
-    i = 0;
-    didRemove = JS_FALSE;
-    while (entryAddr < entryLimit) {
-        entry = (JSDHashEntryHdr *)entryAddr;
-        if (ENTRY_IS_LIVE(entry)) {
-            op = etor(table, entry, i++, arg);
-            if (op & JS_DHASH_REMOVE) {
-                METER(table->stats.removeEnums++);
-                JS_DHashTableRawRemove(table, entry);
-                didRemove = JS_TRUE;
-            }
-            if (op & JS_DHASH_STOP)
-                break;
-        }
-        entryAddr += entrySize;
-    }
-
-    /*
-     * Shrink or compress if a quarter or more of all entries are removed, or
-     * if the table is underloaded according to the configured minimum alpha,
-     * and is not minimal-size already.  Do this only if we removed above, so
-     * non-removing enumerations can count on stable table->entryStore until
-     * the next non-lookup-Operate or removing-Enumerate.
-     */
-    if (didRemove &&
-        (table->removedCount >= capacity >> 2 ||
-         (capacity > JS_DHASH_MIN_SIZE &&
-          table->entryCount <= MIN_LOAD(table, capacity)))) {
-        METER(table->stats.enumShrinks++);
-        capacity = table->entryCount;
-        capacity += capacity >> 1;
-        if (capacity < JS_DHASH_MIN_SIZE)
-            capacity = JS_DHASH_MIN_SIZE;
-
-        JS_CEILING_LOG2(ceiling, capacity);
-        ceiling -= JS_DHASH_BITS - table->hashShift;
-
-        (void) ChangeTable(table, ceiling);
-    }
-    return i;
-}
-
-#ifdef JS_DHASHMETER
-#include <math.h>
-
-JS_PUBLIC_API(void)
-JS_DHashTableDumpMeter(JSDHashTable *table, JSDHashEnumerator dump, FILE *fp)
-{
-    char *entryAddr;
-    uint32 entrySize, entryCount;
-    int hashShift, sizeLog2;
-    uint32 i, tableSize, sizeMask, chainLen, maxChainLen, chainCount;
-    JSDHashNumber hash1, hash2, saveHash1, maxChainHash1, maxChainHash2;
-    double sqsum, mean, variance, sigma;
-    JSDHashEntryHdr *entry, *probe;
-
-    entryAddr = table->entryStore;
-    entrySize = table->entrySize;
-    hashShift = table->hashShift;
-    sizeLog2 = JS_DHASH_BITS - hashShift;
-    tableSize = JS_DHASH_TABLE_SIZE(table);
-    sizeMask = JS_BITMASK(sizeLog2);
-    chainCount = maxChainLen = 0;
-    hash2 = 0;
-    sqsum = 0;
-
-    for (i = 0; i < tableSize; i++) {
-        entry = (JSDHashEntryHdr *)entryAddr;
-        entryAddr += entrySize;
-        if (!ENTRY_IS_LIVE(entry))
-            continue;
-        hash1 = HASH1(entry->keyHash & ~COLLISION_FLAG, hashShift);
-        saveHash1 = hash1;
-        probe = ADDRESS_ENTRY(table, hash1);
-        chainLen = 1;
-        if (probe == entry) {
-            /* Start of a (possibly unit-length) chain. */
-            chainCount++;
-        } else {
-            hash2 = HASH2(entry->keyHash & ~COLLISION_FLAG, sizeLog2,
-                          hashShift);
-            do {
-                chainLen++;
-                hash1 -= hash2;
-                hash1 &= sizeMask;
-                probe = ADDRESS_ENTRY(table, hash1);
-            } while (probe != entry);
-        }
-        sqsum += chainLen * chainLen;
-        if (chainLen > maxChainLen) {
-            maxChainLen = chainLen;
-            maxChainHash1 = saveHash1;
-            maxChainHash2 = hash2;
-        }
-    }
-
-    entryCount = table->entryCount;
-    if (entryCount && chainCount) {
-        mean = (double)entryCount / chainCount;
-        variance = chainCount * sqsum - entryCount * entryCount;
-        if (variance < 0 || chainCount == 1)
-            variance = 0;
-        else
-            variance /= chainCount * (chainCount - 1);
-        sigma = sqrt(variance);
-    } else {
-        mean = sigma = 0;
-    }
-
-    fprintf(fp, "Double hashing statistics:\n");
-    fprintf(fp, "    table size (in entries): %u\n", tableSize);
-    fprintf(fp, "          number of entries: %u\n", table->entryCount);
-    fprintf(fp, "  number of removed entries: %u\n", table->removedCount);
-    fprintf(fp, "         number of searches: %u\n", table->stats.searches);
-    fprintf(fp, "             number of hits: %u\n", table->stats.hits);
-    fprintf(fp, "           number of misses: %u\n", table->stats.misses);
-    fprintf(fp, "      mean steps per search: %g\n", table->stats.searches ?
-                                                     (double)table->stats.steps
-                                                     / table->stats.searches :
-                                                     0.);
-    fprintf(fp, "     mean hash chain length: %g\n", mean);
-    fprintf(fp, "         standard deviation: %g\n", sigma);
-    fprintf(fp, "  maximum hash chain length: %u\n", maxChainLen);
-    fprintf(fp, "          number of lookups: %u\n", table->stats.lookups);
-    fprintf(fp, " adds that made a new entry: %u\n", table->stats.addMisses);
-    fprintf(fp, "adds that recycled removeds: %u\n", table->stats.addOverRemoved);
-    fprintf(fp, "   adds that found an entry: %u\n", table->stats.addHits);
-    fprintf(fp, "               add failures: %u\n", table->stats.addFailures);
-    fprintf(fp, "             useful removes: %u\n", table->stats.removeHits);
-    fprintf(fp, "            useless removes: %u\n", table->stats.removeMisses);
-    fprintf(fp, "removes that freed an entry: %u\n", table->stats.removeFrees);
-    fprintf(fp, "  removes while enumerating: %u\n", table->stats.removeEnums);
-    fprintf(fp, "            number of grows: %u\n", table->stats.grows);
-    fprintf(fp, "          number of shrinks: %u\n", table->stats.shrinks);
-    fprintf(fp, "       number of compresses: %u\n", table->stats.compresses);
-    fprintf(fp, "number of enumerate shrinks: %u\n", table->stats.enumShrinks);
-
-    if (dump && maxChainLen && hash2) {
-        fputs("Maximum hash chain:\n", fp);
-        hash1 = maxChainHash1;
-        hash2 = maxChainHash2;
-        entry = ADDRESS_ENTRY(table, hash1);
-        i = 0;
-        do {
-            if (dump(table, entry, i++, fp) != JS_DHASH_NEXT)
-                break;
-            hash1 -= hash2;
-            hash1 &= sizeMask;
-            entry = ADDRESS_ENTRY(table, hash1);
-        } while (JS_DHASH_ENTRY_IS_BUSY(entry));
-    }
-}
-#endif /* JS_DHASHMETER */
diff --git a/libs/js/src/jsdhash.h b/libs/js/src/jsdhash.h
deleted file mode 100644
index 42a7993c71..0000000000
--- a/libs/js/src/jsdhash.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla JavaScript code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brendan Eich <brendan@mozilla.org> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsdhash_h___
-#define jsdhash_h___
-/*
- * Double hashing, a la Knuth 6.
- */
-#include "jstypes.h"
-
-JS_BEGIN_EXTERN_C
-
-#if defined(__GNUC__) && defined(__i386__) && (__GNUC__ >= 3) && !defined(XP_OS2) && !defined(XP_MACOSX)
-#define JS_DHASH_FASTCALL __attribute__ ((regparm (3),stdcall))
-#else
-#define JS_DHASH_FASTCALL
-#endif
-
-#ifdef DEBUG_XXXbrendan
-#define JS_DHASHMETER 1
-#endif
-
-/* Table size limit, do not equal or exceed (see min&maxAlphaFrac, below). */
-#undef JS_DHASH_SIZE_LIMIT
-#define JS_DHASH_SIZE_LIMIT     JS_BIT(24)
-
-/* Minimum table size, or gross entry count (net is at most .75 loaded). */
-#ifndef JS_DHASH_MIN_SIZE
-#define JS_DHASH_MIN_SIZE 16
-#elif (JS_DHASH_MIN_SIZE & (JS_DHASH_MIN_SIZE - 1)) != 0
-#error "JS_DHASH_MIN_SIZE must be a power of two!"
-#endif
-
-/*
- * Multiplicative hash uses an unsigned 32 bit integer and the golden ratio,
- * expressed as a fixed-point 32-bit fraction.
- */
-#define JS_DHASH_BITS           32
-#define JS_DHASH_GOLDEN_RATIO   0x9E3779B9U
-
-/* Primitive and forward-struct typedefs. */
-typedef uint32                  JSDHashNumber;
-typedef struct JSDHashEntryHdr  JSDHashEntryHdr;
-typedef struct JSDHashEntryStub JSDHashEntryStub;
-typedef struct JSDHashTable     JSDHashTable;
-typedef struct JSDHashTableOps  JSDHashTableOps;
-
-/*
- * Table entry header structure.
- *
- * In order to allow in-line allocation of key and value, we do not declare
- * either here.  Instead, the API uses const void *key as a formal parameter,
- * and asks each entry for its key when necessary via a getKey callback, used
- * when growing or shrinking the table.  Other callback types are defined
- * below and grouped into the JSDHashTableOps structure, for single static
- * initialization per hash table sub-type.
- *
- * Each hash table sub-type should nest the JSDHashEntryHdr structure at the
- * front of its particular entry type.  The keyHash member contains the result
- * of multiplying the hash code returned from the hashKey callback (see below)
- * by JS_DHASH_GOLDEN_RATIO, then constraining the result to avoid the magic 0
- * and 1 values.  The stored keyHash value is table size invariant, and it is
- * maintained automatically by JS_DHashTableOperate -- users should never set
- * it, and its only uses should be via the entry macros below.
- *
- * The JS_DHASH_ENTRY_IS_LIVE macro tests whether entry is neither free nor
- * removed.  An entry may be either busy or free; if busy, it may be live or
- * removed.  Consumers of this API should not access members of entries that
- * are not live.
- *
- * However, use JS_DHASH_ENTRY_IS_BUSY for faster liveness testing of entries
- * returned by JS_DHashTableOperate, as JS_DHashTableOperate never returns a
- * non-live, busy (i.e., removed) entry pointer to its caller.  See below for
- * more details on JS_DHashTableOperate's calling rules.
- */
-struct JSDHashEntryHdr {
-    JSDHashNumber       keyHash;        /* every entry must begin like this */
-};
-
-#define JS_DHASH_ENTRY_IS_FREE(entry)   ((entry)->keyHash == 0)
-#define JS_DHASH_ENTRY_IS_BUSY(entry)   (!JS_DHASH_ENTRY_IS_FREE(entry))
-#define JS_DHASH_ENTRY_IS_LIVE(entry)   ((entry)->keyHash >= 2)
-
-/*
- * A JSDHashTable is currently 8 words (without the JS_DHASHMETER overhead)
- * on most architectures, and may be allocated on the stack or within another
- * structure or class (see below for the Init and Finish functions to use).
- *
- * To decide whether to use double hashing vs. chaining, we need to develop a
- * trade-off relation, as follows:
- *
- * Let alpha be the load factor, esize the entry size in words, count the
- * entry count, and pow2 the power-of-two table size in entries.
- *
- *   (JSDHashTable overhead)    > (JSHashTable overhead)
- *   (unused table entry space) > (malloc and .next overhead per entry) +
- *                                (buckets overhead)
- *   (1 - alpha) * esize * pow2 > 2 * count + pow2
- *
- * Notice that alpha is by definition (count / pow2):
- *
- *   (1 - alpha) * esize * pow2 > 2 * alpha * pow2 + pow2
- *   (1 - alpha) * esize        > 2 * alpha + 1
- *
- *   esize > (1 + 2 * alpha) / (1 - alpha)
- *
- * This assumes both tables must keep keyHash, key, and value for each entry,
- * where key and value point to separately allocated strings or structures.
- * If key and value can be combined into one pointer, then the trade-off is:
- *
- *   esize > (1 + 3 * alpha) / (1 - alpha)
- *
- * If the entry value can be a subtype of JSDHashEntryHdr, rather than a type
- * that must be allocated separately and referenced by an entry.value pointer
- * member, and provided key's allocation can be fused with its entry's, then
- * k (the words wasted per entry with chaining) is 4.
- *
- * To see these curves, feed gnuplot input like so:
- *
- *   gnuplot> f(x,k) = (1 + k * x) / (1 - x)
- *   gnuplot> plot [0:.75] f(x,2), f(x,3), f(x,4)
- *
- * For k of 2 and a well-loaded table (alpha > .5), esize must be more than 4
- * words for chaining to be more space-efficient than double hashing.
- *
- * Solving for alpha helps us decide when to shrink an underloaded table:
- *
- *   esize                     > (1 + k * alpha) / (1 - alpha)
- *   esize - alpha * esize     > 1 + k * alpha
- *   esize - 1                 > (k + esize) * alpha
- *   (esize - 1) / (k + esize) > alpha
- *
- *   alpha < (esize - 1) / (esize + k)
- *
- * Therefore double hashing should keep alpha >= (esize - 1) / (esize + k),
- * assuming esize is not too large (in which case, chaining should probably be
- * used for any alpha).  For esize=2 and k=3, we want alpha >= .2; for esize=3
- * and k=2, we want alpha >= .4.  For k=4, esize could be 6, and alpha >= .5
- * would still obtain.  See the JS_DHASH_MIN_ALPHA macro further below.
- *
- * The current implementation uses a configurable lower bound on alpha, which
- * defaults to .25, when deciding to shrink the table (while still respecting
- * JS_DHASH_MIN_SIZE).
- *
- * Note a qualitative difference between chaining and double hashing: under
- * chaining, entry addresses are stable across table shrinks and grows.  With
- * double hashing, you can't safely hold an entry pointer and use it after an
- * ADD or REMOVE operation, unless you sample table->generation before adding
- * or removing, and compare the sample after, dereferencing the entry pointer
- * only if table->generation has not changed.
- *
- * The moral of this story: there is no one-size-fits-all hash table scheme,
- * but for small table entry size, and assuming entry address stability is not
- * required, double hashing wins.
- */
-struct JSDHashTable {
-    const JSDHashTableOps *ops;         /* virtual operations, see below */
-    void                *data;          /* ops- and instance-specific data */
-    int16               hashShift;      /* multiplicative hash shift */
-    uint8               maxAlphaFrac;   /* 8-bit fixed point max alpha */
-    uint8               minAlphaFrac;   /* 8-bit fixed point min alpha */
-    uint32              entrySize;      /* number of bytes in an entry */
-    uint32              entryCount;     /* number of entries in table */
-    uint32              removedCount;   /* removed entry sentinels in table */
-    uint32              generation;     /* entry storage generation number */
-    char                *entryStore;    /* entry storage */
-#ifdef JS_DHASHMETER
-    struct JSDHashStats {
-        uint32          searches;       /* total number of table searches */
-        uint32          steps;          /* hash chain links traversed */
-        uint32          hits;           /* searches that found key */
-        uint32          misses;         /* searches that didn't find key */
-        uint32          lookups;        /* number of JS_DHASH_LOOKUPs */
-        uint32          addMisses;      /* adds that miss, and do work */
-        uint32          addOverRemoved; /* adds that recycled a removed entry */
-        uint32          addHits;        /* adds that hit an existing entry */
-        uint32          addFailures;    /* out-of-memory during add growth */
-        uint32          removeHits;     /* removes that hit, and do work */
-        uint32          removeMisses;   /* useless removes that miss */
-        uint32          removeFrees;    /* removes that freed entry directly */
-        uint32          removeEnums;    /* removes done by Enumerate */
-        uint32          grows;          /* table expansions */
-        uint32          shrinks;        /* table contractions */
-        uint32          compresses;     /* table compressions */
-        uint32          enumShrinks;    /* contractions after Enumerate */
-    } stats;
-#endif
-};
-
-/*
- * Size in entries (gross, not net of free and removed sentinels) for table.
- * We store hashShift rather than sizeLog2 to optimize the collision-free case
- * in SearchTable.
- */
-#define JS_DHASH_TABLE_SIZE(table)  JS_BIT(JS_DHASH_BITS - (table)->hashShift)
-
-/*
- * Table space at entryStore is allocated and freed using these callbacks.
- * The allocator should return null on error only (not if called with nbytes
- * equal to 0; but note that jsdhash.c code will never call with 0 nbytes).
- */
-typedef void *
-(* JS_DLL_CALLBACK JSDHashAllocTable)(JSDHashTable *table, uint32 nbytes);
-
-typedef void
-(* JS_DLL_CALLBACK JSDHashFreeTable) (JSDHashTable *table, void *ptr);
-
-/*
- * When a table grows or shrinks, each entry is queried for its key using this
- * callback.  NB: in that event, entry is not in table any longer; it's in the
- * old entryStore vector, which is due to be freed once all entries have been
- * moved via moveEntry callbacks.
- */
-typedef const void *
-(* JS_DLL_CALLBACK JSDHashGetKey)    (JSDHashTable *table,
-                                      JSDHashEntryHdr *entry);
-
-/*
- * Compute the hash code for a given key to be looked up, added, or removed
- * from table.  A hash code may have any JSDHashNumber value.
- */
-typedef JSDHashNumber
-(* JS_DLL_CALLBACK JSDHashHashKey)   (JSDHashTable *table, const void *key);
-
-/*
- * Compare the key identifying entry in table with the provided key parameter.
- * Return JS_TRUE if keys match, JS_FALSE otherwise.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSDHashMatchEntry)(JSDHashTable *table,
-                                      const JSDHashEntryHdr *entry,
-                                      const void *key);
-
-/*
- * Copy the data starting at from to the new entry storage at to.  Do not add
- * reference counts for any strong references in the entry, however, as this
- * is a "move" operation: the old entry storage at from will be freed without
- * any reference-decrementing callback shortly.
- */
-typedef void
-(* JS_DLL_CALLBACK JSDHashMoveEntry)(JSDHashTable *table,
-                                     const JSDHashEntryHdr *from,
-                                     JSDHashEntryHdr *to);
-
-/*
- * Clear the entry and drop any strong references it holds.  This callback is
- * invoked during a JS_DHASH_REMOVE operation (see below for operation codes),
- * but only if the given key is found in the table.
- */
-typedef void
-(* JS_DLL_CALLBACK JSDHashClearEntry)(JSDHashTable *table,
-                                      JSDHashEntryHdr *entry);
-
-/*
- * Called when a table (whether allocated dynamically by itself, or nested in
- * a larger structure, or allocated on the stack) is finished.  This callback
- * allows table->ops-specific code to finalize table->data.
- */
-typedef void
-(* JS_DLL_CALLBACK JSDHashFinalize)  (JSDHashTable *table);
-
-/*
- * Initialize a new entry, apart from keyHash.  This function is called when
- * JS_DHashTableOperate's JS_DHASH_ADD case finds no existing entry for the
- * given key, and must add a new one.  At that point, entry->keyHash is not
- * set yet, to avoid claiming the last free entry in a severely overloaded
- * table.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSDHashInitEntry)(JSDHashTable *table,
-                                     JSDHashEntryHdr *entry,
-                                     const void *key);
-
-/*
- * Finally, the "vtable" structure for JSDHashTable.  The first eight hooks
- * must be provided by implementations; they're called unconditionally by the
- * generic jsdhash.c code.  Hooks after these may be null.
- *
- * Summary of allocation-related hook usage with C++ placement new emphasis:
- *  allocTable          Allocate raw bytes with malloc, no ctors run.
- *  freeTable           Free raw bytes with free, no dtors run.
- *  initEntry           Call placement new using default key-based ctor.
- *                      Return JS_TRUE on success, JS_FALSE on error.
- *  moveEntry           Call placement new using copy ctor, run dtor on old
- *                      entry storage.
- *  clearEntry          Run dtor on entry.
- *  finalize            Stub unless table->data was initialized and needs to
- *                      be finalized.
- *
- * Note the reason why initEntry is optional: the default hooks (stubs) clear
- * entry storage:  On successful JS_DHashTableOperate(tbl, key, JS_DHASH_ADD),
- * the returned entry pointer addresses an entry struct whose keyHash member
- * has been set non-zero, but all other entry members are still clear (null).
- * JS_DHASH_ADD callers can test such members to see whether the entry was
- * newly created by the JS_DHASH_ADD call that just succeeded.  If placement
- * new or similar initialization is required, define an initEntry hook.  Of
- * course, the clearEntry hook must zero or null appropriately.
- *
- * XXX assumes 0 is null for pointer types.
- */
-struct JSDHashTableOps {
-    /* Mandatory hooks.  All implementations must provide these. */
-    JSDHashAllocTable   allocTable;
-    JSDHashFreeTable    freeTable;
-    JSDHashGetKey       getKey;
-    JSDHashHashKey      hashKey;
-    JSDHashMatchEntry   matchEntry;
-    JSDHashMoveEntry    moveEntry;
-    JSDHashClearEntry   clearEntry;
-    JSDHashFinalize     finalize;
-
-    /* Optional hooks start here.  If null, these are not called. */
-    JSDHashInitEntry    initEntry;
-};
-
-/*
- * Default implementations for the above ops.
- */
-extern JS_PUBLIC_API(void *)
-JS_DHashAllocTable(JSDHashTable *table, uint32 nbytes);
-
-extern JS_PUBLIC_API(void)
-JS_DHashFreeTable(JSDHashTable *table, void *ptr);
-
-extern JS_PUBLIC_API(JSDHashNumber)
-JS_DHashStringKey(JSDHashTable *table, const void *key);
-
-/* A minimal entry contains a keyHash header and a void key pointer. */
-struct JSDHashEntryStub {
-    JSDHashEntryHdr hdr;
-    const void      *key;
-};
-
-extern JS_PUBLIC_API(const void *)
-JS_DHashGetKeyStub(JSDHashTable *table, JSDHashEntryHdr *entry);
-
-extern JS_PUBLIC_API(JSDHashNumber)
-JS_DHashVoidPtrKeyStub(JSDHashTable *table, const void *key);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DHashMatchEntryStub(JSDHashTable *table,
-                       const JSDHashEntryHdr *entry,
-                       const void *key);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DHashMatchStringKey(JSDHashTable *table,
-                       const JSDHashEntryHdr *entry,
-                       const void *key);
-
-extern JS_PUBLIC_API(void)
-JS_DHashMoveEntryStub(JSDHashTable *table,
-                      const JSDHashEntryHdr *from,
-                      JSDHashEntryHdr *to);
-
-extern JS_PUBLIC_API(void)
-JS_DHashClearEntryStub(JSDHashTable *table, JSDHashEntryHdr *entry);
-
-extern JS_PUBLIC_API(void)
-JS_DHashFreeStringKey(JSDHashTable *table, JSDHashEntryHdr *entry);
-
-extern JS_PUBLIC_API(void)
-JS_DHashFinalizeStub(JSDHashTable *table);
-
-/*
- * If you use JSDHashEntryStub or a subclass of it as your entry struct, and
- * if your entries move via memcpy and clear via memset(0), you can use these
- * stub operations.
- */
-extern JS_PUBLIC_API(const JSDHashTableOps *)
-JS_DHashGetStubOps(void);
-
-/*
- * Dynamically allocate a new JSDHashTable using malloc, initialize it using
- * JS_DHashTableInit, and return its address.  Return null on malloc failure.
- * Note that the entry storage at table->entryStore will be allocated using
- * the ops->allocTable callback.
- */
-extern JS_PUBLIC_API(JSDHashTable *)
-JS_NewDHashTable(const JSDHashTableOps *ops, void *data, uint32 entrySize,
-                 uint32 capacity);
-
-/*
- * Finalize table's data, free its entry storage (via table->ops->freeTable),
- * and return the memory starting at table to the malloc heap.
- */
-extern JS_PUBLIC_API(void)
-JS_DHashTableDestroy(JSDHashTable *table);
-
-/*
- * Initialize table with ops, data, entrySize, and capacity.  Capacity is a
- * guess for the smallest table size at which the table will usually be less
- * than 75% loaded (the table will grow or shrink as needed; capacity serves
- * only to avoid inevitable early growth from JS_DHASH_MIN_SIZE).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_DHashTableInit(JSDHashTable *table, const JSDHashTableOps *ops, void *data,
-                  uint32 entrySize, uint32 capacity);
-
-/*
- * Set maximum and minimum alpha for table.  The defaults are 0.75 and .25.
- * maxAlpha must be in [0.5, 0.9375] for the default JS_DHASH_MIN_SIZE; or if
- * MinSize=JS_DHASH_MIN_SIZE <= 256, in [0.5, (float)(MinSize-1)/MinSize]; or
- * else in [0.5, 255.0/256].  minAlpha must be in [0, maxAlpha / 2), so that
- * we don't shrink on the very next remove after growing a table upon adding
- * an entry that brings entryCount past maxAlpha * tableSize.
- */
-extern JS_PUBLIC_API(void)
-JS_DHashTableSetAlphaBounds(JSDHashTable *table,
-                            float maxAlpha,
-                            float minAlpha);
-
-/*
- * Call this macro with k, the number of pointer-sized words wasted per entry
- * under chaining, to compute the minimum alpha at which double hashing still
- * beats chaining.
- */
-#define JS_DHASH_MIN_ALPHA(table, k)                                          \
-    ((float)((table)->entrySize / sizeof(void *) - 1)                         \
-     / ((table)->entrySize / sizeof(void *) + (k)))
-
-/*
- * Finalize table's data, free its entry storage using table->ops->freeTable,
- * and leave its members unchanged from their last live values (which leaves
- * pointers dangling).  If you want to burn cycles clearing table, it's up to
- * your code to call memset.
- */
-extern JS_PUBLIC_API(void)
-JS_DHashTableFinish(JSDHashTable *table);
-
-/*
- * To consolidate keyHash computation and table grow/shrink code, we use a
- * single entry point for lookup, add, and remove operations.  The operation
- * codes are declared here, along with codes returned by JSDHashEnumerator
- * functions, which control JS_DHashTableEnumerate's behavior.
- */
-typedef enum JSDHashOperator {
-    JS_DHASH_LOOKUP = 0,        /* lookup entry */
-    JS_DHASH_ADD = 1,           /* add entry */
-    JS_DHASH_REMOVE = 2,        /* remove entry, or enumerator says remove */
-    JS_DHASH_NEXT = 0,          /* enumerator says continue */
-    JS_DHASH_STOP = 1           /* enumerator says stop */
-} JSDHashOperator;
-
-/*
- * To lookup a key in table, call:
- *
- *  entry = JS_DHashTableOperate(table, key, JS_DHASH_LOOKUP);
- *
- * If JS_DHASH_ENTRY_IS_BUSY(entry) is true, key was found and it identifies
- * entry.  If JS_DHASH_ENTRY_IS_FREE(entry) is true, key was not found.
- *
- * To add an entry identified by key to table, call:
- *
- *  entry = JS_DHashTableOperate(table, key, JS_DHASH_ADD);
- *
- * If entry is null upon return, then either the table is severely overloaded,
- * and memory can't be allocated for entry storage via table->ops->allocTable;
- * Or if table->ops->initEntry is non-null, the table->ops->initEntry op may
- * have returned false.
- *
- * Otherwise, entry->keyHash has been set so that JS_DHASH_ENTRY_IS_BUSY(entry)
- * is true, and it is up to the caller to initialize the key and value parts
- * of the entry sub-type, if they have not been set already (i.e. if entry was
- * not already in the table, and if the optional initEntry hook was not used).
- *
- * To remove an entry identified by key from table, call:
- *
- *  (void) JS_DHashTableOperate(table, key, JS_DHASH_REMOVE);
- *
- * If key's entry is found, it is cleared (via table->ops->clearEntry) and
- * the entry is marked so that JS_DHASH_ENTRY_IS_FREE(entry).  This operation
- * returns null unconditionally; you should ignore its return value.
- */
-extern JS_PUBLIC_API(JSDHashEntryHdr *) JS_DHASH_FASTCALL
-JS_DHashTableOperate(JSDHashTable *table, const void *key, JSDHashOperator op);
-
-/*
- * Remove an entry already accessed via LOOKUP or ADD.
- *
- * NB: this is a "raw" or low-level routine, intended to be used only where
- * the inefficiency of a full JS_DHashTableOperate (which rehashes in order
- * to find the entry given its key) is not tolerable.  This function does not
- * shrink the table if it is underloaded.  It does not update stats #ifdef
- * JS_DHASHMETER, either.
- */
-extern JS_PUBLIC_API(void)
-JS_DHashTableRawRemove(JSDHashTable *table, JSDHashEntryHdr *entry);
-
-/*
- * Enumerate entries in table using etor:
- *
- *   count = JS_DHashTableEnumerate(table, etor, arg);
- *
- * JS_DHashTableEnumerate calls etor like so:
- *
- *   op = etor(table, entry, number, arg);
- *
- * where number is a zero-based ordinal assigned to live entries according to
- * their order in table->entryStore.
- *
- * The return value, op, is treated as a set of flags.  If op is JS_DHASH_NEXT,
- * then continue enumerating.  If op contains JS_DHASH_REMOVE, then clear (via
- * table->ops->clearEntry) and free entry.  Then we check whether op contains
- * JS_DHASH_STOP; if so, stop enumerating and return the number of live entries
- * that were enumerated so far.  Return the total number of live entries when
- * enumeration completes normally.
- *
- * If etor calls JS_DHashTableOperate on table with op != JS_DHASH_LOOKUP, it
- * must return JS_DHASH_STOP; otherwise undefined behavior results.
- *
- * If any enumerator returns JS_DHASH_REMOVE, table->entryStore may be shrunk
- * or compressed after enumeration, but before JS_DHashTableEnumerate returns.
- * Such an enumerator therefore can't safely set aside entry pointers, but an
- * enumerator that never returns JS_DHASH_REMOVE can set pointers to entries
- * aside, e.g., to avoid copying live entries into an array of the entry type.
- * Copying entry pointers is cheaper, and safe so long as the caller of such a
- * "stable" Enumerate doesn't use the set-aside pointers after any call either
- * to PL_DHashTableOperate, or to an "unstable" form of Enumerate, which might
- * grow or shrink entryStore.
- *
- * If your enumerator wants to remove certain entries, but set aside pointers
- * to other entries that it retains, it can use JS_DHashTableRawRemove on the
- * entries to be removed, returning JS_DHASH_NEXT to skip them.  Likewise, if
- * you want to remove entries, but for some reason you do not want entryStore
- * to be shrunk or compressed, you can call JS_DHashTableRawRemove safely on
- * the entry being enumerated, rather than returning JS_DHASH_REMOVE.
- */
-typedef JSDHashOperator
-(* JS_DLL_CALLBACK JSDHashEnumerator)(JSDHashTable *table, JSDHashEntryHdr *hdr,
-                                      uint32 number, void *arg);
-
-extern JS_PUBLIC_API(uint32)
-JS_DHashTableEnumerate(JSDHashTable *table, JSDHashEnumerator etor, void *arg);
-
-#ifdef JS_DHASHMETER
-#include <stdio.h>
-
-extern JS_PUBLIC_API(void)
-JS_DHashTableDumpMeter(JSDHashTable *table, JSDHashEnumerator dump, FILE *fp);
-#endif
-
-JS_END_EXTERN_C
-
-#endif /* jsdhash_h___ */
diff --git a/libs/js/src/jsdso.c b/libs/js/src/jsdso.c
deleted file mode 100644
index 7480b90a1e..0000000000
--- a/libs/js/src/jsdso.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ATTENTION: This is an OSSP js extension to the Mozilla JavaScript engine.
-   It was implemented by Ralf S. Engelschall <rse@engelschall.com> for OSSP. */
-
-#if defined(OSSP) && defined(JS_HAS_DSO_OBJECT) && JS_HAS_DSO_OBJECT
-
-/* own headers (part 1/2) */
-#include "jsstddef.h"
-
-/* system headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-
-/* own headers (part 2/2) */
-#include "jstypes.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsobj.h"
-#include "jsdso.h"
-
-/* process local storage of DSO handles */
-static void *dso_handle[10000];
-
-/* type of the DSO load/unload functions */
-typedef JSBool (*dso_func_t)(JSContext *cx);
-
-/* ISO-C type coersion trick */
-typedef union { void *vp; dso_func_t fp; } dso_func_ptr_t;
-
-/* public C API function: DSO loading */
-JS_PUBLIC_API(JSBool)
-JS_DSOLoad(JSContext *cx, int *idp, const char *filename)
-{
-    int id;
-    void *handle;
-    dso_func_ptr_t func;
-    JSBool rc;
-
-    /* determine next free DSO handle slot */
-    for (id = 0; dso_handle[id] != NULL && id < sizeof(dso_handle)/sizeof(dso_handle[0]); id++)
-        ;
-    if (id == sizeof(dso_handle)/sizeof(dso_handle[0])) {
-        JS_ReportError(cx, "no more free DSO handle slots available");
-        return JS_FALSE;
-    }
-
-    /* load DSO into process */
-    if ((handle = dlopen(filename, RTLD_NOW)) == NULL) {
-        JS_ReportError(cx, "unable to load DSO \"%s\": %s", filename, dlerror());
-        return JS_FALSE;
-    }
-
-    /* resolve "js_DSO_load" function, call it and insist on a true return */
-    if ((func.vp = dlsym(handle, "js_DSO_load")) == NULL) {
-        JS_ReportError(cx, "unable to resolve symbol \"js_DSO_load\" in DSO \"%s\"", filename);
-        dlclose(handle);
-        return JS_FALSE;
-    }
-    rc = func.fp(cx);
-    if (!rc) {
-        JS_ReportError(cx, "function \"js_DSO_load\" in DSO \"%s\" returned error", filename);
-        dlclose(handle);
-        return JS_FALSE;
-    }
-
-    /* store DSO handle into process local storage */
-    dso_handle[id] = handle;
-
-    /* return DSO id to caller */
-    if (idp != NULL)
-        *idp = id;
-
-    return JS_TRUE;
-}
-
-/* public C API function: DSO unloading */
-JS_PUBLIC_API(JSBool)
-JS_DSOUnload(JSContext *cx, int id)
-{
-    int idx;
-    void *handle;
-    dso_func_ptr_t func;
-    JSBool rc;
-
-    /* sanity check DSO id */
-    if (id < 0 || id >= sizeof(dso_handle)/sizeof(dso_handle[0])) {
-        JS_ReportError(cx, "invalid argument: DSO id #%d out of range", id);
-        return JS_FALSE;
-    }
-
-    /* determine DSO handle */
-    if ((handle = dso_handle[id]) == NULL) {
-        JS_ReportError(cx, "invalid argument: DSO id #%d currently unused", id);
-        return JS_FALSE;
-    }
-
-    /* resolve "js_DSO_unload" function and (if available only)
-       call it and insist on a true return */
-    if ((func.vp = dlsym(handle, "js_DSO_unload")) != NULL) {
-        rc = func.fp(cx);
-        if (!rc) {
-            JS_ReportError(cx, "function \"js_DSO_unload\" in DSO with id #%d returned error", idx);
-            return JS_FALSE;
-        }
-    }
-
-    /* unload DSO from process */
-    dlclose(handle);
-
-    /* free DSO handle slot */
-    dso_handle[id] = NULL;
-
-    return JS_TRUE;
-}
-
-/* global JavaScript language DSO object method: id = DSO.load("filename.so") */
-static JSBool dso_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *filename;
-    char *c_filename;
-    int id;
-
-    /* usage sanity checks */
-    if (argc == 0) {
-        JS_ReportError(cx, "usage: id = DSO.load(filename)");
-        return JS_FALSE;
-    }
-    if (argc != 1) {
-        JS_ReportError(cx, "invalid number of arguments: %d received, %d expected", argc, 1);
-        return JS_FALSE;
-    }
-
-    /* determine filename */
-    if ((filename = js_ValueToString(cx, argv[0])) == NULL) {
-        JS_ReportError(cx, "invalid argument");
-        return JS_FALSE;
-    }
-    if ((c_filename = JS_GetStringBytes(filename)) == NULL) {
-        JS_ReportError(cx, "invalid argument");
-        return JS_FALSE;
-    }
-
-    /* load DSO */
-    if (!JS_DSOLoad(cx, &id, c_filename))
-        return JS_FALSE;
-
-    /* return DSO handle id */
-    *rval = INT_TO_JSVAL(id);
-
-    return JS_TRUE;
-}
-
-/* global JavaScript language DSO object method: DSO.unload(id) */
-static JSBool dso_unload(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    int id;
-    JSBool rc;
-
-    /* usage sanity checks */
-    if (argc == 0) {
-        JS_ReportError(cx, "usage: DSO.unload(id)");
-        return JS_FALSE;
-    }
-    if (argc != 1) {
-        JS_ReportError(cx, "invalid number of arguments: %d received, %d expected", argc, 1);
-        return JS_FALSE;
-    }
-
-    /* determine DSO id */
-    id = JSVAL_TO_INT(argv[0]);
-
-    /* unload DSO */
-    if (!JS_DSOUnload(cx, id))
-        return JS_FALSE;
-
-    return JS_TRUE;
-}
-
-/* JavaScript DSO class method definitions */
-static JSFunctionSpec dso_methods[] = {
-    { "load",   dso_load,   1, 0, 0 },
-    { "unload", dso_unload, 1, 0, 0 },
-    { NULL,     NULL,       0, 0, 0 }
-};
-
-/* JavaScript DSO class definition */
-static JSClass dso_class = {
-    "DSO",
-    0,
-    JS_PropertyStub,
-    JS_PropertyStub,
-    JS_PropertyStub,
-    JS_PropertyStub,
-    JS_EnumerateStub,
-    JS_ResolveStub,
-    JS_ConvertStub,
-    JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-/* JavaScript DSO class global initializer */
-JSObject *js_InitDSOClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *DSO;
-
-    if ((DSO = JS_DefineObject(cx, obj, "DSO", &dso_class, NULL, 0)) == NULL)
-        return NULL;
-    if (!JS_DefineFunctions(cx, DSO, dso_methods))
-        return NULL;
-    return DSO;
-}
-
-#endif /* JS_HAS_DSO_OBJECT */
-
diff --git a/libs/js/src/jsdso.h b/libs/js/src/jsdso.h
deleted file mode 100644
index 8428c965c8..0000000000
--- a/libs/js/src/jsdso.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ATTENTION: This is an OSSP js extension to the Mozilla JavaScript engine.
-   It was implemented by Ralf S. Engelschall <rse@engelschall.com> for OSSP. */
-
-#ifndef jsdso_h___
-#define jsdso_h___
-
-#if defined(OSSP) && defined(JS_HAS_DSO_OBJECT) && JS_HAS_DSO_OBJECT
-
-JS_BEGIN_EXTERN_C
-
-/* public API */
-extern JSBool    JS_DSOLoad      (JSContext *cx, int *id, const char *filename);
-extern JSBool    JS_DSOUnload    (JSContext *cx, int  id);
-
-/* friend API */
-extern JSObject *js_InitDSOClass (JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif
-
-#endif /* jsdso_h___ */
diff --git a/libs/js/src/jsdtoa.c b/libs/js/src/jsdtoa.c
deleted file mode 100644
index d2d45a6c73..0000000000
--- a/libs/js/src/jsdtoa.c
+++ /dev/null
@@ -1,3132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Portable double to alphanumeric string and back converters.
- */
-#include "jsstddef.h"
-#include "jslibmath.h"
-#include "jstypes.h"
-#include "jsdtoa.h"
-#include "jsprf.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jspubtd.h"
-#include "jsnum.h"
-
-#ifdef JS_THREADSAFE
-#include "prlock.h"
-#endif
-
-/****************************************************************
- *
- * The author of this software is David M. Gay.
- *
- * Copyright (c) 1991 by Lucent Technologies.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- ***************************************************************/
-
-/* Please send bug reports to
-    David M. Gay
-    Bell Laboratories, Room 2C-463
-    600 Mountain Avenue
-    Murray Hill, NJ 07974-0636
-    U.S.A.
-    dmg@bell-labs.com
- */
-
-/* On a machine with IEEE extended-precision registers, it is
- * necessary to specify double-precision (53-bit) rounding precision
- * before invoking strtod or dtoa.  If the machine uses (the equivalent
- * of) Intel 80x87 arithmetic, the call
- *  _control87(PC_53, MCW_PC);
- * does this with many compilers.  Whether this or another call is
- * appropriate depends on the compiler; for this to work, it may be
- * necessary to #include "float.h" or another system-dependent header
- * file.
- */
-
-/* strtod for IEEE-arithmetic machines.
- *
- * This strtod returns a nearest machine number to the input decimal
- * string (or sets err to JS_DTOA_ERANGE or JS_DTOA_ENOMEM).  With IEEE
- * arithmetic, ties are broken by the IEEE round-even rule.  Otherwise
- * ties are broken by biased rounding (add half and chop).
- *
- * Inspired loosely by William D. Clinger's paper "How to Read Floating
- * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *
- *  1. We only require IEEE double-precision
- *      arithmetic (not IEEE double-extended).
- *  2. We get by with floating-point arithmetic in a case that
- *      Clinger missed -- when we're computing d * 10^n
- *      for a small integer d and the integer n is not too
- *      much larger than 22 (the maximum integer k for which
- *      we can represent 10^k exactly), we may be able to
- *      compute (d*10^k) * 10^(e-k) with just one roundoff.
- *  3. Rather than a bit-at-a-time adjustment of the binary
- *      result in the hard case, we use floating-point
- *      arithmetic to determine the adjustment to within
- *      one bit; only in really hard cases do we need to
- *      compute a second residual.
- *  4. Because of 3., we don't need a large table of powers of 10
- *      for ten-to-e (just some small tables, e.g. of 10^k
- *      for 0 <= k <= 22).
- */
-
-/*
- * #define IEEE_8087 for IEEE-arithmetic machines where the least
- *  significant byte has the lowest address.
- * #define IEEE_MC68k for IEEE-arithmetic machines where the most
- *  significant byte has the lowest address.
- * #define Long int on machines with 32-bit ints and 64-bit longs.
- * #define Sudden_Underflow for IEEE-format machines without gradual
- *  underflow (i.e., that flush to zero on underflow).
- * #define No_leftright to omit left-right logic in fast floating-point
- *  computation of js_dtoa.
- * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.
- * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
- *  that use extended-precision instructions to compute rounded
- *  products and quotients) with IBM.
- * #define ROUND_BIASED for IEEE-format with biased rounding.
- * #define Inaccurate_Divide for IEEE-format with correctly rounded
- *  products but inaccurate quotients, e.g., for Intel i860.
- * #define JS_HAVE_LONG_LONG on machines that have a "long long"
- *  integer type (of >= 64 bits).  If long long is available and the name is
- *  something other than "long long", #define Llong to be the name,
- *  and if "unsigned Llong" does not work as an unsigned version of
- *  Llong, #define #ULLong to be the corresponding unsigned type.
- * #define Bad_float_h if your system lacks a float.h or if it does not
- *  define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
- *  FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
- *  if memory is available and otherwise does something you deem
- *  appropriate.  If MALLOC is undefined, malloc will be invoked
- *  directly -- and assumed always to succeed.
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- *  memory allocations from a private pool of memory when possible.
- *  When used, the private pool is PRIVATE_MEM bytes long: 2000 bytes,
- *  unless #defined to be a different length.  This default length
- *  suffices to get rid of MALLOC calls except for unusual cases,
- *  such as decimal-to-binary conversion of a very long string of
- *  digits.
- * #define INFNAN_CHECK on IEEE systems to cause strtod to check for
- *  Infinity and NaN (case insensitively).  On some systems (e.g.,
- *  some HP systems), it may be necessary to #define NAN_WORD0
- *  appropriately -- to the most significant word of a quiet NaN.
- *  (On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
- * #define MULTIPLE_THREADS if the system offers preemptively scheduled
- *  multiple threads.  In this case, you must provide (or suitably
- *  #define) two locks, acquired by ACQUIRE_DTOA_LOCK() and released
- *  by RELEASE_DTOA_LOCK().  (The second lock, accessed
- *  in pow5mult, ensures lazy evaluation of only one copy of high
- *  powers of 5; omitting this lock would introduce a small
- *  probability of wasting memory, but would otherwise be harmless.)
- *  You must also invoke freedtoa(s) to free the value s returned by
- *  dtoa.  You may do so whether or not MULTIPLE_THREADS is #defined.
- * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that
- *  avoids underflows on inputs whose result does not underflow.
- */
-#ifdef IS_LITTLE_ENDIAN
-#define IEEE_8087
-#else
-#define IEEE_MC68k
-#endif
-
-#ifndef Long
-#define Long int32
-#endif
-
-#ifndef ULong
-#define ULong uint32
-#endif
-
-#define Bug(errorMessageString) JS_ASSERT(!errorMessageString)
-
-#include "stdlib.h"
-#include "string.h"
-
-#ifdef MALLOC
-extern void *MALLOC(size_t);
-#else
-#define MALLOC malloc
-#endif
-
-#define Omit_Private_Memory
-/* Private memory currently doesn't work with JS_THREADSAFE */
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2000
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
-#ifdef Bad_float_h
-#undef __STDC__
-
-#define DBL_DIG 15
-#define DBL_MAX_10_EXP 308
-#define DBL_MAX_EXP 1024
-#define FLT_RADIX 2
-#define FLT_ROUNDS 1
-#define DBL_MAX 1.7976931348623157e+308
-
-
-
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647
-#endif
-
-#else /* ifndef Bad_float_h */
-#include "float.h"
-#endif /* Bad_float_h */
-
-#ifndef __MATH_H__
-#include "math.h"
-#endif
-
-#ifndef CONST
-#define CONST const
-#endif
-
-#if defined(IEEE_8087) + defined(IEEE_MC68k) != 1
-Exactly one of IEEE_8087 or IEEE_MC68k should be defined.
-#endif
-
-#define word0(x)        JSDOUBLE_HI32(x)
-#define set_word0(x, y) JSDOUBLE_SET_HI32(x, y)
-#define word1(x)        JSDOUBLE_LO32(x)
-#define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
-
-#ifdef OSSP /* BUGFIX */
-#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | ((c) & 0xffff))
-#else
-#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | (c) & 0xffff)
-#endif
-
-/* #define P DBL_MANT_DIG */
-/* Ten_pmax = floor(P*log(2)/log(5)) */
-/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
-/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
-/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
-
-#define Exp_shift  20
-#define Exp_shift1 20
-#define Exp_msk1    0x100000
-#define Exp_msk11   0x100000
-#define Exp_mask  0x7ff00000
-#define P 53
-#define Bias 1023
-#define Emin (-1022)
-#define Exp_1  0x3ff00000
-#define Exp_11 0x3ff00000
-#define Ebits 11
-#define Frac_mask  0xfffff
-#define Frac_mask1 0xfffff
-#define Ten_pmax 22
-#define Bletch 0x10
-#define Bndry_mask  0xfffff
-#define Bndry_mask1 0xfffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 1
-#define Tiny0 0
-#define Tiny1 1
-#define Quick_max 14
-#define Int_max 14
-#define Infinite(x) (word0(x) == 0x7ff00000) /* sufficient test for here */
-#ifndef NO_IEEE_Scale
-#define Avoid_Underflow
-#endif
-
-
-
-#ifdef RND_PRODQUOT
-#define rounded_product(a,b) a = rnd_prod(a, b)
-#define rounded_quotient(a,b) a = rnd_quot(a, b)
-extern double rnd_prod(double, double), rnd_quot(double, double);
-#else
-#define rounded_product(a,b) a *= b
-#define rounded_quotient(a,b) a /= b
-#endif
-
-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
-#define Big1 0xffffffff
-
-#ifndef JS_HAVE_LONG_LONG
-#undef ULLong
-#else   /* long long available */
-#ifndef Llong
-#define Llong JSInt64
-#endif
-#ifndef ULLong
-#define ULLong JSUint64
-#endif
-#endif /* JS_HAVE_LONG_LONG */
-
-#ifdef JS_THREADSAFE
-#define MULTIPLE_THREADS
-static PRLock *freelist_lock;
-#define ACQUIRE_DTOA_LOCK()                                                   \
-    JS_BEGIN_MACRO                                                            \
-        if (!initialized)                                                     \
-            InitDtoa();                                                       \
-        PR_Lock(freelist_lock);                                               \
-    JS_END_MACRO
-#define RELEASE_DTOA_LOCK() PR_Unlock(freelist_lock)
-#else
-#undef MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK()   /*nothing*/
-#define RELEASE_DTOA_LOCK()   /*nothing*/
-#endif
-
-#define Kmax 15
-
-struct Bigint {
-    struct Bigint *next;  /* Free list link */
-    int32 k;              /* lg2(maxwds) */
-    int32 maxwds;         /* Number of words allocated for x */
-    int32 sign;           /* Zero if positive, 1 if negative.  Ignored by most Bigint routines! */
-    int32 wds;            /* Actual number of words.  If value is nonzero, the most significant word must be nonzero. */
-    ULong x[1];           /* wds words of number in little endian order */
-};
-
-#ifdef ENABLE_OOM_TESTING
-/* Out-of-memory testing.  Use a good testcase (over and over) and then use
- * these routines to cause a memory failure on every possible Balloc allocation,
- * to make sure that all out-of-memory paths can be followed.  See bug 14044.
- */
-
-static int allocationNum;               /* which allocation is next? */
-static int desiredFailure;              /* which allocation should fail? */
-
-/**
- * js_BigintTestingReset
- *
- * Call at the beginning of a test run to set the allocation failure position.
- * (Set to 0 to just have the engine count allocations without failing.)
- */
-JS_PUBLIC_API(void)
-js_BigintTestingReset(int newFailure)
-{
-    allocationNum = 0;
-    desiredFailure = newFailure;
-}
-
-/**
- * js_BigintTestingWhere
- *
- * Report the current allocation position.  This is really only useful when you
- * want to learn how many allocations a test run has.
- */
-JS_PUBLIC_API(int)
-js_BigintTestingWhere()
-{
-    return allocationNum;
-}
-
-
-/*
- * So here's what you do: Set up a fantastic test case that exercises the
- * elements of the code you wish.  Set the failure point at 0 and run the test,
- * then get the allocation position.  This number is the number of allocations
- * your test makes.  Now loop from 1 to that number, setting the failure point
- * at each loop count, and run the test over and over, causing failures at each
- * step.  Any memory failure *should* cause a Out-Of-Memory exception; if it
- * doesn't, then there's still an error here.
- */
-#endif
-
-typedef struct Bigint Bigint;
-
-static Bigint *freelist[Kmax+1];
-
-/*
- * Allocate a Bigint with 2^k words.
- * This is not threadsafe. The caller must use thread locks
- */
-static Bigint *Balloc(int32 k)
-{
-    int32 x;
-    Bigint *rv;
-#ifndef Omit_Private_Memory
-    uint32 len;
-#endif
-
-#ifdef ENABLE_OOM_TESTING
-    if (++allocationNum == desiredFailure) {
-        printf("Forced Failing Allocation number %d\n", allocationNum);
-        return NULL;
-    }
-#endif
-
-    if ((rv = freelist[k]) != NULL)
-        freelist[k] = rv->next;
-    if (rv == NULL) {
-        x = 1 << k;
-#ifdef Omit_Private_Memory
-        rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-        len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-            /sizeof(double);
-        if (pmem_next - private_mem + len <= PRIVATE_mem) {
-            rv = (Bigint*)pmem_next;
-            pmem_next += len;
-            }
-        else
-            rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-        if (!rv)
-            return NULL;
-        rv->k = k;
-        rv->maxwds = x;
-    }
-    rv->sign = rv->wds = 0;
-    return rv;
-}
-
-static void Bfree(Bigint *v)
-{
-    if (v) {
-        v->next = freelist[v->k];
-        freelist[v->k] = v;
-    }
-}
-
-#define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
-                          y->wds*sizeof(Long) + 2*sizeof(int32))
-
-/* Return b*m + a.  Deallocate the old b.  Both a and m must be between 0 and
- * 65535 inclusive.  NOTE: old b is deallocated on memory failure.
- */
-static Bigint *multadd(Bigint *b, int32 m, int32 a)
-{
-    int32 i, wds;
-#ifdef ULLong
-    ULong *x;
-    ULLong carry, y;
-#else
-    ULong carry, *x, y;
-    ULong xi, z;
-#endif
-    Bigint *b1;
-
-#ifdef ENABLE_OOM_TESTING
-    if (++allocationNum == desiredFailure) {
-        /* Faux allocation, because I'm not getting all of the failure paths
-         * without it.
-         */
-        printf("Forced Failing Allocation number %d\n", allocationNum);
-        Bfree(b);
-        return NULL;
-    }
-#endif
-
-    wds = b->wds;
-    x = b->x;
-    i = 0;
-    carry = a;
-    do {
-#ifdef ULLong
-        y = *x * (ULLong)m + carry;
-        carry = y >> 32;
-        *x++ = (ULong)(y & 0xffffffffUL);
-#else
-        xi = *x;
-        y = (xi & 0xffff) * m + carry;
-        z = (xi >> 16) * m + (y >> 16);
-        carry = z >> 16;
-        *x++ = (z << 16) + (y & 0xffff);
-#endif
-    }
-    while(++i < wds);
-    if (carry) {
-        if (wds >= b->maxwds) {
-            b1 = Balloc(b->k+1);
-            if (!b1) {
-                Bfree(b);
-                return NULL;
-            }
-            Bcopy(b1, b);
-            Bfree(b);
-            b = b1;
-        }
-        b->x[wds++] = (ULong)carry;
-        b->wds = wds;
-    }
-    return b;
-}
-
-static Bigint *s2b(CONST char *s, int32 nd0, int32 nd, ULong y9)
-{
-    Bigint *b;
-    int32 i, k;
-    Long x, y;
-
-    x = (nd + 8) / 9;
-    for(k = 0, y = 1; x > y; y <<= 1, k++) ;
-    b = Balloc(k);
-    if (!b)
-        return NULL;
-    b->x[0] = y9;
-    b->wds = 1;
-
-    i = 9;
-    if (9 < nd0) {
-        s += 9;
-        do {
-            b = multadd(b, 10, *s++ - '0');
-            if (!b)
-                return NULL;
-        } while(++i < nd0);
-        s++;
-    }
-    else
-        s += 10;
-    for(; i < nd; i++) {
-        b = multadd(b, 10, *s++ - '0');
-        if (!b)
-            return NULL;
-    }
-    return b;
-}
-
-
-/* Return the number (0 through 32) of most significant zero bits in x. */
-static int32 hi0bits(register ULong x)
-{
-    register int32 k = 0;
-
-    if (!(x & 0xffff0000)) {
-        k = 16;
-        x <<= 16;
-    }
-    if (!(x & 0xff000000)) {
-        k += 8;
-        x <<= 8;
-    }
-    if (!(x & 0xf0000000)) {
-        k += 4;
-        x <<= 4;
-    }
-    if (!(x & 0xc0000000)) {
-        k += 2;
-        x <<= 2;
-    }
-    if (!(x & 0x80000000)) {
-        k++;
-        if (!(x & 0x40000000))
-            return 32;
-    }
-    return k;
-}
-
-
-/* Return the number (0 through 32) of least significant zero bits in y.
- * Also shift y to the right past these 0 through 32 zeros so that y's
- * least significant bit will be set unless y was originally zero. */
-static int32 lo0bits(ULong *y)
-{
-    register int32 k;
-    register ULong x = *y;
-
-    if (x & 7) {
-        if (x & 1)
-            return 0;
-        if (x & 2) {
-            *y = x >> 1;
-            return 1;
-        }
-        *y = x >> 2;
-        return 2;
-    }
-    k = 0;
-    if (!(x & 0xffff)) {
-        k = 16;
-        x >>= 16;
-    }
-    if (!(x & 0xff)) {
-        k += 8;
-        x >>= 8;
-    }
-    if (!(x & 0xf)) {
-        k += 4;
-        x >>= 4;
-    }
-    if (!(x & 0x3)) {
-        k += 2;
-        x >>= 2;
-    }
-    if (!(x & 1)) {
-        k++;
-        x >>= 1;
-        if (!x & 1)
-            return 32;
-    }
-    *y = x;
-    return k;
-}
-
-/* Return a new Bigint with the given integer value, which must be nonnegative. */
-static Bigint *i2b(int32 i)
-{
-    Bigint *b;
-
-    b = Balloc(1);
-    if (!b)
-        return NULL;
-    b->x[0] = i;
-    b->wds = 1;
-    return b;
-}
-
-/* Return a newly allocated product of a and b. */
-static Bigint *mult(CONST Bigint *a, CONST Bigint *b)
-{
-    CONST Bigint *t;
-    Bigint *c;
-    int32 k, wa, wb, wc;
-    ULong y;
-    ULong *xc, *xc0, *xce;
-    CONST ULong *x, *xa, *xae, *xb, *xbe;
-#ifdef ULLong
-    ULLong carry, z;
-#else
-    ULong carry, z;
-    ULong z2;
-#endif
-
-    if (a->wds < b->wds) {
-        t = a;
-        a = b;
-        b = t;
-    }
-    k = a->k;
-    wa = a->wds;
-    wb = b->wds;
-    wc = wa + wb;
-    if (wc > a->maxwds)
-        k++;
-    c = Balloc(k);
-    if (!c)
-        return NULL;
-    for(xc = c->x, xce = xc + wc; xc < xce; xc++)
-        *xc = 0;
-    xa = a->x;
-    xae = xa + wa;
-    xb = b->x;
-    xbe = xb + wb;
-    xc0 = c->x;
-#ifdef ULLong
-    for(; xb < xbe; xc0++) {
-        if ((y = *xb++) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            do {
-                z = *x++ * (ULLong)y + *xc + carry;
-                carry = z >> 32;
-                *xc++ = (ULong)(z & 0xffffffffUL);
-                }
-                while(x < xae);
-            *xc = (ULong)carry;
-            }
-        }
-#else
-    for(; xb < xbe; xb++, xc0++) {
-        if ((y = *xb & 0xffff) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            do {
-                z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
-                carry = z >> 16;
-                z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
-                carry = z2 >> 16;
-                Storeinc(xc, z2, z);
-            }
-            while(x < xae);
-            *xc = carry;
-        }
-        if ((y = *xb >> 16) != 0) {
-            x = xa;
-            xc = xc0;
-            carry = 0;
-            z2 = *xc;
-            do {
-                z = (*x & 0xffff) * y + (*xc >> 16) + carry;
-                carry = z >> 16;
-                Storeinc(xc, z, z2);
-                z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
-                carry = z2 >> 16;
-            }
-            while(x < xae);
-            *xc = z2;
-        }
-    }
-#endif
-    for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
-    c->wds = wc;
-    return c;
-}
-
-/*
- * 'p5s' points to a linked list of Bigints that are powers of 5.
- * This list grows on demand, and it can only grow: it won't change
- * in any other way.  So if we read 'p5s' or the 'next' field of
- * some Bigint on the list, and it is not NULL, we know it won't
- * change to NULL or some other value.  Only when the value of
- * 'p5s' or 'next' is NULL do we need to acquire the lock and add
- * a new Bigint to the list.
- */
-
-static Bigint *p5s;
-
-#ifdef JS_THREADSAFE
-static PRLock *p5s_lock;
-#endif
-
-/* Return b * 5^k.  Deallocate the old b.  k must be nonnegative. */
-/* NOTE: old b is deallocated on memory failure. */
-static Bigint *pow5mult(Bigint *b, int32 k)
-{
-    Bigint *b1, *p5, *p51;
-    int32 i;
-    static CONST int32 p05[3] = { 5, 25, 125 };
-
-    if ((i = k & 3) != 0) {
-        b = multadd(b, p05[i-1], 0);
-        if (!b)
-            return NULL;
-    }
-
-    if (!(k >>= 2))
-        return b;
-    if (!(p5 = p5s)) {
-#ifdef JS_THREADSAFE
-        /*
-         * We take great care to not call i2b() and Bfree()
-         * while holding the lock.
-         */
-        Bigint *wasted_effort = NULL;
-        p5 = i2b(625);
-        if (!p5) {
-            Bfree(b);
-            return NULL;
-        }
-        /* lock and check again */
-        PR_Lock(p5s_lock);
-        if (!p5s) {
-            /* first time */
-            p5s = p5;
-            p5->next = 0;
-        } else {
-            /* some other thread just beat us */
-            wasted_effort = p5;
-            p5 = p5s;
-        }
-        PR_Unlock(p5s_lock);
-        if (wasted_effort) {
-            Bfree(wasted_effort);
-        }
-#else
-        /* first time */
-        p5 = p5s = i2b(625);
-        if (!p5) {
-            Bfree(b);
-            return NULL;
-        }
-        p5->next = 0;
-#endif
-    }
-    for(;;) {
-        if (k & 1) {
-            b1 = mult(b, p5);
-            Bfree(b);
-            if (!b1)
-                return NULL;
-            b = b1;
-        }
-        if (!(k >>= 1))
-            break;
-        if (!(p51 = p5->next)) {
-#ifdef JS_THREADSAFE
-            Bigint *wasted_effort = NULL;
-            p51 = mult(p5, p5);
-            if (!p51) {
-                Bfree(b);
-                return NULL;
-            }
-            PR_Lock(p5s_lock);
-            if (!p5->next) {
-                p5->next = p51;
-                p51->next = 0;
-            } else {
-                wasted_effort = p51;
-                p51 = p5->next;
-            }
-            PR_Unlock(p5s_lock);
-            if (wasted_effort) {
-                Bfree(wasted_effort);
-            }
-#else
-            p51 = mult(p5,p5);
-            if (!p51) {
-                Bfree(b);
-                return NULL;
-            }
-            p51->next = 0;
-            p5->next = p51;
-#endif
-        }
-        p5 = p51;
-    }
-    return b;
-}
-
-/* Return b * 2^k.  Deallocate the old b.  k must be nonnegative.
- * NOTE: on memory failure, old b is deallocated. */
-static Bigint *lshift(Bigint *b, int32 k)
-{
-    int32 i, k1, n, n1;
-    Bigint *b1;
-    ULong *x, *x1, *xe, z;
-
-    n = k >> 5;
-    k1 = b->k;
-    n1 = n + b->wds + 1;
-    for(i = b->maxwds; n1 > i; i <<= 1)
-        k1++;
-    b1 = Balloc(k1);
-    if (!b1)
-        goto done;
-    x1 = b1->x;
-    for(i = 0; i < n; i++)
-        *x1++ = 0;
-    x = b->x;
-    xe = x + b->wds;
-    if (k &= 0x1f) {
-        k1 = 32 - k;
-        z = 0;
-        do {
-            *x1++ = *x << k | z;
-            z = *x++ >> k1;
-        }
-        while(x < xe);
-        if ((*x1 = z) != 0)
-            ++n1;
-    }
-    else do
-        *x1++ = *x++;
-         while(x < xe);
-    b1->wds = n1 - 1;
-done:
-    Bfree(b);
-    return b1;
-}
-
-/* Return -1, 0, or 1 depending on whether a<b, a==b, or a>b, respectively. */
-static int32 cmp(Bigint *a, Bigint *b)
-{
-    ULong *xa, *xa0, *xb, *xb0;
-    int32 i, j;
-
-    i = a->wds;
-    j = b->wds;
-#ifdef DEBUG
-    if (i > 1 && !a->x[i-1])
-        Bug("cmp called with a->x[a->wds-1] == 0");
-    if (j > 1 && !b->x[j-1])
-        Bug("cmp called with b->x[b->wds-1] == 0");
-#endif
-    if (i -= j)
-        return i;
-    xa0 = a->x;
-    xa = xa0 + j;
-    xb0 = b->x;
-    xb = xb0 + j;
-    for(;;) {
-        if (*--xa != *--xb)
-            return *xa < *xb ? -1 : 1;
-        if (xa <= xa0)
-            break;
-    }
-    return 0;
-}
-
-static Bigint *diff(Bigint *a, Bigint *b)
-{
-    Bigint *c;
-    int32 i, wa, wb;
-    ULong *xa, *xae, *xb, *xbe, *xc;
-#ifdef ULLong
-    ULLong borrow, y;
-#else
-    ULong borrow, y;
-    ULong z;
-#endif
-
-    i = cmp(a,b);
-    if (!i) {
-        c = Balloc(0);
-        if (!c)
-            return NULL;
-        c->wds = 1;
-        c->x[0] = 0;
-        return c;
-    }
-    if (i < 0) {
-        c = a;
-        a = b;
-        b = c;
-        i = 1;
-    }
-    else
-        i = 0;
-    c = Balloc(a->k);
-    if (!c)
-        return NULL;
-    c->sign = i;
-    wa = a->wds;
-    xa = a->x;
-    xae = xa + wa;
-    wb = b->wds;
-    xb = b->x;
-    xbe = xb + wb;
-    xc = c->x;
-    borrow = 0;
-#ifdef ULLong
-    do {
-        y = (ULLong)*xa++ - *xb++ - borrow;
-        borrow = y >> 32 & 1UL;
-        *xc++ = (ULong)(y & 0xffffffffUL);
-        }
-        while(xb < xbe);
-    while(xa < xae) {
-        y = *xa++ - borrow;
-        borrow = y >> 32 & 1UL;
-        *xc++ = (ULong)(y & 0xffffffffUL);
-        }
-#else
-    do {
-        y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
-        borrow = (y & 0x10000) >> 16;
-        z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
-        borrow = (z & 0x10000) >> 16;
-        Storeinc(xc, z, y);
-        }
-        while(xb < xbe);
-    while(xa < xae) {
-        y = (*xa & 0xffff) - borrow;
-        borrow = (y & 0x10000) >> 16;
-        z = (*xa++ >> 16) - borrow;
-        borrow = (z & 0x10000) >> 16;
-        Storeinc(xc, z, y);
-        }
-#endif
-    while(!*--xc)
-        wa--;
-    c->wds = wa;
-    return c;
-}
-
-/* Return the absolute difference between x and the adjacent greater-magnitude double number (ignoring exponent overflows). */
-static double ulp(double x)
-{
-    register Long L;
-    double a = 0;
-
-    L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
-#ifndef Sudden_Underflow
-    if (L > 0) {
-#endif
-        set_word0(a, L);
-        set_word1(a, 0);
-#ifndef Sudden_Underflow
-    }
-    else {
-        L = -L >> Exp_shift;
-        if (L < Exp_shift) {
-            set_word0(a, 0x80000 >> L);
-            set_word1(a, 0);
-        }
-        else {
-            set_word0(a, 0);
-            L -= Exp_shift;
-            set_word1(a, L >= 31 ? 1 : 1 << (31 - L));
-        }
-    }
-#endif
-    return a;
-}
-
-
-static double b2d(Bigint *a, int32 *e)
-{
-    ULong *xa, *xa0, w, y, z;
-    int32 k;
-    double d = 0;
-#define d0 word0(d)
-#define d1 word1(d)
-#define set_d0(x) set_word0(d, x)
-#define set_d1(x) set_word1(d, x)
-
-    xa0 = a->x;
-    xa = xa0 + a->wds;
-    y = *--xa;
-#ifdef DEBUG
-    if (!y) Bug("zero y in b2d");
-#endif
-    k = hi0bits(y);
-    *e = 32 - k;
-    if (k < Ebits) {
-        set_d0(Exp_1 | y >> (Ebits - k));
-        w = xa > xa0 ? *--xa : 0;
-        set_d1(y << (32-Ebits + k) | w >> (Ebits - k));
-        goto ret_d;
-    }
-    z = xa > xa0 ? *--xa : 0;
-    if (k -= Ebits) {
-        set_d0(Exp_1 | y << k | z >> (32 - k));
-        y = xa > xa0 ? *--xa : 0;
-        set_d1(z << k | y >> (32 - k));
-    }
-    else {
-        set_d0(Exp_1 | y);
-        set_d1(z);
-    }
-  ret_d:
-#undef d0
-#undef d1
-#undef set_d0
-#undef set_d1
-    return d;
-}
-
-
-/* Convert d into the form b*2^e, where b is an odd integer.  b is the returned
- * Bigint and e is the returned binary exponent.  Return the number of significant
- * bits in b in bits.  d must be finite and nonzero. */
-static Bigint *d2b(double d, int32 *e, int32 *bits)
-{
-    Bigint *b;
-    int32 de, i, k;
-    ULong *x, y, z;
-#define d0 word0(d)
-#define d1 word1(d)
-#define set_d0(x) set_word0(d, x)
-#define set_d1(x) set_word1(d, x)
-
-    b = Balloc(1);
-    if (!b)
-        return NULL;
-    x = b->x;
-
-    z = d0 & Frac_mask;
-    set_d0(d0 & 0x7fffffff);  /* clear sign bit, which we ignore */
-#ifdef Sudden_Underflow
-    de = (int32)(d0 >> Exp_shift);
-    z |= Exp_msk11;
-#else
-    if ((de = (int32)(d0 >> Exp_shift)) != 0)
-        z |= Exp_msk1;
-#endif
-    if ((y = d1) != 0) {
-        if ((k = lo0bits(&y)) != 0) {
-            x[0] = y | z << (32 - k);
-            z >>= k;
-        }
-        else
-            x[0] = y;
-        i = b->wds = (x[1] = z) ? 2 : 1;
-    }
-    else {
-        JS_ASSERT(z);
-        k = lo0bits(&z);
-        x[0] = z;
-        i = b->wds = 1;
-        k += 32;
-    }
-#ifndef Sudden_Underflow
-    if (de) {
-#endif
-        *e = de - Bias - (P-1) + k;
-        *bits = P - k;
-#ifndef Sudden_Underflow
-    }
-    else {
-        *e = de - Bias - (P-1) + 1 + k;
-        *bits = 32*i - hi0bits(x[i-1]);
-    }
-#endif
-    return b;
-}
-#undef d0
-#undef d1
-#undef set_d0
-#undef set_d1
-
-
-static double ratio(Bigint *a, Bigint *b)
-{
-    double da, db;
-    int32 k, ka, kb;
-
-    da = b2d(a, &ka);
-    db = b2d(b, &kb);
-    k = ka - kb + 32*(a->wds - b->wds);
-    if (k > 0)
-        set_word0(da, word0(da) + k*Exp_msk1);
-    else {
-        k = -k;
-        set_word0(db, word0(db) + k*Exp_msk1);
-    }
-    return da / db;
-}
-
-static CONST double
-tens[] = {
-    1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
-    1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
-    1e20, 1e21, 1e22
-};
-
-static CONST double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
-#ifdef Avoid_Underflow
-        9007199254740992.e-256
-#else
-        1e-256
-#endif
-        };
-/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */
-/* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-#define Scale_Bit 0x10
-#define n_bigtens 5
-
-
-#ifdef INFNAN_CHECK
-
-#ifndef NAN_WORD0
-#define NAN_WORD0 0x7ff80000
-#endif
-
-#ifndef NAN_WORD1
-#define NAN_WORD1 0
-#endif
-
-static int match(CONST char **sp, char *t)
-{
-    int c, d;
-    CONST char *s = *sp;
-
-    while(d = *t++) {
-        if ((c = *++s) >= 'A' && c <= 'Z')
-            c += 'a' - 'A';
-        if (c != d)
-            return 0;
-        }
-    *sp = s + 1;
-    return 1;
-    }
-#endif /* INFNAN_CHECK */
-
-
-#ifdef JS_THREADSAFE
-static JSBool initialized = JS_FALSE;
-
-/* hacked replica of nspr _PR_InitDtoa */
-static void InitDtoa(void)
-{
-    freelist_lock = PR_NewLock();
-        p5s_lock = PR_NewLock();
-    initialized = JS_TRUE;
-}
-#endif
-
-void js_FinishDtoa(void)
-{
-    int count;
-    Bigint *temp;
-
-#ifdef JS_THREADSAFE
-    if (initialized == JS_TRUE) {
-        PR_DestroyLock(freelist_lock);
-        PR_DestroyLock(p5s_lock);
-        initialized = JS_FALSE;
-    }
-#endif
-
-    /* clear down the freelist array and p5s */
-
-    /* static Bigint *freelist[Kmax+1]; */
-    for (count = 0; count <= Kmax; count++) {
-        Bigint **listp = &freelist[count];
-        while ((temp = *listp) != NULL) {
-            *listp = temp->next;
-            free(temp);
-        }
-        freelist[count] = NULL;
-    }
-
-    /* static Bigint *p5s; */
-    while (p5s) {
-        temp = p5s;
-        p5s = p5s->next;
-        free(temp);
-    }
-}
-
-/* nspr2 watcom bug ifdef omitted */
-
-JS_FRIEND_API(double)
-JS_strtod(CONST char *s00, char **se, int *err)
-{
-    int32 scale;
-    int32 bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-        e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-    CONST char *s, *s0, *s1;
-    double aadj, aadj1, adj, rv, rv0;
-    Long L;
-    ULong y, z;
-    Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-
-    *err = 0;
-
-    bb = bd = bs = delta = NULL;
-    sign = nz0 = nz = 0;
-    rv = 0.;
-
-    /* Locking for Balloc's shared buffers that will be used in this block */
-    ACQUIRE_DTOA_LOCK();
-
-    for(s = s00;;s++) switch(*s) {
-    case '-':
-        sign = 1;
-        /* no break */
-    case '+':
-        if (*++s)
-            goto break2;
-        /* no break */
-    case 0:
-        s = s00;
-        goto ret;
-    case '\t':
-    case '\n':
-    case '\v':
-    case '\f':
-    case '\r':
-    case ' ':
-        continue;
-    default:
-        goto break2;
-    }
-break2:
-
-    if (*s == '0') {
-        nz0 = 1;
-        while(*++s == '0') ;
-        if (!*s)
-            goto ret;
-    }
-    s0 = s;
-    y = z = 0;
-    for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-        if (nd < 9)
-            y = 10*y + c - '0';
-        else if (nd < 16)
-            z = 10*z + c - '0';
-    nd0 = nd;
-    if (c == '.') {
-        c = *++s;
-        if (!nd) {
-            for(; c == '0'; c = *++s)
-                nz++;
-            if (c > '0' && c <= '9') {
-                s0 = s;
-                nf += nz;
-                nz = 0;
-                goto have_dig;
-            }
-            goto dig_done;
-        }
-        for(; c >= '0' && c <= '9'; c = *++s) {
-        have_dig:
-            nz++;
-            if (c -= '0') {
-                nf += nz;
-                for(i = 1; i < nz; i++)
-                    if (nd++ < 9)
-                        y *= 10;
-                    else if (nd <= DBL_DIG + 1)
-                        z *= 10;
-                if (nd++ < 9)
-                    y = 10*y + c;
-                else if (nd <= DBL_DIG + 1)
-                    z = 10*z + c;
-                nz = 0;
-            }
-        }
-    }
-dig_done:
-    e = 0;
-    if (c == 'e' || c == 'E') {
-        if (!nd && !nz && !nz0) {
-            s = s00;
-            goto ret;
-        }
-        s00 = s;
-        esign = 0;
-        switch(c = *++s) {
-        case '-':
-            esign = 1;
-        case '+':
-            c = *++s;
-        }
-        if (c >= '0' && c <= '9') {
-            while(c == '0')
-                c = *++s;
-            if (c > '0' && c <= '9') {
-                L = c - '0';
-                s1 = s;
-                while((c = *++s) >= '0' && c <= '9')
-                    L = 10*L + c - '0';
-                if (s - s1 > 8 || L > 19999)
-                    /* Avoid confusion from exponents
-                     * so large that e might overflow.
-                     */
-                    e = 19999; /* safe for 16 bit ints */
-                else
-                    e = (int32)L;
-                if (esign)
-                    e = -e;
-            }
-            else
-                e = 0;
-        }
-        else
-            s = s00;
-    }
-    if (!nd) {
-        if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-            /* Check for Nan and Infinity */
-            switch(c) {
-              case 'i':
-              case 'I':
-                if (match(&s,"nfinity")) {
-                    word0(rv) = 0x7ff00000;
-                    word1(rv) = 0;
-                    goto ret;
-                    }
-                break;
-              case 'n':
-              case 'N':
-                if (match(&s, "an")) {
-                    word0(rv) = NAN_WORD0;
-                    word1(rv) = NAN_WORD1;
-                    goto ret;
-                    }
-              }
-#endif /* INFNAN_CHECK */
-            s = s00;
-            }
-        goto ret;
-    }
-    e1 = e -= nf;
-
-    /* Now we have nd0 digits, starting at s0, followed by a
-     * decimal point, followed by nd-nd0 digits.  The number we're
-     * after is the integer represented by those digits times
-     * 10**e */
-
-    if (!nd0)
-        nd0 = nd;
-    k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-    rv = y;
-    if (k > 9)
-        rv = tens[k - 9] * rv + z;
-    bd0 = 0;
-    if (nd <= DBL_DIG
-#ifndef RND_PRODQUOT
-        && FLT_ROUNDS == 1
-#endif
-        ) {
-        if (!e)
-            goto ret;
-        if (e > 0) {
-            if (e <= Ten_pmax) {
-                /* rv = */ rounded_product(rv, tens[e]);
-                goto ret;
-            }
-            i = DBL_DIG - nd;
-            if (e <= Ten_pmax + i) {
-                /* A fancier test would sometimes let us do
-                 * this for larger i values.
-                 */
-                e -= i;
-                rv *= tens[i];
-                /* rv = */ rounded_product(rv, tens[e]);
-                goto ret;
-            }
-        }
-#ifndef Inaccurate_Divide
-        else if (e >= -Ten_pmax) {
-            /* rv = */ rounded_quotient(rv, tens[-e]);
-            goto ret;
-        }
-#endif
-    }
-    e1 += nd - k;
-
-    scale = 0;
-
-    /* Get starting approximation = rv * 10**e1 */
-
-    if (e1 > 0) {
-        if ((i = e1 & 15) != 0)
-            rv *= tens[i];
-        if (e1 &= ~15) {
-            if (e1 > DBL_MAX_10_EXP) {
-            ovfl:
-                *err = JS_DTOA_ERANGE;
-#ifdef __STDC__
-                rv = HUGE_VAL;
-#else
-                /* Can't trust HUGE_VAL */
-                word0(rv) = Exp_mask;
-                word1(rv) = 0;
-#endif
-                if (bd0)
-                    goto retfree;
-                goto ret;
-            }
-            e1 >>= 4;
-            for(j = 0; e1 > 1; j++, e1 >>= 1)
-                if (e1 & 1)
-                    rv *= bigtens[j];
-            /* The last multiplication could overflow. */
-            set_word0(rv, word0(rv) - P*Exp_msk1);
-            rv *= bigtens[j];
-            if ((z = word0(rv) & Exp_mask) > Exp_msk1*(DBL_MAX_EXP+Bias-P))
-                goto ovfl;
-            if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
-                /* set to largest number */
-                /* (Can't trust DBL_MAX) */
-                set_word0(rv, Big0);
-                set_word1(rv, Big1);
-                }
-            else
-                set_word0(rv, word0(rv) + P*Exp_msk1);
-            }
-    }
-    else if (e1 < 0) {
-        e1 = -e1;
-        if ((i = e1 & 15) != 0)
-            rv /= tens[i];
-        if (e1 &= ~15) {
-            e1 >>= 4;
-            if (e1 >= 1 << n_bigtens)
-                goto undfl;
-#ifdef Avoid_Underflow
-            if (e1 & Scale_Bit)
-                scale = P;
-            for(j = 0; e1 > 0; j++, e1 >>= 1)
-                if (e1 & 1)
-                    rv *= tinytens[j];
-            if (scale && (j = P + 1 - ((word0(rv) & Exp_mask)
-                        >> Exp_shift)) > 0) {
-                /* scaled rv is denormal; zap j low bits */
-                if (j >= 32) {
-                    set_word1(rv, 0);
-                    set_word0(rv, word0(rv) & (0xffffffff << (j-32)));
-                    if (!word0(rv))
-                        set_word0(rv, 1);
-                    }
-                else
-                    set_word1(rv, word1(rv) & (0xffffffff << j));
-                }
-#else
-            for(j = 0; e1 > 1; j++, e1 >>= 1)
-                if (e1 & 1)
-                    rv *= tinytens[j];
-            /* The last multiplication could underflow. */
-            rv0 = rv;
-            rv *= tinytens[j];
-            if (!rv) {
-                rv = 2.*rv0;
-                rv *= tinytens[j];
-#endif
-                if (!rv) {
-                undfl:
-                    rv = 0.;
-                    *err = JS_DTOA_ERANGE;
-                    if (bd0)
-                        goto retfree;
-                    goto ret;
-                }
-#ifndef Avoid_Underflow
-                set_word0(rv, Tiny0);
-                set_word1(rv, Tiny1);
-                /* The refinement below will clean
-                 * this approximation up.
-                 */
-            }
-#endif
-        }
-    }
-
-    /* Now the hard part -- adjusting rv to the correct value.*/
-
-    /* Put digits into bd: true value = bd * 10^e */
-
-    bd0 = s2b(s0, nd0, nd, y);
-    if (!bd0)
-        goto nomem;
-
-    for(;;) {
-        bd = Balloc(bd0->k);
-        if (!bd)
-            goto nomem;
-        Bcopy(bd, bd0);
-        bb = d2b(rv, &bbe, &bbbits);    /* rv = bb * 2^bbe */
-        if (!bb)
-            goto nomem;
-        bs = i2b(1);
-        if (!bs)
-            goto nomem;
-
-        if (e >= 0) {
-            bb2 = bb5 = 0;
-            bd2 = bd5 = e;
-        }
-        else {
-            bb2 = bb5 = -e;
-            bd2 = bd5 = 0;
-        }
-        if (bbe >= 0)
-            bb2 += bbe;
-        else
-            bd2 -= bbe;
-        bs2 = bb2;
-#ifdef Sudden_Underflow
-        j = P + 1 - bbbits;
-#else
-#ifdef Avoid_Underflow
-        j = bbe - scale;
-#else
-        j = bbe;
-#endif
-        i = j + bbbits - 1; /* logb(rv) */
-        if (i < Emin)   /* denormal */
-            j += P - Emin;
-        else
-            j = P + 1 - bbbits;
-#endif
-        bb2 += j;
-        bd2 += j;
-#ifdef Avoid_Underflow
-        bd2 += scale;
-#endif
-        i = bb2 < bd2 ? bb2 : bd2;
-        if (i > bs2)
-            i = bs2;
-        if (i > 0) {
-            bb2 -= i;
-            bd2 -= i;
-            bs2 -= i;
-        }
-        if (bb5 > 0) {
-            bs = pow5mult(bs, bb5);
-            if (!bs)
-                goto nomem;
-            bb1 = mult(bs, bb);
-            if (!bb1)
-                goto nomem;
-            Bfree(bb);
-            bb = bb1;
-        }
-        if (bb2 > 0) {
-            bb = lshift(bb, bb2);
-            if (!bb)
-                goto nomem;
-        }
-        if (bd5 > 0) {
-            bd = pow5mult(bd, bd5);
-            if (!bd)
-                goto nomem;
-        }
-        if (bd2 > 0) {
-            bd = lshift(bd, bd2);
-            if (!bd)
-                goto nomem;
-        }
-        if (bs2 > 0) {
-            bs = lshift(bs, bs2);
-            if (!bs)
-                goto nomem;
-        }
-        delta = diff(bb, bd);
-        if (!delta)
-            goto nomem;
-        dsign = delta->sign;
-        delta->sign = 0;
-        i = cmp(delta, bs);
-        if (i < 0) {
-            /* Error is less than half an ulp -- check for
-             * special case of mantissa a power of two.
-             */
-            if (dsign || word1(rv) || word0(rv) & Bndry_mask
-#ifdef Avoid_Underflow
-             || (word0(rv) & Exp_mask) <= Exp_msk1 + P*Exp_msk1
-#else
-             || (word0(rv) & Exp_mask) <= Exp_msk1
-#endif
-                ) {
-#ifdef Avoid_Underflow
-                if (!delta->x[0] && delta->wds == 1)
-                    dsign = 2;
-#endif
-                break;
-                }
-            delta = lshift(delta,Log2P);
-            if (!delta)
-                goto nomem;
-            if (cmp(delta, bs) > 0)
-                goto drop_down;
-            break;
-        }
-        if (i == 0) {
-            /* exactly half-way between */
-            if (dsign) {
-                if ((word0(rv) & Bndry_mask1) == Bndry_mask1
-                    &&  word1(rv) == 0xffffffff) {
-                    /*boundary case -- increment exponent*/
-                    set_word0(rv, (word0(rv) & Exp_mask) + Exp_msk1);
-                    set_word1(rv, 0);
-#ifdef Avoid_Underflow
-                    dsign = 0;
-#endif
-                    break;
-                }
-            }
-            else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
-#ifdef Avoid_Underflow
-                dsign = 2;
-#endif
-            drop_down:
-                /* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow
-                L = word0(rv) & Exp_mask;
-                if (L <= Exp_msk1)
-                    goto undfl;
-                L -= Exp_msk1;
-#else
-                L = (word0(rv) & Exp_mask) - Exp_msk1;
-#endif
-                set_word0(rv, L | Bndry_mask1);
-                set_word1(rv, 0xffffffff);
-                break;
-            }
-#ifndef ROUND_BIASED
-            if (!(word1(rv) & LSB))
-                break;
-#endif
-            if (dsign)
-                rv += ulp(rv);
-#ifndef ROUND_BIASED
-            else {
-                rv -= ulp(rv);
-#ifndef Sudden_Underflow
-                if (!rv)
-                    goto undfl;
-#endif
-            }
-#ifdef Avoid_Underflow
-            dsign = 1 - dsign;
-#endif
-#endif
-            break;
-        }
-        if ((aadj = ratio(delta, bs)) <= 2.) {
-            if (dsign)
-                aadj = aadj1 = 1.;
-            else if (word1(rv) || word0(rv) & Bndry_mask) {
-#ifndef Sudden_Underflow
-                if (word1(rv) == Tiny1 && !word0(rv))
-                    goto undfl;
-#endif
-                aadj = 1.;
-                aadj1 = -1.;
-            }
-            else {
-                /* special case -- power of FLT_RADIX to be */
-                /* rounded down... */
-
-                if (aadj < 2./FLT_RADIX)
-                    aadj = 1./FLT_RADIX;
-                else
-                    aadj *= 0.5;
-                aadj1 = -aadj;
-            }
-        }
-        else {
-            aadj *= 0.5;
-            aadj1 = dsign ? aadj : -aadj;
-#ifdef Check_FLT_ROUNDS
-            switch(FLT_ROUNDS) {
-            case 2: /* towards +infinity */
-                aadj1 -= 0.5;
-                break;
-            case 0: /* towards 0 */
-            case 3: /* towards -infinity */
-                aadj1 += 0.5;
-            }
-#else
-            if (FLT_ROUNDS == 0)
-                aadj1 += 0.5;
-#endif
-        }
-        y = word0(rv) & Exp_mask;
-
-        /* Check for overflow */
-
-        if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-            rv0 = rv;
-            set_word0(rv, word0(rv) - P*Exp_msk1);
-            adj = aadj1 * ulp(rv);
-            rv += adj;
-            if ((word0(rv) & Exp_mask) >=
-                Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
-                if (word0(rv0) == Big0 && word1(rv0) == Big1)
-                    goto ovfl;
-                set_word0(rv, Big0);
-                set_word1(rv, Big1);
-                goto cont;
-            }
-            else
-                set_word0(rv, word0(rv) + P*Exp_msk1);
-        }
-        else {
-#ifdef Sudden_Underflow
-            if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-                rv0 = rv;
-                set_word0(rv, word0(rv) + P*Exp_msk1);
-                adj = aadj1 * ulp(rv);
-                rv += adj;
-                    if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
-                        {
-                            if (word0(rv0) == Tiny0
-                                && word1(rv0) == Tiny1)
-                                goto undfl;
-                            set_word0(rv, Tiny0);
-                            set_word1(rv, Tiny1);
-                            goto cont;
-                        }
-                    else
-                        set_word0(rv, word0(rv) - P*Exp_msk1);
-            }
-            else {
-                adj = aadj1 * ulp(rv);
-                rv += adj;
-            }
-#else
-            /* Compute adj so that the IEEE rounding rules will
-             * correctly round rv + adj in some half-way cases.
-             * If rv * ulp(rv) is denormalized (i.e.,
-             * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
-             * trouble from bits lost to denormalization;
-             * example: 1.2e-307 .
-             */
-#ifdef Avoid_Underflow
-            if (y <= P*Exp_msk1 && aadj > 1.)
-#else
-            if (y <= (P-1)*Exp_msk1 && aadj > 1.)
-#endif
-                {
-                aadj1 = (double)(int32)(aadj + 0.5);
-                if (!dsign)
-                    aadj1 = -aadj1;
-            }
-#ifdef Avoid_Underflow
-            if (scale && y <= P*Exp_msk1)
-                set_word0(aadj1, word0(aadj1) + (P+1)*Exp_msk1 - y);
-#endif
-            adj = aadj1 * ulp(rv);
-            rv += adj;
-#endif
-        }
-        z = word0(rv) & Exp_mask;
-#ifdef Avoid_Underflow
-        if (!scale)
-#endif
-        if (y == z) {
-            /* Can we stop now? */
-            L = (Long)aadj;
-            aadj -= L;
-            /* The tolerances below are conservative. */
-            if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
-                if (aadj < .4999999 || aadj > .5000001)
-                    break;
-            }
-            else if (aadj < .4999999/FLT_RADIX)
-                break;
-        }
-    cont:
-        Bfree(bb);
-        Bfree(bd);
-        Bfree(bs);
-        Bfree(delta);
-        bb = bd = bs = delta = NULL;
-    }
-#ifdef Avoid_Underflow
-    if (scale) {
-#ifdef OSSP /* CLEANUP */
-        rv0 = 0.; /* calm the compiler warning */
-#endif
-        set_word0(rv0, Exp_1 - P*Exp_msk1);
-        set_word1(rv0, 0);
-        if ((word0(rv) & Exp_mask) <= P*Exp_msk1
-              && word1(rv) & 1
-              && dsign != 2) {
-            if (dsign) {
-#ifdef Sudden_Underflow
-                /* rv will be 0, but this would give the  */
-                /* right result if only rv *= rv0 worked. */
-                set_word0(rv, word0(rv) + P*Exp_msk1);
-                set_word0(rv0, Exp_1 - 2*P*Exp_msk1);
-#endif
-                rv += ulp(rv);
-                }
-            else
-                set_word1(rv, word1(rv) & ~1);
-        }
-        rv *= rv0;
-    }
-#endif /* Avoid_Underflow */
-retfree:
-    Bfree(bb);
-    Bfree(bd);
-    Bfree(bs);
-    Bfree(bd0);
-    Bfree(delta);
-ret:
-    RELEASE_DTOA_LOCK();
-    if (se)
-        *se = (char *)s;
-    return sign ? -rv : rv;
-
-nomem:
-    Bfree(bb);
-    Bfree(bd);
-    Bfree(bs);
-    Bfree(bd0);
-    Bfree(delta);
-    *err = JS_DTOA_ENOMEM;
-    return 0;
-}
-
-
-/* Return floor(b/2^k) and set b to be the remainder.  The returned quotient must be less than 2^32. */
-static uint32 quorem2(Bigint *b, int32 k)
-{
-    ULong mask;
-    ULong result;
-    ULong *bx, *bxe;
-    int32 w;
-    int32 n = k >> 5;
-    k &= 0x1F;
-    mask = (1<<k) - 1;
-
-    w = b->wds - n;
-    if (w <= 0)
-        return 0;
-    JS_ASSERT(w <= 2);
-    bx = b->x;
-    bxe = bx + n;
-    result = *bxe >> k;
-    *bxe &= mask;
-    if (w == 2) {
-        JS_ASSERT(!(bxe[1] & ~mask));
-        if (k)
-            result |= bxe[1] << (32 - k);
-    }
-    n++;
-    while (!*bxe && bxe != bx) {
-        n--;
-        bxe--;
-    }
-    b->wds = n;
-    return result;
-}
-
-/* Return floor(b/S) and set b to be the remainder.  As added restrictions, b must not have
- * more words than S, the most significant word of S must not start with a 1 bit, and the
- * returned quotient must be less than 36. */
-static int32 quorem(Bigint *b, Bigint *S)
-{
-    int32 n;
-    ULong *bx, *bxe, q, *sx, *sxe;
-#ifdef ULLong
-    ULLong borrow, carry, y, ys;
-#else
-    ULong borrow, carry, y, ys;
-    ULong si, z, zs;
-#endif
-
-    n = S->wds;
-    JS_ASSERT(b->wds <= n);
-    if (b->wds < n)
-        return 0;
-    sx = S->x;
-    sxe = sx + --n;
-    bx = b->x;
-    bxe = bx + n;
-    JS_ASSERT(*sxe <= 0x7FFFFFFF);
-    q = *bxe / (*sxe + 1);  /* ensure q <= true quotient */
-    JS_ASSERT(q < 36);
-    if (q) {
-        borrow = 0;
-        carry = 0;
-        do {
-#ifdef ULLong
-            ys = *sx++ * (ULLong)q + carry;
-            carry = ys >> 32;
-            y = *bx - (ys & 0xffffffffUL) - borrow;
-            borrow = y >> 32 & 1UL;
-            *bx++ = (ULong)(y & 0xffffffffUL);
-#else
-            si = *sx++;
-            ys = (si & 0xffff) * q + carry;
-            zs = (si >> 16) * q + (ys >> 16);
-            carry = zs >> 16;
-            y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            z = (*bx >> 16) - (zs & 0xffff) - borrow;
-            borrow = (z & 0x10000) >> 16;
-            Storeinc(bx, z, y);
-#endif
-        }
-        while(sx <= sxe);
-        if (!*bxe) {
-            bx = b->x;
-            while(--bxe > bx && !*bxe)
-                --n;
-            b->wds = n;
-        }
-    }
-    if (cmp(b, S) >= 0) {
-        q++;
-        borrow = 0;
-        carry = 0;
-        bx = b->x;
-        sx = S->x;
-        do {
-#ifdef ULLong
-            ys = *sx++ + carry;
-            carry = ys >> 32;
-            y = *bx - (ys & 0xffffffffUL) - borrow;
-            borrow = y >> 32 & 1UL;
-            *bx++ = (ULong)(y & 0xffffffffUL);
-#else
-            si = *sx++;
-            ys = (si & 0xffff) + carry;
-            zs = (si >> 16) + (ys >> 16);
-            carry = zs >> 16;
-            y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-            borrow = (y & 0x10000) >> 16;
-            z = (*bx >> 16) - (zs & 0xffff) - borrow;
-            borrow = (z & 0x10000) >> 16;
-            Storeinc(bx, z, y);
-#endif
-        } while(sx <= sxe);
-        bx = b->x;
-        bxe = bx + n;
-        if (!*bxe) {
-            while(--bxe > bx && !*bxe)
-                --n;
-            b->wds = n;
-        }
-    }
-    return (int32)q;
-}
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *  1. Rather than iterating, we use a simple numeric overestimate
- *     to determine k = floor(log10(d)).  We scale relevant
- *     quantities using O(log2(k)) rather than O(k) multiplications.
- *  2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *     try to generate digits strictly left to right.  Instead, we
- *     compute with fewer bits and propagate the carry if necessary
- *     when rounding the final digit up.  This is often faster.
- *  3. Under the assumption that input will be rounded nearest,
- *     mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *     That is, we allow equality in stopping tests when the
- *     round-nearest rule will give the same floating-point value
- *     as would satisfaction of the stopping test with strict
- *     inequality.
- *  4. We remove common factors of powers of 2 from relevant
- *     quantities.
- *  5. When converting floating-point integers less than 1e16,
- *     we use floating-point arithmetic rather than resorting
- *     to multiple-precision integers.
- *  6. When asked to produce fewer than 15 digits, we first try
- *     to get by with floating-point arithmetic; we resort to
- *     multiple-precision integer arithmetic only if we cannot
- *     guarantee that the floating-point calculation has given
- *     the correctly rounded result.  For k requested digits and
- *     "uniformly" distributed input, the probability is
- *     something like 10^(k-15) that we must resort to the Long
- *     calculation.
- */
-
-/* Always emits at least one digit. */
-/* If biasUp is set, then rounding in modes 2 and 3 will round away from zero
- * when the number is exactly halfway between two representable values.  For example,
- * rounding 2.5 to zero digits after the decimal point will return 3 and not 2.
- * 2.49 will still round to 2, and 2.51 will still round to 3. */
-/* bufsize should be at least 20 for modes 0 and 1.  For the other modes,
- * bufsize should be two greater than the maximum number of output characters expected. */
-static JSBool
-js_dtoa(double d, int mode, JSBool biasUp, int ndigits,
-    int *decpt, int *sign, char **rve, char *buf, size_t bufsize)
-{
-    /*  Arguments ndigits, decpt, sign are similar to those
-        of ecvt and fcvt; trailing zeros are suppressed from
-        the returned string.  If not null, *rve is set to point
-        to the end of the return value.  If d is +-Infinity or NaN,
-        then *decpt is set to 9999.
-
-        mode:
-        0 ==> shortest string that yields d when read in
-        and rounded to nearest.
-        1 ==> like 0, but with Steele & White stopping rule;
-        e.g. with IEEE P754 arithmetic , mode 0 gives
-        1e23 whereas mode 1 gives 9.999999999999999e22.
-        2 ==> max(1,ndigits) significant digits.  This gives a
-        return value similar to that of ecvt, except
-        that trailing zeros are suppressed.
-        3 ==> through ndigits past the decimal point.  This
-        gives a return value similar to that from fcvt,
-        except that trailing zeros are suppressed, and
-        ndigits can be negative.
-        4-9 should give the same return values as 2-3, i.e.,
-        4 <= mode <= 9 ==> same return as mode
-        2 + (mode & 1).  These modes are mainly for
-        debugging; often they run slower but sometimes
-        faster than modes 2-3.
-        4,5,8,9 ==> left-to-right digit generation.
-        6-9 ==> don't try fast floating-point estimate
-        (if applicable).
-
-        Values of mode other than 0-9 are treated as mode 0.
-
-        Sufficient space is allocated to the return value
-        to hold the suppressed trailing zeros.
-    */
-
-    int32 bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
-        j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-        spec_case, try_quick;
-    Long L;
-#ifndef Sudden_Underflow
-    int32 denorm;
-    ULong x;
-#endif
-    Bigint *b, *b1, *delta, *mlo, *mhi, *S;
-    double d2, ds, eps;
-    char *s;
-
-    if (word0(d) & Sign_bit) {
-        /* set sign for everything, including 0's and NaNs */
-        *sign = 1;
-        set_word0(d, word0(d) & ~Sign_bit);  /* clear sign bit */
-    }
-    else
-        *sign = 0;
-
-    if ((word0(d) & Exp_mask) == Exp_mask) {
-        /* Infinity or NaN */
-        *decpt = 9999;
-        s = !word1(d) && !(word0(d) & Frac_mask) ? "Infinity" : "NaN";
-        if ((s[0] == 'I' && bufsize < 9) || (s[0] == 'N' && bufsize < 4)) {
-            JS_ASSERT(JS_FALSE);
-/*          JS_SetError(JS_BUFFER_OVERFLOW_ERROR, 0); */
-            return JS_FALSE;
-        }
-        strcpy(buf, s);
-        if (rve) {
-            *rve = buf[3] ? buf + 8 : buf + 3;
-            JS_ASSERT(**rve == '\0');
-        }
-        return JS_TRUE;
-    }
-
-    b = NULL;                           /* initialize for abort protection */
-    S = NULL;
-    mlo = mhi = NULL;
-
-    if (!d) {
-      no_digits:
-        *decpt = 1;
-        if (bufsize < 2) {
-            JS_ASSERT(JS_FALSE);
-/*          JS_SetError(JS_BUFFER_OVERFLOW_ERROR, 0); */
-            return JS_FALSE;
-        }
-        buf[0] = '0'; buf[1] = '\0';  /* copy "0" to buffer */
-        if (rve)
-            *rve = buf + 1;
-        /* We might have jumped to "no_digits" from below, so we need
-         * to be sure to free the potentially allocated Bigints to avoid
-         * memory leaks. */
-        Bfree(b);
-        Bfree(S);
-        if (mlo != mhi)
-            Bfree(mlo);
-        Bfree(mhi);
-        return JS_TRUE;
-    }
-
-    b = d2b(d, &be, &bbits);
-    if (!b)
-        goto nomem;
-#ifdef Sudden_Underflow
-    i = (int32)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
-#else
-    if ((i = (int32)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) != 0) {
-#endif
-        d2 = d;
-        set_word0(d2, word0(d2) & Frac_mask1);
-        set_word0(d2, word0(d2) | Exp_11);
-
-        /* log(x)   ~=~ log(1.5) + (x-1.5)/1.5
-         * log10(x)  =  log(x) / log(10)
-         *      ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-         * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
-         *
-         * This suggests computing an approximation k to log10(d) by
-         *
-         * k = (i - Bias)*0.301029995663981
-         *  + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-         *
-         * We want k to be too large rather than too small.
-         * The error in the first-order Taylor series approximation
-         * is in our favor, so we just round up the constant enough
-         * to compensate for any error in the multiplication of
-         * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-         * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-         * adding 1e-13 to the constant term more than suffices.
-         * Hence we adjust the constant term to 0.1760912590558.
-         * (We could get a more accurate k by invoking log10,
-         *  but this is probably not worthwhile.)
-         */
-
-        i -= Bias;
-#ifndef Sudden_Underflow
-        denorm = 0;
-    }
-    else {
-        /* d is denormalized */
-
-        i = bbits + be + (Bias + (P-1) - 1);
-        x = i > 32 ? word0(d) << (64 - i) | word1(d) >> (i - 32) : word1(d) << (32 - i);
-        d2 = x;
-        set_word0(d2, word0(d2) - 31*Exp_msk1); /* adjust exponent */
-        i -= (Bias + (P-1) - 1) + 1;
-        denorm = 1;
-    }
-#endif
-    /* At this point d = f*2^i, where 1 <= f < 2.  d2 is an approximation of f. */
-    ds = (d2-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-    k = (int32)ds;
-    if (ds < 0. && ds != k)
-        k--;    /* want k = floor(ds) */
-    k_check = 1;
-    if (k >= 0 && k <= Ten_pmax) {
-        if (d < tens[k])
-            k--;
-        k_check = 0;
-    }
-    /* At this point floor(log10(d)) <= k <= floor(log10(d))+1.
-       If k_check is zero, we're guaranteed that k = floor(log10(d)). */
-    j = bbits - i - 1;
-    /* At this point d = b/2^j, where b is an odd integer. */
-    if (j >= 0) {
-        b2 = 0;
-        s2 = j;
-    }
-    else {
-        b2 = -j;
-        s2 = 0;
-    }
-    if (k >= 0) {
-        b5 = 0;
-        s5 = k;
-        s2 += k;
-    }
-    else {
-        b2 -= k;
-        b5 = -k;
-        s5 = 0;
-    }
-    /* At this point d/10^k = (b * 2^b2 * 5^b5) / (2^s2 * 5^s5), where b is an odd integer,
-       b2 >= 0, b5 >= 0, s2 >= 0, and s5 >= 0. */
-    if (mode < 0 || mode > 9)
-        mode = 0;
-    try_quick = 1;
-    if (mode > 5) {
-        mode -= 4;
-        try_quick = 0;
-    }
-    leftright = 1;
-    ilim = ilim1 = 0;
-    switch(mode) {
-    case 0:
-    case 1:
-        ilim = ilim1 = -1;
-        i = 18;
-        ndigits = 0;
-        break;
-    case 2:
-        leftright = 0;
-        /* no break */
-    case 4:
-        if (ndigits <= 0)
-            ndigits = 1;
-        ilim = ilim1 = i = ndigits;
-        break;
-    case 3:
-        leftright = 0;
-        /* no break */
-    case 5:
-        i = ndigits + k + 1;
-        ilim = i;
-        ilim1 = i - 1;
-        if (i <= 0)
-            i = 1;
-    }
-    /* ilim is the maximum number of significant digits we want, based on k and ndigits. */
-    /* ilim1 is the maximum number of significant digits we want, based on k and ndigits,
-       when it turns out that k was computed too high by one. */
-
-    /* Ensure space for at least i+1 characters, including trailing null. */
-    if (bufsize <= (size_t)i) {
-        Bfree(b);
-        JS_ASSERT(JS_FALSE);
-        return JS_FALSE;
-    }
-    s = buf;
-
-    if (ilim >= 0 && ilim <= Quick_max && try_quick) {
-
-        /* Try to get by with floating-point arithmetic. */
-
-        i = 0;
-        d2 = d;
-        k0 = k;
-        ilim0 = ilim;
-        ieps = 2; /* conservative */
-        /* Divide d by 10^k, keeping track of the roundoff error and avoiding overflows. */
-        if (k > 0) {
-            ds = tens[k&0xf];
-            j = k >> 4;
-            if (j & Bletch) {
-                /* prevent overflows */
-                j &= Bletch - 1;
-                d /= bigtens[n_bigtens-1];
-                ieps++;
-            }
-            for(; j; j >>= 1, i++)
-                if (j & 1) {
-                    ieps++;
-                    ds *= bigtens[i];
-                }
-            d /= ds;
-        }
-        else if ((j1 = -k) != 0) {
-            d *= tens[j1 & 0xf];
-            for(j = j1 >> 4; j; j >>= 1, i++)
-                if (j & 1) {
-                    ieps++;
-                    d *= bigtens[i];
-                }
-        }
-        /* Check that k was computed correctly. */
-        if (k_check && d < 1. && ilim > 0) {
-            if (ilim1 <= 0)
-                goto fast_failed;
-            ilim = ilim1;
-            k--;
-            d *= 10.;
-            ieps++;
-        }
-        /* eps bounds the cumulative error. */
-        eps = ieps*d + 7.;
-        set_word0(eps, word0(eps) - (P-1)*Exp_msk1);
-        if (ilim == 0) {
-            S = mhi = 0;
-            d -= 5.;
-            if (d > eps)
-                goto one_digit;
-            if (d < -eps)
-                goto no_digits;
-            goto fast_failed;
-        }
-#ifndef No_leftright
-        if (leftright) {
-            /* Use Steele & White method of only
-             * generating digits needed.
-             */
-            eps = 0.5/tens[ilim-1] - eps;
-            for(i = 0;;) {
-                L = (Long)d;
-                d -= L;
-                *s++ = '0' + (char)L;
-                if (d < eps)
-                    goto ret1;
-                if (1. - d < eps)
-                    goto bump_up;
-                if (++i >= ilim)
-                    break;
-                eps *= 10.;
-                d *= 10.;
-            }
-        }
-        else {
-#endif
-            /* Generate ilim digits, then fix them up. */
-            eps *= tens[ilim-1];
-            for(i = 1;; i++, d *= 10.) {
-                L = (Long)d;
-                d -= L;
-                *s++ = '0' + (char)L;
-                if (i == ilim) {
-                    if (d > 0.5 + eps)
-                        goto bump_up;
-                    else if (d < 0.5 - eps) {
-                        while(*--s == '0') ;
-                        s++;
-                        goto ret1;
-                    }
-                    break;
-                }
-            }
-#ifndef No_leftright
-        }
-#endif
-    fast_failed:
-        s = buf;
-        d = d2;
-        k = k0;
-        ilim = ilim0;
-    }
-
-    /* Do we have a "small" integer? */
-
-    if (be >= 0 && k <= Int_max) {
-        /* Yes. */
-        ds = tens[k];
-        if (ndigits < 0 && ilim <= 0) {
-            S = mhi = 0;
-            if (ilim < 0 || d < 5*ds || (!biasUp && d == 5*ds))
-                goto no_digits;
-            goto one_digit;
-        }
-        for(i = 1;; i++) {
-            L = (Long) (d / ds);
-            d -= L*ds;
-#ifdef Check_FLT_ROUNDS
-            /* If FLT_ROUNDS == 2, L will usually be high by 1 */
-            if (d < 0) {
-                L--;
-                d += ds;
-            }
-#endif
-            *s++ = '0' + (char)L;
-            if (i == ilim) {
-                d += d;
-                if ((d > ds) || (d == ds && (L & 1 || biasUp))) {
-                bump_up:
-                    while(*--s == '9')
-                        if (s == buf) {
-                            k++;
-                            *s = '0';
-                            break;
-                        }
-                    ++*s++;
-                }
-                break;
-            }
-            if (!(d *= 10.))
-                break;
-        }
-        goto ret1;
-    }
-
-    m2 = b2;
-    m5 = b5;
-    if (leftright) {
-        if (mode < 2) {
-            i =
-#ifndef Sudden_Underflow
-                denorm ? be + (Bias + (P-1) - 1 + 1) :
-#endif
-            1 + P - bbits;
-            /* i is 1 plus the number of trailing zero bits in d's significand. Thus,
-               (2^m2 * 5^m5) / (2^(s2+i) * 5^s5) = (1/2 lsb of d)/10^k. */
-        }
-        else {
-            j = ilim - 1;
-            if (m5 >= j)
-                m5 -= j;
-            else {
-                s5 += j -= m5;
-                b5 += j;
-                m5 = 0;
-            }
-            if ((i = ilim) < 0) {
-                m2 -= i;
-                i = 0;
-            }
-            /* (2^m2 * 5^m5) / (2^(s2+i) * 5^s5) = (1/2 * 10^(1-ilim))/10^k. */
-        }
-        b2 += i;
-        s2 += i;
-        mhi = i2b(1);
-        if (!mhi)
-            goto nomem;
-        /* (mhi * 2^m2 * 5^m5) / (2^s2 * 5^s5) = one-half of last printed (when mode >= 2) or
-           input (when mode < 2) significant digit, divided by 10^k. */
-    }
-    /* We still have d/10^k = (b * 2^b2 * 5^b5) / (2^s2 * 5^s5).  Reduce common factors in
-       b2, m2, and s2 without changing the equalities. */
-    if (m2 > 0 && s2 > 0) {
-        i = m2 < s2 ? m2 : s2;
-        b2 -= i;
-        m2 -= i;
-        s2 -= i;
-    }
-
-    /* Fold b5 into b and m5 into mhi. */
-    if (b5 > 0) {
-        if (leftright) {
-            if (m5 > 0) {
-                mhi = pow5mult(mhi, m5);
-                if (!mhi)
-                    goto nomem;
-                b1 = mult(mhi, b);
-                if (!b1)
-                    goto nomem;
-                Bfree(b);
-                b = b1;
-            }
-            if ((j = b5 - m5) != 0) {
-                b = pow5mult(b, j);
-                if (!b)
-                    goto nomem;
-            }
-        }
-        else {
-            b = pow5mult(b, b5);
-            if (!b)
-                goto nomem;
-        }
-    }
-    /* Now we have d/10^k = (b * 2^b2) / (2^s2 * 5^s5) and
-       (mhi * 2^m2) / (2^s2 * 5^s5) = one-half of last printed or input significant digit, divided by 10^k. */
-
-    S = i2b(1);
-    if (!S)
-        goto nomem;
-    if (s5 > 0) {
-        S = pow5mult(S, s5);
-        if (!S)
-            goto nomem;
-    }
-    /* Now we have d/10^k = (b * 2^b2) / (S * 2^s2) and
-       (mhi * 2^m2) / (S * 2^s2) = one-half of last printed or input significant digit, divided by 10^k. */
-
-    /* Check for special case that d is a normalized power of 2. */
-    spec_case = 0;
-    if (mode < 2) {
-        if (!word1(d) && !(word0(d) & Bndry_mask)
-#ifndef Sudden_Underflow
-            && word0(d) & (Exp_mask & Exp_mask << 1)
-#endif
-            ) {
-            /* The special case.  Here we want to be within a quarter of the last input
-               significant digit instead of one half of it when the decimal output string's value is less than d.  */
-            b2 += Log2P;
-            s2 += Log2P;
-            spec_case = 1;
-        }
-    }
-
-    /* Arrange for convenient computation of quotients:
-     * shift left if necessary so divisor has 4 leading 0 bits.
-     *
-     * Perhaps we should just compute leading 28 bits of S once
-     * and for all and pass them and a shift to quorem, so it
-     * can do shifts and ors to compute the numerator for q.
-     */
-    if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f) != 0)
-        i = 32 - i;
-    /* i is the number of leading zero bits in the most significant word of S*2^s2. */
-    if (i > 4) {
-        i -= 4;
-        b2 += i;
-        m2 += i;
-        s2 += i;
-    }
-    else if (i < 4) {
-        i += 28;
-        b2 += i;
-        m2 += i;
-        s2 += i;
-    }
-    /* Now S*2^s2 has exactly four leading zero bits in its most significant word. */
-    if (b2 > 0) {
-        b = lshift(b, b2);
-        if (!b)
-            goto nomem;
-    }
-    if (s2 > 0) {
-        S = lshift(S, s2);
-        if (!S)
-            goto nomem;
-    }
-    /* Now we have d/10^k = b/S and
-       (mhi * 2^m2) / S = maximum acceptable error, divided by 10^k. */
-    if (k_check) {
-        if (cmp(b,S) < 0) {
-            k--;
-            b = multadd(b, 10, 0);  /* we botched the k estimate */
-            if (!b)
-                goto nomem;
-            if (leftright) {
-                mhi = multadd(mhi, 10, 0);
-                if (!mhi)
-                    goto nomem;
-            }
-            ilim = ilim1;
-        }
-    }
-    /* At this point 1 <= d/10^k = b/S < 10. */
-
-    if (ilim <= 0 && mode > 2) {
-        /* We're doing fixed-mode output and d is less than the minimum nonzero output in this mode.
-           Output either zero or the minimum nonzero output depending on which is closer to d. */
-        if (ilim < 0)
-            goto no_digits;
-        S = multadd(S,5,0);
-        if (!S)
-            goto nomem;
-        i = cmp(b,S);
-        if (i < 0 || (i == 0 && !biasUp)) {
-        /* Always emit at least one digit.  If the number appears to be zero
-           using the current mode, then emit one '0' digit and set decpt to 1. */
-        /*no_digits:
-            k = -1 - ndigits;
-            goto ret; */
-            goto no_digits;
-        }
-    one_digit:
-        *s++ = '1';
-        k++;
-        goto ret;
-    }
-    if (leftright) {
-        if (m2 > 0) {
-            mhi = lshift(mhi, m2);
-            if (!mhi)
-                goto nomem;
-        }
-
-        /* Compute mlo -- check for special case
-         * that d is a normalized power of 2.
-         */
-
-        mlo = mhi;
-        if (spec_case) {
-            mhi = Balloc(mhi->k);
-            if (!mhi)
-                goto nomem;
-            Bcopy(mhi, mlo);
-            mhi = lshift(mhi, Log2P);
-            if (!mhi)
-                goto nomem;
-        }
-        /* mlo/S = maximum acceptable error, divided by 10^k, if the output is less than d. */
-        /* mhi/S = maximum acceptable error, divided by 10^k, if the output is greater than d. */
-
-        for(i = 1;;i++) {
-            dig = quorem(b,S) + '0';
-            /* Do we yet have the shortest decimal string
-             * that will round to d?
-             */
-            j = cmp(b, mlo);
-            /* j is b/S compared with mlo/S. */
-            delta = diff(S, mhi);
-            if (!delta)
-                goto nomem;
-            j1 = delta->sign ? 1 : cmp(b, delta);
-            Bfree(delta);
-            /* j1 is b/S compared with 1 - mhi/S. */
-#ifndef ROUND_BIASED
-            if (j1 == 0 && !mode && !(word1(d) & 1)) {
-                if (dig == '9')
-                    goto round_9_up;
-                if (j > 0)
-                    dig++;
-                *s++ = (char)dig;
-                goto ret;
-            }
-#endif
-            if ((j < 0) || (j == 0 && !mode
-#ifndef ROUND_BIASED
-                && !(word1(d) & 1)
-#endif
-                )) {
-                if (j1 > 0) {
-                    /* Either dig or dig+1 would work here as the least significant decimal digit.
-                       Use whichever would produce a decimal value closer to d. */
-                    b = lshift(b, 1);
-                    if (!b)
-                        goto nomem;
-                    j1 = cmp(b, S);
-                    if (((j1 > 0) || (j1 == 0 && (dig & 1 || biasUp)))
-                        && (dig++ == '9'))
-                        goto round_9_up;
-                }
-                *s++ = (char)dig;
-                goto ret;
-            }
-            if (j1 > 0) {
-                if (dig == '9') { /* possible if i == 1 */
-                round_9_up:
-                    *s++ = '9';
-                    goto roundoff;
-                }
-                *s++ = (char)dig + 1;
-                goto ret;
-            }
-            *s++ = (char)dig;
-            if (i == ilim)
-                break;
-            b = multadd(b, 10, 0);
-            if (!b)
-                goto nomem;
-            if (mlo == mhi) {
-                mlo = mhi = multadd(mhi, 10, 0);
-                if (!mhi)
-                    goto nomem;
-            }
-            else {
-                mlo = multadd(mlo, 10, 0);
-                if (!mlo)
-                    goto nomem;
-                mhi = multadd(mhi, 10, 0);
-                if (!mhi)
-                    goto nomem;
-            }
-        }
-    }
-    else
-        for(i = 1;; i++) {
-            *s++ = (char)(dig = quorem(b,S) + '0');
-            if (i >= ilim)
-                break;
-            b = multadd(b, 10, 0);
-            if (!b)
-                goto nomem;
-        }
-
-    /* Round off last digit */
-
-    b = lshift(b, 1);
-    if (!b)
-        goto nomem;
-    j = cmp(b, S);
-    if ((j > 0) || (j == 0 && (dig & 1 || biasUp))) {
-    roundoff:
-        while(*--s == '9')
-            if (s == buf) {
-                k++;
-                *s++ = '1';
-                goto ret;
-            }
-        ++*s++;
-    }
-    else {
-        /* Strip trailing zeros */
-        while(*--s == '0') ;
-        s++;
-    }
-  ret:
-    Bfree(S);
-    if (mhi) {
-        if (mlo && mlo != mhi)
-            Bfree(mlo);
-        Bfree(mhi);
-    }
-  ret1:
-    Bfree(b);
-    JS_ASSERT(s < buf + bufsize);
-    *s = '\0';
-    if (rve)
-        *rve = s;
-    *decpt = k + 1;
-    return JS_TRUE;
-
-nomem:
-    Bfree(S);
-    if (mhi) {
-        if (mlo && mlo != mhi)
-            Bfree(mlo);
-        Bfree(mhi);
-    }
-    Bfree(b);
-    return JS_FALSE;
-}
-
-
-/* Mapping of JSDToStrMode -> js_dtoa mode */
-static const int dtoaModes[] = {
-    0,   /* DTOSTR_STANDARD */
-    0,   /* DTOSTR_STANDARD_EXPONENTIAL, */
-    3,   /* DTOSTR_FIXED, */
-    2,   /* DTOSTR_EXPONENTIAL, */
-    2};  /* DTOSTR_PRECISION */
-
-JS_FRIEND_API(char *)
-JS_dtostr(char *buffer, size_t bufferSize, JSDToStrMode mode, int precision, double d)
-{
-    int decPt;                  /* Position of decimal point relative to first digit returned by js_dtoa */
-    int sign;                   /* Nonzero if the sign bit was set in d */
-    int nDigits;                /* Number of significand digits returned by js_dtoa */
-    char *numBegin = buffer+2;  /* Pointer to the digits returned by js_dtoa; the +2 leaves space for */
-                                /* the sign and/or decimal point */
-    char *numEnd;               /* Pointer past the digits returned by js_dtoa */
-    JSBool dtoaRet;
-
-    JS_ASSERT(bufferSize >= (size_t)(mode <= DTOSTR_STANDARD_EXPONENTIAL ? DTOSTR_STANDARD_BUFFER_SIZE :
-            DTOSTR_VARIABLE_BUFFER_SIZE(precision)));
-
-    if (mode == DTOSTR_FIXED && (d >= 1e21 || d <= -1e21))
-        mode = DTOSTR_STANDARD; /* Change mode here rather than below because the buffer may not be large enough to hold a large integer. */
-
-    /* Locking for Balloc's shared buffers */
-    ACQUIRE_DTOA_LOCK();
-    dtoaRet = js_dtoa(d, dtoaModes[mode], mode >= DTOSTR_FIXED, precision, &decPt, &sign, &numEnd, numBegin, bufferSize-2);
-    RELEASE_DTOA_LOCK();
-    if (!dtoaRet)
-        return 0;
-
-    nDigits = numEnd - numBegin;
-
-    /* If Infinity, -Infinity, or NaN, return the string regardless of the mode. */
-    if (decPt != 9999) {
-        JSBool exponentialNotation = JS_FALSE;
-        int minNDigits = 0;         /* Minimum number of significand digits required by mode and precision */
-        char *p;
-        char *q;
-
-        switch (mode) {
-            case DTOSTR_STANDARD:
-                if (decPt < -5 || decPt > 21)
-                    exponentialNotation = JS_TRUE;
-                else
-                    minNDigits = decPt;
-                break;
-
-            case DTOSTR_FIXED:
-                if (precision >= 0)
-                    minNDigits = decPt + precision;
-                else
-                    minNDigits = decPt;
-                break;
-
-            case DTOSTR_EXPONENTIAL:
-                JS_ASSERT(precision > 0);
-                minNDigits = precision;
-                /* Fall through */
-            case DTOSTR_STANDARD_EXPONENTIAL:
-                exponentialNotation = JS_TRUE;
-                break;
-
-            case DTOSTR_PRECISION:
-                JS_ASSERT(precision > 0);
-                minNDigits = precision;
-                if (decPt < -5 || decPt > precision)
-                    exponentialNotation = JS_TRUE;
-                break;
-        }
-
-        /* If the number has fewer than minNDigits, pad it with zeros at the end */
-        if (nDigits < minNDigits) {
-            p = numBegin + minNDigits;
-            nDigits = minNDigits;
-            do {
-                *numEnd++ = '0';
-            } while (numEnd != p);
-            *numEnd = '\0';
-        }
-
-        if (exponentialNotation) {
-            /* Insert a decimal point if more than one significand digit */
-            if (nDigits != 1) {
-                numBegin--;
-                numBegin[0] = numBegin[1];
-                numBegin[1] = '.';
-            }
-            JS_snprintf(numEnd, bufferSize - (numEnd - buffer), "e%+d", decPt-1);
-        } else if (decPt != nDigits) {
-            /* Some kind of a fraction in fixed notation */
-            JS_ASSERT(decPt <= nDigits);
-            if (decPt > 0) {
-                /* dd...dd . dd...dd */
-                p = --numBegin;
-                do {
-                    *p = p[1];
-                    p++;
-                } while (--decPt);
-                *p = '.';
-            } else {
-                /* 0 . 00...00dd...dd */
-                p = numEnd;
-                numEnd += 1 - decPt;
-                q = numEnd;
-                JS_ASSERT(numEnd < buffer + bufferSize);
-                *numEnd = '\0';
-                while (p != numBegin)
-                    *--q = *--p;
-                for (p = numBegin + 1; p != q; p++)
-                    *p = '0';
-                *numBegin = '.';
-                *--numBegin = '0';
-            }
-        }
-    }
-
-    /* If negative and neither -0.0 nor NaN, output a leading '-'. */
-    if (sign &&
-            !(word0(d) == Sign_bit && word1(d) == 0) &&
-            !((word0(d) & Exp_mask) == Exp_mask &&
-              (word1(d) || (word0(d) & Frac_mask)))) {
-        *--numBegin = '-';
-    }
-    return numBegin;
-}
-
-
-/* Let b = floor(b / divisor), and return the remainder.  b must be nonnegative.
- * divisor must be between 1 and 65536.
- * This function cannot run out of memory. */
-static uint32
-divrem(Bigint *b, uint32 divisor)
-{
-    int32 n = b->wds;
-    uint32 remainder = 0;
-    ULong *bx;
-    ULong *bp;
-
-    JS_ASSERT(divisor > 0 && divisor <= 65536);
-
-    if (!n)
-        return 0; /* b is zero */
-    bx = b->x;
-    bp = bx + n;
-    do {
-        ULong a = *--bp;
-        ULong dividend = remainder << 16 | a >> 16;
-        ULong quotientHi = dividend / divisor;
-        ULong quotientLo;
-
-        remainder = dividend - quotientHi*divisor;
-        JS_ASSERT(quotientHi <= 0xFFFF && remainder < divisor);
-        dividend = remainder << 16 | (a & 0xFFFF);
-        quotientLo = dividend / divisor;
-        remainder = dividend - quotientLo*divisor;
-        JS_ASSERT(quotientLo <= 0xFFFF && remainder < divisor);
-        *bp = quotientHi << 16 | quotientLo;
-    } while (bp != bx);
-    /* Decrease the size of the number if its most significant word is now zero. */
-    if (bx[n-1] == 0)
-        b->wds--;
-    return remainder;
-}
-
-
-/* "-0.0000...(1073 zeros after decimal point)...0001\0" is the longest string that we could produce,
- * which occurs when printing -5e-324 in binary.  We could compute a better estimate of the size of
- * the output string and malloc fewer bytes depending on d and base, but why bother? */
-#define DTOBASESTR_BUFFER_SIZE 1078
-#define BASEDIGIT(digit) ((char)(((digit) >= 10) ? 'a' - 10 + (digit) : '0' + (digit)))
-
-JS_FRIEND_API(char *)
-JS_dtobasestr(int base, double d)
-{
-    char *buffer;        /* The output string */
-    char *p;             /* Pointer to current position in the buffer */
-    char *pInt;          /* Pointer to the beginning of the integer part of the string */
-    char *q;
-    uint32 digit;
-    double di;           /* d truncated to an integer */
-    double df;           /* The fractional part of d */
-
-    JS_ASSERT(base >= 2 && base <= 36);
-
-    buffer = (char*) malloc(DTOBASESTR_BUFFER_SIZE);
-    if (buffer) {
-        p = buffer;
-        if (d < 0.0
-#if defined(XP_WIN) || defined(XP_OS2)
-            && !((word0(d) & Exp_mask) == Exp_mask && ((word0(d) & Frac_mask) || word1(d))) /* Visual C++ doesn't know how to compare against NaN */
-#endif
-           ) {
-            *p++ = '-';
-            d = -d;
-        }
-
-        /* Check for Infinity and NaN */
-        if ((word0(d) & Exp_mask) == Exp_mask) {
-            strcpy(p, !word1(d) && !(word0(d) & Frac_mask) ? "Infinity" : "NaN");
-            return buffer;
-        }
-
-        /* Locking for Balloc's shared buffers */
-        ACQUIRE_DTOA_LOCK();
-
-        /* Output the integer part of d with the digits in reverse order. */
-        pInt = p;
-        di = fd_floor(d);
-        if (di <= 4294967295.0) {
-            uint32 n = (uint32)di;
-            if (n)
-                do {
-                    uint32 m = n / base;
-                    digit = n - m*base;
-                    n = m;
-                    JS_ASSERT(digit < (uint32)base);
-                    *p++ = BASEDIGIT(digit);
-                } while (n);
-            else *p++ = '0';
-        } else {
-            int32 e;
-            int32 bits;  /* Number of significant bits in di; not used. */
-            Bigint *b = d2b(di, &e, &bits);
-            if (!b)
-                goto nomem1;
-            b = lshift(b, e);
-            if (!b) {
-              nomem1:
-                Bfree(b);
-                return NULL;
-            }
-            do {
-                digit = divrem(b, base);
-                JS_ASSERT(digit < (uint32)base);
-                *p++ = BASEDIGIT(digit);
-            } while (b->wds);
-            Bfree(b);
-        }
-        /* Reverse the digits of the integer part of d. */
-        q = p-1;
-        while (q > pInt) {
-            char ch = *pInt;
-            *pInt++ = *q;
-            *q-- = ch;
-        }
-
-        df = d - di;
-        if (df != 0.0) {
-            /* We have a fraction. */
-            int32 e, bbits, s2, done;
-            Bigint *b, *s, *mlo, *mhi;
-
-            b = s = mlo = mhi = NULL;
-
-            *p++ = '.';
-            b = d2b(df, &e, &bbits);
-            if (!b) {
-              nomem2:
-                Bfree(b);
-                Bfree(s);
-                if (mlo != mhi)
-                    Bfree(mlo);
-                Bfree(mhi);
-                return NULL;
-            }
-            JS_ASSERT(e < 0);
-            /* At this point df = b * 2^e.  e must be less than zero because 0 < df < 1. */
-
-            s2 = -(int32)(word0(d) >> Exp_shift1 & Exp_mask>>Exp_shift1);
-#ifndef Sudden_Underflow
-            if (!s2)
-                s2 = -1;
-#endif
-            s2 += Bias + P;
-            /* 1/2^s2 = (nextDouble(d) - d)/2 */
-            JS_ASSERT(-s2 < e);
-            mlo = i2b(1);
-            if (!mlo)
-                goto nomem2;
-            mhi = mlo;
-            if (!word1(d) && !(word0(d) & Bndry_mask)
-#ifndef Sudden_Underflow
-                && word0(d) & (Exp_mask & Exp_mask << 1)
-#endif
-                ) {
-                /* The special case.  Here we want to be within a quarter of the last input
-                   significant digit instead of one half of it when the output string's value is less than d.  */
-                s2 += Log2P;
-                mhi = i2b(1<<Log2P);
-                if (!mhi)
-                    goto nomem2;
-            }
-            b = lshift(b, e + s2);
-            if (!b)
-                goto nomem2;
-            s = i2b(1);
-            if (!s)
-                goto nomem2;
-            s = lshift(s, s2);
-            if (!s)
-                goto nomem2;
-            /* At this point we have the following:
-             *   s = 2^s2;
-             *   1 > df = b/2^s2 > 0;
-             *   (d - prevDouble(d))/2 = mlo/2^s2;
-             *   (nextDouble(d) - d)/2 = mhi/2^s2. */
-
-            done = JS_FALSE;
-            do {
-                int32 j, j1;
-                Bigint *delta;
-
-                b = multadd(b, base, 0);
-                if (!b)
-                    goto nomem2;
-                digit = quorem2(b, s2);
-                if (mlo == mhi) {
-                    mlo = mhi = multadd(mlo, base, 0);
-                    if (!mhi)
-                        goto nomem2;
-                }
-                else {
-                    mlo = multadd(mlo, base, 0);
-                    if (!mlo)
-                        goto nomem2;
-                    mhi = multadd(mhi, base, 0);
-                    if (!mhi)
-                        goto nomem2;
-                }
-
-                /* Do we yet have the shortest string that will round to d? */
-                j = cmp(b, mlo);
-                /* j is b/2^s2 compared with mlo/2^s2. */
-                delta = diff(s, mhi);
-                if (!delta)
-                    goto nomem2;
-                j1 = delta->sign ? 1 : cmp(b, delta);
-                Bfree(delta);
-                /* j1 is b/2^s2 compared with 1 - mhi/2^s2. */
-
-#ifndef ROUND_BIASED
-                if (j1 == 0 && !(word1(d) & 1)) {
-                    if (j > 0)
-                        digit++;
-                    done = JS_TRUE;
-                } else
-#endif
-                if (j < 0 || (j == 0
-#ifndef ROUND_BIASED
-                    && !(word1(d) & 1)
-#endif
-                    )) {
-                    if (j1 > 0) {
-                        /* Either dig or dig+1 would work here as the least significant digit.
-                           Use whichever would produce an output value closer to d. */
-                        b = lshift(b, 1);
-                        if (!b)
-                            goto nomem2;
-                        j1 = cmp(b, s);
-                        if (j1 > 0) /* The even test (|| (j1 == 0 && (digit & 1))) is not here because it messes up odd base output
-                                     * such as 3.5 in base 3.  */
-                            digit++;
-                    }
-                    done = JS_TRUE;
-                } else if (j1 > 0) {
-                    digit++;
-                    done = JS_TRUE;
-                }
-                JS_ASSERT(digit < (uint32)base);
-                *p++ = BASEDIGIT(digit);
-            } while (!done);
-            Bfree(b);
-            Bfree(s);
-            if (mlo != mhi)
-                Bfree(mlo);
-            Bfree(mhi);
-        }
-        JS_ASSERT(p < buffer + DTOBASESTR_BUFFER_SIZE);
-        *p = '\0';
-        RELEASE_DTOA_LOCK();
-    }
-    return buffer;
-}
diff --git a/libs/js/src/jsdtoa.h b/libs/js/src/jsdtoa.h
deleted file mode 100644
index 409f45454b..0000000000
--- a/libs/js/src/jsdtoa.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsdtoa_h___
-#define jsdtoa_h___
-/*
- * Public interface to portable double-precision floating point to string
- * and back conversion package.
- */
-
-#include "jscompat.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * JS_strtod() returns as a double-precision floating-point number
- * the  value represented by the character string pointed to by
- * s00.  The string is scanned up to  the  first  unrecognized
- * character.
- * If the value of se is not (char **)NULL,  a  pointer  to
- * the  character terminating the scan is returned in the location pointed
- * to by se.  If no number can be  formed, se is set to s00r, and
- * zero is returned.
- *
- * *err is set to zero on success; it's set to JS_DTOA_ERANGE on range
- * errors and JS_DTOA_ENOMEM on memory failure.
- */
-#define JS_DTOA_ERANGE 1
-#define JS_DTOA_ENOMEM 2
-JS_FRIEND_API(double)
-JS_strtod(const char *s00, char **se, int *err);
-
-/*
- * Modes for converting floating-point numbers to strings.
- *
- * Some of the modes can round-trip; this means that if the number is converted to
- * a string using one of these mode and then converted back to a number, the result
- * will be identical to the original number (except that, due to ECMA, -0 will get converted
- * to +0).  These round-trip modes return the minimum number of significand digits that
- * permit the round trip.
- *
- * Some of the modes take an integer parameter <precision>.
- */
-/* NB: Keep this in sync with number_constants[]. */
-typedef enum JSDToStrMode {
-    DTOSTR_STANDARD,              /* Either fixed or exponential format; round-trip */
-    DTOSTR_STANDARD_EXPONENTIAL,  /* Always exponential format; round-trip */
-    DTOSTR_FIXED,                 /* Round to <precision> digits after the decimal point; exponential if number is large */
-    DTOSTR_EXPONENTIAL,           /* Always exponential format; <precision> significant digits */
-    DTOSTR_PRECISION              /* Either fixed or exponential format; <precision> significant digits */
-} JSDToStrMode;
-
-
-/* Maximum number of characters (including trailing null) that a DTOSTR_STANDARD or DTOSTR_STANDARD_EXPONENTIAL
- * conversion can produce.  This maximum is reached for a number like -0.0000012345678901234567. */
-#define DTOSTR_STANDARD_BUFFER_SIZE 26
-
-/* Maximum number of characters (including trailing null) that one of the other conversions
- * can produce.  This maximum is reached for TO_FIXED, which can generate up to 21 digits before the decimal point. */
-#define DTOSTR_VARIABLE_BUFFER_SIZE(precision) ((precision)+24 > DTOSTR_STANDARD_BUFFER_SIZE ? (precision)+24 : DTOSTR_STANDARD_BUFFER_SIZE)
-
-/*
- * Convert dval according to the given mode and return a pointer to the resulting ASCII string.
- * The result is held somewhere in buffer, but not necessarily at the beginning.  The size of
- * buffer is given in bufferSize, and must be at least as large as given by the above macros.
- *
- * Return NULL if out of memory.
- */
-JS_FRIEND_API(char *)
-JS_dtostr(char *buffer, size_t bufferSize, JSDToStrMode mode, int precision, double dval);
-
-/*
- * Convert d to a string in the given base.  The integral part of d will be printed exactly
- * in that base, regardless of how large it is, because there is no exponential notation for non-base-ten
- * numbers.  The fractional part will be rounded to as few digits as possible while still preserving
- * the round-trip property (analogous to that of printing decimal numbers).  In other words, if one were
- * to read the resulting string in via a hypothetical base-number-reading routine that rounds to the nearest
- * IEEE double (and to an even significand if there are two equally near doubles), then the result would
- * equal d (except for -0.0, which converts to "0", and NaN, which is not equal to itself).
- *
- * Return NULL if out of memory.  If the result is not NULL, it must be released via free().
- */
-JS_FRIEND_API(char *)
-JS_dtobasestr(int base, double d);
-
-/*
- * Clean up any persistent RAM allocated during the execution of DtoA
- * routines, and remove any locks that might have been created.
- */
-extern void js_FinishDtoa(void);
-
-JS_END_EXTERN_C
-
-#endif /* jsdtoa_h___ */
diff --git a/libs/js/src/jsemit.c b/libs/js/src/jsemit.c
deleted file mode 100644
index 532e92b9f9..0000000000
--- a/libs/js/src/jsemit.c
+++ /dev/null
@@ -1,5360 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS bytecode generation.
- */
-#include "jsstddef.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsbit.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jsnum.h"
-#include "jsopcode.h"
-#include "jsparse.h"
-#include "jsregexp.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-
-/* Allocation chunk counts, must be powers of two in general. */
-#define BYTECODE_CHUNK  256     /* code allocation increment */
-#define SRCNOTE_CHUNK   64      /* initial srcnote allocation increment */
-#define TRYNOTE_CHUNK   64      /* trynote allocation increment */
-
-/* Macros to compute byte sizes from typed element counts. */
-#define BYTECODE_SIZE(n)        ((n) * sizeof(jsbytecode))
-#define SRCNOTE_SIZE(n)         ((n) * sizeof(jssrcnote))
-#define TRYNOTE_SIZE(n)         ((n) * sizeof(JSTryNote))
-
-JS_FRIEND_API(JSBool)
-js_InitCodeGenerator(JSContext *cx, JSCodeGenerator *cg,
-                     JSArenaPool *codePool, JSArenaPool *notePool,
-                     const char *filename, uintN lineno,
-                     JSPrincipals *principals)
-{
-    memset(cg, 0, sizeof *cg);
-    TREE_CONTEXT_INIT(&cg->treeContext);
-    cg->treeContext.flags |= TCF_COMPILING;
-    cg->codePool = codePool;
-    cg->notePool = notePool;
-    cg->codeMark = JS_ARENA_MARK(codePool);
-    cg->noteMark = JS_ARENA_MARK(notePool);
-    cg->tempMark = JS_ARENA_MARK(&cx->tempPool);
-    cg->current = &cg->main;
-    cg->filename = filename;
-    cg->firstLine = cg->prolog.currentLine = cg->main.currentLine = lineno;
-    cg->principals = principals;
-    ATOM_LIST_INIT(&cg->atomList);
-    cg->prolog.noteMask = cg->main.noteMask = SRCNOTE_CHUNK - 1;
-    ATOM_LIST_INIT(&cg->constList);
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(void)
-js_FinishCodeGenerator(JSContext *cx, JSCodeGenerator *cg)
-{
-    TREE_CONTEXT_FINISH(&cg->treeContext);
-    JS_ARENA_RELEASE(cg->codePool, cg->codeMark);
-    JS_ARENA_RELEASE(cg->notePool, cg->noteMark);
-    JS_ARENA_RELEASE(&cx->tempPool, cg->tempMark);
-}
-
-static ptrdiff_t
-EmitCheck(JSContext *cx, JSCodeGenerator *cg, JSOp op, ptrdiff_t delta)
-{
-    jsbytecode *base, *limit, *next;
-    ptrdiff_t offset, length;
-    size_t incr, size;
-
-    base = CG_BASE(cg);
-    next = CG_NEXT(cg);
-    limit = CG_LIMIT(cg);
-    offset = PTRDIFF(next, base, jsbytecode);
-    if (next + delta > limit) {
-        length = offset + delta;
-        length = (length <= BYTECODE_CHUNK)
-                 ? BYTECODE_CHUNK
-                 : JS_BIT(JS_CeilingLog2(length));
-        incr = BYTECODE_SIZE(length);
-        if (!base) {
-            JS_ARENA_ALLOCATE_CAST(base, jsbytecode *, cg->codePool, incr);
-        } else {
-            size = BYTECODE_SIZE(PTRDIFF(limit, base, jsbytecode));
-            incr -= size;
-            JS_ARENA_GROW_CAST(base, jsbytecode *, cg->codePool, size, incr);
-        }
-        if (!base) {
-            JS_ReportOutOfMemory(cx);
-            return -1;
-        }
-        CG_BASE(cg) = base;
-        CG_LIMIT(cg) = base + length;
-        CG_NEXT(cg) = base + offset;
-    }
-    return offset;
-}
-
-static void
-UpdateDepth(JSContext *cx, JSCodeGenerator *cg, ptrdiff_t target)
-{
-    jsbytecode *pc;
-    const JSCodeSpec *cs;
-    intN nuses;
-
-    pc = CG_CODE(cg, target);
-    cs = &js_CodeSpec[pc[0]];
-    nuses = cs->nuses;
-    if (nuses < 0)
-        nuses = 2 + GET_ARGC(pc);       /* stack: fun, this, [argc arguments] */
-    cg->stackDepth -= nuses;
-    JS_ASSERT(cg->stackDepth >= 0);
-    if (cg->stackDepth < 0) {
-        char numBuf[12];
-        JS_snprintf(numBuf, sizeof numBuf, "%d", target);
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING,
-                                     js_GetErrorMessage, NULL,
-                                     JSMSG_STACK_UNDERFLOW,
-                                     cg->filename ? cg->filename : "stdin",
-                                     numBuf);
-    }
-    cg->stackDepth += cs->ndefs;
-    if ((uintN)cg->stackDepth > cg->maxStackDepth)
-        cg->maxStackDepth = cg->stackDepth;
-}
-
-ptrdiff_t
-js_Emit1(JSContext *cx, JSCodeGenerator *cg, JSOp op)
-{
-    ptrdiff_t offset = EmitCheck(cx, cg, op, 1);
-
-    if (offset >= 0) {
-        *CG_NEXT(cg)++ = (jsbytecode)op;
-        UpdateDepth(cx, cg, offset);
-    }
-    return offset;
-}
-
-ptrdiff_t
-js_Emit2(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1)
-{
-    ptrdiff_t offset = EmitCheck(cx, cg, op, 2);
-
-    if (offset >= 0) {
-        jsbytecode *next = CG_NEXT(cg);
-        next[0] = (jsbytecode)op;
-        next[1] = op1;
-        CG_NEXT(cg) = next + 2;
-        UpdateDepth(cx, cg, offset);
-    }
-    return offset;
-}
-
-ptrdiff_t
-js_Emit3(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1,
-         jsbytecode op2)
-{
-    ptrdiff_t offset = EmitCheck(cx, cg, op, 3);
-
-    if (offset >= 0) {
-        jsbytecode *next = CG_NEXT(cg);
-        next[0] = (jsbytecode)op;
-        next[1] = op1;
-        next[2] = op2;
-        CG_NEXT(cg) = next + 3;
-        UpdateDepth(cx, cg, offset);
-    }
-    return offset;
-}
-
-ptrdiff_t
-js_EmitN(JSContext *cx, JSCodeGenerator *cg, JSOp op, size_t extra)
-{
-    ptrdiff_t length = 1 + (ptrdiff_t)extra;
-    ptrdiff_t offset = EmitCheck(cx, cg, op, length);
-
-    if (offset >= 0) {
-        jsbytecode *next = CG_NEXT(cg);
-        *next = (jsbytecode)op;
-        memset(next + 1, 0, BYTECODE_SIZE(extra));
-        CG_NEXT(cg) = next + length;
-        UpdateDepth(cx, cg, offset);
-    }
-    return offset;
-}
-
-/* XXX too many "... statement" L10N gaffes below -- fix via js.msg! */
-const char js_with_statement_str[] = "with statement";
-const char js_script_str[]         = "script";
-
-static const char *statementName[] = {
-    "block",                 /* BLOCK */
-    "label statement",       /* LABEL */
-    "if statement",          /* IF */
-    "else statement",        /* ELSE */
-    "switch statement",      /* SWITCH */
-    js_with_statement_str,   /* WITH */
-    "try statement",         /* TRY */
-    "catch block",           /* CATCH */
-    "finally statement",     /* FINALLY */
-    "do loop",               /* DO_LOOP */
-    "for loop",              /* FOR_LOOP */
-    "for/in loop",           /* FOR_IN_LOOP */
-    "while loop",            /* WHILE_LOOP */
-};
-
-static const char *
-StatementName(JSCodeGenerator *cg)
-{
-    if (!cg->treeContext.topStmt)
-        return js_script_str;
-    return statementName[cg->treeContext.topStmt->type];
-}
-
-static void
-ReportStatementTooLarge(JSContext *cx, JSCodeGenerator *cg)
-{
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NEED_DIET,
-                         StatementName(cg));
-}
-
-/**
-  Span-dependent instructions in JS bytecode consist of the jump (JOF_JUMP)
-  and switch (JOF_LOOKUPSWITCH, JOF_TABLESWITCH) format opcodes, subdivided
-  into unconditional (gotos and gosubs), and conditional jumps or branches
-  (which pop a value, test it, and jump depending on its value).  Most jumps
-  have just one immediate operand, a signed offset from the jump opcode's pc
-  to the target bytecode.  The lookup and table switch opcodes may contain
-  many jump offsets.
-
-  Mozilla bug #80981 (http://bugzilla.mozilla.org/show_bug.cgi?id=80981) was
-  fixed by adding extended "X" counterparts to the opcodes/formats (NB: X is
-  suffixed to prefer JSOP_ORX thereby avoiding a JSOP_XOR name collision for
-  the extended form of the JSOP_OR branch opcode).  The unextended or short
-  formats have 16-bit signed immediate offset operands, the extended or long
-  formats have 32-bit signed immediates.  The span-dependency problem consists
-  of selecting as few long instructions as possible, or about as few -- since
-  jumps can span other jumps, extending one jump may cause another to need to
-  be extended.
-
-  Most JS scripts are short, so need no extended jumps.  We optimize for this
-  case by generating short jumps until we know a long jump is needed.  After
-  that point, we keep generating short jumps, but each jump's 16-bit immediate
-  offset operand is actually an unsigned index into cg->spanDeps, an array of
-  JSSpanDep structs.  Each struct tells the top offset in the script of the
-  opcode, the "before" offset of the jump (which will be the same as top for
-  simplex jumps, but which will index further into the bytecode array for a
-  non-initial jump offset in a lookup or table switch), the after "offset"
-  adjusted during span-dependent instruction selection (initially the same
-  value as the "before" offset), and the jump target (more below).
-
-  Since we generate cg->spanDeps lazily, from within js_SetJumpOffset, we must
-  ensure that all bytecode generated so far can be inspected to discover where
-  the jump offset immediate operands lie within CG_CODE(cg).  But the bonus is
-  that we generate span-dependency records sorted by their offsets, so we can
-  binary-search when trying to find a JSSpanDep for a given bytecode offset,
-  or the nearest JSSpanDep at or above a given pc.
-
-  To avoid limiting scripts to 64K jumps, if the cg->spanDeps index overflows
-  65534, we store SPANDEP_INDEX_HUGE in the jump's immediate operand.  This
-  tells us that we need to binary-search for the cg->spanDeps entry by the
-  jump opcode's bytecode offset (sd->before).
-
-  Jump targets need to be maintained in a data structure that lets us look
-  up an already-known target by its address (jumps may have a common target),
-  and that also lets us update the addresses (script-relative, a.k.a. absolute
-  offsets) of targets that come after a jump target (for when a jump below
-  that target needs to be extended).  We use an AVL tree, implemented using
-  recursion, but with some tricky optimizations to its height-balancing code
-  (see http://www.cmcrossroads.com/bradapp/ftp/src/libs/C++/AvlTrees.html).
-
-  A final wrinkle: backpatch chains are linked by jump-to-jump offsets with
-  positive sign, even though they link "backward" (i.e., toward lower bytecode
-  address).  We don't want to waste space and search time in the AVL tree for
-  such temporary backpatch deltas, so we use a single-bit wildcard scheme to
-  tag true JSJumpTarget pointers and encode untagged, signed (positive) deltas
-  in JSSpanDep.target pointers, depending on whether the JSSpanDep has a known
-  target, or is still awaiting backpatching.
-
-  Note that backpatch chains would present a problem for BuildSpanDepTable,
-  which inspects bytecode to build cg->spanDeps on demand, when the first
-  short jump offset overflows.  To solve this temporary problem, we emit a
-  proxy bytecode (JSOP_BACKPATCH; JSOP_BACKPATCH_PUSH for jumps that push a
-  result on the interpreter's stack, namely JSOP_GOSUB; or JSOP_BACKPATCH_POP
-  for branch ops) whose nuses/ndefs counts help keep the stack balanced, but
-  whose opcode format distinguishes its backpatch delta immediate operand from
-  a normal jump offset.
- */
-static int
-BalanceJumpTargets(JSJumpTarget **jtp)
-{
-    JSJumpTarget *jt, *jt2, *root;
-    int dir, otherDir, heightChanged;
-    JSBool doubleRotate;
-
-    jt = *jtp;
-    JS_ASSERT(jt->balance != 0);
-
-    if (jt->balance < -1) {
-        dir = JT_RIGHT;
-        doubleRotate = (jt->kids[JT_LEFT]->balance > 0);
-    } else if (jt->balance > 1) {
-        dir = JT_LEFT;
-        doubleRotate = (jt->kids[JT_RIGHT]->balance < 0);
-    } else {
-        return 0;
-    }
-
-    otherDir = JT_OTHER_DIR(dir);
-    if (doubleRotate) {
-        jt2 = jt->kids[otherDir];
-        *jtp = root = jt2->kids[dir];
-
-        jt->kids[otherDir] = root->kids[dir];
-        root->kids[dir] = jt;
-
-        jt2->kids[dir] = root->kids[otherDir];
-        root->kids[otherDir] = jt2;
-
-        heightChanged = 1;
-        root->kids[JT_LEFT]->balance = -JS_MAX(root->balance, 0);
-        root->kids[JT_RIGHT]->balance = -JS_MIN(root->balance, 0);
-        root->balance = 0;
-    } else {
-        *jtp = root = jt->kids[otherDir];
-        jt->kids[otherDir] = root->kids[dir];
-        root->kids[dir] = jt;
-
-        heightChanged = (root->balance != 0);
-        jt->balance = -((dir == JT_LEFT) ? --root->balance : ++root->balance);
-    }
-
-    return heightChanged;
-}
-
-typedef struct AddJumpTargetArgs {
-    JSContext           *cx;
-    JSCodeGenerator     *cg;
-    ptrdiff_t           offset;
-    JSJumpTarget        *node;
-} AddJumpTargetArgs;
-
-static int
-AddJumpTarget(AddJumpTargetArgs *args, JSJumpTarget **jtp)
-{
-    JSJumpTarget *jt;
-    int balanceDelta;
-
-    jt = *jtp;
-    if (!jt) {
-        JSCodeGenerator *cg = args->cg;
-
-        jt = cg->jtFreeList;
-        if (jt) {
-            cg->jtFreeList = jt->kids[JT_LEFT];
-        } else {
-            JS_ARENA_ALLOCATE_CAST(jt, JSJumpTarget *, &args->cx->tempPool,
-                                   sizeof *jt);
-            if (!jt) {
-                JS_ReportOutOfMemory(args->cx);
-                return 0;
-            }
-        }
-        jt->offset = args->offset;
-        jt->balance = 0;
-        jt->kids[JT_LEFT] = jt->kids[JT_RIGHT] = NULL;
-        cg->numJumpTargets++;
-        args->node = jt;
-        *jtp = jt;
-        return 1;
-    }
-
-    if (jt->offset == args->offset) {
-        args->node = jt;
-        return 0;
-    }
-
-    if (args->offset < jt->offset)
-        balanceDelta = -AddJumpTarget(args, &jt->kids[JT_LEFT]);
-    else
-        balanceDelta = AddJumpTarget(args, &jt->kids[JT_RIGHT]);
-    if (!args->node)
-        return 0;
-
-    jt->balance += balanceDelta;
-    return (balanceDelta && jt->balance)
-           ? 1 - BalanceJumpTargets(jtp)
-           : 0;
-}
-
-#ifdef DEBUG_brendan
-static int AVLCheck(JSJumpTarget *jt)
-{
-    int lh, rh;
-
-    if (!jt) return 0;
-    JS_ASSERT(-1 <= jt->balance && jt->balance <= 1);
-    lh = AVLCheck(jt->kids[JT_LEFT]);
-    rh = AVLCheck(jt->kids[JT_RIGHT]);
-    JS_ASSERT(jt->balance == rh - lh);
-    return 1 + JS_MAX(lh, rh);
-}
-#endif
-
-static JSBool
-SetSpanDepTarget(JSContext *cx, JSCodeGenerator *cg, JSSpanDep *sd,
-                 ptrdiff_t off)
-{
-    AddJumpTargetArgs args;
-
-    if (off < JUMPX_OFFSET_MIN || JUMPX_OFFSET_MAX < off) {
-        ReportStatementTooLarge(cx, cg);
-        return JS_FALSE;
-    }
-
-    args.cx = cx;
-    args.cg = cg;
-    args.offset = sd->top + off;
-    args.node = NULL;
-    AddJumpTarget(&args, &cg->jumpTargets);
-    if (!args.node)
-        return JS_FALSE;
-
-#ifdef DEBUG_brendan
-    AVLCheck(cg->jumpTargets);
-#endif
-
-    SD_SET_TARGET(sd, args.node);
-    return JS_TRUE;
-}
-
-#define SPANDEPS_MIN            256
-#define SPANDEPS_SIZE(n)        ((n) * sizeof(JSSpanDep))
-#define SPANDEPS_SIZE_MIN       SPANDEPS_SIZE(SPANDEPS_MIN)
-
-static JSBool
-AddSpanDep(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc, jsbytecode *pc2,
-           ptrdiff_t off)
-{
-    uintN index;
-    JSSpanDep *sdbase, *sd;
-    size_t size;
-
-    index = cg->numSpanDeps;
-    if (index + 1 == 0) {
-        ReportStatementTooLarge(cx, cg);
-        return JS_FALSE;
-    }
-
-    if ((index & (index - 1)) == 0 &&
-        (!(sdbase = cg->spanDeps) || index >= SPANDEPS_MIN)) {
-        if (!sdbase) {
-            size = SPANDEPS_SIZE_MIN;
-            JS_ARENA_ALLOCATE_CAST(sdbase, JSSpanDep *, &cx->tempPool, size);
-        } else {
-            size = SPANDEPS_SIZE(index);
-            JS_ARENA_GROW_CAST(sdbase, JSSpanDep *, &cx->tempPool, size, size);
-        }
-        if (!sdbase)
-            return JS_FALSE;
-        cg->spanDeps = sdbase;
-    }
-
-    cg->numSpanDeps = index + 1;
-    sd = cg->spanDeps + index;
-    sd->top = PTRDIFF(pc, CG_BASE(cg), jsbytecode);
-    sd->offset = sd->before = PTRDIFF(pc2, CG_BASE(cg), jsbytecode);
-
-    if (js_CodeSpec[*pc].format & JOF_BACKPATCH) {
-        /* Jump offset will be backpatched if off is a non-zero "bpdelta". */
-        if (off != 0) {
-            JS_ASSERT(off >= 1 + JUMP_OFFSET_LEN);
-            if (off > BPDELTA_MAX) {
-                ReportStatementTooLarge(cx, cg);
-                return JS_FALSE;
-            }
-        }
-        SD_SET_BPDELTA(sd, off);
-    } else if (off == 0) {
-        /* Jump offset will be patched directly, without backpatch chaining. */
-        SD_SET_TARGET(sd, NULL);
-    } else {
-        /* The jump offset in off is non-zero, therefore it's already known. */
-        if (!SetSpanDepTarget(cx, cg, sd, off))
-            return JS_FALSE;
-    }
-
-    if (index > SPANDEP_INDEX_MAX)
-        index = SPANDEP_INDEX_HUGE;
-    SET_SPANDEP_INDEX(pc2, index);
-    return JS_TRUE;
-}
-
-static JSBool
-BuildSpanDepTable(JSContext *cx, JSCodeGenerator *cg)
-{
-    jsbytecode *pc, *end;
-    JSOp op;
-    const JSCodeSpec *cs;
-    ptrdiff_t len, off;
-
-    pc = CG_BASE(cg) + cg->spanDepTodo;
-    end = CG_NEXT(cg);
-    while (pc < end) {
-        op = (JSOp)*pc;
-        cs = &js_CodeSpec[op];
-        len = (ptrdiff_t)cs->length;
-
-        switch (cs->format & JOF_TYPEMASK) {
-          case JOF_JUMP:
-            off = GET_JUMP_OFFSET(pc);
-            if (!AddSpanDep(cx, cg, pc, pc, off))
-                return JS_FALSE;
-            break;
-
-#if JS_HAS_SWITCH_STATEMENT
-          case JOF_TABLESWITCH:
-          {
-            jsbytecode *pc2;
-            jsint i, low, high;
-
-            pc2 = pc;
-            off = GET_JUMP_OFFSET(pc2);
-            if (!AddSpanDep(cx, cg, pc, pc2, off))
-                return JS_FALSE;
-            pc2 += JUMP_OFFSET_LEN;
-            low = GET_JUMP_OFFSET(pc2);
-            pc2 += JUMP_OFFSET_LEN;
-            high = GET_JUMP_OFFSET(pc2);
-            pc2 += JUMP_OFFSET_LEN;
-            for (i = low; i <= high; i++) {
-                off = GET_JUMP_OFFSET(pc2);
-                if (!AddSpanDep(cx, cg, pc, pc2, off))
-                    return JS_FALSE;
-                pc2 += JUMP_OFFSET_LEN;
-            }
-            len = 1 + pc2 - pc;
-            break;
-          }
-
-          case JOF_LOOKUPSWITCH:
-          {
-            jsbytecode *pc2;
-            jsint npairs;
-
-            pc2 = pc;
-            off = GET_JUMP_OFFSET(pc2);
-            if (!AddSpanDep(cx, cg, pc, pc2, off))
-                return JS_FALSE;
-            pc2 += JUMP_OFFSET_LEN;
-            npairs = (jsint) GET_ATOM_INDEX(pc2);
-            pc2 += ATOM_INDEX_LEN;
-            while (npairs) {
-                pc2 += ATOM_INDEX_LEN;
-                off = GET_JUMP_OFFSET(pc2);
-                if (!AddSpanDep(cx, cg, pc, pc2, off))
-                    return JS_FALSE;
-                pc2 += JUMP_OFFSET_LEN;
-                npairs--;
-            }
-            len = 1 + pc2 - pc;
-            break;
-          }
-#endif /* JS_HAS_SWITCH_STATEMENT */
-        }
-
-        JS_ASSERT(len > 0);
-        pc += len;
-    }
-
-    return JS_TRUE;
-}
-
-static JSSpanDep *
-GetSpanDep(JSCodeGenerator *cg, jsbytecode *pc)
-{
-    uintN index;
-    ptrdiff_t offset;
-    int lo, hi, mid;
-    JSSpanDep *sd;
-
-    index = GET_SPANDEP_INDEX(pc);
-    if (index != SPANDEP_INDEX_HUGE)
-        return cg->spanDeps + index;
-
-    offset = PTRDIFF(pc, CG_BASE(cg), jsbytecode);
-    lo = 0;
-    hi = cg->numSpanDeps - 1;
-    while (lo <= hi) {
-        mid = (lo + hi) / 2;
-        sd = cg->spanDeps + mid;
-        if (sd->before == offset)
-            return sd;
-        if (sd->before < offset)
-            lo = mid + 1;
-        else
-            hi = mid - 1;
-    }
-
-    JS_ASSERT(0);
-    return NULL;
-}
-
-static JSBool
-SetBackPatchDelta(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc,
-                  ptrdiff_t delta)
-{
-    JSSpanDep *sd;
-
-    JS_ASSERT(delta >= 1 + JUMP_OFFSET_LEN);
-    if (!cg->spanDeps && delta < JUMP_OFFSET_MAX) {
-        SET_JUMP_OFFSET(pc, delta);
-        return JS_TRUE;
-    }
-
-    if (delta > BPDELTA_MAX) {
-        ReportStatementTooLarge(cx, cg);
-        return JS_FALSE;
-    }
-
-    if (!cg->spanDeps && !BuildSpanDepTable(cx, cg))
-        return JS_FALSE;
-
-    sd = GetSpanDep(cg, pc);
-    JS_ASSERT(SD_GET_BPDELTA(sd) == 0);
-    SD_SET_BPDELTA(sd, delta);
-    return JS_TRUE;
-}
-
-static void
-UpdateJumpTargets(JSJumpTarget *jt, ptrdiff_t pivot, ptrdiff_t delta)
-{
-    if (jt->offset > pivot) {
-        jt->offset += delta;
-        if (jt->kids[JT_LEFT])
-            UpdateJumpTargets(jt->kids[JT_LEFT], pivot, delta);
-    }
-    if (jt->kids[JT_RIGHT])
-        UpdateJumpTargets(jt->kids[JT_RIGHT], pivot, delta);
-}
-
-static JSSpanDep *
-FindNearestSpanDep(JSCodeGenerator *cg, ptrdiff_t offset, int lo,
-                   JSSpanDep *guard)
-{
-    int num, hi, mid;
-    JSSpanDep *sdbase, *sd;
-
-    num = cg->numSpanDeps;
-    JS_ASSERT(num > 0);
-    hi = num - 1;
-    sdbase = cg->spanDeps;
-    while (lo <= hi) {
-        mid = (lo + hi) / 2;
-        sd = sdbase + mid;
-        if (sd->before == offset)
-            return sd;
-        if (sd->before < offset)
-            lo = mid + 1;
-        else
-            hi = mid - 1;
-    }
-    if (lo == num)
-        return guard;
-    sd = sdbase + lo;
-    JS_ASSERT(sd->before >= offset && (lo == 0 || sd[-1].before < offset));
-    return sd;
-}
-
-static void
-FreeJumpTargets(JSCodeGenerator *cg, JSJumpTarget *jt)
-{
-    if (jt->kids[JT_LEFT])
-        FreeJumpTargets(cg, jt->kids[JT_LEFT]);
-    if (jt->kids[JT_RIGHT])
-        FreeJumpTargets(cg, jt->kids[JT_RIGHT]);
-    jt->kids[JT_LEFT] = cg->jtFreeList;
-    cg->jtFreeList = jt;
-}
-
-static JSBool
-OptimizeSpanDeps(JSContext *cx, JSCodeGenerator *cg)
-{
-    jsbytecode *pc, *oldpc, *base, *limit, *next;
-    JSSpanDep *sd, *sd2, *sdbase, *sdlimit, *sdtop, guard;
-    ptrdiff_t offset, growth, delta, top, pivot, span, length, target;
-    JSBool done;
-    JSOp op;
-    uint32 type;
-    size_t size, incr;
-    jssrcnote *sn, *snlimit;
-    JSSrcNoteSpec *spec;
-    uintN i, n, noteIndex;
-    JSTryNote *tn, *tnlimit;
-#ifdef DEBUG_brendan
-    int passes = 0;
-#endif
-
-    base = CG_BASE(cg);
-    sdbase = cg->spanDeps;
-    sdlimit = sdbase + cg->numSpanDeps;
-    offset = CG_OFFSET(cg);
-    growth = 0;
-
-    do {
-        done = JS_TRUE;
-        delta = 0;
-        top = pivot = -1;
-        sdtop = NULL;
-        pc = NULL;
-        op = JSOP_NOP;
-        type = 0;
-#ifdef DEBUG_brendan
-        passes++;
-#endif
-
-        for (sd = sdbase; sd < sdlimit; sd++) {
-            JS_ASSERT(JT_HAS_TAG(sd->target));
-            sd->offset += delta;
-
-            if (sd->top != top) {
-                sdtop = sd;
-                top = sd->top;
-                JS_ASSERT(top == sd->before);
-                pivot = sd->offset;
-                pc = base + top;
-                op = (JSOp) *pc;
-                type = (js_CodeSpec[op].format & JOF_TYPEMASK);
-                if (JOF_TYPE_IS_EXTENDED_JUMP(type)) {
-                    /*
-                     * We already extended all the jump offset operands for
-                     * the opcode at sd->top.  Jumps and branches have only
-                     * one jump offset operand, but switches have many, all
-                     * of which are adjacent in cg->spanDeps.
-                     */
-                    continue;
-                }
-
-                JS_ASSERT(type == JOF_JUMP ||
-                          type == JOF_TABLESWITCH ||
-                          type == JOF_LOOKUPSWITCH);
-            }
-
-            if (!JOF_TYPE_IS_EXTENDED_JUMP(type)) {
-                span = SD_SPAN(sd, pivot);
-                if (span < JUMP_OFFSET_MIN || JUMP_OFFSET_MAX < span) {
-                    ptrdiff_t deltaFromTop = 0;
-
-                    done = JS_FALSE;
-
-                    switch (op) {
-                      case JSOP_GOTO:         op = JSOP_GOTOX; break;
-                      case JSOP_IFEQ:         op = JSOP_IFEQX; break;
-                      case JSOP_IFNE:         op = JSOP_IFNEX; break;
-                      case JSOP_OR:           op = JSOP_ORX; break;
-                      case JSOP_AND:          op = JSOP_ANDX; break;
-                      case JSOP_GOSUB:        op = JSOP_GOSUBX; break;
-                      case JSOP_CASE:         op = JSOP_CASEX; break;
-                      case JSOP_DEFAULT:      op = JSOP_DEFAULTX; break;
-                      case JSOP_TABLESWITCH:  op = JSOP_TABLESWITCHX; break;
-                      case JSOP_LOOKUPSWITCH: op = JSOP_LOOKUPSWITCHX; break;
-                      default:                JS_ASSERT(0);
-                    }
-                    *pc = (jsbytecode) op;
-
-                    for (sd2 = sdtop; sd2 < sdlimit && sd2->top == top; sd2++) {
-                        if (sd2 <= sd) {
-                            /*
-                             * sd2->offset already includes delta as it stood
-                             * before we entered this loop, but it must also
-                             * include the delta relative to top due to all the
-                             * extended jump offset immediates for the opcode
-                             * starting at top, which we extend in this loop.
-                             *
-                             * If there is only one extended jump offset, then
-                             * sd2->offset won't change and this for loop will
-                             * iterate once only.
-                             */
-                            sd2->offset += deltaFromTop;
-                            deltaFromTop += JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN;
-                        } else {
-                            /*
-                             * sd2 comes after sd, and won't be revisited by
-                             * the outer for loop, so we have to increase its
-                             * offset by delta, not merely by deltaFromTop.
-                             */
-                            sd2->offset += delta;
-                        }
-
-                        delta += JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN;
-                        UpdateJumpTargets(cg->jumpTargets, sd2->offset,
-                                          JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN);
-                    }
-                    sd = sd2 - 1;
-                }
-            }
-        }
-
-        growth += delta;
-    } while (!done);
-
-    if (growth) {
-#ifdef DEBUG_brendan
-        printf("%s:%u: %u/%u jumps extended in %d passes (%d=%d+%d)\n",
-               cg->filename ? cg->filename : "stdin", cg->firstLine,
-               growth / (JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN), cg->numSpanDeps,
-               passes, offset + growth, offset, growth);
-#endif
-
-        /*
-         * Ensure that we have room for the extended jumps, but don't round up
-         * to a power of two -- we're done generating code, so we cut to fit.
-         */
-        limit = CG_LIMIT(cg);
-        length = offset + growth;
-        next = base + length;
-        if (next > limit) {
-            JS_ASSERT(length > BYTECODE_CHUNK);
-            size = BYTECODE_SIZE(PTRDIFF(limit, base, jsbytecode));
-            incr = BYTECODE_SIZE(length) - size;
-            JS_ARENA_GROW_CAST(base, jsbytecode *, cg->codePool, size, incr);
-            if (!base) {
-                JS_ReportOutOfMemory(cx);
-                return JS_FALSE;
-            }
-            CG_BASE(cg) = base;
-            CG_LIMIT(cg) = next = base + length;
-        }
-        CG_NEXT(cg) = next;
-
-        /*
-         * Set up a fake span dependency record to guard the end of the code
-         * being generated.  This guard record is returned as a fencepost by
-         * FindNearestSpanDep if there is no real spandep at or above a given
-         * unextended code offset.
-         */
-        guard.top = -1;
-        guard.offset = offset + growth;
-        guard.before = offset;
-        guard.target = NULL;
-    }
-
-    /*
-     * Now work backwards through the span dependencies, copying chunks of
-     * bytecode between each extended jump toward the end of the grown code
-     * space, and restoring immediate offset operands for all jump bytecodes.
-     * The first chunk of bytecodes, starting at base and ending at the first
-     * extended jump offset (NB: this chunk includes the operation bytecode
-     * just before that immediate jump offset), doesn't need to be copied.
-     */
-    JS_ASSERT(sd == sdlimit);
-    top = -1;
-    while (--sd >= sdbase) {
-        if (sd->top != top) {
-            top = sd->top;
-            op = (JSOp) base[top];
-            type = (js_CodeSpec[op].format & JOF_TYPEMASK);
-
-            for (sd2 = sd - 1; sd2 >= sdbase && sd2->top == top; sd2--)
-                continue;
-            sd2++;
-            pivot = sd2->offset;
-            JS_ASSERT(top == sd2->before);
-        }
-
-        oldpc = base + sd->before;
-        span = SD_SPAN(sd, pivot);
-
-        /*
-         * If this jump didn't need to be extended, restore its span immediate
-         * offset operand now, overwriting the index of sd within cg->spanDeps
-         * that was stored temporarily after *pc when BuildSpanDepTable ran.
-         *
-         * Note that span might fit in 16 bits even for an extended jump op,
-         * if the op has multiple span operands, not all of which overflowed
-         * (e.g. JSOP_LOOKUPSWITCH or JSOP_TABLESWITCH where some cases are in
-         * range for a short jump, but others are not).
-         */
-        if (!JOF_TYPE_IS_EXTENDED_JUMP(type)) {
-            JS_ASSERT(JUMP_OFFSET_MIN <= span && span <= JUMP_OFFSET_MAX);
-            SET_JUMP_OFFSET(oldpc, span);
-            continue;
-        }
-
-        /*
-         * Set up parameters needed to copy the next run of bytecode starting
-         * at offset (which is a cursor into the unextended, original bytecode
-         * vector), down to sd->before (a cursor of the same scale as offset,
-         * it's the index of the original jump pc).  Reuse delta to count the
-         * nominal number of bytes to copy.
-         */
-        pc = base + sd->offset;
-        delta = offset - sd->before;
-        JS_ASSERT(delta >= 1 + JUMP_OFFSET_LEN);
-
-        /*
-         * Don't bother copying the jump offset we're about to reset, but do
-         * copy the bytecode at oldpc (which comes just before its immediate
-         * jump offset operand), on the next iteration through the loop, by
-         * including it in offset's new value.
-         */
-        offset = sd->before + 1;
-        size = BYTECODE_SIZE(delta - (1 + JUMP_OFFSET_LEN));
-        if (size) {
-            memmove(pc + 1 + JUMPX_OFFSET_LEN,
-                    oldpc + 1 + JUMP_OFFSET_LEN,
-                    size);
-        }
-
-        SET_JUMPX_OFFSET(pc, span);
-    }
-
-    if (growth) {
-        /*
-         * Fix source note deltas.  Don't hardwire the delta fixup adjustment,
-         * even though currently it must be JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN
-         * at each sd that moved.  The future may bring different offset sizes
-         * for span-dependent instruction operands.  However, we fix only main
-         * notes here, not prolog notes -- we know that prolog opcodes are not
-         * span-dependent, and aren't likely ever to be.
-         */
-        offset = growth = 0;
-        sd = sdbase;
-        for (sn = cg->main.notes, snlimit = sn + cg->main.noteCount;
-             sn < snlimit;
-             sn = SN_NEXT(sn)) {
-            /*
-             * Recall that the offset of a given note includes its delta, and
-             * tells the offset of the annotated bytecode from the main entry
-             * point of the script.
-             */
-            offset += SN_DELTA(sn);
-            while (sd < sdlimit && sd->before < offset) {
-                /*
-                 * To compute the delta to add to sn, we need to look at the
-                 * spandep after sd, whose offset - (before + growth) tells by
-                 * how many bytes sd's instruction grew.
-                 */
-                sd2 = sd + 1;
-                if (sd2 == sdlimit)
-                    sd2 = &guard;
-                delta = sd2->offset - (sd2->before + growth);
-                if (delta > 0) {
-                    JS_ASSERT(delta == JUMPX_OFFSET_LEN - JUMP_OFFSET_LEN);
-                    sn = js_AddToSrcNoteDelta(cx, cg, sn, delta);
-                    if (!sn)
-                        return JS_FALSE;
-                    snlimit = cg->main.notes + cg->main.noteCount;
-                    growth += delta;
-                }
-                sd++;
-            }
-
-            /*
-             * If sn has span-dependent offset operands, check whether each
-             * covers further span-dependencies, and increase those operands
-             * accordingly.  Some source notes measure offset not from the
-             * annotated pc, but from that pc plus some small bias.  NB: we
-             * assume that spec->offsetBias can't itself span span-dependent
-             * instructions!
-             */
-            spec = &js_SrcNoteSpec[SN_TYPE(sn)];
-            if (spec->isSpanDep) {
-                pivot = offset + spec->offsetBias;
-                n = spec->arity;
-                for (i = 0; i < n; i++) {
-                    span = js_GetSrcNoteOffset(sn, i);
-                    if (span == 0)
-                        continue;
-                    target = pivot + span * spec->isSpanDep;
-                    sd2 = FindNearestSpanDep(cg, target,
-                                             (target >= pivot)
-                                             ? sd - sdbase
-                                             : 0,
-                                             &guard);
-
-                    /*
-                     * Increase target by sd2's before-vs-after offset delta,
-                     * which is absolute (i.e., relative to start of script,
-                     * as is target).  Recompute the span by subtracting its
-                     * adjusted pivot from target.
-                     */
-                    target += sd2->offset - sd2->before;
-                    span = target - (pivot + growth);
-                    span *= spec->isSpanDep;
-                    noteIndex = sn - cg->main.notes;
-                    if (!js_SetSrcNoteOffset(cx, cg, noteIndex, i, span))
-                        return JS_FALSE;
-                    sn = cg->main.notes + noteIndex;
-                    snlimit = cg->main.notes + cg->main.noteCount;
-                }
-            }
-        }
-        cg->main.lastNoteOffset += growth;
-
-        /*
-         * Fix try/catch notes (O(numTryNotes * log2(numSpanDeps)), but it's
-         * not clear how we can beat that).
-         */
-        for (tn = cg->tryBase, tnlimit = cg->tryNext; tn < tnlimit; tn++) {
-            /*
-             * First, look for the nearest span dependency at/above tn->start.
-             * There may not be any such spandep, in which case the guard will
-             * be returned.
-             */
-            offset = tn->start;
-            sd = FindNearestSpanDep(cg, offset, 0, &guard);
-            delta = sd->offset - sd->before;
-            tn->start = offset + delta;
-
-            /*
-             * Next, find the nearest spandep at/above tn->start + tn->length.
-             * Use its delta minus tn->start's delta to increase tn->length.
-             */
-            length = tn->length;
-            sd2 = FindNearestSpanDep(cg, offset + length, sd - sdbase, &guard);
-            if (sd2 != sd)
-                tn->length = length + sd2->offset - sd2->before - delta;
-
-            /*
-             * Finally, adjust tn->catchStart upward only if it is non-zero,
-             * and provided there are spandeps below it that grew.
-             */
-            offset = tn->catchStart;
-            if (offset != 0) {
-                sd = FindNearestSpanDep(cg, offset, sd2 - sdbase, &guard);
-                tn->catchStart = offset + sd->offset - sd->before;
-            }
-        }
-    }
-
-#ifdef DEBUG_brendan
-  {
-    uintN bigspans = 0;
-    top = -1;
-    for (sd = sdbase; sd < sdlimit; sd++) {
-        offset = sd->offset;
-
-        /* NB: sd->top cursors into the original, unextended bytecode vector. */
-        if (sd->top != top) {
-            JS_ASSERT(top == -1 ||
-                      !JOF_TYPE_IS_EXTENDED_JUMP(type) ||
-                      bigspans != 0);
-            bigspans = 0;
-            top = sd->top;
-            JS_ASSERT(top == sd->before);
-            op = (JSOp) base[offset];
-            type = (js_CodeSpec[op].format & JOF_TYPEMASK);
-            JS_ASSERT(type == JOF_JUMP ||
-                      type == JOF_JUMPX ||
-                      type == JOF_TABLESWITCH ||
-                      type == JOF_TABLESWITCHX ||
-                      type == JOF_LOOKUPSWITCH ||
-                      type == JOF_LOOKUPSWITCHX);
-            pivot = offset;
-        }
-
-        pc = base + offset;
-        if (JOF_TYPE_IS_EXTENDED_JUMP(type)) {
-            span = GET_JUMPX_OFFSET(pc);
-            if (span < JUMP_OFFSET_MIN || JUMP_OFFSET_MAX < span) {
-                bigspans++;
-            } else {
-                JS_ASSERT(type == JOF_TABLESWITCHX ||
-                          type == JOF_LOOKUPSWITCHX);
-            }
-        } else {
-            span = GET_JUMP_OFFSET(pc);
-        }
-        JS_ASSERT(SD_SPAN(sd, pivot) == span);
-    }
-    JS_ASSERT(!JOF_TYPE_IS_EXTENDED_JUMP(type) || bigspans != 0);
-  }
-#endif
-
-    /*
-     * Reset so we optimize at most once -- cg may be used for further code
-     * generation of successive, independent, top-level statements.  No jump
-     * can span top-level statements, because JS lacks goto.
-     */
-    size = SPANDEPS_SIZE(JS_BIT(JS_CeilingLog2(cg->numSpanDeps)));
-    JS_ArenaFreeAllocation(&cx->tempPool, cg->spanDeps,
-                           JS_MAX(size, SPANDEPS_SIZE_MIN));
-    cg->spanDeps = NULL;
-    FreeJumpTargets(cg, cg->jumpTargets);
-    cg->jumpTargets = NULL;
-    cg->numSpanDeps = cg->numJumpTargets = 0;
-    cg->spanDepTodo = CG_OFFSET(cg);
-    return JS_TRUE;
-}
-
-static JSBool
-EmitJump(JSContext *cx, JSCodeGenerator *cg, JSOp op, ptrdiff_t off)
-{
-    JSBool extend;
-    ptrdiff_t jmp;
-    jsbytecode *pc;
-
-    extend = off < JUMP_OFFSET_MIN || JUMP_OFFSET_MAX < off;
-    if (extend && !cg->spanDeps && !BuildSpanDepTable(cx, cg))
-        return JS_FALSE;
-
-    jmp = js_Emit3(cx, cg, op, JUMP_OFFSET_HI(off), JUMP_OFFSET_LO(off));
-    if (jmp >= 0 && (extend || cg->spanDeps)) {
-        pc = CG_CODE(cg, jmp);
-        if (!AddSpanDep(cx, cg, pc, pc, off))
-            return JS_FALSE;
-    }
-    return jmp;
-}
-
-static ptrdiff_t
-GetJumpOffset(JSCodeGenerator *cg, jsbytecode *pc)
-{
-    JSSpanDep *sd;
-    JSJumpTarget *jt;
-    ptrdiff_t top;
-
-    if (!cg->spanDeps)
-        return GET_JUMP_OFFSET(pc);
-
-    sd = GetSpanDep(cg, pc);
-    jt = sd->target;
-    if (!JT_HAS_TAG(jt))
-        return JT_TO_BPDELTA(jt);
-
-    top = sd->top;
-    while (--sd >= cg->spanDeps && sd->top == top)
-        continue;
-    sd++;
-    return JT_CLR_TAG(jt)->offset - sd->offset;
-}
-
-JSBool
-js_SetJumpOffset(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc,
-                 ptrdiff_t off)
-{
-    if (!cg->spanDeps) {
-        if (JUMP_OFFSET_MIN <= off && off <= JUMP_OFFSET_MAX) {
-            SET_JUMP_OFFSET(pc, off);
-            return JS_TRUE;
-        }
-
-        if (!BuildSpanDepTable(cx, cg))
-            return JS_FALSE;
-    }
-
-    return SetSpanDepTarget(cx, cg, GetSpanDep(cg, pc), off);
-}
-
-JSBool
-js_InWithStatement(JSTreeContext *tc)
-{
-    JSStmtInfo *stmt;
-
-    for (stmt = tc->topStmt; stmt; stmt = stmt->down) {
-        if (stmt->type == STMT_WITH)
-            return JS_TRUE;
-    }
-    return JS_FALSE;
-}
-
-JSBool
-js_InCatchBlock(JSTreeContext *tc, JSAtom *atom)
-{
-    JSStmtInfo *stmt;
-
-    for (stmt = tc->topStmt; stmt; stmt = stmt->down) {
-        if (stmt->type == STMT_CATCH && stmt->label == atom)
-            return JS_TRUE;
-    }
-    return JS_FALSE;
-}
-
-void
-js_PushStatement(JSTreeContext *tc, JSStmtInfo *stmt, JSStmtType type,
-                 ptrdiff_t top)
-{
-    stmt->type = type;
-    SET_STATEMENT_TOP(stmt, top);
-    stmt->label = NULL;
-    stmt->down = tc->topStmt;
-    tc->topStmt = stmt;
-}
-
-/*
- * Emit a backpatch op with offset pointing to the previous jump of this type,
- * so that we can walk back up the chain fixing up the op and jump offset.
- */
-static ptrdiff_t
-EmitBackPatchOp(JSContext *cx, JSCodeGenerator *cg, JSOp op, ptrdiff_t *lastp)
-{
-    ptrdiff_t offset, delta;
-
-    offset = CG_OFFSET(cg);
-    delta = offset - *lastp;
-    *lastp = offset;
-    JS_ASSERT(delta > 0);
-    return EmitJump(cx, cg, op, delta);
-}
-
-/* Emit additional bytecode(s) for non-local jumps. */
-static JSBool
-EmitNonLocalJumpFixup(JSContext *cx, JSCodeGenerator *cg, JSStmtInfo *toStmt,
-                      JSOp *returnop)
-{
-    intN depth;
-    JSStmtInfo *stmt;
-    ptrdiff_t jmp;
-
-    /*
-     * Return from within a try block that has a finally clause must be split
-     * into two ops: JSOP_SETRVAL, to pop the r.v. and store it in fp->rval;
-     * and JSOP_RETRVAL, which makes control flow go back to the caller, who
-     * picks up fp->rval as usual.  Otherwise, the stack will be unbalanced
-     * when executing the finally clause.
-     *
-     * We mutate *returnop once only if we find an enclosing try-block (viz,
-     * STMT_FINALLY) to ensure that we emit just one JSOP_SETRVAL before one
-     * or more JSOP_GOSUBs and other fixup opcodes emitted by this function.
-     * Our caller (the TOK_RETURN case of js_EmitTree) then emits *returnop.
-     * The fixup opcodes and gosubs must interleave in the proper order, from
-     * inner statement to outer, so that finally clauses run at the correct
-     * stack depth.
-     */
-    if (returnop) {
-        JS_ASSERT(*returnop == JSOP_RETURN);
-        for (stmt = cg->treeContext.topStmt; stmt != toStmt;
-             stmt = stmt->down) {
-            if (stmt->type == STMT_FINALLY) {
-                if (js_Emit1(cx, cg, JSOP_SETRVAL) < 0)
-                    return JS_FALSE;
-                *returnop = JSOP_RETRVAL;
-                break;
-            }
-        }
-
-        /*
-         * If there are no try-with-finally blocks open around this return
-         * statement, we can generate a return forthwith and skip generating
-         * any fixup code.
-         */
-        if (*returnop == JSOP_RETURN)
-            return JS_TRUE;
-    }
-
-    /*
-     * The non-local jump fixup we emit will unbalance cg->stackDepth, because
-     * the fixup replicates balanced code such as JSOP_LEAVEWITH emitted at the
-     * end of a with statement, so we save cg->stackDepth here and restore it
-     * just before a successful return.
-     */
-    depth = cg->stackDepth;
-    for (stmt = cg->treeContext.topStmt; stmt != toStmt; stmt = stmt->down) {
-        switch (stmt->type) {
-          case STMT_FINALLY:
-            if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-                return JS_FALSE;
-            jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH_PUSH, &stmt->gosub);
-            if (jmp < 0)
-                return JS_FALSE;
-            break;
-
-          case STMT_WITH:
-          case STMT_CATCH:
-            /* There's a With object on the stack that we need to pop. */
-            if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_LEAVEWITH) < 0)
-                return JS_FALSE;
-            break;
-
-          case STMT_FOR_IN_LOOP:
-            /*
-             * The iterator and the object being iterated need to be popped.
-             * JSOP_POP2 isn't decompiled, so it doesn't need to be HIDDEN.
-             */
-            if (js_Emit1(cx, cg, JSOP_POP2) < 0)
-                return JS_FALSE;
-            break;
-
-          case STMT_SUBROUTINE:
-            /* There's a retsub pc-offset on the stack that we need to pop. */
-            if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_POP) < 0)
-                return JS_FALSE;
-            break;
-
-          default:;
-        }
-    }
-
-    cg->stackDepth = depth;
-    return JS_TRUE;
-}
-
-static ptrdiff_t
-EmitGoto(JSContext *cx, JSCodeGenerator *cg, JSStmtInfo *toStmt,
-         ptrdiff_t *lastp, JSAtomListElement *label, JSSrcNoteType noteType)
-{
-    intN index;
-
-    if (!EmitNonLocalJumpFixup(cx, cg, toStmt, NULL))
-        return -1;
-
-    if (label) {
-        index = js_NewSrcNote(cx, cg, noteType);
-        if (index < 0)
-            return -1;
-        if (!js_SetSrcNoteOffset(cx, cg, (uintN)index, 0,
-                                 (ptrdiff_t) ALE_INDEX(label))) {
-            return -1;
-        }
-    } else if (noteType != SRC_NULL) {
-        if (js_NewSrcNote(cx, cg, noteType) < 0)
-            return -1;
-    }
-
-    return EmitBackPatchOp(cx, cg, JSOP_BACKPATCH, lastp);
-}
-
-static JSBool
-BackPatch(JSContext *cx, JSCodeGenerator *cg, ptrdiff_t last,
-          jsbytecode *target, jsbytecode op)
-{
-    jsbytecode *pc, *stop;
-    ptrdiff_t delta, span;
-
-    pc = CG_CODE(cg, last);
-    stop = CG_CODE(cg, -1);
-    while (pc != stop) {
-        delta = GetJumpOffset(cg, pc);
-        span = PTRDIFF(target, pc, jsbytecode);
-        CHECK_AND_SET_JUMP_OFFSET(cx, cg, pc, span);
-
-        /*
-         * Set *pc after jump offset in case bpdelta didn't overflow, but span
-         * does (if so, CHECK_AND_SET_JUMP_OFFSET might call BuildSpanDepTable
-         * and need to see the JSOP_BACKPATCH* op at *pc).
-         */
-        *pc = op;
-        pc -= delta;
-    }
-    return JS_TRUE;
-}
-
-void
-js_PopStatement(JSTreeContext *tc)
-{
-    tc->topStmt = tc->topStmt->down;
-}
-
-JSBool
-js_PopStatementCG(JSContext *cx, JSCodeGenerator *cg)
-{
-    JSStmtInfo *stmt;
-
-    stmt = cg->treeContext.topStmt;
-    if (!BackPatch(cx, cg, stmt->breaks, CG_NEXT(cg), JSOP_GOTO) ||
-        !BackPatch(cx, cg, stmt->continues, CG_CODE(cg, stmt->update),
-                   JSOP_GOTO)) {
-        return JS_FALSE;
-    }
-    js_PopStatement(&cg->treeContext);
-    return JS_TRUE;
-}
-
-JSBool
-js_DefineCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
-                             JSParseNode *pn)
-{
-    jsdouble dval;
-    jsint ival;
-    JSAtom *valueAtom;
-    JSAtomListElement *ale;
-
-    /* XXX just do numbers for now */
-    if (pn->pn_type == TOK_NUMBER) {
-        dval = pn->pn_dval;
-        valueAtom = (JSDOUBLE_IS_INT(dval, ival) && INT_FITS_IN_JSVAL(ival))
-                    ? js_AtomizeInt(cx, ival, 0)
-                    : js_AtomizeDouble(cx, dval, 0);
-        if (!valueAtom)
-            return JS_FALSE;
-        ale = js_IndexAtom(cx, atom, &cg->constList);
-        if (!ale)
-            return JS_FALSE;
-        ALE_SET_VALUE(ale, ATOM_KEY(valueAtom));
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_LookupCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
-                             jsval *vp)
-{
-    JSBool ok;
-    JSStackFrame *fp;
-    JSAtomListElement *ale;
-    JSObject *obj, *pobj;
-    JSProperty *prop;
-    uintN attrs;
-
-    /*
-     * fp chases cg down the stack, but only until we reach the outermost cg.
-     * This enables propagating consts from top-level into switch cases in a
-     * function compiled along with the top-level script.  All stack frames
-     * with matching code generators should be flagged with JSFRAME_COMPILING;
-     * we check sanity here.
-     */
-    *vp = JSVAL_VOID;
-    ok = JS_TRUE;
-    fp = cx->fp;
-    do {
-        JS_ASSERT(fp->flags & JSFRAME_COMPILING);
-
-        obj = fp->varobj;
-        if (obj == fp->scopeChain &&
-            !js_InWithStatement(&cg->treeContext) &&
-            !js_InCatchBlock(&cg->treeContext, atom)) {
-            ATOM_LIST_SEARCH(ale, &cg->constList, atom);
-            if (ale) {
-                *vp = ALE_VALUE(ale);
-                return JS_TRUE;
-            }
-
-            /*
-             * Try looking in the variable object for a direct property that
-             * is readonly and permanent.  We know such a property can't be
-             * shadowed by another property on obj's prototype chain, or a
-             * with object or catch variable; nor can prop's value be changed,
-             * nor can prop be deleted.
-             */
-            prop = NULL;
-            if (OBJ_IS_NATIVE(obj)) {
-                ok = js_LookupHiddenProperty(cx, obj, ATOM_TO_JSID(atom),
-                                             &pobj, &prop);
-                if (!ok)
-                    break;
-                if (prop) {
-                    /*
-                     * Any hidden property must be a formal arg or local var,
-                     * which will shadow a global const of the same name.
-                     */
-                    OBJ_DROP_PROPERTY(cx, pobj, prop);
-                    break;
-                }
-            }
-
-            ok = OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &pobj, &prop);
-            if (ok) {
-                if (pobj == obj &&
-                    (fp->flags & (JSFRAME_EVAL | JSFRAME_COMPILE_N_GO))) {
-                    /*
-                     * We're compiling code that will be executed immediately,
-                     * not re-executed against a different scope chain and/or
-                     * variable object.  Therefore we can get constant values
-                     * from our variable object here.
-                     */
-                    ok = OBJ_GET_ATTRIBUTES(cx, obj, ATOM_TO_JSID(atom), prop,
-                                            &attrs);
-                    if (ok && !(~attrs & (JSPROP_READONLY | JSPROP_PERMANENT)))
-                        ok = OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), vp);
-                }
-                if (prop)
-                    OBJ_DROP_PROPERTY(cx, pobj, prop);
-            }
-            if (!ok || prop)
-                break;
-        }
-        fp = fp->down;
-    } while ((cg = cg->parent) != NULL);
-    return ok;
-}
-
-/*
- * Allocate an index invariant for all activations of the code being compiled
- * in cg, that can be used to store and fetch a reference to a cloned RegExp
- * object that shares the same JSRegExp private data created for the object
- * literal in pn->pn_atom.  We need clones to hold lastIndex and other direct
- * properties that should not be shared among threads sharing a precompiled
- * function or script.
- *
- * If the code being compiled is function code, allocate a reserved slot in
- * the cloned function object that shares its precompiled script with other
- * cloned function objects and with the compiler-created clone-parent.  There
- * are fun->nregexps such reserved slots in each function object cloned from
- * fun->object.  NB: during compilation, funobj slots must never be allocated,
- * because js_AllocSlot could hand out one of the slots that should be given
- * to a regexp clone.
- *
- * If the code being compiled is global code, reserve the fp->vars slot at
- * ALE_INDEX(ale), by ensuring that cg->treeContext.numGlobalVars is at least
- * one more than this index.  For global code, fp->vars is parallel to the
- * global script->atomMap.vector array, but possibly shorter for the common
- * case (where var declarations and regexp literals cluster toward the front
- * of the script or function body).
- *
- * Global variable name literals in script->atomMap have fast-global slot
- * numbers (stored as int-tagged jsvals) in the corresponding fp->vars array
- * element.  The atomIndex for a regexp object literal thus also addresses an
- * fp->vars element that is not used by any optimized global variable, so we
- * use that GC-scanned element to keep the regexp object clone alive, as well
- * as to lazily create and find it at run-time for the JSOP_REGEXP bytecode.
- *
- * In no case can cx->fp->varobj be a Call object here, because that implies
- * we are compiling eval code, in which case (cx->fp->flags & JSFRAME_EVAL)
- * is true, and js_GetToken will have already selected JSOP_OBJECT instead of
- * JSOP_REGEXP, to avoid all this RegExp object cloning business.
- *
- * Why clone regexp objects?  ECMA specifies that when a regular expression
- * literal is scanned, a RegExp object is created.  In the spec, compilation
- * and execution happen indivisibly, but in this implementation and many of
- * its embeddings, code is precompiled early and re-executed in multiple
- * threads, or using multiple global objects, or both, for efficiency.
- *
- * In such cases, naively following ECMA leads to wrongful sharing of RegExp
- * objects, which makes for collisions on the lastIndex property (especially
- * for global regexps) and on any ad-hoc properties.  Also, __proto__ and
- * __parent__ refer to the pre-compilation prototype and global objects, a
- * pigeon-hole problem for instanceof tests.
- */
-static JSBool
-IndexRegExpClone(JSContext *cx, JSParseNode *pn, JSAtomListElement *ale,
-                 JSCodeGenerator *cg)
-{
-    JSObject *varobj, *reobj;
-    JSClass *clasp;
-    JSFunction *fun;
-    JSRegExp *re;
-    uint16 *countPtr;
-    uintN cloneIndex;
-
-    JS_ASSERT(!(cx->fp->flags & (JSFRAME_EVAL | JSFRAME_COMPILE_N_GO)));
-
-    varobj = cx->fp->varobj;
-    clasp = OBJ_GET_CLASS(cx, varobj);
-    if (clasp == &js_FunctionClass) {
-        fun = (JSFunction *) JS_GetPrivate(cx, varobj);
-        countPtr = &fun->nregexps;
-        cloneIndex = *countPtr;
-    } else {
-        JS_ASSERT(clasp != &js_CallClass);
-        countPtr = &cg->treeContext.numGlobalVars;
-        cloneIndex = ALE_INDEX(ale);
-    }
-
-    if ((cloneIndex + 1) >> 16) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_NEED_DIET, js_script_str);
-        return JS_FALSE;
-    }
-    if (cloneIndex >= *countPtr)
-        *countPtr = cloneIndex + 1;
-
-    reobj = ATOM_TO_OBJECT(pn->pn_atom);
-    JS_ASSERT(OBJ_GET_CLASS(cx, reobj) == &js_RegExpClass);
-    re = (JSRegExp *) JS_GetPrivate(cx, reobj);
-    re->cloneIndex = cloneIndex;
-    return JS_TRUE;
-}
-
-/*
- * Macro to emit a bytecode followed by a uint16 immediate operand stored in
- * big-endian order, used for arg and var numbers as well as for atomIndexes.
- * NB: We use cx and cg from our caller's lexical environment, and return
- * false on error.
- */
-#define EMIT_UINT16_IMM_OP(op, i)                                             \
-    JS_BEGIN_MACRO                                                            \
-        if (js_Emit3(cx, cg, op, ATOM_INDEX_HI(i), ATOM_INDEX_LO(i)) < 0)     \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-/*
- * Emit a bytecode and its 2-byte constant (atom) index immediate operand.
- * If the atomIndex requires more than 2 bytes, emit a prefix op whose 24-bit
- * immediate operand indexes the atom in script->atomMap.
- *
- * If op has JOF_NAME mode, emit JSOP_FINDNAME to find and push the object in
- * the scope chain in which the literal name was found, followed by the name
- * as a string.  This enables us to use the JOF_ELEM counterpart to op.
- *
- * Otherwise, if op has JOF_PROP mode, emit JSOP_LITERAL before op, to push
- * the atom's value key.  For JOF_PROP ops, the object being operated on has
- * already been pushed, and JSOP_LITERAL will push the id, leaving the stack
- * in the proper state for a JOF_ELEM counterpart.
- *
- * Otherwise, emit JSOP_LITOPX to push the atom index, then perform a special
- * dispatch on op, but getting op's atom index from the stack instead of from
- * an unsigned 16-bit immediate operand.
- */
-static JSBool
-EmitAtomIndexOp(JSContext *cx, JSOp op, jsatomid atomIndex, JSCodeGenerator *cg)
-{
-    uint32 mode;
-    JSOp prefixOp;
-    ptrdiff_t off;
-    jsbytecode *pc;
-
-    if (atomIndex >= JS_BIT(16)) {
-        if (op != JSOP_SETNAME) {
-            mode = (js_CodeSpec[op].format & JOF_MODEMASK);
-            prefixOp = (mode == JOF_NAME)
-                       ? JSOP_FINDNAME
-                       : (mode == JOF_PROP)
-                       ? JSOP_LITERAL
-                       : JSOP_LITOPX;
-            off = js_EmitN(cx, cg, prefixOp, 3);
-            if (off < 0)
-                return JS_FALSE;
-            pc = CG_CODE(cg, off);
-            SET_LITERAL_INDEX(pc, atomIndex);
-        }
-
-        switch (op) {
-          case JSOP_DECNAME:    op = JSOP_DECELEM; break;
-          case JSOP_DECPROP:    op = JSOP_DECELEM; break;
-          case JSOP_DELNAME:    op = JSOP_DELELEM; break;
-          case JSOP_DELPROP:    op = JSOP_DELELEM; break;
-          case JSOP_FORNAME:    op = JSOP_FORELEM; break;
-          case JSOP_FORPROP:    op = JSOP_FORELEM; break;
-          case JSOP_GETPROP:    op = JSOP_GETELEM; break;
-          case JSOP_IMPORTPROP: op = JSOP_IMPORTELEM; break;
-          case JSOP_INCNAME:    op = JSOP_INCELEM; break;
-          case JSOP_INCPROP:    op = JSOP_INCELEM; break;
-          case JSOP_INITPROP:   op = JSOP_INITELEM; break;
-          case JSOP_NAME:       op = JSOP_GETELEM; break;
-          case JSOP_NAMEDEC:    op = JSOP_ELEMDEC; break;
-          case JSOP_NAMEINC:    op = JSOP_ELEMINC; break;
-          case JSOP_PROPDEC:    op = JSOP_ELEMDEC; break;
-          case JSOP_PROPINC:    op = JSOP_ELEMINC; break;
-          case JSOP_BINDNAME:   return JS_TRUE;
-          case JSOP_SETNAME:    op = JSOP_SETELEM; break;
-          case JSOP_SETPROP:    op = JSOP_SETELEM; break;
-          default:              JS_ASSERT(mode == 0); break;
-        }
-
-        return js_Emit1(cx, cg, op) >= 0;
-    }
-
-    EMIT_UINT16_IMM_OP(op, atomIndex);
-    return JS_TRUE;
-}
-
-/*
- * Slight sugar for EmitAtomIndexOp, again accessing cx and cg from the macro
- * caller's lexical environment, and embedding a false return on error.
- * XXXbe hey, who checks for fun->nvars and fun->nargs overflow?!
- */
-#define EMIT_ATOM_INDEX_OP(op, atomIndex)                                     \
-    JS_BEGIN_MACRO                                                            \
-        if (!EmitAtomIndexOp(cx, op, atomIndex, cg) < 0)                      \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-static JSBool
-EmitAtomOp(JSContext *cx, JSParseNode *pn, JSOp op, JSCodeGenerator *cg)
-{
-    JSAtomListElement *ale;
-
-    ale = js_IndexAtom(cx, pn->pn_atom, &cg->atomList);
-    if (!ale)
-        return JS_FALSE;
-    if (op == JSOP_REGEXP && !IndexRegExpClone(cx, pn, ale, cg))
-        return JS_FALSE;
-    return EmitAtomIndexOp(cx, op, ALE_INDEX(ale), cg);
-}
-
-/*
- * This routine tries to optimize name gets and sets to stack slot loads and
- * stores, given the variables object and scope chain in cx's top frame, the
- * compile-time context in tc, and a TOK_NAME node pn.  It returns false on
- * error, true on success.
- *
- * The caller can inspect pn->pn_slot for a non-negative slot number to tell
- * whether optimization occurred, in which case LookupArgOrVar also updated
- * pn->pn_op.  If pn->pn_slot is still -1 on return, pn->pn_op nevertheless
- * may have been optimized, e.g., from JSOP_NAME to JSOP_ARGUMENTS.  Whether
- * or not pn->pn_op was modified, if this function finds an argument or local
- * variable name, pn->pn_attrs will contain the property's attributes after a
- * successful return.
- */
-static JSBool
-LookupArgOrVar(JSContext *cx, JSTreeContext *tc, JSParseNode *pn)
-{
-    JSStackFrame *fp;
-    JSObject *obj, *pobj;
-    JSClass *clasp;
-    JSBool optimizeGlobals;
-    JSAtom *atom;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSOp op;
-    JSPropertyOp getter;
-    uintN attrs;
-    jsint slot;
-    JSAtomListElement *ale;
-
-    JS_ASSERT(pn->pn_type == TOK_NAME);
-    if (pn->pn_slot >= 0 || pn->pn_op == JSOP_ARGUMENTS)
-        return JS_TRUE;
-
-    /* QNAME references can never be optimized to use arg/var storage. */
-    if (pn->pn_op == JSOP_QNAMEPART)
-        return JS_TRUE;
-
-    /*
-     * A Script object can be used to split an eval into a compile step done
-     * at construction time, and an execute step done separately, possibly in
-     * a different scope altogether.  We therefore cannot do any name-to-slot
-     * optimizations, but must lookup names at runtime.  Note that script_exec
-     * ensures that its caller's frame has a Call object, so arg and var name
-     * lookups will succeed.
-     */
-    if (cx->fp->flags & JSFRAME_SCRIPT_OBJECT)
-        return JS_TRUE;
-
-    /*
-     * We can't optimize if var and closure (a local function not in a larger
-     * expression and not at top-level within another's body) collide.
-     * XXX suboptimal: keep track of colliding names and deoptimize only those
-     */
-    if (tc->flags & TCF_FUN_CLOSURE_VS_VAR)
-        return JS_TRUE;
-
-    /*
-     * We can't optimize if we're not compiling a function body, whether via
-     * eval, or directly when compiling a function statement or expression.
-     */
-    fp = cx->fp;
-    obj = fp->varobj;
-    clasp = OBJ_GET_CLASS(cx, obj);
-    if (clasp != &js_FunctionClass && clasp != &js_CallClass) {
-        /*
-         * Optimize global variable accesses if there are at least 100 uses
-         * in unambiguous contexts, or failing that, if least half of all the
-         * uses of global vars/consts/functions are in loops.
-         */
-        optimizeGlobals = (tc->globalUses >= 100 ||
-                           (tc->loopyGlobalUses &&
-                            tc->loopyGlobalUses >= tc->globalUses / 2));
-        if (!optimizeGlobals)
-            return JS_TRUE;
-    } else {
-        optimizeGlobals = JS_FALSE;
-    }
-
-    /*
-     * We can't optimize if we're in an eval called inside a with statement,
-     * or we're compiling a with statement and its body, or we're in a catch
-     * block whose exception variable has the same name as pn.
-     */
-    atom = pn->pn_atom;
-    if (fp->scopeChain != obj ||
-        js_InWithStatement(tc) ||
-        js_InCatchBlock(tc, atom)) {
-        return JS_TRUE;
-    }
-
-    op = pn->pn_op;
-    getter = NULL;
-#ifdef __GNUC__
-    attrs = slot = 0;   /* quell GCC overwarning */
-#endif
-    if (optimizeGlobals) {
-        /*
-         * We are optimizing global variables, and there is no pre-existing
-         * global property named atom.  If atom was declared via const or var,
-         * optimize pn to access fp->vars using the appropriate JOF_QVAR op.
-         */
-        ATOM_LIST_SEARCH(ale, &tc->decls, atom);
-        if (!ale) {
-            /* Use precedes declaration, or name is never declared. */
-            return JS_TRUE;
-        }
-
-        attrs = (ALE_JSOP(ale) == JSOP_DEFCONST)
-                ? JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT
-                : JSPROP_ENUMERATE | JSPROP_PERMANENT;
-
-        /* Index atom so we can map fast global number to name. */
-        JS_ASSERT(tc->flags & TCF_COMPILING);
-        ale = js_IndexAtom(cx, atom, &((JSCodeGenerator *) tc)->atomList);
-        if (!ale)
-            return JS_FALSE;
-
-        /* Defend against tc->numGlobalVars 16-bit overflow. */
-        slot = ALE_INDEX(ale);
-        if ((slot + 1) >> 16)
-            return JS_TRUE;
-
-        if ((uint16)(slot + 1) > tc->numGlobalVars)
-            tc->numGlobalVars = (uint16)(slot + 1);
-    } else {
-        /*
-         * We may be able to optimize name to stack slot. Look for an argument
-         * or variable property in the function, or its call object, not found
-         * in any prototype object.  Rewrite pn_op and update pn accordingly.
-         * NB: We know that JSOP_DELNAME on an argument or variable evaluates
-         * to false, due to JSPROP_PERMANENT.
-         */
-        if (!js_LookupHiddenProperty(cx, obj, ATOM_TO_JSID(atom), &pobj, &prop))
-            return JS_FALSE;
-        sprop = (JSScopeProperty *) prop;
-        if (sprop) {
-            if (pobj == obj) {
-                getter = sprop->getter;
-                attrs = sprop->attrs;
-                slot = (sprop->flags & SPROP_HAS_SHORTID) ? sprop->shortid : -1;
-            }
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-        }
-    }
-
-    if (optimizeGlobals || getter) {
-        if (optimizeGlobals) {
-            switch (op) {
-              case JSOP_NAME:     op = JSOP_GETGVAR; break;
-              case JSOP_SETNAME:  op = JSOP_SETGVAR; break;
-              case JSOP_SETCONST: /* NB: no change */ break;
-              case JSOP_INCNAME:  op = JSOP_INCGVAR; break;
-              case JSOP_NAMEINC:  op = JSOP_GVARINC; break;
-              case JSOP_DECNAME:  op = JSOP_DECGVAR; break;
-              case JSOP_NAMEDEC:  op = JSOP_GVARDEC; break;
-              case JSOP_FORNAME:  /* NB: no change */ break;
-              case JSOP_DELNAME:  /* NB: no change */ break;
-              default: JS_ASSERT(0);
-            }
-        } else if (getter == js_GetLocalVariable ||
-                   getter == js_GetCallVariable) {
-            switch (op) {
-              case JSOP_NAME:     op = JSOP_GETVAR; break;
-              case JSOP_SETNAME:  op = JSOP_SETVAR; break;
-              case JSOP_SETCONST: op = JSOP_SETVAR; break;
-              case JSOP_INCNAME:  op = JSOP_INCVAR; break;
-              case JSOP_NAMEINC:  op = JSOP_VARINC; break;
-              case JSOP_DECNAME:  op = JSOP_DECVAR; break;
-              case JSOP_NAMEDEC:  op = JSOP_VARDEC; break;
-              case JSOP_FORNAME:  op = JSOP_FORVAR; break;
-              case JSOP_DELNAME:  op = JSOP_FALSE; break;
-              default: JS_ASSERT(0);
-            }
-        } else if (getter == js_GetArgument ||
-                   (getter == js_CallClass.getProperty &&
-                    fp->fun && (uintN) slot < fp->fun->nargs)) {
-            switch (op) {
-              case JSOP_NAME:     op = JSOP_GETARG; break;
-              case JSOP_SETNAME:  op = JSOP_SETARG; break;
-              case JSOP_INCNAME:  op = JSOP_INCARG; break;
-              case JSOP_NAMEINC:  op = JSOP_ARGINC; break;
-              case JSOP_DECNAME:  op = JSOP_DECARG; break;
-              case JSOP_NAMEDEC:  op = JSOP_ARGDEC; break;
-              case JSOP_FORNAME:  op = JSOP_FORARG; break;
-              case JSOP_DELNAME:  op = JSOP_FALSE; break;
-              default: JS_ASSERT(0);
-            }
-        }
-        if (op != pn->pn_op) {
-            pn->pn_op = op;
-            pn->pn_slot = slot;
-        }
-        pn->pn_attrs = attrs;
-    }
-
-    if (pn->pn_slot < 0) {
-        /*
-         * We couldn't optimize pn, so it's not a global or local slot name.
-         * Now we must check for the predefined arguments variable.  It may be
-         * overridden by assignment, in which case the function is heavyweight
-         * and the interpreter will look up 'arguments' in the function's call
-         * object.
-         */
-        if (pn->pn_op == JSOP_NAME &&
-            atom == cx->runtime->atomState.argumentsAtom) {
-            pn->pn_op = JSOP_ARGUMENTS;
-            return JS_TRUE;
-        }
-
-        tc->flags |= TCF_FUN_USES_NONLOCALS;
-    }
-    return JS_TRUE;
-}
-
-/*
- * If pn contains a useful expression, return true with *answer set to true.
- * If pn contains a useless expression, return true with *answer set to false.
- * Return false on error.
- *
- * The caller should initialize *answer to false and invoke this function on
- * an expression statement or similar subtree to decide whether the tree could
- * produce code that has any side effects.  For an expression statement, we
- * define useless code as code with no side effects, because the main effect,
- * the value left on the stack after the code executes, will be discarded by a
- * pop bytecode.
- */
-static JSBool
-CheckSideEffects(JSContext *cx, JSTreeContext *tc, JSParseNode *pn,
-                 JSBool *answer)
-{
-    JSBool ok;
-    JSFunction *fun;
-    JSParseNode *pn2;
-
-    ok = JS_TRUE;
-    if (!pn || *answer)
-        return ok;
-
-    switch (pn->pn_arity) {
-      case PN_FUNC:
-        /*
-         * A named function is presumed useful: we can't yet know that it is
-         * not called.  The side effects are the creation of a scope object
-         * to parent this function object, and the binding of the function's
-         * name in that scope object.  See comments at case JSOP_NAMEDFUNOBJ:
-         * in jsinterp.c.
-         */
-        fun = (JSFunction *) JS_GetPrivate(cx, ATOM_TO_OBJECT(pn->pn_funAtom));
-        if (fun->atom)
-            *answer = JS_TRUE;
-        break;
-
-      case PN_LIST:
-        if (pn->pn_type == TOK_NEW ||
-            pn->pn_type == TOK_LP ||
-            pn->pn_type == TOK_LB) {
-            /*
-             * All invocation operations (construct: TOK_NEW, call: TOK_LP)
-             * are presumed to be useful, because they may have side effects
-             * even if their main effect (their return value) is discarded.
-             *
-             * TOK_LB binary trees of 3 or more nodes are flattened into lists
-             * to avoid too much recursion.  All such lists must be presumed
-             * to be useful because each index operation could invoke a getter
-             * (the JSOP_ARGUMENTS special case below, in the PN_BINARY case,
-             * does not apply here: arguments[i][j] might invoke a getter).
-             */
-            *answer = JS_TRUE;
-        } else {
-            for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next)
-                ok &= CheckSideEffects(cx, tc, pn2, answer);
-        }
-        break;
-
-      case PN_TERNARY:
-        ok = CheckSideEffects(cx, tc, pn->pn_kid1, answer) &&
-             CheckSideEffects(cx, tc, pn->pn_kid2, answer) &&
-             CheckSideEffects(cx, tc, pn->pn_kid3, answer);
-        break;
-
-      case PN_BINARY:
-        if (pn->pn_type == TOK_ASSIGN) {
-            /*
-             * Assignment is presumed to be useful, even if the next operation
-             * is another assignment overwriting this one's ostensible effect,
-             * because the left operand may be a property with a setter that
-             * has side effects.
-             */
-            *answer = JS_TRUE;
-        } else {
-            if (pn->pn_type == TOK_LB) {
-                pn2 = pn->pn_left;
-                if (pn2->pn_type == TOK_NAME && !LookupArgOrVar(cx, tc, pn2))
-                    return JS_FALSE;
-                if (pn2->pn_op != JSOP_ARGUMENTS) {
-                    /*
-                     * Any indexed property reference could call a getter with
-                     * side effects, except for arguments[i] where arguments is
-                     * unambiguous.
-                     */
-                    *answer = JS_TRUE;
-                }
-            }
-            ok = CheckSideEffects(cx, tc, pn->pn_left, answer) &&
-                 CheckSideEffects(cx, tc, pn->pn_right, answer);
-        }
-        break;
-
-      case PN_UNARY:
-        if (pn->pn_type == TOK_INC || pn->pn_type == TOK_DEC ||
-            pn->pn_type == TOK_DELETE ||
-            pn->pn_type == TOK_THROW ||
-            pn->pn_type == TOK_DEFSHARP) {
-            /* All these operations have effects that we must commit. */
-            *answer = JS_TRUE;
-        } else {
-            ok = CheckSideEffects(cx, tc, pn->pn_kid, answer);
-        }
-        break;
-
-      case PN_NAME:
-        if (pn->pn_type == TOK_NAME) {
-            if (!LookupArgOrVar(cx, tc, pn))
-                return JS_FALSE;
-            if (pn->pn_slot < 0 && pn->pn_op != JSOP_ARGUMENTS) {
-                /*
-                 * Not an argument or local variable use, so this expression
-                 * could invoke a getter that has side effects.
-                 */
-                *answer = JS_TRUE;
-            }
-        }
-        pn2 = pn->pn_expr;
-        if (pn->pn_type == TOK_DOT) {
-            if (pn2->pn_type == TOK_NAME && !LookupArgOrVar(cx, tc, pn2))
-                return JS_FALSE;
-            if (!(pn2->pn_op == JSOP_ARGUMENTS &&
-                  pn->pn_atom == cx->runtime->atomState.lengthAtom)) {
-                /*
-                 * Any dotted property reference could call a getter, except
-                 * for arguments.length where arguments is unambiguous.
-                 */
-                *answer = JS_TRUE;
-            }
-        }
-        ok = CheckSideEffects(cx, tc, pn2, answer);
-        break;
-
-      case PN_NULLARY:
-        if (pn->pn_type == TOK_DEBUGGER)
-            *answer = JS_TRUE;
-        break;
-    }
-    return ok;
-}
-
-/*
- * Secret handshake with js_EmitTree's TOK_LP/TOK_NEW case logic, to flag all
- * uses of JSOP_GETMETHOD that implicitly qualify the method-property name with
- * a function:: prefix.  All other JSOP_GETMETHOD and JSOP_SETMETHOD uses must
- * be explicit, so need a distinct source note (SRC_PCDELTA rather than PCBASE)
- * for round-tripping through the beloved decompiler.
- */
-#define JSPROP_IMPLICIT_FUNCTION_NAMESPACE      0x100
-
-static jssrcnote
-SrcNoteForPropOp(JSParseNode *pn, JSOp op)
-{
-    return ((op == JSOP_GETMETHOD &&
-             !(pn->pn_attrs & JSPROP_IMPLICIT_FUNCTION_NAMESPACE)) ||
-            op == JSOP_SETMETHOD)
-           ? SRC_PCDELTA
-           : SRC_PCBASE;
-}
-
-static JSBool
-EmitPropOp(JSContext *cx, JSParseNode *pn, JSOp op, JSCodeGenerator *cg)
-{
-    JSParseNode *pn2, *pndot, *pnup, *pndown;
-    ptrdiff_t top;
-
-    pn2 = pn->pn_expr;
-    if (op == JSOP_GETPROP &&
-        pn->pn_type == TOK_DOT &&
-        pn2->pn_type == TOK_NAME) {
-        /* Try to optimize arguments.length into JSOP_ARGCNT. */
-        if (!LookupArgOrVar(cx, &cg->treeContext, pn2))
-            return JS_FALSE;
-        if (pn2->pn_op == JSOP_ARGUMENTS &&
-            pn->pn_atom == cx->runtime->atomState.lengthAtom) {
-            return js_Emit1(cx, cg, JSOP_ARGCNT) >= 0;
-        }
-    }
-
-    /*
-     * If the object operand is also a dotted property reference, reverse the
-     * list linked via pn_expr temporarily so we can iterate over it from the
-     * bottom up (reversing again as we go), to avoid excessive recursion.
-     */
-    if (pn2->pn_type == TOK_DOT) {
-        pndot = pn2;
-        pnup = NULL;
-        top = CG_OFFSET(cg);
-        for (;;) {
-            /* Reverse pndot->pn_expr to point up, not down. */
-            pndot->pn_offset = top;
-            pndown = pndot->pn_expr;
-            pndot->pn_expr = pnup;
-            if (pndown->pn_type != TOK_DOT)
-                break;
-            pnup = pndot;
-            pndot = pndown;
-        }
-
-        /* pndown is a primary expression, not a dotted property reference. */
-        if (!js_EmitTree(cx, cg, pndown))
-            return JS_FALSE;
-
-        do {
-            /* Walk back up the list, emitting annotated name ops. */
-            if (js_NewSrcNote2(cx, cg, SrcNoteForPropOp(pndot, pndot->pn_op),
-                               CG_OFFSET(cg) - pndown->pn_offset) < 0) {
-                return JS_FALSE;
-            }
-            if (!EmitAtomOp(cx, pndot, pndot->pn_op, cg))
-                return JS_FALSE;
-
-            /* Reverse the pn_expr link again. */
-            pnup = pndot->pn_expr;
-            pndot->pn_expr = pndown;
-            pndown = pndot;
-        } while ((pndot = pnup) != NULL);
-    } else {
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-    }
-
-    if (js_NewSrcNote2(cx, cg, SrcNoteForPropOp(pn, op),
-                       CG_OFFSET(cg) - pn2->pn_offset) < 0) {
-        return JS_FALSE;
-    }
-    if (!pn->pn_atom) {
-        JS_ASSERT(op == JSOP_IMPORTALL);
-        if (js_Emit1(cx, cg, op) < 0)
-            return JS_FALSE;
-    } else {
-        if (!EmitAtomOp(cx, pn, op, cg))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-EmitElemOp(JSContext *cx, JSParseNode *pn, JSOp op, JSCodeGenerator *cg)
-{
-    ptrdiff_t top;
-    JSParseNode *left, *right, *next, temp;
-    jsint slot;
-
-    top = CG_OFFSET(cg);
-    if (pn->pn_arity == PN_LIST) {
-        /* Left-associative operator chain to avoid too much recursion. */
-        JS_ASSERT(pn->pn_op == JSOP_GETELEM);
-        JS_ASSERT(pn->pn_count >= 3);
-        left = pn->pn_head;
-        right = PN_LAST(pn);
-        next = left->pn_next;
-        JS_ASSERT(next != right);
-
-        /*
-         * Try to optimize arguments[0][j]... into JSOP_ARGSUB<0> followed by
-         * one or more index expression and JSOP_GETELEM op pairs.
-         */
-        if (left->pn_type == TOK_NAME && next->pn_type == TOK_NUMBER) {
-            if (!LookupArgOrVar(cx, &cg->treeContext, left))
-                return JS_FALSE;
-            if (left->pn_op == JSOP_ARGUMENTS &&
-                JSDOUBLE_IS_INT(next->pn_dval, slot) &&
-                (jsuint)slot < JS_BIT(16)) {
-                left->pn_offset = next->pn_offset = top;
-                EMIT_UINT16_IMM_OP(JSOP_ARGSUB, (jsatomid)slot);
-                left = next;
-                next = left->pn_next;
-            }
-        }
-
-        /*
-         * Check whether we generated JSOP_ARGSUB, just above, and have only
-         * one more index expression to emit.  Given arguments[0][j], we must
-         * skip the while loop altogether, falling through to emit code for j
-         * (in the subtree referenced by right), followed by the annotated op,
-         * at the bottom of this function.
-         */
-        JS_ASSERT(next != right || pn->pn_count == 3);
-        if (left == pn->pn_head) {
-            if (!js_EmitTree(cx, cg, left))
-                return JS_FALSE;
-        }
-        while (next != right) {
-            if (!js_EmitTree(cx, cg, next))
-                return JS_FALSE;
-            if (js_NewSrcNote2(cx, cg, SRC_PCBASE, CG_OFFSET(cg) - top) < 0)
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_GETELEM) < 0)
-                return JS_FALSE;
-            next = next->pn_next;
-        }
-    } else {
-        if (pn->pn_arity == PN_NAME) {
-            /*
-             * Set left and right so pn appears to be a TOK_LB node, instead
-             * of a TOK_DOT node (see the TOK_FOR/IN case in js_EmitTree).
-             */
-            left = pn->pn_expr;
-            right = &temp;
-            right->pn_type = TOK_STRING;
-            right->pn_arity = PN_NULLARY;
-            right->pn_op = JSOP_STRING;
-            right->pn_atom = pn->pn_atom;
-        } else {
-            JS_ASSERT(pn->pn_arity == PN_BINARY);
-            left = pn->pn_left;
-            right = pn->pn_right;
-        }
-
-        /* Try to optimize arguments[0] (e.g.) into JSOP_ARGSUB<0>. */
-        if (op == JSOP_GETELEM &&
-            left->pn_type == TOK_NAME &&
-            right->pn_type == TOK_NUMBER) {
-            if (!LookupArgOrVar(cx, &cg->treeContext, left))
-                return JS_FALSE;
-            if (left->pn_op == JSOP_ARGUMENTS &&
-                JSDOUBLE_IS_INT(right->pn_dval, slot) &&
-                (jsuint)slot < JS_BIT(16)) {
-                left->pn_offset = right->pn_offset = top;
-                EMIT_UINT16_IMM_OP(JSOP_ARGSUB, (jsatomid)slot);
-                return JS_TRUE;
-            }
-        }
-
-        if (!js_EmitTree(cx, cg, left))
-            return JS_FALSE;
-    }
-    if (!js_EmitTree(cx, cg, right))
-        return JS_FALSE;
-    if (js_NewSrcNote2(cx, cg, SRC_PCBASE, CG_OFFSET(cg) - top) < 0)
-        return JS_FALSE;
-    return js_Emit1(cx, cg, op) >= 0;
-}
-
-static JSBool
-EmitNumberOp(JSContext *cx, jsdouble dval, JSCodeGenerator *cg)
-{
-    jsint ival;
-    jsatomid atomIndex;
-    ptrdiff_t off;
-    jsbytecode *pc;
-    JSAtom *atom;
-    JSAtomListElement *ale;
-
-    if (JSDOUBLE_IS_INT(dval, ival) && INT_FITS_IN_JSVAL(ival)) {
-        if (ival == 0)
-            return js_Emit1(cx, cg, JSOP_ZERO) >= 0;
-        if (ival == 1)
-            return js_Emit1(cx, cg, JSOP_ONE) >= 0;
-
-        atomIndex = (jsatomid)ival;
-        if (atomIndex < JS_BIT(16)) {
-            EMIT_UINT16_IMM_OP(JSOP_UINT16, atomIndex);
-            return JS_TRUE;
-        }
-
-        if (atomIndex < JS_BIT(24)) {
-            off = js_EmitN(cx, cg, JSOP_UINT24, 3);
-            if (off < 0)
-                return JS_FALSE;
-            pc = CG_CODE(cg, off);
-            SET_LITERAL_INDEX(pc, atomIndex);
-            return JS_TRUE;
-        }
-
-        atom = js_AtomizeInt(cx, ival, 0);
-    } else {
-        atom = js_AtomizeDouble(cx, dval, 0);
-    }
-    if (!atom)
-        return JS_FALSE;
-
-    ale = js_IndexAtom(cx, atom, &cg->atomList);
-    if (!ale)
-        return JS_FALSE;
-    return EmitAtomIndexOp(cx, JSOP_NUMBER, ALE_INDEX(ale), cg);
-}
-
-#if JS_HAS_SWITCH_STATEMENT
-static JSBool
-EmitSwitch(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn,
-           JSStmtInfo *stmtInfo)
-{
-    JSOp switchOp;
-    JSBool ok, hasDefault, constPropagated;
-    ptrdiff_t top, off, defaultOffset;
-    JSParseNode *pn2, *pn3, *pn4;
-    uint32 caseCount, tableLength;
-    JSParseNode **table;
-    jsdouble d;
-    jsint i, low, high;
-    jsval v;
-    JSAtom *atom;
-    JSAtomListElement *ale;
-    intN noteIndex;
-    size_t switchSize, tableSize;
-    jsbytecode *pc, *savepc;
-
-    /* Try for most optimal, fall back if not dense ints, and per ECMAv2. */
-    switchOp = JSOP_TABLESWITCH;
-    ok = JS_TRUE;
-    hasDefault = constPropagated = JS_FALSE;
-    defaultOffset = -1;
-
-    /* Emit code for the discriminant first. */
-    if (!js_EmitTree(cx, cg, pn->pn_kid1))
-        return JS_FALSE;
-
-    /* Switch bytecodes run from here till end of final case. */
-    top = CG_OFFSET(cg);
-    js_PushStatement(&cg->treeContext, stmtInfo, STMT_SWITCH, top);
-
-    pn2 = pn->pn_kid2;
-    caseCount = pn2->pn_count;
-    tableLength = 0;
-    table = NULL;
-
-    if (caseCount == 0 ||
-        (caseCount == 1 &&
-         (hasDefault = (pn2->pn_head->pn_type == TOK_DEFAULT)))) {
-        caseCount = 0;
-        low = 0;
-        high = -1;
-    } else {
-#define INTMAP_LENGTH   256
-        jsbitmap intmap_space[INTMAP_LENGTH];
-        jsbitmap *intmap = NULL;
-        int32 intmap_bitlen = 0;
-
-        low  = JSVAL_INT_MAX;
-        high = JSVAL_INT_MIN;
-
-        for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-            if (pn3->pn_type == TOK_DEFAULT) {
-                hasDefault = JS_TRUE;
-                caseCount--;    /* one of the "cases" was the default */
-                continue;
-            }
-
-            JS_ASSERT(pn3->pn_type == TOK_CASE);
-            if (switchOp == JSOP_CONDSWITCH)
-                continue;
-
-            pn4 = pn3->pn_left;
-            switch (pn4->pn_type) {
-              case TOK_NUMBER:
-                d = pn4->pn_dval;
-                if (JSDOUBLE_IS_INT(d, i) && INT_FITS_IN_JSVAL(i)) {
-                    pn3->pn_val = INT_TO_JSVAL(i);
-                } else {
-                    atom = js_AtomizeDouble(cx, d, 0);
-                    if (!atom) {
-                        ok = JS_FALSE;
-                        goto release;
-                    }
-                    pn3->pn_val = ATOM_KEY(atom);
-                }
-                break;
-              case TOK_STRING:
-                pn3->pn_val = ATOM_KEY(pn4->pn_atom);
-                break;
-              case TOK_NAME:
-                if (!pn4->pn_expr) {
-                    ok = js_LookupCompileTimeConstant(cx, cg, pn4->pn_atom, &v);
-                    if (!ok)
-                        goto release;
-                    if (!JSVAL_IS_VOID(v)) {
-                        pn3->pn_val = v;
-                        constPropagated = JS_TRUE;
-                        break;
-                    }
-                }
-                /* FALL THROUGH */
-              case TOK_PRIMARY:
-                if (pn4->pn_op == JSOP_TRUE) {
-                    pn3->pn_val = JSVAL_TRUE;
-                    break;
-                }
-                if (pn4->pn_op == JSOP_FALSE) {
-                    pn3->pn_val = JSVAL_FALSE;
-                    break;
-                }
-                /* FALL THROUGH */
-              default:
-                switchOp = JSOP_CONDSWITCH;
-                continue;
-            }
-
-            JS_ASSERT(JSVAL_IS_NUMBER(pn3->pn_val) ||
-                      JSVAL_IS_STRING(pn3->pn_val) ||
-                      JSVAL_IS_BOOLEAN(pn3->pn_val));
-
-            if (switchOp != JSOP_TABLESWITCH)
-                continue;
-            if (!JSVAL_IS_INT(pn3->pn_val)) {
-                switchOp = JSOP_LOOKUPSWITCH;
-                continue;
-            }
-            i = JSVAL_TO_INT(pn3->pn_val);
-            if ((jsuint)(i + (jsint)JS_BIT(15)) >= (jsuint)JS_BIT(16)) {
-                switchOp = JSOP_LOOKUPSWITCH;
-                continue;
-            }
-            if (i < low)
-                low = i;
-            if (high < i)
-                high = i;
-
-            /*
-             * Check for duplicates, which require a JSOP_LOOKUPSWITCH.
-             * We bias i by 65536 if it's negative, and hope that's a rare
-             * case (because it requires a malloc'd bitmap).
-             */
-            if (i < 0)
-                i += JS_BIT(16);
-            if (i >= intmap_bitlen) {
-                if (!intmap &&
-                    i < (INTMAP_LENGTH << JS_BITS_PER_WORD_LOG2)) {
-                    intmap = intmap_space;
-                    intmap_bitlen = INTMAP_LENGTH << JS_BITS_PER_WORD_LOG2;
-                } else {
-                    /* Just grab 8K for the worst-case bitmap. */
-                    intmap_bitlen = JS_BIT(16);
-                    intmap = (jsbitmap *)
-                        JS_malloc(cx,
-                                  (JS_BIT(16) >> JS_BITS_PER_WORD_LOG2)
-                                  * sizeof(jsbitmap));
-                    if (!intmap) {
-                        JS_ReportOutOfMemory(cx);
-                        return JS_FALSE;
-                    }
-                }
-                memset(intmap, 0, intmap_bitlen >> JS_BITS_PER_BYTE_LOG2);
-            }
-            if (JS_TEST_BIT(intmap, i)) {
-                switchOp = JSOP_LOOKUPSWITCH;
-                continue;
-            }
-            JS_SET_BIT(intmap, i);
-        }
-
-      release:
-        if (intmap && intmap != intmap_space)
-            JS_free(cx, intmap);
-        if (!ok)
-            return JS_FALSE;
-
-        /*
-         * Compute table length and select lookup instead if overlarge or
-         * more than half-sparse.
-         */
-        if (switchOp == JSOP_TABLESWITCH) {
-            tableLength = (uint32)(high - low + 1);
-            if (tableLength >= JS_BIT(16) || tableLength > 2 * caseCount)
-                switchOp = JSOP_LOOKUPSWITCH;
-        }
-    }
-
-    /*
-     * Emit a note with two offsets: first tells total switch code length,
-     * second tells offset to first JSOP_CASE if condswitch.
-     */
-    noteIndex = js_NewSrcNote3(cx, cg, SRC_SWITCH, 0, 0);
-    if (noteIndex < 0)
-        return JS_FALSE;
-
-    if (switchOp == JSOP_CONDSWITCH) {
-        /*
-         * 0 bytes of immediate for unoptimized ECMAv2 switch.
-         */
-        switchSize = 0;
-    } else if (switchOp == JSOP_TABLESWITCH) {
-        /*
-         * 3 offsets (len, low, high) before the table, 1 per entry.
-         */
-        switchSize = (size_t)(JUMP_OFFSET_LEN * (3 + tableLength));
-    } else {
-        /*
-         * JSOP_LOOKUPSWITCH:
-         * 1 offset (len) and 1 atom index (npairs) before the table,
-         * 1 atom index and 1 jump offset per entry.
-         */
-        switchSize = (size_t)(JUMP_OFFSET_LEN + ATOM_INDEX_LEN +
-                              (ATOM_INDEX_LEN + JUMP_OFFSET_LEN) * caseCount);
-    }
-
-    /*
-     * Emit switchOp followed by switchSize bytes of jump or lookup table.
-     *
-     * If switchOp is JSOP_LOOKUPSWITCH or JSOP_TABLESWITCH, it is crucial
-     * to emit the immediate operand(s) by which bytecode readers such as
-     * BuildSpanDepTable discover the length of the switch opcode *before*
-     * calling js_SetJumpOffset (which may call BuildSpanDepTable).  It's
-     * also important to zero all unknown jump offset immediate operands,
-     * so they can be converted to span dependencies with null targets to
-     * be computed later (js_EmitN zeros switchSize bytes after switchOp).
-     */
-    if (js_EmitN(cx, cg, switchOp, switchSize) < 0)
-        return JS_FALSE;
-
-    off = -1;
-    if (switchOp == JSOP_CONDSWITCH) {
-        intN caseNoteIndex = -1;
-        JSBool beforeCases = JS_TRUE;
-
-        /* Emit code for evaluating cases and jumping to case statements. */
-        for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-            pn4 = pn3->pn_left;
-            if (pn4 && !js_EmitTree(cx, cg, pn4))
-                return JS_FALSE;
-            if (caseNoteIndex >= 0) {
-                /* off is the previous JSOP_CASE's bytecode offset. */
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)caseNoteIndex, 0,
-                                         CG_OFFSET(cg) - off)) {
-                    return JS_FALSE;
-                }
-            }
-            if (!pn4) {
-                JS_ASSERT(pn3->pn_type == TOK_DEFAULT);
-                continue;
-            }
-            caseNoteIndex = js_NewSrcNote2(cx, cg, SRC_PCDELTA, 0);
-            if (caseNoteIndex < 0)
-                return JS_FALSE;
-            off = EmitJump(cx, cg, JSOP_CASE, 0);
-            if (off < 0)
-                return JS_FALSE;
-            pn3->pn_offset = off;
-            if (beforeCases) {
-                /* Switch note's second offset is to first JSOP_CASE. */
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 1,
-                                         off - top)) {
-                    return JS_FALSE;
-                }
-                beforeCases = JS_FALSE;
-            }
-        }
-
-        /* Emit default even if no explicit default statement. */
-        defaultOffset = EmitJump(cx, cg, JSOP_DEFAULT, 0);
-        if (defaultOffset < 0)
-            return JS_FALSE;
-    } else {
-        pc = CG_CODE(cg, top + JUMP_OFFSET_LEN);
-
-        if (switchOp == JSOP_TABLESWITCH) {
-            /* Fill in switch bounds, which we know fit in 16-bit offsets. */
-            SET_JUMP_OFFSET(pc, low);
-            pc += JUMP_OFFSET_LEN;
-            SET_JUMP_OFFSET(pc, high);
-            pc += JUMP_OFFSET_LEN;
-
-            /*
-             * Use malloc to avoid arena bloat for programs with many switches.
-             * We free table if non-null at label out, so all control flow must
-             * exit this function through goto out or goto bad.
-             */
-            if (tableLength != 0) {
-                tableSize = (size_t)tableLength * sizeof *table;
-                table = (JSParseNode **) JS_malloc(cx, tableSize);
-                if (!table)
-                    return JS_FALSE;
-                memset(table, 0, tableSize);
-                for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-                    if (pn3->pn_type == TOK_DEFAULT)
-                        continue;
-                    i = JSVAL_TO_INT(pn3->pn_val);
-                    i -= low;
-                    JS_ASSERT((uint32)i < tableLength);
-                    table[i] = pn3;
-                }
-            }
-        } else {
-            JS_ASSERT(switchOp == JSOP_LOOKUPSWITCH);
-
-            /* Fill in the number of cases. */
-            SET_ATOM_INDEX(pc, caseCount);
-            pc += ATOM_INDEX_LEN;
-        }
-
-        /*
-         * After this point, all control flow involving JSOP_TABLESWITCH
-         * must set ok and goto out to exit this function.  To keep things
-         * simple, all switchOp cases exit that way.
-         */
-        if (constPropagated) {
-            /*
-             * Skip switchOp, as we are not setting jump offsets in the two
-             * for loops below.  We'll restore CG_NEXT(cg) from savepc after,
-             * unless there was an error.
-             */
-            savepc = CG_NEXT(cg);
-            CG_NEXT(cg) = pc + 1;
-            if (switchOp == JSOP_TABLESWITCH) {
-                for (i = 0; i < (jsint)tableLength; i++) {
-                    pn3 = table[i];
-                    if (pn3 &&
-                        (pn4 = pn3->pn_left) != NULL &&
-                        pn4->pn_type == TOK_NAME) {
-                        /* Note a propagated constant with the const's name. */
-                        JS_ASSERT(!pn4->pn_expr);
-                        ale = js_IndexAtom(cx, pn4->pn_atom, &cg->atomList);
-                        if (!ale)
-                            goto bad;
-                        CG_NEXT(cg) = pc;
-                        if (js_NewSrcNote2(cx, cg, SRC_LABEL, (ptrdiff_t)
-                                           ALE_INDEX(ale)) < 0) {
-                            goto bad;
-                        }
-                    }
-                    pc += JUMP_OFFSET_LEN;
-                }
-            } else {
-                for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-                    pn4 = pn3->pn_left;
-                    if (pn4 && pn4->pn_type == TOK_NAME) {
-                        /* Note a propagated constant with the const's name. */
-                        JS_ASSERT(!pn4->pn_expr);
-                        ale = js_IndexAtom(cx, pn4->pn_atom, &cg->atomList);
-                        if (!ale)
-                            goto bad;
-                        CG_NEXT(cg) = pc;
-                        if (js_NewSrcNote2(cx, cg, SRC_LABEL, (ptrdiff_t)
-                                           ALE_INDEX(ale)) < 0) {
-                            goto bad;
-                        }
-                    }
-                    pc += ATOM_INDEX_LEN + JUMP_OFFSET_LEN;
-                }
-            }
-            CG_NEXT(cg) = savepc;
-        }
-    }
-
-    /* Emit code for each case's statements, copying pn_offset up to pn3. */
-    for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-        if (switchOp == JSOP_CONDSWITCH && pn3->pn_type != TOK_DEFAULT)
-            CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, pn3->pn_offset);
-        pn4 = pn3->pn_right;
-        ok = js_EmitTree(cx, cg, pn4);
-        if (!ok)
-            goto out;
-        pn3->pn_offset = pn4->pn_offset;
-        if (pn3->pn_type == TOK_DEFAULT)
-            off = pn3->pn_offset - top;
-    }
-
-    if (!hasDefault) {
-        /* If no default case, offset for default is to end of switch. */
-        off = CG_OFFSET(cg) - top;
-    }
-
-    /* We better have set "off" by now. */
-    JS_ASSERT(off != -1);
-
-    /* Set the default offset (to end of switch if no default). */
-    if (switchOp == JSOP_CONDSWITCH) {
-        pc = NULL;
-        JS_ASSERT(defaultOffset != -1);
-        ok = js_SetJumpOffset(cx, cg, CG_CODE(cg, defaultOffset),
-                              off - (defaultOffset - top));
-        if (!ok)
-            goto out;
-    } else {
-        pc = CG_CODE(cg, top);
-        ok = js_SetJumpOffset(cx, cg, pc, off);
-        if (!ok)
-            goto out;
-        pc += JUMP_OFFSET_LEN;
-    }
-
-    /* Set the SRC_SWITCH note's offset operand to tell end of switch. */
-    off = CG_OFFSET(cg) - top;
-    ok = js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0, off);
-    if (!ok)
-        goto out;
-
-    if (switchOp == JSOP_TABLESWITCH) {
-        /* Skip over the already-initialized switch bounds. */
-        pc += 2 * JUMP_OFFSET_LEN;
-
-        /* Fill in the jump table, if there is one. */
-        for (i = 0; i < (jsint)tableLength; i++) {
-            pn3 = table[i];
-            off = pn3 ? pn3->pn_offset - top : 0;
-            ok = js_SetJumpOffset(cx, cg, pc, off);
-            if (!ok)
-                goto out;
-            pc += JUMP_OFFSET_LEN;
-        }
-    } else if (switchOp == JSOP_LOOKUPSWITCH) {
-        /* Skip over the already-initialized number of cases. */
-        pc += ATOM_INDEX_LEN;
-
-        for (pn3 = pn2->pn_head; pn3; pn3 = pn3->pn_next) {
-            if (pn3->pn_type == TOK_DEFAULT)
-                continue;
-            atom = js_AtomizeValue(cx, pn3->pn_val, 0);
-            if (!atom)
-                goto bad;
-            ale = js_IndexAtom(cx, atom, &cg->atomList);
-            if (!ale)
-                goto bad;
-            SET_ATOM_INDEX(pc, ALE_INDEX(ale));
-            pc += ATOM_INDEX_LEN;
-
-            off = pn3->pn_offset - top;
-            ok = js_SetJumpOffset(cx, cg, pc, off);
-            if (!ok)
-                goto out;
-            pc += JUMP_OFFSET_LEN;
-        }
-    }
-
-out:
-    if (table)
-        JS_free(cx, table);
-    return ok && js_PopStatementCG(cx, cg);
-
-bad:
-    ok = JS_FALSE;
-    goto out;
-}
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-JSBool
-js_EmitFunctionBody(JSContext *cx, JSCodeGenerator *cg, JSParseNode *body,
-                    JSFunction *fun)
-{
-    JSStackFrame *fp, frame;
-    JSObject *funobj;
-    JSBool ok;
-
-    if (!js_AllocTryNotes(cx, cg))
-        return JS_FALSE;
-
-    fp = cx->fp;
-    funobj = fun->object;
-    JS_ASSERT(!fp || (fp->fun != fun && fp->varobj != funobj &&
-                      fp->scopeChain != funobj));
-    memset(&frame, 0, sizeof frame);
-    frame.fun = fun;
-    frame.varobj = frame.scopeChain = funobj;
-    frame.down = fp;
-    frame.flags = JS_HAS_COMPILE_N_GO_OPTION(cx)
-                  ? JSFRAME_COMPILING | JSFRAME_COMPILE_N_GO
-                  : JSFRAME_COMPILING;
-    cx->fp = &frame;
-    ok = js_EmitTree(cx, cg, body);
-    cx->fp = fp;
-    if (!ok)
-        return JS_FALSE;
-
-    fun->u.script = js_NewScriptFromCG(cx, cg, fun);
-    if (!fun->u.script)
-        return JS_FALSE;
-    JS_ASSERT(fun->interpreted);
-    if (cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT)
-        fun->flags |= JSFUN_HEAVYWEIGHT;
-    return JS_TRUE;
-}
-
-/* A macro for inlining at the top of js_EmitTree (whence it came). */
-#define UPDATE_LINE_NUMBER_NOTES(cx, cg, pn)                                  \
-    JS_BEGIN_MACRO                                                            \
-        uintN line_ = (pn)->pn_pos.begin.lineno;                              \
-        uintN delta_ = line_ - CG_CURRENT_LINE(cg);                           \
-        if (delta_ != 0) {                                                    \
-            /*                                                                \
-             * Encode any change in the current source line number by using   \
-             * either several SRC_NEWLINE notes or just one SRC_SETLINE note, \
-             * whichever consumes less space.                                 \
-             *                                                                \
-             * NB: We handle backward line number deltas (possible with for   \
-             * loops where the update part is emitted after the body, but its \
-             * line number is <= any line number in the body) here by letting \
-             * unsigned delta_ wrap to a very large number, which triggers a  \
-             * SRC_SETLINE.                                                   \
-             */                                                               \
-            CG_CURRENT_LINE(cg) = line_;                                      \
-            if (delta_ >= (uintN)(2 + ((line_ > SN_3BYTE_OFFSET_MASK)<<1))) { \
-                if (js_NewSrcNote2(cx, cg, SRC_SETLINE, (ptrdiff_t)line_) < 0)\
-                    return JS_FALSE;                                          \
-            } else {                                                          \
-                do {                                                          \
-                    if (js_NewSrcNote(cx, cg, SRC_NEWLINE) < 0)               \
-                        return JS_FALSE;                                      \
-                } while (--delta_ != 0);                                      \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-/* A function, so that we avoid macro-bloating all the other callsites. */
-static JSBool
-UpdateLineNumberNotes(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
-{
-    UPDATE_LINE_NUMBER_NOTES(cx, cg, pn);
-    return JS_TRUE;
-}
-
-JSBool
-js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
-{
-    JSBool ok, useful, wantval;
-    JSStmtInfo *stmt, stmtInfo;
-    ptrdiff_t top, off, tmp, beq, jmp;
-    JSParseNode *pn2, *pn3;
-    JSAtom *atom;
-    JSAtomListElement *ale;
-    jsatomid atomIndex;
-    intN noteIndex;
-    JSSrcNoteType noteType;
-    jsbytecode *pc;
-    JSOp op;
-    uint32 argc;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return JS_FALSE;
-    }
-
-    ok = JS_TRUE;
-    cg->emitLevel++;
-    pn->pn_offset = top = CG_OFFSET(cg);
-
-    /* Emit notes to tell the current bytecode's source line number. */
-    UPDATE_LINE_NUMBER_NOTES(cx, cg, pn);
-
-    switch (pn->pn_type) {
-      case TOK_FUNCTION:
-      {
-        void *cg2mark;
-        JSCodeGenerator *cg2;
-        JSFunction *fun;
-
-#if JS_HAS_XML_SUPPORT
-        if (pn->pn_arity == PN_NULLARY) {
-            if (js_Emit1(cx, cg, JSOP_GETFUNNS) < 0)
-                return JS_FALSE;
-            break;
-        }
-#endif
-
-        /* Generate code for the function's body. */
-        cg2mark = JS_ARENA_MARK(&cx->tempPool);
-        JS_ARENA_ALLOCATE_TYPE(cg2, JSCodeGenerator, &cx->tempPool);
-        if (!cg2) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-        if (!js_InitCodeGenerator(cx, cg2, cg->codePool, cg->notePool,
-                                  cg->filename, pn->pn_pos.begin.lineno,
-                                  cg->principals)) {
-            return JS_FALSE;
-        }
-        cg2->treeContext.flags = (uint16) (pn->pn_flags | TCF_IN_FUNCTION);
-        cg2->treeContext.tryCount = pn->pn_tryCount;
-        cg2->parent = cg;
-        fun = (JSFunction *) JS_GetPrivate(cx, ATOM_TO_OBJECT(pn->pn_funAtom));
-        if (!js_EmitFunctionBody(cx, cg2, pn->pn_body, fun))
-            return JS_FALSE;
-
-        /*
-         * We need an activation object if an inner peeks out, or if such
-         * inner-peeking caused one of our inners to become heavyweight.
-         */
-        if (cg2->treeContext.flags &
-            (TCF_FUN_USES_NONLOCALS | TCF_FUN_HEAVYWEIGHT)) {
-            cg->treeContext.flags |= TCF_FUN_HEAVYWEIGHT;
-        }
-        js_FinishCodeGenerator(cx, cg2);
-        JS_ARENA_RELEASE(&cx->tempPool, cg2mark);
-
-        /* Make the function object a literal in the outer script's pool. */
-        ale = js_IndexAtom(cx, pn->pn_funAtom, &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        atomIndex = ALE_INDEX(ale);
-
-#if JS_HAS_LEXICAL_CLOSURE
-        /* Emit a bytecode pointing to the closure object in its immediate. */
-        if (pn->pn_op != JSOP_NOP) {
-            EMIT_ATOM_INDEX_OP(pn->pn_op, atomIndex);
-            break;
-        }
-#endif
-
-        /* Top-level named functions need a nop for decompilation. */
-        noteIndex = js_NewSrcNote2(cx, cg, SRC_FUNCDEF, (ptrdiff_t)atomIndex);
-        if (noteIndex < 0 ||
-            js_Emit1(cx, cg, JSOP_NOP) < 0) {
-            return JS_FALSE;
-        }
-
-        /*
-         * Top-levels also need a prolog op to predefine their names in the
-         * variable object, or if local, to fill their stack slots.
-         */
-        CG_SWITCH_TO_PROLOG(cg);
-
-#if JS_HAS_LEXICAL_CLOSURE
-        if (cg->treeContext.flags & TCF_IN_FUNCTION) {
-            JSObject *obj, *pobj;
-            JSProperty *prop;
-            JSScopeProperty *sprop;
-            uintN slot;
-
-            obj = OBJ_GET_PARENT(cx, fun->object);
-            if (!js_LookupHiddenProperty(cx, obj, ATOM_TO_JSID(fun->atom),
-                                         &pobj, &prop)) {
-                return JS_FALSE;
-            }
-
-            JS_ASSERT(prop && pobj == obj);
-            sprop = (JSScopeProperty *) prop;
-            JS_ASSERT(sprop->getter == js_GetLocalVariable);
-            slot = sprop->shortid;
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-
-            if (atomIndex >= JS_BIT(16)) {
-                /*
-                 * Lots of literals in the outer function, so we have to emit
-                 * [JSOP_LITOPX, atomIndex, JSOP_DEFLOCALFUN, var slot].
-                 */
-                off = js_EmitN(cx, cg, JSOP_LITOPX, 3);
-                if (off < 0)
-                    return JS_FALSE;
-                pc = CG_CODE(cg, off);
-                SET_LITERAL_INDEX(pc, atomIndex);
-                EMIT_UINT16_IMM_OP(JSOP_DEFLOCALFUN, slot);
-            } else {
-                /* Emit [JSOP_DEFLOCALFUN, var slot, atomIndex]. */
-                off = js_EmitN(cx, cg, JSOP_DEFLOCALFUN,
-                               VARNO_LEN + ATOM_INDEX_LEN);
-                if (off < 0)
-                    return JS_FALSE;
-                pc = CG_CODE(cg, off);
-                SET_VARNO(pc, slot);
-                pc += VARNO_LEN;
-                SET_ATOM_INDEX(pc, atomIndex);
-            }
-        } else
-#endif
-            EMIT_ATOM_INDEX_OP(JSOP_DEFFUN, atomIndex);
-
-        CG_SWITCH_TO_MAIN(cg);
-        break;
-      }
-
-#if JS_HAS_EXPORT_IMPORT
-      case TOK_EXPORT:
-        pn2 = pn->pn_head;
-        if (pn2->pn_type == TOK_STAR) {
-            /*
-             * 'export *' must have no other elements in the list (what would
-             * be the point?).
-             */
-            if (js_Emit1(cx, cg, JSOP_EXPORTALL) < 0)
-                return JS_FALSE;
-        } else {
-            /*
-             * If not 'export *', the list consists of NAME nodes identifying
-             * properties of the variables object to flag as exported.
-             */
-            do {
-                ale = js_IndexAtom(cx, pn2->pn_atom, &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-                EMIT_ATOM_INDEX_OP(JSOP_EXPORTNAME, ALE_INDEX(ale));
-            } while ((pn2 = pn2->pn_next) != NULL);
-        }
-        break;
-
-      case TOK_IMPORT:
-        for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            /*
-             * Each subtree on an import list is rooted by a DOT or LB node.
-             * A DOT may have a null pn_atom member, in which case pn_op must
-             * be JSOP_IMPORTALL -- see EmitPropOp above.
-             */
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-        }
-        break;
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-      case TOK_IF:
-        /* Initialize so we can detect else-if chains and avoid recursion. */
-        stmtInfo.type = STMT_IF;
-        beq = jmp = -1;
-        noteIndex = -1;
-
-      if_again:
-        /* Emit code for the condition before pushing stmtInfo. */
-        if (!js_EmitTree(cx, cg, pn->pn_kid1))
-            return JS_FALSE;
-        if (stmtInfo.type == STMT_IF) {
-            js_PushStatement(&cg->treeContext, &stmtInfo, STMT_IF,
-                             CG_OFFSET(cg));
-        } else {
-            /*
-             * We came here from the goto further below that detects else-if
-             * chains, so we must mutate stmtInfo back into a STMT_IF record.
-             * Also (see below for why) we need a note offset for SRC_IF_ELSE
-             * to help the decompiler.
-             */
-            JS_ASSERT(stmtInfo.type == STMT_ELSE);
-            stmtInfo.type = STMT_IF;
-            if (!js_SetSrcNoteOffset(cx, cg, noteIndex, 0, jmp - beq))
-                return JS_FALSE;
-        }
-
-        /* Emit an annotated branch-if-false around the then part. */
-        pn3 = pn->pn_kid3;
-        noteIndex = js_NewSrcNote(cx, cg, pn3 ? SRC_IF_ELSE : SRC_IF);
-        if (noteIndex < 0)
-            return JS_FALSE;
-        beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-        if (beq < 0)
-            return JS_FALSE;
-
-        /* Emit code for the then and optional else parts. */
-        if (!js_EmitTree(cx, cg, pn->pn_kid2))
-            return JS_FALSE;
-        if (pn3) {
-            /* Modify stmtInfo so we know we're in the else part. */
-            stmtInfo.type = STMT_ELSE;
-
-            /*
-             * Emit a JSOP_BACKPATCH op to jump from the end of our then part
-             * around the else part.  The js_PopStatementCG call at the bottom
-             * of this switch case will fix up the backpatch chain linked from
-             * stmtInfo.breaks.
-             */
-            jmp = EmitGoto(cx, cg, &stmtInfo, &stmtInfo.breaks, NULL, SRC_NULL);
-            if (jmp < 0)
-                return JS_FALSE;
-
-            /* Ensure the branch-if-false comes here, then emit the else. */
-            CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
-            if (pn3->pn_type == TOK_IF) {
-                pn = pn3;
-                goto if_again;
-            }
-
-            if (!js_EmitTree(cx, cg, pn3))
-                return JS_FALSE;
-
-            /*
-             * Annotate SRC_IF_ELSE with the offset from branch to jump, for
-             * the decompiler's benefit.  We can't just "back up" from the pc
-             * of the else clause, because we don't know whether an extended
-             * jump was required to leap from the end of the then clause over
-             * the else clause.
-             */
-            if (!js_SetSrcNoteOffset(cx, cg, noteIndex, 0, jmp - beq))
-                return JS_FALSE;
-        } else {
-            /* No else part, fixup the branch-if-false to come here. */
-            CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
-        }
-        ok = js_PopStatementCG(cx, cg);
-        break;
-
-#if JS_HAS_SWITCH_STATEMENT
-      case TOK_SWITCH:
-        /* Out of line to avoid bloating js_EmitTree's stack frame size. */
-        ok = EmitSwitch(cx, cg, pn, &stmtInfo);
-        break;
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-      case TOK_WHILE:
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_WHILE_LOOP, top);
-        if (!js_EmitTree(cx, cg, pn->pn_left))
-            return JS_FALSE;
-        noteIndex = js_NewSrcNote(cx, cg, SRC_WHILE);
-        if (noteIndex < 0)
-            return JS_FALSE;
-        beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-        if (beq < 0)
-            return JS_FALSE;
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-        jmp = EmitJump(cx, cg, JSOP_GOTO, top - CG_OFFSET(cg));
-        if (jmp < 0)
-            return JS_FALSE;
-        CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
-        if (!js_SetSrcNoteOffset(cx, cg, noteIndex, 0, jmp - beq))
-            return JS_FALSE;
-        ok = js_PopStatementCG(cx, cg);
-        break;
-
-#if JS_HAS_DO_WHILE_LOOP
-      case TOK_DO:
-        /* Emit an annotated nop so we know to decompile a 'do' keyword. */
-        if (js_NewSrcNote(cx, cg, SRC_WHILE) < 0 ||
-            js_Emit1(cx, cg, JSOP_NOP) < 0) {
-            return JS_FALSE;
-        }
-
-        /* Compile the loop body. */
-        top = CG_OFFSET(cg);
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_DO_LOOP, top);
-        if (!js_EmitTree(cx, cg, pn->pn_left))
-            return JS_FALSE;
-
-        /* Set loop and enclosing label update offsets, for continue. */
-        stmt = &stmtInfo;
-        do {
-            stmt->update = CG_OFFSET(cg);
-        } while ((stmt = stmt->down) != NULL && stmt->type == STMT_LABEL);
-
-        /* Compile the loop condition, now that continues know where to go. */
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-
-        /*
-         * No source note needed, because JSOP_IFNE is used only for do-while.
-         * If we ever use JSOP_IFNE for other purposes, we can still avoid yet
-         * another note here, by storing (jmp - top) in the SRC_WHILE note's
-         * offset, and fetching that delta in order to decompile recursively.
-         */
-        if (EmitJump(cx, cg, JSOP_IFNE, top - CG_OFFSET(cg)) < 0)
-            return JS_FALSE;
-        ok = js_PopStatementCG(cx, cg);
-        break;
-#endif /* JS_HAS_DO_WHILE_LOOP */
-
-      case TOK_FOR:
-        beq = 0;                /* suppress gcc warnings */
-        pn2 = pn->pn_left;
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_FOR_LOOP, top);
-
-        if (pn2->pn_type == TOK_IN) {
-            JSBool emitIFEQ;
-
-            /* Set stmtInfo type for later testing. */
-            stmtInfo.type = STMT_FOR_IN_LOOP;
-            noteIndex = -1;
-
-            /*
-             * If the left part is 'var x', emit code to define x if necessary
-             * using a prolog opcode, but do not emit a pop.  If the left part
-             * is 'var x = i', emit prolog code to define x if necessary; then
-             * emit code to evaluate i, assign the result to x, and pop the
-             * result off the stack.
-             *
-             * All the logic to do this is implemented in the outer switch's
-             * TOK_VAR case, conditioned on pn_extra flags set by the parser.
-             *
-             * In the 'for (var x = i in o) ...' case, the js_EmitTree(...pn3)
-             * called here will generate the SRC_VAR note for the assignment
-             * op that sets x = i, hoisting the initialized var declaration
-             * out of the loop: 'var x = i; for (x in o) ...'.
-             *
-             * In the 'for (var x in o) ...' case, nothing but the prolog op
-             * (if needed) should be generated here, we must emit the SRC_VAR
-             * just before the JSOP_FOR* opcode in the switch on pn3->pn_type
-             * a bit below, so nothing is hoisted: 'for (var x in o) ...'.
-             */
-            pn3 = pn2->pn_left;
-            if (pn3->pn_type == TOK_VAR && !js_EmitTree(cx, cg, pn3))
-                return JS_FALSE;
-
-            /* Emit a push to allocate the iterator. */
-            if (js_Emit1(cx, cg, JSOP_PUSH) < 0)
-                return JS_FALSE;
-
-            /* Compile the object expression to the right of 'in'. */
-            if (!js_EmitTree(cx, cg, pn2->pn_right))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_TOOBJECT) < 0)
-                return JS_FALSE;
-
-            top = CG_OFFSET(cg);
-            SET_STATEMENT_TOP(&stmtInfo, top);
-
-#if JS_HAS_XML_SUPPORT
-            /* Emit a prefix opcode if 'for each (... in ...)' was used. */
-            if (pn->pn_op != JSOP_NOP && js_Emit1(cx, cg, pn->pn_op) < 0)
-                return JS_FALSE;
-#endif
-
-            /* Compile a JSOP_FOR* bytecode based on the left hand side. */
-            emitIFEQ = JS_TRUE;
-            switch (pn3->pn_type) {
-              case TOK_VAR:
-                pn3 = pn3->pn_head;
-                JS_ASSERT(pn3->pn_type == TOK_NAME);
-                if (!pn3->pn_expr && js_NewSrcNote(cx, cg, SRC_VAR) < 0)
-                    return JS_FALSE;
-                /* FALL THROUGH */
-              case TOK_NAME:
-                if (pn3->pn_slot >= 0) {
-                    op = pn3->pn_op;
-                    switch (op) {
-                      case JSOP_GETARG:  /* FALL THROUGH */
-                      case JSOP_SETARG:  op = JSOP_FORARG; break;
-                      case JSOP_GETVAR:  /* FALL THROUGH */
-                      case JSOP_SETVAR:  op = JSOP_FORVAR; break;
-                      case JSOP_GETGVAR:
-                      case JSOP_SETGVAR: op = JSOP_FORNAME; break;
-                      default:           JS_ASSERT(0);
-                    }
-                } else {
-                    pn3->pn_op = JSOP_FORNAME;
-                    if (!LookupArgOrVar(cx, &cg->treeContext, pn3))
-                        return JS_FALSE;
-                    op = pn3->pn_op;
-                }
-                if (pn3->pn_slot >= 0) {
-                    if (pn3->pn_attrs & JSPROP_READONLY)
-                        op = JSOP_GETVAR;
-                    atomIndex = (jsatomid) pn3->pn_slot;
-                    EMIT_UINT16_IMM_OP(op, atomIndex);
-                } else {
-                    if (!EmitAtomOp(cx, pn3, op, cg))
-                        return JS_FALSE;
-                }
-                break;
-
-              case TOK_DOT:
-                useful = JS_TRUE;
-                if (!CheckSideEffects(cx, &cg->treeContext, pn3->pn_expr,
-                                      &useful)) {
-                    return JS_FALSE;
-                }
-                if (!useful) {
-                    if (!EmitPropOp(cx, pn3, JSOP_FORPROP, cg))
-                        return JS_FALSE;
-                    break;
-                }
-                /* FALL THROUGH */
-
-#if JS_HAS_XML_SUPPORT
-              case TOK_UNARYOP:
-#endif
-#if JS_HAS_LVALUE_RETURN
-              case TOK_LP:
-#endif
-              case TOK_LB:
-                /*
-                 * We separate the first/next bytecode from the enumerator
-                 * variable binding to avoid any side-effects in the index
-                 * expression (e.g., for (x[i++] in {}) should not bind x[i]
-                 * or increment i at all).
-                 */
-                emitIFEQ = JS_FALSE;
-                if (!js_Emit1(cx, cg, JSOP_FORELEM))
-                    return JS_FALSE;
-
-                /*
-                 * Emit a SRC_WHILE note with offset telling the distance to
-                 * the loop-closing jump (we can't reckon from the branch at
-                 * the top of the loop, because the loop-closing jump might
-                 * need to be an extended jump, independent of whether the
-                 * branch is short or long).
-                 */
-                noteIndex = js_NewSrcNote(cx, cg, SRC_WHILE);
-                if (noteIndex < 0)
-                    return JS_FALSE;
-                beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-                if (beq < 0)
-                    return JS_FALSE;
-
-#if JS_HAS_LVALUE_RETURN
-                if (pn3->pn_type == TOK_LP) {
-                    JS_ASSERT(pn3->pn_op == JSOP_SETCALL);
-                    if (!js_EmitTree(cx, cg, pn3))
-                        return JS_FALSE;
-                    if (!js_Emit1(cx, cg, JSOP_ENUMELEM))
-                        return JS_FALSE;
-                    break;
-                }
-#endif
-#if JS_HAS_XML_SUPPORT
-                if (pn3->pn_type == TOK_UNARYOP) {
-                    JS_ASSERT(pn3->pn_op == JSOP_BINDXMLNAME);
-                    if (!js_EmitTree(cx, cg, pn3))
-                        return JS_FALSE;
-                    if (!js_Emit1(cx, cg, JSOP_ENUMELEM))
-                        return JS_FALSE;
-                    break;
-                }
-#endif
-
-                /* Now that we're safely past the IFEQ, commit side effects. */
-                if (!EmitElemOp(cx, pn3, JSOP_ENUMELEM, cg))
-                    return JS_FALSE;
-                break;
-
-              default:
-                JS_ASSERT(0);
-            }
-
-            if (emitIFEQ) {
-                /* Annotate so the decompiler can find the loop-closing jump. */
-                noteIndex = js_NewSrcNote(cx, cg, SRC_WHILE);
-                if (noteIndex < 0)
-                    return JS_FALSE;
-
-                /* Pop and test the loop condition generated by JSOP_FOR*. */
-                beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-                if (beq < 0)
-                    return JS_FALSE;
-            }
-        } else {
-            if (!pn2->pn_kid1) {
-                /* No initializer: emit an annotated nop for the decompiler. */
-                op = JSOP_NOP;
-            } else {
-                if (!js_EmitTree(cx, cg, pn2->pn_kid1))
-                    return JS_FALSE;
-                op = JSOP_POP;
-            }
-            noteIndex = js_NewSrcNote(cx, cg, SRC_FOR);
-            if (noteIndex < 0 ||
-                js_Emit1(cx, cg, op) < 0) {
-                return JS_FALSE;
-            }
-
-            top = CG_OFFSET(cg);
-            SET_STATEMENT_TOP(&stmtInfo, top);
-            if (!pn2->pn_kid2) {
-                /* No loop condition: flag this fact in the source notes. */
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0, 0))
-                    return JS_FALSE;
-            } else {
-                if (!js_EmitTree(cx, cg, pn2->pn_kid2))
-                    return JS_FALSE;
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0,
-                                         CG_OFFSET(cg) - top)) {
-                    return JS_FALSE;
-                }
-                beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-                if (beq < 0)
-                    return JS_FALSE;
-            }
-
-            /* Set pn3 (used below) here to avoid spurious gcc warnings. */
-            pn3 = pn2->pn_kid3;
-        }
-
-        /* Emit code for the loop body. */
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-
-        if (pn2->pn_type != TOK_IN) {
-            /* Set the second note offset so we can find the update part. */
-            JS_ASSERT(noteIndex != -1);
-            if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 1,
-                                     CG_OFFSET(cg) - top)) {
-                return JS_FALSE;
-            }
-
-            if (pn3) {
-                /* Set loop and enclosing "update" offsets, for continue. */
-                stmt = &stmtInfo;
-                do {
-                    stmt->update = CG_OFFSET(cg);
-                } while ((stmt = stmt->down) != NULL &&
-                         stmt->type == STMT_LABEL);
-
-                if (!js_EmitTree(cx, cg, pn3))
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, JSOP_POP) < 0)
-                    return JS_FALSE;
-
-                /* Restore the absolute line number for source note readers. */
-                off = (ptrdiff_t) pn->pn_pos.end.lineno;
-                if (CG_CURRENT_LINE(cg) != (uintN) off) {
-                    if (js_NewSrcNote2(cx, cg, SRC_SETLINE, off) < 0)
-                        return JS_FALSE;
-                    CG_CURRENT_LINE(cg) = (uintN) off;
-                }
-            }
-
-            /* The third note offset helps us find the loop-closing jump. */
-            if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 2,
-                                     CG_OFFSET(cg) - top)) {
-                return JS_FALSE;
-            }
-        }
-
-        /* Emit the loop-closing jump and fixup all jump offsets. */
-        jmp = EmitJump(cx, cg, JSOP_GOTO, top - CG_OFFSET(cg));
-        if (jmp < 0)
-            return JS_FALSE;
-        if (beq > 0)
-            CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
-        if (pn2->pn_type == TOK_IN) {
-            /* Set the SRC_WHILE note offset so we can find the closing jump. */
-            JS_ASSERT(noteIndex != -1);
-            if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0, jmp - beq))
-                return JS_FALSE;
-        }
-
-        /* Now fixup all breaks and continues (before for/in's final POP2). */
-        if (!js_PopStatementCG(cx, cg))
-            return JS_FALSE;
-
-        if (pn2->pn_type == TOK_IN) {
-            if (js_Emit1(cx, cg, JSOP_POP2) < 0)
-                return JS_FALSE;
-        }
-        break;
-
-      case TOK_BREAK:
-        stmt = cg->treeContext.topStmt;
-        atom = pn->pn_atom;
-        if (atom) {
-            ale = js_IndexAtom(cx, atom, &cg->atomList);
-            if (!ale)
-                return JS_FALSE;
-            while (stmt->type != STMT_LABEL || stmt->label != atom)
-                stmt = stmt->down;
-            noteType = SRC_BREAK2LABEL;
-        } else {
-            ale = NULL;
-            while (!STMT_IS_LOOP(stmt) && stmt->type != STMT_SWITCH)
-                stmt = stmt->down;
-            noteType = SRC_NULL;
-        }
-
-        if (EmitGoto(cx, cg, stmt, &stmt->breaks, ale, noteType) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_CONTINUE:
-        stmt = cg->treeContext.topStmt;
-        atom = pn->pn_atom;
-        if (atom) {
-            /* Find the loop statement enclosed by the matching label. */
-            JSStmtInfo *loop = NULL;
-            ale = js_IndexAtom(cx, atom, &cg->atomList);
-            if (!ale)
-                return JS_FALSE;
-            while (stmt->type != STMT_LABEL || stmt->label != atom) {
-                if (STMT_IS_LOOP(stmt))
-                    loop = stmt;
-                stmt = stmt->down;
-            }
-            stmt = loop;
-            noteType = SRC_CONT2LABEL;
-        } else {
-            ale = NULL;
-            while (!STMT_IS_LOOP(stmt))
-                stmt = stmt->down;
-            noteType = SRC_CONTINUE;
-        }
-
-        if (EmitGoto(cx, cg, stmt, &stmt->continues, ale, noteType) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_WITH:
-        if (!js_EmitTree(cx, cg, pn->pn_left))
-            return JS_FALSE;
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_WITH, CG_OFFSET(cg));
-        if (js_Emit1(cx, cg, JSOP_ENTERWITH) < 0)
-            return JS_FALSE;
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_LEAVEWITH) < 0)
-            return JS_FALSE;
-        ok = js_PopStatementCG(cx, cg);
-        break;
-
-#if JS_HAS_EXCEPTIONS
-
-      case TOK_TRY:
-      {
-        ptrdiff_t start, end, catchStart, finallyCatch, catchJump;
-        JSParseNode *iter;
-        intN depth;
-
-        /* Quell GCC overwarnings. */
-        end = catchStart = finallyCatch = catchJump = -1;
-
-        /*
-         * Push stmtInfo to track jumps-over-catches and gosubs-to-finally
-         * for later fixup.
-         *
-         * When a finally block is `active' (STMT_FINALLY on the treeContext),
-         * non-local jumps (including jumps-over-catches) result in a GOSUB
-         * being written into the bytecode stream and fixed-up later (c.f.
-         * EmitBackPatchOp and BackPatch).
-         */
-        js_PushStatement(&cg->treeContext, &stmtInfo,
-                         pn->pn_kid3 ? STMT_FINALLY : STMT_BLOCK,
-                         CG_OFFSET(cg));
-
-        /*
-         * About JSOP_SETSP: an exception can be thrown while the stack is in
-         * an unbalanced state, and this imbalance causes problems with things
-         * like function invocation later on.
-         *
-         * To fix this, we compute the `balanced' stack depth upon try entry,
-         * and then restore the stack to this depth when we hit the first catch
-         * or finally block.  We can't just zero the stack, because things like
-         * for/in and with that are active upon entry to the block keep state
-         * variables on the stack.
-         */
-        depth = cg->stackDepth;
-
-        /* Mark try location for decompilation, then emit try block. */
-        if (js_Emit1(cx, cg, JSOP_TRY) < 0)
-            return JS_FALSE;
-        start = CG_OFFSET(cg);
-        if (!js_EmitTree(cx, cg, pn->pn_kid1))
-            return JS_FALSE;
-
-        /* GOSUB to finally, if present. */
-        if (pn->pn_kid3) {
-            if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-                return JS_FALSE;
-            jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH_PUSH, &stmtInfo.gosub);
-            if (jmp < 0)
-                return JS_FALSE;
-        }
-
-        /* Emit (hidden) jump over catch and/or finally. */
-        if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-            return JS_FALSE;
-        jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH, &stmtInfo.catchJump);
-        if (jmp < 0)
-            return JS_FALSE;
-
-        end = CG_OFFSET(cg);
-
-        /* If this try has a catch block, emit it. */
-        iter = pn->pn_kid2;
-        if (iter) {
-            catchStart = end;
-
-            /*
-             * The emitted code for a catch block looks like:
-             *
-             * [ popscope ]                        only if 2nd+ catch block
-             * name Object
-             * pushobj
-             * newinit
-             * exception
-             * initcatchvar <atom>
-             * enterwith
-             * [< catchguard code >]               if there's a catchguard
-             * [ifeq <offset to next catch block>]         " "
-             * < catch block contents >
-             * leavewith
-             * goto <end of catch blocks>          non-local; finally applies
-             *
-             * If there's no catch block without a catchguard, the last
-             * <offset to next catch block> points to rethrow code.  This
-             * code will GOSUB to the finally code if appropriate, and is
-             * also used for the catch-all trynote for capturing exceptions
-             * thrown from catch{} blocks.
-             */
-            for (;;) {
-                JSStmtInfo stmtInfo2;
-                JSParseNode *disc;
-                ptrdiff_t guardnote;
-
-                if (!UpdateLineNumberNotes(cx, cg, iter))
-                    return JS_FALSE;
-
-                if (catchJump != -1) {
-                    /* Fix up and clean up previous catch block. */
-                    CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, catchJump);
-
-                    /* Compensate for the [leavewith]. */
-                    cg->stackDepth++;
-                    JS_ASSERT((uintN) cg->stackDepth <= cg->maxStackDepth);
-
-                    if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0 ||
-                        js_Emit1(cx, cg, JSOP_LEAVEWITH) < 0) {
-                        return JS_FALSE;
-                    }
-                } else {
-                    /* Set stack to original depth (see SETSP comment above). */
-                    EMIT_UINT16_IMM_OP(JSOP_SETSP, (jsatomid)depth);
-                    cg->stackDepth = depth;
-                }
-
-                /* Non-negative guardnote offset is length of catchguard. */
-                guardnote = js_NewSrcNote2(cx, cg, SRC_CATCH, 0);
-                if (guardnote < 0 ||
-                    js_Emit1(cx, cg, JSOP_NOP) < 0) {
-                    return JS_FALSE;
-                }
-
-                /* Construct the scope holder and push it on. */
-                ale = js_IndexAtom(cx, cx->runtime->atomState.ObjectAtom,
-                                   &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-                EMIT_ATOM_INDEX_OP(JSOP_NAME, ALE_INDEX(ale));
-
-                if (js_Emit1(cx, cg, JSOP_PUSHOBJ) < 0 ||
-                    js_Emit1(cx, cg, JSOP_NEWINIT) < 0 ||
-                    js_Emit1(cx, cg, JSOP_EXCEPTION) < 0) {
-                    return JS_FALSE;
-                }
-
-                /* initcatchvar <atomIndex> */
-                disc = iter->pn_kid1;
-                ale = js_IndexAtom(cx, disc->pn_atom, &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-
-                EMIT_ATOM_INDEX_OP(JSOP_INITCATCHVAR, ALE_INDEX(ale));
-                if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0 ||
-                    js_Emit1(cx, cg, JSOP_ENTERWITH) < 0) {
-                    return JS_FALSE;
-                }
-
-                /* boolean_expr */
-                if (disc->pn_expr) {
-                    ptrdiff_t guardstart = CG_OFFSET(cg);
-                    if (!js_EmitTree(cx, cg, disc->pn_expr))
-                        return JS_FALSE;
-                    if (!js_SetSrcNoteOffset(cx, cg, guardnote, 0,
-                                             CG_OFFSET(cg) - guardstart)) {
-                        return JS_FALSE;
-                    }
-                    /* ifeq <next block> */
-                    catchJump = EmitJump(cx, cg, JSOP_IFEQ, 0);
-                    if (catchJump < 0)
-                        return JS_FALSE;
-                }
-
-                /* Emit catch block. */
-                js_PushStatement(&cg->treeContext, &stmtInfo2, STMT_CATCH,
-                                 CG_OFFSET(cg));
-                stmtInfo2.label = disc->pn_atom;
-                if (!js_EmitTree(cx, cg, iter->pn_kid3))
-                    return JS_FALSE;
-                js_PopStatementCG(cx, cg);
-
-                /*
-                 * Jump over the remaining catch blocks.
-                 * This counts as a non-local jump, so do the finally thing.
-                 */
-
-                /* leavewith, annotated so the decompiler knows to pop  */
-                off = cg->stackDepth - 1;
-                if (js_NewSrcNote2(cx, cg, SRC_CATCH, off) < 0 ||
-                    js_Emit1(cx, cg, JSOP_LEAVEWITH) < 0) {
-                    return JS_FALSE;
-                }
-
-                /* gosub <finally>, if required */
-                if (pn->pn_kid3) {
-                    jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH_PUSH,
-                                          &stmtInfo.gosub);
-                    if (jmp < 0)
-                        return JS_FALSE;
-                }
-
-                /* This will get fixed up to jump to after catch/finally. */
-                if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0)
-                    return JS_FALSE;
-                jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH,
-                                      &stmtInfo.catchJump);
-                if (jmp < 0)
-                    return JS_FALSE;
-                if (!iter->pn_kid2)     /* leave iter at last catch */
-                    break;
-                iter = iter->pn_kid2;
-            }
-        }
-
-        /*
-         * We use a [setsp],[gosub],rethrow block for rethrowing when
-         * there's no unguarded catch, and also for running finally code
-         * while letting an uncaught exception pass through.
-         */
-        if (pn->pn_kid3 ||
-            (catchJump != -1 && iter->pn_kid1->pn_expr)) {
-            /*
-             * Emit another stack fixup, because the catch could itself
-             * throw an exception in an unbalanced state, and the finally
-             * may need to call functions.  If there is no finally, only
-             * guarded catches, the rethrow code below nevertheless needs
-             * stack fixup.
-             */
-            finallyCatch = CG_OFFSET(cg);
-            EMIT_UINT16_IMM_OP(JSOP_SETSP, (jsatomid)depth);
-            cg->stackDepth = depth;
-
-            /* Last discriminant jumps to rethrow if none match. */
-            if (catchJump != -1 && iter->pn_kid1->pn_expr)
-                CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, catchJump);
-
-            if (pn->pn_kid3) {
-                jmp = EmitBackPatchOp(cx, cg, JSOP_BACKPATCH_PUSH,
-                                      &stmtInfo.gosub);
-                if (jmp < 0)
-                    return JS_FALSE;
-                cg->stackDepth = depth;
-            }
-
-            if (js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0 ||
-                js_Emit1(cx, cg, JSOP_EXCEPTION) < 0 ||
-                js_NewSrcNote(cx, cg, SRC_HIDDEN) < 0 ||
-                js_Emit1(cx, cg, JSOP_THROW) < 0) {
-                return JS_FALSE;
-            }
-            JS_ASSERT(cg->stackDepth == depth);
-        }
-
-        /*
-         * If we have a finally, it belongs here, and we have to fix up the
-         * gosubs that might have been emitted before non-local jumps.
-         */
-        if (pn->pn_kid3) {
-            if (!BackPatch(cx, cg, stmtInfo.gosub, CG_NEXT(cg), JSOP_GOSUB))
-                return JS_FALSE;
-
-            /*
-             * The stack budget must be balanced at this point, and we need
-             * one more slot for the JSOP_RETSUB return address pushed by a
-             * JSOP_GOSUB opcode that calls this finally clause.
-             */
-            JS_ASSERT(cg->stackDepth == depth);
-            if ((uintN)++cg->stackDepth > cg->maxStackDepth)
-                cg->maxStackDepth = cg->stackDepth;
-
-            /* Now indicate that we're emitting a subroutine body. */
-            stmtInfo.type = STMT_SUBROUTINE;
-            if (!UpdateLineNumberNotes(cx, cg, pn->pn_kid3))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_FINALLY) < 0 ||
-                !js_EmitTree(cx, cg, pn->pn_kid3) ||
-                js_Emit1(cx, cg, JSOP_RETSUB) < 0) {
-                return JS_FALSE;
-            }
-        }
-        js_PopStatementCG(cx, cg);
-
-        if (js_NewSrcNote(cx, cg, SRC_ENDBRACE) < 0 ||
-            js_Emit1(cx, cg, JSOP_NOP) < 0) {
-            return JS_FALSE;
-        }
-
-        /* Fix up the end-of-try/catch jumps to come here. */
-        if (!BackPatch(cx, cg, stmtInfo.catchJump, CG_NEXT(cg), JSOP_GOTO))
-            return JS_FALSE;
-
-        /*
-         * Add the try note last, to let post-order give us the right ordering
-         * (first to last for a given nesting level, inner to outer by level).
-         */
-        if (pn->pn_kid2) {
-            JS_ASSERT(end != -1 && catchStart != -1);
-            if (!js_NewTryNote(cx, cg, start, end, catchStart))
-                return JS_FALSE;
-        }
-
-        /*
-         * If we've got a finally, mark try+catch region with additional
-         * trynote to catch exceptions (re)thrown from a catch block or
-         * for the try{}finally{} case.
-         */
-        if (pn->pn_kid3) {
-            JS_ASSERT(finallyCatch != -1);
-            if (!js_NewTryNote(cx, cg, start, finallyCatch, finallyCatch))
-                return JS_FALSE;
-        }
-        break;
-      }
-
-#endif /* JS_HAS_EXCEPTIONS */
-
-      case TOK_VAR:
-        off = noteIndex = -1;
-        for (pn2 = pn->pn_head; ; pn2 = pn2->pn_next) {
-            JS_ASSERT(pn2->pn_type == TOK_NAME);
-            if (!LookupArgOrVar(cx, &cg->treeContext, pn2))
-                return JS_FALSE;
-            op = pn2->pn_op;
-            if (op == JSOP_ARGUMENTS) {
-                JS_ASSERT(!pn2->pn_expr); /* JSOP_ARGUMENTS => no initializer */
-#ifdef __GNUC__
-                atomIndex = 0;            /* quell GCC overwarning */
-#endif
-            } else {
-                if (pn2->pn_slot >= 0) {
-                    atomIndex = (jsatomid) pn2->pn_slot;
-                } else {
-                    ale = js_IndexAtom(cx, pn2->pn_atom, &cg->atomList);
-                    if (!ale)
-                        return JS_FALSE;
-                    atomIndex = ALE_INDEX(ale);
-                }
-
-                if ((js_CodeSpec[op].format & JOF_TYPEMASK) == JOF_CONST &&
-                    (!(cg->treeContext.flags & TCF_IN_FUNCTION) ||
-                     (cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT))) {
-                    /* Emit a prolog bytecode to predefine the variable. */
-                    CG_SWITCH_TO_PROLOG(cg);
-                    if (!UpdateLineNumberNotes(cx, cg, pn2))
-                        return JS_FALSE;
-                    EMIT_ATOM_INDEX_OP(pn->pn_op, atomIndex);
-                    CG_SWITCH_TO_MAIN(cg);
-                }
-
-                if (pn2->pn_expr) {
-                    if (op == JSOP_SETNAME)
-                        EMIT_ATOM_INDEX_OP(JSOP_BINDNAME, atomIndex);
-                    pn3 = pn2->pn_expr;
-                    if (pn->pn_op == JSOP_DEFCONST &&
-                        !js_DefineCompileTimeConstant(cx, cg, pn2->pn_atom,
-                                                      pn3)) {
-                        return JS_FALSE;
-                    }
-                    if (!js_EmitTree(cx, cg, pn3))
-                        return JS_FALSE;
-                }
-            }
-
-            /*
-             * 'for (var x in o) ...' and 'for (var x = i in o) ...' call the
-             * TOK_VAR case, but only the initialized case (a strange one that
-             * falls out of ECMA-262's grammar) wants to run past this point.
-             * Both cases must conditionally emit a JSOP_DEFVAR, above.  Note
-             * that the parser error-checks to ensure that pn->pn_count is 1.
-             *
-             * XXX Narcissus keeps track of variable declarations in the node
-             * for the script being compiled, so there's no need to share any
-             * conditional prolog code generation there.  We could do likewise,
-             * but it's a big change, requiring extra allocation, so probably
-             * not worth the trouble for SpiderMonkey.
-             */
-            if ((pn->pn_extra & PNX_FORINVAR) && !pn2->pn_expr)
-                break;
-
-            if (pn2 == pn->pn_head &&
-                js_NewSrcNote(cx, cg,
-                              (pn->pn_op == JSOP_DEFCONST)
-                              ? SRC_CONST
-                              : SRC_VAR) < 0) {
-                return JS_FALSE;
-            }
-            if (op == JSOP_ARGUMENTS) {
-                if (js_Emit1(cx, cg, op) < 0)
-                    return JS_FALSE;
-            } else if (pn2->pn_slot >= 0) {
-                EMIT_UINT16_IMM_OP(op, atomIndex);
-            } else {
-                EMIT_ATOM_INDEX_OP(op, atomIndex);
-            }
-            tmp = CG_OFFSET(cg);
-            if (noteIndex >= 0) {
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0, tmp-off))
-                    return JS_FALSE;
-            }
-            if (!pn2->pn_next)
-                break;
-            off = tmp;
-            noteIndex = js_NewSrcNote2(cx, cg, SRC_PCDELTA, 0);
-            if (noteIndex < 0 ||
-                js_Emit1(cx, cg, JSOP_POP) < 0) {
-                return JS_FALSE;
-            }
-        }
-        if (pn->pn_extra & PNX_POPVAR) {
-            if (js_Emit1(cx, cg, JSOP_POP) < 0)
-                return JS_FALSE;
-        }
-        break;
-
-      case TOK_RETURN:
-        /* Push a return value */
-        pn2 = pn->pn_kid;
-        if (pn2) {
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-        } else {
-            if (js_Emit1(cx, cg, JSOP_PUSH) < 0)
-                return JS_FALSE;
-        }
-
-        /*
-         * EmitNonLocalJumpFixup mutates op to JSOP_RETRVAL after emitting a
-         * JSOP_SETRVAL if there are open try blocks having finally clauses.
-         * We can't simply transfer control flow to our caller in that case,
-         * because we must gosub to those clauses from inner to outer, with
-         * the correct stack pointer (i.e., after popping any with, for/in,
-         * etc., slots nested inside the finally's try).
-         */
-        op = JSOP_RETURN;
-        if (!EmitNonLocalJumpFixup(cx, cg, NULL, &op))
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, op) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_LC:
-#if JS_HAS_XML_SUPPORT
-        if (pn->pn_arity == PN_UNARY) {
-            if (!js_EmitTree(cx, cg, pn->pn_kid))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, pn->pn_op) < 0)
-                return JS_FALSE;
-            break;
-        }
-#endif
-
-        JS_ASSERT(pn->pn_arity == PN_LIST);
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_BLOCK, top);
-        for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-        }
-        ok = js_PopStatementCG(cx, cg);
-        break;
-
-      case TOK_SEMI:
-        pn2 = pn->pn_kid;
-        if (pn2) {
-            /*
-             * Top-level or called-from-a-native JS_Execute/EvaluateScript,
-             * debugger, and eval frames may need the value of the ultimate
-             * expression statement as the script's result, despite the fact
-             * that it appears useless to the compiler.
-             */
-            useful = wantval = !cx->fp->fun ||
-                               !cx->fp->fun->interpreted ||
-                               (cx->fp->flags & JSFRAME_SPECIAL);
-            if (!useful) {
-                if (!CheckSideEffects(cx, &cg->treeContext, pn2, &useful))
-                    return JS_FALSE;
-            }
-            if (!useful) {
-                CG_CURRENT_LINE(cg) = pn2->pn_pos.begin.lineno;
-                if (!js_ReportCompileErrorNumber(cx, cg,
-                                                 JSREPORT_CG |
-                                                 JSREPORT_WARNING |
-                                                 JSREPORT_STRICT,
-                                                 JSMSG_USELESS_EXPR)) {
-                    return JS_FALSE;
-                }
-            } else {
-                if (!js_EmitTree(cx, cg, pn2))
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, wantval ? JSOP_POPV : JSOP_POP) < 0)
-                    return JS_FALSE;
-            }
-        }
-        break;
-
-      case TOK_COLON:
-        /* Emit an annotated nop so we know to decompile a label. */
-        atom = pn->pn_atom;
-        ale = js_IndexAtom(cx, atom, &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        pn2 = pn->pn_expr;
-        noteIndex = js_NewSrcNote2(cx, cg,
-                                   (pn2->pn_type == TOK_LC)
-                                   ? SRC_LABELBRACE
-                                   : SRC_LABEL,
-                                   (ptrdiff_t) ALE_INDEX(ale));
-        if (noteIndex < 0 ||
-            js_Emit1(cx, cg, JSOP_NOP) < 0) {
-            return JS_FALSE;
-        }
-
-        /* Emit code for the labeled statement. */
-        js_PushStatement(&cg->treeContext, &stmtInfo, STMT_LABEL,
-                         CG_OFFSET(cg));
-        stmtInfo.label = atom;
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-        if (!js_PopStatementCG(cx, cg))
-            return JS_FALSE;
-
-        /* If the statement was compound, emit a note for the end brace. */
-        if (pn2->pn_type == TOK_LC) {
-            if (js_NewSrcNote(cx, cg, SRC_ENDBRACE) < 0 ||
-                js_Emit1(cx, cg, JSOP_NOP) < 0) {
-                return JS_FALSE;
-            }
-        }
-        break;
-
-      case TOK_COMMA:
-        /*
-         * Emit SRC_PCDELTA notes on each JSOP_POP between comma operands.
-         * These notes help the decompiler bracket the bytecodes generated
-         * from each sub-expression that follows a comma.
-         */
-        off = noteIndex = -1;
-        for (pn2 = pn->pn_head; ; pn2 = pn2->pn_next) {
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            tmp = CG_OFFSET(cg);
-            if (noteIndex >= 0) {
-                if (!js_SetSrcNoteOffset(cx, cg, (uintN)noteIndex, 0, tmp-off))
-                    return JS_FALSE;
-            }
-            if (!pn2->pn_next)
-                break;
-            off = tmp;
-            noteIndex = js_NewSrcNote2(cx, cg, SRC_PCDELTA, 0);
-            if (noteIndex < 0 ||
-                js_Emit1(cx, cg, JSOP_POP) < 0) {
-                return JS_FALSE;
-            }
-        }
-        break;
-
-      case TOK_ASSIGN:
-        /*
-         * Check left operand type and generate specialized code for it.
-         * Specialize to avoid ECMA "reference type" values on the operand
-         * stack, which impose pervasive runtime "GetValue" costs.
-         */
-        pn2 = pn->pn_left;
-        JS_ASSERT(pn2->pn_type != TOK_RP);
-        atomIndex = (jsatomid) -1; /* Suppress warning. */
-        switch (pn2->pn_type) {
-          case TOK_NAME:
-            if (!LookupArgOrVar(cx, &cg->treeContext, pn2))
-                return JS_FALSE;
-            if (pn2->pn_slot >= 0) {
-                atomIndex = (jsatomid) pn2->pn_slot;
-            } else {
-                ale = js_IndexAtom(cx, pn2->pn_atom, &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-                atomIndex = ALE_INDEX(ale);
-                EMIT_ATOM_INDEX_OP(JSOP_BINDNAME, atomIndex);
-            }
-            break;
-          case TOK_DOT:
-            if (!js_EmitTree(cx, cg, pn2->pn_expr))
-                return JS_FALSE;
-            ale = js_IndexAtom(cx, pn2->pn_atom, &cg->atomList);
-            if (!ale)
-                return JS_FALSE;
-            atomIndex = ALE_INDEX(ale);
-            break;
-          case TOK_LB:
-            JS_ASSERT(pn->pn_arity == PN_BINARY);
-            if (!js_EmitTree(cx, cg, pn2->pn_left))
-                return JS_FALSE;
-            if (!js_EmitTree(cx, cg, pn2->pn_right))
-                return JS_FALSE;
-            break;
-#if JS_HAS_LVALUE_RETURN
-          case TOK_LP:
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            break;
-#endif
-#if JS_HAS_XML_SUPPORT
-          case TOK_UNARYOP:
-            JS_ASSERT(pn2->pn_op == JSOP_SETXMLNAME);
-            if (!js_EmitTree(cx, cg, pn2->pn_kid))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_BINDXMLNAME) < 0)
-                return JS_FALSE;
-            break;
-#endif
-          default:
-            JS_ASSERT(0);
-        }
-
-        op = pn->pn_op;
-#if JS_HAS_GETTER_SETTER
-        if (op == JSOP_GETTER || op == JSOP_SETTER) {
-            /* We'll emit these prefix bytecodes after emitting the r.h.s. */
-        } else
-#endif
-        /* If += or similar, dup the left operand and get its value. */
-        if (op != JSOP_NOP) {
-            switch (pn2->pn_type) {
-              case TOK_NAME:
-                if (pn2->pn_op != JSOP_SETNAME) {
-                    EMIT_UINT16_IMM_OP((pn2->pn_op == JSOP_SETGVAR)
-                                       ? JSOP_GETGVAR
-                                       : (pn2->pn_op == JSOP_SETARG)
-                                       ? JSOP_GETARG
-                                       : JSOP_GETVAR,
-                                       atomIndex);
-                    break;
-                }
-                /* FALL THROUGH */
-              case TOK_DOT:
-                if (js_Emit1(cx, cg, JSOP_DUP) < 0)
-                    return JS_FALSE;
-                EMIT_ATOM_INDEX_OP(JSOP_GETPROP, atomIndex);
-                break;
-              case TOK_LB:
-#if JS_HAS_LVALUE_RETURN
-              case TOK_LP:
-#endif
-#if JS_HAS_XML_SUPPORT
-              case TOK_UNARYOP:
-#endif
-                if (js_Emit1(cx, cg, JSOP_DUP2) < 0)
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, JSOP_GETELEM) < 0)
-                    return JS_FALSE;
-                break;
-              default:;
-            }
-        }
-
-        /* Now emit the right operand (it may affect the namespace). */
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-
-        /* If += etc., emit the binary operator with a decompiler note. */
-        if (op != JSOP_NOP) {
-            if (js_NewSrcNote(cx, cg, SRC_ASSIGNOP) < 0 ||
-                js_Emit1(cx, cg, op) < 0) {
-                return JS_FALSE;
-            }
-        }
-
-        /* Left parts such as a.b.c and a[b].c need a decompiler note. */
-        if (pn2->pn_type != TOK_NAME &&
-            js_NewSrcNote2(cx, cg, SrcNoteForPropOp(pn2, pn2->pn_op),
-                           CG_OFFSET(cg) - top) < 0) {
-            return JS_FALSE;
-        }
-
-        /* Finally, emit the specialized assignment bytecode. */
-        switch (pn2->pn_type) {
-          case TOK_NAME:
-            if (pn2->pn_slot < 0 || !(pn2->pn_attrs & JSPROP_READONLY)) {
-                if (pn2->pn_slot >= 0) {
-                    EMIT_UINT16_IMM_OP(pn2->pn_op, atomIndex);
-                } else {
-          case TOK_DOT:
-                    EMIT_ATOM_INDEX_OP(pn2->pn_op, atomIndex);
-                }
-            }
-            break;
-          case TOK_LB:
-#if JS_HAS_LVALUE_RETURN
-          case TOK_LP:
-#endif
-            if (js_Emit1(cx, cg, JSOP_SETELEM) < 0)
-                return JS_FALSE;
-            break;
-#if JS_HAS_XML_SUPPORT
-          case TOK_UNARYOP:
-            if (js_Emit1(cx, cg, JSOP_SETXMLNAME) < 0)
-                return JS_FALSE;
-            break;
-#endif
-          default:;
-        }
-        break;
-
-      case TOK_HOOK:
-        /* Emit the condition, then branch if false to the else part. */
-        if (!js_EmitTree(cx, cg, pn->pn_kid1))
-            return JS_FALSE;
-        noteIndex = js_NewSrcNote(cx, cg, SRC_COND);
-        if (noteIndex < 0)
-            return JS_FALSE;
-        beq = EmitJump(cx, cg, JSOP_IFEQ, 0);
-        if (beq < 0 || !js_EmitTree(cx, cg, pn->pn_kid2))
-            return JS_FALSE;
-
-        /* Jump around else, fixup the branch, emit else, fixup jump. */
-        jmp = EmitJump(cx, cg, JSOP_GOTO, 0);
-        if (jmp < 0)
-            return JS_FALSE;
-        CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
-        if (!js_EmitTree(cx, cg, pn->pn_kid3))
-            return JS_FALSE;
-        CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, jmp);
-        if (!js_SetSrcNoteOffset(cx, cg, noteIndex, 0, jmp - beq))
-            return JS_FALSE;
-
-        /*
-         * Because each branch pushes a single value, but our stack budgeting
-         * analysis ignores branches, we now have two values accounted for in
-         * cg->stackDepth.  Execution will follow only one path, so we must
-         * decrement cg->stackDepth here.  Failing to do this will foil code,
-         * such as the try/catch/finally exception handling code generator,
-         * that samples cg->stackDepth for use at runtime (JSOP_SETSP).
-         */
-        JS_ASSERT(cg->stackDepth > 1);
-        cg->stackDepth--;
-        break;
-
-      case TOK_OR:
-      case TOK_AND:
-        /*
-         * JSOP_OR converts the operand on the stack to boolean, and if true,
-         * leaves the original operand value on the stack and jumps; otherwise
-         * it pops and falls into the next bytecode, which evaluates the right
-         * operand.  The jump goes around the right operand evaluation.
-         *
-         * JSOP_AND converts the operand on the stack to boolean, and if false,
-         * leaves the original operand value on the stack and jumps; otherwise
-         * it pops and falls into the right operand's bytecode.
-         *
-         * Avoid tail recursion for long ||...|| expressions and long &&...&&
-         * expressions or long mixtures of ||'s and &&'s that can easily blow
-         * the stack, by forward-linking and then backpatching all the JSOP_OR
-         * and JSOP_AND bytecodes' immediate jump-offset operands.
-         */
-        pn3 = pn;
-        if (!js_EmitTree(cx, cg, pn->pn_left))
-            return JS_FALSE;
-        top = EmitJump(cx, cg, JSOP_BACKPATCH_POP, 0);
-        if (top < 0)
-            return JS_FALSE;
-        jmp = top;
-        pn2 = pn->pn_right;
-        while (pn2->pn_type == TOK_OR || pn2->pn_type == TOK_AND) {
-            pn = pn2;
-            if (!js_EmitTree(cx, cg, pn->pn_left))
-                return JS_FALSE;
-            off = EmitJump(cx, cg, JSOP_BACKPATCH_POP, 0);
-            if (off < 0)
-                return JS_FALSE;
-            if (!SetBackPatchDelta(cx, cg, CG_CODE(cg, jmp), off - jmp))
-                return JS_FALSE;
-            jmp = off;
-            pn2 = pn->pn_right;
-        }
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-        off = CG_OFFSET(cg);
-        do {
-            pc = CG_CODE(cg, top);
-            tmp = GetJumpOffset(cg, pc);
-            CHECK_AND_SET_JUMP_OFFSET(cx, cg, pc, off - top);
-            *pc = pn3->pn_op;
-            top += tmp;
-        } while ((pn3 = pn3->pn_right) != pn2);
-        break;
-
-      case TOK_BITOR:
-      case TOK_BITXOR:
-      case TOK_BITAND:
-      case TOK_EQOP:
-      case TOK_RELOP:
-#if JS_HAS_IN_OPERATOR
-      case TOK_IN:
-#endif
-#if JS_HAS_INSTANCEOF
-      case TOK_INSTANCEOF:
-#endif
-      case TOK_SHOP:
-      case TOK_PLUS:
-      case TOK_MINUS:
-      case TOK_STAR:
-      case TOK_DIVOP:
-        if (pn->pn_arity == PN_LIST) {
-            /* Left-associative operator chain: avoid too much recursion. */
-            pn2 = pn->pn_head;
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            op = pn->pn_op;
-            while ((pn2 = pn2->pn_next) != NULL) {
-                if (!js_EmitTree(cx, cg, pn2))
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, op) < 0)
-                    return JS_FALSE;
-            }
-        } else {
-#if JS_HAS_XML_SUPPORT
-      case TOK_DBLCOLON:
-            if (pn->pn_arity == PN_NAME) {
-                if (!js_EmitTree(cx, cg, pn->pn_expr))
-                    return JS_FALSE;
-                if (!EmitAtomOp(cx, pn, pn->pn_op, cg))
-                    return JS_FALSE;
-                break;
-            }
-#endif
-            /* Binary operators that evaluate both operands unconditionally. */
-            if (!js_EmitTree(cx, cg, pn->pn_left))
-                return JS_FALSE;
-            if (!js_EmitTree(cx, cg, pn->pn_right))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, pn->pn_op) < 0)
-                return JS_FALSE;
-        }
-        break;
-
-#if JS_HAS_EXCEPTIONS
-      case TOK_THROW:
-#endif
-#if JS_HAS_XML_SUPPORT
-      case TOK_AT:
-      case TOK_DEFAULT:
-        JS_ASSERT(pn->pn_arity == PN_UNARY);
-        /* FALL THROUGH */
-#endif
-      case TOK_UNARYOP:
-        /* Unary op, including unary +/-. */
-        pn2 = pn->pn_kid;
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-        op = pn->pn_op;
-#if JS_HAS_XML_SUPPORT
-        if (op == JSOP_XMLNAME &&
-            js_NewSrcNote2(cx, cg, SRC_PCBASE,
-                           CG_OFFSET(cg) - pn2->pn_offset) < 0) {
-            return JS_FALSE;
-        }
-#endif
-        if (js_Emit1(cx, cg, op) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_INC:
-      case TOK_DEC:
-        /* Emit lvalue-specialized code for ++/-- operators. */
-        pn2 = pn->pn_kid;
-        JS_ASSERT(pn2->pn_type != TOK_RP);
-        op = pn->pn_op;
-        switch (pn2->pn_type) {
-          case TOK_NAME:
-            pn2->pn_op = op;
-            if (!LookupArgOrVar(cx, &cg->treeContext, pn2))
-                return JS_FALSE;
-            op = pn2->pn_op;
-            if (pn2->pn_slot >= 0) {
-                if (pn2->pn_attrs & JSPROP_READONLY) {
-                    /* Incrementing a declared const: just get its value. */
-                    op = ((js_CodeSpec[op].format & JOF_TYPEMASK) == JOF_CONST)
-                         ? JSOP_GETGVAR
-                         : JSOP_GETVAR;
-                }
-                atomIndex = (jsatomid) pn2->pn_slot;
-                EMIT_UINT16_IMM_OP(op, atomIndex);
-            } else {
-                if (!EmitAtomOp(cx, pn2, op, cg))
-                    return JS_FALSE;
-            }
-            break;
-          case TOK_DOT:
-            if (!EmitPropOp(cx, pn2, op, cg))
-                return JS_FALSE;
-            break;
-          case TOK_LB:
-            if (!EmitElemOp(cx, pn2, op, cg))
-                return JS_FALSE;
-            break;
-#if JS_HAS_LVALUE_RETURN
-          case TOK_LP:
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            if (js_NewSrcNote2(cx, cg, SRC_PCBASE,
-                               CG_OFFSET(cg) - pn2->pn_offset) < 0) {
-                return JS_FALSE;
-            }
-            if (js_Emit1(cx, cg, op) < 0)
-                return JS_FALSE;
-            break;
-#endif
-#if JS_HAS_XML_SUPPORT
-          case TOK_UNARYOP:
-            JS_ASSERT(pn2->pn_op == JSOP_SETXMLNAME);
-            if (!js_EmitTree(cx, cg, pn2->pn_kid))
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, JSOP_BINDXMLNAME) < 0)
-                return JS_FALSE;
-            if (js_Emit1(cx, cg, op) < 0)
-                return JS_FALSE;
-            break;
-#endif
-          default:
-            JS_ASSERT(0);
-        }
-
-        /*
-         * Allocate another stack slot for GC protection in case the initial
-         * value being post-incremented or -decremented is not a number, but
-         * converts to a jsdouble.  In the TOK_NAME cases, op has 0 operand
-         * uses and 1 definition, so we don't need an extra stack slot -- we
-         * can use the one allocated for the def.
-         */
-        if (pn2->pn_type != TOK_NAME &&
-            (js_CodeSpec[op].format & JOF_POST) &&
-            (uintN)cg->stackDepth == cg->maxStackDepth) {
-            ++cg->maxStackDepth;
-        }
-        break;
-
-      case TOK_DELETE:
-        /*
-         * Under ECMA 3, deleting a non-reference returns true -- but alas we
-         * must evaluate the operand if it appears it might have side effects.
-         */
-        pn2 = pn->pn_kid;
-        switch (pn2->pn_type) {
-          case TOK_NAME:
-            pn2->pn_op = JSOP_DELNAME;
-            if (!LookupArgOrVar(cx, &cg->treeContext, pn2))
-                return JS_FALSE;
-            op = pn2->pn_op;
-            if (op == JSOP_FALSE) {
-                if (js_Emit1(cx, cg, op) < 0)
-                    return JS_FALSE;
-            } else {
-                if (!EmitAtomOp(cx, pn2, op, cg))
-                    return JS_FALSE;
-            }
-            break;
-          case TOK_DOT:
-            if (!EmitPropOp(cx, pn2, JSOP_DELPROP, cg))
-                return JS_FALSE;
-            break;
-#if JS_HAS_XML_SUPPORT
-          case TOK_DBLDOT:
-            if (!EmitElemOp(cx, pn2, JSOP_DELDESC, cg))
-                return JS_FALSE;
-            break;
-#endif
-          case TOK_LB:
-            if (!EmitElemOp(cx, pn2, JSOP_DELELEM, cg))
-                return JS_FALSE;
-            break;
-          default:
-            useful = JS_FALSE;
-            if (!CheckSideEffects(cx, &cg->treeContext, pn2, &useful))
-                return JS_FALSE;
-            if (useful) {
-                if (!js_EmitTree(cx, cg, pn2))
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, JSOP_POP) < 0)
-                    return JS_FALSE;
-            }
-            if (js_Emit1(cx, cg, JSOP_TRUE) < 0)
-                return JS_FALSE;
-        }
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_FILTER:
-        if (!js_EmitTree(cx, cg, pn->pn_left))
-            return JS_FALSE;
-        jmp = js_Emit3(cx, cg, JSOP_FILTER, 0, 0);
-        if (jmp < 0)
-            return JS_FALSE;
-        if (!js_EmitTree(cx, cg, pn->pn_right))
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_ENDFILTER) < 0)
-            return JS_FALSE;
-        CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, jmp);
-        break;
-#endif
-
-      case TOK_DOT:
-        /*
-         * Pop a stack operand, convert it to object, get a property named by
-         * this bytecode's immediate-indexed atom operand, and push its value
-         * (not a reference to it).  This bytecode sets the virtual machine's
-         * "obj" register to the left operand's ToObject conversion result,
-         * for use by JSOP_PUSHOBJ.
-         */
-        ok = EmitPropOp(cx, pn, pn->pn_op, cg);
-        break;
-
-      case TOK_LB:
-#if JS_HAS_XML_SUPPORT
-      case TOK_DBLDOT:
-#endif
-        /*
-         * Pop two operands, convert the left one to object and the right one
-         * to property name (atom or tagged int), get the named property, and
-         * push its value.  Set the "obj" register to the result of ToObject
-         * on the left operand.
-         */
-        ok = EmitElemOp(cx, pn, pn->pn_op, cg);
-        break;
-
-      case TOK_NEW:
-      case TOK_LP:
-        /*
-         * Emit function call or operator new (constructor call) code.
-         * First, emit code for the left operand to evaluate the callable or
-         * constructable object expression.
-         *
-         * For E4X, if this expression is a dotted member reference, select
-         * JSOP_GETMETHOD instead of JSOP_GETPROP.  ECMA-357 separates XML
-         * method lookup from the normal property id lookup done for native
-         * objects.
-         */
-        pn2 = pn->pn_head;
-#if JS_HAS_XML_SUPPORT
-        if (pn2->pn_type == TOK_DOT && pn2->pn_op != JSOP_GETMETHOD) {
-            JS_ASSERT(pn2->pn_op == JSOP_GETPROP);
-            pn2->pn_op = JSOP_GETMETHOD;
-            pn2->pn_attrs |= JSPROP_IMPLICIT_FUNCTION_NAMESPACE;
-        }
-#endif
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-
-        /*
-         * Push the virtual machine's "obj" register, which was set by a
-         * name, property, or element get (or set) bytecode.
-         */
-        if (js_Emit1(cx, cg, JSOP_PUSHOBJ) < 0)
-            return JS_FALSE;
-
-        /* Remember start of callable-object bytecode for decompilation hint. */
-        off = top;
-
-        /*
-         * Emit code for each argument in order, then emit the JSOP_*CALL* or
-         * JSOP_NEW bytecode with a two-byte immediate telling how many args
-         * were pushed on the operand stack.
-         */
-        for (pn2 = pn2->pn_next; pn2; pn2 = pn2->pn_next) {
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-        }
-        if (js_NewSrcNote2(cx, cg, SRC_PCBASE, CG_OFFSET(cg) - off) < 0)
-            return JS_FALSE;
-
-        argc = pn->pn_count - 1;
-        if (js_Emit3(cx, cg, pn->pn_op, ARGC_HI(argc), ARGC_LO(argc)) < 0)
-            return JS_FALSE;
-        break;
-
-#if JS_HAS_INITIALIZERS
-      case TOK_RB:
-        /*
-         * Emit code for [a, b, c] of the form:
-         *   t = new Array; t[0] = a; t[1] = b; t[2] = c; t;
-         * but use a stack slot for t and avoid dup'ing and popping it via
-         * the JSOP_NEWINIT and JSOP_INITELEM bytecodes.
-         */
-        ale = js_IndexAtom(cx, cx->runtime->atomState.ArrayAtom,
-                           &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        EMIT_ATOM_INDEX_OP(JSOP_NAME, ALE_INDEX(ale));
-        if (js_Emit1(cx, cg, JSOP_PUSHOBJ) < 0)
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_NEWINIT) < 0)
-            return JS_FALSE;
-
-        pn2 = pn->pn_head;
-#if JS_HAS_SHARP_VARS
-        if (pn2 && pn2->pn_type == TOK_DEFSHARP) {
-            EMIT_UINT16_IMM_OP(JSOP_DEFSHARP, (jsatomid)pn2->pn_num);
-            pn2 = pn2->pn_next;
-        }
-#endif
-
-        for (atomIndex = 0; pn2; atomIndex++, pn2 = pn2->pn_next) {
-            if (!EmitNumberOp(cx, atomIndex, cg))
-                return JS_FALSE;
-
-            /* FIXME 260106: holes in a sparse initializer are void-filled. */
-            if (pn2->pn_type == TOK_COMMA) {
-                if (js_Emit1(cx, cg, JSOP_PUSH) < 0)
-                    return JS_FALSE;
-            } else {
-                if (!js_EmitTree(cx, cg, pn2))
-                    return JS_FALSE;
-            }
-
-            if (js_Emit1(cx, cg, JSOP_INITELEM) < 0)
-                return JS_FALSE;
-        }
-
-        if (pn->pn_extra & PNX_ENDCOMMA) {
-            /* Emit a source note so we know to decompile an extra comma. */
-            if (js_NewSrcNote(cx, cg, SRC_CONTINUE) < 0)
-                return JS_FALSE;
-        }
-
-        /* Emit an op for sharp array cleanup and decompilation. */
-        if (js_Emit1(cx, cg, JSOP_ENDINIT) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_RC:
-        /*
-         * Emit code for {p:a, '%q':b, 2:c} of the form:
-         *   t = new Object; t.p = a; t['%q'] = b; t[2] = c; t;
-         * but use a stack slot for t and avoid dup'ing and popping it via
-         * the JSOP_NEWINIT and JSOP_INITELEM bytecodes.
-         */
-        ale = js_IndexAtom(cx, cx->runtime->atomState.ObjectAtom,
-                           &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        EMIT_ATOM_INDEX_OP(JSOP_NAME, ALE_INDEX(ale));
-
-        if (js_Emit1(cx, cg, JSOP_PUSHOBJ) < 0)
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_NEWINIT) < 0)
-            return JS_FALSE;
-
-        pn2 = pn->pn_head;
-#if JS_HAS_SHARP_VARS
-        if (pn2 && pn2->pn_type == TOK_DEFSHARP) {
-            EMIT_UINT16_IMM_OP(JSOP_DEFSHARP, (jsatomid)pn2->pn_num);
-            pn2 = pn2->pn_next;
-        }
-#endif
-
-        for (; pn2; pn2 = pn2->pn_next) {
-            /* Emit an index for t[2], else map an atom for t.p or t['%q']. */
-            pn3 = pn2->pn_left;
-            switch (pn3->pn_type) {
-              case TOK_NUMBER:
-                if (!EmitNumberOp(cx, pn3->pn_dval, cg))
-                    return JS_FALSE;
-                break;
-              case TOK_NAME:
-              case TOK_STRING:
-                ale = js_IndexAtom(cx, pn3->pn_atom, &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-                break;
-              default:
-                JS_ASSERT(0);
-            }
-
-            /* Emit code for the property initializer. */
-            if (!js_EmitTree(cx, cg, pn2->pn_right))
-                return JS_FALSE;
-
-#if JS_HAS_GETTER_SETTER
-            op = pn2->pn_op;
-            if (op == JSOP_GETTER || op == JSOP_SETTER) {
-                if (js_Emit1(cx, cg, op) < 0)
-                    return JS_FALSE;
-            }
-#endif
-            /* Annotate JSOP_INITELEM so we decompile 2:c and not just c. */
-            if (pn3->pn_type == TOK_NUMBER) {
-                if (js_NewSrcNote2(cx, cg, SRC_LABEL, 0) < 0)
-                    return JS_FALSE;
-                if (js_Emit1(cx, cg, JSOP_INITELEM) < 0)
-                    return JS_FALSE;
-            } else {
-                EMIT_ATOM_INDEX_OP(JSOP_INITPROP, ALE_INDEX(ale));
-            }
-        }
-
-        /* Emit an op for sharpArray cleanup and decompilation. */
-        if (js_Emit1(cx, cg, JSOP_ENDINIT) < 0)
-            return JS_FALSE;
-        break;
-
-#if JS_HAS_SHARP_VARS
-      case TOK_DEFSHARP:
-        if (!js_EmitTree(cx, cg, pn->pn_kid))
-            return JS_FALSE;
-        EMIT_UINT16_IMM_OP(JSOP_DEFSHARP, (jsatomid) pn->pn_num);
-        break;
-
-      case TOK_USESHARP:
-        EMIT_UINT16_IMM_OP(JSOP_USESHARP, (jsatomid) pn->pn_num);
-        break;
-#endif /* JS_HAS_SHARP_VARS */
-#endif /* JS_HAS_INITIALIZERS */
-
-      case TOK_RP:
-        /*
-         * The node for (e) has e as its kid, enabling users who want to nest
-         * assignment expressions in conditions to avoid the error correction
-         * done by Condition (from x = y to x == y) by double-parenthesizing.
-         */
-        if (!js_EmitTree(cx, cg, pn->pn_kid))
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_GROUP) < 0)
-            return JS_FALSE;
-        break;
-
-      case TOK_NAME:
-        if (!LookupArgOrVar(cx, &cg->treeContext, pn))
-            return JS_FALSE;
-        op = pn->pn_op;
-        if (op == JSOP_ARGUMENTS) {
-            if (js_Emit1(cx, cg, op) < 0)
-                return JS_FALSE;
-            break;
-        }
-        if (pn->pn_slot >= 0) {
-            atomIndex = (jsatomid) pn->pn_slot;
-            EMIT_UINT16_IMM_OP(op, atomIndex);
-            break;
-        }
-        /* FALL THROUGH */
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_XMLATTR:
-      case TOK_XMLSPACE:
-      case TOK_XMLTEXT:
-      case TOK_XMLCDATA:
-      case TOK_XMLCOMMENT:
-#endif
-      case TOK_STRING:
-      case TOK_OBJECT:
-        /*
-         * The scanner and parser associate JSOP_NAME with TOK_NAME, although
-         * other bytecodes may result instead (JSOP_BINDNAME/JSOP_SETNAME,
-         * JSOP_FORNAME, etc.).  Among JSOP_*NAME* variants, only JSOP_NAME
-         * may generate the first operand of a call or new expression, so only
-         * it sets the "obj" virtual machine register to the object along the
-         * scope chain in which the name was found.
-         *
-         * Token types for STRING and OBJECT have corresponding bytecode ops
-         * in pn_op and emit the same format as NAME, so they share this code.
-         */
-        ok = EmitAtomOp(cx, pn, pn->pn_op, cg);
-        break;
-
-      case TOK_NUMBER:
-        ok = EmitNumberOp(cx, pn->pn_dval, cg);
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_ANYNAME:
-#endif
-      case TOK_PRIMARY:
-        if (js_Emit1(cx, cg, pn->pn_op) < 0)
-            return JS_FALSE;
-        break;
-
-#if JS_HAS_DEBUGGER_KEYWORD
-      case TOK_DEBUGGER:
-        if (js_Emit1(cx, cg, JSOP_DEBUGGER) < 0)
-            return JS_FALSE;
-        break;
-#endif /* JS_HAS_DEBUGGER_KEYWORD */
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_XMLELEM:
-      case TOK_XMLLIST:
-        if (pn->pn_op == JSOP_XMLOBJECT) {
-            ok = EmitAtomOp(cx, pn, pn->pn_op, cg);
-            break;
-        }
-
-        JS_ASSERT(pn->pn_type == TOK_XMLLIST || pn->pn_count != 0);
-        switch (pn->pn_head ? pn->pn_head->pn_type : TOK_XMLLIST) {
-          case TOK_XMLETAGO:
-            JS_ASSERT(0);
-            /* FALL THROUGH */
-          case TOK_XMLPTAGC:
-          case TOK_XMLSTAGO:
-            break;
-          default:
-            if (js_Emit1(cx, cg, JSOP_STARTXML) < 0)
-                return JS_FALSE;
-        }
-
-        for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            if (pn2->pn_type == TOK_LC &&
-                js_Emit1(cx, cg, JSOP_STARTXMLEXPR) < 0) {
-                return JS_FALSE;
-            }
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            if (pn2 != pn->pn_head && js_Emit1(cx, cg, JSOP_ADD) < 0)
-                return JS_FALSE;
-        }
-
-        if (pn->pn_extra & PNX_XMLROOT) {
-            if (pn->pn_count == 0) {
-                JS_ASSERT(pn->pn_type == TOK_XMLLIST);
-                atom = cx->runtime->atomState.emptyAtom;
-                ale = js_IndexAtom(cx, atom, &cg->atomList);
-                if (!ale)
-                    return JS_FALSE;
-                EMIT_ATOM_INDEX_OP(JSOP_STRING, ALE_INDEX(ale));
-            }
-            if (js_Emit1(cx, cg, pn->pn_op) < 0)
-                return JS_FALSE;
-        }
-#ifdef DEBUG
-        else
-            JS_ASSERT(pn->pn_count != 0);
-#endif
-        break;
-
-      case TOK_XMLPTAGC:
-        if (pn->pn_op == JSOP_XMLOBJECT) {
-            ok = EmitAtomOp(cx, pn, pn->pn_op, cg);
-            break;
-        }
-        /* FALL THROUGH */
-
-      case TOK_XMLSTAGO:
-      case TOK_XMLETAGO:
-      {
-        uint32 i;
-
-        if (js_Emit1(cx, cg, JSOP_STARTXML) < 0)
-            return JS_FALSE;
-
-        ale = js_IndexAtom(cx,
-                           (pn->pn_type == TOK_XMLETAGO)
-                           ? cx->runtime->atomState.etagoAtom
-                           : cx->runtime->atomState.stagoAtom,
-                           &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        EMIT_ATOM_INDEX_OP(JSOP_STRING, ALE_INDEX(ale));
-
-        JS_ASSERT(pn->pn_count != 0);
-        pn2 = pn->pn_head;
-        if (pn2->pn_type == TOK_LC && js_Emit1(cx, cg, JSOP_STARTXMLEXPR) < 0)
-            return JS_FALSE;
-        if (!js_EmitTree(cx, cg, pn2))
-            return JS_FALSE;
-        if (js_Emit1(cx, cg, JSOP_ADD) < 0)
-            return JS_FALSE;
-
-        for (pn2 = pn2->pn_next, i = 0; pn2; pn2 = pn2->pn_next, i++) {
-            if (pn2->pn_type == TOK_LC &&
-                js_Emit1(cx, cg, JSOP_STARTXMLEXPR) < 0) {
-                return JS_FALSE;
-            }
-            if (!js_EmitTree(cx, cg, pn2))
-                return JS_FALSE;
-            if ((i & 1) && pn2->pn_type == TOK_LC) {
-                if (js_Emit1(cx, cg, JSOP_TOATTRVAL) < 0)
-                    return JS_FALSE;
-            }
-            if (js_Emit1(cx, cg,
-                         (i & 1) ? JSOP_ADDATTRVAL : JSOP_ADDATTRNAME) < 0) {
-                return JS_FALSE;
-            }
-        }
-
-        ale = js_IndexAtom(cx,
-                           (pn->pn_type == TOK_XMLPTAGC)
-                           ? cx->runtime->atomState.ptagcAtom
-                           : cx->runtime->atomState.tagcAtom,
-                           &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        EMIT_ATOM_INDEX_OP(JSOP_STRING, ALE_INDEX(ale));
-        if (js_Emit1(cx, cg, JSOP_ADD) < 0)
-            return JS_FALSE;
-
-        if ((pn->pn_extra & PNX_XMLROOT) && js_Emit1(cx, cg, pn->pn_op) < 0)
-            return JS_FALSE;
-        break;
-      }
-
-      case TOK_XMLNAME:
-        if (pn->pn_arity == PN_LIST) {
-            JS_ASSERT(pn->pn_count != 0);
-            for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-                if (!js_EmitTree(cx, cg, pn2))
-                    return JS_FALSE;
-                if (pn2 != pn->pn_head && js_Emit1(cx, cg, JSOP_ADD) < 0)
-                    return JS_FALSE;
-            }
-        } else {
-            JS_ASSERT(pn->pn_arity == PN_NULLARY);
-            ok = EmitAtomOp(cx, pn, pn->pn_op, cg);
-        }
-        break;
-
-      case TOK_XMLPI:
-        ale = js_IndexAtom(cx, pn->pn_atom2, &cg->atomList);
-        if (!ale)
-            return JS_FALSE;
-        if (!EmitAtomIndexOp(cx, JSOP_STRING, ALE_INDEX(ale), cg))
-            return JS_FALSE;
-        if (!EmitAtomOp(cx, pn, JSOP_XMLPI, cg))
-            return JS_FALSE;
-        break;
-#endif /* JS_HAS_XML_SUPPORT */
-
-      default:
-        JS_ASSERT(0);
-    }
-
-    if (ok && --cg->emitLevel == 0 && cg->spanDeps)
-        ok = OptimizeSpanDeps(cx, cg);
-
-    return ok;
-}
-
-JS_FRIEND_DATA(JSSrcNoteSpec) js_SrcNoteSpec[] = {
-    {"null",            0,      0,      0},
-    {"if",              0,      0,      0},
-    {"if-else",         1,      0,      1},
-    {"while",           1,      0,      1},
-    {"for",             3,      1,      1},
-    {"continue",        0,      0,      0},
-    {"var",             0,      0,      0},
-    {"pcdelta",         1,      0,      1},
-    {"assignop",        0,      0,      0},
-    {"cond",            1,      0,      1},
-    {"reserved0",       0,      0,      0},
-    {"hidden",          0,      0,      0},
-    {"pcbase",          1,      0,     -1},
-    {"label",           1,      0,      0},
-    {"labelbrace",      1,      0,      0},
-    {"endbrace",        0,      0,      0},
-    {"break2label",     1,      0,      0},
-    {"cont2label",      1,      0,      0},
-    {"switch",          2,      0,      1},
-    {"funcdef",         1,      0,      0},
-    {"catch",           1,     11,      1},
-    {"const",           0,      0,      0},
-    {"newline",         0,      0,      0},
-    {"setline",         1,      0,      0},
-    {"xdelta",          0,      0,      0},
-};
-
-static intN
-AllocSrcNote(JSContext *cx, JSCodeGenerator *cg)
-{
-    intN index;
-    JSArenaPool *pool;
-    size_t size;
-
-    index = CG_NOTE_COUNT(cg);
-    if (((uintN)index & CG_NOTE_MASK(cg)) == 0) {
-        pool = cg->notePool;
-        size = SRCNOTE_SIZE(CG_NOTE_MASK(cg) + 1);
-        if (!CG_NOTES(cg)) {
-            /* Allocate the first note array lazily; leave noteMask alone. */
-            JS_ARENA_ALLOCATE_CAST(CG_NOTES(cg), jssrcnote *, pool, size);
-        } else {
-            /* Grow by doubling note array size; update noteMask on success. */
-            JS_ARENA_GROW_CAST(CG_NOTES(cg), jssrcnote *, pool, size, size);
-            if (CG_NOTES(cg))
-                CG_NOTE_MASK(cg) = (CG_NOTE_MASK(cg) << 1) | 1;
-        }
-        if (!CG_NOTES(cg)) {
-            JS_ReportOutOfMemory(cx);
-            return -1;
-        }
-    }
-
-    CG_NOTE_COUNT(cg) = index + 1;
-    return index;
-}
-
-intN
-js_NewSrcNote(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type)
-{
-    intN index, n;
-    jssrcnote *sn;
-    ptrdiff_t offset, delta, xdelta;
-
-    /*
-     * Claim a note slot in CG_NOTES(cg) by growing it if necessary and then
-     * incrementing CG_NOTE_COUNT(cg).
-     */
-    index = AllocSrcNote(cx, cg);
-    if (index < 0)
-        return -1;
-    sn = &CG_NOTES(cg)[index];
-
-    /*
-     * Compute delta from the last annotated bytecode's offset.  If it's too
-     * big to fit in sn, allocate one or more xdelta notes and reset sn.
-     */
-    offset = CG_OFFSET(cg);
-    delta = offset - CG_LAST_NOTE_OFFSET(cg);
-    CG_LAST_NOTE_OFFSET(cg) = offset;
-    if (delta >= SN_DELTA_LIMIT) {
-        do {
-            xdelta = JS_MIN(delta, SN_XDELTA_MASK);
-            SN_MAKE_XDELTA(sn, xdelta);
-            delta -= xdelta;
-            index = AllocSrcNote(cx, cg);
-            if (index < 0)
-                return -1;
-            sn = &CG_NOTES(cg)[index];
-        } while (delta >= SN_DELTA_LIMIT);
-    }
-
-    /*
-     * Initialize type and delta, then allocate the minimum number of notes
-     * needed for type's arity.  Usually, we won't need more, but if an offset
-     * does take two bytes, js_SetSrcNoteOffset will grow CG_NOTES(cg).
-     */
-    SN_MAKE_NOTE(sn, type, delta);
-    for (n = (intN)js_SrcNoteSpec[type].arity; n > 0; n--) {
-        if (js_NewSrcNote(cx, cg, SRC_NULL) < 0)
-            return -1;
-    }
-    return index;
-}
-
-intN
-js_NewSrcNote2(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
-               ptrdiff_t offset)
-{
-    intN index;
-
-    index = js_NewSrcNote(cx, cg, type);
-    if (index >= 0) {
-        if (!js_SetSrcNoteOffset(cx, cg, index, 0, offset))
-            return -1;
-    }
-    return index;
-}
-
-intN
-js_NewSrcNote3(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
-               ptrdiff_t offset1, ptrdiff_t offset2)
-{
-    intN index;
-
-    index = js_NewSrcNote(cx, cg, type);
-    if (index >= 0) {
-        if (!js_SetSrcNoteOffset(cx, cg, index, 0, offset1))
-            return -1;
-        if (!js_SetSrcNoteOffset(cx, cg, index, 1, offset2))
-            return -1;
-    }
-    return index;
-}
-
-static JSBool
-GrowSrcNotes(JSContext *cx, JSCodeGenerator *cg)
-{
-    JSArenaPool *pool;
-    size_t size;
-
-    /* Grow by doubling note array size; update noteMask on success. */
-    pool = cg->notePool;
-    size = SRCNOTE_SIZE(CG_NOTE_MASK(cg) + 1);
-    JS_ARENA_GROW_CAST(CG_NOTES(cg), jssrcnote *, pool, size, size);
-    if (!CG_NOTES(cg)) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    CG_NOTE_MASK(cg) = (CG_NOTE_MASK(cg) << 1) | 1;
-    return JS_TRUE;
-}
-
-jssrcnote *
-js_AddToSrcNoteDelta(JSContext *cx, JSCodeGenerator *cg, jssrcnote *sn,
-                     ptrdiff_t delta)
-{
-    ptrdiff_t base, limit, newdelta, diff;
-    intN index;
-
-    /*
-     * Called only from OptimizeSpanDeps and js_FinishTakingSrcNotes to add to
-     * main script note deltas, and only by a small positive amount.
-     */
-    JS_ASSERT(cg->current == &cg->main);
-    JS_ASSERT((unsigned) delta < (unsigned) SN_XDELTA_LIMIT);
-
-    base = SN_DELTA(sn);
-    limit = SN_IS_XDELTA(sn) ? SN_XDELTA_LIMIT : SN_DELTA_LIMIT;
-    newdelta = base + delta;
-    if (newdelta < limit) {
-        SN_SET_DELTA(sn, newdelta);
-    } else {
-        index = sn - cg->main.notes;
-        if ((cg->main.noteCount & cg->main.noteMask) == 0) {
-            if (!GrowSrcNotes(cx, cg))
-                return NULL;
-            sn = cg->main.notes + index;
-        }
-        diff = cg->main.noteCount - index;
-        cg->main.noteCount++;
-        memmove(sn + 1, sn, SRCNOTE_SIZE(diff));
-        SN_MAKE_XDELTA(sn, delta);
-        sn++;
-    }
-    return sn;
-}
-
-JS_FRIEND_API(uintN)
-js_SrcNoteLength(jssrcnote *sn)
-{
-    uintN arity;
-    jssrcnote *base;
-
-    arity = (intN)js_SrcNoteSpec[SN_TYPE(sn)].arity;
-    for (base = sn++; arity; sn++, arity--) {
-        if (*sn & SN_3BYTE_OFFSET_FLAG)
-            sn += 2;
-    }
-    return sn - base;
-}
-
-JS_FRIEND_API(ptrdiff_t)
-js_GetSrcNoteOffset(jssrcnote *sn, uintN which)
-{
-    /* Find the offset numbered which (i.e., skip exactly which offsets). */
-    JS_ASSERT(SN_TYPE(sn) != SRC_XDELTA);
-    JS_ASSERT(which < js_SrcNoteSpec[SN_TYPE(sn)].arity);
-    for (sn++; which; sn++, which--) {
-        if (*sn & SN_3BYTE_OFFSET_FLAG)
-            sn += 2;
-    }
-    if (*sn & SN_3BYTE_OFFSET_FLAG) {
-        return (ptrdiff_t)(((uint32)(sn[0] & SN_3BYTE_OFFSET_MASK) << 16)
-                           | (sn[1] << 8)
-                           | sn[2]);
-    }
-    return (ptrdiff_t)*sn;
-}
-
-JSBool
-js_SetSrcNoteOffset(JSContext *cx, JSCodeGenerator *cg, uintN index,
-                    uintN which, ptrdiff_t offset)
-{
-    jssrcnote *sn;
-    ptrdiff_t diff;
-
-    if ((jsuword)offset >= (jsuword)((ptrdiff_t)SN_3BYTE_OFFSET_FLAG << 16)) {
-        ReportStatementTooLarge(cx, cg);
-        return JS_FALSE;
-    }
-
-    /* Find the offset numbered which (i.e., skip exactly which offsets). */
-    sn = &CG_NOTES(cg)[index];
-    JS_ASSERT(SN_TYPE(sn) != SRC_XDELTA);
-    JS_ASSERT(which < js_SrcNoteSpec[SN_TYPE(sn)].arity);
-    for (sn++; which; sn++, which--) {
-        if (*sn & SN_3BYTE_OFFSET_FLAG)
-            sn += 2;
-    }
-
-    /* See if the new offset requires three bytes. */
-    if (offset > (ptrdiff_t)SN_3BYTE_OFFSET_MASK) {
-        /* Maybe this offset was already set to a three-byte value. */
-        if (!(*sn & SN_3BYTE_OFFSET_FLAG)) {
-            /* Losing, need to insert another two bytes for this offset. */
-            index = PTRDIFF(sn, CG_NOTES(cg), jssrcnote);
-
-            /*
-             * Simultaneously test to see if the source note array must grow to
-             * accomodate either the first or second byte of additional storage
-             * required by this 3-byte offset.
-             */
-            if (((CG_NOTE_COUNT(cg) + 1) & CG_NOTE_MASK(cg)) <= 1) {
-                if (!GrowSrcNotes(cx, cg))
-                    return JS_FALSE;
-                sn = CG_NOTES(cg) + index;
-            }
-            CG_NOTE_COUNT(cg) += 2;
-
-            diff = CG_NOTE_COUNT(cg) - (index + 3);
-            JS_ASSERT(diff >= 0);
-            if (diff > 0)
-                memmove(sn + 3, sn + 1, SRCNOTE_SIZE(diff));
-        }
-        *sn++ = (jssrcnote)(SN_3BYTE_OFFSET_FLAG | (offset >> 16));
-        *sn++ = (jssrcnote)(offset >> 8);
-    }
-    *sn = (jssrcnote)offset;
-    return JS_TRUE;
-}
-
-#ifdef DEBUG_brendan
-#define NBINS 10
-static uint32 hist[NBINS];
-
-void DumpSrcNoteSizeHist()
-{
-    static FILE *fp;
-    int i, n;
-
-    if (!fp) {
-        fp = fopen("/tmp/srcnotes.hist", "w");
-        if (!fp)
-            return;
-        setvbuf(fp, NULL, _IONBF, 0);
-    }
-    fprintf(fp, "SrcNote size histogram:\n");
-    for (i = 0; i < NBINS; i++) {
-        fprintf(fp, "%4u %4u ", JS_BIT(i), hist[i]);
-        for (n = (int) JS_HOWMANY(hist[i], 10); n > 0; --n)
-            fputc('*', fp);
-        fputc('\n', fp);
-    }
-    fputc('\n', fp);
-}
-#endif
-
-/*
- * Fill in the storage at notes with prolog and main srcnotes; the space at
- * notes was allocated using the CG_COUNT_FINAL_SRCNOTES macro from jsemit.h.
- * SO DON'T CHANGE THIS FUNCTION WITHOUT AT LEAST CHECKING WHETHER jsemit.h's
- * CG_COUNT_FINAL_SRCNOTES MACRO NEEDS CORRESPONDING CHANGES!
- */
-JSBool
-js_FinishTakingSrcNotes(JSContext *cx, JSCodeGenerator *cg, jssrcnote *notes)
-{
-    uintN prologCount, mainCount, totalCount;
-    ptrdiff_t offset, delta;
-    jssrcnote *sn;
-
-    JS_ASSERT(cg->current == &cg->main);
-
-    prologCount = cg->prolog.noteCount;
-    if (prologCount && cg->prolog.currentLine != cg->firstLine) {
-        CG_SWITCH_TO_PROLOG(cg);
-        if (js_NewSrcNote2(cx, cg, SRC_SETLINE, (ptrdiff_t)cg->firstLine) < 0)
-            return JS_FALSE;
-        prologCount = cg->prolog.noteCount;
-        CG_SWITCH_TO_MAIN(cg);
-    } else {
-        /*
-         * Either no prolog srcnotes, or no line number change over prolog.
-         * We don't need a SRC_SETLINE, but we may need to adjust the offset
-         * of the first main note, by adding to its delta and possibly even
-         * prepending SRC_XDELTA notes to it to account for prolog bytecodes
-         * that came at and after the last annotated bytecode.
-         */
-        offset = CG_PROLOG_OFFSET(cg) - cg->prolog.lastNoteOffset;
-        JS_ASSERT(offset >= 0);
-        if (offset > 0) {
-            /* NB: Use as much of the first main note's delta as we can. */
-            sn = cg->main.notes;
-            delta = SN_IS_XDELTA(sn)
-                    ? SN_XDELTA_MASK - (*sn & SN_XDELTA_MASK)
-                    : SN_DELTA_MASK - (*sn & SN_DELTA_MASK);
-            if (offset < delta)
-                delta = offset;
-            for (;;) {
-                if (!js_AddToSrcNoteDelta(cx, cg, sn, delta))
-                    return JS_FALSE;
-                offset -= delta;
-                if (offset == 0)
-                    break;
-                delta = JS_MIN(offset, SN_XDELTA_MASK);
-                sn = cg->main.notes;
-            }
-        }
-    }
-
-    mainCount = cg->main.noteCount;
-    totalCount = prologCount + mainCount;
-    if (prologCount)
-        memcpy(notes, cg->prolog.notes, SRCNOTE_SIZE(prologCount));
-    memcpy(notes + prologCount, cg->main.notes, SRCNOTE_SIZE(mainCount));
-    SN_MAKE_TERMINATOR(&notes[totalCount]);
-
-#ifdef DEBUG_brendan
-  { int bin = JS_CeilingLog2(totalCount);
-    if (bin >= NBINS)
-        bin = NBINS - 1;
-    ++hist[bin];
-  }
-#endif
-    return JS_TRUE;
-}
-
-JSBool
-js_AllocTryNotes(JSContext *cx, JSCodeGenerator *cg)
-{
-    size_t size, incr;
-    ptrdiff_t delta;
-
-    size = TRYNOTE_SIZE(cg->treeContext.tryCount);
-    if (size <= cg->tryNoteSpace)
-        return JS_TRUE;
-
-    /*
-     * Allocate trynotes from cx->tempPool.
-     * XXX Too much growing and we bloat, as other tempPool allocators block
-     * in-place growth, and we never recycle old free space in an arena.
-     * YYY But once we consume an entire arena, we'll realloc it, letting the
-     * malloc heap recycle old space, while still freeing _en masse_ via the
-     * arena pool.
-     */
-    if (!cg->tryBase) {
-        size = JS_ROUNDUP(size, TRYNOTE_SIZE(TRYNOTE_CHUNK));
-        JS_ARENA_ALLOCATE_CAST(cg->tryBase, JSTryNote *, &cx->tempPool, size);
-        if (!cg->tryBase)
-            return JS_FALSE;
-        cg->tryNoteSpace = size;
-        cg->tryNext = cg->tryBase;
-    } else {
-        delta = PTRDIFF((char *)cg->tryNext, (char *)cg->tryBase, char);
-        incr = size - cg->tryNoteSpace;
-        incr = JS_ROUNDUP(incr, TRYNOTE_SIZE(TRYNOTE_CHUNK));
-        size = cg->tryNoteSpace;
-        JS_ARENA_GROW_CAST(cg->tryBase, JSTryNote *, &cx->tempPool, size, incr);
-        if (!cg->tryBase)
-            return JS_FALSE;
-        cg->tryNoteSpace = size + incr;
-        cg->tryNext = (JSTryNote *)((char *)cg->tryBase + delta);
-    }
-    return JS_TRUE;
-}
-
-JSTryNote *
-js_NewTryNote(JSContext *cx, JSCodeGenerator *cg, ptrdiff_t start,
-              ptrdiff_t end, ptrdiff_t catchStart)
-{
-    JSTryNote *tn;
-
-    JS_ASSERT(cg->tryBase <= cg->tryNext);
-    JS_ASSERT(catchStart >= 0);
-    tn = cg->tryNext++;
-    tn->start = start;
-    tn->length = end - start;
-    tn->catchStart = catchStart;
-    return tn;
-}
-
-void
-js_FinishTakingTryNotes(JSContext *cx, JSCodeGenerator *cg, JSTryNote *notes)
-{
-    uintN count;
-
-    count = PTRDIFF(cg->tryNext, cg->tryBase, JSTryNote);
-    if (!count)
-        return;
-
-    memcpy(notes, cg->tryBase, TRYNOTE_SIZE(count));
-    notes[count].start = 0;
-    notes[count].length = CG_OFFSET(cg);
-    notes[count].catchStart = 0;
-}
diff --git a/libs/js/src/jsemit.h b/libs/js/src/jsemit.h
deleted file mode 100644
index 6ec4600b4d..0000000000
--- a/libs/js/src/jsemit.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsemit_h___
-#define jsemit_h___
-/*
- * JS bytecode generation.
- */
-
-#include "jsstddef.h"
-#include "jstypes.h"
-#include "jsatom.h"
-#include "jsopcode.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * NB: If you add non-loop STMT_* enumerators, do so before STMT_DO_LOOP or
- * you will break the STMT_IS_LOOP macro, just below this enum.
- */
-typedef enum JSStmtType {
-    STMT_BLOCK        = 0,      /* compound statement: { s1[;... sN] } */
-    STMT_LABEL        = 1,      /* labeled statement:  L: s */
-    STMT_IF           = 2,      /* if (then) statement */
-    STMT_ELSE         = 3,      /* else clause of if statement */
-    STMT_SWITCH       = 4,      /* switch statement */
-    STMT_WITH         = 5,      /* with statement */
-    STMT_TRY          = 6,      /* try statement */
-    STMT_CATCH        = 7,      /* catch block */
-    STMT_FINALLY      = 8,      /* finally statement */
-    STMT_SUBROUTINE   = 9,      /* gosub-target subroutine body */
-    STMT_DO_LOOP      = 10,     /* do/while loop statement */
-    STMT_FOR_LOOP     = 11,     /* for loop statement */
-    STMT_FOR_IN_LOOP  = 12,     /* for/in loop statement */
-    STMT_WHILE_LOOP   = 13      /* while loop statement */
-} JSStmtType;
-
-#define STMT_IS_LOOP(stmt)      ((stmt)->type >= STMT_DO_LOOP)
-
-typedef struct JSStmtInfo JSStmtInfo;
-
-struct JSStmtInfo {
-    JSStmtType      type;           /* statement type */
-    ptrdiff_t       update;         /* loop update offset (top if none) */
-    ptrdiff_t       breaks;         /* offset of last break in loop */
-    ptrdiff_t       continues;      /* offset of last continue in loop */
-    ptrdiff_t       gosub;          /* offset of last GOSUB for this finally */
-    ptrdiff_t       catchJump;      /* offset of last end-of-catch jump */
-    JSAtom          *label;         /* name of LABEL or CATCH var */
-    JSStmtInfo      *down;          /* info for enclosing statement */
-};
-
-#define SET_STATEMENT_TOP(stmt, top)                                          \
-    ((stmt)->update = (top), (stmt)->breaks =                                 \
-     (stmt)->continues = (stmt)->catchJump = (stmt)->gosub = (-1))
-
-struct JSTreeContext {              /* tree context for semantic checks */
-    uint16          flags;          /* statement state flags, see below */
-    uint16          numGlobalVars;  /* max. no. of global variables/regexps */
-    uint32          tryCount;       /* total count of try statements parsed */
-    uint32          globalUses;     /* optimizable global var uses in total */
-    uint32          loopyGlobalUses;/* optimizable global var uses in loops */
-    JSStmtInfo      *topStmt;       /* top of statement info stack */
-    JSAtomList      decls;          /* function, const, and var declarations */
-    JSParseNode     *nodeList;      /* list of recyclable parse-node structs */
-};
-
-#define TCF_COMPILING          0x01 /* generating bytecode; this tc is a cg */
-#define TCF_IN_FUNCTION        0x02 /* parsing inside function body */
-#define TCF_RETURN_EXPR        0x04 /* function has 'return expr;' */
-#define TCF_RETURN_VOID        0x08 /* function has 'return;' */
-#define TCF_IN_FOR_INIT        0x10 /* parsing init expr of for; exclude 'in' */
-#define TCF_FUN_CLOSURE_VS_VAR 0x20 /* function and var with same name */
-#define TCF_FUN_USES_NONLOCALS 0x40 /* function refers to non-local names */
-#define TCF_FUN_HEAVYWEIGHT    0x80 /* function needs Call object per call */
-#define TCF_FUN_FLAGS          0xE0 /* flags to propagate from FunctionBody */
-#define TCF_HAS_DEFXMLNS      0x100 /* default xml namespace = ...; parsed */
-
-#define TREE_CONTEXT_INIT(tc)                                                 \
-    ((tc)->flags = (tc)->numGlobalVars = 0,                                   \
-     (tc)->tryCount = (tc)->globalUses = (tc)->loopyGlobalUses = 0,           \
-     (tc)->topStmt = NULL, ATOM_LIST_INIT(&(tc)->decls),                      \
-     (tc)->nodeList = NULL)
-
-#define TREE_CONTEXT_FINISH(tc)                                               \
-    ((void)0)
-
-/*
- * Span-dependent instructions are jumps whose span (from the jump bytecode to
- * the jump target) may require 2 or 4 bytes of immediate operand.
- */
-typedef struct JSSpanDep    JSSpanDep;
-typedef struct JSJumpTarget JSJumpTarget;
-
-struct JSSpanDep {
-    ptrdiff_t       top;        /* offset of first bytecode in an opcode */
-    ptrdiff_t       offset;     /* offset - 1 within opcode of jump operand */
-    ptrdiff_t       before;     /* original offset - 1 of jump operand */
-    JSJumpTarget    *target;    /* tagged target pointer or backpatch delta */
-};
-
-/*
- * Jump targets are stored in an AVL tree, for O(log(n)) lookup with targets
- * sorted by offset from left to right, so that targets after a span-dependent
- * instruction whose jump offset operand must be extended can be found quickly
- * and adjusted upward (toward higher offsets).
- */
-struct JSJumpTarget {
-    ptrdiff_t       offset;     /* offset of span-dependent jump target */
-    int             balance;    /* AVL tree balance number */
-    JSJumpTarget    *kids[2];   /* left and right AVL tree child pointers */
-};
-
-#define JT_LEFT                 0
-#define JT_RIGHT                1
-#define JT_OTHER_DIR(dir)       (1 - (dir))
-#define JT_IMBALANCE(dir)       (((dir) << 1) - 1)
-#define JT_DIR(imbalance)       (((imbalance) + 1) >> 1)
-
-/*
- * Backpatch deltas are encoded in JSSpanDep.target if JT_TAG_BIT is clear,
- * so we can maintain backpatch chains when using span dependency records to
- * hold jump offsets that overflow 16 bits.
- */
-#define JT_TAG_BIT              ((jsword) 1)
-#define JT_UNTAG_SHIFT          1
-#define JT_SET_TAG(jt)          ((JSJumpTarget *)((jsword)(jt) | JT_TAG_BIT))
-#define JT_CLR_TAG(jt)          ((JSJumpTarget *)((jsword)(jt) & ~JT_TAG_BIT))
-#define JT_HAS_TAG(jt)          ((jsword)(jt) & JT_TAG_BIT)
-
-#define BITS_PER_PTRDIFF        (sizeof(ptrdiff_t) * JS_BITS_PER_BYTE)
-#define BITS_PER_BPDELTA        (BITS_PER_PTRDIFF - 1 - JT_UNTAG_SHIFT)
-#define BPDELTA_MAX             (((ptrdiff_t)1 << BITS_PER_BPDELTA) - 1)
-#define BPDELTA_TO_JT(bp)       ((JSJumpTarget *)((bp) << JT_UNTAG_SHIFT))
-#define JT_TO_BPDELTA(jt)       ((ptrdiff_t)((jsword)(jt) >> JT_UNTAG_SHIFT))
-
-#define SD_SET_TARGET(sd,jt)    ((sd)->target = JT_SET_TAG(jt))
-#define SD_GET_TARGET(sd)       (JS_ASSERT(JT_HAS_TAG((sd)->target)),         \
-                                 JT_CLR_TAG((sd)->target))
-#define SD_SET_BPDELTA(sd,bp)   ((sd)->target = BPDELTA_TO_JT(bp))
-#define SD_GET_BPDELTA(sd)      (JS_ASSERT(!JT_HAS_TAG((sd)->target)),        \
-                                 JT_TO_BPDELTA((sd)->target))
-
-/* Avoid asserting twice by expanding SD_GET_TARGET in the "then" clause. */
-#define SD_SPAN(sd,pivot)       (SD_GET_TARGET(sd)                            \
-                                 ? JT_CLR_TAG((sd)->target)->offset - (pivot) \
-                                 : 0)
-
-struct JSCodeGenerator {
-    JSTreeContext   treeContext;    /* base state: statement info stack, etc. */
-
-    JSArenaPool     *codePool;      /* pointer to thread code arena pool */
-    JSArenaPool     *notePool;      /* pointer to thread srcnote arena pool */
-    void            *codeMark;      /* low watermark in cg->codePool */
-    void            *noteMark;      /* low watermark in cg->notePool */
-    void            *tempMark;      /* low watermark in cx->tempPool */
-
-    struct {
-        jsbytecode  *base;          /* base of JS bytecode vector */
-        jsbytecode  *limit;         /* one byte beyond end of bytecode */
-        jsbytecode  *next;          /* pointer to next free bytecode */
-        jssrcnote   *notes;         /* source notes, see below */
-        uintN       noteCount;      /* number of source notes so far */
-        uintN       noteMask;       /* growth increment for notes */
-        ptrdiff_t   lastNoteOffset; /* code offset for last source note */
-        uintN       currentLine;    /* line number for tree-based srcnote gen */
-    } prolog, main, *current;
-
-    const char      *filename;      /* null or weak link to source filename */
-    uintN           firstLine;      /* first line, for js_NewScriptFromCG */
-    JSPrincipals    *principals;    /* principals for constant folding eval */
-    JSAtomList      atomList;       /* literals indexed for mapping */
-
-    intN            stackDepth;     /* current stack depth in script frame */
-    uintN           maxStackDepth;  /* maximum stack depth so far */
-
-    JSTryNote       *tryBase;       /* first exception handling note */
-    JSTryNote       *tryNext;       /* next available note */
-    size_t          tryNoteSpace;   /* # of bytes allocated at tryBase */
-
-    JSSpanDep       *spanDeps;      /* span dependent instruction records */
-    JSJumpTarget    *jumpTargets;   /* AVL tree of jump target offsets */
-    JSJumpTarget    *jtFreeList;    /* JT_LEFT-linked list of free structs */
-    uintN           numSpanDeps;    /* number of span dependencies */
-    uintN           numJumpTargets; /* number of jump targets */
-    ptrdiff_t       spanDepTodo;    /* offset from main.base of potentially
-                                       unoptimized spandeps */
-
-    uintN           emitLevel;      /* js_EmitTree recursion level */
-    JSAtomList      constList;      /* compile time constants */
-    JSCodeGenerator *parent;        /* Enclosing function or global context */
-};
-
-#define CG_BASE(cg)             ((cg)->current->base)
-#define CG_LIMIT(cg)            ((cg)->current->limit)
-#define CG_NEXT(cg)             ((cg)->current->next)
-#define CG_CODE(cg,offset)      (CG_BASE(cg) + (offset))
-#define CG_OFFSET(cg)           PTRDIFF(CG_NEXT(cg), CG_BASE(cg), jsbytecode)
-
-#define CG_NOTES(cg)            ((cg)->current->notes)
-#define CG_NOTE_COUNT(cg)       ((cg)->current->noteCount)
-#define CG_NOTE_MASK(cg)        ((cg)->current->noteMask)
-#define CG_LAST_NOTE_OFFSET(cg) ((cg)->current->lastNoteOffset)
-#define CG_CURRENT_LINE(cg)     ((cg)->current->currentLine)
-
-#define CG_PROLOG_BASE(cg)      ((cg)->prolog.base)
-#define CG_PROLOG_LIMIT(cg)     ((cg)->prolog.limit)
-#define CG_PROLOG_NEXT(cg)      ((cg)->prolog.next)
-#define CG_PROLOG_CODE(cg,poff) (CG_PROLOG_BASE(cg) + (poff))
-#define CG_PROLOG_OFFSET(cg)    PTRDIFF(CG_PROLOG_NEXT(cg), CG_PROLOG_BASE(cg),\
-                                        jsbytecode)
-
-#define CG_SWITCH_TO_MAIN(cg)   ((cg)->current = &(cg)->main)
-#define CG_SWITCH_TO_PROLOG(cg) ((cg)->current = &(cg)->prolog)
-
-/*
- * Initialize cg to allocate bytecode space from codePool, source note space
- * from notePool, and all other arena-allocated temporaries from cx->tempPool.
- * Return true on success.  Report an error and return false if the initial
- * code segment can't be allocated.
- */
-extern JS_FRIEND_API(JSBool)
-js_InitCodeGenerator(JSContext *cx, JSCodeGenerator *cg,
-                     JSArenaPool *codePool, JSArenaPool *notePool,
-                     const char *filename, uintN lineno,
-                     JSPrincipals *principals);
-
-/*
- * Release cg->codePool, cg->notePool, and cx->tempPool to marks set by
- * js_InitCodeGenerator.  Note that cgs are magic: they own the arena pool
- * "tops-of-stack" space above their codeMark, noteMark, and tempMark points.
- * This means you cannot alloc from tempPool and save the pointer beyond the
- * next JS_FinishCodeGenerator.
- */
-extern JS_FRIEND_API(void)
-js_FinishCodeGenerator(JSContext *cx, JSCodeGenerator *cg);
-
-/*
- * Emit one bytecode.
- */
-extern ptrdiff_t
-js_Emit1(JSContext *cx, JSCodeGenerator *cg, JSOp op);
-
-/*
- * Emit two bytecodes, an opcode (op) with a byte of immediate operand (op1).
- */
-extern ptrdiff_t
-js_Emit2(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1);
-
-/*
- * Emit three bytecodes, an opcode with two bytes of immediate operands.
- */
-extern ptrdiff_t
-js_Emit3(JSContext *cx, JSCodeGenerator *cg, JSOp op, jsbytecode op1,
-         jsbytecode op2);
-
-/*
- * Emit (1 + extra) bytecodes, for N bytes of op and its immediate operand.
- */
-extern ptrdiff_t
-js_EmitN(JSContext *cx, JSCodeGenerator *cg, JSOp op, size_t extra);
-
-/*
- * Unsafe macro to call js_SetJumpOffset and return false if it does.
- */
-#define CHECK_AND_SET_JUMP_OFFSET(cx,cg,pc,off)                               \
-    JS_BEGIN_MACRO                                                            \
-        if (!js_SetJumpOffset(cx, cg, pc, off))                               \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-#define CHECK_AND_SET_JUMP_OFFSET_AT(cx,cg,off)                               \
-    CHECK_AND_SET_JUMP_OFFSET(cx, cg, CG_CODE(cg,off), CG_OFFSET(cg) - (off))
-
-extern JSBool
-js_SetJumpOffset(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc,
-                 ptrdiff_t off);
-
-/* Test whether we're in a with statement. */
-extern JSBool
-js_InWithStatement(JSTreeContext *tc);
-
-/* Test whether we're in a catch block with exception named by atom. */
-extern JSBool
-js_InCatchBlock(JSTreeContext *tc, JSAtom *atom);
-
-/*
- * Push the C-stack-allocated struct at stmt onto the stmtInfo stack.
- */
-extern void
-js_PushStatement(JSTreeContext *tc, JSStmtInfo *stmt, JSStmtType type,
-                 ptrdiff_t top);
-
-/*
- * Pop tc->topStmt.  If the top JSStmtInfo struct is not stack-allocated, it
- * is up to the caller to free it.
- */
-extern void
-js_PopStatement(JSTreeContext *tc);
-
-/*
- * Like js_PopStatement(&cg->treeContext), also patch breaks and continues.
- * May fail if a jump offset overflows.
- */
-extern JSBool
-js_PopStatementCG(JSContext *cx, JSCodeGenerator *cg);
-
-/*
- * Define and lookup a primitive jsval associated with the const named by atom.
- * js_DefineCompileTimeConstant analyzes the constant-folded initializer at pn
- * and saves the const's value in cg->constList, if it can be used at compile
- * time.  It returns true unless an error occurred.
- *
- * If the initializer's value could not be saved, js_LookupCompileTimeConstant
- * calls will return the undefined value.  js_LookupCompileTimeConstant tries
- * to find a const value memorized for atom, returning true with *vp set to a
- * value other than undefined if the constant was found, true with *vp set to
- * JSVAL_VOID if not found, and false on error.
- */
-extern JSBool
-js_DefineCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
-                             JSParseNode *pn);
-
-extern JSBool
-js_LookupCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
-                             jsval *vp);
-
-/*
- * Emit code into cg for the tree rooted at pn.
- */
-extern JSBool
-js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn);
-
-/*
- * Emit code into cg for the tree rooted at body, then create a persistent
- * script for fun from cg.
- */
-extern JSBool
-js_EmitFunctionBody(JSContext *cx, JSCodeGenerator *cg, JSParseNode *body,
-                    JSFunction *fun);
-
-/*
- * Source notes generated along with bytecode for decompiling and debugging.
- * A source note is a uint8 with 5 bits of type and 3 of offset from the pc of
- * the previous note.  If 3 bits of offset aren't enough, extended delta notes
- * (SRC_XDELTA) consisting of 2 set high order bits followed by 6 offset bits
- * are emitted before the next note.  Some notes have operand offsets encoded
- * immediately after them, in note bytes or byte-triples.
- *
- *                 Source Note               Extended Delta
- *              +7-6-5-4-3+2-1-0+           +7-6-5+4-3-2-1-0+
- *              |note-type|delta|           |1 1| ext-delta |
- *              +---------+-----+           +---+-----------+
- *
- * At most one "gettable" note (i.e., a note of type other than SRC_NEWLINE,
- * SRC_SETLINE, and SRC_XDELTA) applies to a given bytecode.
- *
- * NB: the js_SrcNoteSpec array in jsemit.c is indexed by this enum, so its
- * initializers need to match the order here.
- */
-typedef enum JSSrcNoteType {
-    SRC_NULL        = 0,        /* terminates a note vector */
-    SRC_IF          = 1,        /* JSOP_IFEQ bytecode is from an if-then */
-    SRC_IF_ELSE     = 2,        /* JSOP_IFEQ bytecode is from an if-then-else */
-    SRC_WHILE       = 3,        /* JSOP_IFEQ is from a while loop */
-    SRC_FOR         = 4,        /* JSOP_NOP or JSOP_POP in for loop head */
-    SRC_CONTINUE    = 5,        /* JSOP_GOTO is a continue, not a break;
-                                   also used on JSOP_ENDINIT if extra comma
-                                   at end of array literal: [1,2,,] */
-    SRC_VAR         = 6,        /* JSOP_NAME/SETNAME/FORNAME in a var decl */
-    SRC_PCDELTA     = 7,        /* distance from comma-operator to next POP,
-                                   or from CONDSWITCH to first CASE opcode --
-                                   or SRC_PCBASE variant for obj.function::foo
-                                   gets and sets */
-    SRC_ASSIGNOP    = 8,        /* += or another assign-op follows */
-    SRC_COND        = 9,        /* JSOP_IFEQ is from conditional ?: operator */
-    SRC_RESERVED0   = 10,       /* reserved for future use */
-    SRC_HIDDEN      = 11,       /* opcode shouldn't be decompiled */
-    SRC_PCBASE      = 12,       /* distance back from annotated get- or setprop
-                                   op to first obj.prop.subprop bytecode */
-    SRC_LABEL       = 13,       /* JSOP_NOP for label: with atomid immediate */
-    SRC_LABELBRACE  = 14,       /* JSOP_NOP for label: {...} begin brace */
-    SRC_ENDBRACE    = 15,       /* JSOP_NOP for label: {...} end brace */
-    SRC_BREAK2LABEL = 16,       /* JSOP_GOTO for 'break label' with atomid */
-    SRC_CONT2LABEL  = 17,       /* JSOP_GOTO for 'continue label' with atomid */
-    SRC_SWITCH      = 18,       /* JSOP_*SWITCH with offset to end of switch,
-                                   2nd off to first JSOP_CASE if condswitch */
-    SRC_FUNCDEF     = 19,       /* JSOP_NOP for function f() with atomid */
-    SRC_CATCH       = 20,       /* catch block has guard */
-    SRC_CONST       = 21,       /* JSOP_SETCONST in a const decl */
-    SRC_NEWLINE     = 22,       /* bytecode follows a source newline */
-    SRC_SETLINE     = 23,       /* a file-absolute source line number note */
-    SRC_XDELTA      = 24        /* 24-31 are for extended delta notes */
-} JSSrcNoteType;
-
-#define SN_TYPE_BITS            5
-#define SN_DELTA_BITS           3
-#define SN_XDELTA_BITS          6
-#define SN_TYPE_MASK            (JS_BITMASK(SN_TYPE_BITS) << SN_DELTA_BITS)
-#define SN_DELTA_MASK           ((ptrdiff_t)JS_BITMASK(SN_DELTA_BITS))
-#define SN_XDELTA_MASK          ((ptrdiff_t)JS_BITMASK(SN_XDELTA_BITS))
-
-#define SN_MAKE_NOTE(sn,t,d)    (*(sn) = (jssrcnote)                          \
-                                          (((t) << SN_DELTA_BITS)             \
-                                           | ((d) & SN_DELTA_MASK)))
-#define SN_MAKE_XDELTA(sn,d)    (*(sn) = (jssrcnote)                          \
-                                          ((SRC_XDELTA << SN_DELTA_BITS)      \
-                                           | ((d) & SN_XDELTA_MASK)))
-
-#define SN_IS_XDELTA(sn)        ((*(sn) >> SN_DELTA_BITS) >= SRC_XDELTA)
-#define SN_TYPE(sn)             (SN_IS_XDELTA(sn) ? SRC_XDELTA                \
-                                                  : *(sn) >> SN_DELTA_BITS)
-#define SN_SET_TYPE(sn,type)    SN_MAKE_NOTE(sn, type, SN_DELTA(sn))
-#define SN_IS_GETTABLE(sn)      (SN_TYPE(sn) < SRC_NEWLINE)
-
-#define SN_DELTA(sn)            ((ptrdiff_t)(SN_IS_XDELTA(sn)                 \
-                                             ? *(sn) & SN_XDELTA_MASK         \
-                                             : *(sn) & SN_DELTA_MASK))
-#define SN_SET_DELTA(sn,delta)  (SN_IS_XDELTA(sn)                             \
-                                 ? SN_MAKE_XDELTA(sn, delta)                  \
-                                 : SN_MAKE_NOTE(sn, SN_TYPE(sn), delta))
-
-#define SN_DELTA_LIMIT          ((ptrdiff_t)JS_BIT(SN_DELTA_BITS))
-#define SN_XDELTA_LIMIT         ((ptrdiff_t)JS_BIT(SN_XDELTA_BITS))
-
-/*
- * Offset fields follow certain notes and are frequency-encoded: an offset in
- * [0,0x7f] consumes one byte, an offset in [0x80,0x7fffff] takes three, and
- * the high bit of the first byte is set.
- */
-#define SN_3BYTE_OFFSET_FLAG    0x80
-#define SN_3BYTE_OFFSET_MASK    0x7f
-
-typedef struct JSSrcNoteSpec {
-    const char      *name;      /* name for disassembly/debugging output */
-    uint8           arity;      /* number of offset operands */
-    uint8           offsetBias; /* bias of offset(s) from annotated pc */
-    int8            isSpanDep;  /* 1 or -1 if offsets could span extended ops,
-                                   0 otherwise; sign tells span direction */
-} JSSrcNoteSpec;
-
-extern JS_FRIEND_DATA(JSSrcNoteSpec) js_SrcNoteSpec[];
-extern JS_FRIEND_API(uintN)          js_SrcNoteLength(jssrcnote *sn);
-
-#define SN_LENGTH(sn)           ((js_SrcNoteSpec[SN_TYPE(sn)].arity == 0) ? 1 \
-                                 : js_SrcNoteLength(sn))
-#define SN_NEXT(sn)             ((sn) + SN_LENGTH(sn))
-
-/* A source note array is terminated by an all-zero element. */
-#define SN_MAKE_TERMINATOR(sn)  (*(sn) = SRC_NULL)
-#define SN_IS_TERMINATOR(sn)    (*(sn) == SRC_NULL)
-
-/*
- * Append a new source note of the given type (and therefore size) to cg's
- * notes dynamic array, updating cg->noteCount.  Return the new note's index
- * within the array pointed at by cg->current->notes.  Return -1 if out of
- * memory.
- */
-extern intN
-js_NewSrcNote(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type);
-
-extern intN
-js_NewSrcNote2(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
-               ptrdiff_t offset);
-
-extern intN
-js_NewSrcNote3(JSContext *cx, JSCodeGenerator *cg, JSSrcNoteType type,
-               ptrdiff_t offset1, ptrdiff_t offset2);
-
-/*
- * NB: this function can add at most one extra extended delta note.
- */
-extern jssrcnote *
-js_AddToSrcNoteDelta(JSContext *cx, JSCodeGenerator *cg, jssrcnote *sn,
-                     ptrdiff_t delta);
-
-/*
- * Get and set the offset operand identified by which (0 for the first, etc.).
- */
-extern JS_FRIEND_API(ptrdiff_t)
-js_GetSrcNoteOffset(jssrcnote *sn, uintN which);
-
-extern JSBool
-js_SetSrcNoteOffset(JSContext *cx, JSCodeGenerator *cg, uintN index,
-                    uintN which, ptrdiff_t offset);
-
-/*
- * Finish taking source notes in cx's notePool, copying final notes to the new
- * stable store allocated by the caller and passed in via notes.  Return false
- * on malloc failure, which means this function reported an error.
- *
- * To compute the number of jssrcnotes to allocate and pass in via notes, use
- * the CG_COUNT_FINAL_SRCNOTES macro.  This macro knows a lot about details of
- * js_FinishTakingSrcNotes, SO DON'T CHANGE jsemit.c's js_FinishTakingSrcNotes
- * FUNCTION WITHOUT CHECKING WHETHER THIS MACRO NEEDS CORRESPONDING CHANGES!
- */
-#define CG_COUNT_FINAL_SRCNOTES(cg, cnt)                                      \
-    JS_BEGIN_MACRO                                                            \
-        ptrdiff_t diff_ = CG_PROLOG_OFFSET(cg) - (cg)->prolog.lastNoteOffset; \
-        cnt = (cg)->prolog.noteCount + (cg)->main.noteCount + 1;              \
-        if ((cg)->prolog.noteCount &&                                         \
-            (cg)->prolog.currentLine != (cg)->firstLine) {                    \
-            if (diff_ > SN_DELTA_MASK)                                        \
-                cnt += JS_HOWMANY(diff_ - SN_DELTA_MASK, SN_XDELTA_MASK);     \
-            cnt += 2 + (((cg)->firstLine > SN_3BYTE_OFFSET_MASK) << 1);       \
-        } else if (diff_ > 0) {                                               \
-            if (cg->main.noteCount) {                                         \
-                jssrcnote *sn_ = (cg)->main.notes;                            \
-                diff_ -= SN_IS_XDELTA(sn_)                                    \
-                         ? SN_XDELTA_MASK - (*sn_ & SN_XDELTA_MASK)           \
-                         : SN_DELTA_MASK - (*sn_ & SN_DELTA_MASK);            \
-            }                                                                 \
-            if (diff_ > 0)                                                    \
-                cnt += JS_HOWMANY(diff_, SN_XDELTA_MASK);                     \
-        }                                                                     \
-    JS_END_MACRO
-
-extern JSBool
-js_FinishTakingSrcNotes(JSContext *cx, JSCodeGenerator *cg, jssrcnote *notes);
-
-/*
- * Allocate cg->treeContext.tryCount notes (plus one for the end sentinel)
- * from cx->tempPool and set up cg->tryBase/tryNext for exactly tryCount
- * js_NewTryNote calls.  The storage is freed by js_FinishCodeGenerator.
- */
-extern JSBool
-js_AllocTryNotes(JSContext *cx, JSCodeGenerator *cg);
-
-/*
- * Grab the next trynote slot in cg, filling it in appropriately.
- */
-extern JSTryNote *
-js_NewTryNote(JSContext *cx, JSCodeGenerator *cg, ptrdiff_t start,
-              ptrdiff_t end, ptrdiff_t catchStart);
-
-/*
- * Finish generating exception information into the space at notes.  As with
- * js_FinishTakingSrcNotes, the caller must use CG_COUNT_FINAL_TRYNOTES(cg) to
- * preallocate enough space in a JSTryNote[] to pass as the notes parameter of
- * js_FinishTakingTryNotes.
- */
-#define CG_COUNT_FINAL_TRYNOTES(cg, cnt)                                      \
-    JS_BEGIN_MACRO                                                            \
-        cnt = ((cg)->tryNext > (cg)->tryBase)                                 \
-              ? PTRDIFF(cg->tryNext, cg->tryBase, JSTryNote) + 1              \
-              : 0;                                                            \
-    JS_END_MACRO
-
-extern void
-js_FinishTakingTryNotes(JSContext *cx, JSCodeGenerator *cg, JSTryNote *notes);
-
-JS_END_EXTERN_C
-
-#endif /* jsemit_h___ */
diff --git a/libs/js/src/jsexn.c b/libs/js/src/jsexn.c
deleted file mode 100644
index a550e1fcd7..0000000000
--- a/libs/js/src/jsexn.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS standard exception implementation.
- */
-
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsexn.h"
-#include "jsfun.h"
-#include "jsinterp.h"
-#include "jsnum.h"
-#include "jsopcode.h"
-#include "jsscript.h"
-
-#if JS_HAS_ERROR_EXCEPTIONS
-#if !JS_HAS_EXCEPTIONS
-# error "JS_HAS_EXCEPTIONS must be defined to use JS_HAS_ERROR_EXCEPTIONS"
-#endif
-
-/* XXX consider adding rt->atomState.messageAtom */
-static char js_message_str[]  = "message";
-static char js_filename_str[] = "fileName";
-static char js_lineno_str[]   = "lineNumber";
-static char js_stack_str[]    = "stack";
-
-/* Forward declarations for ExceptionClass's initializer. */
-static JSBool
-Exception(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-static void
-exn_finalize(JSContext *cx, JSObject *obj);
-
-static JSClass ExceptionClass = {
-    "Error",
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   exn_finalize,
-    NULL,             NULL,             NULL,             Exception,
-    NULL,             NULL,             NULL,             0
-};
-
-/*
- * A copy of the JSErrorReport originally generated.
- */
-typedef struct JSExnPrivate {
-    JSErrorReport *errorReport;
-} JSExnPrivate;
-
-/*
- * Undo all the damage done by exn_newPrivate.
- */
-static void
-exn_destroyPrivate(JSContext *cx, JSExnPrivate *privateData)
-{
-    JSErrorReport *report;
-    const jschar **args;
-
-    if (!privateData)
-        return;
-    report = privateData->errorReport;
-    if (report) {
-        if (report->uclinebuf)
-            JS_free(cx, (void *)report->uclinebuf);
-        if (report->filename)
-            JS_free(cx, (void *)report->filename);
-        if (report->ucmessage)
-            JS_free(cx, (void *)report->ucmessage);
-        if (report->messageArgs) {
-            args = report->messageArgs;
-            while (*args)
-                JS_free(cx, (void *)*args++);
-            JS_free(cx, (void *)report->messageArgs);
-        }
-        JS_free(cx, report);
-    }
-    JS_free(cx, privateData);
-}
-
-/*
- * Copy everything interesting about an error into allocated memory.
- */
-static JSExnPrivate *
-exn_newPrivate(JSContext *cx, JSErrorReport *report)
-{
-    intN i;
-    JSExnPrivate *newPrivate;
-    JSErrorReport *newReport;
-    size_t capacity;
-
-    newPrivate = (JSExnPrivate *)JS_malloc(cx, sizeof (JSExnPrivate));
-    if (!newPrivate)
-        return NULL;
-    memset(newPrivate, 0, sizeof (JSExnPrivate));
-
-    /* Copy the error report */
-    newReport = (JSErrorReport *)JS_malloc(cx, sizeof (JSErrorReport));
-    if (!newReport)
-        goto error;
-    memset(newReport, 0, sizeof (JSErrorReport));
-    newPrivate->errorReport = newReport;
-
-    if (report->filename) {
-        newReport->filename = JS_strdup(cx, report->filename);
-        if (!newReport->filename)
-            goto error;
-    } else {
-        newReport->filename = NULL;
-    }
-
-    newReport->lineno = report->lineno;
-
-    /*
-     * We don't need to copy linebuf and tokenptr, because they
-     * point into the deflated string cache.  (currently?)
-     */
-    newReport->linebuf = report->linebuf;
-    newReport->tokenptr = report->tokenptr;
-
-    /*
-     * But we do need to copy uclinebuf, uctokenptr, because they're
-     * pointers into internal tokenstream structs, and may go away.
-     */
-    if (report->uclinebuf) {
-        capacity = js_strlen(report->uclinebuf) + 1;
-        newReport->uclinebuf =
-            (const jschar *)JS_malloc(cx, capacity * sizeof(jschar));
-        if (!newReport->uclinebuf)
-            goto error;
-        js_strncpy((jschar *)newReport->uclinebuf, report->uclinebuf, capacity);
-        newReport->uctokenptr = newReport->uclinebuf + (report->uctokenptr -
-                                                        report->uclinebuf);
-    } else {
-        newReport->uclinebuf = newReport->uctokenptr = NULL;
-    }
-
-    if (report->ucmessage) {
-        capacity = js_strlen(report->ucmessage) + 1;
-        newReport->ucmessage = (const jschar *)
-            JS_malloc(cx, capacity * sizeof(jschar));
-        if (!newReport->ucmessage)
-            goto error;
-        js_strncpy((jschar *)newReport->ucmessage, report->ucmessage, capacity);
-
-        if (report->messageArgs) {
-            for (i = 0; report->messageArgs[i]; i++)
-                continue;
-            JS_ASSERT(i);
-            newReport->messageArgs =
-                (const jschar **)JS_malloc(cx, (i + 1) * sizeof(jschar *));
-            if (!newReport->messageArgs)
-                goto error;
-            for (i = 0; report->messageArgs[i]; i++) {
-                capacity = js_strlen(report->messageArgs[i]) + 1;
-                newReport->messageArgs[i] =
-                    (const jschar *)JS_malloc(cx, capacity * sizeof(jschar));
-                if (!newReport->messageArgs[i])
-                    goto error;
-                js_strncpy((jschar *)(newReport->messageArgs[i]),
-                           report->messageArgs[i], capacity);
-            }
-            newReport->messageArgs[i] = NULL;
-        } else {
-            newReport->messageArgs = NULL;
-        }
-    } else {
-        newReport->ucmessage = NULL;
-        newReport->messageArgs = NULL;
-    }
-    newReport->errorNumber = report->errorNumber;
-
-    /* Note that this is before it gets flagged with JSREPORT_EXCEPTION */
-    newReport->flags = report->flags;
-
-    return newPrivate;
-error:
-    exn_destroyPrivate(cx, newPrivate);
-    return NULL;
-}
-
-static void
-exn_finalize(JSContext *cx, JSObject *obj)
-{
-    JSExnPrivate *privateData;
-    jsval privateValue;
-
-    privateValue = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-
-    if (!JSVAL_IS_VOID(privateValue)) {
-        privateData = (JSExnPrivate*) JSVAL_TO_PRIVATE(privateValue);
-        if (privateData)
-            exn_destroyPrivate(cx, privateData);
-    }
-}
-
-JSErrorReport *
-js_ErrorFromException(JSContext *cx, jsval exn)
-{
-    JSObject *obj;
-    JSExnPrivate *privateData;
-    jsval privateValue;
-
-    if (JSVAL_IS_PRIMITIVE(exn))
-        return NULL;
-    obj = JSVAL_TO_OBJECT(exn);
-    if (OBJ_GET_CLASS(cx, obj) != &ExceptionClass)
-        return NULL;
-    privateValue = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (JSVAL_IS_VOID(privateValue))
-        return NULL;
-    privateData = (JSExnPrivate*) JSVAL_TO_PRIVATE(privateValue);
-    if (!privateData)
-        return NULL;
-
-    JS_ASSERT(privateData->errorReport);
-    return privateData->errorReport;
-}
-
-struct JSExnSpec {
-    int protoIndex;
-    const char *name;
-    JSNative native;
-};
-
-/*
- * All *Error constructors share the same JSClass, ExceptionClass.  But each
- * constructor function for an *Error class must have a distinct native 'call'
- * function pointer, in order for instanceof to work properly across multiple
- * standard class sets.  See jsfun.c:fun_hasInstance.
- */
-#define MAKE_EXCEPTION_CTOR(name)                                             \
-const char js_##name##_str[] = #name;                                         \
-static JSBool                                                                 \
-name(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)      \
-{                                                                             \
-    return Exception(cx, obj, argc, argv, rval);                              \
-}
-
-MAKE_EXCEPTION_CTOR(Error)
-MAKE_EXCEPTION_CTOR(InternalError)
-MAKE_EXCEPTION_CTOR(EvalError)
-MAKE_EXCEPTION_CTOR(RangeError)
-MAKE_EXCEPTION_CTOR(ReferenceError)
-MAKE_EXCEPTION_CTOR(SyntaxError)
-MAKE_EXCEPTION_CTOR(TypeError)
-MAKE_EXCEPTION_CTOR(URIError)
-
-#undef MAKE_EXCEPTION_CTOR
-
-static struct JSExnSpec exceptions[] = {
-    { JSEXN_NONE,       js_Error_str,           Error },
-    { JSEXN_ERR,        js_InternalError_str,   InternalError },
-    { JSEXN_ERR,        js_EvalError_str,       EvalError },
-    { JSEXN_ERR,        js_RangeError_str,      RangeError },
-    { JSEXN_ERR,        js_ReferenceError_str,  ReferenceError },
-    { JSEXN_ERR,        js_SyntaxError_str,     SyntaxError },
-    { JSEXN_ERR,        js_TypeError_str,       TypeError },
-    { JSEXN_ERR,        js_URIError_str,        URIError },
-    {0,NULL,NULL}
-};
-
-static JSBool
-InitExceptionObject(JSContext *cx, JSObject *obj, JSString *message,
-                    JSString *filename, uintN lineno)
-{
-    JSCheckAccessOp checkAccess;
-    JSErrorReporter older;
-    JSExceptionState *state;
-    jschar *stackbuf;
-    size_t stacklen, stackmax;
-    JSStackFrame *fp;
-    jsval callerid, v;
-    JSBool ok;
-    JSString *argsrc, *stack;
-    uintN i, ulineno;
-    const char *cp;
-    char ulnbuf[11];
-
-    if (!JS_DefineProperty(cx, obj, js_message_str, STRING_TO_JSVAL(message),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return JS_FALSE;
-    }
-
-    if (!JS_DefineProperty(cx, obj, js_filename_str,
-                           STRING_TO_JSVAL(filename),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return JS_FALSE;
-    }
-
-    if (!JS_DefineProperty(cx, obj, js_lineno_str,
-                           INT_TO_JSVAL(lineno),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return JS_FALSE;
-    }
-
-    /*
-     * Set the 'stack' property.
-     *
-     * First, set aside any error reporter for cx and save its exception state
-     * so we can suppress any checkAccess failures.  Such failures should stop
-     * the backtrace procedure, not result in a failure of this constructor.
-     */
-    checkAccess = cx->runtime->checkObjectAccess;
-    if (checkAccess) {
-        older = JS_SetErrorReporter(cx, NULL);
-        state = JS_SaveExceptionState(cx);
-    }
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-    else {
-        older = NULL;
-        state = NULL;
-    }
-#endif
-    callerid = ATOM_KEY(cx->runtime->atomState.callerAtom);
-
-    /*
-     * Prepare to allocate a jschar buffer at stackbuf, where stacklen indexes
-     * the next free jschar slot, and with room for at most stackmax non-null
-     * jschars.  If stackbuf is non-null, it always contains an extra slot for
-     * the null terminator we'll store at the end, as a backstop.
-     *
-     * All early returns must goto done after this point, till the after-loop
-     * cleanup code has run!
-     */
-    stackbuf = NULL;
-    stacklen = stackmax = 0;
-    ok = JS_TRUE;
-
-#define APPEND_CHAR_TO_STACK(c)                                               \
-    JS_BEGIN_MACRO                                                            \
-        if (stacklen == stackmax) {                                           \
-            void *ptr_;                                                       \
-            stackmax = stackmax ? 2 * stackmax : 64;                          \
-            ptr_ = JS_realloc(cx, stackbuf, (stackmax+1) * sizeof(jschar));   \
-            if (!ptr_) {                                                      \
-                ok = JS_FALSE;                                                \
-                goto done;                                                    \
-            }                                                                 \
-            stackbuf = ptr_;                                                  \
-        }                                                                     \
-        stackbuf[stacklen++] = (c);                                           \
-    JS_END_MACRO
-
-#define APPEND_STRING_TO_STACK(str)                                           \
-    JS_BEGIN_MACRO                                                            \
-        JSString *str_ = str;                                                 \
-        size_t length_ = JSSTRING_LENGTH(str_);                               \
-        if (stacklen + length_ > stackmax) {                                  \
-            void *ptr_;                                                       \
-            stackmax = JS_BIT(JS_CeilingLog2(stacklen + length_));            \
-            ptr_ = JS_realloc(cx, stackbuf, (stackmax+1) * sizeof(jschar));   \
-            if (!ptr_) {                                                      \
-                ok = JS_FALSE;                                                \
-                goto done;                                                    \
-            }                                                                 \
-            stackbuf = ptr_;                                                  \
-        }                                                                     \
-        js_strncpy(stackbuf + stacklen, JSSTRING_CHARS(str_), length_);       \
-        stacklen += length_;                                                  \
-    JS_END_MACRO
-
-    for (fp = cx->fp; fp; fp = fp->down) {
-        if (checkAccess) {
-            v = (fp->fun && fp->argv) ? fp->argv[-2] : JSVAL_NULL;
-            if (!JSVAL_IS_PRIMITIVE(v)) {
-                ok = checkAccess(cx, JSVAL_TO_OBJECT(fp->argv[-2]), callerid,
-                                 JSACC_READ, &v /* ignored */);
-                if (!ok) {
-                    ok = JS_TRUE;
-                    break;
-                }
-            }
-        }
-
-        if (fp->fun) {
-            if (fp->fun->atom)
-                APPEND_STRING_TO_STACK(ATOM_TO_STRING(fp->fun->atom));
-
-            APPEND_CHAR_TO_STACK('(');
-            for (i = 0; i < fp->argc; i++) {
-
-                /* Avoid toSource bloat and fallibility for object types. */
-                v = fp->argv[i];
-                if (JSVAL_IS_PRIMITIVE(v)) {
-                    argsrc = js_ValueToSource(cx, v);
-                } else if (JSVAL_IS_FUNCTION(cx, v)) {
-                    /* XXX Avoid function decompilation bloat for now. */
-                    argsrc = JS_GetFunctionId(JS_ValueToFunction(cx, v));
-                    if (!argsrc)
-                        argsrc = js_ValueToSource(cx, v);
-                } else {
-                    /* XXX Avoid toString on objects, it takes too long and
-                           uses too much memory, for too many classes (see
-                           Mozilla bug 166743). */
-                    char buf[100];
-                    JS_snprintf(buf, sizeof buf, "[object %s]",
-                                OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v))->name);
-                    argsrc = JS_NewStringCopyZ(cx, buf);
-                }
-                if (!argsrc) {
-                    ok = JS_FALSE;
-                    goto done;
-                }
-                if (i > 0)
-                    APPEND_CHAR_TO_STACK(',');
-                APPEND_STRING_TO_STACK(argsrc);
-            }
-            APPEND_CHAR_TO_STACK(')');
-        }
-
-        APPEND_CHAR_TO_STACK('@');
-        if (fp->script && fp->script->filename) {
-            for (cp = fp->script->filename; *cp; cp++)
-                APPEND_CHAR_TO_STACK(*cp);
-        }
-        APPEND_CHAR_TO_STACK(':');
-        if (fp->script && fp->pc) {
-            ulineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-            JS_snprintf(ulnbuf, sizeof ulnbuf, "%u", ulineno);
-            for (cp = ulnbuf; *cp; cp++)
-                APPEND_CHAR_TO_STACK(*cp);
-        } else {
-            APPEND_CHAR_TO_STACK('0');
-        }
-        APPEND_CHAR_TO_STACK('\n');
-    }
-
-#undef APPEND_CHAR_TO_STACK
-#undef APPEND_STRING_TO_STACK
-
-done:
-    if (checkAccess) {
-        if (ok)
-            JS_RestoreExceptionState(cx, state);
-        else
-            JS_DropExceptionState(cx, state);
-        JS_SetErrorReporter(cx, older);
-    }
-    if (!ok) {
-        JS_free(cx, stackbuf);
-        return JS_FALSE;
-    }
-
-    if (!stackbuf) {
-        stack = cx->runtime->emptyString;
-    } else {
-        /* NB: if stackbuf was allocated, it has room for the terminator. */
-        JS_ASSERT(stacklen <= stackmax);
-        if (stacklen < stackmax) {
-            /*
-             * Realloc can fail when shrinking on some FreeBSD versions, so
-             * don't use JS_realloc here; simply let the oversized allocation
-             * be owned by the string in that rare case.
-             */
-            void *shrunk = realloc(stackbuf, (stacklen+1) * sizeof(jschar));
-            if (shrunk)
-                stackbuf = shrunk;
-        }
-        stackbuf[stacklen] = 0;
-        stack = js_NewString(cx, stackbuf, stacklen, 0);
-        if (!stack) {
-            JS_free(cx, stackbuf);
-            return JS_FALSE;
-        }
-    }
-    return JS_DefineProperty(cx, obj, js_stack_str,
-                             STRING_TO_JSVAL(stack),
-                             NULL, NULL, JSPROP_ENUMERATE);
-}
-
-/* XXXbe Consolidate the ugly truth that we don't treat filename as UTF-8
-         with these two functions. */
-static JSString *
-FilenameToString(JSContext *cx, const char *filename)
-{
-    return JS_NewStringCopyZ(cx, filename);
-}
-
-static const char *
-StringToFilename(JSContext *cx, JSString *str)
-{
-    return JS_GetStringBytes(str);
-}
-
-static JSBool
-Exception(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSBool ok;
-    jsval pval;
-    uint32 lineno;
-    JSString *message, *filename;
-    JSStackFrame *fp;
-
-    if (cx->creatingException)
-        return JS_FALSE;
-    cx->creatingException = JS_TRUE;
-
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        /*
-         * ECMA ed. 3, 15.11.1 requires Error, etc., to construct even when
-         * called as functions, without operator new.  But as we do not give
-         * each constructor a distinct JSClass, whose .name member is used by
-         * js_NewObject to find the class prototype, we must get the class
-         * prototype ourselves.
-         */
-        ok = OBJ_GET_PROPERTY(cx, JSVAL_TO_OBJECT(argv[-2]),
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .classPrototypeAtom),
-                              &pval);
-        if (!ok)
-            goto out;
-        obj = js_NewObject(cx, &ExceptionClass, JSVAL_TO_OBJECT(pval), NULL);
-        if (!obj) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-
-    /*
-     * If it's a new object of class Exception, then null out the private
-     * data so that the finalizer doesn't attempt to free it.
-     */
-    if (OBJ_GET_CLASS(cx, obj) == &ExceptionClass)
-        OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, JSVAL_VOID);
-
-    /* Set the 'message' property. */
-    if (argc != 0) {
-        message = js_ValueToString(cx, argv[0]);
-        if (!message) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        argv[0] = STRING_TO_JSVAL(message);
-    } else {
-        message = cx->runtime->emptyString;
-    }
-
-    /* Set the 'fileName' property. */
-    if (argc > 1) {
-        filename = js_ValueToString(cx, argv[1]);
-        if (!filename) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        argv[1] = STRING_TO_JSVAL(filename);
-        fp = NULL;
-    } else {
-        fp = JS_GetScriptedCaller(cx, NULL);
-        if (fp) {
-            filename = FilenameToString(cx, fp->script->filename);
-            if (!filename) {
-                ok = JS_FALSE;
-                goto out;
-            }
-        } else {
-            filename = cx->runtime->emptyString;
-        }
-    }
-
-    /* Set the 'lineNumber' property. */
-    if (argc > 2) {
-        ok = js_ValueToECMAUint32(cx, argv[2], &lineno);
-        if (!ok)
-            goto out;
-    } else {
-        if (!fp)
-            fp = JS_GetScriptedCaller(cx, NULL);
-        lineno = (fp && fp->pc) ? js_PCToLineNumber(cx, fp->script, fp->pc) : 0;
-    }
-
-    ok = InitExceptionObject(cx, obj, message, filename, lineno);
-
-out:
-    cx->creatingException = JS_FALSE;
-    return ok;
-}
-
-/*
- * Convert to string.
- *
- * This method only uses JavaScript-modifiable properties name, message.  It
- * is left to the host to check for private data and report filename and line
- * number information along with this message.
- */
-static JSBool
-exn_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    JSString *name, *message, *result;
-    jschar *chars, *cp;
-    size_t name_length, message_length, length;
-
-    if (!OBJ_GET_PROPERTY(cx, obj,
-                          ATOM_TO_JSID(cx->runtime->atomState.nameAtom),
-                          &v)) {
-        return JS_FALSE;
-    }
-    name = JSVAL_IS_STRING(v) ? JSVAL_TO_STRING(v) : cx->runtime->emptyString;
-    *rval = STRING_TO_JSVAL(name);
-
-    if (!JS_GetProperty(cx, obj, js_message_str, &v))
-        return JS_FALSE;
-    message = JSVAL_IS_STRING(v) ? JSVAL_TO_STRING(v)
-                                 : cx->runtime->emptyString;
-
-    if (JSSTRING_LENGTH(message) != 0) {
-        name_length = JSSTRING_LENGTH(name);
-        message_length = JSSTRING_LENGTH(message);
-        length = (name_length ? name_length + 2 : 0) + message_length;
-        cp = chars = (jschar*) JS_malloc(cx, (length + 1) * sizeof(jschar));
-        if (!chars)
-            return JS_FALSE;
-
-        if (name_length) {
-            js_strncpy(cp, JSSTRING_CHARS(name), name_length);
-            cp += name_length;
-            *cp++ = ':'; *cp++ = ' ';
-        }
-        js_strncpy(cp, JSSTRING_CHARS(message), message_length);
-        cp += message_length;
-        *cp = 0;
-
-        result = js_NewString(cx, chars, length, 0);
-        if (!result) {
-            JS_free(cx, chars);
-            return JS_FALSE;
-        }
-    } else {
-        result = name;
-    }
-
-    *rval = STRING_TO_JSVAL(result);
-    return JS_TRUE;
-}
-
-#if JS_HAS_TOSOURCE
-/*
- * Return a string that may eval to something similar to the original object.
- */
-static JSBool
-exn_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval *vp;
-    JSString *name, *message, *filename, *lineno_as_str, *result;
-    uint32 lineno;
-    size_t lineno_length, name_length, message_length, filename_length, length;
-    jschar *chars, *cp;
-
-    vp = argv + argc;   /* beginning of explicit local roots */
-
-    if (!OBJ_GET_PROPERTY(cx, obj,
-                          ATOM_TO_JSID(cx->runtime->atomState.nameAtom),
-                          rval)) {
-        return JS_FALSE;
-    }
-    name = js_ValueToString(cx, *rval);
-    if (!name)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(name);
-
-    if (!JS_GetProperty(cx, obj, js_message_str, &vp[0]) ||
-        !(message = js_ValueToSource(cx, vp[0]))) {
-        return JS_FALSE;
-    }
-    vp[0] = STRING_TO_JSVAL(message);
-
-    if (!JS_GetProperty(cx, obj, js_filename_str, &vp[1]) ||
-        !(filename = js_ValueToSource(cx, vp[1]))) {
-        return JS_FALSE;
-    }
-    vp[1] = STRING_TO_JSVAL(filename);
-
-    if (!JS_GetProperty(cx, obj, js_lineno_str, &vp[2]) ||
-        !js_ValueToECMAUint32 (cx, vp[2], &lineno)) {
-        return JS_FALSE;
-    }
-
-    if (lineno != 0) {
-        lineno_as_str = js_ValueToString(cx, vp[2]);
-        if (!lineno_as_str)
-            return JS_FALSE;
-        lineno_length = JSSTRING_LENGTH(lineno_as_str);
-    } else {
-        lineno_as_str = NULL;
-        lineno_length = 0;
-    }
-
-    /* Magic 8, for the characters in ``(new ())''. */
-    name_length = JSSTRING_LENGTH(name);
-    message_length = JSSTRING_LENGTH(message);
-    length = 8 + name_length + message_length;
-
-    filename_length = JSSTRING_LENGTH(filename);
-    if (filename_length != 0) {
-        /* append filename as ``, {filename}'' */
-        length += 2 + filename_length;
-        if (lineno_as_str) {
-            /* append lineno as ``, {lineno_as_str}'' */
-            length += 2 + lineno_length;
-        }
-    } else {
-        if (lineno_as_str) {
-            /*
-             * no filename, but have line number,
-             * need to append ``, "", {lineno_as_str}''
-             */
-            length += 6 + lineno_length;
-        }
-    }
-
-    cp = chars = (jschar*) JS_malloc(cx, (length + 1) * sizeof(jschar));
-    if (!chars)
-        return JS_FALSE;
-
-    *cp++ = '('; *cp++ = 'n'; *cp++ = 'e'; *cp++ = 'w'; *cp++ = ' ';
-    js_strncpy(cp, JSSTRING_CHARS(name), name_length);
-    cp += name_length;
-    *cp++ = '(';
-    if (message_length != 0) {
-        js_strncpy(cp, JSSTRING_CHARS(message), message_length);
-        cp += message_length;
-    }
-
-    if (filename_length != 0) {
-        /* append filename as ``, {filename}'' */
-        *cp++ = ','; *cp++ = ' ';
-        js_strncpy(cp, JSSTRING_CHARS(filename), filename_length);
-        cp += filename_length;
-    } else {
-        if (lineno_as_str) {
-            /*
-             * no filename, but have line number,
-             * need to append ``, "", {lineno_as_str}''
-             */
-            *cp++ = ','; *cp++ = ' '; *cp++ = '"'; *cp++ = '"';
-        }
-    }
-    if (lineno_as_str) {
-        /* append lineno as ``, {lineno_as_str}'' */
-        *cp++ = ','; *cp++ = ' ';
-        js_strncpy(cp, JSSTRING_CHARS(lineno_as_str), lineno_length);
-        cp += lineno_length;
-    }
-
-    *cp++ = ')'; *cp++ = ')'; *cp = 0;
-
-    result = js_NewString(cx, chars, length, 0);
-    if (!result) {
-        JS_free(cx, chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(result);
-    return JS_TRUE;
-}
-#endif
-
-static JSFunctionSpec exception_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   exn_toSource,           0,0,3},
-#endif
-    {js_toString_str,   exn_toString,           0,0,0},
-    {0,0,0,0,0}
-};
-
-JSObject *
-js_InitExceptionClasses(JSContext *cx, JSObject *obj)
-{
-    int i;
-    JSObject *protos[JSEXN_LIMIT];
-
-    if (!js_EnterLocalRootScope(cx))
-        return NULL;
-
-    /* Initialize the prototypes first. */
-    for (i = 0; exceptions[i].name != 0; i++) {
-        JSAtom *atom;
-        JSFunction *fun;
-        JSString *nameString;
-        int protoIndex = exceptions[i].protoIndex;
-
-        /* Make the prototype for the current constructor name. */
-        protos[i] = js_NewObject(cx, &ExceptionClass,
-                                 (protoIndex != JSEXN_NONE)
-                                 ? protos[protoIndex]
-                                 : NULL,
-                                 obj);
-        if (!protos[i])
-            break;
-
-        /* So exn_finalize knows whether to destroy private data. */
-        OBJ_SET_SLOT(cx, protos[i], JSSLOT_PRIVATE, JSVAL_VOID);
-
-        atom = js_Atomize(cx, exceptions[i].name, strlen(exceptions[i].name), 0);
-        if (!atom)
-            break;
-
-        /* Make a constructor function for the current name. */
-        fun = js_DefineFunction(cx, obj, atom, exceptions[i].native, 3, 0);
-        if (!fun)
-            break;
-
-        /* Make this constructor make objects of class Exception. */
-        fun->clasp = &ExceptionClass;
-
-        /* Make the prototype and constructor links. */
-        if (!js_SetClassPrototype(cx, fun->object, protos[i],
-                                  JSPROP_READONLY | JSPROP_PERMANENT)) {
-            break;
-        }
-
-        /* proto bootstrap bit from JS_InitClass omitted. */
-        nameString = JS_NewStringCopyZ(cx, exceptions[i].name);
-        if (!nameString)
-            break;
-
-        /* Add the name property to the prototype. */
-        if (!JS_DefineProperty(cx, protos[i], js_name_str,
-                               STRING_TO_JSVAL(nameString),
-                               NULL, NULL,
-                               JSPROP_ENUMERATE)) {
-            break;
-        }
-    }
-
-    js_LeaveLocalRootScope(cx);
-    if (exceptions[i].name)
-        return NULL;
-
-    /*
-     * Add an empty message property.  (To Exception.prototype only,
-     * because this property will be the same for all the exception
-     * protos.)
-     */
-    if (!JS_DefineProperty(cx, protos[0], js_message_str,
-                           STRING_TO_JSVAL(cx->runtime->emptyString),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return NULL;
-    }
-    if (!JS_DefineProperty(cx, protos[0], js_filename_str,
-                           STRING_TO_JSVAL(cx->runtime->emptyString),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return NULL;
-    }
-    if (!JS_DefineProperty(cx, protos[0], js_lineno_str,
-                           INT_TO_JSVAL(0),
-                           NULL, NULL, JSPROP_ENUMERATE)) {
-        return NULL;
-    }
-
-    /*
-     * Add methods only to Exception.prototype, because ostensibly all
-     * exception types delegate to that.
-     */
-    if (!JS_DefineFunctions(cx, protos[0], exception_methods))
-        return NULL;
-
-    return protos[0];
-}
-
-const JSErrorFormatString* 
-js_GetLocalizedErrorMessage(JSContext* cx, void *userRef, const char *locale, const uintN errorNumber)
-{
-    const JSErrorFormatString *errorString = NULL;
-
-    if (cx->localeCallbacks && cx->localeCallbacks->localeGetErrorMessage) {
-        errorString = cx->localeCallbacks
-                        ->localeGetErrorMessage(userRef, locale, errorNumber);
-    }
-    if (!errorString)
-        errorString = js_GetErrorMessage(userRef, locale, errorNumber);
-    return errorString;
-}
-
-#if defined ( DEBUG_mccabe ) && defined ( PRINTNAMES )
-/* For use below... get character strings for error name and exception name */
-static struct exnname { char *name; char *exception; } errortoexnname[] = {
-#define MSG_DEF(name, number, count, exception, format) \
-    {#name, #exception},
-#include "js.msg"
-#undef MSG_DEF
-};
-#endif /* DEBUG */
-
-JSBool
-js_ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp)
-{
-    JSErrNum errorNumber;
-    JSExnType exn;
-    JSBool ok;
-    JSObject *errProto, *errObject;
-    JSString *messageStr, *filenameStr;
-    uintN lineno;
-    JSExnPrivate *privateData;
-    const JSErrorFormatString *errorString;
-
-    /*
-     * Tell our caller to report immediately if cx has no active frames, or if
-     * this report is just a warning.
-     */
-    JS_ASSERT(reportp);
-    if (!cx->fp || JSREPORT_IS_WARNING(reportp->flags))
-        return JS_FALSE;
-
-    /* Find the exception index associated with this error. */
-    errorNumber = (JSErrNum) reportp->errorNumber;
-    errorString = js_GetLocalizedErrorMessage(cx, NULL, NULL, errorNumber);
-    exn = errorString ? errorString->exnType : JSEXN_NONE;
-    JS_ASSERT(exn < JSEXN_LIMIT);
-
-#if defined( DEBUG_mccabe ) && defined ( PRINTNAMES )
-    /* Print the error name and the associated exception name to stderr */
-    fprintf(stderr, "%s\t%s\n",
-            errortoexnname[errorNumber].name,
-            errortoexnname[errorNumber].exception);
-#endif
-
-    /*
-     * Return false (no exception raised) if no exception is associated
-     * with the given error number.
-     */
-    if (exn == JSEXN_NONE)
-        return JS_FALSE;
-
-    /*
-     * Prevent runaway recursion, just as the Exception native constructor
-     * must do, via cx->creatingException.  If an out-of-memory error occurs,
-     * no exception object will be created, but we don't assume that OOM is
-     * the only kind of error that subroutines of this function called below
-     * might raise.
-     */
-    if (cx->creatingException)
-        return JS_FALSE;
-    cx->creatingException = JS_TRUE;
-
-    /* Protect the newly-created strings below from nesting GCs. */
-    ok = js_EnterLocalRootScope(cx);
-    if (!ok)
-        goto out;
-
-    /*
-     * Try to get an appropriate prototype by looking up the corresponding
-     * exception constructor name in the scope chain of the current context's
-     * top stack frame, or in the global object if no frame is active.
-     */
-    ok = js_GetClassPrototype(cx, exceptions[exn].name, &errProto);
-    if (!ok)
-        goto out;
-
-    errObject = js_NewObject(cx, &ExceptionClass, errProto, NULL);
-    if (!errObject) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-    /*
-     * Set the generated Exception object early, so it won't be GC'd by a last
-     * ditch attempt to collect garbage, or a GC that otherwise nests or races
-     * under any of the following calls.  If one of the following calls fails,
-     * it will overwrite this exception object with one of its own (except in
-     * case of OOM errors, of course).
-     */
-    JS_SetPendingException(cx, OBJECT_TO_JSVAL(errObject));
-
-    messageStr = JS_NewStringCopyZ(cx, message);
-    if (!messageStr) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-    if (reportp) {
-        filenameStr = JS_NewStringCopyZ(cx, reportp->filename);
-        if (!filenameStr) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        lineno = reportp->lineno;
-    } else {
-        filenameStr = cx->runtime->emptyString;
-        lineno = 0;
-    }
-    ok = InitExceptionObject(cx, errObject, messageStr, filenameStr, lineno);
-    if (!ok)
-        goto out;
-
-    /*
-     * Construct a new copy of the error report struct, and store it in the
-     * exception object's private data.  We can't use the error report struct
-     * that was passed in, because it's stack-allocated, and also because it
-     * may point to transient data in the JSTokenStream.
-     */
-    privateData = exn_newPrivate(cx, reportp);
-    if (!privateData) {
-        ok = JS_FALSE;
-        goto out;
-    }
-    OBJ_SET_SLOT(cx, errObject, JSSLOT_PRIVATE, PRIVATE_TO_JSVAL(privateData));
-
-    /* Flag the error report passed in to indicate an exception was raised. */
-    reportp->flags |= JSREPORT_EXCEPTION;
-
-out:
-    js_LeaveLocalRootScope(cx);
-    cx->creatingException = JS_FALSE;
-    return ok;
-}
-#endif /* JS_HAS_ERROR_EXCEPTIONS */
-
-#if JS_HAS_EXCEPTIONS
-
-JSBool
-js_ReportUncaughtException(JSContext *cx)
-{
-    jsval exn, *vp;
-    JSObject *exnObject;
-    void *mark;
-    JSErrorReport *reportp, report;
-    JSString *str;
-    const char *bytes;
-    JSBool ok;
-
-    if (!JS_IsExceptionPending(cx))
-        return JS_TRUE;
-
-    if (!JS_GetPendingException(cx, &exn))
-        return JS_FALSE;
-
-    /*
-     * Because js_ValueToString below could error and an exception object
-     * could become unrooted, we must root exnObject.  Later, if exnObject is
-     * non-null, we need to root other intermediates, so allocate an operand
-     * stack segment to protect all of these values.
-     */
-    if (JSVAL_IS_PRIMITIVE(exn)) {
-        exnObject = NULL;
-        vp = NULL;
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-        mark = NULL;
-#endif
-    } else {
-        exnObject = JSVAL_TO_OBJECT(exn);
-        vp = js_AllocStack(cx, 5, &mark);
-        if (!vp) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        vp[0] = exn;
-    }
-
-#if JS_HAS_ERROR_EXCEPTIONS
-    reportp = js_ErrorFromException(cx, exn);
-#else
-    reportp = NULL;
-#endif
-
-    /* XXX L10N angels cry once again (see also jsemit.c, /L10N gaffes/) */
-    str = js_ValueToString(cx, exn);
-    if (!str) {
-        bytes = "unknown (can't convert to string)";
-    } else {
-        if (vp)
-            vp[1] = STRING_TO_JSVAL(str);
-        bytes = js_GetStringBytes(str);
-    }
-    ok = JS_TRUE;
-
-    if (!reportp &&
-        exnObject &&
-        OBJ_GET_CLASS(cx, exnObject) == &ExceptionClass) {
-        const char *filename;
-        uint32 lineno;
-
-        ok = JS_GetProperty(cx, exnObject, js_message_str, &vp[2]);
-        if (!ok)
-            goto out;
-        if (JSVAL_IS_STRING(vp[2]))
-            bytes = JS_GetStringBytes(JSVAL_TO_STRING(vp[2]));
-
-        ok = JS_GetProperty(cx, exnObject, js_filename_str, &vp[3]);
-        if (!ok)
-            goto out;
-        str = js_ValueToString(cx, vp[3]);
-        if (!str) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        filename = StringToFilename(cx, str);
-
-        ok = JS_GetProperty(cx, exnObject, js_lineno_str, &vp[4]);
-        if (!ok)
-            goto out;
-        ok = js_ValueToECMAUint32 (cx, vp[4], &lineno);
-        if (!ok)
-            goto out;
-
-        reportp = &report;
-        memset(&report, 0, sizeof report);
-        report.filename = filename;
-        report.lineno = (uintN) lineno;
-    }
-
-    if (!reportp) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_UNCAUGHT_EXCEPTION, bytes);
-    } else {
-        /* Flag the error as an exception. */
-        reportp->flags |= JSREPORT_EXCEPTION;
-        js_ReportErrorAgain(cx, bytes, reportp);
-    }
-
-    JS_ClearPendingException(cx);
-out:
-    if (exnObject)
-        js_FreeStack(cx, mark);
-    return ok;
-}
-
-#endif /* JS_HAS_EXCEPTIONS */
diff --git a/libs/js/src/jsexn.h b/libs/js/src/jsexn.h
deleted file mode 100644
index 29bfcc07b7..0000000000
--- a/libs/js/src/jsexn.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS runtime exception classes.
- */
-
-#ifndef jsexn_h___
-#define jsexn_h___
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Initialize the exception constructor/prototype hierarchy.
- */
-extern JSObject *
-js_InitExceptionClasses(JSContext *cx, JSObject *obj);
-
-/*
- * String constants naming the exception classes.
- */
-extern const char js_Error_str[];
-extern const char js_InternalError_str[];
-extern const char js_EvalError_str[];
-extern const char js_RangeError_str[];
-extern const char js_ReferenceError_str[];
-extern const char js_SyntaxError_str[];
-extern const char js_TypeError_str[];
-extern const char js_URIError_str[];
-
-/*
- * Given a JSErrorReport, check to see if there is an exception associated with
- * the error number.  If there is, then create an appropriate exception object,
- * set it as the pending exception, and set the JSREPORT_EXCEPTION flag on the
- * error report.  Exception-aware host error reporters should probably ignore
- * error reports so flagged.  Returns JS_TRUE if an associated exception is
- * found and set, JS_FALSE otherwise..
- */
-extern JSBool
-js_ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp);
-
-/*
- * Called if a JS API call to js_Execute or js_InternalCall fails; calls the
- * error reporter with the error report associated with any uncaught exception
- * that has been raised.  Returns true if there was an exception pending, and
- * the error reporter was actually called.
- *
- * The JSErrorReport * that the error reporter is called with is currently
- * associated with a JavaScript object, and is not guaranteed to persist after
- * the object is collected.  Any persistent uses of the JSErrorReport contents
- * should make their own copy.
- *
- * The flags field of the JSErrorReport will have the JSREPORT_EXCEPTION flag
- * set; embeddings that want to silently propagate JavaScript exceptions to
- * other contexts may want to use an error reporter that ignores errors with
- * this flag.
- */
-extern JSBool
-js_ReportUncaughtException(JSContext *cx);
-
-extern JSErrorReport *
-js_ErrorFromException(JSContext *cx, jsval exn);
-
-extern const JSErrorFormatString* 
-js_GetLocalizedErrorMessage(JSContext* cx, void *userRef, const char *locale, const uintN errorNumber);
-
-JS_END_EXTERN_C
-
-#endif /* jsexn_h___ */
diff --git a/libs/js/src/jsfile.c b/libs/js/src/jsfile.c
deleted file mode 100644
index 28e0d53da2..0000000000
--- a/libs/js/src/jsfile.c
+++ /dev/null
@@ -1,3109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS File object
- */
-#ifdef OSSP_HACK
-#include "../config.h"
-#endif
-
-#include "jsstddef.h"
-
-/* ----------------- Platform-specific includes and defines ----------------- */
-#if defined(XP_WIN) || defined(XP_OS2)
-#   include <direct.h>
-#ifdef OSSP_HACK
-#   include <dirent.h>
-#   include <fcntl.h>
-#   include <time.h>
-#endif
-#   include <io.h>
-#   include <sys/types.h>
-#   include <sys/stat.h>
-#   define FILESEPARATOR        '\\'
-#   define FILESEPARATOR2       '/'
-#   define CURRENT_DIR          "c:\\"
-#   define POPEN                _popen
-#   define PCLOSE               _pclose
-#ifdef OSSP_HACK
-#   undef mkdir
-#   define mkdir(file, mode)    _mkdir(file)
-#endif
-#elif defined(XP_UNIX) || defined(XP_BEOS)
-#   include <strings.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <unistd.h>
-#ifdef OSSP_HACK
-#   include <sys/types.h>
-#   include <sys/stat.h>
-#   include <dirent.h>
-#   include <fcntl.h>
-#   include <time.h>
-#endif
-#   define FILESEPARATOR        '/'
-#   define FILESEPARATOR2       '\0'
-#   define CURRENT_DIR          "/"
-#   define POPEN                popen
-#   define PCLOSE               pclose
-#endif
-
-/* --------------- Platform-independent includes and defines ---------------- */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsdate.h"
-#include "jsdbgapi.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jslock.h"
-#include "jsobj.h"
-#include "jsparse.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-#include "jsutil.h" /* Added by JSIFY */
-#ifdef OSSP_HACK /* CLEANUP */
-#include "jsfile.h"
-#endif
-#include <string.h>
-
-/* NSPR dependencies */
-#ifdef OSSP_HACK
-#define PR_RDONLY       0x01
-#define PR_WRONLY       0x02
-#define PR_RDWR         0x04
-#define PR_CREATE_FILE  0x08
-#define PR_APPEND       0x10
-#define PR_TRUNCATE     0x20
-#define PR_SYNC         0x40
-#define PR_EXCL         0x80
-#else
-#include "prio.h"
-#include "prerror.h"
-#endif
-
-#define SPECIAL_FILE_STRING     "Special File"
-#define CURRENTDIR_PROPERTY     "currentDir"
-#define SEPARATOR_PROPERTY      "separator"
-#define FILE_CONSTRUCTOR        "File"
-#define PIPE_SYMBOL             '|'
-
-#define ASCII                   0
-#define UTF8                    1
-#define UCS2                    2
-
-#define asciistring             "text"
-#define utfstring               "binary"
-#define unicodestring           "unicode"
-
-#define MAX_PATH_LENGTH         1024
-#define MODE_SIZE               256
-#define NUMBER_SIZE             32
-#define MAX_LINE_LENGTH         256
-#define URL_PREFIX              "file://"
-
-#define STDINPUT_NAME           "Standard input stream"
-#define STDOUTPUT_NAME          "Standard output stream"
-#define STDERROR_NAME           "Standard error stream"
-
-#define RESOLVE_PATH            js_canonicalPath        /* js_absolutePath */
-
-/* Error handling */
-typedef enum JSFileErrNum {
-#define MSG_DEF(name, number, count, exception, format) \
-    name = number,
-#include "jsfile.msg"
-#undef MSG_DEF
-    JSFileErr_Limit
-#undef MSGDEF
-} JSFileErrNum;
-
-#define JSFILE_HAS_DFLT_MSG_STRINGS 1
-
-JSErrorFormatString JSFile_ErrorFormatString[JSFileErr_Limit] = {
-#if JSFILE_HAS_DFLT_MSG_STRINGS
-#define MSG_DEF(name, number, count, exception, format) \
-    { format, count },
-#else
-#define MSG_DEF(name, number, count, exception, format) \
-    { NULL, count },
-#endif
-#include "jsfile.msg"
-#undef MSG_DEF
-};
-
-#ifdef OSSP_HACK
-static
-#endif
-const JSErrorFormatString *
-JSFile_GetErrorMessage(void *userRef, const char *locale,
-                                                        const uintN errorNumber)
-{
-    if ((errorNumber > 0) && (errorNumber < JSFileErr_Limit))
-        return &JSFile_ErrorFormatString[errorNumber];
-    else
-        return NULL;
-}
-
-#define JSFILE_CHECK_NATIVE(op)                                               \
-    if (file->isNative) {                                                     \
-        JS_ReportWarning(cx, "Cannot call or access \"%s\" on native file %s",\
-                         op, file->path);                                     \
-        goto out;                                                             \
-    }
-
-#define JSFILE_CHECK_WRITE                                                    \
-    if (!file->isOpen) {                                                      \
-        JS_ReportWarning(cx,                                                  \
-                "File %s is closed, will open it for writing, proceeding",    \
-                file->path);                                                  \
-        js_FileOpen(cx, obj, file, "write,append,create");                    \
-    }                                                                         \
-    if (!js_canWrite(cx, file)) {                                             \
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,                \
-                             JSFILEMSG_CANNOT_WRITE, file->path);             \
-        goto out;                                                             \
-    }
-
-#define JSFILE_CHECK_READ                                                     \
-    if (!file->isOpen) {                                                      \
-        JS_ReportWarning(cx,                                                  \
-                "File %s is closed, will open it for reading, proceeding",    \
-                file->path);                                                  \
-        js_FileOpen(cx, obj, file, "read");                                   \
-    }                                                                         \
-    if (!js_canRead(cx, file)) {                                              \
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,                \
-                             JSFILEMSG_CANNOT_READ, file->path);              \
-        goto out;                                                             \
-    }
-
-#define JSFILE_CHECK_OPEN(op)                                                 \
-    if (!file->isOpen) {                                                      \
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,                \
-                             JSFILEMSG_FILE_MUST_BE_CLOSED, op);              \
-        goto out;                                                             \
-    }
-
-#define JSFILE_CHECK_CLOSED(op)                                               \
-    if (file->isOpen) {                                                       \
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,                \
-            JSFILEMSG_FILE_MUST_BE_OPEN, op);                                 \
-        goto out;                                                             \
-    }
-
-#define JSFILE_CHECK_ONE_ARG(op)                                              \
-    if (argc != 1) {                                                          \
-        char str[NUMBER_SIZE];                                                \
-        sprintf(str, "%d", argc);                                             \
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,                \
-                             JSFILEMSG_EXPECTS_ONE_ARG_ERROR, op, str);       \
-        goto out;                                                             \
-    }
-
-
-/*
-    Security mechanism, should define a callback for this.
-    The parameters are as follows:
-    SECURITY_CHECK(JSContext *cx, JSPrincipals *ps, char *op_name, JSFile *file)
-    XXX Should this be a real function returning a JSBool result (and getting
-    some typesafety help from the compiler?).
-*/
-#define SECURITY_CHECK(cx, ps, op, file)    \
-        /* Define a callback here... */
-
-
-/* Structure representing the file internally */
-typedef struct JSFile {
-    char        *path;          /* the path to the file. */
-    JSBool      isOpen;
-    int32       mode;           /* mode used to open the file: read, write, append, create, etc.. */
-    int32       type;           /* Asciiz, utf, unicode */
-    char        byteBuffer[3];  /* bytes read in advance by js_FileRead ( UTF8 encoding ) */
-    jsint       nbBytesInBuf;   /* number of bytes stored in the buffer above */
-    jschar      charBuffer;     /* character read in advance by readln ( mac files only ) */
-    JSBool      charBufferUsed; /* flag indicating if the buffer above is being used */
-    JSBool      hasRandomAccess;/* can the file be randomly accessed? false for stdin, and
-                                 UTF-encoded files. */
-    JSBool      hasAutoflush;   /* should we force a flush for each line break? */
-    JSBool      isNative;       /* if the file is using OS-specific file FILE type */
-    /* We can actually put the following two in a union since they should never be used at the same time */
-#ifdef OSSP_HACK
-    FILE        *handle;        /* the handle for the file, if open.  */
-#else
-    PRFileDesc  *handle;        /* the handle for the file, if open.  */
-#endif
-    FILE        *nativehandle;  /* native handle, for stuff NSPR doesn't do. */
-    JSBool      isPipe;         /* if the file is really an OS pipe */
-} JSFile;
-
-/* a few forward declarations... */
-static JSClass file_class;
-JS_PUBLIC_API(JSObject*) js_NewFileObject(JSContext *cx, char *filename);
-static JSBool file_open(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-static JSBool file_close(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-/* New filename manipulation procesures */
-/* assumes we don't have leading/trailing spaces */
-static JSBool
-js_filenameHasAPipe(const char *filename)
-{
-    if (!filename)
-        return JS_FALSE;
-
-    return  filename[0] == PIPE_SYMBOL ||
-            filename[strlen(filename) - 1] == PIPE_SYMBOL;
-}
-
-static JSBool
-js_isAbsolute(const char *name)
-{
-#if defined(XP_WIN) || defined(XP_OS2)
-    return *name && name[1] == ':';
-#else
-    return (name[0]
-#   if defined(XP_UNIX) || defined(XP_BEOS)
-            ==
-#   else
-            !=
-#   endif
-            FILESEPARATOR);
-#endif
-}
-
-/*
- * Concatinates base and name to produce a valid filename.
- * Returned string must be freed.
-*/
-static char*
-js_combinePath(JSContext *cx, const char *base, const char *name)
-{
-    int len = strlen(base);
-    char* result = JS_malloc(cx, len + strlen(name) + 2);
-
-    if (!result)
-        return NULL;
-
-    strcpy(result, base);
-
-    if (base[len - 1] != FILESEPARATOR && base[len - 1] != FILESEPARATOR2) {
-        result[len] = FILESEPARATOR;
-        result[len + 1] = '\0';
-    }
-    strcat(result, name);
-    return result;
-}
-
-/* Extract the last component from a path name. Returned string must be freed */
-static char *
-js_fileBaseName(JSContext *cx, const char *pathname)
-{
-    jsint index, aux;
-    char *result;
-
-    index = strlen(pathname)-1;
-
-    /* Chop off trailing seperators. */
-    while (index > 0 && (pathname[index]==FILESEPARATOR ||
-                         pathname[index]==FILESEPARATOR2)) {
-        --index;
-    }
-
-    aux = index;
-
-    /* Now find the next separator. */
-    while (index >= 0 && pathname[index] != FILESEPARATOR &&
-                         pathname[index] != FILESEPARATOR2) {
-        --index;
-    }
-
-    /* Allocate and copy. */
-    result = JS_malloc(cx, aux - index + 1);
-    if (!result)
-        return NULL;
-    strncpy(result, pathname + index + 1, aux - index);
-    result[aux - index] = '\0';
-    return result;
-}
-
-/*
- * Returns everything but the last component from a path name.
- * Returned string must be freed.
- */
-static char *
-js_fileDirectoryName(JSContext *cx, const char *pathname)
-{
-    char *result;
-    const char *cp, *end;
-    size_t pathsize;
-
-    end = pathname + strlen(pathname);
-    cp = end - 1;
-
-    /* If this is already a directory, chop off the trailing /s. */
-    while (cp >= pathname) {
-        if (*cp != FILESEPARATOR && *cp != FILESEPARATOR2)
-            break;
-        --cp;
-    }
-
-    if (cp < pathname && end != pathname) {
-        /* There were just /s, return the root. */
-        result = JS_malloc(cx, 1 + 1); /* The separator + trailing NUL. */
-        result[0] = FILESEPARATOR;
-        result[1] = '\0';
-        return result;
-    }
-
-    /* Now chop off the last portion. */
-    while (cp >= pathname) {
-        if (*cp == FILESEPARATOR || *cp == FILESEPARATOR2)
-            break;
-        --cp;
-    }
-
-    /* Check if this is a leaf. */
-    if (cp < pathname) {
-        /* It is, return "pathname/". */
-        if (end[-1] == FILESEPARATOR || end[-1] == FILESEPARATOR2) {
-            /* Already has its terminating /. */
-            return JS_strdup(cx, pathname);
-        }
-
-        pathsize = end - pathname + 1;
-        result = JS_malloc(cx, pathsize + 1);
-        if (!result)
-            return NULL;
-
-        strcpy(result, pathname);
-        result[pathsize - 1] = FILESEPARATOR;
-        result[pathsize] = '\0';
-
-        return result;
-    }
-
-    /* Return everything up to and including the seperator. */
-    pathsize = cp - pathname + 1;
-    result = JS_malloc(cx, pathsize + 1);
-    if (!result)
-        return NULL;
-
-    strncpy(result, pathname, pathsize);
-    result[pathsize] = '\0';
-
-    return result;
-}
-
-static char *
-js_absolutePath(JSContext *cx, const char * path)
-{
-    JSObject *obj;
-    JSString *str;
-    jsval prop;
-
-    if (js_isAbsolute(path)) {
-        return JS_strdup(cx, path);
-    } else {
-        obj = JS_GetGlobalObject(cx);
-        if (!JS_GetProperty(cx, obj, FILE_CONSTRUCTOR, &prop)) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_FILE_CONSTRUCTOR_UNDEFINED_ERROR);
-            return JS_strdup(cx, path);
-        }
-
-        obj = JSVAL_TO_OBJECT(prop);
-        if (!JS_GetProperty(cx, obj, CURRENTDIR_PROPERTY, &prop)) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_FILE_CURRENTDIR_UNDEFINED_ERROR);
-            return JS_strdup(cx, path);
-        }
-
-        str = JS_ValueToString(cx, prop);
-        if (!str)
-            return JS_strdup(cx, path);
-
-        /* should we have an array of curr dirs indexed by drive for windows? */
-        return js_combinePath(cx, JS_GetStringBytes(str), path);
-    }
-}
-
-/* Side effect: will remove spaces in the beginning/end of the filename */
-static char *
-js_canonicalPath(JSContext *cx, char *oldpath)
-{
-    char *tmp;
-    char *path = oldpath;
-    char *base, *dir, *current, *result;
-    jsint c;
-    jsint back = 0;
-    unsigned int i = 0, j = strlen(path)-1;
-
-    /* This is probably optional */
-	/* Remove possible spaces in the beginning and end */
-    while (i < j && path[i] == ' ')
-        i++;
-    while (j >= 0 && path[j] == ' ')
-        j--;
-
-    tmp = JS_malloc(cx, j-i+2);
-    if (!tmp)
-        return NULL;
-
-    strncpy(tmp, path + i, j - i + 1);
-    tmp[j - i + 1] = '\0';
-
-    path = tmp;
-
-    /* Pipe support. */
-    if (js_filenameHasAPipe(path))
-        return path;
-
-    /* file:// support. */
-    if (!strncmp(path, URL_PREFIX, strlen(URL_PREFIX))) {
-        tmp = js_canonicalPath(cx, path + strlen(URL_PREFIX));
-        JS_free(cx, path);
-        return tmp;
-    }
-
-    if (!js_isAbsolute(path)) {
-        tmp = js_absolutePath(cx, path);
-        if (!tmp)
-            return NULL;
-        path = tmp;
-    }
-
-    result = JS_strdup(cx, "");
-
-    current = path;
-
-    base = js_fileBaseName(cx, current);
-    dir = js_fileDirectoryName(cx, current);
-
-    while (strcmp(dir, current)) {
-        if (!strcmp(base, "..")) {
-            back++;
-        } else {
-            if (back > 0) {
-                back--;
-            } else {
-                tmp = result;
-                result = JS_malloc(cx, strlen(base) + 1 + strlen(tmp) + 1);
-                if (!result)
-                    goto out;
-
-                strcpy(result, base);
-                c = strlen(result);
-                if (*tmp) {
-                    result[c] = FILESEPARATOR;
-                    result[c + 1] = '\0';
-                    strcat(result, tmp);
-                }
-                JS_free(cx, tmp);
-            }
-        }
-        JS_free(cx, current);
-        JS_free(cx, base);
-        current = dir;
-        base =  js_fileBaseName(cx, current);
-        dir = js_fileDirectoryName(cx, current);
-    }
-
-    tmp = result;
-    result = JS_malloc(cx, strlen(dir)+1+strlen(tmp)+1);
-    if (!result)
-        goto out;
-
-    strcpy(result, dir);
-    c = strlen(result);
-    if (tmp[0]!='\0') {
-        if ((result[c-1]!=FILESEPARATOR)&&(result[c-1]!=FILESEPARATOR2)) {
-            result[c] = FILESEPARATOR;
-            result[c+1] = '\0';
-        }
-        strcat(result, tmp);
-    }
-
-out:
-    if (tmp)
-        JS_free(cx, tmp);
-    if (dir)
-        JS_free(cx, dir);
-    if (base)
-        JS_free(cx, base);
-    if (current)
-        JS_free(cx, current);
-
-    return result;
-}
-
-/* -------------------------- Text conversion ------------------------------- */
-/* The following is ripped from libi18n/unicvt.c and include files.. */
-
-/*
- * UTF8 defines and macros
- */
-#define ONE_OCTET_BASE          0x00    /* 0xxxxxxx */
-#define ONE_OCTET_MASK          0x7F    /* x1111111 */
-#define CONTINUING_OCTET_BASE   0x80    /* 10xxxxxx */
-#define CONTINUING_OCTET_MASK   0x3F    /* 00111111 */
-#define TWO_OCTET_BASE          0xC0    /* 110xxxxx */
-#define TWO_OCTET_MASK          0x1F    /* 00011111 */
-#define THREE_OCTET_BASE        0xE0    /* 1110xxxx */
-#define THREE_OCTET_MASK        0x0F    /* 00001111 */
-#define FOUR_OCTET_BASE         0xF0    /* 11110xxx */
-#define FOUR_OCTET_MASK         0x07    /* 00000111 */
-#define FIVE_OCTET_BASE         0xF8    /* 111110xx */
-#define FIVE_OCTET_MASK         0x03    /* 00000011 */
-#define SIX_OCTET_BASE          0xFC    /* 1111110x */
-#define SIX_OCTET_MASK          0x01    /* 00000001 */
-
-#define IS_UTF8_1ST_OF_1(x) (( (x)&~ONE_OCTET_MASK  ) == ONE_OCTET_BASE)
-#define IS_UTF8_1ST_OF_2(x) (( (x)&~TWO_OCTET_MASK  ) == TWO_OCTET_BASE)
-#define IS_UTF8_1ST_OF_3(x) (( (x)&~THREE_OCTET_MASK) == THREE_OCTET_BASE)
-#define IS_UTF8_1ST_OF_4(x) (( (x)&~FOUR_OCTET_MASK ) == FOUR_OCTET_BASE)
-#define IS_UTF8_1ST_OF_5(x) (( (x)&~FIVE_OCTET_MASK ) == FIVE_OCTET_BASE)
-#define IS_UTF8_1ST_OF_6(x) (( (x)&~SIX_OCTET_MASK  ) == SIX_OCTET_BASE)
-#define IS_UTF8_2ND_THRU_6TH(x) \
-                    (( (x)&~CONTINUING_OCTET_MASK  ) == CONTINUING_OCTET_BASE)
-#define IS_UTF8_1ST_OF_UCS2(x) \
-            IS_UTF8_1ST_OF_1(x) \
-            || IS_UTF8_1ST_OF_2(x) \
-            || IS_UTF8_1ST_OF_3(x)
-
-
-#define MAX_UCS2            0xFFFF
-#define DEFAULT_CHAR        0x003F  /* Default char is "?" */
-#define BYTE_MASK           0xBF
-#define BYTE_MARK           0x80
-
-
-/* Function: one_ucs2_to_utf8_char
- *
- * Function takes one UCS-2 char and writes it to a UTF-8 buffer.
- * We need a UTF-8 buffer because we don't know before this
- * function how many bytes of utf-8 data will be written. It also
- * takes a pointer to the end of the UTF-8 buffer so that we don't
- * overwrite data. This function returns the number of UTF-8 bytes
- * of data written, or -1 if the buffer would have been overrun.
- */
-
-#define LINE_SEPARATOR      0x2028
-#define PARAGRAPH_SEPARATOR 0x2029
-static int16 one_ucs2_to_utf8_char(unsigned char *tobufp,
-                                   unsigned char *tobufendp,
-                                   uint16 onechar)
-{
-    int16 numUTF8bytes = 0;
-
-    if (onechar == LINE_SEPARATOR || onechar == PARAGRAPH_SEPARATOR) {
-        strcpy((char*)tobufp, "\n");
-        return strlen((char*)tobufp);
-    }
-
-    if (onechar < 0x80) {
-        numUTF8bytes = 1;
-    } else if (onechar < 0x800) {
-        numUTF8bytes = 2;
-    } else {
-        /* 0x800 >= onechar <= MAX_UCS2 */
-        numUTF8bytes = 3;
-    }
-
-    tobufp += numUTF8bytes;
-
-    /* return error if we don't have space for the whole character */
-    if (tobufp > tobufendp) {
-        return(-1);
-    }
-
-    switch(numUTF8bytes) {
-      case 3: *--tobufp = (onechar | BYTE_MARK) & BYTE_MASK; onechar >>=6;
-              *--tobufp = (onechar | BYTE_MARK) & BYTE_MASK; onechar >>=6;
-              *--tobufp = onechar |  THREE_OCTET_BASE;
-              break;
-
-      case 2: *--tobufp = (onechar | BYTE_MARK) & BYTE_MASK; onechar >>=6;
-              *--tobufp = onechar | TWO_OCTET_BASE;
-              break;
-
-      case 1: *--tobufp = (unsigned char)onechar;
-              break;
-    }
-
-    return numUTF8bytes;
-}
-
-/*
- * utf8_to_ucs2_char
- *
- * Convert a utf8 multibyte character to ucs2
- *
- * inputs: pointer to utf8 character(s)
- *         length of utf8 buffer ("read" length limit)
- *         pointer to return ucs2 character
- *
- * outputs: number of bytes in the utf8 character
- *          -1 if not a valid utf8 character sequence
- *          -2 if the buffer is too short
- */
-static int16
-utf8_to_ucs2_char(const unsigned char *utf8p, int16 buflen, uint16 *ucs2p)
-{
-    uint16 lead, cont1, cont2;
-
-    /*
-     * Check for minimum buffer length
-     */
-    if ((buflen < 1) || (utf8p == NULL)) {
-        return -2;
-    }
-    lead = (uint16) (*utf8p);
-
-    /*
-     * Check for a one octet sequence
-     */
-    if (IS_UTF8_1ST_OF_1(lead)) {
-        *ucs2p = lead & ONE_OCTET_MASK;
-        return 1;
-    }
-
-    /*
-     * Check for a two octet sequence
-     */
-    if (IS_UTF8_1ST_OF_2(*utf8p)) {
-        if (buflen < 2)
-            return -2;
-        cont1 = (uint16) *(utf8p+1);
-        if (!IS_UTF8_2ND_THRU_6TH(cont1))
-            return -1;
-        *ucs2p =  (lead & TWO_OCTET_MASK) << 6;
-        *ucs2p |= cont1 & CONTINUING_OCTET_MASK;
-        return 2;
-    }
-
-    /*
-     * Check for a three octet sequence
-     */
-    else if (IS_UTF8_1ST_OF_3(lead)) {
-        if (buflen < 3)
-            return -2;
-        cont1 = (uint16) *(utf8p+1);
-        cont2 = (uint16) *(utf8p+2);
-        if (   (!IS_UTF8_2ND_THRU_6TH(cont1))
-            || (!IS_UTF8_2ND_THRU_6TH(cont2)))
-            return -1;
-        *ucs2p =  (lead & THREE_OCTET_MASK) << 12;
-        *ucs2p |= (cont1 & CONTINUING_OCTET_MASK) << 6;
-        *ucs2p |= cont2 & CONTINUING_OCTET_MASK;
-        return 3;
-    }
-    else { /* not a valid utf8/ucs2 character */
-        return -1;
-    }
-}
-
-/* ----------------------------- Helper functions --------------------------- */
-/* Ripped off from lm_win.c .. */
-/* where is strcasecmp?.. for now, it's case sensitive..
- *
- * strcasecmp is in strings.h, but on windows it's called _stricmp...
- * will need to #ifdef this
-*/
-
-static int32
-js_FileHasOption(JSContext *cx, const char *oldoptions, const char *name)
-{
-    char *comma, *equal, *current;
-    char *options = JS_strdup(cx, oldoptions);
-    int32 found = 0;
-
-    current = options;
-    for (;;) {
-        comma = strchr(current, ',');
-        if (comma) *comma = '\0';
-        equal = strchr(current, '=');
-        if (equal) *equal = '\0';
-        if (strcmp(current, name) == 0) {
-            if (!equal || strcmp(equal + 1, "yes") == 0)
-                found = 1;
-            else
-                found = atoi(equal + 1);
-        }
-        if (equal) *equal = '=';
-        if (comma) *comma = ',';
-        if (found || !comma)
-            break;
-        current = comma + 1;
-    }
-    JS_free(cx, options);
-    return found;
-}
-
-/* empty the buffer */
-static void
-js_ResetBuffers(JSFile * file)
-{
-    file->charBufferUsed = JS_FALSE;
-    file->nbBytesInBuf = 0;
-}
-
-/* Reset file attributes */
-static void
-js_ResetAttributes(JSFile * file)
-{
-    file->mode = file->type = 0;
-    file->isOpen = JS_FALSE;
-    file->handle = NULL;
-    file->nativehandle = NULL;
-    file->hasRandomAccess = JS_TRUE; /* Innocent until proven guilty. */
-    file->hasAutoflush = JS_FALSE;
-    file->isNative = JS_FALSE;
-    file->isPipe = JS_FALSE;
-
-    js_ResetBuffers(file);
-}
-
-static JSBool
-js_FileOpen(JSContext *cx, JSObject *obj, JSFile *file, char *mode){
-    JSString *type, *mask;
-    jsval v[2];
-    jsval rval;
-
-    type =  JS_InternString(cx, asciistring);
-    mask =  JS_NewStringCopyZ(cx, mode);
-    v[0] = STRING_TO_JSVAL(mask);
-    v[1] = STRING_TO_JSVAL(type);
-
-    if (!file_open(cx, obj, 2, v, &rval))
-        return JS_FALSE;
-    return JS_TRUE;
-}
-
-/* Buffered version of PR_Read. Used by js_FileRead */
-static int32
-#ifdef OSSP_HACK
-js_BufferedRead(JSFile * f, unsigned char *buf, int32 len)
-#else
-js_BufferedRead(JSFile * f, char *buf, int32 len)
-#endif
-{
-    int32 count = 0;
-
-    while (f->nbBytesInBuf>0&&len>0) {
-        buf[0] = f->byteBuffer[0];
-        f->byteBuffer[0] = f->byteBuffer[1];
-        f->byteBuffer[1] = f->byteBuffer[2];
-        f->nbBytesInBuf--;
-        len--;
-        buf+=1;
-        count++;
-    }
-
-    if (len>0) {
-#ifdef OSSP_HACK
-        count += (!f->isNative)
-                 ? fread(buf, 1, len, f->handle)
-                 : fread(buf, 1, len, f->nativehandle);
-#else
-        count += (!f->isNative)
-                 ? PR_Read(f->handle, buf, len)
-                 : fread(buf, 1, len, f->nativehandle);
-#endif
-    }
-    return count;
-}
-
-static int32
-js_FileRead(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
-{
-    unsigned char *aux;
-    int32 count = 0, i;
-    jsint remainder;
-    unsigned char utfbuf[3];
-
-    if (file->charBufferUsed) {
-        buf[0] = file->charBuffer;
-        buf++;
-        len--;
-        file->charBufferUsed = JS_FALSE;
-    }
-
-    switch (mode) {
-      case ASCII:
-        aux = (unsigned char*)JS_malloc(cx, len);
-        if (!aux)
-            return 0;
-
-        count = js_BufferedRead(file, aux, len);
-        if (count == -1) {
-            JS_free(cx, aux);
-            return 0;
-        }
-
-        for (i = 0; i < len; i++)
-            buf[i] = (jschar)aux[i];
-
-        JS_free(cx, aux);
-        break;
-
-      case UTF8:
-        remainder = 0;
-        for (count = 0;count<len;count++) {
-            i = js_BufferedRead(file, utfbuf+remainder, 3-remainder);
-            if (i<=0) {
-                return count;
-            }
-            i = utf8_to_ucs2_char(utfbuf, (int16)i, &buf[count] );
-            if (i<0) {
-                return count;
-            } else {
-                if (i==1) {
-                    utfbuf[0] = utfbuf[1];
-                    utfbuf[1] = utfbuf[2];
-                    remainder = 2;
-                } else if (i==2) {
-                    utfbuf[0] = utfbuf[2];
-                    remainder = 1;
-                } else if (i==3) {
-                    remainder = 0;
-                }
-            }
-        }
-        while (remainder>0) {
-            file->byteBuffer[file->nbBytesInBuf] = utfbuf[0];
-            file->nbBytesInBuf++;
-            utfbuf[0] = utfbuf[1];
-            utfbuf[1] = utfbuf[2];
-            remainder--;
-        }
-        break;
-
-      case UCS2:
-#ifdef OSSP_HACK
-        count = js_BufferedRead(file, (unsigned char*)buf, len*2) >> 1;
-#else
-        count = js_BufferedRead(file, (char*)buf, len*2) >> 1;
-#endif
-        if (count == -1)
-            return 0;
-
-        break;
-
-      default:
-        /* Not reached. */
-        JS_ASSERT(0);
-    }
-
-    if(count == -1) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_OP_FAILED, "read", file->path);
-    }
-
-    return count;
-}
-
-static int32
-js_FileSeek(JSContext *cx, JSFile *file, int32 len, int32 mode)
-{
-    int32 count = 0, i;
-    jsint remainder;
-    unsigned char utfbuf[3];
-    jschar tmp;
-
-    switch (mode) {
-      case ASCII:
-#ifdef OSSP_HACK
-        count = fseek(file->handle, len, SEEK_CUR);
-#else
-        count = PR_Seek(file->handle, len, PR_SEEK_CUR);
-#endif
-        break;
-
-      case UTF8:
-        remainder = 0;
-        for (count = 0;count<len;count++) {
-            i = js_BufferedRead(file, utfbuf+remainder, 3-remainder);
-            if (i<=0) {
-                return 0;
-            }
-            i = utf8_to_ucs2_char(utfbuf, (int16)i, &tmp );
-            if (i<0) {
-                return 0;
-            } else {
-                if (i==1) {
-                    utfbuf[0] = utfbuf[1];
-                    utfbuf[1] = utfbuf[2];
-                    remainder = 2;
-                } else if (i==2) {
-                    utfbuf[0] = utfbuf[2];
-                    remainder = 1;
-                } else if (i==3) {
-                    remainder = 0;
-                }
-            }
-        }
-        while (remainder>0) {
-            file->byteBuffer[file->nbBytesInBuf] = utfbuf[0];
-            file->nbBytesInBuf++;
-            utfbuf[0] = utfbuf[1];
-            utfbuf[1] = utfbuf[2];
-            remainder--;
-        }
-        break;
-
-      case UCS2:
-#ifdef OSSP_HACK
-        count = fseek(file->handle, len*2, SEEK_CUR)/2;
-#else
-        count = PR_Seek(file->handle, len*2, PR_SEEK_CUR)/2;
-#endif
-        break;
-
-      default:
-        /* Not reached. */
-        JS_ASSERT(0);
-    }
-
-    if(count == -1) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_OP_FAILED, "seek", file->path);
-    }
-
-    return count;
-}
-
-static int32
-js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
-{
-    unsigned char   *aux;
-    int32           count = 0, i, j;
-    unsigned char   *utfbuf;
-
-    switch (mode) {
-      case ASCII:
-        aux = (unsigned char*)JS_malloc(cx, len);
-        if (!aux)
-            return 0;
-
-        for (i = 0; i<len; i++)
-            aux[i] = buf[i] % 256;
-
-#ifdef OSSP_HACK
-        count = (!file->isNative)
-                ? fwrite(aux, 1, len, file->handle)
-                : fwrite(aux, 1, len, file->nativehandle);
-#else
-        count = (!file->isNative)
-                ? PR_Write(file->handle, aux, len)
-                : fwrite(aux, 1, len, file->nativehandle);
-#endif
-
-        if (count==-1) {
-            JS_free(cx, aux);
-            return 0;
-        }
-
-        JS_free(cx, aux);
-        break;
-
-      case UTF8:
-        utfbuf = (unsigned char*)JS_malloc(cx, len*3);
-        if (!utfbuf)  return 0;
-        i = 0;
-        for (count = 0;count<len;count++) {
-            j = one_ucs2_to_utf8_char(utfbuf+i, utfbuf+len*3, buf[count]);
-            if (j==-1) {
-                JS_free(cx, utfbuf);
-                return 0;
-            }
-            i+=j;
-        }
-#ifdef OSSP_HACK
-        j = (!file->isNative) 
-            ? fwrite(utfbuf, 1, i, file->handle)
-            : fwrite(utfbuf, 1, i, file->nativehandle);
-#else
-        j = (!file->isNative) 
-            ? PR_Write(file->handle, utfbuf, i)
-            : fwrite(utfbuf, 1, i, file->nativehandle);
-#endif
-
-        if (j<i) {
-            JS_free(cx, utfbuf);
-            return 0;
-        }
-        JS_free(cx, utfbuf);
-        break;
-
-      case UCS2:
-#ifdef OSSP_HACK
-        count = (!file->isNative) 
-                ? fwrite(buf, 1, len*2, file->handle) >> 1
-                : fwrite(buf, 1, len*2, file->nativehandle) >> 1;
-#else
-        count = (!file->isNative) 
-                ? PR_Write(file->handle, buf, len*2) >> 1
-                : fwrite(buf, 1, len*2, file->nativehandle) >> 1;
-#endif
-
-        if (count == -1)
-            return 0;
-        break;
-
-      default:
-        /* Not reached. */
-        JS_ASSERT(0);
-    }
-
-    if(count == -1) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_OP_FAILED, "write", file->path);
-    }
-
-    return count;
-}
-
-/* ----------------------------- Property checkers -------------------------- */
-static JSBool
-js_exists(JSContext *cx, JSFile *file)
-{
-    if (file->isNative) {
-        /* It doesn't make sense for a pipe of stdstream. */
-        return JS_FALSE;
-    }
-
-#ifdef OSSP_HACK
-    return access(file->path, F_OK) == 0;
-#else
-    return PR_Access(file->path, PR_ACCESS_EXISTS) == PR_SUCCESS;
-#endif
-}
-
-static JSBool
-js_canRead(JSContext *cx, JSFile *file)
-{
-    if (!file->isNative) {
-        if (file->isOpen && !(file->mode & PR_RDONLY))
-            return JS_FALSE;
-#ifdef OSSP_HACK
-        return access(file->path, R_OK) == 0;
-#else
-        return PR_Access(file->path, PR_ACCESS_READ_OK) == PR_SUCCESS;
-#endif
-    }
-
-    if (file->isPipe) {
-        /* Is this pipe open for reading? */
-        return file->path[0] == PIPE_SYMBOL;
-    }
-
-    return !strcmp(file->path, STDINPUT_NAME);
-}
-
-static JSBool
-js_canWrite(JSContext *cx, JSFile *file)
-{
-    if (!file->isNative) {
-        if (file->isOpen && !(file->mode & PR_WRONLY))
-            return JS_FALSE;
-#ifdef OSSP_HACK
-        return access(file->path, W_OK) == 0;
-#else
-        return PR_Access(file->path, PR_ACCESS_WRITE_OK) == PR_SUCCESS;
-#endif
-    }
-
-    if(file->isPipe) {
-        /* Is this pipe open for writing? */
-        return file->path[strlen(file->path)-1] == PIPE_SYMBOL;
-    }
-
-    return !strcmp(file->path, STDOUTPUT_NAME) ||
-           !strcmp(file->path, STDERROR_NAME);
-}
-
-static JSBool
-js_isFile(JSContext *cx, JSFile *file)
-{
-    if (!file->isNative) {
-#ifdef OSSP_HACK
-        struct stat info;
-
-        if (file->isOpen
-            ? fstat(fileno(file->handle), &info) != 0
-            : stat(file->path, &info) != 0) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            return JS_FALSE;
-        }
-
-        return S_ISREG(info.st_mode) != 0;
-#else
-        PRFileInfo info;
-
-        if (file->isOpen
-            ? PR_GetOpenFileInfo(file->handle, &info)
-            : PR_GetFileInfo(file->path, &info) != PR_SUCCESS) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            return JS_FALSE;
-        }
-
-        return info.type == PR_FILE_FILE;
-#endif
-    }
-
-    /* This doesn't make sense for a pipe of stdstream. */
-    return JS_FALSE;
-}
-
-static JSBool
-js_isDirectory(JSContext *cx, JSFile *file)
-{
-    if(!file->isNative){
-#ifdef OSSP_HACK
-        struct stat info;
-#else
-        PRFileInfo info;
-#endif
-
-        /* Hack needed to get get_property to work. */
-        if (!js_exists(cx, file))
-            return JS_FALSE;
-
-#ifdef OSSP_HACK
-        if (file->isOpen
-            ? fstat(fileno(file->handle), &info) != 0
-            : stat(file->path, &info) != 0) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            return JS_FALSE;
-        }
-
-        return S_ISDIR(info.st_mode) != 0;
-#else
-        if (file->isOpen
-            ? PR_GetOpenFileInfo(file->handle, &info)
-            : PR_GetFileInfo(file->path, &info) != PR_SUCCESS) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            return JS_FALSE;
-        }
-
-        return info.type == PR_FILE_DIRECTORY;
-#endif
-    }
-
-    /* This doesn't make sense for a pipe of stdstream. */
-    return JS_FALSE;
-}
-
-static jsval
-js_size(JSContext *cx, JSFile *file)
-{
-#ifdef OSSP_HACK
-    struct stat info;
-#else
-    PRFileInfo info;
-#endif
-
-    JSFILE_CHECK_NATIVE("size");
-
-#ifdef OSSP_HACK
-    if (file->isOpen
-        ? fstat(fileno(file->handle), &info) != 0
-        : stat(file->path, &info) != 0) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-        return JS_FALSE;
-    }
-
-    return INT_TO_JSVAL(info.st_size);
-#else
-    if (file->isOpen
-        ? PR_GetOpenFileInfo(file->handle, &info)
-        : PR_GetFileInfo(file->path, &info) != PR_SUCCESS) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-        return JS_FALSE;
-    }
-
-    return INT_TO_JSVAL(info.size);
-#endif
-
-out:
-    return JSVAL_VOID;
-}
-
-/*
- * Return the parent object
- */
-static JSBool
-js_parent(JSContext *cx, JSFile *file, jsval *resultp)
-{
-    char *str;
-
-    /* Since we only care about pipes and native files, return NULL. */
-    if (file->isNative) {
-        *resultp = JSVAL_VOID;
-        return JS_TRUE;
-    }
-
-    str = js_fileDirectoryName(cx, file->path);
-    if (!str)
-        return JS_FALSE;
-
-    /* If the directory is equal to the original path, we're at the root. */
-    if (!strcmp(file->path, str)) {
-        *resultp = JSVAL_NULL;
-    } else {
-        JSObject *obj = js_NewFileObject(cx, str);
-        if (!obj) {
-            JS_free(cx, str);
-            return JS_FALSE;
-        }
-        *resultp = OBJECT_TO_JSVAL(obj);
-    }
-
-    JS_free(cx, str);
-    return JS_TRUE;
-}
-
-static JSBool
-js_name(JSContext *cx, JSFile *file, jsval *vp)
-{
-    char *name;
-    JSString *str;
-
-    if (file->isPipe) {
-        *vp = JSVAL_VOID;
-        return JS_TRUE;
-    }
-
-    name = js_fileBaseName(cx, file->path);
-    if (!name)
-        return JS_FALSE;
-
-    str = JS_NewString(cx, name, strlen(name));
-    if (!str) {
-        JS_free(cx, name);
-        return JS_FALSE;
-    }
-
-    *vp = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-/* ------------------------------ File object methods ---------------------------- */
-static JSBool
-file_open(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSString	*strmode, *strtype;
-    char        *ctype, *mode;
-    int32       mask, type;
-    int         len;
-
-    mode = NULL;
-
-    SECURITY_CHECK(cx, NULL, "open", file);
-
-    /* A native file that is already open */
-    if(file->isOpen && file->isNative) {
-        JS_ReportWarning(cx, "Native file %s is already open, proceeding",
-                         file->path);
-        goto good;
-    }
-
-    /* Close before proceeding */
-    if (file->isOpen) {
-        JS_ReportWarning(cx, "File %s is already open, we will close it and "
-                         "reopen, proceeding", file->path);
-        if(!file_close(cx, obj, 0, NULL, rval))
-            goto out;
-    }
-
-    if (js_isDirectory(cx, file)) {
-        JS_ReportWarning(cx, "%s seems to be a directory, there is no point in "
-                         "trying to open it, proceeding", file->path);
-        goto good;
-    }
-
-    /* Path must be defined at this point */
-    len = strlen(file->path);
-
-    /* Mode */
-    if (argc >= 1) {
-        strmode = JS_ValueToString(cx, argv[0]);
-        if (!strmode) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_FIRST_ARGUMENT_OPEN_NOT_STRING_ERROR,
-                                 argv[0]);
-            goto out;
-        }
-        mode = JS_strdup(cx, JS_GetStringBytes(strmode));
-    } else {
-        if(file->path[0]==PIPE_SYMBOL) {
-            /* pipe default mode */
-            mode = JS_strdup(cx, "read");
-        } else if(file->path[len-1]==PIPE_SYMBOL) {
-            /* pipe default mode */
-            mode = JS_strdup(cx, "write");
-        } else {
-            /* non-destructive, permissive defaults. */
-            mode = JS_strdup(cx, "readWrite,append,create");
-        }
-    }
-
-    /* Process the mode */
-    mask = 0;
-    /* TODO: this is pretty ugly, we walk thru the string too many times */
-    mask |= js_FileHasOption(cx, mode, "read")     ? PR_RDONLY       :   0;
-    mask |= js_FileHasOption(cx, mode, "write")    ? PR_WRONLY       :   0;
-    mask |= js_FileHasOption(cx, mode, "readWrite")? PR_RDWR         :   0;
-    mask |= js_FileHasOption(cx, mode, "append")   ? PR_APPEND       :   0;
-    mask |= js_FileHasOption(cx, mode, "create")   ? PR_CREATE_FILE  :   0;
-    mask |= js_FileHasOption(cx, mode, "replace")  ? PR_TRUNCATE     :   0;
-
-    if (mask & PR_RDWR)
-        mask |= (PR_RDONLY | PR_WRONLY);
-    if ((mask & PR_RDONLY) && (mask & PR_WRONLY))
-        mask |= PR_RDWR;
-
-    file->hasAutoflush |= js_FileHasOption(cx, mode, "autoflush");
-
-    /* Type */
-    if (argc > 1) {
-        strtype = JS_ValueToString(cx, argv[1]);
-        if (!strtype) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                JSFILEMSG_SECOND_ARGUMENT_OPEN_NOT_STRING_ERROR,
-                                 argv[1]);
-            goto out;
-        }
-        ctype = JS_GetStringBytes(strtype);
-
-        if(!strcmp(ctype, utfstring)) {
-            type = UTF8;
-        } else if (!strcmp(ctype, unicodestring)) {
-            type = UCS2;
-        } else {
-            if (strcmp(ctype, asciistring)) {
-                JS_ReportWarning(cx, "File type %s is not supported, using "
-                                 "'text' instead, proceeding", ctype);
-            }
-            type = ASCII;
-        }
-    } else {
-        type = ASCII;
-    }
-
-    /* Save the relevant fields */
-    file->type = type;
-    file->mode = mask;
-    file->nativehandle = NULL;
-    file->hasRandomAccess = (type != UTF8);
-
-    /*
-     * Deal with pipes here. We can't use NSPR for pipes, so we have to use
-     * POPEN.
-     */
-    if (file->path[0]==PIPE_SYMBOL || file->path[len-1]==PIPE_SYMBOL) {
-        if (file->path[0] == PIPE_SYMBOL && file->path[len-1] == PIPE_SYMBOL) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_BIDIRECTIONAL_PIPE_NOT_SUPPORTED);
-            goto out;
-        } else {
-            int i = 0;
-            char pipemode[3];
-            SECURITY_CHECK(cx, NULL, "pipe_open", file);
-
-            if(file->path[0] == PIPE_SYMBOL){
-                if(mask & (PR_WRONLY | PR_APPEND | PR_CREATE_FILE | PR_TRUNCATE)){
-                    JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                   JSFILEMSG_OPEN_MODE_NOT_SUPPORTED_WITH_PIPES,
-                                         mode, file->path);
-                    goto out;
-                }
-                /* open(SPOOLER, "| cat -v | lpr -h 2>/dev/null") -- pipe for writing */
-                pipemode[i++] = 'r';
-#ifndef XP_UNIX
-                pipemode[i++] = file->type==UTF8 ? 'b' : 't';
-#endif
-                pipemode[i++] = '\0';
-                file->nativehandle = POPEN(&file->path[1], pipemode);
-            } else if(file->path[len-1] == PIPE_SYMBOL) {
-                char *command = JS_malloc(cx, len);
-
-                strncpy(command, file->path, len-1);
-                command[len-1] = '\0';
-                /* open(STATUS, "netstat -an 2>&1 |") */
-                pipemode[i++] = 'w';
-#ifndef XP_UNIX
-                pipemode[i++] = file->type==UTF8 ? 'b' : 't';
-#endif
-                pipemode[i++] = '\0';
-                file->nativehandle = POPEN(command, pipemode);
-                JS_free(cx, command);
-            }
-            /* set the flags */
-            file->isNative = JS_TRUE;
-            file->isPipe  = JS_TRUE;
-            file->hasRandomAccess = JS_FALSE;
-        }
-    } else {
-        /* TODO: what about the permissions?? Java ignores the problem... */
-#ifdef OSSP_HACK
-        {
-            int my_fd;
-            int my_fd_mode = 0;
-            char *my_fp_mode = "";
-            my_fd_mode |= ((mask & PR_RDONLY)      ? O_RDONLY : 0);
-            my_fd_mode |= ((mask & PR_WRONLY)      ? O_WRONLY : 0);
-            my_fd_mode |= ((mask & PR_RDWR)        ? O_RDWR   : 0);
-            my_fd_mode |= ((mask & PR_APPEND)      ? O_APPEND : 0);
-            my_fd_mode |= ((mask & PR_CREATE_FILE) ? O_CREAT  : 0);
-            my_fd_mode |= ((mask & PR_TRUNCATE)    ? O_TRUNC  : 0);
-            if      ((mask & PR_RDWR))                       my_fp_mode = "r+";
-            else if ((mask & PR_RDONLY))                     my_fp_mode = "r";
-            else if ((mask & PR_WRONLY))                     my_fp_mode = "w";
-            else if ((mask & PR_APPEND) && (mask & PR_RDWR)) my_fp_mode = "a+";
-            else if ((mask & PR_APPEND))                     my_fp_mode = "a";
-            else                                             my_fp_mode = "rw";
-            if ((my_fd = open(file->path, my_fd_mode, 0644)) != -1)
-                file->handle = fdopen(my_fd, my_fp_mode);
-        }
-#else
-        file->handle = PR_Open(file->path, mask, 0644);
-#endif
-    }
-
-    js_ResetBuffers(file);
-    JS_free(cx, mode);
-    mode = NULL;
-
-    /* Set the open flag and return result */
-    if (file->handle == NULL && file->nativehandle == NULL) {
-        file->isOpen = JS_FALSE;
-
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_OP_FAILED, "open", file->path);
-        goto out;
-    }
-
-good:
-    file->isOpen = JS_TRUE;
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-
-out:
-    if(mode)
-        JS_free(cx, mode);
-    return JS_FALSE;
-}
-
-static JSBool
-file_close(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile  *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    SECURITY_CHECK(cx, NULL, "close", file);
-
-    if(!file->isOpen){
-        JS_ReportWarning(cx, "File %s is not open, can't close it, proceeding",
-            file->path);
-        goto out;
-    }
-
-    if(!file->isPipe){
-        if(file->isNative){
-            JS_ReportWarning(cx, "Unable to close a native file, proceeding", file->path);
-            goto out;
-        }else{
-#ifdef OSSP_HACK
-            if (file->handle && fclose(file->handle) != 0) {
-#else
-            if(file->handle && PR_Close(file->handle)){
-#endif
-                JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                    JSFILEMSG_OP_FAILED, "close", file->path);
-
-                goto out;
-            }
-        }
-    }else{
-        if(PCLOSE(file->nativehandle)==-1){
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_OP_FAILED, "pclose", file->path);
-            goto out;
-        }
-    }
-
-    js_ResetAttributes(file);
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-
-out:
-    return JS_FALSE;
-}
-
-
-static JSBool
-file_remove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	JSFile  *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    SECURITY_CHECK(cx, NULL, "remove", file);
-    JSFILE_CHECK_NATIVE("remove");
-    JSFILE_CHECK_CLOSED("remove");
-
-#ifdef OSSP_HACK
-    if (remove(file->path) == 0) {
-#else
-    if ((js_isDirectory(cx, file) ?
-            PR_RmDir(file->path) : PR_Delete(file->path))==PR_SUCCESS) {
-#endif
-        js_ResetAttributes(file);
-        *rval = JSVAL_TRUE;
-        return JS_TRUE;
-    } else {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OP_FAILED, "remove", file->path);
-        goto out;
-    }
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-/* Raw PR-based function. No text processing. Just raw data copying. */
-static JSBool
-file_copyTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    char        *dest = NULL;
-#ifdef OSSP_HACK
-    FILE        *handle = NULL;
-#else
-    PRFileDesc  *handle = NULL;
-#endif
-    char        *buffer;
-    jsval		count, size;
-    JSBool      fileInitiallyOpen=JS_FALSE;
-
-    SECURITY_CHECK(cx, NULL, "copyTo", file);   /* may need a second argument!*/
-    JSFILE_CHECK_ONE_ARG("copyTo");
-    JSFILE_CHECK_NATIVE("copyTo");
-    /* remeber the state */
-    fileInitiallyOpen = file->isOpen;
-    JSFILE_CHECK_READ;
-
-    dest = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-    /* make sure we are not reading a file open for writing */
-    if (file->isOpen && !js_canRead(cx, file)) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_CANNOT_COPY_FILE_OPEN_FOR_WRITING_ERROR, file->path);
-        goto out;
-    }
-
-    if (file->handle==NULL){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OP_FAILED, "open", file->path);
-        goto out;
-    }
-
-#ifdef OSSP_HACK
-    {
-        int my_fd;
-        if ((my_fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC, 0644)) != -1)
-            handle = fdopen(my_fd, "w");
-    }
-#else
-    handle = PR_Open(dest, PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE, 0644);
-#endif
-
-    if(!handle){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OP_FAILED, "open", dest);
-        goto out;
-    }
-
-    if ((size=js_size(cx, file))==JSVAL_VOID) {
-        goto out;
-    }
-
-    buffer = JS_malloc(cx, size);
-
-#ifdef OSSP_HACK
-    count = INT_TO_JSVAL((int)fread(buffer, 1, (size_t)size, file->handle));
-#else
-    count = INT_TO_JSVAL(PR_Read(file->handle, buffer, size));
-#endif
-
-    /* reading panic */
-    if (count!=size) {
-        JS_free(cx, buffer);
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-              JSFILEMSG_COPY_READ_ERROR, file->path);
-        goto out;
-    }
-
-#ifdef OSSP_HACK
-    count = INT_TO_JSVAL((int)fwrite(buffer, 1, (size_t)JSVAL_TO_INT(size), handle));
-#else
-    count = INT_TO_JSVAL(PR_Write(handle, buffer, JSVAL_TO_INT(size)));
-#endif
-
-    /* writing panic */
-    if (count!=size) {
-        JS_free(cx, buffer);
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-              JSFILEMSG_COPY_WRITE_ERROR, file->path);
-        goto out;
-    }
-
-    JS_free(cx, buffer);
-
-	if(!fileInitiallyOpen){
-		if(!file_close(cx, obj, 0, NULL, rval)) goto out;
-	}
-
-#ifdef OSSP_HACK
-    if (fclose(handle) != 0) {
-#else
-    if(PR_Close(handle)!=PR_SUCCESS){
-#endif
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-              JSFILEMSG_OP_FAILED, "close", dest);
-        goto out;
-    }
-
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-out:
-    if(file->isOpen && !fileInitiallyOpen){
-#ifdef OSSP_HACK
-        if (fclose(file->handle) != 0) {
-#else
-        if(PR_Close(file->handle)!=PR_SUCCESS){
-#endif
-            JS_ReportWarning(cx, "Can't close %s, proceeding", file->path);
-        }
-    }
-
-#ifdef OSSP_HACK
-    if (handle && fclose(handle) != 0) {
-#else
-    if(handle && PR_Close(handle)!=PR_SUCCESS){
-#endif
-        JS_ReportWarning(cx, "Can't close %s, proceeding", dest);
-    }
-
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_renameTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile  *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    char    *dest;
-
-    SECURITY_CHECK(cx, NULL, "renameTo", file); /* may need a second argument!*/
-    JSFILE_CHECK_ONE_ARG("renameTo");
-    JSFILE_CHECK_NATIVE("renameTo");
-    JSFILE_CHECK_CLOSED("renameTo");
-
-    dest = RESOLVE_PATH(cx, JS_GetStringBytes(JS_ValueToString(cx, argv[0])));
-
-#ifdef OSSP_HACK
-    if (rename(file->path, dest) == 0){
-#else
-    if (PR_Rename(file->path, dest)==PR_SUCCESS){
-#endif
-        /* copy the new filename */
-        JS_free(cx, file->path);
-        file->path = dest;
-        *rval = JSVAL_TRUE;
-        return JS_TRUE;
-    }else{
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_RENAME_FAILED, file->path, dest);
-        goto out;
-    }
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_flush(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    SECURITY_CHECK(cx, NULL, "flush", file);
-    JSFILE_CHECK_NATIVE("flush");
-    JSFILE_CHECK_OPEN("flush");
-
-#ifdef OSSP_HACK
-    if (fflush(file->handle) == 0){
-#else
-    if (PR_Sync(file->handle)==PR_SUCCESS){
-#endif
-      *rval = JSVAL_TRUE;
-      return JS_TRUE;
-    }else{
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-           JSFILEMSG_OP_FAILED, "flush", file->path);
-       goto out;
-    }
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_write(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSString    *str;
-    int32       count;
-    uintN       i;
-
-    SECURITY_CHECK(cx, NULL, "write", file);
-    JSFILE_CHECK_WRITE;
-
-    for (i = 0; i<argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        count = js_FileWrite(cx, file, JS_GetStringChars(str),
-            JS_GetStringLength(str), file->type);
-        if (count==-1){
-          *rval = JSVAL_FALSE;
-          return JS_FALSE;
-        }
-    }
-
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_writeln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSString    *str;
-
-    SECURITY_CHECK(cx, NULL, "writeln", file);
-    JSFILE_CHECK_WRITE;
-
-    /* don't report an error here */
-    if(!file_write(cx, obj, argc, argv, rval))  return JS_FALSE;
-    /* don't do security here -- we passed the check in file_write */
-    str = JS_NewStringCopyZ(cx, "\n");
-
-    if (js_FileWrite(cx, file, JS_GetStringChars(str), JS_GetStringLength(str),
-            file->type)==-1){
-        *rval = JSVAL_FALSE;
-        return JS_FALSE;
-    }
-
-    /* eol causes flush if hasAutoflush is turned on */
-    if (file->hasAutoflush)
-        file_flush(cx, obj, 0, NULL, rval);
-
-    *rval =  JSVAL_TRUE;
-    return JS_TRUE;
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_writeAll(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    jsuint      i;
-    jsuint      limit;
-    JSObject    *array;
-    JSObject    *elem;
-    jsval       elemval;
-
-    SECURITY_CHECK(cx, NULL, "writeAll", file);
-    JSFILE_CHECK_ONE_ARG("writeAll");
-    JSFILE_CHECK_WRITE;
-
-    if (!JS_IsArrayObject(cx, JSVAL_TO_OBJECT(argv[0]))) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_FIRST_ARGUMENT_WRITEALL_NOT_ARRAY_ERROR);
-        goto out;
-    }
-
-    array = JSVAL_TO_OBJECT(argv[0]);
-
-    JS_GetArrayLength(cx, array, &limit);
-
-    for (i = 0; i<limit; i++) {
-        if (!JS_GetElement(cx, array, i, &elemval))  return JS_FALSE;
-        elem = JSVAL_TO_OBJECT(elemval);
-        file_writeln(cx, obj, 1, &elemval, rval);
-    }
-
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_read(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSString    *str;
-    int32       want, count;
-    jschar      *buf;
-
-    SECURITY_CHECK(cx, NULL, "read", file);
-    JSFILE_CHECK_ONE_ARG("read");
-    JSFILE_CHECK_READ;
-
-    if (!JS_ValueToInt32(cx, argv[0], &want)){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_NUMBER, "read", argv[0]);
-        goto out;
-    }
-
-    /* want = (want>262144)?262144:want; * arbitrary size limitation */
-
-    buf = JS_malloc(cx, want*sizeof buf[0]);
-    if (!buf)  goto out;
-
-    count =  js_FileRead(cx, file, buf, want, file->type);
-    if (count>0) {
-        str = JS_NewUCStringCopyN(cx, buf, count);
-        *rval = STRING_TO_JSVAL(str);
-        JS_free(cx, buf);
-        return JS_TRUE;
-    } else {
-        JS_free(cx, buf);
-        goto out;
-    }
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSString    *str;
-    jschar      *buf = NULL, *tmp;
-    int32       offset, read;
-    intN        room;
-    jschar      data, data2;
-
-    SECURITY_CHECK(cx, NULL, "readln", file);
-    JSFILE_CHECK_READ;
-
-    buf = JS_malloc(cx, MAX_LINE_LENGTH * sizeof data);
-    if (!buf)
-        return JS_FALSE;
-
-    room = MAX_LINE_LENGTH - 1;
-    offset = 0;
-
-    for (;;) {
-        read = js_FileRead(cx, file, &data, 1, file->type);
-        if (read < 0)
-            goto out;
-        if (read == 0)
-            goto eof;
-
-        switch (data) {
-          case '\r':
-            read = js_FileRead(cx, file, &data2, 1, file->type);
-            if (read < 0)
-                goto out;
-
-            if (read == 1 && data2 != '\n') {
-                /* We read one char too far.  Buffer it. */
-                file->charBuffer = data2;
-                file->charBufferUsed = JS_TRUE;
-            }
-
-            /* Fall through. */
-          case '\n':
-            goto done;
-
-          default:
-            if (--room < 0) {
-                tmp = JS_realloc(cx, buf,
-                                 (offset + MAX_LINE_LENGTH) * sizeof data);
-                if (!tmp)
-                    goto out;
-
-                room = MAX_LINE_LENGTH - 1;
-                buf = tmp;
-            }
-
-            buf[offset++] = data;
-            break;
-        }
-    }
-
-eof:
-    if (offset == 0) {
-        *rval = JSVAL_NULL;
-        return JS_TRUE;
-    }
-
-done:
-    buf[offset] = 0;
-    tmp = JS_realloc(cx, buf, (offset + 1) * sizeof data);
-    if (!tmp)
-        goto out;
-
-    str = JS_NewUCString(cx, tmp, offset);
-    if (!str)
-        goto out;
-
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-
-out:
-    if (buf)
-        JS_free(cx, buf);
-
-    return JS_FALSE;
-}
-
-static JSBool
-file_readAll(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSObject    *array;
-    jsint       len;
-    jsval       line;
-    JSBool      lineok = JS_FALSE;
-
-    SECURITY_CHECK(cx, NULL, "readAll", file);
-    JSFILE_CHECK_READ;
-
-    array = JS_NewArrayObject(cx, 0, NULL);
-    if (!array)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(array);
-
-    len = 0;
-
-    lineok = file_readln(cx, obj, 0, NULL, &line);
-    while (lineok && !JSVAL_IS_NULL(line)) {
-        JS_SetElement(cx, array, len++, &line);
-        lineok = file_readln(cx, obj, 0, NULL, &line);
-    }
-
-out:
-    return lineok;
-}
-
-static JSBool
-file_seek(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    int32       toskip;
-    int32       pos;
-
-    SECURITY_CHECK(cx, NULL, "seek", file);
-    JSFILE_CHECK_ONE_ARG("seek");
-    JSFILE_CHECK_NATIVE("seek");
-    JSFILE_CHECK_READ;
-
-    if (!JS_ValueToInt32(cx, argv[0], &toskip)){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_NUMBER, "seek", argv[0]);
-        goto out;
-    }
-
-    if(!file->hasRandomAccess){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_NO_RANDOM_ACCESS, file->path);
-       goto out;
-    }
-
-    if(js_isDirectory(cx, file)){
-        JS_ReportWarning(cx,"Seek on directories is not supported, proceeding");
-        goto out;
-    }
-
-    pos = js_FileSeek(cx, file, toskip, file->type);
-
-    if (pos!=-1) {
-        *rval = INT_TO_JSVAL(pos);
-        return JS_TRUE;
-    }
-out:
-    *rval = JSVAL_VOID;
-    return JS_FALSE;
-}
-
-static JSBool
-file_list(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-#ifdef OSSP_HACK
-    DIR           *dir;
-    struct dirent *entry;
-#else
-    PRDir       *dir;
-    PRDirEntry  *entry;
-#endif
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    JSObject    *array;
-    JSObject    *eachFile;
-    jsint       len;
-    jsval       v;
-    JSRegExp    *re = NULL;
-    JSFunction  *func = NULL;
-    JSString    *str;
-    jsval       args[1];
-    char        *filePath;
-
-    SECURITY_CHECK(cx, NULL, "list", file);
-    JSFILE_CHECK_NATIVE("list");
-
-    if (argc==1) {
-        if (JSVAL_IS_REGEXP(cx, argv[0])) {
-            re = JS_GetPrivate(cx, JSVAL_TO_OBJECT(argv[0]));
-        }else
-        if (JSVAL_IS_FUNCTION(cx, argv[0])) {
-            func = JS_GetPrivate(cx, JSVAL_TO_OBJECT(argv[0]));
-        }else{
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_FUNCTION_OR_REGEX, argv[0]);
-            goto out;
-        }
-    }
-
-    if (!js_isDirectory(cx, file)) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_CANNOT_DO_LIST_ON_A_FILE, file->path);
-        goto out;
-    }
-
-#ifdef OSSP_HACK
-    dir = opendir(file->path);
-#else
-    dir = PR_OpenDir(file->path);
-#endif
-    if(!dir){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OP_FAILED, "open", file->path);
-        goto out;
-    }
-
-    /* create JSArray here... */
-    array = JS_NewArrayObject(cx, 0, NULL);
-    len = 0;
-
-#ifdef OSSP_HACK
-    while ((entry = readdir(dir))!=NULL) {
-#else
-    while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH))!=NULL) {
-#endif
-#ifdef OSSP_HACK
-        if (   strcmp(entry->d_name, ".")  == 0
-            || strcmp(entry->d_name, "..") == 0)
-            continue;
-#endif
-        /* first, check if we have a regexp */
-        if (re!=NULL) {
-            size_t index = 0;
-
-#ifdef OSSP_HACK
-            str = JS_NewStringCopyZ(cx, entry->d_name);
-#else
-            str = JS_NewStringCopyZ(cx, entry->name);
-#endif
-            if(!js_ExecuteRegExp(cx, re, str, &index, JS_TRUE, &v)){
-                /* don't report anything here */
-                goto out;
-            }
-            /* not matched! */
-            if (JSVAL_IS_NULL(v)) {
-                continue;
-            }
-        }else
-        if (func!=NULL) {
-#ifdef OSSP_HACK
-            str = JS_NewStringCopyZ(cx, entry->d_name);
-#else
-            str = JS_NewStringCopyZ(cx, entry->name);
-#endif
-            args[0] = STRING_TO_JSVAL(str);
-            if(!JS_CallFunction(cx, obj, func, 1, args, &v)){
-                goto out;
-            }
-
-            if (v==JSVAL_FALSE) {
-                continue;
-            }
-        }
-
-#ifdef OSSP_HACK
-        filePath = js_combinePath(cx, file->path, (char*)entry->d_name);
-#else
-        filePath = js_combinePath(cx, file->path, (char*)entry->name);
-#endif
-
-        eachFile = js_NewFileObject(cx, filePath);
-        JS_free(cx, filePath);
-        if (!eachFile){
-            JS_ReportWarning(cx, "File %s cannot be retrieved", filePath);
-            continue;
-        }
-        v = OBJECT_TO_JSVAL(eachFile);
-        JS_SetElement(cx, array, len, &v);
-#ifdef OSSP_HACK
-        JS_SetProperty(cx, array, entry->d_name, &v);
-#else
-        JS_SetProperty(cx, array, entry->name, &v);
-#endif
-        len++;
-    }
-
-#ifdef OSSP_HACK
-    if (closedir(dir) != 0) {
-#else
-    if(PR_CloseDir(dir)!=PR_SUCCESS){
-#endif
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OP_FAILED, "close", file->path);
-        goto out;
-    }
-    *rval = OBJECT_TO_JSVAL(array);
-    return JS_TRUE;
-out:
-    *rval = JSVAL_NULL;
-    return JS_FALSE;
-}
-
-static JSBool
-file_mkdir(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    SECURITY_CHECK(cx, NULL, "mkdir", file);
-    JSFILE_CHECK_ONE_ARG("mkdir");
-    JSFILE_CHECK_NATIVE("mkdir");
-
-    /* if the current file is not a directory, find out the directory name */
-    if (!js_isDirectory(cx, file)) {
-        char        *dir = js_fileDirectoryName(cx, file->path);
-        JSObject    *dirObj = js_NewFileObject(cx, dir);
-
-        JS_free(cx, dir);
-
-        /* call file_mkdir with the right set of parameters if needed */
-        if (file_mkdir(cx, dirObj, argc, argv, rval))
-			return JS_TRUE;
-		else
-            goto out;
-    }else{
-        char *dirName = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-        char *fullName;
-
-        fullName = js_combinePath(cx, file->path, dirName);
-#ifdef OSSP_HACK
-        if (mkdir(fullName, 0755) == 0) {
-#else
-        if (PR_MkDir(fullName, 0755)==PR_SUCCESS){
-#endif
-            *rval = JSVAL_TRUE;
-            JS_free(cx, fullName);
-            return JS_TRUE;
-        }else{
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_OP_FAILED, "mkdir", fullName);
-            JS_free(cx, fullName);
-            goto out;
-        }
-    }
-out:
-    *rval = JSVAL_FALSE;
-    return JS_FALSE;
-}
-
-static JSBool
-file_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval*rval)
-{
-    JSFile *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-#ifdef OSSP_HACK
-    JSString *str;
-
-    if ((str = JS_NewStringCopyZ(cx, file->path)) == NULL)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-#else
-    *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, file->path));
-#endif
-    return JS_TRUE;
-}
-
-static JSBool
-file_toURL(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSFile *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    char url[MAX_PATH_LENGTH];
-    jschar *urlChars;
-    size_t len;
-#ifdef OSSP_HACK
-    JSString *str;
-#endif
-
-	JSFILE_CHECK_NATIVE("toURL");
-
-    sprintf(url, "file://%s", file->path);
-    /* TODO: js_escape in jsstr.h may go away at some point */
-
-#ifdef OSSP_HACK /* BUGFIX */
-    len = strlen(url);
-    if ((urlChars = js_InflateString(cx, url, &len)) == NULL)
-        return JS_FALSE;
-    if ((str = js_NewString(cx, urlChars, len, 0)) == NULL) {
-        JS_free(cx, urlChars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-#else
-	len = strlen(url);
-    urlChars = js_InflateString(cx, url, &len);
-    if (urlChars == NULL) return JS_FALSE;
-    *rval = STRING_TO_JSVAL(js_NewString(cx, urlChars, strlen(url), 0));
-#endif
-    if (!js_str_escape(cx, obj, 0, rval, rval)) return JS_FALSE;
-
-    return JS_TRUE;
-out:
-    *rval = JSVAL_VOID;
-    return JS_FALSE;
-}
-
-
-static void
-file_finalize(JSContext *cx, JSObject *obj)
-{
-    JSFile *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    if(file) {
-        /* Close the file before exiting. */
-        if(file->isOpen && !file->isNative) {
-            jsval vp;
-            file_close(cx, obj, 0, NULL, &vp);
-        }
-
-        if (file->path)
-            JS_free(cx, file->path);
-
-        JS_free(cx, file);
-    }
-}
-
-/*
-    Allocates memory for the file object, sets fields to defaults.
-*/
-static JSFile*
-file_init(JSContext *cx, JSObject *obj, char *bytes)
-{
-    JSFile *file;
-
-    file = JS_malloc(cx, sizeof *file);
-    if (!file)
-        return NULL;
-    memset(file, 0 , sizeof *file);
-
-    js_ResetAttributes(file);
-
-    file->path = RESOLVE_PATH(cx, bytes);
-
-    if (!JS_SetPrivate(cx, obj, file)) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                             JSFILEMSG_CANNOT_SET_PRIVATE_FILE, file->path);
-        JS_free(cx, file);
-        return NULL;
-    }
-
-    return file;
-}
-
-/* Returns a JSObject. This function is globally visible */
-JS_PUBLIC_API(JSObject*)
-js_NewFileObject(JSContext *cx, char *filename)
-{
-    JSObject    *obj;
-    JSFile      *file;
-
-    obj = JS_NewObject(cx, &file_class, NULL, NULL);
-    if (!obj){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OBJECT_CREATION_FAILED, "js_NewFileObject");
-        return NULL;
-    }
-    file = file_init(cx, obj, filename);
-    if(!file) return NULL;
-    return obj;
-}
-
-/* Internal function, used for cases which NSPR file support doesn't cover */
-#ifdef OSSP_HACK /* CLEANUP */
-static
-#endif
-JSObject*
-js_NewFileObjectFromFILE(JSContext *cx, FILE *nativehandle, char *filename,
-    int32 mode, JSBool open, JSBool randomAccess)
-{
-    JSObject *obj;
-    JSFile   *file;
-
-    obj = JS_NewObject(cx, &file_class, NULL, NULL);
-    if (!obj){
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_OBJECT_CREATION_FAILED, "js_NewFileObjectFromFILE");
-        return NULL;
-    }
-    file = file_init(cx, obj, filename);
-    if(!file) return NULL;
-
-    file->nativehandle = nativehandle;
-
-    /* free result of RESOLVE_PATH from file_init. */
-    JS_ASSERT(file->path != NULL);
-    JS_free(cx, file->path);
-
-    file->path = strdup(filename);
-    file->isOpen = open;
-    file->mode = mode;
-    file->hasRandomAccess = randomAccess;
-    file->isNative = JS_TRUE;
-    return obj;
-}
-
-/*
-    Real file constructor that is called from JavaScript.
-    Basically, does error processing and calls file_init.
-*/
-static JSBool
-file_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    JSString *str;
-    JSFile   *file;
-
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        /* Replace obj with a new File object. */
-        obj = JS_NewObject(cx, &file_class, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-    }
-
-    str = (argc == 0) 
-          ? JS_InternString(cx, "")
-          : JS_ValueToString(cx, argv[0]);
-
-    if (!str) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                         JSFILEMSG_FIRST_ARGUMENT_CONSTRUCTOR_NOT_STRING_ERROR,
-                             argv[0]);
-        return JS_FALSE;
-    }
-
-    file = file_init(cx, obj, JS_GetStringBytes(str));
-    if (!file)
-        return JS_FALSE;
-
-    SECURITY_CHECK(cx, NULL, "constructor", file);
-
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/* -------------------- File methods and properties ------------------------- */
-static JSFunctionSpec file_functions[] = {
-    { "open",           file_open, 0},
-    { "close",          file_close, 0},
-    { "remove",         file_remove, 0},
-    { "copyTo",         file_copyTo, 0},
-    { "renameTo",       file_renameTo, 0},
-    { "flush",          file_flush, 0},
-    { "seek",           file_seek, 0},
-    { "read",           file_read, 0},
-    { "readln",         file_readln, 0},
-    { "readAll",        file_readAll, 0},
-    { "write",          file_write, 0},
-    { "writeln",        file_writeln, 0},
-    { "writeAll",       file_writeAll, 0},
-    { "list",           file_list, 0},
-    { "mkdir",          file_mkdir, 0},
-    { "toString",       file_toString, 0},
-    { "toURL",          file_toURL, 0},
-    {0}
-};
-
-enum file_tinyid {
-    FILE_LENGTH             = -2,
-    FILE_PARENT             = -3,
-    FILE_PATH               = -4,
-    FILE_NAME               = -5,
-    FILE_ISDIR              = -6,
-    FILE_ISFILE             = -7,
-    FILE_EXISTS             = -8,
-    FILE_CANREAD            = -9,
-    FILE_CANWRITE           = -10,
-    FILE_OPEN               = -11,
-    FILE_TYPE               = -12,
-    FILE_MODE               = -13,
-    FILE_CREATED            = -14,
-    FILE_MODIFIED           = -15,
-    FILE_SIZE               = -16,
-    FILE_RANDOMACCESS       = -17,
-    FILE_POSITION           = -18,
-    FILE_APPEND             = -19,
-    FILE_REPLACE            = -20,
-    FILE_AUTOFLUSH          = -21,
-#ifdef OSSP_HACK /* BUGFIX */
-    FILE_ISNATIVE           = -22
-#else
-    FILE_ISNATIVE           = -22,
-#endif
-};
-
-static JSPropertySpec file_props[] = {
-   {"length",          FILE_LENGTH,        JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"parent",          FILE_PARENT,        JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"path",            FILE_PATH,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"name",            FILE_NAME,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"isDirectory",     FILE_ISDIR,         JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"isFile",          FILE_ISFILE,        JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"exists",          FILE_EXISTS,        JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"canRead",         FILE_CANREAD,       JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"canWrite",        FILE_CANWRITE,      JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"canAppend",       FILE_APPEND,        JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"canReplace",      FILE_REPLACE,       JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"isOpen",          FILE_OPEN,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"type",            FILE_TYPE,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"mode",            FILE_MODE,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"creationTime",    FILE_CREATED,       JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"lastModified",    FILE_MODIFIED,      JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"size",            FILE_SIZE,          JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"hasRandomAccess", FILE_RANDOMACCESS,  JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"hasAutoFlush",    FILE_AUTOFLUSH,     JSPROP_ENUMERATE | JSPROP_READONLY },
-   {"position",        FILE_POSITION,      JSPROP_ENUMERATE },
-   {"isNative",        FILE_ISNATIVE,      JSPROP_ENUMERATE | JSPROP_READONLY },
-   {0}
-};
-
-/* ------------------------- Property getter/setter ------------------------- */
-static JSBool
-file_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSFile      *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    char        *bytes;
-    JSString    *str;
-    jsint       tiny;
-#ifdef OSSP_HACK
-    struct stat info;
-#else
-    PRFileInfo  info;
-#endif
-    JSBool      flag;
-#ifdef OSSP_HACK
-    struct tm   *tm;
-    time_t      t;
-#else
-    PRExplodedTime expandedTime;
-#endif
-
-    tiny = JSVAL_TO_INT(id);
-    if (!file)
-        return JS_TRUE;
-
-    switch (tiny) {
-    case FILE_PARENT:
-        SECURITY_CHECK(cx, NULL, "parent", file);
-        if (!js_parent(cx, file, vp))
-            return JS_FALSE;
-        break;
-    case FILE_PATH:
-        str = JS_NewStringCopyZ(cx, file->path);
-        if (!str)
-            return JS_FALSE;
-        *vp = STRING_TO_JSVAL(str);
-        break;
-    case FILE_NAME:
-        if (!js_name(cx, file, vp))
-            return JS_FALSE;
-        break;
-    case FILE_ISDIR:
-        SECURITY_CHECK(cx, NULL, "isDirectory", file);
-        *vp = BOOLEAN_TO_JSVAL(js_isDirectory(cx, file));
-        break;
-    case FILE_ISFILE:
-        SECURITY_CHECK(cx, NULL, "isFile", file);
-        *vp = BOOLEAN_TO_JSVAL(js_isFile(cx, file));
-        break;
-    case FILE_EXISTS:
-        SECURITY_CHECK(cx, NULL, "exists", file);
-        *vp = BOOLEAN_TO_JSVAL(js_exists(cx, file));
-        break;
-    case FILE_ISNATIVE:
-        SECURITY_CHECK(cx, NULL, "isNative", file);
-        *vp = BOOLEAN_TO_JSVAL(file->isNative);
-        break;
-    case FILE_CANREAD:
-        SECURITY_CHECK(cx, NULL, "canRead", file);
-        *vp = BOOLEAN_TO_JSVAL(js_canRead(cx, file));
-        break;
-    case FILE_CANWRITE:
-        SECURITY_CHECK(cx, NULL, "canWrite", file);
-        *vp = BOOLEAN_TO_JSVAL(js_canWrite(cx, file));
-        break;
-    case FILE_OPEN:
-        SECURITY_CHECK(cx, NULL, "isOpen", file);
-        *vp = BOOLEAN_TO_JSVAL(file->isOpen);
-        break;
-    case FILE_APPEND :
-        SECURITY_CHECK(cx, NULL, "canAppend", file);
-        JSFILE_CHECK_OPEN("canAppend");
-        *vp = BOOLEAN_TO_JSVAL(!file->isNative &&
-                (file->mode&PR_APPEND)==PR_APPEND);
-        break;
-    case FILE_REPLACE :
-        SECURITY_CHECK(cx, NULL, "canReplace", file);
-        JSFILE_CHECK_OPEN("canReplace");
-        *vp = BOOLEAN_TO_JSVAL(!file->isNative &&
-                (file->mode&PR_TRUNCATE)==PR_TRUNCATE);
-        break;
-    case FILE_AUTOFLUSH :
-        SECURITY_CHECK(cx, NULL, "hasAutoFlush", file);
-        JSFILE_CHECK_OPEN("hasAutoFlush");
-        *vp = BOOLEAN_TO_JSVAL(!file->isNative && file->hasAutoflush);
-        break;
-    case FILE_TYPE:
-        SECURITY_CHECK(cx, NULL, "type", file);
-        JSFILE_CHECK_OPEN("type");
-        if(js_isDirectory(cx, file)){
-            *vp = JSVAL_VOID;
-            break;
-        }
-
-        switch (file->type) {
-        case ASCII:
-            *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, asciistring));
-            break;
-        case UTF8:
-            *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, utfstring));
-            break;
-        case UCS2:
-            *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, unicodestring));
-            break;
-        default:
-            JS_ReportWarning(cx, "Unsupported file type %d, proceeding",
-                file->type);
-        }
-        break;
-    case FILE_MODE:
-        SECURITY_CHECK(cx, NULL, "mode", file);
-        JSFILE_CHECK_OPEN("mode");
-        bytes = JS_malloc(cx, MODE_SIZE);
-        bytes[0] = '\0';
-        flag = JS_FALSE;
-
-        if ((file->mode&PR_RDONLY)==PR_RDONLY) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "read");
-            flag = JS_TRUE;
-        }
-        if ((file->mode&PR_WRONLY)==PR_WRONLY) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "write");
-            flag = JS_TRUE;
-        }
-        if ((file->mode&PR_RDWR)==PR_RDWR) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "readWrite");
-            flag = JS_TRUE;
-        }
-        if ((file->mode&PR_APPEND)==PR_APPEND) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "append");
-            flag = JS_TRUE;
-        }
-        if ((file->mode&PR_CREATE_FILE)==PR_CREATE_FILE) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "create");
-            flag = JS_TRUE;
-        }
-        if ((file->mode&PR_TRUNCATE)==PR_TRUNCATE) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "replace");
-            flag = JS_TRUE;
-        }
-        if (file->hasAutoflush) {
-            if (flag) strcat(bytes, ",");
-            strcat(bytes, "hasAutoFlush");
-            flag = JS_TRUE;
-        }
-        *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, bytes));
-        JS_free(cx, bytes);
-        break;
-    case FILE_CREATED:
-        SECURITY_CHECK(cx, NULL, "creationTime", file);
-        JSFILE_CHECK_NATIVE("creationTime");
-#ifdef OSSP_HACK
-        if (file->isOpen
-            ? fstat(fileno(file->handle), &info) != 0
-            : stat(file->path, &info) != 0) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            goto out;
-        }
-
-#if defined(HAVE_STRUCT_STAT_ST_BIRTHTIME)
-        t = (time_t)(info.st_birthtime);
-#elif defined(HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC)
-        t = (time_t)(info.st_birthtimensec / (1000*1000*1000));
-#else
-        /* not really correct, but the only possible fallback on not
-           fully POSIX compliant platforms. */
-        t = (time_t)(info.st_ctime);
-#endif
-        tm = localtime(&t);
-        *vp = OBJECT_TO_JSVAL(js_NewDateObject(cx, tm->tm_year + 1900,
-                                    tm->tm_mon + 1,
-                                    tm->tm_mday,
-                                    tm->tm_hour,
-                                    tm->tm_min,
-                                    tm->tm_sec));
-#else
-        if(((file->isOpen)?
-                        PR_GetOpenFileInfo(file->handle, &info):
-                        PR_GetFileInfo(file->path, &info))!=PR_SUCCESS){
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            goto out;
-        }
-
-        PR_ExplodeTime(info.creationTime, PR_LocalTimeParameters,&expandedTime);
-        *vp = OBJECT_TO_JSVAL(js_NewDateObject(cx,  expandedTime.tm_year,
-                                    expandedTime.tm_month,
-                                    expandedTime.tm_mday,
-                                    expandedTime.tm_hour,
-                                    expandedTime.tm_min,
-                                    expandedTime.tm_sec));
-#endif
-        break;
-    case FILE_MODIFIED:
-        SECURITY_CHECK(cx, NULL, "lastModified", file);
-        JSFILE_CHECK_NATIVE("lastModified");
-#ifdef OSSP_HACK
-        if (file->isOpen
-            ? fstat(fileno(file->handle), &info) != 0
-            : stat(file->path, &info) != 0) {
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                                 JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            goto out;
-        }
-
-        t = (time_t)(info.st_mtime);
-        tm = localtime(&t);
-        *vp = OBJECT_TO_JSVAL(js_NewDateObject(cx, tm->tm_year + 1900,
-                                    tm->tm_mon + 1,
-                                    tm->tm_mday,
-                                    tm->tm_hour,
-                                    tm->tm_min,
-                                    tm->tm_sec));
-#else
-        if(((file->isOpen)?
-                        PR_GetOpenFileInfo(file->handle, &info):
-                        PR_GetFileInfo(file->path, &info))!=PR_SUCCESS){
-            JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                JSFILEMSG_CANNOT_ACCESS_FILE_STATUS, file->path);
-            goto out;
-        }
-
-        PR_ExplodeTime(info.modifyTime, PR_LocalTimeParameters, &expandedTime);
-        *vp = OBJECT_TO_JSVAL(js_NewDateObject(cx, expandedTime.tm_year,
-                                    expandedTime.tm_month,
-                                    expandedTime.tm_mday,
-                                    expandedTime.tm_hour,
-                                    expandedTime.tm_min,
-                                    expandedTime.tm_sec));
-#endif
-        break;
-    case FILE_SIZE:
-        SECURITY_CHECK(cx, NULL, "size", file);
-        *vp = js_size(cx, file);
-        break;
-    case FILE_LENGTH:
-        SECURITY_CHECK(cx, NULL, "length", file);
-        JSFILE_CHECK_NATIVE("length");
-
-        if (js_isDirectory(cx, file)) { /* XXX debug me */
-#ifdef OSSP_HACK
-            DIR           *dir;
-            struct dirent *entry;
-#else
-            PRDir       *dir;
-            PRDirEntry  *entry;
-#endif
-            jsint       count = 0;
-
-#ifdef OSSP_HACK
-            if(!(dir = opendir(file->path))){
-#else
-            if(!(dir = PR_OpenDir(file->path))){
-#endif
-                JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                    JSFILEMSG_CANNOT_OPEN_DIR, file->path);
-                goto out;
-            }
-
-#ifdef OSSP_HACK
-            while ((entry = readdir(dir))) {
-                if (   strcmp(entry->d_name, ".")  == 0
-                    || strcmp(entry->d_name, "..") == 0)
-                    continue;
-
-#else
-            while ((entry = PR_ReadDir(dir, PR_SKIP_BOTH))) {
-#endif
-                count++;
-            }
-
-#ifdef OSSP_HACK
-            if(closedir(dir) != 0){
-#else
-            if(!PR_CloseDir(dir)){
-#endif
-                JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                    JSFILEMSG_OP_FAILED, "close", file->path);
-
-                goto out;
-            }
-
-            *vp = INT_TO_JSVAL(count);
-            break;
-        }else{
-            /* return file size */
-            *vp = js_size(cx, file);
-        }
-        break;
-    case FILE_RANDOMACCESS:
-            SECURITY_CHECK(cx, NULL, "hasRandomAccess", file);
-            JSFILE_CHECK_OPEN("hasRandomAccess");
-            *vp = BOOLEAN_TO_JSVAL(file->hasRandomAccess);
-        break;
-    case FILE_POSITION:
-        SECURITY_CHECK(cx, NULL, "position", file);
-        JSFILE_CHECK_NATIVE("position");
-        JSFILE_CHECK_OPEN("position");
-
-        if(!file->hasRandomAccess){
-            JS_ReportWarning(cx, "File %s doesn't support random access, can't report the position, proceeding");
-            *vp = JSVAL_VOID;
-            break;
-        }
-
-        if (file->isOpen && js_isFile(cx, file)) {
-#ifdef OSSP_HACK
-            int pos = fseek(file->handle, 0, SEEK_CUR);
-#else
-            int pos = PR_Seek(file->handle, 0, PR_SEEK_CUR);
-#endif
-            if(pos!=-1){
-                *vp = INT_TO_JSVAL(pos);
-            }else{
-                JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                    JSFILEMSG_CANNOT_REPORT_POSITION, file->path);
-                goto out;
-            }
-        }else {
-            JS_ReportWarning(cx, "File %s is closed or not a plain file,"
-                " can't report position, proceeding");
-            goto out;
-        }
-        break;
-    default:
-        SECURITY_CHECK(cx, NULL, "file_access", file);
-
-        /* this is some other property -- try to use the dir["file"] syntax */
-        if (js_isDirectory(cx, file)) {
-#ifdef OSSP_HACK
-            DIR *dir = NULL;
-            struct dirent *entry = NULL;
-#else
-            PRDir *dir = NULL;
-            PRDirEntry *entry = NULL;
-#endif
-            char *prop_name;
-
-            str = JS_ValueToString(cx, id);
-            if (!str)
-                return JS_FALSE;
-
-            prop_name = JS_GetStringBytes(str);
-
-            /* no native files past this point */
-#ifdef OSSP_HACK
-            dir = opendir(file->path);
-#else
-            dir = PR_OpenDir(file->path);
-#endif
-            if(!dir) {
-                /* This is probably not a directory */
-                JS_ReportWarning(cx, "Can't open directory %s", file->path);
-                return JS_FALSE;
-            }
-
-#ifdef OSSP_HACK
-            while ((entry = readdir(dir)) != NULL) {
-                if (   strcmp(entry->d_name, ".")  == 0
-                    || strcmp(entry->d_name, "..") == 0)
-                    continue;
-                if (!strcmp(entry->d_name, prop_name)){
-#else
-            while ((entry = PR_ReadDir(dir, PR_SKIP_NONE)) != NULL) {
-                if (!strcmp(entry->name, prop_name)){
-#endif
-                    bytes = js_combinePath(cx, file->path, prop_name);
-                    *vp = OBJECT_TO_JSVAL(js_NewFileObject(cx, bytes));
-                    JS_free(cx, bytes);
-#ifdef OSSP_HACK /* BUGFIX */
-                    closedir(dir);
-#else
-                    PR_CloseDir(dir);
-#endif
-                    return JS_TRUE;
-                }
-            }
-#ifdef OSSP_HACK /* BUGFIX */
-            closedir(dir);
-#else
-            PR_CloseDir(dir);
-#endif
-        }
-    }
-    return JS_TRUE;
-
-out:
-    return JS_FALSE;
-}
-
-static JSBool
-file_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSFile  *file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-    jsint   slot;
-
-    if (JSVAL_IS_STRING(id)){
-        return JS_TRUE;
-    }
-
-    slot = JSVAL_TO_INT(id);
-
-    switch (slot) {
-    /* File.position  = 10 */
-    case FILE_POSITION:
-        SECURITY_CHECK(cx, NULL, "set_position", file);
-        JSFILE_CHECK_NATIVE("set_position");
-
-        if(!file->hasRandomAccess){
-            JS_ReportWarning(cx, "File %s doesn't support random access, can't "
-                "report the position, proceeding");
-            goto out;
-        }
-
-        if (file->isOpen && js_isFile(cx, file)) {
-            int32 pos;
-		    int32 offset;
-
-			if (!JS_ValueToInt32(cx, *vp, &offset)){
-				JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-					JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_NUMBER, "position", *vp);
-				goto out;
-			}
-
-#ifdef OSSP_HACK
-			pos = fseek(file->handle, offset, SEEK_SET);
-#else
-			pos = PR_Seek(file->handle, offset, PR_SEEK_SET);
-#endif
-
-            if(pos!=-1){
-                *vp = INT_TO_JSVAL(pos);
-            }else{
-                JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-                    JSFILEMSG_CANNOT_SET_POSITION, file->path);
-                goto out;
-            }
-        } else {
-            JS_ReportWarning(cx, "File %s is closed or not a file, can't set "
-                "position, proceeding", file->path);
-            goto out;
-        }
-    }
-
-    return JS_TRUE;
-out:
-    return JS_FALSE;
-}
-
-/*
-    File.currentDir = new File("D:\") or File.currentDir = "D:\"
-*/
-static JSBool
-file_currentDirSetter(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSFile   *file;
-
-    file = JS_GetInstancePrivate(cx, obj, &file_class, NULL);
-
-    /* Look at the rhs and extract a file object from it */
-    if (JSVAL_IS_OBJECT(*vp)) {
-        if (JS_InstanceOf(cx, obj, &file_class, NULL)) {
-            /* Braindamaged rhs -- just return the old value */
-            if (file && (!js_exists(cx, file) || !js_isDirectory(cx, file))) {
-                JS_GetProperty(cx, obj, CURRENTDIR_PROPERTY, vp);
-                return JS_FALSE;
-            } else {
-                chdir(file->path);
-                return JS_TRUE;
-            }
-        } else {
-            return JS_FALSE;
-        }
-    } else {
-        JSObject *rhsObject;
-        char     *path;
-
-        path      = JS_GetStringBytes(JS_ValueToString(cx, *vp));
-        rhsObject = js_NewFileObject(cx, path);
-        if (!rhsObject)
-            return JS_FALSE;
-
-        if (!file || !js_exists(cx, file) || !js_isDirectory(cx, file)){
-            JS_GetProperty(cx, obj, CURRENTDIR_PROPERTY, vp);
-        } else {
-            *vp = OBJECT_TO_JSVAL(rhsObject);
-            chdir(path);
-        }
-    }
-
-    return JS_TRUE;
-}
-
-/* Declare class */
-static JSClass file_class = {
-    FILE_CONSTRUCTOR, JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  file_getProperty,  file_setProperty,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,    file_finalize
-};
-
-/* -------------------- Functions exposed to the outside -------------------- */
-JS_PUBLIC_API(JSObject*)
-js_InitFileClass(JSContext *cx, JSObject* obj)
-{
-    JSObject *file, *ctor, *afile;
-    jsval    vp;
-    char     *currentdir;
-    char     separator[2];
-
-    file = JS_InitClass(cx, obj, NULL, &file_class, file_constructor, 1,
-        file_props, file_functions, NULL, NULL);
-    if (!file) {
-        JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
-            JSFILEMSG_INIT_FAILED);
-        return NULL;
-    }
-
-    ctor = JS_GetConstructor(cx, file);
-    if (!ctor)  return NULL;
-
-	/* Define CURRENTDIR property. We are doing this to get a
-	slash at the end of the current dir */
-    afile = js_NewFileObject(cx, CURRENT_DIR);
-    currentdir =  JS_malloc(cx, MAX_PATH_LENGTH);
-    currentdir =  getcwd(currentdir, MAX_PATH_LENGTH);
-    afile = js_NewFileObject(cx, currentdir);
-    JS_free(cx, currentdir);
-    vp = OBJECT_TO_JSVAL(afile);
-    JS_DefinePropertyWithTinyId(cx, ctor, CURRENTDIR_PROPERTY, 0, vp,
-                JS_PropertyStub, file_currentDirSetter,
-                JSPROP_ENUMERATE | JSPROP_READONLY );
-
-    /* Define input */
-    vp = OBJECT_TO_JSVAL(js_NewFileObjectFromFILE(cx, stdin,
-            STDINPUT_NAME, PR_RDONLY, JS_TRUE, JS_FALSE));
-    JS_SetProperty(cx, ctor, "input", &vp);
-
-    /* Define output */
-    vp = OBJECT_TO_JSVAL(js_NewFileObjectFromFILE(cx, stdout,
-            STDOUTPUT_NAME, PR_WRONLY, JS_TRUE, JS_FALSE));
-    JS_SetProperty(cx, ctor, "output", &vp);
-
-    /* Define error */
-    vp = OBJECT_TO_JSVAL(js_NewFileObjectFromFILE(cx, stderr,
-            STDERROR_NAME, PR_WRONLY, JS_TRUE, JS_FALSE));
-    JS_SetProperty(cx, ctor, "error", &vp);
-
-    separator[0] = FILESEPARATOR;
-    separator[1] = '\0';
-    vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, separator));
-    JS_DefinePropertyWithTinyId(cx, ctor, SEPARATOR_PROPERTY, 0, vp,
-                JS_PropertyStub, JS_PropertyStub,
-                JSPROP_ENUMERATE | JSPROP_READONLY );
-    return file;
-}
diff --git a/libs/js/src/jsfile.h b/libs/js/src/jsfile.h
deleted file mode 100644
index b7164e16f9..0000000000
--- a/libs/js/src/jsfile.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _jsfile_h__
-#define _jsfile_h__
-
-#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
-extern JS_PUBLIC_API(JSObject*)
-js_InitFileClass(JSContext *cx, JSObject* obj);
-
-extern JS_PUBLIC_API(JSObject*)
-js_NewFileObject(JSContext *cx, char *bytes);
-#endif /* JS_HAS_FILE_OBJECT */
-#endif /* _jsfile_h__ */
diff --git a/libs/js/src/jsfile.msg b/libs/js/src/jsfile.msg
deleted file mode 100644
index 137b35d874..0000000000
--- a/libs/js/src/jsfile.msg
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-        Error messages for jsfile.c. See js.msg for format specification.
-*/
-
-MSG_DEF(JSFILEMSG_NOT_AN_ERROR,                                    0, 0, JSEXN_NONE, "<Error #0 is reserved>")
-MSG_DEF(JSFILEMSG_FILE_CONSTRUCTOR_UNDEFINED_ERROR,                1, 0, JSEXN_NONE, "File constructor is undefined")
-MSG_DEF(JSFILEMSG_FILE_CURRENTDIR_UNDEFINED_ERROR,                 2, 0, JSEXN_NONE, "File.currentDir is undefined")
-MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_OPEN_NOT_STRING_ERROR,            3, 1, JSEXN_NONE, "The first argument {0} to file.open must be a string")
-MSG_DEF(JSFILEMSG_SECOND_ARGUMENT_OPEN_NOT_STRING_ERROR,           4, 0, JSEXN_NONE, "The second argument to file.open must be a string")
-MSG_DEF(JSFILEMSG_CANNOT_COPY_FILE_OPEN_FOR_WRITING_ERROR,         5, 1, JSEXN_NONE, "Cannot copy file {0} open for writing")
-MSG_DEF(JSFILEMSG_CANNOT_ACCESS_FILE_INFO_ERROR,                   6, 1, JSEXN_NONE, "Cannot access file information for {0}")
-MSG_DEF(JSFILEMSG_COPY_READ_ERROR,                                 7, 1, JSEXN_NONE, "An error occured while attempting to read a file {0} to copy")
-MSG_DEF(JSFILEMSG_COPY_WRITE_ERROR,                                8, 1, JSEXN_NONE, "An error occured while attempting to copy into file {0}")
-MSG_DEF(JSFILEMSG_EXPECTS_ONE_ARG_ERROR,                           9, 0, JSEXN_NONE, "Operation {0} expects one argument, not {1}")
-MSG_DEF(JSFILEMSG_CANNOT_FLUSH_CLOSE_FILE_ERROR,                  10, 1, JSEXN_NONE, "Cannot flush closed file {0}")
-MSG_DEF(JSFILEMSG_CANNOT_OPEN_WRITING_ERROR,                      11, 1, JSEXN_NONE, "Cannot open file {0} for writing")
-MSG_DEF(JSFILEMSG_WRITEALL_EXPECTS_ONE_ARG_ERROR,                 12, 0, JSEXN_NONE, "writeAll expects one argument")
-MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_WRITEALL_NOT_ARRAY_ERROR,        13, 0, JSEXN_NONE, "writeAll expects an array as an argument")
-MSG_DEF(JSFILEMSG_UNUSED0,                                        14, 0, JSEXN_NONE, "Unused error message slot")
-MSG_DEF(JSFILEMSG_CANNOT_OPEN_FILE_ERROR,                         15, 1, JSEXN_NONE, "Cannot open file {0}")
-MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_CONSTRUCTOR_NOT_STRING_ERROR,    16, 1, JSEXN_NONE, "The argument to the File constructor {0} must be a string")
-MSG_DEF(JSFILEMSG_BIDIRECTIONAL_PIPE_NOT_SUPPORTED,               17, 0, JSEXN_NONE, "Bidirectional pipes are not supported")
-MSG_DEF(JSFILEMSG_OPEN_MODE_NOT_SUPPORTED_WITH_PIPES,             18, 2, JSEXN_NONE, "The opening mode you have chosen {0} is not supported by the pipe you are trying to open: {1}")
-MSG_DEF(JSFILEMSG_OPEN_FAILED,                                    19, 1, JSEXN_NONE, "open on file {0} failed")
-MSG_DEF(JSFILEMSG_CLOSE_FAILED,                                   20, 1, JSEXN_NONE, "close on file {0} failed")
-MSG_DEF(JSFILEMSG_PCLOSE_FAILED,                                  21, 1, JSEXN_NONE, "pclose on file {0} failed")
-MSG_DEF(JSFILEMSG_REMOVE_FAILED,                                  22, 1, JSEXN_NONE, "remove on file {0} failed")
-MSG_DEF(JSFILEMSG_CANNOT_ACCESS_FILE_STATUS,                      23, 1, JSEXN_NONE, "Cannot access file status for {0}")
-MSG_DEF(JSFILEMSG_RENAME_FAILED,                                  24, 2, JSEXN_NONE, "Cannot rename {0} to {1}")
-MSG_DEF(JSFILEMSG_WRITE_FAILED,                                   25, 1, JSEXN_NONE, "Write failed on file {0}")
-MSG_DEF(JSFILEMSG_READ_FAILED,                                    26, 1, JSEXN_NONE, "Read failed on file {0}")
-MSG_DEF(JSFILEMSG_SKIP_FAILED,                                    27, 1, JSEXN_NONE, "Skip failed on file {0}")
-MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_FUNCTION_OR_REGEX,     28, 1, JSEXN_NONE, "The first argument to file.list must be a function or a regex")
-MSG_DEF(JSFILEMSG_CANNOT_DO_LIST_ON_A_FILE,                       29, 1, JSEXN_NONE, "{0} must be a directory, cannot do list")
-MSG_DEF(JSFILEMSG_NATIVE_OPERATION_IS_NOT_SUPPORTED,              30, 2, JSEXN_NONE, "Native operation {0} is not supported on {1}")
-MSG_DEF(JSFILEMSG_CANNOT_SET_PRIVATE_FILE,                        31, 1, JSEXN_NONE, "Cannot set private data for file {0}")
-MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_MUST_BE_A_NUMBER,                32, 2, JSEXN_NONE, "First argument to {0} must be a number, not {1}")
-MSG_DEF(JSFILEMSG_CANNOT_WRITE,                                   33, 1, JSEXN_NONE, "Cannot write to {0}, file mode is different")
-MSG_DEF(JSFILEMSG_CANNOT_READ,                                    34, 1, JSEXN_NONE, "Cannot read from {0}, file mode is different")
-MSG_DEF(JSFILEMSG_CANNOT_FLUSH,                                   35, 1, JSEXN_NONE, "Flush failed on {0}")
-MSG_DEF(JSFILEMSG_OP_FAILED,									  36, 1, JSEXN_NONE, "File operation {0} failed")
-MSG_DEF(JSFILEMSG_FILE_MUST_BE_OPEN,							  37, 1, JSEXN_NONE, "File must be open for {0}")
-MSG_DEF(JSFILEMSG_FILE_MUST_BE_CLOSED,							  38, 1, JSEXN_NONE, "File must be closed for {0}")
-MSG_DEF(JSFILEMSG_NO_RANDOM_ACCESS,								  39, 1, JSEXN_NONE, "File {0} doesn't allow random access")
-MSG_DEF(JSFILEMSG_OBJECT_CREATION_FAILED,						  40, 1, JSEXN_NONE, "Couldn't create {0}")
-MSG_DEF(JSFILEMSG_CANNOT_OPEN_DIR,								  41, 1, JSEXN_NONE, "Couldn't open directory {0}")
-MSG_DEF(JSFILEMSG_CANNOT_REPORT_POSITION,						  42, 1, JSEXN_NONE, "Couldn't report position for {0}")
-MSG_DEF(JSFILEMSG_CANNOT_SET_POSITION,							  43, 1, JSEXN_NONE, "Couldn't set position for {0}")
-MSG_DEF(JSFILEMSG_INIT_FAILED,									  44, 0, JSEXN_NONE, "File class initialization failed")
-
-
diff --git a/libs/js/src/jsfun.c b/libs/js/src/jsfun.c
deleted file mode 100644
index d35ca07fb0..0000000000
--- a/libs/js/src/jsfun.c
+++ /dev/null
@@ -1,2157 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS function support.
- */
-#include "jsstddef.h"
-#include <string.h>
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsparse.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-#include "jsexn.h"
-
-/* Generic function/call/arguments tinyids -- also reflected bit numbers. */
-enum {
-    CALL_ARGUMENTS  = -1,       /* predefined arguments local variable */
-    CALL_CALLEE     = -2,       /* reference to active function's object */
-    ARGS_LENGTH     = -3,       /* number of actual args, arity if inactive */
-    ARGS_CALLEE     = -4,       /* reference from arguments to active funobj */
-    FUN_ARITY       = -5,       /* number of formal parameters; desired argc */
-    FUN_NAME        = -6,       /* function name, "" if anonymous */
-    FUN_CALLER      = -7        /* Function.prototype.caller, backward compat */
-};
-
-#if JSFRAME_OVERRIDE_BITS < 8
-# error "not enough override bits in JSStackFrame.flags!"
-#endif
-
-#define TEST_OVERRIDE_BIT(fp, tinyid) \
-    ((fp)->flags & JS_BIT(JSFRAME_OVERRIDE_SHIFT - ((tinyid) + 1)))
-
-#define SET_OVERRIDE_BIT(fp, tinyid) \
-    ((fp)->flags |= JS_BIT(JSFRAME_OVERRIDE_SHIFT - ((tinyid) + 1)))
-
-#if JS_HAS_ARGS_OBJECT
-
-JSBool
-js_GetArgsValue(JSContext *cx, JSStackFrame *fp, jsval *vp)
-{
-    JSObject *argsobj;
-
-    if (TEST_OVERRIDE_BIT(fp, CALL_ARGUMENTS)) {
-        JS_ASSERT(fp->callobj);
-        return OBJ_GET_PROPERTY(cx, fp->callobj,
-                                ATOM_TO_JSID(cx->runtime->atomState
-                                             .argumentsAtom),
-                                vp);
-    }
-    argsobj = js_GetArgsObject(cx, fp);
-    if (!argsobj)
-        return JS_FALSE;
-    *vp = OBJECT_TO_JSVAL(argsobj);
-    return JS_TRUE;
-}
-
-static JSBool
-MarkArgDeleted(JSContext *cx, JSStackFrame *fp, uintN slot)
-{
-    JSObject *argsobj;
-    jsval bmapval, bmapint;
-    size_t nbits, nbytes;
-    jsbitmap *bitmap;
-
-    argsobj = fp->argsobj;
-    (void) JS_GetReservedSlot(cx, argsobj, 0, &bmapval);
-    nbits = fp->argc;
-    JS_ASSERT(slot < nbits);
-    if (JSVAL_IS_VOID(bmapval)) {
-        if (nbits <= JSVAL_INT_BITS) {
-            bmapint = 0;
-            bitmap = (jsbitmap *) &bmapint;
-        } else {
-            nbytes = JS_HOWMANY(nbits, JS_BITS_PER_WORD) * sizeof(jsbitmap);
-            bitmap = (jsbitmap *) JS_malloc(cx, nbytes);
-            if (!bitmap)
-                return JS_FALSE;
-            memset(bitmap, 0, nbytes);
-            bmapval = PRIVATE_TO_JSVAL(bitmap);
-            JS_SetReservedSlot(cx, argsobj, 0, bmapval);
-        }
-    } else {
-        if (nbits <= JSVAL_INT_BITS) {
-            bmapint = JSVAL_TO_INT(bmapval);
-            bitmap = (jsbitmap *) &bmapint;
-        } else {
-            bitmap = (jsbitmap *) JSVAL_TO_PRIVATE(bmapval);
-        }
-    }
-    JS_SET_BIT(bitmap, slot);
-    if (bitmap == (jsbitmap *) &bmapint) {
-        bmapval = INT_TO_JSVAL(bmapint);
-        JS_SetReservedSlot(cx, argsobj, 0, bmapval);
-    }
-    return JS_TRUE;
-}
-
-/* NB: Infallible predicate, false does not mean error/exception. */
-static JSBool
-ArgWasDeleted(JSContext *cx, JSStackFrame *fp, uintN slot)
-{
-    JSObject *argsobj;
-    jsval bmapval, bmapint;
-    jsbitmap *bitmap;
-
-    argsobj = fp->argsobj;
-    (void) JS_GetReservedSlot(cx, argsobj, 0, &bmapval);
-    if (JSVAL_IS_VOID(bmapval))
-        return JS_FALSE;
-    if (fp->argc <= JSVAL_INT_BITS) {
-        bmapint = JSVAL_TO_INT(bmapval);
-        bitmap = (jsbitmap *) &bmapint;
-    } else {
-        bitmap = (jsbitmap *) JSVAL_TO_PRIVATE(bmapval);
-    }
-    return JS_TEST_BIT(bitmap, slot) != 0;
-}
-
-JSBool
-js_GetArgsProperty(JSContext *cx, JSStackFrame *fp, jsid id,
-                   JSObject **objp, jsval *vp)
-{
-    jsval val;
-    JSObject *obj;
-    uintN slot;
-
-    if (TEST_OVERRIDE_BIT(fp, CALL_ARGUMENTS)) {
-        JS_ASSERT(fp->callobj);
-        if (!OBJ_GET_PROPERTY(cx, fp->callobj,
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .argumentsAtom),
-                              &val)) {
-            return JS_FALSE;
-        }
-        if (JSVAL_IS_PRIMITIVE(val)) {
-            obj = js_ValueToNonNullObject(cx, val);
-            if (!obj)
-                return JS_FALSE;
-        } else {
-            obj = JSVAL_TO_OBJECT(val);
-        }
-        *objp = obj;
-        return OBJ_GET_PROPERTY(cx, obj, id, vp);
-    }
-
-    *objp = NULL;
-    *vp = JSVAL_VOID;
-    if (JSID_IS_INT(id)) {
-        slot = (uintN) JSID_TO_INT(id);
-        if (slot < fp->argc) {
-            if (fp->argsobj && ArgWasDeleted(cx, fp, slot))
-                return OBJ_GET_PROPERTY(cx, fp->argsobj, id, vp);
-            *vp = fp->argv[slot];
-        } else {
-            /*
-             * Per ECMA-262 Ed. 3, 10.1.8, last bulleted item, do not share
-             * storage between the formal parameter and arguments[k] for all
-             * k >= fp->argc && k < fp->fun->nargs.  For example, in
-             *
-             *   function f(x) { x = 42; return arguments[0]; }
-             *   f();
-             *
-             * the call to f should return undefined, not 42.  If fp->argsobj
-             * is null at this point, as it would be in the example, return
-             * undefined in *vp.
-             */
-            if (fp->argsobj)
-                return OBJ_GET_PROPERTY(cx, fp->argsobj, id, vp);
-        }
-    } else {
-        if (id == ATOM_TO_JSID(cx->runtime->atomState.lengthAtom)) {
-            if (fp->argsobj && TEST_OVERRIDE_BIT(fp, ARGS_LENGTH))
-                return OBJ_GET_PROPERTY(cx, fp->argsobj, id, vp);
-            *vp = INT_TO_JSVAL((jsint) fp->argc);
-        }
-    }
-    return JS_TRUE;
-}
-
-JSObject *
-js_GetArgsObject(JSContext *cx, JSStackFrame *fp)
-{
-    JSObject *argsobj;
-
-    /* Skip eval and debugger frames. */
-    while (fp->flags & JSFRAME_SPECIAL)
-        fp = fp->down;
-
-    /* Create an arguments object for fp only if it lacks one. */
-    argsobj = fp->argsobj;
-    if (argsobj)
-        return argsobj;
-
-    /* Link the new object to fp so it can get actual argument values. */
-    argsobj = js_NewObject(cx, &js_ArgumentsClass, NULL, NULL);
-    if (!argsobj || !JS_SetPrivate(cx, argsobj, fp)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    fp->argsobj = argsobj;
-    return argsobj;
-}
-
-static JSBool
-args_enumerate(JSContext *cx, JSObject *obj);
-
-JSBool
-js_PutArgsObject(JSContext *cx, JSStackFrame *fp)
-{
-    JSObject *argsobj;
-    jsval bmapval, rval;
-    JSBool ok;
-    JSRuntime *rt;
-
-    /*
-     * Reuse args_enumerate here to reflect fp's actual arguments as indexed
-     * elements of argsobj.  Do this first, before clearing and freeing the
-     * deleted argument slot bitmap, because args_enumerate depends on that.
-     */
-    argsobj = fp->argsobj;
-    ok = args_enumerate(cx, argsobj);
-
-    /*
-     * Now clear the deleted argument number bitmap slot and free the bitmap,
-     * if one was actually created due to 'delete arguments[0]' or similar.
-     */
-    (void) JS_GetReservedSlot(cx, argsobj, 0, &bmapval);
-    if (!JSVAL_IS_VOID(bmapval)) {
-        JS_SetReservedSlot(cx, argsobj, 0, JSVAL_VOID);
-        if (fp->argc > JSVAL_INT_BITS)
-            JS_free(cx, JSVAL_TO_PRIVATE(bmapval));
-    }
-
-    /*
-     * Now get the prototype properties so we snapshot fp->fun and fp->argc
-     * before fp goes away.
-     */
-    rt = cx->runtime;
-    ok &= js_GetProperty(cx, argsobj, ATOM_TO_JSID(rt->atomState.calleeAtom),
-                         &rval);
-    ok &= js_SetProperty(cx, argsobj, ATOM_TO_JSID(rt->atomState.calleeAtom),
-                         &rval);
-    ok &= js_GetProperty(cx, argsobj, ATOM_TO_JSID(rt->atomState.lengthAtom),
-                         &rval);
-    ok &= js_SetProperty(cx, argsobj, ATOM_TO_JSID(rt->atomState.lengthAtom),
-                         &rval);
-
-    /*
-     * Clear the private pointer to fp, which is about to go away (js_Invoke).
-     * Do this last because the args_enumerate and js_GetProperty calls above
-     * need to follow the private slot to find fp.
-     */
-    ok &= JS_SetPrivate(cx, argsobj, NULL);
-    fp->argsobj = NULL;
-    return ok;
-}
-
-static JSBool
-args_delProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsint slot;
-    JSStackFrame *fp;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    fp = (JSStackFrame *)
-         JS_GetInstancePrivate(cx, obj, &js_ArgumentsClass, NULL);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->argsobj);
-
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case ARGS_CALLEE:
-      case ARGS_LENGTH:
-        SET_OVERRIDE_BIT(fp, slot);
-        break;
-
-      default:
-        if ((uintN)slot < fp->argc && !MarkArgDeleted(cx, fp, slot))
-            return JS_FALSE;
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-args_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsint slot;
-    JSStackFrame *fp;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    fp = (JSStackFrame *)
-         JS_GetInstancePrivate(cx, obj, &js_ArgumentsClass, NULL);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->argsobj);
-
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case ARGS_CALLEE:
-        if (!TEST_OVERRIDE_BIT(fp, slot))
-            *vp = fp->argv ? fp->argv[-2] : OBJECT_TO_JSVAL(fp->fun->object);
-        break;
-
-      case ARGS_LENGTH:
-        if (!TEST_OVERRIDE_BIT(fp, slot))
-            *vp = INT_TO_JSVAL((jsint)fp->argc);
-        break;
-
-      default:
-        if ((uintN)slot < fp->argc && !ArgWasDeleted(cx, fp, slot))
-            *vp = fp->argv[slot];
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-args_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSStackFrame *fp;
-    jsint slot;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    fp = (JSStackFrame *)
-         JS_GetInstancePrivate(cx, obj, &js_ArgumentsClass, NULL);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->argsobj);
-
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case ARGS_CALLEE:
-      case ARGS_LENGTH:
-        SET_OVERRIDE_BIT(fp, slot);
-        break;
-
-      default:
-        if (fp->fun->interpreted &&
-            (uintN)slot < fp->argc &&
-            !ArgWasDeleted(cx, fp, slot)) {
-            fp->argv[slot] = *vp;
-        }
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-args_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-             JSObject **objp)
-{
-    JSStackFrame *fp;
-    uintN slot;
-    JSString *str;
-    JSAtom *atom;
-    intN tinyid;
-    jsval value;
-
-    *objp = NULL;
-    fp = (JSStackFrame *)
-         JS_GetInstancePrivate(cx, obj, &js_ArgumentsClass, NULL);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->argsobj);
-
-    if (JSVAL_IS_INT(id)) {
-        slot = JSVAL_TO_INT(id);
-        if (slot < fp->argc && !ArgWasDeleted(cx, fp, slot)) {
-            /* XXX ECMA specs DontEnum, contrary to other array-like objects */
-            if (!js_DefineProperty(cx, obj, INT_JSVAL_TO_JSID(id),
-                                   fp->argv[slot],
-                                   args_getProperty, args_setProperty,
-                                   JS_VERSION_IS_ECMA(cx)
-                                   ? 0
-                                   : JSPROP_ENUMERATE,
-                                   NULL)) {
-                return JS_FALSE;
-            }
-            *objp = obj;
-        }
-    } else {
-        str = JSVAL_TO_STRING(id);
-        atom = cx->runtime->atomState.lengthAtom;
-        if (str == ATOM_TO_STRING(atom)) {
-            tinyid = ARGS_LENGTH;
-            value = INT_TO_JSVAL(fp->argc);
-        } else {
-            atom = cx->runtime->atomState.calleeAtom;
-            if (str == ATOM_TO_STRING(atom)) {
-                tinyid = ARGS_CALLEE;
-                value = fp->argv ? fp->argv[-2]
-                                 : OBJECT_TO_JSVAL(fp->fun->object);
-            } else {
-                atom = NULL;
-
-                /* Quell GCC overwarnings. */
-                tinyid = 0;
-                value = JSVAL_NULL;
-            }
-        }
-
-        if (atom && !TEST_OVERRIDE_BIT(fp, tinyid)) {
-            if (!js_DefineNativeProperty(cx, obj, ATOM_TO_JSID(atom), value,
-                                         args_getProperty, args_setProperty, 0,
-                                         SPROP_HAS_SHORTID, tinyid, NULL)) {
-                return JS_FALSE;
-            }
-            *objp = obj;
-        }
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-args_enumerate(JSContext *cx, JSObject *obj)
-{
-    JSStackFrame *fp;
-    JSObject *pobj;
-    JSProperty *prop;
-    uintN slot, argc;
-
-    fp = (JSStackFrame *)
-         JS_GetInstancePrivate(cx, obj, &js_ArgumentsClass, NULL);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->argsobj);
-
-    /*
-     * Trigger reflection with value snapshot in args_resolve using a series
-     * of js_LookupProperty calls.  We handle length, callee, and the indexed
-     * argument properties.  We know that args_resolve covers all these cases
-     * and creates direct properties of obj, but that it may fail to resolve
-     * length or callee if overridden.
-     */
-    if (!js_LookupProperty(cx, obj,
-                           ATOM_TO_JSID(cx->runtime->atomState.lengthAtom),
-                           &pobj, &prop)) {
-        return JS_FALSE;
-    }
-    if (prop)
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-
-    if (!js_LookupProperty(cx, obj,
-                           ATOM_TO_JSID(cx->runtime->atomState.calleeAtom),
-                           &pobj, &prop)) {
-        return JS_FALSE;
-    }
-    if (prop)
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-
-    argc = fp->argc;
-    for (slot = 0; slot < argc; slot++) {
-        if (!js_LookupProperty(cx, obj, INT_TO_JSID((jsint)slot), &pobj, &prop))
-            return JS_FALSE;
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-    }
-    return JS_TRUE;
-}
-
-/*
- * The Arguments class is not initialized via JS_InitClass, and must not be,
- * because its name is "Object".  Per ECMA, that causes instances of it to
- * delegate to the object named by Object.prototype.  It also ensures that
- * arguments.toString() returns "[object Object]".
- *
- * The JSClass functions below collaborate to lazily reflect and synchronize
- * actual argument values, argument count, and callee function object stored
- * in a JSStackFrame with their corresponding property values in the frame's
- * arguments object.
- */
-JSClass js_ArgumentsClass = {
-    js_Object_str,
-    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_HAS_RESERVED_SLOTS(1),
-    JS_PropertyStub,  args_delProperty,
-    args_getProperty, args_setProperty,
-    args_enumerate,   (JSResolveOp) args_resolve,
-    JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-#endif /* JS_HAS_ARGS_OBJECT */
-
-#if JS_HAS_CALL_OBJECT
-
-JSObject *
-js_GetCallObject(JSContext *cx, JSStackFrame *fp, JSObject *parent)
-{
-    JSObject *callobj, *funobj;
-
-    /* Create a call object for fp only if it lacks one. */
-    JS_ASSERT(fp->fun);
-    callobj = fp->callobj;
-    if (callobj)
-        return callobj;
-    JS_ASSERT(fp->fun);
-
-    /* The default call parent is its function's parent (static link). */
-    if (!parent) {
-        funobj = fp->argv ? JSVAL_TO_OBJECT(fp->argv[-2]) : fp->fun->object;
-        if (funobj)
-            parent = OBJ_GET_PARENT(cx, funobj);
-    }
-
-    /* Create the call object and link it to its stack frame. */
-    callobj = js_NewObject(cx, &js_CallClass, NULL, parent);
-    if (!callobj || !JS_SetPrivate(cx, callobj, fp)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    fp->callobj = callobj;
-
-    /* Make callobj be the scope chain and the variables object. */
-    fp->scopeChain = callobj;
-    fp->varobj = callobj;
-    return callobj;
-}
-
-static JSBool
-call_enumerate(JSContext *cx, JSObject *obj);
-
-JSBool
-js_PutCallObject(JSContext *cx, JSStackFrame *fp)
-{
-    JSObject *callobj;
-    JSBool ok;
-    jsid argsid;
-    jsval aval;
-
-    /*
-     * Reuse call_enumerate here to reflect all actual args and vars into the
-     * call object from fp.
-     */
-    callobj = fp->callobj;
-    if (!callobj)
-        return JS_TRUE;
-    ok = call_enumerate(cx, callobj);
-
-    /*
-     * Get the arguments object to snapshot fp's actual argument values.
-     */
-    if (fp->argsobj) {
-        argsid = ATOM_TO_JSID(cx->runtime->atomState.argumentsAtom);
-        ok &= js_GetProperty(cx, callobj, argsid, &aval);
-        ok &= js_SetProperty(cx, callobj, argsid, &aval);
-        ok &= js_PutArgsObject(cx, fp);
-    }
-
-    /*
-     * Clear the private pointer to fp, which is about to go away (js_Invoke).
-     * Do this last because the call_enumerate and js_GetProperty calls above
-     * need to follow the private slot to find fp.
-     */
-    ok &= JS_SetPrivate(cx, callobj, NULL);
-    fp->callobj = NULL;
-    return ok;
-}
-
-static JSPropertySpec call_props[] = {
-    {js_arguments_str,  CALL_ARGUMENTS, JSPROP_PERMANENT,0,0},
-    {"__callee__",      CALL_CALLEE,    0,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-call_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSStackFrame *fp;
-    jsint slot;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->fun);
-
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case CALL_ARGUMENTS:
-        if (!TEST_OVERRIDE_BIT(fp, slot)) {
-            JSObject *argsobj = js_GetArgsObject(cx, fp);
-            if (!argsobj)
-                return JS_FALSE;
-            *vp = OBJECT_TO_JSVAL(argsobj);
-        }
-        break;
-
-      case CALL_CALLEE:
-        if (!TEST_OVERRIDE_BIT(fp, slot))
-            *vp = fp->argv ? fp->argv[-2] : OBJECT_TO_JSVAL(fp->fun->object);
-        break;
-
-      default:
-        if ((uintN)slot < JS_MAX(fp->argc, fp->fun->nargs))
-            *vp = fp->argv[slot];
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-call_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSStackFrame *fp;
-    jsint slot;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->fun);
-
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case CALL_ARGUMENTS:
-      case CALL_CALLEE:
-        SET_OVERRIDE_BIT(fp, slot);
-        break;
-
-      default:
-        if ((uintN)slot < JS_MAX(fp->argc, fp->fun->nargs))
-            fp->argv[slot] = *vp;
-        break;
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_GetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSStackFrame *fp;
-
-    JS_ASSERT(JSVAL_IS_INT(id));
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (fp) {
-        /* XXX no jsint slot commoning here to avoid MSVC1.52 crashes */
-        if ((uintN)JSVAL_TO_INT(id) < fp->nvars)
-            *vp = fp->vars[JSVAL_TO_INT(id)];
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_SetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSStackFrame *fp;
-
-    JS_ASSERT(JSVAL_IS_INT(id));
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (fp) {
-        /* XXX jsint slot is block-local here to avoid MSVC1.52 crashes */
-        jsint slot = JSVAL_TO_INT(id);
-        if ((uintN)slot < fp->nvars)
-            fp->vars[slot] = *vp;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-call_enumerate(JSContext *cx, JSObject *obj)
-{
-    JSStackFrame *fp;
-    JSObject *funobj;
-    JSScope *scope;
-    JSScopeProperty *sprop, *cprop;
-    JSPropertyOp getter;
-    jsval *vec;
-    JSAtom *atom;
-    JSProperty *prop;
-
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (!fp)
-        return JS_TRUE;
-
-    /*
-     * Do not enumerate a cloned function object at fp->argv[-2], it may have
-     * gained its own (mutable) scope (e.g., a brutally-shared XUL script sets
-     * the clone's prototype property).  We must enumerate the function object
-     * that was decorated with parameter and local variable properties by the
-     * compiler when the compiler created fp->fun, namely fp->fun->object.
-     *
-     * Contrast with call_resolve, where we prefer fp->argv[-2], because we'll
-     * use js_LookupProperty to find any overridden properties in that object,
-     * if it was a mutated clone; and if not, we will search its prototype,
-     * fp->fun->object, to find compiler-created params and locals.
-     */
-    funobj = fp->fun->object;
-    if (!funobj)
-        return JS_TRUE;
-
-    /*
-     * Reflect actual args from fp->argv for formal parameters, and local vars
-     * and functions in fp->vars for declared variables and nested-at-top-level
-     * local functions.
-     */
-    scope = OBJ_SCOPE(funobj);
-    for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-        getter = sprop->getter;
-        if (getter == js_GetArgument)
-            vec = fp->argv;
-        else if (getter == js_GetLocalVariable)
-            vec = fp->vars;
-        else
-            continue;
-
-        /* Trigger reflection by looking up the unhidden atom for sprop->id. */
-        JS_ASSERT(JSID_IS_ATOM(sprop->id));
-        atom = JSID_TO_ATOM(sprop->id);
-        JS_ASSERT(atom->flags & ATOM_HIDDEN);
-        atom = atom->entry.value;
-
-        if (!js_LookupProperty(cx, obj, ATOM_TO_JSID(atom), &obj, &prop))
-            return JS_FALSE;
-        JS_ASSERT(obj && prop);
-        cprop = (JSScopeProperty *)prop;
-        LOCKED_OBJ_SET_SLOT(obj, cprop->slot, vec[(uint16) sprop->shortid]);
-        OBJ_DROP_PROPERTY(cx, obj, prop);
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-call_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-             JSObject **objp)
-{
-    JSStackFrame *fp;
-    JSObject *funobj;
-    JSString *str;
-    JSAtom *atom;
-    JSObject *obj2;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSPropertyOp getter, setter;
-    uintN attrs, slot, nslots, spflags;
-    jsval *vp, value;
-    intN shortid;
-
-    fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-    if (!fp)
-        return JS_TRUE;
-    JS_ASSERT(fp->fun);
-
-    if (!JSVAL_IS_STRING(id))
-        return JS_TRUE;
-
-    funobj = fp->argv ? JSVAL_TO_OBJECT(fp->argv[-2]) : fp->fun->object;
-    if (!funobj)
-        return JS_TRUE;
-    JS_ASSERT((JSFunction *) JS_GetPrivate(cx, funobj) == fp->fun);
-
-    str = JSVAL_TO_STRING(id);
-    atom = js_AtomizeString(cx, str, 0);
-    if (!atom)
-        return JS_FALSE;
-    if (!js_LookupHiddenProperty(cx, funobj, ATOM_TO_JSID(atom), &obj2, &prop))
-        return JS_FALSE;
-
-    if (prop) {
-        if (!OBJ_IS_NATIVE(obj2)) {
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-            return JS_TRUE;
-        }
-
-        sprop = (JSScopeProperty *) prop;
-        getter = sprop->getter;
-        attrs = sprop->attrs & ~JSPROP_SHARED;
-        slot = (uintN) sprop->shortid;
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-
-        /* Ensure we found an arg or var property for the same function. */
-        if ((sprop->flags & SPROP_IS_HIDDEN) &&
-            (obj2 == funobj ||
-             (JSFunction *) JS_GetPrivate(cx, obj2) == fp->fun)) {
-            if (getter == js_GetArgument) {
-                vp = fp->argv;
-                nslots = JS_MAX(fp->argc, fp->fun->nargs);
-                getter = setter = NULL;
-            } else {
-                JS_ASSERT(getter == js_GetLocalVariable);
-                vp = fp->vars;
-                nslots = fp->nvars;
-                getter = js_GetCallVariable;
-                setter = js_SetCallVariable;
-            }
-            if (slot < nslots) {
-                value = vp[slot];
-                spflags = SPROP_HAS_SHORTID;
-                shortid = (intN) slot;
-            } else {
-                value = JSVAL_VOID;
-                spflags = 0;
-                shortid = 0;
-            }
-            if (!js_DefineNativeProperty(cx, obj, ATOM_TO_JSID(atom), value,
-                                         getter, setter, attrs,
-                                         spflags, shortid, NULL)) {
-                return JS_FALSE;
-            }
-            *objp = obj;
-        }
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-call_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
-{
-    JSStackFrame *fp;
-
-    if (type == JSTYPE_FUNCTION) {
-        fp = (JSStackFrame *) JS_GetPrivate(cx, obj);
-        if (fp) {
-            JS_ASSERT(fp->fun);
-            *vp = fp->argv ? fp->argv[-2] : OBJECT_TO_JSVAL(fp->fun->object);
-        }
-    }
-    return JS_TRUE;
-}
-
-JSClass js_CallClass = {
-    js_Call_str,
-    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
-    call_getProperty, call_setProperty,
-    call_enumerate,   (JSResolveOp)call_resolve,
-    call_convert,     JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-#endif /* JS_HAS_CALL_OBJECT */
-
-/* SHARED because fun_getProperty always computes a new value. */
-#define FUNCTION_PROP_ATTRS (JSPROP_READONLY|JSPROP_PERMANENT|JSPROP_SHARED)
-
-static JSPropertySpec function_props[] = {
-    {js_arguments_str, CALL_ARGUMENTS, FUNCTION_PROP_ATTRS,0,0},
-    {js_arity_str,     FUN_ARITY,      FUNCTION_PROP_ATTRS,0,0},
-    {js_length_str,    ARGS_LENGTH,    FUNCTION_PROP_ATTRS,0,0},
-    {js_name_str,      FUN_NAME,       FUNCTION_PROP_ATTRS,0,0},
-    {js_caller_str,    FUN_CALLER,     FUNCTION_PROP_ATTRS,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-fun_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsint slot;
-    JSFunction *fun;
-    JSStackFrame *fp;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    slot = JSVAL_TO_INT(id);
-
-    /* No valid function object should lack private data, but check anyway. */
-    fun = (JSFunction *)JS_GetInstancePrivate(cx, obj, &js_FunctionClass, NULL);
-    if (!fun)
-        return JS_TRUE;
-
-    /* Find fun's top-most activation record. */
-    for (fp = cx->fp; fp && (fp->fun != fun || (fp->flags & JSFRAME_SPECIAL));
-         fp = fp->down) {
-        continue;
-    }
-
-    switch (slot) {
-      case CALL_ARGUMENTS:
-#if JS_HAS_ARGS_OBJECT
-        /* Warn if strict about f.arguments or equivalent unqualified uses. */
-        if (!JS_ReportErrorFlagsAndNumber(cx,
-                                          JSREPORT_WARNING | JSREPORT_STRICT,
-                                          js_GetErrorMessage, NULL,
-                                          JSMSG_DEPRECATED_USAGE,
-                                          js_arguments_str)) {
-            return JS_FALSE;
-        }
-        if (fp) {
-            if (!js_GetArgsValue(cx, fp, vp))
-                return JS_FALSE;
-        } else {
-            *vp = JSVAL_NULL;
-        }
-        break;
-#else  /* !JS_HAS_ARGS_OBJECT */
-        *vp = OBJECT_TO_JSVAL(fp ? obj : NULL);
-        break;
-#endif /* !JS_HAS_ARGS_OBJECT */
-
-      case ARGS_LENGTH:
-        if (!JS_VERSION_IS_ECMA(cx))
-            *vp = INT_TO_JSVAL((jsint)(fp && fp->fun ? fp->argc : fun->nargs));
-        else
-      case FUN_ARITY:
-            *vp = INT_TO_JSVAL((jsint)fun->nargs);
-        break;
-
-      case FUN_NAME:
-        *vp = fun->atom
-              ? ATOM_KEY(fun->atom)
-              : STRING_TO_JSVAL(cx->runtime->emptyString);
-        break;
-
-      case FUN_CALLER:
-        while (fp && (fp->flags & JSFRAME_SKIP_CALLER) && fp->down)
-            fp = fp->down;
-        if (fp && fp->down && fp->down->fun && fp->down->argv)
-            *vp = fp->down->argv[-2];
-        else
-            *vp = JSVAL_NULL;
-        if (!JSVAL_IS_PRIMITIVE(*vp) && cx->runtime->checkObjectAccess) {
-            id = ATOM_KEY(cx->runtime->atomState.callerAtom);
-            if (!cx->runtime->checkObjectAccess(cx, obj, id, JSACC_READ, vp))
-                return JS_FALSE;
-        }
-        break;
-
-      default:
-        /* XXX fun[0] and fun.arguments[0] are equivalent. */
-        if (fp && fp->fun && (uintN)slot < fp->fun->nargs)
-            *vp = fp->argv[slot];
-        break;
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-fun_enumerate(JSContext *cx, JSObject *obj)
-{
-    jsid prototypeId;
-    JSObject *pobj;
-    JSProperty *prop;
-
-    prototypeId = ATOM_TO_JSID(cx->runtime->atomState.classPrototypeAtom);
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, prototypeId, &pobj, &prop))
-        return JS_FALSE;
-    JS_ASSERT(prop);
-    OBJ_DROP_PROPERTY(cx, pobj, prop);
-    return JS_TRUE;
-}
-
-static JSBool
-fun_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-            JSObject **objp)
-{
-    JSFunction *fun;
-    JSString *str;
-    JSAtom *prototypeAtom;
-
-    if (!JSVAL_IS_STRING(id))
-        return JS_TRUE;
-
-    /* No valid function object should lack private data, but check anyway. */
-    fun = (JSFunction *)JS_GetInstancePrivate(cx, obj, &js_FunctionClass, NULL);
-    if (!fun || !fun->object)
-        return JS_TRUE;
-
-    /* No need to reflect fun.prototype in 'fun.prototype = ...'. */
-    if (flags & JSRESOLVE_ASSIGNING)
-        return JS_TRUE;
-
-    /*
-     * Ok, check whether id is 'prototype' and bootstrap the function object's
-     * prototype property.
-     */
-    str = JSVAL_TO_STRING(id);
-    prototypeAtom = cx->runtime->atomState.classPrototypeAtom;
-    if (str == ATOM_TO_STRING(prototypeAtom)) {
-        JSObject *proto, *parentProto;
-        jsval pval;
-
-        proto = parentProto = NULL;
-        if (fun->object != obj && fun->object) {
-            /*
-             * Clone of a function: make its prototype property value have the
-             * same class as the clone-parent's prototype.
-             */
-            if (!OBJ_GET_PROPERTY(cx, fun->object, ATOM_TO_JSID(prototypeAtom),
-                                  &pval)) {
-                return JS_FALSE;
-            }
-            if (!JSVAL_IS_PRIMITIVE(pval)) {
-                /*
-                 * We are about to allocate a new object, so hack the newborn
-                 * root until then to protect pval in case it is figuratively
-                 * up in the air, with no strong refs protecting it.
-                 */
-                cx->newborn[GCX_OBJECT] = JSVAL_TO_GCTHING(pval);
-                parentProto = JSVAL_TO_OBJECT(pval);
-            }
-        }
-
-        /*
-         * Beware of the wacky case of a user function named Object -- trying
-         * to find a prototype for that will recur back here _ad perniciem_.
-         */
-        if (!parentProto && fun->atom == cx->runtime->atomState.ObjectAtom)
-            return JS_TRUE;
-
-        /*
-         * If resolving "prototype" in a clone, clone the parent's prototype.
-         * Pass the constructor's (obj's) parent as the prototype parent, to
-         * avoid defaulting to parentProto.constructor.__parent__.
-         */
-        proto = js_NewObject(cx, &js_ObjectClass, parentProto,
-                             OBJ_GET_PARENT(cx, obj));
-        if (!proto)
-            return JS_FALSE;
-
-        /*
-         * ECMA (15.3.5.2) says that constructor.prototype is DontDelete for
-         * user-defined functions, but DontEnum | ReadOnly | DontDelete for
-         * native "system" constructors such as Object or Function.  So lazily
-         * set the former here in fun_resolve, but eagerly define the latter
-         * in JS_InitClass, with the right attributes.
-         */
-        if (!js_SetClassPrototype(cx, obj, proto,
-                                  JSPROP_ENUMERATE | JSPROP_PERMANENT)) {
-            cx->newborn[GCX_OBJECT] = NULL;
-            return JS_FALSE;
-        }
-        *objp = obj;
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-fun_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
-{
-    switch (type) {
-      case JSTYPE_FUNCTION:
-        *vp = OBJECT_TO_JSVAL(obj);
-        return JS_TRUE;
-      default:
-        return js_TryValueOf(cx, obj, type, vp);
-    }
-}
-
-static void
-fun_finalize(JSContext *cx, JSObject *obj)
-{
-    JSFunction *fun;
-
-    /* No valid function object should lack private data, but check anyway. */
-    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-    if (!fun)
-        return;
-    if (fun->object == obj)
-        fun->object = NULL;
-    JS_ATOMIC_DECREMENT(&fun->nrefs);
-    if (fun->nrefs)
-        return;
-
-    /* Null-check required since the parser sets interpreted very early. */
-    if (fun->interpreted && fun->u.script)
-        js_DestroyScript(cx, fun->u.script);
-}
-
-#if JS_HAS_XDR
-
-#include "jsxdrapi.h"
-
-enum {
-    JSXDR_FUNARG = 1,
-    JSXDR_FUNVAR = 2,
-    JSXDR_FUNCONST = 3
-};
-
-/* XXX store parent and proto, if defined */
-static JSBool
-fun_xdrObject(JSXDRState *xdr, JSObject **objp)
-{
-    JSContext *cx;
-    JSFunction *fun;
-    JSString *atomstr;
-    uint32 flagsword;           /* originally only flags was JS_XDRUint8'd */
-    char *propname;
-    JSScopeProperty *sprop;
-    uint32 userid;              /* NB: holds a signed int-tagged jsval */
-    JSAtom *atom;
-    uintN i, n, dupflag;
-    uint32 type;
-#ifdef DEBUG
-    uintN nvars = 0, nargs = 0;
-#endif
-
-    cx = xdr->cx;
-    if (xdr->mode == JSXDR_ENCODE) {
-        /*
-         * No valid function object should lack private data, but fail soft
-         * (return true, no error report) in case one does due to API pilot
-         * or internal error.
-         */
-        fun = (JSFunction *) JS_GetPrivate(cx, *objp);
-        if (!fun)
-            return JS_TRUE;
-        if (!fun->interpreted) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_NOT_SCRIPTED_FUNCTION,
-                                 JS_GetFunctionName(fun));
-            return JS_FALSE;
-        }
-        atomstr = fun->atom ? ATOM_TO_STRING(fun->atom) : NULL;
-        flagsword = ((uint32)fun->nregexps << 16) | fun->flags;
-    } else {
-        fun = js_NewFunction(cx, NULL, NULL, 0, 0, NULL, NULL);
-        if (!fun)
-            return JS_FALSE;
-        atomstr = NULL;
-    }
-
-    if (!JS_XDRStringOrNull(xdr, &atomstr) ||
-        !JS_XDRUint16(xdr, &fun->nargs) ||
-        !JS_XDRUint16(xdr, &fun->extra) ||
-        !JS_XDRUint16(xdr, &fun->nvars) ||
-        !JS_XDRUint32(xdr, &flagsword)) {
-        return JS_FALSE;
-    }
-
-    /* do arguments and local vars */
-    if (fun->object) {
-        n = fun->nargs + fun->nvars;
-        if (xdr->mode == JSXDR_ENCODE) {
-            JSScope *scope;
-            JSScopeProperty **spvec, *auto_spvec[8];
-            void *mark;
-
-            if (n <= sizeof auto_spvec / sizeof auto_spvec[0]) {
-                spvec = auto_spvec;
-                mark = NULL;
-            } else {
-                mark = JS_ARENA_MARK(&cx->tempPool);
-                JS_ARENA_ALLOCATE_CAST(spvec, JSScopeProperty **, &cx->tempPool,
-                                       n * sizeof(JSScopeProperty *));
-                if (!spvec) {
-                    JS_ReportOutOfMemory(cx);
-                    return JS_FALSE;
-                }
-            }
-            scope = OBJ_SCOPE(fun->object);
-            for (sprop = SCOPE_LAST_PROP(scope); sprop;
-                 sprop = sprop->parent) {
-                if (sprop->getter == js_GetArgument) {
-                    JS_ASSERT(nargs++ <= fun->nargs);
-                    spvec[sprop->shortid] = sprop;
-                } else if (sprop->getter == js_GetLocalVariable) {
-                    JS_ASSERT(nvars++ <= fun->nvars);
-                    spvec[fun->nargs + sprop->shortid] = sprop;
-                }
-            }
-            for (i = 0; i < n; i++) {
-                sprop = spvec[i];
-                JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
-                type = (i < fun->nargs)
-                       ? JSXDR_FUNARG
-                       : (sprop->attrs & JSPROP_READONLY)
-                       ? JSXDR_FUNCONST
-                       : JSXDR_FUNVAR;
-                userid = INT_TO_JSVAL(sprop->shortid);
-                /* XXX lossy conversion, need new XDR version for ECMAv3 */
-                propname = JS_GetStringBytes(ATOM_TO_STRING(JSID_TO_ATOM(sprop->id)));
-                if (!propname ||
-                    !JS_XDRUint32(xdr, &type) ||
-                    !JS_XDRUint32(xdr, &userid) ||
-                    !JS_XDRCString(xdr, &propname)) {
-                    if (mark)
-                        JS_ARENA_RELEASE(&cx->tempPool, mark);
-                    return JS_FALSE;
-                }
-            }
-            if (mark)
-                JS_ARENA_RELEASE(&cx->tempPool, mark);
-        } else {
-            JSPropertyOp getter, setter;
-
-            for (i = n; i != 0; i--) {
-                uintN attrs = JSPROP_PERMANENT;
-
-                if (!JS_XDRUint32(xdr, &type) ||
-                    !JS_XDRUint32(xdr, &userid) ||
-                    !JS_XDRCString(xdr, &propname)) {
-                    return JS_FALSE;
-                }
-                JS_ASSERT(type == JSXDR_FUNARG || type == JSXDR_FUNVAR ||
-                          type == JSXDR_FUNCONST);
-                if (type == JSXDR_FUNARG) {
-                    getter = js_GetArgument;
-                    setter = js_SetArgument;
-                    JS_ASSERT(nargs++ <= fun->nargs);
-                } else if (type == JSXDR_FUNVAR || type == JSXDR_FUNCONST) {
-                    getter = js_GetLocalVariable;
-                    setter = js_SetLocalVariable;
-                    if (type == JSXDR_FUNCONST)
-                        attrs |= JSPROP_READONLY;
-                    JS_ASSERT(nvars++ <= fun->nvars);
-                } else {
-                    getter = NULL;
-                    setter = NULL;
-                }
-                atom = js_Atomize(cx, propname, strlen(propname), 0);
-                JS_free(cx, propname);
-                if (!atom)
-                    return JS_FALSE;
-
-                /* Flag duplicate argument if atom is bound in fun->object. */
-                dupflag = SCOPE_GET_PROPERTY(OBJ_SCOPE(fun->object),
-                                             ATOM_TO_JSID(atom))
-                          ? SPROP_IS_DUPLICATE
-                          : 0;
-
-                if (!js_AddHiddenProperty(cx, fun->object, ATOM_TO_JSID(atom),
-                                          getter, setter, SPROP_INVALID_SLOT,
-                                          attrs | JSPROP_SHARED,
-                                          dupflag | SPROP_HAS_SHORTID,
-                                          JSVAL_TO_INT(userid))) {
-                    return JS_FALSE;
-                }
-            }
-        }
-    }
-
-    if (!js_XDRScript(xdr, &fun->u.script, NULL))
-        return JS_FALSE;
-
-    if (xdr->mode == JSXDR_DECODE) {
-        fun->interpreted = JS_TRUE;
-        fun->flags = (uint8) flagsword;
-        fun->nregexps = (uint16) (flagsword >> 16);
-
-        *objp = fun->object;
-        if (atomstr) {
-            /* XXX only if this was a top-level function! */
-            fun->atom = js_AtomizeString(cx, atomstr, 0);
-            if (!fun->atom)
-                return JS_FALSE;
-        }
-
-        js_CallNewScriptHook(cx, fun->u.script, fun);
-    }
-
-    return JS_TRUE;
-}
-
-#else  /* !JS_HAS_XDR */
-
-#define fun_xdrObject NULL
-
-#endif /* !JS_HAS_XDR */
-
-#if JS_HAS_INSTANCEOF
-
-/*
- * [[HasInstance]] internal method for Function objects: fetch the .prototype
- * property of its 'this' parameter, and walks the prototype chain of v (only
- * if v is an object) returning true if .prototype is found.
- */
-static JSBool
-fun_hasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    jsval pval;
-    JSString *str;
-
-    if (!OBJ_GET_PROPERTY(cx, obj,
-                          ATOM_TO_JSID(cx->runtime->atomState
-                                       .classPrototypeAtom),
-                          &pval)) {
-        return JS_FALSE;
-    }
-
-    if (JSVAL_IS_PRIMITIVE(pval)) {
-        /*
-         * Throw a runtime error if instanceof is called on a function that
-         * has a non-object as its .prototype value.
-         */
-        str = js_DecompileValueGenerator(cx, -1, OBJECT_TO_JSVAL(obj), NULL);
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_PROTOTYPE, JS_GetStringBytes(str));
-        }
-        return JS_FALSE;
-    }
-
-    return js_IsDelegate(cx, JSVAL_TO_OBJECT(pval), v, bp);
-}
-
-#else  /* !JS_HAS_INSTANCEOF */
-
-#define fun_hasInstance NULL
-
-#endif /* !JS_HAS_INSTANCEOF */
-
-static uint32
-fun_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSFunction *fun;
-
-    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-    if (fun) {
-        JS_MarkGCThing(cx, fun, js_private_str, arg);
-        if (fun->atom)
-            GC_MARK_ATOM(cx, fun->atom, arg);
-        if (fun->interpreted && fun->u.script)
-            js_MarkScript(cx, fun->u.script, arg);
-    }
-    return 0;
-}
-
-static uint32
-fun_reserveSlots(JSContext *cx, JSObject *obj)
-{
-    JSFunction *fun;
-
-    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-    return fun ? fun->nregexps : 0;
-}
-
-/*
- * Reserve two slots in all function objects for XPConnect.  Note that this
- * does not bloat every instance, only those on which reserved slots are set,
- * and those on which ad-hoc properties are defined.
- */
-JS_FRIEND_DATA(JSClass) js_FunctionClass = {
-    js_Function_str,
-    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_HAS_RESERVED_SLOTS(2),
-    JS_PropertyStub,  JS_PropertyStub,
-    fun_getProperty,  JS_PropertyStub,
-    fun_enumerate,    (JSResolveOp)fun_resolve,
-    fun_convert,      fun_finalize,
-    NULL,             NULL,
-    NULL,             NULL,
-    fun_xdrObject,    fun_hasInstance,
-    fun_mark,         fun_reserveSlots
-};
-
-JSBool
-js_fun_toString(JSContext *cx, JSObject *obj, uint32 indent,
-                uintN argc, jsval *argv, jsval *rval)
-{
-    jsval fval;
-    JSFunction *fun;
-    JSString *str;
-
-    if (!argv) {
-        JS_ASSERT(JS_ObjectIsFunction(cx, obj));
-    } else {
-        fval = argv[-1];
-        if (!JSVAL_IS_FUNCTION(cx, fval)) {
-            /*
-             * If we don't have a function to start off with, try converting
-             * the object to a function.  If that doesn't work, complain.
-             */
-            if (JSVAL_IS_OBJECT(fval)) {
-                obj = JSVAL_TO_OBJECT(fval);
-                if (!OBJ_GET_CLASS(cx, obj)->convert(cx, obj, JSTYPE_FUNCTION,
-                                                     &fval)) {
-                    return JS_FALSE;
-                }
-                argv[-1] = fval;
-            }
-            if (!JSVAL_IS_FUNCTION(cx, fval)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_INCOMPATIBLE_PROTO,
-                                     js_Function_str, js_toString_str,
-                                     JS_GetTypeName(cx,
-                                                    JS_TypeOfValue(cx, fval)));
-                return JS_FALSE;
-            }
-        }
-
-        obj = JSVAL_TO_OBJECT(fval);
-    }
-
-    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-    if (!fun)
-        return JS_TRUE;
-    if (argc && !js_ValueToECMAUint32(cx, argv[0], &indent))
-        return JS_FALSE;
-    str = JS_DecompileFunction(cx, fun, (uintN)indent);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-fun_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return js_fun_toString(cx, obj, 0, argc, argv, rval);
-}
-
-#if JS_HAS_TOSOURCE
-static JSBool
-fun_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return js_fun_toString(cx, obj, JS_DONT_PRETTY_PRINT, argc, argv, rval);
-}
-#endif
-
-static const char call_str[] = "call";
-
-#if JS_HAS_CALL_FUNCTION
-static JSBool
-fun_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval fval, *sp, *oldsp;
-    JSObject *tmp;
-    void *mark;
-    uintN i;
-    JSStackFrame *fp;
-    JSBool ok;
-
-    if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_FUNCTION, &argv[-1]))
-        return JS_FALSE;
-    fval = argv[-1];
-
-    if (!JSVAL_IS_FUNCTION(cx, fval)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_INCOMPATIBLE_PROTO,
-                             js_Function_str, call_str,
-                             JS_GetStringBytes(JS_ValueToString(cx, fval)));
-        return JS_FALSE;
-    }
-
-    if (argc == 0) {
-        /* Call fun with its global object as the 'this' param if no args. */
-        while ((tmp = OBJ_GET_PARENT(cx, obj)) != NULL)
-            obj = tmp;
-    } else {
-        /* Otherwise convert the first arg to 'this' and skip over it. */
-        if (!js_ValueToObject(cx, argv[0], &obj))
-            return JS_FALSE;
-        argc--;
-        argv++;
-    }
-
-    /* Allocate stack space for fval, obj, and the args. */
-    sp = js_AllocStack(cx, 2 + argc, &mark);
-    if (!sp)
-        return JS_FALSE;
-
-    /* Push fval, obj, and the args. */
-    *sp++ = fval;
-    *sp++ = OBJECT_TO_JSVAL(obj);
-    for (i = 0; i < argc; i++)
-        *sp++ = argv[i];
-
-    /* Lift current frame to include the args and do the call. */
-    fp = cx->fp;
-    oldsp = fp->sp;
-    fp->sp = sp;
-    ok = js_Invoke(cx, argc, JSINVOKE_INTERNAL | JSINVOKE_SKIP_CALLER);
-
-    /* Store rval and pop stack back to our frame's sp. */
-    *rval = fp->sp[-1];
-    fp->sp = oldsp;
-    js_FreeStack(cx, mark);
-    return ok;
-}
-#endif /* JS_HAS_CALL_FUNCTION */
-
-#if JS_HAS_APPLY_FUNCTION
-static JSBool
-fun_apply(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval fval, *sp, *oldsp;
-    JSObject *aobj;
-    jsuint length;
-    void *mark;
-    uintN i;
-    JSBool ok;
-    JSStackFrame *fp;
-
-    if (argc == 0) {
-        /* Will get globalObject as 'this' and no other arguments. */
-        return fun_call(cx, obj, argc, argv, rval);
-    }
-
-    if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_FUNCTION, &argv[-1]))
-        return JS_FALSE;
-    fval = argv[-1];
-
-    if (!JSVAL_IS_FUNCTION(cx, fval)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_INCOMPATIBLE_PROTO,
-                             js_Function_str, "apply",
-                             JS_GetStringBytes(JS_ValueToString(cx, fval)));
-        return JS_FALSE;
-    }
-
-    /* Quell GCC overwarnings. */
-    aobj = NULL;
-    length = 0;
-
-    if (argc >= 2) {
-        /* If the 2nd arg is null or void, call the function with 0 args. */
-        if (JSVAL_IS_NULL(argv[1]) || JSVAL_IS_VOID(argv[1])) {
-            argc = 0;
-        } else {
-            /* The second arg must be an array (or arguments object). */
-            if (JSVAL_IS_PRIMITIVE(argv[1]) ||
-                (aobj = JSVAL_TO_OBJECT(argv[1]),
-                OBJ_GET_CLASS(cx, aobj) != &js_ArgumentsClass &&
-                OBJ_GET_CLASS(cx, aobj) != &js_ArrayClass))
-            {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_APPLY_ARGS);
-                return JS_FALSE;
-            }
-            if (!js_GetLengthProperty(cx, aobj, &length))
-                return JS_FALSE;
-        }
-    }
-
-    /* Convert the first arg to 'this' and skip over it. */
-    if (!js_ValueToObject(cx, argv[0], &obj))
-        return JS_FALSE;
-
-    /* Allocate stack space for fval, obj, and the args. */
-    argc = (uintN)JS_MIN(length, ARGC_LIMIT - 1);
-    sp = js_AllocStack(cx, 2 + argc, &mark);
-    if (!sp)
-        return JS_FALSE;
-
-    /* Push fval, obj, and aobj's elements as args. */
-    *sp++ = fval;
-    *sp++ = OBJECT_TO_JSVAL(obj);
-    for (i = 0; i < argc; i++) {
-        ok = JS_GetElement(cx, aobj, (jsint)i, sp);
-        if (!ok)
-            goto out;
-        sp++;
-    }
-
-    /* Lift current frame to include the args and do the call. */
-    fp = cx->fp;
-    oldsp = fp->sp;
-    fp->sp = sp;
-    ok = js_Invoke(cx, argc, JSINVOKE_INTERNAL | JSINVOKE_SKIP_CALLER);
-
-    /* Store rval and pop stack back to our frame's sp. */
-    *rval = fp->sp[-1];
-    fp->sp = oldsp;
-out:
-    js_FreeStack(cx, mark);
-    return ok;
-}
-#endif /* JS_HAS_APPLY_FUNCTION */
-
-static JSFunctionSpec function_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   fun_toSource,   0,0,0},
-#endif
-    {js_toString_str,   fun_toString,   1,0,0},
-#if JS_HAS_APPLY_FUNCTION
-    {"apply",           fun_apply,      2,0,0},
-#endif
-#if JS_HAS_CALL_FUNCTION
-    {call_str,          fun_call,       1,0,0},
-#endif
-    {0,0,0,0,0}
-};
-
-JSBool
-js_IsIdentifier(JSString *str)
-{
-    size_t n;
-    jschar *s, c;
-
-    n = JSSTRING_LENGTH(str);
-    if (n == 0)
-        return JS_FALSE;
-    s = JSSTRING_CHARS(str);
-    c = *s;
-    if (!JS_ISIDSTART(c))
-        return JS_FALSE;
-    for (n--; n != 0; n--) {
-        c = *++s;
-        if (!JS_ISIDENT(c))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-Function(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSStackFrame *fp, *caller;
-    JSFunction *fun;
-    JSObject *parent;
-    uintN i, n, lineno, dupflag;
-    JSAtom *atom;
-    const char *filename;
-    JSObject *obj2;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSString *str, *arg;
-    void *mark;
-    JSTokenStream *ts;
-    JSPrincipals *principals;
-    jschar *collected_args, *cp;
-    size_t arg_length, args_length;
-    JSTokenType tt;
-    JSBool ok;
-
-    fp = cx->fp;
-    if (fp && !(fp->flags & JSFRAME_CONSTRUCTING)) {
-        obj = js_NewObject(cx, &js_FunctionClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-    if (fun)
-        return JS_TRUE;
-
-#if JS_HAS_CALL_OBJECT
-    /*
-     * NB: (new Function) is not lexically closed by its caller, it's just an
-     * anonymous function in the top-level scope that its constructor inhabits.
-     * Thus 'var x = 42; f = new Function("return x"); print(f())' prints 42,
-     * and so would a call to f from another top-level's script or function.
-     *
-     * In older versions, before call objects, a new Function was adopted by
-     * its running context's globalObject, which might be different from the
-     * top-level reachable from scopeChain (in HTML frames, e.g.).
-     */
-    parent = OBJ_GET_PARENT(cx, JSVAL_TO_OBJECT(argv[-2]));
-#else
-    /* Set up for dynamic parenting (see js_Invoke in jsinterp.c). */
-    parent = NULL;
-#endif
-
-    fun = js_NewFunction(cx, obj, NULL, 0, JSFUN_LAMBDA, parent,
-                         JS_VERSION_IS_ECMA(cx)
-                         ? cx->runtime->atomState.anonymousAtom
-                         : NULL);
-
-    if (!fun)
-        return JS_FALSE;
-
-    /*
-     * Function is static and not called directly by other functions in this
-     * file, therefore it is callable only as a native function by js_Invoke.
-     * Find the scripted caller, possibly skipping other native frames such as
-     * are built for Function.prototype.call or .apply activations that invoke
-     * Function indirectly from a script.
-     */
-    JS_ASSERT(!fp->script && fp->fun && fp->fun->u.native == Function);
-    caller = JS_GetScriptedCaller(cx, fp);
-    if (caller) {
-        filename = caller->script->filename;
-        lineno = js_PCToLineNumber(cx, caller->script, caller->pc);
-        principals = JS_EvalFramePrincipals(cx, fp, caller);
-    } else {
-        filename = NULL;
-        lineno = 0;
-        principals = NULL;
-    }
-
-    /* Belt-and-braces: check that the caller has access to parent. */
-    if (!js_CheckPrincipalsAccess(cx, parent, principals, "Function"))
-        return JS_FALSE;
-
-    n = argc ? argc - 1 : 0;
-    if (n > 0) {
-        /*
-         * Collect the function-argument arguments into one string, separated
-         * by commas, then make a tokenstream from that string, and scan it to
-         * get the arguments.  We need to throw the full scanner at the
-         * problem, because the argument string can legitimately contain
-         * comments and linefeeds.  XXX It might be better to concatenate
-         * everything up into a function definition and pass it to the
-         * compiler, but doing it this way is less of a delta from the old
-         * code.  See ECMA 15.3.2.1.
-         */
-        args_length = 0;
-        for (i = 0; i < n; i++) {
-            /* Collect the lengths for all the function-argument arguments. */
-            arg = js_ValueToString(cx, argv[i]);
-            if (!arg)
-                return JS_FALSE;
-            argv[i] = STRING_TO_JSVAL(arg);
-            args_length += JSSTRING_LENGTH(arg);
-        }
-        /* Add 1 for each joining comma. */
-        args_length += n - 1;
-
-        /*
-         * Allocate a string to hold the concatenated arguments, including room
-         * for a terminating 0.  Mark cx->tempPool for later release, to free
-         * collected_args and its tokenstream in one swoop.
-         */
-        mark = JS_ARENA_MARK(&cx->tempPool);
-        JS_ARENA_ALLOCATE_CAST(cp, jschar *, &cx->tempPool,
-                               (args_length+1) * sizeof(jschar));
-        if (!cp)
-            return JS_FALSE;
-        collected_args = cp;
-
-        /*
-         * Concatenate the arguments into the new string, separated by commas.
-         */
-        for (i = 0; i < n; i++) {
-            arg = JSVAL_TO_STRING(argv[i]);
-            arg_length = JSSTRING_LENGTH(arg);
-            (void) js_strncpy(cp, JSSTRING_CHARS(arg), arg_length);
-            cp += arg_length;
-
-            /* Add separating comma or terminating 0. */
-            *cp++ = (i + 1 < n) ? ',' : 0;
-        }
-
-        /*
-         * Make a tokenstream (allocated from cx->tempPool) that reads from
-         * the given string.
-         */
-        ts = js_NewTokenStream(cx, collected_args, args_length, filename,
-                               lineno, principals);
-        if (!ts) {
-            JS_ARENA_RELEASE(&cx->tempPool, mark);
-            return JS_FALSE;
-        }
-
-        /* The argument string may be empty or contain no tokens. */
-        tt = js_GetToken(cx, ts);
-        if (tt != TOK_EOF) {
-            for (;;) {
-                /*
-                 * Check that it's a name.  This also implicitly guards against
-                 * TOK_ERROR, which was already reported.
-                 */
-                if (tt != TOK_NAME)
-                    goto bad_formal;
-
-                /*
-                 * Get the atom corresponding to the name from the tokenstream;
-                 * we're assured at this point that it's a valid identifier.
-                 */
-                atom = CURRENT_TOKEN(ts).t_atom;
-                if (!js_LookupHiddenProperty(cx, obj, ATOM_TO_JSID(atom),
-                                             &obj2, &prop)) {
-                    goto bad_formal;
-                }
-                sprop = (JSScopeProperty *) prop;
-                dupflag = 0;
-                if (sprop) {
-                    ok = JS_TRUE;
-                    if (obj2 == obj) {
-                        const char *name = js_AtomToPrintableString(cx, atom);
-
-                        /*
-                         * A duplicate parameter name. We force a duplicate
-                         * node on the SCOPE_LAST_PROP(scope) list with the
-                         * same id, distinguished by the SPROP_IS_DUPLICATE
-                         * flag, and not mapped by an entry in scope.
-                         */
-                        JS_ASSERT(sprop->getter == js_GetArgument);
-                        ok = name &&
-                             js_ReportCompileErrorNumber(cx, ts,
-                                                         JSREPORT_TS |
-                                                         JSREPORT_WARNING |
-                                                         JSREPORT_STRICT,
-                                                         JSMSG_DUPLICATE_FORMAL,
-                                                         name);
-
-                        dupflag = SPROP_IS_DUPLICATE;
-                    }
-                    OBJ_DROP_PROPERTY(cx, obj2, prop);
-                    if (!ok)
-                        goto bad_formal;
-                    sprop = NULL;
-                }
-                if (!js_AddHiddenProperty(cx, fun->object, ATOM_TO_JSID(atom),
-                                          js_GetArgument, js_SetArgument,
-                                          SPROP_INVALID_SLOT,
-                                          JSPROP_PERMANENT | JSPROP_SHARED,
-                                          dupflag | SPROP_HAS_SHORTID,
-                                          fun->nargs)) {
-                    goto bad_formal;
-                }
-                if (fun->nargs == JS_BITMASK(16)) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_TOO_MANY_FUN_ARGS);
-                    goto bad;
-                }
-                fun->nargs++;
-
-                /*
-                 * Get the next token.  Stop on end of stream.  Otherwise
-                 * insist on a comma, get another name, and iterate.
-                 */
-                tt = js_GetToken(cx, ts);
-                if (tt == TOK_EOF)
-                    break;
-                if (tt != TOK_COMMA)
-                    goto bad_formal;
-                tt = js_GetToken(cx, ts);
-            }
-        }
-
-        /* Clean up. */
-        ok = js_CloseTokenStream(cx, ts);
-        JS_ARENA_RELEASE(&cx->tempPool, mark);
-        if (!ok)
-            return JS_FALSE;
-    }
-
-    if (argc) {
-        str = js_ValueToString(cx, argv[argc-1]);
-    } else {
-        /* Can't use cx->runtime->emptyString because we're called too early. */
-        str = js_NewStringCopyZ(cx, js_empty_ucstr, 0);
-    }
-    if (!str)
-        return JS_FALSE;
-    if (argv) {
-        /* Use the last arg (or this if argc == 0) as a local GC root. */
-        argv[(intN)(argc-1)] = STRING_TO_JSVAL(str);
-    }
-
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewTokenStream(cx, JSSTRING_CHARS(str), JSSTRING_LENGTH(str),
-                           filename, lineno, principals);
-    if (!ts) {
-        ok = JS_FALSE;
-    } else {
-        ok = js_CompileFunctionBody(cx, ts, fun) &&
-             js_CloseTokenStream(cx, ts);
-    }
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    return ok;
-
-bad_formal:
-    /*
-     * Report "malformed formal parameter" iff no illegal char or similar
-     * scanner error was already reported.
-     */
-    if (!(ts->flags & TSF_ERROR))
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_FORMAL);
-
-bad:
-    /*
-     * Clean up the arguments string and tokenstream if we failed to parse
-     * the arguments.
-     */
-    (void)js_CloseTokenStream(cx, ts);
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    return JS_FALSE;
-}
-
-JSObject *
-js_InitFunctionClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-    JSAtom *atom;
-    JSFunction *fun;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_FunctionClass, Function, 1,
-                         function_props, function_methods, NULL, NULL);
-    if (!proto)
-        return NULL;
-    atom = js_Atomize(cx, js_FunctionClass.name, strlen(js_FunctionClass.name),
-                      0);
-    if (!atom)
-        goto bad;
-    fun = js_NewFunction(cx, proto, NULL, 0, 0, obj, NULL);
-    if (!fun)
-        goto bad;
-    fun->u.script = js_NewScript(cx, 0, 0, 0);
-    if (!fun->u.script)
-        goto bad;
-    fun->interpreted = JS_TRUE;
-    return proto;
-
-bad:
-    cx->newborn[GCX_OBJECT] = NULL;
-    return NULL;
-}
-
-#if JS_HAS_CALL_OBJECT
-JSObject *
-js_InitCallClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_CallClass, NULL, 0,
-                         call_props, NULL, NULL, NULL);
-    if (!proto)
-        return NULL;
-
-    /*
-     * Null Call.prototype's proto slot so that Object.prototype.* does not
-     * pollute the scope of heavyweight functions.
-     */
-    OBJ_SET_PROTO(cx, proto, NULL);
-    return proto;
-}
-#endif
-
-JSFunction *
-js_NewFunction(JSContext *cx, JSObject *funobj, JSNative native, uintN nargs,
-               uintN flags, JSObject *parent, JSAtom *atom)
-{
-    JSFunction *fun;
-
-    /* If funobj is null, allocate an object for it. */
-    if (funobj) {
-        OBJ_SET_PARENT(cx, funobj, parent);
-    } else {
-        funobj = js_NewObject(cx, &js_FunctionClass, NULL, parent);
-        if (!funobj)
-            return NULL;
-    }
-
-    /*
-     * Allocate fun after allocating funobj so slot allocation in js_NewObject
-     * does not wipe out fun from cx->newborn[GCX_PRIVATE].
-     */
-    fun = (JSFunction *) js_NewGCThing(cx, GCX_PRIVATE, sizeof(JSFunction));
-    if (!fun)
-        return NULL;
-
-    /* Initialize all function members. */
-    fun->nrefs = 0;
-    fun->object = NULL;
-    fun->u.native = native;
-    fun->nargs = nargs;
-    fun->extra = 0;
-    fun->nvars = 0;
-    fun->flags = flags & JSFUN_FLAGS_MASK;
-    fun->interpreted = JS_FALSE;
-    fun->nregexps = 0;
-    fun->spare = 0;
-    fun->atom = atom;
-    fun->clasp = NULL;
-
-    /* Link fun to funobj and vice versa. */
-    if (!js_LinkFunctionObject(cx, fun, funobj)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    return fun;
-}
-
-JSObject *
-js_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
-{
-    JSObject *newfunobj;
-    JSFunction *fun;
-
-    JS_ASSERT(OBJ_GET_CLASS(cx, funobj) == &js_FunctionClass);
-    newfunobj = js_NewObject(cx, &js_FunctionClass, funobj, parent);
-    if (!newfunobj)
-        return NULL;
-    fun = (JSFunction *) JS_GetPrivate(cx, funobj);
-    if (!js_LinkFunctionObject(cx, fun, newfunobj)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    return newfunobj;
-}
-
-JSBool
-js_LinkFunctionObject(JSContext *cx, JSFunction *fun, JSObject *funobj)
-{
-    if (!fun->object)
-        fun->object = funobj;
-    if (!JS_SetPrivate(cx, funobj, fun))
-        return JS_FALSE;
-    JS_ATOMIC_INCREMENT(&fun->nrefs);
-    return JS_TRUE;
-}
-
-JSFunction *
-js_DefineFunction(JSContext *cx, JSObject *obj, JSAtom *atom, JSNative native,
-                  uintN nargs, uintN attrs)
-{
-    JSFunction *fun;
-
-    fun = js_NewFunction(cx, NULL, native, nargs, attrs, obj, atom);
-    if (!fun)
-        return NULL;
-    if (!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom),
-                             OBJECT_TO_JSVAL(fun->object),
-                             NULL, NULL,
-                             attrs & ~JSFUN_FLAGS_MASK, NULL)) {
-        return NULL;
-    }
-    return fun;
-}
-
-#if (JSV2F_CONSTRUCT & JSV2F_SEARCH_STACK)
-# error "JSINVOKE_CONSTRUCT and JSV2F_SEARCH_STACK are not disjoint!"
-#endif
-
-JSFunction *
-js_ValueToFunction(JSContext *cx, jsval *vp, uintN flags)
-{
-    jsval v;
-    JSObject *obj;
-
-    v = *vp;
-    obj = NULL;
-    if (JSVAL_IS_OBJECT(v)) {
-        obj = JSVAL_TO_OBJECT(v);
-        if (obj && OBJ_GET_CLASS(cx, obj) != &js_FunctionClass) {
-            if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_FUNCTION, &v))
-                return NULL;
-            obj = JSVAL_IS_FUNCTION(cx, v) ? JSVAL_TO_OBJECT(v) : NULL;
-        }
-    }
-    if (!obj) {
-        js_ReportIsNotFunction(cx, vp, flags);
-        return NULL;
-    }
-    return (JSFunction *) JS_GetPrivate(cx, obj);
-}
-
-JSObject *
-js_ValueToFunctionObject(JSContext *cx, jsval *vp, uintN flags)
-{
-    JSFunction *fun;
-    JSObject *funobj;
-    JSStackFrame *caller;
-
-    if (JSVAL_IS_FUNCTION(cx, *vp))
-        return JSVAL_TO_OBJECT(*vp);
-
-    fun = js_ValueToFunction(cx, vp, flags);
-    if (!fun)
-        return NULL;
-    funobj = fun->object;
-    *vp = OBJECT_TO_JSVAL(funobj);
-
-    caller = JS_GetScriptedCaller(cx, cx->fp);
-    if (caller &&
-        !js_CheckPrincipalsAccess(cx, funobj,
-                                  caller->script->principals,
-                                  JS_GetFunctionName(fun))) {
-        return NULL;
-    }
-    return funobj;
-}
-
-JSObject *
-js_ValueToCallableObject(JSContext *cx, jsval *vp, uintN flags)
-{
-    JSObject *callable;
-
-    callable = JSVAL_IS_PRIMITIVE(*vp) ? NULL : JSVAL_TO_OBJECT(*vp);
-    if (callable &&
-        ((callable->map->ops == &js_ObjectOps)
-         ? OBJ_GET_CLASS(cx, callable)->call
-         : callable->map->ops->call)) {
-        *vp = OBJECT_TO_JSVAL(callable);
-    } else {
-        callable = js_ValueToFunctionObject(cx, vp, flags);
-    }
-    return callable;
-}
-
-void
-js_ReportIsNotFunction(JSContext *cx, jsval *vp, uintN flags)
-{
-    JSType type;
-    JSString *fallback;
-    JSString *str;
-
-    /*
-     * We provide the typename as the fallback to handle the case when
-     * valueOf is not a function, which prevents ValueToString from being
-     * called as the default case inside js_DecompileValueGenerator (and
-     * so recursing back to here).
-     */
-    type = JS_TypeOfValue(cx, *vp);
-    fallback = ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[type]);
-    str = js_DecompileValueGenerator(cx,
-                                     (flags & JSV2F_SEARCH_STACK)
-                                     ? JSDVG_SEARCH_STACK
-                                     : cx->fp
-                                     ? vp - cx->fp->sp
-                                     : JSDVG_IGNORE_STACK,
-                                     *vp,
-                                     fallback);
-    if (str) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             (uintN)((flags & JSV2F_CONSTRUCT)
-                                     ? JSMSG_NOT_CONSTRUCTOR
-                                     : JSMSG_NOT_FUNCTION),
-                             JS_GetStringBytes(str));
-    }
-}
diff --git a/libs/js/src/jsfun.h b/libs/js/src/jsfun.h
deleted file mode 100644
index 25aa10320a..0000000000
--- a/libs/js/src/jsfun.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsfun_h___
-#define jsfun_h___
-/*
- * JS function definitions.
- */
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-struct JSFunction {
-    jsrefcount   nrefs;         /* number of referencing objects */
-    JSObject     *object;       /* back-pointer to GC'ed object header */
-    union {
-        JSNative native;        /* native method pointer or null */
-        JSScript *script;       /* interpreted bytecode descriptor or null */
-    } u;
-    uint16       nargs;         /* minimum number of actual arguments */
-    uint16       extra;         /* number of arg slots for local GC roots */
-    uint16       nvars;         /* number of local variables */
-    uint8        flags;         /* bound method and other flags, see jsapi.h */
-    JSPackedBool interpreted;   /* use u.script if true, u.native if false */
-    uint16       nregexps;      /* number of regular expressions literals */
-    uint16       spare;         /* reserved for future use */
-    JSAtom       *atom;         /* name for diagnostics and decompiling */
-    JSClass      *clasp;        /* if non-null, constructor for this class */
-};
-
-#define FUN_NATIVE(fun)         ((fun)->interpreted ? NULL : (fun)->u.native)
-#define FUN_SCRIPT(fun)         ((fun)->interpreted ? (fun)->u.script : NULL)
-
-extern JSClass js_ArgumentsClass;
-extern JSClass js_CallClass;
-
-/* JS_FRIEND_DATA so that JSVAL_IS_FUNCTION is callable from outside */
-extern JS_FRIEND_DATA(JSClass) js_FunctionClass;
-
-/*
- * NB: jsapi.h and jsobj.h must be included before any call to this macro.
- */
-#define JSVAL_IS_FUNCTION(cx, v)                                              \
-    (!JSVAL_IS_PRIMITIVE(v) &&                                                \
-     OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_FunctionClass)
-
-extern JSBool
-js_fun_toString(JSContext *cx, JSObject *obj, uint32 indent,
-                uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool
-js_IsIdentifier(JSString *str);
-
-extern JSObject *
-js_InitFunctionClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitArgumentsClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitCallClass(JSContext *cx, JSObject *obj);
-
-extern JSFunction *
-js_NewFunction(JSContext *cx, JSObject *funobj, JSNative native, uintN nargs,
-               uintN flags, JSObject *parent, JSAtom *atom);
-
-extern JSObject *
-js_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent);
-
-extern JSBool
-js_LinkFunctionObject(JSContext *cx, JSFunction *fun, JSObject *object);
-
-extern JSFunction *
-js_DefineFunction(JSContext *cx, JSObject *obj, JSAtom *atom, JSNative native,
-                  uintN nargs, uintN flags);
-
-/*
- * Flags for js_ValueToFunction and js_ReportIsNotFunction.  We depend on the
- * fact that JSINVOKE_CONSTRUCT (aka JSFRAME_CONSTRUCTING) is 1, and test that
- * with #if/#error in jsfun.c.
- */
-#define JSV2F_CONSTRUCT         JSINVOKE_CONSTRUCT
-#define JSV2F_SEARCH_STACK      2
-
-extern JSFunction *
-js_ValueToFunction(JSContext *cx, jsval *vp, uintN flags);
-
-extern JSObject *
-js_ValueToFunctionObject(JSContext *cx, jsval *vp, uintN flags);
-
-extern JSObject *
-js_ValueToCallableObject(JSContext *cx, jsval *vp, uintN flags);
-
-extern void
-js_ReportIsNotFunction(JSContext *cx, jsval *vp, uintN flags);
-
-extern JSObject *
-js_GetCallObject(JSContext *cx, JSStackFrame *fp, JSObject *parent);
-
-extern JSBool
-js_PutCallObject(JSContext *cx, JSStackFrame *fp);
-
-extern JSBool
-js_GetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_SetCallVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_GetArgsValue(JSContext *cx, JSStackFrame *fp, jsval *vp);
-
-extern JSBool
-js_GetArgsProperty(JSContext *cx, JSStackFrame *fp, jsid id,
-                   JSObject **objp, jsval *vp);
-
-extern JSObject *
-js_GetArgsObject(JSContext *cx, JSStackFrame *fp);
-
-extern JSBool
-js_PutArgsObject(JSContext *cx, JSStackFrame *fp);
-
-extern JSBool
-js_XDRFunction(JSXDRState *xdr, JSObject **objp);
-
-JS_END_EXTERN_C
-
-#endif /* jsfun_h___ */
diff --git a/libs/js/src/jsgc.c b/libs/js/src/jsgc.c
deleted file mode 100644
index ed6e464178..0000000000
--- a/libs/js/src/jsgc.c
+++ /dev/null
@@ -1,1968 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS Mark-and-Sweep Garbage Collector.
- *
- * This GC allocates only fixed-sized things big enough to contain two words
- * (pointers) on any host architecture.  It allocates from an arena pool (see
- * jsarena.h).  It uses an ideally parallel array of flag bytes to hold the
- * mark bit, finalizer type index, etc.
- *
- * XXX swizzle page to freelist for better locality of reference
- */
-#include "jsstddef.h"
-#include <stdlib.h>     /* for free, called by JS_ARENA_DESTROY */
-#include <string.h>     /* for memset, called by jsarena.h macros if DEBUG */
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jshash.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-#if JS_HAS_XML_SUPPORT
-#include "jsxml.h"
-#endif
-
-/*
- * GC arena sizing depends on amortizing arena overhead using a large number
- * of things per arena, and on the thing/flags ratio of 8:1 on most platforms.
- *
- * On 64-bit platforms, we would have half as many things per arena because
- * pointers are twice as big, so we double the bytes for things per arena.
- * This preserves the 1024 byte flags sub-arena size, which relates to the
- * GC_PAGE_SIZE (see below for why).
- */
-#if JS_BYTES_PER_WORD == 8
-# define GC_THINGS_SHIFT 14     /* 16KB for things on Alpha, etc. */
-#else
-# define GC_THINGS_SHIFT 13     /* 8KB for things on most platforms */
-#endif
-#define GC_THINGS_SIZE  JS_BIT(GC_THINGS_SHIFT)
-#define GC_FLAGS_SIZE   (GC_THINGS_SIZE / sizeof(JSGCThing))
-#define GC_ARENA_SIZE   (GC_THINGS_SIZE + GC_FLAGS_SIZE)
-
-/*
- * A GC arena contains one flag byte for each thing in its heap, and supports
- * O(1) lookup of a flag given its thing's address.
- *
- * To implement this, we take advantage of the thing/flags numerology: given
- * the 8K bytes worth of GC-things, there are 1K flag bytes.  We mask a thing's
- * address with ~1023 to find a JSGCPageInfo record at the front of a mythical
- * "GC page" within the larger 8K thing arena.  That JSGCPageInfo contains a
- * pointer to the 128 flag bytes corresponding to the things in the page, so we
- * index into this flags array using the thing's index within its page.
- *
- * To align thing pages on 1024-byte boundaries, we must allocate the 9KB of
- * flags+things arena payload, then find the first 0 mod 1024 boundary after
- * the first payload address.  That's where things start, with a JSGCPageInfo
- * taking up the first thing-slot, as usual for 0 mod 1024 byte boundaries.
- * The effect of this alignment trick is to split the flags into at most 2
- * discontiguous spans, one before the things and one after (if we're really
- * lucky, and the arena payload starts on a 0 mod 1024 byte boundary, no need
- * to split).
- *
- * The overhead of this scheme for most platforms is (16+8*(8+1))/(16+9K) or
- * .95% (assuming 16 byte JSArena header size, and 8 byte JSGCThing size).
- *
- * Here's some ASCII art showing an arena:
- *
- *   split
- *     |
- *     V
- *  +--+-------+-------+-------+-------+-------+-------+-------+-------+-----+
- *  |fB|  tp0  |  tp1  |  tp2  |  tp3  |  tp4  |  tp5  |  tp6  |  tp7  | fA  |
- *  +--+-------+-------+-------+-------+-------+-------+-------+-------+-----+
- *              ^                                 ^
- *  tI ---------+                                 |
- *  tJ -------------------------------------------+
- *
- *  - fB are the "before split" flags, fA are the "after split" flags
- *  - tp0-tp7 are the 8 thing pages
- *  - thing tI points into tp1, whose flags are below the split, in fB
- *  - thing tJ points into tp5, clearly above the split
- *
- * In general, one of the thing pages will have some of its things' flags on
- * the low side of the split, and the rest of its things' flags on the high
- * side.  All the other pages have flags only below or only above.  Therefore
- * we'll have to test something to decide whether the split divides flags in
- * a given thing's page.  So we store the split pointer (the pointer to tp0)
- * in each JSGCPageInfo, along with the flags pointer for the 128 flag bytes
- * ideally starting, for tp0 things, at the beginning of the arena's payload
- * (at the start of fB).
- *
- * That is, each JSGCPageInfo's flags pointer is 128 bytes from the previous,
- * or at the start of the arena if there is no previous page in this arena.
- * Thus these ideal 128-byte flag pages run contiguously from the start of the
- * arena (right over the split!), and the JSGCPageInfo flags pointers contain
- * no discontinuities over the split created by the thing pages.  So if, for a
- * given JSGCPageInfo *pi, we find that
- *
- *  pi->flags + ((jsuword)thing % 1024) / sizeof(JSGCThing) >= pi->split
- *
- * then we must add GC_THINGS_SIZE to the nominal flags pointer to jump over
- * all the thing pages that split the flags into two discontiguous spans.
- *
- * (If we need to implement card-marking for an incremental GC write barrier,
- * we can use the low byte of the pi->split pointer as the card-mark, for an
- * extremely efficient write barrier: when mutating an object obj, just store
- * a 1 byte at (uint8 *) ((jsuword)obj & ~1023) for little-endian platforms.
- * When finding flags, we'll of course have to mask split with ~255, but it is
- * guaranteed to be 1024-byte aligned, so no information is lost by overlaying
- * the card-mark byte on split's low byte.)
- */
-#define GC_PAGE_SHIFT   10
-#define GC_PAGE_MASK    ((jsuword) JS_BITMASK(GC_PAGE_SHIFT))
-#define GC_PAGE_SIZE    JS_BIT(GC_PAGE_SHIFT)
-
-typedef struct JSGCPageInfo {
-    uint8       *split;
-    uint8       *flags;
-} JSGCPageInfo;
-
-#define FIRST_THING_PAGE(a)     (((a)->base + GC_FLAGS_SIZE) & ~GC_PAGE_MASK)
-
-/*
- * Given a jsuword page pointer p and a thing size n, return the address of
- * the first thing in p.  We know that any n not a power of two packs from
- * the end of the page leaving at least enough room for one JSGCPageInfo, but
- * not for another thing, at the front of the page (JS_ASSERTs below insist
- * on this).
- *
- * This works because all allocations are a multiple of sizeof(JSGCThing) ==
- * sizeof(JSGCPageInfo) in size.
- */
-#define FIRST_THING(p,n)        (((n) & ((n) - 1))                            \
-                                 ? (p) + (uint32)(GC_PAGE_SIZE % (n))         \
-                                 : (p) + (n))
-
-static JSGCThing *
-gc_new_arena(JSArenaPool *pool, size_t nbytes)
-{
-    uint8 *flagp, *split, *pagep, *limit;
-    JSArena *a;
-    jsuword p;
-    JSGCThing *thing;
-    JSGCPageInfo *pi;
-
-    /* Use JS_ArenaAllocate to grab another 9K-net-size hunk of space. */
-    flagp = (uint8 *) JS_ArenaAllocate(pool, GC_ARENA_SIZE);
-    if (!flagp)
-        return NULL;
-    a = pool->current;
-
-    /* Reset a->avail to start at the flags split, aka the first thing page. */
-    p = FIRST_THING_PAGE(a);
-    split = pagep = (uint8 *) p;
-    a->avail = FIRST_THING(p, nbytes);
-    JS_ASSERT(a->avail >= p + sizeof(JSGCPageInfo));
-    thing = (JSGCThing *) a->avail;
-    JS_ArenaCountAllocation(pool, a->avail - p);
-    a->avail += nbytes;
-
-    /* Initialize the JSGCPageInfo records at the start of every thing page. */
-    limit = pagep + GC_THINGS_SIZE;
-    do {
-        pi = (JSGCPageInfo *) pagep;
-        pi->split = split;
-        pi->flags = flagp;
-        flagp += GC_PAGE_SIZE >> (GC_THINGS_SHIFT -  GC_PAGE_SHIFT);
-        pagep += GC_PAGE_SIZE;
-    } while (pagep < limit);
-    return thing;
-}
-
-uint8 *
-js_GetGCThingFlags(void *thing)
-{
-    JSGCPageInfo *pi;
-    uint8 *flagp;
-
-    pi = (JSGCPageInfo *) ((jsuword)thing & ~GC_PAGE_MASK);
-    flagp = pi->flags + ((jsuword)thing & GC_PAGE_MASK) / sizeof(JSGCThing);
-    if (flagp >= pi->split)
-        flagp += GC_THINGS_SIZE;
-    return flagp;
-}
-
-JSBool
-js_IsAboutToBeFinalized(JSContext *cx, void *thing)
-{
-    uint8 flags = *js_GetGCThingFlags(thing);
-
-    return !(flags & (GCF_MARK | GCF_LOCK | GCF_FINAL));
-}
-
-typedef void (*GCFinalizeOp)(JSContext *cx, JSGCThing *thing);
-
-#ifndef DEBUG
-# define js_FinalizeDouble       NULL
-#endif
-
-#if !JS_HAS_XML_SUPPORT
-# define js_FinalizeXMLNamespace NULL
-# define js_FinalizeXMLQName     NULL
-# define js_FinalizeXML          NULL
-#endif
-
-static GCFinalizeOp gc_finalizers[GCX_NTYPES] = {
-    (GCFinalizeOp) js_FinalizeObject,           /* GCX_OBJECT */
-    (GCFinalizeOp) js_FinalizeString,           /* GCX_STRING */
-    (GCFinalizeOp) js_FinalizeDouble,           /* GCX_DOUBLE */
-    (GCFinalizeOp) js_FinalizeString,           /* GCX_MUTABLE_STRING */
-    NULL,                                       /* GCX_PRIVATE */
-    (GCFinalizeOp) js_FinalizeXMLNamespace,     /* GCX_NAMESPACE */
-    (GCFinalizeOp) js_FinalizeXMLQName,         /* GCX_QNAME */
-    (GCFinalizeOp) js_FinalizeXML,              /* GCX_XML */
-    NULL,                                       /* GCX_EXTERNAL_STRING */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-#ifdef GC_MARK_DEBUG
-static const char newborn_external_string[] = "newborn external string";
-
-static const char *gc_typenames[GCX_NTYPES] = {
-    "newborn object",
-    "newborn string",
-    "newborn double",
-    "newborn mutable string",
-    "newborn private",
-    "newborn Namespace",
-    "newborn QName",
-    "newborn XML",
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string,
-    newborn_external_string
-};
-#endif
-
-intN
-js_ChangeExternalStringFinalizer(JSStringFinalizeOp oldop,
-                                 JSStringFinalizeOp newop)
-{
-    uintN i;
-
-    for (i = GCX_EXTERNAL_STRING; i < GCX_NTYPES; i++) {
-        if (gc_finalizers[i] == (GCFinalizeOp) oldop) {
-            gc_finalizers[i] = (GCFinalizeOp) newop;
-            return (intN) i;
-        }
-    }
-    return -1;
-}
-
-#ifdef JS_GCMETER
-#define METER(x) x
-#else
-#define METER(x) /* nothing */
-#endif
-
-/* Initial size of the gcRootsHash table (SWAG, small enough to amortize). */
-#define GC_ROOTS_SIZE   256
-#define GC_FINALIZE_LEN 1024
-
-JSBool
-js_InitGC(JSRuntime *rt, uint32 maxbytes)
-{
-    uintN i;
-
-    JS_ASSERT(sizeof(JSGCThing) == sizeof(JSGCPageInfo));
-    JS_ASSERT(sizeof(JSGCThing) >= sizeof(JSObject));
-    JS_ASSERT(sizeof(JSGCThing) >= sizeof(JSString));
-    JS_ASSERT(sizeof(JSGCThing) >= sizeof(jsdouble));
-    JS_ASSERT(GC_FLAGS_SIZE >= GC_PAGE_SIZE);
-    JS_ASSERT(sizeof(JSStackHeader) >= 2 * sizeof(jsval));
-
-    for (i = 0; i < GC_NUM_FREELISTS; i++)
-        JS_InitArenaPool(&rt->gcArenaPool[i], "gc-arena", GC_ARENA_SIZE, 1);
-    if (!JS_DHashTableInit(&rt->gcRootsHash, JS_DHashGetStubOps(), NULL,
-                           sizeof(JSGCRootHashEntry), GC_ROOTS_SIZE)) {
-        rt->gcRootsHash.ops = NULL;
-        return JS_FALSE;
-    }
-    rt->gcLocksHash = NULL;     /* create lazily */
-    rt->gcMaxBytes = maxbytes;
-    return JS_TRUE;
-}
-
-#ifdef JS_GCMETER
-JS_FRIEND_API(void)
-js_DumpGCStats(JSRuntime *rt, FILE *fp)
-{
-    uintN i;
-
-    fprintf(fp, "\nGC allocation statistics:\n");
-
-#define UL(x)       ((unsigned long)(x))
-#define ULSTAT(x)   UL(rt->gcStats.x)
-    fprintf(fp, "     public bytes allocated: %lu\n", UL(rt->gcBytes));
-    fprintf(fp, "    private bytes allocated: %lu\n", UL(rt->gcPrivateBytes));
-    fprintf(fp, "             alloc attempts: %lu\n", ULSTAT(alloc));
-    for (i = 0; i < GC_NUM_FREELISTS; i++) {
-        fprintf(fp, "       GC freelist %u length: %lu\n",
-                i, ULSTAT(freelen[i]));
-        fprintf(fp, " recycles via GC freelist %u: %lu\n",
-                i, ULSTAT(recycle[i]));
-    }
-    fprintf(fp, "allocation retries after GC: %lu\n", ULSTAT(retry));
-    fprintf(fp, "        allocation failures: %lu\n", ULSTAT(fail));
-    fprintf(fp, "         things born locked: %lu\n", ULSTAT(lockborn));
-    fprintf(fp, "           valid lock calls: %lu\n", ULSTAT(lock));
-    fprintf(fp, "         valid unlock calls: %lu\n", ULSTAT(unlock));
-    fprintf(fp, "       mark recursion depth: %lu\n", ULSTAT(depth));
-    fprintf(fp, "     maximum mark recursion: %lu\n", ULSTAT(maxdepth));
-    fprintf(fp, "     mark C recursion depth: %lu\n", ULSTAT(cdepth));
-    fprintf(fp, "   maximum mark C recursion: %lu\n", ULSTAT(maxcdepth));
-    fprintf(fp, "     mark C stack overflows: %lu\n", ULSTAT(dswmark));
-    fprintf(fp, "   mark DSW recursion depth: %lu\n", ULSTAT(dswdepth));
-    fprintf(fp, " maximum mark DSW recursion: %lu\n", ULSTAT(maxdswdepth));
-    fprintf(fp, "  mark DSW up-tree movement: %lu\n", ULSTAT(dswup));
-    fprintf(fp, "DSW up-tree obj->slot steps: %lu\n", ULSTAT(dswupstep));
-    fprintf(fp, "   maximum GC nesting level: %lu\n", ULSTAT(maxlevel));
-    fprintf(fp, "potentially useful GC calls: %lu\n", ULSTAT(poke));
-    fprintf(fp, "           useless GC calls: %lu\n", ULSTAT(nopoke));
-    fprintf(fp, "  thing arenas freed so far: %lu\n", ULSTAT(afree));
-    fprintf(fp, "     stack segments scanned: %lu\n", ULSTAT(stackseg));
-    fprintf(fp, "stack segment slots scanned: %lu\n", ULSTAT(segslots));
-#undef UL
-#undef US
-
-#ifdef JS_ARENAMETER
-    JS_DumpArenaStats(fp);
-#endif
-}
-#endif
-
-#ifdef DEBUG
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-js_root_printer(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 i, void *arg)
-{
-    uint32 *leakedroots = (uint32 *)arg;
-    JSGCRootHashEntry *rhe = (JSGCRootHashEntry *)hdr;
-
-    (*leakedroots)++;
-    fprintf(stderr,
-            "JS engine warning: leaking GC root \'%s\' at %p\n",
-            rhe->name ? (char *)rhe->name : "", rhe->root);
-
-    return JS_DHASH_NEXT;
-}
-#endif
-
-void
-js_FinishGC(JSRuntime *rt)
-{
-    uintN i;
-
-#ifdef JS_ARENAMETER
-    JS_DumpArenaStats(stdout);
-#endif
-#ifdef JS_GCMETER
-    js_DumpGCStats(rt, stdout);
-#endif
-    for (i = 0; i < GC_NUM_FREELISTS; i++) {
-        JS_FinishArenaPool(&rt->gcArenaPool[i]);
-        rt->gcFreeList[i] = NULL;
-    }
-    JS_ArenaFinish();
-
-    if (rt->gcRootsHash.ops) {
-#ifdef DEBUG
-        uint32 leakedroots = 0;
-
-        /* Warn (but don't assert) debug builds of any remaining roots. */
-        JS_DHashTableEnumerate(&rt->gcRootsHash, js_root_printer,
-                               &leakedroots);
-        if (leakedroots > 0) {
-            if (leakedroots == 1) {
-                fprintf(stderr,
-"JS engine warning: 1 GC root remains after destroying the JSRuntime.\n"
-"                   This root may point to freed memory. Objects reachable\n"
-"                   through it have not been finalized.\n");
-            } else {
-                fprintf(stderr,
-"JS engine warning: %lu GC roots remain after destroying the JSRuntime.\n"
-"                   These roots may point to freed memory. Objects reachable\n"
-"                   through them have not been finalized.\n",
-                        (unsigned long) leakedroots);
-            }
-        }
-#endif
-
-        JS_DHashTableFinish(&rt->gcRootsHash);
-        rt->gcRootsHash.ops = NULL;
-    }
-    if (rt->gcLocksHash) {
-        JS_DHashTableDestroy(rt->gcLocksHash);
-        rt->gcLocksHash = NULL;
-    }
-}
-
-JSBool
-js_AddRoot(JSContext *cx, void *rp, const char *name)
-{
-    JSBool ok = js_AddRootRT(cx->runtime, rp, name);
-    if (!ok)
-        JS_ReportOutOfMemory(cx);
-    return ok;
-}
-
-JSBool
-js_AddRootRT(JSRuntime *rt, void *rp, const char *name)
-{
-    JSBool ok;
-    JSGCRootHashEntry *rhe;
-
-    /*
-     * Due to the long-standing, but now removed, use of rt->gcLock across the
-     * bulk of js_GC, API users have come to depend on JS_AddRoot etc. locking
-     * properly with a racing GC, without calling JS_AddRoot from a request.
-     * We have to preserve API compatibility here, now that we avoid holding
-     * rt->gcLock across the mark phase (including the root hashtable mark).
-     *
-     * If the GC is running and we're called on another thread, wait for this
-     * GC activation to finish.  We can safely wait here (in the case where we
-     * are called within a request on another thread's context) without fear
-     * of deadlock because the GC doesn't set rt->gcRunning until after it has
-     * waited for all active requests to end.
-     */
-    JS_LOCK_GC(rt);
-#ifdef JS_THREADSAFE
-    JS_ASSERT(!rt->gcRunning || rt->gcLevel > 0);
-    if (rt->gcRunning && rt->gcThread != js_CurrentThreadId()) {
-        do {
-            JS_AWAIT_GC_DONE(rt);
-        } while (rt->gcLevel > 0);
-    }
-#endif
-    rhe = (JSGCRootHashEntry *) JS_DHashTableOperate(&rt->gcRootsHash, rp,
-                                                     JS_DHASH_ADD);
-    if (rhe) {
-        rhe->root = rp;
-        rhe->name = name;
-        ok = JS_TRUE;
-    } else {
-        ok = JS_FALSE;
-    }
-    JS_UNLOCK_GC(rt);
-    return ok;
-}
-
-JSBool
-js_RemoveRoot(JSRuntime *rt, void *rp)
-{
-    /*
-     * Due to the JS_RemoveRootRT API, we may be called outside of a request.
-     * Same synchronization drill as above in js_AddRoot.
-     */
-    JS_LOCK_GC(rt);
-#ifdef JS_THREADSAFE
-    JS_ASSERT(!rt->gcRunning || rt->gcLevel > 0);
-    if (rt->gcRunning && rt->gcThread != js_CurrentThreadId()) {
-        do {
-            JS_AWAIT_GC_DONE(rt);
-        } while (rt->gcLevel > 0);
-    }
-#endif
-    (void) JS_DHashTableOperate(&rt->gcRootsHash, rp, JS_DHASH_REMOVE);
-    rt->gcPoke = JS_TRUE;
-    JS_UNLOCK_GC(rt);
-    return JS_TRUE;
-}
-
-#ifdef DEBUG_brendan
-#define NGCHIST 64
-
-static struct GCHist {
-    JSBool      lastDitch;
-    JSGCThing   *freeList;
-} gchist[NGCHIST];
-
-unsigned gchpos;
-#endif
-
-void *
-js_NewGCThing(JSContext *cx, uintN flags, size_t nbytes)
-{
-    JSBool tried_gc;
-    JSRuntime *rt;
-    size_t nflags;
-    uintN i;
-    JSGCThing *thing, **flp;
-    uint8 *flagp;
-    JSLocalRootStack *lrs;
-    uint32 *bytesptr;
-
-    rt = cx->runtime;
-    JS_LOCK_GC(rt);
-    JS_ASSERT(!rt->gcRunning);
-    if (rt->gcRunning) {
-        METER(rt->gcStats.finalfail++);
-        JS_UNLOCK_GC(rt);
-        return NULL;
-    }
-
-#ifdef TOO_MUCH_GC
-#ifdef WAY_TOO_MUCH_GC
-    rt->gcPoke = JS_TRUE;
-#endif
-    js_GC(cx, GC_KEEP_ATOMS | GC_ALREADY_LOCKED);
-    tried_gc = JS_TRUE;
-#else
-    tried_gc = JS_FALSE;
-#endif
-
-    METER(rt->gcStats.alloc++);
-    nbytes = JS_ROUNDUP(nbytes, sizeof(JSGCThing));
-    nflags = nbytes / sizeof(JSGCThing);
-    i = GC_FREELIST_INDEX(nbytes);
-    flp = &rt->gcFreeList[i];
-
-retry:
-    thing = *flp;
-    if (thing) {
-        *flp = thing->next;
-        flagp = thing->flagp;
-        METER(rt->gcStats.freelen[i]--);
-        METER(rt->gcStats.recycle[i]++);
-    } else {
-        if (rt->gcBytes < rt->gcMaxBytes &&
-            (tried_gc || rt->gcMallocBytes < rt->gcMaxBytes))
-        {
-            /*
-             * Inline form of JS_ARENA_ALLOCATE adapted to truncate the current
-             * arena's limit to a GC_PAGE_SIZE boundary, and to skip over every
-             * GC_PAGE_SIZE-byte-aligned thing (which is actually not a thing,
-             * it's a JSGCPageInfo record).
-             */
-            JSArenaPool *pool = &rt->gcArenaPool[i];
-            JSArena *a = pool->current;
-            jsuword p = a->avail;
-            jsuword q = p + nbytes;
-
-            if (q > (a->limit & ~GC_PAGE_MASK)) {
-                thing = gc_new_arena(pool, nbytes);
-            } else {
-                if ((p & GC_PAGE_MASK) == 0) {
-                    /* Beware, p points to a JSGCPageInfo record! */
-                    p = FIRST_THING(p, nbytes);
-                    q = p + nbytes;
-                    JS_ArenaCountAllocation(pool, p & GC_PAGE_MASK);
-                }
-                a->avail = q;
-                thing = (JSGCThing *)p;
-            }
-            JS_ArenaCountAllocation(pool, nbytes);
-        }
-
-        /*
-         * Consider doing a "last ditch" GC if thing couldn't be allocated.
-         *
-         * Keep rt->gcLock across the call into js_GC so we don't starve and
-         * lose to racing threads who deplete the heap just after js_GC has
-         * replenished it (or has synchronized with a racing GC that collected
-         * a bunch of garbage).  This unfair scheduling can happen on certain
-         * operating systems.  For the gory details, see Mozilla bug 162779
-         * (http://bugzilla.mozilla.org/show_bug.cgi?id=162779).
-         */
-        if (!thing) {
-            if (!tried_gc) {
-                rt->gcPoke = JS_TRUE;
-                js_GC(cx, GC_KEEP_ATOMS | GC_ALREADY_LOCKED);
-                if (JS_HAS_NATIVE_BRANCH_CALLBACK_OPTION(cx) &&
-                    cx->branchCallback &&
-                    !cx->branchCallback(cx, NULL)) {
-                    METER(rt->gcStats.retryhalt++);
-                    JS_UNLOCK_GC(rt);
-                    return NULL;
-                }
-                tried_gc = JS_TRUE;
-                METER(rt->gcStats.retry++);
-                goto retry;
-            }
-            goto fail;
-        }
-
-        /* Find the flags pointer given thing's address. */
-        flagp = js_GetGCThingFlags(thing);
-    }
-
-    lrs = cx->localRootStack;
-    if (lrs) {
-        /*
-         * If we're in a local root scope, don't set cx->newborn[type] at all,
-         * to avoid entraining garbage from it for an unbounded amount of time
-         * on this context.  A caller will leave the local root scope and pop
-         * this reference, allowing thing to be GC'd if it has no other refs.
-         * See JS_EnterLocalRootScope and related APIs.
-         */
-        if (js_PushLocalRoot(cx, lrs, (jsval) thing) < 0)
-            goto fail;
-    } else {
-        /*
-         * No local root scope, so we're stuck with the old, fragile model of
-         * depending on a pigeon-hole newborn per type per context.
-         */
-        cx->newborn[flags & GCF_TYPEMASK] = thing;
-    }
-
-    /* We can't fail now, so update flags and rt->gc{,Private}Bytes. */
-    *flagp = (uint8)flags;
-    bytesptr = ((flags & GCF_TYPEMASK) == GCX_PRIVATE)
-               ? &rt->gcPrivateBytes
-               : &rt->gcBytes;
-    *bytesptr += nbytes + nflags;
-
-    /*
-     * Clear thing before unlocking in case a GC run is about to scan it,
-     * finding it via cx->newborn[].
-     */
-    thing->next = NULL;
-    thing->flagp = NULL;
-#ifdef DEBUG_brendan
-    gchist[gchpos].lastDitch = tried_gc;
-    gchist[gchpos].freeList = *flp;
-    if (++gchpos == NGCHIST)
-        gchpos = 0;
-#endif
-    METER(if (flags & GCF_LOCK) rt->gcStats.lockborn++);
-    JS_UNLOCK_GC(rt);
-    return thing;
-
-fail:
-    METER(rt->gcStats.fail++);
-    JS_UNLOCK_GC(rt);
-    JS_ReportOutOfMemory(cx);
-    return NULL;
-}
-
-JSBool
-js_LockGCThing(JSContext *cx, void *thing)
-{
-    JSBool ok = js_LockGCThingRT(cx->runtime, thing);
-    if (!ok)
-        JS_ReportOutOfMemory(cx);
-    return ok;
-}
-
-/*
- * Deep GC-things can't be locked just by setting the GCF_LOCK bit, because
- * their descendants must be marked by the GC.  To find them during the mark
- * phase, they are added to rt->gcLocksHash, which is created lazily.
- *
- * NB: we depend on the order of GC-thing type indexes here!
- */
-#define GC_TYPE_IS_STRING(t)    ((t) == GCX_STRING ||                         \
-                                 (t) >= GCX_EXTERNAL_STRING)
-#define GC_TYPE_IS_XML(t)       ((unsigned)((t) - GCX_NAMESPACE) <=           \
-                                 (unsigned)(GCX_XML - GCX_NAMESPACE))
-#define GC_TYPE_IS_DEEP(t)      ((t) == GCX_OBJECT || GC_TYPE_IS_XML(t))
-
-#define IS_DEEP_STRING(t,o)     (GC_TYPE_IS_STRING(t) &&                      \
-                                 JSSTRING_IS_DEPENDENT((JSString *)(o)))
-
-#define GC_THING_IS_DEEP(t,o)   (GC_TYPE_IS_DEEP(t) || IS_DEEP_STRING(t, o))
-
-JSBool
-js_LockGCThingRT(JSRuntime *rt, void *thing)
-{
-    JSBool ok, deep;
-    uint8 *flagp, flags, lock, type;
-    JSGCLockHashEntry *lhe;
-
-    ok = JS_TRUE;
-    if (!thing)
-        return ok;
-
-    flagp = js_GetGCThingFlags(thing);
-
-    JS_LOCK_GC(rt);
-    flags = *flagp;
-    lock = (flags & GCF_LOCK);
-    type = (flags & GCF_TYPEMASK);
-    deep = GC_THING_IS_DEEP(type, thing);
-
-    /*
-     * Avoid adding a rt->gcLocksHash entry for shallow things until someone
-     * nests a lock -- then start such an entry with a count of 2, not 1.
-     */
-    if (lock || deep) {
-        if (!rt->gcLocksHash) {
-            rt->gcLocksHash =
-                JS_NewDHashTable(JS_DHashGetStubOps(), NULL,
-                                 sizeof(JSGCLockHashEntry),
-                                 GC_ROOTS_SIZE);
-            if (!rt->gcLocksHash) {
-                ok = JS_FALSE;
-                goto done;
-            }
-        } else if (lock == 0) {
-#ifdef DEBUG
-            JSDHashEntryHdr *hdr =
-                JS_DHashTableOperate(rt->gcLocksHash, thing,
-                                     JS_DHASH_LOOKUP);
-            JS_ASSERT(JS_DHASH_ENTRY_IS_FREE(hdr));
-#endif
-        }
-
-        lhe = (JSGCLockHashEntry *)
-            JS_DHashTableOperate(rt->gcLocksHash, thing, JS_DHASH_ADD);
-        if (!lhe) {
-            ok = JS_FALSE;
-            goto done;
-        }
-        if (!lhe->thing) {
-            lhe->thing = thing;
-            lhe->count = deep ? 1 : 2;
-        } else {
-            JS_ASSERT(lhe->count >= 1);
-            lhe->count++;
-        }
-    }
-
-    *flagp = (uint8)(flags | GCF_LOCK);
-    METER(rt->gcStats.lock++);
-    ok = JS_TRUE;
-done:
-    JS_UNLOCK_GC(rt);
-    return ok;
-}
-
-JSBool
-js_UnlockGCThingRT(JSRuntime *rt, void *thing)
-{
-    uint8 *flagp, flags;
-    JSGCLockHashEntry *lhe;
-
-    if (!thing)
-        return JS_TRUE;
-
-    flagp = js_GetGCThingFlags(thing);
-    JS_LOCK_GC(rt);
-    flags = *flagp;
-
-    if (flags & GCF_LOCK) {
-        if (!rt->gcLocksHash ||
-            (lhe = (JSGCLockHashEntry *)
-                   JS_DHashTableOperate(rt->gcLocksHash, thing,
-                                        JS_DHASH_LOOKUP),
-             JS_DHASH_ENTRY_IS_FREE(&lhe->hdr))) {
-            /* Shallow GC-thing with an implicit lock count of 1. */
-            JS_ASSERT(!GC_THING_IS_DEEP(flags & GCF_TYPEMASK, thing));
-        } else {
-            /* Basis or nested unlock of a deep thing, or nested of shallow. */
-            if (--lhe->count != 0)
-                goto out;
-            JS_DHashTableOperate(rt->gcLocksHash, thing, JS_DHASH_REMOVE);
-        }
-        *flagp = (uint8)(flags & ~GCF_LOCK);
-    }
-
-    rt->gcPoke = JS_TRUE;
-out:
-    METER(rt->gcStats.unlock++);
-    JS_UNLOCK_GC(rt);
-    return JS_TRUE;
-}
-
-#ifdef GC_MARK_DEBUG
-
-#include <stdio.h>
-#include "jsprf.h"
-
-JS_FRIEND_DATA(FILE *) js_DumpGCHeap;
-JS_EXPORT_DATA(void *) js_LiveThingToFind;
-
-#ifdef HAVE_XPCONNECT
-#include "dump_xpc.h"
-#endif
-
-static const char *
-gc_object_class_name(void* thing)
-{
-    uint8 *flagp = js_GetGCThingFlags(thing);
-    const char *className = "";
-    static char depbuf[32];
-
-    switch (*flagp & GCF_TYPEMASK) {
-      case GCX_OBJECT: {
-        JSObject  *obj = (JSObject *)thing;
-        JSClass   *clasp = JSVAL_TO_PRIVATE(obj->slots[JSSLOT_CLASS]);
-        className = clasp->name;
-#ifdef HAVE_XPCONNECT
-        if (clasp->flags & JSCLASS_PRIVATE_IS_NSISUPPORTS) {
-            jsval privateValue = obj->slots[JSSLOT_PRIVATE];
-
-            JS_ASSERT(clasp->flags & JSCLASS_HAS_PRIVATE);
-            if (!JSVAL_IS_VOID(privateValue)) {
-                void  *privateThing = JSVAL_TO_PRIVATE(privateValue);
-                const char *xpcClassName = GetXPCObjectClassName(privateThing);
-
-                if (xpcClassName)
-                    className = xpcClassName;
-            }
-        }
-#endif
-        break;
-      }
-
-      case GCX_STRING:
-      case GCX_MUTABLE_STRING: {
-        JSString *str = (JSString *)thing;
-        if (JSSTRING_IS_DEPENDENT(str)) {
-            JS_snprintf(depbuf, sizeof depbuf, "start:%u, length:%u",
-                        JSSTRDEP_START(str), JSSTRDEP_LENGTH(str));
-            className = depbuf;
-        } else {
-            className = "string";
-        }
-        break;
-      }
-
-      case GCX_DOUBLE:
-        className = "double";
-        break;
-    }
-
-    return className;
-}
-
-static void
-gc_dump_thing(JSGCThing *thing, uint8 flags, GCMarkNode *prev, FILE *fp)
-{
-    GCMarkNode *next = NULL;
-    char *path = NULL;
-
-    while (prev) {
-        next = prev;
-        prev = prev->prev;
-    }
-    while (next) {
-        uint8 nextFlags = *js_GetGCThingFlags(next->thing);
-        if ((nextFlags & GCF_TYPEMASK) == GCX_OBJECT) {
-            path = JS_sprintf_append(path, "%s(%s @ 0x%08p).",
-                                     next->name,
-                                     gc_object_class_name(next->thing),
-                                     (JSObject*)next->thing);
-        } else {
-            path = JS_sprintf_append(path, "%s(%s).",
-                                     next->name,
-                                     gc_object_class_name(next->thing));
-        }
-        next = next->next;
-    }
-    if (!path)
-        return;
-
-    fprintf(fp, "%08lx ", (long)thing);
-    switch (flags & GCF_TYPEMASK) {
-      case GCX_OBJECT:
-      {
-        JSObject  *obj = (JSObject *)thing;
-        jsval     privateValue = obj->slots[JSSLOT_PRIVATE];
-        void      *privateThing = JSVAL_IS_VOID(privateValue)
-                                  ? NULL
-                                  : JSVAL_TO_PRIVATE(privateValue);
-        const char *className = gc_object_class_name(thing);
-        fprintf(fp, "object %8p %s", privateThing, className);
-        break;
-      }
-#if JS_HAS_XML_SUPPORT
-      case GCX_NAMESPACE:
-      {
-        JSXMLNamespace *ns = (JSXMLNamespace *)thing;
-        fprintf(fp, "namespace %s:%s",
-                JS_GetStringBytes(ns->prefix), JS_GetStringBytes(ns->uri));
-        break;
-      }
-      case GCX_QNAME:
-      {
-        JSXMLQName *qn = (JSXMLQName *)thing;
-        fprintf(fp, "qname %s(%s):%s",
-                JS_GetStringBytes(qn->prefix), JS_GetStringBytes(qn->uri),
-                JS_GetStringBytes(qn->localName));
-        break;
-      }
-      case GCX_XML:
-      {
-        extern const char *js_xml_class_str[];
-        JSXML *xml = (JSXML *)thing;
-        fprintf(fp, "xml %8p %s", xml, js_xml_class_str[xml->xml_class]);
-        break;
-      }
-#endif
-      case GCX_DOUBLE:
-        fprintf(fp, "double %g", *(jsdouble *)thing);
-        break;
-      case GCX_PRIVATE:
-        fprintf(fp, "private %8p", (void *)thing);
-        break;
-      default:
-        fprintf(fp, "string %s", JS_GetStringBytes((JSString *)thing));
-        break;
-    }
-    fprintf(fp, " via %s\n", path);
-    free(path);
-}
-
-#endif /* !GC_MARK_DEBUG */
-
-static void
-gc_mark_atom_key_thing(void *thing, void *arg)
-{
-    JSContext *cx = (JSContext *) arg;
-
-    GC_MARK(cx, thing, "atom", NULL);
-}
-
-void
-js_MarkAtom(JSContext *cx, JSAtom *atom, void *arg)
-{
-    jsval key;
-
-    if (atom->flags & ATOM_MARK)
-        return;
-    atom->flags |= ATOM_MARK;
-    key = ATOM_KEY(atom);
-    if (JSVAL_IS_GCTHING(key)) {
-#ifdef GC_MARK_DEBUG
-        char name[32];
-
-        if (JSVAL_IS_STRING(key)) {
-            JS_snprintf(name, sizeof name, "'%s'",
-                        JS_GetStringBytes(JSVAL_TO_STRING(key)));
-        } else {
-            JS_snprintf(name, sizeof name, "<%x>", key);
-        }
-#endif
-        GC_MARK(cx, JSVAL_TO_GCTHING(key), name, arg);
-    }
-    if (atom->flags & ATOM_HIDDEN)
-        js_MarkAtom(cx, atom->entry.value, arg);
-}
-
-/*
- * These macros help avoid passing the GC_MARK_DEBUG-only |arg| parameter
- * during recursive calls when GC_MARK_DEBUG is not defined.
- */
-#ifdef GC_MARK_DEBUG
-# define UNMARKED_GC_THING_FLAGS(thing, arg)                                  \
-    UnmarkedGCThingFlags(thing, arg)
-# define NEXT_UNMARKED_GC_THING(vp, end, thingp, flagpp, arg)                 \
-    NextUnmarkedGCThing(vp, end, thingp, flagpp, arg)
-# define MARK_GC_THING(cx, thing, flagp, arg)                                 \
-    MarkGCThing(cx, thing, flagp, arg)
-# define CALL_GC_THING_MARKER(marker, cx, thing, arg)                         \
-    marker(cx, thing, arg)
-#else
-# define UNMARKED_GC_THING_FLAGS(thing, arg)                                  \
-    UnmarkedGCThingFlags(thing)
-# define NEXT_UNMARKED_GC_THING(vp, end, thingp, flagpp, arg)                 \
-    NextUnmarkedGCThing(vp, end, thingp, flagpp)
-# define MARK_GC_THING(cx, thing, flagp, arg)                                 \
-    MarkGCThing(cx, thing, flagp)
-# define CALL_GC_THING_MARKER(marker, cx, thing, arg)                         \
-    marker(cx, thing, NULL)
-#endif
-
-static uint8 *
-UNMARKED_GC_THING_FLAGS(void *thing, void *arg)
-{
-    uint8 flags, *flagp;
-
-    if (!thing)
-        return NULL;
-
-    flagp = js_GetGCThingFlags(thing);
-    flags = *flagp;
-    JS_ASSERT(flags != GCF_FINAL);
-#ifdef GC_MARK_DEBUG
-    if (js_LiveThingToFind == thing)
-        gc_dump_thing(thing, flags, arg, stderr);
-#endif
-
-    if (flags & GCF_MARK)
-        return NULL;
-
-    return flagp;
-}
-
-static jsval *
-NEXT_UNMARKED_GC_THING(jsval *vp, jsval *end, void **thingp, uint8 **flagpp,
-                       void *arg)
-{
-    jsval v;
-    void *thing;
-    uint8 *flagp;
-
-    while (vp < end) {
-        v = *vp;
-        if (JSVAL_IS_GCTHING(v)) {
-            thing = JSVAL_TO_GCTHING(v);
-            flagp = UNMARKED_GC_THING_FLAGS(thing, arg);
-            if (flagp) {
-                *thingp = thing;
-                *flagpp = flagp;
-                return vp;
-            }
-        }
-        vp++;
-    }
-    return NULL;
-}
-
-static void
-DeutschSchorrWaite(JSContext *cx, void *thing, uint8 *flagp);
-
-static JSBool
-MARK_GC_THING(JSContext *cx, void *thing, uint8 *flagp, void *arg)
-{
-    JSRuntime *rt;
-    JSObject *obj;
-    jsval v, *vp, *end;
-    JSString *str;
-    void *next_thing;
-    uint8 *next_flagp;
-#ifdef JS_GCMETER
-    uint32 tailCallNesting;
-#endif
-#ifdef GC_MARK_DEBUG
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    char name[32];
-#endif
-    int stackDummy;
-
-    rt = cx->runtime;
-    METER(tailCallNesting = 0);
-    METER(if (++rt->gcStats.cdepth > rt->gcStats.maxcdepth)
-              rt->gcStats.maxcdepth = rt->gcStats.cdepth);
-
-#ifndef GC_MARK_DEBUG
-  start:
-#endif
-    JS_ASSERT(flagp);
-    METER(if (++rt->gcStats.depth > rt->gcStats.maxdepth)
-              rt->gcStats.maxdepth = rt->gcStats.depth);
-    if (*flagp & GCF_MARK) {
-        /*
-         * This should happen only if recursive MARK_GC_THING marks flags
-         * already stored in the caller's *next_flagp.
-         */
-        goto out;
-    }
-
-    *flagp |= GCF_MARK;
-
-#ifdef GC_MARK_DEBUG
-    if (js_DumpGCHeap)
-        gc_dump_thing(thing, *flagp, arg, js_DumpGCHeap);
-#endif
-
-    switch (*flagp & GCF_TYPEMASK) {
-      case GCX_OBJECT:
-        /* If obj->slots is null, obj must be a newborn. */
-        obj = (JSObject *) thing;
-        vp = obj->slots;
-        if (!vp)
-            goto out;
-
-        /* Switch to Deutsch-Schorr-Waite if we exhaust our stack quota. */
-        if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-            METER(rt->gcStats.dswmark++);
-            DeutschSchorrWaite(cx, thing, flagp);
-            goto out;
-        }
-
-        /* Mark slots if they are small enough to be GC-allocated. */
-        if ((vp[-1] + 1) * sizeof(jsval) <= GC_NBYTES_MAX)
-            GC_MARK(cx, vp - 1, "slots", arg);
-
-        /* Set up local variables to loop over unmarked things. */
-        end = vp + ((obj->map->ops->mark)
-                    ? CALL_GC_THING_MARKER(obj->map->ops->mark, cx, obj, arg)
-                    : JS_MIN(obj->map->freeslot, obj->map->nslots));
-
-        vp = NEXT_UNMARKED_GC_THING(vp, end, &thing, &flagp, arg);
-        if (!vp)
-            goto out;
-        v = *vp;
-
-        /*
-         * Here, thing is the first value in obj->slots referring to an
-         * unmarked GC-thing.
-         */
-#ifdef GC_MARK_DEBUG
-        scope = OBJ_IS_NATIVE(obj) ? OBJ_SCOPE(obj) : NULL;
-#endif
-        for (;;) {
-            /* Check loop invariants. */
-            JS_ASSERT(v == *vp && JSVAL_IS_GCTHING(v));
-            JS_ASSERT(thing == JSVAL_TO_GCTHING(v));
-            JS_ASSERT(flagp == js_GetGCThingFlags(thing));
-
-#ifdef GC_MARK_DEBUG
-            if (scope) {
-                uint32 slot;
-                jsval nval;
-
-                slot = vp - obj->slots;
-                for (sprop = SCOPE_LAST_PROP(scope); ; sprop = sprop->parent) {
-                    if (!sprop) {
-                        switch (slot) {
-                          case JSSLOT_PROTO:
-                            strcpy(name, js_proto_str);
-                            break;
-                          case JSSLOT_PARENT:
-                            strcpy(name, js_parent_str);
-                            break;
-                          default:
-                            JS_snprintf(name, sizeof name,
-                                        "**UNKNOWN SLOT %ld**",
-                                        (long)slot);
-                            break;
-                        }
-                        break;
-                    }
-                    if (sprop->slot == slot) {
-                        nval = ID_TO_VALUE(sprop->id);
-                        if (JSVAL_IS_INT(nval)) {
-                            JS_snprintf(name, sizeof name, "%ld",
-                                        (long)JSVAL_TO_INT(nval));
-                        } else if (JSVAL_IS_STRING(nval)) {
-                            JS_snprintf(name, sizeof name, "%s",
-                              JS_GetStringBytes(JSVAL_TO_STRING(nval)));
-                        } else {
-                            strcpy(name, "**FINALIZED ATOM KEY**");
-                        }
-                        break;
-                    }
-                }
-            } else {
-                strcpy(name, "**UNKNOWN OBJECT MAP ENTRY**");
-            }
-#endif
-
-            do {
-                vp = NEXT_UNMARKED_GC_THING(vp+1, end, &next_thing, &next_flagp,
-                                            arg);
-                if (!vp) {
-                    /*
-                     * Here thing came from the last unmarked GC-thing slot.
-                     * We can eliminate tail recursion unless GC_MARK_DEBUG
-                     * is defined.
-                     */
-#ifdef GC_MARK_DEBUG
-                    GC_MARK(cx, thing, name, arg);
-                    goto out;
-#else
-                    METER(++tailCallNesting);
-                    goto start;
-#endif
-                }
-            } while (next_thing == thing);
-            v = *vp;
-
-#ifdef GC_MARK_DEBUG
-            GC_MARK(cx, thing, name, arg);
-#else
-            MARK_GC_THING(cx, thing, flagp, arg);
-#endif
-            thing = next_thing;
-            flagp = next_flagp;
-        }
-        break;
-
-#ifdef DEBUG
-      case GCX_STRING:
-        str = (JSString *)thing;
-        JS_ASSERT(!JSSTRING_IS_DEPENDENT(str));
-        break;
-#endif
-
-      case GCX_MUTABLE_STRING:
-        str = (JSString *)thing;
-        if (JSSTRING_IS_DEPENDENT(str)) {
-            thing = JSSTRDEP_BASE(str);
-            flagp = UNMARKED_GC_THING_FLAGS(thing, arg);
-            if (flagp) {
-#ifdef GC_MARK_DEBUG
-                GC_MARK(cx, thing, "base", arg);
-                goto out;
-#else
-                METER(++tailCallNesting);
-                goto start;
-#endif
-            }
-        }
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case GCX_NAMESPACE:
-        CALL_GC_THING_MARKER(js_MarkXMLNamespace, cx, (JSXMLNamespace *)thing,
-                             arg);
-        break;
-
-      case GCX_QNAME:
-        CALL_GC_THING_MARKER(js_MarkXMLQName, cx, (JSXMLQName *)thing, arg);
-        break;
-
-      case GCX_XML:
-        CALL_GC_THING_MARKER(js_MarkXML, cx, (JSXML *)thing, arg);
-        break;
-#endif
-    }
-
-out:
-    METER(rt->gcStats.depth -= 1 + tailCallNesting);
-    METER(rt->gcStats.cdepth--);
-    return JS_TRUE;
-}
-
-/*
- * An invalid object reference that's distinct from JSVAL_TRUE and JSVAL_FALSE
- * when tagged as a boolean.  Used to indicate empty DSW mark stack.
- *
- * Reversed pointers that link the DSW mark stack through obj->slots entries
- * are also tagged as booleans so we can find each pointer and unreverse it.
- * Because no object pointer is <= 16, these values can be distinguished from
- * JSVAL_EMPTY, JSVAL_TRUE, and JSVAL_FALSE.
- */
-#define JSVAL_EMPTY (2 << JSVAL_TAGBITS)
-
-/*
- * To optimize native objects to avoid O(n^2) explosion in pathological cases,
- * we use a dswIndex member of JSScope to tell where in obj->slots to find the
- * reversed pointer.  Scrounging space in JSScope by packing existing members
- * tighter yielded 16 bits of index, which we use directly if obj->slots has
- * 64K or fewer slots.  Otherwise we make scope->dswIndex a fixed-point 16-bit
- * fraction of the number of slots.
- */
-static JS_INLINE uint16
-EncodeDSWIndex(jsval *vp, jsval *slots)
-{
-    uint32 nslots, limit, index;
-    jsdouble d;
-
-    nslots = slots[-1];
-    limit = JS_BIT(16);
-    index = PTRDIFF(vp, slots, jsval);
-    JS_ASSERT(index < nslots);
-    if (nslots > limit) {
-        d = ((jsdouble)index / nslots) * limit;
-        JS_ASSERT(0 <= d && d < limit);
-        return (uint16) d;
-    }
-    return (uint16) index;
-}
-
-static JS_INLINE uint32
-DecodeDSWIndex(uint16 dswIndex, jsval *slots)
-{
-    uint32 nslots, limit;
-    jsdouble d;
-
-    nslots = slots[-1];
-    limit = JS_BIT(16);
-    JS_ASSERT(dswIndex < nslots);
-    if (nslots > limit) {
-        d = ((jsdouble)dswIndex * nslots) / limit;
-        JS_ASSERT(0 <= d && d < nslots);
-        return (uint32) d;
-    }
-    return dswIndex;
-}
-
-static void
-DeutschSchorrWaite(JSContext *cx, void *thing, uint8 *flagp)
-{
-    jsval top, parent, v, *vp, *end;
-    JSObject *obj;
-    JSScope *scope;
-#ifdef JS_GCMETER
-    JSRuntime *rt = cx->runtime;
-#endif
-
-    top = JSVAL_EMPTY;
-
-down:
-    METER(if (++rt->gcStats.dswdepth > rt->gcStats.maxdswdepth)
-              rt->gcStats.maxdswdepth = rt->gcStats.dswdepth);
-    obj = (JSObject *) thing;
-    parent = OBJECT_TO_JSVAL(obj);
-
-    /* Precompute for quick testing to set and get scope->dswIndex. */
-    scope = (OBJ_IS_NATIVE(obj) && OBJ_SCOPE(obj)->object == obj)
-            ? OBJ_SCOPE(obj)
-            : NULL;
-
-    /* Mark slots if they are small enough to be GC-allocated. */
-    vp = obj->slots;
-    if ((vp[-1] + 1) * sizeof(jsval) <= GC_NBYTES_MAX)
-        GC_MARK(cx, vp - 1, "slots", NULL);
-
-    end = vp + ((obj->map->ops->mark)
-                ? obj->map->ops->mark(cx, obj, NULL)
-                : JS_MIN(obj->map->freeslot, obj->map->nslots));
-
-    *flagp |= GCF_MARK;
-
-    for (;;) {
-        while ((vp = NEXT_UNMARKED_GC_THING(vp, end, &thing, &flagp, NULL))
-               != NULL) {
-            v = *vp;
-            JS_ASSERT(JSVAL_TO_GCTHING(v) == thing);
-
-            if (JSVAL_IS_OBJECT(v)) {
-                *vp = JSVAL_SETTAG(top, JSVAL_BOOLEAN);
-                top = parent;
-                if (scope)
-                    scope->dswIndex = EncodeDSWIndex(vp, obj->slots);
-                goto down;
-            }
-
-            /* Handle string and double GC-things. */
-            MARK_GC_THING(cx, thing, flagp, NULL);
-        }
-
-        /* If we are back at the root (or we never left it), we're done. */
-        METER(rt->gcStats.dswdepth--);
-        if (scope)
-            scope->dswIndex = 0;
-        if (top == JSVAL_EMPTY)
-            return;
-
-        /* Time to go back up the spanning tree. */
-        METER(rt->gcStats.dswup++);
-        obj = JSVAL_TO_OBJECT(top);
-        vp = obj->slots;
-        end = vp + vp[-1];
-
-        /*
-         * If obj is native and owns its own scope, we can minimize the cost
-         * of searching for the reversed pointer.
-         */
-        scope = (OBJ_IS_NATIVE(obj) && OBJ_SCOPE(obj)->object == obj)
-                ? OBJ_SCOPE(obj)
-                : NULL;
-        if (scope)
-            vp += DecodeDSWIndex(scope->dswIndex, vp);
-
-        /*
-         * Alas, we must search for the reversed pointer.  If we used the
-         * scope->dswIndex hint, we'll step over a few slots for objects with
-         * a few times 64K slots, etc.  For more typical (that is, far fewer
-         * than 64K slots) native objects that own their own scopes, this loop
-         * won't iterate at all.  The order of complexity for host objects and
-         * unmutated native objects is O(n^2), but n (4 or 5 in most cases) is
-         * low enough that we don't care.
-         *
-         * We cannot use a reversed pointer into obj->slots, because there
-         * is no way to find an object from an address within its slots.
-         */
-        v = *vp;
-        while (v <= JSVAL_TRUE || !JSVAL_IS_BOOLEAN(v)) {
-            METER(rt->gcStats.dswupstep++);
-            JS_ASSERT(vp + 1 < end);
-            v = *++vp;
-        }
-
-        *vp++ = parent;
-        parent = top;
-        top = JSVAL_CLRTAG(v);
-    }
-}
-
-void
-js_MarkGCThing(JSContext *cx, void *thing, void *arg)
-{
-    uint8 *flagp;
-
-    flagp = UNMARKED_GC_THING_FLAGS(thing, arg);
-    if (!flagp)
-        return;
-    MARK_GC_THING(cx, thing, flagp, arg);
-}
-
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-gc_root_marker(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 num, void *arg)
-{
-    JSGCRootHashEntry *rhe = (JSGCRootHashEntry *)hdr;
-    jsval *rp = (jsval *)rhe->root;
-    jsval v = *rp;
-
-    /* Ignore null object and scalar values. */
-    if (!JSVAL_IS_NULL(v) && JSVAL_IS_GCTHING(v)) {
-        JSContext *cx = (JSContext *)arg;
-#ifdef DEBUG
-        uintN i;
-        JSArena *a;
-        jsuword firstpage;
-        JSBool root_points_to_gcArenaPool = JS_FALSE;
-        void *thing = JSVAL_TO_GCTHING(v);
-
-        for (i = 0; i < GC_NUM_FREELISTS; i++) {
-            for (a = cx->runtime->gcArenaPool[i].first.next; a; a = a->next) {
-                firstpage = FIRST_THING_PAGE(a);
-                if (JS_UPTRDIFF(thing, firstpage) < a->avail - firstpage) {
-                    root_points_to_gcArenaPool = JS_TRUE;
-                    break;
-                }
-            }
-        }
-        if (!root_points_to_gcArenaPool && rhe->name) {
-            fprintf(stderr,
-"JS API usage error: the address passed to JS_AddNamedRoot currently holds an\n"
-"invalid jsval.  This is usually caused by a missing call to JS_RemoveRoot.\n"
-"The root's name is \"%s\".\n",
-                    rhe->name);
-        }
-        JS_ASSERT(root_points_to_gcArenaPool);
-#endif
-
-        GC_MARK(cx, JSVAL_TO_GCTHING(v), rhe->name ? rhe->name : "root", NULL);
-    }
-    return JS_DHASH_NEXT;
-}
-
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-gc_lock_marker(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 num, void *arg)
-{
-    JSGCLockHashEntry *lhe = (JSGCLockHashEntry *)hdr;
-    void *thing = (void *)lhe->thing;
-    JSContext *cx = (JSContext *)arg;
-
-    GC_MARK(cx, thing, "locked object", NULL);
-    return JS_DHASH_NEXT;
-}
-
-void
-js_ForceGC(JSContext *cx, uintN gcflags)
-{
-    uintN i;
-
-    for (i = 0; i < GCX_NTYPES; i++)
-        cx->newborn[i] = NULL;
-    cx->lastAtom = NULL;
-    cx->runtime->gcPoke = JS_TRUE;
-    js_GC(cx, gcflags);
-    JS_ArenaFinish();
-}
-
-#define GC_MARK_JSVALS(cx, len, vec, name)                                    \
-    JS_BEGIN_MACRO                                                            \
-        jsval _v, *_vp, *_end;                                                \
-                                                                              \
-        for (_vp = vec, _end = _vp + len; _vp < _end; _vp++) {                \
-            _v = *_vp;                                                        \
-            if (JSVAL_IS_GCTHING(_v))                                         \
-                GC_MARK(cx, JSVAL_TO_GCTHING(_v), name, NULL);                \
-        }                                                                     \
-    JS_END_MACRO
-
-void
-js_GC(JSContext *cx, uintN gcflags)
-{
-    JSRuntime *rt;
-    JSContext *iter, *acx;
-    JSStackFrame *fp, *chain;
-    uintN i, depth, nslots, type;
-    JSStackHeader *sh;
-    JSTempValueRooter *tvr;
-    size_t nbytes, nflags;
-    JSArena *a, **ap;
-    uint8 flags, *flagp, *split;
-    JSGCThing *thing, *limit, **flp, **oflp;
-    GCFinalizeOp finalizer;
-    uint32 *bytesptr;
-    JSBool all_clear;
-#ifdef JS_THREADSAFE
-    jsword currentThread;
-    uint32 requestDebit;
-#endif
-
-    rt = cx->runtime;
-#ifdef JS_THREADSAFE
-    /* Avoid deadlock. */
-    JS_ASSERT(!JS_IS_RUNTIME_LOCKED(rt));
-#endif
-
-    /*
-     * Don't collect garbage if the runtime isn't up, and cx is not the last
-     * context in the runtime.  The last context must force a GC, and nothing
-     * should suppress that final collection or there may be shutdown leaks,
-     * or runtime bloat until the next context is created.
-     */
-    if (rt->state != JSRTS_UP && !(gcflags & GC_LAST_CONTEXT))
-        return;
-
-    /*
-     * Let the API user decide to defer a GC if it wants to (unless this
-     * is the last context).  Invoke the callback regardless.
-     */
-    if (rt->gcCallback) {
-        if (!rt->gcCallback(cx, JSGC_BEGIN) && !(gcflags & GC_LAST_CONTEXT))
-            return;
-    }
-
-    /* Lock out other GC allocator and collector invocations. */
-    if (!(gcflags & GC_ALREADY_LOCKED))
-        JS_LOCK_GC(rt);
-
-    /* Do nothing if no mutator has executed since the last GC. */
-    if (!rt->gcPoke) {
-        METER(rt->gcStats.nopoke++);
-        if (!(gcflags & GC_ALREADY_LOCKED))
-            JS_UNLOCK_GC(rt);
-        return;
-    }
-    METER(rt->gcStats.poke++);
-    rt->gcPoke = JS_FALSE;
-
-#ifdef JS_THREADSAFE
-    /* Bump gcLevel and return rather than nest on this thread. */
-    currentThread = js_CurrentThreadId();
-    if (rt->gcThread == currentThread) {
-        JS_ASSERT(rt->gcLevel > 0);
-        rt->gcLevel++;
-        METER(if (rt->gcLevel > rt->gcStats.maxlevel)
-                  rt->gcStats.maxlevel = rt->gcLevel);
-        if (!(gcflags & GC_ALREADY_LOCKED))
-            JS_UNLOCK_GC(rt);
-        return;
-    }
-
-    /*
-     * If we're in one or more requests (possibly on more than one context)
-     * running on the current thread, indicate, temporarily, that all these
-     * requests are inactive.  NB: if cx->thread is 0, then cx is not using
-     * the request model, and does not contribute to rt->requestCount.
-     */
-    requestDebit = 0;
-    if (cx->thread) {
-        /*
-         * Check all contexts for any with the same thread-id.  XXX should we
-         * keep a sub-list of contexts having the same id?
-         */
-        iter = NULL;
-        while ((acx = js_ContextIterator(rt, JS_FALSE, &iter)) != NULL) {
-            if (acx->thread == cx->thread && acx->requestDepth)
-                requestDebit++;
-        }
-    } else {
-        /*
-         * We assert, but check anyway, in case someone is misusing the API.
-         * Avoiding the loop over all of rt's contexts is a win in the event
-         * that the GC runs only on request-less contexts with 0 thread-ids,
-         * in a special thread such as might be used by the UI/DOM/Layout
-         * "mozilla" or "main" thread in Mozilla-the-browser.
-         */
-        JS_ASSERT(cx->requestDepth == 0);
-        if (cx->requestDepth)
-            requestDebit = 1;
-    }
-    if (requestDebit) {
-        JS_ASSERT(requestDebit <= rt->requestCount);
-        rt->requestCount -= requestDebit;
-        if (rt->requestCount == 0)
-            JS_NOTIFY_REQUEST_DONE(rt);
-    }
-
-    /* If another thread is already in GC, don't attempt GC; wait instead. */
-    if (rt->gcLevel > 0) {
-        /* Bump gcLevel to restart the current GC, so it finds new garbage. */
-        rt->gcLevel++;
-        METER(if (rt->gcLevel > rt->gcStats.maxlevel)
-                  rt->gcStats.maxlevel = rt->gcLevel);
-
-        /* Wait for the other thread to finish, then resume our request. */
-        while (rt->gcLevel > 0)
-            JS_AWAIT_GC_DONE(rt);
-        if (requestDebit)
-            rt->requestCount += requestDebit;
-        if (!(gcflags & GC_ALREADY_LOCKED))
-            JS_UNLOCK_GC(rt);
-        return;
-    }
-
-    /* No other thread is in GC, so indicate that we're now in GC. */
-    rt->gcLevel = 1;
-    rt->gcThread = currentThread;
-
-    /* Wait for all other requests to finish. */
-    while (rt->requestCount > 0)
-        JS_AWAIT_REQUEST_DONE(rt);
-
-#else  /* !JS_THREADSAFE */
-
-    /* Bump gcLevel and return rather than nest; the outer gc will restart. */
-    rt->gcLevel++;
-    METER(if (rt->gcLevel > rt->gcStats.maxlevel)
-              rt->gcStats.maxlevel = rt->gcLevel);
-    if (rt->gcLevel > 1)
-        return;
-
-#endif /* !JS_THREADSAFE */
-
-    /*
-     * Set rt->gcRunning here within the GC lock, and after waiting for any
-     * active requests to end, so that new requests that try to JS_AddRoot,
-     * JS_RemoveRoot, or JS_RemoveRootRT block in JS_BeginRequest waiting for
-     * rt->gcLevel to drop to zero, while request-less calls to the *Root*
-     * APIs block in js_AddRoot or js_RemoveRoot (see above in this file),
-     * waiting for GC to finish.
-     */
-    rt->gcRunning = JS_TRUE;
-    JS_UNLOCK_GC(rt);
-
-    /* If a suspended compile is running on another context, keep atoms. */
-    if (rt->gcKeepAtoms)
-        gcflags |= GC_KEEP_ATOMS;
-
-    /* Reset malloc counter. */
-    rt->gcMallocBytes = 0;
-
-    /* Drop atoms held by the property cache, and clear property weak links. */
-    js_DisablePropertyCache(cx);
-    js_FlushPropertyCache(cx);
-#ifdef DEBUG_notme
-  { extern void js_DumpScopeMeters(JSRuntime *rt);
-    js_DumpScopeMeters(rt);
-  }
-#endif
-
-restart:
-    rt->gcNumber++;
-
-    /*
-     * Mark phase.
-     */
-    JS_DHashTableEnumerate(&rt->gcRootsHash, gc_root_marker, cx);
-    if (rt->gcLocksHash)
-        JS_DHashTableEnumerate(rt->gcLocksHash, gc_lock_marker, cx);
-    js_MarkAtomState(&rt->atomState, gcflags, gc_mark_atom_key_thing, cx);
-    js_MarkWatchPoints(rt);
-    js_MarkScriptFilenames(rt, gcflags);
-
-    iter = NULL;
-    while ((acx = js_ContextIterator(rt, JS_TRUE, &iter)) != NULL) {
-        /*
-         * Iterate frame chain and dormant chains. Temporarily tack current
-         * frame onto the head of the dormant list to ease iteration.
-         *
-         * (NB: see comment on this whole "dormant" thing in js_Execute.)
-         */
-        chain = acx->fp;
-        if (chain) {
-            JS_ASSERT(!chain->dormantNext);
-            chain->dormantNext = acx->dormantFrameChain;
-        } else {
-            chain = acx->dormantFrameChain;
-        }
-
-        for (fp = chain; fp; fp = chain = chain->dormantNext) {
-            do {
-                if (fp->callobj)
-                    GC_MARK(cx, fp->callobj, "call object", NULL);
-                if (fp->argsobj)
-                    GC_MARK(cx, fp->argsobj, "arguments object", NULL);
-                if (fp->varobj)
-                    GC_MARK(cx, fp->varobj, "variables object", NULL);
-                if (fp->script) {
-                    js_MarkScript(cx, fp->script, NULL);
-                    if (fp->spbase) {
-                        /*
-                         * Don't mark what has not been pushed yet, or what
-                         * has been popped already.
-                         */
-                        depth = fp->script->depth;
-                        nslots = (JS_UPTRDIFF(fp->sp, fp->spbase)
-                                  < depth * sizeof(jsval))
-                                 ? (uintN)(fp->sp - fp->spbase)
-                                 : depth;
-                        GC_MARK_JSVALS(cx, nslots, fp->spbase, "operand");
-                    }
-                }
-                GC_MARK(cx, fp->thisp, "this", NULL);
-                if (fp->argv) {
-                    nslots = fp->argc;
-                    if (fp->fun) {
-                        if (fp->fun->nargs > nslots)
-                            nslots = fp->fun->nargs;
-                        nslots += fp->fun->extra;
-                    }
-                    GC_MARK_JSVALS(cx, nslots, fp->argv, "arg");
-                }
-                if (JSVAL_IS_GCTHING(fp->rval))
-                    GC_MARK(cx, JSVAL_TO_GCTHING(fp->rval), "rval", NULL);
-                if (fp->vars)
-                    GC_MARK_JSVALS(cx, fp->nvars, fp->vars, "var");
-                GC_MARK(cx, fp->scopeChain, "scope chain", NULL);
-                if (fp->sharpArray)
-                    GC_MARK(cx, fp->sharpArray, "sharp array", NULL);
-
-                if (fp->xmlNamespace)
-                    GC_MARK(cx, fp->xmlNamespace, "xmlNamespace", NULL);
-            } while ((fp = fp->down) != NULL);
-        }
-
-        /* Cleanup temporary "dormant" linkage. */
-        if (acx->fp)
-            acx->fp->dormantNext = NULL;
-
-        /* Mark other roots-by-definition in acx. */
-        GC_MARK(cx, acx->globalObject, "global object", NULL);
-        for (i = 0; i < GCX_NTYPES; i++)
-            GC_MARK(cx, acx->newborn[i], gc_typenames[i], NULL);
-        if (acx->lastAtom)
-            GC_MARK_ATOM(cx, acx->lastAtom, NULL);
-        if (JSVAL_IS_GCTHING(acx->lastInternalResult)) {
-            thing = JSVAL_TO_GCTHING(acx->lastInternalResult);
-            if (thing)
-                GC_MARK(cx, thing, "lastInternalResult", NULL);
-        }
-#if JS_HAS_EXCEPTIONS
-        if (acx->throwing && JSVAL_IS_GCTHING(acx->exception))
-            GC_MARK(cx, JSVAL_TO_GCTHING(acx->exception), "exception", NULL);
-#endif
-#if JS_HAS_LVALUE_RETURN
-        if (acx->rval2set && JSVAL_IS_GCTHING(acx->rval2))
-            GC_MARK(cx, JSVAL_TO_GCTHING(acx->rval2), "rval2", NULL);
-#endif
-
-        for (sh = acx->stackHeaders; sh; sh = sh->down) {
-            METER(rt->gcStats.stackseg++);
-            METER(rt->gcStats.segslots += sh->nslots);
-            GC_MARK_JSVALS(cx, sh->nslots, JS_STACK_SEGMENT(sh), "stack");
-        }
-
-        if (acx->localRootStack)
-            js_MarkLocalRoots(cx, acx->localRootStack);
-        for (tvr = acx->tempValueRooters; tvr; tvr = tvr->down) {
-            if (tvr->count < 0) {
-                if (JSVAL_IS_GCTHING(tvr->u.value)) {
-                    GC_MARK(cx, JSVAL_TO_GCTHING(tvr->u.value), "tvr->u.value",
-                            NULL);
-                }
-            } else {
-                GC_MARK_JSVALS(cx, tvr->count, tvr->u.array, "tvr->u.array");
-            }
-        }
-    }
-#ifdef DUMP_CALL_TABLE
-    js_DumpCallTable(cx);
-#endif
-
-    if (rt->gcCallback)
-        (void) rt->gcCallback(cx, JSGC_MARK_END);
-
-    /*
-     * Sweep phase.
-     *
-     * Finalize as we sweep, outside of rt->gcLock, but with rt->gcRunning set
-     * so that any attempt to allocate a GC-thing from a finalizer will fail,
-     * rather than nest badly and leave the unmarked newborn to be swept.
-     *
-     * Finalize smaller objects before larger, to guarantee finalization of
-     * GC-allocated obj->slots after obj.  See FreeSlots in jsobj.c.
-     */
-    js_SweepAtomState(&rt->atomState);
-    js_SweepScopeProperties(rt);
-    js_SweepScriptFilenames(rt);
-    for (i = 0; i < GC_NUM_FREELISTS; i++) {
-        nbytes = GC_FREELIST_NBYTES(i);
-        nflags = nbytes / sizeof(JSGCThing);
-
-        for (a = rt->gcArenaPool[i].first.next; a; a = a->next) {
-            flagp = (uint8 *) a->base;
-            split = (uint8 *) FIRST_THING_PAGE(a);
-            limit = (JSGCThing *) a->avail;
-            for (thing = (JSGCThing *) split; thing < limit; thing += nflags) {
-                if (((jsuword)thing & GC_PAGE_MASK) == 0) {
-                    thing = (JSGCThing *) FIRST_THING((jsuword)thing, nbytes);
-                    flagp = js_GetGCThingFlags(thing);
-                }
-                flags = *flagp;
-                if (flags & GCF_MARK) {
-                    *flagp &= ~GCF_MARK;
-                } else if (!(flags & (GCF_LOCK | GCF_FINAL))) {
-                    /* Call the finalizer with GCF_FINAL ORed into flags. */
-                    type = flags & GCF_TYPEMASK;
-                    finalizer = gc_finalizers[type];
-                    if (finalizer) {
-                        *flagp = (uint8)(flags | GCF_FINAL);
-                        if (type >= GCX_EXTERNAL_STRING)
-                            js_PurgeDeflatedStringCache((JSString *)thing);
-                        finalizer(cx, thing);
-                    }
-
-                    /* Set flags to GCF_FINAL, signifying that thing is free. */
-                    *flagp = GCF_FINAL;
-
-                    bytesptr = (type == GCX_PRIVATE)
-                               ? &rt->gcPrivateBytes
-                               : &rt->gcBytes;
-                    JS_ASSERT(*bytesptr >= nbytes + nflags);
-                    *bytesptr -= nbytes + nflags;
-                }
-                flagp += nflags;
-                if (JS_UPTRDIFF(flagp, split) < nflags)
-                    flagp += GC_THINGS_SIZE;
-            }
-        }
-    }
-
-    /*
-     * Free phase.
-     * Free any unused arenas and rebuild the JSGCThing freelist.
-     */
-    for (i = 0; i < GC_NUM_FREELISTS; i++) {
-        ap = &rt->gcArenaPool[i].first.next;
-        a = *ap;
-        if (!a)
-            continue;
-
-        all_clear = JS_TRUE;
-        flp = oflp = &rt->gcFreeList[i];
-        *flp = NULL;
-        METER(rt->gcStats.freelen[i] = 0);
-
-        nbytes = GC_FREELIST_NBYTES(i);
-        nflags = nbytes / sizeof(JSGCThing);
-        do {
-            flagp = (uint8 *) a->base;
-            split = (uint8 *) FIRST_THING_PAGE(a);
-            limit = (JSGCThing *) a->avail;
-            for (thing = (JSGCThing *) split; thing < limit; thing += nflags) {
-                if (((jsuword)thing & GC_PAGE_MASK) == 0) {
-                    thing = (JSGCThing *) FIRST_THING((jsuword)thing, nbytes);
-                    flagp = js_GetGCThingFlags(thing);
-                }
-                if (*flagp != GCF_FINAL) {
-                    all_clear = JS_FALSE;
-                } else {
-                    thing->flagp = flagp;
-                    *flp = thing;
-                    flp = &thing->next;
-                    METER(rt->gcStats.freelen[i]++);
-                }
-                flagp += nflags;
-                if (JS_UPTRDIFF(flagp, split) < nflags)
-                    flagp += GC_THINGS_SIZE;
-            }
-
-            if (all_clear) {
-                JS_ARENA_DESTROY(&rt->gcArenaPool[i], a, ap);
-                flp = oflp;
-                METER(rt->gcStats.afree++);
-            } else {
-                ap = &a->next;
-                all_clear = JS_TRUE;
-                oflp = flp;
-            }
-        } while ((a = *ap) != NULL);
-
-        /* Terminate the new freelist. */
-        *flp = NULL;
-    }
-
-    if (rt->gcCallback)
-        (void) rt->gcCallback(cx, JSGC_FINALIZE_END);
-#ifdef DEBUG_notme
-  { extern void DumpSrcNoteSizeHist();
-    DumpSrcNoteSizeHist();
-    printf("GC HEAP SIZE %lu (%lu)\n",
-           (unsigned long)rt->gcBytes, (unsigned long)rt->gcPrivateBytes);
-  }
-#endif
-
-    JS_LOCK_GC(rt);
-    if (rt->gcLevel > 1 || rt->gcPoke) {
-        rt->gcLevel = 1;
-        rt->gcPoke = JS_FALSE;
-        JS_UNLOCK_GC(rt);
-        goto restart;
-    }
-    js_EnablePropertyCache(cx);
-    rt->gcLevel = 0;
-    rt->gcLastBytes = rt->gcBytes;
-    rt->gcRunning = JS_FALSE;
-
-#ifdef JS_THREADSAFE
-    /* If we were invoked during a request, pay back the temporary debit. */
-    if (requestDebit)
-        rt->requestCount += requestDebit;
-    rt->gcThread = 0;
-    JS_NOTIFY_GC_DONE(rt);
-    if (!(gcflags & GC_ALREADY_LOCKED))
-        JS_UNLOCK_GC(rt);
-#endif
-
-    if (rt->gcCallback) {
-        if (gcflags & GC_ALREADY_LOCKED)
-            JS_UNLOCK_GC(rt);
-        (void) rt->gcCallback(cx, JSGC_END);
-        if (gcflags & GC_ALREADY_LOCKED)
-            JS_LOCK_GC(rt);
-    }
-}
diff --git a/libs/js/src/jsgc.h b/libs/js/src/jsgc.h
deleted file mode 100644
index 1bf70efba5..0000000000
--- a/libs/js/src/jsgc.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsgc_h___
-#define jsgc_h___
-/*
- * JS Garbage Collector.
- */
-#include "jsprvtd.h"
-#include "jspubtd.h"
-#include "jsdhash.h"
-
-JS_BEGIN_EXTERN_C
-
-/* GC thing type indexes. */
-#define GCX_OBJECT              0               /* JSObject */
-#define GCX_STRING              1               /* JSString */
-#define GCX_DOUBLE              2               /* jsdouble */
-#define GCX_MUTABLE_STRING      3               /* JSString that's mutable --
-                                                   single-threaded only! */
-#define GCX_PRIVATE             4               /* private (unscanned) data */
-#define GCX_NAMESPACE           5               /* JSXMLNamespace */
-#define GCX_QNAME               6               /* JSXMLQName */
-#define GCX_XML                 7               /* JSXML */
-#define GCX_EXTERNAL_STRING     8               /* JSString w/ external chars */
-
-#define GCX_NTYPES_LOG2         4               /* type index bits */
-#define GCX_NTYPES              JS_BIT(GCX_NTYPES_LOG2)
-
-/* GC flag definitions, must fit in 8 bits (type index goes in the low bits). */
-#define GCF_TYPEMASK    JS_BITMASK(GCX_NTYPES_LOG2)
-#define GCF_MARK        JS_BIT(GCX_NTYPES_LOG2)
-#define GCF_FINAL       JS_BIT(GCX_NTYPES_LOG2 + 1)
-#define GCF_SYSTEM      JS_BIT(GCX_NTYPES_LOG2 + 2)
-#define GCF_LOCKSHIFT   (GCX_NTYPES_LOG2 + 3)   /* lock bit shift */
-#define GCF_LOCK        JS_BIT(GCF_LOCKSHIFT)   /* lock request bit in API */
-
-/* Pseudo-flag that modifies GCX_STRING to make GCX_MUTABLE_STRING. */
-#define GCF_MUTABLE     2
-
-#if (GCX_STRING | GCF_MUTABLE) != GCX_MUTABLE_STRING
-# error "mutable string type index botch!"
-#endif
-
-extern uint8 *
-js_GetGCThingFlags(void *thing);
-
-/* These are compatible with JSDHashEntryStub. */
-struct JSGCRootHashEntry {
-    JSDHashEntryHdr hdr;
-    void            *root;
-    const char      *name;
-};
-
-struct JSGCLockHashEntry {
-    JSDHashEntryHdr hdr;
-    const JSGCThing *thing;
-    uint32          count;
-};
-
-#if 1
-/*
- * Since we're forcing a GC from JS_GC anyway, don't bother wasting cycles
- * loading oldval.  XXX remove implied force, fix jsinterp.c's "second arg
- * ignored", etc.
- */
-#define GC_POKE(cx, oldval) ((cx)->runtime->gcPoke = JS_TRUE)
-#else
-#define GC_POKE(cx, oldval) ((cx)->runtime->gcPoke = JSVAL_IS_GCTHING(oldval))
-#endif
-
-extern intN
-js_ChangeExternalStringFinalizer(JSStringFinalizeOp oldop,
-                                 JSStringFinalizeOp newop);
-
-extern JSBool
-js_InitGC(JSRuntime *rt, uint32 maxbytes);
-
-extern void
-js_FinishGC(JSRuntime *rt);
-
-extern JSBool
-js_AddRoot(JSContext *cx, void *rp, const char *name);
-
-extern JSBool
-js_AddRootRT(JSRuntime *rt, void *rp, const char *name);
-
-extern JSBool
-js_RemoveRoot(JSRuntime *rt, void *rp);
-
-/*
- * The private JSGCThing struct, which describes a gcFreeList element.
- */
-struct JSGCThing {
-    JSGCThing   *next;
-    uint8       *flagp;
-};
-
-#define GC_NBYTES_MAX           (10 * sizeof(JSGCThing))
-#define GC_NUM_FREELISTS        (GC_NBYTES_MAX / sizeof(JSGCThing))
-#define GC_FREELIST_NBYTES(i)   (((i) + 1) * sizeof(JSGCThing))
-#define GC_FREELIST_INDEX(n)    (((n) / sizeof(JSGCThing)) - 1)
-
-extern void *
-js_NewGCThing(JSContext *cx, uintN flags, size_t nbytes);
-
-extern JSBool
-js_LockGCThing(JSContext *cx, void *thing);
-
-extern JSBool
-js_LockGCThingRT(JSRuntime *rt, void *thing);
-
-extern JSBool
-js_UnlockGCThingRT(JSRuntime *rt, void *thing);
-
-extern JSBool
-js_IsAboutToBeFinalized(JSContext *cx, void *thing);
-
-extern void
-js_MarkAtom(JSContext *cx, JSAtom *atom, void *arg);
-
-/* We avoid a large number of unnecessary calls by doing the flag check first */
-#define GC_MARK_ATOM(cx, atom, arg)                                           \
-    JS_BEGIN_MACRO                                                            \
-        if (!((atom)->flags & ATOM_MARK))                                     \
-            js_MarkAtom(cx, atom, arg);                                       \
-    JS_END_MACRO
-
-extern void
-js_MarkGCThing(JSContext *cx, void *thing, void *arg);
-
-#ifdef GC_MARK_DEBUG
-
-typedef struct GCMarkNode GCMarkNode;
-
-struct GCMarkNode {
-    void        *thing;
-    const char  *name;
-    GCMarkNode  *next;
-    GCMarkNode  *prev;
-};
-
-#define GC_MARK(cx_, thing_, name_, prev_)                                    \
-    JS_BEGIN_MACRO                                                            \
-        GCMarkNode node_;                                                     \
-        node_.thing = thing_;                                                 \
-        node_.name  = name_;                                                  \
-        node_.next  = NULL;                                                   \
-        node_.prev  = prev_;                                                  \
-        if (prev_) ((GCMarkNode *)(prev_))->next = &node_;                    \
-        js_MarkGCThing(cx_, thing_, &node_);                                  \
-    JS_END_MACRO
-
-#else  /* !GC_MARK_DEBUG */
-
-#define GC_MARK(cx, thing, name, prev)   js_MarkGCThing(cx, thing, NULL)
-
-#endif /* !GC_MARK_DEBUG */
-
-/*
- * Flags to modify how a GC marks and sweeps:
- *   GC_KEEP_ATOMS      Don't sweep unmarked atoms, they may be in use by the
- *                      compiler, or by an API function that calls js_Atomize,
- *                      when the GC is called from js_NewGCThing, due to a
- *                      malloc failure or the runtime GC-thing limit.
- *   GC_LAST_CONTEXT    Called from js_DestroyContext for last JSContext in a
- *                      JSRuntime, when it is imperative that rt->gcPoke gets
- *                      cleared early in js_GC, if it is set.
- *   GC_ALREADY_LOCKED  rt->gcLock is already held on entry to js_GC, and kept
- *                      on return to its caller.
- */
-#define GC_KEEP_ATOMS       0x1
-#define GC_LAST_CONTEXT     0x2
-#define GC_ALREADY_LOCKED   0x4
-
-extern void
-js_ForceGC(JSContext *cx, uintN gcflags);
-
-extern void
-js_GC(JSContext *cx, uintN gcflags);
-
-#ifdef DEBUG_notme
-#define JS_GCMETER 1
-#endif
-
-#ifdef JS_GCMETER
-
-typedef struct JSGCStats {
-    uint32  alloc;      /* number of allocation attempts */
-    uint32  freelen[GC_NUM_FREELISTS];
-                        /* gcFreeList lengths */
-    uint32  recycle[GC_NUM_FREELISTS];
-                        /* number of things recycled through gcFreeList */
-    uint32  retry;      /* allocation attempt retries after running the GC */
-    uint32  retryhalt;  /* allocation retries halted by the branch callback */
-    uint32  fail;       /* allocation failures */
-    uint32  finalfail;  /* finalizer calls allocator failures */
-    uint32  lockborn;   /* things born locked */
-    uint32  lock;       /* valid lock calls */
-    uint32  unlock;     /* valid unlock calls */
-    uint32  depth;      /* mark tail recursion depth */
-    uint32  maxdepth;   /* maximum mark tail recursion depth */
-    uint32  cdepth;     /* mark recursion depth of C functions */
-    uint32  maxcdepth;  /* maximum mark recursion depth of C functions */
-    uint32  dswmark;    /* mark C stack overflows => Deutsch-Schorr-Waite */
-    uint32  dswdepth;   /* DSW mark depth */
-    uint32  maxdswdepth;/* maximum DSW mark depth */
-    uint32  dswup;      /* DSW moves up the mark spanning tree */
-    uint32  dswupstep;  /* steps in obj->slots to find DSW-reversed pointer */
-    uint32  maxlevel;   /* maximum GC nesting (indirect recursion) level */
-    uint32  poke;       /* number of potentially useful GC calls */
-    uint32  nopoke;     /* useless GC calls where js_PokeGC was not set */
-    uint32  afree;      /* thing arenas freed so far */
-    uint32  stackseg;   /* total extraordinary stack segments scanned */
-    uint32  segslots;   /* total stack segment jsval slots scanned */
-} JSGCStats;
-
-extern JS_FRIEND_API(void)
-js_DumpGCStats(JSRuntime *rt, FILE *fp);
-
-#endif /* JS_GCMETER */
-
-#ifdef DEBUG_notme
-#define TOO_MUCH_GC 1
-#endif
-
-#ifdef WAY_TOO_MUCH_GC
-#define TOO_MUCH_GC 1
-#endif
-
-JS_END_EXTERN_C
-
-#endif /* jsgc_h___ */
diff --git a/libs/js/src/jshash.c b/libs/js/src/jshash.c
deleted file mode 100644
index 0f22b5e39c..0000000000
--- a/libs/js/src/jshash.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PR hash table package.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jshash.h" /* Added by JSIFY */
-
-/* Compute the number of buckets in ht */
-#define NBUCKETS(ht)    JS_BIT(JS_HASH_BITS - (ht)->shift)
-
-/* The smallest table has 16 buckets */
-#define MINBUCKETSLOG2  4
-#define MINBUCKETS      JS_BIT(MINBUCKETSLOG2)
-
-/* Compute the maximum entries given n buckets that we will tolerate, ~90% */
-#define OVERLOADED(n)   ((n) - ((n) >> 3))
-
-/* Compute the number of entries below which we shrink the table by half */
-#define UNDERLOADED(n)  (((n) > MINBUCKETS) ? ((n) >> 2) : 0)
-
-/*
-** Stubs for default hash allocator ops.
-*/
-static void *
-DefaultAllocTable(void *pool, size_t size)
-{
-    return malloc(size);
-}
-
-static void
-DefaultFreeTable(void *pool, void *item)
-{
-    free(item);
-}
-
-static JSHashEntry *
-DefaultAllocEntry(void *pool, const void *key)
-{
-    return (JSHashEntry*) malloc(sizeof(JSHashEntry));
-}
-
-static void
-DefaultFreeEntry(void *pool, JSHashEntry *he, uintN flag)
-{
-    if (flag == HT_FREE_ENTRY)
-        free(he);
-}
-
-static JSHashAllocOps defaultHashAllocOps = {
-    DefaultAllocTable, DefaultFreeTable,
-    DefaultAllocEntry, DefaultFreeEntry
-};
-
-JS_PUBLIC_API(JSHashTable *)
-JS_NewHashTable(uint32 n, JSHashFunction keyHash,
-                JSHashComparator keyCompare, JSHashComparator valueCompare,
-                JSHashAllocOps *allocOps, void *allocPriv)
-{
-    JSHashTable *ht;
-    size_t nb;
-
-    if (n <= MINBUCKETS) {
-        n = MINBUCKETSLOG2;
-    } else {
-        n = JS_CeilingLog2(n);
-        if ((int32)n < 0)
-            return NULL;
-    }
-
-    if (!allocOps) allocOps = &defaultHashAllocOps;
-
-    ht = (JSHashTable*) allocOps->allocTable(allocPriv, sizeof *ht);
-    if (!ht)
-        return NULL;
-    memset(ht, 0, sizeof *ht);
-    ht->shift = JS_HASH_BITS - n;
-    n = JS_BIT(n);
-    nb = n * sizeof(JSHashEntry *);
-    ht->buckets = (JSHashEntry**) allocOps->allocTable(allocPriv, nb);
-    if (!ht->buckets) {
-        allocOps->freeTable(allocPriv, ht);
-        return NULL;
-    }
-    memset(ht->buckets, 0, nb);
-
-    ht->keyHash = keyHash;
-    ht->keyCompare = keyCompare;
-    ht->valueCompare = valueCompare;
-    ht->allocOps = allocOps;
-    ht->allocPriv = allocPriv;
-    return ht;
-}
-
-JS_PUBLIC_API(void)
-JS_HashTableDestroy(JSHashTable *ht)
-{
-    uint32 i, n;
-    JSHashEntry *he, **hep;
-    JSHashAllocOps *allocOps = ht->allocOps;
-    void *allocPriv = ht->allocPriv;
-
-    n = NBUCKETS(ht);
-    for (i = 0; i < n; i++) {
-        hep = &ht->buckets[i];
-        while ((he = *hep) != NULL) {
-            *hep = he->next;
-            allocOps->freeEntry(allocPriv, he, HT_FREE_ENTRY);
-        }
-    }
-#ifdef DEBUG
-    memset(ht->buckets, 0xDB, n * sizeof ht->buckets[0]);
-#endif
-    allocOps->freeTable(allocPriv, ht->buckets);
-#ifdef DEBUG
-    memset(ht, 0xDB, sizeof *ht);
-#endif
-    allocOps->freeTable(allocPriv, ht);
-}
-
-/*
-** Multiplicative hash, from Knuth 6.4.
-*/
-JS_PUBLIC_API(JSHashEntry **)
-JS_HashTableRawLookup(JSHashTable *ht, JSHashNumber keyHash, const void *key)
-{
-    JSHashEntry *he, **hep, **hep0;
-    JSHashNumber h;
-
-#ifdef HASHMETER
-    ht->nlookups++;
-#endif
-    h = keyHash * JS_GOLDEN_RATIO;
-    h >>= ht->shift;
-    hep = hep0 = &ht->buckets[h];
-    while ((he = *hep) != NULL) {
-        if (he->keyHash == keyHash && ht->keyCompare(key, he->key)) {
-            /* Move to front of chain if not already there */
-            if (hep != hep0) {
-                *hep = he->next;
-                he->next = *hep0;
-                *hep0 = he;
-            }
-            return hep0;
-        }
-        hep = &he->next;
-#ifdef HASHMETER
-        ht->nsteps++;
-#endif
-    }
-    return hep;
-}
-
-JS_PUBLIC_API(JSHashEntry *)
-JS_HashTableRawAdd(JSHashTable *ht, JSHashEntry **hep,
-                   JSHashNumber keyHash, const void *key, void *value)
-{
-    uint32 i, n;
-    JSHashEntry *he, *next, **oldbuckets;
-    size_t nb;
-
-    /* Grow the table if it is overloaded */
-    n = NBUCKETS(ht);
-    if (ht->nentries >= OVERLOADED(n)) {
-        oldbuckets = ht->buckets;
-        nb = 2 * n * sizeof(JSHashEntry *);
-        ht->buckets = (JSHashEntry**)
-            ht->allocOps->allocTable(ht->allocPriv, nb);
-        if (!ht->buckets) {
-            ht->buckets = oldbuckets;
-            return NULL;
-        }
-        memset(ht->buckets, 0, nb);
-#ifdef HASHMETER
-        ht->ngrows++;
-#endif
-        ht->shift--;
-
-        for (i = 0; i < n; i++) {
-            for (he = oldbuckets[i]; he; he = next) {
-                next = he->next;
-                hep = JS_HashTableRawLookup(ht, he->keyHash, he->key);
-                JS_ASSERT(*hep == NULL);
-                he->next = NULL;
-                *hep = he;
-            }
-        }
-#ifdef DEBUG
-        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
-#endif
-        ht->allocOps->freeTable(ht->allocPriv, oldbuckets);
-        hep = JS_HashTableRawLookup(ht, keyHash, key);
-    }
-
-    /* Make a new key value entry */
-    he = ht->allocOps->allocEntry(ht->allocPriv, key);
-    if (!he)
-        return NULL;
-    he->keyHash = keyHash;
-    he->key = key;
-    he->value = value;
-    he->next = *hep;
-    *hep = he;
-    ht->nentries++;
-    return he;
-}
-
-JS_PUBLIC_API(JSHashEntry *)
-JS_HashTableAdd(JSHashTable *ht, const void *key, void *value)
-{
-    JSHashNumber keyHash;
-    JSHashEntry *he, **hep;
-
-    keyHash = ht->keyHash(key);
-    hep = JS_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) != NULL) {
-        /* Hit; see if values match */
-        if (ht->valueCompare(he->value, value)) {
-            /* key,value pair is already present in table */
-            return he;
-        }
-        if (he->value)
-            ht->allocOps->freeEntry(ht->allocPriv, he, HT_FREE_VALUE);
-        he->value = value;
-        return he;
-    }
-    return JS_HashTableRawAdd(ht, hep, keyHash, key, value);
-}
-
-JS_PUBLIC_API(void)
-JS_HashTableRawRemove(JSHashTable *ht, JSHashEntry **hep, JSHashEntry *he)
-{
-    uint32 i, n;
-    JSHashEntry *next, **oldbuckets;
-    size_t nb;
-
-    *hep = he->next;
-    ht->allocOps->freeEntry(ht->allocPriv, he, HT_FREE_ENTRY);
-
-    /* Shrink table if it's underloaded */
-    n = NBUCKETS(ht);
-    if (--ht->nentries < UNDERLOADED(n)) {
-        oldbuckets = ht->buckets;
-        nb = n * sizeof(JSHashEntry*) / 2;
-        ht->buckets = (JSHashEntry**)
-            ht->allocOps->allocTable(ht->allocPriv, nb);
-        if (!ht->buckets) {
-            ht->buckets = oldbuckets;
-            return;
-        }
-        memset(ht->buckets, 0, nb);
-#ifdef HASHMETER
-        ht->nshrinks++;
-#endif
-        ht->shift++;
-
-        for (i = 0; i < n; i++) {
-            for (he = oldbuckets[i]; he; he = next) {
-                next = he->next;
-                hep = JS_HashTableRawLookup(ht, he->keyHash, he->key);
-                JS_ASSERT(*hep == NULL);
-                he->next = NULL;
-                *hep = he;
-            }
-        }
-#ifdef DEBUG
-        memset(oldbuckets, 0xDB, n * sizeof oldbuckets[0]);
-#endif
-        ht->allocOps->freeTable(ht->allocPriv, oldbuckets);
-    }
-}
-
-JS_PUBLIC_API(JSBool)
-JS_HashTableRemove(JSHashTable *ht, const void *key)
-{
-    JSHashNumber keyHash;
-    JSHashEntry *he, **hep;
-
-    keyHash = ht->keyHash(key);
-    hep = JS_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) == NULL)
-        return JS_FALSE;
-
-    /* Hit; remove element */
-    JS_HashTableRawRemove(ht, hep, he);
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(void *)
-JS_HashTableLookup(JSHashTable *ht, const void *key)
-{
-    JSHashNumber keyHash;
-    JSHashEntry *he, **hep;
-
-    keyHash = ht->keyHash(key);
-    hep = JS_HashTableRawLookup(ht, keyHash, key);
-    if ((he = *hep) != NULL) {
-        return he->value;
-    }
-    return NULL;
-}
-
-/*
-** Iterate over the entries in the hash table calling func for each
-** entry found. Stop if "f" says to (return value & JS_ENUMERATE_STOP).
-** Return a count of the number of elements scanned.
-*/
-JS_PUBLIC_API(int)
-JS_HashTableEnumerateEntries(JSHashTable *ht, JSHashEnumerator f, void *arg)
-{
-    JSHashEntry *he, **hep;
-    uint32 i, nbuckets;
-    int rv, n = 0;
-    JSHashEntry *todo = NULL;
-
-    nbuckets = NBUCKETS(ht);
-    for (i = 0; i < nbuckets; i++) {
-        hep = &ht->buckets[i];
-        while ((he = *hep) != NULL) {
-            rv = f(he, n, arg);
-            n++;
-            if (rv & (HT_ENUMERATE_REMOVE | HT_ENUMERATE_UNHASH)) {
-                *hep = he->next;
-                if (rv & HT_ENUMERATE_REMOVE) {
-                    he->next = todo;
-                    todo = he;
-                }
-            } else {
-                hep = &he->next;
-            }
-            if (rv & HT_ENUMERATE_STOP) {
-                goto out;
-            }
-        }
-    }
-
-out:
-    hep = &todo;
-    while ((he = *hep) != NULL) {
-        JS_HashTableRawRemove(ht, hep, he);
-    }
-    return n;
-}
-
-#ifdef HASHMETER
-#include <math.h>
-#include <stdio.h>
-
-JS_PUBLIC_API(void)
-JS_HashTableDumpMeter(JSHashTable *ht, JSHashEnumerator dump, FILE *fp)
-{
-    double sqsum, mean, variance, sigma;
-    uint32 nchains, nbuckets, nentries;
-    uint32 i, n, maxChain, maxChainLen;
-    JSHashEntry *he;
-
-    sqsum = 0;
-    nchains = 0;
-    maxChainLen = 0;
-    nbuckets = NBUCKETS(ht);
-    for (i = 0; i < nbuckets; i++) {
-        he = ht->buckets[i];
-        if (!he)
-            continue;
-        nchains++;
-        for (n = 0; he; he = he->next)
-            n++;
-        sqsum += n * n;
-        if (n > maxChainLen) {
-            maxChainLen = n;
-            maxChain = i;
-        }
-    }
-    nentries = ht->nentries;
-    mean = (double)nentries / nchains;
-    variance = nchains * sqsum - nentries * nentries;
-    if (variance < 0 || nchains == 1)
-        variance = 0;
-    else
-        variance /= nchains * (nchains - 1);
-    sigma = sqrt(variance);
-
-    fprintf(fp, "\nHash table statistics:\n");
-    fprintf(fp, "     number of lookups: %u\n", ht->nlookups);
-    fprintf(fp, "     number of entries: %u\n", ht->nentries);
-    fprintf(fp, "       number of grows: %u\n", ht->ngrows);
-    fprintf(fp, "     number of shrinks: %u\n", ht->nshrinks);
-    fprintf(fp, "   mean steps per hash: %g\n", (double)ht->nsteps
-                                                / ht->nlookups);
-    fprintf(fp, "mean hash chain length: %g\n", mean);
-    fprintf(fp, "    standard deviation: %g\n", sigma);
-    fprintf(fp, " max hash chain length: %u\n", maxChainLen);
-    fprintf(fp, "        max hash chain: [%u]\n", maxChain);
-
-    for (he = ht->buckets[maxChain], i = 0; he; he = he->next, i++)
-        if (dump(he, i, fp) != HT_ENUMERATE_NEXT)
-            break;
-}
-#endif /* HASHMETER */
-
-JS_PUBLIC_API(int)
-JS_HashTableDump(JSHashTable *ht, JSHashEnumerator dump, FILE *fp)
-{
-    int count;
-
-    count = JS_HashTableEnumerateEntries(ht, dump, fp);
-#ifdef HASHMETER
-    JS_HashTableDumpMeter(ht, dump, fp);
-#endif
-    return count;
-}
-
-JS_PUBLIC_API(JSHashNumber)
-JS_HashString(const void *key)
-{
-    JSHashNumber h;
-    const unsigned char *s;
-
-    h = 0;
-    for (s = (const unsigned char *)key; *s; s++)
-        h = (h >> (JS_HASH_BITS - 4)) ^ (h << 4) ^ *s;
-    return h;
-}
-
-JS_PUBLIC_API(int)
-JS_CompareValues(const void *v1, const void *v2)
-{
-    return v1 == v2;
-}
diff --git a/libs/js/src/jshash.h b/libs/js/src/jshash.h
deleted file mode 100644
index 85e3cf8111..0000000000
--- a/libs/js/src/jshash.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jshash_h___
-#define jshash_h___
-/*
- * API to portable hash table code.
- */
-#include <stddef.h>
-#include <stdio.h>
-#include "jstypes.h"
-#include "jscompat.h"
-
-JS_BEGIN_EXTERN_C
-
-typedef uint32 JSHashNumber;
-typedef struct JSHashEntry JSHashEntry;
-typedef struct JSHashTable JSHashTable;
-
-#define JS_HASH_BITS 32
-#define JS_GOLDEN_RATIO 0x9E3779B9U
-
-typedef JSHashNumber (* JS_DLL_CALLBACK JSHashFunction)(const void *key);
-typedef intN (* JS_DLL_CALLBACK JSHashComparator)(const void *v1, const void *v2);
-typedef intN (* JS_DLL_CALLBACK JSHashEnumerator)(JSHashEntry *he, intN i, void *arg);
-
-/* Flag bits in JSHashEnumerator's return value */
-#define HT_ENUMERATE_NEXT       0       /* continue enumerating entries */
-#define HT_ENUMERATE_STOP       1       /* stop enumerating entries */
-#define HT_ENUMERATE_REMOVE     2       /* remove and free the current entry */
-#define HT_ENUMERATE_UNHASH     4       /* just unhash the current entry */
-
-typedef struct JSHashAllocOps {
-    void *              (*allocTable)(void *pool, size_t size);
-    void                (*freeTable)(void *pool, void *item);
-    JSHashEntry *       (*allocEntry)(void *pool, const void *key);
-    void                (*freeEntry)(void *pool, JSHashEntry *he, uintN flag);
-} JSHashAllocOps;
-
-#define HT_FREE_VALUE   0               /* just free the entry's value */
-#define HT_FREE_ENTRY   1               /* free value and entire entry */
-
-struct JSHashEntry {
-    JSHashEntry         *next;          /* hash chain linkage */
-    JSHashNumber        keyHash;        /* key hash function result */
-    const void          *key;           /* ptr to opaque key */
-    void                *value;         /* ptr to opaque value */
-};
-
-struct JSHashTable {
-    JSHashEntry         **buckets;      /* vector of hash buckets */
-    uint32              nentries;       /* number of entries in table */
-    uint32              shift;          /* multiplicative hash shift */
-    JSHashFunction      keyHash;        /* key hash function */
-    JSHashComparator    keyCompare;     /* key comparison function */
-    JSHashComparator    valueCompare;   /* value comparison function */
-    JSHashAllocOps      *allocOps;      /* allocation operations */
-    void                *allocPriv;     /* allocation private data */
-#ifdef HASHMETER
-    uint32              nlookups;       /* total number of lookups */
-    uint32              nsteps;         /* number of hash chains traversed */
-    uint32              ngrows;         /* number of table expansions */
-    uint32              nshrinks;       /* number of table contractions */
-#endif
-};
-
-/*
- * Create a new hash table.
- * If allocOps is null, use default allocator ops built on top of malloc().
- */
-extern JS_PUBLIC_API(JSHashTable *)
-JS_NewHashTable(uint32 n, JSHashFunction keyHash,
-                JSHashComparator keyCompare, JSHashComparator valueCompare,
-                JSHashAllocOps *allocOps, void *allocPriv);
-
-extern JS_PUBLIC_API(void)
-JS_HashTableDestroy(JSHashTable *ht);
-
-/* Low level access methods */
-extern JS_PUBLIC_API(JSHashEntry **)
-JS_HashTableRawLookup(JSHashTable *ht, JSHashNumber keyHash, const void *key);
-
-extern JS_PUBLIC_API(JSHashEntry *)
-JS_HashTableRawAdd(JSHashTable *ht, JSHashEntry **hep, JSHashNumber keyHash,
-                   const void *key, void *value);
-
-extern JS_PUBLIC_API(void)
-JS_HashTableRawRemove(JSHashTable *ht, JSHashEntry **hep, JSHashEntry *he);
-
-/* Higher level access methods */
-extern JS_PUBLIC_API(JSHashEntry *)
-JS_HashTableAdd(JSHashTable *ht, const void *key, void *value);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HashTableRemove(JSHashTable *ht, const void *key);
-
-extern JS_PUBLIC_API(intN)
-JS_HashTableEnumerateEntries(JSHashTable *ht, JSHashEnumerator f, void *arg);
-
-extern JS_PUBLIC_API(void *)
-JS_HashTableLookup(JSHashTable *ht, const void *key);
-
-extern JS_PUBLIC_API(intN)
-JS_HashTableDump(JSHashTable *ht, JSHashEnumerator dump, FILE *fp);
-
-/* General-purpose C string hash function. */
-extern JS_PUBLIC_API(JSHashNumber)
-JS_HashString(const void *key);
-
-/* Stub function just returns v1 == v2 */
-extern JS_PUBLIC_API(intN)
-JS_CompareValues(const void *v1, const void *v2);
-
-JS_END_EXTERN_C
-
-#endif /* jshash_h___ */
diff --git a/libs/js/src/jsinterp.c b/libs/js/src/jsinterp.c
deleted file mode 100644
index fcdc064e6b..0000000000
--- a/libs/js/src/jsinterp.c
+++ /dev/null
@@ -1,5511 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JavaScript bytecode interpreter.
- */
-#include "jsstddef.h"
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-#if JS_HAS_JIT
-#include "jsjit.h"
-#endif
-
-#if JS_HAS_XML_SUPPORT
-#include "jsxml.h"
-#endif
-
-#ifdef DEBUG
-#define ASSERT_CACHE_IS_EMPTY(cache)                                          \
-    JS_BEGIN_MACRO                                                            \
-        JSPropertyCacheEntry *end_, *pce_, entry_;                            \
-        JSPropertyCache *cache_ = (cache);                                    \
-        JS_ASSERT(cache_->empty);                                             \
-        end_ = &cache_->table[PROPERTY_CACHE_SIZE];                           \
-        for (pce_ = &cache_->table[0]; pce_ < end_; pce_++) {                 \
-            PCE_LOAD(cache_, pce_, entry_);                                   \
-            JS_ASSERT(!PCE_OBJECT(entry_));                                   \
-            JS_ASSERT(!PCE_PROPERTY(entry_));                                 \
-        }                                                                     \
-    JS_END_MACRO
-#else
-#define ASSERT_CACHE_IS_EMPTY(cache) ((void)0)
-#endif
-
-void
-js_FlushPropertyCache(JSContext *cx)
-{
-    JSPropertyCache *cache;
-
-    cache = &cx->runtime->propertyCache;
-    if (cache->empty) {
-        ASSERT_CACHE_IS_EMPTY(cache);
-        return;
-    }
-    memset(cache->table, 0, sizeof cache->table);
-    cache->empty = JS_TRUE;
-#ifdef JS_PROPERTY_CACHE_METERING
-    cache->flushes++;
-#endif
-}
-
-void
-js_DisablePropertyCache(JSContext *cx)
-{
-    JS_ASSERT(!cx->runtime->propertyCache.disabled);
-    cx->runtime->propertyCache.disabled = JS_TRUE;
-}
-
-void
-js_EnablePropertyCache(JSContext *cx)
-{
-    JS_ASSERT(cx->runtime->propertyCache.disabled);
-    ASSERT_CACHE_IS_EMPTY(&cx->runtime->propertyCache);
-    cx->runtime->propertyCache.disabled = JS_FALSE;
-}
-
-/*
- * Class for for/in loop property iterator objects.
- */
-#define JSSLOT_ITER_STATE   JSSLOT_PRIVATE
-
-static void
-prop_iterator_finalize(JSContext *cx, JSObject *obj)
-{
-    jsval iter_state;
-    jsval iteratee;
-
-    /* Protect against stillborn iterators. */
-    iter_state = obj->slots[JSSLOT_ITER_STATE];
-    iteratee = obj->slots[JSSLOT_PARENT];
-    if (!JSVAL_IS_NULL(iter_state) && !JSVAL_IS_PRIMITIVE(iteratee)) {
-        OBJ_ENUMERATE(cx, JSVAL_TO_OBJECT(iteratee), JSENUMERATE_DESTROY,
-                      &iter_state, NULL);
-    }
-    js_RemoveRoot(cx->runtime, &obj->slots[JSSLOT_PARENT]);
-}
-
-static JSClass prop_iterator_class = {
-    "PropertyIterator",
-    0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   prop_iterator_finalize,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-/*
- * Stack macros and functions.  These all use a local variable, jsval *sp, to
- * point to the next free stack slot.  SAVE_SP must be called before any call
- * to a function that may invoke the interpreter.  RESTORE_SP must be called
- * only after return from js_Invoke, because only js_Invoke changes fp->sp.
- */
-#define PUSH(v)         (*sp++ = (v))
-#define POP()           (*--sp)
-#ifdef DEBUG
-#define SAVE_SP(fp)                                                           \
-    (JS_ASSERT((fp)->script || !(fp)->spbase || (sp) == (fp)->spbase),        \
-     (fp)->sp = sp)
-#else
-#define SAVE_SP(fp)     ((fp)->sp = sp)
-#endif
-#define RESTORE_SP(fp)  (sp = (fp)->sp)
-
-/*
- * Push the generating bytecode's pc onto the parallel pc stack that runs
- * depth slots below the operands.
- *
- * NB: PUSH_OPND uses sp, depth, and pc from its lexical environment.  See
- * js_Interpret for these local variables' declarations and uses.
- */
-#define PUSH_OPND(v)    (sp[-depth] = (jsval)pc, PUSH(v))
-#define STORE_OPND(n,v) (sp[(n)-depth] = (jsval)pc, sp[n] = (v))
-#define POP_OPND()      POP()
-#define FETCH_OPND(n)   (sp[n])
-
-/*
- * Push the jsdouble d using sp, depth, and pc from the lexical environment.
- * Try to convert d to a jsint that fits in a jsval, otherwise GC-alloc space
- * for it and push a reference.
- */
-#define STORE_NUMBER(cx, n, d)                                                \
-    JS_BEGIN_MACRO                                                            \
-        jsint i_;                                                             \
-        jsval v_;                                                             \
-                                                                              \
-        if (JSDOUBLE_IS_INT(d, i_) && INT_FITS_IN_JSVAL(i_)) {                \
-            v_ = INT_TO_JSVAL(i_);                                            \
-        } else {                                                              \
-            ok = js_NewDoubleValue(cx, d, &v_);                               \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-        STORE_OPND(n, v_);                                                    \
-    JS_END_MACRO
-
-#define FETCH_NUMBER(cx, n, d)                                                \
-    JS_BEGIN_MACRO                                                            \
-        jsval v_;                                                             \
-                                                                              \
-        v_ = FETCH_OPND(n);                                                   \
-        VALUE_TO_NUMBER(cx, v_, d);                                           \
-    JS_END_MACRO
-
-#define FETCH_INT(cx, n, i)                                                   \
-    JS_BEGIN_MACRO                                                            \
-        jsval v_ = FETCH_OPND(n);                                             \
-        if (JSVAL_IS_INT(v_)) {                                               \
-            i = JSVAL_TO_INT(v_);                                             \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            ok = js_ValueToECMAInt32(cx, v_, &i);                             \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-#define FETCH_UINT(cx, n, ui)                                                 \
-    JS_BEGIN_MACRO                                                            \
-        jsval v_ = FETCH_OPND(n);                                             \
-        jsint i_;                                                             \
-        if (JSVAL_IS_INT(v_) && (i_ = JSVAL_TO_INT(v_)) >= 0) {               \
-            ui = (uint32) i_;                                                 \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            ok = js_ValueToECMAUint32(cx, v_, &ui);                           \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-/*
- * Optimized conversion macros that test for the desired type in v before
- * homing sp and calling a conversion function.
- */
-#define VALUE_TO_NUMBER(cx, v, d)                                             \
-    JS_BEGIN_MACRO                                                            \
-        if (JSVAL_IS_INT(v)) {                                                \
-            d = (jsdouble)JSVAL_TO_INT(v);                                    \
-        } else if (JSVAL_IS_DOUBLE(v)) {                                      \
-            d = *JSVAL_TO_DOUBLE(v);                                          \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            ok = js_ValueToNumber(cx, v, &d);                                 \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-#define POP_BOOLEAN(cx, v, b)                                                 \
-    JS_BEGIN_MACRO                                                            \
-        v = FETCH_OPND(-1);                                                   \
-        if (v == JSVAL_NULL) {                                                \
-            b = JS_FALSE;                                                     \
-        } else if (JSVAL_IS_BOOLEAN(v)) {                                     \
-            b = JSVAL_TO_BOOLEAN(v);                                          \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            ok = js_ValueToBoolean(cx, v, &b);                                \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-        sp--;                                                                 \
-    JS_END_MACRO
-
-#define VALUE_TO_OBJECT(cx, v, obj)                                           \
-    JS_BEGIN_MACRO                                                            \
-        if (!JSVAL_IS_PRIMITIVE(v)) {                                         \
-            obj = JSVAL_TO_OBJECT(v);                                         \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            obj = js_ValueToNonNullObject(cx, v);                             \
-            if (!obj) {                                                       \
-                ok = JS_FALSE;                                                \
-                goto out;                                                     \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-#define FETCH_OBJECT(cx, n, v, obj)                                           \
-    JS_BEGIN_MACRO                                                            \
-        v = FETCH_OPND(n);                                                    \
-        VALUE_TO_OBJECT(cx, v, obj);                                          \
-        STORE_OPND(n, OBJECT_TO_JSVAL(obj));                                  \
-    JS_END_MACRO
-
-#if JS_BUG_VOID_TOSTRING
-#define CHECK_VOID_TOSTRING(cx, v)                                            \
-    if (JSVAL_IS_VOID(v)) {                                                   \
-        JSString *str_;                                                       \
-        str_ = ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_VOID]); \
-        v = STRING_TO_JSVAL(str_);                                            \
-    }
-#else
-#define CHECK_VOID_TOSTRING(cx, v)  ((void)0)
-#endif
-
-#if JS_BUG_EAGER_TOSTRING
-#define CHECK_EAGER_TOSTRING(hint)  (hint = JSTYPE_STRING)
-#else
-#define CHECK_EAGER_TOSTRING(hint)  ((void)0)
-#endif
-
-#define VALUE_TO_PRIMITIVE(cx, v, hint, vp)                                   \
-    JS_BEGIN_MACRO                                                            \
-        if (JSVAL_IS_PRIMITIVE(v)) {                                          \
-            CHECK_VOID_TOSTRING(cx, v);                                       \
-            *vp = v;                                                          \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            CHECK_EAGER_TOSTRING(hint);                                       \
-            ok = OBJ_DEFAULT_VALUE(cx, JSVAL_TO_OBJECT(v), hint, vp);         \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-JS_FRIEND_API(jsval *)
-js_AllocRawStack(JSContext *cx, uintN nslots, void **markp)
-{
-    jsval *sp;
-
-    if (markp)
-        *markp = JS_ARENA_MARK(&cx->stackPool);
-    JS_ARENA_ALLOCATE_CAST(sp, jsval *, &cx->stackPool, nslots * sizeof(jsval));
-    if (!sp) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_STACK_OVERFLOW,
-                             (cx->fp && cx->fp->fun)
-                             ? JS_GetFunctionName(cx->fp->fun)
-                             : "script");
-    }
-    return sp;
-}
-
-JS_FRIEND_API(void)
-js_FreeRawStack(JSContext *cx, void *mark)
-{
-    JS_ARENA_RELEASE(&cx->stackPool, mark);
-}
-
-JS_FRIEND_API(jsval *)
-js_AllocStack(JSContext *cx, uintN nslots, void **markp)
-{
-    jsval *sp, *vp, *end;
-    JSArena *a;
-    JSStackHeader *sh;
-    JSStackFrame *fp;
-
-    /* Callers don't check for zero nslots: we do to avoid empty segments. */
-    if (nslots == 0) {
-        *markp = NULL;
-        return JS_ARENA_MARK(&cx->stackPool);
-    }
-
-    /* Allocate 2 extra slots for the stack segment header we'll likely need. */
-    sp = js_AllocRawStack(cx, 2 + nslots, markp);
-    if (!sp)
-        return NULL;
-
-    /* Try to avoid another header if we can piggyback on the last segment. */
-    a = cx->stackPool.current;
-    sh = cx->stackHeaders;
-    if (sh && JS_STACK_SEGMENT(sh) + sh->nslots == sp) {
-        /* Extend the last stack segment, give back the 2 header slots. */
-        sh->nslots += nslots;
-        a->avail -= 2 * sizeof(jsval);
-    } else {
-        /*
-         * Need a new stack segment, so we must initialize unused slots in the
-         * current frame.  See js_GC, just before marking the "operand" jsvals,
-         * where we scan from fp->spbase to fp->sp or through fp->script->depth
-         * (whichever covers fewer slots).
-         */
-        fp = cx->fp;
-        if (fp && fp->script && fp->spbase) {
-#ifdef DEBUG
-            jsuword depthdiff = fp->script->depth * sizeof(jsval);
-            JS_ASSERT(JS_UPTRDIFF(fp->sp, fp->spbase) <= depthdiff);
-            JS_ASSERT(JS_UPTRDIFF(*markp, fp->spbase) >= depthdiff);
-#endif
-            end = fp->spbase + fp->script->depth;
-            for (vp = fp->sp; vp < end; vp++)
-                *vp = JSVAL_VOID;
-        }
-
-        /* Allocate and push a stack segment header from the 2 extra slots. */
-        sh = (JSStackHeader *)sp;
-        sh->nslots = nslots;
-        sh->down = cx->stackHeaders;
-        cx->stackHeaders = sh;
-        sp += 2;
-    }
-
-    /*
-     * Store JSVAL_NULL using memset, to let compilers optimize as they see
-     * fit, in case a caller allocates and pushes GC-things one by one, which
-     * could nest a last-ditch GC that will scan this segment.
-     */
-    memset(sp, 0, nslots * sizeof(jsval));
-    return sp;
-}
-
-JS_FRIEND_API(void)
-js_FreeStack(JSContext *cx, void *mark)
-{
-    JSStackHeader *sh;
-    jsuword slotdiff;
-
-    /* Check for zero nslots allocation special case. */
-    if (!mark)
-        return;
-
-    /* We can assert because js_FreeStack always balances js_AllocStack. */
-    sh = cx->stackHeaders;
-    JS_ASSERT(sh);
-
-    /* If mark is in the current segment, reduce sh->nslots, else pop sh. */
-    slotdiff = JS_UPTRDIFF(mark, JS_STACK_SEGMENT(sh)) / sizeof(jsval);
-    if (slotdiff < (jsuword)sh->nslots)
-        sh->nslots = slotdiff;
-    else
-        cx->stackHeaders = sh->down;
-
-    /* Release the stackPool space allocated since mark was set. */
-    JS_ARENA_RELEASE(&cx->stackPool, mark);
-}
-
-JSBool
-js_GetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return JS_TRUE;
-}
-
-JSBool
-js_SetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return JS_TRUE;
-}
-
-JSBool
-js_GetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return JS_TRUE;
-}
-
-JSBool
-js_SetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    return JS_TRUE;
-}
-
-JSBool
-js_ComputeThis(JSContext *cx, JSObject *thisp, JSStackFrame *fp)
-{
-    JSObject *parent;
-
-    if (thisp && OBJ_GET_CLASS(cx, thisp) != &js_CallClass) {
-        /* Some objects (e.g., With) delegate 'this' to another object. */
-        thisp = OBJ_THIS_OBJECT(cx, thisp);
-        if (!thisp)
-            return JS_FALSE;
-
-        /* Default return value for a constructor is the new object. */
-        if (fp->flags & JSFRAME_CONSTRUCTING)
-            fp->rval = OBJECT_TO_JSVAL(thisp);
-    } else {
-        /*
-         * ECMA requires "the global object", but in the presence of multiple
-         * top-level objects (windows, frames, or certain layers in the client
-         * object model), we prefer fun's parent.  An example that causes this
-         * code to run:
-         *
-         *   // in window w1
-         *   function f() { return this }
-         *   function g() { return f }
-         *
-         *   // in window w2
-         *   var h = w1.g()
-         *   alert(h() == w1)
-         *
-         * The alert should display "true".
-         */
-        JS_ASSERT(!(fp->flags & JSFRAME_CONSTRUCTING));
-        if (JSVAL_IS_PRIMITIVE(fp->argv[-2]) ||
-            !(parent = OBJ_GET_PARENT(cx, JSVAL_TO_OBJECT(fp->argv[-2])))) {
-            thisp = cx->globalObject;
-        } else {
-            /* walk up to find the top-level object */
-            thisp = parent;
-            while ((parent = OBJ_GET_PARENT(cx, thisp)) != NULL)
-                thisp = parent;
-        }
-    }
-    fp->thisp = thisp;
-    fp->argv[-1] = OBJECT_TO_JSVAL(thisp);
-    return JS_TRUE;
-}
-
-#ifdef DUMP_CALL_TABLE
-
-#include "jsclist.h"
-#include "jshash.h"
-#include "jsdtoa.h"
-
-typedef struct CallKey {
-    jsval               callee;                 /* callee value */
-    const char          *filename;              /* function filename or null */
-    uintN               lineno;                 /* function lineno or 0 */
-} CallKey;
-
-/* Compensate for typeof null == "object" brain damage. */
-#define JSTYPE_NULL     JSTYPE_LIMIT
-#define TYPEOF(cx,v)    (JSVAL_IS_NULL(v) ? JSTYPE_NULL : JS_TypeOfValue(cx,v))
-#define TYPENAME(t)     (((t) == JSTYPE_NULL) ? js_null_str : js_type_str[t])
-#define NTYPEHIST       (JSTYPE_LIMIT + 1)
-
-typedef struct CallValue {
-    uint32              total;                  /* total call count */
-    uint32              recycled;               /* LRU-recycled calls lost */
-    uint16              minargc;                /* minimum argument count */
-    uint16              maxargc;                /* maximum argument count */
-    struct ArgInfo {
-        uint32          typeHist[NTYPEHIST];    /* histogram by type */
-        JSCList         lruList;                /* top 10 values LRU list */
-        struct ArgValCount {
-            JSCList     lruLink;                /* LRU list linkage */
-            jsval       value;                  /* recently passed value */
-            uint32      count;                  /* number of times passed */
-            char        strbuf[112];            /* string conversion buffer */
-        } topValCounts[10];                     /* top 10 value storage */
-    } argInfo[8];
-} CallValue;
-
-typedef struct CallEntry {
-    JSHashEntry         entry;
-    CallKey             key;
-    CallValue           value;
-    char                name[32];               /* function name copy */
-} CallEntry;
-
-static void *
-AllocCallTable(void *pool, size_t size)
-{
-    return malloc(size);
-}
-
-static void
-FreeCallTable(void *pool, void *item)
-{
-    free(item);
-}
-
-static JSHashEntry *
-AllocCallEntry(void *pool, const void *key)
-{
-    return (JSHashEntry*) calloc(1, sizeof(CallEntry));
-}
-
-static void
-FreeCallEntry(void *pool, JSHashEntry *he, uintN flag)
-{
-    JS_ASSERT(flag == HT_FREE_ENTRY);
-    free(he);
-}
-
-static JSHashAllocOps callTableAllocOps = {
-    AllocCallTable, FreeCallTable,
-    AllocCallEntry, FreeCallEntry
-};
-
-JS_STATIC_DLL_CALLBACK(JSHashNumber)
-js_hash_call_key(const void *key)
-{
-    CallKey *ck = (CallKey *) key;
-    JSHashNumber hash = (jsuword)ck->callee >> 3;
-
-    if (ck->filename) {
-        hash = (hash << 4) ^ JS_HashString(ck->filename);
-        hash = (hash << 4) ^ ck->lineno;
-    }
-    return hash;
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_compare_call_keys(const void *k1, const void *k2)
-{
-    CallKey *ck1 = (CallKey *)k1, *ck2 = (CallKey *)k2;
-
-    return ck1->callee == ck2->callee &&
-           ((ck1->filename && ck2->filename)
-            ? strcmp(ck1->filename, ck2->filename) == 0
-            : ck1->filename == ck2->filename) &&
-           ck1->lineno == ck2->lineno;
-}
-
-JSHashTable *js_CallTable;
-size_t      js_LogCallToSourceLimit;
-
-JS_STATIC_DLL_CALLBACK(intN)
-CallTableDumper(JSHashEntry *he, intN k, void *arg)
-{
-    CallEntry *ce = (CallEntry *)he;
-    FILE *fp = (FILE *)arg;
-    uintN argc, i, n;
-    struct ArgInfo *ai;
-    JSType save, type;
-    JSCList *cl;
-    struct ArgValCount *avc;
-    jsval argval;
-
-    if (ce->key.filename) {
-        /* We're called at the end of the mark phase, so mark our filenames. */
-        js_MarkScriptFilename(ce->key.filename);
-        fprintf(fp, "%s:%u ", ce->key.filename, ce->key.lineno);
-    } else {
-        fprintf(fp, "@%p ", (void *) ce->key.callee);
-    }
-
-    if (ce->name[0])
-        fprintf(fp, "name %s ", ce->name);
-    fprintf(fp, "calls %lu (%lu) argc %u/%u\n",
-            (unsigned long) ce->value.total,
-            (unsigned long) ce->value.recycled,
-            ce->value.minargc, ce->value.maxargc);
-
-    argc = JS_MIN(ce->value.maxargc, 8);
-    for (i = 0; i < argc; i++) {
-        ai = &ce->value.argInfo[i];
-
-        n = 0;
-        save = -1;
-        for (type = JSTYPE_VOID; type <= JSTYPE_LIMIT; type++) {
-            if (ai->typeHist[type]) {
-                save = type;
-                ++n;
-            }
-        }
-        if (n == 1) {
-            fprintf(fp, "  arg %u type %s: %lu\n",
-                    i, TYPENAME(save), (unsigned long) ai->typeHist[save]);
-        } else {
-            fprintf(fp, "  arg %u type histogram:\n", i);
-            for (type = JSTYPE_VOID; type <= JSTYPE_LIMIT; type++) {
-                fprintf(fp, "  %9s: %8lu ",
-                       TYPENAME(type), (unsigned long) ai->typeHist[type]);
-                for (n = (uintN) JS_HOWMANY(ai->typeHist[type], 10); n > 0; --n)
-                    fputc('*', fp);
-                fputc('\n', fp);
-            }
-        }
-
-        fprintf(fp, "  arg %u top 10 values:\n", i);
-        n = 1;
-        for (cl = ai->lruList.prev; cl != &ai->lruList; cl = cl->prev) {
-            avc = (struct ArgValCount *)cl;
-            if (!avc->count)
-                break;
-            argval = avc->value;
-            fprintf(fp, "  %9u: %8lu %.*s (%#lx)\n",
-                    n, (unsigned long) avc->count,
-                    sizeof avc->strbuf, avc->strbuf, argval);
-            ++n;
-        }
-    }
-
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_DumpCallTable(JSContext *cx)
-{
-    char name[24];
-    FILE *fp;
-    static uintN dumpCount;
-
-    if (!js_CallTable)
-        return;
-
-    JS_snprintf(name, sizeof name, "/tmp/calltable.dump.%u", dumpCount & 7);
-    dumpCount++;
-    fp = fopen(name, "w");
-    if (!fp)
-        return;
-
-    JS_HashTableEnumerateEntries(js_CallTable, CallTableDumper, fp);
-    fclose(fp);
-}
-
-static void
-LogCall(JSContext *cx, jsval callee, uintN argc, jsval *argv)
-{
-    CallKey key;
-    const char *name, *cstr;
-    JSFunction *fun;
-    JSHashNumber keyHash;
-    JSHashEntry **hep, *he;
-    CallEntry *ce;
-    uintN i, j;
-    jsval argval;
-    JSType type;
-    struct ArgInfo *ai;
-    struct ArgValCount *avc;
-    JSString *str;
-
-    if (!js_CallTable) {
-        js_CallTable = JS_NewHashTable(1024, js_hash_call_key,
-                                       js_compare_call_keys, NULL,
-                                       &callTableAllocOps, NULL);
-        if (!js_CallTable)
-            return;
-    }
-
-    key.callee = callee;
-    key.filename = NULL;
-    key.lineno = 0;
-    name = "";
-    if (JSVAL_IS_FUNCTION(cx, callee)) {
-        fun = (JSFunction *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(callee));
-        if (fun->atom)
-            name = js_AtomToPrintableString(cx, fun->atom);
-        if (fun->interpreted) {
-            key.filename = fun->u.script->filename;
-            key.lineno = fun->u.script->lineno;
-        }
-    }
-    keyHash = js_hash_call_key(&key);
-
-    hep = JS_HashTableRawLookup(js_CallTable, keyHash, &key);
-    he = *hep;
-    if (he) {
-        ce = (CallEntry *) he;
-        JS_ASSERT(strncmp(ce->name, name, sizeof ce->name) == 0);
-    } else {
-        he = JS_HashTableRawAdd(js_CallTable, hep, keyHash, &key, NULL);
-        if (!he)
-            return;
-        ce = (CallEntry *) he;
-        ce->entry.key = &ce->key;
-        ce->entry.value = &ce->value;
-        ce->key = key;
-        for (i = 0; i < 8; i++) {
-            ai = &ce->value.argInfo[i];
-            JS_INIT_CLIST(&ai->lruList);
-            for (j = 0; j < 10; j++)
-                JS_APPEND_LINK(&ai->topValCounts[j].lruLink, &ai->lruList);
-        }
-        strncpy(ce->name, name, sizeof ce->name);
-    }
-
-    ++ce->value.total;
-    if (ce->value.minargc < argc)
-        ce->value.minargc = argc;
-    if (ce->value.maxargc < argc)
-        ce->value.maxargc = argc;
-    if (argc > 8)
-        argc = 8;
-    for (i = 0; i < argc; i++) {
-        ai = &ce->value.argInfo[i];
-        argval = argv[i];
-        type = TYPEOF(cx, argval);
-        ++ai->typeHist[type];
-
-        for (j = 0; ; j++) {
-            if (j == 10) {
-                avc = (struct ArgValCount *) ai->lruList.next;
-                ce->value.recycled += avc->count;
-                avc->value = argval;
-                avc->count = 1;
-                break;
-            }
-            avc = &ai->topValCounts[j];
-            if (avc->value == argval) {
-                ++avc->count;
-                break;
-            }
-        }
-
-        /* Move avc to the back of the LRU list. */
-        JS_REMOVE_LINK(&avc->lruLink);
-        JS_APPEND_LINK(&avc->lruLink, &ai->lruList);
-
-        str = NULL;
-        cstr = "";
-        switch (TYPEOF(cx, argval)) {
-          case JSTYPE_VOID:
-            cstr = js_type_str[JSTYPE_VOID];
-            break;
-          case JSTYPE_NULL:
-            cstr = js_null_str;
-            break;
-          case JSTYPE_BOOLEAN:
-            cstr = js_boolean_str[JSVAL_TO_BOOLEAN(argval)];
-            break;
-          case JSTYPE_NUMBER:
-            if (JSVAL_IS_INT(argval)) {
-                JS_snprintf(avc->strbuf, sizeof avc->strbuf, "%ld",
-                            JSVAL_TO_INT(argval));
-            } else {
-                JS_dtostr(avc->strbuf, sizeof avc->strbuf, DTOSTR_STANDARD, 0,
-                          *JSVAL_TO_DOUBLE(argval));
-            }
-            continue;
-          case JSTYPE_STRING:
-            str = js_QuoteString(cx, JSVAL_TO_STRING(argval), (jschar)'"');
-            break;
-          case JSTYPE_FUNCTION:
-            if (JSVAL_IS_FUNCTION(cx, argval)) {
-                fun = (JSFunction *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(argval));
-                if (fun && fun->atom) {
-                    str = ATOM_TO_STRING(fun->atom);
-                    break;
-                }
-            }
-            /* FALL THROUGH */
-          case JSTYPE_OBJECT:
-            js_LogCallToSourceLimit = sizeof avc->strbuf;
-            cx->options |= JSOPTION_LOGCALL_TOSOURCE;
-            str = js_ValueToSource(cx, argval);
-            cx->options &= ~JSOPTION_LOGCALL_TOSOURCE;
-            break;
-        }
-        if (str)
-            cstr = JS_GetStringBytes(str);
-        strncpy(avc->strbuf, cstr, sizeof avc->strbuf);
-    }
-}
-
-#endif /* DUMP_CALL_TABLE */
-
-/*
- * Find a function reference and its 'this' object implicit first parameter
- * under argc arguments on cx's stack, and call the function.  Push missing
- * required arguments, allocate declared local variables, and pop everything
- * when done.  Then push the return value.
- */
-JS_FRIEND_API(JSBool)
-js_Invoke(JSContext *cx, uintN argc, uintN flags)
-{
-    void *mark;
-    JSStackFrame *fp, frame;
-    jsval *sp, *newsp, *limit;
-    jsval *vp, v;
-    JSObject *funobj, *parent, *thisp;
-    JSBool ok;
-    JSClass *clasp;
-    JSObjectOps *ops;
-    JSNative native;
-    JSFunction *fun;
-    JSScript *script;
-    uintN nslots, nvars, nalloc, surplus;
-    JSInterpreterHook hook;
-    void *hookData;
-
-    /* Mark the top of stack and load frequently-used registers. */
-    mark = JS_ARENA_MARK(&cx->stackPool);
-    fp = cx->fp;
-    sp = fp->sp;
-
-    /*
-     * Set vp to the callee value's stack slot (it's where rval goes).
-     * Once vp is set, control should flow through label out2: to return.
-     * Set frame.rval early so native class and object ops can throw and
-     * return false, causing a goto out2 with ok set to false.  Also set
-     * frame.flags to flags so that ComputeThis can test bits in it.
-     */
-    vp = sp - (2 + argc);
-    v = *vp;
-    frame.rval = JSVAL_VOID;
-    frame.flags = flags;
-    thisp = JSVAL_TO_OBJECT(vp[1]);
-
-    /*
-     * A callee must be an object reference, unless its |this| parameter
-     * implements the __noSuchMethod__ method, in which case that method will
-     * be called like so:
-     *
-     *   thisp.__noSuchMethod__(id, args)
-     *
-     * where id is the name of the method that this invocation attempted to
-     * call by name, and args is an Array containing this invocation's actual
-     * parameters.
-     */
-    if (JSVAL_IS_PRIMITIVE(v)) {
-#if JS_HAS_NO_SUCH_METHOD
-        jsid id;
-        jsbytecode *pc;
-        jsatomid atomIndex;
-        JSAtom *atom;
-        JSObject *argsobj;
-        JSArena *a;
-
-        if (!fp->script || (flags & JSINVOKE_INTERNAL))
-            goto bad;
-
-        /*
-         * We must ComputeThis here to censor Call objects; performance hit,
-         * but at least it's idempotent.
-         *
-         * Normally, we call ComputeThis after all frame members have been
-         * set, and in particular, after any revision of the callee value at
-         * *vp  due to clasp->convert (see below).  This matters because
-         * ComputeThis may access *vp via fp->argv[-2], to follow the parent
-         * chain to a global object to use as the |this| parameter.
-         *
-         * Obviously, here in the JSVAL_IS_PRIMITIVE(v) case, there can't be
-         * any such defaulting of |this| to callee (v, *vp) ancestor.
-         */
-        frame.argv = vp + 2;
-        ok = js_ComputeThis(cx, thisp, &frame);
-        if (!ok)
-            goto out2;
-        thisp = frame.thisp;
-
-        id = ATOM_TO_JSID(cx->runtime->atomState.noSuchMethodAtom);
-#if defined(OSSP) /* BUGFIX */ && JS_HAS_XML_SUPPORT
-        if (OBJECT_IS_XML(cx, thisp)) {
-            JSXMLObjectOps *ops;
-
-            ops = (JSXMLObjectOps *) thisp->map->ops;
-            thisp = ops->getMethod(cx, thisp, id, &v);
-            if (!thisp) {
-                ok = JS_FALSE;
-                goto out2;
-            }
-            vp[1] = OBJECT_TO_JSVAL(thisp);
-        } else {
-#endif
-            ok = OBJ_GET_PROPERTY(cx, thisp, id, &v);
-#if defined(OSSP) /* BUGFIX */ && JS_HAS_XML_SUPPORT
-        }
-#endif
-        if (!ok)
-            goto out2;
-        if (JSVAL_IS_PRIMITIVE(v))
-            goto bad;
-
-        pc = (jsbytecode *) vp[-(intN)fp->script->depth];
-        switch ((JSOp) *pc) {
-          case JSOP_NAME:
-          case JSOP_GETPROP:
-#if JS_HAS_XML_SUPPORT
-          case JSOP_GETMETHOD:
-#endif
-            atomIndex = GET_ATOM_INDEX(pc);
-            atom = js_GetAtom(cx, &fp->script->atomMap, atomIndex);
-            argsobj = js_NewArrayObject(cx, argc, vp + 2);
-            if (!argsobj) {
-                ok = JS_FALSE;
-                goto out2;
-            }
-
-            sp = vp + 4;
-            if (argc < 2) {
-                a = cx->stackPool.current;
-                if ((jsuword)sp > a->limit) {
-                    /*
-                     * Arguments must be contiguous, and must include argv[-1]
-                     * and argv[-2], so allocate more stack, advance sp, and
-                     * set newsp[1] to thisp (vp[1]).  The other argv elements
-                     * will be set below, using negative indexing from sp.
-                     */
-                    newsp = js_AllocRawStack(cx, 4, NULL);
-                    if (!newsp) {
-                        ok = JS_FALSE;
-                        goto out2;
-                    }
-                    newsp[1] = OBJECT_TO_JSVAL(thisp);
-                    sp = newsp + 4;
-                } else if ((jsuword)sp > a->avail) {
-                    /*
-                     * Inline, optimized version of JS_ARENA_ALLOCATE to claim
-                     * the small number of words not already allocated as part
-                     * of the caller's operand stack.
-                     */
-                    JS_ArenaCountAllocation(&cx->stackPool,
-                                            (jsuword)sp - a->avail);
-                    a->avail = (jsuword)sp;
-                }
-            }
-
-            sp[-4] = v;
-            JS_ASSERT(sp[-3] == OBJECT_TO_JSVAL(thisp));
-            sp[-2] = ATOM_KEY(atom);
-            sp[-1] = OBJECT_TO_JSVAL(argsobj);
-            fp->sp = sp;
-            argc = 2;
-            break;
-
-          default:
-            goto bad;
-        }
-#else
-        goto bad;
-#endif
-    }
-
-    funobj = JSVAL_TO_OBJECT(v);
-    parent = OBJ_GET_PARENT(cx, funobj);
-    clasp = OBJ_GET_CLASS(cx, funobj);
-    if (clasp != &js_FunctionClass) {
-        /* Function is inlined, all other classes use object ops. */
-        ops = funobj->map->ops;
-
-        /*
-         * XXX this makes no sense -- why convert to function if clasp->call?
-         * XXX better to call that hook without converting
-         * XXX the only thing that needs fixing is liveconnect
-         *
-         * Try converting to function, for closure and API compatibility.
-         * We attempt the conversion under all circumstances for 1.2, but
-         * only if there is a call op defined otherwise.
-         */
-        if (JS_VERSION_IS_1_2(cx) ||
-            ((ops == &js_ObjectOps) ? clasp->call : ops->call)) {
-            ok = clasp->convert(cx, funobj, JSTYPE_FUNCTION, &v);
-            if (!ok)
-                goto out2;
-
-            if (JSVAL_IS_FUNCTION(cx, v)) {
-                /* Make vp refer to funobj to keep it available as argv[-2]. */
-                *vp = v;
-                funobj = JSVAL_TO_OBJECT(v);
-                parent = OBJ_GET_PARENT(cx, funobj);
-                goto have_fun;
-            }
-        }
-        fun = NULL;
-        script = NULL;
-        nslots = nvars = 0;
-
-        /* Try a call or construct native object op. */
-        native = (flags & JSINVOKE_CONSTRUCT) ? ops->construct : ops->call;
-        if (!native)
-            goto bad;
-    } else {
-have_fun:
-        /* Get private data and set derived locals from it. */
-        fun = (JSFunction *) JS_GetPrivate(cx, funobj);
-        if (fun->interpreted) {
-            native = NULL;
-            script = fun->u.script;
-        } else {
-            native = fun->u.native;
-            script = NULL;
-        }
-        nslots = (fun->nargs > argc) ? fun->nargs - argc : 0;
-        nslots += fun->extra;
-        nvars = fun->nvars;
-
-        /* Handle bound method special case. */
-        if (fun->flags & JSFUN_BOUND_METHOD)
-            thisp = parent;
-    }
-
-    /* Initialize the rest of frame, except for sp (set by SAVE_SP later). */
-    frame.varobj = NULL;
-    frame.callobj = frame.argsobj = NULL;
-    frame.script = script;
-    frame.fun = fun;
-    frame.argc = argc;
-    frame.argv = sp - argc;
-    frame.nvars = nvars;
-    frame.vars = sp;
-    frame.down = fp;
-    frame.annotation = NULL;
-    frame.scopeChain = NULL;    /* set below for real, after cx->fp is set */
-    frame.pc = NULL;
-    frame.spbase = NULL;
-    frame.sharpDepth = 0;
-    frame.sharpArray = NULL;
-    frame.dormantNext = NULL;
-    frame.xmlNamespace = NULL;
-
-    /* Compute the 'this' parameter and store it in frame as frame.thisp. */
-    ok = js_ComputeThis(cx, thisp, &frame);
-    if (!ok)
-        goto out2;
-
-    /* From here on, control must flow through label out: to return. */
-    cx->fp = &frame;
-
-    /* Init these now in case we goto out before first hook call. */
-    hook = cx->runtime->callHook;
-    hookData = NULL;
-
-    /* Check for argument slots required by the function. */
-    if (nslots) {
-        /* All arguments must be contiguous, so we may have to copy actuals. */
-        nalloc = nslots;
-        limit = (jsval *) cx->stackPool.current->limit;
-        if (sp + nslots > limit) {
-            /* Hit end of arena: we have to copy argv[-2..(argc+nslots-1)]. */
-            nalloc += 2 + argc;
-        } else {
-            /* Take advantage of surplus slots in the caller's frame depth. */
-            JS_ASSERT((jsval *)mark >= sp);
-            surplus = (jsval *)mark - sp;
-            nalloc -= surplus;
-        }
-
-        /* Check whether we have enough space in the caller's frame. */
-        if ((intN)nalloc > 0) {
-            /* Need space for actuals plus missing formals minus surplus. */
-            newsp = js_AllocRawStack(cx, nalloc, NULL);
-            if (!newsp) {
-                ok = JS_FALSE;
-                goto out;
-            }
-
-            /* If we couldn't allocate contiguous args, copy actuals now. */
-            if (newsp != mark) {
-                JS_ASSERT(sp + nslots > limit);
-                JS_ASSERT(2 + argc + nslots == nalloc);
-                *newsp++ = vp[0];
-                *newsp++ = vp[1];
-                if (argc)
-                    memcpy(newsp, frame.argv, argc * sizeof(jsval));
-                frame.argv = newsp;
-                sp = frame.vars = newsp + argc;
-            }
-        }
-
-        /* Advance frame.vars to make room for the missing args. */
-        frame.vars += nslots;
-
-        /* Push void to initialize missing args. */
-        do {
-            PUSH(JSVAL_VOID);
-        } while (--nslots != 0);
-    }
-    JS_ASSERT(nslots == 0);
-
-    /* Now allocate stack space for local variables. */
-    if (nvars) {
-        JS_ASSERT((jsval *)cx->stackPool.current->avail >= frame.vars);
-        surplus = (jsval *)cx->stackPool.current->avail - frame.vars;
-        if (surplus < nvars) {
-            newsp = js_AllocRawStack(cx, nvars, NULL);
-            if (!newsp) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            if (newsp != sp) {
-                /* NB: Discontinuity between argv and vars. */
-                sp = frame.vars = newsp;
-            }
-        }
-
-        /* Push void to initialize local variables. */
-        do {
-            PUSH(JSVAL_VOID);
-        } while (--nvars != 0);
-    }
-    JS_ASSERT(nvars == 0);
-
-    /* Store the current sp in frame before calling fun. */
-    SAVE_SP(&frame);
-
-    /* call the hook if present */
-    if (hook && (native || script))
-        hookData = hook(cx, &frame, JS_TRUE, 0, cx->runtime->callHookData);
-
-    /* Call the function, either a native method or an interpreted script. */
-    if (native) {
-#if JS_HAS_LVALUE_RETURN
-        /* Set by JS_SetCallReturnValue2, used to return reference types. */
-        cx->rval2set = JS_FALSE;
-#endif
-
-        /* If native, use caller varobj and scopeChain for eval. */
-        frame.varobj = fp->varobj;
-        frame.scopeChain = fp->scopeChain;
-        ok = native(cx, frame.thisp, argc, frame.argv, &frame.rval);
-        JS_RUNTIME_METER(cx->runtime, nativeCalls);
-    } else if (script) {
-#ifdef DUMP_CALL_TABLE
-        LogCall(cx, *vp, argc, frame.argv);
-#endif
-        /* Use parent scope so js_GetCallObject can find the right "Call". */
-        frame.scopeChain = parent;
-        if (fun->flags & JSFUN_HEAVYWEIGHT) {
-#if JS_HAS_CALL_OBJECT
-            /* Scope with a call object parented by the callee's parent. */
-            if (!js_GetCallObject(cx, &frame, parent)) {
-                ok = JS_FALSE;
-                goto out;
-            }
-#else
-            /* Bad old code used the function as a proxy for all calls to it. */
-            frame.scopeChain = funobj;
-#endif
-        }
-        ok = js_Interpret(cx, script->code, &v);
-    } else {
-        /* fun might be onerror trying to report a syntax error in itself. */
-        frame.scopeChain = NULL;
-        ok = JS_TRUE;
-    }
-
-out:
-    if (hookData) {
-        hook = cx->runtime->callHook;
-        if (hook)
-            hook(cx, &frame, JS_FALSE, &ok, hookData);
-    }
-#if JS_HAS_CALL_OBJECT
-    /* If frame has a call object, sync values and clear back-pointer. */
-    if (frame.callobj)
-        ok &= js_PutCallObject(cx, &frame);
-#endif
-#if JS_HAS_ARGS_OBJECT
-    /* If frame has an arguments object, sync values and clear back-pointer. */
-    if (frame.argsobj)
-        ok &= js_PutArgsObject(cx, &frame);
-#endif
-
-    /* Restore cx->fp now that we're done releasing frame objects. */
-    cx->fp = fp;
-
-out2:
-    /* Pop everything we may have allocated off the stack. */
-    JS_ARENA_RELEASE(&cx->stackPool, mark);
-
-    /* Store the return value and restore sp just above it. */
-    *vp = frame.rval;
-    fp->sp = vp + 1;
-
-    /*
-     * Store the location of the JSOP_CALL or JSOP_EVAL that generated the
-     * return value, but only if this is an external (compiled from script
-     * source) call that has stack budget for the generating pc.
-     */
-    if (fp->script && !(flags & JSINVOKE_INTERNAL))
-        vp[-(intN)fp->script->depth] = (jsval)fp->pc;
-    return ok;
-
-bad:
-    js_ReportIsNotFunction(cx, vp, flags & JSINVOKE_CONSTRUCT);
-    ok = JS_FALSE;
-    goto out2;
-}
-
-JSBool
-js_InternalInvoke(JSContext *cx, JSObject *obj, jsval fval, uintN flags,
-                  uintN argc, jsval *argv, jsval *rval)
-{
-    JSStackFrame *fp, *oldfp, frame;
-    jsval *oldsp, *sp;
-    void *mark;
-    uintN i;
-    JSBool ok;
-
-    fp = oldfp = cx->fp;
-    if (!fp) {
-        memset(&frame, 0, sizeof frame);
-        cx->fp = fp = &frame;
-    }
-    oldsp = fp->sp;
-    sp = js_AllocStack(cx, 2 + argc, &mark);
-    if (!sp) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-    PUSH(fval);
-    PUSH(OBJECT_TO_JSVAL(obj));
-    for (i = 0; i < argc; i++)
-        PUSH(argv[i]);
-    SAVE_SP(fp);
-    ok = js_Invoke(cx, argc, flags | JSINVOKE_INTERNAL);
-    if (ok) {
-        RESTORE_SP(fp);
-
-        /*
-         * Store *rval in the a scoped local root if a scope is open, else in
-         * the cx->lastInternalResult pigeon-hole GC root, solely so users of
-         * js_InternalInvoke and its direct and indirect (js_ValueToString for
-         * example) callers do not need to manage roots for local, temporary
-         * references to such results.
-         */
-        *rval = POP_OPND();
-        if (JSVAL_IS_GCTHING(*rval)) {
-            if (cx->localRootStack) {
-                if (js_PushLocalRoot(cx, cx->localRootStack, *rval) < 0)
-                    ok = JS_FALSE;
-            } else {
-                cx->lastInternalResult = *rval;
-            }
-        }
-    }
-
-    js_FreeStack(cx, mark);
-out:
-    fp->sp = oldsp;
-    if (oldfp != fp)
-        cx->fp = oldfp;
-
-    return ok;
-}
-
-JSBool
-js_InternalGetOrSet(JSContext *cx, JSObject *obj, jsid id, jsval fval,
-                    JSAccessMode mode, uintN argc, jsval *argv, jsval *rval)
-{
-    /*
-     * Check general (not object-ops/class-specific) access from the running
-     * script to obj.id only if id has a scripted getter or setter that we're
-     * about to invoke.  If we don't check this case, nothing else will -- no
-     * other native code has the chance to check.
-     *
-     * Contrast this non-native (scripted) case with native getter and setter
-     * accesses, where the native itself must do an access check, if security
-     * policies requires it.  We make a checkAccess or checkObjectAccess call
-     * back to the embedding program only in those cases where we're not going
-     * to call an embedding-defined native function, getter, setter, or class
-     * hook anyway.  Where we do call such a native, there's no need for the
-     * engine to impose a separate access check callback on all embeddings --
-     * many embeddings have no security policy at all.
-     */
-    JS_ASSERT(mode == JSACC_READ || mode == JSACC_WRITE);
-    if (cx->runtime->checkObjectAccess &&
-        JSVAL_IS_FUNCTION(cx, fval) &&
-        ((JSFunction *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(fval)))->interpreted &&
-        !cx->runtime->checkObjectAccess(cx, obj, ID_TO_VALUE(id), mode,
-                                        &fval)) {
-        return JS_FALSE;
-    }
-
-    return js_InternalCall(cx, obj, fval, argc, argv, rval);
-}
-
-JSBool
-js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
-           JSStackFrame *down, uintN flags, jsval *result)
-{
-    JSInterpreterHook hook;
-    void *hookData, *mark;
-    JSStackFrame *oldfp, frame;
-    JSObject *obj, *tmp;
-    JSBool ok;
-
-    hook = cx->runtime->executeHook;
-    hookData = mark = NULL;
-    oldfp = cx->fp;
-    frame.callobj = frame.argsobj = NULL;
-    frame.script = script;
-    if (down) {
-        /* Propagate arg/var state for eval and the debugger API. */
-        frame.varobj = down->varobj;
-        frame.fun = down->fun;
-        frame.thisp = down->thisp;
-        frame.argc = down->argc;
-        frame.argv = down->argv;
-        frame.nvars = down->nvars;
-        frame.vars = down->vars;
-        frame.annotation = down->annotation;
-        frame.sharpArray = down->sharpArray;
-    } else {
-        obj = chain;
-        if (cx->options & JSOPTION_VAROBJFIX) {
-            while ((tmp = OBJ_GET_PARENT(cx, obj)) != NULL)
-                obj = tmp;
-        }
-        frame.varobj = obj;
-        frame.fun = NULL;
-        frame.thisp = chain;
-        frame.argc = 0;
-        frame.argv = NULL;
-        frame.nvars = script->numGlobalVars;
-        if (frame.nvars) {
-            frame.vars = js_AllocRawStack(cx, frame.nvars, &mark);
-            if (!frame.vars)
-                return JS_FALSE;
-            memset(frame.vars, 0, frame.nvars * sizeof(jsval));
-        } else {
-            frame.vars = NULL;
-        }
-        frame.annotation = NULL;
-        frame.sharpArray = NULL;
-    }
-    frame.rval = JSVAL_VOID;
-    frame.down = down;
-    frame.scopeChain = chain;
-    frame.pc = NULL;
-    frame.sp = oldfp ? oldfp->sp : NULL;
-    frame.spbase = NULL;
-    frame.sharpDepth = 0;
-    frame.flags = flags;
-    frame.dormantNext = NULL;
-    frame.xmlNamespace = NULL;
-
-    /*
-     * Here we wrap the call to js_Interpret with code to (conditionally)
-     * save and restore the old stack frame chain into a chain of 'dormant'
-     * frame chains.  Since we are replacing cx->fp, we were running into
-     * the problem that if GC was called under this frame, some of the GC
-     * things associated with the old frame chain (available here only in
-     * the C variable 'oldfp') were not rooted and were being collected.
-     *
-     * So, now we preserve the links to these 'dormant' frame chains in cx
-     * before calling js_Interpret and cleanup afterwards.  The GC walks
-     * these dormant chains and marks objects in the same way that it marks
-     * objects in the primary cx->fp chain.
-     */
-    if (oldfp && oldfp != down) {
-        JS_ASSERT(!oldfp->dormantNext);
-        oldfp->dormantNext = cx->dormantFrameChain;
-        cx->dormantFrameChain = oldfp;
-    }
-
-    cx->fp = &frame;
-    if (hook)
-        hookData = hook(cx, &frame, JS_TRUE, 0, cx->runtime->executeHookData);
-
-    /*
-     * Use frame.rval, not result, so the last result stays rooted across any
-     * GC activations nested within this js_Interpret.
-     */
-    ok = js_Interpret(cx, script->code, &frame.rval);
-    *result = frame.rval;
-
-    if (hookData) {
-        hook = cx->runtime->executeHook;
-        if (hook)
-            hook(cx, &frame, JS_FALSE, &ok, hookData);
-    }
-    if (mark)
-        js_FreeRawStack(cx, mark);
-    cx->fp = oldfp;
-
-    if (oldfp && oldfp != down) {
-        JS_ASSERT(cx->dormantFrameChain == oldfp);
-        cx->dormantFrameChain = oldfp->dormantNext;
-        oldfp->dormantNext = NULL;
-    }
-
-    return ok;
-}
-
-#if JS_HAS_EXPORT_IMPORT
-/*
- * If id is JSVAL_VOID, import all exported properties from obj.
- */
-static JSBool
-ImportProperty(JSContext *cx, JSObject *obj, jsid id)
-{
-    JSBool ok;
-    JSIdArray *ida;
-    JSProperty *prop;
-    JSObject *obj2, *target, *funobj, *closure;
-    JSString *str;
-    uintN attrs;
-    jsint i;
-    jsval value;
-
-    if (JSVAL_IS_VOID(id)) {
-        ida = JS_Enumerate(cx, obj);
-        if (!ida)
-            return JS_FALSE;
-        ok = JS_TRUE;
-        if (ida->length == 0)
-            goto out;
-    } else {
-        ida = NULL;
-        if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
-            return JS_FALSE;
-        if (!prop) {
-            str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK,
-                                             ID_TO_VALUE(id), NULL);
-            if (str)
-                js_ReportIsNotDefined(cx, JS_GetStringBytes(str));
-            return JS_FALSE;
-        }
-        ok = OBJ_GET_ATTRIBUTES(cx, obj, id, prop, &attrs);
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-        if (!ok)
-            return JS_FALSE;
-        if (!(attrs & JSPROP_EXPORTED)) {
-            str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK,
-                                             ID_TO_VALUE(id), NULL);
-            if (str) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_NOT_EXPORTED,
-                                     JS_GetStringBytes(str));
-            }
-            return JS_FALSE;
-        }
-    }
-
-    target = cx->fp->varobj;
-    i = 0;
-    do {
-        if (ida) {
-            id = ida->vector[i];
-            ok = OBJ_GET_ATTRIBUTES(cx, obj, id, NULL, &attrs);
-            if (!ok)
-                goto out;
-            if (!(attrs & JSPROP_EXPORTED))
-                continue;
-        }
-        ok = OBJ_CHECK_ACCESS(cx, obj, id, JSACC_IMPORT, &value, &attrs);
-        if (!ok)
-            goto out;
-        if (JSVAL_IS_FUNCTION(cx, value)) {
-            funobj = JSVAL_TO_OBJECT(value);
-            closure = js_CloneFunctionObject(cx, funobj, obj);
-            if (!closure) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            value = OBJECT_TO_JSVAL(closure);
-        }
-
-        /*
-         * Handle the case of importing a property that refers to a local
-         * variable or formal parameter of a function activation.  These
-         * properties are accessed by opcodes using stack slot numbers
-         * generated by the compiler rather than runtime name-lookup.  These
-         * local references, therefore, bypass the normal scope chain lookup.
-         * So, instead of defining a new property in the activation object,
-         * modify the existing value in the stack slot.
-         */
-        if (OBJ_GET_CLASS(cx, target) == &js_CallClass) {
-            ok = OBJ_LOOKUP_PROPERTY(cx, target, id, &obj2, &prop);
-            if (!ok)
-                goto out;
-        } else {
-            prop = NULL;
-        }
-        if (prop && target == obj2) {
-            ok = OBJ_SET_PROPERTY(cx, target, id, &value);
-        } else {
-            ok = OBJ_DEFINE_PROPERTY(cx, target, id, value, NULL, NULL,
-                                     attrs & ~JSPROP_EXPORTED,
-                                     NULL);
-        }
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-        if (!ok)
-            goto out;
-    } while (ida && ++i < ida->length);
-
-out:
-    if (ida)
-        JS_DestroyIdArray(cx, ida);
-    return ok;
-}
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-JSBool
-js_CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs,
-                      JSObject **objp, JSProperty **propp)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    uintN oldAttrs, report;
-    JSBool isFunction;
-    jsval value;
-    const char *type, *name;
-
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
-        return JS_FALSE;
-    if (propp) {
-        *objp = obj2;
-        *propp = prop;
-    }
-    if (!prop)
-        return JS_TRUE;
-
-    /* From here, return true, or goto bad on failure to drop prop. */
-    if (!OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &oldAttrs))
-        goto bad;
-
-    /* If either property is readonly, we have an error. */
-    report = ((oldAttrs | attrs) & JSPROP_READONLY)
-             ? JSREPORT_ERROR
-             : JSREPORT_WARNING | JSREPORT_STRICT;
-
-    if (report != JSREPORT_ERROR) {
-        /*
-         * Allow redeclaration of variables and functions, but insist that the
-         * new value is not a getter if the old value was, ditto for setters --
-         * unless prop is impermanent (in which case anyone could delete it and
-         * redefine it, willy-nilly).
-         */
-        if (!(attrs & (JSPROP_GETTER | JSPROP_SETTER)))
-            return JS_TRUE;
-        if ((~(oldAttrs ^ attrs) & (JSPROP_GETTER | JSPROP_SETTER)) == 0)
-            return JS_TRUE;
-        if (!(oldAttrs & JSPROP_PERMANENT))
-            return JS_TRUE;
-        report = JSREPORT_ERROR;
-    }
-
-    isFunction = (oldAttrs & (JSPROP_GETTER | JSPROP_SETTER)) != 0;
-    if (!isFunction) {
-        if (!OBJ_GET_PROPERTY(cx, obj, id, &value))
-            goto bad;
-        isFunction = JSVAL_IS_FUNCTION(cx, value);
-    }
-    type = (oldAttrs & attrs & JSPROP_GETTER)
-           ? js_getter_str
-           : (oldAttrs & attrs & JSPROP_SETTER)
-           ? js_setter_str
-           : (oldAttrs & JSPROP_READONLY)
-           ? js_const_str
-           : isFunction
-           ? js_function_str
-           : js_var_str;
-    name = js_AtomToPrintableString(cx, JSID_TO_ATOM(id));
-    if (!name)
-        goto bad;
-    return JS_ReportErrorFlagsAndNumber(cx, report,
-                                        js_GetErrorMessage, NULL,
-                                        JSMSG_REDECLARED_VAR,
-                                        type, name);
-
-bad:
-    if (propp) {
-        *objp = NULL;
-        *propp = NULL;
-    }
-    OBJ_DROP_PROPERTY(cx, obj2, prop);
-    return JS_FALSE;
-}
-
-JSBool
-js_StrictlyEqual(jsval lval, jsval rval)
-{
-    jsval ltag = JSVAL_TAG(lval), rtag = JSVAL_TAG(rval);
-    jsdouble ld, rd;
-
-    if (ltag == rtag) {
-        if (ltag == JSVAL_STRING) {
-            JSString *lstr = JSVAL_TO_STRING(lval),
-                     *rstr = JSVAL_TO_STRING(rval);
-            return js_CompareStrings(lstr, rstr) == 0;
-        }
-        if (ltag == JSVAL_DOUBLE) {
-            ld = *JSVAL_TO_DOUBLE(lval);
-            rd = *JSVAL_TO_DOUBLE(rval);
-            return JSDOUBLE_COMPARE(ld, ==, rd, JS_FALSE);
-        }
-        return lval == rval;
-    }
-    if (ltag == JSVAL_DOUBLE && JSVAL_IS_INT(rval)) {
-        ld = *JSVAL_TO_DOUBLE(lval);
-        rd = JSVAL_TO_INT(rval);
-        return JSDOUBLE_COMPARE(ld, ==, rd, JS_FALSE);
-    }
-    if (JSVAL_IS_INT(lval) && rtag == JSVAL_DOUBLE) {
-        ld = JSVAL_TO_INT(lval);
-        rd = *JSVAL_TO_DOUBLE(rval);
-        return JSDOUBLE_COMPARE(ld, ==, rd, JS_FALSE);
-    }
-    return lval == rval;
-}
-
-static JSBool
-InternStringElementId(JSContext *cx, jsval idval, jsid *idp)
-{
-    JSAtom *atom;
-
-    atom = js_ValueToStringAtom(cx, idval);
-    if (!atom)
-        return JS_FALSE;
-    *idp = ATOM_TO_JSID(atom);
-    return JS_TRUE;
-}
-
-static JSBool
-InternNonIntElementId(JSContext *cx, jsval idval, jsid *idp)
-{
-    JS_ASSERT(!JSVAL_IS_INT(idval));
-
-#if JS_HAS_XML_SUPPORT
-    if (JSVAL_IS_OBJECT(idval)) {
-        *idp = OBJECT_JSVAL_TO_JSID(idval);
-        return JS_TRUE;
-    }
-#endif
-
-    return InternStringElementId(cx, idval, idp);
-}
-
-#if JS_HAS_XML_SUPPORT
-#define CHECK_ELEMENT_ID(obj, id)                                             \
-    JS_BEGIN_MACRO                                                            \
-        if (JSID_IS_OBJECT(id) && !OBJECT_IS_XML(cx, obj)) {                  \
-            SAVE_SP(fp);                                                      \
-            ok = InternStringElementId(cx, OBJECT_JSID_TO_JSVAL(id), &id);    \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-#else
-#define CHECK_ELEMENT_ID(obj, id)       JS_ASSERT(!JSID_IS_OBJECT(id))
-#endif
-
-#ifndef MAX_INTERP_LEVEL
-#if defined(XP_OS2)
-#define MAX_INTERP_LEVEL 250
-#else
-#define MAX_INTERP_LEVEL 1000
-#endif
-#endif
-
-#define MAX_INLINE_CALL_COUNT 1000
-
-JSBool
-js_Interpret(JSContext *cx, jsbytecode *pc, jsval *result)
-{
-    JSRuntime *rt;
-    JSStackFrame *fp;
-    JSScript *script;
-    uintN inlineCallCount;
-    JSObject *obj, *obj2, *proto, *parent;
-    JSVersion currentVersion, originalVersion;
-    JSBranchCallback onbranch;
-    JSBool ok, cond;
-    JSTrapHandler interruptHandler;
-    jsint depth, len;
-    jsval *sp, *newsp;
-    void *mark;
-    jsbytecode *endpc, *pc2;
-    JSOp op, op2;
-#ifdef OSSP /* CLEANUP */
-    const JSCodeSpec *cs = NULL;
-#else
-    const JSCodeSpec *cs;
-#endif
-    jsatomid atomIndex;
-    JSAtom *atom;
-    uintN argc, slot, attrs;
-    jsval *vp, lval, rval, ltmp, rtmp;
-#ifdef OSSP /* CLEANUP */
-    jsid id = -1L;
-#else
-    jsid id;
-#endif
-    JSObject *withobj, *origobj, *propobj;
-    jsval iter_state;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSString *str, *str2;
-    jsint i, j;
-    jsdouble d, d2;
-    JSClass *clasp, *funclasp;
-    JSFunction *fun;
-    JSType type;
-#ifdef DEBUG
-#ifdef OSSP /* CLEANUP */
-    FILE *tracefp = NULL;
-#else
-    FILE *tracefp;
-#endif
-#endif
-#if JS_HAS_EXPORT_IMPORT
-    JSIdArray *ida;
-#endif
-#if JS_HAS_SWITCH_STATEMENT
-    jsint low, high, off, npairs;
-    JSBool match;
-#endif
-#if JS_HAS_GETTER_SETTER
-    JSPropertyOp getter, setter;
-#endif
-#if JS_HAS_XML_SUPPORT
-    JSBool foreach = JS_FALSE;
-#endif
-    int stackDummy;
-
-    *result = JSVAL_VOID;
-    rt = cx->runtime;
-
-    /* Set registerized frame pointer and derived script pointer. */
-    fp = cx->fp;
-    script = fp->script;
-
-    /* Count of JS function calls that nest in this C js_Interpret frame. */
-    inlineCallCount = 0;
-
-    /*
-     * Optimized Get and SetVersion for proper script language versioning.
-     *
-     * If any native method or JSClass/JSObjectOps hook calls js_SetVersion
-     * and changes cx->version, the effect will "stick" and we will stop
-     * maintaining currentVersion.  This is relied upon by testsuites, for
-     * the most part -- web browsers select version before compiling and not
-     * at run-time.
-     */
-    currentVersion = script->version;
-    originalVersion = cx->version;
-    if (currentVersion != originalVersion)
-        js_SetVersion(cx, currentVersion);
-
-    /*
-     * Prepare to call a user-supplied branch handler, and abort the script
-     * if it returns false.  We reload onbranch after calling out to native
-     * functions (but not to getters, setters, or other native hooks).
-     */
-#define LOAD_BRANCH_CALLBACK(cx)    (onbranch = (cx)->branchCallback)
-
-    LOAD_BRANCH_CALLBACK(cx);
-    ok = JS_TRUE;
-#define CHECK_BRANCH(len)                                                     \
-    JS_BEGIN_MACRO                                                            \
-        if (len <= 0 && onbranch) {                                           \
-            SAVE_SP(fp);                                                      \
-            if (!(ok = (*onbranch)(cx, script)))                              \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-    /*
-     * Load the debugger's interrupt hook here and after calling out to native
-     * functions (but not to getters, setters, or other native hooks), so we do
-     * not have to reload it each time through the interpreter loop -- we hope
-     * the compiler can keep it in a register.
-     * XXX if it spills, we still lose
-     */
-#define LOAD_INTERRUPT_HANDLER(rt)  (interruptHandler = (rt)->interruptHandler)
-
-    LOAD_INTERRUPT_HANDLER(rt);
-
-    /* Check for too much js_Interpret nesting, or too deep a C stack. */
-    if (++cx->interpLevel == MAX_INTERP_LEVEL ||
-        !JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        ok = JS_FALSE;
-        goto out2;
-    }
-
-    /*
-     * Allocate operand and pc stack slots for the script's worst-case depth,
-     * unless we're called to interpret a part of an already active script, a
-     * filtering predicate expression for example.
-     */
-    depth = (jsint) script->depth;
-    if (JS_LIKELY(!fp->spbase)) {
-        newsp = js_AllocRawStack(cx, (uintN)(2 * depth), &mark);
-        if (!newsp) {
-            ok = JS_FALSE;
-            goto out2;
-        }
-        sp = newsp + depth;
-        fp->spbase = sp;
-        SAVE_SP(fp);
-    } else {
-        sp = fp->sp;
-        JS_ASSERT(JS_UPTRDIFF(sp, fp->spbase) <= depth * sizeof(jsval));
-        newsp = fp->spbase - depth;
-        mark = NULL;
-    }
-
-    endpc = script->code + script->length;
-    while (pc < endpc) {
-        fp->pc = pc;
-        op = (JSOp) *pc;
-      do_op:
-        cs = &js_CodeSpec[op];
-        len = cs->length;
-
-#ifdef DEBUG
-        tracefp = (FILE *) cx->tracefp;
-        if (tracefp) {
-            intN nuses, n;
-
-            fprintf(tracefp, "%4u: ", js_PCToLineNumber(cx, script, pc));
-            js_Disassemble1(cx, script, pc,
-                            PTRDIFF(pc, script->code, jsbytecode), JS_FALSE,
-                            tracefp);
-            nuses = cs->nuses;
-            if (nuses) {
-                SAVE_SP(fp);
-                for (n = -nuses; n < 0; n++) {
-                    str = js_DecompileValueGenerator(cx, n, sp[n], NULL);
-                    if (str) {
-                        fprintf(tracefp, "%s %s",
-                                (n == -nuses) ? "  inputs:" : ",",
-                                JS_GetStringBytes(str));
-                    }
-                }
-                fprintf(tracefp, " @ %d\n", sp - fp->spbase);
-            }
-        }
-#endif
-
-        if (interruptHandler) {
-            SAVE_SP(fp);
-            switch (interruptHandler(cx, script, pc, &rval,
-                                     rt->interruptHandlerData)) {
-              case JSTRAP_ERROR:
-                ok = JS_FALSE;
-                goto out;
-              case JSTRAP_CONTINUE:
-                break;
-              case JSTRAP_RETURN:
-                fp->rval = rval;
-                goto out;
-#if JS_HAS_EXCEPTIONS
-              case JSTRAP_THROW:
-                cx->throwing = JS_TRUE;
-                cx->exception = rval;
-                ok = JS_FALSE;
-                goto out;
-#endif /* JS_HAS_EXCEPTIONS */
-              default:;
-            }
-            LOAD_INTERRUPT_HANDLER(rt);
-        }
-
-        switch (op) {
-          case JSOP_NOP:
-            break;
-
-          case JSOP_GROUP:
-            break;
-
-          case JSOP_PUSH:
-            PUSH_OPND(JSVAL_VOID);
-            break;
-
-          case JSOP_POP:
-            sp--;
-            break;
-
-          case JSOP_POP2:
-            sp -= 2;
-            break;
-
-          case JSOP_SWAP:
-            /*
-             * N.B. JSOP_SWAP doesn't swap the corresponding generating pcs
-             * for the operands it swaps.
-             */
-            ltmp = sp[-1];
-            sp[-1] = sp[-2];
-            sp[-2] = ltmp;
-            break;
-
-          case JSOP_POPV:
-            *result = POP_OPND();
-            break;
-
-          case JSOP_ENTERWITH:
-            FETCH_OBJECT(cx, -1, rval, obj);
-            SAVE_SP(fp);
-            withobj = js_NewObject(cx, &js_WithClass, obj, fp->scopeChain);
-            if (!withobj)
-                goto out;
-            rval = INT_TO_JSVAL(sp - fp->spbase);
-            OBJ_SET_SLOT(cx, withobj, JSSLOT_PRIVATE, rval);
-            fp->scopeChain = withobj;
-            STORE_OPND(-1, OBJECT_TO_JSVAL(withobj));
-            break;
-
-          case JSOP_LEAVEWITH:
-            rval = POP_OPND();
-            JS_ASSERT(JSVAL_IS_OBJECT(rval));
-            withobj = JSVAL_TO_OBJECT(rval);
-            JS_ASSERT(OBJ_GET_CLASS(cx, withobj) == &js_WithClass);
-
-            rval = OBJ_GET_SLOT(cx, withobj, JSSLOT_PARENT);
-            JS_ASSERT(JSVAL_IS_OBJECT(rval));
-            fp->scopeChain = JSVAL_TO_OBJECT(rval);
-            break;
-
-          case JSOP_SETRVAL:
-            fp->rval = POP_OPND();
-            break;
-
-          case JSOP_RETURN:
-            CHECK_BRANCH(-1);
-            fp->rval = POP_OPND();
-            /* FALL THROUGH */
-
-          case JSOP_RETRVAL:    /* fp->rval already set */
-            if (inlineCallCount)
-          inline_return:
-            {
-                JSInlineFrame *ifp = (JSInlineFrame *) fp;
-                void *hookData = ifp->hookData;
-
-                if (hookData) {
-                    JSInterpreterHook hook = cx->runtime->callHook;
-                    if (hook) {
-                        hook(cx, fp, JS_FALSE, &ok, hookData);
-                        LOAD_INTERRUPT_HANDLER(rt);
-                    }
-                }
-#if JS_HAS_ARGS_OBJECT
-                if (fp->argsobj)
-                    ok &= js_PutArgsObject(cx, fp);
-#endif
-
-                /* Restore context version only if callee hasn't set version. */
-                if (cx->version == currentVersion) {
-                    currentVersion = ifp->callerVersion;
-                    if (currentVersion != cx->version)
-                        js_SetVersion(cx, currentVersion);
-                }
-
-                /* Store the return value in the caller's operand frame. */
-                vp = fp->argv - 2;
-                *vp = fp->rval;
-
-                /* Restore cx->fp and release the inline frame's space. */
-                cx->fp = fp = fp->down;
-                JS_ARENA_RELEASE(&cx->stackPool, ifp->mark);
-
-                /* Restore sp to point just above the return value. */
-                fp->sp = vp + 1;
-                RESTORE_SP(fp);
-
-                /* Restore the calling script's interpreter registers. */
-                script = fp->script;
-                depth = (jsint) script->depth;
-                pc = fp->pc;
-                endpc = script->code + script->length;
-
-                /* Store the generating pc for the return value. */
-                vp[-depth] = (jsval)pc;
-
-                /* Set remaining variables for 'goto advance_pc'. */
-                op = (JSOp) *pc;
-                cs = &js_CodeSpec[op];
-                len = cs->length;
-
-                /* Resume execution in the calling frame. */
-                inlineCallCount--;
-                if (ok)
-                    goto advance_pc;
-            }
-            goto out;
-
-#if JS_HAS_SWITCH_STATEMENT
-          case JSOP_DEFAULT:
-            (void) POP();
-            /* FALL THROUGH */
-#endif
-          case JSOP_GOTO:
-            len = GET_JUMP_OFFSET(pc);
-            CHECK_BRANCH(len);
-            break;
-
-          case JSOP_IFEQ:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_FALSE) {
-                len = GET_JUMP_OFFSET(pc);
-                CHECK_BRANCH(len);
-            }
-            break;
-
-          case JSOP_IFNE:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond != JS_FALSE) {
-                len = GET_JUMP_OFFSET(pc);
-                CHECK_BRANCH(len);
-            }
-            break;
-
-          case JSOP_OR:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_TRUE) {
-                len = GET_JUMP_OFFSET(pc);
-                PUSH_OPND(rval);
-            }
-            break;
-
-          case JSOP_AND:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_FALSE) {
-                len = GET_JUMP_OFFSET(pc);
-                PUSH_OPND(rval);
-            }
-            break;
-
-
-#if JS_HAS_SWITCH_STATEMENT
-          case JSOP_DEFAULTX:
-            (void) POP();
-            /* FALL THROUGH */
-#endif
-          case JSOP_GOTOX:
-            len = GET_JUMPX_OFFSET(pc);
-            CHECK_BRANCH(len);
-            break;
-
-          case JSOP_IFEQX:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_FALSE) {
-                len = GET_JUMPX_OFFSET(pc);
-                CHECK_BRANCH(len);
-            }
-            break;
-
-          case JSOP_IFNEX:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond != JS_FALSE) {
-                len = GET_JUMPX_OFFSET(pc);
-                CHECK_BRANCH(len);
-            }
-            break;
-
-          case JSOP_ORX:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_TRUE) {
-                len = GET_JUMPX_OFFSET(pc);
-                PUSH_OPND(rval);
-            }
-            break;
-
-          case JSOP_ANDX:
-            POP_BOOLEAN(cx, rval, cond);
-            if (cond == JS_FALSE) {
-                len = GET_JUMPX_OFFSET(pc);
-                PUSH_OPND(rval);
-            }
-            break;
-
-          case JSOP_TOOBJECT:
-            rval = FETCH_OPND(-1);
-            if (!JSVAL_IS_PRIMITIVE(rval)) {
-                obj = JSVAL_TO_OBJECT(rval);
-            } else {
-                SAVE_SP(fp);
-                ok = js_ValueToObject(cx, rval, &obj);
-                if (!ok)
-                    goto out;
-            }
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-            break;
-
-/*
- * If the index value at sp[n] is not an int that fits in a jsval, it could
- * be an object (an XML QName, AttributeName, or AnyName), but only if we are
- * compiling with JS_HAS_XML_SUPPORT.  Otherwise convert the index value to a
- * string atom id.
- */
-#define FETCH_ELEMENT_ID(n, id)                                               \
-    JS_BEGIN_MACRO                                                            \
-        jsval idval_ = FETCH_OPND(n);                                         \
-        if (JSVAL_IS_INT(idval_)) {                                           \
-            id = INT_JSVAL_TO_JSID(idval_);                                   \
-        } else {                                                              \
-            SAVE_SP(fp);                                                      \
-            ok = InternNonIntElementId(cx, idval_, &id);                      \
-            if (!ok)                                                          \
-                goto out;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-#if JS_HAS_IN_OPERATOR
-          case JSOP_IN:
-            SAVE_SP(fp);
-            rval = FETCH_OPND(-1);
-            if (JSVAL_IS_PRIMITIVE(rval)) {
-                str = js_DecompileValueGenerator(cx, -1, rval, NULL);
-                if (str) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_IN_NOT_OBJECT,
-                                         JS_GetStringBytes(str));
-                }
-                ok = JS_FALSE;
-                goto out;
-            }
-            obj = JSVAL_TO_OBJECT(rval);
-            FETCH_ELEMENT_ID(-2, id);
-            CHECK_ELEMENT_ID(obj, id);
-            ok = OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop);
-            if (!ok)
-                goto out;
-            sp--;
-            STORE_OPND(-1, BOOLEAN_TO_JSVAL(prop != NULL));
-            if (prop)
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-            break;
-#endif /* JS_HAS_IN_OPERATOR */
-
-          case JSOP_FORPROP:
-            /*
-             * Handle JSOP_FORPROP first, so the cost of the goto do_forinloop
-             * is not paid for the more common cases.
-             */
-            lval = FETCH_OPND(-1);
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            i = -2;
-            goto do_forinloop;
-
-          case JSOP_FORNAME:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-
-            /*
-             * ECMA 12.6.3 says to eval the LHS after looking for properties
-             * to enumerate, and bail without LHS eval if there are no props.
-             * We do Find here to share the most code at label do_forinloop.
-             * If looking for enumerable properties could have side effects,
-             * then we'd have to move this into the common code and condition
-             * it on op == JSOP_FORNAME.
-             */
-            SAVE_SP(fp);
-            ok = js_FindProperty(cx, id, &obj, &obj2, &prop);
-            if (!ok)
-                goto out;
-            if (prop)
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-            lval = OBJECT_TO_JSVAL(obj);
-            /* FALL THROUGH */
-
-          case JSOP_FORARG:
-          case JSOP_FORVAR:
-            /*
-             * JSOP_FORARG and JSOP_FORVAR don't require any lval computation
-             * here, because they address slots on the stack (in fp->args and
-             * fp->vars, respectively).
-             */
-            /* FALL THROUGH */
-
-          case JSOP_FORELEM:
-            /*
-             * JSOP_FORELEM simply initializes or updates the iteration state
-             * and leaves the index expression evaluation and assignment to the
-             * enumerator until after the next property has been acquired, via
-             * a JSOP_ENUMELEM bytecode.
-             */
-            i = -1;
-
-          do_forinloop:
-            /*
-             * ECMA-compatible for/in evals the object just once, before loop.
-             * Bad old bytecodes (since removed) did it on every iteration.
-             */
-            obj = JSVAL_TO_OBJECT(sp[i]);
-
-            /* If the thing to the right of 'in' has no properties, break. */
-            if (!obj) {
-                rval = JSVAL_FALSE;
-                goto end_forinloop;
-            }
-
-            /*
-             * Save the thing to the right of 'in' as origobj.  Later on, we
-             * use this variable to suppress enumeration of shadowed prototype
-             * properties.
-             */
-            origobj = obj;
-
-            /*
-             * Reach under the top of stack to find our property iterator, a
-             * JSObject that contains the iteration state.  (An object is used
-             * rather than a native struct so that the iteration state is
-             * cleaned up via GC if the for-in loop terminates abruptly.)
-             */
-            vp = &sp[i - 1];
-            rval = *vp;
-
-            /*
-             * Save sp in fp now, before any OBJ_* call-outs that might nest
-             * an interpreter or GC activation on this context.
-             */
-            SAVE_SP(fp);
-
-            /* Is this the first iteration ? */
-            if (JSVAL_IS_VOID(rval)) {
-                /* Yes, create a new JSObject to hold the iterator state */
-                propobj = js_NewObject(cx, &prop_iterator_class, NULL, obj);
-                if (!propobj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-                propobj->slots[JSSLOT_ITER_STATE] = JSVAL_NULL;
-
-                /*
-                 * Root the parent slot so we can get it even in our finalizer
-                 * (otherwise, it would live as long as we do, but it might be
-                 * finalized first).
-                 */
-                ok = js_AddRoot(cx, &propobj->slots[JSSLOT_PARENT],
-                                "propobj->parent");
-                if (!ok)
-                    goto out;
-
-                /*
-                 * Rewrite the iterator so we know to do the next case.
-                 * Do this before calling the enumerator, which could
-                 * displace cx->newborn and cause GC.
-                 */
-                *vp = OBJECT_TO_JSVAL(propobj);
-
-                ok =
-#if JS_HAS_XML_SUPPORT
-                     (foreach && OBJECT_IS_XML(cx, obj))
-                     ? ((JSXMLObjectOps *) obj->map->ops)->enumerateValues
-                                    (cx, obj, JSENUMERATE_INIT, &iter_state,
-                                     NULL, NULL)
-                     :
-#endif
-                       OBJ_ENUMERATE(cx, obj, JSENUMERATE_INIT, &iter_state,
-                                     NULL);
-                if (!ok)
-                    goto out;
-
-                /*
-                 * Stash private iteration state into property iterator object.
-                 * NB: This code knows that the first slots are pre-allocated.
-                 */
-#if JS_INITIAL_NSLOTS < 5
-#error JS_INITIAL_NSLOTS must be greater than or equal to 5.
-#endif
-                propobj->slots[JSSLOT_ITER_STATE] = iter_state;
-            } else {
-                /* This is not the first iteration. Recover iterator state. */
-                propobj = JSVAL_TO_OBJECT(rval);
-                JS_ASSERT(OBJ_GET_CLASS(cx, propobj) == &prop_iterator_class);
-                obj = JSVAL_TO_OBJECT(propobj->slots[JSSLOT_PARENT]);
-                iter_state = propobj->slots[JSSLOT_ITER_STATE];
-            }
-
-          enum_next_property:
-          {
-            jsid fid;
-
-            /* Get the next jsid to be enumerated and store it in fid. */
-            ok =
-#if JS_HAS_XML_SUPPORT
-                 (foreach && OBJECT_IS_XML(cx, obj))
-                 ? ((JSXMLObjectOps *) obj->map->ops)->enumerateValues
-                                (cx, obj, JSENUMERATE_NEXT, &iter_state,
-                                 &fid, &rval)
-                 :
-#endif
-                   OBJ_ENUMERATE(cx, obj, JSENUMERATE_NEXT, &iter_state, &fid);
-            propobj->slots[JSSLOT_ITER_STATE] = iter_state;
-
-            /* No more jsids to iterate in obj? */
-            if (iter_state == JSVAL_NULL) {
-                /* Enumerate the properties on obj's prototype chain. */
-                obj = OBJ_GET_PROTO(cx, obj);
-                if (!obj) {
-                    /* End of property list -- terminate loop. */
-                    rval = JSVAL_FALSE;
-#if JS_HAS_XML_SUPPORT
-                    foreach = JS_FALSE;
-#endif
-                    goto end_forinloop;
-                }
-
-                ok =
-#if JS_HAS_XML_SUPPORT
-                     (foreach && OBJECT_IS_XML(cx, obj))
-                     ? ((JSXMLObjectOps *) obj->map->ops)->enumerateValues
-                                    (cx, obj, JSENUMERATE_INIT, &iter_state,
-                                     NULL, NULL)
-                     :
-#endif
-                       OBJ_ENUMERATE(cx, obj, JSENUMERATE_INIT, &iter_state,
-                                     NULL);
-
-                /*
-                 * Stash private iteration state into property iterator object.
-                 * We do this before checking 'ok' to ensure that propobj is
-                 * in a valid state even if OBJ_ENUMERATE returned JS_FALSE.
-                 * NB: This code knows that the first slots are pre-allocated.
-                 */
-                propobj->slots[JSSLOT_ITER_STATE] = iter_state;
-                if (!ok)
-                    goto out;
-
-                /*
-                 * Update the iterator JSObject's parent link to refer to the
-                 * current object. This is used in the iterator JSObject's
-                 * finalizer.
-                 */
-                propobj->slots[JSSLOT_PARENT] = OBJECT_TO_JSVAL(obj);
-                goto enum_next_property;
-            }
-
-            /* Skip properties not owned by obj when looking from origobj. */
-            ok = OBJ_LOOKUP_PROPERTY(cx, origobj, fid, &obj2, &prop);
-            if (!ok)
-                goto out;
-            if (prop)
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-
-            /*
-             * If the id was deleted, or found in a prototype or an unrelated
-             * object (specifically, not in an inner object for obj), skip it.
-             * This means that OBJ_LOOKUP_PROPERTY implementations must return
-             * an object either further on the prototype chain, or related by
-             * the JSExtendedClass.outerObject optional hook.
-             */
-            if (!prop)
-                goto enum_next_property;
-            if (obj != obj2) {
-                cond = JS_FALSE;
-                clasp = OBJ_GET_CLASS(cx, obj2);
-                if (clasp->flags & JSCLASS_IS_EXTENDED) {
-                    JSExtendedClass *xclasp;
-
-                    xclasp = (JSExtendedClass *) clasp;
-                    cond = xclasp->outerObject &&
-                           xclasp->outerObject(cx, obj2) == obj;
-                }
-                if (!cond)
-                    goto enum_next_property;
-            }
-
-#if JS_HAS_XML_SUPPORT
-            if (foreach) {
-                /* Clear the local foreach flag set by our prefix bytecode. */
-                foreach = JS_FALSE;
-
-                /* If obj is not XML, we must get rval given its fid. */
-                if (!OBJECT_IS_XML(cx, obj)) {
-                    ok = OBJ_GET_PROPERTY(cx, origobj, fid, &rval);
-                    if (!ok)
-                        goto out;
-                }
-            } else
-#endif
-            {
-                /* Make rval a string for uniformity and compatibility. */
-                if (JSID_IS_ATOM(fid)) {
-                    rval = ATOM_KEY(JSID_TO_ATOM(fid));
-                }
-#if JS_HAS_XML_SUPPORT
-                else if (JSID_IS_OBJECT(fid)) {
-                    str = js_ValueToString(cx, OBJECT_JSID_TO_JSVAL(fid));
-                    if (!str) {
-                        ok = JS_FALSE;
-                        goto out;
-                    }
-
-                    rval = STRING_TO_JSVAL(str);
-                }
-#endif
-                else if (!JS_VERSION_IS_1_2(cx)) {
-                    str = js_NumberToString(cx, (jsdouble) JSID_TO_INT(fid));
-                    if (!str) {
-                        ok = JS_FALSE;
-                        goto out;
-                    }
-
-                    rval = STRING_TO_JSVAL(str);
-                } else {
-                    rval = INT_JSID_TO_JSVAL(fid);
-                }
-            }
-
-            switch (op) {
-              case JSOP_FORARG:
-                slot = GET_ARGNO(pc);
-                JS_ASSERT(slot < fp->fun->nargs);
-                fp->argv[slot] = rval;
-                break;
-
-              case JSOP_FORVAR:
-                slot = GET_VARNO(pc);
-                JS_ASSERT(slot < fp->fun->nvars);
-                fp->vars[slot] = rval;
-                break;
-
-              case JSOP_FORELEM:
-                /* FORELEM is not a SET operation, it's more like BINDNAME. */
-                PUSH_OPND(rval);
-                break;
-
-              default:
-                /* Convert lval to a non-null object containing id. */
-                VALUE_TO_OBJECT(cx, lval, obj);
-                if (i + 1 < 0)
-                    STORE_OPND(i + 1, OBJECT_TO_JSVAL(obj));
-
-                /* Set the variable obj[id] to refer to rval. */
-                fp->flags |= JSFRAME_ASSIGNING;
-                ok = OBJ_SET_PROPERTY(cx, obj, id, &rval);
-                fp->flags &= ~JSFRAME_ASSIGNING;
-                if (!ok)
-                    goto out;
-                break;
-            }
-
-            /* Push true to keep looping through properties. */
-            rval = JSVAL_TRUE;
-
-          end_forinloop:
-            sp += i + 1;
-            PUSH_OPND(rval);
-            break;
-          }
-
-          case JSOP_DUP:
-            JS_ASSERT(sp > fp->spbase);
-            rval = sp[-1];
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_DUP2:
-            JS_ASSERT(sp - 1 > fp->spbase);
-            lval = FETCH_OPND(-2);
-            rval = FETCH_OPND(-1);
-            PUSH_OPND(lval);
-            PUSH_OPND(rval);
-            break;
-
-#define PROPERTY_OP(n, call)                                                  \
-    JS_BEGIN_MACRO                                                            \
-        /* Fetch the left part and resolve it to a non-null object. */        \
-        FETCH_OBJECT(cx, n, lval, obj);                                       \
-                                                                              \
-        /* Get or set the property, set ok false if error, true if success. */\
-        SAVE_SP(fp);                                                          \
-        call;                                                                 \
-        if (!ok)                                                              \
-            goto out;                                                         \
-    JS_END_MACRO
-
-#define ELEMENT_OP(n, call)                                                   \
-    JS_BEGIN_MACRO                                                            \
-        /* Fetch the right part and resolve it to an internal id. */          \
-        FETCH_ELEMENT_ID(n, id);                                              \
-                                                                              \
-        /* Fetch the left part and resolve it to a non-null object. */        \
-        FETCH_OBJECT(cx, n - 1, lval, obj);                                   \
-                                                                              \
-        /* Ensure that id has a type suitable for use with obj. */            \
-        CHECK_ELEMENT_ID(obj, id);                                            \
-                                                                              \
-        /* Get or set the element, set ok false if error, true if success. */ \
-        SAVE_SP(fp);                                                          \
-        call;                                                                 \
-        if (!ok)                                                              \
-            goto out;                                                         \
-    JS_END_MACRO
-
-/*
- * Direct callers, i.e. those who do not wrap CACHED_GET and CACHED_SET calls
- * in PROPERTY_OP or ELEMENT_OP macro calls must SAVE_SP(fp); beforehand, just
- * in case a getter or setter function is invoked.  CACHED_GET and CACHED_SET
- * use cx, obj, id, and rval from their caller's lexical environment.
- */
-#define CACHED_GET(call)        CACHED_GET_VP(call, &rval)
-
-#define CACHED_GET_VP(call,vp)                                                \
-    JS_BEGIN_MACRO                                                            \
-        if (!OBJ_IS_NATIVE(obj)) {                                            \
-            ok = call;                                                        \
-        } else {                                                              \
-            JS_LOCK_OBJ(cx, obj);                                             \
-            PROPERTY_CACHE_TEST(&rt->propertyCache, obj, id, sprop);          \
-            if (sprop) {                                                      \
-                JSScope *scope_ = OBJ_SCOPE(obj);                             \
-                slot = (uintN)sprop->slot;                                    \
-                *(vp) = (slot != SPROP_INVALID_SLOT)                          \
-                        ? LOCKED_OBJ_GET_SLOT(obj, slot)                      \
-                        : JSVAL_VOID;                                         \
-                JS_UNLOCK_SCOPE(cx, scope_);                                  \
-                ok = SPROP_GET(cx, sprop, obj, obj, vp);                      \
-                JS_LOCK_SCOPE(cx, scope_);                                    \
-                if (ok && SPROP_HAS_VALID_SLOT(sprop, scope_))                \
-                    LOCKED_OBJ_SET_SLOT(obj, slot, *(vp));                    \
-                JS_UNLOCK_SCOPE(cx, scope_);                                  \
-            } else {                                                          \
-                JS_UNLOCK_OBJ(cx, obj);                                       \
-                ok = call;                                                    \
-                /* No fill here: js_GetProperty fills the cache. */           \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-#define CACHED_SET(call)                                                      \
-    JS_BEGIN_MACRO                                                            \
-        if (!OBJ_IS_NATIVE(obj)) {                                            \
-            ok = call;                                                        \
-        } else {                                                              \
-            JSScope *scope_;                                                  \
-            JS_LOCK_OBJ(cx, obj);                                             \
-            PROPERTY_CACHE_TEST(&rt->propertyCache, obj, id, sprop);          \
-            if (sprop &&                                                      \
-                !(sprop->attrs & JSPROP_READONLY) &&                          \
-                (scope_ = OBJ_SCOPE(obj), !SCOPE_IS_SEALED(scope_))) {        \
-                JS_UNLOCK_SCOPE(cx, scope_);                                  \
-                ok = SPROP_SET(cx, sprop, obj, obj, &rval);                   \
-                JS_LOCK_SCOPE(cx, scope_);                                    \
-                if (ok && SPROP_HAS_VALID_SLOT(sprop, scope_)) {              \
-                    LOCKED_OBJ_SET_SLOT(obj, sprop->slot, rval);              \
-                    GC_POKE(cx, JSVAL_NULL);  /* XXX second arg ignored */    \
-                }                                                             \
-                JS_UNLOCK_SCOPE(cx, scope_);                                  \
-            } else {                                                          \
-                JS_UNLOCK_OBJ(cx, obj);                                       \
-                ok = call;                                                    \
-                /* No fill here: js_SetProperty writes through the cache. */  \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-#define BEGIN_LITOPX_CASE(OP,PCOFF)                                           \
-          case OP:                                                            \
-            atomIndex = GET_ATOM_INDEX(pc + PCOFF);                           \
-          do_##OP:                                                            \
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-
-#define END_LITOPX_CASE                                                       \
-            break;                                                            \
-
-          BEGIN_LITOPX_CASE(JSOP_SETCONST, 0)
-            obj = fp->varobj;
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), rval,
-                                     NULL, NULL,
-                                     JSPROP_ENUMERATE | JSPROP_PERMANENT |
-                                     JSPROP_READONLY,
-                                     NULL);
-            if (!ok)
-                goto out;
-            STORE_OPND(-1, rval);
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_BINDNAME, 0)
-            SAVE_SP(fp);
-            obj = js_FindIdentifierBase(cx, ATOM_TO_JSID(atom));
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-          END_LITOPX_CASE
-
-          case JSOP_SETNAME:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            rval = FETCH_OPND(-1);
-            lval = FETCH_OPND(-2);
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(lval));
-            obj  = JSVAL_TO_OBJECT(lval);
-            SAVE_SP(fp);
-            CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
-            if (!ok)
-                goto out;
-            sp--;
-            STORE_OPND(-1, rval);
-            obj = NULL;
-            break;
-
-#define INTEGER_OP(OP, EXTRA_CODE)                                            \
-    JS_BEGIN_MACRO                                                            \
-        FETCH_INT(cx, -1, j);                                                 \
-        FETCH_INT(cx, -2, i);                                                 \
-        if (!ok)                                                              \
-            goto out;                                                         \
-        EXTRA_CODE                                                            \
-        d = i OP j;                                                           \
-        sp--;                                                                 \
-        STORE_NUMBER(cx, -1, d);                                              \
-    JS_END_MACRO
-
-#define BITWISE_OP(OP)          INTEGER_OP(OP, (void) 0;)
-#define SIGNED_SHIFT_OP(OP)     INTEGER_OP(OP, j &= 31;)
-
-          case JSOP_BITOR:
-            BITWISE_OP(|);
-            break;
-
-          case JSOP_BITXOR:
-            BITWISE_OP(^);
-            break;
-
-          case JSOP_BITAND:
-            BITWISE_OP(&);
-            break;
-
-#define RELATIONAL_OP(OP)                                                     \
-    JS_BEGIN_MACRO                                                            \
-        rval = FETCH_OPND(-1);                                                \
-        lval = FETCH_OPND(-2);                                                \
-        /* Optimize for two int-tagged operands (typical loop control). */    \
-        if ((lval & rval) & JSVAL_INT) {                                      \
-            ltmp = lval ^ JSVAL_VOID;                                         \
-            rtmp = rval ^ JSVAL_VOID;                                         \
-            if (ltmp && rtmp) {                                               \
-                cond = JSVAL_TO_INT(lval) OP JSVAL_TO_INT(rval);              \
-            } else {                                                          \
-                d  = ltmp ? JSVAL_TO_INT(lval) : *rt->jsNaN;                  \
-                d2 = rtmp ? JSVAL_TO_INT(rval) : *rt->jsNaN;                  \
-                cond = JSDOUBLE_COMPARE(d, OP, d2, JS_FALSE);                 \
-            }                                                                 \
-        } else {                                                              \
-            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_NUMBER, &lval);               \
-            sp[-2] = lval;                                                    \
-            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_NUMBER, &rval);               \
-            if (JSVAL_IS_STRING(lval) && JSVAL_IS_STRING(rval)) {             \
-                str  = JSVAL_TO_STRING(lval);                                 \
-                str2 = JSVAL_TO_STRING(rval);                                 \
-                cond = js_CompareStrings(str, str2) OP 0;                     \
-            } else {                                                          \
-                VALUE_TO_NUMBER(cx, lval, d);                                 \
-                VALUE_TO_NUMBER(cx, rval, d2);                                \
-                cond = JSDOUBLE_COMPARE(d, OP, d2, JS_FALSE);                 \
-            }                                                                 \
-        }                                                                     \
-        sp--;                                                                 \
-        STORE_OPND(-1, BOOLEAN_TO_JSVAL(cond));                               \
-    JS_END_MACRO
-
-/*
- * NB: These macros can't use JS_BEGIN_MACRO/JS_END_MACRO around their bodies
- * because they begin if/else chains, so callers must not put semicolons after
- * the call expressions!
- */
-#if JS_HAS_XML_SUPPORT
-#define XML_EQUALITY_OP(OP)                                                   \
-    if ((ltmp == JSVAL_OBJECT &&                                              \
-         (obj2 = JSVAL_TO_OBJECT(lval)) &&                                    \
-         OBJECT_IS_XML(cx, obj2)) ||                                          \
-        (rtmp == JSVAL_OBJECT &&                                              \
-         (obj2 = JSVAL_TO_OBJECT(rval)) &&                                    \
-         OBJECT_IS_XML(cx, obj2))) {                                          \
-        JSXMLObjectOps *ops;                                                  \
-                                                                              \
-        ops = (JSXMLObjectOps *) obj2->map->ops;                              \
-        if (obj2 == JSVAL_TO_OBJECT(rval))                                    \
-            rval = lval;                                                      \
-        SAVE_SP(fp);                                                          \
-        ok = ops->equality(cx, obj2, rval, &cond);                            \
-        if (!ok)                                                              \
-            goto out;                                                         \
-        cond = cond OP JS_TRUE;                                               \
-    } else
-
-#define XML_NAME_EQUALITY_OP(OP)                                              \
-    if (ltmp == JSVAL_OBJECT &&                                               \
-        (obj2 = JSVAL_TO_OBJECT(lval)) &&                                     \
-        ((clasp = OBJ_GET_CLASS(cx, obj2))->flags & JSCLASS_IS_EXTENDED)) {   \
-        JSExtendedClass *xclasp;                                              \
-                                                                              \
-        xclasp = (JSExtendedClass *) clasp;                                   \
-        SAVE_SP(fp);                                                          \
-        ok = xclasp->equality(cx, obj2, rval, &cond);                         \
-        if (!ok)                                                              \
-            goto out;                                                         \
-        cond = cond OP JS_TRUE;                                               \
-    } else
-#else
-#define XML_EQUALITY_OP(OP)             /* nothing */
-#define XML_NAME_EQUALITY_OP(OP)        /* nothing */
-#endif
-
-#define EQUALITY_OP(OP, IFNAN)                                                \
-    JS_BEGIN_MACRO                                                            \
-        rval = FETCH_OPND(-1);                                                \
-        lval = FETCH_OPND(-2);                                                \
-        ltmp = JSVAL_TAG(lval);                                               \
-        rtmp = JSVAL_TAG(rval);                                               \
-        XML_EQUALITY_OP(OP)                                                   \
-        if (ltmp == rtmp) {                                                   \
-            if (ltmp == JSVAL_STRING) {                                       \
-                str  = JSVAL_TO_STRING(lval);                                 \
-                str2 = JSVAL_TO_STRING(rval);                                 \
-                cond = js_CompareStrings(str, str2) OP 0;                     \
-            } else if (ltmp == JSVAL_DOUBLE) {                                \
-                d  = *JSVAL_TO_DOUBLE(lval);                                  \
-                d2 = *JSVAL_TO_DOUBLE(rval);                                  \
-                cond = JSDOUBLE_COMPARE(d, OP, d2, IFNAN);                    \
-            } else {                                                          \
-                XML_NAME_EQUALITY_OP(OP)                                      \
-                /* Handle all undefined (=>NaN) and int combinations. */      \
-                cond = lval OP rval;                                          \
-            }                                                                 \
-        } else {                                                              \
-            if (JSVAL_IS_NULL(lval) || JSVAL_IS_VOID(lval)) {                 \
-                cond = (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) OP 1;     \
-            } else if (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) {          \
-                cond = 1 OP 0;                                                \
-            } else {                                                          \
-                if (ltmp == JSVAL_OBJECT) {                                   \
-                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);       \
-                    lval = sp[-2];                                            \
-                    ltmp = JSVAL_TAG(lval);                                   \
-                } else if (rtmp == JSVAL_OBJECT) {                            \
-                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);       \
-                    rval = sp[-1];                                            \
-                    rtmp = JSVAL_TAG(rval);                                   \
-                }                                                             \
-                if (ltmp == JSVAL_STRING && rtmp == JSVAL_STRING) {           \
-                    str  = JSVAL_TO_STRING(lval);                             \
-                    str2 = JSVAL_TO_STRING(rval);                             \
-                    cond = js_CompareStrings(str, str2) OP 0;                 \
-                } else {                                                      \
-                    VALUE_TO_NUMBER(cx, lval, d);                             \
-                    VALUE_TO_NUMBER(cx, rval, d2);                            \
-                    cond = JSDOUBLE_COMPARE(d, OP, d2, IFNAN);                \
-                }                                                             \
-            }                                                                 \
-        }                                                                     \
-        sp--;                                                                 \
-        STORE_OPND(-1, BOOLEAN_TO_JSVAL(cond));                               \
-    JS_END_MACRO
-
-          case JSOP_EQ:
-            EQUALITY_OP(==, JS_FALSE);
-            break;
-
-          case JSOP_NE:
-            EQUALITY_OP(!=, JS_TRUE);
-            break;
-
-#if !JS_BUG_FALLIBLE_EQOPS
-#define NEW_EQUALITY_OP(OP)                                                   \
-    JS_BEGIN_MACRO                                                            \
-        rval = FETCH_OPND(-1);                                                \
-        lval = FETCH_OPND(-2);                                                \
-        cond = js_StrictlyEqual(lval, rval) OP JS_TRUE;                       \
-        sp--;                                                                 \
-        STORE_OPND(-1, BOOLEAN_TO_JSVAL(cond));                               \
-    JS_END_MACRO
-
-          case JSOP_NEW_EQ:
-            NEW_EQUALITY_OP(==);
-            break;
-
-          case JSOP_NEW_NE:
-            NEW_EQUALITY_OP(!=);
-            break;
-
-#if JS_HAS_SWITCH_STATEMENT
-          case JSOP_CASE:
-            NEW_EQUALITY_OP(==);
-            (void) POP();
-            if (cond) {
-                len = GET_JUMP_OFFSET(pc);
-                CHECK_BRANCH(len);
-            } else {
-                PUSH(lval);
-            }
-            break;
-
-          case JSOP_CASEX:
-            NEW_EQUALITY_OP(==);
-            (void) POP();
-            if (cond) {
-                len = GET_JUMPX_OFFSET(pc);
-                CHECK_BRANCH(len);
-            } else {
-                PUSH(lval);
-            }
-            break;
-#endif
-
-#endif /* !JS_BUG_FALLIBLE_EQOPS */
-
-          case JSOP_LT:
-            RELATIONAL_OP(<);
-            break;
-
-          case JSOP_LE:
-            RELATIONAL_OP(<=);
-            break;
-
-          case JSOP_GT:
-            RELATIONAL_OP(>);
-            break;
-
-          case JSOP_GE:
-            RELATIONAL_OP(>=);
-            break;
-
-#undef EQUALITY_OP
-#undef RELATIONAL_OP
-
-          case JSOP_LSH:
-            SIGNED_SHIFT_OP(<<);
-            break;
-
-          case JSOP_RSH:
-            SIGNED_SHIFT_OP(>>);
-            break;
-
-          case JSOP_URSH:
-          {
-            uint32 u;
-
-            FETCH_INT(cx, -1, j);
-            FETCH_UINT(cx, -2, u);
-            j &= 31;
-            d = u >> j;
-            sp--;
-            STORE_NUMBER(cx, -1, d);
-            break;
-          }
-
-#undef INTEGER_OP
-#undef BITWISE_OP
-#undef SIGNED_SHIFT_OP
-
-          case JSOP_ADD:
-            rval = FETCH_OPND(-1);
-            lval = FETCH_OPND(-2);
-#if JS_HAS_XML_SUPPORT
-            if (!JSVAL_IS_PRIMITIVE(lval) &&
-                (obj2 = JSVAL_TO_OBJECT(lval), OBJECT_IS_XML(cx, obj2)) &&
-                VALUE_IS_XML(cx, rval)) {
-                JSXMLObjectOps *ops;
-
-                ops = (JSXMLObjectOps *) obj2->map->ops;
-                SAVE_SP(fp);
-                ok = ops->concatenate(cx, obj2, rval, &rval);
-                if (!ok)
-                    goto out;
-                sp--;
-                STORE_OPND(-1, rval);
-                break;
-            }
-#endif
-            {
-                VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);
-                lval = sp[-2];
-                VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);
-                rval = sp[-1];
-                if ((cond = JSVAL_IS_STRING(lval)) || JSVAL_IS_STRING(rval)) {
-                    SAVE_SP(fp);
-                    if (cond) {
-                        str = JSVAL_TO_STRING(lval);
-                        ok = (str2 = js_ValueToString(cx, rval)) != NULL;
-                    } else {
-                        str2 = JSVAL_TO_STRING(rval);
-                        ok = (str = js_ValueToString(cx, lval)) != NULL;
-                    }
-                    if (!ok)
-                        goto out;
-                    str = js_ConcatStrings(cx, str, str2);
-                    if (!str) {
-                        ok = JS_FALSE;
-                        goto out;
-                    }
-                    sp--;
-                    STORE_OPND(-1, STRING_TO_JSVAL(str));
-                } else {
-                    VALUE_TO_NUMBER(cx, lval, d);
-                    VALUE_TO_NUMBER(cx, rval, d2);
-                    d += d2;
-                    sp--;
-                    STORE_NUMBER(cx, -1, d);
-                }
-            }
-            break;
-
-#define BINARY_OP(OP)                                                         \
-    JS_BEGIN_MACRO                                                            \
-        FETCH_NUMBER(cx, -1, d2);                                             \
-        FETCH_NUMBER(cx, -2, d);                                              \
-        d = d OP d2;                                                          \
-        sp--;                                                                 \
-        STORE_NUMBER(cx, -1, d);                                              \
-    JS_END_MACRO
-
-          case JSOP_SUB:
-            BINARY_OP(-);
-            break;
-
-          case JSOP_MUL:
-            BINARY_OP(*);
-            break;
-
-          case JSOP_DIV:
-            FETCH_NUMBER(cx, -1, d2);
-            FETCH_NUMBER(cx, -2, d);
-            sp--;
-            if (d2 == 0) {
-#if defined(XP_WIN)
-                /* XXX MSVC miscompiles such that (NaN == 0) */
-                if (JSDOUBLE_IS_NaN(d2))
-                    rval = DOUBLE_TO_JSVAL(rt->jsNaN);
-                else
-#endif
-                if (d == 0 || JSDOUBLE_IS_NaN(d))
-                    rval = DOUBLE_TO_JSVAL(rt->jsNaN);
-                else if ((JSDOUBLE_HI32(d) ^ JSDOUBLE_HI32(d2)) >> 31)
-                    rval = DOUBLE_TO_JSVAL(rt->jsNegativeInfinity);
-                else
-                    rval = DOUBLE_TO_JSVAL(rt->jsPositiveInfinity);
-                STORE_OPND(-1, rval);
-            } else {
-                d /= d2;
-                STORE_NUMBER(cx, -1, d);
-            }
-            break;
-
-          case JSOP_MOD:
-            FETCH_NUMBER(cx, -1, d2);
-            FETCH_NUMBER(cx, -2, d);
-            sp--;
-            if (d2 == 0) {
-                STORE_OPND(-1, DOUBLE_TO_JSVAL(rt->jsNaN));
-            } else {
-#if defined(XP_WIN)
-              /* Workaround MS fmod bug where 42 % (1/0) => NaN, not 42. */
-              if (!(JSDOUBLE_IS_FINITE(d) && JSDOUBLE_IS_INFINITE(d2)))
-#endif
-                d = fmod(d, d2);
-                STORE_NUMBER(cx, -1, d);
-            }
-            break;
-
-          case JSOP_NOT:
-            POP_BOOLEAN(cx, rval, cond);
-            PUSH_OPND(BOOLEAN_TO_JSVAL(!cond));
-            break;
-
-          case JSOP_BITNOT:
-            FETCH_INT(cx, -1, i);
-            d = (jsdouble) ~i;
-            STORE_NUMBER(cx, -1, d);
-            break;
-
-          case JSOP_NEG:
-            FETCH_NUMBER(cx, -1, d);
-#ifdef HPUX
-            /*
-             * Negation of a zero doesn't produce a negative
-             * zero on HPUX. Perform the operation by bit
-             * twiddling.
-             */
-            JSDOUBLE_HI32(d) ^= JSDOUBLE_HI32_SIGNBIT;
-#else
-            d = -d;
-#endif
-            STORE_NUMBER(cx, -1, d);
-            break;
-
-          case JSOP_POS:
-            FETCH_NUMBER(cx, -1, d);
-            STORE_NUMBER(cx, -1, d);
-            break;
-
-          case JSOP_NEW:
-            /* Get immediate argc and find the constructor function. */
-            argc = GET_ARGC(pc);
-
-#if JS_HAS_INITIALIZERS
-          do_new:
-#endif
-            SAVE_SP(fp);
-            vp = sp - (2 + argc);
-            JS_ASSERT(vp >= fp->spbase);
-
-            fun = NULL;
-            obj2 = NULL;
-            lval = *vp;
-            if (!JSVAL_IS_OBJECT(lval) ||
-                (obj2 = JSVAL_TO_OBJECT(lval)) == NULL ||
-                /* XXX clean up to avoid special cases above ObjectOps layer */
-                OBJ_GET_CLASS(cx, obj2) == &js_FunctionClass ||
-                !obj2->map->ops->construct)
-            {
-                fun = js_ValueToFunction(cx, vp, JSV2F_CONSTRUCT);
-                if (!fun) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-            }
-
-            clasp = &js_ObjectClass;
-            if (!obj2) {
-                proto = parent = NULL;
-                fun = NULL;
-            } else {
-                /*
-                 * Get the constructor prototype object for this function.
-                 * Use the nominal |this| parameter slot, vp[1], as a local
-                 * root to protect this prototype, in case it has no other
-                 * strong refs.
-                 */
-                ok = OBJ_GET_PROPERTY(cx, obj2,
-                                      ATOM_TO_JSID(rt->atomState
-                                                   .classPrototypeAtom),
-                                      &vp[1]);
-                if (!ok)
-                    goto out;
-                rval = vp[1];
-                proto = JSVAL_IS_OBJECT(rval) ? JSVAL_TO_OBJECT(rval) : NULL;
-                parent = OBJ_GET_PARENT(cx, obj2);
-
-                if (OBJ_GET_CLASS(cx, obj2) == &js_FunctionClass) {
-                    funclasp = ((JSFunction *)JS_GetPrivate(cx, obj2))->clasp;
-                    if (funclasp)
-                        clasp = funclasp;
-                }
-            }
-            obj = js_NewObject(cx, clasp, proto, parent);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-
-            /* Now we have an object with a constructor method; call it. */
-            vp[1] = OBJECT_TO_JSVAL(obj);
-            ok = js_Invoke(cx, argc, JSINVOKE_CONSTRUCT);
-            RESTORE_SP(fp);
-            LOAD_BRANCH_CALLBACK(cx);
-            LOAD_INTERRUPT_HANDLER(rt);
-            if (!ok) {
-                cx->newborn[GCX_OBJECT] = NULL;
-                goto out;
-            }
-
-            /* Check the return value and update obj from it. */
-            rval = *vp;
-            if (JSVAL_IS_PRIMITIVE(rval)) {
-                if (fun || !JS_VERSION_IS_ECMA(cx)) {
-                    *vp = OBJECT_TO_JSVAL(obj);
-                    break;
-                }
-                /* native [[Construct]] returning primitive is error */
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_NEW_RESULT,
-                                     js_ValueToPrintableString(cx, rval));
-                ok = JS_FALSE;
-                goto out;
-            }
-            obj = JSVAL_TO_OBJECT(rval);
-            JS_RUNTIME_METER(rt, constructs);
-            break;
-
-          case JSOP_DELNAME:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-
-            SAVE_SP(fp);
-            ok = js_FindProperty(cx, id, &obj, &obj2, &prop);
-            if (!ok)
-                goto out;
-
-            /* ECMA says to return true if name is undefined or inherited. */
-            rval = JSVAL_TRUE;
-            if (prop) {
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-                ok = OBJ_DELETE_PROPERTY(cx, obj, id, &rval);
-                if (!ok)
-                    goto out;
-            }
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_DELPROP:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            PROPERTY_OP(-1, ok = OBJ_DELETE_PROPERTY(cx, obj, id, &rval));
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_DELELEM:
-            ELEMENT_OP(-1, ok = OBJ_DELETE_PROPERTY(cx, obj, id, &rval));
-            sp--;
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_TYPEOF:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            type = JS_TypeOfValue(cx, rval);
-            atom = rt->atomState.typeAtoms[type];
-            STORE_OPND(-1, ATOM_KEY(atom));
-            break;
-
-          case JSOP_VOID:
-            (void) POP_OPND();
-            PUSH_OPND(JSVAL_VOID);
-            break;
-
-          case JSOP_INCNAME:
-          case JSOP_DECNAME:
-          case JSOP_NAMEINC:
-          case JSOP_NAMEDEC:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-
-            SAVE_SP(fp);
-            ok = js_FindProperty(cx, id, &obj, &obj2, &prop);
-            if (!ok)
-                goto out;
-            if (!prop)
-                goto atom_not_defined;
-
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-            lval = OBJECT_TO_JSVAL(obj);
-            i = 0;
-            goto do_incop;
-
-          case JSOP_INCPROP:
-          case JSOP_DECPROP:
-          case JSOP_PROPINC:
-          case JSOP_PROPDEC:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            lval = FETCH_OPND(-1);
-            i = -1;
-            goto do_incop;
-
-          case JSOP_INCELEM:
-          case JSOP_DECELEM:
-          case JSOP_ELEMINC:
-          case JSOP_ELEMDEC:
-            FETCH_ELEMENT_ID(-1, id);
-            lval = FETCH_OPND(-2);
-            i = -2;
-
-          do_incop:
-            VALUE_TO_OBJECT(cx, lval, obj);
-            if (i < 0)
-                STORE_OPND(i, OBJECT_TO_JSVAL(obj));
-            CHECK_ELEMENT_ID(obj, id);
-
-            /* The operand must contain a number. */
-            SAVE_SP(fp);
-            CACHED_GET(OBJ_GET_PROPERTY(cx, obj, id, &rval));
-            if (!ok)
-                goto out;
-
-            /* The expression result goes in rtmp, the updated value in rval. */
-            if (JSVAL_IS_INT(rval) &&
-                rval != INT_TO_JSVAL(JSVAL_INT_MIN) &&
-                rval != INT_TO_JSVAL(JSVAL_INT_MAX)) {
-                if (cs->format & JOF_POST) {
-                    rtmp = rval;
-                    (cs->format & JOF_INC) ? (rval += 2) : (rval -= 2);
-                } else {
-                    (cs->format & JOF_INC) ? (rval += 2) : (rval -= 2);
-                    rtmp = rval;
-                }
-            } else {
-
-/*
- * Initially, rval contains the value to increment or decrement, which is not
- * yet converted.  As above, the expression result goes in rtmp, the updated
- * value goes in rval.  Our caller must set vp to point at a GC-rooted jsval
- * in which we home rtmp, to protect it from GC in case the unconverted rval
- * is not a number.
- */
-#define NONINT_INCREMENT_OP_MIDDLE()                                          \
-    JS_BEGIN_MACRO                                                            \
-        VALUE_TO_NUMBER(cx, rval, d);                                         \
-        if (cs->format & JOF_POST) {                                          \
-            rtmp = rval;                                                      \
-            if (!JSVAL_IS_NUMBER(rtmp)) {                                     \
-                ok = js_NewNumberValue(cx, d, &rtmp);                         \
-                if (!ok)                                                      \
-                    goto out;                                                 \
-                *vp = rtmp;                                                   \
-            }                                                                 \
-            (cs->format & JOF_INC) ? d++ : d--;                               \
-            ok = js_NewNumberValue(cx, d, &rval);                             \
-        } else {                                                              \
-            (cs->format & JOF_INC) ? ++d : --d;                               \
-            ok = js_NewNumberValue(cx, d, &rval);                             \
-            rtmp = rval;                                                      \
-        }                                                                     \
-        if (!ok)                                                              \
-            goto out;                                                         \
-    JS_END_MACRO
-
-                if (cs->format & JOF_POST) {
-                    /*
-                     * We must push early to protect the postfix increment
-                     * or decrement result, if converted to a jsdouble from
-                     * a non-number value, from GC nesting in the setter.
-                     */
-                    vp = sp++;
-                    SAVE_SP(fp);
-                    --i;
-                }
-#ifdef __GNUC__
-                else vp = NULL; /* suppress bogus gcc warnings */
-#endif
-
-                NONINT_INCREMENT_OP_MIDDLE();
-            }
-
-            fp->flags |= JSFRAME_ASSIGNING;
-            CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
-            fp->flags &= ~JSFRAME_ASSIGNING;
-            if (!ok)
-                goto out;
-            sp += i;
-            PUSH_OPND(rtmp);
-            break;
-
-/*
- * NB: This macro can't use JS_BEGIN_MACRO/JS_END_MACRO around its body because
- * it must break from the switch case that calls it, not from the do...while(0)
- * loop created by the JS_BEGIN/END_MACRO brackets.
- */
-#define FAST_INCREMENT_OP(SLOT,COUNT,BASE,PRE,OP,MINMAX)                      \
-    slot = SLOT;                                                              \
-    JS_ASSERT(slot < fp->fun->COUNT);                                         \
-    vp = fp->BASE + slot;                                                     \
-    rval = *vp;                                                               \
-    if (JSVAL_IS_INT(rval) &&                                                 \
-        rval != INT_TO_JSVAL(JSVAL_INT_##MINMAX)) {                           \
-        PRE = rval;                                                           \
-        rval OP 2;                                                            \
-        *vp = rval;                                                           \
-        PUSH_OPND(PRE);                                                       \
-        break;                                                                \
-    }                                                                         \
-    goto do_nonint_fast_incop;
-
-          case JSOP_INCARG:
-            FAST_INCREMENT_OP(GET_ARGNO(pc), nargs, argv, rval, +=, MAX);
-          case JSOP_DECARG:
-            FAST_INCREMENT_OP(GET_ARGNO(pc), nargs, argv, rval, -=, MIN);
-          case JSOP_ARGINC:
-            FAST_INCREMENT_OP(GET_ARGNO(pc), nargs, argv, rtmp, +=, MAX);
-          case JSOP_ARGDEC:
-            FAST_INCREMENT_OP(GET_ARGNO(pc), nargs, argv, rtmp, -=, MIN);
-
-          case JSOP_INCVAR:
-            FAST_INCREMENT_OP(GET_VARNO(pc), nvars, vars, rval, +=, MAX);
-          case JSOP_DECVAR:
-            FAST_INCREMENT_OP(GET_VARNO(pc), nvars, vars, rval, -=, MIN);
-          case JSOP_VARINC:
-            FAST_INCREMENT_OP(GET_VARNO(pc), nvars, vars, rtmp, +=, MAX);
-          case JSOP_VARDEC:
-            FAST_INCREMENT_OP(GET_VARNO(pc), nvars, vars, rtmp, -=, MIN);
-
-#undef FAST_INCREMENT_OP
-
-          do_nonint_fast_incop:
-            NONINT_INCREMENT_OP_MIDDLE();
-            *vp = rval;
-            PUSH_OPND(rtmp);
-            break;
-
-#define FAST_GLOBAL_INCREMENT_OP(SLOWOP,PRE,OP,MINMAX)                        \
-    slot = GET_VARNO(pc);                                                     \
-    JS_ASSERT(slot < fp->nvars);                                              \
-    lval = fp->vars[slot];                                                    \
-    if (JSVAL_IS_NULL(lval)) {                                                \
-        op = SLOWOP;                                                          \
-        goto do_op;                                                           \
-    }                                                                         \
-    slot = JSVAL_TO_INT(lval);                                                \
-    obj = fp->varobj;                                                         \
-    rval = OBJ_GET_SLOT(cx, obj, slot);                                       \
-    if (JSVAL_IS_INT(rval) &&                                                 \
-        rval != INT_TO_JSVAL(JSVAL_INT_##MINMAX)) {                           \
-        PRE = rval;                                                           \
-        rval OP 2;                                                            \
-        OBJ_SET_SLOT(cx, obj, slot, rval);                                    \
-        PUSH_OPND(PRE);                                                       \
-        break;                                                                \
-    }                                                                         \
-    goto do_nonint_fast_global_incop;
-
-          case JSOP_INCGVAR:
-            FAST_GLOBAL_INCREMENT_OP(JSOP_INCNAME, rval, +=, MAX);
-          case JSOP_DECGVAR:
-            FAST_GLOBAL_INCREMENT_OP(JSOP_DECNAME, rval, -=, MIN);
-          case JSOP_GVARINC:
-            FAST_GLOBAL_INCREMENT_OP(JSOP_NAMEINC, rtmp, +=, MAX);
-          case JSOP_GVARDEC:
-            FAST_GLOBAL_INCREMENT_OP(JSOP_NAMEDEC, rtmp, -=, MIN);
-
-#undef FAST_GLOBAL_INCREMENT_OP
-
-          do_nonint_fast_global_incop:
-          {
-            const JSCodeSpec *cs = &js_CodeSpec[op];
-
-            vp = sp++;
-            SAVE_SP(fp);
-            NONINT_INCREMENT_OP_MIDDLE();
-            OBJ_SET_SLOT(cx, obj, slot, rval);
-            STORE_OPND(-1, rtmp);
-            len = cs->length;
-            break;
-          }
-
-          case JSOP_GETPROP:
-            /* Get an immediate atom naming the property. */
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            PROPERTY_OP(-1, CACHED_GET(OBJ_GET_PROPERTY(cx, obj, id, &rval)));
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_SETPROP:
-            /* Pop the right-hand side into rval for OBJ_SET_PROPERTY. */
-            rval = FETCH_OPND(-1);
-
-            /* Get an immediate atom naming the property. */
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            PROPERTY_OP(-2, CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval)));
-            sp--;
-            STORE_OPND(-1, rval);
-            obj = NULL;
-            break;
-
-          case JSOP_GETELEM:
-            ELEMENT_OP(-1, CACHED_GET(OBJ_GET_PROPERTY(cx, obj, id, &rval)));
-            sp--;
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_SETELEM:
-            rval = FETCH_OPND(-1);
-            ELEMENT_OP(-2, CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval)));
-            sp -= 2;
-            STORE_OPND(-1, rval);
-            obj = NULL;
-            break;
-
-          case JSOP_ENUMELEM:
-            /* Funky: the value to set is under the [obj, id] pair. */
-            FETCH_ELEMENT_ID(-1, id);
-            FETCH_OBJECT(cx, -2, lval, obj);
-            CHECK_ELEMENT_ID(obj, id);
-            rval = FETCH_OPND(-3);
-            SAVE_SP(fp);
-            ok = OBJ_SET_PROPERTY(cx, obj, id, &rval);
-            if (!ok)
-                goto out;
-            sp -= 3;
-            break;
-
-/*
- * LAZY_ARGS_THISP allows the JSOP_ARGSUB bytecode to defer creation of the
- * arguments object until it is truly needed.  JSOP_ARGSUB optimizes away
- * arguments objects when the only uses of the 'arguments' parameter are to
- * fetch individual actual parameters.  But if such a use were then invoked,
- * e.g., arguments[i](), the 'this' parameter would and must bind to the
- * caller's arguments object.  So JSOP_ARGSUB sets obj to LAZY_ARGS_THISP.
- */
-#define LAZY_ARGS_THISP ((JSObject *) 1)
-
-          case JSOP_PUSHOBJ:
-            if (obj == LAZY_ARGS_THISP && !(obj = js_GetArgsObject(cx, fp))) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            break;
-
-          case JSOP_CALL:
-          case JSOP_EVAL:
-            argc = GET_ARGC(pc);
-            vp = sp - (argc + 2);
-            lval = *vp;
-            SAVE_SP(fp);
-
-            if (JSVAL_IS_FUNCTION(cx, lval) &&
-                (obj = JSVAL_TO_OBJECT(lval),
-                 fun = (JSFunction *) JS_GetPrivate(cx, obj),
-                 fun->interpreted &&
-                 !(fun->flags & (JSFUN_HEAVYWEIGHT | JSFUN_BOUND_METHOD)) &&
-                 argc >= (uintN)(fun->nargs + fun->extra)))
-          /* inline_call: */
-            {
-                uintN nframeslots, nvars;
-                void *newmark;
-                JSInlineFrame *newifp;
-                JSInterpreterHook hook;
-
-                /* Restrict recursion of lightweight functions. */
-                if (inlineCallCount == MAX_INLINE_CALL_COUNT) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_OVER_RECURSED);
-                    ok = JS_FALSE;
-                    goto out;
-                }
-
-#if JS_HAS_JIT
-                /* ZZZbe should do this only if interpreted often enough. */
-                ok = jsjit_Compile(cx, fun);
-                if (!ok)
-                    goto out;
-#endif
-
-                /* Compute the number of stack slots needed for fun. */
-                nframeslots = (sizeof(JSInlineFrame) + sizeof(jsval) - 1)
-                              / sizeof(jsval);
-                nvars = fun->nvars;
-                script = fun->u.script;
-                depth = (jsint) script->depth;
-
-                /* Allocate the frame and space for vars and operands. */
-                newsp = js_AllocRawStack(cx, nframeslots + nvars + 2 * depth,
-                                         &newmark);
-                if (!newsp) {
-                    ok = JS_FALSE;
-                    goto bad_inline_call;
-                }
-                newifp = (JSInlineFrame *) newsp;
-                newsp += nframeslots;
-
-                /* Initialize the stack frame. */
-                memset(newifp, 0, sizeof(JSInlineFrame));
-                newifp->frame.script = script;
-                newifp->frame.fun = fun;
-                newifp->frame.argc = argc;
-                newifp->frame.argv = vp + 2;
-                newifp->frame.rval = JSVAL_VOID;
-                newifp->frame.nvars = nvars;
-                newifp->frame.vars = newsp;
-                newifp->frame.down = fp;
-                newifp->frame.scopeChain = OBJ_GET_PARENT(cx, obj);
-                newifp->mark = newmark;
-
-                /* Compute the 'this' parameter now that argv is set. */
-                ok = js_ComputeThis(cx, JSVAL_TO_OBJECT(vp[1]), &newifp->frame);
-                if (!ok) {
-                    js_FreeRawStack(cx, newmark);
-                    goto bad_inline_call;
-                }
-#ifdef DUMP_CALL_TABLE
-                LogCall(cx, *vp, argc, vp + 2);
-#endif
-
-                /* Push void to initialize local variables. */
-                sp = newsp;
-                while (nvars--)
-                    PUSH(JSVAL_VOID);
-                sp += depth;
-                newifp->frame.spbase = sp;
-                SAVE_SP(&newifp->frame);
-
-                /* Call the debugger hook if present. */
-                hook = cx->runtime->callHook;
-                if (hook) {
-                    newifp->hookData = hook(cx, &newifp->frame, JS_TRUE, 0,
-                                            cx->runtime->callHookData);
-                    LOAD_INTERRUPT_HANDLER(rt);
-                }
-
-                /* Switch to new version if currentVersion wasn't overridden. */
-                newifp->callerVersion = cx->version;
-                if (cx->version == currentVersion) {
-                    currentVersion = script->version;
-                    if (currentVersion != cx->version)
-                        js_SetVersion(cx, currentVersion);
-                }
-
-                /* Push the frame and set interpreter registers. */
-                cx->fp = fp = &newifp->frame;
-                pc = script->code;
-                endpc = pc + script->length;
-                inlineCallCount++;
-                JS_RUNTIME_METER(rt, inlineCalls);
-                continue;
-
-              bad_inline_call:
-                script = fp->script;
-                depth = (jsint) script->depth;
-                goto out;
-            }
-
-            ok = js_Invoke(cx, argc, 0);
-            RESTORE_SP(fp);
-            LOAD_BRANCH_CALLBACK(cx);
-            LOAD_INTERRUPT_HANDLER(rt);
-            if (!ok)
-                goto out;
-            JS_RUNTIME_METER(rt, nonInlineCalls);
-#if JS_HAS_LVALUE_RETURN
-            if (cx->rval2set) {
-                /*
-                 * Sneaky: use the stack depth we didn't claim in our budget,
-                 * but that we know is there on account of [fun, this] already
-                 * having been pushed, at a minimum (if no args).  Those two
-                 * slots have been popped and [rval] has been pushed, which
-                 * leaves one more slot for rval2 before we might overflow.
-                 *
-                 * NB: rval2 must be the property identifier, and rval the
-                 * object from which to get the property.  The pair form an
-                 * ECMA "reference type", which can be used on the right- or
-                 * left-hand side of assignment ops.  Only native methods can
-                 * return reference types.  See JSOP_SETCALL just below for
-                 * the left-hand-side case.
-                 */
-                PUSH_OPND(cx->rval2);
-                cx->rval2set = JS_FALSE;
-                ELEMENT_OP(-1, ok = OBJ_GET_PROPERTY(cx, obj, id, &rval));
-                sp--;
-                STORE_OPND(-1, rval);
-            }
-#endif
-            obj = NULL;
-            break;
-
-#if JS_HAS_LVALUE_RETURN
-          case JSOP_SETCALL:
-            argc = GET_ARGC(pc);
-            SAVE_SP(fp);
-            ok = js_Invoke(cx, argc, 0);
-            RESTORE_SP(fp);
-            LOAD_BRANCH_CALLBACK(cx);
-            LOAD_INTERRUPT_HANDLER(rt);
-            if (!ok)
-                goto out;
-            if (!cx->rval2set) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_LEFTSIDE_OF_ASS);
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(cx->rval2);
-            cx->rval2set = JS_FALSE;
-            obj = NULL;
-            break;
-#endif
-
-          case JSOP_NAME:
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-
-            SAVE_SP(fp);
-            ok = js_FindProperty(cx, id, &obj, &obj2, &prop);
-            if (!ok)
-                goto out;
-            if (!prop) {
-                /* Kludge to allow (typeof foo == "undefined") tests. */
-                for (pc2 = pc + len; pc2 < endpc; pc2++) {
-                    op2 = (JSOp)*pc2;
-                    if (op2 == JSOP_TYPEOF) {
-                        PUSH_OPND(JSVAL_VOID);
-                        goto advance_pc;
-                    }
-                    if (op2 != JSOP_GROUP)
-                        break;
-                }
-                goto atom_not_defined;
-            }
-
-            /* Take the slow path if prop was not found in a native object. */
-            if (!OBJ_IS_NATIVE(obj) || !OBJ_IS_NATIVE(obj2)) {
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-                ok = OBJ_GET_PROPERTY(cx, obj, id, &rval);
-                if (!ok)
-                    goto out;
-                PUSH_OPND(rval);
-                break;
-            }
-
-            /* Get and push the obj[id] property's value. */
-            sprop = (JSScopeProperty *)prop;
-            slot = (uintN)sprop->slot;
-            rval = (slot != SPROP_INVALID_SLOT)
-                   ? LOCKED_OBJ_GET_SLOT(obj2, slot)
-                   : JSVAL_VOID;
-            JS_UNLOCK_OBJ(cx, obj2);
-            ok = SPROP_GET(cx, sprop, obj, obj2, &rval);
-            JS_LOCK_OBJ(cx, obj2);
-            if (!ok) {
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-                goto out;
-            }
-            if (SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj2)))
-                LOCKED_OBJ_SET_SLOT(obj2, slot, rval);
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_UINT16:
-            i = (jsint) GET_ATOM_INDEX(pc);
-            rval = INT_TO_JSVAL(i);
-            PUSH_OPND(rval);
-            obj = NULL;
-            break;
-
-          case JSOP_UINT24:
-            i = (jsint) GET_LITERAL_INDEX(pc);
-            rval = INT_TO_JSVAL(i);
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_LITERAL:
-            atomIndex = GET_LITERAL_INDEX(pc);
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            PUSH_OPND(ATOM_KEY(atom));
-            obj = NULL;
-            break;
-
-          case JSOP_FINDNAME:
-            atomIndex = GET_LITERAL_INDEX(pc);
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            SAVE_SP(fp);
-            obj = js_FindIdentifierBase(cx, ATOM_TO_JSID(atom));
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            PUSH_OPND(ATOM_KEY(atom));
-            break;
-
-          case JSOP_LITOPX:
-            atomIndex = GET_LITERAL_INDEX(pc);
-            op = pc[1 + LITERAL_INDEX_LEN];
-            switch (op) {
-              case JSOP_ANONFUNOBJ:   goto do_JSOP_ANONFUNOBJ;
-              case JSOP_BINDNAME:     goto do_JSOP_BINDNAME;
-              case JSOP_CLOSURE:      goto do_JSOP_CLOSURE;
-              case JSOP_DEFCONST:     goto do_JSOP_DEFCONST;
-              case JSOP_DEFFUN:       goto do_JSOP_DEFFUN;
-              case JSOP_DEFLOCALFUN:  goto do_JSOP_DEFLOCALFUN;
-              case JSOP_DEFVAR:       goto do_JSOP_DEFVAR;
-#if JS_HAS_EXPORT_IMPORT
-              case JSOP_EXPORTNAME:   goto do_JSOP_EXPORTNAME;
-#endif
-#if JS_HAS_XML_SUPPORT
-              case JSOP_GETMETHOD:    goto do_JSOP_GETMETHOD;
-              case JSOP_SETMETHOD:    goto do_JSOP_SETMETHOD;
-#endif
-              case JSOP_INITCATCHVAR: goto do_JSOP_INITCATCHVAR;
-              case JSOP_NAMEDFUNOBJ:  goto do_JSOP_NAMEDFUNOBJ;
-              case JSOP_NUMBER:       goto do_JSOP_NUMBER;
-              case JSOP_OBJECT:       goto do_JSOP_OBJECT;
-#if JS_HAS_XML_SUPPORT
-              case JSOP_QNAMECONST:   goto do_JSOP_QNAMECONST;
-              case JSOP_QNAMEPART:    goto do_JSOP_QNAMEPART;
-#endif
-              case JSOP_REGEXP:       goto do_JSOP_REGEXP;
-              case JSOP_SETCONST:     goto do_JSOP_SETCONST;
-              case JSOP_STRING:       goto do_JSOP_STRING;
-#if JS_HAS_XML_SUPPORT
-              case JSOP_XMLCDATA:     goto do_JSOP_XMLCDATA;
-              case JSOP_XMLCOMMENT:   goto do_JSOP_XMLCOMMENT;
-              case JSOP_XMLOBJECT:    goto do_JSOP_XMLOBJECT;
-              case JSOP_XMLPI:        goto do_JSOP_XMLPI;
-#endif
-              default:                JS_ASSERT(0);
-            }
-            /* NOTREACHED */
-            break;
-
-          case JSOP_NUMBER:
-          case JSOP_STRING:
-          case JSOP_OBJECT:
-            atomIndex = GET_ATOM_INDEX(pc);
-
-          do_JSOP_NUMBER:
-          do_JSOP_STRING:
-          do_JSOP_OBJECT:
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            PUSH_OPND(ATOM_KEY(atom));
-            obj = NULL;
-            break;
-
-          BEGIN_LITOPX_CASE(JSOP_REGEXP, 0)
-          {
-            JSRegExp *re;
-            JSObject *funobj;
-
-            /*
-             * Push a regexp object for the atom mapped by the bytecode at pc,
-             * cloning the literal's regexp object if necessary, to simulate in
-             * the pre-compile/execute-later case what ECMA specifies for the
-             * compile-and-go case: that scanning each regexp literal creates
-             * a single corresponding RegExp object.
-             *
-             * To support pre-compilation transparently, we must handle the
-             * case where a regexp object literal is used in a different global
-             * at execution time from the global with which it was scanned at
-             * compile time.  We do this by re-wrapping the JSRegExp private
-             * data struct with a cloned object having the right prototype and
-             * parent, and having its own lastIndex property value storage.
-             *
-             * Unlike JSOP_DEFFUN and other prolog bytecodes that may clone
-             * literal objects, we don't want to pay a script prolog execution
-             * price for all regexp literals in a script (many may not be used
-             * by a particular execution of that script, depending on control
-             * flow), so we initialize lazily here.
-             *
-             * XXX This code is specific to regular expression objects.  If we
-             * need a similar op for other kinds of object literals, we should
-             * push cloning down under JSObjectOps and reuse code here.
-             */
-            JS_ASSERT(ATOM_IS_OBJECT(atom));
-            obj = ATOM_TO_OBJECT(atom);
-            JS_ASSERT(OBJ_GET_CLASS(cx, obj) == &js_RegExpClass);
-
-            re = (JSRegExp *) JS_GetPrivate(cx, obj);
-            slot = re->cloneIndex;
-            if (fp->fun) {
-                /*
-                 * We're in function code, not global or eval code (in eval
-                 * code, JSOP_REGEXP is never emitted).  The code generator
-                 * recorded in fp->fun->nregexps the number of re->cloneIndex
-                 * slots that it reserved in the cloned funobj.
-                 */
-                funobj = JSVAL_TO_OBJECT(fp->argv[-2]);
-                slot += JSCLASS_RESERVED_SLOTS(&js_FunctionClass);
-                if (!JS_GetReservedSlot(cx, funobj, slot, &rval))
-                    return JS_FALSE;
-                if (JSVAL_IS_VOID(rval))
-                    rval = JSVAL_NULL;
-            } else {
-                /*
-                 * We're in global code.  The code generator already arranged
-                 * via script->numGlobalVars to reserve a global variable slot
-                 * at cloneIndex.  All global variable slots are initialized
-                 * to null, not void, for faster testing in JSOP_*GVAR cases.
-                 */
-                rval = fp->vars[slot];
-#ifdef __GNUC__
-                funobj = NULL;  /* suppress bogus gcc warnings */
-#endif
-            }
-
-            if (JSVAL_IS_NULL(rval)) {
-                /* Compute the current global object in obj2. */
-                obj2 = fp->scopeChain;
-                while ((parent = OBJ_GET_PARENT(cx, obj2)) != NULL)
-                    obj2 = parent;
-
-                /*
-                 * We must home sp here, because either js_CloneRegExpObject
-                 * or JS_SetReservedSlot could nest a last-ditch GC.  We home
-                 * pc as well, in case js_CloneRegExpObject has to lookup the
-                 * "RegExp" class in the global object, which could entail a
-                 * JSNewResolveOp call.
-                 */
-                SAVE_SP(fp);
-
-                /*
-                 * If obj's parent is not obj2, we must clone obj so that it
-                 * has the right parent, and therefore, the right prototype.
-                 *
-                 * Yes, this means we assume that the correct RegExp.prototype
-                 * to which regexp instances (including literals) delegate can
-                 * be distinguished solely by the instance's parent, which was
-                 * set to the parent of the RegExp constructor function object
-                 * when the instance was created.  In other words,
-                 *
-                 *   (/x/.__parent__ == RegExp.__parent__) implies
-                 *   (/x/.__proto__ == RegExp.prototype)
-                 *
-                 * (unless you assign a different object to RegExp.prototype
-                 * at runtime, in which case, ECMA doesn't specify operation,
-                 * and you get what you deserve).
-                 *
-                 * This same coupling between instance parent and constructor
-                 * parent turns up everywhere (see jsobj.c's FindConstructor,
-                 * js_ConstructObject, and js_NewObject).  It's fundamental to
-                 * the design of the language when you consider multiple global
-                 * objects and separate compilation and execution, even though
-                 * it is not specified fully in ECMA.
-                 */
-                if (OBJ_GET_PARENT(cx, obj) != obj2) {
-                    obj = js_CloneRegExpObject(cx, obj, obj2);
-                    if (!obj) {
-                        ok = JS_FALSE;
-                        goto out;
-                    }
-                }
-                rval = OBJECT_TO_JSVAL(obj);
-
-                /* Store the regexp object value in its cloneIndex slot. */
-                if (fp->fun) {
-                    if (!JS_SetReservedSlot(cx, funobj, slot, rval))
-                        return JS_FALSE;
-                } else {
-                    fp->vars[slot] = rval;
-                }
-            }
-
-            PUSH_OPND(rval);
-            obj = NULL;
-          }
-          END_LITOPX_CASE
-
-          case JSOP_ZERO:
-            PUSH_OPND(JSVAL_ZERO);
-            obj = NULL;
-            break;
-
-          case JSOP_ONE:
-            PUSH_OPND(JSVAL_ONE);
-            obj = NULL;
-            break;
-
-          case JSOP_NULL:
-            PUSH_OPND(JSVAL_NULL);
-            obj = NULL;
-            break;
-
-          case JSOP_THIS:
-            obj = fp->thisp;
-            clasp = OBJ_GET_CLASS(cx, obj);
-            if (clasp->flags & JSCLASS_IS_EXTENDED) {
-                JSExtendedClass *xclasp;
-
-                xclasp = (JSExtendedClass *) clasp;
-                if (xclasp->outerObject) {
-                    obj = xclasp->outerObject(cx, obj);
-                    if (!obj) {
-                        ok = JS_FALSE;
-                        goto out;
-                    }
-                }
-            }
-
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            obj = NULL;
-            break;
-
-          case JSOP_FALSE:
-            PUSH_OPND(JSVAL_FALSE);
-            obj = NULL;
-            break;
-
-          case JSOP_TRUE:
-            PUSH_OPND(JSVAL_TRUE);
-            obj = NULL;
-            break;
-
-#if JS_HAS_SWITCH_STATEMENT
-          case JSOP_TABLESWITCH:
-            pc2 = pc;
-            len = GET_JUMP_OFFSET(pc2);
-
-            /*
-             * ECMAv2 forbids conversion of discriminant, so we will skip to
-             * the default case if the discriminant isn't already an int jsval.
-             * (This opcode is emitted only for dense jsint-domain switches.)
-             */
-            if ((cx->version & JSVERSION_MASK) == JSVERSION_DEFAULT ||
-                (cx->version & JSVERSION_MASK) >= JSVERSION_1_4) {
-                rval = POP_OPND();
-                if (!JSVAL_IS_INT(rval))
-                    break;
-                i = JSVAL_TO_INT(rval);
-            } else {
-                FETCH_INT(cx, -1, i);
-                sp--;
-            }
-
-            pc2 += JUMP_OFFSET_LEN;
-            low = GET_JUMP_OFFSET(pc2);
-            pc2 += JUMP_OFFSET_LEN;
-            high = GET_JUMP_OFFSET(pc2);
-
-            i -= low;
-            if ((jsuint)i < (jsuint)(high - low + 1)) {
-                pc2 += JUMP_OFFSET_LEN + JUMP_OFFSET_LEN * i;
-                off = (jsint) GET_JUMP_OFFSET(pc2);
-                if (off)
-                    len = off;
-            }
-            break;
-
-          case JSOP_LOOKUPSWITCH:
-            lval = POP_OPND();
-            pc2 = pc;
-            len = GET_JUMP_OFFSET(pc2);
-
-            if (!JSVAL_IS_NUMBER(lval) &&
-                !JSVAL_IS_STRING(lval) &&
-                !JSVAL_IS_BOOLEAN(lval)) {
-                goto advance_pc;
-            }
-
-            pc2 += JUMP_OFFSET_LEN;
-            npairs = (jsint) GET_ATOM_INDEX(pc2);
-            pc2 += ATOM_INDEX_LEN;
-
-#define SEARCH_PAIRS(MATCH_CODE)                                              \
-    while (npairs) {                                                          \
-        atom = GET_ATOM(cx, script, pc2);                                     \
-        rval = ATOM_KEY(atom);                                                \
-        MATCH_CODE                                                            \
-        if (match) {                                                          \
-            pc2 += ATOM_INDEX_LEN;                                            \
-            len = GET_JUMP_OFFSET(pc2);                                       \
-            goto advance_pc;                                                  \
-        }                                                                     \
-        pc2 += ATOM_INDEX_LEN + JUMP_OFFSET_LEN;                              \
-        npairs--;                                                             \
-    }
-            if (JSVAL_IS_STRING(lval)) {
-                str  = JSVAL_TO_STRING(lval);
-                SEARCH_PAIRS(
-                    match = (JSVAL_IS_STRING(rval) &&
-                             ((str2 = JSVAL_TO_STRING(rval)) == str ||
-                              !js_CompareStrings(str2, str)));
-                )
-            } else if (JSVAL_IS_DOUBLE(lval)) {
-                d = *JSVAL_TO_DOUBLE(lval);
-                SEARCH_PAIRS(
-                    match = (JSVAL_IS_DOUBLE(rval) &&
-                             *JSVAL_TO_DOUBLE(rval) == d);
-                )
-            } else {
-                SEARCH_PAIRS(
-                    match = (lval == rval);
-                )
-            }
-#undef SEARCH_PAIRS
-            break;
-
-          case JSOP_TABLESWITCHX:
-            pc2 = pc;
-            len = GET_JUMPX_OFFSET(pc2);
-
-            /*
-             * ECMAv2 forbids conversion of discriminant, so we will skip to
-             * the default case if the discriminant isn't already an int jsval.
-             * (This opcode is emitted only for dense jsint-domain switches.)
-             */
-            if ((cx->version & JSVERSION_MASK) == JSVERSION_DEFAULT ||
-                (cx->version & JSVERSION_MASK) >= JSVERSION_1_4) {
-                rval = POP_OPND();
-                if (!JSVAL_IS_INT(rval))
-                    break;
-                i = JSVAL_TO_INT(rval);
-            } else {
-                FETCH_INT(cx, -1, i);
-                sp--;
-            }
-
-            pc2 += JUMPX_OFFSET_LEN;
-            low = GET_JUMP_OFFSET(pc2);
-            pc2 += JUMP_OFFSET_LEN;
-            high = GET_JUMP_OFFSET(pc2);
-
-            i -= low;
-            if ((jsuint)i < (jsuint)(high - low + 1)) {
-                pc2 += JUMP_OFFSET_LEN + JUMPX_OFFSET_LEN * i;
-                off = (jsint) GET_JUMPX_OFFSET(pc2);
-                if (off)
-                    len = off;
-            }
-            break;
-
-          case JSOP_LOOKUPSWITCHX:
-            lval = POP_OPND();
-            pc2 = pc;
-            len = GET_JUMPX_OFFSET(pc2);
-
-            if (!JSVAL_IS_NUMBER(lval) &&
-                !JSVAL_IS_STRING(lval) &&
-                !JSVAL_IS_BOOLEAN(lval)) {
-                goto advance_pc;
-            }
-
-            pc2 += JUMPX_OFFSET_LEN;
-            npairs = (jsint) GET_ATOM_INDEX(pc2);
-            pc2 += ATOM_INDEX_LEN;
-
-#define SEARCH_EXTENDED_PAIRS(MATCH_CODE)                                     \
-    while (npairs) {                                                          \
-        atom = GET_ATOM(cx, script, pc2);                                     \
-        rval = ATOM_KEY(atom);                                                \
-        MATCH_CODE                                                            \
-        if (match) {                                                          \
-            pc2 += ATOM_INDEX_LEN;                                            \
-            len = GET_JUMPX_OFFSET(pc2);                                      \
-            goto advance_pc;                                                  \
-        }                                                                     \
-        pc2 += ATOM_INDEX_LEN + JUMPX_OFFSET_LEN;                             \
-        npairs--;                                                             \
-    }
-            if (JSVAL_IS_STRING(lval)) {
-                str  = JSVAL_TO_STRING(lval);
-                SEARCH_EXTENDED_PAIRS(
-                    match = (JSVAL_IS_STRING(rval) &&
-                             ((str2 = JSVAL_TO_STRING(rval)) == str ||
-                              !js_CompareStrings(str2, str)));
-                )
-            } else if (JSVAL_IS_DOUBLE(lval)) {
-                d = *JSVAL_TO_DOUBLE(lval);
-                SEARCH_EXTENDED_PAIRS(
-                    match = (JSVAL_IS_DOUBLE(rval) &&
-                             *JSVAL_TO_DOUBLE(rval) == d);
-                )
-            } else {
-                SEARCH_EXTENDED_PAIRS(
-                    match = (lval == rval);
-                )
-            }
-#undef SEARCH_EXTENDED_PAIRS
-            break;
-
-          case JSOP_CONDSWITCH:
-            break;
-
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-#if JS_HAS_EXPORT_IMPORT
-          case JSOP_EXPORTALL:
-            SAVE_SP(fp);
-            obj = fp->varobj;
-            ida = JS_Enumerate(cx, obj);
-            if (!ida) {
-                ok = JS_FALSE;
-            } else {
-                for (i = 0, j = ida->length; i < j; i++) {
-                    id = ida->vector[i];
-                    ok = OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop);
-                    if (!ok)
-                        break;
-                    if (!prop)
-                        continue;
-                    ok = OBJ_GET_ATTRIBUTES(cx, obj, id, prop, &attrs);
-                    if (ok) {
-                        attrs |= JSPROP_EXPORTED;
-                        ok = OBJ_SET_ATTRIBUTES(cx, obj, id, prop, &attrs);
-                    }
-                    OBJ_DROP_PROPERTY(cx, obj2, prop);
-                    if (!ok)
-                        break;
-                }
-                JS_DestroyIdArray(cx, ida);
-            }
-            break;
-
-          BEGIN_LITOPX_CASE(JSOP_EXPORTNAME, 0)
-            id   = ATOM_TO_JSID(atom);
-            obj  = fp->varobj;
-            SAVE_SP(fp);
-            ok = OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop);
-            if (!ok)
-                goto out;
-            if (!prop) {
-                ok = OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID, NULL, NULL,
-                                         JSPROP_EXPORTED, NULL);
-            } else {
-                ok = OBJ_GET_ATTRIBUTES(cx, obj, id, prop, &attrs);
-                if (ok) {
-                    attrs |= JSPROP_EXPORTED;
-                    ok = OBJ_SET_ATTRIBUTES(cx, obj, id, prop, &attrs);
-                }
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-            }
-            if (!ok)
-                goto out;
-          END_LITOPX_CASE
-
-          case JSOP_IMPORTALL:
-            id = (jsid) JSVAL_VOID;
-            PROPERTY_OP(-1, ok = ImportProperty(cx, obj, id));
-            sp--;
-            break;
-
-          case JSOP_IMPORTPROP:
-            /* Get an immediate atom naming the property. */
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            PROPERTY_OP(-1, ok = ImportProperty(cx, obj, id));
-            sp--;
-            break;
-
-          case JSOP_IMPORTELEM:
-            ELEMENT_OP(-1, ok = ImportProperty(cx, obj, id));
-            sp -= 2;
-            break;
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-          case JSOP_TRAP:
-            switch (JS_HandleTrap(cx, script, pc, &rval)) {
-              case JSTRAP_ERROR:
-                ok = JS_FALSE;
-                goto out;
-              case JSTRAP_CONTINUE:
-                JS_ASSERT(JSVAL_IS_INT(rval));
-                op = (JSOp) JSVAL_TO_INT(rval);
-                JS_ASSERT((uintN)op < (uintN)JSOP_LIMIT);
-                LOAD_INTERRUPT_HANDLER(rt);
-                goto do_op;
-              case JSTRAP_RETURN:
-                fp->rval = rval;
-                goto out;
-#if JS_HAS_EXCEPTIONS
-              case JSTRAP_THROW:
-                cx->throwing = JS_TRUE;
-                cx->exception = rval;
-                ok = JS_FALSE;
-                goto out;
-#endif /* JS_HAS_EXCEPTIONS */
-              default:;
-            }
-            LOAD_INTERRUPT_HANDLER(rt);
-            break;
-
-          case JSOP_ARGUMENTS:
-            SAVE_SP(fp);
-            ok = js_GetArgsValue(cx, fp, &rval);
-            if (!ok)
-                goto out;
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_ARGSUB:
-            id = INT_TO_JSID(GET_ARGNO(pc));
-            SAVE_SP(fp);
-            ok = js_GetArgsProperty(cx, fp, id, &obj, &rval);
-            if (!ok)
-                goto out;
-            if (!obj) {
-                /*
-                 * If arguments was not overridden by eval('arguments = ...'),
-                 * set obj to the magic cookie respected by JSOP_PUSHOBJ, just
-                 * in case this bytecode is part of an 'arguments[i](j, k)' or
-                 * similar such invocation sequence, where the function that
-                 * is invoked expects its 'this' parameter to be the caller's
-                 * arguments object.
-                 */
-                obj = LAZY_ARGS_THISP;
-            }
-            PUSH_OPND(rval);
-            break;
-
-#undef LAZY_ARGS_THISP
-
-          case JSOP_ARGCNT:
-            id = ATOM_TO_JSID(rt->atomState.lengthAtom);
-            SAVE_SP(fp);
-            ok = js_GetArgsProperty(cx, fp, id, &obj, &rval);
-            if (!ok)
-                goto out;
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_GETARG:
-            slot = GET_ARGNO(pc);
-            JS_ASSERT(slot < fp->fun->nargs);
-            PUSH_OPND(fp->argv[slot]);
-            obj = NULL;
-            break;
-
-          case JSOP_SETARG:
-            slot = GET_ARGNO(pc);
-            JS_ASSERT(slot < fp->fun->nargs);
-            vp = &fp->argv[slot];
-            GC_POKE(cx, *vp);
-            *vp = FETCH_OPND(-1);
-            obj = NULL;
-            break;
-
-          case JSOP_GETVAR:
-            slot = GET_VARNO(pc);
-            JS_ASSERT(slot < fp->fun->nvars);
-            PUSH_OPND(fp->vars[slot]);
-            obj = NULL;
-            break;
-
-          case JSOP_SETVAR:
-            slot = GET_VARNO(pc);
-            JS_ASSERT(slot < fp->fun->nvars);
-            vp = &fp->vars[slot];
-            GC_POKE(cx, *vp);
-            *vp = FETCH_OPND(-1);
-            obj = NULL;
-            break;
-
-          case JSOP_GETGVAR:
-            slot = GET_VARNO(pc);
-            JS_ASSERT(slot < fp->nvars);
-            lval = fp->vars[slot];
-            if (JSVAL_IS_NULL(lval)) {
-                op = JSOP_NAME;
-                goto do_op;
-            }
-            slot = JSVAL_TO_INT(lval);
-            obj = fp->varobj;
-            rval = OBJ_GET_SLOT(cx, obj, slot);
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_SETGVAR:
-            slot = GET_VARNO(pc);
-            JS_ASSERT(slot < fp->nvars);
-            rval = FETCH_OPND(-1);
-            lval = fp->vars[slot];
-            obj = fp->varobj;
-            if (JSVAL_IS_NULL(lval)) {
-                /*
-                 * Inline-clone and specialize JSOP_SETNAME code here because
-                 * JSOP_SETGVAR has arity 1: [rval], not arity 2: [obj, rval]
-                 * as JSOP_SETNAME does, where [obj] is due to JSOP_BINDNAME.
-                 */
-                atom = GET_ATOM(cx, script, pc);
-                id = ATOM_TO_JSID(atom);
-                SAVE_SP(fp);
-                CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
-                if (!ok)
-                    goto out;
-                STORE_OPND(-1, rval);
-            } else {
-                slot = JSVAL_TO_INT(lval);
-                GC_POKE(cx, obj->slots[slot]);
-                OBJ_SET_SLOT(cx, obj, slot, rval);
-            }
-            obj = NULL;
-            break;
-
-          case JSOP_DEFCONST:
-          case JSOP_DEFVAR:
-            atomIndex = GET_ATOM_INDEX(pc);
-
-          do_JSOP_DEFCONST:
-          do_JSOP_DEFVAR:
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            obj = fp->varobj;
-            attrs = JSPROP_ENUMERATE;
-            if (!(fp->flags & JSFRAME_EVAL))
-                attrs |= JSPROP_PERMANENT;
-            if (op == JSOP_DEFCONST)
-                attrs |= JSPROP_READONLY;
-
-            /* Lookup id in order to check for redeclaration problems. */
-            id = ATOM_TO_JSID(atom);
-            SAVE_SP(fp);
-            ok = js_CheckRedeclaration(cx, obj, id, attrs, &obj2, &prop);
-            if (!ok)
-                goto out;
-
-            /* Bind a variable only if it's not yet defined. */
-            if (!prop) {
-                ok = OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID, NULL, NULL,
-                                         attrs, &prop);
-                if (!ok)
-                    goto out;
-                JS_ASSERT(prop);
-                obj2 = obj;
-            }
-
-            /*
-             * Try to optimize a property we either just created, or found
-             * directly in the global object, that is permanent, has a slot,
-             * and has stub getter and setter, into a "fast global" accessed
-             * by the JSOP_*GVAR opcodes.
-             */
-            if (atomIndex < script->numGlobalVars &&
-                (attrs & JSPROP_PERMANENT) &&
-                obj2 == obj &&
-                OBJ_IS_NATIVE(obj)) {
-                sprop = (JSScopeProperty *) prop;
-                if (SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) &&
-                    SPROP_HAS_STUB_GETTER(sprop) &&
-                    SPROP_HAS_STUB_SETTER(sprop)) {
-                    /*
-                     * Fast globals use fp->vars to map the global name's
-                     * atomIndex to the permanent fp->varobj slot number,
-                     * tagged as a jsval.  The atomIndex for the global's
-                     * name literal is identical to its fp->vars index.
-                     */
-                    fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
-                }
-            }
-
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-            break;
-
-          BEGIN_LITOPX_CASE(JSOP_DEFFUN, 0)
-          {
-            uintN flags;
-
-            atomIndex = GET_ATOM_INDEX(pc);
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            obj = ATOM_TO_OBJECT(atom);
-            fun = (JSFunction *) JS_GetPrivate(cx, obj);
-            id = ATOM_TO_JSID(fun->atom);
-
-            /*
-             * We must be at top-level (either outermost block that forms a
-             * function's body, or a global) scope, not inside an expression
-             * (JSOP_{ANON,NAMED}FUNOBJ) or compound statement (JSOP_CLOSURE)
-             * in the same compilation unit (ECMA Program).
-             *
-             * However, we could be in a Program being eval'd from inside a
-             * with statement, so we need to distinguish scope chain head from
-             * variables object.  Hence the obj2 vs. parent distinction below.
-             * First we make sure the function object we're defining has the
-             * right scope chain.  Then we define its name in fp->varobj.
-             *
-             * If static link is not current scope, clone fun's object to link
-             * to the current scope via parent.  This clause exists to enable
-             * sharing of compiled functions among multiple equivalent scopes,
-             * splitting the cost of compilation evenly among the scopes and
-             * amortizing it over a number of executions.  Examples include XUL
-             * scripts and event handlers shared among Mozilla chrome windows,
-             * and server-side JS user-defined functions shared among requests.
-             *
-             * NB: The Script object exposes compile and exec in the language,
-             * such that this clause introduces an incompatible change from old
-             * JS versions that supported Script.  Such a JS version supported
-             * executing a script that defined and called functions scoped by
-             * the compile-time static link, not by the exec-time scope chain.
-             *
-             * We sacrifice compatibility, breaking such scripts, in order to
-             * promote compile-cost sharing and amortizing, and because Script
-             * is not and will not be standardized.
-             */
-            obj2 = fp->scopeChain;
-            if (OBJ_GET_PARENT(cx, obj) != obj2) {
-                obj = js_CloneFunctionObject(cx, obj, obj2);
-                if (!obj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-            }
-
-            /*
-             * Protect obj from any GC hiding below OBJ_DEFINE_PROPERTY.  All
-             * paths from here must flow through the "Restore fp->scopeChain"
-             * code below the OBJ_DEFINE_PROPERTY call.
-             */
-            fp->scopeChain = obj;
-            rval = OBJECT_TO_JSVAL(obj);
-
-            /*
-             * ECMA requires functions defined when entering Global code to be
-             * permanent, and functions defined when entering Eval code to be
-             * impermanent.
-             */
-            attrs = JSPROP_ENUMERATE;
-            if (!(fp->flags & JSFRAME_EVAL))
-                attrs |= JSPROP_PERMANENT;
-
-            /*
-             * Load function flags that are also property attributes.  Getters
-             * and setters do not need a slot, their value is stored elsewhere
-             * in the property itself, not in obj->slots.
-             */
-            flags = fun->flags & (JSFUN_GETTER | JSFUN_SETTER);
-            if (flags) {
-                attrs |= flags | JSPROP_SHARED;
-                rval = JSVAL_VOID;
-            }
-
-            /*
-             * Check for a const property of the same name -- or any kind
-             * of property if executing with the strict option.  We check
-             * here at runtime as well as at compile-time, to handle eval
-             * as well as multiple HTML script tags.
-             */
-            parent = fp->varobj;
-            SAVE_SP(fp);
-            ok = js_CheckRedeclaration(cx, parent, id, attrs, NULL, NULL);
-            if (ok) {
-                ok = OBJ_DEFINE_PROPERTY(cx, parent, id, rval,
-                                         (flags & JSFUN_GETTER)
-                                         ? (JSPropertyOp) obj
-                                         : NULL,
-                                         (flags & JSFUN_SETTER)
-                                         ? (JSPropertyOp) obj
-                                         : NULL,
-                                         attrs,
-                                         &prop);
-            }
-
-            /* Restore fp->scopeChain now that obj is defined in fp->varobj. */
-            fp->scopeChain = obj2;
-            if (!ok)
-                goto out;
-
-#if 0
-            if (attrs == (JSPROP_ENUMERATE | JSPROP_PERMANENT) &&
-                script->numGlobalVars) {
-                /*
-                 * As with JSOP_DEFVAR and JSOP_DEFCONST (above), fast globals
-                 * use fp->vars to map the global function name's atomIndex to
-                 * its permanent fp->varobj slot number, tagged as a jsval.
-                 */
-                sprop = (JSScopeProperty *) prop;
-                fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
-            }
-#endif
-            OBJ_DROP_PROPERTY(cx, parent, prop);
-          }
-          END_LITOPX_CASE
-
-#if JS_HAS_LEXICAL_CLOSURE
-          BEGIN_LITOPX_CASE(JSOP_DEFLOCALFUN, VARNO_LEN)
-            /*
-             * Define a local function (i.e., one nested at the top level of
-             * another function), parented by the current scope chain, and
-             * stored in a local variable slot that the compiler allocated.
-             * This is an optimization over JSOP_DEFFUN that avoids requiring
-             * a call object for the outer function's activation.
-             */
-            slot = GET_VARNO(pc);
-            atom = js_GetAtom(cx, &script->atomMap, atomIndex);
-            obj = ATOM_TO_OBJECT(atom);
-            fun = (JSFunction *) JS_GetPrivate(cx, obj);
-
-            parent = fp->scopeChain;
-            if (OBJ_GET_PARENT(cx, obj) != parent) {
-                SAVE_SP(fp);
-                obj = js_CloneFunctionObject(cx, obj, parent);
-                if (!obj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-            }
-            fp->vars[slot] = OBJECT_TO_JSVAL(obj);
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_ANONFUNOBJ, 0)
-            /* Push the specified function object literal. */
-            obj = ATOM_TO_OBJECT(atom);
-
-            /* If re-parenting, push a clone of the function object. */
-            parent = fp->scopeChain;
-            if (OBJ_GET_PARENT(cx, obj) != parent) {
-                SAVE_SP(fp);
-                obj = js_CloneFunctionObject(cx, obj, parent);
-                if (!obj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            obj = NULL;
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_NAMEDFUNOBJ, 0)
-            /* ECMA ed. 3 FunctionExpression: function Identifier [etc.]. */
-            rval = ATOM_KEY(atom);
-            JS_ASSERT(JSVAL_IS_FUNCTION(cx, rval));
-
-            /*
-             * 1. Create a new object as if by the expression new Object().
-             * 2. Add Result(1) to the front of the scope chain.
-             *
-             * Step 2 is achieved by making the new object's parent be the
-             * current scope chain, and then making the new object the parent
-             * of the Function object clone.
-             */
-            SAVE_SP(fp);
-            obj2 = fp->scopeChain;
-            parent = js_ConstructObject(cx, &js_ObjectClass, NULL, obj2,
-                                        0, NULL);
-            if (!parent) {
-                ok = JS_FALSE;
-                goto out;
-            }
-
-            /*
-             * 3. Create a new Function object as specified in section 13.2
-             * with [parameters and body specified by the function expression
-             * that was parsed by the compiler into a Function object, and
-             * saved in the script's atom map].
-             *
-             * Protect parent from GC after js_CloneFunctionObject calls into
-             * js_NewObject, which displaces the newborn object root in cx by
-             * allocating the clone, then runs a last-ditch GC while trying
-             * to allocate the clone's slots vector.  Another, multi-threaded
-             * path: js_CloneFunctionObject => js_NewObject => OBJ_GET_CLASS
-             * which may suspend the current request in ClaimScope, with the
-             * newborn displaced as in the first scenario.
-             */
-            fp->scopeChain = parent;
-            obj = js_CloneFunctionObject(cx, JSVAL_TO_OBJECT(rval), parent);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-
-            /*
-             * Protect obj from any GC hiding below OBJ_DEFINE_PROPERTY.  All
-             * paths from here must flow through the "Restore fp->scopeChain"
-             * code below the OBJ_DEFINE_PROPERTY call.
-             */
-            fp->scopeChain = obj;
-            rval = OBJECT_TO_JSVAL(obj);
-
-            /*
-             * 4. Create a property in the object Result(1).  The property's
-             * name is [fun->atom, the identifier parsed by the compiler],
-             * value is Result(3), and attributes are { DontDelete, ReadOnly }.
-             */
-            fun = (JSFunction *) JS_GetPrivate(cx, obj);
-            attrs = fun->flags & (JSFUN_GETTER | JSFUN_SETTER);
-            if (attrs) {
-                attrs |= JSPROP_SHARED;
-                rval = JSVAL_VOID;
-            }
-            ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval,
-                                     (attrs & JSFUN_GETTER)
-                                     ? (JSPropertyOp) obj
-                                     : NULL,
-                                     (attrs & JSFUN_SETTER)
-                                     ? (JSPropertyOp) obj
-                                     : NULL,
-                                     attrs |
-                                     JSPROP_ENUMERATE | JSPROP_PERMANENT |
-                                     JSPROP_READONLY,
-                                     NULL);
-
-            /* Restore fp->scopeChain now that obj is defined in parent. */
-            fp->scopeChain = obj2;
-            if (!ok) {
-                cx->newborn[GCX_OBJECT] = NULL;
-                goto out;
-            }
-
-            /*
-             * 5. Remove Result(1) from the front of the scope chain [no-op].
-             * 6. Return Result(3).
-             */
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            obj = NULL;
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_CLOSURE, 0)
-            /*
-             * ECMA ed. 3 extension: a named function expression in a compound
-             * statement (not at the top statement level of global code, or at
-             * the top level of a function body).
-             *
-             * Get immediate operand atom, which is a function object literal.
-             * From it, get the function to close.
-             */
-            JS_ASSERT(JSVAL_IS_FUNCTION(cx, ATOM_KEY(atom)));
-            obj = ATOM_TO_OBJECT(atom);
-
-            /*
-             * Clone the function object with the current scope chain as the
-             * clone's parent.  The original function object is the prototype
-             * of the clone.  Do this only if re-parenting; the compiler may
-             * have seen the right parent already and created a sufficiently
-             * well-scoped function object.
-             */
-            SAVE_SP(fp);
-            obj2 = fp->scopeChain;
-            if (OBJ_GET_PARENT(cx, obj) != obj2) {
-                obj = js_CloneFunctionObject(cx, obj, obj2);
-                if (!obj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-            }
-
-            /*
-             * Protect obj from any GC hiding below OBJ_DEFINE_PROPERTY.  All
-             * paths from here must flow through the "Restore fp->scopeChain"
-             * code below the OBJ_DEFINE_PROPERTY call.
-             */
-            fp->scopeChain = obj;
-            rval = OBJECT_TO_JSVAL(obj);
-
-            /*
-             * Make a property in fp->varobj with id fun->atom and value obj,
-             * unless fun is a getter or setter (in which case, obj is cast to
-             * a JSPropertyOp and passed accordingly).
-             */
-            fun = (JSFunction *) JS_GetPrivate(cx, obj);
-            attrs = fun->flags & (JSFUN_GETTER | JSFUN_SETTER);
-            if (attrs) {
-                attrs |= JSPROP_SHARED;
-                rval = JSVAL_VOID;
-            }
-            parent = fp->varobj;
-            ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval,
-                                     (attrs & JSFUN_GETTER)
-                                     ? (JSPropertyOp) obj
-                                     : NULL,
-                                     (attrs & JSFUN_SETTER)
-                                     ? (JSPropertyOp) obj
-                                     : NULL,
-                                     attrs | JSPROP_ENUMERATE
-                                           | JSPROP_PERMANENT,
-                                     &prop);
-
-            /* Restore fp->scopeChain now that obj is defined in fp->varobj. */
-            fp->scopeChain = obj2;
-            if (!ok) {
-                cx->newborn[GCX_OBJECT] = NULL;
-                goto out;
-            }
-
-#if 0
-            if (attrs == 0 && script->numGlobalVars) {
-                /*
-                 * As with JSOP_DEFVAR and JSOP_DEFCONST (above), fast globals
-                 * use fp->vars to map the global function name's atomIndex to
-                 * its permanent fp->varobj slot number, tagged as a jsval.
-                 */
-                sprop = (JSScopeProperty *) prop;
-                fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
-            }
-#endif
-            OBJ_DROP_PROPERTY(cx, parent, prop);
-          END_LITOPX_CASE
-#endif /* JS_HAS_LEXICAL_CLOSURE */
-
-#if JS_HAS_GETTER_SETTER
-          case JSOP_GETTER:
-          case JSOP_SETTER:
-            JS_ASSERT(len == 1);
-            op2 = (JSOp) *++pc;
-            cs = &js_CodeSpec[op2];
-            len = cs->length;
-            switch (op2) {
-              case JSOP_SETNAME:
-              case JSOP_SETPROP:
-                atom = GET_ATOM(cx, script, pc);
-                id   = ATOM_TO_JSID(atom);
-                rval = FETCH_OPND(-1);
-                i = -1;
-                goto gs_pop_lval;
-
-              case JSOP_SETELEM:
-                rval = FETCH_OPND(-1);
-                FETCH_ELEMENT_ID(-2, id);
-                i = -2;
-              gs_pop_lval:
-                FETCH_OBJECT(cx, i - 1, lval, obj);
-                break;
-
-#if JS_HAS_INITIALIZERS
-              case JSOP_INITPROP:
-                JS_ASSERT(sp - fp->spbase >= 2);
-                rval = FETCH_OPND(-1);
-                i = -1;
-                atom = GET_ATOM(cx, script, pc);
-                id   = ATOM_TO_JSID(atom);
-                goto gs_get_lval;
-
-              case JSOP_INITELEM:
-                JS_ASSERT(sp - fp->spbase >= 3);
-                rval = FETCH_OPND(-1);
-                FETCH_ELEMENT_ID(-2, id);
-                i = -2;
-              gs_get_lval:
-                lval = FETCH_OPND(i-1);
-                JS_ASSERT(JSVAL_IS_OBJECT(lval));
-                obj = JSVAL_TO_OBJECT(lval);
-                break;
-#endif /* JS_HAS_INITIALIZERS */
-
-              default:
-                JS_ASSERT(0);
-            }
-
-            /* Ensure that id has a type suitable for use with obj. */
-            CHECK_ELEMENT_ID(obj, id);
-
-            if (JS_TypeOfValue(cx, rval) != JSTYPE_FUNCTION) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_GETTER_OR_SETTER,
-                                     (op == JSOP_GETTER)
-                                     ? js_getter_str
-                                     : js_setter_str);
-                ok = JS_FALSE;
-                goto out;
-            }
-
-            /*
-             * Getters and setters are just like watchpoints from an access
-             * control point of view.
-             */
-            SAVE_SP(fp);
-            ok = OBJ_CHECK_ACCESS(cx, obj, id, JSACC_WATCH, &rtmp, &attrs);
-            if (!ok)
-                goto out;
-
-            if (op == JSOP_GETTER) {
-                getter = (JSPropertyOp) JSVAL_TO_OBJECT(rval);
-                setter = NULL;
-                attrs = JSPROP_GETTER;
-            } else {
-                getter = NULL;
-                setter = (JSPropertyOp) JSVAL_TO_OBJECT(rval);
-                attrs = JSPROP_SETTER;
-            }
-            attrs |= JSPROP_ENUMERATE | JSPROP_SHARED;
-
-            /* Check for a readonly or permanent property of the same name. */
-            ok = js_CheckRedeclaration(cx, obj, id, attrs, NULL, NULL);
-            if (!ok)
-                goto out;
-
-            ok = OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID, getter, setter,
-                                     attrs, NULL);
-            if (!ok)
-                goto out;
-
-            obj = NULL;
-            sp += i;
-            if (cs->ndefs)
-                STORE_OPND(-1, rval);
-            break;
-#endif /* JS_HAS_GETTER_SETTER */
-
-#if JS_HAS_INITIALIZERS
-          case JSOP_NEWINIT:
-            argc = 0;
-            fp->sharpDepth++;
-            goto do_new;
-
-          case JSOP_ENDINIT:
-            if (--fp->sharpDepth == 0)
-                fp->sharpArray = NULL;
-
-            /* Re-set the newborn root to the top of this object tree. */
-            JS_ASSERT(sp - fp->spbase >= 1);
-            lval = FETCH_OPND(-1);
-            JS_ASSERT(JSVAL_IS_OBJECT(lval));
-            cx->newborn[GCX_OBJECT] = JSVAL_TO_GCTHING(lval);
-            break;
-
-          case JSOP_INITPROP:
-            /* Pop the property's value into rval. */
-            JS_ASSERT(sp - fp->spbase >= 2);
-            rval = FETCH_OPND(-1);
-
-            /* Get the immediate property name into id. */
-            atom = GET_ATOM(cx, script, pc);
-            id   = ATOM_TO_JSID(atom);
-            i = -1;
-            goto do_init;
-
-          case JSOP_INITELEM:
-            /* Pop the element's value into rval. */
-            JS_ASSERT(sp - fp->spbase >= 3);
-            rval = FETCH_OPND(-1);
-
-            /* Pop and conditionally atomize the element id. */
-            FETCH_ELEMENT_ID(-2, id);
-            i = -2;
-
-          do_init:
-            /* Find the object being initialized at top of stack. */
-            lval = FETCH_OPND(i-1);
-            JS_ASSERT(JSVAL_IS_OBJECT(lval));
-            obj = JSVAL_TO_OBJECT(lval);
-
-            /* Ensure that id has a type suitable for use with obj. */
-            CHECK_ELEMENT_ID(obj, id);
-
-            /* Set the property named by obj[id] to rval. */
-            SAVE_SP(fp);
-            ok = OBJ_SET_PROPERTY(cx, obj, id, &rval);
-            if (!ok)
-                goto out;
-            sp += i;
-            break;
-
-#if JS_HAS_SHARP_VARS
-          case JSOP_DEFSHARP:
-            SAVE_SP(fp);
-            obj = fp->sharpArray;
-            if (!obj) {
-                obj = js_NewArrayObject(cx, 0, NULL);
-                if (!obj) {
-                    ok = JS_FALSE;
-                    goto out;
-                }
-                fp->sharpArray = obj;
-            }
-            i = (jsint) GET_ATOM_INDEX(pc);
-            id = INT_TO_JSID(i);
-            rval = FETCH_OPND(-1);
-            if (JSVAL_IS_PRIMITIVE(rval)) {
-                char numBuf[12];
-                JS_snprintf(numBuf, sizeof numBuf, "%u", (unsigned) i);
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_SHARP_DEF, numBuf);
-                ok = JS_FALSE;
-                goto out;
-            }
-            ok = OBJ_SET_PROPERTY(cx, obj, id, &rval);
-            if (!ok)
-                goto out;
-            break;
-
-          case JSOP_USESHARP:
-            i = (jsint) GET_ATOM_INDEX(pc);
-            id = INT_TO_JSID(i);
-            obj = fp->sharpArray;
-            if (!obj) {
-                rval = JSVAL_VOID;
-            } else {
-                SAVE_SP(fp);
-                ok = OBJ_GET_PROPERTY(cx, obj, id, &rval);
-                if (!ok)
-                    goto out;
-            }
-            if (!JSVAL_IS_OBJECT(rval)) {
-                char numBuf[12];
-                JS_snprintf(numBuf, sizeof numBuf, "%u", (unsigned) i);
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_SHARP_USE, numBuf);
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(rval);
-            break;
-#endif /* JS_HAS_SHARP_VARS */
-#endif /* JS_HAS_INITIALIZERS */
-
-#if JS_HAS_EXCEPTIONS
-          /* No-ops for ease of decompilation and jit'ing. */
-          case JSOP_TRY:
-          case JSOP_FINALLY:
-            break;
-
-          /* Reset the stack to the given depth. */
-          case JSOP_SETSP:
-            i = (jsint) GET_ATOM_INDEX(pc);
-            JS_ASSERT(i >= 0);
-            sp = fp->spbase + i;
-
-            obj = fp->scopeChain;
-            while (OBJ_GET_CLASS(cx, obj) == &js_WithClass &&
-                   JSVAL_TO_INT(OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE)) > i) {
-                obj = OBJ_GET_PARENT(cx, obj);
-            }
-            fp->scopeChain = obj;
-            break;
-
-          case JSOP_GOSUB:
-            i = PTRDIFF(pc, script->main, jsbytecode) + len;
-            len = GET_JUMP_OFFSET(pc);
-            PUSH(INT_TO_JSVAL(i));
-            break;
-
-          case JSOP_GOSUBX:
-            i = PTRDIFF(pc, script->main, jsbytecode) + len;
-            len = GET_JUMPX_OFFSET(pc);
-            PUSH(INT_TO_JSVAL(i));
-            break;
-
-          case JSOP_RETSUB:
-            rval = POP();
-            JS_ASSERT(JSVAL_IS_INT(rval));
-            i = JSVAL_TO_INT(rval);
-            pc = script->main + i;
-            len = 0;
-            break;
-
-          case JSOP_EXCEPTION:
-            PUSH(cx->exception);
-            cx->throwing = JS_FALSE;
-            break;
-
-          case JSOP_THROW:
-            cx->throwing = JS_TRUE;
-            cx->exception = POP_OPND();
-            ok = JS_FALSE;
-            /* let the code at out try to catch the exception. */
-            goto out;
-
-          BEGIN_LITOPX_CASE(JSOP_INITCATCHVAR, 0)
-            /* Load the value into rval, while keeping it live on stack. */
-            JS_ASSERT(sp - fp->spbase >= 2);
-            rval = FETCH_OPND(-1);
-
-            /* Get the immediate catch variable name into id. */
-            id   = ATOM_TO_JSID(atom);
-
-            /* Find the object being initialized at top of stack. */
-            lval = FETCH_OPND(-2);
-            JS_ASSERT(JSVAL_IS_OBJECT(lval));
-            obj = JSVAL_TO_OBJECT(lval);
-
-            /* Define obj[id] to contain rval and to be permanent. */
-            SAVE_SP(fp);
-            ok = OBJ_DEFINE_PROPERTY(cx, obj, id, rval, NULL, NULL,
-                                     JSPROP_PERMANENT, NULL);
-            if (!ok)
-                goto out;
-
-            /* Now that we're done with rval, pop it. */
-            sp--;
-          END_LITOPX_CASE
-#endif /* JS_HAS_EXCEPTIONS */
-
-#if JS_HAS_INSTANCEOF
-          case JSOP_INSTANCEOF:
-            rval = FETCH_OPND(-1);
-            if (JSVAL_IS_PRIMITIVE(rval) ||
-                !(obj = JSVAL_TO_OBJECT(rval))->map->ops->hasInstance) {
-                SAVE_SP(fp);
-                str = js_DecompileValueGenerator(cx, -1, rval, NULL);
-                if (str) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_BAD_INSTANCEOF_RHS,
-                                         JS_GetStringBytes(str));
-                }
-                ok = JS_FALSE;
-                goto out;
-            }
-            lval = FETCH_OPND(-2);
-            cond = JS_FALSE;
-            SAVE_SP(fp);
-            ok = obj->map->ops->hasInstance(cx, obj, lval, &cond);
-            if (!ok)
-                goto out;
-            sp--;
-            STORE_OPND(-1, BOOLEAN_TO_JSVAL(cond));
-            break;
-#endif /* JS_HAS_INSTANCEOF */
-
-#if JS_HAS_DEBUGGER_KEYWORD
-          case JSOP_DEBUGGER:
-          {
-            JSTrapHandler handler = rt->debuggerHandler;
-            if (handler) {
-                SAVE_SP(fp);
-                switch (handler(cx, script, pc, &rval,
-                                rt->debuggerHandlerData)) {
-                  case JSTRAP_ERROR:
-                    ok = JS_FALSE;
-                    goto out;
-                  case JSTRAP_CONTINUE:
-                    break;
-                  case JSTRAP_RETURN:
-                    fp->rval = rval;
-                    goto out;
-#if JS_HAS_EXCEPTIONS
-                  case JSTRAP_THROW:
-                    cx->throwing = JS_TRUE;
-                    cx->exception = rval;
-                    ok = JS_FALSE;
-                    goto out;
-#endif /* JS_HAS_EXCEPTIONS */
-                  default:;
-                }
-                LOAD_INTERRUPT_HANDLER(rt);
-            }
-            break;
-          }
-#endif /* JS_HAS_DEBUGGER_KEYWORD */
-
-#if JS_HAS_XML_SUPPORT
-          case JSOP_DEFXMLNS:
-            rval = POP();
-            SAVE_SP(fp);
-            ok = js_SetDefaultXMLNamespace(cx, rval);
-            if (!ok)
-                goto out;
-            break;
-
-          case JSOP_ANYNAME:
-            SAVE_SP(fp);
-            ok = js_GetAnyName(cx, &rval);
-            if (!ok)
-                goto out;
-            PUSH_OPND(rval);
-            break;
-
-          BEGIN_LITOPX_CASE(JSOP_QNAMEPART, 0)
-            PUSH_OPND(ATOM_KEY(atom));
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_QNAMECONST, 0)
-            rval = ATOM_KEY(atom);
-            lval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            obj = js_ConstructXMLQNameObject(cx, lval, rval);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-          END_LITOPX_CASE
-
-          case JSOP_QNAME:
-            rval = FETCH_OPND(-1);
-            lval = FETCH_OPND(-2);
-            SAVE_SP(fp);
-            obj = js_ConstructXMLQNameObject(cx, lval, rval);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            sp--;
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-            break;
-
-          case JSOP_TOATTRNAME:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = js_ToAttributeName(cx, &rval);
-            if (!ok)
-                goto out;
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_TOATTRVAL:
-            rval = FETCH_OPND(-1);
-            JS_ASSERT(JSVAL_IS_STRING(rval));
-            SAVE_SP(fp);
-            str = js_EscapeAttributeValue(cx, JSVAL_TO_STRING(rval));
-            if (!str) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, STRING_TO_JSVAL(str));
-            break;
-
-          case JSOP_ADDATTRNAME:
-          case JSOP_ADDATTRVAL:
-            rval = FETCH_OPND(-1);
-            lval = FETCH_OPND(-2);
-            str = JSVAL_TO_STRING(lval);
-            str2 = JSVAL_TO_STRING(rval);
-            SAVE_SP(fp);
-            str = js_AddAttributePart(cx, op == JSOP_ADDATTRNAME, str, str2);
-            if (!str) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            sp--;
-            STORE_OPND(-1, STRING_TO_JSVAL(str));
-            break;
-
-          case JSOP_BINDXMLNAME:
-            lval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = js_FindXMLProperty(cx, lval, &obj, &rval);
-            if (!ok)
-                goto out;
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_SETXMLNAME:
-            obj = JSVAL_TO_OBJECT(FETCH_OPND(-3));
-            lval = FETCH_OPND(-2);
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = js_SetXMLProperty(cx, obj, lval, &rval);
-            if (!ok)
-                goto out;
-            sp -= 2;
-            STORE_OPND(-1, rval);
-            obj = NULL;
-            break;
-
-          case JSOP_XMLNAME:
-            lval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = js_FindXMLProperty(cx, lval, &obj, &rval);
-            if (!ok)
-                goto out;
-            ok = js_GetXMLProperty(cx, obj, rval, &rval);
-            if (!ok)
-                goto out;
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_DESCENDANTS:
-          case JSOP_DELDESC:
-            FETCH_OBJECT(cx, -2, lval, obj);
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            ok = js_GetXMLDescendants(cx, obj, rval, &rval);
-            if (!ok)
-                goto out;
-
-            if (op == JSOP_DELDESC) {
-                sp[-1] = rval;          /* set local root */
-                ok = js_DeleteXMLListElements(cx, JSVAL_TO_OBJECT(rval));
-                if (!ok)
-                    goto out;
-                rval = JSVAL_TRUE;      /* always succeed */
-            }
-
-            sp--;
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_FILTER:
-            FETCH_OBJECT(cx, -1, lval, obj);
-            len = GET_JUMP_OFFSET(pc);
-            SAVE_SP(fp);
-            ok = js_FilterXMLList(cx, obj, pc + cs->length, &rval);
-            if (!ok)
-                goto out;
-            JS_ASSERT(fp->sp == sp);
-            STORE_OPND(-1, rval);
-            break;
-
-          case JSOP_ENDFILTER:
-            *result = POP_OPND();
-            goto out;
-
-	  case JSOP_STARTXML:
-	  case JSOP_STARTXMLEXPR:
-	    break;
-
-          case JSOP_TOXML:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            obj = js_ValueToXMLObject(cx, rval);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-            break;
-
-          case JSOP_TOXMLLIST:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            obj = js_ValueToXMLListObject(cx, rval);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-            break;
-
-          case JSOP_XMLTAGEXPR:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            str = js_ValueToString(cx, rval);
-            if (!str) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, STRING_TO_JSVAL(str));
-            break;
-
-          case JSOP_XMLELTEXPR:
-            rval = FETCH_OPND(-1);
-            SAVE_SP(fp);
-            if (VALUE_IS_XML(cx, rval)) {
-                str = js_ValueToXMLString(cx, rval);
-            } else {
-                str = js_ValueToString(cx, rval);
-                if (str)
-                    str = js_EscapeElementValue(cx, str);
-            }
-            if (!str) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, STRING_TO_JSVAL(str));
-            break;
-
-          BEGIN_LITOPX_CASE(JSOP_XMLOBJECT, 0)
-            SAVE_SP(fp);
-            obj = js_CloneXMLObject(cx, ATOM_TO_OBJECT(atom));
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-            obj = NULL;
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_XMLCDATA, 0)
-            str = ATOM_TO_STRING(atom);
-            obj = js_NewXMLSpecialObject(cx, JSXML_CLASS_TEXT, NULL, str);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_XMLCOMMENT, 0)
-            str = ATOM_TO_STRING(atom);
-            obj = js_NewXMLSpecialObject(cx, JSXML_CLASS_COMMENT, NULL, str);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            PUSH_OPND(OBJECT_TO_JSVAL(obj));
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_XMLPI, 0)
-            str = ATOM_TO_STRING(atom);
-            rval = FETCH_OPND(-1);
-            str2 = JSVAL_TO_STRING(rval);
-            SAVE_SP(fp);
-            obj = js_NewXMLSpecialObject(cx,
-                                         JSXML_CLASS_PROCESSING_INSTRUCTION,
-                                         str, str2);
-            if (!obj) {
-                ok = JS_FALSE;
-                goto out;
-            }
-            STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_GETMETHOD, 0)
-            /* Get an immediate atom naming the property. */
-            id   = ATOM_TO_JSID(atom);
-            FETCH_OBJECT(cx, -1, lval, obj);
-            SAVE_SP(fp);
-
-            /* Special-case XML object method lookup, per ECMA-357. */
-            if (OBJECT_IS_XML(cx, obj)) {
-                JSXMLObjectOps *ops;
-
-                ops = (JSXMLObjectOps *) obj->map->ops;
-                obj = ops->getMethod(cx, obj, id, &rval);
-                if (!obj)
-                    ok = JS_FALSE;
-            } else {
-                CACHED_GET(OBJ_GET_PROPERTY(cx, obj, id, &rval));
-            }
-            if (!ok)
-                goto out;
-            STORE_OPND(-1, rval);
-          END_LITOPX_CASE
-
-          BEGIN_LITOPX_CASE(JSOP_SETMETHOD, 0)
-            /* Get an immediate atom naming the property. */
-            id   = ATOM_TO_JSID(atom);
-            rval = FETCH_OPND(-1);
-            FETCH_OBJECT(cx, -2, lval, obj);
-            SAVE_SP(fp);
-
-            /* Special-case XML object method lookup, per ECMA-357. */
-            if (OBJECT_IS_XML(cx, obj)) {
-                JSXMLObjectOps *ops;
-
-                ops = (JSXMLObjectOps *) obj->map->ops;
-                ok = ops->setMethod(cx, obj, id, &rval);
-            } else {
-                CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
-            }
-            if (!ok)
-                goto out;
-            --sp;
-            STORE_OPND(-1, rval);
-            obj = NULL;
-          END_LITOPX_CASE
-
-          case JSOP_GETFUNNS:
-            ok = js_GetFunctionNamespace(cx, &rval);
-            if (!ok)
-                goto out;
-            PUSH_OPND(rval);
-            break;
-
-          case JSOP_FOREACH:
-            foreach = JS_TRUE;
-            break;
-#endif /* JS_HAS_XML_SUPPORT */
-
-          default: {
-            char numBuf[12];
-            JS_snprintf(numBuf, sizeof numBuf, "%d", op);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_BYTECODE, numBuf);
-            ok = JS_FALSE;
-            goto out;
-          }
-        }
-
-    advance_pc:
-        pc += len;
-
-#ifdef DEBUG
-        if (tracefp) {
-            intN ndefs, n;
-            jsval *siter;
-
-            ndefs = cs->ndefs;
-            if (ndefs) {
-                SAVE_SP(fp);
-                if (op == JSOP_FORELEM && sp[-1] == JSVAL_FALSE)
-                    --ndefs;
-                for (n = -ndefs; n < 0; n++) {
-                    str = js_DecompileValueGenerator(cx, n, sp[n], NULL);
-                    if (str) {
-                        fprintf(tracefp, "%s %s",
-                                (n == -ndefs) ? "  output:" : ",",
-                                JS_GetStringBytes(str));
-                    }
-                }
-                fprintf(tracefp, " @ %d\n", sp - fp->spbase);
-            }
-            fprintf(tracefp, "  stack: ");
-            for (siter = fp->spbase; siter < sp; siter++) {
-                str = js_ValueToSource(cx, *siter);
-                fprintf(tracefp, "%s ",
-                        str ? JS_GetStringBytes(str) : "<null>");
-            }
-            fputc('\n', tracefp);
-        }
-#endif
-    }
-out:
-
-#if JS_HAS_EXCEPTIONS
-    if (!ok) {
-        /*
-         * Has an exception been raised?  Also insist that we are in the
-         * interpreter activation that pushed fp's operand stack, to avoid
-         * catching exceptions within XML filtering predicate expressions,
-         * such as the one from tests/e4x/Regress/regress-301596.js:
-         *
-         *    try {
-         *        <xml/>.(@a == 1);
-         *        throw 5;
-         *    } catch (e) {
-         *    }
-         *
-         * The inner interpreter activation executing the predicate bytecode
-         * will throw "reference to undefined XML name @a" (or 5, in older
-         * versions that followed the first edition of ECMA-357 and evaluated
-         * unbound identifiers to undefined), and the exception must not be
-         * caught until control unwinds to the outer interpreter activation.
-         *
-         * Otherwise, the wrong stack depth will be restored by JSOP_SETSP,
-         * and the catch will move into the filtering predicate expression,
-         * leading to double catch execution if it rethrows.
-         *
-         * XXX This assumes the null mark case implies XML filtering predicate
-         * expression execution!
-         * FIXME: https://bugzilla.mozilla.org/show_bug.cgi?id=309894
-         */
-        if (cx->throwing && JS_LIKELY(mark != NULL)) {
-            /*
-             * Call debugger throw hook if set (XXX thread safety?).
-             */
-            JSTrapHandler handler = rt->throwHook;
-            if (handler) {
-                SAVE_SP(fp);
-                switch (handler(cx, script, pc, &rval, rt->throwHookData)) {
-                  case JSTRAP_ERROR:
-                    cx->throwing = JS_FALSE;
-                    goto no_catch;
-                  case JSTRAP_RETURN:
-                    ok = JS_TRUE;
-                    cx->throwing = JS_FALSE;
-                    fp->rval = rval;
-                    goto no_catch;
-                  case JSTRAP_THROW:
-                    cx->exception = rval;
-                  case JSTRAP_CONTINUE:
-                  default:;
-                }
-                LOAD_INTERRUPT_HANDLER(rt);
-            }
-
-            /*
-             * Look for a try block in script that can catch this exception.
-             */
-            SCRIPT_FIND_CATCH_START(script, pc, pc);
-            if (pc) {
-                /* Don't clear cx->throwing to save cx->exception from GC. */
-                len = 0;
-                ok = JS_TRUE;
-#if JS_HAS_XML_SUPPORT
-                foreach = JS_FALSE;
-#endif
-                goto advance_pc;
-            }
-        }
-no_catch:;
-    }
-#endif
-
-    /*
-     * Check whether control fell off the end of a lightweight function, or an
-     * exception thrown under such a function was not caught by it.  If so, go
-     * to the inline code under JSOP_RETURN.
-     */
-    if (inlineCallCount) {
-#if JS_HAS_XML_SUPPORT
-        foreach = JS_FALSE;
-#endif
-        goto inline_return;
-    }
-
-    /*
-     * Reset sp before freeing stack slots, because our caller may GC soon.
-     * Clear spbase to indicate that we've popped the 2 * depth operand slots.
-     * Restore the previous frame's execution state.
-     */
-    if (JS_LIKELY(mark != NULL)) {
-        fp->sp = fp->spbase;
-        fp->spbase = NULL;
-        js_FreeRawStack(cx, mark);
-    } else {
-        SAVE_SP(fp);
-    }
-
-out2:
-    if (cx->version == currentVersion && currentVersion != originalVersion)
-        js_SetVersion(cx, originalVersion);
-    cx->interpLevel--;
-    return ok;
-
-atom_not_defined:
-    {
-        const char *printable = js_AtomToPrintableString(cx, atom);
-        if (printable)
-            js_ReportIsNotDefined(cx, printable);
-        ok = JS_FALSE;
-#ifdef OSSP /* CLEANUP */
-        sp = NULL;
-#endif
-        goto out;
-    }
-}
diff --git a/libs/js/src/jsinterp.h b/libs/js/src/jsinterp.h
deleted file mode 100644
index edf70f86f3..0000000000
--- a/libs/js/src/jsinterp.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsinterp_h___
-#define jsinterp_h___
-/*
- * JS interpreter interface.
- */
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * JS stack frame, allocated on the C stack.
- */
-struct JSStackFrame {
-    JSObject        *callobj;       /* lazily created Call object */
-    JSObject        *argsobj;       /* lazily created arguments object */
-    JSObject        *varobj;        /* variables object, where vars go */
-    JSScript        *script;        /* script being interpreted */
-    JSFunction      *fun;           /* function being called or null */
-    JSObject        *thisp;         /* "this" pointer if in method */
-    uintN           argc;           /* actual argument count */
-    jsval           *argv;          /* base of argument stack slots */
-    jsval           rval;           /* function return value */
-    uintN           nvars;          /* local variable count */
-    jsval           *vars;          /* base of variable stack slots */
-    JSStackFrame    *down;          /* previous frame */
-    void            *annotation;    /* used by Java security */
-    JSObject        *scopeChain;    /* scope chain */
-    jsbytecode      *pc;            /* program counter */
-    jsval           *sp;            /* stack pointer */
-    jsval           *spbase;        /* operand stack base */
-    uintN           sharpDepth;     /* array/object initializer depth */
-    JSObject        *sharpArray;    /* scope for #n= initializer vars */
-    uint32          flags;          /* frame flags -- see below */
-    JSStackFrame    *dormantNext;   /* next dormant frame chain */
-    JSObject        *xmlNamespace;  /* null or default xml namespace in E4X */
-};
-
-typedef struct JSInlineFrame {
-    JSStackFrame    frame;          /* base struct */
-    void            *mark;          /* mark before inline frame */
-    void            *hookData;      /* debugger call hook data */
-    JSVersion       callerVersion;  /* dynamic version of calling script */
-} JSInlineFrame;
-
-/* JS stack frame flags. */
-#define JSFRAME_CONSTRUCTING  0x01  /* frame is for a constructor invocation */
-#define JSFRAME_INTERNAL      0x02  /* internal call, not invoked by a script */
-#define JSFRAME_SKIP_CALLER   0x04  /* skip one link when evaluating f.caller
-                                       for this invocation of f */
-#define JSFRAME_ASSIGNING     0x08  /* a complex (not simplex JOF_ASSIGNING) op
-                                       is currently assigning to a property */
-#define JSFRAME_DEBUGGER      0x10  /* frame for JS_EvaluateInStackFrame */
-#define JSFRAME_EVAL          0x20  /* frame for obj_eval */
-#define JSFRAME_SPECIAL       0x30  /* special evaluation frame flags */
-#define JSFRAME_COMPILING     0x40  /* frame is being used by compiler */
-#define JSFRAME_COMPILE_N_GO  0x80  /* compiler-and-go mode, can optimize name
-                                       references based on scope chain */
-#define JSFRAME_SCRIPT_OBJECT 0x100 /* compiling source for a Script object */
-
-#define JSFRAME_OVERRIDE_SHIFT 24   /* override bit-set params; see jsfun.c */
-#define JSFRAME_OVERRIDE_BITS  8
-
-/*
- * Property cache for quickened get/set property opcodes.
- */
-#define PROPERTY_CACHE_LOG2     10
-#define PROPERTY_CACHE_SIZE     JS_BIT(PROPERTY_CACHE_LOG2)
-#define PROPERTY_CACHE_MASK     JS_BITMASK(PROPERTY_CACHE_LOG2)
-
-#define PROPERTY_CACHE_HASH(obj, id) \
-    ((((jsuword)(obj) >> JSVAL_TAGBITS) ^ (jsuword)(id)) & PROPERTY_CACHE_MASK)
-
-#ifdef JS_THREADSAFE
-
-#if HAVE_ATOMIC_DWORD_ACCESS
-
-#define PCE_LOAD(cache, pce, entry)     JS_ATOMIC_DWORD_LOAD(pce, entry)
-#define PCE_STORE(cache, pce, entry)    JS_ATOMIC_DWORD_STORE(pce, entry)
-
-#else  /* !HAVE_ATOMIC_DWORD_ACCESS */
-
-#define JS_PROPERTY_CACHE_METERING      1
-
-#define PCE_LOAD(cache, pce, entry)                                           \
-    JS_BEGIN_MACRO                                                            \
-        uint32 prefills_;                                                     \
-        uint32 fills_ = (cache)->fills;                                       \
-        do {                                                                  \
-            /* Load until cache->fills is stable (see FILL macro below). */   \
-            prefills_ = fills_;                                               \
-            (entry) = *(pce);                                                 \
-        } while ((fills_ = (cache)->fills) != prefills_);                     \
-    JS_END_MACRO
-
-#define PCE_STORE(cache, pce, entry)                                          \
-    JS_BEGIN_MACRO                                                            \
-        do {                                                                  \
-            /* Store until no racing collider stores half or all of pce. */   \
-            *(pce) = (entry);                                                 \
-        } while (PCE_OBJECT(*pce) != PCE_OBJECT(entry) ||                     \
-                 PCE_PROPERTY(*pce) != PCE_PROPERTY(entry));                  \
-    JS_END_MACRO
-
-#endif /* !HAVE_ATOMIC_DWORD_ACCESS */
-
-#else  /* !JS_THREADSAFE */
-
-#define PCE_LOAD(cache, pce, entry)     ((entry) = *(pce))
-#define PCE_STORE(cache, pce, entry)    (*(pce) = (entry))
-
-#endif /* !JS_THREADSAFE */
-
-typedef union JSPropertyCacheEntry {
-    struct {
-        JSObject        *object;        /* weak link to object */
-        JSScopeProperty *property;      /* weak link to property */
-    } s;
-#ifdef HAVE_ATOMIC_DWORD_ACCESS
-    prdword align;
-#endif
-} JSPropertyCacheEntry;
-
-/* These may be called in lvalue or rvalue position. */
-#define PCE_OBJECT(entry)       ((entry).s.object)
-#define PCE_PROPERTY(entry)     ((entry).s.property)
-
-typedef struct JSPropertyCache {
-    JSPropertyCacheEntry table[PROPERTY_CACHE_SIZE];
-    JSBool               empty;
-    JSBool               disabled;
-#ifdef JS_PROPERTY_CACHE_METERING
-    uint32               fills;
-    uint32               recycles;
-    uint32               tests;
-    uint32               misses;
-    uint32               flushes;
-# define PCMETER(x)      x
-#else
-# define PCMETER(x)      /* nothing */
-#endif
-} JSPropertyCache;
-
-#define PROPERTY_CACHE_FILL(cache, obj, id, sprop)                            \
-    JS_BEGIN_MACRO                                                            \
-        JSPropertyCache *cache_ = (cache);                                    \
-        if (!cache_->disabled) {                                              \
-            uintN hashIndex_ = (uintN) PROPERTY_CACHE_HASH(obj, id);          \
-            JSPropertyCacheEntry *pce_ = &cache_->table[hashIndex_];          \
-            JSPropertyCacheEntry entry_;                                      \
-            JSScopeProperty *pce_sprop_;                                      \
-            PCE_LOAD(cache_, pce_, entry_);                                   \
-            pce_sprop_ = PCE_PROPERTY(entry_);                                \
-            PCMETER(if (pce_sprop_ && pce_sprop_ != sprop)                    \
-                        cache_->recycles++);                                  \
-            PCE_OBJECT(entry_) = obj;                                         \
-            PCE_PROPERTY(entry_) = sprop;                                     \
-            cache_->empty = JS_FALSE;                                         \
-            PCMETER(cache_->fills++);                                         \
-            PCE_STORE(cache_, pce_, entry_);                                  \
-        }                                                                     \
-    JS_END_MACRO
-
-#define PROPERTY_CACHE_TEST(cache, obj, id, sprop)                            \
-    JS_BEGIN_MACRO                                                            \
-        uintN hashIndex_ = (uintN) PROPERTY_CACHE_HASH(obj, id);              \
-        JSPropertyCache *cache_ = (cache);                                    \
-        JSPropertyCacheEntry *pce_ = &cache_->table[hashIndex_];              \
-        JSPropertyCacheEntry entry_;                                          \
-        JSScopeProperty *pce_sprop_;                                          \
-        PCE_LOAD(cache_, pce_, entry_);                                       \
-        pce_sprop_ = PCE_PROPERTY(entry_);                                    \
-        PCMETER(cache_->tests++);                                             \
-        if (pce_sprop_ &&                                                     \
-            PCE_OBJECT(entry_) == obj &&                                      \
-            pce_sprop_->id == id) {                                           \
-            sprop = pce_sprop_;                                               \
-        } else {                                                              \
-            PCMETER(cache_->misses++);                                        \
-            sprop = NULL;                                                     \
-        }                                                                     \
-    JS_END_MACRO
-
-extern void
-js_FlushPropertyCache(JSContext *cx);
-
-extern void
-js_DisablePropertyCache(JSContext *cx);
-
-extern void
-js_EnablePropertyCache(JSContext *cx);
-
-extern JS_FRIEND_API(jsval *)
-js_AllocStack(JSContext *cx, uintN nslots, void **markp);
-
-extern JS_FRIEND_API(void)
-js_FreeStack(JSContext *cx, void *mark);
-
-extern JSBool
-js_GetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_SetArgument(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_GetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_SetLocalVariable(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-#ifdef DUMP_CALL_TABLE
-# define JSOPTION_LOGCALL_TOSOURCE JS_BIT(15)
-
-extern JSHashTable  *js_CallTable;
-extern size_t       js_LogCallToSourceLimit;
-
-extern void         js_DumpCallTable(JSContext *cx);
-#endif
-
-/*
- * Compute the 'this' parameter and store it in frame as frame.thisp.
- * Activation objects ("Call" objects not created with "new Call()", i.e.,
- * "Call" objects that have private data) may not be referred to by 'this',
- * as dictated by ECMA.
- *
- * N.B.: fp->argv must be set, fp->argv[-1] the nominal 'this' paramter as
- * a jsval, and fp->argv[-2] must be the callee object reference, usually a
- * function object.  Also, fp->flags must contain JSFRAME_CONSTRUCTING if we
- * are preparing for a constructor call.
- */
-extern JSBool
-js_ComputeThis(JSContext *cx, JSObject *thisp, JSStackFrame *fp);
-
-/*
- * NB: js_Invoke requires that cx is currently running JS (i.e., that cx->fp
- * is non-null), and that the callee, |this| parameter, and actual arguments
- * are already pushed on the stack under cx->fp->sp.
- */
-extern JS_FRIEND_API(JSBool)
-js_Invoke(JSContext *cx, uintN argc, uintN flags);
-
-/*
- * Consolidated js_Invoke flags simply rename the low JSFRAME_* flags.
- */
-#define JSINVOKE_CONSTRUCT      JSFRAME_CONSTRUCTING
-#define JSINVOKE_INTERNAL       JSFRAME_INTERNAL
-#define JSINVOKE_SKIP_CALLER    JSFRAME_SKIP_CALLER
-
-/*
- * "Internal" calls may come from C or C++ code using a JSContext on which no
- * JS is running (!cx->fp), so they may need to push a dummy JSStackFrame.
- */
-#define js_InternalCall(cx,obj,fval,argc,argv,rval)                           \
-    js_InternalInvoke(cx, obj, fval, 0, argc, argv, rval)
-
-#define js_InternalConstruct(cx,obj,fval,argc,argv,rval)                      \
-    js_InternalInvoke(cx, obj, fval, JSINVOKE_CONSTRUCT, argc, argv, rval)
-
-extern JSBool
-js_InternalInvoke(JSContext *cx, JSObject *obj, jsval fval, uintN flags,
-                  uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool
-js_InternalGetOrSet(JSContext *cx, JSObject *obj, jsid id, jsval fval,
-                    JSAccessMode mode, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool
-js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
-           JSStackFrame *down, uintN flags, jsval *result);
-
-extern JSBool
-js_CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs,
-                      JSObject **objp, JSProperty **propp);
-
-extern JSBool
-js_StrictlyEqual(jsval lval, jsval rval);
-
-extern JSBool
-js_Interpret(JSContext *cx, jsbytecode *pc, jsval *result);
-
-JS_END_EXTERN_C
-
-#endif /* jsinterp_h___ */
diff --git a/libs/js/src/jslibmath.h b/libs/js/src/jslibmath.h
deleted file mode 100644
index c42d9e5e26..0000000000
--- a/libs/js/src/jslibmath.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   IBM Corp.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * By default all math calls go to fdlibm.  The defines for each platform
- * remap the math calls to native routines.
- */
-
-#ifndef _LIBMATH_H
-#define _LIBMATH_H
-
-#include <math.h>
-#include "jsconfig.h"
-
-/*
- * Define which platforms on which to use fdlibm.  Not used
- * by default since there can be problems with endian-ness and such.
- */
-
-#if defined(_WIN32) && !defined(__MWERKS__)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(SUNOS4)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(IRIX)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(SOLARIS)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(HPUX)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(linux)
-#define JS_USE_FDLIBM_MATH 1
-
-#elif defined(OSF1)
-/* Want to use some fdlibm functions but fdlibm broken on OSF1/alpha. */
-#define JS_USE_FDLIBM_MATH 0
-
-#elif defined(AIX)
-#define JS_USE_FDLIBM_MATH 1
-
-#else
-#define JS_USE_FDLIBM_MATH 0
-#endif
-
-#ifdef OSSP
-#undef JS_USE_FDLIBM_MATH
-#if defined(__FreeBSD__)
-#define JS_USE_FDLIBM_MATH 0
-#else
-#define JS_USE_FDLIBM_MATH 1
-#endif
-#endif
-
-#if !JS_USE_FDLIBM_MATH
-
-/*
- * Use system provided math routines.
- */
-
-#define fd_acos acos
-#define fd_asin asin
-#define fd_atan atan
-#define fd_atan2 atan2
-#define fd_ceil ceil
-#define fd_copysign copysign
-#define fd_cos cos
-#define fd_exp exp
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-#define fd_log log
-#define fd_pow pow
-#define fd_sin sin
-#define fd_sqrt sqrt
-#define fd_tan tan
-
-#else
-
-#ifdef OSSP
-#define fd_acos     js_fd_acos
-#define fd_asin     js_fd_asin
-#define fd_atan     js_fd_atan
-#define fd_atan2    js_fd_atan2
-#define fd_ceil     js_fd_ceil
-#define fd_copysign js_fd_copysign
-#define fd_cos      js_fd_cos
-#define fd_exp      js_fd_exp
-#define fd_fabs     js_fd_fabs
-#define fd_floor    js_fd_floor
-#define fd_fmod     js_fd_fmod
-#define fd_log      js_fd_log
-#define fd_pow      js_fd_pow
-#define fd_sin      js_fd_sin
-#define fd_sqrt     js_fd_sqrt
-#define fd_tan      js_fd_tan
-#endif
-
-/*
- * Use math routines in fdlibm.
- */
-
-#undef __P
-#ifdef __STDC__
-#define __P(p)  p
-#else
-#define __P(p)  ()
-#endif
-
-#if !defined(OSSP) && ((defined _WIN32 && !defined WINCE) || defined SUNOS4)
-
-#define fd_acos acos
-#define fd_asin asin
-#define fd_atan atan
-#define fd_cos cos
-#define fd_sin sin
-#define fd_tan tan
-#define fd_exp exp
-#define fd_log log
-#define fd_sqrt sqrt
-#define fd_ceil ceil
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-
-extern double fd_atan2 __P((double, double));
-extern double fd_copysign __P((double, double));
-extern double fd_pow __P((double, double));
-
-#elif !defined(OSSP) && defined IRIX
-
-#define fd_acos acos
-#define fd_asin asin
-#define fd_atan atan
-#define fd_exp exp
-#define fd_log log
-#define fd_log10 log10
-#define fd_sqrt sqrt
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-
-extern double fd_cos __P((double));
-extern double fd_sin __P((double));
-extern double fd_tan __P((double));
-extern double fd_atan2 __P((double, double));
-extern double fd_pow __P((double, double));
-extern double fd_ceil __P((double));
-extern double fd_copysign __P((double, double));
-
-#elif !defined(OSSP) && defined SOLARIS
-
-#define fd_atan atan
-#define fd_cos cos
-#define fd_sin sin
-#define fd_tan tan
-#define fd_exp exp
-#define fd_sqrt sqrt
-#define fd_ceil ceil
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-
-extern double fd_acos __P((double));
-extern double fd_asin __P((double));
-extern double fd_log __P((double));
-extern double fd_atan2 __P((double, double));
-extern double fd_pow __P((double, double));
-extern double fd_copysign __P((double, double));
-
-#elif !defined(OSSP) && defined HPUX
-
-#define fd_cos cos
-#define fd_sin sin
-#define fd_exp exp
-#define fd_sqrt sqrt
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-
-extern double fd_ceil __P((double));
-extern double fd_acos __P((double));
-extern double fd_log __P((double));
-extern double fd_atan2 __P((double, double));
-extern double fd_tan __P((double));
-extern double fd_pow __P((double, double));
-extern double fd_asin __P((double));
-extern double fd_atan __P((double));
-extern double fd_copysign __P((double, double));
-
-#elif !defined(OSSP) && defined(linux)
-
-#define fd_atan atan
-#define fd_atan2 atan2
-#define fd_ceil ceil
-#define fd_cos cos
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-#define fd_sin sin
-#define fd_sqrt sqrt
-#define fd_tan tan
-#define fd_copysign copysign
-
-extern double fd_asin __P((double));
-extern double fd_acos __P((double));
-extern double fd_exp __P((double));
-extern double fd_log __P((double));
-extern double fd_pow __P((double, double));
-
-#elif !defined(OSSP) && defined(OSF1)
-
-#define fd_acos acos
-#define fd_asin asin
-#define fd_atan atan
-#define fd_copysign copysign
-#define fd_cos cos
-#define fd_exp exp
-#define fd_fabs fabs
-#define fd_fmod fmod
-#define fd_sin sin
-#define fd_sqrt sqrt
-#define fd_tan tan
-
-extern double fd_atan2 __P((double, double));
-extern double fd_ceil __P((double));
-extern double fd_floor __P((double));
-extern double fd_log __P((double));
-extern double fd_pow __P((double, double));
-
-#elif !defined(OSSP) && defined(AIX)
-
-#define fd_acos acos
-#define fd_asin asin
-#define fd_atan2 atan2
-#define fd_copysign copysign
-#define fd_cos cos
-#define fd_exp exp
-#define fd_fabs fabs
-#define fd_floor floor
-#define fd_fmod fmod
-#define fd_log log
-#define fd_sin sin
-#define fd_sqrt sqrt
-
-extern double fd_atan __P((double));
-extern double fd_ceil __P((double));
-extern double fd_pow __P((double,double));
-extern double fd_tan __P((double));
-
-#else /* other platform.. generic paranoid slow fdlibm */
-
-extern double fd_acos __P((double));
-extern double fd_asin __P((double));
-extern double fd_atan __P((double));
-extern double fd_cos __P((double));
-extern double fd_sin __P((double));
-extern double fd_tan __P((double));
-
-extern double fd_exp __P((double));
-extern double fd_log __P((double));
-extern double fd_sqrt __P((double));
-
-extern double fd_ceil __P((double));
-extern double fd_fabs __P((double));
-extern double fd_floor __P((double));
-extern double fd_fmod __P((double, double));
-
-extern double fd_atan2 __P((double, double));
-extern double fd_pow __P((double, double));
-extern double fd_copysign __P((double, double));
-
-#endif
-
-#endif /* JS_USE_FDLIBM_MATH */
-
-#endif /* _LIBMATH_H */
-
diff --git a/libs/js/src/jslock.c b/libs/js/src/jslock.c
deleted file mode 100644
index 968e98b841..0000000000
--- a/libs/js/src/jslock.c
+++ /dev/null
@@ -1,1261 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef JS_THREADSAFE
-
-/*
- * JS locking stubs.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include "jspubtd.h"
-#include "prthread.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jscntxt.h"
-#include "jsdtoa.h"
-#include "jsgc.h"
-#include "jslock.h"
-#include "jsscope.h"
-#include "jsstr.h"
-
-#define ReadWord(W) (W)
-
-#ifndef NSPR_LOCK
-
-#include <memory.h>
-
-static PRLock **global_locks;
-static uint32 global_lock_count = 1;
-static uint32 global_locks_log2 = 0;
-static uint32 global_locks_mask = 0;
-
-#define GLOBAL_LOCK_INDEX(id)   (((uint32)(id) >> 2) & global_locks_mask)
-
-static void
-js_LockGlobal(void *id)
-{
-    uint32 i = GLOBAL_LOCK_INDEX(id);
-    PR_Lock(global_locks[i]);
-}
-
-static void
-js_UnlockGlobal(void *id)
-{
-    uint32 i = GLOBAL_LOCK_INDEX(id);
-    PR_Unlock(global_locks[i]);
-}
-
-/* Exclude Alpha NT. */
-#if defined(_WIN32) && defined(_M_IX86)
-#pragma warning( disable : 4035 )
-
-static JS_INLINE int
-js_CompareAndSwap(jsword *w, jsword ov, jsword nv)
-{
-    __asm {
-        mov eax, ov
-        mov ecx, nv
-        mov ebx, w
-        lock cmpxchg [ebx], ecx
-        sete al
-        and eax, 1h
-    }
-}
-
-#elif defined(__GNUC__) && defined(__i386__)
-
-/* Note: This fails on 386 cpus, cmpxchgl is a >= 486 instruction */
-static JS_INLINE int
-js_CompareAndSwap(jsword *w, jsword ov, jsword nv)
-{
-    unsigned int res;
-
-    __asm__ __volatile__ (
-                          "lock\n"
-                          "cmpxchgl %2, (%1)\n"
-                          "sete %%al\n"
-                          "andl $1, %%eax\n"
-                          : "=a" (res)
-                          : "r" (w), "r" (nv), "a" (ov)
-                          : "cc", "memory");
-    return (int)res;
-}
-
-#elif defined(SOLARIS) && defined(sparc) && defined(ULTRA_SPARC)
-
-static JS_INLINE int
-js_CompareAndSwap(jsword *w, jsword ov, jsword nv)
-{
-#if defined(__GNUC__)
-    unsigned int res;
-    JS_ASSERT(ov != nv);
-    asm volatile ("\
-stbar\n\
-cas [%1],%2,%3\n\
-cmp %2,%3\n\
-be,a 1f\n\
-mov 1,%0\n\
-mov 0,%0\n\
-1:"
-                  : "=r" (res)
-                  : "r" (w), "r" (ov), "r" (nv));
-    return (int)res;
-#else /* !__GNUC__ */
-    extern int compare_and_swap(jsword*, jsword, jsword);
-    JS_ASSERT(ov != nv);
-    return compare_and_swap(w, ov, nv);
-#endif
-}
-
-#elif defined(AIX)
-
-#include <sys/atomic_op.h>
-
-static JS_INLINE int
-js_CompareAndSwap(jsword *w, jsword ov, jsword nv)
-{
-    return !_check_lock((atomic_p)w, ov, nv);
-}
-
-#else
-
-#error "Define NSPR_LOCK if your platform lacks a compare-and-swap instruction."
-
-#endif /* arch-tests */
-
-#endif /* !NSPR_LOCK */
-
-jsword
-js_CurrentThreadId()
-{
-    return CurrentThreadId();
-}
-
-void
-js_InitLock(JSThinLock *tl)
-{
-#ifdef NSPR_LOCK
-    tl->owner = 0;
-    tl->fat = (JSFatLock*)JS_NEW_LOCK();
-#else
-    memset(tl, 0, sizeof(JSThinLock));
-#endif
-}
-
-void
-js_FinishLock(JSThinLock *tl)
-{
-#ifdef NSPR_LOCK
-    tl->owner = 0xdeadbeef;
-    if (tl->fat)
-        JS_DESTROY_LOCK(((JSLock*)tl->fat));
-#else
-    JS_ASSERT(tl->owner == 0);
-    JS_ASSERT(tl->fat == NULL);
-#endif
-}
-
-static void js_Dequeue(JSThinLock *);
-
-#ifdef DEBUG_SCOPE_COUNT
-
-#include <stdio.h>
-#include "jsdhash.h"
-
-static FILE *logfp;
-static JSDHashTable logtbl;
-
-typedef struct logentry {
-    JSDHashEntryStub stub;
-    char             op;
-    const char       *file;
-    int              line;
-} logentry;
-
-static void
-logit(JSScope *scope, char op, const char *file, int line)
-{
-    logentry *entry;
-
-    if (!logfp) {
-        logfp = fopen("/tmp/scope.log", "w");
-        if (!logfp)
-            return;
-        setvbuf(logfp, NULL, _IONBF, 0);
-    }
-    fprintf(logfp, "%p %c %s %d\n", scope, op, file, line);
-
-    if (!logtbl.entryStore &&
-        !JS_DHashTableInit(&logtbl, JS_DHashGetStubOps(), NULL,
-                           sizeof(logentry), 100)) {
-        return;
-    }
-    entry = (logentry *) JS_DHashTableOperate(&logtbl, scope, JS_DHASH_ADD);
-    if (!entry)
-        return;
-    entry->stub.key = scope;
-    entry->op = op;
-    entry->file = file;
-    entry->line = line;
-}
-
-void
-js_unlog_scope(JSScope *scope)
-{
-    if (!logtbl.entryStore)
-        return;
-    (void) JS_DHashTableOperate(&logtbl, scope, JS_DHASH_REMOVE);
-}
-
-# define LOGIT(scope,op) logit(scope, op, __FILE__, __LINE__)
-
-#else
-
-# define LOGIT(scope,op) /* nothing */
-
-#endif /* DEBUG_SCOPE_COUNT */
-
-/*
- * Return true if scope's ownercx, or the ownercx of a single-threaded scope
- * for which ownercx is waiting to become multi-threaded and shared, is cx.
- * That condition implies deadlock in ClaimScope if cx's thread were to wait
- * to share scope.
- *
- * (i) rt->gcLock held
- */
-static JSBool
-WillDeadlock(JSScope *scope, JSContext *cx)
-{
-    JSContext *ownercx;
-
-    do {
-        ownercx = scope->ownercx;
-        if (ownercx == cx) {
-            JS_RUNTIME_METER(cx->runtime, deadlocksAvoided);
-            return JS_TRUE;
-        }
-    } while (ownercx && (scope = ownercx->scopeToShare) != NULL);
-    return JS_FALSE;
-}
-
-/*
- * Make scope multi-threaded, i.e. share its ownership among contexts in rt
- * using a "thin" or (if necessary due to contention) "fat" lock.  Called only
- * from ClaimScope, immediately below, when we detect deadlock were we to wait
- * for scope's lock, because its ownercx is waiting on a scope owned by the
- * calling cx.
- *
- * (i) rt->gcLock held
- */
-static void
-ShareScope(JSRuntime *rt, JSScope *scope)
-{
-    JSScope **todop;
-
-    if (scope->u.link) {
-        for (todop = &rt->scopeSharingTodo; *todop != scope;
-             todop = &(*todop)->u.link) {
-            JS_ASSERT(*todop != NO_SCOPE_SHARING_TODO);
-        }
-        *todop = scope->u.link;
-        scope->u.link = NULL;       /* null u.link for sanity ASAP */
-        JS_NOTIFY_ALL_CONDVAR(rt->scopeSharingDone);
-    }
-    js_InitLock(&scope->lock);
-    if (scope == rt->setSlotScope) {
-        /*
-         * Nesting locks on another thread that's using scope->ownercx: give
-         * the held lock a reentrancy count of 1 and set its lock.owner field
-         * directly (no compare-and-swap needed while scope->ownercx is still
-         * non-null).  See below in ClaimScope, before the ShareScope call,
-         * for more on why this is necessary.
-         *
-         * If NSPR_LOCK is defined, we cannot deadlock holding rt->gcLock and
-         * acquiring scope->lock.fat here, against another thread holding that
-         * fat lock and trying to grab rt->gcLock.  This is because no other
-         * thread can attempt to acquire scope->lock.fat until scope->ownercx
-         * is null *and* our thread has released rt->gcLock, which interlocks
-         * scope->ownercx's transition to null against tests of that member
-         * in ClaimScope.
-         */
-        scope->lock.owner = scope->ownercx->thread;
-#ifdef NSPR_LOCK
-        JS_ACQUIRE_LOCK((JSLock*)scope->lock.fat);
-#endif
-        scope->u.count = 1;
-    } else {
-        scope->u.count = 0;
-    }
-    js_FinishSharingScope(rt, scope);
-}
-
-/*
- * js_FinishSharingScope is the tail part of ShareScope, split out to become a
- * subroutine of JS_EndRequest too.  The bulk of the work here involves making
- * mutable strings in the scope's object's slots be immutable.  We have to do
- * this because such strings will soon be available to multiple threads, so
- * their buffers can't be realloc'd any longer in js_ConcatStrings, and their
- * members can't be modified by js_ConcatStrings, js_MinimizeDependentStrings,
- * or js_UndependString.
- *
- * The last bit of work done by js_FinishSharingScope nulls scope->ownercx and
- * updates rt->sharedScopes.
- */
-#define MAKE_STRING_IMMUTABLE(rt, v, vp)                                      \
-    JS_BEGIN_MACRO                                                            \
-        JSString *str_ = JSVAL_TO_STRING(v);                                  \
-        uint8 *flagp_ = js_GetGCThingFlags(str_);                             \
-        if (*flagp_ & GCF_MUTABLE) {                                          \
-            if (JSSTRING_IS_DEPENDENT(str_) &&                                \
-                !js_UndependString(NULL, str_)) {                             \
-                JS_RUNTIME_METER(rt, badUndependStrings);                     \
-                *vp = JSVAL_VOID;                                             \
-            } else {                                                          \
-                *flagp_ &= ~GCF_MUTABLE;                                      \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-void
-js_FinishSharingScope(JSRuntime *rt, JSScope *scope)
-{
-    JSObject *obj;
-    uint32 nslots;
-    jsval v, *vp, *end;
-
-    obj = scope->object;
-    nslots = JS_MIN(obj->map->freeslot, obj->map->nslots);
-    for (vp = obj->slots, end = vp + nslots; vp < end; vp++) {
-        v = *vp;
-        if (JSVAL_IS_STRING(v))
-            MAKE_STRING_IMMUTABLE(rt, v, vp);
-    }
-
-    scope->ownercx = NULL;  /* NB: set last, after lock init */
-    JS_RUNTIME_METER(rt, sharedScopes);
-}
-
-/*
- * Given a scope with apparently non-null ownercx different from cx, try to
- * set ownercx to cx, claiming exclusive (single-threaded) ownership of scope.
- * If we claim ownership, return true.  Otherwise, we wait for ownercx to be
- * set to null (indicating that scope is multi-threaded); or if waiting would
- * deadlock, we set ownercx to null ourselves via ShareScope.  In any case,
- * once ownercx is null we return false.
- */
-static JSBool
-ClaimScope(JSScope *scope, JSContext *cx)
-{
-    JSRuntime *rt;
-    JSContext *ownercx;
-    jsrefcount saveDepth;
-    PRStatus stat;
-
-    rt = cx->runtime;
-    JS_RUNTIME_METER(rt, claimAttempts);
-    JS_LOCK_GC(rt);
-
-    /* Reload in case ownercx went away while we blocked on the lock. */
-    while ((ownercx = scope->ownercx) != NULL) {
-        /*
-         * Avoid selflock if ownercx is dead, or is not running a request, or
-         * has the same thread as cx.  Set scope->ownercx to cx so that the
-         * matching JS_UNLOCK_SCOPE or JS_UNLOCK_OBJ macro call will take the
-         * fast path around the corresponding js_UnlockScope or js_UnlockObj
-         * function call.
-         *
-         * If scope->u.link is non-null, scope has already been inserted on
-         * the rt->scopeSharingTodo list, because another thread's context
-         * already wanted to lock scope while ownercx was running a request.
-         * We can't claim any scope whose u.link is non-null at this point,
-         * even if ownercx->requestDepth is 0 (see below where we suspend our
-         * request before waiting on rt->scopeSharingDone).
-         */
-        if (!scope->u.link &&
-            (!js_ValidContextPointer(rt, ownercx) ||
-             !ownercx->requestDepth ||
-             ownercx->thread == cx->thread)) {
-            JS_ASSERT(scope->u.count == 0);
-            scope->ownercx = cx;
-            JS_UNLOCK_GC(rt);
-            JS_RUNTIME_METER(rt, claimedScopes);
-            return JS_TRUE;
-        }
-
-        /*
-         * Avoid deadlock if scope's owner context is waiting on a scope that
-         * we own, by revoking scope's ownership.  This approach to deadlock
-         * avoidance works because the engine never nests scope locks, except
-         * for the notable case of js_SetProtoOrParent (see jsobj.c).
-         *
-         * If cx could hold locks on ownercx->scopeToShare, or if ownercx
-         * could hold locks on scope, we would need to keep reentrancy counts
-         * for all such "flyweight" (ownercx != NULL) locks, so that control
-         * would unwind properly once these locks became "thin" or "fat".
-         * Apart from the js_SetProtoOrParent exception, the engine promotes
-         * a scope from exclusive to shared access only when locking, never
-         * when holding or unlocking.
-         *
-         * If ownercx's thread is calling js_SetProtoOrParent, trying to lock
-         * the inner scope (the scope of the object being set as the prototype
-         * of the outer object), ShareScope will find the outer object's scope
-         * at rt->setSlotScope.  If it's the same as scope, we give it a lock
-         * held by ownercx's thread with reentrancy count of 1, then we return
-         * here and break.  After that we unwind to js_[GS]etSlotThreadSafe or
-         * js_LockScope (our caller), where we wait on the newly-fattened lock
-         * until ownercx's thread unwinds from js_SetProtoOrParent.
-         *
-         * Avoid deadlock before any of this scope/context cycle detection if
-         * cx is on the active GC's thread, because in that case, no requests
-         * will run until the GC completes.  Any scope wanted by the GC (from
-         * a finalizer) that can't be claimed must be slated for sharing.
-         */
-        if (rt->gcThread == cx->thread ||
-            (ownercx->scopeToShare &&
-             WillDeadlock(ownercx->scopeToShare, cx))) {
-            ShareScope(rt, scope);
-            break;
-        }
-
-        /*
-         * Thanks to the non-zero NO_SCOPE_SHARING_TODO link terminator, we
-         * can decide whether scope is on rt->scopeSharingTodo with a single
-         * non-null test, and avoid double-insertion bugs.
-         */
-        if (!scope->u.link) {
-            scope->u.link = rt->scopeSharingTodo;
-            rt->scopeSharingTodo = scope;
-            js_HoldObjectMap(cx, &scope->map);
-        }
-
-        /*
-         * Inline JS_SuspendRequest before we wait on rt->scopeSharingDone,
-         * saving and clearing cx->requestDepth so we don't deadlock if the
-         * GC needs to run on ownercx.
-         *
-         * Unlike JS_SuspendRequest and JS_EndRequest, we must take care not
-         * to decrement rt->requestCount if cx is active on the GC's thread,
-         * because the GC has already reduced rt->requestCount to exclude all
-         * such such contexts.
-         */
-        saveDepth = cx->requestDepth;
-        if (saveDepth) {
-            cx->requestDepth = 0;
-            if (rt->gcThread != cx->thread) {
-                JS_ASSERT(rt->requestCount > 0);
-                rt->requestCount--;
-                if (rt->requestCount == 0)
-                    JS_NOTIFY_REQUEST_DONE(rt);
-            }
-        }
-
-        /*
-         * We know that some other thread's context owns scope, which is now
-         * linked onto rt->scopeSharingTodo, awaiting the end of that other
-         * thread's request.  So it is safe to wait on rt->scopeSharingDone.
-         */
-        cx->scopeToShare = scope;
-        stat = PR_WaitCondVar(rt->scopeSharingDone, PR_INTERVAL_NO_TIMEOUT);
-        JS_ASSERT(stat != PR_FAILURE);
-
-        /*
-         * Inline JS_ResumeRequest after waiting on rt->scopeSharingDone,
-         * restoring cx->requestDepth.  Same note as above for the inlined,
-         * specialized JS_SuspendRequest code: beware rt->gcThread.
-         */
-        if (saveDepth) {
-            if (rt->gcThread != cx->thread) {
-                while (rt->gcLevel > 0)
-                    JS_AWAIT_GC_DONE(rt);
-                rt->requestCount++;
-            }
-            cx->requestDepth = saveDepth;
-        }
-
-        /*
-         * Don't clear cx->scopeToShare until after we're through waiting on
-         * all condition variables protected by rt->gcLock -- that includes
-         * rt->scopeSharingDone *and* rt->gcDone (hidden in JS_AWAIT_GC_DONE,
-         * in the inlined JS_ResumeRequest code immediately above).
-         *
-         * Otherwise, the GC could easily deadlock with another thread that
-         * owns a scope wanted by a finalizer.  By keeping cx->scopeToShare
-         * set till here, we ensure that such deadlocks are detected, which
-         * results in the finalized object's scope being shared (it must, of
-         * course, have other, live objects sharing it).
-         */
-        cx->scopeToShare = NULL;
-    }
-
-    JS_UNLOCK_GC(rt);
-    return JS_FALSE;
-}
-
-/* Exported to js.c, which calls it via OBJ_GET_* and JSVAL_IS_* macros. */
-JS_FRIEND_API(jsval)
-js_GetSlotThreadSafe(JSContext *cx, JSObject *obj, uint32 slot)
-{
-    jsval v;
-    JSScope *scope;
-#ifndef NSPR_LOCK
-    JSThinLock *tl;
-    jsword me;
-#endif
-
-    /*
-     * We handle non-native objects via JSObjectOps.getRequiredSlot, treating
-     * all slots starting from 0 as required slots.  A property definition or
-     * some prior arrangement must have allocated slot.
-     *
-     * Note once again (see jspubtd.h, before JSGetRequiredSlotOp's typedef)
-     * the crucial distinction between a |required slot number| that's passed
-     * to the get/setRequiredSlot JSObjectOps, and a |reserved slot index|
-     * passed to the JS_Get/SetReservedSlot APIs.
-     */
-    if (!OBJ_IS_NATIVE(obj))
-        return OBJ_GET_REQUIRED_SLOT(cx, obj, slot);
-
-    /*
-     * Native object locking is inlined here to optimize the single-threaded
-     * and contention-free multi-threaded cases.
-     */
-    scope = OBJ_SCOPE(obj);
-    JS_ASSERT(scope->ownercx != cx);
-    JS_ASSERT(obj->slots && slot < obj->map->freeslot);
-
-    /*
-     * Avoid locking if called from the GC (see GC_AWARE_GET_SLOT in jsobj.h).
-     * Also avoid locking an object owning a sealed scope.  If neither of those
-     * special cases applies, try to claim scope's flyweight lock from whatever
-     * context may have had it in an earlier request.
-     */
-    if (CX_THREAD_IS_RUNNING_GC(cx) ||
-        (SCOPE_IS_SEALED(scope) && scope->object == obj) ||
-        (scope->ownercx && ClaimScope(scope, cx))) {
-        return obj->slots[slot];
-    }
-
-#ifndef NSPR_LOCK
-    tl = &scope->lock;
-    me = cx->thread;
-    JS_ASSERT(me == CurrentThreadId());
-    if (js_CompareAndSwap(&tl->owner, 0, me)) {
-        /*
-         * Got the lock with one compare-and-swap.  Even so, someone else may
-         * have mutated obj so it now has its own scope and lock, which would
-         * require either a restart from the top of this routine, or a thin
-         * lock release followed by fat lock acquisition.
-         */
-        if (scope == OBJ_SCOPE(obj)) {
-            v = obj->slots[slot];
-            if (!js_CompareAndSwap(&tl->owner, me, 0)) {
-                /* Assert that scope locks never revert to flyweight. */
-                JS_ASSERT(scope->ownercx != cx);
-                LOGIT(scope, '1');
-                scope->u.count = 1;
-                js_UnlockObj(cx, obj);
-            }
-            return v;
-        }
-        if (!js_CompareAndSwap(&tl->owner, me, 0))
-            js_Dequeue(tl);
-    }
-    else if (Thin_RemoveWait(ReadWord(tl->owner)) == me) {
-        return obj->slots[slot];
-    }
-#endif
-
-    js_LockObj(cx, obj);
-    v = obj->slots[slot];
-
-    /*
-     * Test whether cx took ownership of obj's scope during js_LockObj.
-     *
-     * This does not mean that a given scope reverted to flyweight from "thin"
-     * or "fat" -- it does mean that obj's map pointer changed due to another
-     * thread setting a property, requiring obj to cease sharing a prototype
-     * object's scope (whose lock was not flyweight, else we wouldn't be here
-     * in the first place!).
-     */
-    scope = OBJ_SCOPE(obj);
-    if (scope->ownercx != cx)
-        js_UnlockScope(cx, scope);
-    return v;
-}
-
-void
-js_SetSlotThreadSafe(JSContext *cx, JSObject *obj, uint32 slot, jsval v)
-{
-    JSScope *scope;
-#ifndef NSPR_LOCK
-    JSThinLock *tl;
-    jsword me;
-#endif
-
-    /* Any string stored in a thread-safe object must be immutable. */
-    if (JSVAL_IS_STRING(v))
-        MAKE_STRING_IMMUTABLE(cx->runtime, v, &v);
-
-    /*
-     * We handle non-native objects via JSObjectOps.setRequiredSlot, as above
-     * for the Get case.
-     */
-    if (!OBJ_IS_NATIVE(obj)) {
-        OBJ_SET_REQUIRED_SLOT(cx, obj, slot, v);
-        return;
-    }
-
-    /*
-     * Native object locking is inlined here to optimize the single-threaded
-     * and contention-free multi-threaded cases.
-     */
-    scope = OBJ_SCOPE(obj);
-    JS_ASSERT(scope->ownercx != cx);
-    JS_ASSERT(obj->slots && slot < obj->map->freeslot);
-
-    /*
-     * Avoid locking if called from the GC (see GC_AWARE_GET_SLOT in jsobj.h).
-     * Also avoid locking an object owning a sealed scope.  If neither of those
-     * special cases applies, try to claim scope's flyweight lock from whatever
-     * context may have had it in an earlier request.
-     */
-    if (CX_THREAD_IS_RUNNING_GC(cx) ||
-        (SCOPE_IS_SEALED(scope) && scope->object == obj) ||
-        (scope->ownercx && ClaimScope(scope, cx))) {
-        obj->slots[slot] = v;
-        return;
-    }
-
-#ifndef NSPR_LOCK
-    tl = &scope->lock;
-    me = cx->thread;
-    JS_ASSERT(me == CurrentThreadId());
-    if (js_CompareAndSwap(&tl->owner, 0, me)) {
-        if (scope == OBJ_SCOPE(obj)) {
-            obj->slots[slot] = v;
-            if (!js_CompareAndSwap(&tl->owner, me, 0)) {
-                /* Assert that scope locks never revert to flyweight. */
-                JS_ASSERT(scope->ownercx != cx);
-                LOGIT(scope, '1');
-                scope->u.count = 1;
-                js_UnlockObj(cx, obj);
-            }
-            return;
-        }
-        if (!js_CompareAndSwap(&tl->owner, me, 0))
-            js_Dequeue(tl);
-    }
-    else if (Thin_RemoveWait(ReadWord(tl->owner)) == me) {
-        obj->slots[slot] = v;
-        return;
-    }
-#endif
-
-    js_LockObj(cx, obj);
-    obj->slots[slot] = v;
-
-    /*
-     * Same drill as above, in js_GetSlotThreadSafe.  Note that we cannot
-     * assume obj has its own mutable scope (where scope->object == obj) yet,
-     * because OBJ_SET_SLOT is called for the "universal", common slots such
-     * as JSSLOT_PROTO and JSSLOT_PARENT, without a prior js_GetMutableScope.
-     * See also the JSPROP_SHARED attribute and its usage.
-     */
-    scope = OBJ_SCOPE(obj);
-    if (scope->ownercx != cx)
-        js_UnlockScope(cx, scope);
-}
-
-#ifndef NSPR_LOCK
-
-static JSFatLock *
-NewFatlock()
-{
-    JSFatLock *fl = (JSFatLock *)malloc(sizeof(JSFatLock)); /* for now */
-    if (!fl) return NULL;
-    fl->susp = 0;
-    fl->next = NULL;
-    fl->prevp = NULL;
-    fl->slock = PR_NewLock();
-    fl->svar = PR_NewCondVar(fl->slock);
-    return fl;
-}
-
-static void
-DestroyFatlock(JSFatLock *fl)
-{
-    PR_DestroyLock(fl->slock);
-    PR_DestroyCondVar(fl->svar);
-    free(fl);
-}
-
-static JSFatLock *
-ListOfFatlocks(int listc)
-{
-    JSFatLock *m;
-    JSFatLock *m0;
-    int i;
-
-    JS_ASSERT(listc>0);
-    m0 = m = NewFatlock();
-    for (i=1; i<listc; i++) {
-        m->next = NewFatlock();
-        m = m->next;
-    }
-    return m0;
-}
-
-static void
-DeleteListOfFatlocks(JSFatLock *m)
-{
-    JSFatLock *m0;
-    for (; m; m=m0) {
-        m0 = m->next;
-        DestroyFatlock(m);
-    }
-}
-
-static JSFatLockTable *fl_list_table = NULL;
-static uint32          fl_list_table_len = 0;
-static uint32          fl_list_chunk_len = 0;
-
-static JSFatLock *
-GetFatlock(void *id)
-{
-    JSFatLock *m;
-
-    uint32 i = GLOBAL_LOCK_INDEX(id);
-    if (fl_list_table[i].free == NULL) {
-#ifdef DEBUG
-        if (fl_list_table[i].taken)
-            printf("Ran out of fat locks!\n");
-#endif
-        fl_list_table[i].free = ListOfFatlocks(fl_list_chunk_len);
-    }
-    m = fl_list_table[i].free;
-    fl_list_table[i].free = m->next;
-    m->susp = 0;
-    m->next = fl_list_table[i].taken;
-    m->prevp = &fl_list_table[i].taken;
-    if (fl_list_table[i].taken)
-        fl_list_table[i].taken->prevp = &m->next;
-    fl_list_table[i].taken = m;
-    return m;
-}
-
-static void
-PutFatlock(JSFatLock *m, void *id)
-{
-    uint32 i;
-    if (m == NULL)
-        return;
-
-    /* Unlink m from fl_list_table[i].taken. */
-    *m->prevp = m->next;
-    if (m->next)
-        m->next->prevp = m->prevp;
-
-    /* Insert m in fl_list_table[i].free. */
-    i = GLOBAL_LOCK_INDEX(id);
-    m->next = fl_list_table[i].free;
-    fl_list_table[i].free = m;
-}
-
-#endif /* !NSPR_LOCK */
-
-JSBool
-js_SetupLocks(int listc, int globc)
-{
-#ifndef NSPR_LOCK
-    uint32 i;
-
-    if (global_locks)
-        return JS_TRUE;
-#ifdef DEBUG
-    if (listc > 10000 || listc < 0) /* listc == fat lock list chunk length */
-        printf("Bad number %d in js_SetupLocks()!\n", listc);
-    if (globc > 100 || globc < 0)   /* globc == number of global locks */
-        printf("Bad number %d in js_SetupLocks()!\n", listc);
-#endif
-    global_locks_log2 = JS_CeilingLog2(globc);
-    global_locks_mask = JS_BITMASK(global_locks_log2);
-    global_lock_count = JS_BIT(global_locks_log2);
-    global_locks = (PRLock **) malloc(global_lock_count * sizeof(PRLock*));
-    if (!global_locks)
-        return JS_FALSE;
-    for (i = 0; i < global_lock_count; i++) {
-        global_locks[i] = PR_NewLock();
-        if (!global_locks[i]) {
-            global_lock_count = i;
-            js_CleanupLocks();
-            return JS_FALSE;
-        }
-    }
-    fl_list_table = (JSFatLockTable *) malloc(i * sizeof(JSFatLockTable));
-    if (!fl_list_table) {
-        js_CleanupLocks();
-        return JS_FALSE;
-    }
-    fl_list_table_len = global_lock_count;
-    for (i = 0; i < global_lock_count; i++)
-        fl_list_table[i].free = fl_list_table[i].taken = NULL;
-    fl_list_chunk_len = listc;
-#endif /* !NSPR_LOCK */
-    return JS_TRUE;
-}
-
-void
-js_CleanupLocks()
-{
-#ifndef NSPR_LOCK
-    uint32 i;
-
-    if (global_locks) {
-        for (i = 0; i < global_lock_count; i++)
-            PR_DestroyLock(global_locks[i]);
-        free(global_locks);
-        global_locks = NULL;
-        global_lock_count = 1;
-        global_locks_log2 = 0;
-        global_locks_mask = 0;
-    }
-    if (fl_list_table) {
-        for (i = 0; i < fl_list_table_len; i++) {
-            DeleteListOfFatlocks(fl_list_table[i].free);
-            fl_list_table[i].free = NULL;
-            DeleteListOfFatlocks(fl_list_table[i].taken);
-            fl_list_table[i].taken = NULL;
-        }
-        free(fl_list_table);
-        fl_list_table = NULL;
-        fl_list_table_len = 0;
-    }
-#endif /* !NSPR_LOCK */
-}
-
-void
-js_InitContextForLocking(JSContext *cx)
-{
-    cx->thread = CurrentThreadId();
-    JS_ASSERT(Thin_GetWait(cx->thread) == 0);
-}
-
-#ifndef NSPR_LOCK
-
-/*
- * Fast locking and unlocking is implemented by delaying the allocation of a
- * system lock (fat lock) until contention.  As long as a locking thread A
- * runs uncontended, the lock is represented solely by storing A's identity in
- * the object being locked.
- *
- * If another thread B tries to lock the object currently locked by A, B is
- * enqueued into a fat lock structure (which might have to be allocated and
- * pointed to by the object), and suspended using NSPR conditional variables
- * (wait).  A wait bit (Bacon bit) is set in the lock word of the object,
- * signalling to A that when releasing the lock, B must be dequeued and
- * notified.
- *
- * The basic operation of the locking primitives (js_Lock, js_Unlock,
- * js_Enqueue, and js_Dequeue) is compare-and-swap.  Hence, when locking into
- * the word pointed at by p, compare-and-swap(p, 0, A) success implies that p
- * is unlocked.  Similarly, when unlocking p, if compare-and-swap(p, A, 0)
- * succeeds this implies that p is uncontended (no one is waiting because the
- * wait bit is not set).
- *
- * When dequeueing, the lock is released, and one of the threads suspended on
- * the lock is notified.  If other threads still are waiting, the wait bit is
- * kept (in js_Enqueue), and if not, the fat lock is deallocated.
- *
- * The functions js_Enqueue, js_Dequeue, js_SuspendThread, and js_ResumeThread
- * are serialized using a global lock.  For scalability, a hashtable of global
- * locks is used, which is indexed modulo the thin lock pointer.
- */
-
-/*
- * Invariants:
- * (i)  global lock is held
- * (ii) fl->susp >= 0
- */
-static int
-js_SuspendThread(JSThinLock *tl)
-{
-    JSFatLock *fl;
-    PRStatus stat;
-
-    if (tl->fat == NULL)
-        fl = tl->fat = GetFatlock(tl);
-    else
-        fl = tl->fat;
-    JS_ASSERT(fl->susp >= 0);
-    fl->susp++;
-    PR_Lock(fl->slock);
-    js_UnlockGlobal(tl);
-    stat = PR_WaitCondVar(fl->svar, PR_INTERVAL_NO_TIMEOUT);
-    JS_ASSERT(stat != PR_FAILURE);
-    PR_Unlock(fl->slock);
-    js_LockGlobal(tl);
-    fl->susp--;
-    if (fl->susp == 0) {
-        PutFatlock(fl, tl);
-        tl->fat = NULL;
-    }
-    return tl->fat == NULL;
-}
-
-/*
- * (i)  global lock is held
- * (ii) fl->susp > 0
- */
-static void
-js_ResumeThread(JSThinLock *tl)
-{
-    JSFatLock *fl = tl->fat;
-    PRStatus stat;
-
-    JS_ASSERT(fl != NULL);
-    JS_ASSERT(fl->susp > 0);
-    PR_Lock(fl->slock);
-    js_UnlockGlobal(tl);
-    stat = PR_NotifyCondVar(fl->svar);
-    JS_ASSERT(stat != PR_FAILURE);
-    PR_Unlock(fl->slock);
-}
-
-static void
-js_Enqueue(JSThinLock *tl, jsword me)
-{
-    jsword o, n;
-
-    js_LockGlobal(tl);
-    for (;;) {
-        o = ReadWord(tl->owner);
-        n = Thin_SetWait(o);
-        if (o != 0 && js_CompareAndSwap(&tl->owner, o, n)) {
-            if (js_SuspendThread(tl))
-                me = Thin_RemoveWait(me);
-            else
-                me = Thin_SetWait(me);
-        }
-        else if (js_CompareAndSwap(&tl->owner, 0, me)) {
-            js_UnlockGlobal(tl);
-            return;
-        }
-    }
-}
-
-static void
-js_Dequeue(JSThinLock *tl)
-{
-    jsword o;
-
-    js_LockGlobal(tl);
-    o = ReadWord(tl->owner);
-    JS_ASSERT(Thin_GetWait(o) != 0);
-    JS_ASSERT(tl->fat != NULL);
-    if (!js_CompareAndSwap(&tl->owner, o, 0)) /* release it */
-        JS_ASSERT(0);
-    js_ResumeThread(tl);
-}
-
-JS_INLINE void
-js_Lock(JSThinLock *tl, jsword me)
-{
-    JS_ASSERT(me == CurrentThreadId());
-    if (js_CompareAndSwap(&tl->owner, 0, me))
-        return;
-    if (Thin_RemoveWait(ReadWord(tl->owner)) != me)
-        js_Enqueue(tl, me);
-#ifdef DEBUG
-    else
-        JS_ASSERT(0);
-#endif
-}
-
-JS_INLINE void
-js_Unlock(JSThinLock *tl, jsword me)
-{
-    JS_ASSERT(me == CurrentThreadId());
-    if (js_CompareAndSwap(&tl->owner, me, 0))
-        return;
-    if (Thin_RemoveWait(ReadWord(tl->owner)) == me)
-        js_Dequeue(tl);
-#ifdef DEBUG
-    else
-        JS_ASSERT(0);
-#endif
-}
-
-#endif /* !NSPR_LOCK */
-
-void
-js_LockRuntime(JSRuntime *rt)
-{
-    PR_Lock(rt->rtLock);
-#ifdef DEBUG
-    rt->rtLockOwner = CurrentThreadId();
-#endif
-}
-
-void
-js_UnlockRuntime(JSRuntime *rt)
-{
-#ifdef DEBUG
-    rt->rtLockOwner = 0;
-#endif
-    PR_Unlock(rt->rtLock);
-}
-
-void
-js_LockScope(JSContext *cx, JSScope *scope)
-{
-    jsword me = cx->thread;
-
-    JS_ASSERT(me == CurrentThreadId());
-    JS_ASSERT(scope->ownercx != cx);
-    if (CX_THREAD_IS_RUNNING_GC(cx))
-        return;
-    if (scope->ownercx && ClaimScope(scope, cx))
-        return;
-
-    if (Thin_RemoveWait(ReadWord(scope->lock.owner)) == me) {
-        JS_ASSERT(scope->u.count > 0);
-        LOGIT(scope, '+');
-        scope->u.count++;
-    } else {
-        JSThinLock *tl = &scope->lock;
-        JS_LOCK0(tl, me);
-        JS_ASSERT(scope->u.count == 0);
-        LOGIT(scope, '1');
-        scope->u.count = 1;
-    }
-}
-
-void
-js_UnlockScope(JSContext *cx, JSScope *scope)
-{
-    jsword me = cx->thread;
-
-    /* We hope compilers use me instead of reloading cx->thread in the macro. */
-    if (CX_THREAD_IS_RUNNING_GC(cx))
-        return;
-    if (cx->lockedSealedScope == scope) {
-        cx->lockedSealedScope = NULL;
-        return;
-    }
-
-    /*
-     * If scope->ownercx is not null, it's likely that two contexts not using
-     * requests nested locks for scope.  The first context, cx here, claimed
-     * scope; the second, scope->ownercx here, re-claimed it because the first
-     * was not in a request, or was on the same thread.  We don't want to keep
-     * track of such nesting, because it penalizes the common non-nested case.
-     * Instead of asserting here and silently coping, we simply re-claim scope
-     * for cx and return.
-     *
-     * See http://bugzilla.mozilla.org/show_bug.cgi?id=229200 for a real world
-     * case where an asymmetric thread model (Mozilla's main thread is known
-     * to be the only thread that runs the GC) combined with multiple contexts
-     * per thread has led to such request-less nesting.
-     */
-    if (scope->ownercx) {
-        JS_ASSERT(scope->u.count == 0);
-        JS_ASSERT(scope->lock.owner == 0);
-        scope->ownercx = cx;
-        return;
-    }
-
-    JS_ASSERT(scope->u.count > 0);
-    if (Thin_RemoveWait(ReadWord(scope->lock.owner)) != me) {
-        JS_ASSERT(0);   /* unbalanced unlock */
-        return;
-    }
-    LOGIT(scope, '-');
-    if (--scope->u.count == 0) {
-        JSThinLock *tl = &scope->lock;
-        JS_UNLOCK0(tl, me);
-    }
-}
-
-/*
- * NB: oldscope may be null if our caller is js_GetMutableScope and it just
- * dropped the last reference to oldscope.
- */
-void
-js_TransferScopeLock(JSContext *cx, JSScope *oldscope, JSScope *newscope)
-{
-    jsword me;
-    JSThinLock *tl;
-
-    JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, newscope));
-
-    /*
-     * If the last reference to oldscope went away, newscope needs no lock
-     * state update.
-     */
-    if (!oldscope)
-        return;
-    JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, oldscope));
-
-    /*
-     * Special case in js_LockScope and js_UnlockScope for the GC calling
-     * code that locks, unlocks, or mutates.  Nothing to do in these cases,
-     * because scope and newscope were "locked" by the GC thread, so neither
-     * was actually locked.
-     */
-    if (CX_THREAD_IS_RUNNING_GC(cx))
-        return;
-
-    /*
-     * Special case in js_LockObj and js_UnlockScope for locking the sealed
-     * scope of an object that owns that scope (the prototype or mutated obj
-     * for which OBJ_SCOPE(obj)->object == obj), and unlocking it.
-     */
-    JS_ASSERT(cx->lockedSealedScope != newscope);
-    if (cx->lockedSealedScope == oldscope) {
-        JS_ASSERT(newscope->ownercx == cx ||
-                  (!newscope->ownercx && newscope->u.count == 1));
-        cx->lockedSealedScope = NULL;
-        return;
-    }
-
-    /*
-     * If oldscope is single-threaded, there's nothing to do.
-     */
-    if (oldscope->ownercx) {
-        JS_ASSERT(oldscope->ownercx == cx);
-        JS_ASSERT(newscope->ownercx == cx ||
-                  (!newscope->ownercx && newscope->u.count == 1));
-        return;
-    }
-
-    /*
-     * We transfer oldscope->u.count only if newscope is not single-threaded.
-     * Flow unwinds from here through some number of JS_UNLOCK_SCOPE and/or
-     * JS_UNLOCK_OBJ macro calls, which will decrement newscope->u.count only
-     * if they find newscope->ownercx != cx.
-     */
-    if (newscope->ownercx != cx) {
-        JS_ASSERT(!newscope->ownercx);
-        newscope->u.count = oldscope->u.count;
-    }
-
-    /*
-     * Reset oldscope's lock state so that it is completely unlocked.
-     */
-    LOGIT(oldscope, '0');
-    oldscope->u.count = 0;
-    tl = &oldscope->lock;
-    me = cx->thread;
-    JS_UNLOCK0(tl, me);
-}
-
-void
-js_LockObj(JSContext *cx, JSObject *obj)
-{
-    JSScope *scope;
-
-    JS_ASSERT(OBJ_IS_NATIVE(obj));
-    for (;;) {
-        scope = OBJ_SCOPE(obj);
-        if (SCOPE_IS_SEALED(scope) && scope->object == obj &&
-            !cx->lockedSealedScope) {
-            cx->lockedSealedScope = scope;
-            return;
-        }
-
-        js_LockScope(cx, scope);
-
-        /* If obj still has this scope, we're done. */
-        if (scope == OBJ_SCOPE(obj))
-            return;
-
-        /* Lost a race with a mutator; retry with obj's new scope. */
-        js_UnlockScope(cx, scope);
-    }
-}
-
-void
-js_UnlockObj(JSContext *cx, JSObject *obj)
-{
-    JS_ASSERT(OBJ_IS_NATIVE(obj));
-    js_UnlockScope(cx, OBJ_SCOPE(obj));
-}
-
-#ifdef DEBUG
-
-JSBool
-js_IsRuntimeLocked(JSRuntime *rt)
-{
-    return CurrentThreadId() == rt->rtLockOwner;
-}
-
-JSBool
-js_IsObjLocked(JSContext *cx, JSObject *obj)
-{
-    JSScope *scope = OBJ_SCOPE(obj);
-
-    return MAP_IS_NATIVE(&scope->map) && js_IsScopeLocked(cx, scope);
-}
-
-JSBool
-js_IsScopeLocked(JSContext *cx, JSScope *scope)
-{
-    /* Special case: the GC locking any object's scope, see js_LockScope. */
-    if (CX_THREAD_IS_RUNNING_GC(cx))
-        return JS_TRUE;
-
-    /* Special case: locked object owning a sealed scope, see js_LockObj. */
-    if (cx->lockedSealedScope == scope)
-        return JS_TRUE;
-
-    /*
-     * General case: the scope is either exclusively owned (by cx), or it has
-     * a thin or fat lock to cope with shared (concurrent) ownership.
-     */
-    if (scope->ownercx) {
-        JS_ASSERT(scope->ownercx == cx);
-        return JS_TRUE;
-    }
-    return CurrentThreadId() == Thin_RemoveWait(ReadWord(scope->lock.owner));
-}
-
-#endif /* DEBUG */
-#endif /* JS_THREADSAFE */
diff --git a/libs/js/src/jslock.h b/libs/js/src/jslock.h
deleted file mode 100644
index 0ab71927b2..0000000000
--- a/libs/js/src/jslock.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef jslock_h__
-#define jslock_h__
-
-#ifdef JS_THREADSAFE
-
-#include "jstypes.h"
-#include "pratom.h"
-#include "prlock.h"
-#include "prcvar.h"
-
-#include "jsprvtd.h"    /* for JSScope, etc. */
-#include "jspubtd.h"    /* for JSRuntime, etc. */
-
-#define Thin_GetWait(W) ((jsword)(W) & 0x1)
-#define Thin_SetWait(W) ((jsword)(W) | 0x1)
-#define Thin_RemoveWait(W) ((jsword)(W) & ~0x1)
-
-typedef struct JSFatLock JSFatLock;
-
-struct JSFatLock {
-    int         susp;
-    PRLock      *slock;
-    PRCondVar   *svar;
-    JSFatLock   *next;
-    JSFatLock   **prevp;
-};
-
-typedef struct JSThinLock {
-    jsword      owner;
-    JSFatLock   *fat;
-} JSThinLock;
-
-typedef PRLock JSLock;
-
-typedef struct JSFatLockTable {
-    JSFatLock   *free;
-    JSFatLock   *taken;
-} JSFatLockTable;
-
-/*
- * Atomic increment and decrement for a reference counter, given jsrefcount *p.
- * NB: jsrefcount is int32, aka PRInt32, so that pratom.h functions work.
- */
-#define JS_ATOMIC_INCREMENT(p)      PR_AtomicIncrement((PRInt32 *)(p))
-#define JS_ATOMIC_DECREMENT(p)      PR_AtomicDecrement((PRInt32 *)(p))
-#define JS_ATOMIC_ADD(p,v)          PR_AtomicAdd((PRInt32 *)(p), (PRInt32)(v))
-
-#define CurrentThreadId()           (jsword)PR_GetCurrentThread()
-#define JS_CurrentThreadId()        js_CurrentThreadId()
-#define JS_NEW_LOCK()               PR_NewLock()
-#define JS_DESTROY_LOCK(l)          PR_DestroyLock(l)
-#define JS_ACQUIRE_LOCK(l)          PR_Lock(l)
-#define JS_RELEASE_LOCK(l)          PR_Unlock(l)
-#define JS_LOCK0(P,M)               js_Lock(P,M)
-#define JS_UNLOCK0(P,M)             js_Unlock(P,M)
-
-#define JS_NEW_CONDVAR(l)           PR_NewCondVar(l)
-#define JS_DESTROY_CONDVAR(cv)      PR_DestroyCondVar(cv)
-#define JS_WAIT_CONDVAR(cv,to)      PR_WaitCondVar(cv,to)
-#define JS_NO_TIMEOUT               PR_INTERVAL_NO_TIMEOUT
-#define JS_NOTIFY_CONDVAR(cv)       PR_NotifyCondVar(cv)
-#define JS_NOTIFY_ALL_CONDVAR(cv)   PR_NotifyAllCondVar(cv)
-
-/*
- * Include jsscope.h so JS_LOCK_OBJ macro callers don't have to include it.
- * Since there is a JSThinLock member in JSScope, we can't nest this include
- * much earlier (see JSThinLock's typedef, above).  Yes, that means there is
- * an #include cycle between jslock.h and jsscope.h: moderate-sized XXX here,
- * to be fixed by moving JS_LOCK_SCOPE to jsscope.h, JS_LOCK_OBJ to jsobj.h,
- * and so on.
- */
-#include "jsscope.h"
-
-#define JS_LOCK_RUNTIME(rt)         js_LockRuntime(rt)
-#define JS_UNLOCK_RUNTIME(rt)       js_UnlockRuntime(rt)
-
-/*
- * NB: The JS_LOCK_OBJ and JS_UNLOCK_OBJ macros work *only* on native objects
- * (objects for which OBJ_IS_NATIVE returns true).  All uses of these macros in
- * the engine are predicated on OBJ_IS_NATIVE or equivalent checks.  These uses
- * are for optimizations above the JSObjectOps layer, under which object locks
- * normally hide.
- */
-#define JS_LOCK_OBJ(cx,obj)         ((OBJ_SCOPE(obj)->ownercx == (cx))        \
-                                     ? (void)0                                \
-                                     : (js_LockObj(cx, obj)))
-#define JS_UNLOCK_OBJ(cx,obj)       ((OBJ_SCOPE(obj)->ownercx == (cx))        \
-                                     ? (void)0 : js_UnlockObj(cx, obj))
-
-#define JS_LOCK_SCOPE(cx,scope)     ((scope)->ownercx == (cx) ? (void)0       \
-                                     : js_LockScope(cx, scope))
-#define JS_UNLOCK_SCOPE(cx,scope)   ((scope)->ownercx == (cx) ? (void)0       \
-                                     : js_UnlockScope(cx, scope))
-#define JS_TRANSFER_SCOPE_LOCK(cx, scope, newscope)                           \
-                                    js_TransferScopeLock(cx, scope, newscope)
-
-extern jsword js_CurrentThreadId();
-extern void js_LockRuntime(JSRuntime *rt);
-extern void js_UnlockRuntime(JSRuntime *rt);
-extern void js_LockObj(JSContext *cx, JSObject *obj);
-extern void js_UnlockObj(JSContext *cx, JSObject *obj);
-extern void js_LockScope(JSContext *cx, JSScope *scope);
-extern void js_UnlockScope(JSContext *cx, JSScope *scope);
-extern int js_SetupLocks(int,int);
-extern void js_CleanupLocks();
-extern void js_InitContextForLocking(JSContext *);
-extern void js_TransferScopeLock(JSContext *, JSScope *, JSScope *);
-extern JS_FRIEND_API(jsval)
-js_GetSlotThreadSafe(JSContext *, JSObject *, uint32);
-extern void js_SetSlotThreadSafe(JSContext *, JSObject *, uint32, jsval);
-extern void js_InitLock(JSThinLock *);
-extern void js_FinishLock(JSThinLock *);
-extern void js_FinishSharingScope(JSRuntime *rt, JSScope *scope);
-
-#ifdef DEBUG
-
-#define JS_IS_RUNTIME_LOCKED(rt)        js_IsRuntimeLocked(rt)
-#define JS_IS_OBJ_LOCKED(cx,obj)        js_IsObjLocked(cx,obj)
-#define JS_IS_SCOPE_LOCKED(cx,scope)    js_IsScopeLocked(cx,scope)
-
-extern JSBool js_IsRuntimeLocked(JSRuntime *rt);
-extern JSBool js_IsObjLocked(JSContext *cx, JSObject *obj);
-extern JSBool js_IsScopeLocked(JSContext *cx, JSScope *scope);
-
-#else
-
-#define JS_IS_RUNTIME_LOCKED(rt)        0
-#define JS_IS_OBJ_LOCKED(cx,obj)        1
-#define JS_IS_SCOPE_LOCKED(cx,scope)    1
-
-#endif /* DEBUG */
-
-#define JS_LOCK_OBJ_VOID(cx, obj, e)                                          \
-    JS_BEGIN_MACRO                                                            \
-        JS_LOCK_OBJ(cx, obj);                                                 \
-        e;                                                                    \
-        JS_UNLOCK_OBJ(cx, obj);                                               \
-    JS_END_MACRO
-
-#define JS_LOCK_VOID(cx, e)                                                   \
-    JS_BEGIN_MACRO                                                            \
-        JSRuntime *_rt = (cx)->runtime;                                       \
-        JS_LOCK_RUNTIME_VOID(_rt, e);                                         \
-    JS_END_MACRO
-
-#if defined(JS_USE_ONLY_NSPR_LOCKS) ||                                        \
-    !( (defined(_WIN32) && defined(_M_IX86)) ||                               \
-       (defined(__GNUC__) && defined(__i386__)) ||                            \
-       (defined(SOLARIS) && defined(sparc) && defined(ULTRA_SPARC)) ||        \
-       defined(AIX) )
-
-#define NSPR_LOCK 1
-
-#undef JS_LOCK0
-#undef JS_UNLOCK0
-#define JS_LOCK0(P,M)   (JS_ACQUIRE_LOCK(((JSLock*)(P)->fat)), (P)->owner = (M))
-#define JS_UNLOCK0(P,M) ((P)->owner = 0, JS_RELEASE_LOCK(((JSLock*)(P)->fat)))
-
-#else  /* arch-tests */
-
-#undef NSPR_LOCK
-
-extern JS_INLINE void js_Lock(JSThinLock *tl, jsword me);
-extern JS_INLINE void js_Unlock(JSThinLock *tl, jsword me);
-
-#endif /* arch-tests */
-
-#else  /* !JS_THREADSAFE */
-
-#define JS_ATOMIC_INCREMENT(p)      (++*(p))
-#define JS_ATOMIC_DECREMENT(p)      (--*(p))
-#define JS_ATOMIC_ADD(p,v)          (*(p) += (v))
-
-#define JS_CurrentThreadId() 0
-#define JS_NEW_LOCK()               NULL
-#define JS_DESTROY_LOCK(l)          ((void)0)
-#define JS_ACQUIRE_LOCK(l)          ((void)0)
-#define JS_RELEASE_LOCK(l)          ((void)0)
-#define JS_LOCK0(P,M)               ((void)0)
-#define JS_UNLOCK0(P,M)             ((void)0)
-
-#define JS_NEW_CONDVAR(l)           NULL
-#define JS_DESTROY_CONDVAR(cv)      ((void)0)
-#define JS_WAIT_CONDVAR(cv,to)      ((void)0)
-#define JS_NOTIFY_CONDVAR(cv)       ((void)0)
-#define JS_NOTIFY_ALL_CONDVAR(cv)   ((void)0)
-
-#define JS_LOCK_RUNTIME(rt)         ((void)0)
-#define JS_UNLOCK_RUNTIME(rt)       ((void)0)
-#define JS_LOCK_OBJ(cx,obj)         ((void)0)
-#define JS_UNLOCK_OBJ(cx,obj)       ((void)0)
-#define JS_LOCK_OBJ_VOID(cx,obj,e)  (e)
-#define JS_LOCK_SCOPE(cx,scope)     ((void)0)
-#define JS_UNLOCK_SCOPE(cx,scope)   ((void)0)
-#define JS_TRANSFER_SCOPE_LOCK(c,o,n) ((void)0)
-
-#define JS_IS_RUNTIME_LOCKED(rt)        1
-#define JS_IS_OBJ_LOCKED(cx,obj)        1
-#define JS_IS_SCOPE_LOCKED(cx,scope)    1
-#define JS_LOCK_VOID(cx, e)             JS_LOCK_RUNTIME_VOID((cx)->runtime, e)
-
-#endif /* !JS_THREADSAFE */
-
-#define JS_LOCK_RUNTIME_VOID(rt,e)                                            \
-    JS_BEGIN_MACRO                                                            \
-        JS_LOCK_RUNTIME(rt);                                                  \
-        e;                                                                    \
-        JS_UNLOCK_RUNTIME(rt);                                                \
-    JS_END_MACRO
-
-#define JS_LOCK_GC(rt)              JS_ACQUIRE_LOCK((rt)->gcLock)
-#define JS_UNLOCK_GC(rt)            JS_RELEASE_LOCK((rt)->gcLock)
-#define JS_LOCK_GC_VOID(rt,e)       (JS_LOCK_GC(rt), (e), JS_UNLOCK_GC(rt))
-#define JS_AWAIT_GC_DONE(rt)        JS_WAIT_CONDVAR((rt)->gcDone, JS_NO_TIMEOUT)
-#define JS_NOTIFY_GC_DONE(rt)       JS_NOTIFY_ALL_CONDVAR((rt)->gcDone)
-#define JS_AWAIT_REQUEST_DONE(rt)   JS_WAIT_CONDVAR((rt)->requestDone,        \
-                                                    JS_NO_TIMEOUT)
-#define JS_NOTIFY_REQUEST_DONE(rt)  JS_NOTIFY_CONDVAR((rt)->requestDone)
-
-#define JS_LOCK(P,CX)               JS_LOCK0(P,(CX)->thread)
-#define JS_UNLOCK(P,CX)             JS_UNLOCK0(P,(CX)->thread)
-
-#endif /* jslock_h___ */
diff --git a/libs/js/src/jslog2.c b/libs/js/src/jslog2.c
deleted file mode 100644
index 9bfca4dd31..0000000000
--- a/libs/js/src/jslog2.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "jsstddef.h"
-#include "jsbit.h"
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-JS_PUBLIC_API(JSIntn) JS_CeilingLog2(JSUint32 n)
-{
-    JSIntn log2 = 0;
-
-    if (n & (n-1))
-        log2++;
-    if (n >> 16)
-        log2 += 16, n >>= 16;
-    if (n >> 8)
-        log2 += 8, n >>= 8;
-    if (n >> 4)
-        log2 += 4, n >>= 4;
-    if (n >> 2)
-        log2 += 2, n >>= 2;
-    if (n >> 1)
-        log2++;
-    return log2;
-}
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n.
-** This really just finds the highest set bit in the word.
-*/
-JS_PUBLIC_API(JSIntn) JS_FloorLog2(JSUint32 n)
-{
-    JSIntn log2 = 0;
-
-    if (n >> 16)
-        log2 += 16, n >>= 16;
-    if (n >> 8)
-        log2 += 8, n >>= 8;
-    if (n >> 4)
-        log2 += 4, n >>= 4;
-    if (n >> 2)
-        log2 += 2, n >>= 2;
-    if (n >> 1)
-        log2++;
-    return log2;
-}
diff --git a/libs/js/src/jslong.c b/libs/js/src/jslong.c
deleted file mode 100644
index 9a4a5b4d78..0000000000
--- a/libs/js/src/jslong.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "jsstddef.h"
-#include "jstypes.h"
-#include "jslong.h"
-
-static JSInt64 ll_zero = JSLL_INIT( 0x00000000,0x00000000 );
-static JSInt64 ll_maxint = JSLL_INIT( 0x7fffffff, 0xffffffff );
-static JSInt64 ll_minint = JSLL_INIT( 0x80000000, 0x00000000 );
-
-#ifdef HAVE_WATCOM_BUG_2
-JSInt64 __pascal __loadds __export
-    JSLL_Zero(void) { return ll_zero; }
-JSInt64 __pascal __loadds __export
-    JSLL_MaxInt(void) { return ll_maxint; }
-JSInt64 __pascal __loadds __export
-    JSLL_MinInt(void) { return ll_minint; }
-#else
-JS_PUBLIC_API(JSInt64) JSLL_Zero(void) { return ll_zero; }
-JS_PUBLIC_API(JSInt64) JSLL_MaxInt(void) { return ll_maxint; }
-JS_PUBLIC_API(JSInt64) JSLL_MinInt(void) { return ll_minint; }
-#endif
-
-#ifndef JS_HAVE_LONG_LONG
-/*
-** Divide 64-bit a by 32-bit b, which must be normalized so its high bit is 1.
-*/
-static void norm_udivmod32(JSUint32 *qp, JSUint32 *rp, JSUint64 a, JSUint32 b)
-{
-    JSUint32 d1, d0, q1, q0;
-    JSUint32 r1, r0, m;
-
-    d1 = jshi16(b);
-    d0 = jslo16(b);
-    r1 = a.hi % d1;
-    q1 = a.hi / d1;
-    m = q1 * d0;
-    r1 = (r1 << 16) | jshi16(a.lo);
-    if (r1 < m) {
-        q1--, r1 += b;
-        if (r1 >= b     /* i.e., we didn't get a carry when adding to r1 */
-            && r1 < m) {
-            q1--, r1 += b;
-        }
-    }
-    r1 -= m;
-    r0 = r1 % d1;
-    q0 = r1 / d1;
-    m = q0 * d0;
-    r0 = (r0 << 16) | jslo16(a.lo);
-    if (r0 < m) {
-        q0--, r0 += b;
-        if (r0 >= b
-            && r0 < m) {
-            q0--, r0 += b;
-        }
-    }
-    *qp = (q1 << 16) | q0;
-    *rp = r0 - m;
-}
-
-static JSUint32 CountLeadingZeros(JSUint32 a)
-{
-    JSUint32 t;
-    JSUint32 r = 32;
-
-    if ((t = a >> 16) != 0)
-        r -= 16, a = t;
-    if ((t = a >> 8) != 0)
-        r -= 8, a = t;
-    if ((t = a >> 4) != 0)
-        r -= 4, a = t;
-    if ((t = a >> 2) != 0)
-        r -= 2, a = t;
-    if ((t = a >> 1) != 0)
-        r -= 1, a = t;
-    if (a & 1)
-        r--;
-    return r;
-}
-
-JS_PUBLIC_API(void) jsll_udivmod(JSUint64 *qp, JSUint64 *rp, JSUint64 a, JSUint64 b)
-{
-    JSUint32 n0, n1, n2;
-    JSUint32 q0, q1;
-    JSUint32 rsh, lsh;
-
-    n0 = a.lo;
-    n1 = a.hi;
-
-    if (b.hi == 0) {
-        if (b.lo > n1) {
-            /* (0 q0) = (n1 n0) / (0 D0) */
-
-            lsh = CountLeadingZeros(b.lo);
-
-            if (lsh) {
-                /*
-                 * Normalize, i.e. make the most significant bit of the
-                 * denominator be set.
-                 */
-                b.lo = b.lo << lsh;
-                n1 = (n1 << lsh) | (n0 >> (32 - lsh));
-                n0 = n0 << lsh;
-            }
-
-            a.lo = n0, a.hi = n1;
-            norm_udivmod32(&q0, &n0, a, b.lo);
-            q1 = 0;
-
-            /* remainder is in n0 >> lsh */
-        } else {
-            /* (q1 q0) = (n1 n0) / (0 d0) */
-
-            if (b.lo == 0)              /* user wants to divide by zero! */
-                b.lo = 1 / b.lo;        /* so go ahead and crash */
-
-            lsh = CountLeadingZeros(b.lo);
-
-            if (lsh == 0) {
-                /*
-                 * From (n1 >= b.lo)
-                 *   && (the most significant bit of b.lo is set),
-                 * conclude that
-                 *      (the most significant bit of n1 is set)
-                 *   && (the leading quotient digit q1 = 1).
-                 *
-                 * This special case is necessary, not an optimization
-                 * (Shifts counts of 32 are undefined).
-                 */
-                n1 -= b.lo;
-                q1 = 1;
-            } else {
-                /*
-                 * Normalize.
-                 */
-                rsh = 32 - lsh;
-
-                b.lo = b.lo << lsh;
-                n2 = n1 >> rsh;
-                n1 = (n1 << lsh) | (n0 >> rsh);
-                n0 = n0 << lsh;
-
-                a.lo = n1, a.hi = n2;
-                norm_udivmod32(&q1, &n1, a, b.lo);
-            }
-
-            /* n1 != b.lo... */
-
-            a.lo = n0, a.hi = n1;
-            norm_udivmod32(&q0, &n0, a, b.lo);
-
-            /* remainder in n0 >> lsh */
-        }
-
-        if (rp) {
-            rp->lo = n0 >> lsh;
-            rp->hi = 0;
-        }
-    } else {
-        if (b.hi > n1) {
-            /* (0 0) = (n1 n0) / (D1 d0) */
-
-            q0 = 0;
-            q1 = 0;
-
-            /* remainder in (n1 n0) */
-            if (rp) {
-                rp->lo = n0;
-                rp->hi = n1;
-            }
-        } else {
-            /* (0 q0) = (n1 n0) / (d1 d0) */
-
-            lsh = CountLeadingZeros(b.hi);
-            if (lsh == 0) {
-                /*
-                 * From (n1 >= b.hi)
-                 *   && (the most significant bit of b.hi is set),
-                 * conclude that
-                 *      (the most significant bit of n1 is set)
-                 *   && (the quotient digit q0 = 0 or 1).
-                 *
-                 * This special case is necessary, not an optimization.
-                 */
-
-                /*
-                 * The condition on the next line takes advantage of that
-                 * n1 >= b.hi (true due to control flow).
-                 */
-                if (n1 > b.hi || n0 >= b.lo) {
-                    q0 = 1;
-                    a.lo = n0, a.hi = n1;
-                    JSLL_SUB(a, a, b);
-                } else {
-                    q0 = 0;
-                }
-                q1 = 0;
-
-                if (rp) {
-                    rp->lo = n0;
-                    rp->hi = n1;
-                }
-            } else {
-                JSInt64 m;
-
-                /*
-                 * Normalize.
-                 */
-                rsh = 32 - lsh;
-
-                b.hi = (b.hi << lsh) | (b.lo >> rsh);
-                b.lo = b.lo << lsh;
-                n2 = n1 >> rsh;
-                n1 = (n1 << lsh) | (n0 >> rsh);
-                n0 = n0 << lsh;
-
-                a.lo = n1, a.hi = n2;
-                norm_udivmod32(&q0, &n1, a, b.hi);
-                JSLL_MUL32(m, q0, b.lo);
-
-                if ((m.hi > n1) || ((m.hi == n1) && (m.lo > n0))) {
-                    q0--;
-                    JSLL_SUB(m, m, b);
-                }
-
-                q1 = 0;
-
-                /* Remainder is ((n1 n0) - (m1 m0)) >> lsh */
-                if (rp) {
-                    a.lo = n0, a.hi = n1;
-                    JSLL_SUB(a, a, m);
-                    rp->lo = (a.hi << rsh) | (a.lo >> lsh);
-                    rp->hi = a.hi >> lsh;
-                }
-            }
-        }
-    }
-
-    if (qp) {
-        qp->lo = q0;
-        qp->hi = q1;
-    }
-}
-#endif /* !JS_HAVE_LONG_LONG */
diff --git a/libs/js/src/jslong.h b/libs/js/src/jslong.h
deleted file mode 100644
index 6a9ae580b5..0000000000
--- a/libs/js/src/jslong.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                jslong.h
-** Description: Portable access to 64 bit numerics
-**
-** Long-long (64-bit signed integer type) support. Some C compilers
-** don't support 64 bit integers yet, so we use these macros to
-** support both machines that do and don't.
-**/
-#ifndef jslong_h___
-#define jslong_h___
-
-#include "jstypes.h"
-
-JS_BEGIN_EXTERN_C
-
-#ifdef OSSP
-#define JSLL_MaxInt   JS_LL_MaxInt
-#define JSLL_MinInt   JS_LL_MinInt
-#define JSLL_Zero     JS_LL_Zero
-#define jsll_udivmod  js_ll_udivmod
-#endif
-
-/***********************************************************************
-** DEFINES:     JSLL_MaxInt
-**              JSLL_MinInt
-**              JSLL_Zero
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-#ifdef HAVE_WATCOM_BUG_2
-JSInt64 __pascal __loadds __export
-    JSLL_MaxInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_MinInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_Zero(void);
-#else
-extern JS_PUBLIC_API(JSInt64) JSLL_MaxInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_MinInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_Zero(void);
-#endif
-
-#define JSLL_MAXINT   JSLL_MaxInt()
-#define JSLL_MININT   JSLL_MinInt()
-#define JSLL_ZERO     JSLL_Zero()
-
-#ifdef JS_HAVE_LONG_LONG
-
-#if JS_BYTES_PER_LONG == 8
-#define JSLL_INIT(hi, lo)  ((hi ## L << 32) + lo ## L)
-#elif (defined(WIN32) || defined(WIN16)) && !defined(__GNUC__)
-#define JSLL_INIT(hi, lo)  ((hi ## i64 << 32) + lo ## i64)
-#else
-#define JSLL_INIT(hi, lo)  ((hi ## LL << 32) + lo ## LL)
-#endif
-
-/***********************************************************************
-** MACROS:      JSLL_*
-** DESCRIPTION:
-**      The following macros define portable access to the 64 bit
-**      math facilities.
-**
-***********************************************************************/
-
-/***********************************************************************
-** MACROS:      JSLL_<relational operators>
-**
-**  JSLL_IS_ZERO        Test for zero
-**  JSLL_EQ             Test for equality
-**  JSLL_NE             Test for inequality
-**  JSLL_GE_ZERO        Test for zero or positive
-**  JSLL_CMP            Compare two values
-***********************************************************************/
-#define JSLL_IS_ZERO(a)       ((a) == 0)
-#define JSLL_EQ(a, b)         ((a) == (b))
-#define JSLL_NE(a, b)         ((a) != (b))
-#define JSLL_GE_ZERO(a)       ((a) >= 0)
-#define JSLL_CMP(a, op, b)    ((JSInt64)(a) op (JSInt64)(b))
-#define JSLL_UCMP(a, op, b)   ((JSUint64)(a) op (JSUint64)(b))
-
-/***********************************************************************
-** MACROS:      JSLL_<logical operators>
-**
-**  JSLL_AND            Logical and
-**  JSLL_OR             Logical or
-**  JSLL_XOR            Logical exclusion
-**  JSLL_OR2            A disgusting deviation
-**  JSLL_NOT            Negation (one's compliment)
-***********************************************************************/
-#define JSLL_AND(r, a, b)        ((r) = (a) & (b))
-#define JSLL_OR(r, a, b)        ((r) = (a) | (b))
-#define JSLL_XOR(r, a, b)        ((r) = (a) ^ (b))
-#define JSLL_OR2(r, a)        ((r) = (r) | (a))
-#define JSLL_NOT(r, a)        ((r) = ~(a))
-
-/***********************************************************************
-** MACROS:      JSLL_<mathematical operators>
-**
-**  JSLL_NEG            Negation (two's compliment)
-**  JSLL_ADD            Summation (two's compliment)
-**  JSLL_SUB            Difference (two's compliment)
-***********************************************************************/
-#define JSLL_NEG(r, a)        ((r) = -(a))
-#define JSLL_ADD(r, a, b)     ((r) = (a) + (b))
-#define JSLL_SUB(r, a, b)     ((r) = (a) - (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<mathematical operators>
-**
-**  JSLL_MUL            Product (two's compliment)
-**  JSLL_DIV            Quotient (two's compliment)
-**  JSLL_MOD            Modulus (two's compliment)
-***********************************************************************/
-#define JSLL_MUL(r, a, b)        ((r) = (a) * (b))
-#define JSLL_DIV(r, a, b)        ((r) = (a) / (b))
-#define JSLL_MOD(r, a, b)        ((r) = (a) % (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<shifting operators>
-**
-**  JSLL_SHL            Shift left [0..64] bits
-**  JSLL_SHR            Shift right [0..64] bits with sign extension
-**  JSLL_USHR           Unsigned shift right [0..64] bits
-**  JSLL_ISHL           Signed shift left [0..64] bits
-***********************************************************************/
-#define JSLL_SHL(r, a, b)     ((r) = (JSInt64)(a) << (b))
-#define JSLL_SHR(r, a, b)     ((r) = (JSInt64)(a) >> (b))
-#define JSLL_USHR(r, a, b)    ((r) = (JSUint64)(a) >> (b))
-#define JSLL_ISHL(r, a, b)    ((r) = (JSInt64)(a) << (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<conversion operators>
-**
-**  JSLL_L2I            Convert to signed 32 bit
-**  JSLL_L2UI           Convert to unsigned 32 bit
-**  JSLL_L2F            Convert to floating point
-**  JSLL_L2D            Convert to floating point
-**  JSLL_I2L            Convert signed to 64 bit
-**  JSLL_UI2L           Convert unsigned to 64 bit
-**  JSLL_F2L            Convert float to 64 bit
-**  JSLL_D2L            Convert float to 64 bit
-***********************************************************************/
-#define JSLL_L2I(i, l)        ((i) = (JSInt32)(l))
-#define JSLL_L2UI(ui, l)        ((ui) = (JSUint32)(l))
-#define JSLL_L2F(f, l)        ((f) = (JSFloat64)(l))
-#define JSLL_L2D(d, l)        ((d) = (JSFloat64)(l))
-
-#define JSLL_I2L(l, i)        ((l) = (JSInt64)(i))
-#define JSLL_UI2L(l, ui)        ((l) = (JSInt64)(ui))
-#define JSLL_F2L(l, f)        ((l) = (JSInt64)(f))
-#define JSLL_D2L(l, d)        ((l) = (JSInt64)(d))
-
-/***********************************************************************
-** MACROS:      JSLL_UDIVMOD
-** DESCRIPTION:
-**  Produce both a quotient and a remainder given an unsigned
-** INPUTS:      JSUint64 a: The dividend of the operation
-**              JSUint64 b: The quotient of the operation
-** OUTPUTS:     JSUint64 *qp: pointer to quotient
-**              JSUint64 *rp: pointer to remainder
-***********************************************************************/
-#define JSLL_UDIVMOD(qp, rp, a, b) \
-    (*(qp) = ((JSUint64)(a) / (b)), \
-     *(rp) = ((JSUint64)(a) % (b)))
-
-#else  /* !JS_HAVE_LONG_LONG */
-
-#ifdef IS_LITTLE_ENDIAN
-#define JSLL_INIT(hi, lo) {JS_INT32(lo), JS_INT32(hi)}
-#else
-#define JSLL_INIT(hi, lo) {JS_INT32(hi), JS_INT32(lo)}
-#endif
-
-#define JSLL_IS_ZERO(a)         (((a).hi == 0) && ((a).lo == 0))
-#define JSLL_EQ(a, b)           (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define JSLL_NE(a, b)           (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define JSLL_GE_ZERO(a)         (((a).hi >> 31) == 0)
-
-#ifdef DEBUG
-#define JSLL_CMP(a, op, b)      (JS_ASSERT((#op)[1] != '='), JSLL_REAL_CMP(a, op, b))
-#define JSLL_UCMP(a, op, b)     (JS_ASSERT((#op)[1] != '='), JSLL_REAL_UCMP(a, op, b))
-#else
-#define JSLL_CMP(a, op, b)      JSLL_REAL_CMP(a, op, b)
-#define JSLL_UCMP(a, op, b)     JSLL_REAL_UCMP(a, op, b)
-#endif
-
-#define JSLL_REAL_CMP(a,op,b)   (((JSInt32)(a).hi op (JSInt32)(b).hi) || \
-                                 (((a).hi == (b).hi) && ((a).lo op (b).lo)))
-#define JSLL_REAL_UCMP(a,op,b)  (((a).hi op (b).hi) || \
-                                 (((a).hi == (b).hi) && ((a).lo op (b).lo)))
-
-#define JSLL_AND(r, a, b)       ((r).lo = (a).lo & (b).lo, \
-                                 (r).hi = (a).hi & (b).hi)
-#define JSLL_OR(r, a, b)        ((r).lo = (a).lo | (b).lo, \
-                                 (r).hi = (a).hi | (b).hi)
-#define JSLL_XOR(r, a, b)       ((r).lo = (a).lo ^ (b).lo, \
-                                 (r).hi = (a).hi ^ (b).hi)
-#define JSLL_OR2(r, a)          ((r).lo = (r).lo | (a).lo, \
-                                 (r).hi = (r).hi | (a).hi)
-#define JSLL_NOT(r, a)          ((r).lo = ~(a).lo, \
-                                 (r).hi = ~(a).hi)
-
-#define JSLL_NEG(r, a)          ((r).lo = -(JSInt32)(a).lo, \
-                                 (r).hi = -(JSInt32)(a).hi - ((r).lo != 0))
-#define JSLL_ADD(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo + _b.lo; \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo); \
-}
-
-#define JSLL_SUB(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo - _b.lo; \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo); \
-}
-
-#define JSLL_MUL(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    JSLL_MUL32(r, _a.lo, _b.lo); \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi; \
-}
-
-#define jslo16(a)        ((a) & JS_BITMASK(16))
-#define jshi16(a)        ((a) >> 16)
-
-#define JSLL_MUL32(r, a, b) { \
-     JSUint32 _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3; \
-     _a1 = jshi16(a), _a0 = jslo16(a); \
-     _b1 = jshi16(b), _b0 = jslo16(b); \
-     _y0 = _a0 * _b0; \
-     _y1 = _a0 * _b1; \
-     _y2 = _a1 * _b0; \
-     _y3 = _a1 * _b1; \
-     _y1 += jshi16(_y0);                         /* can't carry */ \
-     _y1 += _y2;                                /* might carry */ \
-     if (_y1 < _y2)    \
-        _y3 += (JSUint32)(JS_BIT(16));  /* propagate */ \
-     (r).lo = (jslo16(_y1) << 16) + jslo16(_y0); \
-     (r).hi = _y3 + jshi16(_y1); \
-}
-
-#define JSLL_UDIVMOD(qp, rp, a, b)    jsll_udivmod(qp, rp, a, b)
-
-extern JS_PUBLIC_API(void) jsll_udivmod(JSUint64 *qp, JSUint64 *rp, JSUint64 a, JSUint64 b);
-
-#define JSLL_DIV(r, a, b) { \
-    JSInt64 _a, _b; \
-    JSUint32 _negative = (JSInt32)(a).hi < 0; \
-    if (_negative) { \
-    JSLL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((JSInt32)(b).hi < 0) { \
-    _negative ^= 1; \
-    JSLL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    JSLL_UDIVMOD(&(r), 0, _a, _b); \
-    if (_negative) \
-    JSLL_NEG(r, r); \
-}
-
-#define JSLL_MOD(r, a, b) { \
-    JSInt64 _a, _b; \
-    JSUint32 _negative = (JSInt32)(a).hi < 0; \
-    if (_negative) { \
-    JSLL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((JSInt32)(b).hi < 0) { \
-    JSLL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    JSLL_UDIVMOD(0, &(r), _a, _b); \
-    if (_negative) \
-    JSLL_NEG(r, r); \
-}
-
-#define JSLL_SHL(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-        if ((b) < 32) { \
-        (r).lo = _a.lo << ((b) & 31); \
-        (r).hi = (_a.hi << ((b) & 31)) | (_a.lo >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = _a.lo << ((b) & 31); \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-/* a is an JSInt32, b is JSInt32, r is JSInt64 */
-#define JSLL_ISHL(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-    _a.lo = (a); \
-    _a.hi = 0; \
-        if ((b) < 32) { \
-        (r).lo = (a) << ((b) & 31); \
-        (r).hi = ((a) >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = (a) << ((b) & 31); \
-    } \
-    } else { \
-    (r).lo = (a); \
-    (r).hi = 0; \
-    } \
-}
-
-#define JSLL_SHR(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = (JSInt32)_a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = (JSInt32)_a.hi >> ((b) & 31); \
-        (r).hi = (JSInt32)_a.hi >> 31; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define JSLL_USHR(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = _a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = _a.hi >> ((b) & 31); \
-        (r).hi = 0; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define JSLL_L2I(i, l)        ((i) = (l).lo)
-#define JSLL_L2UI(ui, l)        ((ui) = (l).lo)
-#define JSLL_L2F(f, l)        { double _d; JSLL_L2D(_d, l); (f) = (JSFloat64)_d; }
-
-#define JSLL_L2D(d, l) { \
-    int _negative; \
-    JSInt64 _absval; \
- \
-    _negative = (l).hi >> 31; \
-    if (_negative) { \
-    JSLL_NEG(_absval, l); \
-    } else { \
-    _absval = l; \
-    } \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo; \
-    if (_negative) \
-    (d) = -(d); \
-}
-
-#define JSLL_I2L(l, i)        { JSInt32 _i = (i) >> 31; (l).lo = (i); (l).hi = _i; }
-#define JSLL_UI2L(l, ui)      ((l).lo = (ui), (l).hi = 0)
-#define JSLL_F2L(l, f)        { double _d = (double)f; JSLL_D2L(l, _d); }
-
-#define JSLL_D2L(l, d) { \
-    int _negative; \
-    double _absval, _d_hi; \
-    JSInt64 _lo_d; \
- \
-    _negative = ((d) < 0); \
-    _absval = _negative ? -(d) : (d); \
- \
-    (l).hi = _absval / 4.294967296e9; \
-    (l).lo = 0; \
-    JSLL_L2D(_d_hi, l); \
-    _absval -= _d_hi; \
-    _lo_d.hi = 0; \
-    if (_absval < 0) { \
-    _lo_d.lo = -_absval; \
-    JSLL_SUB(l, l, _lo_d); \
-    } else { \
-    _lo_d.lo = _absval; \
-    JSLL_ADD(l, l, _lo_d); \
-    } \
- \
-    if (_negative) \
-    JSLL_NEG(l, l); \
-}
-
-#endif /* !JS_HAVE_LONG_LONG */
-
-JS_END_EXTERN_C
-
-#endif /* jslong_h___ */
diff --git a/libs/js/src/jsmath.c b/libs/js/src/jsmath.c
deleted file mode 100644
index ff1f9130e7..0000000000
--- a/libs/js/src/jsmath.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS math package.
- */
-#include "jsstddef.h"
-#include "jslibmath.h"
-#include <stdlib.h>
-#include "jstypes.h"
-#include "jslong.h"
-#include "prmjtime.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jslock.h"
-#include "jsmath.h"
-#include "jsnum.h"
-#include "jsobj.h"
-
-#ifndef M_E
-#define M_E             2.7182818284590452354
-#endif
-#ifndef M_LOG2E
-#define M_LOG2E         1.4426950408889634074
-#endif
-#ifndef M_LOG10E
-#define M_LOG10E        0.43429448190325182765
-#endif
-#ifndef M_LN2
-#define M_LN2           0.69314718055994530942
-#endif
-#ifndef M_LN10
-#define M_LN10          2.30258509299404568402
-#endif
-#ifndef M_PI
-#define M_PI            3.14159265358979323846
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2         1.41421356237309504880
-#endif
-#ifndef M_SQRT1_2
-#define M_SQRT1_2       0.70710678118654752440
-#endif
-
-static JSConstDoubleSpec math_constants[] = {
-    {M_E,       "E",            0, {0,0,0}},
-    {M_LOG2E,   "LOG2E",        0, {0,0,0}},
-    {M_LOG10E,  "LOG10E",       0, {0,0,0}},
-    {M_LN2,     "LN2",          0, {0,0,0}},
-    {M_LN10,    "LN10",         0, {0,0,0}},
-    {M_PI,      "PI",           0, {0,0,0}},
-    {M_SQRT2,   "SQRT2",        0, {0,0,0}},
-    {M_SQRT1_2, "SQRT1_2",      0, {0,0,0}},
-    {0,0,0,{0,0,0}}
-};
-
-static JSClass math_class = {
-    "Math",
-    0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-static JSBool
-math_abs(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_fabs(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_acos(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_acos(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_asin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_asin(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_atan(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_atan(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_atan2(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, y, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    if (!js_ValueToNumber(cx, argv[1], &y))
-        return JS_FALSE;
-    z = fd_atan2(x, y);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_ceil(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_ceil(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_cos(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_cos(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_exp(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-#ifdef _WIN32
-    if (!JSDOUBLE_IS_NaN(x)) {
-        if (x == *cx->runtime->jsPositiveInfinity) {
-            *rval = DOUBLE_TO_JSVAL(cx->runtime->jsPositiveInfinity);
-            return JS_TRUE;
-        }
-        if (x == *cx->runtime->jsNegativeInfinity) {
-            *rval = JSVAL_ZERO;
-            return JS_TRUE;
-        }
-    }
-#endif
-    z = fd_exp(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_floor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_floor(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_log(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_log(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_max(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z = *cx->runtime->jsNegativeInfinity;
-    uintN i;
-
-    if (argc == 0) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNegativeInfinity);
-        return JS_TRUE;
-    }
-    for (i = 0; i < argc; i++) {
-        if (!js_ValueToNumber(cx, argv[i], &x))
-            return JS_FALSE;
-        if (JSDOUBLE_IS_NaN(x)) {
-            *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-            return JS_TRUE;
-        }
-        if ((x==0)&&(x==z)&&(fd_copysign(1.0,z)==-1))
-            z = x;
-        else
-            z = (x > z) ? x : z;
-    }
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_min(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z = *cx->runtime->jsPositiveInfinity;
-    uintN i;
-
-    if (argc == 0) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsPositiveInfinity);
-        return JS_TRUE;
-    }
-    for (i = 0; i < argc; i++) {
-        if (!js_ValueToNumber(cx, argv[i], &x))
-            return JS_FALSE;
-        if (JSDOUBLE_IS_NaN(x)) {
-            *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-            return JS_TRUE;
-        }
-        if ((x==0)&&(x==z)&&(fd_copysign(1.0,x)==-1))
-            z = x;
-        else
-            z = (x < z) ? x : z;
-    }
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_pow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, y, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    if (!js_ValueToNumber(cx, argv[1], &y))
-        return JS_FALSE;
-    z = fd_pow(x, y);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-/*
- * Math.random() support, lifted from java.util.Random.java.
- */
-static void
-random_setSeed(JSRuntime *rt, int64 seed)
-{
-    int64 tmp;
-
-    JSLL_I2L(tmp, 1000);
-    JSLL_DIV(seed, seed, tmp);
-    JSLL_XOR(tmp, seed, rt->rngMultiplier);
-    JSLL_AND(rt->rngSeed, tmp, rt->rngMask);
-}
-
-static void
-random_init(JSRuntime *rt)
-{
-    int64 tmp, tmp2;
-
-    /* Do at most once. */
-    if (rt->rngInitialized)
-        return;
-    rt->rngInitialized = JS_TRUE;
-
-    /* rt->rngMultiplier = 0x5DEECE66DL */
-    JSLL_ISHL(tmp, 0x5, 32);
-    JSLL_UI2L(tmp2, 0xDEECE66DL);
-    JSLL_OR(rt->rngMultiplier, tmp, tmp2);
-
-    /* rt->rngAddend = 0xBL */
-    JSLL_I2L(rt->rngAddend, 0xBL);
-
-    /* rt->rngMask = (1L << 48) - 1 */
-    JSLL_I2L(tmp, 1);
-    JSLL_SHL(tmp2, tmp, 48);
-    JSLL_SUB(rt->rngMask, tmp2, tmp);
-
-    /* rt->rngDscale = (jsdouble)(1L << 53) */
-    JSLL_SHL(tmp2, tmp, 53);
-    JSLL_L2D(rt->rngDscale, tmp2);
-
-    /* Finally, set the seed from current time. */
-    random_setSeed(rt, PRMJ_Now());
-}
-
-static uint32
-random_next(JSRuntime *rt, int bits)
-{
-    int64 nextseed, tmp;
-    uint32 retval;
-
-    JSLL_MUL(nextseed, rt->rngSeed, rt->rngMultiplier);
-    JSLL_ADD(nextseed, nextseed, rt->rngAddend);
-    JSLL_AND(nextseed, nextseed, rt->rngMask);
-    rt->rngSeed = nextseed;
-    JSLL_USHR(tmp, nextseed, 48 - bits);
-    JSLL_L2I(retval, tmp);
-    return retval;
-}
-
-static jsdouble
-random_nextDouble(JSRuntime *rt)
-{
-    int64 tmp, tmp2;
-    jsdouble d;
-
-    JSLL_ISHL(tmp, random_next(rt, 26), 27);
-    JSLL_UI2L(tmp2, random_next(rt, 27));
-    JSLL_ADD(tmp, tmp, tmp2);
-    JSLL_L2D(d, tmp);
-    return d / rt->rngDscale;
-}
-
-static JSBool
-math_random(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSRuntime *rt;
-    jsdouble z;
-
-    rt = cx->runtime;
-    JS_LOCK_RUNTIME(rt);
-    random_init(rt);
-    z = random_nextDouble(rt);
-    JS_UNLOCK_RUNTIME(rt);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_round(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_copysign(fd_floor(x + 0.5), x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_sin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_sin(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_sqrt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_sqrt(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-static JSBool
-math_tan(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x, z;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    z = fd_tan(x);
-    return js_NewNumberValue(cx, z, rval);
-}
-
-#if JS_HAS_TOSOURCE
-static JSBool
-math_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    *rval = ATOM_KEY(cx->runtime->atomState.MathAtom);
-    return JS_TRUE;
-}
-#endif
-
-static JSFunctionSpec math_static_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   math_toSource,          0, 0, 0},
-#endif
-    {"abs",             math_abs,               1, 0, 0},
-    {"acos",            math_acos,              1, 0, 0},
-    {"asin",            math_asin,              1, 0, 0},
-    {"atan",            math_atan,              1, 0, 0},
-    {"atan2",           math_atan2,             2, 0, 0},
-    {"ceil",            math_ceil,              1, 0, 0},
-    {"cos",             math_cos,               1, 0, 0},
-    {"exp",             math_exp,               1, 0, 0},
-    {"floor",           math_floor,             1, 0, 0},
-    {"log",             math_log,               1, 0, 0},
-    {"max",             math_max,               2, 0, 0},
-    {"min",             math_min,               2, 0, 0},
-    {"pow",             math_pow,               2, 0, 0},
-    {"random",          math_random,            0, 0, 0},
-    {"round",           math_round,             1, 0, 0},
-    {"sin",             math_sin,               1, 0, 0},
-    {"sqrt",            math_sqrt,              1, 0, 0},
-    {"tan",             math_tan,               1, 0, 0},
-    {0,0,0,0,0}
-};
-
-JSObject *
-js_InitMathClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *Math;
-
-    Math = JS_DefineObject(cx, obj, "Math", &math_class, NULL, 0);
-    if (!Math)
-        return NULL;
-    if (!JS_DefineFunctions(cx, Math, math_static_methods))
-        return NULL;
-    if (!JS_DefineConstDoubles(cx, Math, math_constants))
-        return NULL;
-    return Math;
-}
diff --git a/libs/js/src/jsmath.h b/libs/js/src/jsmath.h
deleted file mode 100644
index b67dba1deb..0000000000
--- a/libs/js/src/jsmath.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* -*- Mode: C; tab-width: 8 -*-
- * Copyright (C) 1998-1999 Netscape Communications Corporation, All Rights Reserved.
- */
-
-#ifndef jsmath_h___
-#define jsmath_h___
-/*
- * JS math functions.
- */
-
-JS_BEGIN_EXTERN_C
-
-extern JSObject *
-js_InitMathClass(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jsmath_h___ */
diff --git a/libs/js/src/jsnum.c b/libs/js/src/jsnum.c
deleted file mode 100644
index 8a5596304e..0000000000
--- a/libs/js/src/jsnum.c
+++ /dev/null
@@ -1,1145 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   IBM Corp.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS number type and wrapper class.
- */
-#include "jsstddef.h"
-#if defined(XP_WIN) || defined(XP_OS2)
-#include <float.h>
-#endif
-#include <locale.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdtoa.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsprf.h"
-#include "jsstr.h"
-
-static JSBool
-num_isNaN(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    *rval = BOOLEAN_TO_JSVAL(JSDOUBLE_IS_NaN(x));
-    return JS_TRUE;
-}
-
-static JSBool
-num_isFinite(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble x;
-
-    if (!js_ValueToNumber(cx, argv[0], &x))
-        return JS_FALSE;
-    *rval = BOOLEAN_TO_JSVAL(JSDOUBLE_IS_FINITE(x));
-    return JS_TRUE;
-}
-
-static JSBool
-num_parseFloat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    const jschar *bp, *ep;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    /* XXXbe js_strtod shouldn't require NUL termination */
-    bp = js_UndependString(cx, str);
-    if (!bp)
-        return JS_FALSE;
-    if (!js_strtod(cx, bp, &ep, &d))
-        return JS_FALSE;
-    if (ep == bp) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-        return JS_TRUE;
-    }
-    return js_NewNumberValue(cx, d, rval);
-}
-
-/* See ECMA 15.1.2.2. */
-static JSBool
-num_parseInt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsint radix;
-    JSString *str;
-    jsdouble d;
-    const jschar *bp, *ep;
-
-    if (argc > 1) {
-        if (!js_ValueToECMAInt32(cx, argv[1], &radix))
-            return JS_FALSE;
-    } else {
-        radix = 0;
-    }
-    if (radix != 0 && (radix < 2 || radix > 36)) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-        return JS_TRUE;
-    }
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    /* XXXbe js_strtointeger shouldn't require NUL termination */
-    bp = js_UndependString(cx, str);
-    if (!bp)
-        return JS_FALSE;
-    if (!js_strtointeger(cx, bp, &ep, radix, &d))
-        return JS_FALSE;
-    if (ep == bp) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-        return JS_TRUE;
-    }
-    return js_NewNumberValue(cx, d, rval);
-}
-
-const char js_Infinity_str[]   = "Infinity";
-const char js_NaN_str[]        = "NaN";
-const char js_isNaN_str[]      = "isNaN";
-const char js_isFinite_str[]   = "isFinite";
-const char js_parseFloat_str[] = "parseFloat";
-const char js_parseInt_str[]   = "parseInt";
-
-static JSFunctionSpec number_functions[] = {
-    {"isNaN",           num_isNaN,              1,0,0},
-    {"isFinite",        num_isFinite,           1,0,0},
-    {"parseFloat",      num_parseFloat,         1,0,0},
-    {"parseInt",        num_parseInt,           2,0,0},
-    {0,0,0,0,0}
-};
-
-JSClass js_NumberClass = {
-    "Number",
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-static JSBool
-Number(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsdouble d;
-    jsval v;
-
-    if (argc != 0) {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-    } else {
-        d = 0.0;
-    }
-    if (!js_NewNumberValue(cx, d, &v))
-        return JS_FALSE;
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        *rval = v;
-        return JS_TRUE;
-    }
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, v);
-    return JS_TRUE;
-}
-
-#if JS_HAS_TOSOURCE
-static JSBool
-num_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    jsdouble d;
-    char numBuf[DTOSTR_STANDARD_BUFFER_SIZE], *numStr;
-    char buf[64];
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_NumberClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    JS_ASSERT(JSVAL_IS_NUMBER(v));
-    d = JSVAL_IS_INT(v) ? (jsdouble)JSVAL_TO_INT(v) : *JSVAL_TO_DOUBLE(v);
-    numStr = JS_dtostr(numBuf, sizeof numBuf, DTOSTR_STANDARD, 0, d);
-    if (!numStr) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    JS_snprintf(buf, sizeof buf, "(new %s(%s))", js_NumberClass.name, numStr);
-    str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif
-
-/* The buf must be big enough for MIN_INT to fit including '-' and '\0'. */
-static char *
-IntToString(jsint i, char *buf, size_t bufSize)
-{
-    char *cp;
-    jsuint u;
-
-    u = (i < 0) ? -i : i;
-
-    cp = buf + bufSize; /* one past last buffer cell */
-    *--cp = '\0';       /* null terminate the string to be */
-
-    /*
-     * Build the string from behind. We use multiply and subtraction
-     * instead of modulus because that's much faster.
-     */
-    do {
-        jsuint newu = u / 10;
-        *--cp = (char)(u - newu * 10) + '0';
-        u = newu;
-    } while (u != 0);
-
-    if (i < 0)
-        *--cp = '-';
-
-    return cp;
-}
-
-static JSBool
-num_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    jsdouble d;
-    jsint base;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_NumberClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    JS_ASSERT(JSVAL_IS_NUMBER(v));
-    d = JSVAL_IS_INT(v) ? (jsdouble)JSVAL_TO_INT(v) : *JSVAL_TO_DOUBLE(v);
-    base = 10;
-    if (argc != 0) {
-        if (!js_ValueToECMAInt32(cx, argv[0], &base))
-            return JS_FALSE;
-        if (base < 2 || base > 36) {
-            char numBuf[12];
-            char *numStr = IntToString(base, numBuf, sizeof numBuf);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_RADIX,
-                                 numStr);
-            return JS_FALSE;
-        }
-    }
-    if (base == 10)
-        str = js_NumberToString(cx, d);
-    else {
-        char *dStr = JS_dtobasestr(base, d);
-        if (!dStr) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-        str = JS_NewStringCopyZ(cx, dStr);
-        free(dStr);
-    }
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-num_toLocaleString(JSContext *cx, JSObject *obj, uintN argc,
-                   jsval *argv, jsval *rval)
-{
-    char thousandsLength, decimalLength;
-    const char *numGrouping, *tmpGroup;
-    JSRuntime *rt;
-    JSString *numStr, *str;
-    char *num, *buf, *dec, *end, *tmpSrc, *tmpDest;
-    int digits, size, remainder, nrepeat;
-
-    /*
-     * Create the string, move back to bytes to make string twiddling
-     * a bit easier and so we can insert platform charset seperators.
-     */
-    if (!num_toString(cx, obj, 0, argv, rval))
-        return JS_FALSE;
-    JS_ASSERT(JSVAL_IS_STRING(*rval));
-    numStr = JSVAL_TO_STRING(*rval);
-    num = js_GetStringBytes(numStr);
-
-    /* Find bit before the decimal. */
-    dec = strchr(num, '.');
-    digits = dec ? dec - num : (int)strlen(num);
-    end = num + digits;
-
-    rt = cx->runtime;
-    thousandsLength = strlen(rt->thousandsSeparator);
-    decimalLength = strlen(rt->decimalSeparator);
-
-    /* Figure out how long resulting string will be. */
-    size = digits + (dec ? decimalLength + strlen(dec + 1) : 0);
-
-    numGrouping = tmpGroup = rt->numGrouping;
-    remainder = digits;
-    if (*num == '-')
-        remainder--;
-
-    while (*tmpGroup != CHAR_MAX && *tmpGroup != '\0') {
-        if (*tmpGroup >= remainder)
-            break;
-        size += thousandsLength;
-        remainder -= *tmpGroup;
-        tmpGroup++;
-    }
-    if (*tmpGroup == '\0' && *numGrouping != '\0') {
-        nrepeat = (remainder - 1) / tmpGroup[-1];
-        size += thousandsLength * nrepeat;
-        remainder -= nrepeat * tmpGroup[-1];
-    } else {
-        nrepeat = 0;
-    }
-    tmpGroup--;
-
-    buf = (char *)JS_malloc(cx, size + 1);
-    if (!buf)
-        return JS_FALSE;
-
-    tmpDest = buf;
-    tmpSrc = num;
-
-    while (*tmpSrc == '-' || remainder--)
-        *tmpDest++ = *tmpSrc++;
-    while (tmpSrc < end) {
-        strcpy(tmpDest, rt->thousandsSeparator);
-        tmpDest += thousandsLength;
-        memcpy(tmpDest, tmpSrc, *tmpGroup);
-        tmpDest += *tmpGroup;
-        tmpSrc += *tmpGroup;
-        if (--nrepeat < 0)
-            tmpGroup--;
-    }
-
-    if (dec) {
-        strcpy(tmpDest, rt->decimalSeparator);
-        tmpDest += decimalLength;
-        strcpy(tmpDest, dec + 1);
-    } else {
-        *tmpDest++ = '\0';
-    }
-
-    str = JS_NewString(cx, buf, size);
-    if (!str) {
-        JS_free(cx, buf);
-        return JS_FALSE;
-    }
-
-    *rval = STRING_TO_JSVAL(str);
-
-    return JS_TRUE;
-}
-
-static JSBool
-num_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (!JS_InstanceOf(cx, obj, &js_NumberClass, argv))
-        return JS_FALSE;
-    *rval = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    return JS_TRUE;
-}
-
-
-#if JS_HAS_NUMBER_FORMATS
-#define MAX_PRECISION 100
-
-static JSBool
-num_to(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, JSDToStrMode zeroArgMode,
-       JSDToStrMode oneArgMode, jsint precisionMin, jsint precisionMax, jsint precisionOffset)
-{
-    jsval v;
-    jsdouble d, precision;
-    JSString *str;
-    char buf[DTOSTR_VARIABLE_BUFFER_SIZE(MAX_PRECISION+1)], *numStr; /* Use MAX_PRECISION+1 because precisionOffset can be 1 */
-
-    if (!JS_InstanceOf(cx, obj, &js_NumberClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    JS_ASSERT(JSVAL_IS_NUMBER(v));
-    d = JSVAL_IS_INT(v) ? (jsdouble)JSVAL_TO_INT(v) : *JSVAL_TO_DOUBLE(v);
-
-    if (JSVAL_IS_VOID(argv[0])) {
-        precision = 0.0;
-        oneArgMode = zeroArgMode;
-    } else {
-        if (!js_ValueToNumber(cx, argv[0], &precision))
-            return JS_FALSE;
-        precision = js_DoubleToInteger(precision);
-        if (precision < precisionMin || precision > precisionMax) {
-            numStr = JS_dtostr(buf, sizeof buf, DTOSTR_STANDARD, 0, precision);
-            if (!numStr)
-                JS_ReportOutOfMemory(cx);
-            else
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_PRECISION_RANGE, numStr);
-            return JS_FALSE;
-        }
-    }
-
-    numStr = JS_dtostr(buf, sizeof buf, oneArgMode, (jsint)precision + precisionOffset, d);
-    if (!numStr) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    str = JS_NewStringCopyZ(cx, numStr);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-num_toFixed(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    /* We allow a larger range of precision than ECMA requires; this is permitted by ECMA. */
-    return num_to(cx, obj, argc, argv, rval, DTOSTR_FIXED, DTOSTR_FIXED, -20, MAX_PRECISION, 0);
-}
-
-static JSBool
-num_toExponential(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    /* We allow a larger range of precision than ECMA requires; this is permitted by ECMA. */
-    return num_to(cx, obj, argc, argv, rval, DTOSTR_STANDARD_EXPONENTIAL, DTOSTR_EXPONENTIAL, 0, MAX_PRECISION, 1);
-}
-
-static JSBool
-num_toPrecision(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    /* We allow a larger range of precision than ECMA requires; this is permitted by ECMA. */
-    return num_to(cx, obj, argc, argv, rval, DTOSTR_STANDARD, DTOSTR_PRECISION, 1, MAX_PRECISION, 0);
-}
-#endif /* JS_HAS_NUMBER_FORMATS */
-
-
-static JSFunctionSpec number_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,       num_toSource,       0,0,0},
-#endif
-    {js_toString_str,       num_toString,       0,0,0},
-    {js_toLocaleString_str, num_toLocaleString, 0,0,0},
-    {js_valueOf_str,        num_valueOf,        0,0,0},
-#if JS_HAS_NUMBER_FORMATS
-    {"toFixed",             num_toFixed,        1,0,0},
-    {"toExponential",       num_toExponential,  1,0,0},
-    {"toPrecision",         num_toPrecision,    1,0,0},
-#endif
-    {0,0,0,0,0}
-};
-
-/* NB: Keep this in synch with number_constants[]. */
-enum nc_slot {
-    NC_NaN,
-    NC_POSITIVE_INFINITY,
-    NC_NEGATIVE_INFINITY,
-    NC_MAX_VALUE,
-    NC_MIN_VALUE,
-    NC_LIMIT
-};
-
-/*
- * Some to most C compilers forbid spelling these at compile time, or barf
- * if you try, so all but MAX_VALUE are set up by js_InitRuntimeNumberState
- * using union jsdpun.
- */
-static JSConstDoubleSpec number_constants[] = {
-    {0,                         js_NaN_str,          0,{0,0,0}},
-    {0,                         "POSITIVE_INFINITY", 0,{0,0,0}},
-    {0,                         "NEGATIVE_INFINITY", 0,{0,0,0}},
-    {1.7976931348623157E+308,   "MAX_VALUE",         0,{0,0,0}},
-    {0,                         "MIN_VALUE",         0,{0,0,0}},
-    {0,0,0,{0,0,0}}
-};
-
-static jsdouble NaN;
-
-
-#if (defined XP_WIN || defined XP_OS2) &&                                     \
-    !defined WINCE &&                                                         \
-    !defined __MWERKS__ &&                                                    \
-    (defined _M_IX86 ||                                                       \
-     (defined __GNUC__ && !defined __MINGW32__))
-
-/*
- * Set the exception mask to mask all exceptions and set the FPU precision
- * to 53 bit mantissa.
- * On Alpha platform this is handled via Compiler option.
- */
-#define FIX_FPU() _control87(MCW_EM | PC_53, MCW_EM | MCW_PC)
-
-#else
-
-#define FIX_FPU() ((void)0)
-
-#endif
-
-JSBool
-js_InitRuntimeNumberState(JSContext *cx)
-{
-    JSRuntime *rt;
-    jsdpun u;
-    struct lconv *locale;
-
-    rt = cx->runtime;
-    JS_ASSERT(!rt->jsNaN);
-
-    FIX_FPU();
-
-    u.s.hi = JSDOUBLE_HI32_EXPMASK | JSDOUBLE_HI32_MANTMASK;
-    u.s.lo = 0xffffffff;
-    number_constants[NC_NaN].dval = NaN = u.d;
-    rt->jsNaN = js_NewDouble(cx, NaN, GCF_LOCK);
-    if (!rt->jsNaN)
-        return JS_FALSE;
-
-    u.s.hi = JSDOUBLE_HI32_EXPMASK;
-    u.s.lo = 0x00000000;
-    number_constants[NC_POSITIVE_INFINITY].dval = u.d;
-    rt->jsPositiveInfinity = js_NewDouble(cx, u.d, GCF_LOCK);
-    if (!rt->jsPositiveInfinity)
-        return JS_FALSE;
-
-    u.s.hi = JSDOUBLE_HI32_SIGNBIT | JSDOUBLE_HI32_EXPMASK;
-    u.s.lo = 0x00000000;
-    number_constants[NC_NEGATIVE_INFINITY].dval = u.d;
-    rt->jsNegativeInfinity = js_NewDouble(cx, u.d, GCF_LOCK);
-    if (!rt->jsNegativeInfinity)
-        return JS_FALSE;
-
-    u.s.hi = 0;
-    u.s.lo = 1;
-    number_constants[NC_MIN_VALUE].dval = u.d;
-
-    locale = localeconv();
-    rt->thousandsSeparator =
-        JS_strdup(cx, locale->thousands_sep ? locale->thousands_sep : "'");
-    rt->decimalSeparator =
-        JS_strdup(cx, locale->decimal_point ? locale->decimal_point : ".");
-    rt->numGrouping =
-        JS_strdup(cx, locale->grouping ? locale->grouping : "\3\0");
-
-    return rt->thousandsSeparator && rt->decimalSeparator && rt->numGrouping;
-}
-
-void
-js_FinishRuntimeNumberState(JSContext *cx)
-{
-    JSRuntime *rt = cx->runtime;
-
-    js_UnlockGCThingRT(rt, rt->jsNaN);
-    js_UnlockGCThingRT(rt, rt->jsNegativeInfinity);
-    js_UnlockGCThingRT(rt, rt->jsPositiveInfinity);
-
-    rt->jsNaN = NULL;
-    rt->jsNegativeInfinity = NULL;
-    rt->jsPositiveInfinity = NULL;
-
-    JS_free(cx, (void *)rt->thousandsSeparator);
-    JS_free(cx, (void *)rt->decimalSeparator);
-    JS_free(cx, (void *)rt->numGrouping);
-    rt->thousandsSeparator = rt->decimalSeparator = rt->numGrouping = NULL;
-}
-
-JSObject *
-js_InitNumberClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto, *ctor;
-    JSRuntime *rt;
-
-    /* XXX must do at least once per new thread, so do it per JSContext... */
-    FIX_FPU();
-
-    if (!JS_DefineFunctions(cx, obj, number_functions))
-        return NULL;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_NumberClass, Number, 1,
-                         NULL, number_methods, NULL, NULL);
-    if (!proto || !(ctor = JS_GetConstructor(cx, proto)))
-        return NULL;
-    OBJ_SET_SLOT(cx, proto, JSSLOT_PRIVATE, JSVAL_ZERO);
-    if (!JS_DefineConstDoubles(cx, ctor, number_constants))
-        return NULL;
-
-    /* ECMA 15.1.1.1 */
-    rt = cx->runtime;
-    if (!JS_DefineProperty(cx, obj, js_NaN_str, DOUBLE_TO_JSVAL(rt->jsNaN),
-                           NULL, NULL, JSPROP_PERMANENT)) {
-        return NULL;
-    }
-
-    /* ECMA 15.1.1.2 */
-    if (!JS_DefineProperty(cx, obj, js_Infinity_str,
-                           DOUBLE_TO_JSVAL(rt->jsPositiveInfinity),
-                           NULL, NULL, JSPROP_PERMANENT)) {
-        return NULL;
-    }
-    return proto;
-}
-
-jsdouble *
-js_NewDouble(JSContext *cx, jsdouble d, uintN gcflag)
-{
-    jsdouble *dp;
-
-    dp = (jsdouble *) js_NewGCThing(cx, gcflag | GCX_DOUBLE, sizeof(jsdouble));
-    if (!dp)
-        return NULL;
-    *dp = d;
-    return dp;
-}
-
-void
-js_FinalizeDouble(JSContext *cx, jsdouble *dp)
-{
-    *dp = NaN;
-}
-
-JSBool
-js_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval)
-{
-    jsdouble *dp;
-
-    dp = js_NewDouble(cx, d, 0);
-    if (!dp)
-        return JS_FALSE;
-    *rval = DOUBLE_TO_JSVAL(dp);
-    return JS_TRUE;
-}
-
-JSBool
-js_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval)
-{
-    jsint i;
-
-    if (JSDOUBLE_IS_INT(d, i) && INT_FITS_IN_JSVAL(i)) {
-        *rval = INT_TO_JSVAL(i);
-    } else {
-        if (!js_NewDoubleValue(cx, d, rval))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JSObject *
-js_NumberToObject(JSContext *cx, jsdouble d)
-{
-    JSObject *obj;
-    jsval v;
-
-    obj = js_NewObject(cx, &js_NumberClass, NULL, NULL);
-    if (!obj)
-        return NULL;
-    if (!js_NewNumberValue(cx, d, &v)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, v);
-    return obj;
-}
-
-JSString *
-js_NumberToString(JSContext *cx, jsdouble d)
-{
-    jsint i;
-    char buf[DTOSTR_STANDARD_BUFFER_SIZE];
-    char *numStr;
-
-    if (JSDOUBLE_IS_INT(d, i))
-        numStr = IntToString(i, buf, sizeof buf);
-    else {
-        numStr = JS_dtostr(buf, sizeof buf, DTOSTR_STANDARD, 0, d);
-        if (!numStr) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-    }
-    return JS_NewStringCopyZ(cx, numStr);
-}
-
-JSBool
-js_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp)
-{
-    JSObject *obj;
-    JSString *str;
-    const jschar *bp, *ep;
-
-    if (JSVAL_IS_OBJECT(v)) {
-        obj = JSVAL_TO_OBJECT(v);
-        if (!obj) {
-            *dp = 0;
-            return JS_TRUE;
-        }
-        if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_NUMBER, &v))
-            return JS_FALSE;
-    }
-    if (JSVAL_IS_INT(v)) {
-        *dp = (jsdouble)JSVAL_TO_INT(v);
-    } else if (JSVAL_IS_DOUBLE(v)) {
-        *dp = *JSVAL_TO_DOUBLE(v);
-    } else if (JSVAL_IS_STRING(v)) {
-        str = JSVAL_TO_STRING(v);
-        /*
-         * Note that ECMA doesn't treat a string beginning with a '0' as an
-         * octal number here.  This works because all such numbers will be
-         * interpreted as decimal by js_strtod and will never get passed to
-         * js_strtointeger (which would interpret them as octal).
-         */
-        /* XXXbe js_strtod shouldn't require NUL termination */
-        bp = js_UndependString(cx, str);
-        if (!bp)
-            return JS_FALSE;
-        if ((!js_strtod(cx, bp, &ep, dp) ||
-             js_SkipWhiteSpace(ep) != bp + str->length) &&
-            (!js_strtointeger(cx, bp, &ep, 0, dp) ||
-             js_SkipWhiteSpace(ep) != bp + str->length)) {
-            goto badstr;
-        }
-    } else if (JSVAL_IS_BOOLEAN(v)) {
-        *dp = JSVAL_TO_BOOLEAN(v) ? 1 : 0;
-    } else {
-#if JS_BUG_FALLIBLE_TONUM
-        str = js_DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NULL);
-badstr:
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NAN,
-                                 JS_GetStringBytes(str));
-
-        }
-        return JS_FALSE;
-#else
-badstr:
-        *dp = *cx->runtime->jsNaN;
-#endif
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip)
-{
-    jsdouble d;
-
-    if (!js_ValueToNumber(cx, v, &d))
-        return JS_FALSE;
-    return js_DoubleToECMAInt32(cx, d, ip);
-}
-
-JSBool
-js_DoubleToECMAInt32(JSContext *cx, jsdouble d, int32 *ip)
-{
-    jsdouble two32 = 4294967296.0;
-    jsdouble two31 = 2147483648.0;
-
-    if (!JSDOUBLE_IS_FINITE(d) || d == 0) {
-        *ip = 0;
-        return JS_TRUE;
-    }
-    d = fmod(d, two32);
-    d = (d >= 0) ? floor(d) : ceil(d) + two32;
-    if (d >= two31)
-        *ip = (int32)(d - two32);
-    else
-        *ip = (int32)d;
-    return JS_TRUE;
-}
-
-JSBool
-js_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip)
-{
-    jsdouble d;
-
-    if (!js_ValueToNumber(cx, v, &d))
-        return JS_FALSE;
-    return js_DoubleToECMAUint32(cx, d, ip);
-}
-
-JSBool
-js_DoubleToECMAUint32(JSContext *cx, jsdouble d, uint32 *ip)
-{
-    JSBool neg;
-    jsdouble two32 = 4294967296.0;
-
-    if (!JSDOUBLE_IS_FINITE(d) || d == 0) {
-        *ip = 0;
-        return JS_TRUE;
-    }
-
-    neg = (d < 0);
-    d = floor(neg ? -d : d);
-    d = neg ? -d : d;
-
-    d = fmod(d, two32);
-
-    d = (d >= 0) ? d : d + two32;
-    *ip = (uint32)d;
-    return JS_TRUE;
-}
-
-JSBool
-js_ValueToInt32(JSContext *cx, jsval v, int32 *ip)
-{
-    jsdouble d;
-    JSString *str;
-
-    if (JSVAL_IS_INT(v)) {
-        *ip = JSVAL_TO_INT(v);
-        return JS_TRUE;
-    }
-    if (!js_ValueToNumber(cx, v, &d))
-        return JS_FALSE;
-    if (JSDOUBLE_IS_NaN(d) || d <= -2147483649.0 || 2147483648.0 <= d) {
-        str = js_DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NULL);
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_CANT_CONVERT, JS_GetStringBytes(str));
-
-        }
-        return JS_FALSE;
-    }
-    *ip = (int32)floor(d + 0.5);     /* Round to nearest */
-    return JS_TRUE;
-}
-
-JSBool
-js_ValueToUint16(JSContext *cx, jsval v, uint16 *ip)
-{
-    jsdouble d;
-    jsuint i, m;
-    JSBool neg;
-
-    if (!js_ValueToNumber(cx, v, &d))
-        return JS_FALSE;
-    if (d == 0 || !JSDOUBLE_IS_FINITE(d)) {
-        *ip = 0;
-        return JS_TRUE;
-    }
-    i = (jsuint)d;
-    if ((jsdouble)i == d) {
-        *ip = (uint16)i;
-        return JS_TRUE;
-    }
-    neg = (d < 0);
-    d = floor(neg ? -d : d);
-    d = neg ? -d : d;
-    m = JS_BIT(16);
-    d = fmod(d, (double)m);
-    if (d < 0)
-        d += m;
-    *ip = (uint16) d;
-    return JS_TRUE;
-}
-
-jsdouble
-js_DoubleToInteger(jsdouble d)
-{
-    JSBool neg;
-
-    if (d == 0)
-        return d;
-    if (!JSDOUBLE_IS_FINITE(d)) {
-        if (JSDOUBLE_IS_NaN(d))
-            return 0;
-        return d;
-    }
-    neg = (d < 0);
-    d = floor(neg ? -d : d);
-    return neg ? -d : d;
-}
-
-
-JSBool
-js_strtod(JSContext *cx, const jschar *s, const jschar **ep, jsdouble *dp)
-{
-    char cbuf[32];
-    size_t i;
-    char *cstr, *istr, *estr;
-    JSBool negative;
-    jsdouble d;
-    const jschar *s1 = js_SkipWhiteSpace(s);
-    size_t length = js_strlen(s1);
-
-    /* Use cbuf to avoid malloc */
-    if (length >= sizeof cbuf) {
-        cstr = (char *) JS_malloc(cx, length + 1);
-        if (!cstr)
-           return JS_FALSE;
-    } else {
-        cstr = cbuf;
-    }
-
-    for (i = 0; i <= length; i++) {
-        if (s1[i] >> 8) {
-            cstr[i] = 0;
-            break;
-        }
-        cstr[i] = (char)s1[i];
-    }
-
-    istr = cstr;
-    if ((negative = (*istr == '-')) != 0 || *istr == '+')
-        istr++;
-    if (!strncmp(istr, js_Infinity_str, sizeof js_Infinity_str - 1)) {
-        d = *(negative ? cx->runtime->jsNegativeInfinity : cx->runtime->jsPositiveInfinity);
-        estr = istr + 8;
-    } else {
-        int err;
-        d = JS_strtod(cstr, &estr, &err);
-        if (err == JS_DTOA_ENOMEM) {
-            JS_ReportOutOfMemory(cx);
-            if (cstr != cbuf)
-                JS_free(cx, cstr);
-            return JS_FALSE;
-        }
-        if (err == JS_DTOA_ERANGE) {
-            if (d == HUGE_VAL)
-                d = *cx->runtime->jsPositiveInfinity;
-            else if (d == -HUGE_VAL)
-                d = *cx->runtime->jsNegativeInfinity;
-        }
-#ifdef HPUX
-        if (d == 0.0 && negative) {
-            /*
-             * "-0", "-1e-2000" come out as positive zero
-             * here on HPUX. Force a negative zero instead.
-             */
-            JSDOUBLE_HI32(d) = JSDOUBLE_HI32_SIGNBIT;
-            JSDOUBLE_LO32(d) = 0;
-        }
-#endif
-    }
-
-    i = estr - cstr;
-    if (cstr != cbuf)
-        JS_free(cx, cstr);
-    *ep = i ? s1 + i : s;
-    *dp = d;
-    return JS_TRUE;
-}
-
-struct BinaryDigitReader
-{
-    uintN base;                 /* Base of number; must be a power of 2 */
-    uintN digit;                /* Current digit value in radix given by base */
-    uintN digitMask;            /* Mask to extract the next bit from digit */
-    const jschar *digits;       /* Pointer to the remaining digits */
-    const jschar *end;          /* Pointer to first non-digit */
-};
-
-/* Return the next binary digit from the number or -1 if done */
-static intN GetNextBinaryDigit(struct BinaryDigitReader *bdr)
-{
-    intN bit;
-
-    if (bdr->digitMask == 0) {
-        uintN c;
-
-        if (bdr->digits == bdr->end)
-            return -1;
-
-        c = *bdr->digits++;
-        if ('0' <= c && c <= '9')
-            bdr->digit = c - '0';
-        else if ('a' <= c && c <= 'z')
-            bdr->digit = c - 'a' + 10;
-        else bdr->digit = c - 'A' + 10;
-        bdr->digitMask = bdr->base >> 1;
-    }
-    bit = (bdr->digit & bdr->digitMask) != 0;
-    bdr->digitMask >>= 1;
-    return bit;
-}
-
-JSBool
-js_strtointeger(JSContext *cx, const jschar *s, const jschar **ep, jsint base, jsdouble *dp)
-{
-    JSBool negative;
-    jsdouble value;
-    const jschar *start;
-    const jschar *s1 = js_SkipWhiteSpace(s);
-
-    if ((negative = (*s1 == '-')) != 0 || *s1 == '+')
-        s1++;
-
-    if (base == 0) {
-        /* No base supplied, or some base that evaluated to 0. */
-        if (*s1 == '0') {
-            /* It's either hex or octal; only increment char if str isn't '0' */
-            if (s1[1] == 'X' || s1[1] == 'x') { /* Hex */
-                s1 += 2;
-                base = 16;
-            } else {    /* Octal */
-                base = 8;
-            }
-        } else {
-            base = 10; /* Default to decimal. */
-        }
-    } else if (base == 16 && *s1 == '0' && (s1[1] == 'X' || s1[1] == 'x')) {
-        /* If base is 16, ignore hex prefix. */
-        s1 += 2;
-    }
-
-    /*
-     * Done with the preliminaries; find some prefix of the string that's
-     * a number in the given base.
-     */
-    start = s1; /* Mark - if string is empty, we return NaN. */
-    value = 0.0;
-    for (;;) {
-        uintN digit;
-        jschar c = *s1;
-        if ('0' <= c && c <= '9')
-            digit = c - '0';
-        else if ('a' <= c && c <= 'z')
-            digit = c - 'a' + 10;
-        else if ('A' <= c && c <= 'Z')
-            digit = c - 'A' + 10;
-        else
-            break;
-        if (digit >= (uintN)base)
-            break;
-        value = value * base + digit;
-        s1++;
-    }
-
-    if (value >= 9007199254740992.0) {
-        if (base == 10) {
-            /*
-             * If we're accumulating a decimal number and the number is >=
-             * 2^53, then the result from the repeated multiply-add above may
-             * be inaccurate.  Call JS_strtod to get the correct answer.
-             */
-            size_t i;
-            size_t length = s1 - start;
-            char *cstr = (char *) JS_malloc(cx, length + 1);
-            char *estr;
-            int err=0;
-
-            if (!cstr)
-                return JS_FALSE;
-            for (i = 0; i != length; i++)
-                cstr[i] = (char)start[i];
-            cstr[length] = 0;
-
-            value = JS_strtod(cstr, &estr, &err);
-            if (err == JS_DTOA_ENOMEM) {
-                JS_ReportOutOfMemory(cx);
-                JS_free(cx, cstr);
-                return JS_FALSE;
-            }
-            if (err == JS_DTOA_ERANGE && value == HUGE_VAL)
-                value = *cx->runtime->jsPositiveInfinity;
-            JS_free(cx, cstr);
-        } else if ((base & (base - 1)) == 0) {
-            /*
-             * The number may also be inaccurate for power-of-two bases.  This
-             * happens if the addition in value * base + digit causes a round-
-             * down to an even least significant mantissa bit when the first
-             * dropped bit is a one.  If any of the following digits in the
-             * number (which haven't been added in yet) are nonzero, then the
-             * correct action would have been to round up instead of down.  An
-             * example occurs when reading the number 0x1000000000000081, which
-             * rounds to 0x1000000000000000 instead of 0x1000000000000100.
-             */
-            struct BinaryDigitReader bdr;
-            intN bit, bit2;
-            intN j;
-
-            bdr.base = base;
-            bdr.digitMask = 0;
-            bdr.digits = start;
-            bdr.end = s1;
-            value = 0.0;
-
-            /* Skip leading zeros. */
-            do {
-                bit = GetNextBinaryDigit(&bdr);
-            } while (bit == 0);
-
-            if (bit == 1) {
-                /* Gather the 53 significant bits (including the leading 1) */
-                value = 1.0;
-                for (j = 52; j; j--) {
-                    bit = GetNextBinaryDigit(&bdr);
-                    if (bit < 0)
-                        goto done;
-                    value = value*2 + bit;
-                }
-                /* bit2 is the 54th bit (the first dropped from the mantissa) */
-                bit2 = GetNextBinaryDigit(&bdr);
-                if (bit2 >= 0) {
-                    jsdouble factor = 2.0;
-                    intN sticky = 0;  /* sticky is 1 if any bit beyond the 54th is 1 */
-                    intN bit3;
-
-                    while ((bit3 = GetNextBinaryDigit(&bdr)) >= 0) {
-                        sticky |= bit3;
-                        factor *= 2;
-                    }
-                    value += bit2 & (bit | sticky);
-                    value *= factor;
-                }
-              done:;
-            }
-        }
-    }
-    /* We don't worry about inaccurate numbers for any other base. */
-
-    if (s1 == start) {
-        *dp = 0.0;
-        *ep = s;
-    } else {
-        *dp = negative ? -value : value;
-        *ep = s1;
-    }
-    return JS_TRUE;
-}
diff --git a/libs/js/src/jsnum.h b/libs/js/src/jsnum.h
deleted file mode 100644
index cd99501e77..0000000000
--- a/libs/js/src/jsnum.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsnum_h___
-#define jsnum_h___
-/*
- * JS number (IEEE double) interface.
- *
- * JS numbers are optimistically stored in the top 31 bits of 32-bit integers,
- * but floating point literals, results that overflow 31 bits, and division and
- * modulus operands and results require a 64-bit IEEE double.  These are GC'ed
- * and pointed to by 32-bit jsvals on the stack and in object properties.
- *
- * When a JS number is treated as an object (followed by . or []), the runtime
- * wraps it with a JSObject whose valueOf method returns the unwrapped number.
- */
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
- *  ARM is a little endian architecture but 64 bit double words are stored
- * differently: the 32 bit words are in little endian byte order, the two words
- * are stored in big endian`s way.
- */
-
-#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
-#define CPU_IS_ARM
-#endif
-
-typedef union jsdpun {
-    struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-        uint32 lo, hi;
-#else
-        uint32 hi, lo;
-#endif
-    } s;
-    jsdouble d;
-} jsdpun;
-
-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
-/*
- * This version of the macros is safe for the alias optimizations that gcc
- * does, but uses gcc-specific extensions.
- */
-
-#define JSDOUBLE_HI32(x) (__extension__ ({ jsdpun u; u.d = (x); u.s.hi; }))
-#define JSDOUBLE_LO32(x) (__extension__ ({ jsdpun u; u.d = (x); u.s.lo; }))
-#define JSDOUBLE_SET_HI32(x, y) \
-    (__extension__ ({ jsdpun u; u.d = (x); u.s.hi = (y); (x) = u.d; }))
-#define JSDOUBLE_SET_LO32(x, y) \
-    (__extension__ ({ jsdpun u; u.d = (x); u.s.lo = (y); (x) = u.d; }))
-
-#else /* not or old GNUC */
-
-/*
- * We don't know of any non-gcc compilers that perform alias optimization,
- * so this code should work.
- */
-
-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[1])
-#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[0])
-#else
-#define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[0])
-#define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[1])
-#endif
-
-#define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))
-#define JSDOUBLE_SET_LO32(x, y) (JSDOUBLE_LO32(x)=(y))
-
-#endif /* not or old GNUC */
-
-#define JSDOUBLE_HI32_SIGNBIT   0x80000000
-#define JSDOUBLE_HI32_EXPMASK   0x7ff00000
-#define JSDOUBLE_HI32_MANTMASK  0x000fffff
-
-#define JSDOUBLE_IS_NaN(x)                                                    \
-    ((JSDOUBLE_HI32(x) & JSDOUBLE_HI32_EXPMASK) == JSDOUBLE_HI32_EXPMASK &&   \
-     (JSDOUBLE_LO32(x) || (JSDOUBLE_HI32(x) & JSDOUBLE_HI32_MANTMASK)))
-
-#define JSDOUBLE_IS_INFINITE(x)                                               \
-    ((JSDOUBLE_HI32(x) & ~JSDOUBLE_HI32_SIGNBIT) == JSDOUBLE_HI32_EXPMASK &&  \
-     !JSDOUBLE_LO32(x))
-
-#define JSDOUBLE_IS_FINITE(x)                                                 \
-    ((JSDOUBLE_HI32(x) & JSDOUBLE_HI32_EXPMASK) != JSDOUBLE_HI32_EXPMASK)
-
-#define JSDOUBLE_IS_NEGZERO(d)  (JSDOUBLE_HI32(d) == JSDOUBLE_HI32_SIGNBIT && \
-                                 JSDOUBLE_LO32(d) == 0)
-
-/*
- * JSDOUBLE_IS_INT first checks that d is neither NaN nor infinite, to avoid
- * raising SIGFPE on platforms such as Alpha Linux, then (only if the cast is
- * safe) leaves i as (jsint)d.  This also avoid anomalous NaN floating point
- * comparisons under MSVC.
- */
-#define JSDOUBLE_IS_INT(d, i) (JSDOUBLE_IS_FINITE(d)                          \
-                               && !JSDOUBLE_IS_NEGZERO(d)                     \
-                               && ((d) == (i = (jsint)(d))))
-
-#if defined(XP_WIN)
-#define JSDOUBLE_COMPARE(LVAL, OP, RVAL, IFNAN)                               \
-    ((JSDOUBLE_IS_NaN(LVAL) || JSDOUBLE_IS_NaN(RVAL))                         \
-     ? (IFNAN)                                                                \
-     : (LVAL) OP (RVAL))
-#else
-#define JSDOUBLE_COMPARE(LVAL, OP, RVAL, IFNAN) ((LVAL) OP (RVAL))
-#endif
-
-/* Initialize number constants and runtime state for the first context. */
-extern JSBool
-js_InitRuntimeNumberState(JSContext *cx);
-
-extern void
-js_FinishRuntimeNumberState(JSContext *cx);
-
-/* Initialize the Number class, returning its prototype object. */
-extern JSClass js_NumberClass;
-
-extern JSObject *
-js_InitNumberClass(JSContext *cx, JSObject *obj);
-
-/*
- * String constants for global function names, used in jsapi.c and jsnum.c.
- */
-extern const char js_Infinity_str[];
-extern const char js_NaN_str[];
-extern const char js_isNaN_str[];
-extern const char js_isFinite_str[];
-extern const char js_parseFloat_str[];
-extern const char js_parseInt_str[];
-
-/* GC-allocate a new JS number. */
-extern jsdouble *
-js_NewDouble(JSContext *cx, jsdouble d, uintN gcflag);
-
-extern void
-js_FinalizeDouble(JSContext *cx, jsdouble *dp);
-
-extern JSBool
-js_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval);
-
-extern JSBool
-js_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval);
-
-/* Construct a Number instance that wraps around d. */
-extern JSObject *
-js_NumberToObject(JSContext *cx, jsdouble d);
-
-/* Convert a number to a GC'ed string. */
-extern JSString *
-js_NumberToString(JSContext *cx, jsdouble d);
-
-/*
- * Convert a value to a number, returning false after reporting any error,
- * otherwise returning true with *dp set.
- */
-extern JSBool
-js_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp);
-
-/*
- * Convert a value or a double to an int32, according to the ECMA rules
- * for ToInt32.
- */
-extern JSBool
-js_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip);
-
-extern JSBool
-js_DoubleToECMAInt32(JSContext *cx, jsdouble d, int32 *ip);
-
-/*
- * Convert a value or a double to a uint32, according to the ECMA rules
- * for ToUint32.
- */
-extern JSBool
-js_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip);
-
-extern JSBool
-js_DoubleToECMAUint32(JSContext *cx, jsdouble d, uint32 *ip);
-
-/*
- * Convert a value to a number, then to an int32 if it fits by rounding to
- * nearest; but failing with an error report if the double is out of range
- * or unordered.
- */
-extern JSBool
-js_ValueToInt32(JSContext *cx, jsval v, int32 *ip);
-
-/*
- * Convert a value to a number, then to a uint16 according to the ECMA rules
- * for ToUint16.
- */
-extern JSBool
-js_ValueToUint16(JSContext *cx, jsval v, uint16 *ip);
-
-/*
- * Convert a jsdouble to an integral number, stored in a jsdouble.
- * If d is NaN, return 0.  If d is an infinity, return it without conversion.
- */
-extern jsdouble
-js_DoubleToInteger(jsdouble d);
-
-/*
- * Similar to strtod except that it replaces overflows with infinities of the
- * correct sign, and underflows with zeros of the correct sign.  Guaranteed to
- * return the closest double number to the given input in dp.
- *
- * Also allows inputs of the form [+|-]Infinity, which produce an infinity of
- * the appropriate sign.  The case of the "Infinity" string must match exactly.
- * If the string does not contain a number, set *ep to s and return 0.0 in dp.
- * Return false if out of memory.
- */
-extern JSBool
-js_strtod(JSContext *cx, const jschar *s, const jschar **ep, jsdouble *dp);
-
-/*
- * Similar to strtol except that it handles integers of arbitrary size.
- * Guaranteed to return the closest double number to the given input when radix
- * is 10 or a power of 2.  Callers may see round-off errors for very large
- * numbers of a different radix than 10 or a power of 2.
- *
- * If the string does not contain a number, set *ep to s and return 0.0 in dp.
- * Return false if out of memory.
- */
-extern JSBool
-js_strtointeger(JSContext *cx, const jschar *s, const jschar **ep, jsint radix, jsdouble *dp);
-
-JS_END_EXTERN_C
-
-#endif /* jsnum_h___ */
diff --git a/libs/js/src/jsobj.c b/libs/js/src/jsobj.c
deleted file mode 100644
index 785cf4093e..0000000000
--- a/libs/js/src/jsobj.c
+++ /dev/null
@@ -1,4426 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS object implementation.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jshash.h" /* Added by JSIFY */
-#include "jsdhash.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-#include "jsopcode.h"
-
-#include "jsdbgapi.h"   /* whether or not JS_HAS_OBJ_WATCHPOINT */
-
-#ifdef JS_THREADSAFE
-#define NATIVE_DROP_PROPERTY js_DropProperty
-
-extern void
-js_DropProperty(JSContext *cx, JSObject *obj, JSProperty *prop);
-#else
-#define NATIVE_DROP_PROPERTY NULL
-#endif
-
-JS_FRIEND_DATA(JSObjectOps) js_ObjectOps = {
-    js_NewObjectMap,        js_DestroyObjectMap,
-    js_LookupProperty,      js_DefineProperty,
-    js_GetProperty,         js_SetProperty,
-    js_GetAttributes,       js_SetAttributes,
-    js_DeleteProperty,      js_DefaultValue,
-    js_Enumerate,           js_CheckAccess,
-    NULL,                   NATIVE_DROP_PROPERTY,
-    js_Call,                js_Construct,
-    NULL,                   js_HasInstance,
-    js_SetProtoOrParent,    js_SetProtoOrParent,
-    js_Mark,                js_Clear,
-    js_GetRequiredSlot,     js_SetRequiredSlot
-};
-
-JSClass js_ObjectClass = {
-    js_Object_str,
-    0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-#if JS_HAS_OBJ_PROTO_PROP
-
-static JSBool
-obj_getSlot(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-static JSBool
-obj_setSlot(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-static JSBool
-obj_getCount(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-static JSPropertySpec object_props[] = {
-    /* These two must come first; see object_props[slot].name usage below. */
-    {js_proto_str, JSSLOT_PROTO, JSPROP_PERMANENT|JSPROP_SHARED,
-                                                  obj_getSlot,  obj_setSlot},
-    {js_parent_str,JSSLOT_PARENT,JSPROP_READONLY|JSPROP_PERMANENT|JSPROP_SHARED,
-                                                  obj_getSlot,  obj_setSlot},
-    {js_count_str, 0,            JSPROP_PERMANENT,obj_getCount, obj_getCount},
-    {0,0,0,0,0}
-};
-
-/* NB: JSSLOT_PROTO and JSSLOT_PARENT are already indexes into object_props. */
-#define JSSLOT_COUNT 2
-
-static JSBool
-ReportStrictSlot(JSContext *cx, uint32 slot)
-{
-    if (slot == JSSLOT_PROTO)
-        return JS_TRUE;
-    return JS_ReportErrorFlagsAndNumber(cx,
-                                        JSREPORT_WARNING | JSREPORT_STRICT,
-                                        js_GetErrorMessage, NULL,
-                                        JSMSG_DEPRECATED_USAGE,
-                                        object_props[slot].name);
-}
-
-static JSBool
-obj_getSlot(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    uint32 slot;
-    jsid propid;
-    JSAccessMode mode;
-    uintN attrs;
-    JSObject *pobj;
-    JSClass *clasp;
-    JSExtendedClass *xclasp;
-
-    slot = (uint32) JSVAL_TO_INT(id);
-    if (id == INT_TO_JSVAL(JSSLOT_PROTO)) {
-        propid = ATOM_TO_JSID(cx->runtime->atomState.protoAtom);
-        mode = JSACC_PROTO;
-    } else {
-        propid = ATOM_TO_JSID(cx->runtime->atomState.parentAtom);
-        mode = JSACC_PARENT;
-    }
-
-    /* Let OBJ_CHECK_ACCESS get the slot's value, based on the access mode. */
-    if (!OBJ_CHECK_ACCESS(cx, obj, propid, mode, vp, &attrs))
-        return JS_FALSE;
-
-    pobj = JSVAL_TO_OBJECT(*vp);
-    if (pobj) {
-        clasp = OBJ_GET_CLASS(cx, pobj);
-        if (clasp->flags & JSCLASS_IS_EXTENDED) {
-            xclasp = (JSExtendedClass *) clasp;
-            if (xclasp->outerObject) {
-                pobj = xclasp->outerObject(cx, pobj);
-                if (!pobj)
-                    return JS_FALSE;
-                *vp = OBJECT_TO_JSVAL(pobj);
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-obj_setSlot(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSObject *pobj;
-    uint32 slot;
-    jsid propid;
-    uintN attrs;
-
-    if (!JSVAL_IS_OBJECT(*vp))
-        return JS_TRUE;
-    pobj = JSVAL_TO_OBJECT(*vp);
-    slot = (uint32) JSVAL_TO_INT(id);
-    if (JS_HAS_STRICT_OPTION(cx) && !ReportStrictSlot(cx, slot))
-        return JS_FALSE;
-
-    /* __parent__ is readonly and permanent, only __proto__ may be set. */
-    propid = ATOM_TO_JSID(cx->runtime->atomState.protoAtom);
-    if (!OBJ_CHECK_ACCESS(cx, obj, propid, JSACC_PROTO|JSACC_WRITE, vp, &attrs))
-        return JS_FALSE;
-
-    return js_SetProtoOrParent(cx, obj, slot, pobj);
-}
-
-static JSBool
-obj_getCount(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsval iter_state;
-    jsid num_properties;
-    JSBool ok;
-
-    if (JS_HAS_STRICT_OPTION(cx) && !ReportStrictSlot(cx, JSSLOT_COUNT))
-        return JS_FALSE;
-
-    /* Get the number of properties to enumerate. */
-    iter_state = JSVAL_NULL;
-    ok = OBJ_ENUMERATE(cx, obj, JSENUMERATE_INIT, &iter_state, &num_properties);
-    if (!ok)
-        goto out;
-
-    if (!JSVAL_IS_INT(num_properties)) {
-        JS_ASSERT(0);
-        *vp = JSVAL_ZERO;
-        goto out;
-    }
-    *vp = num_properties;
-
-out:
-    if (iter_state != JSVAL_NULL)
-        ok = OBJ_ENUMERATE(cx, obj, JSENUMERATE_DESTROY, &iter_state, 0);
-    return ok;
-}
-
-#else  /* !JS_HAS_OBJ_PROTO_PROP */
-
-#define object_props NULL
-
-#endif /* !JS_HAS_OBJ_PROTO_PROP */
-
-JSBool
-js_SetProtoOrParent(JSContext *cx, JSObject *obj, uint32 slot, JSObject *pobj)
-{
-    JSRuntime *rt;
-    JSObject *obj2, *oldproto;
-    JSScope *scope, *newscope;
-
-    /*
-     * Serialize all proto and parent setting in order to detect cycles.
-     * We nest locks in this function, and only here, in the following orders:
-     *
-     * (1)  rt->setSlotLock < pobj's scope lock;
-     *      rt->setSlotLock < pobj's proto-or-parent's scope lock;
-     *      rt->setSlotLock < pobj's grand-proto-or-parent's scope lock;
-     *      etc...
-     * (2)  rt->setSlotLock < obj's scope lock < pobj's scope lock.
-     *
-     * We avoid AB-BA deadlock by restricting obj from being on pobj's parent
-     * or proto chain (pobj may already be on obj's parent or proto chain; it
-     * could be moving up or down).  We finally order obj with respect to pobj
-     * at the bottom of this routine (just before releasing rt->setSlotLock),
-     * by making pobj be obj's prototype or parent.
-     *
-     * After we have set the slot and released rt->setSlotLock, another call
-     * to js_SetProtoOrParent could nest locks according to the first order
-     * list above, but it cannot deadlock with any other thread.  For there
-     * to be a deadlock, other parts of the engine would have to nest scope
-     * locks in the opposite order.  XXXbe ensure they don't!
-     */
-    rt = cx->runtime;
-#ifdef JS_THREADSAFE
-
-    JS_ACQUIRE_LOCK(rt->setSlotLock);
-    while (rt->setSlotBusy) {
-        jsrefcount saveDepth;
-
-        /* Take pains to avoid nesting rt->gcLock inside rt->setSlotLock! */
-        JS_RELEASE_LOCK(rt->setSlotLock);
-        saveDepth = JS_SuspendRequest(cx);
-        JS_ACQUIRE_LOCK(rt->setSlotLock);
-        if (rt->setSlotBusy)
-            JS_WAIT_CONDVAR(rt->setSlotDone, JS_NO_TIMEOUT);
-        JS_RELEASE_LOCK(rt->setSlotLock);
-        JS_ResumeRequest(cx, saveDepth);
-        JS_ACQUIRE_LOCK(rt->setSlotLock);
-    }
-    rt->setSlotBusy = JS_TRUE;
-    JS_RELEASE_LOCK(rt->setSlotLock);
-
-#define SET_SLOT_DONE(rt)                                                     \
-    JS_BEGIN_MACRO                                                            \
-        JS_ACQUIRE_LOCK((rt)->setSlotLock);                                   \
-        (rt)->setSlotBusy = JS_FALSE;                                         \
-        JS_NOTIFY_ALL_CONDVAR((rt)->setSlotDone);                             \
-        JS_RELEASE_LOCK((rt)->setSlotLock);                                   \
-    JS_END_MACRO
-
-#else
-
-#define SET_SLOT_DONE(rt)       /* nothing */
-
-#endif
-
-    obj2 = pobj;
-    while (obj2) {
-        if (obj2 == obj) {
-            SET_SLOT_DONE(rt);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_CYCLIC_VALUE,
-#if JS_HAS_OBJ_PROTO_PROP
-                                 object_props[slot].name
-#else
-                                 (slot == JSSLOT_PROTO) ? js_proto_str
-                                                        : js_parent_str
-#endif
-                                 );
-            return JS_FALSE;
-        }
-        obj2 = JSVAL_TO_OBJECT(OBJ_GET_SLOT(cx, obj2, slot));
-    }
-
-    if (slot == JSSLOT_PROTO && OBJ_IS_NATIVE(obj)) {
-        /* Check to see whether obj shares its prototype's scope. */
-        JS_LOCK_OBJ(cx, obj);
-        scope = OBJ_SCOPE(obj);
-        oldproto = JSVAL_TO_OBJECT(LOCKED_OBJ_GET_SLOT(obj, JSSLOT_PROTO));
-        if (oldproto && OBJ_SCOPE(oldproto) == scope) {
-            /* Either obj needs a new empty scope, or it should share pobj's. */
-            if (!pobj ||
-                !OBJ_IS_NATIVE(pobj) ||
-                OBJ_GET_CLASS(cx, pobj) != LOCKED_OBJ_GET_CLASS(oldproto)) {
-                /*
-                 * With no proto and no scope of its own, obj is truly empty.
-                 *
-                 * If pobj is not native, obj needs its own empty scope -- it
-                 * should not continue to share oldproto's scope once oldproto
-                 * is not on obj's prototype chain.  That would put properties
-                 * from oldproto's scope ahead of properties defined by pobj,
-                 * in lookup order.
-                 *
-                 * If pobj's class differs from oldproto's, we may need a new
-                 * scope to handle differences in private and reserved slots,
-                 * so we suboptimally but safely make one.
-                 */
-                scope = js_GetMutableScope(cx, obj);
-                if (!scope) {
-                    JS_UNLOCK_OBJ(cx, obj);
-                    SET_SLOT_DONE(rt);
-                    return JS_FALSE;
-                }
-            } else if (OBJ_SCOPE(pobj) != scope) {
-#ifdef JS_THREADSAFE
-                /*
-                 * We are about to nest scope locks.  Help jslock.c:ShareScope
-                 * keep scope->u.count balanced for the JS_UNLOCK_SCOPE, while
-                 * avoiding deadlock, by recording scope in rt->setSlotScope.
-                 */
-                if (scope->ownercx) {
-                    JS_ASSERT(scope->ownercx == cx);
-                    rt->setSlotScope = scope;
-                }
-#endif
-
-                /* We can't deadlock because we checked for cycles above (2). */
-                JS_LOCK_OBJ(cx, pobj);
-                newscope = (JSScope *) js_HoldObjectMap(cx, pobj->map);
-                obj->map = &newscope->map;
-                js_DropObjectMap(cx, &scope->map, obj);
-                JS_TRANSFER_SCOPE_LOCK(cx, scope, newscope);
-                scope = newscope;
-#ifdef JS_THREADSAFE
-                rt->setSlotScope = NULL;
-#endif
-            }
-        }
-        LOCKED_OBJ_SET_SLOT(obj, JSSLOT_PROTO, OBJECT_TO_JSVAL(pobj));
-        JS_UNLOCK_SCOPE(cx, scope);
-    } else {
-        OBJ_SET_SLOT(cx, obj, slot, OBJECT_TO_JSVAL(pobj));
-    }
-
-    SET_SLOT_DONE(rt);
-    return JS_TRUE;
-
-#undef SET_SLOT_DONE
-}
-
-JS_STATIC_DLL_CALLBACK(JSHashNumber)
-js_hash_object(const void *key)
-{
-    return (JSHashNumber)JS_PTR_TO_UINT32(key) >> JSVAL_TAGBITS;
-}
-
-static JSHashEntry *
-MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
-{
-    JSSharpObjectMap *map;
-    JSHashTable *table;
-    JSHashNumber hash;
-    JSHashEntry **hep, *he;
-    jsatomid sharpid;
-    JSIdArray *ida;
-    JSBool ok;
-    jsint i, length;
-    jsid id;
-#if JS_HAS_GETTER_SETTER
-    JSObject *obj2;
-    JSProperty *prop;
-    uintN attrs;
-#endif
-    jsval val;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return NULL;
-    }
-
-    map = &cx->sharpObjectMap;
-    table = map->table;
-    hash = js_hash_object(obj);
-    hep = JS_HashTableRawLookup(table, hash, obj);
-    he = *hep;
-    if (!he) {
-        sharpid = 0;
-        he = JS_HashTableRawAdd(table, hep, hash, obj,
-                                JS_UINT32_TO_PTR(sharpid));
-        if (!he) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-
-        /*
-         * Increment map->depth to protect js_EnterSharpObject from reentering
-         * itself badly.  Without this fix, if we reenter the basis case where
-         * map->depth == 0, when unwinding the inner call we will destroy the
-         * newly-created hash table and crash.
-         */
-        ++map->depth;
-        ida = JS_Enumerate(cx, obj);
-        --map->depth;
-        if (!ida)
-            return NULL;
-
-        ok = JS_TRUE;
-        for (i = 0, length = ida->length; i < length; i++) {
-            id = ida->vector[i];
-#if JS_HAS_GETTER_SETTER
-            ok = OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop);
-            if (!ok)
-                break;
-            if (!prop)
-                continue;
-            ok = OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &attrs);
-            if (ok) {
-                if (OBJ_IS_NATIVE(obj2) &&
-                    (attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
-                    val = JSVAL_NULL;
-                    if (attrs & JSPROP_GETTER)
-                        val = (jsval) ((JSScopeProperty*)prop)->getter;
-                    if (attrs & JSPROP_SETTER) {
-                        if (val != JSVAL_NULL) {
-                            /* Mark the getter, then set val to setter. */
-                            ok = (MarkSharpObjects(cx, JSVAL_TO_OBJECT(val),
-                                                   NULL)
-                                  != NULL);
-                        }
-                        val = (jsval) ((JSScopeProperty*)prop)->setter;
-                    }
-                } else {
-                    ok = OBJ_GET_PROPERTY(cx, obj, id, &val);
-                }
-            }
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-#else
-            ok = OBJ_GET_PROPERTY(cx, obj, id, &val);
-#endif
-            if (!ok)
-                break;
-            if (!JSVAL_IS_PRIMITIVE(val) &&
-                !MarkSharpObjects(cx, JSVAL_TO_OBJECT(val), NULL)) {
-                ok = JS_FALSE;
-                break;
-            }
-        }
-        if (!ok || !idap)
-            JS_DestroyIdArray(cx, ida);
-        if (!ok)
-            return NULL;
-    } else {
-        sharpid = JS_PTR_TO_UINT32(he->value);
-        if (sharpid == 0) {
-            sharpid = ++map->sharpgen << SHARP_ID_SHIFT;
-            he->value = JS_UINT32_TO_PTR(sharpid);
-        }
-        ida = NULL;
-    }
-    if (idap)
-        *idap = ida;
-    return he;
-}
-
-JSHashEntry *
-js_EnterSharpObject(JSContext *cx, JSObject *obj, JSIdArray **idap,
-                    jschar **sp)
-{
-    JSSharpObjectMap *map;
-    JSHashTable *table;
-    JSIdArray *ida;
-    JSHashNumber hash;
-    JSHashEntry *he, **hep;
-    jsatomid sharpid;
-    char buf[20];
-    size_t len;
-
-    if (JS_HAS_NATIVE_BRANCH_CALLBACK_OPTION(cx) &&
-        cx->branchCallback &&
-        !cx->branchCallback(cx, NULL)) {
-        return NULL;
-    }
-
-    /* Set to null in case we return an early error. */
-    *sp = NULL;
-    map = &cx->sharpObjectMap;
-    table = map->table;
-    if (!table) {
-        table = JS_NewHashTable(8, js_hash_object, JS_CompareValues,
-                                JS_CompareValues, NULL, NULL);
-        if (!table) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-        map->table = table;
-    }
-
-    ida = NULL;
-    if (map->depth == 0) {
-        he = MarkSharpObjects(cx, obj, &ida);
-        if (!he)
-            goto bad;
-        JS_ASSERT((JS_PTR_TO_UINT32(he->value) & SHARP_BIT) == 0);
-        if (!idap) {
-            JS_DestroyIdArray(cx, ida);
-            ida = NULL;
-        }
-    } else {
-        hash = js_hash_object(obj);
-        hep = JS_HashTableRawLookup(table, hash, obj);
-        he = *hep;
-
-        /*
-         * It's possible that the value of a property has changed from the
-         * first time the object's properties are traversed (when the property
-         * ids are entered into the hash table) to the second (when they are
-         * converted to strings), i.e., the OBJ_GET_PROPERTY() call is not
-         * idempotent.
-         */
-        if (!he) {
-            he = JS_HashTableRawAdd(table, hep, hash, obj, NULL);
-            if (!he) {
-                JS_ReportOutOfMemory(cx);
-                goto bad;
-            }
-            sharpid = 0;
-            goto out;
-        }
-    }
-
-    sharpid = JS_PTR_TO_UINT32(he->value);
-    if (sharpid != 0) {
-        len = JS_snprintf(buf, sizeof buf, "#%u%c",
-                          sharpid >> SHARP_ID_SHIFT,
-                          (sharpid & SHARP_BIT) ? '#' : '=');
-        *sp = js_InflateString(cx, buf, &len);
-        if (!*sp) {
-            if (ida)
-                JS_DestroyIdArray(cx, ida);
-            goto bad;
-        }
-    }
-
-out:
-    JS_ASSERT(he);
-    if ((sharpid & SHARP_BIT) == 0) {
-        if (idap && !ida) {
-            ida = JS_Enumerate(cx, obj);
-            if (!ida) {
-                if (*sp) {
-                    JS_free(cx, *sp);
-                    *sp = NULL;
-                }
-                goto bad;
-            }
-        }
-        map->depth++;
-    }
-
-    if (idap)
-        *idap = ida;
-    return he;
-
-bad:
-    /* Clean up the sharpObjectMap table on outermost error. */
-    if (map->depth == 0) {
-        map->sharpgen = 0;
-        JS_HashTableDestroy(map->table);
-        map->table = NULL;
-    }
-    return NULL;
-}
-
-void
-js_LeaveSharpObject(JSContext *cx, JSIdArray **idap)
-{
-    JSSharpObjectMap *map;
-    JSIdArray *ida;
-
-    map = &cx->sharpObjectMap;
-    JS_ASSERT(map->depth > 0);
-    if (--map->depth == 0) {
-        map->sharpgen = 0;
-        JS_HashTableDestroy(map->table);
-        map->table = NULL;
-    }
-    if (idap) {
-        ida = *idap;
-        if (ida) {
-            JS_DestroyIdArray(cx, ida);
-            *idap = NULL;
-        }
-    }
-}
-
-#define OBJ_TOSTRING_EXTRA      4       /* for 4 local GC roots */
-
-#if JS_HAS_INITIALIZERS || JS_HAS_TOSOURCE
-JSBool
-js_obj_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSBool ok, outermost;
-    JSHashEntry *he;
-    JSIdArray *ida;
-    jschar *chars, *ochars, *vsharp;
-    const jschar *idstrchars, *vchars;
-    size_t nchars, idstrlength, gsoplength, vlength, vsharplength;
-    char *comma;
-    jsint i, j, length, valcnt;
-    jsid id;
-#if JS_HAS_GETTER_SETTER
-    JSObject *obj2;
-    JSProperty *prop;
-    uintN attrs;
-#endif
-    jsval *val;
-    JSString *gsop[2];
-    JSAtom *atom;
-    JSString *idstr, *valstr, *str;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return JS_FALSE;
-    }
-
-    /*
-     * obj_toString for 1.2 calls toSource, and doesn't want the extra parens
-     * on the outside.
-     */
-    outermost = !JS_VERSION_IS_1_2(cx) && cx->sharpObjectMap.depth == 0;
-    he = js_EnterSharpObject(cx, obj, &ida, &chars);
-    if (!he)
-        return JS_FALSE;
-    if (IS_SHARP(he)) {
-        /*
-         * We didn't enter -- obj is already "sharp", meaning we've visited it
-         * already in our depth first search, and therefore chars contains a
-         * string of the form "#n#".
-         */
-        JS_ASSERT(!ida);
-#if JS_HAS_SHARP_VARS
-        nchars = js_strlen(chars);
-#else
-        chars[0] = '{';
-        chars[1] = '}';
-        chars[2] = 0;
-        nchars = 2;
-#endif
-        goto make_string;
-    }
-    JS_ASSERT(ida);
-    ok = JS_TRUE;
-
-    if (!chars) {
-        /* If outermost, allocate 4 + 1 for "({})" and the terminator. */
-        chars = (jschar *) malloc(((outermost ? 4 : 2) + 1) * sizeof(jschar));
-        nchars = 0;
-        if (!chars)
-            goto error;
-        if (outermost)
-            chars[nchars++] = '(';
-    } else {
-        /* js_EnterSharpObject returned a string of the form "#n=" in chars. */
-        MAKE_SHARP(he);
-        nchars = js_strlen(chars);
-        chars = (jschar *)
-            realloc((ochars = chars), (nchars + 2 + 1) * sizeof(jschar));
-        if (!chars) {
-            free(ochars);
-            goto error;
-        }
-        if (outermost) {
-            /*
-             * No need for parentheses around the whole shebang, because #n=
-             * unambiguously begins an object initializer, and never a block
-             * statement.
-             */
-            outermost = JS_FALSE;
-        }
-    }
-
-#ifdef DUMP_CALL_TABLE
-    if (cx->options & JSOPTION_LOGCALL_TOSOURCE) {
-        const char *classname = OBJ_GET_CLASS(cx, obj)->name;
-        size_t classnchars = strlen(classname);
-        static const char classpropid[] = "C";
-        const char *cp;
-        size_t onchars = nchars;
-
-        /* 2 for ': ', 2 quotes around classname, 2 for ', ' after. */
-        classnchars += sizeof classpropid - 1 + 2 + 2;
-        if (ida->length)
-            classnchars += 2;
-
-        /* 2 for the braces, 1 for the terminator */
-        chars = (jschar *)
-            realloc((ochars = chars),
-                    (nchars + classnchars + 2 + 1) * sizeof(jschar));
-        if (!chars) {
-            free(ochars);
-            goto error;
-        }
-
-        chars[nchars++] = '{';          /* 1 from the 2 braces */
-        for (cp = classpropid; *cp; cp++)
-            chars[nchars++] = (jschar) *cp;
-        chars[nchars++] = ':';
-        chars[nchars++] = ' ';          /* 2 for ': ' */
-        chars[nchars++] = '"';
-        for (cp = classname; *cp; cp++)
-            chars[nchars++] = (jschar) *cp;
-        chars[nchars++] = '"';          /* 2 quotes */
-        if (ida->length) {
-            chars[nchars++] = ',';
-            chars[nchars++] = ' ';      /* 2 for ', ' */
-        }
-
-        JS_ASSERT(nchars - onchars == 1 + classnchars);
-    } else
-#endif
-    chars[nchars++] = '{';
-
-    comma = NULL;
-
-    /*
-     * We have four local roots for cooked and raw value GC safety.  Hoist the
-     * "argv + 2" out of the loop using the val local, which refers to the raw
-     * (unconverted, "uncooked") values.
-     */
-    val = argv + 2;
-
-    for (i = 0, length = ida->length; i < length; i++) {
-        /* Get strings for id and value and GC-root them via argv. */
-        id = ida->vector[i];
-
-#if JS_HAS_GETTER_SETTER
-
-        ok = OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop);
-        if (!ok)
-            goto error;
-        valcnt = 0;
-        if (prop) {
-            ok = OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &attrs);
-            if (!ok) {
-                OBJ_DROP_PROPERTY(cx, obj2, prop);
-                goto error;
-            }
-            if (OBJ_IS_NATIVE(obj2) &&
-                (attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
-                if (attrs & JSPROP_GETTER) {
-                    val[valcnt] = (jsval) ((JSScopeProperty *)prop)->getter;
-#ifdef OLD_GETTER_SETTER
-                    gsop[valcnt] =
-                        ATOM_TO_STRING(cx->runtime->atomState.getterAtom);
-#else
-                    gsop[valcnt] =
-                        ATOM_TO_STRING(cx->runtime->atomState.getAtom);
-#endif
-                    valcnt++;
-                }
-                if (attrs & JSPROP_SETTER) {
-                    val[valcnt] = (jsval) ((JSScopeProperty *)prop)->setter;
-#ifdef OLD_GETTER_SETTER
-                    gsop[valcnt] =
-                        ATOM_TO_STRING(cx->runtime->atomState.setterAtom);
-#else
-                    gsop[valcnt] =
-                        ATOM_TO_STRING(cx->runtime->atomState.setAtom);
-#endif
-                    valcnt++;
-                }
-            } else {
-                valcnt = 1;
-                gsop[0] = NULL;
-                ok = OBJ_GET_PROPERTY(cx, obj, id, &val[0]);
-            }
-            OBJ_DROP_PROPERTY(cx, obj2, prop);
-        }
-
-#else  /* !JS_HAS_GETTER_SETTER */
-
-        valcnt = 1;
-        gsop[0] = NULL;
-        ok = OBJ_GET_PROPERTY(cx, obj, id, &val[0]);
-
-#endif /* !JS_HAS_GETTER_SETTER */
-
-        if (!ok)
-            goto error;
-
-        /* Convert id to a jsval and then to a string. */
-        atom = JSID_IS_ATOM(id) ? JSID_TO_ATOM(id) : NULL;
-        id = ID_TO_VALUE(id);
-        idstr = js_ValueToString(cx, id);
-        if (!idstr) {
-            ok = JS_FALSE;
-            goto error;
-        }
-        *rval = STRING_TO_JSVAL(idstr);         /* local root */
-
-        /*
-         * If id is a string that's a reserved identifier, or else id is not
-         * an identifier at all, then it needs to be quoted.  Also, negative
-         * integer ids must be quoted.
-         */
-        if (atom
-            ? (ATOM_KEYWORD(atom) || !js_IsIdentifier(idstr))
-            : (JSID_IS_OBJECT(id) || JSID_TO_INT(id) < 0)) {
-            idstr = js_QuoteString(cx, idstr, (jschar)'\'');
-            if (!idstr) {
-                ok = JS_FALSE;
-                goto error;
-            }
-            *rval = STRING_TO_JSVAL(idstr);     /* local root */
-        }
-        idstrchars = JSSTRING_CHARS(idstr);
-        idstrlength = JSSTRING_LENGTH(idstr);
-
-        for (j = 0; j < valcnt; j++) {
-            /* Convert val[j] to its canonical source form. */
-            valstr = js_ValueToSource(cx, val[j]);
-            if (!valstr) {
-                ok = JS_FALSE;
-                goto error;
-            }
-            argv[j] = STRING_TO_JSVAL(valstr);  /* local root */
-            vchars = JSSTRING_CHARS(valstr);
-            vlength = JSSTRING_LENGTH(valstr);
-
-#ifndef OLD_GETTER_SETTER
-            /*
-             * Remove '(function ' from the beginning of valstr and ')' from the
-             * end so that we can put "get" in front of the function definition.
-             */
-            if (gsop[j]) {
-                int n = strlen(js_function_str) + 2;
-                vchars += n;
-                vlength -= n + 1;
-            }
-#endif
-
-            /* If val[j] is a non-sharp object, consider sharpening it. */
-            vsharp = NULL;
-            vsharplength = 0;
-#if JS_HAS_SHARP_VARS
-            if (!JSVAL_IS_PRIMITIVE(val[j]) && vchars[0] != '#') {
-                he = js_EnterSharpObject(cx, JSVAL_TO_OBJECT(val[j]), NULL,
-                                         &vsharp);
-                if (!he) {
-                    ok = JS_FALSE;
-                    goto error;
-                }
-                if (IS_SHARP(he)) {
-                    vchars = vsharp;
-                    vlength = js_strlen(vchars);
-                } else {
-                    if (vsharp) {
-                        vsharplength = js_strlen(vsharp);
-                        MAKE_SHARP(he);
-                    }
-                    js_LeaveSharpObject(cx, NULL);
-                }
-            }
-#endif
-
-            /* Allocate 1 + 1 at end for closing brace and terminating 0. */
-            chars = (jschar *)
-                realloc((ochars = chars),
-                        (nchars + (comma ? 2 : 0) +
-                         idstrlength + 1 +
-                         (gsop[j] ? 1 + JSSTRING_LENGTH(gsop[j]) : 0) +
-                         vsharplength + vlength +
-                         (outermost ? 2 : 1) + 1) * sizeof(jschar));
-            if (!chars) {
-                /* Save code space on error: let JS_free ignore null vsharp. */
-                JS_free(cx, vsharp);
-                free(ochars);
-                goto error;
-            }
-
-            if (comma) {
-                chars[nchars++] = comma[0];
-                chars[nchars++] = comma[1];
-            }
-            comma = ", ";
-
-#ifdef OLD_GETTER_SETTER
-            js_strncpy(&chars[nchars], idstrchars, idstrlength);
-            nchars += idstrlength;
-            if (gsop[j]) {
-                chars[nchars++] = ' ';
-                gsoplength = JSSTRING_LENGTH(gsop[j]);
-                js_strncpy(&chars[nchars], JSSTRING_CHARS(gsop[j]), gsoplength);
-                nchars += gsoplength;
-            }
-            chars[nchars++] = ':';
-#else
-            if (gsop[j]) {
-                gsoplength = JSSTRING_LENGTH(gsop[j]);
-                js_strncpy(&chars[nchars], JSSTRING_CHARS(gsop[j]), gsoplength);
-                nchars += gsoplength;
-                chars[nchars++] = ' ';
-            }
-            js_strncpy(&chars[nchars], idstrchars, idstrlength);
-            nchars += idstrlength;
-            if (!gsop[j])
-                chars[nchars++] = ':';
-#endif
-            if (vsharplength) {
-                js_strncpy(&chars[nchars], vsharp, vsharplength);
-                nchars += vsharplength;
-            }
-            js_strncpy(&chars[nchars], vchars, vlength);
-            nchars += vlength;
-
-            if (vsharp)
-                JS_free(cx, vsharp);
-#ifdef DUMP_CALL_TABLE
-            if (outermost && nchars >= js_LogCallToSourceLimit)
-                break;
-#endif
-        }
-    }
-
-    chars[nchars++] = '}';
-    if (outermost)
-        chars[nchars++] = ')';
-    chars[nchars] = 0;
-
-  error:
-    js_LeaveSharpObject(cx, &ida);
-
-    if (!ok) {
-        if (chars)
-            free(chars);
-        return ok;
-    }
-
-    if (!chars) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-  make_string:
-    str = js_NewString(cx, chars, nchars, 0);
-    if (!str) {
-        free(chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif /* JS_HAS_INITIALIZERS || JS_HAS_TOSOURCE */
-
-JSBool
-js_obj_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    jschar *chars;
-    size_t nchars;
-    const char *clazz, *prefix;
-    JSString *str;
-
-#if JS_HAS_INITIALIZERS
-    if (JS_VERSION_IS_1_2(cx))
-        return js_obj_toSource(cx, obj, argc, argv, rval);
-#endif
-
-    clazz = OBJ_GET_CLASS(cx, obj)->name;
-    nchars = 9 + strlen(clazz);         /* 9 for "[object ]" */
-    chars = (jschar *) JS_malloc(cx, (nchars + 1) * sizeof(jschar));
-    if (!chars)
-        return JS_FALSE;
-
-    prefix = "[object ";
-    nchars = 0;
-    while ((chars[nchars] = (jschar)*prefix) != 0)
-        nchars++, prefix++;
-    while ((chars[nchars] = (jschar)*clazz) != 0)
-        nchars++, clazz++;
-    chars[nchars++] = ']';
-    chars[nchars] = 0;
-
-    str = js_NewString(cx, chars, nchars, 0);
-    if (!str) {
-        JS_free(cx, chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-js_obj_toLocaleString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                      jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, argv[-1]);
-    if (!str)
-        return JS_FALSE;
-
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-obj_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/*
- * Check whether principals subsumes scopeobj's principals, and return true
- * if so (or if scopeobj has no principals, for backward compatibility with
- * the JS API, which does not require principals), and false otherwise.
- */
-JSBool
-js_CheckPrincipalsAccess(JSContext *cx, JSObject *scopeobj,
-                         JSPrincipals *principals, const char *caller)
-{
-    JSRuntime *rt;
-    JSPrincipals *scopePrincipals;
-
-    rt = cx->runtime;
-    if (rt->findObjectPrincipals) {
-        scopePrincipals = rt->findObjectPrincipals(cx, scopeobj);
-        if (!principals || !scopePrincipals ||
-            !principals->subsume(principals, scopePrincipals)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_INDIRECT_CALL, caller);
-            return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-JSObject *
-js_CheckScopeChainValidity(JSContext *cx, JSObject *scopeobj, const char *caller)
-{
-    JSClass *clasp;
-    JSExtendedClass *xclasp;
-    JSObject *inner;
-
-    if (!scopeobj)
-        goto bad;
-
-    OBJ_TO_INNER_OBJECT(cx, scopeobj);
-    if (!scopeobj)
-        return NULL;
-
-    inner = scopeobj;
-
-    /* XXX This is an awful gross hack. */
-    while (scopeobj) {
-        clasp = OBJ_GET_CLASS(cx, scopeobj);
-        if (clasp->flags & JSCLASS_IS_EXTENDED) {
-            xclasp = (JSExtendedClass*)clasp;
-            if (xclasp->innerObject &&
-                xclasp->innerObject(cx, scopeobj) != scopeobj) {
-                goto bad;
-            }
-        }
-
-        scopeobj = OBJ_GET_PARENT(cx, scopeobj);
-    }
-
-    return inner;
-
-bad:
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                         JSMSG_BAD_INDIRECT_CALL, caller);
-    return NULL;
-}
-
-static JSBool
-obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSStackFrame *fp, *caller;
-    JSBool indirectCall;
-    JSObject *scopeobj;
-    JSString *str;
-    const char *file;
-    uintN line;
-    JSPrincipals *principals;
-    JSScript *script;
-    JSBool ok;
-#if JS_HAS_EVAL_THIS_SCOPE
-    JSObject *callerScopeChain = NULL, *callerVarObj = NULL;
-    JSBool setCallerScopeChain = JS_FALSE, setCallerVarObj = JS_FALSE;
-#endif
-
-    fp = cx->fp;
-    caller = JS_GetScriptedCaller(cx, fp);
-    indirectCall = (caller && caller->pc && *caller->pc != JSOP_EVAL);
-
-    if (JS_VERSION_IS_ECMA(cx) &&
-        indirectCall &&
-        !JS_ReportErrorFlagsAndNumber(cx,
-                                      JSREPORT_WARNING | JSREPORT_STRICT,
-                                      js_GetErrorMessage, NULL,
-                                      JSMSG_BAD_INDIRECT_CALL,
-                                      js_eval_str)) {
-        return JS_FALSE;
-    }
-
-    if (!JSVAL_IS_STRING(argv[0])) {
-        *rval = argv[0];
-        return JS_TRUE;
-    }
-
-#if JS_HAS_SCRIPT_OBJECT
-    /*
-     * Script.prototype.compile/exec and Object.prototype.eval all take an
-     * optional trailing argument that overrides the scope object.
-     */
-    scopeobj = NULL;
-    if (argc >= 2) {
-        if (!js_ValueToObject(cx, argv[1], &scopeobj))
-            return JS_FALSE;
-        argv[1] = OBJECT_TO_JSVAL(scopeobj);
-    }
-    if (!scopeobj)
-#endif
-    {
-#if JS_HAS_EVAL_THIS_SCOPE
-        /* If obj.eval(str), emulate 'with (obj) eval(str)' in the caller. */
-        if (indirectCall) {
-            callerScopeChain = caller->scopeChain;
-            if (obj != callerScopeChain) {
-                if (!js_CheckPrincipalsAccess(cx, obj,
-                                              caller->script->principals,
-                                              js_eval_str)) {
-                    return JS_FALSE;
-                }
-
-                scopeobj = js_NewObject(cx, &js_WithClass, obj,
-                                        callerScopeChain);
-                if (!scopeobj)
-                    return JS_FALSE;
-
-                /* Set fp->scopeChain too, for the compiler. */
-                caller->scopeChain = fp->scopeChain = scopeobj;
-                setCallerScopeChain = JS_TRUE;
-            }
-
-            callerVarObj = caller->varobj;
-            if (obj != callerVarObj) {
-                /* Set fp->varobj too, for the compiler. */
-                caller->varobj = fp->varobj = obj;
-                setCallerVarObj = JS_TRUE;
-            }
-        }
-        /* From here on, control must exit through label out with ok set. */
-#endif
-
-#if JS_BUG_EVAL_THIS_SCOPE
-        /* An old version used the object in which eval was found for scope. */
-        scopeobj = obj;
-#else
-        /* Compile using caller's current scope object. */
-        if (caller)
-            scopeobj = caller->scopeChain;
-#endif
-    }
-
-    /* Ensure we compile this eval with the right object in the scope chain. */
-    scopeobj = js_CheckScopeChainValidity(cx, scopeobj, js_eval_str);
-    if (!scopeobj)
-        return JS_FALSE;
-
-    str = JSVAL_TO_STRING(argv[0]);
-    if (caller) {
-        file = caller->script->filename;
-        line = js_PCToLineNumber(cx, caller->script, caller->pc);
-        principals = JS_EvalFramePrincipals(cx, fp, caller);
-    } else {
-        file = NULL;
-        line = 0;
-        principals = NULL;
-    }
-
-    /*
-     * Set JSFRAME_EVAL on fp and any frames (e.g., fun_call if eval.call was
-     * invoked) between fp and its scripted caller, to help the compiler easily
-     * find the same caller whose scope and var obj we've set.
-     *
-     * XXX this nonsense could, and perhaps should, go away with a better way
-     * to pass params to the compiler than via the top-most frame.
-     */
-    do {
-        fp->flags |= JSFRAME_EVAL;
-    } while ((fp = fp->down) != caller);
-
-    script = JS_CompileUCScriptForPrincipals(cx, scopeobj, principals,
-                                             JSSTRING_CHARS(str),
-                                             JSSTRING_LENGTH(str),
-                                             file, line);
-    if (!script) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-#if !JS_BUG_EVAL_THIS_SCOPE
-#if JS_HAS_SCRIPT_OBJECT
-    if (argc < 2)
-#endif
-    {
-        /* Execute using caller's new scope object (might be a Call object). */
-        if (caller)
-            scopeobj = caller->scopeChain;
-    }
-#endif
-
-    /*
-     * Belt-and-braces: check that the lesser of eval's principals and the
-     * caller's principals has access to scopeobj.
-     */
-    ok = js_CheckPrincipalsAccess(cx, scopeobj, principals, js_eval_str);
-    if (!ok)
-        goto out;
-
-    ok = js_Execute(cx, scopeobj, script, caller, JSFRAME_EVAL, rval);
-    JS_DestroyScript(cx, script);
-
-out:
-#if JS_HAS_EVAL_THIS_SCOPE
-    /* Restore OBJ_GET_PARENT(scopeobj) not callerScopeChain in case of Call. */
-    if (setCallerScopeChain)
-        caller->scopeChain = callerScopeChain;
-    if (setCallerVarObj)
-        caller->varobj = callerVarObj;
-#endif
-    return ok;
-}
-
-#if JS_HAS_OBJ_WATCHPOINT
-
-static JSBool
-obj_watch_handler(JSContext *cx, JSObject *obj, jsval id, jsval old, jsval *nvp,
-                  void *closure)
-{
-    JSResolvingKey key;
-    JSResolvingEntry *entry;
-    uint32 generation;
-    JSObject *funobj;
-    jsval argv[3];
-    JSBool ok;
-
-    /* Avoid recursion on (obj, id) already being watched on cx. */
-    key.obj = obj;
-    key.id = id;
-    if (!js_StartResolving(cx, &key, JSRESFLAG_WATCH, &entry))
-        return JS_FALSE;
-    if (!entry)
-        return JS_TRUE;
-    generation = cx->resolvingTable->generation;
-
-    funobj = (JSObject *) closure;
-    argv[0] = id;
-    argv[1] = old;
-    argv[2] = *nvp;
-    ok = js_InternalCall(cx, obj, OBJECT_TO_JSVAL(funobj), 3, argv, nvp);
-    js_StopResolving(cx, &key, JSRESFLAG_WATCH, entry, generation);
-    return ok;
-}
-
-static JSBool
-obj_watch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *callable;
-    jsval userid, value;
-    jsid propid;
-    uintN attrs;
-
-    callable = js_ValueToCallableObject(cx, &argv[1], 0);
-    if (!callable)
-        return JS_FALSE;
-
-    /* Compute the unique int/atom symbol id needed by js_LookupProperty. */
-    userid = argv[0];
-    if (!JS_ValueToId(cx, userid, &propid))
-        return JS_FALSE;
-
-    if (!OBJ_CHECK_ACCESS(cx, obj, propid, JSACC_WATCH, &value, &attrs))
-        return JS_FALSE;
-    if (attrs & JSPROP_READONLY)
-        return JS_TRUE;
-    return JS_SetWatchPoint(cx, obj, userid, obj_watch_handler, callable);
-}
-
-static JSBool
-obj_unwatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return JS_ClearWatchPoint(cx, obj, argv[0], NULL, NULL);
-}
-
-#endif /* JS_HAS_OBJ_WATCHPOINT */
-
-#if JS_HAS_NEW_OBJ_METHODS
-/*
- * Prototype and property query methods, to complement the 'in' and
- * 'instanceof' operators.
- */
-
-/* Proposed ECMA 15.2.4.5. */
-static JSBool
-obj_hasOwnProperty(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    return js_HasOwnPropertyHelper(cx, obj, obj->map->ops->lookupProperty,
-                                   argc, argv, rval);
-}
-
-JSBool
-js_HasOwnPropertyHelper(JSContext *cx, JSObject *obj, JSLookupPropOp lookup,
-                        uintN argc, jsval *argv, jsval *rval)
-{
-    jsid id;
-    JSObject *obj2;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-    if (!lookup(cx, obj, id, &obj2, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        *rval = JSVAL_FALSE;
-    } else if (obj2 == obj) {
-        *rval = JSVAL_TRUE;
-    } else if (OBJ_IS_NATIVE(obj2)) {
-        sprop = (JSScopeProperty *)prop;
-        *rval = BOOLEAN_TO_JSVAL(SPROP_IS_SHARED_PERMANENT(sprop));
-    } else {
-        *rval = JSVAL_FALSE;
-    }
-    if (prop)
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-    return JS_TRUE;
-}
-
-/* Proposed ECMA 15.2.4.6. */
-static JSBool
-obj_isPrototypeOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                  jsval *rval)
-{
-    JSBool b;
-
-    if (!js_IsDelegate(cx, obj, *argv, &b))
-        return JS_FALSE;
-    *rval = BOOLEAN_TO_JSVAL(b);
-    return JS_TRUE;
-}
-
-/* Proposed ECMA 15.2.4.7. */
-static JSBool
-obj_propertyIsEnumerable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                         jsval *rval)
-{
-    jsid id;
-    uintN attrs;
-    JSObject *obj2;
-    JSProperty *prop;
-    JSBool ok;
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
-        return JS_FALSE;
-
-    if (!prop) {
-        *rval = JSVAL_FALSE;
-        return JS_TRUE;
-    }
-
-    /*
-     * XXX ECMA spec error compatible: return false unless hasOwnProperty.
-     * The ECMA spec really should be fixed so propertyIsEnumerable and the
-     * for..in loop agree on whether prototype properties are enumerable,
-     * obviously by fixing this method (not by breaking the for..in loop!).
-     *
-     * We check here for shared permanent prototype properties, which should
-     * be treated as if they are local to obj.  They are an implementation
-     * technique used to satisfy ECMA requirements; users should not be able
-     * to distinguish a shared permanent proto-property from a local one.
-     */
-    if (obj2 != obj &&
-        !(OBJ_IS_NATIVE(obj2) &&
-          SPROP_IS_SHARED_PERMANENT((JSScopeProperty *)prop))) {
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-        *rval = JSVAL_FALSE;
-        return JS_TRUE;
-    }
-
-    ok = OBJ_GET_ATTRIBUTES(cx, obj2, id, prop, &attrs);
-    OBJ_DROP_PROPERTY(cx, obj2, prop);
-    if (ok)
-        *rval = BOOLEAN_TO_JSVAL((attrs & JSPROP_ENUMERATE) != 0);
-    return ok;
-}
-#endif /* JS_HAS_NEW_OBJ_METHODS */
-
-#if JS_HAS_GETTER_SETTER
-static JSBool
-obj_defineGetter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsval fval, junk;
-    jsid id;
-    uintN attrs;
-
-    fval = argv[1];
-    if (JS_TypeOfValue(cx, fval) != JSTYPE_FUNCTION) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_GETTER_OR_SETTER,
-                             js_getter_str);
-        return JS_FALSE;
-    }
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-    if (!js_CheckRedeclaration(cx, obj, id, JSPROP_GETTER, NULL, NULL))
-        return JS_FALSE;
-    /*
-     * Getters and setters are just like watchpoints from an access
-     * control point of view.
-     */
-    if (!OBJ_CHECK_ACCESS(cx, obj, id, JSACC_WATCH, &junk, &attrs))
-        return JS_FALSE;
-    return OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID,
-                               (JSPropertyOp) JSVAL_TO_OBJECT(fval), NULL,
-                               JSPROP_ENUMERATE | JSPROP_GETTER | JSPROP_SHARED,
-                               NULL);
-}
-
-static JSBool
-obj_defineSetter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsval fval, junk;
-    jsid id;
-    uintN attrs;
-
-    fval = argv[1];
-    if (JS_TypeOfValue(cx, fval) != JSTYPE_FUNCTION) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_GETTER_OR_SETTER,
-                             js_setter_str);
-        return JS_FALSE;
-    }
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-    if (!js_CheckRedeclaration(cx, obj, id, JSPROP_SETTER, NULL, NULL))
-        return JS_FALSE;
-    /*
-     * Getters and setters are just like watchpoints from an access
-     * control point of view.
-     */
-    if (!OBJ_CHECK_ACCESS(cx, obj, id, JSACC_WATCH, &junk, &attrs))
-        return JS_FALSE;
-    return OBJ_DEFINE_PROPERTY(cx, obj, id, JSVAL_VOID,
-                               NULL, (JSPropertyOp) JSVAL_TO_OBJECT(fval),
-                               JSPROP_ENUMERATE | JSPROP_SETTER | JSPROP_SHARED,
-                               NULL);
-}
-
-static JSBool
-obj_lookupGetter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsid id;
-    JSObject *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &pobj, &prop))
-        return JS_FALSE;
-    if (prop) {
-        if (OBJ_IS_NATIVE(pobj)) {
-            sprop = (JSScopeProperty *) prop;
-            if (sprop->attrs & JSPROP_GETTER)
-                *rval = OBJECT_TO_JSVAL(sprop->getter);
-        }
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-obj_lookupSetter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jsid id;
-    JSObject *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-
-    if (!JS_ValueToId(cx, argv[0], &id))
-        return JS_FALSE;
-    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &pobj, &prop))
-        return JS_FALSE;
-    if (prop) {
-        if (OBJ_IS_NATIVE(pobj)) {
-            sprop = (JSScopeProperty *) prop;
-            if (sprop->attrs & JSPROP_SETTER)
-                *rval = OBJECT_TO_JSVAL(sprop->setter);
-        }
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-    }
-    return JS_TRUE;
-}
-#endif /* JS_HAS_GETTER_SETTER */
-
-#if JS_HAS_OBJ_WATCHPOINT
-const char js_watch_str[] = "watch";
-const char js_unwatch_str[] = "unwatch";
-#endif
-#if JS_HAS_NEW_OBJ_METHODS
-const char js_hasOwnProperty_str[] = "hasOwnProperty";
-const char js_isPrototypeOf_str[] = "isPrototypeOf";
-const char js_propertyIsEnumerable_str[] = "propertyIsEnumerable";
-#endif
-#if JS_HAS_GETTER_SETTER
-const char js_defineGetter_str[] = "__defineGetter__";
-const char js_defineSetter_str[] = "__defineSetter__";
-const char js_lookupGetter_str[] = "__lookupGetter__";
-const char js_lookupSetter_str[] = "__lookupSetter__";
-#endif
-
-static JSFunctionSpec object_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,             js_obj_toSource,    0, 0, OBJ_TOSTRING_EXTRA},
-#endif
-    {js_toString_str,             js_obj_toString,    0, 0, OBJ_TOSTRING_EXTRA},
-    {js_toLocaleString_str,       js_obj_toLocaleString, 0, 0, OBJ_TOSTRING_EXTRA},
-    {js_valueOf_str,              obj_valueOf,        0,0,0},
-    {js_eval_str,                 obj_eval,           1,0,0},
-#if JS_HAS_OBJ_WATCHPOINT
-    {js_watch_str,                obj_watch,          2,0,0},
-    {js_unwatch_str,              obj_unwatch,        1,0,0},
-#endif
-#if JS_HAS_NEW_OBJ_METHODS
-    {js_hasOwnProperty_str,       obj_hasOwnProperty, 1,0,0},
-    {js_isPrototypeOf_str,        obj_isPrototypeOf,  1,0,0},
-    {js_propertyIsEnumerable_str, obj_propertyIsEnumerable, 1,0,0},
-#endif
-#if JS_HAS_GETTER_SETTER
-    {js_defineGetter_str,         obj_defineGetter,   2,0,0},
-    {js_defineSetter_str,         obj_defineSetter,   2,0,0},
-    {js_lookupGetter_str,         obj_lookupGetter,   1,0,0},
-    {js_lookupSetter_str,         obj_lookupSetter,   1,0,0},
-#endif
-    {0,0,0,0,0}
-};
-
-static JSBool
-Object(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (argc == 0) {
-        /* Trigger logic below to construct a blank object. */
-        obj = NULL;
-    } else {
-        /* If argv[0] is null or undefined, obj comes back null. */
-        if (!js_ValueToObject(cx, argv[0], &obj))
-            return JS_FALSE;
-    }
-    if (!obj) {
-        JS_ASSERT(!argc || JSVAL_IS_NULL(argv[0]) || JSVAL_IS_VOID(argv[0]));
-        if (cx->fp->flags & JSFRAME_CONSTRUCTING)
-            return JS_TRUE;
-        obj = js_NewObject(cx, &js_ObjectClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-    }
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/*
- * ObjectOps and Class for with-statement stack objects.
- */
-static JSBool
-with_LookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                    JSProperty **propp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_LookupProperty(cx, obj, id, objp, propp);
-    return OBJ_LOOKUP_PROPERTY(cx, proto, id, objp, propp);
-}
-
-static JSBool
-with_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_GetProperty(cx, obj, id, vp);
-    return OBJ_GET_PROPERTY(cx, proto, id, vp);
-}
-
-static JSBool
-with_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_SetProperty(cx, obj, id, vp);
-    return OBJ_SET_PROPERTY(cx, proto, id, vp);
-}
-
-static JSBool
-with_GetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                   uintN *attrsp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_GetAttributes(cx, obj, id, prop, attrsp);
-    return OBJ_GET_ATTRIBUTES(cx, proto, id, prop, attrsp);
-}
-
-static JSBool
-with_SetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                   uintN *attrsp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_SetAttributes(cx, obj, id, prop, attrsp);
-    return OBJ_SET_ATTRIBUTES(cx, proto, id, prop, attrsp);
-}
-
-static JSBool
-with_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_DeleteProperty(cx, obj, id, rval);
-    return OBJ_DELETE_PROPERTY(cx, proto, id, rval);
-}
-
-static JSBool
-with_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_DefaultValue(cx, obj, hint, vp);
-    return OBJ_DEFAULT_VALUE(cx, proto, hint, vp);
-}
-
-static JSBool
-with_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
-               jsval *statep, jsid *idp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_Enumerate(cx, obj, enum_op, statep, idp);
-    return OBJ_ENUMERATE(cx, proto, enum_op, statep, idp);
-}
-
-static JSBool
-with_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-                 jsval *vp, uintN *attrsp)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return js_CheckAccess(cx, obj, id, mode, vp, attrsp);
-    return OBJ_CHECK_ACCESS(cx, proto, id, mode, vp, attrsp);
-}
-
-static JSObject *
-with_ThisObject(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto = OBJ_GET_PROTO(cx, obj);
-    if (!proto)
-        return obj;
-    return OBJ_THIS_OBJECT(cx, proto);
-}
-
-JS_FRIEND_DATA(JSObjectOps) js_WithObjectOps = {
-    js_NewObjectMap,        js_DestroyObjectMap,
-    with_LookupProperty,    js_DefineProperty,
-    with_GetProperty,       with_SetProperty,
-    with_GetAttributes,     with_SetAttributes,
-    with_DeleteProperty,    with_DefaultValue,
-    with_Enumerate,         with_CheckAccess,
-    with_ThisObject,        NATIVE_DROP_PROPERTY,
-    NULL,                   NULL,
-    NULL,                   NULL,
-    js_SetProtoOrParent,    js_SetProtoOrParent,
-    js_Mark,                js_Clear,
-    NULL,                   NULL
-};
-
-static JSObjectOps *
-with_getObjectOps(JSContext *cx, JSClass *clasp)
-{
-    return &js_WithObjectOps;
-}
-
-JSClass js_WithClass = {
-    "With",
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
-    with_getObjectOps,
-    0,0,0,0,0,0,0
-};
-
-#if JS_HAS_OBJ_PROTO_PROP
-static JSBool
-With(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *parent, *proto;
-    jsval v;
-
-    if (!JS_ReportErrorFlagsAndNumber(cx,
-                                      JSREPORT_WARNING | JSREPORT_STRICT,
-                                      js_GetErrorMessage, NULL,
-                                      JSMSG_DEPRECATED_USAGE,
-                                      js_WithClass.name)) {
-        return JS_FALSE;
-    }
-
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        obj = js_NewObject(cx, &js_WithClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-
-    parent = cx->fp->scopeChain;
-    if (argc > 0) {
-        if (!js_ValueToObject(cx, argv[0], &proto))
-            return JS_FALSE;
-        v = OBJECT_TO_JSVAL(proto);
-        if (!obj_setSlot(cx, obj, INT_TO_JSVAL(JSSLOT_PROTO), &v))
-            return JS_FALSE;
-        if (argc > 1) {
-            if (!js_ValueToObject(cx, argv[1], &parent))
-                return JS_FALSE;
-        }
-    }
-    v = OBJECT_TO_JSVAL(parent);
-    return obj_setSlot(cx, obj, INT_TO_JSVAL(JSSLOT_PARENT), &v);
-}
-#endif
-
-JSObject *
-js_InitObjectClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-    jsval eval;
-
-#if JS_HAS_SHARP_VARS
-    JS_ASSERT(sizeof(jsatomid) * JS_BITS_PER_BYTE >= ATOM_INDEX_LIMIT_LOG2 + 1);
-#endif
-
-    proto = JS_InitClass(cx, obj, NULL, &js_ObjectClass, Object, 1,
-                         object_props, object_methods, NULL, NULL);
-    if (!proto)
-        return NULL;
-
-#if JS_HAS_OBJ_PROTO_PROP
-    if (!JS_InitClass(cx, obj, NULL, &js_WithClass, With, 0,
-                      NULL, NULL, NULL, NULL)) {
-        return NULL;
-    }
-#endif
-
-    /* ECMA (15.1.2.1) says 'eval' is also a property of the global object. */
-    if (!OBJ_GET_PROPERTY(cx, proto,
-                          ATOM_TO_JSID(cx->runtime->atomState.evalAtom),
-                          &eval)) {
-        return NULL;
-    }
-    if (!OBJ_DEFINE_PROPERTY(cx, obj,
-                             ATOM_TO_JSID(cx->runtime->atomState.evalAtom),
-                             eval, NULL, NULL, 0, NULL)) {
-        return NULL;
-    }
-
-    return proto;
-}
-
-void
-js_InitObjectMap(JSObjectMap *map, jsrefcount nrefs, JSObjectOps *ops,
-                 JSClass *clasp)
-{
-    map->nrefs = nrefs;
-    map->ops = ops;
-    map->nslots = JS_INITIAL_NSLOTS;
-    map->freeslot = JSSLOT_FREE(clasp);
-}
-
-JSObjectMap *
-js_NewObjectMap(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops,
-                JSClass *clasp, JSObject *obj)
-{
-    return (JSObjectMap *) js_NewScope(cx, nrefs, ops, clasp, obj);
-}
-
-void
-js_DestroyObjectMap(JSContext *cx, JSObjectMap *map)
-{
-    js_DestroyScope(cx, (JSScope *)map);
-}
-
-JSObjectMap *
-js_HoldObjectMap(JSContext *cx, JSObjectMap *map)
-{
-    JS_ASSERT(map->nrefs >= 0);
-    JS_ATOMIC_INCREMENT(&map->nrefs);
-    return map;
-}
-
-JSObjectMap *
-js_DropObjectMap(JSContext *cx, JSObjectMap *map, JSObject *obj)
-{
-    JS_ASSERT(map->nrefs > 0);
-    JS_ATOMIC_DECREMENT(&map->nrefs);
-    if (map->nrefs == 0) {
-        map->ops->destroyObjectMap(cx, map);
-        return NULL;
-    }
-    if (MAP_IS_NATIVE(map) && ((JSScope *)map)->object == obj)
-        ((JSScope *)map)->object = NULL;
-    return map;
-}
-
-static JSBool
-GetClassPrototype(JSContext *cx, JSObject *scope, const char *name,
-                  JSObject **protop);
-
-static jsval *
-AllocSlots(JSContext *cx, jsval *slots, uint32 nslots)
-{
-    size_t nbytes, obytes, minbytes;
-    uint32 i, oslots;
-    jsval *newslots;
-
-    nbytes = (nslots + 1) * sizeof(jsval);
-    if (slots) {
-        oslots = slots[-1];
-        obytes = (oslots + 1) * sizeof(jsval);
-    } else {
-        oslots = 0;
-        obytes = 0;
-    }
-
-    if (nbytes <= GC_NBYTES_MAX) {
-        newslots = (jsval *) js_NewGCThing(cx, GCX_PRIVATE, nbytes);
-    } else {
-        newslots = (jsval *)
-                   JS_realloc(cx,
-                              (obytes <= GC_NBYTES_MAX) ? NULL : slots - 1,
-                              nbytes);
-    }
-    if (!newslots)
-        return NULL;
-
-    if (obytes != 0) {
-        /* If either nbytes or obytes fit in a GC-thing, we must copy. */
-        minbytes = JS_MIN(nbytes, obytes);
-        if (minbytes <= GC_NBYTES_MAX)
-            memcpy(newslots + 1, slots, minbytes - sizeof(jsval));
-
-        /* If nbytes are in a GC-thing but obytes aren't, free obytes. */
-        if (nbytes <= GC_NBYTES_MAX && obytes > GC_NBYTES_MAX)
-            JS_free(cx, slots - 1);
-
-        /* If we're extending an allocation, initialize free slots. */
-        if (nslots > oslots) {
-            for (i = 1 + oslots; i <= nslots; i++)
-                newslots[i] = JSVAL_VOID;
-        }
-    }
-
-    newslots[0] = nslots;
-    return ++newslots;
-}
-
-static void
-FreeSlots(JSContext *cx, jsval *slots)
-{
-    size_t nbytes;
-
-    /*
-     * NB: We count on smaller GC-things being finalized before larger things
-     * that become garbage during the same GC.  Without this assumption, we
-     * couldn't load slots[-1] here without possibly loading a gcFreeList link
-     * (see struct JSGCThing in jsgc.h).
-     */
-    nbytes = (slots[-1] + 1) * sizeof(jsval);
-    if (nbytes > GC_NBYTES_MAX)
-        JS_free(cx, slots - 1);
-}
-
-JSObject *
-js_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent)
-{
-    JSObject *obj;
-    JSObjectOps *ops;
-    JSObjectMap *map;
-    JSClass *protoclasp;
-    uint32 nslots, i;
-    jsval *newslots;
-
-    /* Bootstrap the ur-object, and make it the default prototype object. */
-    if (!proto) {
-        if (!GetClassPrototype(cx, parent, clasp->name, &proto))
-            return NULL;
-        if (!proto && !GetClassPrototype(cx, parent, js_Object_str, &proto))
-            return NULL;
-    }
-
-    /* Always call the class's getObjectOps hook if it has one. */
-    ops = clasp->getObjectOps
-          ? clasp->getObjectOps(cx, clasp)
-          : &js_ObjectOps;
-
-    /*
-     * Allocate a zeroed object from the GC heap.  Do this *after* any other
-     * GC-thing allocations under GetClassPrototype or clasp->getObjectOps,
-     * to avoid displacing the newborn root for obj.
-     */
-    obj = (JSObject *) js_NewGCThing(cx, GCX_OBJECT, sizeof(JSObject));
-    if (!obj)
-        return NULL;
-
-    /*
-     * Share proto's map only if it has the same JSObjectOps, and only if
-     * proto's class has the same private and reserved slots as obj's map
-     * and class have.  We assume that if prototype and object are of the
-     * same class, they always have the same number of computed reserved
-     * slots (returned via clasp->reserveSlots); otherwise, prototype and
-     * object classes must have the same (null or not) reserveSlots hook.
-     */
-    if (proto &&
-        (map = proto->map)->ops == ops &&
-        ((protoclasp = OBJ_GET_CLASS(cx, proto)) == clasp ||
-         (!((protoclasp->flags ^ clasp->flags) &
-            (JSCLASS_HAS_PRIVATE |
-             (JSCLASS_RESERVED_SLOTS_MASK << JSCLASS_RESERVED_SLOTS_SHIFT))) &&
-          protoclasp->reserveSlots == clasp->reserveSlots)))
-    {
-        /*
-         * Default parent to the parent of the prototype, which was set from
-         * the parent of the prototype's constructor.
-         */
-        if (!parent)
-            parent = OBJ_GET_PARENT(cx, proto);
-
-        /* Share the given prototype's map. */
-        obj->map = js_HoldObjectMap(cx, map);
-
-        /* Ensure that obj starts with the minimum slots for clasp. */
-        nslots = JS_INITIAL_NSLOTS;
-    } else {
-        /* Leave parent alone.  Allocate a new map for obj. */
-        map = ops->newObjectMap(cx, 1, ops, clasp, obj);
-        if (!map)
-            goto bad;
-        obj->map = map;
-
-        /* Let ops->newObjectMap set nslots so as to reserve slots. */
-        nslots = map->nslots;
-    }
-
-    /* Allocate a slots vector, with a -1'st element telling its length. */
-    newslots = AllocSlots(cx, NULL, nslots);
-    if (!newslots) {
-        js_DropObjectMap(cx, obj->map, obj);
-        obj->map = NULL;
-        goto bad;
-    }
-
-    /* Set the proto, parent, and class properties. */
-    newslots[JSSLOT_PROTO] = OBJECT_TO_JSVAL(proto);
-    newslots[JSSLOT_PARENT] = OBJECT_TO_JSVAL(parent);
-    newslots[JSSLOT_CLASS] = PRIVATE_TO_JSVAL(clasp);
-
-    /* Clear above JSSLOT_CLASS so the GC doesn't load uninitialized memory. */
-    for (i = JSSLOT_CLASS + 1; i < nslots; i++)
-        newslots[i] = JSVAL_VOID;
-
-    /* Store newslots after initializing all of 'em, just in case. */
-    obj->slots = newslots;
-
-    if (cx->runtime->objectHook) {
-        JS_KEEP_ATOMS(cx->runtime);
-        cx->runtime->objectHook(cx, obj, JS_TRUE, cx->runtime->objectHookData);
-        JS_UNKEEP_ATOMS(cx->runtime);
-    }
-
-    return obj;
-
-bad:
-    cx->newborn[GCX_OBJECT] = NULL;
-    return NULL;
-}
-
-JSBool
-js_FindConstructor(JSContext *cx, JSObject *start, const char *name, jsval *vp)
-{
-    JSAtom *atom;
-    JSObject *obj, *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-
-    atom = js_Atomize(cx, name, strlen(name), 0);
-    if (!atom)
-        return JS_FALSE;
-
-    if (start || (cx->fp && (start = cx->fp->scopeChain) != NULL)) {
-        /* Find the topmost object in the scope chain. */
-        do {
-            obj = start;
-            start = OBJ_GET_PARENT(cx, obj);
-        } while (start);
-    } else {
-        obj = cx->globalObject;
-        if (!obj) {
-            *vp = JSVAL_VOID;
-            return JS_TRUE;
-        }
-    }
-
-    JS_ASSERT(OBJ_IS_NATIVE(obj));
-    if (!js_LookupPropertyWithFlags(cx, obj, ATOM_TO_JSID(atom),
-                                    JSRESOLVE_CLASSNAME, &pobj, &prop)) {
-        return JS_FALSE;
-    }
-    if (!prop)  {
-        *vp = JSVAL_VOID;
-        return JS_TRUE;
-    }
-
-    JS_ASSERT(OBJ_IS_NATIVE(pobj));
-    sprop = (JSScopeProperty *) prop;
-    JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)));
-    *vp = OBJ_GET_SLOT(cx, pobj, sprop->slot);
-    OBJ_DROP_PROPERTY(cx, pobj, prop);
-    return JS_TRUE;
-}
-
-JSObject *
-js_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
-                   JSObject *parent, uintN argc, jsval *argv)
-{
-    jsval cval, rval;
-    JSTempValueRooter tvr;
-    JSObject *obj, *ctor;
-
-    if (!js_FindConstructor(cx, parent, clasp->name, &cval))
-        return NULL;
-    if (JSVAL_IS_PRIMITIVE(cval)) {
-        js_ReportIsNotFunction(cx, &cval, JSV2F_CONSTRUCT | JSV2F_SEARCH_STACK);
-        return NULL;
-    }
-
-    /*
-     * Protect cval in case a crazy getter for .prototype uproots it.  After
-     * this point, all control flow must exit through label out with obj set.
-     */
-    JS_PUSH_SINGLE_TEMP_ROOT(cx, cval, &tvr);
-    obj = NULL;
-
-    /*
-     * If proto or parent are NULL, set them to Constructor.prototype and/or
-     * Constructor.__parent__, just like JSOP_NEW does.
-     */
-    ctor = JSVAL_TO_OBJECT(cval);
-    if (!parent)
-        parent = OBJ_GET_PARENT(cx, ctor);
-    if (!proto) {
-        if (!OBJ_GET_PROPERTY(cx, ctor,
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .classPrototypeAtom),
-                              &rval)) {
-            goto out;
-        }
-        if (JSVAL_IS_OBJECT(rval))
-            proto = JSVAL_TO_OBJECT(rval);
-    }
-
-    obj = js_NewObject(cx, clasp, proto, parent);
-    if (!obj)
-        goto out;
-
-    if (!js_InternalConstruct(cx, obj, cval, argc, argv, &rval)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        obj = NULL;
-        goto out;
-    }
-
-    if (!JSVAL_IS_PRIMITIVE(rval))
-        obj = JSVAL_TO_OBJECT(rval);
-out:
-    JS_POP_TEMP_ROOT(cx, &tvr);
-    return obj;
-}
-
-void
-js_FinalizeObject(JSContext *cx, JSObject *obj)
-{
-    JSObjectMap *map;
-
-    /* Cope with stillborn objects that have no map. */
-    map = obj->map;
-    if (!map)
-        return;
-    JS_ASSERT(obj->slots);
-
-    if (cx->runtime->objectHook)
-        cx->runtime->objectHook(cx, obj, JS_FALSE, cx->runtime->objectHookData);
-
-    /* Remove all watchpoints with weak links to obj. */
-    JS_ClearWatchPointsForObject(cx, obj);
-
-    /*
-     * Finalize obj first, in case it needs map and slots.  Optimized to use
-     * LOCKED_OBJ_GET_CLASS instead of OBJ_GET_CLASS, so we avoid "promoting"
-     * obj's scope from lock-free to lock-full (see jslock.c:ClaimScope) when
-     * we're called from the GC.  Only the GC should call js_FinalizeObject,
-     * and no other threads run JS (and possibly racing to update obj->slots)
-     * while the GC is running.
-     */
-    LOCKED_OBJ_GET_CLASS(obj)->finalize(cx, obj);
-
-    /* Drop map and free slots. */
-    js_DropObjectMap(cx, map, obj);
-    obj->map = NULL;
-    FreeSlots(cx, obj->slots);
-    obj->slots = NULL;
-}
-
-/* XXXbe if one adds props, deletes earlier props, adds more, the last added
-         won't recycle the deleted props' slots. */
-JSBool
-js_AllocSlot(JSContext *cx, JSObject *obj, uint32 *slotp)
-{
-    JSObjectMap *map;
-    JSClass *clasp;
-    uint32 nslots;
-    jsval *newslots;
-
-    map = obj->map;
-    JS_ASSERT(!MAP_IS_NATIVE(map) || ((JSScope *)map)->object == obj);
-    clasp = LOCKED_OBJ_GET_CLASS(obj);
-    if (map->freeslot == JSSLOT_FREE(clasp)) {
-        /* Adjust map->freeslot to include computed reserved slots, if any. */
-        if (clasp->reserveSlots)
-            map->freeslot += clasp->reserveSlots(cx, obj);
-    }
-    nslots = map->nslots;
-    if (map->freeslot >= nslots) {
-        nslots = map->freeslot;
-        JS_ASSERT(nslots >= JS_INITIAL_NSLOTS);
-        nslots += (nslots + 1) / 2;
-
-        newslots = AllocSlots(cx, obj->slots, nslots);
-        if (!newslots)
-            return JS_FALSE;
-        map->nslots = nslots;
-        obj->slots = newslots;
-    }
-
-#ifdef TOO_MUCH_GC
-    obj->slots[map->freeslot] = JSVAL_VOID;
-#endif
-    *slotp = map->freeslot++;
-    return JS_TRUE;
-}
-
-void
-js_FreeSlot(JSContext *cx, JSObject *obj, uint32 slot)
-{
-    JSObjectMap *map;
-    uint32 nslots;
-    jsval *newslots;
-
-    OBJ_CHECK_SLOT(obj, slot);
-    obj->slots[slot] = JSVAL_VOID;
-    map = obj->map;
-    JS_ASSERT(!MAP_IS_NATIVE(map) || ((JSScope *)map)->object == obj);
-    if (map->freeslot == slot + 1)
-        map->freeslot = slot;
-    nslots = map->nslots;
-    if (nslots > JS_INITIAL_NSLOTS && map->freeslot < nslots / 2) {
-        nslots = map->freeslot;
-        nslots += nslots / 2;
-        if (nslots < JS_INITIAL_NSLOTS)
-            nslots = JS_INITIAL_NSLOTS;
-
-        newslots = AllocSlots(cx, obj->slots, nslots);
-        if (!newslots)
-            return;
-        map->nslots = nslots;
-        obj->slots = newslots;
-    }
-}
-
-#if JS_BUG_EMPTY_INDEX_ZERO
-#define CHECK_FOR_EMPTY_INDEX(id)                                             \
-    JS_BEGIN_MACRO                                                            \
-        if (JSSTRING_LENGTH(_str) == 0)                                       \
-            id = JSVAL_ZERO;                                                  \
-    JS_END_MACRO
-#else
-#define CHECK_FOR_EMPTY_INDEX(id) /* nothing */
-#endif
-
-/* JSVAL_INT_MAX as a string */
-#define JSVAL_INT_MAX_STRING "1073741823"
-
-#define CHECK_FOR_STRING_INDEX(id)                                            \
-    JS_BEGIN_MACRO                                                            \
-        if (JSID_IS_ATOM(id)) {                                               \
-            JSAtom *atom_ = JSID_TO_ATOM(id);                                 \
-            JSString *str_ = ATOM_TO_STRING(atom_);                           \
-            const jschar *cp_ = str_->chars;                                  \
-            JSBool negative_ = (*cp_ == '-');                                 \
-            if (negative_) cp_++;                                             \
-            if (JS7_ISDEC(*cp_) &&                                            \
-                str_->length - negative_ <= sizeof(JSVAL_INT_MAX_STRING)-1) { \
-                id = CheckForStringIndex(id, cp_, negative_);                 \
-            } else {                                                          \
-                CHECK_FOR_EMPTY_INDEX(id);                                    \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-static jsid
-CheckForStringIndex(jsid id, const jschar *cp, JSBool negative)
-{
-    jsuint index = JS7_UNDEC(*cp++);
-    jsuint oldIndex = 0;
-    jsuint c = 0;
-
-    if (index != 0) {
-        while (JS7_ISDEC(*cp)) {
-            oldIndex = index;
-            c = JS7_UNDEC(*cp);
-            index = 10 * index + c;
-            cp++;
-        }
-    }
-    if (*cp == 0 &&
-        (oldIndex < (JSVAL_INT_MAX / 10) ||
-         (oldIndex == (JSVAL_INT_MAX / 10) &&
-          c <= (JSVAL_INT_MAX % 10)))) {
-        if (negative)
-            index = 0 - index;
-        id = INT_TO_JSID((jsint)index);
-    }
-    return id;
-}
-
-static JSBool
-HidePropertyName(JSContext *cx, jsid *idp)
-{
-    jsid id;
-    JSAtom *atom, *hidden;
-
-    id = *idp;
-    JS_ASSERT(JSID_IS_ATOM(id));
-
-    atom = JSID_TO_ATOM(id);
-    JS_ASSERT(!(atom->flags & ATOM_HIDDEN));
-    JS_ASSERT(ATOM_IS_STRING(atom));
-
-    hidden = js_AtomizeString(cx, ATOM_TO_STRING(atom), ATOM_HIDDEN);
-    if (!hidden)
-        return JS_FALSE;
-
-    /*
-     * Link hidden to unhidden atom to optimize call_enumerate -- this means
-     * the GC must mark a hidden atom's unhidden counterpart (see js_MarkAtom
-     * in jsgc.c).  It overloads the entry.value member, which for unhidden
-     * atoms may point to keyword information.
-     */
-    hidden->entry.value = atom;
-    *idp = ATOM_TO_JSID(hidden);
-    return JS_TRUE;
-}
-
-JSScopeProperty *
-js_AddHiddenProperty(JSContext *cx, JSObject *obj, jsid id,
-                     JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                     uintN attrs, uintN flags, intN shortid)
-{
-    if (!HidePropertyName(cx, &id))
-        return NULL;
-
-    flags |= SPROP_IS_HIDDEN;
-    return js_AddNativeProperty(cx, obj, id, getter, setter, slot, attrs,
-                                flags, shortid);
-}
-
-JSBool
-js_LookupHiddenProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                        JSProperty **propp)
-{
-    return HidePropertyName(cx, &id) &&
-           js_LookupProperty(cx, obj, id, objp, propp);
-}
-
-JSScopeProperty *
-js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,
-                     JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                     uintN attrs, uintN flags, intN shortid)
-{
-    JSScope *scope;
-    JSScopeProperty *sprop;
-
-    JS_LOCK_OBJ(cx, obj);
-    scope = js_GetMutableScope(cx, obj);
-    if (!scope) {
-        sprop = NULL;
-    } else {
-        /*
-         * Handle old bug that took empty string as zero index.  Also convert
-         * string indices to integers if appropriate.
-         */
-        CHECK_FOR_STRING_INDEX(id);
-        sprop = js_AddScopeProperty(cx, scope, id, getter, setter, slot, attrs,
-                                    flags, shortid);
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-    return sprop;
-}
-
-JSScopeProperty *
-js_ChangeNativePropertyAttrs(JSContext *cx, JSObject *obj,
-                             JSScopeProperty *sprop, uintN attrs, uintN mask,
-                             JSPropertyOp getter, JSPropertyOp setter)
-{
-    JSScope *scope;
-
-    JS_LOCK_OBJ(cx, obj);
-    scope = js_GetMutableScope(cx, obj);
-    if (!scope) {
-        sprop = NULL;
-    } else {
-        sprop = js_ChangeScopePropertyAttrs(cx, scope, sprop, attrs, mask,
-                                            getter, setter);
-        if (sprop) {
-            PROPERTY_CACHE_FILL(&cx->runtime->propertyCache, obj, sprop->id,
-                                sprop);
-        }
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-    return sprop;
-}
-
-JSBool
-js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
-                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                  JSProperty **propp)
-{
-    return js_DefineNativeProperty(cx, obj, id, value, getter, setter, attrs,
-                                   0, 0, propp);
-}
-
-/*
- * Backward compatibility requires allowing addProperty hooks to mutate the
- * nominal initial value of a slot-full property, while GC safety wants that
- * value to be stored before the call-out through the hook.  Optimize to do
- * both while saving cycles for classes that stub their addProperty hook.
- */
-#define ADD_PROPERTY_HELPER(cx,clasp,obj,scope,sprop,vp,cleanup)              \
-    JS_BEGIN_MACRO                                                            \
-        if ((clasp)->addProperty != JS_PropertyStub) {                        \
-            jsval nominal_ = *(vp);                                           \
-            if (!(clasp)->addProperty(cx, obj, SPROP_USERID(sprop), vp)) {    \
-                cleanup;                                                      \
-            }                                                                 \
-            if (*(vp) != nominal_) {                                          \
-                if (SPROP_HAS_VALID_SLOT(sprop, scope))                       \
-                    LOCKED_OBJ_SET_SLOT(obj, (sprop)->slot, *(vp));           \
-            }                                                                 \
-        }                                                                     \
-    JS_END_MACRO
-
-JSBool
-js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
-                        JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                        uintN flags, intN shortid, JSProperty **propp)
-{
-    JSClass *clasp;
-    JSScope *scope;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-
-    /*
-     * Handle old bug that took empty string as zero index.  Also convert
-     * string indices to integers if appropriate.
-     */
-    CHECK_FOR_STRING_INDEX(id);
-
-#if JS_HAS_GETTER_SETTER
-    /*
-     * If defining a getter or setter, we must check for its counterpart and
-     * update the attributes and property ops.  A getter or setter is really
-     * only half of a property.
-     */
-    if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
-        JSObject *pobj;
-
-        /*
-         * If JS_THREADSAFE and id is found, js_LookupProperty returns with
-         * sprop non-null and pobj locked.  If pobj == obj, the property is
-         * already in obj and obj has its own (mutable) scope.  So if we are
-         * defining a getter whose setter was already defined, or vice versa,
-         * finish the job via js_ChangeScopePropertyAttributes, and refresh
-         * the property cache line for (obj, id) to map sprop.
-         */
-        if (!js_LookupProperty(cx, obj, id, &pobj, &prop))
-            return JS_FALSE;
-        sprop = (JSScopeProperty *) prop;
-        if (sprop &&
-            pobj == obj &&
-            (sprop->attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
-            sprop = js_ChangeScopePropertyAttrs(cx, OBJ_SCOPE(obj), sprop,
-                                                attrs, sprop->attrs,
-                                                (attrs & JSPROP_GETTER)
-                                                ? getter
-                                                : sprop->getter,
-                                                (attrs & JSPROP_SETTER)
-                                                ? setter
-                                                : sprop->setter);
-
-            /* NB: obj == pobj, so we can share unlock code at the bottom. */
-            if (!sprop)
-                goto bad;
-            goto out;
-        }
-
-        if (prop) {
-            /* NB: call OBJ_DROP_PROPERTY, as pobj might not be native. */
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-            prop = NULL;
-        }
-    }
-#endif /* JS_HAS_GETTER_SETTER */
-
-    /* Lock if object locking is required by this implementation. */
-    JS_LOCK_OBJ(cx, obj);
-
-    /* Use the object's class getter and setter by default. */
-    clasp = LOCKED_OBJ_GET_CLASS(obj);
-    if (!getter)
-        getter = clasp->getProperty;
-    if (!setter)
-        setter = clasp->setProperty;
-
-    /* Get obj's own scope if it has one, or create a new one for obj. */
-    scope = js_GetMutableScope(cx, obj);
-    if (!scope)
-        goto bad;
-
-    /* Add the property to scope, or replace an existing one of the same id. */
-    if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
-        attrs |= JSPROP_SHARED;
-    sprop = js_AddScopeProperty(cx, scope, id, getter, setter,
-                                SPROP_INVALID_SLOT, attrs, flags, shortid);
-    if (!sprop)
-        goto bad;
-
-    /* Store value before calling addProperty, in case the latter GC's. */
-    if (SPROP_HAS_VALID_SLOT(sprop, scope))
-        LOCKED_OBJ_SET_SLOT(obj, sprop->slot, value);
-
-    /* XXXbe called with lock held */
-    ADD_PROPERTY_HELPER(cx, clasp, obj, scope, sprop, &value,
-                        js_RemoveScopeProperty(cx, scope, id);
-                        goto bad);
-
-#if JS_HAS_GETTER_SETTER
-out:
-#endif
-    PROPERTY_CACHE_FILL(&cx->runtime->propertyCache, obj, id, sprop);
-    if (propp)
-        *propp = (JSProperty *) sprop;
-    else
-        JS_UNLOCK_OBJ(cx, obj);
-    return JS_TRUE;
-
-bad:
-    JS_UNLOCK_OBJ(cx, obj);
-    return JS_FALSE;
-}
-
-/*
- * Given pc pointing after a property accessing bytecode, return true if the
- * access is a "object-detecting" in the sense used by web pages, e.g., when
- * checking whether document.all is defined.
- */
-static JSBool
-Detecting(JSContext *cx, jsbytecode *pc)
-{
-    JSScript *script;
-    jsbytecode *endpc;
-    JSOp op;
-    JSAtom *atom;
-
-    if (!cx->fp)
-        return JS_FALSE;
-    script = cx->fp->script;
-    for (endpc = script->code + script->length; pc < endpc; pc++) {
-        /* General case: a branch or equality op follows the access. */
-        op = (JSOp) *pc;
-        if (js_CodeSpec[op].format & JOF_DETECTING)
-            return JS_TRUE;
-
-        /*
-         * Special case #1: handle (document.all == null).  Don't sweat about
-         * JS1.2's revision of the equality operators here.
-         */
-        if (op == JSOP_NULL) {
-            if (++pc < endpc)
-                return *pc == JSOP_EQ || *pc == JSOP_NE;
-            break;
-        }
-
-        /*
-         * Special case #2: handle (document.all == undefined).  Don't worry
-         * about someone redefining undefined, which was added by Edition 3,
-         * so was read/write for backward compatibility.
-         */
-        if (op == JSOP_NAME) {
-            atom = GET_ATOM(cx, script, pc);
-            if (atom == cx->runtime->atomState.typeAtoms[JSTYPE_VOID] &&
-                (pc += js_CodeSpec[op].length) < endpc) {
-                op = (JSOp) *pc;
-                return op == JSOP_EQ || op == JSOP_NE ||
-                       op == JSOP_NEW_EQ || op == JSOP_NEW_NE;
-            }
-            break;
-        }
-
-        /* At this point, anything but grouping means we're not detecting. */
-        if (op != JSOP_GROUP)
-            break;
-    }
-    return JS_FALSE;
-}
-
-JS_FRIEND_API(JSBool)
-js_LookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                  JSProperty **propp)
-{
-    return js_LookupPropertyWithFlags(cx, obj, id, 0, objp, propp);
-}
-
-JSBool
-js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags,
-                           JSObject **objp, JSProperty **propp)
-{
-    JSObject *start, *obj2, *proto;
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    JSClass *clasp;
-    JSResolveOp resolve;
-    JSResolvingKey key;
-    JSResolvingEntry *entry;
-    uint32 generation;
-    JSNewResolveOp newresolve;
-    jsbytecode *pc;
-    const JSCodeSpec *cs;
-    uint32 format;
-    JSBool ok;
-
-    /*
-     * Handle old bug that took empty string as zero index.  Also convert
-     * string indices to integers if appropriate.
-     */
-    CHECK_FOR_STRING_INDEX(id);
-
-    /* Search scopes starting with obj and following the prototype link. */
-    start = obj;
-    for (;;) {
-        JS_LOCK_OBJ(cx, obj);
-        scope = OBJ_SCOPE(obj);
-        if (scope->object == obj) {
-            sprop = SCOPE_GET_PROPERTY(scope, id);
-        } else {
-            /* Shared prototype scope: try resolve before lookup. */
-            sprop = NULL;
-        }
-
-        /* Try obj's class resolve hook if id was not found in obj's scope. */
-        if (!sprop) {
-            clasp = LOCKED_OBJ_GET_CLASS(obj);
-            resolve = clasp->resolve;
-            if (resolve != JS_ResolveStub) {
-                /* Avoid recursion on (obj, id) already being resolved on cx. */
-                key.obj = obj;
-                key.id = id;
-
-                /*
-                 * Once we have successfully added an entry for (obj, key) to
-                 * cx->resolvingTable, control must go through cleanup: before
-                 * returning.  But note that JS_DHASH_ADD may find an existing
-                 * entry, in which case we bail to suppress runaway recursion.
-                 */
-                if (!js_StartResolving(cx, &key, JSRESFLAG_LOOKUP, &entry)) {
-                    JS_UNLOCK_OBJ(cx, obj);
-                    return JS_FALSE;
-                }
-                if (!entry) {
-                    /* Already resolving id in obj -- dampen recursion. */
-                    JS_UNLOCK_OBJ(cx, obj);
-                    goto out;
-                }
-                generation = cx->resolvingTable->generation;
-
-                /* Null *propp here so we can test it at cleanup: safely. */
-                *propp = NULL;
-
-                if (clasp->flags & JSCLASS_NEW_RESOLVE) {
-                    newresolve = (JSNewResolveOp)resolve;
-                    if (!(flags & JSRESOLVE_CLASSNAME) &&
-                        cx->fp &&
-                        (pc = cx->fp->pc)) {
-                        cs = &js_CodeSpec[*pc];
-                        format = cs->format;
-                        if ((format & JOF_MODEMASK) != JOF_NAME)
-                            flags |= JSRESOLVE_QUALIFIED;
-                        if ((format & JOF_ASSIGNING) ||
-                            (cx->fp->flags & JSFRAME_ASSIGNING)) {
-                            flags |= JSRESOLVE_ASSIGNING;
-                        } else {
-                            pc += cs->length;
-                            if (Detecting(cx, pc))
-                                flags |= JSRESOLVE_DETECTING;
-                        }
-                        if (format & JOF_DECLARING)
-                            flags |= JSRESOLVE_DECLARING;
-                    }
-                    obj2 = (clasp->flags & JSCLASS_NEW_RESOLVE_GETS_START)
-                           ? start
-                           : NULL;
-                    JS_UNLOCK_OBJ(cx, obj);
-
-                    /* Protect id and all atoms from a GC nested in resolve. */
-                    JS_KEEP_ATOMS(cx->runtime);
-                    ok = newresolve(cx, obj, ID_TO_VALUE(id), flags, &obj2);
-                    JS_UNKEEP_ATOMS(cx->runtime);
-                    if (!ok)
-                        goto cleanup;
-
-                    JS_LOCK_OBJ(cx, obj);
-                    if (obj2) {
-                        /* Resolved: juggle locks and lookup id again. */
-                        if (obj2 != obj) {
-                            JS_UNLOCK_OBJ(cx, obj);
-                            JS_LOCK_OBJ(cx, obj2);
-                        }
-                        scope = OBJ_SCOPE(obj2);
-                        if (!MAP_IS_NATIVE(&scope->map)) {
-                            /* Whoops, newresolve handed back a foreign obj2. */
-                            JS_ASSERT(obj2 != obj);
-                            JS_UNLOCK_OBJ(cx, obj2);
-                            ok = OBJ_LOOKUP_PROPERTY(cx, obj2, id, objp, propp);
-                            if (!ok || *propp)
-                                goto cleanup;
-                            JS_LOCK_OBJ(cx, obj2);
-                        } else {
-                            /*
-                             * Require that obj2 have its own scope now, as we
-                             * do for old-style resolve.  If it doesn't, then
-                             * id was not truly resolved, and we'll find it in
-                             * the proto chain, or miss it if obj2's proto is
-                             * not on obj's proto chain.  That last case is a
-                             * "too bad!" case.
-                             */
-                            if (scope->object == obj2)
-                                sprop = SCOPE_GET_PROPERTY(scope, id);
-                        }
-                        if (sprop) {
-                            JS_ASSERT(obj2 == scope->object);
-                            obj = obj2;
-                        } else if (obj2 != obj) {
-                            JS_UNLOCK_OBJ(cx, obj2);
-                            JS_LOCK_OBJ(cx, obj);
-                        }
-                    }
-                } else {
-                    /*
-                     * Old resolve always requires id re-lookup if obj owns
-                     * its scope after resolve returns.
-                     */
-                    JS_UNLOCK_OBJ(cx, obj);
-                    ok = resolve(cx, obj, ID_TO_VALUE(id));
-                    if (!ok)
-                        goto cleanup;
-                    JS_LOCK_OBJ(cx, obj);
-                    scope = OBJ_SCOPE(obj);
-                    JS_ASSERT(MAP_IS_NATIVE(&scope->map));
-                    if (scope->object == obj)
-                        sprop = SCOPE_GET_PROPERTY(scope, id);
-                }
-
-            cleanup:
-                js_StopResolving(cx, &key, JSRESFLAG_LOOKUP, entry, generation);
-                if (!ok || *propp)
-                    return ok;
-            }
-        }
-
-        if (sprop) {
-            JS_ASSERT(OBJ_SCOPE(obj) == scope);
-            *objp = scope->object;      /* XXXbe hide in jsscope.[ch] */
-
-            *propp = (JSProperty *) sprop;
-            return JS_TRUE;
-        }
-
-        proto = LOCKED_OBJ_GET_PROTO(obj);
-        JS_UNLOCK_OBJ(cx, obj);
-        if (!proto)
-            break;
-        if (!OBJ_IS_NATIVE(proto))
-            return OBJ_LOOKUP_PROPERTY(cx, proto, id, objp, propp);
-        obj = proto;
-    }
-
-out:
-    *objp = NULL;
-    *propp = NULL;
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(JSBool)
-js_FindProperty(JSContext *cx, jsid id, JSObject **objp, JSObject **pobjp,
-                JSProperty **propp)
-{
-    JSRuntime *rt;
-    JSObject *obj, *pobj, *lastobj;
-    JSScopeProperty *sprop;
-    JSProperty *prop;
-
-    rt = cx->runtime;
-    obj = cx->fp->scopeChain;
-    do {
-        /* Try the property cache and return immediately on cache hit. */
-        if (OBJ_IS_NATIVE(obj)) {
-            JS_LOCK_OBJ(cx, obj);
-            PROPERTY_CACHE_TEST(&rt->propertyCache, obj, id, sprop);
-            if (sprop) {
-                JS_ASSERT(OBJ_IS_NATIVE(obj));
-                *objp = obj;
-                *pobjp = obj;
-                *propp = (JSProperty *) sprop;
-                return JS_TRUE;
-            }
-            JS_UNLOCK_OBJ(cx, obj);
-        }
-
-        /* If cache miss, take the slow path. */
-        if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &pobj, &prop))
-            return JS_FALSE;
-        if (prop) {
-            if (OBJ_IS_NATIVE(pobj)) {
-                sprop = (JSScopeProperty *) prop;
-                PROPERTY_CACHE_FILL(&rt->propertyCache, pobj, id, sprop);
-            }
-            *objp = obj;
-            *pobjp = pobj;
-            *propp = prop;
-            return JS_TRUE;
-        }
-        lastobj = obj;
-    } while ((obj = OBJ_GET_PARENT(cx, obj)) != NULL);
-
-    *objp = lastobj;
-    *pobjp = NULL;
-    *propp = NULL;
-    return JS_TRUE;
-}
-
-JSObject *
-js_FindIdentifierBase(JSContext *cx, jsid id)
-{
-    JSObject *obj, *pobj;
-    JSProperty *prop;
-
-    /*
-     * Look for id's property along the "with" statement chain and the
-     * statically-linked scope chain.
-     */
-    if (!js_FindProperty(cx, id, &obj, &pobj, &prop))
-        return NULL;
-    if (prop) {
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-        return obj;
-    }
-
-    /*
-     * Use the top-level scope from the scope chain, which won't end in the
-     * same scope as cx->globalObject for cross-context function calls.
-     */
-    JS_ASSERT(obj);
-
-    /*
-     * Property not found.  Give a strict warning if binding an undeclared
-     * top-level variable.
-     */
-    if (JS_HAS_STRICT_OPTION(cx)) {
-        JSString *str = JSVAL_TO_STRING(ID_TO_VALUE(id));
-        if (!JS_ReportErrorFlagsAndNumber(cx,
-                                          JSREPORT_WARNING | JSREPORT_STRICT,
-                                          js_GetErrorMessage, NULL,
-                                          JSMSG_UNDECLARED_VAR,
-                                          JS_GetStringBytes(str))) {
-            return NULL;
-        }
-    }
-    return obj;
-}
-
-JSBool
-js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    JSObject *obj2;
-    JSProperty *prop;
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    uint32 slot;
-
-    /*
-     * Handle old bug that took empty string as zero index.  Also convert
-     * string indices to integers if appropriate.
-     */
-    CHECK_FOR_STRING_INDEX(id);
-
-    if (!js_LookupProperty(cx, obj, id, &obj2, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        jsval default_val;
-
-#if JS_BUG_NULL_INDEX_PROPS
-        /* Indexed properties defaulted to null in old versions. */
-        default_val = (JSID_IS_INT(id) && JSID_TO_INT(id) >= 0)
-                      ? JSVAL_NULL
-                      : JSVAL_VOID;
-#else
-        default_val = JSVAL_VOID;
-#endif
-        *vp = default_val;
-
-        if (!OBJ_GET_CLASS(cx, obj)->getProperty(cx, obj, ID_TO_VALUE(id), vp))
-            return JS_FALSE;
-
-        /*
-         * Give a strict warning if foo.bar is evaluated by a script for an
-         * object foo with no property named 'bar'.
-         */
-        if (JS_HAS_STRICT_OPTION(cx) &&
-            *vp == default_val &&
-            cx->fp && cx->fp->pc &&
-            (*cx->fp->pc == JSOP_GETPROP || *cx->fp->pc == JSOP_GETELEM))
-        {
-            jsbytecode *pc;
-            JSString *str;
-
-            /* Kludge to allow (typeof foo == "undefined") tests. */
-            JS_ASSERT(cx->fp->script);
-            pc = cx->fp->pc;
-            pc += js_CodeSpec[*pc].length;
-            if (Detecting(cx, pc))
-                return JS_TRUE;
-
-            /* Ok, bad undefined property reference: whine about it. */
-            str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK,
-                                             ID_TO_VALUE(id), NULL);
-            if (!str ||
-                !JS_ReportErrorFlagsAndNumber(cx,
-                                              JSREPORT_WARNING|JSREPORT_STRICT,
-                                              js_GetErrorMessage, NULL,
-                                              JSMSG_UNDEFINED_PROP,
-                                              JS_GetStringBytes(str))) {
-                return JS_FALSE;
-            }
-        }
-        return JS_TRUE;
-    }
-
-    if (!OBJ_IS_NATIVE(obj2)) {
-        OBJ_DROP_PROPERTY(cx, obj2, prop);
-        return OBJ_GET_PROPERTY(cx, obj2, id, vp);
-    }
-
-    /* Unlock obj2 before calling getter, relock after to avoid deadlock. */
-    scope = OBJ_SCOPE(obj2);
-    sprop = (JSScopeProperty *) prop;
-    slot = sprop->slot;
-    if (slot != SPROP_INVALID_SLOT) {
-        JS_ASSERT(slot < obj2->map->freeslot);
-        *vp = LOCKED_OBJ_GET_SLOT(obj2, slot);
-
-        /* If sprop has a stub getter, we're done. */
-        if (!sprop->getter)
-            goto out;
-    } else {
-        *vp = JSVAL_VOID;
-    }
-
-    JS_UNLOCK_SCOPE(cx, scope);
-    if (!SPROP_GET(cx, sprop, obj, obj2, vp))
-        return JS_FALSE;
-    JS_LOCK_SCOPE(cx, scope);
-
-    if (SPROP_HAS_VALID_SLOT(sprop, scope)) {
-        LOCKED_OBJ_SET_SLOT(obj2, slot, *vp);
-        PROPERTY_CACHE_FILL(&cx->runtime->propertyCache, obj2, id, sprop);
-    }
-
-out:
-    JS_UNLOCK_SCOPE(cx, scope);
-    return JS_TRUE;
-}
-
-JSBool
-js_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    JSObject *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSScope *scope;
-    uintN attrs, flags;
-    intN shortid;
-    JSClass *clasp;
-    JSPropertyOp getter, setter;
-    jsval pval;
-    uint32 slot;
-
-    /*
-     * Handle old bug that took empty string as zero index.  Also convert
-     * string indices to integers if appropriate.
-     */
-    CHECK_FOR_STRING_INDEX(id);
-
-    if (!js_LookupProperty(cx, obj, id, &pobj, &prop))
-        return JS_FALSE;
-
-    if (prop && !OBJ_IS_NATIVE(pobj)) {
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-        prop = NULL;
-    }
-    sprop = (JSScopeProperty *) prop;
-
-    /*
-     * Now either sprop is null, meaning id was not found in obj or one of its
-     * prototypes; or sprop is non-null, meaning id was found in pobj's scope.
-     * If JS_THREADSAFE and sprop is non-null, then scope is locked, and sprop
-     * is held: we must OBJ_DROP_PROPERTY or JS_UNLOCK_SCOPE before we return
-     * (the two are equivalent for native objects, but we use JS_UNLOCK_SCOPE
-     * because it is cheaper).
-     */
-    attrs = JSPROP_ENUMERATE;
-    flags = 0;
-    shortid = 0;
-    clasp = OBJ_GET_CLASS(cx, obj);
-    getter = clasp->getProperty;
-    setter = clasp->setProperty;
-
-    if (sprop) {
-        /*
-         * Set scope for use below.  It was locked by js_LookupProperty, and
-         * we know pobj owns it (i.e., scope->object == pobj).  Therefore we
-         * optimize JS_UNLOCK_OBJ(cx, pobj) into JS_UNLOCK_SCOPE(cx, scope).
-         */
-        scope = OBJ_SCOPE(pobj);
-
-        attrs = sprop->attrs;
-        if ((attrs & JSPROP_READONLY) ||
-            (SCOPE_IS_SEALED(scope) && pobj == obj)) {
-            JS_UNLOCK_SCOPE(cx, scope);
-
-            /*
-             * Here, we'll either return true or goto read_only_error, which
-             * reports a strict warning or throws an error.  So we redefine
-             * the |flags| local variable to be JSREPORT_* flags to pass to
-             * JS_ReportErrorFlagsAndNumberUC at label read_only_error.  We
-             * must likewise re-task flags further below for the other 'goto
-             * read_only_error;' case.
-             */
-            flags = JSREPORT_ERROR;
-            if ((attrs & JSPROP_READONLY) && JS_VERSION_IS_ECMA(cx)) {
-                if (!JS_HAS_STRICT_OPTION(cx)) {
-                    /* Just return true per ECMA if not in strict mode. */
-                    return JS_TRUE;
-                }
-
-                /* Strict mode: report a read-only strict warning. */
-                flags = JSREPORT_STRICT | JSREPORT_WARNING;
-            }
-            goto read_only_error;
-        }
-
-        if (pobj != obj) {
-            /*
-             * We found id in a prototype object: prepare to share or shadow.
-             * NB: Thanks to the immutable, garbage-collected property tree
-             * maintained by jsscope.c in cx->runtime, we needn't worry about
-             * sprop going away behind our back after we've unlocked scope.
-             */
-            JS_UNLOCK_SCOPE(cx, scope);
-
-            /* Don't clone a shared prototype property. */
-            if (attrs & JSPROP_SHARED)
-                return SPROP_SET(cx, sprop, obj, pobj, vp);
-
-            /* Restore attrs to the ECMA default for new properties. */
-            attrs = JSPROP_ENUMERATE;
-
-            /*
-             * Preserve the shortid, getter, and setter when shadowing any
-             * property that has a shortid.  An old API convention requires
-             * that the property's getter and setter functions receive the
-             * shortid, not id, when they are called on the shadow we are
-             * about to create in obj's scope.
-             */
-            if (sprop->flags & SPROP_HAS_SHORTID) {
-                flags = SPROP_HAS_SHORTID;
-                shortid = sprop->shortid;
-                getter = sprop->getter;
-                setter = sprop->setter;
-            }
-
-            /*
-             * Forget we found the proto-property now that we've copied any
-             * needed member values.
-             */
-            sprop = NULL;
-        }
-#ifdef __GNUC__ /* suppress bogus gcc warnings */
-    } else {
-        scope = NULL;
-#endif
-    }
-
-    if (!sprop) {
-        if (SCOPE_IS_SEALED(OBJ_SCOPE(obj)) && OBJ_SCOPE(obj)->object == obj) {
-            flags = JSREPORT_ERROR;
-            goto read_only_error;
-        }
-
-        /* Find or make a property descriptor with the right heritage. */
-        JS_LOCK_OBJ(cx, obj);
-        scope = js_GetMutableScope(cx, obj);
-        if (!scope) {
-            JS_UNLOCK_OBJ(cx, obj);
-            return JS_FALSE;
-        }
-        if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
-            attrs |= JSPROP_SHARED;
-        sprop = js_AddScopeProperty(cx, scope, id, getter, setter,
-                                    SPROP_INVALID_SLOT, attrs, flags, shortid);
-        if (!sprop) {
-            JS_UNLOCK_SCOPE(cx, scope);
-            return JS_FALSE;
-        }
-
-        /*
-         * Initialize the new property value (passed to setter) to undefined.
-         * Note that we store before calling addProperty, to match the order
-         * in js_DefineNativeProperty.
-         */
-        if (SPROP_HAS_VALID_SLOT(sprop, scope))
-            LOCKED_OBJ_SET_SLOT(obj, sprop->slot, JSVAL_VOID);
-
-        /* XXXbe called with obj locked */
-        ADD_PROPERTY_HELPER(cx, clasp, obj, scope, sprop, vp,
-                            js_RemoveScopeProperty(cx, scope, id);
-                            JS_UNLOCK_SCOPE(cx, scope);
-                            return JS_FALSE);
-
-        PROPERTY_CACHE_FILL(&cx->runtime->propertyCache, obj, id, sprop);
-    }
-
-    /* Get the current property value from its slot. */
-    slot = sprop->slot;
-    if (slot != SPROP_INVALID_SLOT) {
-        JS_ASSERT(slot < obj->map->freeslot);
-        pval = LOCKED_OBJ_GET_SLOT(obj, slot);
-
-        /* If sprop has a stub setter, keep scope locked and just store *vp. */
-        if (!sprop->setter)
-            goto set_slot;
-    }
-
-    /* Avoid deadlock by unlocking obj's scope while calling sprop's setter. */
-    JS_UNLOCK_SCOPE(cx, scope);
-
-    /* Let the setter modify vp before copying from it to obj->slots[slot]. */
-    if (!SPROP_SET(cx, sprop, obj, obj, vp))
-        return JS_FALSE;
-
-    /* Relock obj's scope until we are done with sprop. */
-    JS_LOCK_SCOPE(cx, scope);
-
-    /*
-     * Check whether sprop is still around (was not deleted), and whether it
-     * has a slot (it may never have had one, or we may have lost a race with
-     * someone who cleared scope).
-     */
-    if (SPROP_HAS_VALID_SLOT(sprop, scope)) {
-  set_slot:
-        GC_POKE(cx, pval);
-        LOCKED_OBJ_SET_SLOT(obj, slot, *vp);
-    }
-    JS_UNLOCK_SCOPE(cx, scope);
-    return JS_TRUE;
-
-  read_only_error: {
-    JSString *str = js_DecompileValueGenerator(cx,
-                                               JSDVG_IGNORE_STACK,
-                                               ID_TO_VALUE(id),
-                                               NULL);
-    if (!str)
-        return JS_FALSE;
-    return JS_ReportErrorFlagsAndNumberUC(cx, flags, js_GetErrorMessage,
-                                          NULL, JSMSG_READ_ONLY,
-                                          JS_GetStringChars(str));
-  }
-}
-
-JSBool
-js_GetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                 uintN *attrsp)
-{
-    JSBool noprop, ok;
-    JSScopeProperty *sprop;
-
-    noprop = !prop;
-    if (noprop) {
-        if (!js_LookupProperty(cx, obj, id, &obj, &prop))
-            return JS_FALSE;
-        if (!prop) {
-            *attrsp = 0;
-            return JS_TRUE;
-        }
-        if (!OBJ_IS_NATIVE(obj)) {
-            ok = OBJ_GET_ATTRIBUTES(cx, obj, id, prop, attrsp);
-            OBJ_DROP_PROPERTY(cx, obj, prop);
-            return ok;
-        }
-    }
-    sprop = (JSScopeProperty *)prop;
-    *attrsp = sprop->attrs;
-    if (noprop)
-        OBJ_DROP_PROPERTY(cx, obj, prop);
-    return JS_TRUE;
-}
-
-JSBool
-js_SetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                 uintN *attrsp)
-{
-    JSBool noprop, ok;
-    JSScopeProperty *sprop;
-
-    noprop = !prop;
-    if (noprop) {
-        if (!js_LookupProperty(cx, obj, id, &obj, &prop))
-            return JS_FALSE;
-        if (!prop)
-            return JS_TRUE;
-        if (!OBJ_IS_NATIVE(obj)) {
-            ok = OBJ_SET_ATTRIBUTES(cx, obj, id, prop, attrsp);
-            OBJ_DROP_PROPERTY(cx, obj, prop);
-            return ok;
-        }
-    }
-    sprop = (JSScopeProperty *)prop;
-    sprop = js_ChangeNativePropertyAttrs(cx, obj, sprop,
-                                         *attrsp &
-                                         ~(JSPROP_GETTER | JSPROP_SETTER), 0,
-                                         sprop->getter, sprop->setter);
-    if (noprop)
-        OBJ_DROP_PROPERTY(cx, obj, prop);
-    return (sprop != NULL);
-}
-
-JSBool
-js_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval)
-{
-#if JS_HAS_PROP_DELETE
-
-    JSObject *proto;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSString *str;
-    JSScope *scope;
-    JSBool ok;
-
-    *rval = JS_VERSION_IS_ECMA(cx) ? JSVAL_TRUE : JSVAL_VOID;
-
-    /*
-     * Handle old bug that took empty string as zero index.  Also convert
-     * string indices to integers if appropriate.
-     */
-    CHECK_FOR_STRING_INDEX(id);
-
-    if (!js_LookupProperty(cx, obj, id, &proto, &prop))
-        return JS_FALSE;
-    if (!prop || proto != obj) {
-        /*
-         * If the property was found in a native prototype, check whether it's
-         * shared and permanent.  Such a property stands for direct properties
-         * in all delegating objects, matching ECMA semantics without bloating
-         * each delegating object.
-         */
-        if (prop) {
-            if (OBJ_IS_NATIVE(proto)) {
-                sprop = (JSScopeProperty *)prop;
-                if (SPROP_IS_SHARED_PERMANENT(sprop))
-                    *rval = JSVAL_FALSE;
-            }
-            OBJ_DROP_PROPERTY(cx, proto, prop);
-            if (*rval == JSVAL_FALSE)
-                return JS_TRUE;
-        }
-
-        /*
-         * If no property, or the property comes unshared or impermanent from
-         * a prototype, call the class's delProperty hook, passing rval as the
-         * result parameter.
-         */
-        return OBJ_GET_CLASS(cx, obj)->delProperty(cx, obj, ID_TO_VALUE(id),
-                                                   rval);
-    }
-
-    sprop = (JSScopeProperty *)prop;
-    if (sprop->attrs & JSPROP_PERMANENT) {
-        OBJ_DROP_PROPERTY(cx, obj, prop);
-        if (JS_VERSION_IS_ECMA(cx)) {
-            *rval = JSVAL_FALSE;
-            return JS_TRUE;
-        }
-        str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK,
-                                         ID_TO_VALUE(id), NULL);
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_PERMANENT, JS_GetStringBytes(str));
-        }
-        return JS_FALSE;
-    }
-
-    /* XXXbe called with obj locked */
-    if (!LOCKED_OBJ_GET_CLASS(obj)->delProperty(cx, obj, SPROP_USERID(sprop),
-                                                rval)) {
-        OBJ_DROP_PROPERTY(cx, obj, prop);
-        return JS_FALSE;
-    }
-
-    scope = OBJ_SCOPE(obj);
-    if (SPROP_HAS_VALID_SLOT(sprop, scope))
-        GC_POKE(cx, LOCKED_OBJ_GET_SLOT(obj, sprop->slot));
-
-    PROPERTY_CACHE_FILL(&cx->runtime->propertyCache, obj, id, NULL);
-    ok = js_RemoveScopeProperty(cx, scope, id);
-    OBJ_DROP_PROPERTY(cx, obj, prop);
-    return ok;
-
-#else  /* !JS_HAS_PROP_DELETE */
-
-    jsval null = JSVAL_NULL;
-
-    *rval = JSVAL_VOID;
-    return js_SetProperty(cx, obj, id, &null);
-
-#endif /* !JS_HAS_PROP_DELETE */
-}
-
-JSBool
-js_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp)
-{
-    jsval v;
-    JSString *str;
-
-    v = OBJECT_TO_JSVAL(obj);
-    switch (hint) {
-      case JSTYPE_STRING:
-        /*
-         * Propagate the exception if js_TryMethod finds an appropriate
-         * method, and calling that method returned failure.
-         */
-        if (!js_TryMethod(cx, obj, cx->runtime->atomState.toStringAtom, 0, NULL,
-                          &v)) {
-            return JS_FALSE;
-        }
-
-        if (!JSVAL_IS_PRIMITIVE(v)) {
-            if (!OBJ_GET_CLASS(cx, obj)->convert(cx, obj, hint, &v))
-                return JS_FALSE;
-
-            /*
-             * JS1.2 never failed (except for malloc failure) to convert an
-             * object to a string.  ECMA requires an error if both toString
-             * and valueOf fail to produce a primitive value.
-             */
-            if (!JSVAL_IS_PRIMITIVE(v) && JS_VERSION_IS_1_2(cx)) {
-                char *bytes = JS_smprintf("[object %s]",
-                                          OBJ_GET_CLASS(cx, obj)->name);
-                if (!bytes)
-                    return JS_FALSE;
-                str = JS_NewString(cx, bytes, strlen(bytes));
-                if (!str) {
-                    free(bytes);
-                    return JS_FALSE;
-                }
-                v = STRING_TO_JSVAL(str);
-                goto out;
-            }
-        }
-        break;
-
-      default:
-        if (!OBJ_GET_CLASS(cx, obj)->convert(cx, obj, hint, &v))
-            return JS_FALSE;
-        if (!JSVAL_IS_PRIMITIVE(v)) {
-            JSType type = JS_TypeOfValue(cx, v);
-            if (type == hint ||
-                (type == JSTYPE_FUNCTION && hint == JSTYPE_OBJECT)) {
-                goto out;
-            }
-            /* Don't convert to string (source object literal) for JS1.2. */
-            if (JS_VERSION_IS_1_2(cx) && hint == JSTYPE_BOOLEAN)
-                goto out;
-            if (!js_TryMethod(cx, obj, cx->runtime->atomState.toStringAtom, 0,
-                              NULL, &v))
-                return JS_FALSE;
-        }
-        break;
-    }
-    if (!JSVAL_IS_PRIMITIVE(v)) {
-        /* Avoid recursive death through js_DecompileValueGenerator. */
-        if (hint == JSTYPE_STRING) {
-            str = JS_InternString(cx, OBJ_GET_CLASS(cx, obj)->name);
-            if (!str)
-                return JS_FALSE;
-        } else {
-            str = NULL;
-        }
-        *vp = OBJECT_TO_JSVAL(obj);
-        str = js_DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, str);
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_CANT_CONVERT_TO,
-                                 JS_GetStringBytes(str),
-                                 (hint == JSTYPE_VOID)
-                                 ? "primitive type"
-                                 : js_type_str[hint]);
-        }
-        return JS_FALSE;
-    }
-out:
-    *vp = v;
-    return JS_TRUE;
-}
-
-JSIdArray *
-js_NewIdArray(JSContext *cx, jsint length)
-{
-    JSIdArray *ida;
-
-    ida = (JSIdArray *)
-          JS_malloc(cx, sizeof(JSIdArray) + (length-1) * sizeof(jsval));
-    if (ida)
-        ida->length = length;
-    return ida;
-}
-
-JSIdArray *
-js_SetIdArrayLength(JSContext *cx, JSIdArray *ida, jsint length)
-{
-    JSIdArray *rida;
-
-    rida = (JSIdArray *)
-           JS_realloc(cx, ida, sizeof(JSIdArray) + (length-1) * sizeof(jsval));
-    if (!rida)
-        JS_DestroyIdArray(cx, ida);
-    else
-        rida->length = length;
-    return rida;
-}
-
-/* Private type used to iterate over all properties of a native JS object */
-typedef struct JSNativeIteratorState {
-    jsint next_index;   /* index into jsid array */
-    JSIdArray *ida;     /* all property ids in enumeration */
-} JSNativeIteratorState;
-
-/*
- * This function is used to enumerate the properties of native JSObjects
- * and those host objects that do not define a JSNewEnumerateOp-style iterator
- * function.
- */
-JSBool
-js_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
-             jsval *statep, jsid *idp)
-{
-    JSObject *proto;
-    JSClass *clasp;
-    JSEnumerateOp enumerate;
-    JSScopeProperty *sprop, *lastProp;
-    jsint i, length;
-    JSScope *scope;
-    JSIdArray *ida;
-    JSNativeIteratorState *state;
-
-    clasp = OBJ_GET_CLASS(cx, obj);
-    enumerate = clasp->enumerate;
-    if (clasp->flags & JSCLASS_NEW_ENUMERATE)
-        return ((JSNewEnumerateOp) enumerate)(cx, obj, enum_op, statep, idp);
-
-    switch (enum_op) {
-      case JSENUMERATE_INIT:
-        if (!enumerate(cx, obj))
-            return JS_FALSE;
-        length = 0;
-
-        /*
-         * The set of all property ids is pre-computed when the iterator
-         * is initialized so as to avoid problems with properties being
-         * deleted during the iteration.
-         */
-        JS_LOCK_OBJ(cx, obj);
-        scope = OBJ_SCOPE(obj);
-
-        /*
-         * If this object shares a scope with its prototype, don't enumerate
-         * its properties.  Otherwise they will be enumerated a second time
-         * when the prototype object is enumerated.
-         */
-        proto = OBJ_GET_PROTO(cx, obj);
-        if (proto && scope == OBJ_SCOPE(proto)) {
-            ida = js_NewIdArray(cx, 0);
-            if (!ida) {
-                JS_UNLOCK_OBJ(cx, obj);
-                return JS_FALSE;
-            }
-        } else {
-            /* Object has a private scope; Enumerate all props in scope. */
-            for (sprop = lastProp = SCOPE_LAST_PROP(scope); sprop;
-                 sprop = sprop->parent) {
-                if ((
-#ifdef DUMP_CALL_TABLE
-                     (cx->options & JSOPTION_LOGCALL_TOSOURCE) ||
-#endif
-                     (sprop->attrs & JSPROP_ENUMERATE)) &&
-                    !(sprop->flags & SPROP_IS_ALIAS) &&
-                    (!SCOPE_HAD_MIDDLE_DELETE(scope) ||
-                     SCOPE_HAS_PROPERTY(scope, sprop))) {
-                    length++;
-                }
-            }
-            ida = js_NewIdArray(cx, length);
-            if (!ida) {
-                JS_UNLOCK_OBJ(cx, obj);
-                return JS_FALSE;
-            }
-            i = length;
-            for (sprop = lastProp; sprop; sprop = sprop->parent) {
-                if ((
-#ifdef DUMP_CALL_TABLE
-                     (cx->options & JSOPTION_LOGCALL_TOSOURCE) ||
-#endif
-                     (sprop->attrs & JSPROP_ENUMERATE)) &&
-                    !(sprop->flags & SPROP_IS_ALIAS) &&
-                    (!SCOPE_HAD_MIDDLE_DELETE(scope) ||
-                     SCOPE_HAS_PROPERTY(scope, sprop))) {
-                    JS_ASSERT(i > 0);
-                    ida->vector[--i] = sprop->id;
-                }
-            }
-        }
-        JS_UNLOCK_OBJ(cx, obj);
-
-        state = (JSNativeIteratorState *)
-            JS_malloc(cx, sizeof(JSNativeIteratorState));
-        if (!state) {
-            JS_DestroyIdArray(cx, ida);
-            return JS_FALSE;
-        }
-        state->ida = ida;
-        state->next_index = 0;
-        *statep = PRIVATE_TO_JSVAL(state);
-        if (idp)
-            *idp = INT_TO_JSVAL(length);
-        break;
-
-      case JSENUMERATE_NEXT:
-        state = (JSNativeIteratorState *) JSVAL_TO_PRIVATE(*statep);
-        ida = state->ida;
-        length = ida->length;
-        if (state->next_index != length) {
-            *idp = ida->vector[state->next_index++];
-            break;
-        }
-        /* FALL THROUGH */
-
-      case JSENUMERATE_DESTROY:
-        state = (JSNativeIteratorState *) JSVAL_TO_PRIVATE(*statep);
-        JS_DestroyIdArray(cx, state->ida);
-        JS_free(cx, state);
-        *statep = JSVAL_NULL;
-        break;
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-               jsval *vp, uintN *attrsp)
-{
-    JSObject *pobj;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSClass *clasp;
-    JSCheckAccessOp check;
-    JSBool ok;
-
-    if (!js_LookupProperty(cx, obj, id, &pobj, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        *vp = JSVAL_VOID;
-        *attrsp = 0;
-        clasp = OBJ_GET_CLASS(cx, obj);
-        return !clasp->checkAccess ||
-               clasp->checkAccess(cx, obj, ID_TO_VALUE(id), mode, vp);
-    }
-    if (!OBJ_IS_NATIVE(pobj)) {
-        OBJ_DROP_PROPERTY(cx, pobj, prop);
-        return OBJ_CHECK_ACCESS(cx, pobj, id, mode, vp, attrsp);
-    }
-    sprop = (JSScopeProperty *)prop;
-    if (!(mode & JSACC_WRITE)) {
-        *vp = (SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)))
-            ? LOCKED_OBJ_GET_SLOT(pobj, sprop->slot)
-            : ((mode & JSACC_WATCH) == JSACC_PROTO)
-            ? LOCKED_OBJ_GET_SLOT(obj, JSSLOT_PROTO)
-            : (mode == JSACC_PARENT)
-            ? LOCKED_OBJ_GET_SLOT(obj, JSSLOT_PARENT)
-            : JSVAL_VOID;
-    }
-    *attrsp = sprop->attrs;
-
-    /*
-     * If obj's class has a stub (null) checkAccess hook, use the per-runtime
-     * checkObjectAccess callback, if configured.
-     *
-     * We don't want to require all classes to supply a checkAccess hook; we
-     * need that hook only for certain classes used when precompiling scripts
-     * and functions ("brutal sharing").  But for general safety of built-in
-     * magic properties such as __proto__ and __parent__, we route all access
-     * checks, even for classes that stub out checkAccess, through the global
-     * checkObjectAccess hook.  This covers precompilation-based sharing and
-     * (possibly unintended) runtime sharing across trust boundaries.
-     */
-    clasp = LOCKED_OBJ_GET_CLASS(pobj);
-    check = clasp->checkAccess;
-    if (!check)
-        check = cx->runtime->checkObjectAccess;
-    if (check) {
-        JS_UNLOCK_OBJ(cx, pobj);
-        ok = check(cx, pobj, ID_TO_VALUE(id), mode, vp);
-        JS_LOCK_OBJ(cx, pobj);
-    } else {
-        ok = JS_TRUE;
-    }
-    OBJ_DROP_PROPERTY(cx, pobj, prop);
-    return ok;
-}
-
-#ifdef JS_THREADSAFE
-void
-js_DropProperty(JSContext *cx, JSObject *obj, JSProperty *prop)
-{
-    JS_UNLOCK_OBJ(cx, obj);
-}
-#endif
-
-static void
-ReportIsNotFunction(JSContext *cx, jsval *vp, uintN flags)
-{
-    /*
-     * The decompiler may need to access the args of the function in
-     * progress rather than the one we had hoped to call.
-     * So we switch the cx->fp to the frame below us. We stick the
-     * current frame in the dormantFrameChain to protect it from gc.
-     */
-
-    JSStackFrame *fp = cx->fp;
-    if (fp->down) {
-        JS_ASSERT(!fp->dormantNext);
-        fp->dormantNext = cx->dormantFrameChain;
-        cx->dormantFrameChain = fp;
-        cx->fp = fp->down;
-    }
-
-    js_ReportIsNotFunction(cx, vp, flags);
-
-    if (fp->down) {
-        JS_ASSERT(cx->dormantFrameChain == fp);
-        cx->dormantFrameChain = fp->dormantNext;
-        fp->dormantNext = NULL;
-        cx->fp = fp;
-    }
-}
-
-#ifdef NARCISSUS
-static JSBool
-GetCurrentExecutionContext(JSContext *cx, JSObject *obj, jsval *rval)
-{
-    JSObject *tmp;
-    jsval xcval;
-
-    while ((tmp = OBJ_GET_PARENT(cx, obj)) != NULL)
-        obj = tmp;
-    if (!OBJ_GET_PROPERTY(cx, obj,
-                          ATOM_TO_JSID(cx->runtime->atomState
-                                       .ExecutionContextAtom),
-                          &xcval)) {
-        return JS_FALSE;
-    }
-    if (JSVAL_IS_PRIMITIVE(xcval)) {
-        JS_ReportError(cx, "invalid ExecutionContext in global object");
-        return JS_FALSE;
-    }
-    if (!OBJ_GET_PROPERTY(cx, JSVAL_TO_OBJECT(xcval),
-                          ATOM_TO_JSID(cx->runtime->atomState.currentAtom),
-                          rval)) {
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-#endif
-
-JSBool
-js_Call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSClass *clasp;
-
-    clasp = OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(argv[-2]));
-    if (!clasp->call) {
-#ifdef NARCISSUS
-        JSObject *callee, *args;
-        jsval fval, nargv[3];
-        JSBool ok;
-
-        callee = JSVAL_TO_OBJECT(argv[-2]);
-        if (!OBJ_GET_PROPERTY(cx, callee,
-                              ATOM_TO_JSID(cx->runtime->atomState.callAtom),
-                              &fval)) {
-            return JS_FALSE;
-        }
-        if (JSVAL_IS_FUNCTION(cx, fval)) {
-            if (!GetCurrentExecutionContext(cx, obj, &nargv[2]))
-                return JS_FALSE;
-            args = js_GetArgsObject(cx, cx->fp);
-            if (!args)
-                return JS_FALSE;
-            nargv[0] = OBJECT_TO_JSVAL(obj);
-            nargv[1] = OBJECT_TO_JSVAL(args);
-            return js_InternalCall(cx, callee, fval, 3, nargv, rval);
-        }
-        if (JSVAL_IS_OBJECT(fval) && JSVAL_TO_OBJECT(fval) != callee) {
-            argv[-2] = fval;
-            ok = js_Call(cx, obj, argc, argv, rval);
-            argv[-2] = OBJECT_TO_JSVAL(callee);
-            return ok;
-        }
-#endif
-        ReportIsNotFunction(cx, &argv[-2], 0);
-        return JS_FALSE;
-    }
-    return clasp->call(cx, obj, argc, argv, rval);
-}
-
-JSBool
-js_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSClass *clasp;
-
-    clasp = OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(argv[-2]));
-    if (!clasp->construct) {
-#ifdef NARCISSUS
-        JSObject *callee, *args;
-        jsval cval, nargv[2];
-        JSBool ok;
-
-        callee = JSVAL_TO_OBJECT(argv[-2]);
-        if (!OBJ_GET_PROPERTY(cx, callee,
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .constructAtom),
-                              &cval)) {
-            return JS_FALSE;
-        }
-        if (JSVAL_IS_FUNCTION(cx, cval)) {
-            if (!GetCurrentExecutionContext(cx, obj, &nargv[1]))
-                return JS_FALSE;
-            args = js_GetArgsObject(cx, cx->fp);
-            if (!args)
-                return JS_FALSE;
-            nargv[0] = OBJECT_TO_JSVAL(args);
-            return js_InternalCall(cx, callee, cval, 2, nargv, rval);
-        }
-        if (JSVAL_IS_OBJECT(cval) && JSVAL_TO_OBJECT(cval) != callee) {
-            argv[-2] = cval;
-            ok = js_Call(cx, obj, argc, argv, rval);
-            argv[-2] = OBJECT_TO_JSVAL(callee);
-            return ok;
-        }
-#endif
-        ReportIsNotFunction(cx, &argv[-2], JSV2F_CONSTRUCT);
-        return JS_FALSE;
-    }
-    return clasp->construct(cx, obj, argc, argv, rval);
-}
-
-JSBool
-js_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    JSClass *clasp;
-    JSString *str;
-
-    clasp = OBJ_GET_CLASS(cx, obj);
-    if (clasp->hasInstance)
-        return clasp->hasInstance(cx, obj, v, bp);
-#ifdef NARCISSUS
-    {
-        jsval fval, rval;
-
-        if (!OBJ_GET_PROPERTY(cx, obj,
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .hasInstanceAtom),
-                              &fval)) {
-            return JS_FALSE;
-        }
-        if (JSVAL_IS_FUNCTION(cx, fval)) {
-            return js_InternalCall(cx, obj, fval, 1, &v, &rval) &&
-                   js_ValueToBoolean(cx, rval, bp);
-        }
-    }
-#endif
-    str = js_DecompileValueGenerator(cx, JSDVG_SEARCH_STACK,
-                                     OBJECT_TO_JSVAL(obj), NULL);
-    if (str) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_INSTANCEOF_RHS,
-                             JS_GetStringBytes(str));
-    }
-    return JS_FALSE;
-}
-
-JSBool
-js_IsDelegate(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    JSObject *obj2;
-
-    *bp = JS_FALSE;
-    if (JSVAL_IS_PRIMITIVE(v))
-        return JS_TRUE;
-    obj2 = JSVAL_TO_OBJECT(v);
-    while ((obj2 = OBJ_GET_PROTO(cx, obj2)) != NULL) {
-        if (obj2 == obj) {
-            *bp = JS_TRUE;
-            break;
-        }
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_GetClassPrototype(JSContext *cx, const char *name, JSObject **protop)
-{
-    return GetClassPrototype(cx, NULL, name, protop);
-}
-
-static JSBool
-GetClassPrototype(JSContext *cx, JSObject *scope, const char *name,
-                  JSObject **protop)
-{
-    jsval v;
-    JSObject *ctor;
-
-    if (!js_FindConstructor(cx, scope, name, &v))
-        return JS_FALSE;
-    if (JSVAL_IS_FUNCTION(cx, v)) {
-        ctor = JSVAL_TO_OBJECT(v);
-        if (!OBJ_GET_PROPERTY(cx, ctor,
-                              ATOM_TO_JSID(cx->runtime->atomState
-                                           .classPrototypeAtom),
-                              &v)) {
-            return JS_FALSE;
-        }
-        if (!JSVAL_IS_PRIMITIVE(v)) {
-            /*
-             * Set the newborn root in case v is otherwise unreferenced.
-             * It's ok to overwrite newborn roots here, since the getter
-             * called just above could have.  Unlike the common GC rooting
-             * model, our callers do not have to protect protop thanks to
-             * this newborn root, since they all immediately create a new
-             * instance that delegates to this object, or just query the
-             * prototype for its class.
-             */
-            cx->newborn[GCX_OBJECT] = JSVAL_TO_GCTHING(v);
-        }
-    }
-    *protop = JSVAL_IS_OBJECT(v) ? JSVAL_TO_OBJECT(v) : NULL;
-    return JS_TRUE;
-}
-
-/*
- * For shared precompilation of function objects, we support cloning on entry
- * to an execution context in which the function declaration or expression
- * should be processed as if it were not precompiled, where the precompiled
- * function's scope chain does not match the execution context's.  The cloned
- * function object carries its execution-context scope in its parent slot; it
- * links to the precompiled function (the "clone-parent") via its proto slot.
- *
- * Note that this prototype-based delegation leaves an unchecked access path
- * from the clone to the clone-parent's 'constructor' property.  If the clone
- * lives in a less privileged or shared scope than the clone-parent, this is
- * a security hole, a sharing hazard, or both.  Therefore we check all such
- * accesses with the following getter/setter pair, which we use when defining
- * 'constructor' in f.prototype for all function objects f.
- */
-static JSBool
-CheckCtorGetAccess(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSAtom *atom;
-    uintN attrs;
-
-    atom = cx->runtime->atomState.constructorAtom;
-    JS_ASSERT(id == ATOM_KEY(atom));
-    return OBJ_CHECK_ACCESS(cx, obj, ATOM_TO_JSID(atom), JSACC_READ,
-                            vp, &attrs);
-}
-
-static JSBool
-CheckCtorSetAccess(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSAtom *atom;
-    uintN attrs;
-
-    atom = cx->runtime->atomState.constructorAtom;
-    JS_ASSERT(id == ATOM_KEY(atom));
-    return OBJ_CHECK_ACCESS(cx, obj, ATOM_TO_JSID(atom), JSACC_WRITE,
-                            vp, &attrs);
-}
-
-JSBool
-js_SetClassPrototype(JSContext *cx, JSObject *ctor, JSObject *proto,
-                     uintN attrs)
-{
-    /*
-     * Use the given attributes for the prototype property of the constructor,
-     * as user-defined constructors have a DontDelete prototype (which may be
-     * reset), while native or "system" constructors have DontEnum | ReadOnly |
-     * DontDelete.
-     */
-    if (!OBJ_DEFINE_PROPERTY(cx, ctor,
-                             ATOM_TO_JSID(cx->runtime->atomState
-                                          .classPrototypeAtom),
-                             OBJECT_TO_JSVAL(proto),
-                             JS_PropertyStub, JS_PropertyStub,
-                             attrs, NULL)) {
-        return JS_FALSE;
-    }
-
-    /*
-     * ECMA says that Object.prototype.constructor, or f.prototype.constructor
-     * for a user-defined function f, is DontEnum.
-     */
-    return OBJ_DEFINE_PROPERTY(cx, proto,
-                               ATOM_TO_JSID(cx->runtime->atomState
-                                            .constructorAtom),
-                               OBJECT_TO_JSVAL(ctor),
-                               CheckCtorGetAccess, CheckCtorSetAccess,
-                               0, NULL);
-}
-
-JSBool
-js_ValueToObject(JSContext *cx, jsval v, JSObject **objp)
-{
-    JSObject *obj;
-
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)) {
-        obj = NULL;
-    } else if (JSVAL_IS_OBJECT(v)) {
-        obj = JSVAL_TO_OBJECT(v);
-        if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_OBJECT, &v))
-            return JS_FALSE;
-        if (JSVAL_IS_OBJECT(v))
-            obj = JSVAL_TO_OBJECT(v);
-    } else {
-        if (JSVAL_IS_STRING(v)) {
-            obj = js_StringToObject(cx, JSVAL_TO_STRING(v));
-        } else if (JSVAL_IS_INT(v)) {
-            obj = js_NumberToObject(cx, (jsdouble)JSVAL_TO_INT(v));
-        } else if (JSVAL_IS_DOUBLE(v)) {
-            obj = js_NumberToObject(cx, *JSVAL_TO_DOUBLE(v));
-        } else {
-            JS_ASSERT(JSVAL_IS_BOOLEAN(v));
-            obj = js_BooleanToObject(cx, JSVAL_TO_BOOLEAN(v));
-        }
-        if (!obj)
-            return JS_FALSE;
-    }
-    *objp = obj;
-    return JS_TRUE;
-}
-
-JSObject *
-js_ValueToNonNullObject(JSContext *cx, jsval v)
-{
-    JSObject *obj;
-    JSString *str;
-
-    if (!js_ValueToObject(cx, v, &obj))
-        return NULL;
-    if (!obj) {
-        str = js_DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NULL);
-        if (str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_NO_PROPERTIES, JS_GetStringBytes(str));
-        }
-    }
-    return obj;
-}
-
-JSBool
-js_TryValueOf(JSContext *cx, JSObject *obj, JSType type, jsval *rval)
-{
-#if JS_HAS_VALUEOF_HINT
-    jsval argv[1];
-
-    argv[0] = ATOM_KEY(cx->runtime->atomState.typeAtoms[type]);
-    return js_TryMethod(cx, obj, cx->runtime->atomState.valueOfAtom, 1, argv,
-                        rval);
-#else
-    return js_TryMethod(cx, obj, cx->runtime->atomState.valueOfAtom, 0, NULL,
-                        rval);
-#endif
-}
-
-JSBool
-js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
-             uintN argc, jsval *argv, jsval *rval)
-{
-    JSErrorReporter older;
-    jsval fval;
-    JSBool ok;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return JS_FALSE;
-    }
-
-    /*
-     * Report failure only if an appropriate method was found, and calling it
-     * returned failure.  We propagate failure in this case to make exceptions
-     * behave properly.
-     */
-    older = JS_SetErrorReporter(cx, NULL);
-    if (!OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &fval)) {
-        JS_ClearPendingException(cx);
-        ok = JS_TRUE;
-    } else if (!JSVAL_IS_PRIMITIVE(fval)) {
-        ok = js_InternalCall(cx, obj, fval, argc, argv, rval);
-    } else {
-        ok = JS_TRUE;
-    }
-    JS_SetErrorReporter(cx, older);
-    return ok;
-}
-
-#if JS_HAS_XDR
-
-#include "jsxdrapi.h"
-
-JSBool
-js_XDRObject(JSXDRState *xdr, JSObject **objp)
-{
-    JSContext *cx;
-    JSClass *clasp;
-    const char *className;
-    uint32 classId, classDef;
-    JSBool ok;
-    JSObject *proto;
-
-    cx = xdr->cx;
-    if (xdr->mode == JSXDR_ENCODE) {
-        clasp = OBJ_GET_CLASS(cx, *objp);
-        className = clasp->name;
-        classId = JS_XDRFindClassIdByName(xdr, className);
-        classDef = !classId;
-        if (classDef && !JS_XDRRegisterClass(xdr, clasp, &classId))
-            return JS_FALSE;
-    } else {
-        classDef = 0;
-        className = NULL;
-        clasp = NULL;           /* quell GCC overwarning */
-    }
-
-    /* XDR a flag word followed (if true) by the class name. */
-    if (!JS_XDRUint32(xdr, &classDef))
-        return JS_FALSE;
-    if (classDef && !JS_XDRCString(xdr, (char **) &className))
-        return JS_FALSE;
-
-    /* From here on, return through out: to free className if it was set. */
-    ok = JS_XDRUint32(xdr, &classId);
-    if (!ok)
-        goto out;
-
-    if (xdr->mode != JSXDR_ENCODE) {
-        if (classDef) {
-            ok = GetClassPrototype(cx, NULL, className, &proto);
-            if (!ok)
-                goto out;
-            clasp = OBJ_GET_CLASS(cx, proto);
-            ok = JS_XDRRegisterClass(xdr, clasp, &classId);
-            if (!ok)
-                goto out;
-        } else {
-            clasp = JS_XDRFindClassById(xdr, classId);
-            if (!clasp) {
-                char numBuf[12];
-                JS_snprintf(numBuf, sizeof numBuf, "%ld", (long)classId);
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_CANT_FIND_CLASS, numBuf);
-                ok = JS_FALSE;
-                goto out;
-            }
-        }
-    }
-
-    if (!clasp->xdrObject) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_CANT_XDR_CLASS, clasp->name);
-        ok = JS_FALSE;
-    } else {
-        ok = clasp->xdrObject(xdr, objp);
-    }
-out:
-    if (xdr->mode != JSXDR_ENCODE && className)
-        JS_free(cx, (void *)className);
-    return ok;
-}
-
-#endif /* JS_HAS_XDR */
-
-#ifdef DEBUG_brendan
-
-#include <stdio.h>
-#include <math.h>
-
-uint32 js_entry_count_max;
-uint32 js_entry_count_sum;
-double js_entry_count_sqsum;
-uint32 js_entry_count_hist[11];
-
-static void
-MeterEntryCount(uintN count)
-{
-    if (count) {
-        js_entry_count_sum += count;
-        js_entry_count_sqsum += (double)count * count;
-        if (count > js_entry_count_max)
-            js_entry_count_max = count;
-    }
-    js_entry_count_hist[JS_MIN(count, 10)]++;
-}
-
-void
-js_DumpScopeMeters(JSRuntime *rt)
-{
-    static FILE *logfp;
-    if (!logfp)
-        logfp = fopen("/tmp/scope.stats", "a");
-
-    {
-        double mean = 0., var = 0., sigma = 0.;
-        double nscopes = rt->liveScopes;
-        double nentrys = js_entry_count_sum;
-        if (nscopes > 0 && nentrys >= 0) {
-            mean = nentrys / nscopes;
-            var = nscopes * js_entry_count_sqsum - nentrys * nentrys;
-            if (var < 0.0 || nscopes <= 1)
-                var = 0.0;
-            else
-                var /= nscopes * (nscopes - 1);
-
-            /* Windows says sqrt(0.0) is "-1.#J" (?!) so we must test. */
-            sigma = (var != 0.) ? sqrt(var) : 0.;
-        }
-
-        fprintf(logfp,
-                "scopes %g entries %g mean %g sigma %g max %u",
-                nscopes, nentrys, mean, sigma, js_entry_count_max);
-    }
-
-    fprintf(logfp, " histogram %u %u %u %u %u %u %u %u %u %u %u\n",
-            js_entry_count_hist[0], js_entry_count_hist[1],
-            js_entry_count_hist[2], js_entry_count_hist[3],
-            js_entry_count_hist[4], js_entry_count_hist[5],
-            js_entry_count_hist[6], js_entry_count_hist[7],
-            js_entry_count_hist[8], js_entry_count_hist[9],
-            js_entry_count_hist[10]);
-    js_entry_count_sum = js_entry_count_max = 0;
-    js_entry_count_sqsum = 0;
-    memset(js_entry_count_hist, 0, sizeof js_entry_count_hist);
-    fflush(logfp);
-}
-
-#endif /* DEBUG_brendan */
-
-uint32
-js_Mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    JSClass *clasp;
-
-    JS_ASSERT(OBJ_IS_NATIVE(obj));
-    scope = OBJ_SCOPE(obj);
-#ifdef DEBUG_brendan
-    if (scope->object == obj)
-        MeterEntryCount(scope->entryCount);
-#endif
-
-    JS_ASSERT(!SCOPE_LAST_PROP(scope) ||
-              SCOPE_HAS_PROPERTY(scope, SCOPE_LAST_PROP(scope)));
-
-    for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-        if (SCOPE_HAD_MIDDLE_DELETE(scope) && !SCOPE_HAS_PROPERTY(scope, sprop))
-            continue;
-        MARK_SCOPE_PROPERTY(sprop);
-        if (JSID_IS_ATOM(sprop->id))
-            GC_MARK_ATOM(cx, JSID_TO_ATOM(sprop->id), arg);
-        else if (JSID_IS_OBJECT(sprop->id))
-            GC_MARK(cx, JSID_TO_OBJECT(sprop->id), "id", arg);
-
-#if JS_HAS_GETTER_SETTER
-        if (sprop->attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
-#ifdef GC_MARK_DEBUG
-            char buf[64];
-            JSAtom *atom = JSID_TO_ATOM(sprop->id);
-            const char *id = (atom && ATOM_IS_STRING(atom))
-                             ? JS_GetStringBytes(ATOM_TO_STRING(atom))
-                             : "unknown";
-#endif
-
-            if (sprop->attrs & JSPROP_GETTER) {
-#ifdef GC_MARK_DEBUG
-                JS_snprintf(buf, sizeof buf, "%s %s",
-                            id, js_getter_str);
-#endif
-                GC_MARK(cx,
-                        JSVAL_TO_GCTHING((jsval) sprop->getter),
-                        buf,
-                        arg);
-            }
-            if (sprop->attrs & JSPROP_SETTER) {
-#ifdef GC_MARK_DEBUG
-                JS_snprintf(buf, sizeof buf, "%s %s",
-                            id, js_setter_str);
-#endif
-                GC_MARK(cx,
-                        JSVAL_TO_GCTHING((jsval) sprop->setter),
-                        buf,
-                        arg);
-            }
-        }
-#endif /* JS_HAS_GETTER_SETTER */
-    }
-
-    /* No one runs while the GC is running, so we can use LOCKED_... here. */
-    clasp = LOCKED_OBJ_GET_CLASS(obj);
-    if (clasp->mark)
-        (void) clasp->mark(cx, obj, arg);
-
-    if (scope->object != obj) {
-        /*
-         * An unmutated object that shares a prototype's scope.  We can't tell
-         * how many slots are allocated and in use at obj->slots by looking at
-         * scope, so we get obj->slots' length from its -1'st element.
-         */
-        return (uint32) obj->slots[-1];
-    }
-    return JS_MIN(scope->map.freeslot, scope->map.nslots);
-}
-
-void
-js_Clear(JSContext *cx, JSObject *obj)
-{
-    JSScope *scope;
-    JSRuntime *rt;
-    JSScopeProperty *sprop;
-    uint32 i, n;
-
-    /*
-     * Clear our scope and the property cache of all obj's properties only if
-     * obj owns the scope (i.e., not if obj is unmutated and therefore sharing
-     * its prototype's scope).  NB: we do not clear any reserved slots lying
-     * below JSSLOT_FREE(clasp).
-     */
-    JS_LOCK_OBJ(cx, obj);
-    scope = OBJ_SCOPE(obj);
-    if (scope->object == obj) {
-        /* Clear the property cache before we clear the scope. */
-        rt = cx->runtime;
-        for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-            if (!SCOPE_HAD_MIDDLE_DELETE(scope) ||
-                SCOPE_HAS_PROPERTY(scope, sprop)) {
-                PROPERTY_CACHE_FILL(&rt->propertyCache, obj, sprop->id, NULL);
-            }
-        }
-
-        /* Now that we're done using scope->lastProp/table, clear scope. */
-        js_ClearScope(cx, scope);
-
-        /* Clear slot values and reset freeslot so we're consistent. */
-        i = scope->map.nslots;
-        n = JSSLOT_FREE(LOCKED_OBJ_GET_CLASS(obj));
-        while (--i >= n)
-            obj->slots[i] = JSVAL_VOID;
-        scope->map.freeslot = n;
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-}
-
-jsval
-js_GetRequiredSlot(JSContext *cx, JSObject *obj, uint32 slot)
-{
-    jsval v;
-
-    JS_LOCK_OBJ(cx, obj);
-    v = (slot < (uint32) obj->slots[-1]) ? obj->slots[slot] : JSVAL_VOID;
-    JS_UNLOCK_OBJ(cx, obj);
-    return v;
-}
-
-JSBool
-js_SetRequiredSlot(JSContext *cx, JSObject *obj, uint32 slot, jsval v)
-{
-    JSScope *scope;
-    uint32 nslots;
-    JSClass *clasp;
-    jsval *newslots;
-
-    JS_LOCK_OBJ(cx, obj);
-    scope = OBJ_SCOPE(obj);
-    nslots = (uint32) obj->slots[-1];
-    if (slot >= nslots) {
-        /*
-         * At this point, obj may or may not own scope.  If some path calls
-         * js_GetMutableScope but does not add a slot-owning property, then
-         * scope->object == obj but nslots will be nominal.  If obj shares a
-         * prototype's scope, then we cannot update scope->map here, but we
-         * must update obj->slots[-1] when we grow obj->slots.
-         *
-         * See js_Mark, before the last return, where we make a special case
-         * for unmutated (scope->object != obj) objects.
-         */
-        JS_ASSERT(nslots == JS_INITIAL_NSLOTS);
-        clasp = LOCKED_OBJ_GET_CLASS(obj);
-        nslots = JSSLOT_FREE(clasp);
-        if (clasp->reserveSlots)
-            nslots += clasp->reserveSlots(cx, obj);
-        JS_ASSERT(slot < nslots);
-
-        newslots = AllocSlots(cx, obj->slots, nslots);
-        if (!newslots) {
-            JS_UNLOCK_SCOPE(cx, scope);
-            return JS_FALSE;
-        }
-        if (scope->object == obj)
-            scope->map.nslots = nslots;
-        obj->slots = newslots;
-    }
-
-    /* Whether or not we grew nslots, we may need to advance freeslot. */
-    if (scope->object == obj && slot >= scope->map.freeslot)
-        scope->map.freeslot = slot + 1;
-
-    obj->slots[slot] = v;
-    JS_UNLOCK_SCOPE(cx, scope);
-    return JS_TRUE;
-}
-
-#ifdef DEBUG
-
-/* Routines to print out values during debugging. */
-
-#ifdef OSSP
-void printChar(jschar *cp);
-void printString(JSString *str);
-void printVal(JSContext *cx, jsval val);
-void printObj(JSContext *cx, JSObject *jsobj);
-void printId(JSContext *cx, jsid id);
-void printAtom(JSAtom *atom);
-#endif
-
-void printChar(jschar *cp) {
-    fprintf(stderr, "jschar* (0x%p) \"", (void *)cp);
-    while (*cp)
-        fputc(*cp++, stderr);
-    fputc('"', stderr);
-    fputc('\n', stderr);
-}
-
-void printString(JSString *str) {
-    size_t i, n;
-    jschar *s;
-    fprintf(stderr, "string (0x%p) \"", (void *)str);
-    s = JSSTRING_CHARS(str);
-    for (i=0, n=JSSTRING_LENGTH(str); i < n; i++)
-        fputc(s[i], stderr);
-    fputc('"', stderr);
-    fputc('\n', stderr);
-}
-
-#ifndef OSSP
-void printVal(JSContext *cx, jsval val);
-#endif
-
-void printObj(JSContext *cx, JSObject *jsobj) {
-    jsuint i;
-    jsval val;
-    JSClass *clasp;
-
-    fprintf(stderr, "object 0x%p\n", (void *)jsobj);
-    clasp = OBJ_GET_CLASS(cx, jsobj);
-    fprintf(stderr, "class 0x%p %s\n", (void *)clasp, clasp->name);
-    for (i=0; i < jsobj->map->nslots; i++) {
-        fprintf(stderr, "slot %3d ", i);
-        val = jsobj->slots[i];
-        if (JSVAL_IS_OBJECT(val))
-            fprintf(stderr, "object 0x%p\n", (void *)JSVAL_TO_OBJECT(val));
-        else
-            printVal(cx, val);
-    }
-}
-
-void printVal(JSContext *cx, jsval val) {
-    fprintf(stderr, "val %d (0x%p) = ", (int)val, (void *)val);
-    if (JSVAL_IS_NULL(val)) {
-        fprintf(stderr, "null\n");
-    } else if (JSVAL_IS_VOID(val)) {
-        fprintf(stderr, "undefined\n");
-    } else if (JSVAL_IS_OBJECT(val)) {
-        printObj(cx, JSVAL_TO_OBJECT(val));
-    } else if (JSVAL_IS_INT(val)) {
-        fprintf(stderr, "(int) %d\n", JSVAL_TO_INT(val));
-    } else if (JSVAL_IS_STRING(val)) {
-        printString(JSVAL_TO_STRING(val));
-    } else if (JSVAL_IS_DOUBLE(val)) {
-        fprintf(stderr, "(double) %g\n", *JSVAL_TO_DOUBLE(val));
-    } else {
-        JS_ASSERT(JSVAL_IS_BOOLEAN(val));
-        fprintf(stderr, "(boolean) %s\n",
-                JSVAL_TO_BOOLEAN(val) ? "true" : "false");
-    }
-    fflush(stderr);
-}
-
-void printId(JSContext *cx, jsid id) {
-    fprintf(stderr, "id %d (0x%p) is ", (int)id, (void *)id);
-    printVal(cx, ID_TO_VALUE(id));
-}
-
-void printAtom(JSAtom *atom) {
-    printString(ATOM_TO_STRING(atom));
-}
-
-#endif
diff --git a/libs/js/src/jsobj.h b/libs/js/src/jsobj.h
deleted file mode 100644
index 68dfe5cab9..0000000000
--- a/libs/js/src/jsobj.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsobj_h___
-#define jsobj_h___
-/*
- * JS object definitions.
- *
- * A JS object consists of a possibly-shared object descriptor containing
- * ordered property names, called the map; and a dense vector of property
- * values, called slots.  The map/slot pointer pair is GC'ed, while the map
- * is reference counted and the slot vector is malloc'ed.
- */
-#include "jshash.h" /* Added by JSIFY */
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-struct JSObjectMap {
-    jsrefcount  nrefs;          /* count of all referencing objects */
-    JSObjectOps *ops;           /* high level object operation vtable */
-    uint32      nslots;         /* length of obj->slots vector */
-    uint32      freeslot;       /* index of next free obj->slots element */
-};
-
-/* Shorthand macros for frequently-made calls. */
-#define OBJ_LOOKUP_PROPERTY(cx,obj,id,objp,propp)                             \
-    (obj)->map->ops->lookupProperty(cx,obj,id,objp,propp)
-#define OBJ_DEFINE_PROPERTY(cx,obj,id,value,getter,setter,attrs,propp)        \
-    (obj)->map->ops->defineProperty(cx,obj,id,value,getter,setter,attrs,propp)
-#define OBJ_GET_PROPERTY(cx,obj,id,vp)                                        \
-    (obj)->map->ops->getProperty(cx,obj,id,vp)
-#define OBJ_SET_PROPERTY(cx,obj,id,vp)                                        \
-    (obj)->map->ops->setProperty(cx,obj,id,vp)
-#define OBJ_GET_ATTRIBUTES(cx,obj,id,prop,attrsp)                             \
-    (obj)->map->ops->getAttributes(cx,obj,id,prop,attrsp)
-#define OBJ_SET_ATTRIBUTES(cx,obj,id,prop,attrsp)                             \
-    (obj)->map->ops->setAttributes(cx,obj,id,prop,attrsp)
-#define OBJ_DELETE_PROPERTY(cx,obj,id,rval)                                   \
-    (obj)->map->ops->deleteProperty(cx,obj,id,rval)
-#define OBJ_DEFAULT_VALUE(cx,obj,hint,vp)                                     \
-    (obj)->map->ops->defaultValue(cx,obj,hint,vp)
-#define OBJ_ENUMERATE(cx,obj,enum_op,statep,idp)                              \
-    (obj)->map->ops->enumerate(cx,obj,enum_op,statep,idp)
-#define OBJ_CHECK_ACCESS(cx,obj,id,mode,vp,attrsp)                            \
-    (obj)->map->ops->checkAccess(cx,obj,id,mode,vp,attrsp)
-
-/* These four are time-optimized to avoid stub calls. */
-#define OBJ_THIS_OBJECT(cx,obj)                                               \
-    ((obj)->map->ops->thisObject                                              \
-     ? (obj)->map->ops->thisObject(cx,obj)                                    \
-     : (obj))
-#define OBJ_DROP_PROPERTY(cx,obj,prop)                                        \
-    ((obj)->map->ops->dropProperty                                            \
-     ? (obj)->map->ops->dropProperty(cx,obj,prop)                             \
-     : (void)0)
-#define OBJ_GET_REQUIRED_SLOT(cx,obj,slot)                                    \
-    ((obj)->map->ops->getRequiredSlot                                         \
-     ? (obj)->map->ops->getRequiredSlot(cx, obj, slot)                        \
-     : JSVAL_VOID)
-#define OBJ_SET_REQUIRED_SLOT(cx,obj,slot,v)                                  \
-    ((obj)->map->ops->setRequiredSlot                                         \
-     ? (obj)->map->ops->setRequiredSlot(cx, obj, slot, v)                     \
-     : JS_TRUE)
-
-#define OBJ_TO_INNER_OBJECT(cx,obj)                                           \
-    JS_BEGIN_MACRO                                                            \
-        JSClass *clasp_ = OBJ_GET_CLASS(cx, obj);                             \
-        if (clasp_->flags & JSCLASS_IS_EXTENDED) {                            \
-            JSExtendedClass *xclasp_ = (JSExtendedClass*)clasp_;              \
-            if (xclasp_->innerObject)                                         \
-                obj = xclasp_->innerObject(cx, obj);                          \
-        }                                                                     \
-    JS_END_MACRO
-
-/*
- * In the original JS engine design, obj->slots pointed to a vector of length
- * JS_INITIAL_NSLOTS words if obj->map was shared with a prototype object,
- * else of length obj->map->nslots.  With the advent of JS_GetReservedSlot,
- * JS_SetReservedSlot, and JSCLASS_HAS_RESERVED_SLOTS (see jsapi.h), the size
- * of the minimum length slots vector in the case where map is shared cannot
- * be constant.  This length starts at JS_INITIAL_NSLOTS, but may advance to
- * include all the reserved slots.
- *
- * Therefore slots must be self-describing.  Rather than tag its low order bit
- * (a bit is all we need) to distinguish initial length from reserved length,
- * we do "the BSTR thing": over-allocate slots by one jsval, and store the
- * *net* length (counting usable slots, which have non-negative obj->slots[]
- * indices) in obj->slots[-1].  All code that sets obj->slots must be aware of
- * this hack -- you have been warned, and jsobj.c has been updated!
- */
-struct JSObject {
-    JSObjectMap *map;
-    jsval       *slots;
-};
-
-#define JSSLOT_PROTO        0
-#define JSSLOT_PARENT       1
-#define JSSLOT_CLASS        2
-#define JSSLOT_PRIVATE      3
-#define JSSLOT_START(clasp) (((clasp)->flags & JSCLASS_HAS_PRIVATE)           \
-                             ? JSSLOT_PRIVATE + 1                             \
-                             : JSSLOT_CLASS + 1)
-
-#define JSSLOT_FREE(clasp)  (JSSLOT_START(clasp)                              \
-                             + JSCLASS_RESERVED_SLOTS(clasp))
-
-#define JS_INITIAL_NSLOTS   5
-
-#ifdef DEBUG
-#define MAP_CHECK_SLOT(map,slot) \
-    JS_ASSERT((uint32)slot < JS_MIN((map)->freeslot, (map)->nslots))
-#define OBJ_CHECK_SLOT(obj,slot) \
-    MAP_CHECK_SLOT((obj)->map, slot)
-#else
-#define OBJ_CHECK_SLOT(obj,slot) ((void)0)
-#endif
-
-/* Fast macros for accessing obj->slots while obj is locked (if thread-safe). */
-#define LOCKED_OBJ_GET_SLOT(obj,slot) \
-    (OBJ_CHECK_SLOT(obj, slot), (obj)->slots[slot])
-#define LOCKED_OBJ_SET_SLOT(obj,slot,value) \
-    (OBJ_CHECK_SLOT(obj, slot), (obj)->slots[slot] = (value))
-#define LOCKED_OBJ_GET_PROTO(obj) \
-    JSVAL_TO_OBJECT(LOCKED_OBJ_GET_SLOT(obj, JSSLOT_PROTO))
-#define LOCKED_OBJ_GET_CLASS(obj) \
-    ((JSClass *)JSVAL_TO_PRIVATE(LOCKED_OBJ_GET_SLOT(obj, JSSLOT_CLASS)))
-
-#ifdef JS_THREADSAFE
-
-/* Thread-safe functions and wrapper macros for accessing obj->slots. */
-#define OBJ_GET_SLOT(cx,obj,slot)                                             \
-    (OBJ_CHECK_SLOT(obj, slot),                                               \
-     (OBJ_IS_NATIVE(obj) && OBJ_SCOPE(obj)->ownercx == cx)                    \
-     ? LOCKED_OBJ_GET_SLOT(obj, slot)                                         \
-     : js_GetSlotThreadSafe(cx, obj, slot))
-
-#define OBJ_SET_SLOT(cx,obj,slot,value)                                       \
-    (OBJ_CHECK_SLOT(obj, slot),                                               \
-     (OBJ_IS_NATIVE(obj) && OBJ_SCOPE(obj)->ownercx == cx)                    \
-     ? (void) LOCKED_OBJ_SET_SLOT(obj, slot, value)                           \
-     : js_SetSlotThreadSafe(cx, obj, slot, value))
-
-/*
- * If thread-safe, define an OBJ_GET_SLOT wrapper that bypasses, for a native
- * object, the lock-free "fast path" test of (OBJ_SCOPE(obj)->ownercx == cx),
- * to avoid needlessly switching from lock-free to lock-full scope when doing
- * GC on a different context from the last one to own the scope.  The caller
- * in this case is probably a JSClass.mark function, e.g., fun_mark, or maybe
- * a finalizer.
- *
- * The GC runs only when all threads except the one on which the GC is active
- * are suspended at GC-safe points, so there is no hazard in directly accessing
- * obj->slots[slot] from the GC's thread, once rt->gcRunning has been set.  See
- * jsgc.c for details.
- */
-#define THREAD_IS_RUNNING_GC(rt, thread)                                      \
-    ((rt)->gcRunning && (rt)->gcThread == (thread))
-
-#define CX_THREAD_IS_RUNNING_GC(cx)                                           \
-    THREAD_IS_RUNNING_GC((cx)->runtime, (cx)->thread)
-
-#define GC_AWARE_GET_SLOT(cx, obj, slot)                                      \
-    ((OBJ_IS_NATIVE(obj) && CX_THREAD_IS_RUNNING_GC(cx))                      \
-     ? (obj)->slots[slot]                                                     \
-     : OBJ_GET_SLOT(cx, obj, slot))
-
-#else   /* !JS_THREADSAFE */
-
-#define OBJ_GET_SLOT(cx,obj,slot)       LOCKED_OBJ_GET_SLOT(obj,slot)
-#define OBJ_SET_SLOT(cx,obj,slot,value) LOCKED_OBJ_SET_SLOT(obj,slot,value)
-#define GC_AWARE_GET_SLOT(cx,obj,slot)  LOCKED_OBJ_GET_SLOT(obj,slot)
-
-#endif /* !JS_THREADSAFE */
-
-/* Thread-safe proto, parent, and class access macros. */
-#define OBJ_GET_PROTO(cx,obj) \
-    JSVAL_TO_OBJECT(OBJ_GET_SLOT(cx, obj, JSSLOT_PROTO))
-#define OBJ_SET_PROTO(cx,obj,proto) \
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PROTO, OBJECT_TO_JSVAL(proto))
-
-#define OBJ_GET_PARENT(cx,obj) \
-    JSVAL_TO_OBJECT(OBJ_GET_SLOT(cx, obj, JSSLOT_PARENT))
-#define OBJ_SET_PARENT(cx,obj,parent) \
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PARENT, OBJECT_TO_JSVAL(parent))
-
-#define OBJ_GET_CLASS(cx,obj) \
-    ((JSClass *)JSVAL_TO_PRIVATE(OBJ_GET_SLOT(cx, obj, JSSLOT_CLASS)))
-
-/* Test whether a map or object is native. */
-#define MAP_IS_NATIVE(map)                                                    \
-    ((map)->ops == &js_ObjectOps ||                                           \
-     ((map)->ops && (map)->ops->newObjectMap == js_ObjectOps.newObjectMap))
-
-#define OBJ_IS_NATIVE(obj)  MAP_IS_NATIVE((obj)->map)
-
-extern JS_FRIEND_DATA(JSObjectOps) js_ObjectOps;
-extern JS_FRIEND_DATA(JSObjectOps) js_WithObjectOps;
-extern JSClass  js_ObjectClass;
-extern JSClass  js_WithClass;
-
-struct JSSharpObjectMap {
-    jsrefcount  depth;
-    jsatomid    sharpgen;
-    JSHashTable *table;
-};
-
-#define SHARP_BIT       ((jsatomid) 1)
-#define BUSY_BIT        ((jsatomid) 2)
-#define SHARP_ID_SHIFT  2
-#define IS_SHARP(he)    (JS_PTR_TO_UINT32((he)->value) & SHARP_BIT)
-#define MAKE_SHARP(he)  ((he)->value = JS_UINT32_TO_PTR(JS_PTR_TO_UINT32((he)->value)|SHARP_BIT))
-#define IS_BUSY(he)     (JS_PTR_TO_UINT32((he)->value) & BUSY_BIT)
-#define MAKE_BUSY(he)   ((he)->value = JS_UINT32_TO_PTR(JS_PTR_TO_UINT32((he)->value)|BUSY_BIT))
-#define CLEAR_BUSY(he)  ((he)->value = JS_UINT32_TO_PTR(JS_PTR_TO_UINT32((he)->value)&~BUSY_BIT))
-
-extern JSHashEntry *
-js_EnterSharpObject(JSContext *cx, JSObject *obj, JSIdArray **idap,
-                    jschar **sp);
-
-extern void
-js_LeaveSharpObject(JSContext *cx, JSIdArray **idap);
-
-extern JSBool
-js_obj_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval);
-
-extern JSBool
-js_obj_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval);
-
-extern JSBool
-js_HasOwnPropertyHelper(JSContext *cx, JSObject *obj, JSLookupPropOp lookup,
-                        uintN argc, jsval *argv, jsval *rval);
-
-extern JSObject *
-js_InitObjectClass(JSContext *cx, JSObject *obj);
-
-/* Select Object.prototype method names shared between jsapi.c and jsobj.c. */
-extern const char js_watch_str[];
-extern const char js_unwatch_str[];
-extern const char js_hasOwnProperty_str[];
-extern const char js_isPrototypeOf_str[];
-extern const char js_propertyIsEnumerable_str[];
-extern const char js_defineGetter_str[];
-extern const char js_defineSetter_str[];
-extern const char js_lookupGetter_str[];
-extern const char js_lookupSetter_str[];
-
-extern void
-js_InitObjectMap(JSObjectMap *map, jsrefcount nrefs, JSObjectOps *ops,
-                 JSClass *clasp);
-
-extern JSObjectMap *
-js_NewObjectMap(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops,
-                JSClass *clasp, JSObject *obj);
-
-extern void
-js_DestroyObjectMap(JSContext *cx, JSObjectMap *map);
-
-extern JSObjectMap *
-js_HoldObjectMap(JSContext *cx, JSObjectMap *map);
-
-extern JSObjectMap *
-js_DropObjectMap(JSContext *cx, JSObjectMap *map, JSObject *obj);
-
-extern JSObject *
-js_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
-
-extern JSBool
-js_FindConstructor(JSContext *cx, JSObject *start, const char *name, jsval *vp);
-
-extern JSObject *
-js_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
-                   JSObject *parent, uintN argc, jsval *argv);
-
-extern void
-js_FinalizeObject(JSContext *cx, JSObject *obj);
-
-extern JSBool
-js_AllocSlot(JSContext *cx, JSObject *obj, uint32 *slotp);
-
-extern void
-js_FreeSlot(JSContext *cx, JSObject *obj, uint32 slot);
-
-/*
- * Native property add and lookup variants that hide id in the hidden atom
- * subspace, so as to avoid collisions between internal properties such as
- * formal arguments and local variables in function objects, and externally
- * set properties with the same ids.
- */
-extern JSScopeProperty *
-js_AddHiddenProperty(JSContext *cx, JSObject *obj, jsid id,
-                     JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                     uintN attrs, uintN flags, intN shortid);
-
-extern JSBool
-js_LookupHiddenProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                        JSProperty **propp);
-
-/*
- * Find or create a property named by id in obj's scope, with the given getter
- * and setter, slot, attributes, and other members.
- */
-extern JSScopeProperty *
-js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,
-                     JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                     uintN attrs, uintN flags, intN shortid);
-
-/*
- * Change sprop to have the given attrs, getter, and setter in scope, morphing
- * it into a potentially new JSScopeProperty.  Return a pointer to the changed
- * or identical property.
- */
-extern JSScopeProperty *
-js_ChangeNativePropertyAttrs(JSContext *cx, JSObject *obj,
-                             JSScopeProperty *sprop, uintN attrs, uintN mask,
-                             JSPropertyOp getter, JSPropertyOp setter);
-
-/*
- * On error, return false.  On success, if propp is non-null, return true with
- * obj locked and with a held property in *propp; if propp is null, return true
- * but release obj's lock first.  Therefore all callers who pass non-null propp
- * result parameters must later call OBJ_DROP_PROPERTY(cx, obj, *propp) both to
- * drop the held property, and to release the lock on obj.
- */
-extern JSBool
-js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
-                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                  JSProperty **propp);
-
-extern JSBool
-js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
-                        JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                        uintN flags, intN shortid, JSProperty **propp);
-
-/*
- * Unlike js_DefineProperty, propp must be non-null.  On success, and if id was
- * found, return true with *objp non-null and locked, and with a held property
- * stored in *propp.  If successful but id was not found, return true with both
- * *objp and *propp null.  Therefore all callers who receive a non-null *propp
- * must later call OBJ_DROP_PROPERTY(cx, *objp, *propp).
- */
-extern JS_FRIEND_API(JSBool)
-js_LookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                  JSProperty **propp);
-
-/*
- * Specialized subroutine that allows caller to preset JSRESOLVE_* flags.
- */
-extern JSBool
-js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags,
-                           JSObject **objp, JSProperty **propp);
-
-extern JS_FRIEND_API(JSBool)
-js_FindProperty(JSContext *cx, jsid id, JSObject **objp, JSObject **pobjp,
-                JSProperty **propp);
-
-extern JSObject *
-js_FindIdentifierBase(JSContext *cx, jsid id);
-
-extern JSObject *
-js_FindVariableScope(JSContext *cx, JSFunction **funp);
-
-extern JSBool
-js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
-
-extern JSBool
-js_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
-
-extern JSBool
-js_GetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                 uintN *attrsp);
-
-extern JSBool
-js_SetAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                 uintN *attrsp);
-
-extern JSBool
-js_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval);
-
-extern JSBool
-js_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp);
-
-extern JSIdArray *
-js_NewIdArray(JSContext *cx, jsint length);
-
-/*
- * Unlike realloc(3), this function frees ida on failure.
- */
-extern JSIdArray *
-js_SetIdArrayLength(JSContext *cx, JSIdArray *ida, jsint length);
-
-extern JSBool
-js_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
-             jsval *statep, jsid *idp);
-
-extern JSBool
-js_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-               jsval *vp, uintN *attrsp);
-
-extern JSBool
-js_Call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool
-js_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval);
-
-extern JSBool
-js_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
-
-extern JSBool
-js_SetProtoOrParent(JSContext *cx, JSObject *obj, uint32 slot, JSObject *pobj);
-
-extern JSBool
-js_IsDelegate(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
-
-extern JSBool
-js_GetClassPrototype(JSContext *cx, const char *name, JSObject **protop);
-
-extern JSBool
-js_SetClassPrototype(JSContext *cx, JSObject *ctor, JSObject *proto,
-                     uintN attrs);
-
-extern JSBool
-js_ValueToObject(JSContext *cx, jsval v, JSObject **objp);
-
-extern JSObject *
-js_ValueToNonNullObject(JSContext *cx, jsval v);
-
-extern JSBool
-js_TryValueOf(JSContext *cx, JSObject *obj, JSType type, jsval *rval);
-
-extern JSBool
-js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
-             uintN argc, jsval *argv, jsval *rval);
-
-extern JSBool
-js_XDRObject(JSXDRState *xdr, JSObject **objp);
-
-extern uint32
-js_Mark(JSContext *cx, JSObject *obj, void *arg);
-
-extern void
-js_Clear(JSContext *cx, JSObject *obj);
-
-extern jsval
-js_GetRequiredSlot(JSContext *cx, JSObject *obj, uint32 slot);
-
-extern JSBool
-js_SetRequiredSlot(JSContext *cx, JSObject *obj, uint32 slot, jsval v);
-
-extern JSObject *
-js_CheckScopeChainValidity(JSContext *cx, JSObject *scopeobj, const char *caller);
-
-extern JSBool
-js_CheckPrincipalsAccess(JSContext *cx, JSObject *scopeobj,
-                         JSPrincipals *principals, const char *caller);
-JS_END_EXTERN_C
-
-#endif /* jsobj_h___ */
diff --git a/libs/js/src/jsopcode.c b/libs/js/src/jsopcode.c
deleted file mode 100644
index 1336f50663..0000000000
--- a/libs/js/src/jsopcode.c
+++ /dev/null
@@ -1,3142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS bytecode descriptors, disassemblers, and decompilers.
- */
-#include "jsstddef.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsdtoa.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jslock.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsregexp.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-const char js_const_str[]       = "const";
-const char js_var_str[]         = "var";
-const char js_function_str[]    = "function";
-const char js_in_str[]          = "in";
-const char js_instanceof_str[]  = "instanceof";
-const char js_new_str[]         = "new";
-const char js_delete_str[]      = "delete";
-const char js_typeof_str[]      = "typeof";
-const char js_void_str[]        = "void";
-const char js_null_str[]        = "null";
-const char js_this_str[]        = "this";
-const char js_false_str[]       = "false";
-const char js_true_str[]        = "true";
-const char js_default_str[]     = "default";
-
-const char *js_incop_str[]      = {"++", "--"};
-
-/* Pollute the namespace locally for MSVC Win16, but not for WatCom.  */
-#ifdef __WINDOWS_386__
-    #ifdef FAR
-        #undef FAR
-    #endif
-#else  /* !__WINDOWS_386__ */
-#ifndef FAR
-#define FAR
-#endif
-#endif /* !__WINDOWS_386__ */
-
-const JSCodeSpec FAR js_CodeSpec[] = {
-#define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
-    {name,token,length,nuses,ndefs,prec,format},
-#include "jsopcode.tbl"
-#undef OPDEF
-};
-
-uintN js_NumCodeSpecs = sizeof (js_CodeSpec) / sizeof js_CodeSpec[0];
-
-/************************************************************************/
-
-static ptrdiff_t
-GetJumpOffset(jsbytecode *pc, jsbytecode *pc2)
-{
-    uint32 type;
-
-    type = (js_CodeSpec[*pc].format & JOF_TYPEMASK);
-    if (JOF_TYPE_IS_EXTENDED_JUMP(type))
-        return GET_JUMPX_OFFSET(pc2);
-    return GET_JUMP_OFFSET(pc2);
-}
-
-#ifdef DEBUG
-
-JS_FRIEND_API(JSBool)
-js_Disassemble(JSContext *cx, JSScript *script, JSBool lines, FILE *fp)
-{
-    jsbytecode *pc, *end;
-    uintN len;
-
-    pc = script->code;
-    end = pc + script->length;
-    while (pc < end) {
-        if (pc == script->main)
-            fputs("main:\n", fp);
-        len = js_Disassemble1(cx, script, pc,
-                              PTRDIFF(pc, script->code, jsbytecode),
-                              lines, fp);
-        if (!len)
-            return JS_FALSE;
-        pc += len;
-    }
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(uintN)
-js_Disassemble1(JSContext *cx, JSScript *script, jsbytecode *pc, uintN loc,
-                JSBool lines, FILE *fp)
-{
-    JSOp op;
-    const JSCodeSpec *cs;
-    ptrdiff_t len, off, jmplen;
-    uint32 type;
-    JSAtom *atom;
-    JSString *str;
-
-    op = (JSOp)*pc;
-    if (op >= JSOP_LIMIT) {
-        char numBuf1[12], numBuf2[12];
-        JS_snprintf(numBuf1, sizeof numBuf1, "%d", op);
-        JS_snprintf(numBuf2, sizeof numBuf2, "%d", JSOP_LIMIT);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BYTECODE_TOO_BIG, numBuf1, numBuf2);
-        return 0;
-    }
-    cs = &js_CodeSpec[op];
-    len = (ptrdiff_t) cs->length;
-    fprintf(fp, "%05u:", loc);
-    if (lines)
-        fprintf(fp, "%4u", JS_PCToLineNumber(cx, script, pc));
-    fprintf(fp, "  %s", cs->name);
-    type = cs->format & JOF_TYPEMASK;
-    switch (type) {
-      case JOF_BYTE:
-        if (op == JSOP_TRAP) {
-            op = JS_GetTrapOpcode(cx, script, pc);
-            if (op == JSOP_LIMIT)
-                return 0;
-            len = (ptrdiff_t) js_CodeSpec[op].length;
-        }
-        break;
-
-      case JOF_JUMP:
-      case JOF_JUMPX:
-        off = GetJumpOffset(pc, pc);
-        fprintf(fp, " %u (%d)", loc + off, off);
-        break;
-
-      case JOF_CONST:
-        atom = GET_ATOM(cx, script, pc);
-        str = js_ValueToSource(cx, ATOM_KEY(atom));
-        if (!str)
-            return 0;
-        fprintf(fp, " %s", JS_GetStringBytes(str));
-        break;
-
-      case JOF_UINT16:
-        fprintf(fp, " %u", GET_ARGC(pc));
-        break;
-
-#if JS_HAS_SWITCH_STATEMENT
-      case JOF_TABLESWITCH:
-      case JOF_TABLESWITCHX:
-      {
-        jsbytecode *pc2;
-        jsint i, low, high;
-
-        jmplen = (type == JOF_TABLESWITCH) ? JUMP_OFFSET_LEN
-                                           : JUMPX_OFFSET_LEN;
-        pc2 = pc;
-        off = GetJumpOffset(pc, pc2);
-        pc2 += jmplen;
-        low = GET_JUMP_OFFSET(pc2);
-        pc2 += JUMP_OFFSET_LEN;
-        high = GET_JUMP_OFFSET(pc2);
-        pc2 += JUMP_OFFSET_LEN;
-        fprintf(fp, " defaultOffset %d low %d high %d", off, low, high);
-        for (i = low; i <= high; i++) {
-            off = GetJumpOffset(pc, pc2);
-            fprintf(fp, "\n\t%d: %d", i, off);
-            pc2 += jmplen;
-        }
-        len = 1 + pc2 - pc;
-        break;
-      }
-
-      case JOF_LOOKUPSWITCH:
-      case JOF_LOOKUPSWITCHX:
-      {
-        jsbytecode *pc2;
-        jsatomid npairs;
-
-        jmplen = (type == JOF_LOOKUPSWITCH) ? JUMP_OFFSET_LEN
-                                            : JUMPX_OFFSET_LEN;
-        pc2 = pc;
-        off = GetJumpOffset(pc, pc2);
-        pc2 += jmplen;
-        npairs = GET_ATOM_INDEX(pc2);
-        pc2 += ATOM_INDEX_LEN;
-        fprintf(fp, " offset %d npairs %u", off, (uintN) npairs);
-        while (npairs) {
-            atom = GET_ATOM(cx, script, pc2);
-            pc2 += ATOM_INDEX_LEN;
-            off = GetJumpOffset(pc, pc2);
-            pc2 += jmplen;
-
-            str = js_ValueToSource(cx, ATOM_KEY(atom));
-            if (!str)
-                return 0;
-            fprintf(fp, "\n\t%s: %d", JS_GetStringBytes(str), off);
-            npairs--;
-        }
-        len = 1 + pc2 - pc;
-        break;
-      }
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-      case JOF_QARG:
-        fprintf(fp, " %u", GET_ARGNO(pc));
-        break;
-
-      case JOF_QVAR:
-        fprintf(fp, " %u", GET_VARNO(pc));
-        break;
-
-#if JS_HAS_LEXICAL_CLOSURE
-      case JOF_INDEXCONST:
-        fprintf(fp, " %u", GET_VARNO(pc));
-        pc += VARNO_LEN;
-        atom = GET_ATOM(cx, script, pc);
-        str = js_ValueToSource(cx, ATOM_KEY(atom));
-        if (!str)
-            return 0;
-        fprintf(fp, " %s", JS_GetStringBytes(str));
-        break;
-#endif
-
-      case JOF_UINT24:
-        if (op == JSOP_FINDNAME) {
-            /* Special case to avoid a JOF_FINDNAME just for this op. */
-            atom = js_GetAtom(cx, &script->atomMap, GET_LITERAL_INDEX(pc));
-            str = js_ValueToSource(cx, ATOM_KEY(atom));
-            if (!str)
-                return 0;
-            fprintf(fp, " %s", JS_GetStringBytes(str));
-            break;
-        }
-
-        JS_ASSERT(op == JSOP_UINT24 || op == JSOP_LITERAL);
-        fprintf(fp, " %u", GET_LITERAL_INDEX(pc));
-        break;
-
-      case JOF_LITOPX:
-        atom = js_GetAtom(cx, &script->atomMap, GET_LITERAL_INDEX(pc));
-        str = js_ValueToSource(cx, ATOM_KEY(atom));
-        if (!str)
-            return 0;
-
-        /*
-         * Bytecode: JSOP_LITOPX <uint24> op [<varno> if JSOP_DEFLOCALFUN].
-         * Advance pc to point at op.
-         */
-        pc += 1 + LITERAL_INDEX_LEN;
-        op = *pc;
-        cs = &js_CodeSpec[op];
-        fprintf(fp, " %s op %s", JS_GetStringBytes(str), cs->name);
-#if JS_HAS_LEXICAL_CLOSURE
-        if ((cs->format & JOF_TYPEMASK) == JOF_INDEXCONST)
-            fprintf(fp, " %u", GET_VARNO(pc));
-#endif
-
-        /*
-         * Set len to advance pc to skip op and any other immediates (namely,
-         * <varno> if JSOP_DEFLOCALFUN).
-         */
-        JS_ASSERT(cs->length > ATOM_INDEX_LEN);
-        len = cs->length - ATOM_INDEX_LEN;
-        break;
-
-      default: {
-        char numBuf[12];
-        JS_snprintf(numBuf, sizeof numBuf, "%lx", (unsigned long) cs->format);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_UNKNOWN_FORMAT, numBuf);
-        return 0;
-      }
-    }
-    fputs("\n", fp);
-    return len;
-}
-
-#endif /* DEBUG */
-
-/************************************************************************/
-
-/*
- * Sprintf, but with unlimited and automatically allocated buffering.
- */
-typedef struct Sprinter {
-    JSContext       *context;       /* context executing the decompiler */
-    JSArenaPool     *pool;          /* string allocation pool */
-    char            *base;          /* base address of buffer in pool */
-    size_t          size;           /* size of buffer allocated at base */
-    ptrdiff_t       offset;         /* offset of next free char in buffer */
-} Sprinter;
-
-#define INIT_SPRINTER(cx, sp, ap, off) \
-    ((sp)->context = cx, (sp)->pool = ap, (sp)->base = NULL, (sp)->size = 0,  \
-     (sp)->offset = off)
-
-#define OFF2STR(sp,off) ((sp)->base + (off))
-#define STR2OFF(sp,str) ((str) - (sp)->base)
-#define RETRACT(sp,str) ((sp)->offset = STR2OFF(sp, str))
-
-static JSBool
-SprintAlloc(Sprinter *sp, size_t nb)
-{
-    if (!sp->base) {
-        JS_ARENA_ALLOCATE_CAST(sp->base, char *, sp->pool, nb);
-    } else {
-        JS_ARENA_GROW_CAST(sp->base, char *, sp->pool, sp->size, nb);
-    }
-    if (!sp->base) {
-        JS_ReportOutOfMemory(sp->context);
-        return JS_FALSE;
-    }
-    sp->size += nb;
-    return JS_TRUE;
-}
-
-static ptrdiff_t
-SprintPut(Sprinter *sp, const char *s, size_t len)
-{
-    ptrdiff_t nb, offset;
-    char *bp;
-
-    /* Allocate space for s, including the '\0' at the end. */
-    nb = (sp->offset + len + 1) - sp->size;
-    if (nb > 0 && !SprintAlloc(sp, nb))
-        return -1;
-
-    /* Advance offset and copy s into sp's buffer. */
-    offset = sp->offset;
-    sp->offset += len;
-    bp = sp->base + offset;
-    memmove(bp, s, len);
-    bp[len] = 0;
-    return offset;
-}
-
-static ptrdiff_t
-Sprint(Sprinter *sp, const char *format, ...)
-{
-    va_list ap;
-    char *bp;
-    ptrdiff_t offset;
-
-    va_start(ap, format);
-    bp = JS_vsmprintf(format, ap);      /* XXX vsaprintf */
-    va_end(ap);
-    if (!bp) {
-        JS_ReportOutOfMemory(sp->context);
-        return -1;
-    }
-    offset = SprintPut(sp, bp, strlen(bp));
-    free(bp);
-    return offset;
-}
-
-const jschar js_EscapeMap[] = {
-    '\b', 'b',
-    '\f', 'f',
-    '\n', 'n',
-    '\r', 'r',
-    '\t', 't',
-    '\v', 'v',
-    '"',  '"',
-    '\'', '\'',
-    '\\', '\\',
-    0
-};
-
-static char *
-QuoteString(Sprinter *sp, JSString *str, jschar quote)
-{
-    ptrdiff_t off, len, nb;
-    const jschar *s, *t, *u, *z;
-    char *bp;
-    jschar c;
-    JSBool ok;
-
-    /* Sample off first for later return value pointer computation. */
-    off = sp->offset;
-    if (quote && Sprint(sp, "%c", (char)quote) < 0)
-        return NULL;
-
-    /* Loop control variables: z points at end of string sentinel. */
-    s = JSSTRING_CHARS(str);
-    z = s + JSSTRING_LENGTH(str);
-    for (t = s; t < z; s = ++t) {
-        /* Move t forward from s past un-quote-worthy characters. */
-        c = *t;
-        while (JS_ISPRINT(c) && c != quote && c != '\\' && !(c >> 8)) {
-            c = *++t;
-            if (t == z)
-                break;
-        }
-        len = PTRDIFF(t, s, jschar);
-
-        /* Allocate space for s, including the '\0' at the end. */
-        nb = (sp->offset + len + 1) - sp->size;
-        if (nb > 0 && !SprintAlloc(sp, nb))
-            return NULL;
-
-        /* Advance sp->offset and copy s into sp's buffer. */
-        bp = sp->base + sp->offset;
-        sp->offset += len;
-        while (--len >= 0)
-            *bp++ = (char) *s++;
-        *bp = '\0';
-
-        if (t == z)
-            break;
-
-        /* Use js_EscapeMap, \u, or \x only if necessary. */
-        if ((u = js_strchr(js_EscapeMap, c)) != NULL) {
-            ok = Sprint(sp, "\\%c", (char)u[1]) >= 0;
-        } else {
-#ifdef JS_C_STRINGS_ARE_UTF8
-            /* If this is a surrogate pair, make sure to print the pair. */
-            if (c >= 0xD800 && c <= 0xDBFF) {
-                jschar buffer[3];
-                buffer[0] = c;
-                buffer[1] = *++t;
-                buffer[2] = 0;
-                if (t == z) {
-                    ok = JS_FALSE;
-                    break;
-                }
-                ok = Sprint(sp, "%hs", buffer) >= 0;
-            } else {
-                /* Print as UTF-8 string. */
-                ok = Sprint(sp, "%hc", c) >= 0;
-            }
-#else
-            /* Use \uXXXX or \xXX  if the string cannot be displayed as UTF-8. */
-            ok = Sprint(sp, (c >> 8) ? "\\u%04X" : "\\x%02X", c) >= 0;
-#endif
-        }
-        if (!ok)
-            return NULL;
-    }
-
-    /* Sprint the closing quote and return the quoted string. */
-    if (quote && Sprint(sp, "%c", (char)quote) < 0)
-        return NULL;
-
-    /* 
-     * If we haven't Sprint'd anything yet, Sprint an empty string so that
-     * the OFF2STR below gives a valid result.
-     */
-    if (off == sp->offset && Sprint(sp, "") < 0)
-        return NULL;
-    return OFF2STR(sp, off);
-}
-
-JSString *
-js_QuoteString(JSContext *cx, JSString *str, jschar quote)
-{
-    void *mark;
-    Sprinter sprinter;
-    char *bytes;
-    JSString *escstr;
-
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    INIT_SPRINTER(cx, &sprinter, &cx->tempPool, 0);
-    bytes = QuoteString(&sprinter, str, quote);
-    escstr = bytes ? JS_NewStringCopyZ(cx, bytes) : NULL;
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    return escstr;
-}
-
-/************************************************************************/
-
-struct JSPrinter {
-    Sprinter        sprinter;       /* base class state */
-    JSArenaPool     pool;           /* string allocation pool */
-    uintN           indent;         /* indentation in spaces */
-    JSPackedBool    pretty;         /* pretty-print: indent, use newlines */
-    JSPackedBool    grouped;        /* in parenthesized expression context */
-    JSScript        *script;        /* script being printed */
-    JSScope         *scope;         /* script function scope */
-};
-
-/*
- * Hack another flag, a la JS_DONT_PRETTY_PRINT, into uintN indent parameters
- * to functions such as js_DecompileFunction and js_NewPrinter.  This time, as
- * opposed to JS_DONT_PRETTY_PRINT back in the dark ages, we can assume that a
- * uintN is at least 32 bits.
- */
-#define JS_IN_GROUP_CONTEXT 0x10000
-
-JSPrinter *
-js_NewPrinter(JSContext *cx, const char *name, uintN indent, JSBool pretty)
-{
-    JSPrinter *jp;
-
-    jp = (JSPrinter *) JS_malloc(cx, sizeof(JSPrinter));
-    if (!jp)
-        return NULL;
-    INIT_SPRINTER(cx, &jp->sprinter, &jp->pool, 0);
-    JS_InitArenaPool(&jp->pool, name, 256, 1);
-    jp->indent = indent & ~JS_IN_GROUP_CONTEXT;
-    jp->pretty = pretty;
-    jp->grouped = (indent & JS_IN_GROUP_CONTEXT) != 0;
-    jp->script = NULL;
-    jp->scope = NULL;
-    return jp;
-}
-
-void
-js_DestroyPrinter(JSPrinter *jp)
-{
-    JS_FinishArenaPool(&jp->pool);
-    JS_free(jp->sprinter.context, jp);
-}
-
-JSString *
-js_GetPrinterOutput(JSPrinter *jp)
-{
-    JSContext *cx;
-    JSString *str;
-
-    cx = jp->sprinter.context;
-    if (!jp->sprinter.base)
-        return cx->runtime->emptyString;
-    str = JS_NewStringCopyZ(cx, jp->sprinter.base);
-    if (!str)
-        return NULL;
-    JS_FreeArenaPool(&jp->pool);
-    INIT_SPRINTER(cx, &jp->sprinter, &jp->pool, 0);
-    return str;
-}
-
-int
-js_printf(JSPrinter *jp, const char *format, ...)
-{
-    va_list ap;
-    char *bp, *fp;
-    int cc;
-
-    if (*format == '\0')
-        return 0;
-
-    va_start(ap, format);
-
-    /* If pretty-printing, expand magic tab into a run of jp->indent spaces. */
-    if (*format == '\t') {
-        if (jp->pretty && Sprint(&jp->sprinter, "%*s", jp->indent, "") < 0)
-            return -1;
-        format++;
-    }
-
-    /* Suppress newlines (must be once per format, at the end) if not pretty. */
-    fp = NULL;
-    if (!jp->pretty && format[cc = strlen(format) - 1] == '\n') {
-        fp = JS_strdup(jp->sprinter.context, format);
-        if (!fp)
-            return -1;
-        fp[cc] = '\0';
-        format = fp;
-    }
-
-    /* Allocate temp space, convert format, and put. */
-    bp = JS_vsmprintf(format, ap);      /* XXX vsaprintf */
-    if (fp) {
-        JS_free(jp->sprinter.context, fp);
-        format = NULL;
-    }
-    if (!bp) {
-        JS_ReportOutOfMemory(jp->sprinter.context);
-        return -1;
-    }
-
-    cc = strlen(bp);
-    if (SprintPut(&jp->sprinter, bp, (size_t)cc) < 0)
-        cc = -1;
-    free(bp);
-
-    va_end(ap);
-    return cc;
-}
-
-JSBool
-js_puts(JSPrinter *jp, const char *s)
-{
-    return SprintPut(&jp->sprinter, s, strlen(s)) >= 0;
-}
-
-/************************************************************************/
-
-typedef struct SprintStack {
-    Sprinter    sprinter;       /* sprinter for postfix to infix buffering */
-    ptrdiff_t   *offsets;       /* stack of postfix string offsets */
-    jsbytecode  *opcodes;       /* parallel stack of JS opcodes */
-    uintN       top;            /* top of stack index */
-    JSPrinter   *printer;       /* permanent output goes here */
-} SprintStack;
-
-/* Gap between stacked strings to allow for insertion of parens and commas. */
-#define PAREN_SLOP      (2 + 1)
-
-/*
- * These pseudo-ops help js_DecompileValueGenerator decompile JSOP_SETNAME,
- * JSOP_SETPROP, and JSOP_SETELEM, respectively.  See the first assertion in
- * PushOff.
- */
-#define JSOP_GETPROP2   254
-#define JSOP_GETELEM2   255
-
-static JSBool
-PushOff(SprintStack *ss, ptrdiff_t off, JSOp op)
-{
-    uintN top;
-
-#if JSOP_LIMIT > JSOP_GETPROP2
-#error JSOP_LIMIT must be <= JSOP_GETPROP2
-#endif
-    if (!SprintAlloc(&ss->sprinter, PAREN_SLOP))
-        return JS_FALSE;
-
-    /* ss->top points to the next free slot; be paranoid about overflow. */
-    top = ss->top;
-    JS_ASSERT(top < ss->printer->script->depth);
-    if (top >= ss->printer->script->depth) {
-        JS_ReportOutOfMemory(ss->sprinter.context);
-        return JS_FALSE;
-    }
-
-    /* The opcodes stack must contain real bytecodes that index js_CodeSpec. */
-    ss->offsets[top] = off;
-    ss->opcodes[top] = (op == JSOP_GETPROP2) ? JSOP_GETPROP
-                     : (op == JSOP_GETELEM2) ? JSOP_GETELEM
-                     : (jsbytecode) op;
-    ss->top = ++top;
-    ss->sprinter.offset += PAREN_SLOP;
-    return JS_TRUE;
-}
-
-static ptrdiff_t
-PopOff(SprintStack *ss, JSOp op)
-{
-    uintN top;
-    const JSCodeSpec *cs, *topcs;
-    ptrdiff_t off;
-
-    /* ss->top points to the next free slot; be paranoid about underflow. */
-    top = ss->top;
-    JS_ASSERT(top != 0);
-    if (top == 0)
-        return 0;
-
-    ss->top = --top;
-    topcs = &js_CodeSpec[ss->opcodes[top]];
-    cs = &js_CodeSpec[op];
-    if (topcs->prec != 0 && topcs->prec < cs->prec) {
-        ss->offsets[top] -= 2;
-        ss->sprinter.offset = ss->offsets[top];
-        off = Sprint(&ss->sprinter, "(%s)",
-                     OFF2STR(&ss->sprinter, ss->sprinter.offset + 2));
-    } else {
-        off = ss->sprinter.offset = ss->offsets[top];
-    }
-    return off;
-}
-
-#if JS_HAS_SWITCH_STATEMENT
-typedef struct TableEntry {
-    jsval       key;
-    ptrdiff_t   offset;
-    JSAtom      *label;
-    jsint       order;          /* source order for stable tableswitch sort */
-} TableEntry;
-
-static int
-CompareOffsets(const void *v1, const void *v2, void *arg)
-{
-    const TableEntry *te1 = (const TableEntry *) v1,
-                     *te2 = (const TableEntry *) v2;
-
-    if (te1->offset == te2->offset)
-        return (int) (te1->order - te2->order);
-    return (int) (te1->offset - te2->offset);
-}
-
-static JSBool
-Decompile(SprintStack *ss, jsbytecode *pc, intN nb);
-
-static JSBool
-DecompileSwitch(SprintStack *ss, TableEntry *table, uintN tableLength,
-                jsbytecode *pc, ptrdiff_t switchLength,
-                ptrdiff_t defaultOffset, JSBool isCondSwitch)
-{
-    JSContext *cx;
-    JSPrinter *jp;
-    char *lval, *rval;
-    uintN i;
-    ptrdiff_t diff, off, off2, caseExprOff;
-    jsval key;
-    JSString *str;
-
-    cx = ss->sprinter.context;
-    jp = ss->printer;
-
-    lval = OFF2STR(&ss->sprinter, PopOff(ss, JSOP_NOP));
-    js_printf(jp, "\tswitch (%s) {\n", lval);
-
-    if (tableLength) {
-        diff = table[0].offset - defaultOffset;
-        if (diff > 0) {
-            jp->indent += 2;
-            js_printf(jp, "\t%s:\n", js_default_str);
-            jp->indent += 2;
-            if (!Decompile(ss, pc + defaultOffset, diff))
-                return JS_FALSE;
-            jp->indent -= 4;
-        }
-
-        caseExprOff = isCondSwitch
-                      ? (ptrdiff_t) js_CodeSpec[JSOP_CONDSWITCH].length
-                      : 0;
-
-        for (i = 0; i < tableLength; i++) {
-            off = table[i].offset;
-            off2 = (i + 1 < tableLength) ? table[i + 1].offset : switchLength;
-
-            key = table[i].key;
-            if (isCondSwitch) {
-                ptrdiff_t nextCaseExprOff;
-
-                /*
-                 * key encodes the JSOP_CASE bytecode's offset from switchtop.
-                 * The next case expression follows immediately, unless we are
-                 * at the last case.
-                 */
-                nextCaseExprOff = (ptrdiff_t)JSVAL_TO_INT(key);
-                nextCaseExprOff += js_CodeSpec[pc[nextCaseExprOff]].length;
-                jp->indent += 2;
-                if (!Decompile(ss, pc + caseExprOff,
-                               nextCaseExprOff - caseExprOff)) {
-                    return JS_FALSE;
-                }
-                caseExprOff = nextCaseExprOff;
-            } else {
-                /*
-                 * key comes from an atom, not the decompiler, so we need to
-                 * quote it if it's a string literal.  But if table[i].label
-                 * is non-null, key was constant-propagated and label is the
-                 * name of the const we should show as the case label.  We set
-                 * key to undefined so this identifier is escaped, if required
-                 * by non-ASCII characters, but not quoted, by QuoteString.
-                 */
-                if (table[i].label) {
-                    str = ATOM_TO_STRING(table[i].label);
-                    key = JSVAL_VOID;
-                } else {
-                    str = js_ValueToString(cx, key);
-                    if (!str)
-                        return JS_FALSE;
-                }
-                rval = QuoteString(&ss->sprinter, str,
-                                   (jschar)(JSVAL_IS_STRING(key) ? '"' : 0));
-                if (!rval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, rval);
-                jp->indent += 2;
-                js_printf(jp, "\tcase %s:\n", rval);
-            }
-
-            jp->indent += 2;
-            if (off <= defaultOffset && defaultOffset < off2) {
-                diff = defaultOffset - off;
-                if (diff != 0) {
-                    if (!Decompile(ss, pc + off, diff))
-                        return JS_FALSE;
-                    off = defaultOffset;
-                }
-                jp->indent -= 2;
-                js_printf(jp, "\t%s:\n", js_default_str);
-                jp->indent += 2;
-            }
-            if (!Decompile(ss, pc + off, off2 - off))
-                return JS_FALSE;
-            jp->indent -= 4;
-        }
-    }
-
-    if (defaultOffset == switchLength) {
-        jp->indent += 2;
-        js_printf(jp, "\t%s:;\n", js_default_str);
-        jp->indent -= 2;
-    }
-    js_printf(jp, "\t}\n");
-    return JS_TRUE;
-}
-#endif
-
-static JSAtom *
-GetSlotAtom(JSPrinter *jp, JSPropertyOp getter, uintN slot)
-{
-    JSScope *scope;
-    JSScopeProperty *sprop;
-    JSObject *obj, *proto;
-
-    scope = jp->scope;
-    while (scope) {
-        for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-            if (sprop->getter != getter)
-                continue;
-            JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
-            JS_ASSERT(JSID_IS_ATOM(sprop->id));
-            if ((uintN) sprop->shortid == slot)
-                return JSID_TO_ATOM(sprop->id);
-        }
-        obj = scope->object;
-        if (!obj)
-            break;
-        proto = OBJ_GET_PROTO(jp->sprinter.context, obj);
-        if (!proto)
-            break;
-        scope = OBJ_SCOPE(proto);
-    }
-    return NULL;
-}
-
-static const char *
-VarPrefix(jssrcnote *sn)
-{
-    if (sn) {
-        if (SN_TYPE(sn) == SRC_VAR)
-            return "var ";
-        if (SN_TYPE(sn) == SRC_CONST)
-            return "const ";
-    }
-    return "";
-}
-
-static JSBool
-Decompile(SprintStack *ss, jsbytecode *pc, intN nb)
-{
-    JSContext *cx;
-    JSPrinter *jp, *jp2;
-    jsbytecode *endpc, *done, *forelem_tail, *forelem_done;
-    ptrdiff_t tail, todo, len, oplen, cond, next;
-    JSOp op, lastop, saveop;
-    const JSCodeSpec *cs, *topcs;
-    jssrcnote *sn, *sn2;
-    const char *lval, *rval, *xval, *fmt;
-    jsint i, argc;
-    char **argv;
-    jsatomid atomIndex;
-    JSAtom *atom;
-    JSObject *obj;
-    JSFunction *fun;
-    JSString *str;
-    JSBool ok;
-#if JS_HAS_XML_SUPPORT
-    JSBool foreach, inXML, quoteAttr;
-#else
-#define inXML JS_FALSE
-#endif
-    jsval val;
-    static const char catch_cookie[] = "/*CATCH*/";
-    static const char with_cookie[] = "/*WITH*/";
-
-/*
- * Local macros
- */
-#define DECOMPILE_CODE(pc,nb)   if (!Decompile(ss, pc, nb)) return JS_FALSE
-#define POP_STR()               OFF2STR(&ss->sprinter, PopOff(ss, op))
-#define LOCAL_ASSERT(expr)      JS_ASSERT(expr); if (!(expr)) return JS_FALSE
-
-/*
- * Callers know that ATOM_IS_STRING(atom), and we leave it to the optimizer to
- * common ATOM_TO_STRING(atom) here and near the call sites.
- */
-#define ATOM_IS_IDENTIFIER(atom)                                              \
-    (!ATOM_KEYWORD(atom) && js_IsIdentifier(ATOM_TO_STRING(atom)))
-
-/*
- * Given an atom already fetched from jp->script's atom map, quote/escape its
- * string appropriately into rval, and select fmt from the quoted and unquoted
- * alternatives.
- */
-#define GET_QUOTE_AND_FMT(qfmt, ufmt, rval)                                   \
-    JS_BEGIN_MACRO                                                            \
-        jschar quote_;                                                        \
-        if (!ATOM_IS_IDENTIFIER(atom)) {                                      \
-            quote_ = '\'';                                                    \
-            fmt = qfmt;                                                       \
-        } else {                                                              \
-            quote_ = 0;                                                       \
-            fmt = ufmt;                                                       \
-        }                                                                     \
-        rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), quote_);      \
-        if (!rval)                                                            \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-/*
- * Get atom from jp->script's atom map, quote/escape its string appropriately
- * into rval, and select fmt from the quoted and unquoted alternatives.
- */
-#define GET_ATOM_QUOTE_AND_FMT(qfmt, ufmt, rval)                              \
-    JS_BEGIN_MACRO                                                            \
-        atom = GET_ATOM(cx, jp->script, pc);                                  \
-        GET_QUOTE_AND_FMT(qfmt, ufmt, rval);                                  \
-    JS_END_MACRO
-
-    cx = ss->sprinter.context;
-    jp = ss->printer;
-    endpc = pc + nb;
-    forelem_tail = forelem_done = NULL;
-    tail = -1;
-    todo = -2;                  /* NB: different from Sprint() error return. */
-    op = JSOP_NOP;
-    sn = NULL;
-    rval = NULL;
-#if JS_HAS_XML_SUPPORT
-    foreach = inXML = quoteAttr = JS_FALSE;
-#endif
-
-    while (pc < endpc) {
-        lastop = op;
-        op = saveop = (JSOp) *pc;
-        if (op >= JSOP_LIMIT) {
-            switch (op) {
-              case JSOP_GETPROP2:
-                saveop = JSOP_GETPROP;
-                break;
-              case JSOP_GETELEM2:
-                saveop = JSOP_GETELEM;
-                break;
-              default:;
-            }
-        }
-        cs = &js_CodeSpec[saveop];
-        len = oplen = cs->length;
-
-        if (cs->token) {
-            switch (cs->nuses) {
-              case 2:
-                rval = POP_STR();
-                lval = POP_STR();
-                sn = js_GetSrcNote(jp->script, pc);
-                if (sn && SN_TYPE(sn) == SRC_ASSIGNOP) {
-                    /* Print only the right operand of the assignment-op. */
-                    todo = SprintPut(&ss->sprinter, rval, strlen(rval));
-                } else if (!inXML) {
-                    todo = Sprint(&ss->sprinter, "%s %s %s",
-                                  lval, cs->token, rval);
-                } else {
-                    /* In XML, just concatenate the two operands. */
-                    JS_ASSERT(op == JSOP_ADD);
-                    todo = Sprint(&ss->sprinter, "%s%s", lval, rval);
-                }
-                break;
-
-              case 1:
-                rval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s%s", cs->token, rval);
-                break;
-
-              case 0:
-                todo = SprintPut(&ss->sprinter, cs->token, strlen(cs->token));
-                break;
-
-              default:
-                todo = -2;
-                break;
-            }
-        } else {
-            switch (op) {
-#define BEGIN_LITOPX_CASE(OP)                                                 \
-              case OP:                                                        \
-                atomIndex = GET_ATOM_INDEX(pc);                               \
-              do_##OP:                                                        \
-                atom = js_GetAtom(cx, &jp->script->atomMap, atomIndex);
-
-#define END_LITOPX_CASE                                                       \
-                break;
-
-              case JSOP_NOP:
-                /*
-                 * Check for a do-while loop, a for-loop with an empty
-                 * initializer part, a labeled statement, a function
-                 * definition, or try/finally.
-                 */
-                sn = js_GetSrcNote(jp->script, pc);
-                todo = -2;
-                switch (sn ? SN_TYPE(sn) : SRC_NULL) {
-#if JS_HAS_DO_WHILE_LOOP
-                  case SRC_WHILE:
-                    js_printf(jp, "\tdo {\n");
-                    jp->indent += 4;
-                    break;
-#endif /* JS_HAS_DO_WHILE_LOOP */
-
-                  case SRC_FOR:
-                    rval = "";
-
-                  do_forloop:
-                    /* Skip the JSOP_NOP or JSOP_POP bytecode. */
-                    pc++;
-
-                    /* Get the cond, next, and loop-closing tail offsets. */
-                    cond = js_GetSrcNoteOffset(sn, 0);
-                    next = js_GetSrcNoteOffset(sn, 1);
-                    tail = js_GetSrcNoteOffset(sn, 2);
-                    LOCAL_ASSERT(tail + GetJumpOffset(pc+tail, pc+tail) == 0);
-
-                    /* Print the keyword and the possibly empty init-part. */
-                    js_printf(jp, "\tfor (%s;", rval);
-
-                    if (pc[cond] == JSOP_IFEQ || pc[cond] == JSOP_IFEQX) {
-                        /* Decompile the loop condition. */
-                        DECOMPILE_CODE(pc, cond);
-                        js_printf(jp, " %s", POP_STR());
-                    }
-
-                    /* Need a semicolon whether or not there was a cond. */
-                    js_puts(jp, ";");
-
-                    if (pc[next] != JSOP_GOTO && pc[next] != JSOP_GOTOX) {
-                        /* Decompile the loop updater. */
-                        DECOMPILE_CODE(pc + next, tail - next - 1);
-                        js_printf(jp, " %s", POP_STR());
-                    }
-
-                    /* Do the loop body. */
-                    js_printf(jp, ") {\n");
-                    jp->indent += 4;
-                    oplen = (cond) ? js_CodeSpec[pc[cond]].length : 0;
-                    DECOMPILE_CODE(pc + cond + oplen, next - cond - oplen);
-                    jp->indent -= 4;
-                    js_printf(jp, "\t}\n");
-
-                    /* Set len so pc skips over the entire loop. */
-                    len = tail + js_CodeSpec[pc[tail]].length;
-                    break;
-
-                  case SRC_LABEL:
-                    atom = js_GetAtom(cx, &jp->script->atomMap,
-                                      (jsatomid) js_GetSrcNoteOffset(sn, 0));
-                    jp->indent -= 4;
-                    rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!rval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, rval);
-                    js_printf(jp, "\t%s:\n", rval);
-                    jp->indent += 4;
-                    break;
-
-                  case SRC_LABELBRACE:
-                    atom = js_GetAtom(cx, &jp->script->atomMap,
-                                      (jsatomid) js_GetSrcNoteOffset(sn, 0));
-                    rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!rval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, rval);
-                    js_printf(jp, "\t%s: {\n", rval);
-                    jp->indent += 4;
-                    break;
-
-                  case SRC_ENDBRACE:
-                    jp->indent -= 4;
-                    js_printf(jp, "\t}\n");
-                    break;
-
-                  case SRC_CATCH:
-                    jp->indent -= 4;
-                    sn = js_GetSrcNote(jp->script, pc);
-                    pc += oplen;
-                    js_printf(jp, "\t} catch (");
-
-                    LOCAL_ASSERT(*pc == JSOP_NAME);
-                    pc += js_CodeSpec[JSOP_NAME].length;
-                    LOCAL_ASSERT(*pc == JSOP_PUSHOBJ);
-                    pc += js_CodeSpec[JSOP_PUSHOBJ].length;
-                    LOCAL_ASSERT(*pc == JSOP_NEWINIT);
-                    pc += js_CodeSpec[JSOP_NEWINIT].length;
-                    LOCAL_ASSERT(*pc == JSOP_EXCEPTION);
-                    pc += js_CodeSpec[JSOP_EXCEPTION].length;
-                    if (*pc == JSOP_LITOPX) {
-                        atomIndex = GET_LITERAL_INDEX(pc);
-                        pc += 1 + LITERAL_INDEX_LEN;
-                        LOCAL_ASSERT(*pc == JSOP_INITCATCHVAR);
-                        ++pc;
-                    } else {
-                        LOCAL_ASSERT(*pc == JSOP_INITCATCHVAR);
-                        atomIndex = GET_ATOM_INDEX(pc);
-                        pc += js_CodeSpec[JSOP_INITCATCHVAR].length;
-                    }
-                    atom = js_GetAtom(cx, &jp->script->atomMap, atomIndex);
-                    rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!rval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, rval);
-                    js_printf(jp, "%s", rval);
-                    LOCAL_ASSERT(*pc == JSOP_ENTERWITH);
-                    pc += js_CodeSpec[JSOP_ENTERWITH].length;
-
-                    len = js_GetSrcNoteOffset(sn, 0);
-                    if (len) {
-                        js_printf(jp, " if ");
-                        DECOMPILE_CODE(pc, len);
-                        js_printf(jp, "%s", POP_STR());
-                        pc += len;
-                        LOCAL_ASSERT(*pc == JSOP_IFEQ || *pc == JSOP_IFEQX);
-                        pc += js_CodeSpec[*pc].length;
-                    }
-
-                    js_printf(jp, ") {\n");
-                    jp->indent += 4;
-                    todo = Sprint(&ss->sprinter, catch_cookie);
-                    len = 0;
-                    break;
-
-                  case SRC_FUNCDEF:
-                    atom = js_GetAtom(cx, &jp->script->atomMap,
-                                      (jsatomid) js_GetSrcNoteOffset(sn, 0));
-                    JS_ASSERT(ATOM_IS_OBJECT(atom));
-                  do_function:
-                    obj = ATOM_TO_OBJECT(atom);
-                    fun = (JSFunction *) JS_GetPrivate(cx, obj);
-                    jp2 = js_NewPrinter(cx, JS_GetFunctionName(fun),
-                                        jp->indent, jp->pretty);
-                    if (!jp2)
-                        return JS_FALSE;
-                    jp2->scope = jp->scope;
-                    js_puts(jp2, "\n");
-                    ok = js_DecompileFunction(jp2, fun);
-                    if (ok) {
-                        js_puts(jp2, "\n");
-                        str = js_GetPrinterOutput(jp2);
-                        if (str)
-                            js_printf(jp, "%s\n", JS_GetStringBytes(str));
-                        else
-                            ok = JS_FALSE;
-                    }
-                    js_DestroyPrinter(jp2);
-                    if (!ok)
-                        return JS_FALSE;
-
-                    break;
-
-                  default:;
-                }
-              case JSOP_RETRVAL:
-                break;
-
-              case JSOP_GROUP:
-                /* Use last real op so PopOff adds parens if needed. */
-                todo = PopOff(ss, lastop);
-
-                /* Now add user-supplied parens only if PopOff did not. */
-                cs    = &js_CodeSpec[lastop];
-                topcs = &js_CodeSpec[ss->opcodes[ss->top]];
-                if (topcs->prec >= cs->prec) {
-                    todo = Sprint(&ss->sprinter, "(%s)",
-                                  OFF2STR(&ss->sprinter, todo));
-                }
-                break;
-
-              case JSOP_PUSH:
-              case JSOP_PUSHOBJ:
-              case JSOP_BINDNAME:
-              do_JSOP_BINDNAME:
-                todo = Sprint(&ss->sprinter, "");
-                break;
-
-#if JS_HAS_EXCEPTIONS
-              case JSOP_TRY:
-                js_printf(jp, "\ttry {\n");
-                jp->indent += 4;
-                todo = -2;
-                break;
-
-            {
-              static const char finally_cookie[] = "/*FINALLY*/";
-
-              case JSOP_FINALLY:
-                jp->indent -= 4;
-                js_printf(jp, "\t} finally {\n");
-                jp->indent += 4;
-
-                /*
-                 * We must push an empty string placeholder for gosub's return
-                 * address, popped by JSOP_RETSUB and counted by script->depth
-                 * but not by ss->top (see JSOP_SETSP, below).
-                 */
-                todo = Sprint(&ss->sprinter, finally_cookie);
-                break;
-
-              case JSOP_RETSUB:
-                rval = POP_STR();
-                LOCAL_ASSERT(strcmp(rval, finally_cookie) == 0);
-                todo = -2;
-                break;
-            }
-
-              case JSOP_SWAP:
-                /*
-                 * We don't generate this opcode currently, and previously we
-                 * did not need to decompile it.  If old, serialized bytecode
-                 * uses it still, we should fall through and set todo = -2.
-                 */
-                /* FALL THROUGH */
-
-              case JSOP_GOSUB:
-              case JSOP_GOSUBX:
-                /*
-                 * JSOP_GOSUB and GOSUBX have no effect on the decompiler's
-                 * string stack because the next op in bytecode order finds
-                 * the stack balanced by a JSOP_RETSUB executed elsewhere.
-                 */
-                todo = -2;
-                break;
-
-              case JSOP_SETSP:
-                /*
-                 * The compiler models operand stack depth and fixes the stack
-                 * pointer on entry to a catch clause based on its depth model.
-                 * The decompiler must match the code generator's model, which
-                 * is why JSOP_FINALLY pushes a cookie that JSOP_RETSUB pops.
-                 */
-                LOCAL_ASSERT(ss->top >= (uintN) GET_ATOM_INDEX(pc));
-                ss->top = (uintN) GET_ATOM_INDEX(pc);
-                break;
-
-              case JSOP_EXCEPTION:
-                /*
-                 * The only other JSOP_EXCEPTION case occurs as part of a code
-                 * sequence that follows a SRC_CATCH-annotated JSOP_NOP.
-                 */
-                sn = js_GetSrcNote(jp->script, pc);
-                LOCAL_ASSERT(sn && SN_TYPE(sn) == SRC_HIDDEN);
-                todo = -2;
-                break;
-#endif /* JS_HAS_EXCEPTIONS */
-
-              case JSOP_POP:
-              case JSOP_POPV:
-                sn = js_GetSrcNote(jp->script, pc);
-                switch (sn ? SN_TYPE(sn) : SRC_NULL) {
-                  case SRC_FOR:
-                    rval = POP_STR();
-                    todo = -2;
-                    goto do_forloop;
-
-                  case SRC_PCDELTA:
-                    /* Pop and save to avoid blowing stack depth budget. */
-                    lval = JS_strdup(cx, POP_STR());
-                    if (!lval)
-                        return JS_FALSE;
-
-                    /*
-                     * The offset tells distance to the end of the right-hand
-                     * operand of the comma operator.
-                     */
-                    done = pc + len;
-                    pc += js_GetSrcNoteOffset(sn, 0);
-                    len = 0;
-
-                    if (!Decompile(ss, done, pc - done)) {
-                        JS_free(cx, (char *)lval);
-                        return JS_FALSE;
-                    }
-
-                    /* Pop Decompile result and print comma expression. */
-                    rval = POP_STR();
-                    todo = Sprint(&ss->sprinter, "%s, %s", lval, rval);
-                    JS_free(cx, (char *)lval);
-                    break;
-
-                  case SRC_HIDDEN:
-                    /* Hide this pop, it's from a goto in a with or for/in. */
-                    todo = -2;
-                    break;
-
-                  default:
-                    rval = POP_STR();
-                    if (*rval != '\0')
-                        js_printf(jp, "\t%s;\n", rval);
-                    todo = -2;
-                    break;
-                }
-                break;
-
-              case JSOP_POP2:
-                (void) PopOff(ss, op);
-                (void) PopOff(ss, op);
-                todo = -2;
-                break;
-
-              case JSOP_ENTERWITH:
-                JS_ASSERT(!js_GetSrcNote(jp->script, pc));
-                rval = POP_STR();
-                js_printf(jp, "\twith (%s) {\n", rval);
-                jp->indent += 4;
-                todo = Sprint(&ss->sprinter, with_cookie);
-                break;
-
-              case JSOP_LEAVEWITH:
-                sn = js_GetSrcNote(jp->script, pc);
-                todo = -2;
-                if (sn && SN_TYPE(sn) == SRC_HIDDEN)
-                    break;
-                rval = POP_STR();
-                if (sn && SN_TYPE(sn) == SRC_CATCH) {
-                    LOCAL_ASSERT(strcmp(rval, catch_cookie) == 0);
-                    LOCAL_ASSERT((uintN) js_GetSrcNoteOffset(sn, 0) == ss->top);
-                    break;
-                }
-                LOCAL_ASSERT(strcmp(rval, with_cookie) == 0);
-                jp->indent -= 4;
-                js_printf(jp, "\t}\n");
-                break;
-
-              case JSOP_SETRVAL:
-              case JSOP_RETURN:
-                lval = js_CodeSpec[JSOP_RETURN].name;
-                rval = POP_STR();
-                if (*rval != '\0')
-                    js_printf(jp, "\t%s %s;\n", lval, rval);
-                else
-                    js_printf(jp, "\t%s;\n", lval);
-                todo = -2;
-                break;
-
-#if JS_HAS_EXCEPTIONS
-              case JSOP_THROW:
-                sn = js_GetSrcNote(jp->script, pc);
-                todo = -2;
-                if (sn && SN_TYPE(sn) == SRC_HIDDEN)
-                    break;
-                rval = POP_STR();
-                js_printf(jp, "\t%s %s;\n", cs->name, rval);
-                break;
-#endif /* JS_HAS_EXCEPTIONS */
-
-              case JSOP_GOTO:
-              case JSOP_GOTOX:
-                sn = js_GetSrcNote(jp->script, pc);
-                switch (sn ? SN_TYPE(sn) : SRC_NULL) {
-                  case SRC_CONT2LABEL:
-                    atom = js_GetAtom(cx, &jp->script->atomMap,
-                                      (jsatomid) js_GetSrcNoteOffset(sn, 0));
-                    rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!rval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, rval);
-                    js_printf(jp, "\tcontinue %s;\n", rval);
-                    break;
-                  case SRC_CONTINUE:
-                    js_printf(jp, "\tcontinue;\n");
-                    break;
-                  case SRC_BREAK2LABEL:
-                    atom = js_GetAtom(cx, &jp->script->atomMap,
-                                      (jsatomid) js_GetSrcNoteOffset(sn, 0));
-                    rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!rval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, rval);
-                    js_printf(jp, "\tbreak %s;\n", rval);
-                    break;
-                  case SRC_HIDDEN:
-                    break;
-                  default:
-                    js_printf(jp, "\tbreak;\n");
-                    break;
-                }
-                todo = -2;
-                break;
-
-              case JSOP_IFEQ:
-              case JSOP_IFEQX:
-                len = GetJumpOffset(pc, pc);
-                sn = js_GetSrcNote(jp->script, pc);
-
-                switch (sn ? SN_TYPE(sn) : SRC_NULL) {
-                  case SRC_IF:
-                  case SRC_IF_ELSE:
-                    rval = POP_STR();
-                    js_printf(jp, "\tif (%s) {\n", rval);
-                    jp->indent += 4;
-                    if (SN_TYPE(sn) == SRC_IF) {
-                        DECOMPILE_CODE(pc + oplen, len - oplen);
-                    } else {
-                        len = js_GetSrcNoteOffset(sn, 0);
-                        DECOMPILE_CODE(pc + oplen, len - oplen);
-                        jp->indent -= 4;
-                        pc += len;
-                        LOCAL_ASSERT(*pc == JSOP_GOTO || *pc == JSOP_GOTOX);
-                        oplen = js_CodeSpec[*pc].length;
-                        len = GetJumpOffset(pc, pc);
-                        js_printf(jp, "\t} else {\n");
-                        jp->indent += 4;
-                        DECOMPILE_CODE(pc + oplen, len - oplen);
-                    }
-                    jp->indent -= 4;
-                    js_printf(jp, "\t}\n");
-                    todo = -2;
-                    break;
-
-                  case SRC_WHILE:
-                    rval = POP_STR();
-                    js_printf(jp, "\twhile (%s) {\n", rval);
-                    jp->indent += 4;
-                    tail = js_GetSrcNoteOffset(sn, 0);
-                    DECOMPILE_CODE(pc + oplen, tail - oplen);
-                    jp->indent -= 4;
-                    js_printf(jp, "\t}\n");
-                    todo = -2;
-                    break;
-
-                  case SRC_COND:
-                    xval = JS_strdup(cx, POP_STR());
-                    if (!xval)
-                        return JS_FALSE;
-                    len = js_GetSrcNoteOffset(sn, 0);
-                    DECOMPILE_CODE(pc + oplen, len - oplen);
-                    lval = JS_strdup(cx, POP_STR());
-                    if (!lval) {
-                        JS_free(cx, (void *)xval);
-                        return JS_FALSE;
-                    }
-                    pc += len;
-                    LOCAL_ASSERT(*pc == JSOP_GOTO || *pc == JSOP_GOTOX);
-                    oplen = js_CodeSpec[*pc].length;
-                    len = GetJumpOffset(pc, pc);
-                    DECOMPILE_CODE(pc + oplen, len - oplen);
-                    rval = POP_STR();
-                    todo = Sprint(&ss->sprinter, "%s ? %s : %s",
-                                  xval, lval, rval);
-                    JS_free(cx, (void *)xval);
-                    JS_free(cx, (void *)lval);
-                    break;
-
-                  default:
-                    break;
-                }
-                break;
-
-              case JSOP_IFNE:
-              case JSOP_IFNEX:
-#if JS_HAS_DO_WHILE_LOOP
-                /* Currently, this must be a do-while loop's upward branch. */
-                jp->indent -= 4;
-                js_printf(jp, "\t} while (%s);\n", POP_STR());
-                todo = -2;
-#else
-                JS_ASSERT(0);
-#endif /* JS_HAS_DO_WHILE_LOOP */
-                break;
-
-              case JSOP_OR:
-              case JSOP_ORX:
-                xval = "||";
-
-              do_logical_connective:
-                /* Top of stack is the first clause in a disjunction (||). */
-                lval = JS_strdup(cx, POP_STR());
-                if (!lval)
-                    return JS_FALSE;
-                done = pc + GetJumpOffset(pc, pc);
-                pc += len;
-                len = PTRDIFF(done, pc, jsbytecode);
-                DECOMPILE_CODE(pc, len);
-                rval = POP_STR();
-                if (jp->pretty &&
-                    jp->indent + 4 + strlen(lval) + 4 + strlen(rval) > 75) {
-                    rval = JS_strdup(cx, rval);
-                    if (!rval) {
-                        tail = -1;
-                    } else {
-                        todo = Sprint(&ss->sprinter, "%s %s\n", lval, xval);
-                        tail = Sprint(&ss->sprinter, "%*s%s",
-                                      jp->indent + 4, "", rval);
-                        JS_free(cx, (char *)rval);
-                    }
-                    if (tail < 0)
-                        todo = -1;
-                } else {
-                    todo = Sprint(&ss->sprinter, "%s %s %s", lval, xval, rval);
-                }
-                JS_free(cx, (char *)lval);
-                break;
-
-              case JSOP_AND:
-              case JSOP_ANDX:
-                xval = "&&";
-                goto do_logical_connective;
-
-              case JSOP_FORARG:
-                atom = GetSlotAtom(jp, js_GetArgument, GET_ARGNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_fornameinloop;
-
-              case JSOP_FORVAR:
-                atom = GetSlotAtom(jp, js_GetLocalVariable, GET_VARNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_fornameinloop;
-
-              case JSOP_FORNAME:
-                atom = GET_ATOM(cx, jp->script, pc);
-
-              do_fornameinloop:
-                sn = js_GetSrcNote(jp->script, pc);
-                xval = NULL;
-                lval = "";
-                goto do_forinloop;
-
-              case JSOP_FORPROP:
-                xval = NULL;
-                atom = GET_ATOM(cx, jp->script, pc);
-                if (!ATOM_IS_IDENTIFIER(atom)) {
-                    xval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
-                                       (jschar)'\'');
-                    if (!xval)
-                        return JS_FALSE;
-                    atom = NULL;
-                }
-                lval = POP_STR();
-                sn = NULL;
-
-              do_forinloop:
-                pc += oplen;
-                LOCAL_ASSERT(*pc == JSOP_IFEQ || *pc == JSOP_IFEQX);
-                oplen = js_CodeSpec[*pc].length;
-                len = GetJumpOffset(pc, pc);
-                sn2 = js_GetSrcNote(jp->script, pc);
-                tail = js_GetSrcNoteOffset(sn2, 0);
-
-              do_forinbody:
-#if JS_HAS_XML_SUPPORT
-                if (foreach) {
-                    foreach = JS_FALSE;
-                    js_printf(jp, "\tfor %s (%s%s",
-                              js_each_str, VarPrefix(sn), lval);
-                } else
-#endif
-                    js_printf(jp, "\tfor (%s%s", VarPrefix(sn), lval);
-                if (atom) {
-                    xval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                    if (!xval)
-                        return JS_FALSE;
-                    RETRACT(&ss->sprinter, xval);
-                    js_printf(jp, *lval ? ".%s" : "%s", xval);
-                } else if (xval && *xval) {
-                    js_printf(jp,
-                              (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                              ? ".%s"
-                              : "[%s]",
-                              xval);
-                }
-                rval = OFF2STR(&ss->sprinter, ss->offsets[ss->top-1]);
-                js_printf(jp, " in %s) {\n", rval);
-                jp->indent += 4;
-                DECOMPILE_CODE(pc + oplen, tail - oplen);
-                jp->indent -= 4;
-                js_printf(jp, "\t}\n");
-                todo = -2;
-                break;
-
-              case JSOP_FORELEM:
-                pc++;
-                LOCAL_ASSERT(*pc == JSOP_IFEQ || *pc == JSOP_IFEQX);
-                len = js_CodeSpec[*pc].length;
-
-                /*
-                 * Arrange for the JSOP_ENUMELEM case to set tail for use by
-                 * do_forinbody: code that uses on it to find the loop-closing
-                 * jump (whatever its format, normal or extended), in order to
-                 * bound the recursively decompiled loop body.
-                 */
-                sn = js_GetSrcNote(jp->script, pc);
-                JS_ASSERT(!forelem_tail);
-                forelem_tail = pc + js_GetSrcNoteOffset(sn, 0);
-
-                /*
-                 * This gets a little wacky.  Only the length of the for loop
-                 * body PLUS the element-indexing expression is known here, so
-                 * we pass the after-loop pc to the JSOP_ENUMELEM case, which
-                 * is immediately below, to decompile that helper bytecode via
-                 * the 'forelem_done' local.
-                 *
-                 * Since a for..in loop can't nest in the head of another for
-                 * loop, we can use forelem_{tail,done} singletons to remember
-                 * state from JSOP_FORELEM to JSOP_ENUMELEM, thence (via goto)
-                 * to label do_forinbody.
-                 */
-                JS_ASSERT(!forelem_done);
-                forelem_done = pc + GetJumpOffset(pc, pc);
-                break;
-
-              case JSOP_ENUMELEM:
-                /*
-                 * The stack has the object under the (top) index expression.
-                 * The "rval" property id is underneath those two on the stack.
-                 * The for loop body net and gross lengths can now be adjusted
-                 * to account for the length of the indexing expression that
-                 * came after JSOP_FORELEM and before JSOP_ENUMELEM.
-                 */
-                atom = NULL;
-                xval = POP_STR();
-                lval = POP_STR();
-                rval = OFF2STR(&ss->sprinter, ss->offsets[ss->top-1]);
-                JS_ASSERT(forelem_tail > pc);
-                tail = forelem_tail - pc;
-                forelem_tail = NULL;
-                JS_ASSERT(forelem_done > pc);
-                len = forelem_done - pc;
-                forelem_done = NULL;
-                goto do_forinbody;
-
-#if JS_HAS_GETTER_SETTER
-              case JSOP_GETTER:
-              case JSOP_SETTER:
-                todo = -2;
-                break;
-#endif
-
-              case JSOP_DUP2:
-                rval = OFF2STR(&ss->sprinter, ss->offsets[ss->top-2]);
-                todo = SprintPut(&ss->sprinter, rval, strlen(rval));
-                if (todo < 0 || !PushOff(ss, todo, ss->opcodes[ss->top-2]))
-                    return JS_FALSE;
-                /* FALL THROUGH */
-
-              case JSOP_DUP:
-                rval = OFF2STR(&ss->sprinter, ss->offsets[ss->top-1]);
-                op = ss->opcodes[ss->top-1];
-                todo = SprintPut(&ss->sprinter, rval, strlen(rval));
-                break;
-
-              case JSOP_SETARG:
-                atom = GetSlotAtom(jp, js_GetArgument, GET_ARGNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_setname;
-
-              case JSOP_SETVAR:
-                atom = GetSlotAtom(jp, js_GetLocalVariable, GET_VARNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_setname;
-
-              case JSOP_SETCONST:
-              case JSOP_SETNAME:
-              case JSOP_SETGVAR:
-                atomIndex = GET_ATOM_INDEX(pc);
-
-              do_JSOP_SETCONST:
-                atom = js_GetAtom(cx, &jp->script->atomMap, atomIndex);
-
-              do_setname:
-                lval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!lval)
-                    return JS_FALSE;
-                rval = POP_STR();
-                if (op == JSOP_SETNAME)
-                    (void) PopOff(ss, op);
-
-              do_setlval:
-                sn = js_GetSrcNote(jp->script, pc - 1);
-                if (sn && SN_TYPE(sn) == SRC_ASSIGNOP) {
-                    todo = Sprint(&ss->sprinter, "%s %s= %s",
-                                  lval, js_CodeSpec[lastop].token, rval);
-                } else {
-                    sn = js_GetSrcNote(jp->script, pc);
-                    todo = Sprint(&ss->sprinter, "%s%s = %s",
-                                  VarPrefix(sn), lval, rval);
-                }
-                break;
-
-              case JSOP_NEW:
-              case JSOP_CALL:
-              case JSOP_EVAL:
-#if JS_HAS_LVALUE_RETURN
-              case JSOP_SETCALL:
-#endif
-                saveop = op;
-                op = JSOP_NOP;           /* turn off parens */
-                argc = GET_ARGC(pc);
-                argv = (char **)
-                    JS_malloc(cx, (size_t)(argc + 1) * sizeof *argv);
-                if (!argv)
-                    return JS_FALSE;
-
-                ok = JS_TRUE;
-                for (i = argc; i > 0; i--) {
-                    argv[i] = JS_strdup(cx, POP_STR());
-                    if (!argv[i]) {
-                        ok = JS_FALSE;
-                        break;
-                    }
-                }
-
-                /* Skip the JSOP_PUSHOBJ-created empty string. */
-                LOCAL_ASSERT(ss->top >= 2);
-                (void) PopOff(ss, op);
-
-                /* Get the callee's decompiled image in argv[0]. */
-                argv[0] = JS_strdup(cx, POP_STR());
-                if (!argv[i])
-                    ok = JS_FALSE;
-
-                lval = "(", rval = ")";
-                if (saveop == JSOP_NEW) {
-                    todo = Sprint(&ss->sprinter, "%s %s%s",
-                                  js_new_str, argv[0], lval);
-                } else {
-                    todo = Sprint(&ss->sprinter, "%s%s",
-                                  argv[0], lval);
-                }
-                if (todo < 0)
-                    ok = JS_FALSE;
-
-                for (i = 1; i <= argc; i++) {
-                    if (!argv[i] ||
-                        Sprint(&ss->sprinter, "%s%s",
-                               argv[i], (i < argc) ? ", " : "") < 0) {
-                        ok = JS_FALSE;
-                        break;
-                    }
-                }
-                if (Sprint(&ss->sprinter, rval) < 0)
-                    ok = JS_FALSE;
-
-                for (i = 0; i <= argc; i++) {
-                    if (argv[i])
-                        JS_free(cx, argv[i]);
-                }
-                JS_free(cx, argv);
-                if (!ok)
-                    return JS_FALSE;
-                op = saveop;
-#if JS_HAS_LVALUE_RETURN
-                if (op == JSOP_SETCALL) {
-                    if (!PushOff(ss, todo, op))
-                        return JS_FALSE;
-                    todo = Sprint(&ss->sprinter, "");
-                }
-#endif
-                break;
-
-              case JSOP_DELNAME:
-                atom = GET_ATOM(cx, jp->script, pc);
-                lval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!lval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, lval);
-                todo = Sprint(&ss->sprinter, "%s %s", js_delete_str, lval);
-                break;
-
-              case JSOP_DELPROP:
-                GET_ATOM_QUOTE_AND_FMT("%s %s[%s]", "%s %s.%s", rval);
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, fmt, js_delete_str, lval, rval);
-                break;
-
-              case JSOP_DELELEM:
-                xval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter,
-                              (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                              ? "%s %s.%s"
-                              : "%s %s[%s]",
-                              js_delete_str, lval, xval);
-                break;
-
-#if JS_HAS_XML_SUPPORT
-              case JSOP_DELDESC:
-                xval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s %s..%s",
-                              js_delete_str, lval, xval);
-                break;
-#endif
-
-              case JSOP_TYPEOF:
-              case JSOP_VOID:
-                rval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s %s", cs->name, rval);
-                break;
-
-              case JSOP_INCARG:
-              case JSOP_DECARG:
-                atom = GetSlotAtom(jp, js_GetArgument, GET_ARGNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_incatom;
-
-              case JSOP_INCVAR:
-              case JSOP_DECVAR:
-                atom = GetSlotAtom(jp, js_GetLocalVariable, GET_VARNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_incatom;
-
-              case JSOP_INCNAME:
-              case JSOP_DECNAME:
-              case JSOP_INCGVAR:
-              case JSOP_DECGVAR:
-                atom = GET_ATOM(cx, jp->script, pc);
-              do_incatom:
-                lval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!lval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, lval);
-                todo = Sprint(&ss->sprinter, "%s%s",
-                              js_incop_str[!(cs->format & JOF_INC)], lval);
-                break;
-
-              case JSOP_INCPROP:
-              case JSOP_DECPROP:
-                GET_ATOM_QUOTE_AND_FMT("%s%s[%s]", "%s%s.%s", rval);
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, fmt,
-                              js_incop_str[!(cs->format & JOF_INC)],
-                              lval, rval);
-                break;
-
-              case JSOP_INCELEM:
-              case JSOP_DECELEM:
-                xval = POP_STR();
-                lval = POP_STR();
-                if (*xval != '\0') {
-                    todo = Sprint(&ss->sprinter,
-                                  (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                                  ? "%s%s.%s"
-                                  : "%s%s[%s]",
-                                  js_incop_str[!(cs->format & JOF_INC)],
-                                  lval, xval);
-                } else {
-                    todo = Sprint(&ss->sprinter, "%s%s",
-                                  js_incop_str[!(cs->format & JOF_INC)], lval);
-                }
-                break;
-
-              case JSOP_ARGINC:
-              case JSOP_ARGDEC:
-                atom = GetSlotAtom(jp, js_GetArgument, GET_ARGNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_atominc;
-
-              case JSOP_VARINC:
-              case JSOP_VARDEC:
-                atom = GetSlotAtom(jp, js_GetLocalVariable, GET_VARNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_atominc;
-
-              case JSOP_NAMEINC:
-              case JSOP_NAMEDEC:
-              case JSOP_GVARINC:
-              case JSOP_GVARDEC:
-                atom = GET_ATOM(cx, jp->script, pc);
-              do_atominc:
-                lval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!lval)
-                    return JS_FALSE;
-                todo = STR2OFF(&ss->sprinter, lval);
-                SprintPut(&ss->sprinter,
-                          js_incop_str[!(cs->format & JOF_INC)],
-                          2);
-                break;
-
-              case JSOP_PROPINC:
-              case JSOP_PROPDEC:
-                GET_ATOM_QUOTE_AND_FMT("%s[%s]%s", "%s.%s%s", rval);
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, fmt, lval, rval,
-                              js_incop_str[!(cs->format & JOF_INC)]);
-                break;
-
-              case JSOP_ELEMINC:
-              case JSOP_ELEMDEC:
-                xval = POP_STR();
-                lval = POP_STR();
-                if (*xval != '\0') {
-                    todo = Sprint(&ss->sprinter,
-                                  (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                                  ? "%s.%s%s"
-                                  : "%s[%s]%s",
-                                  lval, xval,
-                                  js_incop_str[!(cs->format & JOF_INC)]);
-                } else {
-                    todo = Sprint(&ss->sprinter, "%s%s",
-                                  lval, js_incop_str[!(cs->format & JOF_INC)]);
-                }
-                break;
-
-              case JSOP_GETPROP2:
-                op = JSOP_GETPROP;
-                (void) PopOff(ss, lastop);
-                /* FALL THROUGH */
-
-              case JSOP_GETPROP:
-                atom = GET_ATOM(cx, jp->script, pc);
-
-              do_getprop:
-                GET_QUOTE_AND_FMT("%s[%s]", "%s.%s", rval);
-
-              do_getprop_lval:
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, fmt, lval, rval);
-                break;
-
-#if JS_HAS_XML_SUPPORT
-              BEGIN_LITOPX_CASE(JSOP_GETMETHOD)
-                sn = js_GetSrcNote(jp->script, pc);
-                if (sn && SN_TYPE(sn) == SRC_PCBASE)
-                    goto do_getprop;
-                GET_QUOTE_AND_FMT("%s.function::[%s]", "%s.function::%s", rval);
-                goto do_getprop_lval;
-
-              BEGIN_LITOPX_CASE(JSOP_SETMETHOD)
-                sn = js_GetSrcNote(jp->script, pc);
-                if (sn && SN_TYPE(sn) == SRC_PCBASE)
-                    goto do_setprop;
-                GET_QUOTE_AND_FMT("%s.function::[%s] %s= %s",
-                                  "%s.function::%s %s= %s",
-                                  xval);
-                goto do_setprop_rval;
-#endif
-
-              case JSOP_SETPROP:
-                atom = GET_ATOM(cx, jp->script, pc);
-
-              do_setprop:
-                GET_QUOTE_AND_FMT("%s[%s] %s= %s", "%s.%s %s= %s", xval);
-
-              do_setprop_rval:
-                rval = POP_STR();
-                lval = POP_STR();
-                sn = js_GetSrcNote(jp->script, pc - 1);
-                todo = Sprint(&ss->sprinter, fmt, lval, xval,
-                              (sn && SN_TYPE(sn) == SRC_ASSIGNOP)
-                              ? js_CodeSpec[lastop].token
-                              : "",
-                              rval);
-                break;
-
-              case JSOP_GETELEM2:
-                op = JSOP_GETELEM;
-                (void) PopOff(ss, lastop);
-                /* FALL THROUGH */
-
-              case JSOP_GETELEM:
-                op = JSOP_NOP;           /* turn off parens */
-                xval = POP_STR();
-                op = JSOP_GETELEM;
-                lval = POP_STR();
-                if (*xval == '\0') {
-                    todo = Sprint(&ss->sprinter, "%s", lval);
-                } else {
-                    todo = Sprint(&ss->sprinter,
-                                  (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                                  ? "%s.%s"
-                                  : "%s[%s]",
-                                  lval, xval);
-                }
-                break;
-
-              case JSOP_SETELEM:
-                op = JSOP_NOP;           /* turn off parens */
-                rval = POP_STR();
-                xval = POP_STR();
-                op = JSOP_SETELEM;
-                lval = POP_STR();
-                if (*xval == '\0')
-                    goto do_setlval;
-                sn = js_GetSrcNote(jp->script, pc - 1);
-                todo = Sprint(&ss->sprinter,
-                              (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                              ? "%s.%s %s= %s"
-                              : "%s[%s] %s= %s",
-                              lval, xval,
-                              (sn && SN_TYPE(sn) == SRC_ASSIGNOP)
-                              ? js_CodeSpec[lastop].token
-                              : "",
-                              rval);
-                break;
-
-              case JSOP_ARGSUB:
-                i = (jsint) GET_ATOM_INDEX(pc);
-                todo = Sprint(&ss->sprinter, "%s[%d]",
-                              js_arguments_str, (int) i);
-                break;
-
-              case JSOP_ARGCNT:
-                todo = Sprint(&ss->sprinter, "%s.%s",
-                              js_arguments_str, js_length_str);
-                break;
-
-              case JSOP_GETARG:
-                atom = GetSlotAtom(jp, js_GetArgument, GET_ARGNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_name;
-
-              case JSOP_GETVAR:
-                atom = GetSlotAtom(jp, js_GetLocalVariable, GET_VARNO(pc));
-                LOCAL_ASSERT(atom);
-                goto do_name;
-
-              case JSOP_NAME:
-              case JSOP_GETGVAR:
-                atom = GET_ATOM(cx, jp->script, pc);
-              do_name:
-                sn = js_GetSrcNote(jp->script, pc);
-                rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!rval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, rval);
-                todo = Sprint(&ss->sprinter, "%s%s", VarPrefix(sn), rval);
-                break;
-
-              case JSOP_UINT16:
-                i = (jsint) GET_ATOM_INDEX(pc);
-                goto do_sprint_int;
-
-              case JSOP_UINT24:
-                i = (jsint) GET_LITERAL_INDEX(pc);
-              do_sprint_int:
-                todo = Sprint(&ss->sprinter, "%u", (unsigned) i);
-                break;
-
-              case JSOP_LITERAL:
-                atomIndex = GET_LITERAL_INDEX(pc);
-                goto do_JSOP_STRING;
-
-              case JSOP_FINDNAME:
-                atomIndex = GET_LITERAL_INDEX(pc);
-                todo = Sprint(&ss->sprinter, "");
-                if (todo < 0 || !PushOff(ss, todo, op))
-                    return JS_FALSE;
-                atom = js_GetAtom(cx, &jp->script->atomMap, atomIndex);
-                goto do_name;
-
-              case JSOP_LITOPX:
-                atomIndex = GET_LITERAL_INDEX(pc);
-                op = pc[1 + LITERAL_INDEX_LEN];
-                switch (op) {
-                  case JSOP_ANONFUNOBJ:   goto do_JSOP_ANONFUNOBJ;
-                  case JSOP_BINDNAME:     goto do_JSOP_BINDNAME;
-                  case JSOP_CLOSURE:      goto do_JSOP_CLOSURE;
-#if JS_HAS_EXPORT_IMPORT
-                  case JSOP_EXPORTNAME:   goto do_JSOP_EXPORTNAME;
-#endif
-#if JS_HAS_XML_SUPPORT
-                  case JSOP_GETMETHOD:    goto do_JSOP_GETMETHOD;
-                  case JSOP_SETMETHOD:    goto do_JSOP_SETMETHOD;
-#endif
-                  case JSOP_NAMEDFUNOBJ:  goto do_JSOP_NAMEDFUNOBJ;
-                  case JSOP_NUMBER:       goto do_JSOP_NUMBER;
-                  case JSOP_OBJECT:       goto do_JSOP_OBJECT;
-#if JS_HAS_XML_SUPPORT
-                  case JSOP_QNAMECONST:   goto do_JSOP_QNAMECONST;
-                  case JSOP_QNAMEPART:    goto do_JSOP_QNAMEPART;
-#endif
-                  case JSOP_REGEXP:       goto do_JSOP_REGEXP;
-                  case JSOP_SETCONST:     goto do_JSOP_SETCONST;
-                  case JSOP_STRING:       goto do_JSOP_STRING;
-#if JS_HAS_XML_SUPPORT
-                  case JSOP_XMLCDATA:     goto do_JSOP_XMLCDATA;
-                  case JSOP_XMLCOMMENT:   goto do_JSOP_XMLCOMMENT;
-                  case JSOP_XMLOBJECT:    goto do_JSOP_XMLOBJECT;
-                  case JSOP_XMLPI:        goto do_JSOP_XMLPI;
-#endif
-                  default:                JS_ASSERT(0);
-                }
-                /* NOTREACHED */
-                break;
-
-              BEGIN_LITOPX_CASE(JSOP_NUMBER)
-                val = ATOM_KEY(atom);
-                if (JSVAL_IS_INT(val)) {
-                    long ival = (long)JSVAL_TO_INT(val);
-                    todo = Sprint(&ss->sprinter, "%ld", ival);
-                } else {
-                    char buf[DTOSTR_STANDARD_BUFFER_SIZE];
-                    char *numStr = JS_dtostr(buf, sizeof buf, DTOSTR_STANDARD,
-                                             0, *JSVAL_TO_DOUBLE(val));
-                    if (!numStr) {
-                        JS_ReportOutOfMemory(cx);
-                        return JS_FALSE;
-                    }
-                    todo = Sprint(&ss->sprinter, numStr);
-                }
-              END_LITOPX_CASE
-
-              BEGIN_LITOPX_CASE(JSOP_STRING)
-                rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
-                                   inXML ? 0 : (jschar)'"');
-                if (!rval)
-                    return JS_FALSE;
-                todo = STR2OFF(&ss->sprinter, rval);
-              END_LITOPX_CASE
-
-              case JSOP_OBJECT:
-              case JSOP_REGEXP:
-              case JSOP_ANONFUNOBJ:
-              case JSOP_NAMEDFUNOBJ:
-                atomIndex = GET_ATOM_INDEX(pc);
-
-              do_JSOP_OBJECT:
-              do_JSOP_REGEXP:
-              do_JSOP_ANONFUNOBJ:
-              do_JSOP_NAMEDFUNOBJ:
-                atom = js_GetAtom(cx, &jp->script->atomMap, atomIndex);
-                if (op == JSOP_OBJECT || op == JSOP_REGEXP) {
-                    if (!js_regexp_toString(cx, ATOM_TO_OBJECT(atom), 0, NULL,
-                                            &val)) {
-                        return JS_FALSE;
-                    }
-                } else {
-                    if (!js_fun_toString(cx, ATOM_TO_OBJECT(atom),
-                                         (pc + len < endpc &&
-                                          pc[len] == JSOP_GROUP)
-                                         ? JS_IN_GROUP_CONTEXT |
-                                           JS_DONT_PRETTY_PRINT
-                                         : JS_DONT_PRETTY_PRINT,
-                                         0, NULL, &val)) {
-                        return JS_FALSE;
-                    }
-                }
-                str = JSVAL_TO_STRING(val);
-                todo = SprintPut(&ss->sprinter, JS_GetStringBytes(str),
-                                 JSSTRING_LENGTH(str));
-                break;
-
-#if JS_HAS_SWITCH_STATEMENT
-              case JSOP_TABLESWITCH:
-              case JSOP_TABLESWITCHX:
-              {
-                jsbytecode *pc2;
-                ptrdiff_t jmplen, off, off2;
-                jsint j, n, low, high;
-                TableEntry *table, pivot;
-
-                sn = js_GetSrcNote(jp->script, pc);
-                JS_ASSERT(sn && SN_TYPE(sn) == SRC_SWITCH);
-                len = js_GetSrcNoteOffset(sn, 0);
-                jmplen = (op == JSOP_TABLESWITCH) ? JUMP_OFFSET_LEN
-                                                  : JUMPX_OFFSET_LEN;
-                pc2 = pc;
-                off = GetJumpOffset(pc, pc2);
-                pc2 += jmplen;
-                low = GET_JUMP_OFFSET(pc2);
-                pc2 += JUMP_OFFSET_LEN;
-                high = GET_JUMP_OFFSET(pc2);
-                pc2 += JUMP_OFFSET_LEN;
-
-                n = high - low + 1;
-                if (n == 0) {
-                    table = NULL;
-                    j = 0;
-                } else {
-                    table = (TableEntry *)
-                            JS_malloc(cx, (size_t)n * sizeof *table);
-                    if (!table)
-                        return JS_FALSE;
-                    for (i = j = 0; i < n; i++) {
-                        table[j].label = NULL;
-                        off2 = GetJumpOffset(pc, pc2);
-                        if (off2) {
-                            sn = js_GetSrcNote(jp->script, pc2);
-                            if (sn) {
-                                JS_ASSERT(SN_TYPE(sn) == SRC_LABEL);
-                                table[j].label =
-                                    js_GetAtom(cx, &jp->script->atomMap,
-                                               (jsatomid)
-                                               js_GetSrcNoteOffset(sn, 0));
-                            }
-                            table[j].key = INT_TO_JSVAL(low + i);
-                            table[j].offset = off2;
-                            table[j].order = j;
-                            j++;
-                        }
-                        pc2 += jmplen;
-                    }
-                    js_HeapSort(table, (size_t) j, &pivot, sizeof(TableEntry),
-                                CompareOffsets, NULL);
-                }
-
-                ok = DecompileSwitch(ss, table, (uintN)j, pc, len, off,
-                                     JS_FALSE);
-                JS_free(cx, table);
-                if (!ok)
-                    return ok;
-                todo = -2;
-                break;
-              }
-
-              case JSOP_LOOKUPSWITCH:
-              case JSOP_LOOKUPSWITCHX:
-              {
-                jsbytecode *pc2;
-                ptrdiff_t jmplen, off, off2;
-                jsatomid npairs, k;
-                TableEntry *table;
-
-                sn = js_GetSrcNote(jp->script, pc);
-                JS_ASSERT(sn && SN_TYPE(sn) == SRC_SWITCH);
-                len = js_GetSrcNoteOffset(sn, 0);
-                jmplen = (op == JSOP_LOOKUPSWITCH) ? JUMP_OFFSET_LEN
-                                                   : JUMPX_OFFSET_LEN;
-                pc2 = pc;
-                off = GetJumpOffset(pc, pc2);
-                pc2 += jmplen;
-                npairs = GET_ATOM_INDEX(pc2);
-                pc2 += ATOM_INDEX_LEN;
-
-                table = (TableEntry *)
-                    JS_malloc(cx, (size_t)npairs * sizeof *table);
-                if (!table)
-                    return JS_FALSE;
-                for (k = 0; k < npairs; k++) {
-                    sn = js_GetSrcNote(jp->script, pc2);
-                    if (sn) {
-                        JS_ASSERT(SN_TYPE(sn) == SRC_LABEL);
-                        table[k].label =
-                            js_GetAtom(cx, &jp->script->atomMap, (jsatomid)
-                                       js_GetSrcNoteOffset(sn, 0));
-                    } else {
-                        table[k].label = NULL;
-                    }
-                    atom = GET_ATOM(cx, jp->script, pc2);
-                    pc2 += ATOM_INDEX_LEN;
-                    off2 = GetJumpOffset(pc, pc2);
-                    pc2 += jmplen;
-                    table[k].key = ATOM_KEY(atom);
-                    table[k].offset = off2;
-                }
-
-                ok = DecompileSwitch(ss, table, (uintN)npairs, pc, len, off,
-                                     JS_FALSE);
-                JS_free(cx, table);
-                if (!ok)
-                    return ok;
-                todo = -2;
-                break;
-              }
-
-              case JSOP_CONDSWITCH:
-              {
-                jsbytecode *pc2;
-                ptrdiff_t off, off2, caseOff;
-                jsint ncases;
-                TableEntry *table;
-
-                sn = js_GetSrcNote(jp->script, pc);
-                JS_ASSERT(sn && SN_TYPE(sn) == SRC_SWITCH);
-                len = js_GetSrcNoteOffset(sn, 0);
-                off = js_GetSrcNoteOffset(sn, 1);
-
-                /*
-                 * Count the cases using offsets from switch to first case,
-                 * and case to case, stored in srcnote immediates.
-                 */
-                pc2 = pc;
-                off2 = off;
-                for (ncases = 0; off2 != 0; ncases++) {
-                    pc2 += off2;
-                    JS_ASSERT(*pc2 == JSOP_CASE || *pc2 == JSOP_DEFAULT ||
-                              *pc2 == JSOP_CASEX || *pc2 == JSOP_DEFAULTX);
-                    if (*pc2 == JSOP_DEFAULT || *pc2 == JSOP_DEFAULTX) {
-                        /* End of cases, but count default as a case. */
-                        off2 = 0;
-                    } else {
-                        sn = js_GetSrcNote(jp->script, pc2);
-                        JS_ASSERT(sn && SN_TYPE(sn) == SRC_PCDELTA);
-                        off2 = js_GetSrcNoteOffset(sn, 0);
-                    }
-                }
-
-                /*
-                 * Allocate table and rescan the cases using their srcnotes,
-                 * stashing each case's delta from switch top in table[i].key,
-                 * and the distance to its statements in table[i].offset.
-                 */
-                table = (TableEntry *)
-                    JS_malloc(cx, (size_t)ncases * sizeof *table);
-                if (!table)
-                    return JS_FALSE;
-                pc2 = pc;
-                off2 = off;
-                for (i = 0; i < ncases; i++) {
-                    pc2 += off2;
-                    JS_ASSERT(*pc2 == JSOP_CASE || *pc2 == JSOP_DEFAULT ||
-                              *pc2 == JSOP_CASEX || *pc2 == JSOP_DEFAULTX);
-                    caseOff = pc2 - pc;
-                    table[i].key = INT_TO_JSVAL((jsint) caseOff);
-                    table[i].offset = caseOff + GetJumpOffset(pc2, pc2);
-                    if (*pc2 == JSOP_CASE || *pc2 == JSOP_CASEX) {
-                        sn = js_GetSrcNote(jp->script, pc2);
-                        JS_ASSERT(sn && SN_TYPE(sn) == SRC_PCDELTA);
-                        off2 = js_GetSrcNoteOffset(sn, 0);
-                    }
-                }
-
-                /*
-                 * Find offset of default code by fetching the default offset
-                 * from the end of table.  JSOP_CONDSWITCH always has a default
-                 * case at the end.
-                 */
-                off = JSVAL_TO_INT(table[ncases-1].key);
-                pc2 = pc + off;
-                off += GetJumpOffset(pc2, pc2);
-
-                ok = DecompileSwitch(ss, table, (uintN)ncases, pc, len, off,
-                                     JS_TRUE);
-                JS_free(cx, table);
-                if (!ok)
-                    return ok;
-                todo = -2;
-                break;
-              }
-
-              case JSOP_CASE:
-              case JSOP_CASEX:
-              {
-                lval = POP_STR();
-                if (!lval)
-                    return JS_FALSE;
-                js_printf(jp, "\tcase %s:\n", lval);
-                todo = -2;
-                break;
-              }
-
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-#if !JS_BUG_FALLIBLE_EQOPS
-              case JSOP_NEW_EQ:
-              case JSOP_NEW_NE:
-                rval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s %c%s %s",
-                              lval,
-                              (op == JSOP_NEW_EQ) ? '=' : '!',
-#if JS_HAS_TRIPLE_EQOPS
-                              JS_VERSION_IS_ECMA(cx) ? "==" :
-#endif
-                              "=",
-                              rval);
-                break;
-#endif
-
-#if JS_HAS_LEXICAL_CLOSURE
-              BEGIN_LITOPX_CASE(JSOP_CLOSURE)
-                JS_ASSERT(ATOM_IS_OBJECT(atom));
-                todo = -2;
-                goto do_function;
-              END_LITOPX_CASE
-#endif
-
-#if JS_HAS_EXPORT_IMPORT
-              case JSOP_EXPORTALL:
-                js_printf(jp, "\texport *\n");
-                todo = -2;
-                break;
-
-              BEGIN_LITOPX_CASE(JSOP_EXPORTNAME)
-                rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!rval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, rval);
-                js_printf(jp, "\texport %s\n", rval);
-                todo = -2;
-              END_LITOPX_CASE
-
-              case JSOP_IMPORTALL:
-                lval = POP_STR();
-                js_printf(jp, "\timport %s.*\n", lval);
-                todo = -2;
-                break;
-
-              case JSOP_IMPORTPROP:
-              do_importprop:
-                GET_ATOM_QUOTE_AND_FMT("\timport %s[%s]\n", "\timport %s.%s\n",
-                                       rval);
-                lval = POP_STR();
-                js_printf(jp, fmt, lval, rval);
-                todo = -2;
-                break;
-
-              case JSOP_IMPORTELEM:
-                xval = POP_STR();
-                op = JSOP_GETELEM;
-                if (js_CodeSpec[lastop].format & JOF_XMLNAME)
-                    goto do_importprop;
-                lval = POP_STR();
-                js_printf(jp, "\timport %s[%s]\n", lval, xval);
-                todo = -2;
-                break;
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-              case JSOP_TRAP:
-                op = JS_GetTrapOpcode(cx, jp->script, pc);
-                if (op == JSOP_LIMIT)
-                    return JS_FALSE;
-                *pc = op;
-                cs = &js_CodeSpec[op];
-                len = cs->length;
-                DECOMPILE_CODE(pc, len);
-                *pc = JSOP_TRAP;
-                todo = -2;
-                break;
-
-#if JS_HAS_INITIALIZERS
-              case JSOP_NEWINIT:
-                LOCAL_ASSERT(ss->top >= 2);
-                (void) PopOff(ss, op);
-                lval = POP_STR();
-#if JS_HAS_SHARP_VARS
-                op = (JSOp)pc[len];
-                if (op == JSOP_DEFSHARP) {
-                    pc += len;
-                    cs = &js_CodeSpec[op];
-                    len = cs->length;
-                    i = (jsint) GET_ATOM_INDEX(pc);
-                    todo = Sprint(&ss->sprinter, "#%u=%c",
-                                  (unsigned) i,
-                                  (*lval == 'O') ? '{' : '[');
-                } else
-#endif /* JS_HAS_SHARP_VARS */
-                {
-                    todo = Sprint(&ss->sprinter, (*lval == 'O') ? "{" : "[");
-                }
-                break;
-
-              case JSOP_ENDINIT:
-                rval = POP_STR();
-                sn = js_GetSrcNote(jp->script, pc);
-                todo = Sprint(&ss->sprinter, "%s%s%c",
-                              rval,
-                              (sn && SN_TYPE(sn) == SRC_CONTINUE) ? ", " : "",
-                              (*rval == '{') ? '}' : ']');
-                break;
-
-              case JSOP_INITPROP:
-                atom = GET_ATOM(cx, jp->script, pc);
-                xval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
-                                   (jschar)
-                                   (ATOM_IS_IDENTIFIER(atom) ? 0 : '\''));
-                if (!xval)
-                    return JS_FALSE;
-                rval = POP_STR();
-                lval = POP_STR();
-              do_initprop:
-#ifdef OLD_GETTER_SETTER
-                todo = Sprint(&ss->sprinter, "%s%s%s%s%s:%s",
-                              lval,
-                              (lval[1] != '\0') ? ", " : "",
-                              xval,
-                              (lastop == JSOP_GETTER || lastop == JSOP_SETTER)
-                              ? " " : "",
-                              (lastop == JSOP_GETTER) ? js_getter_str :
-                              (lastop == JSOP_SETTER) ? js_setter_str :
-                              "",
-                              rval);
-#else
-                if (lastop == JSOP_GETTER || lastop == JSOP_SETTER) {
-                    rval += strlen(js_function_str) + 1;
-                    todo = Sprint(&ss->sprinter, "%s%s%s %s%.*s",
-                                  lval,
-                                  (lval[1] != '\0') ? ", " : "",
-                                  (lastop == JSOP_GETTER)
-                                  ? js_get_str : js_set_str,
-                                  xval,
-                                  strlen(rval) - 1,
-                                  rval);
-                } else {
-                    todo = Sprint(&ss->sprinter, "%s%s%s:%s",
-                                  lval,
-                                  (lval[1] != '\0') ? ", " : "",
-                                  xval,
-                                  rval);
-                }
-#endif
-                break;
-
-              case JSOP_INITELEM:
-                rval = POP_STR();
-                xval = POP_STR();
-                lval = POP_STR();
-                sn = js_GetSrcNote(jp->script, pc);
-                if (sn && SN_TYPE(sn) == SRC_LABEL)
-                    goto do_initprop;
-                todo = Sprint(&ss->sprinter, "%s%s%s",
-                              lval,
-                              (lval[1] != '\0' || *xval != '0') ? ", " : "",
-                              rval);
-                break;
-
-#if JS_HAS_SHARP_VARS
-              case JSOP_DEFSHARP:
-                i = (jsint) GET_ATOM_INDEX(pc);
-                rval = POP_STR();
-                todo = Sprint(&ss->sprinter, "#%u=%s", (unsigned) i, rval);
-                break;
-
-              case JSOP_USESHARP:
-                i = (jsint) GET_ATOM_INDEX(pc);
-                todo = Sprint(&ss->sprinter, "#%u#", (unsigned) i);
-                break;
-#endif /* JS_HAS_SHARP_VARS */
-#endif /* JS_HAS_INITIALIZERS */
-
-#if JS_HAS_DEBUGGER_KEYWORD
-              case JSOP_DEBUGGER:
-                js_printf(jp, "\tdebugger;\n");
-                todo = -2;
-                break;
-#endif /* JS_HAS_DEBUGGER_KEYWORD */
-
-#if JS_HAS_XML_SUPPORT
-              case JSOP_STARTXML:
-              case JSOP_STARTXMLEXPR:
-                inXML = op == JSOP_STARTXML; 
-                todo = -2;
-                break;
-
-              case JSOP_DEFXMLNS:
-                rval = POP_STR();
-                js_printf(jp, "\t%s %s %s %s;\n",
-                          js_default_str, js_xml_str, js_namespace_str, rval);
-                todo = -2;
-                break;
-
-              case JSOP_ANYNAME:
-                todo = SprintPut(&ss->sprinter, "*", 1);
-                break;
-
-              BEGIN_LITOPX_CASE(JSOP_QNAMEPART)
-                goto do_name;
-              END_LITOPX_CASE
-
-              BEGIN_LITOPX_CASE(JSOP_QNAMECONST)
-                rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
-                if (!rval)
-                    return JS_FALSE;
-                RETRACT(&ss->sprinter, rval);
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s::%s", lval, rval);
-              END_LITOPX_CASE
-
-              case JSOP_QNAME:
-                rval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s::[%s]", lval, rval);
-                break;
-
-              case JSOP_TOATTRNAME:
-                rval = POP_STR();
-                todo = Sprint(&ss->sprinter, "@%s", rval);
-                break;
-
-              case JSOP_TOATTRVAL:
-                todo = -2;
-                break;
-
-              case JSOP_ADDATTRNAME:
-                rval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s %s", lval, rval);
-                /* This gets reset by all XML tag expressions. */
-                quoteAttr = JS_TRUE;
-                break;
-
-              case JSOP_ADDATTRVAL:
-                rval = POP_STR();
-                lval = POP_STR();
-                if (quoteAttr)
-                    todo = Sprint(&ss->sprinter, "%s=\"%s\"", lval, rval);
-                else
-                    todo = Sprint(&ss->sprinter, "%s=%s", lval, rval);
-                break;
-
-              case JSOP_BINDXMLNAME:
-                /* Leave the name stacked and push a dummy string. */
-                todo = Sprint(&ss->sprinter, "");
-                break;
-
-              case JSOP_SETXMLNAME:
-                /* Pop the r.h.s., the dummy string, and the name. */
-                rval = POP_STR();
-                (void) PopOff(ss, op);
-                lval = POP_STR();
-                goto do_setlval;
-
-              case JSOP_XMLELTEXPR:
-              case JSOP_XMLTAGEXPR:
-                todo = Sprint(&ss->sprinter, "{%s}", POP_STR());
-                inXML = JS_TRUE; 
-                /* If we're an attribute value, we shouldn't quote this. */
-                quoteAttr = JS_FALSE;
-                break;
-
-              case JSOP_TOXMLLIST:
-                todo = Sprint(&ss->sprinter, "<>%s</>", POP_STR());
-                inXML = JS_FALSE;
-                break;
-
-              case JSOP_FOREACH:
-                foreach = JS_TRUE;
-                todo = -2;
-                break;
-
-              case JSOP_TOXML:
-                inXML = JS_FALSE;
-                /* FALL THROUGH */
-
-              case JSOP_XMLNAME:
-              case JSOP_FILTER:
-                /* Conversion and prefix ops do nothing in the decompiler. */
-                todo = -2;
-                break;
-
-              case JSOP_ENDFILTER:
-                rval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s.(%s)", lval, rval);
-                break;
-
-              case JSOP_DESCENDANTS:
-                rval = POP_STR();
-                lval = POP_STR();
-                todo = Sprint(&ss->sprinter, "%s..%s", lval, rval);
-                break;
-
-              BEGIN_LITOPX_CASE(JSOP_XMLOBJECT)
-                atom = GET_ATOM(cx, jp->script, pc);
-                todo = Sprint(&ss->sprinter, "<xml address='%p'>",
-                              ATOM_TO_OBJECT(atom));
-              END_LITOPX_CASE
-
-              BEGIN_LITOPX_CASE(JSOP_XMLCDATA)
-                todo = SprintPut(&ss->sprinter, "<![CDATA[", 9);
-                if (!QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0))
-                    return JS_FALSE;
-                SprintPut(&ss->sprinter, "]]>", 3);
-              END_LITOPX_CASE
-
-              BEGIN_LITOPX_CASE(JSOP_XMLCOMMENT)
-                todo = SprintPut(&ss->sprinter, "<!--", 4);
-                if (!QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0))
-                    return JS_FALSE;
-                SprintPut(&ss->sprinter, "-->", 3);
-              END_LITOPX_CASE
-
-              BEGIN_LITOPX_CASE(JSOP_XMLPI)
-                rval = JS_strdup(cx, POP_STR());
-                if (!rval)
-                    return JS_FALSE;
-                todo = SprintPut(&ss->sprinter, "<?", 2);
-                ok = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0) &&
-                     SprintPut(&ss->sprinter, " ", 1) >= 0 &&
-                     SprintPut(&ss->sprinter, rval, strlen(rval));
-                JS_free(cx, (char *)rval);
-                if (!ok)
-                    return JS_FALSE;
-                SprintPut(&ss->sprinter, "?>", 2);
-              END_LITOPX_CASE
-
-              case JSOP_GETFUNNS:
-                todo = SprintPut(&ss->sprinter, js_function_str, 8);
-                break;
-#endif /* JS_HAS_XML_SUPPORT */
-
-              default:
-                todo = -2;
-                break;
-
-#undef BEGIN_LITOPX_CASE
-#undef END_LITOPX_CASE
-            }
-        }
-
-        if (todo < 0) {
-            /* -2 means "don't push", -1 means reported error. */
-            if (todo == -1)
-                return JS_FALSE;
-        } else {
-            if (!PushOff(ss, todo, op))
-                return JS_FALSE;
-        }
-        pc += len;
-    }
-
-/*
- * Undefine local macros.
- */
-#undef inXML
-#undef DECOMPILE_CODE
-#undef POP_STR
-#undef LOCAL_ASSERT
-#undef ATOM_IS_IDENTIFIER
-#undef GET_QUOTE_AND_FMT
-#undef GET_ATOM_QUOTE_AND_FMT
-
-    return JS_TRUE;
-}
-
-
-JSBool
-js_DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, uintN len)
-{
-    SprintStack ss;
-    JSContext *cx;
-    void *mark, *space;
-    size_t offsetsz, opcodesz;
-    JSBool ok;
-    JSScript *oldscript;
-    char *last;
-
-    /* Initialize a sprinter for use with the offset stack. */
-    ss.printer = jp;
-    cx = jp->sprinter.context;
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    INIT_SPRINTER(cx, &ss.sprinter, &cx->tempPool, PAREN_SLOP);
-
-    /* Allocate the parallel (to avoid padding) offset and opcode stacks. */
-    offsetsz = script->depth * sizeof(ptrdiff_t);
-    opcodesz = script->depth * sizeof(jsbytecode);
-    JS_ARENA_ALLOCATE(space, &cx->tempPool, offsetsz + opcodesz);
-    if (!space) {
-        ok = JS_FALSE;
-        goto out;
-    }
-    ss.offsets = (ptrdiff_t *) space;
-    ss.opcodes = (jsbytecode *) ((char *)space + offsetsz);
-    ss.top = 0;
-
-    /* Call recursive subroutine to do the hard work. */
-    oldscript = jp->script;
-    jp->script = script;
-    ok = Decompile(&ss, pc, len);
-    jp->script = oldscript;
-
-    /* If the given code didn't empty the stack, do it now. */
-    if (ss.top) {
-        do {
-            last = OFF2STR(&ss.sprinter, PopOff(&ss, JSOP_NOP));
-        } while (ss.top);
-        js_printf(jp, "%s", last);
-    }
-
-out:
-    /* Free all temporary stuff allocated under this call. */
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    return ok;
-}
-
-JSBool
-js_DecompileScript(JSPrinter *jp, JSScript *script)
-{
-    return js_DecompileCode(jp, script, script->code, (uintN)script->length);
-}
-
-static const char native_code_str[] = "\t[native code]\n";
-
-JSBool
-js_DecompileFunctionBody(JSPrinter *jp, JSFunction *fun)
-{
-    JSScript *script;
-    JSScope *scope, *save;
-    JSBool ok;
-
-    if (!fun->interpreted) {
-        js_printf(jp, native_code_str);
-        return JS_TRUE;
-    }
-    script = fun->u.script;
-    scope = fun->object ? OBJ_SCOPE(fun->object) : NULL;
-    save = jp->scope;
-    jp->scope = scope;
-    ok = js_DecompileCode(jp, script, script->code, (uintN)script->length);
-    jp->scope = save;
-    return ok;
-}
-
-JSBool
-js_DecompileFunction(JSPrinter *jp, JSFunction *fun)
-{
-    JSContext *cx;
-    uintN i, nargs, indent;
-    void *mark;
-    JSAtom **params;
-    JSScope *scope, *oldscope;
-    JSScopeProperty *sprop;
-    JSBool ok;
-
-    /*
-     * If pretty, conform to ECMA-262 Edition 3, 15.3.4.2, by decompiling a
-     * FunctionDeclaration.  Otherwise, check the JSFUN_LAMBDA flag and force
-     * an expression by parenthesizing.
-     */
-    if (jp->pretty) {
-        js_printf(jp, "\t");
-    } else {
-        if (!jp->grouped && (fun->flags & JSFUN_LAMBDA))
-            js_puts(jp, "(");
-    }
-    if (fun->flags & JSFUN_GETTER)
-        js_printf(jp, "%s ", js_getter_str);
-    else if (fun->flags & JSFUN_SETTER)
-        js_printf(jp, "%s ", js_setter_str);
-
-    js_printf(jp, "%s ", js_function_str);
-    if (fun->atom && !QuoteString(&jp->sprinter, ATOM_TO_STRING(fun->atom), 0))
-        return JS_FALSE;
-    js_puts(jp, "(");
-
-    if (fun->interpreted && fun->object) {
-        /*
-         * Print the parameters.
-         *
-         * This code is complicated by the need to handle duplicate parameter
-         * names, as required by ECMA (bah!).  A duplicate parameter is stored
-         * as another node with the same id (the parameter name) but different
-         * shortid (the argument index) along the property tree ancestor line
-         * starting at SCOPE_LAST_PROP(scope).  Only the last duplicate param
-         * is mapped by the scope's hash table.
-         */
-        cx = jp->sprinter.context;
-        nargs = fun->nargs;
-        mark = JS_ARENA_MARK(&cx->tempPool);
-        JS_ARENA_ALLOCATE_CAST(params, JSAtom **, &cx->tempPool,
-                               nargs * sizeof(JSAtom *));
-        if (!params) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-        scope = OBJ_SCOPE(fun->object);
-        for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-            if (sprop->getter != js_GetArgument)
-                continue;
-            JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
-            JS_ASSERT((uint16) sprop->shortid < nargs);
-            JS_ASSERT(JSID_IS_ATOM(sprop->id));
-            params[(uint16) sprop->shortid] = JSID_TO_ATOM(sprop->id);
-        }
-        for (i = 0; i < nargs; i++) {
-            if (i > 0)
-                js_puts(jp, ", ");
-            if (!QuoteString(&jp->sprinter, ATOM_TO_STRING(params[i]), 0))
-                return JS_FALSE;
-        }
-        JS_ARENA_RELEASE(&cx->tempPool, mark);
-#ifdef __GNUC__
-    } else {
-        scope = NULL;
-#endif
-    }
-
-    js_printf(jp, ") {\n");
-    indent = jp->indent;
-    jp->indent += 4;
-    if (fun->interpreted && fun->object) {
-        oldscope = jp->scope;
-        jp->scope = scope;
-        ok = js_DecompileScript(jp, fun->u.script);
-        jp->scope = oldscope;
-        if (!ok) {
-            jp->indent = indent;
-            return JS_FALSE;
-        }
-    } else {
-        js_printf(jp, native_code_str);
-    }
-    jp->indent -= 4;
-    js_printf(jp, "\t}");
-
-    if (!jp->pretty) {
-        if (!jp->grouped && (fun->flags & JSFUN_LAMBDA))
-            js_puts(jp, ")");
-    }
-    return JS_TRUE;
-}
-
-JSString *
-js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
-                           JSString *fallback)
-{
-    JSStackFrame *fp, *down;
-    jsbytecode *pc, *begin, *end, *tmp;
-    jsval *sp, *base, *limit;
-    JSScript *script;
-    JSOp op;
-    const JSCodeSpec *cs;
-    uint32 format, mode, type;
-    intN depth;
-    jssrcnote *sn;
-    uintN len, off;
-    JSPrinter *jp;
-    JSString *name;
-
-    for (fp = cx->fp; fp && !fp->script; fp = fp->down)
-        continue;
-    if (!fp)
-        goto do_fallback;
-
-    /* Try to find sp's generating pc depth slots under it on the stack. */
-    pc = fp->pc;
-    if (spindex == JSDVG_SEARCH_STACK) {
-        if (!pc) {
-            /*
-             * Current frame is native: look under it for a scripted call
-             * in which a decompilable bytecode string that generated the
-             * value as an actual argument might exist.
-             */
-            JS_ASSERT(!fp->script && !(fp->fun && fp->fun->interpreted));
-            down = fp->down;
-            if (!down)
-                goto do_fallback;
-            script = down->script;
-            base = fp->argv;
-            limit = base + fp->argc;
-        } else {
-            /*
-             * This should be a script activation, either a top-level
-             * script or a scripted function.  But be paranoid about calls
-             * to js_DecompileValueGenerator from code that hasn't fully
-             * initialized a (default-all-zeroes) frame.
-             */
-            script = fp->script;
-            base = fp->spbase;
-            limit = fp->sp;
-        }
-
-        /*
-         * Pure paranoia about default-zeroed frames being active while
-         * js_DecompileValueGenerator is called.  It can't hurt much now;
-         * error reporting performance is not an issue.
-         */
-        if (!script || !base || !limit)
-            goto do_fallback;
-
-        /*
-         * Try to find operand-generating pc depth slots below sp.
-         *
-         * In the native case, we know the arguments have generating pc's
-         * under them, on account of fp->down->script being non-null: all
-         * compiled scripts get depth slots for generating pc's allocated
-         * upon activation, at the top of js_Interpret.
-         *
-         * In the script or scripted function case, the same reasoning
-         * applies to fp rather than to fp->down.
-         */
-        for (sp = base; sp < limit; sp++) {
-            if (*sp == v) {
-                depth = (intN)script->depth;
-                pc = (jsbytecode *) sp[-depth];
-                break;
-            }
-        }
-    } else {
-        /*
-         * At this point, pc may or may not be null, i.e., we could be in
-         * a script activation, or we could be in a native frame that was
-         * called by another native function.  Check pc and script.
-         */
-        if (!pc)
-            goto do_fallback;
-        script = fp->script;
-        if (!script)
-            goto do_fallback;
-
-        if (spindex != JSDVG_IGNORE_STACK) {
-            JS_ASSERT(spindex < 0);
-            depth = (intN)script->depth;
-#if !JS_HAS_NO_SUCH_METHOD
-            JS_ASSERT(-depth <= spindex);
-#endif
-            spindex -= depth;
-
-            base = (jsval *) cx->stackPool.current->base;
-            limit = (jsval *) cx->stackPool.current->avail;
-            sp = fp->sp + spindex;
-            if (JS_UPTRDIFF(sp, base) < JS_UPTRDIFF(limit, base))
-                pc = (jsbytecode *) *sp;
-        }
-    }
-
-    /*
-     * Again, be paranoid, this time about possibly loading an invalid pc
-     * from sp[-(1+depth)].
-     */
-    if (JS_UPTRDIFF(pc, script->code) >= (jsuword)script->length) {
-        pc = fp->pc;
-        if (!pc)
-            goto do_fallback;
-    }
-    op = (JSOp) *pc;
-    if (op == JSOP_TRAP)
-        op = JS_GetTrapOpcode(cx, script, pc);
-
-    /* XXX handle null as a special case, to avoid calling null "object" */
-    if (op == JSOP_NULL)
-        return ATOM_TO_STRING(cx->runtime->atomState.nullAtom);
-
-    cs = &js_CodeSpec[op];
-    format = cs->format;
-    mode = (format & JOF_MODEMASK);
-
-    /* NAME ops are self-contained, but others require left context. */
-    if (mode == JOF_NAME) {
-        begin = pc;
-    } else {
-        sn = js_GetSrcNote(script, pc);
-        if (!sn || (SN_TYPE(sn) != SRC_PCBASE && SN_TYPE(sn) != SRC_PCDELTA)) {
-            if (cs->token)
-                return JS_NewStringCopyZ(cx, cs->token);
-            goto do_fallback;
-        }
-        begin = pc - js_GetSrcNoteOffset(sn, 0);
-    }
-    end = pc + cs->length;
-    len = PTRDIFF(end, begin, jsbytecode);
-
-    if (format & (JOF_SET | JOF_DEL | JOF_INCDEC | JOF_IMPORT | JOF_FOR)) {
-        tmp = (jsbytecode *) JS_malloc(cx, len * sizeof(jsbytecode));
-        if (!tmp)
-            return NULL;
-        memcpy(tmp, begin, len * sizeof(jsbytecode));
-        if (mode == JOF_NAME) {
-            /*
-             * JOF_NAME does not imply JOF_CONST, so we must check for the
-             * QARG and QVAR format types and translate those to JSOP_GETARG
-             * or JSOP_GETVAR appropriately, instead of JSOP_NAME.
-             */
-            type = format & JOF_TYPEMASK;
-            tmp[0] = (type == JOF_QARG)
-                     ? JSOP_GETARG
-                     : (type == JOF_QVAR)
-                     ? JSOP_GETVAR
-                     : JSOP_NAME;
-        } else {
-            /*
-             * We must replace the faulting pc's bytecode with a corresponding
-             * JSOP_GET* code.  For JSOP_SET{PROP,ELEM}, we must use the "2nd"
-             * form of JSOP_GET{PROP,ELEM}, to throw away the assignment op's
-             * right-hand operand and decompile it as if it were a GET of its
-             * left-hand operand.
-             */
-            off = len - cs->length;
-            JS_ASSERT(off == (uintN) PTRDIFF(pc, begin, jsbytecode));
-            if (mode == JOF_PROP) {
-                tmp[off] = (format & JOF_SET) ? JSOP_GETPROP2 : JSOP_GETPROP;
-            } else if (mode == JOF_ELEM) {
-                tmp[off] = (format & JOF_SET) ? JSOP_GETELEM2 : JSOP_GETELEM;
-            } else {
-                /*
-                 * A zero mode means precisely that op is uncategorized for our
-                 * purposes, so we must write per-op special case code here.
-                 */
-                switch (op) {
-                  case JSOP_ENUMELEM:
-                    tmp[off] = JSOP_GETELEM;
-                    break;
-#if JS_HAS_LVALUE_RETURN
-                  case JSOP_SETCALL:
-                    tmp[off] = JSOP_CALL;
-                    break;
-#endif
-                  default:
-                    JS_ASSERT(0);
-                }
-            }
-        }
-        begin = tmp;
-    } else {
-        /* No need to revise script bytecode. */
-        tmp = NULL;
-    }
-
-    name = NULL;
-    jp = js_NewPrinter(cx, "js_DecompileValueGenerator", 0, JS_FALSE);
-    if (jp) {
-       if (fp->fun && fp->fun->object) {
-           JS_ASSERT(OBJ_IS_NATIVE(fp->fun->object));
-           jp->scope = OBJ_SCOPE(fp->fun->object);
-        }
-        if (js_DecompileCode(jp, script, begin, len))
-            name = js_GetPrinterOutput(jp);
-        js_DestroyPrinter(jp);
-    }
-    if (tmp)
-        JS_free(cx, tmp);
-    return name;
-
-  do_fallback:
-    return fallback ? fallback : js_ValueToString(cx, v);
-}
diff --git a/libs/js/src/jsopcode.h b/libs/js/src/jsopcode.h
deleted file mode 100644
index 2a488f6eb6..0000000000
--- a/libs/js/src/jsopcode.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsopcode_h___
-#define jsopcode_h___
-/*
- * JS bytecode definitions.
- */
-#include <stddef.h>
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * JS operation bytecodes.
- */
-typedef enum JSOp {
-#define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
-    op = val,
-#include "jsopcode.tbl"
-#undef OPDEF
-    JSOP_LIMIT
-} JSOp;
-
-/*
- * JS bytecode formats.
- */
-#define JOF_BYTE          0       /* single bytecode, no immediates */
-#define JOF_JUMP          1       /* signed 16-bit jump offset immediate */
-#define JOF_CONST         2       /* unsigned 16-bit constant pool index */
-#define JOF_UINT16        3       /* unsigned 16-bit immediate operand */
-#define JOF_TABLESWITCH   4       /* table switch */
-#define JOF_LOOKUPSWITCH  5       /* lookup switch */
-#define JOF_QARG          6       /* quickened get/set function argument ops */
-#define JOF_QVAR          7       /* quickened get/set local variable ops */
-#define JOF_INDEXCONST    8       /* arg or var index + constant pool index */
-#define JOF_JUMPX         9       /* signed 32-bit jump offset immediate */
-#define JOF_TABLESWITCHX  10      /* extended (32-bit offset) table switch */
-#define JOF_LOOKUPSWITCHX 11      /* extended (32-bit offset) lookup switch */
-#define JOF_UINT24        12      /* extended unsigned 24-bit literal (index) */
-#define JOF_LITOPX        13      /* JOF_UINT24 followed by op being extended,
-                                     where op if JOF_CONST has no unsigned 16-
-                                     bit immediate operand */
-#define JOF_TYPEMASK      0x000f  /* mask for above immediate types */
-#define JOF_NAME          0x0010  /* name operation */
-#define JOF_PROP          0x0020  /* obj.prop operation */
-#define JOF_ELEM          0x0030  /* obj[index] operation */
-#define JOF_MODEMASK      0x0030  /* mask for above addressing modes */
-#define JOF_SET           0x0040  /* set (i.e., assignment) operation */
-#define JOF_DEL           0x0080  /* delete operation */
-#define JOF_DEC           0x0100  /* decrement (--, not ++) opcode */
-#define JOF_INC           0x0200  /* increment (++, not --) opcode */
-#define JOF_INCDEC        0x0300  /* increment or decrement opcode */
-#define JOF_POST          0x0400  /* postorder increment or decrement */
-#define JOF_IMPORT        0x0800  /* import property op */
-#define JOF_FOR           0x1000  /* for-in property op */
-#define JOF_ASSIGNING     JOF_SET /* hint for JSClass.resolve, used for ops
-                                     that do simplex assignment */
-#define JOF_DETECTING     0x2000  /* object detection flag for JSNewResolveOp */
-#define JOF_BACKPATCH     0x4000  /* backpatch placeholder during codegen */
-#define JOF_LEFTASSOC     0x8000  /* left-associative operator */
-#define JOF_DECLARING    0x10000  /* var, const, or function declaration op */
-#define JOF_XMLNAME      0x20000  /* XML name: *, a::b, @a, @a::b, etc. */
-
-#define JOF_TYPE_IS_EXTENDED_JUMP(t) \
-    ((unsigned)((t) - JOF_JUMPX) <= (unsigned)(JOF_LOOKUPSWITCHX - JOF_JUMPX))
-
-/*
- * Immediate operand getters, setters, and bounds.
- */
-
-/* Short (2-byte signed offset) relative jump macros. */
-#define JUMP_OFFSET_LEN         2
-#define JUMP_OFFSET_HI(off)     ((jsbytecode)((off) >> 8))
-#define JUMP_OFFSET_LO(off)     ((jsbytecode)(off))
-#define GET_JUMP_OFFSET(pc)     ((int16)(((pc)[1] << 8) | (pc)[2]))
-#define SET_JUMP_OFFSET(pc,off) ((pc)[1] = JUMP_OFFSET_HI(off),               \
-                                 (pc)[2] = JUMP_OFFSET_LO(off))
-#define JUMP_OFFSET_MIN         ((int16)0x8000)
-#define JUMP_OFFSET_MAX         ((int16)0x7fff)
-
-/*
- * When a short jump won't hold a relative offset, its 2-byte immediate offset
- * operand is an unsigned index of a span-dependency record, maintained until
- * code generation finishes -- after which some (but we hope not nearly all)
- * span-dependent jumps must be extended (see OptimizeSpanDeps in jsemit.c).
- *
- * If the span-dependency record index overflows SPANDEP_INDEX_MAX, the jump
- * offset will contain SPANDEP_INDEX_HUGE, indicating that the record must be
- * found (via binary search) by its "before span-dependency optimization" pc
- * offset (from script main entry point).
- */
-#define GET_SPANDEP_INDEX(pc)   ((uint16)(((pc)[1] << 8) | (pc)[2]))
-#define SET_SPANDEP_INDEX(pc,i) ((pc)[1] = JUMP_OFFSET_HI(i),                 \
-                                 (pc)[2] = JUMP_OFFSET_LO(i))
-#define SPANDEP_INDEX_MAX       ((uint16)0xfffe)
-#define SPANDEP_INDEX_HUGE      ((uint16)0xffff)
-
-/* Ultimately, if short jumps won't do, emit long (4-byte signed) offsets. */
-#define JUMPX_OFFSET_LEN        4
-#define JUMPX_OFFSET_B3(off)    ((jsbytecode)((off) >> 24))
-#define JUMPX_OFFSET_B2(off)    ((jsbytecode)((off) >> 16))
-#define JUMPX_OFFSET_B1(off)    ((jsbytecode)((off) >> 8))
-#define JUMPX_OFFSET_B0(off)    ((jsbytecode)(off))
-#define GET_JUMPX_OFFSET(pc)    ((int32)(((pc)[1] << 24) | ((pc)[2] << 16)    \
-                                         | ((pc)[3] << 8) | (pc)[4]))
-#define SET_JUMPX_OFFSET(pc,off)((pc)[1] = JUMPX_OFFSET_B3(off),              \
-                                 (pc)[2] = JUMPX_OFFSET_B2(off),              \
-                                 (pc)[3] = JUMPX_OFFSET_B1(off),              \
-                                 (pc)[4] = JUMPX_OFFSET_B0(off))
-#define JUMPX_OFFSET_MIN        ((int32)0x80000000)
-#define JUMPX_OFFSET_MAX        ((int32)0x7fffffff)
-
-/*
- * A literal is indexed by a per-script atom map.  Most scripts have relatively
- * few literals, so the standard JOF_CONST format specifies a fixed 16 bits of
- * immediate operand index.  A script with more than 64K literals must push all
- * high-indexed literals on the stack using JSOP_LITERAL, then use JOF_ELEM ops
- * instead of JOF_PROP, etc.
- */
-#define ATOM_INDEX_LEN          2
-#define ATOM_INDEX_HI(i)        ((jsbytecode)((i) >> 8))
-#define ATOM_INDEX_LO(i)        ((jsbytecode)(i))
-#define GET_ATOM_INDEX(pc)      ((jsatomid)(((pc)[1] << 8) | (pc)[2]))
-#define SET_ATOM_INDEX(pc,i)    ((pc)[1] = ATOM_INDEX_HI(i),                  \
-                                 (pc)[2] = ATOM_INDEX_LO(i))
-#define GET_ATOM(cx,script,pc)  js_GetAtom((cx), &(script)->atomMap,          \
-                                           GET_ATOM_INDEX(pc))
-
-/* A full atom index for JSOP_LITERAL uses 24 bits of immediate operand. */
-#define LITERAL_INDEX_LEN       3
-#define LITERAL_INDEX_HI(i)     ((jsbytecode)((i) >> 16))
-#define LITERAL_INDEX_MID(i)    ((jsbytecode)((i) >> 8))
-#define LITERAL_INDEX_LO(i)     ((jsbytecode)(i))
-#define GET_LITERAL_INDEX(pc)   ((jsatomid)(((pc)[1] << 16) |                 \
-                                            ((pc)[2] << 8) |                  \
-                                            (pc)[3]))
-#define SET_LITERAL_INDEX(pc,i) ((pc)[1] = LITERAL_INDEX_HI(i),               \
-                                 (pc)[2] = LITERAL_INDEX_MID(i),              \
-                                 (pc)[3] = LITERAL_INDEX_LO(i))
-
-/* Atom index limit is determined by SN_3BYTE_OFFSET_FLAG, see jsemit.h. */
-#define ATOM_INDEX_LIMIT_LOG2   23
-#define ATOM_INDEX_LIMIT        ((uint32)1 << ATOM_INDEX_LIMIT_LOG2)
-
-/* Actual argument count operand format helpers. */
-#define ARGC_HI(argc)           ((jsbytecode)((argc) >> 8))
-#define ARGC_LO(argc)           ((jsbytecode)(argc))
-#define GET_ARGC(pc)            ((uintN)(((pc)[1] << 8) | (pc)[2]))
-#define ARGC_LIMIT              ((uint32)1 << 16)
-
-/* Synonyms for quick JOF_QARG and JOF_QVAR bytecodes. */
-#define GET_ARGNO(pc)           GET_ARGC(pc)
-#define SET_ARGNO(pc,argno)     SET_JUMP_OFFSET(pc,argno)
-#define ARGNO_LEN               JUMP_OFFSET_LEN
-#define GET_VARNO(pc)           GET_ARGC(pc)
-#define SET_VARNO(pc,varno)     SET_JUMP_OFFSET(pc,varno)
-#define VARNO_LEN               JUMP_OFFSET_LEN
-
-struct JSCodeSpec {
-    const char          *name;          /* JS bytecode name */
-    const char          *token;         /* JS source literal or null */
-    int8                length;         /* length including opcode byte */
-    int8                nuses;          /* arity, -1 if variadic */
-    int8                ndefs;          /* number of stack results */
-    uint8               prec;           /* operator precedence */
-    uint32              format;         /* immediate operand format */
-};
-
-extern const char       js_const_str[];
-extern const char       js_var_str[];
-extern const char       js_function_str[];
-extern const char       js_in_str[];
-extern const char       js_instanceof_str[];
-extern const char       js_new_str[];
-extern const char       js_delete_str[];
-extern const char       js_typeof_str[];
-extern const char       js_void_str[];
-extern const char       js_null_str[];
-extern const char       js_this_str[];
-extern const char       js_false_str[];
-extern const char       js_true_str[];
-extern const char       js_default_str[];
-extern const JSCodeSpec js_CodeSpec[];
-extern uintN            js_NumCodeSpecs;
-extern const jschar     js_EscapeMap[];
-
-/*
- * Return a GC'ed string containing the chars in str, with any non-printing
- * chars or quotes (' or " as specified by the quote argument) escaped, and
- * with the quote character at the beginning and end of the result string.
- */
-extern JSString *
-js_QuoteString(JSContext *cx, JSString *str, jschar quote);
-
-/*
- * JSPrinter operations, for printf style message formatting.  The return
- * value from js_GetPrinterOutput() is the printer's cumulative output, in
- * a GC'ed string.
- */
-extern JSPrinter *
-js_NewPrinter(JSContext *cx, const char *name, uintN indent, JSBool pretty);
-
-extern void
-js_DestroyPrinter(JSPrinter *jp);
-
-extern JSString *
-js_GetPrinterOutput(JSPrinter *jp);
-
-extern int
-js_printf(JSPrinter *jp, const char *format, ...);
-
-extern JSBool
-js_puts(JSPrinter *jp, const char *s);
-
-#ifdef DEBUG
-/*
- * Disassemblers, for debugging only.
- */
-#include <stdio.h>
-
-extern JS_FRIEND_API(JSBool)
-js_Disassemble(JSContext *cx, JSScript *script, JSBool lines, FILE *fp);
-
-extern JS_FRIEND_API(uintN)
-js_Disassemble1(JSContext *cx, JSScript *script, jsbytecode *pc, uintN loc,
-                JSBool lines, FILE *fp);
-#endif /* DEBUG */
-
-/*
- * Decompilers, for script, function, and expression pretty-printing.
- */
-extern JSBool
-js_DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, uintN len);
-
-extern JSBool
-js_DecompileScript(JSPrinter *jp, JSScript *script);
-
-extern JSBool
-js_DecompileFunctionBody(JSPrinter *jp, JSFunction *fun);
-
-extern JSBool
-js_DecompileFunction(JSPrinter *jp, JSFunction *fun);
-
-/*
- * Find the source expression that resulted in v, and return a new string
- * containing it.  Fall back on v's string conversion (fallback) if we can't
- * find the bytecode that generated and pushed v on the operand stack.
- *
- * Search the current stack frame if spindex is JSDVG_SEARCH_STACK.  Don't
- * look for v on the stack if spindex is JSDVG_IGNORE_STACK.  Otherwise,
- * spindex is the negative index of v, measured from cx->fp->sp, or from a
- * lower frame's sp if cx->fp is native.
- */
-extern JSString *
-js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
-                           JSString *fallback);
-
-#define JSDVG_IGNORE_STACK      0
-#define JSDVG_SEARCH_STACK      1
-
-JS_END_EXTERN_C
-
-#endif /* jsopcode_h___ */
diff --git a/libs/js/src/jsopcode.tbl b/libs/js/src/jsopcode.tbl
deleted file mode 100644
index dfca83518f..0000000000
--- a/libs/js/src/jsopcode.tbl
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JavaScript operation bytecodes.  If you need to allocate a bytecode, look
- * for a name of the form JSOP_UNUSED* and claim it.  Otherwise, always add at
- * the end of the table.
- *
- * Includers must define an OPDEF macro of the following form:
- *
- * #define OPDEF(op,val,name,image,length,nuses,ndefs,prec,format) ...
- *
- * Selected arguments can be expanded in initializers.  The op argument is
- * expanded followed by comma in the JSOp enum (jsopcode.h), e.g.  The value
- * field must be dense for now, because jsopcode.c uses an OPDEF() expansion
- * inside the js_CodeSpec[] initializer.
- *
- * Field        Description
- * op           Bytecode name, which is the JSOp enumerator name
- * value        Bytecode value, which is the JSOp enumerator value
- * name         C string containing name for disassembler
- * image        C string containing "image" for pretty-printer, null if ugly
- * length       Number of bytes including any immediate operands
- * nuses        Number of stack slots consumed by bytecode, -1 if variadic
- * ndefs        Number of stack slots produced by bytecode
- * prec         Operator precedence, zero if not an operator
- * format       Bytecode plus immediate operand encoding format
- *
- * This file is best viewed with 128 columns:
-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678
- */
-
-/* legend: op         val name          image       len use def prec  format */
-
-/* Longstanding JavaScript bytecodes. */
-OPDEF(JSOP_NOP,       0,  "nop",        NULL,         1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_PUSH,      1,  "push",       NULL,         1,  0,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_POPV,      2,  "popv",       NULL,         1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_ENTERWITH, 3,  "enterwith",  NULL,         1,  1,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_LEAVEWITH, 4,  "leavewith",  NULL,         1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_RETURN,    5,  "return",     NULL,         1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_GOTO,      6,  "goto",       NULL,         3,  0,  0,  0,  JOF_JUMP)
-OPDEF(JSOP_IFEQ,      7,  "ifeq",       NULL,         3,  1,  0,  0,  JOF_JUMP|JOF_DETECTING)
-OPDEF(JSOP_IFNE,      8,  "ifne",       NULL,         3,  1,  0,  0,  JOF_JUMP)
-
-/* Get the arguments object for the current, lightweight function activation. */
-OPDEF(JSOP_ARGUMENTS, 9, js_arguments_str, js_arguments_str, 1, 0, 1, 12, JOF_BYTE)
-
-/* ECMA-compliant for-in loop with argument or local variable loop control. */
-OPDEF(JSOP_FORARG,    10, "forarg",     NULL,         3,  0,  1,  0,  JOF_QARG|JOF_NAME|JOF_FOR)
-OPDEF(JSOP_FORVAR,    11, "forvar",     NULL,         3,  0,  1,  0,  JOF_QVAR|JOF_NAME|JOF_FOR)
-
-/* More longstanding bytecodes. */
-OPDEF(JSOP_DUP,       12, "dup",        NULL,         1,  1,  2,  0,  JOF_BYTE)
-OPDEF(JSOP_DUP2,      13, "dup2",       NULL,         1,  2,  4,  0,  JOF_BYTE)
-OPDEF(JSOP_SETCONST,  14, "setconst",   NULL,         3,  1,  1,  1,  JOF_CONST|JOF_NAME|JOF_SET|JOF_ASSIGNING)
-OPDEF(JSOP_BITOR,     15, "bitor",      "|",          1,  2,  1,  2,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_BITXOR,    16, "bitxor",     "^",          1,  2,  1,  3,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_BITAND,    17, "bitand",     "&",          1,  2,  1,  4,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_EQ,        18, "eq",         "==",         1,  2,  1,  5,  JOF_BYTE|JOF_LEFTASSOC|JOF_DETECTING)
-OPDEF(JSOP_NE,        19, "ne",         "!=",         1,  2,  1,  5,  JOF_BYTE|JOF_LEFTASSOC|JOF_DETECTING)
-OPDEF(JSOP_LT,        20, "lt",         "<",          1,  2,  1,  6,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_LE,        21, "le",         "<=",         1,  2,  1,  6,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_GT,        22, "gt",         ">",          1,  2,  1,  6,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_GE,        23, "ge",         ">=",         1,  2,  1,  6,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_LSH,       24, "lsh",        "<<",         1,  2,  1,  7,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_RSH,       25, "rsh",        ">>",         1,  2,  1,  7,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_URSH,      26, "ursh",       ">>>",        1,  2,  1,  7,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_ADD,       27, "add",        "+",          1,  2,  1,  8,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_SUB,       28, "sub",        "-",          1,  2,  1,  8,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_MUL,       29, "mul",        "*",          1,  2,  1,  9,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_DIV,       30, "div",        "/",          1,  2,  1,  9,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_MOD,       31, "mod",        "%",          1,  2,  1,  9,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_NOT,       32, "not",        "!",          1,  1,  1, 10,  JOF_BYTE|JOF_DETECTING)
-OPDEF(JSOP_BITNOT,    33, "bitnot",     "~",          1,  1,  1, 10,  JOF_BYTE)
-OPDEF(JSOP_NEG,       34, "neg",        "-",          1,  1,  1, 10,  JOF_BYTE)
-OPDEF(JSOP_NEW,       35, js_new_str,   NULL,         3, -1,  1, 10,  JOF_UINT16)
-OPDEF(JSOP_DELNAME,   36, "delname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEL)
-OPDEF(JSOP_DELPROP,   37, "delprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEL)
-OPDEF(JSOP_DELELEM,   38, "delelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEL)
-OPDEF(JSOP_TYPEOF,    39, js_typeof_str,NULL,         1,  1,  1, 10,  JOF_BYTE|JOF_DETECTING)
-OPDEF(JSOP_VOID,      40, js_void_str,  NULL,         1,  1,  1, 10,  JOF_BYTE)
-OPDEF(JSOP_INCNAME,   41, "incname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC)
-OPDEF(JSOP_INCPROP,   42, "incprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_INC)
-OPDEF(JSOP_INCELEM,   43, "incelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_INC)
-OPDEF(JSOP_DECNAME,   44, "decname",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC)
-OPDEF(JSOP_DECPROP,   45, "decprop",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEC)
-OPDEF(JSOP_DECELEM,   46, "decelem",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEC)
-OPDEF(JSOP_NAMEINC,   47, "nameinc",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC|JOF_POST)
-OPDEF(JSOP_PROPINC,   48, "propinc",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_INC|JOF_POST)
-OPDEF(JSOP_ELEMINC,   49, "eleminc",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_INC|JOF_POST)
-OPDEF(JSOP_NAMEDEC,   50, "namedec",    NULL,         3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC|JOF_POST)
-OPDEF(JSOP_PROPDEC,   51, "propdec",    NULL,         3,  1,  1, 10,  JOF_CONST|JOF_PROP|JOF_DEC|JOF_POST)
-OPDEF(JSOP_ELEMDEC,   52, "elemdec",    NULL,         1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEC|JOF_POST)
-OPDEF(JSOP_GETPROP,   53, "getprop",    NULL,         3,  1,  1, 11,  JOF_CONST|JOF_PROP)
-OPDEF(JSOP_SETPROP,   54, "setprop",    NULL,         3,  2,  1,  1,  JOF_CONST|JOF_PROP|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-OPDEF(JSOP_GETELEM,   55, "getelem",    NULL,         1,  2,  1, 11,  JOF_BYTE |JOF_ELEM|JOF_LEFTASSOC)
-OPDEF(JSOP_SETELEM,   56, "setelem",    NULL,         1,  3,  1,  1,  JOF_BYTE |JOF_ELEM|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-OPDEF(JSOP_PUSHOBJ,   57, "pushobj",    NULL,         1,  0,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_CALL,      58, "call",       NULL,         3, -1,  1, 11,  JOF_UINT16)
-OPDEF(JSOP_NAME,      59, "name",       NULL,         3,  0,  1, 12,  JOF_CONST|JOF_NAME)
-OPDEF(JSOP_NUMBER,    60, "number",     NULL,         3,  0,  1, 12,  JOF_CONST)
-OPDEF(JSOP_STRING,    61, "string",     NULL,         3,  0,  1, 12,  JOF_CONST)
-OPDEF(JSOP_ZERO,      62, "zero",       "0",          1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_ONE,       63, "one",        "1",          1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_NULL,      64, js_null_str,  js_null_str,  1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_THIS,      65, js_this_str,  js_this_str,  1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_FALSE,     66, js_false_str, js_false_str, 1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_TRUE,      67, js_true_str,  js_true_str,  1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_OR,        68, "or",         NULL,         3,  1,  0,  0,  JOF_JUMP|JOF_DETECTING)
-OPDEF(JSOP_AND,       69, "and",        NULL,         3,  1,  0,  0,  JOF_JUMP|JOF_DETECTING)
-
-/* The switch bytecodes have variable length. */
-OPDEF(JSOP_TABLESWITCH,  70, "tableswitch",  NULL,   -1,  1,  0,  0,  JOF_TABLESWITCH|JOF_DETECTING)
-OPDEF(JSOP_LOOKUPSWITCH, 71, "lookupswitch", NULL,   -1,  1,  0,  0,  JOF_LOOKUPSWITCH|JOF_DETECTING)
-
-/* New, infallible/transitive identity ops. */
-OPDEF(JSOP_NEW_EQ,    72, "eq",         NULL,         1,  2,  1,  5,  JOF_BYTE|JOF_DETECTING)
-OPDEF(JSOP_NEW_NE,    73, "ne",         NULL,         1,  2,  1,  5,  JOF_BYTE|JOF_DETECTING)
-
-/* Lexical closure constructor. */
-OPDEF(JSOP_CLOSURE,   74, "closure",    NULL,         3,  0,  0,  0,  JOF_CONST)
-
-/* Export and import ops. */
-OPDEF(JSOP_EXPORTALL, 75, "exportall",  NULL,         1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_EXPORTNAME,76, "exportname", NULL,         3,  0,  0,  0,  JOF_CONST|JOF_NAME)
-OPDEF(JSOP_IMPORTALL, 77, "importall",  NULL,         1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_IMPORTPROP,78, "importprop", NULL,         3,  1,  0,  0,  JOF_CONST|JOF_PROP|JOF_IMPORT)
-OPDEF(JSOP_IMPORTELEM,79, "importelem", NULL,         1,  2,  0,  0,  JOF_BYTE |JOF_ELEM|JOF_IMPORT)
-
-/* Push object literal. */
-OPDEF(JSOP_OBJECT,    80, "object",     NULL,         3,  0,  1, 12,  JOF_CONST)
-
-/* Pop value and discard it. */
-OPDEF(JSOP_POP,       81, "pop",        NULL,         1,  1,  0,  0,  JOF_BYTE)
-
-/* Convert value to number, for unary +. */
-OPDEF(JSOP_POS,       82, "pos",        "+",          1,  1,  1, 10,  JOF_BYTE)
-
-/* Trap into debugger for breakpoint, etc. */
-OPDEF(JSOP_TRAP,      83, "trap",       NULL,         1,  0,  0,  0,  JOF_BYTE)
-
-/* Fast get/set ops for function arguments and local variables. */
-OPDEF(JSOP_GETARG,    84, "getarg",     NULL,         3,  0,  1, 12,  JOF_QARG |JOF_NAME)
-OPDEF(JSOP_SETARG,    85, "setarg",     NULL,         3,  1,  1,  1,  JOF_QARG |JOF_NAME|JOF_SET|JOF_ASSIGNING)
-OPDEF(JSOP_GETVAR,    86, "getvar",     NULL,         3,  0,  1, 12,  JOF_QVAR |JOF_NAME)
-OPDEF(JSOP_SETVAR,    87, "setvar",     NULL,         3,  1,  1,  1,  JOF_QVAR |JOF_NAME|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-
-/* Push unsigned 16-bit int constant. */
-OPDEF(JSOP_UINT16,    88, "uint16",     NULL,         3,  0,  1, 12,  JOF_UINT16)
-
-/* Object and array literal support. */
-OPDEF(JSOP_NEWINIT,   89, "newinit",    NULL,         1,  2,  1, 10,  JOF_BYTE)
-OPDEF(JSOP_ENDINIT,   90, "endinit",    NULL,         1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_INITPROP,  91, "initprop",   NULL,         3,  1,  0,  0,  JOF_CONST|JOF_PROP|JOF_DETECTING)
-OPDEF(JSOP_INITELEM,  92, "initelem",   NULL,         1,  2,  0,  0,  JOF_BYTE |JOF_ELEM|JOF_DETECTING)
-OPDEF(JSOP_DEFSHARP,  93, "defsharp",   NULL,         3,  0,  0,  0,  JOF_UINT16)
-OPDEF(JSOP_USESHARP,  94, "usesharp",   NULL,         3,  0,  1,  0,  JOF_UINT16)
-
-/* Fast inc/dec ops for args and local vars. */
-OPDEF(JSOP_INCARG,    95, "incarg",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_INC)
-OPDEF(JSOP_INCVAR,    96, "incvar",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_INC)
-OPDEF(JSOP_DECARG,    97, "decarg",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_DEC)
-OPDEF(JSOP_DECVAR,    98, "decvar",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_DEC)
-OPDEF(JSOP_ARGINC,    99, "arginc",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_INC|JOF_POST)
-OPDEF(JSOP_VARINC,    100,"varinc",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_INC|JOF_POST)
-OPDEF(JSOP_ARGDEC,    101,"argdec",     NULL,         3,  0,  1, 10,  JOF_QARG |JOF_NAME|JOF_DEC|JOF_POST)
-OPDEF(JSOP_VARDEC,    102,"vardec",     NULL,         3,  0,  1, 10,  JOF_QVAR |JOF_NAME|JOF_DEC|JOF_POST)
-
-/* ECMA-compliant for/in ops. */
-OPDEF(JSOP_TOOBJECT,  103,"toobject",   NULL,         1,  1,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_FORNAME,   104,"forname",    NULL,         3,  0,  1,  0,  JOF_CONST|JOF_NAME|JOF_FOR)
-OPDEF(JSOP_FORPROP,   105,"forprop",    NULL,         3,  1,  1,  0,  JOF_CONST|JOF_PROP|JOF_FOR)
-OPDEF(JSOP_FORELEM,   106,"forelem",    NULL,         1,  2,  4,  0,  JOF_BYTE |JOF_ELEM|JOF_FOR)
-OPDEF(JSOP_POP2,      107,"pop2",       NULL,         1,  2,  0,  0,  JOF_BYTE)
-
-/* ECMA-compliant assignment ops. */
-OPDEF(JSOP_BINDNAME,  108,"bindname",   NULL,         3,  0,  1,  0,  JOF_CONST|JOF_NAME|JOF_SET|JOF_ASSIGNING)
-OPDEF(JSOP_SETNAME,   109,"setname",    NULL,         3,  2,  1,  1,  JOF_CONST|JOF_NAME|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-
-/* Exception handling ops. */
-OPDEF(JSOP_THROW,     110,"throw",      NULL,         1,  1,  0,  0,  JOF_BYTE)
-
-/* 'in' and 'instanceof' ops. */
-OPDEF(JSOP_IN,        111,js_in_str,    js_in_str,    1,  2,  1,  6,  JOF_BYTE|JOF_LEFTASSOC)
-OPDEF(JSOP_INSTANCEOF,112,js_instanceof_str,js_instanceof_str,1,2,1,6,JOF_BYTE|JOF_LEFTASSOC)
-
-/* debugger op */
-OPDEF(JSOP_DEBUGGER,  113,"debugger",   NULL,         1,  0,  0,  0,  JOF_BYTE)
-
-/* gosub/retsub for finally handling */
-OPDEF(JSOP_GOSUB,     114,"gosub",      NULL,         3,  0,  1,  0,  JOF_JUMP)
-OPDEF(JSOP_RETSUB,    115,"retsub",     NULL,         1,  1,  0,  0,  JOF_BYTE)
-
-/* More exception handling ops. */
-OPDEF(JSOP_EXCEPTION, 116,"exception",  NULL,         1,  0,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_SETSP,     117,"setsp",      NULL,         3,  0,  0,  0,  JOF_UINT16)
-
-/*
- * ECMA-compliant switch statement ops.
- * CONDSWITCH is a decompilable NOP; CASE is ===, POP, jump if true, re-push
- * lval if false; and DEFAULT is POP lval and GOTO.
- */
-OPDEF(JSOP_CONDSWITCH,118,"condswitch", NULL,         1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_CASE,      119,"case",       NULL,         3,  1,  0,  0,  JOF_JUMP)
-OPDEF(JSOP_DEFAULT,   120,"default",    NULL,         3,  1,  0,  0,  JOF_JUMP)
-
-/*
- * ECMA-compliant call to eval op
- */
-OPDEF(JSOP_EVAL,      121,"eval",       NULL,         3, -1,  1, 11,  JOF_UINT16)
-
-/*
- * ECMA-compliant helper for 'for (x[i] in o)' loops.
- */
-OPDEF(JSOP_ENUMELEM,  122,"enumelem",   NULL,         1,  3,  0,  1,  JOF_BYTE |JOF_SET|JOF_ASSIGNING)
-
-/*
- * Getter and setter prefix bytecodes.  These modify the next bytecode, either
- * an assignment or a property initializer code, which then defines a property
- * getter or setter.
- */
-OPDEF(JSOP_GETTER,    123,js_getter_str,NULL,         1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_SETTER,    124,js_setter_str,NULL,         1,  0,  0,  0,  JOF_BYTE)
-
-/*
- * Prolog bytecodes for defining function, var, and const names.
- */
-OPDEF(JSOP_DEFFUN,    125,"deffun",     NULL,         3,  0,  0,  0,  JOF_CONST|JOF_DECLARING)
-OPDEF(JSOP_DEFCONST,  126,"defconst",   NULL,         3,  0,  0,  0,  JOF_CONST|JOF_NAME|JOF_DECLARING)
-OPDEF(JSOP_DEFVAR,    127,"defvar",     NULL,         3,  0,  0,  0,  JOF_CONST|JOF_NAME|JOF_DECLARING)
-
-/* Auto-clone (if needed due to re-parenting) and push an anonymous function. */
-OPDEF(JSOP_ANONFUNOBJ,  128, "anonfunobj",  NULL,     3,  0,  1, 12,  JOF_CONST)
-
-/* ECMA ed. 3 named function expression. */
-OPDEF(JSOP_NAMEDFUNOBJ, 129, "namedfunobj", NULL,     3,  0,  1, 12,  JOF_CONST)
-
-/*
- * Like JSOP_INITPROP, but specialized to make a DontDelete property for ECMA
- * Edition 3 catch variables.
- */
-OPDEF(JSOP_INITCATCHVAR,130, "initcatchvar",NULL,     3,  1,  0,  0,  JOF_CONST)
-
-/* ECMA-mandated parenthesization opcode, which nulls the reference base register, obj; see jsinterp.c. */
-OPDEF(JSOP_GROUP,       131, "group",       NULL,     1,  0,  0,  0,  JOF_BYTE)
-
-/* Host object extension: given 'o.item(i) = j', the left-hand side compiles JSOP_SETCALL, rather than JSOP_CALL. */
-OPDEF(JSOP_SETCALL,     132, "setcall",     NULL,     3, -1,  2, 11,  JOF_UINT16|JOF_SET|JOF_ASSIGNING)
-
-/*
- * Exception handling no-ops, for more economical byte-coding than SRC_TRYFIN
- * srcnote-annotated JSOP_NOPs.
- */
-OPDEF(JSOP_TRY,         133,"try",        NULL,       1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_FINALLY,     134,"finally",    NULL,       1,  0,  0,  0,  JOF_BYTE)
-
-/*
- * Swap the top two stack elements.
- * N.B. JSOP_SWAP doesn't swap the corresponding pc stack generating pcs, as
- * they're not needed for the current use of preserving the top-of-stack return
- * value when popping scopes while returning from catch blocks.
- */
-OPDEF(JSOP_SWAP,        135,"swap",       NULL,       1,  2,  2,  0,  JOF_BYTE)
-
-/*
- * Bytecodes that avoid making an arguments object in most cases:
- * JSOP_ARGSUB gets arguments[i] from fp->argv, iff i is in [0, fp->argc-1].
- * JSOP_ARGCNT returns fp->argc.
- */
-OPDEF(JSOP_ARGSUB,      136,"argsub",     NULL,       3,  0,  1, 12,  JOF_QARG |JOF_NAME)
-OPDEF(JSOP_ARGCNT,      137,"argcnt",     NULL,       1,  0,  1, 12,  JOF_BYTE)
-
-/*
- * Define a local function object as a local variable.
- * The local variable's slot number is the first immediate two-byte operand.
- * The function object's atom index is the second immediate operand.
- */
-OPDEF(JSOP_DEFLOCALFUN, 138,"deflocalfun",NULL,       5,  0,  0,  0,  JOF_INDEXCONST|JOF_DECLARING)
-
-/* Extended jumps. */
-OPDEF(JSOP_GOTOX,         139,"gotox",    NULL,       5,  0,  0,  0,  JOF_JUMPX)
-OPDEF(JSOP_IFEQX,         140,"ifeqx",    NULL,       5,  1,  0,  0,  JOF_JUMPX|JOF_DETECTING)
-OPDEF(JSOP_IFNEX,         141,"ifnex",    NULL,       5,  1,  0,  0,  JOF_JUMPX)
-OPDEF(JSOP_ORX,           142,"orx",      NULL,       5,  1,  0,  0,  JOF_JUMPX|JOF_DETECTING)
-OPDEF(JSOP_ANDX,          143,"andx",     NULL,       5,  1,  0,  0,  JOF_JUMPX|JOF_DETECTING)
-OPDEF(JSOP_GOSUBX,        144,"gosubx",   NULL,       5,  0,  1,  0,  JOF_JUMPX)
-OPDEF(JSOP_CASEX,         145,"casex",    NULL,       5,  1,  0,  0,  JOF_JUMPX)
-OPDEF(JSOP_DEFAULTX,      146,"defaultx", NULL,       5,  1,  0,  0,  JOF_JUMPX)
-OPDEF(JSOP_TABLESWITCHX,  147,"tableswitchx",NULL,   -1,  1,  0,  0,  JOF_TABLESWITCHX|JOF_DETECTING)
-OPDEF(JSOP_LOOKUPSWITCHX, 148,"lookupswitchx",NULL,  -1,  1,  0,  0,  JOF_LOOKUPSWITCHX|JOF_DETECTING)
-
-/* Placeholders for a real jump opcode set during backpatch chain fixup. */
-OPDEF(JSOP_BACKPATCH,     149,"backpatch",NULL,       3,  0,  0,  0,  JOF_JUMP|JOF_BACKPATCH)
-OPDEF(JSOP_BACKPATCH_POP, 150,"backpatch_pop",NULL,   3,  1,  0,  0,  JOF_JUMP|JOF_BACKPATCH)
-OPDEF(JSOP_BACKPATCH_PUSH,151,"backpatch_push",NULL,  3,  0,  1,  0,  JOF_JUMP|JOF_BACKPATCH)
-
-/* Set and get return value pseudo-register in stack frame. */
-OPDEF(JSOP_SETRVAL,       152,"setrval",  NULL,       1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_RETRVAL,       153,"retrval",  NULL,       1,  0,  0,  0,  JOF_BYTE)
-
-/* Optimized global variable ops (we don't bother doing a JSOP_FORGVAR op). */
-OPDEF(JSOP_GETGVAR,       154,"getgvar",  NULL,       3,  0,  1, 12,  JOF_CONST|JOF_NAME)
-OPDEF(JSOP_SETGVAR,       155,"setgvar",  NULL,       3,  1,  1,  1,  JOF_CONST|JOF_NAME|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-OPDEF(JSOP_INCGVAR,       156,"incgvar",  NULL,       3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC)
-OPDEF(JSOP_DECGVAR,       157,"decgvar",  NULL,       3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC)
-OPDEF(JSOP_GVARINC,       158,"gvarinc",  NULL,       3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_INC|JOF_POST)
-OPDEF(JSOP_GVARDEC,       159,"gvardec",  NULL,       3,  0,  1, 10,  JOF_CONST|JOF_NAME|JOF_DEC|JOF_POST)
-
-/* Regular expression literal requiring special "fork on exec" handling. */
-OPDEF(JSOP_REGEXP,        160,"regexp",   NULL,       3,  0,  1, 12,  JOF_CONST)
-
-/* XML (ECMA-357, a.k.a. "E4X") support. */
-OPDEF(JSOP_DEFXMLNS,      161,"defxmlns",   NULL,     1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_ANYNAME,       162,"anyname",    NULL,     1,  0,  1, 12,  JOF_BYTE|JOF_XMLNAME)
-OPDEF(JSOP_QNAMEPART,     163,"qnamepart",  NULL,     3,  0,  1, 12,  JOF_CONST|JOF_XMLNAME)
-OPDEF(JSOP_QNAMECONST,    164,"qnameconst", NULL,     3,  1,  1, 12,  JOF_CONST|JOF_XMLNAME)
-OPDEF(JSOP_QNAME,         165,"qname",      NULL,     1,  2,  1,  0,  JOF_BYTE|JOF_XMLNAME)
-OPDEF(JSOP_TOATTRNAME,    166,"toattrname", NULL,     1,  1,  1, 12,  JOF_BYTE|JOF_XMLNAME)
-OPDEF(JSOP_TOATTRVAL,     167,"toattrval",  NULL,     1,  1,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_ADDATTRNAME,   168,"addattrname",NULL,     1,  2,  1,  8,  JOF_BYTE)
-OPDEF(JSOP_ADDATTRVAL,    169,"addattrval", NULL,     1,  2,  1,  8,  JOF_BYTE)
-OPDEF(JSOP_BINDXMLNAME,   170,"bindxmlname",NULL,     1,  1,  2,  0,  JOF_BYTE|JOF_XMLNAME|JOF_SET|JOF_ASSIGNING)
-OPDEF(JSOP_SETXMLNAME,    171,"setxmlname", NULL,     1,  3,  1,  1,  JOF_BYTE|JOF_XMLNAME|JOF_SET|JOF_ASSIGNING|JOF_DETECTING)
-OPDEF(JSOP_XMLNAME,       172,"xmlname",    NULL,     1,  1,  1, 12,  JOF_BYTE|JOF_XMLNAME)
-OPDEF(JSOP_DESCENDANTS,   173,"descendants",NULL,     1,  2,  1, 11,  JOF_BYTE)
-OPDEF(JSOP_FILTER,        174,"filter",     NULL,     3,  1,  1, 11,  JOF_JUMP)
-OPDEF(JSOP_ENDFILTER,     175,"endfilter",  NULL,     1,  1,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_TOXML,         176,"toxml",      NULL,     1,  1,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_TOXMLLIST,     177,"toxmllist",  NULL,     1,  1,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_XMLTAGEXPR,    178,"xmltagexpr", NULL,     1,  1,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_XMLELTEXPR,    179,"xmleltexpr", NULL,     1,  1,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_XMLOBJECT,     180,"xmlobject",  NULL,     3,  0,  1, 12,  JOF_CONST)
-OPDEF(JSOP_XMLCDATA,      181,"xmlcdata",   NULL,     3,  0,  1, 12,  JOF_CONST)
-OPDEF(JSOP_XMLCOMMENT,    182,"xmlcomment", NULL,     3,  0,  1, 12,  JOF_CONST)
-OPDEF(JSOP_XMLPI,         183,"xmlpi",      NULL,     3,  1,  1, 12,  JOF_CONST)
-OPDEF(JSOP_GETMETHOD,     184,"getmethod",  NULL,     3,  1,  1, 11,  JOF_CONST|JOF_PROP)
-OPDEF(JSOP_GETFUNNS,      185,"getfunns",   NULL,     1,  0,  1, 12,  JOF_BYTE)
-OPDEF(JSOP_FOREACH,       186,"foreach",    NULL,     1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_DELDESC,       187,"deldesc",    NULL,     1,  2,  1, 10,  JOF_BYTE |JOF_ELEM|JOF_DEL)
-
-/*
- * Opcodes for extended literal addressing, using unsigned 24-bit immediate
- * operands to hold integer operands (JSOP_UINT24), extended atom indexes in
- * script->atomMap (JSOP_LITERAL, JSOP_FINDNAME), and ops prefixed by such
- * atom index immediates (JSOP_LITOPX).  See jsemit.c, EmitAtomIndexOp.
- */
-OPDEF(JSOP_UINT24,        188,"uint24",     NULL,     4,  0,  1, 12,  JOF_UINT24)
-OPDEF(JSOP_LITERAL,       189,"literal",    NULL,     4,  0,  1, 12,  JOF_UINT24)
-OPDEF(JSOP_FINDNAME,      190,"findname",   NULL,     4,  0,  2,  0,  JOF_UINT24)
-OPDEF(JSOP_LITOPX,        191,"litopx",     NULL,     5,  0,  0, 12,  JOF_LITOPX)
-
-/*
- * Opcodes to help the decompiler deal with XML.
- */
-OPDEF(JSOP_STARTXML,      192,"startxml",    NULL,    1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_STARTXMLEXPR,  193,"startxmlexpr",NULL,    1,  0,  0,  0,  JOF_BYTE)
-OPDEF(JSOP_SETMETHOD,     194,"setmethod",   NULL,    3,  2,  1,  1,  JOF_CONST|JOF_PROP)
diff --git a/libs/js/src/jsosdep.h b/libs/js/src/jsosdep.h
deleted file mode 100644
index e9c4a5534b..0000000000
--- a/libs/js/src/jsosdep.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsosdep_h___
-#define jsosdep_h___
-/*
- * OS (and machine, and compiler XXX) dependent information.
- */
-
-#if defined(XP_WIN) || defined(XP_OS2)
-
-#if defined(_WIN32) || defined (XP_OS2)
-#define JS_HAVE_LONG_LONG
-#else
-#undef JS_HAVE_LONG_LONG
-#endif
-#endif /* XP_WIN || XP_OS2 */
-
-#ifdef XP_BEOS
-#define JS_HAVE_LONG_LONG
-#endif
-
-
-#ifdef XP_UNIX
-
-/*
- * Get OS specific header information.
- */
-#if defined(AIXV3) || defined(AIX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(BSDI)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(HPUX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(IRIX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(linux)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(OSF1)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(_SCO_DS)
-#undef JS_HAVE_LONG_LONG
-
-#elif defined(SOLARIS)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(FREEBSD)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(SUNOS4)
-#undef JS_HAVE_LONG_LONG
-
-/*
-** Missing function prototypes
-*/
-
-extern void *sbrk(int);
-
-#elif defined(UNIXWARE)
-#undef JS_HAVE_LONG_LONG
-
-#elif defined(VMS) && defined(__ALPHA)
-#define JS_HAVE_LONG_LONG
-
-#endif
-
-#endif /* XP_UNIX */
-
-#endif /* jsosdep_h___ */
-
diff --git a/libs/js/src/jsotypes.h b/libs/js/src/jsotypes.h
deleted file mode 100644
index ede1221b81..0000000000
--- a/libs/js/src/jsotypes.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This section typedefs the old 'native' types to the new PR<type>s.
- * These definitions are scheduled to be eliminated at the earliest
- * possible time. The NSPR API is implemented and documented using
- * the new definitions.
- */
-
-/*
- * Note that we test for PROTYPES_H, not JSOTYPES_H.  This is to avoid
- * double-definitions of scalar types such as uint32, if NSPR's
- * protypes.h is also included.
- */
-#ifndef PROTYPES_H
-#define PROTYPES_H
-
-#ifdef XP_BEOS
-/* BeOS defines most int types in SupportDefs.h (int8, uint8, int16,
- * uint16, int32, uint32, int64, uint64), so in the interest of
- * not conflicting with other definitions elsewhere we have to skip the
- * #ifdef jungle below, duplicate some definitions, and do our stuff.
- */
-#include <SupportDefs.h>
-
-typedef JSUintn uintn;
-#ifndef _XP_Core_
-typedef JSIntn intn;
-#endif
-
-#else
-
-/* SVR4 typedef of uint is commonly found on UNIX machines. */
-#ifdef XP_UNIX
-#include <sys/types.h>
-#else
-typedef JSUintn uint;
-#endif
-
-typedef JSUintn uintn;
-typedef JSUint64 uint64;
-#if !defined(_WIN32) && !defined(XP_OS2)
-typedef JSUint32 uint32;
-#else
-typedef unsigned long uint32;
-#endif
-typedef JSUint16 uint16;
-typedef JSUint8 uint8;
-
-#ifndef _XP_Core_
-typedef JSIntn intn;
-#endif
-
-/*
- * On AIX 4.3, sys/inttypes.h (which is included by sys/types.h, a very
- * common header file) defines the types int8, int16, int32, and int64.
- * So we don't define these four types here to avoid conflicts in case
- * the code also includes sys/types.h.
- */
-#if defined(AIX) && defined(HAVE_SYS_INTTYPES_H)
-#include <sys/inttypes.h>
-#else
-typedef JSInt64 int64;
-
-/* /usr/include/model.h on HP-UX defines int8, int16, and int32 */
-#ifdef HPUX
-#include <model.h>
-#else
-#if !defined(_WIN32) && !defined(XP_OS2)
-typedef JSInt32 int32;
-#else
-typedef long int32;
-#endif
-typedef JSInt16 int16;
-typedef JSInt8 int8;
-#endif /* HPUX */
-#endif /* AIX && HAVE_SYS_INTTYPES_H */
-
-#endif  /* XP_BEOS */
-
-typedef JSFloat64 float64;
-
-/* Re: jsbit.h */
-#define TEST_BIT        JS_TEST_BIT
-#define SET_BIT         JS_SET_BIT
-#define CLEAR_BIT       JS_CLEAR_BIT
-
-/* Re: prarena.h->plarena.h */
-#define PRArena PLArena
-#define PRArenaPool PLArenaPool
-#define PRArenaStats PLArenaStats
-#define PR_ARENA_ALIGN PL_ARENA_ALIGN
-#define PR_INIT_ARENA_POOL PL_INIT_ARENA_POOL
-#define PR_ARENA_ALLOCATE PL_ARENA_ALLOCATE
-#define PR_ARENA_GROW PL_ARENA_GROW
-#define PR_ARENA_MARK PL_ARENA_MARK
-#define PR_CLEAR_UNUSED PL_CLEAR_UNUSED
-#define PR_CLEAR_ARENA PL_CLEAR_ARENA
-#define PR_ARENA_RELEASE PL_ARENA_RELEASE
-#define PR_COUNT_ARENA PL_COUNT_ARENA
-#define PR_ARENA_DESTROY PL_ARENA_DESTROY
-#define PR_InitArenaPool PL_InitArenaPool
-#define PR_FreeArenaPool PL_FreeArenaPool
-#define PR_FinishArenaPool PL_FinishArenaPool
-#define PR_CompactArenaPool PL_CompactArenaPool
-#define PR_ArenaFinish PL_ArenaFinish
-#define PR_ArenaAllocate PL_ArenaAllocate
-#define PR_ArenaGrow PL_ArenaGrow
-#define PR_ArenaRelease PL_ArenaRelease
-#define PR_ArenaCountAllocation PL_ArenaCountAllocation
-#define PR_ArenaCountInplaceGrowth PL_ArenaCountInplaceGrowth
-#define PR_ArenaCountGrowth PL_ArenaCountGrowth
-#define PR_ArenaCountRelease PL_ArenaCountRelease
-#define PR_ArenaCountRetract PL_ArenaCountRetract
-
-/* Re: prevent.h->plevent.h */
-#define PREvent PLEvent
-#define PREventQueue PLEventQueue
-#define PR_CreateEventQueue PL_CreateEventQueue
-#define PR_DestroyEventQueue PL_DestroyEventQueue
-#define PR_GetEventQueueMonitor PL_GetEventQueueMonitor
-#define PR_ENTER_EVENT_QUEUE_MONITOR PL_ENTER_EVENT_QUEUE_MONITOR
-#define PR_EXIT_EVENT_QUEUE_MONITOR PL_EXIT_EVENT_QUEUE_MONITOR
-#define PR_PostEvent PL_PostEvent
-#define PR_PostSynchronousEvent PL_PostSynchronousEvent
-#define PR_GetEvent PL_GetEvent
-#define PR_EventAvailable PL_EventAvailable
-#define PREventFunProc PLEventFunProc
-#define PR_MapEvents PL_MapEvents
-#define PR_RevokeEvents PL_RevokeEvents
-#define PR_ProcessPendingEvents PL_ProcessPendingEvents
-#define PR_WaitForEvent PL_WaitForEvent
-#define PR_EventLoop PL_EventLoop
-#define PR_GetEventQueueSelectFD PL_GetEventQueueSelectFD
-#define PRHandleEventProc PLHandleEventProc
-#define PRDestroyEventProc PLDestroyEventProc
-#define PR_InitEvent PL_InitEvent
-#define PR_GetEventOwner PL_GetEventOwner
-#define PR_HandleEvent PL_HandleEvent
-#define PR_DestroyEvent PL_DestroyEvent
-#define PR_DequeueEvent PL_DequeueEvent
-#define PR_GetMainEventQueue PL_GetMainEventQueue
-
-/* Re: prhash.h->plhash.h */
-#define PRHashEntry PLHashEntry
-#define PRHashTable PLHashTable
-#define PRHashNumber PLHashNumber
-#define PRHashFunction PLHashFunction
-#define PRHashComparator PLHashComparator
-#define PRHashEnumerator PLHashEnumerator
-#define PRHashAllocOps PLHashAllocOps
-#define PR_NewHashTable PL_NewHashTable
-#define PR_HashTableDestroy PL_HashTableDestroy
-#define PR_HashTableRawLookup PL_HashTableRawLookup
-#define PR_HashTableRawAdd PL_HashTableRawAdd
-#define PR_HashTableRawRemove PL_HashTableRawRemove
-#define PR_HashTableAdd PL_HashTableAdd
-#define PR_HashTableRemove PL_HashTableRemove
-#define PR_HashTableEnumerateEntries PL_HashTableEnumerateEntries
-#define PR_HashTableLookup PL_HashTableLookup
-#define PR_HashTableDump PL_HashTableDump
-#define PR_HashString PL_HashString
-#define PR_CompareStrings PL_CompareStrings
-#define PR_CompareValues PL_CompareValues
-
-#endif /* !defined(PROTYPES_H) */
diff --git a/libs/js/src/jsparse.c b/libs/js/src/jsparse.c
deleted file mode 100644
index 0f851d64da..0000000000
--- a/libs/js/src/jsparse.c
+++ /dev/null
@@ -1,4864 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS parser.
- *
- * This is a recursive-descent parser for the JavaScript language specified by
- * "The JavaScript 1.5 Language Specification".  It uses lexical and semantic
- * feedback to disambiguate non-LL(1) structures.  It generates trees of nodes
- * induced by the recursive parsing (not precise syntax trees, see jsparse.h).
- * After tree construction, it rewrites trees to fold constants and evaluate
- * compile-time expressions.  Finally, it calls js_EmitTree (see jsemit.h) to
- * generate bytecode.
- *
- * This parser attempts no error recovery.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsparse.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-
-#if JS_HAS_XML_SUPPORT
-#include "jsxml.h"
-#endif
-
-/*
- * JS parsers, from lowest to highest precedence.
- *
- * Each parser takes a context, a token stream, and a tree context struct.
- * Each returns a parse node tree or null on error.
- */
-
-typedef JSParseNode *
-JSParser(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc);
-
-typedef JSParseNode *
-JSMemberParser(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-               JSBool allowCallSyntax);
-
-static JSParser FunctionStmt;
-#if JS_HAS_LEXICAL_CLOSURE
-static JSParser FunctionExpr;
-#endif
-static JSParser Statements;
-static JSParser Statement;
-static JSParser Variables;
-static JSParser Expr;
-static JSParser AssignExpr;
-static JSParser CondExpr;
-static JSParser OrExpr;
-static JSParser AndExpr;
-static JSParser BitOrExpr;
-static JSParser BitXorExpr;
-static JSParser BitAndExpr;
-static JSParser EqExpr;
-static JSParser RelExpr;
-static JSParser ShiftExpr;
-static JSParser AddExpr;
-static JSParser MulExpr;
-static JSParser UnaryExpr;
-static JSMemberParser MemberExpr;
-static JSParser PrimaryExpr;
-
-/*
- * Insist that the next token be of type tt, or report errno and return null.
- * NB: this macro uses cx and ts from its lexical environment.
- */
-#define MUST_MATCH_TOKEN(tt, errno)                                           \
-    JS_BEGIN_MACRO                                                            \
-        if (js_GetToken(cx, ts) != tt) {                                      \
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR, \
-                            errno);                                           \
-            return NULL;                                                      \
-        }                                                                     \
-    JS_END_MACRO
-
-#define CHECK_RECURSION()                                                     \
-    JS_BEGIN_MACRO                                                            \
-        int stackDummy;                                                       \
-        if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {                           \
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR, \
-                                        JSMSG_OVER_RECURSED);                 \
-            return NULL;                                                      \
-        }                                                                     \
-    JS_END_MACRO
-
-#ifdef METER_PARSENODES
-static uint32 parsenodes = 0;
-static uint32 maxparsenodes = 0;
-static uint32 recyclednodes = 0;
-#endif
-
-static JSParseNode *
-RecycleTree(JSParseNode *pn, JSTreeContext *tc)
-{
-    JSParseNode *next;
-
-    if (!pn)
-        return NULL;
-    JS_ASSERT(pn != tc->nodeList);      /* catch back-to-back dup recycles */
-    next = pn->pn_next;
-    pn->pn_next = tc->nodeList;
-    tc->nodeList = pn;
-#ifdef METER_PARSENODES
-    recyclednodes++;
-#endif
-    return next;
-}
-
-static JSParseNode *
-NewOrRecycledNode(JSContext *cx, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = tc->nodeList;
-    if (!pn) {
-        JS_ARENA_ALLOCATE_TYPE(pn, JSParseNode, &cx->tempPool);
-        if (!pn)
-            JS_ReportOutOfMemory(cx);
-    } else {
-        tc->nodeList = pn->pn_next;
-
-        /* Recycle immediate descendents only, to save work and working set. */
-        switch (pn->pn_arity) {
-          case PN_FUNC:
-            RecycleTree(pn->pn_body, tc);
-            break;
-          case PN_LIST:
-            if (pn->pn_head) {
-                /* XXX check for dup recycles in the list */
-                *pn->pn_tail = tc->nodeList;
-                tc->nodeList = pn->pn_head;
-#ifdef METER_PARSENODES
-                recyclednodes += pn->pn_count;
-#endif
-            }
-            break;
-          case PN_TERNARY:
-            RecycleTree(pn->pn_kid1, tc);
-            RecycleTree(pn->pn_kid2, tc);
-            RecycleTree(pn->pn_kid3, tc);
-            break;
-          case PN_BINARY:
-            RecycleTree(pn->pn_left, tc);
-            RecycleTree(pn->pn_right, tc);
-            break;
-          case PN_UNARY:
-            RecycleTree(pn->pn_kid, tc);
-            break;
-          case PN_NAME:
-            RecycleTree(pn->pn_expr, tc);
-            break;
-          case PN_NULLARY:
-            break;
-        }
-    }
-#ifdef METER_PARSENODES
-    if (pn) {
-        parsenodes++;
-        if (parsenodes - recyclednodes > maxparsenodes)
-            maxparsenodes = parsenodes - recyclednodes;
-    }
-#endif
-    return pn;
-}
-
-/*
- * Allocate a JSParseNode from cx's temporary arena.
- */
-static JSParseNode *
-NewParseNode(JSContext *cx, JSTokenStream *ts, JSParseNodeArity arity,
-             JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSToken *tp;
-
-    pn = NewOrRecycledNode(cx, tc);
-    if (!pn)
-        return NULL;
-    tp = &CURRENT_TOKEN(ts);
-    pn->pn_type = tp->type;
-    pn->pn_pos = tp->pos;
-    pn->pn_op = JSOP_NOP;
-    pn->pn_arity = arity;
-    pn->pn_next = NULL;
-#if JS_HAS_XML_SUPPORT
-    pn->pn_ts = ts;
-#endif
-    return pn;
-}
-
-static JSParseNode *
-NewBinary(JSContext *cx, JSTokenType tt,
-          JSOp op, JSParseNode *left, JSParseNode *right,
-          JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn1, *pn2;
-
-    if (!left || !right)
-        return NULL;
-
-    /*
-     * Flatten a left-associative (left-heavy) tree of a given operator into
-     * a list, to reduce js_FoldConstants and js_EmitTree recursion.
-     */
-    if (left->pn_type == tt &&
-        left->pn_op == op &&
-        (js_CodeSpec[op].format & JOF_LEFTASSOC)) {
-        if (left->pn_arity != PN_LIST) {
-            pn1 = left->pn_left, pn2 = left->pn_right;
-            left->pn_arity = PN_LIST;
-            PN_INIT_LIST_1(left, pn1);
-            PN_APPEND(left, pn2);
-            if (tt == TOK_PLUS) {
-                if (pn1->pn_type == TOK_STRING)
-                    left->pn_extra |= PNX_STRCAT;
-                else if (pn1->pn_type != TOK_NUMBER)
-                    left->pn_extra |= PNX_CANTFOLD;
-                if (pn2->pn_type == TOK_STRING)
-                    left->pn_extra |= PNX_STRCAT;
-                else if (pn2->pn_type != TOK_NUMBER)
-                    left->pn_extra |= PNX_CANTFOLD;
-            }
-        }
-        PN_APPEND(left, right);
-        left->pn_pos.end = right->pn_pos.end;
-        if (tt == TOK_PLUS) {
-            if (right->pn_type == TOK_STRING)
-                left->pn_extra |= PNX_STRCAT;
-            else if (right->pn_type != TOK_NUMBER)
-                left->pn_extra |= PNX_CANTFOLD;
-        }
-        return left;
-    }
-
-    /*
-     * Fold constant addition immediately, to conserve node space and, what's
-     * more, so js_FoldConstants never sees mixed addition and concatenation
-     * operations with more than one leading non-string operand in a PN_LIST
-     * generated for expressions such as 1 + 2 + "pt" (which should evaluate
-     * to "3pt", not "12pt").
-     */
-    if (tt == TOK_PLUS &&
-        left->pn_type == TOK_NUMBER &&
-        right->pn_type == TOK_NUMBER) {
-        left->pn_dval += right->pn_dval;
-        left->pn_pos.end = right->pn_pos.end;
-        RecycleTree(right, tc);
-        return left;
-    }
-
-    pn = NewOrRecycledNode(cx, tc);
-    if (!pn)
-        return NULL;
-    pn->pn_type = tt;
-    pn->pn_pos.begin = left->pn_pos.begin;
-    pn->pn_pos.end = right->pn_pos.end;
-    pn->pn_op = op;
-    pn->pn_arity = PN_BINARY;
-    pn->pn_left = left;
-    pn->pn_right = right;
-    pn->pn_next = NULL;
-#if JS_HAS_XML_SUPPORT
-    pn->pn_ts = NULL;
-#endif
-    return pn;
-}
-
-#if JS_HAS_GETTER_SETTER
-static JSTokenType
-CheckGetterOrSetter(JSContext *cx, JSTokenStream *ts, JSTokenType tt)
-{
-    JSAtom *atom;
-    JSRuntime *rt;
-    JSOp op;
-    const char *name;
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_NAME);
-    atom = CURRENT_TOKEN(ts).t_atom;
-    rt = cx->runtime;
-    if (atom == rt->atomState.getterAtom)
-        op = JSOP_GETTER;
-    else if (atom == rt->atomState.setterAtom)
-        op = JSOP_SETTER;
-    else
-        return TOK_NAME;
-    if (js_PeekTokenSameLine(cx, ts) != tt)
-        return TOK_NAME;
-    (void) js_GetToken(cx, ts);
-    if (CURRENT_TOKEN(ts).t_op != JSOP_NOP) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_BAD_GETTER_OR_SETTER,
-                                    (op == JSOP_GETTER)
-                                    ? js_getter_str
-                                    : js_setter_str);
-        return TOK_ERROR;
-    }
-    CURRENT_TOKEN(ts).t_op = op;
-    name = js_AtomToPrintableString(cx, atom);
-    if (!name ||
-        !js_ReportCompileErrorNumber(cx, ts,
-                                     JSREPORT_TS |
-                                     JSREPORT_WARNING |
-                                     JSREPORT_STRICT,
-                                     JSMSG_DEPRECATED_USAGE,
-                                     name)) {
-        return TOK_ERROR;
-    }
-    return tt;
-}
-#endif
-
-/*
- * Parse a top-level JS script.
- */
-JS_FRIEND_API(JSParseNode *)
-js_ParseTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts)
-{
-    JSStackFrame *fp, frame;
-    JSTreeContext tc;
-    JSParseNode *pn;
-
-    /*
-     * Push a compiler frame if we have no frames, or if the top frame is a
-     * lightweight function activation, or if its scope chain doesn't match
-     * the one passed to us.
-     */
-    fp = cx->fp;
-    if (!fp || !fp->varobj || fp->scopeChain != chain) {
-        memset(&frame, 0, sizeof frame);
-        frame.varobj = frame.scopeChain = chain;
-        if (cx->options & JSOPTION_VAROBJFIX) {
-            while ((chain = JS_GetParent(cx, chain)) != NULL)
-                frame.varobj = chain;
-        }
-        frame.down = fp;
-        if (fp)
-            frame.flags = fp->flags & (JSFRAME_SPECIAL | JSFRAME_COMPILE_N_GO);
-        cx->fp = &frame;
-    }
-
-    /*
-     * Protect atoms from being collected by a GC activation, which might
-     * - nest on this thread due to out of memory (the so-called "last ditch"
-     *   GC attempted within js_NewGCThing), or
-     * - run for any reason on another thread if this thread is suspended on
-     *   an object lock before it finishes generating bytecode into a script
-     *   protected from the GC by a root or a stack frame reference.
-     */
-    JS_KEEP_ATOMS(cx->runtime);
-    TREE_CONTEXT_INIT(&tc);
-    pn = Statements(cx, ts, &tc);
-    if (pn) {
-        if (!js_MatchToken(cx, ts, TOK_EOF)) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_SYNTAX_ERROR);
-            pn = NULL;
-        } else {
-            pn->pn_type = TOK_LC;
-            if (!js_FoldConstants(cx, pn, &tc))
-                pn = NULL;
-        }
-    }
-
-    TREE_CONTEXT_FINISH(&tc);
-    JS_UNKEEP_ATOMS(cx->runtime);
-    cx->fp = fp;
-    return pn;
-}
-
-/*
- * Compile a top-level script.
- */
-JS_FRIEND_API(JSBool)
-js_CompileTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts,
-                      JSCodeGenerator *cg)
-{
-    JSStackFrame *fp, frame;
-    uint32 flags;
-    JSParseNode *pn;
-    JSBool ok;
-#ifdef METER_PARSENODES
-    void *sbrk(ptrdiff_t), *before = sbrk(0);
-#endif
-
-    /*
-     * Push a compiler frame if we have no frames, or if the top frame is a
-     * lightweight function activation, or if its scope chain doesn't match
-     * the one passed to us.
-     */
-    fp = cx->fp;
-    if (!fp || !fp->varobj || fp->scopeChain != chain) {
-        memset(&frame, 0, sizeof frame);
-        frame.varobj = frame.scopeChain = chain;
-        if (cx->options & JSOPTION_VAROBJFIX) {
-            while ((chain = JS_GetParent(cx, chain)) != NULL)
-                frame.varobj = chain;
-        }
-        frame.down = fp;
-        if (fp)
-            frame.flags = fp->flags & (JSFRAME_SPECIAL | JSFRAME_COMPILE_N_GO);
-        cx->fp = &frame;
-    }
-    flags = cx->fp->flags;
-    cx->fp->flags = flags |
-                    (JS_HAS_COMPILE_N_GO_OPTION(cx)
-                     ? JSFRAME_COMPILING | JSFRAME_COMPILE_N_GO
-                     : JSFRAME_COMPILING);
-
-    /* Prevent GC activation while compiling. */
-    JS_KEEP_ATOMS(cx->runtime);
-
-    pn = Statements(cx, ts, &cg->treeContext);
-    if (!pn) {
-        ok = JS_FALSE;
-    } else if (!js_MatchToken(cx, ts, TOK_EOF)) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_SYNTAX_ERROR);
-        ok = JS_FALSE;
-    } else {
-#ifdef METER_PARSENODES
-        printf("Parser growth: %d (%u nodes, %u max, %u unrecycled)\n",
-               (char *)sbrk(0) - (char *)before,
-               parsenodes,
-               maxparsenodes,
-               parsenodes - recyclednodes);
-        before = sbrk(0);
-#endif
-
-        /*
-         * No need to emit code here -- Statements already has, for each
-         * statement in turn.  Search for TCF_COMPILING in Statements, below.
-         * That flag is set for every tc == &cg->treeContext, and it implies
-         * that the tc can be downcast to a cg and used to emit code during
-         * parsing, rather than at the end of the parse phase.
-         */
-        JS_ASSERT(cg->treeContext.flags & TCF_COMPILING);
-        ok = JS_TRUE;
-    }
-
-#ifdef METER_PARSENODES
-    printf("Code-gen growth: %d (%u bytecodes, %u srcnotes)\n",
-           (char *)sbrk(0) - (char *)before, CG_OFFSET(cg), cg->noteCount);
-#endif
-#ifdef JS_ARENAMETER
-    JS_DumpArenaStats(stdout);
-#endif
-    JS_UNKEEP_ATOMS(cx->runtime);
-    cx->fp->flags = flags;
-    cx->fp = fp;
-    return ok;
-}
-
-/*
- * Insist on a final return before control flows out of pn, but don't be too
- * smart about loops (do {...; return e2;} while(0) at the end of a function
- * that contains an early return e1 will get a strict-option-only warning).
- */
-#define ENDS_IN_OTHER   0
-#define ENDS_IN_RETURN  1
-#define ENDS_IN_BREAK   2
-
-static int
-HasFinalReturn(JSParseNode *pn)
-{
-    uintN rv, rv2, hasDefault;
-    JSParseNode *pn2, *pn3;
-
-    switch (pn->pn_type) {
-      case TOK_LC:
-        if (!pn->pn_head)
-            return ENDS_IN_OTHER;
-        return HasFinalReturn(PN_LAST(pn));
-
-      case TOK_IF:
-        rv = HasFinalReturn(pn->pn_kid2);
-        if (pn->pn_kid3)
-            rv &= HasFinalReturn(pn->pn_kid3);
-        return rv;
-
-#if JS_HAS_SWITCH_STATEMENT
-      case TOK_SWITCH:
-        rv = ENDS_IN_RETURN;
-        hasDefault = ENDS_IN_OTHER;
-        for (pn2 = pn->pn_kid2->pn_head; rv && pn2; pn2 = pn2->pn_next) {
-            if (pn2->pn_type == TOK_DEFAULT)
-                hasDefault = ENDS_IN_RETURN;
-            pn3 = pn2->pn_right;
-            JS_ASSERT(pn3->pn_type == TOK_LC);
-            if (pn3->pn_head) {
-                rv2 = HasFinalReturn(PN_LAST(pn3));
-                if (rv2 == ENDS_IN_OTHER && pn2->pn_next)
-                    /* Falling through to next case or default. */;
-                else
-                    rv &= rv2;
-            }
-        }
-        /* If a final switch has no default case, we judge it harshly. */
-        rv &= hasDefault;
-        return rv;
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-      case TOK_BREAK:
-        return ENDS_IN_BREAK;
-
-      case TOK_WITH:
-        return HasFinalReturn(pn->pn_right);
-
-      case TOK_RETURN:
-        return ENDS_IN_RETURN;
-
-      case TOK_COLON:
-        return HasFinalReturn(pn->pn_expr);
-
-#if JS_HAS_EXCEPTIONS
-      case TOK_THROW:
-        return ENDS_IN_RETURN;
-
-      case TOK_TRY:
-        /* If we have a finally block that returns, we are done. */
-        if (pn->pn_kid3) {
-            rv = HasFinalReturn(pn->pn_kid3);
-            if (rv == ENDS_IN_RETURN)
-                return rv;
-        }
-
-        /* Else check the try block and any and all catch statements. */
-        rv = HasFinalReturn(pn->pn_kid1);
-        if (pn->pn_kid2)
-            rv &= HasFinalReturn(pn->pn_kid2);
-        return rv;
-
-      case TOK_CATCH:
-        /* Check this block's code and iterate over further catch blocks. */
-        rv = HasFinalReturn(pn->pn_kid3);
-        for (pn2 = pn->pn_kid2; pn2; pn2 = pn2->pn_kid2)
-            rv &= HasFinalReturn(pn2->pn_kid3);
-        return rv;
-#endif
-
-      default:
-        return ENDS_IN_OTHER;
-    }
-}
-
-static JSBool
-ReportNoReturnValue(JSContext *cx, JSTokenStream *ts)
-{
-    JSFunction *fun;
-    JSBool ok;
-
-    fun = cx->fp->fun;
-    if (fun->atom) {
-        char *name = js_GetStringBytes(ATOM_TO_STRING(fun->atom));
-        ok = js_ReportCompileErrorNumber(cx, ts,
-                                         JSREPORT_TS |
-                                         JSREPORT_WARNING |
-                                         JSREPORT_STRICT,
-                                         JSMSG_NO_RETURN_VALUE, name);
-    } else {
-        ok = js_ReportCompileErrorNumber(cx, ts,
-                                         JSREPORT_TS |
-                                         JSREPORT_WARNING |
-                                         JSREPORT_STRICT,
-                                         JSMSG_ANON_NO_RETURN_VALUE);
-    }
-    return ok;
-}
-
-static JSBool
-CheckFinalReturn(JSContext *cx, JSTokenStream *ts, JSParseNode *pn)
-{
-    return HasFinalReturn(pn) == ENDS_IN_RETURN || ReportNoReturnValue(cx, ts);
-}
-
-static JSParseNode *
-FunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun,
-             JSTreeContext *tc)
-{
-    JSStackFrame *fp, frame;
-    JSObject *funobj;
-    uintN oldflags;
-    JSParseNode *pn;
-
-    fp = cx->fp;
-    funobj = fun->object;
-    if (!fp || fp->fun != fun || fp->varobj != funobj ||
-        fp->scopeChain != funobj) {
-        memset(&frame, 0, sizeof frame);
-        frame.fun = fun;
-        frame.varobj = frame.scopeChain = funobj;
-        frame.down = fp;
-        if (fp)
-            frame.flags = fp->flags & JSFRAME_COMPILE_N_GO;
-        cx->fp = &frame;
-    }
-
-    oldflags = tc->flags;
-    tc->flags &= ~(TCF_RETURN_EXPR | TCF_RETURN_VOID);
-    tc->flags |= TCF_IN_FUNCTION;
-    pn = Statements(cx, ts, tc);
-
-    /* Check for falling off the end of a function that returns a value. */
-    if (pn && JS_HAS_STRICT_OPTION(cx) && (tc->flags & TCF_RETURN_EXPR)) {
-        if (!CheckFinalReturn(cx, ts, pn))
-            pn = NULL;
-    }
-
-    cx->fp = fp;
-    tc->flags = oldflags | (tc->flags & (TCF_FUN_FLAGS | TCF_HAS_DEFXMLNS));
-    return pn;
-}
-
-/*
- * Compile a JS function body, which might appear as the value of an event
- * handler attribute in an HTML <INPUT> tag.
- */
-JSBool
-js_CompileFunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun)
-{
-    JSArenaPool codePool, notePool;
-    JSCodeGenerator funcg;
-    JSStackFrame *fp, frame;
-    JSObject *funobj;
-    JSParseNode *pn;
-    JSBool ok;
-
-    JS_InitArenaPool(&codePool, "code", 1024, sizeof(jsbytecode));
-    JS_InitArenaPool(&notePool, "note", 1024, sizeof(jssrcnote));
-    if (!js_InitCodeGenerator(cx, &funcg, &codePool, &notePool,
-                              ts->filename, ts->lineno,
-                              ts->principals)) {
-        return JS_FALSE;
-    }
-
-    /* Prevent GC activation while compiling. */
-    JS_KEEP_ATOMS(cx->runtime);
-
-    /* Push a JSStackFrame for use by FunctionBody. */
-    fp = cx->fp;
-    funobj = fun->object;
-    JS_ASSERT(!fp || (fp->fun != fun && fp->varobj != funobj &&
-                      fp->scopeChain != funobj));
-    memset(&frame, 0, sizeof frame);
-    frame.fun = fun;
-    frame.varobj = frame.scopeChain = funobj;
-    frame.down = fp;
-    frame.flags = JS_HAS_COMPILE_N_GO_OPTION(cx)
-                  ? JSFRAME_COMPILING | JSFRAME_COMPILE_N_GO
-                  : JSFRAME_COMPILING;
-    cx->fp = &frame;
-
-    /* Ensure that the body looks like a block statement to js_EmitTree. */
-    CURRENT_TOKEN(ts).type = TOK_LC;
-    pn = FunctionBody(cx, ts, fun, &funcg.treeContext);
-    if (!pn) {
-        ok = JS_FALSE;
-    } else {
-        /*
-         * No need to emit code here -- Statements (via FunctionBody) already
-         * has.  See similar comment in js_CompileTokenStream, and bug 108257.
-         */
-        fun->u.script = js_NewScriptFromCG(cx, &funcg, fun);
-        if (!fun->u.script) {
-            ok = JS_FALSE;
-        } else {
-            fun->interpreted = JS_TRUE;
-            if (funcg.treeContext.flags & TCF_FUN_HEAVYWEIGHT)
-                fun->flags |= JSFUN_HEAVYWEIGHT;
-            ok = JS_TRUE;
-        }
-    }
-
-    /* Restore saved state and release code generation arenas. */
-    cx->fp = fp;
-    JS_UNKEEP_ATOMS(cx->runtime);
-    js_FinishCodeGenerator(cx, &funcg);
-    JS_FinishArenaPool(&codePool);
-    JS_FinishArenaPool(&notePool);
-    return ok;
-}
-
-static JSParseNode *
-FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-            JSBool lambda)
-{
-    JSOp op, prevop;
-    JSParseNode *pn, *body, *result;
-    JSAtom *funAtom, *objAtom, *argAtom;
-    JSStackFrame *fp;
-    JSObject *varobj, *pobj;
-    JSAtomListElement *ale;
-    JSProperty *prop;
-    JSFunction *fun;
-    uintN dupflag;
-    JSBool ok;
-    JSTreeContext funtc;
-
-    /* Make a TOK_FUNCTION node. */
-#if JS_HAS_GETTER_SETTER
-    op = CURRENT_TOKEN(ts).t_op;
-#endif
-    pn = NewParseNode(cx, ts, PN_FUNC, tc);
-    if (!pn)
-        return NULL;
-
-    /* Scan the optional function name into funAtom. */
-    funAtom = js_MatchToken(cx, ts, TOK_NAME) ? CURRENT_TOKEN(ts).t_atom : NULL;
-#if !JS_HAS_LEXICAL_CLOSURE
-    if (!funAtom && !lambda) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_SYNTAX_ERROR);
-        return NULL;
-    }
-#endif
-
-    /* Find the nearest variable-declaring scope and use it as our parent. */
-    fp = cx->fp;
-    varobj = fp->varobj;
-
-    /*
-     * Record names for function statements in tc->decls so we know when to
-     * avoid optimizing variable references that might name a function.
-     */
-    if (!lambda && funAtom) {
-        ATOM_LIST_SEARCH(ale, &tc->decls, funAtom);
-        if (ale) {
-            prevop = ALE_JSOP(ale);
-            if (JS_HAS_STRICT_OPTION(cx) || prevop == JSOP_DEFCONST) {
-                const char *name = js_AtomToPrintableString(cx, funAtom);
-                if (!name ||
-                    !js_ReportCompileErrorNumber(cx, ts,
-                                                 (prevop != JSOP_DEFCONST)
-                                                 ? JSREPORT_TS |
-                                                   JSREPORT_WARNING |
-                                                   JSREPORT_STRICT
-                                                 : JSREPORT_TS | JSREPORT_ERROR,
-                                                 JSMSG_REDECLARED_VAR,
-                                                 (prevop == JSOP_DEFFUN ||
-                                                  prevop == JSOP_CLOSURE)
-                                                 ? js_function_str
-                                                 : (prevop == JSOP_DEFCONST)
-                                                 ? js_const_str
-                                                 : js_var_str,
-                                                 name)) {
-                    return NULL;
-                }
-            }
-            if (tc->topStmt && prevop == JSOP_DEFVAR)
-                tc->flags |= TCF_FUN_CLOSURE_VS_VAR;
-        } else {
-            ale = js_IndexAtom(cx, funAtom, &tc->decls);
-            if (!ale)
-                return NULL;
-        }
-        ALE_SET_JSOP(ale, tc->topStmt ? JSOP_CLOSURE : JSOP_DEFFUN);
-
-#if JS_HAS_LEXICAL_CLOSURE
-        /*
-         * A function nested at top level inside another's body needs only a
-         * local variable to bind its name to its value, and not an activation
-         * object property (it might also need the activation property, if the
-         * outer function contains with statements, e.g., but the stack slot
-         * wins when jsemit.c's LookupArgOrVar can optimize a JSOP_NAME into a
-         * JSOP_GETVAR bytecode).
-         */
-        if (!tc->topStmt && (tc->flags & TCF_IN_FUNCTION)) {
-            /*
-             * Define a property on the outer function so that LookupArgOrVar
-             * can properly optimize accesses.
-             */
-            JS_ASSERT(OBJ_GET_CLASS(cx, varobj) == &js_FunctionClass);
-            JS_ASSERT(fp->fun == (JSFunction *) JS_GetPrivate(cx, varobj));
-            if (!js_LookupHiddenProperty(cx, varobj, ATOM_TO_JSID(funAtom),
-                                         &pobj, &prop)) {
-                return NULL;
-            }
-            if (prop)
-                OBJ_DROP_PROPERTY(cx, pobj, prop);
-            if (!prop ||
-                pobj != varobj ||
-                ((JSScopeProperty *)prop)->getter != js_GetLocalVariable) {
-                if (!js_AddHiddenProperty(cx, varobj, ATOM_TO_JSID(funAtom),
-                                          js_GetLocalVariable,
-                                          js_SetLocalVariable,
-                                          SPROP_INVALID_SLOT,
-                                          JSPROP_PERMANENT | JSPROP_SHARED,
-                                          SPROP_HAS_SHORTID, fp->fun->nvars)) {
-                    return NULL;
-                }
-                if (fp->fun->nvars == JS_BITMASK(16)) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_TOO_MANY_FUN_VARS);
-                    return NULL;
-                }
-                fp->fun->nvars++;
-            }
-        }
-#endif
-    }
-
-    fun = js_NewFunction(cx, NULL, NULL, 0, lambda ? JSFUN_LAMBDA : 0, varobj,
-                         funAtom);
-    if (!fun)
-        return NULL;
-#if JS_HAS_GETTER_SETTER
-    if (op != JSOP_NOP)
-        fun->flags |= (op == JSOP_GETTER) ? JSPROP_GETTER : JSPROP_SETTER;
-#endif
-
-
-    /*
-     * Set interpreted early so js_EmitTree can test it to decide whether to
-     * eliminate useless expressions.
-     */
-    fun->interpreted = JS_TRUE;
-
-    /*
-     * Atomize fun->object early to protect against a last-ditch GC under
-     * js_LookupHiddenProperty.
-     *
-     * Absent use of the new scoped local GC roots API around compiler calls,
-     * we need to atomize here to protect against a GC activation.  Atoms are
-     * protected from GC during compilation by the JS_FRIEND_API entry points
-     * in this file.  There doesn't seem to be any gain in switching from the
-     * atom-keeping method to the bulkier, slower scoped local roots method.
-     */
-    objAtom = js_AtomizeObject(cx, fun->object, 0);
-    if (!objAtom)
-        return NULL;
-
-    /* Now parse formal argument list and compute fun->nargs. */
-    MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_FORMAL);
-    if (!js_MatchToken(cx, ts, TOK_RP)) {
-        do {
-            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_MISSING_FORMAL);
-            argAtom = CURRENT_TOKEN(ts).t_atom;
-            pobj = NULL;
-            if (!js_LookupHiddenProperty(cx, fun->object, ATOM_TO_JSID(argAtom),
-                                         &pobj, &prop)) {
-                return NULL;
-            }
-            dupflag = 0;
-            if (prop) {
-                ok = JS_TRUE;
-                if (pobj == fun->object &&
-                    ((JSScopeProperty *) prop)->getter == js_GetArgument) {
-                    const char *name = js_AtomToPrintableString(cx, argAtom);
-
-                    /*
-                     * A duplicate parameter name. We force a duplicate node
-                     * on the SCOPE_LAST_PROP(scope) list with the same id,
-                     * distinguished by the SPROP_IS_DUPLICATE flag, and not
-                     * mapped by an entry in scope.
-                     */
-                    ok = name &&
-                         js_ReportCompileErrorNumber(cx, ts,
-                                                     JSREPORT_TS |
-                                                     JSREPORT_WARNING |
-                                                     JSREPORT_STRICT,
-                                                     JSMSG_DUPLICATE_FORMAL,
-                                                     name);
-
-                    dupflag = SPROP_IS_DUPLICATE;
-                }
-                OBJ_DROP_PROPERTY(cx, pobj, prop);
-                if (!ok)
-                    return NULL;
-                prop = NULL;
-            }
-            if (!js_AddHiddenProperty(cx, fun->object, ATOM_TO_JSID(argAtom),
-                                      js_GetArgument, js_SetArgument,
-                                      SPROP_INVALID_SLOT,
-                                      JSPROP_PERMANENT | JSPROP_SHARED,
-                                      dupflag | SPROP_HAS_SHORTID,
-                                      fun->nargs)) {
-                return NULL;
-            }
-            if (fun->nargs == JS_BITMASK(16)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_TOO_MANY_FUN_ARGS);
-                return NULL;
-            }
-            fun->nargs++;
-        } while (js_MatchToken(cx, ts, TOK_COMMA));
-
-        MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_FORMAL);
-    }
-
-    MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_BODY);
-    pn->pn_pos.begin = CURRENT_TOKEN(ts).pos.begin;
-
-    TREE_CONTEXT_INIT(&funtc);
-    body = FunctionBody(cx, ts, fun, &funtc);
-    if (!body)
-        return NULL;
-
-    MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_BODY);
-    pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-
-#if JS_HAS_LEXICAL_CLOSURE
-    /*
-     * If we collected flags that indicate nested heavyweight functions, or
-     * this function contains heavyweight-making statements (references to
-     * __parent__ or __proto__; use of with, eval, import, or export; and
-     * assignment to arguments), flag the function as heavyweight (requiring
-     * a call object per invocation).
-     */
-    if (funtc.flags & TCF_FUN_HEAVYWEIGHT) {
-        fun->flags |= JSFUN_HEAVYWEIGHT;
-        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-    } else {
-        /*
-         * If this function is a named statement function not at top-level
-         * (i.e. a JSOP_CLOSURE), or if it refers to unqualified names that
-         * are not local args or vars (TCF_FUN_USES_NONLOCALS), then our
-         * enclosing function, if any, must be heavyweight.
-         */
-        if ((!lambda && funAtom && tc->topStmt) ||
-            (funtc.flags & TCF_FUN_USES_NONLOCALS)) {
-            tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        }
-    }
-#endif
-
-    result = pn;
-#if JS_HAS_LEXICAL_CLOSURE
-    if (lambda) {
-        /*
-         * ECMA ed. 3 standard: function expression, possibly anonymous.
-         */
-        op = funAtom ? JSOP_NAMEDFUNOBJ : JSOP_ANONFUNOBJ;
-    } else if (!funAtom) {
-        /*
-         * If this anonymous function definition is *not* embedded within a
-         * larger expression, we treat it as an expression statement, not as
-         * a function declaration -- and not as a syntax error (as ECMA-262
-         * Edition 3 would have it).  Backward compatibility trumps all.
-         */
-        result = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!result)
-            return NULL;
-        result->pn_type = TOK_SEMI;
-        result->pn_pos = pn->pn_pos;
-        result->pn_kid = pn;
-        op = JSOP_ANONFUNOBJ;
-    } else if (tc->topStmt) {
-        /*
-         * ECMA ed. 3 extension: a function expression statement not at the
-         * top level, e.g., in a compound statement such as the "then" part
-         * of an "if" statement, binds a closure only if control reaches that
-         * sub-statement.
-         */
-        op = JSOP_CLOSURE;
-    } else
-#endif
-        op = JSOP_NOP;
-
-    pn->pn_funAtom = objAtom;
-    pn->pn_op = op;
-    pn->pn_body = body;
-    pn->pn_flags = funtc.flags & (TCF_FUN_FLAGS | TCF_HAS_DEFXMLNS);
-    pn->pn_tryCount = funtc.tryCount;
-    TREE_CONTEXT_FINISH(&funtc);
-    return result;
-}
-
-static JSParseNode *
-FunctionStmt(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    return FunctionDef(cx, ts, tc, JS_FALSE);
-}
-
-#if JS_HAS_LEXICAL_CLOSURE
-static JSParseNode *
-FunctionExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    return FunctionDef(cx, ts, tc, JS_TRUE);
-}
-#endif
-
-/*
- * Parse the statements in a block, creating a TOK_LC node that lists the
- * statements' trees.  If called from block-parsing code, the caller must
- * match { before and } after.
- */
-static JSParseNode *
-Statements(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    JSTokenType tt;
-
-    CHECK_RECURSION();
-
-    pn = NewParseNode(cx, ts, PN_LIST, tc);
-    if (!pn)
-        return NULL;
-    PN_INIT_LIST(pn);
-
-    ts->flags |= TSF_OPERAND;
-    while ((tt = js_PeekToken(cx, ts)) > TOK_EOF && tt != TOK_RC) {
-        ts->flags &= ~TSF_OPERAND;
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2) {
-            if (ts->flags & TSF_EOF)
-                ts->flags |= TSF_UNEXPECTED_EOF;
-            return NULL;
-        }
-        ts->flags |= TSF_OPERAND;
-
-        /* If compiling top-level statements, emit as we go to save space. */
-        if (!tc->topStmt && (tc->flags & TCF_COMPILING)) {
-            if (cx->fp->fun &&
-                JS_HAS_STRICT_OPTION(cx) &&
-                (tc->flags & TCF_RETURN_EXPR)) {
-                /*
-                 * Check pn2 for lack of a final return statement if it is the
-                 * last statement in the block.
-                 */
-                tt = js_PeekToken(cx, ts);
-                if ((tt == TOK_EOF || tt == TOK_RC) &&
-                    !CheckFinalReturn(cx, ts, pn2)) {
-                    tt = TOK_ERROR;
-                    break;
-                }
-
-                /*
-                 * Clear TCF_RETURN_EXPR so FunctionBody doesn't try to
-                 * CheckFinalReturn again.
-                 */
-                tc->flags &= ~TCF_RETURN_EXPR;
-            }
-            if (!js_FoldConstants(cx, pn2, tc) ||
-                !js_AllocTryNotes(cx, (JSCodeGenerator *)tc) ||
-                !js_EmitTree(cx, (JSCodeGenerator *)tc, pn2)) {
-                tt = TOK_ERROR;
-                break;
-            }
-            RecycleTree(pn2, tc);
-        } else {
-            PN_APPEND(pn, pn2);
-        }
-    }
-    ts->flags &= ~TSF_OPERAND;
-    if (tt == TOK_ERROR)
-        return NULL;
-
-    pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-    return pn;
-}
-
-static JSParseNode *
-Condition(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-
-    MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_COND);
-    pn = Expr(cx, ts, tc);
-    if (!pn)
-        return NULL;
-    MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_COND);
-
-    /*
-     * Check for (a = b) and "correct" it to (a == b) iff b's operator has
-     * greater precedence than ==.
-     * XXX not ECMA, but documented in several books -- now a strict warning.
-     */
-    if (pn->pn_type == TOK_ASSIGN &&
-        pn->pn_op == JSOP_NOP &&
-        pn->pn_right->pn_type > TOK_EQOP)
-    {
-        JSBool rewrite = !JS_VERSION_IS_ECMA(cx);
-        if (!js_ReportCompileErrorNumber(cx, ts,
-                                         JSREPORT_TS |
-                                         JSREPORT_WARNING |
-                                         JSREPORT_STRICT,
-                                         JSMSG_EQUAL_AS_ASSIGN,
-                                         rewrite
-                                         ? "\nAssuming equality test"
-                                         : "")) {
-            return NULL;
-        }
-        if (rewrite) {
-            pn->pn_type = TOK_EQOP;
-            pn->pn_op = (JSOp)cx->jsop_eq;
-            pn2 = pn->pn_left;
-            switch (pn2->pn_op) {
-              case JSOP_SETNAME:
-                pn2->pn_op = JSOP_NAME;
-                break;
-              case JSOP_SETPROP:
-                pn2->pn_op = JSOP_GETPROP;
-                break;
-              case JSOP_SETELEM:
-                pn2->pn_op = JSOP_GETELEM;
-                break;
-              default:
-                JS_ASSERT(0);
-            }
-        }
-    }
-    return pn;
-}
-
-static JSBool
-MatchLabel(JSContext *cx, JSTokenStream *ts, JSParseNode *pn)
-{
-    JSAtom *label;
-#if JS_HAS_LABEL_STATEMENT
-    JSTokenType tt;
-
-    tt = js_PeekTokenSameLine(cx, ts);
-    if (tt == TOK_ERROR)
-        return JS_FALSE;
-    if (tt == TOK_NAME) {
-        (void) js_GetToken(cx, ts);
-        label = CURRENT_TOKEN(ts).t_atom;
-    } else {
-        label = NULL;
-    }
-#else
-    label = NULL;
-#endif
-    pn->pn_atom = label;
-    return JS_TRUE;
-}
-
-#if JS_HAS_EXPORT_IMPORT
-static JSParseNode *
-ImportExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    JSTokenType tt;
-
-    MUST_MATCH_TOKEN(TOK_NAME, JSMSG_NO_IMPORT_NAME);
-    pn = NewParseNode(cx, ts, PN_NAME, tc);
-    if (!pn)
-        return NULL;
-    pn->pn_op = JSOP_NAME;
-    pn->pn_atom = CURRENT_TOKEN(ts).t_atom;
-    pn->pn_expr = NULL;
-    pn->pn_slot = -1;
-    pn->pn_attrs = 0;
-
-    ts->flags |= TSF_OPERAND;
-    while ((tt = js_GetToken(cx, ts)) == TOK_DOT || tt == TOK_LB) {
-        ts->flags &= ~TSF_OPERAND;
-        if (pn->pn_op == JSOP_IMPORTALL)
-            goto bad_import;
-
-        if (tt == TOK_DOT) {
-            pn2 = NewParseNode(cx, ts, PN_NAME, tc);
-            if (!pn2)
-                return NULL;
-            if (js_MatchToken(cx, ts, TOK_STAR)) {
-                pn2->pn_op = JSOP_IMPORTALL;
-                pn2->pn_atom = NULL;
-            } else {
-                MUST_MATCH_TOKEN(TOK_NAME, JSMSG_NAME_AFTER_DOT);
-                pn2->pn_op = JSOP_GETPROP;
-                pn2->pn_atom = CURRENT_TOKEN(ts).t_atom;
-                pn2->pn_slot = -1;
-                pn2->pn_attrs = 0;
-            }
-            pn2->pn_expr = pn;
-            pn2->pn_pos.begin = pn->pn_pos.begin;
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        } else {
-            /* Make a TOK_LB binary node. */
-            pn2 = NewBinary(cx, tt, JSOP_GETELEM, pn, Expr(cx, ts, tc), tc);
-            if (!pn2)
-                return NULL;
-
-            MUST_MATCH_TOKEN(TOK_RB, JSMSG_BRACKET_IN_INDEX);
-        }
-
-        pn = pn2;
-        ts->flags |= TSF_OPERAND;
-    }
-    ts->flags &= ~TSF_OPERAND;
-    if (tt == TOK_ERROR)
-        return NULL;
-    js_UngetToken(ts);
-
-    switch (pn->pn_op) {
-      case JSOP_GETPROP:
-        pn->pn_op = JSOP_IMPORTPROP;
-        break;
-      case JSOP_GETELEM:
-        pn->pn_op = JSOP_IMPORTELEM;
-        break;
-      case JSOP_IMPORTALL:
-        break;
-      default:
-        goto bad_import;
-    }
-    return pn;
-
-  bad_import:
-    js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                JSMSG_BAD_IMPORT);
-    return NULL;
-}
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-extern const char js_with_statement_str[];
-
-static JSParseNode *
-Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSTokenType tt;
-    JSParseNode *pn, *pn1, *pn2, *pn3, *pn4;
-    JSStmtInfo stmtInfo, *stmt, *stmt2;
-    JSAtom *label;
-
-    CHECK_RECURSION();
-
-    ts->flags |= TSF_OPERAND;
-    tt = js_GetToken(cx, ts);
-    ts->flags &= ~TSF_OPERAND;
-
-#if JS_HAS_GETTER_SETTER
-    if (tt == TOK_NAME) {
-        tt = CheckGetterOrSetter(cx, ts, TOK_FUNCTION);
-        if (tt == TOK_ERROR)
-            return NULL;
-    }
-#endif
-
-    switch (tt) {
-#if JS_HAS_EXPORT_IMPORT
-      case TOK_EXPORT:
-        pn = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn)
-            return NULL;
-        PN_INIT_LIST(pn);
-        if (js_MatchToken(cx, ts, TOK_STAR)) {
-            pn2 = NewParseNode(cx, ts, PN_NULLARY, tc);
-            if (!pn2)
-                return NULL;
-            PN_APPEND(pn, pn2);
-        } else {
-            do {
-                MUST_MATCH_TOKEN(TOK_NAME, JSMSG_NO_EXPORT_NAME);
-                pn2 = NewParseNode(cx, ts, PN_NAME, tc);
-                if (!pn2)
-                    return NULL;
-                pn2->pn_op = JSOP_NAME;
-                pn2->pn_atom = CURRENT_TOKEN(ts).t_atom;
-                pn2->pn_expr = NULL;
-                pn2->pn_slot = -1;
-                pn2->pn_attrs = 0;
-                PN_APPEND(pn, pn2);
-            } while (js_MatchToken(cx, ts, TOK_COMMA));
-        }
-        pn->pn_pos.end = PN_LAST(pn)->pn_pos.end;
-        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        break;
-
-      case TOK_IMPORT:
-        pn = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn)
-            return NULL;
-        PN_INIT_LIST(pn);
-        do {
-            pn2 = ImportExpr(cx, ts, tc);
-            if (!pn2)
-                return NULL;
-            PN_APPEND(pn, pn2);
-        } while (js_MatchToken(cx, ts, TOK_COMMA));
-        pn->pn_pos.end = PN_LAST(pn)->pn_pos.end;
-        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        break;
-#endif /* JS_HAS_EXPORT_IMPORT */
-
-      case TOK_FUNCTION:
-#if JS_HAS_XML_SUPPORT
-        if (js_PeekToken(cx, ts) == TOK_DBLCOLON)
-            goto expression;
-#endif
-        return FunctionStmt(cx, ts, tc);
-
-      case TOK_IF:
-        /* An IF node has three kids: condition, then, and optional else. */
-        pn = NewParseNode(cx, ts, PN_TERNARY, tc);
-        if (!pn)
-            return NULL;
-        pn1 = Condition(cx, ts, tc);
-        if (!pn1)
-            return NULL;
-        js_PushStatement(tc, &stmtInfo, STMT_IF, -1);
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        if (js_MatchToken(cx, ts, TOK_ELSE)) {
-            stmtInfo.type = STMT_ELSE;
-            pn3 = Statement(cx, ts, tc);
-            if (!pn3)
-                return NULL;
-            pn->pn_pos.end = pn3->pn_pos.end;
-        } else {
-            pn3 = NULL;
-            pn->pn_pos.end = pn2->pn_pos.end;
-        }
-        js_PopStatement(tc);
-        pn->pn_kid1 = pn1;
-        pn->pn_kid2 = pn2;
-        pn->pn_kid3 = pn3;
-        return pn;
-
-#if JS_HAS_SWITCH_STATEMENT
-      case TOK_SWITCH:
-      {
-        JSParseNode *pn5;
-        JSBool seenDefault = JS_FALSE;
-
-        pn = NewParseNode(cx, ts, PN_BINARY, tc);
-        if (!pn)
-            return NULL;
-        MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_SWITCH);
-
-        /* pn1 points to the switch's discriminant. */
-        pn1 = Expr(cx, ts, tc);
-        if (!pn1)
-            return NULL;
-
-        MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_SWITCH);
-        MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_SWITCH);
-
-        /* pn2 is a list of case nodes. The default case has pn_left == NULL */
-        pn2 = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn2)
-            return NULL;
-        PN_INIT_LIST(pn2);
-
-        js_PushStatement(tc, &stmtInfo, STMT_SWITCH, -1);
-
-        while ((tt = js_GetToken(cx, ts)) != TOK_RC) {
-            switch (tt) {
-              case TOK_DEFAULT:
-                if (seenDefault) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_TOO_MANY_DEFAULTS);
-                    return NULL;
-                }
-                seenDefault = JS_TRUE;
-                /* fall through */
-
-              case TOK_CASE:
-                pn3 = NewParseNode(cx, ts, PN_BINARY, tc);
-                if (!pn3)
-                    return NULL;
-                if (tt == TOK_DEFAULT) {
-                    pn3->pn_left = NULL;
-                } else {
-                    pn3->pn_left = Expr(cx, ts, tc);
-                    if (!pn3->pn_left)
-                        return NULL;
-                }
-                PN_APPEND(pn2, pn3);
-                if (pn2->pn_count == JS_BIT(16)) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_TOO_MANY_CASES);
-                    return NULL;
-                }
-                break;
-
-              case TOK_ERROR:
-                return NULL;
-
-              default:
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_SWITCH);
-                return NULL;
-            }
-            MUST_MATCH_TOKEN(TOK_COLON, JSMSG_COLON_AFTER_CASE);
-
-            pn4 = NewParseNode(cx, ts, PN_LIST, tc);
-            if (!pn4)
-                return NULL;
-            pn4->pn_type = TOK_LC;
-            PN_INIT_LIST(pn4);
-            ts->flags |= TSF_OPERAND;
-            while ((tt = js_PeekToken(cx, ts)) != TOK_RC &&
-                   tt != TOK_CASE && tt != TOK_DEFAULT) {
-                ts->flags &= ~TSF_OPERAND;
-                if (tt == TOK_ERROR)
-                    return NULL;
-                pn5 = Statement(cx, ts, tc);
-                if (!pn5)
-                    return NULL;
-                pn4->pn_pos.end = pn5->pn_pos.end;
-                PN_APPEND(pn4, pn5);
-                ts->flags |= TSF_OPERAND;
-            }
-            ts->flags &= ~TSF_OPERAND;
-
-            /* Fix the PN_LIST so it doesn't begin at the TOK_COLON. */
-            if (pn4->pn_head)
-                pn4->pn_pos.begin = pn4->pn_head->pn_pos.begin;
-            pn3->pn_pos.end = pn4->pn_pos.end;
-            pn3->pn_right = pn4;
-        }
-
-        js_PopStatement(tc);
-
-        pn->pn_pos.end = pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        pn->pn_kid1 = pn1;
-        pn->pn_kid2 = pn2;
-        return pn;
-      }
-#endif /* JS_HAS_SWITCH_STATEMENT */
-
-      case TOK_WHILE:
-        pn = NewParseNode(cx, ts, PN_BINARY, tc);
-        if (!pn)
-            return NULL;
-        js_PushStatement(tc, &stmtInfo, STMT_WHILE_LOOP, -1);
-        pn2 = Condition(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_left = pn2;
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        js_PopStatement(tc);
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_right = pn2;
-        return pn;
-
-#if JS_HAS_DO_WHILE_LOOP
-      case TOK_DO:
-        pn = NewParseNode(cx, ts, PN_BINARY, tc);
-        if (!pn)
-            return NULL;
-        js_PushStatement(tc, &stmtInfo, STMT_DO_LOOP, -1);
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_left = pn2;
-        MUST_MATCH_TOKEN(TOK_WHILE, JSMSG_WHILE_AFTER_DO);
-        pn2 = Condition(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        js_PopStatement(tc);
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_right = pn2;
-        if ((cx->version & JSVERSION_MASK) != JSVERSION_ECMA_3) {
-            /*
-             * All legacy and extended versions must do automatic semicolon
-             * insertion after do-while.  See the testcase and discussion in
-             * http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-             */
-            (void) js_MatchToken(cx, ts, TOK_SEMI);
-            return pn;
-        }
-        break;
-#endif /* JS_HAS_DO_WHILE_LOOP */
-
-      case TOK_FOR:
-        /* A FOR node is binary, left is loop control and right is the body. */
-        pn = NewParseNode(cx, ts, PN_BINARY, tc);
-        if (!pn)
-            return NULL;
-        js_PushStatement(tc, &stmtInfo, STMT_FOR_LOOP, -1);
-
-#if JS_HAS_XML_SUPPORT
-        pn->pn_op = JSOP_NOP;
-        if (js_MatchToken(cx, ts, TOK_NAME)) {
-            if (CURRENT_TOKEN(ts).t_atom == cx->runtime->atomState.eachAtom)
-                pn->pn_op = JSOP_FOREACH;
-            else
-                js_UngetToken(ts);
-        }
-#endif
-
-        MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_AFTER_FOR);
-        ts->flags |= TSF_OPERAND;
-        tt = js_PeekToken(cx, ts);
-        ts->flags &= ~TSF_OPERAND;
-        if (tt == TOK_SEMI) {
-#if JS_HAS_XML_SUPPORT
-            if (pn->pn_op == JSOP_FOREACH)
-                goto bad_for_each;
-#endif
-
-            /* No initializer -- set first kid of left sub-node to null. */
-            pn1 = NULL;
-        } else {
-            /* Set pn1 to a var list or an initializing expression. */
-#if JS_HAS_IN_OPERATOR
-            /*
-             * Set the TCF_IN_FOR_INIT flag during parsing of the first clause
-             * of the for statement.  This flag will be used by the RelExpr
-             * production; if it is set, then the 'in' keyword will not be
-             * recognized as an operator, leaving it available to be parsed as
-             * part of a for/in loop.  A side effect of this restriction is
-             * that (unparenthesized) expressions involving an 'in' operator
-             * are illegal in the init clause of an ordinary for loop.
-             */
-            tc->flags |= TCF_IN_FOR_INIT;
-#endif /* JS_HAS_IN_OPERATOR */
-            if (tt == TOK_VAR) {
-                (void) js_GetToken(cx, ts);
-                pn1 = Variables(cx, ts, tc);
-            } else {
-                pn1 = Expr(cx, ts, tc);
-            }
-#if JS_HAS_IN_OPERATOR
-            tc->flags &= ~TCF_IN_FOR_INIT;
-#endif /* JS_HAS_IN_OPERATOR */
-            if (!pn1)
-                return NULL;
-        }
-
-        /*
-         * We can be sure that it's a for/in loop if there's still an 'in'
-         * keyword here, even if JavaScript recognizes 'in' as an operator,
-         * as we've excluded 'in' from being parsed in RelExpr by setting
-         * the TCF_IN_FOR_INIT flag in our JSTreeContext.
-         */
-        if (pn1 && js_MatchToken(cx, ts, TOK_IN)) {
-            stmtInfo.type = STMT_FOR_IN_LOOP;
-
-            /* Check that the left side of the 'in' is valid. */
-            while (pn1->pn_type == TOK_RP)
-                pn1 = pn1->pn_kid;
-            if ((pn1->pn_type == TOK_VAR)
-                ? (pn1->pn_count > 1 || pn1->pn_op == JSOP_DEFCONST)
-                : (pn1->pn_type != TOK_NAME &&
-                   pn1->pn_type != TOK_DOT &&
-#if JS_HAS_LVALUE_RETURN
-                   pn1->pn_type != TOK_LP &&
-#endif
-#if JS_HAS_XML_SUPPORT
-                   (pn1->pn_type != TOK_UNARYOP ||
-                    pn1->pn_op != JSOP_XMLNAME) &&
-#endif
-                   pn1->pn_type != TOK_LB)) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_FOR_LEFTSIDE);
-                return NULL;
-            }
-
-            if (pn1->pn_type == TOK_VAR) {
-                /* Tell js_EmitTree(TOK_VAR) that pn1 is part of a for/in. */
-                pn1->pn_extra |= PNX_FORINVAR;
-
-                /* Generate a final POP only if the var has an initializer. */
-                pn2 = pn1->pn_head;
-                if (pn2->pn_expr)
-                    pn1->pn_extra |= PNX_POPVAR;
-            } else {
-                pn2 = pn1;
-#if JS_HAS_LVALUE_RETURN
-                if (pn2->pn_type == TOK_LP)
-                    pn2->pn_op = JSOP_SETCALL;
-#endif
-#if JS_HAS_XML_SUPPORT
-                if (pn2->pn_type == TOK_UNARYOP)
-                    pn2->pn_op = JSOP_BINDXMLNAME;
-#endif
-            }
-
-            /* Beware 'for (arguments in ...)' with or without a 'var'. */
-            if (pn2->pn_type == TOK_NAME &&
-                pn2->pn_atom == cx->runtime->atomState.argumentsAtom) {
-                tc->flags |= TCF_FUN_HEAVYWEIGHT;
-            }
-
-            /* Parse the object expression as the right operand of 'in'. */
-            pn2 = NewBinary(cx, TOK_IN, JSOP_NOP, pn1, Expr(cx, ts, tc), tc);
-            if (!pn2)
-                return NULL;
-            pn->pn_left = pn2;
-        } else {
-#if JS_HAS_XML_SUPPORT
-            if (pn->pn_op == JSOP_FOREACH)
-                goto bad_for_each;
-#endif
-
-            /* Parse the loop condition or null into pn2. */
-            MUST_MATCH_TOKEN(TOK_SEMI, JSMSG_SEMI_AFTER_FOR_INIT);
-            ts->flags |= TSF_OPERAND;
-            tt = js_PeekToken(cx, ts);
-            ts->flags &= ~TSF_OPERAND;
-            if (tt == TOK_SEMI) {
-                pn2 = NULL;
-            } else {
-                pn2 = Expr(cx, ts, tc);
-                if (!pn2)
-                    return NULL;
-            }
-
-            /* Parse the update expression or null into pn3. */
-            MUST_MATCH_TOKEN(TOK_SEMI, JSMSG_SEMI_AFTER_FOR_COND);
-            ts->flags |= TSF_OPERAND;
-            tt = js_PeekToken(cx, ts);
-            ts->flags &= ~TSF_OPERAND;
-            if (tt == TOK_RP) {
-                pn3 = NULL;
-            } else {
-                pn3 = Expr(cx, ts, tc);
-                if (!pn3)
-                    return NULL;
-            }
-
-            /* Build the RESERVED node to use as the left kid of pn. */
-            pn4 = NewParseNode(cx, ts, PN_TERNARY, tc);
-            if (!pn4)
-                return NULL;
-            pn4->pn_type = TOK_RESERVED;
-            pn4->pn_op = JSOP_NOP;
-            pn4->pn_kid1 = pn1;
-            pn4->pn_kid2 = pn2;
-            pn4->pn_kid3 = pn3;
-            pn->pn_left = pn4;
-        }
-
-        MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_FOR_CTRL);
-
-        /* Parse the loop body into pn->pn_right. */
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_right = pn2;
-        js_PopStatement(tc);
-
-        /* Record the absolute line number for source note emission. */
-        pn->pn_pos.end = pn2->pn_pos.end;
-        return pn;
-
-#if JS_HAS_XML_SUPPORT
-      bad_for_each:
-        js_ReportCompileErrorNumber(cx, pn,
-                                    JSREPORT_PN | JSREPORT_ERROR,
-                                    JSMSG_BAD_FOR_EACH_LOOP);
-        return NULL;
-#endif
-
-#if JS_HAS_EXCEPTIONS
-      case TOK_TRY: {
-        JSParseNode *catchtail = NULL;
-        /*
-         * try nodes are ternary.
-         * kid1 is the try Statement
-         * kid2 is the catch node
-         * kid3 is the finally Statement
-         *
-         * catch nodes are ternary.
-         * kid1 is the discriminant
-         * kid2 is the next catch node, or NULL
-         * kid3 is the catch block (on kid3 so that we can always append a
-         *                          new catch pn on catchtail->kid2)
-         *
-         * catch discriminant nodes are binary
-         * atom is the receptacle
-         * expr is the discriminant code
-         *
-         * finally nodes are unary (just the finally expression)
-         */
-        pn = NewParseNode(cx, ts, PN_TERNARY, tc);
-        pn->pn_op = JSOP_NOP;
-
-        MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_TRY);
-        js_PushStatement(tc, &stmtInfo, STMT_TRY, -1);
-        pn->pn_kid1 = Statements(cx, ts, tc);
-        if (!pn->pn_kid1)
-            return NULL;
-        MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_TRY);
-        js_PopStatement(tc);
-
-        catchtail = pn;
-        while (js_PeekToken(cx, ts) == TOK_CATCH) {
-            /* check for another catch after unconditional catch */
-            if (catchtail != pn && !catchtail->pn_kid1->pn_expr) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_CATCH_AFTER_GENERAL);
-                return NULL;
-            }
-
-            /*
-             * legal catch forms are:
-             * catch (v)
-             * catch (v if <boolean_expression>)
-             * (the latter is legal only #ifdef JS_HAS_CATCH_GUARD)
-             */
-            (void) js_GetToken(cx, ts); /* eat `catch' */
-            pn2 = NewParseNode(cx, ts, PN_TERNARY, tc);
-            if (!pn2)
-                return NULL;
-
-            /*
-             * We use a PN_NAME for the discriminant (catchguard) node
-             * with the actual discriminant code in the initializer spot
-             */
-            MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_CATCH);
-            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_CATCH_IDENTIFIER);
-            pn3 = NewParseNode(cx, ts, PN_NAME, tc);
-            if (!pn3)
-                return NULL;
-
-            pn3->pn_atom = CURRENT_TOKEN(ts).t_atom;
-            pn3->pn_expr = NULL;
-#if JS_HAS_CATCH_GUARD
-            /*
-             * We use `catch (x if x === 5)' (not `catch (x : x === 5)') to
-             * avoid conflicting with the JS2/ECMA2 proposed catchguard syntax.
-             */
-            if (js_PeekToken(cx, ts) == TOK_IF) {
-                (void)js_GetToken(cx, ts); /* eat `if' */
-                pn3->pn_expr = Expr(cx, ts, tc);
-                if (!pn3->pn_expr)
-                    return NULL;
-            }
-#endif
-            pn2->pn_kid1 = pn3;
-
-            MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_CATCH);
-
-            MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_CATCH);
-            js_PushStatement(tc, &stmtInfo, STMT_CATCH, -1);
-            stmtInfo.label = pn3->pn_atom;
-            pn2->pn_kid3 = Statements(cx, ts, tc);
-            if (!pn2->pn_kid3)
-                return NULL;
-            MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_CATCH);
-            js_PopStatement(tc);
-
-            catchtail = catchtail->pn_kid2 = pn2;
-        }
-        catchtail->pn_kid2 = NULL;
-
-        if (js_MatchToken(cx, ts, TOK_FINALLY)) {
-            tc->tryCount++;
-            MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_FINALLY);
-            js_PushStatement(tc, &stmtInfo, STMT_FINALLY, -1);
-            pn->pn_kid3 = Statements(cx, ts, tc);
-            if (!pn->pn_kid3)
-                return NULL;
-            MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_FINALLY);
-            js_PopStatement(tc);
-        } else {
-            pn->pn_kid3 = NULL;
-        }
-        if (!pn->pn_kid2 && !pn->pn_kid3) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_CATCH_OR_FINALLY);
-            return NULL;
-        }
-        tc->tryCount++;
-        return pn;
-      }
-
-      case TOK_THROW:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-
-        /* ECMA-262 Edition 3 says 'throw [no LineTerminator here] Expr'. */
-        ts->flags |= TSF_OPERAND;
-        tt = js_PeekTokenSameLine(cx, ts);
-        ts->flags &= ~TSF_OPERAND;
-        if (tt == TOK_ERROR)
-            return NULL;
-        if (tt == TOK_EOF || tt == TOK_EOL || tt == TOK_SEMI || tt == TOK_RC) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_SYNTAX_ERROR);
-            return NULL;
-        }
-
-        pn2 = Expr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_op = JSOP_THROW;
-        pn->pn_kid = pn2;
-        break;
-
-      /* TOK_CATCH and TOK_FINALLY are both handled in the TOK_TRY case */
-      case TOK_CATCH:
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_CATCH_WITHOUT_TRY);
-        return NULL;
-
-      case TOK_FINALLY:
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_FINALLY_WITHOUT_TRY);
-        return NULL;
-
-#endif /* JS_HAS_EXCEPTIONS */
-
-      case TOK_BREAK:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        if (!MatchLabel(cx, ts, pn))
-            return NULL;
-        stmt = tc->topStmt;
-        label = pn->pn_atom;
-        if (label) {
-            for (; ; stmt = stmt->down) {
-                if (!stmt) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_LABEL_NOT_FOUND);
-                    return NULL;
-                }
-                if (stmt->type == STMT_LABEL && stmt->label == label)
-                    break;
-            }
-        } else {
-            for (; ; stmt = stmt->down) {
-                if (!stmt) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_TOUGH_BREAK);
-                    return NULL;
-                }
-                if (STMT_IS_LOOP(stmt) || stmt->type == STMT_SWITCH)
-                    break;
-            }
-        }
-        if (label)
-            pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        break;
-
-      case TOK_CONTINUE:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        if (!MatchLabel(cx, ts, pn))
-            return NULL;
-        stmt = tc->topStmt;
-        label = pn->pn_atom;
-        if (label) {
-            for (stmt2 = NULL; ; stmt = stmt->down) {
-                if (!stmt) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_LABEL_NOT_FOUND);
-                    return NULL;
-                }
-                if (stmt->type == STMT_LABEL) {
-                    if (stmt->label == label) {
-                        if (!stmt2 || !STMT_IS_LOOP(stmt2)) {
-                            js_ReportCompileErrorNumber(cx, ts,
-                                                        JSREPORT_TS |
-                                                        JSREPORT_ERROR,
-                                                        JSMSG_BAD_CONTINUE);
-                            return NULL;
-                        }
-                        break;
-                    }
-                } else {
-                    stmt2 = stmt;
-                }
-            }
-        } else {
-            for (; ; stmt = stmt->down) {
-                if (!stmt) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_BAD_CONTINUE);
-                    return NULL;
-                }
-                if (STMT_IS_LOOP(stmt))
-                    break;
-            }
-        }
-        if (label)
-            pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        break;
-
-      case TOK_WITH:
-        if (!js_ReportCompileErrorNumber(cx, ts,
-                                         JSREPORT_TS |
-                                         JSREPORT_WARNING |
-                                         JSREPORT_STRICT,
-                                         JSMSG_DEPRECATED_USAGE,
-                                         js_with_statement_str)) {
-            return NULL;
-        }
-
-        pn = NewParseNode(cx, ts, PN_BINARY, tc);
-        if (!pn)
-            return NULL;
-        MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_WITH);
-        pn2 = Expr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_WITH);
-        pn->pn_left = pn2;
-
-        js_PushStatement(tc, &stmtInfo, STMT_WITH, -1);
-        pn2 = Statement(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        js_PopStatement(tc);
-
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_right = pn2;
-        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        return pn;
-
-      case TOK_VAR:
-        pn = Variables(cx, ts, tc);
-        if (!pn)
-            return NULL;
-
-        /* Tell js_EmitTree to generate a final POP. */
-        pn->pn_extra |= PNX_POPVAR;
-        break;
-
-      case TOK_RETURN:
-        if (!(tc->flags & TCF_IN_FUNCTION)) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_RETURN);
-            return NULL;
-        }
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-
-        /* This is ugly, but we don't want to require a semicolon. */
-        ts->flags |= TSF_OPERAND;
-        tt = js_PeekTokenSameLine(cx, ts);
-        ts->flags &= ~TSF_OPERAND;
-        if (tt == TOK_ERROR)
-            return NULL;
-
-        if (tt != TOK_EOF && tt != TOK_EOL && tt != TOK_SEMI && tt != TOK_RC) {
-            pn2 = Expr(cx, ts, tc);
-            if (!pn2)
-                return NULL;
-            tc->flags |= TCF_RETURN_EXPR;
-            pn->pn_pos.end = pn2->pn_pos.end;
-            pn->pn_kid = pn2;
-        } else {
-            tc->flags |= TCF_RETURN_VOID;
-            pn->pn_kid = NULL;
-        }
-
-        if (JS_HAS_STRICT_OPTION(cx) &&
-            (~tc->flags & (TCF_RETURN_EXPR | TCF_RETURN_VOID)) == 0) {
-            /*
-             * We must be in a frame with a non-native function, because
-             * we're compiling one.
-             */
-            if (!ReportNoReturnValue(cx, ts))
-                return NULL;
-        }
-        break;
-
-      case TOK_LC:
-        js_PushStatement(tc, &stmtInfo, STMT_BLOCK, -1);
-        pn = Statements(cx, ts, tc);
-        if (!pn)
-            return NULL;
-
-        MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_IN_COMPOUND);
-        js_PopStatement(tc);
-        return pn;
-
-      case TOK_EOL:
-      case TOK_SEMI:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_SEMI;
-        pn->pn_kid = NULL;
-        return pn;
-
-#if JS_HAS_DEBUGGER_KEYWORD
-      case TOK_DEBUGGER:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_DEBUGGER;
-        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        break;
-#endif /* JS_HAS_DEBUGGER_KEYWORD */
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_DEFAULT:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        if (!js_MatchToken(cx, ts, TOK_NAME) ||
-            CURRENT_TOKEN(ts).t_atom != cx->runtime->atomState.xmlAtom ||
-            !js_MatchToken(cx, ts, TOK_NAME) ||
-            CURRENT_TOKEN(ts).t_atom != cx->runtime->atomState.namespaceAtom ||
-            !js_MatchToken(cx, ts, TOK_ASSIGN) ||
-            CURRENT_TOKEN(ts).t_op != JSOP_NOP) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_DEFAULT_XML_NAMESPACE);
-            return NULL;
-        }
-        pn2 = Expr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_op = JSOP_DEFXMLNS;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_kid = pn2;
-        tc->flags |= TCF_HAS_DEFXMLNS;
-        break;
-#endif
-
-      case TOK_ERROR:
-        return NULL;
-
-      default:
-#if JS_HAS_XML_SUPPORT
-      expression:
-#endif
-        js_UngetToken(ts);
-        pn2 = Expr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-
-        if (js_PeekToken(cx, ts) == TOK_COLON) {
-            if (pn2->pn_type != TOK_NAME) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_LABEL);
-                return NULL;
-            }
-            label = pn2->pn_atom;
-            for (stmt = tc->topStmt; stmt; stmt = stmt->down) {
-                if (stmt->type == STMT_LABEL && stmt->label == label) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_DUPLICATE_LABEL);
-                    return NULL;
-                }
-            }
-            (void) js_GetToken(cx, ts);
-
-            /* Push a label struct and parse the statement. */
-            js_PushStatement(tc, &stmtInfo, STMT_LABEL, -1);
-            stmtInfo.label = label;
-            pn = Statement(cx, ts, tc);
-            if (!pn)
-                return NULL;
-
-            /* Pop the label, set pn_expr, and return early. */
-            js_PopStatement(tc);
-            pn2->pn_type = TOK_COLON;
-            pn2->pn_pos.end = pn->pn_pos.end;
-            pn2->pn_expr = pn;
-            return pn2;
-        }
-
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_SEMI;
-        pn->pn_pos = pn2->pn_pos;
-        pn->pn_kid = pn2;
-        break;
-    }
-
-    /* Check termination of this primitive statement. */
-    if (ON_CURRENT_LINE(ts, pn->pn_pos)) {
-        tt = js_PeekTokenSameLine(cx, ts);
-        if (tt == TOK_ERROR)
-            return NULL;
-        if (tt != TOK_EOF && tt != TOK_EOL && tt != TOK_SEMI && tt != TOK_RC) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_SEMI_BEFORE_STMNT);
-            return NULL;
-        }
-    }
-
-    (void) js_MatchToken(cx, ts, TOK_SEMI);
-    return pn;
-}
-
-static JSParseNode *
-Variables(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    JSObject *obj, *pobj;
-    JSStackFrame *fp;
-    JSFunction *fun;
-    JSClass *clasp;
-    JSPropertyOp getter, setter, currentGetter, currentSetter;
-    JSAtom *atom;
-    JSAtomListElement *ale;
-    JSOp prevop;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    JSBool ok;
-
-    /*
-     * The tricky part of this code is to create special parsenode opcodes for
-     * getting and setting variables (which will be stored as special slots in
-     * the frame).  The complex special case is an eval() inside a function.
-     * If the evaluated string references variables in the enclosing function,
-     * then we need to generate the special variable opcodes.  We determine
-     * this by looking up the variable id in the current variable scope.
-     */
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_VAR);
-    pn = NewParseNode(cx, ts, PN_LIST, tc);
-    if (!pn)
-        return NULL;
-    pn->pn_op = CURRENT_TOKEN(ts).t_op;
-    PN_INIT_LIST(pn);
-
-    /*
-     * Skip eval and debugger frames when looking for the function whose code
-     * is being compiled.  If we are called from FunctionBody, TCF_IN_FUNCTION
-     * will be set in tc->flags, and we can be sure fp->fun is the function to
-     * use.  But if a function calls eval, the string argument is treated as a
-     * Program (per ECMA), so TCF_IN_FUNCTION won't be set.
-     *
-     * What's more, when the following code is reached from eval, cx->fp->fun
-     * is eval's JSFunction (a native function), so we need to skip its frame.
-     * We should find the scripted caller's function frame just below it, but
-     * we code a loop out of paranoia.
-     */
-    for (fp = cx->fp; (fp->flags & JSFRAME_SPECIAL) && fp->down; fp = fp->down)
-        continue;
-    obj = fp->varobj;
-    fun = fp->fun;
-    clasp = OBJ_GET_CLASS(cx, obj);
-    if (fun && clasp == &js_FunctionClass) {
-        /* We are compiling code inside a function */
-        getter = js_GetLocalVariable;
-        setter = js_SetLocalVariable;
-    } else if (fun && clasp == &js_CallClass) {
-        /* We are compiling code from an eval inside a function */
-        getter = js_GetCallVariable;
-        setter = js_SetCallVariable;
-    } else {
-        getter = clasp->getProperty;
-        setter = clasp->setProperty;
-    }
-
-    ok = JS_TRUE;
-    do {
-        currentGetter = getter;
-        currentSetter = setter;
-        MUST_MATCH_TOKEN(TOK_NAME, JSMSG_NO_VARIABLE_NAME);
-        atom = CURRENT_TOKEN(ts).t_atom;
-
-        ATOM_LIST_SEARCH(ale, &tc->decls, atom);
-        if (ale) {
-            prevop = ALE_JSOP(ale);
-            if (JS_HAS_STRICT_OPTION(cx)
-                ? pn->pn_op != JSOP_DEFVAR || prevop != JSOP_DEFVAR
-                : pn->pn_op == JSOP_DEFCONST || prevop == JSOP_DEFCONST) {
-                const char *name = js_AtomToPrintableString(cx, atom);
-                if (!name ||
-                    !js_ReportCompileErrorNumber(cx, ts,
-                                                 (pn->pn_op != JSOP_DEFCONST &&
-                                                  prevop != JSOP_DEFCONST)
-                                                 ? JSREPORT_TS |
-                                                   JSREPORT_WARNING |
-                                                   JSREPORT_STRICT
-                                                 : JSREPORT_TS | JSREPORT_ERROR,
-                                                 JSMSG_REDECLARED_VAR,
-                                                 (prevop == JSOP_DEFFUN ||
-                                                  prevop == JSOP_CLOSURE)
-                                                 ? js_function_str
-                                                 : (prevop == JSOP_DEFCONST)
-                                                 ? js_const_str
-                                                 : js_var_str,
-                                                 name)) {
-                    return NULL;
-                }
-            }
-            if (pn->pn_op == JSOP_DEFVAR && prevop == JSOP_CLOSURE)
-                tc->flags |= TCF_FUN_CLOSURE_VS_VAR;
-        } else {
-            ale = js_IndexAtom(cx, atom, &tc->decls);
-            if (!ale)
-                return NULL;
-        }
-        ALE_SET_JSOP(ale, pn->pn_op);
-
-        pn2 = NewParseNode(cx, ts, PN_NAME, tc);
-        if (!pn2)
-            return NULL;
-        pn2->pn_op = JSOP_NAME;
-        pn2->pn_atom = atom;
-        pn2->pn_expr = NULL;
-        pn2->pn_slot = -1;
-        pn2->pn_attrs = (pn->pn_op == JSOP_DEFCONST)
-                        ? JSPROP_PERMANENT | JSPROP_READONLY
-                        : JSPROP_PERMANENT;
-        PN_APPEND(pn, pn2);
-
-        if (!fun) {
-            /* Don't lookup global variables at compile time. */
-            prop = NULL;
-        } else if (OBJ_IS_NATIVE(obj)) {
-            if (!js_LookupHiddenProperty(cx, obj, ATOM_TO_JSID(atom),
-                                         &pobj, &prop)) {
-                return NULL;
-            }
-        } else {
-            if (!OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &pobj, &prop))
-                return NULL;
-        }
-        if (prop && pobj == obj && OBJ_IS_NATIVE(pobj)) {
-            sprop = (JSScopeProperty *)prop;
-            if (sprop->getter == js_GetArgument) {
-                const char *name = js_AtomToPrintableString(cx, atom);
-                if (!name) {
-                    ok = JS_FALSE;
-                } else if (pn->pn_op == JSOP_DEFCONST) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_REDECLARED_PARAM,
-                                                name);
-                    ok = JS_FALSE;
-                } else {
-                    currentGetter = js_GetArgument;
-                    currentSetter = js_SetArgument;
-                    ok = js_ReportCompileErrorNumber(cx, ts,
-                                                     JSREPORT_TS |
-                                                     JSREPORT_WARNING |
-                                                     JSREPORT_STRICT,
-                                                     JSMSG_VAR_HIDES_ARG,
-                                                     name);
-                }
-            } else {
-                if (fun) {
-                    /* Not an argument, must be a redeclared local var. */
-                    if (clasp == &js_FunctionClass) {
-                        JS_ASSERT(sprop->getter == js_GetLocalVariable);
-                        JS_ASSERT((sprop->flags & SPROP_HAS_SHORTID) &&
-                                  (uint16) sprop->shortid < fun->nvars);
-                    } else if (clasp == &js_CallClass) {
-                        if (sprop->getter == js_GetCallVariable) {
-                            /*
-                             * Referencing a variable introduced by a var
-                             * statement in the enclosing function. Check
-                             * that the slot number we have is in range.
-                             */
-                            JS_ASSERT((sprop->flags & SPROP_HAS_SHORTID) &&
-                                      (uint16) sprop->shortid < fun->nvars);
-                        } else {
-                            /*
-                             * A variable introduced through another eval:
-                             * don't use the special getters and setters
-                             * since we can't allocate a slot in the frame.
-                             */
-                            currentGetter = sprop->getter;
-                            currentSetter = sprop->setter;
-                        }
-                    }
-
-                    /* Override the old getter and setter, to handle eval. */
-                    sprop = js_ChangeNativePropertyAttrs(cx, obj, sprop,
-                                                         0, sprop->attrs,
-                                                         currentGetter,
-                                                         currentSetter);
-                    if (!sprop)
-                        ok = JS_FALSE;
-                }
-            }
-        } else {
-            /*
-             * Property not found in current variable scope: we have not seen
-             * this variable before.  Define a new local variable by adding a
-             * property to the function's scope, allocating one slot in the
-             * function's frame.  Global variables and any locals declared in
-             * with statement bodies are handled at runtime, by script prolog
-             * JSOP_DEFVAR bytecodes generated for slot-less vars.
-             */
-            sprop = NULL;
-            if (prop) {
-                OBJ_DROP_PROPERTY(cx, pobj, prop);
-                prop = NULL;
-            }
-            if (currentGetter == js_GetCallVariable) {
-                /* Can't increase fun->nvars in an active frame! */
-                currentGetter = clasp->getProperty;
-                currentSetter = clasp->setProperty;
-            }
-            if (currentGetter == js_GetLocalVariable &&
-                atom != cx->runtime->atomState.argumentsAtom &&
-                fp->scopeChain == obj &&
-                !js_InWithStatement(tc)) {
-                if (!js_AddHiddenProperty(cx, obj, ATOM_TO_JSID(atom),
-                                          currentGetter, currentSetter,
-                                          SPROP_INVALID_SLOT,
-                                          pn2->pn_attrs | JSPROP_SHARED,
-                                          SPROP_HAS_SHORTID, fun->nvars)) {
-                    return NULL;
-                }
-                if (fun->nvars == JS_BITMASK(16)) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_TOO_MANY_FUN_VARS);
-                    return NULL;
-                }
-                fun->nvars++;
-            }
-        }
-
-        if (js_MatchToken(cx, ts, TOK_ASSIGN)) {
-            if (CURRENT_TOKEN(ts).t_op != JSOP_NOP) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_VAR_INIT);
-                ok = JS_FALSE;
-            } else {
-                pn2->pn_expr = AssignExpr(cx, ts, tc);
-                if (!pn2->pn_expr) {
-                    ok = JS_FALSE;
-                } else {
-                    pn2->pn_op = (pn->pn_op == JSOP_DEFCONST)
-                                 ? JSOP_SETCONST
-                                 : JSOP_SETNAME;
-                    if (atom == cx->runtime->atomState.argumentsAtom)
-                        tc->flags |= TCF_FUN_HEAVYWEIGHT;
-                }
-            }
-        }
-
-        if (prop)
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-        if (!ok)
-            return NULL;
-    } while (js_MatchToken(cx, ts, TOK_COMMA));
-
-    pn->pn_pos.end = PN_LAST(pn)->pn_pos.end;
-    return pn;
-}
-
-static JSParseNode *
-Expr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-
-    pn = AssignExpr(cx, ts, tc);
-    if (pn && js_MatchToken(cx, ts, TOK_COMMA)) {
-        pn2 = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn2)
-            return NULL;
-        pn2->pn_pos.begin = pn->pn_pos.begin;
-        PN_INIT_LIST_1(pn2, pn);
-        pn = pn2;
-        do {
-            pn2 = AssignExpr(cx, ts, tc);
-            if (!pn2)
-                return NULL;
-            PN_APPEND(pn, pn2);
-        } while (js_MatchToken(cx, ts, TOK_COMMA));
-        pn->pn_pos.end = PN_LAST(pn)->pn_pos.end;
-    }
-    return pn;
-}
-
-static JSParseNode *
-AssignExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    JSTokenType tt;
-    JSOp op;
-
-    CHECK_RECURSION();
-
-    pn = CondExpr(cx, ts, tc);
-    if (!pn)
-        return NULL;
-
-    tt = js_GetToken(cx, ts);
-#if JS_HAS_GETTER_SETTER
-    if (tt == TOK_NAME) {
-        tt = CheckGetterOrSetter(cx, ts, TOK_ASSIGN);
-        if (tt == TOK_ERROR)
-            return NULL;
-    }
-#endif
-    if (tt != TOK_ASSIGN) {
-        js_UngetToken(ts);
-        return pn;
-    }
-
-    op = CURRENT_TOKEN(ts).t_op;
-    for (pn2 = pn; pn2->pn_type == TOK_RP; pn2 = pn2->pn_kid)
-        continue;
-    switch (pn2->pn_type) {
-      case TOK_NAME:
-        pn2->pn_op = JSOP_SETNAME;
-        if (pn2->pn_atom == cx->runtime->atomState.argumentsAtom)
-            tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        break;
-      case TOK_DOT:
-        pn2->pn_op = (pn2->pn_op == JSOP_GETMETHOD)
-                     ? JSOP_SETMETHOD
-                     : JSOP_SETPROP;
-        break;
-      case TOK_LB:
-        pn2->pn_op = JSOP_SETELEM;
-        break;
-#if JS_HAS_LVALUE_RETURN
-      case TOK_LP:
-        pn2->pn_op = JSOP_SETCALL;
-        break;
-#endif
-#if JS_HAS_XML_SUPPORT
-      case TOK_UNARYOP:
-        if (pn2->pn_op == JSOP_XMLNAME) {
-            pn2->pn_op = JSOP_SETXMLNAME;
-            break;
-        }
-        /* FALL THROUGH */
-#endif
-      default:
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_BAD_LEFTSIDE_OF_ASS);
-        return NULL;
-    }
-    pn = NewBinary(cx, TOK_ASSIGN, op, pn2, AssignExpr(cx, ts, tc), tc);
-    return pn;
-}
-
-static JSParseNode *
-CondExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn1, *pn2, *pn3;
-#if JS_HAS_IN_OPERATOR
-    uintN oldflags;
-#endif /* JS_HAS_IN_OPERATOR */
-
-    pn = OrExpr(cx, ts, tc);
-    if (pn && js_MatchToken(cx, ts, TOK_HOOK)) {
-        pn1 = pn;
-        pn = NewParseNode(cx, ts, PN_TERNARY, tc);
-        if (!pn)
-            return NULL;
-#if JS_HAS_IN_OPERATOR
-        /*
-         * Always accept the 'in' operator in the middle clause of a ternary,
-         * where it's unambiguous, even if we might be parsing the init of a
-         * for statement.
-         */
-        oldflags = tc->flags;
-        tc->flags &= ~TCF_IN_FOR_INIT;
-#endif /* JS_HAS_IN_OPERATOR */
-        pn2 = AssignExpr(cx, ts, tc);
-#if JS_HAS_IN_OPERATOR
-        tc->flags = oldflags | (tc->flags & TCF_FUN_FLAGS);
-#endif /* JS_HAS_IN_OPERATOR */
-
-        if (!pn2)
-            return NULL;
-        MUST_MATCH_TOKEN(TOK_COLON, JSMSG_COLON_IN_COND);
-        pn3 = AssignExpr(cx, ts, tc);
-        if (!pn3)
-            return NULL;
-        pn->pn_pos.begin = pn1->pn_pos.begin;
-        pn->pn_pos.end = pn3->pn_pos.end;
-        pn->pn_kid1 = pn1;
-        pn->pn_kid2 = pn2;
-        pn->pn_kid3 = pn3;
-    }
-    return pn;
-}
-
-static JSParseNode *
-OrExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = AndExpr(cx, ts, tc);
-    if (pn && js_MatchToken(cx, ts, TOK_OR))
-        pn = NewBinary(cx, TOK_OR, JSOP_OR, pn, OrExpr(cx, ts, tc), tc);
-    return pn;
-}
-
-static JSParseNode *
-AndExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = BitOrExpr(cx, ts, tc);
-    if (pn && js_MatchToken(cx, ts, TOK_AND))
-        pn = NewBinary(cx, TOK_AND, JSOP_AND, pn, AndExpr(cx, ts, tc), tc);
-    return pn;
-}
-
-static JSParseNode *
-BitOrExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = BitXorExpr(cx, ts, tc);
-    while (pn && js_MatchToken(cx, ts, TOK_BITOR)) {
-        pn = NewBinary(cx, TOK_BITOR, JSOP_BITOR, pn, BitXorExpr(cx, ts, tc),
-                       tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-BitXorExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = BitAndExpr(cx, ts, tc);
-    while (pn && js_MatchToken(cx, ts, TOK_BITXOR)) {
-        pn = NewBinary(cx, TOK_BITXOR, JSOP_BITXOR, pn, BitAndExpr(cx, ts, tc),
-                       tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-BitAndExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = EqExpr(cx, ts, tc);
-    while (pn && js_MatchToken(cx, ts, TOK_BITAND))
-        pn = NewBinary(cx, TOK_BITAND, JSOP_BITAND, pn, EqExpr(cx, ts, tc), tc);
-    return pn;
-}
-
-static JSParseNode *
-EqExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSOp op;
-
-    pn = RelExpr(cx, ts, tc);
-    while (pn && js_MatchToken(cx, ts, TOK_EQOP)) {
-        op = CURRENT_TOKEN(ts).t_op;
-        pn = NewBinary(cx, TOK_EQOP, op, pn, RelExpr(cx, ts, tc), tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-RelExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSTokenType tt;
-    JSOp op;
-#if JS_HAS_IN_OPERATOR
-    uintN inForInitFlag = tc->flags & TCF_IN_FOR_INIT;
-
-    /*
-     * Uses of the in operator in ShiftExprs are always unambiguous,
-     * so unset the flag that prohibits recognizing it.
-     */
-    tc->flags &= ~TCF_IN_FOR_INIT;
-#endif /* JS_HAS_IN_OPERATOR */
-
-    pn = ShiftExpr(cx, ts, tc);
-    while (pn &&
-           (js_MatchToken(cx, ts, TOK_RELOP)
-#if JS_HAS_IN_OPERATOR
-            /*
-             * Recognize the 'in' token as an operator only if we're not
-             * currently in the init expr of a for loop.
-             */
-            || (inForInitFlag == 0 && js_MatchToken(cx, ts, TOK_IN))
-#endif /* JS_HAS_IN_OPERATOR */
-#if JS_HAS_INSTANCEOF
-            || js_MatchToken(cx, ts, TOK_INSTANCEOF)
-#endif /* JS_HAS_INSTANCEOF */
-            )) {
-        tt = CURRENT_TOKEN(ts).type;
-        op = CURRENT_TOKEN(ts).t_op;
-        pn = NewBinary(cx, tt, op, pn, ShiftExpr(cx, ts, tc), tc);
-    }
-#if JS_HAS_IN_OPERATOR
-    /* Restore previous state of inForInit flag. */
-    tc->flags |= inForInitFlag;
-#endif /* JS_HAS_IN_OPERATOR */
-
-    return pn;
-}
-
-static JSParseNode *
-ShiftExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSOp op;
-
-    pn = AddExpr(cx, ts, tc);
-    while (pn && js_MatchToken(cx, ts, TOK_SHOP)) {
-        op = CURRENT_TOKEN(ts).t_op;
-        pn = NewBinary(cx, TOK_SHOP, op, pn, AddExpr(cx, ts, tc), tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-AddExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSTokenType tt;
-    JSOp op;
-
-    pn = MulExpr(cx, ts, tc);
-    while (pn &&
-           (js_MatchToken(cx, ts, TOK_PLUS) ||
-            js_MatchToken(cx, ts, TOK_MINUS))) {
-        tt = CURRENT_TOKEN(ts).type;
-        op = (tt == TOK_PLUS) ? JSOP_ADD : JSOP_SUB;
-        pn = NewBinary(cx, tt, op, pn, MulExpr(cx, ts, tc), tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-MulExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSTokenType tt;
-    JSOp op;
-
-    pn = UnaryExpr(cx, ts, tc);
-    while (pn &&
-           (js_MatchToken(cx, ts, TOK_STAR) ||
-            js_MatchToken(cx, ts, TOK_DIVOP))) {
-        tt = CURRENT_TOKEN(ts).type;
-        op = CURRENT_TOKEN(ts).t_op;
-        pn = NewBinary(cx, tt, op, pn, UnaryExpr(cx, ts, tc), tc);
-    }
-    return pn;
-}
-
-static JSParseNode *
-SetLvalKid(JSContext *cx, JSTokenStream *ts, JSParseNode *pn, JSParseNode *kid,
-           const char *name)
-{
-    while (kid->pn_type == TOK_RP)
-        kid = kid->pn_kid;
-    if (kid->pn_type != TOK_NAME &&
-        kid->pn_type != TOK_DOT &&
-#if JS_HAS_LVALUE_RETURN
-        (kid->pn_type != TOK_LP || kid->pn_op != JSOP_CALL) &&
-#endif
-#if JS_HAS_XML_SUPPORT
-        (kid->pn_type != TOK_UNARYOP || kid->pn_op != JSOP_XMLNAME) &&
-#endif
-        kid->pn_type != TOK_LB) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_BAD_OPERAND, name);
-        return NULL;
-    }
-    pn->pn_kid = kid;
-    return kid;
-}
-
-static const char *incop_name_str[] = {"increment", "decrement"};
-
-static JSBool
-SetIncOpKid(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-            JSParseNode *pn, JSParseNode *kid,
-            JSTokenType tt, JSBool preorder)
-{
-    JSOp op;
-
-    kid = SetLvalKid(cx, ts, pn, kid, incop_name_str[tt == TOK_DEC]);
-    if (!kid)
-        return JS_FALSE;
-    switch (kid->pn_type) {
-      case TOK_NAME:
-        op = (tt == TOK_INC)
-             ? (preorder ? JSOP_INCNAME : JSOP_NAMEINC)
-             : (preorder ? JSOP_DECNAME : JSOP_NAMEDEC);
-        if (kid->pn_atom == cx->runtime->atomState.argumentsAtom)
-            tc->flags |= TCF_FUN_HEAVYWEIGHT;
-        break;
-
-      case TOK_DOT:
-        op = (tt == TOK_INC)
-             ? (preorder ? JSOP_INCPROP : JSOP_PROPINC)
-             : (preorder ? JSOP_DECPROP : JSOP_PROPDEC);
-        break;
-
-#if JS_HAS_LVALUE_RETURN
-      case TOK_LP:
-        JS_ASSERT(kid->pn_op == JSOP_CALL);
-        kid->pn_op = JSOP_SETCALL;
-        /* FALL THROUGH */
-#endif
-#if JS_HAS_XML_SUPPORT
-      case TOK_UNARYOP:
-        if (kid->pn_op == JSOP_XMLNAME)
-            kid->pn_op = JSOP_SETXMLNAME;
-        /* FALL THROUGH */
-#endif
-      case TOK_LB:
-        op = (tt == TOK_INC)
-             ? (preorder ? JSOP_INCELEM : JSOP_ELEMINC)
-             : (preorder ? JSOP_DECELEM : JSOP_ELEMDEC);
-        break;
-
-      default:
-        JS_ASSERT(0);
-        op = JSOP_NOP;
-    }
-    pn->pn_op = op;
-    return JS_TRUE;
-}
-
-static JSParseNode *
-UnaryExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSTokenType tt;
-    JSParseNode *pn, *pn2;
-
-    CHECK_RECURSION();
-
-    ts->flags |= TSF_OPERAND;
-    tt = js_GetToken(cx, ts);
-    ts->flags &= ~TSF_OPERAND;
-
-    switch (tt) {
-      case TOK_UNARYOP:
-      case TOK_PLUS:
-      case TOK_MINUS:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_UNARYOP;      /* PLUS and MINUS are binary */
-        pn->pn_op = CURRENT_TOKEN(ts).t_op;
-        pn2 = UnaryExpr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        pn->pn_kid = pn2;
-        break;
-
-      case TOK_INC:
-      case TOK_DEC:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn2 = MemberExpr(cx, ts, tc, JS_TRUE);
-        if (!pn2)
-            return NULL;
-        if (!SetIncOpKid(cx, ts, tc, pn, pn2, tt, JS_TRUE))
-            return NULL;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        break;
-
-      case TOK_DELETE:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn2 = UnaryExpr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        pn->pn_pos.end = pn2->pn_pos.end;
-
-        /*
-         * Under ECMA3, deleting any unary expression is valid -- it simply
-         * returns true. Here we strip off any parentheses.
-         */
-        while (pn2->pn_type == TOK_RP)
-            pn2 = pn2->pn_kid;
-        pn->pn_kid = pn2;
-        break;
-
-      case TOK_ERROR:
-        return NULL;
-
-      default:
-        js_UngetToken(ts);
-        pn = MemberExpr(cx, ts, tc, JS_TRUE);
-        if (!pn)
-            return NULL;
-
-        /* Don't look across a newline boundary for a postfix incop. */
-        if (ON_CURRENT_LINE(ts, pn->pn_pos)) {
-            tt = js_PeekTokenSameLine(cx, ts);
-            if (tt == TOK_INC || tt == TOK_DEC) {
-                (void) js_GetToken(cx, ts);
-                pn2 = NewParseNode(cx, ts, PN_UNARY, tc);
-                if (!pn2)
-                    return NULL;
-                if (!SetIncOpKid(cx, ts, tc, pn2, pn, tt, JS_FALSE))
-                    return NULL;
-                pn2->pn_pos.begin = pn->pn_pos.begin;
-                pn = pn2;
-            }
-        }
-        break;
-    }
-    return pn;
-}
-
-static JSBool
-ArgumentList(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-             JSParseNode *listNode)
-{
-    JSBool matched;
-
-    ts->flags |= TSF_OPERAND;
-    matched = js_MatchToken(cx, ts, TOK_RP);
-    ts->flags &= ~TSF_OPERAND;
-    if (!matched) {
-        do {
-            JSParseNode *argNode = AssignExpr(cx, ts, tc);
-            if (!argNode)
-                return JS_FALSE;
-            PN_APPEND(listNode, argNode);
-        } while (js_MatchToken(cx, ts, TOK_COMMA));
-
-        if (js_GetToken(cx, ts) != TOK_RP) {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_PAREN_AFTER_ARGS);
-            return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSParseNode *
-MemberExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-           JSBool allowCallSyntax)
-{
-    JSParseNode *pn, *pn2, *pn3;
-    JSTokenType tt;
-
-    CHECK_RECURSION();
-
-    /* Check for new expression first. */
-    ts->flags |= TSF_OPERAND;
-    tt = js_PeekToken(cx, ts);
-    ts->flags &= ~TSF_OPERAND;
-    if (tt == TOK_NEW) {
-        (void) js_GetToken(cx, ts);
-
-        pn = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn)
-            return NULL;
-        pn2 = MemberExpr(cx, ts, tc, JS_FALSE);
-        if (!pn2)
-            return NULL;
-        pn->pn_op = JSOP_NEW;
-        PN_INIT_LIST_1(pn, pn2);
-        pn->pn_pos.begin = pn2->pn_pos.begin;
-
-        if (js_MatchToken(cx, ts, TOK_LP) && !ArgumentList(cx, ts, tc, pn))
-            return NULL;
-        if (pn->pn_count > ARGC_LIMIT) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_TOO_MANY_CON_ARGS);
-            return NULL;
-        }
-        pn->pn_pos.end = PN_LAST(pn)->pn_pos.end;
-    } else {
-        pn = PrimaryExpr(cx, ts, tc);
-        if (!pn)
-            return NULL;
-
-        if (pn->pn_type == TOK_ANYNAME ||
-            pn->pn_type == TOK_AT ||
-            pn->pn_type == TOK_DBLCOLON) {
-            pn2 = NewOrRecycledNode(cx, tc);
-            if (!pn2)
-                return NULL;
-            pn2->pn_type = TOK_UNARYOP;
-            pn2->pn_pos = pn->pn_pos;
-            pn2->pn_op = JSOP_XMLNAME;
-            pn2->pn_arity = PN_UNARY;
-            pn2->pn_kid = pn;
-            pn2->pn_next = NULL;
-            pn = pn2;
-        }
-    }
-
-    while ((tt = js_GetToken(cx, ts)) > TOK_EOF) {
-        if (tt == TOK_DOT) {
-            pn2 = NewParseNode(cx, ts, PN_NAME, tc);
-            if (!pn2)
-                return NULL;
-#if JS_HAS_XML_SUPPORT
-            pn3 = PrimaryExpr(cx, ts, tc);
-            if (!pn3)
-                return NULL;
-            tt = pn3->pn_type;
-            if (tt == TOK_NAME ||
-                (tt == TOK_DBLCOLON &&
-                 pn3->pn_arity == PN_NAME &&
-                 pn3->pn_expr->pn_type == TOK_FUNCTION)) {
-                pn2->pn_op = (tt == TOK_NAME) ? JSOP_GETPROP : JSOP_GETMETHOD;
-                pn2->pn_expr = pn;
-                pn2->pn_atom = pn3->pn_atom;
-                RecycleTree(pn3, tc);
-            } else {
-                if (TOKEN_TYPE_IS_XML(tt)) {
-                    pn2->pn_type = TOK_LB;
-                    pn2->pn_op = JSOP_GETELEM;
-                } else if (tt == TOK_RP) {
-                    JSParseNode *group = pn3;
-
-                    /* Recycle the useless TOK_RP/JSOP_GROUP node. */
-                    pn3 = group->pn_kid;
-                    group->pn_kid = NULL;
-                    RecycleTree(group, tc);
-                    pn2->pn_type = TOK_FILTER;
-                    pn2->pn_op = JSOP_FILTER;
-                } else {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_NAME_AFTER_DOT);
-                    return NULL;
-                }
-                pn2->pn_arity = PN_BINARY;
-                pn2->pn_left = pn;
-                pn2->pn_right = pn3;
-            }
-#else
-            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_NAME_AFTER_DOT);
-            pn2->pn_op = JSOP_GETPROP;
-            pn2->pn_expr = pn;
-            pn2->pn_atom = CURRENT_TOKEN(ts).t_atom;
-#endif
-            pn2->pn_pos.begin = pn->pn_pos.begin;
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-#if JS_HAS_XML_SUPPORT
-        } else if (tt == TOK_DBLDOT) {
-            pn2 = NewParseNode(cx, ts, PN_BINARY, tc);
-            if (!pn2)
-                return NULL;
-            pn3 = PrimaryExpr(cx, ts, tc);
-            if (!pn3)
-                return NULL;
-            tt = pn3->pn_type;
-            if (tt == TOK_NAME) {
-                pn3->pn_type = TOK_STRING;
-                pn3->pn_arity = PN_NULLARY;
-                pn3->pn_op = JSOP_STRING;
-            } else if (!TOKEN_TYPE_IS_XML(tt)) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_NAME_AFTER_DOT);
-                return NULL;
-            }
-            pn2->pn_op = JSOP_DESCENDANTS;
-            pn2->pn_left = pn;
-            pn2->pn_right = pn3;
-            pn2->pn_pos.begin = pn->pn_pos.begin;
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-#endif
-        } else if (tt == TOK_LB) {
-            pn2 = NewParseNode(cx, ts, PN_BINARY, tc);
-            if (!pn2)
-                return NULL;
-            pn3 = Expr(cx, ts, tc);
-            if (!pn3)
-                return NULL;
-
-            MUST_MATCH_TOKEN(TOK_RB, JSMSG_BRACKET_IN_INDEX);
-            pn2->pn_pos.begin = pn->pn_pos.begin;
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-
-            /* Optimize o['p'] to o.p by rewriting pn2. */
-            if (pn3->pn_type == TOK_STRING) {
-                pn2->pn_type = TOK_DOT;
-                pn2->pn_op = JSOP_GETPROP;
-                pn2->pn_arity = PN_NAME;
-                pn2->pn_expr = pn;
-                pn2->pn_atom = pn3->pn_atom;
-            } else {
-                pn2->pn_op = JSOP_GETELEM;
-                pn2->pn_left = pn;
-                pn2->pn_right = pn3;
-            }
-        } else if (allowCallSyntax && tt == TOK_LP) {
-            pn2 = NewParseNode(cx, ts, PN_LIST, tc);
-            if (!pn2)
-                return NULL;
-
-            /* Pick JSOP_EVAL and flag tc as heavyweight if eval(...). */
-            pn2->pn_op = JSOP_CALL;
-            if (pn->pn_op == JSOP_NAME &&
-                pn->pn_atom == cx->runtime->atomState.evalAtom) {
-                pn2->pn_op = JSOP_EVAL;
-                tc->flags |= TCF_FUN_HEAVYWEIGHT;
-            }
-
-            PN_INIT_LIST_1(pn2, pn);
-            pn2->pn_pos.begin = pn->pn_pos.begin;
-
-            if (!ArgumentList(cx, ts, tc, pn2))
-                return NULL;
-            if (pn2->pn_count > ARGC_LIMIT) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_TOO_MANY_FUN_ARGS);
-                return NULL;
-            }
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        } else {
-            js_UngetToken(ts);
-            return pn;
-        }
-
-        pn = pn2;
-    }
-    if (tt == TOK_ERROR)
-        return NULL;
-    return pn;
-}
-
-static JSParseNode *
-BracketedExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    uintN oldflags;
-    JSParseNode *pn;
-
-#if JS_HAS_IN_OPERATOR
-    /*
-     * Always accept the 'in' operator in a parenthesized expression,
-     * where it's unambiguous, even if we might be parsing the init of a
-     * for statement.
-     */
-    oldflags = tc->flags;
-    tc->flags &= ~TCF_IN_FOR_INIT;
-#endif
-    pn = Expr(cx, ts, tc);
-#if JS_HAS_IN_OPERATOR
-    tc->flags = oldflags | (tc->flags & TCF_FUN_FLAGS);
-#endif
-    return pn;
-}
-
-#if JS_HAS_XML_SUPPORT
-
-static JSParseNode *
-EndBracketedExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = BracketedExpr(cx, ts, tc);
-    if (!pn)
-        return NULL;
-
-    MUST_MATCH_TOKEN(TOK_RB, JSMSG_BRACKET_AFTER_ATTR_EXPR);
-    return pn;
-}
-
-/*
- * From the ECMA-357 grammar in 11.1.1 and 11.1.2:
- *
- *      AttributeIdentifier:
- *              @ PropertySelector
- *              @ QualifiedIdentifier
- *              @ [ Expression ]
- *
- *      PropertySelector:
- *              Identifier
- *              *
- *
- *      QualifiedIdentifier:
- *              PropertySelector :: PropertySelector
- *              PropertySelector :: [ Expression ]
- *
- * We adapt AttributeIdentifier and QualifiedIdentier to be LL(1), like so:
- *
- *      AttributeIdentifier:
- *              @ QualifiedIdentifier
- *              @ [ Expression ]
- *
- *      PropertySelector:
- *              Identifier
- *              *
- *
- *      QualifiedIdentifier:
- *              PropertySelector :: PropertySelector
- *              PropertySelector :: [ Expression ]
- *              PropertySelector
- *
- * Since PrimaryExpression: Identifier in ECMA-262 and we want the semantics
- * for that rule to result in a name node, but extend the grammar to include
- * PrimaryExpression: QualifiedIdentifier, we factor further:
- *
- *      QualifiedIdentifier:
- *              PropertySelector QualifiedSuffix
- *
- *      QualifiedSuffix:
- *              :: PropertySelector
- *              :: [ Expression ]
- *              /nothing/
- *
- * And use this production instead of PrimaryExpression: QualifiedIdentifier:
- *
- *      PrimaryExpression:
- *              Identifier QualifiedSuffix
- *
- * We hoists the :: match into callers of QualifiedSuffix, in order to tweak
- * PropertySelector vs. Identifier pn_arity, pn_op, and other members.
- */
-static JSParseNode *
-PropertySelector(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-    if (!pn)
-        return NULL;
-    if (pn->pn_type == TOK_STAR) {
-        pn->pn_type = TOK_ANYNAME;
-        pn->pn_op = JSOP_ANYNAME;
-        pn->pn_atom = cx->runtime->atomState.starAtom;
-    } else {
-        JS_ASSERT(pn->pn_type == TOK_NAME);
-        pn->pn_op = JSOP_QNAMEPART;
-        pn->pn_arity = PN_NAME;
-        pn->pn_atom = CURRENT_TOKEN(ts).t_atom;
-        pn->pn_expr = NULL;
-        pn->pn_slot = -1;
-        pn->pn_attrs = 0;
-    }
-    return pn;
-}
-
-static JSParseNode *
-QualifiedSuffix(JSContext *cx, JSTokenStream *ts, JSParseNode *pn,
-                JSTreeContext *tc)
-{
-    JSParseNode *pn2, *pn3;
-    JSTokenType tt;
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_DBLCOLON);
-    pn2 = NewParseNode(cx, ts, PN_NAME, tc);
-    if (!pn2)
-        return NULL;
-
-    /* Left operand of :: must be evaluated if it is an identifier. */
-    if (pn->pn_op == JSOP_QNAMEPART)
-        pn->pn_op = JSOP_NAME;
-
-    tt = js_GetToken(cx, ts);
-    if (tt == TOK_STAR || tt == TOK_NAME) {
-        /* Inline and specialize PropertySelector for JSOP_QNAMECONST. */
-        pn2->pn_op = JSOP_QNAMECONST;
-        pn2->pn_atom = (tt == TOK_STAR)
-                       ? cx->runtime->atomState.starAtom
-                       : CURRENT_TOKEN(ts).t_atom;
-        pn2->pn_expr = pn;
-        pn2->pn_slot = -1;
-        pn2->pn_attrs = 0;
-        return pn2;
-    }
-
-    if (tt != TOK_LB) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_SYNTAX_ERROR);
-        return NULL;
-    }
-    pn3 = EndBracketedExpr(cx, ts, tc);
-    if (!pn3)
-        return NULL;
-
-    pn2->pn_op = JSOP_QNAME;
-    pn2->pn_arity = PN_BINARY;
-    pn2->pn_left = pn;
-    pn2->pn_right = pn3;
-    return pn2;
-}
-
-static JSParseNode *
-QualifiedIdentifier(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-
-    pn = PropertySelector(cx, ts, tc);
-    if (!pn)
-        return NULL;
-    if (js_MatchToken(cx, ts, TOK_DBLCOLON))
-        pn = QualifiedSuffix(cx, ts, pn, tc);
-    return pn;
-}
-
-static JSParseNode *
-AttributeIdentifier(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    JSTokenType tt;
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_AT);
-    pn = NewParseNode(cx, ts, PN_UNARY, tc);
-    if (!pn)
-        return NULL;
-    pn->pn_op = JSOP_TOATTRNAME;
-    tt = js_GetToken(cx, ts);
-    if (tt == TOK_STAR || tt == TOK_NAME) {
-        pn2 = QualifiedIdentifier(cx, ts, tc);
-    } else if (tt == TOK_LB) {
-        pn2 = EndBracketedExpr(cx, ts, tc);
-    } else {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_SYNTAX_ERROR);
-        return NULL;
-    }
-    if (!pn2)
-        return NULL;
-    pn->pn_kid = pn2;
-    return pn;
-}
-
-/*
- * Make a TOK_LC unary node whose pn_kid is an expression.
- */
-static JSParseNode *
-XMLExpr(JSContext *cx, JSTokenStream *ts, JSBool inTag, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2;
-    uintN oldflags;
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_LC);
-    pn = NewParseNode(cx, ts, PN_UNARY, tc);
-    if (!pn)
-        return NULL;
-
-    /*
-     * Turn off XML tag mode, but don't restore it after parsing this braced
-     * expression.  Instead, simply restore ts's old flags.  This is required
-     * because XMLExpr is called both from within a tag, and from within text
-     * contained in an element, but outside of any start, end, or point tag.
-     */
-    oldflags = ts->flags;
-    ts->flags = oldflags & ~TSF_XMLTAGMODE;
-    pn2 = Expr(cx, ts, tc);
-    if (!pn2)
-        return NULL;
-
-    MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_IN_XML_EXPR);
-    ts->flags = oldflags;
-    pn->pn_kid = pn2;
-    pn->pn_op = inTag ? JSOP_XMLTAGEXPR : JSOP_XMLELTEXPR;
-    return pn;
-}
-
-/*
- * Make a terminal node for oneof TOK_XMLNAME, TOK_XMLATTR, TOK_XMLSPACE,
- * TOK_XMLTEXT, TOK_XMLCDATA, TOK_XMLCOMMENT, or TOK_XMLPI.  When converting
- * parse tree to XML, we preserve a TOK_XMLSPACE node only if it's the sole
- * child of a container tag.
- */
-static JSParseNode *
-XMLAtomNode(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn;
-    JSToken *tp;
-
-    pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-    if (!pn)
-        return NULL;
-    tp = &CURRENT_TOKEN(ts);
-    pn->pn_op = tp->t_op;
-    pn->pn_atom = tp->t_atom;
-    if (tp->type == TOK_XMLPI)
-        pn->pn_atom2 = tp->t_atom2;
-    return pn;
-}
-
-/*
- * Parse the productions:
- *
- *      XMLNameExpr:
- *              XMLName XMLNameExpr?
- *              { Expr } XMLNameExpr?
- *
- * Return a PN_LIST, PN_UNARY, or PN_NULLARY according as XMLNameExpr produces
- * a list of names and/or expressions, a single expression, or a single name.
- * If PN_LIST or PN_NULLARY, pn_type will be TOK_XMLNAME; if PN_UNARY, pn_type
- * will be TOK_LC.
- */
-static JSParseNode *
-XMLNameExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSParseNode *pn, *pn2, *list;
-    JSTokenType tt;
-
-    pn = list = NULL;
-    do {
-        tt = CURRENT_TOKEN(ts).type;
-        if (tt == TOK_LC) {
-            pn2 = XMLExpr(cx, ts, JS_TRUE, tc);
-            if (!pn2)
-                return NULL;
-        } else {
-            JS_ASSERT(tt == TOK_XMLNAME);
-            pn2 = XMLAtomNode(cx, ts, tc);
-            if (!pn2)
-                return NULL;
-        }
-
-        if (!pn) {
-            pn = pn2;
-        } else {
-            if (!list) {
-                list = NewParseNode(cx, ts, PN_LIST, tc);
-                if (!list)
-                    return NULL;
-                list->pn_type = TOK_XMLNAME;
-                list->pn_pos.begin = pn->pn_pos.begin;
-                PN_INIT_LIST_1(list, pn);
-                list->pn_extra = PNX_CANTFOLD;
-                pn = list;
-            }
-            pn->pn_pos.end = pn2->pn_pos.end;
-            PN_APPEND(pn, pn2);
-        }
-    } while ((tt = js_GetToken(cx, ts)) == TOK_XMLNAME || tt == TOK_LC);
-
-    js_UngetToken(ts);
-    return pn;
-}
-
-/*
- * Macro to test whether an XMLNameExpr or XMLTagContent node can be folded
- * at compile time into a JSXML tree.
- */
-#define XML_FOLDABLE(pn)        ((pn)->pn_arity == PN_LIST                    \
-                                 ? ((pn)->pn_extra & PNX_CANTFOLD) == 0       \
-                                 : (pn)->pn_type != TOK_LC)
-
-/*
- * Parse the productions:
- *
- *      XMLTagContent:
- *              XMLNameExpr
- *              XMLTagContent S XMLNameExpr S? = S? XMLAttr
- *              XMLTagContent S XMLNameExpr S? = S? { Expr }
- *
- * Return a PN_LIST, PN_UNARY, or PN_NULLARY according to how XMLTagContent
- * produces a list of name and attribute values and/or braced expressions, a
- * single expression, or a single name.
- *
- * If PN_LIST or PN_NULLARY, pn_type will be TOK_XMLNAME for the case where
- * XMLTagContent: XMLNameExpr.  If pn_type is not TOK_XMLNAME but pn_arity is
- * PN_LIST, pn_type will be tagtype.  If PN_UNARY, pn_type will be TOK_LC and
- * we parsed exactly one expression.
- */
-static JSParseNode *
-XMLTagContent(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-              JSTokenType tagtype, JSAtom **namep)
-{
-    JSParseNode *pn, *pn2, *list;
-    JSTokenType tt;
-
-    pn = XMLNameExpr(cx, ts, tc);
-    if (!pn)
-        return NULL;
-    *namep = (pn->pn_arity == PN_NULLARY) ? pn->pn_atom : NULL;
-    list = NULL;
-
-    while (js_MatchToken(cx, ts, TOK_XMLSPACE)) {
-        tt = js_GetToken(cx, ts);
-        if (tt != TOK_XMLNAME && tt != TOK_LC) {
-            js_UngetToken(ts);
-            break;
-        }
-
-        pn2 = XMLNameExpr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-        if (!list) {
-            list = NewParseNode(cx, ts, PN_LIST, tc);
-            if (!list)
-                return NULL;
-            list->pn_type = tagtype;
-            list->pn_pos.begin = pn->pn_pos.begin;
-            PN_INIT_LIST_1(list, pn);
-            pn = list;
-        }
-        PN_APPEND(pn, pn2);
-        if (!XML_FOLDABLE(pn2))
-            pn->pn_extra |= PNX_CANTFOLD;
-
-        js_MatchToken(cx, ts, TOK_XMLSPACE);
-        MUST_MATCH_TOKEN(TOK_ASSIGN, JSMSG_NO_ASSIGN_IN_XML_ATTR);
-        js_MatchToken(cx, ts, TOK_XMLSPACE);
-
-        tt = js_GetToken(cx, ts);
-        if (tt == TOK_XMLATTR) {
-            pn2 = XMLAtomNode(cx, ts, tc);
-        } else if (tt == TOK_LC) {
-            pn2 = XMLExpr(cx, ts, JS_TRUE, tc);
-            pn->pn_extra |= PNX_CANTFOLD;
-        } else {
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_XML_ATTR_VALUE);
-            return NULL;
-        }
-        if (!pn2)
-            return NULL;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        PN_APPEND(pn, pn2);
-    }
-
-    return pn;
-}
-
-#define XML_CHECK_FOR_ERROR_AND_EOF(tt,result)                                \
-    JS_BEGIN_MACRO                                                            \
-        if ((tt) <= TOK_EOF) {                                                \
-            if ((tt) == TOK_EOF) {                                            \
-                js_ReportCompileErrorNumber(cx, ts,                           \
-                                            JSREPORT_TS | JSREPORT_ERROR,     \
-                                            JSMSG_END_OF_XML_SOURCE);         \
-            }                                                                 \
-            return result;                                                    \
-        }                                                                     \
-    JS_END_MACRO
-
-static JSParseNode *
-XMLElementOrList(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-                 JSBool allowList);
-
-/*
- * Consume XML element tag content, including the TOK_XMLETAGO (</) sequence
- * that opens the end tag for the container.
- */
-static JSBool
-XMLElementContent(JSContext *cx, JSTokenStream *ts, JSParseNode *pn,
-                  JSTreeContext *tc)
-{
-    JSTokenType tt;
-    JSParseNode *pn2;
-    JSAtom *textAtom;
-
-    ts->flags &= ~TSF_XMLTAGMODE;
-    for (;;) {
-        ts->flags |= TSF_XMLTEXTMODE;
-        tt = js_GetToken(cx, ts);
-        ts->flags &= ~TSF_XMLTEXTMODE;
-        XML_CHECK_FOR_ERROR_AND_EOF(tt, JS_FALSE);
-
-        JS_ASSERT(tt == TOK_XMLSPACE || tt == TOK_XMLTEXT);
-        textAtom = CURRENT_TOKEN(ts).t_atom;
-        if (textAtom) {
-            /* Non-zero-length XML text scanned. */
-            pn2 = XMLAtomNode(cx, ts, tc);
-            if (!pn2)
-                return JS_FALSE;
-            pn->pn_pos.end = pn2->pn_pos.end;
-            PN_APPEND(pn, pn2);
-        }
-
-        ts->flags |= TSF_OPERAND;
-        tt = js_GetToken(cx, ts);
-        ts->flags &= ~TSF_OPERAND;
-        XML_CHECK_FOR_ERROR_AND_EOF(tt, JS_FALSE);
-        if (tt == TOK_XMLETAGO)
-            break;
-
-        if (tt == TOK_LC) {
-            pn2 = XMLExpr(cx, ts, JS_FALSE, tc);
-            pn->pn_extra |= PNX_CANTFOLD;
-        } else if (tt == TOK_XMLSTAGO) {
-            pn2 = XMLElementOrList(cx, ts, tc, JS_FALSE);
-            if (pn2) {
-                pn2->pn_extra &= ~PNX_XMLROOT;
-                pn->pn_extra |= pn2->pn_extra;
-            }
-        } else {
-            JS_ASSERT(tt == TOK_XMLCDATA || tt == TOK_XMLCOMMENT ||
-                      tt == TOK_XMLPI);
-            pn2 = XMLAtomNode(cx, ts, tc);
-        }
-        if (!pn2)
-            return JS_FALSE;
-        pn->pn_pos.end = pn2->pn_pos.end;
-        PN_APPEND(pn, pn2);
-    }
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_XMLETAGO);
-    ts->flags |= TSF_XMLTAGMODE;
-    return JS_TRUE;
-}
-
-/*
- * Return a PN_LIST node containing an XML or XMLList Initialiser.
- */
-static JSParseNode *
-XMLElementOrList(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-                 JSBool allowList)
-{
-    JSParseNode *pn, *pn2, *list;
-    JSBool hadSpace;
-    JSTokenType tt;
-    JSAtom *startAtom, *endAtom;
-
-    JS_ASSERT(CURRENT_TOKEN(ts).type == TOK_XMLSTAGO);
-    pn = NewParseNode(cx, ts, PN_LIST, tc);
-    if (!pn)
-        return NULL;
-
-    ts->flags |= TSF_XMLTAGMODE;
-    hadSpace = js_MatchToken(cx, ts, TOK_XMLSPACE);
-    tt = js_GetToken(cx, ts);
-    if (tt == TOK_ERROR)
-        return NULL;
-
-    if (tt == TOK_XMLNAME || tt == TOK_LC) {
-        /*
-         * XMLElement.  Append the tag and its contents, if any, to pn.
-         */
-        pn2 = XMLTagContent(cx, ts, tc, TOK_XMLSTAGO, &startAtom);
-        if (!pn2)
-            return NULL;
-        js_MatchToken(cx, ts, TOK_XMLSPACE);
-
-        tt = js_GetToken(cx, ts);
-        if (tt == TOK_XMLPTAGC) {
-            /* Point tag (/>): recycle pn if pn2 is a list of tag contents. */
-            if (pn2->pn_type == TOK_XMLSTAGO) {
-                PN_INIT_LIST(pn);
-                RecycleTree(pn, tc);
-                pn = pn2;
-            } else {
-                JS_ASSERT(pn2->pn_type == TOK_XMLNAME ||
-                          pn2->pn_type == TOK_LC);
-                PN_INIT_LIST_1(pn, pn2);
-                if (!XML_FOLDABLE(pn2))
-                    pn->pn_extra |= PNX_CANTFOLD;
-            }
-            pn->pn_type = TOK_XMLPTAGC;
-            pn->pn_extra |= PNX_XMLROOT;
-        } else {
-            /* We had better have a tag-close (>) at this point. */
-            if (tt != TOK_XMLTAGC) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_XML_TAG_SYNTAX);
-                return NULL;
-            }
-            pn2->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-
-            /* Make sure pn2 is a TOK_XMLSTAGO list containing tag contents. */
-            if (pn2->pn_type != TOK_XMLSTAGO) {
-                PN_INIT_LIST_1(pn, pn2);
-                if (!XML_FOLDABLE(pn2))
-                    pn->pn_extra |= PNX_CANTFOLD;
-                pn2 = pn;
-                pn = NewParseNode(cx, ts, PN_LIST, tc);
-                if (!pn)
-                    return NULL;
-            }
-
-            /* Now make pn a nominal-root TOK_XMLELEM list containing pn2. */
-            pn->pn_type = TOK_XMLELEM;
-            PN_INIT_LIST_1(pn, pn2);
-            if (!XML_FOLDABLE(pn2))
-                pn->pn_extra |= PNX_CANTFOLD;
-            pn->pn_extra |= PNX_XMLROOT;
-
-            /* Get element contents and delimiting end-tag-open sequence. */
-            if (!XMLElementContent(cx, ts, pn, tc))
-                return NULL;
-
-            js_MatchToken(cx, ts, TOK_XMLSPACE);
-            tt = js_GetToken(cx, ts);
-            XML_CHECK_FOR_ERROR_AND_EOF(tt, NULL);
-            if (tt != TOK_XMLNAME && tt != TOK_LC) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_XML_TAG_SYNTAX);
-                return NULL;
-            }
-
-            /* Parse end tag; check mismatch at compile-time if we can. */
-            pn2 = XMLTagContent(cx, ts, tc, TOK_XMLETAGO, &endAtom);
-            if (!pn2)
-                return NULL;
-            if (pn2->pn_type == TOK_XMLETAGO) {
-                /* Oops, end tag has attributes! */
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_XML_TAG_SYNTAX);
-                return NULL;
-            }
-            if (endAtom && startAtom && endAtom != startAtom) {
-                /* End vs. start tag name mismatch: point to the tag name. */
-                ++pn2->pn_pos.begin.index;
-                js_ReportCompileErrorNumber(cx, pn2,
-                                            JSREPORT_PN | JSREPORT_ERROR,
-                                            JSMSG_XML_TAG_NAME_MISMATCH);
-                return NULL;
-            }
-
-            /* Make a TOK_XMLETAGO list with pn2 as its single child. */
-            JS_ASSERT(pn2->pn_type == TOK_XMLNAME || pn2->pn_type == TOK_LC);
-            list = NewParseNode(cx, ts, PN_LIST, tc);
-            if (!list)
-                return NULL;
-            list->pn_type = TOK_XMLETAGO;
-            PN_INIT_LIST_1(list, pn2);
-            PN_APPEND(pn, list);
-            if (!XML_FOLDABLE(pn2)) {
-                list->pn_extra |= PNX_CANTFOLD;
-                pn->pn_extra |= PNX_CANTFOLD;
-            }
-
-            js_MatchToken(cx, ts, TOK_XMLSPACE);
-            MUST_MATCH_TOKEN(TOK_XMLTAGC, JSMSG_BAD_XML_TAG_SYNTAX);
-        }
-
-        /* Set pn_op now that pn has been updated to its final value. */
-        pn->pn_op = JSOP_TOXML;
-    } else if (!hadSpace && allowList && tt == TOK_XMLTAGC) {
-        /* XMLList Initialiser. */
-        pn->pn_type = TOK_XMLLIST;
-        pn->pn_op = JSOP_TOXMLLIST;
-        PN_INIT_LIST(pn);
-        pn->pn_extra |= PNX_XMLROOT;
-        if (!XMLElementContent(cx, ts, pn, tc))
-            return NULL;
-
-        MUST_MATCH_TOKEN(TOK_XMLTAGC, JSMSG_BAD_XML_LIST_SYNTAX);
-    } else {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_BAD_XML_NAME_SYNTAX);
-        return NULL;
-    }
-
-    pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-    ts->flags &= ~TSF_XMLTAGMODE;
-    return pn;
-}
-
-static JSParseNode *
-XMLElementOrListRoot(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
-                     JSBool allowList)
-{
-    uint32 oldopts;
-    JSParseNode *pn;
-
-    /*
-     * Force XML support to be enabled so that comments and CDATA literals
-     * are recognized, instead of <! followed by -- starting an HTML comment
-     * to end of line (used in script tags to hide content from old browsers
-     * that don't recognize <script>).
-     */
-    oldopts = JS_SetOptions(cx, cx->options | JSOPTION_XML);
-    pn = XMLElementOrList(cx, ts, tc, allowList);
-    JS_SetOptions(cx, oldopts);
-    return pn;
-}
-
-JS_FRIEND_API(JSParseNode *)
-js_ParseXMLTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts,
-                       JSBool allowList)
-{
-    JSStackFrame *fp, frame;
-    JSParseNode *pn;
-    JSTreeContext tc;
-    JSTokenType tt;
-
-    /*
-     * Push a compiler frame if we have no frames, or if the top frame is a
-     * lightweight function activation, or if its scope chain doesn't match
-     * the one passed to us.
-     */
-    fp = cx->fp;
-    if (!fp || !fp->varobj || fp->scopeChain != chain) {
-        memset(&frame, 0, sizeof frame);
-        frame.varobj = frame.scopeChain = chain;
-        if (cx->options & JSOPTION_VAROBJFIX) {
-            while ((chain = JS_GetParent(cx, chain)) != NULL)
-                frame.varobj = chain;
-        }
-        frame.down = fp;
-        if (fp)
-            frame.flags = fp->flags & (JSFRAME_SPECIAL | JSFRAME_COMPILE_N_GO);
-        cx->fp = &frame;
-    }
-
-    JS_KEEP_ATOMS(cx->runtime);
-    TREE_CONTEXT_INIT(&tc);
-
-    /* Set XML-only mode to turn off special treatment of {expr} in XML. */
-    ts->flags |= TSF_OPERAND | TSF_XMLONLYMODE;
-    tt = js_GetToken(cx, ts);
-    ts->flags &= ~TSF_OPERAND;
-
-    if (tt != TOK_XMLSTAGO) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_BAD_XML_MARKUP);
-        pn = NULL;
-    } else {
-        pn = XMLElementOrListRoot(cx, ts, &tc, allowList);
-    }
-
-    ts->flags &= ~TSF_XMLONLYMODE;
-    TREE_CONTEXT_FINISH(&tc);
-    JS_UNKEEP_ATOMS(cx->runtime);
-    cx->fp = fp;
-    return pn;
-}
-
-#endif /* JS_HAS_XMLSUPPORT */
-
-static JSParseNode *
-PrimaryExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
-{
-    JSTokenType tt;
-    JSParseNode *pn, *pn2, *pn3;
-#if JS_HAS_GETTER_SETTER
-    JSAtom *atom;
-    JSRuntime *rt;
-#endif
-
-#if JS_HAS_SHARP_VARS
-    JSParseNode *defsharp;
-    JSBool notsharp;
-
-    defsharp = NULL;
-    notsharp = JS_FALSE;
-  again:
-    /*
-     * Control flows here after #n= is scanned.  If the following primary is
-     * not valid after such a "sharp variable" definition, the tt switch case
-     * should set notsharp.
-     */
-#endif
-
-    CHECK_RECURSION();
-
-    ts->flags |= TSF_OPERAND;
-    tt = js_GetToken(cx, ts);
-    ts->flags &= ~TSF_OPERAND;
-
-#if JS_HAS_GETTER_SETTER
-    if (tt == TOK_NAME) {
-        tt = CheckGetterOrSetter(cx, ts, TOK_FUNCTION);
-        if (tt == TOK_ERROR)
-            return NULL;
-    }
-#endif
-
-    switch (tt) {
-#if JS_HAS_LEXICAL_CLOSURE || JS_HAS_XML_SUPPORT
-      case TOK_FUNCTION:
-#if JS_HAS_XML_SUPPORT
-        if (js_MatchToken(cx, ts, TOK_DBLCOLON)) {
-            pn2 = NewParseNode(cx, ts, PN_NULLARY, tc);
-            if (!pn2)
-                return NULL;
-            pn2->pn_type = TOK_FUNCTION;
-            pn = QualifiedSuffix(cx, ts, pn2, tc);
-            if (!pn)
-                return NULL;
-            break;
-        }
-#endif
-        pn = FunctionExpr(cx, ts, tc);
-        if (!pn)
-            return NULL;
-        break;
-#endif
-
-#if JS_HAS_INITIALIZERS
-      case TOK_LB:
-      {
-        JSBool matched;
-        jsuint atomIndex;
-
-        pn = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_RB;
-
-#if JS_HAS_SHARP_VARS
-        if (defsharp) {
-            PN_INIT_LIST_1(pn, defsharp);
-            defsharp = NULL;
-        } else
-#endif
-            PN_INIT_LIST(pn);
-
-        ts->flags |= TSF_OPERAND;
-        matched = js_MatchToken(cx, ts, TOK_RB);
-        ts->flags &= ~TSF_OPERAND;
-        if (!matched) {
-            for (atomIndex = 0; ; atomIndex++) {
-                if (atomIndex == ATOM_INDEX_LIMIT) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_ARRAY_INIT_TOO_BIG);
-                    return NULL;
-                }
-
-                ts->flags |= TSF_OPERAND;
-                tt = js_PeekToken(cx, ts);
-                ts->flags &= ~TSF_OPERAND;
-                if (tt == TOK_RB) {
-                    pn->pn_extra |= PNX_ENDCOMMA;
-                    break;
-                }
-
-                if (tt == TOK_COMMA) {
-                    /* So CURRENT_TOKEN gets TOK_COMMA and not TOK_LB. */
-                    js_MatchToken(cx, ts, TOK_COMMA);
-                    pn2 = NewParseNode(cx, ts, PN_NULLARY, tc);
-                } else {
-                    pn2 = AssignExpr(cx, ts, tc);
-                }
-                if (!pn2)
-                    return NULL;
-                PN_APPEND(pn, pn2);
-
-                if (tt != TOK_COMMA) {
-                    /* If we didn't already match TOK_COMMA in above case. */
-                    if (!js_MatchToken(cx, ts, TOK_COMMA))
-                        break;
-                }
-            }
-
-            MUST_MATCH_TOKEN(TOK_RB, JSMSG_BRACKET_AFTER_LIST);
-        }
-        pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        return pn;
-      }
-
-      case TOK_LC:
-        pn = NewParseNode(cx, ts, PN_LIST, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_type = TOK_RC;
-
-#if JS_HAS_SHARP_VARS
-        if (defsharp) {
-            PN_INIT_LIST_1(pn, defsharp);
-            defsharp = NULL;
-        } else
-#endif
-            PN_INIT_LIST(pn);
-
-        if (!js_MatchToken(cx, ts, TOK_RC)) {
-            do {
-                JSOp op;
-
-                tt = js_GetToken(cx, ts);
-                switch (tt) {
-                  case TOK_NUMBER:
-                    pn3 = NewParseNode(cx, ts, PN_NULLARY, tc);
-                    if (pn3)
-                        pn3->pn_dval = CURRENT_TOKEN(ts).t_dval;
-                    break;
-                  case TOK_NAME:
-#if JS_HAS_GETTER_SETTER
-                    atom = CURRENT_TOKEN(ts).t_atom;
-                    rt = cx->runtime;
-                    if (atom == rt->atomState.getAtom ||
-                        atom == rt->atomState.setAtom) {
-                        op = (atom == rt->atomState.getAtom)
-                             ? JSOP_GETTER
-                             : JSOP_SETTER;
-                        if (js_MatchToken(cx, ts, TOK_NAME)) {
-                            pn3 = NewParseNode(cx, ts, PN_NAME, tc);
-                            if (!pn3)
-                                return NULL;
-                            pn3->pn_atom = CURRENT_TOKEN(ts).t_atom;
-                            pn3->pn_expr = NULL;
-
-                            /* We have to fake a 'function' token here. */
-                            CURRENT_TOKEN(ts).t_op = JSOP_NOP;
-                            CURRENT_TOKEN(ts).type = TOK_FUNCTION;
-                            pn2 = FunctionExpr(cx, ts, tc);
-                            pn2 = NewBinary(cx, TOK_COLON, op, pn3, pn2, tc);
-                            goto skip;
-                        }
-                    }
-                    /* else fall thru ... */
-#endif
-                  case TOK_STRING:
-                    pn3 = NewParseNode(cx, ts, PN_NULLARY, tc);
-                    if (pn3)
-                        pn3->pn_atom = CURRENT_TOKEN(ts).t_atom;
-                    break;
-                  case TOK_RC:
-                    if (!js_ReportCompileErrorNumber(cx, ts,
-                                                     JSREPORT_TS |
-                                                     JSREPORT_WARNING |
-                                                     JSREPORT_STRICT,
-                                                     JSMSG_TRAILING_COMMA)) {
-                        return NULL;
-                    }
-                    goto end_obj_init;
-                  default:
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_BAD_PROP_ID);
-                    return NULL;
-                }
-
-                tt = js_GetToken(cx, ts);
-#if JS_HAS_GETTER_SETTER
-                if (tt == TOK_NAME) {
-                    tt = CheckGetterOrSetter(cx, ts, TOK_COLON);
-                    if (tt == TOK_ERROR)
-                        return NULL;
-                }
-#endif
-                if (tt != TOK_COLON) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_COLON_AFTER_ID);
-                    return NULL;
-                }
-                op = CURRENT_TOKEN(ts).t_op;
-                pn2 = NewBinary(cx, TOK_COLON, op, pn3, AssignExpr(cx, ts, tc),
-                                tc);
-#if JS_HAS_GETTER_SETTER
-              skip:
-#endif
-                if (!pn2)
-                    return NULL;
-                PN_APPEND(pn, pn2);
-            } while (js_MatchToken(cx, ts, TOK_COMMA));
-
-            MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_LIST);
-        }
-      end_obj_init:
-        pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        return pn;
-
-#if JS_HAS_SHARP_VARS
-      case TOK_DEFSHARP:
-        if (defsharp)
-            goto badsharp;
-        defsharp = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!defsharp)
-            return NULL;
-        defsharp->pn_kid = NULL;
-        defsharp->pn_num = (jsint) CURRENT_TOKEN(ts).t_dval;
-        goto again;
-
-      case TOK_USESHARP:
-        /* Check for forward/dangling references at runtime, to allow eval. */
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_num = (jsint) CURRENT_TOKEN(ts).t_dval;
-        notsharp = JS_TRUE;
-        break;
-#endif /* JS_HAS_SHARP_VARS */
-#endif /* JS_HAS_INITIALIZERS */
-
-      case TOK_LP:
-        pn = NewParseNode(cx, ts, PN_UNARY, tc);
-        if (!pn)
-            return NULL;
-        pn2 = BracketedExpr(cx, ts, tc);
-        if (!pn2)
-            return NULL;
-
-        MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_IN_PAREN);
-        pn->pn_type = TOK_RP;
-        pn->pn_pos.end = CURRENT_TOKEN(ts).pos.end;
-        pn->pn_kid = pn2;
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_STAR:
-        pn = QualifiedIdentifier(cx, ts, tc);
-        if (!pn)
-            return NULL;
-        notsharp = JS_TRUE;
-        break;
-
-      case TOK_AT:
-        pn = AttributeIdentifier(cx, ts, tc);
-        if (!pn)
-            return NULL;
-        notsharp = JS_TRUE;
-        break;
-
-      case TOK_XMLSTAGO:
-        pn = XMLElementOrListRoot(cx, ts, tc, JS_TRUE);
-        if (!pn)
-            return NULL;
-        notsharp = JS_TRUE;     /* XXXbe could be sharp? */
-        break;
-#endif /* JS_HAS_XML_SUPPORT */
-
-      case TOK_STRING:
-#if JS_HAS_SHARP_VARS
-        notsharp = JS_TRUE;
-        /* FALL THROUGH */
-#endif
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_XMLCDATA:
-      case TOK_XMLCOMMENT:
-      case TOK_XMLPI:
-#endif
-      case TOK_NAME:
-      case TOK_OBJECT:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_atom = CURRENT_TOKEN(ts).t_atom;
-#if JS_HAS_XML_SUPPORT
-        if (tt == TOK_XMLPI)
-            pn->pn_atom2 = CURRENT_TOKEN(ts).t_atom2;
-        else
-#endif
-            pn->pn_op = CURRENT_TOKEN(ts).t_op;
-        if (tt == TOK_NAME) {
-            pn->pn_arity = PN_NAME;
-            pn->pn_expr = NULL;
-            pn->pn_slot = -1;
-            pn->pn_attrs = 0;
-
-#if JS_HAS_XML_SUPPORT
-            if (js_MatchToken(cx, ts, TOK_DBLCOLON)) {
-                pn = QualifiedSuffix(cx, ts, pn, tc);
-                if (!pn)
-                    return NULL;
-                break;
-            }
-#endif
-
-            /* Unqualified __parent__ and __proto__ uses require activations. */
-            if (pn->pn_atom == cx->runtime->atomState.parentAtom ||
-                pn->pn_atom == cx->runtime->atomState.protoAtom) {
-                tc->flags |= TCF_FUN_HEAVYWEIGHT;
-            } else {
-                JSAtomListElement *ale;
-                JSStackFrame *fp;
-                JSStmtInfo *stmt;
-
-                /* Measure optimizable global variable uses. */
-                ATOM_LIST_SEARCH(ale, &tc->decls, pn->pn_atom);
-                if (ale &&
-                    !(fp = cx->fp)->fun &&
-                    fp->scopeChain == fp->varobj &&
-                    !js_InWithStatement(tc) &&
-                    !js_InCatchBlock(tc, pn->pn_atom)) {
-                    tc->globalUses++;
-                    for (stmt = tc->topStmt; stmt; stmt = stmt->down) {
-                        if (STMT_IS_LOOP(stmt)) {
-                            tc->loopyGlobalUses++;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-      case TOK_NUMBER:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_dval = CURRENT_TOKEN(ts).t_dval;
-#if JS_HAS_SHARP_VARS
-        notsharp = JS_TRUE;
-#endif
-        break;
-
-      case TOK_PRIMARY:
-        pn = NewParseNode(cx, ts, PN_NULLARY, tc);
-        if (!pn)
-            return NULL;
-        pn->pn_op = CURRENT_TOKEN(ts).t_op;
-#if JS_HAS_SHARP_VARS
-        notsharp = JS_TRUE;
-#endif
-        break;
-
-#if !JS_HAS_EXPORT_IMPORT
-      case TOK_EXPORT:
-      case TOK_IMPORT:
-#endif
-      case TOK_ERROR:
-        /* The scanner or one of its subroutines reported the error. */
-        return NULL;
-
-      default:
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_SYNTAX_ERROR);
-        return NULL;
-    }
-
-#if JS_HAS_SHARP_VARS
-    if (defsharp) {
-        if (notsharp) {
-  badsharp:
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_SHARP_VAR_DEF);
-            return NULL;
-        }
-        defsharp->pn_kid = pn;
-        return defsharp;
-    }
-#endif
-    return pn;
-}
-
-static JSBool
-ContainsVarStmt(JSParseNode *pn)
-{
-    JSParseNode *pn2;
-
-    if (!pn)
-        return JS_FALSE;
-    switch (pn->pn_arity) {
-      case PN_LIST:
-        if (pn->pn_type == TOK_VAR)
-            return JS_TRUE;
-        for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            if (ContainsVarStmt(pn2))
-                return JS_TRUE;
-        }
-        break;
-      case PN_TERNARY:
-        return ContainsVarStmt(pn->pn_kid1) ||
-               ContainsVarStmt(pn->pn_kid2) ||
-               ContainsVarStmt(pn->pn_kid3);
-      case PN_BINARY:
-        /*
-         * Limit recursion if pn is a binary expression, which can't contain a
-         * var statement.
-         */
-        if (pn->pn_op != JSOP_NOP)
-            return JS_FALSE;
-        return ContainsVarStmt(pn->pn_left) || ContainsVarStmt(pn->pn_right);
-      case PN_UNARY:
-        if (pn->pn_op != JSOP_NOP)
-            return JS_FALSE;
-        return ContainsVarStmt(pn->pn_kid);
-      default:;
-    }
-    return JS_FALSE;
-}
-
-/*
- * Fold from one constant type to another.
- * XXX handles only strings and numbers for now
- */
-static JSBool
-FoldType(JSContext *cx, JSParseNode *pn, JSTokenType type)
-{
-    if (pn->pn_type != type) {
-        switch (type) {
-          case TOK_NUMBER:
-            if (pn->pn_type == TOK_STRING) {
-                jsdouble d;
-                if (!js_ValueToNumber(cx, ATOM_KEY(pn->pn_atom), &d))
-                    return JS_FALSE;
-                pn->pn_dval = d;
-                pn->pn_type = TOK_NUMBER;
-                pn->pn_op = JSOP_NUMBER;
-            }
-            break;
-
-          case TOK_STRING:
-            if (pn->pn_type == TOK_NUMBER) {
-                JSString *str = js_NumberToString(cx, pn->pn_dval);
-                if (!str)
-                    return JS_FALSE;
-                pn->pn_atom = js_AtomizeString(cx, str, 0);
-                if (!pn->pn_atom)
-                    return JS_FALSE;
-                pn->pn_type = TOK_STRING;
-                pn->pn_op = JSOP_STRING;
-            }
-            break;
-
-          default:;
-        }
-    }
-    return JS_TRUE;
-}
-
-/*
- * Fold two numeric constants.  Beware that pn1 and pn2 are recycled, unless
- * one of them aliases pn, so you can't safely fetch pn2->pn_next, e.g., after
- * a successful call to this function.
- */
-static JSBool
-FoldBinaryNumeric(JSContext *cx, JSOp op, JSParseNode *pn1, JSParseNode *pn2,
-                  JSParseNode *pn, JSTreeContext *tc)
-{
-    jsdouble d, d2;
-    int32 i, j;
-    uint32 u;
-
-    JS_ASSERT(pn1->pn_type == TOK_NUMBER && pn2->pn_type == TOK_NUMBER);
-    d = pn1->pn_dval;
-    d2 = pn2->pn_dval;
-    switch (op) {
-      case JSOP_LSH:
-      case JSOP_RSH:
-        if (!js_DoubleToECMAInt32(cx, d, &i))
-            return JS_FALSE;
-        if (!js_DoubleToECMAInt32(cx, d2, &j))
-            return JS_FALSE;
-        j &= 31;
-        d = (op == JSOP_LSH) ? i << j : i >> j;
-        break;
-
-      case JSOP_URSH:
-        if (!js_DoubleToECMAUint32(cx, d, &u))
-            return JS_FALSE;
-        if (!js_DoubleToECMAInt32(cx, d2, &j))
-            return JS_FALSE;
-        j &= 31;
-        d = u >> j;
-        break;
-
-      case JSOP_ADD:
-        d += d2;
-        break;
-
-      case JSOP_SUB:
-        d -= d2;
-        break;
-
-      case JSOP_MUL:
-        d *= d2;
-        break;
-
-      case JSOP_DIV:
-        if (d2 == 0) {
-#if defined(XP_WIN)
-            /* XXX MSVC miscompiles such that (NaN == 0) */
-            if (JSDOUBLE_IS_NaN(d2))
-                d = *cx->runtime->jsNaN;
-            else
-#endif
-            if (d == 0 || JSDOUBLE_IS_NaN(d))
-                d = *cx->runtime->jsNaN;
-            else if ((JSDOUBLE_HI32(d) ^ JSDOUBLE_HI32(d2)) >> 31)
-                d = *cx->runtime->jsNegativeInfinity;
-            else
-                d = *cx->runtime->jsPositiveInfinity;
-        } else {
-            d /= d2;
-        }
-        break;
-
-      case JSOP_MOD:
-        if (d2 == 0) {
-            d = *cx->runtime->jsNaN;
-        } else {
-#if defined(XP_WIN)
-          /* Workaround MS fmod bug where 42 % (1/0) => NaN, not 42. */
-          if (!(JSDOUBLE_IS_FINITE(d) && JSDOUBLE_IS_INFINITE(d2)))
-#endif
-            d = fmod(d, d2);
-        }
-        break;
-
-      default:;
-    }
-
-    /* Take care to allow pn1 or pn2 to alias pn. */
-    if (pn1 != pn)
-        RecycleTree(pn1, tc);
-    if (pn2 != pn)
-        RecycleTree(pn2, tc);
-    pn->pn_type = TOK_NUMBER;
-    pn->pn_op = JSOP_NUMBER;
-    pn->pn_arity = PN_NULLARY;
-    pn->pn_dval = d;
-    return JS_TRUE;
-}
-
-#if JS_HAS_XML_SUPPORT
-
-static JSBool
-FoldXMLConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc)
-{
-    JSTokenType tt;
-    JSParseNode **pnp, *pn1, *pn2;
-    JSString *accum, *str;
-    uint32 i, j;
-
-    JS_ASSERT(pn->pn_arity == PN_LIST);
-    tt = pn->pn_type;
-    pnp = &pn->pn_head;
-    pn1 = *pnp;
-    accum = NULL;
-    if ((pn->pn_extra & PNX_CANTFOLD) == 0) {
-        if (tt == TOK_XMLETAGO)
-            accum = ATOM_TO_STRING(cx->runtime->atomState.etagoAtom);
-        else if (tt == TOK_XMLSTAGO || tt == TOK_XMLPTAGC)
-            accum = ATOM_TO_STRING(cx->runtime->atomState.stagoAtom);
-    }
-
-    for (pn2 = pn1, i = j = 0; pn2; pn2 = pn2->pn_next, i++) {
-        /* The parser already rejected end-tags with attributes. */
-        JS_ASSERT(tt != TOK_XMLETAGO || i == 0);
-        switch (pn2->pn_type) {
-          case TOK_XMLNAME:
-          case TOK_XMLATTR:
-          case TOK_XMLSPACE:
-          case TOK_XMLTEXT:
-          case TOK_STRING:
-            if (pn->pn_arity == PN_LIST)
-                goto cantfold;
-            str = ATOM_TO_STRING(pn2->pn_atom);
-            break;
-
-          case TOK_XMLCDATA:
-            str = js_MakeXMLCDATAString(cx, ATOM_TO_STRING(pn2->pn_atom));
-            if (!str)
-                return JS_FALSE;
-            break;
-
-          case TOK_XMLCOMMENT:
-            str = js_MakeXMLCommentString(cx, ATOM_TO_STRING(pn2->pn_atom));
-            if (!str)
-                return JS_FALSE;
-            break;
-
-          case TOK_XMLPI:
-            str = js_MakeXMLPIString(cx, ATOM_TO_STRING(pn2->pn_atom),
-                                         ATOM_TO_STRING(pn2->pn_atom2));
-            if (!str)
-                return JS_FALSE;
-            break;
-
-          cantfold:
-          default:
-            JS_ASSERT(*pnp == pn1);
-            if ((tt == TOK_XMLSTAGO || tt == TOK_XMLPTAGC) &&
-                (i & 1) ^ (j & 1)) {
-#ifdef DEBUG_brendanXXX
-                printf("1: %d, %d => %s\n",
-                       i, j, accum ? JS_GetStringBytes(accum) : "NULL");
-#endif
-            } else if (accum && pn1 != pn2) {
-                while (pn1->pn_next != pn2) {
-                    pn1 = RecycleTree(pn1, tc);
-                    --pn->pn_count;
-                }
-                pn1->pn_type = TOK_XMLTEXT;
-                pn1->pn_op = JSOP_STRING;
-                pn1->pn_arity = PN_NULLARY;
-                pn1->pn_atom = js_AtomizeString(cx, accum, 0);
-                if (!pn1->pn_atom)
-                    return JS_FALSE;
-                JS_ASSERT(pnp != &pn1->pn_next);
-                *pnp = pn1;
-            }
-            pnp = &pn2->pn_next;
-            pn1 = *pnp;
-            accum = NULL;
-            continue;
-        }
-
-        if (accum) {
-            str = ((tt == TOK_XMLSTAGO || tt == TOK_XMLPTAGC) && i != 0)
-                  ? js_AddAttributePart(cx, i & 1, accum, str)
-                  : js_ConcatStrings(cx, accum, str);
-            if (!str)
-                return JS_FALSE;
-#ifdef DEBUG_brendanXXX
-            printf("2: %d, %d => %s (%u)\n",
-                   i, j, JS_GetStringBytes(str), JSSTRING_LENGTH(str));
-#endif
-            ++j;
-        }
-        accum = str;
-    }
-
-    if (accum) {
-        str = NULL;
-        if ((pn->pn_extra & PNX_CANTFOLD) == 0) {
-            if (tt == TOK_XMLPTAGC)
-                str = ATOM_TO_STRING(cx->runtime->atomState.ptagcAtom);
-            else if (tt == TOK_XMLSTAGO || tt == TOK_XMLETAGO)
-                str = ATOM_TO_STRING(cx->runtime->atomState.tagcAtom);
-        }
-        if (str) {
-            accum = js_ConcatStrings(cx, accum, str);
-            if (!accum)
-                return JS_FALSE;
-        }
-
-        JS_ASSERT(*pnp == pn1);
-        while (pn1->pn_next) {
-            pn1 = RecycleTree(pn1, tc);
-            --pn->pn_count;
-        }
-        pn1->pn_type = TOK_XMLTEXT;
-        pn1->pn_op = JSOP_STRING;
-        pn1->pn_arity = PN_NULLARY;
-        pn1->pn_atom = js_AtomizeString(cx, accum, 0);
-        if (!pn1->pn_atom)
-            return JS_FALSE;
-        JS_ASSERT(pnp != &pn1->pn_next);
-        *pnp = pn1;
-    }
-
-    if (pn1 && pn->pn_count == 1) {
-        /*
-         * Only one node under pn, and it has been folded: move pn1 onto pn
-         * unless pn is an XML root (in which case we need it to tell the code
-         * generator to emit a JSOP_TOXML or JSOP_TOXMLLIST op).  If pn is an
-         * XML root *and* it's a point-tag, rewrite it to TOK_XMLELEM to avoid
-         * extra "<" and "/>" bracketing at runtime.
-         */
-        if (!(pn->pn_extra & PNX_XMLROOT)) {
-            PN_MOVE_NODE(pn, pn1);
-        } else if (tt == TOK_XMLPTAGC) {
-            pn->pn_type = TOK_XMLELEM;
-            pn->pn_op = JSOP_TOXML;
-        }
-    }
-    return JS_TRUE;
-}
-
-#endif /* JS_HAS_XML_SUPPORT */
-
-JSBool
-js_FoldConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc)
-{
-    JSParseNode *pn1 = NULL, *pn2 = NULL, *pn3 = NULL;
-    int stackDummy;
-
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_OVER_RECURSED);
-        return JS_FALSE;
-    }
-
-    switch (pn->pn_arity) {
-      case PN_FUNC:
-      {
-        uint16 oldflags = tc->flags;
-
-        tc->flags = (uint16) pn->pn_flags;
-        if (!js_FoldConstants(cx, pn->pn_body, tc))
-            return JS_FALSE;
-        tc->flags = oldflags;
-        break;
-      }
-
-      case PN_LIST:
-#if 0 /* JS_HAS_XML_SUPPORT */
-        switch (pn->pn_type) {
-          case TOK_XMLELEM:
-          case TOK_XMLLIST:
-          case TOK_XMLPTAGC:
-            /*
-             * Try to fold this XML parse tree once, from the top down, into
-             * a JSXML tree with just one object wrapping the tree root.
-             *
-             * Certain subtrees could be folded similarly, but we'd have to
-             * ensure that none used namespace prefixes declared elsewhere in
-             * its super-tree, and we would have to convert each XML object
-             * created at runtime for such sub-trees back into a string, and
-             * concatenate and re-parse anyway.
-             */
-            if ((pn->pn_extra & (PNX_XMLROOT | PNX_CANTFOLD)) == PNX_XMLROOT &&
-                !(tc->flags & TCF_HAS_DEFXMLNS)) {
-                JSObject *obj;
-                JSAtom *atom;
-
-                obj = js_ParseNodeToXMLObject(cx, pn);
-                if (!obj)
-                    return JS_FALSE;
-                atom = js_AtomizeObject(cx, obj, 0);
-                if (!atom)
-                    return JS_FALSE;
-                pn->pn_op = JSOP_XMLOBJECT;
-                pn->pn_arity = PN_NULLARY;
-                pn->pn_atom = atom;
-                return JS_TRUE;
-            }
-
-            /*
-             * Can't fold from parse node to XML tree -- try folding strings
-             * as much as possible, and folding XML sub-trees bottom up to
-             * minimize string concatenation and ToXML/ToXMLList operations
-             * at runtime.
-             */
-            break;
-
-          default:;
-        }
-#endif
-
-        /* Save the list head in pn1 for later use. */
-        for (pn1 = pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            if (!js_FoldConstants(cx, pn2, tc))
-                return JS_FALSE;
-        }
-        break;
-
-      case PN_TERNARY:
-        /* Any kid may be null (e.g. for (;;)). */
-        pn1 = pn->pn_kid1;
-        pn2 = pn->pn_kid2;
-        pn3 = pn->pn_kid3;
-        if (pn1 && !js_FoldConstants(cx, pn1, tc))
-            return JS_FALSE;
-        if (pn2 && !js_FoldConstants(cx, pn2, tc))
-            return JS_FALSE;
-        if (pn3 && !js_FoldConstants(cx, pn3, tc))
-            return JS_FALSE;
-        break;
-
-      case PN_BINARY:
-        /* First kid may be null (for default case in switch). */
-        pn1 = pn->pn_left;
-        pn2 = pn->pn_right;
-        if (pn1 && !js_FoldConstants(cx, pn1, tc))
-            return JS_FALSE;
-        if (!js_FoldConstants(cx, pn2, tc))
-            return JS_FALSE;
-        break;
-
-      case PN_UNARY:
-        /* Our kid may be null (e.g. return; vs. return e;). */
-        pn1 = pn->pn_kid;
-        if (pn1 && !js_FoldConstants(cx, pn1, tc))
-            return JS_FALSE;
-        break;
-
-      case PN_NAME:
-        /*
-         * Skip pn1 down along a chain of dotted member expressions to avoid
-         * excessive recursion.  Our only goal here is to fold constants (if
-         * any) in the primary expression operand to the left of the first
-         * dot in the chain.
-         */
-        pn1 = pn->pn_expr;
-        while (pn1 && pn1->pn_arity == PN_NAME)
-            pn1 = pn1->pn_expr;
-        if (pn1 && !js_FoldConstants(cx, pn1, tc))
-            return JS_FALSE;
-        break;
-
-      case PN_NULLARY:
-        break;
-    }
-
-    switch (pn->pn_type) {
-      case TOK_IF:
-        if (ContainsVarStmt(pn2) || ContainsVarStmt(pn3))
-            break;
-        /* FALL THROUGH */
-
-      case TOK_HOOK:
-        /* Reduce 'if (C) T; else E' into T for true C, E for false. */
-        switch (pn1->pn_type) {
-          case TOK_NUMBER:
-            if (pn1->pn_dval == 0)
-                pn2 = pn3;
-            break;
-          case TOK_STRING:
-            if (JSSTRING_LENGTH(ATOM_TO_STRING(pn1->pn_atom)) == 0)
-                pn2 = pn3;
-            break;
-          case TOK_PRIMARY:
-            if (pn1->pn_op == JSOP_TRUE)
-                break;
-            if (pn1->pn_op == JSOP_FALSE || pn1->pn_op == JSOP_NULL) {
-                pn2 = pn3;
-                break;
-            }
-            /* FALL THROUGH */
-          default:
-            /* Early return to dodge common code that copies pn2 to pn. */
-            return JS_TRUE;
-        }
-
-        if (pn2) {
-            /* pn2 is the then- or else-statement subtree to compile. */
-            PN_MOVE_NODE(pn, pn2);
-        } else {
-            /* False condition and no else: make pn an empty statement. */
-            pn->pn_type = TOK_SEMI;
-            pn->pn_arity = PN_UNARY;
-            pn->pn_kid = NULL;
-        }
-        RecycleTree(pn2, tc);
-        if (pn3 && pn3 != pn2)
-            RecycleTree(pn3, tc);
-        break;
-
-      case TOK_PLUS:
-        if (pn->pn_arity == PN_LIST) {
-            size_t length, length2;
-            jschar *chars;
-            JSString *str, *str2;
-
-            /*
-             * Any string literal term with all others number or string means
-             * this is a concatenation.  If any term is not a string or number
-             * literal, we can't fold.
-             */
-            JS_ASSERT(pn->pn_count > 2);
-            if (pn->pn_extra & PNX_CANTFOLD)
-                return JS_TRUE;
-            if (pn->pn_extra != PNX_STRCAT)
-                goto do_binary_op;
-
-            /* Ok, we're concatenating: convert non-string constant operands. */
-            length = 0;
-            for (pn2 = pn1; pn2; pn2 = pn2->pn_next) {
-                if (!FoldType(cx, pn2, TOK_STRING))
-                    return JS_FALSE;
-                /* XXX fold only if all operands convert to string */
-                if (pn2->pn_type != TOK_STRING)
-                    return JS_TRUE;
-                length += ATOM_TO_STRING(pn2->pn_atom)->length;
-            }
-
-            /* Allocate a new buffer and string descriptor for the result. */
-            chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
-            if (!chars)
-                return JS_FALSE;
-            str = js_NewString(cx, chars, length, 0);
-            if (!str) {
-                JS_free(cx, chars);
-                return JS_FALSE;
-            }
-
-            /* Fill the buffer, advancing chars and recycling kids as we go. */
-            for (pn2 = pn1; pn2; pn2 = RecycleTree(pn2, tc)) {
-                str2 = ATOM_TO_STRING(pn2->pn_atom);
-                length2 = str2->length;
-                js_strncpy(chars, str2->chars, length2);
-                chars += length2;
-            }
-            *chars = 0;
-
-            /* Atomize the result string and mutate pn to refer to it. */
-            pn->pn_atom = js_AtomizeString(cx, str, 0);
-            if (!pn->pn_atom)
-                return JS_FALSE;
-            pn->pn_type = TOK_STRING;
-            pn->pn_op = JSOP_STRING;
-            pn->pn_arity = PN_NULLARY;
-            break;
-        }
-
-        /* Handle a binary string concatenation. */
-        JS_ASSERT(pn->pn_arity == PN_BINARY);
-        if (pn1->pn_type == TOK_STRING || pn2->pn_type == TOK_STRING) {
-            JSString *left, *right, *str;
-
-            if (!FoldType(cx, (pn1->pn_type != TOK_STRING) ? pn1 : pn2,
-                          TOK_STRING)) {
-                return JS_FALSE;
-            }
-            if (pn1->pn_type != TOK_STRING || pn2->pn_type != TOK_STRING)
-                return JS_TRUE;
-            left = ATOM_TO_STRING(pn1->pn_atom);
-            right = ATOM_TO_STRING(pn2->pn_atom);
-            str = js_ConcatStrings(cx, left, right);
-            if (!str)
-                return JS_FALSE;
-            pn->pn_atom = js_AtomizeString(cx, str, 0);
-            if (!pn->pn_atom)
-                return JS_FALSE;
-            pn->pn_type = TOK_STRING;
-            pn->pn_op = JSOP_STRING;
-            pn->pn_arity = PN_NULLARY;
-            RecycleTree(pn1, tc);
-            RecycleTree(pn2, tc);
-            break;
-        }
-
-        /* Can't concatenate string literals, let's try numbers. */
-        goto do_binary_op;
-
-      case TOK_STAR:
-        /* The * in 'import *;' parses as a nullary star node. */
-        if (pn->pn_arity == PN_NULLARY)
-            break;
-        /* FALL THROUGH */
-
-      case TOK_SHOP:
-      case TOK_MINUS:
-      case TOK_DIVOP:
-      do_binary_op:
-        if (pn->pn_arity == PN_LIST) {
-            JS_ASSERT(pn->pn_count > 2);
-            for (pn2 = pn1; pn2; pn2 = pn2->pn_next) {
-                if (!FoldType(cx, pn2, TOK_NUMBER))
-                    return JS_FALSE;
-                /* XXX fold only if all operands convert to number */
-                if (pn2->pn_type != TOK_NUMBER)
-                    break;
-            }
-            if (!pn2) {
-                JSOp op = pn->pn_op;
-
-                pn2 = pn1->pn_next;
-                pn3 = pn2->pn_next;
-                if (!FoldBinaryNumeric(cx, op, pn1, pn2, pn, tc))
-                    return JS_FALSE;
-                while ((pn2 = pn3) != NULL) {
-                    pn3 = pn2->pn_next;
-                    if (!FoldBinaryNumeric(cx, op, pn, pn2, pn, tc))
-                        return JS_FALSE;
-                }
-            }
-        } else {
-            JS_ASSERT(pn->pn_arity == PN_BINARY);
-            if (!FoldType(cx, pn1, TOK_NUMBER) ||
-                !FoldType(cx, pn2, TOK_NUMBER)) {
-                return JS_FALSE;
-            }
-            if (pn1->pn_type == TOK_NUMBER && pn2->pn_type == TOK_NUMBER) {
-                if (!FoldBinaryNumeric(cx, pn->pn_op, pn1, pn2, pn, tc))
-                    return JS_FALSE;
-            }
-        }
-        break;
-
-      case TOK_UNARYOP:
-        if (pn1->pn_type == TOK_NUMBER) {
-            jsdouble d;
-            int32 i;
-
-            /* Operate on one numeric constant. */
-            d = pn1->pn_dval;
-            switch (pn->pn_op) {
-              case JSOP_BITNOT:
-                if (!js_DoubleToECMAInt32(cx, d, &i))
-                    return JS_FALSE;
-                d = ~i;
-                break;
-
-              case JSOP_NEG:
-#ifdef HPUX
-                /*
-                 * Negation of a zero doesn't produce a negative
-                 * zero on HPUX. Perform the operation by bit
-                 * twiddling.
-                 */
-                JSDOUBLE_HI32(d) ^= JSDOUBLE_HI32_SIGNBIT;
-#else
-                d = -d;
-#endif
-                break;
-
-              case JSOP_POS:
-                break;
-
-              case JSOP_NOT:
-                pn->pn_type = TOK_PRIMARY;
-                pn->pn_op = (d == 0) ? JSOP_TRUE : JSOP_FALSE;
-                pn->pn_arity = PN_NULLARY;
-                /* FALL THROUGH */
-
-              default:
-                /* Return early to dodge the common TOK_NUMBER code. */
-                return JS_TRUE;
-            }
-            pn->pn_type = TOK_NUMBER;
-            pn->pn_op = JSOP_NUMBER;
-            pn->pn_arity = PN_NULLARY;
-            pn->pn_dval = d;
-            RecycleTree(pn1, tc);
-        }
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case TOK_XMLELEM:
-      case TOK_XMLLIST:
-      case TOK_XMLPTAGC:
-      case TOK_XMLSTAGO:
-      case TOK_XMLETAGO:
-      case TOK_XMLNAME:
-        if (pn->pn_arity == PN_LIST) {
-            JS_ASSERT(pn->pn_type == TOK_XMLLIST || pn->pn_count != 0);
-            if (!FoldXMLConstants(cx, pn, tc))
-                return JS_FALSE;
-        }
-        break;
-
-      case TOK_AT:
-        if (pn1->pn_type == TOK_XMLNAME) {
-            jsval v;
-            JSAtom *atom;
-
-            v = ATOM_KEY(pn1->pn_atom);
-            if (!js_ToAttributeName(cx, &v))
-                return JS_FALSE;
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
-            atom = js_AtomizeObject(cx, JSVAL_TO_OBJECT(v), 0);
-            if (!atom)
-                return JS_FALSE;
-
-            pn->pn_type = TOK_XMLNAME;
-            pn->pn_op = JSOP_OBJECT;
-            pn->pn_arity = PN_NULLARY;
-            pn->pn_atom = atom;
-            RecycleTree(pn1, tc);
-        }
-        break;
-#endif /* JS_HAS_XML_SUPPORT */
-
-      default:;
-    }
-
-    return JS_TRUE;
-}
diff --git a/libs/js/src/jsparse.h b/libs/js/src/jsparse.h
deleted file mode 100644
index 24b27bdc12..0000000000
--- a/libs/js/src/jsparse.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsparse_h___
-#define jsparse_h___
-/*
- * JS parser definitions.
- */
-#include "jsconfig.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-#include "jsscan.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Parsing builds a tree of nodes that directs code generation.  This tree is
- * not a concrete syntax tree in all respects (for example, || and && are left
- * associative, but (A && B && C) translates into the right-associated tree
- * <A && <B && C>> so that code generation can emit a left-associative branch
- * around <B && C> when A is false).  Nodes are labeled by token type, with a
- * JSOp secondary label when needed:
- *
- * Label        Variant     Members
- * -----        -------     -------
- * <Definitions>
- * TOK_FUNCTION func        pn_funAtom: atom holding function object containing
- *                            arg and var properties.  We create the function
- *                            object at parse (not emit) time to specialize arg
- *                            and var bytecodes early.
- *                          pn_body: TOK_LC node for function body statements
- *                          pn_flags: TCF_FUN_* flags (see jsemit.h) collected
- *                            while parsing the function's body
- *                          pn_tryCount: of try statements in function
- *
- * <Statements>
- * TOK_LC       list        pn_head: list of pn_count statements
- * TOK_EXPORT   list        pn_head: list of pn_count TOK_NAMEs or one TOK_STAR
- *                            (which is not a multiply node)
- * TOK_IMPORT   list        pn_head: list of pn_count sub-trees of the form
- *                            a.b.*, a[b].*, a.*, a.b, or a[b] -- but never a.
- *                            Each member is expressed with TOK_DOT or TOK_LB.
- *                            Each sub-tree's root node has a pn_op in the set
- *                            JSOP_IMPORT{ALL,PROP,ELEM}
- * TOK_IF       ternary     pn_kid1: cond, pn_kid2: then, pn_kid3: else or null
- * TOK_SWITCH   binary      pn_left: discriminant
- *                          pn_right: list of TOK_CASE nodes, with at most one
- *                            TOK_DEFAULT node
- * TOK_CASE,    binary      pn_left: case expr or null if TOK_DEFAULT
- * TOK_DEFAULT              pn_right: TOK_LC node for this case's statements
- *                          pn_val: constant value if lookup or table switch
- * TOK_WHILE    binary      pn_left: cond, pn_right: body
- * TOK_DO       binary      pn_left: body, pn_right: cond
- * TOK_FOR      binary      pn_left: either
- *                            for/in loop: a binary TOK_IN node with
- *                              pn_left:  TOK_VAR or TOK_NAME to left of 'in'
- *                                if TOK_VAR, its pn_extra may have PNX_POPVAR
- *                                and PNX_FORINVAR bits set
- *                              pn_right: object expr to right of 'in'
- *                            for(;;) loop: a ternary TOK_RESERVED node with
- *                              pn_kid1:  init expr before first ';'
- *                              pn_kid2:  cond expr before second ';'
- *                              pn_kid3:  update expr after second ';'
- *                              any kid may be null
- *                          pn_right: body
- * TOK_THROW    unary       pn_op: JSOP_THROW, pn_kid: exception
- * TOK_TRY      ternary     pn_kid1: try block
- *                          pn_kid2: catch blocks or null
- *                          pn_kid3: finally block or null
- * TOK_CATCH    ternary     pn_kid1: PN_NAME node for catch var (with pn_expr
- *                                   null or the catch guard expression)
- *                          pn_kid2: more catch blocks or null
- *                          pn_kid3: catch block statements
- * TOK_BREAK    name        pn_atom: label or null
- * TOK_CONTINUE name        pn_atom: label or null
- * TOK_WITH     binary      pn_left: head expr, pn_right: body
- * TOK_VAR      list        pn_head: list of pn_count TOK_NAME nodes
- *                                   each name node has
- *                                     pn_atom: variable name
- *                                     pn_expr: initializer or null
- * TOK_RETURN   unary       pn_kid: return expr or null
- * TOK_SEMI     unary       pn_kid: expr or null statement
- * TOK_COLON    name        pn_atom: label, pn_expr: labeled statement
- *
- * <Expressions>
- * All left-associated binary trees of the same type are optimized into lists
- * to avoid recursion when processing expression chains.
- * TOK_COMMA    list        pn_head: list of pn_count comma-separated exprs
- * TOK_ASSIGN   binary      pn_left: lvalue, pn_right: rvalue
- *                          pn_op: JSOP_ADD for +=, etc.
- * TOK_HOOK     ternary     pn_kid1: cond, pn_kid2: then, pn_kid3: else
- * TOK_OR       binary      pn_left: first in || chain, pn_right: rest of chain
- * TOK_AND      binary      pn_left: first in && chain, pn_right: rest of chain
- * TOK_BITOR    binary      pn_left: left-assoc | expr, pn_right: ^ expr
- * TOK_BITXOR   binary      pn_left: left-assoc ^ expr, pn_right: & expr
- * TOK_BITAND   binary      pn_left: left-assoc & expr, pn_right: EQ expr
- * TOK_EQOP     binary      pn_left: left-assoc EQ expr, pn_right: REL expr
- *                          pn_op: JSOP_EQ, JSOP_NE, JSOP_NEW_EQ, JSOP_NEW_NE
- * TOK_RELOP    binary      pn_left: left-assoc REL expr, pn_right: SH expr
- *                          pn_op: JSOP_LT, JSOP_LE, JSOP_GT, JSOP_GE
- * TOK_SHOP     binary      pn_left: left-assoc SH expr, pn_right: ADD expr
- *                          pn_op: JSOP_LSH, JSOP_RSH, JSOP_URSH
- * TOK_PLUS,    binary      pn_left: left-assoc ADD expr, pn_right: MUL expr
- *                          pn_extra: if a left-associated binary TOK_PLUS
- *                            tree has been flattened into a list (see above
- *                            under <Expressions>), pn_extra will contain
- *                            PNX_STRCAT if at least one list element is a
- *                            string literal (TOK_STRING); if such a list has
- *                            any non-string, non-number term, pn_extra will
- *                            contain PNX_CANTFOLD.
- *                          pn_
- * TOK_MINUS                pn_op: JSOP_ADD, JSOP_SUB
- * TOK_STAR,    binary      pn_left: left-assoc MUL expr, pn_right: UNARY expr
- * TOK_DIVOP                pn_op: JSOP_MUL, JSOP_DIV, JSOP_MOD
- * TOK_UNARYOP  unary       pn_kid: UNARY expr, pn_op: JSOP_NEG, JSOP_POS,
- *                          JSOP_NOT, JSOP_BITNOT, JSOP_TYPEOF, JSOP_VOID
- * TOK_INC,     unary       pn_kid: MEMBER expr
- * TOK_DEC
- * TOK_NEW      list        pn_head: list of ctor, arg1, arg2, ... argN
- *                          pn_count: 1 + N (where N is number of args)
- *                          ctor is a MEMBER expr
- * TOK_DELETE   unary       pn_kid: MEMBER expr
- * TOK_DOT,     name        pn_expr: MEMBER expr to left of .
- * TOK_DBLDOT               pn_atom: name to right of .
- * TOK_LB       binary      pn_left: MEMBER expr to left of [
- *                          pn_right: expr between [ and ]
- * TOK_LP       list        pn_head: list of call, arg1, arg2, ... argN
- *                          pn_count: 1 + N (where N is number of args)
- *                          call is a MEMBER expr naming a callable object
- * TOK_RB       list        pn_head: list of pn_count array element exprs
- *                          [,,] holes are represented by TOK_COMMA nodes
- *                          #n=[...] produces TOK_DEFSHARP at head of list
- *                          pn_extra: PN_ENDCOMMA if extra comma at end
- * TOK_RC       list        pn_head: list of pn_count TOK_COLON nodes where
- *                          each has pn_left: property id, pn_right: value
- *                          #n={...} produces TOK_DEFSHARP at head of list
- * TOK_DEFSHARP unary       pn_num: jsint value of n in #n=
- *                          pn_kid: null for #n=[...] and #n={...}, primary
- *                          if #n=primary for function, paren, name, object
- *                          literal expressions
- * TOK_USESHARP nullary     pn_num: jsint value of n in #n#
- * TOK_RP       unary       pn_kid: parenthesized expression
- * TOK_NAME,    name        pn_atom: name, string, or object atom
- * TOK_STRING,              pn_op: JSOP_NAME, JSOP_STRING, or JSOP_OBJECT, or
- *                                 JSOP_REGEXP
- * TOK_OBJECT               If JSOP_NAME, pn_op may be JSOP_*ARG or JSOP_*VAR
- *                          with pn_slot >= 0 and pn_attrs telling const-ness
- * TOK_NUMBER   dval        pn_dval: double value of numeric literal
- * TOK_PRIMARY  nullary     pn_op: JSOp bytecode
- * TOK_ANYNAME  nullary     pn_op: JSOP_ANYNAME
- *                          pn_atom: cx->runtime->atomState.starAtom
- * TOK_AT       unary       pn_op: JSOP_TOATTRNAME; pn_kid attribute id/expr
- * TOK_DBLCOLON binary      pn_op: JSOP_QNAME
- *                          pn_left: TOK_ANYNAME or TOK_NAME node
- *                          pn_right: TOK_STRING "*" node, or expr within []
- *              name        pn_op: JSOP_QNAMECONST
- *                          pn_expr: TOK_ANYNAME or TOK_NAME left operand
- *                          pn_atom: name on right of ::
- * TOK_XMLELEM  list        XML element node
- *                          pn_head: start tag, content1, ... contentN, end tag
- *                          pn_count: 2 + N where N is number of content nodes
- *                                    N may be > x.length() if {expr} embedded
- * TOK_XMLLIST  list        XML list node
- *                          pn_head: content1, ... contentN
- * TOK_XMLSTAGO, list       XML start, end, and point tag contents
- * TOK_XMLETAGC,            pn_head: tag name or {expr}, ... XML attrs ...
- * TOK_XMLPTAGO
- * TOK_XMLNAME  nullary     pn_atom: XML name, with no {expr} embedded
- * TOK_XMLNAME  list        pn_head: tag name or {expr}, ... name or {expr}
- * TOK_XMLATTR, nullary     pn_atom: attribute value string; pn_op: JSOP_STRING
- * TOK_XMLCDATA,
- * TOK_XMLCOMMENT
- * TOK_XMLPI    nullary     pn_atom: XML processing instruction target
- *                          pn_atom2: XML PI content, or null if no content
- * TOK_XMLTEXT  nullary     pn_atom: marked-up text, or null if empty string
- * TOK_LC       unary       {expr} in XML tag or content; pn_kid is expr
- *
- * So an XML tag with no {expr} and three attributes is a list with the form:
- *
- *    (tagname attrname1 attrvalue1 attrname2 attrvalue2 attrname2 attrvalue3)
- *
- * An XML tag with embedded expressions like so:
- *
- *    <name1{expr1} name2{expr2}name3={expr3}>
- *
- * would have the form:
- *
- *    ((name1 {expr1}) (name2 {expr2} name3) {expr3})
- *
- * where () bracket a list with elements separated by spaces, and {expr} is a
- * TOK_LC unary node with expr as its kid.
- *
- * Thus, the attribute name/value pairs occupy successive odd and even list
- * locations, where pn_head is the TOK_XMLNAME node at list location 0.  The
- * parser builds the same sort of structures for elements:
- *
- *    <a x={x}>Hi there!<b y={y}>How are you?</b><answer>{x + y}</answer></a>
- *
- * translates to:
- *
- *    ((a x {x}) 'Hi there!' ((b y {y}) 'How are you?') ((answer) {x + y}))
- */
-typedef enum JSParseNodeArity {
-    PN_FUNC     = -3,
-    PN_LIST     = -2,
-    PN_TERNARY  =  3,
-    PN_BINARY   =  2,
-    PN_UNARY    =  1,
-    PN_NAME     = -1,
-    PN_NULLARY  =  0
-} JSParseNodeArity;
-
-struct JSParseNode {
-    uint16              pn_type;
-    uint8               pn_op;
-    int8                pn_arity;
-    JSTokenPos          pn_pos;
-    ptrdiff_t           pn_offset;      /* first generated bytecode offset */
-    union {
-        struct {                        /* TOK_FUNCTION node */
-            JSAtom      *funAtom;       /* atomized function object */
-            JSParseNode *body;          /* TOK_LC list of statements */
-            uint32      flags;          /* accumulated tree context flags */
-            uint32      tryCount;       /* count of try statements in body */
-        } func;
-        struct {                        /* list of next-linked nodes */
-            JSParseNode *head;          /* first node in list */
-            JSParseNode **tail;         /* ptr to ptr to last node in list */
-            uint32      count;          /* number of nodes in list */
-            uint32      extra;          /* extra comma flag for [1,2,,] */
-        } list;
-        struct {                        /* ternary: if, for(;;), ?: */
-            JSParseNode *kid1;          /* condition, discriminant, etc. */
-            JSParseNode *kid2;          /* then-part, case list, etc. */
-            JSParseNode *kid3;          /* else-part, default case, etc. */
-        } ternary;
-        struct {                        /* two kids if binary */
-            JSParseNode *left;
-            JSParseNode *right;
-            jsval       val;            /* switch case value */
-        } binary;
-        struct {                        /* one kid if unary */
-            JSParseNode *kid;
-            jsint       num;            /* -1 or sharp variable number */
-        } unary;
-        struct {                        /* name, labeled statement, etc. */
-            JSAtom      *atom;          /* name or label atom, null if slot */
-            JSParseNode *expr;          /* object or initializer */
-            jsint       slot;           /* -1 or arg or local var slot */
-            uintN       attrs;          /* attributes if local var or const */
-        } name;
-        struct {
-            JSAtom      *atom;          /* first atom in pair */
-            JSAtom      *atom2;         /* second atom in pair or null */
-        } apair;
-        jsdouble        dval;           /* aligned numeric literal value */
-    } pn_u;
-    JSParseNode         *pn_next;       /* to align dval and pn_u on RISCs */
-#if JS_HAS_XML_SUPPORT
-    JSTokenStream       *pn_ts;         /* token stream for XML error reports */
-#endif
-};
-
-#define pn_funAtom      pn_u.func.funAtom
-#define pn_body         pn_u.func.body
-#define pn_flags        pn_u.func.flags
-#define pn_tryCount     pn_u.func.tryCount
-#define pn_head         pn_u.list.head
-#define pn_tail         pn_u.list.tail
-#define pn_count        pn_u.list.count
-#define pn_extra        pn_u.list.extra
-#define pn_kid1         pn_u.ternary.kid1
-#define pn_kid2         pn_u.ternary.kid2
-#define pn_kid3         pn_u.ternary.kid3
-#define pn_left         pn_u.binary.left
-#define pn_right        pn_u.binary.right
-#define pn_val          pn_u.binary.val
-#define pn_kid          pn_u.unary.kid
-#define pn_num          pn_u.unary.num
-#define pn_atom         pn_u.name.atom
-#define pn_expr         pn_u.name.expr
-#define pn_slot         pn_u.name.slot
-#define pn_attrs        pn_u.name.attrs
-#define pn_dval         pn_u.dval
-#define pn_atom2        pn_u.apair.atom2
-
-/* PN_LIST pn_extra flags. */
-#define PNX_STRCAT      0x01            /* TOK_PLUS list has string term */
-#define PNX_CANTFOLD    0x02            /* TOK_PLUS list has unfoldable term */
-#define PNX_POPVAR      0x04            /* TOK_VAR last result needs popping */
-#define PNX_FORINVAR    0x08            /* TOK_VAR is left kid of TOK_IN node,
-                                           which is left kid of TOK_FOR */
-#define PNX_ENDCOMMA    0x10            /* array literal has comma at end */
-#define PNX_XMLROOT     0x20            /* top-most node in XML literal tree */
-
-/*
- * Move pn2 into pn, preserving pn->pn_pos and pn->pn_offset and handing off
- * any kids in pn2->pn_u, by clearing pn2.
- */
-#define PN_MOVE_NODE(pn, pn2)                                                 \
-    JS_BEGIN_MACRO                                                            \
-        (pn)->pn_type = (pn2)->pn_type;                                       \
-        (pn)->pn_op = (pn2)->pn_op;                                           \
-        (pn)->pn_arity = (pn2)->pn_arity;                                     \
-        (pn)->pn_u = (pn2)->pn_u;                                             \
-        PN_CLEAR_NODE(pn2);                                                   \
-    JS_END_MACRO
-
-#define PN_CLEAR_NODE(pn)                                                     \
-    JS_BEGIN_MACRO                                                            \
-        (pn)->pn_type = TOK_EOF;                                              \
-        (pn)->pn_op = JSOP_NOP;                                               \
-        (pn)->pn_arity = PN_NULLARY;                                          \
-    JS_END_MACRO
-
-/* True if pn is a parsenode representing a literal constant. */
-#define PN_IS_CONSTANT(pn)                                                    \
-    ((pn)->pn_type == TOK_NUMBER ||                                           \
-     (pn)->pn_type == TOK_STRING ||                                           \
-     ((pn)->pn_type == TOK_PRIMARY && (pn)->pn_op != JSOP_THIS))
-
-/*
- * Compute a pointer to the last JSParseNode element in a singly-linked list.
- * NB: list must be non-empty for correct PN_LAST usage!
- */
-#define PN_LAST(list) \
-    ((JSParseNode *)((char *)(list)->pn_tail - offsetof(JSParseNode, pn_next)))
-
-#define PN_INIT_LIST(list)                                                    \
-    JS_BEGIN_MACRO                                                            \
-        (list)->pn_head = NULL;                                               \
-        (list)->pn_tail = &(list)->pn_head;                                   \
-        (list)->pn_count = (list)->pn_extra = 0;                              \
-    JS_END_MACRO
-
-#define PN_INIT_LIST_1(list, pn)                                              \
-    JS_BEGIN_MACRO                                                            \
-        (list)->pn_head = (pn);                                               \
-        (list)->pn_tail = &(pn)->pn_next;                                     \
-        (list)->pn_count = 1;                                                 \
-        (list)->pn_extra = 0;                                                 \
-    JS_END_MACRO
-
-#define PN_APPEND(list, pn)                                                   \
-    JS_BEGIN_MACRO                                                            \
-        *(list)->pn_tail = (pn);                                              \
-        (list)->pn_tail = &(pn)->pn_next;                                     \
-        (list)->pn_count++;                                                   \
-    JS_END_MACRO
-
-/*
- * Parse a top-level JS script.
- *
- * The caller must prevent the GC from running while this function is active,
- * because atoms and function newborns are not rooted yet.
- */
-extern JS_FRIEND_API(JSParseNode *)
-js_ParseTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts);
-
-extern JS_FRIEND_API(JSBool)
-js_CompileTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts,
-                      JSCodeGenerator *cg);
-
-extern JSBool
-js_CompileFunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun);
-
-extern JSBool
-js_FoldConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc);
-
-#if JS_HAS_XML_SUPPORT
-JS_FRIEND_API(JSParseNode *)
-js_ParseXMLTokenStream(JSContext *cx, JSObject *chain, JSTokenStream *ts,
-                       JSBool allowList);
-#endif
-
-JS_END_EXTERN_C
-
-#endif /* jsparse_h___ */
diff --git a/libs/js/src/jsprf.c b/libs/js/src/jsprf.c
deleted file mode 100644
index cf7f348f4c..0000000000
--- a/libs/js/src/jsprf.c
+++ /dev/null
@@ -1,1269 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** Portable safe sprintf code.
-**
-** Author: Kipp E.B. Hickman
-*/
-#include "jsstddef.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "jsprf.h"
-#include "jslong.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jspubtd.h"
-#include "jsstr.h"
-
-/*
-** Note: on some platforms va_list is defined as an array,
-** and requires array notation.
-*/
-#ifdef OSSP
-#include "../config.h"
-#define VARARGS_ASSIGN(foo, bar)        va_copy(foo,bar)
-#else
-#ifdef HAVE_VA_COPY
-#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
-#elif defined(HAVE_VA_LIST_AS_ARRAY)
-#define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
-#else
-#define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
-#endif
-#endif
-
-/*
-** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)
-*/
-
-/*
-** XXX This needs to be internationalized!
-*/
-
-typedef struct SprintfStateStr SprintfState;
-
-struct SprintfStateStr {
-    int (*stuff)(SprintfState *ss, const char *sp, JSUint32 len);
-
-    char *base;
-    char *cur;
-    JSUint32 maxlen;
-
-    int (*func)(void *arg, const char *sp, JSUint32 len);
-    void *arg;
-};
-
-/*
-** Numbered Arguement State
-*/
-struct NumArgState{
-    int     type;               /* type of the current ap                    */
-    va_list ap;                 /* point to the corresponding position on ap */
-};
-
-#define NAS_DEFAULT_NUM 20  /* default number of NumberedArgumentState array */
-
-
-#define TYPE_INT16      0
-#define TYPE_UINT16     1
-#define TYPE_INTN       2
-#define TYPE_UINTN      3
-#define TYPE_INT32      4
-#define TYPE_UINT32     5
-#define TYPE_INT64      6
-#define TYPE_UINT64     7
-#define TYPE_STRING     8
-#define TYPE_DOUBLE     9
-#define TYPE_INTSTR     10
-#define TYPE_WSTRING    11
-#define TYPE_UNKNOWN    20
-
-#define FLAG_LEFT       0x1
-#define FLAG_SIGNED     0x2
-#define FLAG_SPACED     0x4
-#define FLAG_ZEROS      0x8
-#define FLAG_NEG        0x10
-
-/*
-** Fill into the buffer using the data in src
-*/
-static int fill2(SprintfState *ss, const char *src, int srclen, int width,
-                int flags)
-{
-    char space = ' ';
-    int rv;
-
-    width -= srclen;
-    if ((width > 0) && ((flags & FLAG_LEFT) == 0)) {    /* Right adjusting */
-        if (flags & FLAG_ZEROS) {
-            space = '0';
-        }
-        while (--width >= 0) {
-            rv = (*ss->stuff)(ss, &space, 1);
-            if (rv < 0) {
-                return rv;
-            }
-        }
-    }
-
-    /* Copy out the source data */
-    rv = (*ss->stuff)(ss, src, (JSUint32)srclen);
-    if (rv < 0) {
-        return rv;
-    }
-
-    if ((width > 0) && ((flags & FLAG_LEFT) != 0)) {    /* Left adjusting */
-        while (--width >= 0) {
-            rv = (*ss->stuff)(ss, &space, 1);
-            if (rv < 0) {
-                return rv;
-            }
-        }
-    }
-    return 0;
-}
-
-/*
-** Fill a number. The order is: optional-sign zero-filling conversion-digits
-*/
-static int fill_n(SprintfState *ss, const char *src, int srclen, int width,
-                  int prec, int type, int flags)
-{
-    int zerowidth = 0;
-    int precwidth = 0;
-    int signwidth = 0;
-    int leftspaces = 0;
-    int rightspaces = 0;
-    int cvtwidth;
-    int rv;
-    char sign;
-
-    if ((type & 1) == 0) {
-        if (flags & FLAG_NEG) {
-            sign = '-';
-            signwidth = 1;
-        } else if (flags & FLAG_SIGNED) {
-            sign = '+';
-            signwidth = 1;
-        } else if (flags & FLAG_SPACED) {
-            sign = ' ';
-            signwidth = 1;
-        }
-    }
-    cvtwidth = signwidth + srclen;
-
-    if (prec > 0) {
-        if (prec > srclen) {
-            precwidth = prec - srclen;          /* Need zero filling */
-            cvtwidth += precwidth;
-        }
-    }
-
-    if ((flags & FLAG_ZEROS) && (prec < 0)) {
-        if (width > cvtwidth) {
-            zerowidth = width - cvtwidth;       /* Zero filling */
-            cvtwidth += zerowidth;
-        }
-    }
-
-    if (flags & FLAG_LEFT) {
-        if (width > cvtwidth) {
-            /* Space filling on the right (i.e. left adjusting) */
-            rightspaces = width - cvtwidth;
-        }
-    } else {
-        if (width > cvtwidth) {
-            /* Space filling on the left (i.e. right adjusting) */
-            leftspaces = width - cvtwidth;
-        }
-    }
-    while (--leftspaces >= 0) {
-        rv = (*ss->stuff)(ss, " ", 1);
-        if (rv < 0) {
-            return rv;
-        }
-    }
-    if (signwidth) {
-        rv = (*ss->stuff)(ss, &sign, 1);
-        if (rv < 0) {
-            return rv;
-        }
-    }
-    while (--precwidth >= 0) {
-        rv = (*ss->stuff)(ss, "0", 1);
-        if (rv < 0) {
-            return rv;
-        }
-    }
-    while (--zerowidth >= 0) {
-        rv = (*ss->stuff)(ss, "0", 1);
-        if (rv < 0) {
-            return rv;
-        }
-    }
-    rv = (*ss->stuff)(ss, src, (JSUint32)srclen);
-    if (rv < 0) {
-        return rv;
-    }
-    while (--rightspaces >= 0) {
-        rv = (*ss->stuff)(ss, " ", 1);
-        if (rv < 0) {
-            return rv;
-        }
-    }
-    return 0;
-}
-
-/*
-** Convert a long into its printable form
-*/
-static int cvt_l(SprintfState *ss, long num, int width, int prec, int radix,
-                 int type, int flags, const char *hexp)
-{
-    char cvtbuf[100];
-    char *cvt;
-    int digits;
-
-    /* according to the man page this needs to happen */
-    if ((prec == 0) && (num == 0)) {
-        return 0;
-    }
-
-    /*
-    ** Converting decimal is a little tricky. In the unsigned case we
-    ** need to stop when we hit 10 digits. In the signed case, we can
-    ** stop when the number is zero.
-    */
-    cvt = cvtbuf + sizeof(cvtbuf);
-    digits = 0;
-    while (num) {
-        int digit = (((unsigned long)num) % radix) & 0xF;
-        *--cvt = hexp[digit];
-        digits++;
-        num = (long)(((unsigned long)num) / radix);
-    }
-    if (digits == 0) {
-        *--cvt = '0';
-        digits++;
-    }
-
-    /*
-    ** Now that we have the number converted without its sign, deal with
-    ** the sign and zero padding.
-    */
-    return fill_n(ss, cvt, digits, width, prec, type, flags);
-}
-
-/*
-** Convert a 64-bit integer into its printable form
-*/
-static int cvt_ll(SprintfState *ss, JSInt64 num, int width, int prec, int radix,
-                  int type, int flags, const char *hexp)
-{
-    char cvtbuf[100];
-    char *cvt;
-    int digits;
-    JSInt64 rad;
-
-    /* according to the man page this needs to happen */
-    if ((prec == 0) && (JSLL_IS_ZERO(num))) {
-        return 0;
-    }
-
-    /*
-    ** Converting decimal is a little tricky. In the unsigned case we
-    ** need to stop when we hit 10 digits. In the signed case, we can
-    ** stop when the number is zero.
-    */
-    JSLL_I2L(rad, radix);
-    cvt = cvtbuf + sizeof(cvtbuf);
-    digits = 0;
-    while (!JSLL_IS_ZERO(num)) {
-        JSInt32 digit;
-        JSInt64 quot, rem;
-        JSLL_UDIVMOD(&quot, &rem, num, rad);
-        JSLL_L2I(digit, rem);
-        *--cvt = hexp[digit & 0xf];
-        digits++;
-        num = quot;
-    }
-    if (digits == 0) {
-        *--cvt = '0';
-        digits++;
-    }
-
-    /*
-    ** Now that we have the number converted without its sign, deal with
-    ** the sign and zero padding.
-    */
-    return fill_n(ss, cvt, digits, width, prec, type, flags);
-}
-
-/*
-** Convert a double precision floating point number into its printable
-** form.
-**
-** XXX stop using sprintf to convert floating point
-*/
-static int cvt_f(SprintfState *ss, double d, const char *fmt0, const char *fmt1)
-{
-    char fin[20];
-    char fout[300];
-    int amount = fmt1 - fmt0;
-
-    JS_ASSERT((amount > 0) && (amount < (int)sizeof(fin)));
-    if (amount >= (int)sizeof(fin)) {
-        /* Totally bogus % command to sprintf. Just ignore it */
-        return 0;
-    }
-    memcpy(fin, fmt0, (size_t)amount);
-    fin[amount] = 0;
-
-    /* Convert floating point using the native sprintf code */
-#ifdef DEBUG
-    {
-        const char *p = fin;
-        while (*p) {
-            JS_ASSERT(*p != 'L');
-            p++;
-        }
-    }
-#endif
-    sprintf(fout, fin, d);
-
-    /*
-    ** This assert will catch overflow's of fout, when building with
-    ** debugging on. At least this way we can track down the evil piece
-    ** of calling code and fix it!
-    */
-    JS_ASSERT(strlen(fout) < sizeof(fout));
-
-    return (*ss->stuff)(ss, fout, strlen(fout));
-}
-
-/*
-** Convert a string into its printable form.  "width" is the output
-** width. "prec" is the maximum number of characters of "s" to output,
-** where -1 means until NUL.
-*/
-static int cvt_s(SprintfState *ss, const char *s, int width, int prec,
-                 int flags)
-{
-    int slen;
-
-    if (prec == 0)
-        return 0;
-
-    /* Limit string length by precision value */
-    slen = s ? strlen(s) : 6;
-    if (prec > 0) {
-        if (prec < slen) {
-            slen = prec;
-        }
-    }
-
-    /* and away we go */
-    return fill2(ss, s ? s : "(null)", slen, width, flags);
-}
-
-static int cvt_ws(SprintfState *ss, const jschar *ws, int width, int prec,
-                  int flags)
-{
-    int result;
-    /* 
-     * Supply NULL as the JSContext; errors are not reported, 
-     * and malloc() is used to allocate the buffer buffer. 
-     */
-    if (ws) {
-        int slen = js_strlen(ws);
-        char *s = js_DeflateString(NULL, ws, slen);
-        if (!s)
-            return -1; /* JSStuffFunc error indicator. */
-        result = cvt_s(ss, s, width, prec, flags);
-        free(s);
-    } else {
-        result = cvt_s(ss, NULL, width, prec, flags);
-    }
-    return result;
-}
-
-/*
-** BuildArgArray stands for Numbered Argument list Sprintf
-** for example,
-**      fmp = "%4$i, %2$d, %3s, %1d";
-** the number must start from 1, and no gap among them
-*/
-
-static struct NumArgState* BuildArgArray( const char *fmt, va_list ap, int* rv, struct NumArgState* nasArray )
-{
-    int number = 0, cn = 0, i;
-    const char *p;
-    char c;
-    struct NumArgState *nas;
-
-
-    /*
-    **  first pass:
-    **  detemine how many legal % I have got, then allocate space
-    */
-
-    p = fmt;
-    *rv = 0;
-    i = 0;
-    while( ( c = *p++ ) != 0 ){
-        if( c != '%' )
-            continue;
-        if( ( c = *p++ ) == '%' )       /* skip %% case */
-            continue;
-
-        while( c != 0 ){
-            if( c > '9' || c < '0' ){
-                if( c == '$' ){         /* numbered argument csae */
-                    if( i > 0 ){
-                        *rv = -1;
-                        return NULL;
-                    }
-                    number++;
-                } else {                /* non-numbered argument case */
-                    if( number > 0 ){
-                        *rv = -1;
-                        return NULL;
-                    }
-                    i = 1;
-                }
-                break;
-            }
-
-            c = *p++;
-        }
-    }
-
-    if( number == 0 ){
-        return NULL;
-    }
-
-
-    if( number > NAS_DEFAULT_NUM ){
-        nas = (struct NumArgState*)malloc( number * sizeof( struct NumArgState ) );
-        if( !nas ){
-            *rv = -1;
-            return NULL;
-        }
-    } else {
-        nas = nasArray;
-    }
-
-    for( i = 0; i < number; i++ ){
-        nas[i].type = TYPE_UNKNOWN;
-    }
-
-
-    /*
-    ** second pass:
-    ** set nas[].type
-    */
-
-    p = fmt;
-    while( ( c = *p++ ) != 0 ){
-        if( c != '%' )  continue;
-            c = *p++;
-        if( c == '%' )  continue;
-
-        cn = 0;
-        while( c && c != '$' ){     /* should improve error check later */
-            cn = cn*10 + c - '0';
-            c = *p++;
-        }
-
-        if( !c || cn < 1 || cn > number ){
-            *rv = -1;
-            break;
-        }
-
-        /* nas[cn] starts from 0, and make sure nas[cn].type is not assigned */
-        cn--;
-        if( nas[cn].type != TYPE_UNKNOWN )
-            continue;
-
-        c = *p++;
-
-        /* width */
-        if (c == '*') {
-            /* not supported feature, for the argument is not numbered */
-            *rv = -1;
-            break;
-        }
-
-        while ((c >= '0') && (c <= '9')) {
-            c = *p++;
-        }
-
-        /* precision */
-        if (c == '.') {
-            c = *p++;
-            if (c == '*') {
-                /* not supported feature, for the argument is not numbered */
-                *rv = -1;
-                break;
-            }
-
-            while ((c >= '0') && (c <= '9')) {
-                c = *p++;
-            }
-        }
-
-        /* size */
-        nas[cn].type = TYPE_INTN;
-        if (c == 'h') {
-            nas[cn].type = TYPE_INT16;
-            c = *p++;
-        } else if (c == 'L') {
-            /* XXX not quite sure here */
-            nas[cn].type = TYPE_INT64;
-            c = *p++;
-        } else if (c == 'l') {
-            nas[cn].type = TYPE_INT32;
-            c = *p++;
-            if (c == 'l') {
-                nas[cn].type = TYPE_INT64;
-                c = *p++;
-            }
-        }
-
-        /* format */
-        switch (c) {
-        case 'd':
-        case 'c':
-        case 'i':
-        case 'o':
-        case 'u':
-        case 'x':
-        case 'X':
-            break;
-
-        case 'e':
-        case 'f':
-        case 'g':
-            nas[ cn ].type = TYPE_DOUBLE;
-            break;
-
-        case 'p':
-            /* XXX should use cpp */
-            if (sizeof(void *) == sizeof(JSInt32)) {
-                nas[ cn ].type = TYPE_UINT32;
-            } else if (sizeof(void *) == sizeof(JSInt64)) {
-                nas[ cn ].type = TYPE_UINT64;
-            } else if (sizeof(void *) == sizeof(JSIntn)) {
-                nas[ cn ].type = TYPE_UINTN;
-            } else {
-                nas[ cn ].type = TYPE_UNKNOWN;
-            }
-            break;
-
-        case 'C':
-        case 'S':
-        case 'E':
-        case 'G':
-            /* XXX not supported I suppose */
-            JS_ASSERT(0);
-            nas[ cn ].type = TYPE_UNKNOWN;
-            break;
-
-        case 's':
-            nas[ cn ].type = (nas[ cn ].type == TYPE_UINT16) ? TYPE_WSTRING : TYPE_STRING;
-            break;
-
-        case 'n':
-            nas[ cn ].type = TYPE_INTSTR;
-            break;
-
-        default:
-            JS_ASSERT(0);
-            nas[ cn ].type = TYPE_UNKNOWN;
-            break;
-        }
-
-        /* get a legal para. */
-        if( nas[ cn ].type == TYPE_UNKNOWN ){
-            *rv = -1;
-            break;
-        }
-    }
-
-
-    /*
-    ** third pass
-    ** fill the nas[cn].ap
-    */
-
-    if( *rv < 0 ){
-        if( nas != nasArray )
-            free( nas );
-        return NULL;
-    }
-
-    cn = 0;
-    while( cn < number ){
-        if( nas[cn].type == TYPE_UNKNOWN ){
-            cn++;
-            continue;
-        }
-
-        VARARGS_ASSIGN(nas[cn].ap, ap);
-
-        switch( nas[cn].type ){
-        case TYPE_INT16:
-        case TYPE_UINT16:
-        case TYPE_INTN:
-        case TYPE_UINTN:                (void)va_arg( ap, JSIntn );             break;
-
-        case TYPE_INT32:                (void)va_arg( ap, JSInt32 );            break;
-
-        case TYPE_UINT32:       (void)va_arg( ap, JSUint32 );   break;
-
-        case TYPE_INT64:        (void)va_arg( ap, JSInt64 );            break;
-
-        case TYPE_UINT64:       (void)va_arg( ap, JSUint64 );           break;
-
-        case TYPE_STRING:       (void)va_arg( ap, char* );              break;
-
-        case TYPE_WSTRING:      (void)va_arg( ap, jschar* );            break;
-
-        case TYPE_INTSTR:       (void)va_arg( ap, JSIntn* );            break;
-
-        case TYPE_DOUBLE:       (void)va_arg( ap, double );             break;
-
-        default:
-            if( nas != nasArray )
-                free( nas );
-            *rv = -1;
-            return NULL;
-        }
-
-        cn++;
-    }
-
-
-    return nas;
-}
-
-/*
-** The workhorse sprintf code.
-*/
-static int dosprintf(SprintfState *ss, const char *fmt, va_list ap)
-{
-    char c;
-    int flags, width, prec, radix, type;
-    union {
-        char ch;
-        jschar wch;
-        int i;
-        long l;
-        JSInt64 ll;
-        double d;
-        const char *s;
-        const jschar* ws;
-        int *ip;
-    } u;
-    const char *fmt0;
-    static char *hex = "0123456789abcdef";
-    static char *HEX = "0123456789ABCDEF";
-    char *hexp;
-    int rv, i;
-    struct NumArgState *nas = NULL;
-    struct NumArgState nasArray[ NAS_DEFAULT_NUM ];
-    char pattern[20];
-    const char *dolPt = NULL;  /* in "%4$.2f", dolPt will poiont to . */
-#ifdef JS_C_STRINGS_ARE_UTF8
-    char utf8buf[6];
-    int utf8len;
-#endif
-
-    /*
-    ** build an argument array, IF the fmt is numbered argument
-    ** list style, to contain the Numbered Argument list pointers
-    */
-
-    nas = BuildArgArray( fmt, ap, &rv, nasArray );
-    if( rv < 0 ){
-        /* the fmt contains error Numbered Argument format, jliu@netscape.com */
-        JS_ASSERT(0);
-        return rv;
-    }
-
-    while ((c = *fmt++) != 0) {
-        if (c != '%') {
-            rv = (*ss->stuff)(ss, fmt - 1, 1);
-            if (rv < 0) {
-                return rv;
-            }
-            continue;
-        }
-        fmt0 = fmt - 1;
-
-        /*
-        ** Gobble up the % format string. Hopefully we have handled all
-        ** of the strange cases!
-        */
-        flags = 0;
-        c = *fmt++;
-        if (c == '%') {
-            /* quoting a % with %% */
-            rv = (*ss->stuff)(ss, fmt - 1, 1);
-            if (rv < 0) {
-                return rv;
-            }
-            continue;
-        }
-
-        if( nas != NULL ){
-            /* the fmt contains the Numbered Arguments feature */
-            i = 0;
-            while( c && c != '$' ){         /* should imporve error check later */
-                i = ( i * 10 ) + ( c - '0' );
-                c = *fmt++;
-            }
-
-            if( nas[i-1].type == TYPE_UNKNOWN ){
-                if( nas && ( nas != nasArray ) )
-                    free( nas );
-                return -1;
-            }
-
-            ap = nas[i-1].ap;
-            dolPt = fmt;
-            c = *fmt++;
-        }
-
-        /*
-         * Examine optional flags.  Note that we do not implement the
-         * '#' flag of sprintf().  The ANSI C spec. of the '#' flag is
-         * somewhat ambiguous and not ideal, which is perhaps why
-         * the various sprintf() implementations are inconsistent
-         * on this feature.
-         */
-        while ((c == '-') || (c == '+') || (c == ' ') || (c == '0')) {
-            if (c == '-') flags |= FLAG_LEFT;
-            if (c == '+') flags |= FLAG_SIGNED;
-            if (c == ' ') flags |= FLAG_SPACED;
-            if (c == '0') flags |= FLAG_ZEROS;
-            c = *fmt++;
-        }
-        if (flags & FLAG_SIGNED) flags &= ~FLAG_SPACED;
-        if (flags & FLAG_LEFT) flags &= ~FLAG_ZEROS;
-
-        /* width */
-        if (c == '*') {
-            c = *fmt++;
-            width = va_arg(ap, int);
-        } else {
-            width = 0;
-            while ((c >= '0') && (c <= '9')) {
-                width = (width * 10) + (c - '0');
-                c = *fmt++;
-            }
-        }
-
-        /* precision */
-        prec = -1;
-        if (c == '.') {
-            c = *fmt++;
-            if (c == '*') {
-                c = *fmt++;
-                prec = va_arg(ap, int);
-            } else {
-                prec = 0;
-                while ((c >= '0') && (c <= '9')) {
-                    prec = (prec * 10) + (c - '0');
-                    c = *fmt++;
-                }
-            }
-        }
-
-        /* size */
-        type = TYPE_INTN;
-        if (c == 'h') {
-            type = TYPE_INT16;
-            c = *fmt++;
-        } else if (c == 'L') {
-            /* XXX not quite sure here */
-            type = TYPE_INT64;
-            c = *fmt++;
-        } else if (c == 'l') {
-            type = TYPE_INT32;
-            c = *fmt++;
-            if (c == 'l') {
-                type = TYPE_INT64;
-                c = *fmt++;
-            }
-        }
-
-        /* format */
-        hexp = hex;
-        switch (c) {
-          case 'd': case 'i':                   /* decimal/integer */
-            radix = 10;
-            goto fetch_and_convert;
-
-          case 'o':                             /* octal */
-            radix = 8;
-            type |= 1;
-            goto fetch_and_convert;
-
-          case 'u':                             /* unsigned decimal */
-            radix = 10;
-            type |= 1;
-            goto fetch_and_convert;
-
-          case 'x':                             /* unsigned hex */
-            radix = 16;
-            type |= 1;
-            goto fetch_and_convert;
-
-          case 'X':                             /* unsigned HEX */
-            radix = 16;
-            hexp = HEX;
-            type |= 1;
-            goto fetch_and_convert;
-
-          fetch_and_convert:
-            switch (type) {
-              case TYPE_INT16:
-                u.l = va_arg(ap, int);
-                if (u.l < 0) {
-                    u.l = -u.l;
-                    flags |= FLAG_NEG;
-                }
-                goto do_long;
-              case TYPE_UINT16:
-                u.l = va_arg(ap, int) & 0xffff;
-                goto do_long;
-              case TYPE_INTN:
-                u.l = va_arg(ap, int);
-                if (u.l < 0) {
-                    u.l = -u.l;
-                    flags |= FLAG_NEG;
-                }
-                goto do_long;
-              case TYPE_UINTN:
-                u.l = (long)va_arg(ap, unsigned int);
-                goto do_long;
-
-              case TYPE_INT32:
-                u.l = va_arg(ap, JSInt32);
-                if (u.l < 0) {
-                    u.l = -u.l;
-                    flags |= FLAG_NEG;
-                }
-                goto do_long;
-              case TYPE_UINT32:
-                u.l = (long)va_arg(ap, JSUint32);
-              do_long:
-                rv = cvt_l(ss, u.l, width, prec, radix, type, flags, hexp);
-                if (rv < 0) {
-                    return rv;
-                }
-                break;
-
-              case TYPE_INT64:
-                u.ll = va_arg(ap, JSInt64);
-                if (!JSLL_GE_ZERO(u.ll)) {
-                    JSLL_NEG(u.ll, u.ll);
-                    flags |= FLAG_NEG;
-                }
-                goto do_longlong;
-              case TYPE_UINT64:
-                u.ll = va_arg(ap, JSUint64);
-              do_longlong:
-                rv = cvt_ll(ss, u.ll, width, prec, radix, type, flags, hexp);
-                if (rv < 0) {
-                    return rv;
-                }
-                break;
-            }
-            break;
-
-          case 'e':
-          case 'E':
-          case 'f':
-          case 'g':
-            u.d = va_arg(ap, double);
-            if( nas != NULL ){
-                i = fmt - dolPt;
-                if( i < (int)sizeof( pattern ) ){
-                    pattern[0] = '%';
-                    memcpy( &pattern[1], dolPt, (size_t)i );
-                    rv = cvt_f(ss, u.d, pattern, &pattern[i+1] );
-                }
-            } else
-                rv = cvt_f(ss, u.d, fmt0, fmt);
-
-            if (rv < 0) {
-                return rv;
-            }
-            break;
-
-          case 'c':
-            if ((flags & FLAG_LEFT) == 0) {
-                while (width-- > 1) {
-                    rv = (*ss->stuff)(ss, " ", 1);
-                    if (rv < 0) {
-                        return rv;
-                    }
-                }
-            }
-            switch (type) {
-              case TYPE_INT16:
-                /* Treat %hc as %c if JS_C_STRINGS_ARE_UTF8 is undefined. */
-#ifdef JS_C_STRINGS_ARE_UTF8
-                u.wch = va_arg(ap, int);
-                utf8len = js_OneUcs4ToUtf8Char (utf8buf, u.wch);
-                rv = (*ss->stuff)(ss, utf8buf, utf8len);
-                break;
-#endif
-              case TYPE_INTN:
-                u.ch = va_arg(ap, int);
-                rv = (*ss->stuff)(ss, &u.ch, 1);
-                break;
-            }
-            if (rv < 0) {
-                return rv;
-            }
-            if (flags & FLAG_LEFT) {
-                while (width-- > 1) {
-                    rv = (*ss->stuff)(ss, " ", 1);
-                    if (rv < 0) {
-                        return rv;
-                    }
-                }
-            }
-            break;
-
-          case 'p':
-            if (sizeof(void *) == sizeof(JSInt32)) {
-                type = TYPE_UINT32;
-            } else if (sizeof(void *) == sizeof(JSInt64)) {
-                type = TYPE_UINT64;
-            } else if (sizeof(void *) == sizeof(int)) {
-                type = TYPE_UINTN;
-            } else {
-                JS_ASSERT(0);
-                break;
-            }
-            radix = 16;
-            goto fetch_and_convert;
-
-#if 0
-          case 'C':
-          case 'S':
-          case 'E':
-          case 'G':
-            /* XXX not supported I suppose */
-            JS_ASSERT(0);
-            break;
-#endif
-
-          case 's':
-            if(type == TYPE_INT16) {
-                /* 
-                 * This would do a simple string/byte conversion 
-                 * if JS_C_STRINGS_ARE_UTF8 is not defined. 
-                 */
-                u.ws = va_arg(ap, const jschar*);
-                rv = cvt_ws(ss, u.ws, width, prec, flags);
-            } else {
-                u.s = va_arg(ap, const char*);
-                rv = cvt_s(ss, u.s, width, prec, flags);
-            }
-            if (rv < 0) {
-                return rv;
-            }
-            break;
-
-          case 'n':
-            u.ip = va_arg(ap, int*);
-            if (u.ip) {
-                *u.ip = ss->cur - ss->base;
-            }
-            break;
-
-          default:
-            /* Not a % token after all... skip it */
-#if 0
-            JS_ASSERT(0);
-#endif
-            rv = (*ss->stuff)(ss, "%", 1);
-            if (rv < 0) {
-                return rv;
-            }
-            rv = (*ss->stuff)(ss, fmt - 1, 1);
-            if (rv < 0) {
-                return rv;
-            }
-        }
-    }
-
-    /* Stuff trailing NUL */
-    rv = (*ss->stuff)(ss, "\0", 1);
-
-    if( nas && ( nas != nasArray ) ){
-        free( nas );
-    }
-
-    return rv;
-}
-
-/************************************************************************/
-
-static int FuncStuff(SprintfState *ss, const char *sp, JSUint32 len)
-{
-    int rv;
-
-    rv = (*ss->func)(ss->arg, sp, len);
-    if (rv < 0) {
-        return rv;
-    }
-    ss->maxlen += len;
-    return 0;
-}
-
-JS_PUBLIC_API(JSUint32) JS_sxprintf(JSStuffFunc func, void *arg,
-                                    const char *fmt, ...)
-{
-    va_list ap;
-    int rv;
-
-    va_start(ap, fmt);
-    rv = JS_vsxprintf(func, arg, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-JS_PUBLIC_API(JSUint32) JS_vsxprintf(JSStuffFunc func, void *arg,
-                                     const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = FuncStuff;
-    ss.func = func;
-    ss.arg = arg;
-    ss.maxlen = 0;
-    rv = dosprintf(&ss, fmt, ap);
-    return (rv < 0) ? (JSUint32)-1 : ss.maxlen;
-}
-
-/*
-** Stuff routine that automatically grows the malloc'd output buffer
-** before it overflows.
-*/
-static int GrowStuff(SprintfState *ss, const char *sp, JSUint32 len)
-{
-    ptrdiff_t off;
-    char *newbase;
-    JSUint32 newlen;
-
-    off = ss->cur - ss->base;
-    if (off + len >= ss->maxlen) {
-        /* Grow the buffer */
-        newlen = ss->maxlen + ((len > 32) ? len : 32);
-        if (ss->base) {
-            newbase = (char*) realloc(ss->base, newlen);
-        } else {
-            newbase = (char*) malloc(newlen);
-        }
-        if (!newbase) {
-            /* Ran out of memory */
-            return -1;
-        }
-        ss->base = newbase;
-        ss->maxlen = newlen;
-        ss->cur = ss->base + off;
-    }
-
-    /* Copy data */
-    while (len) {
-        --len;
-        *ss->cur++ = *sp++;
-    }
-    JS_ASSERT((JSUint32)(ss->cur - ss->base) <= ss->maxlen);
-    return 0;
-}
-
-/*
-** sprintf into a malloc'd buffer
-*/
-JS_PUBLIC_API(char *) JS_smprintf(const char *fmt, ...)
-{
-    va_list ap;
-    char *rv;
-
-    va_start(ap, fmt);
-    rv = JS_vsmprintf(fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-/*
-** Free memory allocated, for the caller, by JS_smprintf
-*/
-JS_PUBLIC_API(void) JS_smprintf_free(char *mem)
-{
-        free(mem);
-}
-
-JS_PUBLIC_API(char *) JS_vsmprintf(const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = GrowStuff;
-    ss.base = 0;
-    ss.cur = 0;
-    ss.maxlen = 0;
-    rv = dosprintf(&ss, fmt, ap);
-    if (rv < 0) {
-        if (ss.base) {
-            free(ss.base);
-        }
-        return 0;
-    }
-    return ss.base;
-}
-
-/*
-** Stuff routine that discards overflow data
-*/
-static int LimitStuff(SprintfState *ss, const char *sp, JSUint32 len)
-{
-    JSUint32 limit = ss->maxlen - (ss->cur - ss->base);
-
-    if (len > limit) {
-        len = limit;
-    }
-    while (len) {
-        --len;
-        *ss->cur++ = *sp++;
-    }
-    return 0;
-}
-
-/*
-** sprintf into a fixed size buffer. Make sure there is a NUL at the end
-** when finished.
-*/
-JS_PUBLIC_API(JSUint32) JS_snprintf(char *out, JSUint32 outlen, const char *fmt, ...)
-{
-    va_list ap;
-    int rv;
-
-    JS_ASSERT((JSInt32)outlen > 0);
-    if ((JSInt32)outlen <= 0) {
-        return 0;
-    }
-
-    va_start(ap, fmt);
-    rv = JS_vsnprintf(out, outlen, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-JS_PUBLIC_API(JSUint32) JS_vsnprintf(char *out, JSUint32 outlen,const char *fmt,
-                                  va_list ap)
-{
-    SprintfState ss;
-    JSUint32 n;
-
-    JS_ASSERT((JSInt32)outlen > 0);
-    if ((JSInt32)outlen <= 0) {
-        return 0;
-    }
-
-    ss.stuff = LimitStuff;
-    ss.base = out;
-    ss.cur = out;
-    ss.maxlen = outlen;
-    (void) dosprintf(&ss, fmt, ap);
-
-    /* If we added chars, and we didn't append a null, do it now. */
-    if( (ss.cur != ss.base) && (ss.cur[-1] != '\0') )
-        ss.cur[-1] = '\0';
-
-    n = ss.cur - ss.base;
-    return n ? n - 1 : n;
-}
-
-JS_PUBLIC_API(char *) JS_sprintf_append(char *last, const char *fmt, ...)
-{
-    va_list ap;
-    char *rv;
-
-    va_start(ap, fmt);
-    rv = JS_vsprintf_append(last, fmt, ap);
-    va_end(ap);
-    return rv;
-}
-
-JS_PUBLIC_API(char *) JS_vsprintf_append(char *last, const char *fmt, va_list ap)
-{
-    SprintfState ss;
-    int rv;
-
-    ss.stuff = GrowStuff;
-    if (last) {
-        int lastlen = strlen(last);
-        ss.base = last;
-        ss.cur = last + lastlen;
-        ss.maxlen = lastlen;
-    } else {
-        ss.base = 0;
-        ss.cur = 0;
-        ss.maxlen = 0;
-    }
-    rv = dosprintf(&ss, fmt, ap);
-    if (rv < 0) {
-        if (ss.base) {
-            free(ss.base);
-        }
-        return 0;
-    }
-    return ss.base;
-}
-
diff --git a/libs/js/src/jsprf.h b/libs/js/src/jsprf.h
deleted file mode 100644
index 0eb910f279..0000000000
--- a/libs/js/src/jsprf.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsprf_h___
-#define jsprf_h___
-
-/*
-** API for PR printf like routines. Supports the following formats
-**      %d - decimal
-**      %u - unsigned decimal
-**      %x - unsigned hex
-**      %X - unsigned uppercase hex
-**      %o - unsigned octal
-**      %hd, %hu, %hx, %hX, %ho - 16-bit versions of above
-**      %ld, %lu, %lx, %lX, %lo - 32-bit versions of above
-**      %lld, %llu, %llx, %llX, %llo - 64 bit versions of above
-**      %s - string
-**      %hs - 16-bit version of above (only available if compiled with JS_C_STRINGS_ARE_UTF8)
-**      %c - character
-**      %hc - 16-bit version of above (only available if compiled with JS_C_STRINGS_ARE_UTF8)
-**      %p - pointer (deals with machine dependent pointer size)
-**      %f - float
-**      %g - float
-*/
-#include "jstypes.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-JS_BEGIN_EXTERN_C
-
-/*
-** sprintf into a fixed size buffer. Guarantees that a NUL is at the end
-** of the buffer. Returns the length of the written output, NOT including
-** the NUL, or (JSUint32)-1 if an error occurs.
-*/
-extern JS_PUBLIC_API(JSUint32) JS_snprintf(char *out, JSUint32 outlen, const char *fmt, ...);
-
-/*
-** sprintf into a malloc'd buffer. Return a pointer to the malloc'd
-** buffer on success, NULL on failure. Call "JS_smprintf_free" to release
-** the memory returned.
-*/
-extern JS_PUBLIC_API(char*) JS_smprintf(const char *fmt, ...);
-
-/*
-** Free the memory allocated, for the caller, by JS_smprintf
-*/
-extern JS_PUBLIC_API(void) JS_smprintf_free(char *mem);
-
-/*
-** "append" sprintf into a malloc'd buffer. "last" is the last value of
-** the malloc'd buffer. sprintf will append data to the end of last,
-** growing it as necessary using realloc. If last is NULL, JS_sprintf_append
-** will allocate the initial string. The return value is the new value of
-** last for subsequent calls, or NULL if there is a malloc failure.
-*/
-extern JS_PUBLIC_API(char*) JS_sprintf_append(char *last, const char *fmt, ...);
-
-/*
-** sprintf into a function. The function "f" is called with a string to
-** place into the output. "arg" is an opaque pointer used by the stuff
-** function to hold any state needed to do the storage of the output
-** data. The return value is a count of the number of characters fed to
-** the stuff function, or (JSUint32)-1 if an error occurs.
-*/
-typedef JSIntn (*JSStuffFunc)(void *arg, const char *s, JSUint32 slen);
-
-extern JS_PUBLIC_API(JSUint32) JS_sxprintf(JSStuffFunc f, void *arg, const char *fmt, ...);
-
-/*
-** va_list forms of the above.
-*/
-extern JS_PUBLIC_API(JSUint32) JS_vsnprintf(char *out, JSUint32 outlen, const char *fmt, va_list ap);
-extern JS_PUBLIC_API(char*) JS_vsmprintf(const char *fmt, va_list ap);
-extern JS_PUBLIC_API(char*) JS_vsprintf_append(char *last, const char *fmt, va_list ap);
-extern JS_PUBLIC_API(JSUint32) JS_vsxprintf(JSStuffFunc f, void *arg, const char *fmt, va_list ap);
-
-/*
-***************************************************************************
-** FUNCTION: JS_sscanf
-** DESCRIPTION:
-**     JS_sscanf() scans the input character string, performs data
-**     conversions, and stores the converted values in the data objects
-**     pointed to by its arguments according to the format control
-**     string.
-**
-**     JS_sscanf() behaves the same way as the sscanf() function in the
-**     Standard C Library (stdio.h), with the following exceptions:
-**     - JS_sscanf() handles the NSPR integer and floating point types,
-**       such as JSInt16, JSInt32, JSInt64, and JSFloat64, whereas
-**       sscanf() handles the standard C types like short, int, long,
-**       and double.
-**     - JS_sscanf() has no multibyte character support, while sscanf()
-**       does.
-** INPUTS:
-**     const char *buf
-**         a character string holding the input to scan
-**     const char *fmt
-**         the format control string for the conversions
-**     ...
-**         variable number of arguments, each of them is a pointer to
-**         a data object in which the converted value will be stored
-** OUTPUTS: none
-** RETURNS: JSInt32
-**     The number of values converted and stored.
-** RESTRICTIONS:
-**    Multibyte characters in 'buf' or 'fmt' are not allowed.
-***************************************************************************
-*/
-
-extern JS_PUBLIC_API(JSInt32) JS_sscanf(const char *buf, const char *fmt, ...);
-
-JS_END_EXTERN_C
-
-#endif /* jsprf_h___ */
diff --git a/libs/js/src/jsprvtd.h b/libs/js/src/jsprvtd.h
deleted file mode 100644
index ed12f1bde5..0000000000
--- a/libs/js/src/jsprvtd.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsprvtd_h___
-#define jsprvtd_h___
-/*
- * JS private typename definitions.
- *
- * This header is included only in other .h files, for convenience and for
- * simplicity of type naming.  The alternative for structures is to use tags,
- * which are named the same as their typedef names (legal in C/C++, and less
- * noisy than suffixing the typedef name with "Struct" or "Str").  Instead,
- * all .h files that include this file may use the same typedef name, whether
- * declaring a pointer to struct type, or defining a member of struct type.
- *
- * A few fundamental scalar types are defined here too.  Neither the scalar
- * nor the struct typedefs should change much, therefore the nearly-global
- * make dependency induced by this file should not prove painful.
- */
-
-#include "jspubtd.h"
-
-/* Internal identifier (jsid) macros. */
-#define JSID_ATOM                   0x0
-#define JSID_INT                    0x1
-#define JSID_OBJECT                 0x2
-#define JSID_TAGMASK                0x3
-#define JSID_TAG(id)                ((id) & JSID_TAGMASK)
-#define JSID_SETTAG(id,t)           ((id) | (t))
-#define JSID_CLRTAG(id)             ((id) & ~(jsid)JSID_TAGMASK)
-
-#define JSID_IS_ATOM(id)            (JSID_TAG(id) == JSID_ATOM)
-#define JSID_TO_ATOM(id)            ((JSAtom *)(id))
-#define ATOM_TO_JSID(atom)          ((jsid)(atom))
-#define ATOM_JSID_TO_JSVAL(id)      ATOM_KEY(JSID_TO_ATOM(id))
-
-#define JSID_IS_INT(id)             ((id) & JSID_INT)
-#define JSID_TO_INT(id)             ((jsint)(id) >> 1)
-#define INT_TO_JSID(i)              (((jsint)(i) << 1) | JSID_INT)
-#define INT_JSID_TO_JSVAL(id)       (id)
-#define INT_JSVAL_TO_JSID(v)        (v)
-
-#define JSID_IS_OBJECT(id)          (JSID_TAG(id) == JSID_OBJECT)
-#define JSID_TO_OBJECT(id)          ((JSObject *) JSID_CLRTAG(id))
-#define OBJECT_TO_JSID(obj)         ((jsid)(obj) | JSID_OBJECT)
-#define OBJECT_JSID_TO_JSVAL(id)    OBJECT_TO_JSVAL(JSID_CLRTAG(id))
-#define OBJECT_JSVAL_TO_JSID(v)     OBJECT_TO_JSID(JSVAL_TO_OBJECT(v))
-
-/* Scalar typedefs. */
-typedef uint8  jsbytecode;
-typedef uint8  jssrcnote;
-typedef uint32 jsatomid;
-
-/* Struct typedefs. */
-typedef struct JSArgumentFormatMap  JSArgumentFormatMap;
-typedef struct JSCodeGenerator      JSCodeGenerator;
-typedef struct JSDependentString    JSDependentString;
-typedef struct JSGCLockHashEntry    JSGCLockHashEntry;
-typedef struct JSGCRootHashEntry    JSGCRootHashEntry;
-typedef struct JSGCThing            JSGCThing;
-typedef struct JSParseNode          JSParseNode;
-typedef struct JSSharpObjectMap     JSSharpObjectMap;
-typedef struct JSToken              JSToken;
-typedef struct JSTokenPos           JSTokenPos;
-typedef struct JSTokenPtr           JSTokenPtr;
-typedef struct JSTokenStream        JSTokenStream;
-typedef struct JSTreeContext        JSTreeContext;
-typedef struct JSTryNote            JSTryNote;
-
-/* Friend "Advanced API" typedefs. */
-typedef struct JSAtom               JSAtom;
-typedef struct JSAtomList           JSAtomList;
-typedef struct JSAtomListElement    JSAtomListElement;
-typedef struct JSAtomMap            JSAtomMap;
-typedef struct JSAtomState          JSAtomState;
-typedef struct JSCodeSpec           JSCodeSpec;
-typedef struct JSPrinter            JSPrinter;
-typedef struct JSRegExp             JSRegExp;
-typedef struct JSRegExpStatics      JSRegExpStatics;
-typedef struct JSScope              JSScope;
-typedef struct JSScopeOps           JSScopeOps;
-typedef struct JSScopeProperty      JSScopeProperty;
-typedef struct JSStackFrame         JSStackFrame;
-typedef struct JSStackHeader        JSStackHeader;
-typedef struct JSStringBuffer       JSStringBuffer;
-typedef struct JSSubString          JSSubString;
-typedef struct JSXML                JSXML;
-typedef struct JSXMLNamespace       JSXMLNamespace;
-typedef struct JSXMLQName           JSXMLQName;
-typedef struct JSXMLArray           JSXMLArray;
-typedef struct JSXMLArrayCursor     JSXMLArrayCursor;
-
-/* "Friend" types used by jscntxt.h and jsdbgapi.h. */
-typedef enum JSTrapStatus {
-    JSTRAP_ERROR,
-    JSTRAP_CONTINUE,
-    JSTRAP_RETURN,
-    JSTRAP_THROW,
-    JSTRAP_LIMIT
-} JSTrapStatus;
-
-typedef JSTrapStatus
-(* JS_DLL_CALLBACK JSTrapHandler)(JSContext *cx, JSScript *script,
-                                  jsbytecode *pc, jsval *rval, void *closure);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSWatchPointHandler)(JSContext *cx, JSObject *obj, jsval id,
-                                        jsval old, jsval *newp, void *closure);
-
-/* called just after script creation */
-typedef void
-(* JS_DLL_CALLBACK JSNewScriptHook)(JSContext  *cx,
-                                    const char *filename,  /* URL of script */
-                                    uintN      lineno,     /* first line */
-                                    JSScript   *script,
-                                    JSFunction *fun,
-                                    void       *callerdata);
-
-/* called just before script destruction */
-typedef void
-(* JS_DLL_CALLBACK JSDestroyScriptHook)(JSContext *cx,
-                                        JSScript  *script,
-                                        void      *callerdata);
-
-typedef void
-(* JS_DLL_CALLBACK JSSourceHandler)(const char *filename, uintN lineno,
-                                    jschar *str, size_t length,
-                                    void **listenerTSData, void *closure);
-
-/*
- * This hook captures high level script execution and function calls (JS or
- * native).  It is used by JS_SetExecuteHook to hook top level scripts and by
- * JS_SetCallHook to hook function calls.  It will get called twice per script
- * or function call: just before execution begins and just after it finishes.
- * In both cases the 'current' frame is that of the executing code.
- *
- * The 'before' param is JS_TRUE for the hook invocation before the execution
- * and JS_FALSE for the invocation after the code has run.
- *
- * The 'ok' param is significant only on the post execution invocation to
- * signify whether or not the code completed 'normally'.
- *
- * The 'closure' param is as passed to JS_SetExecuteHook or JS_SetCallHook
- * for the 'before'invocation, but is whatever value is returned from that
- * invocation for the 'after' invocation. Thus, the hook implementor *could*
- * allocate a stucture in the 'before' invocation and return a pointer to that
- * structure. The pointer would then be handed to the hook for the 'after'
- * invocation. Alternately, the 'before' could just return the same value as
- * in 'closure' to cause the 'after' invocation to be called with the same
- * 'closure' value as the 'before'.
- *
- * Returning NULL in the 'before' hook will cause the 'after' hook *not* to
- * be called.
- */
-typedef void *
-(* JS_DLL_CALLBACK JSInterpreterHook)(JSContext *cx, JSStackFrame *fp, JSBool before,
-                                      JSBool *ok, void *closure);
-
-typedef void
-(* JS_DLL_CALLBACK JSObjectHook)(JSContext *cx, JSObject *obj, JSBool isNew,
-                                 void *closure);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSDebugErrorHook)(JSContext *cx, const char *message,
-                                     JSErrorReport *report, void *closure);
-
-#endif /* jsprvtd_h___ */
diff --git a/libs/js/src/jspubtd.h b/libs/js/src/jspubtd.h
deleted file mode 100644
index 7b22bfce39..0000000000
--- a/libs/js/src/jspubtd.h
+++ /dev/null
@@ -1,635 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jspubtd_h___
-#define jspubtd_h___
-/*
- * JS public API typedefs.
- */
-#include "jstypes.h"
-#include "jscompat.h"
-
-JS_BEGIN_EXTERN_C
-
-/* Scalar typedefs. */
-typedef uint16    jschar;
-typedef int32     jsint;
-typedef uint32    jsuint;
-typedef float64   jsdouble;
-typedef jsword    jsval;
-typedef jsword    jsid;
-typedef int32     jsrefcount;   /* PRInt32 if JS_THREADSAFE, see jslock.h */
-
-/*
- * Run-time version enumeration.  See jsconfig.h for compile-time counterparts
- * to these values that may be selected by the JS_VERSION macro, and tested by
- * #if expressions.
- */
-typedef enum JSVersion {
-    JSVERSION_1_0     = 100,
-    JSVERSION_1_1     = 110,
-    JSVERSION_1_2     = 120,
-    JSVERSION_1_3     = 130,
-    JSVERSION_1_4     = 140,
-    JSVERSION_ECMA_3  = 148,
-    JSVERSION_1_5     = 150,
-    JSVERSION_1_6     = 160,
-    JSVERSION_DEFAULT = 0,
-    JSVERSION_UNKNOWN = -1
-} JSVersion;
-
-#define JSVERSION_IS_ECMA(version) \
-    ((version) == JSVERSION_DEFAULT || (version) >= JSVERSION_1_3)
-
-/* Result of typeof operator enumeration. */
-typedef enum JSType {
-    JSTYPE_VOID,                /* undefined */
-    JSTYPE_OBJECT,              /* object */
-    JSTYPE_FUNCTION,            /* function */
-    JSTYPE_STRING,              /* string */
-    JSTYPE_NUMBER,              /* number */
-    JSTYPE_BOOLEAN,             /* boolean */
-    JSTYPE_NULL,                /* null */
-    JSTYPE_XML,                 /* xml object */
-    JSTYPE_LIMIT
-} JSType;
-
-/* JSObjectOps.checkAccess mode enumeration. */
-typedef enum JSAccessMode {
-    JSACC_PROTO  = 0,           /* XXXbe redundant w.r.t. id */
-    JSACC_PARENT = 1,           /* XXXbe redundant w.r.t. id */
-    JSACC_IMPORT = 2,           /* import foo.bar */
-    JSACC_WATCH  = 3,           /* a watchpoint on object foo for id 'bar' */
-    JSACC_READ   = 4,           /* a "get" of foo.bar */
-    JSACC_WRITE  = 8,           /* a "set" of foo.bar = baz */
-    JSACC_LIMIT
-} JSAccessMode;
-
-#define JSACC_TYPEMASK          (JSACC_WRITE - 1)
-
-/*
- * This enum type is used to control the behavior of a JSObject property
- * iterator function that has type JSNewEnumerate.
- */
-typedef enum JSIterateOp {
-    JSENUMERATE_INIT,       /* Create new iterator state */
-    JSENUMERATE_NEXT,       /* Iterate once */
-    JSENUMERATE_DESTROY     /* Destroy iterator state */
-} JSIterateOp;
-
-/* Struct typedefs. */
-typedef struct JSClass           JSClass;
-typedef struct JSExtendedClass   JSExtendedClass;
-typedef struct JSConstDoubleSpec JSConstDoubleSpec;
-typedef struct JSContext         JSContext;
-typedef struct JSErrorReport     JSErrorReport;
-typedef struct JSFunction        JSFunction;
-typedef struct JSFunctionSpec    JSFunctionSpec;
-typedef struct JSIdArray         JSIdArray;
-typedef struct JSProperty        JSProperty;
-typedef struct JSPropertySpec    JSPropertySpec;
-typedef struct JSObject          JSObject;
-typedef struct JSObjectMap       JSObjectMap;
-typedef struct JSObjectOps       JSObjectOps;
-typedef struct JSXMLObjectOps    JSXMLObjectOps;
-typedef struct JSRuntime         JSRuntime;
-typedef struct JSRuntime         JSTaskState;   /* XXX deprecated name */
-typedef struct JSScript          JSScript;
-typedef struct JSString          JSString;
-typedef struct JSXDRState        JSXDRState;
-typedef struct JSExceptionState  JSExceptionState;
-typedef struct JSLocaleCallbacks JSLocaleCallbacks;
-
-/* JSClass (and JSObjectOps where appropriate) function pointer typedefs. */
-
-/*
- * Add, delete, get or set a property named by id in obj.  Note the jsval id
- * type -- id may be a string (Unicode property identifier) or an int (element
- * index).  The *vp out parameter, on success, is the new property value after
- * an add, get, or set.  After a successful delete, *vp is JSVAL_FALSE iff
- * obj[id] can't be deleted (because it's permanent).
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPropertyOp)(JSContext *cx, JSObject *obj, jsval id,
-                                 jsval *vp);
-
-/*
- * This function type is used for callbacks that enumerate the properties of
- * a JSObject.  The behavior depends on the value of enum_op:
- *
- *  JSENUMERATE_INIT
- *    A new, opaque iterator state should be allocated and stored in *statep.
- *    (You can use PRIVATE_TO_JSVAL() to tag the pointer to be stored).
- *
- *    The number of properties that will be enumerated should be returned as
- *    an integer jsval in *idp, if idp is non-null, and provided the number of
- *    enumerable properties is known.  If idp is non-null and the number of
- *    enumerable properties can't be computed in advance, *idp should be set
- *    to JSVAL_ZERO.
- *
- *  JSENUMERATE_NEXT
- *    A previously allocated opaque iterator state is passed in via statep.
- *    Return the next jsid in the iteration using *idp.  The opaque iterator
- *    state pointed at by statep is destroyed and *statep is set to JSVAL_NULL
- *    if there are no properties left to enumerate.
- *
- *  JSENUMERATE_DESTROY
- *    Destroy the opaque iterator state previously allocated in *statep by a
- *    call to this function when enum_op was JSENUMERATE_INIT.
- *
- * The return value is used to indicate success, with a value of JS_FALSE
- * indicating failure.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSNewEnumerateOp)(JSContext *cx, JSObject *obj,
-                                     JSIterateOp enum_op,
-                                     jsval *statep, jsid *idp);
-
-/*
- * The old-style JSClass.enumerate op should define all lazy properties not
- * yet reflected in obj.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSEnumerateOp)(JSContext *cx, JSObject *obj);
-
-/*
- * Resolve a lazy property named by id in obj by defining it directly in obj.
- * Lazy properties are those reflected from some peer native property space
- * (e.g., the DOM attributes for a given node reflected as obj) on demand.
- *
- * JS looks for a property in an object, and if not found, tries to resolve
- * the given id.  If resolve succeeds, the engine looks again in case resolve
- * defined obj[id].  If no such property exists directly in obj, the process
- * is repeated with obj's prototype, etc.
- *
- * NB: JSNewResolveOp provides a cheaper way to resolve lazy properties.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSResolveOp)(JSContext *cx, JSObject *obj, jsval id);
-
-/*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or function prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
- * The *objp out parameter, on success, should be null to indicate that id
- * was not resolved; and non-null, referring to obj or one of its prototypes,
- * if id was resolved.
- *
- * This hook instead of JSResolveOp is called via the JSClass.resolve member
- * if JSCLASS_NEW_RESOLVE is set in JSClass.flags.
- *
- * Setting JSCLASS_NEW_RESOLVE and JSCLASS_NEW_RESOLVE_GETS_START further
- * extends this hook by passing in the starting object on the prototype chain
- * via *objp.  Thus a resolve hook implementation may define the property id
- * being resolved in the object in which the id was first sought, rather than
- * in a prototype object whose class led to the resolve hook being called.
- *
- * When using JSCLASS_NEW_RESOLVE_GETS_START, the resolve hook must therefore
- * null *objp to signify "not resolved".  With only JSCLASS_NEW_RESOLVE and no
- * JSCLASS_NEW_RESOLVE_GETS_START, the hook can assume *objp is null on entry.
- * This is not good practice, but enough existing hook implementations count
- * on it that we can't break compatibility by passing the starting object in
- * *objp without a new JSClass flag.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSNewResolveOp)(JSContext *cx, JSObject *obj, jsval id,
-                                   uintN flags, JSObject **objp);
-
-/*
- * Convert obj to the given type, returning true with the resulting value in
- * *vp on success, and returning false on error or exception.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSConvertOp)(JSContext *cx, JSObject *obj, JSType type,
-                                jsval *vp);
-
-/*
- * Finalize obj, which the garbage collector has determined to be unreachable
- * from other live objects or from GC roots.  Obviously, finalizers must never
- * store a reference to obj.
- */
-typedef void
-(* JS_DLL_CALLBACK JSFinalizeOp)(JSContext *cx, JSObject *obj);
-
-/*
- * Used by JS_AddExternalStringFinalizer and JS_RemoveExternalStringFinalizer
- * to extend and reduce the set of string types finalized by the GC.
- */
-typedef void
-(* JS_DLL_CALLBACK JSStringFinalizeOp)(JSContext *cx, JSString *str);
-
-/*
- * The signature for JSClass.getObjectOps, used by JS_NewObject's internals
- * to discover the set of high-level object operations to use for new objects
- * of the given class.  All native objects have a JSClass, which is stored as
- * a private (int-tagged) pointer in obj->slots[JSSLOT_CLASS].  In contrast,
- * all native and host objects have a JSObjectMap at obj->map, which may be
- * shared among a number of objects, and which contains the JSObjectOps *ops
- * pointer used to dispatch object operations from API calls.
- *
- * Thus JSClass (which pre-dates JSObjectOps in the API) provides a low-level
- * interface to class-specific code and data, while JSObjectOps allows for a
- * higher level of operation, which does not use the object's class except to
- * find the class's JSObjectOps struct, by calling clasp->getObjectOps, and to
- * finalize the object.
- *
- * If this seems backwards, that's because it is!  API compatibility requires
- * a JSClass *clasp parameter to JS_NewObject, etc.  Most host objects do not
- * need to implement the larger JSObjectOps, and can share the common JSScope
- * code and data used by the native (js_ObjectOps, see jsobj.c) ops.
- *
- * Further extension to preserve API compatibility: if this function returns
- * a pointer to JSXMLObjectOps.base, not to JSObjectOps, then the engine calls
- * extended hooks needed for E4X.
- */
-typedef JSObjectOps *
-(* JS_DLL_CALLBACK JSGetObjectOps)(JSContext *cx, JSClass *clasp);
-
-/*
- * JSClass.checkAccess type: check whether obj[id] may be accessed per mode,
- * returning false on error/exception, true on success with obj[id]'s last-got
- * value in *vp, and its attributes in *attrsp.  As for JSPropertyOp above, id
- * is either a string or an int jsval.
- *
- * See JSCheckAccessIdOp, below, for the JSObjectOps counterpart, which takes
- * a jsid (a tagged int or aligned, unique identifier pointer) rather than a
- * jsval.  The native js_ObjectOps.checkAccess simply forwards to the object's
- * clasp->checkAccess, so that both JSClass and JSObjectOps implementors may
- * specialize access checks.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSCheckAccessOp)(JSContext *cx, JSObject *obj, jsval id,
-                                    JSAccessMode mode, jsval *vp);
-
-/*
- * Encode or decode an object, given an XDR state record representing external
- * data.  See jsxdrapi.h.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSXDRObjectOp)(JSXDRState *xdr, JSObject **objp);
-
-/*
- * Check whether v is an instance of obj.  Return false on error or exception,
- * true on success with JS_TRUE in *bp if v is an instance of obj, JS_FALSE in
- * *bp otherwise.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSHasInstanceOp)(JSContext *cx, JSObject *obj, jsval v,
-                                    JSBool *bp);
-
-/*
- * Function type for JSClass.mark and JSObjectOps.mark, called from the GC to
- * scan live GC-things reachable from obj's private data structure.  For each
- * such thing, a mark implementation must call
- *
- *    JS_MarkGCThing(cx, thing, name, arg);
- *
- * The trailing name and arg parameters are used for GC_MARK_DEBUG-mode heap
- * dumping and ref-path tracing.  The mark function should pass a (typically
- * literal) string naming the private data member for name, and it must pass
- * the opaque arg parameter through from its caller.
- *
- * For the JSObjectOps.mark hook, the return value is the number of slots at
- * obj->slots to scan.  For JSClass.mark, the return value is ignored.
- *
- * NB: JSMarkOp implementations cannot allocate new GC-things (JS_NewObject
- * called from a mark function will fail silently, e.g.).
- */
-typedef uint32
-(* JS_DLL_CALLBACK JSMarkOp)(JSContext *cx, JSObject *obj, void *arg);
-
-/*
- * The optional JSClass.reserveSlots hook allows a class to make computed
- * per-instance object slots reservations, in addition to or instead of using
- * JSCLASS_HAS_RESERVED_SLOTS(n) in the JSClass.flags initializer to reserve
- * a constant-per-class number of slots.  Implementations of this hook should
- * return the number of slots to reserve, not including any reserved by using
- * JSCLASS_HAS_RESERVED_SLOTS(n) in JSClass.flags.
- *
- * NB: called with obj locked by the JSObjectOps-specific mutual exclusion
- * mechanism appropriate for obj, so don't nest other operations that might
- * also lock obj.
- */
-typedef uint32
-(* JS_DLL_CALLBACK JSReserveSlotsOp)(JSContext *cx, JSObject *obj);
-
-/* JSObjectOps function pointer typedefs. */
-
-/*
- * Create a new subclass of JSObjectMap (see jsobj.h), with the nrefs and ops
- * members initialized from the same-named parameters, and with the nslots and
- * freeslot members initialized according to ops and clasp.  Return null on
- * error, non-null on success.
- *
- * JSObjectMaps are reference-counted by generic code in the engine.  Usually,
- * the nrefs parameter to JSObjectOps.newObjectMap will be 1, to count the ref
- * returned to the caller on success.  After a successful construction, some
- * number of js_HoldObjectMap and js_DropObjectMap calls ensue.  When nrefs
- * reaches 0 due to a js_DropObjectMap call, JSObjectOps.destroyObjectMap will
- * be called to dispose of the map.
- */
-typedef JSObjectMap *
-(* JS_DLL_CALLBACK JSNewObjectMapOp)(JSContext *cx, jsrefcount nrefs,
-                                     JSObjectOps *ops, JSClass *clasp,
-                                     JSObject *obj);
-
-/*
- * Generic type for an infallible JSObjectMap operation, used currently by
- * JSObjectOps.destroyObjectMap.
- */
-typedef void
-(* JS_DLL_CALLBACK JSObjectMapOp)(JSContext *cx, JSObjectMap *map);
-
-/*
- * Look for id in obj and its prototype chain, returning false on error or
- * exception, true on success.  On success, return null in *propp if id was
- * not found.  If id was found, return the first object searching from obj
- * along its prototype chain in which id names a direct property in *objp, and
- * return a non-null, opaque property pointer in *propp.
- *
- * If JSLookupPropOp succeeds and returns with *propp non-null, that pointer
- * may be passed as the prop parameter to a JSAttributesOp, as a short-cut
- * that bypasses id re-lookup.  In any case, a non-null *propp result after a
- * successful lookup must be dropped via JSObjectOps.dropProperty.
- *
- * NB: successful return with non-null *propp means the implementation may
- * have locked *objp and added a reference count associated with *propp, so
- * callers should not risk deadlock by nesting or interleaving other lookups
- * or any obj-bearing ops before dropping *propp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSLookupPropOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   JSObject **objp, JSProperty **propp);
-
-/*
- * Define obj[id], a direct property of obj named id, having the given initial
- * value, with the specified getter, setter, and attributes.  If the propp out
- * param is non-null, *propp on successful return contains an opaque property
- * pointer usable as a speedup hint with JSAttributesOp.  But note that propp
- * may be null, indicating that the caller is not interested in recovering an
- * opaque pointer to the newly-defined property.
- *
- * If propp is non-null and JSDefinePropOp succeeds, its caller must be sure
- * to drop *propp using JSObjectOps.dropProperty in short order, just as with
- * JSLookupPropOp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSDefinePropOp)(JSContext *cx, JSObject *obj,
-                                   jsid id, jsval value,
-                                   JSPropertyOp getter, JSPropertyOp setter,
-                                   uintN attrs, JSProperty **propp);
-
-/*
- * Get, set, or delete obj[id], returning false on error or exception, true
- * on success.  If getting or setting, the new value is returned in *vp on
- * success.  If deleting without error, *vp will be JSVAL_FALSE if obj[id] is
- * permanent, and JSVAL_TRUE if id named a direct property of obj that was in
- * fact deleted, or if id names no direct property of obj (id could name a
- * prototype property, or no property in obj or its prototype chain).
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPropertyIdOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   jsval *vp);
-
-/*
- * Get or set attributes of the property obj[id].  Return false on error or
- * exception, true with current attributes in *attrsp.  If prop is non-null,
- * it must come from the *propp out parameter of a prior JSDefinePropOp or
- * JSLookupPropOp call.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSAttributesOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   JSProperty *prop, uintN *attrsp);
-
-/*
- * JSObjectOps.checkAccess type: check whether obj[id] may be accessed per
- * mode, returning false on error/exception, true on success with obj[id]'s
- * last-got value in *vp, and its attributes in *attrsp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSCheckAccessIdOp)(JSContext *cx, JSObject *obj, jsid id,
-                                      JSAccessMode mode, jsval *vp,
-                                      uintN *attrsp);
-
-/*
- * A generic type for functions mapping an object to another object, or null
- * if an error or exception was thrown on cx.  Used by JSObjectOps.thisObject
- * at present.
- */
-typedef JSObject *
-(* JS_DLL_CALLBACK JSObjectOp)(JSContext *cx, JSObject *obj);
-
-/*
- * A generic type for functions taking a context, object, and property, with
- * no return value.  Used by JSObjectOps.dropProperty currently (see above,
- * JSDefinePropOp and JSLookupPropOp, for the object-locking protocol in which
- * dropProperty participates).
- */
-typedef void
-(* JS_DLL_CALLBACK JSPropertyRefOp)(JSContext *cx, JSObject *obj,
-                                    JSProperty *prop);
-
-/*
- * Function type for JSObjectOps.setProto and JSObjectOps.setParent.  These
- * hooks must check for cycles without deadlocking, and otherwise take special
- * steps.  See jsobj.c, js_SetProtoOrParent, for an example.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetObjectSlotOp)(JSContext *cx, JSObject *obj,
-                                      uint32 slot, JSObject *pobj);
-
-/*
- * Get and set a required slot, one that should already have been allocated.
- * These operations are infallible, so required slots must be pre-allocated,
- * or implementations must suppress out-of-memory errors.  The native ops
- * (js_ObjectOps, see jsobj.c) access slots reserved by including a call to
- * the JSCLASS_HAS_RESERVED_SLOTS(n) macro in the JSClass.flags initializer.
- *
- * NB: the slot parameter is a zero-based index into obj->slots[], unlike the
- * index parameter to the JS_GetReservedSlot and JS_SetReservedSlot API entry
- * points, which is a zero-based index into the JSCLASS_RESERVED_SLOTS(clasp)
- * reserved slots that come after the initial well-known slots: proto, parent,
- * class, and optionally, the private data slot.
- */
-typedef jsval
-(* JS_DLL_CALLBACK JSGetRequiredSlotOp)(JSContext *cx, JSObject *obj,
-                                        uint32 slot);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetRequiredSlotOp)(JSContext *cx, JSObject *obj,
-                                        uint32 slot, jsval v);
-
-typedef JSObject *
-(* JS_DLL_CALLBACK JSGetMethodOp)(JSContext *cx, JSObject *obj, jsid id,
-                                  jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetMethodOp)(JSContext *cx, JSObject *obj, jsid id,
-                                  jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSEnumerateValuesOp)(JSContext *cx, JSObject *obj,
-                                        JSIterateOp enum_op,
-                                        jsval *statep, jsid *idp, jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSEqualityOp)(JSContext *cx, JSObject *obj, jsval v,
-                                 JSBool *bp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSConcatenateOp)(JSContext *cx, JSObject *obj, jsval v,
-                                    jsval *vp);
-
-/* Typedef for native functions called by the JS VM. */
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSNative)(JSContext *cx, JSObject *obj, uintN argc,
-                             jsval *argv, jsval *rval);
-
-/* Callbacks and their arguments. */
-
-typedef enum JSGCStatus {
-    JSGC_BEGIN,
-    JSGC_END,
-    JSGC_MARK_END,
-    JSGC_FINALIZE_END
-} JSGCStatus;
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSGCCallback)(JSContext *cx, JSGCStatus status);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSBranchCallback)(JSContext *cx, JSScript *script);
-
-typedef void
-(* JS_DLL_CALLBACK JSErrorReporter)(JSContext *cx, const char *message,
-                                    JSErrorReport *report);
-
-/*
- * Possible exception types. These types are part of a JSErrorFormatString 
- * structure. They define which error to throw in case of a runtime error.
- * JSEXN_NONE marks an unthrowable error.
- */
-typedef enum JSExnType {
-    JSEXN_NONE = -1,
-      JSEXN_ERR,
-        JSEXN_INTERNALERR,
-        JSEXN_EVALERR,
-        JSEXN_RANGEERR,
-        JSEXN_REFERENCEERR,
-        JSEXN_SYNTAXERR,
-        JSEXN_TYPEERR,
-        JSEXN_URIERR,
-        JSEXN_LIMIT
-} JSExnType;
-
-typedef struct JSErrorFormatString {
-    const char *format;  /* the error message (may be UTF-8 if compiled with JS_C_STRINGS_ARE_UTF8) */
-    uint16 argCount;     /* the number of arguments to convert in the error message */
-    JSExnType exnType;      /* One of the JSExnType constants above */
-} JSErrorFormatString;
-
-typedef const JSErrorFormatString *
-(* JS_DLL_CALLBACK JSErrorCallback)(void *userRef, const char *locale,
-                                    const uintN errorNumber);
-
-#ifdef va_start
-#define JS_ARGUMENT_FORMATTER_DEFINED 1
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
-                                        JSBool fromJS, jsval **vpp,
-#ifdef OSSP /* BUGFIX */
-                                        va_list app);
-#else
-                                        va_list *app);
-#endif
-#endif
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToUpperCase)(JSContext *cx, JSString *src,
-                                        jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToLowerCase)(JSContext *cx, JSString *src,
-                                        jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleCompare)(JSContext *cx,
-                                    JSString *src1, JSString *src2,
-                                    jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToUnicode)(JSContext *cx, char *src, jsval *rval);
-
-/*
- * Security protocol types.
- */
-typedef struct JSPrincipals JSPrincipals;
-
-/*
- * XDR-encode or -decode a principals instance, based on whether xdr->mode is
- * JSXDR_ENCODE, in which case *principalsp should be encoded; or JSXDR_DECODE,
- * in which case implementations must return a held (via JSPRINCIPALS_HOLD),
- * non-null *principalsp out parameter.  Return true on success, false on any
- * error, which the implementation must have reported.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPrincipalsTranscoder)(JSXDRState *xdr,
-                                           JSPrincipals **principalsp);
-
-/*
- * Return a weak reference to the principals associated with obj, possibly via
- * the immutable parent chain leading from obj to a top-level container (e.g.,
- * a window object in the DOM level 0).  If there are no principals associated
- * with obj, return null.  Therefore null does not mean an error was reported;
- * in no event should an error be reported or an exception be thrown by this
- * callback's implementation.
- */
-typedef JSPrincipals *
-(* JS_DLL_CALLBACK JSObjectPrincipalsFinder)(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jspubtd_h___ */
diff --git a/libs/js/src/jsregexp.c b/libs/js/src/jsregexp.c
deleted file mode 100644
index f7f31f8313..0000000000
--- a/libs/js/src/jsregexp.c
+++ /dev/null
@@ -1,4173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS regular expressions, after Perl.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsregexp.h"
-#include "jsscan.h"
-#include "jsstr.h"
-
-#if JS_HAS_REGEXPS
-
-/* Note : contiguity of 'simple opcodes' is important for SimpleMatch() */
-typedef enum REOp {
-    REOP_EMPTY         = 0,  /* match rest of input against rest of r.e. */
-    REOP_ALT           = 1,  /* alternative subexpressions in kid and next */
-    REOP_SIMPLE_START  = 2,  /* start of 'simple opcodes' */
-    REOP_BOL           = 2,  /* beginning of input (or line if multiline) */
-    REOP_EOL           = 3,  /* end of input (or line if multiline) */
-    REOP_WBDRY         = 4,  /* match "" at word boundary */
-    REOP_WNONBDRY      = 5,  /* match "" at word non-boundary */
-    REOP_DOT           = 6,  /* stands for any character */
-    REOP_DIGIT         = 7,  /* match a digit char: [0-9] */
-    REOP_NONDIGIT      = 8,  /* match a non-digit char: [^0-9] */
-    REOP_ALNUM         = 9,  /* match an alphanumeric char: [0-9a-z_A-Z] */
-    REOP_NONALNUM      = 10, /* match a non-alphanumeric char: [^0-9a-z_A-Z] */
-    REOP_SPACE         = 11, /* match a whitespace char */
-    REOP_NONSPACE      = 12, /* match a non-whitespace char */
-    REOP_BACKREF       = 13, /* back-reference (e.g., \1) to a parenthetical */
-    REOP_FLAT          = 14, /* match a flat string */
-    REOP_FLAT1         = 15, /* match a single char */
-    REOP_FLATi         = 16, /* case-independent REOP_FLAT */
-    REOP_FLAT1i        = 17, /* case-independent REOP_FLAT1 */
-    REOP_UCFLAT1       = 18, /* single Unicode char */
-    REOP_UCFLAT1i      = 19, /* case-independent REOP_UCFLAT1 */
-    REOP_UCFLAT        = 20, /* flat Unicode string; len immediate counts chars */
-    REOP_UCFLATi       = 21, /* case-independent REOP_UCFLAT */
-    REOP_CLASS         = 22, /* character class with index */
-    REOP_NCLASS        = 23, /* negated character class with index */
-    REOP_SIMPLE_END    = 23, /* end of 'simple opcodes' */
-    REOP_QUANT         = 25, /* quantified atom: atom{1,2} */
-    REOP_STAR          = 26, /* zero or more occurrences of kid */
-    REOP_PLUS          = 27, /* one or more occurrences of kid */
-    REOP_OPT           = 28, /* optional subexpression in kid */
-    REOP_LPAREN        = 29, /* left paren bytecode: kid is u.num'th sub-regexp */
-    REOP_RPAREN        = 30, /* right paren bytecode */
-    REOP_JUMP          = 31, /* for deoptimized closure loops */
-    REOP_DOTSTAR       = 32, /* optimize .* to use a single opcode */
-    REOP_ANCHOR        = 33, /* like .* but skips left context to unanchored r.e. */
-    REOP_EOLONLY       = 34, /* $ not preceded by any pattern */
-    REOP_BACKREFi      = 37, /* case-independent REOP_BACKREF */
-    REOP_LPARENNON     = 41, /* non-capturing version of REOP_LPAREN */
-    REOP_ASSERT        = 43, /* zero width positive lookahead assertion */
-    REOP_ASSERT_NOT    = 44, /* zero width negative lookahead assertion */
-    REOP_ASSERTTEST    = 45, /* sentinel at end of assertion child */
-    REOP_ASSERTNOTTEST = 46, /* sentinel at end of !assertion child */
-    REOP_MINIMALSTAR   = 47, /* non-greedy version of * */
-    REOP_MINIMALPLUS   = 48, /* non-greedy version of + */
-    REOP_MINIMALOPT    = 49, /* non-greedy version of ? */
-    REOP_MINIMALQUANT  = 50, /* non-greedy version of {} */
-    REOP_ENDCHILD      = 51, /* sentinel at end of quantifier child */
-    REOP_REPEAT        = 52, /* directs execution of greedy quantifier */
-    REOP_MINIMALREPEAT = 53, /* directs execution of non-greedy quantifier */
-    REOP_ALTPREREQ     = 54, /* prerequisite for ALT, either of two chars */
-    REOP_ALTPREREQ2    = 55, /* prerequisite for ALT, a char or a class */
-    REOP_ENDALT        = 56, /* end of final alternate */
-    REOP_CONCAT        = 57, /* concatenation of terms (parse time only) */
-
-    REOP_END
-} REOp;
-
-#define REOP_IS_SIMPLE(op)  ((unsigned)((op) - REOP_SIMPLE_START) <           \
-                             (unsigned)REOP_SIMPLE_END)
-
-struct RENode {
-    REOp            op;         /* r.e. op bytecode */
-    RENode          *next;      /* next in concatenation order */
-    void            *kid;       /* first operand */
-    union {
-        void        *kid2;      /* second operand */
-        jsint       num;        /* could be a number */
-        size_t      parenIndex; /* or a parenthesis index */
-        struct {                /* or a quantifier range */
-            uintN  min;
-            uintN  max;
-            JSPackedBool greedy;
-        } range;
-        struct {                /* or a character class */
-            size_t  startIndex;
-            size_t  kidlen;     /* length of string at kid, in jschars */
-            size_t  index;      /* index into class list */
-            uint16  bmsize;     /* bitmap size, based on max char code */
-            JSPackedBool sense;
-        } ucclass;
-        struct {                /* or a literal sequence */
-            jschar  chr;        /* of one character */
-            size_t  length;     /* or many (via the kid) */
-        } flat;
-        struct {
-            RENode  *kid2;      /* second operand from ALT */
-            jschar  ch1;        /* match char for ALTPREREQ */
-            jschar  ch2;        /* ditto, or class index for ALTPREREQ2 */
-        } altprereq;
-    } u;
-};
-
-#define RE_IS_LETTER(c)     (((c >= 'A') && (c <= 'Z')) ||                    \
-                             ((c >= 'a') && (c <= 'z')) )
-#define RE_IS_LINE_TERM(c)  ((c == '\n') || (c == '\r') ||                    \
-                             (c == LINE_SEPARATOR) || (c == PARA_SEPARATOR))
-
-#define CLASS_CACHE_SIZE    4
-
-typedef struct CompilerState {
-    JSContext       *context;
-    JSTokenStream   *tokenStream; /* For reporting errors */
-    const jschar    *cpbegin;
-    const jschar    *cpend;
-    const jschar    *cp;
-    size_t          parenCount;
-    size_t          classCount;   /* number of [] encountered */
-    size_t          treeDepth;    /* maximum depth of parse tree */
-    size_t          progLength;   /* estimated bytecode length */
-    RENode          *result;
-    size_t          classBitmapsMem; /* memory to hold all class bitmaps */
-    struct {
-        const jschar *start;        /* small cache of class strings */
-        size_t length;              /* since they're often the same */
-        size_t index;
-    } classCache[CLASS_CACHE_SIZE];
-    uint16          flags;
-} CompilerState;
-
-typedef struct EmitStateStackEntry {
-    jsbytecode      *altHead;       /* start of REOP_ALT* opcode */
-    jsbytecode      *nextAltFixup;  /* fixup pointer to next-alt offset */
-    jsbytecode      *nextTermFixup; /* fixup ptr. to REOP_JUMP offset */
-    jsbytecode      *endTermFixup;  /* fixup ptr. to REOPT_ALTPREREQ* offset */
-    RENode          *continueNode;  /* original REOP_ALT* node being stacked */
-    jsbytecode      continueOp;     /* REOP_JUMP or REOP_ENDALT continuation */
-    JSPackedBool    jumpToJumpFlag; /* true if we've patched jump-to-jump to
-                                       avoid 16-bit unsigned offset overflow */
-} EmitStateStackEntry;
-
-/*
- * Immediate operand sizes and getter/setters.  Unlike the ones in jsopcode.h,
- * the getters and setters take the pc of the offset, not of the opcode before
- * the offset.
- */
-#define ARG_LEN             2
-#define GET_ARG(pc)         ((uint16)(((pc)[0] << 8) | (pc)[1]))
-#define SET_ARG(pc, arg)    ((pc)[0] = (jsbytecode) ((arg) >> 8),       \
-                             (pc)[1] = (jsbytecode) (arg))
-
-#define OFFSET_LEN          ARG_LEN
-#define OFFSET_MAX          (JS_BIT(ARG_LEN * 8) - 1)
-#define GET_OFFSET(pc)      GET_ARG(pc)
-
-/*
- * Maximum supported tree depth is maximum size of EmitStateStackEntry stack.
- * For sanity, we limit it to 2^24 bytes.
- */
-#define TREE_DEPTH_MAX  (JS_BIT(24) / sizeof(EmitStateStackEntry))
-
-/*
- * The maximum memory that can be allocated for class bitmaps.
- * For sanity, we limit it to 2^24 bytes.
- */
-#define CLASS_BITMAPS_MEM_LIMIT JS_BIT(24)
-
-/*
- * Functions to get size and write/read bytecode that represent small indexes
- * compactly.
- * Each byte in the code represent 7-bit chunk of the index. 8th bit when set
- * indicates that the following byte brings more bits to the index. Otherwise
- * this is the last byte in the index bytecode representing highest index bits.
- */
-static size_t
-GetCompactIndexWidth(size_t index)
-{
-    size_t width;
-
-    for (width = 1; (index >>= 7) != 0; ++width) { }
-    return width;
-}
-
-static jsbytecode *
-WriteCompactIndex(jsbytecode *pc, size_t index)
-{
-    size_t next;
-
-    while ((next = index >> 7) != 0) {
-        *pc++ = (jsbytecode)(index | 0x80);
-        index = next;
-    }
-    *pc++ = (jsbytecode)index;
-    return pc;
-}
-
-static jsbytecode *
-ReadCompactIndex(jsbytecode *pc, size_t *result)
-{
-    size_t nextByte;
-
-    nextByte = *pc++;
-    if ((nextByte & 0x80) == 0) {
-        /*
-         * Short-circuit the most common case when compact index <= 127.
-         */
-        *result = nextByte;
-    } else {
-        size_t shift = 7;
-        *result = 0x7F & nextByte;
-        do {
-            nextByte = *pc++;
-            *result |= (nextByte & 0x7F) << shift;
-            shift += 7;
-        } while ((nextByte & 0x80) != 0);
-    }
-    return pc;
-}
-
-typedef struct RECapture {
-    ptrdiff_t index;           /* start of contents, -1 for empty  */
-    size_t length;             /* length of capture */
-} RECapture;
-
-typedef struct REMatchState {
-    const jschar *cp;
-    RECapture parens[1];      /* first of 're->parenCount' captures,
-                                 allocated at end of this struct */
-} REMatchState;
-
-struct REBackTrackData;
-
-typedef struct REProgState {
-    jsbytecode *continue_pc;        /* current continuation data */
-    jsbytecode continue_op;
-    ptrdiff_t index;                /* progress in text */
-    size_t parenSoFar;              /* highest indexed paren started */
-    union {
-        struct {
-            uintN min;             /* current quantifier limits */
-            uintN max;
-        } quantifier;
-        struct {
-            size_t top;             /* backtrack stack state */
-            size_t sz;
-        } assertion;
-    } u;
-} REProgState;
-
-typedef struct REBackTrackData {
-    size_t sz;                      /* size of previous stack entry */
-    jsbytecode *backtrack_pc;       /* where to backtrack to */
-    jsbytecode backtrack_op;
-    const jschar *cp;               /* index in text of match at backtrack */
-    size_t parenIndex;              /* start index of saved paren contents */
-    size_t parenCount;              /* # of saved paren contents */
-    size_t saveStateStackTop;       /* number of parent states */
-    /* saved parent states follow */
-    /* saved paren contents follow */
-} REBackTrackData;
-
-#define INITIAL_STATESTACK  100
-#define INITIAL_BACKTRACK   8000
-
-typedef struct REGlobalData {
-    JSContext *cx;
-    JSRegExp *regexp;               /* the RE in execution */
-    JSBool ok;                      /* runtime error (out_of_memory only?) */
-    size_t start;                   /* offset to start at */
-    ptrdiff_t skipped;              /* chars skipped anchoring this r.e. */
-    const jschar    *cpbegin;       /* text base address */
-    const jschar    *cpend;         /* text limit address */
-
-    REProgState *stateStack;        /* stack of state of current parents */
-    size_t stateStackTop;
-    size_t stateStackLimit;
-
-    REBackTrackData *backTrackStack;/* stack of matched-so-far positions */
-    REBackTrackData *backTrackSP;
-    size_t backTrackStackSize;
-    size_t cursz;                   /* size of current stack entry */
-
-    JSArenaPool     pool;           /* It's faster to use one malloc'd pool
-                                       than to malloc/free the three items
-                                       that are allocated from this pool */
-} REGlobalData;
-
-/*
- * 1. If IgnoreCase is false, return ch.
- * 2. Let u be ch converted to upper case as if by calling
- *    String.prototype.toUpperCase on the one-character string ch.
- * 3. If u does not consist of a single character, return ch.
- * 4. Let cu be u's character.
- * 5. If ch's code point value is greater than or equal to decimal 128 and cu's
- *    code point value is less than decimal 128, then return ch.
- * 6. Return cu.
- */
-static jschar
-upcase(jschar ch)
-{
-    jschar cu = JS_TOUPPER(ch);
-    if (ch >= 128 && cu < 128)
-        return ch;
-    return cu;
-}
-
-static jschar
-downcase(jschar ch)
-{
-    jschar cl = JS_TOLOWER(ch);
-    if (cl >= 128 && ch < 128)
-        return ch;
-    return cl;
-}
-
-/* Construct and initialize an RENode, returning NULL for out-of-memory */
-static RENode *
-NewRENode(CompilerState *state, REOp op)
-{
-    JSContext *cx;
-    RENode *ren;
-
-    cx = state->context;
-    JS_ARENA_ALLOCATE_CAST(ren, RENode *, &cx->tempPool, sizeof *ren);
-    if (!ren) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-    ren->op = op;
-    ren->next = NULL;
-    ren->kid = NULL;
-    return ren;
-}
-
-/*
- * Validates and converts hex ascii value.
- */
-static JSBool
-isASCIIHexDigit(jschar c, uintN *digit)
-{
-    uintN cv = c;
-
-    if (cv < '0')
-        return JS_FALSE;
-    if (cv <= '9') {
-        *digit = cv - '0';
-        return JS_TRUE;
-    }
-    cv |= 0x20;
-    if (cv >= 'a' && cv <= 'f') {
-        *digit = cv - 'a' + 10;
-        return JS_TRUE;
-    }
-    return JS_FALSE;
-}
-
-
-typedef struct {
-    REOp op;
-    const jschar *errPos;
-    size_t parenIndex;
-} REOpData;
-
-
-/*
- * Process the op against the two top operands, reducing them to a single
- * operand in the penultimate slot. Update progLength and treeDepth.
- */
-static JSBool
-ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack,
-          intN operandSP)
-{
-    RENode *result;
-
-    switch (opData->op) {
-    case REOP_ALT:
-        result = NewRENode(state, REOP_ALT);
-        if (!result)
-            return JS_FALSE;
-        result->kid = operandStack[operandSP - 2];
-        result->u.kid2 = operandStack[operandSP - 1];
-        operandStack[operandSP - 2] = result;
-
-        if (state->treeDepth == TREE_DEPTH_MAX) {
-            js_ReportCompileErrorNumber(state->context, state->tokenStream,
-                                        JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_REGEXP_TOO_COMPLEX);
-            return JS_FALSE;
-        }
-        ++state->treeDepth;
-
-        /*
-         * Look at both alternates to see if there's a FLAT or a CLASS at
-         * the start of each. If so, use a prerequisite match.
-         */
-        if (((RENode *) result->kid)->op == REOP_FLAT &&
-            ((RENode *) result->u.kid2)->op == REOP_FLAT &&
-            (state->flags & JSREG_FOLD) == 0) {
-            result->op = REOP_ALTPREREQ;
-            result->u.altprereq.ch1 = ((RENode *) result->kid)->u.flat.chr;
-            result->u.altprereq.ch2 = ((RENode *) result->u.kid2)->u.flat.chr;
-            /* ALTPREREQ, <end>, uch1, uch2, <next>, ...,
-                                            JUMP, <end> ... ENDALT */
-            state->progLength += 13;
-        }
-        else
-        if (((RENode *) result->kid)->op == REOP_CLASS &&
-            ((RENode *) result->kid)->u.ucclass.index < 256 &&
-            ((RENode *) result->u.kid2)->op == REOP_FLAT &&
-            (state->flags & JSREG_FOLD) == 0) {
-            result->op = REOP_ALTPREREQ2;
-            result->u.altprereq.ch1 = ((RENode *) result->u.kid2)->u.flat.chr;
-            result->u.altprereq.ch2 = ((RENode *) result->kid)->u.ucclass.index;
-            /* ALTPREREQ2, <end>, uch1, uch2, <next>, ...,
-                                            JUMP, <end> ... ENDALT */
-            state->progLength += 13;
-        }
-        else
-        if (((RENode *) result->kid)->op == REOP_FLAT &&
-            ((RENode *) result->u.kid2)->op == REOP_CLASS &&
-            ((RENode *) result->u.kid2)->u.ucclass.index < 256 &&
-            (state->flags & JSREG_FOLD) == 0) {
-            result->op = REOP_ALTPREREQ2;
-            result->u.altprereq.ch1 = ((RENode *) result->kid)->u.flat.chr;
-            result->u.altprereq.ch2 =
-                ((RENode *) result->u.kid2)->u.ucclass.index;
-            /* ALTPREREQ2, <end>, uch1, uch2, <next>, ...,
-                                          JUMP, <end> ... ENDALT */
-            state->progLength += 13;
-        }
-        else {
-            /* ALT, <next>, ..., JUMP, <end> ... ENDALT */
-            state->progLength += 7;
-        }
-        break;
-
-    case REOP_CONCAT:
-        result = operandStack[operandSP - 2];
-        while (result->next)
-            result = result->next;
-        result->next = operandStack[operandSP - 1];
-        break;
-
-    case REOP_ASSERT:
-    case REOP_ASSERT_NOT:
-    case REOP_LPARENNON:
-    case REOP_LPAREN:
-        /* These should have been processed by a close paren. */
-        js_ReportCompileErrorNumberUC(state->context, state->tokenStream,
-                                      JSREPORT_TS | JSREPORT_ERROR,
-                                      JSMSG_MISSING_PAREN, opData->errPos);
-        return JS_FALSE;
-
-    default:;
-    }
-    return JS_TRUE;
-}
-
-/*
- * Parser forward declarations.
- */
-static JSBool ParseTerm(CompilerState *state);
-static JSBool ParseQuantifier(CompilerState *state);
-static intN ParseMinMaxQuantifier(CompilerState *state, JSBool ignoreValues);
-
-/*
- * Top-down regular expression grammar, based closely on Perl4.
- *
- *  regexp:     altern                  A regular expression is one or more
- *              altern '|' regexp       alternatives separated by vertical bar.
- */
-#define INITIAL_STACK_SIZE  128
-
-static JSBool
-ParseRegExp(CompilerState *state)
-{
-    size_t parenIndex;
-    RENode *operand;
-    REOpData *operatorStack;
-    RENode **operandStack;
-    REOp op;
-    intN i;
-    JSBool result = JS_FALSE;
-
-    intN operatorSP = 0, operatorStackSize = INITIAL_STACK_SIZE;
-    intN operandSP = 0, operandStackSize = INITIAL_STACK_SIZE;
-
-    /* Watch out for empty regexp */
-    if (state->cp == state->cpend) {
-        state->result = NewRENode(state, REOP_EMPTY);
-        return (state->result != NULL);
-    }
-
-    operatorStack = (REOpData *)
-        JS_malloc(state->context, sizeof(REOpData) * operatorStackSize);
-    if (!operatorStack)
-        return JS_FALSE;
-
-    operandStack = (RENode **)
-        JS_malloc(state->context, sizeof(RENode *) * operandStackSize);
-    if (!operandStack)
-        goto out;
-
-    for (;;) {
-        parenIndex = state->parenCount;
-        if (state->cp == state->cpend) {
-            /*
-             * If we are at the end of the regexp and we're short one or more
-             * operands, the regexp must have the form /x|/ or some such, with
-             * left parentheses making us short more than one operand.
-             */
-            if (operatorSP >= operandSP) {
-                operand = NewRENode(state, REOP_EMPTY);
-                if (!operand)
-                    goto out;
-                goto pushOperand;
-            }
-        } else {
-            switch (*state->cp) {
-            case '(':
-                ++state->cp;
-                if (state->cp + 1 < state->cpend &&
-                    *state->cp == '?' &&
-                    (state->cp[1] == '=' ||
-                     state->cp[1] == '!' ||
-                     state->cp[1] == ':')) {
-                    switch (state->cp[1]) {
-                    case '=':
-                        op = REOP_ASSERT;
-                        /* ASSERT, <next>, ... ASSERTTEST */
-                        state->progLength += 4;
-                        break;
-                    case '!':
-                        op = REOP_ASSERT_NOT;
-                        /* ASSERTNOT, <next>, ... ASSERTNOTTEST */
-                        state->progLength += 4;
-                        break;
-                    default:
-                        op = REOP_LPARENNON;
-                        break;
-                    }
-                    state->cp += 2;
-                } else {
-                    op = REOP_LPAREN;
-                    /* LPAREN, <index>, ... RPAREN, <index> */
-                    state->progLength
-                        += 2 * (1 + GetCompactIndexWidth(parenIndex));
-                    state->parenCount++;
-                    if (state->parenCount == 65535) {
-                        js_ReportCompileErrorNumber(state->context,
-                                                    state->tokenStream,
-                                                    JSREPORT_TS |
-                                                    JSREPORT_ERROR,
-                                                    JSMSG_TOO_MANY_PARENS);
-                        goto out;
-                    }
-                }
-                goto pushOperator;
-
-            case ')':
-                /*
-                 * If there's no stacked open parenthesis, throw syntax error.
-                 */
-                for (i = operatorSP - 1; ; i--) {
-                    if (i < 0) {
-                        js_ReportCompileErrorNumber(state->context,
-                                                    state->tokenStream,
-                                                    JSREPORT_TS |
-                                                    JSREPORT_ERROR,
-                                                    JSMSG_UNMATCHED_RIGHT_PAREN);
-                        goto out;
-                    }
-                    if (operatorStack[i].op == REOP_ASSERT ||
-                        operatorStack[i].op == REOP_ASSERT_NOT ||
-                        operatorStack[i].op == REOP_LPARENNON ||
-                        operatorStack[i].op == REOP_LPAREN) {
-                        break;
-                    }
-                }
-                /* FALL THROUGH */
-
-            case '|':
-                /* Expected an operand before these, so make an empty one */
-                operand = NewRENode(state, REOP_EMPTY);
-                if (!operand)
-                    goto out;
-                goto pushOperand;
-
-            default:
-                if (!ParseTerm(state))
-                    goto out;
-                operand = state->result;
-pushOperand:
-                if (operandSP == operandStackSize) {
-                    operandStackSize += operandStackSize;
-                    operandStack = (RENode **)
-                        JS_realloc(state->context, operandStack,
-                                   sizeof(RENode *) * operandStackSize);
-                    if (!operandStack)
-                        goto out;
-                }
-                operandStack[operandSP++] = operand;
-                break;
-            }
-        }
-
-        /* At the end; process remaining operators. */
-restartOperator:
-        if (state->cp == state->cpend) {
-            while (operatorSP) {
-                --operatorSP;
-                if (!ProcessOp(state, &operatorStack[operatorSP],
-                               operandStack, operandSP))
-                    goto out;
-                --operandSP;
-            }
-            JS_ASSERT(operandSP == 1);
-            state->result = operandStack[0];
-            result = JS_TRUE;
-            goto out;
-        }
-
-        switch (*state->cp) {
-        case '|':
-            /* Process any stacked 'concat' operators */
-            ++state->cp;
-            while (operatorSP &&
-                   operatorStack[operatorSP - 1].op == REOP_CONCAT) {
-                --operatorSP;
-                if (!ProcessOp(state, &operatorStack[operatorSP],
-                               operandStack, operandSP)) {
-                    goto out;
-                }
-                --operandSP;
-            }
-            op = REOP_ALT;
-            goto pushOperator;
-
-        case ')':
-            /*
-             * If there's no stacked open parenthesis, throw syntax error.
-             */
-            for (i = operatorSP - 1; ; i--) {
-                if (i < 0) {
-                    js_ReportCompileErrorNumber(state->context,
-                                                state->tokenStream,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_UNMATCHED_RIGHT_PAREN);
-                    goto out;
-                }
-                if (operatorStack[i].op == REOP_ASSERT ||
-                    operatorStack[i].op == REOP_ASSERT_NOT ||
-                    operatorStack[i].op == REOP_LPARENNON ||
-                    operatorStack[i].op == REOP_LPAREN) {
-                    break;
-                }
-            }
-            ++state->cp;
-
-            /* Process everything on the stack until the open parenthesis. */
-            for (;;) {
-                JS_ASSERT(operatorSP);
-                --operatorSP;
-                switch (operatorStack[operatorSP].op) {
-                case REOP_ASSERT:
-                case REOP_ASSERT_NOT:
-                case REOP_LPAREN:
-                    operand = NewRENode(state, operatorStack[operatorSP].op);
-                    if (!operand)
-                        goto out;
-                    operand->u.parenIndex =
-                        operatorStack[operatorSP].parenIndex;
-                    JS_ASSERT(operandSP);
-                    operand->kid = operandStack[operandSP - 1];
-                    operandStack[operandSP - 1] = operand;
-                    if (state->treeDepth == TREE_DEPTH_MAX) {
-                        js_ReportCompileErrorNumber(state->context,
-                                                    state->tokenStream,
-                                                    JSREPORT_TS |
-                                                    JSREPORT_ERROR,
-                                                    JSMSG_REGEXP_TOO_COMPLEX);
-                        goto out;
-                    }
-                    ++state->treeDepth;
-                    /* FALL THROUGH */
-
-                case REOP_LPARENNON:
-                    state->result = operandStack[operandSP - 1];
-                    if (!ParseQuantifier(state))
-                        goto out;
-                    operandStack[operandSP - 1] = state->result;
-                    goto restartOperator;
-                default:
-                    if (!ProcessOp(state, &operatorStack[operatorSP],
-                                   operandStack, operandSP))
-                        goto out;
-                    --operandSP;
-                    break;
-                }
-            }
-            break;
-
-        case '{':
-        {
-            const jschar *errp = state->cp;
-
-            if (ParseMinMaxQuantifier(state, JS_TRUE) < 0) {
-                /*
-                 * This didn't even scan correctly as a quantifier, so we should
-                 * treat it as flat.
-                 */
-                op = REOP_CONCAT;
-                goto pushOperator;
-            }
-
-            state->cp = errp;
-            /* FALL THROUGH */
-        }
-
-        case '+':
-        case '*':
-        case '?':
-            js_ReportCompileErrorNumberUC(state->context, state->tokenStream,
-                                          JSREPORT_TS | JSREPORT_ERROR,
-                                          JSMSG_BAD_QUANTIFIER, state->cp);
-            result = JS_FALSE;
-            goto out;
-
-        default:
-            /* Anything else is the start of the next term. */
-            op = REOP_CONCAT;
-pushOperator:
-            if (operatorSP == operatorStackSize) {
-                operatorStackSize += operatorStackSize;
-                operatorStack = (REOpData *)
-                    JS_realloc(state->context, operatorStack,
-                               sizeof(REOpData) * operatorStackSize);
-                if (!operatorStack)
-                    goto out;
-            }
-            operatorStack[operatorSP].op = op;
-            operatorStack[operatorSP].errPos = state->cp;
-            operatorStack[operatorSP++].parenIndex = parenIndex;
-            break;
-        }
-    }
-out:
-    if (operatorStack)
-        JS_free(state->context, operatorStack);
-    if (operandStack)
-        JS_free(state->context, operandStack);
-    return result;
-}
-
-/*
- * Hack two bits in CompilerState.flags, for use within FindParenCount to flag
- * its being on the stack, and to propagate errors to its callers.
- */
-#define JSREG_FIND_PAREN_COUNT  0x8000
-#define JSREG_FIND_PAREN_ERROR  0x4000
-
-/*
- * Magic return value from FindParenCount and GetDecimalValue, to indicate
- * overflow beyond GetDecimalValue's max parameter, or a computed maximum if
- * its findMax parameter is non-null.
- */
-#define OVERFLOW_VALUE          ((uintN)-1)
-
-static uintN
-FindParenCount(CompilerState *state)
-{
-    CompilerState temp;
-    int i;
-
-    if (state->flags & JSREG_FIND_PAREN_COUNT)
-        return OVERFLOW_VALUE;
-
-    /*
-     * Copy state into temp, flag it so we never report an invalid backref,
-     * and reset its members to parse the entire regexp.  This is obviously
-     * suboptimal, but GetDecimalValue calls us only if a backref appears to
-     * refer to a forward parenthetical, which is rare.
-     */
-    temp = *state;
-    temp.flags |= JSREG_FIND_PAREN_COUNT;
-    temp.cp = temp.cpbegin;
-    temp.parenCount = 0;
-    temp.classCount = 0;
-    temp.progLength = 0;
-    temp.treeDepth = 0;
-    temp.classBitmapsMem = 0;
-    for (i = 0; i < CLASS_CACHE_SIZE; i++)
-        temp.classCache[i].start = NULL;
-
-    if (!ParseRegExp(&temp)) {
-        state->flags |= JSREG_FIND_PAREN_ERROR;
-        return OVERFLOW_VALUE;
-    }
-    return temp.parenCount;
-}
-
-/*
- * Extract and return a decimal value at state->cp.  The initial character c
- * has already been read.  Return OVERFLOW_VALUE if the result exceeds max.
- * Callers who pass a non-null findMax should test JSREG_FIND_PAREN_ERROR in
- * state->flags to discover whether an error occurred under findMax.
- */
-static uintN
-GetDecimalValue(jschar c, uintN max, uintN (*findMax)(CompilerState *state),
-                CompilerState *state)
-{
-    uintN value = JS7_UNDEC(c);
-    JSBool overflow = (value > max && (!findMax || value > findMax(state)));
-
-    /* The following restriction allows simpler overflow checks. */
-    JS_ASSERT(max <= ((uintN)-1 - 9) / 10);
-    while (state->cp < state->cpend) {
-        c = *state->cp;
-        if (!JS7_ISDEC(c))
-            break;
-        value = 10 * value + JS7_UNDEC(c);
-        if (!overflow && value > max && (!findMax || value > findMax(state)))
-            overflow = JS_TRUE;
-        ++state->cp;
-    }
-    return overflow ? OVERFLOW_VALUE : value;
-}
-
-/*
- * Calculate the total size of the bitmap required for a class expression.
- */
-static JSBool
-CalculateBitmapSize(CompilerState *state, RENode *target, const jschar *src,
-                    const jschar *end)
-{
-    uintN max = 0;
-    JSBool inRange = JS_FALSE;
-    jschar c, rangeStart = 0;
-    uintN n, digit, nDigits, i;
-
-    target->u.ucclass.bmsize = 0;
-    target->u.ucclass.sense = JS_TRUE;
-
-    if (src == end)
-        return JS_TRUE;
-
-    if (*src == '^') {
-        ++src;
-        target->u.ucclass.sense = JS_FALSE;
-    }
-
-    while (src != end) {
-        uintN localMax = 0;
-        switch (*src) {
-        case '\\':
-            ++src;
-            c = *src++;
-            switch (c) {
-            case 'b':
-                localMax = 0x8;
-                break;
-            case 'f':
-                localMax = 0xC;
-                break;
-            case 'n':
-                localMax = 0xA;
-                break;
-            case 'r':
-                localMax = 0xD;
-                break;
-            case 't':
-                localMax = 0x9;
-                break;
-            case 'v':
-                localMax = 0xB;
-                break;
-            case 'c':
-                if (src + 1 < end && RE_IS_LETTER(src[1]))
-                    localMax = (jschar) (*src++ & 0x1F);
-                else
-                    localMax = '\\';
-                break;
-            case 'x':
-                nDigits = 2;
-                goto lexHex;
-            case 'u':
-                nDigits = 4;
-lexHex:
-                n = 0;
-                for (i = 0; (i < nDigits) && (src < end); i++) {
-                    c = *src++;
-                    if (!isASCIIHexDigit(c, &digit)) {
-                        /*
-                         * Back off to accepting the original
-                         *'\' as a literal.
-                         */
-                        src -= i + 1;
-                        n = '\\';
-                        break;
-                    }
-                    n = (n << 4) | digit;
-                }
-                localMax = n;
-                break;
-            case 'd':
-                if (inRange) {
-                    JS_ReportErrorNumber(state->context,
-                                         js_GetErrorMessage, NULL,
-                                         JSMSG_BAD_CLASS_RANGE);
-                    return JS_FALSE;
-                }
-                localMax = '9';
-                break;
-            case 'D':
-            case 's':
-            case 'S':
-            case 'w':
-            case 'W':
-                if (inRange) {
-                    JS_ReportErrorNumber(state->context,
-                                         js_GetErrorMessage, NULL,
-                                         JSMSG_BAD_CLASS_RANGE);
-                    return JS_FALSE;
-                }
-                target->u.ucclass.bmsize = 65535;
-                return JS_TRUE;
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-                /*
-                 *  This is a non-ECMA extension - decimal escapes (in this
-                 *  case, octal!) are supposed to be an error inside class
-                 *  ranges, but supported here for backwards compatibility.
-                 *
-                 */
-                n = JS7_UNDEC(c);
-                c = *src;
-                if ('0' <= c && c <= '7') {
-                    src++;
-                    n = 8 * n + JS7_UNDEC(c);
-                    c = *src;
-                    if ('0' <= c && c <= '7') {
-                        src++;
-                        i = 8 * n + JS7_UNDEC(c);
-                        if (i <= 0377)
-                            n = i;
-                        else
-                            src--;
-                    }
-                }
-                localMax = n;
-                break;
-
-            default:
-                localMax = c;
-                break;
-            }
-            break;
-        default:
-            localMax = *src++;
-            break;
-        }
-        if (inRange) {
-            if (rangeStart > localMax) {
-                JS_ReportErrorNumber(state->context,
-                                     js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_CLASS_RANGE);
-                return JS_FALSE;
-            }
-            inRange = JS_FALSE;
-        } else {
-            if (src < end - 1) {
-                if (*src == '-') {
-                    ++src;
-                    inRange = JS_TRUE;
-                    rangeStart = (jschar)localMax;
-                    continue;
-                }
-            }
-        }
-        if (state->flags & JSREG_FOLD) {
-            c = JS_MAX(upcase((jschar)localMax), downcase((jschar)localMax));
-            if (c > localMax)
-                localMax = c;
-        }
-        if (localMax > max)
-            max = localMax;
-    }
-    target->u.ucclass.bmsize = max;
-    return JS_TRUE;
-}
-
-/*
- *  item:       assertion               An item is either an assertion or
- *              quantatom               a quantified atom.
- *
- *  assertion:  '^'                     Assertions match beginning of string
- *                                      (or line if the class static property
- *                                      RegExp.multiline is true).
- *              '$'                     End of string (or line if the class
- *                                      static property RegExp.multiline is
- *                                      true).
- *              '\b'                    Word boundary (between \w and \W).
- *              '\B'                    Word non-boundary.
- *
- *  quantatom:  atom                    An unquantified atom.
- *              quantatom '{' n ',' m '}'
- *                                      Atom must occur between n and m times.
- *              quantatom '{' n ',' '}' Atom must occur at least n times.
- *              quantatom '{' n '}'     Atom must occur exactly n times.
- *              quantatom '*'           Zero or more times (same as {0,}).
- *              quantatom '+'           One or more times (same as {1,}).
- *              quantatom '?'           Zero or one time (same as {0,1}).
- *
- *              any of which can be optionally followed by '?' for ungreedy
- *
- *  atom:       '(' regexp ')'          A parenthesized regexp (what matched
- *                                      can be addressed using a backreference,
- *                                      see '\' n below).
- *              '.'                     Matches any char except '\n'.
- *              '[' classlist ']'       A character class.
- *              '[' '^' classlist ']'   A negated character class.
- *              '\f'                    Form Feed.
- *              '\n'                    Newline (Line Feed).
- *              '\r'                    Carriage Return.
- *              '\t'                    Horizontal Tab.
- *              '\v'                    Vertical Tab.
- *              '\d'                    A digit (same as [0-9]).
- *              '\D'                    A non-digit.
- *              '\w'                    A word character, [0-9a-z_A-Z].
- *              '\W'                    A non-word character.
- *              '\s'                    A whitespace character, [ \b\f\n\r\t\v].
- *              '\S'                    A non-whitespace character.
- *              '\' n                   A backreference to the nth (n decimal
- *                                      and positive) parenthesized expression.
- *              '\' octal               An octal escape sequence (octal must be
- *                                      two or three digits long, unless it is
- *                                      0 for the null character).
- *              '\x' hex                A hex escape (hex must be two digits).
- *              '\u' unicode            A unicode escape (must be four digits).
- *              '\c' ctrl               A control character, ctrl is a letter.
- *              '\' literalatomchar     Any character except one of the above
- *                                      that follow '\' in an atom.
- *              otheratomchar           Any character not first among the other
- *                                      atom right-hand sides.
- */
-static JSBool
-ParseTerm(CompilerState *state)
-{
-    jschar c = *state->cp++;
-    uintN nDigits;
-    uintN num, tmp, n, i;
-    const jschar *termStart;
-
-    switch (c) {
-    /* assertions and atoms */
-    case '^':
-        state->result = NewRENode(state, REOP_BOL);
-        if (!state->result)
-            return JS_FALSE;
-        state->progLength++;
-        return JS_TRUE;
-    case '$':
-        state->result = NewRENode(state, REOP_EOL);
-        if (!state->result)
-            return JS_FALSE;
-        state->progLength++;
-        return JS_TRUE;
-    case '\\':
-        if (state->cp >= state->cpend) {
-            /* a trailing '\' is an error */
-            js_ReportCompileErrorNumber(state->context, state->tokenStream,
-                                        JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_TRAILING_SLASH);
-            return JS_FALSE;
-        }
-        c = *state->cp++;
-        switch (c) {
-        /* assertion escapes */
-        case 'b' :
-            state->result = NewRENode(state, REOP_WBDRY);
-            if (!state->result)
-                return JS_FALSE;
-            state->progLength++;
-            return JS_TRUE;
-        case 'B':
-            state->result = NewRENode(state, REOP_WNONBDRY);
-            if (!state->result)
-                return JS_FALSE;
-            state->progLength++;
-            return JS_TRUE;
-        /* Decimal escape */
-        case '0':
-            /* Give a strict warning. See also the note below. */
-            if (!js_ReportCompileErrorNumber(state->context,
-                                             state->tokenStream,
-                                             JSREPORT_TS |
-                                             JSREPORT_WARNING |
-                                             JSREPORT_STRICT,
-                                             JSMSG_INVALID_BACKREF)) {
-                return JS_FALSE;
-            }
-     doOctal:
-            num = 0;
-            while (state->cp < state->cpend) {
-                c = *state->cp;
-                if (c < '0' || '7' < c)
-                    break;
-                state->cp++;
-                tmp = 8 * num + (uintN)JS7_UNDEC(c);
-                if (tmp > 0377)
-                    break;
-                num = tmp;
-            }
-            c = (jschar)num;
-    doFlat:
-            state->result = NewRENode(state, REOP_FLAT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.flat.chr = c;
-            state->result->u.flat.length = 1;
-            state->progLength += 3;
-            break;
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            termStart = state->cp - 1;
-            num = GetDecimalValue(c, state->parenCount, FindParenCount, state);
-            if (state->flags & JSREG_FIND_PAREN_ERROR)
-                return JS_FALSE;
-            if (num == OVERFLOW_VALUE) {
-                /* Give a strict mode warning. */
-                if (!js_ReportCompileErrorNumber(state->context,
-                                                 state->tokenStream,
-                                                 JSREPORT_TS |
-                                                 JSREPORT_WARNING |
-                                                 JSREPORT_STRICT,
-                                                 (c >= '8')
-                                                 ? JSMSG_INVALID_BACKREF
-                                                 : JSMSG_BAD_BACKREF)) {
-                    return JS_FALSE;
-                }
-
-                /*
-                 * Note: ECMA 262, 15.10.2.9 says that we should throw a syntax
-                 * error here. However, for compatibility with IE, we treat the
-                 * whole backref as flat if the first character in it is not a
-                 * valid octal character, and as an octal escape otherwise.
-                 */
-                state->cp = termStart;
-                if (c >= '8') {
-                    /* Treat this as flat. termStart - 1 is the \. */
-                    c = '\\';
-                    goto asFlat;
-                }
-
-                /* Treat this as an octal escape. */
-                goto doOctal;
-            }
-            JS_ASSERT(1 <= num && num <= 0x10000);
-            state->result = NewRENode(state, REOP_BACKREF);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.parenIndex = num - 1;
-            state->progLength
-                += 1 + GetCompactIndexWidth(state->result->u.parenIndex);
-            break;
-        /* Control escape */
-        case 'f':
-            c = 0xC;
-            goto doFlat;
-        case 'n':
-            c = 0xA;
-            goto doFlat;
-        case 'r':
-            c = 0xD;
-            goto doFlat;
-        case 't':
-            c = 0x9;
-            goto doFlat;
-        case 'v':
-            c = 0xB;
-            goto doFlat;
-        /* Control letter */
-        case 'c':
-            if (state->cp + 1 < state->cpend && RE_IS_LETTER(state->cp[1])) {
-                c = (jschar) (*state->cp++ & 0x1F);
-            } else {
-                /* back off to accepting the original '\' as a literal */
-                --state->cp;
-                c = '\\';
-            }
-            goto doFlat;
-        /* HexEscapeSequence */
-        case 'x':
-            nDigits = 2;
-            goto lexHex;
-        /* UnicodeEscapeSequence */
-        case 'u':
-            nDigits = 4;
-lexHex:
-            n = 0;
-            for (i = 0; i < nDigits && state->cp < state->cpend; i++) {
-                uintN digit;
-                c = *state->cp++;
-                if (!isASCIIHexDigit(c, &digit)) {
-                    /*
-                     * Back off to accepting the original 'u' or 'x' as a
-                     * literal.
-                     */
-                    state->cp -= i + 2;
-                    n = *state->cp++;
-                    break;
-                }
-                n = (n << 4) | digit;
-            }
-            c = (jschar) n;
-            goto doFlat;
-        /* Character class escapes */
-        case 'd':
-            state->result = NewRENode(state, REOP_DIGIT);
-doSimple:
-            if (!state->result)
-                return JS_FALSE;
-            state->progLength++;
-            break;
-        case 'D':
-            state->result = NewRENode(state, REOP_NONDIGIT);
-            goto doSimple;
-        case 's':
-            state->result = NewRENode(state, REOP_SPACE);
-            goto doSimple;
-        case 'S':
-            state->result = NewRENode(state, REOP_NONSPACE);
-            goto doSimple;
-        case 'w':
-            state->result = NewRENode(state, REOP_ALNUM);
-            goto doSimple;
-        case 'W':
-            state->result = NewRENode(state, REOP_NONALNUM);
-            goto doSimple;
-        /* IdentityEscape */
-        default:
-            state->result = NewRENode(state, REOP_FLAT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.flat.chr = c;
-            state->result->u.flat.length = 1;
-            state->result->kid = (void *) (state->cp - 1);
-            state->progLength += 3;
-            break;
-        }
-        break;
-    case '[':
-        state->result = NewRENode(state, REOP_CLASS);
-        if (!state->result)
-            return JS_FALSE;
-        termStart = state->cp;
-        state->result->u.ucclass.startIndex = termStart - state->cpbegin;
-        for (;;) {
-            if (state->cp == state->cpend) {
-                js_ReportCompileErrorNumberUC(state->context, state->tokenStream,
-                                              JSREPORT_TS | JSREPORT_ERROR,
-                                              JSMSG_UNTERM_CLASS, termStart);
-
-                return JS_FALSE;
-            }
-            if (*state->cp == '\\') {
-                state->cp++;
-            } else {
-                if (*state->cp == ']') {
-                    state->result->u.ucclass.kidlen = state->cp - termStart;
-                    break;
-                }
-            }
-            state->cp++;
-        }
-        for (i = 0; i < CLASS_CACHE_SIZE; i++) {
-            if (!state->classCache[i].start) {
-                state->classCache[i].start = termStart;
-                state->classCache[i].length = state->result->u.ucclass.kidlen;
-                state->classCache[i].index = state->classCount;
-                break;
-            }
-            if (state->classCache[i].length ==
-                state->result->u.ucclass.kidlen) {
-                for (n = 0; ; n++) {
-                    if (n == state->classCache[i].length) {
-                        state->result->u.ucclass.index
-                            = state->classCache[i].index;
-                        goto claim;
-                    }
-                    if (state->classCache[i].start[n] != termStart[n])
-                        break;
-                }
-            }
-        }
-        state->result->u.ucclass.index = state->classCount++;
-
-    claim:
-        /*
-         * Call CalculateBitmapSize now as we want any errors it finds
-         * to be reported during the parse phase, not at execution.
-         */
-        if (!CalculateBitmapSize(state, state->result, termStart, state->cp++))
-            return JS_FALSE;
-        /*
-         * Update classBitmapsMem with number of bytes to hold bmsize bits,
-         * which is (bitsCount + 7) / 8 or (highest_bit + 1 + 7) / 8
-         * or highest_bit / 8 + 1 where highest_bit is u.ucclass.bmsize.
-         */
-        n = (state->result->u.ucclass.bmsize >> 3) + 1;
-        if (n > CLASS_BITMAPS_MEM_LIMIT - state->classBitmapsMem) {
-            js_ReportCompileErrorNumber(state->context, state->tokenStream,
-                                        JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_REGEXP_TOO_COMPLEX);
-            return JS_FALSE;
-        }
-        state->classBitmapsMem += n;
-        /* CLASS, <index> */
-        state->progLength
-            += 1 + GetCompactIndexWidth(state->result->u.ucclass.index);
-        break;
-
-    case '.':
-        state->result = NewRENode(state, REOP_DOT);
-        goto doSimple;
-
-    case '{':
-    {
-        const jschar *errp = state->cp--;
-        intN err;
-
-        err = ParseMinMaxQuantifier(state, JS_TRUE);
-        state->cp = errp;
-
-        if (err < 0)
-            goto asFlat;
-
-        /* FALL THROUGH */
-    }
-    case '*':
-    case '+':
-    case '?':
-        js_ReportCompileErrorNumberUC(state->context, state->tokenStream,
-                                      JSREPORT_TS | JSREPORT_ERROR,
-                                      JSMSG_BAD_QUANTIFIER, state->cp - 1);
-        return JS_FALSE;
-    default:
-asFlat:
-        state->result = NewRENode(state, REOP_FLAT);
-        if (!state->result)
-            return JS_FALSE;
-        state->result->u.flat.chr = c;
-        state->result->u.flat.length = 1;
-        state->result->kid = (void *) (state->cp - 1);
-        state->progLength += 3;
-        break;
-    }
-    return ParseQuantifier(state);
-}
-
-static JSBool
-ParseQuantifier(CompilerState *state)
-{
-    RENode *term;
-    term = state->result;
-    if (state->cp < state->cpend) {
-        switch (*state->cp) {
-        case '+':
-            state->result = NewRENode(state, REOP_QUANT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.range.min = 1;
-            state->result->u.range.max = (uintN)-1;
-            /* <PLUS>, <next> ... <ENDCHILD> */
-            state->progLength += 4;
-            goto quantifier;
-        case '*':
-            state->result = NewRENode(state, REOP_QUANT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.range.min = 0;
-            state->result->u.range.max = (uintN)-1;
-            /* <STAR>, <next> ... <ENDCHILD> */
-            state->progLength += 4;
-            goto quantifier;
-        case '?':
-            state->result = NewRENode(state, REOP_QUANT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.range.min = 0;
-            state->result->u.range.max = 1;
-            /* <OPT>, <next> ... <ENDCHILD> */
-            state->progLength += 4;
-            goto quantifier;
-        case '{':       /* balance '}' */
-        {
-            intN err;
-            const jschar *errp = state->cp;
-
-            err = ParseMinMaxQuantifier(state, JS_FALSE);
-            if (err == 0)
-                goto quantifier;
-            if (err == -1)
-                return JS_TRUE;
-
-            js_ReportCompileErrorNumberUC(state->context,
-                                          state->tokenStream,
-                                          JSREPORT_TS | JSREPORT_ERROR,
-                                          err, errp);
-            return JS_FALSE;
-        }
-        default:;
-        }
-    }
-    return JS_TRUE;
-
-quantifier:
-    if (state->treeDepth == TREE_DEPTH_MAX) {
-        js_ReportCompileErrorNumber(state->context, state->tokenStream,
-                                    JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_REGEXP_TOO_COMPLEX);
-        return JS_FALSE;
-    }
-
-    ++state->treeDepth;
-    ++state->cp;
-    state->result->kid = term;
-    if (state->cp < state->cpend && *state->cp == '?') {
-        ++state->cp;
-        state->result->u.range.greedy = JS_FALSE;
-    } else {
-        state->result->u.range.greedy = JS_TRUE;
-    }
-    return JS_TRUE;
-}
-
-static intN
-ParseMinMaxQuantifier(CompilerState *state, JSBool ignoreValues)
-{
-    uintN min, max;
-    jschar c;
-    const jschar *errp = state->cp++;
-
-    c = *state->cp;
-    if (JS7_ISDEC(c)) {
-        ++state->cp;
-        min = GetDecimalValue(c, 0xFFFF, NULL, state);
-        c = *state->cp;
-
-        if (!ignoreValues && min == OVERFLOW_VALUE)
-            return JSMSG_MIN_TOO_BIG;
-
-        if (c == ',') {
-            c = *++state->cp;
-            if (JS7_ISDEC(c)) {
-                ++state->cp;
-                max = GetDecimalValue(c, 0xFFFF, NULL, state);
-                c = *state->cp;
-                if (!ignoreValues && max == OVERFLOW_VALUE)
-                    return JSMSG_MAX_TOO_BIG;
-                if (!ignoreValues && min > max)
-                    return JSMSG_OUT_OF_ORDER;
-            } else {
-                max = (uintN)-1;
-            }
-        } else {
-            max = min;
-        }
-        if (c == '}') {
-            state->result = NewRENode(state, REOP_QUANT);
-            if (!state->result)
-                return JS_FALSE;
-            state->result->u.range.min = min;
-            state->result->u.range.max = max;
-            /*
-             * QUANT, <min>, <max>, <next> ... <ENDCHILD>
-             * where <max> is written as compact(max+1) to make
-             * (uintN)-1 sentinel to occupy 1 byte, not width_of(max)+1.
-             */
-            state->progLength += (1 + GetCompactIndexWidth(min)
-                                  + GetCompactIndexWidth(max + 1)
-                                  +3);
-            return 0;
-        }
-    }
-
-    state->cp = errp;
-    return -1;
-}
-
-static JSBool
-SetForwardJumpOffset(jsbytecode *jump, jsbytecode *target)
-{
-    ptrdiff_t offset = target - jump;
-
-    /* Check that target really points forward. */
-    JS_ASSERT(offset >= 2);
-    if ((size_t)offset > OFFSET_MAX)
-        return JS_FALSE;
-
-    jump[0] = JUMP_OFFSET_HI(offset);
-    jump[1] = JUMP_OFFSET_LO(offset);
-    return JS_TRUE;
-}
-
-/*
- * Generate bytecode for the tree rooted at t using an explicit stack instead
- * of recursion.
- */
-static jsbytecode *
-EmitREBytecode(CompilerState *state, JSRegExp *re, size_t treeDepth,
-               jsbytecode *pc, RENode *t)
-{
-    EmitStateStackEntry *emitStateSP, *emitStateStack;
-    RECharSet *charSet;
-    REOp op;
-
-    if (treeDepth == 0) {
-        emitStateStack = NULL;
-    } else {
-        emitStateStack =
-            (EmitStateStackEntry *)JS_malloc(state->context,
-                                             sizeof(EmitStateStackEntry) *
-                                             treeDepth);
-        if (!emitStateStack)
-            return NULL;
-    }
-    emitStateSP = emitStateStack;
-    op = t->op;
-
-    for (;;) {
-        *pc++ = op;
-        switch (op) {
-        case REOP_EMPTY:
-            --pc;
-            break;
-
-        case REOP_ALTPREREQ2:
-        case REOP_ALTPREREQ:
-            JS_ASSERT(emitStateSP);
-            emitStateSP->altHead = pc - 1;
-            emitStateSP->endTermFixup = pc;
-            pc += OFFSET_LEN;
-            SET_ARG(pc, t->u.altprereq.ch1);
-            pc += ARG_LEN;
-            SET_ARG(pc, t->u.altprereq.ch2);
-            pc += ARG_LEN;
-
-            emitStateSP->nextAltFixup = pc;    /* offset to next alternate */
-            pc += OFFSET_LEN;
-
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_JUMP;
-            emitStateSP->jumpToJumpFlag = JS_FALSE;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = (RENode *) t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_JUMP:
-            emitStateSP->nextTermFixup = pc;    /* offset to following term */
-            pc += OFFSET_LEN;
-            if (!SetForwardJumpOffset(emitStateSP->nextAltFixup, pc))
-                goto jump_too_big;
-            emitStateSP->continueOp = REOP_ENDALT;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = t->u.kid2;
-            op = t->op;
-            continue;
-
-        case REOP_ENDALT:
-            /*
-             * If we already patched emitStateSP->nextTermFixup to jump to
-             * a nearer jump, to avoid 16-bit immediate offset overflow, we
-             * are done here.
-             */
-            if (emitStateSP->jumpToJumpFlag)
-                break;
-
-            /*
-             * Fix up the REOP_JUMP offset to go to the op after REOP_ENDALT.
-             * REOP_ENDALT is executed only on successful match of the last
-             * alternate in a group.
-             */
-            if (!SetForwardJumpOffset(emitStateSP->nextTermFixup, pc))
-                goto jump_too_big;
-            if (t->op != REOP_ALT) {
-                if (!SetForwardJumpOffset(emitStateSP->endTermFixup, pc))
-                    goto jump_too_big;
-            }
-
-            /*
-             * If the program is bigger than the REOP_JUMP offset range, then
-             * we must check for alternates before this one that are part of
-             * the same group, and fix up their jump offsets to target jumps
-             * close enough to fit in a 16-bit unsigned offset immediate.
-             */
-            if ((size_t)(pc - re->program) > OFFSET_MAX &&
-                emitStateSP > emitStateStack) {
-                EmitStateStackEntry *esp, *esp2;
-                jsbytecode *alt, *jump;
-                ptrdiff_t span, header;
-
-                esp2 = emitStateSP;
-                alt = esp2->altHead;
-                for (esp = esp2 - 1; esp >= emitStateStack; --esp) {
-                    if (esp->continueOp == REOP_ENDALT &&
-                        !esp->jumpToJumpFlag &&
-                        esp->nextTermFixup + OFFSET_LEN == alt &&
-                        (size_t)(pc - ((esp->continueNode->op != REOP_ALT)
-                                       ? esp->endTermFixup
-                                       : esp->nextTermFixup)) > OFFSET_MAX) {
-                        alt = esp->altHead;
-                        jump = esp->nextTermFixup;
-
-                        /*
-                         * The span must be 1 less than the distance from
-                         * jump offset to jump offset, so we actually jump
-                         * to a REOP_JUMP bytecode, not to its offset!
-                         */
-                        for (;;) {
-                            JS_ASSERT(jump < esp2->nextTermFixup);
-                            span = esp2->nextTermFixup - jump - 1;
-                            if ((size_t)span <= OFFSET_MAX)
-                                break;
-                            do {
-                                if (--esp2 == esp)
-                                    goto jump_too_big;
-                            } while (esp2->continueOp != REOP_ENDALT);
-                        }
-
-                        jump[0] = JUMP_OFFSET_HI(span);
-                        jump[1] = JUMP_OFFSET_LO(span);
-
-                        if (esp->continueNode->op != REOP_ALT) {
-                            /*
-                             * We must patch the offset at esp->endTermFixup
-                             * as well, for the REOP_ALTPREREQ{,2} opcodes.
-                             * If we're unlucky and endTermFixup is more than
-                             * OFFSET_MAX bytes from its target, we cheat by
-                             * jumping 6 bytes to the jump whose offset is at
-                             * esp->nextTermFixup, which has the same target.
-                             */
-                            jump = esp->endTermFixup;
-                            header = esp->nextTermFixup - jump;
-                            span += header;
-                            if ((size_t)span > OFFSET_MAX)
-                                span = header;
-
-                            jump[0] = JUMP_OFFSET_HI(span);
-                            jump[1] = JUMP_OFFSET_LO(span);
-                        }
-
-                        esp->jumpToJumpFlag = JS_TRUE;
-                    }
-                }
-            }
-            break;
-
-        case REOP_ALT:
-            JS_ASSERT(emitStateSP);
-            emitStateSP->altHead = pc - 1;
-            emitStateSP->nextAltFixup = pc;     /* offset to next alternate */
-            pc += OFFSET_LEN;
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_JUMP;
-            emitStateSP->jumpToJumpFlag = JS_FALSE;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_FLAT:
-            /*
-             * Coalesce FLATs if possible and if it would not increase bytecode
-             * beyond preallocated limit. The latter happens only when bytecode
-             * size for coalesced string with offset p and length 2 exceeds 6
-             * bytes preallocated for 2 single char nodes, i.e. when
-             * 1 + GetCompactIndexWidth(p) + GetCompactIndexWidth(2) > 6 or
-             * GetCompactIndexWidth(p) > 4.
-             * Since when GetCompactIndexWidth(p) <= 4 coalescing of 3 or more
-             * nodes strictly decreases bytecode size, the check has to be
-             * done only for the first coalescing.
-             */
-            if (t->kid &&
-                GetCompactIndexWidth((jschar *)t->kid - state->cpbegin) <= 4)
-            {
-                while (t->next &&
-                       t->next->op == REOP_FLAT &&
-                       (jschar*)t->kid + t->u.flat.length ==
-                       (jschar*)t->next->kid) {
-                    t->u.flat.length += t->next->u.flat.length;
-                    t->next = t->next->next;
-                }
-            }
-            if (t->kid && t->u.flat.length > 1) {
-                pc[-1] = (state->flags & JSREG_FOLD) ? REOP_FLATi : REOP_FLAT;
-                pc = WriteCompactIndex(pc, (jschar *)t->kid - state->cpbegin);
-                pc = WriteCompactIndex(pc, t->u.flat.length);
-            } else if (t->u.flat.chr < 256) {
-                pc[-1] = (state->flags & JSREG_FOLD) ? REOP_FLAT1i : REOP_FLAT1;
-                *pc++ = (jsbytecode) t->u.flat.chr;
-            } else {
-                pc[-1] = (state->flags & JSREG_FOLD)
-                         ? REOP_UCFLAT1i
-                         : REOP_UCFLAT1;
-                SET_ARG(pc, t->u.flat.chr);
-                pc += ARG_LEN;
-            }
-            break;
-
-        case REOP_LPAREN:
-            JS_ASSERT(emitStateSP);
-            pc = WriteCompactIndex(pc, t->u.parenIndex);
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_RPAREN;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = (RENode *) t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_RPAREN:
-            pc = WriteCompactIndex(pc, t->u.parenIndex);
-            break;
-
-        case REOP_BACKREF:
-            pc = WriteCompactIndex(pc, t->u.parenIndex);
-            break;
-
-        case REOP_ASSERT:
-            JS_ASSERT(emitStateSP);
-            emitStateSP->nextTermFixup = pc;
-            pc += OFFSET_LEN;
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_ASSERTTEST;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = (RENode *) t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_ASSERTTEST:
-        case REOP_ASSERTNOTTEST:
-            if (!SetForwardJumpOffset(emitStateSP->nextTermFixup, pc))
-                goto jump_too_big;
-            break;
-
-        case REOP_ASSERT_NOT:
-            JS_ASSERT(emitStateSP);
-            emitStateSP->nextTermFixup = pc;
-            pc += OFFSET_LEN;
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_ASSERTNOTTEST;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = (RENode *) t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_QUANT:
-            JS_ASSERT(emitStateSP);
-            if (t->u.range.min == 0 && t->u.range.max == (uintN)-1) {
-                pc[-1] = (t->u.range.greedy) ? REOP_STAR : REOP_MINIMALSTAR;
-            } else if (t->u.range.min == 0 && t->u.range.max == 1) {
-                pc[-1] = (t->u.range.greedy) ? REOP_OPT : REOP_MINIMALOPT;
-            } else if (t->u.range.min == 1 && t->u.range.max == (uintN) -1) {
-                pc[-1] = (t->u.range.greedy) ? REOP_PLUS : REOP_MINIMALPLUS;
-            } else {
-                if (!t->u.range.greedy)
-                    pc[-1] = REOP_MINIMALQUANT;
-                pc = WriteCompactIndex(pc, t->u.range.min);
-                /*
-                 * Write max + 1 to avoid using size_t(max) + 1 bytes
-                 * for (uintN)-1 sentinel.
-                 */
-                pc = WriteCompactIndex(pc, t->u.range.max + 1);
-            }
-            emitStateSP->nextTermFixup = pc;
-            pc += OFFSET_LEN;
-            emitStateSP->continueNode = t;
-            emitStateSP->continueOp = REOP_ENDCHILD;
-            ++emitStateSP;
-            JS_ASSERT((size_t)(emitStateSP - emitStateStack) <= treeDepth);
-            t = (RENode *) t->kid;
-            op = t->op;
-            continue;
-
-        case REOP_ENDCHILD:
-            if (!SetForwardJumpOffset(emitStateSP->nextTermFixup, pc))
-                goto jump_too_big;
-            break;
-
-        case REOP_CLASS:
-            if (!t->u.ucclass.sense)
-                pc[-1] = REOP_NCLASS;
-            pc = WriteCompactIndex(pc, t->u.ucclass.index);
-            charSet = &re->classList[t->u.ucclass.index];
-            charSet->converted = JS_FALSE;
-            charSet->length = t->u.ucclass.bmsize;
-            charSet->u.src.startIndex = t->u.ucclass.startIndex;
-            charSet->u.src.length = t->u.ucclass.kidlen;
-            charSet->sense = t->u.ucclass.sense;
-            break;
-
-        default:
-            break;
-        }
-
-        t = t->next;
-        if (t) {
-            op = t->op;
-        } else {
-            if (emitStateSP == emitStateStack)
-                break;
-            --emitStateSP;
-            t = emitStateSP->continueNode;
-            op = emitStateSP->continueOp;
-        }
-    }
-
-  cleanup:
-    if (emitStateStack)
-        JS_free(state->context, emitStateStack);
-    return pc;
-
-  jump_too_big:
-    js_ReportCompileErrorNumber(state->context, state->tokenStream,
-                                JSREPORT_TS | JSREPORT_ERROR,
-                                JSMSG_REGEXP_TOO_COMPLEX);
-    pc = NULL;
-    goto cleanup;
-}
-
-
-JSRegExp *
-js_NewRegExp(JSContext *cx, JSTokenStream *ts,
-             JSString *str, uintN flags, JSBool flat)
-{
-    JSRegExp *re;
-    void *mark;
-    CompilerState state;
-    size_t resize;
-    jsbytecode *endPC;
-    uintN i;
-    size_t len;
-
-    re = NULL;
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    len = JSSTRING_LENGTH(str);
-
-    state.context = cx;
-    state.tokenStream = ts;
-    state.cp = js_UndependString(cx, str);
-    if (!state.cp)
-        goto out;
-    state.cpbegin = state.cp;
-    state.cpend = state.cp + len;
-    state.flags = flags;
-    state.parenCount = 0;
-    state.classCount = 0;
-    state.progLength = 0;
-    state.treeDepth = 0;
-    state.classBitmapsMem = 0;
-    for (i = 0; i < CLASS_CACHE_SIZE; i++)
-        state.classCache[i].start = NULL;
-
-    if (len != 0 && flat) {
-        state.result = NewRENode(&state, REOP_FLAT);
-        state.result->u.flat.chr = *state.cpbegin;
-        state.result->u.flat.length = len;
-        state.result->kid = (void *) state.cpbegin;
-        /* Flat bytecode: REOP_FLAT compact(string_offset) compact(len). */
-        state.progLength += 1 + GetCompactIndexWidth(0)
-                          + GetCompactIndexWidth(len);
-    } else {
-        if (!ParseRegExp(&state))
-            goto out;
-    }
-    resize = offsetof(JSRegExp, program) + state.progLength + 1;
-    re = (JSRegExp *) JS_malloc(cx, resize);
-    if (!re)
-        goto out;
-
-    re->nrefs = 1;
-    JS_ASSERT(state.classBitmapsMem <= CLASS_BITMAPS_MEM_LIMIT);
-    re->classCount = state.classCount;
-    if (re->classCount) {
-        re->classList = (RECharSet *)
-            JS_malloc(cx, re->classCount * sizeof(RECharSet));
-        if (!re->classList) {
-            js_DestroyRegExp(cx, re);
-            re = NULL;
-            goto out;
-        }
-    } else {
-        re->classList = NULL;
-    }
-    endPC = EmitREBytecode(&state, re, state.treeDepth, re->program, state.result);
-    if (!endPC) {
-        js_DestroyRegExp(cx, re);
-        re = NULL;
-        goto out;
-    }
-    *endPC++ = REOP_END;
-    /*
-     * Check whether size was overestimated and shrink using realloc.
-     * This is safe since no pointers to newly parsed regexp or its parts
-     * besides re exist here.
-     */
-    if ((size_t)(endPC - re->program) != state.progLength + 1) {
-        JSRegExp *tmp;
-        JS_ASSERT((size_t)(endPC - re->program) < state.progLength + 1);
-        resize = offsetof(JSRegExp, program) + (endPC - re->program);
-        tmp = (JSRegExp *) JS_realloc(cx, re, resize);
-        if (tmp)
-            re = tmp;
-    }
-
-    re->flags = flags;
-    re->cloneIndex = 0;
-    re->parenCount = state.parenCount;
-    re->source = str;
-
-out:
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    return re;
-}
-
-JSRegExp *
-js_NewRegExpOpt(JSContext *cx, JSTokenStream *ts,
-                JSString *str, JSString *opt, JSBool flat)
-{
-    uintN flags;
-    jschar *s;
-    size_t i, n;
-    char charBuf[2];
-
-    flags = 0;
-    if (opt) {
-        s = JSSTRING_CHARS(opt);
-        for (i = 0, n = JSSTRING_LENGTH(opt); i < n; i++) {
-            switch (s[i]) {
-            case 'g':
-                flags |= JSREG_GLOB;
-                break;
-            case 'i':
-                flags |= JSREG_FOLD;
-                break;
-            case 'm':
-                flags |= JSREG_MULTILINE;
-                break;
-            default:
-                charBuf[0] = (char)s[i];
-                charBuf[1] = '\0';
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_FLAG, charBuf);
-                return NULL;
-            }
-        }
-    }
-    return js_NewRegExp(cx, ts, str, flags, flat);
-}
-
-
-#define HOLD_REGEXP(cx, re) JS_ATOMIC_INCREMENT(&(re)->nrefs)
-#define DROP_REGEXP(cx, re) js_DestroyRegExp(cx, re)
-
-/*
- * Save the current state of the match - the position in the input
- * text as well as the position in the bytecode. The state of any
- * parent expressions is also saved (preceding state).
- * Contents of parenCount parentheses from parenIndex are also saved.
- */
-static REBackTrackData *
-PushBackTrackState(REGlobalData *gData, REOp op,
-                   jsbytecode *target, REMatchState *x, const jschar *cp,
-                   size_t parenIndex, size_t parenCount)
-{
-    size_t i;
-    REBackTrackData *result =
-        (REBackTrackData *) ((char *)gData->backTrackSP + gData->cursz);
-
-    size_t sz = sizeof(REBackTrackData) +
-                gData->stateStackTop * sizeof(REProgState) +
-                parenCount * sizeof(RECapture);
-
-    ptrdiff_t btsize = gData->backTrackStackSize;
-    ptrdiff_t btincr = ((char *)result + sz) -
-                       ((char *)gData->backTrackStack + btsize);
-
-    if (btincr > 0) {
-        ptrdiff_t offset = (char *)result - (char *)gData->backTrackStack;
-
-        btincr = JS_ROUNDUP(btincr, btsize);
-        JS_ARENA_GROW_CAST(gData->backTrackStack, REBackTrackData *,
-                           &gData->pool, btsize, btincr);
-        if (!gData->backTrackStack)
-            return NULL;
-        gData->backTrackStackSize = btsize + btincr;
-        result = (REBackTrackData *) ((char *)gData->backTrackStack + offset);
-    }
-    gData->backTrackSP = result;
-    result->sz = gData->cursz;
-    gData->cursz = sz;
-
-    result->backtrack_op = op;
-    result->backtrack_pc = target;
-    result->cp = cp;
-    result->parenCount = parenCount;
-
-    result->saveStateStackTop = gData->stateStackTop;
-    JS_ASSERT(gData->stateStackTop);
-    memcpy(result + 1, gData->stateStack,
-           sizeof(REProgState) * result->saveStateStackTop);
-
-    if (parenCount != 0) {
-        result->parenIndex = parenIndex;
-        memcpy((char *)(result + 1) +
-               sizeof(REProgState) * result->saveStateStackTop,
-               &x->parens[parenIndex],
-               sizeof(RECapture) * parenCount);
-        for (i = 0; i != parenCount; i++)
-            x->parens[parenIndex + i].index = -1;
-    }
-
-    return result;
-}
-
-
-/*
- *   Consecutive literal characters.
- */
-#if 0
-static REMatchState *
-FlatNMatcher(REGlobalData *gData, REMatchState *x, jschar *matchChars,
-             size_t length)
-{
-    size_t i;
-    if (length > gData->cpend - x->cp)
-        return NULL;
-    for (i = 0; i != length; i++) {
-        if (matchChars[i] != x->cp[i])
-            return NULL;
-    }
-    x->cp += length;
-    return x;
-}
-#endif
-
-static REMatchState *
-FlatNIMatcher(REGlobalData *gData, REMatchState *x, jschar *matchChars,
-              size_t length)
-{
-    size_t i;
-    JS_ASSERT(gData->cpend >= x->cp);
-    if (length > (size_t)(gData->cpend - x->cp))
-        return NULL;
-    for (i = 0; i != length; i++) {
-        if (upcase(matchChars[i]) != upcase(x->cp[i]))
-            return NULL;
-    }
-    x->cp += length;
-    return x;
-}
-
-/*
- * 1. Evaluate DecimalEscape to obtain an EscapeValue E.
- * 2. If E is not a character then go to step 6.
- * 3. Let ch be E's character.
- * 4. Let A be a one-element RECharSet containing the character ch.
- * 5. Call CharacterSetMatcher(A, false) and return its Matcher result.
- * 6. E must be an integer. Let n be that integer.
- * 7. If n=0 or n>NCapturingParens then throw a SyntaxError exception.
- * 8. Return an internal Matcher closure that takes two arguments, a State x
- *    and a Continuation c, and performs the following:
- *     1. Let cap be x's captures internal array.
- *     2. Let s be cap[n].
- *     3. If s is undefined, then call c(x) and return its result.
- *     4. Let e be x's endIndex.
- *     5. Let len be s's length.
- *     6. Let f be e+len.
- *     7. If f>InputLength, return failure.
- *     8. If there exists an integer i between 0 (inclusive) and len (exclusive)
- *        such that Canonicalize(s[i]) is not the same character as
- *        Canonicalize(Input [e+i]), then return failure.
- *     9. Let y be the State (f, cap).
- *     10. Call c(y) and return its result.
- */
-static REMatchState *
-BackrefMatcher(REGlobalData *gData, REMatchState *x, size_t parenIndex)
-{
-    size_t len, i;
-    const jschar *parenContent;
-    RECapture *cap = &x->parens[parenIndex];
-
-    if (cap->index == -1)
-        return x;
-
-    len = cap->length;
-    if (x->cp + len > gData->cpend)
-        return NULL;
-
-    parenContent = &gData->cpbegin[cap->index];
-    if (gData->regexp->flags & JSREG_FOLD) {
-        for (i = 0; i < len; i++) {
-            if (upcase(parenContent[i]) != upcase(x->cp[i]))
-                return NULL;
-        }
-    } else {
-        for (i = 0; i < len; i++) {
-            if (parenContent[i] != x->cp[i])
-                return NULL;
-        }
-    }
-    x->cp += len;
-    return x;
-}
-
-
-/* Add a single character to the RECharSet */
-static void
-AddCharacterToCharSet(RECharSet *cs, jschar c)
-{
-    uintN byteIndex = (uintN)(c >> 3);
-    JS_ASSERT(c <= cs->length);
-    cs->u.bits[byteIndex] |= 1 << (c & 0x7);
-}
-
-
-/* Add a character range, c1 to c2 (inclusive) to the RECharSet */
-static void
-AddCharacterRangeToCharSet(RECharSet *cs, jschar c1, jschar c2)
-{
-    uintN i;
-
-    uintN byteIndex1 = (uintN)(c1 >> 3);
-    uintN byteIndex2 = (uintN)(c2 >> 3);
-
-    JS_ASSERT((c2 <= cs->length) && (c1 <= c2));
-
-    c1 &= 0x7;
-    c2 &= 0x7;
-
-    if (byteIndex1 == byteIndex2) {
-        cs->u.bits[byteIndex1] |= ((uint8)0xFF >> (7 - (c2 - c1))) << c1;
-    } else {
-        cs->u.bits[byteIndex1] |= 0xFF << c1;
-        for (i = byteIndex1 + 1; i < byteIndex2; i++)
-            cs->u.bits[i] = 0xFF;
-        cs->u.bits[byteIndex2] |= (uint8)0xFF >> (7 - c2);
-    }
-}
-
-/* Compile the source of the class into a RECharSet */
-static JSBool
-ProcessCharSet(REGlobalData *gData, RECharSet *charSet)
-{
-    const jschar *src, *end;
-    JSBool inRange = JS_FALSE;
-    jschar rangeStart = 0;
-    uintN byteLength, n;
-    jschar c, thisCh;
-    intN nDigits, i;
-
-    JS_ASSERT(!charSet->converted);
-    /*
-     * Assert that startIndex and length points to chars inside [] inside
-     * source string.
-     */
-    JS_ASSERT(1 <= charSet->u.src.startIndex);
-    JS_ASSERT(charSet->u.src.startIndex
-              < JSSTRING_LENGTH(gData->regexp->source));
-    JS_ASSERT(charSet->u.src.length <= JSSTRING_LENGTH(gData->regexp->source)
-                                       - 1 - charSet->u.src.startIndex);
-
-    charSet->converted = JS_TRUE;
-    src = JSSTRING_CHARS(gData->regexp->source) + charSet->u.src.startIndex;
-    end = src + charSet->u.src.length;
-    JS_ASSERT(src[-1] == '[');
-    JS_ASSERT(end[0] == ']');
-
-    byteLength = (charSet->length >> 3) + 1;
-    charSet->u.bits = (uint8 *)JS_malloc(gData->cx, byteLength);
-    if (!charSet->u.bits)
-        return JS_FALSE;
-    memset(charSet->u.bits, 0, byteLength);
-
-    if (src == end)
-        return JS_TRUE;
-
-    if (*src == '^') {
-        JS_ASSERT(charSet->sense == JS_FALSE);
-        ++src;
-    } else {
-        JS_ASSERT(charSet->sense == JS_TRUE);
-    }
-
-    while (src != end) {
-        switch (*src) {
-        case '\\':
-            ++src;
-            c = *src++;
-            switch (c) {
-            case 'b':
-                thisCh = 0x8;
-                break;
-            case 'f':
-                thisCh = 0xC;
-                break;
-            case 'n':
-                thisCh = 0xA;
-                break;
-            case 'r':
-                thisCh = 0xD;
-                break;
-            case 't':
-                thisCh = 0x9;
-                break;
-            case 'v':
-                thisCh = 0xB;
-                break;
-            case 'c':
-                if (src + 1 < end && JS_ISWORD(src[1])) {
-                    thisCh = (jschar)(*src++ & 0x1F);
-                } else {
-                    --src;
-                    thisCh = '\\';
-                }
-                break;
-            case 'x':
-                nDigits = 2;
-                goto lexHex;
-            case 'u':
-                nDigits = 4;
-            lexHex:
-                n = 0;
-                for (i = 0; (i < nDigits) && (src < end); i++) {
-                    uintN digit;
-                    c = *src++;
-                    if (!isASCIIHexDigit(c, &digit)) {
-                        /*
-                         * Back off to accepting the original '\'
-                         * as a literal
-                         */
-                        src -= i + 1;
-                        n = '\\';
-                        break;
-                    }
-                    n = (n << 4) | digit;
-                }
-                thisCh = (jschar)n;
-                break;
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-                /*
-                 *  This is a non-ECMA extension - decimal escapes (in this
-                 *  case, octal!) are supposed to be an error inside class
-                 *  ranges, but supported here for backwards compatibility.
-                 */
-                n = JS7_UNDEC(c);
-                c = *src;
-                if ('0' <= c && c <= '7') {
-                    src++;
-                    n = 8 * n + JS7_UNDEC(c);
-                    c = *src;
-                    if ('0' <= c && c <= '7') {
-                        src++;
-                        i = 8 * n + JS7_UNDEC(c);
-                        if (i <= 0377)
-                            n = i;
-                        else
-                            src--;
-                    }
-                }
-                thisCh = (jschar)n;
-                break;
-
-            case 'd':
-                AddCharacterRangeToCharSet(charSet, '0', '9');
-                continue;   /* don't need range processing */
-            case 'D':
-                AddCharacterRangeToCharSet(charSet, 0, '0' - 1);
-                AddCharacterRangeToCharSet(charSet,
-                                           (jschar)('9' + 1),
-                                           (jschar)charSet->length);
-                continue;
-            case 's':
-                for (i = (intN)charSet->length; i >= 0; i--)
-                    if (JS_ISSPACE(i))
-                        AddCharacterToCharSet(charSet, (jschar)i);
-                continue;
-            case 'S':
-                for (i = (intN)charSet->length; i >= 0; i--)
-                    if (!JS_ISSPACE(i))
-                        AddCharacterToCharSet(charSet, (jschar)i);
-                continue;
-            case 'w':
-                for (i = (intN)charSet->length; i >= 0; i--)
-                    if (JS_ISWORD(i))
-                        AddCharacterToCharSet(charSet, (jschar)i);
-                continue;
-            case 'W':
-                for (i = (intN)charSet->length; i >= 0; i--)
-                    if (!JS_ISWORD(i))
-                        AddCharacterToCharSet(charSet, (jschar)i);
-                continue;
-            default:
-                thisCh = c;
-                break;
-
-            }
-            break;
-
-        default:
-            thisCh = *src++;
-            break;
-
-        }
-        if (inRange) {
-            if (gData->regexp->flags & JSREG_FOLD) {
-                AddCharacterRangeToCharSet(charSet, upcase(rangeStart),
-                                                    upcase(thisCh));
-                AddCharacterRangeToCharSet(charSet, downcase(rangeStart),
-                                                    downcase(thisCh));
-            } else {
-                AddCharacterRangeToCharSet(charSet, rangeStart, thisCh);
-            }
-            inRange = JS_FALSE;
-        } else {
-            if (gData->regexp->flags & JSREG_FOLD) {
-                AddCharacterToCharSet(charSet, upcase(thisCh));
-                AddCharacterToCharSet(charSet, downcase(thisCh));
-            } else {
-                AddCharacterToCharSet(charSet, thisCh);
-            }
-            if (src < end - 1) {
-                if (*src == '-') {
-                    ++src;
-                    inRange = JS_TRUE;
-                    rangeStart = thisCh;
-                }
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-void
-js_DestroyRegExp(JSContext *cx, JSRegExp *re)
-{
-    if (JS_ATOMIC_DECREMENT(&re->nrefs) == 0) {
-        if (re->classList) {
-            uintN i;
-            for (i = 0; i < re->classCount; i++) {
-                if (re->classList[i].converted)
-                    JS_free(cx, re->classList[i].u.bits);
-                re->classList[i].u.bits = NULL;
-            }
-            JS_free(cx, re->classList);
-        }
-        JS_free(cx, re);
-    }
-}
-
-static JSBool
-ReallocStateStack(REGlobalData *gData)
-{
-    size_t limit = gData->stateStackLimit;
-    size_t sz = sizeof(REProgState) * limit;
-
-    JS_ARENA_GROW_CAST(gData->stateStack, REProgState *, &gData->pool, sz, sz);
-    if (!gData->stateStack) {
-        gData->ok = JS_FALSE;
-        return JS_FALSE;
-    }
-    gData->stateStackLimit = limit + limit;
-    return JS_TRUE;
-}
-
-#define PUSH_STATE_STACK(data)                                                \
-    JS_BEGIN_MACRO                                                            \
-        ++(data)->stateStackTop;                                              \
-        if ((data)->stateStackTop == (data)->stateStackLimit &&               \
-            !ReallocStateStack((data))) {                                     \
-            return NULL;                                                      \
-        }                                                                     \
-    JS_END_MACRO
-
-/*
- * Apply the current op against the given input to see if it's going to match
- * or fail. Return false if we don't get a match, true if we do and update the
- * state of the input and pc if the update flag is true.
- */
-static REMatchState *
-SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op,
-            jsbytecode **startpc, JSBool update)
-{
-    REMatchState *result = NULL;
-    jschar matchCh;
-    size_t parenIndex;
-    size_t offset, length, index;
-    jsbytecode *pc = *startpc;  /* pc has already been incremented past op */
-    jschar *source;
-    const jschar *startcp = x->cp;
-    jschar ch;
-    RECharSet *charSet;
-
-    switch (op) {
-    case REOP_BOL:
-        if (x->cp != gData->cpbegin) {
-            if (!gData->cx->regExpStatics.multiline &&
-                !(gData->regexp->flags & JSREG_MULTILINE)) {
-                break;
-            }
-            if (!RE_IS_LINE_TERM(x->cp[-1]))
-                break;
-        }
-        result = x;
-        break;
-    case REOP_EOL:
-        if (x->cp != gData->cpend) {
-            if (!gData->cx->regExpStatics.multiline &&
-                !(gData->regexp->flags & JSREG_MULTILINE)) {
-                break;
-            }
-            if (!RE_IS_LINE_TERM(*x->cp))
-                break;
-        }
-        result = x;
-        break;
-    case REOP_WBDRY:
-        if ((x->cp == gData->cpbegin || !JS_ISWORD(x->cp[-1])) ^
-            !(x->cp != gData->cpend && JS_ISWORD(*x->cp))) {
-            result = x;
-        }
-        break;
-    case REOP_WNONBDRY:
-        if ((x->cp == gData->cpbegin || !JS_ISWORD(x->cp[-1])) ^
-            (x->cp != gData->cpend && JS_ISWORD(*x->cp))) {
-            result = x;
-        }
-        break;
-    case REOP_DOT:
-        if (x->cp != gData->cpend && !RE_IS_LINE_TERM(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_DIGIT:
-        if (x->cp != gData->cpend && JS_ISDIGIT(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_NONDIGIT:
-        if (x->cp != gData->cpend && !JS_ISDIGIT(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_ALNUM:
-        if (x->cp != gData->cpend && JS_ISWORD(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_NONALNUM:
-        if (x->cp != gData->cpend && !JS_ISWORD(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_SPACE:
-        if (x->cp != gData->cpend && JS_ISSPACE(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_NONSPACE:
-        if (x->cp != gData->cpend && !JS_ISSPACE(*x->cp)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_BACKREF:
-        pc = ReadCompactIndex(pc, &parenIndex);
-        JS_ASSERT(parenIndex < gData->regexp->parenCount);
-        result = BackrefMatcher(gData, x, parenIndex);
-        break;
-    case REOP_FLAT:
-        pc = ReadCompactIndex(pc, &offset);
-        JS_ASSERT(offset < JSSTRING_LENGTH(gData->regexp->source));
-        pc = ReadCompactIndex(pc, &length);
-        JS_ASSERT(1 <= length);
-        JS_ASSERT(length <= JSSTRING_LENGTH(gData->regexp->source) - offset);
-        if (length <= (size_t)(gData->cpend - x->cp)) {
-            source = JSSTRING_CHARS(gData->regexp->source) + offset;
-            for (index = 0; index != length; index++) {
-                if (source[index] != x->cp[index])
-                    return NULL;
-            }
-            x->cp += length;
-            result = x;
-        }
-        break;
-    case REOP_FLAT1:
-        matchCh = *pc++;
-        if (x->cp != gData->cpend && *x->cp == matchCh) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_FLATi:
-        pc = ReadCompactIndex(pc, &offset);
-        JS_ASSERT(offset < JSSTRING_LENGTH(gData->regexp->source));
-        pc = ReadCompactIndex(pc, &length);
-        JS_ASSERT(1 <= length);
-        JS_ASSERT(length <= JSSTRING_LENGTH(gData->regexp->source) - offset);
-        source = JSSTRING_CHARS(gData->regexp->source);
-        result = FlatNIMatcher(gData, x, source + offset, length);
-        break;
-    case REOP_FLAT1i:
-        matchCh = *pc++;
-        if (x->cp != gData->cpend && upcase(*x->cp) == upcase(matchCh)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_UCFLAT1:
-        matchCh = GET_ARG(pc);
-        pc += ARG_LEN;
-        if (x->cp != gData->cpend && *x->cp == matchCh) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_UCFLAT1i:
-        matchCh = GET_ARG(pc);
-        pc += ARG_LEN;
-        if (x->cp != gData->cpend && upcase(*x->cp) == upcase(matchCh)) {
-            result = x;
-            result->cp++;
-        }
-        break;
-    case REOP_CLASS:
-        pc = ReadCompactIndex(pc, &index);
-        JS_ASSERT(index < gData->regexp->classCount);
-        if (x->cp != gData->cpend) {
-            charSet = &gData->regexp->classList[index];
-            JS_ASSERT(charSet->converted);
-            ch = *x->cp;
-            index = ch >> 3;
-            if (charSet->length != 0 &&
-                ch <= charSet->length &&
-                (charSet->u.bits[index] & (1 << (ch & 0x7)))) {
-                result = x;
-                result->cp++;
-            }
-        }
-        break;
-    case REOP_NCLASS:
-        pc = ReadCompactIndex(pc, &index);
-        JS_ASSERT(index < gData->regexp->classCount);
-        if (x->cp != gData->cpend) {
-            charSet = &gData->regexp->classList[index];
-            JS_ASSERT(charSet->converted);
-            ch = *x->cp;
-            index = ch >> 3;
-            if (charSet->length == 0 ||
-                ch > charSet->length ||
-                !(charSet->u.bits[index] & (1 << (ch & 0x7)))) {
-                result = x;
-                result->cp++;
-            }
-        }
-        break;
-    default:
-        JS_ASSERT(JS_FALSE);
-    }
-    if (result) {
-        if (update)
-            *startpc = pc;
-        else
-            x->cp = startcp;
-        return result;
-    }
-    x->cp = startcp;
-    return NULL;
-}
-
-static REMatchState *
-ExecuteREBytecode(REGlobalData *gData, REMatchState *x)
-{
-    REMatchState *result = NULL;
-    REBackTrackData *backTrackData;
-    jsbytecode *nextpc;
-    REOp nextop;
-    RECapture *cap;
-    REProgState *curState;
-    const jschar *startcp;
-    size_t parenIndex, k;
-    size_t parenSoFar = 0;
-
-    jschar matchCh1, matchCh2;
-    RECharSet *charSet;
-
-    JSBool anchor;
-    jsbytecode *pc = gData->regexp->program;
-    REOp op = (REOp) *pc++;
-
-    /*
-     * If the first node is a simple match, step the index into the string
-     * until that match is made, or fail if it can't be found at all.
-     */
-    if (REOP_IS_SIMPLE(op)) {
-        anchor = JS_FALSE;
-        while (x->cp <= gData->cpend) {
-            nextpc = pc;    /* reset back to start each time */
-            result = SimpleMatch(gData, x, op, &nextpc, JS_TRUE);
-            if (result) {
-                anchor = JS_TRUE;
-                x = result;
-                pc = nextpc;    /* accept skip to next opcode */
-                op = (REOp) *pc++;
-                break;
-            }
-            gData->skipped++;
-            x->cp++;
-        }
-        if (!anchor)
-            return NULL;
-    }
-
-    for (;;) {
-        if (REOP_IS_SIMPLE(op)) {
-            result = SimpleMatch(gData, x, op, &pc, JS_TRUE);
-        } else {
-            curState = &gData->stateStack[gData->stateStackTop];
-            switch (op) {
-            case REOP_EMPTY:
-                result = x;
-                break;
-
-            case REOP_ALTPREREQ2:
-                nextpc = pc + GET_OFFSET(pc);   /* start of next op */
-                pc += ARG_LEN;
-                matchCh2 = GET_ARG(pc);
-                pc += ARG_LEN;
-                k = GET_ARG(pc);
-                pc += ARG_LEN;
-
-                if (x->cp != gData->cpend) {
-                    if (*x->cp == matchCh2)
-                        goto doAlt;
-
-                    charSet = &gData->regexp->classList[k];
-                    if (!charSet->converted)
-                        if (!ProcessCharSet(gData, charSet))
-                            return NULL;
-                    matchCh1 = *x->cp;
-                    k = matchCh1 >> 3;
-                    if ((charSet->length == 0 ||
-                         matchCh1 > charSet->length ||
-                         !(charSet->u.bits[k] & (1 << (matchCh1 & 0x7)))) ^
-                        charSet->sense) {
-                        goto doAlt;
-                    }
-                }
-                result = NULL;
-                break;
-
-            case REOP_ALTPREREQ:
-                nextpc = pc + GET_OFFSET(pc);   /* start of next op */
-                pc += ARG_LEN;
-                matchCh1 = GET_ARG(pc);
-                pc += ARG_LEN;
-                matchCh2 = GET_ARG(pc);
-                pc += ARG_LEN;
-                if (x->cp == gData->cpend ||
-                    (*x->cp != matchCh1 && *x->cp != matchCh2)) {
-                    result = NULL;
-                    break;
-                }
-                /* else false thru... */
-
-            case REOP_ALT:
-            doAlt:
-                nextpc = pc + GET_OFFSET(pc);   /* start of next alternate */
-                pc += ARG_LEN;                  /* start of this alternate */
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                op = (REOp) *pc++;
-                startcp = x->cp;
-                if (REOP_IS_SIMPLE(op)) {
-                    if (!SimpleMatch(gData, x, op, &pc, JS_TRUE)) {
-                        op = (REOp) *nextpc++;
-                        pc = nextpc;
-                        continue;
-                    }
-                    result = x;
-                    op = (REOp) *pc++;
-                }
-                nextop = (REOp) *nextpc++;
-                if (!PushBackTrackState(gData, nextop, nextpc, x, startcp, 0, 0))
-                    return NULL;
-                continue;
-
-            /*
-             * Occurs at (succesful) end of REOP_ALT,
-             */
-            case REOP_JUMP:
-                --gData->stateStackTop;
-                pc += GET_OFFSET(pc);
-                op = (REOp) *pc++;
-                continue;
-
-            /*
-             * Occurs at last (succesful) end of REOP_ALT,
-             */
-            case REOP_ENDALT:
-                --gData->stateStackTop;
-                op = (REOp) *pc++;
-                continue;
-
-            case REOP_LPAREN:
-                pc = ReadCompactIndex(pc, &parenIndex);
-                JS_ASSERT(parenIndex < gData->regexp->parenCount);
-                if (parenIndex + 1 > parenSoFar)
-                    parenSoFar = parenIndex + 1;
-                x->parens[parenIndex].index = x->cp - gData->cpbegin;
-                x->parens[parenIndex].length = 0;
-                op = (REOp) *pc++;
-                continue;
-
-            case REOP_RPAREN:
-                pc = ReadCompactIndex(pc, &parenIndex);
-                JS_ASSERT(parenIndex < gData->regexp->parenCount);
-                cap = &x->parens[parenIndex];
-                cap->length = x->cp - (gData->cpbegin + cap->index);
-                op = (REOp) *pc++;
-                continue;
-
-            case REOP_ASSERT:
-                nextpc = pc + GET_OFFSET(pc);  /* start of term after ASSERT */
-                pc += ARG_LEN;                 /* start of ASSERT child */
-                op = (REOp) *pc++;
-                if (REOP_IS_SIMPLE(op) &&
-                    !SimpleMatch(gData, x, op, &pc, JS_FALSE)) {
-                    result = NULL;
-                    break;
-                }
-                curState->u.assertion.top =
-                    (char *)gData->backTrackSP - (char *)gData->backTrackStack;
-                curState->u.assertion.sz = gData->cursz;
-                curState->index = x->cp - gData->cpbegin;
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                if (!PushBackTrackState(gData, REOP_ASSERTTEST,
-                                        nextpc, x, x->cp, 0, 0)) {
-                    return NULL;
-                }
-                continue;
-
-            case REOP_ASSERT_NOT:
-                nextpc = pc + GET_OFFSET(pc);
-                pc += ARG_LEN;
-                op = (REOp) *pc++;
-                if (REOP_IS_SIMPLE(op) /* Note - fail to fail! */ &&
-                    SimpleMatch(gData, x, op, &pc, JS_FALSE) &&
-                    pc == nextpc) {
-                    result = NULL;
-                    break;
-                }
-                curState->u.assertion.top
-                    = (char *)gData->backTrackSP -
-                      (char *)gData->backTrackStack;
-                curState->u.assertion.sz = gData->cursz;
-                curState->index = x->cp - gData->cpbegin;
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                if (!PushBackTrackState(gData, REOP_ASSERTNOTTEST,
-                                        nextpc, x, x->cp, 0, 0))
-                    return NULL;
-                continue;
-
-            case REOP_ASSERTTEST:
-                --gData->stateStackTop;
-                --curState;
-                x->cp = gData->cpbegin + curState->index;
-                gData->backTrackSP =
-                    (REBackTrackData *) ((char *)gData->backTrackStack +
-                                         curState->u.assertion.top);
-                gData->cursz = curState->u.assertion.sz;
-                if (result)
-                    result = x;
-                break;
-
-            case REOP_ASSERTNOTTEST:
-                --gData->stateStackTop;
-                --curState;
-                x->cp = gData->cpbegin + curState->index;
-                gData->backTrackSP =
-                    (REBackTrackData *) ((char *)gData->backTrackStack +
-                                         curState->u.assertion.top);
-                gData->cursz = curState->u.assertion.sz;
-                result = (!result) ? x : NULL;
-                break;
-
-            case REOP_END:
-                if (x)
-                    return x;
-                break;
-
-            case REOP_STAR:
-                curState->u.quantifier.min = 0;
-                curState->u.quantifier.max = (uintN)-1;
-                goto quantcommon;
-            case REOP_PLUS:
-                curState->u.quantifier.min = 1;
-                curState->u.quantifier.max = (uintN)-1;
-                goto quantcommon;
-            case REOP_OPT:
-                curState->u.quantifier.min = 0;
-                curState->u.quantifier.max = 1;
-                goto quantcommon;
-            case REOP_QUANT:
-                pc = ReadCompactIndex(pc, &k);
-                curState->u.quantifier.min = k;
-                pc = ReadCompactIndex(pc, &k);
-                /* max is k - 1 to use one byte for (uintN)-1 sentinel. */
-                curState->u.quantifier.max = k - 1;
-                JS_ASSERT(curState->u.quantifier.min
-                          <= curState->u.quantifier.max);
-            quantcommon:
-                if (curState->u.quantifier.max == 0) {
-                    pc = pc + GET_OFFSET(pc);
-                    op = (REOp) *pc++;
-                    result = x;
-                    continue;
-                }
-                /* Step over <next> */
-                nextpc = pc + ARG_LEN;
-                op = (REOp) *nextpc++;
-                startcp = x->cp;
-                if (REOP_IS_SIMPLE(op)) {
-                    if (!SimpleMatch(gData, x, op, &nextpc, JS_TRUE)) {
-                        if (curState->u.quantifier.min == 0)
-                            result = x;
-                        else
-                            result = NULL;
-                        pc = pc + GET_OFFSET(pc);
-                        break;
-                    }
-                    op = (REOp) *nextpc++;
-                    result = x;
-                }
-                curState->index = startcp - gData->cpbegin;
-                curState->continue_op = REOP_REPEAT;
-                curState->continue_pc = pc;
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                if (curState->u.quantifier.min == 0 &&
-                    !PushBackTrackState(gData, REOP_REPEAT, pc, x, startcp,
-                                        0, 0)) {
-                    return NULL;
-                }
-                pc = nextpc;
-                continue;
-
-            case REOP_ENDCHILD: /* marks the end of a quantifier child */
-                pc = curState[-1].continue_pc;
-                op = curState[-1].continue_op;
-                continue;
-
-            case REOP_REPEAT:
-                --curState;
-                do {
-                    --gData->stateStackTop;
-                    if (!result) {
-                        /* Failed, see if we have enough children. */
-                        if (curState->u.quantifier.min == 0)
-                            goto repeatDone;
-                        goto break_switch;
-                    }
-                    if (curState->u.quantifier.min == 0 &&
-                        x->cp == gData->cpbegin + curState->index) {
-                        /* matched an empty string, that'll get us nowhere */
-                        result = NULL;
-                        goto break_switch;
-                    }
-                    if (curState->u.quantifier.min != 0)
-                        curState->u.quantifier.min--;
-                    if (curState->u.quantifier.max != (uintN) -1)
-                        curState->u.quantifier.max--;
-                    if (curState->u.quantifier.max == 0)
-                        goto repeatDone;
-                    nextpc = pc + ARG_LEN;
-                    nextop = (REOp) *nextpc;
-                    startcp = x->cp;
-                    if (REOP_IS_SIMPLE(nextop)) {
-                        nextpc++;
-                        if (!SimpleMatch(gData, x, nextop, &nextpc, JS_TRUE)) {
-                            if (curState->u.quantifier.min == 0)
-                                goto repeatDone;
-                            result = NULL;
-                            goto break_switch;
-                        }
-                        result = x;
-                    }
-                    curState->index = startcp - gData->cpbegin;
-                    PUSH_STATE_STACK(gData);
-                    if (curState->u.quantifier.min == 0 &&
-                        !PushBackTrackState(gData, REOP_REPEAT,
-                                            pc, x, startcp,
-                                            curState->parenSoFar,
-                                            parenSoFar -
-                                            curState->parenSoFar)) {
-                        return NULL;
-                    }
-                } while (*nextpc == REOP_ENDCHILD);
-                pc = nextpc;
-                op = (REOp) *pc++;
-                parenSoFar = curState->parenSoFar;
-                continue;
-
-            repeatDone:
-                result = x;
-                pc += GET_OFFSET(pc);
-                goto break_switch;
-
-            case REOP_MINIMALSTAR:
-                curState->u.quantifier.min = 0;
-                curState->u.quantifier.max = (uintN)-1;
-                goto minimalquantcommon;
-            case REOP_MINIMALPLUS:
-                curState->u.quantifier.min = 1;
-                curState->u.quantifier.max = (uintN)-1;
-                goto minimalquantcommon;
-            case REOP_MINIMALOPT:
-                curState->u.quantifier.min = 0;
-                curState->u.quantifier.max = 1;
-                goto minimalquantcommon;
-            case REOP_MINIMALQUANT:
-                pc = ReadCompactIndex(pc, &k);
-                curState->u.quantifier.min = k;
-                pc = ReadCompactIndex(pc, &k);
-                /* See REOP_QUANT comments about k - 1. */
-                curState->u.quantifier.max = k - 1;
-                JS_ASSERT(curState->u.quantifier.min
-                          <= curState->u.quantifier.max);
-            minimalquantcommon:
-                curState->index = x->cp - gData->cpbegin;
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                if (curState->u.quantifier.min != 0) {
-                    curState->continue_op = REOP_MINIMALREPEAT;
-                    curState->continue_pc = pc;
-                    /* step over <next> */
-                    pc += OFFSET_LEN;
-                    op = (REOp) *pc++;
-                } else {
-                    if (!PushBackTrackState(gData, REOP_MINIMALREPEAT,
-                                            pc, x, x->cp, 0, 0)) {
-                        return NULL;
-                    }
-                    --gData->stateStackTop;
-                    pc = pc + GET_OFFSET(pc);
-                    op = (REOp) *pc++;
-                }
-                continue;
-
-            case REOP_MINIMALREPEAT:
-                --gData->stateStackTop;
-                --curState;
-
-                if (!result) {
-                    /*
-                     * Non-greedy failure - try to consume another child.
-                     */
-                    if (curState->u.quantifier.max == (uintN) -1 ||
-                        curState->u.quantifier.max > 0) {
-                        curState->index = x->cp - gData->cpbegin;
-                        curState->continue_op = REOP_MINIMALREPEAT;
-                        curState->continue_pc = pc;
-                        pc += ARG_LEN;
-                        for (k = curState->parenSoFar; k < parenSoFar; k++)
-                            x->parens[k].index = -1;
-                        PUSH_STATE_STACK(gData);
-                        op = (REOp) *pc++;
-                        continue;
-                    }
-                    /* Don't need to adjust pc since we're going to pop. */
-                    break;
-                }
-                if (curState->u.quantifier.min == 0 &&
-                    x->cp == gData->cpbegin + curState->index) {
-                    /* Matched an empty string, that'll get us nowhere. */
-                    result = NULL;
-                    break;
-                }
-                if (curState->u.quantifier.min != 0)
-                    curState->u.quantifier.min--;
-                if (curState->u.quantifier.max != (uintN) -1)
-                    curState->u.quantifier.max--;
-                if (curState->u.quantifier.min != 0) {
-                    curState->continue_op = REOP_MINIMALREPEAT;
-                    curState->continue_pc = pc;
-                    pc += ARG_LEN;
-                    for (k = curState->parenSoFar; k < parenSoFar; k++)
-                        x->parens[k].index = -1;
-                    curState->index = x->cp - gData->cpbegin;
-                    PUSH_STATE_STACK(gData);
-                    op = (REOp) *pc++;
-                    continue;
-                }
-                curState->index = x->cp - gData->cpbegin;
-                curState->parenSoFar = parenSoFar;
-                PUSH_STATE_STACK(gData);
-                if (!PushBackTrackState(gData, REOP_MINIMALREPEAT,
-                                        pc, x, x->cp,
-                                        curState->parenSoFar,
-                                        parenSoFar - curState->parenSoFar)) {
-                    return NULL;
-                }
-                --gData->stateStackTop;
-                pc = pc + GET_OFFSET(pc);
-                op = (REOp) *pc++;
-                continue;
-
-            default:
-                JS_ASSERT(JS_FALSE);
-                result = NULL;
-            }
-        break_switch:;
-        }
-
-        /*
-         *  If the match failed and there's a backtrack option, take it.
-         *  Otherwise this is a complete and utter failure.
-         */
-        if (!result) {
-            if (gData->cursz == 0)
-                return NULL;
-            backTrackData = gData->backTrackSP;
-            gData->cursz = backTrackData->sz;
-            gData->backTrackSP =
-                (REBackTrackData *) ((char *)backTrackData - backTrackData->sz);
-            x->cp = backTrackData->cp;
-            pc = backTrackData->backtrack_pc;
-            op = backTrackData->backtrack_op;
-            gData->stateStackTop = backTrackData->saveStateStackTop;
-            JS_ASSERT(gData->stateStackTop);
-
-            memcpy(gData->stateStack, backTrackData + 1,
-                   sizeof(REProgState) * backTrackData->saveStateStackTop);
-            curState = &gData->stateStack[gData->stateStackTop - 1];
-
-            if (backTrackData->parenCount) {
-                memcpy(&x->parens[backTrackData->parenIndex],
-                       (char *)(backTrackData + 1) +
-                       sizeof(REProgState) * backTrackData->saveStateStackTop,
-                       sizeof(RECapture) * backTrackData->parenCount);
-                parenSoFar = backTrackData->parenIndex + backTrackData->parenCount;
-            } else {
-                for (k = curState->parenSoFar; k < parenSoFar; k++)
-                    x->parens[k].index = -1;
-                parenSoFar = curState->parenSoFar;
-            }
-            continue;
-        }
-        x = result;
-
-        /*
-         *  Continue with the expression.
-         */
-        op = (REOp)*pc++;
-    }
-    return NULL;
-}
-
-static REMatchState *
-MatchRegExp(REGlobalData *gData, REMatchState *x)
-{
-    REMatchState *result;
-    const jschar *cp = x->cp;
-    const jschar *cp2;
-    uintN j;
-
-    /*
-     * Have to include the position beyond the last character
-     * in order to detect end-of-input/line condition.
-     */
-    for (cp2 = cp; cp2 <= gData->cpend; cp2++) {
-        gData->skipped = cp2 - cp;
-        x->cp = cp2;
-        for (j = 0; j < gData->regexp->parenCount; j++)
-            x->parens[j].index = -1;
-        result = ExecuteREBytecode(gData, x);
-        if (!gData->ok || result)
-            return result;
-        gData->backTrackSP = gData->backTrackStack;
-        gData->cursz = 0;
-        gData->stateStackTop = 0;
-        cp2 = cp + gData->skipped;
-    }
-    return NULL;
-}
-
-
-static REMatchState *
-InitMatch(JSContext *cx, REGlobalData *gData, JSRegExp *re)
-{
-    REMatchState *result;
-    uintN i;
-
-    gData->backTrackStackSize = INITIAL_BACKTRACK;
-    JS_ARENA_ALLOCATE_CAST(gData->backTrackStack, REBackTrackData *,
-                           &gData->pool,
-                           INITIAL_BACKTRACK);
-    if (!gData->backTrackStack)
-        return NULL;
-    gData->backTrackSP = gData->backTrackStack;
-    gData->cursz = 0;
-
-
-    gData->stateStackLimit = INITIAL_STATESTACK;
-    JS_ARENA_ALLOCATE_CAST(gData->stateStack, REProgState *,
-                           &gData->pool,
-                           sizeof(REProgState) * INITIAL_STATESTACK);
-    if (!gData->stateStack)
-        return NULL;
-    gData->stateStackTop = 0;
-
-    gData->cx = cx;
-    gData->regexp = re;
-    gData->ok = JS_TRUE;
-
-    JS_ARENA_ALLOCATE_CAST(result, REMatchState *,
-                           &gData->pool,
-                           offsetof(REMatchState, parens)
-                           + re->parenCount * sizeof(RECapture));
-    if (!result)
-        return NULL;
-
-    for (i = 0; i < re->classCount; i++)
-        if (!re->classList[i].converted)
-            if (!ProcessCharSet(gData, &re->classList[i]))
-                return NULL;
-
-    return result;
-}
-
-JSBool
-js_ExecuteRegExp(JSContext *cx, JSRegExp *re, JSString *str, size_t *indexp,
-                 JSBool test, jsval *rval)
-{
-    REGlobalData gData;
-    REMatchState *x, *result;
-
-    const jschar *cp, *ep;
-    size_t i, length, start;
-    JSSubString *morepar;
-    JSBool ok;
-    JSRegExpStatics *res;
-    ptrdiff_t matchlen;
-    uintN num, morenum;
-    JSString *parstr, *matchstr;
-    JSObject *obj;
-
-    RECapture *parsub = NULL;
-
-    /*
-     * It's safe to load from cp because JSStrings have a zero at the end,
-     * and we never let cp get beyond cpend.
-     */
-    start = *indexp;
-    length = JSSTRING_LENGTH(str);
-    if (start > length)
-        start = length;
-    cp = JSSTRING_CHARS(str);
-    gData.cpbegin = cp;
-    gData.cpend = cp + length;
-    cp += start;
-    gData.start = start;
-    gData.skipped = 0;
-
-    JS_InitArenaPool(&gData.pool, "RegExpPool", 8096, 4);
-    x = InitMatch(cx, &gData, re);
-    if (!x)
-        return JS_FALSE;
-    x->cp = cp;
-
-    /*
-     * Call the recursive matcher to do the real work.  Return null on mismatch
-     * whether testing or not.  On match, return an extended Array object.
-     */
-    result = MatchRegExp(&gData, x);
-    ok = gData.ok;
-    if (!ok)
-        goto out;
-    if (!result) {
-        *rval = JSVAL_NULL;
-        goto out;
-    }
-    cp = result->cp;
-    i = cp - gData.cpbegin;
-    *indexp = i;
-    matchlen = i - (start + gData.skipped);
-    ep = cp;
-    cp -= matchlen;
-
-    if (test) {
-        /*
-         * Testing for a match and updating cx->regExpStatics: don't allocate
-         * an array object, do return true.
-         */
-        *rval = JSVAL_TRUE;
-
-        /* Avoid warning.  (gcc doesn't detect that obj is needed iff !test); */
-        obj = NULL;
-    } else {
-        /*
-         * The array returned on match has element 0 bound to the matched
-         * string, elements 1 through state.parenCount bound to the paren
-         * matches, an index property telling the length of the left context,
-         * and an input property referring to the input string.
-         */
-        obj = js_NewArrayObject(cx, 0, NULL);
-        if (!obj) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        *rval = OBJECT_TO_JSVAL(obj);
-
-#define DEFVAL(val, id) {                                                     \
-    ok = js_DefineProperty(cx, obj, id, val,                                  \
-                           JS_PropertyStub, JS_PropertyStub,                  \
-                           JSPROP_ENUMERATE, NULL);                           \
-    if (!ok) {                                                                \
-        cx->newborn[GCX_OBJECT] = NULL;                                       \
-        cx->newborn[GCX_STRING] = NULL;                                       \
-        goto out;                                                             \
-    }                                                                         \
-}
-
-        matchstr = js_NewStringCopyN(cx, cp, matchlen, 0);
-        if (!matchstr) {
-            cx->newborn[GCX_OBJECT] = NULL;
-            ok = JS_FALSE;
-            goto out;
-        }
-        DEFVAL(STRING_TO_JSVAL(matchstr), INT_TO_JSID(0));
-    }
-
-    res = &cx->regExpStatics;
-    res->input = str;
-    res->parenCount = re->parenCount;
-    if (re->parenCount == 0) {
-        res->lastParen = js_EmptySubString;
-    } else {
-        for (num = 0; num < re->parenCount; num++) {
-            parsub = &result->parens[num];
-            if (num < 9) {
-                if (parsub->index == -1) {
-                    res->parens[num].chars = NULL;
-                    res->parens[num].length = 0;
-                } else {
-                    res->parens[num].chars = gData.cpbegin + parsub->index;
-                    res->parens[num].length = parsub->length;
-                }
-            } else {
-                morenum = num - 9;
-                morepar = res->moreParens;
-                if (!morepar) {
-                    res->moreLength = 10;
-                    morepar = (JSSubString*)
-                        JS_malloc(cx, 10 * sizeof(JSSubString));
-                } else if (morenum >= res->moreLength) {
-                    res->moreLength += 10;
-                    morepar = (JSSubString*)
-                        JS_realloc(cx, morepar,
-                                   res->moreLength * sizeof(JSSubString));
-                }
-                if (!morepar) {
-                    cx->newborn[GCX_OBJECT] = NULL;
-                    cx->newborn[GCX_STRING] = NULL;
-                    ok = JS_FALSE;
-                    goto out;
-                }
-                res->moreParens = morepar;
-                if (parsub->index == -1) {
-                    morepar[morenum].chars = NULL;
-                    morepar[morenum].length = 0;
-                } else {
-                    morepar[morenum].chars = gData.cpbegin + parsub->index;
-                    morepar[morenum].length = parsub->length;
-                }
-            }
-            if (test)
-                continue;
-            if (parsub->index == -1) {
-                ok = js_DefineProperty(cx, obj, INT_TO_JSID(num + 1),
-                                       JSVAL_VOID, NULL, NULL,
-                                       JSPROP_ENUMERATE, NULL);
-            } else {
-                parstr = js_NewStringCopyN(cx, gData.cpbegin + parsub->index,
-                                           parsub->length, 0);
-                if (!parstr) {
-                    cx->newborn[GCX_OBJECT] = NULL;
-                    cx->newborn[GCX_STRING] = NULL;
-                    ok = JS_FALSE;
-                    goto out;
-                }
-                ok = js_DefineProperty(cx, obj, INT_TO_JSID(num + 1),
-                                       STRING_TO_JSVAL(parstr), NULL, NULL,
-                                       JSPROP_ENUMERATE, NULL);
-            }
-            if (!ok) {
-                cx->newborn[GCX_OBJECT] = NULL;
-                cx->newborn[GCX_STRING] = NULL;
-                goto out;
-            }
-        }
-        if (parsub->index == -1) {
-            res->lastParen = js_EmptySubString;
-        } else {
-            res->lastParen.chars = gData.cpbegin + parsub->index;
-            res->lastParen.length = parsub->length;
-        }
-    }
-
-    if (!test) {
-        /*
-         * Define the index and input properties last for better for/in loop
-         * order (so they come after the elements).
-         */
-        DEFVAL(INT_TO_JSVAL(start + gData.skipped),
-               ATOM_TO_JSID(cx->runtime->atomState.indexAtom));
-        DEFVAL(STRING_TO_JSVAL(str),
-               ATOM_TO_JSID(cx->runtime->atomState.inputAtom));
-    }
-
-#undef DEFVAL
-
-    res->lastMatch.chars = cp;
-    res->lastMatch.length = matchlen;
-    if (JS_VERSION_IS_1_2(cx)) {
-        /*
-         * JS1.2 emulated Perl4.0.1.8 (patch level 36) for global regexps used
-         * in scalar contexts, and unintentionally for the string.match "list"
-         * pseudo-context.  On "hi there bye", the following would result:
-         *
-         * Language     while(/ /g){print("$`");}   s/ /$`/g
-         * perl4.036    "hi", "there"               "hihitherehi therebye"
-         * perl5        "hi", "hi there"            "hihitherehi therebye"
-         * js1.2        "hi", "there"               "hihitheretherebye"
-         */
-        res->leftContext.chars = JSSTRING_CHARS(str) + start;
-        res->leftContext.length = gData.skipped;
-    } else {
-        /*
-         * For JS1.3 and ECMAv2, emulate Perl5 exactly:
-         *
-         * js1.3        "hi", "hi there"            "hihitherehi therebye"
-         */
-        res->leftContext.chars = JSSTRING_CHARS(str);
-        res->leftContext.length = start + gData.skipped;
-    }
-    res->rightContext.chars = ep;
-    res->rightContext.length = gData.cpend - ep;
-
-out:
-    JS_FinishArenaPool(&gData.pool);
-    return ok;
-}
-
-/************************************************************************/
-
-enum regexp_tinyid {
-    REGEXP_SOURCE       = -1,
-    REGEXP_GLOBAL       = -2,
-    REGEXP_IGNORE_CASE  = -3,
-    REGEXP_LAST_INDEX   = -4,
-    REGEXP_MULTILINE    = -5
-};
-
-#define REGEXP_PROP_ATTRS (JSPROP_PERMANENT|JSPROP_SHARED)
-
-static JSPropertySpec regexp_props[] = {
-    {"source",     REGEXP_SOURCE,      REGEXP_PROP_ATTRS | JSPROP_READONLY,0,0},
-    {"global",     REGEXP_GLOBAL,      REGEXP_PROP_ATTRS | JSPROP_READONLY,0,0},
-    {"ignoreCase", REGEXP_IGNORE_CASE, REGEXP_PROP_ATTRS | JSPROP_READONLY,0,0},
-    {"lastIndex",  REGEXP_LAST_INDEX,  REGEXP_PROP_ATTRS,0,0},
-    {"multiline",  REGEXP_MULTILINE,   REGEXP_PROP_ATTRS | JSPROP_READONLY,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-regexp_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsint slot;
-    JSRegExp *re;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    slot = JSVAL_TO_INT(id);
-    if (slot == REGEXP_LAST_INDEX)
-        return JS_GetReservedSlot(cx, obj, 0, vp);
-
-    JS_LOCK_OBJ(cx, obj);
-    re = (JSRegExp *) JS_GetInstancePrivate(cx, obj, &js_RegExpClass, NULL);
-    if (re) {
-        switch (slot) {
-          case REGEXP_SOURCE:
-            *vp = STRING_TO_JSVAL(re->source);
-            break;
-          case REGEXP_GLOBAL:
-            *vp = BOOLEAN_TO_JSVAL((re->flags & JSREG_GLOB) != 0);
-            break;
-          case REGEXP_IGNORE_CASE:
-            *vp = BOOLEAN_TO_JSVAL((re->flags & JSREG_FOLD) != 0);
-            break;
-          case REGEXP_MULTILINE:
-            *vp = BOOLEAN_TO_JSVAL((re->flags & JSREG_MULTILINE) != 0);
-            break;
-        }
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-    return JS_TRUE;
-}
-
-static JSBool
-regexp_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSBool ok;
-    jsint slot;
-    jsdouble lastIndex;
-
-    ok = JS_TRUE;
-    if (!JSVAL_IS_INT(id))
-        return ok;
-    slot = JSVAL_TO_INT(id);
-    if (slot == REGEXP_LAST_INDEX) {
-        if (!js_ValueToNumber(cx, *vp, &lastIndex))
-            return JS_FALSE;
-        lastIndex = js_DoubleToInteger(lastIndex);
-        ok = js_NewNumberValue(cx, lastIndex, vp) &&
-             JS_SetReservedSlot(cx, obj, 0, *vp);
-    }
-    return ok;
-}
-
-/*
- * RegExp class static properties and their Perl counterparts:
- *
- *  RegExp.input                $_
- *  RegExp.multiline            $*
- *  RegExp.lastMatch            $&
- *  RegExp.lastParen            $+
- *  RegExp.leftContext          $`
- *  RegExp.rightContext         $'
- */
-enum regexp_static_tinyid {
-    REGEXP_STATIC_INPUT         = -1,
-    REGEXP_STATIC_MULTILINE     = -2,
-    REGEXP_STATIC_LAST_MATCH    = -3,
-    REGEXP_STATIC_LAST_PAREN    = -4,
-    REGEXP_STATIC_LEFT_CONTEXT  = -5,
-    REGEXP_STATIC_RIGHT_CONTEXT = -6
-};
-
-JSBool
-js_InitRegExpStatics(JSContext *cx, JSRegExpStatics *res)
-{
-    JS_ClearRegExpStatics(cx);
-    return js_AddRoot(cx, &res->input, "res->input");
-}
-
-void
-js_FreeRegExpStatics(JSContext *cx, JSRegExpStatics *res)
-{
-    if (res->moreParens) {
-        JS_free(cx, res->moreParens);
-        res->moreParens = NULL;
-    }
-    js_RemoveRoot(cx->runtime, &res->input);
-}
-
-static JSBool
-regexp_static_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    jsint slot;
-    JSRegExpStatics *res;
-    JSString *str;
-    JSSubString *sub;
-
-    res = &cx->regExpStatics;
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    slot = JSVAL_TO_INT(id);
-    switch (slot) {
-      case REGEXP_STATIC_INPUT:
-        *vp = res->input ? STRING_TO_JSVAL(res->input)
-                         : JS_GetEmptyStringValue(cx);
-        return JS_TRUE;
-      case REGEXP_STATIC_MULTILINE:
-        *vp = BOOLEAN_TO_JSVAL(res->multiline);
-        return JS_TRUE;
-      case REGEXP_STATIC_LAST_MATCH:
-        sub = &res->lastMatch;
-        break;
-      case REGEXP_STATIC_LAST_PAREN:
-        sub = &res->lastParen;
-        break;
-      case REGEXP_STATIC_LEFT_CONTEXT:
-        sub = &res->leftContext;
-        break;
-      case REGEXP_STATIC_RIGHT_CONTEXT:
-        sub = &res->rightContext;
-        break;
-      default:
-        sub = REGEXP_PAREN_SUBSTRING(res, slot);
-        break;
-    }
-    str = js_NewStringCopyN(cx, sub->chars, sub->length, 0);
-    if (!str)
-        return JS_FALSE;
-    *vp = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-regexp_static_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSRegExpStatics *res;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-    res = &cx->regExpStatics;
-    /* XXX use if-else rather than switch to keep MSVC1.52 from crashing */
-    if (JSVAL_TO_INT(id) == REGEXP_STATIC_INPUT) {
-        if (!JSVAL_IS_STRING(*vp) &&
-            !JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp)) {
-            return JS_FALSE;
-        }
-        res->input = JSVAL_TO_STRING(*vp);
-    } else if (JSVAL_TO_INT(id) == REGEXP_STATIC_MULTILINE) {
-        if (!JSVAL_IS_BOOLEAN(*vp) &&
-            !JS_ConvertValue(cx, *vp, JSTYPE_BOOLEAN, vp)) {
-            return JS_FALSE;
-        }
-        res->multiline = JSVAL_TO_BOOLEAN(*vp);
-    }
-    return JS_TRUE;
-}
-
-static JSPropertySpec regexp_static_props[] = {
-    {"input",
-     REGEXP_STATIC_INPUT,
-     JSPROP_ENUMERATE|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_setProperty},
-    {"multiline",
-     REGEXP_STATIC_MULTILINE,
-     JSPROP_ENUMERATE|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_setProperty},
-    {"lastMatch",
-     REGEXP_STATIC_LAST_MATCH,
-     JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"lastParen",
-     REGEXP_STATIC_LAST_PAREN,
-     JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"leftContext",
-     REGEXP_STATIC_LEFT_CONTEXT,
-     JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"rightContext",
-     REGEXP_STATIC_RIGHT_CONTEXT,
-     JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-
-    /* XXX should have block scope and local $1, etc. */
-    {"$1", 0, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$2", 1, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$3", 2, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$4", 3, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$5", 4, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$6", 5, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$7", 6, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$8", 7, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-    {"$9", 8, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_SHARED,
-     regexp_static_getProperty,    regexp_static_getProperty},
-
-    {0,0,0,0,0}
-};
-
-static void
-regexp_finalize(JSContext *cx, JSObject *obj)
-{
-    JSRegExp *re;
-
-    re = (JSRegExp *) JS_GetPrivate(cx, obj);
-    if (!re)
-        return;
-    js_DestroyRegExp(cx, re);
-}
-
-/* Forward static prototype. */
-static JSBool
-regexp_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-            jsval *rval);
-
-static JSBool
-regexp_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return regexp_exec(cx, JSVAL_TO_OBJECT(argv[-2]), argc, argv, rval);
-}
-
-#if JS_HAS_XDR
-
-#include "jsxdrapi.h"
-
-static JSBool
-regexp_xdrObject(JSXDRState *xdr, JSObject **objp)
-{
-    JSRegExp *re;
-    JSString *source;
-    uint32 flagsword;
-    JSObject *obj;
-
-    if (xdr->mode == JSXDR_ENCODE) {
-        re = (JSRegExp *) JS_GetPrivate(xdr->cx, *objp);
-        if (!re)
-            return JS_FALSE;
-        source = re->source;
-        flagsword = ((uint32)re->cloneIndex << 16) | re->flags;
-    }
-    if (!JS_XDRString(xdr, &source) ||
-        !JS_XDRUint32(xdr, &flagsword)) {
-        return JS_FALSE;
-    }
-    if (xdr->mode == JSXDR_DECODE) {
-        obj = js_NewObject(xdr->cx, &js_RegExpClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        re = js_NewRegExp(xdr->cx, NULL, source, (uint16)flagsword, JS_FALSE);
-        if (!re)
-            return JS_FALSE;
-        if (!JS_SetPrivate(xdr->cx, obj, re) ||
-            !js_SetLastIndex(xdr->cx, obj, 0)) {
-            js_DestroyRegExp(xdr->cx, re);
-            return JS_FALSE;
-        }
-        re->cloneIndex = (uint16)(flagsword >> 16);
-        *objp = obj;
-    }
-    return JS_TRUE;
-}
-
-#else  /* !JS_HAS_XDR */
-
-#define regexp_xdrObject NULL
-
-#endif /* !JS_HAS_XDR */
-
-static uint32
-regexp_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSRegExp *re = (JSRegExp *) JS_GetPrivate(cx, obj);
-    if (re)
-        JS_MarkGCThing(cx, re->source, "source", arg);
-    return 0;
-}
-
-JSClass js_RegExpClass = {
-    js_RegExp_str,
-    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(1),
-    JS_PropertyStub,    JS_PropertyStub,
-    regexp_getProperty, regexp_setProperty,
-    JS_EnumerateStub,   JS_ResolveStub,
-    JS_ConvertStub,     regexp_finalize,
-    NULL,               NULL,
-    regexp_call,        NULL,
-    regexp_xdrObject,   NULL,
-    regexp_mark,        0
-};
-
-static const jschar empty_regexp_ucstr[] = {'(', '?', ':', ')', 0};
-
-JSBool
-js_regexp_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    JSRegExp *re;
-    const jschar *source;
-    jschar *chars;
-    size_t length, nflags;
-    uintN flags;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_RegExpClass, argv))
-        return JS_FALSE;
-    JS_LOCK_OBJ(cx, obj);
-    re = (JSRegExp *) JS_GetPrivate(cx, obj);
-    if (!re) {
-        JS_UNLOCK_OBJ(cx, obj);
-        *rval = STRING_TO_JSVAL(cx->runtime->emptyString);
-        return JS_TRUE;
-    }
-
-    source = JSSTRING_CHARS(re->source);
-    length = JSSTRING_LENGTH(re->source);
-    if (length == 0) {
-        source = empty_regexp_ucstr;
-        length = sizeof(empty_regexp_ucstr) / sizeof(jschar) - 1;
-    }
-    length += 2;
-    nflags = 0;
-    for (flags = re->flags; flags != 0; flags &= flags - 1)
-        nflags++;
-    chars = (jschar*) JS_malloc(cx, (length + nflags + 1) * sizeof(jschar));
-    if (!chars) {
-        JS_UNLOCK_OBJ(cx, obj);
-        return JS_FALSE;
-    }
-
-    chars[0] = '/';
-    js_strncpy(&chars[1], source, length - 2);
-    chars[length-1] = '/';
-    if (nflags) {
-        if (re->flags & JSREG_GLOB)
-            chars[length++] = 'g';
-        if (re->flags & JSREG_FOLD)
-            chars[length++] = 'i';
-        if (re->flags & JSREG_MULTILINE)
-            chars[length++] = 'm';
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-    chars[length] = 0;
-
-    str = js_NewString(cx, chars, length, 0);
-    if (!str) {
-        JS_free(cx, chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-regexp_compile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSString *opt, *str;
-    JSRegExp *oldre, *re;
-    JSBool ok, ok2;
-    JSObject *obj2;
-    size_t length, nbytes;
-    const jschar *cp, *start, *end;
-    jschar *nstart, *ncp, *tmp;
-
-    if (!JS_InstanceOf(cx, obj, &js_RegExpClass, argv))
-        return JS_FALSE;
-    opt = NULL;
-    if (argc == 0) {
-        str = cx->runtime->emptyString;
-    } else {
-        if (JSVAL_IS_OBJECT(argv[0])) {
-            /*
-             * If we get passed in a RegExp object we construct a new
-             * RegExp that is a duplicate of it by re-compiling the
-             * original source code. ECMA requires that it be an error
-             * here if the flags are specified. (We must use the flags
-             * from the original RegExp also).
-             */
-            obj2 = JSVAL_TO_OBJECT(argv[0]);
-            if (obj2 && OBJ_GET_CLASS(cx, obj2) == &js_RegExpClass) {
-                if (argc >= 2 && !JSVAL_IS_VOID(argv[1])) { /* 'flags' passed */
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_NEWREGEXP_FLAGGED);
-                    return JS_FALSE;
-                }
-                JS_LOCK_OBJ(cx, obj2);
-                re = (JSRegExp *) JS_GetPrivate(cx, obj2);
-                if (!re) {
-                    JS_UNLOCK_OBJ(cx, obj2);
-                    return JS_FALSE;
-                }
-                re = js_NewRegExp(cx, NULL, re->source, re->flags, JS_FALSE);
-                JS_UNLOCK_OBJ(cx, obj2);
-                goto created;
-            }
-        }
-        str = js_ValueToString(cx, argv[0]);
-        if (!str)
-            return JS_FALSE;
-        argv[0] = STRING_TO_JSVAL(str);
-        if (argc > 1) {
-            if (JSVAL_IS_VOID(argv[1])) {
-                opt = NULL;
-            } else {
-                opt = js_ValueToString(cx, argv[1]);
-                if (!opt)
-                    return JS_FALSE;
-                argv[1] = STRING_TO_JSVAL(opt);
-            }
-        }
-
-        /* Escape any naked slashes in the regexp source. */
-        length = JSSTRING_LENGTH(str);
-        start = JSSTRING_CHARS(str);
-        end = start + length;
-        nstart = ncp = NULL;
-        for (cp = start; cp < end; cp++) {
-            if (*cp == '/' && (cp == start || cp[-1] != '\\')) {
-                nbytes = (++length + 1) * sizeof(jschar);
-                if (!nstart) {
-                    nstart = (jschar *) JS_malloc(cx, nbytes);
-                    if (!nstart)
-                        return JS_FALSE;
-                    ncp = nstart + (cp - start);
-                    js_strncpy(nstart, start, cp - start);
-                } else {
-                    tmp = (jschar *) JS_realloc(cx, nstart, nbytes);
-                    if (!tmp) {
-                        JS_free(cx, nstart);
-                        return JS_FALSE;
-                    }
-                    ncp = tmp + (ncp - nstart);
-                    nstart = tmp;
-                }
-                *ncp++ = '\\';
-            }
-            if (nstart)
-                *ncp++ = *cp;
-        }
-
-        if (nstart) {
-            /* Don't forget to store the backstop after the new string. */
-            JS_ASSERT((size_t)(ncp - nstart) == length);
-            *ncp = 0;
-            str = js_NewString(cx, nstart, length, 0);
-            if (!str) {
-                JS_free(cx, nstart);
-                return JS_FALSE;
-            }
-            argv[0] = STRING_TO_JSVAL(str);
-        }
-    }
-
-    re = js_NewRegExpOpt(cx, NULL, str, opt, JS_FALSE);
-created:
-    if (!re)
-        return JS_FALSE;
-    JS_LOCK_OBJ(cx, obj);
-    oldre = (JSRegExp *) JS_GetPrivate(cx, obj);
-    ok = JS_SetPrivate(cx, obj, re);
-    ok2 = js_SetLastIndex(cx, obj, 0);
-    JS_UNLOCK_OBJ(cx, obj);
-    if (!ok) {
-        js_DestroyRegExp(cx, re);
-        return JS_FALSE;
-    }
-    if (oldre)
-        js_DestroyRegExp(cx, oldre);
-    *rval = OBJECT_TO_JSVAL(obj);
-    return ok2;
-}
-
-static JSBool
-regexp_exec_sub(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                JSBool test, jsval *rval)
-{
-    JSBool ok;
-    JSRegExp *re;
-    jsdouble lastIndex;
-    JSString *str;
-    size_t i;
-
-    ok = JS_InstanceOf(cx, obj, &js_RegExpClass, argv);
-    if (!ok)
-        return JS_FALSE;
-    JS_LOCK_OBJ(cx, obj);
-    re = (JSRegExp *) JS_GetPrivate(cx, obj);
-    if (!re) {
-        JS_UNLOCK_OBJ(cx, obj);
-        return JS_TRUE;
-    }
-
-    /* NB: we must reach out: after this paragraph, in order to drop re. */
-    HOLD_REGEXP(cx, re);
-    if (re->flags & JSREG_GLOB) {
-        ok = js_GetLastIndex(cx, obj, &lastIndex);
-    } else {
-        lastIndex = 0;
-    }
-    JS_UNLOCK_OBJ(cx, obj);
-    if (!ok)
-        goto out;
-
-    /* Now that obj is unlocked, it's safe to (potentially) grab the GC lock. */
-    if (argc == 0) {
-        str = cx->regExpStatics.input;
-        if (!str) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_NO_INPUT,
-                                 JS_GetStringBytes(re->source),
-                                 (re->flags & JSREG_GLOB) ? "g" : "",
-                                 (re->flags & JSREG_FOLD) ? "i" : "",
-                                 (re->flags & JSREG_MULTILINE) ? "m" : "");
-            ok = JS_FALSE;
-            goto out;
-        }
-    } else {
-        str = js_ValueToString(cx, argv[0]);
-        if (!str)
-            goto out;
-        argv[0] = STRING_TO_JSVAL(str);
-    }
-
-    if (lastIndex < 0 || JSSTRING_LENGTH(str) < lastIndex) {
-        ok = js_SetLastIndex(cx, obj, 0);
-        *rval = JSVAL_NULL;
-    } else {
-        i = (size_t) lastIndex;
-        ok = js_ExecuteRegExp(cx, re, str, &i, test, rval);
-        if (ok && (re->flags & JSREG_GLOB))
-            ok = js_SetLastIndex(cx, obj, (*rval == JSVAL_NULL) ? 0 : i);
-    }
-
-out:
-    DROP_REGEXP(cx, re);
-    return ok;
-}
-
-static JSBool
-regexp_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return regexp_exec_sub(cx, obj, argc, argv, JS_FALSE, rval);
-}
-
-static JSBool
-regexp_test(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (!regexp_exec_sub(cx, obj, argc, argv, JS_TRUE, rval))
-        return JS_FALSE;
-    if (*rval != JSVAL_TRUE)
-        *rval = JSVAL_FALSE;
-    return JS_TRUE;
-}
-
-static JSFunctionSpec regexp_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   js_regexp_toString,     0,0,0},
-#endif
-    {js_toString_str,   js_regexp_toString,     0,0,0},
-    {"compile",         regexp_compile,         1,0,0},
-    {"exec",            regexp_exec,            0,0,0},
-    {"test",            regexp_test,            0,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-RegExp(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        /*
-         * If first arg is regexp and no flags are given, just return the arg.
-         * (regexp_compile detects the regexp + flags case and throws a
-         * TypeError.)  See 10.15.3.1.
-         */
-        if ((argc < 2 || JSVAL_IS_VOID(argv[1])) &&
-            !JSVAL_IS_PRIMITIVE(argv[0]) &&
-            OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(argv[0])) == &js_RegExpClass) {
-            *rval = argv[0];
-            return JS_TRUE;
-        }
-
-        /* Otherwise, replace obj with a new RegExp object. */
-        obj = js_NewObject(cx, &js_RegExpClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-    }
-    return regexp_compile(cx, obj, argc, argv, rval);
-}
-
-JSObject *
-js_InitRegExpClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto, *ctor;
-    jsval rval;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_RegExpClass, RegExp, 1,
-                         regexp_props, regexp_methods,
-                         regexp_static_props, NULL);
-
-    if (!proto || !(ctor = JS_GetConstructor(cx, proto)))
-        return NULL;
-    if (!JS_AliasProperty(cx, ctor, "input",        "$_") ||
-        !JS_AliasProperty(cx, ctor, "multiline",    "$*") ||
-        !JS_AliasProperty(cx, ctor, "lastMatch",    "$&") ||
-        !JS_AliasProperty(cx, ctor, "lastParen",    "$+") ||
-        !JS_AliasProperty(cx, ctor, "leftContext",  "$`") ||
-        !JS_AliasProperty(cx, ctor, "rightContext", "$'")) {
-        goto bad;
-    }
-
-    /* Give RegExp.prototype private data so it matches the empty string. */
-    if (!regexp_compile(cx, proto, 0, NULL, &rval))
-        goto bad;
-    return proto;
-
-bad:
-    JS_DeleteProperty(cx, obj, js_RegExpClass.name);
-    return NULL;
-}
-
-JSObject *
-js_NewRegExpObject(JSContext *cx, JSTokenStream *ts,
-                   jschar *chars, size_t length, uintN flags)
-{
-    JSString *str;
-    JSObject *obj;
-    JSRegExp *re;
-    JSTempValueRooter tvr;
-
-    str = js_NewStringCopyN(cx, chars, length, 0);
-    if (!str)
-        return NULL;
-    re = js_NewRegExp(cx, ts,  str, flags, JS_FALSE);
-    if (!re)
-        return NULL;
-    JS_PUSH_SINGLE_TEMP_ROOT(cx, STRING_TO_JSVAL(str), &tvr);
-    obj = js_NewObject(cx, &js_RegExpClass, NULL, NULL);
-    if (!obj || !JS_SetPrivate(cx, obj, re)) {
-        js_DestroyRegExp(cx, re);
-        obj = NULL;
-    }
-    if (obj && !js_SetLastIndex(cx, obj, 0))
-        obj = NULL;
-    JS_POP_TEMP_ROOT(cx, &tvr);
-    return obj;
-}
-
-JSObject *
-js_CloneRegExpObject(JSContext *cx, JSObject *obj, JSObject *parent)
-{
-    JSObject *clone;
-    JSRegExp *re;
-
-    JS_ASSERT(OBJ_GET_CLASS(cx, obj) == &js_RegExpClass);
-    clone = js_NewObject(cx, &js_RegExpClass, NULL, parent);
-    if (!clone)
-        return NULL;
-    re = JS_GetPrivate(cx, obj);
-    if (!JS_SetPrivate(cx, clone, re) || !js_SetLastIndex(cx, clone, 0)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    HOLD_REGEXP(cx, re);
-    return clone;
-}
-
-JSBool
-js_GetLastIndex(JSContext *cx, JSObject *obj, jsdouble *lastIndex)
-{
-    jsval v;
-
-    return JS_GetReservedSlot(cx, obj, 0, &v) &&
-           js_ValueToNumber(cx, v, lastIndex);
-}
-
-JSBool
-js_SetLastIndex(JSContext *cx, JSObject *obj, jsdouble lastIndex)
-{
-    jsval v;
-
-    return js_NewNumberValue(cx, lastIndex, &v) &&
-           JS_SetReservedSlot(cx, obj, 0, v);
-}
-
-#endif /* JS_HAS_REGEXPS */
diff --git a/libs/js/src/jsregexp.h b/libs/js/src/jsregexp.h
deleted file mode 100644
index d8c4cc2955..0000000000
--- a/libs/js/src/jsregexp.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsregexp_h___
-#define jsregexp_h___
-/*
- * JS regular expression interface.
- */
-#include <stddef.h>
-#include "jspubtd.h"
-#include "jsstr.h"
-
-#ifdef JS_THREADSAFE
-#include "jsdhash.h"
-#endif
-
-struct JSRegExpStatics {
-    JSString    *input;         /* input string to match (perl $_, GC root) */
-    JSBool      multiline;      /* whether input contains newlines (perl $*) */
-    uint16      parenCount;     /* number of valid elements in parens[] */
-    uint16      moreLength;     /* number of allocated elements in moreParens */
-    JSSubString parens[9];      /* last set of parens matched (perl $1, $2) */
-    JSSubString *moreParens;    /* null or realloc'd vector for $10, etc. */
-    JSSubString lastMatch;      /* last string matched (perl $&) */
-    JSSubString lastParen;      /* last paren matched (perl $+) */
-    JSSubString leftContext;    /* input to left of last match (perl $`) */
-    JSSubString rightContext;   /* input to right of last match (perl $') */
-};
-
-/*
- * This struct holds a bitmap representation of a class from a regexp.
- * There's a list of these referenced by the classList field in the JSRegExp
- * struct below. The initial state has startIndex set to the offset in the
- * original regexp source of the beginning of the class contents. The first
- * use of the class converts the source representation into a bitmap.
- *
- */
-typedef struct RECharSet {
-    JSPackedBool    converted;
-    JSPackedBool    sense;
-    uint16          length;
-    union {
-        uint8       *bits;
-        struct {
-            size_t  startIndex;
-            size_t  length;
-        } src;
-    } u;
-} RECharSet;
-
-/*
- * This macro is safe because moreParens is guaranteed to be allocated and big
- * enough to hold parenCount, or else be null when parenCount is 0.
- */
-#define REGEXP_PAREN_SUBSTRING(res, num)                                      \
-    (((jsuint)(num) < (jsuint)(res)->parenCount)                              \
-     ? ((jsuint)(num) < 9)                                                    \
-       ? &(res)->parens[num]                                                  \
-       : &(res)->moreParens[(num) - 9]                                        \
-     : &js_EmptySubString)
-
-typedef struct RENode RENode;
-
-struct JSRegExp {
-    jsrefcount   nrefs;         /* reference count */
-    uint16       flags;         /* flags, see jsapi.h's JSREG_* defines */
-    uint16       cloneIndex;    /* index in fp->vars or funobj->slots of
-                                   cloned regexp object */
-    size_t       parenCount;    /* number of parenthesized submatches */
-    size_t       classCount;    /* count [...] bitmaps */
-    RECharSet    *classList;    /* list of [...] bitmaps */
-    JSString     *source;       /* locked source string, sans // */
-    jsbytecode   program[1];    /* regular expression bytecode */
-};
-
-extern JSRegExp *
-js_NewRegExp(JSContext *cx, JSTokenStream *ts,
-             JSString *str, uintN flags, JSBool flat);
-
-extern JSRegExp *
-js_NewRegExpOpt(JSContext *cx, JSTokenStream *ts,
-                JSString *str, JSString *opt, JSBool flat);
-
-extern void
-js_DestroyRegExp(JSContext *cx, JSRegExp *re);
-
-/*
- * Execute re on input str at *indexp, returning null in *rval on mismatch.
- * On match, return true if test is true, otherwise return an array object.
- * Update *indexp and cx->regExpStatics always on match.
- */
-extern JSBool
-js_ExecuteRegExp(JSContext *cx, JSRegExp *re, JSString *str, size_t *indexp,
-                 JSBool test, jsval *rval);
-
-/*
- * These two add and remove GC roots, respectively, so their calls must be
- * well-ordered.
- */
-extern JSBool
-js_InitRegExpStatics(JSContext *cx, JSRegExpStatics *res);
-
-extern void
-js_FreeRegExpStatics(JSContext *cx, JSRegExpStatics *res);
-
-#define JSVAL_IS_REGEXP(cx, v)                                                \
-    (JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) &&                              \
-     OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_RegExpClass)
-
-extern JSClass js_RegExpClass;
-
-extern JSObject *
-js_InitRegExpClass(JSContext *cx, JSObject *obj);
-
-/*
- * Export js_regexp_toString to the decompiler.
- */
-extern JSBool
-js_regexp_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval);
-
-/*
- * Create, serialize/deserialize, or clone a RegExp object.
- */
-extern JSObject *
-js_NewRegExpObject(JSContext *cx, JSTokenStream *ts,
-                   jschar *chars, size_t length, uintN flags);
-
-extern JSBool
-js_XDRRegExp(JSXDRState *xdr, JSObject **objp);
-
-extern JSObject *
-js_CloneRegExpObject(JSContext *cx, JSObject *obj, JSObject *parent);
-
-/*
- * Get and set the per-object (clone or clone-parent) lastIndex slot.
- */
-extern JSBool
-js_GetLastIndex(JSContext *cx, JSObject *obj, jsdouble *lastIndex);
-
-extern JSBool
-js_SetLastIndex(JSContext *cx, JSObject *obj, jsdouble lastIndex);
-
-#endif /* jsregexp_h___ */
diff --git a/libs/js/src/jsscan.c b/libs/js/src/jsscan.c
deleted file mode 100644
index 5d87de975f..0000000000
--- a/libs/js/src/jsscan.c
+++ /dev/null
@@ -1,2132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS lexical scanner.
- */
-#include "jsstddef.h"
-#include <stdio.h>      /* first to avoid trouble on some systems */
-#include <errno.h>
-#include <limits.h>
-#include <math.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h" /* Added by JSIFY */
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsdtoa.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsemit.h"
-#include "jsexn.h"
-#include "jsnum.h"
-#include "jsopcode.h"
-#include "jsregexp.h"
-#include "jsscan.h"
-#include "jsscript.h"
-
-#if JS_HAS_XML_SUPPORT
-#include "jsparse.h"
-#include "jsxml.h"
-#endif
-
-#define RESERVE_JAVA_KEYWORDS
-#define RESERVE_ECMA_KEYWORDS
-
-#define MAX_KEYWORD_LENGTH      12
-
-static struct keyword {
-    const char  *name;
-    JSTokenType tokentype;      /* JSTokenType */
-    JSOp        op;             /* JSOp */
-    JSVersion   version;        /* JSVersion */
-} keywords[] = {
-    {"break",           TOK_BREAK,              JSOP_NOP,   JSVERSION_DEFAULT},
-    {"case",            TOK_CASE,               JSOP_NOP,   JSVERSION_DEFAULT},
-    {"continue",        TOK_CONTINUE,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {js_default_str,    TOK_DEFAULT,            JSOP_NOP,   JSVERSION_DEFAULT},
-    {js_delete_str,     TOK_DELETE,             JSOP_NOP,   JSVERSION_DEFAULT},
-    {"do",              TOK_DO,                 JSOP_NOP,   JSVERSION_DEFAULT},
-    {"else",            TOK_ELSE,               JSOP_NOP,   JSVERSION_DEFAULT},
-    {"export",          TOK_EXPORT,             JSOP_NOP,   JSVERSION_1_2},
-    {js_false_str,      TOK_PRIMARY,            JSOP_FALSE, JSVERSION_DEFAULT},
-    {"for",             TOK_FOR,                JSOP_NOP,   JSVERSION_DEFAULT},
-    {js_function_str,   TOK_FUNCTION,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"if",              TOK_IF,                 JSOP_NOP,   JSVERSION_DEFAULT},
-    {js_in_str,         TOK_IN,                 JSOP_IN,    JSVERSION_DEFAULT},
-    {js_new_str,        TOK_NEW,                JSOP_NEW,   JSVERSION_DEFAULT},
-    {js_null_str,       TOK_PRIMARY,            JSOP_NULL,  JSVERSION_DEFAULT},
-    {"return",          TOK_RETURN,             JSOP_NOP,   JSVERSION_DEFAULT},
-    {"switch",          TOK_SWITCH,             JSOP_NOP,   JSVERSION_DEFAULT},
-    {js_this_str,       TOK_PRIMARY,            JSOP_THIS,  JSVERSION_DEFAULT},
-    {js_true_str,       TOK_PRIMARY,            JSOP_TRUE,  JSVERSION_DEFAULT},
-    {js_typeof_str,     TOK_UNARYOP,            JSOP_TYPEOF,JSVERSION_DEFAULT},
-    {js_var_str,        TOK_VAR,                JSOP_DEFVAR,JSVERSION_DEFAULT},
-    {js_void_str,       TOK_UNARYOP,            JSOP_VOID,  JSVERSION_DEFAULT},
-    {"while",           TOK_WHILE,              JSOP_NOP,   JSVERSION_DEFAULT},
-    {"with",            TOK_WITH,               JSOP_NOP,   JSVERSION_DEFAULT},
-
-#if JS_HAS_CONST
-    {js_const_str,      TOK_VAR,                JSOP_DEFCONST,JSVERSION_DEFAULT},
-#else
-    {js_const_str,      TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-#endif
-
-#if JS_HAS_EXCEPTIONS
-    {"try",             TOK_TRY,                JSOP_NOP,   JSVERSION_DEFAULT},
-    {"catch",           TOK_CATCH,              JSOP_NOP,   JSVERSION_DEFAULT},
-    {"finally",         TOK_FINALLY,            JSOP_NOP,   JSVERSION_DEFAULT},
-    {"throw",           TOK_THROW,              JSOP_NOP,   JSVERSION_DEFAULT},
-#else
-    {"try",             TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"catch",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"finally",         TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"throw",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-#endif
-
-#if JS_HAS_INSTANCEOF
-    {js_instanceof_str, TOK_INSTANCEOF,         JSOP_INSTANCEOF,JSVERSION_1_4},
-#else
-    {js_instanceof_str, TOK_RESERVED,           JSOP_NOP,   JSVERSION_1_4},
-#endif
-
-#ifdef RESERVE_JAVA_KEYWORDS
-    {"abstract",        TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"boolean",         TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"byte",            TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"char",            TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"class",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"double",          TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"extends",         TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"final",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"float",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"goto",            TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"implements",      TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"import",          TOK_IMPORT,             JSOP_NOP,   JSVERSION_DEFAULT},
-    {"int",             TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"interface",       TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"long",            TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"native",          TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"package",         TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"private",         TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"protected",       TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"public",          TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"short",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"static",          TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"super",           TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"synchronized",    TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"throws",          TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"transient",       TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-    {"volatile",        TOK_RESERVED,           JSOP_NOP,   JSVERSION_DEFAULT},
-#endif
-
-#ifdef RESERVE_ECMA_KEYWORDS
-    {"enum",           TOK_RESERVED,            JSOP_NOP,   JSVERSION_1_3},
-#endif
-
-#if JS_HAS_DEBUGGER_KEYWORD
-    {"debugger",       TOK_DEBUGGER,            JSOP_NOP,   JSVERSION_1_3},
-#elif defined(RESERVE_ECMA_KEYWORDS)
-    {"debugger",       TOK_RESERVED,            JSOP_NOP,   JSVERSION_1_3},
-#endif
-    {0,                TOK_EOF,                 JSOP_NOP,   JSVERSION_DEFAULT}
-};
-
-JSBool
-js_InitScanner(JSContext *cx)
-{
-    struct keyword *kw;
-    size_t length;
-    JSAtom *atom;
-
-    for (kw = keywords; kw->name; kw++) {
-        length = strlen(kw->name);
-        JS_ASSERT(length <= MAX_KEYWORD_LENGTH);
-        atom = js_Atomize(cx, kw->name, length, ATOM_PINNED);
-        if (!atom)
-            return JS_FALSE;
-        ATOM_SET_KEYWORD(atom, kw);
-    }
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(void)
-js_MapKeywords(void (*mapfun)(const char *))
-{
-    struct keyword *kw;
-
-    for (kw = keywords; kw->name; kw++)
-        mapfun(kw->name);
-}
-
-JSTokenStream *
-js_NewTokenStream(JSContext *cx, const jschar *base, size_t length,
-                  const char *filename, uintN lineno,
-                  JSPrincipals *principals)
-{
-    JSTokenStream *ts;
-
-    ts = js_NewBufferTokenStream(cx, base, length);
-    if (!ts)
-        return NULL;
-    ts->filename = filename;
-    ts->lineno = lineno;
-    if (principals)
-        JSPRINCIPALS_HOLD(cx, principals);
-    ts->principals = principals;
-    return ts;
-}
-
-#define TBMIN   64
-
-static JSBool
-GrowTokenBuf(JSStringBuffer *sb, size_t newlength)
-{
-    JSContext *cx;
-    jschar *base;
-    ptrdiff_t offset, length;
-    size_t tbsize;
-    JSArenaPool *pool;
-
-    cx = sb->data;
-    base = sb->base;
-    offset = PTRDIFF(sb->ptr, base, jschar);
-    pool = &cx->tempPool;
-    if (!base) {
-        tbsize = TBMIN * sizeof(jschar);
-        length = TBMIN - 1;
-        JS_ARENA_ALLOCATE_CAST(base, jschar *, pool, tbsize);
-    } else {
-        length = PTRDIFF(sb->limit, base, jschar);
-        tbsize = (length + 1) * sizeof(jschar);
-        length += length + 1;
-        JS_ARENA_GROW_CAST(base, jschar *, pool, tbsize, tbsize);
-    }
-    if (!base) {
-        JS_ReportOutOfMemory(cx);
-        sb->base = STRING_BUFFER_ERROR_BASE;
-        return JS_FALSE;
-    }
-    sb->base = base;
-    sb->limit = base + length;
-    sb->ptr = base + offset;
-    return JS_TRUE;
-}
-
-JS_FRIEND_API(JSTokenStream *)
-js_NewBufferTokenStream(JSContext *cx, const jschar *base, size_t length)
-{
-    size_t nb;
-    JSTokenStream *ts;
-
-    nb = sizeof(JSTokenStream) + JS_LINE_LIMIT * sizeof(jschar);
-    JS_ARENA_ALLOCATE_CAST(ts, JSTokenStream *, &cx->tempPool, nb);
-    if (!ts) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-    memset(ts, 0, nb);
-    ts->lineno = 1;
-    ts->linebuf.base = ts->linebuf.limit = ts->linebuf.ptr = (jschar *)(ts + 1);
-    ts->userbuf.base = (jschar *)base;
-    ts->userbuf.limit = (jschar *)base + length;
-    ts->userbuf.ptr = (jschar *)base;
-    ts->tokenbuf.grow = GrowTokenBuf;
-    ts->tokenbuf.data = cx;
-    ts->listener = cx->runtime->sourceHandler;
-    ts->listenerData = cx->runtime->sourceHandlerData;
-    return ts;
-}
-
-JS_FRIEND_API(JSTokenStream *)
-js_NewFileTokenStream(JSContext *cx, const char *filename, FILE *defaultfp)
-{
-    jschar *base;
-    JSTokenStream *ts;
-    FILE *file;
-
-    JS_ARENA_ALLOCATE_CAST(base, jschar *, &cx->tempPool,
-                           JS_LINE_LIMIT * sizeof(jschar));
-    if (!base)
-        return NULL;
-    ts = js_NewBufferTokenStream(cx, base, JS_LINE_LIMIT);
-    if (!ts)
-        return NULL;
-    if (!filename || strcmp(filename, "-") == 0) {
-        file = defaultfp;
-    } else {
-        file = fopen(filename, "r");
-        if (!file) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_OPEN,
-                                 filename, "No such file or directory");
-            return NULL;
-        }
-    }
-    ts->userbuf.ptr = ts->userbuf.limit;
-    ts->file = file;
-    ts->filename = filename;
-    return ts;
-}
-
-JS_FRIEND_API(JSBool)
-js_CloseTokenStream(JSContext *cx, JSTokenStream *ts)
-{
-    if (ts->flags & TSF_OWNFILENAME)
-        JS_free(cx, (void *) ts->filename);
-    if (ts->principals)
-        JSPRINCIPALS_DROP(cx, ts->principals);
-    return !ts->file || fclose(ts->file) == 0;
-}
-
-JS_FRIEND_API(int)
-js_fgets(char *buf, int size, FILE *file)
-{
-    int n, i, c;
-    JSBool crflag;
-
-    n = size - 1;
-    if (n < 0)
-        return -1;
-
-    crflag = JS_FALSE;
-    for (i = 0; i < n && (c = getc(file)) != EOF; i++) {
-        buf[i] = c;
-        if (c == '\n') {        /* any \n ends a line */
-            i++;                /* keep the \n; we know there is room for \0 */
-            break;
-        }
-        if (crflag) {           /* \r not followed by \n ends line at the \r */
-            ungetc(c, file);
-            break;              /* and overwrite c in buf with \0 */
-        }
-        crflag = (c == '\r');
-    }
-
-    buf[i] = '\0';
-    return i;
-}
-
-static int32
-GetChar(JSTokenStream *ts)
-{
-    int32 c;
-    ptrdiff_t i, j, len, olen;
-    JSBool crflag;
-    char cbuf[JS_LINE_LIMIT];
-    jschar *ubuf, *nl;
-
-    if (ts->ungetpos != 0) {
-        c = ts->ungetbuf[--ts->ungetpos];
-    } else {
-        do {
-            if (ts->linebuf.ptr == ts->linebuf.limit) {
-                len = PTRDIFF(ts->userbuf.limit, ts->userbuf.ptr, jschar);
-                if (len <= 0) {
-                    if (!ts->file) {
-                        ts->flags |= TSF_EOF;
-                        return EOF;
-                    }
-
-                    /* Fill ts->userbuf so that \r and \r\n convert to \n. */
-                    crflag = (ts->flags & TSF_CRFLAG) != 0;
-                    len = js_fgets(cbuf, JS_LINE_LIMIT - crflag, ts->file);
-                    if (len <= 0) {
-                        ts->flags |= TSF_EOF;
-                        return EOF;
-                    }
-                    olen = len;
-                    ubuf = ts->userbuf.base;
-                    i = 0;
-                    if (crflag) {
-                        ts->flags &= ~TSF_CRFLAG;
-                        if (cbuf[0] != '\n') {
-                            ubuf[i++] = '\n';
-                            len++;
-                            ts->linepos--;
-                        }
-                    }
-                    for (j = 0; i < len; i++, j++)
-                        ubuf[i] = (jschar) (unsigned char) cbuf[j];
-                    ts->userbuf.limit = ubuf + len;
-                    ts->userbuf.ptr = ubuf;
-                }
-                if (ts->listener) {
-                    ts->listener(ts->filename, ts->lineno, ts->userbuf.ptr, len,
-                                 &ts->listenerTSData, ts->listenerData);
-                }
-
-                nl = ts->saveEOL;
-                if (!nl) {
-                    /*
-                     * Any one of \n, \r, or \r\n ends a line (the longest
-                     * match wins).  Also allow the Unicode line and paragraph
-                     * separators.
-                     */
-                    for (nl = ts->userbuf.ptr; nl < ts->userbuf.limit; nl++) {
-                        /*
-                         * Try to prevent value-testing on most characters by
-                         * filtering out characters that aren't 000x or 202x.
-                         */
-                        if ((*nl & 0xDFD0) == 0) {
-                            if (*nl == '\n')
-                                break;
-                            if (*nl == '\r') {
-                                if (nl + 1 < ts->userbuf.limit && nl[1] == '\n')
-                                    nl++;
-                                break;
-                            }
-                            if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR)
-                                break;
-                        }
-                    }
-                }
-
-                /*
-                 * If there was a line terminator, copy thru it into linebuf.
-                 * Else copy JS_LINE_LIMIT-1 bytes into linebuf.
-                 */
-                if (nl < ts->userbuf.limit)
-                    len = PTRDIFF(nl, ts->userbuf.ptr, jschar) + 1;
-                if (len >= JS_LINE_LIMIT) {
-                    len = JS_LINE_LIMIT - 1;
-                    ts->saveEOL = nl;
-                } else {
-                    ts->saveEOL = NULL;
-                }
-                js_strncpy(ts->linebuf.base, ts->userbuf.ptr, len);
-                ts->userbuf.ptr += len;
-                olen = len;
-
-                /*
-                 * Make sure linebuf contains \n for EOL (don't do this in
-                 * userbuf because the user's string might be readonly).
-                 */
-                if (nl < ts->userbuf.limit) {
-                    if (*nl == '\r') {
-                        if (ts->linebuf.base[len-1] == '\r') {
-                            /*
-                             * Does the line segment end in \r?  We must check
-                             * for a \n at the front of the next segment before
-                             * storing a \n into linebuf.  This case matters
-                             * only when we're reading from a file.
-                             */
-                            if (nl + 1 == ts->userbuf.limit && ts->file) {
-                                len--;
-                                ts->flags |= TSF_CRFLAG; /* clear NLFLAG? */
-                                if (len == 0) {
-                                    /*
-                                     * This can happen when a segment ends in
-                                     * \r\r.  Start over.  ptr == limit in this
-                                     * case, so we'll fall into buffer-filling
-                                     * code.
-                                     */
-                                    return GetChar(ts);
-                                }
-                            } else {
-                                ts->linebuf.base[len-1] = '\n';
-                            }
-                        }
-                    } else if (*nl == '\n') {
-                        if (nl > ts->userbuf.base &&
-                            nl[-1] == '\r' &&
-                            ts->linebuf.base[len-2] == '\r') {
-                            len--;
-                            JS_ASSERT(ts->linebuf.base[len] == '\n');
-                            ts->linebuf.base[len-1] = '\n';
-                        }
-                    } else if (*nl == LINE_SEPARATOR || *nl == PARA_SEPARATOR) {
-                        ts->linebuf.base[len-1] = '\n';
-                    }
-                }
-
-                /* Reset linebuf based on adjusted segment length. */
-                ts->linebuf.limit = ts->linebuf.base + len;
-                ts->linebuf.ptr = ts->linebuf.base;
-
-                /* Update position of linebuf within physical userbuf line. */
-                if (!(ts->flags & TSF_NLFLAG))
-                    ts->linepos += ts->linelen;
-                else
-                    ts->linepos = 0;
-                if (ts->linebuf.limit[-1] == '\n')
-                    ts->flags |= TSF_NLFLAG;
-                else
-                    ts->flags &= ~TSF_NLFLAG;
-
-                /* Update linelen from original segment length. */
-                ts->linelen = olen;
-            }
-            c = *ts->linebuf.ptr++;
-        } while (JS_ISFORMAT(c));
-    }
-    if (c == '\n')
-        ts->lineno++;
-    return c;
-}
-
-static void
-UngetChar(JSTokenStream *ts, int32 c)
-{
-    if (c == EOF)
-        return;
-    JS_ASSERT(ts->ungetpos < sizeof ts->ungetbuf / sizeof ts->ungetbuf[0]);
-    if (c == '\n')
-        ts->lineno--;
-    ts->ungetbuf[ts->ungetpos++] = (jschar)c;
-}
-
-static int32
-PeekChar(JSTokenStream *ts)
-{
-    int32 c;
-
-    c = GetChar(ts);
-    UngetChar(ts, c);
-    return c;
-}
-
-static JSBool
-PeekChars(JSTokenStream *ts, intN n, jschar *cp)
-{
-    intN i, j;
-    int32 c;
-
-    for (i = 0; i < n; i++) {
-        c = GetChar(ts);
-        if (c == EOF)
-            break;
-        cp[i] = (jschar)c;
-    }
-    for (j = i - 1; j >= 0; j--)
-        UngetChar(ts, cp[j]);
-    return i == n;
-}
-
-static void
-SkipChars(JSTokenStream *ts, intN n)
-{
-    while (--n >= 0)
-        GetChar(ts);
-}
-
-static JSBool
-MatchChar(JSTokenStream *ts, int32 expect)
-{
-    int32 c;
-
-    c = GetChar(ts);
-    if (c == expect)
-        return JS_TRUE;
-    UngetChar(ts, c);
-    return JS_FALSE;
-}
-
-static JSBool
-ReportCompileErrorNumber(JSContext *cx, void *handle, uintN flags,
-                         uintN errorNumber, JSErrorReport *report,
-                         JSBool charArgs, va_list ap)
-{
-    JSString *linestr = NULL;
-    JSTokenStream *ts = NULL;
-    JSCodeGenerator *cg = NULL;
-#if JS_HAS_XML_SUPPORT
-    JSParseNode *pn = NULL;
-#endif
-    JSErrorReporter onError;
-    JSTokenPos *tp;
-    JSStackFrame *fp;
-    uintN index;
-    char *message;
-    JSBool warning;
-
-    memset(report, 0, sizeof (struct JSErrorReport));
-    report->flags = flags;
-    report->errorNumber = errorNumber;
-    message = NULL;
-
-    if (!js_ExpandErrorArguments(cx, js_GetErrorMessage, NULL,
-                                 errorNumber, &message, report, &warning,
-                                 charArgs, ap)) {
-        return JS_FALSE;
-    }
-
-    js_AddRoot(cx, &linestr, "error line buffer");
-
-    switch (flags & JSREPORT_HANDLE) {
-      case JSREPORT_TS:
-        ts = handle;
-        break;
-      case JSREPORT_CG:
-        cg = handle;
-        break;
-#if JS_HAS_XML_SUPPORT
-      case JSREPORT_PN:
-        pn = handle;
-        ts = pn->pn_ts;
-        break;
-#endif
-    }
-
-    JS_ASSERT(!ts || ts->linebuf.limit < ts->linebuf.base + JS_LINE_LIMIT);
-    onError = cx->errorReporter;
-    if (onError) {
-        /*
-         * We are typically called with non-null ts and null cg from jsparse.c.
-         * We can be called with null ts from the regexp compilation functions.
-         * The code generator (jsemit.c) may pass null ts and non-null cg.
-         */
-        do {
-            if (ts) {
-                report->filename = ts->filename;
-#if JS_HAS_XML_SUPPORT
-                if (pn) {
-                    report->lineno = pn->pn_pos.begin.lineno;
-                    if (report->lineno != ts->lineno)
-                        break;
-                }
-#endif
-                report->lineno = ts->lineno;
-                linestr = js_NewStringCopyN(cx, ts->linebuf.base,
-                                            PTRDIFF(ts->linebuf.limit,
-                                                    ts->linebuf.base,
-                                                    jschar),
-                                            0);
-                report->linebuf = linestr
-                                 ? JS_GetStringBytes(linestr)
-                                 : NULL;
-                tp = &ts->tokens[(ts->cursor+ts->lookahead) & NTOKENS_MASK].pos;
-#if JS_HAS_XML_SUPPORT
-                if (pn)
-                    tp = &pn->pn_pos;
-#endif
-                index = (tp->begin.lineno == tp->end.lineno)
-                        ? tp->begin.index - ts->linepos
-                        : 0;
-                report->tokenptr = linestr ? report->linebuf + index : NULL;
-                report->uclinebuf = linestr ? JS_GetStringChars(linestr) : NULL;
-                report->uctokenptr = linestr ? report->uclinebuf + index : NULL;
-                break;
-            }
-
-            if (cg) {
-                report->filename = cg->filename;
-                report->lineno = CG_CURRENT_LINE(cg);
-                break;
-            }
-
-            /*
-             * If we can't find out where the error was based on the current frame,
-             * see if the next frame has a script/pc combo we can use.
-             */
-            for (fp = cx->fp; fp; fp = fp->down) {
-                if (fp->script && fp->pc) {
-                    report->filename = fp->script->filename;
-                    report->lineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-                    break;
-                }
-            }
-        } while (0);
-
-#if JS_HAS_ERROR_EXCEPTIONS
-        /*
-         * If there's a runtime exception type associated with this error
-         * number, set that as the pending exception.  For errors occuring at
-         * compile time, this is very likely to be a JSEXN_SYNTAXERR.
-         *
-         * If an exception is thrown but not caught, the JSREPORT_EXCEPTION
-         * flag will be set in report.flags.  Proper behavior for an error
-         * reporter is to ignore a report with this flag for all but top-level
-         * compilation errors.  The exception will remain pending, and so long
-         * as the non-top-level "load", "eval", or "compile" native function
-         * returns false, the top-level reporter will eventually receive the
-         * uncaught exception report.
-         *
-         * XXX it'd probably be best if there was only one call to this
-         * function, but there seem to be two error reporter call points.
-         */
-
-        /*
-         * Try to raise an exception only if there isn't one already set --
-         * otherwise the exception will describe the last compile-time error,
-         * which is likely spurious.
-         */
-        if (!ts || !(ts->flags & TSF_ERROR)) {
-            if (js_ErrorToException(cx, message, report))
-                onError = NULL;
-        }
-
-        /*
-         * Suppress any compile-time errors that don't occur at the top level.
-         * This may still fail, as interplevel may be zero in contexts where we
-         * don't really want to call the error reporter, as when js is called
-         * by other code which could catch the error.
-         */
-        if (cx->interpLevel != 0 && !JSREPORT_IS_WARNING(flags))
-            onError = NULL;
-#endif
-        if (onError) {
-            JSDebugErrorHook hook = cx->runtime->debugErrorHook;
-
-            /*
-             * If debugErrorHook is present then we give it a chance to veto
-             * sending the error on to the regular error reporter.
-             */
-            if (hook && !hook(cx, message, report,
-                              cx->runtime->debugErrorHookData)) {
-                onError = NULL;
-            }
-        }
-        if (onError)
-            (*onError)(cx, message, report);
-    }
-
-    if (message)
-        JS_free(cx, message);
-    if (report->ucmessage)
-        JS_free(cx, (void *)report->ucmessage);
-
-    js_RemoveRoot(cx->runtime, &linestr);
-
-    if (ts && !JSREPORT_IS_WARNING(flags)) {
-        /* Set the error flag to suppress spurious reports. */
-        ts->flags |= TSF_ERROR;
-    }
-
-    return warning;
-}
-
-JSBool
-js_ReportCompileErrorNumber(JSContext *cx, void *handle, uintN flags,
-                            uintN errorNumber, ...)
-{
-    va_list ap;
-    JSErrorReport report;
-    JSBool warning;
-
-    if ((flags & JSREPORT_STRICT) && !JS_HAS_STRICT_OPTION(cx))
-        return JS_TRUE;
-
-    va_start(ap, errorNumber);
-    warning = ReportCompileErrorNumber(cx, handle, flags, errorNumber,
-                                       &report, JS_TRUE, ap);
-    va_end(ap);
-
-    /* 
-     * We have to do this here because js_ReportCompileErrorNumberUC doesn't
-     * need to do this.
-     */
-    if (report.messageArgs) {
-        int i = 0;
-        while (report.messageArgs[i])
-            JS_free(cx, (void *)report.messageArgs[i++]);
-        JS_free(cx, (void *)report.messageArgs);
-    }
-
-    return warning;
-}
-
-JSBool
-js_ReportCompileErrorNumberUC(JSContext *cx, void *handle, uintN flags,
-                              uintN errorNumber, ...)
-{
-    va_list ap;
-    JSErrorReport report;
-    JSBool warning;
-
-    if ((flags & JSREPORT_STRICT) && !JS_HAS_STRICT_OPTION(cx))
-        return JS_TRUE;
- 
-    va_start(ap, errorNumber);
-    warning = ReportCompileErrorNumber(cx, handle, flags, errorNumber,
-                                       &report, JS_FALSE, ap);
-    va_end(ap);
-
-    if (report.messageArgs)
-        JS_free(cx, (void *)report.messageArgs);
-
-    return warning;
-}
-
-static JSBool
-GrowStringBuffer(JSStringBuffer *sb, size_t newlength)
-{
-    ptrdiff_t offset;
-    jschar *bp;
-
-    offset = PTRDIFF(sb->ptr, sb->base, jschar);
-    newlength += offset;
-    bp = (jschar *) realloc(sb->base, (newlength + 1) * sizeof(jschar));
-    if (!bp) {
-        free(sb->base);
-        sb->base = STRING_BUFFER_ERROR_BASE;
-        return JS_FALSE;
-    }
-    sb->base = bp;
-    sb->ptr = bp + offset;
-    sb->limit = bp + newlength;
-    return JS_TRUE;
-}
-
-static void
-FreeStringBuffer(JSStringBuffer *sb)
-{
-    JS_ASSERT(STRING_BUFFER_OK(sb));
-    if (sb->base)
-        free(sb->base);
-}
-
-void
-js_InitStringBuffer(JSStringBuffer *sb)
-{
-    sb->base = sb->limit = sb->ptr = NULL;
-    sb->data = NULL;
-    sb->grow = GrowStringBuffer;
-    sb->free = FreeStringBuffer;
-}
-
-void
-js_FinishStringBuffer(JSStringBuffer *sb)
-{
-    sb->free(sb);
-}
-
-#define ENSURE_STRING_BUFFER(sb,n) \
-    ((sb)->ptr + (n) <= (sb)->limit || sb->grow(sb, n))
-
-static void
-FastAppendChar(JSStringBuffer *sb, jschar c)
-{
-    if (!STRING_BUFFER_OK(sb))
-        return;
-    if (!ENSURE_STRING_BUFFER(sb, 1))
-        return;
-    *sb->ptr++ = c;
-}
-
-void
-js_AppendChar(JSStringBuffer *sb, jschar c)
-{
-    jschar *bp;
-
-    if (!STRING_BUFFER_OK(sb))
-        return;
-    if (!ENSURE_STRING_BUFFER(sb, 1))
-        return;
-    bp = sb->ptr;
-    *bp++ = c;
-    *bp = 0;
-    sb->ptr = bp;
-}
-
-#if JS_HAS_XML_SUPPORT
-
-void
-js_RepeatChar(JSStringBuffer *sb, jschar c, uintN count)
-{
-    jschar *bp;
-
-    if (!STRING_BUFFER_OK(sb) || count == 0)
-        return;
-    if (!ENSURE_STRING_BUFFER(sb, count))
-        return;
-    for (bp = sb->ptr; count; --count)
-        *bp++ = c;
-    *bp = 0;
-    sb->ptr = bp;
-}
-
-void
-js_AppendCString(JSStringBuffer *sb, const char *asciiz)
-{
-    size_t length;
-    jschar *bp;
-
-    if (!STRING_BUFFER_OK(sb) || *asciiz == '\0')
-        return;
-    length = strlen(asciiz);
-    if (!ENSURE_STRING_BUFFER(sb, length))
-        return;
-    for (bp = sb->ptr; length; --length)
-        *bp++ = (jschar) *asciiz++;
-    *bp = 0;
-    sb->ptr = bp;
-}
-
-void
-js_AppendJSString(JSStringBuffer *sb, JSString *str)
-{
-    size_t length;
-    jschar *bp;
-
-    if (!STRING_BUFFER_OK(sb))
-        return;
-    length = JSSTRING_LENGTH(str);
-    if (length == 0 || !ENSURE_STRING_BUFFER(sb, length))
-        return;
-    bp = sb->ptr;
-    js_strncpy(bp, JSSTRING_CHARS(str), length);
-    bp += length;
-    *bp = 0;
-    sb->ptr = bp;
-}
-
-static JSBool
-GetXMLEntity(JSContext *cx, JSTokenStream *ts)
-{
-    ptrdiff_t offset, length, i;
-    int32 c, d;
-    JSBool ispair;
-    jschar *bp, digit;
-    char *bytes;
-    JSErrNum msg;
-
-    /* Put the entity, including the '&' already scanned, in ts->tokenbuf. */
-    offset = PTRDIFF(ts->tokenbuf.ptr, ts->tokenbuf.base, jschar);
-    FastAppendChar(&ts->tokenbuf, '&');
-    while ((c = GetChar(ts)) != ';') {
-        if (c == EOF || c == '\n') {
-            js_ReportCompileErrorNumber(cx, ts,
-                                        JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_END_OF_XML_ENTITY);
-            return JS_FALSE;
-        }
-        FastAppendChar(&ts->tokenbuf, (jschar) c);
-    }
-
-    /* Let length be the number of jschars after the '&', including the ';'. */
-    length = PTRDIFF(ts->tokenbuf.ptr, ts->tokenbuf.base, jschar) - offset;
-    bp = ts->tokenbuf.base + offset;
-    c = d = 0;
-    ispair = JS_FALSE;
-    if (length > 2 && bp[1] == '#') {
-        /* Match a well-formed XML Character Reference. */
-        i = 2;
-        if (length > 3 && JS_TOLOWER(bp[i]) == 'x') {
-            if (length > 9)     /* at most 6 hex digits allowed */
-                goto badncr;
-            while (++i < length) {
-                digit = bp[i];
-                if (!JS7_ISHEX(digit))
-                    goto badncr;
-                c = (c << 4) + JS7_UNHEX(digit);
-            }
-        } else {
-            while (i < length) {
-                digit = bp[i++];
-                if (!JS7_ISDEC(digit))
-                    goto badncr;
-                c = (c * 10) + JS7_UNDEC(digit);
-                if (c < 0)
-                    goto badncr;
-            }
-        }
-
-        if (0x10000 <= c && c <= 0x10FFFF) {
-            /* Form a surrogate pair (c, d) -- c is the high surrogate. */
-            d = 0xDC00 + (c & 0x3FF);
-            c = 0xD7C0 + (c >> 10);
-            ispair = JS_TRUE;
-        } else {
-            /* Enforce the http://www.w3.org/TR/REC-xml/#wf-Legalchar WFC. */
-            if (c != 0x9 && c != 0xA && c != 0xD &&
-                !(0x20 <= c && c <= 0xD7FF) &&
-                !(0xE000 <= c && c <= 0xFFFD)) {
-                goto badncr;
-            }
-        }
-    } else {
-        /* Try to match one of the five XML 1.0 predefined entities. */
-        switch (length) {
-          case 3:
-            if (bp[2] == 't') {
-                if (bp[1] == 'l')
-                    c = '<';
-                else if (bp[1] == 'g')
-                    c = '>';
-            }
-            break;
-          case 4:
-            if (bp[1] == 'a' && bp[2] == 'm' && bp[3] == 'p')
-                c = '&';
-            break;
-          case 5:
-            if (bp[3] == 'o') {
-                if (bp[1] == 'a' && bp[2] == 'p' && bp[4] == 's')
-                    c = '\'';
-                else if (bp[1] == 'q' && bp[2] == 'u' && bp[4] == 't')
-                    c = '"';
-            }
-            break;
-        }
-        if (c == 0) {
-            msg = JSMSG_UNKNOWN_XML_ENTITY;
-            goto bad;
-        }
-    }
-
-    /* If we matched, retract ts->tokenbuf and store the entity's value. */
-    *bp++ = (jschar) c;
-    if (ispair)
-        *bp++ = (jschar) d;
-    *bp = 0;
-    ts->tokenbuf.ptr = bp;
-    return JS_TRUE;
-
-badncr:
-    msg = JSMSG_BAD_XML_NCR;
-bad:
-    /* No match: throw a TypeError per ECMA-357 10.3.2.1 step 8(a). */
-    FastAppendChar(&ts->tokenbuf, ';');
-    bytes = js_DeflateString(cx, bp + 1,
-                             PTRDIFF(ts->tokenbuf.ptr, bp, jschar) - 2);
-    if (bytes) {
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    msg, bytes);
-        JS_free(cx, bytes);
-    }
-    return JS_FALSE;
-}
-
-#endif /* JS_HAS_XML_SUPPORT */
-
-JSTokenType
-js_PeekToken(JSContext *cx, JSTokenStream *ts)
-{
-    JSTokenType tt;
-
-    if (ts->lookahead != 0) {
-        tt = ts->tokens[(ts->cursor + ts->lookahead) & NTOKENS_MASK].type;
-    } else {
-        tt = js_GetToken(cx, ts);
-        js_UngetToken(ts);
-    }
-    return tt;
-}
-
-JSTokenType
-js_PeekTokenSameLine(JSContext *cx, JSTokenStream *ts)
-{
-    JSTokenType tt;
-
-    JS_ASSERT(ts->lookahead == 0 ||
-              ON_CURRENT_LINE(ts, CURRENT_TOKEN(ts).pos) ||
-              ts->tokens[(ts->cursor + ts->lookahead) & NTOKENS_MASK].type
-                  == TOK_EOL);
-    ts->flags |= TSF_NEWLINES;
-    tt = js_PeekToken(cx, ts);
-    ts->flags &= ~TSF_NEWLINES;
-    return tt;
-}
-
-/*
- * We have encountered a '\': check for a Unicode escape sequence after it,
- * returning the character code value if we found a Unicode escape sequence.
- * Otherwise, non-destructively return the original '\'.
- */
-static int32
-GetUnicodeEscape(JSTokenStream *ts)
-{
-    jschar cp[5];
-    int32 c;
-
-    if (PeekChars(ts, 5, cp) && cp[0] == 'u' &&
-        JS7_ISHEX(cp[1]) && JS7_ISHEX(cp[2]) &&
-        JS7_ISHEX(cp[3]) && JS7_ISHEX(cp[4]))
-    {
-        c = (((((JS7_UNHEX(cp[1]) << 4)
-                + JS7_UNHEX(cp[2])) << 4)
-              + JS7_UNHEX(cp[3])) << 4)
-            + JS7_UNHEX(cp[4]);
-        SkipChars(ts, 5);
-        return c;
-    }
-    return '\\';
-}
-
-static JSToken *
-NewToken(JSTokenStream *ts, ptrdiff_t adjust)
-{
-    JSToken *tp;
-
-    ts->cursor = (ts->cursor + 1) & NTOKENS_MASK;
-    tp = &CURRENT_TOKEN(ts);
-    tp->ptr = ts->linebuf.ptr + adjust;
-    tp->pos.begin.index = ts->linepos +
-                          PTRDIFF(tp->ptr, ts->linebuf.base, jschar) -
-                          ts->ungetpos;
-    tp->pos.begin.lineno = tp->pos.end.lineno = (uint16)ts->lineno;
-    return tp;
-}
-
-JSTokenType
-js_GetToken(JSContext *cx, JSTokenStream *ts)
-{
-    JSTokenType tt;
-    int32 c, qc;
-    JSToken *tp;
-    JSAtom *atom;
-    JSBool hadUnicodeEscape;
-
-#define INIT_TOKENBUF()     (ts->tokenbuf.ptr = ts->tokenbuf.base)
-#define NUL_TERM_TOKENBUF() (*ts->tokenbuf.ptr = 0)
-#define TRIM_TOKENBUF(i)    (ts->tokenbuf.ptr = ts->tokenbuf.base + i)
-#define TOKENBUF_LENGTH()   PTRDIFF(ts->tokenbuf.ptr, ts->tokenbuf.base, jschar)
-#define TOKENBUF_BASE()     (ts->tokenbuf.base)
-#define TOKENBUF_CHAR(i)    (ts->tokenbuf.base[i])
-#define TOKENBUF_TO_ATOM()  js_AtomizeChars(cx,                               \
-                                            TOKENBUF_BASE(),                  \
-                                            TOKENBUF_LENGTH(),                \
-                                            0)
-#define ADD_TO_TOKENBUF(c)  FastAppendChar(&ts->tokenbuf, (jschar) (c))
-
-    /* If there was a fatal error, keep returning TOK_ERROR. */
-    if (ts->flags & TSF_ERROR)
-        return TOK_ERROR;
-
-    /* Check for a pushed-back token resulting from mismatching lookahead. */
-    while (ts->lookahead != 0) {
-        JS_ASSERT(!(ts->flags & TSF_XMLTEXTMODE));
-        ts->lookahead--;
-        ts->cursor = (ts->cursor + 1) & NTOKENS_MASK;
-        tt = CURRENT_TOKEN(ts).type;
-        if (tt != TOK_EOL || (ts->flags & TSF_NEWLINES))
-            return tt;
-    }
-
-#if JS_HAS_XML_SUPPORT
-    if (ts->flags & TSF_XMLTEXTMODE) {
-        tt = TOK_XMLSPACE;      /* veto if non-space, return TOK_XMLTEXT */
-        tp = NewToken(ts, 0);
-        INIT_TOKENBUF();
-        qc = (ts->flags & TSF_XMLONLYMODE) ? '<' : '{';
-
-        while ((c = GetChar(ts)) != qc && c != '<' && c != EOF) {
-            if (c == '&' && qc == '<') {
-                if (!GetXMLEntity(cx, ts))
-                    goto error;
-                tt = TOK_XMLTEXT;
-                continue;
-            }
-
-            if (!JS_ISXMLSPACE(c))
-                tt = TOK_XMLTEXT;
-            ADD_TO_TOKENBUF(c);
-        }
-        UngetChar(ts, c);
-
-        if (TOKENBUF_LENGTH() == 0) {
-            atom = NULL;
-        } else {
-            atom = TOKENBUF_TO_ATOM();
-            if (!atom)
-                goto error;
-        }
-        tp->pos.end.lineno = (uint16)ts->lineno;
-        tp->t_op = JSOP_STRING;
-        tp->t_atom = atom;
-        goto out;
-    }
-
-    if (ts->flags & TSF_XMLTAGMODE) {
-        tp = NewToken(ts, 0);
-        c = GetChar(ts);
-        if (JS_ISXMLSPACE(c)) {
-            do {
-                c = GetChar(ts);
-            } while (JS_ISXMLSPACE(c));
-            UngetChar(ts, c);
-            tt = TOK_XMLSPACE;
-            goto out;
-        }
-
-        if (c == EOF) {
-            tt = TOK_EOF;
-            goto out;
-        }
-
-        INIT_TOKENBUF();
-        if (JS_ISXMLNSSTART(c)) {
-            JSBool sawColon = JS_FALSE;
-
-            ADD_TO_TOKENBUF(c);
-            while ((c = GetChar(ts)) != EOF && JS_ISXMLNAME(c)) {
-                if (c == ':') {
-                    int nextc;
-
-                    if (sawColon ||
-                        (nextc = PeekChar(ts),
-                         ((ts->flags & TSF_XMLONLYMODE) || nextc != '{') &&
-                         !JS_ISXMLNAME(nextc))) {
-                        js_ReportCompileErrorNumber(cx, ts,
-                                                    JSREPORT_TS |
-                                                    JSREPORT_ERROR,
-                                                    JSMSG_BAD_XML_QNAME);
-                        goto error;
-                    }
-                    sawColon = JS_TRUE;
-                }
-
-                ADD_TO_TOKENBUF(c);
-            }
-
-            UngetChar(ts, c);
-            atom = TOKENBUF_TO_ATOM();
-            if (!atom)
-                goto error;
-            tp->t_op = JSOP_STRING;
-            tp->t_atom = atom;
-            tt = TOK_XMLNAME;
-            goto out;
-        }
-
-        switch (c) {
-          case '{':
-            if (ts->flags & TSF_XMLONLYMODE)
-                goto bad_xml_char;
-            tt = TOK_LC;
-            goto out;
-
-          case '=':
-            tt = TOK_ASSIGN;
-            goto out;
-
-          case '"':
-          case '\'':
-            qc = c;
-            while ((c = GetChar(ts)) != qc) {
-                if (c == EOF) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_UNTERMINATED_STRING);
-                    goto error;
-                }
-
-                /*
-                 * XML attribute values are double-quoted when pretty-printed,
-                 * so escape " if it is expressed directly in a single-quoted
-                 * attribute value.
-                 */
-                if (c == '"') {
-                    JS_ASSERT(qc == '\'');
-                    js_AppendCString(&ts->tokenbuf, js_quot_entity_str);
-                    continue;
-                }
-
-                if (c == '&' && (ts->flags & TSF_XMLONLYMODE)) {
-                    if (!GetXMLEntity(cx, ts))
-                        goto error;
-                    continue;
-                }
-
-                ADD_TO_TOKENBUF(c);
-            }
-            atom = TOKENBUF_TO_ATOM();
-            if (!atom)
-                goto error;
-            tp->pos.end.lineno = (uint16)ts->lineno;
-            tp->t_op = JSOP_STRING;
-            tp->t_atom = atom;
-            tt = TOK_XMLATTR;
-            goto out;
-
-          case '>':
-            tt = TOK_XMLTAGC;
-            goto out;
-
-          case '/':
-            if (MatchChar(ts, '>')) {
-                tt = TOK_XMLPTAGC;
-                goto out;
-            }
-            /* FALL THROUGH */
-
-          bad_xml_char:
-          default:
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_XML_CHARACTER);
-            goto error;
-        }
-        /* NOTREACHED */
-    }
-#endif /* JS_HAS_XML_SUPPORT */
-
-retry:
-    do {
-        c = GetChar(ts);
-        if (c == '\n') {
-            ts->flags &= ~TSF_DIRTYLINE;
-            if (ts->flags & TSF_NEWLINES)
-                break;
-        }
-    } while (JS_ISSPACE(c));
-
-    tp = NewToken(ts, -1);
-    if (c == EOF) {
-        tt = TOK_EOF;
-        goto out;
-    }
-
-    hadUnicodeEscape = JS_FALSE;
-    if (JS_ISIDSTART(c) ||
-        (c == '\\' &&
-         (c = GetUnicodeEscape(ts),
-          hadUnicodeEscape = JS_ISIDSTART(c)))) {
-        INIT_TOKENBUF();
-        for (;;) {
-            ADD_TO_TOKENBUF(c);
-            c = GetChar(ts);
-            if (c == '\\') {
-                c = GetUnicodeEscape(ts);
-                if (!JS_ISIDENT(c))
-                    break;
-                hadUnicodeEscape = JS_TRUE;
-            } else {
-                if (!JS_ISIDENT(c))
-                    break;
-            }
-        }
-        UngetChar(ts, c);
-
-        atom = TOKENBUF_TO_ATOM();
-        if (!atom)
-            goto error;
-        if (!hadUnicodeEscape && ATOM_KEYWORD(atom)) {
-            struct keyword *kw;
-            
-            JS_ASSERT(!(atom->flags & ATOM_HIDDEN));
-            kw = ATOM_KEYWORD(atom);
-            if (kw->tokentype == TOK_RESERVED) {
-                char buf[MAX_KEYWORD_LENGTH + 1];
-                size_t buflen = sizeof(buf) - 1;
-                if (!js_DeflateStringToBuffer(cx, TOKENBUF_BASE(), TOKENBUF_LENGTH(),
-                                                  buf, &buflen))
-                    goto error;
-                buf [buflen] = 0;
-                if (!js_ReportCompileErrorNumber(cx, ts,
-                                                 JSREPORT_TS |
-                                                 JSREPORT_WARNING |
-                                                 JSREPORT_STRICT,
-                                                 JSMSG_RESERVED_ID, buf)) {
-                    goto error;
-                }
-            } else if (JS_VERSION_IS_ECMA(cx) ||
-                       kw->version <= (cx->version & JSVERSION_MASK)) {
-                tt = kw->tokentype;
-                tp->t_op = (JSOp) kw->op;
-                goto out;
-            }
-        }
-        tp->t_op = JSOP_NAME;
-        tp->t_atom = atom;
-        tt = TOK_NAME;
-        goto out;
-    }
-
-    if (JS7_ISDEC(c) || (c == '.' && JS7_ISDEC(PeekChar(ts)))) {
-        jsint radix;
-        const jschar *endptr;
-        jsdouble dval;
-
-        radix = 10;
-        INIT_TOKENBUF();
-
-        if (c == '0') {
-            ADD_TO_TOKENBUF(c);
-            c = GetChar(ts);
-            if (JS_TOLOWER(c) == 'x') {
-                ADD_TO_TOKENBUF(c);
-                c = GetChar(ts);
-                radix = 16;
-            } else if (JS7_ISDEC(c)) {
-                radix = 8;
-            }
-        }
-
-        while (JS7_ISHEX(c)) {
-            if (radix < 16) {
-                if (JS7_ISLET(c))
-                    break;
-
-                /*
-                 * We permit 08 and 09 as decimal numbers, which makes our
-                 * behaviour a superset of the ECMA numeric grammar.  We might
-                 * not always be so permissive, so we warn about it.
-                 */
-                if (radix == 8 && c >= '8') {
-                    if (!js_ReportCompileErrorNumber(cx, ts,
-                                                     JSREPORT_TS |
-                                                     JSREPORT_WARNING,
-                                                     JSMSG_BAD_OCTAL,
-                                                     c == '8' ? "08" : "09")) {
-                        goto error;
-                    }
-                    radix = 10;
-                }
-            }
-            ADD_TO_TOKENBUF(c);
-            c = GetChar(ts);
-        }
-
-        if (radix == 10 && (c == '.' || JS_TOLOWER(c) == 'e')) {
-            if (c == '.') {
-                do {
-                    ADD_TO_TOKENBUF(c);
-                    c = GetChar(ts);
-                } while (JS7_ISDEC(c));
-            }
-            if (JS_TOLOWER(c) == 'e') {
-                ADD_TO_TOKENBUF(c);
-                c = GetChar(ts);
-                if (c == '+' || c == '-') {
-                    ADD_TO_TOKENBUF(c);
-                    c = GetChar(ts);
-                }
-                if (!JS7_ISDEC(c)) {
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_MISSING_EXPONENT);
-                    goto error;
-                }
-                do {
-                    ADD_TO_TOKENBUF(c);
-                    c = GetChar(ts);
-                } while (JS7_ISDEC(c));
-            }
-        }
-
-        /* Put back the next char and NUL-terminate tokenbuf for js_strto*. */
-        UngetChar(ts, c);
-        ADD_TO_TOKENBUF(0);
-
-        if (radix == 10) {
-            if (!js_strtod(cx, TOKENBUF_BASE(), &endptr, &dval)) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_OUT_OF_MEMORY);
-                goto error;
-            }
-        } else {
-            if (!js_strtointeger(cx, TOKENBUF_BASE(), &endptr, radix, &dval)) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_OUT_OF_MEMORY);
-                goto error;
-            }
-        }
-        tp->t_dval = dval;
-        tt = TOK_NUMBER;
-        goto out;
-    }
-
-    if (c == '"' || c == '\'') {
-        qc = c;
-        INIT_TOKENBUF();
-        while ((c = GetChar(ts)) != qc) {
-            if (c == '\n' || c == EOF) {
-                UngetChar(ts, c);
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_UNTERMINATED_STRING);
-                goto error;
-            }
-            if (c == '\\') {
-                switch (c = GetChar(ts)) {
-                  case 'b': c = '\b'; break;
-                  case 'f': c = '\f'; break;
-                  case 'n': c = '\n'; break;
-                  case 'r': c = '\r'; break;
-                  case 't': c = '\t'; break;
-                  case 'v': c = '\v'; break;
-
-                  default:
-                    if ('0' <= c && c < '8') {
-                        int32 val = JS7_UNDEC(c);
-
-                        c = PeekChar(ts);
-                        if ('0' <= c && c < '8') {
-                            val = 8 * val + JS7_UNDEC(c);
-                            GetChar(ts);
-                            c = PeekChar(ts);
-                            if ('0' <= c && c < '8') {
-                                int32 save = val;
-                                val = 8 * val + JS7_UNDEC(c);
-                                if (val <= 0377)
-                                    GetChar(ts);
-                                else
-                                    val = save;
-                            }
-                        }
-
-                        c = (jschar)val;
-                    } else if (c == 'u') {
-                        jschar cp[4];
-                        if (PeekChars(ts, 4, cp) &&
-                            JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1]) &&
-                            JS7_ISHEX(cp[2]) && JS7_ISHEX(cp[3])) {
-                            c = (((((JS7_UNHEX(cp[0]) << 4)
-                                    + JS7_UNHEX(cp[1])) << 4)
-                                  + JS7_UNHEX(cp[2])) << 4)
-                                + JS7_UNHEX(cp[3]);
-                            SkipChars(ts, 4);
-                        }
-                    } else if (c == 'x') {
-                        jschar cp[2];
-                        if (PeekChars(ts, 2, cp) &&
-                            JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1])) {
-                            c = (JS7_UNHEX(cp[0]) << 4) + JS7_UNHEX(cp[1]);
-                            SkipChars(ts, 2);
-                        }
-                    } else if (c == '\n' && JS_VERSION_IS_ECMA(cx)) {
-                        /* ECMA follows C by removing escaped newlines. */
-                        continue;
-                    }
-                    break;
-                }
-            }
-            ADD_TO_TOKENBUF(c);
-        }
-        atom = TOKENBUF_TO_ATOM();
-        if (!atom)
-            goto error;
-        tp->pos.end.lineno = (uint16)ts->lineno;
-        tp->t_op = JSOP_STRING;
-        tp->t_atom = atom;
-        tt = TOK_STRING;
-        goto out;
-    }
-
-    switch (c) {
-      case '\n': tt = TOK_EOL; goto eol_out;
-      case ';':  tt = TOK_SEMI; break;
-      case '[':  tt = TOK_LB; break;
-      case ']':  tt = TOK_RB; break;
-      case '{':  tt = TOK_LC; break;
-      case '}':  tt = TOK_RC; break;
-      case '(':  tt = TOK_LP; break;
-      case ')':  tt = TOK_RP; break;
-      case ',':  tt = TOK_COMMA; break;
-      case '?':  tt = TOK_HOOK; break;
-
-      case '.':
-#if JS_HAS_XML_SUPPORT
-        if (MatchChar(ts, c))
-            tt = TOK_DBLDOT;
-        else
-#endif
-            tt = TOK_DOT;
-        break;
-
-      case ':':
-#if JS_HAS_XML_SUPPORT
-        if (MatchChar(ts, c)) {
-            tt = TOK_DBLCOLON;
-            break;
-        }
-#endif
-        /*
-         * Default so compiler can modify to JSOP_GETTER if 'p getter: v' in an
-         * object initializer, likewise for setter.
-         */
-        tp->t_op = JSOP_NOP;
-        tt = TOK_COLON;
-        break;
-
-      case '|':
-        if (MatchChar(ts, c)) {
-            tt = TOK_OR;
-        } else if (MatchChar(ts, '=')) {
-            tp->t_op = JSOP_BITOR;
-            tt = TOK_ASSIGN;
-        } else {
-            tt = TOK_BITOR;
-        }
-        break;
-
-      case '^':
-        if (MatchChar(ts, '=')) {
-            tp->t_op = JSOP_BITXOR;
-            tt = TOK_ASSIGN;
-        } else {
-            tt = TOK_BITXOR;
-        }
-        break;
-
-      case '&':
-        if (MatchChar(ts, c)) {
-            tt = TOK_AND;
-        } else if (MatchChar(ts, '=')) {
-            tp->t_op = JSOP_BITAND;
-            tt = TOK_ASSIGN;
-        } else {
-            tt = TOK_BITAND;
-        }
-        break;
-
-      case '=':
-        if (MatchChar(ts, c)) {
-#if JS_HAS_TRIPLE_EQOPS
-            tp->t_op = MatchChar(ts, c) ? JSOP_NEW_EQ : (JSOp)cx->jsop_eq;
-#else
-            tp->t_op = cx->jsop_eq;
-#endif
-            tt = TOK_EQOP;
-        } else {
-            tp->t_op = JSOP_NOP;
-            tt = TOK_ASSIGN;
-        }
-        break;
-
-      case '!':
-        if (MatchChar(ts, '=')) {
-#if JS_HAS_TRIPLE_EQOPS
-            tp->t_op = MatchChar(ts, '=') ? JSOP_NEW_NE : (JSOp)cx->jsop_ne;
-#else
-            tp->t_op = cx->jsop_ne;
-#endif
-            tt = TOK_EQOP;
-        } else {
-            tp->t_op = JSOP_NOT;
-            tt = TOK_UNARYOP;
-        }
-        break;
-
-#if JS_HAS_XML_SUPPORT
-      case '@':
-        tt = TOK_AT;
-        break;
-#endif
-
-      case '<':
-#if JS_HAS_XML_SUPPORT
-        /*
-         * After much testing, it's clear that Postel's advice to protocol
-         * designers ("be liberal in what you accept, and conservative in what
-         * you send") invites a natural-law repercussion for JS as "protocol":
-         *
-         * "If you are liberal in what you accept, others will utterly fail to
-         *  be conservative in what they send."
-         *
-         * Which means you will get <!-- comments to end of line in the middle
-         * of .js files, and after if conditions whose then statements are on
-         * the next line, and other wonders.  See at least the following bugs:
-         * https://bugzilla.mozilla.org/show_bug.cgi?id=309242
-         * https://bugzilla.mozilla.org/show_bug.cgi?id=309712
-         * https://bugzilla.mozilla.org/show_bug.cgi?id=310993
-         *
-         * So without JSOPTION_XML, we never scan an XML comment or CDATA
-         * literal.  We always scan <! as the start of an HTML comment hack
-         * to end of line, used since Netscape 2 to hide script tag content
-         * from script-unaware browsers.
-         */
-        if ((ts->flags & TSF_OPERAND) &&
-            (JS_HAS_XML_OPTION(cx) || PeekChar(ts) != '!')) {
-            /* Check for XML comment or CDATA section. */
-            if (MatchChar(ts, '!')) {
-                INIT_TOKENBUF();
-
-                /* Scan XML comment. */
-                if (MatchChar(ts, '-')) {
-                    if (!MatchChar(ts, '-'))
-                        goto bad_xml_markup;
-                    while ((c = GetChar(ts)) != '-' || !MatchChar(ts, '-')) {
-                        if (c == EOF)
-                            goto bad_xml_markup;
-                        ADD_TO_TOKENBUF(c);
-                    }
-                    tt = TOK_XMLCOMMENT;
-                    tp->t_op = JSOP_XMLCOMMENT;
-                    goto finish_xml_markup;
-                }
-
-                /* Scan CDATA section. */
-                if (MatchChar(ts, '[')) {
-                    jschar cp[6];
-                    if (PeekChars(ts, 6, cp) &&
-                        cp[0] == 'C' &&
-                        cp[1] == 'D' &&
-                        cp[2] == 'A' &&
-                        cp[3] == 'T' &&
-                        cp[4] == 'A' &&
-                        cp[5] == '[') {
-                        SkipChars(ts, 6);
-                        while ((c = GetChar(ts)) != ']' ||
-                               !PeekChars(ts, 2, cp) ||
-                               cp[0] != ']' ||
-                               cp[1] != '>') {
-                            if (c == EOF)
-                                goto bad_xml_markup;
-                            ADD_TO_TOKENBUF(c);
-                        }
-                        GetChar(ts);            /* discard ] but not > */
-                        tt = TOK_XMLCDATA;
-                        tp->t_op = JSOP_XMLCDATA;
-                        goto finish_xml_markup;
-                    }
-                    goto bad_xml_markup;
-                }
-            }
-
-            /* Check for processing instruction. */
-            if (MatchChar(ts, '?')) {
-                JSBool inTarget = JS_TRUE;
-                size_t targetLength = 0;
-                ptrdiff_t contentIndex = -1;
-
-                INIT_TOKENBUF();
-                while ((c = GetChar(ts)) != '?' || PeekChar(ts) != '>') {
-                    if (c == EOF)
-                        goto bad_xml_markup;
-                    if (inTarget) {
-                        if (JS_ISXMLSPACE(c)) {
-                            if (TOKENBUF_LENGTH() == 0)
-                                goto bad_xml_markup;
-                            inTarget = JS_FALSE;
-                        } else {
-                            if (!((TOKENBUF_LENGTH() == 0)
-                                  ? JS_ISXMLNSSTART(c)
-                                  : JS_ISXMLNS(c))) {
-                                goto bad_xml_markup;
-                            }
-                            ++targetLength;
-                        }
-                    } else {
-                        if (contentIndex < 0 && !JS_ISXMLSPACE(c))
-                            contentIndex = TOKENBUF_LENGTH();
-                    }
-                    ADD_TO_TOKENBUF(c);
-                }
-                if (contentIndex < 0) {
-                    atom = cx->runtime->atomState.emptyAtom;
-                } else {
-                    atom = js_AtomizeChars(cx,
-                                           &TOKENBUF_CHAR(contentIndex),
-                                           TOKENBUF_LENGTH() - contentIndex,
-                                           0);
-                    if (!atom)
-                        goto error;
-                    TRIM_TOKENBUF(targetLength);
-                }
-                tp->t_atom2 = atom;
-                tt = TOK_XMLPI;
-
-        finish_xml_markup:
-                if (!MatchChar(ts, '>'))
-                    goto bad_xml_markup;
-                atom = TOKENBUF_TO_ATOM();
-                if (!atom)
-                    goto error;
-                tp->t_atom = atom;
-                tp->pos.end.lineno = (uint16)ts->lineno;
-                goto out;
-            }
-
-            /* An XML start-of-tag character. */
-            tt = MatchChar(ts, '/') ? TOK_XMLETAGO : TOK_XMLSTAGO;
-            goto out;
-
-        bad_xml_markup:
-            js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_BAD_XML_MARKUP);
-            goto error;
-        }
-#endif /* JS_HAS_XML_SUPPORT */
-
-        /* NB: treat HTML begin-comment as comment-till-end-of-line */
-        if (MatchChar(ts, '!')) {
-            if (MatchChar(ts, '-')) {
-                if (MatchChar(ts, '-')) {
-                    ts->flags |= TSF_IN_HTML_COMMENT;
-                    goto skipline;
-                }
-                UngetChar(ts, '-');
-            }
-            UngetChar(ts, '!');
-        }
-        if (MatchChar(ts, c)) {
-            tp->t_op = JSOP_LSH;
-            tt = MatchChar(ts, '=') ? TOK_ASSIGN : TOK_SHOP;
-        } else {
-            tp->t_op = MatchChar(ts, '=') ? JSOP_LE : JSOP_LT;
-            tt = TOK_RELOP;
-        }
-        break;
-
-      case '>':
-        if (MatchChar(ts, c)) {
-            tp->t_op = MatchChar(ts, c) ? JSOP_URSH : JSOP_RSH;
-            tt = MatchChar(ts, '=') ? TOK_ASSIGN : TOK_SHOP;
-        } else {
-            tp->t_op = MatchChar(ts, '=') ? JSOP_GE : JSOP_GT;
-            tt = TOK_RELOP;
-        }
-        break;
-
-      case '*':
-        tp->t_op = JSOP_MUL;
-        tt = MatchChar(ts, '=') ? TOK_ASSIGN : TOK_STAR;
-        break;
-
-      case '/':
-        if (MatchChar(ts, '/')) {
-            /*
-             * Hack for source filters such as the Mozilla XUL preprocessor:
-             * "//@line 123\n" sets the number of the *next* line after the
-             * comment to 123.
-             */
-            if (JS_HAS_ATLINE_OPTION(cx)) {
-                jschar cp[5];
-                uintN i, line, temp;
-                char filename[1024];
-
-                if (PeekChars(ts, 5, cp) &&
-                    cp[0] == '@' &&
-                    cp[1] == 'l' &&
-                    cp[2] == 'i' &&
-                    cp[3] == 'n' &&
-                    cp[4] == 'e') {
-                    SkipChars(ts, 5);
-                    while ((c = GetChar(ts)) != '\n' && JS_ISSPACE(c))
-                        continue;
-                    if (JS7_ISDEC(c)) {
-                        line = JS7_UNDEC(c);
-                        while ((c = GetChar(ts)) != EOF && JS7_ISDEC(c)) {
-                            temp = 10 * line + JS7_UNDEC(c);
-                            if (temp < line) {
-                                /* Ignore overlarge line numbers. */
-                                goto skipline;
-                            }
-                            line = temp;
-                        }
-                        while (c != '\n' && JS_ISSPACE(c))
-                            c = GetChar(ts);
-                        i = 0;
-                        if (c == '"') {
-                            while ((c = GetChar(ts)) != EOF && c != '"') {
-                                if (c == '\n') {
-                                    UngetChar(ts, c);
-                                    goto skipline;
-                                }
-                                if ((c >> 8) != 0 || i >= sizeof filename - 1)
-                                    goto skipline;
-                                filename[i++] = (char) c;
-                            }
-                            if (c == '"') {
-                                while ((c = GetChar(ts)) != '\n' &&
-                                       JS_ISSPACE(c)) {
-                                    continue;
-                                }
-                            }
-                        }
-                        filename[i] = '\0';
-                        if (c == '\n') {
-                            if (i > 0) {
-                                if (ts->flags & TSF_OWNFILENAME)
-                                    JS_free(cx, (void *) ts->filename);
-                                ts->filename = JS_strdup(cx, filename);
-                                if (!ts->filename)
-                                    goto error;
-                                ts->flags |= TSF_OWNFILENAME;
-                            }
-                            ts->lineno = line;
-                        }
-                    }
-                    UngetChar(ts, c);
-                }
-            }
-
-skipline:
-            /* Optimize line skipping if we are not in an HTML comment. */
-            if (ts->flags & TSF_IN_HTML_COMMENT) {
-                while ((c = GetChar(ts)) != EOF && c != '\n') {
-                    if (c == '-' && MatchChar(ts, '-') && MatchChar(ts, '>'))
-                        ts->flags &= ~TSF_IN_HTML_COMMENT;
-                }
-            } else {
-                while ((c = GetChar(ts)) != EOF && c != '\n')
-                    continue;
-            }
-            UngetChar(ts, c);
-            ts->cursor = (ts->cursor - 1) & NTOKENS_MASK;
-            goto retry;
-        }
-
-        if (MatchChar(ts, '*')) {
-            while ((c = GetChar(ts)) != EOF &&
-                   !(c == '*' && MatchChar(ts, '/'))) {
-                /* Ignore all characters until comment close. */
-            }
-            if (c == EOF) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_UNTERMINATED_COMMENT);
-                goto error;
-            }
-            ts->cursor = (ts->cursor - 1) & NTOKENS_MASK;
-            goto retry;
-        }
-
-#if JS_HAS_REGEXPS
-        if (ts->flags & TSF_OPERAND) {
-            JSObject *obj;
-            uintN flags;
-            JSBool inCharClass = JS_FALSE;
-
-            INIT_TOKENBUF();
-            for (;;) {
-                c = GetChar(ts);
-                if (c == '\n' || c == EOF) {
-                    UngetChar(ts, c);
-                    js_ReportCompileErrorNumber(cx, ts,
-                                                JSREPORT_TS | JSREPORT_ERROR,
-                                                JSMSG_UNTERMINATED_REGEXP);
-                    goto error;
-                }
-                if (c == '\\') {
-                    ADD_TO_TOKENBUF(c);
-                    c = GetChar(ts);
-                } else if (c == '[') {
-                    inCharClass = JS_TRUE;
-                } else if (c == ']') {
-                    inCharClass = JS_FALSE;
-                } else if (c == '/' && !inCharClass) {
-                    /* For compat with IE, allow unescaped / in char classes. */
-                    break;
-                }
-                ADD_TO_TOKENBUF(c);
-            }
-            for (flags = 0; ; ) {
-                if (MatchChar(ts, 'g'))
-                    flags |= JSREG_GLOB;
-                else if (MatchChar(ts, 'i'))
-                    flags |= JSREG_FOLD;
-                else if (MatchChar(ts, 'm'))
-                    flags |= JSREG_MULTILINE;
-                else
-                    break;
-            }
-            c = PeekChar(ts);
-            if (JS7_ISLET(c)) {
-                tp->ptr = ts->linebuf.ptr - 1;
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_BAD_REGEXP_FLAG);
-                (void) GetChar(ts);
-                goto error;
-            }
-            /* XXXbe fix jsregexp.c so it doesn't depend on NUL termination */
-            NUL_TERM_TOKENBUF();
-            obj = js_NewRegExpObject(cx, ts,
-                                     TOKENBUF_BASE(),
-                                     TOKENBUF_LENGTH(),
-                                     flags);
-            if (!obj)
-                goto error;
-            atom = js_AtomizeObject(cx, obj, 0);
-            if (!atom)
-                goto error;
-
-            /*
-             * If the regexp's script is one-shot, we can avoid the extra
-             * fork-on-exec costs of JSOP_REGEXP by selecting JSOP_OBJECT.
-             * Otherwise, to avoid incorrect proto, parent, and lastIndex
-             * sharing among threads and sequentially across re-execution,
-             * select JSOP_REGEXP.
-             */
-            tp->t_op = (cx->fp->flags & (JSFRAME_EVAL | JSFRAME_COMPILE_N_GO))
-                       ? JSOP_OBJECT
-                       : JSOP_REGEXP;
-            tp->t_atom = atom;
-            tt = TOK_OBJECT;
-            break;
-        }
-#endif /* JS_HAS_REGEXPS */
-
-        tp->t_op = JSOP_DIV;
-        tt = MatchChar(ts, '=') ? TOK_ASSIGN : TOK_DIVOP;
-        break;
-
-      case '%':
-        tp->t_op = JSOP_MOD;
-        tt = MatchChar(ts, '=') ? TOK_ASSIGN : TOK_DIVOP;
-        break;
-
-      case '~':
-        tp->t_op = JSOP_BITNOT;
-        tt = TOK_UNARYOP;
-        break;
-
-      case '+':
-        if (MatchChar(ts, '=')) {
-            tp->t_op = JSOP_ADD;
-            tt = TOK_ASSIGN;
-        } else if (MatchChar(ts, c)) {
-            tt = TOK_INC;
-        } else {
-            tp->t_op = JSOP_POS;
-            tt = TOK_PLUS;
-        }
-        break;
-
-      case '-':
-        if (MatchChar(ts, '=')) {
-            tp->t_op = JSOP_SUB;
-            tt = TOK_ASSIGN;
-        } else if (MatchChar(ts, c)) {
-            if (PeekChar(ts) == '>' && !(ts->flags & TSF_DIRTYLINE)) {
-                ts->flags &= ~TSF_IN_HTML_COMMENT;
-                goto skipline;
-            }
-            tt = TOK_DEC;
-        } else {
-            tp->t_op = JSOP_NEG;
-            tt = TOK_MINUS;
-        }
-        break;
-
-#if JS_HAS_SHARP_VARS
-      case '#':
-      {
-        uint32 n;
-
-        c = GetChar(ts);
-        if (!JS7_ISDEC(c)) {
-            UngetChar(ts, c);
-            goto badchar;
-        }
-        n = (uint32)JS7_UNDEC(c);
-        for (;;) {
-            c = GetChar(ts);
-            if (!JS7_ISDEC(c))
-                break;
-            n = 10 * n + JS7_UNDEC(c);
-            if (n >= ATOM_INDEX_LIMIT) {
-                js_ReportCompileErrorNumber(cx, ts,
-                                            JSREPORT_TS | JSREPORT_ERROR,
-                                            JSMSG_SHARPVAR_TOO_BIG);
-                goto error;
-            }
-        }
-        tp->t_dval = (jsdouble) n;
-        if (JS_HAS_STRICT_OPTION(cx) &&
-            (c == '=' || c == '#')) {
-            char buf[20];
-            JS_snprintf(buf, sizeof buf, "#%u%c", n, c);
-            if (!js_ReportCompileErrorNumber(cx, ts,
-                                             JSREPORT_TS |
-                                             JSREPORT_WARNING |
-                                             JSREPORT_STRICT,
-                                             JSMSG_DEPRECATED_USAGE,
-                                             buf)) {
-                goto error;
-            }
-        }
-        if (c == '=')
-            tt = TOK_DEFSHARP;
-        else if (c == '#')
-            tt = TOK_USESHARP;
-        else
-            goto badchar;
-        break;
-      }
-#endif /* JS_HAS_SHARP_VARS */
-
-#if JS_HAS_SHARP_VARS || JS_HAS_XML_SUPPORT
-      badchar:
-#endif
-
-      default:
-        js_ReportCompileErrorNumber(cx, ts, JSREPORT_TS | JSREPORT_ERROR,
-                                    JSMSG_ILLEGAL_CHARACTER);
-        goto error;
-    }
-
-out:
-    JS_ASSERT(tt != TOK_EOL);
-    ts->flags |= TSF_DIRTYLINE;
-
-eol_out:
-    if (!STRING_BUFFER_OK(&ts->tokenbuf))
-        tt = TOK_ERROR;
-    JS_ASSERT(tt < TOK_LIMIT);
-    tp->pos.end.index = ts->linepos +
-                        PTRDIFF(ts->linebuf.ptr, ts->linebuf.base, jschar) -
-                        ts->ungetpos;
-    tp->type = tt;
-    return tt;
-
-error:
-    tt = TOK_ERROR;
-    ts->flags |= TSF_ERROR;
-    goto out;
-
-#undef INIT_TOKENBUF
-#undef TRIM_TOKENBUF
-#undef TOKENBUF_LENGTH
-#undef TOKENBUF_BASE
-#undef TOKENBUF_CHAR
-#undef TOKENBUF_TO_ATOM
-#undef ADD_TO_TOKENBUF
-}
-
-void
-js_UngetToken(JSTokenStream *ts)
-{
-    JS_ASSERT(ts->lookahead < NTOKENS_MASK);
-    if (ts->flags & TSF_ERROR)
-        return;
-    ts->lookahead++;
-    ts->cursor = (ts->cursor - 1) & NTOKENS_MASK;
-}
-
-JSBool
-js_MatchToken(JSContext *cx, JSTokenStream *ts, JSTokenType tt)
-{
-    if (js_GetToken(cx, ts) == tt)
-        return JS_TRUE;
-    js_UngetToken(ts);
-    return JS_FALSE;
-}
diff --git a/libs/js/src/jsscan.h b/libs/js/src/jsscan.h
deleted file mode 100644
index ee39bbc0af..0000000000
--- a/libs/js/src/jsscan.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsscan_h___
-#define jsscan_h___
-/*
- * JS lexical scanner interface.
- */
-#include <stddef.h>
-#include <stdio.h>
-#include "jsopcode.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-typedef enum JSTokenType {
-    TOK_ERROR = -1,                     /* well-known as the only code < EOF */
-    TOK_EOF = 0,                        /* end of file */
-    TOK_EOL = 1,                        /* end of line */
-    TOK_SEMI = 2,                       /* semicolon */
-    TOK_COMMA = 3,                      /* comma operator */
-    TOK_ASSIGN = 4,                     /* assignment ops (= += -= etc.) */
-    TOK_HOOK = 5, TOK_COLON = 6,        /* conditional (?:) */
-    TOK_OR = 7,                         /* logical or (||) */
-    TOK_AND = 8,                        /* logical and (&&) */
-    TOK_BITOR = 9,                      /* bitwise-or (|) */
-    TOK_BITXOR = 10,                    /* bitwise-xor (^) */
-    TOK_BITAND = 11,                    /* bitwise-and (&) */
-    TOK_EQOP = 12,                      /* equality ops (== !=) */
-    TOK_RELOP = 13,                     /* relational ops (< <= > >=) */
-    TOK_SHOP = 14,                      /* shift ops (<< >> >>>) */
-    TOK_PLUS = 15,                      /* plus */
-    TOK_MINUS = 16,                     /* minus */
-    TOK_STAR = 17, TOK_DIVOP = 18,      /* multiply/divide ops (* / %) */
-    TOK_UNARYOP = 19,                   /* unary prefix operator */
-    TOK_INC = 20, TOK_DEC = 21,         /* increment/decrement (++ --) */
-    TOK_DOT = 22,                       /* member operator (.) */
-    TOK_LB = 23, TOK_RB = 24,           /* left and right brackets */
-    TOK_LC = 25, TOK_RC = 26,           /* left and right curlies (braces) */
-    TOK_LP = 27, TOK_RP = 28,           /* left and right parentheses */
-    TOK_NAME = 29,                      /* identifier */
-    TOK_NUMBER = 30,                    /* numeric constant */
-    TOK_STRING = 31,                    /* string constant */
-    TOK_OBJECT = 32,                    /* RegExp or other object constant */
-    TOK_PRIMARY = 33,                   /* true, false, null, this, super */
-    TOK_FUNCTION = 34,                  /* function keyword */
-    TOK_EXPORT = 35,                    /* export keyword */
-    TOK_IMPORT = 36,                    /* import keyword */
-    TOK_IF = 37,                        /* if keyword */
-    TOK_ELSE = 38,                      /* else keyword */
-    TOK_SWITCH = 39,                    /* switch keyword */
-    TOK_CASE = 40,                      /* case keyword */
-    TOK_DEFAULT = 41,                   /* default keyword */
-    TOK_WHILE = 42,                     /* while keyword */
-    TOK_DO = 43,                        /* do keyword */
-    TOK_FOR = 44,                       /* for keyword */
-    TOK_BREAK = 45,                     /* break keyword */
-    TOK_CONTINUE = 46,                  /* continue keyword */
-    TOK_IN = 47,                        /* in keyword */
-    TOK_VAR = 48,                       /* var keyword */
-    TOK_WITH = 49,                      /* with keyword */
-    TOK_RETURN = 50,                    /* return keyword */
-    TOK_NEW = 51,                       /* new keyword */
-    TOK_DELETE = 52,                    /* delete keyword */
-    TOK_DEFSHARP = 53,                  /* #n= for object/array initializers */
-    TOK_USESHARP = 54,                  /* #n# for object/array initializers */
-    TOK_TRY = 55,                       /* try keyword */
-    TOK_CATCH = 56,                     /* catch keyword */
-    TOK_FINALLY = 57,                   /* finally keyword */
-    TOK_THROW = 58,                     /* throw keyword */
-    TOK_INSTANCEOF = 59,                /* instanceof keyword */
-    TOK_DEBUGGER = 60,                  /* debugger keyword */
-    TOK_XMLSTAGO = 61,                  /* XML start tag open (<) */
-    TOK_XMLETAGO = 62,                  /* XML end tag open (</) */
-    TOK_XMLPTAGC = 63,                  /* XML point tag close (/>) */
-    TOK_XMLTAGC = 64,                   /* XML start or end tag close (>) */
-    TOK_XMLNAME = 65,                   /* XML start-tag non-final fragment */
-    TOK_XMLATTR = 66,                   /* XML quoted attribute value */
-    TOK_XMLSPACE = 67,                  /* XML whitespace */
-    TOK_XMLTEXT = 68,                   /* XML text */
-    TOK_XMLCOMMENT = 69,                /* XML comment */
-    TOK_XMLCDATA = 70,                  /* XML CDATA section */
-    TOK_XMLPI = 71,                     /* XML processing instruction */
-    TOK_AT = 72,                        /* XML attribute op (@) */
-    TOK_DBLCOLON = 73,                  /* namespace qualified name op (::) */
-    TOK_ANYNAME = 74,                   /* XML AnyName singleton (*) */
-    TOK_DBLDOT = 75,                    /* XML descendant op (..) */
-    TOK_FILTER = 76,                    /* XML filtering predicate op (.()) */
-    TOK_XMLELEM = 77,                   /* XML element node type (no token) */
-    TOK_XMLLIST = 78,                   /* XML list node type (no token) */
-    TOK_RESERVED,                       /* reserved keywords */
-    TOK_LIMIT                           /* domain size */
-} JSTokenType;
-
-#define IS_PRIMARY_TOKEN(tt) \
-    ((uintN)((tt) - TOK_NAME) <= (uintN)(TOK_PRIMARY - TOK_NAME))
-
-#define TOKEN_TYPE_IS_XML(tt) \
-    (tt == TOK_AT || tt == TOK_DBLCOLON || tt == TOK_ANYNAME)
-
-struct JSStringBuffer {
-    jschar      *base;
-    jschar      *limit;         /* length limit for quick bounds check */
-    jschar      *ptr;           /* slot for next non-NUL char to store */
-    void        *data;
-    JSBool      (*grow)(JSStringBuffer *sb, size_t newlength);
-    void        (*free)(JSStringBuffer *sb);
-};
-
-#define STRING_BUFFER_ERROR_BASE        ((jschar *) 1)
-#define STRING_BUFFER_OK(sb)            ((sb)->base != STRING_BUFFER_ERROR_BASE)
-#define STRING_BUFFER_OFFSET(sb)        ((sb)->ptr -(sb)->base)
-
-extern void
-js_InitStringBuffer(JSStringBuffer *sb);
-
-extern void
-js_FinishStringBuffer(JSStringBuffer *sb);
-
-extern void
-js_AppendChar(JSStringBuffer *sb, jschar c);
-
-extern void
-js_RepeatChar(JSStringBuffer *sb, jschar c, uintN count);
-
-extern void
-js_AppendCString(JSStringBuffer *sb, const char *asciiz);
-
-extern void
-js_AppendJSString(JSStringBuffer *sb, JSString *str);
-
-struct JSTokenPtr {
-    uint16              index;          /* index of char in physical line */
-    uint16              lineno;         /* physical line number */
-};
-
-struct JSTokenPos {
-    JSTokenPtr          begin;          /* first character and line of token */
-    JSTokenPtr          end;            /* index 1 past last char, last line */
-};
-
-struct JSToken {
-    JSTokenType         type;           /* char value or above enumerator */
-    JSTokenPos          pos;            /* token position in file */
-    jschar              *ptr;           /* beginning of token in line buffer */
-    union {
-        struct {                        /* non-numeric literal */
-            JSOp        op;             /* operator, for minimal parser */
-            JSAtom      *atom;          /* atom table entry */
-        } s;
-        struct {                        /* atom pair, for XML PIs */
-            JSAtom      *atom2;         /* auxiliary atom table entry */
-            JSAtom      *atom;          /* main atom table entry */
-        } p;
-        jsdouble        dval;           /* floating point number */
-    } u;
-};
-
-#define t_op            u.s.op
-#define t_atom          u.s.atom
-#define t_atom2         u.p.atom2
-#define t_dval          u.dval
-
-typedef struct JSTokenBuf {
-    jschar              *base;          /* base of line or stream buffer */
-    jschar              *limit;         /* limit for quick bounds check */
-    jschar              *ptr;           /* next char to get, or slot to use */
-} JSTokenBuf;
-
-#define JS_LINE_LIMIT   256             /* logical line buffer size limit --
-                                           physical line length is unlimited */
-#define NTOKENS         4               /* 1 current + 2 lookahead, rounded */
-#define NTOKENS_MASK    (NTOKENS-1)     /* to power of 2 to avoid divmod by 3 */
-
-struct JSTokenStream {
-    JSToken             tokens[NTOKENS];/* circular token buffer */
-    uintN               cursor;         /* index of last parsed token */
-    uintN               lookahead;      /* count of lookahead tokens */
-    uintN               lineno;         /* current line number */
-    uintN               ungetpos;       /* next free char slot in ungetbuf */
-    jschar              ungetbuf[6];    /* at most 6, for \uXXXX lookahead */
-    uintN               flags;          /* flags -- see below */
-    ptrdiff_t           linelen;        /* physical linebuf segment length */
-    ptrdiff_t           linepos;        /* linebuf offset in physical line */
-    JSTokenBuf          linebuf;        /* line buffer for diagnostics */
-    JSTokenBuf          userbuf;        /* user input buffer if !file */
-    JSStringBuffer      tokenbuf;       /* current token string buffer */
-    const char          *filename;      /* input filename or null */
-    FILE                *file;          /* stdio stream if reading from file */
-    JSPrincipals        *principals;    /* principals associated with source */
-    JSSourceHandler     listener;       /* callback for source; eg debugger */
-    void                *listenerData;  /* listener 'this' data */
-    void                *listenerTSData;/* listener data for this TokenStream */
-    jschar              *saveEOL;       /* save next end of line in userbuf, to
-                                           optimize for very long lines */
-};
-
-#define CURRENT_TOKEN(ts)       ((ts)->tokens[(ts)->cursor])
-#define ON_CURRENT_LINE(ts,pos) ((uint16)(ts)->lineno == (pos).end.lineno)
-
-/* JSTokenStream flags */
-#define TSF_ERROR       0x01            /* fatal error while compiling */
-#define TSF_EOF         0x02            /* hit end of file */
-#define TSF_NEWLINES    0x04            /* tokenize newlines */
-#define TSF_OPERAND     0x08            /* looking for operand, not operator */
-#define TSF_NLFLAG      0x20            /* last linebuf ended with \n */
-#define TSF_CRFLAG      0x40            /* linebuf would have ended with \r */
-#define TSF_DIRTYLINE   0x80            /* non-whitespace since start of line */
-#define TSF_OWNFILENAME 0x100           /* ts->filename is malloc'd */
-#define TSF_XMLTAGMODE  0x200           /* scanning within an XML tag in E4X */
-#define TSF_XMLTEXTMODE 0x400           /* scanning XMLText terminal from E4X */
-#define TSF_XMLONLYMODE 0x800           /* don't scan {expr} within text/tag */
-
-/* Flag indicating unexpected end of input, i.e. TOK_EOF not at top-level. */
-#define TSF_UNEXPECTED_EOF 0x1000
-
-/*
- * To handle the hard case of contiguous HTML comments, we want to clear the
- * TSF_DIRTYINPUT flag at the end of each such comment.  But we'd rather not
- * scan for --> within every //-style comment unless we have to.  So we set
- * TSF_IN_HTML_COMMENT when a <!-- is scanned as an HTML begin-comment, and
- * clear it (and TSF_DIRTYINPUT) when we scan --> either on a clean line, or
- * only if (ts->flags & TSF_IN_HTML_COMMENT), in a //-style comment.
- *
- * This still works as before given a malformed comment hiding hack such as:
- *
- *    <script>
- *      <!-- comment hiding hack #1
- *      code goes here
- *      // --> oops, markup for script-unaware browsers goes here!
- *    </script>
- *
- * It does not cope with malformed comment hiding hacks where --> is hidden
- * by C-style comments, or on a dirty line.  Such cases are already broken.
- */
-#define TSF_IN_HTML_COMMENT 0x2000
-
-/* Unicode separators that are treated as line terminators, in addition to \n, \r */
-#define LINE_SEPARATOR  0x2028
-#define PARA_SEPARATOR  0x2029
-
-/*
- * Create a new token stream, either from an input buffer or from a file.
- * Return null on file-open or memory-allocation failure.
- *
- * NB: All of js_New{,Buffer,File}TokenStream() return a pointer to transient
- * memory in the current context's temp pool.  This memory is deallocated via
- * JS_ARENA_RELEASE() after parsing is finished.
- */
-extern JSTokenStream *
-js_NewTokenStream(JSContext *cx, const jschar *base, size_t length,
-                  const char *filename, uintN lineno, JSPrincipals *principals);
-
-extern JS_FRIEND_API(JSTokenStream *)
-js_NewBufferTokenStream(JSContext *cx, const jschar *base, size_t length);
-
-extern JS_FRIEND_API(JSTokenStream *)
-js_NewFileTokenStream(JSContext *cx, const char *filename, FILE *defaultfp);
-
-extern JS_FRIEND_API(JSBool)
-js_CloseTokenStream(JSContext *cx, JSTokenStream *ts);
-
-extern JS_FRIEND_API(int)
-js_fgets(char *buf, int size, FILE *file);
-
-/*
- * Initialize the scanner, installing JS keywords into cx's global scope.
- */
-extern JSBool
-js_InitScanner(JSContext *cx);
-
-/*
- * Friend-exported API entry point to call a mapping function on each reserved
- * identifier in the scanner's keyword table.
- */
-extern JS_FRIEND_API(void)
-js_MapKeywords(void (*mapfun)(const char *));
-
-/*
- * Report a compile-time error by its number, using ts or cg to show context.
- * Return true for a warning, false for an error.
- */
-extern JSBool
-js_ReportCompileErrorNumber(JSContext *cx, void *handle, uintN flags,
-                            uintN errorNumber, ...);
-
-extern JSBool
-js_ReportCompileErrorNumberUC(JSContext *cx, void *handle, uintN flags,
-                              uintN errorNumber, ...);
-
-/* Steal some JSREPORT_* bits (see jsapi.h) to tell handle's type. */
-#define JSREPORT_HANDLE 0x300
-#define JSREPORT_TS     0x000
-#define JSREPORT_CG     0x100
-#define JSREPORT_PN     0x200
-
-/*
- * Look ahead one token and return its type.
- */
-extern JSTokenType
-js_PeekToken(JSContext *cx, JSTokenStream *ts);
-
-extern JSTokenType
-js_PeekTokenSameLine(JSContext *cx, JSTokenStream *ts);
-
-/*
- * Get the next token from ts.
- */
-extern JSTokenType
-js_GetToken(JSContext *cx, JSTokenStream *ts);
-
-/*
- * Push back the last scanned token onto ts.
- */
-extern void
-js_UngetToken(JSTokenStream *ts);
-
-/*
- * Get the next token from ts if its type is tt.
- */
-extern JSBool
-js_MatchToken(JSContext *cx, JSTokenStream *ts, JSTokenType tt);
-
-JS_END_EXTERN_C
-
-#endif /* jsscan_h___ */
diff --git a/libs/js/src/jsscope.c b/libs/js/src/jsscope.c
deleted file mode 100644
index ed6525f5ec..0000000000
--- a/libs/js/src/jsscope.c
+++ /dev/null
@@ -1,1642 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS symbol tables.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsarena.h"
-#include "jsbit.h"
-#include "jsclist.h"
-#include "jsdhash.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsdbgapi.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsscope.h"
-#include "jsstr.h"
-
-JSScope *
-js_GetMutableScope(JSContext *cx, JSObject *obj)
-{
-    JSScope *scope, *newscope;
-
-    scope = OBJ_SCOPE(obj);
-    JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, scope));
-    if (scope->object == obj)
-        return scope;
-    newscope = js_NewScope(cx, 0, scope->map.ops, LOCKED_OBJ_GET_CLASS(obj),
-                           obj);
-    if (!newscope)
-        return NULL;
-    JS_LOCK_SCOPE(cx, newscope);
-    obj->map = js_HoldObjectMap(cx, &newscope->map);
-    scope = (JSScope *) js_DropObjectMap(cx, &scope->map, obj);
-    JS_TRANSFER_SCOPE_LOCK(cx, scope, newscope);
-    return newscope;
-}
-
-/*
- * JSScope uses multiplicative hashing, _a la_ jsdhash.[ch], but specialized
- * to minimize footprint.  But if a scope has fewer than SCOPE_HASH_THRESHOLD
- * entries, we use linear search and avoid allocating scope->table.
- */
-#define SCOPE_HASH_THRESHOLD    6
-#define MIN_SCOPE_SIZE_LOG2     4
-#define MIN_SCOPE_SIZE          JS_BIT(MIN_SCOPE_SIZE_LOG2)
-#define SCOPE_TABLE_NBYTES(n)   ((n) * sizeof(JSScopeProperty *))
-
-static void
-InitMinimalScope(JSScope *scope)
-{
-    scope->hashShift = JS_DHASH_BITS - MIN_SCOPE_SIZE_LOG2;
-    scope->entryCount = scope->removedCount = 0;
-    scope->table = NULL;
-    scope->lastProp = NULL;
-}
-
-static JSBool
-CreateScopeTable(JSScope *scope)
-{
-    int sizeLog2;
-    JSScopeProperty *sprop, **spp;
-
-    JS_ASSERT(!scope->table);
-    JS_ASSERT(scope->lastProp);
-
-    if (scope->entryCount > SCOPE_HASH_THRESHOLD) {
-        /*
-         * Ouch: calloc failed at least once already -- let's try again,
-         * overallocating to hold at least twice the current population.
-         */
-        sizeLog2 = JS_CeilingLog2(2 * scope->entryCount);
-        scope->hashShift = JS_DHASH_BITS - sizeLog2;
-    } else {
-        JS_ASSERT(scope->hashShift == JS_DHASH_BITS - MIN_SCOPE_SIZE_LOG2);
-        sizeLog2 = MIN_SCOPE_SIZE_LOG2;
-    }
-
-    scope->table = (JSScopeProperty **)
-        calloc(JS_BIT(sizeLog2), sizeof(JSScopeProperty *));
-    if (!scope->table)
-        return JS_FALSE;
-
-    scope->hashShift = JS_DHASH_BITS - sizeLog2;
-    for (sprop = scope->lastProp; sprop; sprop = sprop->parent) {
-        spp = js_SearchScope(scope, sprop->id, JS_TRUE);
-        SPROP_STORE_PRESERVING_COLLISION(spp, sprop);
-    }
-    return JS_TRUE;
-}
-
-JSScope *
-js_NewScope(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops, JSClass *clasp,
-            JSObject *obj)
-{
-    JSScope *scope;
-
-    scope = (JSScope *) JS_malloc(cx, sizeof(JSScope));
-    if (!scope)
-        return NULL;
-
-    js_InitObjectMap(&scope->map, nrefs, ops, clasp);
-    scope->object = obj;
-    scope->flags = 0;
-    scope->dswIndex = 0;
-    InitMinimalScope(scope);
-
-#ifdef JS_THREADSAFE
-    scope->ownercx = cx;
-    memset(&scope->lock, 0, sizeof scope->lock);
-
-    /*
-     * Set u.link = NULL, not u.count = 0, in case the target architecture's
-     * null pointer has a non-zero integer representation.
-     */
-    scope->u.link = NULL;
-
-#ifdef DEBUG
-    scope->file[0] = scope->file[1] = scope->file[2] = scope->file[3] = NULL;
-    scope->line[0] = scope->line[1] = scope->line[2] = scope->line[3] = 0;
-#endif
-#endif
-
-    JS_RUNTIME_METER(cx->runtime, liveScopes);
-    JS_RUNTIME_METER(cx->runtime, totalScopes);
-    return scope;
-}
-
-#ifdef DEBUG_SCOPE_COUNT
-extern void
-js_unlog_scope(JSScope *scope);
-#endif
-
-void
-js_DestroyScope(JSContext *cx, JSScope *scope)
-{
-#ifdef DEBUG_SCOPE_COUNT
-    js_unlog_scope(scope);
-#endif
-
-#ifdef JS_THREADSAFE
-    /* Scope must be single-threaded at this point, so set scope->ownercx. */
-    JS_ASSERT(scope->u.count == 0);
-    scope->ownercx = cx;
-    js_FinishLock(&scope->lock);
-#endif
-    if (scope->table)
-        JS_free(cx, scope->table);
-
-#ifdef DEBUG
-    JS_LOCK_RUNTIME_VOID(cx->runtime,
-                         cx->runtime->liveScopeProps -= scope->entryCount);
-#endif
-    JS_RUNTIME_UNMETER(cx->runtime, liveScopes);
-    JS_free(cx, scope);
-}
-
-#ifdef DUMP_SCOPE_STATS
-typedef struct JSScopeStats {
-    jsrefcount          searches;
-    jsrefcount          steps;
-    jsrefcount          hits;
-    jsrefcount          misses;
-    jsrefcount          stepHits;
-    jsrefcount          stepMisses;
-    jsrefcount          adds;
-    jsrefcount          redundantAdds;
-    jsrefcount          addFailures;
-    jsrefcount          changeFailures;
-    jsrefcount          compresses;
-    jsrefcount          grows;
-    jsrefcount          removes;
-    jsrefcount          removeFrees;
-    jsrefcount          uselessRemoves;
-    jsrefcount          shrinks;
-} JSScopeStats;
-
-JS_FRIEND_DATA(JSScopeStats) js_scope_stats;
-
-# define METER(x)       JS_ATOMIC_INCREMENT(&js_scope_stats.x)
-#else
-# define METER(x)       /* nothing */
-#endif
-
-/*
- * Double hashing needs the second hash code to be relatively prime to table
- * size, so we simply make hash2 odd.  The inputs to multiplicative hash are
- * the golden ratio, expressed as a fixed-point 32 bit fraction, and the int
- * property index or named property's atom number (observe that most objects
- * have either no indexed properties, or almost all indexed and a few names,
- * so collisions between index and atom number are unlikely).
- */
-#define SCOPE_HASH0(id)                 (HASH_ID(id) * JS_GOLDEN_RATIO)
-#define SCOPE_HASH1(hash0,shift)        ((hash0) >> (shift))
-#define SCOPE_HASH2(hash0,log2,shift)   ((((hash0) << (log2)) >> (shift)) | 1)
-
-JS_FRIEND_API(JSScopeProperty **)
-js_SearchScope(JSScope *scope, jsid id, JSBool adding)
-{
-    JSHashNumber hash0, hash1, hash2;
-    int hashShift, sizeLog2;
-    JSScopeProperty *stored, *sprop, **spp, **firstRemoved;
-    uint32 sizeMask;
-
-    METER(searches);
-    if (!scope->table) {
-        /* Not enough properties to justify hashing: search from lastProp. */
-        JS_ASSERT(!SCOPE_HAD_MIDDLE_DELETE(scope));
-        for (spp = &scope->lastProp; (sprop = *spp); spp = &sprop->parent) {
-            if (sprop->id == id) {
-                METER(hits);
-                return spp;
-            }
-        }
-        METER(misses);
-        return spp;
-    }
-
-    /* Compute the primary hash address. */
-    hash0 = SCOPE_HASH0(id);
-    hashShift = scope->hashShift;
-    hash1 = SCOPE_HASH1(hash0, hashShift);
-    spp = scope->table + hash1;
-
-    /* Miss: return space for a new entry. */
-    stored = *spp;
-    if (SPROP_IS_FREE(stored)) {
-        METER(misses);
-        return spp;
-    }
-
-    /* Hit: return entry. */
-    sprop = SPROP_CLEAR_COLLISION(stored);
-    if (sprop && sprop->id == id) {
-        METER(hits);
-        return spp;
-    }
-
-    /* Collision: double hash. */
-    sizeLog2 = JS_DHASH_BITS - hashShift;
-    hash2 = SCOPE_HASH2(hash0, sizeLog2, hashShift);
-    sizeMask = JS_BITMASK(sizeLog2);
-
-    /* Save the first removed entry pointer so we can recycle it if adding. */
-    if (SPROP_IS_REMOVED(stored)) {
-        firstRemoved = spp;
-    } else {
-        firstRemoved = NULL;
-        if (adding && !SPROP_HAD_COLLISION(stored))
-            SPROP_FLAG_COLLISION(spp, sprop);
-    }
-
-    for (;;) {
-        METER(steps);
-        hash1 -= hash2;
-        hash1 &= sizeMask;
-        spp = scope->table + hash1;
-
-        stored = *spp;
-        if (SPROP_IS_FREE(stored)) {
-            METER(stepMisses);
-            return (adding && firstRemoved) ? firstRemoved : spp;
-        }
-
-        sprop = SPROP_CLEAR_COLLISION(stored);
-        if (sprop && sprop->id == id) {
-            METER(stepHits);
-            return spp;
-        }
-
-        if (SPROP_IS_REMOVED(stored)) {
-            if (!firstRemoved)
-                firstRemoved = spp;
-        } else {
-            if (adding && !SPROP_HAD_COLLISION(stored))
-                SPROP_FLAG_COLLISION(spp, sprop);
-        }
-    }
-
-    /* NOTREACHED */
-    return NULL;
-}
-
-static JSBool
-ChangeScope(JSContext *cx, JSScope *scope, int change)
-{
-    int oldlog2, newlog2;
-    uint32 oldsize, newsize, nbytes;
-    JSScopeProperty **table, **oldtable, **spp, **oldspp, *sprop;
-
-    /* Grow, shrink, or compress by changing scope->table. */
-    oldlog2 = JS_DHASH_BITS - scope->hashShift;
-    newlog2 = oldlog2 + change;
-    oldsize = JS_BIT(oldlog2);
-    newsize = JS_BIT(newlog2);
-    nbytes = SCOPE_TABLE_NBYTES(newsize);
-    table = (JSScopeProperty **) calloc(nbytes, 1);
-    if (!table) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    /* Now that we have a new table allocated, update scope members. */
-    scope->hashShift = JS_DHASH_BITS - newlog2;
-    scope->removedCount = 0;
-    oldtable = scope->table;
-    scope->table = table;
-
-    /* Copy only live entries, leaving removed and free ones behind. */
-    for (oldspp = oldtable; oldsize != 0; oldspp++) {
-        sprop = SPROP_FETCH(oldspp);
-        if (sprop) {
-            spp = js_SearchScope(scope, sprop->id, JS_TRUE);
-            JS_ASSERT(SPROP_IS_FREE(*spp));
-            *spp = sprop;
-        }
-        oldsize--;
-    }
-
-    /* Finally, free the old table storage. */
-    JS_free(cx, oldtable);
-    return JS_TRUE;
-}
-
-/*
- * Take care to exclude the mark and duplicate bits, in case we're called from
- * the GC, or we are searching for a property that has not yet been flagged as
- * a duplicate when making a duplicate formal parameter.
- */
-#define SPROP_FLAGS_NOT_MATCHED (SPROP_MARK | SPROP_IS_DUPLICATE)
-
-JS_STATIC_DLL_CALLBACK(JSDHashNumber)
-js_HashScopeProperty(JSDHashTable *table, const void *key)
-{
-    const JSScopeProperty *sprop = (const JSScopeProperty *)key;
-    JSDHashNumber hash;
-    JSPropertyOp gsop;
-
-    /* Accumulate from least to most random so the low bits are most random. */
-    hash = 0;
-    gsop = sprop->getter;
-    if (gsop)
-        hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ (jsword)gsop;
-    gsop = sprop->setter;
-    if (gsop)
-        hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ (jsword)gsop;
-
-    hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4)
-           ^ (sprop->flags & ~SPROP_FLAGS_NOT_MATCHED);
-
-    hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ sprop->attrs;
-    hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ sprop->shortid;
-    hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ sprop->slot;
-    hash = (hash >> (JS_DHASH_BITS - 4)) ^ (hash << 4) ^ sprop->id;
-    return hash;
-}
-
-#define SPROP_MATCH(sprop, child)                                             \
-    SPROP_MATCH_PARAMS(sprop, (child)->id, (child)->getter, (child)->setter,  \
-                       (child)->slot, (child)->attrs, (child)->flags,         \
-                       (child)->shortid)
-
-#define SPROP_MATCH_PARAMS(sprop, aid, agetter, asetter, aslot, aattrs,       \
-                           aflags, ashortid)                                  \
-    ((sprop)->id == (aid) &&                                                  \
-     SPROP_MATCH_PARAMS_AFTER_ID(sprop, agetter, asetter, aslot, aattrs,      \
-                                 aflags, ashortid))
-
-#define SPROP_MATCH_PARAMS_AFTER_ID(sprop, agetter, asetter, aslot, aattrs,   \
-                                    aflags, ashortid)                         \
-    ((sprop)->getter == (agetter) &&                                          \
-     (sprop)->setter == (asetter) &&                                          \
-     (sprop)->slot == (aslot) &&                                              \
-     (sprop)->attrs == (aattrs) &&                                            \
-     (((sprop)->flags ^ (aflags)) & ~SPROP_FLAGS_NOT_MATCHED) == 0 &&         \
-     (sprop)->shortid == (ashortid))
-
-JS_STATIC_DLL_CALLBACK(JSBool)
-js_MatchScopeProperty(JSDHashTable *table,
-                      const JSDHashEntryHdr *hdr,
-                      const void *key)
-{
-    const JSPropertyTreeEntry *entry = (const JSPropertyTreeEntry *)hdr;
-    const JSScopeProperty *sprop = entry->child;
-    const JSScopeProperty *kprop = (const JSScopeProperty *)key;
-
-    return SPROP_MATCH(sprop, kprop);
-}
-
-static const JSDHashTableOps PropertyTreeHashOps = {
-    JS_DHashAllocTable,
-    JS_DHashFreeTable,
-    JS_DHashGetKeyStub,
-    js_HashScopeProperty,
-    js_MatchScopeProperty,
-    JS_DHashMoveEntryStub,
-    JS_DHashClearEntryStub,
-    JS_DHashFinalizeStub,
-    NULL
-};
-
-/*
- * A property tree node on rt->propertyFreeList overlays the following prefix
- * struct on JSScopeProperty.
- */
-typedef struct FreeNode {
-    jsid                id;
-    JSScopeProperty     *next;
-    JSScopeProperty     **prevp;
-} FreeNode;
-
-#define FREENODE(sprop) ((FreeNode *) (sprop))
-
-#define FREENODE_INSERT(list, sprop)                                          \
-    JS_BEGIN_MACRO                                                            \
-        FREENODE(sprop)->next = (list);                                       \
-        FREENODE(sprop)->prevp = &(list);                                     \
-        if (list)                                                             \
-            FREENODE(list)->prevp = &FREENODE(sprop)->next;                   \
-        (list) = (sprop);                                                     \
-    JS_END_MACRO
-
-#define FREENODE_REMOVE(sprop)                                                \
-    JS_BEGIN_MACRO                                                            \
-        *FREENODE(sprop)->prevp = FREENODE(sprop)->next;                      \
-        if (FREENODE(sprop)->next)                                            \
-            FREENODE(FREENODE(sprop)->next)->prevp = FREENODE(sprop)->prevp;  \
-    JS_END_MACRO
-
-/* NB: Called with the runtime lock held. */
-static JSScopeProperty *
-NewScopeProperty(JSRuntime *rt)
-{
-    JSScopeProperty *sprop;
-
-    sprop = rt->propertyFreeList;
-    if (sprop) {
-        FREENODE_REMOVE(sprop);
-    } else {
-        JS_ARENA_ALLOCATE_CAST(sprop, JSScopeProperty *,
-                               &rt->propertyArenaPool,
-                               sizeof(JSScopeProperty));
-        if (!sprop)
-            return NULL;
-    }
-
-    JS_RUNTIME_METER(rt, livePropTreeNodes);
-    JS_RUNTIME_METER(rt, totalPropTreeNodes);
-    return sprop;
-}
-
-#define CHUNKY_KIDS_TAG         ((jsuword)1)
-#define KIDS_IS_CHUNKY(kids)    ((jsuword)(kids) & CHUNKY_KIDS_TAG)
-#define KIDS_TO_CHUNK(kids)     ((PropTreeKidsChunk *)                        \
-                                 ((jsuword)(kids) & ~CHUNKY_KIDS_TAG))
-#define CHUNK_TO_KIDS(chunk)    ((JSScopeProperty *)                          \
-                                 ((jsuword)(chunk) | CHUNKY_KIDS_TAG))
-#define MAX_KIDS_PER_CHUNK      10
-
-typedef struct PropTreeKidsChunk PropTreeKidsChunk;
-
-struct PropTreeKidsChunk {
-    JSScopeProperty     *kids[MAX_KIDS_PER_CHUNK];
-    PropTreeKidsChunk   *next;
-};
-
-static PropTreeKidsChunk *
-NewPropTreeKidsChunk(JSRuntime *rt)
-{
-    PropTreeKidsChunk *chunk;
-
-    chunk = calloc(1, sizeof *chunk);
-    if (!chunk)
-        return NULL;
-    JS_ASSERT(((jsuword)chunk & CHUNKY_KIDS_TAG) == 0);
-    JS_RUNTIME_METER(rt, propTreeKidsChunks);
-    return chunk;
-}
-
-static void
-DestroyPropTreeKidsChunk(JSRuntime *rt, PropTreeKidsChunk *chunk)
-{
-    JS_RUNTIME_UNMETER(rt, propTreeKidsChunks);
-    free(chunk);
-}
-
-/* NB: Called with the runtime lock held. */
-static JSBool
-InsertPropertyTreeChild(JSRuntime *rt, JSScopeProperty *parent,
-                        JSScopeProperty *child)
-{
-    JSPropertyTreeEntry *entry;
-    JSScopeProperty **childp, *kids, *sprop;
-    PropTreeKidsChunk *chunk, **chunkp;
-    uintN i;
-
-    JS_ASSERT(!parent || child->parent != parent);
-
-    if (!parent) {
-        entry = (JSPropertyTreeEntry *)
-            JS_DHashTableOperate(&rt->propertyTreeHash, child, JS_DHASH_ADD);
-        if (!entry)
-            return JS_FALSE;
-        childp = &entry->child;
-        sprop = *childp;
-        if (!sprop) {
-            *childp = child;
-        } else {
-            /*
-             * A "Duplicate child" case.
-             *
-             * We can't do away with child, as at least one live scope entry
-             * still points at it.  What's more, that scope's lastProp chains
-             * through an ancestor line to reach child, and js_Enumerate and
-             * others count on this linkage.  We must leave child out of the
-             * hash table, and not require it to be there when we eventually
-             * GC it (see RemovePropertyTreeChild, below).
-             *
-             * It is necessary to leave the duplicate child out of the hash
-             * table to preserve entry uniqueness.  It is safe to leave the
-             * child out of the hash table (unlike the duplicate child cases
-             * below), because the child's parent link will be null, which
-             * can't dangle.
-             */
-            JS_ASSERT(sprop != child && SPROP_MATCH(sprop, child));
-            JS_RUNTIME_METER(rt, duplicatePropTreeNodes);
-        }
-    } else {
-        childp = &parent->kids;
-        kids = *childp;
-        if (kids) {
-            if (KIDS_IS_CHUNKY(kids)) {
-                chunk = KIDS_TO_CHUNK(kids);
-                do {
-                    for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                        childp = &chunk->kids[i];
-                        sprop = *childp;
-                        if (!sprop)
-                            goto insert;
-
-                        JS_ASSERT(sprop != child);
-                        if (SPROP_MATCH(sprop, child)) {
-                            /*
-                             * Duplicate child, see comment above.  In this
-                             * case, we must let the duplicate be inserted at
-                             * this level in the tree, so we keep iterating,
-                             * looking for an empty slot in which to insert.
-                             */
-                            JS_ASSERT(sprop != child);
-                            JS_RUNTIME_METER(rt, duplicatePropTreeNodes);
-                        }
-                    }
-                    chunkp = &chunk->next;
-                } while ((chunk = *chunkp) != NULL);
-
-                chunk = NewPropTreeKidsChunk(rt);
-                if (!chunk)
-                    return JS_FALSE;
-                *chunkp = chunk;
-                childp = &chunk->kids[0];
-            } else {
-                sprop = kids;
-                JS_ASSERT(sprop != child);
-                if (SPROP_MATCH(sprop, child)) {
-                    /*
-                     * Duplicate child, see comment above.  Once again, we
-                     * must let duplicates created by deletion pile up in a
-                     * kids-chunk-list, in order to find them when sweeping
-                     * and thereby avoid dangling parent pointers.
-                     */
-                    JS_RUNTIME_METER(rt, duplicatePropTreeNodes);
-                }
-
-                chunk = NewPropTreeKidsChunk(rt);
-                if (!chunk)
-                    return JS_FALSE;
-                parent->kids = CHUNK_TO_KIDS(chunk);
-                chunk->kids[0] = sprop;
-                childp = &chunk->kids[1];
-            }
-        }
-    insert:
-        *childp = child;
-    }
-
-    child->parent = parent;
-    return JS_TRUE;
-}
-
-/* NB: Called with the runtime lock held. */
-static void
-RemovePropertyTreeChild(JSRuntime *rt, JSScopeProperty *child)
-{
-    JSPropertyTreeEntry *entry;
-    JSScopeProperty *parent, *kids, *kid;
-    PropTreeKidsChunk *list, *chunk, **chunkp, *lastChunk;
-    uintN i, j;
-
-    parent = child->parent;
-    if (!parent) {
-        /*
-         * Don't remove child if it is not in rt->propertyTreeHash, but only
-         * matches a root child in the table that has compatible members. See
-         * the "Duplicate child" comments in InsertPropertyTreeChild, above.
-         */
-        entry = (JSPropertyTreeEntry *)
-            JS_DHashTableOperate(&rt->propertyTreeHash, child, JS_DHASH_LOOKUP);
-
-        if (entry->child == child)
-            JS_DHashTableRawRemove(&rt->propertyTreeHash, &entry->hdr);
-    } else {
-        kids = parent->kids;
-        if (KIDS_IS_CHUNKY(kids)) {
-            list = chunk = KIDS_TO_CHUNK(kids);
-            chunkp = &list;
-
-            do {
-                for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                    if (chunk->kids[i] == child) {
-                        lastChunk = chunk;
-                        if (!lastChunk->next) {
-                            j = i + 1;
-                        } else {
-                            j = 0;
-                            do {
-                                chunkp = &lastChunk->next;
-                                lastChunk = *chunkp;
-                            } while (lastChunk->next);
-                        }
-                        for (; j < MAX_KIDS_PER_CHUNK; j++) {
-                            if (!lastChunk->kids[j])
-                                break;
-                        }
-                        --j;
-                        if (chunk != lastChunk || j > i)
-                            chunk->kids[i] = lastChunk->kids[j];
-                        lastChunk->kids[j] = NULL;
-                        if (j == 0) {
-                            *chunkp = NULL;
-                            if (!list)
-                                parent->kids = NULL;
-                            DestroyPropTreeKidsChunk(rt, lastChunk);
-                        }
-                        return;
-                    }
-                }
-
-                chunkp = &chunk->next;
-            } while ((chunk = *chunkp) != NULL);
-        } else {
-            kid = kids;
-            if (kid == child)
-                parent->kids = NULL;
-        }
-    }
-}
-
-/*
- * Called *without* the runtime lock held, this function acquires that lock
- * only when inserting a new child.  Thus there may be races to find or add
- * a node that result in duplicates.  We expect such races to be rare!
- */
-static JSScopeProperty *
-GetPropertyTreeChild(JSContext *cx, JSScopeProperty *parent,
-                     JSScopeProperty *child)
-{
-    JSRuntime *rt;
-    JSPropertyTreeEntry *entry;
-    JSScopeProperty *sprop;
-    PropTreeKidsChunk *chunk;
-    uintN i;
-
-    rt = cx->runtime;
-    if (!parent) {
-        JS_LOCK_RUNTIME(rt);
-
-        entry = (JSPropertyTreeEntry *)
-            JS_DHashTableOperate(&rt->propertyTreeHash, child, JS_DHASH_ADD);
-        if (!entry)
-            goto out_of_memory;
-
-        sprop = entry->child;
-        if (sprop)
-            goto out;
-    } else {
-        /*
-         * Because chunks are appended at the end and never deleted except by
-         * the GC, we can search without taking the runtime lock.  We may miss
-         * a matching sprop added by another thread, and make a duplicate one,
-         * but that is an unlikely, therefore small, cost.  The property tree
-         * has extremely low fan-out below its root in popular embeddings with
-         * real-world workloads.
-         *
-         * If workload changes so as to increase fan-out significantly below
-         * the property tree root, we'll want to add another tag bit stored in
-         * parent->kids that indicates a JSDHashTable pointer.
-         */
-        entry = NULL;
-        sprop = parent->kids;
-        if (sprop) {
-            if (KIDS_IS_CHUNKY(sprop)) {
-                chunk = KIDS_TO_CHUNK(sprop);
-                do {
-                    for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                        sprop = chunk->kids[i];
-                        if (!sprop)
-                            goto not_found;
-
-                        if (SPROP_MATCH(sprop, child))
-                            return sprop;
-                    }
-                } while ((chunk = chunk->next) != NULL);
-            } else {
-                if (SPROP_MATCH(sprop, child))
-                    return sprop;
-            }
-        }
-
-    not_found:
-        JS_LOCK_RUNTIME(rt);
-    }
-
-    sprop = NewScopeProperty(rt);
-    if (!sprop)
-        goto out_of_memory;
-
-    sprop->id = child->id;
-    sprop->getter = child->getter;
-    sprop->setter = child->setter;
-    sprop->slot = child->slot;
-    sprop->attrs = child->attrs;
-    sprop->flags = child->flags;
-    sprop->shortid = child->shortid;
-    sprop->parent = sprop->kids = NULL;
-    if (!parent) {
-        entry->child = sprop;
-    } else {
-        if (!InsertPropertyTreeChild(rt, parent, sprop))
-            goto out_of_memory;
-    }
-
-out:
-    JS_UNLOCK_RUNTIME(rt);
-    return sprop;
-
-out_of_memory:
-    JS_UNLOCK_RUNTIME(rt);
-    JS_ReportOutOfMemory(cx);
-    return NULL;
-}
-
-#ifdef DEBUG_notbrendan
-#define CHECK_ANCESTOR_LINE(scope, sparse)                                    \
-    JS_BEGIN_MACRO                                                            \
-        if ((scope)->table) CheckAncestorLine(scope, sparse);                 \
-    JS_END_MACRO
-
-static void
-CheckAncestorLine(JSScope *scope, JSBool sparse)
-{
-    uint32 size;
-    JSScopeProperty **spp, **start, **end, *ancestorLine, *sprop, *aprop;
-    uint32 entryCount, ancestorCount;
-
-    ancestorLine = SCOPE_LAST_PROP(scope);
-    if (ancestorLine)
-        JS_ASSERT(SCOPE_HAS_PROPERTY(scope, ancestorLine));
-
-    entryCount = 0;
-    size = SCOPE_CAPACITY(scope);
-    start = scope->table;
-    for (spp = start, end = start + size; spp < end; spp++) {
-        sprop = SPROP_FETCH(spp);
-        if (sprop) {
-            entryCount++;
-            for (aprop = ancestorLine; aprop; aprop = aprop->parent) {
-                if (aprop == sprop)
-                    break;
-            }
-            JS_ASSERT(aprop);
-        }
-    }
-    JS_ASSERT(entryCount == scope->entryCount);
-
-    ancestorCount = 0;
-    for (sprop = ancestorLine; sprop; sprop = sprop->parent) {
-        if (SCOPE_HAD_MIDDLE_DELETE(scope) &&
-            !SCOPE_HAS_PROPERTY(scope, sprop)) {
-            JS_ASSERT(sparse || (sprop->flags & SPROP_IS_DUPLICATE));
-            continue;
-        }
-        ancestorCount++;
-    }
-    JS_ASSERT(ancestorCount == scope->entryCount);
-}
-#else
-#define CHECK_ANCESTOR_LINE(scope, sparse) /* nothing */
-#endif
-
-static void
-ReportReadOnlyScope(JSContext *cx, JSScope *scope)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(scope->object));
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_READ_ONLY,
-                         str
-                         ? JS_GetStringBytes(str)
-                         : LOCKED_OBJ_GET_CLASS(scope->object)->name);
-}
-
-JSScopeProperty *
-js_AddScopeProperty(JSContext *cx, JSScope *scope, jsid id,
-                    JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                    uintN attrs, uintN flags, intN shortid)
-{
-    JSScopeProperty **spp, *sprop, *overwriting, **spvec, **spp2, child;
-    uint32 size, splen, i;
-    int change;
-
-    JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, scope));
-    CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-
-    /*
-     * You can't add properties to a sealed scope.  But note well that you can
-     * change property attributes in a sealed scope, even though that replaces
-     * a JSScopeProperty * in the scope's hash table -- but no id is added, so
-     * the scope remains sealed.
-     */
-    if (SCOPE_IS_SEALED(scope)) {
-        ReportReadOnlyScope(cx, scope);
-        return NULL;
-    }
-
-    /*
-     * Normalize stub getter and setter values for faster is-stub testing in
-     * the SPROP_CALL_[GS]ETTER macros.
-     */
-    if (getter == JS_PropertyStub)
-        getter = NULL;
-    if (setter == JS_PropertyStub)
-        setter = NULL;
-
-    /*
-     * Search for id in order to claim its entry, allocating a property tree
-     * node if one doesn't already exist for our parameters.
-     */
-    spp = js_SearchScope(scope, id, JS_TRUE);
-    sprop = overwriting = SPROP_FETCH(spp);
-    if (!sprop) {
-        /* Check whether we need to grow, if the load factor is >= .75. */
-        size = SCOPE_CAPACITY(scope);
-        if (scope->entryCount + scope->removedCount >= size - (size >> 2)) {
-            if (scope->removedCount >= size >> 2) {
-                METER(compresses);
-                change = 0;
-            } else {
-                METER(grows);
-                change = 1;
-            }
-            if (!ChangeScope(cx, scope, change) &&
-                scope->entryCount + scope->removedCount == size - 1) {
-                METER(addFailures);
-                return NULL;
-            }
-            spp = js_SearchScope(scope, id, JS_TRUE);
-            JS_ASSERT(!SPROP_FETCH(spp));
-        }
-    } else {
-        /* Property exists: js_SearchScope must have returned a valid entry. */
-        JS_ASSERT(!SPROP_IS_REMOVED(*spp));
-
-        /*
-         * If all property members match, this is a redundant add and we can
-         * return early.  If the caller wants to allocate a slot, but doesn't
-         * care which slot, copy sprop->slot into slot so we can match sprop,
-         * if all other members match.
-         */
-        if (!(attrs & JSPROP_SHARED) &&
-            slot == SPROP_INVALID_SLOT &&
-            SPROP_HAS_VALID_SLOT(sprop, scope)) {
-            slot = sprop->slot;
-        }
-        if (SPROP_MATCH_PARAMS_AFTER_ID(sprop, getter, setter, slot, attrs,
-                                        flags, shortid)) {
-            METER(redundantAdds);
-            return sprop;
-        }
-
-        /*
-         * Duplicate formal parameters require us to leave the old property
-         * on the ancestor line, so the decompiler can find it, even though
-         * its entry in scope->table is overwritten to point at a new property
-         * descending from the old one.  The SPROP_IS_DUPLICATE flag helps us
-         * cope with the consequent disparity between ancestor line height and
-         * scope->entryCount.
-         */
-        if (flags & SPROP_IS_DUPLICATE) {
-            sprop->flags |= SPROP_IS_DUPLICATE;
-        } else {
-            /*
-             * If we are clearing sprop to force an existing property to be
-             * overwritten (apart from a duplicate formal parameter), we must
-             * unlink it from the ancestor line at scope->lastProp, lazily if
-             * sprop is not lastProp.  And we must remove the entry at *spp,
-             * precisely so the lazy "middle delete" fixup code further below
-             * won't find sprop in scope->table, in spite of sprop being on
-             * the ancestor line.
-             *
-             * When we finally succeed in finding or creating a new sprop
-             * and storing its pointer at *spp, we'll use the |overwriting|
-             * local saved when we first looked up id to decide whether we're
-             * indeed creating a new entry, or merely overwriting an existing
-             * property.
-             */
-            if (sprop == SCOPE_LAST_PROP(scope)) {
-                do {
-                    SCOPE_REMOVE_LAST_PROP(scope);
-                    if (!SCOPE_HAD_MIDDLE_DELETE(scope))
-                        break;
-                    sprop = SCOPE_LAST_PROP(scope);
-                } while (sprop && !SCOPE_HAS_PROPERTY(scope, sprop));
-            } else if (!SCOPE_HAD_MIDDLE_DELETE(scope)) {
-                /*
-                 * If we have no hash table yet, we need one now.  The middle
-                 * delete code is simple-minded that way!
-                 */
-                if (!scope->table) {
-                    if (!CreateScopeTable(scope)) {
-                        JS_ReportOutOfMemory(cx);
-                        return NULL;
-                    }
-                    spp = js_SearchScope(scope, id, JS_TRUE);
-                    sprop = overwriting = SPROP_FETCH(spp);
-                }
-                SCOPE_SET_MIDDLE_DELETE(scope);
-            }
-        }
-
-        /*
-         * If we fail later on trying to find or create a new sprop, we will
-         * goto fail_overwrite and restore *spp from |overwriting|.  Note that
-         * we don't bother to keep scope->removedCount in sync, because we'll
-         * fix up *spp and scope->entryCount shortly, no matter how control
-         * flow returns from this function.
-         */
-        if (scope->table)
-            SPROP_STORE_PRESERVING_COLLISION(spp, NULL);
-        scope->entryCount--;
-        CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-        sprop = NULL;
-    }
-
-    if (!sprop) {
-        /*
-         * If properties were deleted from the middle of the list starting at
-         * scope->lastProp, we may need to fork the property tree and squeeze
-         * all deleted properties out of scope's ancestor line.  Otherwise we
-         * risk adding a node with the same id as a "middle" node, violating
-         * the rule that properties along an ancestor line have distinct ids
-         * (unless flagged SPROP_IS_DUPLICATE).
-         */
-        if (SCOPE_HAD_MIDDLE_DELETE(scope)) {
-            JS_ASSERT(scope->table);
-            CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-
-            splen = scope->entryCount;
-            if (splen == 0) {
-                JS_ASSERT(scope->lastProp == NULL);
-            } else {
-                /*
-                 * Enumerate live entries in scope->table using a temporary
-                 * vector, by walking the (possibly sparse, due to deletions)
-                 * ancestor line from scope->lastProp.
-                 */
-                spvec = (JSScopeProperty **)
-                        JS_malloc(cx, SCOPE_TABLE_NBYTES(splen));
-                if (!spvec)
-                    goto fail_overwrite;
-                i = splen;
-                sprop = SCOPE_LAST_PROP(scope);
-                JS_ASSERT(sprop);
-                do {
-                    /*
-                     * NB: test SCOPE_GET_PROPERTY, not SCOPE_HAS_PROPERTY --
-                     * the latter insists that sprop->id maps to sprop, while
-                     * the former simply tests whether sprop->id is bound in
-                     * scope.  We must allow for duplicate formal parameters
-                     * along the ancestor line, and fork them as needed.
-                     */
-                    if (!SCOPE_GET_PROPERTY(scope, sprop->id))
-                        continue;
-
-                    JS_ASSERT(sprop != overwriting);
-                    if (i == 0) {
-                        /*
-                         * If our original splen estimate, scope->entryCount,
-                         * is less than the ancestor line height, there must
-                         * be duplicate formal parameters in this (function
-                         * object) scope.  Count remaining ancestors in order
-                         * to realloc spvec.
-                         */
-                        JSScopeProperty *tmp = sprop;
-                        do {
-                            if (SCOPE_GET_PROPERTY(scope, tmp->id))
-                                i++;
-                        } while ((tmp = tmp->parent) != NULL);
-                        spp2 = (JSScopeProperty **)
-                             JS_realloc(cx, spvec, SCOPE_TABLE_NBYTES(splen+i));
-                        if (!spp2) {
-                            JS_free(cx, spvec);
-                            goto fail_overwrite;
-                        }
-
-                        spvec = spp2;
-                        memmove(spvec + i, spvec, SCOPE_TABLE_NBYTES(splen));
-                        splen += i;
-                    }
-
-                    spvec[--i] = sprop;
-                } while ((sprop = sprop->parent) != NULL);
-                JS_ASSERT(i == 0);
-
-                /*
-                 * Now loop forward through spvec, forking the property tree
-                 * whenever we see a "parent gap" due to deletions from scope.
-                 * NB: sprop is null on first entry to the loop body.
-                 */
-                do {
-                    if (spvec[i]->parent == sprop) {
-                        sprop = spvec[i];
-                    } else {
-                        sprop = GetPropertyTreeChild(cx, sprop, spvec[i]);
-                        if (!sprop) {
-                            JS_free(cx, spvec);
-                            goto fail_overwrite;
-                        }
-
-                        spp2 = js_SearchScope(scope, sprop->id, JS_FALSE);
-                        JS_ASSERT(SPROP_FETCH(spp2) == spvec[i]);
-                        SPROP_STORE_PRESERVING_COLLISION(spp2, sprop);
-                    }
-                } while (++i < splen);
-                JS_free(cx, spvec);
-
-                /*
-                 * Now sprop points to the last property in scope, where the
-                 * ancestor line from sprop to the root is dense w.r.t. scope:
-                 * it contains no nodes not mapped by scope->table, apart from
-                 * any stinking ECMA-mandated duplicate formal parameters.
-                 */
-                scope->lastProp = sprop;
-                CHECK_ANCESTOR_LINE(scope, JS_FALSE);
-                JS_RUNTIME_METER(cx->runtime, middleDeleteFixups);
-            }
-
-            SCOPE_CLR_MIDDLE_DELETE(scope);
-        }
-
-        /*
-         * Aliases share another property's slot, passed in the |slot| param.
-         * Shared properties have no slot.  Unshared properties that do not
-         * alias another property's slot get one here, but may lose it due to
-         * a JS_ClearScope call.
-         */
-        if (!(flags & SPROP_IS_ALIAS)) {
-            if (attrs & JSPROP_SHARED) {
-                slot = SPROP_INVALID_SLOT;
-            } else {
-                /*
-                 * We may have set slot from a nearly-matching sprop, above.
-                 * If so, we're overwriting that nearly-matching sprop, so we
-                 * can reuse its slot -- we don't need to allocate a new one.
-                 * Callers should therefore pass SPROP_INVALID_SLOT for all
-                 * non-alias, unshared property adds.
-                 */
-                if (slot != SPROP_INVALID_SLOT)
-                    JS_ASSERT(overwriting);
-                else if (!js_AllocSlot(cx, scope->object, &slot))
-                    goto fail_overwrite;
-            }
-        }
-
-        /*
-         * Check for a watchpoint on a deleted property; if one exists, change
-         * setter to js_watch_set.
-         * XXXbe this could get expensive with lots of watchpoints...
-         */
-        if (!JS_CLIST_IS_EMPTY(&cx->runtime->watchPointList) &&
-            js_FindWatchPoint(cx->runtime, scope, id)) {
-            setter = js_WrapWatchedSetter(cx, id, attrs, setter);
-            if (!setter)
-                goto fail_overwrite;
-        }
-
-        /* Find or create a property tree node labeled by our arguments. */
-        child.id = id;
-        child.getter = getter;
-        child.setter = setter;
-        child.slot = slot;
-        child.attrs = attrs;
-        child.flags = flags;
-        child.shortid = shortid;
-        sprop = GetPropertyTreeChild(cx, scope->lastProp, &child);
-        if (!sprop)
-            goto fail_overwrite;
-
-        /* Store the tree node pointer in the table entry for id. */
-        if (scope->table)
-            SPROP_STORE_PRESERVING_COLLISION(spp, sprop);
-        scope->entryCount++;
-        scope->lastProp = sprop;
-        CHECK_ANCESTOR_LINE(scope, JS_FALSE);
-        if (!overwriting) {
-            JS_RUNTIME_METER(cx->runtime, liveScopeProps);
-            JS_RUNTIME_METER(cx->runtime, totalScopeProps);
-        }
-
-        /*
-         * If we reach the hashing threshold, try to allocate scope->table.
-         * If we can't (a rare event, preceded by swapping to death on most
-         * modern OSes), stick with linear search rather than whining about
-         * this little set-back.  Therefore we must test !scope->table and
-         * scope->entryCount >= SCOPE_HASH_THRESHOLD, not merely whether the
-         * entry count just reached the threshold.
-         */
-        if (!scope->table && scope->entryCount >= SCOPE_HASH_THRESHOLD)
-            (void) CreateScopeTable(scope);
-    }
-
-    METER(adds);
-    return sprop;
-
-fail_overwrite:
-    if (overwriting) {
-        /*
-         * We may or may not have forked overwriting out of scope's ancestor
-         * line, so we must check (the alternative is to set a flag above, but
-         * that hurts the common, non-error case).  If we did fork overwriting
-         * out, we'll add it back at scope->lastProp.  This means enumeration
-         * order can change due to a failure to overwrite an id.
-         * XXXbe very minor incompatibility
-         */
-        for (sprop = SCOPE_LAST_PROP(scope); ; sprop = sprop->parent) {
-            if (!sprop) {
-                sprop = SCOPE_LAST_PROP(scope);
-                if (overwriting->parent == sprop) {
-                    scope->lastProp = overwriting;
-                } else {
-                    sprop = GetPropertyTreeChild(cx, sprop, overwriting);
-                    if (sprop) {
-                        JS_ASSERT(sprop != overwriting);
-                        scope->lastProp = sprop;
-                    }
-                    overwriting = sprop;
-                }
-                break;
-            }
-            if (sprop == overwriting)
-                break;
-        }
-        if (overwriting) {
-            if (scope->table)
-                SPROP_STORE_PRESERVING_COLLISION(spp, overwriting);
-            scope->entryCount++;
-        }
-        CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-    }
-    METER(addFailures);
-    return NULL;
-}
-
-JSScopeProperty *
-js_ChangeScopePropertyAttrs(JSContext *cx, JSScope *scope,
-                            JSScopeProperty *sprop, uintN attrs, uintN mask,
-                            JSPropertyOp getter, JSPropertyOp setter)
-{
-    JSScopeProperty child, *newsprop, **spp;
-
-    CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-
-    /* Allow only shared (slot-less) => unshared (slot-full) transition. */
-    attrs |= sprop->attrs & mask;
-    JS_ASSERT(!((attrs ^ sprop->attrs) & JSPROP_SHARED) ||
-              !(attrs & JSPROP_SHARED));
-    if (getter == JS_PropertyStub)
-        getter = NULL;
-    if (setter == JS_PropertyStub)
-        setter = NULL;
-    if (sprop->attrs == attrs &&
-        sprop->getter == getter &&
-        sprop->setter == setter) {
-        return sprop;
-    }
-
-    child.id = sprop->id;
-    child.getter = getter;
-    child.setter = setter;
-    child.slot = sprop->slot;
-    child.attrs = attrs;
-    child.flags = sprop->flags;
-    child.shortid = sprop->shortid;
-
-    if (SCOPE_LAST_PROP(scope) == sprop) {
-        /*
-         * Optimize the case where the last property added to scope is changed
-         * to have a different attrs, getter, or setter.  In the last property
-         * case, we need not fork the property tree.  But since we do not call
-         * js_AddScopeProperty, we may need to allocate a new slot directly.
-         */
-        if ((sprop->attrs & JSPROP_SHARED) && !(attrs & JSPROP_SHARED)) {
-            JS_ASSERT(child.slot == SPROP_INVALID_SLOT);
-            if (!js_AllocSlot(cx, scope->object, &child.slot))
-                return NULL;
-        }
-
-        newsprop = GetPropertyTreeChild(cx, sprop->parent, &child);
-        if (newsprop) {
-            spp = js_SearchScope(scope, sprop->id, JS_FALSE);
-            JS_ASSERT(SPROP_FETCH(spp) == sprop);
-
-            if (scope->table)
-                SPROP_STORE_PRESERVING_COLLISION(spp, newsprop);
-            scope->lastProp = newsprop;
-            CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-        }
-    } else {
-        /*
-         * Let js_AddScopeProperty handle this |overwriting| case, including
-         * the conservation of sprop->slot (if it's valid).  We must not call
-         * js_RemoveScopeProperty here, it will free a valid sprop->slot and
-         * js_AddScopeProperty won't re-allocate it.
-         */
-        newsprop = js_AddScopeProperty(cx, scope, child.id,
-                                       child.getter, child.setter, child.slot,
-                                       child.attrs, child.flags, child.shortid);
-    }
-
-#ifdef DUMP_SCOPE_STATS
-    if (!newsprop)
-        METER(changeFailures);
-#endif
-    return newsprop;
-}
-
-JSBool
-js_RemoveScopeProperty(JSContext *cx, JSScope *scope, jsid id)
-{
-    JSScopeProperty **spp, *stored, *sprop;
-    uint32 size;
-
-    JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, scope));
-    CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-    if (SCOPE_IS_SEALED(scope)) {
-        ReportReadOnlyScope(cx, scope);
-        return JS_FALSE;
-    }
-    METER(removes);
-
-    spp = js_SearchScope(scope, id, JS_FALSE);
-    stored = *spp;
-    sprop = SPROP_CLEAR_COLLISION(stored);
-    if (!sprop) {
-        METER(uselessRemoves);
-        return JS_TRUE;
-    }
-
-    /* Convert from a list to a hash so we can handle "middle deletes". */
-    if (!scope->table && sprop != scope->lastProp) {
-        if (!CreateScopeTable(scope)) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-        spp = js_SearchScope(scope, id, JS_FALSE);
-        stored = *spp;
-        sprop = SPROP_CLEAR_COLLISION(stored);
-    }
-
-    /* First, if sprop is unshared and not cleared, free its slot number. */
-    if (SPROP_HAS_VALID_SLOT(sprop, scope))
-        js_FreeSlot(cx, scope->object, sprop->slot);
-
-    /* Next, remove id by setting its entry to a removed or free sentinel. */
-    if (SPROP_HAD_COLLISION(stored)) {
-        JS_ASSERT(scope->table);
-        *spp = SPROP_REMOVED;
-        scope->removedCount++;
-    } else {
-        METER(removeFrees);
-        if (scope->table)
-            *spp = NULL;
-    }
-    scope->entryCount--;
-    JS_RUNTIME_UNMETER(cx->runtime, liveScopeProps);
-
-    /* Update scope->lastProp directly, or set its deferred update flag. */
-    if (sprop == SCOPE_LAST_PROP(scope)) {
-        do {
-            SCOPE_REMOVE_LAST_PROP(scope);
-            if (!SCOPE_HAD_MIDDLE_DELETE(scope))
-                break;
-            sprop = SCOPE_LAST_PROP(scope);
-        } while (sprop && !SCOPE_HAS_PROPERTY(scope, sprop));
-    } else if (!SCOPE_HAD_MIDDLE_DELETE(scope)) {
-        SCOPE_SET_MIDDLE_DELETE(scope);
-    }
-    CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-
-    /* Last, consider shrinking scope's table if its load factor is <= .25. */
-    size = SCOPE_CAPACITY(scope);
-    if (size > MIN_SCOPE_SIZE && scope->entryCount <= size >> 2) {
-        METER(shrinks);
-        (void) ChangeScope(cx, scope, -1);
-    }
-
-    return JS_TRUE;
-}
-
-void
-js_ClearScope(JSContext *cx, JSScope *scope)
-{
-    CHECK_ANCESTOR_LINE(scope, JS_TRUE);
-#ifdef DEBUG
-    JS_LOCK_RUNTIME_VOID(cx->runtime,
-                         cx->runtime->liveScopeProps -= scope->entryCount);
-#endif
-
-    if (scope->table)
-        free(scope->table);
-    SCOPE_CLR_MIDDLE_DELETE(scope);
-    InitMinimalScope(scope);
-}
-
-#ifdef DUMP_SCOPE_STATS
-
-#include <stdio.h>
-#include <math.h>
-
-uint32 js_nkids_max;
-uint32 js_nkids_sum;
-double js_nkids_sqsum;
-uint32 js_nkids_hist[11];
-
-static void
-MeterKidCount(uintN nkids)
-{
-    if (nkids) {
-        js_nkids_sum += nkids;
-        js_nkids_sqsum += (double)nkids * nkids;
-        if (nkids > js_nkids_max)
-            js_nkids_max = nkids;
-    }
-    js_nkids_hist[JS_MIN(nkids, 10)]++;
-}
-
-static void
-MeterPropertyTree(JSScopeProperty *node)
-{
-    uintN i, nkids;
-    JSScopeProperty *kids, *kid;
-    PropTreeKidsChunk *chunk;
-
-    nkids = 0;
-    kids = node->kids;
-    if (kids) {
-        if (KIDS_IS_CHUNKY(kids)) {
-            for (chunk = KIDS_TO_CHUNK(kids); chunk; chunk = chunk->next) {
-                for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                    kid = chunk->kids[i];
-                    if (!kid)
-                        break;
-                    MeterPropertyTree(kid);
-                    nkids++;
-                }
-            }
-        } else {
-            MeterPropertyTree(kids);
-            nkids = 1;
-        }
-    }
-
-    MeterKidCount(nkids);
-}
-
-JS_STATIC_DLL_CALLBACK(JSDHashOperator)
-js_MeterPropertyTree(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 number,
-                     void *arg)
-{
-    JSPropertyTreeEntry *entry = (JSPropertyTreeEntry *)hdr;
-
-    MeterPropertyTree(entry->child);
-    return JS_DHASH_NEXT;
-}
-
-#include "jsprf.h"
-
-static void
-DumpSubtree(JSScopeProperty *sprop, int level, FILE *fp)
-{
-    char buf[10];
-    JSScopeProperty *kids, *kid;
-    PropTreeKidsChunk *chunk;
-    uintN i;
-
-    fprintf(fp, "%*sid %s g/s %p/%p slot %lu attrs %x flags %x shortid %d\n",
-            level, "",
-            JSID_IS_ATOM(sprop->id)
-            ? JS_GetStringBytes(ATOM_TO_STRING(JSID_TO_ATOM(sprop->id)))
-            : JSID_IS_OBJECT(sprop->id)
-            ? js_ValueToPrintableString(cx, OBJECT_JSID_TO_JSVAL(sprop->id))
-            : (JS_snprintf(buf, sizeof buf, "%ld", JSVAL_TO_INT(sprop->id)),
-               buf)
-            (void *) sprop->getter, (void *) sprop->setter,
-            (unsigned long) sprop->slot, sprop->attrs, sprop->flags,
-            sprop->shortid);
-    kids = sprop->kids;
-    if (kids) {
-        ++level;
-        if (KIDS_IS_CHUNKY(kids)) {
-            chunk = KIDS_TO_CHUNK(kids);
-            do {
-                for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                    kid = chunk->kids[i];
-                    if (!kid)
-                        break;
-                    JS_ASSERT(kid->parent == sprop);
-                    DumpSubtree(kid, level, fp);
-                }
-            } while ((chunk = chunk->next) != NULL);
-        } else {
-            kid = kids;
-            DumpSubtree(kid, level, fp);
-        }
-    }
-}
-
-#endif /* DUMP_SCOPE_STATS */
-
-void
-js_SweepScopeProperties(JSRuntime *rt)
-{
-    JSArena **ap, *a;
-    JSScopeProperty *limit, *sprop, *parent, *kids, *kid;
-    uintN liveCount;
-    PropTreeKidsChunk *chunk, *nextChunk;
-    uintN i;
-
-#ifdef DUMP_SCOPE_STATS
-    uint32 livePropCapacity = 0, totalLiveCount = 0;
-    static FILE *logfp;
-    if (!logfp)
-        logfp = fopen("/tmp/proptree.stats", "a");
-
-    MeterKidCount(rt->propertyTreeHash.entryCount);
-    JS_DHashTableEnumerate(&rt->propertyTreeHash, js_MeterPropertyTree, NULL);
-
-    {
-        double mean = 0.0, var = 0.0, sigma = 0.0;
-        double nodesum = rt->livePropTreeNodes;
-        double kidsum = js_nkids_sum;
-        if (nodesum > 0 && kidsum >= 0) {
-            mean = kidsum / nodesum;
-            var = nodesum * js_nkids_sqsum - kidsum * kidsum;
-            if (var < 0.0 || nodesum <= 1)
-                var = 0.0;
-            else
-                var /= nodesum * (nodesum - 1);
-
-            /* Windows says sqrt(0.0) is "-1.#J" (?!) so we must test. */
-            sigma = (var != 0.0) ? sqrt(var) : 0.0;
-        }
-
-        fprintf(logfp,
-                "props %u nodes %g beta %g meankids %g sigma %g max %u",
-                rt->liveScopeProps, nodesum, nodesum / rt->liveScopeProps,
-                mean, sigma, js_nkids_max);
-    }
-
-    fprintf(logfp, " histogram %u %u %u %u %u %u %u %u %u %u %u",
-            js_nkids_hist[0], js_nkids_hist[1],
-            js_nkids_hist[2], js_nkids_hist[3],
-            js_nkids_hist[4], js_nkids_hist[5],
-            js_nkids_hist[6], js_nkids_hist[7],
-            js_nkids_hist[8], js_nkids_hist[9],
-            js_nkids_hist[10]);
-    js_nkids_sum = js_nkids_max = 0;
-    js_nkids_sqsum = 0;
-    memset(js_nkids_hist, 0, sizeof js_nkids_hist);
-#endif
-
-    ap = &rt->propertyArenaPool.first.next;
-    while ((a = *ap) != NULL) {
-        limit = (JSScopeProperty *) a->avail;
-        liveCount = 0;
-        for (sprop = (JSScopeProperty *) a->base; sprop < limit; sprop++) {
-            /* If the id is null, sprop is already on the freelist. */
-            if (sprop->id == JSVAL_NULL)
-                continue;
-
-            /* If the mark bit is set, sprop is alive, so we skip it. */
-            if (sprop->flags & SPROP_MARK) {
-                sprop->flags &= ~SPROP_MARK;
-                liveCount++;
-                continue;
-            }
-
-            /* Ok, sprop is garbage to collect: unlink it from its parent. */
-            RemovePropertyTreeChild(rt, sprop);
-
-            /* Take care to reparent all sprop's kids to their grandparent. */
-            kids = sprop->kids;
-            if (kids) {
-                sprop->kids = NULL;
-                parent = sprop->parent;
-                if (KIDS_IS_CHUNKY(kids)) {
-                    chunk = KIDS_TO_CHUNK(kids);
-                    do {
-                        for (i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
-                            kid = chunk->kids[i];
-                            if (!kid)
-                                break;
-                            JS_ASSERT(kid->parent == sprop);
-                            InsertPropertyTreeChild(rt, parent, kid);
-                        }
-                        nextChunk = chunk->next;
-                        DestroyPropTreeKidsChunk(rt, chunk);
-                    } while ((chunk = nextChunk) != NULL);
-                } else {
-                    kid = kids;
-                    InsertPropertyTreeChild(rt, parent, kid);
-                }
-            }
-
-            /* Clear id so we know (above) that sprop is on the freelist. */
-            sprop->id = JSVAL_NULL;
-            FREENODE_INSERT(rt->propertyFreeList, sprop);
-            JS_RUNTIME_UNMETER(rt, livePropTreeNodes);
-        }
-
-        /* If a contains no live properties, return it to the malloc heap. */
-        if (liveCount == 0) {
-            for (sprop = (JSScopeProperty *) a->base; sprop < limit; sprop++)
-                FREENODE_REMOVE(sprop);
-            JS_ARENA_DESTROY(&rt->propertyArenaPool, a, ap);
-        } else {
-#ifdef DUMP_SCOPE_STATS
-            livePropCapacity += limit - (JSScopeProperty *) a->base;
-            totalLiveCount += liveCount;
-#endif
-            ap = &a->next;
-        }
-    }
-
-#ifdef DUMP_SCOPE_STATS
-    fprintf(logfp, " arenautil %g%%\n",
-            (totalLiveCount * 100.0) / livePropCapacity);
-    fflush(logfp);
-#endif
-
-#ifdef DUMP_PROPERTY_TREE
-    {
-        FILE *dumpfp = fopen("/tmp/proptree.dump", "w");
-        if (dumpfp) {
-            JSPropertyTreeEntry *pte, *end;
-
-            pte = (JSPropertyTreeEntry *) rt->propertyTreeHash.entryStore;
-            end = pte + JS_DHASH_TABLE_SIZE(&rt->propertyTreeHash);
-            while (pte < end) {
-                if (pte->child)
-                    DumpSubtree(pte->child, 0, dumpfp);
-                pte++;
-            }
-            fclose(dumpfp);
-        }
-    }
-#endif
-}
-
-JSBool
-js_InitPropertyTree(JSRuntime *rt)
-{
-    if (!JS_DHashTableInit(&rt->propertyTreeHash, &PropertyTreeHashOps, NULL,
-                           sizeof(JSPropertyTreeEntry), JS_DHASH_MIN_SIZE)) {
-        rt->propertyTreeHash.ops = NULL;
-        return JS_FALSE;
-    }
-    JS_InitArenaPool(&rt->propertyArenaPool, "properties",
-                     256 * sizeof(JSScopeProperty), sizeof(void *));
-    return JS_TRUE;
-}
-
-void
-js_FinishPropertyTree(JSRuntime *rt)
-{
-    if (rt->propertyTreeHash.ops) {
-        JS_DHashTableFinish(&rt->propertyTreeHash);
-        rt->propertyTreeHash.ops = NULL;
-    }
-    JS_FinishArenaPool(&rt->propertyArenaPool);
-}
diff --git a/libs/js/src/jsscope.h b/libs/js/src/jsscope.h
deleted file mode 100644
index 0f8a837c0f..0000000000
--- a/libs/js/src/jsscope.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsscope_h___
-#define jsscope_h___
-/*
- * JS symbol tables.
- */
-#include "jstypes.h"
-#include "jsobj.h"
-#include "jsprvtd.h"
-#include "jspubtd.h"
-
-#ifdef JS_THREADSAFE
-# include "jslock.h"
-#endif
-
-/*
- * Given P independent, non-unique properties each of size S words mapped by
- * all scopes in a runtime, construct a property tree of N nodes each of size
- * S+L words (L for tree linkage).  A nominal L value is 2 for leftmost-child
- * and right-sibling links.  We hope that the N < P by enough that the space
- * overhead of L, and the overhead of scope entries pointing at property tree
- * nodes, is worth it.
- *
- * The tree construction goes as follows.  If any empty scope in the runtime
- * has a property X added to it, find or create a node under the tree root
- * labeled X, and set scope->lastProp to point at that node.  If any non-empty
- * scope whose most recently added property is labeled Y has another property
- * labeled Z added, find or create a node for Z under the node that was added
- * for Y, and set scope->lastProp to point at that node.
- *
- * A property is labeled by its members' values: id, getter, setter, slot,
- * attributes, tiny or short id, and a field telling for..in order.  Note that
- * labels are not unique in the tree, but they are unique among a node's kids
- * (barring rare and benign multi-threaded race condition outcomes, see below)
- * and along any ancestor line from the tree root to a given leaf node (except
- * for the hard case of duplicate formal parameters to a function).
- *
- * Thus the root of the tree represents all empty scopes, and the first ply
- * of the tree represents all scopes containing one property, etc.  Each node
- * in the tree can stand for any number of scopes having the same ordered set
- * of properties, where that node was the last added to the scope.  (We need
- * not store the root of the tree as a node, and do not -- all we need are
- * links to its kids.)
- *
- * Sidebar on for..in loop order: ECMA requires no particular order, but this
- * implementation has promised and delivered property definition order, and
- * compatibility is king.  We could use an order number per property, which
- * would require a sort in js_Enumerate, and an entry order generation number
- * per scope.  An order number beats a list, which should be doubly-linked for
- * O(1) delete.  An even better scheme is to use a parent link in the property
- * tree, so that the ancestor line can be iterated from scope->lastProp when
- * filling in a JSIdArray from back to front.  This parent link also helps the
- * GC to sweep properties iteratively.
- *
- * What if a property Y is deleted from a scope?  If Y is the last property in
- * the scope, we simply adjust the scope's lastProp member after we remove the
- * scope's hash-table entry pointing at that property node.  The parent link
- * mentioned in the for..in sidebar above makes this adjustment O(1).  But if
- * Y comes between X and Z in the scope, then we might have to "fork" the tree
- * at X, leaving X->Y->Z in case other scopes have those properties added in
- * that order; and to finish the fork, we'd add a node labeled Z with the path
- * X->Z, if it doesn't exist.  This could lead to lots of extra nodes, and to
- * O(n^2) growth when deleting lots of properties.
- *
- * Rather, for O(1) growth all around, we should share the path X->Y->Z among
- * scopes having those three properties added in that order, and among scopes
- * having only X->Z where Y was deleted.  All such scopes have a lastProp that
- * points to the Z child of Y.  But a scope in which Y was deleted does not
- * have a table entry for Y, and when iterating that scope by traversing the
- * ancestor line from Z, we will have to test for a table entry for each node,
- * skipping nodes that lack entries.
- *
- * What if we add Y again?  X->Y->Z->Y is wrong and we'll enumerate Y twice.
- * Therefore we must fork in such a case, if not earlier.  Because delete is
- * "bursty", we should not fork eagerly.  Delaying a fork till we are at risk
- * of adding Y after it was deleted already requires a flag in the JSScope, to
- * wit, SCOPE_MIDDLE_DELETE.
- *
- * What about thread safety?  If the property tree operations done by requests
- * are find-node and insert-node, then the only hazard is duplicate insertion.
- * This is harmless except for minor bloat.  When all requests have ended or
- * been suspended, the GC is free to sweep the tree after marking all nodes
- * reachable from scopes, performing remove-node operations as needed.  Note
- * also that the stable storage of the property nodes during active requests
- * permits the property cache (see jsinterp.h) to dereference JSScopeProperty
- * weak references safely.
- *
- * Is the property tree worth it compared to property storage in each table's
- * entries?  To decide, we must find the relation <> between the words used
- * with a property tree and the words required without a tree.
- *
- * Model all scopes as one super-scope of capacity T entries (T a power of 2).
- * Let alpha be the load factor of this double hash-table.  With the property
- * tree, each entry in the table is a word-sized pointer to a node that can be
- * shared by many scopes.  But all such pointers are overhead compared to the
- * situation without the property tree, where the table stores property nodes
- * directly, as entries each of size S words.  With the property tree, we need
- * L=2 extra words per node for siblings and kids pointers.  Without the tree,
- * (1-alpha)*S*T words are wasted on free or removed sentinel-entries required
- * by double hashing.
- *
- * Therefore,
- *
- *      (property tree)                 <> (no property tree)
- *      N*(S+L) + T                     <> S*T
- *      N*(S+L) + T                     <> P*S + (1-alpha)*S*T
- *      N*(S+L) + alpha*T + (1-alpha)*T <> P*S + (1-alpha)*S*T
- *
- * Note that P is alpha*T by definition, so
- *
- *      N*(S+L) + P + (1-alpha)*T <> P*S + (1-alpha)*S*T
- *      N*(S+L)                   <> P*S - P + (1-alpha)*S*T - (1-alpha)*T
- *      N*(S+L)                   <> (P + (1-alpha)*T) * (S-1)
- *      N*(S+L)                   <> (P + (1-alpha)*P/alpha) * (S-1)
- *      N*(S+L)                   <> P * (1/alpha) * (S-1)
- *
- * Let N = P*beta for a compression ratio beta, beta <= 1:
- *
- *      P*beta*(S+L) <> P * (1/alpha) * (S-1)
- *      beta*(S+L)   <> (S-1)/alpha
- *      beta         <> (S-1)/((S+L)*alpha)
- *
- * For S = 6 (32-bit architectures) and L = 2, the property tree wins iff
- *
- *      beta < 5/(8*alpha)
- *
- * We ensure that alpha <= .75, so the property tree wins if beta < .83_.  An
- * average beta from recent Mozilla browser startups was around .6.
- *
- * Can we reduce L?  Observe that the property tree degenerates into a list of
- * lists if at most one property Y follows X in all scopes.  In or near such a
- * case, we waste a word on the right-sibling link outside of the root ply of
- * the tree.  Note also that the root ply tends to be large, so O(n^2) growth
- * searching it is likely, indicating the need for hashing (but with increased
- * thread safety costs).
- *
- * If only K out of N nodes in the property tree have more than one child, we
- * could eliminate the sibling link and overlay a children list or hash-table
- * pointer on the leftmost-child link (which would then be either null or an
- * only-child link; the overlay could be tagged in the low bit of the pointer,
- * or flagged elsewhere in the property tree node, although such a flag must
- * not be considered when comparing node labels during tree search).
- *
- * For such a system, L = 1 + (K * averageChildrenTableSize) / N instead of 2.
- * If K << N, L approaches 1 and the property tree wins if beta < .95.
- *
- * We observe that fan-out below the root ply of the property tree appears to
- * have extremely low degree (see the MeterPropertyTree code that histograms
- * child-counts in jsscope.c), so instead of a hash-table we use a linked list
- * of child node pointer arrays ("kid chunks").  The details are isolated in
- * jsscope.c; others must treat JSScopeProperty.kids as opaque.  We leave it
- * strongly typed for debug-ability of the common (null or one-kid) cases.
- *
- * One final twist (can you stand it?): the mean number of entries per scope
- * in Mozilla is < 5, with a large standard deviation (~8).  Instead of always
- * allocating scope->table, we leave it null while initializing all the other
- * scope members as if it were non-null and minimal-length.  Until a property
- * is added that crosses the threshold of 6 or more entries for hashing, or
- * until a "middle delete" occurs, we use linear search from scope->lastProp
- * to find a given id, and save on the space overhead of a hash table.
- */
-
-struct JSScope {
-    JSObjectMap     map;                /* base class state */
-    JSObject        *object;            /* object that owns this scope */
-    uint8           flags;              /* flags, see below */
-    int8            hashShift;          /* multiplicative hash shift */
-    uint16          dswIndex;           /* Deutsch-Schorr-Waite scaled index */
-    uint32          entryCount;         /* number of entries in table */
-    uint32          removedCount;       /* removed entry sentinels in table */
-    JSScopeProperty **table;            /* table of ptrs to shared tree nodes */
-    JSScopeProperty *lastProp;          /* pointer to last property added */
-#ifdef JS_THREADSAFE
-    JSContext       *ownercx;           /* creating context, NULL if shared */
-    JSThinLock      lock;               /* binary semaphore protecting scope */
-    union {                             /* union lockful and lock-free state: */
-        jsrefcount  count;              /* lock entry count for reentrancy */
-        JSScope     *link;              /* next link in rt->scopeSharingTodo */
-    } u;
-#ifdef DEBUG
-    const char      *file[4];           /* file where lock was (re-)taken */
-    unsigned int    line[4];            /* line where lock was (re-)taken */
-#endif
-#endif
-};
-
-#define OBJ_SCOPE(obj)                  ((JSScope *)(obj)->map)
-
-/* By definition, hashShift = JS_DHASH_BITS - log2(capacity). */
-#define SCOPE_CAPACITY(scope)           JS_BIT(JS_DHASH_BITS-(scope)->hashShift)
-
-/* Scope flags and some macros to hide them from other files than jsscope.c. */
-#define SCOPE_MIDDLE_DELETE             0x0001
-#define SCOPE_SEALED                    0x0002
-
-#define SCOPE_HAD_MIDDLE_DELETE(scope)  ((scope)->flags & SCOPE_MIDDLE_DELETE)
-#define SCOPE_SET_MIDDLE_DELETE(scope)  ((scope)->flags |= SCOPE_MIDDLE_DELETE)
-#define SCOPE_CLR_MIDDLE_DELETE(scope)  ((scope)->flags &= ~SCOPE_MIDDLE_DELETE)
-
-#define SCOPE_IS_SEALED(scope)          ((scope)->flags & SCOPE_SEALED)
-#define SCOPE_SET_SEALED(scope)         ((scope)->flags |= SCOPE_SEALED)
-#if 0
-/*
- * Don't define this, it can't be done safely because JS_LOCK_OBJ will avoid
- * taking the lock if the object owns its scope and the scope is sealed.
- */
-#define SCOPE_CLR_SEALED(scope)         ((scope)->flags &= ~SCOPE_SEALED)
-#endif
-
-/*
- * A little information hiding for scope->lastProp, in case it ever becomes
- * a tagged pointer again.
- */
-#define SCOPE_LAST_PROP(scope)          ((scope)->lastProp)
-#define SCOPE_REMOVE_LAST_PROP(scope)   ((scope)->lastProp =                  \
-                                         (scope)->lastProp->parent)
-
-struct JSScopeProperty {
-    jsid            id;                 /* int-tagged jsval/untagged JSAtom* */
-    JSPropertyOp    getter;             /* getter and setter hooks or objects */
-    JSPropertyOp    setter;
-    uint32          slot;               /* index in obj->slots vector */
-    uint8           attrs;              /* attributes, see jsapi.h JSPROP_* */
-    uint8           flags;              /* flags, see below for defines */
-    int16           shortid;            /* tinyid, or local arg/var index */
-    JSScopeProperty *parent;            /* parent node, reverse for..in order */
-    JSScopeProperty *kids;              /* null, single child, or a tagged ptr
-                                           to many-kids data structure */
-};
-
-/* JSScopeProperty pointer tag bit indicating a collision. */
-#define SPROP_COLLISION                 ((jsuword)1)
-#define SPROP_REMOVED                   ((JSScopeProperty *) SPROP_COLLISION)
-
-/* Macros to get and set sprop pointer values and collision flags. */
-#define SPROP_IS_FREE(sprop)            ((sprop) == NULL)
-#define SPROP_IS_REMOVED(sprop)         ((sprop) == SPROP_REMOVED)
-#define SPROP_IS_LIVE(sprop)            ((sprop) > SPROP_REMOVED)
-#define SPROP_FLAG_COLLISION(spp,sprop) (*(spp) = (JSScopeProperty *)         \
-                                         ((jsuword)(sprop) | SPROP_COLLISION))
-#define SPROP_HAD_COLLISION(sprop)      ((jsuword)(sprop) & SPROP_COLLISION)
-#define SPROP_FETCH(spp)                SPROP_CLEAR_COLLISION(*(spp))
-
-#define SPROP_CLEAR_COLLISION(sprop)                                          \
-    ((JSScopeProperty *) ((jsuword)(sprop) & ~SPROP_COLLISION))
-
-#define SPROP_STORE_PRESERVING_COLLISION(spp, sprop)                          \
-    (*(spp) = (JSScopeProperty *) ((jsuword)(sprop)                           \
-                                   | SPROP_HAD_COLLISION(*(spp))))
-
-/* Bits stored in sprop->flags. */
-#define SPROP_MARK                      0x01
-#define SPROP_IS_DUPLICATE              0x02
-#define SPROP_IS_ALIAS                  0x04
-#define SPROP_HAS_SHORTID               0x08
-#define SPROP_IS_HIDDEN                 0x10    /* a normally-hidden property,
-                                                   e.g., function arg or var */
-
-/*
- * If SPROP_HAS_SHORTID is set in sprop->flags, we use sprop->shortid rather
- * than id when calling sprop's getter or setter.
- */
-#define SPROP_USERID(sprop)                                                   \
-    (((sprop)->flags & SPROP_HAS_SHORTID) ? INT_TO_JSVAL((sprop)->shortid)    \
-                                          : ID_TO_VALUE((sprop)->id))
-
-#define SPROP_INVALID_SLOT              0xffffffff
-
-#define SPROP_HAS_VALID_SLOT(sprop, scope)                                    \
-    ((sprop)->slot < (scope)->map.freeslot)
-
-#define SPROP_HAS_STUB_GETTER(sprop)    (!(sprop)->getter)
-#define SPROP_HAS_STUB_SETTER(sprop)    (!(sprop)->setter)
-
-#define SPROP_CALL_GETTER(cx,sprop,getter,obj,obj2,vp)                        \
-    (!(getter) ||                                                             \
-     (getter)(cx, OBJ_THIS_OBJECT(cx,obj), SPROP_USERID(sprop), vp))
-#define SPROP_CALL_SETTER(cx,sprop,setter,obj,obj2,vp)                        \
-    (!(setter) ||                                                             \
-     (setter)(cx, OBJ_THIS_OBJECT(cx,obj), SPROP_USERID(sprop), vp))
-
-#define SPROP_GET(cx,sprop,obj,obj2,vp)                                       \
-    (((sprop)->attrs & JSPROP_GETTER)                                         \
-     ? js_InternalGetOrSet(cx, obj, (sprop)->id,                              \
-                           OBJECT_TO_JSVAL((sprop)->getter), JSACC_READ,      \
-                           0, 0, vp)                                          \
-     : SPROP_CALL_GETTER(cx, sprop, (sprop)->getter, obj, obj2, vp))
-
-#define SPROP_SET(cx,sprop,obj,obj2,vp)                                       \
-    (((sprop)->attrs & JSPROP_SETTER)                                         \
-     ? js_InternalGetOrSet(cx, obj, (sprop)->id,                              \
-                           OBJECT_TO_JSVAL((sprop)->setter), JSACC_WRITE,     \
-                           1, vp, vp)                                         \
-     : ((sprop)->attrs & JSPROP_GETTER)                                       \
-     ? (JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,                    \
-                             JSMSG_GETTER_ONLY, NULL), JS_FALSE)              \
-     : SPROP_CALL_SETTER(cx, sprop, (sprop)->setter, obj, obj2, vp))
-
-/* Macro for common expression to test for shared permanent attributes. */
-#define SPROP_IS_SHARED_PERMANENT(sprop)                                      \
-    ((~(sprop)->attrs & (JSPROP_SHARED | JSPROP_PERMANENT)) == 0)
-
-extern JSScope *
-js_GetMutableScope(JSContext *cx, JSObject *obj);
-
-extern JSScope *
-js_NewScope(JSContext *cx, jsrefcount nrefs, JSObjectOps *ops, JSClass *clasp,
-            JSObject *obj);
-
-extern void
-js_DestroyScope(JSContext *cx, JSScope *scope);
-
-#define ID_TO_VALUE(id) (JSID_IS_ATOM(id) ? ATOM_JSID_TO_JSVAL(id) :          \
-                         JSID_IS_OBJECT(id) ? OBJECT_JSID_TO_JSVAL(id) :      \
-                         (jsval)(id))
-#define HASH_ID(id)     (JSID_IS_ATOM(id) ? JSID_TO_ATOM(id)->number :        \
-                         JSID_IS_OBJECT(id) ? (jsatomid) JSID_CLRTAG(id) :    \
-                         (jsatomid) JSID_TO_INT(id))
-
-extern JS_FRIEND_API(JSScopeProperty **)
-js_SearchScope(JSScope *scope, jsid id, JSBool adding);
-
-#define SCOPE_GET_PROPERTY(scope, id)                                         \
-    SPROP_FETCH(js_SearchScope(scope, id, JS_FALSE))
-
-#define SCOPE_HAS_PROPERTY(scope, sprop)                                      \
-    (SCOPE_GET_PROPERTY(scope, (sprop)->id) == (sprop))
-
-extern JSScopeProperty *
-js_AddScopeProperty(JSContext *cx, JSScope *scope, jsid id,
-                    JSPropertyOp getter, JSPropertyOp setter, uint32 slot,
-                    uintN attrs, uintN flags, intN shortid);
-
-extern JSScopeProperty *
-js_ChangeScopePropertyAttrs(JSContext *cx, JSScope *scope,
-                            JSScopeProperty *sprop, uintN attrs, uintN mask,
-                            JSPropertyOp getter, JSPropertyOp setter);
-
-extern JSBool
-js_RemoveScopeProperty(JSContext *cx, JSScope *scope, jsid id);
-
-extern void
-js_ClearScope(JSContext *cx, JSScope *scope);
-
-#define MARK_SCOPE_PROPERTY(sprop)      ((sprop)->flags |= SPROP_MARK)
-
-extern void
-js_SweepScopeProperties(JSRuntime *rt);
-
-extern JSBool
-js_InitPropertyTree(JSRuntime *rt);
-
-extern void
-js_FinishPropertyTree(JSRuntime *rt);
-
-#endif /* jsscope_h___ */
diff --git a/libs/js/src/jsscript.c b/libs/js/src/jsscript.c
deleted file mode 100644
index 85c6db420b..0000000000
--- a/libs/js/src/jsscript.c
+++ /dev/null
@@ -1,1473 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS script operations.
- */
-#include "jsstddef.h"
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsdbgapi.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsopcode.h"
-#include "jsscript.h"
-#if JS_HAS_XDR
-#include "jsxdrapi.h"
-#endif
-
-#if JS_HAS_SCRIPT_OBJECT
-
-static const char js_script_exec[] = "Script.prototype.exec";
-static const char js_script_compile[] = "Script.prototype.compile";
-
-#if JS_HAS_TOSOURCE
-static JSBool
-script_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSScript *script;
-    size_t i, j, k, n;
-    char buf[16];
-    jschar *s, *t;
-    uint32 indent;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-
-    /* Let n count the source string length, j the "front porch" length. */
-    j = JS_snprintf(buf, sizeof buf, "(new %s(", js_ScriptClass.name);
-    n = j + 2;
-    if (!script) {
-        /* Let k count the constructor argument string length. */
-        k = 0;
-        s = NULL;               /* quell GCC overwarning */
-    } else {
-        indent = 0;
-        if (argc && !js_ValueToECMAUint32(cx, argv[0], &indent))
-            return JS_FALSE;
-        str = JS_DecompileScript(cx, script, "Script.prototype.toSource",
-                                 (uintN)indent);
-        if (!str)
-            return JS_FALSE;
-        str = js_QuoteString(cx, str, '\'');
-        if (!str)
-            return JS_FALSE;
-        s = JSSTRING_CHARS(str);
-        k = JSSTRING_LENGTH(str);
-        n += k;
-    }
-
-    /* Allocate the source string and copy into it. */
-    t = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
-    if (!t)
-        return JS_FALSE;
-    for (i = 0; i < j; i++)
-        t[i] = buf[i];
-    for (j = 0; j < k; i++, j++)
-        t[i] = s[j];
-    t[i++] = ')';
-    t[i++] = ')';
-    t[i] = 0;
-
-    /* Create and return a JS string for t. */
-    str = JS_NewUCString(cx, t, n);
-    if (!str) {
-        JS_free(cx, t);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif /* JS_HAS_TOSOURCE */
-
-static JSBool
-script_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSScript *script;
-    uint32 indent;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-    if (!script) {
-        *rval = STRING_TO_JSVAL(cx->runtime->emptyString);
-        return JS_TRUE;
-    }
-
-    indent = 0;
-    if (argc && !js_ValueToECMAUint32(cx, argv[0], &indent))
-        return JS_FALSE;
-    str = JS_DecompileScript(cx, script, "Script.prototype.toString",
-                             (uintN)indent);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-script_compile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSScript *oldscript, *script;
-    JSString *str;
-    JSStackFrame *fp, *caller;
-    JSObject *scopeobj;
-    const char *file;
-    uintN line;
-    JSPrincipals *principals;
-
-    /* Make sure obj is a Script object. */
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-
-    /* If no args, leave private undefined and return early. */
-    if (argc == 0)
-        goto out;
-
-    /* Otherwise, the first arg is the script source to compile. */
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-
-    /* Compile using the caller's scope chain, which js_Invoke passes to fp. */
-    fp = cx->fp;
-    caller = JS_GetScriptedCaller(cx, fp);
-    JS_ASSERT(!caller || fp->scopeChain == caller->scopeChain);
-
-    scopeobj = NULL;
-    if (argc >= 2) {
-        if (!js_ValueToObject(cx, argv[1], &scopeobj))
-            return JS_FALSE;
-        argv[1] = OBJECT_TO_JSVAL(scopeobj);
-    }
-    if (caller) {
-        if (!scopeobj)
-            scopeobj = caller->scopeChain;
-
-        file = caller->script->filename;
-        line = js_PCToLineNumber(cx, caller->script, caller->pc);
-        principals = JS_EvalFramePrincipals(cx, fp, caller);
-    } else {
-        file = NULL;
-        line = 0;
-        principals = NULL;
-    }
-
-    /* Ensure we compile this script with the right (inner) principals. */
-    scopeobj = js_CheckScopeChainValidity(cx, scopeobj, js_script_compile);
-    if (!scopeobj)
-        return JS_FALSE;
-
-    /*
-     * Compile the new script using the caller's scope chain, a la eval().
-     * Unlike jsobj.c:obj_eval, however, we do not set JSFRAME_EVAL in fp's
-     * flags, because compilation is here separated from execution, and the
-     * run-time scope chain may not match the compile-time.  JSFRAME_EVAL is
-     * tested in jsemit.c and jsscan.c to optimize based on identity of run-
-     * and compile-time scope.
-     */
-    fp->flags |= JSFRAME_SCRIPT_OBJECT;
-    script = JS_CompileUCScriptForPrincipals(cx, scopeobj, principals,
-                                             JSSTRING_CHARS(str),
-                                             JSSTRING_LENGTH(str),
-                                             file, line);
-    if (!script)
-        return JS_FALSE;
-
-    /* Swap script for obj's old script, if any. */
-    oldscript = (JSScript *) JS_GetPrivate(cx, obj);
-    if (!JS_SetPrivate(cx, obj, script)) {
-        js_DestroyScript(cx, script);
-        return JS_FALSE;
-    }
-    if (oldscript)
-        js_DestroyScript(cx, oldscript);
-
-    script->object = obj;
-out:
-    /* Return the object. */
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSBool
-script_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSScript *script;
-    JSObject *scopeobj, *parent;
-    JSStackFrame *fp, *caller;
-    JSPrincipals *principals;
-
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-    if (!script)
-        return JS_TRUE;
-
-    scopeobj = NULL;
-    if (argc) {
-        if (!js_ValueToObject(cx, argv[0], &scopeobj))
-            return JS_FALSE;
-        argv[0] = OBJECT_TO_JSVAL(scopeobj);
-    }
-
-    /*
-     * Emulate eval() by using caller's this, var object, sharp array, etc.,
-     * all propagated by js_Execute via a non-null fourth (down) argument to
-     * js_Execute.  If there is no scripted caller, js_Execute uses its second
-     * (chain) argument to set the exec frame's varobj, thisp, and scopeChain.
-     *
-     * Unlike eval, which the compiler detects, Script.prototype.exec may be
-     * called from a lightweight function, or even from native code (in which
-     * case fp->varobj and fp->scopeChain are null).  If exec is called from
-     * a lightweight function, we will need to get a Call object representing
-     * its frame, to act as the var object and scope chain head.
-     */
-    fp = cx->fp;
-    caller = JS_GetScriptedCaller(cx, fp);
-    if (caller && !caller->varobj) {
-        /* Called from a lightweight function. */
-        JS_ASSERT(caller->fun && !(caller->fun->flags & JSFUN_HEAVYWEIGHT));
-
-        /* Scope chain links from Call object to callee's parent. */
-        parent = OBJ_GET_PARENT(cx, JSVAL_TO_OBJECT(caller->argv[-2]));
-        if (!js_GetCallObject(cx, caller, parent))
-            return JS_FALSE;
-    }
-
-    if (!scopeobj) {
-        /* No scope object passed in: try to use the caller's scope chain. */
-        if (caller) {
-            /*
-             * Load caller->scopeChain after the conditional js_GetCallObject
-             * call above, which resets scopeChain as well as varobj.
-             */
-            scopeobj = caller->scopeChain;
-        } else {
-            /*
-             * Called from native code, so we don't know what scope object to
-             * use.  We could use parent (see above), but Script.prototype.exec
-             * might be a shared/sealed "superglobal" method.  A more general
-             * approach would use cx->globalObject, which will be the same as
-             * exec.__parent__ in the non-superglobal case.  In the superglobal
-             * case it's the right object: the global, not the superglobal.
-             */
-            scopeobj = cx->globalObject;
-        }
-    }
-
-    scopeobj = js_CheckScopeChainValidity(cx, scopeobj, js_script_exec);
-    if (!scopeobj)
-        return JS_FALSE;
-
-    /* Belt-and-braces: check that this script object has access to scopeobj. */
-    principals = script->principals;
-    if (!js_CheckPrincipalsAccess(cx, scopeobj, principals, js_script_exec))
-        return JS_FALSE;
-
-    return js_Execute(cx, scopeobj, script, caller, JSFRAME_EVAL, rval);
-}
-
-#if JS_HAS_XDR
-
-static JSBool
-XDRAtomListElement(JSXDRState *xdr, JSAtomListElement *ale)
-{
-    jsval value;
-    jsatomid index;
-
-    if (xdr->mode == JSXDR_ENCODE)
-        value = ATOM_KEY(ALE_ATOM(ale));
-
-    index = ALE_INDEX(ale);
-    if (!JS_XDRUint32(xdr, &index))
-        return JS_FALSE;
-    ALE_SET_INDEX(ale, index);
-
-    if (!JS_XDRValue(xdr, &value))
-        return JS_FALSE;
-
-    if (xdr->mode == JSXDR_DECODE) {
-        if (!ALE_SET_ATOM(ale, js_AtomizeValue(xdr->cx, value, 0)))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-XDRAtomMap(JSXDRState *xdr, JSAtomMap *map)
-{
-    uint32 length;
-    uintN i;
-    JSBool ok;
-
-    if (xdr->mode == JSXDR_ENCODE)
-        length = map->length;
-
-    if (!JS_XDRUint32(xdr, &length))
-        return JS_FALSE;
-
-    if (xdr->mode == JSXDR_DECODE) {
-        JSContext *cx;
-        void *mark;
-        JSAtomList al;
-        JSAtomListElement *ale;
-
-        cx = xdr->cx;
-        mark = JS_ARENA_MARK(&cx->tempPool);
-        ATOM_LIST_INIT(&al);
-        for (i = 0; i < length; i++) {
-            JS_ARENA_ALLOCATE_TYPE(ale, JSAtomListElement, &cx->tempPool);
-            if (!ale ||
-                !XDRAtomListElement(xdr, ale)) {
-                if (!ale)
-                    JS_ReportOutOfMemory(cx);
-                JS_ARENA_RELEASE(&cx->tempPool, mark);
-                return JS_FALSE;
-            }
-            ALE_SET_NEXT(ale, al.list);
-            al.count++;
-            al.list = ale;
-        }
-        ok = js_InitAtomMap(cx, map, &al);
-        JS_ARENA_RELEASE(&cx->tempPool, mark);
-        return ok;
-    }
-
-    if (xdr->mode == JSXDR_ENCODE) {
-        JSAtomListElement ale;
-
-        for (i = 0; i < map->length; i++) {
-            ALE_SET_ATOM(&ale, map->vector[i]);
-            ALE_SET_INDEX(&ale, i);
-            if (!XDRAtomListElement(xdr, &ale))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *hasMagic)
-{
-    JSContext *cx;
-    JSScript *script, *newscript;
-    uint32 length, lineno, depth, magic, nsrcnotes, ntrynotes;
-    uint32 prologLength, version;
-    JSBool filenameWasSaved;
-    jssrcnote *notes, *sn;
-
-    cx = xdr->cx;
-    script = *scriptp;
-    nsrcnotes = ntrynotes = 0;
-    filenameWasSaved = JS_FALSE;
-    notes = NULL;
-
-    /*
-     * Encode prologLength and version after script->length (_2 or greater),
-     * but decode both new (>= _2) and old, prolog&version-free (_1) scripts.
-     * Version _3 supports principals serialization.  Version _4 reorders the
-     * nsrcnotes and ntrynotes fields to come before everything except magic,
-     * length, prologLength, and version, so that srcnote and trynote storage
-     * can be allocated as part of the JSScript (along with bytecode storage).
-     */
-    if (xdr->mode == JSXDR_ENCODE)
-        magic = JSXDR_MAGIC_SCRIPT_CURRENT;
-    if (!JS_XDRUint32(xdr, &magic))
-        return JS_FALSE;
-    if (magic != JSXDR_MAGIC_SCRIPT_4 &&
-        magic != JSXDR_MAGIC_SCRIPT_3 &&
-        magic != JSXDR_MAGIC_SCRIPT_2 &&
-        magic != JSXDR_MAGIC_SCRIPT_1) {
-        if (!hasMagic) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_SCRIPT_MAGIC);
-            return JS_FALSE;
-        }
-        *hasMagic = JS_FALSE;
-        return JS_TRUE;
-    }
-    if (hasMagic)
-        *hasMagic = JS_TRUE;
-
-    if (xdr->mode == JSXDR_ENCODE) {
-        length = script->length;
-        prologLength = PTRDIFF(script->main, script->code, jsbytecode);
-        JS_ASSERT((int16)script->version != JSVERSION_UNKNOWN);
-        version = (uint32)script->version | (script->numGlobalVars << 16);
-        lineno = (uint32)script->lineno;
-        depth = (uint32)script->depth;
-
-        /* Count the srcnotes, keeping notes pointing at the first one. */
-        notes = SCRIPT_NOTES(script);
-        for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn))
-            continue;
-        nsrcnotes = PTRDIFF(sn, notes, jssrcnote);
-        nsrcnotes++;            /* room for the terminator */
-
-        /* Count the trynotes. */
-        if (script->trynotes) {
-            while (script->trynotes[ntrynotes].catchStart)
-                ntrynotes++;
-            ntrynotes++;        /* room for the end marker */
-        }
-    }
-
-    if (!JS_XDRUint32(xdr, &length))
-        return JS_FALSE;
-    if (magic >= JSXDR_MAGIC_SCRIPT_2) {
-        if (!JS_XDRUint32(xdr, &prologLength))
-            return JS_FALSE;
-        if (!JS_XDRUint32(xdr, &version))
-            return JS_FALSE;
-
-        /* To fuse allocations, we need srcnote and trynote counts early. */
-        if (magic >= JSXDR_MAGIC_SCRIPT_4) {
-            if (!JS_XDRUint32(xdr, &nsrcnotes))
-                return JS_FALSE;
-            if (!JS_XDRUint32(xdr, &ntrynotes))
-                return JS_FALSE;
-        }
-    }
-
-    if (xdr->mode == JSXDR_DECODE) {
-        script = js_NewScript(cx, length, nsrcnotes, ntrynotes);
-        if (!script)
-            return JS_FALSE;
-        if (magic >= JSXDR_MAGIC_SCRIPT_2) {
-            script->main += prologLength;
-            script->version = (JSVersion) (version & 0xffff);
-            script->numGlobalVars = (uint16) (version >> 16);
-
-            /* If we know nsrcnotes, we allocated space for notes in script. */
-            if (magic >= JSXDR_MAGIC_SCRIPT_4)
-                notes = SCRIPT_NOTES(script);
-        }
-        *scriptp = script;
-    }
-
-    /*
-     * Control hereafter must goto error on failure, in order for the DECODE
-     * case to destroy script and conditionally free notes, which if non-null
-     * in the (DECODE and magic < _4) case must point at a temporary vector
-     * allocated just below.
-     */
-    if (!JS_XDRBytes(xdr, (char *)script->code, length * sizeof(jsbytecode)) ||
-        !XDRAtomMap(xdr, &script->atomMap)) {
-        goto error;
-    }
-
-    if (magic < JSXDR_MAGIC_SCRIPT_4) {
-        if (!JS_XDRUint32(xdr, &nsrcnotes))
-            goto error;
-        if (xdr->mode == JSXDR_DECODE) {
-            notes = (jssrcnote *) JS_malloc(cx, nsrcnotes * sizeof(jssrcnote));
-            if (!notes)
-                goto error;
-        }
-    }
-
-    if (!JS_XDRBytes(xdr, (char *)notes, nsrcnotes * sizeof(jssrcnote)) ||
-        !JS_XDRCStringOrNull(xdr, (char **)&script->filename) ||
-        !JS_XDRUint32(xdr, &lineno) ||
-        !JS_XDRUint32(xdr, &depth) ||
-        (magic < JSXDR_MAGIC_SCRIPT_4 && !JS_XDRUint32(xdr, &ntrynotes))) {
-        goto error;
-    }
-
-    /* Script principals transcoding support comes with versions >= _3. */
-    if (magic >= JSXDR_MAGIC_SCRIPT_3) {
-        JSPrincipals *principals;
-        uint32 encodeable;
-
-        if (xdr->mode == JSXDR_ENCODE) {
-            principals = script->principals;
-            encodeable = (cx->runtime->principalsTranscoder != NULL);
-            if (!JS_XDRUint32(xdr, &encodeable))
-                goto error;
-            if (encodeable &&
-                !cx->runtime->principalsTranscoder(xdr, &principals)) {
-                goto error;
-            }
-        } else {
-            if (!JS_XDRUint32(xdr, &encodeable))
-                goto error;
-            if (encodeable) {
-                if (!cx->runtime->principalsTranscoder) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_CANT_DECODE_PRINCIPALS);
-                    goto error;
-                }
-                if (!cx->runtime->principalsTranscoder(xdr, &principals))
-                    goto error;
-                script->principals = principals;
-            }
-        }
-    }
-
-    if (xdr->mode == JSXDR_DECODE) {
-        const char *filename = script->filename;
-        if (filename) {
-            filename = js_SaveScriptFilename(cx, filename);
-            if (!filename)
-                goto error;
-            JS_free(cx, (void *) script->filename);
-            script->filename = filename;
-            filenameWasSaved = JS_TRUE;
-        }
-        script->lineno = (uintN)lineno;
-        script->depth = (uintN)depth;
-
-        if (magic < JSXDR_MAGIC_SCRIPT_4) {
-            /*
-             * Argh, we have to reallocate script, copy notes into the extra
-             * space after the bytecodes, and free the temporary notes vector.
-             * First, add enough slop to nsrcnotes so we can align the address
-             * after the srcnotes of the first trynote.
-             */
-            uint32 osrcnotes = nsrcnotes;
-
-            if (ntrynotes)
-                nsrcnotes += JSTRYNOTE_ALIGNMASK;
-            newscript = (JSScript *) JS_realloc(cx, script,
-                                                sizeof(JSScript) +
-                                                length * sizeof(jsbytecode) +
-                                                nsrcnotes * sizeof(jssrcnote) +
-                                                ntrynotes * sizeof(JSTryNote));
-            if (!newscript)
-                goto error;
-
-            *scriptp = script = newscript;
-            script->code = (jsbytecode *)(script + 1);
-            script->main = script->code + prologLength;
-            memcpy(script->code + length, notes, osrcnotes * sizeof(jssrcnote));
-            JS_free(cx, (void *) notes);
-            notes = NULL;
-            if (ntrynotes) {
-                script->trynotes = (JSTryNote *)
-                                   ((jsword)(SCRIPT_NOTES(script) + nsrcnotes) &
-                                    ~(jsword)JSTRYNOTE_ALIGNMASK);
-                memset(script->trynotes, 0, ntrynotes * sizeof(JSTryNote));
-            }
-        }
-    }
-
-    while (ntrynotes) {
-        JSTryNote *tn = &script->trynotes[--ntrynotes];
-        uint32 start = (uint32) tn->start,
-               catchLength = (uint32) tn->length,
-               catchStart = (uint32) tn->catchStart;
-
-        if (!JS_XDRUint32(xdr, &start) ||
-            !JS_XDRUint32(xdr, &catchLength) ||
-            !JS_XDRUint32(xdr, &catchStart)) {
-            goto error;
-        }
-        tn->start = (ptrdiff_t) start;
-        tn->length = (ptrdiff_t) catchLength;
-        tn->catchStart = (ptrdiff_t) catchStart;
-    }
-    return JS_TRUE;
-
-  error:
-    if (xdr->mode == JSXDR_DECODE) {
-        if (script->filename && !filenameWasSaved) {
-            JS_free(cx, (void *) script->filename);
-            script->filename = NULL;
-        }
-        if (notes && magic < JSXDR_MAGIC_SCRIPT_4)
-            JS_free(cx, (void *) notes);
-        js_DestroyScript(cx, script);
-        *scriptp = NULL;
-    }
-    return JS_FALSE;
-}
-
-#if JS_HAS_XDR_FREEZE_THAW
-/*
- * These cannot be exposed to web content, and chrome does not need them, so
- * we take them out of the Mozilla client altogether.  Fortunately, there is
- * no way to serialize a native function (see fun_xdrObject in jsfun.c).
- */
-
-static JSBool
-script_freeze(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSXDRState *xdr;
-    JSScript *script;
-    JSBool ok, hasMagic;
-    uint32 len;
-    void *buf;
-    JSString *str;
-
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-    if (!script)
-        return JS_TRUE;
-
-    /* create new XDR */
-    xdr = JS_XDRNewMem(cx, JSXDR_ENCODE);
-    if (!xdr)
-        return JS_FALSE;
-
-    /* write  */
-    ok = js_XDRScript(xdr, &script, &hasMagic);
-    if (!ok)
-        goto out;
-    if (!hasMagic) {
-        *rval = JSVAL_VOID;
-        goto out;
-    }
-
-    buf = JS_XDRMemGetData(xdr, &len);
-    if (!buf) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-    JS_ASSERT((jsword)buf % sizeof(jschar) == 0);
-    len /= sizeof(jschar);
-    str = JS_NewUCStringCopyN(cx, (jschar *)buf, len);
-    if (!str) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-#if IS_BIG_ENDIAN
-  {
-    jschar *chars;
-    uint32 i;
-
-    /* Swap bytes in Unichars to keep frozen strings machine-independent. */
-    chars = JS_GetStringChars(str);
-    for (i = 0; i < len; i++)
-        chars[i] = JSXDR_SWAB16(chars[i]);
-  }
-#endif
-    *rval = STRING_TO_JSVAL(str);
-
-out:
-    JS_XDRDestroy(xdr);
-    return ok;
-}
-
-static JSBool
-script_thaw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-            jsval *rval)
-{
-    JSXDRState *xdr;
-    JSString *str;
-    void *buf;
-    uint32 len;
-    JSScript *script, *oldscript;
-    JSBool ok, hasMagic;
-
-    if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv))
-        return JS_FALSE;
-
-    if (argc == 0)
-        return JS_TRUE;
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-
-    /* create new XDR */
-    xdr = JS_XDRNewMem(cx, JSXDR_DECODE);
-    if (!xdr)
-        return JS_FALSE;
-
-    buf = JS_GetStringChars(str);
-    len = JS_GetStringLength(str);
-#if IS_BIG_ENDIAN
-  {
-    jschar *from, *to;
-    uint32 i;
-
-    /* Swap bytes in Unichars to keep frozen strings machine-independent. */
-    from = (jschar *)buf;
-    to = (jschar *) JS_malloc(cx, len * sizeof(jschar));
-    if (!to) {
-        JS_XDRDestroy(xdr);
-        return JS_FALSE;
-    }
-    for (i = 0; i < len; i++)
-        to[i] = JSXDR_SWAB16(from[i]);
-    buf = (char *)to;
-  }
-#endif
-    len *= sizeof(jschar);
-    JS_XDRMemSetData(xdr, buf, len);
-
-    /* XXXbe should magic mismatch be error, or false return value? */
-    ok = js_XDRScript(xdr, &script, &hasMagic);
-    if (!ok)
-        goto out;
-    if (!hasMagic) {
-        *rval = JSVAL_FALSE;
-        goto out;
-    }
-
-    /* Swap script for obj's old script, if any. */
-    oldscript = (JSScript *) JS_GetPrivate(cx, obj);
-    ok = JS_SetPrivate(cx, obj, script);
-    if (!ok) {
-        JS_free(cx, script);
-        goto out;
-    }
-    if (oldscript)
-        js_DestroyScript(cx, oldscript);
-
-    script->object = obj;
-    js_CallNewScriptHook(cx, script, NULL);
-
-out:
-    /*
-     * We reset the buffer to be NULL so that it doesn't free the chars
-     * memory owned by str (argv[0]).
-     */
-    JS_XDRMemSetData(xdr, NULL, 0);
-    JS_XDRDestroy(xdr);
-#if IS_BIG_ENDIAN
-    JS_free(cx, buf);
-#endif
-    *rval = JSVAL_TRUE;
-    return ok;
-}
-
-static const char js_thaw_str[] = "thaw";
-
-#endif /* JS_HAS_XDR_FREEZE_THAW */
-#endif /* JS_HAS_XDR */
-
-static JSFunctionSpec script_methods[] = {
-#if JS_HAS_TOSOURCE
-    {js_toSource_str,   script_toSource,        0,0,0},
-#endif
-    {js_toString_str,   script_toString,        0,0,0},
-    {"compile",         script_compile,         2,0,0},
-    {"exec",            script_exec,            1,0,0},
-#if JS_HAS_XDR_FREEZE_THAW
-    {"freeze",          script_freeze,          0,0,0},
-    {js_thaw_str,       script_thaw,            1,0,0},
-#endif /* JS_HAS_XDR_FREEZE_THAW */
-    {0,0,0,0,0}
-};
-
-#endif /* JS_HAS_SCRIPT_OBJECT */
-
-static void
-script_finalize(JSContext *cx, JSObject *obj)
-{
-    JSScript *script;
-
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-    if (script)
-        js_DestroyScript(cx, script);
-}
-
-static JSBool
-script_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-#if JS_HAS_SCRIPT_OBJECT
-    return script_exec(cx, JSVAL_TO_OBJECT(argv[-2]), argc, argv, rval);
-#else
-    return JS_FALSE;
-#endif
-}
-
-static uint32
-script_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSScript *script;
-
-    script = (JSScript *) JS_GetPrivate(cx, obj);
-    if (script)
-        js_MarkScript(cx, script, arg);
-    return 0;
-}
-
-JS_FRIEND_DATA(JSClass) js_ScriptClass = {
-    js_Script_str,
-    JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   script_finalize,
-    NULL,             NULL,             script_call,      NULL,/*XXXbe xdr*/
-    NULL,             NULL,             script_mark,      0
-};
-
-#if JS_HAS_SCRIPT_OBJECT
-
-static JSBool
-Script(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    /* If not constructing, replace obj with a new Script object. */
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        obj = js_NewObject(cx, &js_ScriptClass, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-    }
-    return script_compile(cx, obj, argc, argv, rval);
-}
-
-#if JS_HAS_XDR_FREEZE_THAW
-
-static JSBool
-script_static_thaw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    obj = js_NewObject(cx, &js_ScriptClass, NULL, NULL);
-    if (!obj)
-        return JS_FALSE;
-    if (!script_thaw(cx, obj, argc, argv, rval))
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec script_static_methods[] = {
-    {js_thaw_str,       script_static_thaw,     1,0,0},
-    {0,0,0,0,0}
-};
-
-#else  /* !JS_HAS_XDR_FREEZE_THAW */
-
-#define script_static_methods   NULL
-
-#endif /* !JS_HAS_XDR_FREEZE_THAW */
-
-JSObject *
-js_InitScriptClass(JSContext *cx, JSObject *obj)
-{
-    return JS_InitClass(cx, obj, NULL, &js_ScriptClass, Script, 1,
-                        NULL, script_methods, NULL, script_static_methods);
-}
-
-#endif /* JS_HAS_SCRIPT_OBJECT */
-
-/*
- * Shared script filename management.
- */
-JS_STATIC_DLL_CALLBACK(int)
-js_compare_strings(const void *k1, const void *k2)
-{
-    return strcmp(k1, k2) == 0;
-}
-
-/* Shared with jsatom.c to save code space. */
-extern void * JS_DLL_CALLBACK
-js_alloc_table_space(void *priv, size_t size);
-
-extern void JS_DLL_CALLBACK
-js_free_table_space(void *priv, void *item);
-
-/* NB: This struct overlays JSHashEntry -- see jshash.h, do not reorganize. */
-typedef struct ScriptFilenameEntry {
-    JSHashEntry         *next;          /* hash chain linkage */
-    JSHashNumber        keyHash;        /* key hash function result */
-    const void          *key;           /* ptr to filename, below */
-    uint32              flags;          /* user-defined filename prefix flags */
-    JSPackedBool        mark;           /* GC mark flag */
-    char                filename[3];    /* two or more bytes, NUL-terminated */
-} ScriptFilenameEntry;
-
-JS_STATIC_DLL_CALLBACK(JSHashEntry *)
-js_alloc_sftbl_entry(void *priv, const void *key)
-{
-    size_t nbytes = offsetof(ScriptFilenameEntry, filename) + strlen(key) + 1;
-
-    return (JSHashEntry *) malloc(JS_MAX(nbytes, sizeof(JSHashEntry)));
-}
-
-JS_STATIC_DLL_CALLBACK(void)
-js_free_sftbl_entry(void *priv, JSHashEntry *he, uintN flag)
-{
-    if (flag != HT_FREE_ENTRY)
-        return;
-    free(he);
-}
-
-static JSHashAllocOps sftbl_alloc_ops = {
-    js_alloc_table_space,   js_free_table_space,
-    js_alloc_sftbl_entry,   js_free_sftbl_entry
-};
-
-JSBool
-js_InitRuntimeScriptState(JSRuntime *rt)
-{
-#ifdef JS_THREADSAFE
-    JS_ASSERT(!rt->scriptFilenameTableLock);
-    rt->scriptFilenameTableLock = JS_NEW_LOCK();
-    if (!rt->scriptFilenameTableLock)
-        return JS_FALSE;
-#endif
-    JS_ASSERT(!rt->scriptFilenameTable);
-    rt->scriptFilenameTable =
-        JS_NewHashTable(16, JS_HashString, js_compare_strings, NULL,
-                        &sftbl_alloc_ops, NULL);
-    if (!rt->scriptFilenameTable) {
-        js_FinishRuntimeScriptState(rt);    /* free lock if threadsafe */
-        return JS_FALSE;
-    }
-    JS_INIT_CLIST(&rt->scriptFilenamePrefixes);
-    return JS_TRUE;
-}
-
-typedef struct ScriptFilenamePrefix {
-    JSCList     links;      /* circular list linkage for easy deletion */
-    const char  *name;      /* pointer to pinned ScriptFilenameEntry string */
-    size_t      length;     /* prefix string length, precomputed */
-    uint32      flags;      /* user-defined flags to inherit from this prefix */
-} ScriptFilenamePrefix;
-
-void
-js_FinishRuntimeScriptState(JSRuntime *rt)
-{
-    if (rt->scriptFilenameTable) {
-        JS_HashTableDestroy(rt->scriptFilenameTable);
-        rt->scriptFilenameTable = NULL;
-    }
-#ifdef JS_THREADSAFE
-    if (rt->scriptFilenameTableLock) {
-        JS_DESTROY_LOCK(rt->scriptFilenameTableLock);
-        rt->scriptFilenameTableLock = NULL;
-    }
-#endif
-}
-
-void
-js_FreeRuntimeScriptState(JSRuntime *rt)
-{
-    ScriptFilenamePrefix *sfp;
-
-    while (!JS_CLIST_IS_EMPTY(&rt->scriptFilenamePrefixes)) {
-        sfp = (ScriptFilenamePrefix *) rt->scriptFilenamePrefixes.next;
-        JS_REMOVE_LINK(&sfp->links);
-        free(sfp);
-    }
-    js_FinishRuntimeScriptState(rt);
-}
-
-#ifdef DEBUG_brendan
-size_t sftbl_savings = 0;
-#endif
-
-static ScriptFilenameEntry *
-SaveScriptFilename(JSRuntime *rt, const char *filename, uint32 flags)
-{
-    JSHashTable *table;
-    JSHashNumber hash;
-    JSHashEntry **hep;
-    ScriptFilenameEntry *sfe;
-    size_t length;
-    JSCList *head, *link;
-    ScriptFilenamePrefix *sfp;
-
-    table = rt->scriptFilenameTable;
-    hash = JS_HashString(filename);
-    hep = JS_HashTableRawLookup(table, hash, filename);
-    sfe = (ScriptFilenameEntry *) *hep;
-#ifdef DEBUG_brendan
-    if (sfe)
-        sftbl_savings += strlen(sfe->filename);
-#endif
-
-    if (!sfe) {
-        sfe = (ScriptFilenameEntry *)
-              JS_HashTableRawAdd(table, hep, hash, filename, NULL);
-        if (!sfe)
-            return NULL;
-        sfe->key = strcpy(sfe->filename, filename);
-        sfe->flags = 0;
-        sfe->mark = JS_FALSE;
-    }
-
-    /* If saving a prefix, add it to the set in rt->scriptFilenamePrefixes. */
-    if (flags != 0) {
-        /* Search in case filename was saved already; we must be idempotent. */
-        sfp = NULL;
-        length = strlen(filename);
-        for (head = link = &rt->scriptFilenamePrefixes;
-             link->next != head;
-             link = link->next) {
-            /* Lag link behind sfp to insert in non-increasing length order. */
-            sfp = (ScriptFilenamePrefix *) link->next;
-            if (!strcmp(sfp->name, filename))
-                break;
-            if (sfp->length <= length) {
-                sfp = NULL;
-                break;
-            }
-            sfp = NULL;
-        }
-
-        if (!sfp) {
-            /* No such prefix: add one now. */
-            sfp = (ScriptFilenamePrefix *) malloc(sizeof(ScriptFilenamePrefix));
-            if (!sfp)
-                return NULL;
-            JS_INSERT_AFTER(&sfp->links, link);
-            sfp->name = sfe->filename;
-            sfp->length = length;
-            sfp->flags = 0;
-        }
-
-        /*
-         * Accumulate flags in both sfe and sfp: sfe for later access from the
-         * JS_GetScriptedCallerFilenameFlags debug-API, and sfp so that longer
-         * filename entries can inherit by prefix.
-         */
-        sfe->flags |= flags;
-        sfp->flags |= flags;
-    }
-
-    return sfe;
-}
-
-const char *
-js_SaveScriptFilename(JSContext *cx, const char *filename)
-{
-    JSRuntime *rt;
-    ScriptFilenameEntry *sfe;
-    JSCList *head, *link;
-    ScriptFilenamePrefix *sfp;
-
-    rt = cx->runtime;
-    JS_ACQUIRE_LOCK(rt->scriptFilenameTableLock);
-    sfe = SaveScriptFilename(rt, filename, 0);
-    if (!sfe) {
-        JS_RELEASE_LOCK(rt->scriptFilenameTableLock);
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-
-    /*
-     * Try to inherit flags by prefix.  We assume there won't be more than a
-     * few (dozen! ;-) prefixes, so linear search is tolerable.
-     * XXXbe every time I've assumed that in the JS engine, I've been wrong!
-     */
-    for (head = &rt->scriptFilenamePrefixes, link = head->next;
-         link != head;
-         link = link->next) {
-        sfp = (ScriptFilenamePrefix *) link;
-        if (!strncmp(sfp->name, filename, sfp->length)) {
-            sfe->flags |= sfp->flags;
-            break;
-        }
-    }
-    JS_RELEASE_LOCK(rt->scriptFilenameTableLock);
-    return sfe->filename;
-}
-
-const char *
-js_SaveScriptFilenameRT(JSRuntime *rt, const char *filename, uint32 flags)
-{
-    ScriptFilenameEntry *sfe;
-
-    /* This may be called very early, via the jsdbgapi.h entry point. */
-    if (!rt->scriptFilenameTable && !js_InitRuntimeScriptState(rt))
-        return NULL;
-
-    JS_ACQUIRE_LOCK(rt->scriptFilenameTableLock);
-    sfe = SaveScriptFilename(rt, filename, flags);
-    JS_RELEASE_LOCK(rt->scriptFilenameTableLock);
-    if (!sfe)
-        return NULL;
-
-    return sfe->filename;
-}
-
-/*
- * Back up from a saved filename by its offset within its hash table entry.
- */
-#define FILENAME_TO_SFE(fn) \
-    ((ScriptFilenameEntry *) ((fn) - offsetof(ScriptFilenameEntry, filename)))
-
-/*
- * The sfe->key member, redundant given sfe->filename but required by the old
- * jshash.c code, here gives us a useful sanity check.  This assertion will
- * very likely botch if someone tries to mark a string that wasn't allocated
- * as an sfe->filename.
- */
-#define ASSERT_VALID_SFE(sfe)   JS_ASSERT((sfe)->key == (sfe)->filename)
-
-uint32
-js_GetScriptFilenameFlags(const char *filename)
-{
-    ScriptFilenameEntry *sfe;
-
-    sfe = FILENAME_TO_SFE(filename);
-    ASSERT_VALID_SFE(sfe);
-    return sfe->flags;
-}
-
-void
-js_MarkScriptFilename(const char *filename)
-{
-    ScriptFilenameEntry *sfe;
-
-    sfe = FILENAME_TO_SFE(filename);
-    ASSERT_VALID_SFE(sfe);
-    sfe->mark = JS_TRUE;
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_script_filename_marker(JSHashEntry *he, intN i, void *arg)
-{
-    ScriptFilenameEntry *sfe = (ScriptFilenameEntry *) he;
-
-    sfe->mark = JS_TRUE;
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_MarkScriptFilenames(JSRuntime *rt, uintN gcflags)
-{
-    JSCList *head, *link;
-    ScriptFilenamePrefix *sfp;
-
-    if (gcflags & GC_KEEP_ATOMS) {
-        JS_HashTableEnumerateEntries(rt->scriptFilenameTable,
-                                     js_script_filename_marker,
-                                     rt);
-    }
-    for (head = &rt->scriptFilenamePrefixes, link = head->next;
-         link != head;
-         link = link->next) {
-        sfp = (ScriptFilenamePrefix *) link;
-        js_MarkScriptFilename(sfp->name);
-    }
-}
-
-JS_STATIC_DLL_CALLBACK(intN)
-js_script_filename_sweeper(JSHashEntry *he, intN i, void *arg)
-{
-    ScriptFilenameEntry *sfe = (ScriptFilenameEntry *) he;
-
-    if (!sfe->mark)
-        return HT_ENUMERATE_REMOVE;
-    sfe->mark = JS_FALSE;
-    return HT_ENUMERATE_NEXT;
-}
-
-void
-js_SweepScriptFilenames(JSRuntime *rt)
-{
-    JS_HashTableEnumerateEntries(rt->scriptFilenameTable,
-                                 js_script_filename_sweeper,
-                                 rt);
-#ifdef DEBUG_notme
-    printf("script filename table savings so far: %u\n", sftbl_savings);
-#endif
-}
-
-JSScript *
-js_NewScript(JSContext *cx, uint32 length, uint32 nsrcnotes, uint32 ntrynotes)
-{
-    JSScript *script;
-
-    /* Round up source note count to align script->trynotes for its type. */
-    if (ntrynotes)
-        nsrcnotes += JSTRYNOTE_ALIGNMASK;
-    script = (JSScript *) JS_malloc(cx,
-                                    sizeof(JSScript) +
-                                    length * sizeof(jsbytecode) +
-                                    nsrcnotes * sizeof(jssrcnote) +
-                                    ntrynotes * sizeof(JSTryNote));
-    if (!script)
-        return NULL;
-    memset(script, 0, sizeof(JSScript));
-    script->code = script->main = (jsbytecode *)(script + 1);
-    script->length = length;
-    script->version = cx->version;
-    if (ntrynotes) {
-        script->trynotes = (JSTryNote *)
-                           ((jsword)(SCRIPT_NOTES(script) + nsrcnotes) &
-                            ~(jsword)JSTRYNOTE_ALIGNMASK);
-        memset(script->trynotes, 0, ntrynotes * sizeof(JSTryNote));
-    }
-    return script;
-}
-
-JS_FRIEND_API(JSScript *)
-js_NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg, JSFunction *fun)
-{
-    uint32 mainLength, prologLength, nsrcnotes, ntrynotes;
-    JSScript *script;
-    const char *filename;
-
-    mainLength = CG_OFFSET(cg);
-    prologLength = CG_PROLOG_OFFSET(cg);
-    CG_COUNT_FINAL_SRCNOTES(cg, nsrcnotes);
-    CG_COUNT_FINAL_TRYNOTES(cg, ntrynotes);
-    script = js_NewScript(cx, prologLength + mainLength, nsrcnotes, ntrynotes);
-    if (!script)
-        return NULL;
-
-    /* Now that we have script, error control flow must go to label bad. */
-    script->main += prologLength;
-    memcpy(script->code, CG_PROLOG_BASE(cg), prologLength * sizeof(jsbytecode));
-    memcpy(script->main, CG_BASE(cg), mainLength * sizeof(jsbytecode));
-    script->numGlobalVars = cg->treeContext.numGlobalVars;
-    if (!js_InitAtomMap(cx, &script->atomMap, &cg->atomList))
-        goto bad;
-
-    filename = cg->filename;
-    if (filename) {
-        script->filename = js_SaveScriptFilename(cx, filename);
-        if (!script->filename)
-            goto bad;
-    }
-    script->lineno = cg->firstLine;
-    script->depth = cg->maxStackDepth;
-    if (cg->principals) {
-        script->principals = cg->principals;
-        JSPRINCIPALS_HOLD(cx, script->principals);
-    }
-
-    if (!js_FinishTakingSrcNotes(cx, cg, SCRIPT_NOTES(script)))
-        goto bad;
-    if (script->trynotes)
-        js_FinishTakingTryNotes(cx, cg, script->trynotes);
-
-    /* Tell the debugger about this compiled script. */
-    js_CallNewScriptHook(cx, script, fun);
-    return script;
-
-bad:
-    js_DestroyScript(cx, script);
-    return NULL;
-}
-
-JS_FRIEND_API(void)
-js_CallNewScriptHook(JSContext *cx, JSScript *script, JSFunction *fun)
-{
-    JSRuntime *rt;
-    JSNewScriptHook hook;
-
-    rt = cx->runtime;
-    hook = rt->newScriptHook;
-    if (hook) {
-        JS_KEEP_ATOMS(rt);
-        hook(cx, script->filename, script->lineno, script, fun,
-             rt->newScriptHookData);
-        JS_UNKEEP_ATOMS(rt);
-    }
-}
-
-JS_FRIEND_API(void)
-js_CallDestroyScriptHook(JSContext *cx, JSScript *script)
-{
-    JSRuntime *rt;
-    JSDestroyScriptHook hook;
-
-    rt = cx->runtime;
-    hook = rt->destroyScriptHook;
-    if (hook)
-        hook(cx, script, rt->destroyScriptHookData);
-}
-
-void
-js_DestroyScript(JSContext *cx, JSScript *script)
-{
-    js_CallDestroyScriptHook(cx, script);
-
-    JS_ClearScriptTraps(cx, script);
-    js_FreeAtomMap(cx, &script->atomMap);
-    if (script->principals)
-        JSPRINCIPALS_DROP(cx, script->principals);
-    JS_free(cx, script);
-}
-
-void
-js_MarkScript(JSContext *cx, JSScript *script, void *arg)
-{
-    JSAtomMap *map;
-    uintN i, length;
-    JSAtom **vector;
-
-    map = &script->atomMap;
-    length = map->length;
-    vector = map->vector;
-    for (i = 0; i < length; i++)
-        GC_MARK_ATOM(cx, vector[i], arg);
-
-    if (script->filename)
-        js_MarkScriptFilename(script->filename);
-}
-
-jssrcnote *
-js_GetSrcNote(JSScript *script, jsbytecode *pc)
-{
-    jssrcnote *sn;
-    ptrdiff_t offset, target;
-
-    target = PTRDIFF(pc, script->code, jsbytecode);
-    if ((uint32)target >= script->length)
-        return NULL;
-    offset = 0;
-    for (sn = SCRIPT_NOTES(script); !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
-        offset += SN_DELTA(sn);
-        if (offset == target && SN_IS_GETTABLE(sn))
-            return sn;
-    }
-    return NULL;
-}
-
-uintN
-js_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc)
-{
-    JSAtom *atom;
-    JSFunction *fun;
-    uintN lineno;
-    ptrdiff_t offset, target;
-    jssrcnote *sn;
-    JSSrcNoteType type;
-
-    /*
-     * Special case: function definition needs no line number note because
-     * the function's script contains its starting line number.
-     */
-    if (*pc == JSOP_DEFFUN) {
-        atom = GET_ATOM(cx, script, pc);
-        fun = (JSFunction *) JS_GetPrivate(cx, ATOM_TO_OBJECT(atom));
-        JS_ASSERT(fun->interpreted);
-        return fun->u.script->lineno;
-    }
-
-    /*
-     * General case: walk through source notes accumulating their deltas,
-     * keeping track of line-number notes, until we pass the note for pc's
-     * offset within script->code.
-     */
-    lineno = script->lineno;
-    offset = 0;
-    target = PTRDIFF(pc, script->code, jsbytecode);
-    for (sn = SCRIPT_NOTES(script); !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
-        offset += SN_DELTA(sn);
-        type = (JSSrcNoteType) SN_TYPE(sn);
-        if (type == SRC_SETLINE) {
-            if (offset <= target)
-                lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
-        } else if (type == SRC_NEWLINE) {
-            if (offset <= target)
-                lineno++;
-        }
-        if (offset > target)
-            break;
-    }
-    return lineno;
-}
-
-/* The line number limit is the same as the jssrcnote offset limit. */
-#define SN_LINE_LIMIT   (SN_3BYTE_OFFSET_FLAG << 16)
-
-jsbytecode *
-js_LineNumberToPC(JSScript *script, uintN target)
-{
-    ptrdiff_t offset, best;
-    uintN lineno, bestdiff, diff;
-    jssrcnote *sn;
-    JSSrcNoteType type;
-
-    offset = 0;
-    best = -1;
-    lineno = script->lineno;
-    bestdiff = SN_LINE_LIMIT;
-    for (sn = SCRIPT_NOTES(script); !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
-        if (lineno == target)
-            goto out;
-        if (lineno > target) {
-            diff = lineno - target;
-            if (diff < bestdiff) {
-                bestdiff = diff;
-                best = offset;
-            }
-        }
-        offset += SN_DELTA(sn);
-        type = (JSSrcNoteType) SN_TYPE(sn);
-        if (type == SRC_SETLINE) {
-            lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
-        } else if (type == SRC_NEWLINE) {
-            lineno++;
-        }
-    }
-    if (best >= 0)
-        offset = best;
-out:
-    return script->code + offset;
-}
-
-JS_FRIEND_API(uintN)
-js_GetScriptLineExtent(JSScript *script)
-{
-    uintN lineno;
-    jssrcnote *sn;
-    JSSrcNoteType type;
-
-    lineno = script->lineno;
-    for (sn = SCRIPT_NOTES(script); !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) {
-        type = (JSSrcNoteType) SN_TYPE(sn);
-        if (type == SRC_SETLINE) {
-            lineno = (uintN) js_GetSrcNoteOffset(sn, 0);
-        } else if (type == SRC_NEWLINE) {
-            lineno++;
-        }
-    }
-    return 1 + lineno - script->lineno;
-}
diff --git a/libs/js/src/jsscript.h b/libs/js/src/jsscript.h
deleted file mode 100644
index 77f59ed751..0000000000
--- a/libs/js/src/jsscript.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsscript_h___
-#define jsscript_h___
-/*
- * JS script descriptor.
- */
-#include "jsatom.h"
-#include "jsprvtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Exception handling runtime information.
- *
- * All fields except length are code offsets relative to the main entry point
- * of the script.  If script->trynotes is not null, it points to a vector of
- * these structs terminated by one with catchStart == 0.
- */
-struct JSTryNote {
-    ptrdiff_t    start;         /* start of try statement */
-    ptrdiff_t    length;        /* count of try statement bytecodes */
-    ptrdiff_t    catchStart;    /* start of catch block (0 if end) */
-};
-
-#define JSTRYNOTE_GRAIN         sizeof(ptrdiff_t)
-#define JSTRYNOTE_ALIGNMASK     (JSTRYNOTE_GRAIN - 1)
-
-struct JSScript {
-    jsbytecode   *code;         /* bytecodes and their immediate operands */
-    uint32       length;        /* length of code vector */
-    jsbytecode   *main;         /* main entry point, after predef'ing prolog */
-    uint16       version;       /* JS version under which script was compiled */
-    uint16       numGlobalVars; /* declared global var/const/function count */
-    JSAtomMap    atomMap;       /* maps immediate index to literal struct */
-    const char   *filename;     /* source filename or null */
-    uintN        lineno;        /* base line number of script */
-    uintN        depth;         /* maximum stack depth in slots */
-    JSTryNote    *trynotes;     /* exception table for this script */
-    JSPrincipals *principals;   /* principals for this script */
-    JSObject     *object;       /* optional Script-class object wrapper */
-};
-
-/* No need to store script->notes now that it is allocated right after code. */
-#define SCRIPT_NOTES(script)    ((jssrcnote*)((script)->code+(script)->length))
-
-#define SCRIPT_FIND_CATCH_START(script, pc, catchpc)                          \
-    JS_BEGIN_MACRO                                                            \
-        JSTryNote *tn_ = (script)->trynotes;                                  \
-        jsbytecode *catchpc_ = NULL;                                          \
-        if (tn_) {                                                            \
-            ptrdiff_t off_ = PTRDIFF(pc, (script)->main, jsbytecode);         \
-            if (off_ >= 0) {                                                  \
-                while ((jsuword)(off_ - tn_->start) >= (jsuword)tn_->length)  \
-                    ++tn_;                                                    \
-                if (tn_->catchStart)                                          \
-                    catchpc_ = (script)->main + tn_->catchStart;              \
-            }                                                                 \
-        }                                                                     \
-        catchpc = catchpc_;                                                   \
-    JS_END_MACRO
-
-extern JS_FRIEND_DATA(JSClass) js_ScriptClass;
-
-extern JSObject *
-js_InitScriptClass(JSContext *cx, JSObject *obj);
-
-/*
- * On first new context in rt, initialize script runtime state, specifically
- * the script filename table and its lock.
- */
-extern JSBool
-js_InitRuntimeScriptState(JSRuntime *rt);
-
-/*
- * On last context destroy for rt, if script filenames are all GC'd, free the
- * script filename table and its lock.
- */
-extern void
-js_FinishRuntimeScriptState(JSRuntime *rt);
-
-/*
- * On JS_DestroyRuntime(rt), forcibly free script filename prefixes and any
- * script filename table entries that have not been GC'd, the latter using
- * js_FinishRuntimeScriptState.
- *
- * This allows script filename prefixes to outlive any context in rt.
- */
-extern void
-js_FreeRuntimeScriptState(JSRuntime *rt);
-
-extern const char *
-js_SaveScriptFilename(JSContext *cx, const char *filename);
-
-extern const char *
-js_SaveScriptFilenameRT(JSRuntime *rt, const char *filename, uint32 flags);
-
-extern uint32
-js_GetScriptFilenameFlags(const char *filename);
-
-extern void
-js_MarkScriptFilename(const char *filename);
-
-extern void
-js_MarkScriptFilenames(JSRuntime *rt, uintN gcflags);
-
-extern void
-js_SweepScriptFilenames(JSRuntime *rt);
-
-/*
- * Two successively less primitive ways to make a new JSScript.  The first
- * does *not* call a non-null cx->runtime->newScriptHook -- only the second,
- * js_NewScriptFromCG, calls this optional debugger hook.
- *
- * The js_NewScript function can't know whether the script it creates belongs
- * to a function, or is top-level or eval code, but the debugger wants access
- * to the newly made script's function, if any -- so callers of js_NewScript
- * are responsible for notifying the debugger after successfully creating any
- * kind (function or other) of new JSScript.
- */
-extern JSScript *
-js_NewScript(JSContext *cx, uint32 length, uint32 snlength, uint32 tnlength);
-
-extern JS_FRIEND_API(JSScript *)
-js_NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg, JSFunction *fun);
-
-/*
- * New-script-hook calling is factored from js_NewScriptFromCG so that it
- * and callers of js_XDRScript can share this code.  In the case of callers
- * of js_XDRScript, the hook should be invoked only after successful decode
- * of any owning function (the fun parameter) or script object (null fun).
- */
-extern JS_FRIEND_API(void)
-js_CallNewScriptHook(JSContext *cx, JSScript *script, JSFunction *fun);
-
-extern JS_FRIEND_API(void)
-js_CallDestroyScriptHook(JSContext *cx, JSScript *script);
-
-extern void
-js_DestroyScript(JSContext *cx, JSScript *script);
-
-extern void
-js_MarkScript(JSContext *cx, JSScript *script, void *arg);
-
-extern jssrcnote *
-js_GetSrcNote(JSScript *script, jsbytecode *pc);
-
-/* XXX need cx to lock function objects declared by prolog bytecodes. */
-extern uintN
-js_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
-
-extern jsbytecode *
-js_LineNumberToPC(JSScript *script, uintN lineno);
-
-extern JS_FRIEND_API(uintN)
-js_GetScriptLineExtent(JSScript *script);
-
-/*
- * If magic is non-null, js_XDRScript succeeds on magic number mismatch but
- * returns false in *magic; it reflects a match via a true *magic out param.
- * If magic is null, js_XDRScript returns false on bad magic number errors,
- * which it reports.
- *
- * NB: callers must call js_CallNewScriptHook after successful JSXDR_DECODE
- * and subsequent set-up of owning function or script object, if any.
- */
-extern JSBool
-js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *magic);
-
-JS_END_EXTERN_C
-
-#endif /* jsscript_h___ */
diff --git a/libs/js/src/jsshell.msg b/libs/js/src/jsshell.msg
deleted file mode 100644
index 4b811ac01d..0000000000
--- a/libs/js/src/jsshell.msg
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-	Error messages for JSShell. See js.msg for format.
-*/
-
-MSG_DEF(JSSMSG_NOT_AN_ERROR,             0, 0, JSEXN_NONE, "<Error #0 is reserved>")
-MSG_DEF(JSSMSG_CANT_OPEN,                1, 2, JSEXN_NONE, "can't open {0}: {1}") 
-MSG_DEF(JSSMSG_TRAP_USAGE,               2, 0, JSEXN_NONE, "usage: trap [fun] [pc] expr") 
-MSG_DEF(JSSMSG_LINE2PC_USAGE,            3, 0, JSEXN_NONE, "usage: line2pc [fun] line") 
-MSG_DEF(JSSMSG_FILE_SCRIPTS_ONLY,        4, 0, JSEXN_NONE, "only works on JS scripts read from files") 
-MSG_DEF(JSSMSG_UNEXPECTED_EOF,           5, 1, JSEXN_NONE, "unexpected EOF in {0}") 
-MSG_DEF(JSSMSG_DOEXP_USAGE,              6, 0, JSEXN_NONE, "usage: doexp obj id") 
diff --git a/libs/js/src/jsstddef.h b/libs/js/src/jsstddef.h
deleted file mode 100644
index addaa88ff6..0000000000
--- a/libs/js/src/jsstddef.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * stddef inclusion here to first declare ptrdif as a signed long instead of a
- * signed int.
- */
-
-#ifdef _WINDOWS
-# ifndef XP_WIN
-# define XP_WIN
-# endif
-#if defined(_WIN32) || defined(WIN32)
-# ifndef XP_WIN32
-# define XP_WIN32
-# endif
-#else
-# ifndef XP_WIN16
-# define XP_WIN16
-# endif
-#endif
-#endif
-
-#ifdef XP_WIN16
-#ifndef _PTRDIFF_T_DEFINED
-typedef long ptrdiff_t;
-
-/*
- * The Win16 compiler treats pointer differences as 16-bit signed values.
- * This macro allows us to treat them as 17-bit signed values, stored in
- * a 32-bit type.
- */
-#define PTRDIFF(p1, p2, type)                                 \
-    ((((unsigned long)(p1)) - ((unsigned long)(p2))) / sizeof(type))
-
-#define _PTRDIFF_T_DEFINED
-#endif /*_PTRDIFF_T_DEFINED*/
-#else /*WIN16*/
-
-#define PTRDIFF(p1, p2, type)                                 \
-        ((p1) - (p2))
-
-#endif
-
-#include <stddef.h>
-
-
diff --git a/libs/js/src/jsstr.c b/libs/js/src/jsstr.c
deleted file mode 100644
index 4cc975e7a5..0000000000
--- a/libs/js/src/jsstr.c
+++ /dev/null
@@ -1,4849 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JS string type implementation.
- *
- * In order to avoid unnecessary js_LockGCThing/js_UnlockGCThing calls, these
- * native methods store strings (possibly newborn) converted from their 'this'
- * parameter and arguments on the stack: 'this' conversions at argv[-1], arg
- * conversions at their index (argv[0], argv[1]).  This is a legitimate method
- * of rooting things that might lose their newborn root due to subsequent GC
- * allocations in the same native method.
- */
-#include "jsstddef.h"
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jshash.h" /* Added by JSIFY */
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsconfig.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsregexp.h"
-#include "jsstr.h"
-
-#if JS_HAS_REPLACE_LAMBDA
-#include "jsinterp.h"
-#endif
-
-#define JSSTRDEP_RECURSION_LIMIT        100
-
-size_t
-js_MinimizeDependentStrings(JSString *str, int level, JSString **basep)
-{
-    JSString *base;
-    size_t start, length;
-
-    JS_ASSERT(JSSTRING_IS_DEPENDENT(str));
-    base = JSSTRDEP_BASE(str);
-    start = JSSTRDEP_START(str);
-    if (JSSTRING_IS_DEPENDENT(base)) {
-        if (level < JSSTRDEP_RECURSION_LIMIT) {
-            start += js_MinimizeDependentStrings(base, level + 1, &base);
-        } else {
-            do {
-                start += JSSTRDEP_START(base);
-                base = JSSTRDEP_BASE(base);
-            } while (JSSTRING_IS_DEPENDENT(base));
-        }
-        if (start == 0) {
-            JS_ASSERT(JSSTRING_IS_PREFIX(str));
-            JSPREFIX_SET_BASE(str, base);
-        } else if (start <= JSSTRDEP_START_MASK) {
-            length = JSSTRDEP_LENGTH(str);
-            JSSTRDEP_SET_START_AND_LENGTH(str, start, length);
-            JSSTRDEP_SET_BASE(str, base);
-        }
-    }
-    *basep = base;
-    return start;
-}
-
-jschar *
-js_GetDependentStringChars(JSString *str)
-{
-    size_t start;
-    JSString *base;
-
-    start = js_MinimizeDependentStrings(str, 0, &base);
-    JS_ASSERT(!JSSTRING_IS_DEPENDENT(base));
-    JS_ASSERT(start < base->length);
-    return base->chars + start;
-}
-
-jschar *
-js_GetStringChars(JSString *str)
-{
-    if (JSSTRING_IS_DEPENDENT(str) && !js_UndependString(NULL, str))
-        return NULL;
-
-    *js_GetGCThingFlags(str) &= ~GCF_MUTABLE;
-    return str->chars;
-}
-
-JSString *
-js_ConcatStrings(JSContext *cx, JSString *left, JSString *right)
-{
-    size_t rn, ln, lrdist, n;
-    jschar *rs, *ls, *s;
-    JSDependentString *ldep;    /* non-null if left should become dependent */
-    JSString *str;
-
-    if (JSSTRING_IS_DEPENDENT(right)) {
-        rn = JSSTRDEP_LENGTH(right);
-        rs = JSSTRDEP_CHARS(right);
-    } else {
-        rn = right->length;
-        rs = right->chars;
-    }
-    if (rn == 0)
-        return left;
-
-    if (JSSTRING_IS_DEPENDENT(left) ||
-        !(*js_GetGCThingFlags(left) & GCF_MUTABLE)) {
-        /* We must copy if left does not own a buffer to realloc. */
-        ln = JSSTRING_LENGTH(left);
-        if (ln == 0)
-            return right;
-        ls = JSSTRING_CHARS(left);
-        s = (jschar *) JS_malloc(cx, (ln + rn + 1) * sizeof(jschar));
-        if (!s)
-            return NULL;
-        js_strncpy(s, ls, ln);
-        ldep = NULL;
-    } else {
-        /* We can realloc left's space and make it depend on our result. */
-        ln = left->length;
-        if (ln == 0)
-            return right;
-        ls = left->chars;
-        s = (jschar *) JS_realloc(cx, ls, (ln + rn + 1) * sizeof(jschar));
-        if (!s)
-            return NULL;
-
-        /* Take care: right could depend on left! */
-        lrdist = (size_t)(rs - ls);
-        if (lrdist < ln)
-            rs = s + lrdist;
-        left->chars = ls = s;
-        ldep = JSSTRDEP(left);
-    }
-
-    js_strncpy(s + ln, rs, rn);
-    n = ln + rn;
-    s[n] = 0;
-    str = js_NewString(cx, s, n, GCF_MUTABLE);
-    if (!str) {
-        /* Out of memory: clean up any space we (re-)allocated. */
-        if (!ldep) {
-            JS_free(cx, s);
-        } else {
-            s = JS_realloc(cx, ls, (ln + 1) * sizeof(jschar));
-            if (s)
-                left->chars = s;
-        }
-    } else {
-        /* Morph left into a dependent prefix if we realloc'd its buffer. */
-        if (ldep) {
-            JSPREFIX_SET_LENGTH(ldep, ln);
-            JSPREFIX_SET_BASE(ldep, str);
-#ifdef DEBUG
-          {
-            JSRuntime *rt = cx->runtime;
-            JS_RUNTIME_METER(rt, liveDependentStrings);
-            JS_RUNTIME_METER(rt, totalDependentStrings);
-            JS_LOCK_RUNTIME_VOID(rt,
-                (rt->strdepLengthSum += (double)ln,
-                 rt->strdepLengthSquaredSum += (double)ln * (double)ln));
-          }
-#endif
-        }
-    }
-
-    return str;
-}
-
-/*
- * May be called with null cx by js_GetStringChars, above; and by the jslock.c
- * MAKE_STRING_IMMUTABLE file-local macro.
- */
-const jschar *
-js_UndependString(JSContext *cx, JSString *str)
-{
-    size_t n, size;
-    jschar *s;
-
-    if (JSSTRING_IS_DEPENDENT(str)) {
-        n = JSSTRDEP_LENGTH(str);
-        size = (n + 1) * sizeof(jschar);
-        s = (jschar *) (cx ? JS_malloc(cx, size) : malloc(size));
-        if (!s)
-            return NULL;
-
-        js_strncpy(s, JSSTRDEP_CHARS(str), n);
-        s[n] = 0;
-        str->length = n;
-        str->chars = s;
-
-#ifdef DEBUG
-        if (cx) {
-            JSRuntime *rt = cx->runtime;
-            JS_RUNTIME_UNMETER(rt, liveDependentStrings);
-            JS_RUNTIME_UNMETER(rt, totalDependentStrings);
-            JS_LOCK_RUNTIME_VOID(rt,
-                (rt->strdepLengthSum -= (double)n,
-                 rt->strdepLengthSquaredSum -= (double)n * (double)n));
-        }
-#endif
-    }
-
-    return str->chars;
-}
-
-/*
- * Forward declarations for URI encode/decode and helper routines
- */
-static JSBool
-str_decodeURI(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval);
-
-static JSBool
-str_decodeURI_Component(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                        jsval *rval);
-
-static JSBool
-str_encodeURI(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval);
-
-static JSBool
-str_encodeURI_Component(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                        jsval *rval);
-
-static uint32
-Utf8ToOneUcs4Char(const uint8 *utf8Buffer, int utf8Length);
-
-/*
- * Contributions from the String class to the set of methods defined for the
- * global object.  escape and unescape used to be defined in the Mocha library,
- * but as ECMA decided to spec them, they've been moved to the core engine
- * and made ECMA-compliant.  (Incomplete escapes are interpreted as literal
- * characters by unescape.)
- */
-
-/*
- * Stuff to emulate the old libmocha escape, which took a second argument
- * giving the type of escape to perform.  Retained for compatibility, and
- * copied here to avoid reliance on net.h, mkparse.c/NET_EscapeBytes.
- */
-
-#define URL_XALPHAS     ((uint8) 1)
-#define URL_XPALPHAS    ((uint8) 2)
-#define URL_PATH        ((uint8) 4)
-
-static const uint8 urlCharType[256] =
-/*      Bit 0           xalpha          -- the alphas
- *      Bit 1           xpalpha         -- as xalpha but
- *                             converts spaces to plus and plus to %20
- *      Bit 2 ...       path            -- as xalphas but doesn't escape '/'
- */
-    /*   0 1 2 3 4 5 6 7 8 9 A B C D E F */
-    {    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,       /* 0x */
-         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,       /* 1x */
-         0,0,0,0,0,0,0,0,0,0,7,4,0,7,7,4,       /* 2x   !"#$%&'()*+,-./  */
-         7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,       /* 3x  0123456789:;<=>?  */
-         7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,       /* 4x  @ABCDEFGHIJKLMNO  */
-         7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,7,       /* 5X  PQRSTUVWXYZ[\]^_  */
-         0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,       /* 6x  `abcdefghijklmno  */
-         7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,       /* 7X  pqrstuvwxyz{\}~  DEL */
-         0, };
-
-/* This matches the ECMA escape set when mask is 7 (default.) */
-
-#define IS_OK(C, mask) (urlCharType[((uint8) (C))] & (mask))
-
-/* See ECMA-262 15.1.2.4. */
-JSBool
-js_str_escape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    size_t i, ni, length, newlength;
-    const jschar *chars;
-    jschar *newchars;
-    jschar ch;
-    jsint mask;
-    jsdouble d;
-    const char digits[] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                           '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
-    mask = URL_XALPHAS | URL_XPALPHAS | URL_PATH;
-    if (argc > 1) {
-        if (!js_ValueToNumber(cx, argv[1], &d))
-            return JS_FALSE;
-        if (!JSDOUBLE_IS_FINITE(d) ||
-            (mask = (jsint)d) != d ||
-            mask & ~(URL_XALPHAS | URL_XPALPHAS | URL_PATH))
-        {
-            char numBuf[12];
-            JS_snprintf(numBuf, sizeof numBuf, "%lx", (unsigned long) mask);
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_STRING_MASK, numBuf);
-            return JS_FALSE;
-        }
-    }
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-
-    chars = JSSTRING_CHARS(str);
-    length = newlength = JSSTRING_LENGTH(str);
-
-    /* Take a first pass and see how big the result string will need to be. */
-    for (i = 0; i < length; i++) {
-        if ((ch = chars[i]) < 128 && IS_OK(ch, mask))
-            continue;
-        if (ch < 256) {
-            if (mask == URL_XPALPHAS && ch == ' ')
-                continue;   /* The character will be encoded as '+' */
-            newlength += 2; /* The character will be encoded as %XX */
-        } else {
-            newlength += 5; /* The character will be encoded as %uXXXX */
-        }
-
-        /*
-         * This overflow test works because newlength is incremented by at
-         * most 5 on each iteration.
-         */
-        if (newlength < length) {
-            JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-    }
-
-    if (newlength >= ~(size_t)0 / sizeof(jschar)) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-
-    newchars = (jschar *) JS_malloc(cx, (newlength + 1) * sizeof(jschar));
-    if (!newchars)
-        return JS_FALSE;
-    for (i = 0, ni = 0; i < length; i++) {
-        if ((ch = chars[i]) < 128 && IS_OK(ch, mask)) {
-            newchars[ni++] = ch;
-        } else if (ch < 256) {
-            if (mask == URL_XPALPHAS && ch == ' ') {
-                newchars[ni++] = '+'; /* convert spaces to pluses */
-            } else {
-                newchars[ni++] = '%';
-                newchars[ni++] = digits[ch >> 4];
-                newchars[ni++] = digits[ch & 0xF];
-            }
-        } else {
-            newchars[ni++] = '%';
-            newchars[ni++] = 'u';
-            newchars[ni++] = digits[ch >> 12];
-            newchars[ni++] = digits[(ch & 0xF00) >> 8];
-            newchars[ni++] = digits[(ch & 0xF0) >> 4];
-            newchars[ni++] = digits[ch & 0xF];
-        }
-    }
-    JS_ASSERT(ni == newlength);
-    newchars[newlength] = 0;
-
-    str = js_NewString(cx, newchars, newlength, 0);
-    if (!str) {
-        JS_free(cx, newchars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#undef IS_OK
-
-/* See ECMA-262 15.1.2.5 */
-static JSBool
-str_unescape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    size_t i, ni, length;
-    const jschar *chars;
-    jschar *newchars;
-    jschar ch;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-
-    chars = JSSTRING_CHARS(str);
-    length = JSSTRING_LENGTH(str);
-
-    /* Don't bother allocating less space for the new string. */
-    newchars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
-    if (!newchars)
-        return JS_FALSE;
-    ni = i = 0;
-    while (i < length) {
-        ch = chars[i++];
-        if (ch == '%') {
-            if (i + 1 < length &&
-                JS7_ISHEX(chars[i]) && JS7_ISHEX(chars[i + 1]))
-            {
-                ch = JS7_UNHEX(chars[i]) * 16 + JS7_UNHEX(chars[i + 1]);
-                i += 2;
-            } else if (i + 4 < length && chars[i] == 'u' &&
-                       JS7_ISHEX(chars[i + 1]) && JS7_ISHEX(chars[i + 2]) &&
-                       JS7_ISHEX(chars[i + 3]) && JS7_ISHEX(chars[i + 4]))
-            {
-                ch = (((((JS7_UNHEX(chars[i + 1]) << 4)
-                        + JS7_UNHEX(chars[i + 2])) << 4)
-                      + JS7_UNHEX(chars[i + 3])) << 4)
-                    + JS7_UNHEX(chars[i + 4]);
-                i += 5;
-            }
-        }
-        newchars[ni++] = ch;
-    }
-    newchars[ni] = 0;
-
-    str = js_NewString(cx, newchars, ni, 0);
-    if (!str) {
-        JS_free(cx, newchars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-#if JS_HAS_UNEVAL
-static JSBool
-str_uneval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToSource(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif
-
-const char js_escape_str[] = "escape";
-const char js_unescape_str[] = "unescape";
-#if JS_HAS_UNEVAL
-const char js_uneval_str[] = "uneval";
-#endif
-const char js_decodeURI_str[] = "decodeURI";
-const char js_encodeURI_str[] = "encodeURI";
-const char js_decodeURIComponent_str[] = "decodeURIComponent";
-const char js_encodeURIComponent_str[] = "encodeURIComponent";
-
-static JSFunctionSpec string_functions[] = {
-    {js_escape_str,             js_str_escape,              1,0,0},
-    {js_unescape_str,           str_unescape,               1,0,0},
-#if JS_HAS_UNEVAL
-    {js_uneval_str,             str_uneval,                 1,0,0},
-#endif
-    {js_decodeURI_str,          str_decodeURI,              1,0,0},
-    {js_encodeURI_str,          str_encodeURI,              1,0,0},
-    {js_decodeURIComponent_str, str_decodeURI_Component,    1,0,0},
-    {js_encodeURIComponent_str, str_encodeURI_Component,    1,0,0},
-
-    {0,0,0,0,0}
-};
-
-jschar      js_empty_ucstr[]  = {0};
-JSSubString js_EmptySubString = {0, js_empty_ucstr};
-
-enum string_tinyid {
-    STRING_LENGTH = -1
-};
-
-static JSPropertySpec string_props[] = {
-    {js_length_str,     STRING_LENGTH,
-                        JSPROP_READONLY|JSPROP_PERMANENT|JSPROP_SHARED, 0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-str_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSString *str;
-    jsint slot;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-
-    /*
-     * Call js_ValueToString because getters and setters can be invoked on
-     * objects of different class, unlike enumerate, resolve, and the other
-     * class hooks.
-     */
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-
-    slot = JSVAL_TO_INT(id);
-    if (slot == STRING_LENGTH)
-        *vp = INT_TO_JSVAL((jsint) JSSTRING_LENGTH(str));
-    return JS_TRUE;
-}
-
-#define STRING_ELEMENT_ATTRS (JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT)
-
-static JSBool
-str_enumerate(JSContext *cx, JSObject *obj)
-{
-    JSString *str, *str1;
-    size_t i, length;
-
-    /* Avoid infinite recursion via js_obj_toSource (see bug 271477). */
-    if (JS_VERSION_IS_1_2(cx))
-        return JS_TRUE;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_TRUE;
-    cx->newborn[GCX_STRING] = (JSGCThing *) str;
-
-    length = JSSTRING_LENGTH(str);
-    for (i = 0; i < length; i++) {
-        str1 = js_NewDependentString(cx, str, i, 1, 0);
-        if (!str1)
-            return JS_FALSE;
-        if (!OBJ_DEFINE_PROPERTY(cx, obj, INT_TO_JSID(i),
-                                 STRING_TO_JSVAL(str1), NULL, NULL,
-                                 STRING_ELEMENT_ATTRS, NULL)) {
-            return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-str_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
-            JSObject **objp)
-{
-    JSString *str, *str1;
-    jsint slot;
-
-    if (!JSVAL_IS_INT(id) || (flags & JSRESOLVE_ASSIGNING))
-        return JS_TRUE;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_TRUE;
-    cx->newborn[GCX_STRING] = (JSGCThing *) str;
-
-    slot = JSVAL_TO_INT(id);
-    if ((size_t)slot < JSSTRING_LENGTH(str)) {
-        str1 = js_NewDependentString(cx, str, (size_t)slot, 1, 0);
-        if (!str1)
-            return JS_FALSE;
-        if (!OBJ_DEFINE_PROPERTY(cx, obj, INT_TO_JSID(slot),
-                                 STRING_TO_JSVAL(str1), NULL, NULL,
-                                 STRING_ELEMENT_ATTRS, NULL)) {
-            return JS_FALSE;
-        }
-        *objp = obj;
-    }
-    return JS_TRUE;
-}
-
-JSClass js_StringClass = {
-    js_String_str,
-    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,   JS_PropertyStub,   str_getProperty,   JS_PropertyStub,
-    str_enumerate, (JSResolveOp)str_resolve, JS_ConvertStub, JS_FinalizeStub,
-    JSCLASS_NO_OPTIONAL_MEMBERS
-};
-
-#if JS_HAS_TOSOURCE
-
-/*
- * String.prototype.quote is generic (as are most string methods), unlike
- * toSource, toString, and valueOf.
- */
-static JSBool
-str_quote(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    str = js_QuoteString(cx, str, '"');
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-str_toSource(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    JSString *str;
-    size_t i, j, k, n;
-    char buf[16];
-    jschar *s, *t;
-
-    if (!JS_InstanceOf(cx, obj, &js_StringClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (!JSVAL_IS_STRING(v))
-        return js_obj_toSource(cx, obj, argc, argv, rval);
-    str = js_QuoteString(cx, JSVAL_TO_STRING(v), '"');
-    if (!str)
-        return JS_FALSE;
-    j = JS_snprintf(buf, sizeof buf, "(new %s(", js_StringClass.name);
-    s = JSSTRING_CHARS(str);
-    k = JSSTRING_LENGTH(str);
-    n = j + k + 2;
-    t = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
-    if (!t)
-        return JS_FALSE;
-    for (i = 0; i < j; i++)
-        t[i] = buf[i];
-    for (j = 0; j < k; i++, j++)
-        t[i] = s[j];
-    t[i++] = ')';
-    t[i++] = ')';
-    t[i] = 0;
-    str = js_NewString(cx, t, n, 0);
-    if (!str) {
-        JS_free(cx, t);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-#endif /* JS_HAS_TOSOURCE */
-
-static JSBool
-str_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-
-    if (!JS_InstanceOf(cx, obj, &js_StringClass, argv))
-        return JS_FALSE;
-    v = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    if (!JSVAL_IS_STRING(v))
-        return js_obj_toString(cx, obj, argc, argv, rval);
-    *rval = v;
-    return JS_TRUE;
-}
-
-static JSBool
-str_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    if (!JS_InstanceOf(cx, obj, &js_StringClass, argv))
-        return JS_FALSE;
-    *rval = OBJ_GET_SLOT(cx, obj, JSSLOT_PRIVATE);
-    return JS_TRUE;
-}
-
-/*
- * Java-like string native methods.
- */
-static JSBool
-str_substring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    jsdouble length, begin, end;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc != 0) {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        length = JSSTRING_LENGTH(str);
-        begin = js_DoubleToInteger(d);
-        if (begin < 0)
-            begin = 0;
-        else if (begin > length)
-            begin = length;
-
-        if (argc == 1) {
-            end = length;
-        } else {
-            if (!js_ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-            end = js_DoubleToInteger(d);
-            if (end < 0)
-                end = 0;
-            else if (end > length)
-                end = length;
-            if (end < begin) {
-                if (!JS_VERSION_IS_1_2(cx)) {
-                    /* XXX emulate old JDK1.0 java.lang.String.substring. */
-                    jsdouble tmp = begin;
-                    begin = end;
-                    end = tmp;
-                } else {
-                    end = begin;
-                }
-            }
-        }
-
-        str = js_NewDependentString(cx, str, (size_t)begin,
-                                    (size_t)(end - begin), 0);
-        if (!str)
-            return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-str_toLowerCase(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSString *str;
-    size_t i, n;
-    jschar *s, *news;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    n = JSSTRING_LENGTH(str);
-    news = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
-    if (!news)
-        return JS_FALSE;
-    s = JSSTRING_CHARS(str);
-    for (i = 0; i < n; i++)
-        news[i] = JS_TOLOWER(s[i]);
-    news[n] = 0;
-    str = js_NewString(cx, news, n, 0);
-    if (!str) {
-        JS_free(cx, news);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-str_toLocaleLowerCase(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSString *str;
-
-    /*
-     * Forcefully ignore the first (or any) argument and return toLowerCase(),
-     * ECMA has reserved that argument, presumably for defining the locale.
-     */
-    if (cx->localeCallbacks && cx->localeCallbacks->localeToLowerCase) {
-        str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-        if (!str)
-            return JS_FALSE;
-        argv[-1] = STRING_TO_JSVAL(str);
-        return cx->localeCallbacks->localeToLowerCase(cx, str, rval);
-    }
-    return str_toLowerCase(cx, obj, 0, argv, rval);
-}
-
-static JSBool
-str_toUpperCase(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSString *str;
-    size_t i, n;
-    jschar *s, *news;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    n = JSSTRING_LENGTH(str);
-    news = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
-    if (!news)
-        return JS_FALSE;
-    s = JSSTRING_CHARS(str);
-    for (i = 0; i < n; i++)
-        news[i] = JS_TOUPPER(s[i]);
-    news[n] = 0;
-    str = js_NewString(cx, news, n, 0);
-    if (!str) {
-        JS_free(cx, news);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-str_toLocaleUpperCase(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSString *str;
-
-    /*
-     * Forcefully ignore the first (or any) argument and return toUpperCase(),
-     * ECMA has reserved that argument, presumbaly for defining the locale.
-     */
-    if (cx->localeCallbacks && cx->localeCallbacks->localeToUpperCase) {
-        str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-        if (!str)
-            return JS_FALSE;
-        argv[-1] = STRING_TO_JSVAL(str);
-        return cx->localeCallbacks->localeToUpperCase(cx, str, rval);
-    }
-    return str_toUpperCase(cx, obj, 0, argv, rval);
-}
-
-static JSBool
-str_localeCompare(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                  jsval *rval)
-{
-    JSString *str, *thatStr;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc == 0) {
-        *rval = JSVAL_ZERO;
-    } else {
-        thatStr = js_ValueToString(cx, argv[0]);
-        if (!thatStr)
-            return JS_FALSE;
-        if (cx->localeCallbacks && cx->localeCallbacks->localeCompare) {
-            argv[0] = STRING_TO_JSVAL(thatStr);
-            return cx->localeCallbacks->localeCompare(cx, str, thatStr, rval);
-        }
-        *rval = INT_TO_JSVAL(js_CompareStrings(str, thatStr));
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-str_charAt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    size_t index;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc == 0) {
-        d = 0.0;
-    } else {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
-    }
-
-    if (d < 0 || JSSTRING_LENGTH(str) <= d) {
-        *rval = JS_GetEmptyStringValue(cx);
-    } else {
-        index = (size_t)d;
-        str = js_NewDependentString(cx, str, index, 1, 0);
-        if (!str)
-            return JS_FALSE;
-        *rval = STRING_TO_JSVAL(str);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-str_charCodeAt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    size_t index;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc == 0) {
-        d = 0.0;
-    } else {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
-    }
-
-    if (d < 0 || JSSTRING_LENGTH(str) <= d) {
-        *rval = JS_GetNaNValue(cx);
-    } else {
-        index = (size_t)d;
-        *rval = INT_TO_JSVAL((jsint) JSSTRING_CHARS(str)[index]);
-    }
-    return JS_TRUE;
-}
-
-jsint
-js_BoyerMooreHorspool(const jschar *text, jsint textlen,
-                      const jschar *pat, jsint patlen,
-                      jsint start)
-{
-    jsint i, j, k, m;
-    uint8 skip[BMH_CHARSET_SIZE];
-    jschar c;
-
-    JS_ASSERT(0 < patlen && patlen <= BMH_PATLEN_MAX);
-    for (i = 0; i < BMH_CHARSET_SIZE; i++)
-        skip[i] = (uint8)patlen;
-    m = patlen - 1;
-    for (i = 0; i < m; i++) {
-        c = pat[i];
-        if (c >= BMH_CHARSET_SIZE)
-            return BMH_BAD_PATTERN;
-        skip[c] = (uint8)(m - i);
-    }
-    for (k = start + m;
-         k < textlen;
-         k += ((c = text[k]) >= BMH_CHARSET_SIZE) ? patlen : skip[c]) {
-        for (i = k, j = m; ; i--, j--) {
-            if (j < 0)
-                return i + 1;
-            if (text[i] != pat[j])
-                break;
-        }
-    }
-    return -1;
-}
-
-static JSBool
-str_indexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str, *str2;
-    jsint i, j, index, textlen, patlen;
-    const jschar *text, *pat;
-    jsdouble d;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-    text = JSSTRING_CHARS(str);
-    textlen = (jsint) JSSTRING_LENGTH(str);
-
-    str2 = js_ValueToString(cx, argv[0]);
-    if (!str2)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str2);
-    pat = JSSTRING_CHARS(str2);
-    patlen = (jsint) JSSTRING_LENGTH(str2);
-
-    if (argc > 1) {
-        if (!js_ValueToNumber(cx, argv[1], &d))
-            return JS_FALSE;
-        d = js_DoubleToInteger(d);
-        if (d < 0)
-            i = 0;
-        else if (d > textlen)
-            i = textlen;
-        else
-            i = (jsint)d;
-    } else {
-        i = 0;
-    }
-    if (patlen == 0) {
-        *rval = INT_TO_JSVAL(i);
-        return JS_TRUE;
-    }
-
-    /* XXX tune the BMH threshold (512) */
-    if ((jsuint)(patlen - 2) <= BMH_PATLEN_MAX - 2 && textlen >= 512) {
-        index = js_BoyerMooreHorspool(text, textlen, pat, patlen, i);
-        if (index != BMH_BAD_PATTERN)
-            goto out;
-    }
-
-    index = -1;
-    j = 0;
-    while (i + j < textlen) {
-        if (text[i + j] == pat[j]) {
-            if (++j == patlen) {
-                index = i;
-                break;
-            }
-        } else {
-            i++;
-            j = 0;
-        }
-    }
-
-out:
-    *rval = INT_TO_JSVAL(index);
-    return JS_TRUE;
-}
-
-static JSBool
-str_lastIndexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                  jsval *rval)
-{
-    JSString *str, *str2;
-    const jschar *text, *pat;
-    jsint i, j, textlen, patlen;
-    jsdouble d;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-    text = JSSTRING_CHARS(str);
-    textlen = (jsint) JSSTRING_LENGTH(str);
-
-    str2 = js_ValueToString(cx, argv[0]);
-    if (!str2)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str2);
-    pat = JSSTRING_CHARS(str2);
-    patlen = (jsint) JSSTRING_LENGTH(str2);
-
-    if (argc > 1) {
-        if (!js_ValueToNumber(cx, argv[1], &d))
-            return JS_FALSE;
-        if (JSDOUBLE_IS_NaN(d)) {
-            i = textlen;
-        } else {
-            d = js_DoubleToInteger(d);
-            if (d < 0)
-                i = 0;
-            else if (d > textlen)
-                i = textlen;
-            else
-                i = (jsint)d;
-        }
-    } else {
-        i = textlen;
-    }
-
-    if (patlen == 0) {
-        *rval = INT_TO_JSVAL(i);
-        return JS_TRUE;
-    }
-
-    j = 0;
-    while (i >= 0) {
-        /* Don't assume that text is NUL-terminated: it could be dependent. */
-        if (i + j < textlen && text[i + j] == pat[j]) {
-            if (++j == patlen)
-                break;
-        } else {
-            i--;
-            j = 0;
-        }
-    }
-    *rval = INT_TO_JSVAL(i);
-    return JS_TRUE;
-}
-
-/*
- * Perl-inspired string functions.
- */
-#if JS_HAS_REGEXPS
-typedef struct GlobData {
-    uintN       flags;          /* inout: mode and flag bits, see below */
-    uintN       optarg;         /* in: index of optional flags argument */
-    JSString    *str;           /* out: 'this' parameter object as string */
-    JSRegExp    *regexp;        /* out: regexp parameter object private data */
-} GlobData;
-
-/*
- * Mode and flag bit definitions for match_or_replace's GlobData.flags field.
- */
-#define MODE_MATCH      0x00    /* in: return match array on success */
-#define MODE_REPLACE    0x01    /* in: match and replace */
-#define MODE_SEARCH     0x02    /* in: search only, return match index or -1 */
-#define GET_MODE(f)     ((f) & 0x03)
-#define FORCE_FLAT      0x04    /* in: force flat (non-regexp) string match */
-#define KEEP_REGEXP     0x08    /* inout: keep GlobData.regexp alive for caller
-                                          of match_or_replace; if set on input
-                                          but clear on output, regexp ownership
-                                          does not pass to caller */
-#define GLOBAL_REGEXP   0x10    /* out: regexp had the 'g' flag */
-
-static JSBool
-match_or_replace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 JSBool (*glob)(JSContext *cx, jsint count, GlobData *data),
-                 GlobData *data, jsval *rval)
-{
-    JSString *str, *src, *opt;
-    JSObject *reobj;
-    JSRegExp *re;
-    size_t index, length;
-    JSBool ok, test;
-    jsint count;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-    data->str = str;
-
-    if (JSVAL_IS_REGEXP(cx, argv[0])) {
-        reobj = JSVAL_TO_OBJECT(argv[0]);
-        re = (JSRegExp *) JS_GetPrivate(cx, reobj);
-    } else {
-        src = js_ValueToString(cx, argv[0]);
-        if (!src)
-            return JS_FALSE;
-        if (data->optarg < argc) {
-            argv[0] = STRING_TO_JSVAL(src);
-            opt = js_ValueToString(cx, argv[data->optarg]);
-            if (!opt)
-                return JS_FALSE;
-        } else {
-            opt = NULL;
-        }
-        re = js_NewRegExpOpt(cx, NULL, src, opt,
-                             (data->flags & FORCE_FLAT) != 0);
-        if (!re)
-            return JS_FALSE;
-        reobj = NULL;
-    }
-    data->regexp = re;
-
-    if (re->flags & JSREG_GLOB)
-        data->flags |= GLOBAL_REGEXP;
-    index = 0;
-    if (GET_MODE(data->flags) == MODE_SEARCH) {
-        ok = js_ExecuteRegExp(cx, re, str, &index, JS_TRUE, rval);
-        if (ok) {
-            *rval = (*rval == JSVAL_TRUE)
-                    ? INT_TO_JSVAL(cx->regExpStatics.leftContext.length)
-                    : INT_TO_JSVAL(-1);
-        }
-    } else if (data->flags & GLOBAL_REGEXP) {
-        if (reobj) {
-            /* Set the lastIndex property's reserved slot to 0. */
-            ok = js_SetLastIndex(cx, reobj, 0);
-            if (!ok)
-                return JS_FALSE;
-        } else {
-            ok = JS_TRUE;
-        }
-        length = JSSTRING_LENGTH(str);
-        for (count = 0; index <= length; count++) {
-            ok = js_ExecuteRegExp(cx, re, str, &index, JS_TRUE, rval);
-            if (!ok || *rval != JSVAL_TRUE)
-                break;
-            ok = glob(cx, count, data);
-            if (!ok)
-                break;
-            if (cx->regExpStatics.lastMatch.length == 0) {
-                if (index == length)
-                    break;
-                index++;
-            }
-        }
-    } else {
-        if (GET_MODE(data->flags) == MODE_REPLACE) {
-            test = JS_TRUE;
-        } else {
-            /*
-             * MODE_MATCH implies str_match is being called from a script or a
-             * scripted function.  If the caller cares only about testing null
-             * vs. non-null return value, optimize away the array object that
-             * would normally be returned in *rval.
-             */
-            JSStackFrame *fp = cx->fp->down;
-
-            /* Skip Function.prototype.call and .apply frames. */
-            while (fp && !fp->pc) {
-                JS_ASSERT(!fp->script);
-                fp = fp->down;
-            }
-
-            /* Assume a full array result is required, then prove otherwise. */
-            test = JS_FALSE;
-            if (fp) {
-                JS_ASSERT(*fp->pc == JSOP_CALL || *fp->pc == JSOP_NEW);
-                JS_ASSERT(js_CodeSpec[*fp->pc].length == 3);
-                switch (fp->pc[3]) {
-                  case JSOP_POP:
-                  case JSOP_IFEQ:
-                  case JSOP_IFNE:
-                  case JSOP_IFEQX:
-                  case JSOP_IFNEX:
-                    test = JS_TRUE;
-                    break;
-                  default:;
-                }
-            }
-        }
-        ok = js_ExecuteRegExp(cx, re, str, &index, test, rval);
-    }
-
-    if (reobj) {
-        /* Tell our caller that it doesn't need to destroy data->regexp. */
-        data->flags &= ~KEEP_REGEXP;
-    } else if (!(data->flags & KEEP_REGEXP)) {
-        /* Caller didn't want to keep data->regexp, so null and destroy it.  */
-        data->regexp = NULL;
-        js_DestroyRegExp(cx, re);
-    }
-    return ok;
-}
-
-typedef struct MatchData {
-    GlobData    base;
-    jsval       *arrayval;      /* NB: local root pointer */
-} MatchData;
-
-static JSBool
-match_glob(JSContext *cx, jsint count, GlobData *data)
-{
-    MatchData *mdata;
-    JSObject *arrayobj;
-    JSSubString *matchsub;
-    JSString *matchstr;
-    jsval v;
-
-    mdata = (MatchData *)data;
-    arrayobj = JSVAL_TO_OBJECT(*mdata->arrayval);
-    if (!arrayobj) {
-        arrayobj = js_ConstructObject(cx, &js_ArrayClass, NULL, NULL, 0, NULL);
-        if (!arrayobj)
-            return JS_FALSE;
-        *mdata->arrayval = OBJECT_TO_JSVAL(arrayobj);
-    }
-    matchsub = &cx->regExpStatics.lastMatch;
-    matchstr = js_NewStringCopyN(cx, matchsub->chars, matchsub->length, 0);
-    if (!matchstr)
-        return JS_FALSE;
-    v = STRING_TO_JSVAL(matchstr);
-    return js_SetProperty(cx, arrayobj, INT_TO_JSID(count), &v);
-}
-
-static JSBool
-str_match(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    MatchData mdata;
-    JSBool ok;
-
-    mdata.base.flags = MODE_MATCH;
-    mdata.base.optarg = 1;
-    mdata.arrayval = &argv[2];
-    *mdata.arrayval = JSVAL_NULL;
-    ok = match_or_replace(cx, obj, argc, argv, match_glob, &mdata.base, rval);
-    if (ok && !JSVAL_IS_NULL(*mdata.arrayval))
-        *rval = *mdata.arrayval;
-    return ok;
-}
-
-static JSBool
-str_search(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    GlobData data;
-
-    data.flags = MODE_SEARCH;
-    data.optarg = 1;
-    return match_or_replace(cx, obj, argc, argv, NULL, &data, rval);
-}
-
-typedef struct ReplaceData {
-    GlobData    base;           /* base struct state */
-    JSObject    *lambda;        /* replacement function object or null */
-    JSString    *repstr;        /* replacement string */
-    jschar      *dollar;        /* null or pointer to first $ in repstr */
-    jschar      *dollarEnd;     /* limit pointer for js_strchr_limit */
-    jschar      *chars;         /* result chars, null initially */
-    size_t      length;         /* result length, 0 initially */
-    jsint       index;          /* index in result of next replacement */
-    jsint       leftIndex;      /* left context index in base.str->chars */
-    JSSubString dollarStr;      /* for "$$" interpret_dollar result */
-} ReplaceData;
-
-static JSSubString *
-interpret_dollar(JSContext *cx, jschar *dp, jschar *ep, ReplaceData *rdata,
-                 size_t *skip)
-{
-    JSVersion version;
-    JSRegExpStatics *res;
-    jschar dc, *cp;
-    uintN num, tmp;
-    JSString *str;
-
-    JS_ASSERT(*dp == '$');
-
-    /*
-     * Allow a real backslash (literal "\\" before "$1") to escape "$1", e.g.
-     * Do this only for versions strictly less than ECMAv3.
-     */
-    version = cx->version & JSVERSION_MASK;
-    if (version != JSVERSION_DEFAULT && version <= JSVERSION_1_4) {
-        if (dp > JSSTRING_CHARS(rdata->repstr) && dp[-1] == '\\')
-            return NULL;
-    }
-
-    /* If there is only a dollar, bail now */
-    if (dp + 1 >= ep)
-        return NULL;
-
-    /* Interpret all Perl match-induced dollar variables. */
-    res = &cx->regExpStatics;
-    dc = dp[1];
-    if (JS7_ISDEC(dc)) {
-        if (version != JSVERSION_DEFAULT && version <= JSVERSION_1_4) {
-            if (dc == '0')
-                return NULL;
-
-            /* Check for overflow to avoid gobbling arbitrary decimal digits. */
-            num = 0;
-            cp = dp;
-            while (++cp < ep && (dc = *cp, JS7_ISDEC(dc))) {
-                tmp = 10 * num + JS7_UNDEC(dc);
-                if (tmp < num)
-                    break;
-                num = tmp;
-            }
-        } else { /* ECMA 3, 1-9 or 01-99 */
-            num = JS7_UNDEC(dc);
-            if (num > res->parenCount)
-                return NULL;
-
-            cp = dp + 2;
-            if (cp < ep && (dc = *cp, JS7_ISDEC(dc))) {
-                tmp = 10 * num + JS7_UNDEC(dc);
-                if (tmp <= res->parenCount) {
-                    cp++;
-                    num = tmp;
-                }
-            }
-            if (num == 0)
-                return NULL;
-        }
-        /* Adjust num from 1 $n-origin to 0 array-index-origin. */
-        num--;
-        *skip = cp - dp;
-        return REGEXP_PAREN_SUBSTRING(res, num);
-    }
-
-    *skip = 2;
-    switch (dc) {
-      case '$':
-        rdata->dollarStr.chars = dp;
-        rdata->dollarStr.length = 1;
-        return &rdata->dollarStr;
-      case '&':
-        return &res->lastMatch;
-      case '+':
-        return &res->lastParen;
-      case '`':
-        if (version == JSVERSION_1_2) {
-            /*
-             * JS1.2 imitated the Perl4 bug where left context at each step
-             * in an iterative use of a global regexp started from last match,
-             * not from the start of the target string.  But Perl4 does start
-             * $` at the beginning of the target string when it is used in a
-             * substitution, so we emulate that special case here.
-             */
-            str = rdata->base.str;
-            res->leftContext.chars = JSSTRING_CHARS(str);
-            res->leftContext.length = res->lastMatch.chars
-                                    - JSSTRING_CHARS(str);
-        }
-        return &res->leftContext;
-      case '\'':
-        return &res->rightContext;
-    }
-    return NULL;
-}
-
-static JSBool
-find_replen(JSContext *cx, ReplaceData *rdata, size_t *sizep)
-{
-    JSString *repstr;
-    size_t replen, skip;
-    jschar *dp, *ep;
-    JSSubString *sub;
-#if JS_HAS_REPLACE_LAMBDA
-    JSObject *lambda;
-
-    lambda = rdata->lambda;
-    if (lambda) {
-        uintN argc, i, j, m, n, p;
-        jsval *sp, *oldsp, rval;
-        void *mark;
-        JSStackFrame *fp;
-        JSBool ok;
-
-        /*
-         * Save the regExpStatics from the current regexp, since they may be
-         * clobbered by a RegExp usage in the lambda function.  Note that all
-         * members of JSRegExpStatics are JSSubStrings, so not GC roots, save
-         * input, which is rooted otherwise via argv[-1] in str_replace.
-         */
-        JSRegExpStatics save = cx->regExpStatics;
-        JSBool freeMoreParens = JS_FALSE;
-
-        /*
-         * In the lambda case, not only do we find the replacement string's
-         * length, we compute repstr and return it via rdata for use within
-         * do_replace.  The lambda is called with arguments ($&, $1, $2, ...,
-         * index, input), i.e., all the properties of a regexp match array.
-         * For $&, etc., we must create string jsvals from cx->regExpStatics.
-         * We grab up stack space to keep the newborn strings GC-rooted.
-         */
-        p = rdata->base.regexp->parenCount;
-        argc = 1 + p + 2;
-        sp = js_AllocStack(cx, 2 + argc, &mark);
-        if (!sp)
-            return JS_FALSE;
-
-        /* Push lambda and its 'this' parameter. */
-        *sp++ = OBJECT_TO_JSVAL(lambda);
-        *sp++ = OBJECT_TO_JSVAL(OBJ_GET_PARENT(cx, lambda));
-
-#define PUSH_REGEXP_STATIC(sub)                                               \
-    JS_BEGIN_MACRO                                                            \
-        JSString *str = js_NewStringCopyN(cx,                                 \
-                                          cx->regExpStatics.sub.chars,        \
-                                          cx->regExpStatics.sub.length,       \
-                                          0);                                 \
-        if (!str) {                                                           \
-            ok = JS_FALSE;                                                    \
-            goto lambda_out;                                                  \
-        }                                                                     \
-        *sp++ = STRING_TO_JSVAL(str);                                         \
-    JS_END_MACRO
-
-        /* Push $&, $1, $2, ... */
-        PUSH_REGEXP_STATIC(lastMatch);
-        i = 0;
-        m = cx->regExpStatics.parenCount;
-        n = JS_MIN(m, 9);
-        for (j = 0; i < n; i++, j++)
-            PUSH_REGEXP_STATIC(parens[j]);
-        for (j = 0; i < m; i++, j++)
-            PUSH_REGEXP_STATIC(moreParens[j]);
-
-        /*
-         * We need to clear moreParens in the top-of-stack cx->regExpStatics
-         * to it won't be possibly realloc'ed, leaving the bottom-of-stack
-         * moreParens pointing to freed memory.
-         */
-        cx->regExpStatics.moreParens = NULL;
-        freeMoreParens = JS_TRUE;
-
-#undef PUSH_REGEXP_STATIC
-
-        /* Make sure to push undefined for any unmatched parens. */
-        for (; i < p; i++)
-            *sp++ = JSVAL_VOID;
-
-        /* Push match index and input string. */
-        *sp++ = INT_TO_JSVAL((jsint)cx->regExpStatics.leftContext.length);
-        *sp++ = STRING_TO_JSVAL(rdata->base.str);
-
-        /* Lift current frame to include the args and do the call. */
-        fp = cx->fp;
-        oldsp = fp->sp;
-        fp->sp = sp;
-        ok = js_Invoke(cx, argc, JSINVOKE_INTERNAL);
-        rval = fp->sp[-1];
-        fp->sp = oldsp;
-
-        if (ok) {
-            /*
-             * NB: we count on the newborn string root to hold any string
-             * created by this js_ValueToString that would otherwise be GC-
-             * able, until we use rdata->repstr in do_replace.
-             */
-            repstr = js_ValueToString(cx, rval);
-            if (!repstr) {
-                ok = JS_FALSE;
-            } else {
-                rdata->repstr = repstr;
-                *sizep = JSSTRING_LENGTH(repstr);
-            }
-        }
-
-      lambda_out:
-        js_FreeStack(cx, mark);
-        if (freeMoreParens)
-            JS_free(cx, cx->regExpStatics.moreParens);
-        cx->regExpStatics = save;
-        return ok;
-    }
-#endif /* JS_HAS_REPLACE_LAMBDA */
-
-    repstr = rdata->repstr;
-    replen = JSSTRING_LENGTH(repstr);
-    for (dp = rdata->dollar, ep = rdata->dollarEnd; dp;
-         dp = js_strchr_limit(dp, '$', ep)) {
-        sub = interpret_dollar(cx, dp, ep, rdata, &skip);
-        if (sub) {
-            replen += sub->length - skip;
-            dp += skip;
-        }
-        else
-            dp++;
-    }
-    *sizep = replen;
-    return JS_TRUE;
-}
-
-static void
-do_replace(JSContext *cx, ReplaceData *rdata, jschar *chars)
-{
-    JSString *repstr;
-    jschar *bp, *cp, *dp, *ep;
-    size_t len, skip;
-    JSSubString *sub;
-
-    repstr = rdata->repstr;
-    bp = cp = JSSTRING_CHARS(repstr);
-    for (dp = rdata->dollar, ep = rdata->dollarEnd; dp;
-         dp = js_strchr_limit(dp, '$', ep)) {
-        len = dp - cp;
-        js_strncpy(chars, cp, len);
-        chars += len;
-        cp = dp;
-        sub = interpret_dollar(cx, dp, ep, rdata, &skip);
-        if (sub) {
-            len = sub->length;
-            js_strncpy(chars, sub->chars, len);
-            chars += len;
-            cp += skip;
-            dp += skip;
-        } else {
-            dp++;
-        }
-    }
-    js_strncpy(chars, cp, JSSTRING_LENGTH(repstr) - (cp - bp));
-}
-
-static JSBool
-replace_glob(JSContext *cx, jsint count, GlobData *data)
-{
-    ReplaceData *rdata;
-    JSString *str;
-    size_t leftoff, leftlen, replen, growth;
-    const jschar *left;
-    jschar *chars;
-
-    rdata = (ReplaceData *)data;
-    str = data->str;
-    leftoff = rdata->leftIndex;
-    left = JSSTRING_CHARS(str) + leftoff;
-    leftlen = cx->regExpStatics.lastMatch.chars - left;
-    rdata->leftIndex = cx->regExpStatics.lastMatch.chars - JSSTRING_CHARS(str);
-    rdata->leftIndex += cx->regExpStatics.lastMatch.length;
-    if (!find_replen(cx, rdata, &replen))
-        return JS_FALSE;
-    growth = leftlen + replen;
-    chars = (jschar *)
-        (rdata->chars
-         ? JS_realloc(cx, rdata->chars, (rdata->length + growth + 1)
-                                        * sizeof(jschar))
-         : JS_malloc(cx, (growth + 1) * sizeof(jschar)));
-    if (!chars) {
-        JS_free(cx, rdata->chars);
-        rdata->chars = NULL;
-        return JS_FALSE;
-    }
-    rdata->chars = chars;
-    rdata->length += growth;
-    chars += rdata->index;
-    rdata->index += growth;
-    js_strncpy(chars, left, leftlen);
-    chars += leftlen;
-    do_replace(cx, rdata, chars);
-    return JS_TRUE;
-}
-
-static JSBool
-str_replace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *lambda;
-    JSString *repstr, *str;
-    ReplaceData rdata;
-    JSVersion version;
-    JSBool ok;
-    jschar *chars;
-    size_t leftlen, rightlen, length;
-
-#if JS_HAS_REPLACE_LAMBDA
-    if (JS_TypeOfValue(cx, argv[1]) == JSTYPE_FUNCTION) {
-        lambda = JSVAL_TO_OBJECT(argv[1]);
-        repstr = NULL;
-    } else
-#endif
-    {
-        if (!JS_ConvertValue(cx, argv[1], JSTYPE_STRING, &argv[1]))
-            return JS_FALSE;
-        repstr = JSVAL_TO_STRING(argv[1]);
-        lambda = NULL;
-    }
-
-    /*
-     * For ECMA Edition 3, the first argument is to be converted to a string
-     * to match in a "flat" sense (without regular expression metachars having
-     * special meanings) UNLESS the first arg is a RegExp object.
-     */
-    rdata.base.flags = MODE_REPLACE | KEEP_REGEXP;
-    version = cx->version & JSVERSION_MASK;
-    if (version == JSVERSION_DEFAULT || version > JSVERSION_1_4)
-        rdata.base.flags |= FORCE_FLAT;
-    rdata.base.optarg = 2;
-
-    rdata.lambda = lambda;
-    rdata.repstr = repstr;
-    if (repstr) {
-        rdata.dollarEnd = JSSTRING_CHARS(repstr) + JSSTRING_LENGTH(repstr);
-        rdata.dollar = js_strchr_limit(JSSTRING_CHARS(repstr), '$',
-                                       rdata.dollarEnd);
-    } else {
-        rdata.dollar = rdata.dollarEnd = NULL;
-    }
-    rdata.chars = NULL;
-    rdata.length = 0;
-    rdata.index = 0;
-    rdata.leftIndex = 0;
-
-    ok = match_or_replace(cx, obj, argc, argv, replace_glob, &rdata.base, rval);
-    if (!ok)
-        return JS_FALSE;
-
-    if (!rdata.chars) {
-        if ((rdata.base.flags & GLOBAL_REGEXP) || *rval != JSVAL_TRUE) {
-            /* Didn't match even once. */
-            *rval = STRING_TO_JSVAL(rdata.base.str);
-            goto out;
-        }
-        leftlen = cx->regExpStatics.leftContext.length;
-        ok = find_replen(cx, &rdata, &length);
-        if (!ok)
-            goto out;
-        length += leftlen;
-        chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
-        if (!chars) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        js_strncpy(chars, cx->regExpStatics.leftContext.chars, leftlen);
-        do_replace(cx, &rdata, chars + leftlen);
-        rdata.chars = chars;
-        rdata.length = length;
-    }
-
-    rightlen = cx->regExpStatics.rightContext.length;
-    length = rdata.length + rightlen;
-    chars = (jschar *)
-        JS_realloc(cx, rdata.chars, (length + 1) * sizeof(jschar));
-    if (!chars) {
-        JS_free(cx, rdata.chars);
-        ok = JS_FALSE;
-        goto out;
-    }
-    js_strncpy(chars + rdata.length, cx->regExpStatics.rightContext.chars,
-               rightlen);
-    chars[length] = 0;
-
-    str = js_NewString(cx, chars, length, 0);
-    if (!str) {
-        JS_free(cx, chars);
-        ok = JS_FALSE;
-        goto out;
-    }
-    *rval = STRING_TO_JSVAL(str);
-
-out:
-    /* If KEEP_REGEXP is still set, it's our job to destroy regexp now. */
-    if (rdata.base.flags & KEEP_REGEXP)
-        js_DestroyRegExp(cx, rdata.base.regexp);
-    return ok;
-}
-#endif /* JS_HAS_REGEXPS */
-
-/*
- * Subroutine used by str_split to find the next split point in str, starting
- * at offset *ip and looking either for the separator substring given by sep,
- * or for the next re match.  In the re case, return the matched separator in
- * *sep, and the possibly updated offset in *ip.
- *
- * Return -2 on error, -1 on end of string, >= 0 for a valid index of the next
- * separator occurrence if found, or str->length if no separator is found.
- */
-static jsint
-find_split(JSContext *cx, JSString *str, JSRegExp *re, jsint *ip,
-           JSSubString *sep)
-{
-    jsint i, j, k;
-    jschar *chars;
-    size_t length;
-
-    /*
-     * Stop if past end of string.  If at end of string, we will compare the
-     * null char stored there (by js_NewString*) to sep->chars[j] in the while
-     * loop at the end of this function, so that
-     *
-     *  "ab,".split(',') => ["ab", ""]
-     *
-     * and the resulting array converts back to the string "ab," for symmetry.
-     * However, we ape Perl and do this only if there is a sufficiently large
-     * limit argument (see str_split).
-     */
-    i = *ip;
-    if ((size_t)i > JSSTRING_LENGTH(str))
-        return -1;
-
-    /*
-     * Perl4 special case for str.split(' '), only if the user has selected
-     * JavaScript1.2 explicitly.  Split on whitespace, and skip leading w/s.
-     * Strange but true, apparently modeled after awk.
-     *
-     * NB: we set sep->length to the length of the w/s run, so we must test
-     * sep->chars[1] == 0 to make sure sep is just one space.
-     */
-    chars = JSSTRING_CHARS(str);
-    length = JSSTRING_LENGTH(str);
-    if (JS_VERSION_IS_1_2(cx) &&
-        !re && *sep->chars == ' ' && sep->chars[1] == 0) {
-
-        /* Skip leading whitespace if at front of str. */
-        if (i == 0) {
-            while (JS_ISSPACE(chars[i]))
-                i++;
-            *ip = i;
-        }
-
-        /* Don't delimit whitespace at end of string. */
-        if ((size_t)i == length)
-            return -1;
-
-        /* Skip over the non-whitespace chars. */
-        while ((size_t)i < length && !JS_ISSPACE(chars[i]))
-            i++;
-
-        /* Now skip the next run of whitespace. */
-        j = i;
-        while ((size_t)j < length && JS_ISSPACE(chars[j]))
-            j++;
-
-        /* Update sep->length to count delimiter chars. */
-        sep->length = (size_t)(j - i);
-        return i;
-    }
-
-#if JS_HAS_REGEXPS
-    /*
-     * Match a regular expression against the separator at or above index i.
-     * Call js_ExecuteRegExp with true for the test argument.  On successful
-     * match, get the separator from cx->regExpStatics.lastMatch.
-     */
-    if (re) {
-        size_t index;
-        jsval rval;
-
-      again:
-        /* JS1.2 deviated from Perl by never matching at end of string. */
-        index = (size_t)i;
-        if (!js_ExecuteRegExp(cx, re, str, &index, JS_TRUE, &rval))
-            return -2;
-        if (rval != JSVAL_TRUE) {
-            /* Mismatch: ensure our caller advances i past end of string. */
-            sep->length = 1;
-            return length;
-        }
-        i = (jsint)index;
-        *sep = cx->regExpStatics.lastMatch;
-        if (sep->length == 0) {
-            /*
-             * Empty string match: never split on an empty match at the start
-             * of a find_split cycle.  Same rule as for an empty global match
-             * in match_or_replace.
-             */
-            if (i == *ip) {
-                /*
-                 * "Bump-along" to avoid sticking at an empty match, but don't
-                 * bump past end of string -- our caller must do that by adding
-                 * sep->length to our return value.
-                 */
-                if ((size_t)i == length) {
-                    if (JS_VERSION_IS_1_2(cx)) {
-                        sep->length = 1;
-                        return i;
-                    }
-                    return -1;
-                }
-                i++;
-                goto again;
-            }
-            if ((size_t)i == length) {
-                /*
-                 * If there was a trivial zero-length match at the end of the
-                 * split, then we shouldn't output the matched string at the end
-                 * of the split array. See ECMA-262 Ed. 3, 15.5.4.14, Step 15.
-                 */
-                sep->chars = NULL;
-            }
-        }
-        JS_ASSERT((size_t)i >= sep->length);
-        return i - sep->length;
-    }
-#endif /* JS_HAS_REGEXPS */
-
-    /*
-     * Deviate from ECMA by never splitting an empty string by any separator
-     * string into a non-empty array (an array of length 1 that contains the
-     * empty string).
-     */
-    if (!JS_VERSION_IS_ECMA(cx) && length == 0)
-        return -1;
-
-    /*
-     * Special case: if sep is the empty string, split str into one character
-     * substrings.  Let our caller worry about whether to split once at end of
-     * string into an empty substring.
-     *
-     * For 1.2 compatibility, at the end of the string, we return the length as
-     * the result, and set the separator length to 1 -- this allows the caller
-     * to include an additional null string at the end of the substring list.
-     */
-    if (sep->length == 0) {
-        if (JS_VERSION_IS_1_2(cx)) {
-            if ((size_t)i == length) {
-                sep->length = 1;
-                return i;
-            }
-            return i + 1;
-        }
-        return ((size_t)i == length) ? -1 : i + 1;
-    }
-
-    /*
-     * Now that we know sep is non-empty, search starting at i in str for an
-     * occurrence of all of sep's chars.  If we find them, return the index of
-     * the first separator char.  Otherwise, return length.
-     */
-    j = 0;
-    while ((size_t)(k = i + j) < length) {
-        if (chars[k] == sep->chars[j]) {
-            if ((size_t)++j == sep->length)
-                return i;
-        } else {
-            i++;
-            j = 0;
-        }
-    }
-    return k;
-}
-
-static JSBool
-str_split(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str, *sub;
-    JSObject *arrayobj;
-    jsval v;
-    JSBool ok, limited;
-    JSRegExp *re;
-    JSSubString *sep, tmp;
-    jsdouble d;
-    jsint i, j;
-    uint32 len, limit;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    arrayobj = js_ConstructObject(cx, &js_ArrayClass, NULL, NULL, 0, NULL);
-    if (!arrayobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(arrayobj);
-
-    if (argc == 0) {
-        v = STRING_TO_JSVAL(str);
-        ok = JS_SetElement(cx, arrayobj, 0, &v);
-    } else {
-#if JS_HAS_REGEXPS
-        if (JSVAL_IS_REGEXP(cx, argv[0])) {
-            re = (JSRegExp *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(argv[0]));
-            sep = &tmp;
-
-            /* Set a magic value so we can detect a successful re match. */
-            sep->chars = NULL;
-        } else
-#endif
-        {
-            JSString *str2 = js_ValueToString(cx, argv[0]);
-            if (!str2)
-                return JS_FALSE;
-            argv[0] = STRING_TO_JSVAL(str2);
-
-            /*
-             * Point sep at a local copy of str2's header because find_split
-             * will modify sep->length.
-             */
-            tmp.length = JSSTRING_LENGTH(str2);
-            tmp.chars = JSSTRING_CHARS(str2);
-            sep = &tmp;
-            re = NULL;
-        }
-
-        /* Use the second argument as the split limit, if given. */
-        limited = (argc > 1) && !JSVAL_IS_VOID(argv[1]);
-        limit = 0; /* Avoid warning. */
-        if (limited) {
-            if (!js_ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-
-            /* Clamp limit between 0 and 1 + string length. */
-            if (!js_DoubleToECMAUint32(cx, d, &limit))
-                return JS_FALSE;
-            if (limit > JSSTRING_LENGTH(str))
-                limit = 1 + JSSTRING_LENGTH(str);
-        }
-
-        len = i = 0;
-        while ((j = find_split(cx, str, re, &i, sep)) >= 0) {
-            if (limited && len >= limit)
-                break;
-            sub = js_NewDependentString(cx, str, i, (size_t)(j - i), 0);
-            if (!sub)
-                return JS_FALSE;
-            v = STRING_TO_JSVAL(sub);
-            if (!JS_SetElement(cx, arrayobj, len, &v))
-                return JS_FALSE;
-            len++;
-#if JS_HAS_REGEXPS
-            /*
-             * Imitate perl's feature of including parenthesized substrings
-             * that matched part of the delimiter in the new array, after the
-             * split substring that was delimited.
-             */
-            if (re && sep->chars) {
-                uintN num;
-                JSSubString *parsub;
-
-                for (num = 0; num < cx->regExpStatics.parenCount; num++) {
-                    if (limited && len >= limit)
-                        break;
-                    parsub = REGEXP_PAREN_SUBSTRING(&cx->regExpStatics, num);
-                    sub = js_NewStringCopyN(cx, parsub->chars, parsub->length,
-                                            0);
-                    if (!sub)
-                        return JS_FALSE;
-                    v = STRING_TO_JSVAL(sub);
-                    if (!JS_SetElement(cx, arrayobj, len, &v))
-                        return JS_FALSE;
-                    len++;
-                }
-                sep->chars = NULL;
-            }
-#endif
-            i = j + sep->length;
-            if (!JS_VERSION_IS_ECMA(cx)) {
-                /*
-                 * Deviate from ECMA to imitate Perl, which omits a final
-                 * split unless a limit argument is given and big enough.
-                 */
-                if (!limited && (size_t)i == JSSTRING_LENGTH(str))
-                    break;
-            }
-        }
-        ok = (j != -2);
-    }
-    return ok;
-}
-
-#if JS_HAS_PERL_SUBSTR
-static JSBool
-str_substr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    jsdouble length, begin, end;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc != 0) {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        length = JSSTRING_LENGTH(str);
-        begin = js_DoubleToInteger(d);
-        if (begin < 0) {
-            begin += length;
-            if (begin < 0)
-                begin = 0;
-        } else if (begin > length) {
-            begin = length;
-        }
-
-        if (argc == 1) {
-            end = length;
-        } else {
-            if (!js_ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-            end = js_DoubleToInteger(d);
-            if (end < 0)
-                end = 0;
-            end += begin;
-            if (end > length)
-                end = length;
-        }
-
-        str = js_NewDependentString(cx, str, (size_t)begin,
-                                    (size_t)(end - begin), 0);
-        if (!str)
-            return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif /* JS_HAS_PERL_SUBSTR */
-
-#if JS_HAS_SEQUENCE_OPS
-/*
- * Python-esque sequence operations.
- */
-static JSBool
-str_concat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str, *str2;
-    uintN i;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    for (i = 0; i < argc; i++) {
-        str2 = js_ValueToString(cx, argv[i]);
-        if (!str2)
-            return JS_FALSE;
-        argv[i] = STRING_TO_JSVAL(str2);
-
-        str = js_ConcatStrings(cx, str, str2);
-        if (!str)
-            return JS_FALSE;
-    }
-
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-str_slice(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-    jsdouble d;
-    jsdouble length, begin, end;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (argc != 0) {
-        if (!js_ValueToNumber(cx, argv[0], &d))
-            return JS_FALSE;
-        length = JSSTRING_LENGTH(str);
-        begin = js_DoubleToInteger(d);
-        if (begin < 0) {
-            begin += length;
-            if (begin < 0)
-                begin = 0;
-        } else if (begin > length) {
-            begin = length;
-        }
-
-        if (argc == 1) {
-            end = length;
-        } else {
-            if (!js_ValueToNumber(cx, argv[1], &d))
-                return JS_FALSE;
-            end = js_DoubleToInteger(d);
-            if (end < 0) {
-                end += length;
-                if (end < 0)
-                    end = 0;
-            } else if (end > length) {
-                end = length;
-            }
-            if (end < begin)
-                end = begin;
-        }
-
-        str = js_NewDependentString(cx, str, (size_t)begin,
-                                    (size_t)(end - begin), 0);
-        if (!str)
-            return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-#endif /* JS_HAS_SEQUENCE_OPS */
-
-#if JS_HAS_STR_HTML_HELPERS
-/*
- * HTML composition aids.
- */
-static JSBool
-tagify(JSContext *cx, JSObject *obj, jsval *argv,
-       const char *begin, JSString *param, const char *end,
-       jsval *rval)
-{
-    JSString *str;
-    jschar *tagbuf;
-    size_t beglen, endlen, parlen, taglen;
-    size_t i, j;
-
-    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    argv[-1] = STRING_TO_JSVAL(str);
-
-    if (!end)
-        end = begin;
-
-    beglen = strlen(begin);
-    taglen = 1 + beglen + 1;                            /* '<begin' + '>' */
-    parlen = 0; /* Avoid warning. */
-    if (param) {
-        parlen = JSSTRING_LENGTH(param);
-        taglen += 2 + parlen + 1;                       /* '="param"' */
-    }
-    endlen = strlen(end);
-    taglen += JSSTRING_LENGTH(str) + 2 + endlen + 1;    /* 'str</end>' */
-
-    tagbuf = (jschar *) JS_malloc(cx, (taglen + 1) * sizeof(jschar));
-    if (!tagbuf)
-        return JS_FALSE;
-
-    j = 0;
-    tagbuf[j++] = '<';
-    for (i = 0; i < beglen; i++)
-        tagbuf[j++] = (jschar)begin[i];
-    if (param) {
-        tagbuf[j++] = '=';
-        tagbuf[j++] = '"';
-        js_strncpy(&tagbuf[j], JSSTRING_CHARS(param), parlen);
-        j += parlen;
-        tagbuf[j++] = '"';
-    }
-    tagbuf[j++] = '>';
-    js_strncpy(&tagbuf[j], JSSTRING_CHARS(str), JSSTRING_LENGTH(str));
-    j += JSSTRING_LENGTH(str);
-    tagbuf[j++] = '<';
-    tagbuf[j++] = '/';
-    for (i = 0; i < endlen; i++)
-        tagbuf[j++] = (jschar)end[i];
-    tagbuf[j++] = '>';
-    JS_ASSERT(j == taglen);
-    tagbuf[j] = 0;
-
-    str = js_NewString(cx, tagbuf, taglen, 0);
-    if (!str) {
-        free((char *)tagbuf);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-tagify_value(JSContext *cx, JSObject *obj, jsval *argv,
-             const char *begin, const char *end,
-             jsval *rval)
-{
-    JSString *param;
-
-    param = js_ValueToString(cx, argv[0]);
-    if (!param)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(param);
-    return tagify(cx, obj, argv, begin, param, end, rval);
-}
-
-static JSBool
-str_bold(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "b", NULL, NULL, rval);
-}
-
-static JSBool
-str_italics(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "i", NULL, NULL, rval);
-}
-
-static JSBool
-str_fixed(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "tt", NULL, NULL, rval);
-}
-
-static JSBool
-str_fontsize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify_value(cx, obj, argv, "font size", "font", rval);
-}
-
-static JSBool
-str_fontcolor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    return tagify_value(cx, obj, argv, "font color", "font", rval);
-}
-
-static JSBool
-str_link(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify_value(cx, obj, argv, "a href", "a", rval);
-}
-
-static JSBool
-str_anchor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify_value(cx, obj, argv, "a name", "a", rval);
-}
-
-static JSBool
-str_strike(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "strike", NULL, NULL, rval);
-}
-
-static JSBool
-str_small(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "small", NULL, NULL, rval);
-}
-
-static JSBool
-str_big(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "big", NULL, NULL, rval);
-}
-
-static JSBool
-str_blink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "blink", NULL, NULL, rval);
-}
-
-static JSBool
-str_sup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "sup", NULL, NULL, rval);
-}
-
-static JSBool
-str_sub(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    return tagify(cx, obj, argv, "sub", NULL, NULL, rval);
-}
-#endif /* JS_HAS_STR_HTML_HELPERS */
-
-static JSFunctionSpec string_methods[] = {
-#if JS_HAS_TOSOURCE
-    {"quote",               str_quote,              0,JSFUN_GENERIC_NATIVE,0},
-    {js_toSource_str,       str_toSource,           0,0,0},
-#endif
-
-    /* Java-like methods. */
-    {js_toString_str,       str_toString,           0,0,0},
-    {js_valueOf_str,        str_valueOf,            0,0,0},
-    {"substring",           str_substring,          2,JSFUN_GENERIC_NATIVE,0},
-    {"toLowerCase",         str_toLowerCase,        0,JSFUN_GENERIC_NATIVE,0},
-    {"toUpperCase",         str_toUpperCase,        0,JSFUN_GENERIC_NATIVE,0},
-    {"charAt",              str_charAt,             1,JSFUN_GENERIC_NATIVE,0},
-    {"charCodeAt",          str_charCodeAt,         1,JSFUN_GENERIC_NATIVE,0},
-    {"indexOf",             str_indexOf,            1,JSFUN_GENERIC_NATIVE,0},
-    {"lastIndexOf",         str_lastIndexOf,        1,JSFUN_GENERIC_NATIVE,0},
-    {"toLocaleLowerCase",   str_toLocaleLowerCase,  0,JSFUN_GENERIC_NATIVE,0},
-    {"toLocaleUpperCase",   str_toLocaleUpperCase,  0,JSFUN_GENERIC_NATIVE,0},
-    {"localeCompare",       str_localeCompare,      1,JSFUN_GENERIC_NATIVE,0},
-
-    /* Perl-ish methods (search is actually Python-esque). */
-#if JS_HAS_REGEXPS
-    {"match",               str_match,              1,JSFUN_GENERIC_NATIVE,2},
-    {"search",              str_search,             1,JSFUN_GENERIC_NATIVE,0},
-    {"replace",             str_replace,            2,JSFUN_GENERIC_NATIVE,0},
-    {"split",               str_split,              2,JSFUN_GENERIC_NATIVE,0},
-#endif
-#if JS_HAS_PERL_SUBSTR
-    {"substr",              str_substr,             2,JSFUN_GENERIC_NATIVE,0},
-#endif
-
-    /* Python-esque sequence methods. */
-#if JS_HAS_SEQUENCE_OPS
-    {"concat",              str_concat,             0,JSFUN_GENERIC_NATIVE,0},
-    {"slice",               str_slice,              0,JSFUN_GENERIC_NATIVE,0},
-#endif
-
-    /* HTML string methods. */
-#if JS_HAS_STR_HTML_HELPERS
-    {"bold",                str_bold,               0,0,0},
-    {"italics",             str_italics,            0,0,0},
-    {"fixed",               str_fixed,              0,0,0},
-    {"fontsize",            str_fontsize,           1,0,0},
-    {"fontcolor",           str_fontcolor,          1,0,0},
-    {"link",                str_link,               1,0,0},
-    {"anchor",              str_anchor,             1,0,0},
-    {"strike",              str_strike,             0,0,0},
-    {"small",               str_small,              0,0,0},
-    {"big",                 str_big,                0,0,0},
-    {"blink",               str_blink,              0,0,0},
-    {"sup",                 str_sup,                0,0,0},
-    {"sub",                 str_sub,                0,0,0},
-#endif
-
-    {0,0,0,0,0}
-};
-
-static JSBool
-String(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSString *str;
-
-    if (argc > 0) {
-        str = js_ValueToString(cx, argv[0]);
-        if (!str)
-            return JS_FALSE;
-        argv[0] = STRING_TO_JSVAL(str);
-    } else {
-        str = cx->runtime->emptyString;
-    }
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        *rval = STRING_TO_JSVAL(str);
-        return JS_TRUE;
-    }
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, STRING_TO_JSVAL(str));
-    return JS_TRUE;
-}
-
-static JSBool
-str_fromCharCode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    jschar *chars;
-    uintN i;
-    uint16 code;
-    JSString *str;
-
-    chars = (jschar *) JS_malloc(cx, (argc + 1) * sizeof(jschar));
-    if (!chars)
-        return JS_FALSE;
-    for (i = 0; i < argc; i++) {
-        if (!js_ValueToUint16(cx, argv[i], &code)) {
-            JS_free(cx, chars);
-            return JS_FALSE;
-        }
-        chars[i] = (jschar)code;
-    }
-    chars[i] = 0;
-    str = js_NewString(cx, chars, argc, 0);
-    if (!str) {
-        JS_free(cx, chars);
-        return JS_FALSE;
-    }
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec string_static_methods[] = {
-    {"fromCharCode",    str_fromCharCode,       1,0,0},
-    {0,0,0,0,0}
-};
-
-static JSHashTable *deflated_string_cache;
-#ifdef DEBUG
-static uint32 deflated_string_cache_bytes;
-#endif
-#ifdef JS_THREADSAFE
-static JSLock *deflated_string_cache_lock;
-#endif
-
-JSBool
-js_InitStringGlobals(void)
-{
-#ifdef JS_THREADSAFE
-    /* Must come through here once in primordial thread to init safely! */
-    if (!deflated_string_cache_lock) {
-        deflated_string_cache_lock = JS_NEW_LOCK();
-        if (!deflated_string_cache_lock)
-            return JS_FALSE;
-    }
-#endif
-    return JS_TRUE;
-}
-
-void
-js_FreeStringGlobals()
-{
-    if (deflated_string_cache) {
-        JS_HashTableDestroy(deflated_string_cache);
-        deflated_string_cache = NULL;
-    }
-#ifdef JS_THREADSAFE
-    if (deflated_string_cache_lock) {
-        JS_DESTROY_LOCK(deflated_string_cache_lock);
-        deflated_string_cache_lock = NULL;
-    }
-#endif
-}
-
-JSBool
-js_InitRuntimeStringState(JSContext *cx)
-{
-    JSRuntime *rt;
-    JSString *empty;
-    JSAtom *atom;
-
-    rt = cx->runtime;
-    JS_ASSERT(!rt->emptyString);
-
-    /* Make a permanently locked empty string. */
-    empty = js_NewStringCopyN(cx, js_empty_ucstr, 0, GCF_LOCK);
-    if (!empty)
-        return JS_FALSE;
-
-    /* Atomize it for scripts that use '' + x to convert x to string. */
-    atom = js_AtomizeString(cx, empty, ATOM_PINNED);
-    if (!atom)
-        return JS_FALSE;
-
-    rt->emptyString = empty;
-    rt->atomState.emptyAtom = atom;
-    return JS_TRUE;
-}
-
-void
-js_FinishRuntimeStringState(JSContext *cx)
-{
-    JSRuntime *rt = cx->runtime;
-
-    js_UnlockGCThingRT(rt, rt->emptyString);
-    rt->emptyString = NULL;
-}
-
-JSObject *
-js_InitStringClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto;
-
-    /* Define the escape, unescape functions in the global object. */
-    if (!JS_DefineFunctions(cx, obj, string_functions))
-        return NULL;
-
-    proto = JS_InitClass(cx, obj, NULL, &js_StringClass, String, 1,
-                         string_props, string_methods,
-                         NULL, string_static_methods);
-    if (!proto)
-        return NULL;
-    OBJ_SET_SLOT(cx, proto, JSSLOT_PRIVATE,
-                 STRING_TO_JSVAL(cx->runtime->emptyString));
-    return proto;
-}
-
-JSString *
-js_NewString(JSContext *cx, jschar *chars, size_t length, uintN gcflag)
-{
-    JSString *str;
-
-    if (length > JSSTRING_LENGTH_MASK) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-
-    str = (JSString *) js_NewGCThing(cx, gcflag | GCX_STRING, sizeof(JSString));
-    if (!str)
-        return NULL;
-    str->length = length;
-    str->chars = chars;
-#ifdef DEBUG
-  {
-    JSRuntime *rt = cx->runtime;
-    JS_RUNTIME_METER(rt, liveStrings);
-    JS_RUNTIME_METER(rt, totalStrings);
-    JS_LOCK_RUNTIME_VOID(rt,
-        (rt->lengthSum += (double)length,
-         rt->lengthSquaredSum += (double)length * (double)length));
-  }
-#endif
-    return str;
-}
-
-JSString *
-js_NewDependentString(JSContext *cx, JSString *base, size_t start,
-                      size_t length, uintN gcflag)
-{
-    JSDependentString *ds;
-
-    if (length == 0)
-        return cx->runtime->emptyString;
-
-    if (start == 0 && length == JSSTRING_LENGTH(base))
-        return base;
-
-    if (start > JSSTRDEP_START_MASK ||
-        (start != 0 && length > JSSTRDEP_LENGTH_MASK)) {
-        return js_NewStringCopyN(cx, JSSTRING_CHARS(base) + start, length,
-                                 gcflag);
-    }
-
-    ds = (JSDependentString *)
-         js_NewGCThing(cx, gcflag | GCX_MUTABLE_STRING, sizeof(JSString));
-    if (!ds)
-        return NULL;
-    if (start == 0) {
-        JSPREFIX_SET_LENGTH(ds, length);
-        JSPREFIX_SET_BASE(ds, base);
-    } else {
-        JSSTRDEP_SET_START_AND_LENGTH(ds, start, length);
-        JSSTRDEP_SET_BASE(ds, base);
-    }
-#ifdef DEBUG
-  {
-    JSRuntime *rt = cx->runtime;
-    JS_RUNTIME_METER(rt, liveDependentStrings);
-    JS_RUNTIME_METER(rt, totalDependentStrings);
-    JS_RUNTIME_METER(rt, liveStrings);
-    JS_RUNTIME_METER(rt, totalStrings);
-    JS_LOCK_RUNTIME_VOID(rt,
-        (rt->strdepLengthSum += (double)length,
-         rt->strdepLengthSquaredSum += (double)length * (double)length));
-    JS_LOCK_RUNTIME_VOID(rt,
-        (rt->lengthSum += (double)length,
-         rt->lengthSquaredSum += (double)length * (double)length));
-  }
-#endif
-    return (JSString *)ds;
-}
-
-#ifdef DEBUG
-#include <math.h>
-
-#ifdef OSSP
-void printJSStringStats(JSRuntime *rt);
-#endif
-
-void printJSStringStats(JSRuntime *rt) {
-    double mean = 0., var = 0., sigma = 0.;
-    jsrefcount count = rt->totalStrings;
-    if (count > 0 && rt->lengthSum >= 0) {
-        mean = rt->lengthSum / count;
-        var = count * rt->lengthSquaredSum - rt->lengthSum * rt->lengthSum;
-        if (var < 0.0 || count <= 1)
-            var = 0.0;
-        else
-            var /= count * (count - 1);
-
-        /* Windows says sqrt(0.0) is "-1.#J" (?!) so we must test. */
-        sigma = (var != 0.) ? sqrt(var) : 0.;
-    }
-    fprintf(stderr, "%lu total strings, mean length %g (sigma %g)\n",
-            (unsigned long)count, mean, sigma);
-
-    mean = var = sigma = 0.;
-    count = rt->totalDependentStrings;
-    if (count > 0 && rt->strdepLengthSum >= 0) {
-        mean = rt->strdepLengthSum / count;
-        var = count * rt->strdepLengthSquaredSum
-            - rt->strdepLengthSum * rt->strdepLengthSum;
-        if (var < 0.0 || count <= 1)
-            var = 0.0;
-        else
-            var /= count * (count - 1);
-
-        /* Windows says sqrt(0.0) is "-1.#J" (?!) so we must test. */
-        sigma = (var != 0.) ? sqrt(var) : 0.;
-    }
-    fprintf(stderr, "%lu total dependent strings, mean length %g (sigma %g)\n",
-            (unsigned long)count, mean, sigma);
-}
-#endif
-
-JSString *
-js_NewStringCopyN(JSContext *cx, const jschar *s, size_t n, uintN gcflag)
-{
-    jschar *news;
-    JSString *str;
-
-    news = (jschar *)JS_malloc(cx, (n + 1) * sizeof(jschar));
-    if (!news)
-        return NULL;
-    js_strncpy(news, s, n);
-    news[n] = 0;
-    str = js_NewString(cx, news, n, gcflag);
-    if (!str)
-        JS_free(cx, news);
-    return str;
-}
-
-JSString *
-js_NewStringCopyZ(JSContext *cx, const jschar *s, uintN gcflag)
-{
-    size_t n, m;
-    jschar *news;
-    JSString *str;
-
-    n = js_strlen(s);
-    m = (n + 1) * sizeof(jschar);
-    news = (jschar *) JS_malloc(cx, m);
-    if (!news)
-        return NULL;
-    memcpy(news, s, m);
-    str = js_NewString(cx, news, n, gcflag);
-    if (!str)
-        JS_free(cx, news);
-    return str;
-}
-
-JS_STATIC_DLL_CALLBACK(JSHashNumber)
-js_hash_string_pointer(const void *key)
-{
-    return (JSHashNumber)JS_PTR_TO_UINT32(key) >> JSVAL_TAGBITS;
-}
-
-void
-js_PurgeDeflatedStringCache(JSString *str)
-{
-    JSHashNumber hash;
-    JSHashEntry *he, **hep;
-
-    if (!deflated_string_cache)
-        return;
-
-    hash = js_hash_string_pointer(str);
-    JS_ACQUIRE_LOCK(deflated_string_cache_lock);
-    hep = JS_HashTableRawLookup(deflated_string_cache, hash, str);
-    he = *hep;
-    if (he) {
-#ifdef DEBUG
-        deflated_string_cache_bytes -= JSSTRING_LENGTH(str);
-#endif
-        free(he->value);
-        JS_HashTableRawRemove(deflated_string_cache, hep, he);
-    }
-    JS_RELEASE_LOCK(deflated_string_cache_lock);
-}
-
-void
-js_FinalizeString(JSContext *cx, JSString *str)
-{
-    js_FinalizeStringRT(cx->runtime, str);
-}
-
-void
-js_FinalizeStringRT(JSRuntime *rt, JSString *str)
-{
-    JSBool valid;
-
-    JS_RUNTIME_UNMETER(rt, liveStrings);
-    if (JSSTRING_IS_DEPENDENT(str)) {
-        /* If JSSTRFLAG_DEPENDENT is set, this string must be valid. */
-        JS_ASSERT(JSSTRDEP_BASE(str));
-        JS_RUNTIME_UNMETER(rt, liveDependentStrings);
-        valid = JS_TRUE;
-    } else {
-        /* A stillborn string has null chars, so is not valid. */
-        valid = (str->chars != NULL);
-        if (valid)
-            free(str->chars);
-    }
-    if (valid) {
-        js_PurgeDeflatedStringCache(str);
-        str->chars = NULL;
-    }
-    str->length = 0;
-}
-
-JSObject *
-js_StringToObject(JSContext *cx, JSString *str)
-{
-    JSObject *obj;
-
-    obj = js_NewObject(cx, &js_StringClass, NULL, NULL);
-    if (!obj)
-        return NULL;
-    OBJ_SET_SLOT(cx, obj, JSSLOT_PRIVATE, STRING_TO_JSVAL(str));
-    return obj;
-}
-
-JS_FRIEND_API(const char *)
-js_ValueToPrintableString(JSContext *cx, jsval v)
-{
-    JSString *str;
-    const char *bytes;
-
-    str = js_ValueToString(cx, v);
-    if (!str)
-        return NULL;
-    str = js_QuoteString(cx, str, 0);
-    if (!str)
-        return NULL;
-    bytes = js_GetStringBytes(str);
-    if (!bytes)
-        JS_ReportOutOfMemory(cx);
-    return bytes;
-}
-
-JSString *
-js_ValueToString(JSContext *cx, jsval v)
-{
-    JSObject *obj;
-    JSString *str;
-
-    if (JSVAL_IS_OBJECT(v)) {
-        obj = JSVAL_TO_OBJECT(v);
-        if (!obj)
-            return ATOM_TO_STRING(cx->runtime->atomState.nullAtom);
-        if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_STRING, &v))
-            return NULL;
-    }
-    if (JSVAL_IS_STRING(v)) {
-        str = JSVAL_TO_STRING(v);
-    } else if (JSVAL_IS_INT(v)) {
-        str = js_NumberToString(cx, JSVAL_TO_INT(v));
-    } else if (JSVAL_IS_DOUBLE(v)) {
-        str = js_NumberToString(cx, *JSVAL_TO_DOUBLE(v));
-    } else if (JSVAL_IS_BOOLEAN(v)) {
-        str = js_BooleanToString(cx, JSVAL_TO_BOOLEAN(v));
-    } else {
-        str = ATOM_TO_STRING(cx->runtime->atomState.typeAtoms[JSTYPE_VOID]);
-    }
-    return str;
-}
-
-JSString *
-js_ValueToSource(JSContext *cx, jsval v)
-{
-    if (JSVAL_IS_STRING(v))
-        return js_QuoteString(cx, JSVAL_TO_STRING(v), '"');
-    if (JSVAL_IS_PRIMITIVE(v)) {
-        /* Special case to preserve negative zero, _contra_ toString. */
-        if (JSVAL_IS_DOUBLE(v) && JSDOUBLE_IS_NEGZERO(*JSVAL_TO_DOUBLE(v))) {
-            /* NB: _ucNstr rather than _ucstr to indicate non-terminated. */
-            static const jschar js_negzero_ucNstr[] = {'-', '0'};
-
-            return js_NewStringCopyN(cx, js_negzero_ucNstr, 2, 0);
-        }
-    } else {
-        if (!js_TryMethod(cx, JSVAL_TO_OBJECT(v),
-                          cx->runtime->atomState.toSourceAtom,
-                          0, NULL, &v)) {
-            return NULL;
-        }
-    }
-    return js_ValueToString(cx, v);
-}
-
-JSHashNumber
-js_HashString(JSString *str)
-{
-    JSHashNumber h;
-    const jschar *s;
-    size_t n;
-
-    h = 0;
-    for (s = JSSTRING_CHARS(str), n = JSSTRING_LENGTH(str); n; s++, n--)
-        h = (h >> (JS_HASH_BITS - 4)) ^ (h << 4) ^ *s;
-    return h;
-}
-
-intN
-js_CompareStrings(JSString *str1, JSString *str2)
-{
-    size_t l1, l2, n, i;
-    const jschar *s1, *s2;
-    intN cmp;
-
-    l1 = JSSTRING_LENGTH(str1), l2 = JSSTRING_LENGTH(str2);
-    s1 = JSSTRING_CHARS(str1),  s2 = JSSTRING_CHARS(str2);
-    n = JS_MIN(l1, l2);
-    for (i = 0; i < n; i++) {
-        cmp = s1[i] - s2[i];
-        if (cmp != 0)
-            return cmp;
-    }
-    return (intN)(l1 - l2);
-}
-
-size_t
-js_strlen(const jschar *s)
-{
-    const jschar *t;
-
-    for (t = s; *t != 0; t++)
-        continue;
-    return (size_t)(t - s);
-}
-
-jschar *
-js_strchr(const jschar *s, jschar c)
-{
-    while (*s != 0) {
-        if (*s == c)
-            return (jschar *)s;
-        s++;
-    }
-    return NULL;
-}
-
-jschar *
-js_strchr_limit(const jschar *s, jschar c, const jschar *limit)
-{
-    while (s < limit) {
-        if (*s == c)
-            return (jschar *)s;
-        s++;
-    }
-    return NULL;
-}
-
-const jschar *
-js_SkipWhiteSpace(const jschar *s)
-{
-    /* JS_ISSPACE is false on a null. */
-    while (JS_ISSPACE(*s))
-        s++;
-    return s;
-}
-
-#ifdef JS_C_STRINGS_ARE_UTF8
-
-jschar *
-js_InflateString(JSContext *cx, const char *bytes, size_t *length)
-{
-    jschar *chars = NULL;
-    size_t dstlen = 0;
-
-    if (!js_InflateStringToBuffer(cx, bytes, *length, NULL, &dstlen))
-        return NULL;
-    chars = (jschar *) JS_malloc(cx, (dstlen + 1) * sizeof (jschar));
-    if (!chars)
-        return NULL;
-    js_InflateStringToBuffer(cx, bytes, *length, chars, &dstlen);
-    chars [dstlen] = 0;
-    *length = dstlen;
-    return chars;
-}
-
-/*
- * May be called with null cx by js_GetStringBytes, see below.
- */
-char *
-js_DeflateString(JSContext *cx, const jschar *chars, size_t length)
-{
-    size_t size = 0;
-    char *bytes = NULL;
-    if (!js_DeflateStringToBuffer (cx, chars, length, NULL, &size))
-        return NULL;
-    bytes = (char *) (cx ? JS_malloc(cx, size+1) : malloc(size+1));
-    if (!bytes)
-        return NULL;
-    js_DeflateStringToBuffer (cx, chars, length, bytes, &size);
-    bytes [size] = 0;
-    return bytes;
-}
-
-JSBool
-js_DeflateStringToBuffer(JSContext *cx, const jschar* src, size_t srclen, char* dst, size_t* dstlenp)
-{
-    size_t i, utf8Len, dstlen = *dstlenp, origDstlen = dstlen;
-    jschar c, c2;
-    uint32 v;
-    uint8 utf8buf[6];
-
-    if (!dst)
-        dstlen = origDstlen = (size_t) -1;
-
-    while (srclen) {
-        c = *src++;
-        srclen--;
-        if ((c >= 0xDC00) && (c <= 0xDFFF))
-            goto badSurrogate;
-        if (c < 0xD800 || c > 0xDBFF) {
-            v = c;
-        } else {
-            if (srclen < 1)
-                goto bufferTooSmall;
-            c2 = *src++;
-            srclen--;
-            if ((c2 < 0xDC00) || (c2 > 0xDFFF)) {
-                c = c2;
-                goto badSurrogate;
-            }
-            v = ((c - 0xD800) << 10) + (c2 - 0xDC00) + 0x10000;
-        }
-        if (v < 0x0080) {
-            /* OSSP BUGFIX */ /* no encoding necessary - performance hack */
-            if (!dstlen)
-                goto bufferTooSmall;
-            if (dst)
-                *dst++ = (char) v;
-            utf8Len = 1;
-        } else {
-            utf8Len = js_OneUcs4ToUtf8Char(utf8buf, v);
-            if (utf8Len > dstlen)
-                goto bufferTooSmall;
-            if (dst) {
-                for (i = 0; i < utf8Len; i++)
-                    *dst++ = (char) utf8buf [i];
-            }
-        }
-        dstlen -= utf8Len;
-    }
-    *dstlenp = (origDstlen - dstlen);
-    return JS_TRUE;
-
-badSurrogate:
-    *dstlenp = (origDstlen - dstlen);
-    if (cx) {
-        char buffer [10];
-        JS_snprintf (buffer, 10, "0x%x", c);
-        JS_ReportErrorFlagsAndNumber(cx,
-                                JSREPORT_ERROR,
-                                js_GetErrorMessage, NULL,
-                                JSMSG_BAD_SURROGATE_CHAR,
-                                buffer);
-    }
-    return JS_FALSE;
-
-bufferTooSmall:
-    *dstlenp = (origDstlen - dstlen);
-    if (cx)
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BUFFER_TOO_SMALL);
-    return JS_FALSE;
-}
-
-JSBool
-js_InflateStringToBuffer(JSContext *cx, const char *src, size_t srclen, jschar* dst, size_t* dstlenp)
-{
-    uint32 v;
-    size_t offset = 0, j, n, dstlen = *dstlenp, origDstlen = dstlen;
-
-    if (!dst)
-        dstlen = origDstlen = (size_t) -1;
-
-    while (srclen) {
-        v = (uint8) *src;
-        n = 1;
-        if (v & 0x80) {
-            while (v & (0x80 >> n))
-                n++;
-            if (n > srclen)
-                goto bufferTooSmall;
-            if (n == 1 || n > 6)
-                goto badCharacter;
-            for (j = 1; j < n; j++) {
-                if ((src [j] & 0xC0) != 0x80)
-                    goto badCharacter;
-            }
-            v = Utf8ToOneUcs4Char(src, n);
-            if (v >= 0x10000) {
-                v -= 0x10000;
-                if (v > 0xFFFFF || dstlen < 2) {
-                    *dstlenp = (origDstlen - dstlen);
-                    if (cx) {
-                        char buffer [10];
-                        JS_snprintf (buffer, 10, "0x%x", v + 0x10000);
-                        JS_ReportErrorFlagsAndNumber(cx,
-                                                JSREPORT_ERROR,
-                                                js_GetErrorMessage, NULL,
-                                                JSMSG_UTF8_CHAR_TOO_LARGE,
-                                                buffer);
-                    }
-                    return JS_FALSE;
-                }
-                if (dstlen < 2)
-                    goto bufferTooSmall;
-                if (dst) {
-                    *dst++ = (jschar)((v >> 10) + 0xD800);
-                    v = (jschar)((v & 0x3FF) + 0xDC00);
-                }
-                dstlen--;
-            }
-        }
-        if (!dstlen)
-            goto bufferTooSmall;
-        if (dst)
-            *dst++ = (jschar) v;
-        dstlen--;
-        offset += n;
-        src += n;
-        srclen -= n;
-    }
-    *dstlenp = (origDstlen - dstlen);
-    return JS_TRUE;
-
-badCharacter:
-    *dstlenp = (origDstlen - dstlen);
-    if (cx) {
-        char buffer [10];
-        JS_snprintf (buffer, 10, "%d", offset);
-        JS_ReportErrorFlagsAndNumber(cx,
-                                JSREPORT_ERROR,
-                                js_GetErrorMessage, NULL,
-                                JSMSG_MALFORMED_UTF8_CHAR,
-                                buffer);
-    }
-    return JS_FALSE;
-
-bufferTooSmall:
-    *dstlenp = (origDstlen - dstlen);
-    if (cx)
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BUFFER_TOO_SMALL);
-    return JS_FALSE;
-}
-
-#else
-
-JSBool
-js_InflateStringToBuffer(JSContext* cx, const char *bytes, size_t length, jschar *chars, size_t* charsLength)
-{
-    size_t i;
-
-    if (length > *charsLength) {
-        for (i = 0; i < *charsLength; i++)
-            chars[i] = (unsigned char) bytes[i];
-        if (cx)
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BUFFER_TOO_SMALL);
-        return JS_FALSE;
-    }
-    else {
-        for (i = 0; i < length; i++)
-            chars[i] = (unsigned char) bytes[i];
-        *charsLength = length;
-        return JS_TRUE;
-    }
-}
-
-jschar *
-js_InflateString(JSContext *cx, const char *bytes, size_t *bytesLength)
-{
-    jschar *chars;
-    size_t i, length = *bytesLength;
-
-    chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
-    if (!chars) {
-        *bytesLength = 0;
-        return NULL;
-    }
-    for (i = 0; i < length; i++)
-        chars[i] = (unsigned char) bytes[i];
-    chars [length] = 0;
-    *bytesLength = length;
-    return chars;
-}
-
-JSBool
-js_DeflateStringToBuffer(JSContext* cx, const jschar *chars, size_t length, char *bytes, size_t* bytesLength)
-{
-    size_t i;
-
-    if (length > *bytesLength) {
-        for (i = 0; i < *bytesLength; i++)
-            bytes[i] = (char) chars[i];
-        if (cx)
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BUFFER_TOO_SMALL);
-        return JS_FALSE;
-    }
-    else {
-        for (i = 0; i < length; i++)
-            bytes[i] = (char) chars[i];
-        *bytesLength = length;
-        return JS_TRUE;
-    }
-}
-
-/*
- * May be called with null cx by js_GetStringBytes, see below.
- */
-char *
-js_DeflateString(JSContext *cx, const jschar *chars, size_t length)
-{
-    size_t i, size;
-    char *bytes;
-
-    size = (length + 1) * sizeof(char);
-    bytes = (char *) (cx ? JS_malloc(cx, size) : malloc(size));
-    if (!bytes)
-        return NULL;
-
-    for (i = 0; i < length; i++)
-        bytes[i] = (char) chars[i];
-
-    bytes [length] = 0;
-    return bytes;
-}
-
-#endif
-
-static JSHashTable *
-GetDeflatedStringCache(void)
-{
-    JSHashTable *cache;
-
-    cache = deflated_string_cache;
-    if (!cache) {
-        cache = JS_NewHashTable(8, js_hash_string_pointer,
-                                JS_CompareValues, JS_CompareValues,
-                                NULL, NULL);
-        deflated_string_cache = cache;
-    }
-    return cache;
-}
-
-JSBool
-js_SetStringBytes(JSString *str, char *bytes, size_t length)
-{
-    JSHashTable *cache;
-    JSBool ok;
-    JSHashNumber hash;
-    JSHashEntry **hep;
-
-    JS_ACQUIRE_LOCK(deflated_string_cache_lock);
-
-    cache = GetDeflatedStringCache();
-    if (!cache) {
-        ok = JS_FALSE;
-    } else {
-        hash = js_hash_string_pointer(str);
-        hep = JS_HashTableRawLookup(cache, hash, str);
-        JS_ASSERT(*hep == NULL);
-        ok = JS_HashTableRawAdd(cache, hep, hash, str, bytes) != NULL;
-#ifdef DEBUG
-        if (ok)
-            deflated_string_cache_bytes += length;
-#endif
-    }
-
-    JS_RELEASE_LOCK(deflated_string_cache_lock);
-    return ok;
-}
-
-char *
-js_GetStringBytes(JSString *str)
-{
-    JSHashTable *cache;
-    char *bytes;
-    JSHashNumber hash;
-    JSHashEntry *he, **hep;
-
-    JS_ACQUIRE_LOCK(deflated_string_cache_lock);
-
-    cache = GetDeflatedStringCache();
-    if (!cache) {
-        bytes = NULL;
-    } else {
-        hash = js_hash_string_pointer(str);
-        hep = JS_HashTableRawLookup(cache, hash, str);
-        he = *hep;
-        if (he) {
-            bytes = (char *) he->value;
-
-            /* Try to catch failure to JS_ShutDown between runtime epochs. */
-            JS_ASSERT((*bytes == '\0' && JSSTRING_LENGTH(str) == 0) ||
-                      *bytes == (char) JSSTRING_CHARS(str)[0]);
-        } else {
-            bytes = js_DeflateString(NULL, JSSTRING_CHARS(str),
-                                           JSSTRING_LENGTH(str));
-            if (bytes) {
-                if (JS_HashTableRawAdd(cache, hep, hash, str, bytes)) {
-#ifdef DEBUG
-                    deflated_string_cache_bytes += JSSTRING_LENGTH(str);
-#endif
-                } else {
-                    free(bytes);
-                    bytes = NULL;
-                }
-            }
-        }
-    }
-
-    JS_RELEASE_LOCK(deflated_string_cache_lock);
-    return bytes;
-}
-
-/*
- * From java.lang.Character.java:
- *
- * The character properties are currently encoded into 32 bits in the
- * following manner:
- *
- * 10 bits      signed offset used for converting case
- *  1 bit       if 1, adding the signed offset converts the character to
- *              lowercase
- *  1 bit       if 1, subtracting the signed offset converts the character to
- *              uppercase
- *  1 bit       if 1, character has a titlecase equivalent (possibly itself)
- *  3 bits      0  may not be part of an identifier
- *              1  ignorable control; may continue a Unicode identifier or JS
- *                 identifier
- *              2  may continue a JS identifier but not a Unicode identifier
- *                 (unused)
- *              3  may continue a Unicode identifier or JS identifier
- *              4  is a JS whitespace character
- *              5  may start or continue a JS identifier;
- *                 may continue but not start a Unicode identifier (_)
- *              6  may start or continue a JS identifier but not a Unicode
- *                 identifier ($)
- *              7  may start or continue a Unicode identifier or JS identifier
- *              Thus:
- *                 5, 6, 7 may start a JS identifier
- *                 1, 2, 3, 5, 6, 7 may continue a JS identifier
- *                 7 may start a Unicode identifier
- *                 1, 3, 5, 7 may continue a Unicode identifier
- *                 1 is ignorable within an identifier
- *                 4 is JS whitespace
- *  2 bits      0  this character has no numeric property
- *              1  adding the digit offset to the character code and then
- *                 masking with 0x1F will produce the desired numeric value
- *              2  this character has a "strange" numeric value
- *              3  a JS supradecimal digit: adding the digit offset to the
- *                 character code, then masking with 0x1F, then adding 10
- *                 will produce the desired numeric value
- *  5 bits      digit offset
- *  1 bit       XML 1.0 name start character
- *  1 bit       XML 1.0 name character
- *  2 bits      reserved for future use
- *  5 bits      character type
- */
-
-/* The X table has 1024 entries for a total of 1024 bytes. */
-
-const uint8 js_X[] = {
-  0,   1,   2,   3,   4,   5,   6,   7,  /*  0x0000 */
-  8,   9,  10,  11,  12,  13,  14,  15,  /*  0x0200 */
- 16,  17,  18,  19,  20,  21,  22,  23,  /*  0x0400 */
- 24,  25,  26,  27,  28,  28,  28,  28,  /*  0x0600 */
- 28,  28,  28,  28,  29,  30,  31,  32,  /*  0x0800 */
- 33,  34,  35,  36,  37,  38,  39,  40,  /*  0x0A00 */
- 41,  42,  43,  44,  45,  46,  28,  28,  /*  0x0C00 */
- 47,  48,  49,  50,  51,  52,  53,  28,  /*  0x0E00 */
- 28,  28,  54,  55,  56,  57,  58,  59,  /*  0x1000 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1200 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1400 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1600 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1800 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1A00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x1C00 */
- 60,  60,  61,  62,  63,  64,  65,  66,  /*  0x1E00 */
- 67,  68,  69,  70,  71,  72,  73,  74,  /*  0x2000 */
- 75,  75,  75,  76,  77,  78,  28,  28,  /*  0x2200 */
- 79,  80,  81,  82,  83,  83,  84,  85,  /*  0x2400 */
- 86,  85,  28,  28,  87,  88,  89,  28,  /*  0x2600 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x2800 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x2A00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x2C00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x2E00 */
- 90,  91,  92,  93,  94,  56,  95,  28,  /*  0x3000 */
- 96,  97,  98,  99,  83, 100,  83, 101,  /*  0x3200 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3400 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3600 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3800 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3A00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3C00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x3E00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4000 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4200 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4400 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4600 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4800 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4A00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0x4C00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x4E00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5A00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5C00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x5E00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6A00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6C00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x6E00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7A00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7C00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x7E00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8A00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8C00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x8E00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9A00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0x9C00 */
- 56,  56,  56,  56,  56,  56, 102,  28,  /*  0x9E00 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xA000 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xA200 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xA400 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xA600 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xA800 */
- 28,  28,  28,  28,  28,  28,  28,  28,  /*  0xAA00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xAC00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xAE00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xB000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xB200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xB400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xB600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xB800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xBA00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xBC00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xBE00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xC000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xC200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xC400 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xC600 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xC800 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xCA00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xCC00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xCE00 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xD000 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xD200 */
- 56,  56,  56,  56,  56,  56,  56,  56,  /*  0xD400 */
- 56,  56,  56,  56,  56,  56, 103,  28,  /*  0xD600 */
-104, 104, 104, 104, 104, 104, 104, 104,  /*  0xD800 */
-104, 104, 104, 104, 104, 104, 104, 104,  /*  0xDA00 */
-104, 104, 104, 104, 104, 104, 104, 104,  /*  0xDC00 */
-104, 104, 104, 104, 104, 104, 104, 104,  /*  0xDE00 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xE000 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xE200 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xE400 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xE600 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xE800 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xEA00 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xEC00 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xEE00 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xF000 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xF200 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xF400 */
-105, 105, 105, 105, 105, 105, 105, 105,  /*  0xF600 */
-105, 105, 105, 105,  56,  56,  56,  56,  /*  0xF800 */
-106,  28,  28,  28, 107, 108, 109, 110,  /*  0xFA00 */
- 56,  56,  56,  56, 111, 112, 113, 114,  /*  0xFC00 */
-115, 116,  56, 117, 118, 119, 120, 121   /*  0xFE00 */
-};
-
-/* The Y table has 7808 entries for a total of 7808 bytes. */
-
-const uint8 js_Y[] = {
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    0 */
-  0,   1,   1,   1,   1,   1,   0,   0,  /*    0 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    0 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    0 */
-  2,   3,   3,   3,   4,   3,   3,   3,  /*    0 */
-  5,   6,   3,   7,   3,   8,   3,   3,  /*    0 */
-  9,   9,   9,   9,   9,   9,   9,   9,  /*    0 */
-  9,   9,   3,   3,   7,   7,   7,   3,  /*    0 */
-  3,  10,  10,  10,  10,  10,  10,  10,  /*    1 */
- 10,  10,  10,  10,  10,  10,  10,  10,  /*    1 */
- 10,  10,  10,  10,  10,  10,  10,  10,  /*    1 */
- 10,  10,  10,   5,   3,   6,  11,  12,  /*    1 */
- 11,  13,  13,  13,  13,  13,  13,  13,  /*    1 */
- 13,  13,  13,  13,  13,  13,  13,  13,  /*    1 */
- 13,  13,  13,  13,  13,  13,  13,  13,  /*    1 */
- 13,  13,  13,   5,   7,   6,   7,   0,  /*    1 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    2 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    2 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    2 */
-  0,   0,   0,   0,   0,   0,   0,   0,  /*    2 */
-  2,   3,   4,   4,   4,   4,  15,  15,  /*    2 */
- 11,  15,  16,   5,   7,   8,  15,  11,  /*    2 */
- 15,   7,  17,  17,  11,  16,  15,   3,  /*    2 */
- 11,  18,  16,   6,  19,  19,  19,   3,  /*    2 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*    3 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*    3 */
- 20,  20,  20,  20,  20,  20,  20,   7,  /*    3 */
- 20,  20,  20,  20,  20,  20,  20,  16,  /*    3 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*    3 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*    3 */
- 21,  21,  21,  21,  21,  21,  21,   7,  /*    3 */
- 21,  21,  21,  21,  21,  21,  21,  22,  /*    3 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    4 */
- 25,  26,  23,  24,  23,  24,  23,  24,  /*    4 */
- 16,  23,  24,  23,  24,  23,  24,  23,  /*    4 */
- 24,  23,  24,  23,  24,  23,  24,  23,  /*    5 */
- 24,  16,  23,  24,  23,  24,  23,  24,  /*    5 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    5 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    5 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    5 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    5 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    5 */
- 27,  23,  24,  23,  24,  23,  24,  28,  /*    5 */
- 16,  29,  23,  24,  23,  24,  30,  23,  /*    6 */
- 24,  31,  31,  23,  24,  16,  32,  32,  /*    6 */
- 33,  23,  24,  31,  34,  16,  35,  36,  /*    6 */
- 23,  24,  16,  16,  35,  37,  16,  38,  /*    6 */
- 23,  24,  23,  24,  23,  24,  38,  23,  /*    6 */
- 24,  39,  40,  16,  23,  24,  39,  23,  /*    6 */
- 24,  41,  41,  23,  24,  23,  24,  42,  /*    6 */
- 23,  24,  16,  40,  23,  24,  40,  40,  /*    6 */
- 40,  40,  40,  40,  43,  44,  45,  43,  /*    7 */
- 44,  45,  43,  44,  45,  23,  24,  23,  /*    7 */
- 24,  23,  24,  23,  24,  23,  24,  23,  /*    7 */
- 24,  23,  24,  23,  24,  16,  23,  24,  /*    7 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    7 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    7 */
- 16,  43,  44,  45,  23,  24,  46,  46,  /*    7 */
- 46,  46,  23,  24,  23,  24,  23,  24,  /*    7 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    8 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    8 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    8 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    9 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*    9 */
- 16,  16,  16,  47,  48,  16,  49,  49,  /*    9 */
- 50,  50,  16,  51,  16,  16,  16,  16,  /*    9 */
- 49,  16,  16,  52,  16,  16,  16,  16,  /*    9 */
- 53,  54,  16,  16,  16,  16,  16,  54,  /*    9 */
- 16,  16,  55,  16,  16,  16,  16,  16,  /*    9 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*    9 */
- 16,  16,  16,  56,  16,  16,  16,  16,  /*   10 */
- 56,  16,  57,  57,  16,  16,  16,  16,  /*   10 */
- 16,  16,  58,  16,  16,  16,  16,  16,  /*   10 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   10 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   10 */
- 16,  46,  46,  46,  46,  46,  46,  46,  /*   10 */
- 59,  59,  59,  59,  59,  59,  59,  59,  /*   10 */
- 59,  11,  11,  59,  59,  59,  59,  59,  /*   10 */
- 59,  59,  11,  11,  11,  11,  11,  11,  /*   11 */
- 11,  11,  11,  11,  11,  11,  11,  11,  /*   11 */
- 59,  59,  11,  11,  11,  11,  11,  11,  /*   11 */
- 11,  11,  11,  11,  11,  11,  11,  46,  /*   11 */
- 59,  59,  59,  59,  59,  11,  11,  11,  /*   11 */
- 11,  11,  46,  46,  46,  46,  46,  46,  /*   11 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   11 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   11 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   12 */
- 60,  60,  60,  60,  60,  60,  46,  46,  /*   13 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   13 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   13 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   13 */
- 60,  60,  46,  46,  46,  46,  46,  46,  /*   13 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   13 */
- 46,  46,  46,  46,   3,   3,  46,  46,  /*   13 */
- 46,  46,  59,  46,  46,  46,   3,  46,  /*   13 */
- 46,  46,  46,  46,  11,  11,  61,   3,  /*   14 */
- 62,  62,  62,  46,  63,  46,  64,  64,  /*   14 */
- 16,  20,  20,  20,  20,  20,  20,  20,  /*   14 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*   14 */
- 20,  20,  46,  20,  20,  20,  20,  20,  /*   14 */
- 20,  20,  20,  20,  65,  66,  66,  66,  /*   14 */
- 16,  21,  21,  21,  21,  21,  21,  21,  /*   14 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*   14 */
- 21,  21,  16,  21,  21,  21,  21,  21,  /*   15 */
- 21,  21,  21,  21,  67,  68,  68,  46,  /*   15 */
- 69,  70,  38,  38,  38,  71,  72,  46,  /*   15 */
- 46,  46,  38,  46,  38,  46,  38,  46,  /*   15 */
- 38,  46,  23,  24,  23,  24,  23,  24,  /*   15 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   15 */
- 73,  74,  16,  40,  46,  46,  46,  46,  /*   15 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   15 */
- 46,  75,  75,  75,  75,  75,  75,  75,  /*   16 */
- 75,  75,  75,  75,  75,  46,  75,  75,  /*   16 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*   16 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*   16 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*   16 */
- 20,  20,  20,  20,  20,  20,  20,  20,  /*   16 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*   16 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*   16 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*   17 */
- 21,  21,  21,  21,  21,  21,  21,  21,  /*   17 */
- 46,  74,  74,  74,  74,  74,  74,  74,  /*   17 */
- 74,  74,  74,  74,  74,  46,  74,  74,  /*   17 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   17 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   17 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   17 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   17 */
- 23,  24,  15,  60,  60,  60,  60,  46,  /*   18 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   18 */
- 40,  23,  24,  23,  24,  46,  46,  23,  /*   19 */
- 24,  46,  46,  23,  24,  46,  46,  46,  /*   19 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   19 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   19 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   19 */
- 23,  24,  23,  24,  46,  46,  23,  24,  /*   19 */
- 23,  24,  23,  24,  23,  24,  46,  46,  /*   19 */
- 23,  24,  46,  46,  46,  46,  46,  46,  /*   19 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   20 */
- 46,  76,  76,  76,  76,  76,  76,  76,  /*   20 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   20 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   21 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   21 */
- 76,  76,  76,  76,  76,  76,  76,  46,  /*   21 */
- 46,  59,   3,   3,   3,   3,   3,   3,  /*   21 */
- 46,  77,  77,  77,  77,  77,  77,  77,  /*   21 */
- 77,  77,  77,  77,  77,  77,  77,  77,  /*   21 */
- 77,  77,  77,  77,  77,  77,  77,  77,  /*   21 */
- 77,  77,  77,  77,  77,  77,  77,  77,  /*   21 */
- 77,  77,  77,  77,  77,  77,  77,  16,  /*   22 */
- 46,   3,  46,  46,  46,  46,  46,  46,  /*   22 */
- 46,  60,  60,  60,  60,  60,  60,  60,  /*   22 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   22 */
- 60,  60,  46,  60,  60,  60,  60,  60,  /*   22 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   22 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   22 */
- 60,  60,  46,  60,  60,  60,   3,  60,  /*   22 */
-  3,  60,  60,   3,  60,  46,  46,  46,  /*   23 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   23 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   23 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   23 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   23 */
- 40,  40,  40,  46,  46,  46,  46,  46,  /*   23 */
- 40,  40,  40,   3,   3,  46,  46,  46,  /*   23 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   23 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   24 */
- 46,  46,  46,  46,   3,  46,  46,  46,  /*   24 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   24 */
- 46,  46,  46,   3,  46,  46,  46,   3,  /*   24 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   24 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   24 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   24 */
- 40,  40,  40,  46,  46,  46,  46,  46,  /*   24 */
- 59,  40,  40,  40,  40,  40,  40,  40,  /*   25 */
- 40,  40,  40,  60,  60,  60,  60,  60,  /*   25 */
- 60,  60,  60,  46,  46,  46,  46,  46,  /*   25 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   25 */
- 78,  78,  78,  78,  78,  78,  78,  78,  /*   25 */
- 78,  78,   3,   3,   3,   3,  46,  46,  /*   25 */
- 60,  40,  40,  40,  40,  40,  40,  40,  /*   25 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   25 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   26 */
- 46,  46,  40,  40,  40,  40,  40,  46,  /*   26 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   27 */
- 40,  40,  40,  40,  40,  40,  40,  46,  /*   27 */
- 40,  40,  40,  40,   3,  40,  60,  60,  /*   27 */
- 60,  60,  60,  60,  60,  79,  79,  60,  /*   27 */
- 60,  60,  60,  60,  60,  59,  59,  60,  /*   27 */
- 60,  15,  60,  60,  60,  60,  46,  46,  /*   27 */
-  9,   9,   9,   9,   9,   9,   9,   9,  /*   27 */
-  9,   9,  46,  46,  46,  46,  46,  46,  /*   27 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   28 */
- 46,  60,  60,  80,  46,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   29 */
- 40,  40,  46,  46,  60,  40,  80,  80,  /*   29 */
- 80,  60,  60,  60,  60,  60,  60,  60,  /*   30 */
- 60,  80,  80,  80,  80,  60,  46,  46,  /*   30 */
- 15,  60,  60,  60,  60,  46,  46,  46,  /*   30 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   30 */
- 40,  40,  60,  60,   3,   3,  81,  81,  /*   30 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   30 */
-  3,  46,  46,  46,  46,  46,  46,  46,  /*   30 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   30 */
- 46,  60,  80,  80,  46,  40,  40,  40,  /*   31 */
- 40,  40,  40,  40,  40,  46,  46,  40,  /*   31 */
- 40,  46,  46,  40,  40,  40,  40,  40,  /*   31 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   31 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   31 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   31 */
- 40,  46,  40,  46,  46,  46,  40,  40,  /*   31 */
- 40,  40,  46,  46,  60,  46,  80,  80,  /*   31 */
- 80,  60,  60,  60,  60,  46,  46,  80,  /*   32 */
- 80,  46,  46,  80,  80,  60,  46,  46,  /*   32 */
- 46,  46,  46,  46,  46,  46,  46,  80,  /*   32 */
- 46,  46,  46,  46,  40,  40,  46,  40,  /*   32 */
- 40,  40,  60,  60,  46,  46,  81,  81,  /*   32 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   32 */
- 40,  40,   4,   4,  82,  82,  82,  82,  /*   32 */
- 19,  83,  15,  46,  46,  46,  46,  46,  /*   32 */
- 46,  46,  60,  46,  46,  40,  40,  40,  /*   33 */
- 40,  40,  40,  46,  46,  46,  46,  40,  /*   33 */
- 40,  46,  46,  40,  40,  40,  40,  40,  /*   33 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   33 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   33 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   33 */
- 40,  46,  40,  40,  46,  40,  40,  46,  /*   33 */
- 40,  40,  46,  46,  60,  46,  80,  80,  /*   33 */
- 80,  60,  60,  46,  46,  46,  46,  60,  /*   34 */
- 60,  46,  46,  60,  60,  60,  46,  46,  /*   34 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   34 */
- 46,  40,  40,  40,  40,  46,  40,  46,  /*   34 */
- 46,  46,  46,  46,  46,  46,  81,  81,  /*   34 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   34 */
- 60,  60,  40,  40,  40,  46,  46,  46,  /*   34 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   34 */
- 46,  60,  60,  80,  46,  40,  40,  40,  /*   35 */
- 40,  40,  40,  40,  46,  40,  46,  40,  /*   35 */
- 40,  40,  46,  40,  40,  40,  40,  40,  /*   35 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   35 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   35 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   35 */
- 40,  46,  40,  40,  46,  40,  40,  40,  /*   35 */
- 40,  40,  46,  46,  60,  40,  80,  80,  /*   35 */
- 80,  60,  60,  60,  60,  60,  46,  60,  /*   36 */
- 60,  80,  46,  80,  80,  60,  46,  46,  /*   36 */
- 15,  46,  46,  46,  46,  46,  46,  46,  /*   36 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   36 */
- 40,  46,  46,  46,  46,  46,  81,  81,  /*   36 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   36 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   36 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   36 */
- 46,  60,  80,  80,  46,  40,  40,  40,  /*   37 */
- 40,  40,  40,  40,  40,  46,  46,  40,  /*   37 */
- 40,  46,  46,  40,  40,  40,  40,  40,  /*   37 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   37 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   37 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   37 */
- 40,  46,  40,  40,  46,  46,  40,  40,  /*   37 */
- 40,  40,  46,  46,  60,  40,  80,  60,  /*   37 */
- 80,  60,  60,  60,  46,  46,  46,  80,  /*   38 */
- 80,  46,  46,  80,  80,  60,  46,  46,  /*   38 */
- 46,  46,  46,  46,  46,  46,  60,  80,  /*   38 */
- 46,  46,  46,  46,  40,  40,  46,  40,  /*   38 */
- 40,  40,  46,  46,  46,  46,  81,  81,  /*   38 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   38 */
- 15,  46,  46,  46,  46,  46,  46,  46,  /*   38 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   38 */
- 46,  46,  60,  80,  46,  40,  40,  40,  /*   39 */
- 40,  40,  40,  46,  46,  46,  40,  40,  /*   39 */
- 40,  46,  40,  40,  40,  40,  46,  46,  /*   39 */
- 46,  40,  40,  46,  40,  46,  40,  40,  /*   39 */
- 46,  46,  46,  40,  40,  46,  46,  46,  /*   39 */
- 40,  40,  40,  46,  46,  46,  40,  40,  /*   39 */
- 40,  40,  40,  40,  40,  40,  46,  40,  /*   39 */
- 40,  40,  46,  46,  46,  46,  80,  80,  /*   39 */
- 60,  80,  80,  46,  46,  46,  80,  80,  /*   40 */
- 80,  46,  80,  80,  80,  60,  46,  46,  /*   40 */
- 46,  46,  46,  46,  46,  46,  46,  80,  /*   40 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   40 */
- 46,  46,  46,  46,  46,  46,  46,  81,  /*   40 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   40 */
- 84,  19,  19,  46,  46,  46,  46,  46,  /*   40 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   40 */
- 46,  80,  80,  80,  46,  40,  40,  40,  /*   41 */
- 40,  40,  40,  40,  40,  46,  40,  40,  /*   41 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   41 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   41 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   41 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   41 */
- 40,  40,  40,  40,  46,  40,  40,  40,  /*   41 */
- 40,  40,  46,  46,  46,  46,  60,  60,  /*   41 */
- 60,  80,  80,  80,  80,  46,  60,  60,  /*   42 */
- 60,  46,  60,  60,  60,  60,  46,  46,  /*   42 */
- 46,  46,  46,  46,  46,  60,  60,  46,  /*   42 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   42 */
- 40,  40,  46,  46,  46,  46,  81,  81,  /*   42 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   42 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   42 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   42 */
- 46,  46,  80,  80,  46,  40,  40,  40,  /*   43 */
- 40,  40,  40,  40,  40,  46,  40,  40,  /*   43 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   43 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   43 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   43 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   43 */
- 40,  40,  40,  40,  46,  40,  40,  40,  /*   43 */
- 40,  40,  46,  46,  46,  46,  80,  60,  /*   43 */
- 80,  80,  80,  80,  80,  46,  60,  80,  /*   44 */
- 80,  46,  80,  80,  60,  60,  46,  46,  /*   44 */
- 46,  46,  46,  46,  46,  80,  80,  46,  /*   44 */
- 46,  46,  46,  46,  46,  46,  40,  46,  /*   44 */
- 40,  40,  46,  46,  46,  46,  81,  81,  /*   44 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   44 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   44 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   44 */
- 46,  46,  80,  80,  46,  40,  40,  40,  /*   45 */
- 40,  40,  40,  40,  40,  46,  40,  40,  /*   45 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   45 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   45 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   45 */
- 40,  46,  40,  40,  40,  40,  40,  40,  /*   45 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   45 */
- 40,  40,  46,  46,  46,  46,  80,  80,  /*   45 */
- 80,  60,  60,  60,  46,  46,  80,  80,  /*   46 */
- 80,  46,  80,  80,  80,  60,  46,  46,  /*   46 */
- 46,  46,  46,  46,  46,  46,  46,  80,  /*   46 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   46 */
- 40,  40,  46,  46,  46,  46,  81,  81,  /*   46 */
- 81,  81,  81,  81,  81,  81,  81,  81,  /*   46 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   46 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   46 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   47 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   47 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   47 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   47 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   47 */
- 40,  40,  40,  40,  40,  40,  40,   3,  /*   47 */
- 40,  60,  40,  40,  60,  60,  60,  60,  /*   47 */
- 60,  60,  60,  46,  46,  46,  46,   4,  /*   47 */
- 40,  40,  40,  40,  40,  40,  59,  60,  /*   48 */
- 60,  60,  60,  60,  60,  60,  60,  15,  /*   48 */
-  9,   9,   9,   9,   9,   9,   9,   9,  /*   48 */
-  9,   9,   3,   3,  46,  46,  46,  46,  /*   48 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   48 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   48 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   48 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   48 */
- 46,  40,  40,  46,  40,  46,  46,  40,  /*   49 */
- 40,  46,  40,  46,  46,  40,  46,  46,  /*   49 */
- 46,  46,  46,  46,  40,  40,  40,  40,  /*   49 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   49 */
- 46,  40,  40,  40,  46,  40,  46,  40,  /*   49 */
- 46,  46,  40,  40,  46,  40,  40,   3,  /*   49 */
- 40,  60,  40,  40,  60,  60,  60,  60,  /*   49 */
- 60,  60,  46,  60,  60,  40,  46,  46,  /*   49 */
- 40,  40,  40,  40,  40,  46,  59,  46,  /*   50 */
- 60,  60,  60,  60,  60,  60,  46,  46,  /*   50 */
-  9,   9,   9,   9,   9,   9,   9,   9,  /*   50 */
-  9,   9,  46,  46,  40,  40,  46,  46,  /*   50 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   50 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   50 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   50 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   50 */
- 15,  15,  15,  15,   3,   3,   3,   3,  /*   51 */
-  3,   3,   3,   3,   3,   3,   3,   3,  /*   51 */
-  3,   3,   3,  15,  15,  15,  15,  15,  /*   51 */
- 60,  60,  15,  15,  15,  15,  15,  15,  /*   51 */
- 78,  78,  78,  78,  78,  78,  78,  78,  /*   51 */
- 78,  78,  85,  85,  85,  85,  85,  85,  /*   51 */
- 85,  85,  85,  85,  15,  60,  15,  60,  /*   51 */
- 15,  60,   5,   6,   5,   6,  80,  80,  /*   51 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   52 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   52 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   52 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   52 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   52 */
- 40,  40,  46,  46,  46,  46,  46,  46,  /*   52 */
- 46,  60,  60,  60,  60,  60,  60,  60,  /*   52 */
- 60,  60,  60,  60,  60,  60,  60,  80,  /*   52 */
- 60,  60,  60,  60,  60,   3,  60,  60,  /*   53 */
- 60,  60,  60,  60,  46,  46,  46,  46,  /*   53 */
- 60,  60,  60,  60,  60,  60,  46,  60,  /*   53 */
- 46,  60,  60,  60,  60,  60,  60,  60,  /*   53 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   53 */
- 60,  60,  60,  60,  60,  60,  46,  46,  /*   53 */
- 46,  60,  60,  60,  60,  60,  60,  60,  /*   53 */
- 46,  60,  46,  46,  46,  46,  46,  46,  /*   53 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   54 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   54 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   54 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   54 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   54 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   54 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   54 */
- 76,  76,  76,  76,  76,  76,  76,  76,  /*   54 */
- 76,  76,  76,  76,  76,  76,  46,  46,  /*   55 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   55 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   55 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   55 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   55 */
- 16,  16,  16,  16,  16,  16,  16,  16,  /*   55 */
- 16,  16,  16,  16,  16,  16,  16,  46,  /*   55 */
- 46,  46,  46,   3,  46,  46,  46,  46,  /*   55 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   56 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  46,  46,  46,  46,  46,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   57 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  46,  46,  46,  46,  46,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   58 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   59 */
- 40,  40,  46,  46,  46,  46,  46,  46,  /*   59 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   60 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  16,  16,  /*   61 */
- 16,  16,  16,  16,  46,  46,  46,  46,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   61 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  23,  24,  23,  24,  23,  24,  /*   62 */
- 23,  24,  46,  46,  46,  46,  46,  46,  /*   62 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   63 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   63 */
- 86,  86,  86,  86,  86,  86,  46,  46,  /*   63 */
- 87,  87,  87,  87,  87,  87,  46,  46,  /*   63 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   63 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   63 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   63 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   63 */
- 86,  86,  86,  86,  86,  86,  46,  46,  /*   64 */
- 87,  87,  87,  87,  87,  87,  46,  46,  /*   64 */
- 16,  86,  16,  86,  16,  86,  16,  86,  /*   64 */
- 46,  87,  46,  87,  46,  87,  46,  87,  /*   64 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   64 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   64 */
- 88,  88,  89,  89,  89,  89,  90,  90,  /*   64 */
- 91,  91,  92,  92,  93,  93,  46,  46,  /*   64 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   65 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   65 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   65 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   65 */
- 86,  86,  86,  86,  86,  86,  86,  86,  /*   65 */
- 87,  87,  87,  87,  87,  87,  87,  87,  /*   65 */
- 86,  86,  16,  94,  16,  46,  16,  16,  /*   65 */
- 87,  87,  95,  95,  96,  11,  38,  11,  /*   65 */
- 11,  11,  16,  94,  16,  46,  16,  16,  /*   66 */
- 97,  97,  97,  97,  96,  11,  11,  11,  /*   66 */
- 86,  86,  16,  16,  46,  46,  16,  16,  /*   66 */
- 87,  87,  98,  98,  46,  11,  11,  11,  /*   66 */
- 86,  86,  16,  16,  16,  99,  16,  16,  /*   66 */
- 87,  87, 100, 100, 101,  11,  11,  11,  /*   66 */
- 46,  46,  16,  94,  16,  46,  16,  16,  /*   66 */
-102, 102, 103, 103,  96,  11,  11,  46,  /*   66 */
-  2,   2,   2,   2,   2,   2,   2,   2,  /*   67 */
-  2,   2,   2,   2, 104, 104, 104, 104,  /*   67 */
-  8,   8,   8,   8,   8,   8,   3,   3,  /*   67 */
-  5,   6,   5,   5,   5,   6,   5,   5,  /*   67 */
-  3,   3,   3,   3,   3,   3,   3,   3,  /*   67 */
-105, 106, 104, 104, 104, 104, 104,  46,  /*   67 */
-  3,   3,   3,   3,   3,   3,   3,   3,  /*   67 */
-  3,   5,   6,   3,   3,   3,   3,  12,  /*   67 */
- 12,   3,   3,   3,   7,   5,   6,  46,  /*   68 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   68 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   68 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   68 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   68 */
- 46,  46, 104, 104, 104, 104, 104, 104,  /*   68 */
- 17,  46,  46,  46,  17,  17,  17,  17,  /*   68 */
- 17,  17,   7,   7,   7,   5,   6,  16,  /*   68 */
-107, 107, 107, 107, 107, 107, 107, 107,  /*   69 */
-107, 107,   7,   7,   7,   5,   6,  46,  /*   69 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   69 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   69 */
-  4,   4,   4,   4,   4,   4,   4,   4,  /*   69 */
-  4,   4,   4,   4,  46,  46,  46,  46,  /*   69 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   69 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   69 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   70 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   70 */
- 60,  60,  60,  60,  60,  60,  60,  60,  /*   70 */
- 60,  60,  60,  60,  60,  79,  79,  79,  /*   70 */
- 79,  60,  46,  46,  46,  46,  46,  46,  /*   70 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   70 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   70 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   70 */
- 15,  15,  38,  15,  15,  15,  15,  38,  /*   71 */
- 15,  15,  16,  38,  38,  38,  16,  16,  /*   71 */
- 38,  38,  38,  16,  15,  38,  15,  15,  /*   71 */
- 38,  38,  38,  38,  38,  38,  15,  15,  /*   71 */
- 15,  15,  15,  15,  38,  15,  38,  15,  /*   71 */
- 38,  15,  38,  38,  38,  38,  16,  16,  /*   71 */
- 38,  38,  15,  38,  16,  40,  40,  40,  /*   71 */
- 40,  46,  46,  46,  46,  46,  46,  46,  /*   71 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   72 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   72 */
- 46,  46,  46,  19,  19,  19,  19,  19,  /*   72 */
- 19,  19,  19,  19,  19,  19,  19, 108,  /*   72 */
-109, 109, 109, 109, 109, 109, 109, 109,  /*   72 */
-109, 109, 109, 109, 110, 110, 110, 110,  /*   72 */
-111, 111, 111, 111, 111, 111, 111, 111,  /*   72 */
-111, 111, 111, 111, 112, 112, 112, 112,  /*   72 */
-113, 113, 113,  46,  46,  46,  46,  46,  /*   73 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   73 */
-  7,   7,   7,   7,   7,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   73 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   74 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   74 */
- 15,  15,   7,  15,   7,  15,  15,  15,  /*   74 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   74 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   74 */
- 15,  15,  15,  46,  46,  46,  46,  46,  /*   74 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   74 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   74 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   75 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,   7,   7,   7,   7,   7,   7,  /*   76 */
-  7,   7,  46,  46,  46,  46,  46,  46,  /*   76 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   76 */
- 15,  46,  15,  15,  15,  15,  15,  15,  /*   77 */
-  7,   7,   7,   7,  15,  15,  15,  15,  /*   77 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   77 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   77 */
-  7,   7,  15,  15,  15,  15,  15,  15,  /*   77 */
- 15,   5,   6,  15,  15,  15,  15,  15,  /*   77 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   77 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   77 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   78 */
- 15,  15,  15,  46,  46,  46,  46,  46,  /*   78 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   79 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   79 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   79 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   79 */
- 15,  15,  15,  15,  15,  46,  46,  46,  /*   79 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   79 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   79 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   79 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   80 */
- 15,  15,  15,  46,  46,  46,  46,  46,  /*   80 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   80 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   80 */
-114, 114, 114, 114, 114, 114, 114, 114,  /*   80 */
-114, 114, 114, 114, 114, 114, 114, 114,  /*   80 */
-114, 114, 114, 114,  82,  82,  82,  82,  /*   80 */
- 82,  82,  82,  82,  82,  82,  82,  82,  /*   80 */
- 82,  82,  82,  82,  82,  82,  82,  82,  /*   81 */
-115, 115, 115, 115, 115, 115, 115, 115,  /*   81 */
-115, 115, 115, 115, 115, 115, 115, 115,  /*   81 */
-115, 115, 115, 115,  15,  15,  15,  15,  /*   81 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   81 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   81 */
- 15,  15,  15,  15,  15,  15, 116, 116,  /*   81 */
-116, 116, 116, 116, 116, 116, 116, 116,  /*   81 */
-116, 116, 116, 116, 116, 116, 116, 116,  /*   82 */
-116, 116, 116, 116, 116, 116, 116, 116,  /*   82 */
-117, 117, 117, 117, 117, 117, 117, 117,  /*   82 */
-117, 117, 117, 117, 117, 117, 117, 117,  /*   82 */
-117, 117, 117, 117, 117, 117, 117, 117,  /*   82 */
-117, 117, 118,  46,  46,  46,  46,  46,  /*   82 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   82 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   82 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   83 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  46,  46,  /*   84 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   84 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   85 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   85 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   85 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  46,  46,  46,  46,  /*   86 */
- 46,  46,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   86 */
- 46,  15,  15,  15,  15,  46,  15,  15,  /*   87 */
- 15,  15,  46,  46,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 46,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   87 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   88 */
- 15,  15,  15,  15,  46,  15,  46,  15,  /*   88 */
- 15,  15,  15,  46,  46,  46,  15,  46,  /*   88 */
- 15,  15,  15,  15,  15,  15,  15,  46,  /*   88 */
- 46,  15,  15,  15,  15,  15,  15,  15,  /*   88 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   88 */
- 46,  46,  46,  46,  46,  46, 119, 119,  /*   88 */
-119, 119, 119, 119, 119, 119, 119, 119,  /*   88 */
-114, 114, 114, 114, 114, 114, 114, 114,  /*   89 */
-114, 114,  83,  83,  83,  83,  83,  83,  /*   89 */
- 83,  83,  83,  83,  15,  46,  46,  46,  /*   89 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   89 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   89 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   89 */
- 46,  15,  15,  15,  15,  15,  15,  15,  /*   89 */
- 15,  15,  15,  15,  15,  15,  15,  46,  /*   89 */
-  2,   3,   3,   3,  15,  59,   3, 120,  /*   90 */
-  5,   6,   5,   6,   5,   6,   5,   6,  /*   90 */
-  5,   6,  15,  15,   5,   6,   5,   6,  /*   90 */
-  5,   6,   5,   6,   8,   5,   6,   5,  /*   90 */
- 15, 121, 121, 121, 121, 121, 121, 121,  /*   90 */
-121, 121,  60,  60,  60,  60,  60,  60,  /*   90 */
-  8,  59,  59,  59,  59,  59,  15,  15,  /*   90 */
- 46,  46,  46,  46,  46,  46,  46,  15,  /*   90 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   91 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  46,  46,  46,  /*   92 */
- 46,  60,  60,  59,  59,  59,  59,  46,  /*   92 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   92 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   93 */
- 40,  40,  40,   3,  59,  59,  59,  46,  /*   93 */
- 46,  46,  46,  46,  46,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  46,  46,  46,  /*   94 */
- 46,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   94 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*   95 */
- 40,  40,  40,  40,  40,  40,  40,  46,  /*   95 */
- 15,  15,  85,  85,  85,  85,  15,  15,  /*   95 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   95 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   95 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   95 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   95 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   95 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  15,  46,  46,  46,  /*   96 */
- 85,  85,  85,  85,  85,  85,  85,  85,  /*   96 */
- 85,  85,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   96 */
- 15,  15,  15,  15,  46,  46,  46,  46,  /*   97 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   97 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   97 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   97 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   97 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   97 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   97 */
- 15,  15,  15,  15,  46,  46,  46,  15,  /*   97 */
-114, 114, 114, 114, 114, 114, 114, 114,  /*   98 */
-114, 114,  15,  15,  15,  15,  15,  15,  /*   98 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   98 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   98 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   98 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   98 */
- 15,  46,  46,  46,  46,  46,  46,  46,  /*   98 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*   98 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  46,  46,  46,  46,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  46,  /*   99 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  46,  /*  100 */
- 46,  46,  46,  15,  15,  15,  15,  15,  /*  100 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  46,  46,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  15,  /*  101 */
- 15,  15,  15,  15,  15,  15,  15,  46,  /*  101 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  102 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  102 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  102 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  102 */
- 40,  40,  40,  40,  40,  40,  46,  46,  /*  102 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  102 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  102 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  102 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  103 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  103 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  103 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  103 */
- 40,  40,  40,  40,  46,  46,  46,  46,  /*  103 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  103 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  103 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  103 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-122, 122, 122, 122, 122, 122, 122, 122,  /*  104 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
-123, 123, 123, 123, 123, 123, 123, 123,  /*  105 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  106 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  106 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  106 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  106 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  106 */
- 40,  40,  40,  40,  40,  40,  46,  46,  /*  106 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  106 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  106 */
- 16,  16,  16,  16,  16,  16,  16,  46,  /*  107 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  107 */
- 46,  46,  46,  16,  16,  16,  16,  16,  /*  107 */
- 46,  46,  46,  46,  46,  46,  60,  40,  /*  107 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  107 */
- 40,   7,  40,  40,  40,  40,  40,  40,  /*  107 */
- 40,  40,  40,  40,  40,  40,  40,  46,  /*  107 */
- 40,  40,  40,  40,  40,  46,  40,  46,  /*  107 */
- 40,  40,  46,  40,  40,  46,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  108 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  109 */
- 40,  40,  46,  46,  46,  46,  46,  46,  /*  109 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  109 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  110 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  110 */
- 46,  46,  46,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  110 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  111 */
- 40,  40,  40,  40,  40,  40,   5,   6,  /*  111 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  112 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  112 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 46,  46,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  113 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  114 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  114 */
- 40,  40,  40,  40,  46,  46,  46,  46,  /*  114 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  115 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  115 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  115 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  115 */
- 60,  60,  60,  60,  46,  46,  46,  46,  /*  115 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  115 */
-  3,   8,   8,  12,  12,   5,   6,   5,  /*  115 */
-  6,   5,   6,   5,   6,   5,   6,   5,  /*  115 */
-  6,   5,   6,   5,   6,  46,  46,  46,  /*  116 */
- 46,   3,   3,   3,   3,  12,  12,  12,  /*  116 */
-  3,   3,   3,  46,   3,   3,   3,   3,  /*  116 */
-  8,   5,   6,   5,   6,   5,   6,   3,  /*  116 */
-  3,   3,   7,   8,   7,   7,   7,  46,  /*  116 */
-  3,   4,   3,   3,  46,  46,  46,  46,  /*  116 */
- 40,  40,  40,  46,  40,  46,  40,  40,  /*  116 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  116 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  117 */
- 40,  40,  40,  40,  40,  46,  46, 104,  /*  117 */
- 46,   3,   3,   3,   4,   3,   3,   3,  /*  118 */
-  5,   6,   3,   7,   3,   8,   3,   3,  /*  118 */
-  9,   9,   9,   9,   9,   9,   9,   9,  /*  118 */
-  9,   9,   3,   3,   7,   7,   7,   3,  /*  118 */
-  3,  10,  10,  10,  10,  10,  10,  10,  /*  118 */
- 10,  10,  10,  10,  10,  10,  10,  10,  /*  118 */
- 10,  10,  10,  10,  10,  10,  10,  10,  /*  118 */
- 10,  10,  10,   5,   3,   6,  11,  12,  /*  118 */
- 11,  13,  13,  13,  13,  13,  13,  13,  /*  119 */
- 13,  13,  13,  13,  13,  13,  13,  13,  /*  119 */
- 13,  13,  13,  13,  13,  13,  13,  13,  /*  119 */
- 13,  13,  13,   5,   7,   6,   7,  46,  /*  119 */
- 46,   3,   5,   6,   3,   3,  40,  40,  /*  119 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  119 */
- 59,  40,  40,  40,  40,  40,  40,  40,  /*  119 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  119 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  59,  59,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  40,  /*  120 */
- 40,  40,  40,  40,  40,  40,  40,  46,  /*  120 */
- 46,  46,  40,  40,  40,  40,  40,  40,  /*  121 */
- 46,  46,  40,  40,  40,  40,  40,  40,  /*  121 */
- 46,  46,  40,  40,  40,  40,  40,  40,  /*  121 */
- 46,  46,  40,  40,  40,  46,  46,  46,  /*  121 */
-  4,   4,   7,  11,  15,   4,   4,  46,  /*  121 */
-  7,   7,   7,   7,   7,  15,  15,  46,  /*  121 */
- 46,  46,  46,  46,  46,  46,  46,  46,  /*  121 */
- 46,  46,  46,  46,  46,  15,  46,  46   /*  121 */
-};
-
-/* The A table has 124 entries for a total of 496 bytes. */
-
-const uint32 js_A[] = {
-0x0001000F,  /*    0   Cc, ignorable */
-0x0004000F,  /*    1   Cc, whitespace */
-0x0004000C,  /*    2   Zs, whitespace */
-0x00000018,  /*    3   Po */
-0x0006001A,  /*    4   Sc, currency */
-0x00000015,  /*    5   Ps */
-0x00000016,  /*    6   Pe */
-0x00000019,  /*    7   Sm */
-0x00000014,  /*    8   Pd */
-0x00036089,  /*    9   Nd, identifier part, decimal 16 */
-0x0827FF81,  /*   10   Lu, hasLower (add 32), identifier start, supradecimal 31 */
-0x0000001B,  /*   11   Sk */
-0x00050017,  /*   12   Pc, underscore */
-0x0817FF82,  /*   13   Ll, hasUpper (subtract 32), identifier start, supradecimal 31 */
-0x0000000C,  /*   14   Zs */
-0x0000001C,  /*   15   So */
-0x00070182,  /*   16   Ll, identifier start */
-0x0000600B,  /*   17   No, decimal 16 */
-0x0000500B,  /*   18   No, decimal 8 */
-0x0000800B,  /*   19   No, strange */
-0x08270181,  /*   20   Lu, hasLower (add 32), identifier start */
-0x08170182,  /*   21   Ll, hasUpper (subtract 32), identifier start */
-0xE1D70182,  /*   22   Ll, hasUpper (subtract -121), identifier start */
-0x00670181,  /*   23   Lu, hasLower (add 1), identifier start */
-0x00570182,  /*   24   Ll, hasUpper (subtract 1), identifier start */
-0xCE670181,  /*   25   Lu, hasLower (add -199), identifier start */
-0x3A170182,  /*   26   Ll, hasUpper (subtract 232), identifier start */
-0xE1E70181,  /*   27   Lu, hasLower (add -121), identifier start */
-0x4B170182,  /*   28   Ll, hasUpper (subtract 300), identifier start */
-0x34A70181,  /*   29   Lu, hasLower (add 210), identifier start */
-0x33A70181,  /*   30   Lu, hasLower (add 206), identifier start */
-0x33670181,  /*   31   Lu, hasLower (add 205), identifier start */
-0x32A70181,  /*   32   Lu, hasLower (add 202), identifier start */
-0x32E70181,  /*   33   Lu, hasLower (add 203), identifier start */
-0x33E70181,  /*   34   Lu, hasLower (add 207), identifier start */
-0x34E70181,  /*   35   Lu, hasLower (add 211), identifier start */
-0x34670181,  /*   36   Lu, hasLower (add 209), identifier start */
-0x35670181,  /*   37   Lu, hasLower (add 213), identifier start */
-0x00070181,  /*   38   Lu, identifier start */
-0x36A70181,  /*   39   Lu, hasLower (add 218), identifier start */
-0x00070185,  /*   40   Lo, identifier start */
-0x36670181,  /*   41   Lu, hasLower (add 217), identifier start */
-0x36E70181,  /*   42   Lu, hasLower (add 219), identifier start */
-0x00AF0181,  /*   43   Lu, hasLower (add 2), hasTitle, identifier start */
-0x007F0183,  /*   44   Lt, hasUpper (subtract 1), hasLower (add 1), hasTitle, identifier start */
-0x009F0182,  /*   45   Ll, hasUpper (subtract 2), hasTitle, identifier start */
-0x00000000,  /*   46   unassigned */
-0x34970182,  /*   47   Ll, hasUpper (subtract 210), identifier start */
-0x33970182,  /*   48   Ll, hasUpper (subtract 206), identifier start */
-0x33570182,  /*   49   Ll, hasUpper (subtract 205), identifier start */
-0x32970182,  /*   50   Ll, hasUpper (subtract 202), identifier start */
-0x32D70182,  /*   51   Ll, hasUpper (subtract 203), identifier start */
-0x33D70182,  /*   52   Ll, hasUpper (subtract 207), identifier start */
-0x34570182,  /*   53   Ll, hasUpper (subtract 209), identifier start */
-0x34D70182,  /*   54   Ll, hasUpper (subtract 211), identifier start */
-0x35570182,  /*   55   Ll, hasUpper (subtract 213), identifier start */
-0x36970182,  /*   56   Ll, hasUpper (subtract 218), identifier start */
-0x36570182,  /*   57   Ll, hasUpper (subtract 217), identifier start */
-0x36D70182,  /*   58   Ll, hasUpper (subtract 219), identifier start */
-0x00070084,  /*   59   Lm, identifier start */
-0x00030086,  /*   60   Mn, identifier part */
-0x09A70181,  /*   61   Lu, hasLower (add 38), identifier start */
-0x09670181,  /*   62   Lu, hasLower (add 37), identifier start */
-0x10270181,  /*   63   Lu, hasLower (add 64), identifier start */
-0x0FE70181,  /*   64   Lu, hasLower (add 63), identifier start */
-0x09970182,  /*   65   Ll, hasUpper (subtract 38), identifier start */
-0x09570182,  /*   66   Ll, hasUpper (subtract 37), identifier start */
-0x10170182,  /*   67   Ll, hasUpper (subtract 64), identifier start */
-0x0FD70182,  /*   68   Ll, hasUpper (subtract 63), identifier start */
-0x0F970182,  /*   69   Ll, hasUpper (subtract 62), identifier start */
-0x0E570182,  /*   70   Ll, hasUpper (subtract 57), identifier start */
-0x0BD70182,  /*   71   Ll, hasUpper (subtract 47), identifier start */
-0x0D970182,  /*   72   Ll, hasUpper (subtract 54), identifier start */
-0x15970182,  /*   73   Ll, hasUpper (subtract 86), identifier start */
-0x14170182,  /*   74   Ll, hasUpper (subtract 80), identifier start */
-0x14270181,  /*   75   Lu, hasLower (add 80), identifier start */
-0x0C270181,  /*   76   Lu, hasLower (add 48), identifier start */
-0x0C170182,  /*   77   Ll, hasUpper (subtract 48), identifier start */
-0x00034089,  /*   78   Nd, identifier part, decimal 0 */
-0x00000087,  /*   79   Me */
-0x00030088,  /*   80   Mc, identifier part */
-0x00037489,  /*   81   Nd, identifier part, decimal 26 */
-0x00005A0B,  /*   82   No, decimal 13 */
-0x00006E0B,  /*   83   No, decimal 23 */
-0x0000740B,  /*   84   No, decimal 26 */
-0x0000000B,  /*   85   No */
-0xFE170182,  /*   86   Ll, hasUpper (subtract -8), identifier start */
-0xFE270181,  /*   87   Lu, hasLower (add -8), identifier start */
-0xED970182,  /*   88   Ll, hasUpper (subtract -74), identifier start */
-0xEA970182,  /*   89   Ll, hasUpper (subtract -86), identifier start */
-0xE7170182,  /*   90   Ll, hasUpper (subtract -100), identifier start */
-0xE0170182,  /*   91   Ll, hasUpper (subtract -128), identifier start */
-0xE4170182,  /*   92   Ll, hasUpper (subtract -112), identifier start */
-0xE0970182,  /*   93   Ll, hasUpper (subtract -126), identifier start */
-0xFDD70182,  /*   94   Ll, hasUpper (subtract -9), identifier start */
-0xEDA70181,  /*   95   Lu, hasLower (add -74), identifier start */
-0xFDE70181,  /*   96   Lu, hasLower (add -9), identifier start */
-0xEAA70181,  /*   97   Lu, hasLower (add -86), identifier start */
-0xE7270181,  /*   98   Lu, hasLower (add -100), identifier start */
-0xFE570182,  /*   99   Ll, hasUpper (subtract -7), identifier start */
-0xE4270181,  /*  100   Lu, hasLower (add -112), identifier start */
-0xFE670181,  /*  101   Lu, hasLower (add -7), identifier start */
-0xE0270181,  /*  102   Lu, hasLower (add -128), identifier start */
-0xE0A70181,  /*  103   Lu, hasLower (add -126), identifier start */
-0x00010010,  /*  104   Cf, ignorable */
-0x0004000D,  /*  105   Zl, whitespace */
-0x0004000E,  /*  106   Zp, whitespace */
-0x0000400B,  /*  107   No, decimal 0 */
-0x0000440B,  /*  108   No, decimal 2 */
-0x0427438A,  /*  109   Nl, hasLower (add 16), identifier start, decimal 1 */
-0x0427818A,  /*  110   Nl, hasLower (add 16), identifier start, strange */
-0x0417638A,  /*  111   Nl, hasUpper (subtract 16), identifier start, decimal 17 */
-0x0417818A,  /*  112   Nl, hasUpper (subtract 16), identifier start, strange */
-0x0007818A,  /*  113   Nl, identifier start, strange */
-0x0000420B,  /*  114   No, decimal 1 */
-0x0000720B,  /*  115   No, decimal 25 */
-0x06A0001C,  /*  116   So, hasLower (add 26) */
-0x0690001C,  /*  117   So, hasUpper (subtract 26) */
-0x00006C0B,  /*  118   No, decimal 22 */
-0x0000560B,  /*  119   No, decimal 11 */
-0x0007738A,  /*  120   Nl, identifier start, decimal 25 */
-0x0007418A,  /*  121   Nl, identifier start, decimal 0 */
-0x00000013,  /*  122   Cs */
-0x00000012   /*  123   Co */
-};
-
-const jschar js_uriReservedPlusPound_ucstr[] =
-    {';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '#', 0};
-const jschar js_uriUnescaped_ucstr[] =
-    {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-     'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-     'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-     'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-     '-', '_', '.', '!', '~', '*', '\'', '(', ')', 0};
-
-#define URI_CHUNK 64U
-
-/* Concatenate jschars onto an unshared/newborn JSString. */
-static JSBool
-AddCharsToURI(JSContext *cx, JSString *str, const jschar *chars, size_t length)
-{
-    size_t total;
-
-    JS_ASSERT(!JSSTRING_IS_DEPENDENT(str));
-    total = str->length + length + 1;
-    if (!str->chars ||
-        JS_HOWMANY(total, URI_CHUNK) > JS_HOWMANY(str->length + 1, URI_CHUNK)) {
-        total = JS_ROUNDUP(total, URI_CHUNK);
-        str->chars = JS_realloc(cx, str->chars, total * sizeof(jschar));
-        if (!str->chars)
-            return JS_FALSE;
-    }
-    js_strncpy(str->chars + str->length, chars, length);
-    str->length += length;
-    str->chars[str->length] = 0;
-    return JS_TRUE;
-}
-
-/*
- * ECMA 3, 15.1.3 URI Handling Function Properties
- *
- * The following are implementations of the algorithms
- * given in the ECMA specification for the hidden functions
- * 'Encode' and 'Decode'.
- */
-static JSBool
-Encode(JSContext *cx, JSString *str, const jschar *unescapedSet,
-       const jschar *unescapedSet2, jsval *rval)
-{
-    size_t length, j, k, L;
-    jschar *chars, c, c2;
-    uint32 v;
-    uint8 utf8buf[6];
-    jschar hexBuf[4];
-    static const char HexDigits[] = "0123456789ABCDEF"; /* NB: uppercase */
-    JSString *R;
-
-    length = JSSTRING_LENGTH(str);
-    if (length == 0) {
-        *rval = STRING_TO_JSVAL(cx->runtime->emptyString);
-        return JS_TRUE;
-    }
-
-    R = js_NewString(cx, NULL, 0, 0);
-    if (!R)
-        return JS_FALSE;
-
-    hexBuf[0] = '%';
-    hexBuf[3] = 0;
-    chars = JSSTRING_CHARS(str);
-    for (k = 0; k < length; k++) {
-        c = chars[k];
-        if (js_strchr(unescapedSet, c) ||
-            (unescapedSet2 && js_strchr(unescapedSet2, c))) {
-            if (!AddCharsToURI(cx, R, &c, 1))
-                return JS_FALSE;
-        } else {
-            if ((c >= 0xDC00) && (c <= 0xDFFF)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_BAD_URI, NULL);
-                return JS_FALSE;
-            }
-            if (c < 0xD800 || c > 0xDBFF) {
-                v = c;
-            } else {
-                k++;
-                if (k == length) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_URI, NULL);
-                    return JS_FALSE;
-                }
-                c2 = chars[k];
-                if ((c2 < 0xDC00) || (c2 > 0xDFFF)) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_URI, NULL);
-                    return JS_FALSE;
-                }
-                v = ((c - 0xD800) << 10) + (c2 - 0xDC00) + 0x10000;
-            }
-            L = js_OneUcs4ToUtf8Char(utf8buf, v);
-            for (j = 0; j < L; j++) {
-                hexBuf[1] = HexDigits[utf8buf[j] >> 4];
-                hexBuf[2] = HexDigits[utf8buf[j] & 0xf];
-                if (!AddCharsToURI(cx, R, hexBuf, 3))
-                    return JS_FALSE;
-            }
-        }
-    }
-
-    /*
-     * Shrinking realloc can fail (e.g., with a BSD-style allocator), but we
-     * don't worry about that case here.  Worst case, R hangs onto URI_CHUNK-1
-     * more jschars than it needs.
-     */
-    chars = (jschar *) JS_realloc(cx, R->chars, (R->length+1) * sizeof(jschar));
-    if (chars)
-        R->chars = chars;
-    *rval = STRING_TO_JSVAL(R);
-    return JS_TRUE;
-}
-
-static JSBool
-Decode(JSContext *cx, JSString *str, const jschar *reservedSet, jsval *rval)
-{
-    size_t length, start, k;
-    jschar *chars, c, H;
-    uint32 v;
-    jsuint B;
-    uint8 octets[6];
-    JSString *R;
-    intN j, n;
-
-    length = JSSTRING_LENGTH(str);
-    if (length == 0) {
-        *rval = STRING_TO_JSVAL(cx->runtime->emptyString);
-        return JS_TRUE;
-    }
-
-    R = js_NewString(cx, NULL, 0, 0);
-    if (!R)
-        return JS_FALSE;
-
-    chars = JSSTRING_CHARS(str);
-    for (k = 0; k < length; k++) {
-        c = chars[k];
-        if (c == '%') {
-            start = k;
-            if ((k + 2) >= length)
-                goto bad;
-            if (!JS7_ISHEX(chars[k+1]) || !JS7_ISHEX(chars[k+2]))
-                goto bad;
-            B = JS7_UNHEX(chars[k+1]) * 16 + JS7_UNHEX(chars[k+2]);
-            k += 2;
-            if (!(B & 0x80)) {
-                c = (jschar)B;
-            } else {
-                n = 1;
-                while (B & (0x80 >> n))
-                    n++;
-                if (n == 1 || n > 6)
-                    goto bad;
-                octets[0] = (uint8)B;
-                if (k + 3 * (n - 1) >= length)
-                    goto bad;
-                for (j = 1; j < n; j++) {
-                    k++;
-                    if (chars[k] != '%')
-                        goto bad;
-                    if (!JS7_ISHEX(chars[k+1]) || !JS7_ISHEX(chars[k+2]))
-                        goto bad;
-                    B = JS7_UNHEX(chars[k+1]) * 16 + JS7_UNHEX(chars[k+2]);
-                    if ((B & 0xC0) != 0x80)
-                        goto bad;
-                    k += 2;
-                    octets[j] = (char)B;
-                }
-                v = Utf8ToOneUcs4Char(octets, n);
-                if (v >= 0x10000) {
-                    v -= 0x10000;
-                    if (v > 0xFFFFF)
-                        goto bad;
-                    c = (jschar)((v & 0x3FF) + 0xDC00);
-                    H = (jschar)((v >> 10) + 0xD800);
-                    if (!AddCharsToURI(cx, R, &H, 1))
-                        return JS_FALSE;
-                } else {
-                    c = (jschar)v;
-                }
-            }
-            if (js_strchr(reservedSet, c)) {
-                if (!AddCharsToURI(cx, R, &chars[start], (k - start + 1)))
-                    return JS_FALSE;
-            } else {
-                if (!AddCharsToURI(cx, R, &c, 1))
-                    return JS_FALSE;
-            }
-        } else {
-            if (!AddCharsToURI(cx, R, &c, 1))
-                return JS_FALSE;
-        }
-    }
-
-    /*
-     * Shrinking realloc can fail (e.g., with a BSD-style allocator), but we
-     * don't worry about that case here.  Worst case, R hangs onto URI_CHUNK-1
-     * more jschars than it needs.
-     */
-    chars = (jschar *) JS_realloc(cx, R->chars, (R->length+1) * sizeof(jschar));
-    if (chars)
-        R->chars = chars;
-    *rval = STRING_TO_JSVAL(R);
-    return JS_TRUE;
-
-bad:
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_URI);
-    return JS_FALSE;
-}
-
-static JSBool
-str_decodeURI(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-    return Decode(cx, str, js_uriReservedPlusPound_ucstr, rval);
-}
-
-static JSBool
-str_decodeURI_Component(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                        jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-    return Decode(cx, str, js_empty_ucstr, rval);
-}
-
-static JSBool
-str_encodeURI(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-    return Encode(cx, str, js_uriReservedPlusPound_ucstr, js_uriUnescaped_ucstr,
-                  rval);
-}
-
-static JSBool
-str_encodeURI_Component(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                        jsval *rval)
-{
-    JSString *str;
-
-    str = js_ValueToString(cx, argv[0]);
-    if (!str)
-        return JS_FALSE;
-    argv[0] = STRING_TO_JSVAL(str);
-    return Encode(cx, str, js_uriUnescaped_ucstr, NULL, rval);
-}
-
-/*
- * Convert one UCS-4 char and write it into a UTF-8 buffer, which must be at
- * least 6 bytes long.  Return the number of UTF-8 bytes of data written.
- */
-int
-js_OneUcs4ToUtf8Char(uint8 *utf8Buffer, uint32 ucs4Char)
-{
-    int utf8Length = 1;
-
-    JS_ASSERT(ucs4Char <= 0x7FFFFFFF);
-    if (ucs4Char < 0x80) {
-        *utf8Buffer = (uint8)ucs4Char;
-    } else {
-        int i;
-        uint32 a = ucs4Char >> 11;
-        utf8Length = 2;
-        while (a) {
-            a >>= 5;
-            utf8Length++;
-        }
-        i = utf8Length;
-        while (--i) {
-            utf8Buffer[i] = (uint8)((ucs4Char & 0x3F) | 0x80);
-            ucs4Char >>= 6;
-        }
-        *utf8Buffer = (uint8)(0x100 - (1 << (8-utf8Length)) + ucs4Char);
-    }
-    return utf8Length;
-}
-
-/*
- * Convert a utf8 character sequence into a UCS-4 character and return that
- * character.  It is assumed that the caller already checked that the sequence
- * is valid.
- */
-static uint32
-Utf8ToOneUcs4Char(const uint8 *utf8Buffer, int utf8Length)
-{
-    uint32 ucs4Char;
-    uint32 minucs4Char;
-    /* from Unicode 3.1, non-shortest form is illegal */
-    static const uint32 minucs4Table[] = {
-        0x00000080, 0x00000800, 0x0001000, 0x0020000, 0x0400000
-    };
-
-    JS_ASSERT(utf8Length >= 1 && utf8Length <= 6);
-    if (utf8Length == 1) {
-        ucs4Char = *utf8Buffer;
-        JS_ASSERT(!(ucs4Char & 0x80));
-    } else {
-        JS_ASSERT((*utf8Buffer & (0x100 - (1 << (7-utf8Length)))) ==
-                  (0x100 - (1 << (8-utf8Length))));
-        ucs4Char = *utf8Buffer++ & ((1<<(7-utf8Length))-1);
-        minucs4Char = minucs4Table[utf8Length-2];
-        while (--utf8Length) {
-            JS_ASSERT((*utf8Buffer & 0xC0) == 0x80);
-            ucs4Char = ucs4Char<<6 | (*utf8Buffer++ & 0x3F);
-        }
-        if (ucs4Char < minucs4Char ||
-            ucs4Char == 0xFFFE || ucs4Char == 0xFFFF) {
-            ucs4Char = 0xFFFD;
-        }
-    }
-    return ucs4Char;
-}
diff --git a/libs/js/src/jsstr.h b/libs/js/src/jsstr.h
deleted file mode 100644
index 658a87f90f..0000000000
--- a/libs/js/src/jsstr.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsstr_h___
-#define jsstr_h___
-/*
- * JS string type implementation.
- *
- * A JS string is a counted array of unicode characters.  To support handoff
- * of API client memory, the chars are allocated separately from the length,
- * necessitating a pointer after the count, to form a separately allocated
- * string descriptor.  String descriptors are GC'ed, while their chars are
- * allocated from the malloc heap.
- *
- * When a string is treated as an object (by following it with . or []), the
- * runtime wraps it with a JSObject whose valueOf method returns the unwrapped
- * string descriptor.
- */
-#include <ctype.h>
-#include "jspubtd.h"
-#include "jsprvtd.h"
-#include "jshash.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * The original GC-thing "string" type, a flat character string owned by its
- * GC-thing descriptor.  The chars member points to a vector having byte size
- * (length + 1) * sizeof(jschar), terminated at index length by a zero jschar.
- * The terminator is purely a backstop, in case the chars pointer flows out to
- * native code that requires \u0000 termination.
- *
- * NB: Always use the JSSTRING_LENGTH and JSSTRING_CHARS accessor macros,
- * unless you guard str->member uses with !JSSTRING_IS_DEPENDENT(str).
- */
-struct JSString {
-    size_t          length;
-    jschar          *chars;
-};
-
-/*
- * Overlay structure for a string that depends on another string's characters.
- * Distinguished by the JSSTRFLAG_DEPENDENT bit being set in length.  The base
- * member may point to another dependent string if JSSTRING_CHARS has not been
- * called yet.  The length chars in a dependent string are stored starting at
- * base->chars + start, and are not necessarily zero-terminated.  If start is
- * 0, it is not stored, length is a full size_t (minus the JSSTRFLAG_* bits in
- * the high two positions), and the JSSTRFLAG_PREFIX flag is set.
- */
-struct JSDependentString {
-    size_t          length;
-    JSString        *base;
-};
-
-/* Definitions for flags stored in the high order bits of JSString.length. */
-#define JSSTRFLAG_BITS              2
-#define JSSTRFLAG_SHIFT(flg)        ((size_t)(flg) << JSSTRING_LENGTH_BITS)
-#define JSSTRFLAG_MASK              JSSTRFLAG_SHIFT(JS_BITMASK(JSSTRFLAG_BITS))
-#define JSSTRFLAG_DEPENDENT         JSSTRFLAG_SHIFT(1)
-#define JSSTRFLAG_PREFIX            JSSTRFLAG_SHIFT(2)
-
-/* Universal JSString type inquiry and accessor macros. */
-#define JSSTRING_BIT(n)             ((size_t)1 << (n))
-#define JSSTRING_BITMASK(n)         (JSSTRING_BIT(n) - 1)
-#define JSSTRING_HAS_FLAG(str,flg)  ((str)->length & (flg))
-#define JSSTRING_IS_DEPENDENT(str)  JSSTRING_HAS_FLAG(str, JSSTRFLAG_DEPENDENT)
-#define JSSTRING_IS_PREFIX(str)     JSSTRING_HAS_FLAG(str, JSSTRFLAG_PREFIX)
-#define JSSTRING_CHARS(str)         (JSSTRING_IS_DEPENDENT(str)               \
-                                     ? JSSTRDEP_CHARS(str)                    \
-                                     : (str)->chars)
-#define JSSTRING_LENGTH(str)        (JSSTRING_IS_DEPENDENT(str)               \
-                                     ? JSSTRDEP_LENGTH(str)                   \
-                                     : (str)->length)
-#define JSSTRING_LENGTH_BITS        (sizeof(size_t) * JS_BITS_PER_BYTE        \
-                                     - JSSTRFLAG_BITS)
-#define JSSTRING_LENGTH_MASK        JSSTRING_BITMASK(JSSTRING_LENGTH_BITS)
-
-/* Specific JSDependentString shift/mask accessor and mutator macros. */
-#define JSSTRDEP_START_BITS         (JSSTRING_LENGTH_BITS-JSSTRDEP_LENGTH_BITS)
-#define JSSTRDEP_START_SHIFT        JSSTRDEP_LENGTH_BITS
-#define JSSTRDEP_START_MASK         JSSTRING_BITMASK(JSSTRDEP_START_BITS)
-#define JSSTRDEP_LENGTH_BITS        (JSSTRING_LENGTH_BITS / 2)
-#define JSSTRDEP_LENGTH_MASK        JSSTRING_BITMASK(JSSTRDEP_LENGTH_BITS)
-
-#define JSSTRDEP(str)               ((JSDependentString *)(str))
-#define JSSTRDEP_START(str)         (JSSTRING_IS_PREFIX(str) ? 0              \
-                                     : ((JSSTRDEP(str)->length                \
-                                         >> JSSTRDEP_START_SHIFT)             \
-                                        & JSSTRDEP_START_MASK))
-#define JSSTRDEP_LENGTH(str)        (JSSTRDEP(str)->length                    \
-                                     & (JSSTRING_IS_PREFIX(str)               \
-                                        ? JSSTRING_LENGTH_MASK                \
-                                        : JSSTRDEP_LENGTH_MASK))
-
-#define JSSTRDEP_SET_START_AND_LENGTH(str,off,len)                            \
-    (JSSTRDEP(str)->length = JSSTRFLAG_DEPENDENT                              \
-                           | ((off) << JSSTRDEP_START_SHIFT)                  \
-                           | (len))
-#define JSPREFIX_SET_LENGTH(str,len)                                          \
-    (JSSTRDEP(str)->length = JSSTRFLAG_DEPENDENT | JSSTRFLAG_PREFIX | (len))
-
-#define JSSTRDEP_BASE(str)          (JSSTRDEP(str)->base)
-#define JSSTRDEP_SET_BASE(str,bstr) (JSSTRDEP(str)->base = (bstr))
-#define JSPREFIX_BASE(str)          JSSTRDEP_BASE(str)
-#define JSPREFIX_SET_BASE(str,bstr) JSSTRDEP_SET_BASE(str,bstr)
-
-#define JSSTRDEP_CHARS(str)                                                   \
-    (JSSTRING_IS_DEPENDENT(JSSTRDEP_BASE(str))                                \
-     ? js_GetDependentStringChars(str)                                        \
-     : JSSTRDEP_BASE(str)->chars + JSSTRDEP_START(str))
-
-extern size_t
-js_MinimizeDependentStrings(JSString *str, int level, JSString **basep);
-
-extern jschar *
-js_GetDependentStringChars(JSString *str);
-
-extern jschar *
-js_GetStringChars(JSString *str);
-
-extern JSString *
-js_ConcatStrings(JSContext *cx, JSString *left, JSString *right);
-
-extern const jschar *
-js_UndependString(JSContext *cx, JSString *str);
-
-struct JSSubString {
-    size_t          length;
-    const jschar    *chars;
-};
-
-extern jschar      js_empty_ucstr[];
-extern JSSubString js_EmptySubString;
-
-/* Unicode character attribute lookup tables. */
-extern const uint8 js_X[];
-extern const uint8 js_Y[];
-extern const uint32 js_A[];
-
-/* Enumerated Unicode general category types. */
-typedef enum JSCharType {
-    JSCT_UNASSIGNED             = 0,
-    JSCT_UPPERCASE_LETTER       = 1,
-    JSCT_LOWERCASE_LETTER       = 2,
-    JSCT_TITLECASE_LETTER       = 3,
-    JSCT_MODIFIER_LETTER        = 4,
-    JSCT_OTHER_LETTER           = 5,
-    JSCT_NON_SPACING_MARK       = 6,
-    JSCT_ENCLOSING_MARK         = 7,
-    JSCT_COMBINING_SPACING_MARK = 8,
-    JSCT_DECIMAL_DIGIT_NUMBER   = 9,
-    JSCT_LETTER_NUMBER          = 10,
-    JSCT_OTHER_NUMBER           = 11,
-    JSCT_SPACE_SEPARATOR        = 12,
-    JSCT_LINE_SEPARATOR         = 13,
-    JSCT_PARAGRAPH_SEPARATOR    = 14,
-    JSCT_CONTROL                = 15,
-    JSCT_FORMAT                 = 16,
-    JSCT_PRIVATE_USE            = 18,
-    JSCT_SURROGATE              = 19,
-    JSCT_DASH_PUNCTUATION       = 20,
-    JSCT_START_PUNCTUATION      = 21,
-    JSCT_END_PUNCTUATION        = 22,
-    JSCT_CONNECTOR_PUNCTUATION  = 23,
-    JSCT_OTHER_PUNCTUATION      = 24,
-    JSCT_MATH_SYMBOL            = 25,
-    JSCT_CURRENCY_SYMBOL        = 26,
-    JSCT_MODIFIER_SYMBOL        = 27,
-    JSCT_OTHER_SYMBOL           = 28
-} JSCharType;
-
-/* Character classifying and mapping macros, based on java.lang.Character. */
-#define JS_CCODE(c)     (js_A[js_Y[(js_X[(uint16)(c)>>6]<<6)|((c)&0x3F)]])
-#define JS_CTYPE(c)     (JS_CCODE(c) & 0x1F)
-
-#define JS_ISALPHA(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
-                           (1 << JSCT_LOWERCASE_LETTER) |                     \
-                           (1 << JSCT_TITLECASE_LETTER) |                     \
-                           (1 << JSCT_MODIFIER_LETTER) |                      \
-                           (1 << JSCT_OTHER_LETTER))                          \
-                          >> JS_CTYPE(c)) & 1)
-
-#define JS_ISALNUM(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
-                           (1 << JSCT_LOWERCASE_LETTER) |                     \
-                           (1 << JSCT_TITLECASE_LETTER) |                     \
-                           (1 << JSCT_MODIFIER_LETTER) |                      \
-                           (1 << JSCT_OTHER_LETTER) |                         \
-                           (1 << JSCT_DECIMAL_DIGIT_NUMBER))                  \
-                          >> JS_CTYPE(c)) & 1)
-
-/* A unicode letter, suitable for use in an identifier. */
-#define JS_ISLETTER(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                    \
-                            (1 << JSCT_LOWERCASE_LETTER) |                    \
-                            (1 << JSCT_TITLECASE_LETTER) |                    \
-                            (1 << JSCT_MODIFIER_LETTER) |                     \
-                            (1 << JSCT_OTHER_LETTER) |                        \
-                            (1 << JSCT_LETTER_NUMBER))                        \
-                           >> JS_CTYPE(c)) & 1)
-
-/*
- * 'IdentifierPart' from ECMA grammar, is Unicode letter or combining mark or
- * digit or connector punctuation.
- */
-#define JS_ISIDPART(c)  ((((1 << JSCT_UPPERCASE_LETTER) |                     \
-                           (1 << JSCT_LOWERCASE_LETTER) |                     \
-                           (1 << JSCT_TITLECASE_LETTER) |                     \
-                           (1 << JSCT_MODIFIER_LETTER) |                      \
-                           (1 << JSCT_OTHER_LETTER) |                         \
-                           (1 << JSCT_LETTER_NUMBER) |                        \
-                           (1 << JSCT_NON_SPACING_MARK) |                     \
-                           (1 << JSCT_COMBINING_SPACING_MARK) |               \
-                           (1 << JSCT_DECIMAL_DIGIT_NUMBER) |                 \
-                           (1 << JSCT_CONNECTOR_PUNCTUATION))                 \
-                          >> JS_CTYPE(c)) & 1)
-
-/* Unicode control-format characters, ignored in input */
-#define JS_ISFORMAT(c) (((1 << JSCT_FORMAT) >> JS_CTYPE(c)) & 1)
-
-/*
- * Per ECMA-262 15.10.2.6, these characters are the only ones that make up a
- * "word", as far as a RegExp is concerned.  If we want a Unicode-friendlier
- * definition of "word", we should rename this macro to something regexp-y.
- */
-#define JS_ISWORD(c)    ((c) < 128 && (isalnum(c) || (c) == '_'))
-
-#define JS_ISIDSTART(c) (JS_ISLETTER(c) || (c) == '_' || (c) == '$')
-#define JS_ISIDENT(c)   (JS_ISIDPART(c) || (c) == '_' || (c) == '$')
-
-#define JS_ISXMLSPACE(c)        ((c) == ' ' || (c) == '\t' || (c) == '\r' ||  \
-                                 (c) == '\n')
-#define JS_ISXMLNSSTART(c)      ((JS_CCODE(c) & 0x00000100) || (c) == '_')
-#define JS_ISXMLNS(c)           ((JS_CCODE(c) & 0x00000080) || (c) == '.' ||  \
-                                 (c) == '-' || (c) == '_')
-#define JS_ISXMLNAMESTART(c)    (JS_ISXMLNSSTART(c) || (c) == ':')
-#define JS_ISXMLNAME(c)         (JS_ISXMLNS(c) || (c) == ':')
-
-#define JS_ISDIGIT(c)   (JS_CTYPE(c) == JSCT_DECIMAL_DIGIT_NUMBER)
-
-/* XXXbe unify on A/X/Y tbls, avoid ctype.h? */
-/* XXXbe fs, etc. ? */
-#define JS_ISSPACE(c)   ((JS_CCODE(c) & 0x00070000) == 0x00040000)
-#define JS_ISPRINT(c)   ((c) < 128 && isprint(c))
-
-#define JS_ISUPPER(c)   (JS_CTYPE(c) == JSCT_UPPERCASE_LETTER)
-#define JS_ISLOWER(c)   (JS_CTYPE(c) == JSCT_LOWERCASE_LETTER)
-
-#define JS_TOUPPER(c)   ((jschar) ((JS_CCODE(c) & 0x00100000)                 \
-                                   ? (c) - ((int32)JS_CCODE(c) >> 22)         \
-                                   : (c)))
-#define JS_TOLOWER(c)   ((jschar) ((JS_CCODE(c) & 0x00200000)                 \
-                                   ? (c) + ((int32)JS_CCODE(c) >> 22)         \
-                                   : (c)))
-
-/* Shorthands for ASCII (7-bit) decimal and hex conversion. */
-#define JS7_ISDEC(c)    ((c) < 128 && isdigit(c))
-#define JS7_UNDEC(c)    ((c) - '0')
-#define JS7_ISHEX(c)    ((c) < 128 && isxdigit(c))
-#define JS7_UNHEX(c)    (uintN)(isdigit(c) ? (c) - '0' : 10 + tolower(c) - 'a')
-#define JS7_ISLET(c)    ((c) < 128 && isalpha(c))
-
-/* Initialize truly global state associated with JS strings. */
-extern JSBool
-js_InitStringGlobals(void);
-
-extern void
-js_FreeStringGlobals(void);
-
-extern void
-js_PurgeDeflatedStringCache(JSString *str);
-
-/* Initialize per-runtime string state for the first context in the runtime. */
-extern JSBool
-js_InitRuntimeStringState(JSContext *cx);
-
-extern void
-js_FinishRuntimeStringState(JSContext *cx);
-
-/* Initialize the String class, returning its prototype object. */
-extern JSClass js_StringClass;
-
-extern JSObject *
-js_InitStringClass(JSContext *cx, JSObject *obj);
-
-extern const char js_escape_str[];
-extern const char js_unescape_str[];
-extern const char js_uneval_str[];
-extern const char js_decodeURI_str[];
-extern const char js_encodeURI_str[];
-extern const char js_decodeURIComponent_str[];
-extern const char js_encodeURIComponent_str[];
-
-/* GC-allocate a string descriptor for the given malloc-allocated chars. */
-extern JSString *
-js_NewString(JSContext *cx, jschar *chars, size_t length, uintN gcflag);
-
-extern JSString *
-js_NewDependentString(JSContext *cx, JSString *base, size_t start,
-                      size_t length, uintN gcflag);
-
-/* Copy a counted string and GC-allocate a descriptor for it. */
-extern JSString *
-js_NewStringCopyN(JSContext *cx, const jschar *s, size_t n, uintN gcflag);
-
-/* Copy a C string and GC-allocate a descriptor for it. */
-extern JSString *
-js_NewStringCopyZ(JSContext *cx, const jschar *s, uintN gcflag);
-
-/* Free the chars held by str when it is finalized by the GC. */
-extern void
-js_FinalizeString(JSContext *cx, JSString *str);
-
-extern void
-js_FinalizeStringRT(JSRuntime *rt, JSString *str);
-
-/* Wrap a string value in a String object. */
-extern JSObject *
-js_StringToObject(JSContext *cx, JSString *str);
-
-/*
- * Convert a value to a printable C string.
- */
-extern JS_FRIEND_API(const char *)
-js_ValueToPrintableString(JSContext *cx, jsval v);
-
-/*
- * Convert a value to a string, returning null after reporting an error,
- * otherwise returning a new string reference.
- */
-extern JSString *
-js_ValueToString(JSContext *cx, jsval v);
-
-/*
- * Convert a value to its source expression, returning null after reporting
- * an error, otherwise returning a new string reference.
- */
-extern JSString *
-js_ValueToSource(JSContext *cx, jsval v);
-
-#ifdef HT_ENUMERATE_NEXT        /* XXX don't require jshash.h */
-/*
- * Compute a hash function from str.
- */
-extern JSHashNumber
-js_HashString(JSString *str);
-#endif
-
-/*
- * Return less than, equal to, or greater than zero depending on whether
- * str1 is less than, equal to, or greater than str2.
- */
-extern intN
-js_CompareStrings(JSString *str1, JSString *str2);
-
-/*
- * Boyer-Moore-Horspool superlinear search for pat:patlen in text:textlen.
- * The patlen argument must be positive and no greater than BMH_PATLEN_MAX.
- * The start argument tells where in text to begin the search.
- *
- * Return the index of pat in text, or -1 if not found.
- */
-#define BMH_CHARSET_SIZE 256    /* ISO-Latin-1 */
-#define BMH_PATLEN_MAX   255    /* skip table element is uint8 */
-
-#define BMH_BAD_PATTERN  (-2)   /* return value if pat is not ISO-Latin-1 */
-
-extern jsint
-js_BoyerMooreHorspool(const jschar *text, jsint textlen,
-                      const jschar *pat, jsint patlen,
-                      jsint start);
-
-extern size_t
-js_strlen(const jschar *s);
-
-extern jschar *
-js_strchr(const jschar *s, jschar c);
-
-extern jschar *
-js_strchr_limit(const jschar *s, jschar c, const jschar *limit);
-
-#define js_strncpy(t, s, n)     memcpy((t), (s), (n) * sizeof(jschar))
-
-/*
- * Return s advanced past any Unicode white space characters.
- */
-extern const jschar *
-js_SkipWhiteSpace(const jschar *s);
-
-/*
- * Inflate bytes to JS chars and vice versa.  Report out of memory via cx
- * and return null on error, otherwise return the jschar or byte vector that
- * was JS_malloc'ed. length is updated with the length of the new string in jschars.
- */
-extern jschar *
-js_InflateString(JSContext *cx, const char *bytes, size_t *length);
-
-extern char *
-js_DeflateString(JSContext *cx, const jschar *chars, size_t length);
-
-/*
- * Inflate bytes to JS chars into a buffer.
- * 'chars' must be large enough for 'length' jschars.
- * The buffer is NOT null-terminated.
- * cx may be NULL, which means no errors are thrown.
- * The destination length needs to be initialized with the buffer size, takes the number of chars moved.
- */
-extern JSBool
-js_InflateStringToBuffer(JSContext* cx, const char *bytes, size_t length, jschar *chars, size_t* charsLength);
-
-/*
- * Deflate JS chars to bytes into a buffer.
- * 'bytes' must be large enough for 'length chars.
- * The buffer is NOT null-terminated.
- * cx may be NULL, which means no errors are thrown.
- * The destination length needs to be initialized with the buffer size, takes the number of bytes moved.
- */
-extern JSBool
-js_DeflateStringToBuffer(JSContext* cx, const jschar *chars, size_t charsLength, char *bytes, size_t* length);
-
-/*
- * Associate bytes with str in the deflated string cache, returning true on
- * successful association, false on out of memory.
- */
-extern JSBool
-js_SetStringBytes(JSString *str, char *bytes, size_t length);
-
-/*
- * Find or create a deflated string cache entry for str that contains its
- * characters chopped from Unicode code points into bytes.
- */
-extern char *
-js_GetStringBytes(JSString *str);
-
-JSBool
-js_str_escape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval);
-
-/*
- * Convert one UCS-4 char and write it into a UTF-8 buffer, which must be at
- * least 6 bytes long.  Return the number of UTF-8 bytes of data written.
- */
-extern int
-js_OneUcs4ToUtf8Char(uint8 *utf8Buffer, uint32 ucs4Char);
-
-JS_END_EXTERN_C
-
-#endif /* jsstr_h___ */
diff --git a/libs/js/src/jstypes.h b/libs/js/src/jstypes.h
deleted file mode 100644
index e5d9544413..0000000000
--- a/libs/js/src/jstypes.h
+++ /dev/null
@@ -1,472 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   IBM Corp.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                jstypes.h
-** Description: Definitions of NSPR's basic types
-**
-** Prototypes and macros used to make up for deficiencies in ANSI environments
-** that we have found.
-**
-** Since we do not wrap <stdlib.h> and all the other standard headers, authors
-** of portable code will not know in general that they need these definitions.
-** Instead of requiring these authors to find the dependent uses in their code
-** and take the following steps only in those C files, we take steps once here
-** for all C files.
-**/
-
-#ifndef jstypes_h___
-#define jstypes_h___
-
-#include <stddef.h>
-
-/***********************************************************************
-** MACROS:      JS_EXTERN_API
-**              JS_EXPORT_API
-** DESCRIPTION:
-**      These are only for externally visible routines and globals.  For
-**      internal routines, just use "extern" for type checking and that
-**      will not export internal cross-file or forward-declared symbols.
-**      Define a macro for declaring procedures return types. We use this to
-**      deal with windoze specific type hackery for DLL definitions. Use
-**      JS_EXTERN_API when the prototype for the method is declared. Use
-**      JS_EXPORT_API for the implementation of the method.
-**
-** Example:
-**   in dowhim.h
-**     JS_EXTERN_API( void ) DoWhatIMean( void );
-**   in dowhim.c
-**     JS_EXPORT_API( void ) DoWhatIMean( void ) { return; }
-**
-**
-***********************************************************************/
-#ifdef WIN32
-
-/* These also work for __MWERKS__ */
-# define JS_EXTERN_API(__type)  extern __declspec(dllexport) __type
-# define JS_EXPORT_API(__type)  __declspec(dllexport) __type
-# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
-
-# define JS_DLL_CALLBACK
-# define JS_STATIC_DLL_CALLBACK(__x)    static __x
-
-#elif defined(XP_OS2) && defined(__declspec)
-
-# define JS_EXTERN_API(__type)  extern __declspec(dllexport) __type
-# define JS_EXPORT_API(__type)  __declspec(dllexport) __type
-# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
-
-# define JS_DLL_CALLBACK
-# define JS_STATIC_DLL_CALLBACK(__x)    static __x
-
-#else /* Unix */
-
-#ifdef HAVE_VISIBILITY_PRAGMA
-#define JS_EXTERNAL_VIS __attribute__((visibility ("default")))
-#else
-#define JS_EXTERNAL_VIS
-#endif
-
-#define JS_EXTERN_API(__type) extern JS_EXTERNAL_VIS __type
-#define JS_EXPORT_API(__type) JS_EXTERNAL_VIS __type
-#define JS_EXTERN_DATA(__type) extern JS_EXTERNAL_VIS __type
-#define JS_EXPORT_DATA(__type) JS_EXTERNAL_VIS __type
-
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) static __x
-
-#endif
-
-#ifdef _WIN32
-# if defined(__MWERKS__) || defined(__GNUC__)
-#  define JS_IMPORT_API(__x)    __x
-# else
-#  define JS_IMPORT_API(__x)    __declspec(dllimport) __x
-# endif
-#elif defined(XP_OS2) && defined(__declspec)
-# define JS_IMPORT_API(__x)     __declspec(dllimport) __x
-#else
-# define JS_IMPORT_API(__x)     JS_EXPORT_API (__x)
-#endif
-
-#if defined(_WIN32) && !defined(__MWERKS__)
-# define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
-#elif defined(XP_OS2) && defined(__declspec)
-# define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
-#else
-# define JS_IMPORT_DATA(__x)     JS_EXPORT_DATA (__x)
-#endif
-
-/*
- * The linkage of JS API functions differs depending on whether the file is
- * used within the JS library or not. Any source file within the JS
- * interpreter should define EXPORT_JS_API whereas any client of the library
- * should not. STATIC_JS_API is used to build JS as a static library.
- */
-#if defined(STATIC_JS_API)
-
-# define JS_PUBLIC_API(t)   t
-# define JS_PUBLIC_DATA(t)  t
-
-#elif defined(EXPORT_JS_API)
-
-# define JS_PUBLIC_API(t)   JS_EXPORT_API(t)
-# define JS_PUBLIC_DATA(t)  JS_EXPORT_DATA(t)
-
-#else
-
-# define JS_PUBLIC_API(t)   JS_IMPORT_API(t)
-# define JS_PUBLIC_DATA(t)  JS_IMPORT_DATA(t)
-
-#endif
-
-#define JS_FRIEND_API(t)    JS_PUBLIC_API(t)
-#define JS_FRIEND_DATA(t)   JS_PUBLIC_DATA(t)
-
-#if defined(_MSC_VER)
-# define JS_INLINE __forceinline
-#elif defined(__GNUC__)
-#   define JS_INLINE
-#else
-# define JS_INLINE
-#endif
-
-/***********************************************************************
-** MACROS:      JS_BEGIN_MACRO
-**              JS_END_MACRO
-** DESCRIPTION:
-**      Macro body brackets so that macros with compound statement definitions
-**      behave syntactically more like functions when called.
-***********************************************************************/
-#define JS_BEGIN_MACRO  do {
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-# define JS_END_MACRO                                                         \
-    } __pragma(warning(push)) __pragma(warning(disable:4127))                 \
-    while (0) __pragma(warning(pop))
-#else
-# define JS_END_MACRO   } while (0)
-#endif
-
-/***********************************************************************
-** MACROS:      JS_BEGIN_EXTERN_C
-**              JS_END_EXTERN_C
-** DESCRIPTION:
-**      Macro shorthands for conditional C++ extern block delimiters.
-***********************************************************************/
-#ifdef __cplusplus
-
-# define JS_BEGIN_EXTERN_C      extern "C" {
-# define JS_END_EXTERN_C        }
-
-#else
-
-# define JS_BEGIN_EXTERN_C
-# define JS_END_EXTERN_C
-
-#endif
-
-/***********************************************************************
-** MACROS:      JS_BIT
-**              JS_BITMASK
-** DESCRIPTION:
-** Bit masking macros.  XXX n must be <= 31 to be portable
-***********************************************************************/
-#define JS_BIT(n)       ((JSUint32)1 << (n))
-#define JS_BITMASK(n)   (JS_BIT(n) - 1)
-
-/***********************************************************************
-** MACROS:      JS_PTR_TO_INT32
-**              JS_PTR_TO_UINT32
-**              JS_INT32_TO_PTR
-**              JS_UINT32_TO_PTR
-** DESCRIPTION:
-** Integer to pointer and pointer to integer conversion macros.
-***********************************************************************/
-#define JS_PTR_TO_INT32(x)  ((jsint)((char *)(x) - (char *)0))
-#define JS_PTR_TO_UINT32(x) ((jsuint)((char *)(x) - (char *)0))
-#define JS_INT32_TO_PTR(x)  ((void *)((char *)0 + (jsint)(x)))
-#define JS_UINT32_TO_PTR(x) ((void *)((char *)0 + (jsuint)(x)))
-
-/***********************************************************************
-** MACROS:      JS_HOWMANY
-**              JS_ROUNDUP
-**              JS_MIN
-**              JS_MAX
-** DESCRIPTION:
-**      Commonly used macros for operations on compatible types.
-***********************************************************************/
-#define JS_HOWMANY(x,y) (((x)+(y)-1)/(y))
-#define JS_ROUNDUP(x,y) (JS_HOWMANY(x,y)*(y))
-#define JS_MIN(x,y)     ((x)<(y)?(x):(y))
-#define JS_MAX(x,y)     ((x)>(y)?(x):(y))
-
-#if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE)
-# include "jscpucfg.h"      /* Use standard Mac or Windows configuration */
-#elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE)
-# include "jsautocfg.h"     /* Use auto-detected configuration */
-#    include "jsosdep.h"         /* ...and platform-specific flags */
-#else
-# error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
-#endif
-
-JS_BEGIN_EXTERN_C
-
-/************************************************************************
-** TYPES:       JSUint8
-**              JSInt8
-** DESCRIPTION:
-**  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char".
-************************************************************************/
-#if JS_BYTES_PER_BYTE == 1
-typedef unsigned char JSUint8;
-typedef signed char JSInt8;
-#else
-# error No suitable type for JSInt8/JSUint8
-#endif
-
-/************************************************************************
-** TYPES:       JSUint16
-**              JSInt16
-** DESCRIPTION:
-**  The int16 types are known to be 16 bits each.
-************************************************************************/
-#if JS_BYTES_PER_SHORT == 2
-typedef unsigned short JSUint16;
-typedef short JSInt16;
-#else
-# error No suitable type for JSInt16/JSUint16
-#endif
-
-/************************************************************************
-** TYPES:       JSUint32
-**              JSInt32
-** DESCRIPTION:
-**  The int32 types are known to be 32 bits each.
-************************************************************************/
-#if JS_BYTES_PER_INT == 4
-typedef unsigned int JSUint32;
-typedef int JSInt32;
-# define JS_INT32(x)    x
-# define JS_UINT32(x)   x ## U
-#elif JS_BYTES_PER_LONG == 4
-typedef unsigned long JSUint32;
-typedef long JSInt32;
-# define JS_INT32(x)    x ## L
-# define JS_UINT32(x)   x ## UL
-#else
-# error No suitable type for JSInt32/JSUint32
-#endif
-
-/************************************************************************
-** TYPES:       JSUint64
-**              JSInt64
-** DESCRIPTION:
-**  The int64 types are known to be 64 bits each. Care must be used when
-**      declaring variables of type JSUint64 or JSInt64. Different hardware
-**      architectures and even different compilers have varying support for
-**      64 bit values. The only guaranteed portability requires the use of
-**      the JSLL_ macros (see jslong.h).
-************************************************************************/
-#ifdef JS_HAVE_LONG_LONG
-
-# if JS_BYTES_PER_LONG == 8
-typedef long JSInt64;
-typedef unsigned long JSUint64;
-# elif defined(WIN16)
-typedef __int64 JSInt64;
-typedef unsigned __int64 JSUint64;
-# elif defined(WIN32) && !defined(__GNUC__)
-typedef __int64  JSInt64;
-typedef unsigned __int64 JSUint64;
-# else
-typedef long long JSInt64;
-typedef unsigned long long JSUint64;
-# endif /* JS_BYTES_PER_LONG == 8 */
-
-#else  /* !JS_HAVE_LONG_LONG */
-
-typedef struct {
-# ifdef IS_LITTLE_ENDIAN
-    JSUint32 lo, hi;
-# else
-    JSUint32 hi, lo;
-#endif
-} JSInt64;
-typedef JSInt64 JSUint64;
-
-#endif /* !JS_HAVE_LONG_LONG */
-
-/************************************************************************
-** TYPES:       JSUintn
-**              JSIntn
-** DESCRIPTION:
-**  The JSIntn types are most appropriate for automatic variables. They are
-**      guaranteed to be at least 16 bits, though various architectures may
-**      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure.
-************************************************************************/
-#if JS_BYTES_PER_INT >= 2
-typedef int JSIntn;
-typedef unsigned int JSUintn;
-#else
-# error 'sizeof(int)' not sufficient for platform use
-#endif
-
-/************************************************************************
-** TYPES:       JSFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
-************************************************************************/
-typedef double          JSFloat64;
-
-/************************************************************************
-** TYPES:       JSSize
-** DESCRIPTION:
-**  A type for representing the size of objects.
-************************************************************************/
-typedef size_t JSSize;
-
-/************************************************************************
-** TYPES:       JSPtrDiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
-************************************************************************/
-typedef ptrdiff_t JSPtrdiff;
-
-/************************************************************************
-** TYPES:       JSUptrdiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
-************************************************************************/
-#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
-typedef JSUint64 JSUptrdiff;
-#else
-typedef unsigned long JSUptrdiff;
-#endif
-
-/************************************************************************
-** TYPES:       JSBool
-** DESCRIPTION:
-**  Use JSBool for variables and parameter types. Use JS_FALSE and JS_TRUE
-**      for clarity of target type in assignments and actual arguments. Use
-**      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions.
-************************************************************************/
-typedef JSIntn JSBool;
-#define JS_TRUE (JSIntn)1
-#define JS_FALSE (JSIntn)0
-
-/************************************************************************
-** TYPES:       JSPackedBool
-** DESCRIPTION:
-**  Use JSPackedBool within structs where bitfields are not desireable
-**      but minimum and consistent overhead matters.
-************************************************************************/
-typedef JSUint8 JSPackedBool;
-
-/*
-** A JSWord is an integer that is the same size as a void*
-*/
-#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
-typedef JSInt64 JSWord;
-typedef JSUint64 JSUword;
-#else
-typedef long JSWord;
-typedef unsigned long JSUword;
-#endif
-
-#include "jsotypes.h"
-
-/***********************************************************************
-** MACROS:      JS_LIKELY
-**              JS_UNLIKELY
-** DESCRIPTION:
-**      These macros allow you to give a hint to the compiler about branch
-**      probability so that it can better optimize.  Use them like this:
-**
-**      if (JS_LIKELY(v == 1)) {
-**          ... expected code path ...
-**      }
-**
-**      if (JS_UNLIKELY(v == 0)) {
-**          ... non-expected code path ...
-**      }
-**
-***********************************************************************/
-#if defined(__GNUC__) && (__GNUC__ > 2)
-
-# define JS_LIKELY(x)   (__builtin_expect((x), 1))
-# define JS_UNLIKELY(x) (__builtin_expect((x), 0))
-
-#else
-
-# define JS_LIKELY(x)   (x)
-# define JS_UNLIKELY(x) (x)
-
-#endif
-
-/***********************************************************************
-** MACROS:      JS_ARRAY_LENGTH
-**              JS_ARRAY_END
-** DESCRIPTION:
-**      Macros to get the number of elements and the pointer to one past the
-**      last element of a C array. Use them like this:
-**
-**      jschar buf[10], *s;
-**      JSString *str;
-**      ...
-**      for (s = buf; s != JS_ARRAY_END(buf); ++s) *s = ...;
-**      ...
-**      str = JS_NewStringCopyN(cx, buf, JS_ARRAY_LENGTH(buf));
-**      ...
-**
-***********************************************************************/
-
-#define JS_ARRAY_LENGTH(array) (sizeof (array) / sizeof (array)[0])
-#define JS_ARRAY_END(array)    ((array) + JS_ARRAY_LENGTH(array))
-
-JS_END_EXTERN_C
-
-#endif /* jstypes_h___ */
diff --git a/libs/js/src/jsutil.c b/libs/js/src/jsutil.c
deleted file mode 100644
index 8aecbe8b83..0000000000
--- a/libs/js/src/jsutil.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   IBM Corp.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PR assertion checker.
- */
-#include "jsstddef.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "jstypes.h"
-#include "jsutil.h"
-
-#ifdef WIN32
-#    include <windows.h>
-#endif
-
-JS_PUBLIC_API(void) JS_Assert(const char *s, const char *file, JSIntn ln)
-{
-    fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, ln);
-#if defined(WIN32)
-    DebugBreak();
-#endif
-#if defined(XP_OS2)
-    asm("int $3");
-#endif
-    abort();
-}
-
-#if defined DEBUG_notme && defined XP_UNIX
-
-#define __USE_GNU 1
-#include <dlfcn.h>
-#include <setjmp.h>
-#include <string.h>
-#include "jshash.h"
-#include "jsprf.h"
-
-JSCallsite js_calltree_root = {0, NULL, NULL, 0, NULL, NULL, NULL, NULL};
-
-static JSCallsite *
-CallTree(uint32 *bp)
-{
-    uint32 *bpup, *bpdown, pc;
-    JSCallsite *parent, *site, **csp;
-    Dl_info info;
-    int ok, offset;
-    const char *symbol;
-    char *method;
-
-    /* Reverse the stack frame list to avoid recursion. */
-    bpup = NULL;
-    for (;;) {
-        bpdown = (uint32*) bp[0];
-        bp[0] = (uint32) bpup;
-        if ((uint32*) bpdown[0] < bpdown)
-            break;
-        bpup = bp;
-        bp = bpdown;
-    }
-
-    /* Reverse the stack again, finding and building a path in the tree. */
-    parent = &js_calltree_root;
-    do {
-        bpup = (uint32*) bp[0];
-        bp[0] = (uint32) bpdown;
-        pc = bp[1];
-
-        csp = &parent->kids;
-        while ((site = *csp) != NULL) {
-            if (site->pc == pc) {
-                /* Put the most recently used site at the front of siblings. */
-                *csp = site->siblings;
-                site->siblings = parent->kids;
-                parent->kids = site;
-
-                /* Site already built -- go up the stack. */
-                goto upward;
-            }
-            csp = &site->siblings;
-        }
-
-        /* Check for recursion: see if pc is on our ancestor line. */
-        for (site = parent; site; site = site->parent) {
-            if (site->pc == pc)
-                goto upward;
-        }
-
-        /*
-         * Not in tree at all: let's find our symbolic callsite info.
-         * XXX static syms are masked by nearest lower global
-         */
-        info.dli_fname = info.dli_sname = NULL;
-        ok = dladdr((void*) pc, &info);
-        if (ok < 0) {
-            fprintf(stderr, "dladdr failed!\n");
-            return NULL;
-        }
-
-/* XXXbe sub 0x08040000? or something, see dbaron bug with tenthumbs comment */
-        symbol = info.dli_sname;
-        offset = (char*)pc - (char*)info.dli_fbase;
-        method = symbol
-                 ? strdup(symbol)
-                 : JS_smprintf("%s+%X",
-                               info.dli_fname ? info.dli_fname : "main",
-                               offset);
-        if (!method)
-            return NULL;
-
-        /* Create a new callsite record. */
-        site = (JSCallsite *) malloc(sizeof(JSCallsite));
-        if (!site)
-            return NULL;
-
-        /* Insert the new site into the tree. */
-        site->pc = pc;
-        site->name = method;
-        site->library = info.dli_fname;
-        site->offset = offset;
-        site->parent = parent;
-        site->siblings = parent->kids;
-        parent->kids = site;
-        site->kids = NULL;
-
-      upward:
-        parent = site;
-        bpdown = bp;
-        bp = bpup;
-    } while (bp);
-
-    return site;
-}
-
-JSCallsite *
-JS_Backtrace(int skip)
-{
-    jmp_buf jb;
-    uint32 *bp, *bpdown;
-
-    setjmp(jb);
-
-    /* Stack walking code adapted from Kipp's "leaky". */
-    bp = (uint32*) jb[0].__jmpbuf[JB_BP];
-    while (--skip >= 0) {
-        bpdown = (uint32*) *bp++;
-        if (bpdown < bp)
-            break;
-        bp = bpdown;
-    }
-
-    return CallTree(bp);
-}
-
-#endif /* DEBUG_notme && XP_UNIX */
diff --git a/libs/js/src/jsutil.h b/libs/js/src/jsutil.h
deleted file mode 100644
index 5e26c16ae3..0000000000
--- a/libs/js/src/jsutil.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PR assertion checker.
- */
-
-#ifndef jsutil_h___
-#define jsutil_h___
-
-JS_BEGIN_EXTERN_C
-
-#ifdef DEBUG
-
-extern JS_PUBLIC_API(void)
-JS_Assert(const char *s, const char *file, JSIntn ln);
-#define JS_ASSERT(_expr) \
-    ((_expr)?((void)0):JS_Assert(# _expr,__FILE__,__LINE__))
-
-#define JS_NOT_REACHED(_reasonStr) \
-    JS_Assert(_reasonStr,__FILE__,__LINE__)
-
-#else
-
-#define JS_ASSERT(expr) ((void) 0)
-#define JS_NOT_REACHED(reasonStr)
-
-#endif /* defined(DEBUG) */
-
-/*
-** Abort the process in a non-graceful manner. This will cause a core file,
-** call to the debugger or other moral equivalent as well as causing the
-** entire process to stop.
-*/
-extern JS_PUBLIC_API(void) JS_Abort(void);
-
-#ifdef XP_UNIX
-
-typedef struct JSCallsite JSCallsite;
-
-struct JSCallsite {
-    uint32      pc;
-    char        *name;
-    const char  *library;
-    int         offset;
-    JSCallsite  *parent;
-    JSCallsite  *siblings;
-    JSCallsite  *kids;
-    void        *handy;
-};
-
-extern JSCallsite *JS_Backtrace(int skip);
-
-#endif
-
-JS_END_EXTERN_C
-
-#endif /* jsutil_h___ */
diff --git a/libs/js/src/jsxdrapi.c b/libs/js/src/jsxdrapi.c
deleted file mode 100644
index 0c9aeceedf..0000000000
--- a/libs/js/src/jsxdrapi.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "jsstddef.h"
-#include "jsconfig.h"
-
-#if JS_HAS_XDR
-
-#include <string.h>
-#include "jstypes.h"
-#include "jsutil.h" /* Added by JSIFY */
-#include "jsdhash.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jscntxt.h"
-#include "jsnum.h"
-#include "jsobj.h"              /* js_XDRObject */
-#include "jsscript.h"           /* js_XDRScript */
-#include "jsstr.h"
-#include "jsxdrapi.h"
-
-#ifdef DEBUG
-#define DBG(x) x
-#else
-#define DBG(x) ((void)0)
-#endif
-
-typedef struct JSXDRMemState {
-    JSXDRState  state;
-    char        *base;
-    uint32      count;
-    uint32      limit;
-} JSXDRMemState;
-
-#define MEM_BLOCK       8192
-#define MEM_PRIV(xdr)   ((JSXDRMemState *)(xdr))
-
-#define MEM_BASE(xdr)   (MEM_PRIV(xdr)->base)
-#define MEM_COUNT(xdr)  (MEM_PRIV(xdr)->count)
-#define MEM_LIMIT(xdr)  (MEM_PRIV(xdr)->limit)
-
-#define MEM_LEFT(xdr, bytes)                                                  \
-    JS_BEGIN_MACRO                                                            \
-        if ((xdr)->mode == JSXDR_DECODE &&                                    \
-            MEM_COUNT(xdr) + bytes > MEM_LIMIT(xdr)) {                        \
-            JS_ReportErrorNumber((xdr)->cx, js_GetErrorMessage, NULL,         \
-                                 JSMSG_END_OF_DATA);                          \
-            return 0;                                                         \
-        }                                                                     \
-    JS_END_MACRO
-
-#define MEM_NEED(xdr, bytes)                                                  \
-    JS_BEGIN_MACRO                                                            \
-        if ((xdr)->mode == JSXDR_ENCODE) {                                    \
-            if (MEM_LIMIT(xdr) &&                                             \
-                MEM_COUNT(xdr) + bytes > MEM_LIMIT(xdr)) {                    \
-                uint32 limit_ = JS_ROUNDUP(MEM_COUNT(xdr) + bytes, MEM_BLOCK);\
-                void *data_ = JS_realloc((xdr)->cx, MEM_BASE(xdr), limit_);   \
-                if (!data_)                                                   \
-                    return 0;                                                 \
-                MEM_BASE(xdr) = data_;                                        \
-                MEM_LIMIT(xdr) = limit_;                                      \
-            }                                                                 \
-        } else {                                                              \
-            MEM_LEFT(xdr, bytes);                                             \
-        }                                                                     \
-    JS_END_MACRO
-
-#define MEM_DATA(xdr)        ((void *)(MEM_BASE(xdr) + MEM_COUNT(xdr)))
-#define MEM_INCR(xdr,bytes)  (MEM_COUNT(xdr) += (bytes))
-
-static JSBool
-mem_get32(JSXDRState *xdr, uint32 *lp)
-{
-    MEM_LEFT(xdr, 4);
-    *lp = *(uint32 *)MEM_DATA(xdr);
-    MEM_INCR(xdr, 4);
-    return JS_TRUE;
-}
-
-static JSBool
-mem_set32(JSXDRState *xdr, uint32 *lp)
-{
-    MEM_NEED(xdr, 4);
-    *(uint32 *)MEM_DATA(xdr) = *lp;
-    MEM_INCR(xdr, 4);
-    return JS_TRUE;
-}
-
-static JSBool
-mem_getbytes(JSXDRState *xdr, char *bytes, uint32 len)
-{
-    MEM_LEFT(xdr, len);
-    memcpy(bytes, MEM_DATA(xdr), len);
-    MEM_INCR(xdr, len);
-    return JS_TRUE;
-}
-
-static JSBool
-mem_setbytes(JSXDRState *xdr, char *bytes, uint32 len)
-{
-    MEM_NEED(xdr, len);
-    memcpy(MEM_DATA(xdr), bytes, len);
-    MEM_INCR(xdr, len);
-    return JS_TRUE;
-}
-
-static void *
-mem_raw(JSXDRState *xdr, uint32 len)
-{
-    void *data;
-    if (xdr->mode == JSXDR_ENCODE) {
-        MEM_NEED(xdr, len);
-    } else if (xdr->mode == JSXDR_DECODE) {
-        MEM_LEFT(xdr, len);
-    }
-    data = MEM_DATA(xdr);
-    MEM_INCR(xdr, len);
-    return data;
-}
-
-static JSBool
-mem_seek(JSXDRState *xdr, int32 offset, JSXDRWhence whence)
-{
-    switch (whence) {
-      case JSXDR_SEEK_CUR:
-        if ((int32)MEM_COUNT(xdr) + offset < 0) {
-            JS_ReportErrorNumber(xdr->cx, js_GetErrorMessage, NULL,
-                                 JSMSG_SEEK_BEYOND_START);
-            return JS_FALSE;
-        }
-        if (offset > 0)
-            MEM_NEED(xdr, offset);
-        MEM_COUNT(xdr) += offset;
-        return JS_TRUE;
-      case JSXDR_SEEK_SET:
-        if (offset < 0) {
-            JS_ReportErrorNumber(xdr->cx, js_GetErrorMessage, NULL,
-                                 JSMSG_SEEK_BEYOND_START);
-            return JS_FALSE;
-        }
-        if (xdr->mode == JSXDR_ENCODE) {
-            if ((uint32)offset > MEM_COUNT(xdr))
-                MEM_NEED(xdr, offset - MEM_COUNT(xdr));
-            MEM_COUNT(xdr) = offset;
-        } else {
-            if ((uint32)offset > MEM_LIMIT(xdr)) {
-                JS_ReportErrorNumber(xdr->cx, js_GetErrorMessage, NULL,
-                                     JSMSG_SEEK_BEYOND_END);
-                return JS_FALSE;
-            }
-            MEM_COUNT(xdr) = offset;
-        }
-        return JS_TRUE;
-      case JSXDR_SEEK_END:
-        if (offset >= 0 ||
-            xdr->mode == JSXDR_ENCODE ||
-            (int32)MEM_LIMIT(xdr) + offset < 0) {
-            JS_ReportErrorNumber(xdr->cx, js_GetErrorMessage, NULL,
-                                 JSMSG_END_SEEK);
-            return JS_FALSE;
-        }
-        MEM_COUNT(xdr) = MEM_LIMIT(xdr) + offset;
-        return JS_TRUE;
-      default: {
-        char numBuf[12];
-        JS_snprintf(numBuf, sizeof numBuf, "%d", whence);
-        JS_ReportErrorNumber(xdr->cx, js_GetErrorMessage, NULL,
-                             JSMSG_WHITHER_WHENCE, numBuf);
-        return JS_FALSE;
-      }
-    }
-}
-
-static uint32
-mem_tell(JSXDRState *xdr)
-{
-    return MEM_COUNT(xdr);
-}
-
-static void
-mem_finalize(JSXDRState *xdr)
-{
-    JS_free(xdr->cx, MEM_BASE(xdr));
-}
-
-static JSXDROps xdrmem_ops = {
-    mem_get32,      mem_set32,      mem_getbytes,   mem_setbytes,
-    mem_raw,        mem_seek,       mem_tell,       mem_finalize
-};
-
-JS_PUBLIC_API(void)
-JS_XDRInitBase(JSXDRState *xdr, JSXDRMode mode, JSContext *cx)
-{
-    xdr->mode = mode;
-    xdr->cx = cx;
-    xdr->registry = NULL;
-    xdr->numclasses = xdr->maxclasses = 0;
-    xdr->reghash = NULL;
-    xdr->userdata = NULL;
-}
-
-JS_PUBLIC_API(JSXDRState *)
-JS_XDRNewMem(JSContext *cx, JSXDRMode mode)
-{
-    JSXDRState *xdr = (JSXDRState *) JS_malloc(cx, sizeof(JSXDRMemState));
-    if (!xdr)
-        return NULL;
-    JS_XDRInitBase(xdr, mode, cx);
-    if (mode == JSXDR_ENCODE) {
-        if (!(MEM_BASE(xdr) = JS_malloc(cx, MEM_BLOCK))) {
-            JS_free(cx, xdr);
-            return NULL;
-        }
-    } else {
-        /* XXXbe ok, so better not deref MEM_BASE(xdr) if not ENCODE */
-        MEM_BASE(xdr) = NULL;
-    }
-    xdr->ops = &xdrmem_ops;
-    MEM_COUNT(xdr) = 0;
-    MEM_LIMIT(xdr) = MEM_BLOCK;
-    return xdr;
-}
-
-JS_PUBLIC_API(void *)
-JS_XDRMemGetData(JSXDRState *xdr, uint32 *lp)
-{
-    if (xdr->ops != &xdrmem_ops)
-        return NULL;
-    *lp = MEM_COUNT(xdr);
-    return MEM_BASE(xdr);
-}
-
-JS_PUBLIC_API(void)
-JS_XDRMemSetData(JSXDRState *xdr, void *data, uint32 len)
-{
-    if (xdr->ops != &xdrmem_ops)
-        return;
-    MEM_LIMIT(xdr) = len;
-    MEM_BASE(xdr) = data;
-    MEM_COUNT(xdr) = 0;
-}
-
-JS_PUBLIC_API(uint32)
-JS_XDRMemDataLeft(JSXDRState *xdr)
-{
-    if (xdr->ops != &xdrmem_ops)
-        return 0;
-    return MEM_LIMIT(xdr) - MEM_COUNT(xdr);
-}
-
-JS_PUBLIC_API(void)
-JS_XDRMemResetData(JSXDRState *xdr)
-{
-    if (xdr->ops != &xdrmem_ops)
-        return;
-    MEM_COUNT(xdr) = 0;
-}
-
-JS_PUBLIC_API(void)
-JS_XDRDestroy(JSXDRState *xdr)
-{
-    JSContext *cx = xdr->cx;
-    xdr->ops->finalize(xdr);
-    if (xdr->registry) {
-        JS_free(cx, xdr->registry);
-        if (xdr->reghash)
-            JS_DHashTableDestroy(xdr->reghash);
-    }
-    JS_free(cx, xdr);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRUint8(JSXDRState *xdr, uint8 *b)
-{
-    uint32 l = *b;
-    if (!JS_XDRUint32(xdr, &l))
-        return JS_FALSE;
-    *b = (uint8) l;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRUint16(JSXDRState *xdr, uint16 *s)
-{
-    uint32 l = *s;
-    if (!JS_XDRUint32(xdr, &l))
-        return JS_FALSE;
-    *s = (uint16) l;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRUint32(JSXDRState *xdr, uint32 *lp)
-{
-    JSBool ok = JS_TRUE;
-    if (xdr->mode == JSXDR_ENCODE) {
-        uint32 xl = JSXDR_SWAB32(*lp);
-        ok = xdr->ops->set32(xdr, &xl);
-    } else if (xdr->mode == JSXDR_DECODE) {
-        ok = xdr->ops->get32(xdr, lp);
-        *lp = JSXDR_SWAB32(*lp);
-    }
-    return ok;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRBytes(JSXDRState *xdr, char *bytes, uint32 len)
-{
-    uint32 padlen;
-    static char padbuf[JSXDR_ALIGN-1];
-
-    if (xdr->mode == JSXDR_ENCODE) {
-        if (!xdr->ops->setbytes(xdr, bytes, len))
-            return JS_FALSE;
-    } else {
-        if (!xdr->ops->getbytes(xdr, bytes, len))
-            return JS_FALSE;
-    }
-    len = xdr->ops->tell(xdr);
-    if (len % JSXDR_ALIGN) {
-        padlen = JSXDR_ALIGN - (len % JSXDR_ALIGN);
-        if (xdr->mode == JSXDR_ENCODE) {
-            if (!xdr->ops->setbytes(xdr, padbuf, padlen))
-                return JS_FALSE;
-        } else {
-            if (!xdr->ops->seek(xdr, padlen, JSXDR_SEEK_CUR))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-/**
- * Convert between a C string and the XDR representation:
- * leading 32-bit count, then counted vector of chars,
- * then possibly \0 padding to multiple of 4.
- */
-JS_PUBLIC_API(JSBool)
-JS_XDRCString(JSXDRState *xdr, char **sp)
-{
-    uint32 len;
-
-    if (xdr->mode == JSXDR_ENCODE)
-        len = strlen(*sp);
-    JS_XDRUint32(xdr, &len);
-    if (xdr->mode == JSXDR_DECODE) {
-        if (!(*sp = (char *) JS_malloc(xdr->cx, len + 1)))
-            return JS_FALSE;
-    }
-    if (!JS_XDRBytes(xdr, *sp, len)) {
-        if (xdr->mode == JSXDR_DECODE)
-            JS_free(xdr->cx, *sp);
-        return JS_FALSE;
-    }
-    if (xdr->mode == JSXDR_DECODE) {
-        (*sp)[len] = '\0';
-    } else if (xdr->mode == JSXDR_FREE) {
-        JS_free(xdr->cx, *sp);
-        *sp = NULL;
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRCStringOrNull(JSXDRState *xdr, char **sp)
-{
-    uint32 null = (*sp == NULL);
-    if (!JS_XDRUint32(xdr, &null))
-        return JS_FALSE;
-    if (null) {
-        *sp = NULL;
-        return JS_TRUE;
-    }
-    return JS_XDRCString(xdr, sp);
-}
-
-/*
- * Convert between a JS (Unicode) string and the XDR representation.
- */
-JS_PUBLIC_API(JSBool)
-JS_XDRString(JSXDRState *xdr, JSString **strp)
-{
-    uint32 i, len, padlen, nbytes;
-    jschar *chars = NULL, *raw;
-
-    if (xdr->mode == JSXDR_ENCODE)
-        len = JSSTRING_LENGTH(*strp);
-    if (!JS_XDRUint32(xdr, &len))
-        return JS_FALSE;
-    nbytes = len * sizeof(jschar);
-
-    if (xdr->mode == JSXDR_DECODE) {
-        if (!(chars = (jschar *) JS_malloc(xdr->cx, nbytes + sizeof(jschar))))
-            return JS_FALSE;
-    } else {
-        chars = JSSTRING_CHARS(*strp);
-    }
-
-    padlen = nbytes % JSXDR_ALIGN;
-    if (padlen) {
-        padlen = JSXDR_ALIGN - padlen;
-        nbytes += padlen;
-    }
-    if (!(raw = (jschar *) xdr->ops->raw(xdr, nbytes)))
-        goto bad;
-    if (xdr->mode == JSXDR_ENCODE) {
-        for (i = 0; i < len; i++)
-            raw[i] = JSXDR_SWAB16(chars[i]);
-        if (padlen)
-            memset((char *)raw + nbytes - padlen, 0, padlen);
-    } else if (xdr->mode == JSXDR_DECODE) {
-        for (i = 0; i < len; i++)
-            chars[i] = JSXDR_SWAB16(raw[i]);
-        chars[len] = 0;
-
-        if (!(*strp = JS_NewUCString(xdr->cx, chars, len)))
-            goto bad;
-    }
-    return JS_TRUE;
-
-bad:
-    if (xdr->mode == JSXDR_DECODE)
-        JS_free(xdr->cx, chars);
-    return JS_FALSE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRStringOrNull(JSXDRState *xdr, JSString **strp)
-{
-    uint32 null = (*strp == NULL);
-    if (!JS_XDRUint32(xdr, &null))
-        return JS_FALSE;
-    if (null) {
-        *strp = NULL;
-        return JS_TRUE;
-    }
-    return JS_XDRString(xdr, strp);
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRDouble(JSXDRState *xdr, jsdouble **dp)
-{
-    jsdpun u;
-
-    if (xdr->mode == JSXDR_ENCODE)
-        u.d = **dp;
-    if (!JS_XDRUint32(xdr, &u.s.lo) || !JS_XDRUint32(xdr, &u.s.hi))
-        return JS_FALSE;
-    if (xdr->mode == JSXDR_DECODE) {
-        *dp = JS_NewDouble(xdr->cx, u.d);
-        if (!*dp)
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-/* These are magic pseudo-tags: see jsapi.h, near the top, for real tags. */
-#define JSVAL_XDRNULL   0x8
-#define JSVAL_XDRVOID   0xA
-
-JS_PUBLIC_API(JSBool)
-JS_XDRValue(JSXDRState *xdr, jsval *vp)
-{
-    uint32 type;
-
-    if (xdr->mode == JSXDR_ENCODE) {
-        if (JSVAL_IS_NULL(*vp))
-            type = JSVAL_XDRNULL;
-        else if (JSVAL_IS_VOID(*vp))
-            type = JSVAL_XDRVOID;
-        else
-            type = JSVAL_TAG(*vp);
-    }
-    if (!JS_XDRUint32(xdr, &type))
-        return JS_FALSE;
-
-    switch (type) {
-      case JSVAL_XDRNULL:
-        *vp = JSVAL_NULL;
-        break;
-      case JSVAL_XDRVOID:
-        *vp = JSVAL_VOID;
-        break;
-      case JSVAL_STRING: {
-        JSString *str;
-        if (xdr->mode == JSXDR_ENCODE)
-            str = JSVAL_TO_STRING(*vp);
-        if (!JS_XDRString(xdr, &str))
-            return JS_FALSE;
-        if (xdr->mode == JSXDR_DECODE)
-            *vp = STRING_TO_JSVAL(str);
-        break;
-      }
-      case JSVAL_DOUBLE: {
-        jsdouble *dp;
-        if (xdr->mode == JSXDR_ENCODE)
-            dp = JSVAL_TO_DOUBLE(*vp);
-        if (!JS_XDRDouble(xdr, &dp))
-            return JS_FALSE;
-        if (xdr->mode == JSXDR_DECODE)
-            *vp = DOUBLE_TO_JSVAL(dp);
-        break;
-      }
-      case JSVAL_OBJECT: {
-        JSObject *obj;
-        if (xdr->mode == JSXDR_ENCODE)
-            obj = JSVAL_TO_OBJECT(*vp);
-        if (!js_XDRObject(xdr, &obj))
-            return JS_FALSE;
-        if (xdr->mode == JSXDR_DECODE)
-            *vp = OBJECT_TO_JSVAL(obj);
-        break;
-      }
-      case JSVAL_BOOLEAN: {
-        uint32 b;
-        if (xdr->mode == JSXDR_ENCODE)
-            b = (uint32) JSVAL_TO_BOOLEAN(*vp);
-        if (!JS_XDRUint32(xdr, &b))
-            return JS_FALSE;
-        if (xdr->mode == JSXDR_DECODE)
-            *vp = BOOLEAN_TO_JSVAL((JSBool) b);
-        break;
-      }
-      default: {
-        uint32 i;
-
-        JS_ASSERT(type & JSVAL_INT);
-        if (xdr->mode == JSXDR_ENCODE)
-            i = (uint32) JSVAL_TO_INT(*vp);
-        if (!JS_XDRUint32(xdr, &i))
-            return JS_FALSE;
-        if (xdr->mode == JSXDR_DECODE)
-            *vp = INT_TO_JSVAL((int32) i);
-        break;
-      }
-    }
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_XDRScript(JSXDRState *xdr, JSScript **scriptp)
-{
-    if (!js_XDRScript(xdr, scriptp, NULL))
-        return JS_FALSE;
-    if (xdr->mode == JSXDR_DECODE)
-        js_CallNewScriptHook(xdr->cx, *scriptp, NULL);
-    return JS_TRUE;
-}
-
-#define CLASS_REGISTRY_MIN      8
-#define CLASS_INDEX_TO_ID(i)    ((i)+1)
-#define CLASS_ID_TO_INDEX(id)   ((id)-1)
-
-typedef struct JSRegHashEntry {
-    JSDHashEntryHdr hdr;
-    const char      *name;
-    uint32          index;
-} JSRegHashEntry;
-
-JS_PUBLIC_API(JSBool)
-JS_XDRRegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *idp)
-{
-    uintN numclasses, maxclasses;
-    JSClass **registry;
-
-    numclasses = xdr->numclasses;
-    maxclasses = xdr->maxclasses;
-    if (numclasses == maxclasses) {
-        maxclasses = (maxclasses == 0) ? CLASS_REGISTRY_MIN : maxclasses << 1;
-        registry = (JSClass **)
-            JS_realloc(xdr->cx, xdr->registry, maxclasses * sizeof(JSClass *));
-        if (!registry)
-            return JS_FALSE;
-        xdr->registry = registry;
-        xdr->maxclasses = maxclasses;
-    } else {
-        JS_ASSERT(numclasses && numclasses < maxclasses);
-        registry = xdr->registry;
-    }
-
-    registry[numclasses] = clasp;
-    if (xdr->reghash) {
-        JSRegHashEntry *entry = (JSRegHashEntry *)
-            JS_DHashTableOperate(xdr->reghash, clasp->name, JS_DHASH_ADD);
-        if (!entry) {
-            JS_ReportOutOfMemory(xdr->cx);
-            return JS_FALSE;
-        }
-        entry->name = clasp->name;
-        entry->index = numclasses;
-    }
-    *idp = CLASS_INDEX_TO_ID(numclasses);
-    xdr->numclasses = ++numclasses;
-    return JS_TRUE;
-}
-
-JS_PUBLIC_API(uint32)
-JS_XDRFindClassIdByName(JSXDRState *xdr, const char *name)
-{
-    uintN i, numclasses;
-
-    numclasses = xdr->numclasses;
-    if (numclasses >= 10) {
-        JSRegHashEntry *entry;
-
-        /* Bootstrap reghash from registry on first overpopulated Find. */
-        if (!xdr->reghash) {
-            xdr->reghash = JS_NewDHashTable(JS_DHashGetStubOps(), NULL,
-                                            sizeof(JSRegHashEntry),
-                                            numclasses);
-            if (xdr->reghash) {
-                for (i = 0; i < numclasses; i++) {
-                    JSClass *clasp = xdr->registry[i];
-                    entry = (JSRegHashEntry *)
-                        JS_DHashTableOperate(xdr->reghash, clasp->name,
-                                             JS_DHASH_ADD);
-                    entry->name = clasp->name;
-                    entry->index = i;
-                }
-            }
-        }
-
-        /* If we managed to create reghash, use it for O(1) Find. */
-        if (xdr->reghash) {
-            entry = (JSRegHashEntry *)
-                JS_DHashTableOperate(xdr->reghash, name, JS_DHASH_LOOKUP);
-            if (JS_DHASH_ENTRY_IS_BUSY(&entry->hdr))
-                return CLASS_INDEX_TO_ID(entry->index);
-        }
-    }
-
-    /* Only a few classes, or we couldn't malloc reghash: use linear search. */
-    for (i = 0; i < numclasses; i++) {
-        if (!strcmp(name, xdr->registry[i]->name))
-            return CLASS_INDEX_TO_ID(i);
-    }
-    return 0;
-}
-
-JS_PUBLIC_API(JSClass *)
-JS_XDRFindClassById(JSXDRState *xdr, uint32 id)
-{
-    uintN i = CLASS_ID_TO_INDEX(id);
-
-    if (i >= xdr->numclasses)
-        return NULL;
-    return xdr->registry[i];
-}
-
-#endif /* JS_HAS_XDR */
diff --git a/libs/js/src/jsxdrapi.h b/libs/js/src/jsxdrapi.h
deleted file mode 100644
index 874a62eebf..0000000000
--- a/libs/js/src/jsxdrapi.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsxdrapi_h___
-#define jsxdrapi_h___
-
-/*
- * JS external data representation interface API.
- *
- * The XDR system is comprised of three major parts:
- *
- * - the state serialization/deserialization APIs, which allow consumers
- *   of the API to serialize JS runtime state (script bytecodes, atom maps,
- *   object graphs, etc.) for later restoration.  These portions
- *   are implemented in various appropriate files, such as jsscript.c
- *   for the script portions and jsobj.c for object state.
- * - the callback APIs through which the runtime requests an opaque
- *   representation of a native object, and through which the runtime
- *   constructs a live native object from an opaque representation. These
- *   portions are the responsibility of the native object implementor.
- * - utility functions for en/decoding of primitive types, such as
- *   JSStrings.  This portion is implemented in jsxdrapi.c.
- *
- * Spiritually guided by Sun's XDR, where appropriate.
- */
-
-#include "jspubtd.h"
-#include "jsprvtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/* We use little-endian byteorder for all encoded data */
-
-#if defined IS_LITTLE_ENDIAN
-#define JSXDR_SWAB32(x) x
-#define JSXDR_SWAB16(x) x
-#elif defined IS_BIG_ENDIAN
-#define JSXDR_SWAB32(x) (((uint32)(x) >> 24) |                                \
-                         (((uint32)(x) >> 8) & 0xff00) |                      \
-                         (((uint32)(x) << 8) & 0xff0000) |                    \
-                         ((uint32)(x) << 24))
-#define JSXDR_SWAB16(x) (((uint16)(x) >> 8) | ((uint16)(x) << 8))
-#else
-#error "unknown byte order"
-#endif
-
-#define JSXDR_ALIGN     4
-
-typedef enum JSXDRMode {
-    JSXDR_ENCODE,
-    JSXDR_DECODE,
-    JSXDR_FREE
-} JSXDRMode;
-
-typedef enum JSXDRWhence {
-    JSXDR_SEEK_SET,
-    JSXDR_SEEK_CUR,
-    JSXDR_SEEK_END
-} JSXDRWhence;
-
-typedef struct JSXDROps {
-    JSBool      (*get32)(JSXDRState *, uint32 *);
-    JSBool      (*set32)(JSXDRState *, uint32 *);
-    JSBool      (*getbytes)(JSXDRState *, char *, uint32);
-    JSBool      (*setbytes)(JSXDRState *, char *, uint32);
-    void *      (*raw)(JSXDRState *, uint32);
-    JSBool      (*seek)(JSXDRState *, int32, JSXDRWhence);
-    uint32      (*tell)(JSXDRState *);
-    void        (*finalize)(JSXDRState *);
-} JSXDROps;
-
-struct JSXDRState {
-    JSXDRMode   mode;
-    JSXDROps    *ops;
-    JSContext   *cx;
-    JSClass     **registry;
-    uintN       numclasses;
-    uintN       maxclasses;
-    void        *reghash;
-    void        *userdata;
-};
-
-extern JS_PUBLIC_API(void)
-JS_XDRInitBase(JSXDRState *xdr, JSXDRMode mode, JSContext *cx);
-
-extern JS_PUBLIC_API(JSXDRState *)
-JS_XDRNewMem(JSContext *cx, JSXDRMode mode);
-
-extern JS_PUBLIC_API(void *)
-JS_XDRMemGetData(JSXDRState *xdr, uint32 *lp);
-
-extern JS_PUBLIC_API(void)
-JS_XDRMemSetData(JSXDRState *xdr, void *data, uint32 len);
-
-extern JS_PUBLIC_API(uint32)
-JS_XDRMemDataLeft(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(void)
-JS_XDRMemResetData(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(void)
-JS_XDRDestroy(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint8(JSXDRState *xdr, uint8 *b);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint16(JSXDRState *xdr, uint16 *s);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint32(JSXDRState *xdr, uint32 *lp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRBytes(JSXDRState *xdr, char *bytes, uint32 len);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRCString(JSXDRState *xdr, char **sp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRCStringOrNull(JSXDRState *xdr, char **sp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRString(JSXDRState *xdr, JSString **strp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRStringOrNull(JSXDRState *xdr, JSString **strp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRDouble(JSXDRState *xdr, jsdouble **dp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRValue(JSXDRState *xdr, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRScript(JSXDRState *xdr, JSScript **scriptp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRRegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *lp);
-
-extern JS_PUBLIC_API(uint32)
-JS_XDRFindClassIdByName(JSXDRState *xdr, const char *name);
-
-extern JS_PUBLIC_API(JSClass *)
-JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
-
-/*
- * Magic numbers.
- */
-#define JSXDR_MAGIC_SCRIPT_1        0xdead0001
-#define JSXDR_MAGIC_SCRIPT_2        0xdead0002
-#define JSXDR_MAGIC_SCRIPT_3        0xdead0003
-#define JSXDR_MAGIC_SCRIPT_4        0xdead0004
-#define JSXDR_MAGIC_SCRIPT_CURRENT  JSXDR_MAGIC_SCRIPT_4
-
-JS_END_EXTERN_C
-
-#endif /* ! jsxdrapi_h___ */
diff --git a/libs/js/src/jsxml.c b/libs/js/src/jsxml.c
deleted file mode 100644
index 46ed0ef908..0000000000
--- a/libs/js/src/jsxml.c
+++ /dev/null
@@ -1,8062 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=4 sw=4 et tw=80:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SpiderMonkey E4X code, released August, 2004.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "jsstddef.h"
-#include "jsconfig.h"
-
-#if JS_HAS_XML_SUPPORT
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jstypes.h"
-#include "jsbit.h"
-#include "jsprf.h"
-#include "jsutil.h"
-#include "jsapi.h"
-#include "jsarray.h"
-#include "jsatom.h"
-#include "jsbool.h"
-#include "jscntxt.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jsinterp.h"
-#include "jslock.h"
-#include "jsnum.h"
-#include "jsobj.h"
-#include "jsopcode.h"
-#include "jsparse.h"
-#include "jsscan.h"
-#include "jsscope.h"
-#include "jsscript.h"
-#include "jsstr.h"
-#include "jsxml.h"
-
-#ifdef DEBUG
-#include <string.h>     /* for #ifdef DEBUG memset calls */
-#endif
-
-/*
- * NOTES
- * - in the js shell, you must use the -x command line option, or call
- *   options('xml') before compiling anything that uses XML literals
- *
- * TODO
- * - XXXbe patrol
- * - Fuse objects and their JSXML* private data into single GC-things
- * - fix function::foo vs. x.(foo == 42) collision using proper namespacing
- * - fix the !TCF_HAS_DEFXMLNS optimization in js_FoldConstants
- * - JSCLASS_DOCUMENT_OBSERVER support -- live two-way binding to Gecko's DOM!
- * - JS_TypeOfValue sure could use a cleaner interface to "types"
- */
-
-#ifdef DEBUG_brendan
-#define METERING        1
-#endif
-
-#ifdef METERING
-static struct {
-    jsrefcount  qname;
-    jsrefcount  qnameobj;
-    jsrefcount  liveqname;
-    jsrefcount  liveqnameobj;
-    jsrefcount  namespace;
-    jsrefcount  namespaceobj;
-    jsrefcount  livenamespace;
-    jsrefcount  livenamespaceobj;
-    jsrefcount  xml;
-    jsrefcount  xmlobj;
-    jsrefcount  livexml;
-    jsrefcount  livexmlobj;
-} xml_stats;
-
-#define METER(x)        JS_ATOMIC_INCREMENT(&(x))
-#define UNMETER(x)      JS_ATOMIC_DECREMENT(&(x))
-#else
-#define METER(x)        /* nothing */
-#define UNMETER(x)      /* nothing */
-#endif
-
-/*
- * Random utilities and global functions.
- */
-const char js_AnyName_str[]       = "AnyName";
-const char js_AttributeName_str[] = "AttributeName";
-const char js_isXMLName_str[]     = "isXMLName";
-const char js_XMLList_str[]       = "XMLList";
-const char js_localName_str[]     = "localName";
-const char js_xml_parent_str[]    = "parent";
-const char js_prefix_str[]        = "prefix";
-const char js_toXMLString_str[]   = "toXMLString";
-const char js_uri_str[]           = "uri";
-
-const char js_amp_entity_str[]    = "&amp;";
-const char js_gt_entity_str[]     = "&gt;";
-const char js_lt_entity_str[]     = "&lt;";
-const char js_quot_entity_str[]   = "&quot;";
-
-#define IS_EMPTY(str) (JSSTRING_LENGTH(str) == 0)
-#define IS_STAR(str)  (JSSTRING_LENGTH(str) == 1 && *JSSTRING_CHARS(str) == '*')
-
-static JSBool
-xml_isXMLName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    *rval = BOOLEAN_TO_JSVAL(js_IsXMLName(cx, argv[0]));
-    return JS_TRUE;
-}
-
-/*
- * Namespace class and library functions.
- */
-enum namespace_tinyid {
-    NAMESPACE_PREFIX = -1,
-    NAMESPACE_URI = -2
-};
-
-static JSBool
-namespace_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSXMLNamespace *ns;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-
-    ns = (JSXMLNamespace *)
-         JS_GetInstancePrivate(cx, obj, &js_NamespaceClass.base, NULL);
-    if (!ns)
-        return JS_TRUE;
-
-    switch (JSVAL_TO_INT(id)) {
-      case NAMESPACE_PREFIX:
-        *vp = ns->prefix ? STRING_TO_JSVAL(ns->prefix) : JSVAL_VOID;
-        break;
-      case NAMESPACE_URI:
-        *vp = STRING_TO_JSVAL(ns->uri);
-        break;
-    }
-    return JS_TRUE;
-}
-
-static void
-namespace_finalize(JSContext *cx, JSObject *obj)
-{
-    JSXMLNamespace *ns;
-    JSRuntime *rt;
-
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, obj);
-    if (!ns)
-        return;
-    JS_ASSERT(ns->object == obj);
-    ns->object = NULL;
-    UNMETER(xml_stats.livenamespaceobj);
-
-    rt = cx->runtime;
-    if (rt->functionNamespaceObject == obj)
-        rt->functionNamespaceObject = NULL;
-}
-
-static void
-namespace_mark_vector(JSContext *cx, JSXMLNamespace **vec, uint32 len,
-                      void *arg)
-{
-    uint32 i;
-    JSXMLNamespace *ns;
-
-    for (i = 0; i < len; i++) {
-        ns = vec[i];
-        {
-#ifdef GC_MARK_DEBUG
-            char buf[100];
-
-            JS_snprintf(buf, sizeof buf, "%s=%s",
-                        ns->prefix ? JS_GetStringBytes(ns->prefix) : "",
-                        JS_GetStringBytes(ns->uri));
-#else
-            const char *buf = NULL;
-#endif
-            JS_MarkGCThing(cx, ns, buf, arg);
-        }
-    }
-}
-
-static uint32
-namespace_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSXMLNamespace *ns;
-
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, obj);
-    JS_MarkGCThing(cx, ns, js_private_str, arg);
-    return 0;
-}
-
-static JSBool
-namespace_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    JSXMLNamespace *ns, *ns2;
-    JSObject *obj2;
-
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, obj);
-    JS_ASSERT(JSVAL_IS_OBJECT(v));
-    obj2 = JSVAL_TO_OBJECT(v);
-    if (!obj2 || OBJ_GET_CLASS(cx, obj2) != &js_NamespaceClass.base) {
-        *bp = JS_FALSE;
-    } else {
-        ns2 = (JSXMLNamespace *) JS_GetPrivate(cx, obj2);
-        *bp = !js_CompareStrings(ns->uri, ns2->uri);
-    }
-    return JS_TRUE;
-}
-
-JS_FRIEND_DATA(JSExtendedClass) js_NamespaceClass = {
-  { "Namespace",
-    JSCLASS_HAS_PRIVATE | JSCLASS_CONSTRUCT_PROTOTYPE | JSCLASS_IS_EXTENDED,
-    JS_PropertyStub,   JS_PropertyStub,   namespace_getProperty, NULL,
-    JS_EnumerateStub,  JS_ResolveStub,    JS_ConvertStub,    namespace_finalize,
-    NULL,              NULL,              NULL,              NULL,
-    NULL,              NULL,              namespace_mark,    NULL },
-    namespace_equality,
-    NULL, NULL,
-    JSCLASS_NO_RESERVED_MEMBERS
-};
-
-#define NAMESPACE_ATTRS                                                       \
-    (JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED)
-
-static JSPropertySpec namespace_props[] = {
-    {js_prefix_str,    NAMESPACE_PREFIX,  NAMESPACE_ATTRS,   0, 0},
-    {js_uri_str,       NAMESPACE_URI,     NAMESPACE_ATTRS,   0, 0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-namespace_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    JSXMLNamespace *ns;
-
-    ns = (JSXMLNamespace *)
-         JS_GetInstancePrivate(cx, obj, &js_NamespaceClass.base, argv);
-    if (!ns)
-        return JS_FALSE;
-
-    *rval = STRING_TO_JSVAL(ns->uri);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec namespace_methods[] = {
-    {js_toString_str,  namespace_toString,        0,0,0},
-    {0,0,0,0,0}
-};
-
-JSXMLNamespace *
-js_NewXMLNamespace(JSContext *cx, JSString *prefix, JSString *uri,
-                   JSBool declared)
-{
-    JSXMLNamespace *ns;
-
-    ns = (JSXMLNamespace *)
-         js_NewGCThing(cx, GCX_NAMESPACE, sizeof(JSXMLNamespace));
-    if (!ns)
-        return NULL;
-    ns->object = NULL;
-    ns->prefix = prefix;
-    ns->uri = uri;
-    ns->declared = declared;
-    METER(xml_stats.namespace);
-    METER(xml_stats.livenamespace);
-    return ns;
-}
-
-void
-js_MarkXMLNamespace(JSContext *cx, JSXMLNamespace *ns, void *arg)
-{
-    JS_MarkGCThing(cx, ns->object, js_object_str, arg);
-    JS_MarkGCThing(cx, ns->prefix, js_prefix_str, arg);
-    JS_MarkGCThing(cx, ns->uri, js_uri_str, arg);
-}
-
-void
-js_FinalizeXMLNamespace(JSContext *cx, JSXMLNamespace *ns)
-{
-    UNMETER(xml_stats.livenamespace);
-}
-
-JSObject *
-js_NewXMLNamespaceObject(JSContext *cx, JSString *prefix, JSString *uri,
-                         JSBool declared)
-{
-    JSXMLNamespace *ns;
-
-    ns = js_NewXMLNamespace(cx, prefix, uri, declared);
-    if (!ns)
-        return NULL;
-    return js_GetXMLNamespaceObject(cx, ns);
-}
-
-JSObject *
-js_GetXMLNamespaceObject(JSContext *cx, JSXMLNamespace *ns)
-{
-    JSObject *obj;
-
-    obj = ns->object;
-    if (obj) {
-        JS_ASSERT(JS_GetPrivate(cx, obj) == ns);
-        return obj;
-    }
-    obj = js_NewObject(cx, &js_NamespaceClass.base, NULL, NULL);
-    if (!obj || !JS_SetPrivate(cx, obj, ns)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    ns->object = obj;
-    METER(xml_stats.namespaceobj);
-    METER(xml_stats.livenamespaceobj);
-    return obj;
-}
-
-/*
- * QName class and library functions.
- */
-enum qname_tinyid {
-    QNAME_URI = -1,
-    QNAME_LOCALNAME = -2
-};
-
-static JSBool
-qname_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSXMLQName *qn;
-
-    if (!JSVAL_IS_INT(id))
-        return JS_TRUE;
-
-    qn = (JSXMLQName *)
-         JS_GetInstancePrivate(cx, obj, &js_QNameClass.base, NULL);
-    if (!qn)
-        return JS_TRUE;
-
-    switch (JSVAL_TO_INT(id)) {
-      case QNAME_URI:
-        *vp = qn->uri ? STRING_TO_JSVAL(qn->uri) : JSVAL_NULL;
-        break;
-      case QNAME_LOCALNAME:
-        *vp = STRING_TO_JSVAL(qn->localName);
-        break;
-    }
-    return JS_TRUE;
-}
-
-static void
-qname_finalize(JSContext *cx, JSObject *obj)
-{
-    JSXMLQName *qn;
-
-    qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-    if (!qn)
-        return;
-    JS_ASSERT(qn->object == obj);
-    qn->object = NULL;
-    UNMETER(xml_stats.liveqnameobj);
-}
-
-static void
-anyname_finalize(JSContext* cx, JSObject* obj)
-{
-    JSRuntime *rt;
-
-    /* Make sure the next call to js_GetAnyName doesn't try to use obj. */
-    rt = cx->runtime;
-    if (rt->anynameObject == obj)
-        rt->anynameObject = NULL;
-
-    qname_finalize(cx, obj);
-}
-
-static uint32
-qname_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSXMLQName *qn;
-
-    qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-    JS_MarkGCThing(cx, qn, js_private_str, arg);
-    return 0;
-}
-
-static JSBool
-qname_identity(JSXMLQName *qna, JSXMLQName *qnb)
-{
-    if (!qna->uri ^ !qnb->uri)
-        return JS_FALSE;
-    if (qna->uri && js_CompareStrings(qna->uri, qnb->uri))
-        return JS_FALSE;
-    return !js_CompareStrings(qna->localName, qnb->localName);
-}
-
-static JSBool
-qname_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    JSXMLQName *qn, *qn2;
-    JSObject *obj2;
-
-    qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-    JS_ASSERT(JSVAL_IS_OBJECT(v));
-    obj2 = JSVAL_TO_OBJECT(v);
-    if (!obj2 || OBJ_GET_CLASS(cx, obj2) != &js_QNameClass.base) {
-        *bp = JS_FALSE;
-    } else {
-        qn2 = (JSXMLQName *) JS_GetPrivate(cx, obj2);
-        *bp = qname_identity(qn, qn2);
-    }
-    return JS_TRUE;
-}
-
-JS_FRIEND_DATA(JSExtendedClass) js_QNameClass = {
-  { "QName",
-    JSCLASS_HAS_PRIVATE | JSCLASS_CONSTRUCT_PROTOTYPE | JSCLASS_IS_EXTENDED,
-    JS_PropertyStub,   JS_PropertyStub,   qname_getProperty, NULL,
-    JS_EnumerateStub,  JS_ResolveStub,    JS_ConvertStub,    qname_finalize,
-    NULL,              NULL,              NULL,              NULL,
-    NULL,              NULL,              qname_mark,        NULL },
-    qname_equality,
-    NULL, NULL,
-    JSCLASS_NO_RESERVED_MEMBERS
-};
-
-/*
- * Classes for the ECMA-357-internal types AttributeName and AnyName, which
- * are like QName, except that they have no property getters.  They share the
- * qname_toString method, and therefore are exposed as constructable objects
- * in this implementation.
- */
-JS_FRIEND_DATA(JSClass) js_AttributeNameClass = {
-    js_AttributeName_str, JSCLASS_HAS_PRIVATE | JSCLASS_CONSTRUCT_PROTOTYPE,
-    JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,
-    JS_EnumerateStub,  JS_ResolveStub,    JS_ConvertStub,    qname_finalize,
-    NULL,              NULL,              NULL,              NULL,
-    NULL,              NULL,              qname_mark,        NULL
-};
-
-JS_FRIEND_DATA(JSClass) js_AnyNameClass = {
-    js_AnyName_str,    JSCLASS_HAS_PRIVATE | JSCLASS_CONSTRUCT_PROTOTYPE,
-    JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,
-    JS_EnumerateStub,  JS_ResolveStub,    JS_ConvertStub,    anyname_finalize,
-    NULL,              NULL,              NULL,              NULL,
-    NULL,              NULL,              qname_mark,        NULL
-};
-
-#define QNAME_ATTRS                                                           \
-    (JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED)
-
-static JSPropertySpec qname_props[] = {
-    {js_uri_str,       QNAME_URI,         QNAME_ATTRS,       0, 0},
-    {js_localName_str, QNAME_LOCALNAME,   QNAME_ATTRS,       0, 0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-qname_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSClass *clasp;
-    JSXMLQName *qn;
-    JSString *str, *qualstr;
-    size_t length;
-    jschar *chars;
-
-    clasp = OBJ_GET_CLASS(cx, obj);
-    if (clasp == &js_AttributeNameClass || clasp == &js_AnyNameClass) {
-        qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-    } else {
-        qn = (JSXMLQName *)
-             JS_GetInstancePrivate(cx, obj, &js_QNameClass.base, argv);
-        if (!qn)
-            return JS_FALSE;
-    }
-
-    if (!qn->uri) {
-        /* No uri means wildcard qualifier. */
-        str = ATOM_TO_STRING(cx->runtime->atomState.starQualifierAtom);
-    } else if (IS_EMPTY(qn->uri)) {
-        /* Empty string for uri means localName is in no namespace. */
-        str = cx->runtime->emptyString;
-    } else {
-        qualstr = ATOM_TO_STRING(cx->runtime->atomState.qualifierAtom);
-        str = js_ConcatStrings(cx, qn->uri, qualstr);
-        if (!str)
-            return JS_FALSE;
-    }
-    str = js_ConcatStrings(cx, str, qn->localName);
-    if (!str)
-        return JS_FALSE;
-
-    if (str && clasp == &js_AttributeNameClass) {
-        length = JSSTRING_LENGTH(str);
-        chars = (jschar *) JS_malloc(cx, (length + 2) * sizeof(jschar));
-        if (!chars)
-            return JS_FALSE;
-        *chars = '@';
-        js_strncpy(chars + 1, JSSTRING_CHARS(str), length);
-        chars[++length] = 0;
-        str = js_NewString(cx, chars, length, 0);
-        if (!str) {
-            JS_free(cx, chars);
-            return JS_FALSE;
-        }
-    }
-
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec qname_methods[] = {
-    {js_toString_str,  qname_toString,    0,0,0},
-    {0,0,0,0,0}
-};
-
-JSXMLQName *
-js_NewXMLQName(JSContext *cx, JSString *uri, JSString *prefix,
-               JSString *localName)
-{
-    JSXMLQName *qn;
-
-    qn = (JSXMLQName *) js_NewGCThing(cx, GCX_QNAME, sizeof(JSXMLQName));
-    if (!qn)
-        return NULL;
-    qn->object = NULL;
-    qn->uri = uri;
-    qn->prefix = prefix;
-    qn->localName = localName;
-    METER(xml_stats.qname);
-    METER(xml_stats.liveqname);
-    return qn;
-}
-
-void
-js_MarkXMLQName(JSContext *cx, JSXMLQName *qn, void *arg)
-{
-    JS_MarkGCThing(cx, qn->object, js_object_str, arg);
-    JS_MarkGCThing(cx, qn->uri, js_uri_str, arg);
-    JS_MarkGCThing(cx, qn->prefix, js_prefix_str, arg);
-    JS_MarkGCThing(cx, qn->localName, js_localName_str, arg);
-}
-
-void
-js_FinalizeXMLQName(JSContext *cx, JSXMLQName *qn)
-{
-    UNMETER(xml_stats.liveqname);
-}
-
-JSObject *
-js_NewXMLQNameObject(JSContext *cx, JSString *uri, JSString *prefix,
-                     JSString *localName)
-{
-    JSXMLQName *qn;
-
-    qn = js_NewXMLQName(cx, uri, prefix, localName);
-    if (!qn)
-        return NULL;
-    return js_GetXMLQNameObject(cx, qn);
-}
-
-JSObject *
-js_GetXMLQNameObject(JSContext *cx, JSXMLQName *qn)
-{
-    JSObject *obj;
-
-    obj = qn->object;
-    if (obj) {
-        JS_ASSERT(JS_GetPrivate(cx, obj) == qn);
-        return obj;
-    }
-    obj = js_NewObject(cx, &js_QNameClass.base, NULL, NULL);
-    if (!obj || !JS_SetPrivate(cx, obj, qn)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    qn->object = obj;
-    METER(xml_stats.qnameobj);
-    METER(xml_stats.liveqnameobj);
-    return obj;
-}
-
-JSObject *
-js_GetAttributeNameObject(JSContext *cx, JSXMLQName *qn)
-{
-    JSObject *obj;
-
-    obj = qn->object;
-    if (obj) {
-        if (OBJ_GET_CLASS(cx, obj) == &js_AttributeNameClass)
-            return obj;
-        qn = js_NewXMLQName(cx, qn->uri, qn->prefix, qn->localName);
-        if (!qn)
-            return NULL;
-    }
-
-    obj = js_NewObject(cx, &js_AttributeNameClass, NULL, NULL);
-    if (!obj || !JS_SetPrivate(cx, obj, qn)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-
-    qn->object = obj;
-    METER(xml_stats.qnameobj);
-    METER(xml_stats.liveqnameobj);
-    return obj;
-}
-
-JSObject *
-js_ConstructXMLQNameObject(JSContext *cx, jsval nsval, jsval lnval)
-{
-    jsval argv[2];
-
-    /*
-     * ECMA-357 11.1.2,
-     * The _QualifiedIdentifier : PropertySelector :: PropertySelector_
-     * production, step 2.
-     */
-    if (!JSVAL_IS_PRIMITIVE(nsval) &&
-        OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(nsval)) == &js_AnyNameClass) {
-        nsval = JSVAL_NULL;
-    }
-
-    argv[0] = nsval;
-    argv[1] = lnval;
-    return js_ConstructObject(cx, &js_QNameClass.base, NULL, NULL, 2, argv);
-}
-
-static JSBool
-IsXMLName(const jschar *cp, size_t n)
-{
-    JSBool rv;
-    jschar c;
-
-    rv = JS_FALSE;
-    if (n != 0 && JS_ISXMLNSSTART(*cp)) {
-        while (--n != 0) {
-            c = *++cp;
-            if (!JS_ISXMLNS(c))
-                return rv;
-        }
-        rv = JS_TRUE;
-    }
-    return rv;
-}
-
-JSBool
-js_IsXMLName(JSContext *cx, jsval v)
-{
-    JSClass *clasp;
-    JSXMLQName *qn;
-    JSString *name;
-    JSErrorReporter older;
-
-    /*
-     * Inline specialization of the QName constructor called with v passed as
-     * the only argument, to compute the localName for the constructed qname,
-     * without actually allocating the object or computing its uri and prefix.
-     * See ECMA-357 13.1.2.1 step 1 and 13.3.2.
-     */
-    if (!JSVAL_IS_PRIMITIVE(v) &&
-        (clasp = OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)),
-         clasp == &js_QNameClass.base ||
-         clasp == &js_AttributeNameClass ||
-         clasp == &js_AnyNameClass)) {
-        qn = (JSXMLQName *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-        name = qn->localName;
-    } else {
-        older = JS_SetErrorReporter(cx, NULL);
-        name = js_ValueToString(cx, v);
-        JS_SetErrorReporter(cx, older);
-        if (!name) {
-            JS_ClearPendingException(cx);
-            return JS_FALSE;
-        }
-    }
-
-    return IsXMLName(JSSTRING_CHARS(name), JSSTRING_LENGTH(name));
-}
-
-static JSBool
-Namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval urival, prefixval;
-    JSObject *uriobj;
-    JSBool isNamespace, isQName;
-    JSClass *clasp;
-    JSString *empty, *prefix;
-    JSXMLNamespace *ns, *ns2;
-    JSXMLQName *qn;
-
-    urival = argv[argc > 1];
-    isNamespace = isQName = JS_FALSE;
-    if (!JSVAL_IS_PRIMITIVE(urival)) {
-        uriobj = JSVAL_TO_OBJECT(urival);
-        clasp = OBJ_GET_CLASS(cx, uriobj);
-        isNamespace = (clasp == &js_NamespaceClass.base);
-        isQName = (clasp == &js_QNameClass.base);
-    }
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-    else uriobj = NULL;
-#endif
-
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        /* Namespace called as function. */
-        if (argc == 1 && isNamespace) {
-            /* Namespace called with one Namespace argument is identity. */
-            *rval = urival;
-            return JS_TRUE;
-        }
-
-        /* Create and return a new QName object exactly as if constructed. */
-        obj = js_NewObject(cx, &js_NamespaceClass.base, NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-    METER(xml_stats.namespaceobj);
-    METER(xml_stats.livenamespaceobj);
-
-    /*
-     * Create and connect private data to rooted obj early, so we don't have
-     * to worry about rooting string newborns hanging off of the private data
-     * further below.
-     */
-    empty = cx->runtime->emptyString;
-    ns = js_NewXMLNamespace(cx, empty, empty, JS_FALSE);
-    if (!ns)
-        return JS_FALSE;
-    if (!JS_SetPrivate(cx, obj, ns))
-        return JS_FALSE;
-    ns->object = obj;
-
-    if (argc == 1) {
-        if (isNamespace) {
-            ns2 = (JSXMLNamespace *) JS_GetPrivate(cx, uriobj);
-            ns->uri = ns2->uri;
-            ns->prefix = ns2->prefix;
-        } else if (isQName &&
-                   (qn = (JSXMLQName *) JS_GetPrivate(cx, uriobj))->uri) {
-            ns->uri = qn->uri;
-            ns->prefix = qn->prefix;
-        } else {
-            ns->uri = js_ValueToString(cx, urival);
-            if (!ns->uri)
-                return JS_FALSE;
-
-            /* NULL here represents *undefined* in ECMA-357 13.2.2 3(c)iii. */
-            if (!IS_EMPTY(ns->uri))
-                ns->prefix = NULL;
-        }
-    } else if (argc == 2) {
-        if (isQName &&
-            (qn = (JSXMLQName *) JS_GetPrivate(cx, uriobj))->uri) {
-            ns->uri = qn->uri;
-        } else {
-            ns->uri = js_ValueToString(cx, urival);
-            if (!ns->uri)
-                return JS_FALSE;
-        }
-
-        prefixval = argv[0];
-        if (IS_EMPTY(ns->uri)) {
-            if (!JSVAL_IS_VOID(prefixval)) {
-                prefix = js_ValueToString(cx, prefixval);
-                if (!prefix)
-                    return JS_FALSE;
-                if (!IS_EMPTY(prefix)) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                         JSMSG_BAD_XML_NAMESPACE,
-                                         js_ValueToPrintableString(cx,
-                                             STRING_TO_JSVAL(prefix)));
-                    return JS_FALSE;
-                }
-            }
-        } else if (JSVAL_IS_VOID(prefixval) || !js_IsXMLName(cx, prefixval)) {
-            /* NULL here represents *undefined* in ECMA-357 13.2.2 4(d) etc. */
-            ns->prefix = NULL;
-        } else {
-            prefix = js_ValueToString(cx, prefixval);
-            if (!prefix)
-                return JS_FALSE;
-            ns->prefix = prefix;
-        }
-    }
-
-    return JS_TRUE;
-}
-
-static JSBool
-QName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval nameval, nsval;
-    JSBool isQName, isNamespace;
-    JSXMLQName *qn;
-    JSString *uri, *prefix, *name;
-    JSObject *nsobj;
-    JSClass *clasp;
-    JSXMLNamespace *ns;
-
-    nameval = argv[argc > 1];
-    isQName =
-        !JSVAL_IS_PRIMITIVE(nameval) &&
-        OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(nameval)) == &js_QNameClass.base;
-
-    if (!(cx->fp->flags & JSFRAME_CONSTRUCTING)) {
-        /* QName called as function. */
-        if (argc == 1 && isQName) {
-            /* QName called with one QName argument is identity. */
-            *rval = nameval;
-            return JS_TRUE;
-        }
-
-        /*
-         * Create and return a new QName object exactly as if constructed.
-         * Use the constructor's clasp so we can be shared by AttributeName
-         * (see below after this function).
-         */
-        obj = js_NewObject(cx,
-                           argv
-                           ? JS_ValueToFunction(cx, argv[-2])->clasp
-                           : &js_QNameClass.base,
-                           NULL, NULL);
-        if (!obj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(obj);
-    }
-    METER(xml_stats.qnameobj);
-    METER(xml_stats.liveqnameobj);
-
-    if (isQName) {
-        /* If namespace is not specified and name is a QName, clone it. */
-        qn = (JSXMLQName *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(nameval));
-        if (argc == 1) {
-            uri = qn->uri;
-            prefix = qn->prefix;
-            name = qn->localName;
-            goto out;
-        }
-
-        /* Namespace and qname were passed -- use the qname's localName. */
-        nameval = STRING_TO_JSVAL(qn->localName);
-    }
-
-    if (argc == 0) {
-        name = cx->runtime->emptyString;
-    } else {
-        name = js_ValueToString(cx, nameval);
-        if (!name)
-            return JS_FALSE;
-
-        /* Use argv[1] as a local root for name, even if it was not passed. */
-        argv[1] = STRING_TO_JSVAL(name);
-    }
-
-    nsval = argv[0];
-    if (argc == 1 || JSVAL_IS_VOID(nsval)) {
-        if (IS_STAR(name)) {
-            nsval = JSVAL_NULL;
-        } else {
-            if (!js_GetDefaultXMLNamespace(cx, &nsval))
-                return JS_FALSE;
-        }
-    }
-
-    if (JSVAL_IS_NULL(nsval)) {
-        /* NULL prefix represents *undefined* in ECMA-357 13.3.2 5(a). */
-        uri = prefix = NULL;
-    } else {
-        /*
-         * Inline specialization of the Namespace constructor called with
-         * nsval passed as the only argument, to compute the uri and prefix
-         * for the constructed namespace, without actually allocating the
-         * object or computing other members.  See ECMA-357 13.3.2 6(a) and
-         * 13.2.2.
-         */
-        isNamespace = isQName = JS_FALSE;
-        if (!JSVAL_IS_PRIMITIVE(nsval)) {
-            nsobj = JSVAL_TO_OBJECT(nsval);
-            clasp = OBJ_GET_CLASS(cx, nsobj);
-            isNamespace = (clasp == &js_NamespaceClass.base);
-            isQName = (clasp == &js_QNameClass.base);
-        }
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-        else nsobj = NULL;
-#endif
-
-        if (isNamespace) {
-            ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-            uri = ns->uri;
-            prefix = ns->prefix;
-        } else if (isQName &&
-                   (qn = (JSXMLQName *) JS_GetPrivate(cx, nsobj))->uri) {
-            uri = qn->uri;
-            prefix = qn->prefix;
-        } else {
-            uri = js_ValueToString(cx, nsval);
-            if (!uri)
-                return JS_FALSE;
-            argv[0] = STRING_TO_JSVAL(uri);     /* local root */
-
-            /* NULL here represents *undefined* in ECMA-357 13.2.2 3(c)iii. */
-            prefix = IS_EMPTY(uri) ? cx->runtime->emptyString : NULL;
-        }
-    }
-
-out:
-    qn = js_NewXMLQName(cx, uri, prefix, name);
-    if (!qn)
-        return JS_FALSE;
-    if (!JS_SetPrivate(cx, obj, qn))
-        return JS_FALSE;
-    qn->object = obj;
-    return JS_TRUE;
-}
-
-static JSBool
-AttributeName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    /*
-     * Since js_AttributeNameClass was initialized, obj will have that as its
-     * class, not js_QNameClass.
-     */
-    return QName(cx, obj, argc, argv, rval);
-}
-
-/*
- * XMLArray library functions.
- */
-static JSBool
-namespace_identity(const void *a, const void *b)
-{
-    const JSXMLNamespace *nsa = (const JSXMLNamespace *) a;
-    const JSXMLNamespace *nsb = (const JSXMLNamespace *) b;
-
-    if (nsa->prefix && nsb->prefix) {
-        if (js_CompareStrings(nsa->prefix, nsb->prefix))
-            return JS_FALSE;
-    } else {
-        if (nsa->prefix || nsb->prefix)
-            return JS_FALSE;
-    }
-    return !js_CompareStrings(nsa->uri, nsb->uri);
-}
-
-static JSBool
-attr_identity(const void *a, const void *b)
-{
-    const JSXML *xmla = (const JSXML *) a;
-    const JSXML *xmlb = (const JSXML *) b;
-
-    return qname_identity(xmla->name, xmlb->name);
-}
-
-static void
-XMLArrayCursorInit(JSXMLArrayCursor *cursor, JSXMLArray *array)
-{
-    JSXMLArrayCursor *next;
-
-    cursor->array = array;
-    cursor->index = 0;
-    next = cursor->next = array->cursors;
-    if (next)
-        next->prevp = &cursor->next;
-    cursor->prevp = &array->cursors;
-    array->cursors = cursor;
-}
-
-static void
-XMLArrayCursorFinish(JSXMLArrayCursor *cursor)
-{
-    JSXMLArrayCursor *next;
-
-    if (!cursor->array)
-        return;
-    next = cursor->next;
-    if (next)
-        next->prevp = cursor->prevp;
-    *cursor->prevp = next;
-    cursor->array = NULL;
-}
-
-/* NB: called with null cx from the GC, via xml_mark => XMLArrayTrim. */
-static JSBool
-XMLArraySetCapacity(JSContext *cx, JSXMLArray *array, uint32 capacity)
-{
-    void **vector;
-
-    if (capacity == 0) {
-        /* We could let realloc(p, 0) free this, but purify gets confused. */
-        if (array->vector)
-            free(array->vector);
-        vector = NULL;
-    } else {
-        if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-            !(vector = (void **)
-                       realloc(array->vector, capacity * sizeof(void *)))) {
-            if (cx)
-                JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
-        }
-    }
-    array->capacity = JSXML_PRESET_CAPACITY | capacity;
-    array->vector = vector;
-    return JS_TRUE;
-}
-
-static void
-XMLArrayTrim(JSXMLArray *array)
-{
-    if (array->capacity & JSXML_PRESET_CAPACITY)
-        return;
-    if (array->length < array->capacity)
-        XMLArraySetCapacity(NULL, array, array->length);
-}
-
-static JSBool
-XMLArrayInit(JSContext *cx, JSXMLArray *array, uint32 capacity)
-{
-    array->length = array->capacity = 0;
-    array->vector = NULL;
-    array->cursors = NULL;
-    return capacity == 0 || XMLArraySetCapacity(cx, array, capacity);
-}
-
-static void
-XMLArrayFinish(JSContext *cx, JSXMLArray *array)
-{
-    JSXMLArrayCursor *cursor;
-
-    JS_free(cx, array->vector);
-
-    while ((cursor = array->cursors) != NULL)
-        XMLArrayCursorFinish(cursor);
-
-#ifdef DEBUG
-    memset(array, 0xd5, sizeof *array);
-#endif
-}
-
-#define XML_NOT_FOUND   ((uint32) -1)
-
-static uint32
-XMLArrayFindMember(const JSXMLArray *array, void *elt, JSIdentityOp identity)
-{
-    void **vector;
-    uint32 i, n;
-
-    /* The identity op must not reallocate array->vector. */
-    vector = array->vector;
-    if (identity) {
-        for (i = 0, n = array->length; i < n; i++) {
-            if (identity(vector[i], elt))
-                return i;
-        }
-    } else {
-        for (i = 0, n = array->length; i < n; i++) {
-            if (vector[i] == elt)
-                return i;
-        }
-    }
-    return XML_NOT_FOUND;
-}
-
-/*
- * Grow array vector capacity by powers of two to LINEAR_THRESHOLD, and after
- * that, grow by LINEAR_INCREMENT.  Both must be powers of two, and threshold
- * should be greater than increment.
- */
-#define LINEAR_THRESHOLD        256
-#define LINEAR_INCREMENT        32
-
-static JSBool
-XMLArrayAddMember(JSContext *cx, JSXMLArray *array, uint32 index, void *elt)
-{
-    uint32 capacity, i;
-    int log2;
-    void **vector;
-
-    if (index >= array->length) {
-        if (index >= JSXML_CAPACITY(array)) {
-            /* Arrange to clear JSXML_PRESET_CAPACITY from array->capacity. */
-            capacity = index + 1;
-            if (index >= LINEAR_THRESHOLD) {
-                capacity = JS_ROUNDUP(capacity, LINEAR_INCREMENT);
-            } else {
-                JS_CEILING_LOG2(log2, capacity);
-                capacity = JS_BIT(log2);
-            }
-            if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-                !(vector = (void **)
-                           realloc(array->vector, capacity * sizeof(void *)))) {
-                JS_ReportOutOfMemory(cx);
-                return JS_FALSE;
-            }
-            array->capacity = capacity;
-            array->vector = vector;
-            for (i = array->length; i < index; i++)
-                vector[i] = NULL;
-        }
-        array->length = index + 1;
-    }
-
-    array->vector[index] = elt;
-    return JS_TRUE;
-}
-
-static JSBool
-XMLArrayInsert(JSContext *cx, JSXMLArray *array, uint32 i, uint32 n)
-{
-    uint32 j;
-    JSXMLArrayCursor *cursor;
-
-    j = array->length;
-    JS_ASSERT(i <= j);
-    if (!XMLArraySetCapacity(cx, array, j + n))
-        return JS_FALSE;
-
-    array->length = j + n;
-    JS_ASSERT(n != (uint32)-1);
-    while (j != i) {
-        --j;
-        array->vector[j + n] = array->vector[j];
-    }
-
-    for (cursor = array->cursors; cursor; cursor = cursor->next) {
-        if (cursor->index > i)
-            cursor->index += n;
-    }
-    return JS_TRUE;
-}
-
-static void *
-XMLArrayDelete(JSContext *cx, JSXMLArray *array, uint32 index, JSBool compress)
-{
-    uint32 length;
-    void **vector, *elt;
-    JSXMLArrayCursor *cursor;
-
-    length = array->length;
-    if (index >= length)
-        return NULL;
-
-    vector = array->vector;
-    elt = vector[index];
-    if (compress) {
-        while (++index < length)
-            vector[index-1] = vector[index];
-        array->length = length - 1;
-        array->capacity = JSXML_CAPACITY(array);
-    } else {
-        vector[index] = NULL;
-    }
-
-    for (cursor = array->cursors; cursor; cursor = cursor->next) {
-        if (cursor->index > index)
-            --cursor->index;
-    }
-    return elt;
-}
-
-static void
-XMLArrayTruncate(JSContext *cx, JSXMLArray *array, uint32 length)
-{
-    void **vector;
-
-    JS_ASSERT(!array->cursors);
-    if (length >= array->length)
-        return;
-
-    if (length == 0) {
-        if (array->vector)
-            free(array->vector);
-        vector = NULL;
-    } else {
-        vector = realloc(array->vector, length * sizeof(void *));
-        if (!vector)
-            return;
-    }
-
-    if (array->length > length)
-        array->length = length;
-    array->capacity = length;
-    array->vector = vector;
-}
-
-#define XMLARRAY_FIND_MEMBER(a,e,f) XMLArrayFindMember(a, (void *)(e), f)
-#define XMLARRAY_HAS_MEMBER(a,e,f)  (XMLArrayFindMember(a, (void *)(e), f) != \
-                                     XML_NOT_FOUND)
-#define XMLARRAY_MEMBER(a,i,t)      ((t *) (a)->vector[i])
-#define XMLARRAY_SET_MEMBER(a,i,e)  ((a)->vector[i] = (void *)(e))
-#define XMLARRAY_ADD_MEMBER(x,a,i,e)XMLArrayAddMember(x, a, i, (void *)(e))
-#define XMLARRAY_INSERT(x,a,i,n)    XMLArrayInsert(x, a, i, n)
-#define XMLARRAY_APPEND(x,a,e)      XMLARRAY_ADD_MEMBER(x, a, (a)->length, (e))
-#define XMLARRAY_DELETE(x,a,i,c,t)  ((t *) XMLArrayDelete(x, a, i, c))
-#define XMLARRAY_TRUNCATE(x,a,n)    XMLArrayTruncate(x, a, n)
-
-/*
- * Define XML setting property strings and constants early, so everyone can
- * use the same names and their magic numbers (tinyids, flags).
- */
-static const char js_ignoreComments_str[]   = "ignoreComments";
-static const char js_ignoreProcessingInstructions_str[]
-                                            = "ignoreProcessingInstructions";
-static const char js_ignoreWhitespace_str[] = "ignoreWhitespace";
-static const char js_prettyPrinting_str[]   = "prettyPrinting";
-static const char js_prettyIndent_str[]     = "prettyIndent";
-
-/*
- * NB: These XML static property tinyids must
- * (a) not collide with the generic negative tinyids at the top of jsfun.c;
- * (b) index their corresponding xml_static_props array elements.
- * Don't change 'em!
- */
-enum xml_static_tinyid {
-    XML_IGNORE_COMMENTS,
-    XML_IGNORE_PROCESSING_INSTRUCTIONS,
-    XML_IGNORE_WHITESPACE,
-    XML_PRETTY_PRINTING,
-    XML_PRETTY_INDENT
-};
-
-static JSBool
-xml_setting_setter(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSBool b;
-    uint8 flag;
-
-    JS_ASSERT(JSVAL_IS_INT(id));
-    if (!js_ValueToBoolean(cx, *vp, &b))
-        return JS_FALSE;
-
-    flag = JS_BIT(JSVAL_TO_INT(id));
-    if (b)
-        cx->xmlSettingFlags |= flag;
-    else
-        cx->xmlSettingFlags &= ~flag;
-    return JS_TRUE;
-}
-
-static JSPropertySpec xml_static_props[] = {
-    {js_ignoreComments_str,     XML_IGNORE_COMMENTS,   JSPROP_PERMANENT,
-                                NULL, xml_setting_setter},
-    {js_ignoreProcessingInstructions_str,
-                   XML_IGNORE_PROCESSING_INSTRUCTIONS, JSPROP_PERMANENT,
-                                NULL, xml_setting_setter},
-    {js_ignoreWhitespace_str,   XML_IGNORE_WHITESPACE, JSPROP_PERMANENT,
-                                NULL, xml_setting_setter},
-    {js_prettyPrinting_str,     XML_PRETTY_PRINTING,   JSPROP_PERMANENT,
-                                NULL, xml_setting_setter},
-    {js_prettyIndent_str,       XML_PRETTY_INDENT,     JSPROP_PERMANENT,
-                                NULL, NULL},
-    {0,0,0,0,0}
-};
-
-/* Derive cx->xmlSettingFlags bits from xml_static_props tinyids. */
-#define XSF_IGNORE_COMMENTS     JS_BIT(XML_IGNORE_COMMENTS)
-#define XSF_IGNORE_PROCESSING_INSTRUCTIONS                                    \
-                                JS_BIT(XML_IGNORE_PROCESSING_INSTRUCTIONS)
-#define XSF_IGNORE_WHITESPACE   JS_BIT(XML_IGNORE_WHITESPACE)
-#define XSF_PRETTY_PRINTING     JS_BIT(XML_PRETTY_PRINTING)
-#define XSF_CACHE_VALID         JS_BIT(XML_PRETTY_INDENT)
-
-/*
- * Extra, unrelated but necessarily disjoint flag used by ParseNodeToXML.
- * This flag means a couple of things:
- *
- * - The top JSXML created for a parse tree must have an object owning it.
- *
- * - That the default namespace normally inherited from the temporary
- *   <parent xmlns='...'> tag that wraps a runtime-concatenated XML source
- *   string must, in the case of a precompiled XML object tree, inherit via
- *   ad-hoc code in ParseNodeToXML.
- *
- * Because of the second purpose, we name this flag XSF_PRECOMPILED_ROOT.
- */
-#define XSF_PRECOMPILED_ROOT    (XSF_CACHE_VALID << 1)
-
-/* Macros for special-casing xml:, xmlns= and xmlns:foo= in ParseNodeToQName. */
-#define IS_XML(str)                                                           \
-    (JSSTRING_LENGTH(str) == 3 && IS_XML_CHARS(JSSTRING_CHARS(str)))
-
-#define IS_XMLNS(str)                                                         \
-    (JSSTRING_LENGTH(str) == 5 && IS_XMLNS_CHARS(JSSTRING_CHARS(str)))
-
-#define IS_XML_CHARS(chars)                                                   \
-    (JS_TOLOWER((chars)[0]) == 'x' &&                                         \
-     JS_TOLOWER((chars)[1]) == 'm' &&                                         \
-     JS_TOLOWER((chars)[2]) == 'l')
-
-#define HAS_NS_AFTER_XML(chars)                                               \
-    (JS_TOLOWER((chars)[3]) == 'n' &&                                         \
-     JS_TOLOWER((chars)[4]) == 's')
-
-#define IS_XMLNS_CHARS(chars)                                                 \
-    (IS_XML_CHARS(chars) && HAS_NS_AFTER_XML(chars))
-
-#define STARTS_WITH_XML(chars,length)                                         \
-    (length >= 3 && IS_XML_CHARS(chars))
-
-static const char xml_namespace_str[] = "http://www.w3.org/XML/1998/namespace";
-static const char xmlns_namespace_str[] = "http://www.w3.org/2000/xmlns/";
-
-static JSXMLQName *
-ParseNodeToQName(JSContext *cx, JSParseNode *pn, JSXMLArray *inScopeNSes,
-                 JSBool isAttributeName)
-{
-    JSString *str, *uri, *prefix, *localName;
-    size_t length, offset;
-    const jschar *start, *limit, *colon;
-    uint32 n;
-    JSXMLNamespace *ns;
-
-    JS_ASSERT(pn->pn_arity == PN_NULLARY);
-    str = ATOM_TO_STRING(pn->pn_atom);
-    length = JSSTRING_LENGTH(str);
-    start = JSSTRING_CHARS(str);
-    JS_ASSERT(length != 0 && *start != '@');
-    JS_ASSERT(length != 1 || *start != '*');
-
-    uri = cx->runtime->emptyString;
-    limit = start + length;
-    colon = js_strchr_limit(start, ':', limit);
-    if (colon) {
-        offset = PTRDIFF(colon, start, jschar);
-        prefix = js_NewDependentString(cx, str, 0, offset, 0);
-        if (!prefix)
-            return NULL;
-
-        if (STARTS_WITH_XML(start, offset)) {
-            if (offset == 3) {
-                uri = JS_InternString(cx, xml_namespace_str);
-                if (!uri)
-                    return NULL;
-            } else if (offset == 5 && HAS_NS_AFTER_XML(start)) {
-                uri = JS_InternString(cx, xmlns_namespace_str);
-                if (!uri)
-                    return NULL;
-            } else {
-                uri = NULL;
-            }
-        } else {
-            uri = NULL;
-            n = inScopeNSes->length;
-            while (n != 0) {
-                ns = XMLARRAY_MEMBER(inScopeNSes, --n, JSXMLNamespace);
-                if (ns->prefix && !js_CompareStrings(ns->prefix, prefix)) {
-                    uri = ns->uri;
-                    break;
-                }
-            }
-        }
-
-        if (!uri) {
-            js_ReportCompileErrorNumber(cx, pn,
-                                        JSREPORT_PN | JSREPORT_ERROR,
-                                        JSMSG_BAD_XML_NAMESPACE,
-                                        js_ValueToPrintableString(cx,
-                                            STRING_TO_JSVAL(prefix)));
-            return NULL;
-        }
-
-        localName = js_NewStringCopyN(cx, colon + 1, length - (offset + 1), 0);
-        if (!localName)
-            return NULL;
-    } else {
-        if (isAttributeName) {
-            /*
-             * An unprefixed attribute is not in any namespace, so set prefix
-             * as well as uri to the empty string.
-             */
-            prefix = uri;
-        } else {
-            /*
-             * Loop from back to front looking for the closest declared default
-             * namespace.
-             */
-            n = inScopeNSes->length;
-            while (n != 0) {
-                ns = XMLARRAY_MEMBER(inScopeNSes, --n, JSXMLNamespace);
-                if (!ns->prefix || IS_EMPTY(ns->prefix)) {
-                    uri = ns->uri;
-                    break;
-                }
-            }
-            prefix = NULL;
-        }
-        localName = str;
-    }
-
-    return js_NewXMLQName(cx, uri, prefix, localName);
-}
-
-static JSString *
-ChompXMLWhitespace(JSContext *cx, JSString *str)
-{
-    size_t length, newlength, offset;
-    const jschar *cp, *start, *end;
-    jschar c;
-
-    length = JSSTRING_LENGTH(str);
-    for (cp = start = JSSTRING_CHARS(str), end = cp + length; cp < end; cp++) {
-        c = *cp;
-        if (!JS_ISXMLSPACE(c))
-            break;
-    }
-    while (end > cp) {
-        c = end[-1];
-        if (!JS_ISXMLSPACE(c))
-            break;
-        --end;
-    }
-    newlength = PTRDIFF(end, cp, jschar);
-    if (newlength == length)
-        return str;
-    offset = PTRDIFF(cp, start, jschar);
-    return js_NewDependentString(cx, str, offset, newlength, 0);
-}
-
-static JSXML *
-ParseNodeToXML(JSContext *cx, JSParseNode *pn, JSXMLArray *inScopeNSes,
-               uintN flags)
-{
-    JSXML *xml, *kid, *attr, *attrj;
-    JSString *str;
-    uint32 length, n, i, j;
-    JSParseNode *pn2, *pn3, *head, **pnp;
-    JSXMLNamespace *ns;
-    JSXMLQName *qn, *attrjqn;
-    JSXMLClass xml_class;
-
-#define PN2X_SKIP_CHILD ((JSXML *) 1)
-
-    /*
-     * Cases return early to avoid common code that gets an outermost xml's
-     * object, which protects GC-things owned by xml and its descendants from
-     * garbage collection.
-     */
-    xml = NULL;
-    if (!JS_EnterLocalRootScope(cx))
-        return NULL;
-    switch (pn->pn_type) {
-      case TOK_XMLELEM:
-        length = inScopeNSes->length;
-        pn2 = pn->pn_head;
-        xml = ParseNodeToXML(cx, pn2, inScopeNSes, flags);
-        if (!xml)
-            goto fail;
-        flags &= ~XSF_PRECOMPILED_ROOT;
-
-        n = pn->pn_count;
-        JS_ASSERT(n >= 2);
-        n -= 2;
-        if (!XMLArraySetCapacity(cx, &xml->xml_kids, n))
-            goto fail;
-
-        i = 0;
-        while ((pn2 = pn2->pn_next) != NULL) {
-            if (!pn2->pn_next) {
-                /* Don't append the end tag! */
-                JS_ASSERT(pn2->pn_type == TOK_XMLETAGO);
-                break;
-            }
-
-            if ((flags & XSF_IGNORE_WHITESPACE) &&
-                n > 1 && pn2->pn_type == TOK_XMLSPACE) {
-                --n;
-                continue;
-            }
-
-            kid = ParseNodeToXML(cx, pn2, inScopeNSes, flags);
-            if (kid == PN2X_SKIP_CHILD) {
-                --n;
-                continue;
-            }
-
-            if (!kid) {
-                xml->xml_kids.length = i;
-                goto fail;
-            }
-
-            /* Store kid in xml right away, to protect it from GC. */
-            XMLARRAY_SET_MEMBER(&xml->xml_kids, i, kid);
-            kid->parent = xml;
-            ++i;
-
-            /* XXX where is this documented in an XML spec, or in E4X? */
-            if ((flags & XSF_IGNORE_WHITESPACE) &&
-                n > 1 && kid->xml_class == JSXML_CLASS_TEXT) {
-                str = ChompXMLWhitespace(cx, kid->xml_value);
-                if (!str)
-                    goto fail;
-                kid->xml_value = str;
-            }
-        }
-
-        JS_ASSERT(i == n);
-        xml->xml_kids.length = n;
-        if (n < pn->pn_count - 2)
-            XMLArrayTrim(&xml->xml_kids);
-        XMLARRAY_TRUNCATE(cx, inScopeNSes, length);
-        break;
-
-      case TOK_XMLLIST:
-        xml = js_NewXML(cx, JSXML_CLASS_LIST);
-        if (!xml)
-            goto fail;
-
-        n = pn->pn_count;
-        if (!XMLArraySetCapacity(cx, &xml->xml_kids, n))
-            goto fail;
-
-        i = 0;
-        for (pn2 = pn->pn_head; pn2; pn2 = pn2->pn_next) {
-            /*
-             * Always ignore insignificant whitespace in lists -- we shouldn't
-             * condition this on an XML.ignoreWhitespace setting when the list
-             * constructor is XMLList (note XML/XMLList unification hazard).
-             */
-            if (pn2->pn_type == TOK_XMLSPACE) {
-                --n;
-                continue;
-            }
-
-            kid = ParseNodeToXML(cx, pn2, inScopeNSes, flags);
-            if (kid == PN2X_SKIP_CHILD) {
-                --n;
-                continue;
-            }
-
-            if (!kid) {
-                xml->xml_kids.length = i;
-                goto fail;
-            }
-
-            XMLARRAY_SET_MEMBER(&xml->xml_kids, i, kid);
-            ++i;
-        }
-
-        xml->xml_kids.length = n;
-        if (n < pn->pn_count)
-            XMLArrayTrim(&xml->xml_kids);
-        break;
-
-      case TOK_XMLSTAGO:
-      case TOK_XMLPTAGC:
-        length = inScopeNSes->length;
-        pn2 = pn->pn_head;
-        JS_ASSERT(pn2->pn_type = TOK_XMLNAME);
-        if (pn2->pn_arity == PN_LIST)
-            goto syntax;
-
-        xml = js_NewXML(cx, JSXML_CLASS_ELEMENT);
-        if (!xml)
-            goto fail;
-
-        /* First pass: check syntax and process namespace declarations. */
-        JS_ASSERT(pn->pn_count >= 1);
-        n = pn->pn_count - 1;
-        pnp = &pn2->pn_next;
-        head = *pnp;
-        while ((pn2 = *pnp) != NULL) {
-            size_t length;
-            const jschar *chars;
-
-            if (pn2->pn_type != TOK_XMLNAME || pn2->pn_arity != PN_NULLARY)
-                goto syntax;
-
-            /* Enforce "Well-formedness constraint: Unique Att Spec". */
-            for (pn3 = head; pn3 != pn2; pn3 = pn3->pn_next->pn_next) {
-                if (pn3->pn_atom == pn2->pn_atom) {
-                    js_ReportCompileErrorNumber(cx, pn2,
-                                                JSREPORT_PN | JSREPORT_ERROR,
-                                                JSMSG_DUPLICATE_XML_ATTR,
-                                                js_ValueToPrintableString(cx,
-                                                    ATOM_KEY(pn2->pn_atom)));
-                    goto fail;
-                }
-            }
-
-            str = ATOM_TO_STRING(pn2->pn_atom);
-            pn2 = pn2->pn_next;
-            JS_ASSERT(pn2);
-            if (pn2->pn_type != TOK_XMLATTR)
-                goto syntax;
-
-            length = JSSTRING_LENGTH(str);
-            chars = JSSTRING_CHARS(str);
-            if (length >= 5 &&
-                IS_XMLNS_CHARS(chars) &&
-                (length == 5 || chars[5] == ':')) {
-                JSString *uri, *prefix;
-
-                uri = ATOM_TO_STRING(pn2->pn_atom);
-                if (length == 5) {
-                    /* 10.3.2.1. Step 6(h)(i)(1)(a). */
-                    prefix = cx->runtime->emptyString;
-                } else {
-                    prefix = js_NewStringCopyN(cx, chars + 6, length - 6, 0);
-                    if (!prefix)
-                        goto fail;
-                }
-
-                /*
-                 * Once the new ns is appended to xml->xml_namespaces, it is
-                 * protected from GC by the object that owns xml -- which is
-                 * either xml->object if outermost, or the object owning xml's
-                 * oldest ancestor if !outermost.
-                 */
-                ns = js_NewXMLNamespace(cx, prefix, uri, JS_TRUE);
-                if (!ns)
-                    goto fail;
-
-                /*
-                 * Don't add a namespace that's already in scope.  If someone
-                 * extracts a child property from its parent via [[Get]], then
-                 * we enforce the invariant, noted many times in ECMA-357, that
-                 * the child's namespaces form a possibly-improper superset of
-                 * its ancestors' namespaces.
-                 */
-                if (!XMLARRAY_HAS_MEMBER(inScopeNSes, ns, namespace_identity)) {
-                    if (!XMLARRAY_APPEND(cx, inScopeNSes, ns) ||
-                        !XMLARRAY_APPEND(cx, &xml->xml_namespaces, ns)) {
-                        goto fail;
-                    }
-                }
-
-                JS_ASSERT(n >= 2);
-                n -= 2;
-                *pnp = pn2->pn_next;
-                /* XXXbe recycle pn2 */
-                continue;
-            }
-
-            pnp = &pn2->pn_next;
-        }
-
-        /*
-         * If called from js_ParseNodeToXMLObject, emulate the effect of the
-         * <parent xmlns='%s'>...</parent> wrapping done by "ToXML Applied to
-         * the String Type" (ECMA-357 10.3.1).
-         */
-        if (flags & XSF_PRECOMPILED_ROOT) {
-            JS_ASSERT(length >= 1);
-            ns = XMLARRAY_MEMBER(inScopeNSes, 0, JSXMLNamespace);
-            JS_ASSERT(!XMLARRAY_HAS_MEMBER(&xml->xml_namespaces, ns,
-                                           namespace_identity));
-            ns = js_NewXMLNamespace(cx, ns->prefix, ns->uri, JS_FALSE);
-            if (!ns)
-                goto fail;
-            if (!XMLARRAY_APPEND(cx, &xml->xml_namespaces, ns))
-                goto fail;
-        }
-        XMLArrayTrim(&xml->xml_namespaces);
-
-        /* Second pass: process tag name and attributes, using namespaces. */
-        pn2 = pn->pn_head;
-        qn = ParseNodeToQName(cx, pn2, inScopeNSes, JS_FALSE);
-        if (!qn)
-            goto fail;
-        xml->name = qn;
-
-        JS_ASSERT((n & 1) == 0);
-        n >>= 1;
-        if (!XMLArraySetCapacity(cx, &xml->xml_attrs, n))
-            goto fail;
-
-        for (i = 0; (pn2 = pn2->pn_next) != NULL; i++) {
-            qn = ParseNodeToQName(cx, pn2, inScopeNSes, JS_TRUE);
-            if (!qn) {
-                xml->xml_attrs.length = i;
-                goto fail;
-            }
-
-            /*
-             * Enforce "Well-formedness constraint: Unique Att Spec", part 2:
-             * this time checking local name and namespace URI.
-             */
-            for (j = 0; j < i; j++) {
-                attrj = XMLARRAY_MEMBER(&xml->xml_attrs, j, JSXML);
-                attrjqn = attrj->name;
-                if (!js_CompareStrings(attrjqn->uri, qn->uri) &&
-                    !js_CompareStrings(attrjqn->localName, qn->localName)) {
-                    js_ReportCompileErrorNumber(cx, pn2,
-                                                JSREPORT_PN | JSREPORT_ERROR,
-                                                JSMSG_DUPLICATE_XML_ATTR,
-                                                js_ValueToPrintableString(cx,
-                                                    ATOM_KEY(pn2->pn_atom)));
-                    goto fail;
-                }
-            }
-
-            pn2 = pn2->pn_next;
-            JS_ASSERT(pn2);
-            JS_ASSERT(pn2->pn_type == TOK_XMLATTR);
-
-            attr = js_NewXML(cx, JSXML_CLASS_ATTRIBUTE);
-            if (!attr) {
-                xml->xml_attrs.length = i;
-                goto fail;
-            }
-
-            XMLARRAY_SET_MEMBER(&xml->xml_attrs, i, attr);
-            attr->parent = xml;
-            attr->name = qn;
-            attr->xml_value = ATOM_TO_STRING(pn2->pn_atom);
-        }
-
-        xml->xml_attrs.length = n;
-
-        /* Point tag closes its own namespace scope. */
-        if (pn->pn_type == TOK_XMLPTAGC)
-            XMLARRAY_TRUNCATE(cx, inScopeNSes, length);
-        break;
-
-      case TOK_XMLSPACE:
-      case TOK_XMLTEXT:
-      case TOK_XMLCDATA:
-      case TOK_XMLCOMMENT:
-      case TOK_XMLPI:
-        str = ATOM_TO_STRING(pn->pn_atom);
-        qn = NULL;
-        if (pn->pn_type == TOK_XMLCOMMENT) {
-            if (flags & XSF_IGNORE_COMMENTS)
-                goto skip_child;
-            xml_class = JSXML_CLASS_COMMENT;
-        } else if (pn->pn_type == TOK_XMLPI) {
-            if (IS_XML(str)) {
-                js_ReportCompileErrorNumber(cx, pn,
-                                            JSREPORT_PN | JSREPORT_ERROR,
-                                            JSMSG_RESERVED_ID,
-                                            js_ValueToPrintableString(cx,
-                                                STRING_TO_JSVAL(str)));
-                goto fail;
-            }
-
-            if (flags & XSF_IGNORE_PROCESSING_INSTRUCTIONS)
-                goto skip_child;
-
-            qn = ParseNodeToQName(cx, pn, inScopeNSes, JS_FALSE);
-            if (!qn)
-                goto fail;
-
-            str = pn->pn_atom2
-                  ? ATOM_TO_STRING(pn->pn_atom2)
-                  : cx->runtime->emptyString;
-            xml_class = JSXML_CLASS_PROCESSING_INSTRUCTION;
-        } else {
-            /* CDATA section content, or element text. */
-            xml_class = JSXML_CLASS_TEXT;
-        }
-
-        xml = js_NewXML(cx, xml_class);
-        if (!xml)
-            goto fail;
-        xml->name = qn;
-        if (pn->pn_type == TOK_XMLSPACE)
-            xml->xml_flags |= XMLF_WHITESPACE_TEXT;
-        xml->xml_value = str;
-        break;
-
-      default:
-        goto syntax;
-    }
-
-    JS_LeaveLocalRootScope(cx);
-    if ((flags & XSF_PRECOMPILED_ROOT) && !js_GetXMLObject(cx, xml))
-        return NULL;
-    return xml;
-
-skip_child:
-    js_LeaveLocalRootScope(cx);
-    return PN2X_SKIP_CHILD;
-
-#undef PN2X_SKIP_CHILD
-
-syntax:
-    js_ReportCompileErrorNumber(cx, pn, JSREPORT_PN | JSREPORT_ERROR,
-                                JSMSG_BAD_XML_MARKUP);
-fail:
-    JS_LeaveLocalRootScope(cx);
-    return NULL;
-}
-
-/*
- * XML helper, object-ops, and library functions.  We start with the helpers,
- * in ECMA-357 order, but merging XML (9.1) and XMLList (9.2) helpers.
- */
-static JSBool
-GetXMLSetting(JSContext *cx, const char *name, jsval *vp)
-{
-    jsval v;
-
-    if (!js_FindConstructor(cx, NULL, js_XML_str, &v))
-        return JS_FALSE;
-    if (!JSVAL_IS_FUNCTION(cx, v)) {
-        *vp = JSVAL_VOID;
-        return JS_TRUE;
-    }
-    return JS_GetProperty(cx, JSVAL_TO_OBJECT(v), name, vp);
-}
-
-static JSBool
-GetBooleanXMLSetting(JSContext *cx, const char *name, JSBool *bp)
-{
-    int i;
-    jsval v;
-
-    if (cx->xmlSettingFlags & XSF_CACHE_VALID) {
-        for (i = 0; xml_static_props[i].name; i++) {
-            if (!strcmp(xml_static_props[i].name, name)) {
-                *bp = (cx->xmlSettingFlags & JS_BIT(i)) != 0;
-                return JS_TRUE;
-            }
-        }
-        *bp = JS_FALSE;
-        return JS_TRUE;
-    }
-
-    return GetXMLSetting(cx, name, &v) && js_ValueToBoolean(cx, v, bp);
-}
-
-static JSBool
-GetUint32XMLSetting(JSContext *cx, const char *name, uint32 *uip)
-{
-    jsval v;
-
-    return GetXMLSetting(cx, name, &v) && js_ValueToECMAUint32(cx, v, uip);
-}
-
-static JSBool
-GetXMLSettingFlags(JSContext *cx, uintN *flagsp)
-{
-    JSBool flag;
-
-    /* Just get the first flag to validate the setting flags cache. */
-    if (!GetBooleanXMLSetting(cx, js_ignoreComments_str, &flag))
-        return JS_FALSE;
-    *flagsp = cx->xmlSettingFlags;
-    return JS_TRUE;
-}
-
-static JSXML *
-ParseXMLSource(JSContext *cx, JSString *src)
-{
-    jsval nsval;
-    JSXMLNamespace *ns;
-    size_t urilen, srclen, length, offset, dstlen;
-    jschar *chars;
-    const jschar *srcp, *endp;
-    void *mark;
-    JSTokenStream *ts;
-    uintN lineno;
-    JSStackFrame *fp;
-    JSOp op;
-    JSParseNode *pn;
-    JSXML *xml;
-    JSXMLArray nsarray;
-    uintN flags;
-
-    static const char prefix[] = "<parent xmlns='";
-    static const char middle[] = "'>";
-    static const char suffix[] = "</parent>";
-
-#define constrlen(constr)   (sizeof(constr) - 1)
-
-    if (!js_GetDefaultXMLNamespace(cx, &nsval))
-        return NULL;
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(nsval));
-
-    urilen = JSSTRING_LENGTH(ns->uri);
-    srclen = JSSTRING_LENGTH(src);
-    length = constrlen(prefix) + urilen + constrlen(middle) + srclen +
-             constrlen(suffix);
-
-    chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
-    if (!chars)
-        return NULL;
-
-    dstlen = length;
-    js_InflateStringToBuffer(cx, prefix, constrlen(prefix), chars, &dstlen);
-    offset = dstlen;
-    js_strncpy(chars + offset, JSSTRING_CHARS(ns->uri), urilen);
-    offset += urilen;
-    dstlen = length - offset + 1;
-    js_InflateStringToBuffer(cx, middle, constrlen(middle), chars + offset, &dstlen);
-    offset += dstlen;
-    srcp = JSSTRING_CHARS(src);
-    js_strncpy(chars + offset, srcp, srclen);
-    offset += srclen;
-    dstlen = length - offset + 1;
-    js_InflateStringToBuffer(cx, suffix, constrlen(suffix), chars + offset, &dstlen);
-    chars [offset + dstlen] = 0;
-
-    mark = JS_ARENA_MARK(&cx->tempPool);
-    ts = js_NewBufferTokenStream(cx, chars, length);
-    if (!ts)
-        return NULL;
-    for (fp = cx->fp; fp && !fp->pc; fp = fp->down)
-        continue;
-    if (fp) {
-        op = (JSOp) *fp->pc;
-        if (op == JSOP_TOXML || op == JSOP_TOXMLLIST) {
-            ts->filename = fp->script->filename;
-            lineno = js_PCToLineNumber(cx, fp->script, fp->pc);
-            for (endp = srcp + srclen; srcp < endp; srcp++)
-                if (*srcp == '\n')
-                    --lineno;
-            ts->lineno = lineno;
-        }
-    }
-
-    JS_KEEP_ATOMS(cx->runtime);
-    pn = js_ParseXMLTokenStream(cx, cx->fp->scopeChain, ts, JS_FALSE);
-    xml = NULL;
-    if (pn && XMLArrayInit(cx, &nsarray, 1)) {
-        if (GetXMLSettingFlags(cx, &flags))
-            xml = ParseNodeToXML(cx, pn, &nsarray, flags);
-
-        XMLArrayFinish(cx, &nsarray);
-    }
-    JS_UNKEEP_ATOMS(cx->runtime);
-
-    JS_ARENA_RELEASE(&cx->tempPool, mark);
-    JS_free(cx, chars);
-    return xml;
-
-#undef constrlen
-}
-
-/*
- * Errata in 10.3.1, 10.4.1, and 13.4.4.24 (at least).
- *
- * 10.3.1 Step 6(a) fails to NOTE that implementations that do not enforce
- * the constraint:
- *
- *     for all x belonging to XML:
- *         x.[[InScopeNamespaces]] >= x.[[Parent]].[[InScopeNamespaces]]
- *
- * must union x.[[InScopeNamespaces]] into x[0].[[InScopeNamespaces]] here
- * (in new sub-step 6(a), renumbering the others to (b) and (c)).
- *
- * Same goes for 10.4.1 Step 7(a).
- *
- * In order for XML.prototype.namespaceDeclarations() to work correctly, the
- * default namespace thereby unioned into x[0].[[InScopeNamespaces]] must be
- * flagged as not declared, so that 13.4.4.24 Step 8(a) can exclude all such
- * undeclared namespaces associated with x not belonging to ancestorNS.
- */
-static JSXML *
-OrphanXMLChild(JSContext *cx, JSXML *xml, uint32 i)
-{
-    JSXMLNamespace *ns;
-
-    ns = XMLARRAY_MEMBER(&xml->xml_namespaces, 0, JSXMLNamespace);
-    xml = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-    if (xml->xml_class == JSXML_CLASS_ELEMENT) {
-        if (!XMLARRAY_APPEND(cx, &xml->xml_namespaces, ns))
-            return NULL;
-        ns->declared = JS_FALSE;
-    }
-    xml->parent = NULL;
-    return xml;
-}
-
-static JSObject *
-ToXML(JSContext *cx, jsval v)
-{
-    JSObject *obj;
-    JSXML *xml;
-    JSClass *clasp;
-    JSString *str;
-    uint32 length;
-
-    if (JSVAL_IS_PRIMITIVE(v)) {
-        if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v))
-            goto bad;
-    } else {
-        obj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, obj)) {
-            xml = (JSXML *) JS_GetPrivate(cx, obj);
-            if (xml->xml_class == JSXML_CLASS_LIST) {
-                if (xml->xml_kids.length != 1)
-                    goto bad;
-                xml = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-                JS_ASSERT(xml->xml_class != JSXML_CLASS_LIST);
-                return js_GetXMLObject(cx, xml);
-            }
-            return obj;
-        }
-
-        clasp = OBJ_GET_CLASS(cx, obj);
-        if (clasp->flags & JSCLASS_DOCUMENT_OBSERVER) {
-            JS_ASSERT(0);
-        }
-
-        if (clasp != &js_StringClass &&
-            clasp != &js_NumberClass &&
-            clasp != &js_BooleanClass) {
-            goto bad;
-        }
-    }
-
-    str = js_ValueToString(cx, v);
-    if (!str)
-        return NULL;
-    if (IS_EMPTY(str)) {
-        length = 0;
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-        xml = NULL;
-#endif
-    } else {
-        xml = ParseXMLSource(cx, str);
-        if (!xml)
-            return NULL;
-        length = JSXML_LENGTH(xml);
-    }
-
-    if (length == 0) {
-        obj = js_NewXMLObject(cx, JSXML_CLASS_TEXT);
-        if (!obj)
-            return NULL;
-    } else if (length == 1) {
-        xml = OrphanXMLChild(cx, xml, 0);
-        if (!xml)
-            return NULL;
-        obj = js_GetXMLObject(cx, xml);
-        if (!obj)
-            return NULL;
-    } else {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_SYNTAX_ERROR);
-        return NULL;
-    }
-    return obj;
-
-bad:
-    str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK, v, NULL);
-    if (str) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_XML_CONVERSION,
-                             JS_GetStringBytes(str));
-    }
-    return NULL;
-}
-
-static JSBool
-Append(JSContext *cx, JSXML *list, JSXML *kid);
-
-static JSObject *
-ToXMLList(JSContext *cx, jsval v)
-{
-    JSObject *obj, *listobj;
-    JSXML *xml, *list, *kid;
-    JSClass *clasp;
-    JSString *str;
-    uint32 i, length;
-
-    if (JSVAL_IS_PRIMITIVE(v)) {
-        if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v))
-            goto bad;
-    } else {
-        obj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, obj)) {
-            xml = (JSXML *) JS_GetPrivate(cx, obj);
-            if (xml->xml_class != JSXML_CLASS_LIST) {
-                listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-                if (!listobj)
-                    return NULL;
-                list = (JSXML *) JS_GetPrivate(cx, listobj);
-                if (!Append(cx, list, xml))
-                    return NULL;
-                return listobj;
-            }
-            return obj;
-        }
-
-        clasp = OBJ_GET_CLASS(cx, obj);
-        if (clasp->flags & JSCLASS_DOCUMENT_OBSERVER) {
-            JS_ASSERT(0);
-        }
-
-        if (clasp != &js_StringClass &&
-            clasp != &js_NumberClass &&
-            clasp != &js_BooleanClass) {
-            goto bad;
-        }
-    }
-
-    str = js_ValueToString(cx, v);
-    if (!str)
-        return NULL;
-    if (IS_EMPTY(str)) {
-        xml = NULL;
-        length = 0;
-    } else {
-        if (!JS_EnterLocalRootScope(cx))
-            return NULL;
-        xml = ParseXMLSource(cx, str);
-        if (!xml) {
-            JS_LeaveLocalRootScope(cx);
-            return NULL;
-        }
-        length = JSXML_LENGTH(xml);
-    }
-
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (listobj) {
-        list = (JSXML *) JS_GetPrivate(cx, listobj);
-        for (i = 0; i < length; i++) {
-            kid = OrphanXMLChild(cx, xml, i);
-            if (!kid)
-                return NULL;
-            if (!Append(cx, list, kid)) {
-                listobj = NULL;
-                break;
-            }
-        }
-    }
-
-    if (xml)
-        JS_LeaveLocalRootScope(cx);
-    return listobj;
-
-bad:
-    str = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK, v, NULL);
-    if (str) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_XMLLIST_CONVERSION,
-                             JS_GetStringBytes(str));
-    }
-    return NULL;
-}
-
-/*
- * ECMA-357 10.2.1 Steps 5-7 pulled out as common subroutines of XMLToXMLString
- * and their library-public js_* counterparts.  The guts of MakeXMLCDataString,
- * MakeXMLCommentString, and MakeXMLPIString are further factored into a common
- * MakeXMLSpecialString subroutine.
- *
- * These functions take ownership of sb->base, if sb is non-null, in all cases
- * of success or failure.
- */
-static JSString *
-MakeXMLSpecialString(JSContext *cx, JSStringBuffer *sb,
-                     JSString *str, JSString *str2,
-                     const jschar *prefix, size_t prefixlength,
-                     const jschar *suffix, size_t suffixlength)
-{
-    JSStringBuffer localSB;
-    size_t length, length2, newlength;
-    jschar *bp, *base;
-
-    if (!sb) {
-        sb = &localSB;
-        js_InitStringBuffer(sb);
-    }
-
-    length = JSSTRING_LENGTH(str);
-    length2 = str2 ? JSSTRING_LENGTH(str2) : 0;
-    newlength = STRING_BUFFER_OFFSET(sb) +
-                prefixlength + length + ((length2 != 0) ? 1 + length2 : 0) +
-                suffixlength;
-    bp = base = (jschar *)
-                JS_realloc(cx, sb->base, (newlength + 1) * sizeof(jschar));
-    if (!bp) {
-        js_FinishStringBuffer(sb);
-        return NULL;
-    }
-
-    bp += STRING_BUFFER_OFFSET(sb);
-    js_strncpy(bp, prefix, prefixlength);
-    bp += prefixlength;
-    js_strncpy(bp, JSSTRING_CHARS(str), length);
-    bp += length;
-    if (length2 != 0) {
-        *bp++ = (jschar) ' ';
-        js_strncpy(bp, JSSTRING_CHARS(str2), length2);
-        bp += length2;
-    }
-    js_strncpy(bp, suffix, suffixlength);
-    bp[suffixlength] = 0;
-
-    str = js_NewString(cx, base, newlength, 0);
-    if (!str)
-        free(base);
-    return str;
-}
-
-static JSString *
-MakeXMLCDATAString(JSContext *cx, JSStringBuffer *sb, JSString *str)
-{
-    static const jschar cdata_prefix_ucNstr[] = {'<', '!', '[',
-                                                 'C', 'D', 'A', 'T', 'A',
-                                                 '['};
-    static const jschar cdata_suffix_ucNstr[] = {']', ']', '>'};
-
-    return MakeXMLSpecialString(cx, sb, str, NULL,
-                                cdata_prefix_ucNstr, 9,
-                                cdata_suffix_ucNstr, 3);
-}
-
-static JSString *
-MakeXMLCommentString(JSContext *cx, JSStringBuffer *sb, JSString *str)
-{
-    static const jschar comment_prefix_ucNstr[] = {'<', '!', '-', '-'};
-    static const jschar comment_suffix_ucNstr[] = {'-', '-', '>'};
-
-    return MakeXMLSpecialString(cx, sb, str, NULL,
-                                comment_prefix_ucNstr, 4,
-                                comment_suffix_ucNstr, 3);
-}
-
-static JSString *
-MakeXMLPIString(JSContext *cx, JSStringBuffer *sb, JSString *name,
-                JSString *value)
-{
-    static const jschar pi_prefix_ucNstr[] = {'<', '?'};
-    static const jschar pi_suffix_ucNstr[] = {'?', '>'};
-
-    return MakeXMLSpecialString(cx, sb, name, value,
-                                pi_prefix_ucNstr, 2,
-                                pi_suffix_ucNstr, 2);
-}
-
-/*
- * ECMA-357 10.2.1 17(d-g) pulled out into a common subroutine that appends
- * equals, a double quote, an attribute value, and a closing double quote.
- */
-static void
-AppendAttributeValue(JSContext *cx, JSStringBuffer *sb, JSString *valstr)
-{
-    js_AppendCString(sb, "=\"");
-    valstr = js_EscapeAttributeValue(cx, valstr);
-    if (!valstr) {
-        free(sb->base);
-        sb->base = STRING_BUFFER_ERROR_BASE;
-        return;
-    }
-    js_AppendJSString(sb, valstr);
-    js_AppendChar(sb, '"');
-}
-
-/*
- * ECMA-357 10.2.1.1 EscapeElementValue helper method.
- *
- * This function takes ownership of sb->base, if sb is non-null, in all cases
- * of success or failure.
- */
-static JSString *
-EscapeElementValue(JSContext *cx, JSStringBuffer *sb, JSString *str)
-{
-    size_t length, newlength;
-    const jschar *cp, *start, *end;
-    jschar c;
-
-    length = newlength = JSSTRING_LENGTH(str);
-    for (cp = start = JSSTRING_CHARS(str), end = cp + length; cp < end; cp++) {
-        c = *cp;
-        if (c == '<' || c == '>')
-            newlength += 3;
-        else if (c == '&')
-            newlength += 4;
-    }
-    if ((sb && STRING_BUFFER_OFFSET(sb) != 0) || newlength > length) {
-        JSStringBuffer localSB;
-        if (!sb) {
-            sb = &localSB;
-            js_InitStringBuffer(sb);
-        }
-        if (!sb->grow(sb, STRING_BUFFER_OFFSET(sb) + newlength)) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-        for (cp = start; cp < end; cp++) {
-            c = *cp;
-            if (c == '<')
-                js_AppendCString(sb, js_lt_entity_str);
-            else if (c == '>')
-                js_AppendCString(sb, js_gt_entity_str);
-            else if (c == '&')
-                js_AppendCString(sb, js_amp_entity_str);
-            else
-                js_AppendChar(sb, c);
-        }
-        JS_ASSERT(STRING_BUFFER_OK(sb));
-        str = js_NewString(cx, sb->base, STRING_BUFFER_OFFSET(sb), 0);
-        if (!str)
-            js_FinishStringBuffer(sb);
-    }
-    return str;
-}
-
-/*
- * ECMA-357 10.2.1.2 EscapeAttributeValue helper method.
- * This function takes ownership of sb->base, if sb is non-null, in all cases.
- */
-static JSString *
-EscapeAttributeValue(JSContext *cx, JSStringBuffer *sb, JSString *str)
-{
-    size_t length, newlength;
-    const jschar *cp, *start, *end;
-    jschar c;
-
-    length = newlength = JSSTRING_LENGTH(str);
-    for (cp = start = JSSTRING_CHARS(str), end = cp + length; cp < end; cp++) {
-        c = *cp;
-        if (c == '"')
-            newlength += 5;
-        else if (c == '<')
-            newlength += 3;
-        else if (c == '&' || c == '\n' || c == '\r' || c == '\t')
-            newlength += 4;
-    }
-    if ((sb && STRING_BUFFER_OFFSET(sb) != 0) || newlength > length) {
-        JSStringBuffer localSB;
-        if (!sb) {
-            sb = &localSB;
-            js_InitStringBuffer(sb);
-        }
-        if (!sb->grow(sb, STRING_BUFFER_OFFSET(sb) + newlength)) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-        for (cp = start; cp < end; cp++) {
-            c = *cp;
-            if (c == '"')
-                js_AppendCString(sb, js_quot_entity_str);
-            else if (c == '<')
-                js_AppendCString(sb, js_lt_entity_str);
-            else if (c == '&')
-                js_AppendCString(sb, js_amp_entity_str);
-            else if (c == '\n')
-                js_AppendCString(sb, "&#xA;");
-            else if (c == '\r')
-                js_AppendCString(sb, "&#xD;");
-            else if (c == '\t')
-                js_AppendCString(sb, "&#x9;");
-            else
-                js_AppendChar(sb, c);
-        }
-        JS_ASSERT(STRING_BUFFER_OK(sb));
-        str = js_NewString(cx, sb->base, STRING_BUFFER_OFFSET(sb), 0);
-        if (!str)
-            js_FinishStringBuffer(sb);
-    }
-    return str;
-}
-
-/* 13.3.5.4 [[GetNamespace]]([InScopeNamespaces]) */
-static JSXMLNamespace *
-GetNamespace(JSContext *cx, JSXMLQName *qn, const JSXMLArray *inScopeNSes)
-{
-    JSXMLNamespace *match, *ns;
-    uint32 i, n;
-    jsval argv[2];
-    JSObject *nsobj;
-
-    JS_ASSERT(qn->uri);
-    if (!qn->uri) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_XML_NAMESPACE,
-                             qn->prefix
-                             ? js_ValueToPrintableString(cx,
-                                   STRING_TO_JSVAL(qn->prefix))
-                             : js_type_str[JSTYPE_VOID]);
-        return NULL;
-    }
-
-    /* Look for a matching namespace in inScopeNSes, if provided. */
-    match = NULL;
-    if (inScopeNSes) {
-        for (i = 0, n = inScopeNSes->length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(inScopeNSes, i, JSXMLNamespace);
-
-            /*
-             * Erratum, very tricky, and not specified in ECMA-357 13.3.5.4:
-             * If we preserve prefixes, we must match null qn->prefix against
-             * an empty ns->prefix, in order to avoid generating redundant
-             * prefixed and default namespaces for cases such as:
-             *
-             *   x = <t xmlns="http://foo.com"/>
-             *   print(x.toXMLString());
-             *
-             * Per 10.3.2.1, the namespace attribute in t has an empty string
-             * prefix (*not* a null prefix), per 10.3.2.1 Step 6(h)(i)(1):
-             *
-             *   1. If the [local name] property of a is "xmlns"
-             *      a. Map ns.prefix to the empty string
-             *
-             * But t's name has a null prefix in this implementation, meaning
-             * *undefined*, per 10.3.2.1 Step 6(c)'s NOTE (which refers to
-             * the http://www.w3.org/TR/xml-infoset/ spec, item 2.2.3, without
-             * saying how "no value" maps to an ECMA-357 value -- but it must
-             * map to the *undefined* prefix value).
-             *
-             * Since "" != undefined (or null, in the current implementation)
-             * the ECMA-357 spec will fail to match in [[GetNamespace]] called
-             * on t with argument {} U {(prefix="", uri="http://foo.com")}.
-             * This spec bug leads to ToXMLString results that duplicate the
-             * declared namespace.
-             */
-            if (!js_CompareStrings(ns->uri, qn->uri) &&
-                (ns->prefix == qn->prefix ||
-                 ((ns->prefix && qn->prefix)
-                  ? !js_CompareStrings(ns->prefix, qn->prefix)
-                  : IS_EMPTY(ns->prefix ? ns->prefix : qn->prefix)))) {
-                match = ns;
-                break;
-            }
-        }
-    }
-
-    /* If we didn't match, make a new namespace from qn. */
-    if (!match) {
-        argv[0] = qn->prefix ? STRING_TO_JSVAL(qn->prefix) : JSVAL_VOID;
-        argv[1] = STRING_TO_JSVAL(qn->uri);
-        nsobj = js_ConstructObject(cx, &js_NamespaceClass.base, NULL, NULL,
-                                   2, argv);
-        if (!nsobj)
-            return NULL;
-        match = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-    }
-    return match;
-}
-
-static JSString *
-GeneratePrefix(JSContext *cx, JSString *uri, JSXMLArray *decls)
-{
-    const jschar *cp, *start, *end;
-    size_t length, newlength, offset;
-    uint32 i, n, m, serial;
-    jschar *bp, *dp;
-    JSBool done;
-    JSXMLNamespace *ns;
-    JSString *prefix;
-
-    JS_ASSERT(!IS_EMPTY(uri));
-
-    /*
-     * Try peeling off the last filename suffix or pathname component till
-     * we have a valid XML name.  This heuristic will prefer "xul" given
-     * ".../there.is.only.xul", "xbl" given ".../xbl", and "xbl2" given any
-     * likely URI of the form ".../xbl2/2005".
-     */
-    start = JSSTRING_CHARS(uri);
-    cp = end = start + JSSTRING_LENGTH(uri);
-    while (--cp > start) {
-        if (*cp == '.' || *cp == '/' || *cp == ':') {
-            ++cp;
-            if (IsXMLName(cp, PTRDIFF(end, cp, jschar)))
-                break;
-            end = --cp;
-        }
-    }
-    length = PTRDIFF(end, cp, jschar);
-
-    /*
-     * Now search through decls looking for a collision.  If we collide with
-     * an existing prefix, start tacking on a hyphen and a serial number.
-     */
-    serial = 0;
-    bp = NULL;
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-    newlength = 0;
-#endif
-    do {
-        done = JS_TRUE;
-        for (i = 0, n = decls->length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(decls, i, JSXMLNamespace);
-            if (ns->prefix &&
-                JSSTRING_LENGTH(ns->prefix) == length &&
-                !memcmp(JSSTRING_CHARS(ns->prefix), cp,
-                        length * sizeof(jschar))) {
-                if (!bp) {
-                    newlength = length + 2 + (size_t) log10(n);
-                    bp = (jschar *)
-                         JS_malloc(cx, (newlength + 1) * sizeof(jschar));
-                    if (!bp)
-                        return NULL;
-                    js_strncpy(bp, cp, length);
-                }
-
-                ++serial;
-                JS_ASSERT(serial <= n);
-                dp = bp + length + 2 + (size_t) log10(serial);
-                *dp = 0;
-                for (m = serial; m != 0; m /= 10)
-                    *--dp = (jschar)('0' + m % 10);
-                *--dp = '-';
-                JS_ASSERT(dp == bp + length);
-
-                done = JS_FALSE;
-                break;
-            }
-        }
-    } while (!done);
-
-    if (!bp) {
-        offset = PTRDIFF(cp, start, jschar);
-        prefix = js_NewDependentString(cx, uri, offset, length, 0);
-    } else {
-        prefix = js_NewString(cx, bp, newlength, 0);
-        if (!prefix)
-            JS_free(cx, bp);
-    }
-    return prefix;
-}
-
-static JSBool
-namespace_match(const void *a, const void *b)
-{
-    const JSXMLNamespace *nsa = (const JSXMLNamespace *) a;
-    const JSXMLNamespace *nsb = (const JSXMLNamespace *) b;
-
-    if (nsb->prefix)
-        return nsa->prefix && !js_CompareStrings(nsa->prefix, nsb->prefix);
-    return !js_CompareStrings(nsa->uri, nsb->uri);
-}
-
-/* ECMA-357 10.2.1 and 10.2.2 */
-static JSString *
-XMLToXMLString(JSContext *cx, JSXML *xml, const JSXMLArray *ancestorNSes,
-               uintN indentLevel)
-{
-    JSBool pretty, indentKids;
-    JSStringBuffer sb;
-    JSString *str, *prefix, *kidstr;
-    uint32 i, n;
-    JSXMLArray empty, decls, ancdecls;
-    JSXMLNamespace *ns, *ns2;
-    uintN nextIndentLevel;
-    JSXML *attr, *kid;
-
-    if (!GetBooleanXMLSetting(cx, js_prettyPrinting_str, &pretty))
-        return NULL;
-
-    js_InitStringBuffer(&sb);
-    if (pretty)
-        js_RepeatChar(&sb, ' ', indentLevel);
-    str = NULL;
-
-    switch (xml->xml_class) {
-      case JSXML_CLASS_TEXT:
-        /* Step 4. */
-        if (pretty) {
-            str = ChompXMLWhitespace(cx, xml->xml_value);
-            if (!str)
-                return NULL;
-        } else {
-            str = xml->xml_value;
-        }
-        return EscapeElementValue(cx, &sb, str);
-
-      case JSXML_CLASS_ATTRIBUTE:
-        /* Step 5. */
-        return EscapeAttributeValue(cx, &sb, xml->xml_value);
-
-      case JSXML_CLASS_COMMENT:
-        /* Step 6. */
-        return MakeXMLCommentString(cx, &sb, xml->xml_value);
-
-      case JSXML_CLASS_PROCESSING_INSTRUCTION:
-        /* Step 7. */
-        return MakeXMLPIString(cx, &sb, xml->name->localName, xml->xml_value);
-
-      case JSXML_CLASS_LIST:
-        /* ECMA-357 10.2.2. */
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            if (pretty && i != 0)
-                js_AppendChar(&sb, '\n');
-
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            kidstr = XMLToXMLString(cx, kid, ancestorNSes, indentLevel);
-            if (!kidstr)
-                goto list_out;
-
-            js_AppendJSString(&sb, kidstr);
-        }
-
-        if (!sb.base) {
-            if (!STRING_BUFFER_OK(&sb)) {
-                JS_ReportOutOfMemory(cx);
-                return NULL;
-            }
-            return cx->runtime->emptyString;
-        }
-
-        str = js_NewString(cx, sb.base, STRING_BUFFER_OFFSET(&sb), 0);
-      list_out:
-        if (!str)
-            js_FinishStringBuffer(&sb);
-        return str;
-
-      default:;
-    }
-
-    /* After this point, control must flow through label out: to exit. */
-    if (!JS_EnterLocalRootScope(cx))
-        return NULL;
-
-    /* ECMA-357 10.2.1 step 8 onward: handle ToXMLString on an XML element. */
-    if (!ancestorNSes) {
-        XMLArrayInit(cx, &empty, 0);
-        ancestorNSes = &empty;
-    }
-    XMLArrayInit(cx, &decls, 0);
-    ancdecls.capacity = 0;
-
-    /* Clone in-scope namespaces not in ancestorNSes into decls. */
-    for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-        ns = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-        if (!ns->declared)
-            continue;
-        if (!XMLARRAY_HAS_MEMBER(ancestorNSes, ns, namespace_identity)) {
-            /* NOTE: may want to exclude unused namespaces here. */
-            ns2 = js_NewXMLNamespace(cx, ns->prefix, ns->uri, JS_TRUE);
-            if (!ns2)
-                goto out;
-            if (!XMLARRAY_APPEND(cx, &decls, ns2))
-                goto out;
-        }
-    }
-
-    /*
-     * Union ancestorNSes and decls into ancdecls.  Note that ancdecls does
-     * not own its member references.  In the spec, ancdecls has no name, but
-     * is always written out as (AncestorNamespaces U namespaceDeclarations).
-     */
-    if (!XMLArrayInit(cx, &ancdecls, ancestorNSes->length + decls.length))
-        goto out;
-    for (i = 0, n = ancestorNSes->length; i < n; i++) {
-        ns2 = XMLARRAY_MEMBER(ancestorNSes, i, JSXMLNamespace);
-        JS_ASSERT(!XMLARRAY_HAS_MEMBER(&decls, ns2, namespace_identity));
-        if (!XMLARRAY_APPEND(cx, &ancdecls, ns2))
-            goto out;
-    }
-    for (i = 0, n = decls.length; i < n; i++) {
-        ns2 = XMLARRAY_MEMBER(&decls, i, JSXMLNamespace);
-        JS_ASSERT(!XMLARRAY_HAS_MEMBER(&ancdecls, ns2, namespace_identity));
-        if (!XMLARRAY_APPEND(cx, &ancdecls, ns2))
-            goto out;
-    }
-
-    /* Step 11, except we don't clone ns unless its prefix is undefined. */
-    ns = GetNamespace(cx, xml->name, &ancdecls);
-    if (!ns)
-        goto out;
-
-    /* Step 12 (NULL means *undefined* here), plus the deferred ns cloning. */
-    if (!ns->prefix) {
-        /*
-         * Create a namespace prefix that isn't used by any member of decls.
-         * Assign the new prefix to a copy of ns.  Flag this namespace as if
-         * it were declared, for assertion-testing's sake later below.
-         *
-         * Erratum: if ns->prefix and xml->name are both null (*undefined* in
-         * ECMA-357), we know that xml was named using the default namespace
-         * (proof: see GetNamespace and the Namespace constructor called with
-         * two arguments).  So we ought not generate a new prefix here, when
-         * we can declare ns as the default namespace for xml.
-         *
-         * This helps descendants inherit the namespace instead of redundantly
-         * redeclaring it with generated prefixes in each descendant.
-         */
-        if (!xml->name->prefix) {
-            prefix = cx->runtime->emptyString;
-        } else {
-            prefix = GeneratePrefix(cx, ns->uri, &ancdecls);
-            if (!prefix)
-                goto out;
-        }
-        ns = js_NewXMLNamespace(cx, prefix, ns->uri, JS_TRUE);
-        if (!ns)
-            goto out;
-
-        /*
-         * If the xml->name was unprefixed, we must remove any declared default
-         * namespace from decls before appending ns.  How can you get a default
-         * namespace in decls that doesn't match the one from name?  Apparently
-         * by calling x.setNamespace(ns) where ns has no prefix.  The other way
-         * to fix this is to update x's in-scope namespaces when setNamespace
-         * is called, but that's not specified by ECMA-357.
-         *
-         * Likely Erratum here, depending on whether the lack of update to x's
-         * in-scope namespace in XML.prototype.setNamespace (13.4.4.36) is an
-         * erratum or not.  Note that changing setNamespace to update the list
-         * of in-scope namespaces will change x.namespaceDeclarations().
-         */
-        if (IS_EMPTY(prefix)) {
-            i = XMLArrayFindMember(&decls, ns, namespace_match);
-            if (i != XML_NOT_FOUND)
-                XMLArrayDelete(cx, &decls, i, JS_TRUE);
-        }
-
-        /*
-         * In the spec, ancdecls has no name, but is always written out as
-         * (AncestorNamespaces U namespaceDeclarations).  Since we compute
-         * that union in ancdecls, any time we append a namespace strong
-         * ref to decls, we must also append a weak ref to ancdecls.  Order
-         * matters here: code at label out: releases strong refs in decls.
-         */
-        if (!XMLARRAY_APPEND(cx, &ancdecls, ns) ||
-            !XMLARRAY_APPEND(cx, &decls, ns)) {
-            goto out;
-        }
-    }
-
-    /* Format the element or point-tag into sb. */
-    js_AppendChar(&sb, '<');
-
-    if (ns->prefix && !IS_EMPTY(ns->prefix)) {
-        js_AppendJSString(&sb, ns->prefix);
-        js_AppendChar(&sb, ':');
-    }
-    js_AppendJSString(&sb, xml->name->localName);
-
-    /*
-     * Step 16 makes a union to avoid writing two loops in step 17, to share
-     * common attribute value appending spec-code.  We prefer two loops for
-     * faster code and less data overhead.
-     */
-
-    /* Step 17(c): append XML namespace declarations. */
-    for (i = 0, n = decls.length; i < n; i++) {
-        ns2 = XMLARRAY_MEMBER(&decls, i, JSXMLNamespace);
-        JS_ASSERT(ns2->declared);
-
-        js_AppendCString(&sb, " xmlns");
-
-        /* 17(c)(ii): NULL means *undefined* here. */
-        if (!ns2->prefix) {
-            prefix = GeneratePrefix(cx, ns2->uri, &ancdecls);
-            if (!prefix)
-                goto out;
-            ns2->prefix = prefix;
-        }
-
-        /* 17(c)(iii). */
-        if (!IS_EMPTY(ns2->prefix)) {
-            js_AppendChar(&sb, ':');
-            js_AppendJSString(&sb, ns2->prefix);
-        }
-
-        /* 17(d-g). */
-        AppendAttributeValue(cx, &sb, ns2->uri);
-    }
-
-    /* Step 17(b): append attributes. */
-    for (i = 0, n = xml->xml_attrs.length; i < n; i++) {
-        attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
-        js_AppendChar(&sb, ' ');
-        ns2 = GetNamespace(cx, attr->name, &ancdecls);
-        if (!ns2)
-            goto out;
-
-        /* 17(b)(ii): NULL means *undefined* here. */
-        if (!ns2->prefix) {
-            prefix = GeneratePrefix(cx, ns2->uri, &ancdecls);
-            if (!prefix)
-                goto out;
-
-            /* Again, we avoid copying ns2 until we know it's prefix-less. */
-            ns2 = js_NewXMLNamespace(cx, prefix, ns2->uri, JS_TRUE);
-            if (!ns2)
-                goto out;
-
-            /*
-             * In the spec, ancdecls has no name, but is always written out as
-             * (AncestorNamespaces U namespaceDeclarations).  Since we compute
-             * that union in ancdecls, any time we append a namespace strong
-             * ref to decls, we must also append a weak ref to ancdecls.  Order
-             * matters here: code at label out: releases strong refs in decls.
-             */
-            if (!XMLARRAY_APPEND(cx, &ancdecls, ns2) ||
-                !XMLARRAY_APPEND(cx, &decls, ns2)) {
-                goto out;
-            }
-        }
-
-        /* 17(b)(iii). */
-        if (!IS_EMPTY(ns2->prefix)) {
-            js_AppendJSString(&sb, ns2->prefix);
-            js_AppendChar(&sb, ':');
-        }
-
-        /* 17(b)(iv). */
-        js_AppendJSString(&sb, attr->name->localName);
-
-        /* 17(d-g). */
-        AppendAttributeValue(cx, &sb, attr->xml_value);
-    }
-
-    /* Step 18: handle point tags. */
-    n = xml->xml_kids.length;
-    if (n == 0) {
-        js_AppendCString(&sb, "/>");
-    } else {
-        /* Steps 19 through 25: handle element content, and open the end-tag. */
-        js_AppendChar(&sb, '>');
-        indentKids = n > 1 ||
-                     (n == 1 &&
-                      XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML)->xml_class
-                      != JSXML_CLASS_TEXT);
-
-        if (pretty && indentKids) {
-            if (!GetUint32XMLSetting(cx, js_prettyIndent_str, &i))
-                goto out;
-            nextIndentLevel = indentLevel + i;
-        } else {
-            nextIndentLevel = 0;
-        }
-
-        for (i = 0; i < n; i++) {
-            if (pretty && indentKids)
-                js_AppendChar(&sb, '\n');
-
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            kidstr = XMLToXMLString(cx, kid, &ancdecls, nextIndentLevel);
-            if (!kidstr)
-                goto out;
-
-            js_AppendJSString(&sb, kidstr);
-        }
-
-        if (pretty && indentKids) {
-            js_AppendChar(&sb, '\n');
-            js_RepeatChar(&sb, ' ', indentLevel);
-        }
-        js_AppendCString(&sb, "</");
-
-        /* Step 26. */
-        if (ns->prefix && !IS_EMPTY(ns->prefix)) {
-            js_AppendJSString(&sb, ns->prefix);
-            js_AppendChar(&sb, ':');
-        }
-
-        /* Step 27. */
-        js_AppendJSString(&sb, xml->name->localName);
-        js_AppendChar(&sb, '>');
-    }
-
-    if (!STRING_BUFFER_OK(&sb)) {
-        JS_ReportOutOfMemory(cx);
-        goto out;
-    }
-
-    str = js_NewString(cx, sb.base, STRING_BUFFER_OFFSET(&sb), 0);
-out:
-    JS_LeaveLocalRootScope(cx);
-    if (!str)
-        js_FinishStringBuffer(&sb);
-    XMLArrayFinish(cx, &decls);
-    if (ancdecls.capacity != 0)
-        XMLArrayFinish(cx, &ancdecls);
-    return str;
-}
-
-/* ECMA-357 10.2 */
-static JSString *
-ToXMLString(JSContext *cx, jsval v)
-{
-    JSObject *obj;
-    JSString *str;
-    JSXML *xml;
-
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_XML_CONVERSION,
-                             js_type_str[JSVAL_IS_NULL(v)
-                                         ? JSTYPE_NULL
-                                         : JSTYPE_VOID]);
-        return NULL;
-    }
-
-    if (JSVAL_IS_BOOLEAN(v) || JSVAL_IS_NUMBER(v))
-        return js_ValueToString(cx, v);
-
-    if (JSVAL_IS_STRING(v))
-        return EscapeElementValue(cx, NULL, JSVAL_TO_STRING(v));
-
-    obj = JSVAL_TO_OBJECT(v);
-    if (!OBJECT_IS_XML(cx, obj)) {
-        if (!OBJ_DEFAULT_VALUE(cx, obj, JSTYPE_STRING, &v))
-            return NULL;
-        str = js_ValueToString(cx, v);
-        if (!str)
-            return NULL;
-        return EscapeElementValue(cx, NULL, str);
-    }
-
-    /* Handle non-element cases in this switch, returning from each case. */
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    return XMLToXMLString(cx, xml, NULL, 0);
-}
-
-static JSXMLQName *
-ToAttributeName(JSContext *cx, jsval v)
-{
-    JSString *name, *uri, *prefix;
-    JSObject *obj;
-    JSClass *clasp;
-    JSXMLQName *qn;
-    JSTempValueRooter tvr;
-
-    if (JSVAL_IS_STRING(v)) {
-        name = JSVAL_TO_STRING(v);
-        uri = prefix = cx->runtime->emptyString;
-    } else {
-        if (JSVAL_IS_PRIMITIVE(v)) {
-            name = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK, v, NULL);
-            if (name) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                     JSMSG_BAD_XML_ATTR_NAME,
-                                     JS_GetStringBytes(name));
-            }
-            return NULL;
-        }
-
-        obj = JSVAL_TO_OBJECT(v);
-        clasp = OBJ_GET_CLASS(cx, obj);
-        if (clasp == &js_AttributeNameClass)
-            return (JSXMLQName *) JS_GetPrivate(cx, obj);
-
-        if (clasp == &js_QNameClass.base) {
-            qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-            uri = qn->uri;
-            prefix = qn->prefix;
-            name = qn->localName;
-        } else {
-            if (clasp == &js_AnyNameClass) {
-                name = ATOM_TO_STRING(cx->runtime->atomState.starAtom);
-            } else {
-                name = js_ValueToString(cx, v);
-                if (!name)
-                    return NULL;
-            }
-            uri = prefix = cx->runtime->emptyString;
-        }
-    }
-
-    qn = js_NewXMLQName(cx, uri, prefix, name);
-    if (!qn)
-        return NULL;
-
-    /*
-     * Temp and local root scope APIs take GC-thing pointers tagged as jsvals
-     * and blindly untag.  Since qn is a GC-thing pointer, we can treat it as
-     * an object pointer.
-     */
-    JS_PUSH_SINGLE_TEMP_ROOT(cx, OBJECT_TO_JSVAL(qn), &tvr);
-    obj = js_GetAttributeNameObject(cx, qn);
-    JS_POP_TEMP_ROOT(cx, &tvr);
-    if (!obj)
-        return NULL;
-    return qn;
-}
-
-static JSXMLQName *
-ToXMLName(JSContext *cx, jsval v, jsid *funidp)
-{
-    JSString *name;
-    JSObject *obj;
-    JSClass *clasp;
-    uint32 index;
-    JSXMLQName *qn;
-    JSAtom *atom;
-
-    if (JSVAL_IS_STRING(v)) {
-        name = JSVAL_TO_STRING(v);
-    } else {
-        if (JSVAL_IS_PRIMITIVE(v)) {
-            name = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK, v, NULL);
-            if (name)
-                goto bad;
-            return NULL;
-        }
-
-        obj = JSVAL_TO_OBJECT(v);
-        clasp = OBJ_GET_CLASS(cx, obj);
-        if (clasp == &js_AttributeNameClass || clasp == &js_QNameClass.base)
-            goto out;
-        if (clasp == &js_AnyNameClass) {
-            name = ATOM_TO_STRING(cx->runtime->atomState.starAtom);
-            goto construct;
-        }
-        name = js_ValueToString(cx, v);
-        if (!name)
-            return NULL;
-    }
-
-    /*
-     * ECMA-357 10.6.1 step 1 seems to be incorrect.  The spec says:
-     *
-     * 1. If ToString(ToNumber(P)) == ToString(P), throw a TypeError exception
-     *
-     * First, _P_ should be _s_, to refer to the given string.
-     *
-     * Second, why does ToXMLName applied to the string type throw TypeError
-     * only for numeric literals without any leading or trailing whitespace?
-     *
-     * If the idea is to reject uint32 property names, then the check needs to
-     * be stricter, to exclude hexadecimal and floating point literals.
-     */
-    if (js_IdIsIndex(STRING_TO_JSVAL(name), &index))
-        goto bad;
-
-    if (*JSSTRING_CHARS(name) == '@') {
-        name = js_NewDependentString(cx, name, 1, JSSTRING_LENGTH(name) - 1, 0);
-        if (!name)
-            return NULL;
-        *funidp = 0;
-        return ToAttributeName(cx, STRING_TO_JSVAL(name));
-    }
-
-construct:
-    v = STRING_TO_JSVAL(name);
-    obj = js_ConstructObject(cx, &js_QNameClass.base, NULL, NULL, 1, &v);
-    if (!obj)
-        return NULL;
-
-out:
-    qn = (JSXMLQName *) JS_GetPrivate(cx, obj);
-    atom = cx->runtime->atomState.lazy.functionNamespaceURIAtom;
-    if (atom &&
-        (qn->uri == ATOM_TO_STRING(atom) ||
-         !js_CompareStrings(qn->uri, ATOM_TO_STRING(atom)))) {
-        if (!JS_ValueToId(cx, STRING_TO_JSVAL(qn->localName), funidp))
-            return NULL;
-    } else {
-        *funidp = 0;
-    }
-    return qn;
-
-bad:
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                         JSMSG_BAD_XML_NAME,
-                         js_ValueToPrintableString(cx, STRING_TO_JSVAL(name)));
-    return NULL;
-}
-
-/* ECMA-357 9.1.1.13 XML [[AddInScopeNamespace]]. */
-static JSBool
-AddInScopeNamespace(JSContext *cx, JSXML *xml, JSXMLNamespace *ns)
-{
-    JSXMLNamespace *match, *ns2;
-    uint32 i, n, m;
-
-    if (xml->xml_class != JSXML_CLASS_ELEMENT)
-        return JS_TRUE;
-
-    /* NULL means *undefined* here -- see ECMA-357 9.1.1.13 step 2. */
-    if (!ns->prefix) {
-        match = NULL;
-        for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-            ns2 = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-            if (!js_CompareStrings(ns2->uri, ns->uri)) {
-                match = ns2;
-                break;
-            }
-        }
-        if (!match && !XMLARRAY_ADD_MEMBER(cx, &xml->xml_namespaces, n, ns))
-            return JS_FALSE;
-    } else {
-        if (IS_EMPTY(ns->prefix) && IS_EMPTY(xml->name->uri))
-            return JS_TRUE;
-        match = NULL;
-#ifdef __GNUC__         /* suppress bogus gcc warnings */
-        m = XML_NOT_FOUND;
-#endif
-        for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-            ns2 = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-            if (ns2->prefix && !js_CompareStrings(ns2->prefix, ns->prefix)) {
-                match = ns2;
-                m = i;
-                break;
-            }
-        }
-        if (match && js_CompareStrings(match->uri, ns->uri)) {
-            ns2 = XMLARRAY_DELETE(cx, &xml->xml_namespaces, m, JS_TRUE,
-                                  JSXMLNamespace);
-            JS_ASSERT(ns2 == match);
-            match->prefix = NULL;
-            if (!AddInScopeNamespace(cx, xml, match))
-                return JS_FALSE;
-        }
-        if (!XMLARRAY_APPEND(cx, &xml->xml_namespaces, ns))
-            return JS_FALSE;
-    }
-
-    /* OPTION: enforce that descendants have superset namespaces. */
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.2.1.6 XMLList [[Append]]. */
-static JSBool
-Append(JSContext *cx, JSXML *list, JSXML *xml)
-{
-    uint32 i, j, k, n;
-    JSXML *kid;
-
-    JS_ASSERT(list->xml_class == JSXML_CLASS_LIST);
-    i = list->xml_kids.length;
-    n = 1;
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        list->xml_target = xml->xml_target;
-        list->xml_targetprop = xml->xml_targetprop;
-        n = JSXML_LENGTH(xml);
-        k = i + n;
-        if (!XMLArraySetCapacity(cx, &list->xml_kids, k))
-            return JS_FALSE;
-        for (j = 0; j < n; j++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, j, JSXML);
-            XMLARRAY_SET_MEMBER(&list->xml_kids, i + j, kid);
-        }
-        list->xml_kids.length = k;
-        return JS_TRUE;
-    }
-
-    list->xml_target = xml->parent;
-    if (xml->xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION)
-        list->xml_targetprop = NULL;
-    else
-        list->xml_targetprop = xml->name;
-    if (!XMLARRAY_ADD_MEMBER(cx, &list->xml_kids, i, xml))
-        return JS_FALSE;
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.1.1.7 XML [[DeepCopy]] and 9.2.1.7 XMLList [[DeepCopy]]. */
-static JSXML *
-DeepCopyInLRS(JSContext *cx, JSXML *xml, uintN flags);
-
-static JSXML *
-DeepCopy(JSContext *cx, JSXML *xml, JSObject *obj, uintN flags)
-{
-    JSXML *copy;
-    JSBool ok;
-
-    /* Our caller may not be protecting newborns with a local root scope. */
-    if (!JS_EnterLocalRootScope(cx))
-        return NULL;
-    copy = DeepCopyInLRS(cx, xml, flags);
-    if (copy) {
-        if (obj) {
-            /* Caller provided the object for this copy, hook 'em up. */
-            ok = JS_SetPrivate(cx, obj, copy);
-            if (ok)
-                copy->object = obj;
-        } else {
-            ok = js_GetXMLObject(cx, copy) != NULL;
-        }
-        if (!ok)
-            copy = NULL;
-    }
-    JS_LeaveLocalRootScope(cx);
-    return copy;
-}
-
-/*
- * (i) We must be in a local root scope (InLRS).
- * (ii) parent must have a rooted object.
- * (iii) from's owning object must be locked if not thread-local.
- */
-static JSBool
-DeepCopySetInLRS(JSContext *cx, JSXMLArray *from, JSXMLArray *to, JSXML *parent,
-                 uintN flags)
-{
-    uint32 i, j, n;
-    JSXML *kid, *kid2;
-    JSString *str;
-
-    JS_ASSERT(cx->localRootStack);
-
-    n = from->length;
-    if (!XMLArraySetCapacity(cx, to, n))
-        return JS_FALSE;
-
-    for (i = j = 0; i < n; i++) {
-        kid = XMLARRAY_MEMBER(from, i, JSXML);
-        if ((flags & XSF_IGNORE_COMMENTS) &&
-            kid->xml_class == JSXML_CLASS_COMMENT) {
-            continue;
-        }
-        if ((flags & XSF_IGNORE_PROCESSING_INSTRUCTIONS) &&
-            kid->xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION) {
-            continue;
-        }
-        if ((flags & XSF_IGNORE_WHITESPACE) &&
-            (kid->xml_flags & XMLF_WHITESPACE_TEXT)) {
-            continue;
-        }
-        kid2 = DeepCopyInLRS(cx, kid, flags);
-        if (!kid2) {
-            to->length = j;
-            return JS_FALSE;
-        }
-
-        if ((flags & XSF_IGNORE_WHITESPACE) &&
-            n > 1 && kid2->xml_class == JSXML_CLASS_TEXT) {
-            str = ChompXMLWhitespace(cx, kid2->xml_value);
-            if (!str) {
-                to->length = j;
-                return JS_FALSE;
-            }
-            kid2->xml_value = str;
-        }
-
-        XMLARRAY_SET_MEMBER(to, j++, kid2);
-        if (parent->xml_class != JSXML_CLASS_LIST)
-            kid2->parent = parent;
-    }
-
-    to->length = j;
-    if (j < n)
-        XMLArrayTrim(to);
-    return JS_TRUE;
-}
-
-static JSXML *
-DeepCopyInLRS(JSContext *cx, JSXML *xml, uintN flags)
-{
-    JSXML *copy;
-    JSXMLQName *qn;
-    JSBool ok;
-    uint32 i, n;
-    JSXMLNamespace *ns, *ns2;
-
-    /* Our caller must be protecting newborn objects. */
-    JS_ASSERT(cx->localRootStack);
-
-    copy = js_NewXML(cx, xml->xml_class);
-    if (!copy)
-        return NULL;
-    qn = xml->name;
-    if (qn) {
-        qn = js_NewXMLQName(cx, qn->uri, qn->prefix, qn->localName);
-        if (!qn) {
-            ok = JS_FALSE;
-            goto out;
-        }
-    }
-    copy->name = qn;
-    copy->xml_flags = xml->xml_flags;
-
-    if (JSXML_HAS_VALUE(xml)) {
-        copy->xml_value = xml->xml_value;
-        ok = JS_TRUE;
-    } else {
-        ok = DeepCopySetInLRS(cx, &xml->xml_kids, &copy->xml_kids, copy, flags);
-        if (!ok)
-            goto out;
-
-        if (xml->xml_class == JSXML_CLASS_LIST) {
-            copy->xml_target = xml->xml_target;
-            copy->xml_targetprop = xml->xml_targetprop;
-        } else {
-            n = xml->xml_namespaces.length;
-            ok = XMLArraySetCapacity(cx, &copy->xml_namespaces, n);
-            if (!ok)
-                goto out;
-            for (i = 0; i < n; i++) {
-                ns = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-                ns2 = js_NewXMLNamespace(cx, ns->prefix, ns->uri, ns->declared);
-                if (!ns2) {
-                    copy->xml_namespaces.length = i;
-                    ok = JS_FALSE;
-                    goto out;
-                }
-                XMLARRAY_SET_MEMBER(&copy->xml_namespaces, i, ns2);
-            }
-            copy->xml_namespaces.length = n;
-
-            ok = DeepCopySetInLRS(cx, &xml->xml_attrs, &copy->xml_attrs, copy,
-                                  0);
-            if (!ok)
-                goto out;
-        }
-    }
-
-out:
-    if (!ok)
-        return NULL;
-    return copy;
-}
-
-static void
-ReportBadXMLName(JSContext *cx, jsval id)
-{
-    JSString *name;
-
-    name = js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK, id, NULL);
-    if (name) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_BAD_XML_NAME,
-                             JS_GetStringBytes(name));
-    }
-}
-
-/* ECMA-357 9.1.1.4 XML [[DeleteByIndex]]. */
-static JSBool
-DeleteByIndex(JSContext *cx, JSXML *xml, jsval id, jsval *vp)
-{
-    uint32 index;
-    JSXML *kid;
-
-    if (!js_IdIsIndex(id, &index)) {
-        ReportBadXMLName(cx, id);
-        return JS_FALSE;
-    }
-
-    if (JSXML_HAS_KIDS(xml) && index < xml->xml_kids.length) {
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-        kid->parent = NULL;
-        XMLArrayDelete(cx, &xml->xml_kids, index, JS_TRUE);
-    }
-
-    *vp = JSVAL_TRUE;
-    return JS_TRUE;
-}
-
-typedef JSBool (*JSXMLNameMatcher)(JSXMLQName *nameqn, JSXML *xml);
-
-static JSBool
-MatchAttrName(JSXMLQName *nameqn, JSXML *attr)
-{
-    JSXMLQName *attrqn = attr->name;
-
-    return (IS_STAR(nameqn->localName) ||
-            !js_CompareStrings(attrqn->localName, nameqn->localName)) &&
-           (!nameqn->uri ||
-            !js_CompareStrings(attrqn->uri, nameqn->uri));
-}
-
-static JSBool
-MatchElemName(JSXMLQName *nameqn, JSXML *elem)
-{
-    return (IS_STAR(nameqn->localName) ||
-            (elem->xml_class == JSXML_CLASS_ELEMENT &&
-             !js_CompareStrings(elem->name->localName, nameqn->localName))) &&
-           (!nameqn->uri ||
-            (elem->xml_class == JSXML_CLASS_ELEMENT &&
-             !js_CompareStrings(elem->name->uri, nameqn->uri)));
-}
-
-/* ECMA-357 9.1.1.8 XML [[Descendants]] and 9.2.1.8 XMLList [[Descendants]]. */
-static JSBool
-DescendantsHelper(JSContext *cx, JSXML *xml, JSXMLQName *nameqn, JSXML *list)
-{
-    uint32 i, n;
-    JSXML *attr, *kid;
-
-    if (xml->xml_class == JSXML_CLASS_ELEMENT &&
-        OBJ_GET_CLASS(cx, nameqn->object) == &js_AttributeNameClass) {
-        for (i = 0, n = xml->xml_attrs.length; i < n; i++) {
-            attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
-            if (MatchAttrName(nameqn, attr)) {
-                if (!Append(cx, list, attr))
-                    return JS_FALSE;
-            }
-        }
-    }
-
-    for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-        if (OBJ_GET_CLASS(cx, nameqn->object) != &js_AttributeNameClass &&
-            MatchElemName(nameqn, kid)) {
-            if (!Append(cx, list, kid))
-                return JS_FALSE;
-        }
-        if (!DescendantsHelper(cx, kid, nameqn, list))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSXML *
-Descendants(JSContext *cx, JSXML *xml, jsval id)
-{
-    jsid funid;
-    JSXMLQName *nameqn;
-    JSObject *listobj;
-    JSXML *list, *kid;
-    uint32 i, n;
-    JSBool ok;
-
-    nameqn = ToXMLName(cx, id, &funid);
-    if (!nameqn)
-        return NULL;
-
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj)
-        return NULL;
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    if (funid)
-        return list;
-
-    /*
-     * Protect nameqn's object and strings from GC by linking list to it
-     * temporarily.  The cx->newborn[GCX_OBJECT] GC root protects listobj,
-     * which protects list.  Any other object allocations occuring beneath
-     * DescendantsHelper use local roots.
-     */
-    list->name = nameqn;
-    if (!JS_EnterLocalRootScope(cx))
-        return NULL;
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        ok = JS_TRUE;
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                ok = DescendantsHelper(cx, kid, nameqn, list);
-                if (!ok)
-                    break;
-            }
-        }
-    } else {
-        ok = DescendantsHelper(cx, xml, nameqn, list);
-    }
-    JS_LeaveLocalRootScope(cx);
-    if (!ok)
-        return NULL;
-    list->name = NULL;
-    return list;
-}
-
-/* Recursive (JSXML *) parameterized version of Equals. */
-static JSBool
-XMLEquals(JSContext *cx, JSXML *xml, JSXML *vxml, JSBool *bp)
-{
-    JSXMLQName *qn, *vqn;
-    uint32 i, j, n;
-    JSXML **xvec, **vvec, *attr, *vattr;
-    JSObject *xobj, *vobj;
-
-retry:
-    if (xml->xml_class != vxml->xml_class) {
-        if (xml->xml_class == JSXML_CLASS_LIST && xml->xml_kids.length == 1) {
-            xml = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-            goto retry;
-        }
-        if (vxml->xml_class == JSXML_CLASS_LIST && vxml->xml_kids.length == 1) {
-            vxml = XMLARRAY_MEMBER(&vxml->xml_kids, 0, JSXML);
-            goto retry;
-        }
-        *bp = JS_FALSE;
-        return JS_TRUE;
-    }
-
-    qn = xml->name;
-    vqn = vxml->name;
-    if (qn) {
-        *bp = vqn &&
-              !js_CompareStrings(qn->localName, vqn->localName) &&
-              !js_CompareStrings(qn->uri, vqn->uri);
-    } else {
-        *bp = vqn == NULL;
-    }
-    if (!*bp)
-        return JS_TRUE;
-
-    if (JSXML_HAS_VALUE(xml)) {
-        *bp = !js_CompareStrings(xml->xml_value, vxml->xml_value);
-    } else if ((n = xml->xml_kids.length) != vxml->xml_kids.length) {
-        *bp = JS_FALSE;
-    } else {
-        xvec = (JSXML **) xml->xml_kids.vector;
-        vvec = (JSXML **) vxml->xml_kids.vector;
-        for (i = 0; i < n; i++) {
-            xobj = js_GetXMLObject(cx, xvec[i]);
-            vobj = js_GetXMLObject(cx, vvec[i]);
-            if (!xobj || !vobj)
-                return JS_FALSE;
-            if (!js_XMLObjectOps.equality(cx, xobj, OBJECT_TO_JSVAL(vobj), bp))
-                return JS_FALSE;
-            if (!*bp)
-                break;
-        }
-
-        if (*bp && xml->xml_class == JSXML_CLASS_ELEMENT) {
-            n = xml->xml_attrs.length;
-            if (n != vxml->xml_attrs.length)
-                *bp = JS_FALSE;
-            for (i = 0; i < n; i++) {
-                attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
-                j = XMLARRAY_FIND_MEMBER(&vxml->xml_attrs, attr, attr_identity);
-                if (j == XML_NOT_FOUND) {
-                    *bp = JS_FALSE;
-                    break;
-                }
-                vattr = XMLARRAY_MEMBER(&vxml->xml_attrs, j, JSXML);
-                *bp = !js_CompareStrings(attr->xml_value, vattr->xml_value);
-                if (!*bp)
-                    break;
-            }
-        }
-    }
-
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.1.1.9 XML [[Equals]] and 9.2.1.9 XMLList [[Equals]]. */
-static JSBool
-Equals(JSContext *cx, JSXML *xml, jsval v, JSBool *bp)
-{
-    JSObject *vobj;
-    JSXML *vxml;
-
-    if (JSVAL_IS_PRIMITIVE(v)) {
-        *bp = JS_FALSE;
-        if (xml->xml_class == JSXML_CLASS_LIST) {
-            if (xml->xml_kids.length == 1) {
-                vxml = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-                vobj = js_GetXMLObject(cx, vxml);
-                if (!vobj)
-                    return JS_FALSE;
-                return js_XMLObjectOps.equality(cx, vobj, v, bp);
-            }
-            if (JSVAL_IS_VOID(v) && xml->xml_kids.length == 0)
-                *bp = JS_TRUE;
-        }
-    } else {
-        vobj = JSVAL_TO_OBJECT(v);
-        if (!OBJECT_IS_XML(cx, vobj)) {
-            *bp = JS_FALSE;
-        } else {
-            vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-            if (!XMLEquals(cx, xml, vxml, bp))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-Replace(JSContext *cx, JSXML *xml, jsval id, jsval v);
-
-static JSBool
-CheckCycle(JSContext *cx, JSXML *xml, JSXML *kid)
-{
-    do {
-        if (xml == kid) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                 JSMSG_CYCLIC_VALUE, js_XML_str);
-            return JS_FALSE;
-        }
-    } while ((xml = xml->parent) != NULL);
-
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.1.1.11 XML [[Insert]]. */
-static JSBool
-Insert(JSContext *cx, JSXML *xml, jsval id, jsval v)
-{
-    uint32 i, j, n;
-    JSXML *vxml, *kid;
-    JSObject *vobj;
-
-    if (!JSXML_HAS_KIDS(xml))
-        return JS_TRUE;
-
-    if (!js_IdIsIndex(id, &i)) {
-        ReportBadXMLName(cx, id);
-        return JS_FALSE;
-    }
-
-    n = 1;
-    vxml = NULL;
-    if (!JSVAL_IS_PRIMITIVE(v)) {
-        vobj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, vobj)) {
-            vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-            if (!CheckCycle(cx, xml, vxml))
-                return JS_FALSE;
-            if (vxml->xml_class == JSXML_CLASS_LIST)
-                n = vxml->xml_kids.length;
-        }
-    }
-
-    if (n == 0)
-        return JS_TRUE;
-
-    if (!XMLArrayInsert(cx, &xml->xml_kids, i, n))
-        return JS_FALSE;
-
-    if (vxml && vxml->xml_class == JSXML_CLASS_LIST) {
-        for (j = 0; j < n; j++) {
-            kid = XMLARRAY_MEMBER(&vxml->xml_kids, j, JSXML);
-            kid->parent = xml;
-            XMLARRAY_SET_MEMBER(&xml->xml_kids, i + j, kid);
-
-            /* OPTION: enforce that descendants have superset namespaces. */
-        }
-    } else {
-        /*
-         * Tricky: ECMA-357 9.1.1.11 step 7 specifies:
-         *
-         *      For j = x.[[Length]]-1 downto i,
-         *              rename property ToString(j) of x to ToString(j + n)
-         *
-         * That loop, coded above, simply copies pointers up in xml->xml_kids.
-         * We don't need to change property "names", nor do we need to null
-         * pointers in the vxml->xml_class == JSXML_CLASS_LIST case, above.
-         *
-         * But here, before calling Replace, we must help Replace discern that
-         * the "properties" have been "renamed" by nulling the n xml->xml_kids
-         * slots that have been evacuated to make way for vxml.
-         */
-        for (j = 0; j < n; j++)
-            xml->xml_kids.vector[i + j] = NULL;
-        if (!Replace(cx, xml, id, v))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-IndexToIdVal(JSContext *cx, uint32 index, jsval *idvp)
-{
-    JSString *str;
-
-    if (index <= JSVAL_INT_MAX) {
-        *idvp = INT_TO_JSVAL(index);
-    } else {
-        str = js_NumberToString(cx, (jsdouble) index);
-        if (!str)
-            return JS_FALSE;
-        *idvp = STRING_TO_JSVAL(str);
-    }
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.1.1.12 XML [[Replace]]. */
-static JSBool
-Replace(JSContext *cx, JSXML *xml, jsval id, jsval v)
-{
-    uint32 i, n;
-    JSXML *vxml, *kid;
-    JSObject *vobj;
-    jsval junk;
-    JSString *str;
-
-    if (!JSXML_HAS_KIDS(xml))
-        return JS_TRUE;
-
-    if (!js_IdIsIndex(id, &i)) {
-        ReportBadXMLName(cx, id);
-        return JS_FALSE;
-    }
-
-    /*
-     * 9.1.1.12
-     * [[Replace]] handles _i >= x.[[Length]]_ by incrementing _x.[[Length]_.
-     * It should therefore constrain callers to pass in _i <= x.[[Length]]_.
-     */
-    n = xml->xml_kids.length;
-    JS_ASSERT(i <= n);
-    if (i >= n) {
-        if (!IndexToIdVal(cx, n, &id))
-            return JS_FALSE;
-        i = n;
-    }
-
-    vxml = NULL;
-    if (!JSVAL_IS_PRIMITIVE(v)) {
-        vobj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, vobj))
-            vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-    }
-
-    switch (vxml ? vxml->xml_class : JSXML_CLASS_LIMIT) {
-      case JSXML_CLASS_ELEMENT:
-        /* OPTION: enforce that descendants have superset namespaces. */
-        if (!CheckCycle(cx, xml, vxml))
-            return JS_FALSE;
-      case JSXML_CLASS_COMMENT:
-      case JSXML_CLASS_PROCESSING_INSTRUCTION:
-      case JSXML_CLASS_TEXT:
-        goto do_replace;
-
-      case JSXML_CLASS_LIST:
-        if (i < n && !DeleteByIndex(cx, xml, id, &junk))
-            return JS_FALSE;
-        if (!Insert(cx, xml, id, v))
-            return JS_FALSE;
-        break;
-
-      default:
-        str = js_ValueToString(cx, v);
-        if (!str)
-            return JS_FALSE;
-
-        vxml = js_NewXML(cx, JSXML_CLASS_TEXT);
-        if (!vxml)
-            return JS_FALSE;
-        vxml->xml_value = str;
-
-      do_replace:
-        vxml->parent = xml;
-        if (i < n) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid)
-                kid->parent = NULL;
-        }
-        if (!XMLARRAY_ADD_MEMBER(cx, &xml->xml_kids, i, vxml))
-            return JS_FALSE;
-        break;
-    }
-
-    return JS_TRUE;
-}
-
-/* Forward declared -- its implementation uses other statics that call it. */
-static JSBool
-ResolveValue(JSContext *cx, JSXML *list, JSXML **result);
-
-/* ECMA-357 9.1.1.3 XML [[Delete]], 9.2.1.3 XML [[Delete]]. */
-static JSBool
-DeleteProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSXML *xml, *kid, *parent;
-    JSBool isIndex;
-    JSXMLArray *array;
-    uint32 length, index, deleteCount;
-    JSXMLQName *nameqn;
-    jsid funid;
-    JSObject *nameobj, *kidobj;
-    JSXMLNameMatcher matcher;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    isIndex = js_IdIsIndex(id, &index);
-    if (JSXML_HAS_KIDS(xml)) {
-        array = &xml->xml_kids;
-        length = array->length;
-    } else {
-        array = NULL;
-        length = 0;
-    }
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* ECMA-357 9.2.1.3. */
-        if (isIndex && index < length) {
-            kid = XMLARRAY_MEMBER(array, index, JSXML);
-            parent = kid->parent;
-            if (parent) {
-                JS_ASSERT(parent != xml);
-                JS_ASSERT(JSXML_HAS_KIDS(parent));
-
-                if (kid->xml_class == JSXML_CLASS_ATTRIBUTE) {
-                    nameqn = kid->name;
-                    nameobj = js_GetAttributeNameObject(cx, nameqn);
-                    if (!nameobj || !js_GetXMLObject(cx, parent))
-                        return JS_FALSE;
-
-                    id = OBJECT_TO_JSVAL(nameobj);
-                    if (!DeleteProperty(cx, parent->object, id, vp))
-                        return JS_FALSE;
-                } else {
-                    index = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL);
-                    JS_ASSERT(index != XML_NOT_FOUND);
-                    if (!IndexToIdVal(cx, index, &id))
-                        return JS_FALSE;
-                    if (!DeleteByIndex(cx, parent, id, vp))
-                        return JS_FALSE;
-                }
-            }
-
-            XMLArrayDelete(cx, array, index, JS_TRUE);
-        } else {
-            for (index = 0; index < length; index++) {
-                kid = XMLARRAY_MEMBER(array, index, JSXML);
-                if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                    kidobj = js_GetXMLObject(cx, kid);
-                    if (!kidobj || !DeleteProperty(cx, kidobj, id, vp))
-                        return JS_FALSE;
-                }
-            }
-        }
-    } else {
-        /* ECMA-357 9.1.1.3. */
-        if (isIndex) {
-            /* See NOTE in spec: this variation is reserved for future use. */
-            ReportBadXMLName(cx, id);
-            return JS_FALSE;
-        }
-
-        nameqn = ToXMLName(cx, id, &funid);
-        if (!nameqn)
-            return JS_FALSE;
-        if (funid)
-            goto out;
-        nameobj = nameqn->object;
-
-        if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
-            if (xml->xml_class != JSXML_CLASS_ELEMENT)
-                goto out;
-            array = &xml->xml_attrs;
-            length = array->length;
-            matcher = MatchAttrName;
-        } else {
-            matcher = MatchElemName;
-        }
-        if (length != 0) {
-            deleteCount = 0;
-            for (index = 0; index < length; index++) {
-                kid = XMLARRAY_MEMBER(array, index, JSXML);
-                if (matcher(nameqn, kid)) {
-                    kid->parent = NULL;
-                    XMLArrayDelete(cx, array, index, JS_FALSE);
-                    ++deleteCount;
-                } else if (deleteCount != 0) {
-                    XMLARRAY_SET_MEMBER(array,
-                                        index - deleteCount,
-                                        array->vector[index]);
-                }
-            }
-            array->length -= deleteCount;
-        }
-    }
-
-out:
-    *vp = JSVAL_TRUE;
-    return JS_TRUE;
-}
-
-/*
- * Class compatibility mask flag bits stored in xml_methods[i].extra.  If XML
- * and XMLList are unified (an incompatible change to ECMA-357), then we don't
- * need any of this.
- */
-#define XML_MASK                0x1
-#define XMLLIST_MASK            0x2
-#define GENERIC_MASK            (XML_MASK | XMLLIST_MASK)
-#define CLASS_TO_MASK(c)        (1 + ((c) == JSXML_CLASS_LIST))
-
-static JSBool
-GetFunction(JSContext *cx, JSObject *obj, JSXML *xml, jsid id, jsval *vp)
-{
-    jsval fval;
-    JSFunction *fun;
-
-    do {
-        /* XXXbe really want a separate scope for function::*. */
-        if (!js_GetProperty(cx, obj, id, &fval))
-            return JS_FALSE;
-        if (JSVAL_IS_FUNCTION(cx, fval)) {
-            if (xml && OBJECT_IS_XML(cx, obj)) {
-                fun = (JSFunction *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(fval));
-                if (fun->spare &&
-                    (fun->spare & CLASS_TO_MASK(xml->xml_class)) == 0) {
-                    /* XML method called on XMLList or vice versa. */
-                    fval = JSVAL_VOID;
-                }
-            }
-            break;
-        }
-    } while ((obj = OBJ_GET_PROTO(cx, obj)) != NULL);
-    *vp = fval;
-    return JS_TRUE;
-}
-
-static JSBool
-SyncInScopeNamespaces(JSContext *cx, JSXML *xml)
-{
-    JSXMLArray *nsarray;
-    uint32 i, n;
-    JSXMLNamespace *ns;
-
-    nsarray = &xml->xml_namespaces;
-    while ((xml = xml->parent) != NULL) {
-        for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-            if (!XMLARRAY_HAS_MEMBER(nsarray, ns, namespace_identity)) {
-                if (!XMLARRAY_APPEND(cx, nsarray, ns))
-                    return JS_FALSE;
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-/* ECMA-357 9.1.1.1 XML [[Get]] and 9.2.1.1 XMLList [[Get]]. */
-static JSBool
-GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSXML *xml, *list, *kid;
-    uint32 index, i, n;
-    JSObject *kidobj, *listobj, *nameobj;
-    JSXMLQName *nameqn;
-    jsid funid;
-    JSBool ok;
-    jsval kidval;
-    JSXMLArray *array;
-    JSXMLNameMatcher matcher;
-
-    xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, NULL);
-    if (!xml)
-        return JS_TRUE;
-
-retry:
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* ECMA-357 9.2.1.1 starts here. */
-        if (js_IdIsIndex(id, &index)) {
-            /*
-             * Erratum: 9.2 is not completely clear that indexed properties
-             * correspond to kids, but that's what it seems to say, and it's
-             * what any sane user would want.
-             */
-            if (index < xml->xml_kids.length) {
-                kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-                kidobj = js_GetXMLObject(cx, kid);
-                if (!kidobj)
-                    return JS_FALSE;
-
-                *vp = OBJECT_TO_JSVAL(kidobj);
-            } else {
-                *vp = JSVAL_VOID;
-            }
-            return JS_TRUE;
-        }
-
-        nameqn = ToXMLName(cx, id, &funid);
-        if (!nameqn)
-            return JS_FALSE;
-        if (funid)
-            return GetFunction(cx, obj, xml, funid, vp);
-
-        /*
-         * Recursion through GetProperty may allocate more list objects, so
-         * we make use of local root scopes here.  Each new allocation will
-         * push the newborn onto the local root stack.
-         */
-        ok = JS_EnterLocalRootScope(cx);
-        if (!ok)
-            return JS_FALSE;
-
-        /*
-         * NB: nameqn is already protected from GC by cx->newborn[GCX_OBJECT]
-         * until listobj is created.  After that, a local root keeps listobj
-         * alive, and listobj's private keeps nameqn alive via targetprop.
-         */
-        listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-        if (!listobj) {
-            ok = JS_FALSE;
-        } else {
-            list = (JSXML *) JS_GetPrivate(cx, listobj);
-            list->xml_target = xml;
-            list->xml_targetprop = nameqn;
-
-            for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-                kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-                if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                    kidobj = js_GetXMLObject(cx, kid);
-                    if (!kidobj) {
-                        ok = JS_FALSE;
-                        break;
-                    }
-                    ok = GetProperty(cx, kidobj, id, &kidval);
-                    if (!ok)
-                        break;
-                    kidobj = JSVAL_TO_OBJECT(kidval);
-                    kid = (JSXML *) JS_GetPrivate(cx, kidobj);
-                    if (JSXML_LENGTH(kid) > 0) {
-                        ok = Append(cx, list, kid);
-                        if (!ok)
-                            break;
-                    }
-                }
-            }
-        }
-    } else {
-        /* ECMA-357 9.1.1.1 starts here. */
-        if (js_IdIsIndex(id, &index)) {
-            obj = ToXMLList(cx, OBJECT_TO_JSVAL(obj));
-            if (!obj)
-                return JS_FALSE;
-            xml = (JSXML *) JS_GetPrivate(cx, obj);
-            goto retry;
-        }
-
-        nameqn = ToXMLName(cx, id, &funid);
-        if (!nameqn)
-            return JS_FALSE;
-        if (funid)
-            return GetFunction(cx, obj, xml, funid, vp);
-        nameobj = nameqn->object;
-
-        /*
-         * Recursion through GetProperty may allocate more list objects, so
-         * we make use of local root scopes here.  Each new allocation will
-         * push the newborn onto the local root stack.
-         */
-        ok = JS_EnterLocalRootScope(cx);
-        if (!ok)
-            return JS_FALSE;
-
-        listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-        if (!listobj) {
-            ok = JS_FALSE;
-        } else {
-            list = (JSXML *) JS_GetPrivate(cx, listobj);
-            list->xml_target = xml;
-            list->xml_targetprop = nameqn;
-
-            if (JSXML_HAS_KIDS(xml)) {
-                if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
-                    array = &xml->xml_attrs;
-                    matcher = MatchAttrName;
-                } else {
-                    array = &xml->xml_kids;
-                    matcher = MatchElemName;
-                }
-                for (i = 0, n = array->length; i < n; i++) {
-                    kid = XMLARRAY_MEMBER(array, i, JSXML);
-                    if (matcher(nameqn, kid)) {
-                        if (array == &xml->xml_kids &&
-                            kid->xml_class == JSXML_CLASS_ELEMENT) {
-                            ok = SyncInScopeNamespaces(cx, kid);
-                            if (!ok)
-                                break;
-                        }
-                        ok = Append(cx, list, kid);
-                        if (!ok)
-                            break;
-                    }
-                }
-            }
-        }
-    }
-
-    /* Common tail code for list and non-list cases. */
-    JS_LeaveLocalRootScope(cx);
-    if (!ok)
-        return JS_FALSE;
-
-    *vp = OBJECT_TO_JSVAL(listobj);
-    return JS_TRUE;
-}
-
-static JSXML *
-CopyOnWrite(JSContext *cx, JSXML *xml, JSObject *obj)
-{
-    JS_ASSERT(xml->object != obj);
-
-    xml = DeepCopy(cx, xml, obj, 0);
-    if (!xml)
-        return NULL;
-
-    JS_ASSERT(xml->object == obj);
-    return xml;
-}
-
-#define CHECK_COPY_ON_WRITE(cx,xml,obj)                                       \
-    (xml->object == obj ? xml : CopyOnWrite(cx, xml, obj))
-
-static JSString *
-KidToString(JSContext *cx, JSXML *xml, uint32 index)
-{
-    JSXML *kid;
-    JSObject *kidobj;
-
-    kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-    kidobj = js_GetXMLObject(cx, kid);
-    if (!kidobj)
-        return NULL;
-    return js_ValueToString(cx, OBJECT_TO_JSVAL(kidobj));
-}
-
-/* ECMA-357 9.1.1.2 XML [[Put]] and 9.2.1.2 XMLList [[Put]]. */
-static JSBool
-PutProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSBool ok, primitiveAssign;
-    JSXML *xml, *vxml, *rxml, *kid, *attr, *parent, *copy, *kid2, *match;
-    JSObject *vobj, *nameobj, *attrobj, *parentobj, *kidobj, *copyobj;
-    JSXMLQName *targetprop, *nameqn, *attrqn;
-    uint32 index, i, j, k, n, q;
-    jsval attrval, nsval, junk;
-    jsid funid;
-    JSString *left, *right, *space;
-    JSXMLNamespace *ns;
-
-    xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, NULL);
-    if (!xml)
-        return JS_TRUE;
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    /* Precompute vxml for 9.2.1.2 2(c)(vii)(2-3) and 2(d) and 9.1.1.2 1. */
-    vxml = NULL;
-    if (!JSVAL_IS_PRIMITIVE(*vp)) {
-        vobj = JSVAL_TO_OBJECT(*vp);
-        if (OBJECT_IS_XML(cx, vobj))
-            vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-    }
-
-    /* Control flow after here must exit via label out. */
-    ok = JS_EnterLocalRootScope(cx);
-    if (!ok)
-        return JS_FALSE;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* ECMA-357 9.2.1.2. */
-        if (js_IdIsIndex(id, &index)) {
-            /* Step 1 sets i to the property index. */
-            i = index;
-
-            /* 2(a-b). */
-            if (xml->xml_target) {
-                ok = ResolveValue(cx, xml->xml_target, &rxml);
-                if (!ok)
-                    goto out;
-                if (!rxml)
-                    goto out;
-                JS_ASSERT(rxml->object);
-            } else {
-                rxml = NULL;
-            }
-
-            /* 2(c). */
-            if (index >= xml->xml_kids.length) {
-                /* 2(c)(i). */
-                if (rxml) {
-                    if (rxml->xml_class == JSXML_CLASS_LIST) {
-                        if (rxml->xml_kids.length != 1)
-                            goto out;
-                        rxml = XMLARRAY_MEMBER(&rxml->xml_kids, 0, JSXML);
-                        ok = js_GetXMLObject(cx, rxml) != NULL;
-                        if (!ok)
-                            goto out;
-                    }
-
-                    /*
-                     * Erratum: ECMA-357 9.2.1.2 step 2(c)(ii) sets
-                     * _y.[[Parent]] = r_ where _r_ is the result of
-                     * [[ResolveValue]] called on _x.[[TargetObject]] in
-                     * 2(a)(i).  This can result in text parenting text:
-                     *
-                     *    var MYXML = new XML();
-                     *    MYXML.appendChild(new XML("<TEAM>Giants</TEAM>"));
-                     *
-                     * (testcase from Werner Sharp <wsharp@macromedia.com>).
-                     *
-                     * To match insertChildAfter, insertChildBefore,
-                     * prependChild, and setChildren, we should silently
-                     * do nothing in this case.
-                     */
-                    if (!JSXML_HAS_KIDS(rxml))
-                        goto out;
-                }
-
-                /* 2(c)(ii) is distributed below as several js_NewXML calls. */
-                targetprop = xml->xml_targetprop;
-                if (!targetprop || IS_STAR(targetprop->localName)) {
-                    /* 2(c)(iv)(1-2), out of order w.r.t. 2(c)(iii). */
-                    kid = js_NewXML(cx, JSXML_CLASS_TEXT);
-                    if (!kid)
-                        goto bad;
-                } else {
-                    nameobj = js_GetXMLQNameObject(cx, targetprop);
-                    if (!nameobj)
-                        goto bad;
-                    if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
-                        /*
-                         * 2(c)(iii)(1-3).
-                         * Note that rxml can't be null here, because target
-                         * and targetprop are non-null.
-                         */
-                        ok = GetProperty(cx, rxml->object, id, &attrval);
-                        if (!ok)
-                            goto out;
-                        attrobj = JSVAL_TO_OBJECT(attrval);
-                        attr = (JSXML *) JS_GetPrivate(cx, attrobj);
-                        if (JSXML_LENGTH(attr) != 0)
-                            goto out;
-
-                        kid = js_NewXML(cx, JSXML_CLASS_ATTRIBUTE);
-                    } else {
-                        /* 2(c)(v). */
-                        kid = js_NewXML(cx, JSXML_CLASS_ELEMENT);
-                    }
-                    if (!kid)
-                        goto bad;
-
-                    /* An important bit of 2(c)(ii). */
-                    kid->name = targetprop;
-                }
-
-                /* Final important bit of 2(c)(ii). */
-                kid->parent = rxml;
-
-                /* 2(c)(vi-vii). */
-                i = xml->xml_kids.length;
-                if (kid->xml_class != JSXML_CLASS_ATTRIBUTE) {
-                    /*
-                     * 2(c)(vii)(1) tests whether _y.[[Parent]]_ is not null.
-                     * y.[[Parent]] is here called kid->parent, which we know
-                     * from 2(c)(ii) is _r_, here called rxml.  So let's just
-                     * test that!  Erratum, the spec should be simpler here.
-                     */
-                    if (rxml) {
-                        JS_ASSERT(JSXML_HAS_KIDS(rxml));
-                        n = rxml->xml_kids.length;
-                        j = n - 1;
-                        if (n != 0 && i != 0) {
-                            for (n = j, j = 0; j < n; j++) {
-                                if (rxml->xml_kids.vector[j] ==
-                                    xml->xml_kids.vector[i-1]) {
-                                    break;
-                                }
-                            }
-                        }
-
-                        kidobj = js_GetXMLObject(cx, kid);
-                        if (!kidobj)
-                            goto bad;
-                        ok = Insert(cx, rxml, INT_TO_JSVAL(j + 1),
-                                    OBJECT_TO_JSVAL(kidobj));
-                        if (!ok)
-                            goto out;
-                    }
-
-                    /*
-                     * 2(c)(vii)(2-3).
-                     * Erratum: [[PropertyName]] in 2(c)(vii)(3) must be a
-                     * typo for [[TargetProperty]].
-                     */
-                    if (vxml) {
-                        kid->name = (vxml->xml_class == JSXML_CLASS_LIST)
-                                    ? vxml->xml_targetprop
-                                    : vxml->name;
-                    }
-                }
-
-                /* 2(c)(viii). */
-                ok = Append(cx, xml, kid);
-                if (!ok)
-                    goto out;
-            }
-
-            /* 2(d). */
-            if (!vxml ||
-                vxml->xml_class == JSXML_CLASS_TEXT ||
-                vxml->xml_class == JSXML_CLASS_ATTRIBUTE) {
-                ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp);
-                if (!ok)
-                    goto out;
-            }
-
-            /* 2(e). */
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            parent = kid->parent;
-            if (kid->xml_class == JSXML_CLASS_ATTRIBUTE) {
-                nameobj = js_GetAttributeNameObject(cx, kid->name);
-                if (!nameobj)
-                    goto bad;
-                id = OBJECT_TO_JSVAL(nameobj);
-
-                /* 2(e)(i). */
-                parentobj = parent->object;
-                ok = PutProperty(cx, parentobj, id, vp);
-                if (!ok)
-                    goto out;
-
-                /* 2(e)(ii). */
-                ok = GetProperty(cx, parentobj, id, vp);
-                if (!ok)
-                    goto out;
-                attr = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp));
-
-                /* 2(e)(iii). */
-                xml->xml_kids.vector[i] = attr->xml_kids.vector[0];
-            }
-
-            /* 2(f). */
-            else if (vxml && vxml->xml_class == JSXML_CLASS_LIST) {
-                /* 2(f)(i) Create a shallow copy _c_ of _V_. */
-                copyobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-                if (!copyobj)
-                    goto bad;
-                copy = (JSXML *) JS_GetPrivate(cx, copyobj);
-                n = vxml->xml_kids.length;
-                ok = XMLArraySetCapacity(cx, &copy->xml_kids, n);
-                if (!ok)
-                    goto out;
-                for (k = 0; k < n; k++) {
-                    kid2 = XMLARRAY_MEMBER(&vxml->xml_kids, k, JSXML);
-                    XMLARRAY_SET_MEMBER(&copy->xml_kids, k, kid2);
-                }
-                copy->xml_kids.length = n;
-
-                JS_ASSERT(parent != xml);
-                if (parent) {
-                    q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL);
-                    JS_ASSERT(q != XML_NOT_FOUND);
-
-                    ok = IndexToIdVal(cx, q, &id);
-                    if (!ok)
-                        goto out;
-                    ok = Replace(cx, parent, id, OBJECT_TO_JSVAL(copyobj));
-                    if (!ok)
-                        goto out;
-
-#ifdef DEBUG
-                    /* Erratum: this loop in the spec is useless. */
-                    for (j = 0, n = copy->xml_kids.length; j < n; j++) {
-                        kid2 = XMLARRAY_MEMBER(&parent->xml_kids, q + j, JSXML);
-                        JS_ASSERT(XMLARRAY_MEMBER(&copy->xml_kids, j, JSXML)
-                                  == kid2);
-                    }
-#endif
-                }
-
-                /*
-                 * 2(f)(iv-vi).
-                 * Erratum: notice the unhandled zero-length V basis case and
-                 * the off-by-one errors for the n != 0 cases in the spec.
-                 */
-                if (n == 0) {
-                    XMLArrayDelete(cx, &xml->xml_kids, i, JS_TRUE);
-                } else {
-                    ok = XMLArrayInsert(cx, &xml->xml_kids, i + 1, n - 1);
-                    if (!ok)
-                        goto out;
-
-                    for (j = 0; j < n; j++)
-                        xml->xml_kids.vector[i + j] = copy->xml_kids.vector[j];
-                }
-            }
-
-            /* 2(g). */
-            else if (vxml || JSXML_HAS_VALUE(kid)) {
-                if (parent) {
-                    q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL);
-                    JS_ASSERT(q != XML_NOT_FOUND);
-
-                    ok = IndexToIdVal(cx, q, &id);
-                    if (!ok)
-                        goto out;
-                    ok = Replace(cx, parent, id, *vp);
-                    if (!ok)
-                        goto out;
-
-                    vxml = XMLARRAY_MEMBER(&parent->xml_kids, q, JSXML);
-                    *vp = OBJECT_TO_JSVAL(vxml->object);
-                }
-
-                /*
-                 * 2(g)(iii).
-                 * Erratum: _V_ may not be of type XML, but all index-named
-                 * properties _x[i]_ in an XMLList _x_ must be of type XML,
-                 * according to 9.2.1.1 Overview and other places in the spec.
-                 *
-                 * Thanks to 2(d), we know _V_ (*vp here) is either a string
-                 * or an XML/XMLList object.  If *vp is a string, call ToXML
-                 * on it to satisfy the constraint.
-                 */
-                if (!vxml) {
-                    JS_ASSERT(JSVAL_IS_STRING(*vp));
-                    vobj = ToXML(cx, *vp);
-                    if (!vobj)
-                        goto bad;
-                    *vp = OBJECT_TO_JSVAL(vobj);
-                    vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-                }
-                XMLARRAY_SET_MEMBER(&xml->xml_kids, i, vxml);
-            }
-
-            /* 2(h). */
-            else {
-                kidobj = js_GetXMLObject(cx, kid);
-                if (!kidobj)
-                    goto bad;
-                id = ATOM_KEY(cx->runtime->atomState.starAtom);
-                ok = PutProperty(cx, kidobj, id, vp);
-                if (!ok)
-                    goto out;
-            }
-        } else {
-            /*
-             * 3.
-             * Erratum: if x.[[Length]] > 1 or [[ResolveValue]] returns null
-             * or an r with r.[[Length]] != 1, throw TypeError.
-             */
-            n = JSXML_LENGTH(xml);
-            if (n > 1)
-                goto type_error;
-            if (n == 0) {
-                ok = ResolveValue(cx, xml, &rxml);
-                if (!ok)
-                    goto out;
-                if (!rxml || JSXML_LENGTH(rxml) != 1)
-                    goto type_error;
-                ok = Append(cx, xml, rxml);
-                if (!ok)
-                    goto out;
-            }
-            JS_ASSERT(JSXML_LENGTH(xml) == 1);
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj)
-                goto bad;
-            ok = PutProperty(cx, kidobj, id, vp);
-            if (!ok)
-                goto out;
-        }
-    } else {
-        /*
-         * ECMA-357 9.1.1.2.
-         * Erratum: move steps 3 and 4 to before 1 and 2, to avoid wasted
-         * effort in ToString or [[DeepCopy]].
-         */
-        if (js_IdIsIndex(id, &index)) {
-            /* See NOTE in spec: this variation is reserved for future use. */
-            ReportBadXMLName(cx, id);
-            goto bad;
-        }
-
-        nameqn = ToXMLName(cx, id, &funid);
-        if (!nameqn)
-            goto bad;
-        if (funid) {
-            ok = js_SetProperty(cx, obj, funid, vp);
-            goto out;
-        }
-        nameobj = nameqn->object;
-
-        if (JSXML_HAS_VALUE(xml))
-            goto out;
-
-        if (!vxml ||
-            vxml->xml_class == JSXML_CLASS_TEXT ||
-            vxml->xml_class == JSXML_CLASS_ATTRIBUTE) {
-            ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp);
-            if (!ok)
-                goto out;
-        } else {
-            rxml = DeepCopyInLRS(cx, vxml, 0);
-            if (!rxml || !js_GetXMLObject(cx, rxml))
-                goto bad;
-            vxml = rxml;
-            *vp = OBJECT_TO_JSVAL(vxml->object);
-        }
-
-        /*
-         * 6.
-         * Erratum: why is this done here, so early? use is way later....
-         */
-        ok = js_GetDefaultXMLNamespace(cx, &nsval);
-        if (!ok)
-            goto out;
-
-        if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
-            /* 7(a). */
-            if (!js_IsXMLName(cx, OBJECT_TO_JSVAL(nameobj)))
-                goto out;
-
-            /* 7(b-c). */
-            if (vxml && vxml->xml_class == JSXML_CLASS_LIST) {
-                n = vxml->xml_kids.length;
-                if (n == 0) {
-                    *vp = STRING_TO_JSVAL(cx->runtime->emptyString);
-                } else {
-                    left = KidToString(cx, vxml, 0);
-                    if (!left)
-                        goto bad;
-
-                    space = ATOM_TO_STRING(cx->runtime->atomState.spaceAtom);
-                    for (i = 1; i < n; i++) {
-                        left = js_ConcatStrings(cx, left, space);
-                        if (!left)
-                            goto bad;
-                        right = KidToString(cx, vxml, i);
-                        if (!right)
-                            goto bad;
-                        left = js_ConcatStrings(cx, left, right);
-                        if (!left)
-                            goto bad;
-                    }
-
-                    *vp = STRING_TO_JSVAL(left);
-                }
-            } else {
-                ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp);
-                if (!ok)
-                    goto out;
-            }
-
-            /* 7(d-e). */
-            match = NULL;
-            for (i = 0, n = xml->xml_attrs.length; i < n; i++) {
-                attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
-                attrqn = attr->name;
-                if (!js_CompareStrings(attrqn->localName, nameqn->localName) &&
-                    (!nameqn->uri ||
-                     !js_CompareStrings(attrqn->uri, nameqn->uri))) {
-                    if (!match) {
-                        match = attr;
-                    } else {
-                        nameobj = js_GetAttributeNameObject(cx, attrqn);
-                        if (!nameobj)
-                            goto bad;
-
-                        id = OBJECT_TO_JSVAL(nameobj);
-                        ok = DeleteProperty(cx, obj, id, &junk);
-                        if (!ok)
-                            goto out;
-                        --i;
-                    }
-                }
-            }
-
-            /* 7(f). */
-            attr = match;
-            if (!attr) {
-                /* 7(f)(i-ii). */
-                if (!nameqn->uri) {
-                    left = right = cx->runtime->emptyString;
-                } else {
-                    left = nameqn->uri;
-                    right = nameqn->prefix;
-                }
-                nameqn = js_NewXMLQName(cx, left, right, nameqn->localName);
-                if (!nameqn)
-                    goto bad;
-
-                /* 7(f)(iii). */
-                attr = js_NewXML(cx, JSXML_CLASS_ATTRIBUTE);
-                if (!attr)
-                    goto bad;
-                attr->parent = xml;
-                attr->name = nameqn;
-
-                /* 7(f)(iv). */
-                ok = XMLARRAY_ADD_MEMBER(cx, &xml->xml_attrs, n, attr);
-                if (!ok)
-                    goto out;
-
-                /* 7(f)(v-vi). */
-                ns = GetNamespace(cx, nameqn, NULL);
-                if (!ns)
-                    goto bad;
-                ok = AddInScopeNamespace(cx, xml, ns);
-                if (!ok)
-                    goto out;
-            }
-
-            /* 7(g). */
-            attr->xml_value = JSVAL_TO_STRING(*vp);
-            goto out;
-        }
-
-        /* 8-9. */
-        if (!js_IsXMLName(cx, OBJECT_TO_JSVAL(nameobj)) &&
-            !IS_STAR(nameqn->localName)) {
-            goto out;
-        }
-
-        /* 10-11. */
-        id = JSVAL_VOID;
-        primitiveAssign = !vxml && !IS_STAR(nameqn->localName);
-
-        /* 12. */
-        k = n = xml->xml_kids.length;
-        kid2 = NULL;
-        while (k != 0) {
-            --k;
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, k, JSXML);
-            if (MatchElemName(nameqn, kid)) {
-                if (!JSVAL_IS_VOID(id)) {
-                    ok = DeleteByIndex(cx, xml, id, &junk);
-                    if (!ok)
-                        goto out;
-                }
-                ok = IndexToIdVal(cx, k, &id);
-                if (!ok)
-                    goto out;
-                kid2 = kid;
-            }
-        }
-
-        /*
-         * Erratum: ECMA-357 specified child insertion inconsistently:
-         * insertChildBefore and insertChildAfter insert an arbitrary XML
-         * instance, and therefore can create cycles, but appendChild as
-         * specified by the "Overview" of 13.4.4.3 calls [[DeepCopy]] on
-         * its argument.  But the "Semantics" in 13.4.4.3 do not include
-         * any [[DeepCopy]] call.
-         *
-         * Fixing this (https://bugzilla.mozilla.org/show_bug.cgi?id=312692)
-         * required adding cycle detection, and allowing duplicate kids to
-         * be created (see comment 6 in the bug).  Allowing duplicate kid
-         * references means the loop above will delete all but the lowest
-         * indexed reference, and each [[DeleteByIndex]] nulls the kid's
-         * parent.  Thus the need to restore parent here.  This is covered
-         * by https://bugzilla.mozilla.org/show_bug.cgi?id=327564.
-         */
-        if (kid2) {
-            JS_ASSERT(kid2->parent == xml || !kid2->parent);
-            if (!kid2->parent)
-                kid2->parent = xml;
-        }
-
-        /* 13. */
-        if (JSVAL_IS_VOID(id)) {
-            /* 13(a). */
-            ok = IndexToIdVal(cx, n, &id);
-            if (!ok)
-                goto out;
-
-            /* 13(b). */
-            if (primitiveAssign) {
-                if (!nameqn->uri) {
-                    ns = (JSXMLNamespace *)
-                         JS_GetPrivate(cx, JSVAL_TO_OBJECT(nsval));
-                    left = ns->uri;
-                    right = ns->prefix;
-                } else {
-                    left = nameqn->uri;
-                    right = nameqn->prefix;
-                }
-                nameqn = js_NewXMLQName(cx, left, right, nameqn->localName);
-                if (!nameqn)
-                    goto bad;
-
-                /* 13(b)(iii). */
-                vobj = js_NewXMLObject(cx, JSXML_CLASS_ELEMENT);
-                if (!vobj)
-                    goto bad;
-                vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-                vxml->parent = xml;
-                vxml->name = nameqn;
-
-                /* 13(b)(iv-vi). */
-                ns = GetNamespace(cx, nameqn, NULL);
-                if (!ns)
-                    goto bad;
-                ok = Replace(cx, xml, id, OBJECT_TO_JSVAL(vobj));
-                if (!ok)
-                    goto out;
-                ok = AddInScopeNamespace(cx, vxml, ns);
-                if (!ok)
-                    goto out;
-            }
-        }
-
-        /* 14. */
-        if (primitiveAssign) {
-            js_IdIsIndex(id, &index);
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-            if (JSXML_HAS_KIDS(kid)) {
-                XMLArrayFinish(cx, &kid->xml_kids);
-                ok = XMLArrayInit(cx, &kid->xml_kids, 1);
-                if (!ok)
-                    goto out;
-            }
-
-            /* 14(b-c). */
-            /* XXXbe Erratum? redundant w.r.t. 7(b-c) else clause above */
-            ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp);
-            if (!ok)
-                goto out;
-            if (!IS_EMPTY(JSVAL_TO_STRING(*vp)))
-                ok = Replace(cx, kid, JSVAL_ZERO, *vp);
-        } else {
-            /* 15(a). */
-            ok = Replace(cx, xml, id, *vp);
-        }
-    }
-
-out:
-    JS_LeaveLocalRootScope(cx);
-    return ok;
-
-type_error:
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                         JSMSG_BAD_XMLLIST_PUT,
-                         js_ValueToPrintableString(cx, id));
-bad:
-    ok = JS_FALSE;
-    goto out;
-}
-
-/* ECMA-357 9.1.1.10 XML [[ResolveValue]], 9.2.1.10 XMLList [[ResolveValue]]. */
-static JSBool
-ResolveValue(JSContext *cx, JSXML *list, JSXML **result)
-{
-    JSXML *target, *base;
-    JSXMLQName *targetprop;
-    jsval id, tv;
-
-    /* Our caller must be protecting newborn objects. */
-    JS_ASSERT(cx->localRootStack);
-
-    if (list->xml_class != JSXML_CLASS_LIST || list->xml_kids.length != 0) {
-        if (!js_GetXMLObject(cx, list))
-            return JS_FALSE;
-        *result = list;
-        return JS_TRUE;
-    }
-
-    target = list->xml_target;
-    targetprop = list->xml_targetprop;
-    if (!target ||
-        !targetprop ||
-        OBJ_GET_CLASS(cx, targetprop->object) == &js_AttributeNameClass ||
-        IS_STAR(targetprop->localName)) {
-        *result = NULL;
-        return JS_TRUE;
-    }
-
-    if (!ResolveValue(cx, target, &base))
-        return JS_FALSE;
-    if (!base) {
-        *result = NULL;
-        return JS_TRUE;
-    }
-    if (!js_GetXMLObject(cx, base))
-        return JS_FALSE;
-
-    id = OBJECT_TO_JSVAL(targetprop->object);
-    if (!GetProperty(cx, base->object, id, &tv))
-        return JS_FALSE;
-    target = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(tv));
-
-    if (JSXML_LENGTH(target) == 0) {
-        if (base->xml_class == JSXML_CLASS_LIST && JSXML_LENGTH(base) > 1) {
-            *result = NULL;
-            return JS_TRUE;
-        }
-        tv = STRING_TO_JSVAL(cx->runtime->emptyString);
-        if (!PutProperty(cx, base->object, id, &tv))
-            return JS_FALSE;
-        if (!GetProperty(cx, base->object, id, &tv))
-            return JS_FALSE;
-        target = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(tv));
-    }
-
-    *result = target;
-    return JS_TRUE;
-}
-
-/*
- * HasProperty must be able to return a found JSProperty and the object in
- * which it was found, if id is of the form function::name.  For other ids,
- * if they index or name an XML child, we return FOUND_XML_PROPERTY in *propp
- * and null in *objp.
- *
- * DROP_PROPERTY helps HasProperty callers drop function properties without
- * trying to drop the magic FOUND_XML_PROPERTY cookie.
- */
-#define FOUND_XML_PROPERTY              ((JSProperty *) 1)
-#define DROP_PROPERTY(cx,pobj,prop)     (((prop) != FOUND_XML_PROPERTY)       \
-                                         ? OBJ_DROP_PROPERTY(cx, pobj, prop)  \
-                                         : (void) 0)
-
-/* ECMA-357 9.1.1.6 XML [[HasProperty]] and 9.2.1.5 XMLList [[HasProperty]]. */
-static JSBool
-HasProperty(JSContext *cx, JSObject *obj, jsval id, JSObject **objp,
-            JSProperty **propp)
-{
-    JSXML *xml, *kid;
-    uint32 i, n;
-    JSObject *kidobj;
-    JSXMLQName *qn;
-    jsid funid;
-    JSXMLArray *array;
-    JSXMLNameMatcher matcher;
-
-    *objp = NULL;
-    *propp = NULL;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        n = JSXML_LENGTH(xml);
-        if (js_IdIsIndex(id, &i)) {
-            if (i < n)
-                *propp = FOUND_XML_PROPERTY;
-            return JS_TRUE;
-        }
-
-        for (i = 0; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                kidobj = js_GetXMLObject(cx, kid);
-                if (!kidobj || !HasProperty(cx, kidobj, id, objp, propp))
-                    return JS_FALSE;
-                if (*propp)
-                    return JS_TRUE;
-            }
-        }
-    } else {
-        if (xml->xml_class == JSXML_CLASS_ELEMENT && js_IdIsIndex(id, &i)) {
-            if (i == 0)
-                *propp = FOUND_XML_PROPERTY;
-            return JS_TRUE;
-        }
-
-        qn = ToXMLName(cx, id, &funid);
-        if (!qn)
-            return JS_FALSE;
-        if (funid)
-            return js_LookupProperty(cx, obj, funid, objp, propp);
-
-        if (xml->xml_class != JSXML_CLASS_ELEMENT)
-            return JS_TRUE;
-
-        if (OBJ_GET_CLASS(cx, qn->object) == &js_AttributeNameClass) {
-            array = &xml->xml_attrs;
-            matcher = MatchAttrName;
-        } else {
-            array = &xml->xml_kids;
-            matcher = MatchElemName;
-        }
-        for (i = 0, n = array->length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(array, i, JSXML);
-            if (matcher(qn, kid)) {
-                *propp = FOUND_XML_PROPERTY;
-                return JS_TRUE;
-            }
-        }
-    }
-
-    return JS_TRUE;
-}
-
-static void
-xml_finalize(JSContext *cx, JSObject *obj)
-{
-    JSXML *xml;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    if (!xml)
-        return;
-    if (xml->object == obj)
-        xml->object = NULL;
-    UNMETER(xml_stats.livexmlobj);
-}
-
-static void
-xml_mark_vector(JSContext *cx, JSXML **vec, uint32 len, void *arg)
-{
-    uint32 i;
-    JSXML *elt;
-
-    for (i = 0; i < len; i++) {
-        elt = vec[i];
-        {
-#ifdef GC_MARK_DEBUG
-            char buf[100];
-            JSXMLQName *qn = elt->name;
-
-            JS_snprintf(buf, sizeof buf, "%s::%s",
-                        qn->uri ? JS_GetStringBytes(qn->uri) : "*",
-                        JS_GetStringBytes(qn->localName));
-#else
-            const char *buf = NULL;
-#endif
-            JS_MarkGCThing(cx, elt, buf, arg);
-        }
-    }
-}
-
-/*
- * js_XMLObjectOps.newObjectMap == js_NewObjectMap, so XML objects appear to
- * be native.  Therefore, xml_lookupProperty must return a valid JSProperty
- * pointer parameter via *propp to signify "property found".  Since the only
- * call to xml_lookupProperty is via OBJ_LOOKUP_PROPERTY, and then only from
- * js_FindXMLProperty (in this file) and js_FindProperty (in jsobj.c, called
- * from jsinterp.c), the only time we add a JSScopeProperty here is when an
- * unqualified name or XML name is being accessed.
- *
- * This scope property both speeds up subsequent js_Find*Property calls, and
- * keeps the JSOP_NAME code in js_Interpret happy by giving it an sprop with
- * (getter, setter) == (GetProperty, PutProperty).  We can't use that getter
- * and setter as js_XMLClass's getProperty and setProperty, because doing so
- * would break the XML methods, which are function-valued properties of the
- * XML.prototype object.
- *
- * NB: xml_deleteProperty must take care to remove any property added here.
- */
-static JSBool
-xml_lookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                   JSProperty **propp)
-{
-    JSScopeProperty *sprop;
-
-    if (!HasProperty(cx, obj, ID_TO_VALUE(id), objp, propp))
-        return JS_FALSE;
-
-    if (*propp == FOUND_XML_PROPERTY) {
-        sprop = js_AddNativeProperty(cx, obj, id, GetProperty, PutProperty,
-                                     SPROP_INVALID_SLOT, JSPROP_ENUMERATE,
-                                     0, 0);
-        if (!sprop)
-            return JS_FALSE;
-
-        JS_LOCK_OBJ(cx, obj);
-        *objp = obj;
-        *propp = (JSProperty *) sprop;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_defineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
-                   JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
-                   JSProperty **propp)
-{
-    if (JSVAL_IS_FUNCTION(cx, value) || getter || setter ||
-        (attrs & JSPROP_ENUMERATE) == 0 ||
-        (attrs & (JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED))) {
-        return js_DefineProperty(cx, obj, id, value, getter, setter, attrs,
-                                 propp);
-    }
-
-    if (!PutProperty(cx, obj, ID_TO_VALUE(id), &value))
-        return JS_FALSE;
-    if (propp)
-        *propp = NULL;
-    return JS_TRUE;
-}
-
-static JSBool
-xml_getProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    if (id == JS_DEFAULT_XML_NAMESPACE_ID) {
-        *vp = JSVAL_VOID;
-        return JS_TRUE;
-    }
-
-    return GetProperty(cx, obj, ID_TO_VALUE(id), vp);
-}
-
-static JSBool
-xml_setProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    return PutProperty(cx, obj, ID_TO_VALUE(id), vp);
-}
-
-static JSBool
-FoundProperty(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-              JSBool *foundp)
-{
-    JSObject *pobj;
-
-    if (prop) {
-        *foundp = JS_TRUE;
-    } else {
-        if (!HasProperty(cx, obj, ID_TO_VALUE(id), &pobj, &prop))
-            return JS_FALSE;
-        if (prop)
-            DROP_PROPERTY(cx, pobj, prop);
-        *foundp = (prop != NULL);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_getAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                  uintN *attrsp)
-{
-    JSBool found;
-
-    if (!FoundProperty(cx, obj, id, prop, &found))
-        return JS_FALSE;
-    *attrsp = found ? JSPROP_ENUMERATE : 0;
-    return JS_TRUE;
-}
-
-static JSBool
-xml_setAttributes(JSContext *cx, JSObject *obj, jsid id, JSProperty *prop,
-                  uintN *attrsp)
-{
-    JSBool found;
-
-    if (!FoundProperty(cx, obj, id, prop, &found))
-        return JS_FALSE;
-    if (found) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_CANT_SET_XML_ATTRS);
-    }
-    return !found;
-}
-
-static JSBool
-xml_deleteProperty(JSContext *cx, JSObject *obj, jsid id, jsval *rval)
-{
-    /*
-     * If this object has its own (mutable) scope, and if id isn't an index,
-     * then we may have added a property to the scope in xml_lookupProperty
-     * for it to return to mean "found" and to provide a handle for access
-     * operations to call the property's getter or setter.  The property also
-     * helps speed up unqualified accesses via the property cache, avoiding
-     * what amount to two HasProperty searches.
-     *
-     * But now it's time to remove any such property, to purge the property
-     * cache and remove the scope entry.
-     */
-    if (OBJ_SCOPE(obj)->object == obj && !JSID_IS_INT(id)) {
-        if (!js_DeleteProperty(cx, obj, id, rval))
-            return JS_FALSE;
-    }
-
-    return DeleteProperty(cx, obj, ID_TO_VALUE(id), rval);
-}
-
-static JSBool
-xml_defaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp)
-{
-    JSXML *xml;
-
-    if (hint == JSTYPE_OBJECT) {
-        /* Called from for..in code in js_Interpret: return an XMLList. */
-        xml = (JSXML *) JS_GetPrivate(cx, obj);
-        if (xml->xml_class != JSXML_CLASS_LIST) {
-            obj = ToXMLList(cx, OBJECT_TO_JSVAL(obj));
-            if (!obj)
-                return JS_FALSE;
-        }
-        *vp = OBJECT_TO_JSVAL(obj);
-        return JS_TRUE;
-    }
-
-    return JS_CallFunctionName(cx, obj, js_toString_str, 0, NULL, vp);
-}
-
-static JSBool
-xml_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
-              jsval *statep, jsid *idp)
-{
-    JSXML *xml;
-    uint32 length, index;
-    JSXMLArrayCursor *cursor;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    length = JSXML_LENGTH(xml);
-
-    switch (enum_op) {
-      case JSENUMERATE_INIT:
-        if (length == 0) {
-            cursor = NULL;
-        } else {
-            cursor = (JSXMLArrayCursor *) JS_malloc(cx, sizeof *cursor);
-            if (!cursor)
-                return JS_FALSE;
-            XMLArrayCursorInit(cursor, &xml->xml_kids);
-        }
-        *statep = PRIVATE_TO_JSVAL(cursor);
-        if (idp)
-            *idp = INT_TO_JSID(length);
-        break;
-
-      case JSENUMERATE_NEXT:
-        cursor = JSVAL_TO_PRIVATE(*statep);
-        if (cursor && cursor->array && (index = cursor->index) < length) {
-            *idp = INT_TO_JSID(index);
-            cursor->index = index + 1;
-            break;
-        }
-        /* FALL THROUGH */
-
-      case JSENUMERATE_DESTROY:
-        cursor = JSVAL_TO_PRIVATE(*statep);
-        if (cursor) {
-            XMLArrayCursorFinish(cursor);
-            JS_free(cx, cursor);
-        }
-        *statep = JSVAL_NULL;
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_hasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    return JS_TRUE;
-}
-
-static uint32
-xml_mark(JSContext *cx, JSObject *obj, void *arg)
-{
-    JSXML *xml;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    JS_MarkGCThing(cx, xml, js_private_str, arg);
-    return js_Mark(cx, obj, arg);
-}
-
-static void
-xml_clear(JSContext *cx, JSObject *obj)
-{
-}
-
-static JSBool
-HasSimpleContent(JSXML *xml)
-{
-    JSXML *kid;
-    JSBool simple;
-    uint32 i, n;
-
-again:
-    switch (xml->xml_class) {
-      case JSXML_CLASS_COMMENT:
-      case JSXML_CLASS_PROCESSING_INSTRUCTION:
-        return JS_FALSE;
-      case JSXML_CLASS_LIST:
-        if (xml->xml_kids.length == 0)
-            return JS_TRUE;
-        if (xml->xml_kids.length == 1) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-            xml = kid;
-            goto again;
-        }
-        /* FALL THROUGH */
-      default:
-        simple = JS_TRUE;
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                simple = JS_FALSE;
-                break;
-            }
-        }
-        return simple;
-    }
-}
-
-static JSObject *
-xml_getMethod(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    JSXML *xml;
-    jsval fval;
-
-    JS_ASSERT(JS_InstanceOf(cx, obj, &js_XMLClass, NULL));
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-
-retry:
-    /* 11.2.2.1 Step 3(d) onward. */
-    if (!GetFunction(cx, obj, xml, id, &fval))
-        return NULL;
-
-    if (JSVAL_IS_VOID(fval) && OBJECT_IS_XML(cx, obj)) {
-        if (xml->xml_class == JSXML_CLASS_LIST) {
-            if (xml->xml_kids.length == 1) {
-                xml = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-                obj = js_GetXMLObject(cx, xml);
-                if (!obj)
-                    return NULL;
-                goto retry;
-            }
-        } else if (HasSimpleContent(xml)) {
-            JSString *str;
-            JSObject *tmp;
-
-            str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-            if (!str || !js_ValueToObject(cx, STRING_TO_JSVAL(str), &tmp))
-                return NULL;
-            if (!js_GetProperty(cx, tmp, id, &fval))
-                return NULL;
-            if (!JSVAL_IS_VOID(fval))
-                obj = tmp;
-        }
-    }
-
-    *vp = fval;
-    return obj;
-}
-
-static JSBool
-xml_setMethod(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
-{
-    return js_SetProperty(cx, obj, id, vp);
-}
-
-static JSBool
-xml_enumerateValues(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
-                    jsval *statep, jsid *idp, jsval *vp)
-{
-    JSXML *xml, *kid;
-    uint32 length, index;
-    JSXMLArrayCursor *cursor;
-    JSObject *kidobj;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    length = JSXML_LENGTH(xml);
-    JS_ASSERT(INT_FITS_IN_JSVAL(length));
-
-    switch (enum_op) {
-      case JSENUMERATE_INIT:
-        if (length == 0) {
-            cursor = NULL;
-        } else {
-            cursor = (JSXMLArrayCursor *) JS_malloc(cx, sizeof *cursor);
-            if (!cursor)
-                return JS_FALSE;
-            XMLArrayCursorInit(cursor, &xml->xml_kids);
-        }
-        *statep = PRIVATE_TO_JSVAL(cursor);
-        if (idp)
-            *idp = INT_TO_JSID(length);
-        if (vp)
-            *vp = JSVAL_VOID;
-        break;
-
-      case JSENUMERATE_NEXT:
-        cursor = JSVAL_TO_PRIVATE(*statep);
-        if (cursor && cursor->array && (index = cursor->index) < length) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj)
-                return JS_FALSE;
-            JS_ASSERT(INT_FITS_IN_JSVAL(index));
-            *idp = INT_TO_JSID(index);
-            *vp = OBJECT_TO_JSVAL(kidobj);
-            cursor->index = index + 1;
-            break;
-        }
-        /* FALL THROUGH */
-
-      case JSENUMERATE_DESTROY:
-        cursor = JSVAL_TO_PRIVATE(*statep);
-        if (cursor) {
-            XMLArrayCursorFinish(cursor);
-            JS_free(cx, cursor);
-        }
-        *statep = JSVAL_NULL;
-        break;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    JSXML *xml, *vxml;
-    JSObject *vobj;
-    JSBool ok;
-    JSString *str, *vstr;
-    jsdouble d, d2;
-
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    vxml = NULL;
-    if (!JSVAL_IS_PRIMITIVE(v)) {
-        vobj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, vobj))
-            vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-    }
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        ok = Equals(cx, xml, v, bp);
-    } else if (vxml) {
-        if (vxml->xml_class == JSXML_CLASS_LIST) {
-            ok = Equals(cx, vxml, OBJECT_TO_JSVAL(obj), bp);
-        } else {
-            if (((xml->xml_class == JSXML_CLASS_TEXT ||
-                  xml->xml_class == JSXML_CLASS_ATTRIBUTE) &&
-                 HasSimpleContent(vxml)) ||
-                ((vxml->xml_class == JSXML_CLASS_TEXT ||
-                  vxml->xml_class == JSXML_CLASS_ATTRIBUTE) &&
-                 HasSimpleContent(xml))) {
-                ok = JS_EnterLocalRootScope(cx);
-                if (ok) {
-                    str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-                    vstr = js_ValueToString(cx, v);
-                    ok = str && vstr;
-                    if (ok)
-                        *bp = !js_CompareStrings(str, vstr);
-                    JS_LeaveLocalRootScope(cx);
-                }
-            } else {
-                ok = XMLEquals(cx, xml, vxml, bp);
-            }
-        }
-    } else {
-        ok = JS_EnterLocalRootScope(cx);
-        if (ok) {
-            if (HasSimpleContent(xml)) {
-                str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-                vstr = js_ValueToString(cx, v);
-                ok = str && vstr;
-                if (ok)
-                    *bp = !js_CompareStrings(str, vstr);
-            } else if (JSVAL_IS_STRING(v) || JSVAL_IS_NUMBER(v)) {
-                str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-                if (!str) {
-                    ok = JS_FALSE;
-                } else if (JSVAL_IS_STRING(v)) {
-                    *bp = !js_CompareStrings(str, JSVAL_TO_STRING(v));
-                } else {
-                    ok = js_ValueToNumber(cx, STRING_TO_JSVAL(str), &d);
-                    if (ok) {
-                        d2 = JSVAL_IS_INT(v) ? JSVAL_TO_INT(v)
-                                             : *JSVAL_TO_DOUBLE(v);
-                        *bp = JSDOUBLE_COMPARE(d, ==, d2, JS_FALSE);
-                    }
-                }
-            } else {
-                *bp = JS_FALSE;
-            }
-            JS_LeaveLocalRootScope(cx);
-        }
-    }
-    return ok;
-}
-
-static JSBool
-xml_concatenate(JSContext *cx, JSObject *obj, jsval v, jsval *vp)
-{
-    JSBool ok;
-    JSObject *listobj, *robj;
-    JSXML *list, *lxml, *rxml;
-
-    ok = JS_EnterLocalRootScope(cx);
-    if (!ok)
-        return JS_FALSE;
-
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj) {
-        ok = JS_FALSE;
-        goto out;
-    }
-
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    lxml = (JSXML *) JS_GetPrivate(cx, obj);
-    ok = Append(cx, list, lxml);
-    if (!ok)
-        goto out;
-
-    if (VALUE_IS_XML(cx, v)) {
-        rxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-    } else {
-        robj = ToXML(cx, v);
-        if (!robj) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        rxml = (JSXML *) JS_GetPrivate(cx, robj);
-    }
-    ok = Append(cx, list, rxml);
-    if (!ok)
-        goto out;
-
-    *vp = OBJECT_TO_JSVAL(listobj);
-out:
-    JS_LeaveLocalRootScope(cx);
-    return ok;
-}
-
-/* Use js_NewObjectMap so XML objects satisfy OBJ_IS_NATIVE tests. */
-JS_FRIEND_DATA(JSXMLObjectOps) js_XMLObjectOps = {
-  { js_NewObjectMap,            js_DestroyObjectMap,
-    xml_lookupProperty,         xml_defineProperty,
-    xml_getProperty,            xml_setProperty,
-    xml_getAttributes,          xml_setAttributes,
-    xml_deleteProperty,         xml_defaultValue,
-    xml_enumerate,              js_CheckAccess,
-    NULL,                       NULL,
-    NULL,                       NULL,
-    NULL,                       xml_hasInstance,
-    js_SetProtoOrParent,        js_SetProtoOrParent,
-    xml_mark,                   xml_clear,
-    NULL,                       NULL },
-    xml_getMethod,              xml_setMethod,
-    xml_enumerateValues,        xml_equality,
-    xml_concatenate
-};
-
-static JSObjectOps *
-xml_getObjectOps(JSContext *cx, JSClass *clasp)
-{
-    return &js_XMLObjectOps.base;
-}
-
-JS_FRIEND_DATA(JSClass) js_XMLClass = {
-    js_XML_str,        JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,   JS_PropertyStub,
-    JS_EnumerateStub,  JS_ResolveStub,    JS_ConvertStub,    xml_finalize,
-    xml_getObjectOps,  NULL,              NULL,              NULL,
-    NULL,              NULL,              NULL,              NULL
-};
-
-static JSObject *
-CallConstructorFunction(JSContext *cx, JSObject *obj, JSClass *clasp,
-                        uintN argc, jsval *argv)
-{
-    JSObject *tmp;
-    jsval rval;
-
-    while ((tmp = OBJ_GET_PARENT(cx, obj)) != NULL)
-        obj = tmp;
-    if (!JS_CallFunctionName(cx, obj, clasp->name, argc, argv, &rval))
-        return NULL;
-    JS_ASSERT(!JSVAL_IS_PRIMITIVE(rval));
-    return JSVAL_TO_OBJECT(rval);
-}
-
-#define XML_METHOD_PROLOG                                                     \
-    JS_BEGIN_MACRO                                                            \
-        xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, argv);   \
-        if (!xml)                                                             \
-            return JS_FALSE;                                                  \
-    JS_END_MACRO
-
-static JSBool
-xml_addNamespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    JSXML *xml;
-    JSObject *nsobj;
-    JSXMLNamespace *ns;
-
-    XML_METHOD_PROLOG;
-    if (xml->xml_class != JSXML_CLASS_ELEMENT)
-        return JS_TRUE;
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    nsobj = CallConstructorFunction(cx, obj, &js_NamespaceClass.base, 1, argv);
-    if (!nsobj)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(nsobj);
-
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-    if (!AddInScopeNamespace(cx, xml, ns))
-        return JS_FALSE;
-    ns->declared = JS_TRUE;
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSBool
-xml_appendChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSXML *xml, *vxml;
-    jsval name, v;
-    JSObject *vobj;
-
-    XML_METHOD_PROLOG;
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    if (!js_GetAnyName(cx, &name))
-        return JS_FALSE;
-
-    if (!GetProperty(cx, obj, name, &v))
-        return JS_FALSE;
-
-    JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
-    vobj = JSVAL_TO_OBJECT(v);
-    JS_ASSERT(OBJECT_IS_XML(cx, vobj));
-    vxml = (JSXML *) JS_GetPrivate(cx, vobj);
-    JS_ASSERT(vxml->xml_class == JSXML_CLASS_LIST);
-
-    if (!IndexToIdVal(cx, vxml->xml_kids.length, &name))
-        return JS_FALSE;
-    if (!PutProperty(cx, JSVAL_TO_OBJECT(v), name, &argv[0]))
-        return JS_FALSE;
-
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_attribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSXMLQName *qn;
-
-    qn = ToAttributeName(cx, argv[0]);
-    if (!qn)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(qn->object);      /* local root */
-    return GetProperty(cx, obj, argv[0], rval);
-}
-
-/* XML and XMLList */
-static JSBool
-xml_attributes(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    jsval name;
-    JSXMLQName *qn;
-    JSTempValueRooter tvr;
-    JSBool ok;
-
-    name = ATOM_KEY(cx->runtime->atomState.starAtom);
-    qn = ToAttributeName(cx, name);
-    if (!qn)
-        return JS_FALSE;
-    name = OBJECT_TO_JSVAL(qn->object);
-    JS_PUSH_SINGLE_TEMP_ROOT(cx, name, &tvr);
-    ok = GetProperty(cx, obj, name, rval);
-    JS_POP_TEMP_ROOT(cx, &tvr);
-    return ok;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_child_helper(JSContext *cx, JSObject *obj, JSXML *xml, jsval name,
-                 jsval *rval)
-{
-    uint32 index;
-    JSXML *kid;
-    JSObject *kidobj;
-
-    /* ECMA-357 13.4.4.6 */
-    JS_ASSERT(xml->xml_class != JSXML_CLASS_LIST);
-
-    if (js_IdIsIndex(name, &index)) {
-        if (index >= JSXML_LENGTH(xml)) {
-            *rval = JSVAL_VOID;
-        } else {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj)
-                return JS_FALSE;
-            *rval = OBJECT_TO_JSVAL(kidobj);
-        }
-        return JS_TRUE;
-    }
-
-    return GetProperty(cx, obj, name, rval);
-}
-
-static JSBool
-xml_child(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *list, *kid, *vxml;
-    jsval name, v;
-    uint32 i, n;
-    JSObject *listobj, *kidobj;
-
-    XML_METHOD_PROLOG;
-    name = argv[0];
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* ECMA-357 13.5.4.4 */
-        listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-        if (!listobj)
-            return JS_FALSE;
-
-        *rval = OBJECT_TO_JSVAL(listobj);
-        list = (JSXML *) JS_GetPrivate(cx, listobj);
-        list->xml_target = xml;
-
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj)
-                return JS_FALSE;
-            if (!xml_child_helper(cx, kidobj, kid, name, &v))
-                return JS_FALSE;
-            if (JSVAL_IS_VOID(v)) {
-                /* The property didn't exist in this kid. */
-                continue;
-            }
-
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
-            vxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-            if ((!JSXML_HAS_KIDS(vxml) || vxml->xml_kids.length != 0) &&
-                !Append(cx, list, vxml)) {
-                return JS_FALSE;
-            }
-        }
-        return JS_TRUE;
-    }
-
-    return xml_child_helper(cx, obj, xml, name, rval);
-}
-
-static JSBool
-xml_childIndex(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-               jsval *rval)
-{
-    JSXML *xml, *parent;
-    uint32 i, n;
-
-    XML_METHOD_PROLOG;
-    parent = xml->parent;
-    if (!parent || xml->xml_class == JSXML_CLASS_ATTRIBUTE) {
-        *rval = DOUBLE_TO_JSVAL(cx->runtime->jsNaN);
-        return JS_TRUE;
-    }
-    for (i = 0, n = JSXML_LENGTH(parent); i < n; i++) {
-        if (XMLARRAY_MEMBER(&parent->xml_kids, i, JSXML) == xml)
-            break;
-    }
-    JS_ASSERT(i < n);
-    return js_NewNumberValue(cx, i, rval);
-}
-
-/* XML and XMLList */
-static JSBool
-xml_children(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    jsval name;
-
-    name = ATOM_KEY(cx->runtime->atomState.starAtom);
-    return GetProperty(cx, obj, name, rval);
-}
-
-/* XML and XMLList */
-static JSBool
-xml_comments(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSXML *xml, *list, *kid, *vxml;
-    JSObject *listobj, *kidobj;
-    JSBool ok;
-    uint32 i, n;
-    jsval v;
-
-    XML_METHOD_PROLOG;
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj)
-        return JS_FALSE;
-
-    *rval = OBJECT_TO_JSVAL(listobj);
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    list->xml_target = xml;
-
-    ok = JS_TRUE;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* 13.5.4.6 Step 2. */
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                ok = JS_EnterLocalRootScope(cx);
-                if (!ok)
-                    break;
-                kidobj = js_GetXMLObject(cx, kid);
-                ok = kidobj
-                     ? xml_comments(cx, kidobj, argc, argv, &v)
-                     : JS_FALSE;
-                JS_LeaveLocalRootScope(cx);
-                if (!ok)
-                    break;
-                vxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-                if (JSXML_LENGTH(vxml) != 0) {
-                    ok = Append(cx, list, vxml);
-                    if (!ok)
-                        break;
-                }
-            }
-        }
-    } else {
-        /* 13.4.4.9 Step 2. */
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_COMMENT) {
-                ok = Append(cx, list, kid);
-                if (!ok)
-                    break;
-            }
-        }
-    }
-
-    return ok;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_contains(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSXML *xml, *kid;
-    jsval value;
-    JSBool eq;
-    JSObject *kidobj;
-    uint32 i, n;
-
-    XML_METHOD_PROLOG;
-    value = argv[0];
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        eq = JS_FALSE;
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj || !xml_equality(cx, kidobj, value, &eq))
-                return JS_FALSE;
-            if (eq)
-                break;
-        }
-    } else {
-        if (!xml_equality(cx, obj, value, &eq))
-            return JS_FALSE;
-    }
-    *rval = BOOLEAN_TO_JSVAL(eq);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_copy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *copy;
-
-    XML_METHOD_PROLOG;
-    copy = DeepCopy(cx, xml, NULL, 0);
-    if (!copy)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(copy->object);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_descendants(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSXML *xml, *list;
-    jsval name;
-
-    XML_METHOD_PROLOG;
-    name = (argc == 0) ? ATOM_KEY(cx->runtime->atomState.starAtom) : argv[0];
-    list = Descendants(cx, xml, name);
-    if (!list)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(list->object);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_elements(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSXML *xml, *list, *kid, *vxml;
-    jsval name, v;
-    JSXMLQName *nameqn;
-    jsid funid;
-    JSObject *listobj, *kidobj;
-    JSBool ok;
-    uint32 i, n;
-
-    XML_METHOD_PROLOG;
-    name = (argc == 0) ? ATOM_KEY(cx->runtime->atomState.starAtom) : argv[0];
-    nameqn = ToXMLName(cx, name, &funid);
-    if (!nameqn)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(nameqn->object);
-
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(listobj);
-    if (funid)
-        return JS_TRUE;
-
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    list->xml_target = xml;
-    list->xml_targetprop = nameqn;
-    ok = JS_TRUE;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* 13.5.4.6 */
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                ok = JS_EnterLocalRootScope(cx);
-                if (!ok)
-                    break;
-                kidobj = js_GetXMLObject(cx, kid);
-                ok = kidobj
-                     ? xml_elements(cx, kidobj, argc, argv, &v)
-                     : JS_FALSE;
-                JS_LeaveLocalRootScope(cx);
-                if (!ok)
-                    break;
-                vxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-                if (JSXML_LENGTH(vxml) != 0) {
-                    ok = Append(cx, list, vxml);
-                    if (!ok)
-                        break;
-                }
-            }
-        }
-    } else {
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT &&
-                MatchElemName(nameqn, kid)) {
-                ok = Append(cx, list, kid);
-                if (!ok)
-                    break;
-            }
-        }
-    }
-
-    return ok;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_hasOwnProperty(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                   jsval *rval)
-{
-    jsval name;
-    JSObject *pobj;
-    JSProperty *prop;
-
-    name = argv[0];
-    if (!HasProperty(cx, obj, name, &pobj, &prop))
-        return JS_FALSE;
-    if (!prop) {
-        return js_HasOwnPropertyHelper(cx, obj, js_LookupProperty, argc, argv,
-                                       rval);
-    }
-    DROP_PROPERTY(cx, pobj, prop);
-    *rval = JSVAL_TRUE;
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_hasComplexContent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                      jsval *rval)
-{
-    JSXML *xml, *kid;
-    JSObject *kidobj;
-    uint32 i, n;
-
-    XML_METHOD_PROLOG;
-again:
-    switch (xml->xml_class) {
-      case JSXML_CLASS_ATTRIBUTE:
-      case JSXML_CLASS_COMMENT:
-      case JSXML_CLASS_PROCESSING_INSTRUCTION:
-      case JSXML_CLASS_TEXT:
-        *rval = JSVAL_FALSE;
-        break;
-      case JSXML_CLASS_LIST:
-        if (xml->xml_kids.length == 0) {
-            *rval = JSVAL_TRUE;
-        } else if (xml->xml_kids.length == 1) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj)
-                return JS_FALSE;
-            obj = kidobj;
-            xml = (JSXML *) JS_GetPrivate(cx, obj);
-            goto again;
-        }
-        /* FALL THROUGH */
-      default:
-        *rval = JSVAL_FALSE;
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                *rval = JSVAL_TRUE;
-                break;
-            }
-        }
-        break;
-    }
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_hasSimpleContent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval)
-{
-    JSXML *xml;
-
-    XML_METHOD_PROLOG;
-    *rval = BOOLEAN_TO_JSVAL(HasSimpleContent(xml));
-    return JS_TRUE;
-}
-
-static JSBool
-xml_inScopeNamespaces(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                      jsval *rval)
-{
-    JSObject *arrayobj, *nsobj;
-    JSXML *xml;
-    uint32 length, i, j, n;
-    JSXMLNamespace *ns, *ns2;
-    jsval v;
-
-    arrayobj = js_NewArrayObject(cx, 0, NULL);
-    if (!arrayobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(arrayobj);
-    length = 0;
-
-    XML_METHOD_PROLOG;
-    do {
-        if (xml->xml_class != JSXML_CLASS_ELEMENT)
-            continue;
-        for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-
-            for (j = 0; j < length; j++) {
-                if (!JS_GetElement(cx, arrayobj, j, &v))
-                    return JS_FALSE;
-                nsobj = JSVAL_TO_OBJECT(v);
-                ns2 = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-                if ((ns2->prefix && ns->prefix)
-                    ? !js_CompareStrings(ns2->prefix, ns->prefix)
-                    : !js_CompareStrings(ns2->uri, ns->uri)) {
-                    break;
-                }
-            }
-
-            if (j == length) {
-                nsobj = js_GetXMLNamespaceObject(cx, ns);
-                if (!nsobj)
-                    return JS_FALSE;
-                v = OBJECT_TO_JSVAL(nsobj);
-                if (!JS_SetElement(cx, arrayobj, length, &v))
-                    return JS_FALSE;
-                ++length;
-            }
-        }
-    } while ((xml = xml->parent) != NULL);
-    return JS_TRUE;
-}
-
-static JSBool
-xml_insertChildAfter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval)
-{
-    JSXML *xml, *kid;
-    jsval arg;
-    uint32 i;
-
-    XML_METHOD_PROLOG;
-    if (!JSXML_HAS_KIDS(xml))
-        return JS_TRUE;
-
-    arg = argv[0];
-    if (JSVAL_IS_NULL(arg)) {
-        kid = NULL;
-        i = 0;
-    } else {
-        if (!VALUE_IS_XML(cx, arg))
-            return JS_TRUE;
-        kid = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(arg));
-        i = XMLARRAY_FIND_MEMBER(&xml->xml_kids, kid, NULL);
-        if (i == XML_NOT_FOUND)
-            return JS_TRUE;
-        ++i;
-    }
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-    if (!Insert(cx, xml, INT_TO_JSID(i), argv[1]))
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSBool
-xml_insertChildBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                      jsval *rval)
-{
-    JSXML *xml, *kid;
-    jsval arg;
-    uint32 i;
-
-    XML_METHOD_PROLOG;
-    if (!JSXML_HAS_KIDS(xml))
-        return JS_TRUE;
-
-    arg = argv[0];
-    if (JSVAL_IS_NULL(arg)) {
-        kid = NULL;
-        i = xml->xml_kids.length;
-    } else {
-        if (!VALUE_IS_XML(cx, arg))
-            return JS_TRUE;
-        kid = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(arg));
-        i = XMLARRAY_FIND_MEMBER(&xml->xml_kids, kid, NULL);
-        if (i == XML_NOT_FOUND)
-            return JS_TRUE;
-    }
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-    if (!Insert(cx, xml, INT_TO_JSID(i), argv[1]))
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_length(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml;
-
-    XML_METHOD_PROLOG;
-    if (xml->xml_class != JSXML_CLASS_LIST) {
-        *rval = JSVAL_ONE;
-    } else {
-        if (!js_NewNumberValue(cx, xml->xml_kids.length, rval))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_localName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSXML *xml;
-
-    XML_METHOD_PROLOG;
-    *rval = xml->name ? STRING_TO_JSVAL(xml->name->localName) : JSVAL_NULL;
-    return JS_TRUE;
-}
-
-static JSBool
-xml_name(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml;
-    JSObject *nameobj;
-
-    XML_METHOD_PROLOG;
-    if (!xml->name) {
-        *rval = JSVAL_NULL;
-    } else {
-        nameobj = js_GetXMLQNameObject(cx, xml->name);
-        if (!nameobj)
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(nameobj);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_namespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSXML *xml;
-    JSObject *arrayobj;
-    JSBool ok;
-    jsuint i, length;
-    jsval v;
-    JSXMLArray inScopeNSes;
-    JSXMLNamespace *ns;
-    JSString *prefix;
-
-    XML_METHOD_PROLOG;
-    if (argc == 0 &&
-        (xml->xml_class == JSXML_CLASS_TEXT ||
-         xml->xml_class == JSXML_CLASS_COMMENT ||
-         xml->xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION)) {
-        *rval = JSVAL_NULL;
-        return JS_TRUE;
-    }
-
-    if (!xml_inScopeNamespaces(cx, obj, 0, NULL, rval))
-        return JS_FALSE;
-    arrayobj = JSVAL_TO_OBJECT(*rval);
-    ok = js_GetLengthProperty(cx, arrayobj, &length);
-    if (!ok)
-        return JS_FALSE;
-
-    if (argc == 0) {
-        if (!XMLArrayInit(cx, &inScopeNSes, length))
-            return JS_FALSE;
-
-        for (i = 0; i < length; i++) {
-            ok = OBJ_GET_PROPERTY(cx, arrayobj, INT_TO_JSID(i), &v);
-            if (!ok)
-                break;
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
-            ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-            XMLARRAY_SET_MEMBER(&inScopeNSes, i, ns);
-        }
-
-        inScopeNSes.length = i;
-        ns = ok ? GetNamespace(cx, xml->name, &inScopeNSes) : NULL;
-        XMLArrayFinish(cx, &inScopeNSes);
-        if (!ns)
-            return JS_FALSE;
-
-        *rval = OBJECT_TO_JSVAL(ns->object);
-    } else {
-        prefix = js_ValueToString(cx, argv[0]);
-        if (!prefix)
-            return JS_FALSE;
-        argv[0] = STRING_TO_JSVAL(prefix);      /* local root */
-
-        for (i = 0; i < length; i++) {
-            if (!OBJ_GET_PROPERTY(cx, arrayobj, INT_TO_JSID(i), &v))
-                return JS_FALSE;
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
-            ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-            if (ns->prefix && !js_CompareStrings(ns->prefix, prefix))
-                break;
-        }
-
-        *rval = (i < length) ? OBJECT_TO_JSVAL(ns->object) : JSVAL_VOID;
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_namespaceDeclarations(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                          jsval *rval)
-{
-    JSObject *arrayobj, *nsobj;
-    JSXML *xml, *yml;
-    JSBool ok;
-    JSXMLArray ancestors, declared;
-    uint32 i, n;
-    JSXMLNamespace *ns;
-    jsval v;
-
-    arrayobj = js_NewArrayObject(cx, 0, NULL);
-    if (!arrayobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(arrayobj);
-
-    XML_METHOD_PROLOG;
-    if (JSXML_HAS_VALUE(xml) || xml->xml_class == JSXML_CLASS_LIST)
-        return JS_TRUE;
-
-    /* From here, control flow must goto out to finish these arrays. */
-    ok = JS_TRUE;
-    XMLArrayInit(cx, &ancestors, 0);
-    XMLArrayInit(cx, &declared, 0);
-    yml = xml;
-
-    while ((yml = yml->parent) != NULL) {
-        JS_ASSERT(yml->xml_class == JSXML_CLASS_ELEMENT);
-        for (i = 0, n = yml->xml_namespaces.length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(&yml->xml_namespaces, i, JSXMLNamespace);
-            if (!XMLARRAY_HAS_MEMBER(&ancestors, ns, namespace_match)) {
-                ok = XMLARRAY_APPEND(cx, &ancestors, ns);
-                if (!ok)
-                    goto out;
-            }
-        }
-    }
-
-    for (i = 0, n = xml->xml_namespaces.length; i < n; i++) {
-        ns = XMLARRAY_MEMBER(&xml->xml_namespaces, i, JSXMLNamespace);
-        if (!ns->declared)
-            continue;
-        if (!XMLARRAY_HAS_MEMBER(&ancestors, ns, namespace_match)) {
-            ok = XMLARRAY_APPEND(cx, &declared, ns);
-            if (!ok)
-                goto out;
-        }
-    }
-
-    for (i = 0, n = declared.length; i < n; i++) {
-        ns = XMLARRAY_MEMBER(&declared, i, JSXMLNamespace);
-        nsobj = js_GetXMLNamespaceObject(cx, ns);
-        if (!nsobj) {
-            ok = JS_FALSE;
-            goto out;
-        }
-        v = OBJECT_TO_JSVAL(nsobj);
-        ok = OBJ_SET_PROPERTY(cx, arrayobj, INT_TO_JSID(i), &v);
-        if (!ok)
-            goto out;
-    }
-
-out:
-    XMLArrayFinish(cx, &ancestors);
-    XMLArrayFinish(cx, &declared);
-    return ok;
-}
-
-static const char js_attribute_str[] = "attribute";
-static const char js_text_str[]      = "text";
-
-/* Exported to jsgc.c #ifdef GC_MARK_DEBUG. */
-const char *js_xml_class_str[] = {
-    "list",
-    "element",
-    js_attribute_str,
-    "processing-instruction",
-    js_text_str,
-    "comment"
-};
-
-static JSBool
-xml_nodeKind(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSXML *xml;
-    JSString *str;
-
-    XML_METHOD_PROLOG;
-    str = JS_InternString(cx, js_xml_class_str[xml->xml_class]);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-static JSBool
-NormalizingDelete(JSContext *cx, JSObject *obj, JSXML *xml, jsval id)
-{
-    jsval junk;
-
-    if (xml->xml_class == JSXML_CLASS_LIST)
-        return DeleteProperty(cx, obj, id, &junk);
-    return DeleteByIndex(cx, xml, id, &junk);
-}
-
-/*
- * Erratum? the testcase js/tests/e4x/XML/13.4.4.26.js wants all-whitespace
- * text between tags to be removed by normalize.
- */
-static JSBool
-IsXMLSpace(JSString *str)
-{
-    const jschar *cp, *end;
-
-    cp = JSSTRING_CHARS(str);
-    end = cp + JSSTRING_LENGTH(str);
-    while (cp < end) {
-        if (!JS_ISXMLSPACE(*cp))
-            return JS_FALSE;
-        ++cp;
-    }
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_normalize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-              jsval *rval)
-{
-    JSXML *xml, *kid, *kid2;
-    uint32 i, n;
-    JSObject *kidobj;
-    JSString *str;
-    jsval junk;
-
-    XML_METHOD_PROLOG;
-    *rval = OBJECT_TO_JSVAL(obj);
-    if (!JSXML_HAS_KIDS(xml))
-        return JS_TRUE;
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-        if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-            kidobj = js_GetXMLObject(cx, kid);
-            if (!kidobj || !xml_normalize(cx, kidobj, argc, argv, &junk))
-                return JS_FALSE;
-        } else if (kid->xml_class == JSXML_CLASS_TEXT) {
-            while (i + 1 < n &&
-                   (kid2 = XMLARRAY_MEMBER(&xml->xml_kids, i + 1, JSXML))
-                   ->xml_class == JSXML_CLASS_TEXT) {
-                str = js_ConcatStrings(cx, kid->xml_value, kid2->xml_value);
-                if (!str)
-                    return JS_FALSE;
-                if (!NormalizingDelete(cx, obj, xml, INT_TO_JSVAL(i + 1)))
-                    return JS_FALSE;
-                n = xml->xml_kids.length;
-                kid->xml_value = str;
-            }
-            if (IS_EMPTY(kid->xml_value) || IsXMLSpace(kid->xml_value)) {
-                if (!NormalizingDelete(cx, obj, xml, INT_TO_JSVAL(i)))
-                    return JS_FALSE;
-                n = xml->xml_kids.length;
-                --i;
-            }
-        }
-    }
-
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_parent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *parent, *kid;
-    uint32 i, n;
-    JSObject *parentobj;
-
-    XML_METHOD_PROLOG;
-    parent = xml->parent;
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        *rval = JSVAL_VOID;
-        n = xml->xml_kids.length;
-        if (n == 0)
-            return JS_TRUE;
-
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
-        parent = kid->parent;
-        for (i = 1; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->parent != parent)
-                return JS_TRUE;
-        }
-    }
-
-    if (!parent) {
-        *rval = JSVAL_NULL;
-        return JS_TRUE;
-    }
-
-    parentobj = js_GetXMLObject(cx, parent);
-    if (!parentobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(parentobj);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_processingInstructions(JSContext *cx, JSObject *obj, uintN argc,
-                           jsval *argv, jsval *rval)
-{
-    JSXML *xml, *list, *kid, *vxml;
-    jsval name, v;
-    JSXMLQName *nameqn;
-    jsid funid;
-    JSObject *listobj, *kidobj;
-    JSBool ok;
-    uint32 i, n;
-
-    XML_METHOD_PROLOG;
-    name = (argc == 0) ? ATOM_KEY(cx->runtime->atomState.starAtom) : argv[0];
-    nameqn = ToXMLName(cx, name, &funid);
-    if (!nameqn)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(nameqn->object);
-
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(listobj);
-    if (funid)
-        return JS_TRUE;
-
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    list->xml_target = xml;
-    list->xml_targetprop = nameqn;
-    ok = JS_TRUE;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        /* 13.5.4.17 Step 4 (misnumbered 9 -- Erratum?). */
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                ok = JS_EnterLocalRootScope(cx);
-                if (!ok)
-                    break;
-                kidobj = js_GetXMLObject(cx, kid);
-                ok = kidobj
-                     ? xml_processingInstructions(cx, kidobj, argc, argv, &v)
-                     : JS_FALSE;
-                JS_LeaveLocalRootScope(cx);
-                if (!ok)
-                    break;
-                vxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-                if (JSXML_LENGTH(vxml) != 0) {
-                    ok = Append(cx, list, vxml);
-                    if (!ok)
-                        break;
-                }
-            }
-        }
-    } else {
-        /* 13.4.4.28 Step 4. */
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION &&
-                (IS_STAR(nameqn->localName) ||
-                 !js_CompareStrings(nameqn->localName, kid->name->localName))) {
-                ok = Append(cx, list, kid);
-                if (!ok)
-                    break;
-            }
-        }
-    }
-
-    return ok;
-}
-
-static JSBool
-xml_prependChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    JSXML *xml;
-
-    XML_METHOD_PROLOG;
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(obj);
-    return Insert(cx, xml, JSVAL_ZERO, argv[0]);
-}
-
-/* XML and XMLList */
-static JSBool
-xml_propertyIsEnumerable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                         jsval *rval)
-{
-    JSXML *xml;
-    jsval name;
-    uint32 index;
-
-    XML_METHOD_PROLOG;
-    name = argv[0];
-    *rval = JSVAL_FALSE;
-    if (js_IdIsIndex(name, &index)) {
-        if (xml->xml_class == JSXML_CLASS_LIST) {
-            /* 13.5.4.18. */
-            *rval = BOOLEAN_TO_JSVAL(index < xml->xml_kids.length);
-        } else {
-            /* 13.4.4.30. */
-            *rval = BOOLEAN_TO_JSVAL(index == 0);
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-namespace_full_match(const void *a, const void *b)
-{
-    const JSXMLNamespace *nsa = (const JSXMLNamespace *) a;
-    const JSXMLNamespace *nsb = (const JSXMLNamespace *) b;
-
-    if (nsa->prefix && nsb->prefix &&
-        js_CompareStrings(nsa->prefix, nsb->prefix)) {
-        return JS_FALSE;
-    }
-    return !js_CompareStrings(nsa->uri, nsb->uri);
-}
-
-static JSBool
-xml_removeNamespace_helper(JSContext *cx, JSXML *xml, JSXMLNamespace *ns)
-{
-    JSXMLNamespace *thisns, *attrns;
-    uint32 i, n;
-    JSXML *attr, *kid;
-
-    thisns = GetNamespace(cx, xml->name, &xml->xml_namespaces);
-    JS_ASSERT(thisns);
-    if (thisns == ns)
-        return JS_TRUE;
-
-    for (i = 0, n = xml->xml_attrs.length; i < n; i++) {
-        attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
-        attrns = GetNamespace(cx, attr->name, &xml->xml_namespaces);
-        JS_ASSERT(attrns);
-        if (attrns == ns)
-            return JS_TRUE;
-    }
-
-    i = XMLARRAY_FIND_MEMBER(&xml->xml_namespaces, ns, namespace_full_match);
-    if (i != XML_NOT_FOUND)
-        XMLArrayDelete(cx, &xml->xml_namespaces, i, JS_TRUE);
-
-    for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-        if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-            if (!xml_removeNamespace_helper(cx, kid, ns))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-xml_removeNamespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                    jsval *rval)
-{
-    JSXML *xml;
-    JSObject *nsobj;
-    JSXMLNamespace *ns;
-
-    XML_METHOD_PROLOG;
-    *rval = OBJECT_TO_JSVAL(obj);
-    if (xml->xml_class != JSXML_CLASS_ELEMENT)
-        return JS_TRUE;
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    nsobj = CallConstructorFunction(cx, obj, &js_NamespaceClass.base, 1, argv);
-    if (!nsobj)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(nsobj);
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-
-    /* NOTE: remove ns from each ancestor if not used by that ancestor. */
-    return xml_removeNamespace_helper(cx, xml, ns);
-}
-
-static JSBool
-xml_replace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *vxml, *kid;
-    jsval name, value, id, junk;
-    uint32 index;
-    JSObject *nameobj;
-    JSXMLQName *nameqn;
-
-    XML_METHOD_PROLOG;
-    *rval = OBJECT_TO_JSVAL(obj);
-    if (xml->xml_class != JSXML_CLASS_ELEMENT)
-        return JS_TRUE;
-
-    value = argv[1];
-    vxml = VALUE_IS_XML(cx, value)
-           ? (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(value))
-           : NULL;
-    if (!vxml) {
-        if (!JS_ConvertValue(cx, value, JSTYPE_STRING, &argv[1]))
-            return JS_FALSE;
-        value = argv[1];
-    } else {
-        vxml = DeepCopy(cx, vxml, NULL, 0);
-        if (!vxml)
-            return JS_FALSE;
-        value = argv[1] = OBJECT_TO_JSVAL(vxml->object);
-    }
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-
-    name = argv[0];
-    if (js_IdIsIndex(name, &index))
-        return Replace(cx, xml, name, value);
-
-    /* Call function QName per spec, not ToXMLName, to avoid attribute names. */
-    nameobj = CallConstructorFunction(cx, obj, &js_QNameClass.base, 1, &name);
-    if (!nameobj)
-        return JS_FALSE;
-    argv[0] = OBJECT_TO_JSVAL(nameobj);
-    nameqn = (JSXMLQName *) JS_GetPrivate(cx, nameobj);
-
-    id = JSVAL_VOID;
-    index = xml->xml_kids.length;
-    while (index != 0) {
-        --index;
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, index, JSXML);
-        if (MatchElemName(nameqn, kid)) {
-            if (!JSVAL_IS_VOID(id) && !DeleteByIndex(cx, xml, id, &junk))
-                return JS_FALSE;
-            if (!IndexToIdVal(cx, index, &id))
-                return JS_FALSE;
-        }
-    }
-    if (JSVAL_IS_VOID(id))
-        return JS_TRUE;
-    return Replace(cx, xml, id, value);
-}
-
-static JSBool
-xml_setChildren(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    if (!PutProperty(cx, obj, ATOM_KEY(cx->runtime->atomState.starAtom),
-                     &argv[0])) {
-        return JS_FALSE;
-    }
-
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSBool
-xml_setLocalName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    JSXML *xml;
-    jsval name;
-    JSXMLQName *nameqn;
-    JSString *namestr;
-
-    XML_METHOD_PROLOG;
-    if (!JSXML_HAS_NAME(xml))
-        return JS_TRUE;
-
-    name = argv[0];
-    if (!JSVAL_IS_PRIMITIVE(name) &&
-        OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(name)) == &js_QNameClass.base) {
-        nameqn = (JSXMLQName *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(name));
-        namestr = nameqn->localName;
-    } else {
-        if (!JS_ConvertValue(cx, name, JSTYPE_STRING, &argv[0]))
-            return JS_FALSE;
-        name = argv[0];
-        namestr = JSVAL_TO_STRING(name);
-    }
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-    xml->name->localName = namestr;
-    return JS_TRUE;
-}
-
-static JSBool
-xml_setName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *nsowner;
-    jsval name;
-    JSXMLQName *nameqn;
-    JSObject *nameobj;
-    JSXMLArray *nsarray;
-    uint32 i, n;
-    JSXMLNamespace *ns;
-
-    XML_METHOD_PROLOG;
-    if (!JSXML_HAS_NAME(xml))
-        return JS_TRUE;
-
-    name = argv[0];
-    if (!JSVAL_IS_PRIMITIVE(name) &&
-        OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(name)) == &js_QNameClass.base &&
-        !(nameqn = (JSXMLQName *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(name)))
-         ->uri) {
-        name = argv[0] = STRING_TO_JSVAL(nameqn->localName);
-    }
-
-    nameobj = js_ConstructObject(cx, &js_QNameClass.base, NULL, NULL, 1, &name);
-    if (!nameobj)
-        return JS_FALSE;
-    nameqn = (JSXMLQName *) JS_GetPrivate(cx, nameobj);
-
-    /* ECMA-357 13.4.4.35 Step 4. */
-    if (xml->xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION)
-        nameqn->uri = cx->runtime->emptyString;
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml)
-        return JS_FALSE;
-    xml->name = nameqn;
-
-    /*
-     * Erratum: nothing in 13.4.4.35 talks about making the name match the
-     * in-scope namespaces, either by finding an in-scope namespace with a
-     * matching uri and setting the new name's prefix to that namespace's
-     * prefix, or by extending the in-scope namespaces for xml (which are in
-     * xml->parent if xml is an attribute or a PI).
-     */
-    if (xml->xml_class == JSXML_CLASS_ELEMENT) {
-        nsowner = xml;
-    } else {
-        if (!xml->parent || xml->parent->xml_class != JSXML_CLASS_ELEMENT)
-            return JS_TRUE;
-        nsowner = xml->parent;
-    }
-
-    if (nameqn->prefix) {
-        /*
-         * The name being set has a prefix, which originally came from some
-         * namespace object (which may be the null namespace, where both the
-         * prefix and uri are the empty string).  We must go through a full
-         * GetNamespace in case that namespace is in-scope in nsowner.
-         *
-         * If we find such an in-scope namespace, we return true right away,
-         * in this block.  Otherwise, we fall through to the final return of
-         * AddInScopeNamespace(cx, nsowner, ns).
-         */
-        ns = GetNamespace(cx, nameqn, &nsowner->xml_namespaces);
-        if (!ns)
-            return JS_FALSE;
-
-        /* XXXbe have to test membership to see whether GetNamespace added */
-        if (XMLARRAY_HAS_MEMBER(&nsowner->xml_namespaces, ns, NULL))
-            return JS_TRUE;
-    } else {
-        /*
-         * At this point, we know nameqn->prefix is null, so nameqn->uri can't
-         * be the empty string (the null namespace always uses the empty string
-         * for both prefix and uri).
-         *
-         * This means we must inline GetNamespace and specialize it to match
-         * uri only, never prefix.  If we find a namespace with nameqn's uri
-         * already in nsowner->xml_namespaces, then all that we need do is set
-         * nameqn->prefix to that namespace's prefix.
-         *
-         * If no such namespace exists, we can create one without going through
-         * the constructor, because we know nameqn->uri is non-empty (so prefix
-         * does not need to be converted from null to empty by QName).
-         */
-        JS_ASSERT(!IS_EMPTY(nameqn->uri));
-
-        nsarray = &nsowner->xml_namespaces;
-        for (i = 0, n = nsarray->length; i < n; i++) {
-            ns = XMLARRAY_MEMBER(nsarray, i, JSXMLNamespace);
-            if (!js_CompareStrings(ns->uri, nameqn->uri)) {
-                nameqn->prefix = ns->prefix;
-                return JS_TRUE;
-            }
-        }
-
-        ns = js_NewXMLNamespace(cx, NULL, nameqn->uri, JS_TRUE);
-        if (!ns)
-            return JS_FALSE;
-    }
-
-    return AddInScopeNamespace(cx, nsowner, ns);
-}
-
-static JSBool
-xml_setNamespace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    JSXML *xml, *nsowner;
-    JSObject *nsobj, *qnobj;
-    JSXMLNamespace *ns;
-    jsval qnargv[2];
-
-    XML_METHOD_PROLOG;
-    if (xml->xml_class != JSXML_CLASS_ELEMENT &&
-        xml->xml_class != JSXML_CLASS_ATTRIBUTE) {
-        return JS_TRUE;
-    }
-
-    xml = CHECK_COPY_ON_WRITE(cx, xml, obj);
-    if (!xml || !js_GetXMLQNameObject(cx, xml->name))
-        return JS_FALSE;
-
-    nsobj = js_ConstructObject(cx, &js_NamespaceClass.base, NULL, obj, 1, argv);
-    if (!nsobj)
-        return JS_FALSE;
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, nsobj);
-    ns->declared = JS_TRUE;
-
-    qnargv[0] = argv[0] = OBJECT_TO_JSVAL(nsobj);
-    qnargv[1] = OBJECT_TO_JSVAL(xml->name->object);
-    qnobj = js_ConstructObject(cx, &js_QNameClass.base, NULL, NULL, 2, qnargv);
-    if (!qnobj)
-        return JS_FALSE;
-
-    xml->name = (JSXMLQName *) JS_GetPrivate(cx, qnobj);
-
-    /*
-     * Erratum: the spec fails to update the governing in-scope namespaces.
-     * See the erratum noted in xml_setName, above.
-     */
-    if (xml->xml_class == JSXML_CLASS_ELEMENT) {
-        nsowner = xml;
-    } else {
-        if (!xml->parent || xml->parent->xml_class != JSXML_CLASS_ELEMENT)
-            return JS_TRUE;
-        nsowner = xml->parent;
-    }
-    return AddInScopeNamespace(cx, nsowner, ns);
-}
-
-/* XML and XMLList */
-static JSBool
-xml_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSXML *xml, *list, *kid, *vxml;
-    JSObject *listobj, *kidobj;
-    uint32 i, n;
-    JSBool ok;
-    jsval v;
-
-    XML_METHOD_PROLOG;
-    listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!listobj)
-        return JS_FALSE;
-
-    *rval = OBJECT_TO_JSVAL(listobj);
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    list->xml_target = xml;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        ok = JS_TRUE;
-        for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_ELEMENT) {
-                ok = JS_EnterLocalRootScope(cx);
-                if (!ok)
-                    break;
-                kidobj = js_GetXMLObject(cx, kid);
-                ok = kidobj
-                     ? xml_text(cx, kidobj, argc, argv, &v)
-                     : JS_FALSE;
-                JS_LeaveLocalRootScope(cx);
-                if (!ok)
-                    return JS_FALSE;
-                vxml = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(v));
-                if (JSXML_LENGTH(vxml) != 0 && !Append(cx, list, vxml))
-                    return JS_FALSE;
-            }
-        }
-    } else {
-        for (i = 0, n = JSXML_LENGTH(xml); i < n; i++) {
-            kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            if (kid->xml_class == JSXML_CLASS_TEXT && !Append(cx, list, kid))
-                return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_toXMLString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    JSString *str;
-
-    str = ToXMLString(cx, OBJECT_TO_JSVAL(obj));
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSString *
-xml_toString_helper(JSContext *cx, JSXML *xml)
-{
-    JSString *str, *kidstr;
-    JSXML *kid;
-    uint32 i, n;
-
-    if (xml->xml_class == JSXML_CLASS_ATTRIBUTE ||
-        xml->xml_class == JSXML_CLASS_TEXT) {
-        return xml->xml_value;
-    }
-
-    if (!HasSimpleContent(xml))
-        return ToXMLString(cx, OBJECT_TO_JSVAL(xml->object));
-
-    str = cx->runtime->emptyString;
-    JS_EnterLocalRootScope(cx);
-    for (i = 0, n = xml->xml_kids.length; i < n; i++) {
-        kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-        if (kid->xml_class != JSXML_CLASS_COMMENT &&
-            kid->xml_class != JSXML_CLASS_PROCESSING_INSTRUCTION) {
-            kidstr = xml_toString_helper(cx, kid);
-            if (!kidstr) {
-                str = NULL;
-                break;
-            }
-            str = js_ConcatStrings(cx, str, kidstr);
-            if (!str)
-                break;
-        }
-    }
-    JS_LeaveLocalRootScope(cx);
-    return str;
-}
-
-static JSBool
-xml_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-             jsval *rval)
-{
-    JSXML *xml;
-    JSString *str;
-
-    XML_METHOD_PROLOG;
-    str = xml_toString_helper(cx, xml);
-    if (!str)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(str);
-    return JS_TRUE;
-}
-
-/* XML and XMLList */
-static JSBool
-xml_valueOf(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-static JSFunctionSpec xml_methods[] = {
-    {"addNamespace",          xml_addNamespace,          1,0,XML_MASK},
-    {"appendChild",           xml_appendChild,           1,0,XML_MASK},
-    {js_attribute_str,        xml_attribute,             1,0,GENERIC_MASK},
-    {"attributes",            xml_attributes,            0,0,GENERIC_MASK},
-    {"child",                 xml_child,                 1,0,GENERIC_MASK},
-    {"childIndex",            xml_childIndex,            0,0,XML_MASK},
-    {"children",              xml_children,              0,0,GENERIC_MASK},
-    {"comments",              xml_comments,              0,0,GENERIC_MASK},
-    {"contains",              xml_contains,              1,0,GENERIC_MASK},
-    {"copy",                  xml_copy,                  0,0,GENERIC_MASK},
-    {"descendants",           xml_descendants,           1,0,GENERIC_MASK},
-    {"elements",              xml_elements,              1,0,GENERIC_MASK},
-    {"hasOwnProperty",        xml_hasOwnProperty,        1,0,GENERIC_MASK},
-    {"hasComplexContent",     xml_hasComplexContent,     1,0,GENERIC_MASK},
-    {"hasSimpleContent",      xml_hasSimpleContent,      1,0,GENERIC_MASK},
-    {"inScopeNamespaces",     xml_inScopeNamespaces,     0,0,XML_MASK},
-    {"insertChildAfter",      xml_insertChildAfter,      2,0,XML_MASK},
-    {"insertChildBefore",     xml_insertChildBefore,     2,0,XML_MASK},
-    {js_length_str,           xml_length,                0,0,GENERIC_MASK},
-    {js_localName_str,        xml_localName,             0,0,XML_MASK},
-    {js_name_str,             xml_name,                  0,0,XML_MASK},
-    {js_namespace_str,        xml_namespace,             1,0,XML_MASK},
-    {"namespaceDeclarations", xml_namespaceDeclarations, 0,0,XML_MASK},
-    {"nodeKind",              xml_nodeKind,              0,0,XML_MASK},
-    {"normalize",             xml_normalize,             0,0,GENERIC_MASK},
-    {js_xml_parent_str,       xml_parent,                0,0,GENERIC_MASK},
-    {"processingInstructions",xml_processingInstructions,1,0,GENERIC_MASK},
-    {"prependChild",          xml_prependChild,          1,0,XML_MASK},
-    {"propertyIsEnumerable",  xml_propertyIsEnumerable,  1,0,GENERIC_MASK},
-    {"removeNamespace",       xml_removeNamespace,       1,0,XML_MASK},
-    {"replace",               xml_replace,               2,0,XML_MASK},
-    {"setChildren",           xml_setChildren,           1,0,XML_MASK},
-    {"setLocalName",          xml_setLocalName,          1,0,XML_MASK},
-    {"setName",               xml_setName,               1,0,XML_MASK},
-    {"setNamespace",          xml_setNamespace,          1,0,XML_MASK},
-    {js_text_str,             xml_text,                  0,0,GENERIC_MASK},
-    {js_toString_str,         xml_toString,              0,0,GENERIC_MASK},
-    {js_toXMLString_str,      xml_toXMLString,           0,0,GENERIC_MASK},
-    {js_valueOf_str,          xml_valueOf,               0,0,GENERIC_MASK},
-    {0,0,0,0,0}
-};
-
-static JSBool
-CopyXMLSettings(JSContext *cx, JSObject *from, JSObject *to)
-{
-    int i;
-    const char *name;
-    jsval v;
-
-    for (i = XML_IGNORE_COMMENTS; i < XML_PRETTY_INDENT; i++) {
-        name = xml_static_props[i].name;
-        if (!JS_GetProperty(cx, from, name, &v))
-            return JS_FALSE;
-        if (JSVAL_IS_BOOLEAN(v) && !JS_SetProperty(cx, to, name, &v))
-            return JS_FALSE;
-    }
-
-    name = xml_static_props[i].name;
-    if (!JS_GetProperty(cx, from, name, &v))
-        return JS_FALSE;
-    if (JSVAL_IS_NUMBER(v) && !JS_SetProperty(cx, to, name, &v))
-        return JS_FALSE;
-    return JS_TRUE;
-}
-
-static JSBool
-SetDefaultXMLSettings(JSContext *cx, JSObject *obj)
-{
-    int i;
-    jsval v;
-
-    for (i = XML_IGNORE_COMMENTS; i < XML_PRETTY_INDENT; i++) {
-        v = JSVAL_TRUE;
-        if (!JS_SetProperty(cx, obj, xml_static_props[i].name, &v))
-            return JS_FALSE;
-    }
-    v = INT_TO_JSVAL(2);
-    return JS_SetProperty(cx, obj, xml_static_props[i].name, &v);
-}
-
-static JSBool
-xml_settings(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    JSObject *settings;
-
-    settings = JS_NewObject(cx, NULL, NULL, NULL);
-    if (!settings)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(settings);
-    return CopyXMLSettings(cx, obj, settings);
-}
-
-static JSBool
-xml_setSettings(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                jsval *rval)
-{
-    jsval v;
-    JSBool ok;
-    JSObject *settings;
-
-    v = argv[0];
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)) {
-        cx->xmlSettingFlags = 0;
-        ok = SetDefaultXMLSettings(cx, obj);
-    } else {
-        if (JSVAL_IS_PRIMITIVE(v))
-            return JS_TRUE;
-        settings = JSVAL_TO_OBJECT(v);
-        cx->xmlSettingFlags = 0;
-        ok = CopyXMLSettings(cx, settings, obj);
-    }
-    if (ok)
-        cx->xmlSettingFlags |= XSF_CACHE_VALID;
-    return ok;
-}
-
-static JSBool
-xml_defaultSettings(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                    jsval *rval)
-{
-    JSObject *settings;
-
-    settings = JS_NewObject(cx, NULL, NULL, NULL);
-    if (!settings)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(settings);
-    return SetDefaultXMLSettings(cx, settings);
-}
-
-static JSFunctionSpec xml_static_methods[] = {
-    {"settings",         xml_settings,          0,0,0},
-    {"setSettings",      xml_setSettings,       1,0,0},
-    {"defaultSettings",  xml_defaultSettings,   0,0,0},
-    {0,0,0,0,0}
-};
-
-static JSBool
-XML(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    JSXML *xml, *copy;
-    JSObject *xobj, *vobj;
-    JSClass *clasp;
-
-    v = argv[0];
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v))
-        v = STRING_TO_JSVAL(cx->runtime->emptyString);
-
-    xobj = ToXML(cx, v);
-    if (!xobj)
-        return JS_FALSE;
-    *rval = OBJECT_TO_JSVAL(xobj);
-    xml = (JSXML *) JS_GetPrivate(cx, xobj);
-
-    if ((cx->fp->flags & JSFRAME_CONSTRUCTING) && !JSVAL_IS_PRIMITIVE(v)) {
-        vobj = JSVAL_TO_OBJECT(v);
-        clasp = OBJ_GET_CLASS(cx, vobj);
-        if (clasp == &js_XMLClass ||
-            (clasp->flags & JSCLASS_DOCUMENT_OBSERVER)) {
-            /* No need to lock obj, it's newly constructed and thread local. */
-            copy = DeepCopy(cx, xml, obj, 0);
-            if (!copy)
-                return JS_FALSE;
-            JS_ASSERT(copy->object == obj);
-            *rval = OBJECT_TO_JSVAL(obj);
-            return JS_TRUE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-XMLList(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-    jsval v;
-    JSObject *vobj, *listobj;
-    JSXML *xml, *list;
-
-    v = argv[0];
-    if (JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v))
-        v = STRING_TO_JSVAL(cx->runtime->emptyString);
-
-    if ((cx->fp->flags & JSFRAME_CONSTRUCTING) && !JSVAL_IS_PRIMITIVE(v)) {
-        vobj = JSVAL_TO_OBJECT(v);
-        if (OBJECT_IS_XML(cx, vobj)) {
-            xml = (JSXML *) JS_GetPrivate(cx, vobj);
-            if (xml->xml_class == JSXML_CLASS_LIST) {
-                listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-                if (!listobj)
-                    return JS_FALSE;
-                *rval = OBJECT_TO_JSVAL(listobj);
-
-                list = (JSXML *) JS_GetPrivate(cx, listobj);
-                if (!Append(cx, list, xml))
-                    return JS_FALSE;
-                return JS_TRUE;
-            }
-        }
-    }
-
-    /* Toggle on XML support since the script has explicitly requested it. */
-    listobj = ToXMLList(cx, v);
-    if (!listobj)
-        return JS_FALSE;
-
-    *rval = OBJECT_TO_JSVAL(listobj);
-    return JS_TRUE;
-}
-
-#define JSXML_LIST_SIZE     (offsetof(JSXML, u) + sizeof(struct JSXMLListVar))
-#define JSXML_ELEMENT_SIZE  (offsetof(JSXML, u) + sizeof(struct JSXMLVar))
-#define JSXML_LEAF_SIZE     (offsetof(JSXML, u) + sizeof(JSString *))
-
-static size_t sizeof_JSXML[JSXML_CLASS_LIMIT] = {
-    JSXML_LIST_SIZE,        /* JSXML_CLASS_LIST */
-    JSXML_ELEMENT_SIZE,     /* JSXML_CLASS_ELEMENT */
-    JSXML_LEAF_SIZE,        /* JSXML_CLASS_ATTRIBUTE */
-    JSXML_LEAF_SIZE,        /* JSXML_CLASS_PROCESSING_INSTRUCTION */
-    JSXML_LEAF_SIZE,        /* JSXML_CLASS_TEXT */
-    JSXML_LEAF_SIZE         /* JSXML_CLASS_COMMENT */
-};
-
-#ifdef DEBUG_notme
-JSCList xml_leaks = JS_INIT_STATIC_CLIST(&xml_leaks);
-uint32  xml_serial;
-#endif
-
-JSXML *
-js_NewXML(JSContext *cx, JSXMLClass xml_class)
-{
-    JSXML *xml;
-
-    xml = (JSXML *) js_NewGCThing(cx, GCX_XML, sizeof_JSXML[xml_class]);
-    if (!xml)
-        return NULL;
-
-    xml->object = NULL;
-    xml->domnode = NULL;
-    xml->parent = NULL;
-    xml->name = NULL;
-    xml->xml_class = xml_class;
-    xml->xml_flags = 0;
-    if (JSXML_CLASS_HAS_VALUE(xml_class)) {
-        xml->xml_value = cx->runtime->emptyString;
-    } else {
-        XMLArrayInit(cx, &xml->xml_kids, 0);
-        if (xml_class == JSXML_CLASS_LIST) {
-            xml->xml_target = NULL;
-            xml->xml_targetprop = NULL;
-        } else {
-            XMLArrayInit(cx, &xml->xml_namespaces, 0);
-            XMLArrayInit(cx, &xml->xml_attrs, 0);
-        }
-    }
-
-#ifdef DEBUG_notme
-    JS_APPEND_LINK(&xml->links, &xml_leaks);
-    xml->serial = xml_serial++;
-#endif
-    METER(xml_stats.xml);
-    METER(xml_stats.livexml);
-    return xml;
-}
-
-/*
- * Code factored from js_MarkXML for use by xml_DeutschScorrWaite, see below.
- * All things marked here cannot lead to overlong lists (mark stack overflow).
- */
-static void
-xml_mark_tail(JSContext *cx, JSXML *xml, void *arg)
-{
-    XMLArrayTrim(&xml->xml_kids);
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        if (xml->xml_target)
-            js_MarkXML(cx, xml->xml_target, arg);
-        if (xml->xml_targetprop)
-            js_MarkXMLQName(cx, xml->xml_targetprop, arg);
-    } else {
-        namespace_mark_vector(cx,
-                              (JSXMLNamespace **) xml->xml_namespaces.vector,
-                              xml->xml_namespaces.length,
-                              arg);
-        XMLArrayTrim(&xml->xml_namespaces);
-
-        xml_mark_vector(cx,
-                        (JSXML **) xml->xml_attrs.vector,
-                        xml->xml_attrs.length,
-                        arg);
-        XMLArrayTrim(&xml->xml_attrs);
-    }
-}
-
-static void
-xml_DeutschSchorrWaite(JSContext *cx, JSXML *xml, void *arg)
-{
-    JSXML *top, *kid;
-    uint8 *flagp;
-    uint32 i, n;
-#ifdef JS_GCMETER
-    JSRuntime *rt = cx->runtime;
-# define GCMETER(x)     x
-#else
-# define GCMETER(x)     /* nothing */
-#endif
-
-    top = NULL;
-    flagp = js_GetGCThingFlags(xml);
-
-down:
-    GCMETER(if (++rt->gcStats.dswdepth > rt->gcStats.maxdswdepth)
-                rt->gcStats.maxdswdepth = rt->gcStats.dswdepth);
-
-    *flagp |= GCF_MARK;
-
-    i = 0;
-    for (;;) {
-        /*
-         * Let (i == n) index xml->parent, not any child in xml->xml_kids.
-         * Use JSXML_LENGTH here and below in case xml is a leaf node whose
-         * parent we are marking non-recursively.  In the case where parent
-         * is being marked, the "kid/down" sense is backwards -- humor me.
-         */
-        for (n = JSXML_LENGTH(xml); i <= n; i++) {
-            if (i < n) {
-                kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
-            } else {
-                kid = xml->parent;
-                if (!kid)
-                    continue;
-            }
-
-            flagp = js_GetGCThingFlags(kid);
-            if (*flagp & GCF_MARK)
-                continue;
-
-            /*
-             * Don't descend if a for..in loop is enumerating xml's kids, i.e.
-             * if xml has kids and its xml_kids.cursors member is non-null.
-             */
-            if (JSXML_HAS_KIDS(kid) &&
-                (JSXML_HAS_VALUE(xml) || !xml->xml_kids.cursors)) {
-                if (i < n)
-                    XMLARRAY_SET_MEMBER(&xml->xml_kids, i, top);
-                else
-                    xml->parent = top;
-                if (JSXML_HAS_KIDS(xml))
-                    xml->xml_kids.cursors = JS_UINT32_TO_PTR(i);
-                top = xml;
-                xml = kid;
-                goto down;
-            }
-
-            js_MarkXML(cx, kid, arg);
-        }
-
-        /* If we are back at the root (or we never left it), we're done. */
-        GCMETER(rt->gcStats.dswdepth--);
-        xml->xml_kids.cursors = NULL;
-        if (!top)
-            return;
-
-        /* Time to go back up the spanning tree. */
-        GCMETER(rt->gcStats.dswup++);
-        i = JSXML_HAS_KIDS(top) ? JS_PTR_TO_UINT32(top->xml_kids.cursors) : 0;
-        if (i < JSXML_LENGTH(top)) {
-            kid = XMLARRAY_MEMBER(&top->xml_kids, i, JSXML);
-            XMLARRAY_SET_MEMBER(&top->xml_kids, i, xml);
-        } else {
-            JS_ASSERT(i == JSXML_LENGTH(top));
-            kid = top->parent;
-            top->parent = xml;
-        }
-        xml = top;
-        top = kid;
-        i++;
-    }
-#undef GCMETER
-}
-
-void
-js_MarkXML(JSContext *cx, JSXML *xml, void *arg)
-{
-    int stackDummy;
-
-    JS_MarkGCThing(cx, xml->object, js_object_str, arg);
-    JS_MarkGCThing(cx, xml->name, js_name_str, arg);
-    if (!JS_CHECK_STACK_SIZE(cx, stackDummy)) {
-        xml_DeutschSchorrWaite(cx, xml, arg);
-    } else {
-        JS_MarkGCThing(cx, xml->parent, js_xml_parent_str, arg);
-
-        if (JSXML_HAS_VALUE(xml)) {
-            JS_MarkGCThing(cx, xml->xml_value, "value", arg);
-        } else {
-            xml_mark_vector(cx,
-                            (JSXML **) xml->xml_kids.vector,
-                            xml->xml_kids.length,
-                            arg);
-
-            xml_mark_tail(cx, xml, arg);
-        }
-    }
-}
-
-void
-js_FinalizeXML(JSContext *cx, JSXML *xml)
-{
-    if (JSXML_HAS_KIDS(xml)) {
-        XMLArrayFinish(cx, &xml->xml_kids);
-        if (xml->xml_class == JSXML_CLASS_ELEMENT) {
-            XMLArrayFinish(cx, &xml->xml_namespaces);
-            XMLArrayFinish(cx, &xml->xml_attrs);
-        }
-    }
-
-#ifdef DEBUG_notme
-    JS_REMOVE_LINK(&xml->links);
-#endif
-
-    UNMETER(xml_stats.livexml);
-}
-
-JSObject *
-js_ParseNodeToXMLObject(JSContext *cx, JSParseNode *pn)
-{
-    jsval nsval;
-    JSXMLNamespace *ns;
-    JSXMLArray nsarray;
-    JSXML *xml;
-
-    if (!js_GetDefaultXMLNamespace(cx, &nsval))
-        return NULL;
-    JS_ASSERT(!JSVAL_IS_PRIMITIVE(nsval));
-    ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(nsval));
-
-    if (!XMLArrayInit(cx, &nsarray, 1))
-        return NULL;
-
-    XMLARRAY_APPEND(cx, &nsarray, ns);
-    xml = ParseNodeToXML(cx, pn, &nsarray, XSF_PRECOMPILED_ROOT);
-    XMLArrayFinish(cx, &nsarray);
-    if (!xml)
-        return NULL;
-
-    return xml->object;
-}
-
-JSObject *
-js_NewXMLObject(JSContext *cx, JSXMLClass xml_class)
-{
-    JSXML *xml;
-
-    xml = js_NewXML(cx, xml_class);
-    if (!xml)
-        return NULL;
-    return js_GetXMLObject(cx, xml);
-}
-
-static JSObject *
-NewXMLObject(JSContext *cx, JSXML *xml)
-{
-    JSObject *obj;
-
-    obj = js_NewObject(cx, &js_XMLClass, NULL, NULL);
-    if (!obj || !JS_SetPrivate(cx, obj, xml)) {
-        cx->newborn[GCX_OBJECT] = NULL;
-        return NULL;
-    }
-    METER(xml_stats.xmlobj);
-    METER(xml_stats.livexmlobj);
-    return obj;
-}
-
-JSObject *
-js_GetXMLObject(JSContext *cx, JSXML *xml)
-{
-    JSObject *obj;
-
-    obj = xml->object;
-    if (obj) {
-        JS_ASSERT(JS_GetPrivate(cx, obj) == xml);
-        return obj;
-    }
-
-    /*
-     * A JSXML cannot be shared among threads unless it has an object.
-     * A JSXML cannot be given an object unless:
-     * (a) it has no parent; or
-     * (b) its parent has no object (therefore is thread-private); or
-     * (c) its parent's object is locked.
-     *
-     * Once given an object, a JSXML is immutable.
-     */
-    JS_ASSERT(!xml->parent ||
-              !xml->parent->object ||
-              JS_IS_OBJ_LOCKED(cx, xml->parent->object));
-
-    obj = NewXMLObject(cx, xml);
-    if (!obj)
-        return NULL;
-    xml->object = obj;
-    return obj;
-}
-
-JSObject *
-js_InitNamespaceClass(JSContext *cx, JSObject *obj)
-{
-    return JS_InitClass(cx, obj, NULL, &js_NamespaceClass.base, Namespace, 2,
-                        namespace_props, namespace_methods, NULL, NULL);
-}
-
-JSObject *
-js_InitQNameClass(JSContext *cx, JSObject *obj)
-{
-    return JS_InitClass(cx, obj, NULL, &js_QNameClass.base, QName, 2,
-                        qname_props, qname_methods, NULL, NULL);
-}
-
-JSObject *
-js_InitAttributeNameClass(JSContext *cx, JSObject *obj)
-{
-    return JS_InitClass(cx, obj, NULL, &js_AttributeNameClass, AttributeName, 2,
-                        qname_props, qname_methods, NULL, NULL);
-}
-
-JSObject *
-js_InitAnyNameClass(JSContext *cx, JSObject *obj)
-{
-    jsval v;
-
-    if (!js_GetAnyName(cx, &v))
-        return NULL;
-    return JSVAL_TO_OBJECT(v);
-}
-
-JSObject *
-js_InitXMLClass(JSContext *cx, JSObject *obj)
-{
-    JSObject *proto, *pobj, *ctor;
-    JSFunctionSpec *fs;
-    JSFunction *fun;
-    JSXML *xml;
-    JSProperty *prop;
-    JSScopeProperty *sprop;
-    jsval cval, argv[1], junk;
-
-    /* Define the isXMLName function. */
-    if (!JS_DefineFunction(cx, obj, js_isXMLName_str, xml_isXMLName, 1, 0))
-        return NULL;
-
-    /* Define the XML class constructor and prototype. */
-    proto = JS_InitClass(cx, obj, NULL, &js_XMLClass, XML, 1,
-                         NULL, NULL,
-                         xml_static_props, xml_static_methods);
-    if (!proto)
-        return NULL;
-
-    /*
-     * XXX Hack alert: expand JS_DefineFunctions here to copy fs->extra into
-     * fun->spare, clearing fun->extra.  No xml_methods require extra local GC
-     * roots allocated after actual arguments on the VM stack, but we need a
-     * way to tell which methods work only on XML objects, which work only on
-     * XMLList objects, and which work on either.
-     */
-    for (fs = xml_methods; fs->name; fs++) {
-        fun = JS_DefineFunction(cx, proto, fs->name, fs->call, fs->nargs,
-                                fs->flags);
-        if (!fun)
-            return NULL;
-        fun->extra = 0;
-        fun->spare = fs->extra;
-    }
-
-    xml = js_NewXML(cx, JSXML_CLASS_TEXT);
-    if (!xml || !JS_SetPrivate(cx, proto, xml))
-        return NULL;
-    xml->object = proto;
-    METER(xml_stats.xmlobj);
-    METER(xml_stats.livexmlobj);
-
-    /*
-     * Prepare to set default settings on the XML constructor we just made.
-     * NB: We can't use JS_GetConstructor, because it calls OBJ_GET_PROPERTY,
-     * which is xml_getProperty, which creates a new XMLList every time!  We
-     * must instead call js_LookupProperty directly.
-     */
-    if (!js_LookupProperty(cx, proto,
-                           ATOM_TO_JSID(cx->runtime->atomState.constructorAtom),
-                           &pobj, &prop)) {
-        return NULL;
-    }
-    JS_ASSERT(prop);
-    sprop = (JSScopeProperty *) prop;
-    JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)));
-    cval = OBJ_GET_SLOT(cx, pobj, sprop->slot);
-    OBJ_DROP_PROPERTY(cx, pobj, prop);
-    JS_ASSERT(JSVAL_IS_FUNCTION(cx, cval));
-
-    /* Set default settings. */
-    ctor = JSVAL_TO_OBJECT(cval);
-    argv[0] = JSVAL_VOID;
-    if (!xml_setSettings(cx, ctor, 1, argv, &junk))
-        return NULL;
-
-    /* Define the XMLList function and give it the same prototype as XML. */
-    fun = JS_DefineFunction(cx, obj, js_XMLList_str, XMLList, 1, 0);
-    if (!fun)
-        return NULL;
-    if (!js_SetClassPrototype(cx, fun->object, proto,
-                              JSPROP_READONLY | JSPROP_PERMANENT)) {
-        return NULL;
-    }
-    return proto;
-}
-
-JSObject *
-js_InitXMLClasses(JSContext *cx, JSObject *obj)
-{
-    if (!js_InitNamespaceClass(cx, obj))
-        return NULL;
-    if (!js_InitQNameClass(cx, obj))
-        return NULL;
-    if (!js_InitAttributeNameClass(cx, obj))
-        return NULL;
-    if (!js_InitAnyNameClass(cx, obj))
-        return NULL;
-    return js_InitXMLClass(cx, obj);
-}
-
-JSBool
-js_GetFunctionNamespace(JSContext *cx, jsval *vp)
-{
-    JSRuntime *rt;
-    JSObject *obj;
-    JSAtom *atom;
-    JSString *prefix, *uri;
-
-    /* An invalid URI, for internal use only, guaranteed not to collide. */
-    static const char anti_uri[] = "@mozilla.org/js/function";
-
-    rt = cx->runtime;
-    obj = rt->functionNamespaceObject;
-    if (!obj) {
-        atom = js_Atomize(cx, js_function_str, 8, 0);
-        JS_ASSERT(atom);
-        prefix = ATOM_TO_STRING(atom);
-
-        atom = js_Atomize(cx, anti_uri, sizeof anti_uri - 1, ATOM_PINNED);
-        if (!atom)
-            return JS_FALSE;
-        rt->atomState.lazy.functionNamespaceURIAtom = atom;
-
-        uri = ATOM_TO_STRING(atom);
-        obj = js_NewXMLNamespaceObject(cx, prefix, uri, JS_FALSE);
-        if (!obj)
-            return JS_FALSE;
-
-        /*
-         * Avoid entraining any in-scope Object.prototype.  The loss of
-         * Namespace.prototype is not detectable, as there is no way to
-         * refer to this instance in scripts.  When used to qualify method
-         * names, its prefix and uri references are copied to the QName.
-         */
-        OBJ_SET_PROTO(cx, obj, NULL);
-        OBJ_SET_PARENT(cx, obj, NULL);
-        rt->functionNamespaceObject = obj;
-    }
-    *vp = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/*
- * Note the asymmetry between js_GetDefaultXMLNamespace and js_SetDefaultXML-
- * Namespace.  Get searches fp->scopeChain for JS_DEFAULT_XML_NAMESPACE_ID,
- * while Set sets JS_DEFAULT_XML_NAMESPACE_ID in fp->varobj (unless fp is a
- * lightweight function activation).  There's no requirement that fp->varobj
- * lie directly on fp->scopeChain, although it should be reachable using the
- * prototype chain from a scope object (cf. JSOPTION_VAROBJFIX in jsapi.h).
- *
- * If Get can't find JS_DEFAULT_XML_NAMESPACE_ID along the scope chain, it
- * creates a default namespace via 'new Namespace()'.  In contrast, Set uses
- * its v argument as the uri of a new Namespace, with "" as the prefix.  See
- * ECMA-357 12.1 and 12.1.1.  Note that if Set is called with a Namespace n,
- * the default XML namespace will be set to ("", n.uri).  So the uri string
- * is really the only usefully stored value of the default namespace.
- */
-JSBool
-js_GetDefaultXMLNamespace(JSContext *cx, jsval *vp)
-{
-    JSStackFrame *fp;
-    JSObject *nsobj, *obj, *tmp;
-    jsval v;
-
-    fp = cx->fp;
-    nsobj = fp->xmlNamespace;
-    if (nsobj) {
-        *vp = OBJECT_TO_JSVAL(nsobj);
-        return JS_TRUE;
-    }
-
-    obj = NULL;
-    for (tmp = fp->scopeChain; tmp; tmp = OBJ_GET_PARENT(cx, obj)) {
-        obj = tmp;
-        if (!OBJ_GET_PROPERTY(cx, obj, JS_DEFAULT_XML_NAMESPACE_ID, &v))
-            return JS_FALSE;
-        if (!JSVAL_IS_PRIMITIVE(v)) {
-            fp->xmlNamespace = JSVAL_TO_OBJECT(v);
-            *vp = v;
-            return JS_TRUE;
-        }
-    }
-
-    nsobj = js_ConstructObject(cx, &js_NamespaceClass.base, NULL, obj, 0, NULL);
-    if (!nsobj)
-        return JS_FALSE;
-    v = OBJECT_TO_JSVAL(nsobj);
-    if (obj &&
-        !OBJ_DEFINE_PROPERTY(cx, obj, JS_DEFAULT_XML_NAMESPACE_ID, v,
-                             JS_PropertyStub, JS_PropertyStub,
-                             JSPROP_PERMANENT, NULL)) {
-        return JS_FALSE;
-    }
-    fp->xmlNamespace = nsobj;
-    *vp = v;
-    return JS_TRUE;
-}
-
-JSBool
-js_SetDefaultXMLNamespace(JSContext *cx, jsval v)
-{
-    jsval argv[2];
-    JSObject *nsobj, *varobj;
-    JSStackFrame *fp;
-
-    argv[0] = STRING_TO_JSVAL(cx->runtime->emptyString);
-    argv[1] = v;
-    nsobj = js_ConstructObject(cx, &js_NamespaceClass.base, NULL, NULL,
-                               2, argv);
-    if (!nsobj)
-        return JS_FALSE;
-    v = OBJECT_TO_JSVAL(nsobj);
-
-    fp = cx->fp;
-    varobj = fp->varobj;
-    if (varobj) {
-        if (!OBJ_DEFINE_PROPERTY(cx, varobj, JS_DEFAULT_XML_NAMESPACE_ID, v,
-                                 JS_PropertyStub, JS_PropertyStub,
-                                 JSPROP_PERMANENT, NULL)) {
-            return JS_FALSE;
-        }
-    } else {
-        JS_ASSERT(fp->fun && !(fp->fun->flags & JSFUN_HEAVYWEIGHT));
-    }
-    fp->xmlNamespace = JSVAL_TO_OBJECT(v);
-    return JS_TRUE;
-}
-
-JSBool
-js_ToAttributeName(JSContext *cx, jsval *vp)
-{
-    JSXMLQName *qn;
-
-    qn = ToAttributeName(cx, *vp);
-    if (!qn)
-        return JS_FALSE;
-    *vp = OBJECT_TO_JSVAL(qn->object);
-    return JS_TRUE;
-}
-
-JSString *
-js_EscapeAttributeValue(JSContext *cx, JSString *str)
-{
-    return EscapeAttributeValue(cx, NULL, str);
-}
-
-JSString *
-js_AddAttributePart(JSContext *cx, JSBool isName, JSString *str, JSString *str2)
-{
-    size_t len, len2, newlen;
-    jschar *chars;
-
-    if (JSSTRING_IS_DEPENDENT(str) ||
-        !(*js_GetGCThingFlags(str) & GCF_MUTABLE)) {
-        str = js_NewStringCopyN(cx, JSSTRING_CHARS(str), JSSTRING_LENGTH(str),
-                                0);
-        if (!str)
-            return NULL;
-    }
-
-    len = str->length;
-    len2 = JSSTRING_LENGTH(str2);
-    newlen = (isName) ? len + 1 + len2 : len + 2 + len2 + 1;
-    chars = (jschar *) JS_realloc(cx, str->chars, (newlen+1) * sizeof(jschar));
-    if (!chars)
-        return NULL;
-
-    /*
-     * Reallocating str (because we know it has no other references) requires
-     * purging any deflated string cached for it.
-     */
-    js_PurgeDeflatedStringCache(str);
-
-    str->chars = chars;
-    str->length = newlen;
-    chars += len;
-    if (isName) {
-        *chars++ = ' ';
-        js_strncpy(chars, JSSTRING_CHARS(str2), len2);
-        chars += len2;
-    } else {
-        *chars++ = '=';
-        *chars++ = '"';
-        js_strncpy(chars, JSSTRING_CHARS(str2), len2);
-        chars += len2;
-        *chars++ = '"';
-    }
-    *chars = 0;
-    return str;
-}
-
-JSString *
-js_EscapeElementValue(JSContext *cx, JSString *str)
-{
-    return EscapeElementValue(cx, NULL, str);
-}
-
-JSString *
-js_ValueToXMLString(JSContext *cx, jsval v)
-{
-    return ToXMLString(cx, v);
-}
-
-static JSBool
-anyname_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                 jsval *rval)
-{
-    *rval = ATOM_KEY(cx->runtime->atomState.starAtom);
-    return JS_TRUE;
-}
-
-JSBool
-js_GetAnyName(JSContext *cx, jsval *vp)
-{
-    JSRuntime *rt;
-    JSObject *obj;
-    JSXMLQName *qn;
-
-    rt = cx->runtime;
-    obj = rt->anynameObject;
-    if (!obj) {
-        qn = js_NewXMLQName(cx, rt->emptyString, rt->emptyString,
-                            ATOM_TO_STRING(rt->atomState.starAtom));
-        if (!qn)
-            return JS_FALSE;
-
-        obj = js_NewObject(cx, &js_AnyNameClass, NULL, NULL);
-        if (!obj || !JS_SetPrivate(cx, obj, qn)) {
-            cx->newborn[GCX_OBJECT] = NULL;
-            return JS_FALSE;
-        }
-        qn->object = obj;
-        METER(xml_stats.qnameobj);
-        METER(xml_stats.liveqnameobj);
-
-        /*
-         * Avoid entraining any in-scope Object.prototype.  This loses the
-         * default toString inheritance, but no big deal: we want a better
-         * custom one for clearer diagnostics.
-         */
-        if (!JS_DefineFunction(cx, obj, js_toString_str, anyname_toString,
-                               0, 0)) {
-            return JS_FALSE;
-        }
-        OBJ_SET_PROTO(cx, obj, NULL);
-        JS_ASSERT(!OBJ_GET_PARENT(cx, obj));
-        rt->anynameObject = obj;
-    }
-    *vp = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-JSBool
-js_FindXMLProperty(JSContext *cx, jsval name, JSObject **objp, jsval *namep)
-{
-    JSXMLQName *qn;
-    jsid funid, id;
-    JSObject *obj, *pobj, *lastobj;
-    JSProperty *prop;
-    const char *printable;
-
-    qn = ToXMLName(cx, name, &funid);
-    if (!qn)
-        return JS_FALSE;
-    id = OBJECT_TO_JSID(qn->object);
-
-    obj = cx->fp->scopeChain;
-    do {
-        if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &pobj, &prop))
-            return JS_FALSE;
-        if (prop) {
-            OBJ_DROP_PROPERTY(cx, pobj, prop);
-
-            /*
-             * Call OBJ_THIS_OBJECT to skip any With object that wraps an XML
-             * object to carry scope chain linkage in js_FilterXMLList.
-             */
-            pobj = OBJ_THIS_OBJECT(cx, obj);
-            if (OBJECT_IS_XML(cx, pobj)) {
-                *objp = pobj;
-                *namep = ID_TO_VALUE(id);
-                return JS_TRUE;
-            }
-        }
-
-        lastobj = obj;
-    } while ((obj = OBJ_GET_PARENT(cx, obj)) != NULL);
-
-    printable = js_ValueToPrintableString(cx, name);
-    if (printable) {
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR,
-                                     js_GetErrorMessage, NULL,
-                                     JSMSG_UNDEFINED_XML_NAME, printable);
-    }
-    return JS_FALSE;
-}
-
-JSBool
-js_GetXMLProperty(JSContext *cx, JSObject *obj, jsval name, jsval *vp)
-{
-    return GetProperty(cx, obj, name, vp);
-}
-
-JSBool
-js_SetXMLProperty(JSContext *cx, JSObject *obj, jsval name, jsval *vp)
-{
-    return PutProperty(cx, obj, name, vp);
-}
-
-static JSXML *
-GetPrivate(JSContext *cx, JSObject *obj, const char *method)
-{
-    JSXML *xml;
-
-    xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, NULL);
-    if (!xml) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                             JSMSG_INCOMPATIBLE_METHOD,
-                             js_XML_str, method, OBJ_GET_CLASS(cx, obj)->name);
-    }
-    return xml;
-}
-
-JSBool
-js_GetXMLDescendants(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-    JSXML *xml, *list;
-
-    xml = GetPrivate(cx, obj, "descendants internal method");
-    if (!xml)
-        return JS_FALSE;
-
-    list = Descendants(cx, xml, id);
-    if (!list)
-        return JS_FALSE;
-    *vp = OBJECT_TO_JSVAL(list->object);
-    return JS_TRUE;
-}
-
-JSBool
-js_DeleteXMLListElements(JSContext *cx, JSObject *listobj)
-{
-    JSXML *list;
-    uint32 n;
-    jsval junk;
-
-    list = (JSXML *) JS_GetPrivate(cx, listobj);
-    for (n = list->xml_kids.length; n != 0; --n) {
-        if (!DeleteProperty(cx, listobj, INT_TO_JSID(0), &junk))
-            return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-JSBool
-js_FilterXMLList(JSContext *cx, JSObject *obj, jsbytecode *pc, jsval *vp)
-{
-    JSBool ok, match;
-    JSStackFrame *fp;
-    JSObject *scobj, *listobj, *resobj, *withobj, *kidobj;
-    JSXML *xml, *list, *result, *kid;
-    uint32 i, n;
-
-    ok = JS_EnterLocalRootScope(cx);
-    if (!ok)
-        return JS_FALSE;
-
-    /* All control flow after this point must exit via label out or bad. */
-    fp = cx->fp;
-    scobj = fp->scopeChain;
-    xml = GetPrivate(cx, obj, "filtering predicate operator");
-    if (!xml)
-        goto bad;
-
-    if (xml->xml_class == JSXML_CLASS_LIST) {
-        list = xml;
-    } else {
-        listobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-        if (!listobj)
-            goto bad;
-        list = (JSXML *) JS_GetPrivate(cx, listobj);
-        ok = Append(cx, list, xml);
-        if (!ok)
-            goto out;
-    }
-
-    resobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
-    if (!resobj)
-        goto bad;
-    result = (JSXML *) JS_GetPrivate(cx, resobj);
-
-    /* Hoist the scope chain update out of the loop over kids. */
-    withobj = js_NewObject(cx, &js_WithClass, NULL, scobj);
-    if (!withobj)
-        goto bad;
-    fp->scopeChain = withobj;
-
-    for (i = 0, n = list->xml_kids.length; i < n; i++) {
-        kid = XMLARRAY_MEMBER(&list->xml_kids, i, JSXML);
-        kidobj = js_GetXMLObject(cx, kid);
-        if (!kidobj)
-            goto bad;
-        OBJ_SET_PROTO(cx, withobj, kidobj);
-        ok = js_Interpret(cx, pc, vp) && js_ValueToBoolean(cx, *vp, &match);
-        if (!ok)
-            goto out;
-        if (match) {
-            ok = Append(cx, result, kid);
-            if (!ok)
-                goto out;
-        }
-    }
-
-    *vp = OBJECT_TO_JSVAL(resobj);
-
-out:
-    fp->scopeChain = scobj;
-    JS_LeaveLocalRootScope(cx);
-    return ok;
-bad:
-    ok = JS_FALSE;
-    goto out;
-}
-
-JSObject *
-js_ValueToXMLObject(JSContext *cx, jsval v)
-{
-    return ToXML(cx, v);
-}
-
-JSObject *
-js_ValueToXMLListObject(JSContext *cx, jsval v)
-{
-    return ToXMLList(cx, v);
-}
-
-JSObject *
-js_CloneXMLObject(JSContext *cx, JSObject *obj)
-{
-    uintN flags;
-    JSXML *xml;
-
-    if (!GetXMLSettingFlags(cx, &flags))
-        return NULL;
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    if (flags & (XSF_IGNORE_COMMENTS |
-                 XSF_IGNORE_PROCESSING_INSTRUCTIONS |
-                 XSF_IGNORE_WHITESPACE)) {
-        xml = DeepCopy(cx, xml, NULL, flags);
-        if (!xml)
-            return NULL;
-        return xml->object;
-    }
-    return NewXMLObject(cx, xml);
-}
-
-JSObject *
-js_NewXMLSpecialObject(JSContext *cx, JSXMLClass xml_class, JSString *name,
-                       JSString *value)
-{
-    uintN flags;
-    JSObject *obj;
-    JSXML *xml;
-    JSXMLQName *qn;
-
-    if (!GetXMLSettingFlags(cx, &flags))
-        return NULL;
-
-    if ((xml_class == JSXML_CLASS_COMMENT &&
-         (flags & XSF_IGNORE_COMMENTS)) ||
-        (xml_class == JSXML_CLASS_PROCESSING_INSTRUCTION &&
-         (flags & XSF_IGNORE_PROCESSING_INSTRUCTIONS))) {
-        return js_NewXMLObject(cx, JSXML_CLASS_TEXT);
-    }
-
-    obj = js_NewXMLObject(cx, xml_class);
-    if (!obj)
-        return NULL;
-    xml = (JSXML *) JS_GetPrivate(cx, obj);
-    if (name) {
-        qn = js_NewXMLQName(cx, cx->runtime->emptyString, NULL, name);
-        if (!qn)
-            return NULL;
-        xml->name = qn;
-    }
-    xml->xml_value = value;
-    return obj;
-}
-
-JSString *
-js_MakeXMLCDATAString(JSContext *cx, JSString *str)
-{
-    return MakeXMLCDATAString(cx, NULL, str);
-}
-
-JSString *
-js_MakeXMLCommentString(JSContext *cx, JSString *str)
-{
-    return MakeXMLCommentString(cx, NULL, str);
-}
-
-JSString *
-js_MakeXMLPIString(JSContext *cx, JSString *name, JSString *str)
-{
-    return MakeXMLPIString(cx, NULL, name, str);
-}
-
-#endif /* JS_HAS_XML_SUPPORT */
diff --git a/libs/js/src/jsxml.h b/libs/js/src/jsxml.h
deleted file mode 100644
index cc1cc5b2e8..0000000000
--- a/libs/js/src/jsxml.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SpiderMonkey E4X code, released August, 2004.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsxml_h___
-#define jsxml_h___
-
-#include "jsstddef.h"
-#include "jspubtd.h"
-
-extern const char js_AnyName_str[];
-extern const char js_AttributeName_str[];
-extern const char js_isXMLName_str[];
-extern const char js_XMLList_str[];
-
-extern const char js_amp_entity_str[];
-extern const char js_gt_entity_str[];
-extern const char js_lt_entity_str[];
-extern const char js_quot_entity_str[];
-
-struct JSXMLNamespace {
-    JSObject            *object;
-    JSString            *prefix;
-    JSString            *uri;
-    JSBool              declared;       /* true if declared in its XML tag */
-};
-
-extern JSXMLNamespace *
-js_NewXMLNamespace(JSContext *cx, JSString *prefix, JSString *uri,
-                   JSBool declared);
-
-extern void
-js_MarkXMLNamespace(JSContext *cx, JSXMLNamespace *ns, void *arg);
-
-extern void
-js_FinalizeXMLNamespace(JSContext *cx, JSXMLNamespace *ns);
-
-extern JSObject *
-js_NewXMLNamespaceObject(JSContext *cx, JSString *prefix, JSString *uri,
-                         JSBool declared);
-
-extern JSObject *
-js_GetXMLNamespaceObject(JSContext *cx, JSXMLNamespace *ns);
-
-struct JSXMLQName {
-    JSObject            *object;
-    JSString            *uri;
-    JSString            *prefix;
-    JSString            *localName;
-};
-
-extern JSXMLQName *
-js_NewXMLQName(JSContext *cx, JSString *uri, JSString *prefix,
-               JSString *localName);
-
-extern void
-js_MarkXMLQName(JSContext *cx, JSXMLQName *qn, void *arg);
-
-extern void
-js_FinalizeXMLQName(JSContext *cx, JSXMLQName *qn);
-
-extern JSObject *
-js_NewXMLQNameObject(JSContext *cx, JSString *uri, JSString *prefix,
-                     JSString *localName);
-
-extern JSObject *
-js_GetXMLQNameObject(JSContext *cx, JSXMLQName *qn);
-
-extern JSObject *
-js_GetAttributeNameObject(JSContext *cx, JSXMLQName *qn);
-
-extern JSObject *
-js_ConstructXMLQNameObject(JSContext *cx, jsval nsval, jsval lnval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSIdentityOp)(const void *a, const void *b);
-
-struct JSXMLArray {
-    uint32              length;
-    uint32              capacity;
-    void                **vector;
-    JSXMLArrayCursor    *cursors;
-};
-
-#define JSXML_PRESET_CAPACITY   JS_BIT(31)
-#define JSXML_CAPACITY_MASK     JS_BITMASK(31)
-#define JSXML_CAPACITY(array)   ((array)->capacity & JSXML_CAPACITY_MASK)
-
-struct JSXMLArrayCursor {
-    JSXMLArray          *array;
-    uint32              index;
-    JSXMLArrayCursor    *next;
-    JSXMLArrayCursor    **prevp;
-};
-
-/*
- * NB: don't reorder this enum without changing all array initializers that
- * depend on it in jsxml.c.
- */ 
-typedef enum JSXMLClass {
-    JSXML_CLASS_LIST,
-    JSXML_CLASS_ELEMENT,
-    JSXML_CLASS_ATTRIBUTE,
-    JSXML_CLASS_PROCESSING_INSTRUCTION,
-    JSXML_CLASS_TEXT,
-    JSXML_CLASS_COMMENT,
-    JSXML_CLASS_LIMIT
-} JSXMLClass;
-
-#define JSXML_CLASS_HAS_KIDS(class_)    ((class_) < JSXML_CLASS_ATTRIBUTE)
-#define JSXML_CLASS_HAS_VALUE(class_)   ((class_) >= JSXML_CLASS_ATTRIBUTE)
-#define JSXML_CLASS_HAS_NAME(class_)                                          \
-    ((uintN)((class_) - JSXML_CLASS_ELEMENT) <=                               \
-     (uintN)(JSXML_CLASS_PROCESSING_INSTRUCTION - JSXML_CLASS_ELEMENT))
-
-#ifdef DEBUG_notme
-#include "jsclist.h"
-#endif
-
-struct JSXML {
-#ifdef DEBUG_notme
-    JSCList             links;
-    uint32              serial;
-#endif
-    JSObject            *object;
-    void                *domnode;       /* DOM node if mapped info item */
-    JSXML               *parent;
-    JSXMLQName          *name;
-    uint16              xml_class;      /* discriminates u, below */
-    uint16              xml_flags;      /* flags, see below */
-    union {
-        struct JSXMLListVar {
-            JSXMLArray  kids;           /* NB: must come first */
-            JSXML       *target;
-            JSXMLQName  *targetprop;
-        } list;
-        struct JSXMLVar {
-            JSXMLArray  kids;           /* NB: must come first */
-            JSXMLArray  namespaces;
-            JSXMLArray  attrs;
-        } elem;
-        JSString        *value;
-    } u;
-
-    /* Don't add anything after u -- see js_NewXML for why. */
-};
-
-/* union member shorthands */
-#define xml_kids        u.list.kids
-#define xml_target      u.list.target
-#define xml_targetprop  u.list.targetprop
-#define xml_namespaces  u.elem.namespaces
-#define xml_attrs       u.elem.attrs
-#define xml_value       u.value
-
-/* xml_flags values */
-#define XMLF_WHITESPACE_TEXT    0x1
-
-/* xml_class-testing macros */
-#define JSXML_HAS_KIDS(xml)     JSXML_CLASS_HAS_KIDS((xml)->xml_class)
-#define JSXML_HAS_VALUE(xml)    JSXML_CLASS_HAS_VALUE((xml)->xml_class)
-#define JSXML_HAS_NAME(xml)     JSXML_CLASS_HAS_NAME((xml)->xml_class)
-#define JSXML_LENGTH(xml)       (JSXML_CLASS_HAS_KIDS((xml)->xml_class)       \
-                                 ? (xml)->xml_kids.length                     \
-                                 : 0)
-
-extern JSXML *
-js_NewXML(JSContext *cx, JSXMLClass xml_class);
-
-extern void
-js_MarkXML(JSContext *cx, JSXML *xml, void *arg);
-
-extern void
-js_FinalizeXML(JSContext *cx, JSXML *xml);
-
-extern JSObject *
-js_ParseNodeToXMLObject(JSContext *cx, JSParseNode *pn);
-
-extern JSObject *
-js_NewXMLObject(JSContext *cx, JSXMLClass xml_class);
-
-extern JSObject *
-js_GetXMLObject(JSContext *cx, JSXML *xml);
-
-extern JS_FRIEND_DATA(JSXMLObjectOps)   js_XMLObjectOps;
-extern JS_FRIEND_DATA(JSClass)          js_XMLClass;
-extern JS_FRIEND_DATA(JSExtendedClass)  js_NamespaceClass;
-extern JS_FRIEND_DATA(JSExtendedClass)  js_QNameClass;
-extern JS_FRIEND_DATA(JSClass)          js_AttributeNameClass;
-extern JS_FRIEND_DATA(JSClass)          js_AnyNameClass;
-
-/*
- * Macros to test whether an object or a value is of type "xml" (per typeof).
- * NB: jsapi.h must be included before any call to VALUE_IS_XML.
- */
-#define OBJECT_IS_XML(cx,obj)   ((obj)->map->ops == &js_XMLObjectOps.base)
-#define VALUE_IS_XML(cx,v)      (!JSVAL_IS_PRIMITIVE(v) &&                    \
-                                 OBJECT_IS_XML(cx, JSVAL_TO_OBJECT(v)))
-
-extern JSObject *
-js_InitNamespaceClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitQNameClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitAttributeNameClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitAnyNameClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitXMLClass(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_InitXMLClasses(JSContext *cx, JSObject *obj);
-
-extern JSBool
-js_GetFunctionNamespace(JSContext *cx, jsval *vp);
-
-extern JSBool
-js_GetDefaultXMLNamespace(JSContext *cx, jsval *vp);
-
-extern JSBool
-js_SetDefaultXMLNamespace(JSContext *cx, jsval v);
-
-/*
- * Return true if v is a XML QName object, or if it converts to a string that
- * contains a valid XML qualified name (one containing no :), false otherwise.
- * NB: This function is an infallible predicate, it hides exceptions.
- */
-extern JSBool
-js_IsXMLName(JSContext *cx, jsval v);
-
-extern JSBool
-js_ToAttributeName(JSContext *cx, jsval *vp);
-
-extern JSString *
-js_EscapeAttributeValue(JSContext *cx, JSString *str);
-
-extern JSString *
-js_AddAttributePart(JSContext *cx, JSBool isName, JSString *str,
-                    JSString *str2);
-
-extern JSString *
-js_EscapeElementValue(JSContext *cx, JSString *str);
-
-extern JSString *
-js_ValueToXMLString(JSContext *cx, jsval v);
-
-extern JSBool
-js_GetAnyName(JSContext *cx, jsval *vp);
-
-extern JSBool
-js_FindXMLProperty(JSContext *cx, jsval name, JSObject **objp, jsval *namep);
-
-extern JSBool
-js_GetXMLProperty(JSContext *cx, JSObject *obj, jsval name, jsval *vp);
-
-extern JSBool
-js_SetXMLProperty(JSContext *cx, JSObject *obj, jsval name, jsval *vp);
-
-extern JSBool
-js_GetXMLDescendants(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool
-js_DeleteXMLListElements(JSContext *cx, JSObject *listobj);
-
-extern JSBool
-js_FilterXMLList(JSContext *cx, JSObject *obj, jsbytecode *pc, jsval *vp);
-
-extern JSObject *
-js_ValueToXMLObject(JSContext *cx, jsval v);
-
-extern JSObject *
-js_ValueToXMLListObject(JSContext *cx, jsval v);
-
-extern JSObject *
-js_CloneXMLObject(JSContext *cx, JSObject *obj);
-
-extern JSObject *
-js_NewXMLSpecialObject(JSContext *cx, JSXMLClass xml_class, JSString *name,
-                       JSString *value);
-
-extern JSString *
-js_MakeXMLCDATAString(JSContext *cx, JSString *str);
-
-extern JSString *
-js_MakeXMLCommentString(JSContext *cx, JSString *str);
-
-extern JSString *
-js_MakeXMLPIString(JSContext *cx, JSString *name, JSString *str);
-
-#endif /* jsxml_h___ */
diff --git a/libs/js/src/perlconnect/JS.pm b/libs/js/src/perlconnect/JS.pm
deleted file mode 100644
index f4d95e6586..0000000000
--- a/libs/js/src/perlconnect/JS.pm
+++ /dev/null
@@ -1,318 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-############################################################################
-# JS.pm is a Perl interface to JavaScript 3/2/99 5:23PM
-# The packages implemented here include
-#           JS, JS::Runtime, JS::Contents, JS::Object
-# See README.html for more information about this module.
-############################################################################
-
-package JS;
-$VERSION='0.03';
-require Exporter;
-use DynaLoader;
-@ISA = qw(Exporter DynaLoader);
-use strict;
-use vars qw($VERSION);
-
-sub boot        #7/31/98 5:28PM
-{
-    # this is to load the JS DLL at run-time
-    bootstrap JS $VERSION;
-    push @DynaLoader::dl_library_path, $ENV{'LD_LIBRARY_PATH'};
-}   ##boot
-
-sub new {
-    my ($class, $maxbytes) = @_;
-    my $self = new JS::Runtime($maxbytes);
-    return $self;
-}
-
-############################################################
-# JS::Runtime
-############################################################
-package JS::Runtime;
-use strict;
-use vars qw ($AUTOLOAD $DEBUG %CONTEXTS);
-
-# we use %CONTEXT hash to remember all created contex. 
-# reason of this is increase reference to context objects
-# and ensure corret order of destructor calls
-
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    print "\nJS::Runtime::AUTOLOAD: $AUTOLOAD, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-
-# Constructor. Calls NewRuntime
-
-sub new     #7/31/98 3:39PM
-{
-    warn "JS::Runtime::new\n" if $DEBUG;
-    my($class, $maxbytes) = @_;
-    my $self = JS::NewRuntime(scalar($maxbytes));
-    return  $self;
-}   ##new
-
-sub createContext {
-    my ($self, $stacksize) = @_;
-    #my $cx = $self->NewContext($stacksize);
-    my $cx = JS::Context->new($self, $stacksize);
-#    $CONTEXTS{$self} = [] unless exists $CONTEXTS{$self};
-#    push @{$CONTEXTS{$self}}, $cx;
-    return $cx;
-}
-
-# Destructor for Runtimes
-sub DESTROY     #7/31/98 4:54PM
-{
-    my $self = shift;
-    warn "JS::Runtime::DESTROY\n" if $DEBUG;
-    JS::DestroyRuntime($self);
-}   ##DESTROY
-
-############################################################
-# JS::Context
-############################################################
-package JS::Context;
-use vars qw($AUTOLOAD $DEBUG);
-
-# sub AUTOLOAD        #7/28/98 8:24PM
-# {
-#     print "\nJS::Context::AUTOLOAD: $AUTOLOAD, not implemented yet\n" if $DEBUG;
-# }   ##AUTOLOAD
-
-sub new     #7/31/98 3:39PM
-{
-    warn "JS::Context::new\n" if $DEBUG;
-    my($class, $rt, $stacksize) = @_;
-    $class = ref $class || $class;
-    my $cx = JS::Runtime::NewContext($rt, $stacksize);
-    my $self = {
-		_handle => $cx,
-		_name => ("name_" . int (rand 1000)),
-	       };
-      $self->{_handle};
-    bless $self, $class;
-    return  $self;
-}   ##new
-
-use Data::Dumper;
-
-sub exec {
-    my ($self, $script) = @_;
-    $self->exec_($script);
-}
-
-sub DESTROY     #7/31/98 4:54PM
-{
-    my $self = shift;
-    warn "JS::Context::DESTROY\n" if $DEBUG;
-    JS::Runtime::DestroyContext($self);
-}   ##DESTROY
-
-
-############################################################
-# JS::Script
-############################################################
-package JS::Script;
-
-sub new {
-    my ($class, $cx, $code, $name) = @_;
-    $class = ref $class || $class;
-    my $self = {};
-    bless $self, $class;
-    $self->{_script} = $self->compileScript($cx, $code, $name);
-    $self->{_root} = $self->rootScript($cx, $name);
-    $self->{_cx} = $cx; #!!! dangerous
-    $self->{_name} = $name;
-    return $self;
-}
-
-sub DESTROY {
-    my $self = shift;
-    print "---> script destroy\n";
-    my $cx = $self->{_cx};
-    $self->destroyScript($cx);
-}
-
-############################################################
-# JS::Object
-############################################################
-package JS::Object;
-use vars qw($AUTOLOAD $DEBUG);
-
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    $_ = $AUTOLOAD;
-    $_ =~ s/.*://;
-    print "\nJS::Object::AUTOLOAD: $_, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-
-
-############################################################
-# executable part
-############################################################
-#$JS::Runtime::DEBUG = 1;
-#$JS::Context::DEBUG = 1;
-#$JS::Object::DEBUG = 1;
-
-&JS::boot();
-
-1;
-
-############################################################
-# the end
-############################################################
-
-
-
-
-__END__
-
-package JS;
-$VERSION = '0.03';
-require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
-
-#@ISA = qw(JS);
-
-############################################################################
-# Duplicates JS::Context::new is a way
-############################################################################
-sub new         #7/31/98 5:32PM
-{
-    print "JS::new" if $DEBUG;
-    my $rt = new JS::Runtime(10_000);
-    $this = new JS::Context($rt, 1_024);
-    return $this
-}   ##new
-
-############################################################################
-# Uses DynaLoader to load JS support DLL, performs the initialization
-############################################################################
-sub boot        #7/31/98 5:28PM
-{
-    # this is to load the JS DLL at run-time
-    bootstrap JS $VERSION;
-    push @dl_library_path, $ENV{'LD_LIBRARY_PATH'};
-}   ##boot
-
-############################################################################
-package JS::Runtime;
-@EXPORT = qw($this);
-
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    print "\nJS::Runtime::AUTOLOAD: $AUTOLOAD, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-############################################################################
-# Constructor. Calls NewRuntime and saves the returned value in this
-############################################################################
-sub new     #7/31/98 3:39PM
-{
-    print "JS::Runtime::new\n" if $DEBUG;
-    my($class, $maxbytes) = @_;
-    $this = JS::NewRuntime(scalar($maxbytes));
-    return  $this;
-}   ##new
-
-############################################################################
-# Destructor for Runtimes
-############################################################################
-sub DESTROY     #7/31/98 4:54PM
-{
-    my $self = shift;
-    print "JS::Runtime::DESTROY\n" if $DEBUG;
-warn("JS::Runtime::DESTROY\n");
-    JS::DestroyRuntime($self);
-    undef $this;
-}   ##DESTROY
-
-############################################################################
-package JS::Context;
-@EXPORT = qw($this);
-
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    print "\nJS::Context::AUTOLOAD: $AUTOLOAD, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-############################################################################
-# Constructor. Calls NewContext and saves the returned value in this
-############################################################################
-sub new     #7/31/98 3:39PM
-{
-    print "JS::Context::new\n" if $DEBUG;
-warn("JS::Context::new\n");
-    my($class, $rt, $stacksize) = @_;
-    $this = JS::Runtime::NewContext($rt, $stacksize);
-    return  $this;
-}   ##new
-
-############################################################################
-# Destructor for Contexts
-############################################################################
-sub DESTROY     #7/31/98 4:54PM
-{
-    my $self = shift;
-    print "JS::Context::DESTROY\n" if $DEBUG;
-warn("JS::Context::DESTROY\n");
-    JS::Runtime::DestroyContext($self);
-    undef $this;
-}   ##DESTROY
-
-############################################################################
-
-package JS::Object;
-
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    $_ = $AUTOLOAD;
-    $_ =~ s/.*://;
-    print "\nJS::Object::AUTOLOAD: $_, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-&JS::boot();
-
-1;
diff --git a/libs/js/src/perlconnect/JS.xs b/libs/js/src/perlconnect/JS.xs
deleted file mode 100644
index 39ba4ec7df..0000000000
--- a/libs/js/src/perlconnect/JS.xs
+++ /dev/null
@@ -1,1055 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PerlConnect. Provides means for OO Perl <==> JS communications
- */
-
-/* This is an program written in XSUB. You need to compile it using xsubpp   */
-/* usually found in your perl\bin directory. On my machine I do it like this:*/
-/*      perl c:\perl\lib\ExtUtils\xsubpp  -typemap  \                        */
-/*           c:\perl\lib\extutils\typemap -typemap typemap JS.xs > JS.c      */
-/* See perlxs man page for details.                                          */
-/* Don't edit the resulting C file directly. See README.html for more info   */
-/* on PerlConnect in general                                                 */
-
-#ifdef __cplusplus
-    extern "C"; {
-#endif
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-#ifdef __cplusplus
-    }
-#endif
-
-#include <jsapi.h>
-#include "jsperlpvt.h"
-#ifdef OSSP
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
-
-/* __REMOVE__ */
-/* #include <stdio.h>  */
-
-/************************************************************/
-/* utils */
-
-static JSBool
-checkError(JSContext *cx)
-{
-    if(SvTRUE(GvSV(PL_errgv))){ 
-        JS_ReportError(cx, "perl eval failed: %s",
-            SvPV(GvSV(PL_errgv), PL_na));
-        /* clear error status. there should be a way to do this faster */
-        perl_eval_sv(newSVpv("undef $@;", 0), G_KEEPERR);
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-static void
-clearException(JSContext *cx) 
-{
-    if (JS_IsExceptionPending(cx)) {
-        JS_ClearPendingException(cx);
-    }
-}
-
-/************************************************************/
-/* calback stub */
-
-/* this is internal js structure needed in errorFromPrivate */
-typedef struct JSExnPrivate {
-    JSErrorReport *errorReport;
-} JSExnPrivate;
-
-static
-JSClass global_class = {
-    "Global", 0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub, JS_FinalizeStub
-};
-
-/* __PH__BEGIN  */
-/* perl callback structure */
-/* prefix PCB means Perl CallBack */
-
-struct PerlCallbackItem{
-    char*  name;
-    SV*    perl_proc;
-    int    param_num;
-    struct PerlCallbackItem *next;
-};
-
-typedef struct PerlCallbackItem PerlCallbackItem;
-
-
-struct PerlObjectItem {
-    char * name;
-    SV* pObject;
-    /* OSSP BUGFIX *//*JSObject *jsStub;*/
-    JSObject *jsObject;
-    JSClass *jsClass;
-    struct PerlCallbackItem* vector;
-    struct PerlObjectItem *next;
-};
-
-typedef struct PerlObjectItem PerlObjectItem;
-
-/* error reporter */
-/* OSSP BUGFIX *//*struct JSContextItem;*/
-/* OSSP BUGFIX *//*struct JSContextItem;*/
-struct  JSContextItem {
-    JSContext *cx;
-    SV *errorReporter;
-    PerlObjectItem *objects;
-    int dieFromErrors;
-    struct JSContextItem* next;
-};
-
-typedef struct JSContextItem JSContextItem;
-
-static JSContextItem *context_list = NULL;
-
-static JSContextItem*
-PCB_NewContextItem() {
-    JSContextItem *ret;
-    ret = (JSContextItem*)calloc(1, sizeof(JSContextItem));
-    return ret;
-}
-
-static JSContextItem*
-PCB_FindContextItem (JSContext *cx) {
-    JSContextItem *cxitem =  context_list;
-    while ( cxitem ) {
-        if (cxitem->cx == cx ) return cxitem;
-        cxitem = cxitem->next;
-    }
-    return NULL;
-}
-
-static  SV*
-PCB_FindErrorReporter (JSContext *cx) {
-    JSContextItem *cxitem;
-    if (cxitem = PCB_FindContextItem(cx)) {
-        return cxitem->errorReporter;
-    } else {
-        return NULL;
-    }
-}
-
-static void
-PCB_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
-{
-    SV *report_proc;
-    if ( report_proc = PCB_FindErrorReporter(cx) ) {
-        dSP;
-        PUSHMARK(SP);
-        XPUSHs(sv_2mortal(newSVpv((char*)message, 0)));
-        if ( report ) {
-            if ( report->filename ) {
-                XPUSHs(sv_2mortal(newSVpv((char*)report->filename, 0)));
-            }
-            XPUSHs(sv_2mortal(newSViv(report->lineno)));
-            if (report->linebuf) {
-                XPUSHs(sv_2mortal(newSVpv((char*)report->linebuf, 0)));
-                XPUSHs(sv_2mortal(newSVpv((char*)report->tokenptr, 0)));
-            }
-        }
-        PUTBACK;
-        perl_call_sv(report_proc, G_VOID | G_DISCARD);
-    } else {
-        warn(message);
-    }
-}
-
-/* perl object stuff */
-
-
-/* functions for callback list handling */
-static PerlCallbackItem*
-PCB_AddCallback(PerlObjectItem* object, char *name, 
-                SV* perl_proc, int param_num) {
-    PerlCallbackItem *cbk;
-
-    cbk = (PerlCallbackItem*)calloc(1, sizeof(PerlCallbackItem));
-    cbk->name = (char*) malloc(strlen(name) + 1);
-    strcpy(cbk->name, name);
-    SvREFCNT_inc(perl_proc);
-    cbk->perl_proc = perl_proc;
-    cbk->param_num = param_num;
-
-    cbk->next = object->vector;
-    object->vector = cbk;
-
-    return cbk;
-}
-
-/* functions for perl object list handling */
-
-static PerlObjectItem*
-PCB_AddObject(char *name, SV *pobj, JSContext *cx, JSObject *jso, JSClass *class) {
-    JSContextItem *cxitem;
-    PerlObjectItem *object;
-
-    /* we should always find the item */
-    cxitem = PCB_FindContextItem(cx);
-    object = (PerlObjectItem*) calloc(1, sizeof(PerlObjectItem));
-    object->name = (char*) malloc(strlen(name) + 1);
-    strcpy(object->name, name);
-    SvREFCNT_inc(pobj);
-    object->pObject = pobj;
-    object->jsObject = jso;
-    object->jsClass = class;
-    object->next = cxitem->objects;
-    cxitem->objects = object;
-
-    return object;
-}
-
-static PerlObjectItem*
-PCB_FindObject(JSContext *cx, JSObject *jso) {
-    JSContextItem *cxitem;
-    PerlObjectItem *objitem;
-
-    cxitem = PCB_FindContextItem(cx);
-    objitem = cxitem->objects;
-
-    while ( objitem ) {
-        if ( objitem->jsObject == jso ) return objitem;
-        objitem = objitem->next;
-    }
-    return NULL;
-}
-
-static PerlCallbackItem*
-PCB_FindCallback(PerlObjectItem *obj, const char *name) {
-    PerlCallbackItem *cbkitem;
-
-    cbkitem = obj->vector;
-    while ( cbkitem ) {
-        if ( strcmp(name, cbkitem->name) == 0 ) return cbkitem;
-        cbkitem = cbkitem->next;
-    }
-    return NULL;
-}
-
-/* deletion functions */
-
-static void 
-PCB_FreeCallbackItem(PerlCallbackItem *callback) {
-    free(callback->name);
-    /* we have to decrease ref. count to proc */
-    SvREFCNT_dec(callback->perl_proc);
-    free(callback);
-}
-
-static void 
-PCB_FreeObjectItem(PerlObjectItem *object) {
-    PerlCallbackItem *cbkitem, *next;
-    JSClass *class;
-
-    free(object->name);
-    free(object->jsClass);
-
-    SvREFCNT_dec(object->pObject);
-    cbkitem = object->vector;
-    while ( cbkitem ) {
-        next = cbkitem->next;
-        PCB_FreeCallbackItem(cbkitem);
-        cbkitem = next;
-    }
-    free(object);
-}
-
-static void 
-PCB_FreeContextItem(JSContext *cx) {
-    JSContextItem *cxitem, *aux;
-    PerlObjectItem *objitem, *next;
-
-    cxitem = PCB_FindContextItem(cx);
-    objitem = cxitem->objects;
-
-    while ( objitem ) {
-        next = objitem->next;
-        PCB_FreeObjectItem(objitem);
-        objitem = next;
-    }
-
-    if (cxitem->errorReporter) {
-        SvREFCNT_dec(cxitem->errorReporter);
-    }
-    
-    if ( context_list == cxitem ) {
-        context_list = cxitem->next;
-    } else {
-        aux = context_list;
-        while ( aux->next != cxitem ) aux = aux->next;
-        aux->next = cxitem->next;
-    }
-    free(cxitem);
-}
-
-/* later the object list should be bind to JS Context
-   in this case is needed to update destructor PerlFreeObjectList
- */
-
-/* property getter and setter - cooperate with AUTOLOAD */
-
-static JSBool
-PCB_GetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval) {
-    PerlObjectItem *po;
-    int i, cnt, len;
-    I32 ax;
-    SV *proc_sv;
-    HV *stash;
-    char prop_name[256];
-    char full_name[256];
-    char *foo;
-    GV *gv;
-    dSP;
-
-    /* property name */
-    strcpy(prop_name, JS_GetStringBytes(JSVAL_TO_STRING(name)));
-
-    if (! (po = PCB_FindObject(cx, obj)))
-        croak("Couldn't find stub for object");
-    if ( (PCB_FindCallback(po, prop_name)))
-        return(JS_TRUE);
-
-    stash = SvSTASH(SvRV(po->pObject));
-    /* strcpy(full_name, HvNAME(stash));
-    strcat(full_name, "::");
-    strcat(full_name, prop_name);
-
-    proc_sv = sv_newmortal();
-    sv_setpv(proc_sv, full_name); */
-    /* start of perl call stuff */
-
-    gv = gv_fetchmeth(stash, prop_name, strlen(prop_name), -1);
-    /* better check and error report should be done here */
-    if (!gv) return JS_FALSE;
-
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    XPUSHs(po->pObject); /* self for perl AUTOLOAD */
-    PUTBACK;
-
-    /* cnt = perl_call_sv(proc_sv, 0); */
-    cnt = perl_call_sv((SV*)GvCV(gv), G_ARRAY);    
-
-    SPAGAIN;
-    /* adjust stack for use of ST macro (see perlcall) */
-    SP -= cnt;
-    ax = (SP - PL_stack_base) + 1;
-
-    /* read value(s) */
-    if (cnt == 1) {
-        SVToJSVAL(cx, obj, ST(0), rval);
-    } else {
-        JSObject *jsarr;
-        jsval val;
-        int i;
-        jsarr = JS_NewArrayObject(cx, 0, NULL);
-        for (i = 0; i < cnt; i++) {
-            SVToJSVAL(cx, JS_GetGlobalObject(cx), ST(i), &val);
-            JS_DefineElement(cx, jsarr, i, val, NULL, NULL, 0);
-        }
-        *rval = OBJECT_TO_JSVAL(jsarr);
-    }
-    PUTBACK;
-
-    FREETMPS;
-    LEAVE;
-
-    return(JS_TRUE);
-}
-
-static JSBool
-PCB_SetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval) {
-    PerlObjectItem *po;
-    int i, cnt, len;
-    I32 ax;
-    SV *proc_sv, *value_sv;
-    HV *stash;
-    char prop_name[256];
-    char full_name[256];
-    char *foo;
-    dSP;
-
-    /* property name */
-    strcpy(prop_name, JS_GetStringBytes(JSVAL_TO_STRING(name)));
-
-    if (! (po = PCB_FindObject(cx, obj)))
-        croak("Couldn't find stub for object");
-    if ( (PCB_FindCallback(po, prop_name)))
-        return(JS_TRUE);
-
-    stash = SvSTASH(SvRV(po->pObject));
-    strcpy(full_name, HvNAME(stash));
-    strcat(full_name, "::");
-    strcat(full_name, prop_name);
-
-    proc_sv = sv_newmortal();
-    sv_setpv(proc_sv, full_name);
-    JSVALToSV(cx, obj, *rval, &value_sv);
-    /* start of perl call stuff */
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    XPUSHs(po->pObject); /* self for perl AUTOLOAD */
-    XPUSHs(value_sv);
-    PUTBACK;
-
-    cnt = perl_call_sv(proc_sv, G_ARRAY);
-    
-    SPAGAIN;
-    /* adjust stack for use of ST macro (see perlcall) */
-    SP -= cnt;
-    ax = (SP - PL_stack_base) + 1;
-
-    /* read value(s) */
-    if (cnt == 1) {
-        SVToJSVAL(cx, obj, ST(0), rval);
-    } else {
-        JSObject *jsarr;
-        jsval val;
-        int i;
-        jsarr = JS_NewArrayObject(cx, 0, NULL);
-        for (i = 0; i < cnt; i++) {
-            SVToJSVAL(cx, JS_GetGlobalObject(cx), ST(i), &val);
-            JS_DefineElement(cx, jsarr, i, val, NULL, NULL, 0);
-        }
-        *rval = OBJECT_TO_JSVAL(jsarr);
-    }
-    PUTBACK;
-
-    FREETMPS;
-    LEAVE;
-
-    return(JS_TRUE);
-}
-
-/* helper functions */ 
-/* JSClass pointer is disposed by 
-   JS engine during context cleanup _PH_ 
- */
-void
-PCB_FinalizeStub(JSContext *cx, JSObject *obj) {
-}
-
-static JSClass* 
-PCB_NewStdJSClass(char *name) {	
-    JSClass *class;
-
-    class = (JSClass*)calloc(1, sizeof(JSClass));
-    class->name = name;
-    class->flags = JSCLASS_HAS_PRIVATE;
-    class->addProperty = JS_PropertyStub;
-    class->delProperty = JS_PropertyStub;  
-    class->getProperty = PCB_GetProperty;  
-    class->setProperty = PCB_SetProperty;
-    class->enumerate = JS_EnumerateStub;
-    class->resolve = JS_ResolveStub;
-    class->convert = JS_ConvertStub;
-    /* OSSP BUGFIX */
-    /*class->finalize = JS_FinalizeStub;*/
-    class->finalize = PCB_FinalizeStub;
-    return(class);
-}
-
-static JSBool
-PCB_UniversalStub (JSContext *cx, JSObject *obj, uintN argc, 
-                   jsval *argv, jsval *rval) {
-    JSFunction *fun;
-    PerlObjectItem *po;
-    PerlCallbackItem *cbk;
-    int i, cnt;
-    I32 ax;
-    SV* sv;
-    dSP;
-
-    fun = JS_ValueToFunction(cx, argv[-2]);
-    if (! (po = PCB_FindObject(cx, obj)))
-        croak("Couldn't find stub for object");
-    if (! (cbk = PCB_FindCallback(po, JS_GetFunctionName(fun))))
-        croak("Couldn't find perl callback");
-    /* start of perl call stuff */
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    XPUSHs(po->pObject); /* self for perl object method */
-    for (i = 0; i < argc; i++) {
-        JSVALToSV(cx, obj, argv[i], &sv);
-        XPUSHs(sv);
-    }
-    PUTBACK;
-    cnt = perl_call_sv(SvRV(cbk->perl_proc), G_ARRAY | G_KEEPERR | G_EVAL);
-
-    SPAGAIN;
-    /* adjust stack for use of ST macro (see perlcall) */
-    SP -= cnt;
-    ax = (SP - PL_stack_base) + 1;
-
-    /* read value(s) */
-    if (cnt == 1) {
-        SVToJSVAL(cx, obj, ST(0), rval);
-    } else {
-        JSObject *jsarr;
-        jsval val;
-        int i;
-        jsarr = JS_NewArrayObject(cx, 0, NULL);
-        for (i = 0; i < cnt; i++) {
-            SVToJSVAL(cx, JS_GetGlobalObject(cx), ST(i), &val);
-            JS_DefineElement(cx, jsarr, i, val, NULL, NULL, 0);
-        }
-        *rval = OBJECT_TO_JSVAL(jsarr);
-    }
-
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
-
-    /* this solution is not perfect, but usefull when nested call happens */
-    return(checkError(cx) && !JS_IsExceptionPending(cx));
-};
-
-/* __PH__END */
-
-
-/* Helper functions needed for most JS API routines */
-/*
-static JSRuntime *
-getRuntime()
-{
-    return (JSRuntime *)SvIV((SV*)SvRV(perl_get_sv("JS::Runtime::rt", FALSE)));
-}
-
-static JSContext *
-getContext()
-{
-    return (JSContext *)SvIV((SV*)SvRV(perl_get_sv("JS::Context::this", FALSE)));
-}
- */ /* commented as obsolete by __PH__ */
-
-/*
-    The following packages are defined below:
-    JS -- main container for all JS functionality
-        JS::Runtime -- wrapper around JSRuntime *
-        JS::Context -- wrapper around JSContext *
-        JS::Object  -- wrapper around JSObject *
- */
-
-MODULE = JS  PACKAGE = JS   PREFIX = JS_
-PROTOTYPES:  DISABLE
- # package JS
-
- #   Most of the functions below have names coinsiding with those of the
- #   corresponding JS API functions. Thus, they are not commented.
-JSRuntime *
-JS_NewRuntime(maxbytes)
-    int maxbytes
-    OUTPUT:
-    RETVAL
-
-void
-JS_DestroyRuntime(rt)
-    JSRuntime *rt
-    CODE:
-    /*
-        Make sure that the reference count to the runtime is zero.
-        O.w. this sequence of commands will cause double-deallocation:
-            $rt = new JS::Runtime(10_000);
-            $rt1 = $rt;
-            [exit here]
-        So both $rt->DESTROY and $rt1->DESTROY will cause runtime destruction.
-
-        _PH_ That's not true, I guess. At least for Perl 5.
-     */
-     /* warn("===> before runtime check\n"); */
-    if(SvREFCNT(ST(0)) == 1){
-        /* warn("===> really runtime destroing"); */
-        /* __PH__ */
-        /*__PH__END */
-        JS_DestroyRuntime(rt);
-    }
-
-
- # package JS::Runtime
-MODULE = JS    PACKAGE = JS::Runtime   PREFIX = JS_
-
-int
-JS_NewContext(rt, stacksize)
-    JSRuntime *rt
-    int        stacksize
-    PREINIT:
-    JSContextItem *cxitem;
-    CODE:
-    {
-        JSObject *obj;
-        /* jsval v; comment out unused var __PH__*/
-        JSContext *cx;
-        cx = JS_NewContext(rt, stacksize);
-        cxitem = PCB_NewContextItem();
-        cxitem->cx = cx;
-        cxitem->next = context_list;
-        context_list = cxitem;
-        /* __PH__ set the error reporter */
-        JS_SetErrorReporter(cx, PCB_ErrorReporter); 
-        obj = JS_NewObject(cx, &global_class, NULL, NULL);
-        JS_SetGlobalObject(cx, obj);
-        JS_InitStandardClasses(cx, obj);
-        RETVAL = (int)cx;
-    }
-    OUTPUT:
-    RETVAL
-
-void
-JS_DestroyContext(cx)
-    JSContext *cx
-    CODE:
-    /* See the comment about ref. count above */
-    /* warn("===> before context check\n"); */
-    if(SvREFCNT(ST(0)) == 1){
-        /* warn("===> really destroing context"); */
-        if (JS_IsExceptionPending(cx)) {
-            JS_ClearPendingException(cx);
-        }
-        JS_SetErrorReporter(cx, NULL);
-        JS_GC(cx); /* OSSP BUGFIX */ /*important*/
-        JS_DestroyContext(cx);
-        PCB_FreeContextItem(cx);
-    }
-
-
- # package JS::Context
-MODULE = JS    PACKAGE = JS::Context   PREFIX = JS_
-
-jsval
-JS_eval(cx, bytes, ...)
-    JSContext *cx
-    char *bytes
-    PREINIT:
-    JSContextItem *cxitem;
-    char *filename = NULL;
-    CODE:
-    {
-        jsval rval;
-        if (items > 2) { filename = SvPV(ST(2), PL_na); };
-        /* Call on the global object */
-        if(!JS_EvaluateScript(cx, JS_GetGlobalObject(cx), 
-                              bytes, strlen(bytes), 
-                              filename ? filename : "Perl", 
-                              0, &rval)){
-            cxitem = PCB_FindContextItem(cx);
-            if (!cxitem || cxitem->dieFromErrors)
-                croak("JS script evaluation failed");
-       
-            clearException(cx);
-            XSRETURN_UNDEF;
-        } 
-        RETVAL = rval; 
-    }
-    clearException(cx);
-    OUTPUT:
-    RETVAL
-
-
-jsval
-JS_exec_(cx, script)
-    JSContext *cx
-    SV    *script
-    PREINIT:
-    JSContextItem *cxitem;
-    JSScript *handle;
-    CODE:
-    {
-        jsval rval;
-        handle = (JSScript*)SvIV(*hv_fetch((HV*)SvRV(script), "_script", 7, 0));
-        /* Call on the global object */
-        if(!JS_ExecuteScript(cx, JS_GetGlobalObject(cx), 
-                             handle, &rval)) {
-            cxitem = PCB_FindContextItem(cx);
-            if (!cxitem || cxitem->dieFromErrors)
-                croak("JS script evaluation failed");
-
-            clearException(cx);
-            XSRETURN_UNDEF;
-        }
-        clearException(cx);
-        RETVAL = rval;
-    }
-    OUTPUT:
-    RETVAL
-
-#void
-#JS_destroyScript(cx, script)
-#     JSContext *cx
-#     JSScript *script
-#    CODE:
-#    JS_DestroyScript(cx, script);
-
-# __PH__
-void
-JS_setErrorReporter(cx, reporter)
-    JSContext *cx
-    SV* reporter
-    PREINIT:
-    JSContextItem *cxitem;
-    CODE:
-    cxitem = PCB_FindContextItem(cx);
-    SvREFCNT_inc(reporter);
-    if ( cxitem ) cxitem->errorReporter = reporter;
-
-void
-JS_unsetErrorReporter(cx)
-    JSContext *cx
-    PREINIT:
-    JSContextItem *cxitem;
-    CODE:
-    cxitem = PCB_FindContextItem(cx);
-    if ( cxitem ) {
-        if ( cxitem->errorReporter ) 
-            SvREFCNT_dec(cxitem->errorReporter);
-        cxitem->errorReporter = NULL;
-    }
-
-int
-JS_hasException(cx)
-    JSContext *cx
-    CODE:
-    RETVAL = ! JS_IsExceptionPending(cx);
-    OUTPUT:
-    RETVAL
-
-void 
-JS_reportError(cx, msg)
-    JSContext *cx
-    char *msg
-    CODE:
-    JS_ReportError(cx, msg);
-
-void 
-JS_errorFromPrivate(cx, msg, ex)
-     JSContext *cx
-     char *msg
-     JSObject *ex
-     PREINIT:
-     JSErrorReport *rep;
-     CODE:
-     rep = (JSErrorReport*) JS_GetPrivate(cx, ex);
-     if (rep)
-       PCB_ErrorReporter(cx, msg, ((JSExnPrivate*)rep)->errorReport);
-
-void
-JS_setDieFromErrors(cx, value)
-     JSContext *cx
-     int value
-     PREINIT:
-     JSContextItem *cxitem;
-     CODE:
-     cxitem = PCB_FindContextItem(cx);
-     if ( cxitem ) cxitem->dieFromErrors = value;
-
-void
-JS_createObject(cx, object, name,  methods)
-    JSContext *cx 
-    SV *object
-    char *name
-    SV *methods
-    PREINIT:
-    JSObject *jso;
-    HV *m_hash;
-    I32 len;	
-    HE *he;
-    int i;
-    PerlObjectItem *po;
-    JSClass *object_class;
-    PerlCallbackItem *pcbitem;
-    CODE:
-    if (SvTYPE(SvRV(methods)) != SVt_PVHV) {
-        croak("Second parameter has to be HASHREF");
-    }
-    /* create js object in given context */
-    object_class = PCB_NewStdJSClass(name);
-    /* OSSP BUGFIX */ /* jso = JS_NewObject(cx, object_class, NULL, 0); */
-
-    jso = JS_DefineObject(cx, JS_GetGlobalObject(cx), name, 
-                          object_class, NULL, 
-                          JSPROP_ENUMERATE | JSPROP_READONLY | 
-                          JSPROP_PERMANENT);
-
-
-    if (!jso) croak("Unable create JS object");
-    /* create callback info */
-    po = PCB_AddObject(name, object, cx, jso, object_class);
-    m_hash = (HV*)SvRV(methods);
-    hv_iterinit(m_hash);
-    while ((he = hv_iternext(m_hash))) {
-	PCB_AddCallback(po, hv_iterkey(he, &len), hv_iterval(m_hash, he), 0);
-    }
-    /* set js object methods */
-    /* HERE _PH_ */
-    pcbitem = po->vector;
-    while ( pcbitem ) {
-        if (! JS_DefineFunction(cx, jso, pcbitem->name, 
-                                PCB_UniversalStub, 0, 0)) 
-            croak("Unable create JS function");
-        pcbitem = pcbitem->next;
-    }
-
-# __PH__END
-
-
- # package JS::Object
-MODULE = JS    PACKAGE = JS::Object   PREFIX = JS_
-
- #
- #   The methods below get used when hash is tied.
- #
-SV *
-JS_TIEHASH(class, obj)
-    char *class
-    SV *obj
-    PREINIT:
-    JSContext* cx;
-    CODE:
-        RETVAL = SvREFCNT_inc(obj);
-    OUTPUT:
-    RETVAL
-
-SV *
-JS_TIEARRAY(class, obj)
-    char *class
-    SV *obj
-    PREINIT:
-    JSContext* cx;
-    CODE:
-        RETVAL = SvREFCNT_inc(obj);
-    OUTPUT:
-    RETVAL
-
-jsval
-JS_FETCH(obj, key)
-    JSObject *obj
-    char *key
-    PREINIT:
-    JSContext* cx;
-    jsval rval;
-    MAGIC *magic;
-    CODE:
-    {
-        /* printf("+++++++++> FETCH\n"); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }
-        JS_GetProperty(cx, obj, key, &rval);
-        RETVAL = rval;
-    }
-    OUTPUT:
-    RETVAL
-
-int
-JS_FETCHSIZE(obj)
-    JSObject *obj
-    PREINIT:
-    JSContext* cx;
-    MAGIC *magic;
-    CODE:
-    {
-        /* printf("+++++++++> FETCHSIZE: %d\n", ST(0)); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }
-        JS_IsArrayObject(cx, obj);
-        JS_GetArrayLength(cx, obj, &RETVAL);
-    }
-    OUTPUT:
-    RETVAL
-
-void
-JS_STORE(obj, key, value)
-    JSObject *obj
-    char *key
-    jsval value
-    PREINIT:
-    JSContext* cx;
-    MAGIC *magic;
-    {
-        /* printf("+++++++++> STORE\n"); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }
-    }
-    CODE:
-    {
-        JS_SetProperty(cx, obj, key, &value);
-    }
-
-void
-JS_DELETE(obj, key)
-    JSObject *obj
-    char *key
-    PREINIT:
-    JSContext* cx;
-    MAGIC *magic;
-    CODE:
-    {
-        /* printf("+++++++++> DELETE\n"); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }      
-        JS_DeleteProperty(cx, obj, key);
-    }
-
-void
-JS_CLEAR(obj)
-    JSObject *obj
-    PREINIT:
-    JSContext* cx;
-    MAGIC *magic;
-    CODE:
-    {
-        /* printf("+++++++++> CLEAR\n"); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }
-        JS_ClearScope(cx, obj);
-    }
-
-int
-JS_EXISTS(obj, key)
-    JSObject *obj
-    char *key
-    PREINIT:
-    JSContext* cx;
-    MAGIC *magic;
-    CODE:
-    {
-        jsval v;
-        /* printf("+++++++++> EXISTS\n"); */
-        magic = mg_find(SvRV(ST(0)), '~');
-        if (magic) {
-            cx = (JSContext *)SvIV(magic->mg_obj);
-        } else {
-            warn("Tied object has no magic\n");
-        }
-        JS_LookupProperty(cx, obj, key, &v);
-        RETVAL = !JSVAL_IS_VOID(v);
-    }
-    OUTPUT:
-    RETVAL
-
-#script
-MODULE = JS    PACKAGE = JS::Script   PREFIX = JS_
-
-int
-JS_compileScript(object, cx, bytes, ...)
-    SV *object
-    JSContext *cx
-    char *bytes
-    PREINIT:
-    JSContextItem *cxitem;
-    char *filename = NULL;
-    CODE:
-    {
-        if (items > 2) { filename = SvPV(ST(2), PL_na); };
-        /* Call on the global object */
-        if(!(RETVAL = (int)JS_CompileScript(cx, JS_GetGlobalObject(cx), 
-                                       bytes, strlen(bytes), 
-                                       filename ? filename : "Perl", 
-                                       0)))
-            {
-                cxitem = PCB_FindContextItem(cx);
-                if (!cxitem || cxitem->dieFromErrors)
-                    croak("JS script compilation failed");
-                XSRETURN_UNDEF;
-            }
-    }
-    OUTPUT:
-    RETVAL
-
-int 
-JS_rootScript(object, cx, name)
-    SV *object
-    JSContext *cx
-    char *name
-    PREINIT:
-    JSObject **scrobj;
-    JSScript *handle;
-    CODE:
-    handle = (JSScript*)SvIV(*hv_fetch((HV*)SvRV(object), "_script", 7, 0));
-    scrobj = malloc(sizeof(JSObject*));
-    *scrobj = JS_NewScriptObject(cx, handle);
-    JS_AddNamedRoot(cx, scrobj, name);
-    RETVAL = (int)scrobj;
-    OUTPUT:
-    RETVAL
-
-void 
-JS_destroyScript(object, cx)
-    SV *object
-    JSContext *cx
-    PREINIT:
-    JSObject **scrobj;
-    JSScript *handle;
-    CODE:
-    handle = (JSScript*)SvIV(*hv_fetch((HV*)SvRV(object), "_script", 7, 0));
-    scrobj = (JSObject**)SvIV(*hv_fetch((HV*)SvRV(object), "_root", 5, 0));
-    JS_RemoveRoot(cx, scrobj);
-
diff --git a/libs/js/src/perlconnect/MANIFEST b/libs/js/src/perlconnect/MANIFEST
deleted file mode 100644
index b3b5a56d39..0000000000
--- a/libs/js/src/perlconnect/MANIFEST
+++ /dev/null
@@ -1,11 +0,0 @@
-MANIFEST
-.cvsignore
-JS.pm
-JS.xs
-jsperl.c
-jsperl.h
-jsperlpvt.h
-Makefile.PL
-Makefile.PL.in
-PerlConnect.pm
-typemap
diff --git a/libs/js/src/perlconnect/Makefile.PL.in b/libs/js/src/perlconnect/Makefile.PL.in
deleted file mode 100644
index 705b9363a7..0000000000
--- a/libs/js/src/perlconnect/Makefile.PL.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-    NAME         => 'JS',
-	DEFINE       => '-DOSSP -DXP_UNIX',
-	INC          => "-I..",
-	LIBS         => "-L../../.libs -ljs @LIBS@",
-	VERSION_FROM => 'JS.pm',
-);
-
diff --git a/libs/js/src/perlconnect/PerlConnect.pm b/libs/js/src/perlconnect/PerlConnect.pm
deleted file mode 100644
index 8e22d99d3a..0000000000
--- a/libs/js/src/perlconnect/PerlConnect.pm
+++ /dev/null
@@ -1,126 +0,0 @@
-############################################################################
-# PerlConnect support package. 8/3/98 2:50PM
-# This packages implements private methods called from jsperl.c
-# Please don't try to include in from Perl
-# See README.html and JS.xs for information about this module.
-############################################################################
-
-package JS;
-require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
-@EXPORT_OK = qw(perl_eval perl_resolve perl_call $js $ver);
-
-# version string for the interpreter
-$ver = "[Perl Interpreter: Version $] compiled under $^O]\n";
-$DEBUG = undef;
-
-############################################################################
-# TODO: This will be added
-############################################################################
-sub AUTOLOAD        #7/28/98 8:24PM
-{
-    print "\nJS::AUTOLOAD: $AUTOLOAD, not implemented yet\n" if $DEBUG;
-}   ##AUTOLOAD
-
-############################################################################
-# Evaluates the parameter and returns the return result of eval() as a
-# reference
-############################################################################
-sub perl_eval       #7/15/98 5:13PM
-{
-    my($stmt) = shift;
-    package main;
-    my(@_js) = eval($stmt);
-    package JS;
-    my($_js) = (scalar(@_js)==1)?$_js[0]:\@_js;
-    undef $js;
-    $js = (ref $_js) ? $_js: \$_js;
-    print "Failure in perl_call!" unless ref $js;
-}   ##perl_eval
-
-############################################################################
-# Calls the procesure passed as the first parameter and passes the rest of
-# the arguments to it. The return result is converted to a reference as
-# before
-############################################################################
-sub perl_call       #7/21/98 2:16PM
-{
-    my($proc) = shift;
-    my($_js);
-
-    $proc =~ s/main:://g;
-    #print "Calling $proc\n";
-    package main;
-    my(@_js) = &$proc(@_);
-    package JS;
-    #print "here: ", @_js, "\n";
-    $_js = (scalar(@_js)==1)?$_js[0]:\@_js;
-    undef $js;
-    $js = (ref $_js) ? $_js: \$_js;
-    #print ref $js;
-    print "Failure in perl_call!" unless ref $js;
-}   ##perl_call
-
-############################################################################
-# Takes the first parameter and tries to retrieve this variable
-############################################################################
-sub perl_resolve        #7/22/98 10:08AM
-{
-    my($name)  = shift;
-    my(@parts) = split('::', $name);
-    my($last_part)  = pop(@parts);
-
-    # variable lookup -- variables must start with $, @, or %
-    if($last_part =~ /^([\$\@\%])(.+)/){
-        my($resolved_name) = "$1".join('::', @parts)."::$2";
-        package main;
-        my(@_js) = eval($resolved_name);
-        package JS;
-        my($_js) = (scalar(@_js)==1)?$_js[0]:\@_js;
-        undef $js;
-        $js = (ref $_js) ? $_js: \$_js;
-    }else{
-        $name =~ s/main:://g;
-        # if this function exists
-        # function -- set $js to 1 to indicate this
-        if(eval "return defined(&main::$name)"){
-            print "function $name\n" if $DEBUG;
-            $js = 1;
-        # module
-        }else{
-            print "must be a module\n" if $DEBUG;
-            $js=2;
-            return;
-            # defined module -- try to do an eval and check $@ to trap errors
-            # as a result, the module is automatically pre-use'd if it exists
-            $name =~ s/main:://g;
-            if(eval "use $name; return !(defined($@));"){
-                $js = 2;
-            # o.w. this module is undefined
-            }else{
-                $js = 3;
-            }
-        }
-    }
-}   ##perl_resolve
-
-############################################################################
-# Validates package name
-############################################################################
-sub perl_validate_package       #7/22/98 10:15AM
-{
-    print "perl_validate_package\n" if $DEBUG;
-    my($name) = shift;
-    print $name if $DEBUG;
-    $js = $name?1:undef;
-}   ##perl_validate_package
-
-# test procedure
-sub c{
-    print "da!\n" if wantarray;
-    print "Called!\n";
-    return @_;
-}
-
-1;
\ No newline at end of file
diff --git a/libs/js/src/perlconnect/jsperl.c b/libs/js/src/perlconnect/jsperl.c
deleted file mode 100644
index 48d904add2..0000000000
--- a/libs/js/src/perlconnect/jsperl.c
+++ /dev/null
@@ -1,1100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PerlConnect module.
- */
-
-/*
-    The first two headers are from the Perl distribution.
-    Play with "perl -MExtUtils::Embed -e ccopts -e ldopts"
-    to find out which directories should be included. Refer
-    to perlembed man page for more info.
-*/
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-
-#include <jsapi.h>
-#include <string.h>
-
-/*---------------------------------------------------------------------------*/
-/* PerlConnect. Provides means for OO JS <==> Perl communications            */
-/* See README.html for more info on PerlConnect. Look for TODO in this file  */
-/* for things that are bogus or not completely implemented. Has been tested  */
-/* with 5.004 only                                                           */
-/*---------------------------------------------------------------------------*/
-
-/* Forward declarations */
-static JSBool PerlConstruct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *v);
-static void PerlFinalize(JSContext *cx, JSObject *obj);
-static JSBool perl_eval(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static JSBool perl_call(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static JSBool perl_use(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static JSBool use(JSContext *cx, JSObject *obj, int argc, jsval *argv, const char* t);
-static JSBool PMGetProperty(JSContext *cx, JSObject *obj, jsval name, jsval* rval);
-static JSBool PMSetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval);
-static JSBool PerlToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static JSBool processReturn(JSContext *cx, JSObject *obj, jsval* rval);
-static JSBool checkError(JSContext *cx);
-static JSBool PMToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static JSBool PVToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval);
-static SV*    PVGetRef(JSContext *cx, JSObject *obj);
-static JSBool PVGetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval);
-static JSBool PVSetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval);
-static JSBool PVGetElement(JSContext *cx, JSObject *obj, jsint index, jsval *rval);
-static JSBool PVSetElement(JSContext *cx, JSObject *obj, jsint index, jsval v);
-static JSBool PVGetKey(JSContext *cx, JSObject *obj, char* name, jsval *rval);
-static JSBool PVSetKey(JSContext *cx, JSObject *obj, char* name, jsval v);
-static JSBool PVConvert(JSContext *cx, JSObject *obj, JSType type, jsval *v);
-static void PVFinalize(JSContext *cx, JSObject *obj);
-/* Exported functions */
-JS_EXPORT_API(JSObject*)	JS_InitPerlClass(JSContext *cx, JSObject *obj);
-JS_EXPORT_API(JSBool)		JSVALToSV(JSContext *cx, JSObject *obj, jsval v, SV** sv);
-JS_EXPORT_API(JSBool)		SVToJSVAL(JSContext *cx, JSObject *obj, SV *ref, jsval *rval);
-
-/*
-    The following is required by the Perl dynamic loading mechanism to
-    link with modules that use C properly. See perlembed man page for details.
-    This allows things like sockets to be called via PerlConnect.
-*/
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-EXTERN_C void boot_DynaLoader _((CV* cv));
-EXTERN_C void
-xs_init()
-{
-    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__);
-}
-
-/* These properties are not processed by the getter for PerlValue */
-static char* predefined_methods[] = {"toString", "valueOf", "type", "length"};
-
-/* Represents a perl interpreter */
-JSClass perlClass = {
-    "Perl", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub, PMGetProperty, /*PMSetProperty*/JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,  PerlFinalize
-};
-
-static JSFunctionSpec perlMethods[] = {
-    {"toString",  (JSNative)PerlToString, 0},
-    {"eval",  (JSNative)perl_eval, 0},
-    {"call",  (JSNative)perl_call, 0},
-    {"use",   (JSNative)perl_use,  0},
-    { NULL, NULL,0 }
-};
-
-
-/* Represents a Perl module */
-JSClass perlModuleClass = {
-    "PerlModule", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub, PMGetProperty, JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
-};
-
-JSFunctionSpec perlModuleMethods[] = {
-    {"toString",  (JSNative)PMToString, 0},
-    { NULL, NULL,0 }
-};
-
-
-/* Represents a value returned from Perl */
-JSClass perlValueClass = {
-    "PerlValue", JSCLASS_HAS_PRIVATE,
-    JS_PropertyStub,  JS_PropertyStub, PVGetProperty, PVSetProperty,
-    JS_EnumerateStub, JS_ResolveStub, PVConvert, PVFinalize
-};
-
-JSFunctionSpec perlValueMethods[] = {
-    {"toString",  (JSNative)PVToString, 0},
-    { NULL, NULL,             0}
-};
-
-/*
-    Initializes Perl class. Should be called by applications that
-    want to enable PerlConnect. This will probably preload the Perl
-    DLL even though Perl might not actually be used. We may postpone
-    this and load the DLL at runtime after the constructor is called.
-*/
-static JSObject*
-js_InitPerlClass(JSContext *cx, JSObject *obj)
-{
-    jsval v;
-    JSObject *module;
-    JSString *mainString = JS_NewStringCopyZ(cx, "main");
-    if (!mainString)
-        return NULL;
-    v = STRING_TO_JSVAL(mainString);
-    module = JS_NewObject(cx, &perlModuleClass, NULL, obj);
-    if (!module)
-        return NULL;
-
-    if (!JS_DefineFunctions(cx, module, perlModuleMethods))
-        return NULL;
-
-    JS_SetProperty(cx, module, "path", &v);
-
-    return JS_InitClass(cx, obj, module, &perlClass, PerlConstruct, 0,
-        NULL, NULL, NULL, NULL);
-}
-
-/* Public wrapper for the function above */
-JSObject*
-JS_InitPerlClass(JSContext *cx, JSObject *obj)
-{
-    return js_InitPerlClass(cx, obj);
-}
-
-/*
-    Perl constructor. Allocates a new interpreter and defines methods on it.
-    The constructor is sort of bogus in that it doesn't create a new namespace
-    and all the variables defined in one instance of the Perl object will be
-    visible in others. In the future, I think it may be a good idea to use
-    Safe.pm to provide independent contexts for different Perl objects and
-    prohibit certain operations (like exit(), alarm(), die(), etc.). Or we
-    may simple disallow calling the constructor more than once.
-*/
-static JSBool
-PerlConstruct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *v)
-{
-    PerlInterpreter *perl;
-    JSObject *perlObject;
-    JSBool ok;
-    char *embedding[] = {"", "-e", "0"};
-    char *t = "use PerlConnect qw(perl_eval perl_resolve perl_call $js $ver);";
-
-    /* create a new interpreter */
-    perl = perl_alloc();
-
-    if(perl==NULL){
-        JS_ReportError(cx, "Can't allocate a new interpreter");
-        return JS_FALSE;
-    }
-
-    perl_construct(perl);
-    if(perl_parse(perl, xs_init, 3, embedding, NULL)){
-        JS_ReportError(cx, "Parsing failed");
-        return JS_FALSE;
-    }
-    if(perl_run(perl)){
-        JS_ReportError(cx, "Run failed");
-        return JS_FALSE;
-    }
-    ok = use(cx, obj, argc, argv, t);
-
-    /* make it into an object */
-    perlObject = JS_NewObject(cx, &perlClass, NULL, NULL);
-    if(!perlObject)
-        return JS_FALSE;
-    if(!JS_DefineFunctions(cx, perlObject, perlMethods))
-        return JS_FALSE;
-    JS_SetPrivate(cx, perlObject, perl);
-    *v = OBJECT_TO_JSVAL(perlObject);
-    return ok;
-}
-
-/* Destructor. Deallocates the interpreter */
-static void
-PerlFinalize(JSContext *cx, JSObject *obj)
-{
-    PerlInterpreter *perl = JS_GetPrivate(cx, obj);
-    if (perl) {
-        perl_destruct(perl);
-        perl_free(perl);
-    }
-    /*    return JS_TRUE; */
-}
-
-/*
-    Returns a string representation of the Perl interpreter.
-    Can add printing of the Perl version, @ISA, etc., like the
-    output produced by perl -V. Can also make certain variables
-    available off the Perl object, like Perl.version, etc.
-*/
-static JSBool
-PerlToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval){
-    JSString *imported;
-    SV* sv = perl_get_sv("JS::ver", FALSE);
-    if (!sv) {
-        JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
-    }
-    imported = JS_NewStringCopyZ(cx, SvPV(sv, PL_na));
-    if (!imported)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(imported);
-    return JS_TRUE;
-}
-
-/*
-    Evaluates the first parameter in Perl and put the eval's
-    return value into *rval. The return value is of type PerlValue.
-    This procedure uses JS::perl_eval. Example of use of perl.eval():
-        p = new Perl();
-        str = p.eval("'-' x 80");   // str contains 80 dashes
-*/
-static JSBool
-perl_eval(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval)
-{
-    char *statement;
-    char *args[] = {NULL, NULL};    /* two elements */
-
-    if(argc!=1){
-        JS_ReportError(cx, "Perl.eval expects one parameter");
-        return JS_FALSE;
-    }
-    statement = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-    args[0] = statement;
-    perl_call_argv("JS::perl_eval", G_SCALAR|G_KEEPERR|G_EVAL, args);
-    return processReturn(cx, obj, rval);
-}
-
-/*
-    Call the perl procedure specified as the first argument and
-    pass all the other arguments as parameters. The return value
-    is returned in *rval. Example of use of perl.call():
-        p = new Perl('Time::gmtime');
-        time = p.call("Time::gmtime::gmtime");   // time is now the following array:
-                                                 // [40,42,1,22,6,98,3,202,0]
-    NB: The full function name has to be supplied, i.e. Time::gmtime::gmtime
-    instead of gmtime unless gmtime is exported into the current package.
-
-    This method is also used when one uses the full package name syntax like
-    this:
-        p = new Perl("Sys::Hostname", "JS")
-        result = p.JS.c(1, 2, 4)
-        p.hostname()
-
-    This gets called from PMGetProperty, which creates a
-    function whose native method is perl_call. Also see
-    JS::perl_call.
-*/
-static JSBool
-perl_call(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval)
-{
-    JSBool ok;
-    int count, i;
-    char* fun_name;
-    SV *sv;
-    dSP;
-
-    /* Differetiate between direct and method-like call */
-    if((JS_TypeOfValue(cx, argv[-2]) == JSTYPE_FUNCTION) &&
-            strcmp("call", JS_GetFunctionName(JS_ValueToFunction(cx, argv[-2])))){
-        fun_name = (char*)JS_GetFunctionName(JS_GetPrivate(cx, JSVAL_TO_OBJECT(argv[-2])));
-        i=0;
-    }else{
-        fun_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-        i=1;
-    }
-
-    PUSHMARK(sp);
-    XPUSHs(sv_2mortal(newSVpv(fun_name,0)));
-
-    for(;i<argc;i++){
-        JSVALToSV(cx, obj, argv[i], &sv);
-        XPUSHs(sv);
-    }
-    PUTBACK;
-
-    count = perl_call_sv(newSVpv("JS::perl_call", 0), G_KEEPERR|G_SCALAR|G_EVAL|G_DISCARD);
-    if(count!=0){
-        JS_ReportError(cx, "Implementation error: count=%d, must be 0!\n", count);
-        return JS_FALSE;
-    }
-    ok = processReturn(cx, obj, rval);
-
-    return ok;
-}
-
-/*
-    Loads Perl libraries specified as arguments.
-*/
-static JSBool
-perl_use(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval)
-{
-    return use(cx, obj, argc, argv, NULL);
-}
-
-/*
-    Utility function used by perl_use and Perl's constructor.
-    Executes use lib1; use lib2, etc. in the current interpreter.
-*/
-static JSBool
-use(JSContext *cx, JSObject *obj, int argc, jsval *argv, const char* t){
-    char *evalStr = JS_malloc(cx, t?strlen(t)+1:1);
-    int i;
-
-    if (!evalStr)
-        return JS_FALSE;
-
-    strcpy(evalStr, t?t:"");
-
-    for(i=0;i<argc;i++){
-        char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[i])), *tmp, old[256];
-
-        /* call use() on every parameter */
-        strcpy(old, evalStr);
-	JS_free(cx, evalStr);
-        tmp = JS_malloc(cx, strlen(old)+strlen(arg)+6);
-        if (!tmp)
-            return JS_FALSE;
-        sprintf(tmp, "%suse %s;", old, arg);
-        evalStr = tmp;
-    }
-
-    perl_eval_sv(newSVpv(evalStr, 0), G_KEEPERR);
-
-    checkError(cx);
-    JS_free(cx, evalStr);
-    return JS_TRUE;
-}
-
-/*
-    Looks at $@ to see if there was an error. Used by
-    perl_eval, perl_call, etc.
-*/
-static JSBool
-checkError(JSContext *cx)
-{
-    if(SvTRUE(GvSV(PL_errgv))){ 
-        JS_ReportError(cx, "perl eval failed: %s",
-            SvPV(GvSV(PL_errgv), PL_na));
-        /* clear error status. there should be a way to do this faster */
-        perl_eval_sv(newSVpv("undef $@;", 0), G_KEEPERR);
-        return JS_FALSE;
-    }
-    return JS_TRUE;
-}
-
-/*
-    Take the value of $JS::js and convert in to a jsval. It's stotred
-    in *rval. perl_eval and perl_call use $JS::js to store return results.
-*/
-static JSBool
-processReturn(JSContext *cx, JSObject *obj, jsval* rval)
-{
-    SV  *js;
-
-    js = perl_get_sv("JS::js", FALSE);
-
-    if(!js || !SvOK(js)){
-        *rval = JSVAL_VOID;
-        /* XXX isn't this wrong? */
-        return JS_FALSE;
-    }
-    if(!SvROK(js)){
-        JS_ReportError(cx, "$js (%s) must be of reference type", SvPV(js,PL_na));
-        return JS_FALSE;
-    }
-
-    checkError(cx);
-
-    return SVToJSVAL(cx, obj, js, rval);
-}
-
-/*
-    Implements namespace-like syntax that maps Perl packages to
-    JS objects. One can say
-        p = new Perl('Foo::Bar')
-    and then call
-        a = p.Foo.Bar.f()
-    or access variables exported from those packages like this:
-        a = p.Foo.Bar["$var"]
-    this syntax will also work:
-        a = p.Foo.Bar.$var
-    but if you want to access non-scalar values, you must use the subscript syntax:
-        p.Foo.Bar["@arr"]
-    and
-        p.Foo.Bar["%hash"]
-*/
-static JSBool
-PMGetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval)
-{
-    char *last = JS_GetStringBytes(JS_ValueToString(cx, name)), *path, package[256];
-    char *args[] = {NULL, NULL};
-    char *predefined_methods[] = {"toString", "eval", "call", "use", "path"};
-    int count;
-    SV  *js;
-    jsval v;
-    int i;
-
-    for(i=0;i<sizeof(predefined_methods)/sizeof(char*);i++){
-        if(!strcmp(predefined_methods[i], last)){
-            return JS_TRUE;
-        }
-    }
-
-    JS_GetProperty(cx, obj, "path", &v);
-    path = JS_GetStringBytes(JS_ValueToString(cx, v));
-    sprintf(package, "%s::%s", path, last);
-    args[0] = package;
-
-    count = perl_call_argv("JS::perl_resolve", G_KEEPERR|G_SCALAR|G_EVAL|G_DISCARD, args);
-    if(count!=0){
-        JS_ReportError(cx, "Implementation error: count=%d, must be 0!\n", count);
-        return JS_FALSE;
-    }
-
-    checkError(cx);
-
-    js = perl_get_sv("JS::js", FALSE);
-
-    if(js && SvOK(js)){
-        if(SvROK(js)){
-            SVToJSVAL(cx, obj, js, rval);
-        }else{
-            /* defined function */
-            if(SvIV(js) == 1){
-                JSFunction *f = JS_NewFunction(cx, (JSNative)perl_call, 0, 0, NULL, package);
-                if (!f) {
-                    return JS_FALSE;
-                }
-                *rval = OBJECT_TO_JSVAL(JS_GetFunctionObject(f));
-            }else
-            if(SvIV(js) == 2){
-                JSObject *module;
-                JSString *packageString;
-                module = JS_NewObject(cx, &perlModuleClass, NULL, obj);
-                packageString = JS_NewStringCopyZ(cx,package);
-                if (!module || !packageString) {
-                    return JS_FALSE;
-                }
-                v = (js && SvTRUE(js))?STRING_TO_JSVAL(packageString):JSVAL_VOID;
-                JS_SetProperty(cx, module, "path", &v);
-                *rval = OBJECT_TO_JSVAL(module);
-            }else{
-                JS_ReportError(cx, "Symbol %s is not defined", package);
-                *rval = JSVAL_VOID;
-            }
-        }
-        return JS_TRUE;
-    }else{
-        JS_ReportError(cx, "failure");
-        return JS_FALSE;
-    }
-}
-
-/*
-    Gets called when a Perl value gets assigned to like this:
-        p.Foo.Bar["$var"] = 100
-*/
-static JSBool
-PMSetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval)
-{
-    /* TODO: just call SVToJSVAL() and make the assignment. */
-    return JS_TRUE;
-}
-
-/*
-    toString() for PerlModule. Prints the path the module represents.
-    Note that the path doesn't necessarily have to be valid. We don't
-    have a way to check that until we call a function from that package.
-    TODO: In 5.005 exists Foo::{Bar::} checks is Foo::{Bar::} exists.
-    We can use this to validate package names.
-*/
-static JSBool
-PMToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval){
-    char str[256];
-    JSString *s, *newString;
-    jsval v;
-
-    JS_GetProperty(cx, obj,  "path", &v);
-    s = JSVAL_TO_STRING(v);
-    sprintf(str, "[PerlModule %s]", JS_GetStringBytes(s));
-    newString = JS_NewStringCopyZ(cx, str);
-    if (!newString)
-        return JS_FALSE;
-    *rval = STRING_TO_JSVAL(newString);
-    return JS_TRUE;
-}
-
-/*
-    Helped method. Retrieves the Perl reference stored
-    in PerlValue object as private data.
-*/
-
-#include <stdio.h>
-
-static SV*
-PVGetRef(JSContext *cx, JSObject *obj)
-{
-    SV* ref;
-
-    ref = (SV*)JS_GetInstancePrivate(cx, obj, &perlValueClass, NULL);
-
-    if(!ref || !SvOK(ref) || !SvROK(ref)){
-        JS_ReportError(cx, "Can't extract ref");
-        return NULL;
-    }
-    return ref;
-}
-
-static JSBool
-PVCallStub (JSContext *cx, JSObject *obj, uintN argc, 
-            jsval *argv, jsval *rval) {
-    JSFunction *fun;
-    int i, cnt;
-    I32 ax;
-    SV *sv, *perl_object;
-    GV *gv;
-    HV *stash;
-    char *name;
-
-    dSP;
-
-    fun = JS_ValueToFunction(cx, argv[-2]);
-    perl_object = PVGetRef(cx, obj);
-
-    fun = JS_ValueToFunction(cx, argv[-2]);
-    name = (char*) JS_GetFunctionName(fun);
-
-    stash = SvSTASH(SvRV(perl_object));
-    gv = gv_fetchmeth(stash, name, strlen(name), 0);
-    /* cnt = perl_call_pv(method_name, 0); */
-    /* start of perl call stuff */
-    if (! gv) {
-        char msg[256];
-        sprintf(msg, "Method ``%s'' not defined", name);
-        JS_ReportError(cx, msg);
-        return JS_FALSE;
-    }
-
-    ENTER;
-    SAVETMPS;
-    PUSHMARK(SP);
-    //SvREFCNT_inc(perl_object);
-    XPUSHs(perl_object); /* self for perl object method */
-    for (i = 0; i < argc; i++) {
-        //sv = sv_newmortal();
-        JSVALToSV(cx, obj, argv[i], &sv);
-        //sv_2mortal(sv);
-        XPUSHs(sv);
-    }
-    PUTBACK;
-
-    cnt = perl_call_sv((SV*)GvCV(gv), G_ARRAY | G_KEEPERR | G_EVAL);
-
-    //SvREFCNT_dec(perl_object);
-
-    SPAGAIN;
-    /* adjust stack for use of ST macro (see perlcall) */
-    SP -= cnt;
-    ax = (SP - PL_stack_base) + 1;
-
-    /* read value(s) */
-    if (cnt == 1) {
-        SVToJSVAL(cx, obj, ST(0), rval);
-    } else {
-        JSObject *jsarr;
-        jsval val;
-        int i;
-        jsarr = JS_NewArrayObject(cx, 0, NULL);
-        for (i = 0; i < cnt; i++) {
-            SVToJSVAL(cx, JS_GetGlobalObject(cx), ST(i), &val);
-            JS_DefineElement(cx, jsarr, i, val, NULL, NULL, 0);
-        }
-        *rval = OBJECT_TO_JSVAL(jsarr);
-    }
-    PUTBACK;
-
-    FREETMPS;
-    LEAVE;
-
-    //return(JS_TRUE);
-    return checkError(cx);
-}
-
-/*
-    Retrieve property from PerlValue object by its name. Tries
-    to look at the PerlValue object both as a hash and array.
-    If the index is numerical, then it looks at the array part
-    first. *rval contains the result.
-*/
-/* __PH__
-    ...but. PVGetproperty now firstly looks for method in given 
-    object package. If such method if found, then is returned 
-    universal method stub. Sideeffect of this behavior is, that
-    method are looked first before properties of the same name.
-
-    Second problem is security. In this way any perl method could 
-    be called. We pay security leak for this. May be we could 
-    support some Perl exporting process (via some package global 
-    array).
-*/
-static JSBool
-PVGetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval)
-{
-    char* str;
-
-    /* __PH__ array properties should be served first */
-    if(JSVAL_IS_INT(name)){
-        int32 ip;
-
-        JS_ValueToInt32(cx, name, &ip);
-        PVGetElement(cx, obj, ip, rval);
-        if(*rval!=JSVAL_VOID){
-            return JS_TRUE;
-        }
-    }
-
-    str = JS_GetStringBytes(JS_ValueToString(cx, name));
-
-    /* __PH__ may, be */
-    if(!strcmp(str, "length")){
-        SV* sv = SvRV(PVGetRef(cx, obj));
-
-        if(SvTYPE(sv)==SVt_PVAV){
-            *rval = INT_TO_JSVAL(av_len((AV*)sv)+1);
-            return JS_TRUE;
-        }else
-        if(SvTYPE(sv)==SVt_PVHV){
-            *rval = INT_TO_JSVAL(av_len((AV*)sv)+1);
-            return JS_TRUE;
-        }else{
-            *rval = INT_TO_JSVAL(0);
-            return JS_TRUE;
-        }
-    }else{
-        int i;
-        /* __PH__ predefined methods NUST win */
-        for(i=0; i < sizeof(predefined_methods)/sizeof(char*); i++){
-            if(!strcmp(predefined_methods[i], str)){
-                return JS_TRUE;
-            }
-        }
-
-        /* __PH__ properties in hash should be served at last (possibly) */
-        PVGetKey(cx, obj, str, rval);
-        if (*rval!=JSVAL_VOID) {
-            return JS_TRUE;
-        } else {
-#if 0
-            char* str = JS_GetStringBytes(JS_ValueToString(cx, name));
-            JS_ReportError(cx, "Perl: can't get property '%s'", str);
-            return JS_FALSE;
-#else
-            /* when Volodya does another job, we may experiment :-) */
-            char* str = JS_GetStringBytes(JS_ValueToString(cx, name));
-            /* great, but who will dispose it? (GC of JS??) */
-            JSFunction *fun = JS_NewFunction(cx, PVCallStub, 0, 0, NULL, str);
-            *rval = OBJECT_TO_JSVAL(JS_GetFunctionObject(fun));
-            return(JS_TRUE);
-#endif
-        }
-    }
-    return JS_TRUE;
-}
-
-/*
-    Set property of PerlValue object. Like GetProperty is looks at
-    both array and hash components.
-*/
-static JSBool
-PVSetProperty(JSContext *cx, JSObject *obj, jsval name, jsval *rval)
-{
-    char* str = JS_GetStringBytes(JS_ValueToString(cx, name));
-
-    if(JSVAL_IS_INT(name)){
-        int32 ip;
-
-        JS_ValueToInt32(cx, name, &ip);
-        if(PVSetElement(cx, obj, ip, *rval)) return JS_TRUE;
-    }
-    return PVSetKey(cx, obj, str, *rval);
-}
-
-/*
-    Retrieve numerical property of a PerlValue object.
-    If the object doesn't contain an array, or the
-    property doesn't exist, NULL is returned.
-*/
-static JSBool
-PVGetElement(JSContext *cx, JSObject *obj, jsint index, jsval *rval)
-{
-    SV *ref, **sv;
-    AV *list;
-
-    *rval = JSVAL_VOID;
-
-    ref = PVGetRef(cx, obj);
-
-    if(SvTYPE(SvRV(ref)) != SVt_PVAV){
-        return JS_FALSE;
-    }
-
-    list = (AV*)SvRV(ref);
-
-    if(!list){
-        return JS_FALSE;
-    }
-    sv = av_fetch(list, (I32)index, 0);
-    if(!sv){
-        return JS_FALSE;
-    }
-    //return SVToJSVAL(cx, obj, newRV_inc(*sv), rval);
-    return SVToJSVAL(cx, obj, *sv, rval);
-}
-
-/*
-    Set a numeric property of a PerlValue object.
-    If the object doesn't contain an array or the
-    index doesn't exist, JS_FALSE is returned.
-*/
-static JSBool
-PVSetElement(JSContext *cx, JSObject *obj, jsint index, jsval v)
-{
-    SV *ref, **sv, *s;
-    AV *list;
-
-    ref = PVGetRef(cx, obj);
-
-    if(SvTYPE(SvRV(ref)) != SVt_PVAV){
-        return JS_FALSE;
-    }
-
-    list = (AV*)SvRV(ref);
-
-    if(!list) return JS_FALSE;
-    JSVALToSV(cx, obj, v, &s);
-    sv = av_store(list, (I32)index, s);
-    if(!sv) return JS_FALSE;
-    return JS_TRUE;
-}
-
-/*
-    Retrieve property. If the object doesn't contain an hash, or the
-    property doesn't exist, NULL is returned.
-*/
-static JSBool
-PVGetKey(JSContext *cx, JSObject *obj, char* name, jsval *rval)
-{
-    SV *ref, **sv;
-    HV *hash;
-
-    *rval = JSVAL_VOID;
-    ref = PVGetRef(cx, obj);
-
-    if(SvTYPE(SvRV(ref)) != SVt_PVHV){
-        return JS_FALSE;
-    }
-
-    hash = (HV*)SvRV(ref);
-
-    if(!hash){
-        return JS_FALSE;
-    }
-    sv = hv_fetch(hash, name, strlen(name), 0);
-    if(!sv){
-        return JS_FALSE;
-    }
-    return SVToJSVAL(cx, obj, newRV_inc(*sv), rval);
-}
-
-/*
-    Get property of a PerlValue object.
-    If the object doesn't contain a hash or the
-    property doesn't exist, JS_FALSE is returned.
-*/
-static JSBool
-PVSetKey(JSContext *cx, JSObject *obj, char* name, jsval v)
-{
-    SV *ref, **sv, *s;
-    HV *hash;
-
-    ref = PVGetRef(cx, obj);
-
-    if(SvTYPE(SvRV(ref)) != SVt_PVHV){
-        return JS_FALSE;
-    }
-
-    hash = (HV*)SvRV(ref);
-
-    if(!hash) return JS_FALSE;
-    JSVALToSV(cx, obj, v, &s);
-    sv = hv_store(hash, name, strlen(name), s, 0);
-    if(!sv) return JS_FALSE;
-    else return JS_TRUE;
-}
-
-/*
-    toString() method for PerlValue. For arrays uses array's methods.
-    If this fails, the type of the value gets returned. TODO: It's actually
-    better to use a Perl module like Data::Dumpvar.pm to print complex
-    data structures recursively.
-*/
-static JSBool
-PVToString(JSContext *cx, JSObject *obj, int argc, jsval *argv, jsval* rval)
-{
-    SV* ref     = PVGetRef(cx, obj);
-    SV* sv      = SvRV(ref);
-    svtype type = SvTYPE(sv);
-    /*jsval args[]= {STRING_TO_JSVAL(JS_NewStringCopyZ(cx, "JS::Object::toString")),
-                            OBJECT_TO_JSVAL(obj)};*/
-    jsval v;
-    /*return perl_call(cx, obj, 2, args, rval);*/
-
-    if (type==SVt_PVAV) {
-        JSObject   *arrayObject = JS_NewArrayObject(cx,0,NULL);
-        JSFunction *fun;
-
-        JS_GetProperty(cx, arrayObject, "toString", &v);
-        fun = JS_ValueToFunction(cx, v);
-        return JS_CallFunction(cx, obj, fun, 0, NULL, rval);
-    } 
-    {
-        char out[256];
-        JSString *newString;
-        JS_GetProperty(cx, obj, "type", &v);
-        if(!JSVAL_IS_VOID(v))
-            sprintf(out, "[%s]", JS_GetStringBytes(JSVAL_TO_STRING(v)));
-        else
-            strcpy(out, "[PerlValue]");
-        newString = JS_NewStringCopyZ(cx, out);
-        if (!newString)
-            return JS_FALSE;
-        *rval = STRING_TO_JSVAL(newString);
-    }
-    return JS_TRUE;
-}
-
-static JSBool
-PVConvert (JSContext *cx, JSObject *obj, JSType type, jsval *rval)
-{
-    *rval = OBJECT_TO_JSVAL(obj);
-    return JS_TRUE;
-}
-
-/*
-    Takes care of GC in Perl: we need to decrement Perl's
-    reference count when PV goes out of scope.
-*/
-
-/* #include <stdio.h> */
-
-static void
-PVFinalize (JSContext *cx, JSObject *obj)
-{
-    /* SV* sv = SvRV(PVGetRef(cx, obj)); */
-    SV *sv;
-
-    if ( obj ) {
-        sv = PVGetRef(cx, obj);
-        
-        /* SV *sv = PVGetRef(cx, obj);
-           if ( SvROK(sv) ) sv = SvRV( sv ); _PH_ test*/
-        
-        /* TODO: GC */
-        if(sv && SvREFCNT(sv) > 0){
-            /*fprintf(stderr, "Finalization: %d references left", SvREFCNT(sv));*/
-            SvREFCNT_dec(sv);
-            /*fprintf(stderr, "Finalization: %d references left", SvREFCNT(sv));*/
-        }
-    }
-    /*    return JS_TRUE; */
-}
-
-/*
-    Convert a jsval to a SV* (scalar value pointer).
-    Used for parameter passing. This function is also
-    used by the Perl part of PerlConnect.
-*/
-
-JSBool
-JSVALToSV(JSContext *cx, JSObject *obj, jsval v, SV** sv)
-{
-    //*sv = &sv_undef; //__PH__??
-    if(JSVAL_IS_PRIMITIVE(v)){
-        if(JSVAL_IS_NULL(v) || JSVAL_IS_VOID(v)){
-            *sv = &PL_sv_undef;
-            //printf("===> JSVALToSV: VOID\n");
-        }else
-        if(JSVAL_IS_INT(v)){
-            *sv = sv_newmortal();
-            sv_setiv(*sv, JSVAL_TO_INT(v));
-            //*sv = newSViv(JSVAL_TO_INT(v));
-            //printf("===> JSVALToSV: INT\n");
-        }else
-        if(JSVAL_IS_DOUBLE(v)){
-            *sv = sv_newmortal();
-            sv_setnv(*sv, *JSVAL_TO_DOUBLE(v));
-            //*sv = newSVnv(*JSVAL_TO_DOUBLE(v));
-            //printf("===> JSVALToSV: DOUBLE\n");
-        }else
-        if(JSVAL_IS_STRING(v)){
-            *sv = sv_newmortal();
-            sv_setpv(*sv, JS_GetStringBytes(JSVAL_TO_STRING(v)));
-            //*sv = newSViv(0);
-            //sv_setpv(*sv, JS_GetStringBytes(JSVAL_TO_STRING(v)));
-            //printf("===> JSVALToSV: CHAR\n");
-        }else{
-            warn("Unknown primitive type");
-        }
-    }else{
-        if(JSVAL_IS_OBJECT(v)){
-            JSObject *object = JSVAL_TO_OBJECT(v);
-            if(JS_InstanceOf(cx, object, &perlValueClass, NULL)){
-                *sv = PVGetRef(cx, object);
-            }else{
-                if(JS_IsArrayObject(cx, object)){
-                    *sv = sv_newmortal();
-                    sv_setref_pv(*sv, "JS::Object", (void*)object);
-                    sv_magic(SvRV(*sv), sv_2mortal(newSViv((IV)cx)), 
-                             '~', NULL, 0);
-                    /* printf("===> JSVALToSV: ARRAY\n); */
-                }else{
-                    *sv = sv_newmortal();
-                    sv_setref_pv(*sv, "JS::Object", (void*)object);
-                    sv_magic(SvRV(*sv), sv_2mortal(newSViv((IV)cx)), 
-                             '~', NULL, 0);
-                    //printf("===> JSVALToSV: JS OBJECT\n");
-                }
-            }
-        }else{
-            warn("Type conversion is not supported");
-            *sv = &PL_sv_undef;  //__PH__??
-            return JS_FALSE;
-        }
-    }
-    return JS_TRUE;
-}
-
-/*
-    Converts a reference Perl value to a jsval. If ref points
-    to an immediate value, the value itself is returned in rval.
-    O.w. a PerlValue object is returned. This function is also
-    used by the Perl part of PerlConnect.
-*/
-
-#define SV_BIND_TO_OBJECT(sv) (sv_isobject(sv) || (SvROK(sv) && (\
-               SvTYPE(SvRV(sv)) == SVt_RV   ||\
-               SvTYPE(SvRV(sv)) == SVt_PVAV ||\
-               SvTYPE(SvRV(sv)) == SVt_PVHV ||\
-               SvTYPE(SvRV(sv)) == SVt_PVCV\
-            )))
-
-JSBool
-SVToJSVAL(JSContext *cx, JSObject *obj, SV *ref, jsval *rval) {
-    SV *sv;
-    char* name=NULL;
-    JSBool ok = JS_TRUE;
-
-    /* we'll use the dereferrenced value (excpet for object) */
-    if( SvROK(ref) ) {
-        sv = SvRV(ref);
-    }else{
-        sv = ref;
-    }
-
-    /* printf("+++> In SVToJSVAL value %s, type=%d\n", SvPV(sv, PL_na), SvTYPE(sv)); */
-
-    if ( ! SvOK( ref ) ){
-        *rval = JSVAL_VOID;
-        /* printf("---> SVToJSVAL returning VOID\n"); */
-    } else
-    if ( SV_BIND_TO_OBJECT(ref) ) {
-        JSObject *perlValue, *prototype = NULL;
-        JSString *nameString;
-
-        /*svtype type = SvTYPE(sv);
-          switch(type){
-          case SVt_RV:   name = "Perl Reference"; break;
-          case SVt_PVAV: name = "Perl Array"; break;
-          case SVt_PVHV: name = "Perl Hash"; break;
-          case SVt_PVCV: name = "Perl Code Reference"; break;
-          case SVt_PVMG: name = "Perl Magic"; break;
-          default:
-          warn("Unsupported type in SVToJSVAL: %d", type);
-          *rval = JSVAL_VOID;
-          return JS_FALSE;
-          }*/
-        
-        /* printf("---> SVToJSVAL returning object\n"); */
-        name = "Perl Value";
-        /* __PH__ */
-        SvREFCNT_inc(ref);
-
-        if (SvTYPE(sv) == SVt_PVAV) {
-            prototype = JS_NewArrayObject(cx, 0, NULL);
-            if (!prototype)
-                return JS_FALSE;
-        }
-
-        perlValue = JS_DefineObject(cx, obj, "PerlValue",
-                                    &perlValueClass, prototype, 
-                                    JSPROP_ENUMERATE);
-        if (!perlValue)
-            return JS_FALSE;
-        JS_SetPrivate(cx, perlValue, ref);
-        if (!JS_DefineFunctions(cx, perlValue, perlValueMethods))
-            return JS_FALSE;
-        if (name) {
-            nameString = JS_NewStringCopyZ(cx, name);
-            if (!nameString)
-                return JS_FALSE;
-        }
-        if (!JS_DefineProperty(cx, perlValue, "type",
-                               name?STRING_TO_JSVAL(nameString):JSVAL_VOID,
-                               NULL, NULL, JSPROP_PERMANENT|JSPROP_READONLY))
-            return JS_FALSE;
-        *rval = OBJECT_TO_JSVAL(perlValue); 
-    } else
-    if(SvIOK(sv)){
-        *rval = INT_TO_JSVAL(SvIV(sv));
-        /* printf("---> SVToJSVAL returning INTEGER\n"); */
-    } else
-    if(SvNOK(sv)){
-        ok = JS_NewDoubleValue(cx, SvNV(sv), rval);
-        /* printf("---> SVToJSVAL returning DOUBLE\n"); */
-    } else
-    if(SvPOK(sv)){
-        *rval = STRING_TO_JSVAL((JS_NewStringCopyZ(cx, SvPV(sv, PL_na))));
-        /* printf("---> SVToJSVAL returning CHAR\n\n"); */
-    } else {
-        *rval = JSVAL_VOID; /* shouldn't happen */
-        /* printf("---> SVToJSVAL returning VOID (panic)\n"); */
-    }
-    return ok;
-}
diff --git a/libs/js/src/perlconnect/jsperl.h b/libs/js/src/perlconnect/jsperl.h
deleted file mode 100644
index 7c23ef3e5d..0000000000
--- a/libs/js/src/perlconnect/jsperl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* This is the public header, which means that this is the only thing one    */
-/* needs to include to enable the Perl object. See README.html for more      */
-/* documentation                                                             */
-
-#include <jsapi.h>
-
-/*
-    This is the only function that must be called by an
-    application that wants to use PerlConnect.
-*/
-JS_EXTERN_API(JSObject*)
-JS_InitPerlClass(JSContext *cx, JSObject *obj);
-
diff --git a/libs/js/src/perlconnect/jsperlpvt.h b/libs/js/src/perlconnect/jsperlpvt.h
deleted file mode 100644
index 8edca81521..0000000000
--- a/libs/js/src/perlconnect/jsperlpvt.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "EXTERN.h"
-#include "perl.h"
-#include "jsperl.h"
-/* Copyright © 1998 Netscape Communications Corporation, All Rights Reserved.*/
-/* This is the private header, which means that it shouldn't be included     */
-/* unless you need to use some of the jsval<->SV* conversion functions       */
-/* provided by PerlConnect needs to include to enable the Perl object. See   */
-/* README.html for more documentation                                        */
-
-/*
-    This and the following function are used to convert
-    between Perl's "SV*" and JS's "jsval" types.
-*/
-JS_EXTERN_API(SV*)
-JSVALToSV(JSContext *cx, JSObject *obj, jsval v, SV** sv);
-
-JS_EXTERN_API(JSBool)
-SVToJSVAL(JSContext *cx, JSObject *obj, SV *ref, jsval *rval);
diff --git a/libs/js/src/perlconnect/typemap b/libs/js/src/perlconnect/typemap
deleted file mode 100644
index 0a35189b34..0000000000
--- a/libs/js/src/perlconnect/typemap
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Typemap for PerlConnect
-#
-
-TYPEMAP
-# These types have direct equivalents implemented as Perl packages
-JSRuntime *      RUNTIME
-JSContext *      CONTEXT
-JSScript  *      SCRIPT
-jsval            jsval
-# This is an auxilary type. Object serves as a wrapper for it
-JSObject *       OBJECT
-
-
-OUTPUT
-jsval
-    {
-	SV *foo = sv_newmortal();
-        JSVALToSV(cx, JS_GetGlobalObject(cx), $var, &foo);
-	sv_setsv($arg, foo);
-    }
-
-OBJECT
-    sv_setref_pv($arg, "JS::Object", (void*)$var);
-
-#CONTEXT
-#    sv_setref_pv($arg, "JS::Context", (void*)$var);
-
-SCRIPT
-    sv_setref_pv($arg, "JS::Script", (void*)$var);
-
-RUNTIME
-    sv_setref_pv($arg, "JS::Runtime", (void*)$var);
-
-#JS_OBJECT
-#    sv_setref_pv($arg, "JSObject", (void*)$var);
-
-INPUT
-jsval
-    {
-        /* JSContext *cx = getContext(); */
-        SVToJSVAL(cx, JS_GetGlobalObject(cx), newRV($arg), &$var);
-    }
-
-OBJECT
-    if(sv_isa($arg, \"JS::Object\"))
-        $var = ($type)SvIV((SV*)SvRV($arg));
-    else{
-        warn(\"${Package}::$func_name() -- $var is not a blessed JS::Object reference\");
-        XSRETURN_UNDEF;
-    }
-
-#CONTEXT
-#    if(sv_isa($arg, \"JS::Context\"))
-#        $var = ($type)SvIV((SV*)SvRV($arg));
-#    else{
-#        warn(\"${Package}::$func_name() -- $var is not a blessed JS::Context reference\");
-#        XSRETURN_UNDEF;
-#    }
-
-CONTEXT
-    if(sv_isa($arg, \"JS::Context\"))
-        $var = ($type)SvIV(*hv_fetch((HV*)SvRV($arg), \"_handle\", 7, 0));
-    else{
-        warn(\"${Package}::$func_name() -- $var is not a blessed JS::Context reference\");
-        XSRETURN_UNDEF;
-    }
-
-SCRIPT
-    if(sv_isa($arg, \"JS::Script\"))
-        $var = ($type)SvIV((SV*)SvRV($arg));
-    else{
-        warn(\"${Package}::$func_name() -- $var is not a blessed JS::Script reference\");
-        XSRETURN_UNDEF;
-    }
-
-RUNTIME
-    if(sv_isa($arg, \"JS::Runtime\"))
-        $var = ($type)SvIV((SV*)SvRV($arg));
-    else{
-        warn(\"${Package}::$func_name() -- $var is not a blessed JS::Runtime reference\");
-        XSRETURN_UNDEF;
-    }
diff --git a/libs/js/src/prmjtime.c b/libs/js/src/prmjtime.c
deleted file mode 100644
index 30c7836ef2..0000000000
--- a/libs/js/src/prmjtime.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * PR time code.
- */
-#include "jsstddef.h"
-#ifdef SOLARIS
-#define _REENTRANT 1
-#endif
-#include <string.h>
-#include <time.h>
-#include "jstypes.h"
-#include "jsutil.h"
-
-#include "jsprf.h"
-#include "prmjtime.h"
-
-#define PRMJ_DO_MILLISECONDS 1
-
-#ifdef XP_OS2
-#include <sys/timeb.h>
-#endif
-#ifdef XP_WIN
-#include <windef.h>
-#include <winbase.h>
-#endif
-
-#if defined(XP_UNIX) || defined(XP_BEOS)
-
-#ifdef _SVID_GETTOD   /* Defined only on Solaris, see Solaris <sys/types.h> */
-extern int gettimeofday(struct timeval *tv);
-#endif
-
-#include <sys/time.h>
-
-#endif /* XP_UNIX */
-
-#define IS_LEAP(year) \
-   (year != 0 && ((((year & 0x3) == 0) &&  \
-		   ((year - ((year/100) * 100)) != 0)) || \
-		  (year - ((year/400) * 400)) == 0))
-
-#define PRMJ_HOUR_SECONDS  3600L
-#define PRMJ_DAY_SECONDS  (24L * PRMJ_HOUR_SECONDS)
-#define PRMJ_YEAR_SECONDS (PRMJ_DAY_SECONDS * 365L)
-#define PRMJ_MAX_UNIX_TIMET 2145859200L /*time_t value equiv. to 12/31/2037 */
-/* function prototypes */
-static void PRMJ_basetime(JSInt64 tsecs, PRMJTime *prtm);
-/*
- * get the difference in seconds between this time zone and UTC (GMT)
- */
-JSInt32
-PRMJ_LocalGMTDifference()
-{
-#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS)
-    struct tm ltime;
-
-    /* get the difference between this time zone and GMT */
-    memset((char *)&ltime,0,sizeof(ltime));
-    ltime.tm_mday = 2;
-    ltime.tm_year = 70;
-#ifdef SUNOS4
-    ltime.tm_zone = 0;
-    ltime.tm_gmtoff = 0;
-    return timelocal(&ltime) - (24 * 3600);
-#else
-    return (JSInt32)(mktime(&ltime) - (24L * 3600L));
-#endif
-#endif
-}
-
-/* Constants for GMT offset from 1970 */
-#define G1970GMTMICROHI        0x00dcdcad /* micro secs to 1970 hi */
-#define G1970GMTMICROLOW       0x8b3fa000 /* micro secs to 1970 low */
-
-#define G2037GMTMICROHI        0x00e45fab /* micro secs to 2037 high */
-#define G2037GMTMICROLOW       0x7a238000 /* micro secs to 2037 low */
-
-/* Convert from base time to extended time */
-static JSInt64
-PRMJ_ToExtendedTime(JSInt32 base_time)
-{
-    JSInt64 exttime;
-    JSInt64 g1970GMTMicroSeconds;
-    JSInt64 low;
-    JSInt32 diff;
-    JSInt64  tmp;
-    JSInt64  tmp1;
-
-    diff = PRMJ_LocalGMTDifference();
-    JSLL_UI2L(tmp, PRMJ_USEC_PER_SEC);
-    JSLL_I2L(tmp1,diff);
-    JSLL_MUL(tmp,tmp,tmp1);
-
-    JSLL_UI2L(g1970GMTMicroSeconds,G1970GMTMICROHI);
-    JSLL_UI2L(low,G1970GMTMICROLOW);
-#ifndef JS_HAVE_LONG_LONG
-    JSLL_SHL(g1970GMTMicroSeconds,g1970GMTMicroSeconds,16);
-    JSLL_SHL(g1970GMTMicroSeconds,g1970GMTMicroSeconds,16);
-#else
-    JSLL_SHL(g1970GMTMicroSeconds,g1970GMTMicroSeconds,32);
-#endif
-    JSLL_ADD(g1970GMTMicroSeconds,g1970GMTMicroSeconds,low);
-
-    JSLL_I2L(exttime,base_time);
-    JSLL_ADD(exttime,exttime,g1970GMTMicroSeconds);
-    JSLL_SUB(exttime,exttime,tmp);
-    return exttime;
-}
-
-JSInt64
-PRMJ_Now(void)
-{
-#ifdef XP_OS2
-    JSInt64 s, us, ms2us, s2us;
-    struct timeb b;
-#endif
-#ifdef XP_WIN
-    JSInt64 s, us,
-    win2un = JSLL_INIT(0x19DB1DE, 0xD53E8000),
-    ten = JSLL_INIT(0, 10);
-    FILETIME time, midnight;
-#endif
-#if defined(XP_UNIX) || defined(XP_BEOS)
-    struct timeval tv;
-    JSInt64 s, us, s2us;
-#endif /* XP_UNIX */
-
-#ifdef XP_OS2
-    ftime(&b);
-    JSLL_UI2L(ms2us, PRMJ_USEC_PER_MSEC);
-    JSLL_UI2L(s2us, PRMJ_USEC_PER_SEC);
-    JSLL_UI2L(s, b.time);
-    JSLL_UI2L(us, b.millitm);
-    JSLL_MUL(us, us, ms2us);
-    JSLL_MUL(s, s, s2us);
-    JSLL_ADD(s, s, us);
-    return s;
-#endif
-#ifdef XP_WIN
-    /* The windows epoch is around 1600. The unix epoch is around 1970.
-       win2un is the difference (in windows time units which are 10 times
-       more precise than the JS time unit) */
-    GetSystemTimeAsFileTime(&time);
-    /* Win9x gets confused at midnight
-       http://support.microsoft.com/default.aspx?scid=KB;en-us;q224423
-       So if the low part (precision <8mins) is 0 then we get the time
-       again. */
-    if (!time.dwLowDateTime) {
-        GetSystemTimeAsFileTime(&midnight);
-        time.dwHighDateTime = midnight.dwHighDateTime;
-    }
-    JSLL_UI2L(s, time.dwHighDateTime);
-    JSLL_UI2L(us, time.dwLowDateTime);
-    JSLL_SHL(s, s, 32);
-    JSLL_ADD(s, s, us);
-    JSLL_SUB(s, s, win2un);
-    JSLL_DIV(s, s, ten);
-    return s;
-#endif
-
-#if defined(XP_UNIX) || defined(XP_BEOS)
-#ifdef _SVID_GETTOD   /* Defined only on Solaris, see Solaris <sys/types.h> */
-    gettimeofday(&tv);
-#else
-    gettimeofday(&tv, 0);
-#endif /* _SVID_GETTOD */
-    JSLL_UI2L(s2us, PRMJ_USEC_PER_SEC);
-    JSLL_UI2L(s, tv.tv_sec);
-    JSLL_UI2L(us, tv.tv_usec);
-    JSLL_MUL(s, s, s2us);
-    JSLL_ADD(s, s, us);
-    return s;
-#endif /* XP_UNIX */
-}
-
-/* Get the DST timezone offset for the time passed in */
-JSInt64
-PRMJ_DSTOffset(JSInt64 local_time)
-{
-    JSInt64 us2s;
-    time_t local;
-    JSInt32 diff;
-    JSInt64  maxtimet;
-    struct tm tm;
-    PRMJTime prtm;
-#ifndef HAVE_LOCALTIME_R
-    struct tm *ptm;
-#endif
-
-
-    JSLL_UI2L(us2s, PRMJ_USEC_PER_SEC);
-    JSLL_DIV(local_time, local_time, us2s);
-
-    /* get the maximum of time_t value */
-    JSLL_UI2L(maxtimet,PRMJ_MAX_UNIX_TIMET);
-
-    if(JSLL_CMP(local_time,>,maxtimet)){
-        JSLL_UI2L(local_time,PRMJ_MAX_UNIX_TIMET);
-    } else if(!JSLL_GE_ZERO(local_time)){
-        /*go ahead a day to make localtime work (does not work with 0) */
-        JSLL_UI2L(local_time,PRMJ_DAY_SECONDS);
-    }
-    JSLL_L2UI(local,local_time);
-    PRMJ_basetime(local_time,&prtm);
-#ifndef HAVE_LOCALTIME_R
-    ptm = localtime(&local);
-    if(!ptm){
-        return JSLL_ZERO;
-    }
-    tm = *ptm;
-#else
-    localtime_r(&local,&tm); /* get dst information */
-#endif
-
-    diff = ((tm.tm_hour - prtm.tm_hour) * PRMJ_HOUR_SECONDS) +
-	((tm.tm_min - prtm.tm_min) * 60);
-
-    if(diff < 0){
-	diff += PRMJ_DAY_SECONDS;
-    }
-
-    JSLL_UI2L(local_time,diff);
-
-    JSLL_MUL(local_time,local_time,us2s);
-
-    return(local_time);
-}
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-size_t
-PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *prtm)
-{
-#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS)
-    struct tm a;
-
-    /* Zero out the tm struct.  Linux, SunOS 4 struct tm has extra members int
-     * tm_gmtoff, char *tm_zone; when tm_zone is garbage, strftime gets
-     * confused and dumps core.  NSPR20 prtime.c attempts to fill these in by
-     * calling mktime on the partially filled struct, but this doesn't seem to
-     * work as well; the result string has "can't get timezone" for ECMA-valid
-     * years.  Might still make sense to use this, but find the range of years
-     * for which valid tz information exists, and map (per ECMA hint) from the
-     * given year into that range.
-
-     * N.B. This hasn't been tested with anything that actually _uses_
-     * tm_gmtoff; zero might be the wrong thing to set it to if you really need
-     * to format a time.  This fix is for jsdate.c, which only uses
-     * JS_FormatTime to get a string representing the time zone.  */
-    memset(&a, 0, sizeof(struct tm));
-
-    a.tm_sec = prtm->tm_sec;
-    a.tm_min = prtm->tm_min;
-    a.tm_hour = prtm->tm_hour;
-    a.tm_mday = prtm->tm_mday;
-    a.tm_mon = prtm->tm_mon;
-    a.tm_wday = prtm->tm_wday;
-    a.tm_year = prtm->tm_year - 1900;
-    a.tm_yday = prtm->tm_yday;
-    a.tm_isdst = prtm->tm_isdst;
-
-    /* Even with the above, SunOS 4 seems to detonate if tm_zone and tm_gmtoff
-     * are null.  This doesn't quite work, though - the timezone is off by
-     * tzoff + dst.  (And mktime seems to return -1 for the exact dst
-     * changeover time.)
-
-     */
-
-#if defined(SUNOS4)
-    if (mktime(&a) == -1) {
-        /* Seems to fail whenever the requested date is outside of the 32-bit
-         * UNIX epoch.  We could proceed at this point (setting a.tm_zone to
-         * "") but then strftime returns a string with a 2-digit field of
-         * garbage for the year.  So we return 0 and hope jsdate.c
-         * will fall back on toString.
-         */
-        return 0;
-    }
-#endif
-
-    return strftime(buf, buflen, fmt, &a);
-#endif
-}
-
-/* table for number of days in a month */
-static int mtab[] = {
-    /* jan, feb,mar,apr,may,jun */
-    31,28,31,30,31,30,
-    /* july,aug,sep,oct,nov,dec */
-    31,31,30,31,30,31
-};
-
-/*
- * basic time calculation functionality for localtime and gmtime
- * setups up prtm argument with correct values based upon input number
- * of seconds.
- */
-static void
-PRMJ_basetime(JSInt64 tsecs, PRMJTime *prtm)
-{
-    /* convert tsecs back to year,month,day,hour,secs */
-    JSInt32 year    = 0;
-    JSInt32 month   = 0;
-    JSInt32 yday    = 0;
-    JSInt32 mday    = 0;
-    JSInt32 wday    = 6; /* start on a Sunday */
-    JSInt32 days    = 0;
-    JSInt32 seconds = 0;
-    JSInt32 minutes = 0;
-    JSInt32 hours   = 0;
-    JSInt32 isleap  = 0;
-    JSInt64 result;
-    JSInt64	result1;
-    JSInt64	result2;
-    JSInt64 base;
-
-    JSLL_UI2L(result,0);
-    JSLL_UI2L(result1,0);
-    JSLL_UI2L(result2,0);
-
-    /* get the base time via UTC */
-    base = PRMJ_ToExtendedTime(0);
-    JSLL_UI2L(result,  PRMJ_USEC_PER_SEC);
-    JSLL_DIV(base,base,result);
-    JSLL_ADD(tsecs,tsecs,base);
-
-    JSLL_UI2L(result, PRMJ_YEAR_SECONDS);
-    JSLL_UI2L(result1,PRMJ_DAY_SECONDS);
-    JSLL_ADD(result2,result,result1);
-
-    /* get the year */
-    while ((isleap == 0) ? !JSLL_CMP(tsecs,<,result) : !JSLL_CMP(tsecs,<,result2)) {
-        /* subtract a year from tsecs */
-        JSLL_SUB(tsecs,tsecs,result);
-        days += 365;
-        /* is it a leap year ? */
-        if(IS_LEAP(year)){
-            JSLL_SUB(tsecs,tsecs,result1);
-            days++;
-        }
-        year++;
-        isleap = IS_LEAP(year);
-    }
-
-    JSLL_UI2L(result1,PRMJ_DAY_SECONDS);
-
-    JSLL_DIV(result,tsecs,result1);
-    JSLL_L2I(mday,result);
-
-    /* let's find the month */
-    while(((month == 1 && isleap) ?
-            (mday >= mtab[month] + 1) :
-            (mday >= mtab[month]))){
-	 yday += mtab[month];
-	 days += mtab[month];
-
-	 mday -= mtab[month];
-
-         /* it's a Feb, check if this is a leap year */
-	 if(month == 1 && isleap != 0){
-	     yday++;
-	     days++;
-	     mday--;
-	 }
-	 month++;
-    }
-
-    /* now adjust tsecs */
-    JSLL_MUL(result,result,result1);
-    JSLL_SUB(tsecs,tsecs,result);
-
-    mday++; /* day of month always start with 1 */
-    days += mday;
-    wday = (days + wday) % 7;
-
-    yday += mday;
-
-    /* get the hours */
-    JSLL_UI2L(result1,PRMJ_HOUR_SECONDS);
-    JSLL_DIV(result,tsecs,result1);
-    JSLL_L2I(hours,result);
-    JSLL_MUL(result,result,result1);
-    JSLL_SUB(tsecs,tsecs,result);
-
-    /* get minutes */
-    JSLL_UI2L(result1,60);
-    JSLL_DIV(result,tsecs,result1);
-    JSLL_L2I(minutes,result);
-    JSLL_MUL(result,result,result1);
-    JSLL_SUB(tsecs,tsecs,result);
-
-    JSLL_L2I(seconds,tsecs);
-
-    prtm->tm_usec  = 0L;
-    prtm->tm_sec   = (JSInt8)seconds;
-    prtm->tm_min   = (JSInt8)minutes;
-    prtm->tm_hour  = (JSInt8)hours;
-    prtm->tm_mday  = (JSInt8)mday;
-    prtm->tm_mon   = (JSInt8)month;
-    prtm->tm_wday  = (JSInt8)wday;
-    prtm->tm_year  = (JSInt16)year;
-    prtm->tm_yday  = (JSInt16)yday;
-}
diff --git a/libs/js/src/prmjtime.h b/libs/js/src/prmjtime.h
deleted file mode 100644
index 0c21f4220c..0000000000
--- a/libs/js/src/prmjtime.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef prmjtime_h___
-#define prmjtime_h___
-/*
- * PR date stuff for mocha and java. Placed here temporarily not to break
- * Navigator and localize changes to mocha.
- */
-#include <time.h>
-#include "jslong.h"
-#ifdef MOZILLA_CLIENT
-#include "jscompat.h"
-#endif
-
-#ifdef OSSP
-/* avoid namespace pollution */
-#define PRMJ_Now                js_PRMJ_Now
-#define PRMJ_LocalGMTDifference js_PRMJ_LocalGMTDifference
-#define PRMJ_FormatTime         js_PRMJ_FormatTime
-#define PRMJ_DSTOffset          js_PRMJ_DSTOffset
-#endif
-
-JS_BEGIN_EXTERN_C
-
-typedef struct PRMJTime       PRMJTime;
-
-/*
- * Broken down form of 64 bit time value.
- */
-struct PRMJTime {
-    JSInt32 tm_usec;            /* microseconds of second (0-999999) */
-    JSInt8 tm_sec;              /* seconds of minute (0-59) */
-    JSInt8 tm_min;              /* minutes of hour (0-59) */
-    JSInt8 tm_hour;             /* hour of day (0-23) */
-    JSInt8 tm_mday;             /* day of month (1-31) */
-    JSInt8 tm_mon;              /* month of year (0-11) */
-    JSInt8 tm_wday;             /* 0=sunday, 1=monday, ... */
-    JSInt16 tm_year;            /* absolute year, AD */
-    JSInt16 tm_yday;            /* day of year (0 to 365) */
-    JSInt8 tm_isdst;            /* non-zero if DST in effect */
-};
-
-/* Some handy constants */
-#define PRMJ_USEC_PER_SEC       1000000L
-#define PRMJ_USEC_PER_MSEC      1000L
-
-/* Return the current local time in micro-seconds */
-extern JSInt64
-PRMJ_Now(void);
-
-/* get the difference between this time zone and  gmt timezone in seconds */
-extern JSInt32
-PRMJ_LocalGMTDifference(void);
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-extern size_t
-PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *tm);
-
-/* Get the DST offset for the local time passed in */
-extern JSInt64
-PRMJ_DSTOffset(JSInt64 local_time);
-
-JS_END_EXTERN_C
-
-#endif /* prmjtime_h___ */
-

From 9a1df3e3e02a5351666b2eac854ef66dd94537e6 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Fri, 18 Jul 2014 19:01:26 +0000
Subject: [PATCH 050/130] Remove the legacy mod_spidermonkey

Without libjs in tree, this can't realistically be built.  Our legacy
is stored in the version control history.
---
 .../languages/mod_spidermonkey/.gitignore     |    3 -
 .../languages/mod_spidermonkey/Makefile.am    |   65 -
 .../mod_spidermonkey.2008.vcproj              |  301 --
 .../mod_spidermonkey.2010.vcxproj             |  165 -
 .../mod_spidermonkey.2012.vcxproj             |  169 -
 .../mod_spidermonkey/mod_spidermonkey.c       | 3939 -----------------
 .../mod_spidermonkey/mod_spidermonkey.h       |  163 -
 .../mod_spidermonkey/mod_spidermonkey.vcproj  |   64 -
 .../mod_spidermonkey_core_db.2008.vcproj      |  295 --
 .../mod_spidermonkey_core_db.2010.vcxproj     |  181 -
 .../mod_spidermonkey_core_db.2012.vcxproj     |  185 -
 .../mod_spidermonkey_core_db.c                |  474 --
 .../mod_spidermonkey_core_db.vcproj           |   93 -
 .../mod_spidermonkey_curl.2008.vcproj         |  295 --
 .../mod_spidermonkey_curl.2010.vcxproj        |  187 -
 .../mod_spidermonkey_curl.2012.vcxproj        |  191 -
 .../mod_spidermonkey/mod_spidermonkey_curl.c  |  260 --
 .../mod_spidermonkey_curl.vcproj              |  159 -
 .../mod_spidermonkey_odbc.2008.vcproj         |  305 --
 .../mod_spidermonkey_odbc.2010.vcxproj        |  191 -
 .../mod_spidermonkey_odbc.2012.vcxproj        |  195 -
 .../mod_spidermonkey/mod_spidermonkey_odbc.c  |  566 ---
 .../mod_spidermonkey_odbc.vcproj              |   98 -
 .../mod_spidermonkey/mod_spidermonkey_skel.c  |  111 -
 .../mod_spidermonkey_socket.2008.vcproj       |  291 --
 .../mod_spidermonkey_socket.2010.vcxproj      |  161 -
 .../mod_spidermonkey_socket.2012.vcxproj      |  165 -
 .../mod_spidermonkey_socket.c                 |  343 --
 .../mod_spidermonkey_socket.vcproj            |   91 -
 .../mod_spidermonkey_teletone.2008.vcproj     |  301 --
 .../mod_spidermonkey_teletone.2010.vcxproj    |  191 -
 .../mod_spidermonkey_teletone.2012.vcxproj    |  195 -
 .../mod_spidermonkey_teletone.c               |  366 --
 .../mod_spidermonkey_teletone.vcproj          |   96 -
 34 files changed, 10855 deletions(-)
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/.gitignore
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/Makefile.am
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c
 delete mode 100644 src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj

diff --git a/src/mod/legacy/languages/mod_spidermonkey/.gitignore b/src/mod/legacy/languages/mod_spidermonkey/.gitignore
deleted file mode 100644
index 1ce7a516b6..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-mod_spidermonkey.log
diff --git a/src/mod/legacy/languages/mod_spidermonkey/Makefile.am b/src/mod/legacy/languages/mod_spidermonkey/Makefile.am
deleted file mode 100644
index eb3eef7fed..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-
-MODNAME=mod_spidermonkey
-
-JS_DIR=$(switch_srcdir)/libs/js
-JS_BUILDDIR=$(switch_builddir)/libs/js
-JSLA=$(JS_BUILDDIR)/libjs.la
-
-AM_CFLAGS  += -I. -I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -I$(JS_BUILDDIR)/src -I$(JS_BUILDDIR)/nsprpub/dist/include/nspr
-AM_CFLAGS  += -DXP_UNIX  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1
-AM_LIBADD   = $(switch_builddir)/libfreeswitch.la $(JSLA) -lnspr4 $(JS_BUILDDIR)/nsprpub/pr/src/libnspr4.*
-AM_LDFLAGS += -avoid-version -module -no-undefined -shared 
-AM_LDFLAGS += -L$(JS_BUILDDIR)/nsprpub/dist/lib
-BUILT_SOURCES = $(JSLA)
-
-mod_LTLIBRARIES              = mod_spidermonkey.la 
-mod_spidermonkey_la_SOURCES  = mod_spidermonkey.c
-mod_spidermonkey_la_CFLAGS   = $(AM_CFLAGS)
-mod_spidermonkey_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
-mod_spidermonkey_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_la_LDFLAGS  = $(CURL_LIBS) $(AM_LDFLAGS)
-
-mod_LTLIBRARIES             += mod_spidermonkey_curl.la
-mod_spidermonkey_curl_la_SOURCES  = mod_spidermonkey_curl.c
-mod_spidermonkey_curl_la_CFLAGS   = $(AM_CFLAGS)
-mod_spidermonkey_curl_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
-mod_spidermonkey_curl_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_curl_la_LDFLAGS  = $(CURL_LIBS) $(AM_LDFLAGS)
-
-mod_LTLIBRARIES             += mod_spidermonkey_socket.la
-mod_spidermonkey_socket_la_SOURCES  = mod_spidermonkey_socket.c
-mod_spidermonkey_socket_la_CFLAGS   = $(AM_CFLAGS)
-mod_spidermonkey_socket_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_socket_la_LDFLAGS  = $(AM_LDFLAGS)
-
-mod_LTLIBRARIES             += mod_spidermonkey_core_db.la 
-mod_spidermonkey_core_db_la_SOURCES  = mod_spidermonkey_core_db.c
-mod_spidermonkey_core_db_la_CFLAGS   = $(AM_CFLAGS)
-mod_spidermonkey_core_db_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_core_db_la_LDFLAGS  = $(AM_LDFLAGS)
-
-mod_LTLIBRARIES             += mod_spidermonkey_teletone.la
-mod_spidermonkey_teletone_la_SOURCES  = mod_spidermonkey_teletone.c
-mod_spidermonkey_teletone_la_CFLAGS   = $(AM_CFLAGS) -I$(switch_srcdir)/libs/libteletone/src
-mod_spidermonkey_teletone_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_teletone_la_LDFLAGS  = $(AM_LDFLAGS)
-
-if HAVE_ODBC
-mod_LTLIBRARIES             += mod_spidermonkey_odbc.la
-mod_spidermonkey_odbc_la_SOURCES  = mod_spidermonkey_odbc.c
-mod_spidermonkey_odbc_la_CFLAGS   = $(AM_CFLAGS) $(ODBC_INC_FLAGS)
-mod_spidermonkey_odbc_la_LIBADD   = $(AM_LIBADD)
-mod_spidermonkey_odbc_la_LDFLAGS  = $(AM_LDFLAGS) -lodbc
-endif
-
-$(SOURCES): $(BUILT_SOURCES)
-
-$(JSLA): $(JS_DIR) $(JS_DIR)/.update
-	cd $(JS_BUILDDIR)/nsprpub && $(MAKE) -j1 && cd $(JS_BUILDDIR) && $(MAKE)
-	$(TOUCH_TARGET)
-
-install-exec-local: $(DESTDIR)$(libdir)/libjs.la
-
-$(DESTDIR)$(libdir)/libjs.la: $(JSLA)
-	cd $(JS_BUILDDIR)/nsprpub/ && $(MAKE) -j1 install && cd $(JS_BUILDDIR) && $(MAKE) install
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
deleted file mode 100644
index cf35ce5e13..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey"
-	ProjectGUID="{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-	RootNamespace="mod_spidermonkey"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(ProjectName).lib"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(ProjectName).lib"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(ProjectName).lib"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(ProjectName).lib"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
deleted file mode 100644
index 4506dd561d..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey</ProjectName>
-    <ProjectGuid>{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2010.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\curl\curllib.2010.vcxproj">
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj
deleted file mode 100644
index f74c051eb2..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.2012.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey</ProjectName>
-    <ProjectGuid>{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\curl\curllib.2012.vcxproj">
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c
deleted file mode 100644
index e86eed40d6..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.c
+++ /dev/null
@@ -1,3939 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- * William King <william.king@quentustech.com>
- *
- * mod_spidermonkey.c -- Javascript Module
- *
- */
-#ifndef HAVE_CURL
-#define HAVE_CURL
-#endif
-#include "mod_spidermonkey.h"
-
-#ifdef HAVE_CURL
-#include <switch_curl.h>
-#endif
-static int foo = 0;
-static jsval check_hangup_hook(struct js_session *jss, jsval * rp);
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown);
-SWITCH_MODULE_DEFINITION_EX(mod_spidermonkey, mod_spidermonkey_load, mod_spidermonkey_shutdown, NULL, SMODF_GLOBAL_SYMBOLS);
-
-#define METHOD_SANITY_CHECK()  if (!jss || !jss->session) {				\
-		eval_some_js("~throw new Error(\"You must call the session.originate method before calling this method!\");", cx, obj, rval); \
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);								\
-		return JS_FALSE;												\
-	} else check_hangup_hook(jss, NULL)
-
-#define CHANNEL_SANITY_CHECK() do {										\
-		if (!switch_channel_ready(channel)) {							\
-			eval_some_js("~throw new Error(\"Session is not active!\");", cx, obj, rval); \
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);							\
-			return JS_FALSE;											\
-		}																\
-		if (!((switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA)))) {	\
-			switch_channel_pre_answer(channel);							\
-			if (!((switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA)))) {	\
-				eval_some_js("~throw new Error(\"Session is not answered!\");", cx, obj, rval); \
-				*rval = BOOLEAN_TO_JSVAL(JS_FALSE);						\
-				return JS_FALSE;										\
-			}															\
-		}																\
-	} while (foo == 1)
-
-#define CHANNEL_SANITY_CHECK_ANSWER() do {										\
-		if (!switch_channel_ready(channel)) {							\
-			eval_some_js("~throw new Error(\"Session is not active!\");", cx, obj, rval); \
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);							\
-			return JS_FALSE;											\
-		}																\
-	} while (foo == 1)
-
-#define CHANNEL_MEDIA_SANITY_CHECK() do {								\
-		if (!switch_channel_media_ready(channel)) {						\
-			eval_some_js("~throw new Error(\"Session is not in media mode!\");", cx, obj, rval); \
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);							\
-			return JS_FALSE;											\
-		}																\
-	} while (foo == 1)
-
-static void session_destroy(JSContext * cx, JSObject * obj);
-static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval);
-static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval);
-static JSBool session_set_callerdata(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval);
-static switch_api_interface_t *js_run_interface = NULL;
-static switch_api_interface_t *jsapi_interface = NULL;
-
-struct js_env {
-	size_t gStackChunkSize;
-	jsuword gStackBase;
-	int gExitCode;
-	JSBool gQuitting;
-	FILE *gErrFile;
-	FILE *gOutFile;
-	int stackDummy;
-	JSRuntime *rt;
-};
-
-static JSClass global_class = {
-	"Global", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
-};
-
-
-static struct {
-	switch_hash_t *mod_hash;
-	switch_hash_t *load_hash;
-	switch_memory_pool_t *pool;
-} module_manager;
-
-struct sm_loadable_module {
-	char *filename;
-	void *lib;
-	const sm_module_interface_t *module_interface;
-	spidermonkey_init_t spidermonkey_init;
-};
-typedef struct sm_loadable_module sm_loadable_module_t;
-
-typedef enum {
-	S_HUP = (1 << 0),
-} session_flag_t;
-
-struct input_callback_state {
-	struct js_session *session_state;
-	char code_buffer[1024];
-	size_t code_buffer_len;
-	char ret_buffer[1024];
-	int ret_buffer_len;
-	int digit_count;
-	JSFunction *function;
-	jsval arg;
-	jsval ret;
-	JSContext *cx;
-	JSObject *obj;
-	jsrefcount saveDepth;
-	void *extra;
-	struct js_session *jss_a;
-	struct js_session *jss_b;
-	JSObject *session_obj_a;
-	JSObject *session_obj_b;
-};
-
-struct fileio_obj {
-	char *path;
-	unsigned int flags;
-	switch_file_t *fd;
-	switch_memory_pool_t *pool;
-	char *buf;
-	switch_size_t buflen;
-	int32 bufsize;
-};
-
-struct request_obj {
-	const char *cmd;
-	switch_core_session_t *session;
-	switch_stream_handle_t *stream;
-};
-
-
-/* Request Object */
-/*********************************************************************************/
-
-static JSBool request_write(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct request_obj *ro = JS_GetPrivate(cx, obj);
-
-	if (!ro) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		char *string = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		ro->stream->write_function(ro->stream, "%s", string);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool request_add_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct request_obj *ro = JS_GetPrivate(cx, obj);
-
-	if (!ro) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 1) {
-		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_event_add_header_string(ro->stream->param_event, SWITCH_STACK_BOTTOM, hname, hval);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool request_get_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct request_obj *ro = JS_GetPrivate(cx, obj);
-
-	if (!ro) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-
-	if (argc > 0) {
-		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *val = switch_event_get_header(ro->stream->param_event, hname);
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val));
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool request_dump_env(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct request_obj *ro = JS_GetPrivate(cx, obj);
-	char *how = "text";
-
-	if (!ro) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		how = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	}
-
-	if (!strcasecmp(how, "xml")) {
-		switch_xml_t xml;
-		char *xmlstr;
-		if ((xml = switch_event_xmlize(ro->stream->param_event, SWITCH_VA_NONE))) {
-			xmlstr = switch_xml_toxml(xml, SWITCH_FALSE);
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr));
-			free(xmlstr);
-			return JS_TRUE;
-		}
-	} else {
-		char *buf;
-		switch_event_serialize(ro->stream->param_event, &buf, SWITCH_TRUE);
-		if (buf) {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf));
-			free(buf);
-			return JS_TRUE;
-		}
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_FALSE;
-}
-
-static void request_destroy(JSContext * cx, JSObject * obj)
-{
-
-}
-
-enum request_tinyid {
-	REQUEST_COMMAND
-};
-
-static JSFunctionSpec request_methods[] = {
-	{"write", request_write, 1},
-	{"getHeader", request_get_header, 1},
-	{"addHeader", request_add_header, 1},
-	{"dumpENV", request_dump_env, 1},
-	{0}
-};
-
-static JSPropertySpec request_props[] = {
-	{"command", REQUEST_COMMAND, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool request_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	struct request_obj *ro = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	if (!ro) {
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case REQUEST_COMMAND:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ro->cmd));
-		break;
-	}
-
-	return res;
-}
-
-JSClass request_class = {
-	"Request", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, request_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, request_destroy, NULL, NULL, NULL, NULL
-};
-
-static JSObject *new_request(JSContext * cx, JSObject * obj, struct request_obj *ro)
-{
-	JSObject *Request;
-	if ((Request = JS_DefineObject(cx, obj, "request", &request_class, NULL, 0))) {
-		if ((JS_SetPrivate(cx, Request, ro) && JS_DefineProperties(cx, Request, request_props) && JS_DefineFunctions(cx, Request, request_methods))) {
-			return Request;
-		}
-	}
-
-	return NULL;
-}
-
-struct pcre_obj {
-	switch_regex_t *re;
-	char *string;
-	int proceed;
-	int ovector[30];
-	int freed;
-};
-
-/* Pcre Object */
-/*********************************************************************************/
-static JSBool pcre_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct pcre_obj *pcre_obj;
-
-	if (!((pcre_obj = malloc(sizeof(*pcre_obj))))) {
-		abort();
-	}
-	memset(pcre_obj, 0, sizeof(*pcre_obj));
-	JS_SetPrivate(cx, obj, pcre_obj);
-	return JS_TRUE;
-
-}
-
-static void pcre_destroy(JSContext * cx, JSObject * obj)
-{
-	struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj);
-
-	if (pcre_obj) {
-		if (!pcre_obj->freed && pcre_obj->re) {
-			switch_regex_safe_free(pcre_obj->re);
-			switch_safe_free(pcre_obj->string);
-		}
-		switch_safe_free(pcre_obj);
-	}
-}
-
-static JSBool pcre_compile(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj);
-	char *string, *regex_string;
-
-	if (argc > 1) {
-		string = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		regex_string = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_regex_safe_free(pcre_obj->re);
-		switch_safe_free(pcre_obj->string);
-		pcre_obj->string = strdup(string);
-		pcre_obj->proceed = switch_regex_perform(pcre_obj->string, regex_string, &pcre_obj->re, pcre_obj->ovector,
-												 sizeof(pcre_obj->ovector) / sizeof(pcre_obj->ovector[0]));
-		*rval = BOOLEAN_TO_JSVAL(pcre_obj->proceed ? JS_TRUE : JS_FALSE);
-	} else {
-		eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool pcre_substitute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj);
-	char *subst_string;
-	char *substituted;
-
-	if (!pcre_obj->proceed) {
-		eval_some_js("~throw new Error(\"REGEX is not compiled or has no matches\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (argc > 0) {
-		uint32_t len;
-		subst_string = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10) * pcre_obj->proceed;
-		substituted = malloc(len);
-		switch_assert(substituted != NULL);
-		switch_perform_substitution(pcre_obj->re, pcre_obj->proceed, subst_string, pcre_obj->string, substituted, len, pcre_obj->ovector);
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, substituted));
-		free(substituted);
-	} else {
-		eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	return JS_TRUE;
-}
-
-enum pcre_tinyid {
-	PCRE_READY
-};
-
-static JSFunctionSpec pcre_methods[] = {
-	{"compile", pcre_compile, 2},
-	{"substitute", pcre_substitute, 2},
-	{0}
-};
-
-static JSPropertySpec pcre_props[] = {
-	{"ready", PCRE_READY, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool pcre_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	struct pcre_obj *pcre_obj = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	if (!pcre_obj) {
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case PCRE_READY:
-		*vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		break;
-	}
-
-	return res;
-}
-
-JSClass pcre_class = {
-	"PCRE", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, pcre_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, pcre_destroy, NULL, NULL, NULL,
-	pcre_construct
-};
-
-struct event_obj {
-	switch_event_t *event;
-	int freed;
-};
-
-/* Event Object */
-/*********************************************************************************/
-static JSBool event_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	if (argc > 0) {
-		switch_event_t *event;
-		struct event_obj *eo;
-		switch_event_types_t etype;
-		char *ename = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-		if ((eo = malloc(sizeof(*eo)))) {
-
-			if (switch_name_event(ename, &etype) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown event %s\n", ename);
-				*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-				return JS_TRUE;
-			}
-
-			if (etype == SWITCH_EVENT_CUSTOM) {
-				char *subclass_name;
-				if (argc > 1) {
-					subclass_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-				} else {
-					subclass_name = "none";
-				}
-
-				if (switch_event_create_subclass(&event, etype, subclass_name) != SWITCH_STATUS_SUCCESS) {
-					*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-					return JS_TRUE;
-				}
-
-			} else {
-				if (switch_event_create(&event, etype) != SWITCH_STATUS_SUCCESS) {
-					*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-					return JS_TRUE;
-				}
-			}
-
-			eo->event = event;
-			eo->freed = 0;
-
-			JS_SetPrivate(cx, obj, eo);
-			return JS_TRUE;
-		}
-	}
-
-	return JS_FALSE;
-}
-
-static void event_destroy(JSContext * cx, JSObject * obj)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (eo) {
-		if (!eo->freed && eo->event) {
-			switch_event_destroy(&eo->event);
-		}
-		switch_safe_free(eo);
-	}
-}
-
-static JSBool event_add_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (!eo || eo->freed) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 1) {
-		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_event_add_header_string(eo->event, SWITCH_STACK_BOTTOM, hname, hval);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool event_get_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (!eo) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *val = switch_event_get_header(eo->event, hname);
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val));
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool event_add_body(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (!eo || eo->freed) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		char *body = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		switch_event_add_body(eo->event, "%s", body);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool event_get_body(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (!eo) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_event_get_body(eo->event)));
-
-	return JS_TRUE;
-}
-
-static JSBool event_get_type(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (!eo) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_event_name(eo->event->event_id)));
-
-	return JS_TRUE;
-}
-
-static JSBool event_serialize(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-	char *buf;
-	uint8_t isxml = 0, isjson = 0;
-
-	if (!eo) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (!strcasecmp(arg, "xml")) {
-			isxml++;
-		} else if (!strcasecmp(arg, "json")) {
-			isjson++;
-		}
-	}
-
-	if (isxml) {
-		switch_xml_t xml;
-		char *xmlstr;
-		if ((xml = switch_event_xmlize(eo->event, SWITCH_VA_NONE))) {
-			xmlstr = switch_xml_toxml(xml, SWITCH_FALSE);
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr));
-			switch_xml_free(xml);
-			free(xmlstr);
-		} else {
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		}
-	} else if (isjson) {
-		if (switch_event_serialize_json(eo->event, &buf) == SWITCH_STATUS_SUCCESS) {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf));
-			switch_safe_free(buf);
-		}
-	} else {
-		if (switch_event_serialize(eo->event, &buf, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf));
-			switch_safe_free(buf);
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool event_fire(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (eo) {
-		switch_event_fire(&eo->event);
-		JS_SetPrivate(cx, obj, NULL);
-		switch_safe_free(eo);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-
-static JSBool event_chat_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (eo) {
-		if (argc > 0) {
-			char *app = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-			char *arg = NULL;
-
-			if (argc > 1) {
-				arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-			}
-
-			switch_core_execute_chat_app(eo->event, app, arg);
-
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-			return JS_TRUE;
-		}
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_FALSE;
-}
-
-static JSBool event_destroy_(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct event_obj *eo = JS_GetPrivate(cx, obj);
-
-	if (eo) {
-		if (!eo->freed) {
-			switch_event_destroy(&eo->event);
-		}
-		JS_SetPrivate(cx, obj, NULL);
-		switch_safe_free(eo);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-enum event_tinyid {
-	EVENT_READY
-};
-
-static JSFunctionSpec event_methods[] = {
-	{"addHeader", event_add_header, 1},
-	{"getHeader", event_get_header, 1},
-	{"addBody", event_add_body, 1},
-	{"getBody", event_get_body, 1},
-	{"getType", event_get_type, 1},
-	{"serialize", event_serialize, 0},
-	{"fire", event_fire, 0},
-	{"chatExecute", event_chat_execute, 0},
-	{"destroy", event_destroy_, 0},
-	{0}
-};
-
-static JSPropertySpec event_props[] = {
-	{"ready", EVENT_READY, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool event_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	switch_event_t *event = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	if (!event) {
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case EVENT_READY:
-		*vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		break;
-	}
-
-	return res;
-}
-
-JSClass event_class = {
-	"Event", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, event_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, event_destroy, NULL, NULL, NULL,
-	event_construct
-};
-
-/* Dtmf Object */
-/*********************************************************************************/
-static JSBool dtmf_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	switch_dtmf_t *dtmf;
-	int32 duration = switch_core_default_dtmf_duration(0);
-
-	if (argc <= 0) {
-		eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (argc > 1) {
-		JS_ValueToInt32(cx, argv[1], &duration);
-		if (duration <= 0) {
-			duration = switch_core_default_dtmf_duration(0);
-		}
-	}
-
-	if ((dtmf = malloc(sizeof(*dtmf)))) {
-		JS_SetPrivate(cx, obj, dtmf);
-		return JS_TRUE;
-	}
-
-	return JS_FALSE;
-}
-
-static void dtmf_destroy(JSContext * cx, JSObject * obj)
-{
-	switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj);
-
-	if (dtmf) {
-		switch_safe_free(dtmf);
-		JS_SetPrivate(cx, obj, NULL);
-	}
-}
-
-enum dtmf_tinyid {
-	DTMF_DIGIT, DTMF_DURATION
-};
-
-static JSFunctionSpec dtmf_methods[] = {
-	{0}
-};
-
-
-static JSPropertySpec dtmf_props[] = {
-	{"digit", DTMF_DIGIT, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"duration", DTMF_DURATION, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool dtmf_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	if (!dtmf) {
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case DTMF_DIGIT:
-		{
-			char tmp[2] = { dtmf->digit, '\0' };
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, tmp));
-		}
-		break;
-
-	case DTMF_DURATION:
-		{
-			*vp = INT_TO_JSVAL((int) dtmf->duration);
-		}
-		break;
-	}
-
-	return res;
-}
-
-JSClass dtmf_class = {
-	"DTMF", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, dtmf_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, dtmf_destroy, NULL, NULL, NULL,
-	dtmf_construct
-};
-
-static void js_error(JSContext * cx, const char *message, JSErrorReport * report)
-{
-	const char *filename = __FILE__;
-	int line = __LINE__;
-	const char *text = "";
-	char *ex = "";
-
-	if (message && report) {
-		if (report->filename) {
-			filename = report->filename;
-		}
-		line = report->lineno;
-		if (report->linebuf) {
-			text = report->linebuf;
-			ex = "near ";
-		}
-	}
-
-	if (!message) {
-		message = "(N/A)";
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, filename, modname, line, NULL, SWITCH_LOG_ERROR, "%s %s%s\n", ex, message, text);
-}
-
-static switch_status_t sm_load_file(char *filename)
-{
-	sm_loadable_module_t *module = NULL;
-	switch_dso_lib_t dso = NULL;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_loadable_module_function_table_t *function_handle = NULL;
-	spidermonkey_init_t spidermonkey_init = NULL;
-	const sm_module_interface_t *module_interface = NULL, *mp;
-	char *derr = NULL;
-	const char *err = NULL;
-
-	switch_assert(filename != NULL);
-
-	if (!(dso = switch_dso_open(filename, 1, &derr))) {
-		status = SWITCH_STATUS_FALSE;
-	}
-
-	if (derr || status != SWITCH_STATUS_SUCCESS) {
-		err = derr;
-		goto err;
-	}
-
-	function_handle = switch_dso_data_sym(dso, "spidermonkey_init", &derr);
-
-	if (!function_handle || derr) {
-		status = SWITCH_STATUS_FALSE;
-		err = derr;
-		goto err;
-	}
-
-	spidermonkey_init = (spidermonkey_init_t) (intptr_t) function_handle;
-
-	if (spidermonkey_init == NULL) {
-		err = "Cannot Load";
-		goto err;
-	}
-
-	if (spidermonkey_init(&module_interface) != SWITCH_STATUS_SUCCESS) {
-		err = "Module load routine returned an error";
-		goto err;
-	}
-
-	if (!(module = (sm_loadable_module_t *) switch_core_permanent_alloc(sizeof(*module)))) {
-		err = "Could not allocate memory\n";
-	}
-
-  err:
-
-	if (err || !module) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, switch_str_nil(err));
-		switch_safe_free(derr);
-		return SWITCH_STATUS_GENERR;
-	}
-
-	module->filename = switch_core_permanent_strdup(filename);
-	module->spidermonkey_init = spidermonkey_init;
-	module->module_interface = module_interface;
-
-	module->lib = dso;
-
-	switch_core_hash_insert(module_manager.mod_hash, (char *) module->filename, (void *) module);
-
-	for (mp = module->module_interface; mp; mp = mp->next) {
-		switch_core_hash_insert(module_manager.load_hash, (char *) mp->name, (void *) mp);
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Successfully Loaded [%s]\n", module->filename);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t sm_load_module(const char *dir, const char *fname)
-{
-	switch_size_t len = 0;
-	char *path;
-	char *file;
-
-#ifdef WIN32
-	const char *ext = ".dll";
-#else
-	const char *ext = ".so";
-#endif
-
-	if ((file = switch_core_strdup(module_manager.pool, fname)) == 0) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (*file == '/') {
-		path = switch_core_strdup(module_manager.pool, file);
-	} else {
-		if (strchr(file, '.')) {
-			len = strlen(dir);
-			len += strlen(file);
-			len += 4;
-			path = (char *) switch_core_alloc(module_manager.pool, len);
-			switch_snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file);
-		} else {
-			len = strlen(dir);
-			len += strlen(file);
-			len += 8;
-			path = (char *) switch_core_alloc(module_manager.pool, len);
-			switch_snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext);
-		}
-	}
-
-	return sm_load_file(path);
-}
-
-static switch_status_t load_modules(void)
-{
-	char *cf = "spidermonkey.conf";
-	switch_xml_t cfg, xml;
-	unsigned int count = 0;
-
-#ifdef WIN32
-	const char *ext = ".dll";
-	const char *EXT = ".DLL";
-#elif defined (MACOSX) || defined (DARWIN)
-	const char *ext = ".dylib";
-	const char *EXT = ".DYLIB";
-#else
-	const char *ext = ".so";
-	const char *EXT = ".SO";
-#endif
-
-	memset(&module_manager, 0, sizeof(module_manager));
-	switch_core_new_memory_pool(&module_manager.pool);
-
-	switch_core_hash_init(&module_manager.mod_hash);
-	switch_core_hash_init(&module_manager.load_hash);
-
-	if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-		switch_xml_t mods, ld;
-
-		if ((mods = switch_xml_child(cfg, "modules"))) {
-			for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) {
-				const char *val = switch_xml_attr_soft(ld, "module");
-				if (!zstr(val) && strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val);
-					continue;
-				}
-				sm_load_module(SWITCH_GLOBAL_dirs.mod_dir, val);
-				count++;
-			}
-		}
-		switch_xml_free(xml);
-
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Open of %s failed\n", cf);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t init_js(struct js_env *env)
-{
-
-	memset(env, 0, sizeof(*env));
-	env->gQuitting = JS_FALSE;
-	env->gErrFile = NULL;
-	env->gOutFile = NULL;
-	env->gStackChunkSize = 8192;
-	env->gStackBase = (jsuword) & env->stackDummy;
-	env->gErrFile = stderr;
-	env->gOutFile = stdout;
-
-	if (!(env->rt = JS_NewRuntime(64L * 1024L * 1024L))) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-JSObject *new_js_event(switch_event_t *event, char *name, JSContext * cx, JSObject * obj)
-{
-	struct event_obj *eo;
-	JSObject *Event = NULL;
-
-	if ((eo = malloc(sizeof(*eo)))) {
-		eo->event = event;
-		eo->freed = 1;
-		if ((Event = JS_DefineObject(cx, obj, name, &event_class, NULL, 0))) {
-			if ((JS_SetPrivate(cx, Event, eo) && JS_DefineProperties(cx, Event, event_props) && JS_DefineFunctions(cx, Event, event_methods))) {
-			}
-		} else {
-			free(eo);
-		}
-	}
-	return Event;
-}
-
-JSObject *new_js_dtmf(switch_dtmf_t *dtmf, char *name, JSContext * cx, JSObject * obj)
-{
-	JSObject *DTMF = NULL;
-	switch_dtmf_t *ddtmf;
-
-	if ((ddtmf = malloc(sizeof(*ddtmf)))) {
-		*ddtmf = *dtmf;
-		if ((DTMF = JS_DefineObject(cx, obj, name, &dtmf_class, NULL, 0))) {
-			JS_SetPrivate(cx, DTMF, ddtmf);
-			JS_DefineProperties(cx, DTMF, dtmf_props);
-			JS_DefineFunctions(cx, DTMF, dtmf_methods);
-		} else {
-			free(ddtmf);
-		}
-	}
-	return DTMF;
-}
-
-#define MAX_STACK_DEPTH 2
-
-static switch_status_t js_common_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	switch_event_t *event = NULL;
-	struct input_callback_state *cb_state = buf;
-	struct js_session *jss = cb_state->session_state;
-	uintN argc = 0;
-	jsval argv[4];
-	JSObject *Event = NULL;
-	jsval ret, nval, *rval = &nval;
-	JSContext *cx = cb_state->cx;
-	JSObject *obj = cb_state->obj;
-	switch_uuid_t uuid;
-	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-	char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25];
-	char *p;
-	switch_status_t status = SWITCH_STATUS_FALSE;
-
-	if (!jss || !jss->session) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (++jss->stack_depth > MAX_STACK_DEPTH) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH);
-		jss->stack_depth--;
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_uuid_get(&uuid);
-	switch_uuid_format(uuid_str, &uuid);
-
-	switch_snprintf(var_name, sizeof(var_name), "__event_%s", uuid_str);
-	for (p = var_name; p && *p; p++) {
-		if (*p == '-') {
-			*p = '_';
-		}
-	}
-
-	JS_ResumeRequest(cb_state->cx, cb_state->saveDepth);
-	METHOD_SANITY_CHECK();
-
-	if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) {
-		argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a);
-	} else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) {
-		argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b);
-	} else {
-		argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state->obj);
-	}
-
-	switch (itype) {
-	case SWITCH_INPUT_TYPE_EVENT:
-		if ((event = (switch_event_t *) input)) {
-			if ((Event = new_js_event(event, var_name, cb_state->cx, cb_state->obj))) {
-				argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "event"));
-				argv[argc++] = OBJECT_TO_JSVAL(Event);
-			}
-		}
-		if (!Event) {
-			goto done;
-		}
-		break;
-	case SWITCH_INPUT_TYPE_DTMF:
-		{
-			switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
-
-			if (dtmf) {
-				if ((Event = new_js_dtmf(dtmf, var_name, cb_state->cx, cb_state->obj))) {
-					argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf"));
-					argv[argc++] = OBJECT_TO_JSVAL(Event);
-				} else {
-					goto done;
-				}
-			}
-		}
-		break;
-	}
-
-	if (cb_state->arg) {
-		argv[argc++] = cb_state->arg;
-	}
-
-	check_hangup_hook(jss, &ret);
-
-	if (ret == JS_TRUE) {
-		JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret);
-	}
-
-	status = SWITCH_STATUS_SUCCESS;
-  done:
-	cb_state->saveDepth = JS_SuspendRequest(cb_state->cx);
-	jss->stack_depth--;
-	return status;
-}
-
-static switch_status_t js_stream_input_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	char *ret;
-	switch_status_t status;
-	struct input_callback_state *cb_state = buf;
-	switch_file_handle_t *fh = cb_state->extra;
-	//struct js_session *jss = cb_state->session_state;
-
-	if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if ((status = js_common_callback(session, input, itype, buf, buflen)) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	if ((ret = JS_GetStringBytes(JS_ValueToString(cb_state->cx, cb_state->ret)))) {
-		if (!strncasecmp(ret, "speed", 5)) {
-			char *p;
-
-			if ((p = strchr(ret, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						step = 1;
-					}
-					fh->speed += step;
-				} else {
-					int speed = atoi(p);
-					fh->speed = speed;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-			return SWITCH_STATUS_FALSE;
-		} else if (!strncasecmp(ret, "volume", 6)) {
-			char *p;
-
-			if ((p = strchr(ret, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						step = 1;
-					}
-					fh->vol += step;
-				} else {
-					int vol = atoi(p);
-					fh->vol = vol;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-			if (fh->vol) {
-				switch_normalize_volume(fh->vol);
-			}
-
-			return SWITCH_STATUS_FALSE;
-		} else if (!strcasecmp(ret, "pause")) {
-			if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
-				switch_clear_flag(fh, SWITCH_FILE_PAUSE);
-			} else {
-				switch_set_flag(fh, SWITCH_FILE_PAUSE);
-			}
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(ret, "truncate")) {
-			switch_core_file_truncate(fh, 0);
-		} else if (!strcasecmp(ret, "restart")) {
-			uint32_t pos = 0;
-			fh->speed = 0;
-			switch_core_file_seek(fh, &pos, 0, SEEK_SET);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strncasecmp(ret, "seek", 4)) {
-			//switch_codec_t *codec;
-			uint32_t samps = 0;
-			uint32_t pos = 0;
-			char *p;
-			//codec = switch_core_session_get_read_codec(jss->session);
-
-			if ((p = strchr(ret, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						step = 1000;
-					}
-					if (step > 0) {
-						samps = step * (fh->native_rate / 1000);
-						switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
-					} else {
-						samps = abs(step) * (fh->native_rate / 1000);
-						switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET);
-					}
-				} else {
-					samps = atoi(p) * (fh->native_rate / 1000);
-					switch_core_file_seek(fh, &pos, samps, SEEK_SET);
-				}
-			}
-
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		return SWITCH_STATUS_BREAK;
-
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t js_record_input_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	char *ret;
-	switch_status_t status;
-	struct input_callback_state *cb_state = buf;
-	switch_file_handle_t *fh = cb_state->extra;
-
-	if ((status = js_common_callback(session, input, itype, buf, buflen)) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	if ((ret = JS_GetStringBytes(JS_ValueToString(cb_state->cx, cb_state->ret)))) {
-		if (!strcasecmp(ret, "pause")) {
-			if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
-				switch_clear_flag(fh, SWITCH_FILE_PAUSE);
-			} else {
-				switch_set_flag(fh, SWITCH_FILE_PAUSE);
-			}
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(ret, "restart")) {
-			unsigned int pos = 0;
-			fh->speed = 0;
-			switch_core_file_seek(fh, &pos, 0, SEEK_SET);
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-
-		return SWITCH_STATUS_BREAK;
-
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t js_collect_input_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
-{
-	char *ret;
-	switch_status_t status;
-	struct input_callback_state *cb_state = buf;
-
-	if ((status = js_common_callback(session, input, itype, buf, buflen)) != SWITCH_STATUS_SUCCESS) {
-		return status;
-	}
-
-	if ((ret = JS_GetStringBytes(JS_ValueToString(cb_state->cx, cb_state->ret)))) {
-		if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-	return SWITCH_STATUS_BREAK;
-}
-
-static JSBool session_flush_digits(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	switch_channel_flush_dtmf(switch_core_session_get_channel(jss->session));
-
-	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	return JS_TRUE;
-}
-
-static JSBool session_flush_events(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_event_t *event;
-
-	if (!jss || !jss->session) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	while (switch_core_session_dequeue_event(jss->session, &event, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
-		switch_event_destroy(&event);
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	return JS_TRUE;
-
-}
-
-static JSBool session_recordfile(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	char *file_name = NULL;
-	void *bp = NULL;
-	int len = 0;
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	switch_file_handle_t fh = { 0 };
-	JSFunction *function;
-	int32 limit = 0;
-	switch_input_args_t args = { 0 };
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc > 0) {
-		file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (zstr(file_name)) {
-			return JS_FALSE;
-		}
-	}
-	if (argc > 1) {
-		if ((function = JS_ValueToFunction(cx, argv[1]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.session_state = jss;
-			cb_state.function = function;
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			if (argc > 2) {
-				cb_state.arg = argv[2];
-			}
-
-			dtmf_func = js_record_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-
-		if (argc > 3) {
-			JS_ValueToInt32(cx, argv[3], &limit);
-		}
-
-		if (argc > 4) {
-			int32 thresh;
-			JS_ValueToInt32(cx, argv[4], &thresh);
-			fh.thresh = thresh;
-		}
-
-		if (argc > 5) {
-			int32 silence_hits;
-			JS_ValueToInt32(cx, argv[5], &silence_hits);
-			fh.silence_hits = silence_hits;
-		}
-	}
-
-	cb_state.extra = &fh;
-	cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-
-	switch_ivr_record_file(jss->session, &fh, file_name, &args, limit);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	return (JSBool)ret;
-}
-
-static JSBool session_collect_input(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	void *bp = NULL;
-	int len = 0;
-	int32 abs_timeout = 0;
-	int32 digit_timeout = 0;
-
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	JSFunction *function;
-	switch_input_args_t args = { 0 };
-	jsval ret = JS_TRUE;
-
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc > 0) {
-		if ((function = JS_ValueToFunction(cx, argv[0]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-
-			if (argc > 1) {
-				cb_state.arg = argv[1];
-			}
-
-			cb_state.session_state = jss;
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			dtmf_func = js_collect_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-	}
-
-	if (argc == 3) {
-		JS_ValueToInt32(jss->cx, argv[2], &abs_timeout);
-	} else if (argc > 3) {
-		JS_ValueToInt32(jss->cx, argv[2], &digit_timeout);
-		JS_ValueToInt32(jss->cx, argv[3], &abs_timeout);
-	}
-
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-
-	switch_ivr_collect_digits_callback(jss->session, &args, digit_timeout, abs_timeout);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	return (JSBool)ret;
-}
-
-/* session.sayphrase(phrase_name, phrase_data, language, dtmf_callback, dtmf_callback_args)*/
-
-static JSBool session_sayphrase(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	char *phrase_name = NULL;
-	char *phrase_data = NULL;
-	char *phrase_lang = NULL;
-	char *tmp = NULL;
-	//char *input_callback = NULL;
-	void *bp = NULL;
-	int len = 0;
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	JSFunction *function;
-	switch_input_args_t args = { 0 };
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc > 0) {
-		phrase_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (zstr(phrase_name)) {
-			return JS_FALSE;
-		}
-	} else {
-		return JS_FALSE;
-	}
-
-	if (argc > 1) {
-		phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	}
-
-	if (argc > 2) {
-		tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-		if (!zstr(tmp)) {
-			phrase_lang = tmp;
-		}
-	}
-
-	if (argc > 3) {
-		if ((function = JS_ValueToFunction(cx, argv[3]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-
-			if (argc > 4) {
-				cb_state.arg = argv[4];
-			}
-
-			cb_state.session_state = jss;
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			dtmf_func = js_collect_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-	}
-
-	cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-
-	switch_ivr_phrase_macro(jss->session, phrase_name, phrase_data, phrase_lang, &args);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	return (JSBool)ret;
-}
-
-static jsval check_hangup_hook(struct js_session *jss, jsval * rp)
-{
-	jsval argv[3] = { 0 };
-	int argc = 0;
-	jsval ret = JS_TRUE;
-	char *resp;
-
-	if (jss && !jss->check_state && jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) {
-		jss->check_state++;
-		argv[argc++] = OBJECT_TO_JSVAL(jss->obj);
-		if (jss->hook_state == CS_HANGUP) {
-			argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "hangup"));
-		} else {
-			argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "transfer"));
-		}
-		JS_CallFunction(jss->cx, jss->obj, jss->on_hangup, argc, argv, &ret);
-		resp = JS_GetStringBytes(JS_ValueToString(jss->cx, ret));
-		if (!zstr(resp)) {
-			ret = !strcasecmp(resp, "exit") ? JS_FALSE : JS_TRUE;
-		}
-	}
-
-	if (rp) {
-		*rp = ret;
-	}
-
-	return ret;
-}
-
-static switch_status_t hanguphook(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t state = switch_channel_get_state(channel);
-	struct js_session *jss = NULL;
-
-	if (state == CS_HANGUP || state == CS_ROUTING) {
-		if ((jss = switch_channel_get_private(channel, "jss"))) {
-			jss->hook_state = state;
-			jss->check_state = 0;
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static JSBool session_hanguphook(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	JSFunction *function;
-	struct js_session *jss;
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if ((jss = JS_GetPrivate(cx, obj)) && jss->session) {
-		if (argc > 0) {
-			if ((function = JS_ValueToFunction(cx, argv[0]))) {
-				switch_channel_t *channel = switch_core_session_get_channel(jss->session);
-				jss->on_hangup = function;
-				jss->hook_state = switch_channel_get_state(channel);
-				switch_channel_set_private(channel, "jss", jss);
-				switch_core_event_hook_add_state_change(jss->session, hanguphook);
-				*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-			}
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_streamfile(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	char *file_name = NULL;
-	//char *input_callback = NULL;
-	void *bp = NULL;
-	int len = 0;
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	switch_file_handle_t fh = { 0 };
-	JSFunction *function;
-	switch_input_args_t args = { 0 };
-	const char *prebuf;
-	char posbuf[35] = "";
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc > 0) {
-		file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (zstr(file_name)) {
-			return JS_FALSE;
-		}
-	}
-
-	if (argc > 1) {
-		if ((function = JS_ValueToFunction(cx, argv[1]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-
-			if (argc > 2) {
-				cb_state.arg = argv[2];
-			}
-
-			cb_state.session_state = jss;
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			dtmf_func = js_stream_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-	}
-
-	if (argc > 3) {
-		int32 samps;
-		JS_ValueToInt32(cx, argv[3], &samps);
-		fh.samples = samps;
-	}
-
-	if ((prebuf = switch_channel_get_variable(channel, "stream_prebuffer"))) {
-		int maybe = atoi(prebuf);
-		if (maybe > 0) {
-			fh.prebuf = maybe;
-		}
-	}
-
-	cb_state.extra = &fh;
-	cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-	switch_ivr_play_file(jss->session, &fh, file_name, &args);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	switch_snprintf(posbuf, sizeof(posbuf), "%u", fh.offset_pos);
-	switch_channel_set_variable(channel, "last_file_position", posbuf);
-
-	return (JSBool)ret;
-}
-
-
-
-static JSBool session_sleep(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	void *bp = NULL;
-	int len = 0;
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	JSFunction *function;
-	switch_input_args_t args = { 0 };
-	int32 ms = 0;
-	jsval ret = JS_TRUE;
-	int32 sync = 0;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc > 0) {
-		JS_ValueToInt32(cx, argv[0], &ms);
-	}
-
-	if (ms <= 0) {
-		return JS_FALSE;
-	}
-
-	if (argc > 1) {
-		if ((function = JS_ValueToFunction(cx, argv[1]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-
-			if (argc > 2) {
-				cb_state.arg = argv[2];
-			}
-
-			cb_state.session_state = jss;
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			dtmf_func = js_stream_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-	}
-
-	if (argc > 2) {
-		JS_ValueToInt32(cx, argv[2], &sync);
-	}
-
-	cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-	switch_ivr_sleep(jss->session, ms, sync, &args);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	return (JSBool)ret;
-}
-
-static JSBool session_set_variable(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-
-	channel = switch_core_session_get_channel(jss->session);
-
-	if (argc > 1) {
-		char *var, *val;
-
-		var = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		val = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_channel_set_variable_var_check(channel, var, val, SWITCH_FALSE);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	} else {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_get_variable(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-
-	channel = switch_core_session_get_channel(jss->session);
-
-	if (argc > 0) {
-		const char *var, *val;
-
-		var = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		val = switch_channel_get_variable(channel, var);
-
-		if (val) {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val));
-		} else {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ""));
-		}
-	} else {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	}
-
-	return JS_TRUE;
-}
-
-static void destroy_speech_engine(struct js_session *jss)
-{
-	if (jss->speech) {
-		switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-		switch_core_codec_destroy(&jss->speech->codec);
-		switch_core_speech_close(&jss->speech->sh, &flags);
-		jss->speech = NULL;
-	}
-}
-
-static switch_status_t init_speech_engine(struct js_session *jss, char *engine, char *voice)
-{
-	switch_codec_t *read_codec;
-	switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE;
-	uint32_t rate = 0, channels;
-	int interval = 0;
-
-	read_codec = switch_core_session_get_read_codec(jss->session);
-	rate = read_codec->implementation->actual_samples_per_second;
-	interval = read_codec->implementation->microseconds_per_packet / 1000;
-	channels = read_codec->implementation->number_of_channels;
-
-	if (switch_core_codec_init(&jss->speech->codec,
-							   "L16",
-							   NULL,
-							   rate,
-							   interval,
-							   1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-							   switch_core_session_get_pool(jss->session)) == SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", rate, interval);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (switch_core_speech_open(&jss->speech->sh, engine, voice, rate, interval, channels,
-								&flags, switch_core_session_get_pool(jss->session)) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n");
-		switch_core_codec_destroy(&jss->speech->codec);
-		return SWITCH_STATUS_FALSE;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-static JSBool session_speak(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	char *tts_name = NULL;
-	char *voice_name = NULL;
-	char *text = NULL;
-	void *bp = NULL;
-	int len = 0;
-	struct input_callback_state cb_state = { 0 };
-	switch_input_callback_function_t dtmf_func = NULL;
-	JSFunction *function;
-	switch_input_args_t args = { 0 };
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	if (argc < 3) {
-		return JS_FALSE;
-	}
-
-	tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	voice_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	text = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-
-	if (zstr(tts_name)) {
-		eval_some_js("~throw new Error(\"Invalid TTS Name\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (zstr(text)) {
-		eval_some_js("~throw new Error(\"Invalid Text\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (jss->speech && jss->speech->speaking) {
-		eval_some_js("~throw new Error(\"Recursive call not allowed\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-
-	if (jss->speech && strcasecmp(jss->speech->sh.name, tts_name)) {
-		destroy_speech_engine(jss);
-	}
-
-	if (jss->speech) {
-		switch_core_speech_text_param_tts(&jss->speech->sh, "voice", voice_name);
-	} else {
-		jss->speech = switch_core_session_alloc(jss->session, sizeof(*jss->speech));
-		switch_assert(jss->speech != NULL);
-		if (init_speech_engine(jss, tts_name, voice_name) != SWITCH_STATUS_SUCCESS) {
-			eval_some_js("~throw new Error(\"Cannot allocate speech engine!\");", cx, obj, rval);
-			jss->speech = NULL;
-			return JS_FALSE;
-		}
-	}
-
-	if (argc > 3) {
-		if ((function = JS_ValueToFunction(cx, argv[3]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-			if (argc > 4) {
-				cb_state.arg = argv[4];
-			}
-
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			cb_state.session_state = jss;
-			dtmf_func = js_collect_input_callback;
-			bp = &cb_state;
-			len = sizeof(cb_state);
-		}
-	}
-
-	cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	args.input_callback = dtmf_func;
-	args.buf = bp;
-	args.buflen = len;
-
-	switch_core_speech_flush_tts(&jss->speech->sh);
-	if (switch_core_codec_ready(&jss->speech->codec)) {
-		jss->speech->speaking = 1;
-		switch_ivr_speak_text_handle(jss->session, &jss->speech->sh, &jss->speech->codec, NULL, text, &args);
-		jss->speech->speaking = 0;
-	}
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-	check_hangup_hook(jss, &ret);
-	*rval = cb_state.ret;
-
-	return (JSBool)ret;
-}
-
-static JSBool session_get_digits(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	char *terminators = NULL;
-	char buf[513] = { 0 };
-	int32 digits = 0, timeout = 5000, digit_timeout = 0, abs_timeout = 0;
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK();
-
-	if (argc > 0) {
-		char term;
-		JS_ValueToInt32(cx, argv[0], &digits);
-
-		if (digits > sizeof(buf) - 1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exceeded max digits of %" SWITCH_SIZE_T_FMT "\n", sizeof(buf) - 1);
-			return JS_FALSE;
-		}
-
-		if (argc > 1) {
-			terminators = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		}
-
-		if (argc > 2) {
-			JS_ValueToInt32(cx, argv[2], &timeout);
-		}
-
-		if (argc > 3) {
-			JS_ValueToInt32(cx, argv[3], &digit_timeout);
-		}
-
-		if (argc > 4) {
-			JS_ValueToInt32(cx, argv[4], &abs_timeout);
-		}
-
-		switch_ivr_collect_digits_count(jss->session, buf, sizeof(buf), digits, terminators, &term, timeout, digit_timeout, abs_timeout);
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf));
-		return JS_TRUE;
-	}
-
-	return JS_FALSE;
-}
-
-static JSBool session_autohangup(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	METHOD_SANITY_CHECK();
-
-	if (argv[0]) {
-		JSBool tf;
-		JS_ValueToBoolean(cx, argv[0], &tf);
-		if (tf == JS_TRUE) {
-			switch_set_flag(jss, S_HUP);
-		} else {
-			switch_clear_flag(jss, S_HUP);
-		}
-		*rval = BOOLEAN_TO_JSVAL(tf);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_answer(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK_ANSWER();
-
-	switch_channel_answer(channel);
-	return JS_TRUE;
-}
-
-static JSBool session_pre_answer(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_SANITY_CHECK_ANSWER();
-
-	switch_channel_pre_answer(channel);
-	return JS_TRUE;
-}
-
-static JSBool session_cdr(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_xml_t cdr = NULL;
-
-	/*Always a pessimist... sheesh! */
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (switch_ivr_generate_xml_cdr(jss->session, &cdr) == SWITCH_STATUS_SUCCESS) {
-		char *xml_text;
-		if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) {
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xml_text));
-		}
-		switch_safe_free(xml_text);
-		switch_xml_free(cdr);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_ready(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-
-	*rval = BOOLEAN_TO_JSVAL((jss && jss->session && switch_channel_ready(switch_core_session_get_channel(jss->session))) ? JS_TRUE : JS_FALSE);
-
-	return JS_TRUE;
-}
-
-static JSBool session_media_ready(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-
-	*rval = BOOLEAN_TO_JSVAL((jss && jss->session && switch_channel_media_ready(switch_core_session_get_channel(jss->session))) ? JS_TRUE : JS_FALSE);
-
-	return JS_TRUE;
-}
-
-
-static JSBool session_ring_ready(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-
-	*rval = BOOLEAN_TO_JSVAL((jss && jss->session && switch_channel_test_flag(switch_core_session_get_channel(jss->session), CF_RING_READY)) ? JS_TRUE : JS_FALSE);
-
-	return JS_TRUE;
-}
-
-static JSBool session_answered(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-
-	*rval =
-		BOOLEAN_TO_JSVAL((jss && jss->session
-						  && switch_channel_test_flag(switch_core_session_get_channel(jss->session), CF_ANSWERED)) ? JS_TRUE : JS_FALSE);
-
-	return JS_TRUE;
-}
-
-static JSBool session_wait_for_media(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	switch_time_t started;
-	unsigned int elapsed;
-	int32 timeout = 60000;
-	jsrefcount saveDepth;
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-
-	channel = switch_core_session_get_channel(jss->session);
-	CHANNEL_MEDIA_SANITY_CHECK();
-
-	started = switch_micro_time_now();
-
-	if (argc > 0) {
-		JS_ValueToInt32(cx, argv[0], &timeout);
-		if (timeout < 1000) {
-			timeout = 1000;
-		}
-	}
-
-	if (check_hangup_hook(jss, NULL) != JS_TRUE) {
-		return JS_FALSE;
-	}
-	saveDepth = JS_SuspendRequest(cx);
-	for (;;) {
-		if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout)
-			|| switch_channel_down(channel)) {
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-			break;
-		}
-
-		if (switch_channel_ready(channel)
-			&& (switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA))) {
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-			break;
-		}
-
-		switch_cond_next();
-	}
-	JS_ResumeRequest(cx, saveDepth);
-	check_hangup_hook(jss, &ret);
-
-	return (JSBool)ret;
-}
-
-static JSBool session_wait_for_answer(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	switch_time_t started;
-	unsigned int elapsed;
-	int32 timeout = 60000;
-	jsrefcount saveDepth;
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-
-	started = switch_micro_time_now();
-
-	if (argc > 0) {
-		JS_ValueToInt32(cx, argv[0], &timeout);
-		if (timeout < 1000) {
-			timeout = 1000;
-		}
-	}
-
-	if (check_hangup_hook(jss, NULL) != JS_TRUE) {
-		return JS_FALSE;
-	}
-
-	saveDepth = JS_SuspendRequest(cx);
-	for (;;) {
-		if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout)
-			|| switch_channel_down(channel)) {
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-			break;
-		}
-
-		if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_ANSWERED)) {
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-			break;
-		}
-
-		switch_cond_next();
-	}
-	JS_ResumeRequest(cx, saveDepth);
-	check_hangup_hook(jss, &ret);
-	return (JSBool)ret;
-}
-
-static JSBool session_detach(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	jsval ret = JS_TRUE;
-	switch_call_cause_t cause = 0;
-	switch_channel_t *channel;
-	switch_core_session_t *session;
-	METHOD_SANITY_CHECK();
-
-	if ((session = jss->session)) {
-		jss->session = NULL;
-
-		if (argc > 1) {
-			if (JSVAL_IS_INT(argv[0])) {
-				int32 i = 0;
-				JS_ValueToInt32(cx, argv[0], &i);
-				cause = i;
-			} else {
-				const char *cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-				cause = switch_channel_str2cause(cause_name);
-			}
-		}
-
-		if (cause) {
-			channel = switch_core_session_get_channel(session);
-			switch_channel_hangup(channel, cause);
-		}
-
-		switch_core_session_rwunlock(session);
-		*rval = JS_TRUE;
-	} else {
-		*rval = JS_FALSE;
-	}
-
-	return (JSBool)ret;
-}
-
-static JSBool session_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	JSBool retval = JS_FALSE;
-
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	jsval ret = JS_TRUE;
-
-	METHOD_SANITY_CHECK();
-
-	/* you can execute some apps before you answer  CHANNEL_SANITY_CHECK(); */
-
-	if (argc > 0) {
-		switch_application_interface_t *application_interface;
-		char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *app_arg = NULL;
-		jsrefcount saveDepth;
-
-		METHOD_SANITY_CHECK();
-
-		if (argc > 1) {
-			app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		}
-
-		if ((application_interface = switch_loadable_module_get_application_interface(app_name))) {
-			if (application_interface->application_function) {
-				if (check_hangup_hook(jss, NULL) != JS_TRUE) {
-					return JS_FALSE;
-				}
-
-				saveDepth = JS_SuspendRequest(cx);
-				switch_core_session_exec(jss->session, application_interface, app_arg);
-				JS_ResumeRequest(cx, saveDepth);
-				check_hangup_hook(jss, &ret);
-				retval = JS_TRUE;
-			}
-			UNPROTECT_INTERFACE(application_interface);
-		}
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(retval);
-	return (JSBool)ret;
-}
-
-static JSBool session_get_event(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_event_t *event;
-
-	METHOD_SANITY_CHECK();
-
-	if (switch_core_session_dequeue_event(jss->session, &event, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
-		JSObject *Event;
-		struct event_obj *eo;
-
-		if ((eo = malloc(sizeof(*eo)))) {
-			eo->event = event;
-			eo->freed = 0;
-
-			if ((Event = JS_DefineObject(cx, obj, "__event__", &event_class, NULL, 0))) {
-				if ((JS_SetPrivate(cx, Event, eo) && JS_DefineProperties(cx, Event, event_props) && JS_DefineFunctions(cx, Event, event_methods))) {
-					*rval = OBJECT_TO_JSVAL(Event);
-					return JS_TRUE;
-				}
-			}
-		}
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-static JSBool session_send_event(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	JSObject *Event;
-	struct event_obj *eo;
-
-	METHOD_SANITY_CHECK();
-
-	if (argc > 0) {
-		if (JS_ValueToObject(cx, argv[0], &Event)) {
-			if ((eo = JS_GetPrivate(cx, Event))) {
-				if (switch_core_session_receive_event(jss->session, &eo->event) != SWITCH_STATUS_SUCCESS) {
-					*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-					return JS_TRUE;
-				}
-
-				JS_SetPrivate(cx, Event, NULL);
-			}
-		}
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	return JS_TRUE;
-}
-
-static JSBool session_hangup(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	switch_channel_t *channel;
-	char *cause_name = NULL;
-	switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-
-	METHOD_SANITY_CHECK();
-	channel = switch_core_session_get_channel(jss->session);
-	//CHANNEL_SANITY_CHECK();
-
-	if (switch_channel_up(channel)) {
-		jsval ret = JS_TRUE;
-
-		if (argc > 0) {
-			if (JSVAL_IS_INT(argv[0])) {
-				int32 i = 0;
-				JS_ValueToInt32(cx, argv[0], &i);
-				cause = i;
-			} else {
-				cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-				cause = switch_channel_str2cause(cause_name);
-			}
-		}
-
-		switch_channel_hangup(channel, cause);
-		switch_core_session_kill_channel(jss->session, SWITCH_SIG_KILL);
-
-		jss->hook_state = CS_HANGUP;
-		check_hangup_hook(jss, &ret);
-
-	}
-
-	return JS_TRUE;
-}
-
-#ifdef HAVE_CURL
-
-struct config_data {
-	JSContext *cx;
-	JSObject *obj;
-	char *name;
-	int fd;
-};
-
-struct fetch_url_data {
-	JSContext *cx;
-	JSObject *obj;
-	switch_size_t buffer_size;
-	switch_size_t data_len;
-	char *buffer;
-};
-
-static size_t hash_callback(void *ptr, size_t size, size_t nmemb, void *data)
-{
-	register size_t realsize = size * nmemb;
-	char *line, lineb[2048], *nextline = NULL, *val = NULL, *p = NULL;
-	jsval rval;
-	struct config_data *config_data = data;
-	char code[256];
-
-	if (config_data->name) {
-		switch_copy_string(lineb, (char *) ptr, sizeof(lineb));
-		line = lineb;
-		while (line) {
-			if ((nextline = strchr(line, '\n'))) {
-				*nextline = '\0';
-				nextline++;
-			}
-
-			if ((val = strchr(line, '='))) {
-				*val = '\0';
-				val++;
-				if (val[0] == '>') {
-					*val = '\0';
-					val++;
-				}
-
-				for (p = line; p && *p == ' '; p++);
-				line = p;
-				for (p = line + strlen(line) - 1; *p == ' '; p--)
-					*p = '\0';
-				for (p = val; p && *p == ' '; p++);
-				val = p;
-				for (p = val + strlen(val) - 1; *p == ' '; p--)
-					*p = '\0';
-
-				switch_snprintf(code, sizeof(code), "~%s[\"%s\"] = \"%s\"", config_data->name, line, val);
-				eval_some_js(code, config_data->cx, config_data->obj, &rval);
-
-			}
-
-			line = nextline;
-		}
-	}
-	return realsize;
-}
-
-static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
-{
-	register unsigned int realsize = (unsigned int) (size * nmemb);
-	struct config_data *config_data = data;
-
-	if ((write(config_data->fd, ptr, realsize) != (int) realsize)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to write all bytes!\n");
-	}
-	return realsize;
-}
-
-static size_t fetch_url_callback(void *ptr, size_t size, size_t nmemb, void *data)
-{
-	register unsigned int realsize = (unsigned int) (size * nmemb);
-	struct fetch_url_data *config_data = data;
-
-	/* Too much data. Do not increase buffer, but abort fetch instead. */
-	if (config_data->data_len + realsize >= config_data->buffer_size) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Data do not fit in the allocated buffer\n");
-		return 0;
-	}
-
-	memcpy(config_data->buffer + config_data->data_len, ptr, realsize);
-	config_data->data_len += realsize;
-	config_data->buffer[config_data->data_len] = 0;
-
-	return realsize;
-}
-
-
-static JSBool js_fetchurl_hash(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *url = NULL, *name = NULL;
-	CURL *curl_handle = NULL;
-	struct config_data config_data;
-	int saveDepth = 0;
-
-	if (argc > 1) {
-		url = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		name = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-		curl_handle = curl_easy_init();
-		if (!strncasecmp(url, "https", 5)) {
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-		}
-		config_data.cx = cx;
-		config_data.obj = obj;
-		if (name) {
-			config_data.name = name;
-		}
-		curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-		curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
-		curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
-		curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
-		curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, hash_callback);
-		curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
-		curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");
-
-		saveDepth = JS_SuspendRequest(cx);
-		curl_easy_perform(curl_handle);
-		JS_ResumeRequest(cx, saveDepth);
-
-		curl_easy_cleanup(curl_handle);
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
-		return JS_FALSE;
-	}
-
-	return JS_TRUE;
-}
-
-
-
-static JSBool js_fetchurl_file(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *url = NULL, *filename = NULL;
-	CURL *curl_handle = NULL;
-	struct config_data config_data;
-	int saveDepth = 0;
-
-	if (argc > 1) {
-		url = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		filename = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-		curl_handle = curl_easy_init();
-		if (!strncasecmp(url, "https", 5)) {
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-		}
-		config_data.cx = cx;
-		config_data.obj = obj;
-
-		config_data.name = filename;
-		if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) {
-			curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-			curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
-			curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
-			curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback);
-			curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
-			curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");
-
-			saveDepth = JS_SuspendRequest(cx);
-			curl_easy_perform(curl_handle);
-			JS_ResumeRequest(cx, saveDepth);
-
-			curl_easy_cleanup(curl_handle);
-			close(config_data.fd);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool js_fetchurl(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *url = NULL;
-	CURL *curl_handle = NULL;
-	struct fetch_url_data config_data;
-	int32 buffer_size = 65535;
-	CURLcode code = 0;
-	int saveDepth = 0;
-
-	if (argc >= 1) {
-		url = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (argc > 1) {
-			JS_ValueToInt32(cx, argv[1], &buffer_size);
-		}
-
-		curl_handle = curl_easy_init();
-		if (!strncasecmp(url, "https", 5)) {
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
-			curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-		}
-
-		config_data.buffer_size = buffer_size;
-		config_data.buffer = malloc(config_data.buffer_size);
-		config_data.data_len = 0;
-		if (config_data.buffer == NULL) {
-			eval_some_js("~throw new Error(\"Failed to allocate data buffer.\");", cx, obj, rval);
-			return JS_TRUE;
-		}
-
-		curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-		curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
-		curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
-		curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, fetch_url_callback);
-		curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
-		curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");
-
-		saveDepth = JS_SuspendRequest(cx);
-		code = curl_easy_perform(curl_handle);
-		JS_ResumeRequest(cx, saveDepth);
-
-		curl_easy_cleanup(curl_handle);
-
-		if (code != CURLE_WRITE_ERROR) {
-			config_data.buffer[config_data.data_len] = 0;
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, config_data.buffer));
-		} else {
-			char errmsg[256];
-			switch_snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %u.\");", (unsigned) code);
-			eval_some_js(errmsg, cx, obj, rval);
-		}
-
-		free(config_data.buffer);
-
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
-	}
-
-	return JS_TRUE;
-}
-#endif
-
-/* Session Object */
-/*********************************************************************************/
-enum session_tinyid {
-	SESSION_NAME, SESSION_STATE,
-	PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST,
-	SESSION_UUID, SESSION_CAUSE, SESSION_CAUSECODE
-};
-
-static JSFunctionSpec session_methods[] = {
-	{"originate", session_originate, 2},
-	{"setCallerData", session_set_callerdata, 2},
-	{"setHangupHook", session_hanguphook, 1},
-	{"setAutoHangup", session_autohangup, 1},
-	{"sayPhrase", session_sayphrase, 1},
-	{"streamFile", session_streamfile, 1},
-	{"collectInput", session_collect_input, 1},
-	{"recordFile", session_recordfile, 1},
-	{"flushEvents", session_flush_events, 1},
-	{"flushDigits", session_flush_digits, 1},
-	{"speak", session_speak, 1},
-	{"setVariable", session_set_variable, 1},
-	{"getVariable", session_get_variable, 1},
-	{"getDigits", session_get_digits, 1},
-	{"answer", session_answer, 0},
-	{"preAnswer", session_pre_answer, 0},
-	{"generateXmlCdr", session_cdr, 0},
-	{"ready", session_ready, 0},
-	{"answered", session_answered, 0},
-	{"mediaReady", session_media_ready, 0},
-	{"ringReady", session_ring_ready, 0},
-	{"waitForAnswer", session_wait_for_answer, 0},
-	{"waitForMedia", session_wait_for_media, 0},
-	{"getEvent", session_get_event, 0},
-	{"sendEvent", session_send_event, 0},
-	{"hangup", session_hangup, 0},
-	{"execute", session_execute, 0},
-	{"destroy", session_detach, 0},
-	{"sleep", session_sleep, 1},
-	{0}
-};
-
-static JSPropertySpec session_props[] = {
-	{"name", SESSION_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"state", SESSION_STATE, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"dialplan", PROFILE_DIALPLAN, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"caller_id_name", PROFILE_CID_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"caller_id_num", PROFILE_CID_NUM, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"caller_id_number", PROFILE_CID_NUM, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"network_addr", PROFILE_IP, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"network_address", PROFILE_IP, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"ani", PROFILE_ANI, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"aniii", PROFILE_ANI_II, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"uuid", SESSION_UUID, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"cause", SESSION_CAUSE, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"causecode", SESSION_CAUSECODE, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool session_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	struct js_session *jss = JS_GetPrivate(cx, obj);
-	int param = 0;
-	switch_channel_t *channel = NULL;
-	switch_caller_profile_t *caller_profile = NULL;
-	char *name = NULL;
-
-	if (jss && jss->session) {
-		channel = switch_core_session_get_channel(jss->session);
-		caller_profile = switch_channel_get_caller_profile(channel);
-	}
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	if (!channel) {
-		switch (param) {
-		case SESSION_CAUSE:
-			if (jss) {
-				*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause)));
-			}
-			break;
-		case SESSION_CAUSECODE:
-			if (jss) {
-				*vp = INT_TO_JSVAL(jss->cause);
-			}
-			break;
-		default:
-			*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		}
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case SESSION_CAUSE:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(switch_channel_get_cause(channel))));
-		break;
-	case SESSION_CAUSECODE:
-		*vp = INT_TO_JSVAL(switch_channel_get_cause(channel));
-		break;
-	case SESSION_NAME:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel)));
-		break;
-	case SESSION_UUID:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_uuid(channel)));
-		break;
-	case SESSION_STATE:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_state_name(switch_channel_get_state(channel))));
-		break;
-	case PROFILE_DIALPLAN:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->dialplan));
-		}
-		break;
-	case PROFILE_CID_NAME:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->caller_id_name));
-		}
-		break;
-	case PROFILE_CID_NUM:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->caller_id_number));
-		}
-		break;
-	case PROFILE_IP:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->network_addr));
-		}
-		break;
-	case PROFILE_ANI:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->ani));
-		}
-		break;
-	case PROFILE_ANI_II:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->aniii));
-		}
-		break;
-	case PROFILE_DEST:
-		if (caller_profile) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->destination_number));
-		}
-		break;
-	default:
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		break;
-	}
-
-	return JS_TRUE;
-}
-
-JSClass session_class = {
-	"Session", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, session_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, session_destroy, NULL, NULL, NULL,
-	session_construct
-};
-
-static JSObject *new_js_session(JSContext * cx, JSObject * obj, switch_core_session_t *session, struct js_session **jss, char *name, int flags)
-{
-	JSObject *session_obj;
-	if ((session_obj = JS_DefineObject(cx, obj, name, &session_class, NULL, 0))) {
-		*jss = malloc(sizeof(**jss));
-		switch_assert(*jss);
-		memset(*jss, 0, sizeof(**jss));
-
-		(*jss)->session = session;
-		(*jss)->flags = flags;
-		(*jss)->cx = cx;
-		(*jss)->obj = session_obj;
-		(*jss)->stack_depth = 0;
-		if ((JS_SetPrivate(cx, session_obj, *jss) &&
-			 JS_DefineProperties(cx, session_obj, session_props) && JS_DefineFunctions(cx, session_obj, session_methods))) {
-			if (switch_core_session_read_lock_hangup(session) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Failure.\n");
-				free(*jss);
-				return NULL;
-			}
-			return session_obj;
-		} else {
-			free(*jss);
-		}
-	}
-
-	return NULL;
-}
-
-/* Session Object */
-/*********************************************************************************/
-
-static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = NULL;
-	JSObject *session_obj = NULL;
-
-	jss = malloc(sizeof(*jss));
-	switch_assert(jss);
-	memset(jss, 0, sizeof(*jss));
-	jss->cx = cx;
-	jss->obj = obj;
-	JS_SetPrivate(cx, obj, jss);
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (argc > 0) {
-		char *uuid = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-		if (!strchr(uuid, '/')) {
-			jss->session = switch_core_session_locate(uuid);
-			switch_set_flag(jss, S_HUP);
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		} else {
-			struct js_session *old_jss = NULL;
-
-			if (argc > 1) {
-				if (JS_ValueToObject(cx, argv[1], &session_obj) && session_obj) {
-					old_jss = JS_GetPrivate(cx, session_obj);
-				}
-			}
-			if (switch_ivr_originate(old_jss ? old_jss->session : NULL,
-									 &jss->session, &jss->cause, uuid, 60, NULL, NULL, NULL, NULL, NULL, SOF_NONE, NULL) == SWITCH_STATUS_SUCCESS) {
-				switch_set_flag(jss, S_HUP);
-				//switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE);
-				//switch_channel_wait_for_state_timeout(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE, 5000);
-				*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-			} else {
-				*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause)));
-			}
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_set_callerdata(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = NULL;
-	jss = JS_GetPrivate(cx, obj);
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (argc > 1) {
-		char *var, *val, **toset = NULL;
-		var = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		val = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-		if (!strcasecmp(var, "dialplan")) {
-			toset = &jss->dialplan;
-		} else if (!strcasecmp(var, "username")) {
-			toset = &jss->username;
-		} else if (!strcasecmp(var, "caller_id_name")) {
-			toset = &jss->caller_id_name;
-		} else if (!strcasecmp(var, "ani")) {
-			toset = &jss->ani;
-		} else if (!strcasecmp(var, "aniii")) {
-			toset = &jss->aniii;
-		} else if (!strcasecmp(var, "caller_id_number")) {
-			toset = &jss->caller_id_number;
-		} else if (!strcasecmp(var, "network_addr")) {
-			toset = &jss->network_addr;
-		} else if (!strcasecmp(var, "rdnis")) {
-			toset = &jss->rdnis;
-		} else if (!strcasecmp(var, "destination_number")) {
-			toset = &jss->destination_number;
-		} else if (!strcasecmp(var, "context")) {
-			toset = &jss->context;
-		}
-
-		if (toset) {
-			switch_safe_free(*toset);
-			*toset = strdup(val);
-		}
-
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss = NULL;
-	switch_memory_pool_t *pool = NULL;
-
-	jss = JS_GetPrivate(cx, obj);
-	jss->cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "This method is deprecated, please use new Session(\"<dial string>\", a_leg) \n");
-
-	if (jss->session) {
-		eval_some_js("~throw new Error(\"cannot call this method on an initialized session\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (argc > 1) {
-		JSObject *session_obj;
-		switch_core_session_t *session = NULL, *peer_session = NULL;
-		switch_caller_profile_t *caller_profile = NULL, *orig_caller_profile = NULL;
-		const char *dest = NULL;
-		const char *dialplan = NULL;
-		const char *cid_name = "";
-		const char *cid_num = "";
-		const char *network_addr = "";
-		const char *ani = "";
-		const char *aniii = "";
-		const char *rdnis = "";
-		const char *context = "";
-		const char *username = NULL;
-		char *to = NULL;
-		char *tmp;
-		jsrefcount saveDepth;
-		switch_status_t status;
-
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-		if (JS_ValueToObject(cx, argv[0], &session_obj)) {
-			struct js_session *old_jss = NULL;
-			if (session_obj && (old_jss = JS_GetPrivate(cx, session_obj))) {
-
-				if (old_jss == jss) {
-					eval_some_js("~throw new Error(\"Supplied a_leg session is the same as our session\");", cx, obj, rval);
-					return JS_FALSE;
-
-				};
-
-				if (!old_jss->session) {
-					eval_some_js("~throw new Error(\"Supplied a_leg session is not initilaized!\");", cx, obj, rval);
-					return JS_FALSE;
-				}
-
-				session = old_jss->session;
-				orig_caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session));
-				dialplan = orig_caller_profile->dialplan;
-				cid_name = orig_caller_profile->caller_id_name;
-				cid_num = orig_caller_profile->caller_id_number;
-				ani = orig_caller_profile->ani;
-				aniii = orig_caller_profile->aniii;
-				rdnis = orig_caller_profile->rdnis;
-				context = orig_caller_profile->context;
-				username = orig_caller_profile->username;
-			}
-
-		}
-
-		if (!zstr(jss->dialplan))
-			dialplan = jss->dialplan;
-		if (!zstr(jss->caller_id_name))
-			cid_name = jss->caller_id_name;
-		if (!zstr(jss->caller_id_number))
-			cid_num = jss->caller_id_number;
-		if (!zstr(jss->ani))
-			ani = jss->ani;
-		if (!zstr(jss->aniii))
-			aniii = jss->aniii;
-		if (!zstr(jss->rdnis))
-			rdnis = jss->rdnis;
-		if (!zstr(jss->context))
-			context = jss->context;
-		if (!zstr(jss->username))
-			username = jss->username;
-
-		dest = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-		if (!strchr(dest, '/')) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Channel String\n");
-			goto done;
-		}
-
-		if (argc > 2) {
-			tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-			if (!zstr(tmp)) {
-				to = tmp;
-			}
-		}
-
-		if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n");
-			return JS_FALSE;
-		}
-
-		caller_profile = switch_caller_profile_new(pool, username, dialplan, cid_name, cid_num, network_addr, ani, aniii, rdnis, modname, context, dest);
-
-		saveDepth = JS_SuspendRequest(cx);
-		status =
-			switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile, NULL, SOF_NONE, NULL);
-		JS_ResumeRequest(cx, saveDepth);
-
-		if (status != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest);
-			goto done;
-		}
-
-		jss->session = peer_session;
-		switch_set_flag(jss, S_HUP);
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		//switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE);
-
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing Args\n");
-	}
-
-  done:
-	return JS_TRUE;
-}
-
-static void session_destroy(JSContext * cx, JSObject * obj)
-{
-	struct js_session *jss;
-
-	if (cx && obj) {
-		if ((jss = JS_GetPrivate(cx, obj))) {
-
-			JS_SetPrivate(cx, obj, NULL);
-			if (jss->speech && *jss->speech->sh.name) {
-				destroy_speech_engine(jss);
-			}
-
-			if (jss->session) {
-				switch_core_session_t *session = jss->session;
-				switch_channel_t *channel = switch_core_session_get_channel(session);
-
-				switch_channel_set_private(channel, "jss", NULL);
-				switch_core_event_hook_remove_state_change(session, hanguphook);
-
-				if (switch_test_flag(jss, S_HUP)) {
-					switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-				}
-
-				switch_safe_free(jss->dialplan);
-				switch_safe_free(jss->username);
-				switch_safe_free(jss->caller_id_name);
-				switch_safe_free(jss->ani);
-				switch_safe_free(jss->aniii);
-				switch_safe_free(jss->caller_id_number);
-				switch_safe_free(jss->network_addr);
-				switch_safe_free(jss->rdnis);
-				switch_safe_free(jss->destination_number);
-				switch_safe_free(jss->context);
-				switch_core_session_rwunlock(session);
-			}
-
-			free(jss);
-
-		}
-	}
-
-	return;
-}
-
-/* FileIO Object */
-/*********************************************************************************/
-static JSBool fileio_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	switch_memory_pool_t *pool;
-	switch_file_t *fd;
-	char *path, *flags_str;
-	unsigned int flags = 0;
-	struct fileio_obj *fio;
-
-	if (argc > 1) {
-		path = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		flags_str = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-		if (strchr(flags_str, 'r')) {
-			flags |= SWITCH_FOPEN_READ;
-		}
-		if (strchr(flags_str, 'w')) {
-			flags |= SWITCH_FOPEN_WRITE;
-		}
-		if (strchr(flags_str, 'c')) {
-			flags |= SWITCH_FOPEN_CREATE;
-		}
-		if (strchr(flags_str, 'a')) {
-			flags |= SWITCH_FOPEN_APPEND;
-		}
-		if (strchr(flags_str, 't')) {
-			flags |= SWITCH_FOPEN_TRUNCATE;
-		}
-		if (strchr(flags_str, 'b')) {
-			flags |= SWITCH_FOPEN_BINARY;
-		}
-		switch_core_new_memory_pool(&pool);
-		if (switch_file_open(&fd, path, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, pool) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", path);
-			switch_core_destroy_memory_pool(&pool);
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-			return JS_TRUE;
-		}
-		fio = switch_core_alloc(pool, sizeof(*fio));
-		fio->fd = fd;
-		fio->pool = pool;
-		fio->path = switch_core_strdup(pool, path);
-		fio->flags = flags;
-		JS_SetPrivate(cx, obj, fio);
-		return JS_TRUE;
-	}
-
-	return JS_TRUE;
-}
-static void fileio_destroy(JSContext * cx, JSObject * obj)
-{
-	struct fileio_obj *fio = JS_GetPrivate(cx, obj);
-
-	if (fio) {
-		switch_memory_pool_t *pool;
-		if (fio->fd) {
-			switch_file_close(fio->fd);
-		}
-		pool = fio->pool;
-		switch_core_destroy_memory_pool(&pool);
-		pool = NULL;
-	}
-}
-
-static JSBool fileio_read(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct fileio_obj *fio = JS_GetPrivate(cx, obj);
-	int32 bytes = 0;
-	switch_size_t read = 0;
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (!fio) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (!(fio->flags & SWITCH_FOPEN_READ)) {
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		JS_ValueToInt32(cx, argv[0], &bytes);
-	}
-
-	if (bytes) {
-		if (!fio->buf || fio->bufsize < bytes) {
-			fio->buf = switch_core_alloc(fio->pool, bytes);
-			fio->bufsize = bytes;
-		}
-		read = bytes;
-		switch_file_read(fio->fd, fio->buf, &read);
-		fio->buflen = read;
-		*rval = BOOLEAN_TO_JSVAL((read > 0) ? JS_TRUE : JS_FALSE);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool fileio_data(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct fileio_obj *fio = JS_GetPrivate(cx, obj);
-
-	if (!fio) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->buf));
-	return JS_TRUE;
-}
-
-static JSBool fileio_write(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct fileio_obj *fio = JS_GetPrivate(cx, obj);
-	switch_size_t wrote = 0;
-	char *data = NULL;
-
-	if (!fio) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (!(fio->flags & SWITCH_FOPEN_WRITE)) {
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	}
-
-	if (argc > 0) {
-		data = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	}
-
-	if (data) {
-		wrote = strlen(data);
-		*rval = BOOLEAN_TO_JSVAL((switch_file_write(fio->fd, data, &wrote) == SWITCH_STATUS_SUCCESS) ? JS_TRUE : JS_FALSE);
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-enum fileio_tinyid {
-	FILEIO_PATH, FILEIO_OPEN
-};
-
-static JSFunctionSpec fileio_methods[] = {
-	{"read", fileio_read, 1},
-	{"write", fileio_write, 1},
-	{"data", fileio_data, 0},
-	{0}
-};
-
-static JSPropertySpec fileio_props[] = {
-	{"path", FILEIO_PATH, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"open", FILEIO_OPEN, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool fileio_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	struct fileio_obj *fio = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case FILEIO_PATH:
-		if (fio) {
-			*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->path));
-		} else {
-			*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		}
-		break;
-	case FILEIO_OPEN:
-		*vp = BOOLEAN_TO_JSVAL(fio ? JS_TRUE : JS_FALSE);
-		break;
-	}
-
-	return res;
-}
-
-JSClass fileio_class = {
-	"FileIO", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, fileio_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, fileio_destroy, NULL, NULL, NULL,
-	fileio_construct
-};
-
-/* Built-In*/
-/*********************************************************************************/
-static JSBool js_exit(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *supplied_error, code_buf[256] = "";
-
-	if (argc > 0 && (supplied_error = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-		switch_snprintf(code_buf, sizeof(code_buf), "~throw new Error(\"%s\");", supplied_error);
-		eval_some_js(code_buf, cx, obj, rval);
-	}
-	return JS_FALSE;
-}
-
-static JSBool js_log(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *level_str, *msg;
-	switch_log_level_t level = SWITCH_LOG_DEBUG;
-	JSScript *script = NULL;
-	const char *file = __FILE__;
-	int line = __LINE__;
-	JSStackFrame *caller;
-
-	caller = JS_GetScriptedCaller(cx, NULL);
-	script = JS_GetFrameScript(cx, caller);
-
-	if (script) {
-		file = JS_GetScriptFilename(cx, script);
-		line = JS_GetScriptBaseLineNumber(cx, script);
-	}
-
-	if (argc > 1) {
-		if ((level_str = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-			level = switch_log_str2level(level_str);
-			if (level == SWITCH_LOG_INVALID) {
-				level = SWITCH_LOG_DEBUG;
-			}
-		}
-
-		if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])))) {
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, NULL, level, "%s", msg);
-			return JS_TRUE;
-		}
-	} else if (argc > 0) {
-		if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "console_log", line, NULL, level, "%s", msg);
-			return JS_TRUE;
-		}
-	}
-
-	return JS_FALSE;
-}
-
-static JSBool js_global_set(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *var_name = NULL, *val = NULL, *val2 = NULL;
-	JSBool tf = JS_TRUE;
-	if (argc > 1) {
-		var_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		val = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		if (argc == 2) {
-			switch_core_set_variable(var_name, val);
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-			return JS_TRUE;
-		} else {
-			val2 = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-			if (switch_core_set_var_conditional(var_name, val, val2) != SWITCH_TRUE) {
-				tf = JS_FALSE;
-			}
-			*rval = BOOLEAN_TO_JSVAL(tf);
-			return JS_TRUE;
-		}
-	}
-	/* this is so the wrong error message to throw for this one */
-	eval_some_js("~throw new Error(\"var name not supplied!\");", cx, obj, rval);
-	return JS_FALSE;
-}
-
-static JSBool js_global_get(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *var_name = NULL, *val = NULL;
-
-	if (argc > 0) {
-		var_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		val = switch_core_get_variable_dup(var_name);
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val));
-		free(val);
-		return JS_TRUE;
-	}
-
-	eval_some_js("~throw new Error(\"var name not supplied!\");", cx, obj, rval);
-	return JS_FALSE;
-}
-
-static JSBool js_include(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *code;
-	if (argc > 0 && (code = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-		if (eval_some_js(code, cx, obj, rval) <= 0) {
-			return JS_FALSE;
-		}
-		return JS_TRUE;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Arguements\n");
-	return JS_FALSE;
-}
-
-static JSBool js_api_sleep(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	int32 msec = 0;
-
-	if (argc > 0) {
-		JS_ValueToInt32(cx, argv[0], &msec);
-	}
-
-	if (msec) {
-		int saveDepth;
-		saveDepth = JS_SuspendRequest(cx);
-		switch_yield(msec * 1000);
-		JS_ResumeRequest(cx, saveDepth);
-	} else {
-		eval_some_js("~throw new Error(\"No Time specified\");", cx, obj, rval);
-	}
-
-	return JS_TRUE;
-
-}
-
-static JSBool js_api_use(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *mod_name = NULL;
-
-	if (argc > 0 && (mod_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-		const sm_module_interface_t *mp;
-
-		if ((mp = switch_core_hash_find(module_manager.load_hash, mod_name))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading %s\n", mod_name);
-			mp->spidermonkey_load(cx, obj);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading %s\n", mod_name);
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Filename\n");
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool js_api_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	if (argc > 0) {
-		char *cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *arg = NULL;
-		switch_core_session_t *session = NULL;
-		switch_stream_handle_t stream = { 0 };
-
-		if (!strcasecmp(cmd, "jsapi")) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid API Call!\n");
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-			return JS_TRUE;
-		}
-
-		if (argc > 1) {
-			arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		}
-
-		if (argc > 2) {
-			JSObject *session_obj;
-			struct js_session *jss;
-			if (JS_ValueToObject(cx, argv[2], &session_obj)) {
-				if ((jss = JS_GetPrivate(cx, session_obj))) {
-					session = jss->session;
-				}
-			}
-		}
-
-		SWITCH_STANDARD_STREAM(stream);
-		switch_api_execute(cmd, arg, session, &stream);
-
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_str_nil((char *) stream.data)));
-		switch_safe_free(stream.data);
-
-	} else {
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ""));
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool js_email(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *to = NULL, *from = NULL, *headers = NULL, *body = NULL, *file = NULL, *convert_cmd = NULL, *convert_ext = NULL;
-	
-	if (argc > 0) {
-		to = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	}
-
-	if (argc > 1) {
-		from = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	}
-
-	if (argc > 2) {
-		headers = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-	}
-
-	if (argc > 3) {
-		body = JS_GetStringBytes(JS_ValueToString(cx, argv[3]));
-	}
-
-	if (argc > 4) {
-		file = JS_GetStringBytes(JS_ValueToString(cx, argv[4]));
-	}
-
-	if (argc > 5) {
-		convert_cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[5]));
-	}
-
-	if (argc > 6) {
-		convert_ext = JS_GetStringBytes(JS_ValueToString(cx, argv[6]));
-	}
-
-    if (to && from && headers && body && switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext) == SWITCH_TRUE) {
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		return JS_TRUE;
-    }
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_FALSE;
-
-}
-
-static JSBool js_bridge(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct js_session *jss_a = NULL, *jss_b = NULL;
-	JSObject *session_obj_a = NULL, *session_obj_b = NULL;
-	void *bp = NULL;
-	switch_input_callback_function_t dtmf_func = NULL;
-	struct input_callback_state cb_state = { 0 };
-	JSFunction *function;
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (argc > 1) {
-		if (JS_ValueToObject(cx, argv[0], &session_obj_a)) {
-			if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) {
-				eval_some_js("~throw new Error(\"Cannot find session A\");", cx, obj, rval);
-				return JS_FALSE;
-			}
-		}
-		if (JS_ValueToObject(cx, argv[1], &session_obj_b)) {
-			if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) {
-				eval_some_js("~throw new Error(\"Cannot find session B\");", cx, obj, rval);
-				return JS_FALSE;
-			}
-		}
-	}
-
-	if (!(jss_a && jss_a->session)) {
-		eval_some_js("~throw new Error(\"session A is not ready!\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (!(jss_b && jss_b->session)) {
-		eval_some_js("~throw new Error(\"session B is not ready!\");", cx, obj, rval);
-		return JS_FALSE;
-	}
-
-	if (argc > 2) {
-		if ((function = JS_ValueToFunction(cx, argv[2]))) {
-			memset(&cb_state, 0, sizeof(cb_state));
-			cb_state.function = function;
-
-			if (argc > 3) {
-				cb_state.arg = argv[3];
-			}
-
-			cb_state.cx = cx;
-			cb_state.obj = obj;
-			cb_state.jss_a = jss_a;
-			cb_state.jss_b = jss_b;
-			cb_state.session_obj_a = session_obj_a;
-			cb_state.session_obj_b = session_obj_b;
-			cb_state.session_state = jss_a;
-			dtmf_func = js_collect_input_callback;
-			bp = &cb_state;
-		}
-	}
-
-	cb_state.saveDepth = JS_SuspendRequest(cx);
-	switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp);
-	JS_ResumeRequest(cx, cb_state.saveDepth);
-
-	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-
-	return JS_TRUE;
-}
-
-/* Replace this with more robust version later */
-static JSBool js_system(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	char *cmd;
-	int saveDepth, result;
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (argc > 0 && (cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-		saveDepth = JS_SuspendRequest(cx);
-		result = switch_system(cmd, SWITCH_TRUE);
-		JS_ResumeRequest(cx, saveDepth);
-		*rval = INT_TO_JSVAL(result);
-		return JS_TRUE;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Arguements\n");
-	return JS_FALSE;
-}
-
-static JSBool js_file_unlink(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	const char *path;
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	if (argc > 0 && (path = (const char *) JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
-		if ((switch_file_remove(path, NULL)) == SWITCH_STATUS_SUCCESS) {
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		}
-		return JS_TRUE;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Arguements\n");
-	return JS_FALSE;
-}
-
-static JSFunctionSpec fs_functions[] = {
-	{"console_log", js_log, 2},
-	{"consoleLog", js_log, 2},
-	{"getGlobalVariable", js_global_get, 2},
-	{"setGlobalVariable", js_global_set, 2},
-	{"exit", js_exit, 0},
-	{"include", js_include, 1},
-	{"bridge", js_bridge, 2},
-	{"email", js_email, 3},
-	{"apiExecute", js_api_execute, 2},
-	{"use", js_api_use, 1},
-	{"msleep", js_api_sleep, 1},
-	{"fileDelete", js_file_unlink, 1},
-	{"system", js_system, 1},
-#ifdef HAVE_CURL
-	{"fetchURL", js_fetchurl, 1},
-	{"fetchURLHash", js_fetchurl_hash, 1},
-	{"fetchURLFile", js_fetchurl_file, 1},
-	{"fetchUrl", js_fetchurl, 1},
-	{"fetchUrlHash", js_fetchurl_hash, 1},
-	{"fetchUrlFile", js_fetchurl_file, 1},
-#endif
-	{0}
-};
-
-static int env_init(JSContext * cx, JSObject * javascript_object)
-{
-	JS_DefineFunctions(cx, javascript_object, fs_functions);
-
-	JS_InitStandardClasses(cx, javascript_object);
-
-	JS_InitClass(cx, javascript_object, NULL, &session_class, session_construct, 3, session_props, session_methods, session_props, session_methods);
-
-	JS_InitClass(cx, javascript_object, NULL, &fileio_class, fileio_construct, 3, fileio_props, fileio_methods, fileio_props, fileio_methods);
-
-	JS_InitClass(cx, javascript_object, NULL, &event_class, event_construct, 3, event_props, event_methods, event_props, event_methods);
-
-	JS_InitClass(cx, javascript_object, NULL, &dtmf_class, dtmf_construct, 3, dtmf_props, dtmf_methods, dtmf_props, dtmf_methods);
-
-	JS_InitClass(cx, javascript_object, NULL, &pcre_class, pcre_construct, 3, pcre_props, pcre_methods, pcre_props, pcre_methods);
-
-	return 1;
-}
-
-static void js_parse_and_execute(switch_core_session_t *session, const char *input_code, struct request_obj *ro, switch_event_t *message)
-{
-	JSObject *javascript_global_object = NULL;
-	char buf[1024], *arg, *argv[512];
-	const char *script;
-	int argc = 0, x = 0, y = 0;
-	unsigned int flags = 0;
-	struct js_session *jss = NULL;
-	JSContext *cx = NULL;
-	jsval rval;
-	struct js_env env = { 0 };
-
-	if (zstr(input_code)) {
-		return;
-	}
-
-	init_js(&env);
-
-	if ((cx = JS_NewContext(env.rt, env.gStackChunkSize))) {
-		JS_BeginRequest(cx);
-		JS_SetErrorReporter(cx, js_error);
-		javascript_global_object = JS_NewObject(cx, &global_class, NULL, NULL);
-		env_init(cx, javascript_global_object);
-		JS_SetGlobalObject(cx, javascript_global_object);
-
-		/* Emaculent conception of session object into the script if one is available */
-		if (!(session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags))) {
-			switch_snprintf(buf, sizeof(buf), "~var session = false;");
-			eval_some_js(buf, cx, javascript_global_object, &rval);
-
-			if (message) {
-				new_js_event(message, "message", cx,  javascript_global_object);
-			}
-
-
-		}
-		if (ro) {
-			new_request(cx, javascript_global_object, ro);
-		}
-
-	} else {
-		abort();
-	}
-
-	script = input_code;
-
-	if (*script != '~') {
-		if ((arg = strchr(script, ' '))) {
-			*arg++ = '\0';
-			argc = switch_separate_string(arg, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-		}
-
-		if (!argc) {
-			switch_snprintf(buf, sizeof(buf), "~var argv = new Array();");
-			eval_some_js(buf, cx, javascript_global_object, &rval);
-		} else {
-			/* create a js doppleganger of this argc/argv */
-			switch_snprintf(buf, sizeof(buf), "~var argv = new Array(%d);", argc);
-			eval_some_js(buf, cx, javascript_global_object, &rval);
-			switch_snprintf(buf, sizeof(buf), "~var argc = %d", argc);
-			eval_some_js(buf, cx, javascript_global_object, &rval);
-
-			for (y = 0; y < argc; y++) {
-				switch_snprintf(buf, sizeof(buf), "~argv[%d] = \"%s\";", x++, argv[y]);
-				eval_some_js(buf, cx, javascript_global_object, &rval);
-			}
-		}
-	}
-
-	if (cx) {
-		eval_some_js(script, cx, javascript_global_object, &rval);
-		JS_DestroyContext(cx);
-	}
-
-
-	JS_DestroyRuntime(env.rt);
-
-	return;
-}
-
-SWITCH_STANDARD_APP(js_dp_function)
-{
-	js_parse_and_execute(session, data, NULL, NULL);
-}
-
-SWITCH_STANDARD_CHAT_APP(js_chat_function)
-{
-
-	js_parse_and_execute(NULL, data, NULL, message);
-
-	return SWITCH_STATUS_SUCCESS;
-
-}
-
-struct js_task {
-	switch_memory_pool_t *pool;
-	char *code;
-};
-
-static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t *thread, void *obj)
-{
-	struct js_task *task = (struct js_task *) obj;
-	switch_memory_pool_t *pool;
-
-	js_parse_and_execute(NULL, task->code, NULL, NULL);
-
-	if ((pool = task->pool)) {
-		switch_core_destroy_memory_pool(&pool);
-	}
-
-	return NULL;
-}
-
-static void js_thread_launch(const char *text)
-{
-	switch_thread_t *thread;
-	switch_threadattr_t *thd_attr = NULL;
-	struct js_task *task;
-	switch_memory_pool_t *pool;
-
-	if (zstr(text)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "missing required input!\n");
-		return;
-	}
-
-	if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n");
-		return;
-	}
-
-	task = switch_core_alloc(pool, sizeof(*task));
-	task->pool = pool;
-	task->code = switch_core_strdup(pool, text);
-
-	switch_threadattr_create(&thd_attr, pool);
-	switch_threadattr_detach_set(thd_attr, 1);
-	switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-	switch_thread_create(&thread, thd_attr, js_thread_run, task, pool);
-}
-
-SWITCH_STANDARD_API(jsapi_function)
-{
-	struct request_obj ro = { 0 };
-	char *path_info = NULL;
-
-	if (stream->param_event) {
-		path_info = switch_event_get_header(stream->param_event, "http-path-info");
-	}
-
-	if (zstr(cmd) && path_info) {
-		cmd = path_info;
-	}
-
-	if (zstr(cmd)) {
-		stream->write_function(stream, "USAGE: %s\n", jsapi_interface->syntax);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	ro.cmd = cmd;
-	ro.session = session;
-	ro.stream = stream;
-
-	js_parse_and_execute(session, (char *) cmd, &ro, NULL);
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(launch_async)
-{
-	if (zstr(cmd)) {
-		stream->write_function(stream, "USAGE: %s\n", js_run_interface->syntax);
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	js_thread_launch(cmd);
-	stream->write_function(stream, "OK\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
-{
-	switch_application_interface_t *app_interface;
-	switch_chat_application_interface_t *chat_app_interface;
-
-	//switch_status_t status;
-
-	//if ((status = init_js()) != SWITCH_STATUS_SUCCESS) {
-	//	return status;
-	//}
-
-	if (load_modules() != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]");
-	SWITCH_ADD_API(jsapi_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]");
-	SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]",
-				   SAF_SUPPORT_NOMEDIA);
-
-	SWITCH_ADD_CHAT_APP(chat_app_interface, "javascript", "execute a js script", "execute a js script", js_chat_function, "<script>", SCAF_NONE);
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_NOUNLOAD;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)
-{
-	switch_core_hash_destroy(&module_manager.mod_hash);
-	switch_core_hash_destroy(&module_manager.load_hash);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h
deleted file mode 100644
index 406fe34441..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey.h -- Javascript Module
- *
- */
-#ifndef SWITCH_MOD_SPIDERMONKEY_H
-#define SWITCH_MOD_SPIDERMONKEY_H
-
-
-#include <switch.h>
-#include "jstypes.h"
-#include "jsarena.h"
-#include "jsutil.h"
-#include "jsprf.h"
-#include "jsapi.h"
-#include "jsatom.h"
-#include "jscntxt.h"
-#include "jsdbgapi.h"
-#include "jsemit.h"
-#include "jsfun.h"
-#include "jsgc.h"
-#include "jslock.h"
-#include "jsobj.h"
-#include "jsparse.h"
-#include "jsscope.h"
-#include "jsscript.h"
-
-SWITCH_BEGIN_EXTERN_C
-#define JS_BUFFER_SIZE 1024 * 32
-#define JS_BLOCK_SIZE JS_BUFFER_SIZE
-#ifdef __ICC
-#pragma warning (disable:310 193 1418)
-#endif
-#ifdef _MSC_VER
-#pragma warning(disable: 4311)
-#endif
-#ifdef WIN32
-#if defined(SWITCH_SM_DECLARE_STATIC)
-#define SWITCH_SM_DECLARE(type)		type __cdecl
-#elif defined(SM_EXPORTS)
-#define SWITCH_SM_DECLARE(type)		__declspec(dllexport) type __cdecl
-#else
-#define SWITCH_SM_DECLARE(type)		__declspec(dllimport) type __cdecl
-#endif
-#else //not win32
-#define SWITCH_SM_DECLARE(type) type
-#endif
-int eval_some_js(const char *code, JSContext * cx, JSObject * obj, jsval * rval)
-{
-	JSScript *script = NULL;
-	const char *cptr;
-	char *path = NULL;
-	const char *script_name = NULL;
-	int result = 0;
-
-	JS_ClearPendingException(cx);
-
-	if (code[0] == '~') {
-		cptr = code + 1;
-		script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1);
-	} else {
-		if (switch_is_file_path(code)) {
-			script_name = code;
-		} else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) {
-			script_name = path;
-		}
-		if (script_name) {
-			if (switch_file_exists(script_name, NULL) == SWITCH_STATUS_SUCCESS) {
-				script = JS_CompileFile(cx, obj, script_name);
-			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", script_name);
-			}
-		}
-	}
-
-	if (script) {
-		result = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0;
-		JS_DestroyScript(cx, script);
-	} else {
-		result = -1;
-	}
-
-	switch_safe_free(path);
-	return result;
-}
-
-
-typedef switch_status_t (*spidermonkey_load_t) (JSContext * cx, JSObject * obj);
-
-struct sm_module_interface {
-	const char *name;
-	spidermonkey_load_t spidermonkey_load;
-	const struct sm_module_interface *next;
-};
-
-typedef struct sm_module_interface sm_module_interface_t;
-typedef switch_status_t (*spidermonkey_init_t) (const sm_module_interface_t ** module_interface);
-
-struct js_session_speech {
-	switch_speech_handle_t sh;
-	switch_codec_t codec;
-	int speaking;
-};
-
-struct js_session {
-	switch_core_session_t *session;
-	JSContext *cx;
-	JSObject *obj;
-	unsigned int flags;
-	switch_call_cause_t cause;
-	JSFunction *on_hangup;
-	int stack_depth;
-	switch_channel_state_t hook_state;
-	char *destination_number;
-	char *dialplan;
-	char *caller_id_name;
-	char *caller_id_number;
-	char *network_addr;
-	char *ani;
-	char *aniii;
-	char *rdnis;
-	char *context;
-	char *username;
-	int check_state;
-	struct js_session_speech *speech;
-};
-
-JSBool DEFAULT_SET_PROPERTY(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	eval_some_js("~throw new Error(\"this property cannot be changed!\");", cx, obj, vp);
-	return JS_FALSE;
-}
-
-
-
-SWITCH_END_EXTERN_C
-#endif
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj
deleted file mode 100644
index 9ef3f8842e..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey.vcproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey"
-	ProjectGUID="{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-	RootNamespace="mod_spidermonkey"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj
deleted file mode 100644
index 51a16de882..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2008.vcproj
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey_core_db"
-	ProjectGUID="{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-	RootNamespace="mod_spidermonkey_core_db"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_core_db.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj
deleted file mode 100644
index 268fdb11b0..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2010.vcxproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_core_db</ProjectName>
-    <ProjectGuid>{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_core_db</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_core_db.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2010.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2010.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
deleted file mode 100644
index 5508881875..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.2012.vcxproj
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_core_db</ProjectName>
-    <ProjectGuid>{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_core_db</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_core_db\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_core_db.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2012.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c
deleted file mode 100644
index caa72fb5c2..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey_DB.c -- DB Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-
-static const char modname[] = "CoreDB";
-
-struct db_obj {
-	switch_memory_pool_t *pool;
-	switch_core_db_t *db;
-	switch_core_db_stmt_t *stmt;
-	char *dbname;
-	char code_buffer[2048];
-	JSContext *cx;
-	JSObject *obj;
-};
-
-
-/* DB Object */
-/*********************************************************************************/
-static JSBool db_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	switch_memory_pool_t *pool;
-	switch_core_db_t *db;
-	struct db_obj *dbo;
-
-	if (argc > 0) {
-		char *dbname = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		switch_core_new_memory_pool(&pool);
-		if (!(db = switch_core_db_open_file(dbname))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open DB!\n");
-			switch_core_destroy_memory_pool(&pool);
-			return JS_FALSE;
-		}
-		dbo = switch_core_alloc(pool, sizeof(*dbo));
-		dbo->pool = pool;
-		dbo->dbname = switch_core_strdup(pool, dbname);
-		dbo->cx = cx;
-		dbo->obj = obj;
-		dbo->db = db;
-		JS_SetPrivate(cx, obj, dbo);
-		return JS_TRUE;
-	}
-
-	return JS_FALSE;
-}
-
-static JSBool db_close(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-
-	if (dbo) {
-		if (dbo->stmt) {
-			switch_core_db_finalize(dbo->stmt);
-			dbo->stmt = NULL;
-		}
-		if (dbo->db) {
-			switch_core_db_close(dbo->db);
-			dbo->db = NULL;
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static void db_destroy(JSContext * cx, JSObject * obj)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-
-	if (dbo) {
-		switch_memory_pool_t *pool = dbo->pool;
-		jsval rval = JS_TRUE;
-
-		db_close(cx, obj, 0, NULL, &rval);
-		switch_core_destroy_memory_pool(&pool);
-		pool = NULL;
-	}
-}
-
-
-static int db_callback(void *pArg, int argc, char **argv, char **columnNames)
-{
-	struct db_obj *dbo = pArg;
-	char code[1024];
-	jsval rval;
-	int x = 0;
-
-	switch_snprintf(code, sizeof(code), "~var _Db_RoW_ = {}");
-	eval_some_js(code, dbo->cx, dbo->obj, &rval);
-
-	for (x = 0; x < argc; x++) {
-		switch_snprintf(code, sizeof(code), "~_Db_RoW_[\"%s\"] = \"%s\"", columnNames[x], argv[x]);
-		eval_some_js(code, dbo->cx, dbo->obj, &rval);
-	}
-
-	switch_snprintf(code, sizeof(code), "~%s(_Db_RoW_)", dbo->code_buffer);
-	eval_some_js(code, dbo->cx, dbo->obj, &rval);
-
-	switch_snprintf(code, sizeof(code), "~delete _Db_RoW_");
-	eval_some_js(code, dbo->cx, dbo->obj, &rval);
-
-	return 0;
-}
-
-static JSBool db_exec(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	*rval = INT_TO_JSVAL(0);
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	if (argc > 0) {
-		char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		char *err = NULL;
-		void *arg = NULL;
-		switch_core_db_callback_func_t cb_func = NULL;
-
-
-		if (argc > 1) {
-			char *js_func = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-			switch_copy_string(dbo->code_buffer, js_func, sizeof(dbo->code_buffer));
-			cb_func = db_callback;
-			arg = dbo;
-		}
-
-		switch_core_db_exec(dbo->db, sql, cb_func, arg, &err);
-		if (err) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", err);
-			switch_core_db_free(err);
-			*rval = INT_TO_JSVAL(-1);
-		} else {
-			int count = switch_core_db_changes(dbo->db);
-
-			*rval = INT_TO_JSVAL(count);
-		}
-	}
-	return JS_TRUE;
-}
-
-
-/* Evaluate a prepared statement
-  stepSuccessCode expected success code from switch_core_db_step() 
-  return true if step return expected success code, false otherwise
-*/
-static JSBool db_step_ex(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval, int stepSuccessCode)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	if (dbo->stmt) {
-		int running = 1;
-		while (running < 5000) {
-			int result = switch_core_db_step(dbo->stmt);
-			if (result == stepSuccessCode) {
-				*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-				break;
-			} else if (result == SWITCH_CORE_DB_BUSY) {
-				running++;
-				switch_cond_next();	/* wait a bit before retrying */
-				continue;
-			}
-			if (switch_core_db_finalize(dbo->stmt) != SWITCH_CORE_DB_OK) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
-			}
-			dbo->stmt = NULL;
-			break;
-		}
-	}
-
-	return JS_TRUE;
-}
-
-/* Evaluate a prepared statement, to be used with statements that return data 
-  return true while data is available, false when done or error
-*/
-static JSBool db_next(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	/* return true until no more rows available */
-	return db_step_ex(cx, obj, argc, argv, rval, SWITCH_CORE_DB_ROW);
-}
-
-/* Evaluate a prepared statement, to be used with statements that return no data 
-  return true if statement has finished executing successfully, false otherwise 
-*/
-static JSBool db_step(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	/* return true when the statement has finished executing successfully */
-	return db_step_ex(cx, obj, argc, argv, rval, SWITCH_CORE_DB_DONE);
-}
-
-
-static JSBool db_fetch(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	int colcount = switch_core_db_column_count(dbo->stmt);
-	char code[1024];
-	int x;
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	switch_snprintf(code, sizeof(code), "~var _dB_RoW_DaTa_ = {}");
-	eval_some_js(code, dbo->cx, dbo->obj, rval);
-	if (*rval == JS_FALSE) {
-		return JS_TRUE;
-	}
-	for (x = 0; x < colcount; x++) {
-		const char *var = (char *) switch_core_db_column_name(dbo->stmt, x);
-		const char *val = (char *) switch_core_db_column_text(dbo->stmt, x);
-
-		if (var && val) {
-			switch_snprintf(code, sizeof(code), "~_dB_RoW_DaTa_[\"%s\"] = \"%s\"", var, val);
-			eval_some_js(code, dbo->cx, dbo->obj, rval);
-			if (*rval == JS_FALSE) {
-				return JS_TRUE;
-			}
-		}
-	}
-
-	JS_GetProperty(cx, obj, "_dB_RoW_DaTa_", rval);
-
-	return JS_TRUE;
-}
-
-
-static JSBool db_prepare(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	if (dbo->stmt) {
-		switch_core_db_finalize(dbo->stmt);
-		dbo->stmt = NULL;
-	}
-
-	if (argc > 0) {
-		char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		if (switch_core_db_prepare(dbo->db, sql, -1, &dbo->stmt, 0)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
-		} else {
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-		}
-	}
-	return JS_TRUE;
-}
-
-static JSBool db_bind_text(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	JSBool status;
-	int32 param_index = -1;
-	char *param_value = NULL;
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	/* db_prepare() must be called first */
-	if (!dbo->stmt) {
-		return JS_FALSE;
-	}
-
-	/* argv[0] = parameter index
-	   argv[1] = parameter value
-	 */
-	if (argc < 2) {
-		return JS_FALSE;
-	}
-
-
-
-	/* convert args */
-	status = JS_ValueToECMAUint32(cx, argv[0], (uint32 *) & param_index);
-	switch_assert(status == JS_TRUE);
-	param_value = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	if ((param_index < 1) || (NULL == param_value)) {
-		return JS_FALSE;
-	}
-
-	/* bind param */
-	if (switch_core_db_bind_text(dbo->stmt, param_index, param_value, -1, SWITCH_CORE_DB_STATIC)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
-		return JS_FALSE;
-	} else {
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool db_bind_int(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	JSBool status;
-	int32 param_index = -1;
-	int32 param_value = -1;
-
-	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-
-	if (!dbo->db) {
-		return JS_FALSE;
-	}
-
-	/* db_prepare() must be called first */
-	if (!dbo->stmt) {
-		return JS_FALSE;
-	}
-
-	/* argv[0] = parameter index
-	   argv[1] = parameter value
-	 */
-	if (argc < 2) {
-		return JS_FALSE;
-	}
-
-	/* convert args */
-	status = JS_ValueToECMAUint32(cx, argv[0], (uint32 *) & param_index);
-	switch_assert(status == JS_TRUE);
-	status = JS_ValueToECMAUint32(cx, argv[1], (uint32 *) & param_value);
-	switch_assert(status == JS_TRUE);
-
-	if (param_index < 1) {
-		return JS_FALSE;
-	}
-
-	/* bind param */
-	if (switch_core_db_bind_int(dbo->stmt, param_index, param_value)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db));
-		return JS_FALSE;
-	} else {
-		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	}
-
-	return JS_TRUE;
-}
-
-enum db_tinyid {
-	DB_NAME
-};
-
-static JSFunctionSpec db_methods[] = {
-	{"exec", db_exec, 1},
-	{"close", db_close, 0},
-	{"next", db_next, 0},
-	{"step", db_step, 0},
-	{"fetch", db_fetch, 1},
-	{"prepare", db_prepare, 0},
-	{"bindText", db_bind_text, 2},
-	{"bindInt", db_bind_int, 2},
-	{0}
-};
-
-
-static JSPropertySpec db_props[] = {
-	{"path", DB_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-
-static JSBool db_setProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	char *name = JS_GetStringBytes(JS_ValueToString(cx, id));
-
-	if (strcmp(name, "_dB_RoW_DaTa_")) {
-		eval_some_js("~throw new Error(\"this property cannot be changed!\");", cx, obj, vp);
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-	}
-	return JS_TRUE;
-}
-
-static JSBool db_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	struct db_obj *dbo = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case DB_NAME:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, dbo->dbname));
-		break;
-	}
-
-	return res;
-}
-
-JSClass db_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, db_getProperty, db_setProperty,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, db_destroy, NULL, NULL, NULL,
-	db_construct
-};
-
-
-switch_status_t db_load(JSContext * cx, JSObject * obj)
-{
-
-	JS_InitClass(cx, obj, NULL, &db_class, db_construct, 3, db_props, db_methods, db_props, db_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t DB_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ db_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &DB_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj
deleted file mode 100644
index d01d002b1c..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_core_db.vcproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey_core_db"
-	ProjectGUID="{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-	RootNamespace="mod_spidermonkey_core_db"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_core_db.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj
deleted file mode 100644
index 6c7333ee00..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2008.vcproj
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey_curl"
-	ProjectGUID="{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-	RootNamespace="mod_spidermonkey_curl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_curl.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
deleted file mode 100644
index 0e2c0a4c95..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_curl</ProjectName>
-    <ProjectGuid>{36E854E3-CE12-4348-A125-CCF3F9D74813}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_curl</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_curl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\curl\curllib.2010.vcxproj">
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\openssl\libeay32.2010.vcxproj">
-      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\openssl\ssleay32.2010.vcxproj">
-      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2010.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
deleted file mode 100644
index 03f1e8a706..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.2012.vcxproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_curl</ProjectName>
-    <ProjectGuid>{36E854E3-CE12-4348-A125-CCF3F9D74813}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_curl</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_curl\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_curl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\curl\curllib.2012.vcxproj">
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\openssl\libeay32.2012.vcxproj">
-      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\openssl\ssleay32.2012.vcxproj">
-      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2012.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c
deleted file mode 100644
index c78bec8e4d..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey_teletone.c -- TeleTone Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-#include <switch_curl.h>
-
-
-static const char modname[] = "CURL";
-
-struct curl_obj {
-	switch_CURL *curl_handle;
-	JSContext *cx;
-	JSObject *obj;
-	JSFunction *function;
-	JSObject *user_data;
-	jsrefcount saveDepth;
-	jsval ret;
-};
-
-
-static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
-{
-	register unsigned int realsize = (unsigned int) (size * nmemb);
-	struct curl_obj *co = data;
-	uintN argc = 0;
-	jsval argv[4];
-
-
-	if (!co) {
-		return 0;
-	}
-	if (co->function) {
-		char *ret;
-		argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyN(co->cx, (char *) ptr, realsize));
-		if (co->user_data) {
-			argv[argc++] = OBJECT_TO_JSVAL(co->user_data);
-		}
-		JS_ResumeRequest(co->cx, co->saveDepth);
-		JS_CallFunction(co->cx, co->obj, co->function, argc, argv, &co->ret);
-		co->saveDepth = JS_SuspendRequest(co->cx);
-
-		if ((ret = JS_GetStringBytes(JS_ValueToString(co->cx, co->ret)))) {
-			if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
-				return realsize;
-			} else {
-				return 0;
-			}
-		}
-	}
-
-	return realsize;
-}
-
-
-/* Curl Object */
-/*********************************************************************************/
-static JSBool curl_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct curl_obj *co = NULL;
-
-	co = malloc(sizeof(*co));
-	switch_assert(co);
-
-	memset(co, 0, sizeof(*co));
-
-	co->cx = cx;
-	co->obj = obj;
-
-	JS_SetPrivate(cx, obj, co);
-
-	return JS_TRUE;
-}
-
-static void curl_destroy(JSContext * cx, JSObject * obj)
-{
-	struct curl_obj *co = JS_GetPrivate(cx, obj);
-	switch_safe_free(co);
-	JS_SetPrivate(cx, obj, NULL);
-}
-
-static JSBool curl_run(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct curl_obj *co = JS_GetPrivate(cx, obj);
-	char *method = NULL, *url, *cred = NULL;
-	char *url_p = NULL, *data = NULL, *durl = NULL;
-	long httpRes = 0;
-	struct curl_slist *headers = NULL;
-	int32 timeout = 0;
-	char ct[80] = "Content-Type: application/x-www-form-urlencoded";
-
-	if (argc < 2 || !co) {
-		return JS_FALSE;
-	}
-
-
-	method = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	url = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-
-	co->curl_handle = switch_curl_easy_init();
-	if (!strncasecmp(url, "https", 5)) {
-		switch_curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
-		switch_curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
-	}
-
-
-	if (argc > 2) {
-		data = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-	}
-
-	if (argc > 3) {
-		co->function = JS_ValueToFunction(cx, argv[3]);
-	}
-
-	if (argc > 4) {
-		JS_ValueToObject(cx, argv[4], &co->user_data);
-	}
-
-	if (argc > 5) {
-		cred = JS_GetStringBytes(JS_ValueToString(cx, argv[5]));
-		if (!zstr(cred)) {
-			switch_curl_easy_setopt(co->curl_handle, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY);
-			switch_curl_easy_setopt(co->curl_handle, CURLOPT_USERPWD, cred);
-		}
-	}
-
-	if (argc > 6) {
-		JS_ValueToInt32(cx, argv[6], &timeout);
-		if (timeout > 0) {
-			switch_curl_easy_setopt(co->curl_handle, CURLOPT_TIMEOUT, timeout);
-		}
-	}
-
-	if (argc > 7) {
-		char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[7]));
-		switch_snprintf(ct, sizeof(ct), "Content-Type: %s", content_type);
-	}
-
-	headers = curl_slist_append(headers, ct);
-
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_HTTPHEADER, headers);
-
-	url_p = url;
-
-	if (!strcasecmp(method, "post")) {
-		switch_curl_easy_setopt(co->curl_handle, CURLOPT_POST, 1);
-		if (!data) {
-			data = "";
-		}
-		switch_curl_easy_setopt(co->curl_handle, CURLOPT_POSTFIELDS, data);
-	} else if (!zstr(data)) {
-		durl = switch_mprintf("%s?%s", url, data);
-		url_p = durl;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Running: method: [%s] url: [%s] data: [%s] cred=[%s] cb: [%s]\n",
-					  method, url_p, data, switch_str_nil(cred), co->function ? "yes" : "no");
-
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_URL, url_p);
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_NOSIGNAL, 1);
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_WRITEFUNCTION, file_callback);
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_WRITEDATA, (void *) co);
-
-	switch_curl_easy_setopt(co->curl_handle, CURLOPT_USERAGENT, "freeswitch-spidermonkey-curl/1.0");
-
-	co->saveDepth = JS_SuspendRequest(cx);
-	switch_curl_easy_perform(co->curl_handle);
-
-	switch_curl_easy_getinfo(co->curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);
-	switch_curl_easy_cleanup(co->curl_handle);
-	curl_slist_free_all(headers);
-	co->curl_handle = NULL;
-	co->function = NULL;
-	JS_ResumeRequest(cx, co->saveDepth);
-	switch_safe_free(durl);
-
-
-	return JS_TRUE;
-}
-
-static JSFunctionSpec curl_methods[] = {
-	{"run", curl_run, 2},
-	{0}
-};
-
-
-static JSPropertySpec curl_props[] = {
-	{0}
-};
-
-static JSBool curl_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-	return res;
-}
-
-JSClass curl_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, curl_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, curl_destroy, NULL, NULL, NULL,
-	curl_construct
-};
-
-
-switch_status_t curl_load(JSContext * cx, JSObject * obj)
-{
-	JS_InitClass(cx, obj, NULL, &curl_class, curl_construct, 3, curl_props, curl_methods, curl_props, curl_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t curl_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ curl_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &curl_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj
deleted file mode 100644
index 632b69c26b..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_curl.vcproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey_curl"
-	ProjectGUID="{2CCED6DC-26FF-40F2-9585-E9E1049A4599}"
-	RootNamespace="mod_spidermonkey_curl"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_curl.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj
deleted file mode 100644
index 74cd439740..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2008.vcproj
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey_odbc"
-	ProjectGUID="{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-	RootNamespace="mod_spidermonkey_odbc"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_odbc.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj
deleted file mode 100644
index eded788457..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2010.vcxproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_odbc</ProjectName>
-    <ProjectGuid>{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_odbc</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_odbc.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2010.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2010.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
deleted file mode 100644
index 44b3c9aaff..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.2012.vcxproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_odbc</ProjectName>
-    <ProjectGuid>{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_odbc</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_odbc\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_odbc.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2012.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c
deleted file mode 100644
index 64ec16aaff..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey_odbc.c -- ODBC Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-
-#include <sql.h>
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4201)
-#include <sqlext.h>
-#pragma warning(pop)
-#else
-#include <sqlext.h>
-#endif
-#include <sqltypes.h>
-
-static const char modname[] = "ODBC";
-
-struct odbc_obj {
-	switch_odbc_handle_t *handle;
-	SQLHSTMT stmt;
-	SQLCHAR *colbuf;
-	int32 cblen;
-	SQLCHAR *code;
-	int32 codelen;
-};
-typedef struct odbc_obj odbc_obj_t;
-
-static odbc_obj_t *new_odbc_obj(char *dsn, char *username, char *password)
-{
-	odbc_obj_t *new_obj;
-
-	if (!(new_obj = malloc(sizeof(*new_obj)))) {
-		goto err;
-	}
-
-	memset(new_obj, 0, sizeof(odbc_obj_t));
-	if (!(new_obj->handle = switch_odbc_handle_new(dsn, username, password))) {
-		goto err;
-	}
-
-	return new_obj;
-
-  err:
-	if (new_obj) {
-		if (new_obj->handle) {
-			switch_odbc_handle_destroy(&new_obj->handle);
-		}
-		switch_safe_free(new_obj);
-	}
-
-	return NULL;
-}
-
-switch_odbc_status_t odbc_obj_connect(odbc_obj_t *obj)
-{
-
-	return switch_odbc_handle_connect(obj->handle);
-}
-
-static void destroy_odbc_obj(odbc_obj_t ** objp)
-{
-	odbc_obj_t *obj = *objp;
-	if (obj == NULL)
-		return;
-	if (obj->stmt) {
-		SQLFreeHandle(SQL_HANDLE_STMT, obj->stmt);
-	}
-	if (obj->handle) {
-		switch_odbc_handle_destroy(&obj->handle);
-	}
-	switch_safe_free(obj->colbuf);
-	switch_safe_free(obj->code);
-	switch_safe_free(obj);
-}
-
-
-/* ODBC Object */
-/*********************************************************************************/
-static JSBool odbc_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = NULL;
-	char *dsn, *username, *password;
-	int32 blen = 1024;
-
-	if (argc < 3) {
-		return JS_FALSE;
-	}
-
-	dsn = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	username = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	password = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));
-
-	if (argc > 3) {
-		int32 len;
-		JS_ValueToInt32(cx, argv[3], &len);
-
-		if (len > 0) {
-			blen = len;
-		}
-	}
-
-	if (zstr(username)) {
-		username = NULL;
-	}
-
-	if (zstr(password)) {
-		password = NULL;
-	}
-
-	if (dsn) {
-		odbc_obj = new_odbc_obj(dsn, username, password);
-	}
-
-	if (!odbc_obj) {
-		return JS_FALSE;
-	}
-
-	if (!(odbc_obj->colbuf = (SQLCHAR *) malloc(blen))) {
-		destroy_odbc_obj(&odbc_obj);
-		return JS_FALSE;
-	}
-
-	odbc_obj->cblen = blen;
-
-	blen += 1536;
-
-	if (!(odbc_obj->code = (SQLCHAR *) malloc(blen))) {
-		destroy_odbc_obj(&odbc_obj);
-		return JS_FALSE;
-	}
-
-	odbc_obj->codelen = blen;
-
-	JS_SetPrivate(cx, obj, odbc_obj);
-
-	return JS_TRUE;
-}
-
-static void odbc_destroy(JSContext * cx, JSObject * obj)
-{
-	odbc_obj_t *odbc_obj;
-	if (obj == NULL)
-		return;
-	odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	if (odbc_obj) {
-		destroy_odbc_obj(&odbc_obj);
-		JS_SetPrivate(cx, obj, NULL);
-	}
-}
-
-static JSBool odbc_connect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	JSBool tf = JS_TRUE;
-
-	if (odbc_obj) {
-		if (odbc_obj_connect(odbc_obj) == SWITCH_ODBC_SUCCESS) {
-			tf = JS_TRUE;
-		} else {
-			tf = JS_FALSE;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database handle is not initialized!\n");
-	}
-
-	*rval = BOOLEAN_TO_JSVAL(tf);
-
-	return JS_TRUE;
-}
-
-static JSBool odbc_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	char *sql;
-	JSBool tf = JS_FALSE;
-	SQLHSTMT stmt;
-
-	if (argc < 1) {
-		goto done;
-	}
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-	if (switch_odbc_handle_exec(odbc_obj->handle, sql, &stmt, NULL) != SWITCH_ODBC_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[ODBC] Execute failed for: %s\n", sql);
-		goto done;
-	}
-
-	SQLFreeHandle(SQL_HANDLE_STMT, stmt);
-
-	tf = JS_TRUE;
-
-  done:
-
-	*rval = BOOLEAN_TO_JSVAL(tf);
-
-	return JS_TRUE;
-}
-
-static JSBool odbc_exec(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	char *sql;
-	JSBool tf = JS_FALSE;
-
-	if (argc < 1) {
-		goto done;
-	}
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	if (odbc_obj->stmt) {
-		SQLFreeHandle(SQL_HANDLE_STMT, odbc_obj->stmt);
-		odbc_obj->stmt = NULL;
-	}
-
-	sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-	if (switch_odbc_handle_exec(odbc_obj->handle, sql, &odbc_obj->stmt, NULL) != SWITCH_ODBC_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[ODBC] query failed: %s\n", sql);
-		goto done;
-	}
-
-	tf = JS_TRUE;
-
-  done:
-
-	*rval = BOOLEAN_TO_JSVAL(tf);
-
-	return JS_TRUE;
-}
-
-static JSBool odbc_num_rows(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	SQLLEN row_count = 0;
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	if (odbc_obj->stmt) {
-		SQLRowCount(odbc_obj->stmt, &row_count);
-	}
-
-  done:
-
-	*rval = INT_TO_JSVAL(row_count);
-
-	return JS_TRUE;
-
-}
-
-
-static JSBool odbc_num_cols(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-
-	SQLSMALLINT cols = 0;
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	if (odbc_obj->stmt) {
-		SQLNumResultCols(odbc_obj->stmt, &cols);
-	}
-
-  done:
-
-	*rval = INT_TO_JSVAL(cols);
-
-	return JS_TRUE;
-
-}
-
-
-static JSBool odbc_next_row(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	int result = 0;
-	JSBool tf = JS_FALSE;
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-
-	if (odbc_obj->stmt) {
-		if ((result = SQLFetch(odbc_obj->stmt) == SQL_SUCCESS)) {
-			tf = JS_TRUE;
-		}
-	}
-
-  done:
-
-	*rval = BOOLEAN_TO_JSVAL(tf);
-
-	return JS_TRUE;
-}
-
-static char *escape_data(char *in, char escapeChar)
-{
-	switch_size_t nlen = strlen(in);
-	uint32_t qc = 0;
-	char *p, *q, *r;
-
-	for (p = in; p && *p; p++) {
-		if (*p == '"') {
-			qc += 2;
-		}
-		if (*p == '\'') {
-			qc += 2;
-		}
-	}
-
-	nlen += qc + 1;
-
-	if (!(q = (char *) malloc(nlen))) {
-		return NULL;
-	}
-
-	r = q;
-	qc = 0;
-	for (p = in; p && *p; p++) {
-		if (*p == '"') {
-			*r++ = escapeChar;
-		}
-		if (*p == '\'') {
-			*r++ = escapeChar;
-		}
-		*r++ = *p;
-		if (++qc > nlen) {
-			break;
-		}
-	}
-
-	*r++ = '\0';
-
-	return q;
-
-}
-
-
-static JSBool odbc_get_data(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-	JSBool tf = JS_FALSE;
-
-	if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	if (odbc_obj->stmt) {
-		SQLSMALLINT nColumns = 0, x = 0;
-
-		eval_some_js("~var _oDbC_dB_RoW_DaTa_ = {}", cx, obj, rval);
-		if (*rval == JS_FALSE) {
-			return JS_TRUE;
-		}
-
-		if (SQLNumResultCols(odbc_obj->stmt, &nColumns) != SQL_SUCCESS)
-			return JS_FALSE;
-
-		for (x = 1; x <= nColumns; x++) {
-			SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable;
-			SQLULEN ColumnSize;
-			SQLCHAR name[1024] = "";
-			SQLCHAR *data = odbc_obj->colbuf;
-			SQLCHAR *esc = NULL;
-
-			SQLDescribeCol(odbc_obj->stmt, x, name, sizeof(name), &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable);
-			SQLGetData(odbc_obj->stmt, x, SQL_C_CHAR, odbc_obj->colbuf, odbc_obj->cblen, NULL);
-
-			if (strchr((char *) odbc_obj->colbuf, '"')) {	/* please don't */
-				esc = (SQLCHAR *) escape_data((char *) odbc_obj->colbuf, '\\');
-				data = esc;
-			}
-
-			switch_snprintf((char *) odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data);
-			switch_safe_free(esc);
-
-			eval_some_js((char *) odbc_obj->code, cx, obj, rval);
-
-			if (*rval == JS_FALSE) {
-				return JS_TRUE;
-			}
-		}
-
-		JS_GetProperty(cx, obj, "_oDbC_dB_RoW_DaTa_", rval);
-		return JS_TRUE;
-
-
-	}
-
-  done:
-
-	*rval = BOOLEAN_TO_JSVAL(tf);
-
-	return JS_TRUE;
-
-}
-
-static JSBool odbc_close(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_destroy(cx, obj);
-	return JS_TRUE;
-}
-
-
-static JSBool odbc_disconnect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj);
-
-	if (!odbc_obj) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database handle is not initialized!\n");
-		goto done;
-	}
-
-	if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");
-		goto done;
-	}
-
-	if (odbc_obj->stmt) {
-		SQLFreeHandle(SQL_HANDLE_STMT, odbc_obj->stmt);
-		odbc_obj->stmt = NULL;
-	}
-
-	switch_odbc_handle_disconnect(odbc_obj->handle);
-
-  done:
-
-	return JS_TRUE;
-}
-
-enum odbc_tinyid {
-	odbc_NAME
-};
-
-static JSFunctionSpec odbc_methods[] = {
-	{"connect", odbc_connect, 1},
-	{"disconnect", odbc_disconnect, 1},
-	{"exec", odbc_exec, 1},
-	{"query", odbc_exec, 1},
-	{"execute", odbc_execute, 1},
-	{"numRows", odbc_num_rows, 1},
-	{"numCols", odbc_num_cols, 1},
-	{"nextRow", odbc_next_row, 1},
-	{"getData", odbc_get_data, 1},
-	{"close", odbc_close, 1},
-	{0}
-};
-
-
-static JSPropertySpec odbc_props[] = {
-	{"name", odbc_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-static JSBool odbc_setProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	char *name = JS_GetStringBytes(JS_ValueToString(cx, id));
-
-	if (strcmp(name, "_oDbC_dB_RoW_DaTa_")) {
-		eval_some_js("~throw new Error(\"this property cannot be changed!\");", cx, obj, vp);
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-	}
-	return JS_TRUE;
-}
-
-static JSBool odbc_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	//int param;
-	char *name = JS_GetStringBytes(JS_ValueToString(cx, id));
-
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		// param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-}
-
-JSClass odbc_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, odbc_getProperty, odbc_setProperty,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, odbc_destroy, NULL, NULL, NULL,
-	odbc_construct
-};
-
-
-switch_status_t odbc_load(JSContext * cx, JSObject * obj)
-{
-	JS_InitClass(cx, obj, NULL, &odbc_class, odbc_construct, 3, odbc_props, odbc_methods, odbc_props, odbc_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t odbc_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ odbc_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &odbc_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj
deleted file mode 100644
index d4a078b037..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_odbc.vcproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey_odbc"
-	ProjectGUID="{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-	RootNamespace="mod_spidermonkey_odbc"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_odbc.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c
deleted file mode 100644
index 54140c5084..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_skel.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey_skel.c -- Skel Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-
-static const char modname[] = "Skel";
-
-/* Skel Object */
-/*********************************************************************************/
-static JSBool skel_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	return JS_TRUE;
-}
-
-static void skel_destroy(JSContext * cx, JSObject * obj)
-{
-}
-
-static JSBool skel_my_method(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	return JS_FALSE;
-}
-
-enum skel_tinyid {
-	SKEL_NAME
-};
-
-static JSFunctionSpec skel_methods[] = {
-	{"myMethod", skel_my_method, 1},
-	{0}
-};
-
-
-static JSPropertySpec skel_props[] = {
-	{"name", SKEL_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-
-static JSBool skel_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-
-	return res;
-}
-
-JSClass skel_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, skel_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, skel_destroy, NULL, NULL, NULL,
-	skel_construct
-};
-
-
-switch_status_t spidermonkey_load(JSContext * cx, JSObject * obj)
-{
-	JS_InitClass(cx, obj, NULL, &skel_class, skel_construct, 3, skel_props, skel_methods, skel_props, skel_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t skel_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ spidermonkey_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &skel_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj
deleted file mode 100644
index e4fb0e2b15..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2008.vcproj
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey_socket"
-	ProjectGUID="{028C7278-05D7-4E18-82FE-BE231B844F41}"
-	RootNamespace="mod_spidermonkey_socket"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_socket.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj
deleted file mode 100644
index 7e585c4fb1..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2010.vcxproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_socket</ProjectName>
-    <ProjectGuid>{028C7278-05D7-4E18-82FE-BE231B844F41}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_socket</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_socket.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2010.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
deleted file mode 100644
index ba1d532426..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.2012.vcxproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_socket</ProjectName>
-    <ProjectGuid>{028C7278-05D7-4E18-82FE-BE231B844F41}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_socket</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_socket\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_socket.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2012.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
deleted file mode 100644
index 9797ea0080..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* 
- * Spidermonkey Socket Module
- * Copyright (C) 2007, Jonas Gauffin <jonas.gauffin@gmail.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Jonas Gauffin
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Jonas Gauffin <jonas.gauffin@gmail.com>
- *
- *
- * mod_spidermonkey_socket.c -- Socket Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-
-static const char modname[] = "Socket";
-
-struct js_socket_obj {
-	switch_socket_t *socket;
-	switch_memory_pool_t *pool;
-	char *read_buffer;
-	switch_size_t buffer_size;
-	int state;
-	jsrefcount saveDepth;
-};
-typedef struct js_socket_obj js_socket_obj_t;
-
-/* Socket Object */
-/*********************************************************************************/
-static JSBool socket_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *js_socket_obj = 0;
-	switch_memory_pool_t *pool;
-	switch_socket_t *socket;
-	switch_status_t ret;
-
-	switch_core_new_memory_pool(&pool);
-	ret = switch_socket_create(&socket, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, pool);
-	if (ret != SWITCH_STATUS_SUCCESS) {
-		switch_core_destroy_memory_pool(&pool);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Failed to create socket, reason: %d.\n", ret);
-		return JS_FALSE;
-	}
-	// allocate information needed by JS to be able to write to the log.
-	// (needed since multitple js sessions can write to the same log)
-	js_socket_obj = switch_core_alloc(pool, sizeof(js_socket_obj_t));
-	js_socket_obj->pool = pool;
-	js_socket_obj->socket = socket;
-	JS_SetPrivate(cx, obj, js_socket_obj);
-	return JS_TRUE;
-}
-
-static void socket_destroy(JSContext * cx, JSObject * obj)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	if (socket == NULL)
-		return;
-
-	if (socket->socket != 0) {
-		socket->saveDepth = JS_SuspendRequest(cx);
-		switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE);
-		switch_socket_close(socket->socket);
-		switch_core_destroy_memory_pool(&socket->pool);
-		JS_ResumeRequest(cx, socket->saveDepth);
-	}
-
-}
-
-static JSBool socket_connect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	if (socket == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n");
-		return JS_FALSE;
-	}
-
-	if (argc == 2) {
-		char *host = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		int32 port;
-		switch_sockaddr_t *addr;
-		switch_status_t ret;
-
-		JS_ValueToInt32(cx, argv[1], &port);
-
-		ret = switch_sockaddr_info_get(&addr, host, AF_INET, (switch_port_t) port, 0, socket->pool);
-		if (ret != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_sockaddr_info_get failed: %d.\n", ret);
-			return JS_FALSE;
-		}
-
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Connecting to: %s:%d.\n", host, port);
-		socket->saveDepth = JS_SuspendRequest(cx);
-		ret = switch_socket_connect(socket->socket, addr);
-		JS_ResumeRequest(cx, socket->saveDepth);
-		if (ret != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_connect failed: %d.\n", ret);
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		} else
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool socket_send(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	if (socket == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n");
-		return JS_FALSE;
-	}
-
-	if (argc == 1) {
-		switch_status_t ret;
-		char *buffer = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		switch_size_t len = strlen(buffer);
-		socket->saveDepth = JS_SuspendRequest(cx);
-		ret = switch_socket_send(socket->socket, buffer, &len);
-		JS_ResumeRequest(cx, socket->saveDepth);
-		if (ret != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret);
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		} else
-			*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool socket_read_bytes(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	if (socket == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n");
-		return JS_FALSE;
-	}
-
-	if (argc == 1) {
-		int32 bytes_to_read;
-		switch_status_t ret;
-		switch_size_t len;
-
-		JS_ValueToInt32(cx, argv[0], &bytes_to_read);
-		len = (switch_size_t) bytes_to_read;
-
-		if (socket->buffer_size < len) {
-			socket->read_buffer = switch_core_alloc(socket->pool, len + 1);
-			socket->buffer_size = bytes_to_read + 1;
-		}
-
-		socket->saveDepth = JS_SuspendRequest(cx);
-		ret = switch_socket_recv(socket->socket, socket->read_buffer, &len);
-		JS_ResumeRequest(cx, socket->saveDepth);
-		if (ret != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret);
-			*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		} else {
-			socket->read_buffer[len] = 0;
-			*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, socket->read_buffer));
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool socket_read(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	char *delimiter = "\n";
-	switch_status_t ret = SWITCH_STATUS_FALSE;
-	switch_size_t len = 1;
-	switch_size_t total_length = 0;
-	int can_run = TRUE;
-	char tempbuf[2];
-
-	if (socket == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n");
-		return JS_FALSE;
-	}
-
-	if (argc == 1) {
-		delimiter = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-	}
-
-	if (socket->read_buffer == 0) {
-		socket->read_buffer = switch_core_alloc(socket->pool, socket->buffer_size);
-	}
-
-	socket->saveDepth = JS_SuspendRequest(cx);
-
-	while (can_run == TRUE) {
-		ret = switch_socket_recv(socket->socket, tempbuf, &len);
-		if (ret != SWITCH_STATUS_SUCCESS)
-			break;
-
-		tempbuf[1] = 0;
-		if (tempbuf[0] == delimiter[0])
-			break;
-		else if (tempbuf[0] == '\r' && delimiter[0] == '\n')
-			continue;
-		else {
-			// Buffer is full, let's increase it.
-			if (total_length == socket->buffer_size - 1) {
-				switch_size_t new_size = socket->buffer_size + 4196;
-				char *new_buffer = switch_core_alloc(socket->pool, socket->buffer_size);
-				memcpy(new_buffer, socket->read_buffer, total_length);
-				socket->buffer_size = new_size;
-				socket->read_buffer = new_buffer;
-			}
-			socket->read_buffer[total_length] = tempbuf[0];
-			++total_length;
-		}
-	}
-	JS_ResumeRequest(cx, socket->saveDepth);
-
-	if (ret != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "socket receive failed: %d.\n", ret);
-		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-	} else {
-		socket->read_buffer[total_length] = 0;
-		*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, socket->read_buffer));
-	}
-	
-
-	return JS_TRUE;
-}
-
-static JSBool socket_close(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	if (socket == NULL) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find js object.\n");
-		return JS_FALSE;
-	}
-
-	socket->saveDepth = JS_SuspendRequest(cx);
-	switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE);
-	switch_socket_close(socket->socket);
-	socket->socket = NULL;
-	JS_ResumeRequest(cx, socket->saveDepth);
-	return JS_TRUE;
-}
-
-static JSFunctionSpec socket_methods[] = {
-	{"connect", socket_connect, 1},
-	{"close", socket_close, 1},
-	{"send", socket_send, 1},
-	{"readBytes", socket_read_bytes, 1},
-	{"read", socket_read, 1},
-	{0}
-};
-
-#define SOCKET_ADDRESS 1
-#define SOCKET_PORT 2
-
-static JSPropertySpec socket_props[] = {
-	{"address", SOCKET_ADDRESS, JSPROP_READONLY | JSPROP_PERMANENT},
-	{"port", SOCKET_PORT, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-
-static JSBool socket_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-//  js_socket_obj_t *socket = JS_GetPrivate(cx, obj);
-	char *name;
-	int param = 0;
-
-	name = JS_GetStringBytes(JS_ValueToString(cx, id));
-	/* numbers are our props anything else is a method */
-	if (name[0] >= 48 && name[0] <= 57) {
-		param = atoi(name);
-	} else {
-		return JS_TRUE;
-	}
-
-	switch (param) {
-	case SOCKET_ADDRESS:
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, "unknown"));
-		break;
-	case SOCKET_PORT:
-		*vp = INT_TO_JSVAL(1234);
-		break;
-	}
-
-	return res;
-}
-
-JSClass socket_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, socket_getProperty, JS_PropertyStub,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, socket_destroy, NULL, NULL, NULL,
-	socket_construct
-};
-
-
-switch_status_t socket_load(JSContext * cx, JSObject * obj)
-{
-	JS_InitClass(cx, obj, NULL, &socket_class, socket_construct, 3, socket_props, socket_methods, socket_props, socket_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t socket_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ socket_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &socket_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj
deleted file mode 100644
index d95cbc890f..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.vcproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey_socket"
-	ProjectGUID="{028C7278-05D7-4E18-82FE-BE231B844F41}"
-	RootNamespace="mod_spidermonkey_socket"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_socket.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj
deleted file mode 100644
index 83a4e8e167..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2008.vcproj
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mod_spidermonkey_teletone"
-	ProjectGUID="{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-	RootNamespace="mod_spidermonkey_teletone"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_teletone.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj
deleted file mode 100644
index f865ae8864..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2010.vcxproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_teletone</ProjectName>
-    <ProjectGuid>{8F992C49-6C51-412F-B2A3-34EAB708EB65}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_teletone</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_teletone.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\libteletone\libteletone.2010.vcxproj">
-      <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2010.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2010.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2010.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
deleted file mode 100644
index b06886a935..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.2012.vcxproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_spidermonkey_teletone</ProjectName>
-    <ProjectGuid>{8F992C49-6C51-412F-B2A3-34EAB708EB65}</ProjectGuid>
-    <RootNamespace>mod_spidermonkey_teletone</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_release.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\w32\winlibs.props" />
-    <Import Project="..\..\..\..\..\w32\module_debug.props" />
-    <Import Project="..\..\..\..\..\w32\spidermonkey.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\mod_spidermonkey_teletone\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\..\libs\libteletone\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Platform)\$(Configuration)/mod/$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_spidermonkey_teletone.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\libs\libteletone\libteletone.2012.vcxproj">
-      <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\libs\win32\js\js.2012.vcxproj">
-      <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mod_spidermonkey.2012.vcxproj">
-      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c
deleted file mode 100644
index 1a7640d667..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_spidermonkey_teletone.c -- TeleTone Javascript Module
- *
- */
-#include "mod_spidermonkey.h"
-#include <libteletone.h>
-
-static const char modname[] = "TeleTone";
-
-typedef enum {
-	TTF_DTMF = (1 << 0)
-} teletone_flag_t;
-
-
-struct teletone_obj {
-	teletone_generation_session_t ts;
-	JSContext *cx;
-	JSObject *obj;
-	switch_core_session_t *session;
-	switch_codec_t codec;
-	switch_buffer_t *audio_buffer;
-	switch_memory_pool_t *pool;
-	switch_timer_t *timer;
-	switch_timer_t timer_base;
-	JSFunction *function;
-	jsval arg;
-	jsval ret;
-	unsigned int flags;
-};
-
-
-static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map)
-{
-	struct teletone_obj *tto = ts->user_data;
-	int wrote;
-
-	if (!tto) {
-		return -1;
-	}
-	wrote = teletone_mux_tones(ts, map);
-	switch_buffer_write(tto->audio_buffer, ts->buffer, wrote * 2);
-
-	return 0;
-}
-
-
-/* TeleTone Object */
-/*********************************************************************************/
-static JSBool teletone_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	JSObject *session_obj;
-	struct teletone_obj *tto = NULL;
-	struct js_session *jss = NULL;
-	switch_memory_pool_t *pool;
-	char *timer_name = NULL;
-	switch_codec_implementation_t read_impl = { 0 };
-
-
-
-	if (argc > 0) {
-		if (JS_ValueToObject(cx, argv[0], &session_obj)) {
-			if (!(jss = JS_GetPrivate(cx, session_obj))) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n");
-				return JS_FALSE;
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [2]\n");
-			return JS_FALSE;
-		}
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Session Arg\n");
-		return JS_FALSE;
-	}
-	if (argc > 1) {
-		timer_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-	}
-
-	switch_core_new_memory_pool(&pool);
-
-	if (!(tto = switch_core_alloc(pool, sizeof(*tto)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n");
-		return JS_FALSE;
-	}
-
-	switch_core_session_get_read_impl(jss->session, &read_impl);
-
-	if (switch_core_codec_init(&tto->codec,
-							   "L16",
-							   NULL,
-							   read_impl.actual_samples_per_second,
-							   read_impl.microseconds_per_packet / 1000,
-							   read_impl.number_of_channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, pool) == SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
-	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed\n");
-		return JS_FALSE;
-	}
-
-	if (timer_name) {
-		unsigned int ms = read_impl.microseconds_per_packet / 1000;
-		if (switch_core_timer_init(&tto->timer_base,
-								   timer_name, ms, (read_impl.samples_per_second / 50) * read_impl.number_of_channels, pool) == SWITCH_STATUS_SUCCESS) {
-			tto->timer = &tto->timer_base;
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timer INIT Success %u\n", ms);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Timer INIT Failed\n");
-		}
-	}
-
-	switch_buffer_create_dynamic(&tto->audio_buffer, JS_BLOCK_SIZE, JS_BUFFER_SIZE, 0);
-	tto->pool = pool;
-	tto->obj = obj;
-	tto->cx = cx;
-	tto->session = jss->session;
-	teletone_init_session(&tto->ts, 0, teletone_handler, tto);
-	JS_SetPrivate(cx, obj, tto);
-
-	return JS_TRUE;
-}
-
-static void teletone_destroy(JSContext * cx, JSObject * obj)
-{
-	struct teletone_obj *tto = JS_GetPrivate(cx, obj);
-	switch_memory_pool_t *pool;
-	if (tto) {
-		if (tto->timer) {
-			switch_core_timer_destroy(tto->timer);
-		}
-		teletone_destroy_session(&tto->ts);
-		switch_buffer_destroy(&tto->audio_buffer);
-		switch_core_codec_destroy(&tto->codec);
-		pool = tto->pool;
-		tto->pool = NULL;
-		if (pool) {
-			switch_core_destroy_memory_pool(&pool);
-		}
-	}
-}
-
-static JSBool teletone_add_tone(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct teletone_obj *tto = JS_GetPrivate(cx, obj);
-	if (argc > 2) {
-		int x;
-        int nmax = argc;
-		char *fval;
-		char *map_str;
-		map_str = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-
-		if ( TELETONE_MAX_TONES < nmax ) {
-			nmax = TELETONE_MAX_TONES;
-		}
-
-		for (x = 1; x < nmax; x++) {
-			fval = JS_GetStringBytes(JS_ValueToString(cx, argv[x]));
-			tto->ts.TONES[(int) *map_str].freqs[x - 1] = strtod(fval, NULL);
-		}
-		return JS_TRUE;
-	}
-
-	return JS_FALSE;
-}
-
-static JSBool teletone_on_dtmf(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct teletone_obj *tto = JS_GetPrivate(cx, obj);
-	if (argc > 0) {
-		tto->function = JS_ValueToFunction(cx, argv[0]);
-		if (argc > 1) {
-			tto->arg = argv[1];
-		}
-		switch_set_flag(tto, TTF_DTMF);
-	}
-	return JS_TRUE;
-}
-
-static JSBool teletone_generate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
-{
-	struct teletone_obj *tto = JS_GetPrivate(cx, obj);
-	int32 loops = 0;
-
-	if (argc > 0) {
-		char *script;
-		switch_core_session_t *session;
-		switch_frame_t write_frame = { 0 };
-		unsigned char *fdata[1024];
-		switch_frame_t *read_frame;
-		switch_channel_t *channel;
-
-		if (argc > 1) {
-			if (!JS_ValueToInt32(cx, argv[1], &loops)) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Convert to INT\n");
-				return JS_FALSE;
-			}
-			loops--;
-		}
-
-		if (tto->audio_buffer) {
-			switch_buffer_zero(tto->audio_buffer);
-		}
-
-		tto->ts.debug = 1;
-		tto->ts.debug_stream = switch_core_get_console();
-
-		script = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
-		teletone_run(&tto->ts, script);
-
-		session = tto->session;
-		write_frame.codec = &tto->codec;
-		write_frame.data = fdata;
-		write_frame.buflen = sizeof(fdata);
-
-		channel = switch_core_session_get_channel(session);
-
-		if (tto->timer) {
-			switch_core_service_session(session);
-		}
-
-		if (loops) {
-			switch_buffer_set_loops(tto->audio_buffer, loops);
-		}
-
-		for (;;) {
-
-			if (switch_test_flag(tto, TTF_DTMF)) {
-				char dtmf[128];
-				char *ret;
-
-				if (switch_channel_has_dtmf(channel)) {
-					uintN aargc = 0;
-					jsval aargv[4];
-
-					switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf));
-					aargv[aargc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, dtmf));
-					JS_CallFunction(cx, obj, tto->function, aargc, aargv, &tto->ret);
-					ret = JS_GetStringBytes(JS_ValueToString(cx, tto->ret));
-					if (strcmp(ret, "true") && strcmp(ret, "undefined")) {
-						*rval = tto->ret;
-						return JS_TRUE;
-					}
-				}
-			}
-
-			if (tto->timer) {
-				if (switch_core_timer_next(tto->timer) != SWITCH_STATUS_SUCCESS) {
-					break;
-				}
-
-			} else {
-				switch_status_t status;
-				status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
-
-				if (!SWITCH_READ_ACCEPTABLE(status)) {
-					break;
-				}
-			}
-			if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(tto->audio_buffer,
-																		  fdata, write_frame.codec->implementation->decoded_bytes_per_packet)) <= 0) {
-				break;
-			}
-
-			write_frame.samples = write_frame.datalen / 2;
-			if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad Write\n");
-				break;
-			}
-		}
-
-		if (tto->timer) {
-			switch_core_thread_session_end(session);
-		}
-		return JS_TRUE;
-	}
-
-	return JS_FALSE;
-}
-
-enum teletone_tinyid {
-	TELETONE_NAME
-};
-
-static JSFunctionSpec teletone_methods[] = {
-	{"generate", teletone_generate, 1},
-	{"onDTMF", teletone_on_dtmf, 1},
-	{"addTone", teletone_add_tone, 10},
-	{0}
-};
-
-
-static JSPropertySpec teletone_props[] = {
-	{"name", TELETONE_NAME, JSPROP_READONLY | JSPROP_PERMANENT},
-	{0}
-};
-
-
-static JSBool teletone_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp)
-{
-	JSBool res = JS_TRUE;
-
-	return res;
-}
-
-JSClass teletone_class = {
-	modname, JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_PropertyStub, teletone_getProperty, DEFAULT_SET_PROPERTY,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, teletone_destroy, NULL, NULL, NULL,
-	teletone_construct
-};
-
-
-switch_status_t teletone_load(JSContext * cx, JSObject * obj)
-{
-	JS_InitClass(cx, obj, NULL, &teletone_class, teletone_construct, 3, teletone_props, teletone_methods, teletone_props, teletone_methods);
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-const sm_module_interface_t teletone_module_interface = {
-	/*.name = */ modname,
-	/*.spidermonkey_load */ teletone_load,
-	/*.next */ NULL
-};
-
-SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
-{
-	*module_interface = &teletone_module_interface;
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj b/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj
deleted file mode 100644
index cdf796ffb0..0000000000
--- a/src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_teletone.vcproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mod_spidermonkey_teletone"
-	ProjectGUID="{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-	RootNamespace="mod_spidermonkey_teletone"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\libteletone\src&quot;"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\mod_spidermonkey_teletone.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

From 02ee686d85df66040cd1158eb41e0e53d31d65d5 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Fri, 18 Jul 2014 19:07:38 +0000
Subject: [PATCH 051/130] Remove remaining traces of mod_spidermonkey

---
 conf/curl/autoload_configs/spidermonkey.conf.xml  | 8 --------
 conf/insideout/autoload_configs/modules.conf.xml  | 1 -
 conf/insideout/dialplan/default/00_pizza_demo.xml | 2 +-
 conf/sbc/dialplan/default/00_pizza_demo.xml       | 2 +-
 conf/vanilla/autoload_configs/modules.conf.xml    | 1 -
 conf/vanilla/dialplan/default/00_pizza_demo.xml   | 2 +-
 configure.ac                                      | 1 -
 debian/copyright                                  | 4 ----
 8 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 conf/curl/autoload_configs/spidermonkey.conf.xml

diff --git a/conf/curl/autoload_configs/spidermonkey.conf.xml b/conf/curl/autoload_configs/spidermonkey.conf.xml
deleted file mode 100644
index 2e6dc6a166..0000000000
--- a/conf/curl/autoload_configs/spidermonkey.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration name="spidermonkey.conf" description="Spider Monkey JavaScript Plug-Ins">
-  <modules>
-    <load module="mod_spidermonkey_teletone"/>
-    <load module="mod_spidermonkey_core_db"/>
-    <load module="mod_spidermonkey_socket"/>
-    <!--<load module="mod_spidermonkey_odbc"/>-->
-  </modules>
-</configuration>
diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml
index 520903fe04..7d056a5b2a 100644
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -78,7 +78,6 @@
     <!-- Timers -->
 
     <!-- Languages -->
-    <!-- <load module="mod_spidermonkey"/> -->
     <load module="mod_v8"/>
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->
diff --git a/conf/insideout/dialplan/default/00_pizza_demo.xml b/conf/insideout/dialplan/default/00_pizza_demo.xml
index e7fcca204a..4b308fe159 100644
--- a/conf/insideout/dialplan/default/00_pizza_demo.xml
+++ b/conf/insideout/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>
diff --git a/conf/sbc/dialplan/default/00_pizza_demo.xml b/conf/sbc/dialplan/default/00_pizza_demo.xml
index e7fcca204a..4b308fe159 100644
--- a/conf/sbc/dialplan/default/00_pizza_demo.xml
+++ b/conf/sbc/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index 4cd8f8e1ce..995a5afb68 100644
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -107,7 +107,6 @@
     <!-- <load module="mod_posix_timer"/> -->
 
     <!-- Languages -->
-    <!-- <load module="mod_spidermonkey"/> -->
     <load module="mod_v8"/>
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->
diff --git a/conf/vanilla/dialplan/default/00_pizza_demo.xml b/conf/vanilla/dialplan/default/00_pizza_demo.xml
index e7fcca204a..4b308fe159 100644
--- a/conf/vanilla/dialplan/default/00_pizza_demo.xml
+++ b/conf/vanilla/dialplan/default/00_pizza_demo.xml
@@ -1,7 +1,7 @@
 <include>
   <extension name="pizza_demo">
     <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
+    <condition field="${module_exists(mod_v8)}" expression="true"/>
     <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
       <action application="javascript" data="ps_pizza.js"/>
     </condition>
diff --git a/configure.ac b/configure.ac
index fcd0161870..df70f63565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1556,7 +1556,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/languages/mod_yaml/Makefile
 		src/mod/languages/mod_basic/Makefile
 		src/mod/legacy/languages/mod_lua/Makefile
-		src/mod/legacy/languages/mod_spidermonkey/Makefile
 		src/mod/loggers/mod_console/Makefile
 		src/mod/loggers/mod_graylog2/Makefile
 		src/mod/loggers/mod_logfile/Makefile
diff --git a/debian/copyright b/debian/copyright
index 954a73e017..809466c74a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1563,10 +1563,6 @@ Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
 Copyright: 1998 Doug Rabson
 License: BSD-2-clause
 
-Files: src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
-Copyright: 2007, Jonas Gauffin <jonas.gauffin@gmail.com>
-License: MPL-1.1
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1

From bf197196a61e2f47e112ed0c0fe98feb0eef2419 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 18 Jul 2014 14:24:44 -0500
Subject: [PATCH 052/130] OpenBSD Auto Build

---
 build/Makefile.openbsd | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 build/Makefile.openbsd

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
new file mode 100644
index 0000000000..88c129b375
--- /dev/null
+++ b/build/Makefile.openbsd
@@ -0,0 +1,51 @@
+#
+# FreeSWITCH auto-build Makefile (OpenBSD 5.x)
+# http://www.freeswitch.org
+# put this file anywhere and type make to
+# create a fully-built freeswitch.git from scratch
+# in that same directory.
+#
+#
+
+PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wget pcre speex libldns
+FSPREFIX=/usr/local/freeswitch
+PREFIX=$(FSPREFIX)
+OPENSSL=1.0.1h
+LIBEDIT=20140618-3.1
+
+freeswitch: has-git deps freeswitch.git/Makefile
+	AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake
+
+freeswitch.git/Makefile: freeswitch.git/configure
+	cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(FSPREFIX)
+
+freeswitch.git/configure: freeswitch.git/bootstrap.sh
+	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize sh bootstrap.sh
+
+freeswitch.git/bootstrap.sh: has-git
+	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git freeswitch.git
+
+install:
+	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake install
+
+clean:
+	@rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
+	(cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
+
+has-git:
+	@git --version || pkg install git
+
+deps: libedit openssl
+	@PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r $(PKG)
+
+openssl: openssl-$(OPENSSL)/Makefile
+openssl-$(OPENSSL)/Makefile: openssl-$(OPENSSL)
+openssl-$(OPENSSL):
+	(test -d $@) || (wget -4 -O $@.tar.gz http://www.openssl.org/source/$@.tar.gz && tar zxfv $@.tar.gz)
+	(cd $@ && ./Configure --prefix=$(PREFIX) BSD-x86_64 shared && make && sudo make install)
+
+libedit: libedit-$(LIBEDIT)/Makefile
+libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
+libedit-$(LIBEDIT):
+	(test -d $@) || (wget -4 -O $@.tar.gz http://thrysoee.dk/editline/$@.tar.gz && tar zxfv $@.tar.gz)
+	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)

From 997e9217219d71b8133dff551b17c65d9fa1b407 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Sat, 19 Jul 2014 00:32:04 +0500
Subject: [PATCH 053/130] add transfer command

---
 html5/verto/demo/index.html                   |  2 ++
 html5/verto/demo/js/verto-min.js              | 10 ++++-----
 html5/verto/js/src/jquery.verto.js            | 21 +++++++++++++------
 .../mod_conference/mod_conference.c           | 16 ++++++++++++++
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index ca4c6b1f47..2ccdde86dc 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -20,6 +20,8 @@
 	color: #eeeeee;
 	background-color: #0000ae;
 	font-face: arial;
+        height:18px;
+        font-size:7pt;
       }     	      
 
       .ctlbtn:hover {
diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index d17c6097c5..a0dcc3cbd9 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -172,16 +172,16 @@ dt.fnUpdate(args.data,index);dt.fnAdjustColumnSizing();break;case"del":dt.fnDele
 if(iserr){obj.errs++;if(obj.errs<3){obj.bootstrap(obj.user_obj);}}else{obj.errs=0;}};la.onChange(la,{action:"init"});};var CONFMAN_SERNO=1;$.verto.confMan=function(verto,params){var confMan=this;conf
 confMan.params=$.extend({tableID:null,statusID:null,mainModID:null,dialog:null,hasVid:false,laData:null,onBroadcast:null,onLaChange:null,onLaRow:null},params);confMan.verto=verto;confMan.serno=CONFMAN_SERNO++;function genMainMod(jq){var play_id="play_"+confMan.serno;var stop_id="stop_"+confMan.serno;var recording_id="recording_"+confMan.serno;var rec_stop_id="recording_stop"+confMan.serno;var div_id="confman_"+confMan.serno;var html="<div id='"+div_id+"'><br>"+"<button class='ctlbtn' id='"+play_id+"'>Play</button>"+"<button class='ctlbtn' id='"+stop_id+"'>Stop</button>"+"<button class='ctlbtn' id='"+recording_id+"'>Record</button>"+"<button class='ctlbtn' id='"+rec_stop_id+"'>Record Stop</button>"
 +"<br><br></div>";jq.html(html);$("#"+play_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("play",null,file);});$("#"+stop_id).click(function(){confMan.modCommand("stop",null,"all");});$("#"+recording_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("recording",null,["start",file]);});$("#"+rec_stop_id).click(function(){confMan.modCommand("recording",null,["stop","all"]);});}
-function genControls(jq,rowid){var x=parseInt(rowid);var kick_id="kick_"+x;var tmute_id="tmute_"+x;var box_id="box_"+x;var volup_id="volume_in_up"+x;var voldn_id="volume_in_dn"+x;var html="<div id='"+box_id+"'>"+"<button class='ctlbtn' id='"+kick_id+"'>KICK</button>"+"<button class='ctlbtn' id='"+tmute_id+"'>MUTE</button>"+"<button class='ctlbtn' id='"+voldn_id+"'>vol -</button>"+"<button class='ctlbtn' id='"+volup_id+"'>vol +</button>"+"</div>";jq.html(html);if(!jq.data("mouse")){$("#"+box_id).hide();}
-jq.mouseover(function(e){jq.data({"mouse":true});$("#"+box_id).show();});jq.mouseout(function(e){jq.data({"mouse":false});$("#"+box_id).hide();});$("#"+kick_id).click(function(){confMan.modCommand("kick",x);});$("#"+tmute_id).click(function(){confMan.modCommand("tmute",x);});$("#"+volup_id).click(function(){confMan.modCommand("volume_in",x,"up");});$("#"+voldn_id).click(function(){confMan.modCommand("volume_in",x,"down");});return html;}
+function genControls(jq,rowid){var x=parseInt(rowid);var kick_id="kick_"+x;var tmute_id="tmute_"+x;var box_id="box_"+x;var volup_id="volume_in_up"+x;var voldn_id="volume_in_dn"+x;var transfer_id="transfer"+x;var html="<div id='"+box_id+"'>"+"<button class='ctlbtn' id='"+kick_id+"'>Kick</button>"+"<button class='ctlbtn' id='"+tmute_id+"'>Mute</button>"+"<button class='ctlbtn' id='"+voldn_id+"'>Vol -</button>"+"<button class='ctlbtn' id='"+volup_id+"'>Vol +</button>"+"<button class='ctlbtn' id='"+transfer_id+"'>Transfer</button>"+"</div>";jq.html(html);if(!jq.data("mouse")){$("#"+box_id).hide();}
+jq.mouseover(function(e){jq.data({"mouse":true});$("#"+box_id).show();});jq.mouseout(function(e){jq.data({"mouse":false});$("#"+box_id).hide();});$("#"+transfer_id).click(function(){var xten=prompt("Enter Extension");confMan.modCommand("transfer",x,xten);});$("#"+kick_id).click(function(){confMan.modCommand("kick",x);});$("#"+tmute_id).click(function(){confMan.modCommand("tmute",x);});$("#"+volup_id).click(function(){confMan.modCommand("volume_in",x,"up");});$("#"+voldn_id).click(function(){confMan.modCommand("volume_in",x,"down");});return html;}
 var atitle="";var awidth=0;$(".jsDataTable").width(confMan.params.hasVid?"900px":"800px");if(confMan.params.laData.role==="moderator"){atitle="Action";awidth=200;if(confMan.params.mainModID){genMainMod($(confMan.params.mainModID));$(confMan.params.displayID).html("Moderator Controls Ready<br><br>")}else{$(confMan.params.mainModID).html("");}
 verto.subscribe(confMan.params.laData.modChannel,{handler:function(v,e){console.error("MODDATA:",e.data);if(confMan.params.onBroadcast){confMan.params.onBroadcast(verto,confMan,e.data);}
-if(confMan.params.displayID){$(confMan.params.displayID).html(e.data.response+"<br><br>");if(confMan.lastTimeout){clearTimeout(confMan.lastTimeout);confMan.lastTimeout=0;}
-confMan.lastTimeout=setTimeout(function(){$(confMan.params.displayID).html("Moderator Controls Ready<br><br>")},4000);}}});}
+if(!confMan.destroyed&&confMan.params.displayID){$(confMan.params.displayID).html(e.data.response+"<br><br>");if(confMan.lastTimeout){clearTimeout(confMan.lastTimeout);confMan.lastTimeout=0;}
+confMan.lastTimeout=setTimeout(function(){$(confMan.params.displayID).html(confMan.destroyed?"":"Moderator Controls Ready<br><br>")},4000);}}});}
 var row_callback=null;if(confMan.params.laData.role==="moderator"){row_callback=function(nRow,aData,iDisplayIndex,iDisplayIndexFull){if(!aData[5]){var $row=$('td:eq(5)',nRow);genControls($row,aData);if(confMan.params.onLaRow){confMan.params.onLaRow(verto,confMan,$row,aData);}}};}
 confMan.lt=new $.verto.liveTable(verto,confMan.params.laData.laChannel,confMan.params.laData.laName,$(confMan.params.tableID),{subParams:{callID:confMan.params.dialog?confMan.params.dialog.callID:null},"onChange":function(obj,args){$(confMan.params.statusID).text("Conference Members: "+" ("+obj.arrayLen()+" Total)");if(confMan.params.onLaChange){confMan.params.onLaChange(verto,confMan,$.verto.enum.confEvent.laChange,obj,args);}},"aaData":[],"aoColumns":[{"sTitle":"ID"},{"sTitle":"Number"},{"sTitle":"Name"},{"sTitle":"Codec"},{"sTitle":"Status","sWidth":confMan.params.hasVid?"300px":"150px"},{"sTitle":atitle,"sWidth":awidth,}],"bAutoWidth":true,"bDestroy":true,"bSort":false,"bInfo":false,"bFilter":false,"bLengthChange":false,"bPaginate":false,"iDisplayLength":1000,"oLanguage":{"sEmptyTable":"The Conference is Empty....."},"fnRowCallback":row_callback});}
 $.verto.confMan.prototype.modCommand=function(cmd,id,value){var confMan=this;confMan.verto.sendMethod("verto.broadcast",{"eventChannel":confMan.params.laData.modChannel,"data":{"application":"conf-control","command":cmd,"id":id,"value":value}});}
-$.verto.confMan.prototype.destroy=function(){var confMan=this;if(confMan.lt){confMan.lt.destroy();}
+$.verto.confMan.prototype.destroy=function(){var confMan=this;confMan.destroyed=true;if(confMan.lt){confMan.lt.destroy();}
 if(confMan.params.laData.modChannel){confMan.verto.unsubscribe(confMan.params.laData.modChannel);}
 if(confMan.params.mainModID){$(confMan.params.mainModID).html("");}}
 $.verto.dialog=function(direction,verto,params){var dialog=this;dialog.params=$.extend({useVideo:verto.options.useVideo,useStereo:verto.options.useStereo,tag:verto.options.tag},params);dialog.verto=verto;dialog.direction=direction;dialog.lastState=null;dialog.state=dialog.lastState=$.verto.enum.state.new;dialog.callbacks=verto.callbacks;dialog.answered=false;dialog.attach=params.attach||false;if(dialog.params.callID){dialog.callID=dialog.params.callID;}else{dialog.callID=dialog.params.callID=generateGUID();}
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 39c96dd4dd..5c847d8364 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1192,13 +1192,15 @@
 	    var box_id = "box_" + x;
 	    var volup_id = "volume_in_up" + x;
 	    var voldn_id = "volume_in_dn" + x;
+	    var transfer_id = "transfer" + x;
 
 	    
 	    var html = "<div id='" + box_id + "'>" + 
-		"<button class='ctlbtn' id='" + kick_id + "'>KICK</button>" + 
-		"<button class='ctlbtn' id='" + tmute_id + "'>MUTE</button>" +
-		"<button class='ctlbtn' id='" + voldn_id + "'>vol -</button>" +
-		"<button class='ctlbtn' id='" + volup_id + "'>vol +</button>" +
+		"<button class='ctlbtn' id='" + kick_id + "'>Kick</button>" + 
+		"<button class='ctlbtn' id='" + tmute_id + "'>Mute</button>" +
+		"<button class='ctlbtn' id='" + voldn_id + "'>Vol -</button>" +
+		"<button class='ctlbtn' id='" + volup_id + "'>Vol +</button>" +
+		"<button class='ctlbtn' id='" + transfer_id + "'>Transfer</button>" +
 		"</div>"
 	    ;
 	    
@@ -1218,6 +1220,11 @@
 		$("#" + box_id).hide();
 	    });
 
+	    $("#" + transfer_id).click(function() {
+		var xten = prompt("Enter Extension");
+		confMan.modCommand("transfer", x, xten);
+	    });
+
 	    $("#" + kick_id).click(function() {
 		confMan.modCommand("kick", x);
 	    });
@@ -1261,13 +1268,13 @@
 		    if (confMan.params.onBroadcast) {
 			confMan.params.onBroadcast(verto, confMan, e.data);
 		    }
-		    if (confMan.params.displayID) {
+		    if (!confMan.destroyed && confMan.params.displayID) {
 			$(confMan.params.displayID).html(e.data.response + "<br><br>");
 			if (confMan.lastTimeout) {
 			    clearTimeout(confMan.lastTimeout);
 			    confMan.lastTimeout = 0;
 			}
-			confMan.lastTimeout = setTimeout(function() { $(confMan.params.displayID).html("Moderator Controls Ready<br><br>")}, 4000);
+			confMan.lastTimeout = setTimeout(function() { $(confMan.params.displayID).html(confMan.destroyed ? "" : "Moderator Controls Ready<br><br>")}, 4000);
 		    }
 
 		}
@@ -1361,6 +1368,8 @@
     $.verto.confMan.prototype.destroy = function() {
 	var confMan = this;
 
+	confMan.destroyed = true;
+
 	if (confMan.lt) {
 	    confMan.lt.destroy();
 	}
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 274362744d..36430e1e14 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1590,6 +1590,22 @@ static void conference_mod_event_channel_handler(const char *event_channel, cJSO
 			argv[1] = "all";
 		}
 		exec = switch_mprintf("%s %s %s %s", conf_name, action, argv[0], argv[1]);
+
+	} else if (!strcasecmp(action, "transfer") && cid) {
+		conference_member_t *member;
+		conference_obj_t *conference;
+
+		exec = switch_mprintf("%s %s %s", argv[0], switch_str_nil(argv[1]), switch_str_nil(argv[2]));
+		stream.write_function(&stream, "+OK Call transferred to %s", argv[0]);
+
+		if ((conference = conference_find(conf_name, NULL))) {
+			if ((member = conference_member_get(conference, cid))) {
+				switch_ivr_session_transfer(member->session, argv[0], argv[1], argv[2]);
+				switch_thread_rwlock_unlock(member->rwlock);
+			}
+			switch_thread_rwlock_unlock(conference->rwlock); 
+		}
+		goto end;
 	}
 
 	if (exec) {

From ff2edeb219aa450d7366c0d9e8f02afca2f388a2 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Sat, 19 Jul 2014 00:42:49 +0500
Subject: [PATCH 054/130] add blind-reg param to verto

---
 conf/vanilla/autoload_configs/verto.conf.xml | 2 ++
 src/mod/endpoints/mod_verto/mod_verto.c      | 5 +++++
 src/mod/endpoints/mod_verto/mod_verto.h      | 1 +
 3 files changed, 8 insertions(+)

diff --git a/conf/vanilla/autoload_configs/verto.conf.xml b/conf/vanilla/autoload_configs/verto.conf.xml
index 6d84929baf..12897b0431 100644
--- a/conf/vanilla/autoload_configs/verto.conf.xml
+++ b/conf/vanilla/autoload_configs/verto.conf.xml
@@ -11,6 +11,8 @@
       <param name="secure-combined" value="/usr/local/freeswitch/certs/wss.pem"/>
       <param name="secure-chain" value="/usr/local/freeswitch/certs/wss.pem"/>
       <param name="userauth" value="true"/>
+      <!-- setting this to true will allow anyone to register even with no account so use with care -->
+      <param name="blind-reg" value="false"/>
       <param name="mcast-ip" value="224.1.1.1"/>
       <param name="mcast-port" value="1337"/>
       <param name="rtp-ip" value="$${local_ip_v4}"/>
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 335e3e0c06..61ba82f93b 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -916,6 +916,9 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 		switch_event_destroy(&req_params);
 	}
 
+	if (jsock->profile->blind_reg) {
+		r = SWITCH_TRUE;
+	}
 	
  end:
 
@@ -3531,6 +3534,8 @@ static switch_status_t parse_config(const char *cf)
 					profile->inbound_codec_string = switch_core_strdup(profile->pool, val); 
 				} else if (!strcasecmp(var, "outbound-codec-string") && !zstr(val)) {
 					profile->outbound_codec_string = switch_core_strdup(profile->pool, val); 
+				} else if (!strcasecmp(var, "blind-reg") && !zstr(val)) {
+					profile->blind_reg = switch_true(val);
 				} else if (!strcasecmp(var, "userauth") && !zstr(val)) {
 					profile->userauth = switch_core_strdup(profile->pool, val);
 				} else if (!strcasecmp(var, "root-password") && !zstr(val)) {
diff --git a/src/mod/endpoints/mod_verto/mod_verto.h b/src/mod/endpoints/mod_verto/mod_verto.h
index 84a98649b9..db61cdedd1 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.h
+++ b/src/mod/endpoints/mod_verto/mod_verto.h
@@ -187,6 +187,7 @@ struct verto_profile_s {
 	int debug;
 	
 	int in_thread;
+	int blind_reg;
 
 	char *userauth;
 	char *root_passwd;

From 58a33988a3ad016eb1d9b39c5082d1d9be715ada Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 12:21:18 +0200
Subject: [PATCH 055/130] spandsp: Add missing include for alloc.h. This fixes
 a build error on Windows.

---
 libs/spandsp/src/spandsp/fir.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/spandsp/src/spandsp/fir.h b/libs/spandsp/src/spandsp/fir.h
index 85be5d2a6f..554a36c372 100644
--- a/libs/spandsp/src/spandsp/fir.h
+++ b/libs/spandsp/src/spandsp/fir.h
@@ -38,6 +38,8 @@
 #include "mmx.h"
 #endif
 
+#include "alloc.h"
+
 /*!
     16 bit integer FIR descriptor. This defines the working state for a single
     instance of an FIR filter using 16 bit integer coefficients.

From 730cd201c471e06665cc52aaa37c0a883507a37a Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 12:10:43 +0200
Subject: [PATCH 056/130] Remove js and mod_spidermonkey from Windows build

---
 Freeswitch.2005.unsupported.sln         |  123 ---
 Freeswitch.2008.express.unsupported.sln |  127 ---
 Freeswitch.2008.unsupported.sln         |  123 ---
 Freeswitch.2010.express.sln             |  245 ------
 Freeswitch.2010.sln                     |  148 ----
 Freeswitch.2012.sln                     |  124 ---
 libs/win32/js/cleancount                |    1 -
 libs/win32/js/fdlibm.vcproj             |  471 -----------
 libs/win32/js/js.2008.vcproj            | 1025 -----------------------
 libs/win32/js/js.2010.vcxproj           |  410 ---------
 libs/win32/js/js.2010.vcxproj.filters   |  464 ----------
 libs/win32/js/js.2012.vcxproj           |  414 ---------
 libs/win32/js/js.2012.vcxproj.filters   |  464 ----------
 libs/win32/js/js.vcproj                 |  829 ------------------
 w32/spidermonkey.props                  |   18 -
 w32/spidermonkey.vsprops                |   17 -
 16 files changed, 5003 deletions(-)
 delete mode 100644 libs/win32/js/cleancount
 delete mode 100644 libs/win32/js/fdlibm.vcproj
 delete mode 100644 libs/win32/js/js.2008.vcproj
 delete mode 100644 libs/win32/js/js.2010.vcxproj
 delete mode 100644 libs/win32/js/js.2010.vcxproj.filters
 delete mode 100644 libs/win32/js/js.2012.vcxproj
 delete mode 100644 libs/win32/js/js.2012.vcxproj.filters
 delete mode 100644 libs/win32/js/js.vcproj
 delete mode 100644 w32/spidermonkey.props
 delete mode 100644 w32/spidermonkey.vsprops

diff --git a/Freeswitch.2005.unsupported.sln b/Freeswitch.2005.unsupported.sln
index ea05e55ec1..4beeb1b5a7 100644
--- a/Freeswitch.2005.unsupported.sln
+++ b/Freeswitch.2005.unsupported.sln
@@ -91,14 +91,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libtele
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{0C808854-54D1-4230-BFF5-77B5FD905000}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.vcproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}"
@@ -208,8 +200,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
@@ -243,23 +233,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
@@ -268,14 +241,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applica
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
@@ -365,13 +330,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-	ProjectSection(ProjectDependencies) = postProject
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -443,7 +401,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\autoload_configs\portaudio.conf.xml = conf\autoload_configs\portaudio.conf.xml
 		conf\autoload_configs\rss.conf.xml = conf\autoload_configs\rss.conf.xml
 		conf\autoload_configs\sofia.conf.xml = conf\autoload_configs\sofia.conf.xml
-		conf\autoload_configs\spidermonkey.conf.xml = conf\autoload_configs\spidermonkey.conf.xml
 		conf\autoload_configs\switch.conf.xml = conf\autoload_configs\switch.conf.xml
 		conf\autoload_configs\syslog.conf.xml = conf\autoload_configs\syslog.conf.xml
 		conf\autoload_configs\voicemail.conf.xml = conf\autoload_configs\voicemail.conf.xml
@@ -544,7 +501,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		debug\conf\autoload_configs\portaudio.conf.xml = debug\conf\autoload_configs\portaudio.conf.xml
 		debug\conf\autoload_configs\rss.conf.xml = debug\conf\autoload_configs\rss.conf.xml
 		debug\conf\autoload_configs\sofia.conf.xml = debug\conf\autoload_configs\sofia.conf.xml
-		debug\conf\autoload_configs\spidermonkey.conf.xml = debug\conf\autoload_configs\spidermonkey.conf.xml
 		debug\conf\autoload_configs\switch.conf.xml = debug\conf\autoload_configs\switch.conf.xml
 		debug\conf\autoload_configs\syslog.conf.xml = debug\conf\autoload_configs\syslog.conf.xml
 		debug\conf\autoload_configs\voicemail.conf.xml = debug\conf\autoload_configs\voicemail.conf.xml
@@ -642,7 +598,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		release\conf\autoload_configs\portaudio.conf.xml = release\conf\autoload_configs\portaudio.conf.xml
 		release\conf\autoload_configs\rss.conf.xml = release\conf\autoload_configs\rss.conf.xml
 		release\conf\autoload_configs\sofia.conf.xml = release\conf\autoload_configs\sofia.conf.xml
-		release\conf\autoload_configs\spidermonkey.conf.xml = release\conf\autoload_configs\spidermonkey.conf.xml
 		release\conf\autoload_configs\switch.conf.xml = release\conf\autoload_configs\switch.conf.xml
 		release\conf\autoload_configs\syslog.conf.xml = release\conf\autoload_configs\syslog.conf.xml
 		release\conf\autoload_configs\voicemail.conf.xml = release\conf\autoload_configs\voicemail.conf.xml
@@ -742,14 +697,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voipcodecs", "src\mod\c
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.vcproj", "{2CCED6DC-26FF-40F2-9585-E9E1049A4599}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applications\mod_fsv\mod_fsv.vcproj", "{4AE157CF-F2DD-4B5D-A1EE-4AC173B4F9AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -923,15 +870,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.ActiveCfg = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.Build.0 = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|Win32
@@ -1119,15 +1057,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.Build.0 = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|Win32
@@ -1182,24 +1111,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.ActiveCfg = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.Build.0 = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.ActiveCfg = Release|Win32
@@ -1218,15 +1129,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.ActiveCfg = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.Build.0 = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|Win32
@@ -1299,15 +1201,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.ActiveCfg = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.Build.0 = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|Win32
@@ -1434,15 +1327,6 @@ Global
 		{9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|Win32.ActiveCfg = Release|Win32
 		{9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|Win32.Build.0 = Release|Win32
 		{9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|x64.ActiveCfg = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.All|Win32.ActiveCfg = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.All|Win32.Build.0 = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.All|x64.ActiveCfg = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Debug|x64.ActiveCfg = Debug|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Release|Win32.Build.0 = Release|Win32
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599}.Release|x64.ActiveCfg = Release|Win32
 		{4AE157CF-F2DD-4B5D-A1EE-4AC173B4F9AC}.All|Win32.ActiveCfg = Release|Win32
 		{4AE157CF-F2DD-4B5D-A1EE-4AC173B4F9AC}.All|Win32.Build.0 = Release|Win32
 		{4AE157CF-F2DD-4B5D-A1EE-4AC173B4F9AC}.All|x64.ActiveCfg = Release|Win32
@@ -1638,7 +1522,6 @@ Global
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -1655,12 +1538,6 @@ Global
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{2CCED6DC-26FF-40F2-9585-E9E1049A4599} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
diff --git a/Freeswitch.2008.express.unsupported.sln b/Freeswitch.2008.express.unsupported.sln
index 2c2adaced0..c054263e3b 100644
--- a/Freeswitch.2008.express.unsupported.sln
+++ b/Freeswitch.2008.express.unsupported.sln
@@ -74,14 +74,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2008.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.2008.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.2008.vcproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -180,8 +172,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2008.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2008.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2008.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
@@ -217,37 +207,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2008.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{23B4D303-79FC-49E0-89E2-2280E7E28940} = {23B4D303-79FC-49E0-89E2-2280E7E28940}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2008.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -289,13 +254,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2008.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -367,14 +325,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applicat
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2008.vcproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -818,17 +768,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.Build.0 = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.Build.0 = Release|x64
@@ -1057,17 +996,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1134,28 +1062,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.Build.0 = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|Win32.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.Build.0 = Release|x64
@@ -1167,17 +1073,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.Build.0 = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
@@ -1266,17 +1161,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.Build.0 = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
@@ -1431,17 +1315,6 @@ Global
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|Win32.Build.0 = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.Build.0 = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.Build.0 = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
diff --git a/Freeswitch.2008.unsupported.sln b/Freeswitch.2008.unsupported.sln
index 1b121b30d9..6c90369c67 100644
--- a/Freeswitch.2008.unsupported.sln
+++ b/Freeswitch.2008.unsupported.sln
@@ -85,7 +85,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\portaudio.conf.xml = conf\vanilla\autoload_configs\portaudio.conf.xml
 		conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml
 		conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml
-		conf\vanilla\autoload_configs\spidermonkey.conf.xml = conf\vanilla\autoload_configs\spidermonkey.conf.xml
 		conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml
 		conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml
 		conf\vanilla\autoload_configs\voicemail.conf.xml = conf\vanilla\autoload_configs\voicemail.conf.xml
@@ -239,14 +238,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2008.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.2008.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.2008.vcproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -346,8 +337,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2008.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2008.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2008.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
@@ -385,37 +374,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2008.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{23B4D303-79FC-49E0-89E2-2280E7E28940} = {23B4D303-79FC-49E0-89E2-2280E7E28940}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2008.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -457,13 +421,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2008.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -535,14 +492,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applicat
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\languages\mod_spidermonkey\mod_spidermonkey_curl.2008.vcproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2008.vcproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -1115,15 +1064,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.Build.0 = Release|x64
@@ -1351,17 +1291,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1429,24 +1358,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|Win32.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.Build.0 = Release|x64
@@ -1458,15 +1369,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
@@ -1555,15 +1457,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
@@ -1718,15 +1611,6 @@ Global
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|Win32.Build.0 = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
@@ -2834,12 +2718,6 @@ Global
 		{38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{36E854E3-CE12-4348-A125-CCF3F9D74813} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
@@ -2863,7 +2741,6 @@ Global
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
diff --git a/Freeswitch.2010.express.sln b/Freeswitch.2010.express.sln
index 895a8a5407..8837d349f7 100644
--- a/Freeswitch.2010.express.sln
+++ b/Freeswitch.2010.express.sln
@@ -23,8 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2010.vcxproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey.2010.vcxproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.2010.vcxproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.2010.vcxproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
@@ -73,8 +71,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2010.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2010.vcxproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2010.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.2010.vcxproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}"
@@ -87,14 +83,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codec
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2010.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_core_db.2010.vcxproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_teletone.2010.vcxproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2010.vcxproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_odbc.2010.vcxproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2010.vcxproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2010.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
@@ -111,8 +101,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applicat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2010.vcxproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_socket.2010.vcxproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2010.vcxproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_de", "src\mod\say\mod_say_de\mod_say_de.2010.vcxproj", "{5BC072DB-3826-48EA-AF34-FE32AA01E83B}"
@@ -141,8 +129,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applications\mod_fsv\mod_fsv.2010.vcxproj", "{E3246D17-E29B-4AB5-962A-C69B0C5837BB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_curl.2010.vcxproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2010.vcxproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abyss", "libs\win32\xmlrpc-c\abyss.2010.vcxproj", "{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}"
@@ -730,38 +716,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.Build.0 = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Dynamic|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_SSE2|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.Build.0 = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.ActiveCfg = Release|x64
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|x64.Build.0 = Release|x64
@@ -1398,38 +1352,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Dynamic|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_SSE2|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1623,70 +1545,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.Build.0 = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Dynamic|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_SSE2|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.Build.0 = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Dynamic|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_SSE2|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.Build.0 = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|Win32.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.All|x64.Build.0 = Release|x64
@@ -1719,38 +1577,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.Build.0 = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Dynamic|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_SSE2|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.Build.0 = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
@@ -2007,38 +1833,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.Build.0 = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Dynamic|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_SSE2|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.Build.0 = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
@@ -2487,38 +2281,6 @@ Global
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|Win32.Build.0 = Release|Win32
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug_RTL_dll|x64.Build.0 = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.Build.0 = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic_SSE|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Dynamic|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_RTL_dll|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_RTL_dll|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_RTL_dll|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE2|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE2|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_SSE2|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Static_SSE|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Static_SSE|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release_Static_SSE|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.Build.0 = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
@@ -5793,7 +5555,6 @@ Global
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -5825,12 +5586,6 @@ Global
 		{56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{36E854E3-CE12-4348-A125-CCF3F9D74813} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index e6618c04f4..4ba6c5ab1e 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -85,7 +85,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\portaudio.conf.xml = conf\vanilla\autoload_configs\portaudio.conf.xml
 		conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml
 		conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml
-		conf\vanilla\autoload_configs\spidermonkey.conf.xml = conf\vanilla\autoload_configs\spidermonkey.conf.xml
 		conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml
 		conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml
 		conf\vanilla\autoload_configs\v8.conf.xml = conf\vanilla\autoload_configs\v8.conf.xml
@@ -193,8 +192,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2010.vcxproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey.2010.vcxproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8", "src\mod\languages\mod_v8\mod_v8.2010.vcxproj", "{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8_skel", "src\mod\languages\mod_v8\mod_v8_skel.2010.vcxproj", "{8B754330-A434-4791-97E5-1EE67060BAC0}"
@@ -247,8 +244,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2010.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2010.vcxproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2010.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.2010.vcxproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}"
@@ -261,16 +256,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iSAC", "src\mod\codecs\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2010.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_core_db.2010.vcxproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_teletone.2010.vcxproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2010.vcxproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2010.vcxproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_odbc.2010.vcxproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2010.vcxproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2010.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
@@ -287,8 +276,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applicat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2010.vcxproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_socket.2010.vcxproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2010.vcxproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_de", "src\mod\say\mod_say_de\mod_say_de.2010.vcxproj", "{5BC072DB-3826-48EA-AF34-FE32AA01E83B}"
@@ -317,8 +304,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applications\mod_fsv\mod_fsv.2010.vcxproj", "{E3246D17-E29B-4AB5-962A-C69B0C5837BB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_curl.2010.vcxproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2010.vcxproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download sphinxbase", "libs\win32\Download sphinxbase.2010.vcxproj", "{4F92B672-DADB-4047-8D6A-4BB3796733FD}"
@@ -819,24 +804,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64 Setup.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x86 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.Build.0 = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|Win32.ActiveCfg = Release|x64
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|x64.ActiveCfg = Release|x64
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|x64.Build.0 = Release|x64
@@ -1243,24 +1210,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64 Setup.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x86 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64 Setup.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1371,42 +1320,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64 Setup.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x86 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.Build.0 = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x86 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.Build.0 = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.Build.0 = Release|x64
@@ -1439,24 +1352,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64 Setup.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x86 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.Build.0 = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
@@ -1601,24 +1496,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64 Setup.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x86 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.Build.0 = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
@@ -1871,24 +1748,6 @@ Global
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64 Setup.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x86 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.Build.0 = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
@@ -4242,7 +4101,6 @@ Global
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -4281,14 +4139,8 @@ Global
 		{ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{8B754330-A434-4791-97E5-1EE67060BAC0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{36E854E3-CE12-4348-A125-CCF3F9D74813} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index 3cf6c57149..7d97a01985 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -84,7 +84,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\portaudio.conf.xml = conf\vanilla\autoload_configs\portaudio.conf.xml
 		conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml
 		conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml
-		conf\vanilla\autoload_configs\spidermonkey.conf.xml = conf\vanilla\autoload_configs\spidermonkey.conf.xml
 		conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml
 		conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml
 		conf\vanilla\autoload_configs\v8.conf.xml = conf\vanilla\autoload_configs\v8.conf.xml
@@ -192,8 +191,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2012.vcxproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey.2012.vcxproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8", "src\mod\languages\mod_v8\mod_v8.2012.vcxproj", "{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_v8_skel", "src\mod\languages\mod_v8\mod_v8_skel.2012.vcxproj", "{8B754330-A434-4791-97E5-1EE67060BAC0}"
@@ -246,8 +243,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2012.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2012.vcxproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2012.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.2012.vcxproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}"
@@ -260,16 +255,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iSAC", "src\mod\codecs\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2012.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_core_db.2012.vcxproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_teletone.2012.vcxproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2012.vcxproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2012.vcxproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_odbc.2012.vcxproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2012.vcxproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2012.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"
@@ -286,8 +275,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applicat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2012.vcxproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_socket.2012.vcxproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2012.vcxproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_de", "src\mod\say\mod_say_de\mod_say_de.2012.vcxproj", "{5BC072DB-3826-48EA-AF34-FE32AA01E83B}"
@@ -316,8 +303,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applications\mod_fsv\mod_fsv.2012.vcxproj", "{E3246D17-E29B-4AB5-962A-C69B0C5837BB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_curl", "src\mod\legacy\languages\mod_spidermonkey\mod_spidermonkey_curl.2012.vcxproj", "{36E854E3-CE12-4348-A125-CCF3F9D74813}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2012.vcxproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download sphinxbase", "libs\win32\Download sphinxbase.2012.vcxproj", "{4F92B672-DADB-4047-8D6A-4BB3796733FD}"
@@ -826,20 +811,6 @@ Global
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.Build.0 = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64 Setup.ActiveCfg = Release|x64
 		{89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|Win32.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x64 Setup.Build.0 = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.All|x86 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64 Setup.ActiveCfg = Release|x64
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|Win32.ActiveCfg = Release|x64
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|x64.ActiveCfg = Release|x64
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064}.All|x64.Build.0 = Release|x64
@@ -1246,24 +1217,6 @@ Global
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64 Setup.ActiveCfg = Release|x64
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|Win32.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x64 Setup.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.All|x86 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.Build.0 = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.Build.0 = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64 Setup.ActiveCfg = Release|x64
-		{204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1374,34 +1327,6 @@ Global
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.Build.0 = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64 Setup.ActiveCfg = Release|x64
 		{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|Win32.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x64 Setup.Build.0 = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.All|x86 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64 Setup.ActiveCfg = Release|x64
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x64 Setup.Build.0 = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|x86 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64 Setup.ActiveCfg = Release|x64
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.ActiveCfg = Release|x64
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|x64.Build.0 = Release|x64
@@ -1434,20 +1359,6 @@ Global
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.Build.0 = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64 Setup.ActiveCfg = Release|x64
 		{71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|Win32.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x64 Setup.Build.0 = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.All|x86 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64 Setup.ActiveCfg = Release|x64
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.ActiveCfg = Release|x64
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|x64.Build.0 = Release|x64
@@ -1592,20 +1503,6 @@ Global
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.Build.0 = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64 Setup.ActiveCfg = Release|x64
 		{2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|Win32.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x64 Setup.Build.0 = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.All|x86 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64 Setup.ActiveCfg = Release|x64
-		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.ActiveCfg = Release|x64
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|x64.Build.0 = Release|x64
@@ -1858,20 +1755,6 @@ Global
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64.Build.0 = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x64 Setup.ActiveCfg = Release|x64
 		{E3246D17-E29B-4AB5-962A-C69B0C5837BB}.Release|x86 Setup.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|Win32.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x64 Setup.Build.0 = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.All|x86 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64 Setup.ActiveCfg = Debug|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x86 Setup.ActiveCfg = Debug|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64 Setup.ActiveCfg = Release|x64
-		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
@@ -4242,7 +4125,6 @@ Global
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
@@ -4281,14 +4163,8 @@ Global
 		{ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
-		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{9B9D2551-D6BD-4F20-8BE5-DE30E154A064} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{8B754330-A434-4791-97E5-1EE67060BAC0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000}
-		{36E854E3-CE12-4348-A125-CCF3F9D74813} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
diff --git a/libs/win32/js/cleancount b/libs/win32/js/cleancount
deleted file mode 100644
index 56a6051ca2..0000000000
--- a/libs/win32/js/cleancount
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/win32/js/fdlibm.vcproj b/libs/win32/js/fdlibm.vcproj
deleted file mode 100644
index af399813f2..0000000000
--- a/libs/win32/js/fdlibm.vcproj
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="fdlibm"
-	ProjectGUID="{76D0A759-9C07-42D4-90A9-82AE15462C95}"
-	RootNamespace="fdlibm"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\fdlibm.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\Debug/fdlibm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\fdlibm.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\Release/fdlibm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\e_atan2.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\e_pow.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\e_sqrt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\k_standard.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_atan.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_copysign.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_fabs.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_finite.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_isnan.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_matherr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_rint.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\s_scalbn.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\w_atan2.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\w_pow.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\js20051231\src\fdlibm\w_sqrt.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="NDEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/win32/js/js.2008.vcproj b/libs/win32/js/js.2008.vcproj
deleted file mode 100644
index a50b9e95d6..0000000000
--- a/libs/win32/js/js.2008.vcproj
+++ /dev/null
@@ -1,1025 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="js"
-	ProjectGUID="{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-	RootNamespace="js"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)Release"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(IntDir)/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="$(IntDir)/js32.pdb"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/js32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(IntDir)/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="_AMD64_=1;NDEBUG;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile="$(IntDir)/js32.pdb"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)js32.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)Debug"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(IntDir)/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/js32.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/js32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(IntDir)/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="_DEBUG;DEBUG;_AMD64_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/js32.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(TargetDir)js32.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_acos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_acosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_asin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_atan2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_atanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_cosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_fmod.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_gamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_hypot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_j0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_j1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_jn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_lgamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_lgamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_log10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_pow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_rem_pio2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_remainder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_scalb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_sinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_sqrt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsarena.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsarray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsatom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsbool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jscntxt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdbgapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdhash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdso.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdtoa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsemit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsexn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsfun.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsgc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jshash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsinterp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslog2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslong.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsmath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsnum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsopcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsprf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsregexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscope.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscript.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsstr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsxdrapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsxml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_cos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_rem_pio2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_sin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_standard.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_tan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\prmjtime.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_asinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_atan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_cbrt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ceil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_copysign.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_cos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_erf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_expm1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_fabs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_finite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_floor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_frexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ilogb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_isnan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ldexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_lib_version.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_log1p.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_logb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_matherr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_modf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_nextafter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_rint.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_scalbn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_signgam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_significand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_sin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_tan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_tanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_acos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_acosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_asin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_atan2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_atanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_cosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_fmod.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_gamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_hypot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_j0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_j1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_jn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_lgamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_lgamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_log10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_pow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_remainder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_scalb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_sinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_sqrt.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-		</Filter>
-		<Filter
-			Name="NSPR Source"
-			>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntsec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\pratom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\prcthr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prfdcach.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prinit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prinrval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\priometh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prlayer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\malloc\prmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prmmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prmwait.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prolock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\prosdep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prprf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\memory\prseg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prtime.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\prtpd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prulock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prustack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32poll.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/win32/js/js.2010.vcxproj b/libs/win32/js/js.2010.vcxproj
deleted file mode 100644
index 81131a97b0..0000000000
--- a/libs/win32/js/js.2010.vcxproj
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>js</ProjectName>
-    <ProjectGuid>{204FA0DE-305D-4414-AE2E-F195A23F390D}</ProjectGuid>
-    <RootNamespace>js</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_AMD64_=1;NDEBUG;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_AMD64_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_acosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_asin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_atan2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_atanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_cosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_exp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_fmod.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_hypot.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_j0.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_j1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_jn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_log.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_log10.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_pow.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_rem_pio2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_remainder.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_scalb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_sinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_sqrt.c" />
-    <ClCompile Include="..\..\js\src\jsapi.c" />
-    <ClCompile Include="..\..\js\src\jsarena.c" />
-    <ClCompile Include="..\..\js\src\jsarray.c" />
-    <ClCompile Include="..\..\js\src\jsatom.c" />
-    <ClCompile Include="..\..\js\src\jsbool.c" />
-    <ClCompile Include="..\..\js\src\jscntxt.c" />
-    <ClCompile Include="..\..\js\src\jsdate.c" />
-    <ClCompile Include="..\..\js\src\jsdbgapi.c" />
-    <ClCompile Include="..\..\js\src\jsdhash.c" />
-    <ClCompile Include="..\..\js\src\jsdso.c" />
-    <ClCompile Include="..\..\js\src\jsdtoa.c" />
-    <ClCompile Include="..\..\js\src\jsemit.c" />
-    <ClCompile Include="..\..\js\src\jsexn.c" />
-    <ClCompile Include="..\..\js\src\jsfile.c" />
-    <ClCompile Include="..\..\js\src\jsfun.c" />
-    <ClCompile Include="..\..\js\src\jsgc.c" />
-    <ClCompile Include="..\..\js\src\jshash.c" />
-    <ClCompile Include="..\..\js\src\jsinterp.c" />
-    <ClCompile Include="..\..\js\src\jslock.c" />
-    <ClCompile Include="..\..\js\src\jslog2.c" />
-    <ClCompile Include="..\..\js\src\jslong.c" />
-    <ClCompile Include="..\..\js\src\jsmath.c" />
-    <ClCompile Include="..\..\js\src\jsnum.c" />
-    <ClCompile Include="..\..\js\src\jsobj.c" />
-    <ClCompile Include="..\..\js\src\jsopcode.c" />
-    <ClCompile Include="..\..\js\src\jsparse.c" />
-    <ClCompile Include="..\..\js\src\jsprf.c" />
-    <ClCompile Include="..\..\js\src\jsregexp.c" />
-    <ClCompile Include="..\..\js\src\jsscan.c" />
-    <ClCompile Include="..\..\js\src\jsscope.c" />
-    <ClCompile Include="..\..\js\src\jsscript.c" />
-    <ClCompile Include="..\..\js\src\jsstr.c" />
-    <ClCompile Include="..\..\js\src\jsutil.c" />
-    <ClCompile Include="..\..\js\src\jsxdrapi.c" />
-    <ClCompile Include="..\..\js\src\jsxml.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_cos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_rem_pio2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_sin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_standard.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_tan.c" />
-    <ClCompile Include="..\..\js\src\prmjtime.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_asinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_atan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_cbrt.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ceil.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_copysign.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_cos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_erf.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_expm1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_fabs.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_finite.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_floor.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_frexp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ilogb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_isnan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ldexp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_lib_version.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_log1p.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_logb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_matherr.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_modf.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_nextafter.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_rint.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_scalbn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_signgam.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_significand.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_sin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_tan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_tanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_acos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_acosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_asin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_atan2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_atanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_cosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_exp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_fmod.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_hypot.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_j0.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_j1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_jn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_log.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_log10.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_pow.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_remainder.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_scalb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_sinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_sqrt.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntio.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntsec.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntthread.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\pratom.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prcthr.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prdir.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prerror.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfdcach.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfile.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinit.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinrval.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prio.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\priometh.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlayer.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlog.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\malloc\prmem.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmmap.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmwait.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prolock.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\prosdep.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prprf.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\memory\prseg.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prtime.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prtpd.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucv.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prulock.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prustack.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\w32poll.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/js/js.2010.vcxproj.filters b/libs/win32/js/js.2010.vcxproj.filters
deleted file mode 100644
index 11d8e7697c..0000000000
--- a/libs/win32/js/js.2010.vcxproj.filters
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4f5946e3-6061-45f6-aabc-3cfadc4ad060}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{90b839f0-4610-43e4-9fb3-0aa74394976d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NSPR Source">
-      <UniqueIdentifier>{c637d4b7-47bc-497a-b85e-becc3e2eb4ae}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_asin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_atan2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_atanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_cosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_exp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_fmod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_hypot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_j0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_j1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_jn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_log10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_pow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_rem_pio2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_remainder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_scalb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_sinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_sqrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsarena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsarray.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsatom.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsbool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jscntxt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdbgapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdhash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdso.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdtoa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsemit.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsexn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsfile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsfun.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsgc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jshash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsinterp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslog2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslong.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsmath.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsnum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsobj.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsopcode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsprf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsregexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscope.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscript.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsstr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsxdrapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsxml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_cos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_rem_pio2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_sin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_standard.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_tan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\prmjtime.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_asinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_atan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_cbrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ceil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_copysign.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_cos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_erf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_expm1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_fabs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_finite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_floor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_frexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ilogb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_isnan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ldexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_lib_version.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_log1p.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_logb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_matherr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_modf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_nextafter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_rint.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_scalbn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_signgam.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_significand.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_sin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_tan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_tanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_acos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_acosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_asin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_atan2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_atanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_cosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_exp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_fmod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_hypot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_j0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_j1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_jn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_log10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_pow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_remainder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_scalb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_sinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_sqrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntio.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntsec.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntthread.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\pratom.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prcthr.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prdir.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prerror.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfdcach.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfile.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinit.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinrval.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prio.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\priometh.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlayer.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlog.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\malloc\prmem.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmmap.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmwait.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prolock.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\prosdep.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prprf.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\memory\prseg.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prtime.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prtpd.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucv.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prulock.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prustack.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\w32poll.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/js/js.2012.vcxproj b/libs/win32/js/js.2012.vcxproj
deleted file mode 100644
index bd4a140b98..0000000000
--- a/libs/win32/js/js.2012.vcxproj
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>js</ProjectName>
-    <ProjectGuid>{204FA0DE-305D-4414-AE2E-F195A23F390D}</ProjectGuid>
-    <RootNamespace>js</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extdll.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_AMD64_=1;NDEBUG;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" &gt; "$(ProjectDir)..\..\js\config.h"
-if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" &gt; "$(ProjectDir)..\..\js\src\jsautocfg.h"
-if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" &gt; "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
-</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(IntDir)js.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_AMD64_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;advapi32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)js.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_acosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_asin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_atan2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_atanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_cosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_exp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_fmod.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_hypot.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_j0.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_j1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_jn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_log.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_log10.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_pow.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_rem_pio2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_remainder.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_scalb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_sinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\e_sqrt.c" />
-    <ClCompile Include="..\..\js\src\jsapi.c" />
-    <ClCompile Include="..\..\js\src\jsarena.c" />
-    <ClCompile Include="..\..\js\src\jsarray.c" />
-    <ClCompile Include="..\..\js\src\jsatom.c" />
-    <ClCompile Include="..\..\js\src\jsbool.c" />
-    <ClCompile Include="..\..\js\src\jscntxt.c" />
-    <ClCompile Include="..\..\js\src\jsdate.c" />
-    <ClCompile Include="..\..\js\src\jsdbgapi.c" />
-    <ClCompile Include="..\..\js\src\jsdhash.c" />
-    <ClCompile Include="..\..\js\src\jsdso.c" />
-    <ClCompile Include="..\..\js\src\jsdtoa.c" />
-    <ClCompile Include="..\..\js\src\jsemit.c" />
-    <ClCompile Include="..\..\js\src\jsexn.c" />
-    <ClCompile Include="..\..\js\src\jsfile.c" />
-    <ClCompile Include="..\..\js\src\jsfun.c" />
-    <ClCompile Include="..\..\js\src\jsgc.c" />
-    <ClCompile Include="..\..\js\src\jshash.c" />
-    <ClCompile Include="..\..\js\src\jsinterp.c" />
-    <ClCompile Include="..\..\js\src\jslock.c" />
-    <ClCompile Include="..\..\js\src\jslog2.c" />
-    <ClCompile Include="..\..\js\src\jslong.c" />
-    <ClCompile Include="..\..\js\src\jsmath.c" />
-    <ClCompile Include="..\..\js\src\jsnum.c" />
-    <ClCompile Include="..\..\js\src\jsobj.c" />
-    <ClCompile Include="..\..\js\src\jsopcode.c" />
-    <ClCompile Include="..\..\js\src\jsparse.c" />
-    <ClCompile Include="..\..\js\src\jsprf.c" />
-    <ClCompile Include="..\..\js\src\jsregexp.c" />
-    <ClCompile Include="..\..\js\src\jsscan.c" />
-    <ClCompile Include="..\..\js\src\jsscope.c" />
-    <ClCompile Include="..\..\js\src\jsscript.c" />
-    <ClCompile Include="..\..\js\src\jsstr.c" />
-    <ClCompile Include="..\..\js\src\jsutil.c" />
-    <ClCompile Include="..\..\js\src\jsxdrapi.c" />
-    <ClCompile Include="..\..\js\src\jsxml.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_cos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_rem_pio2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_sin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_standard.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\k_tan.c" />
-    <ClCompile Include="..\..\js\src\prmjtime.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_asinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_atan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_cbrt.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ceil.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_copysign.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_cos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_erf.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_expm1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_fabs.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_finite.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_floor.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_frexp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ilogb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_isnan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_ldexp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_lib_version.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_log1p.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_logb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_matherr.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_modf.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_nextafter.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_rint.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_scalbn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_signgam.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_significand.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_sin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_tan.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\s_tanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_acos.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_acosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_asin.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_atan2.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_atanh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_cosh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_exp.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_fmod.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_hypot.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_j0.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_j1.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_jn.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma_r.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_log.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_log10.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_pow.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_remainder.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_scalb.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_sinh.c" />
-    <ClCompile Include="..\..\js\src\fdlibm\w_sqrt.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntio.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntsec.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntthread.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\pratom.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prcthr.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prdir.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prerror.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfdcach.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfile.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinit.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinrval.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prio.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\priometh.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlayer.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlog.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\malloc\prmem.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmmap.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmwait.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prolock.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\prosdep.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prprf.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\memory\prseg.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prtime.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prtpd.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucv.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prulock.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prustack.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\w32poll.c" />
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/libs/win32/js/js.2012.vcxproj.filters b/libs/win32/js/js.2012.vcxproj.filters
deleted file mode 100644
index 11d8e7697c..0000000000
--- a/libs/win32/js/js.2012.vcxproj.filters
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4f5946e3-6061-45f6-aabc-3cfadc4ad060}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{90b839f0-4610-43e4-9fb3-0aa74394976d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NSPR Source">
-      <UniqueIdentifier>{c637d4b7-47bc-497a-b85e-becc3e2eb4ae}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_acosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_asin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_atan2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_atanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_cosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_exp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_fmod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_gamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_hypot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_j0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_j1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_jn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_lgamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_log10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_pow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_rem_pio2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_remainder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_scalb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_sinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\e_sqrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsarena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsarray.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsatom.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsbool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jscntxt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdbgapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdhash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdso.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsdtoa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsemit.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsexn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsfile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsfun.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsgc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jshash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsinterp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslog2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jslong.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsmath.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsnum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsobj.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsopcode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsprf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsregexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscope.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsscript.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsstr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsxdrapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\jsxml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_cos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_rem_pio2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_sin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_standard.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\k_tan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\prmjtime.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_asinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_atan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_cbrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ceil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_copysign.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_cos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_erf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_expm1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_fabs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_finite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_floor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_frexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ilogb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_isnan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_ldexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_lib_version.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_log1p.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_logb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_matherr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_modf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_nextafter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_rint.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_scalbn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_signgam.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_significand.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_sin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_tan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\s_tanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_acos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_acosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_asin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_atan2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_atanh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_cosh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_exp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_fmod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_gamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_hypot.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_j0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_j1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_jn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_lgamma_r.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_log10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_pow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_remainder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_scalb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_sinh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\src\fdlibm\w_sqrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntio.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntsec.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\ntthread.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\pratom.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prcthr.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prdir.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prerror.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfdcach.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prfile.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinit.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prinrval.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prio.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\priometh.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlayer.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prlog.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\malloc\prmem.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmmap.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prmwait.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prolock.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\prosdep.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\io\prprf.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\memory\prseg.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\misc\prtime.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\prtpd.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prucv.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prulock.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\prustack.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\w32poll.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c">
-      <Filter>NSPR Source</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/js/js.vcproj b/libs/win32/js/js.vcproj
deleted file mode 100644
index 42a9eac279..0000000000
--- a/libs/win32/js/js.vcproj
+++ /dev/null
@@ -1,829 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="js"
-	ProjectGUID="{204FA0DE-305D-4414-AE2E-F195A23F390D}"
-	RootNamespace="js"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)Release"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\Release/js32.pdb"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				ImportLibrary=".\Release/js32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)Debug"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\js\config.h&quot; type &quot;$(ProjectDir)..\..\js\config.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot; type &quot;$(ProjectDir)..\..\js\src\jsautocfg.hw&quot; &gt; &quot;$(ProjectDir)..\..\js\src\jsautocfg.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot; type &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg&quot; &gt; &quot;$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h&quot;&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/js.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include"
-				PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(IntDir)\js.pch"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="0"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib"
-				OutputFile="$(OutDir)\js32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/js32.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Debug/js32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/js.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_acos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_acosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_asin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_atan2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_atanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_cosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_fmod.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_gamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_hypot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_j0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_j1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_jn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_lgamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_lgamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_log10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_pow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_rem_pio2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_remainder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_scalb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_sinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\e_sqrt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsarena.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsarray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsatom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsbool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jscntxt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdbgapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdhash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdso.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsdtoa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsemit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsexn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsfun.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsgc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jshash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsinterp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslog2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jslong.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsmath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsnum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsobj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsopcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsprf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsregexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscope.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsscript.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsstr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsxdrapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\jsxml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_cos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_rem_pio2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_sin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_standard.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\k_tan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\prmjtime.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_asinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_atan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_cbrt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ceil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_copysign.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_cos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_erf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_expm1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_fabs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_finite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_floor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_frexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ilogb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_isnan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_ldexp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_lib_version.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_log1p.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_logb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_matherr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_modf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_nextafter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_rint.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_scalbn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_signgam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_significand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_sin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_tan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\s_tanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_acos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_acosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_asin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_atan2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_atanh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_cosh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_exp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_fmod.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_gamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_hypot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_j0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_j1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_jn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_lgamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_lgamma_r.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_log10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_pow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_remainder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_scalb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_sinh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\src\fdlibm\w_sqrt.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-		</Filter>
-		<Filter
-			Name="NSPR Source"
-			>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntsec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\pratom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\prcthr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prfdcach.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prinit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prinrval.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\priometh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prlayer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\malloc\prmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prmmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prmwait.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prolock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\prosdep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\io\prprf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\memory\prseg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\misc\prtime.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\prtpd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prulock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prustack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32poll.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/w32/spidermonkey.props b/w32/spidermonkey.props
deleted file mode 100644
index f13aebbca5..0000000000
--- a/w32/spidermonkey.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="curl.props" Condition=" '$(CurlPropsImported)' == '' "/>
-  </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\js\src;$(SolutionDir)libs\js\nsprpub\pr\include;$(SolutionDir)src\mod\languages\mod_spidermonkey;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>XP_WIN;JSFILE;EXPORT_JS_API;JS_THREADSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)nspr-4.6.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/w32/spidermonkey.vsprops b/w32/spidermonkey.vsprops
deleted file mode 100644
index 932e928e5b..0000000000
--- a/w32/spidermonkey.vsprops
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="spidermonkey"
-	InheritedPropertySheets=".\curl.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(SolutionDir)libs\js\src&quot;;&quot;$(SolutionDir)libs\js\nsprpub\pr\include&quot;;&quot;$(SolutionDir)src\mod\languages\mod_spidermonkey&quot;"
-		PreprocessorDefinitions="XP_WIN;JSFILE;EXPORT_JS_API;JS_THREADSAFE"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="&quot;..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib&quot;"
-	/>
-</VisualStudioPropertySheet>

From 1f6eb250814eda569a15e60c0463a2bdd2173e85 Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 11:16:20 +0200
Subject: [PATCH 057/130] .gitignore portadio

---
 libs/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/.gitignore b/libs/.gitignore
index 4855f271d2..1f0304c8fa 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -827,3 +827,4 @@ unimrcp/build/compile
 /sqlite-*.zip
 /sqlite-*/
 /ldns/
+/portaudio/

From 4df59b013c9afeda3a2b09cd311c365cfdaf9da3 Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 09:40:53 +0200
Subject: [PATCH 058/130] Force line endings to LF on common file types. This
 should help improve the autocrlf issue in Windows.

---
 .gitattributes | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 06c92d07df..97baa70786 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,13 @@
 # gitattributes
+*.h text eol=lf
+*.hxx text eol=lf
+*.hpp text eol=lf
+*.in text eol=lf
+*.c text eol=lf
+*.cxx text eol=lf
+*.cpp text eol=lf
+/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask text eol=lf
+*.txt text eol=lf
 *.exe -diff binary executable windows dfsg-nonfree debian-ignore
 *.wav -diff binary sound
 *.gif -diff binary image

From 62404c6e2bf37164a8798b81d27dfc90f212ee1c Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 13:41:33 +0200
Subject: [PATCH 059/130] Windows: Remove auto generation of files that already
 exist in git.

---
 libs/win32/xmlrpc-c/gennmtab.2012.vcxproj | 40 +++++++++++++++++------
 libs/win32/xmlrpc-c/xmlparse.2012.vcxproj | 38 ++++++++++-----------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/libs/win32/xmlrpc-c/gennmtab.2012.vcxproj b/libs/win32/xmlrpc-c/gennmtab.2012.vcxproj
index 88ef30278c..f31953289d 100644
--- a/libs/win32/xmlrpc-c/gennmtab.2012.vcxproj
+++ b/libs/win32/xmlrpc-c/gennmtab.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -97,10 +97,26 @@
     <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PreBuildEventUseInBuild>
     <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
     <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreBuildEventUseInBuild>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Clean</CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    </CustomBuildAfterTargets>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -147,7 +163,8 @@
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>del $(XMLRPCDir)lib\expat\xmltok\nametab.h</Command>
+      <Command>
+      </Command>
     </CustomBuildStep>
     <CustomBuildStep>
       <Outputs>NoOutput</Outputs>
@@ -197,7 +214,8 @@
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>del $(XMLRPCDir)lib\expat\xmltok\nametab.h</Command>
+      <Command>
+      </Command>
     </CustomBuildStep>
     <CustomBuildStep>
       <Outputs>NoOutput</Outputs>
@@ -248,7 +266,8 @@
     </PreBuildEvent>
     <CustomBuildStep>
       <Outputs>NoOutput</Outputs>
-      <Command>del $(XMLRPCDir)lib\expat\xmltok\nametab.h</Command>
+      <Command>
+      </Command>
     </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -295,7 +314,8 @@
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>del $(XMLRPCDir)lib\expat\xmltok\nametab.h</Command>
+      <Command>
+      </Command>
     </CustomBuildStep>
     <CustomBuildStep>
       <Outputs>NoOutput</Outputs>
@@ -307,4 +327,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj
index ef12dea8de..b13d7f86de 100644
--- a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj
+++ b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj
@@ -83,10 +83,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\xmlparse\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\xmlparse\$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\version.h;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Clean</CustomBuildAfterTargets>
-    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Clean</CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    </CustomBuildAfterTargets>
+    <CustomBuildAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    </CustomBuildAfterTargets>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -120,10 +124,8 @@ popd
 	</Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>pushd $(XMLRPCDir)Windows
-"$(XMLRPCDir)Windows\CleanWin32.bat"
-popd
-</Command>
+      <Command>
+      </Command>
       <Outputs>NoOutput</Outputs>
     </CustomBuildStep>
   </ItemDefinitionGroup>
@@ -162,10 +164,8 @@ popd
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>pushd $(XMLRPCDir)Windows
-"$(XMLRPCDir)Windows\CleanWin32.bat"
-popd
-</Command>
+      <Command>
+      </Command>
       <Outputs>NoOutput</Outputs>
     </CustomBuildStep>
   </ItemDefinitionGroup>
@@ -201,10 +201,8 @@ popd
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>pushd $(XMLRPCDir)Windows
-"$(XMLRPCDir)Windows\CleanWin32.bat"
-popd
-</Command>
+      <Command>
+      </Command>
       <Outputs>NoOutput</Outputs>
     </CustomBuildStep>
   </ItemDefinitionGroup>
@@ -243,10 +241,8 @@ popd
       </Command>
     </PreBuildEvent>
     <CustomBuildStep>
-      <Command>pushd $(XMLRPCDir)Windows
-"$(XMLRPCDir)Windows\CleanWin32.bat"
-popd
-</Command>
+      <Command>
+      </Command>
       <Outputs>NoOutput</Outputs>
     </CustomBuildStep>
   </ItemDefinitionGroup>
@@ -259,4 +255,4 @@ popd
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

From 17d6c5b85096c8eff05ce76aaa927ea649f970fc Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Sat, 19 Jul 2014 18:06:01 +0200
Subject: [PATCH 060/130] FS-6578 #comment fixed #resolve

---
 libs/srtp/libsrtp.2010.vcxproj                |   12 +-
 libs/srtp/libsrtp.2012.vcxproj                |   12 +-
 libs/win32/Download OPENSSL.2010.vcxproj      |    6 +-
 libs/win32/Download OPENSSL.2012.vcxproj      |    6 +-
 libs/win32/curl/curllib.2010.vcxproj          |   12 +-
 libs/win32/curl/curllib.2012.vcxproj          |   12 +-
 libs/win32/iksemel/iksemel.2010.vcxproj       |   12 +-
 libs/win32/iksemel/iksemel.2012.vcxproj       |   12 +-
 libs/win32/openssl/include/opensslv.h         |    6 +-
 libs/win32/openssl/include/pkcs7.h            |    1 +
 libs/win32/openssl/include/ssl.h              |    4 +-
 libs/win32/openssl/include/ssl3.h             |    1 +
 libs/win32/openssl/libeay32.2010.vcxproj      | 1364 ++++++++--------
 .../openssl/libeay32.2010.vcxproj.filters     | 1328 ++++++++--------
 libs/win32/openssl/libeay32.2012.vcxproj      | 1388 +++++++++--------
 .../openssl/libeay32.2012.vcxproj.filters     | 1328 ++++++++--------
 libs/win32/openssl/openssl.2010.vcxproj       |  118 +-
 .../openssl/openssl.2010.vcxproj.filters      |  106 +-
 libs/win32/openssl/openssl.2012.vcxproj       |  118 +-
 .../openssl/openssl.2012.vcxproj.filters      |  106 +-
 libs/win32/openssl/ssleay32.2010.vcxproj      |  120 +-
 .../openssl/ssleay32.2010.vcxproj.filters     |  100 +-
 libs/win32/openssl/ssleay32.2012.vcxproj      |  120 +-
 .../openssl/ssleay32.2012.vcxproj.filters     |  100 +-
 .../sofia/libsofia_sip_ua_static.2010.vcxproj |   12 +-
 .../sofia/libsofia_sip_ua_static.2012.vcxproj |   12 +-
 .../mod_xml_rpc/mod_xml_rpc.2010.vcxproj      |   12 +-
 .../mod_xml_rpc/mod_xml_rpc.2012.vcxproj      |   12 +-
 w32/Library/FreeSwitchCore.2010.vcxproj       |   12 +-
 w32/Library/FreeSwitchCore.2012.vcxproj       |   12 +-
 w32/openssl-version.props                     |   17 +
 31 files changed, 3289 insertions(+), 3192 deletions(-)
 create mode 100644 w32/openssl-version.props

diff --git a/libs/srtp/libsrtp.2010.vcxproj b/libs/srtp/libsrtp.2010.vcxproj
index 2c8aa25059..06d304b9bf 100644
--- a/libs/srtp/libsrtp.2010.vcxproj
+++ b/libs/srtp/libsrtp.2010.vcxproj
@@ -89,10 +89,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Dll|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -103,10 +105,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -127,7 +131,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +153,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -166,7 +170,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -184,7 +188,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
diff --git a/libs/srtp/libsrtp.2012.vcxproj b/libs/srtp/libsrtp.2012.vcxproj
index eebc138ade..0d321c9e46 100644
--- a/libs/srtp/libsrtp.2012.vcxproj
+++ b/libs/srtp/libsrtp.2012.vcxproj
@@ -97,10 +97,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Dll|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -111,10 +113,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\w32\extlib.props" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -135,7 +139,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -157,7 +161,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -174,7 +178,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -192,7 +196,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
diff --git a/libs/win32/Download OPENSSL.2010.vcxproj b/libs/win32/Download OPENSSL.2010.vcxproj
index 3d0a0a1e76..1c6ba98a47 100644
--- a/libs/win32/Download OPENSSL.2010.vcxproj	
+++ b/libs/win32/Download OPENSSL.2010.vcxproj	
@@ -32,9 +32,11 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -51,11 +53,11 @@
     <CustomBuild Include="OPENSSL\cleancount">
       <FileType>Document</FileType>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\openssl-$(OpenSSLVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-$(OpenSSLVersion).tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\openssl-$(OpenSSLVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-$(OpenSSLVersion).tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
     </CustomBuild>
diff --git a/libs/win32/Download OPENSSL.2012.vcxproj b/libs/win32/Download OPENSSL.2012.vcxproj
index 5ecf8e386f..2e48bdff31 100644
--- a/libs/win32/Download OPENSSL.2012.vcxproj	
+++ b/libs/win32/Download OPENSSL.2012.vcxproj	
@@ -34,9 +34,11 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -53,11 +55,11 @@
     <CustomBuild Include="cleancount">
       <FileType>Document</FileType>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\openssl-$(OpenSSLVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-$(OpenSSLVersion).tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\openssl-$(OpenSSLVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-$(OpenSSLVersion).tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
     </CustomBuild>
diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj
index 983f3074f6..e5ccd33951 100644
--- a/libs/win32/curl/curllib.2010.vcxproj
+++ b/libs/win32/curl/curllib.2010.vcxproj
@@ -50,18 +50,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -80,7 +84,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -111,7 +115,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -141,7 +145,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +175,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj
index fe1f314baf..1ea3ef6330 100644
--- a/libs/win32/curl/curllib.2012.vcxproj
+++ b/libs/win32/curl/curllib.2012.vcxproj
@@ -54,18 +54,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -84,7 +88,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -115,7 +119,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,7 +149,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -175,7 +179,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/libs/win32/iksemel/iksemel.2010.vcxproj b/libs/win32/iksemel/iksemel.2010.vcxproj
index 0f1a9e2cbc..c42ba84d72 100644
--- a/libs/win32/iksemel/iksemel.2010.vcxproj
+++ b/libs/win32/iksemel/iksemel.2010.vcxproj
@@ -49,18 +49,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -69,7 +73,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -91,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +108,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
diff --git a/libs/win32/iksemel/iksemel.2012.vcxproj b/libs/win32/iksemel/iksemel.2012.vcxproj
index 600b647ded..526dfed705 100644
--- a/libs/win32/iksemel/iksemel.2012.vcxproj
+++ b/libs/win32/iksemel/iksemel.2012.vcxproj
@@ -53,18 +53,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -73,7 +77,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -95,7 +99,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -108,7 +112,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
diff --git a/libs/win32/openssl/include/opensslv.h b/libs/win32/openssl/include/opensslv.h
index ebe7180723..c3b6acec75 100644
--- a/libs/win32/openssl/include/opensslv.h
+++ b/libs/win32/openssl/include/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x1000107fL
+#define OPENSSL_VERSION_NUMBER	0x1000108fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-fips 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-fips 5 Jun 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h 5 Jun 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/libs/win32/openssl/include/pkcs7.h b/libs/win32/openssl/include/pkcs7.h
index e4d443193c..04f60379fb 100644
--- a/libs/win32/openssl/include/pkcs7.h
+++ b/libs/win32/openssl/include/pkcs7.h
@@ -453,6 +453,7 @@ void ERR_load_PKCS7_strings(void);
 #define PKCS7_R_ERROR_SETTING_CIPHER			 121
 #define PKCS7_R_INVALID_MIME_TYPE			 131
 #define PKCS7_R_INVALID_NULL_POINTER			 143
+#define PKCS7_R_INVALID_SIGNED_DATA_TYPE		 155
 #define PKCS7_R_MIME_NO_CONTENT_TYPE			 132
 #define PKCS7_R_MIME_PARSE_ERROR			 133
 #define PKCS7_R_MIME_SIG_PARSE_ERROR			 134
diff --git a/libs/win32/openssl/include/ssl.h b/libs/win32/openssl/include/ssl.h
index 7219a0e64b..4c1242c9d2 100644
--- a/libs/win32/openssl/include/ssl.h
+++ b/libs/win32/openssl/include/ssl.h
@@ -553,7 +553,7 @@ struct ssl_session_st
 /* Allow initial connection to servers that don't support RI */
 #define SSL_OP_LEGACY_SERVER_CONNECT			0x00000004L
 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
-#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
+#define SSL_OP_TLSEXT_PADDING				0x00000010L
 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
 #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG			0x00000040L
 #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L
@@ -562,6 +562,8 @@ struct ssl_session_st
 
 /* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
 #define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x0
+/* Refers to ancient SSLREF and SSLv2, retained for compatibility */
+#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x0
 
 /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
  * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
diff --git a/libs/win32/openssl/include/ssl3.h b/libs/win32/openssl/include/ssl3.h
index cb8b2492ec..37f19e3ab5 100644
--- a/libs/win32/openssl/include/ssl3.h
+++ b/libs/win32/openssl/include/ssl3.h
@@ -388,6 +388,7 @@ typedef struct ssl3_buffer_st
 #define TLS1_FLAGS_TLS_PADDING_BUG		0x0008
 #define TLS1_FLAGS_SKIP_CERT_VERIFY		0x0010
 #define TLS1_FLAGS_KEEP_HANDSHAKE		0x0020
+#define SSL3_FLAGS_CCS_OK			0x0080
  
 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we
  * restart a handshake because of MS SGC and so prevents us
diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj
index 9a4987f989..ebbc82735a 100644
--- a/libs/win32/openssl/libeay32.2010.vcxproj
+++ b/libs/win32/openssl/libeay32.2010.vcxproj
@@ -54,18 +54,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -129,7 +133,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -143,7 +147,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
@@ -151,18 +155,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -177,7 +181,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
@@ -185,11 +189,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -199,7 +203,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,679 +217,679 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_x931p.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_str.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cmac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_pwri.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cpt_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cryptlib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cversion.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp224.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp256.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp521.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rdrand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rsax.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_cnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_fips.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes_cbc_hmac_sha1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4_hmac_md5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ex_data.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_clr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_dbg.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ccm128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\gcm128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\xts128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_dir.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_fips.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_str.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\uid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_cksm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64ede.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb3_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ede_cbcm_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_read.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_writ.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt_b.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64ede.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\pcbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\qud_cksm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rand_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\read2pwd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rpc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\set_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\str2key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\xcbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_core.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ctr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ige.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_misc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_wrap.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\camellia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ctr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_misc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cbc128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cfb128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ctr128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cts128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ofb128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_add.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_asm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_blind.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_const.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_ctx.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_div.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gcd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gf2m.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_kron.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mod.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mont.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mpi.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mul.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_nist.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_prime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_recp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_shift.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqrt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_word.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_chk.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_eay.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_none.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_oaep.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pk1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_saos.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_x931.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_vrf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\md_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_egd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_nw.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_os2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_unix.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_win.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\randfile.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_dump.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_sock.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_buff.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_nbio.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_cb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_acpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_bio.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_conn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_dgram.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_fd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_file.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_log.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_mem.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_sock.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_compat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_util.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_dir.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_file.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_att.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_cmp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_d2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_def.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_ext.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_lu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_obj.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_r2x.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_set.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_trs.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_txt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_v3.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vpm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509cset.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509name.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509rset.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509type.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bitstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bool.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bytes.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_d2i_fp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_dup.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_gentm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_i2d_fp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_mbstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_object.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_octet.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_set.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strex.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strnid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_type.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utctm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utf8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\ameth_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_par.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_mime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_moid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_pack.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_ndef.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\evp_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_string.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\n_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\nsseq.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbe.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbev2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p8_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_bitst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509a.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_dec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_fre.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_new.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_typ.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_algor.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_attrib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_bignum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_exten.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_long.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_name.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_nx509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pubkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_sig.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_val.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509a.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\o_names.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_dat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_xref.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_b64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_md.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_ok.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_allc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_alld.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_bf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_camellia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_cast.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des3.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_idea.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_old.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_seed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_xcbc_d.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\encode.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_acnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pbe.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ecdsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md4.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_mdc2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ripemd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sigver.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_wp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\names.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\openbsd_hw.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_dec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_open.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_seal.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_fn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_gn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buffer.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_att.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_cd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_dd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_env.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_ess.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_io.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_sd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cryptodev.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_ctrl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_dyn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_fat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_list.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_table.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_asnmth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_cipher.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_pkmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_store.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\stack\stack.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\bio_pk7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_attr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_doit.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_mime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pkcs7err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_check.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_cl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ext.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ht.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_srv.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_cache.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_data.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_map.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_node.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_tree.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_addr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akeya.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_alt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_asid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bcons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bitst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_conf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_cpols.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_crld.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_extku.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_genn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ia5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ncons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ocsp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pci.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pku.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pmaps.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_purp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_sxnet.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_conf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_utils.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_utils.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_verify_ctx.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_api.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_def.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mall.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mod.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_sap.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_mult.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_smpl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_check.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_curve.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_cvt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_mult.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\eck_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_mont.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nist.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_smpl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_vrf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lh_stats.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lhash.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_beos.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dlfcn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_vms.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_win32.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_add.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_attr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_decr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_kiss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_mutl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_npas.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8d.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8e.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\pk12err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hmac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha256.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512t.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_rle.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_zlib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_oth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pk8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_seal.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_xaux.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pvkfmt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_block.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\krb5\krb5_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\txt_db\txt_db.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pqueue\pqueue.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ms\uplink.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_x931p.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_str.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cmac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_pwri.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cpt_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cversion.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp224.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp256.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp521.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rdrand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rsax.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_cnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_fips.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes_cbc_hmac_sha1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4_hmac_md5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ex_data.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_clr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_dbg.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ccm128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\gcm128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\xts128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_fips.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\uid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_cksm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64ede.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb3_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ede_cbcm_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_read.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_writ.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt_b.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64ede.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\pcbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\qud_cksm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rand_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\read2pwd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rpc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\set_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\str2key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\xcbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_core.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ctr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ige.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_misc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_wrap.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\camellia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ctr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_misc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cbc128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cfb128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ctr128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cts128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ofb128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_add.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_asm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_blind.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_const.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_ctx.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_div.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gcd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gf2m.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_kron.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mod.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mont.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mpi.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mul.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_nist.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_prime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_recp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_shift.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqrt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_word.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_chk.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_eay.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_none.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_oaep.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pk1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_saos.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_x931.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_vrf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\md_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_egd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_nw.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_os2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_unix.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_win.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\randfile.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_dump.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_sock.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_buff.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_nbio.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_cb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_acpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_bio.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_conn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_dgram.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_fd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_file.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_log.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_mem.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_sock.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_compat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_util.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_dir.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_file.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_att.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_cmp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_d2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_def.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_ext.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_lu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_obj.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_r2x.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_set.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_trs.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_txt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_v3.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vpm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509cset.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509name.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509rset.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509type.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bitstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bool.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bytes.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_d2i_fp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_dup.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_gentm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_i2d_fp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_mbstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_object.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_octet.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_set.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strex.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strnid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_type.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utctm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utf8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\ameth_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_par.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_mime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_moid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_pack.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_ndef.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\evp_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_string.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\n_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\nsseq.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbe.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbev2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p8_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_bitst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509a.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_dec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_fre.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_new.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_typ.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_algor.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_attrib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_bignum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_exten.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_long.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_name.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_nx509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pubkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_sig.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_val.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509a.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\o_names.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_dat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_xref.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_b64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_md.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_ok.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_allc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_alld.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_bf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_camellia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_cast.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des3.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_idea.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_old.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_seed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_xcbc_d.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\encode.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_acnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pbe.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ecdsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md4.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_mdc2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ripemd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sigver.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_wp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\names.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\openbsd_hw.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_dec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_open.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_seal.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_fn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_gn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buffer.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_att.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_cd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_dd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_env.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_ess.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_io.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_sd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cryptodev.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_ctrl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_dyn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_fat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_list.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_table.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_asnmth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_cipher.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_pkmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_store.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\stack\stack.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\bio_pk7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_attr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_doit.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_mime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pkcs7err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_check.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_cl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ext.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ht.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_srv.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_cache.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_data.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_map.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_node.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_tree.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_addr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akeya.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_alt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_asid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bcons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bitst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_conf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_cpols.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_crld.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_extku.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_genn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ia5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ncons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ocsp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pci.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pku.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pmaps.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_purp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_sxnet.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_conf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_utils.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_utils.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_verify_ctx.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_api.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_def.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mall.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mod.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_sap.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_mult.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_smpl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_check.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_curve.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_cvt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_mult.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\eck_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_mont.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nist.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_smpl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_vrf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lh_stats.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lhash.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_beos.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dlfcn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_vms.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_win32.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_add.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_attr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_decr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_kiss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_mutl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_npas.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8d.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8e.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\pk12err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hmac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha256.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512t.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_rle.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_zlib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_oth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pk8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_seal.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_xaux.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pvkfmt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_block.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\krb5\krb5_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\txt_db\txt_db.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pqueue\pqueue.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\e_os.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_str.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_time.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\aes.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1_mac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1t.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bio.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\blowfish.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bn.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\buffer.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\camellia.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cast.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cms.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\comp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf_api.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\crypto.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des_old.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dh.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dso.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dtls1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\e_os2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ebcdic.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ec.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdh.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\engine.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\err.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\evp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\hmac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\idea.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\krb5_asn.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\kssl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\lhash.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md4.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md5.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\mdc2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\modes.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\obj_mac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\objects.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ocsp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\opensslv.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ossl_typ.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs12.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs7.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pqueue.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rand.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc4.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ripemd.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\safestack.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\seed.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\sha.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl23.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl3.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\stack.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\symhacks.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\tls1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ts.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\txt_db.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui_compat.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\whrlpool.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509_vfy.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509v3.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_locl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_pi.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\blowfish.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\ms\uplink.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\e_os.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\aes.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1_mac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1t.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bio.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\blowfish.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bn.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\buffer.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\camellia.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cast.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cms.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\comp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf_api.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\crypto.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des_old.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dh.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dso.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dtls1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ebcdic.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ec.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdh.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\engine.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\err.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\evp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\hmac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\idea.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\krb5_asn.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\kssl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\lhash.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md4.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md5.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\mdc2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\modes.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\obj_mac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\objects.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ocsp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslv.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ossl_typ.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs12.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs7.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pqueue.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rand.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc4.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ripemd.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\safestack.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\seed.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\sha.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl23.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl3.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\stack.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\symhacks.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\tls1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ts.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\txt_db.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui_compat.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\whrlpool.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509_vfy.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509v3.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_pi.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\blowfish.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Download OPENSSL.2010.vcxproj">
diff --git a/libs/win32/openssl/libeay32.2010.vcxproj.filters b/libs/win32/openssl/libeay32.2010.vcxproj.filters
index 80893a4fe8..ce9c62b732 100644
--- a/libs/win32/openssl/libeay32.2010.vcxproj.filters
+++ b/libs/win32/openssl/libeay32.2010.vcxproj.filters
@@ -185,1998 +185,1998 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cpt_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cpt_err.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cryptlib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cversion.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cversion.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ex_data.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ex_data.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_clr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_clr.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_dbg.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_dbg.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_dir.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\uid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\uid.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_cbc.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_ecb.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_skey.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2cfb64.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2ofb64.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_enc.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_skey.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cbc.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cfb64.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ecb.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ofb64.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_skey.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_cfb64.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ecb.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_enc.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ofb64.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_skey.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_cfb64.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ecb.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_enc.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ofb64.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_skey.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_dgst.c">
       <Filter>Source Files\crypto\ripemd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_one.c">
       <Filter>Source Files\crypto\ripemd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_cksm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_cksm.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64ede.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64ede.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old2.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb3_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb3_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ede_cbcm_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ede_cbcm_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_read.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_read.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_writ.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_writ.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt_b.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt_b.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64ede.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64ede.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\pcbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\pcbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\qud_cksm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\qud_cksm.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rand_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rand_key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\read2pwd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\read2pwd.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rpc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rpc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\set_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\set_key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\str2key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\str2key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\xcbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\xcbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cbc.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cfb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_core.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_core.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ctr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ctr.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ecb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ige.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ige.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_misc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_misc.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ofb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_wrap.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_wrap.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\camellia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\camellia.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cbc.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cfb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ctr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ctr.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ecb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_misc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_misc.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ofb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cbc.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cfb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ecb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ofb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cbc128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cbc128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cfb128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cfb128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ctr128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ctr128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cts128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cts128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ofb128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ofb128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_add.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_add.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_asm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_asm.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_blind.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_blind.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_const.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_const.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_ctx.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_ctx.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_depr.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_div.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_div.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_err.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp2.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gcd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gcd.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gf2m.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gf2m.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_kron.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_kron.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_lib.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mod.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mod.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mont.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mont.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mpi.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mpi.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mul.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mul.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_nist.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_nist.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_prime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_prime.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_print.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_rand.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_recp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_recp.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_shift.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_shift.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqr.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqrt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqrt.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_word.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_word.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ameth.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_asn1.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_chk.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_chk.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_depr.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_eay.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_eay.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_err.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_gen.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_lib.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_none.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_none.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_null.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_oaep.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_oaep.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pk1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pk1.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pmeth.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_prn.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pss.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_saos.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_saos.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_sign.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ssl.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_x931.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_x931.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ameth.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_asn1.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_depr.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_err.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_gen.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_key.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_lib.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ossl.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_pmeth.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_prn.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_sign.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_vrf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_vrf.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\md_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\md_rand.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_egd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_egd.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_err.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_lib.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_nw.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_nw.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_os2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_os2.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_unix.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_unix.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_win.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_win.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\randfile.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\randfile.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_dump.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_dump.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_print.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_sock.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_sock.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_buff.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_buff.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_nbio.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_nbio.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_null.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_cb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_cb.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_err.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_lib.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_acpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_acpt.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_bio.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_bio.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_conn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_conn.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_dgram.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_dgram.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_fd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_fd.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_file.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_file.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_log.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_log.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_mem.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_mem.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_null.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_sock.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_sock.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_all.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_prn.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_compat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_compat.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_err.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_lib.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_openssl.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_util.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_util.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_dir.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_dir.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_file.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_file.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_att.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_att.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_cmp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_cmp.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_d2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_d2.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_def.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_def.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_err.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_ext.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_ext.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_lu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_lu.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_obj.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_obj.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_r2x.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_r2x.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_req.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_set.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_set.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_trs.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_trs.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_txt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_txt.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_v3.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_v3.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vfy.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vpm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vpm.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509cset.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509cset.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509name.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509name.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509rset.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509rset.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509spki.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509type.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509type.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x_all.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bitstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bitstr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bool.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bool.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bytes.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bytes.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_d2i_fp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_d2i_fp.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_digest.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_dup.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_dup.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_enum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_gentm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_gentm.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_i2d_fp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_i2d_fp.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_int.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_mbstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_mbstr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_object.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_object.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_octet.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_octet.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_print.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_set.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_set.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_sign.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strex.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strex.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strnid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strnid.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_time.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_type.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_type.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utctm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utctm.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utf8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utf8.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_verify.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\ameth_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\ameth_lib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_err.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_gen.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_lib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_par.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_par.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_mime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_mime.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_moid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_moid.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_pack.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_pack.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_asn1.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_ndef.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_ndef.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pu.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\evp_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\evp_asn1.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_enum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_int.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_string.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_string.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pu.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\n_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\n_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\nsseq.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\nsseq.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbe.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbe.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbev2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbev2.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p8_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p8_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_bitst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_bitst.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_crl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_req.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_spki.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509a.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509a.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_dec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_dec.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_enc.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_fre.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_fre.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_new.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_new.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_prn.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_typ.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_typ.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_utl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_algor.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_algor.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_attrib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_attrib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_bignum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_bignum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_crl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_exten.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_exten.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_info.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_long.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_long.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_name.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_name.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_nx509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_nx509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pubkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pubkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_req.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_sig.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_sig.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_spki.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_val.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_val.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509a.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509a.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\o_names.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\o_names.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_dat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_dat.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_err.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_lib.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_xref.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_xref.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_b64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_b64.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_md.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_md.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_ok.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_ok.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_all.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_allc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_allc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_alld.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_alld.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\digest.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_bf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_bf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_camellia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_camellia.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_cast.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_cast.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des3.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des3.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_idea.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_idea.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_null.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_old.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_old.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_seed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_seed.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_xcbc_d.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_xcbc_d.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\encode.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\encode.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_acnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_acnf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_err.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_key.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pbe.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pbe.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pkey.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ecdsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ecdsa.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md4.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md4.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_mdc2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_mdc2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_null.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ripemd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ripemd.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sigver.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sigver.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_wp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_wp.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\names.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\names.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\openbsd_hw.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\openbsd_hw.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_dec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_dec.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_open.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_open.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_seal.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_seal.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_sign.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_verify.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_fn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_fn.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_gn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_gn.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_err.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buffer.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buffer.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_asn1.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_att.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_att.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_cd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_cd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_dd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_dd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_enc.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_env.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_env.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_err.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_ess.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_ess.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_io.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_io.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_lib.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_sd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_sd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_smime.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_all.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cnf.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cryptodev.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cryptodev.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_ctrl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_ctrl.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_dyn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_dyn.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_err.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_fat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_fat.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_init.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_lib.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_list.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_list.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_openssl.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_pkey.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_table.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_table.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_asnmth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_asnmth.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_cipher.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_cipher.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dh.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_digest.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdh.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_pkmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_pkmeth.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rand.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_store.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_store.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\stack\stack.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\stack\stack.c">
       <Filter>Source Files\crypto\stack</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\bio_pk7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\bio_pk7.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_asn1.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_attr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_attr.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_doit.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_doit.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_lib.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_mime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_mime.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_smime.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pkcs7err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pkcs7err.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_ameth.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_asn1.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_check.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_check.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_depr.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_err.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_gen.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_key.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_lib.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_pmeth.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_prn.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_asn.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_cl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_cl.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_err.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ext.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ext.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ht.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ht.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_lib.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_prn.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_srv.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_srv.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_vfy.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_cache.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_cache.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_data.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_data.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_lib.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_map.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_map.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_node.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_node.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_tree.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_tree.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_addr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_addr.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akey.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akeya.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akeya.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_alt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_alt.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_asid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_asid.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bcons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bcons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bitst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bitst.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_conf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_conf.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_cpols.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_cpols.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_crld.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_crld.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_enum.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_extku.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_extku.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_genn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_genn.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ia5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ia5.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_info.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_int.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_lib.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ncons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ncons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ocsp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ocsp.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pci.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pci.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcia.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pku.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pku.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pmaps.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pmaps.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_prn.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_purp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_purp.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_skey.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_sxnet.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_sxnet.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_utl.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3err.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_asn1.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_conf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_conf.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_err.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_lib.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_print.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_utils.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_utils.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_print.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_sign.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_utils.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_utils.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_verify.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_verify_ctx.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_verify_ctx.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_api.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_api.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_def.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_def.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_err.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_lib.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mall.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mall.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mod.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mod.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_sap.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_sap.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_mult.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_mult.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_smpl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_smpl.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_ameth.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_asn1.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_check.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_check.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_curve.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_curve.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_cvt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_cvt.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_err.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_key.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_lib.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_mult.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_mult.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_pmeth.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_print.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\eck_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\eck_prn.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_mont.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_mont.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nist.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nist.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_smpl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_smpl.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_err.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_key.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_lib.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_ossl.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_asn1.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_err.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_lib.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_ossl.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_sign.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_vrf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_vrf.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_dgst.c">
       <Filter>Source Files\crypto\md5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_one.c">
       <Filter>Source Files\crypto\md5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_dgst.c">
       <Filter>Source Files\crypto\md4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_one.c">
       <Filter>Source Files\crypto\md4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lh_stats.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lh_stats.c">
       <Filter>Source Files\crypto\lhash</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lhash.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lhash.c">
       <Filter>Source Files\crypto\lhash</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_beos.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_beos.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dl.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dlfcn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dlfcn.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_err.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_lib.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_null.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_openssl.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_vms.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_vms.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_win32.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_win32.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_add.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_add.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_asn.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_attr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_attr.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crpt.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crt.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_decr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_decr.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_init.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_key.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_kiss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_kiss.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_mutl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_mutl.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_npas.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_npas.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8d.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8d.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8e.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8e.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_utl.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\pk12err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\pk12err.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_ameth.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_pmeth.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hmac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hmac.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1_one.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1dgst.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha256.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha256.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512t.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512t.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_dgst.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_one.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_rle.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_rle.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_zlib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_zlib.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_err.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_lib.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_all.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_err.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_info.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_lib.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_oth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_oth.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pk8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pk8.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pkey.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_seal.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_seal.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_sign.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_x509.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_xaux.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_xaux.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pvkfmt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pvkfmt.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_block.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_block.c">
       <Filter>Source Files\crypto\whrlpool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_dgst.c">
       <Filter>Source Files\crypto\whrlpool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2_one.c">
       <Filter>Source Files\crypto\mdc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2dgst.c">
       <Filter>Source Files\crypto\mdc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\krb5\krb5_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\krb5\krb5_asn.c">
       <Filter>Source Files\crypto\krb5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\txt_db\txt_db.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\txt_db\txt_db.c">
       <Filter>Source Files\crypto\txt_db</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pqueue\pqueue.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pqueue\pqueue.c">
       <Filter>Source Files\crypto\pqueue</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ms\uplink.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.c">
       <Filter>Source Files\ms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_str.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_str.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_utl.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_utl.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_crpt.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4_hmac_md5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4_hmac_md5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes_cbc_hmac_sha1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes_cbc_hmac_sha1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\gcm128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\gcm128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ccm128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ccm128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\xts128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\xts128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rsax.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rsax.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rdrand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rdrand.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_pwri.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_pwri.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cmac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cmac.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_ameth.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_pmeth.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_init.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp256.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp256.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp224.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp224.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp521.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp521.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_vfy.c">
       <Filter>Source Files\crypto\srp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_lib.c">
       <Filter>Source Files\crypto\srp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_fips.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_fips.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_x931p.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_x931p.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_fips.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_fips.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_str.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_cnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_cnf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\e_os.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\e_os.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_str.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_time.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h">
       <Filter>Header Files\crypto\evp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\aes.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\aes.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1_mac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1_mac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1t.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1t.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bio.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bio.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\blowfish.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\blowfish.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bn.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bn.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\buffer.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\buffer.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\camellia.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\camellia.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cast.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cast.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cms.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cms.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\comp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\comp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf_api.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf_api.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\crypto.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\crypto.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des_old.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des_old.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dh.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dh.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dso.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dso.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dtls1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dtls1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\e_os2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ebcdic.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ebcdic.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ec.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ec.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdh.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdh.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\engine.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\engine.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\err.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\err.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\evp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\evp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\hmac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\hmac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\idea.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\idea.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\krb5_asn.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\krb5_asn.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\kssl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\kssl.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\lhash.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\lhash.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md4.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md4.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md5.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md5.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\mdc2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\mdc2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\modes.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\modes.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\obj_mac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\obj_mac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\objects.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\objects.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ocsp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ocsp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\opensslv.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslv.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ossl_typ.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ossl_typ.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs12.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs12.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs7.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs7.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pqueue.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pqueue.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rand.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rand.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc4.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc4.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ripemd.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ripemd.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\safestack.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\safestack.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\seed.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\seed.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\sha.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\sha.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl23.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl23.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl3.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl3.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\stack.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\stack.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\symhacks.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\symhacks.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\tls1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\tls1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ts.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ts.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\txt_db.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\txt_db.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui_compat.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui_compat.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\whrlpool.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\whrlpool.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509_vfy.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509_vfy.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509v3.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509v3.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_locl.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_pi.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_pi.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\blowfish.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\blowfish.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\ms\uplink.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.h">
       <Filter>Header Files\ms</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj
index e4ac19109b..de0a980a9c 100644
--- a/libs/win32/openssl/libeay32.2012.vcxproj
+++ b/libs/win32/openssl/libeay32.2012.vcxproj
@@ -58,18 +58,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -85,18 +89,18 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -111,7 +115,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
@@ -119,11 +123,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -133,7 +137,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -147,7 +151,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
@@ -155,18 +159,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -181,7 +185,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
@@ -189,11 +193,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h"
-copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c"
-copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h"
-copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def"
-if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S
+      <Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslconf.h"
+copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\applink.c"
+copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\crypto\buildinf.h"
+copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def"
+if not exist "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\include\openssl\" /C /Y /S
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -203,7 +207,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion)\crypto\aes;..\..\openssl-$(OpenSSLVersion)\crypto\asn1;..\..\openssl-$(OpenSSLVersion)\crypto\bf;..\..\openssl-$(OpenSSLVersion)\crypto\bio;..\..\openssl-$(OpenSSLVersion)\crypto\bn;..\..\openssl-$(OpenSSLVersion)\crypto\buffer;..\..\openssl-$(OpenSSLVersion)\crypto\camellia;..\..\openssl-$(OpenSSLVersion)\crypto\cast;..\..\openssl-$(OpenSSLVersion)\crypto\cms;..\..\openssl-$(OpenSSLVersion)\crypto\comp;..\..\openssl-$(OpenSSLVersion)\crypto\conf;..\..\openssl-$(OpenSSLVersion)\crypto\des;..\..\openssl-$(OpenSSLVersion)\crypto\dh;..\..\openssl-$(OpenSSLVersion)\crypto\dsa;..\..\openssl-$(OpenSSLVersion)\crypto\dso;..\..\openssl-$(OpenSSLVersion)\crypto\ec;..\..\openssl-$(OpenSSLVersion)\crypto\ecdh;..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa;..\..\openssl-$(OpenSSLVersion)\crypto\engine;..\..\openssl-$(OpenSSLVersion)\crypto\err;..\..\openssl-$(OpenSSLVersion)\crypto\evp;..\..\openssl-$(OpenSSLVersion)\crypto\modes;..\..\openssl-$(OpenSSLVersion)\ms;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -217,679 +221,679 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\libeay32.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_x931p.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_str.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cmac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_pwri.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cpt_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cryptlib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cversion.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp224.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp256.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp521.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_oct.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rdrand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rsax.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_cnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_fips.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes_cbc_hmac_sha1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4_hmac_md5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ex_data.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_clr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_dbg.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ccm128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\gcm128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\xts128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_dir.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_fips.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_str.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\uid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_cfb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ofb64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_cksm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64ede.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb3_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ede_cbcm_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_read.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_writ.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt_b.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64ede.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\pcbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\qud_cksm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rand_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\read2pwd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rpc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\set_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\str2key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\xcbc_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_core.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ctr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ige.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_misc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_wrap.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\camellia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ctr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_misc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cfb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ecb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ofb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cbc128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cfb128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ctr128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cts128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ofb128.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_add.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_asm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_blind.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_const.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_ctx.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_div.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gcd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gf2m.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_kron.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mod.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mont.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mpi.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mul.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_nist.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_prime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_recp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_shift.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqrt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_word.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_chk.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_eay.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_none.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_oaep.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pk1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_saos.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_x931.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_vrf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\md_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_egd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_nw.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_os2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_unix.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_win.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\randfile.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_dump.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_sock.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_buff.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_nbio.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_cb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_acpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_bio.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_conn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_dgram.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_fd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_file.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_log.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_mem.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_sock.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_compat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_util.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_dir.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_file.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_att.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_cmp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_d2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_def.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_ext.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_lu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_obj.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_r2x.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_set.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_trs.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_txt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_v3.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vpm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509cset.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509name.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509rset.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509type.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bitstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bool.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bytes.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_d2i_fp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_dup.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_gentm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_i2d_fp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_mbstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_object.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_octet.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_set.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strex.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strnid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_type.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utctm.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utf8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\ameth_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_par.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_mime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_moid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_pack.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_ndef.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\evp_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_string.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pu.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\n_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\nsseq.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbe.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbev2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p8_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_bitst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509a.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_dec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_fre.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_new.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_typ.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_algor.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_attrib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_bignum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_exten.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_long.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_name.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_nx509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pubkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_sig.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_spki.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_val.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509a.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\o_names.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_dat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_xref.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_b64.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_md.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_ok.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_allc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_alld.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_bf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_camellia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_cast.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des3.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_idea.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_old.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_seed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_xcbc_d.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\encode.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_acnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pbe.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ecdsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md4.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_mdc2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ripemd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sigver.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_wp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\names.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\openbsd_hw.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_dec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_open.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_seal.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_fn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_gn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buffer.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_att.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_cd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_dd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_env.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_ess.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_io.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_sd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cnf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cryptodev.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_ctrl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_dyn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_fat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_list.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_table.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_asnmth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_cipher.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_digest.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_pkmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_store.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\stack\stack.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\bio_pk7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_attr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_doit.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_mime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pkcs7err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_check.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_depr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_gen.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_cl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ext.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ht.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_srv.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_vfy.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_cache.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_data.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_map.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_node.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_tree.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_addr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akeya.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_alt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_asid.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bcons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bitst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_conf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_cpols.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_crld.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_enum.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_extku.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_genn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ia5.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_int.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ncons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ocsp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pci.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcia.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcons.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pku.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pmaps.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_purp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_skey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_sxnet.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_conf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_utils.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_utils.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_verify_ctx.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_api.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_def.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mall.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mod.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_sap.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_mult.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_smpl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_check.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_curve.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_cvt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_mult.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_print.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\eck_prn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_mont.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nist.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_smpl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_ossl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_vrf.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lh_stats.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lhash.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_beos.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dlfcn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_null.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_vms.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_win32.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_add.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_attr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crpt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_decr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_init.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_key.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_kiss.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_mutl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_npas.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8d.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8e.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_utl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\pk12err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_ameth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_pmeth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hmac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha256.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512t.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_rle.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_zlib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_all.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_info.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_oth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pk8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_seal.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_sign.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_x509.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_xaux.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pvkfmt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_block.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2_one.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\krb5\krb5_asn.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\txt_db\txt_db.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pqueue\pqueue.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ms\uplink.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_x931p.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_str.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cmac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_pwri.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cpt_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cversion.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp224.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp256.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp521.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_oct.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rdrand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rsax.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_cnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_fips.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes_cbc_hmac_sha1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4_hmac_md5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ex_data.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_clr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_dbg.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ccm128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\gcm128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\xts128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_fips.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\uid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_cfb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ofb64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_cksm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64ede.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb3_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ede_cbcm_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_read.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_writ.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt_b.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64ede.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\pcbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\qud_cksm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rand_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\read2pwd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rpc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\set_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\str2key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\xcbc_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_core.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ctr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ige.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_misc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_wrap.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\camellia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ctr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_misc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cfb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ecb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ofb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cbc128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cfb128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ctr128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cts128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ofb128.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_add.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_asm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_blind.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_const.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_ctx.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_div.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gcd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gf2m.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_kron.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mod.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mont.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mpi.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mul.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_nist.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_prime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_recp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_shift.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqrt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_word.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_chk.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_eay.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_none.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_oaep.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pk1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_saos.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_x931.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_vrf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\md_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_egd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_nw.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_os2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_unix.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_win.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\randfile.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_dump.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_sock.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_buff.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_nbio.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_cb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_acpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_bio.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_conn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_dgram.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_fd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_file.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_log.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_mem.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_sock.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_compat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_util.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_dir.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_file.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_att.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_cmp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_d2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_def.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_ext.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_lu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_obj.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_r2x.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_set.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_trs.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_txt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_v3.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vpm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509cset.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509name.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509rset.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509type.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bitstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bool.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bytes.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_d2i_fp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_dup.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_gentm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_i2d_fp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_mbstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_object.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_octet.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_set.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strex.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strnid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_type.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utctm.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utf8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\ameth_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_par.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_mime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_moid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_pack.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_ndef.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\evp_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_string.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pu.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\n_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\nsseq.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbe.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbev2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p8_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_bitst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509a.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_dec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_fre.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_new.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_typ.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_algor.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_attrib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_bignum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_exten.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_long.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_name.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_nx509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pubkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_sig.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_spki.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_val.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509a.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\o_names.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_dat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_xref.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_b64.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_md.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_ok.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_allc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_alld.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_bf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_camellia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_cast.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des3.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_idea.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_old.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_seed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_xcbc_d.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\encode.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_acnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pbe.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ecdsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md4.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_mdc2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ripemd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sigver.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_wp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\names.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\openbsd_hw.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_dec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_open.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_seal.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_fn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_gn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buffer.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_att.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_cd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_dd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_env.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_ess.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_io.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_sd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cnf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cryptodev.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_ctrl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_dyn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_fat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_list.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_table.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_asnmth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_cipher.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_digest.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_pkmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_store.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\stack\stack.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\bio_pk7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_attr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_doit.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_mime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pkcs7err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_check.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_depr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_gen.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_cl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ext.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ht.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_srv.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_vfy.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_cache.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_data.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_map.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_node.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_tree.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_addr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akeya.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_alt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_asid.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bcons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bitst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_conf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_cpols.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_crld.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_enum.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_extku.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_genn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ia5.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_int.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ncons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ocsp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pci.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcia.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcons.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pku.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pmaps.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_purp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_skey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_sxnet.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_conf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_utils.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_utils.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_verify_ctx.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_api.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_def.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mall.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mod.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_sap.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_mult.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_smpl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_check.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_curve.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_cvt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_mult.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_print.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\eck_prn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_mont.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nist.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_smpl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_ossl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_vrf.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lh_stats.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lhash.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_beos.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dlfcn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_null.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_vms.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_win32.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_add.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_attr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crpt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_decr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_init.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_key.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_kiss.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_mutl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_npas.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8d.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8e.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_utl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\pk12err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_ameth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_pmeth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hmac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha256.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512t.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_rle.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_zlib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_all.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_info.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_oth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pk8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_seal.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_sign.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_xaux.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pvkfmt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_block.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2_one.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\krb5\krb5_asn.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\txt_db\txt_db.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pqueue\pqueue.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\e_os.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_str.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_time.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\aes.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1_mac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1t.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bio.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\blowfish.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bn.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\buffer.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\camellia.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cast.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cms.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\comp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf_api.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\crypto.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des_old.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dh.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dso.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dtls1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\e_os2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ebcdic.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ec.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdh.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\engine.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\err.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\evp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\hmac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\idea.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\krb5_asn.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\kssl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\lhash.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md4.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md5.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\mdc2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\modes.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\obj_mac.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\objects.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ocsp.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\opensslv.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ossl_typ.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs12.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs7.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pqueue.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rand.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc4.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ripemd.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rsa.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\safestack.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\seed.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\sha.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl2.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl23.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl3.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\stack.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\symhacks.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\tls1.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ts.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\txt_db.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui_compat.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\whrlpool.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509_vfy.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509v3.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_locl.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_pi.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\blowfish.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\ms\uplink.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\e_os.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\aes.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1_mac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1t.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bio.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\blowfish.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bn.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\buffer.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\camellia.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cast.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cms.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\comp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf_api.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\crypto.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des_old.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dh.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dso.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dtls1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ebcdic.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ec.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdh.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\engine.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\err.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\evp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\hmac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\idea.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\krb5_asn.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\kssl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\lhash.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md4.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md5.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\mdc2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\modes.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\obj_mac.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\objects.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ocsp.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslv.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ossl_typ.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs12.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs7.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pqueue.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rand.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc4.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ripemd.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rsa.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\safestack.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\seed.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\sha.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl2.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl23.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl3.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\stack.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\symhacks.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\tls1.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ts.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\txt_db.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui_compat.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\whrlpool.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509_vfy.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509v3.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_pi.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\blowfish.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Download OPENSSL.2012.vcxproj">
diff --git a/libs/win32/openssl/libeay32.2012.vcxproj.filters b/libs/win32/openssl/libeay32.2012.vcxproj.filters
index 80893a4fe8..ce9c62b732 100644
--- a/libs/win32/openssl/libeay32.2012.vcxproj.filters
+++ b/libs/win32/openssl/libeay32.2012.vcxproj.filters
@@ -185,1998 +185,1998 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cpt_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cpt_err.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cryptlib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cversion.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cversion.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ex_data.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ex_data.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_clr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_clr.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mem_dbg.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mem_dbg.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_dir.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\uid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\uid.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_cbc.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_ecb.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2_skey.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2cfb64.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc2\rc2ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc2\rc2ofb64.c">
       <Filter>Source Files\crypto\rc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_enc.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_skey.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cbc.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_cfb64.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ecb.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_ofb64.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\idea\i_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\idea\i_skey.c">
       <Filter>Source Files\crypto\idea</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_cfb64.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ecb.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_enc.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_ofb64.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bf\bf_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_skey.c">
       <Filter>Source Files\crypto\bf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_cfb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_cfb64.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ecb.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_enc.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_ofb64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_ofb64.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cast\c_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cast\c_skey.c">
       <Filter>Source Files\crypto\cast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_dgst.c">
       <Filter>Source Files\crypto\ripemd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ripemd\rmd_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ripemd\rmd_one.c">
       <Filter>Source Files\crypto\ripemd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_cksm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_cksm.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64ede.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64ede.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb64enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb64enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\cfb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\cfb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\des_old2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\des_old2.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb3_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb3_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ecb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ecb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ede_cbcm_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ede_cbcm_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_read.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_read.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\enc_writ.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\enc_writ.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\fcrypt_b.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\fcrypt_b.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64ede.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64ede.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb64enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb64enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\ofb_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\ofb_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\pcbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\pcbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\qud_cksm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\qud_cksm.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rand_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rand_key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\read2pwd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\read2pwd.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\rpc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\rpc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\set_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\set_key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\str2key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\str2key.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\des\xcbc_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\des\xcbc_enc.c">
       <Filter>Source Files\crypto\des</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cbc.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_cfb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_core.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_core.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ctr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ctr.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ecb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ige.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ige.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_misc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_misc.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_ofb.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\aes\aes_wrap.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\aes\aes_wrap.c">
       <Filter>Source Files\crypto\aes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\camellia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\camellia.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cbc.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_cfb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ctr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ctr.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ecb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_misc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_misc.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_ofb.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cbc.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_cfb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_cfb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ecb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ecb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\seed\seed_ofb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\seed\seed_ofb.c">
       <Filter>Source Files\crypto\seed</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cbc128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cbc128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cfb128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cfb128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ctr128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ctr128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\cts128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\cts128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ofb128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ofb128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_add.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_add.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_asm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_asm.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_blind.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_blind.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_const.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_const.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_ctx.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_ctx.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_depr.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_div.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_div.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_err.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_exp2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_exp2.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gcd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gcd.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_gf2m.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_gf2m.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_kron.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_kron.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_lib.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mod.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mod.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mont.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mont.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mpi.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mpi.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_mul.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_mul.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_nist.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_nist.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_prime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_prime.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_print.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_rand.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_recp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_recp.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_shift.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_shift.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqr.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_sqrt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_sqrt.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_word.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_word.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ameth.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_asn1.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_chk.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_chk.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_depr.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_eay.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_eay.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_err.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_gen.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_lib.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_none.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_none.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_null.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_oaep.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_oaep.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pk1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pk1.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pmeth.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_prn.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_pss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_pss.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_saos.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_saos.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_sign.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_ssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_ssl.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_x931.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_x931.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ameth.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_asn1.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_depr.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_err.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_gen.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_key.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_lib.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_ossl.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_pmeth.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_prn.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_sign.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dsa\dsa_vrf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dsa\dsa_vrf.c">
       <Filter>Source Files\crypto\dsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\md_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\md_rand.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_egd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_egd.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_err.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_lib.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_nw.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_nw.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_os2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_os2.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_unix.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_unix.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\rand_win.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\rand_win.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rand\randfile.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rand\randfile.c">
       <Filter>Source Files\crypto\rand</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_dump.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_dump.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_print.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\b_sock.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\b_sock.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_buff.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_buff.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_nbio.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_nbio.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bf_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bf_null.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_cb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_cb.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_err.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bio_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bio_lib.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_acpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_acpt.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_bio.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_bio.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_conn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_conn.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_dgram.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_dgram.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_fd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_fd.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_file.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_file.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_log.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_log.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_mem.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_mem.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_null.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bio\bss_sock.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bio\bss_sock.c">
       <Filter>Source Files\crypto\bio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_all.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\err\err_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\err\err_prn.c">
       <Filter>Source Files\crypto\err</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_compat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_compat.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_err.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_lib.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_openssl.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ui\ui_util.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ui\ui_util.c">
       <Filter>Source Files\crypto\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_dir.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_dir.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\by_file.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\by_file.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_att.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_att.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_cmp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_cmp.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_d2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_d2.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_def.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_def.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_err.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_ext.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_ext.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_lu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_lu.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_obj.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_obj.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_r2x.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_r2x.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_req.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_set.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_set.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_trs.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_trs.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_txt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_txt.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_v3.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_v3.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vfy.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509_vpm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509_vpm.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509cset.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509cset.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509name.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509name.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509rset.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509rset.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509spki.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x509type.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x509type.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509\x_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509\x_all.c">
       <Filter>Source Files\crypto\x509</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bitstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bitstr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bool.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bool.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_bytes.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_bytes.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_d2i_fp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_d2i_fp.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_digest.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_dup.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_dup.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_enum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_gentm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_gentm.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_i2d_fp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_i2d_fp.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_int.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_mbstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_mbstr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_object.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_object.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_octet.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_octet.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_print.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_set.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_set.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_sign.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strex.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strex.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_strnid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_strnid.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_time.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_type.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_type.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utctm.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utctm.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_utf8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_utf8.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\a_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\a_verify.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\ameth_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\ameth_lib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_err.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_gen.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_lib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn1_par.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn1_par.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_mime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_mime.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_moid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_moid.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\asn_pack.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\asn_pack.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_asn1.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\bio_ndef.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\bio_ndef.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\d2i_pu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\d2i_pu.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\evp_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\evp_asn1.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_enum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_int.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\f_string.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\f_string.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pr.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\i2d_pu.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\i2d_pu.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\n_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\n_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\nsseq.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\nsseq.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbe.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbe.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p5_pbev2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p5_pbev2.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\p8_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\p8_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_bitst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_bitst.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_crl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_req.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_spki.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\t_x509a.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\t_x509a.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_dec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_dec.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_enc.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_fre.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_fre.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_new.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_new.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_prn.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_typ.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_typ.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\tasn_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\tasn_utl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_algor.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_algor.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_attrib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_attrib.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_bignum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_bignum.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_crl.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_exten.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_exten.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_info.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_long.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_long.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_name.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_name.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_nx509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_nx509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_pubkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_pubkey.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_req.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_sig.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_sig.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_spki.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_spki.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_val.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_val.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\asn1\x_x509a.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\asn1\x_x509a.c">
       <Filter>Source Files\crypto\asn1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\o_names.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\o_names.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_dat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_dat.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_err.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_lib.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\objects\obj_xref.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\objects\obj_xref.c">
       <Filter>Source Files\crypto\objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_b64.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_b64.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_md.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_md.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\bio_ok.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\bio_ok.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_all.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_allc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_allc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\c_alld.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\c_alld.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\digest.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_bf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_bf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_camellia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_camellia.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_cast.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_cast.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_des3.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_des3.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_idea.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_idea.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_null.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_old.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_old.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_seed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_seed.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_xcbc_d.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_xcbc_d.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\encode.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\encode.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_acnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_acnf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_err.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_key.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pbe.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pbe.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_pkey.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_dss1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_dss1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ecdsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ecdsa.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md4.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md4.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_md5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_md5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_mdc2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_mdc2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_null.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_ripemd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_ripemd.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sha1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sha1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_sigver.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_sigver.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\m_wp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\m_wp.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\names.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\names.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\openbsd_hw.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\openbsd_hw.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p5_crpt2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p5_crpt2.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_dec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_dec.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_enc.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_open.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_open.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_seal.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_seal.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_sign.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\p_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\p_verify.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_fn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_fn.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_gn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_gn.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\pmeth_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\pmeth_lib.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_err.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buffer.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buffer.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_asn1.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_att.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_att.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_cd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_cd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_dd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_dd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_enc.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_env.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_env.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_err.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_ess.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_ess.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_io.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_io.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_lib.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_sd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_sd.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_smime.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_all.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cnf.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_cryptodev.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_cryptodev.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_ctrl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_ctrl.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_dyn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_dyn.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_err.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_fat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_fat.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_init.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_lib.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_list.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_list.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_openssl.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_pkey.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_table.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_table.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_asnmth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_asnmth.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_cipher.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_cipher.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dh.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_digest.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_digest.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_dsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_dsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdh.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_ecdsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_ecdsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_pkmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_pkmeth.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rand.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_rsa.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\tb_store.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\tb_store.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\stack\stack.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\stack\stack.c">
       <Filter>Source Files\crypto\stack</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\bio_pk7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\bio_pk7.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_asn1.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_attr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_attr.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_doit.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_doit.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_lib.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_mime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_mime.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pk7_smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pk7_smime.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs7\pkcs7err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs7\pkcs7err.c">
       <Filter>Source Files\crypto\pkcs7</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_ameth.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_asn1.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_check.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_check.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_depr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_depr.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_err.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_gen.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_gen.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_key.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_lib.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_pmeth.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dh\dh_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dh\dh_prn.c">
       <Filter>Source Files\crypto\dh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_asn.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_cl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_cl.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_err.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ext.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ext.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_ht.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_ht.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_lib.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_prn.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_srv.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_srv.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ocsp\ocsp_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ocsp\ocsp_vfy.c">
       <Filter>Source Files\crypto\ocsp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_cache.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_cache.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_data.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_data.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_lib.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_map.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_map.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_node.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_node.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\pcy_tree.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\pcy_tree.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_addr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_addr.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akey.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_akeya.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_akeya.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_alt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_alt.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_asid.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_asid.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bcons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bcons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_bitst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_bitst.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_conf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_conf.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_cpols.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_cpols.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_crld.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_crld.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_enum.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_enum.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_extku.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_extku.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_genn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_genn.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ia5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ia5.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_info.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_int.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_int.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_lib.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ncons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ncons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_ocsp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_ocsp.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pci.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pci.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcia.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcia.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pcons.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pcons.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pku.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pku.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_pmaps.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_pmaps.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_prn.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_purp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_purp.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_skey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_skey.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_sxnet.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_sxnet.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3_utl.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\x509v3\v3err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\x509v3\v3err.c">
       <Filter>Source Files\crypto\x509v3</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_asn1.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_conf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_conf.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_err.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_lib.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_print.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_req_utils.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_req_utils.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_print.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_sign.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_utils.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_utils.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_rsp_verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_rsp_verify.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ts\ts_verify_ctx.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ts\ts_verify_ctx.c">
       <Filter>Source Files\crypto\ts</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_api.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_api.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_def.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_def.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_err.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_lib.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mall.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mall.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_mod.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_mod.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\conf\conf_sap.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\conf\conf_sap.c">
       <Filter>Source Files\crypto\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_mult.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_mult.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_smpl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_smpl.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_ameth.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_asn1.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_check.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_check.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_curve.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_curve.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_cvt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_cvt.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_err.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_key.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_lib.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_mult.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_mult.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_pmeth.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_print.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_print.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\eck_prn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\eck_prn.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_mont.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_mont.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nist.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nist.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_smpl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_smpl.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_err.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_key.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_lib.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdh\ech_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdh\ech_ossl.c">
       <Filter>Source Files\crypto\ecdh</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_asn1.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_err.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_lib.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_ossl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_ossl.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_sign.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ecdsa\ecs_vrf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ecdsa\ecs_vrf.c">
       <Filter>Source Files\crypto\ecdsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_dgst.c">
       <Filter>Source Files\crypto\md5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md5\md5_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md5\md5_one.c">
       <Filter>Source Files\crypto\md5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_dgst.c">
       <Filter>Source Files\crypto\md4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\md4\md4_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\md4\md4_one.c">
       <Filter>Source Files\crypto\md4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lh_stats.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lh_stats.c">
       <Filter>Source Files\crypto\lhash</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\lhash\lhash.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\lhash\lhash.c">
       <Filter>Source Files\crypto\lhash</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_beos.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_beos.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dl.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_dlfcn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_dlfcn.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_err.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_lib.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_null.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_null.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_openssl.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_vms.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_vms.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\dso\dso_win32.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\dso\dso_win32.c">
       <Filter>Source Files\crypto\dso</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_add.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_add.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_asn.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_attr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_attr.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crpt.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_crt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_crt.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_decr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_decr.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_init.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_key.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_key.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_kiss.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_kiss.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_mutl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_mutl.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_npas.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_npas.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8d.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8d.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_p8e.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_p8e.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\p12_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\p12_utl.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pkcs12\pk12err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pkcs12\pk12err.c">
       <Filter>Source Files\crypto\pkcs12</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_ameth.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hm_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hm_pmeth.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\hmac\hmac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\hmac\hmac.c">
       <Filter>Source Files\crypto\hmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1_one.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha1dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha1dgst.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha256.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha256.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha512t.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha512t.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_dgst.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\sha\sha_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\sha\sha_one.c">
       <Filter>Source Files\crypto\sha</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_rle.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_rle.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\c_zlib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\c_zlib.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_err.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\comp\comp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\comp\comp_lib.c">
       <Filter>Source Files\crypto\comp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_all.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_all.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_err.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_info.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_info.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_lib.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_oth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_oth.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pk8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pk8.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_pkey.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_seal.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_seal.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_sign.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_sign.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_x509.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pem_xaux.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pem_xaux.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pem\pvkfmt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pem\pvkfmt.c">
       <Filter>Source Files\crypto\pem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_block.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_block.c">
       <Filter>Source Files\crypto\whrlpool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\whrlpool\wp_dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\whrlpool\wp_dgst.c">
       <Filter>Source Files\crypto\whrlpool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2_one.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2_one.c">
       <Filter>Source Files\crypto\mdc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\mdc2\mdc2dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\mdc2\mdc2dgst.c">
       <Filter>Source Files\crypto\mdc2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\krb5\krb5_asn.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\krb5\krb5_asn.c">
       <Filter>Source Files\crypto\krb5</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\txt_db\txt_db.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\txt_db\txt_db.c">
       <Filter>Source Files\crypto\txt_db</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\pqueue\pqueue.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\pqueue\pqueue.c">
       <Filter>Source Files\crypto\pqueue</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ms\uplink.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.c">
       <Filter>Source Files\ms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\buffer\buf_str.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\buffer\buf_str.c">
       <Filter>Source Files\crypto\buffer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\camellia\cmll_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\camellia\cmll_utl.c">
       <Filter>Source Files\crypto\camellia</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rc4\rc4_utl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rc4\rc4_utl.c">
       <Filter>Source Files\crypto\rc4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\rsa\rsa_crpt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\rsa\rsa_crpt.c">
       <Filter>Source Files\crypto\rsa</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ec2_oct.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ec2_oct.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_rc4_hmac_md5.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_rc4_hmac_md5.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\e_aes_cbc_hmac_sha1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\e_aes_cbc_hmac_sha1.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\gcm128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\gcm128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\ccm128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\ccm128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\modes\xts128.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\modes\xts128.c">
       <Filter>Source Files\crypto\modes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rsax.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rsax.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\engine\eng_rdrand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\engine\eng_rdrand.c">
       <Filter>Source Files\crypto\engine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cms\cms_pwri.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cms\cms_pwri.c">
       <Filter>Source Files\crypto\cms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cmac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cmac.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_ameth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_ameth.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\cmac\cm_pmeth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\cmac\cm_pmeth.c">
       <Filter>Source Files\crypto\cmac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_init.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_init.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp256.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp256.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp224.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp224.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\ec\ecp_nistp521.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\ec\ecp_nistp521.c">
       <Filter>Source Files\crypto\ec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_vfy.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_vfy.c">
       <Filter>Source Files\crypto\srp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\srp\srp_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\srp\srp_lib.c">
       <Filter>Source Files\crypto\srp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_fips.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_fips.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\bn\bn_x931p.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\bn\bn_x931p.c">
       <Filter>Source Files\crypto\bn</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_fips.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_fips.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\o_str.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\crypto\evp\evp_cnf.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_cnf.c">
       <Filter>Source Files\crypto\evp</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\e_os.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\e_os.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_str.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_str.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_time.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_time.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h">
       <Filter>Header Files\crypto\evp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\aes.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\aes.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1_mac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1_mac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\asn1t.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\asn1t.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bio.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bio.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\blowfish.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\blowfish.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\bn.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\bn.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\buffer.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\buffer.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\camellia.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\camellia.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cast.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cast.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\cms.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\cms.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\comp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\comp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\conf_api.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\conf_api.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\crypto.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\crypto.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\des_old.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\des_old.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dh.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dh.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dso.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dso.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\dtls1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\dtls1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\e_os2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\e_os2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ebcdic.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ebcdic.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ec.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ec.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdh.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdh.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ecdsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ecdsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\engine.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\engine.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\err.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\err.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\evp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\evp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\hmac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\hmac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\idea.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\idea.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\krb5_asn.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\krb5_asn.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\kssl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\kssl.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\lhash.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\lhash.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md4.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md4.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\md5.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\md5.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\mdc2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\mdc2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\modes.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\modes.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\obj_mac.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\obj_mac.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\objects.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\objects.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ocsp.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ocsp.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\opensslv.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\opensslv.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ossl_typ.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ossl_typ.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pem2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pem2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs12.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs12.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pkcs7.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pkcs7.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\pqueue.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\pqueue.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rand.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rand.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rc4.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rc4.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ripemd.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ripemd.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\rsa.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\rsa.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\safestack.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\safestack.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\seed.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\seed.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\sha.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\sha.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl2.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl2.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl23.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl23.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ssl3.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ssl3.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\stack.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\stack.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\symhacks.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\symhacks.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\tls1.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\tls1.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ts.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ts.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\txt_db.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\txt_db.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\ui_compat.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\ui_compat.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\whrlpool.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\whrlpool.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509_vfy.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509_vfy.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\include\openssl\x509v3.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\include\openssl\x509v3.h">
       <Filter>Header Files\openssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_locl.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\bf_pi.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\bf_pi.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\bf\blowfish.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\bf\blowfish.h">
       <Filter>Header Files\bf</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\ms\uplink.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\ms\uplink.h">
       <Filter>Header Files\ms</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/openssl/openssl.2010.vcxproj b/libs/win32/openssl/openssl.2010.vcxproj
index e1c8e5242d..f3f0c03bea 100644
--- a/libs/win32/openssl/openssl.2010.vcxproj
+++ b/libs/win32/openssl/openssl.2010.vcxproj
@@ -49,18 +49,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -75,7 +79,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -103,7 +107,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -135,7 +139,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -165,7 +169,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -189,61 +193,61 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\app_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\apps.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\asn1pars.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ca.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ciphers.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\cms.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl2p7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dhparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsaparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ecparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\engine.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\errstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genpkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genrsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\nseq.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ocsp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\passwd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs12.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyutl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\prime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsautl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\srp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_cb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_client.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_server.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_socket.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\sess_id.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\speed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\spkac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ts.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\version.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\winrand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\app_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\asn1pars.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ca.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ciphers.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\cms.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl2p7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dhparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsaparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ecparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\engine.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\errstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genpkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genrsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\nseq.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ocsp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\passwd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs12.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyutl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\prime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsautl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\srp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_cb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_client.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_server.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_socket.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\sess_id.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\speed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\spkac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ts.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\version.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\winrand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\x509.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\apps\apps.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libeay32.2010.vcxproj">
diff --git a/libs/win32/openssl/openssl.2010.vcxproj.filters b/libs/win32/openssl/openssl.2010.vcxproj.filters
index 0aa3b5be8c..a87e2e4a24 100644
--- a/libs/win32/openssl/openssl.2010.vcxproj.filters
+++ b/libs/win32/openssl/openssl.2010.vcxproj.filters
@@ -17,165 +17,165 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\app_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\app_rand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\apps.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\asn1pars.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\asn1pars.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ca.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ca.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ciphers.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ciphers.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\cms.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\cms.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl2p7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl2p7.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dgst.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dh.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dhparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dhparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsaparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsaparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ec.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ecparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ecparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\enc.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\engine.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\engine.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\errstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\errstr.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendh.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genpkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genpkey.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genrsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genrsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\nseq.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\nseq.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ocsp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ocsp.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\openssl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\passwd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\passwd.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs12.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs12.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs7.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs8.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkey.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyutl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyutl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\prime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\prime.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\req.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsautl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsautl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_cb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_cb.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_client.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_client.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_server.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_server.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_socket.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_socket.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_time.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\sess_id.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\sess_id.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\smime.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\speed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\speed.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\spkac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\spkac.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ts.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ts.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\verify.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\version.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\version.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\winrand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\winrand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\x509.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\srp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\srp.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\apps\apps.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.h">
       <Filter>Header Files\apps</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/openssl/openssl.2012.vcxproj b/libs/win32/openssl/openssl.2012.vcxproj
index f12884bc40..3b4dd66eeb 100644
--- a/libs/win32/openssl/openssl.2012.vcxproj
+++ b/libs/win32/openssl/openssl.2012.vcxproj
@@ -53,18 +53,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -79,7 +83,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -107,7 +111,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -139,7 +143,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -169,7 +173,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -193,61 +197,61 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\app_rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\apps.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\asn1pars.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ca.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ciphers.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\cms.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl2p7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dgst.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dhparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsaparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ec.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ecparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\engine.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\errstr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendh.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genpkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genrsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\nseq.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ocsp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\openssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\passwd.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs12.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs7.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs8.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkey.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyparam.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyutl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\prime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\req.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsautl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\srp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_cb.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_client.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_server.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_socket.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_time.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\sess_id.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\smime.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\speed.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\spkac.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ts.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\verify.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\version.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\winrand.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\x509.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\app_rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\asn1pars.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ca.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ciphers.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\cms.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl2p7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dgst.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dhparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsaparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ec.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ecparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\engine.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\errstr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendh.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genpkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genrsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\nseq.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ocsp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\openssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\passwd.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs12.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs7.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs8.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkey.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyparam.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyutl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\prime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\req.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsautl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\srp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_cb.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_client.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_server.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_socket.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_time.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\sess_id.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\smime.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\speed.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\spkac.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ts.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\verify.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\version.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\winrand.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\x509.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\apps\apps.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libeay32.2012.vcxproj">
diff --git a/libs/win32/openssl/openssl.2012.vcxproj.filters b/libs/win32/openssl/openssl.2012.vcxproj.filters
index 0aa3b5be8c..a87e2e4a24 100644
--- a/libs/win32/openssl/openssl.2012.vcxproj.filters
+++ b/libs/win32/openssl/openssl.2012.vcxproj.filters
@@ -17,165 +17,165 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\app_rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\app_rand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\apps.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\asn1pars.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\asn1pars.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ca.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ca.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ciphers.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ciphers.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\cms.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\cms.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\crl2p7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\crl2p7.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dgst.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dgst.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dh.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dhparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dhparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\dsaparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\dsaparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ec.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ec.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ecparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ecparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\enc.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\engine.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\engine.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\errstr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\errstr.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendh.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendh.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\gendsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\gendsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genpkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genpkey.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\genrsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\genrsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\nseq.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\nseq.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ocsp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ocsp.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\openssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\openssl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\passwd.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\passwd.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs12.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs12.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs7.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs7.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkcs8.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkcs8.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkey.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkey.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyparam.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyparam.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\pkeyutl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\pkeyutl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\prime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\prime.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\req.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\req.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsa.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\rsautl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\rsautl.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_cb.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_cb.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_client.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_client.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_server.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_server.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_socket.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_socket.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\s_time.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\s_time.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\sess_id.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\sess_id.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\smime.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\smime.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\speed.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\speed.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\spkac.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\spkac.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\ts.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\ts.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\verify.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\verify.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\version.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\version.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\winrand.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\winrand.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\x509.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\x509.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\apps\srp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\apps\srp.c">
       <Filter>Source Files\apps</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\apps\apps.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\apps\apps.h">
       <Filter>Header Files\apps</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj b/libs/win32/openssl/ssleay32.2010.vcxproj
index 71c52bd331..9e4f641c28 100644
--- a/libs/win32/openssl/ssleay32.2010.vcxproj
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj
@@ -53,18 +53,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -80,13 +84,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -108,13 +112,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -136,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -145,7 +149,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -166,7 +170,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -175,7 +179,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -195,58 +199,58 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\bio_ssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_both.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srtp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\kssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_both.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_algs.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_cert.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_ciph.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_sess.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_stat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_txt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_reneg.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\tls_srp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\bio_ssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_both.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srtp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\kssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_both.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_algs.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_cert.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_ciph.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_sess.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_stat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_txt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_reneg.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\tls_srp.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libeay32.2010.vcxproj">
diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj.filters b/libs/win32/openssl/ssleay32.2010.vcxproj.filters
index 85a68df172..5686c6efca 100644
--- a/libs/win32/openssl/ssleay32.2010.vcxproj.filters
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj.filters
@@ -20,156 +20,156 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\bio_ssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\bio_ssl.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_both.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_both.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\kssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\kssl.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_both.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_both.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_algs.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_algs.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_asn1.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_cert.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_cert.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_ciph.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_ciph.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err2.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_rsa.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_sess.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_sess.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_stat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_stat.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_txt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_txt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_reneg.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_reneg.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\tls_srp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\tls_srp.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srtp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srtp.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_cbc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h">
       <Filter>Header Files\crypto\evp</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj b/libs/win32/openssl/ssleay32.2012.vcxproj
index d677d84b5d..9c8f848402 100644
--- a/libs/win32/openssl/ssleay32.2012.vcxproj
+++ b/libs/win32/openssl/ssleay32.2012.vcxproj
@@ -57,18 +57,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extdll.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -84,13 +88,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -112,13 +116,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -140,7 +144,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -149,7 +153,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -171,7 +175,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def"</Command>
+      <Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-$(OpenSSLVersion)\ssleay32.def"</Command>
     </PreBuildEvent>
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -180,7 +184,7 @@
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\openssl-$(OpenSSLVersion)\include;..\..\openssl-$(OpenSSLVersion)\crypto;..\..\openssl-$(OpenSSLVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -201,58 +205,58 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\bio_ssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_both.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srtp.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\kssl.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_both.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_cbc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_pkt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_algs.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_asn1.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_cert.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_ciph.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err2.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_rsa.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_sess.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_stat.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_txt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_clnt.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_enc.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_lib.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_meth.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_reneg.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_srvr.c" />
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\tls_srp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\bio_ssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_both.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srtp.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\kssl.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_both.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_cbc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_pkt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_algs.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_asn1.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_cert.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_ciph.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err2.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_rsa.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_sess.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_stat.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_txt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_clnt.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_enc.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_lib.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_meth.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_reneg.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_srvr.c" />
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\tls_srp.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h" />
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h" />
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libeay32.2012.vcxproj">
diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj.filters b/libs/win32/openssl/ssleay32.2012.vcxproj.filters
index 85a68df172..5686c6efca 100644
--- a/libs/win32/openssl/ssleay32.2012.vcxproj.filters
+++ b/libs/win32/openssl/ssleay32.2012.vcxproj.filters
@@ -20,156 +20,156 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\bio_ssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\bio_ssl.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_both.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_both.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\kssl.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\kssl.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s23_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s23_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s2_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s2_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_both.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_both.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_pkt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_pkt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_algs.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_algs.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_asn1.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_asn1.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_cert.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_cert.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_ciph.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_ciph.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_err2.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_err2.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_rsa.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_rsa.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_sess.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_sess.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_stat.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_stat.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\ssl_txt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\ssl_txt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_clnt.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_clnt.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_enc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_enc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_lib.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_lib.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_meth.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_meth.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_reneg.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_reneg.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\t1_srvr.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\t1_srvr.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\tls_srp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\tls_srp.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\d1_srtp.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\d1_srtp.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1g\ssl\s3_cbc.c">
+    <ClCompile Include="..\..\openssl-$(OpenSSLVersion)\ssl\s3_cbc.c">
       <Filter>Source Files\ssl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\cryptlib.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\o_dir.h">
       <Filter>Header Files\crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1g\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-$(OpenSSLVersion)\crypto\evp\evp_locl.h">
       <Filter>Header Files\crypto\evp</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj
index 9f4b294266..8e163da9bd 100644
--- a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj
+++ b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj
@@ -50,18 +50,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -78,7 +82,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -114,7 +118,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -148,7 +152,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +189,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj
index 3dd1eb7a81..bd8a68bd2c 100644
--- a/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj
+++ b/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj
@@ -54,18 +54,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\extlib.props" />
+    <Import Project="..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -82,7 +86,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -119,7 +123,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +158,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -192,7 +196,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj
index 6d5e67e8a7..24d60e629e 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj
@@ -47,18 +47,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_debug.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_debug.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -66,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -83,7 +87,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -98,7 +102,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -115,7 +119,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj
index 92c4a10d0a..b6aed02f7d 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj
@@ -51,18 +51,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_debug.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_debug.props" />
+    <Import Project="..\..\..\..\w32\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -86,7 +90,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -105,7 +109,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -122,7 +126,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -141,7 +145,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 43fedd67cc..eaaa36b3ec 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -47,18 +47,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -88,7 +92,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -147,7 +151,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -199,7 +203,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -249,7 +253,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj
index 6987782bff..73bb5f6542 100644
--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -51,18 +51,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\winlibs.props" />
+    <Import Project="..\openssl-version.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -92,7 +96,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -155,7 +159,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -209,7 +213,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -260,7 +264,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-$(OpenSSLVersion)\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Create</PrecompiledHeader>
diff --git a/w32/openssl-version.props b/w32/openssl-version.props
new file mode 100644
index 0000000000..7d606656e1
--- /dev/null
+++ b/w32/openssl-version.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <OpenSSLVersion>1.0.1h</OpenSSLVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OpenSSLVersionImported>true</OpenSSLVersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="OpenSSLVersion">
+      <Value>$(OpenSSLVersion)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 4dcb072f8d788575ad149ebe3740eadd9bfed4de Mon Sep 17 00:00:00 2001
From: William King <william.king@quentustech.com>
Date: Sat, 19 Jul 2014 14:47:27 -0700
Subject: [PATCH 061/130] Updating the wiki location, and changing the
 appropriate links to https from http

---
 build/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/Makefile.am b/build/Makefile.am
index bcac6d6cf4..d112b2a729 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -8,7 +8,7 @@ all:
 	@echo " +               $(MK) install                   +"
 	@echo " +                                               +"
 	@echo " + While you're waiting, register for ClueCon!   +"
-	@echo " + http://www.cluecon.com                        +"
+	@echo " + https://www.cluecon.com                       +"
 	@echo " +                                               +"
 	@echo " +-----------------------------------------------+"
 	@cat $(switch_srcdir)/cluecon2.tmpl
@@ -58,16 +58,16 @@ install:
 	@echo " +                                                 +"
 	@echo " +       Additional resources:                     +"
 	@echo " +       ----------------------------------        +"
-	@echo " +       http://www.freeswitch.org                 +"
-	@echo " +       http://wiki.freeswitch.org                +"
-	@echo " +       http://jira.freeswitch.org                +"
+	@echo " +       https://www.freeswitch.org                +"
+	@echo " +       https://confluence.freeswitch.org         +"
+	@echo " +       https://jira.freeswitch.org               +"
 	@echo " +       http://lists.freeswitch.org               +"
 	@echo " +                                                 +"
 	@echo " +       irc.freenode.net / #freeswitch            +"
 	@echo " +                                                 +"
 	@echo " +       Register For ClueCon:                     +"
 	@echo " +       ----------------------------------        +"
-	@echo " +       http://www.cluecon.com                    +"
+	@echo " +       https://www.cluecon.com                   +"
 	@echo " +                                                 +"
 	@echo " +-------------------------------------------------+"
 	@cat $(switch_srcdir)/cluecon2.tmpl

From 5ea172956874825ee23742940bad72222428c5a5 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Mon, 21 Jul 2014 06:48:10 -0500
Subject: [PATCH 062/130] FS-6674 #comment you can do pull requests via
 stash.freeswitch.org #resolve

---
 src/mod/endpoints/mod_verto/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_verto/Makefile.am b/src/mod/endpoints/mod_verto/Makefile.am
index 123976d139..4b8c144d65 100644
--- a/src/mod/endpoints/mod_verto/Makefile.am
+++ b/src/mod/endpoints/mod_verto/Makefile.am
@@ -4,7 +4,7 @@ MODNAME=mod_verto
 mod_LTLIBRARIES       = mod_verto.la
 mod_verto_la_SOURCES  = mod_verto.c ws.c mcast/mcast.c
 mod_verto_la_CFLAGS   = -D__EXTENSIONS__ -D_GNU_SOURCE $(AM_CFLAGS)
-mod_verto_la_CPPFLAGS = -I. -Imcast
+mod_verto_la_CPPFLAGS = -I. -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
 mod_verto_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_verto_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 

From c15663cba289e50263faefe0ecd9f670e3c23707 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Mon, 21 Jul 2014 15:58:32 -0500
Subject: [PATCH 063/130] FS-6670 #resolve #comment This should resolve this
 fun stuff.

---
 src/mod/endpoints/mod_sofia/sofia.c          | 8 ++++++++
 src/mod/endpoints/mod_sofia/sofia_presence.c | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index acb10c4f9d..158ca28e59 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1617,6 +1617,8 @@ static void our_sofia_event_callback(nua_event_t event,
 				const char *call_id, *full_from, *full_to, *full_via, *from_user = NULL, *from_host = NULL, *to_user, *to_host, *full_agent;
 				char to_tag[13] = "";
 				char *event_str = "refer";
+				sip_accept_t *ap = sip->sip_accept;
+				char accept_header[256] = "";
 
 				np.fs_path = 1;
 				contact_str = sofia_glue_gen_contact_str(profile, sip, nh, de, &np);
@@ -1645,6 +1647,12 @@ static void our_sofia_event_callback(nua_event_t event,
 					to_user = "n/a";
 					to_host = "n/a";
 				}
+				
+				while (ap) {
+					switch_snprintf(accept_header + strlen(accept_header), sizeof(accept_header) - strlen(accept_header),
+									"%s%s ", ap->ac_type, ap->ac_next ? "," : "");
+					ap = ap->ac_next;
+				}
 
 				sql = switch_mprintf("insert into sip_subscriptions "
 									 "(proto,sip_user,sip_host,sub_to_user,sub_to_host,presence_hosts,event,contact,call_id,full_from,"
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 41b4055a09..3dd216624b 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -3904,12 +3904,13 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
 		} else {
 			sip_accept_t *ap = sip->sip_accept;
-			char accept[256] = "";
+			char accept_header[256] = "";
 
 			sub_state = nua_substate_active;
 
 			while (ap) {
-				switch_snprintf(accept + strlen(accept), sizeof(accept) - strlen(accept), "%s%s ", ap->ac_type, ap->ac_next ? "," : "");
+				switch_snprintf(accept_header + strlen(accept_header), sizeof(accept_header) - strlen(accept_header),
+								"%s%s ", ap->ac_type, ap->ac_next ? "," : "");
 				ap = ap->ac_next;
 			}
 

From d208484a1cff867457898109040d7c1b7b4d2a0f Mon Sep 17 00:00:00 2001
From: William King <william.king@quentustech.com>
Date: Mon, 21 Jul 2014 14:00:55 -0700
Subject: [PATCH 064/130] Fixing linefeed for mod_managed

---
 .../mod_managed/freeswitch_managed.cpp        |   216 +-
 .../mod_managed/freeswitch_wrap.2010.cxx      | 87640 ++++++++--------
 src/mod/languages/mod_managed/mod_managed.cpp |   922 +-
 3 files changed, 44389 insertions(+), 44389 deletions(-)

diff --git a/src/mod/languages/mod_managed/freeswitch_managed.cpp b/src/mod/languages/mod_managed/freeswitch_managed.cpp
index 1c1bfa8c4c..1b241ee253 100644
--- a/src/mod/languages/mod_managed/freeswitch_managed.cpp
+++ b/src/mod/languages/mod_managed/freeswitch_managed.cpp
@@ -1,108 +1,108 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
- * Copyright (C) 2008, Michael Giagnocavo <mgg@packetrino.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
- *
- * The Initial Developer of the Original Code is
- * Michael Giagnocavo <mgg@packetrino.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Michael Giagnocavo <mgg@packetrino.com>
- * Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet
- * 
- * freeswitch_managed.cpp -- Managed CoreSession subclasses
- *
- */  
-
-#include <switch.h>
-#include <switch_cpp.h>
-#include "freeswitch_managed.h"
-
-#ifdef _MANAGED
-#pragma unmanaged
-#endif
-
-ManagedSession::ManagedSession():CoreSession() 
-{
-
-} 
-
-ManagedSession::ManagedSession(char *uuid):CoreSession(uuid) 
-{
-
-} 
-
-ManagedSession::ManagedSession(switch_core_session_t *session):CoreSession(session) 
-{
-
-} 
-
-bool ManagedSession::begin_allow_threads() 
-{
-	return true;
-}
-
-bool ManagedSession::end_allow_threads() 
-{
-	return true;
-}
-
-ManagedSession::~ManagedSession() 
-{
-	ATTACH_THREADS
-	// Do auto-hangup ourselves because CoreSession can't call check_hangup_hook 
-	// after ManagedSession destruction (cause at point it's pure virtual)
-	if (session) {
-		if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {
-			switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-			setAutoHangup(0);
-		}
-		// Don't let any callbacks use this CoreSession anymore
-		switch_channel_set_private(channel, "CoreSession", NULL);
-	}
-}
-
-void ManagedSession::check_hangup_hook() 
-{
-	ATTACH_THREADS
-	if (!hangupDelegate) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hangupDelegate is null.");
-		return;
-	}
-	hangupDelegate();
-}
-
-switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type_t itype) 
-{
-	ATTACH_THREADS
-	if (!dtmfDelegate) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "dtmfDelegate is null.");
-		return SWITCH_STATUS_FALSE;;
-	}
-	char *result = dtmfDelegate(input, itype);
-	switch_status_t status = process_callback_result(result);
-
-	RESULT_FREE(result); 
-
-	return status;
-}
-
-static switch_status_t stateHangupHandler(switch_core_session_t *session) {
-	return SWITCH_STATUS_FALSE;
-}
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ * Copyright (C) 2008, Michael Giagnocavo <mgg@packetrino.com>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Giagnocavo <mgg@packetrino.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Michael Giagnocavo <mgg@packetrino.com>
+ * Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet
+ * 
+ * freeswitch_managed.cpp -- Managed CoreSession subclasses
+ *
+ */  
+
+#include <switch.h>
+#include <switch_cpp.h>
+#include "freeswitch_managed.h"
+
+#ifdef _MANAGED
+#pragma unmanaged
+#endif
+
+ManagedSession::ManagedSession():CoreSession() 
+{
+
+} 
+
+ManagedSession::ManagedSession(char *uuid):CoreSession(uuid) 
+{
+
+} 
+
+ManagedSession::ManagedSession(switch_core_session_t *session):CoreSession(session) 
+{
+
+} 
+
+bool ManagedSession::begin_allow_threads() 
+{
+	return true;
+}
+
+bool ManagedSession::end_allow_threads() 
+{
+	return true;
+}
+
+ManagedSession::~ManagedSession() 
+{
+	ATTACH_THREADS
+	// Do auto-hangup ourselves because CoreSession can't call check_hangup_hook 
+	// after ManagedSession destruction (cause at point it's pure virtual)
+	if (session) {
+		if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {
+			switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+			setAutoHangup(0);
+		}
+		// Don't let any callbacks use this CoreSession anymore
+		switch_channel_set_private(channel, "CoreSession", NULL);
+	}
+}
+
+void ManagedSession::check_hangup_hook() 
+{
+	ATTACH_THREADS
+	if (!hangupDelegate) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hangupDelegate is null.");
+		return;
+	}
+	hangupDelegate();
+}
+
+switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type_t itype) 
+{
+	ATTACH_THREADS
+	if (!dtmfDelegate) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "dtmfDelegate is null.");
+		return SWITCH_STATUS_FALSE;;
+	}
+	char *result = dtmfDelegate(input, itype);
+	switch_status_t status = process_callback_result(result);
+
+	RESULT_FREE(result); 
+
+	return status;
+}
+
+static switch_status_t stateHangupHandler(switch_core_session_t *session) {
+	return SWITCH_STATUS_FALSE;
+}
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 2cc066aaa2..d8c9843b36 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -1,43820 +1,43820 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-#define SWIGCSHARP
-
-
-#ifdef __cplusplus
-/* SwigValueWrapper is described in swig.swg */
-template<typename T> class SwigValueWrapper {
-  struct SwigMovePointer {
-    T *ptr;
-    SwigMovePointer(T *p) : ptr(p) { }
-    ~SwigMovePointer() { delete ptr; }
-    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-  } pointer;
-  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
-public:
-  SwigValueWrapper() : pointer(0) { }
-  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
-  operator T&() const { return *pointer.ptr; }
-  T *operator&() { return pointer.ptr; }
-};
-
-template <typename T> T SwigValueInit() {
-  return T();
-}
-#endif
-
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
-#   define SWIGUNUSED 
-# endif
-#endif
-
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
-#endif
-
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif 
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-
-/* Support for throwing C# exceptions from C/C++. There are two types: 
- * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */
-typedef enum {
-  SWIG_CSharpApplicationException,
-  SWIG_CSharpArithmeticException,
-  SWIG_CSharpDivideByZeroException,
-  SWIG_CSharpIndexOutOfRangeException,
-  SWIG_CSharpInvalidCastException,
-  SWIG_CSharpInvalidOperationException,
-  SWIG_CSharpIOException,
-  SWIG_CSharpNullReferenceException,
-  SWIG_CSharpOutOfMemoryException,
-  SWIG_CSharpOverflowException,
-  SWIG_CSharpSystemException
-} SWIG_CSharpExceptionCodes;
-
-typedef enum {
-  SWIG_CSharpArgumentException,
-  SWIG_CSharpArgumentNullException,
-  SWIG_CSharpArgumentOutOfRangeException
-} SWIG_CSharpExceptionArgumentCodes;
-
-typedef void (SWIGSTDCALL* SWIG_CSharpExceptionCallback_t)(const char *);
-typedef void (SWIGSTDCALL* SWIG_CSharpExceptionArgumentCallback_t)(const char *, const char *);
-
-typedef struct {
-  SWIG_CSharpExceptionCodes code;
-  SWIG_CSharpExceptionCallback_t callback;
-} SWIG_CSharpException_t;
-
-typedef struct {
-  SWIG_CSharpExceptionArgumentCodes code;
-  SWIG_CSharpExceptionArgumentCallback_t callback;
-} SWIG_CSharpExceptionArgument_t;
-
-static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
-  { SWIG_CSharpApplicationException, NULL },
-  { SWIG_CSharpArithmeticException, NULL },
-  { SWIG_CSharpDivideByZeroException, NULL },
-  { SWIG_CSharpIndexOutOfRangeException, NULL },
-  { SWIG_CSharpInvalidCastException, NULL },
-  { SWIG_CSharpInvalidOperationException, NULL },
-  { SWIG_CSharpIOException, NULL },
-  { SWIG_CSharpNullReferenceException, NULL },
-  { SWIG_CSharpOutOfMemoryException, NULL },
-  { SWIG_CSharpOverflowException, NULL },
-  { SWIG_CSharpSystemException, NULL }
-};
-
-static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
-  { SWIG_CSharpArgumentException, NULL },
-  { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL }
-};
-
-static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
-  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
-    callback = SWIG_csharp_exceptions[code].callback;
-  }
-  callback(msg);
-}
-
-static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
-  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
-    callback = SWIG_csharp_exceptions_argument[code].callback;
-  }
-  callback(msg, param_name);
-}
-
-
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_freeswitch(
-                                                SWIG_CSharpExceptionCallback_t applicationCallback,
-                                                SWIG_CSharpExceptionCallback_t arithmeticCallback,
-                                                SWIG_CSharpExceptionCallback_t divideByZeroCallback, 
-                                                SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, 
-                                                SWIG_CSharpExceptionCallback_t invalidCastCallback,
-                                                SWIG_CSharpExceptionCallback_t invalidOperationCallback,
-                                                SWIG_CSharpExceptionCallback_t ioCallback,
-                                                SWIG_CSharpExceptionCallback_t nullReferenceCallback,
-                                                SWIG_CSharpExceptionCallback_t outOfMemoryCallback, 
-                                                SWIG_CSharpExceptionCallback_t overflowCallback, 
-                                                SWIG_CSharpExceptionCallback_t systemCallback) {
-  SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
-}
-
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_freeswitch(
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback) {
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
-}
-
-
-/* Contract support */
-
-#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
-
-
-
-/* Callback for returning strings to C# without leaking memory */
-#ifndef _MANAGED
-#include <mono/jit/jit.h>
-#include <mono/metadata/environment.h>
-#include <mono/metadata/mono-config.h>
-#include <mono/metadata/threads.h>
-#include <mono/metadata/debug-helpers.h>
-#endif
-
-typedef char * (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char *);
-static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback_real = NULL;
-
-
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_freeswitch(SWIG_CSharpStringHelperCallback callback) {
-	/* Set this only once, in the main appdomain */
-	if (SWIG_csharp_string_callback_real == NULL) SWIG_csharp_string_callback_real = callback;
-}
-char * SWIG_csharp_string_callback(const char * str) {
-#ifndef _MANAGED
-	// Mono won't transition appdomains properly after the callback, so we force it
-	MonoDomain* dom = mono_domain_get();
-	char* res = SWIG_csharp_string_callback_real(str);
-	mono_domain_set(dom, true);
-	return res;
-#else
-	return SWIG_csharp_string_callback_real(str);
-#endif
-}
-
-
-#include "switch.h"
-#include "switch_cpp.h"
-#include "freeswitch_managed.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_PEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("27880");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_OID_PREFIX_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)(".1.3.6.1.4.1.27880");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_ITAD_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("543");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp___EXTENSIONS___get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp___BSD_VISIBLE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENT_ORIGINATE_DELIM_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)(":_:");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BLANK_STRING_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\0");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_TON_UNDEF_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(255);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_NUMPLAN_UNDEF_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(255);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_ESC_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_get() {
-  char jresult ;
-  char result;
-  
-  result = (char)('H');
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_STR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("H");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_get() {
-  char jresult ;
-  char result;
-  
-  result = (char)('1');
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_STR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("1");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_CHAR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("K");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR0_get() {
-  char jresult ;
-  char result;
-  
-  result = (char)('2');
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR1_get() {
-  char jresult ;
-  char result;
-  
-  result = (char)('J');
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("2J");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_AND_COLOR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)(";");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_END_COLOR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLACK_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("30");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_RED_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("31");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_GREEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("32");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_YELLOW_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("33");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLUE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("34");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_MAGEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("35");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_CYAN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("36");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_WHITE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("37");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLACK_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("40");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_RED_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("41");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_GREEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("42");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_YELLOW_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("43");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLUE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("44");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_MAGEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("45");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_CYAN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("46");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_WHITE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("47");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLACK_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[30m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FRED_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[31m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FGREEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[32m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FYELLOW_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[33m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLUE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[34m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FMAGEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[35m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FCYAN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[36m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FWHITE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[37m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLACK_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[40m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BRED_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[41m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BGREEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[42m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BYELLOW_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[43m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLUE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[44m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BMAGEN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[45m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BCYAN_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[46m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BWHITE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[47m");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[H");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[1");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[K");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\33[2J\33[H");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NAME_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("\0");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NUMBER_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("0000000000");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_DTMF_DURATION_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2000);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MIN_DTMF_DURATION_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(400);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_DTMF_DURATION_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(192000);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PATH_SEPARATOR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("/");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_URL_SEPARATOR_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("://");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_IGNORE_DISPLAY_UPDATES_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("ignore_display_updates");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_AUDIO_SPOOL_PATH_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("audio_spool_path");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bridge_hangup_cause");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_TERMINATOR_USED_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("read_terminator_used");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("send_silence_when_idle");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("current_application");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_DATA_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("current_application_data");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("current_application_response");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PASSTHRU_PTIME_MISMATCH_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("passthru_ptime_mismatch");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("enable_heartbeat_events");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bypass_media_after_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_RESULT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("read_result");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ATT_XFER_RESULT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("att_xfer_result");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_XML_CDR_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("copy_xml_cdr");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_JSON_CDR_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("copy_json_cdr");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("proto_specific_hangup_cause");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_HISTORY_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("transfer_history");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_SOURCE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("transfer_source");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SENSITIVE_DTMF_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("sensitive_dtmf");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_APP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("record_post_process_exec_app");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_API_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("record_post_process_exec_api");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_answer");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ANSWER_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_pre_answer");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_media");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_RING_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_ring");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_TONE_DETECT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_tone_detect");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_post_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_pre_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_pre_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("execute_on_post_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ANSWER_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_answer");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ANSWER_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_pre_answer");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_MEDIA_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_media");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_RING_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_ring");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_TONE_DETECT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_tone_detect");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_POST_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_post_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ORIGINATE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_on_pre_originate");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CALL_TIMEOUT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("call_timeout");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLDING_UUID_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("holding_uuid");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SOFT_HOLDING_UUID_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("soft_holding_uuid");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_END_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_after_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_START_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_before_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_HANGUP_HOOK_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_hangup_hook");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_REPORTING_HOOK_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("api_reporting_hook");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("session_in_hangup_hook");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROCESS_CDR_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("process_cdr");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SKIP_CDR_CAUSES_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("skip_cdr_causes");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_FORCE_PROCESS_CDR_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("force_process_cdr");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_CHANNEL_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bridge_channel");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_NAME_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("channel_name");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_UUID_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bridge_uuid");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("continue_on_fail");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("playback_terminators");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATOR_USED_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("playback_terminator_used");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("cache_speech_handles");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("__cache_speech_handles_obj__");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bypass_media");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROXY_MEDIA_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("proxy_media");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ZRTP_PASSTHRU_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("zrtp_passthru");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENDPOINT_DISPOSITION_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("endpoint_disposition");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLD_MUSIC_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("hold_music");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TEMP_HOLD_MUSIC_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("temp_hold_music");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXPORT_VARS_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("export_vars");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_EXPORT_VARS_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bridge_export_vars");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_R_SDP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("switch_r_sdp");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_L_SDP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("switch_l_sdp");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_B_SDP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("switch_m_sdp");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("bridge_to");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LAST_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("last_bridge_to");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("signal_bridge_to");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BOND_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("signal_bond");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATE_SIGNAL_BOND_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("originate_signal_bond");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("originator");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_CODEC_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("originator_codec");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VIDEO_CODEC_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("originator_video_codec");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_IP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("local_media_ip");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_PORT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("local_media_port");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ADVERTISED_MEDIA_IP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("advertised_media_ip");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_IP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("remote_media_ip");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_PORT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("remote_media_port");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_IP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("remote_video_ip");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_PORT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("remote_video_port");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_IP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("local_video_ip");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_PORT_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("local_video_port");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("hangup_after_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("park_after_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("transfer_after_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("exec_after_bridge_app");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("exec_after_bridge_arg");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_MAX_FORWARDS_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("max_forwards");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DISABLE_APP_LOG_VARIABLE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("disable_app_log");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SPEECH_KEY_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("speech");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_UUID_BRIDGE_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("uuid_bridge");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BITS_PER_BYTE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(65536);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1000);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_TRANS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2000);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_SESSION_MAX_PRIVATES_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_JITTER_VARIANCE_THRESHOLD_get() {
-  double jresult ;
-  double result;
-  
-  result = (double)(400.0);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_IPDV_THRESHOLD_get() {
-  double jresult ;
-  double result;
-  
-  result = (double)(1.0);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_ANALYZE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(500);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_CAPTURE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1024);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) {
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  char arg2 ;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  arg2 = (char)jarg2; 
-  if (arg1) (arg1)->digit = arg2;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_switch_dtmf_t_digit_get(void * jarg1) {
-  char jresult ;
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  char result;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  result = (char) ((arg1)->digit);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_duration_set(void * jarg1, unsigned long jarg2) {
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->duration = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_dtmf_t_duration_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  result = (uint32_t) ((arg1)->duration);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_flags_set(void * jarg1, int jarg2) {
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  int32_t arg2 ;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  arg2 = (int32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmf_t_flags_get(void * jarg1) {
-  int jresult ;
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  int32_t result;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  result = (int32_t) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_source_set(void * jarg1, int jarg2) {
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  switch_dtmf_source_t arg2 ;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  arg2 = (switch_dtmf_source_t)jarg2; 
-  if (arg1) (arg1)->source = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmf_t_source_get(void * jarg1) {
-  int jresult ;
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  switch_dtmf_source_t result;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  result = (switch_dtmf_source_t) ((arg1)->source);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_dtmf_t() {
-  void * jresult ;
-  switch_dtmf_t *result = 0 ;
-  
-  result = (switch_dtmf_t *)new switch_dtmf_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dtmf_t(void * jarg1) {
-  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
-  
-  arg1 = (switch_dtmf_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buf_set(void * jarg1, void * jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  if (arg1) (arg1)->buf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_bitpack_t_buf_get(void * jarg1) {
-  void * jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t *) ((arg1)->buf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buflen_set(void * jarg1, unsigned long jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->buflen = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_buflen_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (uint32_t) ((arg1)->buflen);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_cur_set(void * jarg1, void * jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  if (arg1) (arg1)->cur = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_bitpack_t_cur_get(void * jarg1) {
-  void * jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t *) ((arg1)->cur);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bytes_set(void * jarg1, unsigned long jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->bytes = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_bytes_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (uint32_t) ((arg1)->bytes);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_tot_set(void * jarg1, unsigned long jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->bits_tot = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_bits_tot_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (uint32_t) ((arg1)->bits_tot);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_cur_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->bits_cur = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_bits_cur_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->bits_cur);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_rem_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->bits_rem = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_bits_rem_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->bits_rem);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_frame_bits_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->frame_bits = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_frame_bits_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->frame_bits);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_shiftby_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->shiftby = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_shiftby_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->shiftby);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_this_byte_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->this_byte = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_this_byte_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->this_byte);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_under_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->under = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_under_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->under);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_over_set(void * jarg1, unsigned char jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_byte_t)jarg2; 
-  if (arg1) (arg1)->over = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_over_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_byte_t) ((arg1)->over);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_mode_set(void * jarg1, int jarg2) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_bitpack_mode_t arg2 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  arg2 = (switch_bitpack_mode_t)jarg2; 
-  if (arg1) (arg1)->mode = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_bitpack_t_mode_get(void * jarg1) {
-  int jresult ;
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  switch_bitpack_mode_t result;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  result = (switch_bitpack_mode_t) ((arg1)->mode);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_bitpack_t() {
-  void * jresult ;
-  switch_bitpack_t *result = 0 ;
-  
-  result = (switch_bitpack_t *)new switch_bitpack_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_bitpack_t(void * jarg1) {
-  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
-  
-  arg1 = (switch_bitpack_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_base_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->base_dir) delete [] arg1->base_dir;
-    if (arg2) {
-      arg1->base_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->base_dir, (const char *)arg2);
-    } else {
-      arg1->base_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_base_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->base_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_mod_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->mod_dir) delete [] arg1->mod_dir;
-    if (arg2) {
-      arg1->mod_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->mod_dir, (const char *)arg2);
-    } else {
-      arg1->mod_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_mod_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->mod_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_conf_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->conf_dir) delete [] arg1->conf_dir;
-    if (arg2) {
-      arg1->conf_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->conf_dir, (const char *)arg2);
-    } else {
-      arg1->conf_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_conf_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->conf_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_log_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->log_dir) delete [] arg1->log_dir;
-    if (arg2) {
-      arg1->log_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->log_dir, (const char *)arg2);
-    } else {
-      arg1->log_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_log_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->log_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_run_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->run_dir) delete [] arg1->run_dir;
-    if (arg2) {
-      arg1->run_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->run_dir, (const char *)arg2);
-    } else {
-      arg1->run_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_run_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->run_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_db_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->db_dir) delete [] arg1->db_dir;
-    if (arg2) {
-      arg1->db_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->db_dir, (const char *)arg2);
-    } else {
-      arg1->db_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_db_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->db_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_script_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->script_dir) delete [] arg1->script_dir;
-    if (arg2) {
-      arg1->script_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->script_dir, (const char *)arg2);
-    } else {
-      arg1->script_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_script_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->script_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_temp_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->temp_dir) delete [] arg1->temp_dir;
-    if (arg2) {
-      arg1->temp_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->temp_dir, (const char *)arg2);
-    } else {
-      arg1->temp_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_temp_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->temp_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_htdocs_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->htdocs_dir) delete [] arg1->htdocs_dir;
-    if (arg2) {
-      arg1->htdocs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->htdocs_dir, (const char *)arg2);
-    } else {
-      arg1->htdocs_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_htdocs_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->htdocs_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_grammar_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->grammar_dir) delete [] arg1->grammar_dir;
-    if (arg2) {
-      arg1->grammar_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->grammar_dir, (const char *)arg2);
-    } else {
-      arg1->grammar_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_grammar_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->grammar_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_storage_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->storage_dir) delete [] arg1->storage_dir;
-    if (arg2) {
-      arg1->storage_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->storage_dir, (const char *)arg2);
-    } else {
-      arg1->storage_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_storage_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->storage_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_recordings_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->recordings_dir) delete [] arg1->recordings_dir;
-    if (arg2) {
-      arg1->recordings_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->recordings_dir, (const char *)arg2);
-    } else {
-      arg1->recordings_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_recordings_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->recordings_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_sounds_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->sounds_dir) delete [] arg1->sounds_dir;
-    if (arg2) {
-      arg1->sounds_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->sounds_dir, (const char *)arg2);
-    } else {
-      arg1->sounds_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_sounds_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->sounds_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_lib_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->lib_dir) delete [] arg1->lib_dir;
-    if (arg2) {
-      arg1->lib_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->lib_dir, (const char *)arg2);
-    } else {
-      arg1->lib_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_lib_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->lib_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_certs_dir_set(void * jarg1, char * jarg2) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->certs_dir) delete [] arg1->certs_dir;
-    if (arg2) {
-      arg1->certs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->certs_dir, (const char *)arg2);
-    } else {
-      arg1->certs_dir = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_certs_dir_get(void * jarg1) {
-  char * jresult ;
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  result = (char *) ((arg1)->certs_dir);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directories() {
-  void * jresult ;
-  switch_directories *result = 0 ;
-  
-  result = (switch_directories *)new switch_directories();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directories(void * jarg1) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_dirs_set(void * jarg1) {
-  switch_directories *arg1 = (switch_directories *) 0 ;
-  
-  arg1 = (switch_directories *)jarg1; 
-  SWITCH_GLOBAL_dirs = *arg1;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_SWITCH_GLOBAL_dirs_get() {
-  void * jresult ;
-  switch_directories *result = 0 ;
-  
-  result = (switch_directories *)&SWITCH_GLOBAL_dirs;
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_filenames_conf_name_set(void * jarg1, char * jarg2) {
-  switch_filenames *arg1 = (switch_filenames *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_filenames *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->conf_name) delete [] arg1->conf_name;
-    if (arg2) {
-      arg1->conf_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->conf_name, (const char *)arg2);
-    } else {
-      arg1->conf_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_filenames_conf_name_get(void * jarg1) {
-  char * jresult ;
-  switch_filenames *arg1 = (switch_filenames *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_filenames *)jarg1; 
-  result = (char *) ((arg1)->conf_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_filenames() {
-  void * jresult ;
-  switch_filenames *result = 0 ;
-  
-  result = (switch_filenames *)new switch_filenames();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_filenames(void * jarg1) {
-  switch_filenames *arg1 = (switch_filenames *) 0 ;
-  
-  arg1 = (switch_filenames *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_filenames_set(void * jarg1) {
-  switch_filenames *arg1 = (switch_filenames *) 0 ;
-  
-  arg1 = (switch_filenames *)jarg1; 
-  SWITCH_GLOBAL_filenames = *arg1;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_SWITCH_GLOBAL_filenames_get() {
-  void * jresult ;
-  switch_filenames *result = 0 ;
-  
-  result = (switch_filenames *)&SWITCH_GLOBAL_filenames;
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STACKS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(16);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_THREAD_STACKSIZE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(240*1024);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SYSTEM_THREAD_STACKSIZE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(8192*1024);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_INTERVAL_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(120);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_INTERVAL_PAD_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(10);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_SAMPLE_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(48);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BYTES_PER_SAMPLE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RECOMMENDED_BUFFER_SIZE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(8192);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CODECS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(50);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STATE_HANDLERS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(30);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_QUEUE_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(100000);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1024*8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->raw_bytes = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->raw_bytes);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->media_bytes = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->media_bytes);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->period_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->period_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->media_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->media_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->skip_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->skip_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->jb_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->jb_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->dtmf_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->dtmf_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->cng_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->cng_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->flush_packet_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->flush_packet_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->largest_jb_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->largest_jb_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_proc_time_set(void * jarg1, long long jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->last_proc_time = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_proc_time_get(void * jarg1) {
-  long long jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int64_t) ((arg1)->last_proc_time);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_n_set(void * jarg1, long long jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->jitter_n = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_n_get(void * jarg1) {
-  long long jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int64_t) ((arg1)->jitter_n);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_add_set(void * jarg1, long long jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->jitter_add = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_add_get(void * jarg1) {
-  long long jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int64_t) ((arg1)->jitter_add);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_addsq_set(void * jarg1, long long jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->jitter_addsq = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_addsq_get(void * jarg1) {
-  long long jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int64_t) ((arg1)->jitter_addsq);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_variance_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->variance = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_variance_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->variance);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_min_variance_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->min_variance = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_min_variance_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->min_variance);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_max_variance_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->max_variance = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_max_variance_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->max_variance);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_std_deviation_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->std_deviation = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_std_deviation_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->std_deviation);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_lossrate_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->lossrate = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_lossrate_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->lossrate);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_burstrate_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->burstrate = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_burstrate_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->burstrate);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mean_interval_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->mean_interval = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_mean_interval_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->mean_interval);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_loss_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int *arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int *)jarg2; 
-  {
-    size_t ii;
-    int *b = (int *) arg1->loss;
-    for (ii = 0; ii < (size_t)1024; ii++) b[ii] = *((int *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_loss_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int *result = 0 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int *)(int *) ((arg1)->loss);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_loss_set(void * jarg1, int jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->last_loss = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_loss_get(void * jarg1) {
-  int jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int) ((arg1)->last_loss);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_recved_set(void * jarg1, int jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->recved = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_recved_get(void * jarg1) {
-  int jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int) ((arg1)->recved);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_processed_seq_set(void * jarg1, int jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->last_processed_seq = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_processed_seq_get(void * jarg1) {
-  int jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (int) ((arg1)->last_processed_seq);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->flaws = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->flaws);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_set(void * jarg1, void * jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->last_flaw = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result =  ((arg1)->last_flaw);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_R_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->R = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_R_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->R);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mos_set(void * jarg1, double jarg2) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->mos = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_mos_get(void * jarg1) {
-  double jresult ;
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  result = (double) ((arg1)->mos);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_numbers_t() {
-  void * jresult ;
-  switch_rtp_numbers_t *result = 0 ;
-  
-  result = (switch_rtp_numbers_t *)new switch_rtp_numbers_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_numbers_t(void * jarg1) {
-  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
-  
-  arg1 = (switch_rtp_numbers_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_set(void * jarg1, unsigned long jarg2) {
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->packet_count = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  result = (uint32_t) ((arg1)->packet_count);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_set(void * jarg1, unsigned long jarg2) {
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->octet_count = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  result = (uint32_t) ((arg1)->octet_count);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_peer_ssrc_set(void * jarg1, unsigned long jarg2) {
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->peer_ssrc = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_peer_ssrc_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  result = (uint32_t) ((arg1)->peer_ssrc);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtcp_numbers_t() {
-  void * jresult ;
-  switch_rtcp_numbers_t *result = 0 ;
-  
-  result = (switch_rtcp_numbers_t *)new switch_rtcp_numbers_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_numbers_t(void * jarg1) {
-  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
-  
-  arg1 = (switch_rtcp_numbers_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_set(void * jarg1, void * jarg2) {
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtp_numbers_t *arg2 = (switch_rtp_numbers_t *) 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  arg2 = (switch_rtp_numbers_t *)jarg2; 
-  if (arg1) (arg1)->inbound = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtp_numbers_t *result = 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  result = (switch_rtp_numbers_t *)& ((arg1)->inbound);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_set(void * jarg1, void * jarg2) {
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtp_numbers_t *arg2 = (switch_rtp_numbers_t *) 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  arg2 = (switch_rtp_numbers_t *)jarg2; 
-  if (arg1) (arg1)->outbound = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtp_numbers_t *result = 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  result = (switch_rtp_numbers_t *)& ((arg1)->outbound);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_set(void * jarg1, void * jarg2) {
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtcp_numbers_t *arg2 = (switch_rtcp_numbers_t *) 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  arg2 = (switch_rtcp_numbers_t *)jarg2; 
-  if (arg1) (arg1)->rtcp = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  switch_rtcp_numbers_t *result = 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  result = (switch_rtcp_numbers_t *)& ((arg1)->rtcp);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_read_count_set(void * jarg1, unsigned long jarg2) {
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->read_count = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_stats_t_read_count_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->read_count);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_stats_t() {
-  void * jresult ;
-  switch_rtp_stats_t *result = 0 ;
-  
-  result = (switch_rtp_stats_t *)new switch_rtp_stats_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_stats_t(void * jarg1) {
-  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
-  
-  arg1 = (switch_rtp_stats_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_CNG_PAYLOAD_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(13);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_version_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->version = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_version_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->version);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_p_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->p = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_p_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->p);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_x_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->x = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_x_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->x);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_cc_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->cc = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_cc_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->cc);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_m_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->m = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_m_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->m);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_pt_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->pt = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_pt_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->pt);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_seq_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->seq = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_seq_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->seq);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ts_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->ts = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_ts_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->ts);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ssrc_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->ssrc = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_ssrc_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->ssrc);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_hdr_t() {
-  void * jresult ;
-  switch_rtp_hdr_t *result = 0 ;
-  
-  result = (switch_rtp_hdr_t *)new switch_rtp_hdr_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_t(void * jarg1) {
-  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
-  
-  arg1 = (switch_rtp_hdr_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->length = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
-  result = (unsigned int) ((arg1)->length);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_set(void * jarg1, unsigned int jarg2) {
-  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->profile = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
-  result = (unsigned int) ((arg1)->profile);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_hdr_ext_t() {
-  void * jresult ;
-  switch_rtp_hdr_ext_t *result = 0 ;
-  
-  result = (switch_rtp_hdr_ext_t *)new switch_rtp_hdr_ext_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_ext_t(void * jarg1) {
-  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
-  
-  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_set(void * jarg1, unsigned int jarg2) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->version = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->version);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_p_set(void * jarg1, unsigned int jarg2) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->p = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_p_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->p);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_count_set(void * jarg1, unsigned int jarg2) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->count = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_count_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->count);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_type_set(void * jarg1, unsigned int jarg2) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_type_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_length_set(void * jarg1, unsigned int jarg2) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->length = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_length_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  result = (unsigned int) ((arg1)->length);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtcp_hdr_t() {
-  void * jresult ;
-  switch_rtcp_hdr_t *result = 0 ;
-  
-  result = (switch_rtcp_hdr_t *)new switch_rtcp_hdr_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_hdr_t(void * jarg1) {
-  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
-  
-  arg1 = (switch_rtcp_hdr_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_ts_set(void * jarg1, unsigned long jarg2) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (audio_buffer_header_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ts = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_ts_get(void * jarg1) {
-  unsigned long jresult ;
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (audio_buffer_header_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ts);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_len_set(void * jarg1, unsigned long jarg2) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (audio_buffer_header_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->len = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_len_get(void * jarg1) {
-  unsigned long jresult ;
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (audio_buffer_header_t *)jarg1; 
-  result = (uint32_t) ((arg1)->len);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_audio_buffer_header_t() {
-  void * jresult ;
-  audio_buffer_header_t *result = 0 ;
-  
-  result = (audio_buffer_header_t *)new audio_buffer_header_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_audio_buffer_header_t(void * jarg1) {
-  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
-  
-  arg1 = (audio_buffer_header_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxVersion_set(void * jarg1, unsigned short jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint16_t)jarg2; 
-  if (arg1) (arg1)->T38FaxVersion = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxVersion_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint16_t) ((arg1)->T38FaxVersion);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_set(void * jarg1, unsigned long jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->T38MaxBitRate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint32_t) ((arg1)->T38MaxBitRate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_set(void * jarg1, int jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  if (arg1) (arg1)->T38FaxFillBitRemoval = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_get(void * jarg1) {
-  int jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (switch_bool_t) ((arg1)->T38FaxFillBitRemoval);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_set(void * jarg1, int jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  if (arg1) (arg1)->T38FaxTranscodingMMR = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_get(void * jarg1) {
-  int jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (switch_bool_t) ((arg1)->T38FaxTranscodingMMR);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_set(void * jarg1, int jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  if (arg1) (arg1)->T38FaxTranscodingJBIG = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_get(void * jarg1) {
-  int jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (switch_bool_t) ((arg1)->T38FaxTranscodingJBIG);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->T38FaxRateManagement = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->T38FaxRateManagement, (const char *)arg2);
-    } else {
-      arg1->T38FaxRateManagement = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->T38FaxRateManagement);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_set(void * jarg1, unsigned long jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->T38FaxMaxBuffer = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint32_t) ((arg1)->T38FaxMaxBuffer);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_set(void * jarg1, unsigned long jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->T38FaxMaxDatagram = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint32_t) ((arg1)->T38FaxMaxDatagram);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->T38FaxUdpEC = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->T38FaxUdpEC, (const char *)arg2);
-    } else {
-      arg1->T38FaxUdpEC = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->T38FaxUdpEC);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->T38VendorInfo = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->T38VendorInfo, (const char *)arg2);
-    } else {
-      arg1->T38VendorInfo = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->T38VendorInfo);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_ip_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->remote_ip = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->remote_ip, (const char *)arg2);
-    } else {
-      arg1->remote_ip = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_remote_ip_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->remote_ip);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_set(void * jarg1, unsigned short jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint16_t)jarg2; 
-  if (arg1) (arg1)->remote_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint16_t) ((arg1)->remote_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_ip_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->local_ip = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->local_ip, (const char *)arg2);
-    } else {
-      arg1->local_ip = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_local_ip_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->local_ip);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_port_set(void * jarg1, unsigned short jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t arg2 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (uint16_t)jarg2; 
-  if (arg1) (arg1)->local_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_local_port_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  uint16_t result;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (uint16_t) ((arg1)->local_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_sdp_o_line_set(void * jarg1, char * jarg2) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->sdp_o_line = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->sdp_o_line, (const char *)arg2);
-    } else {
-      arg1->sdp_o_line = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_sdp_o_line_get(void * jarg1) {
-  char * jresult ;
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  result = (char *) ((arg1)->sdp_o_line);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_t38_options_t() {
-  void * jresult ;
-  switch_t38_options_t *result = 0 ;
-  
-  result = (switch_t38_options_t *)new switch_t38_options_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_t38_options_t(void * jarg1) {
-  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
-  
-  arg1 = (switch_t38_options_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MEDIA_TYPE_TOTAL_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_val_set(void * jarg1, char * jarg2) {
-  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_console_callback_match_node *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->val) delete [] arg1->val;
-    if (arg2) {
-      arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->val, (const char *)arg2);
-    } else {
-      arg1->val = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_console_callback_match_node_val_get(void * jarg1) {
-  char * jresult ;
-  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_console_callback_match_node *)jarg1; 
-  result = (char *) ((arg1)->val);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_next_set(void * jarg1, void * jarg2) {
-  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
-  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
-  
-  arg1 = (switch_console_callback_match_node *)jarg1; 
-  arg2 = (switch_console_callback_match_node *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_node_next_get(void * jarg1) {
-  void * jresult ;
-  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
-  switch_console_callback_match_node *result = 0 ;
-  
-  arg1 = (switch_console_callback_match_node *)jarg1; 
-  result = (switch_console_callback_match_node *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_console_callback_match_node() {
-  void * jresult ;
-  switch_console_callback_match_node *result = 0 ;
-  
-  result = (switch_console_callback_match_node *)new switch_console_callback_match_node();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match_node(void * jarg1) {
-  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
-  
-  arg1 = (switch_console_callback_match_node *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_head_set(void * jarg1, void * jarg2) {
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  arg2 = (switch_console_callback_match_node *)jarg2; 
-  if (arg1) (arg1)->head = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_head_get(void * jarg1) {
-  void * jresult ;
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  switch_console_callback_match_node *result = 0 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  result = (switch_console_callback_match_node *) ((arg1)->head);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_end_set(void * jarg1, void * jarg2) {
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  arg2 = (switch_console_callback_match_node *)jarg2; 
-  if (arg1) (arg1)->end = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_end_get(void * jarg1) {
-  void * jresult ;
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  switch_console_callback_match_node *result = 0 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  result = (switch_console_callback_match_node *) ((arg1)->end);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_count_set(void * jarg1, int jarg2) {
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->count = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_callback_match_count_get(void * jarg1) {
-  int jresult ;
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  int result;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  result = (int) ((arg1)->count);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_dynamic_set(void * jarg1, int jarg2) {
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->dynamic = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_callback_match_dynamic_get(void * jarg1) {
-  int jresult ;
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  int result;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  result = (int) ((arg1)->dynamic);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_console_callback_match() {
-  void * jresult ;
-  switch_console_callback_match *result = 0 ;
-  
-  result = (switch_console_callback_match *)new switch_console_callback_match();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match(void * jarg1) {
-  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
-  
-  arg1 = (switch_console_callback_match *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_DMACHINE_MAX_DIGIT_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(512);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_dmachine_set(void * jarg1, void * jarg2) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  arg2 = (switch_ivr_dmachine_t *)jarg2; 
-  if (arg1) (arg1)->dmachine = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_dmachine_get(void * jarg1) {
-  void * jresult ;
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  switch_ivr_dmachine_t *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  result = (switch_ivr_dmachine_t *) ((arg1)->dmachine);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_digits_set(void * jarg1, char * jarg2) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->match_digits = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->match_digits, (const char *)arg2);
-    } else {
-      arg1->match_digits = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_digits_get(void * jarg1) {
-  char * jresult ;
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  result = (char *) ((arg1)->match_digits);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_key_set(void * jarg1, int jarg2) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  int32_t arg2 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  arg2 = (int32_t)jarg2; 
-  if (arg1) (arg1)->match_key = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_key_get(void * jarg1) {
-  int jresult ;
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  int32_t result;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  result = (int32_t) ((arg1)->match_key);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_type_set(void * jarg1, int jarg2) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  dm_match_type_t arg2 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  arg2 = (dm_match_type_t)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_match_type_get(void * jarg1) {
-  int jresult ;
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  dm_match_type_t result;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  result = (dm_match_type_t) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_user_data_set(void * jarg1, void * jarg2) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  result = (void *) ((arg1)->user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_ivr_dmachine_match() {
-  void * jresult ;
-  switch_ivr_dmachine_match *result = 0 ;
-  
-  result = (switch_ivr_dmachine_match *)new switch_ivr_dmachine_match();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_ivr_dmachine_match(void * jarg1) {
-  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_match *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_MAX_ARG_RECURSION_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(25);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_input_callback_set(void * jarg1, void * jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (switch_input_callback_function_t)jarg2; 
-  if (arg1) (arg1)->input_callback = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_input_callback_get(void * jarg1) {
-  void * jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_input_callback_function_t result;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (switch_input_callback_function_t) ((arg1)->input_callback);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buf_set(void * jarg1, void * jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->buf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_buf_get(void * jarg1) {
-  void * jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (void *) ((arg1)->buf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buflen_set(void * jarg1, unsigned long jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->buflen = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_input_args_t_buflen_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (uint32_t) ((arg1)->buflen);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_read_frame_callback_set(void * jarg1, void * jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_read_frame_callback_function_t arg2 = (switch_read_frame_callback_function_t) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (switch_read_frame_callback_function_t)jarg2; 
-  if (arg1) (arg1)->read_frame_callback = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_read_frame_callback_get(void * jarg1) {
-  void * jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_read_frame_callback_function_t result;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (switch_read_frame_callback_function_t) ((arg1)->read_frame_callback);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_user_data_set(void * jarg1, void * jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (void *) ((arg1)->user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_dmachine_set(void * jarg1, void * jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (switch_ivr_dmachine_t *)jarg2; 
-  if (arg1) (arg1)->dmachine = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_dmachine_get(void * jarg1) {
-  void * jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  switch_ivr_dmachine_t *result = 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (switch_ivr_dmachine_t *) ((arg1)->dmachine);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_loops_set(void * jarg1, int jarg2) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->loops = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_input_args_t_loops_get(void * jarg1) {
-  int jresult ;
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  result = (int) ((arg1)->loops);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_input_args_t() {
-  void * jresult ;
-  switch_input_args_t *result = 0 ;
-  
-  result = (switch_input_args_t *)new switch_input_args_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_input_args_t(void * jarg1) {
-  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
-  
-  arg1 = (switch_input_args_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_type_set(void * jarg1, int jarg2) {
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_type_t arg2 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  arg2 = (switch_say_type_t)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_type_get(void * jarg1) {
-  int jresult ;
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_type_t result;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  result = (switch_say_type_t) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_method_set(void * jarg1, int jarg2) {
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_method_t arg2 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  arg2 = (switch_say_method_t)jarg2; 
-  if (arg1) (arg1)->method = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_method_get(void * jarg1) {
-  int jresult ;
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_method_t result;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  result = (switch_say_method_t) ((arg1)->method);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_gender_set(void * jarg1, int jarg2) {
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_gender_t arg2 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  arg2 = (switch_say_gender_t)jarg2; 
-  if (arg1) (arg1)->gender = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_gender_get(void * jarg1) {
-  int jresult ;
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  switch_say_gender_t result;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  result = (switch_say_gender_t) ((arg1)->gender);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_ext_set(void * jarg1, char * jarg2) {
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->ext = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->ext, (const char *)arg2);
-    } else {
-      arg1->ext = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_args_t_ext_get(void * jarg1) {
-  char * jresult ;
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  result = (char *) ((arg1)->ext);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_say_args_t() {
-  void * jresult ;
-  switch_say_args_t *result = 0 ;
-  
-  result = (switch_say_args_t *)new switch_say_args_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_args_t(void * jarg1) {
-  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
-  
-  arg1 = (switch_say_args_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_API_VERSION_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_set(void * jarg1, int jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->switch_api_version = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_get(void * jarg1) {
-  int jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  result = (int) ((arg1)->switch_api_version);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_load_t arg2 = (switch_module_load_t) 0 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  arg2 = (switch_module_load_t)jarg2; 
-  if (arg1) (arg1)->load = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_load_t result;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  result = (switch_module_load_t) ((arg1)->load);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_shutdown_t arg2 = (switch_module_shutdown_t) 0 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  arg2 = (switch_module_shutdown_t)jarg2; 
-  if (arg1) (arg1)->shutdown = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_shutdown_t result;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  result = (switch_module_shutdown_t) ((arg1)->shutdown);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_runtime_t arg2 = (switch_module_runtime_t) 0 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  arg2 = (switch_module_runtime_t)jarg2; 
-  if (arg1) (arg1)->runtime = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_runtime_t result;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  result = (switch_module_runtime_t) ((arg1)->runtime);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_flag_t arg2 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  arg2 = (switch_module_flag_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  switch_module_flag_t result;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  result = (switch_module_flag_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_loadable_module_function_table_t() {
-  void * jresult ;
-  switch_loadable_module_function_table_t *result = 0 ;
-  
-  result = (switch_loadable_module_function_table_t *)new switch_loadable_module_function_table_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_function_table_t(void * jarg1) {
-  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_type_set(void * jarg1, int jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_media_type_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_media_type_t)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_type_get(void * jarg1) {
-  int jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_media_type_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_media_type_t) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_sdp_type_set(void * jarg1, int jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_sdp_type_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_sdp_type_t)jarg2; 
-  if (arg1) (arg1)->sdp_type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_sdp_type_get(void * jarg1) {
-  int jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_sdp_type_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_sdp_type_t) ((arg1)->sdp_type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_ptime_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ptime = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_ptime_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ptime);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rate_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint32_t) ((arg1)->rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_allocated_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->allocated = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_allocated_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint8_t) ((arg1)->allocated);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_negotiated_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->negotiated = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_negotiated_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint8_t) ((arg1)->negotiated);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_current_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->current = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_current_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint8_t) ((arg1)->current);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_hash_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->hash = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_hash_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (unsigned long) ((arg1)->hash);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_encoding_set(void * jarg1, char * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->rm_encoding) delete [] arg1->rm_encoding;
-    if (arg2) {
-      arg1->rm_encoding = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->rm_encoding, (const char *)arg2);
-    } else {
-      arg1->rm_encoding = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_encoding_get(void * jarg1) {
-  char * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (char *) ((arg1)->rm_encoding);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_iananame_set(void * jarg1, char * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->iananame) delete [] arg1->iananame;
-    if (arg2) {
-      arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->iananame, (const char *)arg2);
-    } else {
-      arg1->iananame = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_iananame_get(void * jarg1) {
-  char * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (char *) ((arg1)->iananame);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_pt_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->pt = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_pt_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_payload_t) ((arg1)->pt);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_rate_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->rm_rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rm_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (unsigned long) ((arg1)->rm_rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->adv_rm_rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  unsigned long result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (unsigned long) ((arg1)->adv_rm_rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_codec_ms_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->codec_ms = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_codec_ms_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint32_t) ((arg1)->codec_ms);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_bitrate_set(void * jarg1, unsigned long jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->bitrate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_bitrate_get(void * jarg1) {
-  unsigned long jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (uint32_t) ((arg1)->bitrate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_set(void * jarg1, char * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->rm_fmtp) delete [] arg1->rm_fmtp;
-    if (arg2) {
-      arg1->rm_fmtp = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->rm_fmtp, (const char *)arg2);
-    } else {
-      arg1->rm_fmtp = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_get(void * jarg1) {
-  char * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (char *) ((arg1)->rm_fmtp);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_agreed_pt_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->agreed_pt = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_agreed_pt_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_payload_t) ((arg1)->agreed_pt);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_recv_pt_set(void * jarg1, unsigned char jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->recv_pt = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_recv_pt_get(void * jarg1) {
-  unsigned char jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_payload_t) ((arg1)->recv_pt);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_fmtp_out_set(void * jarg1, char * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->fmtp_out) delete [] arg1->fmtp_out;
-    if (arg2) {
-      arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->fmtp_out, (const char *)arg2);
-    } else {
-      arg1->fmtp_out = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_fmtp_out_get(void * jarg1) {
-  char * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (char *) ((arg1)->fmtp_out);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_set(void * jarg1, char * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->remote_sdp_ip) delete [] arg1->remote_sdp_ip;
-    if (arg2) {
-      arg1->remote_sdp_ip = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->remote_sdp_ip, (const char *)arg2);
-    } else {
-      arg1->remote_sdp_ip = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_get(void * jarg1) {
-  char * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (char *) ((arg1)->remote_sdp_ip);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_set(void * jarg1, unsigned short jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  if (arg1) (arg1)->remote_sdp_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_get(void * jarg1) {
-  unsigned short jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (switch_port_t) ((arg1)->remote_sdp_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_channels_set(void * jarg1, int jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->channels = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_channels_get(void * jarg1) {
-  int jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  int result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (int) ((arg1)->channels);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_channels_set(void * jarg1, int jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->adv_channels = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_adv_channels_get(void * jarg1) {
-  int jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  int result;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (int) ((arg1)->adv_channels);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_next_set(void * jarg1, void * jarg2) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  payload_map_s *arg2 = (payload_map_s *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  arg2 = (payload_map_s *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_payload_map_t_next_get(void * jarg1) {
-  void * jresult ;
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  payload_map_s *result = 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  result = (payload_map_s *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_payload_map_t() {
-  void * jresult ;
-  payload_map_t *result = 0 ;
-  
-  result = (payload_map_t *)new payload_map_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_payload_map_t(void * jarg1) {
-  payload_map_t *arg1 = (payload_map_t *) 0 ;
-  
-  arg1 = (payload_map_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_close(void * jarg1) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  result = (int)switch_core_db_close(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_open(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_core_db_t **arg2 = (switch_core_db_t **) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_core_db_t **)jarg2; 
-  result = (int)switch_core_db_open((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_db_column_text(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  unsigned char *result = 0 ;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (unsigned char *)switch_core_db_column_text(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_db_column_name(void * jarg1, int jarg2) {
-  char * jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (char *)switch_core_db_column_name(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_column_count(void * jarg1) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  result = (int)switch_core_db_column_count(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_db_errmsg(void * jarg1) {
-  char * jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  result = (char *)switch_core_db_errmsg(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_exec(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  char **arg5 = (char **) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_callback_func_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  arg5 = (char **)jarg5; 
-  result = (int)switch_core_db_exec(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_finalize(void * jarg1) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  result = (int)switch_core_db_finalize(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_prepare(void * jarg1, char * jarg2, int jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  switch_core_db_stmt_t **arg4 = (switch_core_db_stmt_t **) 0 ;
-  char **arg5 = (char **) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (switch_core_db_stmt_t **)jarg4; 
-  arg5 = (char **)jarg5; 
-  result = (int)switch_core_db_prepare(arg1,(char const *)arg2,arg3,arg4,(char const **)arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_step(void * jarg1) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  result = (int)switch_core_db_step(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_reset(void * jarg1) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  result = (int)switch_core_db_reset(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_int(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_core_db_bind_int(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_int64(void * jarg1, int jarg2, long long jarg3) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  int64_t arg3 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int64_t)jarg3; 
-  result = (int)switch_core_db_bind_int64(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_text(void * jarg1, int jarg2, char * jarg3, int jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_core_db_destructor_type_t arg5 = (switch_core_db_destructor_type_t) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_core_db_destructor_type_t)jarg5; 
-  result = (int)switch_core_db_bind_text(arg1,arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_double(void * jarg1, int jarg2, double jarg3) {
-  int jresult ;
-  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
-  int arg2 ;
-  double arg3 ;
-  int result;
-  
-  arg1 = (switch_core_db_stmt_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (double)jarg3; 
-  result = (int)switch_core_db_bind_double(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_core_db_last_insert_rowid(void * jarg1) {
-  long long jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  result = (int64_t)switch_core_db_last_insert_rowid(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_get_table(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char ***arg3 = (char ***) 0 ;
-  int *arg4 = (int *) 0 ;
-  int *arg5 = (int *) 0 ;
-  char **arg6 = (char **) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char ***)jarg3; 
-  arg4 = (int *)jarg4; 
-  arg5 = (int *)jarg5; 
-  arg6 = (char **)jarg6; 
-  result = (int)switch_core_db_get_table(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_free_table(void * jarg1) {
-  char **arg1 = (char **) 0 ;
-  
-  arg1 = (char **)jarg1; 
-  switch_core_db_free_table(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_free(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_core_db_free(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_changes(void * jarg1) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  result = (int)switch_core_db_changes(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_load_extension(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_core_db_load_extension(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_OK_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(0);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ERROR_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERNAL_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PERM_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ABORT_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_BUSY_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_LOCKED_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOMEM_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_READONLY_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERRUPT_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_IOERR_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(10);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CORRUPT_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(11);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTFOUND_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(12);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FULL_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(13);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CANTOPEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(14);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PROTOCOL_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(15);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_EMPTY_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(16);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_SCHEMA_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(17);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_TOOBIG_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(18);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CONSTRAINT_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(19);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISMATCH_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(20);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISUSE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(21);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOLFS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(22);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_AUTH_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(23);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FORMAT_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(24);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_RANGE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(25);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTADB_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(26);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ROW_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(100);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_DONE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(101);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_sql_concat() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_sql_concat();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_regex_compile(char * jarg1, int jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  char **arg3 = (char **) 0 ;
-  int *arg4 = (int *) 0 ;
-  unsigned char *arg5 = (unsigned char *) 0 ;
-  switch_regex_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char **)jarg3; 
-  arg4 = (int *)jarg4; 
-  arg5 = (unsigned char *)jarg5; 
-  result = (switch_regex_t *)switch_regex_compile((char const *)arg1,arg2,(char const **)arg3,arg4,(unsigned char const *)arg5);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_copy_substring(char * jarg1, void * jarg2, int jarg3, int jarg4, char * jarg5, int jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
-  int arg6 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (int)jarg6; 
-  result = (int)switch_regex_copy_substring((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_free(void * jarg1) {
-  void *arg1 = (void *) 0 ;
-  
-  arg1 = (void *)jarg1; 
-  switch_regex_free(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_perform(char * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_regex_t **arg3 = (switch_regex_t **) 0 ;
-  int *arg4 = (int *) 0 ;
-  uint32_t arg5 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_regex_t **)jarg3; 
-  arg4 = (int *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  result = (int)switch_regex_perform((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_perform_substitution(void * jarg1, int jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6, void * jarg7) {
-  switch_regex_t *arg1 = (switch_regex_t *) 0 ;
-  int arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_size_t arg6 ;
-  int *arg7 = (int *) 0 ;
-  switch_size_t *argp6 ;
-  
-  arg1 = (switch_regex_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  argp6 = (switch_size_t *)jarg6; 
-  if (!argp6) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg6 = *argp6; 
-  arg7 = (int *)jarg7; 
-  switch_perform_substitution(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_match(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_regex_match((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_match_partial(char * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int *arg3 = (int *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int *)jarg3; 
-  result = (switch_status_t)switch_regex_match_partial((char const *)arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_capture_regex(void * jarg1, int jarg2, char * jarg3, void * jarg4, char * jarg5, void * jarg6, void * jarg7) {
-  switch_regex_t *arg1 = (switch_regex_t *) 0 ;
-  int arg2 ;
-  char *arg3 = (char *) 0 ;
-  int *arg4 = (int *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_cap_callback_t arg6 = (switch_cap_callback_t) 0 ;
-  void *arg7 = (void *) 0 ;
-  
-  arg1 = (switch_regex_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_cap_callback_t)jarg6; 
-  arg7 = (void *)jarg7; 
-  switch_capture_regex(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6,arg7);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_set_var_callback(char * jarg1, char * jarg2, void * jarg3) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  switch_regex_set_var_callback((char const *)arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_set_event_header_callback(char * jarg1, char * jarg2, void * jarg3) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  switch_regex_set_event_header_callback((char const *)arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CORE_THREAD_SESSION_OBJS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(128);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STREAMS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(128);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_mms_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->mms = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_mms_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->mms);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_ms_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ms = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_ms_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->ms);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_sec_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->sec = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_sec_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->sec);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_min_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->min = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_min_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->min);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_hr_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->hr = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_hr_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->hr);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_day_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->day = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_day_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->day);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_yr_set(void * jarg1, unsigned long jarg2) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->yr = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_yr_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  result = (uint32_t) ((arg1)->yr);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_time_duration() {
-  void * jresult ;
-  switch_core_time_duration *result = 0 ;
-  
-  result = (switch_core_time_duration *)new switch_core_time_duration();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_time_duration(void * jarg1) {
-  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
-  
-  arg1 = (switch_core_time_duration *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_app_set(void * jarg1, char * jarg2) {
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->app) delete [] arg1->app;
-    if (arg2) {
-      arg1->app = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->app, (const char *)arg2);
-    } else {
-      arg1->app = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_app_log_app_get(void * jarg1) {
-  char * jresult ;
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  result = (char *) ((arg1)->app);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_arg_set(void * jarg1, char * jarg2) {
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->arg) delete [] arg1->arg;
-    if (arg2) {
-      arg1->arg = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->arg, (const char *)arg2);
-    } else {
-      arg1->arg = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_app_log_arg_get(void * jarg1) {
-  char * jresult ;
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  result = (char *) ((arg1)->arg);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_stamp_set(void * jarg1, void * jarg2) {
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->stamp = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_app_log_stamp_get(void * jarg1) {
-  void * jresult ;
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  result =  ((arg1)->stamp);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_next_set(void * jarg1, void * jarg2) {
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  switch_app_log *arg2 = (switch_app_log *) 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  arg2 = (switch_app_log *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_app_log_next_get(void * jarg1) {
-  void * jresult ;
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  switch_app_log *result = 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  result = (switch_app_log *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_app_log() {
-  void * jresult ;
-  switch_app_log *result = 0 ;
-  
-  result = (switch_app_log *)new switch_app_log();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_app_log(void * jarg1) {
-  switch_app_log *arg1 = (switch_app_log *) 0 ;
-  
-  arg1 = (switch_app_log *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_func_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  switch_thread_start_t arg2 ;
-  switch_thread_start_t *argp2 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  argp2 = (switch_thread_start_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_thread_start_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->func = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_func_get(void * jarg1) {
-  void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  switch_thread_start_t result;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  result =  ((arg1)->func);
-  jresult = new switch_thread_start_t((const switch_thread_start_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_obj_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->obj = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_obj_get(void * jarg1) {
-  void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  result = (void *) ((arg1)->obj);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_alloc_set(void * jarg1, int jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->alloc = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_data_t_alloc_get(void * jarg1) {
-  int jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  result = (int) ((arg1)->alloc);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_pool_set(void * jarg1, void * jarg2) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_thread_data_t() {
-  void * jresult ;
-  switch_thread_data_t *result = 0 ;
-  
-  result = (switch_thread_data_t *)new switch_thread_data_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_thread_data_t(void * jarg1) {
-  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
-  
-  arg1 = (switch_thread_data_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_on_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->on = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_on_get(void * jarg1) {
-  void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  result =  ((arg1)->on);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_off_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->off = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_off_get(void * jarg1) {
-  void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  result =  ((arg1)->off);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid) delete [] arg1->uuid;
-    if (arg2) {
-      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid, (const char *)arg2);
-    } else {
-      arg1->uuid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_hold_record_t_uuid_get(void * jarg1) {
-  char * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  result = (char *) ((arg1)->uuid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_next_set(void * jarg1, void * jarg2) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_hold_record_s *arg2 = (switch_hold_record_s *) 0 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  arg2 = (switch_hold_record_s *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_next_get(void * jarg1) {
-  void * jresult ;
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  switch_hold_record_s *result = 0 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  result = (switch_hold_record_s *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_hold_record_t() {
-  void * jresult ;
-  switch_hold_record_t *result = 0 ;
-  
-  result = (switch_hold_record_t *)new switch_hold_record_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_hold_record_t(void * jarg1) {
-  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
-  
-  arg1 = (switch_hold_record_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid) delete [] arg1->uuid;
-    if (arg2) {
-      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid, (const char *)arg2);
-    } else {
-      arg1->uuid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_node_t_uuid_get(void * jarg1) {
-  char * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (char *) ((arg1)->uuid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->xml_cdr = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_xml_t) ((arg1)->xml_cdr);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t__event_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  if (arg1) (arg1)->event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t__event_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_event_t *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_event_t *) ((arg1)->event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_callstate_set(void * jarg1, int jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_channel_callstate_t arg2 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_channel_callstate_t)jarg2; 
-  if (arg1) (arg1)->callstate = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_callstate_get(void * jarg1) {
-  int jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_channel_callstate_t result;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_channel_callstate_t) ((arg1)->callstate);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hold_record_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_hold_record_t *arg2 = (switch_hold_record_t *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_hold_record_t *)jarg2; 
-  if (arg1) (arg1)->hold_record = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hold_record_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_hold_record_t *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_hold_record_t *) ((arg1)->hold_record);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  if (arg1) (arg1)->hup_profile = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_caller_profile_t *) ((arg1)->hup_profile);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_direction_set(void * jarg1, int jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_call_direction_t arg2 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  if (arg1) (arg1)->direction = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_direction_get(void * jarg1) {
-  int jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_call_direction_t) ((arg1)->direction);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_parent_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_device_record_s *arg2 = (switch_device_record_s *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (switch_device_record_s *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  switch_device_record_s *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (switch_device_record_s *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_next_set(void * jarg1, void * jarg2) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  arg2 = (device_uuid_node_s *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_next_get(void * jarg1) {
-  void * jresult ;
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  device_uuid_node_s *result = 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  result = (device_uuid_node_s *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_node_t() {
-  void * jresult ;
-  switch_device_node_t *result = 0 ;
-  
-  result = (switch_device_node_t *)new switch_device_node_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_node_t(void * jarg1) {
-  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
-  
-  arg1 = (switch_device_node_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->total = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->total);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->total_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->total_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->total_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->total_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->offhook = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->offhook);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->offhook_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->offhook_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->offhook_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->offhook_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->active = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->active);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->active_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->active_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->active_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->active_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->held = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->held);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->held_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->held_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->held_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->held_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->unheld = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->unheld);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->unheld_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->unheld_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->unheld_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->unheld_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->hup = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->hup);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->hup_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->hup_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->hup_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->hup_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ringing = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ringing);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ringing_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ringing_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ringing_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ringing_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->early = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->early);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_in_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->early_in = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_in_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->early_in);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_out_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->early_out = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_out_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->early_out);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_set(void * jarg1, unsigned long jarg2) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ring_wait = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  result = (uint32_t) ((arg1)->ring_wait);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_stats_t() {
-  void * jresult ;
-  switch_device_stats_t *result = 0 ;
-  
-  result = (switch_device_stats_t *)new switch_device_stats_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_stats_t(void * jarg1) {
-  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
-  
-  arg1 = (switch_device_stats_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_device_id_set(void * jarg1, char * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->device_id) delete [] arg1->device_id;
-    if (arg2) {
-      arg1->device_id = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->device_id, (const char *)arg2);
-    } else {
-      arg1->device_id = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_device_id_get(void * jarg1) {
-  char * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (char *) ((arg1)->device_id);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_set(void * jarg1, char * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid) delete [] arg1->uuid;
-    if (arg2) {
-      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid, (const char *)arg2);
-    } else {
-      arg1->uuid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_uuid_get(void * jarg1) {
-  char * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (char *) ((arg1)->uuid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_refs_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_refs_get(void * jarg1) {
-  int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_stats_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_device_stats_t *)jarg2; 
-  if (arg1) (arg1)->stats = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_stats_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_stats_t *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_device_stats_t *)& ((arg1)->stats);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_stats_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_device_stats_t *)jarg2; 
-  if (arg1) (arg1)->last_stats = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_stats_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_stats_t *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_device_stats_t *)& ((arg1)->last_stats);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_state_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_state_t arg2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_device_state_t)jarg2; 
-  if (arg1) (arg1)->state = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_state_get(void * jarg1) {
-  int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_state_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_device_state_t) ((arg1)->state);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_state_set(void * jarg1, int jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_state_t arg2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_device_state_t)jarg2; 
-  if (arg1) (arg1)->last_state = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_last_state_get(void * jarg1) {
-  int jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_device_state_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_device_state_t) ((arg1)->last_state);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->active_start = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_start_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->active_start);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->active_stop = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_stop_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->active_stop);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->last_call_time = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->last_call_time);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->ring_start = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_start_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->ring_start);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->ring_stop = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->ring_stop);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->hold_start = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_start_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->hold_start);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->hold_stop = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->hold_stop);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_call_start_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->call_start = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_call_start_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result =  ((arg1)->call_start);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (device_uuid_node_s *)jarg2; 
-  if (arg1) (arg1)->uuid_list = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  device_uuid_node_s *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (device_uuid_node_s *) ((arg1)->uuid_list);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (device_uuid_node_s *)jarg2; 
-  if (arg1) (arg1)->uuid_tail = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  device_uuid_node_s *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (device_uuid_node_s *) ((arg1)->uuid_tail);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_mutex_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->mutex = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_mutex_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->mutex);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_pool_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_user_data_set(void * jarg1, void * jarg2) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  result = (void *) ((arg1)->user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_record_t() {
-  void * jresult ;
-  switch_device_record_t *result = 0 ;
-  
-  result = (switch_device_record_t *)new switch_device_record_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_record_t(void * jarg1) {
-  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
-  
-  arg1 = (switch_device_record_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_DTLS_SRTP_FNAME_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("dtls-srtp");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPLEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(64);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPSTRLEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(192);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_len_set(void * jarg1, unsigned long jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->len = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_dtls_fingerprint_t_len_get(void * jarg1) {
-  unsigned long jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  result = (uint32_t) ((arg1)->len);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_data_set(void * jarg1, void * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  uint8_t *arg2 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  arg2 = (uint8_t *)jarg2; 
-  {
-    size_t ii;
-    uint8_t *b = (uint8_t *) arg1->data;
-    for (ii = 0; ii < (size_t)64+1; ii++) b[ii] = *((uint8_t *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_dtls_fingerprint_t_data_get(void * jarg1) {
-  void * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  uint8_t *result = 0 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  result = (uint8_t *)(uint8_t *) ((arg1)->data);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_type_set(void * jarg1, char * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->type) delete [] arg1->type;
-    if (arg2) {
-      arg1->type = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->type, (const char *)arg2);
-    } else {
-      arg1->type = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_type_get(void * jarg1) {
-  char * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  result = (char *) ((arg1)->type);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_str_set(void * jarg1, char * jarg2) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->str, (const char *)arg2, 192-1);
-      arg1->str[192-1] = 0;
-    } else {
-      arg1->str[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_str_get(void * jarg1) {
-  char * jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  result = (char *)(char *) ((arg1)->str);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_dtls_fingerprint_t() {
-  void * jresult ;
-  dtls_fingerprint_t *result = 0 ;
-  
-  result = (dtls_fingerprint_t *)new dtls_fingerprint_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_dtls_fingerprint_t(void * jarg1) {
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_MESSAGE_STRING_ARG_MAX_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(10);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_from_set(void * jarg1, char * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->from) delete [] arg1->from;
-    if (arg2) {
-      arg1->from = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->from, (const char *)arg2);
-    } else {
-      arg1->from = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_from_get(void * jarg1) {
-  char * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char *) ((arg1)->from);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_message_id_set(void * jarg1, int jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_core_session_message_types_t arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (switch_core_session_message_types_t)jarg2; 
-  if (arg1) (arg1)->message_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_message_id_get(void * jarg1) {
-  int jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_core_session_message_types_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (switch_core_session_message_types_t) ((arg1)->message_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_arg_set(void * jarg1, int jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->numeric_arg = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_numeric_arg_get(void * jarg1) {
-  int jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (int) ((arg1)->numeric_arg);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_arg_set(void * jarg1, char * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->string_arg = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->string_arg, (const char *)arg2);
-    } else {
-      arg1->string_arg = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_string_arg_get(void * jarg1) {
-  char * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char *) ((arg1)->string_arg);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->string_arg_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result =  ((arg1)->string_arg_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->pointer_arg = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (void *) ((arg1)->pointer_arg);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_size_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->pointer_arg_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_size_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result =  ((arg1)->pointer_arg_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_reply_set(void * jarg1, int jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->numeric_reply = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_numeric_reply_get(void * jarg1) {
-  int jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (int) ((arg1)->numeric_reply);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_set(void * jarg1, char * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->string_reply) delete [] arg1->string_reply;
-    if (arg2) {
-      arg1->string_reply = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->string_reply, (const char *)arg2);
-    } else {
-      arg1->string_reply = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_string_reply_get(void * jarg1) {
-  char * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char *) ((arg1)->string_reply);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_size_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->string_reply_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_reply_size_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result =  ((arg1)->string_reply_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->pointer_reply = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (void *) ((arg1)->pointer_reply);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_size_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->pointer_reply_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_size_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result =  ((arg1)->pointer_reply_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_core_session_message_flag_t arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (switch_core_session_message_flag_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_message_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  switch_core_session_message_flag_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (switch_core_session_message_flag_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__file_set(void * jarg1, char * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->_file = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->_file, (const char *)arg2);
-    } else {
-      arg1->_file = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__file_get(void * jarg1) {
-  char * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char *) ((arg1)->_file);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__func_set(void * jarg1, char * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->_func = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->_func, (const char *)arg2);
-    } else {
-      arg1->_func = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__func_get(void * jarg1) {
-  char * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char *) ((arg1)->_func);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__line_set(void * jarg1, int jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->_line = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message__line_get(void * jarg1) {
-  int jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (int) ((arg1)->_line);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char **arg2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  arg2 = (char **)jarg2; 
-  {
-    size_t ii;
-    char const * *b = (char const * *) arg1->string_array_arg;
-    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((char const * *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  char **result = 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result = (char **)(char **) ((arg1)->string_array_arg);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_set(void * jarg1, void * jarg2) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  time_t arg2 ;
-  time_t *argp2 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  argp2 = (time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->delivery_time = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_get(void * jarg1) {
-  void * jresult ;
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  time_t result;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  result =  ((arg1)->delivery_time);
-  jresult = new time_t((const time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_session_message() {
-  void * jresult ;
-  switch_core_session_message *result = 0 ;
-  
-  result = (switch_core_session_message *)new switch_core_session_message();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_session_message(void * jarg1) {
-  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
-  
-  arg1 = (switch_core_session_message *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_running_set(void * jarg1, int jarg2) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->running = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_thread_session_running_get(void * jarg1) {
-  int jresult ;
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  result = (int) ((arg1)->running);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_mutex_set(void * jarg1, void * jarg2) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->mutex = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_mutex_get(void * jarg1) {
-  void * jresult ;
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->mutex);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_objs_set(void * jarg1, void * jarg2) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  void **arg2 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  arg2 = (void **)jarg2; 
-  {
-    size_t ii;
-    void * *b = (void * *) arg1->objs;
-    for (ii = 0; ii < (size_t)128; ii++) b[ii] = *((void * *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_objs_get(void * jarg1) {
-  void * jresult ;
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  void **result = 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  result = (void **)(void **) ((arg1)->objs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_input_callback_set(void * jarg1, void * jarg2) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  arg2 = (switch_input_callback_function_t)jarg2; 
-  if (arg1) (arg1)->input_callback = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_input_callback_get(void * jarg1) {
-  void * jresult ;
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_input_callback_function_t result;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  result = (switch_input_callback_function_t) ((arg1)->input_callback);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_pool_set(void * jarg1, void * jarg2) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_thread_session() {
-  void * jresult ;
-  switch_core_thread_session *result = 0 ;
-  
-  result = (switch_core_thread_session *)new switch_core_thread_session();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_thread_session(void * jarg1) {
-  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
-  
-  arg1 = (switch_core_thread_session *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_screen_size(void * jarg1, void * jarg2) {
-  int *arg1 = (int *) 0 ;
-  int *arg2 = (int *) 0 ;
-  
-  arg1 = (int *)jarg1; 
-  arg2 = (int *)jarg2; 
-  switch_core_screen_size(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_sched_heartbeat(void * jarg1, unsigned long jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_core_session_sched_heartbeat(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unsched_heartbeat(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_unsched_heartbeat(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_enable_heartbeat(void * jarg1, unsigned long jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_core_session_enable_heartbeat(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_disable_heartbeat(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_disable_heartbeat(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_pop(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_media_bug_t **arg3 = (switch_media_bug_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_media_bug_t **)jarg3; 
-  result = (switch_status_t)switch_core_media_bug_pop(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_exec_all(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_media_bug_exec_cb_t arg3 = (switch_media_bug_exec_cb_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_media_bug_exec_cb_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  result = (switch_status_t)switch_core_media_bug_exec_all(arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_count(void * jarg1, char * jarg2) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (uint32_t)switch_core_media_bug_count(arg1,(char const *)arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_add(void * jarg1, char * jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6, unsigned long jarg7, void * jarg8) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_media_bug_callback_t arg4 = (switch_media_bug_callback_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  time_t arg6 ;
-  switch_media_bug_flag_t arg7 ;
-  switch_media_bug_t **arg8 = (switch_media_bug_t **) 0 ;
-  time_t *argp6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_media_bug_callback_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  argp6 = (time_t *)jarg6; 
-  if (!argp6) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg6 = *argp6; 
-  arg7 = (switch_media_bug_flag_t)jarg7; 
-  arg8 = (switch_media_bug_t **)jarg8; 
-  result = (switch_status_t)switch_core_media_bug_add(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_pause(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_media_bug_pause(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_resume(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_media_bug_resume(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_inuse(void * jarg1, void * jarg2, void * jarg3) {
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_size_t *arg2 = (switch_size_t *) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (switch_size_t *)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  switch_core_media_bug_inuse(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_user_data(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (void *)switch_core_media_bug_get_user_data(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_write_replace_frame(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (switch_frame_t *)switch_core_media_bug_get_write_replace_frame(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_native_read_frame(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (switch_frame_t *)switch_core_media_bug_get_native_read_frame(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_native_write_frame(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (switch_frame_t *)switch_core_media_bug_get_native_write_frame(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_write_replace_frame(void * jarg1, void * jarg2) {
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  switch_core_media_bug_set_write_replace_frame(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_read_replace_frame(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (switch_frame_t *)switch_core_media_bug_get_read_replace_frame(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_read_demux_frame(void * jarg1, void * jarg2) {
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  switch_core_media_bug_set_read_demux_frame(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_session(void * jarg1) {
-  void * jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  result = (switch_core_session_t *)switch_core_media_bug_get_session(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_test_flag(void * jarg1, unsigned long jarg2) {
-  unsigned long jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (uint32_t)switch_core_media_bug_test_flag(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_set_flag(void * jarg1, unsigned long jarg2) {
-  unsigned long jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (uint32_t)switch_core_media_bug_set_flag(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_clear_flag(void * jarg1, unsigned long jarg2) {
-  unsigned long jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (uint32_t)switch_core_media_bug_clear_flag(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_read_replace_frame(void * jarg1, void * jarg2) {
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  switch_core_media_bug_set_read_replace_frame(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_cpu_count() {
-  unsigned long jresult ;
-  uint32_t result;
-  
-  result = (uint32_t)switch_core_cpu_count();
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_media_bug_t **arg2 = (switch_media_bug_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_media_bug_t **)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_remove(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_prune(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (uint32_t)switch_core_media_bug_prune(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove_callback(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_media_bug_callback_t arg2 = (switch_media_bug_callback_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_media_bug_callback_t)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_remove_callback(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_close(void * jarg1) {
-  int jresult ;
-  switch_media_bug_t **arg1 = (switch_media_bug_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_media_bug_t **)jarg1; 
-  result = (switch_status_t)switch_core_media_bug_close(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove_all_function(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_remove_all_function(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_enumerate(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_stream_handle_t *)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_enumerate(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_transfer_recordings(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_transfer_recordings(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_transfer_callback(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_media_bug_callback_t arg3 = (switch_media_bug_callback_t) 0 ;
-  void *(*arg4)(switch_core_session_t *,void *) = (void *(*)(switch_core_session_t *,void *)) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (switch_media_bug_callback_t)jarg3; 
-  arg4 = (void *(*)(switch_core_session_t *,void *))jarg4; 
-  result = (switch_status_t)switch_core_media_bug_transfer_callback(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_read(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_core_media_bug_read(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_flush(void * jarg1) {
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  switch_core_media_bug_flush(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_flush_all(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_media_bug_flush_all(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_set_pre_buffer_framecount(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
-  uint32_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_media_bug_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (switch_status_t)switch_core_media_bug_set_pre_buffer_framecount(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_new(char * jarg1, unsigned short jarg2, unsigned short jarg3, unsigned long jarg4, void * jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_port_t arg2 ;
-  switch_port_t arg3 ;
-  switch_port_flag_t arg4 ;
-  switch_core_port_allocator_t **arg5 = (switch_core_port_allocator_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  arg3 = (switch_port_t)jarg3; 
-  arg4 = (switch_port_flag_t)jarg4; 
-  arg5 = (switch_core_port_allocator_t **)jarg5; 
-  result = (switch_status_t)switch_core_port_allocator_new((char const *)arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_request_port(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_port_allocator_t *arg1 = (switch_core_port_allocator_t *) 0 ;
-  switch_port_t *arg2 = (switch_port_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_port_allocator_t *)jarg1; 
-  arg2 = (switch_port_t *)jarg2; 
-  result = (switch_status_t)switch_core_port_allocator_request_port(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_free_port(void * jarg1, unsigned short jarg2) {
-  int jresult ;
-  switch_core_port_allocator_t *arg1 = (switch_core_port_allocator_t *) 0 ;
-  switch_port_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_port_allocator_t *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  result = (switch_status_t)switch_core_port_allocator_free_port(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_port_allocator_destroy(void * jarg1) {
-  switch_core_port_allocator_t **arg1 = (switch_core_port_allocator_t **) 0 ;
-  
-  arg1 = (switch_core_port_allocator_t **)jarg1; 
-  switch_core_port_allocator_destroy(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_test_flag(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_core_test_flag(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_init(unsigned long jarg1, int jarg2, void * jarg3) {
-  int jresult ;
-  switch_core_flag_t arg1 ;
-  switch_bool_t arg2 ;
-  char **arg3 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_flag_t)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_status_t)switch_core_init(arg1,arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_init_and_modload(unsigned long jarg1, int jarg2, void * jarg3) {
-  int jresult ;
-  switch_core_flag_t arg1 ;
-  switch_bool_t arg2 ;
-  char **arg3 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_flag_t)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_status_t)switch_core_init_and_modload(arg1,arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_limit(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_core_session_limit(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_sessions_per_second(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_core_sessions_per_second(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_destroy() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_core_destroy();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_read_lock(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_io_read_lock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_write_lock(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_io_write_lock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_rwunlock(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_io_rwunlock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_read_lock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock_hangup(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_read_lock_hangup(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_write_lock(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_write_lock(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_rwunlock(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_rwunlock(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_add_state_handler(void * jarg1) {
-  int jresult ;
-  switch_state_handler_table_t *arg1 = (switch_state_handler_table_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_state_handler_table_t *)jarg1; 
-  result = (int)switch_core_add_state_handler((switch_state_handler_table const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_remove_state_handler(void * jarg1) {
-  switch_state_handler_table_t *arg1 = (switch_state_handler_table_t *) 0 ;
-  
-  arg1 = (switch_state_handler_table_t *)jarg1; 
-  switch_core_remove_state_handler((switch_state_handler_table const *)arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_state_handler(int jarg1) {
-  void * jresult ;
-  int arg1 ;
-  switch_state_handler_table_t *result = 0 ;
-  
-  arg1 = (int)jarg1; 
-  result = (switch_state_handler_table_t *)switch_core_get_state_handler(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_tag(void * jarg1, char * jarg2) {
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_core_memory_pool_tag(arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_new_memory_pool(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_memory_pool_t **arg1 = (switch_memory_pool_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_perform_new_memory_pool(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_sync_clock() {
-  int jresult ;
-  int result;
-  
-  result = (int)switch_core_session_sync_clock();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_destroy_memory_pool(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_memory_pool_t **arg1 = (switch_memory_pool_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_perform_destroy_memory_pool(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_set_data(void * jarg1, char * jarg2, void * jarg3) {
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  switch_core_memory_pool_set_data(arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_memory_pool_get_data(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (void *)switch_core_memory_pool_get_data(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_run(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_run(arg1);
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_core_session_running(void * jarg1) {
-  unsigned int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (unsigned int)switch_core_session_running(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_core_session_started(void * jarg1) {
-  unsigned int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (unsigned int)switch_core_session_started(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_permanent_alloc(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  void * jresult ;
-  switch_size_t arg1 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_size_t *argp1 ;
-  void *result = 0 ;
-  
-  argp1 = (switch_size_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (void *)switch_core_perform_permanent_alloc(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_alloc(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  void * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_size_t *argp2 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (void *)switch_core_perform_alloc(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_session_alloc(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_size_t *argp2 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (void *)switch_core_perform_session_alloc(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_permanent_strdup(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (char *)switch_core_perform_permanent_strdup((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_session_strdup(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  char * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (char *)switch_core_perform_session_strdup(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_strdup(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  char * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (char *)switch_core_perform_strdup(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_sprintf(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_core_session_sprintf(arg1,(char const *)arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_sprintf(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_core_sprintf(arg1,(char const *)arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_pool(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_memory_pool_t *)switch_core_session_get_pool(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_xml(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
-  switch_memory_pool_t **arg2 = (switch_memory_pool_t **) 0 ;
-  switch_xml_t arg3 = (switch_xml_t) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface_t *)jarg1; 
-  arg2 = (switch_memory_pool_t **)jarg2; 
-  arg3 = (switch_xml_t)jarg3; 
-  result = (switch_core_session_t *)switch_core_session_request_xml(arg1,arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, int jarg2, unsigned long jarg3, void * jarg4, char * jarg5) {
-  void * jresult ;
-  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
-  switch_call_direction_t arg2 ;
-  switch_originate_flag_t arg3 ;
-  switch_memory_pool_t **arg4 = (switch_memory_pool_t **) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface_t *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  arg3 = (switch_originate_flag_t)jarg3; 
-  arg4 = (switch_memory_pool_t **)jarg4; 
-  arg5 = (char *)jarg5; 
-  result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,arg3,arg4,(char const *)arg5);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_uuid(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_uuid(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_perform_destroy(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  switch_core_session_t **arg1 = (switch_core_session_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  
-  arg1 = (switch_core_session_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  switch_core_session_perform_destroy(arg1,(char const *)arg2,(char const *)arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_destroy_state(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_destroy_state(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reporting_state(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_reporting_state(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hangup_state(void * jarg1, int jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  switch_core_session_hangup_state(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_count() {
-  unsigned long jresult ;
-  uint32_t result;
-  
-  result = (uint32_t)switch_core_session_count();
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_id(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = switch_core_session_get_id(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id() {
-  void * jresult ;
-  switch_size_t result;
-  
-  result = switch_core_session_id();
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id_dec() {
-  void * jresult ;
-  switch_size_t result;
-  
-  result = switch_core_session_id_dec();
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_by_name(char * jarg1, int jarg2, void * jarg3) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_call_direction_t arg2 ;
-  switch_memory_pool_t **arg3 = (switch_memory_pool_t **) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  arg3 = (switch_memory_pool_t **)jarg3; 
-  result = (switch_core_session_t *)switch_core_session_request_by_name((char const *)arg1,arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_thread_launch(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_thread_launch(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_pool_launch_thread(void * jarg1) {
-  int jresult ;
-  switch_thread_data_t **arg1 = (switch_thread_data_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_thread_data_t **)jarg1; 
-  result = (switch_status_t)switch_thread_pool_launch_thread(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_thread_pool_launch(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_thread_pool_launch(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_channel(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_channel_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_channel_t *)switch_core_session_get_channel(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_mutex(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_mutex_t *)switch_core_session_get_mutex(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_wake_session_thread(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_wake_session_thread(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_signal_state_change(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_signal_state_change(arg1);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_get_uuid(void * jarg1) {
-  char * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (char *)switch_core_session_get_uuid(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_loglevel(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_log_level_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_log_level_t)jarg2; 
-  result = (switch_status_t)switch_core_session_set_loglevel(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_loglevel(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_log_level_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_log_level_t)switch_core_session_get_loglevel(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_jb(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_media_type_t arg2 ;
-  stfu_instance_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_media_type_t)jarg2; 
-  result = (stfu_instance_t *)switch_core_session_get_jb(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_soft_lock(void * jarg1, unsigned long jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_core_session_soft_lock(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_soft_unlock(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_soft_unlock(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_set_dmachine(void * jarg1, void * jarg2, int jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
-  switch_digit_action_target_t arg3 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_ivr_dmachine_t *)jarg2; 
-  arg3 = (switch_digit_action_target_t)jarg3; 
-  switch_core_session_set_dmachine(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_dmachine(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_digit_action_target_t arg2 ;
-  switch_ivr_dmachine_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_digit_action_target_t)jarg2; 
-  result = (switch_ivr_dmachine_t *)switch_core_session_get_dmachine(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_get_target(void * jarg1) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_digit_action_target_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (switch_digit_action_target_t)switch_ivr_dmachine_get_target(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_target(void * jarg1, int jarg2) {
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_digit_action_target_t arg2 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (switch_digit_action_target_t)jarg2; 
-  switch_ivr_dmachine_set_target(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_terminators(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_dmachine_set_terminators(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_codec_slin(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_slin_data_t *arg2 = (switch_slin_data_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_slin_data_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_codec_slin(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_uuid() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_core_get_uuid();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_perform_locate(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_core_session_t *)switch_core_session_perform_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_perform_force_locate(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_core_session_t *)switch_core_session_perform_force_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_core_get_variable((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable_dup(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_core_get_variable_dup((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable_pdup(char * jarg1, void * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  result = (char *)switch_core_get_variable_pdup((char const *)arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_hostname() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_core_get_hostname();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_switchname() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_core_get_switchname();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_domain(int jarg1) {
-  char * jresult ;
-  switch_bool_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  result = (char *)switch_core_get_domain(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_variable(char * jarg1, char * jarg2) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_core_set_variable((char const *)arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_get_variables(void * jarg1) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  result = (switch_status_t)switch_core_get_variables(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_set_var_conditional(char * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_bool_t)switch_core_set_var_conditional((char const *)arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_dump_variables(void * jarg1) {
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  switch_core_dump_variables(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall(int jarg1) {
-  switch_call_cause_t arg1 ;
-  
-  arg1 = (switch_call_cause_t)jarg1; 
-  switch_core_session_hupall(arg1);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_hupall_matching_var_ans(char * jarg1, char * jarg2, int jarg3, int jarg4) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_call_cause_t arg3 ;
-  switch_hup_type_t arg4 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_call_cause_t)jarg3; 
-  arg4 = (switch_hup_type_t)jarg4; 
-  result = (uint32_t)switch_core_session_hupall_matching_var_ans((char const *)arg1,(char const *)arg2,arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_findall_matching_var(char * jarg1, char * jarg2) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_console_callback_match_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_console_callback_match_t *)switch_core_session_findall_matching_var((char const *)arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_findall() {
-  void * jresult ;
-  switch_console_callback_match_t *result = 0 ;
-  
-  result = (switch_console_callback_match_t *)switch_core_session_findall();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall_endpoint(void * jarg1, int jarg2) {
-  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
-  switch_call_cause_t arg2 ;
-  
-  arg1 = (switch_endpoint_interface_t *)jarg1; 
-  arg2 = (switch_call_cause_t)jarg2; 
-  switch_core_session_hupall_endpoint((switch_endpoint_interface const *)arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_get_partner(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t **)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)switch_core_session_perform_get_partner(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_send(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_core_session_message_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_message_send((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_message(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_queue_message(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_free_message(void * jarg1) {
-  switch_core_session_message_t **arg1 = (switch_core_session_message_t **) 0 ;
-  
-  arg1 = (switch_core_session_message_t **)jarg1; 
-  switch_core_session_free_message(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_signal_data(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (switch_status_t)switch_core_session_queue_signal_data(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_signal_data(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void **arg2 = (void **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void **)jarg2; 
-  result = (switch_status_t)switch_core_session_dequeue_signal_data(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_pass_indication(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_types_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_types_t)jarg2; 
-  result = (switch_status_t)switch_core_session_pass_indication(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_indication(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_types_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_types_t)jarg2; 
-  result = (switch_status_t)switch_core_session_queue_indication(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_message(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_t **arg2 = (switch_core_session_message_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_t **)jarg2; 
-  result = (switch_status_t)switch_core_session_dequeue_message(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_flush_message(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_flush_message(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_event_send(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_core_session_event_send((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_app_log(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_app_log_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_app_log_t *)switch_core_session_get_app_log(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_exec(void * jarg1, void * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_application_interface_t *arg2 = (switch_application_interface_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_application_interface_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_session_exec(arg1,(switch_application_interface const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_video_reset(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_video_reset(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_get_flags(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int32_t *arg4 = (int32_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int32_t *)jarg4; 
-  result = (switch_status_t)switch_core_session_execute_application_get_flags(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_async(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_session_execute_application_async(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_app_flags(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int32_t *arg2 = (int32_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int32_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_app_flags((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_exten(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_core_session_execute_exten(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_receive_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_core_session_receive_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_private_class(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_pvt_class_t arg2 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_pvt_class_t)jarg2; 
-  result = (void *)switch_core_session_get_private_class(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_private_class(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_pvt_class_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_pvt_class_t)jarg3; 
-  result = (switch_status_t)switch_core_session_set_private_class(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_add_stream(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (int)switch_core_session_add_stream(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_stream(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  int arg2 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (void *)switch_core_session_get_stream(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_stream_count(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (int)switch_core_session_get_stream_count(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_launch_thread(void * jarg1, void * jarg2, void * jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void *(*arg2)(switch_thread_t *,void *) = (void *(*)(switch_thread_t *,void *)) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void *(*)(switch_thread_t *,void *))jarg2; 
-  arg3 = (void *)jarg3; 
-  switch_core_session_launch_thread(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_end(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_thread_session_end(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_service_session_av(void * jarg1, int jarg2, int jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_bool_t arg3 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  switch_core_service_session_av(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_outgoing_channel(void * jarg1, void * jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6, unsigned long jarg7, void * jarg8) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_caller_profile_t *arg4 = (switch_caller_profile_t *) 0 ;
-  switch_core_session_t **arg5 = (switch_core_session_t **) 0 ;
-  switch_memory_pool_t **arg6 = (switch_memory_pool_t **) 0 ;
-  switch_originate_flag_t arg7 ;
-  switch_call_cause_t *arg8 = (switch_call_cause_t *) 0 ;
-  switch_call_cause_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_caller_profile_t *)jarg4; 
-  arg5 = (switch_core_session_t **)jarg5; 
-  arg6 = (switch_memory_pool_t **)jarg6; 
-  arg7 = (switch_originate_flag_t)jarg7; 
-  arg8 = (switch_call_cause_t *)jarg8; 
-  result = (switch_call_cause_t)switch_core_session_outgoing_channel(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_receive_message(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)switch_core_session_perform_receive_message(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_core_session_queue_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_event_count(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (uint32_t)switch_core_session_event_count(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_messages_waiting(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (uint32_t)switch_core_session_messages_waiting(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_core_session_dequeue_event(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_private_event(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_core_session_queue_private_event(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_private_event_count(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (uint32_t)switch_core_session_private_event_count(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_private_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_core_session_dequeue_private_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_flush_private_events(void * jarg1) {
-  unsigned long jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (uint32_t)switch_core_session_flush_private_events(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
-  switch_io_flag_t arg3 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_frame_t **)jarg2; 
-  arg3 = (switch_io_flag_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_session_read_frame(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_video_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
-  switch_io_flag_t arg3 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_frame_t **)jarg2; 
-  arg3 = (switch_io_flag_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_session_read_video_frame(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_write_video_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  switch_io_flag_t arg3 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  arg3 = (switch_io_flag_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_session_write_video_frame(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_read_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_read_impl(arg1,(switch_codec_implementation const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_write_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_write_impl(arg1,(switch_codec_implementation const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_read_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_video_read_impl(arg1,(switch_codec_implementation const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_write_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_video_write_impl(arg1,(switch_codec_implementation const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reset(void * jarg1, int jarg2, int jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_bool_t arg3 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  switch_core_session_reset(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_write_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  switch_io_flag_t arg3 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  arg3 = (switch_io_flag_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_session_write_frame(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_kill_channel(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_signal_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_signal_t)jarg5; 
-  result = (switch_status_t)switch_core_session_perform_kill_channel(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_send_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_send_dtmf(arg1,(switch_dtmf_t const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_send_dtmf_string(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_session_send_dtmf_string(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_recv_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_recv_dtmf(arg1,(switch_dtmf_t const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_hash_t **arg1 = (switch_hash_t **) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t **)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_core_hash_init_case(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_destroy(void * jarg1) {
-  int jresult ;
-  switch_hash_t **arg1 = (switch_hash_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t **)jarg1; 
-  result = (switch_status_t)switch_core_hash_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_destructor(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  hashtable_destructor_t arg4 = (hashtable_destructor_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (hashtable_destructor_t)jarg4; 
-  result = (switch_status_t)switch_core_hash_insert_destructor(arg1,(char const *)arg2,(void const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_locked(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_mutex_t *arg4 = (switch_mutex_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (switch_mutex_t *)jarg4; 
-  result = (switch_status_t)switch_core_hash_insert_locked(arg1,(char const *)arg2,(void const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_wrlock(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_thread_rwlock_t *arg4 = (switch_thread_rwlock_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (switch_thread_rwlock_t *)jarg4; 
-  result = (switch_status_t)switch_core_hash_insert_wrlock(arg1,(char const *)arg2,(void const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_hash_delete(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_locked(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_mutex_t *arg3 = (switch_mutex_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_mutex_t *)jarg3; 
-  result = (switch_status_t)switch_core_hash_delete_locked(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_wrlock(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_thread_rwlock_t *arg3 = (switch_thread_rwlock_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_thread_rwlock_t *)jarg3; 
-  result = (switch_status_t)switch_core_hash_delete_wrlock(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_multi(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  switch_hash_delete_callback_t arg2 = (switch_hash_delete_callback_t) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (switch_hash_delete_callback_t)jarg2; 
-  arg3 = (void *)jarg3; 
-  result = (switch_status_t)switch_core_hash_delete_multi(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (void *)switch_core_hash_find(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find_locked(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_mutex_t *arg3 = (switch_mutex_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_mutex_t *)jarg3; 
-  result = (void *)switch_core_hash_find_locked(arg1,(char const *)arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find_rdlock(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_thread_rwlock_t *arg3 = (switch_thread_rwlock_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_thread_rwlock_t *)jarg3; 
-  result = (void *)switch_core_hash_find_rdlock(arg1,(char const *)arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_first_iter(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  switch_hash_index_t *arg2 = (switch_hash_index_t *) 0 ;
-  switch_hash_index_t *result = 0 ;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  arg2 = (switch_hash_index_t *)jarg2; 
-  result = (switch_hash_index_t *)switch_core_hash_first_iter(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_empty(void * jarg1) {
-  int jresult ;
-  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_hash_t *)jarg1; 
-  result = (switch_bool_t)switch_core_hash_empty(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_next(void * jarg1) {
-  void * jresult ;
-  switch_hash_index_t **arg1 = (switch_hash_index_t **) 0 ;
-  switch_hash_index_t *result = 0 ;
-  
-  arg1 = (switch_hash_index_t **)jarg1; 
-  result = (switch_hash_index_t *)switch_core_hash_next(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_hash_this(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ;
-  void **arg2 = (void **) 0 ;
-  switch_ssize_t *arg3 = (switch_ssize_t *) 0 ;
-  void **arg4 = (void **) 0 ;
-  
-  arg1 = (switch_hash_index_t *)jarg1; 
-  arg2 = (void **)jarg2; 
-  arg3 = (switch_ssize_t *)jarg3; 
-  arg4 = (void **)jarg4; 
-  switch_core_hash_this(arg1,(void const **)arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_init(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  switch_memory_pool_t *arg5 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_memory_pool_t *)jarg5; 
-  result = (switch_status_t)switch_core_timer_init(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_calibrate_clock() {
-  switch_time_calibrate_clock();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_next(void * jarg1) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  result = (switch_status_t)switch_core_timer_next(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_step(void * jarg1) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  result = (switch_status_t)switch_core_timer_step(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_sync(void * jarg1) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  result = (switch_status_t)switch_core_timer_sync(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_check(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_core_timer_check(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_destroy(void * jarg1) {
-  int jresult ;
-  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_timer_t *)jarg1; 
-  result = (switch_status_t)switch_core_timer_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_init_with_bitrate(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, int jarg5, int jarg6, unsigned long jarg7, unsigned long jarg8, void * jarg9, void * jarg10) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  uint32_t arg4 ;
-  int arg5 ;
-  int arg6 ;
-  uint32_t arg7 ;
-  uint32_t arg8 ;
-  switch_codec_settings_t *arg9 = (switch_codec_settings_t *) 0 ;
-  switch_memory_pool_t *arg10 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (int)jarg5; 
-  arg6 = (int)jarg6; 
-  arg7 = (uint32_t)jarg7; 
-  arg8 = (uint32_t)jarg8; 
-  arg9 = (switch_codec_settings_t *)jarg9; 
-  arg10 = (switch_memory_pool_t *)jarg10; 
-  result = (switch_status_t)switch_core_codec_init_with_bitrate(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,(switch_codec_settings const *)arg9,arg10);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_copy(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  arg3 = (switch_memory_pool_t *)jarg3; 
-  result = (switch_status_t)switch_core_codec_copy(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_parse_fmtp(char * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_codec_fmtp_t *arg4 = (switch_codec_fmtp_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (switch_codec_fmtp_t *)jarg4; 
-  result = (switch_status_t)switch_core_codec_parse_fmtp((char const *)arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_reset(void * jarg1) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  result = (switch_status_t)switch_core_codec_reset(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_encode(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  void *arg3 = (void *) 0 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  void *arg6 = (void *) 0 ;
-  uint32_t *arg7 = (uint32_t *) 0 ;
-  uint32_t *arg8 = (uint32_t *) 0 ;
-  unsigned int *arg9 = (unsigned int *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (void *)jarg6; 
-  arg7 = (uint32_t *)jarg7; 
-  arg8 = (uint32_t *)jarg8; 
-  arg9 = (unsigned int *)jarg9; 
-  result = (switch_status_t)switch_core_codec_encode(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_decode(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  void *arg3 = (void *) 0 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  void *arg6 = (void *) 0 ;
-  uint32_t *arg7 = (uint32_t *) 0 ;
-  uint32_t *arg8 = (uint32_t *) 0 ;
-  unsigned int *arg9 = (unsigned int *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (void *)jarg6; 
-  arg7 = (uint32_t *)jarg7; 
-  arg8 = (uint32_t *)jarg8; 
-  arg9 = (unsigned int *)jarg9; 
-  result = (switch_status_t)switch_core_codec_decode(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_destroy(void * jarg1) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  result = (switch_status_t)switch_core_codec_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_read_codec(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_read_codec(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_real_read_codec(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_real_read_codec(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unset_read_codec(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_unset_read_codec(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unset_write_codec(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_unset_write_codec(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_lock_codec_write(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_lock_codec_write(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unlock_codec_write(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_unlock_codec_write(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_lock_codec_read(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_lock_codec_read(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unlock_codec_read(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_session_unlock_codec_read(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_read_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_read_impl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_real_read_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_real_read_impl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_write_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_write_impl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_read_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_video_read_impl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_write_impl(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_get_video_write_impl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_read_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_read_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_effective_read_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_effective_read_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_write_codec(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_write_codec(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_write_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_write_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_effective_write_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_effective_write_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_read_codec(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_video_read_codec(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_video_read_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_video_read_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_write_codec(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  result = (switch_status_t)switch_core_session_set_video_write_codec(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_video_write_codec(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_codec_t *)switch_core_session_get_video_write_codec(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_db_open_file(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_core_db_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_core_db_t *)switch_core_db_open_file((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_persistant_execute(void * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_core_db_persistant_execute(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_persistant_execute_trans(void * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_core_db_persistant_execute_trans(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_test_reactive(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  
-  arg1 = (switch_core_db_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  switch_core_db_test_reactive(arg1,arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_file_open(char * jarg1, char * jarg2, int jarg3, void * jarg4, char * jarg5, unsigned long jarg6, unsigned long jarg7, unsigned int jarg8, void * jarg9) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  switch_file_handle_t *arg4 = (switch_file_handle_t *) 0 ;
-  char *arg5 = (char *) 0 ;
-  uint32_t arg6 ;
-  uint32_t arg7 ;
-  unsigned int arg8 ;
-  switch_memory_pool_t *arg9 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (switch_file_handle_t *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  arg7 = (uint32_t)jarg7; 
-  arg8 = (unsigned int)jarg8; 
-  arg9 = (switch_memory_pool_t *)jarg9; 
-  result = (switch_status_t)switch_core_perform_file_open((char const *)arg1,(char const *)arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_read(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = (switch_status_t)switch_core_file_read(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_write(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = (switch_status_t)switch_core_file_write(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_write_video(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = (switch_status_t)switch_core_file_write_video(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_seek(void * jarg1, void * jarg2, long long jarg3, int jarg4) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  unsigned int *arg2 = (unsigned int *) 0 ;
-  int64_t arg3 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (unsigned int *)jarg2; 
-  arg3 = (int64_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_core_file_seek(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_set_string(void * jarg1, int jarg2, char * jarg3) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  switch_audio_col_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (switch_audio_col_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_file_set_string(arg1,arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_get_string(void * jarg1, int jarg2, void * jarg3) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  switch_audio_col_t arg2 ;
-  char **arg3 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (switch_audio_col_t)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_status_t)switch_core_file_get_string(arg1,arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_close(void * jarg1) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_file_close(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_truncate(void * jarg1, long long jarg2) {
-  int jresult ;
-  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
-  int64_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_file_handle_t *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  result = (switch_status_t)switch_core_file_truncate(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_open(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, void * jarg7, void * jarg8) {
-  int jresult ;
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  unsigned int arg4 ;
-  unsigned int arg5 ;
-  unsigned int arg6 ;
-  switch_speech_flag_t *arg7 = (switch_speech_flag_t *) 0 ;
-  switch_memory_pool_t *arg8 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (unsigned int)jarg4; 
-  arg5 = (unsigned int)jarg5; 
-  arg6 = (unsigned int)jarg6; 
-  arg7 = (switch_speech_flag_t *)jarg7; 
-  arg8 = (switch_memory_pool_t *)jarg8; 
-  result = (switch_status_t)switch_core_speech_open(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_feed_tts(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_speech_flag_t *arg3 = (switch_speech_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_speech_flag_t *)jarg3; 
-  result = (switch_status_t)switch_core_speech_feed_tts(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_flush_tts(void * jarg1) {
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  switch_core_speech_flush_tts(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_text_param_tts(void * jarg1, char * jarg2, char * jarg3) {
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  switch_core_speech_text_param_tts(arg1,arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_numeric_param_tts(void * jarg1, char * jarg2, int jarg3) {
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  switch_core_speech_numeric_param_tts(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_float_param_tts(void * jarg1, char * jarg2, double jarg3) {
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  double arg3 ;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (double)jarg3; 
-  switch_core_speech_float_param_tts(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_read_tts(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_speech_flag_t *arg4 = (switch_speech_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  arg4 = (switch_speech_flag_t *)jarg4; 
-  result = (switch_status_t)switch_core_speech_read_tts(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_close(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
-  switch_speech_flag_t *arg2 = (switch_speech_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_speech_handle_t *)jarg1; 
-  arg2 = (switch_speech_flag_t *)jarg2; 
-  result = (switch_status_t)switch_core_speech_close(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_open(void * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5, void * jarg6, void * jarg7) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
-  switch_asr_flag_t *arg6 = (switch_asr_flag_t *) 0 ;
-  switch_memory_pool_t *arg7 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_asr_flag_t *)jarg6; 
-  arg7 = (switch_memory_pool_t *)jarg7; 
-  result = (switch_status_t)switch_core_asr_open(arg1,(char const *)arg2,(char const *)arg3,arg4,(char const *)arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_close(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_asr_flag_t *arg2 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (switch_asr_flag_t *)jarg2; 
-  result = (switch_status_t)switch_core_asr_close(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_feed(void * jarg1, void * jarg2, unsigned int jarg3, void * jarg4) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  unsigned int arg3 ;
-  switch_asr_flag_t *arg4 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (unsigned int)jarg3; 
-  arg4 = (switch_asr_flag_t *)jarg4; 
-  result = (switch_status_t)switch_core_asr_feed(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_feed_dtmf(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  arg3 = (switch_asr_flag_t *)jarg3; 
-  result = (switch_status_t)switch_core_asr_feed_dtmf(arg1,(switch_dtmf_t const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_check_results(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_asr_flag_t *arg2 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (switch_asr_flag_t *)jarg2; 
-  result = (switch_status_t)switch_core_asr_check_results(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_results(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (switch_asr_flag_t *)jarg3; 
-  result = (switch_status_t)switch_core_asr_get_results(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_result_headers(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  arg3 = (switch_asr_flag_t *)jarg3; 
-  result = (switch_status_t)switch_core_asr_get_result_headers(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_asr_load_grammar(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_unload_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_asr_unload_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_enable_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_asr_enable_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_disable_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_asr_disable_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_disable_all_grammars(void * jarg1) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_asr_disable_all_grammars(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_pause(void * jarg1) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_asr_pause(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_resume(void * jarg1) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_asr_resume(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_start_input_timers(void * jarg1) {
-  int jresult ;
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_asr_start_input_timers(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_text_param(void * jarg1, char * jarg2, char * jarg3) {
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  switch_core_asr_text_param(arg1,arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_numeric_param(void * jarg1, char * jarg2, int jarg3) {
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  switch_core_asr_numeric_param(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_float_param(void * jarg1, char * jarg2, double jarg3) {
-  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  double arg3 ;
-  
-  arg1 = (switch_asr_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (double)jarg3; 
-  switch_core_asr_float_param(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_open(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
-  int jresult ;
-  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_memory_pool_t *arg6 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_directory_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_memory_pool_t *)jarg6; 
-  result = (switch_status_t)switch_core_directory_open(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_query(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_directory_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_directory_query(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_next(void * jarg1) {
-  int jresult ;
-  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_directory_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_directory_next(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_next_pair(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  char **arg3 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_directory_handle_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_status_t)switch_core_directory_next_pair(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_close(void * jarg1) {
-  int jresult ;
-  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_directory_handle_t *)jarg1; 
-  result = (switch_status_t)switch_core_directory_close(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_data_channel(int jarg1) {
-  void * jresult ;
-  switch_text_channel_t arg1 ;
-  FILE *result = 0 ;
-  
-  arg1 = (switch_text_channel_t)jarg1; 
-  result = (FILE *)switch_core_data_channel(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready() {
-  int jresult ;
-  switch_bool_t result;
-  
-  result = (switch_bool_t)switch_core_ready();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_running() {
-  int jresult ;
-  switch_bool_t result;
-  
-  result = (switch_bool_t)switch_core_running();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready_inbound() {
-  int jresult ;
-  switch_bool_t result;
-  
-  result = (switch_bool_t)switch_core_ready_inbound();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready_outbound() {
-  int jresult ;
-  switch_bool_t result;
-  
-  result = (switch_bool_t)switch_core_ready_outbound();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_flags() {
-  unsigned long jresult ;
-  switch_core_flag_t result;
-  
-  result = (switch_core_flag_t)switch_core_flags();
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_management_exec(char * jarg1, int jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_management_action_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  switch_size_t arg4 ;
-  switch_size_t *argp4 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_management_action_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (switch_status_t)switch_core_management_exec(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_set_normal_priority() {
-  int jresult ;
-  int32_t result;
-  
-  result = (int32_t)set_normal_priority();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_set_auto_priority() {
-  int jresult ;
-  int32_t result;
-  
-  result = (int32_t)set_auto_priority();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_set_realtime_priority() {
-  int jresult ;
-  int32_t result;
-  
-  result = (int32_t)set_realtime_priority();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_set_low_priority() {
-  int jresult ;
-  int32_t result;
-  
-  result = (int32_t)set_low_priority();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_change_user_group(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int32_t)change_user_group((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_runtime_loop(int jarg1) {
-  int arg1 ;
-  
-  arg1 = (int)jarg1; 
-  switch_core_runtime_loop(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_set_console(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_core_set_console((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_measure_time(void * jarg1, void * jarg2) {
-  switch_time_t arg1 ;
-  switch_core_time_duration_t *arg2 = (switch_core_time_duration_t *) 0 ;
-  switch_time_t *argp1 ;
-  
-  argp1 = (switch_time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg1 = *argp1; 
-  arg2 = (switch_core_time_duration_t *)jarg2; 
-  switch_core_measure_time(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_uptime() {
-  void * jresult ;
-  switch_time_t result;
-  
-  result = switch_core_uptime();
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_ctl(int jarg1, void * jarg2) {
-  int jresult ;
-  switch_session_ctl_t arg1 ;
-  void *arg2 = (void *) 0 ;
-  int32_t result;
-  
-  arg1 = (switch_session_ctl_t)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (int32_t)switch_core_session_ctl(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_console() {
-  void * jresult ;
-  FILE *result = 0 ;
-  
-  result = (FILE *)switch_core_get_console();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_globals() {
-  switch_core_set_globals();
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_core_session_compare(void * jarg1, void * jarg2) {
-  unsigned char jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  result = (uint8_t)switch_core_session_compare(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_core_session_check_interface(void * jarg1, void * jarg2) {
-  unsigned char jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_endpoint_interface_t *arg2 = (switch_endpoint_interface_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_endpoint_interface_t *)jarg2; 
-  result = (uint8_t)switch_core_session_check_interface(arg1,(switch_endpoint_interface const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_mime_index() {
-  void * jresult ;
-  switch_hash_index_t *result = 0 ;
-  
-  result = (switch_hash_index_t *)switch_core_mime_index();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_mime_ext2type(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_core_mime_ext2type((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_mime_add_type(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_core_mime_add_type((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_create_module_interface(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_loadable_module_interface_t *)switch_loadable_module_create_module_interface(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_create_interface(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_loadable_module_interface_t *arg1 = (switch_loadable_module_interface_t *) 0 ;
-  switch_module_interface_name_t arg2 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface_t *)jarg1; 
-  arg2 = (switch_module_interface_name_t)jarg2; 
-  result = (void *)switch_loadable_module_create_interface(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_micro_time_now() {
-  void * jresult ;
-  switch_time_t result;
-  
-  result = switch_micro_time_now();
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_mono_micro_time_now() {
-  void * jresult ;
-  switch_time_t result;
-  
-  result = switch_mono_micro_time_now();
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim() {
-  switch_core_memory_reclaim();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_events() {
-  switch_core_memory_reclaim_events();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_logger() {
-  switch_core_memory_reclaim_logger();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_all() {
-  switch_core_memory_reclaim_all();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_setrlimits() {
-  switch_core_setrlimits();
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_time_ref() {
-  void * jresult ;
-  switch_time_t result;
-  
-  result = switch_time_ref();
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_sync() {
-  switch_time_sync();
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_epoch_time_now(void * jarg1) {
-  void * jresult ;
-  time_t *arg1 = (time_t *) 0 ;
-  time_t result;
-  
-  arg1 = (time_t *)jarg1; 
-  result = switch_epoch_time_now(arg1);
-  jresult = new time_t((const time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_lookup_timezone(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_lookup_timezone((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_strftime_tz(char * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, void * jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  size_t arg4 ;
-  switch_time_t arg5 ;
-  switch_time_t *argp5 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (size_t)jarg4; 
-  argp5 = (switch_time_t *)jarg5; 
-  if (!argp5) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return 0;
-  }
-  arg5 = *argp5; 
-  result = (switch_status_t)switch_strftime_tz((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_time_exp_tz_name(char * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_time_exp_t *arg2 = (switch_time_exp_t *) 0 ;
-  switch_time_t arg3 ;
-  switch_time_t *argp3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_time_exp_t *)jarg2; 
-  argp3 = (switch_time_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_status_t)switch_time_exp_tz_name((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_load_network_lists(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_load_network_lists(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_check_network_list_ip_token(char * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char **arg3 = (char **) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_bool_t)switch_check_network_list_ip_token((char const *)arg1,(char const *)arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_monotonic(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_time_set_monotonic(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_timerfd(int jarg1) {
-  int arg1 ;
-  
-  arg1 = (int)jarg1; 
-  switch_time_set_timerfd(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_nanosleep(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_time_set_nanosleep(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_matrix(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_time_set_matrix(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_cond_yield(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_time_set_cond_yield(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_use_system_time(int jarg1) {
-  switch_bool_t arg1 ;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  switch_time_set_use_system_time(arg1);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_min_dtmf_duration(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_core_min_dtmf_duration(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_max_dtmf_duration(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_core_max_dtmf_duration(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_core_min_idle_cpu(double jarg1) {
-  double jresult ;
-  double arg1 ;
-  double result;
-  
-  arg1 = (double)jarg1; 
-  result = (double)switch_core_min_idle_cpu(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_core_idle_cpu() {
-  double jresult ;
-  double result;
-  
-  result = (double)switch_core_idle_cpu();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_default_dtmf_duration(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_core_default_dtmf_duration(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_set_complete(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_console_set_complete((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_set_alias(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_console_set_alias((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_system(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t arg2 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (int)switch_system((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_stream_handle_t *)jarg2; 
-  result = (int)switch_stream_system((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_yield(void * jarg1) {
-  switch_interval_time_t arg1 ;
-  switch_interval_time_t *argp1 ;
-  
-  argp1 = (switch_interval_time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_interval_time_t", 0);
-    return ;
-  }
-  arg1 = *argp1; 
-  switch_cond_yield(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_next() {
-  switch_cond_next();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_send_args(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, int jarg9) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  switch_bool_t arg9 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (switch_bool_t)jarg9; 
-  result = (switch_status_t)switch_core_chat_send_args((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_send(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  result = (switch_status_t)switch_core_chat_send((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_deliver(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_core_chat_deliver((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_preprocess_session(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_preprocess_session(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_pause() {
-  switch_core_sqldb_pause();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_resume() {
-  switch_core_sqldb_resume();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CACHE_DB_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(256);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_core_db_dbh_set(void * jarg1, void * jarg2) {
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_core_db_t *arg2 = (switch_core_db_t *) 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  arg2 = (switch_core_db_t *)jarg2; 
-  if (arg1) (arg1)->core_db_dbh = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_core_db_dbh_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_core_db_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  result = (switch_core_db_t *) ((arg1)->core_db_dbh);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_odbc_dbh_set(void * jarg1, void * jarg2) {
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_odbc_handle_t *arg2 = (switch_odbc_handle_t *) 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  arg2 = (switch_odbc_handle_t *)jarg2; 
-  if (arg1) (arg1)->odbc_dbh = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_odbc_dbh_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_odbc_handle_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  result = (switch_odbc_handle_t *) ((arg1)->odbc_dbh);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_pgsql_dbh_set(void * jarg1, void * jarg2) {
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_pgsql_handle_t *arg2 = (switch_pgsql_handle_t *) 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  arg2 = (switch_pgsql_handle_t *)jarg2; 
-  if (arg1) (arg1)->pgsql_dbh = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_pgsql_dbh_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  switch_pgsql_handle_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  result = (switch_pgsql_handle_t *) ((arg1)->pgsql_dbh);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_native_handle_t() {
-  void * jresult ;
-  switch_cache_db_native_handle_t *result = 0 ;
-  
-  result = (switch_cache_db_native_handle_t *)new switch_cache_db_native_handle_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_native_handle_t(void * jarg1) {
-  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
-  
-  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_core_db_options_t_db_path_set(void * jarg1, char * jarg2) {
-  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->db_path) delete [] arg1->db_path;
-    if (arg2) {
-      arg1->db_path = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->db_path, (const char *)arg2);
-    } else {
-      arg1->db_path = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_core_db_options_t_db_path_get(void * jarg1) {
-  char * jresult ;
-  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
-  result = (char *) ((arg1)->db_path);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_core_db_options_t() {
-  void * jresult ;
-  switch_cache_db_core_db_options_t *result = 0 ;
-  
-  result = (switch_cache_db_core_db_options_t *)new switch_cache_db_core_db_options_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_core_db_options_t(void * jarg1) {
-  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_dsn_set(void * jarg1, char * jarg2) {
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->dsn) delete [] arg1->dsn;
-    if (arg2) {
-      arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->dsn, (const char *)arg2);
-    } else {
-      arg1->dsn = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_dsn_get(void * jarg1) {
-  char * jresult ;
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  result = (char *) ((arg1)->dsn);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_user_set(void * jarg1, char * jarg2) {
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->user) delete [] arg1->user;
-    if (arg2) {
-      arg1->user = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->user, (const char *)arg2);
-    } else {
-      arg1->user = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_user_get(void * jarg1) {
-  char * jresult ;
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  result = (char *) ((arg1)->user);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_pass_set(void * jarg1, char * jarg2) {
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->pass) delete [] arg1->pass;
-    if (arg2) {
-      arg1->pass = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->pass, (const char *)arg2);
-    } else {
-      arg1->pass = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_pass_get(void * jarg1) {
-  char * jresult ;
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  result = (char *) ((arg1)->pass);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_odbc_options_t() {
-  void * jresult ;
-  switch_cache_db_odbc_options_t *result = 0 ;
-  
-  result = (switch_cache_db_odbc_options_t *)new switch_cache_db_odbc_options_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_odbc_options_t(void * jarg1) {
-  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_pgsql_options_t_dsn_set(void * jarg1, char * jarg2) {
-  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->dsn) delete [] arg1->dsn;
-    if (arg2) {
-      arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->dsn, (const char *)arg2);
-    } else {
-      arg1->dsn = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_pgsql_options_t_dsn_get(void * jarg1) {
-  char * jresult ;
-  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
-  result = (char *) ((arg1)->dsn);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_pgsql_options_t() {
-  void * jresult ;
-  switch_cache_db_pgsql_options_t *result = 0 ;
-  
-  result = (switch_cache_db_pgsql_options_t *)new switch_cache_db_pgsql_options_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_pgsql_options_t(void * jarg1) {
-  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_core_db_options_set(void * jarg1, void * jarg2) {
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_core_db_options_t *arg2 = (switch_cache_db_core_db_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  arg2 = (switch_cache_db_core_db_options_t *)jarg2; 
-  if (arg1) (arg1)->core_db_options = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_core_db_options_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_core_db_options_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  result = (switch_cache_db_core_db_options_t *)& ((arg1)->core_db_options);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_odbc_options_set(void * jarg1, void * jarg2) {
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_odbc_options_t *arg2 = (switch_cache_db_odbc_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  arg2 = (switch_cache_db_odbc_options_t *)jarg2; 
-  if (arg1) (arg1)->odbc_options = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_odbc_options_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_odbc_options_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  result = (switch_cache_db_odbc_options_t *)& ((arg1)->odbc_options);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_pgsql_options_set(void * jarg1, void * jarg2) {
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_pgsql_options_t *arg2 = (switch_cache_db_pgsql_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  arg2 = (switch_cache_db_pgsql_options_t *)jarg2; 
-  if (arg1) (arg1)->pgsql_options = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_pgsql_options_get(void * jarg1) {
-  void * jresult ;
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  switch_cache_db_pgsql_options_t *result = 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  result = (switch_cache_db_pgsql_options_t *)& ((arg1)->pgsql_options);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_connection_options_t() {
-  void * jresult ;
-  switch_cache_db_connection_options_t *result = 0 ;
-  
-  result = (switch_cache_db_connection_options_t *)new switch_cache_db_connection_options_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_connection_options_t(void * jarg1) {
-  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
-  
-  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_type_name(int jarg1) {
-  char * jresult ;
-  switch_cache_db_handle_type_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_handle_type_t)jarg1; 
-  result = (char *)switch_cache_db_type_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_get_type(void * jarg1) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  switch_cache_db_handle_type_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  result = (switch_cache_db_handle_type_t)switch_cache_db_get_type(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_dismiss_db_handle(void * jarg1) {
-  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
-  
-  arg1 = (switch_cache_db_handle_t **)jarg1; 
-  switch_cache_db_dismiss_db_handle(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_release_db_handle(void * jarg1) {
-  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
-  
-  arg1 = (switch_cache_db_handle_t **)jarg1; 
-  switch_cache_db_release_db_handle(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp__switch_cache_db_get_db_handle(void * jarg1, int jarg2, void * jarg3, char * jarg4, char * jarg5, int jarg6) {
-  int jresult ;
-  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
-  switch_cache_db_handle_type_t arg2 ;
-  switch_cache_db_connection_options_t *arg3 = (switch_cache_db_connection_options_t *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  int arg6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t **)jarg1; 
-  arg2 = (switch_cache_db_handle_type_t)jarg2; 
-  arg3 = (switch_cache_db_connection_options_t *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (int)jarg6; 
-  result = (switch_status_t)_switch_cache_db_get_db_handle(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp__switch_cache_db_get_db_handle_dsn(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)_switch_cache_db_get_db_handle_dsn(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_execute_sql2str(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, void * jarg5) {
-  char * jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  size_t arg4 ;
-  char **arg5 = (char **) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (size_t)jarg4; 
-  arg5 = (char **)jarg5; 
-  result = (char *)switch_cache_db_execute_sql2str(arg1,arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char **arg3 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_status_t)switch_cache_db_execute_sql(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  char **arg5 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_callback_func_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  arg5 = (char **)jarg5; 
-  result = (switch_status_t)switch_cache_db_execute_sql_callback(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
-  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  char **arg6 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_callback_func_t)jarg3; 
-  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  arg6 = (char **)jarg6; 
-  result = (switch_status_t)switch_cache_db_execute_sql_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_affected_rows(void * jarg1) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  result = (int)switch_cache_db_affected_rows(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_load_extension(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_cache_db_load_extension(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_status(void * jarg1) {
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  switch_cache_db_status(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp__switch_core_db_handle(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)_switch_core_db_handle(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_test_reactive(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_bool_t)switch_cache_db_test_reactive(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_persistant_execute(void * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_cache_db_persistant_execute(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_persistant_execute_trans_full(void * jarg1, char * jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  result = (switch_status_t)switch_cache_db_persistant_execute_trans_full(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_signal_handlers() {
-  switch_core_set_signal_handlers();
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_debug_level() {
-  unsigned long jresult ;
-  uint32_t result;
-  
-  result = (uint32_t)switch_core_debug_level();
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_flush_handles() {
-  switch_cache_db_flush_handles();
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_banner() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_core_banner();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_in_thread(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_bool_t)switch_core_session_in_thread(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_default_ptime(char * jarg1, unsigned long jarg2) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  uint32_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (uint32_t)switch_default_ptime((char const *)arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_default_rate(char * jarg1, unsigned long jarg2) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  uint32_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (uint32_t)switch_default_rate((char const *)arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_add_registration(char * jarg1, char * jarg2, char * jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  uint32_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  result = (switch_status_t)switch_core_add_registration((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_del_registration(char * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_del_registration((char const *)arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_expire_registration(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  switch_status_t result;
-  
-  arg1 = (int)jarg1; 
-  result = (switch_status_t)switch_core_expire_registration(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_get_variable(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_say_file_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_say_file_handle_get_variable(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_get_path(void * jarg1) {
-  char * jresult ;
-  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_say_file_handle_t *)jarg1; 
-  result = (char *)switch_say_file_handle_get_path(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_detach_path(void * jarg1) {
-  char * jresult ;
-  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_say_file_handle_t *)jarg1; 
-  result = (char *)switch_say_file_handle_detach_path(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_file_handle_destroy(void * jarg1) {
-  switch_say_file_handle_t **arg1 = (switch_say_file_handle_t **) 0 ;
-  
-  arg1 = (switch_say_file_handle_t **)jarg1; 
-  switch_say_file_handle_destroy(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_file_handle_create(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_say_file_handle_t **arg1 = (switch_say_file_handle_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_t **arg3 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_say_file_handle_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_t **)jarg3; 
-  result = (switch_status_t)switch_say_file_handle_create(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_file(void * jarg1, char * jarg2) {
-  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  
-  arg1 = (switch_say_file_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_say_file(arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_max_file_desc() {
-  int jresult ;
-  int result;
-  
-  result = (int)switch_max_file_desc();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_close_extra_files(void * jarg1, int jarg2) {
-  int *arg1 = (int *) 0 ;
-  int arg2 ;
-  
-  arg1 = (int *)jarg1; 
-  arg2 = (int)jarg2; 
-  switch_close_extra_files(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_thread_set_cpu_affinity(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  switch_status_t result;
-  
-  arg1 = (int)jarg1; 
-  result = (switch_status_t)switch_core_thread_set_cpu_affinity(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_os_yield() {
-  switch_os_yield();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_get_stacksizes(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_size_t *arg1 = (switch_size_t *) 0 ;
-  switch_size_t *arg2 = (switch_size_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_size_t *)jarg1; 
-  arg2 = (switch_size_t *)jarg2; 
-  result = (switch_status_t)switch_core_get_stacksizes(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_gen_encoded_silence(void * jarg1, void * jarg2, void * jarg3) {
-  unsigned char *arg1 = (unsigned char *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  
-  arg1 = (unsigned char *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg3 = *argp3; 
-  switch_core_gen_encoded_silence(arg1,(switch_codec_implementation const *)arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_dbtype() {
-  int jresult ;
-  switch_cache_db_handle_type_t result;
-  
-  result = (switch_cache_db_handle_type_t)switch_core_dbtype();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sql_exec(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_core_sql_exec((char const *)arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_recovery_recover(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_core_recovery_recover((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_untrack(void * jarg1, int jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  switch_core_recovery_untrack(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_track(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_core_recovery_track(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_flush(char * jarg1, char * jarg2) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_core_recovery_flush((char const *)arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_pause(void * jarg1, int jarg2) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  switch_sql_queue_manager_pause(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_resume(void * jarg1) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  switch_sql_queue_manager_resume(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_size(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  uint32_t arg2 ;
-  int result;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (int)switch_sql_queue_manager_size(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_push_confirm(void * jarg1, char * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_sql_queue_manager_push_confirm(arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_push(void * jarg1, char * jarg2, unsigned long jarg3, int jarg4) {
-  int jresult ;
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_sql_queue_manager_push(arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_destroy(void * jarg1) {
-  int jresult ;
-  switch_sql_queue_manager_t **arg1 = (switch_sql_queue_manager_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_sql_queue_manager_t **)jarg1; 
-  result = (switch_status_t)switch_sql_queue_manager_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_sql_queue_manager_t **arg2 = (switch_sql_queue_manager_t **) 0 ;
-  uint32_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  uint32_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_sql_queue_manager_t **)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_start(void * jarg1) {
-  int jresult ;
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  result = (switch_status_t)switch_sql_queue_manager_start(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_stop(void * jarg1) {
-  int jresult ;
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  result = (switch_status_t)switch_sql_queue_manager_stop(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_event_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  char **arg5 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_cache_db_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  arg5 = (char **)jarg5; 
-  result = (switch_status_t)switch_cache_db_execute_sql_event_callback(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_callback_func_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  switch_sql_queue_manager_execute_sql_callback(arg1,(char const *)arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
-  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_callback_func_t)jarg3; 
-  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  switch_sql_queue_manager_execute_sql_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_event_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  switch_sql_queue_manager_execute_sql_event_callback(arg1,(char const *)arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_event_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
-  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  
-  arg1 = (switch_sql_queue_manager_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
-  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  switch_sql_queue_manager_execute_sql_event_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fork() {
-  void * jresult ;
-  pid_t result;
-  
-  result = switch_fork();
-  jresult = new pid_t((const pid_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_gen_certs(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_core_gen_certs((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_gen_fingerprint(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  dtls_fingerprint_t *arg2 = (dtls_fingerprint_t *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (dtls_fingerprint_t *)jarg2; 
-  result = (int)switch_core_cert_gen_fingerprint((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_expand_fingerprint(void * jarg1, char * jarg2) {
-  int jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_core_cert_expand_fingerprint(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_verify(void * jarg1) {
-  int jresult ;
-  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
-  int result;
-  
-  arg1 = (dtls_fingerprint_t *)jarg1; 
-  result = (int)switch_core_cert_verify(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_refresh_video(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_core_session_refresh_video(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system_fork(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_stream_handle_t *)jarg2; 
-  result = (int)switch_stream_system_fork((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ice_direction(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_call_direction_t)switch_ice_direction(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_debug_pool(void * jarg1) {
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  switch_core_session_debug_pool(arg1);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_major() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_major();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_minor() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_minor();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_micro() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_micro();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_revision() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_revision();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_revision_human() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_revision_human();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_full() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_full();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_full_human() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)switch_version_full_human();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_set(void * jarg1, char * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->module_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->module_name, (const char *)arg2);
-    } else {
-      arg1->module_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_get(void * jarg1) {
-  char * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (char *) ((arg1)->module_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_endpoint_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_endpoint_interface_t *arg2 = (switch_endpoint_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_endpoint_interface_t *)jarg2; 
-  if (arg1) (arg1)->endpoint_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_endpoint_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_endpoint_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_endpoint_interface_t *) ((arg1)->endpoint_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_timer_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_timer_interface_t *arg2 = (switch_timer_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_timer_interface_t *)jarg2; 
-  if (arg1) (arg1)->timer_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_timer_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_timer_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_timer_interface_t *) ((arg1)->timer_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_dialplan_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_dialplan_interface_t *arg2 = (switch_dialplan_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_dialplan_interface_t *)jarg2; 
-  if (arg1) (arg1)->dialplan_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_dialplan_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_dialplan_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_dialplan_interface_t *) ((arg1)->dialplan_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_codec_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_codec_interface_t *)jarg2; 
-  if (arg1) (arg1)->codec_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_codec_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_codec_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_codec_interface_t *) ((arg1)->codec_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_application_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_application_interface_t *arg2 = (switch_application_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_application_interface_t *)jarg2; 
-  if (arg1) (arg1)->application_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_application_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_application_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_application_interface_t *) ((arg1)->application_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_application_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_chat_application_interface_t *arg2 = (switch_chat_application_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_chat_application_interface_t *)jarg2; 
-  if (arg1) (arg1)->chat_application_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_application_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_chat_application_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_chat_application_interface_t *) ((arg1)->chat_application_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_api_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_api_interface_t *arg2 = (switch_api_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_api_interface_t *)jarg2; 
-  if (arg1) (arg1)->api_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_api_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_api_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_api_interface_t *) ((arg1)->api_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_json_api_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_json_api_interface_t *arg2 = (switch_json_api_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_json_api_interface_t *)jarg2; 
-  if (arg1) (arg1)->json_api_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_json_api_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_json_api_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_json_api_interface_t *) ((arg1)->json_api_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_file_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_file_interface_t *arg2 = (switch_file_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_file_interface_t *)jarg2; 
-  if (arg1) (arg1)->file_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_file_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_file_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_file_interface_t *) ((arg1)->file_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_speech_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_speech_interface_t *arg2 = (switch_speech_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_speech_interface_t *)jarg2; 
-  if (arg1) (arg1)->speech_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_speech_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_speech_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_speech_interface_t *) ((arg1)->speech_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_directory_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_directory_interface_t *arg2 = (switch_directory_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_directory_interface_t *)jarg2; 
-  if (arg1) (arg1)->directory_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_directory_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_directory_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_directory_interface_t *) ((arg1)->directory_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_chat_interface_t *arg2 = (switch_chat_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_chat_interface_t *)jarg2; 
-  if (arg1) (arg1)->chat_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_chat_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_chat_interface_t *) ((arg1)->chat_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_say_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_say_interface_t *arg2 = (switch_say_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_say_interface_t *)jarg2; 
-  if (arg1) (arg1)->say_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_say_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_say_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_say_interface_t *) ((arg1)->say_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_asr_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_asr_interface_t *arg2 = (switch_asr_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_asr_interface_t *)jarg2; 
-  if (arg1) (arg1)->asr_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_asr_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_asr_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_asr_interface_t *) ((arg1)->asr_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_management_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_management_interface_t *arg2 = (switch_management_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_management_interface_t *)jarg2; 
-  if (arg1) (arg1)->management_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_management_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_management_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_management_interface_t *) ((arg1)->management_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_limit_interface_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_limit_interface_t *arg2 = (switch_limit_interface_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_limit_interface_t *)jarg2; 
-  if (arg1) (arg1)->limit_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_limit_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_limit_interface_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_limit_interface_t *) ((arg1)->limit_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_refs_set(void * jarg1, int jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_pool_set(void * jarg1, void * jarg2) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_loadable_module_interface() {
-  void * jresult ;
-  switch_loadable_module_interface *result = 0 ;
-  
-  result = (switch_loadable_module_interface *)new switch_loadable_module_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_interface(void * jarg1) {
-  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
-  
-  arg1 = (switch_loadable_module_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_init(int jarg1) {
-  int jresult ;
-  switch_bool_t arg1 ;
-  switch_status_t result;
-  
-  arg1 = (switch_bool_t)jarg1; 
-  result = (switch_status_t)switch_loadable_module_init(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_shutdown() {
-  switch_loadable_module_shutdown();
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_endpoint_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_endpoint_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_endpoint_interface_t *)switch_loadable_module_get_endpoint_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_codec_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_codec_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_codec_interface_t *)switch_loadable_module_get_codec_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_parse_codec_buf(char * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  uint32_t *arg2 = (uint32_t *) 0 ;
-  uint32_t *arg3 = (uint32_t *) 0 ;
-  uint32_t *arg4 = (uint32_t *) 0 ;
-  uint32_t *arg5 = (uint32_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (uint32_t *)jarg2; 
-  arg3 = (uint32_t *)jarg3; 
-  arg4 = (uint32_t *)jarg4; 
-  arg5 = (uint32_t *)jarg5; 
-  result = (char *)switch_parse_codec_buf(arg1,arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_dialplan_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_dialplan_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_dialplan_interface_t *)switch_loadable_module_get_dialplan_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_enumerate_available(char * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_modulename_callback_func_t arg2 = (switch_modulename_callback_func_t) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_modulename_callback_func_t)jarg2; 
-  arg3 = (void *)jarg3; 
-  result = (switch_status_t)switch_loadable_module_enumerate_available((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_enumerate_loaded(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_modulename_callback_func_t arg1 = (switch_modulename_callback_func_t) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_modulename_callback_func_t)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (switch_status_t)switch_loadable_module_enumerate_loaded(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_build_dynamic(char * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_module_load_t arg2 = (switch_module_load_t) 0 ;
-  switch_module_runtime_t arg3 = (switch_module_runtime_t) 0 ;
-  switch_module_shutdown_t arg4 = (switch_module_shutdown_t) 0 ;
-  switch_bool_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_module_load_t)jarg2; 
-  arg3 = (switch_module_runtime_t)jarg3; 
-  arg4 = (switch_module_shutdown_t)jarg4; 
-  arg5 = (switch_bool_t)jarg5; 
-  result = (switch_status_t)switch_loadable_module_build_dynamic(arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_timer_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_timer_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_timer_interface_t *)switch_loadable_module_get_timer_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_application_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_application_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_application_interface_t *)switch_loadable_module_get_application_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_chat_application_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_chat_application_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_chat_application_interface_t *)switch_loadable_module_get_chat_application_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_execute_chat_app(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_core_execute_chat_app(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_api_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_api_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_api_interface_t *)switch_loadable_module_get_api_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_json_api_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_json_api_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_json_api_interface_t *)switch_loadable_module_get_json_api_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_file_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_file_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_file_interface_t *)switch_loadable_module_get_file_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_speech_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_speech_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_speech_interface_t *)switch_loadable_module_get_speech_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_asr_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_asr_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_asr_interface_t *)switch_loadable_module_get_asr_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_directory_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_directory_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_directory_interface_t *)switch_loadable_module_get_directory_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_chat_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_chat_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_chat_interface_t *)switch_loadable_module_get_chat_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_say_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_say_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_say_interface_t *)switch_loadable_module_get_say_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_management_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_management_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_management_interface_t *)switch_loadable_module_get_management_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_limit_interface(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_limit_interface_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_limit_interface_t *)switch_loadable_module_get_limit_interface((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_get_codecs(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_codec_implementation_t **arg1 = (switch_codec_implementation_t **) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (switch_codec_implementation_t **)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)switch_loadable_module_get_codecs((switch_codec_implementation const **)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_get_codecs_sorted(void * jarg1, int jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  switch_codec_implementation_t **arg1 = (switch_codec_implementation_t **) 0 ;
-  int arg2 ;
-  char **arg3 = (char **) 0 ;
-  int arg4 ;
-  int result;
-  
-  arg1 = (switch_codec_implementation_t **)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char **)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (int)switch_loadable_module_get_codecs_sorted((switch_codec_implementation const **)arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_api_execute(char * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_core_session_t *arg3 = (switch_core_session_t *) 0 ;
-  switch_stream_handle_t *arg4 = (switch_stream_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_core_session_t *)jarg3; 
-  arg4 = (switch_stream_handle_t *)jarg4; 
-  result = (switch_status_t)switch_api_execute((char const *)arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_json_api_execute(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  cJSON *arg1 = (cJSON *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  cJSON **arg3 = (cJSON **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (cJSON *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (cJSON **)jarg3; 
-  result = (switch_status_t)switch_json_api_execute(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_load_module(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  char **arg4 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (char **)jarg4; 
-  result = (switch_status_t)switch_loadable_module_load_module(arg1,arg2,arg3,(char const **)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_exists(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_loadable_module_exists((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_unload_module(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  char **arg4 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (char **)jarg4; 
-  result = (switch_status_t)switch_loadable_module_unload_module(arg1,arg2,arg3,(char const **)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_codec_next_id() {
-  unsigned long jresult ;
-  uint32_t result;
-  
-  result = (uint32_t)switch_core_codec_next_id();
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_check_interval(unsigned long jarg1, unsigned long jarg2) {
-  int jresult ;
-  uint32_t arg1 ;
-  uint32_t arg2 ;
-  int result;
-  
-  arg1 = (uint32_t)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (int)switch_check_interval(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_codec_add_implementation(void * jarg1, void * jarg2, int jarg3, unsigned char jarg4, char * jarg5, char * jarg6, unsigned long jarg7, unsigned long jarg8, int jarg9, int jarg10, unsigned long jarg11, unsigned long jarg12, unsigned long jarg13, unsigned char jarg14, int jarg15, void * jarg16, void * jarg17, void * jarg18, void * jarg19) {
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
-  switch_codec_type_t arg3 ;
-  switch_payload_t arg4 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  uint32_t arg7 ;
-  uint32_t arg8 ;
-  int arg9 ;
-  int arg10 ;
-  uint32_t arg11 ;
-  uint32_t arg12 ;
-  uint32_t arg13 ;
-  uint8_t arg14 ;
-  int arg15 ;
-  switch_core_codec_init_func_t arg16 = (switch_core_codec_init_func_t) 0 ;
-  switch_core_codec_encode_func_t arg17 = (switch_core_codec_encode_func_t) 0 ;
-  switch_core_codec_decode_func_t arg18 = (switch_core_codec_decode_func_t) 0 ;
-  switch_core_codec_destroy_func_t arg19 = (switch_core_codec_destroy_func_t) 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (switch_codec_interface_t *)jarg2; 
-  arg3 = (switch_codec_type_t)jarg3; 
-  arg4 = (switch_payload_t)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (uint32_t)jarg7; 
-  arg8 = (uint32_t)jarg8; 
-  arg9 = (int)jarg9; 
-  arg10 = (int)jarg10; 
-  arg11 = (uint32_t)jarg11; 
-  arg12 = (uint32_t)jarg12; 
-  arg13 = (uint32_t)jarg13; 
-  arg14 = (uint8_t)jarg14; 
-  arg15 = (int)jarg15; 
-  arg16 = (switch_core_codec_init_func_t)jarg16; 
-  arg17 = (switch_core_codec_encode_func_t)jarg17; 
-  arg18 = (switch_core_codec_decode_func_t)jarg18; 
-  arg19 = (switch_core_codec_destroy_func_t)jarg19; 
-  switch_core_codec_add_implementation(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_ready(void * jarg1) {
-  int jresult ;
-  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_codec_t *)jarg1; 
-  result = (switch_bool_t)switch_core_codec_ready(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_secondary_recover_callback(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_core_recover_callback_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_core_recover_callback_t)switch_core_get_secondary_recover_callback((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_register_secondary_recover_callback(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_core_recover_callback_t arg2 = (switch_core_recover_callback_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_core_recover_callback_t)jarg2; 
-  result = (switch_status_t)switch_core_register_secondary_recover_callback((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_unregister_secondary_recover_callback(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_core_unregister_secondary_recover_callback((char const *)arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CMD_CHUNK_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1024);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_loop() {
-  switch_console_loop();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_stream_raw_write(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  uint8_t *arg2 = (uint8_t *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  arg2 = (uint8_t *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_status_t)switch_console_stream_raw_write(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_write_file_contents(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_stream_write_file_contents(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_init(void * jarg1) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  result = (switch_status_t)switch_console_init(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_shutdown() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_console_shutdown();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_add_complete_func(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_console_complete_callback_t arg2 = (switch_console_complete_callback_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_console_complete_callback_t)jarg2; 
-  result = (switch_status_t)switch_console_add_complete_func((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_del_complete_func(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_console_del_complete_func((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_run_complete_func(char * jarg1, char * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_console_callback_match_t **arg4 = (switch_console_callback_match_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_console_callback_match_t **)jarg4; 
-  result = (switch_status_t)switch_console_run_complete_func((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match_unique(void * jarg1, char * jarg2) {
-  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_console_callback_match_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_console_push_match_unique(arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match(void * jarg1, char * jarg2) {
-  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_console_callback_match_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_console_push_match(arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_free_matches(void * jarg1) {
-  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
-  
-  arg1 = (switch_console_callback_match_t **)jarg1; 
-  switch_console_free_matches(arg1);
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_console_complete(char * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  unsigned char jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  FILE *arg3 = (FILE *) 0 ;
-  switch_stream_handle_t *arg4 = (switch_stream_handle_t *) 0 ;
-  switch_xml_t arg5 = (switch_xml_t) 0 ;
-  unsigned char result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (FILE *)jarg3; 
-  arg4 = (switch_stream_handle_t *)jarg4; 
-  arg5 = (switch_xml_t)jarg5; 
-  result = (unsigned char)switch_console_complete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_sort_matches(void * jarg1) {
-  switch_console_callback_match_t *arg1 = (switch_console_callback_match_t *) 0 ;
-  
-  arg1 = (switch_console_callback_match_t *)jarg1; 
-  switch_console_sort_matches(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_save_history() {
-  switch_console_save_history();
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_console_expand_alias(char * jarg1, char * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_console_expand_alias(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_execute(char * jarg1, int jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  switch_stream_handle_t *arg3 = (switch_stream_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (switch_stream_handle_t *)jarg3; 
-  result = (switch_status_t)switch_console_execute(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_toupper(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_toupper(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_tolower(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_tolower(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_toupper_max(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_toupper_max(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_tolower_max(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_tolower_max(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_toupper(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)old_switch_toupper(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_tolower(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)old_switch_tolower(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isalnum(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isalnum(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isalpha(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isalpha(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_iscntrl(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_iscntrl(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isdigit(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isdigit(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isgraph(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isgraph(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_islower(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_islower(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isprint(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isprint(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ispunct(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_ispunct(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isspace(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isspace(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isupper(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isupper(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_isxdigit(int jarg1) {
-  int jresult ;
-  int arg1 ;
-  int result;
-  
-  arg1 = (int)jarg1; 
-  result = (int)switch_isxdigit(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v4_set(void * jarg1, unsigned long jarg2) {
-  ip_t *arg1 = (ip_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (ip_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->v4 = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_ip_t_v4_get(void * jarg1) {
-  unsigned long jresult ;
-  ip_t *arg1 = (ip_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (ip_t *)jarg1; 
-  result = (uint32_t) ((arg1)->v4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v6_set(void * jarg1, void * jarg2) {
-  ip_t *arg1 = (ip_t *) 0 ;
-  in6_addr arg2 ;
-  in6_addr *argp2 ;
-  
-  arg1 = (ip_t *)jarg1; 
-  argp2 = (in6_addr *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null in6_addr", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->v6 = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_ip_t_v6_get(void * jarg1) {
-  void * jresult ;
-  ip_t *arg1 = (ip_t *) 0 ;
-  in6_addr result;
-  
-  arg1 = (ip_t *)jarg1; 
-  result =  ((arg1)->v6);
-  jresult = new in6_addr((const in6_addr &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_ip_t() {
-  void * jresult ;
-  ip_t *result = 0 ;
-  
-  result = (ip_t *)new ip_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_ip_t(void * jarg1) {
-  ip_t *arg1 = (ip_t *) 0 ;
-  
-  arg1 = (ip_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_testv6_subnet(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  ip_t arg1 ;
-  ip_t arg2 ;
-  ip_t arg3 ;
-  ip_t *argp1 ;
-  ip_t *argp2 ;
-  ip_t *argp3 ;
-  switch_bool_t result;
-  
-  argp1 = (ip_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  argp2 = (ip_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  argp3 = (ip_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_bool_t)switch_testv6_subnet(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_print_host(void * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_sockaddr_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_print_host(arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMAX_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(32767);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMIN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(-32768);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp__zstr(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)_zstr((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_moh(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_is_moh((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strchr_strict(char * jarg1, char jarg2, char * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (char *)switch_strchr_strict((char const *)arg1,arg2,(char const *)arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_has_escaped_data(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_string_has_escaped_data((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_b64_encode(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  unsigned char *arg1 = (unsigned char *) 0 ;
-  switch_size_t arg2 ;
-  unsigned char *arg3 = (unsigned char *) 0 ;
-  switch_size_t arg4 ;
-  switch_size_t *argp2 ;
-  switch_size_t *argp4 ;
-  switch_status_t result;
-  
-  arg1 = (unsigned char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (unsigned char *)jarg3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (switch_status_t)switch_b64_encode(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_b64_decode(char * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_b64_decode(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_amp_encode(char * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_amp_encode(arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_digit_string(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_is_digit_string((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_switch_itodtmf(char jarg1) {
-  char jresult ;
-  char arg1 ;
-  char result;
-  
-  arg1 = (char)jarg1; 
-  result = (char)switch_itodtmf(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmftoi(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_dtmftoi(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_known_bitrate(unsigned char jarg1) {
-  unsigned long jresult ;
-  switch_payload_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (switch_payload_t)jarg1; 
-  result = (uint32_t)switch_known_bitrate(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_line(int jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  int arg1 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (int)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_fd_read_line(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_dline(int jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  int arg1 ;
-  char **arg2 = (char **) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (int)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = switch_fd_read_dline(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fp_read_dline(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  FILE *arg1 = (FILE *) 0 ;
-  char **arg2 = (char **) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (FILE *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = switch_fp_read_dline(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_alloc(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_frame_t **arg1 = (switch_frame_t **) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_frame_t **)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  result = (switch_status_t)switch_frame_alloc(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_dup(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_frame_t *arg1 = (switch_frame_t *) 0 ;
-  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_frame_t *)jarg1; 
-  arg2 = (switch_frame_t **)jarg2; 
-  result = (switch_status_t)switch_frame_dup(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_free(void * jarg1) {
-  int jresult ;
-  switch_frame_t **arg1 = (switch_frame_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_frame_t **)jarg1; 
-  result = (switch_status_t)switch_frame_free(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_number(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_is_number((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_find_parameter(char * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_memory_pool_t *)jarg3; 
-  result = (char *)switch_find_parameter((char const *)arg1,(char const *)arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_true(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_true((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_true_byte(char * jarg1) {
-  unsigned char jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_byte_t)switch_true_byte((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_false(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_false((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_resolve_host(char * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (size_t)jarg3; 
-  result = (switch_status_t)switch_resolve_host((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  int *arg3 = (int *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_interface_ip(char * jarg1, int jarg2, void * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  int *arg3 = (int *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)switch_find_interface_ip(arg1,arg2,arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_size_t arg2 ;
-  sockaddr *arg3 = (sockaddr *) 0 ;
-  socklen_t arg4 ;
-  switch_size_t *argp2 ;
-  socklen_t *argp4 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (sockaddr *)jarg3; 
-  argp4 = (socklen_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null socklen_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (char *)get_addr(arg1,arg2,arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr6(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_size_t arg2 ;
-  sockaddr_in6 *arg3 = (sockaddr_in6 *) 0 ;
-  socklen_t arg4 ;
-  switch_size_t *argp2 ;
-  socklen_t *argp4 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (sockaddr_in6 *)jarg3; 
-  argp4 = (socklen_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null socklen_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (char *)get_addr6(arg1,arg2,arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_get_addr_int(void * jarg1) {
-  int jresult ;
-  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_sockaddr_t *)jarg1; 
-  result = (int)get_addr_int(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_cmp_addr(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
-  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_sockaddr_t *)jarg1; 
-  arg2 = (switch_sockaddr_t *)jarg2; 
-  result = (int)switch_cmp_addr(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_get_port(void * jarg1) {
-  unsigned short jresult ;
-  sockaddr *arg1 = (sockaddr *) 0 ;
-  unsigned short result;
-  
-  arg1 = (sockaddr *)jarg1; 
-  result = (unsigned short)get_port(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_build_uri(char * jarg1, void * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_sockaddr_t *arg5 = (switch_sockaddr_t *) 0 ;
-  int arg6 ;
-  switch_size_t *argp2 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_sockaddr_t *)jarg5; 
-  arg6 = (int)jarg6; 
-  result = (int)switch_build_uri(arg1,arg2,(char const *)arg3,(char const *)arg4,(switch_sockaddr_t const *)arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_priority_name(int jarg1) {
-  char * jresult ;
-  switch_priority_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_priority_t)jarg1; 
-  result = (char *)switch_priority_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_switch_rfc2833_to_char(int jarg1) {
-  char jresult ;
-  int arg1 ;
-  char result;
-  
-  arg1 = (int)jarg1; 
-  result = (char)switch_rfc2833_to_char(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_char_to_rfc2833(char jarg1) {
-  unsigned char jresult ;
-  char arg1 ;
-  unsigned char result;
-  
-  arg1 = (char)jarg1; 
-  result = (unsigned char)switch_char_to_rfc2833(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_sanitize_number(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_sanitize_number(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_var_check(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t arg2 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_bool_t)switch_string_var_check(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_var_check_const(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_string_var_check_const((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_var_clean_string(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_var_clean_string(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_clean_string(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_clean_string(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_clean_name_string(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_clean_name_string(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_safe_atoi(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)switch_safe_atoi((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_safe_strdup(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_safe_strdup((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_lc_strdup(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_lc_strdup((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uc_strdup(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_uc_strdup((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_strstr(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_bool_t)switch_strstr(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_str_time(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = switch_str_time((char const *)arg1);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_separate_string(char * jarg1, char jarg2, void * jarg3, unsigned int jarg4) {
-  unsigned int jresult ;
-  char *arg1 = (char *) 0 ;
-  char arg2 ;
-  char **arg3 = (char **) 0 ;
-  unsigned int arg4 ;
-  unsigned int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char)jarg2; 
-  arg3 = (char **)jarg3; 
-  arg4 = (unsigned int)jarg4; 
-  result = (unsigned int)switch_separate_string(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_separate_string_string(char * jarg1, char * jarg2, void * jarg3, unsigned int jarg4) {
-  unsigned int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char **arg3 = (char **) 0 ;
-  unsigned int arg4 ;
-  unsigned int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char **)jarg3; 
-  arg4 = (unsigned int)jarg4; 
-  result = (unsigned int)switch_separate_string_string(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_spaces(char * jarg1, int jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t arg2 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (char *)switch_strip_spaces(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_whitespace(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_strip_whitespace((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_commas(char * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_strip_commas(arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_nonnumerics(char * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_strip_nonnumerics(arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_separate_paren_args(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_separate_paren_args(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_stristr(char * jarg1, char * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_stristr((char const *)arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_lan_addr(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_is_lan_addr((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_replace_char(char * jarg1, char jarg2, char jarg3, int jarg4) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char arg2 ;
-  char arg3 ;
-  switch_bool_t arg4 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char)jarg2; 
-  arg3 = (char)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (char *)switch_replace_char(arg1,arg2,arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ast2regex(char * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (size_t)jarg3; 
-  result = (switch_bool_t)switch_ast2regex((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_char(void * jarg1, char * jarg2, char * jarg3, char jarg4) {
-  char * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char arg4 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char)jarg4; 
-  result = (char *)switch_escape_char(arg1,arg2,(char const *)arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_string(char * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_escape_string((char const *)arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_string_pool(char * jarg1, void * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  result = (char *)switch_escape_string_pool((char const *)arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_socket_waitfor(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_pollfd_t *arg1 = (switch_pollfd_t *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (switch_pollfd_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)switch_socket_waitfor(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cut_path(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_cut_path((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_string_replace(char * jarg1, char * jarg2, char * jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (char *)switch_string_replace((char const *)arg1,(char const *)arg2,(char const *)arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_match(char * jarg1, unsigned long jarg2, char * jarg3, unsigned long jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  size_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  size_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (size_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (size_t)jarg4; 
-  result = (switch_status_t)switch_string_match((char const *)arg1,arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_strcasecmp_any(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  void *arg2 = 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_strcasecmp_any((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_util_quote_shell_arg(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_util_quote_shell_arg((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_util_quote_shell_arg_pool(char * jarg1, void * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  result = (char *)switch_util_quote_shell_arg_pool((char const *)arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_encode(char * jarg1, char * jarg2, unsigned long jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (size_t)jarg3; 
-  result = (char *)switch_url_encode((char const *)arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_decode(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_url_decode(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_simple_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  result = (switch_bool_t)switch_simple_email((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_find_end_paren(char * jarg1, char jarg2, char jarg3) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char arg2 ;
-  char arg3 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char)jarg2; 
-  arg3 = (char)jarg3; 
-  result = (char *)switch_find_end_paren((char const *)arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_file_path(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_is_file_path((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_parse_cidr(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  ip_t *arg2 = (ip_t *) 0 ;
-  ip_t *arg3 = (ip_t *) 0 ;
-  uint32_t *arg4 = (uint32_t *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (ip_t *)jarg2; 
-  arg3 = (ip_t *)jarg3; 
-  arg4 = (uint32_t *)jarg4; 
-  result = (int)switch_parse_cidr((char const *)arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  int jresult ;
-  switch_network_list_t **arg1 = (switch_network_list_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  switch_memory_pool_t *arg4 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_network_list_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (switch_memory_pool_t *)jarg4; 
-  result = (switch_status_t)switch_network_list_create(arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_add_cidr_token(void * jarg1, char * jarg2, int jarg3, char * jarg4) {
-  int jresult ;
-  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_network_list_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_network_list_add_cidr_token(arg1,(char const *)arg2,arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_add_host_mask(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_network_list_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_network_list_add_host_mask(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip_token(void * jarg1, unsigned long jarg2, void * jarg3) {
-  int jresult ;
-  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
-  uint32_t arg2 ;
-  char **arg3 = (char **) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_network_list_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_bool_t)switch_network_list_validate_ip_token(arg1,arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip6_token(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
-  ip_t arg2 ;
-  char **arg3 = (char **) 0 ;
-  ip_t *argp2 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_network_list_t *)jarg1; 
-  argp2 = (ip_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  arg3 = (char **)jarg3; 
-  result = (switch_bool_t)switch_network_list_validate_ip6_token(arg1,arg2,(char const **)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_dow_int2str(int jarg1) {
-  char * jresult ;
-  int arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (int)jarg1; 
-  result = (char *)switch_dow_int2str(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dow_str2int(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (int)switch_dow_str2int((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dow_cmp(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (switch_bool_t)switch_dow_cmp((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_number_cmp(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)switch_number_cmp((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_tod_cmp(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)switch_tod_cmp((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_fulldate_cmp(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_time_t *arg2 = (switch_time_t *) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_time_t *)jarg2; 
-  result = (int)switch_fulldate_cmp((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_split_date(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  char *arg1 = (char *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
-  int *arg4 = (int *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int *)jarg2; 
-  arg3 = (int *)jarg3; 
-  arg4 = (int *)jarg4; 
-  switch_split_date((char const *)arg1,arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_split_time(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  char *arg1 = (char *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
-  int *arg4 = (int *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (int *)jarg2; 
-  arg3 = (int *)jarg3; 
-  arg4 = (int *)jarg4; 
-  switch_split_time((char const *)arg1,arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_split_user_domain(char * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char **arg2 = (char **) 0 ;
-  char **arg3 = (char **) 0 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (int)switch_split_user_domain(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uuid_str(char * jarg1, void * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  result = (char *)switch_uuid_str(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_format_number(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)switch_format_number((char const *)arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_atoui(char * jarg1) {
-  unsigned int jresult ;
-  char *arg1 = (char *) 0 ;
-  unsigned int result;
-  
-  arg1 = (char *)jarg1; 
-  result = (unsigned int)switch_atoui((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_atoul(char * jarg1) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  unsigned long result;
-  
-  arg1 = (char *)jarg1; 
-  result = (unsigned long)switch_atoul((char const *)arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strerror_r(int jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  int arg1 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  char *result = 0 ;
-  
-  arg1 = (int)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (char *)switch_strerror_r(arg1,arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_var_set(void * jarg1, char * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->var) delete [] arg1->var;
-    if (arg2) {
-      arg1->var = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->var, (const char *)arg2);
-    } else {
-      arg1->var = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_var_get(void * jarg1) {
-  char * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  result = (char *) ((arg1)->var);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_val_set(void * jarg1, char * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->val) delete [] arg1->val;
-    if (arg2) {
-      arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->val, (const char *)arg2);
-    } else {
-      arg1->val = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_val_get(void * jarg1) {
-  char * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  result = (char *) ((arg1)->val);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_next_set(void * jarg1, void * jarg2) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  profile_node_s *arg2 = (profile_node_s *) 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  arg2 = (profile_node_s *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_profile_node_t_next_get(void * jarg1) {
-  void * jresult ;
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  profile_node_s *result = 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  result = (profile_node_s *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_profile_node_t() {
-  void * jresult ;
-  profile_node_t *result = 0 ;
-  
-  result = (profile_node_t *)new profile_node_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_profile_node_t(void * jarg1) {
-  profile_node_t *arg1 = (profile_node_t *) 0 ;
-  
-  arg1 = (profile_node_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_username_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->username = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->username, (const char *)arg2);
-    } else {
-      arg1->username = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_username_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->username);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_dialplan_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->dialplan = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->dialplan, (const char *)arg2);
-    } else {
-      arg1->dialplan = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_dialplan_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->dialplan);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_id_name_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->caller_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->caller_id_name, (const char *)arg2);
-    } else {
-      arg1->caller_id_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_caller_id_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->caller_id_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_id_number_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->caller_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->caller_id_number, (const char *)arg2);
-    } else {
-      arg1->caller_id_number = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_caller_id_number_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->caller_id_number);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_name_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->orig_caller_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->orig_caller_id_name, (const char *)arg2);
-    } else {
-      arg1->orig_caller_id_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->orig_caller_id_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_number_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->orig_caller_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->orig_caller_id_number, (const char *)arg2);
-    } else {
-      arg1->orig_caller_id_number = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_number_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->orig_caller_id_number);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->callee_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->callee_id_name, (const char *)arg2);
-    } else {
-      arg1->callee_id_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->callee_id_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->callee_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->callee_id_number, (const char *)arg2);
-    } else {
-      arg1->callee_id_number = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->callee_id_number);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->caller_ton = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->caller_ton);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_numplan_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->caller_numplan = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_caller_numplan_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->caller_numplan);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_network_addr_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->network_addr = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->network_addr, (const char *)arg2);
-    } else {
-      arg1->network_addr = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_network_addr_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->network_addr);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->ani = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->ani, (const char *)arg2);
-    } else {
-      arg1->ani = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_ani_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->ani);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_ton_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->ani_ton = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_ani_ton_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->ani_ton);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_numplan_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->ani_numplan = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_ani_numplan_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->ani_numplan);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_aniii_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->aniii = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->aniii, (const char *)arg2);
-    } else {
-      arg1->aniii = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_aniii_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->aniii);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->rdnis = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->rdnis, (const char *)arg2);
-    } else {
-      arg1->rdnis = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_rdnis_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->rdnis);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_ton_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->rdnis_ton = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_rdnis_ton_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->rdnis_ton);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_numplan_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->rdnis_numplan = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_rdnis_numplan_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->rdnis_numplan);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->destination_number) delete [] arg1->destination_number;
-    if (arg2) {
-      arg1->destination_number = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->destination_number, (const char *)arg2);
-    } else {
-      arg1->destination_number = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_destination_number_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->destination_number);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_ton_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->destination_number_ton = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_destination_number_ton_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->destination_number_ton);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_numplan_set(void * jarg1, unsigned char jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->destination_number_numplan = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_destination_number_numplan_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (uint8_t) ((arg1)->destination_number_numplan);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_source_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->source = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->source, (const char *)arg2);
-    } else {
-      arg1->source = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_source_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->source);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_chan_name_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->chan_name) delete [] arg1->chan_name;
-    if (arg2) {
-      arg1->chan_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->chan_name, (const char *)arg2);
-    } else {
-      arg1->chan_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_chan_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->chan_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid) delete [] arg1->uuid;
-    if (arg2) {
-      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid, (const char *)arg2);
-    } else {
-      arg1->uuid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_uuid_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->uuid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_context_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->context = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->context, (const char *)arg2);
-    } else {
-      arg1->context = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_context_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->context);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_profile_index_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->profile_index = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->profile_index, (const char *)arg2);
-    } else {
-      arg1->profile_index = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_profile_index_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->profile_index);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile_flag_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile_flag_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_caller_profile_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile_flag_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile_flag_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originator_caller_profile_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->originator_caller_profile = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_originator_caller_profile_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->originator_caller_profile);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_profile_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->originatee_caller_profile = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_profile_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->originatee_caller_profile);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->origination_caller_profile = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->origination_caller_profile);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->hunt_caller_profile = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->hunt_caller_profile);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_times_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_channel_timetable *)jarg2; 
-  if (arg1) (arg1)->times = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_times_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_channel_timetable *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_channel_timetable *) ((arg1)->times);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_old_times_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_channel_timetable *)jarg2; 
-  if (arg1) (arg1)->old_times = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_old_times_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_channel_timetable *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_channel_timetable *) ((arg1)->old_times);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_extension_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_extension *arg2 = (switch_caller_extension *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_extension *)jarg2; 
-  if (arg1) (arg1)->caller_extension = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_caller_extension_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_extension *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_extension *) ((arg1)->caller_extension);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_pool_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_next_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_next_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_direction_set(void * jarg1, int jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_call_direction_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  if (arg1) (arg1)->direction = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_profile_direction_get(void * jarg1) {
-  int jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_call_direction_t) ((arg1)->direction);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_logical_direction_set(void * jarg1, int jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_call_direction_t arg2 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  if (arg1) (arg1)->logical_direction = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_profile_logical_direction_get(void * jarg1) {
-  int jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (switch_call_direction_t) ((arg1)->logical_direction);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_soft_set(void * jarg1, void * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  profile_node_t *arg2 = (profile_node_t *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (profile_node_t *)jarg2; 
-  if (arg1) (arg1)->soft = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_soft_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  profile_node_t *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (profile_node_t *) ((arg1)->soft);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_str_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid_str) delete [] arg1->uuid_str;
-    if (arg2) {
-      arg1->uuid_str = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid_str, (const char *)arg2);
-    } else {
-      arg1->uuid_str = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_uuid_str_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->uuid_str);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_clone_of_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->clone_of) delete [] arg1->clone_of;
-    if (arg2) {
-      arg1->clone_of = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->clone_of, (const char *)arg2);
-    } else {
-      arg1->clone_of = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_clone_of_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->clone_of);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_transfer_source_set(void * jarg1, char * jarg2) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->transfer_source) delete [] arg1->transfer_source;
-    if (arg2) {
-      arg1->transfer_source = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->transfer_source, (const char *)arg2);
-    } else {
-      arg1->transfer_source = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_transfer_source_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  result = (char *) ((arg1)->transfer_source);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_profile() {
-  void * jresult ;
-  switch_caller_profile *result = 0 ;
-  
-  result = (switch_caller_profile *)new switch_caller_profile();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_profile(void * jarg1) {
-  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_profile *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_name_set(void * jarg1, char * jarg2) {
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->application_name) delete [] arg1->application_name;
-    if (arg2) {
-      arg1->application_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->application_name, (const char *)arg2);
-    } else {
-      arg1->application_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_application_application_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  result = (char *) ((arg1)->application_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_data_set(void * jarg1, char * jarg2) {
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->application_data) delete [] arg1->application_data;
-    if (arg2) {
-      arg1->application_data = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->application_data, (const char *)arg2);
-    } else {
-      arg1->application_data = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_application_application_data_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  result = (char *) ((arg1)->application_data);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_function_set(void * jarg1, void * jarg2) {
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  switch_application_function_t arg2 = (switch_application_function_t) 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  arg2 = (switch_application_function_t)jarg2; 
-  if (arg1) (arg1)->application_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_application_application_function_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  switch_application_function_t result;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  result = (switch_application_function_t) ((arg1)->application_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_next_set(void * jarg1, void * jarg2) {
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  switch_caller_application *arg2 = (switch_caller_application *) 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  arg2 = (switch_caller_application *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_application_next_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  switch_caller_application *result = 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  result = (switch_caller_application *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_application() {
-  void * jresult ;
-  switch_caller_application *result = 0 ;
-  
-  result = (switch_caller_application *)new switch_caller_application();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_application(void * jarg1) {
-  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
-  
-  arg1 = (switch_caller_application *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_name_set(void * jarg1, char * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->extension_name) delete [] arg1->extension_name;
-    if (arg2) {
-      arg1->extension_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->extension_name, (const char *)arg2);
-    } else {
-      arg1->extension_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_extension_extension_name_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (char *) ((arg1)->extension_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_number_set(void * jarg1, char * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->extension_number) delete [] arg1->extension_number;
-    if (arg2) {
-      arg1->extension_number = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->extension_number, (const char *)arg2);
-    } else {
-      arg1->extension_number = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_extension_extension_number_get(void * jarg1) {
-  char * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (char *) ((arg1)->extension_number);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_current_application_set(void * jarg1, void * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (switch_caller_application_t *)jarg2; 
-  if (arg1) (arg1)->current_application = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_current_application_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (switch_caller_application_t *) ((arg1)->current_application);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_last_application_set(void * jarg1, void * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (switch_caller_application_t *)jarg2; 
-  if (arg1) (arg1)->last_application = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_last_application_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (switch_caller_application_t *) ((arg1)->last_application);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_applications_set(void * jarg1, void * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (switch_caller_application_t *)jarg2; 
-  if (arg1) (arg1)->applications = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_applications_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_application_t *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (switch_caller_application_t *) ((arg1)->applications);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_children_set(void * jarg1, void * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (switch_caller_profile *)jarg2; 
-  if (arg1) (arg1)->children = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_children_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_profile *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (switch_caller_profile *) ((arg1)->children);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_next_set(void * jarg1, void * jarg2) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_extension *arg2 = (switch_caller_extension *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  arg2 = (switch_caller_extension *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_next_get(void * jarg1) {
-  void * jresult ;
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  switch_caller_extension *result = 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  result = (switch_caller_extension *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_extension() {
-  void * jresult ;
-  switch_caller_extension *result = 0 ;
-  
-  result = (switch_caller_extension *)new switch_caller_extension();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_extension(void * jarg1) {
-  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
-  
-  arg1 = (switch_caller_extension *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_new(void * jarg1, char * jarg2, char * jarg3) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_caller_extension_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_caller_extension_t *)switch_caller_extension_new(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_extension_clone(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_caller_extension_t **arg1 = (switch_caller_extension_t **) 0 ;
-  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
-  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_caller_extension_t **)jarg1; 
-  arg2 = (switch_caller_extension_t *)jarg2; 
-  arg3 = (switch_memory_pool_t *)jarg3; 
-  result = (switch_status_t)switch_caller_extension_clone(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_add_application(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_caller_extension_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  switch_caller_extension_add_application(arg1,arg2,(char const *)arg3,(char const *)arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_add_application_printf(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_caller_extension_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  switch_caller_extension_add_application_printf(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_get_field_by_name(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_caller_profile_t *arg1 = (switch_caller_profile_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_caller_profile_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_caller_get_field_by_name(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_new(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12) {
-  void * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) 0 ;
-  char *arg11 = (char *) 0 ;
-  char *arg12 = (char *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (char *)jarg11; 
-  arg12 = (char *)jarg12; 
-  result = (switch_caller_profile_t *)switch_caller_profile_new(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_clone(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  result = (switch_caller_profile_t *)switch_caller_profile_clone(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_dup(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  result = (switch_caller_profile_t *)switch_caller_profile_dup(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_event_set_data(void * jarg1, char * jarg2, void * jarg3) {
-  switch_caller_profile_t *arg1 = (switch_caller_profile_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_caller_profile_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  switch_caller_profile_event_set_data(arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_codec_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  if (arg1) (arg1)->codec = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_codec_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (switch_codec_t *) ((arg1)->codec);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_source_set(void * jarg1, char * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->source = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->source, (const char *)arg2);
-    } else {
-      arg1->source = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_frame_source_get(void * jarg1) {
-  char * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (char *) ((arg1)->source);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packet_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->packet = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_packet_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (void *) ((arg1)->packet);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packetlen_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->packetlen = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_packetlen_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->packetlen);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_extra_data_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->extra_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_extra_data_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (void *) ((arg1)->extra_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_data_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_data_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (void *) ((arg1)->data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_datalen_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->datalen = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_datalen_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->datalen);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_buflen_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->buflen = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_buflen_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->buflen);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_samples_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samples = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_samples_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->samples);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_payload_set(void * jarg1, unsigned char jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->payload = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_frame_payload_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (switch_payload_t) ((arg1)->payload);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_timestamp_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->timestamp = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_timestamp_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result =  ((arg1)->timestamp);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_seq_set(void * jarg1, unsigned short jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint16_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint16_t)jarg2; 
-  if (arg1) (arg1)->seq = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_frame_seq_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint16_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint16_t) ((arg1)->seq);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_ssrc_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->ssrc = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_ssrc_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (uint32_t) ((arg1)->ssrc);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_m_set(void * jarg1, int jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  if (arg1) (arg1)->m = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_m_get(void * jarg1) {
-  int jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (switch_bool_t) ((arg1)->m);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_frame_flag_t arg2 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (switch_frame_flag_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  switch_frame_flag_t result;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (switch_frame_flag_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_user_data_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (void *) ((arg1)->user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_pmap_set(void * jarg1, void * jarg2) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  payload_map_t *arg2 = (payload_map_t *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  arg2 = (payload_map_t *)jarg2; 
-  if (arg1) (arg1)->pmap = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_pmap_get(void * jarg1) {
-  void * jresult ;
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  payload_map_t *result = 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  result = (payload_map_t *) ((arg1)->pmap);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_frame() {
-  void * jresult ;
-  switch_frame *result = 0 ;
-  
-  result = (switch_frame *)new switch_frame();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_frame(void * jarg1) {
-  switch_frame *arg1 = (switch_frame *) 0 ;
-  
-  arg1 = (switch_frame *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_init_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_init = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_init_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_init);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_routing_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_routing = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_routing_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_routing);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_execute_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_execute = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_execute_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_execute);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hangup_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_hangup = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_hangup_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_hangup);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_exchange_media_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_exchange_media = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_exchange_media_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_exchange_media);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_soft_execute_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_soft_execute = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_soft_execute_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_soft_execute);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_consume_media_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_consume_media = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_consume_media_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_consume_media);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hibernate_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_hibernate = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_hibernate_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_hibernate);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reset_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_reset = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_reset_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_reset);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_park_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_park = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_park_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_park);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_reporting = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_reporting);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_destroy_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (switch_state_handler_t)jarg2; 
-  if (arg1) (arg1)->on_destroy = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_destroy_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  switch_state_handler_t result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (switch_state_handler_t) ((arg1)->on_destroy);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_flags_set(void * jarg1, int jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_state_handler_table_flags_get(void * jarg1) {
-  int jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  int result;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (int) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_padding_set(void * jarg1, void * jarg2) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  void **arg2 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  arg2 = (void **)jarg2; 
-  {
-    size_t ii;
-    void * *b = (void * *) arg1->padding;
-    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((void * *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_padding_get(void * jarg1) {
-  void * jresult ;
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  void **result = 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  result = (void **)(void **) ((arg1)->padding);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_state_handler_table() {
-  void * jresult ;
-  switch_state_handler_table *result = 0 ;
-  
-  result = (switch_state_handler_table *)new switch_state_handler_table();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_state_handler_table(void * jarg1) {
-  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
-  
-  arg1 = (switch_state_handler_table *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_write_function_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_stream_handle_write_function_t arg2 = (switch_stream_handle_write_function_t) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  arg2 = (switch_stream_handle_write_function_t)jarg2; 
-  if (arg1) (arg1)->write_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_write_function_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_stream_handle_write_function_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result = (switch_stream_handle_write_function_t) ((arg1)->write_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_raw_write_function_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_stream_handle_raw_write_function_t arg2 = (switch_stream_handle_raw_write_function_t) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  arg2 = (switch_stream_handle_raw_write_function_t)jarg2; 
-  if (arg1) (arg1)->raw_write_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_raw_write_function_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_stream_handle_raw_write_function_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result = (switch_stream_handle_raw_write_function_t) ((arg1)->raw_write_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result = (void *) ((arg1)->data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_end_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->end = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_end_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result = (void *) ((arg1)->end);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_size_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->data_size = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_size_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result =  ((arg1)->data_size);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_len_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->data_len = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_len_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result =  ((arg1)->data_len);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->alloc_len = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result =  ((arg1)->alloc_len);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->alloc_chunk = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result =  ((arg1)->alloc_chunk);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_param_event_set(void * jarg1, void * jarg2) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  if (arg1) (arg1)->param_event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_param_event_get(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  switch_event_t *result = 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  result = (switch_event_t *) ((arg1)->param_event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_stream_handle() {
-  void * jresult ;
-  switch_stream_handle *result = 0 ;
-  
-  result = (switch_stream_handle *)new switch_stream_handle();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_stream_handle(void * jarg1) {
-  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
-  
-  arg1 = (switch_stream_handle *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_outgoing_channel_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_outgoing_channel_t arg2 = (switch_io_outgoing_channel_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_outgoing_channel_t)jarg2; 
-  if (arg1) (arg1)->outgoing_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_outgoing_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_outgoing_channel_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_outgoing_channel_t) ((arg1)->outgoing_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_frame_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_read_frame_t arg2 = (switch_io_read_frame_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_read_frame_t)jarg2; 
-  if (arg1) (arg1)->read_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_read_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_read_frame_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_read_frame_t) ((arg1)->read_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_frame_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_write_frame_t arg2 = (switch_io_write_frame_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_write_frame_t)jarg2; 
-  if (arg1) (arg1)->write_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_write_frame_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_write_frame_t) ((arg1)->write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_kill_channel_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_kill_channel_t arg2 = (switch_io_kill_channel_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_kill_channel_t)jarg2; 
-  if (arg1) (arg1)->kill_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_kill_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_kill_channel_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_kill_channel_t) ((arg1)->kill_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_send_dtmf_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_send_dtmf_t arg2 = (switch_io_send_dtmf_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_send_dtmf_t)jarg2; 
-  if (arg1) (arg1)->send_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_send_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_send_dtmf_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_send_dtmf_t) ((arg1)->send_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_message_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_receive_message_t arg2 = (switch_io_receive_message_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_receive_message_t)jarg2; 
-  if (arg1) (arg1)->receive_message = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_receive_message_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_receive_message_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_receive_message_t) ((arg1)->receive_message);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_event_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_receive_event_t arg2 = (switch_io_receive_event_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_receive_event_t)jarg2; 
-  if (arg1) (arg1)->receive_event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_receive_event_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_receive_event_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_receive_event_t) ((arg1)->receive_event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_change_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_state_change_t arg2 = (switch_io_state_change_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_state_change_t)jarg2; 
-  if (arg1) (arg1)->state_change = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_state_change_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_state_change_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_state_change_t) ((arg1)->state_change);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_video_frame_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_read_video_frame_t arg2 = (switch_io_read_video_frame_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_read_video_frame_t)jarg2; 
-  if (arg1) (arg1)->read_video_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_read_video_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_read_video_frame_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_read_video_frame_t) ((arg1)->read_video_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_video_frame_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_write_video_frame_t arg2 = (switch_io_write_video_frame_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_write_video_frame_t)jarg2; 
-  if (arg1) (arg1)->write_video_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_write_video_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_write_video_frame_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_write_video_frame_t) ((arg1)->write_video_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_run_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_state_run_t arg2 = (switch_io_state_run_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_state_run_t)jarg2; 
-  if (arg1) (arg1)->state_run = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_state_run_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_state_run_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_state_run_t) ((arg1)->state_run);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_get_jb_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_get_jb_t arg2 = (switch_io_get_jb_t) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (switch_io_get_jb_t)jarg2; 
-  if (arg1) (arg1)->get_jb = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_get_jb_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  switch_io_get_jb_t result;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (switch_io_get_jb_t) ((arg1)->get_jb);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_padding_set(void * jarg1, void * jarg2) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  void **arg2 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  arg2 = (void **)jarg2; 
-  {
-    size_t ii;
-    void * *b = (void * *) arg1->padding;
-    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((void * *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_padding_get(void * jarg1) {
-  void * jresult ;
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  void **result = 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  result = (void **)(void **) ((arg1)->padding);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_routines() {
-  void * jresult ;
-  switch_io_routines *result = 0 ;
-  
-  result = (switch_io_routines *)new switch_io_routines();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_routines(void * jarg1) {
-  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
-  
-  arg1 = (switch_io_routines *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_endpoint_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_io_routines_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_io_routines_t *arg2 = (switch_io_routines_t *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_io_routines_t *)jarg2; 
-  if (arg1) (arg1)->io_routines = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_io_routines_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_io_routines_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_io_routines_t *) ((arg1)->io_routines);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_state_handler_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_state_handler_table_t *)jarg2; 
-  if (arg1) (arg1)->state_handler = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_state_handler_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_state_handler_table_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_state_handler_table_t *) ((arg1)->state_handler);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_private_info_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_refs_set(void * jarg1, int jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_endpoint_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_next_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_endpoint_interface *arg2 = (switch_endpoint_interface *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_endpoint_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_endpoint_interface *result = 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_endpoint_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_recover_callback_set(void * jarg1, void * jarg2) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_core_recover_callback_t arg2 = (switch_core_recover_callback_t) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  arg2 = (switch_core_recover_callback_t)jarg2; 
-  if (arg1) (arg1)->recover_callback = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_recover_callback_get(void * jarg1) {
-  void * jresult ;
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  switch_core_recover_callback_t result;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  result = (switch_core_recover_callback_t) ((arg1)->recover_callback);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_endpoint_interface() {
-  void * jresult ;
-  switch_endpoint_interface *result = 0 ;
-  
-  result = (switch_endpoint_interface *)new switch_endpoint_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_endpoint_interface(void * jarg1) {
-  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
-  
-  arg1 = (switch_endpoint_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interval_set(void * jarg1, int jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->interval = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_timer_interval_get(void * jarg1) {
-  int jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  int result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (int) ((arg1)->interval);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_timer_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samples_set(void * jarg1, unsigned int jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->samples = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_timer_samples_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (unsigned int) ((arg1)->samples);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samplecount_set(void * jarg1, unsigned long jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samplecount = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_timer_samplecount_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (uint32_t) ((arg1)->samplecount);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_timer_interface_set(void * jarg1, void * jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_timer_interface_t *arg2 = (switch_timer_interface_t *) 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (switch_timer_interface_t *)jarg2; 
-  if (arg1) (arg1)->timer_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_timer_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_timer_interface_t *result = 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (switch_timer_interface_t *) ((arg1)->timer_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_private_info_set(void * jarg1, void * jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_diff_set(void * jarg1, void * jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->diff = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_diff_get(void * jarg1) {
-  void * jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result =  ((arg1)->diff);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_tick_set(void * jarg1, void * jarg2) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->tick = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_tick_get(void * jarg1) {
-  void * jresult ;
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_timer *)jarg1; 
-  result =  ((arg1)->tick);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_timer() {
-  void * jresult ;
-  switch_timer *result = 0 ;
-  
-  result = (switch_timer *)new switch_timer();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer(void * jarg1) {
-  switch_timer *arg1 = (switch_timer *) 0 ;
-  
-  arg1 = (switch_timer *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_timer_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_init_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
-  if (arg1) (arg1)->timer_init = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_init_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_init);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_next_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
-  if (arg1) (arg1)->timer_next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_next_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_step_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
-  if (arg1) (arg1)->timer_step = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_step_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_step);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_sync_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
-  if (arg1) (arg1)->timer_sync = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_sync_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_sync);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_check_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *,switch_bool_t) = (switch_status_t (*)(switch_timer_t *,switch_bool_t)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *,switch_bool_t))jarg2; 
-  if (arg1) (arg1)->timer_check = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_check_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *,switch_bool_t) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *,switch_bool_t)) ((arg1)->timer_check);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_destroy_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
-  if (arg1) (arg1)->timer_destroy = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_destroy_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_status_t (*result)(switch_timer_t *) = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_destroy);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_refs_set(void * jarg1, int jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_timer_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_next_set(void * jarg1, void * jarg2) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_timer_interface *arg2 = (switch_timer_interface *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  arg2 = (switch_timer_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  switch_timer_interface *result = 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  result = (switch_timer_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_timer_interface() {
-  void * jresult ;
-  switch_timer_interface *result = 0 ;
-  
-  result = (switch_timer_interface *)new switch_timer_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer_interface(void * jarg1) {
-  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
-  
-  arg1 = (switch_timer_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_dialplan_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_hunt_function_set(void * jarg1, void * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_dialplan_hunt_function_t arg2 = (switch_dialplan_hunt_function_t) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (switch_dialplan_hunt_function_t)jarg2; 
-  if (arg1) (arg1)->hunt_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_hunt_function_get(void * jarg1) {
-  void * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_dialplan_hunt_function_t result;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (switch_dialplan_hunt_function_t) ((arg1)->hunt_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_refs_set(void * jarg1, int jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_dialplan_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_next_set(void * jarg1, void * jarg2) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_dialplan_interface *arg2 = (switch_dialplan_interface *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  arg2 = (switch_dialplan_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  switch_dialplan_interface *result = 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  result = (switch_dialplan_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_dialplan_interface() {
-  void * jresult ;
-  switch_dialplan_interface *result = 0 ;
-  
-  result = (switch_dialplan_interface *)new switch_dialplan_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dialplan_interface(void * jarg1) {
-  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
-  
-  arg1 = (switch_dialplan_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_open_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,char const *) = (switch_status_t (*)(switch_file_handle_t *,char const *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,char const *))jarg2; 
-  if (arg1) (arg1)->file_open = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_open_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,char const *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,char const *)) ((arg1)->file_open);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_close_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *) = (switch_status_t (*)(switch_file_handle_t *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *))jarg2; 
-  if (arg1) (arg1)->file_close = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_close_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *)) ((arg1)->file_close);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_truncate_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,int64_t) = (switch_status_t (*)(switch_file_handle_t *,int64_t)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,int64_t))jarg2; 
-  if (arg1) (arg1)->file_truncate = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_truncate_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,int64_t) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,int64_t)) ((arg1)->file_truncate);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
-  if (arg1) (arg1)->file_read = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_read_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_read);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
-  if (arg1) (arg1)->file_write = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_write_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_write);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_video_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
-  if (arg1) (arg1)->file_read_video = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_read_video_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_read_video);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_video_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
-  if (arg1) (arg1)->file_write_video = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_write_video_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_write_video);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_seek_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,unsigned int *,int64_t,int) = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int))jarg2; 
-  if (arg1) (arg1)->file_seek = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_seek_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,unsigned int *,int64_t,int) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int)) ((arg1)->file_seek);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_set_string_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,switch_audio_col_t,char const *) = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *))jarg2; 
-  if (arg1) (arg1)->file_set_string = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_set_string_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,switch_audio_col_t,char const *) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *)) ((arg1)->file_set_string);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_get_string_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*arg2)(switch_file_handle_t *,switch_audio_col_t,char const **) = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **)) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **))jarg2; 
-  if (arg1) (arg1)->file_get_string = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_get_string_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_status_t (*result)(switch_file_handle_t *,switch_audio_col_t,char const **) = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **)) ((arg1)->file_get_string);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_extens_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  char **arg2 = (char **) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (char **)jarg2; 
-  if (arg1) (arg1)->extens = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_extens_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  char **result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (char **) ((arg1)->extens);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_refs_set(void * jarg1, int jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_next_set(void * jarg1, void * jarg2) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_file_interface *arg2 = (switch_file_interface *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  arg2 = (switch_file_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  switch_file_interface *result = 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  result = (switch_file_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_file_interface() {
-  void * jresult ;
-  switch_file_interface *result = 0 ;
-  
-  result = (switch_file_interface *)new switch_file_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_interface(void * jarg1) {
-  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
-  
-  arg1 = (switch_file_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_interface_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_file_interface_t *arg2 = (switch_file_interface_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_file_interface_t *)jarg2; 
-  if (arg1) (arg1)->file_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_file_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_file_interface_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_file_interface_t *) ((arg1)->file_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_fd_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_file_t *arg2 = (switch_file_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_file_t *)jarg2; 
-  if (arg1) (arg1)->fd = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_fd_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_file_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_file_t *) ((arg1)->fd);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_set(void * jarg1, unsigned int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->samples = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_samples_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (unsigned int) ((arg1)->samples);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samplerate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_samplerate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->samplerate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->native_rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_native_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->native_rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_real_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->real_channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_real_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->real_channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_format_set(void * jarg1, unsigned int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->format = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_format_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (unsigned int) ((arg1)->format);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sections_set(void * jarg1, unsigned int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->sections = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_sections_get(void * jarg1) {
-  unsigned int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (unsigned int) ((arg1)->sections);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_seekable_set(void * jarg1, int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->seekable = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_seekable_get(void * jarg1) {
-  int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int) ((arg1)->seekable);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sample_count_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->sample_count = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_sample_count_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result =  ((arg1)->sample_count);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_speed_set(void * jarg1, int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->speed = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_speed_get(void * jarg1) {
-  int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int) ((arg1)->speed);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_prebuf_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->prebuf = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_prebuf_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->prebuf);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_interval_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->interval = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_interval_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->interval);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_private_info_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_handler_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->handler) delete [] arg1->handler;
-    if (arg2) {
-      arg1->handler = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->handler, (const char *)arg2);
-    } else {
-      arg1->handler = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_handler_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->handler);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pos_set(void * jarg1, long long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->pos = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_file_handle_pos_get(void * jarg1) {
-  long long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int64_t) ((arg1)->pos);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_audio_buffer_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->audio_buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_audio_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->audio_buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sp_audio_buffer_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->sp_audio_buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_sp_audio_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->sp_audio_buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_thresh_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->thresh = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_thresh_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->thresh);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_silence_hits_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->silence_hits = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_silence_hits_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->silence_hits);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_offset_pos_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->offset_pos = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_offset_pos_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->offset_pos);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_in_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->samples_in = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_in_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result =  ((arg1)->samples_in);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_out_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->samples_out = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_out_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result =  ((arg1)->samples_out);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int32_t)jarg2; 
-  if (arg1) (arg1)->vol = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_vol_get(void * jarg1) {
-  int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int32_t) ((arg1)->vol);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_resampler_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_audio_resampler_t *)jarg2; 
-  if (arg1) (arg1)->resampler = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_resampler_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_audio_resampler_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_audio_resampler_t *) ((arg1)->resampler);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_buffer_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuf_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  if (arg1) (arg1)->dbuf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_dbuf_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_byte_t *) ((arg1)->dbuf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuflen_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->dbuflen = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_dbuflen_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->pre_buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->pre_buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned char *arg2 = (unsigned char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (unsigned char *)jarg2; 
-  if (arg1) (arg1)->pre_buffer_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  unsigned char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (unsigned char *) ((arg1)->pre_buffer_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->pre_buffer_datalen = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result =  ((arg1)->pre_buffer_datalen);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->file = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->file, (const char *)arg2);
-    } else {
-      arg1->file = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_file_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->file);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_func_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->func = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->func, (const char *)arg2);
-    } else {
-      arg1->func = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_func_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->func);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_line_set(void * jarg1, int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->line = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_line_get(void * jarg1) {
-  int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int) ((arg1)->line);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_path_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->file_path) delete [] arg1->file_path;
-    if (arg2) {
-      arg1->file_path = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->file_path, (const char *)arg2);
-    } else {
-      arg1->file_path = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_file_path_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->file_path);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_spool_path_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->spool_path) delete [] arg1->spool_path;
-    if (arg2) {
-      arg1->spool_path = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->spool_path, (const char *)arg2);
-    } else {
-      arg1->spool_path = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_spool_path_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->spool_path);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_prefix_set(void * jarg1, char * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->prefix = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->prefix, (const char *)arg2);
-    } else {
-      arg1->prefix = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_prefix_get(void * jarg1) {
-  char * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (char *) ((arg1)->prefix);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_max_samples_set(void * jarg1, int jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->max_samples = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_max_samples_get(void * jarg1) {
-  int jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  int result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (int) ((arg1)->max_samples);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle__params_set(void * jarg1, void * jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  if (arg1) (arg1)->params = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle__params_get(void * jarg1) {
-  void * jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  switch_event_t *result = 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (switch_event_t *) ((arg1)->params);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->cur_channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_cur_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->cur_channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_samplerate_set(void * jarg1, unsigned long jarg2) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->cur_samplerate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_cur_samplerate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->cur_samplerate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_file_handle() {
-  void * jresult ;
-  switch_file_handle *result = 0 ;
-  
-  result = (switch_file_handle *)new switch_file_handle();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_handle(void * jarg1) {
-  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
-  
-  arg1 = (switch_file_handle *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_open_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_open = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_open_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *)) ((arg1)->asr_open);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_load_grammar_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char const *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *))jarg2; 
-  if (arg1) (arg1)->asr_load_grammar = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_load_grammar_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char const *,char const *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *)) ((arg1)->asr_load_grammar);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_unload_grammar_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
-  if (arg1) (arg1)->asr_unload_grammar = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_unload_grammar_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_unload_grammar);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_close_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_close = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_close_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) ((arg1)->asr_close);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_feed = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *)) ((arg1)->asr_feed);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_resume_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
-  if (arg1) (arg1)->asr_resume = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_resume_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_resume);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_pause_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
-  if (arg1) (arg1)->asr_pause = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_pause_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_pause);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_check_results_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_check_results = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_check_results_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) ((arg1)->asr_check_results);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_get_results = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char **,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *)) ((arg1)->asr_get_results);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_get_result_headers = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) ((arg1)->asr_get_result_headers);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
-  if (arg1) (arg1)->asr_start_input_timers = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_start_input_timers);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*arg2)(switch_asr_handle_t *,char *,char const *) = (void (*)(switch_asr_handle_t *,char *,char const *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (void (*)(switch_asr_handle_t *,char *,char const *))jarg2; 
-  if (arg1) (arg1)->asr_text_param = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*result)(switch_asr_handle_t *,char *,char const *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (void (*)(switch_asr_handle_t *,char *,char const *)) ((arg1)->asr_text_param);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*arg2)(switch_asr_handle_t *,char *,int) = (void (*)(switch_asr_handle_t *,char *,int)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (void (*)(switch_asr_handle_t *,char *,int))jarg2; 
-  if (arg1) (arg1)->asr_numeric_param = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*result)(switch_asr_handle_t *,char *,int) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (void (*)(switch_asr_handle_t *,char *,int)) ((arg1)->asr_numeric_param);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*arg2)(switch_asr_handle_t *,char *,double) = (void (*)(switch_asr_handle_t *,char *,double)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (void (*)(switch_asr_handle_t *,char *,double))jarg2; 
-  if (arg1) (arg1)->asr_float_param = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  void (*result)(switch_asr_handle_t *,char *,double) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (void (*)(switch_asr_handle_t *,char *,double)) ((arg1)->asr_float_param);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_refs_set(void * jarg1, int jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_asr_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_next_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_asr_interface *arg2 = (switch_asr_interface *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_asr_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_asr_interface *result = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_asr_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_enable_grammar_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
-  if (arg1) (arg1)->asr_enable_grammar = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_enable_grammar_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_enable_grammar);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_grammar_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
-  if (arg1) (arg1)->asr_disable_grammar = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_grammar_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_disable_grammar);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_all_grammars_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
-  if (arg1) (arg1)->asr_disable_all_grammars = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_all_grammars_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_disable_all_grammars);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_dtmf_set(void * jarg1, void * jarg2) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*arg2)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *)) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *))jarg2; 
-  if (arg1) (arg1)->asr_feed_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  switch_status_t (*result)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *) = 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *)) ((arg1)->asr_feed_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_asr_interface() {
-  void * jresult ;
-  switch_asr_interface *result = 0 ;
-  
-  result = (switch_asr_interface *)new switch_asr_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_interface(void * jarg1) {
-  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
-  
-  arg1 = (switch_asr_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_asr_interface_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_asr_interface_t *arg2 = (switch_asr_interface_t *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (switch_asr_interface_t *)jarg2; 
-  if (arg1) (arg1)->asr_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_asr_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_asr_interface_t *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (switch_asr_interface_t *) ((arg1)->asr_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_name_set(void * jarg1, char * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_name_get(void * jarg1) {
-  char * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_codec_set(void * jarg1, char * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->codec) delete [] arg1->codec;
-    if (arg2) {
-      arg1->codec = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->codec, (const char *)arg2);
-    } else {
-      arg1->codec = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_codec_get(void * jarg1) {
-  char * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (char *) ((arg1)->codec);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_grammar_set(void * jarg1, char * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->grammar) delete [] arg1->grammar;
-    if (arg2) {
-      arg1->grammar = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->grammar, (const char *)arg2);
-    } else {
-      arg1->grammar = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_grammar_get(void * jarg1) {
-  char * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (char *) ((arg1)->grammar);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_param_set(void * jarg1, char * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->param) delete [] arg1->param;
-    if (arg2) {
-      arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->param, (const char *)arg2);
-    } else {
-      arg1->param = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_param_get(void * jarg1) {
-  char * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (char *) ((arg1)->param);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_buffer_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuf_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  if (arg1) (arg1)->dbuf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_dbuf_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (switch_byte_t *) ((arg1)->dbuf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->dbuflen = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_resampler_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (switch_audio_resampler_t *)jarg2; 
-  if (arg1) (arg1)->resampler = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_resampler_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  switch_audio_resampler_t *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (switch_audio_resampler_t *) ((arg1)->resampler);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samplerate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_samplerate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->samplerate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->native_rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_native_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->native_rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_private_info_set(void * jarg1, void * jarg2) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_asr_handle() {
-  void * jresult ;
-  switch_asr_handle *result = 0 ;
-  
-  result = (switch_asr_handle *)new switch_asr_handle();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_handle(void * jarg1) {
-  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
-  
-  arg1 = (switch_asr_handle *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_open_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*arg2)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *))jarg2; 
-  if (arg1) (arg1)->speech_open = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_open_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*result)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) ((arg1)->speech_open);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_close_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*arg2)(switch_speech_handle_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *))jarg2; 
-  if (arg1) (arg1)->speech_close = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_close_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*result)(switch_speech_handle_t *,switch_speech_flag_t *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *)) ((arg1)->speech_close);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_feed_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*arg2)(switch_speech_handle_t *,char *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *))jarg2; 
-  if (arg1) (arg1)->speech_feed_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_feed_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*result)(switch_speech_handle_t *,char *,switch_speech_flag_t *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *)) ((arg1)->speech_feed_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*arg2)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *))jarg2; 
-  if (arg1) (arg1)->speech_read_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_status_t (*result)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) ((arg1)->speech_read_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_flush_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*arg2)(switch_speech_handle_t *) = (void (*)(switch_speech_handle_t *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (void (*)(switch_speech_handle_t *))jarg2; 
-  if (arg1) (arg1)->speech_flush_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_flush_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*result)(switch_speech_handle_t *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (void (*)(switch_speech_handle_t *)) ((arg1)->speech_flush_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_text_param_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*arg2)(switch_speech_handle_t *,char *,char const *) = (void (*)(switch_speech_handle_t *,char *,char const *)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (void (*)(switch_speech_handle_t *,char *,char const *))jarg2; 
-  if (arg1) (arg1)->speech_text_param_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_text_param_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*result)(switch_speech_handle_t *,char *,char const *) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (void (*)(switch_speech_handle_t *,char *,char const *)) ((arg1)->speech_text_param_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_numeric_param_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*arg2)(switch_speech_handle_t *,char *,int) = (void (*)(switch_speech_handle_t *,char *,int)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (void (*)(switch_speech_handle_t *,char *,int))jarg2; 
-  if (arg1) (arg1)->speech_numeric_param_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_numeric_param_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*result)(switch_speech_handle_t *,char *,int) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (void (*)(switch_speech_handle_t *,char *,int)) ((arg1)->speech_numeric_param_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_float_param_tts_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*arg2)(switch_speech_handle_t *,char *,double) = (void (*)(switch_speech_handle_t *,char *,double)) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (void (*)(switch_speech_handle_t *,char *,double))jarg2; 
-  if (arg1) (arg1)->speech_float_param_tts = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_float_param_tts_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  void (*result)(switch_speech_handle_t *,char *,double) = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (void (*)(switch_speech_handle_t *,char *,double)) ((arg1)->speech_float_param_tts);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_refs_set(void * jarg1, int jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_speech_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_next_set(void * jarg1, void * jarg2) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_speech_interface *arg2 = (switch_speech_interface *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  arg2 = (switch_speech_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  switch_speech_interface *result = 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  result = (switch_speech_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_speech_interface() {
-  void * jresult ;
-  switch_speech_interface *result = 0 ;
-  
-  result = (switch_speech_interface *)new switch_speech_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_interface(void * jarg1) {
-  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
-  
-  arg1 = (switch_speech_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speech_interface_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_speech_interface_t *arg2 = (switch_speech_interface_t *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (switch_speech_interface_t *)jarg2; 
-  if (arg1) (arg1)->speech_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_speech_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_speech_interface_t *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (switch_speech_interface_t *) ((arg1)->speech_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_name_set(void * jarg1, char * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_name_get(void * jarg1) {
-  char * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speed_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->speed = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_speed_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->speed);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samples_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samples = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samples_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->samples);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_real_channels_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->real_channels = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_real_channels_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->real_channels);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_voice_set(void * jarg1, char * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->voice, (const char *)arg2, 80-1);
-      arg1->voice[80-1] = 0;
-    } else {
-      arg1->voice[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_voice_get(void * jarg1) {
-  char * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (char *)(char *) ((arg1)->voice);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_engine_set(void * jarg1, char * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->engine) delete [] arg1->engine;
-    if (arg2) {
-      arg1->engine = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->engine, (const char *)arg2);
-    } else {
-      arg1->engine = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_engine_get(void * jarg1) {
-  char * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (char *) ((arg1)->engine);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_param_set(void * jarg1, char * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->param) delete [] arg1->param;
-    if (arg2) {
-      arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->param, (const char *)arg2);
-    } else {
-      arg1->param = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_param_get(void * jarg1) {
-  char * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (char *) ((arg1)->param);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_resampler_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (switch_audio_resampler_t *)jarg2; 
-  if (arg1) (arg1)->resampler = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_resampler_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_audio_resampler_t *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (switch_audio_resampler_t *) ((arg1)->resampler);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_buffer_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (switch_buffer_t *)jarg2; 
-  if (arg1) (arg1)->buffer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_buffer_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_buffer_t *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (switch_buffer_t *) ((arg1)->buffer);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuf_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  if (arg1) (arg1)->dbuf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuf_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (switch_byte_t *) ((arg1)->dbuf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->dbuflen = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result =  ((arg1)->dbuflen);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samplerate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samplerate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->samplerate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->native_rate = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_native_rate_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->native_rate);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_private_info_set(void * jarg1, void * jarg2) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_speech_handle() {
-  void * jresult ;
-  switch_speech_handle *result = 0 ;
-  
-  result = (switch_speech_handle *)new switch_speech_handle();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_handle(void * jarg1) {
-  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
-  
-  arg1 = (switch_speech_handle *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_function_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_callback_t arg2 = (switch_say_callback_t) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_say_callback_t)jarg2; 
-  if (arg1) (arg1)->say_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_say_function_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_callback_t result;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_say_callback_t) ((arg1)->say_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_string_function_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_string_callback_t arg2 = (switch_say_string_callback_t) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_say_string_callback_t)jarg2; 
-  if (arg1) (arg1)->say_string_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_say_string_function_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_string_callback_t result;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_say_string_callback_t) ((arg1)->say_string_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_refs_set(void * jarg1, int jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_next_set(void * jarg1, void * jarg2) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_interface *arg2 = (switch_say_interface *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  arg2 = (switch_say_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  switch_say_interface *result = 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  result = (switch_say_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_say_interface() {
-  void * jresult ;
-  switch_say_interface *result = 0 ;
-  
-  result = (switch_say_interface *)new switch_say_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_interface(void * jarg1) {
-  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
-  
-  arg1 = (switch_say_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_chat_send_set(void * jarg1, void * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_status_t (*arg2)(switch_event_t *) = (switch_status_t (*)(switch_event_t *)) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_event_t *))jarg2; 
-  if (arg1) (arg1)->chat_send = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_chat_send_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_status_t (*result)(switch_event_t *) = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_event_t *)) ((arg1)->chat_send);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_refs_set(void * jarg1, int jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_chat_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_next_set(void * jarg1, void * jarg2) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_chat_interface *arg2 = (switch_chat_interface *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  arg2 = (switch_chat_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  switch_chat_interface *result = 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  result = (switch_chat_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_chat_interface() {
-  void * jresult ;
-  switch_chat_interface *result = 0 ;
-  
-  result = (switch_chat_interface *)new switch_chat_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_interface(void * jarg1) {
-  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
-  
-  arg1 = (switch_chat_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_relative_oid_set(void * jarg1, char * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->relative_oid = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->relative_oid, (const char *)arg2);
-    } else {
-      arg1->relative_oid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_management_interface_relative_oid_get(void * jarg1) {
-  char * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (char *) ((arg1)->relative_oid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_management_function_set(void * jarg1, void * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_status_t (*arg2)(char *,switch_management_action_t,char *,switch_size_t) = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t)) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t))jarg2; 
-  if (arg1) (arg1)->management_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_management_function_get(void * jarg1) {
-  void * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_status_t (*result)(char *,switch_management_action_t,char *,switch_size_t) = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t)) ((arg1)->management_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_refs_set(void * jarg1, int jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_management_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_next_set(void * jarg1, void * jarg2) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_management_interface *arg2 = (switch_management_interface *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  arg2 = (switch_management_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  switch_management_interface *result = 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  result = (switch_management_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_management_interface() {
-  void * jresult ;
-  switch_management_interface *result = 0 ;
-  
-  result = (switch_management_interface *)new switch_management_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_management_interface(void * jarg1) {
-  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
-  
-  arg1 = (switch_management_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_limit_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_incr_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*arg2)(switch_core_session_t *,char const *,char const *,int const,int const) = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const))jarg2; 
-  if (arg1) (arg1)->incr = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_incr_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*result)(switch_core_session_t *,char const *,char const *,int const,int const) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const)) ((arg1)->incr);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_release_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*arg2)(switch_core_session_t *,char const *,char const *) = (switch_status_t (*)(switch_core_session_t *,char const *,char const *)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *))jarg2; 
-  if (arg1) (arg1)->release = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_release_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*result)(switch_core_session_t *,char const *,char const *) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_core_session_t *,char const *,char const *)) ((arg1)->release);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_usage_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  int (*arg2)(char const *,char const *,uint32_t *) = (int (*)(char const *,char const *,uint32_t *)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (int (*)(char const *,char const *,uint32_t *))jarg2; 
-  if (arg1) (arg1)->usage = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_usage_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  int (*result)(char const *,char const *,uint32_t *) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (int (*)(char const *,char const *,uint32_t *)) ((arg1)->usage);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reset_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*arg2)(void) = (switch_status_t (*)(void)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(void))jarg2; 
-  if (arg1) (arg1)->reset = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_reset_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*result)(void) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_status_t (*)(void)) ((arg1)->reset);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_status_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  char *(*arg2)(void) = (char *(*)(void)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (char *(*)(void))jarg2; 
-  if (arg1) (arg1)->status = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_status_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  char *(*result)(void) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (char *(*)(void)) ((arg1)->status);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_interval_reset_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*arg2)(char const *,char const *) = (switch_status_t (*)(char const *,char const *)) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(char const *,char const *))jarg2; 
-  if (arg1) (arg1)->interval_reset = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_interval_reset_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_status_t (*result)(char const *,char const *) = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_status_t (*)(char const *,char const *)) ((arg1)->interval_reset);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_refs_set(void * jarg1, int jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_limit_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_next_set(void * jarg1, void * jarg2) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_limit_interface *arg2 = (switch_limit_interface *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  arg2 = (switch_limit_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  switch_limit_interface *result = 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  result = (switch_limit_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_limit_interface() {
-  void * jresult ;
-  switch_limit_interface *result = 0 ;
-  
-  result = (switch_limit_interface *)new switch_limit_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_limit_interface(void * jarg1) {
-  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
-  
-  arg1 = (switch_limit_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directory_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_open_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*arg2)(switch_directory_handle_t *,char *,char *,char *) = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *)) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *))jarg2; 
-  if (arg1) (arg1)->directory_open = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_open_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*result)(switch_directory_handle_t *,char *,char *,char *) = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *)) ((arg1)->directory_open);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_close_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*arg2)(switch_directory_handle_t *) = (switch_status_t (*)(switch_directory_handle_t *)) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
-  if (arg1) (arg1)->directory_close = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_close_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*result)(switch_directory_handle_t *) = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_directory_handle_t *)) ((arg1)->directory_close);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_query_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*arg2)(switch_directory_handle_t *,char *,char *) = (switch_status_t (*)(switch_directory_handle_t *,char *,char *)) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *))jarg2; 
-  if (arg1) (arg1)->directory_query = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_query_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*result)(switch_directory_handle_t *,char *,char *) = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_directory_handle_t *,char *,char *)) ((arg1)->directory_query);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*arg2)(switch_directory_handle_t *) = (switch_status_t (*)(switch_directory_handle_t *)) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
-  if (arg1) (arg1)->directory_next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_next_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*result)(switch_directory_handle_t *) = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_directory_handle_t *)) ((arg1)->directory_next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_pair_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*arg2)(switch_directory_handle_t *,char **,char **) = (switch_status_t (*)(switch_directory_handle_t *,char **,char **)) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char **,char **))jarg2; 
-  if (arg1) (arg1)->directory_next_pair = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_next_pair_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_status_t (*result)(switch_directory_handle_t *,char **,char **) = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_status_t (*)(switch_directory_handle_t *,char **,char **)) ((arg1)->directory_next_pair);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_refs_set(void * jarg1, int jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_directory_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_next_set(void * jarg1, void * jarg2) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_directory_interface *arg2 = (switch_directory_interface *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  arg2 = (switch_directory_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  switch_directory_interface *result = 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  result = (switch_directory_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directory_interface() {
-  void * jresult ;
-  switch_directory_interface *result = 0 ;
-  
-  result = (switch_directory_interface *)new switch_directory_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_interface(void * jarg1) {
-  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
-  
-  arg1 = (switch_directory_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_directory_interface_set(void * jarg1, void * jarg2) {
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  switch_directory_interface_t *arg2 = (switch_directory_interface_t *) 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  arg2 = (switch_directory_interface_t *)jarg2; 
-  if (arg1) (arg1)->directory_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_directory_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  switch_directory_interface_t *result = 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  result = (switch_directory_interface_t *) ((arg1)->directory_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_directory_handle_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_private_info_set(void * jarg1, void * jarg2) {
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directory_handle() {
-  void * jresult ;
-  switch_directory_handle *result = 0 ;
-  
-  result = (switch_directory_handle *)new switch_directory_handle();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_handle(void * jarg1) {
-  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
-  
-  arg1 = (switch_directory_handle *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_settings_unused_set(void * jarg1, int jarg2) {
-  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_settings *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->unused = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_settings_unused_get(void * jarg1) {
-  int jresult ;
-  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_settings *)jarg1; 
-  result = (int) ((arg1)->unused);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_settings() {
-  void * jresult ;
-  switch_codec_settings *result = 0 ;
-  
-  result = (switch_codec_settings *)new switch_codec_settings();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_settings(void * jarg1) {
-  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
-  
-  arg1 = (switch_codec_settings *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_actual_samples_per_second_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->actual_samples_per_second = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_fmtp_actual_samples_per_second_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  result = (uint32_t) ((arg1)->actual_samples_per_second);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_bits_per_second_set(void * jarg1, int jarg2) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->bits_per_second = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_bits_per_second_get(void * jarg1) {
-  int jresult ;
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  result = (int) ((arg1)->bits_per_second);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_set(void * jarg1, int jarg2) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->microseconds_per_packet = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_get(void * jarg1) {
-  int jresult ;
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  result = (int) ((arg1)->microseconds_per_packet);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_set(void * jarg1, int jarg2) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->stereo = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_get(void * jarg1) {
-  int jresult ;
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  result = (int) ((arg1)->stereo);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_set(void * jarg1, void * jarg2) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_fmtp() {
-  void * jresult ;
-  switch_codec_fmtp *result = 0 ;
-  
-  result = (switch_codec_fmtp *)new switch_codec_fmtp();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_fmtp(void * jarg1) {
-  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
-  
-  arg1 = (switch_codec_fmtp *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_codec_interface_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_codec_interface_t *)jarg2; 
-  if (arg1) (arg1)->codec_interface = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_codec_interface_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec_interface_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_codec_interface_t *) ((arg1)->codec_interface);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  if (arg1) (arg1)->implementation = (switch_codec_implementation_t const *)arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec_implementation_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_codec_implementation_t *) ((arg1)->implementation);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_in_set(void * jarg1, char * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->fmtp_in) delete [] arg1->fmtp_in;
-    if (arg2) {
-      arg1->fmtp_in = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->fmtp_in, (const char *)arg2);
-    } else {
-      arg1->fmtp_in = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_fmtp_in_get(void * jarg1) {
-  char * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (char *) ((arg1)->fmtp_in);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_out_set(void * jarg1, char * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->fmtp_out) delete [] arg1->fmtp_out;
-    if (arg2) {
-      arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->fmtp_out, (const char *)arg2);
-    } else {
-      arg1->fmtp_out = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_fmtp_out_get(void * jarg1) {
-  char * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (char *) ((arg1)->fmtp_out);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_memory_pool_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  if (arg1) (arg1)->memory_pool = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_memory_pool_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_memory_pool_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_private_info_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->private_info = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_private_info_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (void *) ((arg1)->private_info);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_agreed_pt_set(void * jarg1, unsigned char jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->agreed_pt = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_agreed_pt_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_payload_t) ((arg1)->agreed_pt);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_mutex_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->mutex = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_mutex_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->mutex);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_next_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec *arg2 = (switch_codec *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_codec *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_next_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_codec *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_codec *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_session_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  if (arg1) (arg1)->session = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_session_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_core_session_t *) ((arg1)->session);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_cur_frame_set(void * jarg1, void * jarg2) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  if (arg1) (arg1)->cur_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_cur_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  result = (switch_frame_t *) ((arg1)->cur_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec() {
-  void * jresult ;
-  switch_codec *result = 0 ;
-  
-  result = (switch_codec *)new switch_codec();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec(void * jarg1) {
-  switch_codec *arg1 = (switch_codec *) 0 ;
-  
-  arg1 = (switch_codec *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_type_set(void * jarg1, int jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_codec_type_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_codec_type_t)jarg2; 
-  if (arg1) (arg1)->codec_type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_codec_type_get(void * jarg1) {
-  int jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_codec_type_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_codec_type_t) ((arg1)->codec_type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_ianacode_set(void * jarg1, unsigned char jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  if (arg1) (arg1)->ianacode = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_implementation_ianacode_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_payload_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_payload_t) ((arg1)->ianacode);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_iananame_set(void * jarg1, char * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->iananame) delete [] arg1->iananame;
-    if (arg2) {
-      arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->iananame, (const char *)arg2);
-    } else {
-      arg1->iananame = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_implementation_iananame_get(void * jarg1) {
-  char * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (char *) ((arg1)->iananame);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_fmtp_set(void * jarg1, char * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->fmtp) delete [] arg1->fmtp;
-    if (arg2) {
-      arg1->fmtp = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->fmtp, (const char *)arg2);
-    } else {
-      arg1->fmtp = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_implementation_fmtp_get(void * jarg1) {
-  char * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (char *) ((arg1)->fmtp);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_second_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samples_per_second = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_second_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->samples_per_second);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_actual_samples_per_second_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->actual_samples_per_second = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_actual_samples_per_second_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->actual_samples_per_second);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_bits_per_second_set(void * jarg1, int jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->bits_per_second = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_bits_per_second_get(void * jarg1) {
-  int jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (int) ((arg1)->bits_per_second);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_set(void * jarg1, int jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->microseconds_per_packet = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_get(void * jarg1) {
-  int jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (int) ((arg1)->microseconds_per_packet);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->samples_per_packet = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->samples_per_packet);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->decoded_bytes_per_packet = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->decoded_bytes_per_packet);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->encoded_bytes_per_packet = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->encoded_bytes_per_packet);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_number_of_channels_set(void * jarg1, unsigned char jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->number_of_channels = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_implementation_number_of_channels_get(void * jarg1) {
-  unsigned char jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint8_t) ((arg1)->number_of_channels);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_set(void * jarg1, int jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->codec_frames_per_packet = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_get(void * jarg1) {
-  int jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (int) ((arg1)->codec_frames_per_packet);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_init_set(void * jarg1, void * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_init_func_t arg2 = (switch_core_codec_init_func_t) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_core_codec_init_func_t)jarg2; 
-  if (arg1) (arg1)->init = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_init_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_init_func_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_core_codec_init_func_t) ((arg1)->init);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encode_set(void * jarg1, void * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_encode_func_t arg2 = (switch_core_codec_encode_func_t) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_core_codec_encode_func_t)jarg2; 
-  if (arg1) (arg1)->encode = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_encode_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_encode_func_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_core_codec_encode_func_t) ((arg1)->encode);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decode_set(void * jarg1, void * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_decode_func_t arg2 = (switch_core_codec_decode_func_t) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_core_codec_decode_func_t)jarg2; 
-  if (arg1) (arg1)->decode = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_decode_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_decode_func_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_core_codec_decode_func_t) ((arg1)->decode);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_destroy_set(void * jarg1, void * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_destroy_func_t arg2 = (switch_core_codec_destroy_func_t) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_core_codec_destroy_func_t)jarg2; 
-  if (arg1) (arg1)->destroy = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_destroy_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_core_codec_destroy_func_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_core_codec_destroy_func_t) ((arg1)->destroy);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_id_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->codec_id = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_codec_id_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->codec_id);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_impl_id_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->impl_id = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_impl_id_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (uint32_t) ((arg1)->impl_id);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_next_set(void * jarg1, void * jarg2) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_codec_implementation *arg2 = (switch_codec_implementation *) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  arg2 = (switch_codec_implementation *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_next_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  switch_codec_implementation *result = 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  result = (switch_codec_implementation *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_implementation() {
-  void * jresult ;
-  switch_codec_implementation *result = 0 ;
-  
-  result = (switch_codec_implementation *)new switch_codec_implementation();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_implementation(void * jarg1) {
-  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
-  
-  arg1 = (switch_codec_implementation *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_implementations_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_codec_implementation_t *)jarg2; 
-  if (arg1) (arg1)->implementations = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_implementations_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_codec_implementation_t *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_codec_implementation_t *) ((arg1)->implementations);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parse_fmtp_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_core_codec_fmtp_parse_func_t arg2 = (switch_core_codec_fmtp_parse_func_t) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_core_codec_fmtp_parse_func_t)jarg2; 
-  if (arg1) (arg1)->parse_fmtp = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_parse_fmtp_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_core_codec_fmtp_parse_func_t result;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_core_codec_fmtp_parse_func_t) ((arg1)->parse_fmtp);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_codec_id_set(void * jarg1, unsigned long jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->codec_id = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_interface_codec_id_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (uint32_t) ((arg1)->codec_id);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_refs_set(void * jarg1, int jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_next_set(void * jarg1, void * jarg2) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_codec_interface *arg2 = (switch_codec_interface *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  arg2 = (switch_codec_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  switch_codec_interface *result = 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  result = (switch_codec_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_interface() {
-  void * jresult ;
-  switch_codec_interface *result = 0 ;
-  
-  result = (switch_codec_interface *)new switch_codec_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_interface(void * jarg1) {
-  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
-  
-  arg1 = (switch_codec_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_application_function_set(void * jarg1, void * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_application_function_t arg2 = (switch_application_function_t) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (switch_application_function_t)jarg2; 
-  if (arg1) (arg1)->application_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_application_function_get(void * jarg1) {
-  void * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_application_function_t result;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (switch_application_function_t) ((arg1)->application_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_long_desc_set(void * jarg1, char * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->long_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->long_desc, (const char *)arg2);
-    } else {
-      arg1->long_desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_long_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (char *) ((arg1)->long_desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_short_desc_set(void * jarg1, char * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->short_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->short_desc, (const char *)arg2);
-    } else {
-      arg1->short_desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_short_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (char *) ((arg1)->short_desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_syntax_set(void * jarg1, char * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->syntax, (const char *)arg2);
-    } else {
-      arg1->syntax = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_syntax_get(void * jarg1) {
-  char * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (char *) ((arg1)->syntax);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_application_interface_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_refs_set(void * jarg1, int jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_application_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_next_set(void * jarg1, void * jarg2) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_application_interface *arg2 = (switch_application_interface *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  arg2 = (switch_application_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  switch_application_interface *result = 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  result = (switch_application_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_application_interface() {
-  void * jresult ;
-  switch_application_interface *result = 0 ;
-  
-  result = (switch_application_interface *)new switch_application_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_application_interface(void * jarg1) {
-  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
-  
-  arg1 = (switch_application_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_chat_application_function_set(void * jarg1, void * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_chat_application_function_t arg2 = (switch_chat_application_function_t) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (switch_chat_application_function_t)jarg2; 
-  if (arg1) (arg1)->chat_application_function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_chat_application_function_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_chat_application_function_t result;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (switch_chat_application_function_t) ((arg1)->chat_application_function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_long_desc_set(void * jarg1, char * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->long_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->long_desc, (const char *)arg2);
-    } else {
-      arg1->long_desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_long_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (char *) ((arg1)->long_desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_short_desc_set(void * jarg1, char * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->short_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->short_desc, (const char *)arg2);
-    } else {
-      arg1->short_desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_short_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (char *) ((arg1)->short_desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_syntax_set(void * jarg1, char * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->syntax, (const char *)arg2);
-    } else {
-      arg1->syntax = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_syntax_get(void * jarg1) {
-  char * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (char *) ((arg1)->syntax);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_chat_application_interface_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_refs_set(void * jarg1, int jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_chat_application_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_next_set(void * jarg1, void * jarg2) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_chat_application_interface *arg2 = (switch_chat_application_interface *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  arg2 = (switch_chat_application_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  switch_chat_application_interface *result = 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  result = (switch_chat_application_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_chat_application_interface() {
-  void * jresult ;
-  switch_chat_application_interface *result = 0 ;
-  
-  result = (switch_chat_application_interface *)new switch_chat_application_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_application_interface(void * jarg1) {
-  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
-  
-  arg1 = (switch_chat_application_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_desc_set(void * jarg1, char * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->desc, (const char *)arg2);
-    } else {
-      arg1->desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (char *) ((arg1)->desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_function_set(void * jarg1, void * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_api_function_t arg2 = (switch_api_function_t) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (switch_api_function_t)jarg2; 
-  if (arg1) (arg1)->function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_function_get(void * jarg1) {
-  void * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_api_function_t result;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (switch_api_function_t) ((arg1)->function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_syntax_set(void * jarg1, char * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->syntax, (const char *)arg2);
-    } else {
-      arg1->syntax = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_syntax_get(void * jarg1) {
-  char * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (char *) ((arg1)->syntax);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_refs_set(void * jarg1, int jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_api_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_next_set(void * jarg1, void * jarg2) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_api_interface *arg2 = (switch_api_interface *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  arg2 = (switch_api_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  switch_api_interface *result = 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  result = (switch_api_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_api_interface() {
-  void * jresult ;
-  switch_api_interface *result = 0 ;
-  
-  result = (switch_api_interface *)new switch_api_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_api_interface(void * jarg1) {
-  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
-  
-  arg1 = (switch_api_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_interface_name_set(void * jarg1, char * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->interface_name, (const char *)arg2);
-    } else {
-      arg1->interface_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_interface_name_get(void * jarg1) {
-  char * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (char *) ((arg1)->interface_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_desc_set(void * jarg1, char * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->desc = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->desc, (const char *)arg2);
-    } else {
-      arg1->desc = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_desc_get(void * jarg1) {
-  char * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (char *) ((arg1)->desc);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_function_set(void * jarg1, void * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_json_api_function_t arg2 = (switch_json_api_function_t) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (switch_json_api_function_t)jarg2; 
-  if (arg1) (arg1)->function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_function_get(void * jarg1) {
-  void * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_json_api_function_t result;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (switch_json_api_function_t) ((arg1)->function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_syntax_set(void * jarg1, char * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg2) {
-      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->syntax, (const char *)arg2);
-    } else {
-      arg1->syntax = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_syntax_get(void * jarg1) {
-  char * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (char *) ((arg1)->syntax);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_rwlock_set(void * jarg1, void * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (switch_thread_rwlock_t *)jarg2; 
-  if (arg1) (arg1)->rwlock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_rwlock_get(void * jarg1) {
-  void * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_thread_rwlock_t *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_refs_set(void * jarg1, int jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_json_api_interface_refs_get(void * jarg1) {
-  int jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  int result;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (int) ((arg1)->refs);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_reflock_set(void * jarg1, void * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->reflock = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_reflock_get(void * jarg1) {
-  void * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->reflock);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_parent_set(void * jarg1, void * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (switch_loadable_module_interface_t *)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_loadable_module_interface_t *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_next_set(void * jarg1, void * jarg2) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_json_api_interface *arg2 = (switch_json_api_interface *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  arg2 = (switch_json_api_interface *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_next_get(void * jarg1) {
-  void * jresult ;
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  switch_json_api_interface *result = 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  result = (switch_json_api_interface *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_json_api_interface() {
-  void * jresult ;
-  switch_json_api_interface *result = 0 ;
-  
-  result = (switch_json_api_interface *)new switch_json_api_interface();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_json_api_interface(void * jarg1) {
-  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
-  
-  arg1 = (switch_json_api_interface *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_session_set(void * jarg1, void * jarg2) {
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  if (arg1) (arg1)->session = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_session_get(void * jarg1) {
-  void * jresult ;
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  result = (switch_core_session_t *) ((arg1)->session);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_write_frame_set(void * jarg1, void * jarg2) {
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  if (arg1) (arg1)->write_frame = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  result = (switch_frame_t *)& ((arg1)->write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_codec_set(void * jarg1, void * jarg2) {
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  if (arg1) (arg1)->codec = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_codec_get(void * jarg1) {
-  void * jresult ;
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  result = (switch_codec_t *)& ((arg1)->codec);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_frame_data_set(void * jarg1, char * jarg2) {
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->frame_data, (const char *)arg2, 8192-1);
-      arg1->frame_data[8192-1] = 0;
-    } else {
-      arg1->frame_data[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_slin_data_frame_data_get(void * jarg1) {
-  char * jresult ;
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  result = (char *)(char *) ((arg1)->frame_data);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_slin_data() {
-  void * jresult ;
-  switch_slin_data *result = 0 ;
-  
-  result = (switch_slin_data *)new switch_slin_data();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_slin_data(void * jarg1) {
-  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
-  
-  arg1 = (switch_slin_data *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->profile_created = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->profile_created);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_created_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->created = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_created_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->created);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_answered_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->answered = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_answered_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->answered);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->progress = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->progress);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->progress_media = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->progress_media);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hungup_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->hungup = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hungup_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->hungup);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_transferred_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->transferred = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_transferred_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->transferred);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->resurrected = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->resurrected);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_bridged_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->bridged = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_bridged_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->bridged);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->last_hold = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->last_hold);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->hold_accum = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result =  ((arg1)->hold_accum);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_next_set(void * jarg1, void * jarg2) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  arg2 = (switch_channel_timetable *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_next_get(void * jarg1) {
-  void * jresult ;
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  switch_channel_timetable *result = 0 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  result = (switch_channel_timetable *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_channel_timetable() {
-  void * jresult ;
-  switch_channel_timetable *result = 0 ;
-  
-  result = (switch_channel_timetable *)new switch_channel_timetable();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_channel_timetable(void * jarg1) {
-  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
-  
-  arg1 = (switch_channel_timetable *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_state(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_state_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_channel_state_t)switch_channel_get_state(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_running_state(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_state_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_channel_state_t)switch_channel_get_running_state(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_check_signal(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_bool_t arg2 ;
-  int result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (int)switch_channel_check_signal(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_ready(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_bool_t arg3 ;
-  int result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (int)switch_channel_test_ready(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state(void * jarg1, void * jarg2, int jarg3) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  switch_channel_state_t arg3 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (switch_channel_state_t)jarg3; 
-  switch_channel_wait_for_state(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state_timeout(void * jarg1, int jarg2, unsigned long jarg3) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_state_t arg2 ;
-  uint32_t arg3 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_state_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  switch_channel_wait_for_state_timeout(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, int jarg2, int jarg3, unsigned long jarg4, void * jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  switch_bool_t arg3 ;
-  uint32_t arg4 ;
-  switch_channel_t *arg5 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (switch_channel_t *)jarg5; 
-  result = (switch_status_t)switch_channel_wait_for_flag(arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_set_state(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_channel_state_t arg5 ;
-  switch_channel_state_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_channel_state_t)jarg5; 
-  result = (switch_channel_state_t)switch_channel_perform_set_state(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_set_running_state(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_state_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_channel_state_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_state_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_channel_state_t)switch_channel_perform_set_running_state(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_str2cause(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_call_cause_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_call_cause_t)switch_channel_str2cause((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_cause(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_cause_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_call_cause_t)switch_channel_get_cause(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_cause_q850(int jarg1) {
-  int jresult ;
-  switch_call_cause_t arg1 ;
-  switch_call_cause_t result;
-  
-  arg1 = (switch_call_cause_t)jarg1; 
-  result = (switch_call_cause_t)switch_channel_cause_q850(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_cause_q850(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_cause_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_call_cause_t)switch_channel_get_cause_q850(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_cause_ptr(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_cause_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_call_cause_t *)switch_channel_get_cause_ptr(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_cause2str(int jarg1) {
-  char * jresult ;
-  switch_call_cause_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_call_cause_t)jarg1; 
-  result = (char *)switch_channel_cause2str(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_timetable(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_timetable_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_channel_timetable_t *)switch_channel_get_timetable(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_alloc(void * jarg1, int jarg2, void * jarg3) {
-  int jresult ;
-  switch_channel_t **arg1 = (switch_channel_t **) 0 ;
-  switch_call_direction_t arg2 ;
-  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t **)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  arg3 = (switch_memory_pool_t *)jarg3; 
-  result = (switch_status_t)switch_channel_alloc(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_init(void * jarg1, void * jarg2, int jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_channel_state_t arg3 ;
-  switch_channel_flag_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (switch_channel_state_t)jarg3; 
-  arg4 = (switch_channel_flag_t)jarg4; 
-  result = (switch_status_t)switch_channel_init(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_presence_data_vals(void * jarg1, char * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  switch_channel_set_presence_data_vals(arg1,(char const *)arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_presence(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, int jarg7) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  int arg7 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (int)jarg7; 
-  switch_channel_perform_presence(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,arg7);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_uninit(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_uninit(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_caller_profile(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  switch_channel_set_caller_profile(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_step_caller_profile(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_step_caller_profile(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_caller_profile(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_profile_t *)switch_channel_get_caller_profile(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_originator_caller_profile(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  switch_channel_set_originator_caller_profile(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_hunt_caller_profile(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  switch_channel_set_hunt_caller_profile(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_originator_caller_profile(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_profile_t *)switch_channel_get_originator_caller_profile(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_originatee_caller_profile(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  switch_channel_set_originatee_caller_profile(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_originatee_caller_profile(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_profile_t *)switch_channel_get_originatee_caller_profile(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_origination_caller_profile(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  switch_channel_set_origination_caller_profile(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_origination_caller_profile(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_profile_t *)switch_channel_get_origination_caller_profile(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_uuid(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_uuid(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_profile_var(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_channel_set_profile_var(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_channel_set_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_add_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t arg4 ;
-  switch_stack_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  arg5 = (switch_stack_t)jarg5; 
-  result = (switch_status_t)switch_channel_add_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_printf(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *arg4 = 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_channel_set_variable_printf(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_name_printf(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *arg4 = 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_channel_set_variable_name_printf(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_partner_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_channel_set_variable_partner_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_partner(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_channel_get_variable_partner(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_hold_music(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_hold_music(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_hold_music_partner(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_hold_music_partner(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_del_variable_prefix(void * jarg1, char * jarg2) {
-  unsigned long jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (uint32_t)switch_channel_del_variable_prefix(arg1,(char const *)arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_transfer_variable_prefix(void * jarg1, void * jarg2, char * jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_channel_transfer_variable_prefix(arg1,arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_bool_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_bool_t)jarg5; 
-  result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_export(void * jarg1, void * jarg2, void * jarg3, char * jarg4) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  char *arg4 = (char *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  arg4 = (char *)jarg4; 
-  switch_channel_process_export(arg1,arg2,arg3,(char const *)arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_printf(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  void *arg5 = 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_channel_export_variable_printf(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_scope_variables(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  switch_channel_set_scope_variables(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_scope_variables(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_channel_get_scope_variables(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3, int jarg4) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  int arg4 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (char *)switch_channel_get_variable_dup(arg1,(char const *)arg2,arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_variables(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t **arg2 = (switch_event_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t **)jarg2; 
-  result = (switch_status_t)switch_channel_get_variables(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_pass_callee_id(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  result = (switch_status_t)switch_channel_pass_callee_id(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_variable_first(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_header_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_event_header_t *)switch_channel_variable_first(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_variable_last(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_variable_last(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_restart(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_restart(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_caller_extension_masquerade(void * jarg1, void * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_channel_caller_extension_masquerade(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_caller_extension(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_extension_t *)jarg2; 
-  switch_channel_set_caller_extension(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_invert_cid(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_invert_cid(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_flip_cid(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_flip_cid(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_sort_cid(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_sort_cid(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_caller_extension(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_extension_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_extension_t *)switch_channel_get_caller_extension(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag(void * jarg1, int jarg2) {
-  unsigned long jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  result = (uint32_t)switch_channel_test_flag(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_flag_value(void * jarg1, int jarg2, unsigned long jarg3) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  uint32_t arg3 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  switch_channel_set_flag_value(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_flag_recursive(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  switch_channel_set_flag_recursive(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_cap_value(void * jarg1, int jarg2, unsigned long jarg3) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_cap_t arg2 ;
-  uint32_t arg3 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_cap_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  switch_channel_set_cap_value(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_cap(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_cap_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_cap_t)jarg2; 
-  switch_channel_clear_cap(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_cap(void * jarg1, int jarg2) {
-  unsigned long jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_cap_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_cap_t)jarg2; 
-  result = (uint32_t)switch_channel_test_cap(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_cap_partner(void * jarg1, int jarg2) {
-  unsigned long jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_cap_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_cap_t)jarg2; 
-  result = (uint32_t)switch_channel_test_cap_partner(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_flag_partner(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  result = (switch_bool_t)switch_channel_set_flag_partner(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_clear_flag_partner(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  result = (switch_bool_t)switch_channel_clear_flag_partner(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag_partner(void * jarg1, int jarg2) {
-  unsigned long jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  result = (uint32_t)switch_channel_test_flag_partner(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_state_flag(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  switch_channel_set_state_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_state_flag(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  switch_channel_clear_state_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_flag(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  switch_channel_clear_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_flag_recursive(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_flag_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_flag_t)jarg2; 
-  switch_channel_clear_flag_recursive(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_answer(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_channel_perform_answer(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_answered(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_channel_perform_mark_answered(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_check_zrtp(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_check_zrtp(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_ring_ready_value(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_ring_ready_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_ring_ready_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)switch_channel_perform_ring_ready_value(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_pre_answer(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_channel_perform_pre_answer(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_pre_answered(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_channel_perform_mark_pre_answered(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_ring_ready_value(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_ring_ready_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_ring_ready_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (switch_status_t)switch_channel_perform_mark_ring_ready_value(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_add_state_handler(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_state_handler_table_t *)jarg2; 
-  result = (int)switch_channel_add_state_handler(arg1,(switch_state_handler_table const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_state_handler(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_state_handler_table_t *)jarg2; 
-  switch_channel_clear_state_handler(arg1,(switch_state_handler_table const *)arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_state_handler(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  int arg2 ;
-  switch_state_handler_table_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (switch_state_handler_table_t *)switch_channel_get_state_handler(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_private(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  result = (switch_status_t)switch_channel_set_private(arg1,(char const *)arg2,(void const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_private(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (void *)switch_channel_get_private(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_private_partner(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (void *)switch_channel_get_private_partner(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_name(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_channel_set_name(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_name(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_hangup(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_call_cause_t arg5 ;
-  switch_channel_state_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_call_cause_t)jarg5; 
-  result = (switch_channel_state_t)switch_channel_perform_hangup(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_has_dtmf(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = switch_channel_has_dtmf(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dtmf_lock(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_status_t)switch_channel_dtmf_lock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_try_dtmf_lock(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_status_t)switch_channel_try_dtmf_lock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dtmf_unlock(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_status_t)switch_channel_dtmf_unlock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_queue_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_channel_queue_dtmf(arg1,(switch_dtmf_t const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_queue_dtmf_string(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_channel_queue_dtmf_string(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_channel_dequeue_dtmf(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_flush_dtmf(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_flush_dtmf(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf_string(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_channel_dequeue_dtmf_string(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_state_name(int jarg1) {
-  char * jresult ;
-  switch_channel_state_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_state_t)jarg1; 
-  result = (char *)switch_channel_state_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_name_state(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_channel_state_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_channel_state_t)switch_channel_name_state((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_data(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  switch_channel_event_set_data(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_basic_data(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  switch_channel_event_set_basic_data(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_extended_data(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  switch_channel_event_set_extended_data(arg1,arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_expand_variables_check(void * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  switch_event_t *arg4 = (switch_event_t *) 0 ;
-  uint32_t arg5 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  arg4 = (switch_event_t *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  result = (char *)switch_channel_expand_variables_check(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_build_param_string(void * jarg1, void * jarg2, char * jarg3) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (char *)switch_channel_build_param_string(arg1,arg2,(char const *)arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_timestamps(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_status_t)switch_channel_set_timestamps(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_audio_sync(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  switch_channel_perform_audio_sync(arg1,(char const *)arg2,(char const *)arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_private_flag(void * jarg1, unsigned long jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_channel_set_private_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_private_flag(void * jarg1, unsigned long jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_channel_clear_private_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_private_flag(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  uint32_t arg2 ;
-  int result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (int)switch_channel_test_private_flag(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
-  char *arg1 = (char *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  uint32_t arg3 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  switch_channel_set_app_flag_key((char const *)arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
-  char *arg1 = (char *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  uint32_t arg3 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  switch_channel_clear_app_flag_key((char const *)arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  uint32_t arg3 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (int)switch_channel_test_app_flag_key((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_bridge_time(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_set_bridge_time(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_hangup_time(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_set_hangup_time(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_direction(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_call_direction_t)switch_channel_direction(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_logical_direction(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_direction_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_call_direction_t)switch_channel_logical_direction(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_direction(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_direction_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_call_direction_t)jarg2; 
-  switch_channel_set_direction(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_session(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_core_session_t *)switch_channel_get_session(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_flag_string(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_flag_string(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_cap_string(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_cap_string(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_state_change_pending(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (int)switch_channel_state_change_pending(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_set_callstate(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_callstate_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_channel_callstate_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  switch_channel_perform_set_callstate(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_callstate(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_channel_callstate_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_channel_callstate_t)switch_channel_get_callstate(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_callstate2str(int jarg1) {
-  char * jresult ;
-  switch_channel_callstate_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_callstate_t)jarg1; 
-  result = (char *)switch_channel_callstate2str(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_str2callstate(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_channel_callstate_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_channel_callstate_t)switch_channel_str2callstate((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_mark_hold(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  switch_channel_mark_hold(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_execute_on(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_channel_execute_on(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_api_on(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_channel_api_on(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_device_hangup(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_process_device_hangup(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_queued_extension(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_extension_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_caller_extension_t *)switch_channel_get_queued_extension(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_transfer_to_extension(void * jarg1, void * jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_caller_extension_t *)jarg2; 
-  switch_channel_transfer_to_extension(arg1,arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_partner_uuid(void * jarg1) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (char *)switch_channel_get_partner_uuid(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_hold_record(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_hold_record_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_hold_record_t *)switch_channel_get_hold_record(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_state_thread_lock(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_state_thread_lock(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_state_thread_unlock(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_state_thread_unlock(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_state_thread_trylock(void * jarg1) {
-  int jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_status_t)switch_channel_state_thread_trylock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_handle_cause(void * jarg1, int jarg2) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_call_cause_t arg2 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_call_cause_t)jarg2; 
-  switch_channel_handle_cause(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_global_init(void * jarg1) {
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  switch_channel_global_init(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_global_uninit() {
-  switch_channel_global_uninit();
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_set_device_id(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_channel_set_device_id(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_device_record(void * jarg1) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  switch_channel_clear_device_record(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_device_record(void * jarg1) {
-  void * jresult ;
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_device_record_t *result = 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  result = (switch_device_record_t *)switch_channel_get_device_record(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_release_device_record(void * jarg1) {
-  switch_device_record_t **arg1 = (switch_device_record_t **) 0 ;
-  
-  arg1 = (switch_device_record_t **)jarg1; 
-  switch_channel_release_device_record(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_bind_device_state_handler(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_device_state_function_t arg1 = (switch_device_state_function_t) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_device_state_function_t)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (switch_status_t)switch_channel_bind_device_state_handler(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_unbind_device_state_handler(void * jarg1) {
-  int jresult ;
-  switch_device_state_function_t arg1 = (switch_device_state_function_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_device_state_function_t)jarg1; 
-  result = (switch_status_t)switch_channel_unbind_device_state_handler(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_device_state2str(int jarg1) {
-  char * jresult ;
-  switch_device_state_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_device_state_t)jarg1; 
-  result = (char *)switch_channel_device_state2str(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_buffer_t **arg2 = (switch_buffer_t **) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (switch_buffer_t **)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_status_t)switch_buffer_create(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create_dynamic(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_buffer_t **arg1 = (switch_buffer_t **) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t arg3 ;
-  switch_size_t arg4 ;
-  switch_size_t *argp2 ;
-  switch_size_t *argp3 ;
-  switch_size_t *argp4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_buffer_t **)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (switch_status_t)switch_buffer_create_dynamic(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_add_mutex(void * jarg1, void * jarg2) {
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  switch_buffer_add_mutex(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_lock(void * jarg1) {
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  switch_buffer_lock(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_trylock(void * jarg1) {
-  int jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  result = (switch_status_t)switch_buffer_trylock(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_unlock(void * jarg1) {
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  switch_buffer_unlock(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_len(void * jarg1) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  result = switch_buffer_len(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_freespace(void * jarg1) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  result = switch_buffer_freespace(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_inuse(void * jarg1) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  result = switch_buffer_inuse(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_read(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_peek(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek_zerocopy(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void **arg2 = (void **) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void **)jarg2; 
-  result = switch_buffer_peek_zerocopy(arg1,(void const **)arg2);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read_loop(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_read_loop(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_set_loops(void * jarg1, int jarg2) {
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  int32_t arg2 ;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (int32_t)jarg2; 
-  switch_buffer_set_loops(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_write(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_write(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_toss(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  result = switch_buffer_toss(arg1,arg2);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_zero(void * jarg1) {
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  switch_buffer_zero(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_slide_write(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_slide_write(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_destroy(void * jarg1) {
-  switch_buffer_t **arg1 = (switch_buffer_t **) 0 ;
-  
-  arg1 = (switch_buffer_t **)jarg1; 
-  switch_buffer_destroy(arg1);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_zwrite(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (switch_buffer_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_buffer_zwrite(arg1,(void const *)arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_name_set(void * jarg1, char * jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_header_name_get(void * jarg1) {
-  char * jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_value_set(void * jarg1, char * jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->value) delete [] arg1->value;
-    if (arg2) {
-      arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->value, (const char *)arg2);
-    } else {
-      arg1->value = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_header_value_get(void * jarg1) {
-  char * jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (char *) ((arg1)->value);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_array_set(void * jarg1, void * jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char **arg2 = (char **) 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (char **)jarg2; 
-  if (arg1) (arg1)->array = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_header_array_get(void * jarg1) {
-  void * jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  char **result = 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (char **) ((arg1)->array);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_idx_set(void * jarg1, int jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->idx = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_header_idx_get(void * jarg1) {
-  int jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  int result;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (int) ((arg1)->idx);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_hash_set(void * jarg1, unsigned long jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->hash = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_header_hash_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  unsigned long result;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (unsigned long) ((arg1)->hash);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_next_set(void * jarg1, void * jarg2) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  switch_event_header *arg2 = (switch_event_header *) 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  arg2 = (switch_event_header *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_header_next_get(void * jarg1) {
-  void * jresult ;
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  switch_event_header *result = 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  result = (switch_event_header *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_event_header() {
-  void * jresult ;
-  switch_event_header *result = 0 ;
-  
-  result = (switch_event_header *)new switch_event_header();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event_header(void * jarg1) {
-  switch_event_header *arg1 = (switch_event_header *) 0 ;
-  
-  arg1 = (switch_event_header *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_id_set(void * jarg1, int jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_types_t arg2 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (switch_event_types_t)jarg2; 
-  if (arg1) (arg1)->event_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_event_id_get(void * jarg1) {
-  int jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_types_t result;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (switch_event_types_t) ((arg1)->event_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_priority_set(void * jarg1, int jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_priority_t arg2 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (switch_priority_t)jarg2; 
-  if (arg1) (arg1)->priority = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_priority_get(void * jarg1) {
-  int jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_priority_t result;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (switch_priority_t) ((arg1)->priority);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_owner_set(void * jarg1, char * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->owner) delete [] arg1->owner;
-    if (arg2) {
-      arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->owner, (const char *)arg2);
-    } else {
-      arg1->owner = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_owner_get(void * jarg1) {
-  char * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (char *) ((arg1)->owner);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_subclass_name_set(void * jarg1, char * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->subclass_name) delete [] arg1->subclass_name;
-    if (arg2) {
-      arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->subclass_name, (const char *)arg2);
-    } else {
-      arg1->subclass_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_subclass_name_get(void * jarg1) {
-  char * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (char *) ((arg1)->subclass_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_headers_set(void * jarg1, void * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_header_t *arg2 = (switch_event_header_t *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (switch_event_header_t *)jarg2; 
-  if (arg1) (arg1)->headers = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_headers_get(void * jarg1) {
-  void * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_header_t *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (switch_event_header_t *) ((arg1)->headers);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_last_header_set(void * jarg1, void * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_header_t *arg2 = (switch_event_header_t *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (switch_event_header_t *)jarg2; 
-  if (arg1) (arg1)->last_header = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_last_header_get(void * jarg1) {
-  void * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event_header_t *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (switch_event_header_t *) ((arg1)->last_header);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_body_set(void * jarg1, char * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->body) delete [] arg1->body;
-    if (arg2) {
-      arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->body, (const char *)arg2);
-    } else {
-      arg1->body = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_body_get(void * jarg1) {
-  char * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (char *) ((arg1)->body);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_bind_user_data_set(void * jarg1, void * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->bind_user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_bind_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (void *) ((arg1)->bind_user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_user_data_set(void * jarg1, void * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->event_user_data = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_event_user_data_get(void * jarg1) {
-  void * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (void *) ((arg1)->event_user_data);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_key_set(void * jarg1, unsigned long jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->key = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_key_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  unsigned long result;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (unsigned long) ((arg1)->key);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_next_set(void * jarg1, void * jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event *arg2 = (switch_event *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (switch_event *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_next_get(void * jarg1) {
-  void * jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  switch_event *result = 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (switch_event *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_flags_set(void * jarg1, int jarg2) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_flags_get(void * jarg1) {
-  int jresult ;
-  switch_event *arg1 = (switch_event *) 0 ;
-  int result;
-  
-  arg1 = (switch_event *)jarg1; 
-  result = (int) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_event() {
-  void * jresult ;
-  switch_event *result = 0 ;
-  
-  result = (switch_event *)new switch_event();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event(void * jarg1) {
-  switch_event *arg1 = (switch_event *) 0 ;
-  
-  arg1 = (switch_event *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_event_id_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->event_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_event_id_get(void * jarg1) {
-  int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (int) ((arg1)->event_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_priority_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->priority = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_priority_get(void * jarg1) {
-  int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (int) ((arg1)->priority);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_flags_set(void * jarg1, int jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_flags_get(void * jarg1) {
-  int jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (int) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_owner_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->owner) delete [] arg1->owner;
-    if (arg2) {
-      arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->owner, (const char *)arg2);
-    } else {
-      arg1->owner = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_owner_get(void * jarg1) {
-  char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (char *) ((arg1)->owner);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->subclass_name) delete [] arg1->subclass_name;
-    if (arg2) {
-      arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->subclass_name, (const char *)arg2);
-    } else {
-      arg1->subclass_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_get(void * jarg1) {
-  char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (char *) ((arg1)->subclass_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_body_set(void * jarg1, char * jarg2) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->body) delete [] arg1->body;
-    if (arg2) {
-      arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->body, (const char *)arg2);
-    } else {
-      arg1->body = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_body_get(void * jarg1) {
-  char * jresult ;
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  result = (char *) ((arg1)->body);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_t() {
-  void * jresult ;
-  switch_serial_event_t *result = 0 ;
-  
-  result = (switch_serial_event_t *)new switch_serial_event_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_t(void * jarg1) {
-  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
-  
-  arg1 = (switch_serial_event_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_name_set(void * jarg1, char * jarg2) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_serial_event_header_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_name_get(void * jarg1) {
-  char * jresult ;
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_serial_event_header_t *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_value_set(void * jarg1, char * jarg2) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_serial_event_header_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->value) delete [] arg1->value;
-    if (arg2) {
-      arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->value, (const char *)arg2);
-    } else {
-      arg1->value = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_value_get(void * jarg1) {
-  char * jresult ;
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_serial_event_header_t *)jarg1; 
-  result = (char *) ((arg1)->value);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_header_t() {
-  void * jresult ;
-  switch_serial_event_header_t *result = 0 ;
-  
-  result = (switch_serial_event_header_t *)new switch_serial_event_header_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_header_t(void * jarg1) {
-  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
-  
-  arg1 = (switch_serial_event_header_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_init(void * jarg1) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  result = (switch_status_t)switch_event_init(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_shutdown() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_event_shutdown();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_subclass_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4, int jarg5, char * jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  switch_event_t **arg4 = (switch_event_t **) 0 ;
-  switch_event_types_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (switch_event_t **)jarg4; 
-  arg5 = (switch_event_types_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  result = (switch_status_t)switch_event_create_subclass_detailed((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_priority(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  switch_priority_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (switch_priority_t)jarg2; 
-  result = (switch_status_t)switch_event_set_priority(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_get_header_ptr(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_header_t *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_event_header_t *)switch_event_get_header_ptr(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_get_header_idx(void * jarg1, char * jarg2, int jarg3) {
-  char * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (char *)switch_event_get_header_idx(arg1,(char const *)arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_rename_header(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_event_rename_header(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_get_body(void * jarg1) {
-  char * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  result = (char *)switch_event_get_body(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_subclass_name(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_event_set_subclass_name(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_add_header_string(void * jarg1, int jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  switch_stack_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (switch_stack_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_event_add_header_string(arg1,arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_del_header_val(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_event_del_header_val(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_add_array(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (int)switch_event_add_array(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_destroy(void * jarg1) {
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  switch_event_destroy(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_dup(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  result = (switch_status_t)switch_event_dup(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_merge(void * jarg1, void * jarg2) {
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  switch_event_merge(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_dup_reply(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  result = (switch_status_t)switch_event_dup_reply(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_fire_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  switch_event_t **arg4 = (switch_event_t **) 0 ;
-  void *arg5 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (switch_event_t **)jarg4; 
-  arg5 = (void *)jarg5; 
-  result = (switch_status_t)switch_event_fire_detailed((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_prep_for_delivery_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  switch_event_t *arg4 = (switch_event_t *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (switch_event_t *)jarg4; 
-  switch_event_prep_for_delivery_detailed((char const *)arg1,(char const *)arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_bind(char * jarg1, int jarg2, char * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_types_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  switch_event_callback_t arg4 = (switch_event_callback_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_types_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_event_callback_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  result = (switch_status_t)switch_event_bind((char const *)arg1,arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_bind_removable(char * jarg1, int jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_types_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  switch_event_callback_t arg4 = (switch_event_callback_t) 0 ;
-  void *arg5 = (void *) 0 ;
-  switch_event_node_t **arg6 = (switch_event_node_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_types_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_event_callback_t)jarg4; 
-  arg5 = (void *)jarg5; 
-  arg6 = (switch_event_node_t **)jarg6; 
-  result = (switch_status_t)switch_event_bind_removable((char const *)arg1,arg2,(char const *)arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_unbind(void * jarg1) {
-  int jresult ;
-  switch_event_node_t **arg1 = (switch_event_node_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_node_t **)jarg1; 
-  result = (switch_status_t)switch_event_unbind(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_unbind_callback(void * jarg1) {
-  int jresult ;
-  switch_event_callback_t arg1 = (switch_event_callback_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_callback_t)jarg1; 
-  result = (switch_status_t)switch_event_unbind_callback(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_name(int jarg1) {
-  char * jresult ;
-  switch_event_types_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_types_t)jarg1; 
-  result = (char *)switch_event_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_name_event(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_types_t *arg2 = (switch_event_types_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_types_t *)jarg2; 
-  result = (switch_status_t)switch_name_event((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_reserve_subclass_detailed(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_event_reserve_subclass_detailed((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_free_subclass_detailed(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_event_free_subclass_detailed((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_binary_deserialize(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  void **arg2 = (void **) 0 ;
-  switch_size_t arg3 ;
-  switch_bool_t arg4 ;
-  switch_size_t *argp3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (void **)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_event_binary_deserialize(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_binary_serialize(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  void **arg2 = (void **) 0 ;
-  switch_size_t *arg3 = (switch_size_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (void **)jarg2; 
-  arg3 = (switch_size_t *)jarg3; 
-  result = (switch_status_t)switch_event_binary_serialize(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_event_serialize(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize_json(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  result = (switch_status_t)switch_event_serialize_json(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize_json_obj(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  cJSON **arg2 = (cJSON **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (cJSON **)jarg2; 
-  result = (switch_status_t)switch_event_serialize_json_obj(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_json(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_event_create_json(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_brackets(char * jarg1, char jarg2, char jarg3, char jarg4, void * jarg5, void * jarg6, int jarg7) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char arg2 ;
-  char arg3 ;
-  char arg4 ;
-  switch_event_t **arg5 = (switch_event_t **) 0 ;
-  char **arg6 = (char **) 0 ;
-  switch_bool_t arg7 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char)jarg2; 
-  arg3 = (char)jarg3; 
-  arg4 = (char)jarg4; 
-  arg5 = (switch_event_t **)jarg5; 
-  arg6 = (char **)jarg6; 
-  arg7 = (switch_bool_t)jarg7; 
-  result = (switch_status_t)switch_event_create_brackets(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_array_pair(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  char **arg2 = (char **) 0 ;
-  char **arg3 = (char **) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (char **)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_event_create_array_pair(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_running() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_event_running();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_body(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_event_set_body(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_expand_headers_check(void * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
-  char * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  switch_event_t *arg4 = (switch_event_t *) 0 ;
-  uint32_t arg5 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  arg4 = (switch_event_t *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  result = (char *)switch_event_expand_headers_check(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_pres_in_detailed(char * jarg1, char * jarg2, int jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, char * jarg12, char * jarg13, char * jarg14, char * jarg15) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) 0 ;
-  int arg11 ;
-  char *arg12 = (char *) 0 ;
-  char *arg13 = (char *) 0 ;
-  char *arg14 = (char *) 0 ;
-  char *arg15 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (int)jarg11; 
-  arg12 = (char *)jarg12; 
-  arg13 = (char *)jarg13; 
-  arg14 = (char *)jarg14; 
-  arg15 = (char *)jarg15; 
-  result = (switch_status_t)switch_event_create_pres_in_detailed(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,(char const *)arg12,(char const *)arg13,(char const *)arg14,(char const *)arg15);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_plain(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  switch_event_types_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (switch_event_types_t)jarg2; 
-  result = (switch_status_t)switch_event_create_plain(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_deliver(void * jarg1) {
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  switch_event_deliver(arg1);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_build_param_string(void * jarg1, char * jarg2, void * jarg3) {
-  char * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_hash_t *arg3 = (switch_hash_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_hash_t *)jarg3; 
-  result = (char *)switch_event_build_param_string(arg1,(char const *)arg2,arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_check_permission_list(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_event_check_permission_list(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_add_presence_data_cols(void * jarg1, void * jarg2, char * jarg3) {
-  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (switch_channel_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  switch_event_add_presence_data_cols(arg1,arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_add_presence_data_cols(void * jarg1, void * jarg2, char * jarg3) {
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  cJSON *arg2 = (cJSON *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (cJSON *)jarg2; 
-  arg3 = (char *)jarg3; 
-  switch_json_add_presence_data_cols(arg1,arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_launch_dispatch_threads(unsigned long jarg1) {
-  uint32_t arg1 ;
-  
-  arg1 = (uint32_t)jarg1; 
-  switch_event_launch_dispatch_threads(arg1);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_channel_broadcast(char * jarg1, void * jarg2, char * jarg3, unsigned long jarg4) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  cJSON **arg2 = (cJSON **) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_event_channel_id_t arg4 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (cJSON **)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_event_channel_id_t)jarg4; 
-  result = (uint32_t)switch_event_channel_broadcast((char const *)arg1,arg2,(char const *)arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_channel_unbind(char * jarg1, void * jarg2) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_channel_func_t arg2 = (switch_event_channel_func_t) 0 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_channel_func_t)jarg2; 
-  result = (uint32_t)switch_event_channel_unbind((char const *)arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_channel_bind(char * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_channel_func_t arg2 = (switch_event_channel_func_t) 0 ;
-  switch_event_channel_id_t *arg3 = (switch_event_channel_id_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_channel_func_t)jarg2; 
-  arg3 = (switch_event_channel_id_t *)jarg3; 
-  result = (switch_status_t)switch_event_channel_bind((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_NO_EVENT_CHANNEL_ID_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(0);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EVENT_CHANNEL_GLOBAL_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("__global__");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_clear(void * jarg1) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  result = (switch_status_t)switch_live_array_clear(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_bootstrap(void * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_channel_id_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_channel_id_t)jarg3; 
-  result = (switch_status_t)switch_live_array_bootstrap(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_destroy(void * jarg1) {
-  int jresult ;
-  switch_live_array_t **arg1 = (switch_live_array_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t **)jarg1; 
-  result = (switch_status_t)switch_live_array_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_create(char * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_event_channel_id_t arg3 ;
-  switch_live_array_t **arg4 = (switch_live_array_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_event_channel_id_t)jarg3; 
-  arg4 = (switch_live_array_t **)jarg4; 
-  result = (switch_status_t)switch_live_array_create((char const *)arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_live_array_get(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  cJSON *result = 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (cJSON *)switch_live_array_get(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_live_array_get_idx(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  int arg2 ;
-  cJSON *result = 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (cJSON *)switch_live_array_get_idx(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_del(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_live_array_del(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_add(void * jarg1, char * jarg2, int jarg3, void * jarg4, int jarg5) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  cJSON **arg4 = (cJSON **) 0 ;
-  switch_bool_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (cJSON **)jarg4; 
-  arg5 = (switch_bool_t)jarg5; 
-  result = (switch_status_t)switch_live_array_add(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_visible(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_live_array_visible(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_isnew(void * jarg1) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  result = (switch_bool_t)switch_live_array_isnew(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_lock(void * jarg1) {
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  switch_live_array_lock(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_unlock(void * jarg1) {
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  switch_live_array_unlock(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_set_user_data(void * jarg1, void * jarg2) {
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  switch_live_array_set_user_data(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_set_command_handler(void * jarg1, void * jarg2) {
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  switch_live_array_command_handler_t arg2 = (switch_live_array_command_handler_t) 0 ;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (switch_live_array_command_handler_t)jarg2; 
-  switch_live_array_set_command_handler(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_parse_json(void * jarg1, unsigned long jarg2) {
-  cJSON *arg1 = (cJSON *) 0 ;
-  switch_event_channel_id_t arg2 ;
-  
-  arg1 = (cJSON *)jarg1; 
-  arg2 = (switch_event_channel_id_t)jarg2; 
-  switch_live_array_parse_json(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_add_alias(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_bool_t)switch_live_array_add_alias(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_clear_alias(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_live_array_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_bool_t)switch_live_array_clear_alias(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_channel_permission_verify(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_bool_t)switch_event_channel_permission_verify((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_channel_permission_modify(char * jarg1, char * jarg2, int jarg3) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  switch_event_channel_permission_modify((char const *)arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_channel_permission_clear(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  switch_event_channel_permission_clear((char const *)arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RESAMPLE_QUALITY_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_resampler_set(void * jarg1, void * jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->resampler = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_audio_resampler_t_resampler_get(void * jarg1) {
-  void * jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (void *) ((arg1)->resampler);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_from_rate_set(void * jarg1, int jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->from_rate = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_from_rate_get(void * jarg1) {
-  int jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (int) ((arg1)->from_rate);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_rate_set(void * jarg1, int jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->to_rate = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_to_rate_get(void * jarg1) {
-  int jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (int) ((arg1)->to_rate);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_factor_set(void * jarg1, double jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->factor = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_audio_resampler_t_factor_get(void * jarg1) {
-  double jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (double) ((arg1)->factor);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_rfactor_set(void * jarg1, double jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  double arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (double)jarg2; 
-  if (arg1) (arg1)->rfactor = arg2;
-}
-
-
-SWIGEXPORT double SWIGSTDCALL CSharp_switch_audio_resampler_t_rfactor_get(void * jarg1) {
-  double jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  double result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (double) ((arg1)->rfactor);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_set(void * jarg1, void * jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int16_t *arg2 = (int16_t *) 0 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (int16_t *)jarg2; 
-  if (arg1) (arg1)->to = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_audio_resampler_t_to_get(void * jarg1) {
-  void * jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int16_t *result = 0 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (int16_t *) ((arg1)->to);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_len_set(void * jarg1, unsigned long jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->to_len = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_audio_resampler_t_to_len_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (uint32_t) ((arg1)->to_len);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_set(void * jarg1, unsigned long jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->to_size = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (uint32_t) ((arg1)->to_size);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_set(void * jarg1, int jarg2) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->channels = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_get(void * jarg1) {
-  int jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  result = (int) ((arg1)->channels);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_audio_resampler_t() {
-  void * jresult ;
-  switch_audio_resampler_t *result = 0 ;
-  
-  result = (switch_audio_resampler_t *)new switch_audio_resampler_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_audio_resampler_t(void * jarg1) {
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_resample_perform_create(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, int jarg5, unsigned long jarg6, char * jarg7, char * jarg8, int jarg9) {
-  int jresult ;
-  switch_audio_resampler_t **arg1 = (switch_audio_resampler_t **) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  int arg5 ;
-  uint32_t arg6 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  int arg9 ;
-  switch_status_t result;
-  
-  arg1 = (switch_audio_resampler_t **)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (int)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (int)jarg9; 
-  result = (switch_status_t)switch_resample_perform_create(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_resample_destroy(void * jarg1) {
-  switch_audio_resampler_t **arg1 = (switch_audio_resampler_t **) 0 ;
-  
-  arg1 = (switch_audio_resampler_t **)jarg1; 
-  switch_resample_destroy(arg1);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_resample_process(void * jarg1, void * jarg2, unsigned long jarg3) {
-  unsigned long jresult ;
-  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
-  int16_t *arg2 = (int16_t *) 0 ;
-  uint32_t arg3 ;
-  uint32_t result;
-  
-  arg1 = (switch_audio_resampler_t *)jarg1; 
-  arg2 = (int16_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (uint32_t)switch_resample_process(arg1,arg2,arg3);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_float_to_short(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  float *arg1 = (float *) 0 ;
-  short *arg2 = (short *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_size_t result;
-  
-  arg1 = (float *)jarg1; 
-  arg2 = (short *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = switch_float_to_short(arg1,arg2,arg3);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_char_to_float(char * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  float *arg2 = (float *) 0 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (float *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_char_to_float(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_float_to_char(void * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  float *arg1 = (float *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (float *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_float_to_char(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_short_to_float(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  short *arg1 = (short *) 0 ;
-  float *arg2 = (float *) 0 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (short *)jarg1; 
-  arg2 = (float *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_short_to_float(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_swap_linear(void * jarg1, int jarg2) {
-  int16_t *arg1 = (int16_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  switch_swap_linear(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_generate_sln_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4) {
-  int16_t *arg1 = (int16_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  switch_generate_sln_silence(arg1,arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_change_sln_volume(void * jarg1, unsigned long jarg2, int jarg3) {
-  int16_t *arg1 = (int16_t *) 0 ;
-  uint32_t arg2 ;
-  int32_t arg3 ;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (int32_t)jarg3; 
-  switch_change_sln_volume(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_change_sln_volume_granular(void * jarg1, unsigned long jarg2, int jarg3) {
-  int16_t *arg1 = (int16_t *) 0 ;
-  uint32_t arg2 ;
-  int32_t arg3 ;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (int32_t)jarg3; 
-  switch_change_sln_volume_granular(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_merge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
-  unsigned long jresult ;
-  int16_t *arg1 = (int16_t *) 0 ;
-  uint32_t arg2 ;
-  int16_t *arg3 = (int16_t *) 0 ;
-  uint32_t arg4 ;
-  uint32_t result;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (int16_t *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  result = (uint32_t)switch_merge_sln(arg1,arg2,arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_unmerge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
-  unsigned long jresult ;
-  int16_t *arg1 = (int16_t *) 0 ;
-  uint32_t arg2 ;
-  int16_t *arg3 = (int16_t *) 0 ;
-  uint32_t arg4 ;
-  uint32_t result;
-  
-  arg1 = (int16_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (int16_t *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  result = (uint32_t)switch_unmerge_sln(arg1,arg2,arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, void * jarg2, unsigned long jarg3, unsigned long jarg4) {
-  int16_t *arg1 = (int16_t *) 0 ;
-  switch_size_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (int16_t *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  switch_mux_channels(arg1,arg2,arg3,arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_session_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  if (arg1) (arg1)->session = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_session_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_core_session_t *) ((arg1)->session);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_read_codec_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_codec_t *)jarg2; 
-  if (arg1) (arg1)->read_codec = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_read_codec_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_codec_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_codec_t *)& ((arg1)->read_codec);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  if (arg1) (arg1)->write_frame = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_frame_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_frame_t *)& ((arg1)->write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_data_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_byte_t *arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_byte_t *)jarg2; 
-  {
-    size_t ii;
-    switch_byte_t *b = (switch_byte_t *) arg1->write_frame_data;
-    for (ii = 0; ii < (size_t)8192; ii++) b[ii] = *((switch_byte_t *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_data_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_byte_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_byte_t *)(switch_byte_t *) ((arg1)->write_frame_data);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_socket_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_socket_t *arg2 = (switch_socket_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_socket_t *)jarg2; 
-  if (arg1) (arg1)->socket = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_socket_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_socket_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_socket_t *) ((arg1)->socket);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_ip_set(void * jarg1, char * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->local_ip) delete [] arg1->local_ip;
-    if (arg2) {
-      arg1->local_ip = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->local_ip, (const char *)arg2);
-    } else {
-      arg1->local_ip = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_unicast_conninfo_local_ip_get(void * jarg1) {
-  char * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (char *) ((arg1)->local_ip);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_port_set(void * jarg1, unsigned short jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  if (arg1) (arg1)->local_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_unicast_conninfo_local_port_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_port_t) ((arg1)->local_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_ip_set(void * jarg1, char * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->remote_ip) delete [] arg1->remote_ip;
-    if (arg2) {
-      arg1->remote_ip = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->remote_ip, (const char *)arg2);
-    } else {
-      arg1->remote_ip = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_ip_get(void * jarg1) {
-  char * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (char *) ((arg1)->remote_ip);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_port_set(void * jarg1, unsigned short jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  if (arg1) (arg1)->remote_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_port_get(void * jarg1) {
-  unsigned short jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_port_t) ((arg1)->remote_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_addr_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_sockaddr_t *)jarg2; 
-  if (arg1) (arg1)->local_addr = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_local_addr_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_sockaddr_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_sockaddr_t *) ((arg1)->local_addr);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_addr_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_sockaddr_t *)jarg2; 
-  if (arg1) (arg1)->remote_addr = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_addr_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_sockaddr_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_sockaddr_t *) ((arg1)->remote_addr);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flag_mutex_set(void * jarg1, void * jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (switch_mutex_t *)jarg2; 
-  if (arg1) (arg1)->flag_mutex = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_flag_mutex_get(void * jarg1) {
-  void * jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  switch_mutex_t *result = 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (switch_mutex_t *) ((arg1)->flag_mutex);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flags_set(void * jarg1, int jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int32_t arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (int32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_flags_get(void * jarg1) {
-  int jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int32_t result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (int32_t) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_type_set(void * jarg1, int jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_type_get(void * jarg1) {
-  int jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (int) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_transport_set(void * jarg1, int jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->transport = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_transport_get(void * jarg1) {
-  int jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (int) ((arg1)->transport);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_set(void * jarg1, int jarg2) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->stream_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_get(void * jarg1) {
-  int jresult ;
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  int result;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  result = (int) ((arg1)->stream_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_unicast_conninfo() {
-  void * jresult ;
-  switch_unicast_conninfo *result = 0 ;
-  
-  result = (switch_unicast_conninfo *)new switch_unicast_conninfo();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_unicast_conninfo(void * jarg1) {
-  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
-  
-  arg1 = (switch_unicast_conninfo *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_deactivate_unicast(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_deactivate_unicast(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_activate_unicast(void * jarg1, char * jarg2, unsigned short jarg3, char * jarg4, unsigned short jarg5, char * jarg6, char * jarg7) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_port_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  switch_port_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_port_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_port_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  result = (switch_status_t)switch_ivr_activate_unicast(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_generate_json_cdr(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  cJSON **arg2 = (cJSON **) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (cJSON **)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_ivr_generate_json_cdr(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_generate_xml_cdr(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_xml_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_generate_xml_cdr(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_xml_profile_data(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_caller_profile_t *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_ivr_set_xml_profile_data(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_xml_chan_vars(void * jarg1, void * jarg2, int jarg3) {
-  int jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)switch_ivr_set_xml_chan_vars(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_parse_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_events(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_parse_all_events(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_next_event(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_parse_next_event(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_messages(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_parse_all_messages(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_signal_data(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_parse_all_signal_data(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_indications(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_message_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_process_indications(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sleep(void * jarg1, unsigned long jarg2, int jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  switch_bool_t arg3 ;
-  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  arg4 = (switch_input_args_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_sleep(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_park(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_input_args_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_park(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_collect_digits_callback(void * jarg1, void * jarg2, unsigned long jarg3, unsigned long jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_input_args_t *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  result = (switch_status_t)switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_collect_digits_count(void * jarg1, char * jarg2, void * jarg3, void * jarg4, char * jarg5, char * jarg6, unsigned long jarg7, unsigned long jarg8, unsigned long jarg9) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t arg4 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  uint32_t arg7 ;
-  uint32_t arg8 ;
-  uint32_t arg9 ;
-  switch_size_t *argp3 ;
-  switch_size_t *argp4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (uint32_t)jarg7; 
-  arg8 = (uint32_t)jarg8; 
-  arg9 = (uint32_t)jarg9; 
-  result = (switch_status_t)switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_and_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, unsigned long jarg6, void * jarg7) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char **arg5 = (char **) 0 ;
-  uint32_t arg6 ;
-  switch_input_args_t *arg7 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char **)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  arg7 = (switch_input_args_t *)jarg7; 
-  result = (switch_status_t)switch_ivr_play_and_detect_speech(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_init(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_asr_handle_t *arg4 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_asr_handle_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_detect_speech_init(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_asr_handle_t *arg6 = (switch_asr_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_asr_handle_t *)jarg6; 
-  result = (switch_status_t)switch_ivr_detect_speech(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_detect_speech(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_stop_detect_speech(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_pause_detect_speech(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_pause_detect_speech(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_resume_detect_speech(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_resume_detect_speech(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_detect_speech_load_grammar(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_unload_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_detect_speech_unload_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_enable_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_detect_speech_enable_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_disable_grammar(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_detect_speech_disable_grammar(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_disable_all_grammars(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_detect_speech_disable_all_grammars(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_param_detect_speech(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_set_param_detect_speech(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_start_input_timers(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_detect_speech_start_input_timers(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_session(void * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  switch_file_handle_t *arg4 = (switch_file_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (switch_file_handle_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_record_session(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_transfer_recordings(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_transfer_recordings(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_pop_eavesdropper(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_eavesdrop_pop_eavesdropper(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_exec_all(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_eavesdrop_exec_all(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_update_display(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_eavesdrop_update_display(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_session(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_eavesdrop_flag_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_eavesdrop_flag_t)jarg4; 
-  result = (switch_status_t)switch_ivr_eavesdrop_session(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_displace_session(void * jarg1, char * jarg2, unsigned long jarg3, char * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  uint32_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_displace_session(arg1,(char const *)arg2,arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_displace_session(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_stop_displace_session(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_record_session(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_stop_record_session(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_audio(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (switch_status_t)switch_ivr_session_audio(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_session_audio(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_stop_session_audio(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_inband_dtmf_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_inband_dtmf_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_inband_dtmf_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_stop_inband_dtmf_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_inband_dtmf_generate_session(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_ivr_inband_dtmf_generate_session(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_inband_dtmf_generate_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_stop_inband_dtmf_generate_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_echo(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_input_args_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_session_echo(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_tone_detect_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_stop_tone_detect_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_tone_detect_session(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6, char * jarg7, char * jarg8, void * jarg9) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  time_t arg5 ;
-  int arg6 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  switch_tone_detect_callback_t arg9 = (switch_tone_detect_callback_t) 0 ;
-  time_t *argp5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  argp5 = (time_t *)jarg5; 
-  if (!argp5) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg5 = *argp5; 
-  arg6 = (int)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (switch_tone_detect_callback_t)jarg9; 
-  result = (switch_status_t)switch_ivr_tone_detect_session(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_file(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_file_handle_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_input_args_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_play_file(arg1,arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_wait_for_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  result = (switch_status_t)switch_ivr_wait_for_silence(arg1,arg2,arg3,arg4,arg5,(char const *)arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_gentones(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int32_t arg3 ;
-  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int32_t)jarg3; 
-  arg4 = (switch_input_args_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_gentones(arg1,(char const *)arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_file(void * jarg1, void * jarg2, char * jarg3, void * jarg4, unsigned long jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
-  uint32_t arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_file_handle_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_input_args_t *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  result = (switch_status_t)switch_ivr_record_file(arg1,arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_play_and_get_digits(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, unsigned long jarg11, char * jarg12, unsigned long jarg13, char * jarg14) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) 0 ;
-  uint32_t arg11 ;
-  char *arg12 = (char *) 0 ;
-  uint32_t arg13 ;
-  char *arg14 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (uint32_t)jarg11; 
-  arg12 = (char *)jarg12; 
-  arg13 = (uint32_t)jarg13; 
-  arg14 = (char *)jarg14; 
-  result = (switch_status_t)switch_play_and_get_digits(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,(char const *)arg12,arg13,(char const *)arg14);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_speak_text_handle(void * jarg1, void * jarg2, void * jarg3, void * jarg4, char * jarg5, void * jarg6) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_speech_handle_t *arg2 = (switch_speech_handle_t *) 0 ;
-  switch_codec_t *arg3 = (switch_codec_t *) 0 ;
-  switch_timer_t *arg4 = (switch_timer_t *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_input_args_t *arg6 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_speech_handle_t *)jarg2; 
-  arg3 = (switch_codec_t *)jarg3; 
-  arg4 = (switch_timer_t *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_input_args_t *)jarg6; 
-  result = (switch_status_t)switch_ivr_speak_text_handle(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_clear_speech_cache(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_ivr_clear_speech_cache(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_speak_text(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_input_args_t *arg5 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_input_args_t *)jarg5; 
-  result = (switch_status_t)switch_ivr_speak_text(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, void * jarg10, unsigned long jarg11, void * jarg12) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
-  switch_call_cause_t *arg3 = (switch_call_cause_t *) 0 ;
-  char *arg4 = (char *) 0 ;
-  uint32_t arg5 ;
-  switch_state_handler_table_t *arg6 = (switch_state_handler_table_t *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  switch_caller_profile_t *arg9 = (switch_caller_profile_t *) 0 ;
-  switch_event_t *arg10 = (switch_event_t *) 0 ;
-  switch_originate_flag_t arg11 ;
-  switch_call_cause_t *arg12 = (switch_call_cause_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t **)jarg2; 
-  arg3 = (switch_call_cause_t *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (switch_state_handler_table_t *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (switch_caller_profile_t *)jarg9; 
-  arg10 = (switch_event_t *)jarg10; 
-  arg11 = (switch_originate_flag_t)jarg11; 
-  arg12 = (switch_call_cause_t *)jarg12; 
-  result = (switch_status_t)switch_ivr_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_enterprise_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, void * jarg10, unsigned long jarg11, void * jarg12) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
-  switch_call_cause_t *arg3 = (switch_call_cause_t *) 0 ;
-  char *arg4 = (char *) 0 ;
-  uint32_t arg5 ;
-  switch_state_handler_table_t *arg6 = (switch_state_handler_table_t *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  switch_caller_profile_t *arg9 = (switch_caller_profile_t *) 0 ;
-  switch_event_t *arg10 = (switch_event_t *) 0 ;
-  switch_originate_flag_t arg11 ;
-  switch_call_cause_t *arg12 = (switch_call_cause_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t **)jarg2; 
-  arg3 = (switch_call_cause_t *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (switch_state_handler_table_t *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (switch_caller_profile_t *)jarg9; 
-  arg10 = (switch_event_t *)jarg10; 
-  arg11 = (switch_originate_flag_t)jarg11; 
-  arg12 = (switch_call_cause_t *)jarg12; 
-  result = (switch_status_t)switch_ivr_enterprise_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_bridge_display(void * jarg1, void * jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  switch_ivr_bridge_display(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_multi_threaded_bridge(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_input_callback_function_t arg3 = (switch_input_callback_function_t) 0 ;
-  void *arg4 = (void *) 0 ;
-  void *arg5 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (switch_input_callback_function_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  arg5 = (void *)jarg5; 
-  result = (switch_status_t)switch_ivr_multi_threaded_bridge(arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_signal_bridge(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_signal_bridge(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_session_transfer(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5) {
-  unsigned long jresult ;
-  time_t arg1 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  time_t *argp1 ;
-  uint32_t result;
-  
-  argp1 = (time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  result = (uint32_t)switch_ivr_schedule_transfer(arg1,(char const *)arg2,arg3,arg4,arg5);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_hangup(void * jarg1, char * jarg2, int jarg3, int jarg4) {
-  unsigned long jresult ;
-  time_t arg1 ;
-  char *arg2 = (char *) 0 ;
-  switch_call_cause_t arg3 ;
-  switch_bool_t arg4 ;
-  time_t *argp1 ;
-  uint32_t result;
-  
-  argp1 = (time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_call_cause_t)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (uint32_t)switch_ivr_schedule_hangup(arg1,(char const *)arg2,arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_bridge(char * jarg1, char * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_uuid_bridge((char const *)arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_media(char * jarg1, unsigned long jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_media_flag_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_media_flag_t)jarg2; 
-  result = (switch_status_t)switch_ivr_media((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_nomedia(char * jarg1, unsigned long jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_media_flag_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_media_flag_t)jarg2; 
-  result = (switch_status_t)switch_ivr_nomedia((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold_uuid(char * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_ivr_hold_uuid((char const *)arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold_toggle_uuid(char * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_ivr_hold_toggle_uuid((char const *)arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unhold_uuid(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_status_t)switch_ivr_unhold_uuid((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold(void * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_ivr_hold(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unhold(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_unhold(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_broadcast(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4) {
-  unsigned long jresult ;
-  time_t arg1 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_media_flag_t arg4 ;
-  time_t *argp1 ;
-  uint32_t result;
-  
-  argp1 = (time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_media_flag_t)jarg4; 
-  result = (uint32_t)switch_ivr_schedule_broadcast(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_broadcast(char * jarg1, char * jarg2, unsigned long jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_media_flag_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_media_flag_t)jarg3; 
-  result = (switch_status_t)switch_ivr_broadcast((char const *)arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_broadcast_in_thread(void * jarg1, char * jarg2, int jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  switch_ivr_broadcast_in_thread(arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_transfer_variable(void * jarg1, void * jarg2, char * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_transfer_variable(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_new(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_ivr_digit_stream_parser_t **arg2 = (switch_ivr_digit_stream_parser_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (switch_ivr_digit_stream_parser_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_digit_stream_parser_new(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_destroy(void * jarg1) {
-  int jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_digit_stream_parser_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_new(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  switch_ivr_digit_stream_t **arg2 = (switch_ivr_digit_stream_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  arg2 = (switch_ivr_digit_stream_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_digit_stream_new(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_destroy(void * jarg1) {
-  int jresult ;
-  switch_ivr_digit_stream_t **arg1 = (switch_ivr_digit_stream_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_t **)jarg1; 
-  result = (switch_status_t)switch_ivr_digit_stream_destroy(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_event(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  result = (switch_status_t)switch_ivr_digit_stream_parser_set_event(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_del_event(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_digit_stream_parser_del_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_feed(void * jarg1, void * jarg2, char jarg3) {
-  void * jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  switch_ivr_digit_stream_t *arg2 = (switch_ivr_digit_stream_t *) 0 ;
-  char arg3 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  arg2 = (switch_ivr_digit_stream_t *)jarg2; 
-  arg3 = (char)jarg3; 
-  result = (void *)switch_ivr_digit_stream_parser_feed(arg1,arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_reset(void * jarg1) {
-  int jresult ;
-  switch_ivr_digit_stream_t *arg1 = (switch_ivr_digit_stream_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_digit_stream_reset(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_terminator(void * jarg1, char jarg2) {
-  int jresult ;
-  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
-  char arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
-  arg2 = (char)jarg2; 
-  result = (switch_status_t)switch_ivr_digit_stream_parser_set_terminator(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, int jarg18, void * jarg19) {
-  int jresult ;
-  switch_ivr_menu_t **arg1 = (switch_ivr_menu_t **) 0 ;
-  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) 0 ;
-  char *arg11 = (char *) 0 ;
-  char *arg12 = (char *) 0 ;
-  int arg13 ;
-  int arg14 ;
-  int arg15 ;
-  int arg16 ;
-  int arg17 ;
-  int arg18 ;
-  switch_memory_pool_t *arg19 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_t **)jarg1; 
-  arg2 = (switch_ivr_menu_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (char *)jarg11; 
-  arg12 = (char *)jarg12; 
-  arg13 = (int)jarg13; 
-  arg14 = (int)jarg14; 
-  arg15 = (int)jarg15; 
-  arg16 = (int)jarg16; 
-  arg17 = (int)jarg17; 
-  arg18 = (int)jarg18; 
-  arg19 = (switch_memory_pool_t *)jarg19; 
-  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_bind_action(void * jarg1, int jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
-  switch_ivr_action_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_t *)jarg1; 
-  arg2 = (switch_ivr_action_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_menu_bind_action(arg1,arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_bind_function(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
-  switch_ivr_menu_action_function_t *arg2 = (switch_ivr_menu_action_function_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_t *)jarg1; 
-  arg2 = (switch_ivr_menu_action_function_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_menu_bind_function(arg1,arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_execute(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *arg4 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_ivr_menu_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (void *)jarg4; 
-  result = (switch_status_t)switch_ivr_menu_execute(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_free(void * jarg1) {
-  int jresult ;
-  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_menu_stack_free(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_build(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_ivr_menu_xml_ctx_t *arg1 = (switch_ivr_menu_xml_ctx_t *) 0 ;
-  switch_ivr_menu_t **arg2 = (switch_ivr_menu_t **) 0 ;
-  switch_xml_t arg3 = (switch_xml_t) 0 ;
-  switch_xml_t arg4 = (switch_xml_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_xml_ctx_t *)jarg1; 
-  arg2 = (switch_ivr_menu_t **)jarg2; 
-  arg3 = (switch_xml_t)jarg3; 
-  arg4 = (switch_xml_t)jarg4; 
-  result = (switch_status_t)switch_ivr_menu_stack_xml_build(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_str2action(char * jarg1, void * jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_ivr_action_t *arg2 = (switch_ivr_action_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_ivr_action_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_menu_str2action((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_add_custom(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_ivr_menu_xml_ctx_t *arg1 = (switch_ivr_menu_xml_ctx_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_ivr_menu_action_function_t *arg3 = (switch_ivr_menu_action_function_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_xml_ctx_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_ivr_menu_action_function_t *)jarg3; 
-  result = (switch_status_t)switch_ivr_menu_stack_xml_add_custom(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_init(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_ivr_menu_xml_ctx_t **arg1 = (switch_ivr_menu_xml_ctx_t **) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_menu_xml_ctx_t **)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_menu_stack_xml_init(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_phrase_macro_event(void * jarg1, char * jarg2, char * jarg3, void * jarg4, char * jarg5, void * jarg6) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_event_t *arg4 = (switch_event_t *) 0 ;
-  char *arg5 = (char *) 0 ;
-  switch_input_args_t *arg6 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_event_t *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (switch_input_args_t *)jarg6; 
-  result = (switch_status_t)switch_ivr_phrase_macro_event(arg1,(char const *)arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_delay_echo(void * jarg1, unsigned long jarg2) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_ivr_delay_echo(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_find_bridged_uuid(char * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_status_t)switch_ivr_find_bridged_uuid((char const *)arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_intercept_session(void * jarg1, char * jarg2, int jarg3) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  switch_ivr_intercept_session(arg1,(char const *)arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_park_session(void * jarg1) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  switch_ivr_park_session(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_wait_for_answer(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  result = (switch_status_t)switch_ivr_wait_for_answer(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_read(void * jarg1, unsigned long jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, void * jarg7, unsigned long jarg8, char * jarg9, unsigned long jarg10) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  switch_size_t arg7 ;
-  uint32_t arg8 ;
-  char *arg9 = (char *) 0 ;
-  uint32_t arg10 ;
-  switch_size_t *argp7 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  argp7 = (switch_size_t *)jarg7; 
-  if (!argp7) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg7 = *argp7; 
-  arg8 = (uint32_t)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (uint32_t)jarg10; 
-  result = (switch_status_t)switch_ivr_read(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8,(char const *)arg9,arg10);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_block_dtmf_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_block_dtmf_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unblock_dtmf_session(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_unblock_dtmf_session(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_bind_dtmf_meta_session(void * jarg1, unsigned long jarg2, unsigned long jarg3, char * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  switch_bind_flag_t arg3 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (switch_bind_flag_t)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_bind_dtmf_meta_session(arg1,arg2,arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unbind_dtmf_meta_session(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  uint32_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (switch_status_t)switch_ivr_unbind_dtmf_meta_session(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_soft_hold(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_status_t)switch_ivr_soft_hold(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, void * jarg7) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  switch_input_args_t *arg7 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (switch_input_args_t *)jarg7; 
-  result = (switch_status_t)switch_ivr_say(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_string(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, void * jarg9) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char **arg9 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char **)jarg9; 
-  result = (switch_status_t)switch_ivr_say_string(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_method_by_name(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_say_method_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_say_method_t)switch_ivr_get_say_method_by_name((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_gender_by_name(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_say_gender_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_say_gender_t)switch_ivr_get_say_gender_by_name((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_type_by_name(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_say_type_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_say_type_t)switch_ivr_get_say_type_by_name((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_spell(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_say_args_t *arg3 = (switch_say_args_t *) 0 ;
-  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_say_args_t *)jarg3; 
-  arg4 = (switch_input_args_t *)jarg4; 
-  result = (switch_status_t)switch_ivr_say_spell(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_ip(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_say_callback_t arg3 = (switch_say_callback_t) 0 ;
-  switch_say_args_t *arg4 = (switch_say_args_t *) 0 ;
-  switch_input_args_t *arg5 = (switch_input_args_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_say_callback_t)jarg3; 
-  arg4 = (switch_say_args_t *)jarg4; 
-  arg5 = (switch_input_args_t *)jarg5; 
-  result = (switch_status_t)switch_ivr_say_ip(arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_set_user(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user_xml(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_xml_t arg5 = (switch_xml_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_xml_t)jarg5; 
-  result = (switch_status_t)switch_ivr_set_user_xml(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sound_test(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_sound_test(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_process_import(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  switch_process_import(arg1,arg2,(char const *)arg3,(char const *)arg4);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_exists(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_ivr_uuid_exists((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_force_exists(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_bool_t)switch_ivr_uuid_force_exists((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_last_ping(void * jarg1) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_dmachine_last_ping(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_name(void * jarg1) {
-  char * jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (char *)switch_ivr_dmachine_get_name(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_match_callback(void * jarg1, void * jarg2) {
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_ivr_dmachine_callback_t arg2 = (switch_ivr_dmachine_callback_t) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (switch_ivr_dmachine_callback_t)jarg2; 
-  switch_ivr_dmachine_set_match_callback(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_nonmatch_callback(void * jarg1, void * jarg2) {
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_ivr_dmachine_callback_t arg2 = (switch_ivr_dmachine_callback_t) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (switch_ivr_dmachine_callback_t)jarg2; 
-  switch_ivr_dmachine_set_nonmatch_callback(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_create(void * jarg1, char * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8) {
-  int jresult ;
-  switch_ivr_dmachine_t **arg1 = (switch_ivr_dmachine_t **) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  switch_ivr_dmachine_callback_t arg6 = (switch_ivr_dmachine_callback_t) 0 ;
-  switch_ivr_dmachine_callback_t arg7 = (switch_ivr_dmachine_callback_t) 0 ;
-  void *arg8 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t **)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_memory_pool_t *)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (switch_ivr_dmachine_callback_t)jarg6; 
-  arg7 = (switch_ivr_dmachine_callback_t)jarg7; 
-  arg8 = (void *)jarg8; 
-  result = (switch_status_t)switch_ivr_dmachine_create(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_destroy(void * jarg1) {
-  switch_ivr_dmachine_t **arg1 = (switch_ivr_dmachine_t **) 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t **)jarg1; 
-  switch_ivr_dmachine_destroy(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_bind(void * jarg1, char * jarg2, char * jarg3, int jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int32_t arg4 ;
-  switch_ivr_dmachine_callback_t arg5 = (switch_ivr_dmachine_callback_t) 0 ;
-  void *arg6 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int32_t)jarg4; 
-  arg5 = (switch_ivr_dmachine_callback_t)jarg5; 
-  arg6 = (void *)jarg6; 
-  result = (switch_status_t)switch_ivr_dmachine_bind(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_feed(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_ivr_dmachine_match_t **arg3 = (switch_ivr_dmachine_match_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_ivr_dmachine_match_t **)jarg3; 
-  result = (switch_status_t)switch_ivr_dmachine_feed(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_clear(void * jarg1) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (switch_status_t)switch_ivr_dmachine_clear(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_ping(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_ivr_dmachine_match_t **arg2 = (switch_ivr_dmachine_match_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (switch_ivr_dmachine_match_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_dmachine_ping(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_match(void * jarg1) {
-  void * jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  switch_ivr_dmachine_match_t *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (switch_ivr_dmachine_match_t *)switch_ivr_dmachine_get_match(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_failed_digits(void * jarg1) {
-  char * jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  result = (char *)switch_ivr_dmachine_get_failed_digits(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_digit_timeout_ms(void * jarg1, unsigned long jarg2) {
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_ivr_dmachine_set_digit_timeout_ms(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_input_timeout_ms(void * jarg1, unsigned long jarg2) {
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_ivr_dmachine_set_input_timeout_ms(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_clear_realm(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_dmachine_clear_realm(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_realm(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_ivr_dmachine_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_ivr_dmachine_set_realm(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_file_handle(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_file_handle_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_get_file_handle(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_release_file_handle(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_file_handle_t **)jarg2; 
-  result = (switch_status_t)switch_ivr_release_file_handle(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_fh(void * jarg1, char * jarg2, void * jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_file_handle_t *arg3 = (switch_file_handle_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_file_handle_t *)jarg3; 
-  result = (switch_status_t)switch_ivr_process_fh(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_insert_file(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_size_t arg4 ;
-  switch_size_t *argp4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  result = (switch_status_t)switch_ivr_insert_file(arg1,(char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_create_message_reply(void * jarg1, void * jarg2, char * jarg3) {
-  int jresult ;
-  switch_event_t **arg1 = (switch_event_t **) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_event_t **)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_status_t)switch_ivr_create_message_reply(arg1,arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_check_presence_mapping(char * jarg1, char * jarg2) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_ivr_check_presence_mapping((char const *)arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_kill_uuid(char * jarg1, int jarg2) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_call_cause_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_call_cause_t)jarg2; 
-  result = (switch_status_t)switch_ivr_kill_uuid((char const *)arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_blind_transfer_ack(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_ivr_blind_transfer_ack(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_session_mask(void * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_ivr_record_session_mask(arg1,(char const *)arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(16384);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTCP_MAX_BUF_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(16384);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_WORDS_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(4094);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(64);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() {
-  char * jresult ;
-  char *result = 0 ;
-  
-  result = (char *)("AES_CM_128_HMAC_SHA1_80");
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_set(void * jarg1, char * jarg2) {
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_get(void * jarg1) {
-  char * jresult ;
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_set(void * jarg1, int jarg2) {
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  switch_rtp_crypto_key_type_t arg2 ;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  arg2 = (switch_rtp_crypto_key_type_t)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_get(void * jarg1) {
-  int jresult ;
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  switch_rtp_crypto_key_type_t result;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  result = (switch_rtp_crypto_key_type_t) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_set(void * jarg1, int jarg2) {
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->keylen = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_get(void * jarg1) {
-  int jresult ;
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  result = (int) ((arg1)->keylen);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_srtp_crypto_suite_t() {
-  void * jresult ;
-  switch_srtp_crypto_suite_t *result = 0 ;
-  
-  result = (switch_srtp_crypto_suite_t *)new switch_srtp_crypto_suite_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_srtp_crypto_suite_t(void * jarg1) {
-  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
-  
-  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_set(void * jarg1, unsigned long jarg2) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->index = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  result = (uint32_t) ((arg1)->index);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_type_set(void * jarg1, int jarg2) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_rtp_crypto_key_type_t arg2 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  arg2 = (switch_rtp_crypto_key_type_t)jarg2; 
-  if (arg1) (arg1)->type = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_crypto_key_type_get(void * jarg1) {
-  int jresult ;
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_rtp_crypto_key_type_t result;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  result = (switch_rtp_crypto_key_type_t) ((arg1)->type);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_key_set(void * jarg1, void * jarg2) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  unsigned char *arg2 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  arg2 = (unsigned char *)jarg2; 
-  {
-    size_t ii;
-    unsigned char *b = (unsigned char *) arg1->key;
-    for (ii = 0; ii < (size_t)64; ii++) b[ii] = *((unsigned char *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_key_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  unsigned char *result = 0 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  result = (unsigned char *)(unsigned char *) ((arg1)->key);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_set(void * jarg1, void * jarg2) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->keylen = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  result =  ((arg1)->keylen);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_next_set(void * jarg1, void * jarg2) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_rtp_crypto_key *arg2 = (switch_rtp_crypto_key *) 0 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  arg2 = (switch_rtp_crypto_key *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_next_get(void * jarg1) {
-  void * jresult ;
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  switch_rtp_crypto_key *result = 0 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  result = (switch_rtp_crypto_key *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_crypto_key() {
-  void * jresult ;
-  switch_rtp_crypto_key *result = 0 ;
-  
-  result = (switch_rtp_crypto_key *)new switch_rtp_crypto_key();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_crypto_key(void * jarg1) {
-  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
-  
-  arg1 = (switch_rtp_crypto_key *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_foundation_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->foundation) delete [] arg1->foundation;
-    if (arg2) {
-      arg1->foundation = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->foundation, (const char *)arg2);
-    } else {
-      arg1->foundation = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_foundation_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->foundation);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_component_id_set(void * jarg1, int jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->component_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_icand_t_component_id_get(void * jarg1) {
-  int jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  int result;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (int) ((arg1)->component_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_transport_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->transport) delete [] arg1->transport;
-    if (arg2) {
-      arg1->transport = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->transport, (const char *)arg2);
-    } else {
-      arg1->transport = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_transport_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->transport);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_priority_set(void * jarg1, unsigned long jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->priority = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_icand_t_priority_get(void * jarg1) {
-  unsigned long jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (uint32_t) ((arg1)->priority);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_addr_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->con_addr) delete [] arg1->con_addr;
-    if (arg2) {
-      arg1->con_addr = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->con_addr, (const char *)arg2);
-    } else {
-      arg1->con_addr = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_con_addr_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->con_addr);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_port_set(void * jarg1, unsigned short jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  if (arg1) (arg1)->con_port = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_con_port_get(void * jarg1) {
-  unsigned short jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (switch_port_t) ((arg1)->con_port);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_cand_type_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->cand_type) delete [] arg1->cand_type;
-    if (arg2) {
-      arg1->cand_type = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->cand_type, (const char *)arg2);
-    } else {
-      arg1->cand_type = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_cand_type_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->cand_type);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_raddr_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->raddr) delete [] arg1->raddr;
-    if (arg2) {
-      arg1->raddr = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->raddr, (const char *)arg2);
-    } else {
-      arg1->raddr = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_raddr_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->raddr);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_rport_set(void * jarg1, unsigned short jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  if (arg1) (arg1)->rport = arg2;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_rport_get(void * jarg1) {
-  unsigned short jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (switch_port_t) ((arg1)->rport);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_generation_set(void * jarg1, char * jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->generation) delete [] arg1->generation;
-    if (arg2) {
-      arg1->generation = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->generation, (const char *)arg2);
-    } else {
-      arg1->generation = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_generation_get(void * jarg1) {
-  char * jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (char *) ((arg1)->generation);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_ready_set(void * jarg1, unsigned char jarg2) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  uint8_t arg2 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  arg2 = (uint8_t)jarg2; 
-  if (arg1) (arg1)->ready = arg2;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_icand_t_ready_get(void * jarg1) {
-  unsigned char jresult ;
-  icand_t *arg1 = (icand_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (icand_t *)jarg1; 
-  result = (uint8_t) ((arg1)->ready);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_icand_t() {
-  void * jresult ;
-  icand_t *result = 0 ;
-  
-  result = (icand_t *)new icand_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_icand_t(void * jarg1) {
-  icand_t *arg1 = (icand_t *) 0 ;
-  
-  arg1 = (icand_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_MAX_CAND_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(50);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cands_set(void * jarg1, void * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  icand_t (*arg2)[2] ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (icand_t (*)[2])jarg2; 
-  {
-    icand_t (*inp)[2] = (icand_t (*)[2])(arg2);
-    icand_t (*dest)[2] = (icand_t (*)[2])(arg1->cands);
-    size_t ii = 0;
-    for (; ii < 50; ++ii) {
-      icand_t *ip = inp[ii];
-      icand_t *dp = dest[ii];
-      size_t jj = 0;
-      for (; jj < 2; ++jj) dp[jj] = ip[jj];
-    }
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_cands_get(void * jarg1) {
-  void * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  icand_t (*result)[2] = 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (icand_t (*)[2])(icand_t (*)[2]) ((arg1)->cands);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cand_idx_set(void * jarg1, int jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  int arg2 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->cand_idx = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_ice_t_cand_idx_get(void * jarg1) {
-  int jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  int result;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (int) ((arg1)->cand_idx);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_chosen_set(void * jarg1, void * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  int *arg2 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (int *)jarg2; 
-  {
-    size_t ii;
-    int *b = (int *) arg1->chosen;
-    for (ii = 0; ii < (size_t)2; ii++) b[ii] = *((int *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_chosen_get(void * jarg1) {
-  void * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  int *result = 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (int *)(int *) ((arg1)->chosen);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_ufrag_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->ufrag) delete [] arg1->ufrag;
-    if (arg2) {
-      arg1->ufrag = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->ufrag, (const char *)arg2);
-    } else {
-      arg1->ufrag = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_ufrag_get(void * jarg1) {
-  char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (char *) ((arg1)->ufrag);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_pwd_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->pwd) delete [] arg1->pwd;
-    if (arg2) {
-      arg1->pwd = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->pwd, (const char *)arg2);
-    } else {
-      arg1->pwd = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_pwd_get(void * jarg1) {
-  char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (char *) ((arg1)->pwd);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_options_set(void * jarg1, char * jarg2) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->options) delete [] arg1->options;
-    if (arg2) {
-      arg1->options = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->options, (const char *)arg2);
-    } else {
-      arg1->options = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_options_get(void * jarg1) {
-  char * jresult ;
-  ice_t *arg1 = (ice_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  result = (char *) ((arg1)->options);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_ice_t() {
-  void * jresult ;
-  ice_t *result = 0 ;
-  
-  result = (ice_t *)new ice_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_ice_t(void * jarg1) {
-  ice_t *arg1 = (ice_t *) 0 ;
-  
-  arg1 = (ice_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_add_crypto_key(void * jarg1, int jarg2, unsigned long jarg3, int jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_crypto_direction_t arg2 ;
-  uint32_t arg3 ;
-  switch_rtp_crypto_key_type_t arg4 ;
-  unsigned char *arg5 = (unsigned char *) 0 ;
-  switch_size_t arg6 ;
-  switch_size_t *argp6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_crypto_direction_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (switch_rtp_crypto_key_type_t)jarg4; 
-  arg5 = (unsigned char *)jarg5; 
-  argp6 = (switch_size_t *)jarg6; 
-  if (!argp6) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg6 = *argp6; 
-  result = (switch_status_t)switch_rtp_add_crypto_key(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_get_random(void * jarg1, unsigned long jarg2) {
-  void *arg1 = (void *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (void *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_rtp_get_random(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_init(void * jarg1) {
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  switch_rtp_init(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_shutdown() {
-  switch_rtp_shutdown();
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_start_port(unsigned short jarg1) {
-  unsigned short jresult ;
-  switch_port_t arg1 ;
-  switch_port_t result;
-  
-  arg1 = (switch_port_t)jarg1; 
-  result = (switch_port_t)switch_rtp_set_start_port(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_ssrc(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (switch_status_t)switch_rtp_set_ssrc(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_ssrc(void * jarg1, unsigned long jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (switch_status_t)switch_rtp_set_remote_ssrc(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_end_port(unsigned short jarg1) {
-  unsigned short jresult ;
-  switch_port_t arg1 ;
-  switch_port_t result;
-  
-  arg1 = (switch_port_t)jarg1; 
-  result = (switch_port_t)switch_rtp_set_end_port(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_request_port(char * jarg1) {
-  unsigned short jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_port_t)switch_rtp_request_port((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_release_port(char * jarg1, unsigned short jarg2) {
-  char *arg1 = (char *) 0 ;
-  switch_port_t arg2 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  switch_rtp_release_port((char const *)arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_interval(void * jarg1, unsigned long jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_rtp_set_interval(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_change_interval(void * jarg1, unsigned long jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  result = (switch_status_t)switch_rtp_change_interval(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_create(void * jarg1, unsigned char jarg2, unsigned long jarg3, unsigned long jarg4, void * jarg5, char * jarg6, void * jarg7, void * jarg8) {
-  int jresult ;
-  switch_rtp_t **arg1 = (switch_rtp_t **) 0 ;
-  switch_payload_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  switch_rtp_flag_t *arg5 ;
-  char *arg6 = (char *) 0 ;
-  char **arg7 = (char **) 0 ;
-  switch_memory_pool_t *arg8 = (switch_memory_pool_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t **)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (switch_rtp_flag_t *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char **)jarg7; 
-  arg8 = (switch_memory_pool_t *)jarg8; 
-  result = (switch_status_t)switch_rtp_create(arg1,arg2,arg3,arg4,arg5,arg6,(char const **)arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_new(char * jarg1, unsigned short jarg2, char * jarg3, unsigned short jarg4, unsigned char jarg5, unsigned long jarg6, unsigned long jarg7, void * jarg8, char * jarg9, void * jarg10, void * jarg11) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_port_t arg2 ;
-  char *arg3 = (char *) 0 ;
-  switch_port_t arg4 ;
-  switch_payload_t arg5 ;
-  uint32_t arg6 ;
-  uint32_t arg7 ;
-  switch_rtp_flag_t *arg8 ;
-  char *arg9 = (char *) 0 ;
-  char **arg10 = (char **) 0 ;
-  switch_memory_pool_t *arg11 = (switch_memory_pool_t *) 0 ;
-  switch_rtp_t *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_port_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (switch_port_t)jarg4; 
-  arg5 = (switch_payload_t)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  arg7 = (uint32_t)jarg7; 
-  arg8 = (switch_rtp_flag_t *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char **)jarg10; 
-  arg11 = (switch_memory_pool_t *)jarg11; 
-  result = (switch_rtp_t *)switch_rtp_new((char const *)arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,(char const **)arg10,arg11);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_address(void * jarg1, char * jarg2, unsigned short jarg3, unsigned short jarg4, int jarg5, void * jarg6) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_port_t arg3 ;
-  switch_port_t arg4 ;
-  switch_bool_t arg5 ;
-  char **arg6 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_port_t)jarg3; 
-  arg4 = (switch_port_t)jarg4; 
-  arg5 = (switch_bool_t)jarg5; 
-  arg6 = (char **)jarg6; 
-  result = (switch_status_t)switch_rtp_set_remote_address(arg1,(char const *)arg2,arg3,arg4,arg5,(char const **)arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_rtp_get_remote_host(void * jarg1) {
-  char * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (char *)switch_rtp_get_remote_host(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_get_remote_port(void * jarg1) {
-  unsigned short jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_port_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_port_t)switch_rtp_get_remote_port(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_reset_media_timer(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_reset_media_timer(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_max_missed_packets(void * jarg1, unsigned long jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_rtp_set_max_missed_packets(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_udptl_mode(void * jarg1) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_status_t)switch_rtp_udptl_mode(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_reset(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_reset(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_local_address(void * jarg1, char * jarg2, unsigned short jarg3, void * jarg4) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_port_t arg3 ;
-  char **arg4 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_port_t)jarg3; 
-  arg4 = (char **)jarg4; 
-  result = (switch_status_t)switch_rtp_set_local_address(arg1,(char const *)arg2,arg3,(char const **)arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_kill_socket(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_kill_socket(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_break(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_break(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_flush(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_flush(arg1);
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_rtp_ready(void * jarg1) {
-  unsigned char jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint8_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (uint8_t)switch_rtp_ready(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_destroy(void * jarg1) {
-  switch_rtp_t **arg1 = (switch_rtp_t **) 0 ;
-  
-  arg1 = (switch_rtp_t **)jarg1; 
-  switch_rtp_destroy(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, int jarg7, void * jarg8) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  ice_proto_t arg6 ;
-  switch_core_media_ice_type_t arg7 ;
-  ice_t *arg8 = (ice_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (ice_proto_t)jarg6; 
-  arg7 = (switch_core_media_ice_type_t)jarg7; 
-  arg8 = (ice_t *)jarg8; 
-  result = (switch_status_t)switch_rtp_activate_ice(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_rtcp(void * jarg1, int jarg2, unsigned short jarg3, int jarg4) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  int arg2 ;
-  switch_port_t arg3 ;
-  switch_bool_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (switch_port_t)jarg3; 
-  arg4 = (switch_bool_t)jarg4; 
-  result = (switch_status_t)switch_rtp_activate_rtcp(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_jitter_buffer(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, unsigned long jarg6) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  uint32_t arg3 ;
-  uint32_t arg4 ;
-  uint32_t arg5 ;
-  uint32_t arg6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint32_t)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  result = (switch_status_t)switch_rtp_activate_jitter_buffer(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_debug_jitter_buffer(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_status_t)switch_rtp_debug_jitter_buffer(arg1,(char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_deactivate_jitter_buffer(void * jarg1) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_status_t)switch_rtp_deactivate_jitter_buffer(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_pause_jitter_buffer(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_rtp_pause_jitter_buffer(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_jitter_buffer(void * jarg1) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  stfu_instance_t *result = 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (stfu_instance_t *)switch_rtp_get_jitter_buffer(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_flag(void * jarg1, int jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flag_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flag_t)jarg2; 
-  switch_rtp_set_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_flags(void * jarg1, void * jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flag_t *arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flag_t *)jarg2; 
-  switch_rtp_set_flags(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_clear_flags(void * jarg1, void * jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flag_t *arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flag_t *)jarg2; 
-  switch_rtp_clear_flags(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_test_flag(void * jarg1, int jarg2) {
-  unsigned long jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flag_t arg2 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flag_t)jarg2; 
-  result = (uint32_t)switch_rtp_test_flag(arg1,arg2);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_clear_flag(void * jarg1, int jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flag_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flag_t)jarg2; 
-  switch_rtp_clear_flag(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_rtp_socket(void * jarg1) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_socket_t *result = 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_socket_t *)switch_rtp_get_rtp_socket(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_ping(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_ping(arg1);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_default_samples_per_interval(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (uint32_t)switch_rtp_get_default_samples_per_interval(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_default_payload(void * jarg1, unsigned char jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  switch_rtp_set_default_payload(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_default_payload(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (uint32_t)switch_rtp_get_default_payload(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_invalid_handler(void * jarg1, void * jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_invalid_handler_t arg2 = (switch_rtp_invalid_handler_t) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_invalid_handler_t)jarg2; 
-  switch_rtp_set_invalid_handler(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_read(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, unsigned long jarg6) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  uint32_t *arg3 = (uint32_t *) 0 ;
-  switch_payload_t *arg4 = (switch_payload_t *) 0 ;
-  switch_frame_flag_t *arg5 = (switch_frame_flag_t *) 0 ;
-  switch_io_flag_t arg6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (uint32_t *)jarg3; 
-  arg4 = (switch_payload_t *)jarg4; 
-  arg5 = (switch_frame_flag_t *)jarg5; 
-  arg6 = (switch_io_flag_t)jarg6; 
-  result = (switch_status_t)switch_rtp_read(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_queue_rfc2833(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_rtp_queue_rfc2833(arg1,(switch_dtmf_t const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_queue_rfc2833_in(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = (switch_status_t)switch_rtp_queue_rfc2833_in(arg1,(switch_dtmf_t const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_has_dtmf(void * jarg1) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = switch_rtp_has_dtmf(arg1);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_dequeue_dtmf(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_dtmf_t *)jarg2; 
-  result = switch_rtp_dequeue_dtmf(arg1,arg2);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_zerocopy_read(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, unsigned long jarg6) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  void **arg2 = (void **) 0 ;
-  uint32_t *arg3 = (uint32_t *) 0 ;
-  switch_payload_t *arg4 = (switch_payload_t *) 0 ;
-  switch_frame_flag_t *arg5 = (switch_frame_flag_t *) 0 ;
-  switch_io_flag_t arg6 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (void **)jarg2; 
-  arg3 = (uint32_t *)jarg3; 
-  arg4 = (switch_payload_t *)jarg4; 
-  arg5 = (switch_frame_flag_t *)jarg5; 
-  arg6 = (switch_io_flag_t)jarg6; 
-  result = (switch_status_t)switch_rtp_zerocopy_read(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_zerocopy_read_frame(void * jarg1, void * jarg2, unsigned long jarg3) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  switch_io_flag_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  arg3 = (switch_io_flag_t)jarg3; 
-  result = (switch_status_t)switch_rtp_zerocopy_read_frame(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtcp_zerocopy_read_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtcp_frame_t *arg2 = (switch_rtcp_frame_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtcp_frame_t *)jarg2; 
-  result = (switch_status_t)switch_rtcp_zerocopy_read_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_rtp_flush_read_buffer(void * jarg1, int jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_flush_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_flush_t)jarg2; 
-  rtp_flush_read_buffer(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_enable_vad(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  switch_codec_t *arg3 = (switch_codec_t *) 0 ;
-  switch_vad_flag_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  arg3 = (switch_codec_t *)jarg3; 
-  arg4 = (switch_vad_flag_t)jarg4; 
-  result = (switch_status_t)switch_rtp_enable_vad(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_disable_vad(void * jarg1) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_status_t)switch_rtp_disable_vad(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_write_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_frame_t *)jarg2; 
-  result = (int)switch_rtp_write_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_write_manual(void * jarg1, void * jarg2, unsigned long jarg3, unsigned char jarg4, unsigned char jarg5, unsigned long jarg6, void * jarg7) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  uint32_t arg3 ;
-  uint8_t arg4 ;
-  switch_payload_t arg5 ;
-  uint32_t arg6 ;
-  switch_frame_flag_t *arg7 = (switch_frame_flag_t *) 0 ;
-  int result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (uint32_t)jarg3; 
-  arg4 = (uint8_t)jarg4; 
-  arg5 = (switch_payload_t)jarg5; 
-  arg6 = (uint32_t)jarg6; 
-  arg7 = (switch_frame_flag_t *)jarg7; 
-  result = (int)switch_rtp_write_manual(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_ssrc(void * jarg1) {
-  unsigned long jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (uint32_t)switch_rtp_get_ssrc(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_private(void * jarg1, void * jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  switch_rtp_set_private(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_telephony_event(void * jarg1, unsigned char jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  switch_rtp_set_telephony_event(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_telephony_recv_event(void * jarg1, unsigned char jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  switch_rtp_set_telephony_recv_event(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_cng_pt(void * jarg1, unsigned char jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_payload_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_payload_t)jarg2; 
-  switch_rtp_set_cng_pt(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_private(void * jarg1) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (void *)switch_rtp_get_private(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_payload_map(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  payload_map_t **arg2 = (payload_map_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (payload_map_t **)jarg2; 
-  result = (switch_status_t)switch_rtp_set_payload_map(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_intentional_bugs(void * jarg1, int jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_rtp_bug_flag_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_rtp_bug_flag_t)jarg2; 
-  switch_rtp_intentional_bugs(arg1,arg2);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_stats(void * jarg1, void * jarg2) {
-  void * jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
-  switch_rtp_stats_t *result = 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (switch_memory_pool_t *)jarg2; 
-  result = (switch_rtp_stats_t *)switch_rtp_get_stats(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_rtp_check_auto_adj(void * jarg1) {
-  unsigned char jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  switch_byte_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  result = (switch_byte_t)switch_rtp_check_auto_adj(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_interdigit_delay(void * jarg1, unsigned long jarg2) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  switch_rtp_set_interdigit_delay(arg1,arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_add_dtls(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  dtls_fingerprint_t *arg2 = (dtls_fingerprint_t *) 0 ;
-  dtls_fingerprint_t *arg3 = (dtls_fingerprint_t *) 0 ;
-  dtls_type_t arg4 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (dtls_fingerprint_t *)jarg2; 
-  arg3 = (dtls_fingerprint_t *)jarg3; 
-  arg4 = (dtls_type_t)jarg4; 
-  result = (switch_status_t)switch_rtp_add_dtls(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_del_dtls(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  dtls_type_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  arg2 = (dtls_type_t)jarg2; 
-  result = (switch_status_t)switch_rtp_del_dtls(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_has_dtls() {
-  int jresult ;
-  int result;
-  
-  result = (int)switch_rtp_has_dtls();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_video_refresh(void * jarg1) {
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
-  
-  arg1 = (switch_rtp_t *)jarg1; 
-  switch_rtp_video_refresh(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_data_set(void * jarg1, char * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->data) delete [] arg1->data;
-    if (arg2) {
-      arg1->data = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->data, (const char *)arg2);
-    } else {
-      arg1->data = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_data_get(void * jarg1) {
-  char * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (char *) ((arg1)->data);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_file_set(void * jarg1, char * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->file, (const char *)arg2, 80-1);
-      arg1->file[80-1] = 0;
-    } else {
-      arg1->file[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_file_get(void * jarg1) {
-  char * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (char *)(char *) ((arg1)->file);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_line_set(void * jarg1, unsigned long jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->line = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_log_node_t_line_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (uint32_t) ((arg1)->line);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_func_set(void * jarg1, char * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->func, (const char *)arg2, 80-1);
-      arg1->func[80-1] = 0;
-    } else {
-      arg1->func[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_func_get(void * jarg1) {
-  char * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (char *)(char *) ((arg1)->func);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_level_set(void * jarg1, int jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_log_level_t arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (switch_log_level_t)jarg2; 
-  if (arg1) (arg1)->level = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_level_get(void * jarg1) {
-  int jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_log_level_t result;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (switch_log_level_t) ((arg1)->level);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_timestamp_set(void * jarg1, void * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_time_t arg2 ;
-  switch_time_t *argp2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  argp2 = (switch_time_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->timestamp = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_log_node_t_timestamp_get(void * jarg1) {
-  void * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_time_t result;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result =  ((arg1)->timestamp);
-  jresult = new switch_time_t((const switch_time_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_content_set(void * jarg1, char * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->content) delete [] arg1->content;
-    if (arg2) {
-      arg1->content = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->content, (const char *)arg2);
-    } else {
-      arg1->content = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_content_get(void * jarg1) {
-  char * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (char *) ((arg1)->content);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_userdata_set(void * jarg1, char * jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->userdata) delete [] arg1->userdata;
-    if (arg2) {
-      arg1->userdata = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->userdata, (const char *)arg2);
-    } else {
-      arg1->userdata = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_userdata_get(void * jarg1) {
-  char * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (char *) ((arg1)->userdata);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_channel_set(void * jarg1, int jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_text_channel_t arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (switch_text_channel_t)jarg2; 
-  if (arg1) (arg1)->channel = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_channel_get(void * jarg1) {
-  int jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_text_channel_t result;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (switch_text_channel_t) ((arg1)->channel);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_slevel_set(void * jarg1, int jarg2) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_log_level_t arg2 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  arg2 = (switch_log_level_t)jarg2; 
-  if (arg1) (arg1)->slevel = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_slevel_get(void * jarg1) {
-  int jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_log_level_t result;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (switch_log_level_t) ((arg1)->slevel);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_log_node_t() {
-  void * jresult ;
-  switch_log_node_t *result = 0 ;
-  
-  result = (switch_log_node_t *)new switch_log_node_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_log_node_t(void * jarg1) {
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_init(void * jarg1, int jarg2) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  switch_bool_t arg2 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_status_t)switch_log_init(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_shutdown() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_log_shutdown();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_bind_logger(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  switch_log_function_t arg1 = (switch_log_function_t) 0 ;
-  switch_log_level_t arg2 ;
-  switch_bool_t arg3 ;
-  switch_status_t result;
-  
-  arg1 = (switch_log_function_t)jarg1; 
-  arg2 = (switch_log_level_t)jarg2; 
-  arg3 = (switch_bool_t)jarg3; 
-  result = (switch_status_t)switch_log_bind_logger(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_unbind_logger(void * jarg1) {
-  int jresult ;
-  switch_log_function_t arg1 = (switch_log_function_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_log_function_t)jarg1; 
-  result = (switch_status_t)switch_log_unbind_logger(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_level2str(int jarg1) {
-  char * jresult ;
-  switch_log_level_t arg1 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_log_level_t)jarg1; 
-  result = (char *)switch_log_level2str(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_str2level(char * jarg1) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_log_level_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_log_level_t)switch_log_str2level((char const *)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_log_str2mask(char * jarg1) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (uint32_t)switch_log_str2mask((char const *)arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_log_node_dup(void * jarg1) {
-  void * jresult ;
-  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
-  switch_log_node_t *result = 0 ;
-  
-  arg1 = (switch_log_node_t *)jarg1; 
-  result = (switch_log_node_t *)switch_log_node_dup((switch_log_node_t const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_free(void * jarg1) {
-  switch_log_node_t **arg1 = (switch_log_node_t **) 0 ;
-  
-  arg1 = (switch_log_node_t **)jarg1; 
-  switch_log_node_free(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_XML_BUFSIZE_get() {
-  int jresult ;
-  int result;
-  
-  result = (int)(1024);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_name_set(void * jarg1, char * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->name) delete [] arg1->name;
-    if (arg2) {
-      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->name, (const char *)arg2);
-    } else {
-      arg1->name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_name_get(void * jarg1) {
-  char * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (char *) ((arg1)->name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_attr_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char **arg2 = (char **) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (char **)jarg2; 
-  if (arg1) (arg1)->attr = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_attr_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char **result = 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (char **) ((arg1)->attr);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_txt_set(void * jarg1, char * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->txt) delete [] arg1->txt;
-    if (arg2) {
-      arg1->txt = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->txt, (const char *)arg2);
-    } else {
-      arg1->txt = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_txt_get(void * jarg1) {
-  char * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (char *) ((arg1)->txt);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free_path_set(void * jarg1, char * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->free_path) delete [] arg1->free_path;
-    if (arg2) {
-      arg1->free_path = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->free_path, (const char *)arg2);
-    } else {
-      arg1->free_path = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_free_path_get(void * jarg1) {
-  char * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (char *) ((arg1)->free_path);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_off_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return ;
-  }
-  arg2 = *argp2; 
-  if (arg1) (arg1)->off = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_off_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_size_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result =  ((arg1)->off);
-  jresult = new switch_size_t((const switch_size_t &)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_next_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_next_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_xml_t) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_sibling_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->sibling = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_sibling_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_xml_t) ((arg1)->sibling);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_ordered_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->ordered = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_ordered_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_xml_t) ((arg1)->ordered);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_child_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->child = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_child_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_xml_t) ((arg1)->child);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_parent_set(void * jarg1, void * jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  if (arg1) (arg1)->parent = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parent_get(void * jarg1) {
-  void * jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_xml_t) ((arg1)->parent);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_flags_set(void * jarg1, unsigned long jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_flags_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (uint32_t) ((arg1)->flags);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_is_switch_xml_root_t_set(void * jarg1, int jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_bool_t arg2 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  if (arg1) (arg1)->is_switch_xml_root_t = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_is_switch_xml_root_t_get(void * jarg1) {
-  int jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  switch_bool_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (switch_bool_t) ((arg1)->is_switch_xml_root_t);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_refs_set(void * jarg1, unsigned long jarg2) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->refs = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_refs_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_xml *)jarg1; 
-  result = (uint32_t) ((arg1)->refs);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_xml() {
-  void * jresult ;
-  switch_xml *result = 0 ;
-  
-  result = (switch_xml *)new switch_xml();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_xml(void * jarg1) {
-  switch_xml *arg1 = (switch_xml *) 0 ;
-  
-  arg1 = (switch_xml *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str_dynamic(char * jarg1, int jarg2) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_bool_t arg2 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (switch_xml_t)switch_xml_parse_str_dynamic(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str(char * jarg1, void * jarg2) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_size_t arg2 ;
-  switch_size_t *argp2 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  argp2 = (switch_size_t *)jarg2; 
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg2 = *argp2; 
-  result = (switch_xml_t)switch_xml_parse_str(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_fd(int jarg1) {
-  void * jresult ;
-  int arg1 ;
-  switch_xml_t result;
-  
-  arg1 = (int)jarg1; 
-  result = (switch_xml_t)switch_xml_parse_fd(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_file(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_xml_t)switch_xml_parse_file((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_file_simple(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_xml_t)switch_xml_parse_file_simple((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_fp(void * jarg1) {
-  void * jresult ;
-  FILE *arg1 = (FILE *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (FILE *)jarg1; 
-  result = (switch_xml_t)switch_xml_parse_fp(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_child(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_xml_t)switch_xml_child(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_find_child(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (switch_xml_t)switch_xml_find_child(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_find_child_multi(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_xml_t)switch_xml_find_child_multi(arg1,(char const *)arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_attr(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_xml_attr(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_attr_soft(void * jarg1, char * jarg2) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)switch_xml_attr_soft(arg1,(char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_get(void * jarg1) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  void *arg2 = 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  result = (switch_xml_t)switch_xml_get(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml(void * jarg1, int jarg2) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_bool_t arg2 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (char *)switch_xml_toxml(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml_nolock(void * jarg1, int jarg2) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_bool_t arg2 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (char *)switch_xml_toxml_nolock(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_tohtml(void * jarg1, int jarg2) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_bool_t arg2 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_bool_t)jarg2; 
-  result = (char *)switch_xml_tohtml(arg1,arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml_buf(void * jarg1, char * jarg2, void * jarg3, void * jarg4, int jarg5) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t arg4 ;
-  switch_bool_t arg5 ;
-  switch_size_t *argp3 ;
-  switch_size_t *argp4 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  argp4 = (switch_size_t *)jarg4; 
-  if (!argp4) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg4 = *argp4; 
-  arg5 = (switch_bool_t)jarg5; 
-  result = (char *)switch_xml_toxml_buf(arg1,arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free(void * jarg1) {
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  switch_xml_free(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free_in_thread(void * jarg1, int jarg2) {
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (int)jarg2; 
-  switch_xml_free_in_thread(arg1,arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_error(void * jarg1) {
-  char * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  result = (char *)switch_xml_error(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_new(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_xml_t)switch_xml_new((char const *)arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_add_child(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_xml_t)switch_xml_add_child(arg1,(char const *)arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_txt(void * jarg1, char * jarg2) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (switch_xml_t)switch_xml_set_txt(arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_attr(void * jarg1, char * jarg2, char * jarg3) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (switch_xml_t)switch_xml_set_attr(arg1,(char const *)arg2,(char const *)arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_flag(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_xml_flag_t arg2 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_xml_flag_t)jarg2; 
-  result = (switch_xml_t)switch_xml_set_flag(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_cut(void * jarg1) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  result = (switch_xml_t)switch_xml_cut(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_insert(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  switch_size_t arg3 ;
-  switch_size_t *argp3 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  argp3 = (switch_size_t *)jarg3; 
-  if (!argp3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
-    return 0;
-  }
-  arg3 = *argp3; 
-  result = (switch_xml_t)switch_xml_insert(arg1,arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_set_root(void * jarg1) {
-  int jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  result = (switch_status_t)switch_xml_set_root(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_set_open_root_function(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_xml_open_root_function_t arg1 = (switch_xml_open_root_function_t) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_open_root_function_t)jarg1; 
-  arg2 = (void *)jarg2; 
-  result = (switch_status_t)switch_xml_set_open_root_function(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_open_root(unsigned char jarg1, void * jarg2) {
-  void * jresult ;
-  uint8_t arg1 ;
-  char **arg2 = (char **) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (uint8_t)jarg1; 
-  arg2 = (char **)jarg2; 
-  result = (switch_xml_t)switch_xml_open_root(arg1,(char const **)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_init(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_memory_pool_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  result = (switch_status_t)switch_xml_init(arg1,(char const **)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_reload(void * jarg1) {
-  int jresult ;
-  char **arg1 = (char **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char **)jarg1; 
-  result = (switch_status_t)switch_xml_reload((char const **)arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_destroy() {
-  int jresult ;
-  switch_status_t result;
-  
-  result = (switch_status_t)switch_xml_destroy();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_root() {
-  void * jresult ;
-  switch_xml_t result;
-  
-  result = (switch_xml_t)switch_xml_root();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6, void * jarg7, int jarg8) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
-  switch_event_t *arg7 = (switch_event_t *) 0 ;
-  switch_bool_t arg8 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_xml_t *)jarg5; 
-  arg6 = (switch_xml_t *)jarg6; 
-  arg7 = (switch_event_t *)jarg7; 
-  arg8 = (switch_bool_t)jarg8; 
-  result = (switch_status_t)switch_xml_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_domain(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  arg3 = (switch_xml_t *)jarg3; 
-  arg4 = (switch_xml_t *)jarg4; 
-  result = (switch_status_t)switch_xml_locate_domain((char const *)arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_group(char * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
-  switch_event_t *arg6 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (switch_xml_t *)jarg3; 
-  arg4 = (switch_xml_t *)jarg4; 
-  arg5 = (switch_xml_t *)jarg5; 
-  arg6 = (switch_event_t *)jarg6; 
-  result = (switch_status_t)switch_xml_locate_group((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg7 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg8 = (switch_xml_t *) 0 ;
-  switch_event_t *arg9 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_xml_t *)jarg5; 
-  arg6 = (switch_xml_t *)jarg6; 
-  arg7 = (switch_xml_t *)jarg7; 
-  arg8 = (switch_xml_t *)jarg8; 
-  arg9 = (switch_event_t *)jarg9; 
-  result = (switch_status_t)switch_xml_locate_user((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8,arg9);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user_in_domain(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  arg3 = (switch_xml_t *)jarg3; 
-  arg4 = (switch_xml_t *)jarg4; 
-  result = (switch_status_t)switch_xml_locate_user_in_domain((char const *)arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user_merged(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6) {
-  int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
-  switch_event_t *arg6 = (switch_event_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (switch_xml_t *)jarg5; 
-  arg6 = (switch_event_t *)jarg6; 
-  result = (switch_status_t)switch_xml_locate_user_merged((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_clear_user_cache(char * jarg1, char * jarg2, char * jarg3) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (uint32_t)switch_xml_clear_user_cache((char const *)arg1,(char const *)arg2,(char const *)arg3);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_merge_user(void * jarg1, void * jarg2, void * jarg3) {
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_xml_t arg2 = (switch_xml_t) 0 ;
-  switch_xml_t arg3 = (switch_xml_t) 0 ;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (switch_xml_t)jarg2; 
-  arg3 = (switch_xml_t)jarg3; 
-  switch_xml_merge_user(arg1,arg2,arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_dup(void * jarg1) {
-  void * jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  result = (switch_xml_t)switch_xml_dup(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_open_cfg(char * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  switch_xml_t result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (switch_xml_t *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  result = (switch_xml_t)switch_xml_open_cfg((char const *)arg1,arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_set_binding_sections(void * jarg1, unsigned long jarg2) {
-  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
-  switch_xml_section_t arg2 ;
-  
-  arg1 = (switch_xml_binding_t *)jarg1; 
-  arg2 = (switch_xml_section_t)jarg2; 
-  switch_xml_set_binding_sections(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_set_binding_user_data(void * jarg1, void * jarg2) {
-  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_xml_binding_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  switch_xml_set_binding_user_data(arg1,arg2);
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_get_binding_sections(void * jarg1) {
-  unsigned long jresult ;
-  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
-  switch_xml_section_t result;
-  
-  arg1 = (switch_xml_binding_t *)jarg1; 
-  result = (switch_xml_section_t)switch_xml_get_binding_sections(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_get_binding_user_data(void * jarg1) {
-  void * jresult ;
-  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_xml_binding_t *)jarg1; 
-  result = (void *)switch_xml_get_binding_user_data(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_bind_search_function_ret(void * jarg1, unsigned long jarg2, void * jarg3, void * jarg4) {
-  int jresult ;
-  switch_xml_search_function_t arg1 = (switch_xml_search_function_t) 0 ;
-  switch_xml_section_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  switch_xml_binding_t **arg4 = (switch_xml_binding_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_search_function_t)jarg1; 
-  arg2 = (switch_xml_section_t)jarg2; 
-  arg3 = (void *)jarg3; 
-  arg4 = (switch_xml_binding_t **)jarg4; 
-  result = (switch_status_t)switch_xml_bind_search_function_ret(arg1,arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_unbind_search_function(void * jarg1) {
-  int jresult ;
-  switch_xml_binding_t **arg1 = (switch_xml_binding_t **) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_binding_t **)jarg1; 
-  result = (switch_status_t)switch_xml_unbind_search_function(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_unbind_search_function_ptr(void * jarg1) {
-  int jresult ;
-  switch_xml_search_function_t arg1 = (switch_xml_search_function_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_search_function_t)jarg1; 
-  result = (switch_status_t)switch_xml_unbind_search_function_ptr(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_parse_section_string(char * jarg1) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  switch_xml_section_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (switch_xml_section_t)switch_xml_parse_section_string((char const *)arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_std_datetime_check(void * jarg1, void * jarg2, char * jarg3) {
-  int jresult ;
-  switch_xml_t arg1 = (switch_xml_t) 0 ;
-  int *arg2 = (int *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_xml_t)jarg1; 
-  arg2 = (int *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (int)switch_xml_std_datetime_check(arg1,arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_language(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6, char * jarg7) {
-  int jresult ;
-  switch_xml_t *arg1 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
-  switch_event_t *arg3 = (switch_event_t *) 0 ;
-  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
-  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
-  char *arg7 = (char *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_xml_t *)jarg1; 
-  arg2 = (switch_xml_t *)jarg2; 
-  arg3 = (switch_event_t *)jarg3; 
-  arg4 = (switch_xml_t *)jarg4; 
-  arg5 = (switch_xml_t *)jarg5; 
-  arg6 = (switch_xml_t *)jarg6; 
-  arg7 = (char *)jarg7; 
-  result = (switch_status_t)switch_xml_locate_language(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_outgoing_channel_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
-  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
-  if (arg1) (arg1)->outgoing_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_outgoing_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  switch_outgoing_channel_hook_t result;
-  
-  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
-  result = (switch_outgoing_channel_hook_t) ((arg1)->outgoing_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  switch_io_event_hook_outgoing_channel *arg2 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  
-  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
-  arg2 = (switch_io_event_hook_outgoing_channel *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  switch_io_event_hook_outgoing_channel *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
-  result = (switch_io_event_hook_outgoing_channel *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_outgoing_channel() {
-  void * jresult ;
-  switch_io_event_hook_outgoing_channel *result = 0 ;
-  
-  result = (switch_io_event_hook_outgoing_channel *)new switch_io_event_hook_outgoing_channel();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_outgoing_channel(void * jarg1) {
-  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
-  
-  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_receive_message_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
-  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
-  arg2 = (switch_receive_message_hook_t)jarg2; 
-  if (arg1) (arg1)->receive_message = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_receive_message_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
-  switch_receive_message_hook_t result;
-  
-  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
-  result = (switch_receive_message_hook_t) ((arg1)->receive_message);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
-  switch_io_event_hook_receive_message *arg2 = (switch_io_event_hook_receive_message *) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
-  arg2 = (switch_io_event_hook_receive_message *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
-  switch_io_event_hook_receive_message *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
-  result = (switch_io_event_hook_receive_message *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_receive_message() {
-  void * jresult ;
-  switch_io_event_hook_receive_message *result = 0 ;
-  
-  result = (switch_io_event_hook_receive_message *)new switch_io_event_hook_receive_message();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_message(void * jarg1) {
-  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_receive_event_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
-  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
-  arg2 = (switch_receive_event_hook_t)jarg2; 
-  if (arg1) (arg1)->receive_event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_receive_event_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
-  switch_receive_event_hook_t result;
-  
-  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
-  result = (switch_receive_event_hook_t) ((arg1)->receive_event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
-  switch_io_event_hook_receive_event *arg2 = (switch_io_event_hook_receive_event *) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
-  arg2 = (switch_io_event_hook_receive_event *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
-  switch_io_event_hook_receive_event *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
-  result = (switch_io_event_hook_receive_event *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_receive_event() {
-  void * jresult ;
-  switch_io_event_hook_receive_event *result = 0 ;
-  
-  result = (switch_io_event_hook_receive_event *)new switch_io_event_hook_receive_event();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_event(void * jarg1) {
-  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
-  
-  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_read_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
-  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
-  arg2 = (switch_read_frame_hook_t)jarg2; 
-  if (arg1) (arg1)->read_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_read_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
-  switch_read_frame_hook_t result;
-  
-  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
-  result = (switch_read_frame_hook_t) ((arg1)->read_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
-  switch_io_event_hook_read_frame *arg2 = (switch_io_event_hook_read_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
-  arg2 = (switch_io_event_hook_read_frame *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
-  switch_io_event_hook_read_frame *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
-  result = (switch_io_event_hook_read_frame *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_read_frame() {
-  void * jresult ;
-  switch_io_event_hook_read_frame *result = 0 ;
-  
-  result = (switch_io_event_hook_read_frame *)new switch_io_event_hook_read_frame();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_read_frame(void * jarg1) {
-  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_video_read_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
-  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
-  arg2 = (switch_read_frame_hook_t)jarg2; 
-  if (arg1) (arg1)->video_read_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_video_read_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
-  switch_read_frame_hook_t result;
-  
-  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
-  result = (switch_read_frame_hook_t) ((arg1)->video_read_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
-  switch_io_event_hook_video_read_frame *arg2 = (switch_io_event_hook_video_read_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
-  arg2 = (switch_io_event_hook_video_read_frame *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
-  switch_io_event_hook_video_read_frame *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
-  result = (switch_io_event_hook_video_read_frame *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_video_read_frame() {
-  void * jresult ;
-  switch_io_event_hook_video_read_frame *result = 0 ;
-  
-  result = (switch_io_event_hook_video_read_frame *)new switch_io_event_hook_video_read_frame();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_read_frame(void * jarg1) {
-  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_write_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
-  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
-  arg2 = (switch_write_frame_hook_t)jarg2; 
-  if (arg1) (arg1)->write_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
-  switch_write_frame_hook_t result;
-  
-  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
-  result = (switch_write_frame_hook_t) ((arg1)->write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
-  switch_io_event_hook_write_frame *arg2 = (switch_io_event_hook_write_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
-  arg2 = (switch_io_event_hook_write_frame *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
-  switch_io_event_hook_write_frame *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
-  result = (switch_io_event_hook_write_frame *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_write_frame() {
-  void * jresult ;
-  switch_io_event_hook_write_frame *result = 0 ;
-  
-  result = (switch_io_event_hook_write_frame *)new switch_io_event_hook_write_frame();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_write_frame(void * jarg1) {
-  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_video_write_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
-  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
-  arg2 = (switch_video_write_frame_hook_t)jarg2; 
-  if (arg1) (arg1)->video_write_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_video_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
-  switch_video_write_frame_hook_t result;
-  
-  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
-  result = (switch_video_write_frame_hook_t) ((arg1)->video_write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
-  switch_io_event_hook_video_write_frame *arg2 = (switch_io_event_hook_video_write_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
-  arg2 = (switch_io_event_hook_video_write_frame *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
-  switch_io_event_hook_video_write_frame *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
-  result = (switch_io_event_hook_video_write_frame *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_video_write_frame() {
-  void * jresult ;
-  switch_io_event_hook_video_write_frame *result = 0 ;
-  
-  result = (switch_io_event_hook_video_write_frame *)new switch_io_event_hook_video_write_frame();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_write_frame(void * jarg1) {
-  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
-  
-  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_kill_channel_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
-  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
-  arg2 = (switch_kill_channel_hook_t)jarg2; 
-  if (arg1) (arg1)->kill_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_kill_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
-  switch_kill_channel_hook_t result;
-  
-  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
-  result = (switch_kill_channel_hook_t) ((arg1)->kill_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
-  switch_io_event_hook_kill_channel *arg2 = (switch_io_event_hook_kill_channel *) 0 ;
-  
-  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
-  arg2 = (switch_io_event_hook_kill_channel *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
-  switch_io_event_hook_kill_channel *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
-  result = (switch_io_event_hook_kill_channel *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_kill_channel() {
-  void * jresult ;
-  switch_io_event_hook_kill_channel *result = 0 ;
-  
-  result = (switch_io_event_hook_kill_channel *)new switch_io_event_hook_kill_channel();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_kill_channel(void * jarg1) {
-  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
-  
-  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_send_dtmf_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
-  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
-  arg2 = (switch_send_dtmf_hook_t)jarg2; 
-  if (arg1) (arg1)->send_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_send_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
-  switch_send_dtmf_hook_t result;
-  
-  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
-  result = (switch_send_dtmf_hook_t) ((arg1)->send_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
-  switch_io_event_hook_send_dtmf *arg2 = (switch_io_event_hook_send_dtmf *) 0 ;
-  
-  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
-  arg2 = (switch_io_event_hook_send_dtmf *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
-  switch_io_event_hook_send_dtmf *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
-  result = (switch_io_event_hook_send_dtmf *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_send_dtmf() {
-  void * jresult ;
-  switch_io_event_hook_send_dtmf *result = 0 ;
-  
-  result = (switch_io_event_hook_send_dtmf *)new switch_io_event_hook_send_dtmf();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_send_dtmf(void * jarg1) {
-  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
-  
-  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_recv_dtmf_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
-  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
-  if (arg1) (arg1)->recv_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_recv_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  switch_recv_dtmf_hook_t result;
-  
-  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
-  result = (switch_recv_dtmf_hook_t) ((arg1)->recv_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  switch_io_event_hook_recv_dtmf *arg2 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  
-  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
-  arg2 = (switch_io_event_hook_recv_dtmf *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  switch_io_event_hook_recv_dtmf *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
-  result = (switch_io_event_hook_recv_dtmf *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_recv_dtmf() {
-  void * jresult ;
-  switch_io_event_hook_recv_dtmf *result = 0 ;
-  
-  result = (switch_io_event_hook_recv_dtmf *)new switch_io_event_hook_recv_dtmf();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_recv_dtmf(void * jarg1) {
-  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
-  
-  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_state_change_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
-  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_change *)jarg1; 
-  arg2 = (switch_state_change_hook_t)jarg2; 
-  if (arg1) (arg1)->state_change = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_change_state_change_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
-  switch_state_change_hook_t result;
-  
-  arg1 = (switch_io_event_hook_state_change *)jarg1; 
-  result = (switch_state_change_hook_t) ((arg1)->state_change);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
-  switch_io_event_hook_state_change *arg2 = (switch_io_event_hook_state_change *) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_change *)jarg1; 
-  arg2 = (switch_io_event_hook_state_change *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_change_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
-  switch_io_event_hook_state_change *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_state_change *)jarg1; 
-  result = (switch_io_event_hook_state_change *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_state_change() {
-  void * jresult ;
-  switch_io_event_hook_state_change *result = 0 ;
-  
-  result = (switch_io_event_hook_state_change *)new switch_io_event_hook_state_change();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_change(void * jarg1) {
-  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_change *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_state_run_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
-  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_run *)jarg1; 
-  arg2 = (switch_state_run_hook_t)jarg2; 
-  if (arg1) (arg1)->state_run = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_run_state_run_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
-  switch_state_run_hook_t result;
-  
-  arg1 = (switch_io_event_hook_state_run *)jarg1; 
-  result = (switch_state_run_hook_t) ((arg1)->state_run);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_next_set(void * jarg1, void * jarg2) {
-  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
-  switch_io_event_hook_state_run *arg2 = (switch_io_event_hook_state_run *) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_run *)jarg1; 
-  arg2 = (switch_io_event_hook_state_run *)jarg2; 
-  if (arg1) (arg1)->next = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_run_next_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
-  switch_io_event_hook_state_run *result = 0 ;
-  
-  arg1 = (switch_io_event_hook_state_run *)jarg1; 
-  result = (switch_io_event_hook_state_run *) ((arg1)->next);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_state_run() {
-  void * jresult ;
-  switch_io_event_hook_state_run *result = 0 ;
-  
-  result = (switch_io_event_hook_state_run *)new switch_io_event_hook_state_run();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_run(void * jarg1) {
-  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
-  
-  arg1 = (switch_io_event_hook_state_run *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_outgoing_channel_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_outgoing_channel_t *arg2 = (switch_io_event_hook_outgoing_channel_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_outgoing_channel_t *)jarg2; 
-  if (arg1) (arg1)->outgoing_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_outgoing_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_outgoing_channel_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_outgoing_channel_t *) ((arg1)->outgoing_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_message_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_receive_message_t *arg2 = (switch_io_event_hook_receive_message_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_receive_message_t *)jarg2; 
-  if (arg1) (arg1)->receive_message = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_receive_message_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_receive_message_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_receive_message_t *) ((arg1)->receive_message);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_event_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_receive_event_t *arg2 = (switch_io_event_hook_receive_event_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_receive_event_t *)jarg2; 
-  if (arg1) (arg1)->receive_event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_receive_event_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_receive_event_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_receive_event_t *) ((arg1)->receive_event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_read_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_read_frame_t *arg2 = (switch_io_event_hook_read_frame_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_read_frame_t *)jarg2; 
-  if (arg1) (arg1)->read_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_read_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_read_frame_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_read_frame_t *) ((arg1)->read_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_read_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_video_read_frame_t *arg2 = (switch_io_event_hook_video_read_frame_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_video_read_frame_t *)jarg2; 
-  if (arg1) (arg1)->video_read_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_video_read_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_video_read_frame_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_video_read_frame_t *) ((arg1)->video_read_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_write_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_write_frame_t *arg2 = (switch_io_event_hook_write_frame_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_write_frame_t *)jarg2; 
-  if (arg1) (arg1)->write_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_write_frame_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_write_frame_t *) ((arg1)->write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_write_frame_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_video_write_frame_t *arg2 = (switch_io_event_hook_video_write_frame_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_video_write_frame_t *)jarg2; 
-  if (arg1) (arg1)->video_write_frame = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_video_write_frame_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_video_write_frame_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_video_write_frame_t *) ((arg1)->video_write_frame);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_kill_channel_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_kill_channel_t *arg2 = (switch_io_event_hook_kill_channel_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_kill_channel_t *)jarg2; 
-  if (arg1) (arg1)->kill_channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_kill_channel_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_kill_channel_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_kill_channel_t *) ((arg1)->kill_channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_send_dtmf_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_send_dtmf_t *arg2 = (switch_io_event_hook_send_dtmf_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_send_dtmf_t *)jarg2; 
-  if (arg1) (arg1)->send_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_send_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_send_dtmf_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_send_dtmf_t *) ((arg1)->send_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_recv_dtmf_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_recv_dtmf_t *arg2 = (switch_io_event_hook_recv_dtmf_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_recv_dtmf_t *)jarg2; 
-  if (arg1) (arg1)->recv_dtmf = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_recv_dtmf_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_recv_dtmf_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_recv_dtmf_t *) ((arg1)->recv_dtmf);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_change_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_state_change_t *arg2 = (switch_io_event_hook_state_change_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_state_change_t *)jarg2; 
-  if (arg1) (arg1)->state_change = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_state_change_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_state_change_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_state_change_t *) ((arg1)->state_change);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_run_set(void * jarg1, void * jarg2) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_state_run_t *arg2 = (switch_io_event_hook_state_run_t *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  arg2 = (switch_io_event_hook_state_run_t *)jarg2; 
-  if (arg1) (arg1)->state_run = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_state_run_get(void * jarg1) {
-  void * jresult ;
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  switch_io_event_hook_state_run_t *result = 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  result = (switch_io_event_hook_state_run_t *) ((arg1)->state_run);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hooks() {
-  void * jresult ;
-  switch_io_event_hooks *result = 0 ;
-  
-  result = (switch_io_event_hooks *)new switch_io_event_hooks();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hooks(void * jarg1) {
-  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
-  
-  arg1 = (switch_io_event_hooks *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_outgoing_channel(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_outgoing_channel(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_receive_message(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_receive_message_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_receive_message(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_receive_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_receive_event_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_receive_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_state_change(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_state_change_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_state_change(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_state_run(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_state_run_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_state_run(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_read_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_read_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_read_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_write_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_write_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_write_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_video_read_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_video_read_frame_hook_t arg2 = (switch_video_read_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_video_read_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_video_read_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_video_write_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_video_write_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_video_write_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_kill_channel(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_kill_channel_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_kill_channel(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_send_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_send_dtmf_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_send_dtmf(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_recv_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_add_recv_dtmf(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_outgoing_channel(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_outgoing_channel(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_receive_message(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_receive_message_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_receive_message(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_receive_event(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_receive_event_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_receive_event(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_state_change(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_state_change_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_state_change(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_state_run(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_state_run_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_state_run(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_read_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_read_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_read_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_write_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_write_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_write_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_video_read_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_video_read_frame_hook_t arg2 = (switch_video_read_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_video_read_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_video_read_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_video_write_frame(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_video_write_frame_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_video_write_frame(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_kill_channel(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_kill_channel_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_kill_channel(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_send_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_send_dtmf_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_send_dtmf(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_recv_dtmf(void * jarg1, void * jarg2) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
-  result = (switch_status_t)switch_core_event_hook_remove_recv_dtmf(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_created_set(void * jarg1, long long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->created = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_scheduler_task_created_get(void * jarg1) {
-  long long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (int64_t) ((arg1)->created);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_runtime_set(void * jarg1, long long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  int64_t arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (int64_t)jarg2; 
-  if (arg1) (arg1)->runtime = arg2;
-}
-
-
-SWIGEXPORT long long SWIGSTDCALL CSharp_switch_scheduler_task_runtime_get(void * jarg1) {
-  long long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  int64_t result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (int64_t) ((arg1)->runtime);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_set(void * jarg1, unsigned long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->cmd_id = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (uint32_t) ((arg1)->cmd_id);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_repeat_set(void * jarg1, unsigned long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->repeat = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_repeat_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (uint32_t) ((arg1)->repeat);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_group_set(void * jarg1, char * jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->group) delete [] arg1->group;
-    if (arg2) {
-      arg1->group = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->group, (const char *)arg2);
-    } else {
-      arg1->group = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_scheduler_task_group_get(void * jarg1) {
-  char * jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (char *) ((arg1)->group);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_arg_set(void * jarg1, void * jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->cmd_arg = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_scheduler_task_cmd_arg_get(void * jarg1) {
-  void * jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (void *) ((arg1)->cmd_arg);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_task_id_set(void * jarg1, unsigned long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->task_id = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_task_id_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  uint32_t result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (uint32_t) ((arg1)->task_id);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_hash_set(void * jarg1, unsigned long jarg2) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->hash = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_hash_get(void * jarg1) {
-  unsigned long jresult ;
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  unsigned long result;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  result = (unsigned long) ((arg1)->hash);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_scheduler_task() {
-  void * jresult ;
-  switch_scheduler_task *result = 0 ;
-  
-  result = (switch_scheduler_task *)new switch_scheduler_task();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_scheduler_task(void * jarg1) {
-  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
-  
-  arg1 = (switch_scheduler_task *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_add_task(void * jarg1, void * jarg2, char * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, unsigned long jarg7) {
-  unsigned long jresult ;
-  time_t arg1 ;
-  switch_scheduler_func_t arg2 = (switch_scheduler_func_t) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  uint32_t arg5 ;
-  void *arg6 = (void *) 0 ;
-  switch_scheduler_flag_t arg7 ;
-  time_t *argp1 ;
-  uint32_t result;
-  
-  argp1 = (time_t *)jarg1; 
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
-    return 0;
-  }
-  arg1 = *argp1; 
-  arg2 = (switch_scheduler_func_t)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (uint32_t)jarg5; 
-  arg6 = (void *)jarg6; 
-  arg7 = (switch_scheduler_flag_t)jarg7; 
-  result = (uint32_t)switch_scheduler_add_task(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_del_task_id(unsigned long jarg1) {
-  unsigned long jresult ;
-  uint32_t arg1 ;
-  uint32_t result;
-  
-  arg1 = (uint32_t)jarg1; 
-  result = (uint32_t)switch_scheduler_del_task_id(arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_del_task_group(char * jarg1) {
-  unsigned long jresult ;
-  char *arg1 = (char *) 0 ;
-  uint32_t result;
-  
-  arg1 = (char *)jarg1; 
-  result = (uint32_t)switch_scheduler_del_task_group((char const *)arg1);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_thread_start() {
-  switch_scheduler_task_thread_start();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_thread_stop() {
-  switch_scheduler_task_thread_stop();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_file_set(void * jarg1, void * jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (FILE *)jarg2; 
-  if (arg1) (arg1)->file = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_config_file_get(void * jarg1) {
-  void * jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  FILE *result = 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (FILE *) ((arg1)->file);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_path_set(void * jarg1, char * jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->path, (const char *)arg2, 512-1);
-      arg1->path[512-1] = 0;
-    } else {
-      arg1->path[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_path_get(void * jarg1) {
-  char * jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (char *)(char *) ((arg1)->path);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_category_set(void * jarg1, char * jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->category, (const char *)arg2, 256-1);
-      arg1->category[256-1] = 0;
-    } else {
-      arg1->category[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_category_get(void * jarg1) {
-  char * jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (char *)(char *) ((arg1)->category);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_section_set(void * jarg1, char * jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->section, (const char *)arg2, 256-1);
-      arg1->section[256-1] = 0;
-    } else {
-      arg1->section[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_section_get(void * jarg1) {
-  char * jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (char *)(char *) ((arg1)->section);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_buf_set(void * jarg1, char * jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if(arg2) {
-      strncpy((char*)arg1->buf, (const char *)arg2, 1024-1);
-      arg1->buf[1024-1] = 0;
-    } else {
-      arg1->buf[0] = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_buf_get(void * jarg1) {
-  char * jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (char *)(char *) ((arg1)->buf);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lineno_set(void * jarg1, int jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->lineno = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_lineno_get(void * jarg1) {
-  int jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  int result;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (int) ((arg1)->lineno);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_catno_set(void * jarg1, int jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->catno = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_catno_get(void * jarg1) {
-  int jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  int result;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (int) ((arg1)->catno);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_sectno_set(void * jarg1, int jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->sectno = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_sectno_get(void * jarg1) {
-  int jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  int result;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (int) ((arg1)->sectno);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lockto_set(void * jarg1, int jarg2) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  int arg2 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->lockto = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_lockto_get(void * jarg1) {
-  int jresult ;
-  switch_config *arg1 = (switch_config *) 0 ;
-  int result;
-  
-  arg1 = (switch_config *)jarg1; 
-  result = (int) ((arg1)->lockto);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_config() {
-  void * jresult ;
-  switch_config *result = 0 ;
-  
-  result = (switch_config *)new switch_config();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_config(void * jarg1) {
-  switch_config *arg1 = (switch_config *) 0 ;
-  
-  arg1 = (switch_config *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_open_file(void * jarg1, char * jarg2) {
-  int jresult ;
-  switch_config_t *arg1 = (switch_config_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (switch_config_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)switch_config_open_file(arg1,arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_close_file(void * jarg1) {
-  switch_config_t *arg1 = (switch_config_t *) 0 ;
-  
-  arg1 = (switch_config_t *)jarg1; 
-  switch_config_close_file(arg1);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_next_pair(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  switch_config_t *arg1 = (switch_config_t *) 0 ;
-  char **arg2 = (char **) 0 ;
-  char **arg3 = (char **) 0 ;
-  int result;
-  
-  arg1 = (switch_config_t *)jarg1; 
-  arg2 = (char **)jarg2; 
-  arg3 = (char **)jarg3; 
-  result = (int)switch_config_next_pair(arg1,arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_setGlobalVariable(char * jarg1, char * jarg2) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  setGlobalVariable(arg1,arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_getGlobalVariable(char * jarg1) {
-  char * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (char *)getGlobalVariable(arg1);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  free(result);
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog(char * jarg1, char * jarg2) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  consoleLog(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (char *)jarg5; 
-  consoleLog2(arg1,arg2,arg3,arg4,arg5);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  consoleCleanLog(arg1);
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_running() {
-  unsigned int jresult ;
-  bool result;
-  
-  result = (bool)running();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
-  unsigned int jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) NULL ;
-  char *arg4 = (char *) NULL ;
-  char *arg5 = (char *) NULL ;
-  char *arg6 = (char *) NULL ;
-  char *arg7 = (char *) NULL ;
-  bool result;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  result = (bool)email(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17) {
-  void * jresult ;
-  IVRMenu *arg1 = (IVRMenu *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) 0 ;
-  char *arg11 = (char *) 0 ;
-  int arg12 ;
-  int arg13 ;
-  int arg14 ;
-  int arg15 ;
-  int arg16 ;
-  int arg17 ;
-  IVRMenu *result = 0 ;
-  
-  arg1 = (IVRMenu *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (char *)jarg11; 
-  arg12 = (int)jarg12; 
-  arg13 = (int)jarg13; 
-  arg14 = (int)jarg14; 
-  arg15 = (int)jarg15; 
-  arg16 = (int)jarg16; 
-  arg17 = (int)jarg17; 
-  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_IvrMenu(void * jarg1) {
-  IVRMenu *arg1 = (IVRMenu *) 0 ;
-  
-  arg1 = (IVRMenu *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_IvrMenu_bindAction(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  IVRMenu *arg1 = (IVRMenu *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  
-  arg1 = (IVRMenu *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  (arg1)->bindAction(arg2,(char const *)arg3,(char const *)arg4);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_IvrMenu_Execute(void * jarg1, void * jarg2, char * jarg3) {
-  IVRMenu *arg1 = (IVRMenu *) 0 ;
-  CoreSession *arg2 = (CoreSession *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (IVRMenu *)jarg1; 
-  arg2 = (CoreSession *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->execute(arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_Api(void * jarg1) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) NULL ;
-  API *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (API *)new API(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_Api(void * jarg1) {
-  API *arg1 = (API *) 0 ;
-  
-  arg1 = (API *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Api_Execute(void * jarg1, char * jarg2, char * jarg3) {
-  char * jresult ;
-  API *arg1 = (API *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) NULL ;
-  char *result = 0 ;
-  
-  arg1 = (API *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  free(result);
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Api_ExecuteString(void * jarg1, char * jarg2) {
-  char * jresult ;
-  API *arg1 = (API *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (API *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)(arg1)->executeString((char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  free(result);
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Api_getTime(void * jarg1) {
-  char * jresult ;
-  API *arg1 = (API *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (API *)jarg1; 
-  result = (char *)(arg1)->getTime();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_function_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->function = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_function_get(void * jarg1) {
-  void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  result = (void *) ((arg1)->function);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_threadState_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->threadState = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_threadState_get(void * jarg1) {
-  void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  result = (void *) ((arg1)->threadState);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_extra_set(void * jarg1, void * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  if (arg1) (arg1)->extra = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_extra_get(void * jarg1) {
-  void * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  result = (void *) ((arg1)->extra);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_funcargs_set(void * jarg1, char * jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->funcargs) delete [] arg1->funcargs;
-    if (arg2) {
-      arg1->funcargs = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->funcargs, (const char *)arg2);
-    } else {
-      arg1->funcargs = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_input_callback_state_t_funcargs_get(void * jarg1) {
-  char * jresult ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  result = (char *) ((arg1)->funcargs);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_input_callback_state_t() {
-  void * jresult ;
-  input_callback_state_t *result = 0 ;
-  
-  result = (input_callback_state_t *)new input_callback_state_t();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_input_callback_state_t(void * jarg1) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
-  
-  arg1 = (input_callback_state_t *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_digit_set(void * jarg1, char jarg2) {
-  DTMF *arg1 = (DTMF *) 0 ;
-  char arg2 ;
-  
-  arg1 = (DTMF *)jarg1; 
-  arg2 = (char)jarg2; 
-  if (arg1) (arg1)->digit = arg2;
-}
-
-
-SWIGEXPORT char SWIGSTDCALL CSharp_DTMF_digit_get(void * jarg1) {
-  char jresult ;
-  DTMF *arg1 = (DTMF *) 0 ;
-  char result;
-  
-  arg1 = (DTMF *)jarg1; 
-  result = (char) ((arg1)->digit);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_duration_set(void * jarg1, unsigned long jarg2) {
-  DTMF *arg1 = (DTMF *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (DTMF *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->duration = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_DTMF_duration_get(void * jarg1) {
-  unsigned long jresult ;
-  DTMF *arg1 = (DTMF *) 0 ;
-  uint32_t result;
-  
-  arg1 = (DTMF *)jarg1; 
-  result = (uint32_t) ((arg1)->duration);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_DTMF(char jarg1, unsigned long jarg2) {
-  void * jresult ;
-  char arg1 ;
-  uint32_t arg2 = (uint32_t) 2000 ;
-  DTMF *result = 0 ;
-  
-  arg1 = (char)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  result = (DTMF *)new DTMF(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_DTMF(void * jarg1) {
-  DTMF *arg1 = (DTMF *) 0 ;
-  
-  arg1 = (DTMF *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_Stream__SWIG_0() {
-  void * jresult ;
-  Stream *result = 0 ;
-  
-  result = (Stream *)new Stream();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_Stream__SWIG_1(void * jarg1) {
-  void * jresult ;
-  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
-  Stream *result = 0 ;
-  
-  arg1 = (switch_stream_handle_t *)jarg1; 
-  result = (Stream *)new Stream(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_Stream(void * jarg1) {
-  Stream *arg1 = (Stream *) 0 ;
-  
-  arg1 = (Stream *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Stream_Write(void * jarg1, char * jarg2) {
-  Stream *arg1 = (Stream *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (Stream *)jarg1; 
-  arg2 = (char *)jarg2; 
-  (arg1)->write((char const *)arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Stream_get_data(void * jarg1) {
-  char * jresult ;
-  Stream *arg1 = (Stream *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (Stream *)jarg1; 
-  result = (char *)(arg1)->get_data();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Event_InternalEvent_set(void * jarg1, void * jarg2) {
-  Event *arg1 = (Event *) 0 ;
-  switch_event_t *arg2 = (switch_event_t *) 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (switch_event_t *)jarg2; 
-  if (arg1) (arg1)->event = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Event_InternalEvent_get(void * jarg1) {
-  void * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  switch_event_t *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  result = (switch_event_t *) ((arg1)->event);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Event_serialized_string_set(void * jarg1, char * jarg2) {
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->serialized_string) delete [] arg1->serialized_string;
-    if (arg2) {
-      arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->serialized_string, (const char *)arg2);
-    } else {
-      arg1->serialized_string = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Event_serialized_string_get(void * jarg1) {
-  char * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  result = (char *) ((arg1)->serialized_string);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Event_mine_set(void * jarg1, int jarg2) {
-  Event *arg1 = (Event *) 0 ;
-  int arg2 ;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->mine = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Event_mine_get(void * jarg1) {
-  int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  int result;
-  
-  arg1 = (Event *)jarg1; 
-  result = (int) ((arg1)->mine);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_Event__SWIG_0(char * jarg1, char * jarg2) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) NULL ;
-  Event *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (Event *)new Event((char const *)arg1,(char const *)arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_Event__SWIG_1(void * jarg1, int jarg2) {
-  void * jresult ;
-  switch_event_t *arg1 = (switch_event_t *) 0 ;
-  int arg2 = (int) 0 ;
-  Event *result = 0 ;
-  
-  arg1 = (switch_event_t *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (Event *)new Event(arg1,arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_Event(void * jarg1) {
-  Event *arg1 = (Event *) 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Event_chat_execute(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) NULL ;
-  int result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (int)(arg1)->chat_execute((char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Event_chat_send(void * jarg1, char * jarg2) {
-  int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) NULL ;
-  int result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->chat_send((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Event_Serialize(void * jarg1, char * jarg2) {
-  char * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) NULL ;
-  char *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)(arg1)->serialize((char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_SetPriority(void * jarg1, int jarg2) {
-  unsigned int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  switch_priority_t arg2 = (switch_priority_t) SWITCH_PRIORITY_NORMAL ;
-  bool result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (switch_priority_t)jarg2; 
-  result = (bool)(arg1)->setPriority(arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetHeader(void * jarg1, char * jarg2) {
-  char * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)(arg1)->getHeader((char const *)arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetBody(void * jarg1) {
-  char * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  result = (char *)(arg1)->getBody();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetEventType(void * jarg1) {
-  char * jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (Event *)jarg1; 
-  result = (char *)(arg1)->getType();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_AddBody(void * jarg1, char * jarg2) {
-  unsigned int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  bool result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (bool)(arg1)->addBody((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_AddHeader(void * jarg1, char * jarg2, char * jarg3) {
-  unsigned int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  bool result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_DeleteHeader(void * jarg1, char * jarg2) {
-  unsigned int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  char *arg2 = (char *) 0 ;
-  bool result;
-  
-  arg1 = (Event *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (bool)(arg1)->delHeader((char const *)arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_Fire(void * jarg1) {
-  unsigned int jresult ;
-  Event *arg1 = (Event *) 0 ;
-  bool result;
-  
-  arg1 = (Event *)jarg1; 
-  result = (bool)(arg1)->fire();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_events_set(void * jarg1, void * jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_queue_t *arg2 = (switch_queue_t *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (switch_queue_t *)jarg2; 
-  if (arg1) (arg1)->events = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_events_get(void * jarg1) {
-  void * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_queue_t *result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (switch_queue_t *) ((arg1)->events);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_event_id_set(void * jarg1, int jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_event_types_t arg2 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (switch_event_types_t)jarg2; 
-  if (arg1) (arg1)->e_event_id = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_EventConsumer_e_event_id_get(void * jarg1) {
-  int jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_event_types_t result;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (switch_event_types_t) ((arg1)->e_event_id);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_callback_set(void * jarg1, char * jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->e_callback) delete [] arg1->e_callback;
-    if (arg2) {
-      arg1->e_callback = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->e_callback, (const char *)arg2);
-    } else {
-      arg1->e_callback = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_callback_get(void * jarg1) {
-  char * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (char *) ((arg1)->e_callback);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_subclass_name_set(void * jarg1, char * jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->e_subclass_name) delete [] arg1->e_subclass_name;
-    if (arg2) {
-      arg1->e_subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->e_subclass_name, (const char *)arg2);
-    } else {
-      arg1->e_subclass_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_subclass_name_get(void * jarg1) {
-  char * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (char *) ((arg1)->e_subclass_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_cb_arg_set(void * jarg1, char * jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->e_cb_arg) delete [] arg1->e_cb_arg;
-    if (arg2) {
-      arg1->e_cb_arg = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->e_cb_arg, (const char *)arg2);
-    } else {
-      arg1->e_cb_arg = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_cb_arg_get(void * jarg1) {
-  char * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (char *) ((arg1)->e_cb_arg);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_enodes_set(void * jarg1, void * jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_event_node_t **arg2 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (switch_event_node_t **)jarg2; 
-  {
-    size_t ii;
-    switch_event_node_t * *b = (switch_event_node_t * *) arg1->enodes;
-    for (ii = 0; ii < (size_t)SWITCH_EVENT_ALL+1; ii++) b[ii] = *((switch_event_node_t * *) arg2 + ii);
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_enodes_get(void * jarg1) {
-  void * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  switch_event_node_t **result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (switch_event_node_t **)(switch_event_node_t **) ((arg1)->enodes);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_node_index_set(void * jarg1, unsigned long jarg2) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  uint32_t arg2 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (uint32_t)jarg2; 
-  if (arg1) (arg1)->node_index = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_EventConsumer_node_index_get(void * jarg1) {
-  unsigned long jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  uint32_t result;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  result = (uint32_t) ((arg1)->node_index);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_EventConsumer(char * jarg1, char * jarg2, int jarg3) {
-  void * jresult ;
-  char *arg1 = (char *) NULL ;
-  char *arg2 = (char *) "" ;
-  int arg3 = (int) 5000 ;
-  EventConsumer *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (EventConsumer *)new EventConsumer((char const *)arg1,(char const *)arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_EventConsumer(void * jarg1) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_EventConsumer_bind(void * jarg1, char * jarg2, char * jarg3) {
-  int jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) "" ;
-  int result;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  result = (int)(arg1)->bind((char const *)arg2,(char const *)arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_pop(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  int arg2 = (int) 0 ;
-  int arg3 = (int) 0 ;
-  Event *result = 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (Event *)(arg1)->pop(arg2,arg3);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_cleanup(void * jarg1) {
-  EventConsumer *arg1 = (EventConsumer *) 0 ;
-  
-  arg1 = (EventConsumer *)jarg1; 
-  (arg1)->cleanup();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_CoreSession(void * jarg1) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_InternalSession_set(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (switch_core_session_t *)jarg2; 
-  if (arg1) (arg1)->session = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_InternalSession_get(void * jarg1) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_core_session_t *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (switch_core_session_t *) ((arg1)->session);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_channel_set(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (switch_channel_t *)jarg2; 
-  if (arg1) (arg1)->channel = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_channel_get(void * jarg1) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_channel_t *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (switch_channel_t *) ((arg1)->channel);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_flags_set(void * jarg1, unsigned int jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  unsigned int arg2 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  if (arg1) (arg1)->flags = arg2;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_flags_get(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  unsigned int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (unsigned int) ((arg1)->flags);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_allocated_set(void * jarg1, int jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  if (arg1) (arg1)->allocated = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_allocated_get(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (int) ((arg1)->allocated);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cb_state_set(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  input_callback_state *arg2 = (input_callback_state *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (input_callback_state *)jarg2; 
-  if (arg1) (arg1)->cb_state = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_cb_state_get(void * jarg1) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  input_callback_state *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (input_callback_state *)& ((arg1)->cb_state);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_HookState_set(void * jarg1, int jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_channel_state_t arg2 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (switch_channel_state_t)jarg2; 
-  if (arg1) (arg1)->hook_state = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_HookState_get(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_channel_state_t result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (switch_channel_state_t) ((arg1)->hook_state);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cause_set(void * jarg1, int jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_call_cause_t arg2 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (switch_call_cause_t)jarg2; 
-  if (arg1) (arg1)->cause = arg2;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_cause_get(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_call_cause_t result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (switch_call_cause_t) ((arg1)->cause);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_uuid_set(void * jarg1, char * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->uuid) delete [] arg1->uuid;
-    if (arg2) {
-      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->uuid, (const char *)arg2);
-    } else {
-      arg1->uuid = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_uuid_get(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *) ((arg1)->uuid);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_tts_name_set(void * jarg1, char * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->tts_name) delete [] arg1->tts_name;
-    if (arg2) {
-      arg1->tts_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->tts_name, (const char *)arg2);
-    } else {
-      arg1->tts_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_tts_name_get(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *) ((arg1)->tts_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_voice_name_set(void * jarg1, char * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  {
-    if (arg1->voice_name) delete [] arg1->voice_name;
-    if (arg2) {
-      arg1->voice_name = (char *) (new char[strlen((const char *)arg2)+1]);
-      strcpy((char *)arg1->voice_name, (const char *)arg2);
-    } else {
-      arg1->voice_name = 0;
-    }
-  }
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_voice_name_get(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *) ((arg1)->voice_name);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_insertFile(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (int)(arg1)->insertFile((char const *)arg2,(char const *)arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Answer(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (int)(arg1)->answer();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_preAnswer(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (int)(arg1)->preAnswer();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Hangup(void * jarg1, char * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) "normal_clearing" ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  (arg1)->hangup((char const *)arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_hangupState(void * jarg1) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  (arg1)->hangupState();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetVariable(void * jarg1, char * jarg2, char * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->setVariable(arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetPrivate(void * jarg1, char * jarg2, void * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = (void *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (void *)jarg3; 
-  (arg1)->setPrivate(arg2,arg3);
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_GetPrivate(void * jarg1, char * jarg2) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (void *)(arg1)->getPrivate(arg2);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetVariable(void * jarg1, char * jarg2) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (char *)(arg1)->getVariable(arg2);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Say(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  char *arg5 = (char *) 0 ;
-  char *arg6 = (char *) NULL ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (char *)jarg5; 
-  arg6 = (char *)jarg6; 
-  (arg1)->say((char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SayPhrase(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) "" ;
-  char *arg4 = (char *) NULL ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  (arg1)->sayPhrase((char const *)arg2,(char const *)arg3,(char const *)arg4);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_hangupCause(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *)(arg1)->hangupCause();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_getState(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *)(arg1)->getState();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_RecordFile(void * jarg1, char * jarg2, int jarg3, int jarg4, int jarg5) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 = (int) 0 ;
-  int arg4 = (int) 0 ;
-  int arg5 = (int) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (int)(arg1)->recordFile(arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_originate(void * jarg1, void * jarg2, char * jarg3, int jarg4, void * jarg5) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  CoreSession *arg2 = (CoreSession *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 = (int) 60 ;
-  switch_state_handler_table_t *arg5 = (switch_state_handler_table_t *) NULL ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (CoreSession *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (switch_state_handler_table_t *)jarg5; 
-  result = (int)(arg1)->originate(arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_destroy(void * jarg1) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  (arg1)->destroy();
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Speak(void * jarg1, char * jarg2) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  result = (int)(arg1)->speak(arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetTtsParameters(void * jarg1, char * jarg2, char * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->set_tts_parms(arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_set_tts_params(void * jarg1, char * jarg2, char * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->set_tts_params(arg2,arg3);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_CollectDigits__SWIG_0(void * jarg1, int jarg2) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  result = (int)(arg1)->collectDigits(arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_CollectDigits__SWIG_1(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)(arg1)->collectDigits(arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetDigits__SWIG_0(void * jarg1, int jarg2, char * jarg3, int jarg4) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  result = (char *)(arg1)->getDigits(arg2,arg3,arg4);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetDigits__SWIG_1(void * jarg1, int jarg2, char * jarg3, int jarg4, int jarg5) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  int arg5 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (int)jarg5; 
-  result = (char *)(arg1)->getDigits(arg2,arg3,arg4,arg5);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) NULL ;
-  char *arg4 = (char *) NULL ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  result = (int)(arg1)->transfer(arg2,arg3,arg4);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_read(void * jarg1, int jarg2, int jarg3, char * jarg4, int jarg5, char * jarg6, int jarg7) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  char *arg6 = (char *) 0 ;
-  int arg7 = (int) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (int)jarg7; 
-  result = (char *)(arg1)->read(arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_PlayAndGetDigits(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, char * jarg12) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  char *arg6 = (char *) 0 ;
-  char *arg7 = (char *) 0 ;
-  char *arg8 = (char *) 0 ;
-  char *arg9 = (char *) 0 ;
-  char *arg10 = (char *) NULL ;
-  int arg11 = (int) 0 ;
-  char *arg12 = (char *) NULL ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (int)jarg5; 
-  arg6 = (char *)jarg6; 
-  arg7 = (char *)jarg7; 
-  arg8 = (char *)jarg8; 
-  arg9 = (char *)jarg9; 
-  arg10 = (char *)jarg10; 
-  arg11 = (int)jarg11; 
-  arg12 = (char *)jarg12; 
-  result = (char *)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,(char const *)arg10,arg11,(char const *)arg12);
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_StreamFile(void * jarg1, char * jarg2, int jarg3) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  int arg3 = (int) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)(arg1)->streamFile(arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_sleep(void * jarg1, int jarg2, int jarg3) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int arg2 ;
-  int arg3 = (int) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  result = (int)(arg1)->sleep(arg2,arg3);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_flushEvents(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (int)(arg1)->flushEvents();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_flushDigits(void * jarg1) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (int)(arg1)->flushDigits();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_SetAutoHangup(void * jarg1, unsigned int jarg2) {
-  int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool arg2 ;
-  int result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = jarg2 ? true : false; 
-  result = (int)(arg1)->setAutoHangup(arg2);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_Ready(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->ready();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_bridged(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->bridged();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_answered(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->answered();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_mediaReady(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->mediaReady();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_waitForAnswer(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  CoreSession *arg2 = (CoreSession *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (CoreSession *)jarg2; 
-  (arg1)->waitForAnswer(arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Execute(void * jarg1, char * jarg2, char * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) NULL ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->execute((char const *)arg2,(char const *)arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_sendEvent(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  Event *arg2 = (Event *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (Event *)jarg2; 
-  (arg1)->sendEvent(arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_setEventData(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  Event *arg2 = (Event *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (Event *)jarg2; 
-  (arg1)->setEventData(arg2);
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_getXMLCDR(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *)(arg1)->getXMLCDR();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_begin_allow_threads(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->begin_allow_threads();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_end_allow_threads(void * jarg1) {
-  unsigned int jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  bool result;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (bool)(arg1)->end_allow_threads();
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetUuid(void * jarg1) {
-  char * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (char *)((CoreSession const *)arg1)->get_uuid();
-  jresult = SWIG_csharp_string_callback((const char *)result); 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_get_cb_args(void * jarg1) {
-  void * jresult ;
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  switch_input_args_t *result = 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  result = (switch_input_args_t *) &((CoreSession const *)arg1)->get_cb_args();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_check_hangup_hook(void * jarg1) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  (arg1)->check_hangup_hook();
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog(void * jarg1, char * jarg2, char * jarg3) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  (arg1)->consoleLog(arg2,arg3);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog2(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5, char * jarg6) {
-  CoreSession *arg1 = (CoreSession *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  int arg5 ;
-  char *arg6 = (char *) 0 ;
-  
-  arg1 = (CoreSession *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (char *)jarg4; 
-  arg5 = (int)jarg5; 
-  arg6 = (char *)jarg6; 
-  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  console_log(arg1,arg2);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_console_log2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
-  char *arg1 = (char *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  int arg4 ;
-  char *arg5 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (int)jarg4; 
-  arg5 = (char *)jarg5; 
-  console_log2(arg1,arg2,arg3,arg4,arg5);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
-  char *arg1 = (char *) 0 ;
-  
-  arg1 = (char *)jarg1; 
-  console_clean_log(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) {
-  unsigned int arg1 ;
-  
-  arg1 = (unsigned int)jarg1; 
-  switch_msleep(arg1);
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_bridge(void * jarg1, void * jarg2) {
-  CoreSession *arg1 = 0 ;
-  CoreSession *arg2 = 0 ;
-  
-  arg1 = (CoreSession *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
-    return ;
-  } 
-  arg2 = (CoreSession *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
-    return ;
-  } 
-  bridge(*arg1,*arg2);
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_hanguphook(void * jarg1) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (switch_status_t)hanguphook(arg1);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_dtmf_callback(void * jarg1, void * jarg2, int jarg3, void * jarg4, unsigned int jarg5) {
-  int jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  switch_input_type_t arg3 ;
-  void *arg4 = (void *) 0 ;
-  unsigned int arg5 ;
-  switch_status_t result;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  arg2 = (void *)jarg2; 
-  arg3 = (switch_input_type_t)jarg3; 
-  arg4 = (void *)jarg4; 
-  arg5 = (unsigned int)jarg5; 
-  result = (switch_status_t)dtmf_callback(arg1,arg2,arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_0() {
-  void * jresult ;
-  ManagedSession *result = 0 ;
-  
-  result = (ManagedSession *)new ManagedSession();
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_1(char * jarg1) {
-  void * jresult ;
-  char *arg1 = (char *) 0 ;
-  ManagedSession *result = 0 ;
-  
-  arg1 = (char *)jarg1; 
-  result = (ManagedSession *)new ManagedSession(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_2(void * jarg1) {
-  void * jresult ;
-  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-  ManagedSession *result = 0 ;
-  
-  arg1 = (switch_core_session_t *)jarg1; 
-  result = (ManagedSession *)new ManagedSession(arg1);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_ManagedSession(void * jarg1) {
-  ManagedSession *arg1 = (ManagedSession *) 0 ;
-  
-  arg1 = (ManagedSession *)jarg1; 
-  delete arg1;
-}
-
-
-SWIGEXPORT CoreSession * SWIGSTDCALL CSharp_ManagedSession_SWIGUpcast(ManagedSession *jarg1) {
-    return (CoreSession *)jarg1;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.1
+ * 
+ * This file is not intended to be easily readable and contains a number of 
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
+ * ----------------------------------------------------------------------------- */
+
+#define SWIGCSHARP
+
+
+#ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+public:
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
+};
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
+#endif
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
+# else
+#   define SWIGUNUSED 
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+
+/* Support for throwing C# exceptions from C/C++. There are two types: 
+ * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */
+typedef enum {
+  SWIG_CSharpApplicationException,
+  SWIG_CSharpArithmeticException,
+  SWIG_CSharpDivideByZeroException,
+  SWIG_CSharpIndexOutOfRangeException,
+  SWIG_CSharpInvalidCastException,
+  SWIG_CSharpInvalidOperationException,
+  SWIG_CSharpIOException,
+  SWIG_CSharpNullReferenceException,
+  SWIG_CSharpOutOfMemoryException,
+  SWIG_CSharpOverflowException,
+  SWIG_CSharpSystemException
+} SWIG_CSharpExceptionCodes;
+
+typedef enum {
+  SWIG_CSharpArgumentException,
+  SWIG_CSharpArgumentNullException,
+  SWIG_CSharpArgumentOutOfRangeException
+} SWIG_CSharpExceptionArgumentCodes;
+
+typedef void (SWIGSTDCALL* SWIG_CSharpExceptionCallback_t)(const char *);
+typedef void (SWIGSTDCALL* SWIG_CSharpExceptionArgumentCallback_t)(const char *, const char *);
+
+typedef struct {
+  SWIG_CSharpExceptionCodes code;
+  SWIG_CSharpExceptionCallback_t callback;
+} SWIG_CSharpException_t;
+
+typedef struct {
+  SWIG_CSharpExceptionArgumentCodes code;
+  SWIG_CSharpExceptionArgumentCallback_t callback;
+} SWIG_CSharpExceptionArgument_t;
+
+static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
+  { SWIG_CSharpApplicationException, NULL },
+  { SWIG_CSharpArithmeticException, NULL },
+  { SWIG_CSharpDivideByZeroException, NULL },
+  { SWIG_CSharpIndexOutOfRangeException, NULL },
+  { SWIG_CSharpInvalidCastException, NULL },
+  { SWIG_CSharpInvalidOperationException, NULL },
+  { SWIG_CSharpIOException, NULL },
+  { SWIG_CSharpNullReferenceException, NULL },
+  { SWIG_CSharpOutOfMemoryException, NULL },
+  { SWIG_CSharpOverflowException, NULL },
+  { SWIG_CSharpSystemException, NULL }
+};
+
+static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
+  { SWIG_CSharpArgumentException, NULL },
+  { SWIG_CSharpArgumentNullException, NULL },
+  { SWIG_CSharpArgumentOutOfRangeException, NULL }
+};
+
+static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
+  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
+    callback = SWIG_csharp_exceptions[code].callback;
+  }
+  callback(msg);
+}
+
+static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
+  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
+    callback = SWIG_csharp_exceptions_argument[code].callback;
+  }
+  callback(msg, param_name);
+}
+
+
+#ifdef __cplusplus
+extern "C" 
+#endif
+SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_freeswitch(
+                                                SWIG_CSharpExceptionCallback_t applicationCallback,
+                                                SWIG_CSharpExceptionCallback_t arithmeticCallback,
+                                                SWIG_CSharpExceptionCallback_t divideByZeroCallback, 
+                                                SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, 
+                                                SWIG_CSharpExceptionCallback_t invalidCastCallback,
+                                                SWIG_CSharpExceptionCallback_t invalidOperationCallback,
+                                                SWIG_CSharpExceptionCallback_t ioCallback,
+                                                SWIG_CSharpExceptionCallback_t nullReferenceCallback,
+                                                SWIG_CSharpExceptionCallback_t outOfMemoryCallback, 
+                                                SWIG_CSharpExceptionCallback_t overflowCallback, 
+                                                SWIG_CSharpExceptionCallback_t systemCallback) {
+  SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
+  SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
+}
+
+#ifdef __cplusplus
+extern "C" 
+#endif
+SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_freeswitch(
+                                                SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
+                                                SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
+                                                SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback) {
+  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
+  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
+  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
+}
+
+
+/* Contract support */
+
+#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
+
+
+
+/* Callback for returning strings to C# without leaking memory */
+#ifndef _MANAGED
+#include <mono/jit/jit.h>
+#include <mono/metadata/environment.h>
+#include <mono/metadata/mono-config.h>
+#include <mono/metadata/threads.h>
+#include <mono/metadata/debug-helpers.h>
+#endif
+
+typedef char * (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char *);
+static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback_real = NULL;
+
+
+#ifdef __cplusplus
+extern "C" 
+#endif
+SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_freeswitch(SWIG_CSharpStringHelperCallback callback) {
+	/* Set this only once, in the main appdomain */
+	if (SWIG_csharp_string_callback_real == NULL) SWIG_csharp_string_callback_real = callback;
+}
+char * SWIG_csharp_string_callback(const char * str) {
+#ifndef _MANAGED
+	// Mono won't transition appdomains properly after the callback, so we force it
+	MonoDomain* dom = mono_domain_get();
+	char* res = SWIG_csharp_string_callback_real(str);
+	mono_domain_set(dom, true);
+	return res;
+#else
+	return SWIG_csharp_string_callback_real(str);
+#endif
+}
+
+
+#include "switch.h"
+#include "switch_cpp.h"
+#include "freeswitch_managed.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_PEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("27880");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_OID_PREFIX_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)(".1.3.6.1.4.1.27880");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_FREESWITCH_ITAD_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("543");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp___EXTENSIONS___get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp___BSD_VISIBLE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENT_ORIGINATE_DELIM_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)(":_:");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BLANK_STRING_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\0");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_TON_UNDEF_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(255);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_NUMPLAN_UNDEF_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(255);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_ESC_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_get() {
+  char jresult ;
+  char result;
+  
+  result = (char)('H');
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_CHAR_STR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("H");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_get() {
+  char jresult ;
+  char result;
+  
+  result = (char)('1');
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_CHAR_STR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("1");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_CHAR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("K");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR0_get() {
+  char jresult ;
+  char result;
+  
+  result = (char)('2');
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR1_get() {
+  char jresult ;
+  char result;
+  
+  result = (char)('J');
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_CHAR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("2J");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_AND_COLOR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)(";");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_END_COLOR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLACK_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("30");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_RED_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("31");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_GREEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("32");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_YELLOW_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("33");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_BLUE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("34");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_MAGEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("35");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_CYAN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("36");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_F_WHITE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("37");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLACK_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("40");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_RED_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("41");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_GREEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("42");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_YELLOW_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("43");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_BLUE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("44");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_MAGEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("45");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_CYAN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("46");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_B_WHITE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("47");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLACK_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[30m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FRED_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[31m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FGREEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[32m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FYELLOW_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[33m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FBLUE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[34m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FMAGEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[35m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FCYAN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[36m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_FWHITE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[37m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLACK_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[40m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BRED_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[41m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BGREEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[42m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BYELLOW_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[43m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BBLUE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[44m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BMAGEN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[45m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BCYAN_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[46m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_BWHITE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[47m");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_HOME_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[H");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[1");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARLINEEND_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[K");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_CLEARSCR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\33[2J\33[H");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NAME_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("\0");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DEFAULT_CLID_NUMBER_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("0000000000");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_DTMF_DURATION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2000);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MIN_DTMF_DURATION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(400);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_DTMF_DURATION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(192000);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PATH_SEPARATOR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("/");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_URL_SEPARATOR_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("://");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_IGNORE_DISPLAY_UPDATES_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("ignore_display_updates");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_AUDIO_SPOOL_PATH_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("audio_spool_path");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bridge_hangup_cause");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_TERMINATOR_USED_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("read_terminator_used");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("send_silence_when_idle");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("current_application");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_DATA_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("current_application_data");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("current_application_response");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PASSTHRU_PTIME_MISMATCH_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("passthru_ptime_mismatch");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("enable_heartbeat_events");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bypass_media_after_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_READ_RESULT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("read_result");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ATT_XFER_RESULT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("att_xfer_result");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_XML_CDR_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("copy_xml_cdr");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_COPY_JSON_CDR_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("copy_json_cdr");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("proto_specific_hangup_cause");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_HISTORY_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("transfer_history");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_SOURCE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("transfer_source");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SENSITIVE_DTMF_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("sensitive_dtmf");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_APP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("record_post_process_exec_app");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RECORD_POST_PROCESS_EXEC_API_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("record_post_process_exec_api");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_answer");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ANSWER_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_pre_answer");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_MEDIA_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_media");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_RING_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_ring");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_TONE_DETECT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_tone_detect");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_post_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_pre_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_PRE_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_pre_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_EXECUTE_ON_POST_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("execute_on_post_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ANSWER_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_answer");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ANSWER_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_pre_answer");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_MEDIA_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_media");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_RING_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_ring");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_TONE_DETECT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_tone_detect");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_POST_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_post_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_API_ON_PRE_ORIGINATE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_on_pre_originate");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CALL_TIMEOUT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("call_timeout");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLDING_UUID_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("holding_uuid");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SOFT_HOLDING_UUID_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("soft_holding_uuid");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_END_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_after_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_START_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_before_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_HANGUP_HOOK_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_hangup_hook");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_REPORTING_HOOK_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("api_reporting_hook");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("session_in_hangup_hook");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROCESS_CDR_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("process_cdr");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SKIP_CDR_CAUSES_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("skip_cdr_causes");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_FORCE_PROCESS_CDR_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("force_process_cdr");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_CHANNEL_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bridge_channel");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CHANNEL_NAME_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("channel_name");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_UUID_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bridge_uuid");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CONTINUE_ON_FAILURE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("continue_on_fail");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATORS_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("playback_terminators");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PLAYBACK_TERMINATOR_USED_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("playback_terminator_used");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("cache_speech_handles");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("__cache_speech_handles_obj__");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bypass_media");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PROXY_MEDIA_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("proxy_media");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ZRTP_PASSTHRU_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("zrtp_passthru");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENDPOINT_DISPOSITION_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("endpoint_disposition");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLD_MUSIC_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("hold_music");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TEMP_HOLD_MUSIC_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("temp_hold_music");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXPORT_VARS_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("export_vars");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_EXPORT_VARS_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bridge_export_vars");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_R_SDP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("switch_r_sdp");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_L_SDP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("switch_l_sdp");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_B_SDP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("switch_m_sdp");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("bridge_to");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LAST_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("last_bridge_to");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("signal_bridge_to");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SIGNAL_BOND_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("signal_bond");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATE_SIGNAL_BOND_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("originate_signal_bond");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("originator");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_CODEC_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("originator_codec");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ORIGINATOR_VIDEO_CODEC_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("originator_video_codec");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_IP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("local_media_ip");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_MEDIA_PORT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("local_media_port");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ADVERTISED_MEDIA_IP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("advertised_media_ip");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_IP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("remote_media_ip");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_MEDIA_PORT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("remote_media_port");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_IP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("remote_video_ip");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_REMOTE_VIDEO_PORT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("remote_video_port");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_IP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("local_video_ip");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_LOCAL_VIDEO_PORT_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("local_video_port");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("hangup_after_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("park_after_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("transfer_after_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("exec_after_bridge_app");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("exec_after_bridge_arg");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_MAX_FORWARDS_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("max_forwards");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_DISABLE_APP_LOG_VARIABLE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("disable_app_log");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SPEECH_KEY_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("speech");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_UUID_BRIDGE_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("uuid_bridge");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BITS_PER_BYTE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(65536);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1000);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_TRANS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2000);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_SESSION_MAX_PRIVATES_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_JITTER_VARIANCE_THRESHOLD_get() {
+  double jresult ;
+  double result;
+  
+  result = (double)(400.0);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_IPDV_THRESHOLD_get() {
+  double jresult ;
+  double result;
+  
+  result = (double)(1.0);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_ANALYZE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(500);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_LOST_BURST_CAPTURE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1024);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) {
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  char arg2 ;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  arg2 = (char)jarg2; 
+  if (arg1) (arg1)->digit = arg2;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_switch_dtmf_t_digit_get(void * jarg1) {
+  char jresult ;
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  char result;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  result = (char) ((arg1)->digit);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_duration_set(void * jarg1, unsigned long jarg2) {
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->duration = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_dtmf_t_duration_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  result = (uint32_t) ((arg1)->duration);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_flags_set(void * jarg1, int jarg2) {
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  int32_t arg2 ;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  arg2 = (int32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmf_t_flags_get(void * jarg1) {
+  int jresult ;
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  int32_t result;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  result = (int32_t) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_source_set(void * jarg1, int jarg2) {
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  switch_dtmf_source_t arg2 ;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  arg2 = (switch_dtmf_source_t)jarg2; 
+  if (arg1) (arg1)->source = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmf_t_source_get(void * jarg1) {
+  int jresult ;
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  switch_dtmf_source_t result;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  result = (switch_dtmf_source_t) ((arg1)->source);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_dtmf_t() {
+  void * jresult ;
+  switch_dtmf_t *result = 0 ;
+  
+  result = (switch_dtmf_t *)new switch_dtmf_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dtmf_t(void * jarg1) {
+  switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
+  
+  arg1 = (switch_dtmf_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buf_set(void * jarg1, void * jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  if (arg1) (arg1)->buf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_bitpack_t_buf_get(void * jarg1) {
+  void * jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t *) ((arg1)->buf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_buflen_set(void * jarg1, unsigned long jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->buflen = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_buflen_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (uint32_t) ((arg1)->buflen);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_cur_set(void * jarg1, void * jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  if (arg1) (arg1)->cur = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_bitpack_t_cur_get(void * jarg1) {
+  void * jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t *) ((arg1)->cur);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bytes_set(void * jarg1, unsigned long jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->bytes = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_bytes_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (uint32_t) ((arg1)->bytes);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_tot_set(void * jarg1, unsigned long jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->bits_tot = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_bitpack_t_bits_tot_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (uint32_t) ((arg1)->bits_tot);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_cur_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->bits_cur = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_bits_cur_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->bits_cur);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_bits_rem_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->bits_rem = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_bits_rem_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->bits_rem);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_frame_bits_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->frame_bits = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_frame_bits_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->frame_bits);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_shiftby_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->shiftby = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_shiftby_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->shiftby);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_this_byte_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->this_byte = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_this_byte_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->this_byte);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_under_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->under = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_under_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->under);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_over_set(void * jarg1, unsigned char jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_byte_t)jarg2; 
+  if (arg1) (arg1)->over = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_bitpack_t_over_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_byte_t) ((arg1)->over);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_bitpack_t_mode_set(void * jarg1, int jarg2) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_bitpack_mode_t arg2 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  arg2 = (switch_bitpack_mode_t)jarg2; 
+  if (arg1) (arg1)->mode = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_bitpack_t_mode_get(void * jarg1) {
+  int jresult ;
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  switch_bitpack_mode_t result;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  result = (switch_bitpack_mode_t) ((arg1)->mode);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_bitpack_t() {
+  void * jresult ;
+  switch_bitpack_t *result = 0 ;
+  
+  result = (switch_bitpack_t *)new switch_bitpack_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_bitpack_t(void * jarg1) {
+  switch_bitpack_t *arg1 = (switch_bitpack_t *) 0 ;
+  
+  arg1 = (switch_bitpack_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_base_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->base_dir) delete [] arg1->base_dir;
+    if (arg2) {
+      arg1->base_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->base_dir, (const char *)arg2);
+    } else {
+      arg1->base_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_base_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->base_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_mod_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->mod_dir) delete [] arg1->mod_dir;
+    if (arg2) {
+      arg1->mod_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->mod_dir, (const char *)arg2);
+    } else {
+      arg1->mod_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_mod_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->mod_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_conf_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->conf_dir) delete [] arg1->conf_dir;
+    if (arg2) {
+      arg1->conf_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->conf_dir, (const char *)arg2);
+    } else {
+      arg1->conf_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_conf_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->conf_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_log_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->log_dir) delete [] arg1->log_dir;
+    if (arg2) {
+      arg1->log_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->log_dir, (const char *)arg2);
+    } else {
+      arg1->log_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_log_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->log_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_run_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->run_dir) delete [] arg1->run_dir;
+    if (arg2) {
+      arg1->run_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->run_dir, (const char *)arg2);
+    } else {
+      arg1->run_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_run_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->run_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_db_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->db_dir) delete [] arg1->db_dir;
+    if (arg2) {
+      arg1->db_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->db_dir, (const char *)arg2);
+    } else {
+      arg1->db_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_db_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->db_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_script_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->script_dir) delete [] arg1->script_dir;
+    if (arg2) {
+      arg1->script_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->script_dir, (const char *)arg2);
+    } else {
+      arg1->script_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_script_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->script_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_temp_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->temp_dir) delete [] arg1->temp_dir;
+    if (arg2) {
+      arg1->temp_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->temp_dir, (const char *)arg2);
+    } else {
+      arg1->temp_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_temp_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->temp_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_htdocs_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->htdocs_dir) delete [] arg1->htdocs_dir;
+    if (arg2) {
+      arg1->htdocs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->htdocs_dir, (const char *)arg2);
+    } else {
+      arg1->htdocs_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_htdocs_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->htdocs_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_grammar_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->grammar_dir) delete [] arg1->grammar_dir;
+    if (arg2) {
+      arg1->grammar_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->grammar_dir, (const char *)arg2);
+    } else {
+      arg1->grammar_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_grammar_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->grammar_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_storage_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->storage_dir) delete [] arg1->storage_dir;
+    if (arg2) {
+      arg1->storage_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->storage_dir, (const char *)arg2);
+    } else {
+      arg1->storage_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_storage_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->storage_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_recordings_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->recordings_dir) delete [] arg1->recordings_dir;
+    if (arg2) {
+      arg1->recordings_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->recordings_dir, (const char *)arg2);
+    } else {
+      arg1->recordings_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_recordings_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->recordings_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_sounds_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->sounds_dir) delete [] arg1->sounds_dir;
+    if (arg2) {
+      arg1->sounds_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->sounds_dir, (const char *)arg2);
+    } else {
+      arg1->sounds_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_sounds_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->sounds_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_lib_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->lib_dir) delete [] arg1->lib_dir;
+    if (arg2) {
+      arg1->lib_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->lib_dir, (const char *)arg2);
+    } else {
+      arg1->lib_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_lib_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->lib_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_certs_dir_set(void * jarg1, char * jarg2) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->certs_dir) delete [] arg1->certs_dir;
+    if (arg2) {
+      arg1->certs_dir = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->certs_dir, (const char *)arg2);
+    } else {
+      arg1->certs_dir = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_certs_dir_get(void * jarg1) {
+  char * jresult ;
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  result = (char *) ((arg1)->certs_dir);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directories() {
+  void * jresult ;
+  switch_directories *result = 0 ;
+  
+  result = (switch_directories *)new switch_directories();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directories(void * jarg1) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_dirs_set(void * jarg1) {
+  switch_directories *arg1 = (switch_directories *) 0 ;
+  
+  arg1 = (switch_directories *)jarg1; 
+  SWITCH_GLOBAL_dirs = *arg1;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_SWITCH_GLOBAL_dirs_get() {
+  void * jresult ;
+  switch_directories *result = 0 ;
+  
+  result = (switch_directories *)&SWITCH_GLOBAL_dirs;
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_filenames_conf_name_set(void * jarg1, char * jarg2) {
+  switch_filenames *arg1 = (switch_filenames *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_filenames *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->conf_name) delete [] arg1->conf_name;
+    if (arg2) {
+      arg1->conf_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->conf_name, (const char *)arg2);
+    } else {
+      arg1->conf_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_filenames_conf_name_get(void * jarg1) {
+  char * jresult ;
+  switch_filenames *arg1 = (switch_filenames *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_filenames *)jarg1; 
+  result = (char *) ((arg1)->conf_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_filenames() {
+  void * jresult ;
+  switch_filenames *result = 0 ;
+  
+  result = (switch_filenames *)new switch_filenames();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_filenames(void * jarg1) {
+  switch_filenames *arg1 = (switch_filenames *) 0 ;
+  
+  arg1 = (switch_filenames *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_SWITCH_GLOBAL_filenames_set(void * jarg1) {
+  switch_filenames *arg1 = (switch_filenames *) 0 ;
+  
+  arg1 = (switch_filenames *)jarg1; 
+  SWITCH_GLOBAL_filenames = *arg1;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_SWITCH_GLOBAL_filenames_get() {
+  void * jresult ;
+  switch_filenames *result = 0 ;
+  
+  result = (switch_filenames *)&SWITCH_GLOBAL_filenames;
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STACKS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(16);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_THREAD_STACKSIZE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(240*1024);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SYSTEM_THREAD_STACKSIZE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(8192*1024);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_INTERVAL_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(120);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_INTERVAL_PAD_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(10);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_SAMPLE_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(48);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_BYTES_PER_SAMPLE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RECOMMENDED_BUFFER_SIZE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(8192);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CODECS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(50);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STATE_HANDLERS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(30);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_QUEUE_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(100000);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1024*8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->raw_bytes = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_raw_bytes_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->raw_bytes);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->media_bytes = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_bytes_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->media_bytes);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->period_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_period_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->period_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->media_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_media_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->media_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->skip_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_skip_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->skip_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->jb_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_jb_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->jb_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->dtmf_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_dtmf_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->dtmf_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->cng_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_cng_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->cng_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->flush_packet_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flush_packet_count_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->flush_packet_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->largest_jb_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_largest_jb_size_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->largest_jb_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_proc_time_set(void * jarg1, long long jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->last_proc_time = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_proc_time_get(void * jarg1) {
+  long long jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int64_t) ((arg1)->last_proc_time);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_n_set(void * jarg1, long long jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->jitter_n = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_n_get(void * jarg1) {
+  long long jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int64_t) ((arg1)->jitter_n);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_add_set(void * jarg1, long long jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->jitter_add = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_add_get(void * jarg1) {
+  long long jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int64_t) ((arg1)->jitter_add);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_addsq_set(void * jarg1, long long jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->jitter_addsq = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_rtp_numbers_t_jitter_addsq_get(void * jarg1) {
+  long long jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int64_t) ((arg1)->jitter_addsq);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_variance_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->variance = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_variance_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->variance);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_min_variance_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->min_variance = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_min_variance_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->min_variance);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_max_variance_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->max_variance = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_max_variance_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->max_variance);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_std_deviation_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->std_deviation = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_std_deviation_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->std_deviation);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_lossrate_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->lossrate = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_lossrate_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->lossrate);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_burstrate_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->burstrate = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_burstrate_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->burstrate);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mean_interval_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->mean_interval = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_mean_interval_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->mean_interval);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_loss_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int *arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int *)jarg2; 
+  {
+    size_t ii;
+    int *b = (int *) arg1->loss;
+    for (ii = 0; ii < (size_t)1024; ii++) b[ii] = *((int *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_loss_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int *result = 0 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int *)(int *) ((arg1)->loss);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_loss_set(void * jarg1, int jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->last_loss = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_loss_get(void * jarg1) {
+  int jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int) ((arg1)->last_loss);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_recved_set(void * jarg1, int jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->recved = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_recved_get(void * jarg1) {
+  int jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int) ((arg1)->recved);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_processed_seq_set(void * jarg1, int jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->last_processed_seq = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_processed_seq_get(void * jarg1) {
+  int jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (int) ((arg1)->last_processed_seq);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->flaws = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_flaws_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->flaws);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_set(void * jarg1, void * jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->last_flaw = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_numbers_t_last_flaw_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result =  ((arg1)->last_flaw);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_R_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->R = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_R_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->R);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_numbers_t_mos_set(void * jarg1, double jarg2) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->mos = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_rtp_numbers_t_mos_get(void * jarg1) {
+  double jresult ;
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  result = (double) ((arg1)->mos);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_numbers_t() {
+  void * jresult ;
+  switch_rtp_numbers_t *result = 0 ;
+  
+  result = (switch_rtp_numbers_t *)new switch_rtp_numbers_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_numbers_t(void * jarg1) {
+  switch_rtp_numbers_t *arg1 = (switch_rtp_numbers_t *) 0 ;
+  
+  arg1 = (switch_rtp_numbers_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_set(void * jarg1, unsigned long jarg2) {
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->packet_count = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  result = (uint32_t) ((arg1)->packet_count);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_set(void * jarg1, unsigned long jarg2) {
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->octet_count = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  result = (uint32_t) ((arg1)->octet_count);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_peer_ssrc_set(void * jarg1, unsigned long jarg2) {
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->peer_ssrc = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_peer_ssrc_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  result = (uint32_t) ((arg1)->peer_ssrc);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtcp_numbers_t() {
+  void * jresult ;
+  switch_rtcp_numbers_t *result = 0 ;
+  
+  result = (switch_rtcp_numbers_t *)new switch_rtcp_numbers_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_numbers_t(void * jarg1) {
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;
+  
+  arg1 = (switch_rtcp_numbers_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_set(void * jarg1, void * jarg2) {
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtp_numbers_t *arg2 = (switch_rtp_numbers_t *) 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  arg2 = (switch_rtp_numbers_t *)jarg2; 
+  if (arg1) (arg1)->inbound = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtp_numbers_t *result = 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  result = (switch_rtp_numbers_t *)& ((arg1)->inbound);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_set(void * jarg1, void * jarg2) {
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtp_numbers_t *arg2 = (switch_rtp_numbers_t *) 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  arg2 = (switch_rtp_numbers_t *)jarg2; 
+  if (arg1) (arg1)->outbound = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtp_numbers_t *result = 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  result = (switch_rtp_numbers_t *)& ((arg1)->outbound);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_set(void * jarg1, void * jarg2) {
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtcp_numbers_t *arg2 = (switch_rtcp_numbers_t *) 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  arg2 = (switch_rtcp_numbers_t *)jarg2; 
+  if (arg1) (arg1)->rtcp = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  switch_rtcp_numbers_t *result = 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  result = (switch_rtcp_numbers_t *)& ((arg1)->rtcp);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_read_count_set(void * jarg1, unsigned long jarg2) {
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->read_count = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_stats_t_read_count_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->read_count);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_stats_t() {
+  void * jresult ;
+  switch_rtp_stats_t *result = 0 ;
+  
+  result = (switch_rtp_stats_t *)new switch_rtp_stats_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_stats_t(void * jarg1) {
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;
+  
+  arg1 = (switch_rtp_stats_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_CNG_PAYLOAD_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(13);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_version_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->version = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_version_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->version);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_p_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->p = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_p_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->p);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_x_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->x = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_x_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->x);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_cc_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->cc = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_cc_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->cc);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_m_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->m = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_m_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->m);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_pt_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->pt = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_pt_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->pt);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_seq_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->seq = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_seq_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->seq);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ts_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->ts = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_ts_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->ts);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_t_ssrc_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->ssrc = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_t_ssrc_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->ssrc);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_hdr_t() {
+  void * jresult ;
+  switch_rtp_hdr_t *result = 0 ;
+  
+  result = (switch_rtp_hdr_t *)new switch_rtp_hdr_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_t(void * jarg1) {
+  switch_rtp_hdr_t *arg1 = (switch_rtp_hdr_t *) 0 ;
+  
+  arg1 = (switch_rtp_hdr_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->length = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  result = (unsigned int) ((arg1)->length);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->profile = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  result = (unsigned int) ((arg1)->profile);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_hdr_ext_t() {
+  void * jresult ;
+  switch_rtp_hdr_ext_t *result = 0 ;
+  
+  result = (switch_rtp_hdr_ext_t *)new switch_rtp_hdr_ext_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_ext_t(void * jarg1) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_set(void * jarg1, unsigned int jarg2) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->version = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->version);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_p_set(void * jarg1, unsigned int jarg2) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->p = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_p_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->p);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_count_set(void * jarg1, unsigned int jarg2) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->count = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_count_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->count);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_type_set(void * jarg1, unsigned int jarg2) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_type_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_length_set(void * jarg1, unsigned int jarg2) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->length = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtcp_hdr_t_length_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  result = (unsigned int) ((arg1)->length);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtcp_hdr_t() {
+  void * jresult ;
+  switch_rtcp_hdr_t *result = 0 ;
+  
+  result = (switch_rtcp_hdr_t *)new switch_rtcp_hdr_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_hdr_t(void * jarg1) {
+  switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
+  
+  arg1 = (switch_rtcp_hdr_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_ts_set(void * jarg1, unsigned long jarg2) {
+  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ts = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_ts_get(void * jarg1) {
+  unsigned long jresult ;
+  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (audio_buffer_header_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ts);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_audio_buffer_header_t_len_set(void * jarg1, unsigned long jarg2) {
+  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (audio_buffer_header_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->len = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_audio_buffer_header_t_len_get(void * jarg1) {
+  unsigned long jresult ;
+  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (audio_buffer_header_t *)jarg1; 
+  result = (uint32_t) ((arg1)->len);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_audio_buffer_header_t() {
+  void * jresult ;
+  audio_buffer_header_t *result = 0 ;
+  
+  result = (audio_buffer_header_t *)new audio_buffer_header_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_audio_buffer_header_t(void * jarg1) {
+  audio_buffer_header_t *arg1 = (audio_buffer_header_t *) 0 ;
+  
+  arg1 = (audio_buffer_header_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxVersion_set(void * jarg1, unsigned short jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint16_t)jarg2; 
+  if (arg1) (arg1)->T38FaxVersion = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxVersion_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint16_t) ((arg1)->T38FaxVersion);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_set(void * jarg1, unsigned long jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->T38MaxBitRate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38MaxBitRate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint32_t) ((arg1)->T38MaxBitRate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_set(void * jarg1, int jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  if (arg1) (arg1)->T38FaxFillBitRemoval = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxFillBitRemoval_get(void * jarg1) {
+  int jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (switch_bool_t) ((arg1)->T38FaxFillBitRemoval);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_set(void * jarg1, int jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  if (arg1) (arg1)->T38FaxTranscodingMMR = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingMMR_get(void * jarg1) {
+  int jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (switch_bool_t) ((arg1)->T38FaxTranscodingMMR);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_set(void * jarg1, int jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  if (arg1) (arg1)->T38FaxTranscodingJBIG = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxTranscodingJBIG_get(void * jarg1) {
+  int jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (switch_bool_t) ((arg1)->T38FaxTranscodingJBIG);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->T38FaxRateManagement = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->T38FaxRateManagement, (const char *)arg2);
+    } else {
+      arg1->T38FaxRateManagement = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxRateManagement_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->T38FaxRateManagement);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_set(void * jarg1, unsigned long jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->T38FaxMaxBuffer = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxBuffer_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint32_t) ((arg1)->T38FaxMaxBuffer);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_set(void * jarg1, unsigned long jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->T38FaxMaxDatagram = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxMaxDatagram_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint32_t) ((arg1)->T38FaxMaxDatagram);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->T38FaxUdpEC = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->T38FaxUdpEC, (const char *)arg2);
+    } else {
+      arg1->T38FaxUdpEC = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38FaxUdpEC_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->T38FaxUdpEC);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->T38VendorInfo = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->T38VendorInfo, (const char *)arg2);
+    } else {
+      arg1->T38VendorInfo = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_T38VendorInfo_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->T38VendorInfo);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_ip_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->remote_ip = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->remote_ip, (const char *)arg2);
+    } else {
+      arg1->remote_ip = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_remote_ip_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->remote_ip);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_set(void * jarg1, unsigned short jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint16_t)jarg2; 
+  if (arg1) (arg1)->remote_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint16_t) ((arg1)->remote_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_ip_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->local_ip = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->local_ip, (const char *)arg2);
+    } else {
+      arg1->local_ip = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_local_ip_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->local_ip);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_port_set(void * jarg1, unsigned short jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t arg2 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (uint16_t)jarg2; 
+  if (arg1) (arg1)->local_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_local_port_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  uint16_t result;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (uint16_t) ((arg1)->local_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_sdp_o_line_set(void * jarg1, char * jarg2) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->sdp_o_line = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->sdp_o_line, (const char *)arg2);
+    } else {
+      arg1->sdp_o_line = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_t38_options_t_sdp_o_line_get(void * jarg1) {
+  char * jresult ;
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  result = (char *) ((arg1)->sdp_o_line);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_t38_options_t() {
+  void * jresult ;
+  switch_t38_options_t *result = 0 ;
+  
+  result = (switch_t38_options_t *)new switch_t38_options_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_t38_options_t(void * jarg1) {
+  switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;
+  
+  arg1 = (switch_t38_options_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MEDIA_TYPE_TOTAL_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_val_set(void * jarg1, char * jarg2) {
+  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_console_callback_match_node *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->val) delete [] arg1->val;
+    if (arg2) {
+      arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->val, (const char *)arg2);
+    } else {
+      arg1->val = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_console_callback_match_node_val_get(void * jarg1) {
+  char * jresult ;
+  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_console_callback_match_node *)jarg1; 
+  result = (char *) ((arg1)->val);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_node_next_set(void * jarg1, void * jarg2) {
+  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
+  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
+  
+  arg1 = (switch_console_callback_match_node *)jarg1; 
+  arg2 = (switch_console_callback_match_node *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_node_next_get(void * jarg1) {
+  void * jresult ;
+  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
+  switch_console_callback_match_node *result = 0 ;
+  
+  arg1 = (switch_console_callback_match_node *)jarg1; 
+  result = (switch_console_callback_match_node *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_console_callback_match_node() {
+  void * jresult ;
+  switch_console_callback_match_node *result = 0 ;
+  
+  result = (switch_console_callback_match_node *)new switch_console_callback_match_node();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match_node(void * jarg1) {
+  switch_console_callback_match_node *arg1 = (switch_console_callback_match_node *) 0 ;
+  
+  arg1 = (switch_console_callback_match_node *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_head_set(void * jarg1, void * jarg2) {
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  arg2 = (switch_console_callback_match_node *)jarg2; 
+  if (arg1) (arg1)->head = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_head_get(void * jarg1) {
+  void * jresult ;
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  switch_console_callback_match_node *result = 0 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  result = (switch_console_callback_match_node *) ((arg1)->head);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_end_set(void * jarg1, void * jarg2) {
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  switch_console_callback_match_node *arg2 = (switch_console_callback_match_node *) 0 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  arg2 = (switch_console_callback_match_node *)jarg2; 
+  if (arg1) (arg1)->end = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_console_callback_match_end_get(void * jarg1) {
+  void * jresult ;
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  switch_console_callback_match_node *result = 0 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  result = (switch_console_callback_match_node *) ((arg1)->end);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_count_set(void * jarg1, int jarg2) {
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->count = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_callback_match_count_get(void * jarg1) {
+  int jresult ;
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  int result;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  result = (int) ((arg1)->count);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_callback_match_dynamic_set(void * jarg1, int jarg2) {
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->dynamic = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_callback_match_dynamic_get(void * jarg1) {
+  int jresult ;
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  int result;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  result = (int) ((arg1)->dynamic);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_console_callback_match() {
+  void * jresult ;
+  switch_console_callback_match *result = 0 ;
+  
+  result = (switch_console_callback_match *)new switch_console_callback_match();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_console_callback_match(void * jarg1) {
+  switch_console_callback_match *arg1 = (switch_console_callback_match *) 0 ;
+  
+  arg1 = (switch_console_callback_match *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_DMACHINE_MAX_DIGIT_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(512);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_dmachine_set(void * jarg1, void * jarg2) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  arg2 = (switch_ivr_dmachine_t *)jarg2; 
+  if (arg1) (arg1)->dmachine = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_dmachine_get(void * jarg1) {
+  void * jresult ;
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  switch_ivr_dmachine_t *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  result = (switch_ivr_dmachine_t *) ((arg1)->dmachine);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_digits_set(void * jarg1, char * jarg2) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->match_digits = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->match_digits, (const char *)arg2);
+    } else {
+      arg1->match_digits = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_digits_get(void * jarg1) {
+  char * jresult ;
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  result = (char *) ((arg1)->match_digits);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_key_set(void * jarg1, int jarg2) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  int32_t arg2 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  arg2 = (int32_t)jarg2; 
+  if (arg1) (arg1)->match_key = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_match_match_key_get(void * jarg1) {
+  int jresult ;
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  int32_t result;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  result = (int32_t) ((arg1)->match_key);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_type_set(void * jarg1, int jarg2) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  dm_match_type_t arg2 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  arg2 = (dm_match_type_t)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_match_type_get(void * jarg1) {
+  int jresult ;
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  dm_match_type_t result;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  result = (dm_match_type_t) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_match_user_data_set(void * jarg1, void * jarg2) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_match_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  result = (void *) ((arg1)->user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_ivr_dmachine_match() {
+  void * jresult ;
+  switch_ivr_dmachine_match *result = 0 ;
+  
+  result = (switch_ivr_dmachine_match *)new switch_ivr_dmachine_match();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_ivr_dmachine_match(void * jarg1) {
+  switch_ivr_dmachine_match *arg1 = (switch_ivr_dmachine_match *) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_match *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_MAX_ARG_RECURSION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(25);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_input_callback_set(void * jarg1, void * jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (switch_input_callback_function_t)jarg2; 
+  if (arg1) (arg1)->input_callback = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_input_callback_get(void * jarg1) {
+  void * jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_input_callback_function_t result;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (switch_input_callback_function_t) ((arg1)->input_callback);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buf_set(void * jarg1, void * jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->buf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_buf_get(void * jarg1) {
+  void * jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (void *) ((arg1)->buf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_buflen_set(void * jarg1, unsigned long jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->buflen = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_input_args_t_buflen_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (uint32_t) ((arg1)->buflen);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_read_frame_callback_set(void * jarg1, void * jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_read_frame_callback_function_t arg2 = (switch_read_frame_callback_function_t) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (switch_read_frame_callback_function_t)jarg2; 
+  if (arg1) (arg1)->read_frame_callback = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_read_frame_callback_get(void * jarg1) {
+  void * jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_read_frame_callback_function_t result;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (switch_read_frame_callback_function_t) ((arg1)->read_frame_callback);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_user_data_set(void * jarg1, void * jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (void *) ((arg1)->user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_dmachine_set(void * jarg1, void * jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (switch_ivr_dmachine_t *)jarg2; 
+  if (arg1) (arg1)->dmachine = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_dmachine_get(void * jarg1) {
+  void * jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  switch_ivr_dmachine_t *result = 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (switch_ivr_dmachine_t *) ((arg1)->dmachine);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_loops_set(void * jarg1, int jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->loops = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_input_args_t_loops_get(void * jarg1) {
+  int jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (int) ((arg1)->loops);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_input_args_t() {
+  void * jresult ;
+  switch_input_args_t *result = 0 ;
+  
+  result = (switch_input_args_t *)new switch_input_args_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_input_args_t(void * jarg1) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_type_set(void * jarg1, int jarg2) {
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_type_t arg2 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  arg2 = (switch_say_type_t)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_type_get(void * jarg1) {
+  int jresult ;
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_type_t result;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  result = (switch_say_type_t) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_method_set(void * jarg1, int jarg2) {
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_method_t arg2 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  arg2 = (switch_say_method_t)jarg2; 
+  if (arg1) (arg1)->method = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_method_get(void * jarg1) {
+  int jresult ;
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_method_t result;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  result = (switch_say_method_t) ((arg1)->method);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_gender_set(void * jarg1, int jarg2) {
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_gender_t arg2 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  arg2 = (switch_say_gender_t)jarg2; 
+  if (arg1) (arg1)->gender = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_args_t_gender_get(void * jarg1) {
+  int jresult ;
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  switch_say_gender_t result;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  result = (switch_say_gender_t) ((arg1)->gender);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_args_t_ext_set(void * jarg1, char * jarg2) {
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->ext = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->ext, (const char *)arg2);
+    } else {
+      arg1->ext = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_args_t_ext_get(void * jarg1) {
+  char * jresult ;
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  result = (char *) ((arg1)->ext);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_say_args_t() {
+  void * jresult ;
+  switch_say_args_t *result = 0 ;
+  
+  result = (switch_say_args_t *)new switch_say_args_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_args_t(void * jarg1) {
+  switch_say_args_t *arg1 = (switch_say_args_t *) 0 ;
+  
+  arg1 = (switch_say_args_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_API_VERSION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_set(void * jarg1, int jarg2) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->switch_api_version = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_switch_api_version_get(void * jarg1) {
+  int jresult ;
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  result = (int) ((arg1)->switch_api_version);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_load_t arg2 = (switch_module_load_t) 0 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg2 = (switch_module_load_t)jarg2; 
+  if (arg1) (arg1)->load = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_load_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_load_t result;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  result = (switch_module_load_t) ((arg1)->load);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_shutdown_t arg2 = (switch_module_shutdown_t) 0 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg2 = (switch_module_shutdown_t)jarg2; 
+  if (arg1) (arg1)->shutdown = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_shutdown_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_shutdown_t result;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  result = (switch_module_shutdown_t) ((arg1)->shutdown);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_runtime_t arg2 = (switch_module_runtime_t) 0 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg2 = (switch_module_runtime_t)jarg2; 
+  if (arg1) (arg1)->runtime = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_runtime_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_runtime_t result;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  result = (switch_module_runtime_t) ((arg1)->runtime);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_flag_t arg2 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  arg2 = (switch_module_flag_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_loadable_module_function_table_t_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  switch_module_flag_t result;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  result = (switch_module_flag_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_loadable_module_function_table_t() {
+  void * jresult ;
+  switch_loadable_module_function_table_t *result = 0 ;
+  
+  result = (switch_loadable_module_function_table_t *)new switch_loadable_module_function_table_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_function_table_t(void * jarg1) {
+  switch_loadable_module_function_table_t *arg1 = (switch_loadable_module_function_table_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_function_table_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_type_set(void * jarg1, int jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_media_type_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_media_type_t)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_type_get(void * jarg1) {
+  int jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_media_type_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_media_type_t) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_sdp_type_set(void * jarg1, int jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_sdp_type_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_sdp_type_t)jarg2; 
+  if (arg1) (arg1)->sdp_type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_sdp_type_get(void * jarg1) {
+  int jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_sdp_type_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_sdp_type_t) ((arg1)->sdp_type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_ptime_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ptime = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_ptime_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ptime);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rate_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint32_t) ((arg1)->rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_allocated_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->allocated = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_allocated_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint8_t) ((arg1)->allocated);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_negotiated_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->negotiated = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_negotiated_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint8_t) ((arg1)->negotiated);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_current_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->current = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_current_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint8_t) ((arg1)->current);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_hash_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->hash = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_hash_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (unsigned long) ((arg1)->hash);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_encoding_set(void * jarg1, char * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->rm_encoding) delete [] arg1->rm_encoding;
+    if (arg2) {
+      arg1->rm_encoding = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->rm_encoding, (const char *)arg2);
+    } else {
+      arg1->rm_encoding = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_encoding_get(void * jarg1) {
+  char * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (char *) ((arg1)->rm_encoding);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_iananame_set(void * jarg1, char * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->iananame) delete [] arg1->iananame;
+    if (arg2) {
+      arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->iananame, (const char *)arg2);
+    } else {
+      arg1->iananame = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_iananame_get(void * jarg1) {
+  char * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (char *) ((arg1)->iananame);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_pt_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->pt = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_pt_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_payload_t) ((arg1)->pt);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_rate_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->rm_rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rm_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (unsigned long) ((arg1)->rm_rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->adv_rm_rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  unsigned long result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (unsigned long) ((arg1)->adv_rm_rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_codec_ms_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->codec_ms = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_codec_ms_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint32_t) ((arg1)->codec_ms);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_bitrate_set(void * jarg1, unsigned long jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->bitrate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_bitrate_get(void * jarg1) {
+  unsigned long jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (uint32_t) ((arg1)->bitrate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_set(void * jarg1, char * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->rm_fmtp) delete [] arg1->rm_fmtp;
+    if (arg2) {
+      arg1->rm_fmtp = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->rm_fmtp, (const char *)arg2);
+    } else {
+      arg1->rm_fmtp = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_get(void * jarg1) {
+  char * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (char *) ((arg1)->rm_fmtp);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_agreed_pt_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->agreed_pt = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_agreed_pt_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_payload_t) ((arg1)->agreed_pt);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_recv_pt_set(void * jarg1, unsigned char jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->recv_pt = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_recv_pt_get(void * jarg1) {
+  unsigned char jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_payload_t) ((arg1)->recv_pt);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_fmtp_out_set(void * jarg1, char * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->fmtp_out) delete [] arg1->fmtp_out;
+    if (arg2) {
+      arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->fmtp_out, (const char *)arg2);
+    } else {
+      arg1->fmtp_out = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_fmtp_out_get(void * jarg1) {
+  char * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (char *) ((arg1)->fmtp_out);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_set(void * jarg1, char * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->remote_sdp_ip) delete [] arg1->remote_sdp_ip;
+    if (arg2) {
+      arg1->remote_sdp_ip = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->remote_sdp_ip, (const char *)arg2);
+    } else {
+      arg1->remote_sdp_ip = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_get(void * jarg1) {
+  char * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (char *) ((arg1)->remote_sdp_ip);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_set(void * jarg1, unsigned short jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  if (arg1) (arg1)->remote_sdp_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_get(void * jarg1) {
+  unsigned short jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (switch_port_t) ((arg1)->remote_sdp_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_channels_set(void * jarg1, int jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->channels = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_channels_get(void * jarg1) {
+  int jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  int result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (int) ((arg1)->channels);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_channels_set(void * jarg1, int jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->adv_channels = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_adv_channels_get(void * jarg1) {
+  int jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  int result;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (int) ((arg1)->adv_channels);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_next_set(void * jarg1, void * jarg2) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  payload_map_s *arg2 = (payload_map_s *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  arg2 = (payload_map_s *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_payload_map_t_next_get(void * jarg1) {
+  void * jresult ;
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  payload_map_s *result = 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  result = (payload_map_s *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_payload_map_t() {
+  void * jresult ;
+  payload_map_t *result = 0 ;
+  
+  result = (payload_map_t *)new payload_map_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_payload_map_t(void * jarg1) {
+  payload_map_t *arg1 = (payload_map_t *) 0 ;
+  
+  arg1 = (payload_map_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_close(void * jarg1) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  result = (int)switch_core_db_close(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_open(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_core_db_t **arg2 = (switch_core_db_t **) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_core_db_t **)jarg2; 
+  result = (int)switch_core_db_open((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_db_column_text(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  unsigned char *result = 0 ;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (unsigned char *)switch_core_db_column_text(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_db_column_name(void * jarg1, int jarg2) {
+  char * jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (char *)switch_core_db_column_name(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_column_count(void * jarg1) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  result = (int)switch_core_db_column_count(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_db_errmsg(void * jarg1) {
+  char * jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  result = (char *)switch_core_db_errmsg(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_exec(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  char **arg5 = (char **) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_callback_func_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  arg5 = (char **)jarg5; 
+  result = (int)switch_core_db_exec(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_finalize(void * jarg1) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  result = (int)switch_core_db_finalize(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_prepare(void * jarg1, char * jarg2, int jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  switch_core_db_stmt_t **arg4 = (switch_core_db_stmt_t **) 0 ;
+  char **arg5 = (char **) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (switch_core_db_stmt_t **)jarg4; 
+  arg5 = (char **)jarg5; 
+  result = (int)switch_core_db_prepare(arg1,(char const *)arg2,arg3,arg4,(char const **)arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_step(void * jarg1) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  result = (int)switch_core_db_step(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_reset(void * jarg1) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  result = (int)switch_core_db_reset(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_int(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_core_db_bind_int(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_int64(void * jarg1, int jarg2, long long jarg3) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  int64_t arg3 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int64_t)jarg3; 
+  result = (int)switch_core_db_bind_int64(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_text(void * jarg1, int jarg2, char * jarg3, int jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_core_db_destructor_type_t arg5 = (switch_core_db_destructor_type_t) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_core_db_destructor_type_t)jarg5; 
+  result = (int)switch_core_db_bind_text(arg1,arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_bind_double(void * jarg1, int jarg2, double jarg3) {
+  int jresult ;
+  switch_core_db_stmt_t *arg1 = (switch_core_db_stmt_t *) 0 ;
+  int arg2 ;
+  double arg3 ;
+  int result;
+  
+  arg1 = (switch_core_db_stmt_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (double)jarg3; 
+  result = (int)switch_core_db_bind_double(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_core_db_last_insert_rowid(void * jarg1) {
+  long long jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  result = (int64_t)switch_core_db_last_insert_rowid(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_get_table(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char ***arg3 = (char ***) 0 ;
+  int *arg4 = (int *) 0 ;
+  int *arg5 = (int *) 0 ;
+  char **arg6 = (char **) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char ***)jarg3; 
+  arg4 = (int *)jarg4; 
+  arg5 = (int *)jarg5; 
+  arg6 = (char **)jarg6; 
+  result = (int)switch_core_db_get_table(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_free_table(void * jarg1) {
+  char **arg1 = (char **) 0 ;
+  
+  arg1 = (char **)jarg1; 
+  switch_core_db_free_table(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_free(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_core_db_free(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_changes(void * jarg1) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  result = (int)switch_core_db_changes(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_load_extension(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_core_db_load_extension(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_OK_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(0);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ERROR_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERNAL_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PERM_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ABORT_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_BUSY_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_LOCKED_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOMEM_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_READONLY_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_INTERRUPT_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_IOERR_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(10);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CORRUPT_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(11);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTFOUND_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(12);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FULL_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(13);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CANTOPEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(14);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_PROTOCOL_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(15);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_EMPTY_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(16);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_SCHEMA_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(17);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_TOOBIG_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(18);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_CONSTRAINT_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(19);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISMATCH_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(20);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_MISUSE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(21);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOLFS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(22);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_AUTH_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(23);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_FORMAT_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(24);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_RANGE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(25);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_NOTADB_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(26);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_ROW_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(100);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_DONE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(101);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_sql_concat() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_sql_concat();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_regex_compile(char * jarg1, int jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  char **arg3 = (char **) 0 ;
+  int *arg4 = (int *) 0 ;
+  unsigned char *arg5 = (unsigned char *) 0 ;
+  switch_regex_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char **)jarg3; 
+  arg4 = (int *)jarg4; 
+  arg5 = (unsigned char *)jarg5; 
+  result = (switch_regex_t *)switch_regex_compile((char const *)arg1,arg2,(char const **)arg3,arg4,(unsigned char const *)arg5);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_copy_substring(char * jarg1, void * jarg2, int jarg3, int jarg4, char * jarg5, int jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int arg3 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  int arg6 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (int)jarg6; 
+  result = (int)switch_regex_copy_substring((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_free(void * jarg1) {
+  void *arg1 = (void *) 0 ;
+  
+  arg1 = (void *)jarg1; 
+  switch_regex_free(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_perform(char * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_regex_t **arg3 = (switch_regex_t **) 0 ;
+  int *arg4 = (int *) 0 ;
+  uint32_t arg5 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_regex_t **)jarg3; 
+  arg4 = (int *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  result = (int)switch_regex_perform((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_perform_substitution(void * jarg1, int jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6, void * jarg7) {
+  switch_regex_t *arg1 = (switch_regex_t *) 0 ;
+  int arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_size_t arg6 ;
+  int *arg7 = (int *) 0 ;
+  switch_size_t *argp6 ;
+  
+  arg1 = (switch_regex_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  argp6 = (switch_size_t *)jarg6; 
+  if (!argp6) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg6 = *argp6; 
+  arg7 = (int *)jarg7; 
+  switch_perform_substitution(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_match(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_regex_match((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_regex_match_partial(char * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int *arg3 = (int *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int *)jarg3; 
+  result = (switch_status_t)switch_regex_match_partial((char const *)arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_capture_regex(void * jarg1, int jarg2, char * jarg3, void * jarg4, char * jarg5, void * jarg6, void * jarg7) {
+  switch_regex_t *arg1 = (switch_regex_t *) 0 ;
+  int arg2 ;
+  char *arg3 = (char *) 0 ;
+  int *arg4 = (int *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_cap_callback_t arg6 = (switch_cap_callback_t) 0 ;
+  void *arg7 = (void *) 0 ;
+  
+  arg1 = (switch_regex_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_cap_callback_t)jarg6; 
+  arg7 = (void *)jarg7; 
+  switch_capture_regex(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6,arg7);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_set_var_callback(char * jarg1, char * jarg2, void * jarg3) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  switch_regex_set_var_callback((char const *)arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_regex_set_event_header_callback(char * jarg1, char * jarg2, void * jarg3) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  switch_regex_set_event_header_callback((char const *)arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_CORE_THREAD_SESSION_OBJS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(128);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_STREAMS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(128);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_mms_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->mms = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_mms_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->mms);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_ms_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ms = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_ms_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->ms);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_sec_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->sec = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_sec_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->sec);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_min_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->min = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_min_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->min);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_hr_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->hr = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_hr_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->hr);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_day_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->day = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_day_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->day);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_time_duration_yr_set(void * jarg1, unsigned long jarg2) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->yr = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_time_duration_yr_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  result = (uint32_t) ((arg1)->yr);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_time_duration() {
+  void * jresult ;
+  switch_core_time_duration *result = 0 ;
+  
+  result = (switch_core_time_duration *)new switch_core_time_duration();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_time_duration(void * jarg1) {
+  switch_core_time_duration *arg1 = (switch_core_time_duration *) 0 ;
+  
+  arg1 = (switch_core_time_duration *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_app_set(void * jarg1, char * jarg2) {
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->app) delete [] arg1->app;
+    if (arg2) {
+      arg1->app = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->app, (const char *)arg2);
+    } else {
+      arg1->app = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_app_log_app_get(void * jarg1) {
+  char * jresult ;
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  result = (char *) ((arg1)->app);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_arg_set(void * jarg1, char * jarg2) {
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->arg) delete [] arg1->arg;
+    if (arg2) {
+      arg1->arg = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->arg, (const char *)arg2);
+    } else {
+      arg1->arg = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_app_log_arg_get(void * jarg1) {
+  char * jresult ;
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  result = (char *) ((arg1)->arg);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_stamp_set(void * jarg1, void * jarg2) {
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->stamp = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_app_log_stamp_get(void * jarg1) {
+  void * jresult ;
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  result =  ((arg1)->stamp);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_app_log_next_set(void * jarg1, void * jarg2) {
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  switch_app_log *arg2 = (switch_app_log *) 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  arg2 = (switch_app_log *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_app_log_next_get(void * jarg1) {
+  void * jresult ;
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  switch_app_log *result = 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  result = (switch_app_log *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_app_log() {
+  void * jresult ;
+  switch_app_log *result = 0 ;
+  
+  result = (switch_app_log *)new switch_app_log();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_app_log(void * jarg1) {
+  switch_app_log *arg1 = (switch_app_log *) 0 ;
+  
+  arg1 = (switch_app_log *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_func_set(void * jarg1, void * jarg2) {
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_start_t arg2 ;
+  switch_thread_start_t *argp2 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  argp2 = (switch_thread_start_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_thread_start_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->func = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_func_get(void * jarg1) {
+  void * jresult ;
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_thread_start_t result;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  result =  ((arg1)->func);
+  jresult = new switch_thread_start_t((const switch_thread_start_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_obj_set(void * jarg1, void * jarg2) {
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->obj = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_obj_get(void * jarg1) {
+  void * jresult ;
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  result = (void *) ((arg1)->obj);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_alloc_set(void * jarg1, int jarg2) {
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->alloc = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_data_t_alloc_get(void * jarg1) {
+  int jresult ;
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  result = (int) ((arg1)->alloc);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_thread_data_t_pool_set(void * jarg1, void * jarg2) {
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_thread_data_t_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_thread_data_t() {
+  void * jresult ;
+  switch_thread_data_t *result = 0 ;
+  
+  result = (switch_thread_data_t *)new switch_thread_data_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_thread_data_t(void * jarg1) {
+  switch_thread_data_t *arg1 = (switch_thread_data_t *) 0 ;
+  
+  arg1 = (switch_thread_data_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_on_set(void * jarg1, void * jarg2) {
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->on = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_on_get(void * jarg1) {
+  void * jresult ;
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  result =  ((arg1)->on);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_off_set(void * jarg1, void * jarg2) {
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->off = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_off_get(void * jarg1) {
+  void * jresult ;
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  result =  ((arg1)->off);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_uuid_set(void * jarg1, char * jarg2) {
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid) delete [] arg1->uuid;
+    if (arg2) {
+      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid, (const char *)arg2);
+    } else {
+      arg1->uuid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_hold_record_t_uuid_get(void * jarg1) {
+  char * jresult ;
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  result = (char *) ((arg1)->uuid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_hold_record_t_next_set(void * jarg1, void * jarg2) {
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *arg2 = (switch_hold_record_s *) 0 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  arg2 = (switch_hold_record_s *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hold_record_t_next_get(void * jarg1) {
+  void * jresult ;
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  switch_hold_record_s *result = 0 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  result = (switch_hold_record_s *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_hold_record_t() {
+  void * jresult ;
+  switch_hold_record_t *result = 0 ;
+  
+  result = (switch_hold_record_t *)new switch_hold_record_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_hold_record_t(void * jarg1) {
+  switch_hold_record_t *arg1 = (switch_hold_record_t *) 0 ;
+  
+  arg1 = (switch_hold_record_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_uuid_set(void * jarg1, char * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid) delete [] arg1->uuid;
+    if (arg2) {
+      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid, (const char *)arg2);
+    } else {
+      arg1->uuid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_node_t_uuid_get(void * jarg1) {
+  char * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (char *) ((arg1)->uuid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->xml_cdr = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_xml_cdr_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_xml_t) ((arg1)->xml_cdr);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t__event_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  if (arg1) (arg1)->event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t__event_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_event_t *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_event_t *) ((arg1)->event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_callstate_set(void * jarg1, int jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_channel_callstate_t arg2 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_channel_callstate_t)jarg2; 
+  if (arg1) (arg1)->callstate = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_callstate_get(void * jarg1) {
+  int jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_channel_callstate_t result;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_channel_callstate_t) ((arg1)->callstate);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hold_record_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_hold_record_t *arg2 = (switch_hold_record_t *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_hold_record_t *)jarg2; 
+  if (arg1) (arg1)->hold_record = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hold_record_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_hold_record_t *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_hold_record_t *) ((arg1)->hold_record);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  if (arg1) (arg1)->hup_profile = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_hup_profile_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_caller_profile_t *) ((arg1)->hup_profile);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_direction_set(void * jarg1, int jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_call_direction_t arg2 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  if (arg1) (arg1)->direction = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_node_t_direction_get(void * jarg1) {
+  int jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_call_direction_t) ((arg1)->direction);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_parent_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_device_record_s *arg2 = (switch_device_record_s *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (switch_device_record_s *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  switch_device_record_s *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (switch_device_record_s *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_node_t_next_set(void * jarg1, void * jarg2) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  arg2 = (device_uuid_node_s *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_node_t_next_get(void * jarg1) {
+  void * jresult ;
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  device_uuid_node_s *result = 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  result = (device_uuid_node_s *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_node_t() {
+  void * jresult ;
+  switch_device_node_t *result = 0 ;
+  
+  result = (switch_device_node_t *)new switch_device_node_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_node_t(void * jarg1) {
+  switch_device_node_t *arg1 = (switch_device_node_t *) 0 ;
+  
+  arg1 = (switch_device_node_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->total = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->total);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->total_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->total_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_total_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->total_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_total_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->total_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->offhook = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->offhook);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->offhook_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->offhook_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->offhook_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_offhook_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->offhook_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->active = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->active);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->active_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->active_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_active_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->active_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_active_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->active_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->held = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->held);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->held_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->held_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_held_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->held_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_held_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->held_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->unheld = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->unheld);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->unheld_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->unheld_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->unheld_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_unheld_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->unheld_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->hup = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->hup);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->hup_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->hup_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->hup_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_hup_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->hup_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ringing = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ringing);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ringing_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ringing_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ringing_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ringing_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ringing_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->early = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->early);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_in_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->early_in = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_in_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->early_in);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_early_out_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->early_out = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_early_out_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->early_out);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_set(void * jarg1, unsigned long jarg2) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ring_wait = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_device_stats_t_ring_wait_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  result = (uint32_t) ((arg1)->ring_wait);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_stats_t() {
+  void * jresult ;
+  switch_device_stats_t *result = 0 ;
+  
+  result = (switch_device_stats_t *)new switch_device_stats_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_stats_t(void * jarg1) {
+  switch_device_stats_t *arg1 = (switch_device_stats_t *) 0 ;
+  
+  arg1 = (switch_device_stats_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_device_id_set(void * jarg1, char * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->device_id) delete [] arg1->device_id;
+    if (arg2) {
+      arg1->device_id = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->device_id, (const char *)arg2);
+    } else {
+      arg1->device_id = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_device_id_get(void * jarg1) {
+  char * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (char *) ((arg1)->device_id);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_set(void * jarg1, char * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid) delete [] arg1->uuid;
+    if (arg2) {
+      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid, (const char *)arg2);
+    } else {
+      arg1->uuid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_device_record_t_uuid_get(void * jarg1) {
+  char * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (char *) ((arg1)->uuid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_refs_set(void * jarg1, int jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_refs_get(void * jarg1) {
+  int jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_stats_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_device_stats_t *)jarg2; 
+  if (arg1) (arg1)->stats = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_stats_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_stats_t *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_device_stats_t *)& ((arg1)->stats);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_stats_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_stats_t *arg2 = (switch_device_stats_t *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_device_stats_t *)jarg2; 
+  if (arg1) (arg1)->last_stats = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_stats_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_stats_t *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_device_stats_t *)& ((arg1)->last_stats);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_state_set(void * jarg1, int jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_state_t arg2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_device_state_t)jarg2; 
+  if (arg1) (arg1)->state = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_state_get(void * jarg1) {
+  int jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_state_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_device_state_t) ((arg1)->state);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_state_set(void * jarg1, int jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_state_t arg2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_device_state_t)jarg2; 
+  if (arg1) (arg1)->last_state = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_device_record_t_last_state_get(void * jarg1) {
+  int jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_device_state_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_device_state_t) ((arg1)->last_state);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_start_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->active_start = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_start_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->active_start);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_active_stop_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->active_stop = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_active_stop_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->active_stop);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->last_call_time = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_last_call_time_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->last_call_time);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_start_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->ring_start = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_start_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->ring_start);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->ring_stop = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_ring_stop_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->ring_stop);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_start_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->hold_start = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_start_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->hold_start);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->hold_stop = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_hold_stop_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->hold_stop);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_call_start_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->call_start = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_call_start_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result =  ((arg1)->call_start);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (device_uuid_node_s *)jarg2; 
+  if (arg1) (arg1)->uuid_list = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_list_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  device_uuid_node_s *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (device_uuid_node_s *) ((arg1)->uuid_list);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  device_uuid_node_s *arg2 = (device_uuid_node_s *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (device_uuid_node_s *)jarg2; 
+  if (arg1) (arg1)->uuid_tail = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_uuid_tail_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  device_uuid_node_s *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (device_uuid_node_s *) ((arg1)->uuid_tail);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_mutex_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->mutex = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_mutex_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->mutex);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_pool_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_device_record_t_user_data_set(void * jarg1, void * jarg2) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_device_record_t_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  result = (void *) ((arg1)->user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_device_record_t() {
+  void * jresult ;
+  switch_device_record_t *result = 0 ;
+  
+  result = (switch_device_record_t *)new switch_device_record_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_device_record_t(void * jarg1) {
+  switch_device_record_t *arg1 = (switch_device_record_t *) 0 ;
+  
+  arg1 = (switch_device_record_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_DTLS_SRTP_FNAME_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("dtls-srtp");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPLEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(64);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_MAX_FPSTRLEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(192);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_len_set(void * jarg1, unsigned long jarg2) {
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->len = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_dtls_fingerprint_t_len_get(void * jarg1) {
+  unsigned long jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  result = (uint32_t) ((arg1)->len);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_data_set(void * jarg1, void * jarg2) {
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  uint8_t *arg2 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg2 = (uint8_t *)jarg2; 
+  {
+    size_t ii;
+    uint8_t *b = (uint8_t *) arg1->data;
+    for (ii = 0; ii < (size_t)64+1; ii++) b[ii] = *((uint8_t *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_dtls_fingerprint_t_data_get(void * jarg1) {
+  void * jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  uint8_t *result = 0 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  result = (uint8_t *)(uint8_t *) ((arg1)->data);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_type_set(void * jarg1, char * jarg2) {
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->type) delete [] arg1->type;
+    if (arg2) {
+      arg1->type = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->type, (const char *)arg2);
+    } else {
+      arg1->type = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_type_get(void * jarg1) {
+  char * jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  result = (char *) ((arg1)->type);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_dtls_fingerprint_t_str_set(void * jarg1, char * jarg2) {
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->str, (const char *)arg2, 192-1);
+      arg1->str[192-1] = 0;
+    } else {
+      arg1->str[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_dtls_fingerprint_t_str_get(void * jarg1) {
+  char * jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  result = (char *)(char *) ((arg1)->str);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_dtls_fingerprint_t() {
+  void * jresult ;
+  dtls_fingerprint_t *result = 0 ;
+  
+  result = (dtls_fingerprint_t *)new dtls_fingerprint_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_dtls_fingerprint_t(void * jarg1) {
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_MESSAGE_STRING_ARG_MAX_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(10);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_from_set(void * jarg1, char * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->from) delete [] arg1->from;
+    if (arg2) {
+      arg1->from = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->from, (const char *)arg2);
+    } else {
+      arg1->from = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_from_get(void * jarg1) {
+  char * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char *) ((arg1)->from);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_message_id_set(void * jarg1, int jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_core_session_message_types_t arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (switch_core_session_message_types_t)jarg2; 
+  if (arg1) (arg1)->message_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_message_id_get(void * jarg1) {
+  int jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_core_session_message_types_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (switch_core_session_message_types_t) ((arg1)->message_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_arg_set(void * jarg1, int jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->numeric_arg = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_numeric_arg_get(void * jarg1) {
+  int jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (int) ((arg1)->numeric_arg);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_arg_set(void * jarg1, char * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->string_arg = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->string_arg, (const char *)arg2);
+    } else {
+      arg1->string_arg = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_string_arg_get(void * jarg1) {
+  char * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char *) ((arg1)->string_arg);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->string_arg_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_arg_size_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result =  ((arg1)->string_arg_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->pointer_arg = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (void *) ((arg1)->pointer_arg);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_size_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->pointer_arg_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_arg_size_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result =  ((arg1)->pointer_arg_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_numeric_reply_set(void * jarg1, int jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->numeric_reply = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_numeric_reply_get(void * jarg1) {
+  int jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (int) ((arg1)->numeric_reply);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_set(void * jarg1, char * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->string_reply) delete [] arg1->string_reply;
+    if (arg2) {
+      arg1->string_reply = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->string_reply, (const char *)arg2);
+    } else {
+      arg1->string_reply = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message_string_reply_get(void * jarg1) {
+  char * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char *) ((arg1)->string_reply);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_reply_size_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->string_reply_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_reply_size_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result =  ((arg1)->string_reply_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->pointer_reply = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (void *) ((arg1)->pointer_reply);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_size_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->pointer_reply_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_pointer_reply_size_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result =  ((arg1)->pointer_reply_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_core_session_message_flag_t arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (switch_core_session_message_flag_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_message_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  switch_core_session_message_flag_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (switch_core_session_message_flag_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__file_set(void * jarg1, char * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->_file = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->_file, (const char *)arg2);
+    } else {
+      arg1->_file = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__file_get(void * jarg1) {
+  char * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char *) ((arg1)->_file);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__func_set(void * jarg1, char * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->_func = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->_func, (const char *)arg2);
+    } else {
+      arg1->_func = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_message__func_get(void * jarg1) {
+  char * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char *) ((arg1)->_func);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message__line_set(void * jarg1, int jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->_line = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message__line_get(void * jarg1) {
+  int jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (int) ((arg1)->_line);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char **arg2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  arg2 = (char **)jarg2; 
+  {
+    size_t ii;
+    char const * *b = (char const * *) arg1->string_array_arg;
+    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((char const * *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  char **result = 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result = (char **)(char **) ((arg1)->string_array_arg);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_set(void * jarg1, void * jarg2) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  time_t arg2 ;
+  time_t *argp2 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  argp2 = (time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->delivery_time = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_delivery_time_get(void * jarg1) {
+  void * jresult ;
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  time_t result;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  result =  ((arg1)->delivery_time);
+  jresult = new time_t((const time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_session_message() {
+  void * jresult ;
+  switch_core_session_message *result = 0 ;
+  
+  result = (switch_core_session_message *)new switch_core_session_message();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_session_message(void * jarg1) {
+  switch_core_session_message *arg1 = (switch_core_session_message *) 0 ;
+  
+  arg1 = (switch_core_session_message *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_running_set(void * jarg1, int jarg2) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->running = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_thread_session_running_get(void * jarg1) {
+  int jresult ;
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  result = (int) ((arg1)->running);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_mutex_set(void * jarg1, void * jarg2) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->mutex = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_mutex_get(void * jarg1) {
+  void * jresult ;
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->mutex);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_objs_set(void * jarg1, void * jarg2) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  void **arg2 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  arg2 = (void **)jarg2; 
+  {
+    size_t ii;
+    void * *b = (void * *) arg1->objs;
+    for (ii = 0; ii < (size_t)128; ii++) b[ii] = *((void * *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_objs_get(void * jarg1) {
+  void * jresult ;
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  void **result = 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  result = (void **)(void **) ((arg1)->objs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_input_callback_set(void * jarg1, void * jarg2) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  arg2 = (switch_input_callback_function_t)jarg2; 
+  if (arg1) (arg1)->input_callback = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_input_callback_get(void * jarg1) {
+  void * jresult ;
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_input_callback_function_t result;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  result = (switch_input_callback_function_t) ((arg1)->input_callback);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_pool_set(void * jarg1, void * jarg2) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_thread_session_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_thread_session() {
+  void * jresult ;
+  switch_core_thread_session *result = 0 ;
+  
+  result = (switch_core_thread_session *)new switch_core_thread_session();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_core_thread_session(void * jarg1) {
+  switch_core_thread_session *arg1 = (switch_core_thread_session *) 0 ;
+  
+  arg1 = (switch_core_thread_session *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_screen_size(void * jarg1, void * jarg2) {
+  int *arg1 = (int *) 0 ;
+  int *arg2 = (int *) 0 ;
+  
+  arg1 = (int *)jarg1; 
+  arg2 = (int *)jarg2; 
+  switch_core_screen_size(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_sched_heartbeat(void * jarg1, unsigned long jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_core_session_sched_heartbeat(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unsched_heartbeat(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_unsched_heartbeat(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_enable_heartbeat(void * jarg1, unsigned long jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_core_session_enable_heartbeat(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_disable_heartbeat(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_disable_heartbeat(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_pop(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_media_bug_t **arg3 = (switch_media_bug_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_media_bug_t **)jarg3; 
+  result = (switch_status_t)switch_core_media_bug_pop(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_exec_all(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_media_bug_exec_cb_t arg3 = (switch_media_bug_exec_cb_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_media_bug_exec_cb_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  result = (switch_status_t)switch_core_media_bug_exec_all(arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_count(void * jarg1, char * jarg2) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (uint32_t)switch_core_media_bug_count(arg1,(char const *)arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_add(void * jarg1, char * jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6, unsigned long jarg7, void * jarg8) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_media_bug_callback_t arg4 = (switch_media_bug_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  time_t arg6 ;
+  switch_media_bug_flag_t arg7 ;
+  switch_media_bug_t **arg8 = (switch_media_bug_t **) 0 ;
+  time_t *argp6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_media_bug_callback_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  argp6 = (time_t *)jarg6; 
+  if (!argp6) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg6 = *argp6; 
+  arg7 = (switch_media_bug_flag_t)jarg7; 
+  arg8 = (switch_media_bug_t **)jarg8; 
+  result = (switch_status_t)switch_core_media_bug_add(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_pause(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_media_bug_pause(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_resume(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_media_bug_resume(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_inuse(void * jarg1, void * jarg2, void * jarg3) {
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_size_t *arg2 = (switch_size_t *) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (switch_size_t *)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  switch_core_media_bug_inuse(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_user_data(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (void *)switch_core_media_bug_get_user_data(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_write_replace_frame(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (switch_frame_t *)switch_core_media_bug_get_write_replace_frame(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_native_read_frame(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (switch_frame_t *)switch_core_media_bug_get_native_read_frame(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_native_write_frame(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (switch_frame_t *)switch_core_media_bug_get_native_write_frame(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_write_replace_frame(void * jarg1, void * jarg2) {
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  switch_core_media_bug_set_write_replace_frame(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_read_replace_frame(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (switch_frame_t *)switch_core_media_bug_get_read_replace_frame(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_read_demux_frame(void * jarg1, void * jarg2) {
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  switch_core_media_bug_set_read_demux_frame(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_session(void * jarg1) {
+  void * jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  result = (switch_core_session_t *)switch_core_media_bug_get_session(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_test_flag(void * jarg1, unsigned long jarg2) {
+  unsigned long jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (uint32_t)switch_core_media_bug_test_flag(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_set_flag(void * jarg1, unsigned long jarg2) {
+  unsigned long jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (uint32_t)switch_core_media_bug_set_flag(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_clear_flag(void * jarg1, unsigned long jarg2) {
+  unsigned long jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (uint32_t)switch_core_media_bug_clear_flag(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_set_read_replace_frame(void * jarg1, void * jarg2) {
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  switch_core_media_bug_set_read_replace_frame(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_cpu_count() {
+  unsigned long jresult ;
+  uint32_t result;
+  
+  result = (uint32_t)switch_core_cpu_count();
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_media_bug_t **arg2 = (switch_media_bug_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_media_bug_t **)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_remove(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_media_bug_prune(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_media_bug_prune(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove_callback(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_media_bug_callback_t arg2 = (switch_media_bug_callback_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_media_bug_callback_t)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_remove_callback(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_close(void * jarg1) {
+  int jresult ;
+  switch_media_bug_t **arg1 = (switch_media_bug_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_media_bug_t **)jarg1; 
+  result = (switch_status_t)switch_core_media_bug_close(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove_all_function(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_remove_all_function(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_enumerate(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_stream_handle_t *)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_enumerate(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_transfer_recordings(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_transfer_recordings(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_transfer_callback(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_media_bug_callback_t arg3 = (switch_media_bug_callback_t) 0 ;
+  void *(*arg4)(switch_core_session_t *,void *) = (void *(*)(switch_core_session_t *,void *)) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (switch_media_bug_callback_t)jarg3; 
+  arg4 = (void *(*)(switch_core_session_t *,void *))jarg4; 
+  result = (switch_status_t)switch_core_media_bug_transfer_callback(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_read(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_core_media_bug_read(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_flush(void * jarg1) {
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  switch_core_media_bug_flush(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_flush_all(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_media_bug_flush_all(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_set_pre_buffer_framecount(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_media_bug_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_core_media_bug_set_pre_buffer_framecount(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_new(char * jarg1, unsigned short jarg2, unsigned short jarg3, unsigned long jarg4, void * jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_port_t arg2 ;
+  switch_port_t arg3 ;
+  switch_port_flag_t arg4 ;
+  switch_core_port_allocator_t **arg5 = (switch_core_port_allocator_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  arg3 = (switch_port_t)jarg3; 
+  arg4 = (switch_port_flag_t)jarg4; 
+  arg5 = (switch_core_port_allocator_t **)jarg5; 
+  result = (switch_status_t)switch_core_port_allocator_new((char const *)arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_request_port(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_port_allocator_t *arg1 = (switch_core_port_allocator_t *) 0 ;
+  switch_port_t *arg2 = (switch_port_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_port_allocator_t *)jarg1; 
+  arg2 = (switch_port_t *)jarg2; 
+  result = (switch_status_t)switch_core_port_allocator_request_port(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_port_allocator_free_port(void * jarg1, unsigned short jarg2) {
+  int jresult ;
+  switch_core_port_allocator_t *arg1 = (switch_core_port_allocator_t *) 0 ;
+  switch_port_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_port_allocator_t *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  result = (switch_status_t)switch_core_port_allocator_free_port(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_port_allocator_destroy(void * jarg1) {
+  switch_core_port_allocator_t **arg1 = (switch_core_port_allocator_t **) 0 ;
+  
+  arg1 = (switch_core_port_allocator_t **)jarg1; 
+  switch_core_port_allocator_destroy(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_test_flag(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_core_test_flag(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_init(unsigned long jarg1, int jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_flag_t arg1 ;
+  switch_bool_t arg2 ;
+  char **arg3 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_flag_t)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_status_t)switch_core_init(arg1,arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_init_and_modload(unsigned long jarg1, int jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_flag_t arg1 ;
+  switch_bool_t arg2 ;
+  char **arg3 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_flag_t)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_status_t)switch_core_init_and_modload(arg1,arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_limit(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_core_session_limit(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_sessions_per_second(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_core_sessions_per_second(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_destroy() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_core_destroy();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_read_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_read_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_write_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_write_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_rwunlock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_rwunlock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_read_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock_hangup(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_read_lock_hangup(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_write_lock(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_write_lock(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_rwunlock(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_rwunlock(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_add_state_handler(void * jarg1) {
+  int jresult ;
+  switch_state_handler_table_t *arg1 = (switch_state_handler_table_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_state_handler_table_t *)jarg1; 
+  result = (int)switch_core_add_state_handler((switch_state_handler_table const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_remove_state_handler(void * jarg1) {
+  switch_state_handler_table_t *arg1 = (switch_state_handler_table_t *) 0 ;
+  
+  arg1 = (switch_state_handler_table_t *)jarg1; 
+  switch_core_remove_state_handler((switch_state_handler_table const *)arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_state_handler(int jarg1) {
+  void * jresult ;
+  int arg1 ;
+  switch_state_handler_table_t *result = 0 ;
+  
+  arg1 = (int)jarg1; 
+  result = (switch_state_handler_table_t *)switch_core_get_state_handler(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_tag(void * jarg1, char * jarg2) {
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_core_memory_pool_tag(arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_new_memory_pool(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_memory_pool_t **arg1 = (switch_memory_pool_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_perform_new_memory_pool(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_sync_clock() {
+  int jresult ;
+  int result;
+  
+  result = (int)switch_core_session_sync_clock();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_destroy_memory_pool(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_memory_pool_t **arg1 = (switch_memory_pool_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_perform_destroy_memory_pool(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_set_data(void * jarg1, char * jarg2, void * jarg3) {
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  switch_core_memory_pool_set_data(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_memory_pool_get_data(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (void *)switch_core_memory_pool_get_data(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_run(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_run(arg1);
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_core_session_running(void * jarg1) {
+  unsigned int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (unsigned int)switch_core_session_running(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_core_session_started(void * jarg1) {
+  unsigned int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (unsigned int)switch_core_session_started(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_permanent_alloc(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  void * jresult ;
+  switch_size_t arg1 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_size_t *argp1 ;
+  void *result = 0 ;
+  
+  argp1 = (switch_size_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (void *)switch_core_perform_permanent_alloc(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_alloc(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  void * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_size_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_size_t *argp2 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (void *)switch_core_perform_alloc(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_perform_session_alloc(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_size_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_size_t *argp2 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (void *)switch_core_perform_session_alloc(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_permanent_strdup(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (char *)switch_core_perform_permanent_strdup((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_session_strdup(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  char * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (char *)switch_core_perform_session_strdup(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_perform_strdup(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  char * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (char *)switch_core_perform_strdup(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_sprintf(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_core_session_sprintf(arg1,(char const *)arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_sprintf(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_core_sprintf(arg1,(char const *)arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_pool(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_memory_pool_t *)switch_core_session_get_pool(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_xml(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
+  switch_memory_pool_t **arg2 = (switch_memory_pool_t **) 0 ;
+  switch_xml_t arg3 = (switch_xml_t) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface_t *)jarg1; 
+  arg2 = (switch_memory_pool_t **)jarg2; 
+  arg3 = (switch_xml_t)jarg3; 
+  result = (switch_core_session_t *)switch_core_session_request_xml(arg1,arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, int jarg2, unsigned long jarg3, void * jarg4, char * jarg5) {
+  void * jresult ;
+  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
+  switch_call_direction_t arg2 ;
+  switch_originate_flag_t arg3 ;
+  switch_memory_pool_t **arg4 = (switch_memory_pool_t **) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface_t *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  arg3 = (switch_originate_flag_t)jarg3; 
+  arg4 = (switch_memory_pool_t **)jarg4; 
+  arg5 = (char *)jarg5; 
+  result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,arg3,arg4,(char const *)arg5);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_uuid(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_uuid(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_perform_destroy(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  switch_core_session_t **arg1 = (switch_core_session_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  
+  arg1 = (switch_core_session_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  switch_core_session_perform_destroy(arg1,(char const *)arg2,(char const *)arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_destroy_state(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_destroy_state(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reporting_state(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_reporting_state(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hangup_state(void * jarg1, int jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  switch_core_session_hangup_state(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_count() {
+  unsigned long jresult ;
+  uint32_t result;
+  
+  result = (uint32_t)switch_core_session_count();
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_id(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = switch_core_session_get_id(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id() {
+  void * jresult ;
+  switch_size_t result;
+  
+  result = switch_core_session_id();
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id_dec() {
+  void * jresult ;
+  switch_size_t result;
+  
+  result = switch_core_session_id_dec();
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_by_name(char * jarg1, int jarg2, void * jarg3) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_call_direction_t arg2 ;
+  switch_memory_pool_t **arg3 = (switch_memory_pool_t **) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  arg3 = (switch_memory_pool_t **)jarg3; 
+  result = (switch_core_session_t *)switch_core_session_request_by_name((char const *)arg1,arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_thread_launch(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_thread_launch(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_thread_pool_launch_thread(void * jarg1) {
+  int jresult ;
+  switch_thread_data_t **arg1 = (switch_thread_data_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_thread_data_t **)jarg1; 
+  result = (switch_status_t)switch_thread_pool_launch_thread(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_thread_pool_launch(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_thread_pool_launch(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_channel(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_channel_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_channel_t *)switch_core_session_get_channel(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_mutex(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_mutex_t *)switch_core_session_get_mutex(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_wake_session_thread(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_wake_session_thread(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_signal_state_change(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_signal_state_change(arg1);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_get_uuid(void * jarg1) {
+  char * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (char *)switch_core_session_get_uuid(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_loglevel(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_log_level_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_log_level_t)jarg2; 
+  result = (switch_status_t)switch_core_session_set_loglevel(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_loglevel(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_log_level_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_log_level_t)switch_core_session_get_loglevel(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_jb(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_media_type_t arg2 ;
+  stfu_instance_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_media_type_t)jarg2; 
+  result = (stfu_instance_t *)switch_core_session_get_jb(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_soft_lock(void * jarg1, unsigned long jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_core_session_soft_lock(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_soft_unlock(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_soft_unlock(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_set_dmachine(void * jarg1, void * jarg2, int jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_ivr_dmachine_t *arg2 = (switch_ivr_dmachine_t *) 0 ;
+  switch_digit_action_target_t arg3 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_ivr_dmachine_t *)jarg2; 
+  arg3 = (switch_digit_action_target_t)jarg3; 
+  switch_core_session_set_dmachine(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_dmachine(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_digit_action_target_t arg2 ;
+  switch_ivr_dmachine_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_digit_action_target_t)jarg2; 
+  result = (switch_ivr_dmachine_t *)switch_core_session_get_dmachine(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_get_target(void * jarg1) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_digit_action_target_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (switch_digit_action_target_t)switch_ivr_dmachine_get_target(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_target(void * jarg1, int jarg2) {
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_digit_action_target_t arg2 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (switch_digit_action_target_t)jarg2; 
+  switch_ivr_dmachine_set_target(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_terminators(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_dmachine_set_terminators(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_codec_slin(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_slin_data_t *arg2 = (switch_slin_data_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_slin_data_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_codec_slin(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_uuid() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_core_get_uuid();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_perform_locate(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_core_session_t *)switch_core_session_perform_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_perform_force_locate(char * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_core_session_t *)switch_core_session_perform_force_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_core_get_variable((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable_dup(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_core_get_variable_dup((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable_pdup(char * jarg1, void * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  result = (char *)switch_core_get_variable_pdup((char const *)arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_hostname() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_core_get_hostname();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_switchname() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_core_get_switchname();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_domain(int jarg1) {
+  char * jresult ;
+  switch_bool_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  result = (char *)switch_core_get_domain(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_variable(char * jarg1, char * jarg2) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_core_set_variable((char const *)arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_get_variables(void * jarg1) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  result = (switch_status_t)switch_core_get_variables(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_set_var_conditional(char * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_bool_t)switch_core_set_var_conditional((char const *)arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_dump_variables(void * jarg1) {
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  switch_core_dump_variables(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall(int jarg1) {
+  switch_call_cause_t arg1 ;
+  
+  arg1 = (switch_call_cause_t)jarg1; 
+  switch_core_session_hupall(arg1);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_hupall_matching_var_ans(char * jarg1, char * jarg2, int jarg3, int jarg4) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_call_cause_t arg3 ;
+  switch_hup_type_t arg4 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_call_cause_t)jarg3; 
+  arg4 = (switch_hup_type_t)jarg4; 
+  result = (uint32_t)switch_core_session_hupall_matching_var_ans((char const *)arg1,(char const *)arg2,arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_findall_matching_var(char * jarg1, char * jarg2) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_console_callback_match_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_console_callback_match_t *)switch_core_session_findall_matching_var((char const *)arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_findall() {
+  void * jresult ;
+  switch_console_callback_match_t *result = 0 ;
+  
+  result = (switch_console_callback_match_t *)switch_core_session_findall();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hupall_endpoint(void * jarg1, int jarg2) {
+  switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;
+  switch_call_cause_t arg2 ;
+  
+  arg1 = (switch_endpoint_interface_t *)jarg1; 
+  arg2 = (switch_call_cause_t)jarg2; 
+  switch_core_session_hupall_endpoint((switch_endpoint_interface const *)arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_get_partner(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t **)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_core_session_perform_get_partner(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_send(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_core_session_message_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_message_send((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_message(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_queue_message(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_free_message(void * jarg1) {
+  switch_core_session_message_t **arg1 = (switch_core_session_message_t **) 0 ;
+  
+  arg1 = (switch_core_session_message_t **)jarg1; 
+  switch_core_session_free_message(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_signal_data(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (switch_status_t)switch_core_session_queue_signal_data(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_signal_data(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void **arg2 = (void **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void **)jarg2; 
+  result = (switch_status_t)switch_core_session_dequeue_signal_data(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_pass_indication(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_types_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_types_t)jarg2; 
+  result = (switch_status_t)switch_core_session_pass_indication(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_indication(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_types_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_types_t)jarg2; 
+  result = (switch_status_t)switch_core_session_queue_indication(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_message(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_t **arg2 = (switch_core_session_message_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_t **)jarg2; 
+  result = (switch_status_t)switch_core_session_dequeue_message(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_flush_message(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_flush_message(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_event_send(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_core_session_event_send((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_app_log(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_app_log_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_app_log_t *)switch_core_session_get_app_log(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_exec(void * jarg1, void * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_application_interface_t *arg2 = (switch_application_interface_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_application_interface_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_session_exec(arg1,(switch_application_interface const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_video_reset(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_video_reset(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_get_flags(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int32_t *arg4 = (int32_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int32_t *)jarg4; 
+  result = (switch_status_t)switch_core_session_execute_application_get_flags(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_async(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_session_execute_application_async(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_app_flags(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int32_t *arg2 = (int32_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int32_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_app_flags((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_exten(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_core_session_execute_exten(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_receive_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_core_session_receive_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_private_class(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_pvt_class_t arg2 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_pvt_class_t)jarg2; 
+  result = (void *)switch_core_session_get_private_class(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_private_class(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_pvt_class_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_pvt_class_t)jarg3; 
+  result = (switch_status_t)switch_core_session_set_private_class(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_add_stream(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (int)switch_core_session_add_stream(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_stream(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  int arg2 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (void *)switch_core_session_get_stream(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_stream_count(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (int)switch_core_session_get_stream_count(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_launch_thread(void * jarg1, void * jarg2, void * jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void *(*arg2)(switch_thread_t *,void *) = (void *(*)(switch_thread_t *,void *)) 0 ;
+  void *arg3 = (void *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void *(*)(switch_thread_t *,void *))jarg2; 
+  arg3 = (void *)jarg3; 
+  switch_core_session_launch_thread(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_thread_session_end(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_thread_session_end(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_service_session_av(void * jarg1, int jarg2, int jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_bool_t arg3 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  switch_core_service_session_av(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_outgoing_channel(void * jarg1, void * jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6, unsigned long jarg7, void * jarg8) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_caller_profile_t *arg4 = (switch_caller_profile_t *) 0 ;
+  switch_core_session_t **arg5 = (switch_core_session_t **) 0 ;
+  switch_memory_pool_t **arg6 = (switch_memory_pool_t **) 0 ;
+  switch_originate_flag_t arg7 ;
+  switch_call_cause_t *arg8 = (switch_call_cause_t *) 0 ;
+  switch_call_cause_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_caller_profile_t *)jarg4; 
+  arg5 = (switch_core_session_t **)jarg5; 
+  arg6 = (switch_memory_pool_t **)jarg6; 
+  arg7 = (switch_originate_flag_t)jarg7; 
+  arg8 = (switch_call_cause_t *)jarg8; 
+  result = (switch_call_cause_t)switch_core_session_outgoing_channel(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_receive_message(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_core_session_perform_receive_message(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_core_session_queue_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_event_count(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_event_count(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_messages_waiting(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_messages_waiting(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_core_session_dequeue_event(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_queue_private_event(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_core_session_queue_private_event(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_private_event_count(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_private_event_count(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_private_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_core_session_dequeue_private_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_flush_private_events(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_flush_private_events(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
+  switch_io_flag_t arg3 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_frame_t **)jarg2; 
+  arg3 = (switch_io_flag_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_session_read_frame(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_video_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
+  switch_io_flag_t arg3 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_frame_t **)jarg2; 
+  arg3 = (switch_io_flag_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_session_read_video_frame(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_write_video_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  switch_io_flag_t arg3 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  arg3 = (switch_io_flag_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_session_write_video_frame(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_read_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_read_impl(arg1,(switch_codec_implementation const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_write_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_write_impl(arg1,(switch_codec_implementation const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_read_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_video_read_impl(arg1,(switch_codec_implementation const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_write_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_video_write_impl(arg1,(switch_codec_implementation const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reset(void * jarg1, int jarg2, int jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_bool_t arg3 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  switch_core_session_reset(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_write_frame(void * jarg1, void * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  switch_io_flag_t arg3 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  arg3 = (switch_io_flag_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_session_write_frame(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_perform_kill_channel(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_signal_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_signal_t)jarg5; 
+  result = (switch_status_t)switch_core_session_perform_kill_channel(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_send_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_send_dtmf(arg1,(switch_dtmf_t const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_send_dtmf_string(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_session_send_dtmf_string(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_recv_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_recv_dtmf(arg1,(switch_dtmf_t const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_hash_t **arg1 = (switch_hash_t **) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t **)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_core_hash_init_case(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_destroy(void * jarg1) {
+  int jresult ;
+  switch_hash_t **arg1 = (switch_hash_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t **)jarg1; 
+  result = (switch_status_t)switch_core_hash_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_destructor(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  hashtable_destructor_t arg4 = (hashtable_destructor_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (hashtable_destructor_t)jarg4; 
+  result = (switch_status_t)switch_core_hash_insert_destructor(arg1,(char const *)arg2,(void const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_locked(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_mutex_t *arg4 = (switch_mutex_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (switch_mutex_t *)jarg4; 
+  result = (switch_status_t)switch_core_hash_insert_locked(arg1,(char const *)arg2,(void const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_insert_wrlock(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_thread_rwlock_t *arg4 = (switch_thread_rwlock_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (switch_thread_rwlock_t *)jarg4; 
+  result = (switch_status_t)switch_core_hash_insert_wrlock(arg1,(char const *)arg2,(void const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_hash_delete(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_locked(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_mutex_t *arg3 = (switch_mutex_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_mutex_t *)jarg3; 
+  result = (switch_status_t)switch_core_hash_delete_locked(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_wrlock(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_thread_rwlock_t *arg3 = (switch_thread_rwlock_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_thread_rwlock_t *)jarg3; 
+  result = (switch_status_t)switch_core_hash_delete_wrlock(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_delete_multi(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  switch_hash_delete_callback_t arg2 = (switch_hash_delete_callback_t) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (switch_hash_delete_callback_t)jarg2; 
+  arg3 = (void *)jarg3; 
+  result = (switch_status_t)switch_core_hash_delete_multi(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (void *)switch_core_hash_find(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find_locked(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_mutex_t *arg3 = (switch_mutex_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_mutex_t *)jarg3; 
+  result = (void *)switch_core_hash_find_locked(arg1,(char const *)arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_find_rdlock(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_thread_rwlock_t *arg3 = (switch_thread_rwlock_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_thread_rwlock_t *)jarg3; 
+  result = (void *)switch_core_hash_find_rdlock(arg1,(char const *)arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_first_iter(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  switch_hash_index_t *arg2 = (switch_hash_index_t *) 0 ;
+  switch_hash_index_t *result = 0 ;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  arg2 = (switch_hash_index_t *)jarg2; 
+  result = (switch_hash_index_t *)switch_core_hash_first_iter(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_empty(void * jarg1) {
+  int jresult ;
+  switch_hash_t *arg1 = (switch_hash_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_hash_t *)jarg1; 
+  result = (switch_bool_t)switch_core_hash_empty(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_hash_next(void * jarg1) {
+  void * jresult ;
+  switch_hash_index_t **arg1 = (switch_hash_index_t **) 0 ;
+  switch_hash_index_t *result = 0 ;
+  
+  arg1 = (switch_hash_index_t **)jarg1; 
+  result = (switch_hash_index_t *)switch_core_hash_next(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_hash_this(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ;
+  void **arg2 = (void **) 0 ;
+  switch_ssize_t *arg3 = (switch_ssize_t *) 0 ;
+  void **arg4 = (void **) 0 ;
+  
+  arg1 = (switch_hash_index_t *)jarg1; 
+  arg2 = (void **)jarg2; 
+  arg3 = (switch_ssize_t *)jarg3; 
+  arg4 = (void **)jarg4; 
+  switch_core_hash_this(arg1,(void const **)arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_init(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  int arg4 ;
+  switch_memory_pool_t *arg5 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_memory_pool_t *)jarg5; 
+  result = (switch_status_t)switch_core_timer_init(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_calibrate_clock() {
+  switch_time_calibrate_clock();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_next(void * jarg1) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  result = (switch_status_t)switch_core_timer_next(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_step(void * jarg1) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  result = (switch_status_t)switch_core_timer_step(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_sync(void * jarg1) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  result = (switch_status_t)switch_core_timer_sync(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_check(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_core_timer_check(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_destroy(void * jarg1) {
+  int jresult ;
+  switch_timer_t *arg1 = (switch_timer_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_timer_t *)jarg1; 
+  result = (switch_status_t)switch_core_timer_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_init_with_bitrate(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, int jarg5, int jarg6, unsigned long jarg7, unsigned long jarg8, void * jarg9, void * jarg10) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  uint32_t arg4 ;
+  int arg5 ;
+  int arg6 ;
+  uint32_t arg7 ;
+  uint32_t arg8 ;
+  switch_codec_settings_t *arg9 = (switch_codec_settings_t *) 0 ;
+  switch_memory_pool_t *arg10 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (int)jarg6; 
+  arg7 = (uint32_t)jarg7; 
+  arg8 = (uint32_t)jarg8; 
+  arg9 = (switch_codec_settings_t *)jarg9; 
+  arg10 = (switch_memory_pool_t *)jarg10; 
+  result = (switch_status_t)switch_core_codec_init_with_bitrate(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,(switch_codec_settings const *)arg9,arg10);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_copy(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  arg3 = (switch_memory_pool_t *)jarg3; 
+  result = (switch_status_t)switch_core_codec_copy(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_parse_fmtp(char * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_codec_fmtp_t *arg4 = (switch_codec_fmtp_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (switch_codec_fmtp_t *)jarg4; 
+  result = (switch_status_t)switch_core_codec_parse_fmtp((char const *)arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_reset(void * jarg1) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  result = (switch_status_t)switch_core_codec_reset(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_encode(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  void *arg3 = (void *) 0 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  void *arg6 = (void *) 0 ;
+  uint32_t *arg7 = (uint32_t *) 0 ;
+  uint32_t *arg8 = (uint32_t *) 0 ;
+  unsigned int *arg9 = (unsigned int *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (void *)jarg6; 
+  arg7 = (uint32_t *)jarg7; 
+  arg8 = (uint32_t *)jarg8; 
+  arg9 = (unsigned int *)jarg9; 
+  result = (switch_status_t)switch_core_codec_encode(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_decode(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  void *arg3 = (void *) 0 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  void *arg6 = (void *) 0 ;
+  uint32_t *arg7 = (uint32_t *) 0 ;
+  uint32_t *arg8 = (uint32_t *) 0 ;
+  unsigned int *arg9 = (unsigned int *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (void *)jarg6; 
+  arg7 = (uint32_t *)jarg7; 
+  arg8 = (uint32_t *)jarg8; 
+  arg9 = (unsigned int *)jarg9; 
+  result = (switch_status_t)switch_core_codec_decode(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_destroy(void * jarg1) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  result = (switch_status_t)switch_core_codec_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_read_codec(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_read_codec(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_real_read_codec(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_real_read_codec(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unset_read_codec(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_unset_read_codec(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unset_write_codec(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_unset_write_codec(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_lock_codec_write(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_lock_codec_write(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unlock_codec_write(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_unlock_codec_write(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_lock_codec_read(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_lock_codec_read(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unlock_codec_read(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_session_unlock_codec_read(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_read_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_read_impl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_real_read_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_real_read_impl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_write_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_write_impl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_read_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_video_read_impl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_write_impl(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_get_video_write_impl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_read_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_read_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_effective_read_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_effective_read_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_write_codec(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_write_codec(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_write_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_write_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_effective_write_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_effective_write_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_read_codec(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_video_read_codec(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_video_read_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_video_read_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_video_write_codec(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  result = (switch_status_t)switch_core_session_set_video_write_codec(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_video_write_codec(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_codec_t *)switch_core_session_get_video_write_codec(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_db_open_file(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_core_db_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_core_db_t *)switch_core_db_open_file((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_persistant_execute(void * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_core_db_persistant_execute(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_persistant_execute_trans(void * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_core_db_persistant_execute_trans(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_db_test_reactive(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  switch_core_db_t *arg1 = (switch_core_db_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  
+  arg1 = (switch_core_db_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_core_db_test_reactive(arg1,arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_perform_file_open(char * jarg1, char * jarg2, int jarg3, void * jarg4, char * jarg5, unsigned long jarg6, unsigned long jarg7, unsigned int jarg8, void * jarg9) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  switch_file_handle_t *arg4 = (switch_file_handle_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  uint32_t arg6 ;
+  uint32_t arg7 ;
+  unsigned int arg8 ;
+  switch_memory_pool_t *arg9 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (switch_file_handle_t *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  arg7 = (uint32_t)jarg7; 
+  arg8 = (unsigned int)jarg8; 
+  arg9 = (switch_memory_pool_t *)jarg9; 
+  result = (switch_status_t)switch_core_perform_file_open((char const *)arg1,(char const *)arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_read(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = (switch_status_t)switch_core_file_read(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_write(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = (switch_status_t)switch_core_file_write(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_write_video(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = (switch_status_t)switch_core_file_write_video(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_seek(void * jarg1, void * jarg2, long long jarg3, int jarg4) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  unsigned int *arg2 = (unsigned int *) 0 ;
+  int64_t arg3 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (unsigned int *)jarg2; 
+  arg3 = (int64_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_core_file_seek(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_set_string(void * jarg1, int jarg2, char * jarg3) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  switch_audio_col_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (switch_audio_col_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_file_set_string(arg1,arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_get_string(void * jarg1, int jarg2, void * jarg3) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  switch_audio_col_t arg2 ;
+  char **arg3 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (switch_audio_col_t)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_status_t)switch_core_file_get_string(arg1,arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_close(void * jarg1) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_file_close(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_file_truncate(void * jarg1, long long jarg2) {
+  int jresult ;
+  switch_file_handle_t *arg1 = (switch_file_handle_t *) 0 ;
+  int64_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_file_handle_t *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  result = (switch_status_t)switch_core_file_truncate(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_open(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, void * jarg7, void * jarg8) {
+  int jresult ;
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  unsigned int arg4 ;
+  unsigned int arg5 ;
+  unsigned int arg6 ;
+  switch_speech_flag_t *arg7 = (switch_speech_flag_t *) 0 ;
+  switch_memory_pool_t *arg8 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (unsigned int)jarg4; 
+  arg5 = (unsigned int)jarg5; 
+  arg6 = (unsigned int)jarg6; 
+  arg7 = (switch_speech_flag_t *)jarg7; 
+  arg8 = (switch_memory_pool_t *)jarg8; 
+  result = (switch_status_t)switch_core_speech_open(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_feed_tts(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_speech_flag_t *arg3 = (switch_speech_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_speech_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_speech_feed_tts(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_flush_tts(void * jarg1) {
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  switch_core_speech_flush_tts(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_text_param_tts(void * jarg1, char * jarg2, char * jarg3) {
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  switch_core_speech_text_param_tts(arg1,arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_numeric_param_tts(void * jarg1, char * jarg2, int jarg3) {
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  switch_core_speech_numeric_param_tts(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_speech_float_param_tts(void * jarg1, char * jarg2, double jarg3) {
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  double arg3 ;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (double)jarg3; 
+  switch_core_speech_float_param_tts(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_read_tts(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_speech_flag_t *arg4 = (switch_speech_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  arg4 = (switch_speech_flag_t *)jarg4; 
+  result = (switch_status_t)switch_core_speech_read_tts(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_speech_close(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_speech_handle_t *arg1 = (switch_speech_handle_t *) 0 ;
+  switch_speech_flag_t *arg2 = (switch_speech_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_speech_handle_t *)jarg1; 
+  arg2 = (switch_speech_flag_t *)jarg2; 
+  result = (switch_status_t)switch_core_speech_close(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_open(void * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5, void * jarg6, void * jarg7) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  switch_asr_flag_t *arg6 = (switch_asr_flag_t *) 0 ;
+  switch_memory_pool_t *arg7 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_asr_flag_t *)jarg6; 
+  arg7 = (switch_memory_pool_t *)jarg7; 
+  result = (switch_status_t)switch_core_asr_open(arg1,(char const *)arg2,(char const *)arg3,arg4,(char const *)arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_close(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_asr_flag_t *arg2 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_asr_flag_t *)jarg2; 
+  result = (switch_status_t)switch_core_asr_close(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_feed(void * jarg1, void * jarg2, unsigned int jarg3, void * jarg4) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  switch_asr_flag_t *arg4 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (unsigned int)jarg3; 
+  arg4 = (switch_asr_flag_t *)jarg4; 
+  result = (switch_status_t)switch_core_asr_feed(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_feed_dtmf(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  arg3 = (switch_asr_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_asr_feed_dtmf(arg1,(switch_dtmf_t const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_check_results(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_asr_flag_t *arg2 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_asr_flag_t *)jarg2; 
+  result = (switch_status_t)switch_core_asr_check_results(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_results(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (switch_asr_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_asr_get_results(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_get_result_headers(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_asr_flag_t *arg3 = (switch_asr_flag_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  arg3 = (switch_asr_flag_t *)jarg3; 
+  result = (switch_status_t)switch_core_asr_get_result_headers(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_asr_load_grammar(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_unload_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_asr_unload_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_enable_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_asr_enable_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_disable_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_asr_disable_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_disable_all_grammars(void * jarg1) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_asr_disable_all_grammars(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_pause(void * jarg1) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_asr_pause(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_resume(void * jarg1) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_asr_resume(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_start_input_timers(void * jarg1) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_asr_start_input_timers(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_text_param(void * jarg1, char * jarg2, char * jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  switch_core_asr_text_param(arg1,arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_numeric_param(void * jarg1, char * jarg2, int jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  switch_core_asr_numeric_param(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_float_param(void * jarg1, char * jarg2, double jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  double arg3 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (double)jarg3; 
+  switch_core_asr_float_param(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_open(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
+  int jresult ;
+  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_memory_pool_t *arg6 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_directory_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_memory_pool_t *)jarg6; 
+  result = (switch_status_t)switch_core_directory_open(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_query(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_directory_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_directory_query(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_next(void * jarg1) {
+  int jresult ;
+  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_directory_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_directory_next(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_next_pair(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_directory_handle_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_status_t)switch_core_directory_next_pair(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_close(void * jarg1) {
+  int jresult ;
+  switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_directory_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_directory_close(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_data_channel(int jarg1) {
+  void * jresult ;
+  switch_text_channel_t arg1 ;
+  FILE *result = 0 ;
+  
+  arg1 = (switch_text_channel_t)jarg1; 
+  result = (FILE *)switch_core_data_channel(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready() {
+  int jresult ;
+  switch_bool_t result;
+  
+  result = (switch_bool_t)switch_core_ready();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_running() {
+  int jresult ;
+  switch_bool_t result;
+  
+  result = (switch_bool_t)switch_core_running();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready_inbound() {
+  int jresult ;
+  switch_bool_t result;
+  
+  result = (switch_bool_t)switch_core_ready_inbound();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_ready_outbound() {
+  int jresult ;
+  switch_bool_t result;
+  
+  result = (switch_bool_t)switch_core_ready_outbound();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_flags() {
+  unsigned long jresult ;
+  switch_core_flag_t result;
+  
+  result = (switch_core_flag_t)switch_core_flags();
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_management_exec(char * jarg1, int jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_management_action_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_management_action_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_core_management_exec(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_set_normal_priority() {
+  int jresult ;
+  int32_t result;
+  
+  result = (int32_t)set_normal_priority();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_set_auto_priority() {
+  int jresult ;
+  int32_t result;
+  
+  result = (int32_t)set_auto_priority();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_set_realtime_priority() {
+  int jresult ;
+  int32_t result;
+  
+  result = (int32_t)set_realtime_priority();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_set_low_priority() {
+  int jresult ;
+  int32_t result;
+  
+  result = (int32_t)set_low_priority();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_change_user_group(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int32_t)change_user_group((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_runtime_loop(int jarg1) {
+  int arg1 ;
+  
+  arg1 = (int)jarg1; 
+  switch_core_runtime_loop(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_set_console(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_core_set_console((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_measure_time(void * jarg1, void * jarg2) {
+  switch_time_t arg1 ;
+  switch_core_time_duration_t *arg2 = (switch_core_time_duration_t *) 0 ;
+  switch_time_t *argp1 ;
+  
+  argp1 = (switch_time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg1 = *argp1; 
+  arg2 = (switch_core_time_duration_t *)jarg2; 
+  switch_core_measure_time(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_uptime() {
+  void * jresult ;
+  switch_time_t result;
+  
+  result = switch_core_uptime();
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_ctl(int jarg1, void * jarg2) {
+  int jresult ;
+  switch_session_ctl_t arg1 ;
+  void *arg2 = (void *) 0 ;
+  int32_t result;
+  
+  arg1 = (switch_session_ctl_t)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (int32_t)switch_core_session_ctl(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_console() {
+  void * jresult ;
+  FILE *result = 0 ;
+  
+  result = (FILE *)switch_core_get_console();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_globals() {
+  switch_core_set_globals();
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_core_session_compare(void * jarg1, void * jarg2) {
+  unsigned char jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  result = (uint8_t)switch_core_session_compare(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_core_session_check_interface(void * jarg1, void * jarg2) {
+  unsigned char jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_endpoint_interface_t *arg2 = (switch_endpoint_interface_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_endpoint_interface_t *)jarg2; 
+  result = (uint8_t)switch_core_session_check_interface(arg1,(switch_endpoint_interface const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_mime_index() {
+  void * jresult ;
+  switch_hash_index_t *result = 0 ;
+  
+  result = (switch_hash_index_t *)switch_core_mime_index();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_mime_ext2type(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_core_mime_ext2type((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_mime_add_type(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_core_mime_add_type((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_create_module_interface(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_loadable_module_interface_t *)switch_loadable_module_create_module_interface(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_create_interface(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_loadable_module_interface_t *arg1 = (switch_loadable_module_interface_t *) 0 ;
+  switch_module_interface_name_t arg2 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface_t *)jarg1; 
+  arg2 = (switch_module_interface_name_t)jarg2; 
+  result = (void *)switch_loadable_module_create_interface(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_micro_time_now() {
+  void * jresult ;
+  switch_time_t result;
+  
+  result = switch_micro_time_now();
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_mono_micro_time_now() {
+  void * jresult ;
+  switch_time_t result;
+  
+  result = switch_mono_micro_time_now();
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim() {
+  switch_core_memory_reclaim();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_events() {
+  switch_core_memory_reclaim_events();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_logger() {
+  switch_core_memory_reclaim_logger();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_reclaim_all() {
+  switch_core_memory_reclaim_all();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_setrlimits() {
+  switch_core_setrlimits();
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_time_ref() {
+  void * jresult ;
+  switch_time_t result;
+  
+  result = switch_time_ref();
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_sync() {
+  switch_time_sync();
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_epoch_time_now(void * jarg1) {
+  void * jresult ;
+  time_t *arg1 = (time_t *) 0 ;
+  time_t result;
+  
+  arg1 = (time_t *)jarg1; 
+  result = switch_epoch_time_now(arg1);
+  jresult = new time_t((const time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_lookup_timezone(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_lookup_timezone((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_strftime_tz(char * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, void * jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  size_t arg4 ;
+  switch_time_t arg5 ;
+  switch_time_t *argp5 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (size_t)jarg4; 
+  argp5 = (switch_time_t *)jarg5; 
+  if (!argp5) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return 0;
+  }
+  arg5 = *argp5; 
+  result = (switch_status_t)switch_strftime_tz((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_time_exp_tz_name(char * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_time_exp_t *arg2 = (switch_time_exp_t *) 0 ;
+  switch_time_t arg3 ;
+  switch_time_t *argp3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_time_exp_t *)jarg2; 
+  argp3 = (switch_time_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_status_t)switch_time_exp_tz_name((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_load_network_lists(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_load_network_lists(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_check_network_list_ip_token(char * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char **arg3 = (char **) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_bool_t)switch_check_network_list_ip_token((char const *)arg1,(char const *)arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_monotonic(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_time_set_monotonic(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_timerfd(int jarg1) {
+  int arg1 ;
+  
+  arg1 = (int)jarg1; 
+  switch_time_set_timerfd(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_nanosleep(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_time_set_nanosleep(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_matrix(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_time_set_matrix(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_cond_yield(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_time_set_cond_yield(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_time_set_use_system_time(int jarg1) {
+  switch_bool_t arg1 ;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  switch_time_set_use_system_time(arg1);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_min_dtmf_duration(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_core_min_dtmf_duration(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_max_dtmf_duration(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_core_max_dtmf_duration(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_core_min_idle_cpu(double jarg1) {
+  double jresult ;
+  double arg1 ;
+  double result;
+  
+  arg1 = (double)jarg1; 
+  result = (double)switch_core_min_idle_cpu(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_core_idle_cpu() {
+  double jresult ;
+  double result;
+  
+  result = (double)switch_core_idle_cpu();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_default_dtmf_duration(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_core_default_dtmf_duration(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_set_complete(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_console_set_complete((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_set_alias(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_console_set_alias((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_system(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t arg2 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (int)switch_system((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_stream_handle_t *)jarg2; 
+  result = (int)switch_stream_system((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_yield(void * jarg1) {
+  switch_interval_time_t arg1 ;
+  switch_interval_time_t *argp1 ;
+  
+  argp1 = (switch_interval_time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_interval_time_t", 0);
+    return ;
+  }
+  arg1 = *argp1; 
+  switch_cond_yield(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cond_next() {
+  switch_cond_next();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_send_args(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, int jarg9) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  switch_bool_t arg9 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (switch_bool_t)jarg9; 
+  result = (switch_status_t)switch_core_chat_send_args((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_send(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  result = (switch_status_t)switch_core_chat_send((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_deliver(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_core_chat_deliver((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_preprocess_session(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_preprocess_session(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_pause() {
+  switch_core_sqldb_pause();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_resume() {
+  switch_core_sqldb_resume();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CACHE_DB_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(256);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_core_db_dbh_set(void * jarg1, void * jarg2) {
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_core_db_t *arg2 = (switch_core_db_t *) 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  arg2 = (switch_core_db_t *)jarg2; 
+  if (arg1) (arg1)->core_db_dbh = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_core_db_dbh_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_core_db_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  result = (switch_core_db_t *) ((arg1)->core_db_dbh);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_odbc_dbh_set(void * jarg1, void * jarg2) {
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_odbc_handle_t *arg2 = (switch_odbc_handle_t *) 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  arg2 = (switch_odbc_handle_t *)jarg2; 
+  if (arg1) (arg1)->odbc_dbh = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_odbc_dbh_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_odbc_handle_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  result = (switch_odbc_handle_t *) ((arg1)->odbc_dbh);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_pgsql_dbh_set(void * jarg1, void * jarg2) {
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_pgsql_handle_t *arg2 = (switch_pgsql_handle_t *) 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  arg2 = (switch_pgsql_handle_t *)jarg2; 
+  if (arg1) (arg1)->pgsql_dbh = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_native_handle_t_pgsql_dbh_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  switch_pgsql_handle_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  result = (switch_pgsql_handle_t *) ((arg1)->pgsql_dbh);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_native_handle_t() {
+  void * jresult ;
+  switch_cache_db_native_handle_t *result = 0 ;
+  
+  result = (switch_cache_db_native_handle_t *)new switch_cache_db_native_handle_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_native_handle_t(void * jarg1) {
+  switch_cache_db_native_handle_t *arg1 = (switch_cache_db_native_handle_t *) 0 ;
+  
+  arg1 = (switch_cache_db_native_handle_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_core_db_options_t_db_path_set(void * jarg1, char * jarg2) {
+  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->db_path) delete [] arg1->db_path;
+    if (arg2) {
+      arg1->db_path = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->db_path, (const char *)arg2);
+    } else {
+      arg1->db_path = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_core_db_options_t_db_path_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
+  result = (char *) ((arg1)->db_path);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_core_db_options_t() {
+  void * jresult ;
+  switch_cache_db_core_db_options_t *result = 0 ;
+  
+  result = (switch_cache_db_core_db_options_t *)new switch_cache_db_core_db_options_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_core_db_options_t(void * jarg1) {
+  switch_cache_db_core_db_options_t *arg1 = (switch_cache_db_core_db_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_core_db_options_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_dsn_set(void * jarg1, char * jarg2) {
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->dsn) delete [] arg1->dsn;
+    if (arg2) {
+      arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->dsn, (const char *)arg2);
+    } else {
+      arg1->dsn = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_dsn_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  result = (char *) ((arg1)->dsn);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_user_set(void * jarg1, char * jarg2) {
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->user) delete [] arg1->user;
+    if (arg2) {
+      arg1->user = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->user, (const char *)arg2);
+    } else {
+      arg1->user = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_user_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  result = (char *) ((arg1)->user);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_pass_set(void * jarg1, char * jarg2) {
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->pass) delete [] arg1->pass;
+    if (arg2) {
+      arg1->pass = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->pass, (const char *)arg2);
+    } else {
+      arg1->pass = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_odbc_options_t_pass_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  result = (char *) ((arg1)->pass);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_odbc_options_t() {
+  void * jresult ;
+  switch_cache_db_odbc_options_t *result = 0 ;
+  
+  result = (switch_cache_db_odbc_options_t *)new switch_cache_db_odbc_options_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_odbc_options_t(void * jarg1) {
+  switch_cache_db_odbc_options_t *arg1 = (switch_cache_db_odbc_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_odbc_options_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_pgsql_options_t_dsn_set(void * jarg1, char * jarg2) {
+  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->dsn) delete [] arg1->dsn;
+    if (arg2) {
+      arg1->dsn = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->dsn, (const char *)arg2);
+    } else {
+      arg1->dsn = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_pgsql_options_t_dsn_get(void * jarg1) {
+  char * jresult ;
+  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
+  result = (char *) ((arg1)->dsn);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_pgsql_options_t() {
+  void * jresult ;
+  switch_cache_db_pgsql_options_t *result = 0 ;
+  
+  result = (switch_cache_db_pgsql_options_t *)new switch_cache_db_pgsql_options_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_pgsql_options_t(void * jarg1) {
+  switch_cache_db_pgsql_options_t *arg1 = (switch_cache_db_pgsql_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_pgsql_options_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_core_db_options_set(void * jarg1, void * jarg2) {
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_core_db_options_t *arg2 = (switch_cache_db_core_db_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  arg2 = (switch_cache_db_core_db_options_t *)jarg2; 
+  if (arg1) (arg1)->core_db_options = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_core_db_options_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_core_db_options_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  result = (switch_cache_db_core_db_options_t *)& ((arg1)->core_db_options);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_odbc_options_set(void * jarg1, void * jarg2) {
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_odbc_options_t *arg2 = (switch_cache_db_odbc_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  arg2 = (switch_cache_db_odbc_options_t *)jarg2; 
+  if (arg1) (arg1)->odbc_options = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_odbc_options_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_odbc_options_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  result = (switch_cache_db_odbc_options_t *)& ((arg1)->odbc_options);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_pgsql_options_set(void * jarg1, void * jarg2) {
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_pgsql_options_t *arg2 = (switch_cache_db_pgsql_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  arg2 = (switch_cache_db_pgsql_options_t *)jarg2; 
+  if (arg1) (arg1)->pgsql_options = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_cache_db_connection_options_t_pgsql_options_get(void * jarg1) {
+  void * jresult ;
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  switch_cache_db_pgsql_options_t *result = 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  result = (switch_cache_db_pgsql_options_t *)& ((arg1)->pgsql_options);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_cache_db_connection_options_t() {
+  void * jresult ;
+  switch_cache_db_connection_options_t *result = 0 ;
+  
+  result = (switch_cache_db_connection_options_t *)new switch_cache_db_connection_options_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_cache_db_connection_options_t(void * jarg1) {
+  switch_cache_db_connection_options_t *arg1 = (switch_cache_db_connection_options_t *) 0 ;
+  
+  arg1 = (switch_cache_db_connection_options_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_type_name(int jarg1) {
+  char * jresult ;
+  switch_cache_db_handle_type_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_handle_type_t)jarg1; 
+  result = (char *)switch_cache_db_type_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_get_type(void * jarg1) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  switch_cache_db_handle_type_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  result = (switch_cache_db_handle_type_t)switch_cache_db_get_type(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_dismiss_db_handle(void * jarg1) {
+  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
+  
+  arg1 = (switch_cache_db_handle_t **)jarg1; 
+  switch_cache_db_dismiss_db_handle(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_release_db_handle(void * jarg1) {
+  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
+  
+  arg1 = (switch_cache_db_handle_t **)jarg1; 
+  switch_cache_db_release_db_handle(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp__switch_cache_db_get_db_handle(void * jarg1, int jarg2, void * jarg3, char * jarg4, char * jarg5, int jarg6) {
+  int jresult ;
+  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
+  switch_cache_db_handle_type_t arg2 ;
+  switch_cache_db_connection_options_t *arg3 = (switch_cache_db_connection_options_t *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  int arg6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t **)jarg1; 
+  arg2 = (switch_cache_db_handle_type_t)jarg2; 
+  arg3 = (switch_cache_db_connection_options_t *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (int)jarg6; 
+  result = (switch_status_t)_switch_cache_db_get_db_handle(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp__switch_cache_db_get_db_handle_dsn(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)_switch_cache_db_get_db_handle_dsn(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cache_db_execute_sql2str(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, void * jarg5) {
+  char * jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  size_t arg4 ;
+  char **arg5 = (char **) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (size_t)jarg4; 
+  arg5 = (char **)jarg5; 
+  result = (char *)switch_cache_db_execute_sql2str(arg1,arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char **arg3 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_status_t)switch_cache_db_execute_sql(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  char **arg5 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_callback_func_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  arg5 = (char **)jarg5; 
+  result = (switch_status_t)switch_cache_db_execute_sql_callback(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
+  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  char **arg6 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_callback_func_t)jarg3; 
+  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  arg6 = (char **)jarg6; 
+  result = (switch_status_t)switch_cache_db_execute_sql_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_affected_rows(void * jarg1) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  result = (int)switch_cache_db_affected_rows(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_load_extension(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_cache_db_load_extension(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_status(void * jarg1) {
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  switch_cache_db_status(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp__switch_core_db_handle(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_cache_db_handle_t **arg1 = (switch_cache_db_handle_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)_switch_core_db_handle(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_test_reactive(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_bool_t)switch_cache_db_test_reactive(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_persistant_execute(void * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_cache_db_persistant_execute(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_persistant_execute_trans_full(void * jarg1, char * jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  result = (switch_status_t)switch_cache_db_persistant_execute_trans_full(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_signal_handlers() {
+  switch_core_set_signal_handlers();
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_debug_level() {
+  unsigned long jresult ;
+  uint32_t result;
+  
+  result = (uint32_t)switch_core_debug_level();
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_cache_db_flush_handles() {
+  switch_cache_db_flush_handles();
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_banner() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_core_banner();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_in_thread(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_bool_t)switch_core_session_in_thread(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_default_ptime(char * jarg1, unsigned long jarg2) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  uint32_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (uint32_t)switch_default_ptime((char const *)arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_default_rate(char * jarg1, unsigned long jarg2) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  uint32_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (uint32_t)switch_default_rate((char const *)arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_add_registration(char * jarg1, char * jarg2, char * jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  uint32_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  result = (switch_status_t)switch_core_add_registration((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_del_registration(char * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_del_registration((char const *)arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_expire_registration(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  switch_status_t result;
+  
+  arg1 = (int)jarg1; 
+  result = (switch_status_t)switch_core_expire_registration(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_get_variable(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_say_file_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_say_file_handle_get_variable(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_get_path(void * jarg1) {
+  char * jresult ;
+  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_say_file_handle_t *)jarg1; 
+  result = (char *)switch_say_file_handle_get_path(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_file_handle_detach_path(void * jarg1) {
+  char * jresult ;
+  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_say_file_handle_t *)jarg1; 
+  result = (char *)switch_say_file_handle_detach_path(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_file_handle_destroy(void * jarg1) {
+  switch_say_file_handle_t **arg1 = (switch_say_file_handle_t **) 0 ;
+  
+  arg1 = (switch_say_file_handle_t **)jarg1; 
+  switch_say_file_handle_destroy(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_file_handle_create(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_say_file_handle_t **arg1 = (switch_say_file_handle_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_t **arg3 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_say_file_handle_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_t **)jarg3; 
+  result = (switch_status_t)switch_say_file_handle_create(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_file(void * jarg1, char * jarg2) {
+  switch_say_file_handle_t *arg1 = (switch_say_file_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = 0 ;
+  
+  arg1 = (switch_say_file_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_say_file(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_max_file_desc() {
+  int jresult ;
+  int result;
+  
+  result = (int)switch_max_file_desc();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_close_extra_files(void * jarg1, int jarg2) {
+  int *arg1 = (int *) 0 ;
+  int arg2 ;
+  
+  arg1 = (int *)jarg1; 
+  arg2 = (int)jarg2; 
+  switch_close_extra_files(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_thread_set_cpu_affinity(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  switch_status_t result;
+  
+  arg1 = (int)jarg1; 
+  result = (switch_status_t)switch_core_thread_set_cpu_affinity(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_os_yield() {
+  switch_os_yield();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_get_stacksizes(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_size_t *arg1 = (switch_size_t *) 0 ;
+  switch_size_t *arg2 = (switch_size_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_size_t *)jarg1; 
+  arg2 = (switch_size_t *)jarg2; 
+  result = (switch_status_t)switch_core_get_stacksizes(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_gen_encoded_silence(void * jarg1, void * jarg2, void * jarg3) {
+  unsigned char *arg1 = (unsigned char *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  
+  arg1 = (unsigned char *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg3 = *argp3; 
+  switch_core_gen_encoded_silence(arg1,(switch_codec_implementation const *)arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_dbtype() {
+  int jresult ;
+  switch_cache_db_handle_type_t result;
+  
+  result = (switch_cache_db_handle_type_t)switch_core_dbtype();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sql_exec(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_core_sql_exec((char const *)arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_recovery_recover(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_core_recovery_recover((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_untrack(void * jarg1, int jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  switch_core_recovery_untrack(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_track(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_core_recovery_track(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_flush(char * jarg1, char * jarg2) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_core_recovery_flush((char const *)arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_pause(void * jarg1, int jarg2) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  switch_sql_queue_manager_pause(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_resume(void * jarg1) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  switch_sql_queue_manager_resume(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_size(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  uint32_t arg2 ;
+  int result;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (int)switch_sql_queue_manager_size(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_push_confirm(void * jarg1, char * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_sql_queue_manager_push_confirm(arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_push(void * jarg1, char * jarg2, unsigned long jarg3, int jarg4) {
+  int jresult ;
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_sql_queue_manager_push(arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_destroy(void * jarg1) {
+  int jresult ;
+  switch_sql_queue_manager_t **arg1 = (switch_sql_queue_manager_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_sql_queue_manager_t **)jarg1; 
+  result = (switch_status_t)switch_sql_queue_manager_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_sql_queue_manager_t **arg2 = (switch_sql_queue_manager_t **) 0 ;
+  uint32_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  uint32_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_sql_queue_manager_t **)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_start(void * jarg1) {
+  int jresult ;
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  result = (switch_status_t)switch_sql_queue_manager_start(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_stop(void * jarg1) {
+  int jresult ;
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  result = (switch_status_t)switch_sql_queue_manager_stop(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cache_db_execute_sql_event_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_cache_db_handle_t *arg1 = (switch_cache_db_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  char **arg5 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_cache_db_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  arg5 = (char **)jarg5; 
+  result = (switch_status_t)switch_cache_db_execute_sql_event_callback(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_callback_func_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  switch_sql_queue_manager_execute_sql_callback(arg1,(char const *)arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_callback_func_t arg3 = (switch_core_db_callback_func_t) 0 ;
+  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_callback_func_t)jarg3; 
+  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  switch_sql_queue_manager_execute_sql_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_event_callback(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  switch_sql_queue_manager_execute_sql_event_callback(arg1,(char const *)arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_sql_queue_manager_execute_sql_event_callback_err(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_db_event_callback_func_t arg3 = (switch_core_db_event_callback_func_t) 0 ;
+  switch_core_db_err_callback_func_t arg4 = (switch_core_db_err_callback_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  
+  arg1 = (switch_sql_queue_manager_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_db_event_callback_func_t)jarg3; 
+  arg4 = (switch_core_db_err_callback_func_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  switch_sql_queue_manager_execute_sql_event_callback_err(arg1,(char const *)arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fork() {
+  void * jresult ;
+  pid_t result;
+  
+  result = switch_fork();
+  jresult = new pid_t((const pid_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_gen_certs(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_core_gen_certs((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_gen_fingerprint(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  dtls_fingerprint_t *arg2 = (dtls_fingerprint_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (dtls_fingerprint_t *)jarg2; 
+  result = (int)switch_core_cert_gen_fingerprint((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_expand_fingerprint(void * jarg1, char * jarg2) {
+  int jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_core_cert_expand_fingerprint(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_verify(void * jarg1) {
+  int jresult ;
+  dtls_fingerprint_t *arg1 = (dtls_fingerprint_t *) 0 ;
+  int result;
+  
+  arg1 = (dtls_fingerprint_t *)jarg1; 
+  result = (int)switch_core_cert_verify(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_refresh_video(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_refresh_video(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_system_fork(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_stream_handle_t *arg2 = (switch_stream_handle_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_stream_handle_t *)jarg2; 
+  result = (int)switch_stream_system_fork((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ice_direction(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_call_direction_t)switch_ice_direction(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_debug_pool(void * jarg1) {
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  switch_core_session_debug_pool(arg1);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_major() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_major();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_minor() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_minor();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_micro() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_micro();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_revision() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_revision();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_revision_human() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_revision_human();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_full() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_full();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_version_full_human() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)switch_version_full_human();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_set(void * jarg1, char * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->module_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->module_name, (const char *)arg2);
+    } else {
+      arg1->module_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_get(void * jarg1) {
+  char * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (char *) ((arg1)->module_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_endpoint_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_endpoint_interface_t *arg2 = (switch_endpoint_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_endpoint_interface_t *)jarg2; 
+  if (arg1) (arg1)->endpoint_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_endpoint_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_endpoint_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_endpoint_interface_t *) ((arg1)->endpoint_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_timer_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_timer_interface_t *arg2 = (switch_timer_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_timer_interface_t *)jarg2; 
+  if (arg1) (arg1)->timer_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_timer_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_timer_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_timer_interface_t *) ((arg1)->timer_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_dialplan_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_dialplan_interface_t *arg2 = (switch_dialplan_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_dialplan_interface_t *)jarg2; 
+  if (arg1) (arg1)->dialplan_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_dialplan_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_dialplan_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_dialplan_interface_t *) ((arg1)->dialplan_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_codec_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_codec_interface_t *)jarg2; 
+  if (arg1) (arg1)->codec_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_codec_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_codec_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_codec_interface_t *) ((arg1)->codec_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_application_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_application_interface_t *arg2 = (switch_application_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_application_interface_t *)jarg2; 
+  if (arg1) (arg1)->application_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_application_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_application_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_application_interface_t *) ((arg1)->application_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_application_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_chat_application_interface_t *arg2 = (switch_chat_application_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_chat_application_interface_t *)jarg2; 
+  if (arg1) (arg1)->chat_application_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_application_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_chat_application_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_chat_application_interface_t *) ((arg1)->chat_application_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_api_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_api_interface_t *arg2 = (switch_api_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_api_interface_t *)jarg2; 
+  if (arg1) (arg1)->api_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_api_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_api_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_api_interface_t *) ((arg1)->api_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_json_api_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_json_api_interface_t *arg2 = (switch_json_api_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_json_api_interface_t *)jarg2; 
+  if (arg1) (arg1)->json_api_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_json_api_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_json_api_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_json_api_interface_t *) ((arg1)->json_api_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_file_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_file_interface_t *arg2 = (switch_file_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_file_interface_t *)jarg2; 
+  if (arg1) (arg1)->file_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_file_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_file_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_file_interface_t *) ((arg1)->file_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_speech_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_speech_interface_t *arg2 = (switch_speech_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_speech_interface_t *)jarg2; 
+  if (arg1) (arg1)->speech_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_speech_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_speech_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_speech_interface_t *) ((arg1)->speech_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_directory_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_directory_interface_t *arg2 = (switch_directory_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_directory_interface_t *)jarg2; 
+  if (arg1) (arg1)->directory_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_directory_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_directory_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_directory_interface_t *) ((arg1)->directory_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_chat_interface_t *arg2 = (switch_chat_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_chat_interface_t *)jarg2; 
+  if (arg1) (arg1)->chat_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_chat_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_chat_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_chat_interface_t *) ((arg1)->chat_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_say_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_say_interface_t *arg2 = (switch_say_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_say_interface_t *)jarg2; 
+  if (arg1) (arg1)->say_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_say_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_say_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_say_interface_t *) ((arg1)->say_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_asr_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_asr_interface_t *arg2 = (switch_asr_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_asr_interface_t *)jarg2; 
+  if (arg1) (arg1)->asr_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_asr_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_asr_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_asr_interface_t *) ((arg1)->asr_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_management_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_management_interface_t *arg2 = (switch_management_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_management_interface_t *)jarg2; 
+  if (arg1) (arg1)->management_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_management_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_management_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_management_interface_t *) ((arg1)->management_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_limit_interface_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_limit_interface_t *arg2 = (switch_limit_interface_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_limit_interface_t *)jarg2; 
+  if (arg1) (arg1)->limit_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_limit_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_limit_interface_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_limit_interface_t *) ((arg1)->limit_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_refs_set(void * jarg1, int jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_pool_set(void * jarg1, void * jarg2) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_interface_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_loadable_module_interface() {
+  void * jresult ;
+  switch_loadable_module_interface *result = 0 ;
+  
+  result = (switch_loadable_module_interface *)new switch_loadable_module_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_interface(void * jarg1) {
+  switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;
+  
+  arg1 = (switch_loadable_module_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_init(int jarg1) {
+  int jresult ;
+  switch_bool_t arg1 ;
+  switch_status_t result;
+  
+  arg1 = (switch_bool_t)jarg1; 
+  result = (switch_status_t)switch_loadable_module_init(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_shutdown() {
+  switch_loadable_module_shutdown();
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_endpoint_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_endpoint_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_endpoint_interface_t *)switch_loadable_module_get_endpoint_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_codec_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_codec_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_codec_interface_t *)switch_loadable_module_get_codec_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_parse_codec_buf(char * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  uint32_t *arg2 = (uint32_t *) 0 ;
+  uint32_t *arg3 = (uint32_t *) 0 ;
+  uint32_t *arg4 = (uint32_t *) 0 ;
+  uint32_t *arg5 = (uint32_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (uint32_t *)jarg2; 
+  arg3 = (uint32_t *)jarg3; 
+  arg4 = (uint32_t *)jarg4; 
+  arg5 = (uint32_t *)jarg5; 
+  result = (char *)switch_parse_codec_buf(arg1,arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_dialplan_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_dialplan_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_dialplan_interface_t *)switch_loadable_module_get_dialplan_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_enumerate_available(char * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_modulename_callback_func_t arg2 = (switch_modulename_callback_func_t) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_modulename_callback_func_t)jarg2; 
+  arg3 = (void *)jarg3; 
+  result = (switch_status_t)switch_loadable_module_enumerate_available((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_enumerate_loaded(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_modulename_callback_func_t arg1 = (switch_modulename_callback_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_modulename_callback_func_t)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (switch_status_t)switch_loadable_module_enumerate_loaded(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_build_dynamic(char * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_module_load_t arg2 = (switch_module_load_t) 0 ;
+  switch_module_runtime_t arg3 = (switch_module_runtime_t) 0 ;
+  switch_module_shutdown_t arg4 = (switch_module_shutdown_t) 0 ;
+  switch_bool_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_module_load_t)jarg2; 
+  arg3 = (switch_module_runtime_t)jarg3; 
+  arg4 = (switch_module_shutdown_t)jarg4; 
+  arg5 = (switch_bool_t)jarg5; 
+  result = (switch_status_t)switch_loadable_module_build_dynamic(arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_timer_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_timer_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_timer_interface_t *)switch_loadable_module_get_timer_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_application_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_application_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_application_interface_t *)switch_loadable_module_get_application_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_chat_application_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_chat_application_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_chat_application_interface_t *)switch_loadable_module_get_chat_application_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_execute_chat_app(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_execute_chat_app(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_api_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_api_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_api_interface_t *)switch_loadable_module_get_api_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_json_api_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_json_api_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_json_api_interface_t *)switch_loadable_module_get_json_api_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_file_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_file_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_file_interface_t *)switch_loadable_module_get_file_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_speech_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_speech_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_speech_interface_t *)switch_loadable_module_get_speech_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_asr_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_asr_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_asr_interface_t *)switch_loadable_module_get_asr_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_directory_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_directory_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_directory_interface_t *)switch_loadable_module_get_directory_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_chat_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_chat_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_chat_interface_t *)switch_loadable_module_get_chat_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_say_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_say_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_say_interface_t *)switch_loadable_module_get_say_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_management_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_management_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_management_interface_t *)switch_loadable_module_get_management_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_loadable_module_get_limit_interface(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_limit_interface_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_limit_interface_t *)switch_loadable_module_get_limit_interface((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_get_codecs(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_codec_implementation_t **arg1 = (switch_codec_implementation_t **) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (switch_codec_implementation_t **)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)switch_loadable_module_get_codecs((switch_codec_implementation const **)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_get_codecs_sorted(void * jarg1, int jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  switch_codec_implementation_t **arg1 = (switch_codec_implementation_t **) 0 ;
+  int arg2 ;
+  char **arg3 = (char **) 0 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (switch_codec_implementation_t **)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char **)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)switch_loadable_module_get_codecs_sorted((switch_codec_implementation const **)arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_api_execute(char * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_core_session_t *arg3 = (switch_core_session_t *) 0 ;
+  switch_stream_handle_t *arg4 = (switch_stream_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_core_session_t *)jarg3; 
+  arg4 = (switch_stream_handle_t *)jarg4; 
+  result = (switch_status_t)switch_api_execute((char const *)arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_json_api_execute(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  cJSON *arg1 = (cJSON *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  cJSON **arg3 = (cJSON **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (cJSON *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (cJSON **)jarg3; 
+  result = (switch_status_t)switch_json_api_execute(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_load_module(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  char **arg4 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (char **)jarg4; 
+  result = (switch_status_t)switch_loadable_module_load_module(arg1,arg2,arg3,(char const **)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_exists(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_loadable_module_exists((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_unload_module(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  char **arg4 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (char **)jarg4; 
+  result = (switch_status_t)switch_loadable_module_unload_module(arg1,arg2,arg3,(char const **)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_codec_next_id() {
+  unsigned long jresult ;
+  uint32_t result;
+  
+  result = (uint32_t)switch_core_codec_next_id();
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_check_interval(unsigned long jarg1, unsigned long jarg2) {
+  int jresult ;
+  uint32_t arg1 ;
+  uint32_t arg2 ;
+  int result;
+  
+  arg1 = (uint32_t)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (int)switch_check_interval(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_codec_add_implementation(void * jarg1, void * jarg2, int jarg3, unsigned char jarg4, char * jarg5, char * jarg6, unsigned long jarg7, unsigned long jarg8, int jarg9, int jarg10, unsigned long jarg11, unsigned long jarg12, unsigned long jarg13, unsigned char jarg14, int jarg15, void * jarg16, void * jarg17, void * jarg18, void * jarg19) {
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
+  switch_codec_type_t arg3 ;
+  switch_payload_t arg4 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  uint32_t arg7 ;
+  uint32_t arg8 ;
+  int arg9 ;
+  int arg10 ;
+  uint32_t arg11 ;
+  uint32_t arg12 ;
+  uint32_t arg13 ;
+  uint8_t arg14 ;
+  int arg15 ;
+  switch_core_codec_init_func_t arg16 = (switch_core_codec_init_func_t) 0 ;
+  switch_core_codec_encode_func_t arg17 = (switch_core_codec_encode_func_t) 0 ;
+  switch_core_codec_decode_func_t arg18 = (switch_core_codec_decode_func_t) 0 ;
+  switch_core_codec_destroy_func_t arg19 = (switch_core_codec_destroy_func_t) 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (switch_codec_interface_t *)jarg2; 
+  arg3 = (switch_codec_type_t)jarg3; 
+  arg4 = (switch_payload_t)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (uint32_t)jarg7; 
+  arg8 = (uint32_t)jarg8; 
+  arg9 = (int)jarg9; 
+  arg10 = (int)jarg10; 
+  arg11 = (uint32_t)jarg11; 
+  arg12 = (uint32_t)jarg12; 
+  arg13 = (uint32_t)jarg13; 
+  arg14 = (uint8_t)jarg14; 
+  arg15 = (int)jarg15; 
+  arg16 = (switch_core_codec_init_func_t)jarg16; 
+  arg17 = (switch_core_codec_encode_func_t)jarg17; 
+  arg18 = (switch_core_codec_decode_func_t)jarg18; 
+  arg19 = (switch_core_codec_destroy_func_t)jarg19; 
+  switch_core_codec_add_implementation(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_codec_ready(void * jarg1) {
+  int jresult ;
+  switch_codec_t *arg1 = (switch_codec_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_codec_t *)jarg1; 
+  result = (switch_bool_t)switch_core_codec_ready(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_get_secondary_recover_callback(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_core_recover_callback_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_core_recover_callback_t)switch_core_get_secondary_recover_callback((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_register_secondary_recover_callback(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_core_recover_callback_t arg2 = (switch_core_recover_callback_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_core_recover_callback_t)jarg2; 
+  result = (switch_status_t)switch_core_register_secondary_recover_callback((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_unregister_secondary_recover_callback(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_core_unregister_secondary_recover_callback((char const *)arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CMD_CHUNK_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1024);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_loop() {
+  switch_console_loop();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_stream_raw_write(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  uint8_t *arg2 = (uint8_t *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  arg2 = (uint8_t *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_status_t)switch_console_stream_raw_write(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_stream_write_file_contents(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_stream_write_file_contents(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_init(void * jarg1) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  result = (switch_status_t)switch_console_init(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_shutdown() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_console_shutdown();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_add_complete_func(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_console_complete_callback_t arg2 = (switch_console_complete_callback_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_console_complete_callback_t)jarg2; 
+  result = (switch_status_t)switch_console_add_complete_func((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_del_complete_func(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_console_del_complete_func((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_run_complete_func(char * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_console_callback_match_t **arg4 = (switch_console_callback_match_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_console_callback_match_t **)jarg4; 
+  result = (switch_status_t)switch_console_run_complete_func((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match_unique(void * jarg1, char * jarg2) {
+  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_console_callback_match_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_console_push_match_unique(arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_push_match(void * jarg1, char * jarg2) {
+  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_console_callback_match_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_console_push_match(arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_free_matches(void * jarg1) {
+  switch_console_callback_match_t **arg1 = (switch_console_callback_match_t **) 0 ;
+  
+  arg1 = (switch_console_callback_match_t **)jarg1; 
+  switch_console_free_matches(arg1);
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_console_complete(char * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  unsigned char jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  FILE *arg3 = (FILE *) 0 ;
+  switch_stream_handle_t *arg4 = (switch_stream_handle_t *) 0 ;
+  switch_xml_t arg5 = (switch_xml_t) 0 ;
+  unsigned char result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (FILE *)jarg3; 
+  arg4 = (switch_stream_handle_t *)jarg4; 
+  arg5 = (switch_xml_t)jarg5; 
+  result = (unsigned char)switch_console_complete((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_sort_matches(void * jarg1) {
+  switch_console_callback_match_t *arg1 = (switch_console_callback_match_t *) 0 ;
+  
+  arg1 = (switch_console_callback_match_t *)jarg1; 
+  switch_console_sort_matches(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_console_save_history() {
+  switch_console_save_history();
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_console_expand_alias(char * jarg1, char * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_console_expand_alias(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_execute(char * jarg1, int jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  switch_stream_handle_t *arg3 = (switch_stream_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (switch_stream_handle_t *)jarg3; 
+  result = (switch_status_t)switch_console_execute(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_toupper(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_toupper(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_tolower(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_tolower(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_toupper_max(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_toupper_max(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_tolower_max(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_tolower_max(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_toupper(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)old_switch_toupper(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_tolower(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)old_switch_tolower(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isalnum(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isalnum(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isalpha(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isalpha(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_iscntrl(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_iscntrl(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isdigit(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isdigit(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isgraph(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isgraph(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_islower(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_islower(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isprint(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isprint(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ispunct(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_ispunct(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isspace(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isspace(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isupper(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isupper(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_isxdigit(int jarg1) {
+  int jresult ;
+  int arg1 ;
+  int result;
+  
+  arg1 = (int)jarg1; 
+  result = (int)switch_isxdigit(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v4_set(void * jarg1, unsigned long jarg2) {
+  ip_t *arg1 = (ip_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (ip_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->v4 = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_ip_t_v4_get(void * jarg1) {
+  unsigned long jresult ;
+  ip_t *arg1 = (ip_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (ip_t *)jarg1; 
+  result = (uint32_t) ((arg1)->v4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ip_t_v6_set(void * jarg1, void * jarg2) {
+  ip_t *arg1 = (ip_t *) 0 ;
+  in6_addr arg2 ;
+  in6_addr *argp2 ;
+  
+  arg1 = (ip_t *)jarg1; 
+  argp2 = (in6_addr *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null in6_addr", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->v6 = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_ip_t_v6_get(void * jarg1) {
+  void * jresult ;
+  ip_t *arg1 = (ip_t *) 0 ;
+  in6_addr result;
+  
+  arg1 = (ip_t *)jarg1; 
+  result =  ((arg1)->v6);
+  jresult = new in6_addr((const in6_addr &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ip_t() {
+  void * jresult ;
+  ip_t *result = 0 ;
+  
+  result = (ip_t *)new ip_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_ip_t(void * jarg1) {
+  ip_t *arg1 = (ip_t *) 0 ;
+  
+  arg1 = (ip_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_testv6_subnet(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  ip_t arg1 ;
+  ip_t arg2 ;
+  ip_t arg3 ;
+  ip_t *argp1 ;
+  ip_t *argp2 ;
+  ip_t *argp3 ;
+  switch_bool_t result;
+  
+  argp1 = (ip_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  argp2 = (ip_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  argp3 = (ip_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_bool_t)switch_testv6_subnet(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_print_host(void * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_sockaddr_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_print_host(arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMAX_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(32767);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_SMIN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(-32768);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp__zstr(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)_zstr((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_moh(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_is_moh((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strchr_strict(char * jarg1, char jarg2, char * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (char *)switch_strchr_strict((char const *)arg1,arg2,(char const *)arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_has_escaped_data(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_string_has_escaped_data((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_b64_encode(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  unsigned char *arg1 = (unsigned char *) 0 ;
+  switch_size_t arg2 ;
+  unsigned char *arg3 = (unsigned char *) 0 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp2 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (unsigned char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (unsigned char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_b64_encode(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_b64_decode(char * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_b64_decode(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_amp_encode(char * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_amp_encode(arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_digit_string(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_is_digit_string((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_switch_itodtmf(char jarg1) {
+  char jresult ;
+  char arg1 ;
+  char result;
+  
+  arg1 = (char)jarg1; 
+  result = (char)switch_itodtmf(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dtmftoi(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_dtmftoi(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_known_bitrate(unsigned char jarg1) {
+  unsigned long jresult ;
+  switch_payload_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (switch_payload_t)jarg1; 
+  result = (uint32_t)switch_known_bitrate(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_line(int jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  int arg1 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (int)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_fd_read_line(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fd_read_dline(int jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  int arg1 ;
+  char **arg2 = (char **) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (int)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = switch_fd_read_dline(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_fp_read_dline(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  FILE *arg1 = (FILE *) 0 ;
+  char **arg2 = (char **) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (FILE *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = switch_fp_read_dline(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_alloc(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_frame_t **arg1 = (switch_frame_t **) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_frame_t **)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  result = (switch_status_t)switch_frame_alloc(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_dup(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_frame_t *arg1 = (switch_frame_t *) 0 ;
+  switch_frame_t **arg2 = (switch_frame_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_frame_t *)jarg1; 
+  arg2 = (switch_frame_t **)jarg2; 
+  result = (switch_status_t)switch_frame_dup(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_free(void * jarg1) {
+  int jresult ;
+  switch_frame_t **arg1 = (switch_frame_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_frame_t **)jarg1; 
+  result = (switch_status_t)switch_frame_free(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_number(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_is_number((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_find_parameter(char * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_memory_pool_t *)jarg3; 
+  result = (char *)switch_find_parameter((char const *)arg1,(char const *)arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_true(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_true((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_true_byte(char * jarg1) {
+  unsigned char jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_byte_t)switch_true_byte((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_false(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_false((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_resolve_host(char * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (size_t)jarg3; 
+  result = (switch_status_t)switch_resolve_host((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int *arg3 = (int *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_interface_ip(char * jarg1, int jarg2, void * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int *arg3 = (int *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_find_interface_ip(arg1,arg2,arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_size_t arg2 ;
+  sockaddr *arg3 = (sockaddr *) 0 ;
+  socklen_t arg4 ;
+  switch_size_t *argp2 ;
+  socklen_t *argp4 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (sockaddr *)jarg3; 
+  argp4 = (socklen_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null socklen_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (char *)get_addr(arg1,arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_get_addr6(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_size_t arg2 ;
+  sockaddr_in6 *arg3 = (sockaddr_in6 *) 0 ;
+  socklen_t arg4 ;
+  switch_size_t *argp2 ;
+  socklen_t *argp4 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (sockaddr_in6 *)jarg3; 
+  argp4 = (socklen_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null socklen_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (char *)get_addr6(arg1,arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_get_addr_int(void * jarg1) {
+  int jresult ;
+  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_sockaddr_t *)jarg1; 
+  result = (int)get_addr_int(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_cmp_addr(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_sockaddr_t *arg1 = (switch_sockaddr_t *) 0 ;
+  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_sockaddr_t *)jarg1; 
+  arg2 = (switch_sockaddr_t *)jarg2; 
+  result = (int)switch_cmp_addr(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_get_port(void * jarg1) {
+  unsigned short jresult ;
+  sockaddr *arg1 = (sockaddr *) 0 ;
+  unsigned short result;
+  
+  arg1 = (sockaddr *)jarg1; 
+  result = (unsigned short)get_port(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_build_uri(char * jarg1, void * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_size_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_sockaddr_t *arg5 = (switch_sockaddr_t *) 0 ;
+  int arg6 ;
+  switch_size_t *argp2 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_sockaddr_t *)jarg5; 
+  arg6 = (int)jarg6; 
+  result = (int)switch_build_uri(arg1,arg2,(char const *)arg3,(char const *)arg4,(switch_sockaddr_t const *)arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_priority_name(int jarg1) {
+  char * jresult ;
+  switch_priority_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_priority_t)jarg1; 
+  result = (char *)switch_priority_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_switch_rfc2833_to_char(int jarg1) {
+  char jresult ;
+  int arg1 ;
+  char result;
+  
+  arg1 = (int)jarg1; 
+  result = (char)switch_rfc2833_to_char(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_char_to_rfc2833(char jarg1) {
+  unsigned char jresult ;
+  char arg1 ;
+  unsigned char result;
+  
+  arg1 = (char)jarg1; 
+  result = (unsigned char)switch_char_to_rfc2833(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_sanitize_number(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_sanitize_number(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_var_check(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t arg2 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_bool_t)switch_string_var_check(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_var_check_const(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_string_var_check_const((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_var_clean_string(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_var_clean_string(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_clean_string(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_clean_string(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_clean_name_string(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_clean_name_string(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_safe_atoi(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)switch_safe_atoi((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_safe_strdup(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_safe_strdup((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_lc_strdup(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_lc_strdup((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uc_strdup(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_uc_strdup((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_strstr(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_bool_t)switch_strstr(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_str_time(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = switch_str_time((char const *)arg1);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_separate_string(char * jarg1, char jarg2, void * jarg3, unsigned int jarg4) {
+  unsigned int jresult ;
+  char *arg1 = (char *) 0 ;
+  char arg2 ;
+  char **arg3 = (char **) 0 ;
+  unsigned int arg4 ;
+  unsigned int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char)jarg2; 
+  arg3 = (char **)jarg3; 
+  arg4 = (unsigned int)jarg4; 
+  result = (unsigned int)switch_separate_string(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_separate_string_string(char * jarg1, char * jarg2, void * jarg3, unsigned int jarg4) {
+  unsigned int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char **arg3 = (char **) 0 ;
+  unsigned int arg4 ;
+  unsigned int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char **)jarg3; 
+  arg4 = (unsigned int)jarg4; 
+  result = (unsigned int)switch_separate_string_string(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_spaces(char * jarg1, int jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t arg2 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (char *)switch_strip_spaces(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_whitespace(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_strip_whitespace((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_commas(char * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_strip_commas(arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strip_nonnumerics(char * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_strip_nonnumerics(arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_separate_paren_args(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_separate_paren_args(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_stristr(char * jarg1, char * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_stristr((char const *)arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_lan_addr(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_is_lan_addr((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_replace_char(char * jarg1, char jarg2, char jarg3, int jarg4) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char arg2 ;
+  char arg3 ;
+  switch_bool_t arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char)jarg2; 
+  arg3 = (char)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (char *)switch_replace_char(arg1,arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ast2regex(char * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (size_t)jarg3; 
+  result = (switch_bool_t)switch_ast2regex((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_char(void * jarg1, char * jarg2, char * jarg3, char jarg4) {
+  char * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char)jarg4; 
+  result = (char *)switch_escape_char(arg1,arg2,(char const *)arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_string(char * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_escape_string((char const *)arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_escape_string_pool(char * jarg1, void * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  result = (char *)switch_escape_string_pool((char const *)arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_socket_waitfor(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_pollfd_t *arg1 = (switch_pollfd_t *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (switch_pollfd_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)switch_socket_waitfor(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_cut_path(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_cut_path((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_string_replace(char * jarg1, char * jarg2, char * jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (char *)switch_string_replace((char const *)arg1,(char const *)arg2,(char const *)arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_match(char * jarg1, unsigned long jarg2, char * jarg3, unsigned long jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  size_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  size_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (size_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (size_t)jarg4; 
+  result = (switch_status_t)switch_string_match((char const *)arg1,arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_strcasecmp_any(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  void *arg2 = 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_strcasecmp_any((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_util_quote_shell_arg(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_util_quote_shell_arg((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_util_quote_shell_arg_pool(char * jarg1, void * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  result = (char *)switch_util_quote_shell_arg_pool((char const *)arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_encode(char * jarg1, char * jarg2, unsigned long jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (size_t)jarg3; 
+  result = (char *)switch_url_encode((char const *)arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_decode(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_url_decode(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_simple_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  result = (switch_bool_t)switch_simple_email((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_find_end_paren(char * jarg1, char jarg2, char jarg3) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char arg2 ;
+  char arg3 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char)jarg2; 
+  arg3 = (char)jarg3; 
+  result = (char *)switch_find_end_paren((char const *)arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_is_file_path(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_is_file_path((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_parse_cidr(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  ip_t *arg2 = (ip_t *) 0 ;
+  ip_t *arg3 = (ip_t *) 0 ;
+  uint32_t *arg4 = (uint32_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (ip_t *)jarg2; 
+  arg3 = (ip_t *)jarg3; 
+  arg4 = (uint32_t *)jarg4; 
+  result = (int)switch_parse_cidr((char const *)arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  int jresult ;
+  switch_network_list_t **arg1 = (switch_network_list_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  switch_memory_pool_t *arg4 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_network_list_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (switch_memory_pool_t *)jarg4; 
+  result = (switch_status_t)switch_network_list_create(arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_add_cidr_token(void * jarg1, char * jarg2, int jarg3, char * jarg4) {
+  int jresult ;
+  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_network_list_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_network_list_add_cidr_token(arg1,(char const *)arg2,arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_add_host_mask(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_network_list_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_network_list_add_host_mask(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip_token(void * jarg1, unsigned long jarg2, void * jarg3) {
+  int jresult ;
+  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
+  uint32_t arg2 ;
+  char **arg3 = (char **) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_network_list_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_bool_t)switch_network_list_validate_ip_token(arg1,arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip6_token(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_network_list_t *arg1 = (switch_network_list_t *) 0 ;
+  ip_t arg2 ;
+  char **arg3 = (char **) 0 ;
+  ip_t *argp2 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_network_list_t *)jarg1; 
+  argp2 = (ip_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ip_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  arg3 = (char **)jarg3; 
+  result = (switch_bool_t)switch_network_list_validate_ip6_token(arg1,arg2,(char const **)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_dow_int2str(int jarg1) {
+  char * jresult ;
+  int arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (int)jarg1; 
+  result = (char *)switch_dow_int2str(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dow_str2int(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (int)switch_dow_str2int((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dow_cmp(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (switch_bool_t)switch_dow_cmp((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_number_cmp(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)switch_number_cmp((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_tod_cmp(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)switch_tod_cmp((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_fulldate_cmp(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_time_t *arg2 = (switch_time_t *) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_time_t *)jarg2; 
+  result = (int)switch_fulldate_cmp((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_split_date(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  char *arg1 = (char *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int *arg4 = (int *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int *)jarg2; 
+  arg3 = (int *)jarg3; 
+  arg4 = (int *)jarg4; 
+  switch_split_date((char const *)arg1,arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_split_time(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  char *arg1 = (char *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int *arg4 = (int *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (int *)jarg2; 
+  arg3 = (int *)jarg3; 
+  arg4 = (int *)jarg4; 
+  switch_split_time((char const *)arg1,arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_split_user_domain(char * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (int)switch_split_user_domain(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_uuid_str(char * jarg1, void * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  result = (char *)switch_uuid_str(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_format_number(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_format_number((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_atoui(char * jarg1) {
+  unsigned int jresult ;
+  char *arg1 = (char *) 0 ;
+  unsigned int result;
+  
+  arg1 = (char *)jarg1; 
+  result = (unsigned int)switch_atoui((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_atoul(char * jarg1) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  unsigned long result;
+  
+  arg1 = (char *)jarg1; 
+  result = (unsigned long)switch_atoul((char const *)arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_strerror_r(int jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  int arg1 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  char *result = 0 ;
+  
+  arg1 = (int)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (char *)switch_strerror_r(arg1,arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_var_set(void * jarg1, char * jarg2) {
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->var) delete [] arg1->var;
+    if (arg2) {
+      arg1->var = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->var, (const char *)arg2);
+    } else {
+      arg1->var = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_var_get(void * jarg1) {
+  char * jresult ;
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  result = (char *) ((arg1)->var);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_val_set(void * jarg1, char * jarg2) {
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->val) delete [] arg1->val;
+    if (arg2) {
+      arg1->val = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->val, (const char *)arg2);
+    } else {
+      arg1->val = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_profile_node_t_val_get(void * jarg1) {
+  char * jresult ;
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  result = (char *) ((arg1)->val);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_profile_node_t_next_set(void * jarg1, void * jarg2) {
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *arg2 = (profile_node_s *) 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  arg2 = (profile_node_s *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_profile_node_t_next_get(void * jarg1) {
+  void * jresult ;
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  profile_node_s *result = 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  result = (profile_node_s *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_profile_node_t() {
+  void * jresult ;
+  profile_node_t *result = 0 ;
+  
+  result = (profile_node_t *)new profile_node_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_profile_node_t(void * jarg1) {
+  profile_node_t *arg1 = (profile_node_t *) 0 ;
+  
+  arg1 = (profile_node_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_username_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->username = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->username, (const char *)arg2);
+    } else {
+      arg1->username = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_username_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->username);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_dialplan_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->dialplan = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->dialplan, (const char *)arg2);
+    } else {
+      arg1->dialplan = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_dialplan_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->dialplan);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_id_name_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->caller_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->caller_id_name, (const char *)arg2);
+    } else {
+      arg1->caller_id_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_caller_id_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->caller_id_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_id_number_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->caller_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->caller_id_number, (const char *)arg2);
+    } else {
+      arg1->caller_id_number = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_caller_id_number_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->caller_id_number);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_name_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->orig_caller_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->orig_caller_id_name, (const char *)arg2);
+    } else {
+      arg1->orig_caller_id_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->orig_caller_id_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_number_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->orig_caller_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->orig_caller_id_number, (const char *)arg2);
+    } else {
+      arg1->orig_caller_id_number = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_orig_caller_id_number_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->orig_caller_id_number);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->callee_id_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->callee_id_name, (const char *)arg2);
+    } else {
+      arg1->callee_id_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->callee_id_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->callee_id_number = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->callee_id_number, (const char *)arg2);
+    } else {
+      arg1->callee_id_number = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->callee_id_number);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->caller_ton = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->caller_ton);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_numplan_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->caller_numplan = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_caller_numplan_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->caller_numplan);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_network_addr_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->network_addr = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->network_addr, (const char *)arg2);
+    } else {
+      arg1->network_addr = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_network_addr_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->network_addr);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->ani = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->ani, (const char *)arg2);
+    } else {
+      arg1->ani = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_ani_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->ani);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_ton_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->ani_ton = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_ani_ton_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->ani_ton);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_ani_numplan_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->ani_numplan = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_ani_numplan_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->ani_numplan);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_aniii_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->aniii = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->aniii, (const char *)arg2);
+    } else {
+      arg1->aniii = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_aniii_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->aniii);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->rdnis = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->rdnis, (const char *)arg2);
+    } else {
+      arg1->rdnis = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_rdnis_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->rdnis);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_ton_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->rdnis_ton = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_rdnis_ton_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->rdnis_ton);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_rdnis_numplan_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->rdnis_numplan = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_rdnis_numplan_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->rdnis_numplan);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->destination_number) delete [] arg1->destination_number;
+    if (arg2) {
+      arg1->destination_number = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->destination_number, (const char *)arg2);
+    } else {
+      arg1->destination_number = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_destination_number_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->destination_number);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_ton_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->destination_number_ton = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_destination_number_ton_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->destination_number_ton);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_destination_number_numplan_set(void * jarg1, unsigned char jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->destination_number_numplan = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_caller_profile_destination_number_numplan_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (uint8_t) ((arg1)->destination_number_numplan);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_source_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->source = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->source, (const char *)arg2);
+    } else {
+      arg1->source = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_source_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->source);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_chan_name_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->chan_name) delete [] arg1->chan_name;
+    if (arg2) {
+      arg1->chan_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->chan_name, (const char *)arg2);
+    } else {
+      arg1->chan_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_chan_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->chan_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid) delete [] arg1->uuid;
+    if (arg2) {
+      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid, (const char *)arg2);
+    } else {
+      arg1->uuid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_uuid_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->uuid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_context_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->context = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->context, (const char *)arg2);
+    } else {
+      arg1->context = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_context_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->context);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_profile_index_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->profile_index = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->profile_index, (const char *)arg2);
+    } else {
+      arg1->profile_index = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_profile_index_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->profile_index);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile_flag_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile_flag_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_caller_profile_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile_flag_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile_flag_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originator_caller_profile_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->originator_caller_profile = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_originator_caller_profile_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->originator_caller_profile);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_profile_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->originatee_caller_profile = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_profile_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->originatee_caller_profile);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->origination_caller_profile = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->origination_caller_profile);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->hunt_caller_profile = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->hunt_caller_profile);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_times_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_channel_timetable *)jarg2; 
+  if (arg1) (arg1)->times = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_times_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_channel_timetable *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_channel_timetable *) ((arg1)->times);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_old_times_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_channel_timetable *)jarg2; 
+  if (arg1) (arg1)->old_times = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_old_times_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_channel_timetable *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_channel_timetable *) ((arg1)->old_times);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_extension_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_extension *arg2 = (switch_caller_extension *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_extension *)jarg2; 
+  if (arg1) (arg1)->caller_extension = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_caller_extension_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_extension *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_extension *) ((arg1)->caller_extension);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_pool_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_next_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_next_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_direction_set(void * jarg1, int jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_call_direction_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  if (arg1) (arg1)->direction = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_profile_direction_get(void * jarg1) {
+  int jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_call_direction_t) ((arg1)->direction);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_logical_direction_set(void * jarg1, int jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_call_direction_t arg2 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  if (arg1) (arg1)->logical_direction = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_profile_logical_direction_get(void * jarg1) {
+  int jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (switch_call_direction_t) ((arg1)->logical_direction);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_soft_set(void * jarg1, void * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  profile_node_t *arg2 = (profile_node_t *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (profile_node_t *)jarg2; 
+  if (arg1) (arg1)->soft = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_soft_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  profile_node_t *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (profile_node_t *) ((arg1)->soft);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_uuid_str_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid_str) delete [] arg1->uuid_str;
+    if (arg2) {
+      arg1->uuid_str = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid_str, (const char *)arg2);
+    } else {
+      arg1->uuid_str = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_uuid_str_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->uuid_str);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_clone_of_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->clone_of) delete [] arg1->clone_of;
+    if (arg2) {
+      arg1->clone_of = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->clone_of, (const char *)arg2);
+    } else {
+      arg1->clone_of = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_clone_of_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->clone_of);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_transfer_source_set(void * jarg1, char * jarg2) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->transfer_source) delete [] arg1->transfer_source;
+    if (arg2) {
+      arg1->transfer_source = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->transfer_source, (const char *)arg2);
+    } else {
+      arg1->transfer_source = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_transfer_source_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  result = (char *) ((arg1)->transfer_source);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_profile() {
+  void * jresult ;
+  switch_caller_profile *result = 0 ;
+  
+  result = (switch_caller_profile *)new switch_caller_profile();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_profile(void * jarg1) {
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_profile *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_name_set(void * jarg1, char * jarg2) {
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->application_name) delete [] arg1->application_name;
+    if (arg2) {
+      arg1->application_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->application_name, (const char *)arg2);
+    } else {
+      arg1->application_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_application_application_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  result = (char *) ((arg1)->application_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_data_set(void * jarg1, char * jarg2) {
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->application_data) delete [] arg1->application_data;
+    if (arg2) {
+      arg1->application_data = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->application_data, (const char *)arg2);
+    } else {
+      arg1->application_data = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_application_application_data_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  result = (char *) ((arg1)->application_data);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_application_function_set(void * jarg1, void * jarg2) {
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  switch_application_function_t arg2 = (switch_application_function_t) 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  arg2 = (switch_application_function_t)jarg2; 
+  if (arg1) (arg1)->application_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_application_application_function_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  switch_application_function_t result;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  result = (switch_application_function_t) ((arg1)->application_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_application_next_set(void * jarg1, void * jarg2) {
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  switch_caller_application *arg2 = (switch_caller_application *) 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  arg2 = (switch_caller_application *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_application_next_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  switch_caller_application *result = 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  result = (switch_caller_application *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_application() {
+  void * jresult ;
+  switch_caller_application *result = 0 ;
+  
+  result = (switch_caller_application *)new switch_caller_application();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_application(void * jarg1) {
+  switch_caller_application *arg1 = (switch_caller_application *) 0 ;
+  
+  arg1 = (switch_caller_application *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_name_set(void * jarg1, char * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->extension_name) delete [] arg1->extension_name;
+    if (arg2) {
+      arg1->extension_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->extension_name, (const char *)arg2);
+    } else {
+      arg1->extension_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_extension_extension_name_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (char *) ((arg1)->extension_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_extension_number_set(void * jarg1, char * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->extension_number) delete [] arg1->extension_number;
+    if (arg2) {
+      arg1->extension_number = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->extension_number, (const char *)arg2);
+    } else {
+      arg1->extension_number = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_extension_extension_number_get(void * jarg1) {
+  char * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (char *) ((arg1)->extension_number);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_current_application_set(void * jarg1, void * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (switch_caller_application_t *)jarg2; 
+  if (arg1) (arg1)->current_application = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_current_application_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (switch_caller_application_t *) ((arg1)->current_application);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_last_application_set(void * jarg1, void * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (switch_caller_application_t *)jarg2; 
+  if (arg1) (arg1)->last_application = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_last_application_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (switch_caller_application_t *) ((arg1)->last_application);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_applications_set(void * jarg1, void * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *arg2 = (switch_caller_application_t *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (switch_caller_application_t *)jarg2; 
+  if (arg1) (arg1)->applications = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_applications_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_application_t *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (switch_caller_application_t *) ((arg1)->applications);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_children_set(void * jarg1, void * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (switch_caller_profile *)jarg2; 
+  if (arg1) (arg1)->children = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_children_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_profile *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (switch_caller_profile *) ((arg1)->children);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_next_set(void * jarg1, void * jarg2) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_extension *arg2 = (switch_caller_extension *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  arg2 = (switch_caller_extension *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_next_get(void * jarg1) {
+  void * jresult ;
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  switch_caller_extension *result = 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  result = (switch_caller_extension *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_caller_extension() {
+  void * jresult ;
+  switch_caller_extension *result = 0 ;
+  
+  result = (switch_caller_extension *)new switch_caller_extension();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_caller_extension(void * jarg1) {
+  switch_caller_extension *arg1 = (switch_caller_extension *) 0 ;
+  
+  arg1 = (switch_caller_extension *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_extension_new(void * jarg1, char * jarg2, char * jarg3) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_caller_extension_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_caller_extension_t *)switch_caller_extension_new(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_caller_extension_clone(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_caller_extension_t **arg1 = (switch_caller_extension_t **) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_caller_extension_t **)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  arg3 = (switch_memory_pool_t *)jarg3; 
+  result = (switch_status_t)switch_caller_extension_clone(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_add_application(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_caller_extension_add_application(arg1,arg2,(char const *)arg3,(char const *)arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_extension_add_application_printf(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  void *arg5 = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_caller_extension_add_application_printf(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_get_field_by_name(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_caller_profile_t *arg1 = (switch_caller_profile_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_caller_profile_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_caller_get_field_by_name(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_new(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12) {
+  void * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) 0 ;
+  char *arg11 = (char *) 0 ;
+  char *arg12 = (char *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (char *)jarg11; 
+  arg12 = (char *)jarg12; 
+  result = (switch_caller_profile_t *)switch_caller_profile_new(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_clone(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  result = (switch_caller_profile_t *)switch_caller_profile_clone(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_dup(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  result = (switch_caller_profile_t *)switch_caller_profile_dup(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_event_set_data(void * jarg1, char * jarg2, void * jarg3) {
+  switch_caller_profile_t *arg1 = (switch_caller_profile_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_caller_profile_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  switch_caller_profile_event_set_data(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_codec_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  if (arg1) (arg1)->codec = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_codec_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (switch_codec_t *) ((arg1)->codec);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_source_set(void * jarg1, char * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->source = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->source, (const char *)arg2);
+    } else {
+      arg1->source = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_frame_source_get(void * jarg1) {
+  char * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (char *) ((arg1)->source);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packet_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->packet = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_packet_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (void *) ((arg1)->packet);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_packetlen_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->packetlen = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_packetlen_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->packetlen);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_extra_data_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->extra_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_extra_data_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (void *) ((arg1)->extra_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_data_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_data_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (void *) ((arg1)->data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_datalen_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->datalen = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_datalen_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->datalen);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_buflen_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->buflen = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_buflen_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->buflen);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_samples_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samples = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_samples_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->samples);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_payload_set(void * jarg1, unsigned char jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->payload = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_frame_payload_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (switch_payload_t) ((arg1)->payload);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_timestamp_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->timestamp = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_timestamp_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result =  ((arg1)->timestamp);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_seq_set(void * jarg1, unsigned short jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint16_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint16_t)jarg2; 
+  if (arg1) (arg1)->seq = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_frame_seq_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint16_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint16_t) ((arg1)->seq);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_ssrc_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->ssrc = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_ssrc_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (uint32_t) ((arg1)->ssrc);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_m_set(void * jarg1, int jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  if (arg1) (arg1)->m = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_frame_m_get(void * jarg1) {
+  int jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (switch_bool_t) ((arg1)->m);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_frame_flag_t arg2 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (switch_frame_flag_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_frame_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  switch_frame_flag_t result;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (switch_frame_flag_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_user_data_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (void *) ((arg1)->user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_pmap_set(void * jarg1, void * jarg2) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  payload_map_t *arg2 = (payload_map_t *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  arg2 = (payload_map_t *)jarg2; 
+  if (arg1) (arg1)->pmap = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_pmap_get(void * jarg1) {
+  void * jresult ;
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  payload_map_t *result = 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  result = (payload_map_t *) ((arg1)->pmap);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_frame() {
+  void * jresult ;
+  switch_frame *result = 0 ;
+  
+  result = (switch_frame *)new switch_frame();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_frame(void * jarg1) {
+  switch_frame *arg1 = (switch_frame *) 0 ;
+  
+  arg1 = (switch_frame *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_init_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_init = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_init_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_init);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_routing_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_routing = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_routing_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_routing);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_execute_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_execute = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_execute_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_execute);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hangup_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_hangup = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_hangup_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_hangup);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_exchange_media_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_exchange_media = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_exchange_media_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_exchange_media);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_soft_execute_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_soft_execute = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_soft_execute_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_soft_execute);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_consume_media_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_consume_media = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_consume_media_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_consume_media);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_hibernate_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_hibernate = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_hibernate_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_hibernate);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reset_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_reset = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_reset_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_reset);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_park_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_park = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_park_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_park);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_reporting = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_reporting);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_destroy_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t arg2 = (switch_state_handler_t) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (switch_state_handler_t)jarg2; 
+  if (arg1) (arg1)->on_destroy = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_destroy_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  switch_state_handler_t result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (switch_state_handler_t) ((arg1)->on_destroy);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_flags_set(void * jarg1, int jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_state_handler_table_flags_get(void * jarg1) {
+  int jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  int result;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (int) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_padding_set(void * jarg1, void * jarg2) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  void **arg2 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  arg2 = (void **)jarg2; 
+  {
+    size_t ii;
+    void * *b = (void * *) arg1->padding;
+    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((void * *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_padding_get(void * jarg1) {
+  void * jresult ;
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  void **result = 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  result = (void **)(void **) ((arg1)->padding);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_state_handler_table() {
+  void * jresult ;
+  switch_state_handler_table *result = 0 ;
+  
+  result = (switch_state_handler_table *)new switch_state_handler_table();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_state_handler_table(void * jarg1) {
+  switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ;
+  
+  arg1 = (switch_state_handler_table *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_write_function_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_stream_handle_write_function_t arg2 = (switch_stream_handle_write_function_t) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  arg2 = (switch_stream_handle_write_function_t)jarg2; 
+  if (arg1) (arg1)->write_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_write_function_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_stream_handle_write_function_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result = (switch_stream_handle_write_function_t) ((arg1)->write_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_raw_write_function_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_stream_handle_raw_write_function_t arg2 = (switch_stream_handle_raw_write_function_t) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  arg2 = (switch_stream_handle_raw_write_function_t)jarg2; 
+  if (arg1) (arg1)->raw_write_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_raw_write_function_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_stream_handle_raw_write_function_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result = (switch_stream_handle_raw_write_function_t) ((arg1)->raw_write_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result = (void *) ((arg1)->data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_end_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->end = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_end_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result = (void *) ((arg1)->end);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_size_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->data_size = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_size_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result =  ((arg1)->data_size);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_data_len_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->data_len = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_data_len_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result =  ((arg1)->data_len);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->alloc_len = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_len_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result =  ((arg1)->alloc_len);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->alloc_chunk = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_alloc_chunk_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result =  ((arg1)->alloc_chunk);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_stream_handle_param_event_set(void * jarg1, void * jarg2) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  if (arg1) (arg1)->param_event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_stream_handle_param_event_get(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  switch_event_t *result = 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  result = (switch_event_t *) ((arg1)->param_event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_stream_handle() {
+  void * jresult ;
+  switch_stream_handle *result = 0 ;
+  
+  result = (switch_stream_handle *)new switch_stream_handle();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_stream_handle(void * jarg1) {
+  switch_stream_handle *arg1 = (switch_stream_handle *) 0 ;
+  
+  arg1 = (switch_stream_handle *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_outgoing_channel_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_outgoing_channel_t arg2 = (switch_io_outgoing_channel_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_outgoing_channel_t)jarg2; 
+  if (arg1) (arg1)->outgoing_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_outgoing_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_outgoing_channel_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_outgoing_channel_t) ((arg1)->outgoing_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_frame_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_read_frame_t arg2 = (switch_io_read_frame_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_read_frame_t)jarg2; 
+  if (arg1) (arg1)->read_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_read_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_read_frame_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_read_frame_t) ((arg1)->read_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_frame_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_write_frame_t arg2 = (switch_io_write_frame_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_write_frame_t)jarg2; 
+  if (arg1) (arg1)->write_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_write_frame_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_write_frame_t) ((arg1)->write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_kill_channel_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_kill_channel_t arg2 = (switch_io_kill_channel_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_kill_channel_t)jarg2; 
+  if (arg1) (arg1)->kill_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_kill_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_kill_channel_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_kill_channel_t) ((arg1)->kill_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_send_dtmf_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_send_dtmf_t arg2 = (switch_io_send_dtmf_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_send_dtmf_t)jarg2; 
+  if (arg1) (arg1)->send_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_send_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_send_dtmf_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_send_dtmf_t) ((arg1)->send_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_message_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_receive_message_t arg2 = (switch_io_receive_message_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_receive_message_t)jarg2; 
+  if (arg1) (arg1)->receive_message = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_receive_message_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_receive_message_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_receive_message_t) ((arg1)->receive_message);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_receive_event_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_receive_event_t arg2 = (switch_io_receive_event_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_receive_event_t)jarg2; 
+  if (arg1) (arg1)->receive_event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_receive_event_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_receive_event_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_receive_event_t) ((arg1)->receive_event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_change_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_state_change_t arg2 = (switch_io_state_change_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_state_change_t)jarg2; 
+  if (arg1) (arg1)->state_change = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_state_change_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_state_change_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_state_change_t) ((arg1)->state_change);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_read_video_frame_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_read_video_frame_t arg2 = (switch_io_read_video_frame_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_read_video_frame_t)jarg2; 
+  if (arg1) (arg1)->read_video_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_read_video_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_read_video_frame_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_read_video_frame_t) ((arg1)->read_video_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_write_video_frame_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_write_video_frame_t arg2 = (switch_io_write_video_frame_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_write_video_frame_t)jarg2; 
+  if (arg1) (arg1)->write_video_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_write_video_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_write_video_frame_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_write_video_frame_t) ((arg1)->write_video_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_state_run_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_state_run_t arg2 = (switch_io_state_run_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_state_run_t)jarg2; 
+  if (arg1) (arg1)->state_run = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_state_run_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_state_run_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_state_run_t) ((arg1)->state_run);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_get_jb_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_get_jb_t arg2 = (switch_io_get_jb_t) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (switch_io_get_jb_t)jarg2; 
+  if (arg1) (arg1)->get_jb = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_get_jb_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  switch_io_get_jb_t result;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (switch_io_get_jb_t) ((arg1)->get_jb);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_routines_padding_set(void * jarg1, void * jarg2) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  void **arg2 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  arg2 = (void **)jarg2; 
+  {
+    size_t ii;
+    void * *b = (void * *) arg1->padding;
+    for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((void * *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_routines_padding_get(void * jarg1) {
+  void * jresult ;
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  void **result = 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  result = (void **)(void **) ((arg1)->padding);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_routines() {
+  void * jresult ;
+  switch_io_routines *result = 0 ;
+  
+  result = (switch_io_routines *)new switch_io_routines();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_routines(void * jarg1) {
+  switch_io_routines *arg1 = (switch_io_routines *) 0 ;
+  
+  arg1 = (switch_io_routines *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_endpoint_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_io_routines_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_io_routines_t *arg2 = (switch_io_routines_t *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_io_routines_t *)jarg2; 
+  if (arg1) (arg1)->io_routines = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_io_routines_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_io_routines_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_io_routines_t *) ((arg1)->io_routines);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_state_handler_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_state_handler_table_t *)jarg2; 
+  if (arg1) (arg1)->state_handler = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_state_handler_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_state_handler_table_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_state_handler_table_t *) ((arg1)->state_handler);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_private_info_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_refs_set(void * jarg1, int jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_endpoint_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_next_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_endpoint_interface *arg2 = (switch_endpoint_interface *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_endpoint_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_endpoint_interface *result = 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_endpoint_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_endpoint_interface_recover_callback_set(void * jarg1, void * jarg2) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_core_recover_callback_t arg2 = (switch_core_recover_callback_t) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  arg2 = (switch_core_recover_callback_t)jarg2; 
+  if (arg1) (arg1)->recover_callback = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_endpoint_interface_recover_callback_get(void * jarg1) {
+  void * jresult ;
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  switch_core_recover_callback_t result;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  result = (switch_core_recover_callback_t) ((arg1)->recover_callback);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_endpoint_interface() {
+  void * jresult ;
+  switch_endpoint_interface *result = 0 ;
+  
+  result = (switch_endpoint_interface *)new switch_endpoint_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_endpoint_interface(void * jarg1) {
+  switch_endpoint_interface *arg1 = (switch_endpoint_interface *) 0 ;
+  
+  arg1 = (switch_endpoint_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interval_set(void * jarg1, int jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->interval = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_timer_interval_get(void * jarg1) {
+  int jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  int result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (int) ((arg1)->interval);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_timer_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samples_set(void * jarg1, unsigned int jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->samples = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_timer_samples_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (unsigned int) ((arg1)->samples);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_samplecount_set(void * jarg1, unsigned long jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samplecount = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_timer_samplecount_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (uint32_t) ((arg1)->samplecount);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_timer_interface_set(void * jarg1, void * jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_timer_interface_t *arg2 = (switch_timer_interface_t *) 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (switch_timer_interface_t *)jarg2; 
+  if (arg1) (arg1)->timer_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_timer_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_timer_interface_t *result = 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (switch_timer_interface_t *) ((arg1)->timer_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_private_info_set(void * jarg1, void * jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_diff_set(void * jarg1, void * jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->diff = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_diff_get(void * jarg1) {
+  void * jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result =  ((arg1)->diff);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_tick_set(void * jarg1, void * jarg2) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->tick = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_tick_get(void * jarg1) {
+  void * jresult ;
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_timer *)jarg1; 
+  result =  ((arg1)->tick);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_timer() {
+  void * jresult ;
+  switch_timer *result = 0 ;
+  
+  result = (switch_timer *)new switch_timer();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer(void * jarg1) {
+  switch_timer *arg1 = (switch_timer *) 0 ;
+  
+  arg1 = (switch_timer *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_timer_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_init_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
+  if (arg1) (arg1)->timer_init = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_init_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_init);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_next_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
+  if (arg1) (arg1)->timer_next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_next_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_step_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
+  if (arg1) (arg1)->timer_step = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_step_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_step);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_sync_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
+  if (arg1) (arg1)->timer_sync = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_sync_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_sync);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_check_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *,switch_bool_t) = (switch_status_t (*)(switch_timer_t *,switch_bool_t)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *,switch_bool_t))jarg2; 
+  if (arg1) (arg1)->timer_check = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_check_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *,switch_bool_t) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *,switch_bool_t)) ((arg1)->timer_check);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_timer_destroy_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*arg2)(switch_timer_t *) = (switch_status_t (*)(switch_timer_t *)) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_timer_t *))jarg2; 
+  if (arg1) (arg1)->timer_destroy = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_timer_destroy_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_status_t (*result)(switch_timer_t *) = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_timer_t *)) ((arg1)->timer_destroy);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_refs_set(void * jarg1, int jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_timer_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_timer_interface_next_set(void * jarg1, void * jarg2) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_timer_interface *arg2 = (switch_timer_interface *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  arg2 = (switch_timer_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_timer_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  switch_timer_interface *result = 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  result = (switch_timer_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_timer_interface() {
+  void * jresult ;
+  switch_timer_interface *result = 0 ;
+  
+  result = (switch_timer_interface *)new switch_timer_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_timer_interface(void * jarg1) {
+  switch_timer_interface *arg1 = (switch_timer_interface *) 0 ;
+  
+  arg1 = (switch_timer_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_dialplan_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_hunt_function_set(void * jarg1, void * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_dialplan_hunt_function_t arg2 = (switch_dialplan_hunt_function_t) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (switch_dialplan_hunt_function_t)jarg2; 
+  if (arg1) (arg1)->hunt_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_hunt_function_get(void * jarg1) {
+  void * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_dialplan_hunt_function_t result;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (switch_dialplan_hunt_function_t) ((arg1)->hunt_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_refs_set(void * jarg1, int jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_dialplan_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_dialplan_interface_next_set(void * jarg1, void * jarg2) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_dialplan_interface *arg2 = (switch_dialplan_interface *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  arg2 = (switch_dialplan_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_dialplan_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  switch_dialplan_interface *result = 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  result = (switch_dialplan_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_dialplan_interface() {
+  void * jresult ;
+  switch_dialplan_interface *result = 0 ;
+  
+  result = (switch_dialplan_interface *)new switch_dialplan_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_dialplan_interface(void * jarg1) {
+  switch_dialplan_interface *arg1 = (switch_dialplan_interface *) 0 ;
+  
+  arg1 = (switch_dialplan_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_open_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,char const *) = (switch_status_t (*)(switch_file_handle_t *,char const *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,char const *))jarg2; 
+  if (arg1) (arg1)->file_open = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_open_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,char const *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,char const *)) ((arg1)->file_open);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_close_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *) = (switch_status_t (*)(switch_file_handle_t *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *))jarg2; 
+  if (arg1) (arg1)->file_close = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_close_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *)) ((arg1)->file_close);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_truncate_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,int64_t) = (switch_status_t (*)(switch_file_handle_t *,int64_t)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,int64_t))jarg2; 
+  if (arg1) (arg1)->file_truncate = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_truncate_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,int64_t) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,int64_t)) ((arg1)->file_truncate);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
+  if (arg1) (arg1)->file_read = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_read_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_read);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
+  if (arg1) (arg1)->file_write = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_write_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_write);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_read_video_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
+  if (arg1) (arg1)->file_read_video = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_read_video_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_read_video);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_write_video_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,void *,switch_size_t *) = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *))jarg2; 
+  if (arg1) (arg1)->file_write_video = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_write_video_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,void *,switch_size_t *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,void *,switch_size_t *)) ((arg1)->file_write_video);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_seek_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,unsigned int *,int64_t,int) = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int))jarg2; 
+  if (arg1) (arg1)->file_seek = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_seek_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,unsigned int *,int64_t,int) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,unsigned int *,int64_t,int)) ((arg1)->file_seek);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_set_string_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,switch_audio_col_t,char const *) = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *))jarg2; 
+  if (arg1) (arg1)->file_set_string = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_set_string_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,switch_audio_col_t,char const *) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const *)) ((arg1)->file_set_string);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_file_get_string_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*arg2)(switch_file_handle_t *,switch_audio_col_t,char const **) = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **)) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **))jarg2; 
+  if (arg1) (arg1)->file_get_string = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_file_get_string_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_status_t (*result)(switch_file_handle_t *,switch_audio_col_t,char const **) = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_file_handle_t *,switch_audio_col_t,char const **)) ((arg1)->file_get_string);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_extens_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  char **arg2 = (char **) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (char **)jarg2; 
+  if (arg1) (arg1)->extens = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_extens_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  char **result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (char **) ((arg1)->extens);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_refs_set(void * jarg1, int jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_interface_next_set(void * jarg1, void * jarg2) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_file_interface *arg2 = (switch_file_interface *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  arg2 = (switch_file_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  switch_file_interface *result = 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  result = (switch_file_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_file_interface() {
+  void * jresult ;
+  switch_file_interface *result = 0 ;
+  
+  result = (switch_file_interface *)new switch_file_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_interface(void * jarg1) {
+  switch_file_interface *arg1 = (switch_file_interface *) 0 ;
+  
+  arg1 = (switch_file_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_interface_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_file_interface_t *arg2 = (switch_file_interface_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_file_interface_t *)jarg2; 
+  if (arg1) (arg1)->file_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_file_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_file_interface_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_file_interface_t *) ((arg1)->file_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_fd_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_file_t *arg2 = (switch_file_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_file_t *)jarg2; 
+  if (arg1) (arg1)->fd = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_fd_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_file_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_file_t *) ((arg1)->fd);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_set(void * jarg1, unsigned int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->samples = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_samples_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (unsigned int) ((arg1)->samples);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samplerate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_samplerate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->samplerate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->native_rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_native_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->native_rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_real_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->real_channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_real_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->real_channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_format_set(void * jarg1, unsigned int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->format = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_format_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (unsigned int) ((arg1)->format);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sections_set(void * jarg1, unsigned int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->sections = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_file_handle_sections_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (unsigned int) ((arg1)->sections);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_seekable_set(void * jarg1, int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->seekable = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_seekable_get(void * jarg1) {
+  int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int) ((arg1)->seekable);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sample_count_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->sample_count = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_sample_count_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result =  ((arg1)->sample_count);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_speed_set(void * jarg1, int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->speed = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_speed_get(void * jarg1) {
+  int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int) ((arg1)->speed);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_prebuf_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->prebuf = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_prebuf_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->prebuf);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_interval_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->interval = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_interval_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->interval);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_private_info_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_handler_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->handler) delete [] arg1->handler;
+    if (arg2) {
+      arg1->handler = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->handler, (const char *)arg2);
+    } else {
+      arg1->handler = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_handler_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->handler);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pos_set(void * jarg1, long long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->pos = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_file_handle_pos_get(void * jarg1) {
+  long long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int64_t) ((arg1)->pos);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_audio_buffer_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->audio_buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_audio_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->audio_buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_sp_audio_buffer_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->sp_audio_buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_sp_audio_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->sp_audio_buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_thresh_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->thresh = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_thresh_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->thresh);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_silence_hits_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->silence_hits = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_silence_hits_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->silence_hits);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_offset_pos_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->offset_pos = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_offset_pos_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->offset_pos);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_in_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->samples_in = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_in_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result =  ((arg1)->samples_in);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_out_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->samples_out = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_out_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result =  ((arg1)->samples_out);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int32_t)jarg2; 
+  if (arg1) (arg1)->vol = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_vol_get(void * jarg1) {
+  int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int32_t) ((arg1)->vol);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_resampler_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_audio_resampler_t *)jarg2; 
+  if (arg1) (arg1)->resampler = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_resampler_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_audio_resampler_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_audio_resampler_t *) ((arg1)->resampler);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_buffer_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuf_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  if (arg1) (arg1)->dbuf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_dbuf_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_byte_t *) ((arg1)->dbuf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_dbuflen_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->dbuflen = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_dbuflen_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result =  ((arg1)->dbuflen);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->pre_buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->pre_buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned char *arg2 = (unsigned char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (unsigned char *)jarg2; 
+  if (arg1) (arg1)->pre_buffer_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_data_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  unsigned char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (unsigned char *) ((arg1)->pre_buffer_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->pre_buffer_datalen = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_pre_buffer_datalen_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result =  ((arg1)->pre_buffer_datalen);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->file = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->file, (const char *)arg2);
+    } else {
+      arg1->file = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_file_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->file);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_func_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->func = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->func, (const char *)arg2);
+    } else {
+      arg1->func = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_func_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->func);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_line_set(void * jarg1, int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->line = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_line_get(void * jarg1) {
+  int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int) ((arg1)->line);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_file_path_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->file_path) delete [] arg1->file_path;
+    if (arg2) {
+      arg1->file_path = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->file_path, (const char *)arg2);
+    } else {
+      arg1->file_path = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_file_path_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->file_path);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_spool_path_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->spool_path) delete [] arg1->spool_path;
+    if (arg2) {
+      arg1->spool_path = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->spool_path, (const char *)arg2);
+    } else {
+      arg1->spool_path = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_spool_path_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->spool_path);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_prefix_set(void * jarg1, char * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->prefix = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->prefix, (const char *)arg2);
+    } else {
+      arg1->prefix = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_file_handle_prefix_get(void * jarg1) {
+  char * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (char *) ((arg1)->prefix);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_max_samples_set(void * jarg1, int jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->max_samples = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_file_handle_max_samples_get(void * jarg1) {
+  int jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  int result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (int) ((arg1)->max_samples);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle__params_set(void * jarg1, void * jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  if (arg1) (arg1)->params = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle__params_get(void * jarg1) {
+  void * jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  switch_event_t *result = 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (switch_event_t *) ((arg1)->params);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->cur_channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_cur_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->cur_channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_cur_samplerate_set(void * jarg1, unsigned long jarg2) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->cur_samplerate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_file_handle_cur_samplerate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->cur_samplerate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_file_handle() {
+  void * jresult ;
+  switch_file_handle *result = 0 ;
+  
+  result = (switch_file_handle *)new switch_file_handle();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_file_handle(void * jarg1) {
+  switch_file_handle *arg1 = (switch_file_handle *) 0 ;
+  
+  arg1 = (switch_file_handle *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_open_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_open = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_open_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char const *,int,char const *,switch_asr_flag_t *)) ((arg1)->asr_open);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_load_grammar_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char const *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_load_grammar = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_load_grammar_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char const *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char const *,char const *)) ((arg1)->asr_load_grammar);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_unload_grammar_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_unload_grammar = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_unload_grammar_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_unload_grammar);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_close_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_close = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_close_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) ((arg1)->asr_close);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_feed = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,void *,unsigned int,switch_asr_flag_t *)) ((arg1)->asr_feed);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_resume_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
+  if (arg1) (arg1)->asr_resume = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_resume_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_resume);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_pause_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
+  if (arg1) (arg1)->asr_pause = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_pause_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_pause);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_check_results_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_check_results = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_check_results_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_asr_flag_t *)) ((arg1)->asr_check_results);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_get_results = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_results_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char **,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char **,switch_asr_flag_t *)) ((arg1)->asr_get_results);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_get_result_headers = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_get_result_headers_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_event_t **,switch_asr_flag_t *)) ((arg1)->asr_get_result_headers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
+  if (arg1) (arg1)->asr_start_input_timers = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_start_input_timers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,char const *) = (void (*)(switch_asr_handle_t *,char *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_text_param = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,char const *)) ((arg1)->asr_text_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,int) = (void (*)(switch_asr_handle_t *,char *,int)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,int))jarg2; 
+  if (arg1) (arg1)->asr_numeric_param = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,int) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,int)) ((arg1)->asr_numeric_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,double) = (void (*)(switch_asr_handle_t *,char *,double)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,double))jarg2; 
+  if (arg1) (arg1)->asr_float_param = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,double) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,double)) ((arg1)->asr_float_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_refs_set(void * jarg1, int jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_asr_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_next_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_asr_interface *arg2 = (switch_asr_interface *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_asr_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_asr_interface *result = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_asr_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_enable_grammar_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_enable_grammar = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_enable_grammar_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_enable_grammar);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_grammar_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,char const *) = (switch_status_t (*)(switch_asr_handle_t *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_disable_grammar = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_grammar_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,char const *)) ((arg1)->asr_disable_grammar);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_all_grammars_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
+  if (arg1) (arg1)->asr_disable_all_grammars = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_disable_all_grammars_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_disable_all_grammars);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_dtmf_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *) = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *))jarg2; 
+  if (arg1) (arg1)->asr_feed_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_feed_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *,switch_dtmf_t const *,switch_asr_flag_t *)) ((arg1)->asr_feed_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_asr_interface() {
+  void * jresult ;
+  switch_asr_interface *result = 0 ;
+  
+  result = (switch_asr_interface *)new switch_asr_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_interface(void * jarg1) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_asr_interface_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_asr_interface_t *arg2 = (switch_asr_interface_t *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (switch_asr_interface_t *)jarg2; 
+  if (arg1) (arg1)->asr_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_asr_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_asr_interface_t *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (switch_asr_interface_t *) ((arg1)->asr_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_name_set(void * jarg1, char * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_name_get(void * jarg1) {
+  char * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_codec_set(void * jarg1, char * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->codec) delete [] arg1->codec;
+    if (arg2) {
+      arg1->codec = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->codec, (const char *)arg2);
+    } else {
+      arg1->codec = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_codec_get(void * jarg1) {
+  char * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (char *) ((arg1)->codec);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_grammar_set(void * jarg1, char * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->grammar) delete [] arg1->grammar;
+    if (arg2) {
+      arg1->grammar = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->grammar, (const char *)arg2);
+    } else {
+      arg1->grammar = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_grammar_get(void * jarg1) {
+  char * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (char *) ((arg1)->grammar);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_param_set(void * jarg1, char * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->param) delete [] arg1->param;
+    if (arg2) {
+      arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->param, (const char *)arg2);
+    } else {
+      arg1->param = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_asr_handle_param_get(void * jarg1) {
+  char * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (char *) ((arg1)->param);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_buffer_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuf_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  if (arg1) (arg1)->dbuf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_dbuf_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (switch_byte_t *) ((arg1)->dbuf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->dbuflen = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_dbuflen_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result =  ((arg1)->dbuflen);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_resampler_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (switch_audio_resampler_t *)jarg2; 
+  if (arg1) (arg1)->resampler = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_resampler_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  switch_audio_resampler_t *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (switch_audio_resampler_t *) ((arg1)->resampler);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samplerate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_samplerate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->samplerate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->native_rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_asr_handle_native_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->native_rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_handle_private_info_set(void * jarg1, void * jarg2) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_handle_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_asr_handle() {
+  void * jresult ;
+  switch_asr_handle *result = 0 ;
+  
+  result = (switch_asr_handle *)new switch_asr_handle();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_asr_handle(void * jarg1) {
+  switch_asr_handle *arg1 = (switch_asr_handle *) 0 ;
+  
+  arg1 = (switch_asr_handle *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_open_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*arg2)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *))jarg2; 
+  if (arg1) (arg1)->speech_open = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_open_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*result)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_speech_handle_t *,char const *,int,int,switch_speech_flag_t *)) ((arg1)->speech_open);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_close_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*arg2)(switch_speech_handle_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *))jarg2; 
+  if (arg1) (arg1)->speech_close = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_close_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*result)(switch_speech_handle_t *,switch_speech_flag_t *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_speech_handle_t *,switch_speech_flag_t *)) ((arg1)->speech_close);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_feed_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*arg2)(switch_speech_handle_t *,char *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *))jarg2; 
+  if (arg1) (arg1)->speech_feed_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_feed_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*result)(switch_speech_handle_t *,char *,switch_speech_flag_t *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_speech_handle_t *,char *,switch_speech_flag_t *)) ((arg1)->speech_feed_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*arg2)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *))jarg2; 
+  if (arg1) (arg1)->speech_read_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_read_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_status_t (*result)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_speech_handle_t *,void *,switch_size_t *,switch_speech_flag_t *)) ((arg1)->speech_read_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_flush_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*arg2)(switch_speech_handle_t *) = (void (*)(switch_speech_handle_t *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (void (*)(switch_speech_handle_t *))jarg2; 
+  if (arg1) (arg1)->speech_flush_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_flush_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*result)(switch_speech_handle_t *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (void (*)(switch_speech_handle_t *)) ((arg1)->speech_flush_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_text_param_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*arg2)(switch_speech_handle_t *,char *,char const *) = (void (*)(switch_speech_handle_t *,char *,char const *)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (void (*)(switch_speech_handle_t *,char *,char const *))jarg2; 
+  if (arg1) (arg1)->speech_text_param_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_text_param_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*result)(switch_speech_handle_t *,char *,char const *) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (void (*)(switch_speech_handle_t *,char *,char const *)) ((arg1)->speech_text_param_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_numeric_param_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*arg2)(switch_speech_handle_t *,char *,int) = (void (*)(switch_speech_handle_t *,char *,int)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (void (*)(switch_speech_handle_t *,char *,int))jarg2; 
+  if (arg1) (arg1)->speech_numeric_param_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_numeric_param_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*result)(switch_speech_handle_t *,char *,int) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (void (*)(switch_speech_handle_t *,char *,int)) ((arg1)->speech_numeric_param_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_speech_float_param_tts_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*arg2)(switch_speech_handle_t *,char *,double) = (void (*)(switch_speech_handle_t *,char *,double)) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (void (*)(switch_speech_handle_t *,char *,double))jarg2; 
+  if (arg1) (arg1)->speech_float_param_tts = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_speech_float_param_tts_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  void (*result)(switch_speech_handle_t *,char *,double) = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (void (*)(switch_speech_handle_t *,char *,double)) ((arg1)->speech_float_param_tts);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_refs_set(void * jarg1, int jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_speech_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_interface_next_set(void * jarg1, void * jarg2) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_speech_interface *arg2 = (switch_speech_interface *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  arg2 = (switch_speech_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  switch_speech_interface *result = 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  result = (switch_speech_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_speech_interface() {
+  void * jresult ;
+  switch_speech_interface *result = 0 ;
+  
+  result = (switch_speech_interface *)new switch_speech_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_interface(void * jarg1) {
+  switch_speech_interface *arg1 = (switch_speech_interface *) 0 ;
+  
+  arg1 = (switch_speech_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speech_interface_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_speech_interface_t *arg2 = (switch_speech_interface_t *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (switch_speech_interface_t *)jarg2; 
+  if (arg1) (arg1)->speech_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_speech_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_speech_interface_t *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (switch_speech_interface_t *) ((arg1)->speech_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_name_set(void * jarg1, char * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_name_get(void * jarg1) {
+  char * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_speed_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->speed = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_speed_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->speed);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samples_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samples = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samples_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->samples);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_real_channels_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->real_channels = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_real_channels_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->real_channels);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_voice_set(void * jarg1, char * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->voice, (const char *)arg2, 80-1);
+      arg1->voice[80-1] = 0;
+    } else {
+      arg1->voice[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_voice_get(void * jarg1) {
+  char * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (char *)(char *) ((arg1)->voice);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_engine_set(void * jarg1, char * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->engine) delete [] arg1->engine;
+    if (arg2) {
+      arg1->engine = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->engine, (const char *)arg2);
+    } else {
+      arg1->engine = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_engine_get(void * jarg1) {
+  char * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (char *) ((arg1)->engine);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_param_set(void * jarg1, char * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->param) delete [] arg1->param;
+    if (arg2) {
+      arg1->param = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->param, (const char *)arg2);
+    } else {
+      arg1->param = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_speech_handle_param_get(void * jarg1) {
+  char * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (char *) ((arg1)->param);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_resampler_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_audio_resampler_t *arg2 = (switch_audio_resampler_t *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (switch_audio_resampler_t *)jarg2; 
+  if (arg1) (arg1)->resampler = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_resampler_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_audio_resampler_t *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (switch_audio_resampler_t *) ((arg1)->resampler);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_buffer_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_buffer_t *arg2 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (switch_buffer_t *)jarg2; 
+  if (arg1) (arg1)->buffer = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_buffer_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_buffer_t *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (switch_buffer_t *) ((arg1)->buffer);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuf_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_byte_t *arg2 = (switch_byte_t *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  if (arg1) (arg1)->dbuf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuf_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (switch_byte_t *) ((arg1)->dbuf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->dbuflen = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_dbuflen_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result =  ((arg1)->dbuflen);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_samplerate_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samplerate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_samplerate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->samplerate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_native_rate_set(void * jarg1, unsigned long jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->native_rate = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_speech_handle_native_rate_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->native_rate);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_speech_handle_private_info_set(void * jarg1, void * jarg2) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_speech_handle_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_speech_handle() {
+  void * jresult ;
+  switch_speech_handle *result = 0 ;
+  
+  result = (switch_speech_handle *)new switch_speech_handle();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_speech_handle(void * jarg1) {
+  switch_speech_handle *arg1 = (switch_speech_handle *) 0 ;
+  
+  arg1 = (switch_speech_handle *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_say_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_function_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_callback_t arg2 = (switch_say_callback_t) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_say_callback_t)jarg2; 
+  if (arg1) (arg1)->say_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_say_function_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_callback_t result;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_say_callback_t) ((arg1)->say_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_say_string_function_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_string_callback_t arg2 = (switch_say_string_callback_t) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_say_string_callback_t)jarg2; 
+  if (arg1) (arg1)->say_string_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_say_string_function_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_string_callback_t result;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_say_string_callback_t) ((arg1)->say_string_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_refs_set(void * jarg1, int jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_say_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_say_interface_next_set(void * jarg1, void * jarg2) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_interface *arg2 = (switch_say_interface *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  arg2 = (switch_say_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_say_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  switch_say_interface *result = 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  result = (switch_say_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_say_interface() {
+  void * jresult ;
+  switch_say_interface *result = 0 ;
+  
+  result = (switch_say_interface *)new switch_say_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_say_interface(void * jarg1) {
+  switch_say_interface *arg1 = (switch_say_interface *) 0 ;
+  
+  arg1 = (switch_say_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_chat_send_set(void * jarg1, void * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_status_t (*arg2)(switch_event_t *) = (switch_status_t (*)(switch_event_t *)) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_event_t *))jarg2; 
+  if (arg1) (arg1)->chat_send = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_chat_send_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_status_t (*result)(switch_event_t *) = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_event_t *)) ((arg1)->chat_send);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_refs_set(void * jarg1, int jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_chat_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_next_set(void * jarg1, void * jarg2) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_chat_interface *arg2 = (switch_chat_interface *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  arg2 = (switch_chat_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  switch_chat_interface *result = 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  result = (switch_chat_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_chat_interface() {
+  void * jresult ;
+  switch_chat_interface *result = 0 ;
+  
+  result = (switch_chat_interface *)new switch_chat_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_interface(void * jarg1) {
+  switch_chat_interface *arg1 = (switch_chat_interface *) 0 ;
+  
+  arg1 = (switch_chat_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_relative_oid_set(void * jarg1, char * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->relative_oid = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->relative_oid, (const char *)arg2);
+    } else {
+      arg1->relative_oid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_management_interface_relative_oid_get(void * jarg1) {
+  char * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (char *) ((arg1)->relative_oid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_management_function_set(void * jarg1, void * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_status_t (*arg2)(char *,switch_management_action_t,char *,switch_size_t) = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t)) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t))jarg2; 
+  if (arg1) (arg1)->management_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_management_function_get(void * jarg1) {
+  void * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_status_t (*result)(char *,switch_management_action_t,char *,switch_size_t) = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (switch_status_t (*)(char *,switch_management_action_t,char *,switch_size_t)) ((arg1)->management_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_refs_set(void * jarg1, int jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_management_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_management_interface_next_set(void * jarg1, void * jarg2) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_management_interface *arg2 = (switch_management_interface *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  arg2 = (switch_management_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_management_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  switch_management_interface *result = 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  result = (switch_management_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_management_interface() {
+  void * jresult ;
+  switch_management_interface *result = 0 ;
+  
+  result = (switch_management_interface *)new switch_management_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_management_interface(void * jarg1) {
+  switch_management_interface *arg1 = (switch_management_interface *) 0 ;
+  
+  arg1 = (switch_management_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_limit_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_incr_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*arg2)(switch_core_session_t *,char const *,char const *,int const,int const) = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const))jarg2; 
+  if (arg1) (arg1)->incr = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_incr_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*result)(switch_core_session_t *,char const *,char const *,int const,int const) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_core_session_t *,char const *,char const *,int const,int const)) ((arg1)->incr);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_release_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*arg2)(switch_core_session_t *,char const *,char const *) = (switch_status_t (*)(switch_core_session_t *,char const *,char const *)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_core_session_t *,char const *,char const *))jarg2; 
+  if (arg1) (arg1)->release = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_release_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*result)(switch_core_session_t *,char const *,char const *) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_core_session_t *,char const *,char const *)) ((arg1)->release);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_usage_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  int (*arg2)(char const *,char const *,uint32_t *) = (int (*)(char const *,char const *,uint32_t *)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (int (*)(char const *,char const *,uint32_t *))jarg2; 
+  if (arg1) (arg1)->usage = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_usage_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  int (*result)(char const *,char const *,uint32_t *) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (int (*)(char const *,char const *,uint32_t *)) ((arg1)->usage);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reset_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*arg2)(void) = (switch_status_t (*)(void)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(void))jarg2; 
+  if (arg1) (arg1)->reset = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_reset_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*result)(void) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_status_t (*)(void)) ((arg1)->reset);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_status_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  char *(*arg2)(void) = (char *(*)(void)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (char *(*)(void))jarg2; 
+  if (arg1) (arg1)->status = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_status_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  char *(*result)(void) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (char *(*)(void)) ((arg1)->status);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_interval_reset_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*arg2)(char const *,char const *) = (switch_status_t (*)(char const *,char const *)) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(char const *,char const *))jarg2; 
+  if (arg1) (arg1)->interval_reset = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_interval_reset_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_status_t (*result)(char const *,char const *) = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_status_t (*)(char const *,char const *)) ((arg1)->interval_reset);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_refs_set(void * jarg1, int jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_limit_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_limit_interface_next_set(void * jarg1, void * jarg2) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_limit_interface *arg2 = (switch_limit_interface *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  arg2 = (switch_limit_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_limit_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  switch_limit_interface *result = 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  result = (switch_limit_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_limit_interface() {
+  void * jresult ;
+  switch_limit_interface *result = 0 ;
+  
+  result = (switch_limit_interface *)new switch_limit_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_limit_interface(void * jarg1) {
+  switch_limit_interface *arg1 = (switch_limit_interface *) 0 ;
+  
+  arg1 = (switch_limit_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directory_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_open_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*arg2)(switch_directory_handle_t *,char *,char *,char *) = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *)) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *))jarg2; 
+  if (arg1) (arg1)->directory_open = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_open_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*result)(switch_directory_handle_t *,char *,char *,char *) = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_directory_handle_t *,char *,char *,char *)) ((arg1)->directory_open);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_close_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*arg2)(switch_directory_handle_t *) = (switch_status_t (*)(switch_directory_handle_t *)) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
+  if (arg1) (arg1)->directory_close = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_close_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*result)(switch_directory_handle_t *) = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_directory_handle_t *)) ((arg1)->directory_close);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_query_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*arg2)(switch_directory_handle_t *,char *,char *) = (switch_status_t (*)(switch_directory_handle_t *,char *,char *)) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char *,char *))jarg2; 
+  if (arg1) (arg1)->directory_query = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_query_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*result)(switch_directory_handle_t *,char *,char *) = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_directory_handle_t *,char *,char *)) ((arg1)->directory_query);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*arg2)(switch_directory_handle_t *) = (switch_status_t (*)(switch_directory_handle_t *)) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_directory_handle_t *))jarg2; 
+  if (arg1) (arg1)->directory_next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_next_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*result)(switch_directory_handle_t *) = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_directory_handle_t *)) ((arg1)->directory_next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_directory_next_pair_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*arg2)(switch_directory_handle_t *,char **,char **) = (switch_status_t (*)(switch_directory_handle_t *,char **,char **)) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_directory_handle_t *,char **,char **))jarg2; 
+  if (arg1) (arg1)->directory_next_pair = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_directory_next_pair_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_status_t (*result)(switch_directory_handle_t *,char **,char **) = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_directory_handle_t *,char **,char **)) ((arg1)->directory_next_pair);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_refs_set(void * jarg1, int jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_directory_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_interface_next_set(void * jarg1, void * jarg2) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_directory_interface *arg2 = (switch_directory_interface *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  arg2 = (switch_directory_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  switch_directory_interface *result = 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  result = (switch_directory_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directory_interface() {
+  void * jresult ;
+  switch_directory_interface *result = 0 ;
+  
+  result = (switch_directory_interface *)new switch_directory_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_interface(void * jarg1) {
+  switch_directory_interface *arg1 = (switch_directory_interface *) 0 ;
+  
+  arg1 = (switch_directory_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_directory_interface_set(void * jarg1, void * jarg2) {
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  switch_directory_interface_t *arg2 = (switch_directory_interface_t *) 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  arg2 = (switch_directory_interface_t *)jarg2; 
+  if (arg1) (arg1)->directory_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_directory_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  switch_directory_interface_t *result = 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  result = (switch_directory_interface_t *) ((arg1)->directory_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_directory_handle_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directory_handle_private_info_set(void * jarg1, void * jarg2) {
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_directory_handle_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_directory_handle() {
+  void * jresult ;
+  switch_directory_handle *result = 0 ;
+  
+  result = (switch_directory_handle *)new switch_directory_handle();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_directory_handle(void * jarg1) {
+  switch_directory_handle *arg1 = (switch_directory_handle *) 0 ;
+  
+  arg1 = (switch_directory_handle *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_settings_unused_set(void * jarg1, int jarg2) {
+  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_settings *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->unused = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_settings_unused_get(void * jarg1) {
+  int jresult ;
+  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_settings *)jarg1; 
+  result = (int) ((arg1)->unused);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_settings() {
+  void * jresult ;
+  switch_codec_settings *result = 0 ;
+  
+  result = (switch_codec_settings *)new switch_codec_settings();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_settings(void * jarg1) {
+  switch_codec_settings *arg1 = (switch_codec_settings *) 0 ;
+  
+  arg1 = (switch_codec_settings *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_actual_samples_per_second_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->actual_samples_per_second = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_fmtp_actual_samples_per_second_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (uint32_t) ((arg1)->actual_samples_per_second);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_bits_per_second_set(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->bits_per_second = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_bits_per_second_get(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->bits_per_second);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_set(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->microseconds_per_packet = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_microseconds_per_packet_get(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->microseconds_per_packet);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_set(void * jarg1, int jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->stereo = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_fmtp_stereo_get(void * jarg1) {
+  int jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (int) ((arg1)->stereo);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_set(void * jarg1, void * jarg2) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_fmtp_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_fmtp() {
+  void * jresult ;
+  switch_codec_fmtp *result = 0 ;
+  
+  result = (switch_codec_fmtp *)new switch_codec_fmtp();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_fmtp(void * jarg1) {
+  switch_codec_fmtp *arg1 = (switch_codec_fmtp *) 0 ;
+  
+  arg1 = (switch_codec_fmtp *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_codec_interface_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec_interface_t *arg2 = (switch_codec_interface_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_codec_interface_t *)jarg2; 
+  if (arg1) (arg1)->codec_interface = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_codec_interface_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec_interface_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_codec_interface_t *) ((arg1)->codec_interface);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  if (arg1) (arg1)->implementation = (switch_codec_implementation_t const *)arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec_implementation_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_codec_implementation_t *) ((arg1)->implementation);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_in_set(void * jarg1, char * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->fmtp_in) delete [] arg1->fmtp_in;
+    if (arg2) {
+      arg1->fmtp_in = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->fmtp_in, (const char *)arg2);
+    } else {
+      arg1->fmtp_in = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_fmtp_in_get(void * jarg1) {
+  char * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (char *) ((arg1)->fmtp_in);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_fmtp_out_set(void * jarg1, char * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->fmtp_out) delete [] arg1->fmtp_out;
+    if (arg2) {
+      arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->fmtp_out, (const char *)arg2);
+    } else {
+      arg1->fmtp_out = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_fmtp_out_get(void * jarg1) {
+  char * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (char *) ((arg1)->fmtp_out);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_memory_pool_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  if (arg1) (arg1)->memory_pool = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_memory_pool_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_memory_pool_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_memory_pool_t *) ((arg1)->memory_pool);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_private_info_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->private_info = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_private_info_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (void *) ((arg1)->private_info);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_agreed_pt_set(void * jarg1, unsigned char jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->agreed_pt = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_agreed_pt_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_payload_t) ((arg1)->agreed_pt);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_mutex_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->mutex = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_mutex_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->mutex);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_next_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec *arg2 = (switch_codec *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_codec *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_next_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_codec *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_codec *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_session_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  if (arg1) (arg1)->session = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_session_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_core_session_t *) ((arg1)->session);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_cur_frame_set(void * jarg1, void * jarg2) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  if (arg1) (arg1)->cur_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_cur_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  result = (switch_frame_t *) ((arg1)->cur_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec() {
+  void * jresult ;
+  switch_codec *result = 0 ;
+  
+  result = (switch_codec *)new switch_codec();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec(void * jarg1) {
+  switch_codec *arg1 = (switch_codec *) 0 ;
+  
+  arg1 = (switch_codec *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_type_set(void * jarg1, int jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_codec_type_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_codec_type_t)jarg2; 
+  if (arg1) (arg1)->codec_type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_codec_type_get(void * jarg1) {
+  int jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_codec_type_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_codec_type_t) ((arg1)->codec_type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_ianacode_set(void * jarg1, unsigned char jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  if (arg1) (arg1)->ianacode = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_implementation_ianacode_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_payload_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_payload_t) ((arg1)->ianacode);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_iananame_set(void * jarg1, char * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->iananame) delete [] arg1->iananame;
+    if (arg2) {
+      arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->iananame, (const char *)arg2);
+    } else {
+      arg1->iananame = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_implementation_iananame_get(void * jarg1) {
+  char * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (char *) ((arg1)->iananame);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_fmtp_set(void * jarg1, char * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->fmtp) delete [] arg1->fmtp;
+    if (arg2) {
+      arg1->fmtp = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->fmtp, (const char *)arg2);
+    } else {
+      arg1->fmtp = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_implementation_fmtp_get(void * jarg1) {
+  char * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (char *) ((arg1)->fmtp);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_second_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samples_per_second = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_second_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->samples_per_second);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_actual_samples_per_second_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->actual_samples_per_second = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_actual_samples_per_second_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->actual_samples_per_second);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_bits_per_second_set(void * jarg1, int jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->bits_per_second = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_bits_per_second_get(void * jarg1) {
+  int jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (int) ((arg1)->bits_per_second);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_set(void * jarg1, int jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->microseconds_per_packet = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_get(void * jarg1) {
+  int jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (int) ((arg1)->microseconds_per_packet);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->samples_per_packet = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->samples_per_packet);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->decoded_bytes_per_packet = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->decoded_bytes_per_packet);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->encoded_bytes_per_packet = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->encoded_bytes_per_packet);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_number_of_channels_set(void * jarg1, unsigned char jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->number_of_channels = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_codec_implementation_number_of_channels_get(void * jarg1) {
+  unsigned char jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint8_t) ((arg1)->number_of_channels);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_set(void * jarg1, int jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->codec_frames_per_packet = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_get(void * jarg1) {
+  int jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (int) ((arg1)->codec_frames_per_packet);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_init_set(void * jarg1, void * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_init_func_t arg2 = (switch_core_codec_init_func_t) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_core_codec_init_func_t)jarg2; 
+  if (arg1) (arg1)->init = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_init_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_init_func_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_core_codec_init_func_t) ((arg1)->init);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encode_set(void * jarg1, void * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_encode_func_t arg2 = (switch_core_codec_encode_func_t) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_core_codec_encode_func_t)jarg2; 
+  if (arg1) (arg1)->encode = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_encode_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_encode_func_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_core_codec_encode_func_t) ((arg1)->encode);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decode_set(void * jarg1, void * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_decode_func_t arg2 = (switch_core_codec_decode_func_t) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_core_codec_decode_func_t)jarg2; 
+  if (arg1) (arg1)->decode = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_decode_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_decode_func_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_core_codec_decode_func_t) ((arg1)->decode);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_destroy_set(void * jarg1, void * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_destroy_func_t arg2 = (switch_core_codec_destroy_func_t) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_core_codec_destroy_func_t)jarg2; 
+  if (arg1) (arg1)->destroy = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_destroy_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_core_codec_destroy_func_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_core_codec_destroy_func_t) ((arg1)->destroy);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_id_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->codec_id = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_codec_id_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->codec_id);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_impl_id_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->impl_id = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_impl_id_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (uint32_t) ((arg1)->impl_id);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_next_set(void * jarg1, void * jarg2) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_codec_implementation *arg2 = (switch_codec_implementation *) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  arg2 = (switch_codec_implementation *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_implementation_next_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  switch_codec_implementation *result = 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  result = (switch_codec_implementation *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_implementation() {
+  void * jresult ;
+  switch_codec_implementation *result = 0 ;
+  
+  result = (switch_codec_implementation *)new switch_codec_implementation();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_implementation(void * jarg1) {
+  switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ;
+  
+  arg1 = (switch_codec_implementation *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_codec_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_implementations_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_codec_implementation_t *)jarg2; 
+  if (arg1) (arg1)->implementations = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_implementations_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_codec_implementation_t *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_codec_implementation_t *) ((arg1)->implementations);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parse_fmtp_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_core_codec_fmtp_parse_func_t arg2 = (switch_core_codec_fmtp_parse_func_t) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_core_codec_fmtp_parse_func_t)jarg2; 
+  if (arg1) (arg1)->parse_fmtp = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_parse_fmtp_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_core_codec_fmtp_parse_func_t result;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_core_codec_fmtp_parse_func_t) ((arg1)->parse_fmtp);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_codec_id_set(void * jarg1, unsigned long jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->codec_id = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_interface_codec_id_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (uint32_t) ((arg1)->codec_id);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_refs_set(void * jarg1, int jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_interface_next_set(void * jarg1, void * jarg2) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_codec_interface *arg2 = (switch_codec_interface *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  arg2 = (switch_codec_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  switch_codec_interface *result = 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  result = (switch_codec_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec_interface() {
+  void * jresult ;
+  switch_codec_interface *result = 0 ;
+  
+  result = (switch_codec_interface *)new switch_codec_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_codec_interface(void * jarg1) {
+  switch_codec_interface *arg1 = (switch_codec_interface *) 0 ;
+  
+  arg1 = (switch_codec_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_application_function_set(void * jarg1, void * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_application_function_t arg2 = (switch_application_function_t) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (switch_application_function_t)jarg2; 
+  if (arg1) (arg1)->application_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_application_function_get(void * jarg1) {
+  void * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_application_function_t result;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (switch_application_function_t) ((arg1)->application_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_long_desc_set(void * jarg1, char * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->long_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->long_desc, (const char *)arg2);
+    } else {
+      arg1->long_desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_long_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (char *) ((arg1)->long_desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_short_desc_set(void * jarg1, char * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->short_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->short_desc, (const char *)arg2);
+    } else {
+      arg1->short_desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_short_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (char *) ((arg1)->short_desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_syntax_set(void * jarg1, char * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->syntax, (const char *)arg2);
+    } else {
+      arg1->syntax = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_application_interface_syntax_get(void * jarg1) {
+  char * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (char *) ((arg1)->syntax);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_application_interface_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_refs_set(void * jarg1, int jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_application_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_application_interface_next_set(void * jarg1, void * jarg2) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_application_interface *arg2 = (switch_application_interface *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  arg2 = (switch_application_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_application_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  switch_application_interface *result = 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  result = (switch_application_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_application_interface() {
+  void * jresult ;
+  switch_application_interface *result = 0 ;
+  
+  result = (switch_application_interface *)new switch_application_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_application_interface(void * jarg1) {
+  switch_application_interface *arg1 = (switch_application_interface *) 0 ;
+  
+  arg1 = (switch_application_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_chat_application_function_set(void * jarg1, void * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_chat_application_function_t arg2 = (switch_chat_application_function_t) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (switch_chat_application_function_t)jarg2; 
+  if (arg1) (arg1)->chat_application_function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_chat_application_function_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_chat_application_function_t result;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (switch_chat_application_function_t) ((arg1)->chat_application_function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_long_desc_set(void * jarg1, char * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->long_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->long_desc, (const char *)arg2);
+    } else {
+      arg1->long_desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_long_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (char *) ((arg1)->long_desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_short_desc_set(void * jarg1, char * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->short_desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->short_desc, (const char *)arg2);
+    } else {
+      arg1->short_desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_short_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (char *) ((arg1)->short_desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_syntax_set(void * jarg1, char * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->syntax, (const char *)arg2);
+    } else {
+      arg1->syntax = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_chat_application_interface_syntax_get(void * jarg1) {
+  char * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (char *) ((arg1)->syntax);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_chat_application_interface_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_refs_set(void * jarg1, int jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_chat_application_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_application_interface_next_set(void * jarg1, void * jarg2) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_chat_application_interface *arg2 = (switch_chat_application_interface *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  arg2 = (switch_chat_application_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_application_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  switch_chat_application_interface *result = 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  result = (switch_chat_application_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_chat_application_interface() {
+  void * jresult ;
+  switch_chat_application_interface *result = 0 ;
+  
+  result = (switch_chat_application_interface *)new switch_chat_application_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_chat_application_interface(void * jarg1) {
+  switch_chat_application_interface *arg1 = (switch_chat_application_interface *) 0 ;
+  
+  arg1 = (switch_chat_application_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_desc_set(void * jarg1, char * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->desc, (const char *)arg2);
+    } else {
+      arg1->desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (char *) ((arg1)->desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_function_set(void * jarg1, void * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_api_function_t arg2 = (switch_api_function_t) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (switch_api_function_t)jarg2; 
+  if (arg1) (arg1)->function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_function_get(void * jarg1) {
+  void * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_api_function_t result;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (switch_api_function_t) ((arg1)->function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_syntax_set(void * jarg1, char * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->syntax, (const char *)arg2);
+    } else {
+      arg1->syntax = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_api_interface_syntax_get(void * jarg1) {
+  char * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (char *) ((arg1)->syntax);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_refs_set(void * jarg1, int jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_api_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_api_interface_next_set(void * jarg1, void * jarg2) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_api_interface *arg2 = (switch_api_interface *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  arg2 = (switch_api_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_api_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  switch_api_interface *result = 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  result = (switch_api_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_api_interface() {
+  void * jresult ;
+  switch_api_interface *result = 0 ;
+  
+  result = (switch_api_interface *)new switch_api_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_api_interface(void * jarg1) {
+  switch_api_interface *arg1 = (switch_api_interface *) 0 ;
+  
+  arg1 = (switch_api_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_interface_name_set(void * jarg1, char * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->interface_name = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->interface_name, (const char *)arg2);
+    } else {
+      arg1->interface_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_interface_name_get(void * jarg1) {
+  char * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (char *) ((arg1)->interface_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_desc_set(void * jarg1, char * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->desc = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->desc, (const char *)arg2);
+    } else {
+      arg1->desc = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_desc_get(void * jarg1) {
+  char * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (char *) ((arg1)->desc);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_function_set(void * jarg1, void * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_json_api_function_t arg2 = (switch_json_api_function_t) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (switch_json_api_function_t)jarg2; 
+  if (arg1) (arg1)->function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_function_get(void * jarg1) {
+  void * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_json_api_function_t result;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (switch_json_api_function_t) ((arg1)->function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_syntax_set(void * jarg1, char * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg2) {
+      arg1->syntax = (char const *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->syntax, (const char *)arg2);
+    } else {
+      arg1->syntax = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_json_api_interface_syntax_get(void * jarg1) {
+  char * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (char *) ((arg1)->syntax);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_rwlock_set(void * jarg1, void * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (switch_thread_rwlock_t *)jarg2; 
+  if (arg1) (arg1)->rwlock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_rwlock_get(void * jarg1) {
+  void * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_thread_rwlock_t *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (switch_thread_rwlock_t *) ((arg1)->rwlock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_refs_set(void * jarg1, int jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_json_api_interface_refs_get(void * jarg1) {
+  int jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  int result;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (int) ((arg1)->refs);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_reflock_set(void * jarg1, void * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->reflock = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_reflock_get(void * jarg1) {
+  void * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->reflock);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_parent_set(void * jarg1, void * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_loadable_module_interface_t *arg2 = (switch_loadable_module_interface_t *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (switch_loadable_module_interface_t *)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_loadable_module_interface_t *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (switch_loadable_module_interface_t *) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_api_interface_next_set(void * jarg1, void * jarg2) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_json_api_interface *arg2 = (switch_json_api_interface *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  arg2 = (switch_json_api_interface *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_json_api_interface_next_get(void * jarg1) {
+  void * jresult ;
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  switch_json_api_interface *result = 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  result = (switch_json_api_interface *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_json_api_interface() {
+  void * jresult ;
+  switch_json_api_interface *result = 0 ;
+  
+  result = (switch_json_api_interface *)new switch_json_api_interface();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_json_api_interface(void * jarg1) {
+  switch_json_api_interface *arg1 = (switch_json_api_interface *) 0 ;
+  
+  arg1 = (switch_json_api_interface *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_session_set(void * jarg1, void * jarg2) {
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  if (arg1) (arg1)->session = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_session_get(void * jarg1) {
+  void * jresult ;
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  result = (switch_core_session_t *) ((arg1)->session);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_write_frame_set(void * jarg1, void * jarg2) {
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  if (arg1) (arg1)->write_frame = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  result = (switch_frame_t *)& ((arg1)->write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_codec_set(void * jarg1, void * jarg2) {
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  if (arg1) (arg1)->codec = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_slin_data_codec_get(void * jarg1) {
+  void * jresult ;
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  result = (switch_codec_t *)& ((arg1)->codec);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_slin_data_frame_data_set(void * jarg1, char * jarg2) {
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->frame_data, (const char *)arg2, 8192-1);
+      arg1->frame_data[8192-1] = 0;
+    } else {
+      arg1->frame_data[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_slin_data_frame_data_get(void * jarg1) {
+  char * jresult ;
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  result = (char *)(char *) ((arg1)->frame_data);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_slin_data() {
+  void * jresult ;
+  switch_slin_data *result = 0 ;
+  
+  result = (switch_slin_data *)new switch_slin_data();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_slin_data(void * jarg1) {
+  switch_slin_data *arg1 = (switch_slin_data *) 0 ;
+  
+  arg1 = (switch_slin_data *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->profile_created = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_profile_created_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->profile_created);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_created_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->created = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_created_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->created);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_answered_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->answered = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_answered_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->answered);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->progress = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->progress);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->progress_media = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_progress_media_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->progress_media);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hungup_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->hungup = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hungup_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->hungup);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_transferred_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->transferred = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_transferred_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->transferred);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->resurrected = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_resurrected_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->resurrected);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_bridged_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->bridged = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_bridged_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->bridged);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->last_hold = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_last_hold_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->last_hold);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->hold_accum = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_hold_accum_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result =  ((arg1)->hold_accum);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_timetable_next_set(void * jarg1, void * jarg2) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_channel_timetable *arg2 = (switch_channel_timetable *) 0 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  arg2 = (switch_channel_timetable *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_timetable_next_get(void * jarg1) {
+  void * jresult ;
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  switch_channel_timetable *result = 0 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  result = (switch_channel_timetable *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_channel_timetable() {
+  void * jresult ;
+  switch_channel_timetable *result = 0 ;
+  
+  result = (switch_channel_timetable *)new switch_channel_timetable();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_channel_timetable(void * jarg1) {
+  switch_channel_timetable *arg1 = (switch_channel_timetable *) 0 ;
+  
+  arg1 = (switch_channel_timetable *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_state(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_state_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_channel_state_t)switch_channel_get_state(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_running_state(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_state_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_channel_state_t)switch_channel_get_running_state(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_check_signal(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_bool_t arg2 ;
+  int result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (int)switch_channel_check_signal(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_ready(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_bool_t arg3 ;
+  int result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (int)switch_channel_test_ready(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state(void * jarg1, void * jarg2, int jarg3) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  switch_channel_state_t arg3 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (switch_channel_state_t)jarg3; 
+  switch_channel_wait_for_state(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state_timeout(void * jarg1, int jarg2, unsigned long jarg3) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_state_t arg2 ;
+  uint32_t arg3 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_state_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  switch_channel_wait_for_state_timeout(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, int jarg2, int jarg3, unsigned long jarg4, void * jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  switch_bool_t arg3 ;
+  uint32_t arg4 ;
+  switch_channel_t *arg5 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (switch_channel_t *)jarg5; 
+  result = (switch_status_t)switch_channel_wait_for_flag(arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_set_state(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_channel_state_t arg5 ;
+  switch_channel_state_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_channel_state_t)jarg5; 
+  result = (switch_channel_state_t)switch_channel_perform_set_state(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_set_running_state(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_state_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_channel_state_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_state_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_channel_state_t)switch_channel_perform_set_running_state(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_str2cause(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_call_cause_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_call_cause_t)switch_channel_str2cause((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_cause(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_cause_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_call_cause_t)switch_channel_get_cause(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_cause_q850(int jarg1) {
+  int jresult ;
+  switch_call_cause_t arg1 ;
+  switch_call_cause_t result;
+  
+  arg1 = (switch_call_cause_t)jarg1; 
+  result = (switch_call_cause_t)switch_channel_cause_q850(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_cause_q850(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_cause_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_call_cause_t)switch_channel_get_cause_q850(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_cause_ptr(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_cause_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_call_cause_t *)switch_channel_get_cause_ptr(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_cause2str(int jarg1) {
+  char * jresult ;
+  switch_call_cause_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_call_cause_t)jarg1; 
+  result = (char *)switch_channel_cause2str(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_timetable(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_timetable_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_channel_timetable_t *)switch_channel_get_timetable(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_alloc(void * jarg1, int jarg2, void * jarg3) {
+  int jresult ;
+  switch_channel_t **arg1 = (switch_channel_t **) 0 ;
+  switch_call_direction_t arg2 ;
+  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t **)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  arg3 = (switch_memory_pool_t *)jarg3; 
+  result = (switch_status_t)switch_channel_alloc(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_init(void * jarg1, void * jarg2, int jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_channel_state_t arg3 ;
+  switch_channel_flag_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (switch_channel_state_t)jarg3; 
+  arg4 = (switch_channel_flag_t)jarg4; 
+  result = (switch_status_t)switch_channel_init(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_presence_data_vals(void * jarg1, char * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  switch_channel_set_presence_data_vals(arg1,(char const *)arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_presence(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, int jarg7) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  int arg7 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (int)jarg7; 
+  switch_channel_perform_presence(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,arg7);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_uninit(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_uninit(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_caller_profile(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  switch_channel_set_caller_profile(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_step_caller_profile(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_step_caller_profile(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_caller_profile(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_profile_t *)switch_channel_get_caller_profile(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_originator_caller_profile(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  switch_channel_set_originator_caller_profile(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_hunt_caller_profile(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  switch_channel_set_hunt_caller_profile(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_originator_caller_profile(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_profile_t *)switch_channel_get_originator_caller_profile(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_originatee_caller_profile(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  switch_channel_set_originatee_caller_profile(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_originatee_caller_profile(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_profile_t *)switch_channel_get_originatee_caller_profile(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_origination_caller_profile(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  switch_channel_set_origination_caller_profile(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_origination_caller_profile(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_profile_t *)switch_channel_get_origination_caller_profile(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_uuid(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_uuid(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_profile_var(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_channel_set_profile_var(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_channel_set_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_add_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t arg4 ;
+  switch_stack_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  arg5 = (switch_stack_t)jarg5; 
+  result = (switch_status_t)switch_channel_add_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_printf(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  void *arg4 = 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_channel_set_variable_printf(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_name_printf(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  void *arg4 = 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_channel_set_variable_name_printf(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_partner_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_channel_set_variable_partner_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_partner(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_channel_get_variable_partner(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_hold_music(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_hold_music(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_hold_music_partner(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_hold_music_partner(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_del_variable_prefix(void * jarg1, char * jarg2) {
+  unsigned long jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (uint32_t)switch_channel_del_variable_prefix(arg1,(char const *)arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_transfer_variable_prefix(void * jarg1, void * jarg2, char * jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_channel_transfer_variable_prefix(arg1,arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_bool_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_bool_t)jarg5; 
+  result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_export(void * jarg1, void * jarg2, void * jarg3, char * jarg4) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  char *arg4 = (char *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_channel_process_export(arg1,arg2,arg3,(char const *)arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_printf(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  void *arg5 = 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_channel_export_variable_printf(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_scope_variables(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  switch_channel_set_scope_variables(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_scope_variables(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_channel_get_scope_variables(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  int arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (char *)switch_channel_get_variable_dup(arg1,(char const *)arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_variables(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t **arg2 = (switch_event_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t **)jarg2; 
+  result = (switch_status_t)switch_channel_get_variables(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_pass_callee_id(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  result = (switch_status_t)switch_channel_pass_callee_id(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_variable_first(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_header_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_event_header_t *)switch_channel_variable_first(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_variable_last(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_variable_last(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_restart(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_restart(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_caller_extension_masquerade(void * jarg1, void * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_channel_caller_extension_masquerade(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_caller_extension(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  switch_channel_set_caller_extension(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_invert_cid(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_invert_cid(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_flip_cid(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_flip_cid(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_sort_cid(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_sort_cid(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_caller_extension(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_extension_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_extension_t *)switch_channel_get_caller_extension(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag(void * jarg1, int jarg2) {
+  unsigned long jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  result = (uint32_t)switch_channel_test_flag(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_flag_value(void * jarg1, int jarg2, unsigned long jarg3) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  uint32_t arg3 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  switch_channel_set_flag_value(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_flag_recursive(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  switch_channel_set_flag_recursive(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_cap_value(void * jarg1, int jarg2, unsigned long jarg3) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_cap_t arg2 ;
+  uint32_t arg3 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_cap_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  switch_channel_set_cap_value(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_cap(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_cap_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_cap_t)jarg2; 
+  switch_channel_clear_cap(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_cap(void * jarg1, int jarg2) {
+  unsigned long jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_cap_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_cap_t)jarg2; 
+  result = (uint32_t)switch_channel_test_cap(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_cap_partner(void * jarg1, int jarg2) {
+  unsigned long jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_cap_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_cap_t)jarg2; 
+  result = (uint32_t)switch_channel_test_cap_partner(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_flag_partner(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  result = (switch_bool_t)switch_channel_set_flag_partner(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_clear_flag_partner(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  result = (switch_bool_t)switch_channel_clear_flag_partner(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag_partner(void * jarg1, int jarg2) {
+  unsigned long jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  result = (uint32_t)switch_channel_test_flag_partner(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_state_flag(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  switch_channel_set_state_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_state_flag(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  switch_channel_clear_state_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_flag(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  switch_channel_clear_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_flag_recursive(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_flag_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_flag_t)jarg2; 
+  switch_channel_clear_flag_recursive(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_answer(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_channel_perform_answer(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_answered(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_channel_perform_mark_answered(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_check_zrtp(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_check_zrtp(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_ring_ready_value(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_ring_ready_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_ring_ready_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_channel_perform_ring_ready_value(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_pre_answer(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_channel_perform_pre_answer(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_pre_answered(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_channel_perform_mark_pre_answered(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_mark_ring_ready_value(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_ring_ready_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_ring_ready_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (switch_status_t)switch_channel_perform_mark_ring_ready_value(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_add_state_handler(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_state_handler_table_t *)jarg2; 
+  result = (int)switch_channel_add_state_handler(arg1,(switch_state_handler_table const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_state_handler(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_state_handler_table_t *arg2 = (switch_state_handler_table_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_state_handler_table_t *)jarg2; 
+  switch_channel_clear_state_handler(arg1,(switch_state_handler_table const *)arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_state_handler(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  int arg2 ;
+  switch_state_handler_table_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (switch_state_handler_table_t *)switch_channel_get_state_handler(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_private(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  result = (switch_status_t)switch_channel_set_private(arg1,(char const *)arg2,(void const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_private(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (void *)switch_channel_get_private(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_private_partner(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (void *)switch_channel_get_private_partner(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_name(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_channel_set_name(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_name(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_perform_hangup(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_call_cause_t arg5 ;
+  switch_channel_state_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_call_cause_t)jarg5; 
+  result = (switch_channel_state_t)switch_channel_perform_hangup(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_has_dtmf(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = switch_channel_has_dtmf(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dtmf_lock(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_status_t)switch_channel_dtmf_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_try_dtmf_lock(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_status_t)switch_channel_try_dtmf_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dtmf_unlock(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_status_t)switch_channel_dtmf_unlock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_queue_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_channel_queue_dtmf(arg1,(switch_dtmf_t const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_queue_dtmf_string(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_channel_queue_dtmf_string(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_channel_dequeue_dtmf(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_flush_dtmf(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_flush_dtmf(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_dequeue_dtmf_string(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_channel_dequeue_dtmf_string(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_state_name(int jarg1) {
+  char * jresult ;
+  switch_channel_state_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_state_t)jarg1; 
+  result = (char *)switch_channel_state_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_name_state(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_channel_state_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_channel_state_t)switch_channel_name_state((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_data(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  switch_channel_event_set_data(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_basic_data(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  switch_channel_event_set_basic_data(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_event_set_extended_data(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  switch_channel_event_set_extended_data(arg1,arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_expand_variables_check(void * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  switch_event_t *arg4 = (switch_event_t *) 0 ;
+  uint32_t arg5 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  arg4 = (switch_event_t *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  result = (char *)switch_channel_expand_variables_check(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_build_param_string(void * jarg1, void * jarg2, char * jarg3) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (char *)switch_channel_build_param_string(arg1,arg2,(char const *)arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_timestamps(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_status_t)switch_channel_set_timestamps(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_audio_sync(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  switch_channel_perform_audio_sync(arg1,(char const *)arg2,(char const *)arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_private_flag(void * jarg1, unsigned long jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_channel_set_private_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_private_flag(void * jarg1, unsigned long jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_channel_clear_private_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_private_flag(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  uint32_t arg2 ;
+  int result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (int)switch_channel_test_private_flag(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
+  char *arg1 = (char *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  uint32_t arg3 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  switch_channel_set_app_flag_key((char const *)arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
+  char *arg1 = (char *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  uint32_t arg3 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  switch_channel_clear_app_flag_key((char const *)arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_app_flag_key(char * jarg1, void * jarg2, unsigned long jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  uint32_t arg3 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (int)switch_channel_test_app_flag_key((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_bridge_time(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_set_bridge_time(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_hangup_time(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_set_hangup_time(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_direction(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_call_direction_t)switch_channel_direction(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_logical_direction(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_direction_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_call_direction_t)switch_channel_logical_direction(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_direction(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_direction_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_call_direction_t)jarg2; 
+  switch_channel_set_direction(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_session(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_core_session_t *)switch_channel_get_session(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_flag_string(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_flag_string(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_cap_string(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_cap_string(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_state_change_pending(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (int)switch_channel_state_change_pending(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_set_callstate(void * jarg1, int jarg2, char * jarg3, char * jarg4, int jarg5) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_callstate_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_channel_callstate_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  switch_channel_perform_set_callstate(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_get_callstate(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_channel_callstate_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_channel_callstate_t)switch_channel_get_callstate(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_callstate2str(int jarg1) {
+  char * jresult ;
+  switch_channel_callstate_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_callstate_t)jarg1; 
+  result = (char *)switch_channel_callstate2str(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_str2callstate(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_channel_callstate_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_channel_callstate_t)switch_channel_str2callstate((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_mark_hold(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  switch_channel_mark_hold(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_execute_on(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_channel_execute_on(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_api_on(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_channel_api_on(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_device_hangup(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_process_device_hangup(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_queued_extension(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_extension_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_caller_extension_t *)switch_channel_get_queued_extension(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_transfer_to_extension(void * jarg1, void * jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_caller_extension_t *arg2 = (switch_caller_extension_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_caller_extension_t *)jarg2; 
+  switch_channel_transfer_to_extension(arg1,arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_partner_uuid(void * jarg1) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (char *)switch_channel_get_partner_uuid(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_hold_record(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_hold_record_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_hold_record_t *)switch_channel_get_hold_record(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_state_thread_lock(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_state_thread_lock(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_state_thread_unlock(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_state_thread_unlock(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_state_thread_trylock(void * jarg1) {
+  int jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_status_t)switch_channel_state_thread_trylock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_handle_cause(void * jarg1, int jarg2) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_call_cause_t arg2 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_call_cause_t)jarg2; 
+  switch_channel_handle_cause(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_global_init(void * jarg1) {
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  switch_channel_global_init(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_global_uninit() {
+  switch_channel_global_uninit();
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_set_device_id(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_channel_set_device_id(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_device_record(void * jarg1) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  switch_channel_clear_device_record(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_device_record(void * jarg1) {
+  void * jresult ;
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_device_record_t *result = 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  result = (switch_device_record_t *)switch_channel_get_device_record(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_release_device_record(void * jarg1) {
+  switch_device_record_t **arg1 = (switch_device_record_t **) 0 ;
+  
+  arg1 = (switch_device_record_t **)jarg1; 
+  switch_channel_release_device_record(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_bind_device_state_handler(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_device_state_function_t arg1 = (switch_device_state_function_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_device_state_function_t)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (switch_status_t)switch_channel_bind_device_state_handler(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_unbind_device_state_handler(void * jarg1) {
+  int jresult ;
+  switch_device_state_function_t arg1 = (switch_device_state_function_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_device_state_function_t)jarg1; 
+  result = (switch_status_t)switch_channel_unbind_device_state_handler(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_device_state2str(int jarg1) {
+  char * jresult ;
+  switch_device_state_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_device_state_t)jarg1; 
+  result = (char *)switch_channel_device_state2str(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_buffer_t **arg2 = (switch_buffer_t **) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (switch_buffer_t **)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_status_t)switch_buffer_create(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create_dynamic(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_buffer_t **arg1 = (switch_buffer_t **) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t arg3 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp2 ;
+  switch_size_t *argp3 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_buffer_t **)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_buffer_create_dynamic(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_add_mutex(void * jarg1, void * jarg2) {
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  switch_buffer_add_mutex(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_lock(void * jarg1) {
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  switch_buffer_lock(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_trylock(void * jarg1) {
+  int jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  result = (switch_status_t)switch_buffer_trylock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_unlock(void * jarg1) {
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  switch_buffer_unlock(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_len(void * jarg1) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  result = switch_buffer_len(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_freespace(void * jarg1) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  result = switch_buffer_freespace(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_inuse(void * jarg1) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  result = switch_buffer_inuse(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_read(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_peek(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek_zerocopy(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void **arg2 = (void **) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void **)jarg2; 
+  result = switch_buffer_peek_zerocopy(arg1,(void const **)arg2);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read_loop(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_read_loop(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_set_loops(void * jarg1, int jarg2) {
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  int32_t arg2 ;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (int32_t)jarg2; 
+  switch_buffer_set_loops(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_write(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_write(arg1,(void const *)arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_toss(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  result = switch_buffer_toss(arg1,arg2);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_zero(void * jarg1) {
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  switch_buffer_zero(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_slide_write(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_slide_write(arg1,(void const *)arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_buffer_destroy(void * jarg1) {
+  switch_buffer_t **arg1 = (switch_buffer_t **) 0 ;
+  
+  arg1 = (switch_buffer_t **)jarg1; 
+  switch_buffer_destroy(arg1);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_zwrite(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (switch_buffer_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_buffer_zwrite(arg1,(void const *)arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_name_set(void * jarg1, char * jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_header_name_get(void * jarg1) {
+  char * jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_value_set(void * jarg1, char * jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->value) delete [] arg1->value;
+    if (arg2) {
+      arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->value, (const char *)arg2);
+    } else {
+      arg1->value = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_header_value_get(void * jarg1) {
+  char * jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (char *) ((arg1)->value);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_array_set(void * jarg1, void * jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char **arg2 = (char **) 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (char **)jarg2; 
+  if (arg1) (arg1)->array = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_header_array_get(void * jarg1) {
+  void * jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  char **result = 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (char **) ((arg1)->array);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_idx_set(void * jarg1, int jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->idx = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_header_idx_get(void * jarg1) {
+  int jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  int result;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (int) ((arg1)->idx);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_hash_set(void * jarg1, unsigned long jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->hash = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_header_hash_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  unsigned long result;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (unsigned long) ((arg1)->hash);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_header_next_set(void * jarg1, void * jarg2) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  switch_event_header *arg2 = (switch_event_header *) 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  arg2 = (switch_event_header *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_header_next_get(void * jarg1) {
+  void * jresult ;
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  switch_event_header *result = 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  result = (switch_event_header *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_event_header() {
+  void * jresult ;
+  switch_event_header *result = 0 ;
+  
+  result = (switch_event_header *)new switch_event_header();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event_header(void * jarg1) {
+  switch_event_header *arg1 = (switch_event_header *) 0 ;
+  
+  arg1 = (switch_event_header *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_id_set(void * jarg1, int jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_types_t arg2 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (switch_event_types_t)jarg2; 
+  if (arg1) (arg1)->event_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_event_id_get(void * jarg1) {
+  int jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_types_t result;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (switch_event_types_t) ((arg1)->event_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_priority_set(void * jarg1, int jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_priority_t arg2 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (switch_priority_t)jarg2; 
+  if (arg1) (arg1)->priority = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_priority_get(void * jarg1) {
+  int jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_priority_t result;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (switch_priority_t) ((arg1)->priority);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_owner_set(void * jarg1, char * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->owner) delete [] arg1->owner;
+    if (arg2) {
+      arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->owner, (const char *)arg2);
+    } else {
+      arg1->owner = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_owner_get(void * jarg1) {
+  char * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (char *) ((arg1)->owner);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_subclass_name_set(void * jarg1, char * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->subclass_name) delete [] arg1->subclass_name;
+    if (arg2) {
+      arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->subclass_name, (const char *)arg2);
+    } else {
+      arg1->subclass_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_subclass_name_get(void * jarg1) {
+  char * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (char *) ((arg1)->subclass_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_headers_set(void * jarg1, void * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_header_t *arg2 = (switch_event_header_t *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (switch_event_header_t *)jarg2; 
+  if (arg1) (arg1)->headers = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_headers_get(void * jarg1) {
+  void * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_header_t *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (switch_event_header_t *) ((arg1)->headers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_last_header_set(void * jarg1, void * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_header_t *arg2 = (switch_event_header_t *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (switch_event_header_t *)jarg2; 
+  if (arg1) (arg1)->last_header = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_last_header_get(void * jarg1) {
+  void * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event_header_t *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (switch_event_header_t *) ((arg1)->last_header);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_body_set(void * jarg1, char * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->body) delete [] arg1->body;
+    if (arg2) {
+      arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->body, (const char *)arg2);
+    } else {
+      arg1->body = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_body_get(void * jarg1) {
+  char * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (char *) ((arg1)->body);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_bind_user_data_set(void * jarg1, void * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->bind_user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_bind_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (void *) ((arg1)->bind_user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_event_user_data_set(void * jarg1, void * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->event_user_data = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_event_user_data_get(void * jarg1) {
+  void * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (void *) ((arg1)->event_user_data);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_key_set(void * jarg1, unsigned long jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->key = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_key_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  unsigned long result;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (unsigned long) ((arg1)->key);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_next_set(void * jarg1, void * jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event *arg2 = (switch_event *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (switch_event *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_next_get(void * jarg1) {
+  void * jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  switch_event *result = 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (switch_event *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_flags_set(void * jarg1, int jarg2) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_flags_get(void * jarg1) {
+  int jresult ;
+  switch_event *arg1 = (switch_event *) 0 ;
+  int result;
+  
+  arg1 = (switch_event *)jarg1; 
+  result = (int) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_event() {
+  void * jresult ;
+  switch_event *result = 0 ;
+  
+  result = (switch_event *)new switch_event();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_event(void * jarg1) {
+  switch_event *arg1 = (switch_event *) 0 ;
+  
+  arg1 = (switch_event *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_event_id_set(void * jarg1, int jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->event_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_event_id_get(void * jarg1) {
+  int jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (int) ((arg1)->event_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_priority_set(void * jarg1, int jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->priority = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_priority_get(void * jarg1) {
+  int jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (int) ((arg1)->priority);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_flags_set(void * jarg1, int jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_serial_event_t_flags_get(void * jarg1) {
+  int jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (int) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_owner_set(void * jarg1, char * jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->owner) delete [] arg1->owner;
+    if (arg2) {
+      arg1->owner = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->owner, (const char *)arg2);
+    } else {
+      arg1->owner = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_owner_get(void * jarg1) {
+  char * jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (char *) ((arg1)->owner);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_set(void * jarg1, char * jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->subclass_name) delete [] arg1->subclass_name;
+    if (arg2) {
+      arg1->subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->subclass_name, (const char *)arg2);
+    } else {
+      arg1->subclass_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_subclass_name_get(void * jarg1) {
+  char * jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (char *) ((arg1)->subclass_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_t_body_set(void * jarg1, char * jarg2) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->body) delete [] arg1->body;
+    if (arg2) {
+      arg1->body = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->body, (const char *)arg2);
+    } else {
+      arg1->body = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_t_body_get(void * jarg1) {
+  char * jresult ;
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  result = (char *) ((arg1)->body);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_t() {
+  void * jresult ;
+  switch_serial_event_t *result = 0 ;
+  
+  result = (switch_serial_event_t *)new switch_serial_event_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_t(void * jarg1) {
+  switch_serial_event_t *arg1 = (switch_serial_event_t *) 0 ;
+  
+  arg1 = (switch_serial_event_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_name_set(void * jarg1, char * jarg2) {
+  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_name_get(void * jarg1) {
+  char * jresult ;
+  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_serial_event_header_t *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_serial_event_header_t_value_set(void * jarg1, char * jarg2) {
+  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_serial_event_header_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->value) delete [] arg1->value;
+    if (arg2) {
+      arg1->value = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->value, (const char *)arg2);
+    } else {
+      arg1->value = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_serial_event_header_t_value_get(void * jarg1) {
+  char * jresult ;
+  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_serial_event_header_t *)jarg1; 
+  result = (char *) ((arg1)->value);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_serial_event_header_t() {
+  void * jresult ;
+  switch_serial_event_header_t *result = 0 ;
+  
+  result = (switch_serial_event_header_t *)new switch_serial_event_header_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_serial_event_header_t(void * jarg1) {
+  switch_serial_event_header_t *arg1 = (switch_serial_event_header_t *) 0 ;
+  
+  arg1 = (switch_serial_event_header_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_init(void * jarg1) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  result = (switch_status_t)switch_event_init(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_shutdown() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_event_shutdown();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_subclass_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4, int jarg5, char * jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  switch_event_t **arg4 = (switch_event_t **) 0 ;
+  switch_event_types_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (switch_event_t **)jarg4; 
+  arg5 = (switch_event_types_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  result = (switch_status_t)switch_event_create_subclass_detailed((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_priority(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  switch_priority_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (switch_priority_t)jarg2; 
+  result = (switch_status_t)switch_event_set_priority(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_event_get_header_ptr(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_header_t *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_event_header_t *)switch_event_get_header_ptr(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_get_header_idx(void * jarg1, char * jarg2, int jarg3) {
+  char * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (char *)switch_event_get_header_idx(arg1,(char const *)arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_rename_header(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_event_rename_header(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_get_body(void * jarg1) {
+  char * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  result = (char *)switch_event_get_body(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_subclass_name(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_event_set_subclass_name(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_add_header_string(void * jarg1, int jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  switch_stack_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (switch_stack_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_event_add_header_string(arg1,arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_del_header_val(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_event_del_header_val(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_add_array(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (int)switch_event_add_array(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_destroy(void * jarg1) {
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  switch_event_destroy(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_dup(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  result = (switch_status_t)switch_event_dup(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_merge(void * jarg1, void * jarg2) {
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  switch_event_merge(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_dup_reply(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  result = (switch_status_t)switch_event_dup_reply(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_fire_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  switch_event_t **arg4 = (switch_event_t **) 0 ;
+  void *arg5 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (switch_event_t **)jarg4; 
+  arg5 = (void *)jarg5; 
+  result = (switch_status_t)switch_event_fire_detailed((char const *)arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_prep_for_delivery_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  switch_event_t *arg4 = (switch_event_t *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (switch_event_t *)jarg4; 
+  switch_event_prep_for_delivery_detailed((char const *)arg1,(char const *)arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_bind(char * jarg1, int jarg2, char * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_types_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  switch_event_callback_t arg4 = (switch_event_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_types_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_event_callback_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  result = (switch_status_t)switch_event_bind((char const *)arg1,arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_bind_removable(char * jarg1, int jarg2, char * jarg3, void * jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_types_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  switch_event_callback_t arg4 = (switch_event_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  switch_event_node_t **arg6 = (switch_event_node_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_types_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_event_callback_t)jarg4; 
+  arg5 = (void *)jarg5; 
+  arg6 = (switch_event_node_t **)jarg6; 
+  result = (switch_status_t)switch_event_bind_removable((char const *)arg1,arg2,(char const *)arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_unbind(void * jarg1) {
+  int jresult ;
+  switch_event_node_t **arg1 = (switch_event_node_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_node_t **)jarg1; 
+  result = (switch_status_t)switch_event_unbind(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_unbind_callback(void * jarg1) {
+  int jresult ;
+  switch_event_callback_t arg1 = (switch_event_callback_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_callback_t)jarg1; 
+  result = (switch_status_t)switch_event_unbind_callback(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_name(int jarg1) {
+  char * jresult ;
+  switch_event_types_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_types_t)jarg1; 
+  result = (char *)switch_event_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_name_event(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_types_t *arg2 = (switch_event_types_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_types_t *)jarg2; 
+  result = (switch_status_t)switch_name_event((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_reserve_subclass_detailed(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_event_reserve_subclass_detailed((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_free_subclass_detailed(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_event_free_subclass_detailed((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_binary_deserialize(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  void **arg2 = (void **) 0 ;
+  switch_size_t arg3 ;
+  switch_bool_t arg4 ;
+  switch_size_t *argp3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (void **)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_event_binary_deserialize(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_binary_serialize(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  void **arg2 = (void **) 0 ;
+  switch_size_t *arg3 = (switch_size_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (void **)jarg2; 
+  arg3 = (switch_size_t *)jarg3; 
+  result = (switch_status_t)switch_event_binary_serialize(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_event_serialize(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize_json(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  result = (switch_status_t)switch_event_serialize_json(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_serialize_json_obj(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  cJSON **arg2 = (cJSON **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (cJSON **)jarg2; 
+  result = (switch_status_t)switch_event_serialize_json_obj(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_json(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_event_create_json(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_brackets(char * jarg1, char jarg2, char jarg3, char jarg4, void * jarg5, void * jarg6, int jarg7) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char arg2 ;
+  char arg3 ;
+  char arg4 ;
+  switch_event_t **arg5 = (switch_event_t **) 0 ;
+  char **arg6 = (char **) 0 ;
+  switch_bool_t arg7 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char)jarg2; 
+  arg3 = (char)jarg3; 
+  arg4 = (char)jarg4; 
+  arg5 = (switch_event_t **)jarg5; 
+  arg6 = (char **)jarg6; 
+  arg7 = (switch_bool_t)jarg7; 
+  result = (switch_status_t)switch_event_create_brackets(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_array_pair(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (char **)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_event_create_array_pair(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_running() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_event_running();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_set_body(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_event_set_body(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_expand_headers_check(void * jarg1, char * jarg2, void * jarg3, void * jarg4, unsigned long jarg5) {
+  char * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  switch_event_t *arg4 = (switch_event_t *) 0 ;
+  uint32_t arg5 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  arg4 = (switch_event_t *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  result = (char *)switch_event_expand_headers_check(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_pres_in_detailed(char * jarg1, char * jarg2, int jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, char * jarg12, char * jarg13, char * jarg14, char * jarg15) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) 0 ;
+  int arg11 ;
+  char *arg12 = (char *) 0 ;
+  char *arg13 = (char *) 0 ;
+  char *arg14 = (char *) 0 ;
+  char *arg15 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (int)jarg11; 
+  arg12 = (char *)jarg12; 
+  arg13 = (char *)jarg13; 
+  arg14 = (char *)jarg14; 
+  arg15 = (char *)jarg15; 
+  result = (switch_status_t)switch_event_create_pres_in_detailed(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,arg11,(char const *)arg12,(char const *)arg13,(char const *)arg14,(char const *)arg15);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_plain(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  switch_event_types_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (switch_event_types_t)jarg2; 
+  result = (switch_status_t)switch_event_create_plain(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_deliver(void * jarg1) {
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  switch_event_deliver(arg1);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_event_build_param_string(void * jarg1, char * jarg2, void * jarg3) {
+  char * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_hash_t *arg3 = (switch_hash_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_hash_t *)jarg3; 
+  result = (char *)switch_event_build_param_string(arg1,(char const *)arg2,arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_check_permission_list(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_event_check_permission_list(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_add_presence_data_cols(void * jarg1, void * jarg2, char * jarg3) {
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (switch_channel_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  switch_event_add_presence_data_cols(arg1,arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_json_add_presence_data_cols(void * jarg1, void * jarg2, char * jarg3) {
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  cJSON *arg2 = (cJSON *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (cJSON *)jarg2; 
+  arg3 = (char *)jarg3; 
+  switch_json_add_presence_data_cols(arg1,arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_launch_dispatch_threads(unsigned long jarg1) {
+  uint32_t arg1 ;
+  
+  arg1 = (uint32_t)jarg1; 
+  switch_event_launch_dispatch_threads(arg1);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_channel_broadcast(char * jarg1, void * jarg2, char * jarg3, unsigned long jarg4) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  cJSON **arg2 = (cJSON **) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_event_channel_id_t arg4 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (cJSON **)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_event_channel_id_t)jarg4; 
+  result = (uint32_t)switch_event_channel_broadcast((char const *)arg1,arg2,(char const *)arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_event_channel_unbind(char * jarg1, void * jarg2) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_channel_func_t arg2 = (switch_event_channel_func_t) 0 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_channel_func_t)jarg2; 
+  result = (uint32_t)switch_event_channel_unbind((char const *)arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_channel_bind(char * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_channel_func_t arg2 = (switch_event_channel_func_t) 0 ;
+  switch_event_channel_id_t *arg3 = (switch_event_channel_id_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_channel_func_t)jarg2; 
+  arg3 = (switch_event_channel_id_t *)jarg3; 
+  result = (switch_status_t)switch_event_channel_bind((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_NO_EVENT_CHANNEL_ID_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(0);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EVENT_CHANNEL_GLOBAL_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("__global__");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_clear(void * jarg1) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  result = (switch_status_t)switch_live_array_clear(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_bootstrap(void * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_channel_id_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_channel_id_t)jarg3; 
+  result = (switch_status_t)switch_live_array_bootstrap(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_destroy(void * jarg1) {
+  int jresult ;
+  switch_live_array_t **arg1 = (switch_live_array_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t **)jarg1; 
+  result = (switch_status_t)switch_live_array_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_create(char * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_event_channel_id_t arg3 ;
+  switch_live_array_t **arg4 = (switch_live_array_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_event_channel_id_t)jarg3; 
+  arg4 = (switch_live_array_t **)jarg4; 
+  result = (switch_status_t)switch_live_array_create((char const *)arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_live_array_get(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  cJSON *result = 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (cJSON *)switch_live_array_get(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_live_array_get_idx(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  int arg2 ;
+  cJSON *result = 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (cJSON *)switch_live_array_get_idx(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_del(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_live_array_del(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_add(void * jarg1, char * jarg2, int jarg3, void * jarg4, int jarg5) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  cJSON **arg4 = (cJSON **) 0 ;
+  switch_bool_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (cJSON **)jarg4; 
+  arg5 = (switch_bool_t)jarg5; 
+  result = (switch_status_t)switch_live_array_add(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_visible(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_live_array_visible(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_isnew(void * jarg1) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  result = (switch_bool_t)switch_live_array_isnew(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_lock(void * jarg1) {
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  switch_live_array_lock(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_unlock(void * jarg1) {
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  switch_live_array_unlock(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_set_user_data(void * jarg1, void * jarg2) {
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  switch_live_array_set_user_data(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_set_command_handler(void * jarg1, void * jarg2) {
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  switch_live_array_command_handler_t arg2 = (switch_live_array_command_handler_t) 0 ;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (switch_live_array_command_handler_t)jarg2; 
+  switch_live_array_set_command_handler(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_live_array_parse_json(void * jarg1, unsigned long jarg2) {
+  cJSON *arg1 = (cJSON *) 0 ;
+  switch_event_channel_id_t arg2 ;
+  
+  arg1 = (cJSON *)jarg1; 
+  arg2 = (switch_event_channel_id_t)jarg2; 
+  switch_live_array_parse_json(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_add_alias(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_bool_t)switch_live_array_add_alias(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_live_array_clear_alias(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_live_array_t *arg1 = (switch_live_array_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_live_array_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_bool_t)switch_live_array_clear_alias(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_channel_permission_verify(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_bool_t)switch_event_channel_permission_verify((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_channel_permission_modify(char * jarg1, char * jarg2, int jarg3) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  switch_event_channel_permission_modify((char const *)arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_channel_permission_clear(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_event_channel_permission_clear((char const *)arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RESAMPLE_QUALITY_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_resampler_set(void * jarg1, void * jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->resampler = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_audio_resampler_t_resampler_get(void * jarg1) {
+  void * jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (void *) ((arg1)->resampler);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_from_rate_set(void * jarg1, int jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->from_rate = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_from_rate_get(void * jarg1) {
+  int jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (int) ((arg1)->from_rate);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_rate_set(void * jarg1, int jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->to_rate = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_to_rate_get(void * jarg1) {
+  int jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (int) ((arg1)->to_rate);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_factor_set(void * jarg1, double jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->factor = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_audio_resampler_t_factor_get(void * jarg1) {
+  double jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (double) ((arg1)->factor);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_rfactor_set(void * jarg1, double jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  double arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (double)jarg2; 
+  if (arg1) (arg1)->rfactor = arg2;
+}
+
+
+SWIGEXPORT double SWIGSTDCALL CSharp_switch_audio_resampler_t_rfactor_get(void * jarg1) {
+  double jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  double result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (double) ((arg1)->rfactor);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_set(void * jarg1, void * jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int16_t *arg2 = (int16_t *) 0 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (int16_t *)jarg2; 
+  if (arg1) (arg1)->to = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_audio_resampler_t_to_get(void * jarg1) {
+  void * jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int16_t *result = 0 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (int16_t *) ((arg1)->to);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_len_set(void * jarg1, unsigned long jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->to_len = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_audio_resampler_t_to_len_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (uint32_t) ((arg1)->to_len);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_set(void * jarg1, unsigned long jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->to_size = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_audio_resampler_t_to_size_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (uint32_t) ((arg1)->to_size);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_set(void * jarg1, int jarg2) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->channels = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_audio_resampler_t_channels_get(void * jarg1) {
+  int jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  result = (int) ((arg1)->channels);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_audio_resampler_t() {
+  void * jresult ;
+  switch_audio_resampler_t *result = 0 ;
+  
+  result = (switch_audio_resampler_t *)new switch_audio_resampler_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_audio_resampler_t(void * jarg1) {
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_resample_perform_create(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, int jarg5, unsigned long jarg6, char * jarg7, char * jarg8, int jarg9) {
+  int jresult ;
+  switch_audio_resampler_t **arg1 = (switch_audio_resampler_t **) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  int arg5 ;
+  uint32_t arg6 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  int arg9 ;
+  switch_status_t result;
+  
+  arg1 = (switch_audio_resampler_t **)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (int)jarg9; 
+  result = (switch_status_t)switch_resample_perform_create(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_resample_destroy(void * jarg1) {
+  switch_audio_resampler_t **arg1 = (switch_audio_resampler_t **) 0 ;
+  
+  arg1 = (switch_audio_resampler_t **)jarg1; 
+  switch_resample_destroy(arg1);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_resample_process(void * jarg1, void * jarg2, unsigned long jarg3) {
+  unsigned long jresult ;
+  switch_audio_resampler_t *arg1 = (switch_audio_resampler_t *) 0 ;
+  int16_t *arg2 = (int16_t *) 0 ;
+  uint32_t arg3 ;
+  uint32_t result;
+  
+  arg1 = (switch_audio_resampler_t *)jarg1; 
+  arg2 = (int16_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (uint32_t)switch_resample_process(arg1,arg2,arg3);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_float_to_short(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  float *arg1 = (float *) 0 ;
+  short *arg2 = (short *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_size_t result;
+  
+  arg1 = (float *)jarg1; 
+  arg2 = (short *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = switch_float_to_short(arg1,arg2,arg3);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_char_to_float(char * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  float *arg2 = (float *) 0 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (float *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_char_to_float(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_float_to_char(void * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  float *arg1 = (float *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (float *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_float_to_char(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_short_to_float(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  short *arg1 = (short *) 0 ;
+  float *arg2 = (float *) 0 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (short *)jarg1; 
+  arg2 = (float *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_short_to_float(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_swap_linear(void * jarg1, int jarg2) {
+  int16_t *arg1 = (int16_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  switch_swap_linear(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_generate_sln_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4) {
+  int16_t *arg1 = (int16_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  switch_generate_sln_silence(arg1,arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_change_sln_volume(void * jarg1, unsigned long jarg2, int jarg3) {
+  int16_t *arg1 = (int16_t *) 0 ;
+  uint32_t arg2 ;
+  int32_t arg3 ;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (int32_t)jarg3; 
+  switch_change_sln_volume(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_change_sln_volume_granular(void * jarg1, unsigned long jarg2, int jarg3) {
+  int16_t *arg1 = (int16_t *) 0 ;
+  uint32_t arg2 ;
+  int32_t arg3 ;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (int32_t)jarg3; 
+  switch_change_sln_volume_granular(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_merge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
+  unsigned long jresult ;
+  int16_t *arg1 = (int16_t *) 0 ;
+  uint32_t arg2 ;
+  int16_t *arg3 = (int16_t *) 0 ;
+  uint32_t arg4 ;
+  uint32_t result;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (int16_t *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  result = (uint32_t)switch_merge_sln(arg1,arg2,arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_unmerge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
+  unsigned long jresult ;
+  int16_t *arg1 = (int16_t *) 0 ;
+  uint32_t arg2 ;
+  int16_t *arg3 = (int16_t *) 0 ;
+  uint32_t arg4 ;
+  uint32_t result;
+  
+  arg1 = (int16_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (int16_t *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  result = (uint32_t)switch_unmerge_sln(arg1,arg2,arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, void * jarg2, unsigned long jarg3, unsigned long jarg4) {
+  int16_t *arg1 = (int16_t *) 0 ;
+  switch_size_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (int16_t *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  switch_mux_channels(arg1,arg2,arg3,arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_session_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  if (arg1) (arg1)->session = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_session_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_core_session_t *) ((arg1)->session);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_read_codec_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_codec_t *arg2 = (switch_codec_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_codec_t *)jarg2; 
+  if (arg1) (arg1)->read_codec = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_read_codec_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_codec_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_codec_t *)& ((arg1)->read_codec);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  if (arg1) (arg1)->write_frame = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_frame_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_frame_t *)& ((arg1)->write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_data_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_byte_t *arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_byte_t *)jarg2; 
+  {
+    size_t ii;
+    switch_byte_t *b = (switch_byte_t *) arg1->write_frame_data;
+    for (ii = 0; ii < (size_t)8192; ii++) b[ii] = *((switch_byte_t *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_write_frame_data_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_byte_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_byte_t *)(switch_byte_t *) ((arg1)->write_frame_data);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_socket_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_socket_t *arg2 = (switch_socket_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_socket_t *)jarg2; 
+  if (arg1) (arg1)->socket = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_socket_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_socket_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_socket_t *) ((arg1)->socket);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_ip_set(void * jarg1, char * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->local_ip) delete [] arg1->local_ip;
+    if (arg2) {
+      arg1->local_ip = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->local_ip, (const char *)arg2);
+    } else {
+      arg1->local_ip = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_unicast_conninfo_local_ip_get(void * jarg1) {
+  char * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (char *) ((arg1)->local_ip);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_port_set(void * jarg1, unsigned short jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  if (arg1) (arg1)->local_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_unicast_conninfo_local_port_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_port_t) ((arg1)->local_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_ip_set(void * jarg1, char * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->remote_ip) delete [] arg1->remote_ip;
+    if (arg2) {
+      arg1->remote_ip = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->remote_ip, (const char *)arg2);
+    } else {
+      arg1->remote_ip = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_ip_get(void * jarg1) {
+  char * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (char *) ((arg1)->remote_ip);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_port_set(void * jarg1, unsigned short jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  if (arg1) (arg1)->remote_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_port_get(void * jarg1) {
+  unsigned short jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_port_t) ((arg1)->remote_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_local_addr_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_sockaddr_t *)jarg2; 
+  if (arg1) (arg1)->local_addr = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_local_addr_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_sockaddr_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_sockaddr_t *) ((arg1)->local_addr);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_addr_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_sockaddr_t *arg2 = (switch_sockaddr_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_sockaddr_t *)jarg2; 
+  if (arg1) (arg1)->remote_addr = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_remote_addr_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_sockaddr_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_sockaddr_t *) ((arg1)->remote_addr);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flag_mutex_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_mutex_t *arg2 = (switch_mutex_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_mutex_t *)jarg2; 
+  if (arg1) (arg1)->flag_mutex = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_flag_mutex_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_mutex_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_mutex_t *) ((arg1)->flag_mutex);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_flags_set(void * jarg1, int jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int32_t arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (int32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_flags_get(void * jarg1) {
+  int jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int32_t result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (int32_t) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_type_set(void * jarg1, int jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_type_get(void * jarg1) {
+  int jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (int) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_transport_set(void * jarg1, int jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->transport = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_transport_get(void * jarg1) {
+  int jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (int) ((arg1)->transport);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_set(void * jarg1, int jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->stream_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_get(void * jarg1) {
+  int jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  int result;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (int) ((arg1)->stream_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_unicast_conninfo() {
+  void * jresult ;
+  switch_unicast_conninfo *result = 0 ;
+  
+  result = (switch_unicast_conninfo *)new switch_unicast_conninfo();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_unicast_conninfo(void * jarg1) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_deactivate_unicast(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_deactivate_unicast(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_activate_unicast(void * jarg1, char * jarg2, unsigned short jarg3, char * jarg4, unsigned short jarg5, char * jarg6, char * jarg7) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_port_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  switch_port_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_port_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_port_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  result = (switch_status_t)switch_ivr_activate_unicast(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_generate_json_cdr(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  cJSON **arg2 = (cJSON **) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (cJSON **)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_ivr_generate_json_cdr(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_generate_xml_cdr(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_xml_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_generate_xml_cdr(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_xml_profile_data(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_caller_profile_t *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_ivr_set_xml_profile_data(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_xml_chan_vars(void * jarg1, void * jarg2, int jarg3) {
+  int jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)switch_ivr_set_xml_chan_vars(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_parse_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_events(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_parse_all_events(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_next_event(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_parse_next_event(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_messages(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_parse_all_messages(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_parse_all_signal_data(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_parse_all_signal_data(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_indications(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_message_t *arg2 = (switch_core_session_message_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_message_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_process_indications(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sleep(void * jarg1, unsigned long jarg2, int jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  switch_bool_t arg3 ;
+  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  arg4 = (switch_input_args_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_sleep(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_park(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_input_args_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_park(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_collect_digits_callback(void * jarg1, void * jarg2, unsigned long jarg3, unsigned long jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_input_args_t *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  result = (switch_status_t)switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_collect_digits_count(void * jarg1, char * jarg2, void * jarg3, void * jarg4, char * jarg5, char * jarg6, unsigned long jarg7, unsigned long jarg8, unsigned long jarg9) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t arg4 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  uint32_t arg7 ;
+  uint32_t arg8 ;
+  uint32_t arg9 ;
+  switch_size_t *argp3 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (uint32_t)jarg7; 
+  arg8 = (uint32_t)jarg8; 
+  arg9 = (uint32_t)jarg9; 
+  result = (switch_status_t)switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7,arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_and_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, unsigned long jarg6, void * jarg7) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char **arg5 = (char **) 0 ;
+  uint32_t arg6 ;
+  switch_input_args_t *arg7 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char **)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  arg7 = (switch_input_args_t *)jarg7; 
+  result = (switch_status_t)switch_ivr_play_and_detect_speech(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_init(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_asr_handle_t *arg4 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_asr_handle_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_detect_speech_init(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_asr_handle_t *arg6 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_asr_handle_t *)jarg6; 
+  result = (switch_status_t)switch_ivr_detect_speech(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_detect_speech(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_stop_detect_speech(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_pause_detect_speech(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_pause_detect_speech(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_resume_detect_speech(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_resume_detect_speech(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_load_grammar(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_detect_speech_load_grammar(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_unload_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_detect_speech_unload_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_enable_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_detect_speech_enable_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_disable_grammar(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_detect_speech_disable_grammar(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_disable_all_grammars(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_detect_speech_disable_all_grammars(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_param_detect_speech(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_set_param_detect_speech(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_detect_speech_start_input_timers(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_detect_speech_start_input_timers(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_session(void * jarg1, char * jarg2, unsigned long jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  switch_file_handle_t *arg4 = (switch_file_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (switch_file_handle_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_record_session(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_transfer_recordings(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_transfer_recordings(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_pop_eavesdropper(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_eavesdrop_pop_eavesdropper(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_exec_all(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_eavesdrop_exec_all(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_update_display(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_eavesdrop_update_display(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_eavesdrop_session(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_eavesdrop_flag_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_eavesdrop_flag_t)jarg4; 
+  result = (switch_status_t)switch_ivr_eavesdrop_session(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_displace_session(void * jarg1, char * jarg2, unsigned long jarg3, char * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  uint32_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_displace_session(arg1,(char const *)arg2,arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_displace_session(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_stop_displace_session(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_record_session(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_stop_record_session(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_audio(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (switch_status_t)switch_ivr_session_audio(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_session_audio(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_stop_session_audio(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_inband_dtmf_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_inband_dtmf_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_inband_dtmf_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_stop_inband_dtmf_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_inband_dtmf_generate_session(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_ivr_inband_dtmf_generate_session(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_inband_dtmf_generate_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_stop_inband_dtmf_generate_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_echo(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_input_args_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_session_echo(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_tone_detect_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_stop_tone_detect_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_tone_detect_session(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6, char * jarg7, char * jarg8, void * jarg9) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  time_t arg5 ;
+  int arg6 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  switch_tone_detect_callback_t arg9 = (switch_tone_detect_callback_t) 0 ;
+  time_t *argp5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  argp5 = (time_t *)jarg5; 
+  if (!argp5) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg5 = *argp5; 
+  arg6 = (int)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (switch_tone_detect_callback_t)jarg9; 
+  result = (switch_status_t)switch_ivr_tone_detect_session(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_play_file(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_input_args_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_play_file(arg1,arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_wait_for_silence(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  result = (switch_status_t)switch_ivr_wait_for_silence(arg1,arg2,arg3,arg4,arg5,(char const *)arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_gentones(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int32_t arg3 ;
+  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int32_t)jarg3; 
+  arg4 = (switch_input_args_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_gentones(arg1,(char const *)arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_file(void * jarg1, void * jarg2, char * jarg3, void * jarg4, unsigned long jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
+  uint32_t arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_input_args_t *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  result = (switch_status_t)switch_ivr_record_file(arg1,arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_play_and_get_digits(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, unsigned long jarg11, char * jarg12, unsigned long jarg13, char * jarg14) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) 0 ;
+  uint32_t arg11 ;
+  char *arg12 = (char *) 0 ;
+  uint32_t arg13 ;
+  char *arg14 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (uint32_t)jarg11; 
+  arg12 = (char *)jarg12; 
+  arg13 = (uint32_t)jarg13; 
+  arg14 = (char *)jarg14; 
+  result = (switch_status_t)switch_play_and_get_digits(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,(char const *)arg12,arg13,(char const *)arg14);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_speak_text_handle(void * jarg1, void * jarg2, void * jarg3, void * jarg4, char * jarg5, void * jarg6) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_speech_handle_t *arg2 = (switch_speech_handle_t *) 0 ;
+  switch_codec_t *arg3 = (switch_codec_t *) 0 ;
+  switch_timer_t *arg4 = (switch_timer_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_input_args_t *arg6 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_speech_handle_t *)jarg2; 
+  arg3 = (switch_codec_t *)jarg3; 
+  arg4 = (switch_timer_t *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_input_args_t *)jarg6; 
+  result = (switch_status_t)switch_ivr_speak_text_handle(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_clear_speech_cache(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_ivr_clear_speech_cache(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_speak_text(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_input_args_t *arg5 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_input_args_t *)jarg5; 
+  result = (switch_status_t)switch_ivr_speak_text(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, void * jarg10, unsigned long jarg11, void * jarg12) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+  switch_call_cause_t *arg3 = (switch_call_cause_t *) 0 ;
+  char *arg4 = (char *) 0 ;
+  uint32_t arg5 ;
+  switch_state_handler_table_t *arg6 = (switch_state_handler_table_t *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  switch_caller_profile_t *arg9 = (switch_caller_profile_t *) 0 ;
+  switch_event_t *arg10 = (switch_event_t *) 0 ;
+  switch_originate_flag_t arg11 ;
+  switch_call_cause_t *arg12 = (switch_call_cause_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t **)jarg2; 
+  arg3 = (switch_call_cause_t *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (switch_state_handler_table_t *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (switch_caller_profile_t *)jarg9; 
+  arg10 = (switch_event_t *)jarg10; 
+  arg11 = (switch_originate_flag_t)jarg11; 
+  arg12 = (switch_call_cause_t *)jarg12; 
+  result = (switch_status_t)switch_ivr_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_enterprise_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, void * jarg10, unsigned long jarg11, void * jarg12) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+  switch_call_cause_t *arg3 = (switch_call_cause_t *) 0 ;
+  char *arg4 = (char *) 0 ;
+  uint32_t arg5 ;
+  switch_state_handler_table_t *arg6 = (switch_state_handler_table_t *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  switch_caller_profile_t *arg9 = (switch_caller_profile_t *) 0 ;
+  switch_event_t *arg10 = (switch_event_t *) 0 ;
+  switch_originate_flag_t arg11 ;
+  switch_call_cause_t *arg12 = (switch_call_cause_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t **)jarg2; 
+  arg3 = (switch_call_cause_t *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (switch_state_handler_table_t *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (switch_caller_profile_t *)jarg9; 
+  arg10 = (switch_event_t *)jarg10; 
+  arg11 = (switch_originate_flag_t)jarg11; 
+  arg12 = (switch_call_cause_t *)jarg12; 
+  result = (switch_status_t)switch_ivr_enterprise_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_bridge_display(void * jarg1, void * jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  switch_ivr_bridge_display(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_multi_threaded_bridge(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_input_callback_function_t arg3 = (switch_input_callback_function_t) 0 ;
+  void *arg4 = (void *) 0 ;
+  void *arg5 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (switch_input_callback_function_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  arg5 = (void *)jarg5; 
+  result = (switch_status_t)switch_ivr_multi_threaded_bridge(arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_signal_bridge(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_signal_bridge(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_session_transfer(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5) {
+  unsigned long jresult ;
+  time_t arg1 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  time_t *argp1 ;
+  uint32_t result;
+  
+  argp1 = (time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  result = (uint32_t)switch_ivr_schedule_transfer(arg1,(char const *)arg2,arg3,arg4,arg5);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_hangup(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+  unsigned long jresult ;
+  time_t arg1 ;
+  char *arg2 = (char *) 0 ;
+  switch_call_cause_t arg3 ;
+  switch_bool_t arg4 ;
+  time_t *argp1 ;
+  uint32_t result;
+  
+  argp1 = (time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_call_cause_t)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (uint32_t)switch_ivr_schedule_hangup(arg1,(char const *)arg2,arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_bridge(char * jarg1, char * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_uuid_bridge((char const *)arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_media(char * jarg1, unsigned long jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_media_flag_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_media_flag_t)jarg2; 
+  result = (switch_status_t)switch_ivr_media((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_nomedia(char * jarg1, unsigned long jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_media_flag_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_media_flag_t)jarg2; 
+  result = (switch_status_t)switch_ivr_nomedia((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold_uuid(char * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_ivr_hold_uuid((char const *)arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold_toggle_uuid(char * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_ivr_hold_toggle_uuid((char const *)arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unhold_uuid(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_status_t)switch_ivr_unhold_uuid((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_hold(void * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_ivr_hold(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unhold(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_unhold(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_ivr_schedule_broadcast(void * jarg1, char * jarg2, char * jarg3, unsigned long jarg4) {
+  unsigned long jresult ;
+  time_t arg1 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_media_flag_t arg4 ;
+  time_t *argp1 ;
+  uint32_t result;
+  
+  argp1 = (time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_media_flag_t)jarg4; 
+  result = (uint32_t)switch_ivr_schedule_broadcast(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_broadcast(char * jarg1, char * jarg2, unsigned long jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_media_flag_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_media_flag_t)jarg3; 
+  result = (switch_status_t)switch_ivr_broadcast((char const *)arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_broadcast_in_thread(void * jarg1, char * jarg2, int jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  switch_ivr_broadcast_in_thread(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_transfer_variable(void * jarg1, void * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_transfer_variable(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_new(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_ivr_digit_stream_parser_t **arg2 = (switch_ivr_digit_stream_parser_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (switch_ivr_digit_stream_parser_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_digit_stream_parser_new(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_destroy(void * jarg1) {
+  int jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_digit_stream_parser_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_new(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  switch_ivr_digit_stream_t **arg2 = (switch_ivr_digit_stream_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  arg2 = (switch_ivr_digit_stream_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_digit_stream_new(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_destroy(void * jarg1) {
+  int jresult ;
+  switch_ivr_digit_stream_t **arg1 = (switch_ivr_digit_stream_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_t **)jarg1; 
+  result = (switch_status_t)switch_ivr_digit_stream_destroy(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_event(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  result = (switch_status_t)switch_ivr_digit_stream_parser_set_event(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_del_event(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_digit_stream_parser_del_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_feed(void * jarg1, void * jarg2, char jarg3) {
+  void * jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  switch_ivr_digit_stream_t *arg2 = (switch_ivr_digit_stream_t *) 0 ;
+  char arg3 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  arg2 = (switch_ivr_digit_stream_t *)jarg2; 
+  arg3 = (char)jarg3; 
+  result = (void *)switch_ivr_digit_stream_parser_feed(arg1,arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_reset(void * jarg1) {
+  int jresult ;
+  switch_ivr_digit_stream_t *arg1 = (switch_ivr_digit_stream_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_digit_stream_reset(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_digit_stream_parser_set_terminator(void * jarg1, char jarg2) {
+  int jresult ;
+  switch_ivr_digit_stream_parser_t *arg1 = (switch_ivr_digit_stream_parser_t *) 0 ;
+  char arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_digit_stream_parser_t *)jarg1; 
+  arg2 = (char)jarg2; 
+  result = (switch_status_t)switch_ivr_digit_stream_parser_set_terminator(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_init(void * jarg1, void * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, char * jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17, int jarg18, void * jarg19) {
+  int jresult ;
+  switch_ivr_menu_t **arg1 = (switch_ivr_menu_t **) 0 ;
+  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) 0 ;
+  char *arg11 = (char *) 0 ;
+  char *arg12 = (char *) 0 ;
+  int arg13 ;
+  int arg14 ;
+  int arg15 ;
+  int arg16 ;
+  int arg17 ;
+  int arg18 ;
+  switch_memory_pool_t *arg19 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_t **)jarg1; 
+  arg2 = (switch_ivr_menu_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (char *)jarg11; 
+  arg12 = (char *)jarg12; 
+  arg13 = (int)jarg13; 
+  arg14 = (int)jarg14; 
+  arg15 = (int)jarg15; 
+  arg16 = (int)jarg16; 
+  arg17 = (int)jarg17; 
+  arg18 = (int)jarg18; 
+  arg19 = (switch_memory_pool_t *)jarg19; 
+  result = (switch_status_t)switch_ivr_menu_init(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,(char const *)arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_bind_action(void * jarg1, int jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
+  switch_ivr_action_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_t *)jarg1; 
+  arg2 = (switch_ivr_action_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_menu_bind_action(arg1,arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_bind_function(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
+  switch_ivr_menu_action_function_t *arg2 = (switch_ivr_menu_action_function_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_t *)jarg1; 
+  arg2 = (switch_ivr_menu_action_function_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_menu_bind_function(arg1,arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_execute(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_ivr_menu_t *arg2 = (switch_ivr_menu_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  void *arg4 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_ivr_menu_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (void *)jarg4; 
+  result = (switch_status_t)switch_ivr_menu_execute(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_free(void * jarg1) {
+  int jresult ;
+  switch_ivr_menu_t *arg1 = (switch_ivr_menu_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_menu_stack_free(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_build(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_ivr_menu_xml_ctx_t *arg1 = (switch_ivr_menu_xml_ctx_t *) 0 ;
+  switch_ivr_menu_t **arg2 = (switch_ivr_menu_t **) 0 ;
+  switch_xml_t arg3 = (switch_xml_t) 0 ;
+  switch_xml_t arg4 = (switch_xml_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_xml_ctx_t *)jarg1; 
+  arg2 = (switch_ivr_menu_t **)jarg2; 
+  arg3 = (switch_xml_t)jarg3; 
+  arg4 = (switch_xml_t)jarg4; 
+  result = (switch_status_t)switch_ivr_menu_stack_xml_build(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_str2action(char * jarg1, void * jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_ivr_action_t *arg2 = (switch_ivr_action_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_ivr_action_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_menu_str2action((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_add_custom(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_ivr_menu_xml_ctx_t *arg1 = (switch_ivr_menu_xml_ctx_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_ivr_menu_action_function_t *arg3 = (switch_ivr_menu_action_function_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_xml_ctx_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_ivr_menu_action_function_t *)jarg3; 
+  result = (switch_status_t)switch_ivr_menu_stack_xml_add_custom(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_menu_stack_xml_init(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_ivr_menu_xml_ctx_t **arg1 = (switch_ivr_menu_xml_ctx_t **) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_menu_xml_ctx_t **)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_menu_stack_xml_init(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_phrase_macro_event(void * jarg1, char * jarg2, char * jarg3, void * jarg4, char * jarg5, void * jarg6) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_event_t *arg4 = (switch_event_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  switch_input_args_t *arg6 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_event_t *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (switch_input_args_t *)jarg6; 
+  result = (switch_status_t)switch_ivr_phrase_macro_event(arg1,(char const *)arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_delay_echo(void * jarg1, unsigned long jarg2) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_ivr_delay_echo(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_find_bridged_uuid(char * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_status_t)switch_ivr_find_bridged_uuid((char const *)arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_intercept_session(void * jarg1, char * jarg2, int jarg3) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  switch_ivr_intercept_session(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_park_session(void * jarg1) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  switch_ivr_park_session(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_wait_for_answer(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  result = (switch_status_t)switch_ivr_wait_for_answer(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_read(void * jarg1, unsigned long jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, void * jarg7, unsigned long jarg8, char * jarg9, unsigned long jarg10) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  switch_size_t arg7 ;
+  uint32_t arg8 ;
+  char *arg9 = (char *) 0 ;
+  uint32_t arg10 ;
+  switch_size_t *argp7 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  argp7 = (switch_size_t *)jarg7; 
+  if (!argp7) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg7 = *argp7; 
+  arg8 = (uint32_t)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (uint32_t)jarg10; 
+  result = (switch_status_t)switch_ivr_read(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8,(char const *)arg9,arg10);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_block_dtmf_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_block_dtmf_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unblock_dtmf_session(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_unblock_dtmf_session(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_bind_dtmf_meta_session(void * jarg1, unsigned long jarg2, unsigned long jarg3, char * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  switch_bind_flag_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (switch_bind_flag_t)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_bind_dtmf_meta_session(arg1,arg2,arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_unbind_dtmf_meta_session(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_ivr_unbind_dtmf_meta_session(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_soft_hold(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_status_t)switch_ivr_soft_hold(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, void * jarg7) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  switch_input_args_t *arg7 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (switch_input_args_t *)jarg7; 
+  result = (switch_status_t)switch_ivr_say(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_string(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, void * jarg9) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char **arg9 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char **)jarg9; 
+  result = (switch_status_t)switch_ivr_say_string(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_method_by_name(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_say_method_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_say_method_t)switch_ivr_get_say_method_by_name((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_gender_by_name(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_say_gender_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_say_gender_t)switch_ivr_get_say_gender_by_name((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_say_type_by_name(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_say_type_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_say_type_t)switch_ivr_get_say_type_by_name((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_spell(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_say_args_t *arg3 = (switch_say_args_t *) 0 ;
+  switch_input_args_t *arg4 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_say_args_t *)jarg3; 
+  arg4 = (switch_input_args_t *)jarg4; 
+  result = (switch_status_t)switch_ivr_say_spell(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_say_ip(void * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_say_callback_t arg3 = (switch_say_callback_t) 0 ;
+  switch_say_args_t *arg4 = (switch_say_args_t *) 0 ;
+  switch_input_args_t *arg5 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_say_callback_t)jarg3; 
+  arg4 = (switch_say_args_t *)jarg4; 
+  arg5 = (switch_input_args_t *)jarg5; 
+  result = (switch_status_t)switch_ivr_say_ip(arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_set_user(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_set_user_xml(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t arg5 = (switch_xml_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t)jarg5; 
+  result = (switch_status_t)switch_ivr_set_user_xml(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_sound_test(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_sound_test(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_process_import(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  switch_process_import(arg1,arg2,(char const *)arg3,(char const *)arg4);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_exists(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_ivr_uuid_exists((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_uuid_force_exists(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_bool_t)switch_ivr_uuid_force_exists((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_last_ping(void * jarg1) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_dmachine_last_ping(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_name(void * jarg1) {
+  char * jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (char *)switch_ivr_dmachine_get_name(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_match_callback(void * jarg1, void * jarg2) {
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_ivr_dmachine_callback_t arg2 = (switch_ivr_dmachine_callback_t) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (switch_ivr_dmachine_callback_t)jarg2; 
+  switch_ivr_dmachine_set_match_callback(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_nonmatch_callback(void * jarg1, void * jarg2) {
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_ivr_dmachine_callback_t arg2 = (switch_ivr_dmachine_callback_t) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (switch_ivr_dmachine_callback_t)jarg2; 
+  switch_ivr_dmachine_set_nonmatch_callback(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_create(void * jarg1, char * jarg2, void * jarg3, unsigned long jarg4, unsigned long jarg5, void * jarg6, void * jarg7, void * jarg8) {
+  int jresult ;
+  switch_ivr_dmachine_t **arg1 = (switch_ivr_dmachine_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  switch_ivr_dmachine_callback_t arg6 = (switch_ivr_dmachine_callback_t) 0 ;
+  switch_ivr_dmachine_callback_t arg7 = (switch_ivr_dmachine_callback_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t **)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_memory_pool_t *)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (switch_ivr_dmachine_callback_t)jarg6; 
+  arg7 = (switch_ivr_dmachine_callback_t)jarg7; 
+  arg8 = (void *)jarg8; 
+  result = (switch_status_t)switch_ivr_dmachine_create(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_destroy(void * jarg1) {
+  switch_ivr_dmachine_t **arg1 = (switch_ivr_dmachine_t **) 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t **)jarg1; 
+  switch_ivr_dmachine_destroy(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_bind(void * jarg1, char * jarg2, char * jarg3, int jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int32_t arg4 ;
+  switch_ivr_dmachine_callback_t arg5 = (switch_ivr_dmachine_callback_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int32_t)jarg4; 
+  arg5 = (switch_ivr_dmachine_callback_t)jarg5; 
+  arg6 = (void *)jarg6; 
+  result = (switch_status_t)switch_ivr_dmachine_bind(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_feed(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_ivr_dmachine_match_t **arg3 = (switch_ivr_dmachine_match_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_ivr_dmachine_match_t **)jarg3; 
+  result = (switch_status_t)switch_ivr_dmachine_feed(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_clear(void * jarg1) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (switch_status_t)switch_ivr_dmachine_clear(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_ping(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_ivr_dmachine_match_t **arg2 = (switch_ivr_dmachine_match_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (switch_ivr_dmachine_match_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_dmachine_ping(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_match(void * jarg1) {
+  void * jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  switch_ivr_dmachine_match_t *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (switch_ivr_dmachine_match_t *)switch_ivr_dmachine_get_match(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_dmachine_get_failed_digits(void * jarg1) {
+  char * jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  result = (char *)switch_ivr_dmachine_get_failed_digits(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_digit_timeout_ms(void * jarg1, unsigned long jarg2) {
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_ivr_dmachine_set_digit_timeout_ms(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_input_timeout_ms(void * jarg1, unsigned long jarg2) {
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_ivr_dmachine_set_input_timeout_ms(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_clear_realm(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_dmachine_clear_realm(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_realm(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_dmachine_set_realm(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_get_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_release_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_release_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_fh(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_file_handle_t *arg3 = (switch_file_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_file_handle_t *)jarg3; 
+  result = (switch_status_t)switch_ivr_process_fh(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_insert_file(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_ivr_insert_file(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_create_message_reply(void * jarg1, void * jarg2, char * jarg3) {
+  int jresult ;
+  switch_event_t **arg1 = (switch_event_t **) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_event_t **)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_ivr_create_message_reply(arg1,arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_ivr_check_presence_mapping(char * jarg1, char * jarg2) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_ivr_check_presence_mapping((char const *)arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_kill_uuid(char * jarg1, int jarg2) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_call_cause_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_call_cause_t)jarg2; 
+  result = (switch_status_t)switch_ivr_kill_uuid((char const *)arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_blind_transfer_ack(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_ivr_blind_transfer_ack(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_record_session_mask(void * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_ivr_record_session_mask(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(16384);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTCP_MAX_BUF_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(16384);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_WORDS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(4094);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(64);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() {
+  char * jresult ;
+  char *result = 0 ;
+  
+  result = (char *)("AES_CM_128_HMAC_SHA1_80");
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_set(void * jarg1, char * jarg2) {
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_get(void * jarg1) {
+  char * jresult ;
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_set(void * jarg1, int jarg2) {
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  switch_rtp_crypto_key_type_t arg2 ;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  arg2 = (switch_rtp_crypto_key_type_t)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_get(void * jarg1) {
+  int jresult ;
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  switch_rtp_crypto_key_type_t result;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  result = (switch_rtp_crypto_key_type_t) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_set(void * jarg1, int jarg2) {
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->keylen = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_get(void * jarg1) {
+  int jresult ;
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  result = (int) ((arg1)->keylen);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_srtp_crypto_suite_t() {
+  void * jresult ;
+  switch_srtp_crypto_suite_t *result = 0 ;
+  
+  result = (switch_srtp_crypto_suite_t *)new switch_srtp_crypto_suite_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_srtp_crypto_suite_t(void * jarg1) {
+  switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ;
+  
+  arg1 = (switch_srtp_crypto_suite_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_set(void * jarg1, unsigned long jarg2) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->index = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  result = (uint32_t) ((arg1)->index);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_type_set(void * jarg1, int jarg2) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_rtp_crypto_key_type_t arg2 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  arg2 = (switch_rtp_crypto_key_type_t)jarg2; 
+  if (arg1) (arg1)->type = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_crypto_key_type_get(void * jarg1) {
+  int jresult ;
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_rtp_crypto_key_type_t result;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  result = (switch_rtp_crypto_key_type_t) ((arg1)->type);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_key_set(void * jarg1, void * jarg2) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  unsigned char *arg2 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  arg2 = (unsigned char *)jarg2; 
+  {
+    size_t ii;
+    unsigned char *b = (unsigned char *) arg1->key;
+    for (ii = 0; ii < (size_t)64; ii++) b[ii] = *((unsigned char *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_key_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  unsigned char *result = 0 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  result = (unsigned char *)(unsigned char *) ((arg1)->key);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_set(void * jarg1, void * jarg2) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->keylen = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_keylen_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  result =  ((arg1)->keylen);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_next_set(void * jarg1, void * jarg2) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_rtp_crypto_key *arg2 = (switch_rtp_crypto_key *) 0 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  arg2 = (switch_rtp_crypto_key *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_crypto_key_next_get(void * jarg1) {
+  void * jresult ;
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  switch_rtp_crypto_key *result = 0 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  result = (switch_rtp_crypto_key *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_crypto_key() {
+  void * jresult ;
+  switch_rtp_crypto_key *result = 0 ;
+  
+  result = (switch_rtp_crypto_key *)new switch_rtp_crypto_key();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_crypto_key(void * jarg1) {
+  switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ;
+  
+  arg1 = (switch_rtp_crypto_key *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_foundation_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->foundation) delete [] arg1->foundation;
+    if (arg2) {
+      arg1->foundation = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->foundation, (const char *)arg2);
+    } else {
+      arg1->foundation = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_foundation_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->foundation);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_component_id_set(void * jarg1, int jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->component_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_icand_t_component_id_get(void * jarg1) {
+  int jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  int result;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (int) ((arg1)->component_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_transport_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->transport) delete [] arg1->transport;
+    if (arg2) {
+      arg1->transport = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->transport, (const char *)arg2);
+    } else {
+      arg1->transport = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_transport_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->transport);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_priority_set(void * jarg1, unsigned long jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->priority = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_icand_t_priority_get(void * jarg1) {
+  unsigned long jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (uint32_t) ((arg1)->priority);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_addr_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->con_addr) delete [] arg1->con_addr;
+    if (arg2) {
+      arg1->con_addr = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->con_addr, (const char *)arg2);
+    } else {
+      arg1->con_addr = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_con_addr_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->con_addr);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_con_port_set(void * jarg1, unsigned short jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  if (arg1) (arg1)->con_port = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_con_port_get(void * jarg1) {
+  unsigned short jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (switch_port_t) ((arg1)->con_port);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_cand_type_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->cand_type) delete [] arg1->cand_type;
+    if (arg2) {
+      arg1->cand_type = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->cand_type, (const char *)arg2);
+    } else {
+      arg1->cand_type = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_cand_type_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->cand_type);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_raddr_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->raddr) delete [] arg1->raddr;
+    if (arg2) {
+      arg1->raddr = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->raddr, (const char *)arg2);
+    } else {
+      arg1->raddr = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_raddr_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->raddr);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_rport_set(void * jarg1, unsigned short jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  if (arg1) (arg1)->rport = arg2;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_icand_t_rport_get(void * jarg1) {
+  unsigned short jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (switch_port_t) ((arg1)->rport);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_generation_set(void * jarg1, char * jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->generation) delete [] arg1->generation;
+    if (arg2) {
+      arg1->generation = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->generation, (const char *)arg2);
+    } else {
+      arg1->generation = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_icand_t_generation_get(void * jarg1) {
+  char * jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (char *) ((arg1)->generation);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_icand_t_ready_set(void * jarg1, unsigned char jarg2) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  uint8_t arg2 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  arg2 = (uint8_t)jarg2; 
+  if (arg1) (arg1)->ready = arg2;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_icand_t_ready_get(void * jarg1) {
+  unsigned char jresult ;
+  icand_t *arg1 = (icand_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (icand_t *)jarg1; 
+  result = (uint8_t) ((arg1)->ready);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_icand_t() {
+  void * jresult ;
+  icand_t *result = 0 ;
+  
+  result = (icand_t *)new icand_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_icand_t(void * jarg1) {
+  icand_t *arg1 = (icand_t *) 0 ;
+  
+  arg1 = (icand_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_MAX_CAND_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(50);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cands_set(void * jarg1, void * jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  icand_t (*arg2)[2] ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (icand_t (*)[2])jarg2; 
+  {
+    icand_t (*inp)[2] = (icand_t (*)[2])(arg2);
+    icand_t (*dest)[2] = (icand_t (*)[2])(arg1->cands);
+    size_t ii = 0;
+    for (; ii < 50; ++ii) {
+      icand_t *ip = inp[ii];
+      icand_t *dp = dest[ii];
+      size_t jj = 0;
+      for (; jj < 2; ++jj) dp[jj] = ip[jj];
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_cands_get(void * jarg1) {
+  void * jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  icand_t (*result)[2] = 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (icand_t (*)[2])(icand_t (*)[2]) ((arg1)->cands);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_cand_idx_set(void * jarg1, int jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->cand_idx = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ice_t_cand_idx_get(void * jarg1) {
+  int jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  int result;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (int) ((arg1)->cand_idx);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_chosen_set(void * jarg1, void * jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  int *arg2 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (int *)jarg2; 
+  {
+    size_t ii;
+    int *b = (int *) arg1->chosen;
+    for (ii = 0; ii < (size_t)2; ii++) b[ii] = *((int *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_ice_t_chosen_get(void * jarg1) {
+  void * jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  int *result = 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (int *)(int *) ((arg1)->chosen);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_ufrag_set(void * jarg1, char * jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->ufrag) delete [] arg1->ufrag;
+    if (arg2) {
+      arg1->ufrag = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->ufrag, (const char *)arg2);
+    } else {
+      arg1->ufrag = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_ufrag_get(void * jarg1) {
+  char * jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (char *) ((arg1)->ufrag);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_pwd_set(void * jarg1, char * jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->pwd) delete [] arg1->pwd;
+    if (arg2) {
+      arg1->pwd = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->pwd, (const char *)arg2);
+    } else {
+      arg1->pwd = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_pwd_get(void * jarg1) {
+  char * jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (char *) ((arg1)->pwd);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ice_t_options_set(void * jarg1, char * jarg2) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->options) delete [] arg1->options;
+    if (arg2) {
+      arg1->options = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->options, (const char *)arg2);
+    } else {
+      arg1->options = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_ice_t_options_get(void * jarg1) {
+  char * jresult ;
+  ice_t *arg1 = (ice_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  result = (char *) ((arg1)->options);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ice_t() {
+  void * jresult ;
+  ice_t *result = 0 ;
+  
+  result = (ice_t *)new ice_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_ice_t(void * jarg1) {
+  ice_t *arg1 = (ice_t *) 0 ;
+  
+  arg1 = (ice_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_add_crypto_key(void * jarg1, int jarg2, unsigned long jarg3, int jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_crypto_direction_t arg2 ;
+  uint32_t arg3 ;
+  switch_rtp_crypto_key_type_t arg4 ;
+  unsigned char *arg5 = (unsigned char *) 0 ;
+  switch_size_t arg6 ;
+  switch_size_t *argp6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_crypto_direction_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (switch_rtp_crypto_key_type_t)jarg4; 
+  arg5 = (unsigned char *)jarg5; 
+  argp6 = (switch_size_t *)jarg6; 
+  if (!argp6) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg6 = *argp6; 
+  result = (switch_status_t)switch_rtp_add_crypto_key(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_get_random(void * jarg1, unsigned long jarg2) {
+  void *arg1 = (void *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (void *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_rtp_get_random(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_init(void * jarg1) {
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  switch_rtp_init(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_shutdown() {
+  switch_rtp_shutdown();
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_start_port(unsigned short jarg1) {
+  unsigned short jresult ;
+  switch_port_t arg1 ;
+  switch_port_t result;
+  
+  arg1 = (switch_port_t)jarg1; 
+  result = (switch_port_t)switch_rtp_set_start_port(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_ssrc(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_rtp_set_ssrc(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_ssrc(void * jarg1, unsigned long jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (switch_status_t)switch_rtp_set_remote_ssrc(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_set_end_port(unsigned short jarg1) {
+  unsigned short jresult ;
+  switch_port_t arg1 ;
+  switch_port_t result;
+  
+  arg1 = (switch_port_t)jarg1; 
+  result = (switch_port_t)switch_rtp_set_end_port(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_request_port(char * jarg1) {
+  unsigned short jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_port_t)switch_rtp_request_port((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_release_port(char * jarg1, unsigned short jarg2) {
+  char *arg1 = (char *) 0 ;
+  switch_port_t arg2 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  switch_rtp_release_port((char const *)arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_interval(void * jarg1, unsigned long jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_rtp_set_interval(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_change_interval(void * jarg1, unsigned long jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  result = (switch_status_t)switch_rtp_change_interval(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_create(void * jarg1, unsigned char jarg2, unsigned long jarg3, unsigned long jarg4, void * jarg5, char * jarg6, void * jarg7, void * jarg8) {
+  int jresult ;
+  switch_rtp_t **arg1 = (switch_rtp_t **) 0 ;
+  switch_payload_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  switch_rtp_flag_t *arg5 ;
+  char *arg6 = (char *) 0 ;
+  char **arg7 = (char **) 0 ;
+  switch_memory_pool_t *arg8 = (switch_memory_pool_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t **)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (switch_rtp_flag_t *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char **)jarg7; 
+  arg8 = (switch_memory_pool_t *)jarg8; 
+  result = (switch_status_t)switch_rtp_create(arg1,arg2,arg3,arg4,arg5,arg6,(char const **)arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_new(char * jarg1, unsigned short jarg2, char * jarg3, unsigned short jarg4, unsigned char jarg5, unsigned long jarg6, unsigned long jarg7, void * jarg8, char * jarg9, void * jarg10, void * jarg11) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_port_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  switch_port_t arg4 ;
+  switch_payload_t arg5 ;
+  uint32_t arg6 ;
+  uint32_t arg7 ;
+  switch_rtp_flag_t *arg8 ;
+  char *arg9 = (char *) 0 ;
+  char **arg10 = (char **) 0 ;
+  switch_memory_pool_t *arg11 = (switch_memory_pool_t *) 0 ;
+  switch_rtp_t *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_port_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (switch_port_t)jarg4; 
+  arg5 = (switch_payload_t)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  arg7 = (uint32_t)jarg7; 
+  arg8 = (switch_rtp_flag_t *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char **)jarg10; 
+  arg11 = (switch_memory_pool_t *)jarg11; 
+  result = (switch_rtp_t *)switch_rtp_new((char const *)arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,(char const **)arg10,arg11);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_remote_address(void * jarg1, char * jarg2, unsigned short jarg3, unsigned short jarg4, int jarg5, void * jarg6) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_port_t arg3 ;
+  switch_port_t arg4 ;
+  switch_bool_t arg5 ;
+  char **arg6 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_port_t)jarg3; 
+  arg4 = (switch_port_t)jarg4; 
+  arg5 = (switch_bool_t)jarg5; 
+  arg6 = (char **)jarg6; 
+  result = (switch_status_t)switch_rtp_set_remote_address(arg1,(char const *)arg2,arg3,arg4,arg5,(char const **)arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_rtp_get_remote_host(void * jarg1) {
+  char * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (char *)switch_rtp_get_remote_host(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_rtp_get_remote_port(void * jarg1) {
+  unsigned short jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_port_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_port_t)switch_rtp_get_remote_port(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_reset_media_timer(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_reset_media_timer(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_max_missed_packets(void * jarg1, unsigned long jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_rtp_set_max_missed_packets(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_udptl_mode(void * jarg1) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_status_t)switch_rtp_udptl_mode(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_reset(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_reset(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_local_address(void * jarg1, char * jarg2, unsigned short jarg3, void * jarg4) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_port_t arg3 ;
+  char **arg4 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_port_t)jarg3; 
+  arg4 = (char **)jarg4; 
+  result = (switch_status_t)switch_rtp_set_local_address(arg1,(char const *)arg2,arg3,(char const **)arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_kill_socket(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_kill_socket(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_break(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_break(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_flush(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_flush(arg1);
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_rtp_ready(void * jarg1) {
+  unsigned char jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint8_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (uint8_t)switch_rtp_ready(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_destroy(void * jarg1) {
+  switch_rtp_t **arg1 = (switch_rtp_t **) 0 ;
+  
+  arg1 = (switch_rtp_t **)jarg1; 
+  switch_rtp_destroy(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, int jarg7, void * jarg8) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  ice_proto_t arg6 ;
+  switch_core_media_ice_type_t arg7 ;
+  ice_t *arg8 = (ice_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (ice_proto_t)jarg6; 
+  arg7 = (switch_core_media_ice_type_t)jarg7; 
+  arg8 = (ice_t *)jarg8; 
+  result = (switch_status_t)switch_rtp_activate_ice(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_rtcp(void * jarg1, int jarg2, unsigned short jarg3, int jarg4) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  int arg2 ;
+  switch_port_t arg3 ;
+  switch_bool_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (switch_port_t)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (switch_status_t)switch_rtp_activate_rtcp(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_jitter_buffer(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, unsigned long jarg6) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  uint32_t arg3 ;
+  uint32_t arg4 ;
+  uint32_t arg5 ;
+  uint32_t arg6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint32_t)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  result = (switch_status_t)switch_rtp_activate_jitter_buffer(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_debug_jitter_buffer(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_rtp_debug_jitter_buffer(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_deactivate_jitter_buffer(void * jarg1) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_status_t)switch_rtp_deactivate_jitter_buffer(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_pause_jitter_buffer(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_rtp_pause_jitter_buffer(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_jitter_buffer(void * jarg1) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  stfu_instance_t *result = 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (stfu_instance_t *)switch_rtp_get_jitter_buffer(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_flag(void * jarg1, int jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flag_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flag_t)jarg2; 
+  switch_rtp_set_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_flags(void * jarg1, void * jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flag_t *arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flag_t *)jarg2; 
+  switch_rtp_set_flags(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_clear_flags(void * jarg1, void * jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flag_t *arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flag_t *)jarg2; 
+  switch_rtp_clear_flags(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_test_flag(void * jarg1, int jarg2) {
+  unsigned long jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flag_t arg2 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flag_t)jarg2; 
+  result = (uint32_t)switch_rtp_test_flag(arg1,arg2);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_clear_flag(void * jarg1, int jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flag_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flag_t)jarg2; 
+  switch_rtp_clear_flag(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_rtp_socket(void * jarg1) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_socket_t *result = 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_socket_t *)switch_rtp_get_rtp_socket(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_ping(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_ping(arg1);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_default_samples_per_interval(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (uint32_t)switch_rtp_get_default_samples_per_interval(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_default_payload(void * jarg1, unsigned char jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  switch_rtp_set_default_payload(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_default_payload(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (uint32_t)switch_rtp_get_default_payload(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_invalid_handler(void * jarg1, void * jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_invalid_handler_t arg2 = (switch_rtp_invalid_handler_t) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_invalid_handler_t)jarg2; 
+  switch_rtp_set_invalid_handler(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_read(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, unsigned long jarg6) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  uint32_t *arg3 = (uint32_t *) 0 ;
+  switch_payload_t *arg4 = (switch_payload_t *) 0 ;
+  switch_frame_flag_t *arg5 = (switch_frame_flag_t *) 0 ;
+  switch_io_flag_t arg6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (uint32_t *)jarg3; 
+  arg4 = (switch_payload_t *)jarg4; 
+  arg5 = (switch_frame_flag_t *)jarg5; 
+  arg6 = (switch_io_flag_t)jarg6; 
+  result = (switch_status_t)switch_rtp_read(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_queue_rfc2833(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_rtp_queue_rfc2833(arg1,(switch_dtmf_t const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_queue_rfc2833_in(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = (switch_status_t)switch_rtp_queue_rfc2833_in(arg1,(switch_dtmf_t const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_has_dtmf(void * jarg1) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = switch_rtp_has_dtmf(arg1);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_dequeue_dtmf(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_dtmf_t *arg2 = (switch_dtmf_t *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_dtmf_t *)jarg2; 
+  result = switch_rtp_dequeue_dtmf(arg1,arg2);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_zerocopy_read(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, unsigned long jarg6) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  void **arg2 = (void **) 0 ;
+  uint32_t *arg3 = (uint32_t *) 0 ;
+  switch_payload_t *arg4 = (switch_payload_t *) 0 ;
+  switch_frame_flag_t *arg5 = (switch_frame_flag_t *) 0 ;
+  switch_io_flag_t arg6 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (void **)jarg2; 
+  arg3 = (uint32_t *)jarg3; 
+  arg4 = (switch_payload_t *)jarg4; 
+  arg5 = (switch_frame_flag_t *)jarg5; 
+  arg6 = (switch_io_flag_t)jarg6; 
+  result = (switch_status_t)switch_rtp_zerocopy_read(arg1,arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_zerocopy_read_frame(void * jarg1, void * jarg2, unsigned long jarg3) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  switch_io_flag_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  arg3 = (switch_io_flag_t)jarg3; 
+  result = (switch_status_t)switch_rtp_zerocopy_read_frame(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtcp_zerocopy_read_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtcp_frame_t *arg2 = (switch_rtcp_frame_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtcp_frame_t *)jarg2; 
+  result = (switch_status_t)switch_rtcp_zerocopy_read_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_rtp_flush_read_buffer(void * jarg1, int jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_flush_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_flush_t)jarg2; 
+  rtp_flush_read_buffer(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_enable_vad(void * jarg1, void * jarg2, void * jarg3, unsigned long jarg4) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  switch_codec_t *arg3 = (switch_codec_t *) 0 ;
+  switch_vad_flag_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  arg3 = (switch_codec_t *)jarg3; 
+  arg4 = (switch_vad_flag_t)jarg4; 
+  result = (switch_status_t)switch_rtp_enable_vad(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_disable_vad(void * jarg1) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_status_t)switch_rtp_disable_vad(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_write_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_frame_t *)jarg2; 
+  result = (int)switch_rtp_write_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_write_manual(void * jarg1, void * jarg2, unsigned long jarg3, unsigned char jarg4, unsigned char jarg5, unsigned long jarg6, void * jarg7) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  uint32_t arg3 ;
+  uint8_t arg4 ;
+  switch_payload_t arg5 ;
+  uint32_t arg6 ;
+  switch_frame_flag_t *arg7 = (switch_frame_flag_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (uint32_t)jarg3; 
+  arg4 = (uint8_t)jarg4; 
+  arg5 = (switch_payload_t)jarg5; 
+  arg6 = (uint32_t)jarg6; 
+  arg7 = (switch_frame_flag_t *)jarg7; 
+  result = (int)switch_rtp_write_manual(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtp_get_ssrc(void * jarg1) {
+  unsigned long jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (uint32_t)switch_rtp_get_ssrc(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_private(void * jarg1, void * jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  switch_rtp_set_private(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_telephony_event(void * jarg1, unsigned char jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  switch_rtp_set_telephony_event(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_telephony_recv_event(void * jarg1, unsigned char jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  switch_rtp_set_telephony_recv_event(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_cng_pt(void * jarg1, unsigned char jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_payload_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_payload_t)jarg2; 
+  switch_rtp_set_cng_pt(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_private(void * jarg1) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (void *)switch_rtp_get_private(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_set_payload_map(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  payload_map_t **arg2 = (payload_map_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (payload_map_t **)jarg2; 
+  result = (switch_status_t)switch_rtp_set_payload_map(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_intentional_bugs(void * jarg1, int jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_rtp_bug_flag_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_rtp_bug_flag_t)jarg2; 
+  switch_rtp_intentional_bugs(arg1,arg2);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_stats(void * jarg1, void * jarg2) {
+  void * jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ;
+  switch_rtp_stats_t *result = 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (switch_memory_pool_t *)jarg2; 
+  result = (switch_rtp_stats_t *)switch_rtp_get_stats(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned char SWIGSTDCALL CSharp_switch_rtp_check_auto_adj(void * jarg1) {
+  unsigned char jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  switch_byte_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  result = (switch_byte_t)switch_rtp_check_auto_adj(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_set_interdigit_delay(void * jarg1, unsigned long jarg2) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  switch_rtp_set_interdigit_delay(arg1,arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_add_dtls(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  dtls_fingerprint_t *arg2 = (dtls_fingerprint_t *) 0 ;
+  dtls_fingerprint_t *arg3 = (dtls_fingerprint_t *) 0 ;
+  dtls_type_t arg4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (dtls_fingerprint_t *)jarg2; 
+  arg3 = (dtls_fingerprint_t *)jarg3; 
+  arg4 = (dtls_type_t)jarg4; 
+  result = (switch_status_t)switch_rtp_add_dtls(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_del_dtls(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  dtls_type_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  arg2 = (dtls_type_t)jarg2; 
+  result = (switch_status_t)switch_rtp_del_dtls(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_has_dtls() {
+  int jresult ;
+  int result;
+  
+  result = (int)switch_rtp_has_dtls();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_video_refresh(void * jarg1) {
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;
+  
+  arg1 = (switch_rtp_t *)jarg1; 
+  switch_rtp_video_refresh(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_data_set(void * jarg1, char * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->data) delete [] arg1->data;
+    if (arg2) {
+      arg1->data = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->data, (const char *)arg2);
+    } else {
+      arg1->data = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_data_get(void * jarg1) {
+  char * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (char *) ((arg1)->data);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_file_set(void * jarg1, char * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->file, (const char *)arg2, 80-1);
+      arg1->file[80-1] = 0;
+    } else {
+      arg1->file[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_file_get(void * jarg1) {
+  char * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (char *)(char *) ((arg1)->file);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_line_set(void * jarg1, unsigned long jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->line = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_log_node_t_line_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (uint32_t) ((arg1)->line);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_func_set(void * jarg1, char * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->func, (const char *)arg2, 80-1);
+      arg1->func[80-1] = 0;
+    } else {
+      arg1->func[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_func_get(void * jarg1) {
+  char * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (char *)(char *) ((arg1)->func);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_level_set(void * jarg1, int jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_log_level_t arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (switch_log_level_t)jarg2; 
+  if (arg1) (arg1)->level = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_level_get(void * jarg1) {
+  int jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_log_level_t result;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (switch_log_level_t) ((arg1)->level);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_timestamp_set(void * jarg1, void * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_time_t arg2 ;
+  switch_time_t *argp2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  argp2 = (switch_time_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->timestamp = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_log_node_t_timestamp_get(void * jarg1) {
+  void * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_time_t result;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result =  ((arg1)->timestamp);
+  jresult = new switch_time_t((const switch_time_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_content_set(void * jarg1, char * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->content) delete [] arg1->content;
+    if (arg2) {
+      arg1->content = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->content, (const char *)arg2);
+    } else {
+      arg1->content = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_content_get(void * jarg1) {
+  char * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (char *) ((arg1)->content);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_userdata_set(void * jarg1, char * jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->userdata) delete [] arg1->userdata;
+    if (arg2) {
+      arg1->userdata = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->userdata, (const char *)arg2);
+    } else {
+      arg1->userdata = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_node_t_userdata_get(void * jarg1) {
+  char * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (char *) ((arg1)->userdata);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_channel_set(void * jarg1, int jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_text_channel_t arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (switch_text_channel_t)jarg2; 
+  if (arg1) (arg1)->channel = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_channel_get(void * jarg1) {
+  int jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_text_channel_t result;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (switch_text_channel_t) ((arg1)->channel);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_slevel_set(void * jarg1, int jarg2) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_log_level_t arg2 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  arg2 = (switch_log_level_t)jarg2; 
+  if (arg1) (arg1)->slevel = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_node_t_slevel_get(void * jarg1) {
+  int jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_log_level_t result;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (switch_log_level_t) ((arg1)->slevel);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_log_node_t() {
+  void * jresult ;
+  switch_log_node_t *result = 0 ;
+  
+  result = (switch_log_node_t *)new switch_log_node_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_log_node_t(void * jarg1) {
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_init(void * jarg1, int jarg2) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  switch_bool_t arg2 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_status_t)switch_log_init(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_shutdown() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_log_shutdown();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_bind_logger(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  switch_log_function_t arg1 = (switch_log_function_t) 0 ;
+  switch_log_level_t arg2 ;
+  switch_bool_t arg3 ;
+  switch_status_t result;
+  
+  arg1 = (switch_log_function_t)jarg1; 
+  arg2 = (switch_log_level_t)jarg2; 
+  arg3 = (switch_bool_t)jarg3; 
+  result = (switch_status_t)switch_log_bind_logger(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_unbind_logger(void * jarg1) {
+  int jresult ;
+  switch_log_function_t arg1 = (switch_log_function_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_log_function_t)jarg1; 
+  result = (switch_status_t)switch_log_unbind_logger(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_log_level2str(int jarg1) {
+  char * jresult ;
+  switch_log_level_t arg1 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_log_level_t)jarg1; 
+  result = (char *)switch_log_level2str(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_log_str2level(char * jarg1) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_log_level_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_log_level_t)switch_log_str2level((char const *)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_log_str2mask(char * jarg1) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (uint32_t)switch_log_str2mask((char const *)arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_log_node_dup(void * jarg1) {
+  void * jresult ;
+  switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;
+  switch_log_node_t *result = 0 ;
+  
+  arg1 = (switch_log_node_t *)jarg1; 
+  result = (switch_log_node_t *)switch_log_node_dup((switch_log_node_t const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_free(void * jarg1) {
+  switch_log_node_t **arg1 = (switch_log_node_t **) 0 ;
+  
+  arg1 = (switch_log_node_t **)jarg1; 
+  switch_log_node_free(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_XML_BUFSIZE_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)(1024);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_name_set(void * jarg1, char * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->name) delete [] arg1->name;
+    if (arg2) {
+      arg1->name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->name, (const char *)arg2);
+    } else {
+      arg1->name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_name_get(void * jarg1) {
+  char * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (char *) ((arg1)->name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_attr_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char **arg2 = (char **) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (char **)jarg2; 
+  if (arg1) (arg1)->attr = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_attr_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char **result = 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (char **) ((arg1)->attr);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_txt_set(void * jarg1, char * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->txt) delete [] arg1->txt;
+    if (arg2) {
+      arg1->txt = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->txt, (const char *)arg2);
+    } else {
+      arg1->txt = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_txt_get(void * jarg1) {
+  char * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (char *) ((arg1)->txt);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free_path_set(void * jarg1, char * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->free_path) delete [] arg1->free_path;
+    if (arg2) {
+      arg1->free_path = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->free_path, (const char *)arg2);
+    } else {
+      arg1->free_path = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_free_path_get(void * jarg1) {
+  char * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (char *) ((arg1)->free_path);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_off_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return ;
+  }
+  arg2 = *argp2; 
+  if (arg1) (arg1)->off = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_off_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_size_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result =  ((arg1)->off);
+  jresult = new switch_size_t((const switch_size_t &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_next_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_next_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_xml_t) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_sibling_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->sibling = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_sibling_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_xml_t) ((arg1)->sibling);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_ordered_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->ordered = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_ordered_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_xml_t) ((arg1)->ordered);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_child_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->child = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_child_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_xml_t) ((arg1)->child);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_parent_set(void * jarg1, void * jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  if (arg1) (arg1)->parent = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parent_get(void * jarg1) {
+  void * jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_xml_t) ((arg1)->parent);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_flags_set(void * jarg1, unsigned long jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_flags_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (uint32_t) ((arg1)->flags);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_is_switch_xml_root_t_set(void * jarg1, int jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_bool_t arg2 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  if (arg1) (arg1)->is_switch_xml_root_t = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_is_switch_xml_root_t_get(void * jarg1) {
+  int jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  switch_bool_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (switch_bool_t) ((arg1)->is_switch_xml_root_t);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_refs_set(void * jarg1, unsigned long jarg2) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->refs = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_refs_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_xml *)jarg1; 
+  result = (uint32_t) ((arg1)->refs);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_xml() {
+  void * jresult ;
+  switch_xml *result = 0 ;
+  
+  result = (switch_xml *)new switch_xml();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_xml(void * jarg1) {
+  switch_xml *arg1 = (switch_xml *) 0 ;
+  
+  arg1 = (switch_xml *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str_dynamic(char * jarg1, int jarg2) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_bool_t arg2 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (switch_xml_t)switch_xml_parse_str_dynamic(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str(char * jarg1, void * jarg2) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_size_t arg2 ;
+  switch_size_t *argp2 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  argp2 = (switch_size_t *)jarg2; 
+  if (!argp2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg2 = *argp2; 
+  result = (switch_xml_t)switch_xml_parse_str(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_fd(int jarg1) {
+  void * jresult ;
+  int arg1 ;
+  switch_xml_t result;
+  
+  arg1 = (int)jarg1; 
+  result = (switch_xml_t)switch_xml_parse_fd(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_file(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_xml_t)switch_xml_parse_file((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_file_simple(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_xml_t)switch_xml_parse_file_simple((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_fp(void * jarg1) {
+  void * jresult ;
+  FILE *arg1 = (FILE *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (FILE *)jarg1; 
+  result = (switch_xml_t)switch_xml_parse_fp(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_child(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_xml_t)switch_xml_child(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_find_child(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (switch_xml_t)switch_xml_find_child(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_find_child_multi(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_xml_t)switch_xml_find_child_multi(arg1,(char const *)arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_attr(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_xml_attr(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_attr_soft(void * jarg1, char * jarg2) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)switch_xml_attr_soft(arg1,(char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_get(void * jarg1) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  void *arg2 = 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  result = (switch_xml_t)switch_xml_get(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml(void * jarg1, int jarg2) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_bool_t arg2 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (char *)switch_xml_toxml(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml_nolock(void * jarg1, int jarg2) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_bool_t arg2 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (char *)switch_xml_toxml_nolock(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_tohtml(void * jarg1, int jarg2) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_bool_t arg2 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_bool_t)jarg2; 
+  result = (char *)switch_xml_tohtml(arg1,arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_toxml_buf(void * jarg1, char * jarg2, void * jarg3, void * jarg4, int jarg5) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t arg4 ;
+  switch_bool_t arg5 ;
+  switch_size_t *argp3 ;
+  switch_size_t *argp4 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  arg5 = (switch_bool_t)jarg5; 
+  result = (char *)switch_xml_toxml_buf(arg1,arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free(void * jarg1) {
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  switch_xml_free(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_free_in_thread(void * jarg1, int jarg2) {
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (int)jarg2; 
+  switch_xml_free_in_thread(arg1,arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_xml_error(void * jarg1) {
+  char * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  result = (char *)switch_xml_error(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_new(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_xml_t)switch_xml_new((char const *)arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_add_child(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_xml_t)switch_xml_add_child(arg1,(char const *)arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_txt(void * jarg1, char * jarg2) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_xml_t)switch_xml_set_txt(arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_attr(void * jarg1, char * jarg2, char * jarg3) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_xml_t)switch_xml_set_attr(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_set_flag(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_xml_flag_t arg2 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_xml_flag_t)jarg2; 
+  result = (switch_xml_t)switch_xml_set_flag(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_cut(void * jarg1) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  result = (switch_xml_t)switch_xml_cut(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_insert(void * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  switch_size_t arg3 ;
+  switch_size_t *argp3 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  argp3 = (switch_size_t *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg3 = *argp3; 
+  result = (switch_xml_t)switch_xml_insert(arg1,arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_set_root(void * jarg1) {
+  int jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  result = (switch_status_t)switch_xml_set_root(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_set_open_root_function(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_xml_open_root_function_t arg1 = (switch_xml_open_root_function_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_open_root_function_t)jarg1; 
+  arg2 = (void *)jarg2; 
+  result = (switch_status_t)switch_xml_set_open_root_function(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_open_root(unsigned char jarg1, void * jarg2) {
+  void * jresult ;
+  uint8_t arg1 ;
+  char **arg2 = (char **) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (uint8_t)jarg1; 
+  arg2 = (char **)jarg2; 
+  result = (switch_xml_t)switch_xml_open_root(arg1,(char const **)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_init(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_memory_pool_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  result = (switch_status_t)switch_xml_init(arg1,(char const **)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_reload(void * jarg1) {
+  int jresult ;
+  char **arg1 = (char **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char **)jarg1; 
+  result = (switch_status_t)switch_xml_reload((char const **)arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_destroy() {
+  int jresult ;
+  switch_status_t result;
+  
+  result = (switch_status_t)switch_xml_destroy();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_root() {
+  void * jresult ;
+  switch_xml_t result;
+  
+  result = (switch_xml_t)switch_xml_root();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6, void * jarg7, int jarg8) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
+  switch_event_t *arg7 = (switch_event_t *) 0 ;
+  switch_bool_t arg8 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t *)jarg5; 
+  arg6 = (switch_xml_t *)jarg6; 
+  arg7 = (switch_event_t *)jarg7; 
+  arg8 = (switch_bool_t)jarg8; 
+  result = (switch_status_t)switch_xml_locate((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_domain(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  arg3 = (switch_xml_t *)jarg3; 
+  arg4 = (switch_xml_t *)jarg4; 
+  result = (switch_status_t)switch_xml_locate_domain((char const *)arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_group(char * jarg1, char * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
+  switch_event_t *arg6 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_xml_t *)jarg3; 
+  arg4 = (switch_xml_t *)jarg4; 
+  arg5 = (switch_xml_t *)jarg5; 
+  arg6 = (switch_event_t *)jarg6; 
+  result = (switch_status_t)switch_xml_locate_group((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6, void * jarg7, void * jarg8, void * jarg9) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg7 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg8 = (switch_xml_t *) 0 ;
+  switch_event_t *arg9 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t *)jarg5; 
+  arg6 = (switch_xml_t *)jarg6; 
+  arg7 = (switch_xml_t *)jarg7; 
+  arg8 = (switch_xml_t *)jarg8; 
+  arg9 = (switch_event_t *)jarg9; 
+  result = (switch_status_t)switch_xml_locate_user((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8,arg9);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user_in_domain(char * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  switch_xml_t *arg3 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  arg3 = (switch_xml_t *)jarg3; 
+  arg4 = (switch_xml_t *)jarg4; 
+  result = (switch_status_t)switch_xml_locate_user_in_domain((char const *)arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_user_merged(char * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, void * jarg6) {
+  int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
+  switch_event_t *arg6 = (switch_event_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (switch_xml_t *)jarg5; 
+  arg6 = (switch_event_t *)jarg6; 
+  result = (switch_status_t)switch_xml_locate_user_merged((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_clear_user_cache(char * jarg1, char * jarg2, char * jarg3) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (uint32_t)switch_xml_clear_user_cache((char const *)arg1,(char const *)arg2,(char const *)arg3);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_merge_user(void * jarg1, void * jarg2, void * jarg3) {
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_xml_t arg2 = (switch_xml_t) 0 ;
+  switch_xml_t arg3 = (switch_xml_t) 0 ;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (switch_xml_t)jarg2; 
+  arg3 = (switch_xml_t)jarg3; 
+  switch_xml_merge_user(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_dup(void * jarg1) {
+  void * jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  result = (switch_xml_t)switch_xml_dup(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_open_cfg(char * jarg1, void * jarg2, void * jarg3) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  switch_xml_t result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (switch_xml_t *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  result = (switch_xml_t)switch_xml_open_cfg((char const *)arg1,arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_set_binding_sections(void * jarg1, unsigned long jarg2) {
+  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
+  switch_xml_section_t arg2 ;
+  
+  arg1 = (switch_xml_binding_t *)jarg1; 
+  arg2 = (switch_xml_section_t)jarg2; 
+  switch_xml_set_binding_sections(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_xml_set_binding_user_data(void * jarg1, void * jarg2) {
+  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_xml_binding_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  switch_xml_set_binding_user_data(arg1,arg2);
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_get_binding_sections(void * jarg1) {
+  unsigned long jresult ;
+  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
+  switch_xml_section_t result;
+  
+  arg1 = (switch_xml_binding_t *)jarg1; 
+  result = (switch_xml_section_t)switch_xml_get_binding_sections(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_get_binding_user_data(void * jarg1) {
+  void * jresult ;
+  switch_xml_binding_t *arg1 = (switch_xml_binding_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_xml_binding_t *)jarg1; 
+  result = (void *)switch_xml_get_binding_user_data(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_bind_search_function_ret(void * jarg1, unsigned long jarg2, void * jarg3, void * jarg4) {
+  int jresult ;
+  switch_xml_search_function_t arg1 = (switch_xml_search_function_t) 0 ;
+  switch_xml_section_t arg2 ;
+  void *arg3 = (void *) 0 ;
+  switch_xml_binding_t **arg4 = (switch_xml_binding_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_search_function_t)jarg1; 
+  arg2 = (switch_xml_section_t)jarg2; 
+  arg3 = (void *)jarg3; 
+  arg4 = (switch_xml_binding_t **)jarg4; 
+  result = (switch_status_t)switch_xml_bind_search_function_ret(arg1,arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_unbind_search_function(void * jarg1) {
+  int jresult ;
+  switch_xml_binding_t **arg1 = (switch_xml_binding_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_binding_t **)jarg1; 
+  result = (switch_status_t)switch_xml_unbind_search_function(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_unbind_search_function_ptr(void * jarg1) {
+  int jresult ;
+  switch_xml_search_function_t arg1 = (switch_xml_search_function_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_search_function_t)jarg1; 
+  result = (switch_status_t)switch_xml_unbind_search_function_ptr(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_xml_parse_section_string(char * jarg1) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  switch_xml_section_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (switch_xml_section_t)switch_xml_parse_section_string((char const *)arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_std_datetime_check(void * jarg1, void * jarg2, char * jarg3) {
+  int jresult ;
+  switch_xml_t arg1 = (switch_xml_t) 0 ;
+  int *arg2 = (int *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_xml_t)jarg1; 
+  arg2 = (int *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (int)switch_xml_std_datetime_check(arg1,arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_locate_language(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6, char * jarg7) {
+  int jresult ;
+  switch_xml_t *arg1 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg2 = (switch_xml_t *) 0 ;
+  switch_event_t *arg3 = (switch_event_t *) 0 ;
+  switch_xml_t *arg4 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg5 = (switch_xml_t *) 0 ;
+  switch_xml_t *arg6 = (switch_xml_t *) 0 ;
+  char *arg7 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_xml_t *)jarg1; 
+  arg2 = (switch_xml_t *)jarg2; 
+  arg3 = (switch_event_t *)jarg3; 
+  arg4 = (switch_xml_t *)jarg4; 
+  arg5 = (switch_xml_t *)jarg5; 
+  arg6 = (switch_xml_t *)jarg6; 
+  arg7 = (char *)jarg7; 
+  result = (switch_status_t)switch_xml_locate_language(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_outgoing_channel_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
+  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
+  if (arg1) (arg1)->outgoing_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_outgoing_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  switch_outgoing_channel_hook_t result;
+  
+  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
+  result = (switch_outgoing_channel_hook_t) ((arg1)->outgoing_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  switch_io_event_hook_outgoing_channel *arg2 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  
+  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
+  arg2 = (switch_io_event_hook_outgoing_channel *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_outgoing_channel_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  switch_io_event_hook_outgoing_channel *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
+  result = (switch_io_event_hook_outgoing_channel *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_outgoing_channel() {
+  void * jresult ;
+  switch_io_event_hook_outgoing_channel *result = 0 ;
+  
+  result = (switch_io_event_hook_outgoing_channel *)new switch_io_event_hook_outgoing_channel();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_outgoing_channel(void * jarg1) {
+  switch_io_event_hook_outgoing_channel *arg1 = (switch_io_event_hook_outgoing_channel *) 0 ;
+  
+  arg1 = (switch_io_event_hook_outgoing_channel *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_receive_message_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
+  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
+  arg2 = (switch_receive_message_hook_t)jarg2; 
+  if (arg1) (arg1)->receive_message = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_receive_message_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
+  switch_receive_message_hook_t result;
+  
+  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
+  result = (switch_receive_message_hook_t) ((arg1)->receive_message);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
+  switch_io_event_hook_receive_message *arg2 = (switch_io_event_hook_receive_message *) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
+  arg2 = (switch_io_event_hook_receive_message *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_message_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
+  switch_io_event_hook_receive_message *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
+  result = (switch_io_event_hook_receive_message *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_receive_message() {
+  void * jresult ;
+  switch_io_event_hook_receive_message *result = 0 ;
+  
+  result = (switch_io_event_hook_receive_message *)new switch_io_event_hook_receive_message();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_message(void * jarg1) {
+  switch_io_event_hook_receive_message *arg1 = (switch_io_event_hook_receive_message *) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_message *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_receive_event_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
+  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
+  arg2 = (switch_receive_event_hook_t)jarg2; 
+  if (arg1) (arg1)->receive_event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_receive_event_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
+  switch_receive_event_hook_t result;
+  
+  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
+  result = (switch_receive_event_hook_t) ((arg1)->receive_event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
+  switch_io_event_hook_receive_event *arg2 = (switch_io_event_hook_receive_event *) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
+  arg2 = (switch_io_event_hook_receive_event *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_receive_event_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
+  switch_io_event_hook_receive_event *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
+  result = (switch_io_event_hook_receive_event *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_receive_event() {
+  void * jresult ;
+  switch_io_event_hook_receive_event *result = 0 ;
+  
+  result = (switch_io_event_hook_receive_event *)new switch_io_event_hook_receive_event();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_receive_event(void * jarg1) {
+  switch_io_event_hook_receive_event *arg1 = (switch_io_event_hook_receive_event *) 0 ;
+  
+  arg1 = (switch_io_event_hook_receive_event *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_read_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
+  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
+  arg2 = (switch_read_frame_hook_t)jarg2; 
+  if (arg1) (arg1)->read_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_read_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
+  switch_read_frame_hook_t result;
+  
+  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
+  result = (switch_read_frame_hook_t) ((arg1)->read_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
+  switch_io_event_hook_read_frame *arg2 = (switch_io_event_hook_read_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
+  arg2 = (switch_io_event_hook_read_frame *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_read_frame_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
+  switch_io_event_hook_read_frame *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
+  result = (switch_io_event_hook_read_frame *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_read_frame() {
+  void * jresult ;
+  switch_io_event_hook_read_frame *result = 0 ;
+  
+  result = (switch_io_event_hook_read_frame *)new switch_io_event_hook_read_frame();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_read_frame(void * jarg1) {
+  switch_io_event_hook_read_frame *arg1 = (switch_io_event_hook_read_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_read_frame *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_video_read_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
+  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
+  arg2 = (switch_read_frame_hook_t)jarg2; 
+  if (arg1) (arg1)->video_read_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_video_read_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
+  switch_read_frame_hook_t result;
+  
+  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
+  result = (switch_read_frame_hook_t) ((arg1)->video_read_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
+  switch_io_event_hook_video_read_frame *arg2 = (switch_io_event_hook_video_read_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
+  arg2 = (switch_io_event_hook_video_read_frame *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_read_frame_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
+  switch_io_event_hook_video_read_frame *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
+  result = (switch_io_event_hook_video_read_frame *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_video_read_frame() {
+  void * jresult ;
+  switch_io_event_hook_video_read_frame *result = 0 ;
+  
+  result = (switch_io_event_hook_video_read_frame *)new switch_io_event_hook_video_read_frame();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_read_frame(void * jarg1) {
+  switch_io_event_hook_video_read_frame *arg1 = (switch_io_event_hook_video_read_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_read_frame *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_write_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
+  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
+  arg2 = (switch_write_frame_hook_t)jarg2; 
+  if (arg1) (arg1)->write_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
+  switch_write_frame_hook_t result;
+  
+  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
+  result = (switch_write_frame_hook_t) ((arg1)->write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
+  switch_io_event_hook_write_frame *arg2 = (switch_io_event_hook_write_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
+  arg2 = (switch_io_event_hook_write_frame *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_write_frame_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
+  switch_io_event_hook_write_frame *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
+  result = (switch_io_event_hook_write_frame *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_write_frame() {
+  void * jresult ;
+  switch_io_event_hook_write_frame *result = 0 ;
+  
+  result = (switch_io_event_hook_write_frame *)new switch_io_event_hook_write_frame();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_write_frame(void * jarg1) {
+  switch_io_event_hook_write_frame *arg1 = (switch_io_event_hook_write_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_write_frame *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_video_write_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
+  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
+  arg2 = (switch_video_write_frame_hook_t)jarg2; 
+  if (arg1) (arg1)->video_write_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_video_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
+  switch_video_write_frame_hook_t result;
+  
+  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
+  result = (switch_video_write_frame_hook_t) ((arg1)->video_write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
+  switch_io_event_hook_video_write_frame *arg2 = (switch_io_event_hook_video_write_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
+  arg2 = (switch_io_event_hook_video_write_frame *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_video_write_frame_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
+  switch_io_event_hook_video_write_frame *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
+  result = (switch_io_event_hook_video_write_frame *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_video_write_frame() {
+  void * jresult ;
+  switch_io_event_hook_video_write_frame *result = 0 ;
+  
+  result = (switch_io_event_hook_video_write_frame *)new switch_io_event_hook_video_write_frame();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_video_write_frame(void * jarg1) {
+  switch_io_event_hook_video_write_frame *arg1 = (switch_io_event_hook_video_write_frame *) 0 ;
+  
+  arg1 = (switch_io_event_hook_video_write_frame *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_kill_channel_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
+  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
+  arg2 = (switch_kill_channel_hook_t)jarg2; 
+  if (arg1) (arg1)->kill_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_kill_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
+  switch_kill_channel_hook_t result;
+  
+  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
+  result = (switch_kill_channel_hook_t) ((arg1)->kill_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
+  switch_io_event_hook_kill_channel *arg2 = (switch_io_event_hook_kill_channel *) 0 ;
+  
+  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
+  arg2 = (switch_io_event_hook_kill_channel *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_kill_channel_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
+  switch_io_event_hook_kill_channel *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
+  result = (switch_io_event_hook_kill_channel *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_kill_channel() {
+  void * jresult ;
+  switch_io_event_hook_kill_channel *result = 0 ;
+  
+  result = (switch_io_event_hook_kill_channel *)new switch_io_event_hook_kill_channel();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_kill_channel(void * jarg1) {
+  switch_io_event_hook_kill_channel *arg1 = (switch_io_event_hook_kill_channel *) 0 ;
+  
+  arg1 = (switch_io_event_hook_kill_channel *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_send_dtmf_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
+  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
+  arg2 = (switch_send_dtmf_hook_t)jarg2; 
+  if (arg1) (arg1)->send_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_send_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
+  switch_send_dtmf_hook_t result;
+  
+  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
+  result = (switch_send_dtmf_hook_t) ((arg1)->send_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
+  switch_io_event_hook_send_dtmf *arg2 = (switch_io_event_hook_send_dtmf *) 0 ;
+  
+  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
+  arg2 = (switch_io_event_hook_send_dtmf *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_send_dtmf_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
+  switch_io_event_hook_send_dtmf *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
+  result = (switch_io_event_hook_send_dtmf *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_send_dtmf() {
+  void * jresult ;
+  switch_io_event_hook_send_dtmf *result = 0 ;
+  
+  result = (switch_io_event_hook_send_dtmf *)new switch_io_event_hook_send_dtmf();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_send_dtmf(void * jarg1) {
+  switch_io_event_hook_send_dtmf *arg1 = (switch_io_event_hook_send_dtmf *) 0 ;
+  
+  arg1 = (switch_io_event_hook_send_dtmf *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_recv_dtmf_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
+  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
+  if (arg1) (arg1)->recv_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_recv_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  switch_recv_dtmf_hook_t result;
+  
+  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
+  result = (switch_recv_dtmf_hook_t) ((arg1)->recv_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  switch_io_event_hook_recv_dtmf *arg2 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  
+  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
+  arg2 = (switch_io_event_hook_recv_dtmf *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_recv_dtmf_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  switch_io_event_hook_recv_dtmf *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
+  result = (switch_io_event_hook_recv_dtmf *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_recv_dtmf() {
+  void * jresult ;
+  switch_io_event_hook_recv_dtmf *result = 0 ;
+  
+  result = (switch_io_event_hook_recv_dtmf *)new switch_io_event_hook_recv_dtmf();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_recv_dtmf(void * jarg1) {
+  switch_io_event_hook_recv_dtmf *arg1 = (switch_io_event_hook_recv_dtmf *) 0 ;
+  
+  arg1 = (switch_io_event_hook_recv_dtmf *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_state_change_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
+  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_change *)jarg1; 
+  arg2 = (switch_state_change_hook_t)jarg2; 
+  if (arg1) (arg1)->state_change = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_change_state_change_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
+  switch_state_change_hook_t result;
+  
+  arg1 = (switch_io_event_hook_state_change *)jarg1; 
+  result = (switch_state_change_hook_t) ((arg1)->state_change);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_change_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
+  switch_io_event_hook_state_change *arg2 = (switch_io_event_hook_state_change *) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_change *)jarg1; 
+  arg2 = (switch_io_event_hook_state_change *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_change_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
+  switch_io_event_hook_state_change *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_state_change *)jarg1; 
+  result = (switch_io_event_hook_state_change *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_state_change() {
+  void * jresult ;
+  switch_io_event_hook_state_change *result = 0 ;
+  
+  result = (switch_io_event_hook_state_change *)new switch_io_event_hook_state_change();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_change(void * jarg1) {
+  switch_io_event_hook_state_change *arg1 = (switch_io_event_hook_state_change *) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_change *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_state_run_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
+  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_run *)jarg1; 
+  arg2 = (switch_state_run_hook_t)jarg2; 
+  if (arg1) (arg1)->state_run = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_run_state_run_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
+  switch_state_run_hook_t result;
+  
+  arg1 = (switch_io_event_hook_state_run *)jarg1; 
+  result = (switch_state_run_hook_t) ((arg1)->state_run);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hook_state_run_next_set(void * jarg1, void * jarg2) {
+  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
+  switch_io_event_hook_state_run *arg2 = (switch_io_event_hook_state_run *) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_run *)jarg1; 
+  arg2 = (switch_io_event_hook_state_run *)jarg2; 
+  if (arg1) (arg1)->next = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hook_state_run_next_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
+  switch_io_event_hook_state_run *result = 0 ;
+  
+  arg1 = (switch_io_event_hook_state_run *)jarg1; 
+  result = (switch_io_event_hook_state_run *) ((arg1)->next);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hook_state_run() {
+  void * jresult ;
+  switch_io_event_hook_state_run *result = 0 ;
+  
+  result = (switch_io_event_hook_state_run *)new switch_io_event_hook_state_run();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hook_state_run(void * jarg1) {
+  switch_io_event_hook_state_run *arg1 = (switch_io_event_hook_state_run *) 0 ;
+  
+  arg1 = (switch_io_event_hook_state_run *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_outgoing_channel_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_outgoing_channel_t *arg2 = (switch_io_event_hook_outgoing_channel_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_outgoing_channel_t *)jarg2; 
+  if (arg1) (arg1)->outgoing_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_outgoing_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_outgoing_channel_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_outgoing_channel_t *) ((arg1)->outgoing_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_message_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_receive_message_t *arg2 = (switch_io_event_hook_receive_message_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_receive_message_t *)jarg2; 
+  if (arg1) (arg1)->receive_message = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_receive_message_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_receive_message_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_receive_message_t *) ((arg1)->receive_message);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_receive_event_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_receive_event_t *arg2 = (switch_io_event_hook_receive_event_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_receive_event_t *)jarg2; 
+  if (arg1) (arg1)->receive_event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_receive_event_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_receive_event_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_receive_event_t *) ((arg1)->receive_event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_read_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_read_frame_t *arg2 = (switch_io_event_hook_read_frame_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_read_frame_t *)jarg2; 
+  if (arg1) (arg1)->read_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_read_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_read_frame_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_read_frame_t *) ((arg1)->read_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_read_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_video_read_frame_t *arg2 = (switch_io_event_hook_video_read_frame_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_video_read_frame_t *)jarg2; 
+  if (arg1) (arg1)->video_read_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_video_read_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_video_read_frame_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_video_read_frame_t *) ((arg1)->video_read_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_write_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_write_frame_t *arg2 = (switch_io_event_hook_write_frame_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_write_frame_t *)jarg2; 
+  if (arg1) (arg1)->write_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_write_frame_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_write_frame_t *) ((arg1)->write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_video_write_frame_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_video_write_frame_t *arg2 = (switch_io_event_hook_video_write_frame_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_video_write_frame_t *)jarg2; 
+  if (arg1) (arg1)->video_write_frame = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_video_write_frame_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_video_write_frame_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_video_write_frame_t *) ((arg1)->video_write_frame);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_kill_channel_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_kill_channel_t *arg2 = (switch_io_event_hook_kill_channel_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_kill_channel_t *)jarg2; 
+  if (arg1) (arg1)->kill_channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_kill_channel_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_kill_channel_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_kill_channel_t *) ((arg1)->kill_channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_send_dtmf_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_send_dtmf_t *arg2 = (switch_io_event_hook_send_dtmf_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_send_dtmf_t *)jarg2; 
+  if (arg1) (arg1)->send_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_send_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_send_dtmf_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_send_dtmf_t *) ((arg1)->send_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_recv_dtmf_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_recv_dtmf_t *arg2 = (switch_io_event_hook_recv_dtmf_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_recv_dtmf_t *)jarg2; 
+  if (arg1) (arg1)->recv_dtmf = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_recv_dtmf_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_recv_dtmf_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_recv_dtmf_t *) ((arg1)->recv_dtmf);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_change_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_state_change_t *arg2 = (switch_io_event_hook_state_change_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_state_change_t *)jarg2; 
+  if (arg1) (arg1)->state_change = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_state_change_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_state_change_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_state_change_t *) ((arg1)->state_change);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_io_event_hooks_state_run_set(void * jarg1, void * jarg2) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_state_run_t *arg2 = (switch_io_event_hook_state_run_t *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  arg2 = (switch_io_event_hook_state_run_t *)jarg2; 
+  if (arg1) (arg1)->state_run = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_io_event_hooks_state_run_get(void * jarg1) {
+  void * jresult ;
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  switch_io_event_hook_state_run_t *result = 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  result = (switch_io_event_hook_state_run_t *) ((arg1)->state_run);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_io_event_hooks() {
+  void * jresult ;
+  switch_io_event_hooks *result = 0 ;
+  
+  result = (switch_io_event_hooks *)new switch_io_event_hooks();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_io_event_hooks(void * jarg1) {
+  switch_io_event_hooks *arg1 = (switch_io_event_hooks *) 0 ;
+  
+  arg1 = (switch_io_event_hooks *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_outgoing_channel(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_outgoing_channel(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_receive_message(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_receive_message_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_receive_message(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_receive_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_receive_event_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_receive_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_state_change(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_state_change_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_state_change(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_state_run(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_state_run_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_state_run(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_read_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_read_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_read_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_write_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_write_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_write_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_video_read_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_video_read_frame_hook_t arg2 = (switch_video_read_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_video_read_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_video_read_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_video_write_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_video_write_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_video_write_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_kill_channel(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_kill_channel_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_kill_channel(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_send_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_send_dtmf_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_send_dtmf(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_add_recv_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_add_recv_dtmf(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_outgoing_channel(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_outgoing_channel_hook_t arg2 = (switch_outgoing_channel_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_outgoing_channel_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_outgoing_channel(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_receive_message(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_receive_message_hook_t arg2 = (switch_receive_message_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_receive_message_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_receive_message(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_receive_event(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_receive_event_hook_t arg2 = (switch_receive_event_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_receive_event_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_receive_event(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_state_change(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_state_change_hook_t arg2 = (switch_state_change_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_state_change_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_state_change(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_state_run(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_state_run_hook_t arg2 = (switch_state_run_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_state_run_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_state_run(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_read_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_read_frame_hook_t arg2 = (switch_read_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_read_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_read_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_write_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_write_frame_hook_t arg2 = (switch_write_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_write_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_write_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_video_read_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_video_read_frame_hook_t arg2 = (switch_video_read_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_video_read_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_video_read_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_video_write_frame(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_video_write_frame_hook_t arg2 = (switch_video_write_frame_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_video_write_frame_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_video_write_frame(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_kill_channel(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_kill_channel_hook_t arg2 = (switch_kill_channel_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_kill_channel_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_kill_channel(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_send_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_send_dtmf_hook_t arg2 = (switch_send_dtmf_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_send_dtmf_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_send_dtmf(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_event_hook_remove_recv_dtmf(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_recv_dtmf_hook_t arg2 = (switch_recv_dtmf_hook_t) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_recv_dtmf_hook_t)jarg2; 
+  result = (switch_status_t)switch_core_event_hook_remove_recv_dtmf(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_created_set(void * jarg1, long long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->created = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_scheduler_task_created_get(void * jarg1) {
+  long long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (int64_t) ((arg1)->created);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_runtime_set(void * jarg1, long long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  int64_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (int64_t)jarg2; 
+  if (arg1) (arg1)->runtime = arg2;
+}
+
+
+SWIGEXPORT long long SWIGSTDCALL CSharp_switch_scheduler_task_runtime_get(void * jarg1) {
+  long long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  int64_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (int64_t) ((arg1)->runtime);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_set(void * jarg1, unsigned long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->cmd_id = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_cmd_id_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (uint32_t) ((arg1)->cmd_id);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_repeat_set(void * jarg1, unsigned long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->repeat = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_repeat_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (uint32_t) ((arg1)->repeat);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_group_set(void * jarg1, char * jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->group) delete [] arg1->group;
+    if (arg2) {
+      arg1->group = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->group, (const char *)arg2);
+    } else {
+      arg1->group = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_scheduler_task_group_get(void * jarg1) {
+  char * jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (char *) ((arg1)->group);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_cmd_arg_set(void * jarg1, void * jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->cmd_arg = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_scheduler_task_cmd_arg_get(void * jarg1) {
+  void * jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (void *) ((arg1)->cmd_arg);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_task_id_set(void * jarg1, unsigned long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->task_id = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_task_id_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (uint32_t) ((arg1)->task_id);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_hash_set(void * jarg1, unsigned long jarg2) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  unsigned long arg2 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  arg2 = (unsigned long)jarg2; 
+  if (arg1) (arg1)->hash = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_task_hash_get(void * jarg1) {
+  unsigned long jresult ;
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  unsigned long result;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  result = (unsigned long) ((arg1)->hash);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_scheduler_task() {
+  void * jresult ;
+  switch_scheduler_task *result = 0 ;
+  
+  result = (switch_scheduler_task *)new switch_scheduler_task();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_scheduler_task(void * jarg1) {
+  switch_scheduler_task *arg1 = (switch_scheduler_task *) 0 ;
+  
+  arg1 = (switch_scheduler_task *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_add_task(void * jarg1, void * jarg2, char * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, unsigned long jarg7) {
+  unsigned long jresult ;
+  time_t arg1 ;
+  switch_scheduler_func_t arg2 = (switch_scheduler_func_t) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  uint32_t arg5 ;
+  void *arg6 = (void *) 0 ;
+  switch_scheduler_flag_t arg7 ;
+  time_t *argp1 ;
+  uint32_t result;
+  
+  argp1 = (time_t *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null time_t", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  arg2 = (switch_scheduler_func_t)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (uint32_t)jarg5; 
+  arg6 = (void *)jarg6; 
+  arg7 = (switch_scheduler_flag_t)jarg7; 
+  result = (uint32_t)switch_scheduler_add_task(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_del_task_id(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_scheduler_del_task_id(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_scheduler_del_task_group(char * jarg1) {
+  unsigned long jresult ;
+  char *arg1 = (char *) 0 ;
+  uint32_t result;
+  
+  arg1 = (char *)jarg1; 
+  result = (uint32_t)switch_scheduler_del_task_group((char const *)arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_thread_start() {
+  switch_scheduler_task_thread_start();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_scheduler_task_thread_stop() {
+  switch_scheduler_task_thread_stop();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_file_set(void * jarg1, void * jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  FILE *arg2 = (FILE *) 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (FILE *)jarg2; 
+  if (arg1) (arg1)->file = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_config_file_get(void * jarg1) {
+  void * jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  FILE *result = 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (FILE *) ((arg1)->file);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_path_set(void * jarg1, char * jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->path, (const char *)arg2, 512-1);
+      arg1->path[512-1] = 0;
+    } else {
+      arg1->path[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_path_get(void * jarg1) {
+  char * jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (char *)(char *) ((arg1)->path);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_category_set(void * jarg1, char * jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->category, (const char *)arg2, 256-1);
+      arg1->category[256-1] = 0;
+    } else {
+      arg1->category[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_category_get(void * jarg1) {
+  char * jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (char *)(char *) ((arg1)->category);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_section_set(void * jarg1, char * jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->section, (const char *)arg2, 256-1);
+      arg1->section[256-1] = 0;
+    } else {
+      arg1->section[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_section_get(void * jarg1) {
+  char * jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (char *)(char *) ((arg1)->section);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_buf_set(void * jarg1, char * jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if(arg2) {
+      strncpy((char*)arg1->buf, (const char *)arg2, 1024-1);
+      arg1->buf[1024-1] = 0;
+    } else {
+      arg1->buf[0] = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_config_buf_get(void * jarg1) {
+  char * jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (char *)(char *) ((arg1)->buf);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lineno_set(void * jarg1, int jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->lineno = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_lineno_get(void * jarg1) {
+  int jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  int result;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (int) ((arg1)->lineno);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_catno_set(void * jarg1, int jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->catno = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_catno_get(void * jarg1) {
+  int jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  int result;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (int) ((arg1)->catno);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_sectno_set(void * jarg1, int jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->sectno = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_sectno_get(void * jarg1) {
+  int jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  int result;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (int) ((arg1)->sectno);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_lockto_set(void * jarg1, int jarg2) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->lockto = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_lockto_get(void * jarg1) {
+  int jresult ;
+  switch_config *arg1 = (switch_config *) 0 ;
+  int result;
+  
+  arg1 = (switch_config *)jarg1; 
+  result = (int) ((arg1)->lockto);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_config() {
+  void * jresult ;
+  switch_config *result = 0 ;
+  
+  result = (switch_config *)new switch_config();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_config(void * jarg1) {
+  switch_config *arg1 = (switch_config *) 0 ;
+  
+  arg1 = (switch_config *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_open_file(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_config_t *arg1 = (switch_config_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (switch_config_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)switch_config_open_file(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_config_close_file(void * jarg1) {
+  switch_config_t *arg1 = (switch_config_t *) 0 ;
+  
+  arg1 = (switch_config_t *)jarg1; 
+  switch_config_close_file(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_config_next_pair(void * jarg1, void * jarg2, void * jarg3) {
+  int jresult ;
+  switch_config_t *arg1 = (switch_config_t *) 0 ;
+  char **arg2 = (char **) 0 ;
+  char **arg3 = (char **) 0 ;
+  int result;
+  
+  arg1 = (switch_config_t *)jarg1; 
+  arg2 = (char **)jarg2; 
+  arg3 = (char **)jarg3; 
+  result = (int)switch_config_next_pair(arg1,arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_setGlobalVariable(char * jarg1, char * jarg2) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  setGlobalVariable(arg1,arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_getGlobalVariable(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)getGlobalVariable(arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog(char * jarg1, char * jarg2) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  consoleLog(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleLog2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  consoleLog2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_consoleCleanLog(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  consoleCleanLog(arg1);
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_running() {
+  unsigned int jresult ;
+  bool result;
+  
+  result = (bool)running();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) {
+  unsigned int jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
+  char *arg4 = (char *) NULL ;
+  char *arg5 = (char *) NULL ;
+  char *arg6 = (char *) NULL ;
+  char *arg7 = (char *) NULL ;
+  bool result;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  result = (bool)email(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_IvrMenu(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, char * jarg11, int jarg12, int jarg13, int jarg14, int jarg15, int jarg16, int jarg17) {
+  void * jresult ;
+  IVRMenu *arg1 = (IVRMenu *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) 0 ;
+  char *arg11 = (char *) 0 ;
+  int arg12 ;
+  int arg13 ;
+  int arg14 ;
+  int arg15 ;
+  int arg16 ;
+  int arg17 ;
+  IVRMenu *result = 0 ;
+  
+  arg1 = (IVRMenu *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (char *)jarg11; 
+  arg12 = (int)jarg12; 
+  arg13 = (int)jarg13; 
+  arg14 = (int)jarg14; 
+  arg15 = (int)jarg15; 
+  arg16 = (int)jarg16; 
+  arg17 = (int)jarg17; 
+  result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,(char const *)arg10,(char const *)arg11,arg12,arg13,arg14,arg15,arg16,arg17);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_IvrMenu(void * jarg1) {
+  IVRMenu *arg1 = (IVRMenu *) 0 ;
+  
+  arg1 = (IVRMenu *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_IvrMenu_bindAction(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  IVRMenu *arg1 = (IVRMenu *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  
+  arg1 = (IVRMenu *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  (arg1)->bindAction(arg2,(char const *)arg3,(char const *)arg4);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_IvrMenu_Execute(void * jarg1, void * jarg2, char * jarg3) {
+  IVRMenu *arg1 = (IVRMenu *) 0 ;
+  CoreSession *arg2 = (CoreSession *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (IVRMenu *)jarg1; 
+  arg2 = (CoreSession *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->execute(arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_Api(void * jarg1) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) NULL ;
+  API *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (API *)new API(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_Api(void * jarg1) {
+  API *arg1 = (API *) 0 ;
+  
+  arg1 = (API *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Api_Execute(void * jarg1, char * jarg2, char * jarg3) {
+  char * jresult ;
+  API *arg1 = (API *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
+  char *result = 0 ;
+  
+  arg1 = (API *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Api_ExecuteString(void * jarg1, char * jarg2) {
+  char * jresult ;
+  API *arg1 = (API *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (API *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)(arg1)->executeString((char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  free(result);
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Api_getTime(void * jarg1) {
+  char * jresult ;
+  API *arg1 = (API *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (API *)jarg1; 
+  result = (char *)(arg1)->getTime();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_function_set(void * jarg1, void * jarg2) {
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->function = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_function_get(void * jarg1) {
+  void * jresult ;
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  result = (void *) ((arg1)->function);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_threadState_set(void * jarg1, void * jarg2) {
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->threadState = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_threadState_get(void * jarg1) {
+  void * jresult ;
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  result = (void *) ((arg1)->threadState);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_extra_set(void * jarg1, void * jarg2) {
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  if (arg1) (arg1)->extra = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_input_callback_state_t_extra_get(void * jarg1) {
+  void * jresult ;
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  result = (void *) ((arg1)->extra);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_input_callback_state_t_funcargs_set(void * jarg1, char * jarg2) {
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->funcargs) delete [] arg1->funcargs;
+    if (arg2) {
+      arg1->funcargs = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->funcargs, (const char *)arg2);
+    } else {
+      arg1->funcargs = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_input_callback_state_t_funcargs_get(void * jarg1) {
+  char * jresult ;
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  result = (char *) ((arg1)->funcargs);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_input_callback_state_t() {
+  void * jresult ;
+  input_callback_state_t *result = 0 ;
+  
+  result = (input_callback_state_t *)new input_callback_state_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_input_callback_state_t(void * jarg1) {
+  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  
+  arg1 = (input_callback_state_t *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_digit_set(void * jarg1, char jarg2) {
+  DTMF *arg1 = (DTMF *) 0 ;
+  char arg2 ;
+  
+  arg1 = (DTMF *)jarg1; 
+  arg2 = (char)jarg2; 
+  if (arg1) (arg1)->digit = arg2;
+}
+
+
+SWIGEXPORT char SWIGSTDCALL CSharp_DTMF_digit_get(void * jarg1) {
+  char jresult ;
+  DTMF *arg1 = (DTMF *) 0 ;
+  char result;
+  
+  arg1 = (DTMF *)jarg1; 
+  result = (char) ((arg1)->digit);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_DTMF_duration_set(void * jarg1, unsigned long jarg2) {
+  DTMF *arg1 = (DTMF *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (DTMF *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->duration = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_DTMF_duration_get(void * jarg1) {
+  unsigned long jresult ;
+  DTMF *arg1 = (DTMF *) 0 ;
+  uint32_t result;
+  
+  arg1 = (DTMF *)jarg1; 
+  result = (uint32_t) ((arg1)->duration);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_DTMF(char jarg1, unsigned long jarg2) {
+  void * jresult ;
+  char arg1 ;
+  uint32_t arg2 = (uint32_t) 2000 ;
+  DTMF *result = 0 ;
+  
+  arg1 = (char)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  result = (DTMF *)new DTMF(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_DTMF(void * jarg1) {
+  DTMF *arg1 = (DTMF *) 0 ;
+  
+  arg1 = (DTMF *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_Stream__SWIG_0() {
+  void * jresult ;
+  Stream *result = 0 ;
+  
+  result = (Stream *)new Stream();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_Stream__SWIG_1(void * jarg1) {
+  void * jresult ;
+  switch_stream_handle_t *arg1 = (switch_stream_handle_t *) 0 ;
+  Stream *result = 0 ;
+  
+  arg1 = (switch_stream_handle_t *)jarg1; 
+  result = (Stream *)new Stream(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_Stream(void * jarg1) {
+  Stream *arg1 = (Stream *) 0 ;
+  
+  arg1 = (Stream *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Stream_Write(void * jarg1, char * jarg2) {
+  Stream *arg1 = (Stream *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (Stream *)jarg1; 
+  arg2 = (char *)jarg2; 
+  (arg1)->write((char const *)arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Stream_get_data(void * jarg1) {
+  char * jresult ;
+  Stream *arg1 = (Stream *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (Stream *)jarg1; 
+  result = (char *)(arg1)->get_data();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Event_InternalEvent_set(void * jarg1, void * jarg2) {
+  Event *arg1 = (Event *) 0 ;
+  switch_event_t *arg2 = (switch_event_t *) 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (switch_event_t *)jarg2; 
+  if (arg1) (arg1)->event = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Event_InternalEvent_get(void * jarg1) {
+  void * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  switch_event_t *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  result = (switch_event_t *) ((arg1)->event);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Event_serialized_string_set(void * jarg1, char * jarg2) {
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->serialized_string) delete [] arg1->serialized_string;
+    if (arg2) {
+      arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->serialized_string, (const char *)arg2);
+    } else {
+      arg1->serialized_string = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Event_serialized_string_get(void * jarg1) {
+  char * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  result = (char *) ((arg1)->serialized_string);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Event_mine_set(void * jarg1, int jarg2) {
+  Event *arg1 = (Event *) 0 ;
+  int arg2 ;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->mine = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Event_mine_get(void * jarg1) {
+  int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  int result;
+  
+  arg1 = (Event *)jarg1; 
+  result = (int) ((arg1)->mine);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_Event__SWIG_0(char * jarg1, char * jarg2) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) NULL ;
+  Event *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (Event *)new Event((char const *)arg1,(char const *)arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_Event__SWIG_1(void * jarg1, int jarg2) {
+  void * jresult ;
+  switch_event_t *arg1 = (switch_event_t *) 0 ;
+  int arg2 = (int) 0 ;
+  Event *result = 0 ;
+  
+  arg1 = (switch_event_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (Event *)new Event(arg1,arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_Event(void * jarg1) {
+  Event *arg1 = (Event *) 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Event_chat_execute(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
+  int result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (int)(arg1)->chat_execute((char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Event_chat_send(void * jarg1, char * jarg2) {
+  int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) NULL ;
+  int result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->chat_send((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Event_Serialize(void * jarg1, char * jarg2) {
+  char * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) NULL ;
+  char *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)(arg1)->serialize((char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_SetPriority(void * jarg1, int jarg2) {
+  unsigned int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  switch_priority_t arg2 = (switch_priority_t) SWITCH_PRIORITY_NORMAL ;
+  bool result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (switch_priority_t)jarg2; 
+  result = (bool)(arg1)->setPriority(arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetHeader(void * jarg1, char * jarg2) {
+  char * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)(arg1)->getHeader((char const *)arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetBody(void * jarg1) {
+  char * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  result = (char *)(arg1)->getBody();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_Event_GetEventType(void * jarg1) {
+  char * jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (Event *)jarg1; 
+  result = (char *)(arg1)->getType();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_AddBody(void * jarg1, char * jarg2) {
+  unsigned int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (bool)(arg1)->addBody((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_AddHeader(void * jarg1, char * jarg2, char * jarg3) {
+  unsigned int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  bool result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_DeleteHeader(void * jarg1, char * jarg2) {
+  unsigned int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  
+  arg1 = (Event *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (bool)(arg1)->delHeader((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Event_Fire(void * jarg1) {
+  unsigned int jresult ;
+  Event *arg1 = (Event *) 0 ;
+  bool result;
+  
+  arg1 = (Event *)jarg1; 
+  result = (bool)(arg1)->fire();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_events_set(void * jarg1, void * jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_queue_t *arg2 = (switch_queue_t *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (switch_queue_t *)jarg2; 
+  if (arg1) (arg1)->events = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_events_get(void * jarg1) {
+  void * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_queue_t *result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (switch_queue_t *) ((arg1)->events);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_event_id_set(void * jarg1, int jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_event_types_t arg2 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (switch_event_types_t)jarg2; 
+  if (arg1) (arg1)->e_event_id = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_EventConsumer_e_event_id_get(void * jarg1) {
+  int jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_event_types_t result;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (switch_event_types_t) ((arg1)->e_event_id);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_callback_set(void * jarg1, char * jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->e_callback) delete [] arg1->e_callback;
+    if (arg2) {
+      arg1->e_callback = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->e_callback, (const char *)arg2);
+    } else {
+      arg1->e_callback = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_callback_get(void * jarg1) {
+  char * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (char *) ((arg1)->e_callback);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_subclass_name_set(void * jarg1, char * jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->e_subclass_name) delete [] arg1->e_subclass_name;
+    if (arg2) {
+      arg1->e_subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->e_subclass_name, (const char *)arg2);
+    } else {
+      arg1->e_subclass_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_subclass_name_get(void * jarg1) {
+  char * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (char *) ((arg1)->e_subclass_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_e_cb_arg_set(void * jarg1, char * jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->e_cb_arg) delete [] arg1->e_cb_arg;
+    if (arg2) {
+      arg1->e_cb_arg = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->e_cb_arg, (const char *)arg2);
+    } else {
+      arg1->e_cb_arg = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_EventConsumer_e_cb_arg_get(void * jarg1) {
+  char * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (char *) ((arg1)->e_cb_arg);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_enodes_set(void * jarg1, void * jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_event_node_t **arg2 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (switch_event_node_t **)jarg2; 
+  {
+    size_t ii;
+    switch_event_node_t * *b = (switch_event_node_t * *) arg1->enodes;
+    for (ii = 0; ii < (size_t)SWITCH_EVENT_ALL+1; ii++) b[ii] = *((switch_event_node_t * *) arg2 + ii);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_enodes_get(void * jarg1) {
+  void * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  switch_event_node_t **result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (switch_event_node_t **)(switch_event_node_t **) ((arg1)->enodes);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_node_index_set(void * jarg1, unsigned long jarg2) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  uint32_t arg2 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (uint32_t)jarg2; 
+  if (arg1) (arg1)->node_index = arg2;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_EventConsumer_node_index_get(void * jarg1) {
+  unsigned long jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  uint32_t result;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  result = (uint32_t) ((arg1)->node_index);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_EventConsumer(char * jarg1, char * jarg2, int jarg3) {
+  void * jresult ;
+  char *arg1 = (char *) NULL ;
+  char *arg2 = (char *) "" ;
+  int arg3 = (int) 5000 ;
+  EventConsumer *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (EventConsumer *)new EventConsumer((char const *)arg1,(char const *)arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_EventConsumer(void * jarg1) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_EventConsumer_bind(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) "" ;
+  int result;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (int)(arg1)->bind((char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_pop(void * jarg1, int jarg2, int jarg3) {
+  void * jresult ;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  int arg2 = (int) 0 ;
+  int arg3 = (int) 0 ;
+  Event *result = 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (Event *)(arg1)->pop(arg2,arg3);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_cleanup(void * jarg1) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  (arg1)->cleanup();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_CoreSession(void * jarg1) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_InternalSession_set(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_core_session_t *arg2 = (switch_core_session_t *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (switch_core_session_t *)jarg2; 
+  if (arg1) (arg1)->session = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_InternalSession_get(void * jarg1) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_core_session_t *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (switch_core_session_t *) ((arg1)->session);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_channel_set(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_channel_t *arg2 = (switch_channel_t *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (switch_channel_t *)jarg2; 
+  if (arg1) (arg1)->channel = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_channel_get(void * jarg1) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_channel_t *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (switch_channel_t *) ((arg1)->channel);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_flags_set(void * jarg1, unsigned int jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->flags = arg2;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_flags_get(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  unsigned int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (unsigned int) ((arg1)->flags);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_allocated_set(void * jarg1, int jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->allocated = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_allocated_get(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (int) ((arg1)->allocated);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cb_state_set(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  input_callback_state *arg2 = (input_callback_state *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (input_callback_state *)jarg2; 
+  if (arg1) (arg1)->cb_state = *arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_cb_state_get(void * jarg1) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  input_callback_state *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (input_callback_state *)& ((arg1)->cb_state);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_HookState_set(void * jarg1, int jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_channel_state_t arg2 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (switch_channel_state_t)jarg2; 
+  if (arg1) (arg1)->hook_state = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_HookState_get(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_channel_state_t result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (switch_channel_state_t) ((arg1)->hook_state);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_cause_set(void * jarg1, int jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_call_cause_t arg2 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (switch_call_cause_t)jarg2; 
+  if (arg1) (arg1)->cause = arg2;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_cause_get(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_call_cause_t result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (switch_call_cause_t) ((arg1)->cause);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_uuid_set(void * jarg1, char * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->uuid) delete [] arg1->uuid;
+    if (arg2) {
+      arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->uuid, (const char *)arg2);
+    } else {
+      arg1->uuid = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_uuid_get(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *) ((arg1)->uuid);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_tts_name_set(void * jarg1, char * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->tts_name) delete [] arg1->tts_name;
+    if (arg2) {
+      arg1->tts_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->tts_name, (const char *)arg2);
+    } else {
+      arg1->tts_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_tts_name_get(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *) ((arg1)->tts_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_voice_name_set(void * jarg1, char * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  {
+    if (arg1->voice_name) delete [] arg1->voice_name;
+    if (arg2) {
+      arg1->voice_name = (char *) (new char[strlen((const char *)arg2)+1]);
+      strcpy((char *)arg1->voice_name, (const char *)arg2);
+    } else {
+      arg1->voice_name = 0;
+    }
+  }
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_voice_name_get(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *) ((arg1)->voice_name);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_insertFile(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)(arg1)->insertFile((char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Answer(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (int)(arg1)->answer();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_preAnswer(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (int)(arg1)->preAnswer();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Hangup(void * jarg1, char * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) "normal_clearing" ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  (arg1)->hangup((char const *)arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_hangupState(void * jarg1) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  (arg1)->hangupState();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetVariable(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->setVariable(arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetPrivate(void * jarg1, char * jarg2, void * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = (void *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (void *)jarg3; 
+  (arg1)->setPrivate(arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_GetPrivate(void * jarg1, char * jarg2) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (void *)(arg1)->getPrivate(arg2);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetVariable(void * jarg1, char * jarg2) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (char *)(arg1)->getVariable(arg2);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Say(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) NULL ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (char *)jarg5; 
+  arg6 = (char *)jarg6; 
+  (arg1)->say((char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SayPhrase(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) "" ;
+  char *arg4 = (char *) NULL ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  (arg1)->sayPhrase((char const *)arg2,(char const *)arg3,(char const *)arg4);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_hangupCause(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *)(arg1)->hangupCause();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_getState(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *)(arg1)->getState();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_RecordFile(void * jarg1, char * jarg2, int jarg3, int jarg4, int jarg5) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 = (int) 0 ;
+  int arg4 = (int) 0 ;
+  int arg5 = (int) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (int)(arg1)->recordFile(arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_originate(void * jarg1, void * jarg2, char * jarg3, int jarg4, void * jarg5) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  CoreSession *arg2 = (CoreSession *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 = (int) 60 ;
+  switch_state_handler_table_t *arg5 = (switch_state_handler_table_t *) NULL ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (CoreSession *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (switch_state_handler_table_t *)jarg5; 
+  result = (int)(arg1)->originate(arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_destroy(void * jarg1) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  (arg1)->destroy();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Speak(void * jarg1, char * jarg2) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (int)(arg1)->speak(arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetTtsParameters(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->set_tts_parms(arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_set_tts_params(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->set_tts_params(arg2,arg3);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_CollectDigits__SWIG_0(void * jarg1, int jarg2) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  result = (int)(arg1)->collectDigits(arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_CollectDigits__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)(arg1)->collectDigits(arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetDigits__SWIG_0(void * jarg1, int jarg2, char * jarg3, int jarg4) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (char *)(arg1)->getDigits(arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetDigits__SWIG_1(void * jarg1, int jarg2, char * jarg3, int jarg4, int jarg5) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  int arg5 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (int)jarg5; 
+  result = (char *)(arg1)->getDigits(arg2,arg3,arg4,arg5);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Transfer(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
+  char *arg4 = (char *) NULL ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  result = (int)(arg1)->transfer(arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_read(void * jarg1, int jarg2, int jarg3, char * jarg4, int jarg5, char * jarg6, int jarg7) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  int arg7 = (int) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (int)jarg7; 
+  result = (char *)(arg1)->read(arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_PlayAndGetDigits(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, char * jarg10, int jarg11, char * jarg12) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  char *arg10 = (char *) NULL ;
+  int arg11 = (int) 0 ;
+  char *arg12 = (char *) NULL ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (char *)jarg6; 
+  arg7 = (char *)jarg7; 
+  arg8 = (char *)jarg8; 
+  arg9 = (char *)jarg9; 
+  arg10 = (char *)jarg10; 
+  arg11 = (int)jarg11; 
+  arg12 = (char *)jarg12; 
+  result = (char *)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,(char const *)arg10,arg11,(char const *)arg12);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_StreamFile(void * jarg1, char * jarg2, int jarg3) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 = (int) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)(arg1)->streamFile(arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_sleep(void * jarg1, int jarg2, int jarg3) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int arg2 ;
+  int arg3 = (int) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  result = (int)(arg1)->sleep(arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_flushEvents(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (int)(arg1)->flushEvents();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_flushDigits(void * jarg1) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (int)(arg1)->flushDigits();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_SetAutoHangup(void * jarg1, unsigned int jarg2) {
+  int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool arg2 ;
+  int result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = jarg2 ? true : false; 
+  result = (int)(arg1)->setAutoHangup(arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_Ready(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->ready();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_bridged(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->bridged();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_answered(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->answered();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_mediaReady(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->mediaReady();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_waitForAnswer(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  CoreSession *arg2 = (CoreSession *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (CoreSession *)jarg2; 
+  (arg1)->waitForAnswer(arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_Execute(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) NULL ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->execute((char const *)arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_sendEvent(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  Event *arg2 = (Event *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (Event *)jarg2; 
+  (arg1)->sendEvent(arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_setEventData(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  Event *arg2 = (Event *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (Event *)jarg2; 
+  (arg1)->setEventData(arg2);
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_getXMLCDR(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *)(arg1)->getXMLCDR();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_begin_allow_threads(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->begin_allow_threads();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_end_allow_threads(void * jarg1) {
+  unsigned int jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  bool result;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (bool)(arg1)->end_allow_threads();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT char * SWIGSTDCALL CSharp_CoreSession_GetUuid(void * jarg1) {
+  char * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (char *)((CoreSession const *)arg1)->get_uuid();
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_CoreSession_get_cb_args(void * jarg1) {
+  void * jresult ;
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  switch_input_args_t *result = 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  result = (switch_input_args_t *) &((CoreSession const *)arg1)->get_cb_args();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_check_hangup_hook(void * jarg1) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  (arg1)->check_hangup_hook();
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog(void * jarg1, char * jarg2, char * jarg3) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  (arg1)->consoleLog(arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_consoleLog2(void * jarg1, char * jarg2, char * jarg3, char * jarg4, int jarg5, char * jarg6) {
+  CoreSession *arg1 = (CoreSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  int arg5 ;
+  char *arg6 = (char *) 0 ;
+  
+  arg1 = (CoreSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (char *)jarg4; 
+  arg5 = (int)jarg5; 
+  arg6 = (char *)jarg6; 
+  (arg1)->consoleLog2(arg2,arg3,arg4,arg5,arg6);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_console_log(char * jarg1, char * jarg2) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  console_log(arg1,arg2);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_console_log2(char * jarg1, char * jarg2, char * jarg3, int jarg4, char * jarg5) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  char *arg5 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  arg4 = (int)jarg4; 
+  arg5 = (char *)jarg5; 
+  console_log2(arg1,arg2,arg3,arg4,arg5);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  console_clean_log(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) {
+  unsigned int arg1 ;
+  
+  arg1 = (unsigned int)jarg1; 
+  switch_msleep(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_bridge(void * jarg1, void * jarg2) {
+  CoreSession *arg1 = 0 ;
+  CoreSession *arg2 = 0 ;
+  
+  arg1 = (CoreSession *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
+    return ;
+  } 
+  arg2 = (CoreSession *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "CoreSession & type is null", 0);
+    return ;
+  } 
+  bridge(*arg1,*arg2);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_hanguphook(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)hanguphook(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_dtmf_callback(void * jarg1, void * jarg2, int jarg3, void * jarg4, unsigned int jarg5) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  switch_input_type_t arg3 ;
+  void *arg4 = (void *) 0 ;
+  unsigned int arg5 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (void *)jarg2; 
+  arg3 = (switch_input_type_t)jarg3; 
+  arg4 = (void *)jarg4; 
+  arg5 = (unsigned int)jarg5; 
+  result = (switch_status_t)dtmf_callback(arg1,arg2,arg3,arg4,arg5);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_0() {
+  void * jresult ;
+  ManagedSession *result = 0 ;
+  
+  result = (ManagedSession *)new ManagedSession();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_1(char * jarg1) {
+  void * jresult ;
+  char *arg1 = (char *) 0 ;
+  ManagedSession *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (ManagedSession *)new ManagedSession(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ManagedSession__SWIG_2(void * jarg1) {
+  void * jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  ManagedSession *result = 0 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (ManagedSession *)new ManagedSession(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_ManagedSession(void * jarg1) {
+  ManagedSession *arg1 = (ManagedSession *) 0 ;
+  
+  arg1 = (ManagedSession *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT CoreSession * SWIGSTDCALL CSharp_ManagedSession_SWIGUpcast(ManagedSession *jarg1) {
+    return (CoreSession *)jarg1;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp
index ee6e87a5fc..215a98336b 100644
--- a/src/mod/languages/mod_managed/mod_managed.cpp
+++ b/src/mod/languages/mod_managed/mod_managed.cpp
@@ -1,461 +1,461 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
- * Copyright (C) 2008, Michael Giagnocavo <mgg@packetrino.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
- *
- * The Initial Developer of the Original Code is
- * Michael Giagnocavo <mgg@packetrino.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Michael Giagnocavo <mgg@giagnocavo.net>
- * David Brazier <David.Brazier@360crm.co.uk>
- * Jeff Lenk <jlenk@frontiernet.net> 
- *
- * mod_mono.cpp -- FreeSWITCH mod_mono main class
- *
- * Most of mod_mono is implmented in the mod_mono_managed Loader class. 
- * The native code just handles getting the Mono runtime up and down
- * and passing pointers into managed code.
- */  
-
-#include <switch.h>
-#include "freeswitch_managed.h" 
-
-#ifdef _MANAGED
-#include <mscoree.h>
-using namespace System;
-using namespace System::Runtime::InteropServices;
-#define MOD_MANAGED_VERSION "Microsoft CLR Version"
-#else
-#define MOD_MANAGED_VERSION "Mono Version"
-#endif
-
-SWITCH_BEGIN_EXTERN_C 
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load);
-SWITCH_MODULE_DEFINITION_EX(mod_managed, mod_managed_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS);
-
-SWITCH_STANDARD_API(managedrun_api_function);	/* ExecuteBackground */
-SWITCH_STANDARD_API(managed_api_function);	/* Execute */
-SWITCH_STANDARD_APP(managed_app_function);	/* Run */
-SWITCH_STANDARD_API(managedreload_api_function);	/* Reload */
-SWITCH_STANDARD_API(managedlist_api_function); /* List modules */
-
-#define MOD_MANAGED_ASM_NAME "FreeSWITCH.Managed"
-#define MOD_MANAGED_ASM_V1 1
-#define MOD_MANAGED_ASM_V2 0
-#define MOD_MANAGED_ASM_V3 2
-#define MOD_MANAGED_ASM_V4 0
-#define MOD_MANAGED_DLL MOD_MANAGED_ASM_NAME ".dll"
-#define MOD_MANAGED_IMAGE_NAME "FreeSWITCH"
-#define MOD_MANAGED_CLASS_NAME "Loader"
-
-mod_managed_globals globals = { 0 };
-
-// Global delegates to call managed functions
-typedef int (*runFunction)(const char *data, void *sessionPtr);
-typedef int (*executeFunction)(const char *cmd, void *stream, void *Event);
-typedef int (*executeBackgroundFunction)(const char* cmd);
-typedef int (*reloadFunction)(const char* cmd);
-typedef int (*listFunction)(const char* cmd);
-static runFunction runDelegate;
-static executeFunction executeDelegate;
-static executeBackgroundFunction executeBackgroundDelegate;
-static reloadFunction reloadDelegate;
-static listFunction listDelegate;
-
-SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, reloadFunction reload, listFunction list) 
-{
-	runDelegate = run;
-	executeDelegate = execute;
-	executeBackgroundDelegate = executeBackground;
-	reloadDelegate = reload;
-	listDelegate = list;
-}
-
-
-// Sets up delegates (and anything else needed) on the ManagedSession object
-// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC
-// Exported method.
-SWITCH_MOD_DECLARE_NONSTD(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) 
-{
-	switch_assert(session);
-	if (!session) {
-		return;
-	}
-	session->setDTMFCallback(NULL, "");
-	session->setHangupHook(NULL);
-	session->dtmfDelegate = dtmfDelegate;
-	session->hangupDelegate = hangupDelegate;
-}
-
-#ifndef _MANAGED	
-
-#ifdef WIN32
-#include <shlobj.h>
-#endif	
-
-switch_status_t setMonoDirs() 
-{
-#ifdef WIN32	
-	// Win32 Mono installs can't figure out their own path
-	// Guys in #mono say we should just deploy all the libs we need
-	// We'll first check for Program Files\Mono to allow people to use the symlink dir for a specific version.
-	// Then we'll check HKEY_LOCAL_MACHINE\SOFTWARE\Novell\Mono\2.0\FrameworkAssemblyDirectory and MonoConfigDir
-	// After that, we'll scan program files for a Mono-* dir.
-	char progFilesPath[MAX_PATH];
-	char libPath[MAX_PATH];
-	char etcPath[MAX_PATH];
-	char findPath[MAX_PATH];
-	bool found = false;
-
-	SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, progFilesPath);
-
-	{ // Check PF\Mono directly
-		DWORD attr;
-		switch_snprintf(findPath, MAX_PATH, "%s\\Mono", progFilesPath);
-		attr = GetFileAttributes(findPath);
-		found = (attr != INVALID_FILE_ATTRIBUTES && ((attr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY));
-		if (found) {
-			switch_snprintf(libPath, MAX_PATH, "%s\\lib", findPath);
-			switch_snprintf(etcPath, MAX_PATH, "%s\\etc", findPath);
-		}
-	}
-
-	if (!found) {   // Check registry
-		DWORD size = MAX_PATH;
-		if (ERROR_SUCCESS == RegGetValue(HKEY_LOCAL_MACHINE, "SOFTWARE\\Novell\\Mono\\2.0", "FrameworkAssemblyDirectory", RRF_RT_REG_SZ, NULL, &libPath, &size)) {
-			size = MAX_PATH;
-			if (ERROR_SUCCESS == RegGetValue(HKEY_LOCAL_MACHINE, "SOFTWARE\\Novell\\Mono\\2.0", "MonoConfigDir", RRF_RT_REG_SZ, NULL, &etcPath, &size)) {
-				found = true;
-			}
-		}
-	}
-
-	if (!found) { // Scan program files for Mono-2something
-		HANDLE hFind;
-		WIN32_FIND_DATA findData;
-		switch_snprintf(findPath, MAX_PATH, "%s\\Mono-2*", progFilesPath);
-		hFind = FindFirstFile(findPath, &findData);
-		if (hFind == INVALID_HANDLE_VALUE) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error looking for Mono in Program Files.\n");
-			return SWITCH_STATUS_FALSE;
-		}
-
-		while ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) {
-			if (FindNextFile(hFind, &findData) == 0) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find Mono directory in Program Files.\n");
-				FindClose(hFind);
-				return SWITCH_STATUS_FALSE;
-			}
-		}
-		switch_snprintf(libPath, MAX_PATH, "%s\\%s\\lib", progFilesPath, findData.cFileName);
-		switch_snprintf(etcPath, MAX_PATH, "%s\\%s\\etc", progFilesPath, findData.cFileName);
-		FindClose(hFind);
-	}
-
-	/* Got it */ 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using Mono paths '%s' and '%s'.\n", libPath, etcPath);
-	mono_set_dirs(libPath, etcPath);
-	return SWITCH_STATUS_SUCCESS;
-
-#else
-	// On other platforms, it should just work if it hasn't been relocated
-	mono_set_dirs(NULL, NULL);
-	return SWITCH_STATUS_SUCCESS;
-#endif	
-}
-
-switch_status_t loadRuntime() 
-{
-	/* Find and load mod_mono_managed.exe */ 
-	char filename[256];
-
-	if (setMonoDirs() != SWITCH_STATUS_SUCCESS) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-#ifndef WIN32 	
-	// So linux can find the .so
-	char xmlConfig[300];
-	switch_snprintf(xmlConfig, 300, "<configuration><dllmap dll=\"mod_managed\" target=\"%s%smod_managed.so\"/></configuration>", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR);
-	mono_config_parse(NULL);
-	mono_config_parse_memory(xmlConfig);
-#endif
-
-	switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL);
-	globals.domain = mono_jit_init(filename);
-
-	/* Already got a Mono domain? */
-	if ((globals.domain = mono_get_root_domain())) {
-		mono_thread_attach(globals.domain);
-		globals.embedded = SWITCH_TRUE;
-	} else {
-		if (!(globals.domain = mono_jit_init(filename))) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	/* Already loaded? */
-	MonoAssemblyName *name = mono_assembly_name_new (MOD_MANAGED_ASM_NAME);
-	//Note also that it can't be allocated on the stack anymore and you'll need to create and destroy it with the following API:
-	//mono_assembly_name_free (name);
-	
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_assembly_loaded.\n");
-
-	if (!(globals.mod_mono_asm = mono_assembly_loaded(name))) {
-		/* Open the assembly */ 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_domain_assembly_open.\n");
-		globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename);
-		if (!globals.mod_mono_asm) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n");
-			return SWITCH_STATUS_FALSE;
-		}
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-MonoMethod * getMethod(const char *name, MonoClass * klass) 
-{
-	MonoMethodDesc * desc;
-	MonoMethod * method;
-
-	desc = mono_method_desc_new(name, TRUE);
-	method = mono_method_desc_search_in_class(desc, klass);
-
-	if (!method) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find %s method.\n", name);
-		return NULL;
-	}
-
-	return method;
-}
-
-switch_status_t findLoader() 
-{
-	/* Find loader class and methods */ 
-	MonoClass * loaderClass;
-	MonoImage * img = mono_assembly_get_image(globals.mod_mono_asm);
-
-	if (!(loaderClass = mono_class_from_name(img, MOD_MANAGED_IMAGE_NAME, MOD_MANAGED_CLASS_NAME))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " class.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if (!(globals.loadMethod = getMethod(MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME ":Load()", loaderClass))) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all loader functions.\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif
-
-/**********************************************************
-	CLR Code Starts Here
-**********************************************************/
-
-#ifdef _MANAGED
-
-switch_status_t loadRuntime() 
-{
-	/* Find and load mod_dotnet_managed.dll */ 
-	char filename[256];
-	switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL);
-
-	wchar_t modpath[256];
-	mbstowcs(modpath, filename, 255);
-	try {
-		FreeSwitchManaged::mod_dotnet_managed = Assembly::LoadFrom(gcnew String(modpath));
-	} catch (Exception^ ex) {
-		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Assembly::LoadFrom failed: %s\n", static_cast<const char*>(msg.ToPointer()));
-		Marshal::FreeHGlobal(msg);
-		return SWITCH_STATUS_FALSE;
-	}
-	return SWITCH_STATUS_SUCCESS;
-}
-
-switch_status_t findLoader() 
-{
-	try {
-		FreeSwitchManaged::loadMethod = FreeSwitchManaged::mod_dotnet_managed->GetType(MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME)->GetMethod("Load");
-	} catch(Exception^ ex) {
-		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not load " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " class: %s\n", static_cast<const char*>(msg.ToPointer()));
-		Marshal::FreeHGlobal(msg);
-		return SWITCH_STATUS_FALSE;
-	}
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " functions.\n");
-	return SWITCH_STATUS_SUCCESS;
-}
-#endif
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load) 
-{
-	int success;
-	/* connect my internal structure to the blank pointer passed to me */ 
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading mod_managed (Common Language Infrastructure), " MOD_MANAGED_VERSION "\n");
-
-	globals.pool = pool;
-	
-	if (loadRuntime() != SWITCH_STATUS_SUCCESS) {			
-		return SWITCH_STATUS_FALSE;
-	}
-	
-	if (findLoader() != SWITCH_STATUS_SUCCESS) {		
-		return SWITCH_STATUS_FALSE;
-	}
-#ifdef _MANAGED
-	try {
-		Object ^objResult = FreeSwitchManaged::loadMethod->Invoke(nullptr, nullptr);
-		success = *reinterpret_cast<bool^>(objResult);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");
-	}
-	catch(Exception^ ex) {
-		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true. %s\n", static_cast<const char*>(msg.ToPointer()));
-		Marshal::FreeHGlobal(msg);
-		return SWITCH_STATUS_FALSE;
-	}
-#else
-	/* Not sure if this is necesary on the loading thread */ 
-	mono_thread_attach(globals.domain);
-
-	/* Run loader */ 
-	MonoObject * exception = NULL;
-	MonoObject * objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception);
-	if (exception) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n");
-		mono_print_unhandled_exception(exception);
-		return SWITCH_STATUS_FALSE;
-	}
-	success = *(int *) mono_object_unbox(objResult);
-#endif
-	if (success) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");
-	} else {		
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true.\n");
-		return SWITCH_STATUS_FALSE;
-	}
-	
-	/* We're good to register */ 
-	switch_api_interface_t *api_interface;
-	switch_application_interface_t *app_interface;
-
-	SWITCH_ADD_API(api_interface, "managedrun", "Run a module (ExecuteBackground)", managedrun_api_function, "<module> [<args>]");
-	SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]");
-	SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_SUPPORT_NOMEDIA);
-	SWITCH_ADD_API(api_interface, "managedreload", "Force [re]load of a file", managedreload_api_function, "<filename>");
-	SWITCH_ADD_API(api_interface, "managedlist", "Log the list of available APIs and Apps", managedlist_api_function, "");
-	return SWITCH_STATUS_NOUNLOAD;
-}
-
-#ifdef _MANAGED
-#pragma unmanaged
-#endif
-SWITCH_STANDARD_API(managedrun_api_function) 
-{
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR no args specified!\n");	
-		return SWITCH_STATUS_SUCCESS;
-	}
-#ifndef _MANAGED
-	mono_thread_attach(globals.domain);
-#endif
-	if (executeBackgroundDelegate(cmd)) {
-		stream->write_function(stream, "+OK\n");
-	} else {	
-		stream->write_function(stream, "-ERR ExecuteBackground returned false (unknown module or exception?).\n");
-	}
-#ifndef _MANAGED
-	mono_thread_detach(mono_thread_current());
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(managed_api_function) 
-{
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR no args specified!\n");	
-		return SWITCH_STATUS_SUCCESS;
-	}
-#ifndef _MANAGED
-	mono_thread_attach(globals.domain);
-#endif
-	if (!(executeDelegate(cmd, stream, stream->param_event))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module or exception).\n", cmd); 
-	}
-#ifndef _MANAGED
-	mono_thread_detach(mono_thread_current());
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_APP(managed_app_function) 
-{
-	if (zstr(data)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No args specified!\n");
-		return;
-	}
-#ifndef _MANAGED
-	mono_thread_attach(globals.domain);
-#endif
-	if (!(runDelegate(data, session))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application run failed for %s (unknown module or exception).\n", data);
-	}
-#ifndef _MANAGED
-	mono_thread_detach(mono_thread_current());
-#endif
-}
-
-SWITCH_STANDARD_API(managedreload_api_function) 
-{
-	if (zstr(cmd)) {
-		stream->write_function(stream, "-ERR no args specified!\n");	
-		return SWITCH_STATUS_SUCCESS;
-	}
-#ifndef _MANAGED
-	mono_thread_attach(globals.domain);
-#endif
-	if (!(reloadDelegate(cmd))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module or exception).\n", cmd); 
-	}
-#ifndef _MANAGED
-	mono_thread_detach(mono_thread_current());
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(managedlist_api_function)
-{
-#ifndef _MANAGED
-	mono_thread_attach(globals.domain);
-#endif
-	listDelegate(cmd);
-#ifndef _MANAGED
-	mono_thread_detach(mono_thread_current());
-#endif
-	return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_END_EXTERN_C
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ * Copyright (C) 2008, Michael Giagnocavo <mgg@packetrino.com>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Giagnocavo <mgg@packetrino.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Michael Giagnocavo <mgg@giagnocavo.net>
+ * David Brazier <David.Brazier@360crm.co.uk>
+ * Jeff Lenk <jlenk@frontiernet.net> 
+ *
+ * mod_mono.cpp -- FreeSWITCH mod_mono main class
+ *
+ * Most of mod_mono is implmented in the mod_mono_managed Loader class. 
+ * The native code just handles getting the Mono runtime up and down
+ * and passing pointers into managed code.
+ */  
+
+#include <switch.h>
+#include "freeswitch_managed.h" 
+
+#ifdef _MANAGED
+#include <mscoree.h>
+using namespace System;
+using namespace System::Runtime::InteropServices;
+#define MOD_MANAGED_VERSION "Microsoft CLR Version"
+#else
+#define MOD_MANAGED_VERSION "Mono Version"
+#endif
+
+SWITCH_BEGIN_EXTERN_C 
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load);
+SWITCH_MODULE_DEFINITION_EX(mod_managed, mod_managed_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS);
+
+SWITCH_STANDARD_API(managedrun_api_function);	/* ExecuteBackground */
+SWITCH_STANDARD_API(managed_api_function);	/* Execute */
+SWITCH_STANDARD_APP(managed_app_function);	/* Run */
+SWITCH_STANDARD_API(managedreload_api_function);	/* Reload */
+SWITCH_STANDARD_API(managedlist_api_function); /* List modules */
+
+#define MOD_MANAGED_ASM_NAME "FreeSWITCH.Managed"
+#define MOD_MANAGED_ASM_V1 1
+#define MOD_MANAGED_ASM_V2 0
+#define MOD_MANAGED_ASM_V3 2
+#define MOD_MANAGED_ASM_V4 0
+#define MOD_MANAGED_DLL MOD_MANAGED_ASM_NAME ".dll"
+#define MOD_MANAGED_IMAGE_NAME "FreeSWITCH"
+#define MOD_MANAGED_CLASS_NAME "Loader"
+
+mod_managed_globals globals = { 0 };
+
+// Global delegates to call managed functions
+typedef int (*runFunction)(const char *data, void *sessionPtr);
+typedef int (*executeFunction)(const char *cmd, void *stream, void *Event);
+typedef int (*executeBackgroundFunction)(const char* cmd);
+typedef int (*reloadFunction)(const char* cmd);
+typedef int (*listFunction)(const char* cmd);
+static runFunction runDelegate;
+static executeFunction executeDelegate;
+static executeBackgroundFunction executeBackgroundDelegate;
+static reloadFunction reloadDelegate;
+static listFunction listDelegate;
+
+SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, reloadFunction reload, listFunction list) 
+{
+	runDelegate = run;
+	executeDelegate = execute;
+	executeBackgroundDelegate = executeBackground;
+	reloadDelegate = reload;
+	listDelegate = list;
+}
+
+
+// Sets up delegates (and anything else needed) on the ManagedSession object
+// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC
+// Exported method.
+SWITCH_MOD_DECLARE_NONSTD(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) 
+{
+	switch_assert(session);
+	if (!session) {
+		return;
+	}
+	session->setDTMFCallback(NULL, "");
+	session->setHangupHook(NULL);
+	session->dtmfDelegate = dtmfDelegate;
+	session->hangupDelegate = hangupDelegate;
+}
+
+#ifndef _MANAGED	
+
+#ifdef WIN32
+#include <shlobj.h>
+#endif	
+
+switch_status_t setMonoDirs() 
+{
+#ifdef WIN32	
+	// Win32 Mono installs can't figure out their own path
+	// Guys in #mono say we should just deploy all the libs we need
+	// We'll first check for Program Files\Mono to allow people to use the symlink dir for a specific version.
+	// Then we'll check HKEY_LOCAL_MACHINE\SOFTWARE\Novell\Mono\2.0\FrameworkAssemblyDirectory and MonoConfigDir
+	// After that, we'll scan program files for a Mono-* dir.
+	char progFilesPath[MAX_PATH];
+	char libPath[MAX_PATH];
+	char etcPath[MAX_PATH];
+	char findPath[MAX_PATH];
+	bool found = false;
+
+	SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, progFilesPath);
+
+	{ // Check PF\Mono directly
+		DWORD attr;
+		switch_snprintf(findPath, MAX_PATH, "%s\\Mono", progFilesPath);
+		attr = GetFileAttributes(findPath);
+		found = (attr != INVALID_FILE_ATTRIBUTES && ((attr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY));
+		if (found) {
+			switch_snprintf(libPath, MAX_PATH, "%s\\lib", findPath);
+			switch_snprintf(etcPath, MAX_PATH, "%s\\etc", findPath);
+		}
+	}
+
+	if (!found) {   // Check registry
+		DWORD size = MAX_PATH;
+		if (ERROR_SUCCESS == RegGetValue(HKEY_LOCAL_MACHINE, "SOFTWARE\\Novell\\Mono\\2.0", "FrameworkAssemblyDirectory", RRF_RT_REG_SZ, NULL, &libPath, &size)) {
+			size = MAX_PATH;
+			if (ERROR_SUCCESS == RegGetValue(HKEY_LOCAL_MACHINE, "SOFTWARE\\Novell\\Mono\\2.0", "MonoConfigDir", RRF_RT_REG_SZ, NULL, &etcPath, &size)) {
+				found = true;
+			}
+		}
+	}
+
+	if (!found) { // Scan program files for Mono-2something
+		HANDLE hFind;
+		WIN32_FIND_DATA findData;
+		switch_snprintf(findPath, MAX_PATH, "%s\\Mono-2*", progFilesPath);
+		hFind = FindFirstFile(findPath, &findData);
+		if (hFind == INVALID_HANDLE_VALUE) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error looking for Mono in Program Files.\n");
+			return SWITCH_STATUS_FALSE;
+		}
+
+		while ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) {
+			if (FindNextFile(hFind, &findData) == 0) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find Mono directory in Program Files.\n");
+				FindClose(hFind);
+				return SWITCH_STATUS_FALSE;
+			}
+		}
+		switch_snprintf(libPath, MAX_PATH, "%s\\%s\\lib", progFilesPath, findData.cFileName);
+		switch_snprintf(etcPath, MAX_PATH, "%s\\%s\\etc", progFilesPath, findData.cFileName);
+		FindClose(hFind);
+	}
+
+	/* Got it */ 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using Mono paths '%s' and '%s'.\n", libPath, etcPath);
+	mono_set_dirs(libPath, etcPath);
+	return SWITCH_STATUS_SUCCESS;
+
+#else
+	// On other platforms, it should just work if it hasn't been relocated
+	mono_set_dirs(NULL, NULL);
+	return SWITCH_STATUS_SUCCESS;
+#endif	
+}
+
+switch_status_t loadRuntime() 
+{
+	/* Find and load mod_mono_managed.exe */ 
+	char filename[256];
+
+	if (setMonoDirs() != SWITCH_STATUS_SUCCESS) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+#ifndef WIN32 	
+	// So linux can find the .so
+	char xmlConfig[300];
+	switch_snprintf(xmlConfig, 300, "<configuration><dllmap dll=\"mod_managed\" target=\"%s%smod_managed.so\"/></configuration>", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR);
+	mono_config_parse(NULL);
+	mono_config_parse_memory(xmlConfig);
+#endif
+
+	switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL);
+	globals.domain = mono_jit_init(filename);
+
+	/* Already got a Mono domain? */
+	if ((globals.domain = mono_get_root_domain())) {
+		mono_thread_attach(globals.domain);
+		globals.embedded = SWITCH_TRUE;
+	} else {
+		if (!(globals.domain = mono_jit_init(filename))) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n");
+			return SWITCH_STATUS_FALSE;
+		}
+	}
+
+	/* Already loaded? */
+	MonoAssemblyName *name = mono_assembly_name_new (MOD_MANAGED_ASM_NAME);
+	//Note also that it can't be allocated on the stack anymore and you'll need to create and destroy it with the following API:
+	//mono_assembly_name_free (name);
+	
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_assembly_loaded.\n");
+
+	if (!(globals.mod_mono_asm = mono_assembly_loaded(name))) {
+		/* Open the assembly */ 
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_domain_assembly_open.\n");
+		globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename);
+		if (!globals.mod_mono_asm) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n");
+			return SWITCH_STATUS_FALSE;
+		}
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+MonoMethod * getMethod(const char *name, MonoClass * klass) 
+{
+	MonoMethodDesc * desc;
+	MonoMethod * method;
+
+	desc = mono_method_desc_new(name, TRUE);
+	method = mono_method_desc_search_in_class(desc, klass);
+
+	if (!method) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find %s method.\n", name);
+		return NULL;
+	}
+
+	return method;
+}
+
+switch_status_t findLoader() 
+{
+	/* Find loader class and methods */ 
+	MonoClass * loaderClass;
+	MonoImage * img = mono_assembly_get_image(globals.mod_mono_asm);
+
+	if (!(loaderClass = mono_class_from_name(img, MOD_MANAGED_IMAGE_NAME, MOD_MANAGED_CLASS_NAME))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " class.\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	if (!(globals.loadMethod = getMethod(MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME ":Load()", loaderClass))) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all loader functions.\n");
+	return SWITCH_STATUS_SUCCESS;
+}
+#endif
+
+/**********************************************************
+	CLR Code Starts Here
+**********************************************************/
+
+#ifdef _MANAGED
+
+switch_status_t loadRuntime() 
+{
+	/* Find and load mod_dotnet_managed.dll */ 
+	char filename[256];
+	switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL);
+
+	wchar_t modpath[256];
+	mbstowcs(modpath, filename, 255);
+	try {
+		FreeSwitchManaged::mod_dotnet_managed = Assembly::LoadFrom(gcnew String(modpath));
+	} catch (Exception^ ex) {
+		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Assembly::LoadFrom failed: %s\n", static_cast<const char*>(msg.ToPointer()));
+		Marshal::FreeHGlobal(msg);
+		return SWITCH_STATUS_FALSE;
+	}
+	return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t findLoader() 
+{
+	try {
+		FreeSwitchManaged::loadMethod = FreeSwitchManaged::mod_dotnet_managed->GetType(MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME)->GetMethod("Load");
+	} catch(Exception^ ex) {
+		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not load " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " class: %s\n", static_cast<const char*>(msg.ToPointer()));
+		Marshal::FreeHGlobal(msg);
+		return SWITCH_STATUS_FALSE;
+	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all " MOD_MANAGED_IMAGE_NAME "." MOD_MANAGED_CLASS_NAME " functions.\n");
+	return SWITCH_STATUS_SUCCESS;
+}
+#endif
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load) 
+{
+	int success;
+	/* connect my internal structure to the blank pointer passed to me */ 
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading mod_managed (Common Language Infrastructure), " MOD_MANAGED_VERSION "\n");
+
+	globals.pool = pool;
+	
+	if (loadRuntime() != SWITCH_STATUS_SUCCESS) {			
+		return SWITCH_STATUS_FALSE;
+	}
+	
+	if (findLoader() != SWITCH_STATUS_SUCCESS) {		
+		return SWITCH_STATUS_FALSE;
+	}
+#ifdef _MANAGED
+	try {
+		Object ^objResult = FreeSwitchManaged::loadMethod->Invoke(nullptr, nullptr);
+		success = *reinterpret_cast<bool^>(objResult);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");
+	}
+	catch(Exception^ ex) {
+		IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString());
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true. %s\n", static_cast<const char*>(msg.ToPointer()));
+		Marshal::FreeHGlobal(msg);
+		return SWITCH_STATUS_FALSE;
+	}
+#else
+	/* Not sure if this is necesary on the loading thread */ 
+	mono_thread_attach(globals.domain);
+
+	/* Run loader */ 
+	MonoObject * exception = NULL;
+	MonoObject * objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception);
+	if (exception) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n");
+		mono_print_unhandled_exception(exception);
+		return SWITCH_STATUS_FALSE;
+	}
+	success = *(int *) mono_object_unbox(objResult);
+#endif
+	if (success) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");
+	} else {		
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true.\n");
+		return SWITCH_STATUS_FALSE;
+	}
+	
+	/* We're good to register */ 
+	switch_api_interface_t *api_interface;
+	switch_application_interface_t *app_interface;
+
+	SWITCH_ADD_API(api_interface, "managedrun", "Run a module (ExecuteBackground)", managedrun_api_function, "<module> [<args>]");
+	SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]");
+	SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_SUPPORT_NOMEDIA);
+	SWITCH_ADD_API(api_interface, "managedreload", "Force [re]load of a file", managedreload_api_function, "<filename>");
+	SWITCH_ADD_API(api_interface, "managedlist", "Log the list of available APIs and Apps", managedlist_api_function, "");
+	return SWITCH_STATUS_NOUNLOAD;
+}
+
+#ifdef _MANAGED
+#pragma unmanaged
+#endif
+SWITCH_STANDARD_API(managedrun_api_function) 
+{
+	if (zstr(cmd)) {
+		stream->write_function(stream, "-ERR no args specified!\n");	
+		return SWITCH_STATUS_SUCCESS;
+	}
+#ifndef _MANAGED
+	mono_thread_attach(globals.domain);
+#endif
+	if (executeBackgroundDelegate(cmd)) {
+		stream->write_function(stream, "+OK\n");
+	} else {	
+		stream->write_function(stream, "-ERR ExecuteBackground returned false (unknown module or exception?).\n");
+	}
+#ifndef _MANAGED
+	mono_thread_detach(mono_thread_current());
+#endif
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_STANDARD_API(managed_api_function) 
+{
+	if (zstr(cmd)) {
+		stream->write_function(stream, "-ERR no args specified!\n");	
+		return SWITCH_STATUS_SUCCESS;
+	}
+#ifndef _MANAGED
+	mono_thread_attach(globals.domain);
+#endif
+	if (!(executeDelegate(cmd, stream, stream->param_event))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module or exception).\n", cmd); 
+	}
+#ifndef _MANAGED
+	mono_thread_detach(mono_thread_current());
+#endif
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_STANDARD_APP(managed_app_function) 
+{
+	if (zstr(data)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No args specified!\n");
+		return;
+	}
+#ifndef _MANAGED
+	mono_thread_attach(globals.domain);
+#endif
+	if (!(runDelegate(data, session))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application run failed for %s (unknown module or exception).\n", data);
+	}
+#ifndef _MANAGED
+	mono_thread_detach(mono_thread_current());
+#endif
+}
+
+SWITCH_STANDARD_API(managedreload_api_function) 
+{
+	if (zstr(cmd)) {
+		stream->write_function(stream, "-ERR no args specified!\n");	
+		return SWITCH_STATUS_SUCCESS;
+	}
+#ifndef _MANAGED
+	mono_thread_attach(globals.domain);
+#endif
+	if (!(reloadDelegate(cmd))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module or exception).\n", cmd); 
+	}
+#ifndef _MANAGED
+	mono_thread_detach(mono_thread_current());
+#endif
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_STANDARD_API(managedlist_api_function)
+{
+#ifndef _MANAGED
+	mono_thread_attach(globals.domain);
+#endif
+	listDelegate(cmd);
+#ifndef _MANAGED
+	mono_thread_detach(mono_thread_current());
+#endif
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_END_EXTERN_C

From 940171c623a81b0281ffc145b6e2490e72b0ffd1 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Mon, 21 Jul 2014 16:01:23 -0500
Subject: [PATCH 065/130] FS-6670 #resolve #comment Doh, see this one is
 dangerous

---
 src/mod/endpoints/mod_sofia/sofia.c          | 2 +-
 src/mod/endpoints/mod_sofia/sofia_presence.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 158ca28e59..d3aae97b6c 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1661,7 +1661,7 @@ static void our_sofia_event_callback(nua_event_t event,
 									 proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : "",
 									 event_str, contact_str, call_id, full_from, full_via,
 									 (long) switch_epoch_time_now(NULL) + 60,
-									 full_agent, accept, profile->name, mod_sofia_globals.hostname,
+									 full_agent, accept_header, profile->name, mod_sofia_globals.hostname,
 									 np.network_port, np.network_ip, orig_proto, full_to, to_tag);
 
 				switch_assert(sql != NULL);
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 3dd216624b..5691da5ade 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -3921,7 +3921,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 								 proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : "",
 								 event, contact_str, call_id, full_from, full_via,
 								 (long) switch_epoch_time_now(NULL) + exp_delta,
-								 full_agent, accept, profile->name, mod_sofia_globals.hostname,
+								 full_agent, accept_header, profile->name, mod_sofia_globals.hostname,
 								 np.network_port, np.network_ip, orig_proto, full_to, use_to_tag);
 
 			switch_assert(sql != NULL);

From 7e08d2123df557a20cd65ff8e1cbb439909ae673 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 22 Jul 2014 02:05:25 +0500
Subject: [PATCH 066/130] FS-6663 #resolve

---
 .../event_handlers/mod_event_multicast/mod_event_multicast.c   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
index ae0908b886..97fb934262 100644
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
+++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
@@ -319,6 +319,7 @@ static void event_handler(switch_event_t *event)
 									  &tmplen, (unsigned char *) MAGIC, (int) strlen((char *) MAGIC));
 					outlen += tmplen;
 					EVP_EncryptFinal(&ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
+					EVP_CIPHER_CTX_cleanup(&ctx);
 					outlen += tmplen;
 					len = (size_t) outlen + SWITCH_UUID_FORMATTED_LENGTH;
 					*(buf + SWITCH_UUID_FORMATTED_LENGTH + outlen) = '\0';
@@ -546,7 +547,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime)
 			EVP_DecryptInit(&ctx, NULL, (unsigned char *) globals.psk, (unsigned char *) uuid_str);
 			EVP_DecryptUpdate(&ctx, (unsigned char *) tmp, &outl, (unsigned char *) packet, (int) len);
 			EVP_DecryptFinal(&ctx, (unsigned char *) tmp + outl, &tmplen);
-
+			EVP_CIPHER_CTX_cleanup(&ctx);
 			*(tmp + outl + tmplen) = '\0';
 
 			/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decrypted event as %s\n----------\n of actual length %d (%d) %d\n", tmp, outl + tmplen, (int) len, (int) strlen(tmp)); */

From fb6ecb4c766f8f6cd61f1ddba019e53f90fbe3d8 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 09:38:55 +0800
Subject: [PATCH 067/130] Fixed some issues raised by coverity in spandsp ilbc
 and unimrcp

---
 libs/ilbc/src/iLBC_decode.c                   | 27 +++++++++----------
 libs/ilbc/src/iLBC_encode.c                   | 16 +++++------
 libs/spandsp/src/super_tone_rx.c              |  2 +-
 libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c |  3 ++-
 .../unimrcp/libs/mpf/src/mpf_dtmf_generator.c |  3 ++-
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/libs/ilbc/src/iLBC_decode.c b/libs/ilbc/src/iLBC_decode.c
index ddc164bed8..7eb63f512a 100644
--- a/libs/ilbc/src/iLBC_decode.c
+++ b/libs/ilbc/src/iLBC_decode.c
@@ -188,7 +188,7 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst,  /* (i/o) the decoder stat
 
         /* setup memory */
         memset(mem, 0, (CB_MEML - iLBCdec_inst->state_short_len)*sizeof(float));
-        memcpy(mem + CB_MEML - iLBCdec_inst->state_short_len,
+        memcpy(&mem[CB_MEML - iLBCdec_inst->state_short_len],
                decresidual + start_pos,
                iLBCdec_inst->state_short_len*sizeof(float));
 
@@ -239,8 +239,8 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst,  /* (i/o) the decoder stat
     if (Nfor > 0)
     {
         /* Setup memory */
-        memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-        memcpy(mem + CB_MEML - STATE_LEN, decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
+        memset(mem, 0, (CB_MEML - STATE_LEN)*sizeof(float));
+        memcpy(&mem[CB_MEML - STATE_LEN], decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
 
         /* Loop over sub-frames to encode */
         for (subframe = 0;  subframe < Nfor;  subframe++)
@@ -255,10 +255,10 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst,  /* (i/o) the decoder stat
                          CB_NSTAGES);
 
             /* Update memory */
-            memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float));
-            memcpy(mem + CB_MEML-SUBL,
-                   &decresidual[(start + 1 + subframe)*SUBL],
-                   SUBL*sizeof(float));
+            memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
+            memmove(&mem[CB_MEML - SUBL],
+                    &decresidual[(start + 1 + subframe)*SUBL],
+                    SUBL*sizeof(float));
 
             subcount++;
         }
@@ -291,10 +291,10 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst,  /* (i/o) the decoder stat
                          CB_NSTAGES);
 
             /* Update memory */
-            memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float));
-            memcpy(mem + CB_MEML - SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
+            memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
+            memmove(&mem[CB_MEML - SUBL],
+                    &reverseDecresidual[subframe*SUBL],
+                    SUBL*sizeof(float));
 
             subcount++;
         }
@@ -332,7 +332,6 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
     float cc;
     float maxcc;
     int idxVec[STATE_LEN];
-    int check;
     int gain_index[NASUB_MAX*CB_NSTAGES];
     int extra_gain_index[CB_NSTAGES];
     int cb_index[CB_NSTAGES*NASUB_MAX];
@@ -452,7 +451,7 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
 
             /* Decode the LSF */
             SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
-            check = LSF_check(lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst->lpc_n);
+            LSF_check(lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst->lpc_n);
             DecoderInterpolateLSF(syntdenum, weightdenum, lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst);
 
             Decode(iLBCdec_inst,
@@ -499,7 +498,7 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
 
         order_plus_one = ILBC_LPC_FILTERORDER + 1;
         for (i = 0;  i < iLBCdec_inst->nsub;  i++)
-            memcpy(syntdenum + (i*order_plus_one), PLClpc, order_plus_one*sizeof(float));
+            memcpy(&syntdenum[i*order_plus_one], PLClpc, order_plus_one*sizeof(float));
     }
 
     if (iLBCdec_inst->use_enhancer == 1)
diff --git a/libs/ilbc/src/iLBC_encode.c b/libs/ilbc/src/iLBC_encode.c
index 5330d89643..44c8166f00 100644
--- a/libs/ilbc/src/iLBC_encode.c
+++ b/libs/ilbc/src/iLBC_encode.c
@@ -195,7 +195,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
         /* Setup memory */
 
         memset(mem, 0, (CB_MEML - iLBCenc_inst->state_short_len)*sizeof(float));
-        memcpy(mem + CB_MEML - iLBCenc_inst->state_short_len, decresidual + start_pos, iLBCenc_inst->state_short_len*sizeof(float));
+        memcpy(&mem[CB_MEML - iLBCenc_inst->state_short_len], &decresidual[start_pos], iLBCenc_inst->state_short_len*sizeof(float));
         memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
 
         /* Encode sub-frames */
@@ -272,7 +272,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
     {
         /* Setup memory */
         memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-        memcpy(mem + CB_MEML - STATE_LEN, decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
+        memcpy(&mem[CB_MEML - STATE_LEN], decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
         memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
 
         /* Loop over sub-frames to encode */
@@ -301,8 +301,8 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
                          CB_NSTAGES);
 
             /* Update memory */
-            memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-            memcpy(mem + CB_MEML - SUBL, &decresidual[(start + 1 + subframe)*SUBL], SUBL*sizeof(float));
+            memmove(mem, &mem[SUBL], (CB_MEML-SUBL)*sizeof(float));
+            memmove(&mem[CB_MEML - SUBL], &decresidual[(start + 1 + subframe)*SUBL], SUBL*sizeof(float));
             memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
             subcount++;
         }
@@ -357,10 +357,10 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
                          CB_NSTAGES);
 
             /* Update memory */
-            memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float));
-            memcpy(mem + CB_MEML - SUBL,
-                   &reverseDecresidual[subframe*SUBL],
-                   SUBL*sizeof(float));
+            memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
+            memmove(&mem[CB_MEML - SUBL],
+                    &reverseDecresidual[subframe*SUBL],
+                    SUBL*sizeof(float));
             memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
 
             subcount++;
diff --git a/libs/spandsp/src/super_tone_rx.c b/libs/spandsp/src/super_tone_rx.c
index eabebe6a30..a6324f91bf 100644
--- a/libs/spandsp/src/super_tone_rx.c
+++ b/libs/spandsp/src/super_tone_rx.c
@@ -400,7 +400,7 @@ static void super_tone_chunk(super_tone_rx_state_t *s)
                                     s->segments[9].f2,
                                     s->segments[9].min_duration*SUPER_TONE_BINS/8);
             }
-            memcpy (&s->segments[0], &s->segments[1], 9*sizeof(s->segments[0]));
+            memmove(&s->segments[0], &s->segments[1], 9*sizeof(s->segments[0]));
             s->segments[9].f1 = k1;
             s->segments[9].f2 = k2;
             s->segments[9].min_duration = 1;
diff --git a/libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c b/libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c
index f22da57a8d..889416a3f2 100644
--- a/libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c
+++ b/libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c
@@ -142,7 +142,8 @@ MPF_DECLARE(char) mpf_dtmf_detector_digit_get(struct mpf_dtmf_detector_t *detect
 	apr_thread_mutex_lock(detector->mutex);
 	digit = detector->buf[0];
 	if (digit) {
-		strcpy(detector->buf, detector->buf + 1);
+        /* This used to be a strcpy(), but that can give overlapping buffer issues */
+		memmove(detector->buf, &detector->buf[1], strlen(&detector->buf[1]) + 1);
 		detector->digits--;
 	}
 	apr_thread_mutex_unlock(detector->mutex);
diff --git a/libs/unimrcp/libs/mpf/src/mpf_dtmf_generator.c b/libs/unimrcp/libs/mpf/src/mpf_dtmf_generator.c
index a31240be4a..ee4072e8a8 100644
--- a/libs/unimrcp/libs/mpf/src/mpf_dtmf_generator.c
+++ b/libs/unimrcp/libs/mpf/src/mpf_dtmf_generator.c
@@ -209,7 +209,8 @@ MPF_DECLARE(apt_bool_t) mpf_dtmf_generator_put_frame(
 		/* Get next valid digit from queue */
 		do {
 			generator->event_id = (apr_byte_t) mpf_dtmf_char_to_event_id(*generator->queue);
-			strcpy(generator->queue, generator->queue + 1);
+            /* This used to be a strcpy(), but that can give overlapping buffer issues */
+			memmove(generator->queue, &generator->queue[1], strlen(&generator->queue[1]) + 1);
 		} while (*generator->queue && (generator->event_id > DTMF_EVENT_ID_MAX));
 		/* Reset state */
 		if (generator->event_id <= DTMF_EVENT_ID_MAX) {

From 3b8bc35bd9876fbdcfa285b102d4f8ef2a5afb27 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 10:51:42 +0800
Subject: [PATCH 068/130] More fixes for Coverity issues

---
 .../src/spandsp/private/super_tone_tx.h       | 10 +++----
 libs/spandsp/src/spandsp/super_tone_tx.h      |  3 ++
 libs/spandsp/src/spandsp/vector_int.h         | 18 ++++++++++++
 libs/spandsp/src/super_tone_tx.c              | 17 +++++++----
 libs/spandsp/src/time_scale.c                 | 29 ++++++++++---------
 .../tests/t81_t82_arith_coding_tests.c        |  2 +-
 6 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/libs/spandsp/src/spandsp/private/super_tone_tx.h b/libs/spandsp/src/spandsp/private/super_tone_tx.h
index b6efced965..cec758026d 100644
--- a/libs/spandsp/src/spandsp/private/super_tone_tx.h
+++ b/libs/spandsp/src/spandsp/private/super_tone_tx.h
@@ -28,7 +28,7 @@
 
 struct super_tone_tx_step_s
 {
-    tone_gen_tone_descriptor_t tone[4];
+    tone_gen_tone_descriptor_t tone[SUPER_TONE_TX_MAX_TONES];
     int tone_on;
     int length;
     int cycles;
@@ -38,12 +38,12 @@ struct super_tone_tx_step_s
 
 struct super_tone_tx_state_s
 {
-    tone_gen_tone_descriptor_t tone[4];
-    uint32_t phase[4];
+    tone_gen_tone_descriptor_t tone[SUPER_TONE_TX_MAX_TONES];
+    uint32_t phase[SUPER_TONE_TX_MAX_TONES];
     int current_position;
     int level;
-    super_tone_tx_step_t *levels[4];
-    int cycles[4];
+    super_tone_tx_step_t *levels[SUPER_TONE_TX_MAX_LEVELS];
+    int cycles[SUPER_TONE_TX_MAX_LEVELS];
 };
 
 #endif
diff --git a/libs/spandsp/src/spandsp/super_tone_tx.h b/libs/spandsp/src/spandsp/super_tone_tx.h
index 55b8d670f0..879319ae47 100644
--- a/libs/spandsp/src/spandsp/super_tone_tx.h
+++ b/libs/spandsp/src/spandsp/super_tone_tx.h
@@ -39,6 +39,9 @@ complex cadence patterns.
 
 */
 
+#define SUPER_TONE_TX_MAX_LEVELS    4
+#define SUPER_TONE_TX_MAX_TONES     4
+
 typedef struct super_tone_tx_step_s super_tone_tx_step_t;
 
 typedef struct super_tone_tx_state_s super_tone_tx_state_t;
diff --git a/libs/spandsp/src/spandsp/vector_int.h b/libs/spandsp/src/spandsp/vector_int.h
index daec30670e..775d525c86 100644
--- a/libs/spandsp/src/spandsp/vector_int.h
+++ b/libs/spandsp/src/spandsp/vector_int.h
@@ -49,6 +49,24 @@ static __inline__ void vec_copyi32(int32_t z[], const int32_t x[], int n)
 }
 /*- End of function --------------------------------------------------------*/
 
+static __inline__ void vec_movei(int z[], const int x[], int n)
+{
+    memmove(z, x, n*sizeof(z[0]));
+}
+/*- End of function --------------------------------------------------------*/
+
+static __inline__ void vec_movei16(int16_t z[], const int16_t x[], int n)
+{
+    memmove(z, x, n*sizeof(z[0]));
+}
+/*- End of function --------------------------------------------------------*/
+
+static __inline__ void vec_movei32(int32_t z[], const int32_t x[], int n)
+{
+    memmove(z, x, n*sizeof(z[0]));
+}
+/*- End of function --------------------------------------------------------*/
+
 static __inline__ void vec_zeroi(int z[], int n)
 {
     memset(z, 0, n*sizeof(z[0]));
diff --git a/libs/spandsp/src/super_tone_tx.c b/libs/spandsp/src/super_tone_tx.c
index 5b8ab4303d..cd6ac8290e 100644
--- a/libs/spandsp/src/super_tone_tx.c
+++ b/libs/spandsp/src/super_tone_tx.c
@@ -170,7 +170,7 @@ SPAN_DECLARE(int) super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max
     float xamp;
     super_tone_tx_step_t *tree;
 
-    if (s->level < 0  ||  s->level > 3)
+    if (s->level < 0  ||  s->level >= SUPER_TONE_TX_MAX_LEVELS)
         return 0;
     samples = 0;
     tree = s->levels[s->level];
@@ -182,7 +182,7 @@ SPAN_DECLARE(int) super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max
             if (s->current_position == 0)
             {
                 /* New step - prepare the tone generator */
-                for (i = 0;  i < 4;  i++)
+                for (i = 0;  i < SUPER_TONE_TX_MAX_TONES;  i++)
                     s->tone[i] = tree->tone[i];
             }
             len = tree->length - s->current_position;
@@ -216,7 +216,7 @@ SPAN_DECLARE(int) super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max
                 for (limit = len + samples;  samples < limit;  samples++)
                 {
                     xamp = 0.0f;
-                    for (i = 0;  i < 4;  i++)
+                    for (i = 0;  i < SUPER_TONE_TX_MAX_TONES;  i++)
                     {
                         if (s->tone[i].phase_rate == 0)
                             break;
@@ -251,9 +251,14 @@ SPAN_DECLARE(int) super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max
         /* Nesting has priority... */
         if (tree->nest)
         {
-            tree = tree->nest;
-            s->levels[++s->level] = tree;
-            s->cycles[s->level] = tree->cycles;
+            if (s->level < SUPER_TONE_TX_MAX_LEVELS - 1)
+            {
+                /* TODO: We have stopped an over-range value being used, but we really
+                         ought to deal with the condition properly. */
+                tree = tree->nest;
+                s->levels[++s->level] = tree;
+                s->cycles[s->level] = tree->cycles;
+            }
         }
         else
         {
diff --git a/libs/spandsp/src/time_scale.c b/libs/spandsp/src/time_scale.c
index c8b6b23825..5337e4ad0c 100644
--- a/libs/spandsp/src/time_scale.c
+++ b/libs/spandsp/src/time_scale.c
@@ -52,8 +52,9 @@
 #include "spandsp/telephony.h"
 #include "spandsp/alloc.h"
 #include "spandsp/fast_convert.h"
-#include "spandsp/time_scale.h"
+#include "spandsp/vector_int.h"
 #include "spandsp/saturated.h"
+#include "spandsp/time_scale.h"
 
 #include "spandsp/private/time_scale.h"
 
@@ -190,46 +191,46 @@ SPAN_DECLARE(int) time_scale(time_scale_state_t *s, int16_t out[], int16_t in[],
     if (s->fill + len < s->buf_len)
     {
         /* Cannot continue without more samples */
-        memcpy(&s->buf[s->fill], in, sizeof(int16_t)*len);
+        vec_copyi16(&s->buf[s->fill], in, len);
         s->fill += len;
         return out_len;
     }
     k = s->buf_len - s->fill;
-    memcpy(&s->buf[s->fill], in, sizeof(int16_t)*k);
+    vec_copyi16(&s->buf[s->fill], in, k);
     in_len += k;
     s->fill = s->buf_len;
     while (s->fill == s->buf_len)
     {
         while (s->lcp >= s->buf_len)
         {
-            memcpy(&out[out_len], s->buf, sizeof(int16_t)*s->buf_len);
+            vec_copyi16(&out[out_len], s->buf, s->buf_len);
             out_len += s->buf_len;
             if (len - in_len < s->buf_len)
             {
                 /* Cannot continue without more samples */
-                memcpy(s->buf, &in[in_len], sizeof(int16_t)*(len - in_len));
+                vec_copyi16(s->buf, &in[in_len], len - in_len);
                 s->fill = len - in_len;
                 s->lcp -= s->buf_len;
                 return out_len;
             }
-            memcpy(s->buf, &in[in_len], sizeof(int16_t)*s->buf_len);
+            vec_copyi16(s->buf, &in[in_len], s->buf_len);
             in_len += s->buf_len;
             s->lcp -= s->buf_len;
         }
         if (s->lcp > 0)
         {
-            memcpy(&out[out_len], s->buf, sizeof(int16_t)*s->lcp);
+            vec_copyi16(&out[out_len], s->buf, s->lcp);
             out_len += s->lcp;
-            memmove(s->buf, &s->buf[s->lcp], sizeof(int16_t)*(s->buf_len - s->lcp));
+            vec_movei16(s->buf, &s->buf[s->lcp], s->buf_len - s->lcp);
             if (len - in_len < s->lcp)
             {
                 /* Cannot continue without more samples */
-                memcpy(&s->buf[s->buf_len - s->lcp], &in[in_len], sizeof(int16_t)*(len - in_len));
+                vec_copyi16(&s->buf[s->buf_len - s->lcp], &in[in_len], len - in_len);
                 s->fill = s->buf_len - s->lcp + len - in_len;
                 s->lcp = 0;
                 return out_len;
             }
-            memcpy(&s->buf[s->buf_len - s->lcp], &in[in_len], sizeof(int16_t)*s->lcp);
+            vec_copyi16(&s->buf[s->buf_len - s->lcp], &in[in_len], s->lcp);
             in_len += s->lcp;
             s->lcp = 0;
         }
@@ -259,21 +260,21 @@ SPAN_DECLARE(int) time_scale(time_scale_state_t *s, int16_t out[], int16_t in[],
             {
                 /* Speed up - drop a chunk of data */
                 overlap_add(s->buf, &s->buf[pitch], pitch);
-                memcpy(&s->buf[pitch], &s->buf[2*pitch], sizeof(int16_t)*(s->buf_len - 2*pitch));
+                vec_copyi16(&s->buf[pitch], &s->buf[2*pitch], s->buf_len - 2*pitch);
                 if (len - in_len < pitch)
                 {
                     /* Cannot continue without more samples */
-                    memcpy(&s->buf[s->buf_len - pitch], &in[in_len], sizeof(int16_t)*(len - in_len));
+                    vec_copyi16(&s->buf[s->buf_len - pitch], &in[in_len], len - in_len);
                     s->fill += (len - in_len - pitch);
                     return out_len;
                 }
-                memcpy(&s->buf[s->buf_len - pitch], &in[in_len], sizeof(int16_t)*pitch);
+                vec_copyi16(&s->buf[s->buf_len - pitch], &in[in_len], pitch);
                 in_len += pitch;
             }
             else
             {
                 /* Slow down - insert a chunk of data */
-                memcpy(&out[out_len], s->buf, sizeof(int16_t)*pitch);
+                vec_copyi16(&out[out_len], s->buf, pitch);
                 out_len += pitch;
                 overlap_add(&s->buf[pitch], s->buf, pitch);
             }
diff --git a/libs/spandsp/tests/t81_t82_arith_coding_tests.c b/libs/spandsp/tests/t81_t82_arith_coding_tests.c
index 84a61a5df1..7df59567ea 100644
--- a/libs/spandsp/tests/t81_t82_arith_coding_tests.c
+++ b/libs/spandsp/tests/t81_t82_arith_coding_tests.c
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
     }
     printf("Test passed\n");
     t81_t82_arith_encode_free(se);
-    t81_t82_arith_encode_free(sd);
+    t81_t82_arith_decode_free(sd);
     printf("Tests passed\n");
     return 0;
 }

From e5cad4d7d48d14edaf20e0e1006ed50ac24458a7 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 11:07:22 +0800
Subject: [PATCH 069/130] More Coverity related cleanups

---
 libs/spandsp/src/data_modems.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libs/spandsp/src/data_modems.c b/libs/spandsp/src/data_modems.c
index 43f3743492..44af2ae400 100644
--- a/libs/spandsp/src/data_modems.c
+++ b/libs/spandsp/src/data_modems.c
@@ -466,16 +466,8 @@ SPAN_DECLARE(void) data_modems_set_modem_type(data_modems_state_t *s, int which,
         s->rx_user_data = &s->modems.fsk.rx;
         s->tx_handler = (span_tx_handler_t) &fsk_tx;
         s->tx_user_data = &s->modems.fsk.tx;
-        if (s->calling_party)
-        {
-            fsk_rx_spec = &preset_fsk_specs[FSK_BELL202];
-            fsk_tx_spec = &preset_fsk_specs[FSK_BELL202];
-        }
-        else
-        {
-            fsk_rx_spec = &preset_fsk_specs[FSK_BELL202];
-            fsk_tx_spec = &preset_fsk_specs[FSK_BELL202];
-        }
+        fsk_rx_spec = &preset_fsk_specs[FSK_BELL202];
+        fsk_tx_spec = &preset_fsk_specs[FSK_BELL202];
         fsk_rx_init(&s->modems.fsk.rx, fsk_rx_spec, FSK_FRAME_MODE_SYNC, s->put_bit, s->put_user_data);
         fsk_tx_init(&s->modems.fsk.tx, fsk_tx_spec, s->get_bit, s->get_user_data);
         break;

From 47e588728809360c73cc8f89c8364a0d6598c731 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 11:25:22 +0800
Subject: [PATCH 070/130] Tweaks to the V.17 modem

---
 libs/spandsp/src/v17rx.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/libs/spandsp/src/v17rx.c b/libs/spandsp/src/v17rx.c
index 384d460fb3..aea4e5913d 100644
--- a/libs/spandsp/src/v17rx.c
+++ b/libs/spandsp/src/v17rx.c
@@ -103,9 +103,9 @@
 /*! The nominal baud or symbol rate */
 #define BAUD_RATE                       2400
 /*! The adaption rate coefficient for the equalizer during initial training */
-#define EQUALIZER_DELTA                 0.21f
-/*! The adaption rate coefficient for the equalizer during continuous fine tuning */
-#define EQUALIZER_SLOW_ADAPT_RATIO      0.1f
+#define EQUALIZER_FAST_ADAPTION_DELTA   (0.21f/V17_EQUALIZER_LEN)
+/*! The adaption rate coefficient for the equalizer during fine tuning */
+#define EQUALIZER_SLOW_ADAPTION_DELTA   (0.1f*EQUALIZER_FAST_ADAPTION_DELTA)
 
 /* Segments of the training sequence */
 /*! The length of training segment 1, in symbols */
@@ -236,11 +236,11 @@ static void equalizer_restore(v17_rx_state_t *s)
 #if defined(SPANDSP_USE_FIXED_POINTx)
     cvec_copyi16(s->eq_coeff, s->eq_coeff_save, V17_EQUALIZER_LEN);
     cvec_zeroi16(s->eq_buf, V17_EQUALIZER_LEN);
-    s->eq_delta = 32768.0f*EQUALIZER_SLOW_ADAPT_RATIO*EQUALIZER_DELTA/V17_EQUALIZER_LEN;
+    s->eq_delta = 32768.0f*EQUALIZER_SLOW_ADAPTION_DELTA;
 #else
     cvec_copyf(s->eq_coeff, s->eq_coeff_save, V17_EQUALIZER_LEN);
     cvec_zerof(s->eq_buf, V17_EQUALIZER_LEN);
-    s->eq_delta = EQUALIZER_SLOW_ADAPT_RATIO*EQUALIZER_DELTA/V17_EQUALIZER_LEN;
+    s->eq_delta = EQUALIZER_SLOW_ADAPTION_DELTA;
 #endif
 
     s->eq_put_step = RX_PULSESHAPER_COEFF_SETS*10/(3*2) - 1;
@@ -258,14 +258,14 @@ static void equalizer_reset(v17_rx_state_t *s)
     cvec_zeroi16(s->eq_coeff, V17_EQUALIZER_LEN);
     s->eq_coeff[V17_EQUALIZER_PRE_LEN] = x;
     cvec_zeroi16(s->eq_buf, V17_EQUALIZER_LEN);
-    s->eq_delta = 32768.0f*EQUALIZER_DELTA/V17_EQUALIZER_LEN;
+    s->eq_delta = 32768.0f*EQUALIZER_FAST_ADAPTION_DELTA;
 #else
     static const complexf_t x = {FP_CONSTELLATION_SCALE(3.0f), FP_CONSTELLATION_SCALE(0.0f)};
 
     cvec_zerof(s->eq_coeff, V17_EQUALIZER_LEN);
     s->eq_coeff[V17_EQUALIZER_PRE_LEN] = x;
     cvec_zerof(s->eq_buf, V17_EQUALIZER_LEN);
-    s->eq_delta = EQUALIZER_DELTA/V17_EQUALIZER_LEN;
+    s->eq_delta = EQUALIZER_FAST_ADAPTION_DELTA;
 #endif
 
     s->eq_put_step = RX_PULSESHAPER_COEFF_SETS*10/(3*2) - 1;
@@ -627,15 +627,6 @@ static __inline__ void symbol_sync(v17_rx_state_t *s)
     /* A little integration will now filter away much of the HF noise */
     s->baud_phase -= p;
     v = labs(s->baud_phase);
-    if (v > FP_SYNC_SCALE_32(100.0f))
-    {
-        i = (v > FP_SYNC_SCALE_32(1000.0f))  ?  15  :  1;
-        if (s->baud_phase < FP_SYNC_SCALE_32(0.0f))
-            i = -i;
-        //printf("v = %10.5f %5d - %f %f %d %d\n", v, i, p, s->baud_phase, s->total_baud_timing_correction);
-        s->eq_put_step += i;
-        s->total_baud_timing_correction += i;
-    }
 #else
     /* Cross correlate */
     v = s->symbol_sync_low[1]*s->symbol_sync_high[0]*SYNC_LOW_BAND_EDGE_COEFF_2
@@ -648,6 +639,7 @@ static __inline__ void symbol_sync(v17_rx_state_t *s)
     /* A little integration will now filter away much of the HF noise */
     s->baud_phase -= p;
     v = fabsf(s->baud_phase);
+#endif
     if (v > FP_SYNC_SCALE_32(100.0f))
     {
         i = (v > FP_SYNC_SCALE_32(1000.0f))  ?  15  :  1;
@@ -657,7 +649,6 @@ static __inline__ void symbol_sync(v17_rx_state_t *s)
         s->eq_put_step += i;
         s->total_baud_timing_correction += i;
     }
-#endif
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -747,7 +738,7 @@ static void process_half_baud(v17_rx_state_t *s, const complexf_t *sample)
                out is the phase. */
             /* Check if we just saw A or B */
             /* atan(1/3) = 18.433 degrees */
-            if ((uint32_t) (angle - s->last_angles[0]) < 0x80000000U)
+            if ((uint32_t) (angle - s->last_angles[0]) < (uint32_t) DDS_PHASE(180.0f))
             {
                 angle = s->last_angles[0];
                 s->last_angles[0] = DDS_PHASE(270.0f + 18.433f);
@@ -887,7 +878,7 @@ static void process_half_baud(v17_rx_state_t *s, const complexf_t *sample)
         {
             /* Now the equaliser adaption should be getting somewhere, slow it down, or it will never
                tune very well on a noisy signal. */
-            s->eq_delta *= EQUALIZER_SLOW_ADAPT_RATIO;
+            s->eq_delta = EQUALIZER_SLOW_ADAPTION_DELTA;
 #if defined(SPANDSP_USE_FIXED_POINTx)
             s->carrier_track_i = 1000;
 #else
@@ -1188,7 +1179,7 @@ static __inline__ int signal_detect(v17_rx_state_t *s, int16_t amp)
     {
         if (++s->low_samples > 120)
         {
-            power_meter_init(&(s->power), 4);
+            power_meter_init(&s->power, 4);
             s->high_sample = 0;
             s->low_samples = 0;
         }
@@ -1471,7 +1462,7 @@ SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, int short_trai
     s->trellis_ptr = 14;
 
     s->carrier_phase = 0;
-    power_meter_init(&(s->power), 4);
+    power_meter_init(&s->power, 4);
 
     if (s->short_train)
     {

From 720e7a23c42153e0a50943370622134ad754c894 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 11:40:34 +0800
Subject: [PATCH 071/130] Tweas to PLC

---
 libs/spandsp/src/plc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libs/spandsp/src/plc.c b/libs/spandsp/src/plc.c
index 52f4e24044..bc744c6240 100644
--- a/libs/spandsp/src/plc.c
+++ b/libs/spandsp/src/plc.c
@@ -46,6 +46,7 @@
 #include "spandsp/alloc.h"
 #include "spandsp/fast_convert.h"
 #include "spandsp/saturated.h"
+#include "spandsp/vector_int.h"
 #include "spandsp/plc.h"
 
 #include "spandsp/private/plc.h"
@@ -58,21 +59,21 @@ static void save_history(plc_state_t *s, int16_t *buf, int len)
     if (len >= PLC_HISTORY_LEN)
     {
         /* Just keep the last part of the new data, starting at the beginning of the buffer */
-        memcpy(s->history, &buf[len - PLC_HISTORY_LEN], sizeof(int16_t)*PLC_HISTORY_LEN);
+        vec_copyi16(s->history, &buf[len - PLC_HISTORY_LEN], PLC_HISTORY_LEN);
         s->buf_ptr = 0;
         return;
     }
     if (s->buf_ptr + len > PLC_HISTORY_LEN)
     {
         /* Wraps around - must break into two sections */
-        memcpy(&s->history[s->buf_ptr], buf, sizeof(int16_t)*(PLC_HISTORY_LEN - s->buf_ptr));
+        vec_copyi16(&s->history[s->buf_ptr], buf, PLC_HISTORY_LEN - s->buf_ptr);
         len -= (PLC_HISTORY_LEN - s->buf_ptr);
-        memcpy(s->history, &buf[PLC_HISTORY_LEN - s->buf_ptr], sizeof(int16_t)*len);
+        vec_copyi16(s->history, &buf[PLC_HISTORY_LEN - s->buf_ptr], len);
         s->buf_ptr = len;
         return;
     }
     /* Can use just one section */
-    memcpy(&s->history[s->buf_ptr], buf, sizeof(int16_t)*len);
+    vec_copyi16(&s->history[s->buf_ptr], buf, len);
     s->buf_ptr += len;
 }
 /*- End of function --------------------------------------------------------*/
@@ -83,9 +84,9 @@ static __inline__ void normalise_history(plc_state_t *s)
 
     if (s->buf_ptr == 0)
         return;
-    memcpy(tmp, s->history, sizeof(int16_t)*s->buf_ptr);
-    memmove(s->history, &s->history[s->buf_ptr], sizeof(int16_t)*(PLC_HISTORY_LEN - s->buf_ptr));
-    memcpy(&s->history[PLC_HISTORY_LEN - s->buf_ptr], tmp, sizeof(int16_t)*s->buf_ptr);
+    vec_copyi16(tmp, s->history, s->buf_ptr);
+    vec_copyi16(s->history, &s->history[s->buf_ptr], PLC_HISTORY_LEN - s->buf_ptr);
+    vec_copyi16(&s->history[PLC_HISTORY_LEN - s->buf_ptr], tmp, s->buf_ptr);
     s->buf_ptr = 0;
 }
 /*- End of function --------------------------------------------------------*/

From 0c32ae8ca0a26ebec4359d754d340f0322004112 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 22 Jul 2014 12:06:50 +0800
Subject: [PATCH 072/130] Coverity cleanups for iLBC

---
 libs/ilbc/src/filter.c      |   7 +-
 libs/ilbc/src/iLBC_decode.c | 138 +++++++++++++++++-------------------
 libs/ilbc/src/iLBC_encode.c | 115 +++++++++++++++---------------
 3 files changed, 129 insertions(+), 131 deletions(-)

diff --git a/libs/ilbc/src/filter.c b/libs/ilbc/src/filter.c
index bc971d2992..85f300db97 100644
--- a/libs/ilbc/src/filter.c
+++ b/libs/ilbc/src/filter.c
@@ -134,7 +134,7 @@ void DownSample(const float *In,        /* (i) input samples */
 
         o = 0.0f;
 
-        stop = (i < FILTERORDER_DS)  ?  i + 1  :  FILTERORDER_DS;
+        stop = (i < FILTERORDER_DS)  ?  (i + 1)  :  FILTERORDER_DS;
 
         for (j = 0;  j < stop;  j++)
             o += *Coef_ptr++ * (*In_ptr--);
@@ -151,14 +151,13 @@ void DownSample(const float *In,        /* (i) input samples */
         if (i<lengthIn)
         {
             Coef_ptr = &Coef[0];
-            In_ptr = &In[i];
             for (j = 0;  j < FILTERORDER_DS;  j++)
                 o += *Coef_ptr++ * (*Out_ptr--);
         }
         else
         {
-            Coef_ptr = &Coef[i-lengthIn];
-            In_ptr = &In[lengthIn-1];
+            Coef_ptr = &Coef[i - lengthIn];
+            In_ptr = &In[lengthIn - 1];
             for (j = 0;  j < FILTERORDER_DS - (i - lengthIn);  j++)
                 o += *Coef_ptr++ * (*In_ptr--);
         }
diff --git a/libs/ilbc/src/iLBC_decode.c b/libs/ilbc/src/iLBC_decode.c
index 7eb63f512a..b9c21aa598 100644
--- a/libs/ilbc/src/iLBC_decode.c
+++ b/libs/ilbc/src/iLBC_decode.c
@@ -66,77 +66,6 @@
 #endif
 #endif
 
-/*----------------------------------------------------------------*
- *  Initiation of decoder instance.
- *---------------------------------------------------------------*/
-
-ilbc_decode_state_t *ilbc_decode_init(ilbc_decode_state_t *iLBCdec_inst,   /* (i/o) Decoder instance */
-                                      int mode,                            /* (i) frame size mode */
-                                      int use_enhancer)                    /* (i) 1 to use enhancer
-                                                                                  0 to run without enhancer */
-{
-    int i;
-
-    iLBCdec_inst->mode = mode;
-
-    if (mode == 30)
-    {
-        iLBCdec_inst->blockl = ILBC_BLOCK_LEN_30MS;
-        iLBCdec_inst->nsub = NSUB_30MS;
-        iLBCdec_inst->nasub = NASUB_30MS;
-        iLBCdec_inst->lpc_n = LPC_N_30MS;
-        iLBCdec_inst->no_of_bytes = ILBC_NO_OF_BYTES_30MS;
-        iLBCdec_inst->state_short_len = STATE_SHORT_LEN_30MS;
-        /* ULP init */
-        iLBCdec_inst->ULP_inst = &ULP_30msTbl;
-    }
-    else if (mode == 20)
-    {
-        iLBCdec_inst->blockl = ILBC_BLOCK_LEN_20MS;
-        iLBCdec_inst->nsub = NSUB_20MS;
-        iLBCdec_inst->nasub = NASUB_20MS;
-        iLBCdec_inst->lpc_n = LPC_N_20MS;
-        iLBCdec_inst->no_of_bytes = ILBC_NO_OF_BYTES_20MS;
-        iLBCdec_inst->state_short_len = STATE_SHORT_LEN_20MS;
-        /* ULP init */
-        iLBCdec_inst->ULP_inst = &ULP_20msTbl;
-    }
-    else
-    {
-        return NULL;
-    }
-
-    memset(iLBCdec_inst->syntMem, 0, ILBC_LPC_FILTERORDER*sizeof(float));
-    memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
-
-    memset(iLBCdec_inst->old_syntdenum,
-           0,
-           ((ILBC_LPC_FILTERORDER + 1)*ILBC_NUM_SUB_MAX)*sizeof(float));
-    for (i = 0;  i < ILBC_NUM_SUB_MAX;  i++)
-        iLBCdec_inst->old_syntdenum[i*(ILBC_LPC_FILTERORDER + 1)] = 1.0f;
-
-    iLBCdec_inst->last_lag = 20;
-
-    iLBCdec_inst->prevLag = 120;
-    iLBCdec_inst->per = 0.0;
-    iLBCdec_inst->consPLICount = 0;
-    iLBCdec_inst->prevPLI = 0;
-    iLBCdec_inst->prevLpc[0] = 1.0f;
-    memset(iLBCdec_inst->prevLpc + 1, 0, ILBC_LPC_FILTERORDER*sizeof(float));
-    memset(iLBCdec_inst->prevResidual, 0, ILBC_BLOCK_LEN_MAX*sizeof(float));
-    iLBCdec_inst->seed = 777;
-    memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
-
-    iLBCdec_inst->use_enhancer = use_enhancer;
-    memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
-    for (i = 0;  i < ENH_NBLOCKS_TOT;  i++)
-        iLBCdec_inst->enh_period[i] = 40.0f;
-
-    iLBCdec_inst->prev_enh_pl = 0;
-
-    return iLBCdec_inst;
-}
-
 /*----------------------------------------------------------------*
  *  frame residual decoder function (subrutine to iLBC_decode)
  *---------------------------------------------------------------*/
@@ -648,3 +577,70 @@ int ilbc_fillin(ilbc_decode_state_t *s,     /* (i/o) the decoder state structure
     }
     return i;
 }
+
+ilbc_decode_state_t *ilbc_decode_init(ilbc_decode_state_t *iLBCdec_inst,   /* (i/o) Decoder instance */
+                                      int mode,                            /* (i) frame size mode */
+                                      int use_enhancer)                    /* (i) 1 to use enhancer
+                                                                                  0 to run without enhancer */
+{
+    int i;
+
+    iLBCdec_inst->mode = mode;
+
+    if (mode == 30)
+    {
+        iLBCdec_inst->blockl = ILBC_BLOCK_LEN_30MS;
+        iLBCdec_inst->nsub = NSUB_30MS;
+        iLBCdec_inst->nasub = NASUB_30MS;
+        iLBCdec_inst->lpc_n = LPC_N_30MS;
+        iLBCdec_inst->no_of_bytes = ILBC_NO_OF_BYTES_30MS;
+        iLBCdec_inst->state_short_len = STATE_SHORT_LEN_30MS;
+        /* ULP init */
+        iLBCdec_inst->ULP_inst = &ULP_30msTbl;
+    }
+    else if (mode == 20)
+    {
+        iLBCdec_inst->blockl = ILBC_BLOCK_LEN_20MS;
+        iLBCdec_inst->nsub = NSUB_20MS;
+        iLBCdec_inst->nasub = NASUB_20MS;
+        iLBCdec_inst->lpc_n = LPC_N_20MS;
+        iLBCdec_inst->no_of_bytes = ILBC_NO_OF_BYTES_20MS;
+        iLBCdec_inst->state_short_len = STATE_SHORT_LEN_20MS;
+        /* ULP init */
+        iLBCdec_inst->ULP_inst = &ULP_20msTbl;
+    }
+    else
+    {
+        return NULL;
+    }
+
+    memset(iLBCdec_inst->syntMem, 0, ILBC_LPC_FILTERORDER*sizeof(float));
+    memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
+
+    memset(iLBCdec_inst->old_syntdenum,
+           0,
+           ((ILBC_LPC_FILTERORDER + 1)*ILBC_NUM_SUB_MAX)*sizeof(float));
+    for (i = 0;  i < ILBC_NUM_SUB_MAX;  i++)
+        iLBCdec_inst->old_syntdenum[i*(ILBC_LPC_FILTERORDER + 1)] = 1.0f;
+
+    iLBCdec_inst->last_lag = 20;
+
+    iLBCdec_inst->prevLag = 120;
+    iLBCdec_inst->per = 0.0;
+    iLBCdec_inst->consPLICount = 0;
+    iLBCdec_inst->prevPLI = 0;
+    iLBCdec_inst->prevLpc[0] = 1.0f;
+    memset(iLBCdec_inst->prevLpc + 1, 0, ILBC_LPC_FILTERORDER*sizeof(float));
+    memset(iLBCdec_inst->prevResidual, 0, ILBC_BLOCK_LEN_MAX*sizeof(float));
+    iLBCdec_inst->seed = 777;
+    memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
+
+    iLBCdec_inst->use_enhancer = use_enhancer;
+    memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
+    for (i = 0;  i < ENH_NBLOCKS_TOT;  i++)
+        iLBCdec_inst->enh_period[i] = 40.0f;
+
+    iLBCdec_inst->prev_enh_pl = 0;
+
+    return iLBCdec_inst;
+}
diff --git a/libs/ilbc/src/iLBC_encode.c b/libs/ilbc/src/iLBC_encode.c
index 44c8166f00..1a36575d50 100644
--- a/libs/ilbc/src/iLBC_encode.c
+++ b/libs/ilbc/src/iLBC_encode.c
@@ -46,46 +46,6 @@
  *  Initiation of encoder instance.
  *---------------------------------------------------------------*/
 
-ilbc_encode_state_t *ilbc_encode_init(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) Encoder instance */
-                                      int mode)                          /* (i) frame size mode */
-{
-    iLBCenc_inst->mode = mode;
-    if (mode == 30)
-    {
-        iLBCenc_inst->blockl = ILBC_BLOCK_LEN_30MS;
-        iLBCenc_inst->nsub = NSUB_30MS;
-        iLBCenc_inst->nasub = NASUB_30MS;
-        iLBCenc_inst->lpc_n = LPC_N_30MS;
-        iLBCenc_inst->no_of_bytes = ILBC_NO_OF_BYTES_30MS;
-        iLBCenc_inst->state_short_len = STATE_SHORT_LEN_30MS;
-        /* ULP init */
-        iLBCenc_inst->ULP_inst = &ULP_30msTbl;
-    }
-    else if (mode == 20)
-    {
-        iLBCenc_inst->blockl = ILBC_BLOCK_LEN_20MS;
-        iLBCenc_inst->nsub = NSUB_20MS;
-        iLBCenc_inst->nasub = NASUB_20MS;
-        iLBCenc_inst->lpc_n = LPC_N_20MS;
-        iLBCenc_inst->no_of_bytes = ILBC_NO_OF_BYTES_20MS;
-        iLBCenc_inst->state_short_len = STATE_SHORT_LEN_20MS;
-        /* ULP init */
-        iLBCenc_inst->ULP_inst = &ULP_20msTbl;
-    }
-    else
-    {
-        return NULL;
-    }
-
-    memset((*iLBCenc_inst).anaMem, 0, ILBC_LPC_FILTERORDER*sizeof(float));
-    memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
-    memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
-    memset((*iLBCenc_inst).lpc_buffer, 0, (LPC_LOOKBACK + ILBC_BLOCK_LEN_MAX)*sizeof(float));
-    memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
-
-    return iLBCenc_inst;
-}
-
 /*----------------------------------------------------------------*
  *  main encoder function
  *---------------------------------------------------------------*/
@@ -215,7 +175,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
         iCBConstruct(&decresidual[start_pos + iLBCenc_inst->state_short_len],
                      extra_cb_index,
                      extra_gain_index,
-                     mem + CB_MEML - stMemLTbl,
+                     &mem[CB_MEML - stMemLTbl],
                      stMemLTbl,
                      diff,
                      CB_NSTAGES);
@@ -252,7 +212,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
         iCBConstruct(reverseDecresidual,
                      extra_cb_index,
                      extra_gain_index,
-                     mem + CB_MEML - stMemLTbl,
+                     &mem[CB_MEML - stMemLTbl],
                      stMemLTbl,
                      diff,
                      CB_NSTAGES);
@@ -271,7 +231,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
     if (Nfor > 0)
     {
         /* Setup memory */
-        memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
+        memset(mem, 0, (CB_MEML - STATE_LEN)*sizeof(float));
         memcpy(&mem[CB_MEML - STATE_LEN], decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
         memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
 
@@ -280,10 +240,10 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
         {
             /* Encode sub-frame */
             iCBSearch(iLBCenc_inst,
-                      cb_index + subcount*CB_NSTAGES,
-                      gain_index + subcount*CB_NSTAGES,
+                      &cb_index[subcount*CB_NSTAGES],
+                      &gain_index[subcount*CB_NSTAGES],
                       &residual[(start + 1 + subframe)*SUBL],
-                      mem + CB_MEML-memLfTbl[subcount],
+                      &mem[CB_MEML - memLfTbl[subcount]],
                       memLfTbl[subcount],
                       SUBL,
                       CB_NSTAGES,
@@ -293,9 +253,9 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
 
             /* Construct decoded vector */
             iCBConstruct(&decresidual[(start + 1 + subframe)*SUBL],
-                         cb_index + subcount*CB_NSTAGES,
-                         gain_index + subcount*CB_NSTAGES,
-                         mem + CB_MEML - memLfTbl[subcount],
+                         &cb_index[subcount*CB_NSTAGES],
+                         &gain_index[subcount*CB_NSTAGES],
+                         &mem[CB_MEML - memLfTbl[subcount]],
                          memLfTbl[subcount],
                          SUBL,
                          CB_NSTAGES);
@@ -338,20 +298,23 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst,     /* (i/o) the
         for (subframe = 0;  subframe < Nback;  subframe++)
         {
             /* Encode sub-frame */
-            iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-                      gain_index + subcount*CB_NSTAGES,
+            iCBSearch(iLBCenc_inst,
+                      &cb_index[subcount*CB_NSTAGES],
+                      &gain_index[subcount*CB_NSTAGES],
                       &reverseResidual[subframe*SUBL],
-                      mem + CB_MEML - memLfTbl[subcount],
-                      memLfTbl[subcount], SUBL, CB_NSTAGES,
+                      &mem[CB_MEML - memLfTbl[subcount]],
+                      memLfTbl[subcount],
+                      SUBL,
+                      CB_NSTAGES,
                       &weightdenum[(start - 2 - subframe)*(ILBC_LPC_FILTERORDER + 1)],
                       weightState,
                       subcount + 1);
 
             /* Construct decoded vector */
             iCBConstruct(&reverseDecresidual[subframe*SUBL],
-                         cb_index + subcount*CB_NSTAGES,
-                         gain_index + subcount*CB_NSTAGES,
-                         mem + CB_MEML - memLfTbl[subcount],
+                         &cb_index[subcount*CB_NSTAGES],
+                         &gain_index[subcount*CB_NSTAGES],
+                         &mem[CB_MEML - memLfTbl[subcount]],
                          memLfTbl[subcount],
                          SUBL,
                          CB_NSTAGES);
@@ -515,3 +478,43 @@ int ilbc_encode(ilbc_encode_state_t *s,     /* (i/o) the general encoder state *
     }
     return j;
 }
+
+ilbc_encode_state_t *ilbc_encode_init(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) Encoder instance */
+                                      int mode)                          /* (i) frame size mode */
+{
+    iLBCenc_inst->mode = mode;
+    if (mode == 30)
+    {
+        iLBCenc_inst->blockl = ILBC_BLOCK_LEN_30MS;
+        iLBCenc_inst->nsub = NSUB_30MS;
+        iLBCenc_inst->nasub = NASUB_30MS;
+        iLBCenc_inst->lpc_n = LPC_N_30MS;
+        iLBCenc_inst->no_of_bytes = ILBC_NO_OF_BYTES_30MS;
+        iLBCenc_inst->state_short_len = STATE_SHORT_LEN_30MS;
+        /* ULP init */
+        iLBCenc_inst->ULP_inst = &ULP_30msTbl;
+    }
+    else if (mode == 20)
+    {
+        iLBCenc_inst->blockl = ILBC_BLOCK_LEN_20MS;
+        iLBCenc_inst->nsub = NSUB_20MS;
+        iLBCenc_inst->nasub = NASUB_20MS;
+        iLBCenc_inst->lpc_n = LPC_N_20MS;
+        iLBCenc_inst->no_of_bytes = ILBC_NO_OF_BYTES_20MS;
+        iLBCenc_inst->state_short_len = STATE_SHORT_LEN_20MS;
+        /* ULP init */
+        iLBCenc_inst->ULP_inst = &ULP_20msTbl;
+    }
+    else
+    {
+        return NULL;
+    }
+
+    memset((*iLBCenc_inst).anaMem, 0, ILBC_LPC_FILTERORDER*sizeof(float));
+    memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
+    memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl, ILBC_LPC_FILTERORDER*sizeof(float));
+    memset((*iLBCenc_inst).lpc_buffer, 0, (LPC_LOOKBACK + ILBC_BLOCK_LEN_MAX)*sizeof(float));
+    memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
+
+    return iLBCenc_inst;
+}

From 00573a95cc65b06b2fdec22602e1ff91ce577058 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 06:28:46 -0500
Subject: [PATCH 073/130] tweak

---
 build/Makefile.openbsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 88c129b375..504e031aea 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -14,7 +14,7 @@ OPENSSL=1.0.1h
 LIBEDIT=20140618-3.1
 
 freeswitch: has-git deps freeswitch.git/Makefile
-	AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake
+	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake
 
 freeswitch.git/Makefile: freeswitch.git/configure
 	cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(FSPREFIX)

From ad8c7bc6f1e74726a6ff6a853a844fa493ec7dfa Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 06:33:28 -0500
Subject: [PATCH 074/130] build curl too so it links against the correct ssl
 lib.

---
 build/Makefile.openbsd | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 504e031aea..ae5874d1af 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -12,6 +12,7 @@ FSPREFIX=/usr/local/freeswitch
 PREFIX=$(FSPREFIX)
 OPENSSL=1.0.1h
 LIBEDIT=20140618-3.1
+CURL=7.35.0
 
 freeswitch: has-git deps freeswitch.git/Makefile
 	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake
@@ -35,7 +36,7 @@ clean:
 has-git:
 	@git --version || pkg install git
 
-deps: libedit openssl
+deps: libedit openssl curl
 	@PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r $(PKG)
 
 openssl: openssl-$(OPENSSL)/Makefile
@@ -49,3 +50,10 @@ libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
 libedit-$(LIBEDIT):
 	(test -d $@) || (wget -4 -O $@.tar.gz http://thrysoee.dk/editline/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
+
+curl: curl-$(CURL)/.done
+curl-$(CURL)/.done: curl-$(CURL)
+curl-$(CURL):
+	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
+	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
+

From b3308dc72001f011a1c02b80f753234f8de6be1f Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 06:44:28 -0500
Subject: [PATCH 075/130] doh

---
 build/Makefile.openbsd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index ae5874d1af..00ff8b3f6b 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -10,6 +10,7 @@
 PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wget pcre speex libldns
 FSPREFIX=/usr/local/freeswitch
 PREFIX=$(FSPREFIX)
+DOWNLOAD=http://files.freeswitch.org/downloads/libs
 OPENSSL=1.0.1h
 LIBEDIT=20140618-3.1
 CURL=7.35.0
@@ -42,13 +43,13 @@ deps: libedit openssl curl
 openssl: openssl-$(OPENSSL)/Makefile
 openssl-$(OPENSSL)/Makefile: openssl-$(OPENSSL)
 openssl-$(OPENSSL):
-	(test -d $@) || (wget -4 -O $@.tar.gz http://www.openssl.org/source/$@.tar.gz && tar zxfv $@.tar.gz)
+	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./Configure --prefix=$(PREFIX) BSD-x86_64 shared && make && sudo make install)
 
 libedit: libedit-$(LIBEDIT)/Makefile
 libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)
 libedit-$(LIBEDIT):
-	(test -d $@) || (wget -4 -O $@.tar.gz http://thrysoee.dk/editline/$@.tar.gz && tar zxfv $@.tar.gz)
+	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
 
 curl: curl-$(CURL)/.done

From ff245eceb5824589e6c7aef828f85cfd9d089f45 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 06:52:13 -0500
Subject: [PATCH 076/130] fix has-git

---
 build/Makefile.openbsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 00ff8b3f6b..c35e33b345 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -35,7 +35,7 @@ clean:
 	(cd freeswitch.git && git clean -fdx && git reset --hard HEAD && git pull)
 
 has-git:
-	@git --version || pkg install git
+	@git --version || PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r git
 
 deps: libedit openssl curl
 	@PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r $(PKG)

From 407fb1a7dd4a92de6890b222caee893d89dd6b0b Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 07:25:43 -0500
Subject: [PATCH 077/130] NOT OpenBSD

---
 libs/spandsp/src/gsm0610_rpe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/spandsp/src/gsm0610_rpe.c b/libs/spandsp/src/gsm0610_rpe.c
index dbec0d24bb..509880a5c7 100644
--- a/libs/spandsp/src/gsm0610_rpe.c
+++ b/libs/spandsp/src/gsm0610_rpe.c
@@ -59,7 +59,7 @@
 static void weighting_filter(int16_t x[40],
                              const int16_t *e)      // signal [-5..0.39.44] IN)
 {
-#if defined(__GNUC__)  &&  defined(SPANDSP_USE_MMX)  &&  defined(__x86_64__)
+#if defined(__GNUC__)  &&  defined(SPANDSP_USE_MMX)  &&  defined(__x86_64__) && !defined(__OpenBSD__)
     /* Table 4.4   Coefficients of the weighting filter */
     /* This must be padded to a multiple of 4 for MMX to work */
     static const union

From e4bd2c3cd938416a2cab07c50c26a7aac6443d34 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 07:26:04 -0500
Subject: [PATCH 078/130] bump

---
 libs/spandsp/.update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/spandsp/.update b/libs/spandsp/.update
index 81f030be2b..59c2e311b5 100644
--- a/libs/spandsp/.update
+++ b/libs/spandsp/.update
@@ -1 +1 @@
-Thu Jun  5 22:07:01 CDT 2014
+Tue Jul 22 07:25:58 CDT 2014

From 78c07db88846e008910b03fbe0d33df0fcd2dd5e Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 07:27:38 -0500
Subject: [PATCH 079/130] Use LibreSSL on OpenBSD build, yes it does work

---
 build/Makefile.openbsd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index c35e33b345..49aa239ee4 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -11,7 +11,7 @@ PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wge
 FSPREFIX=/usr/local/freeswitch
 PREFIX=$(FSPREFIX)
 DOWNLOAD=http://files.freeswitch.org/downloads/libs
-OPENSSL=1.0.1h
+LIBRESSL=2.0.3
 LIBEDIT=20140618-3.1
 CURL=7.35.0
 
@@ -37,14 +37,14 @@ clean:
 has-git:
 	@git --version || PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r git
 
-deps: libedit openssl curl
+deps: libedit libressl curl
 	@PKG_PATH=http://openbsd.mirrors.pair.com/`uname -r`/packages/`machine -a`/ pkg_add -r $(PKG)
 
-openssl: openssl-$(OPENSSL)/Makefile
-openssl-$(OPENSSL)/Makefile: openssl-$(OPENSSL)
-openssl-$(OPENSSL):
+libressl: libressl-$(LIBRESSL)/Makefile
+libressl-$(LIBRESSL)/Makefile: libressl-$(LIBRESSL)
+libressl-$(LIBRESSL):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
-	(cd $@ && ./Configure --prefix=$(PREFIX) BSD-x86_64 shared && make && sudo make install)
+	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install)
 
 libedit: libedit-$(LIBEDIT)/Makefile
 libedit-$(LIBEDIT)/Makefile: libedit-$(LIBEDIT)

From aaddc4211cdbb03e5e692a967a9068b4747d0325 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 07:50:09 -0500
Subject: [PATCH 080/130] stop it with the system ssl for curl you pesky thing

---
 build/Makefile.openbsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 49aa239ee4..3ad18426cb 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -56,5 +56,6 @@ curl: curl-$(CURL)/.done
 curl-$(CURL)/.done: curl-$(CURL)
 curl-$(CURL):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
-	(cd $@ && ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
+	(rm -rf $(PREFIX)/lib/libcurl.*)
+	(cd $@ && PKG_CONFIG_PATH=/usr/local/freeswitch/lib/pkgconfig:$PKG_CONFIG_PATH LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath-link=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 

From a537d803728f844d50f4243a6b0861db0a02dccc Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Tue, 22 Jul 2014 05:59:54 +0000
Subject: [PATCH 081/130] Add new module: mod_prefix

mod_prefix is an in-memory data store optimized for fast lookups
according to the longest prefix match (LPM) rule.

Tables of key-value string pairs in JSON format can be loaded at
startup via configuration and at runtime via the API.

The implementation uses a bitwise trie (aka binary prefix tree), so
arbitrary string keys are supported.
---
 build/modules.conf.in                         |   1 +
 configure.ac                                  |   1 +
 debian/control-modules                        |   5 +
 docs/AUTHORS                                  |   2 +-
 src/mod/applications/mod_prefix/Makefile.am   |   9 +
 .../mod_prefix/conf/prefix.conf.xml           |   5 +
 src/mod/applications/mod_prefix/mod_prefix.c  | 278 ++++++++++++++++++
 src/mod/applications/mod_prefix/trie.c        | 113 +++++++
 src/mod/applications/mod_prefix/trie.h        |  40 +++
 9 files changed, 453 insertions(+), 1 deletion(-)
 create mode 100644 src/mod/applications/mod_prefix/Makefile.am
 create mode 100644 src/mod/applications/mod_prefix/conf/prefix.conf.xml
 create mode 100644 src/mod/applications/mod_prefix/mod_prefix.c
 create mode 100644 src/mod/applications/mod_prefix/trie.c
 create mode 100644 src/mod/applications/mod_prefix/trie.h

diff --git a/build/modules.conf.in b/build/modules.conf.in
index 7368cc8f01..44b386f151 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -30,6 +30,7 @@ applications/mod_httapi
 #applications/mod_nibblebill
 #applications/mod_oreka
 #applications/mod_osp
+#applications/mod_prefix
 #applications/mod_rad_auth
 #applications/mod_redis
 #applications/mod_rss
diff --git a/configure.ac b/configure.ac
index df70f63565..d255162dbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1459,6 +1459,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/applications/mod_nibblebill/Makefile
 		src/mod/applications/mod_oreka/Makefile
 		src/mod/applications/mod_osp/Makefile
+		src/mod/applications/mod_prefix/Makefile
 		src/mod/applications/mod_rad_auth/Makefile
 		src/mod/applications/mod_random/Makefile
 		src/mod/applications/mod_redis/Makefile
diff --git a/debian/control-modules b/debian/control-modules
index dce770f279..57b62dd6d1 100644
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -156,6 +156,11 @@ Description: Open Settlement Protocol
  This module adds support for the Open Settlement Protocol (OSP).
 Build-Depends: libosptk3-dev
 
+Module: applications/mod_prefix
+Description: Longest prefix match search
+ This module provides a data store with fast lookups by the longest
+ prefix match (LPM) rule.
+
 Module: applications/mod_rad_auth
 Description: RADIUS AA
  This module implements RADIUS Authentication and Authorization.
diff --git a/docs/AUTHORS b/docs/AUTHORS
index 495889c269..67925ca8c6 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -28,7 +28,7 @@ that much better:
  Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! 
  Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> 
  Ken Rice - <krice AT freeswitch.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there.
- Travis Cross <tc@traviscross.com> - git migration, Debian packaging, ZRTP integration, and many other improvements
+ Travis Cross <tc@traviscross.com> - git migration, Debian packaging, ZRTP integration, mod_prefix, and many other improvements
  Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks.
  Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups.
  Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements.
diff --git a/src/mod/applications/mod_prefix/Makefile.am b/src/mod/applications/mod_prefix/Makefile.am
new file mode 100644
index 0000000000..4c9ba6e2e2
--- /dev/null
+++ b/src/mod/applications/mod_prefix/Makefile.am
@@ -0,0 +1,9 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_prefix
+
+mod_LTLIBRARIES = mod_prefix.la
+mod_prefix_la_SOURCES  = mod_prefix.c trie.c
+mod_prefix_la_CFLAGS   = $(AM_CFLAGS)
+mod_prefix_la_CPPFLAGS = -I. $(AM_CPPFLAGS)
+mod_prefix_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_prefix_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_prefix/conf/prefix.conf.xml b/src/mod/applications/mod_prefix/conf/prefix.conf.xml
new file mode 100644
index 0000000000..d5be03393e
--- /dev/null
+++ b/src/mod/applications/mod_prefix/conf/prefix.conf.xml
@@ -0,0 +1,5 @@
+<configuration name="prefix.conf">
+  <tables>
+    <table name="rates" file="/var/lib/freeswitch/prefix/rates.json"/>
+  </tables>
+</configuration>
diff --git a/src/mod/applications/mod_prefix/mod_prefix.c b/src/mod/applications/mod_prefix/mod_prefix.c
new file mode 100644
index 0000000000..1a1ebacfde
--- /dev/null
+++ b/src/mod/applications/mod_prefix/mod_prefix.c
@@ -0,0 +1,278 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Travis Cross <tc@traviscross.com>
+ *
+ * mod_prefix.c -- Longest-prefix match in-memory data store
+ *
+ */
+
+#include <switch.h>
+#include <switch_json.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include "trie.h"
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_prefix_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_prefix_shutdown);
+SWITCH_MODULE_DEFINITION(mod_prefix, mod_prefix_load, mod_prefix_shutdown, NULL);
+
+static struct {
+	switch_memory_pool_t *pool;
+	switch_hash_t *trees;
+	switch_thread_rwlock_t *trees_rwlock;
+} globals;
+
+struct prefix_tree {
+	struct bit_trie_node *node;
+	switch_thread_rwlock_t *rwlock;
+};
+
+static cJSON* parse_file(const char *file) {
+	cJSON *root;
+	char *buf;
+	struct stat s;
+	int fd = open(file, O_RDONLY);
+	if (fd < 0) return NULL;
+	fstat(fd, &s);
+	buf = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	close(fd);
+	if (buf == MAP_FAILED) return NULL;
+	root = cJSON_Parse(buf);
+	if (munmap(buf, s.st_size) < 0) abort();
+	return root;
+}
+
+static struct bit_trie_node *load_file(const char *file) {
+	struct bit_trie_node *node;
+	cJSON *item, *root = parse_file(file);
+	if (!root) return NULL;
+	node = bit_trie_create();
+	item = root->child;
+	while(item) {
+		if (item->string && item->valuestring) {
+			bit_trie_set(node, (unsigned char*)item->string, strlen(item->string),
+						 strdup(item->valuestring), strlen(item->valuestring)+1);
+		}
+		item = item->next;
+	}
+	cJSON_Delete(root);
+	return node;
+}
+
+static int search_prefix_tree(switch_stream_handle_t *stream,
+							  const char *name, const char *key) {
+	struct prefix_tree *tr;
+	switch_thread_rwlock_rdlock(globals.trees_rwlock);
+	if ((tr = switch_core_hash_find(globals.trees, name))) {
+		struct bit_trie_node *res = NULL;
+		switch_thread_rwlock_rdlock(tr->rwlock);
+		bit_trie_get(&res, tr->node, (unsigned char*)key, strlen(key));
+		if (res && res->value) {
+			stream->write_function(stream, "%s", res->value);
+		} else {
+			stream->write_function(stream, "");
+		}
+		switch_thread_rwlock_unlock(tr->rwlock);
+	}
+	switch_thread_rwlock_unlock(globals.trees_rwlock);
+	return 0;
+}
+
+static int load_prefix_tree(const char *name, const char *file) {
+	struct prefix_tree *tr;
+	struct bit_trie_node *node;
+	node = load_file(file);
+	if (node) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded prefix file %s\n", file);
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading prefix file %s\n", file);
+		return 2;
+	}
+	switch_thread_rwlock_rdlock(globals.trees_rwlock);
+	if ((tr = switch_core_hash_find(globals.trees, name))) {
+		switch_thread_rwlock_wrlock(tr->rwlock);
+		bit_trie_free(tr->node);
+		tr->node = node;
+		switch_thread_rwlock_unlock(tr->rwlock);
+		switch_thread_rwlock_unlock(globals.trees_rwlock);
+	} else {
+		switch_thread_rwlock_unlock(globals.trees_rwlock);
+		switch_thread_rwlock_wrlock(globals.trees_rwlock);
+		if (!(tr = malloc(sizeof(struct prefix_tree)))) abort();
+		memset(tr, 0, sizeof(struct prefix_tree));
+		tr->node = node;
+		switch_thread_rwlock_create(&tr->rwlock, globals.pool);
+		switch_core_hash_insert(globals.trees, name, tr);
+		switch_thread_rwlock_unlock(globals.trees_rwlock);
+	}
+	return 0;
+}
+
+static int drop_prefix_tree(const char *name) {
+	struct prefix_tree *tr;
+	switch_thread_rwlock_wrlock(globals.trees_rwlock);
+	if ((tr = switch_core_hash_find(globals.trees, name))) {
+		switch_core_hash_delete(globals.trees, name);
+		switch_thread_rwlock_wrlock(tr->rwlock);
+		bit_trie_free(tr->node);
+		switch_thread_rwlock_unlock(tr->rwlock);
+		switch_thread_rwlock_destroy(tr->rwlock);
+		free(tr);
+	}
+	switch_thread_rwlock_unlock(globals.trees_rwlock);
+	return 0;
+}
+
+static void do_config(switch_bool_t reload);
+
+#define PREFIX_API_USAGE "get <table> <key> | load <table> <file> | drop <table> | reload"
+SWITCH_STANDARD_API(prefix_api_function)
+{
+	int argc = 0;
+	char *argv[4] = { 0 };
+	char *mydata = NULL;
+
+	if (!zstr(cmd)) {
+		mydata = strdup(cmd);
+		switch_assert(mydata);
+		argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+	}
+
+	if (argc < 1 || !argv[0]) {
+		goto usage;
+	}
+
+	if (!strcasecmp(argv[0], "get")) {
+		char *name, *key;
+		int ret;
+		if (argc < 3) goto usage;
+		name = argv[1]; key = argv[2];
+		ret = search_prefix_tree(stream, name, key);
+		if (ret == 1) goto usage;
+	} else if (!strcasecmp(argv[0], "load")) {
+		char *name, *file;
+		if (argc < 3) goto usage;
+		name = argv[1]; file = argv[2];
+		if (!load_prefix_tree(name, file)) {
+			stream->write_function(stream, "+OK\n");
+		} else {
+			stream->write_function(stream, "-ERR\n");
+		}
+	} else if (!strcasecmp(argv[0], "drop")) {
+		char *name;
+		if (argc < 2) goto usage;
+		name = argv[1];
+		if (!drop_prefix_tree(name)) {
+			stream->write_function(stream, "+OK\n");
+		} else {
+			stream->write_function(stream, "-ERR\n");
+		}
+	} else if (!strcasecmp(argv[0], "reload")) {
+		do_config(1);
+		stream->write_function(stream, "+OK\n");
+	} else {
+		goto usage;
+	}
+	goto done;
+
+ usage:
+	stream->write_function(stream, "-ERR Usage: prefix %s\n", PREFIX_API_USAGE);
+
+ done:
+	switch_safe_free(mydata);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static void do_config(switch_bool_t reload)
+{
+	switch_xml_t xml = NULL, x_lists = NULL, x_list = NULL, cfg = NULL;
+	if ((xml = switch_xml_open_cfg("prefix.conf", &cfg, NULL))) {
+		if ((x_lists = switch_xml_child(cfg, "tables"))) {
+			for (x_list = switch_xml_child(x_lists, "table"); x_list; x_list = x_list->next) {
+				const char *name = switch_xml_attr(x_list, "name");
+				const char *file = switch_xml_attr(x_list, "file");
+				load_prefix_tree(name, file);
+			}
+		}
+		switch_xml_free(xml);
+	}
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_prefix_load)
+{
+	switch_api_interface_t *api_interface;
+	memset(&globals, 0, sizeof(globals));
+	globals.pool = pool;
+	switch_thread_rwlock_create(&globals.trees_rwlock, globals.pool);
+	switch_core_hash_init(&globals.trees);
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	SWITCH_ADD_API(api_interface, "prefix", "prefix handling", prefix_api_function, PREFIX_API_USAGE);
+	switch_console_set_complete("add prefix get");
+	switch_console_set_complete("add prefix load");
+	switch_console_set_complete("add prefix drop");
+	switch_console_set_complete("add prefix reload");
+	do_config(SWITCH_FALSE);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_prefix_shutdown)
+{
+	switch_hash_index_t *hi = NULL;
+	switch_thread_rwlock_wrlock(globals.trees_rwlock);
+	while ((hi = switch_core_hash_first_iter(globals.trees, hi))) {
+		void *val = NULL;
+		struct prefix_tree *tr = NULL;
+		const void *key;
+		switch_ssize_t keylen;
+		switch_core_hash_this(hi, &key, &keylen, &val);
+		tr = (struct prefix_tree*)val;
+		switch_core_hash_delete(globals.trees, key);
+		switch_thread_rwlock_wrlock(tr->rwlock);
+		bit_trie_free(tr->node);
+		switch_thread_rwlock_unlock(tr->rwlock);
+		switch_thread_rwlock_destroy(tr->rwlock);
+		free(tr);
+	}
+	switch_core_hash_destroy(&globals.trees);
+	switch_thread_rwlock_unlock(globals.trees_rwlock);
+	switch_thread_rwlock_destroy(globals.trees_rwlock);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * show-trailing-whitespace:t
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */
diff --git a/src/mod/applications/mod_prefix/trie.c b/src/mod/applications/mod_prefix/trie.c
new file mode 100644
index 0000000000..667c5c4166
--- /dev/null
+++ b/src/mod/applications/mod_prefix/trie.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2014 Travis Cross <tc@traviscross.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include "trie.h"
+
+struct bit_trie_node* bit_trie_create() {
+  struct bit_trie_node *node = malloc(sizeof(struct bit_trie_node));
+  if (!node) abort();
+  memset(node, 0, sizeof(struct bit_trie_node));
+  return node;
+}
+
+uint32_t bit_trie_get(struct bit_trie_node **node_out,
+                      struct bit_trie_node *node,
+                      unsigned char *key,
+                      uint32_t key_len) {
+  unsigned char *keyp = key, *keyp0 = key;
+  struct bit_trie_node *node0 = node;
+  while(keyp < key + key_len) {
+    uint8_t offset = 0;
+    while(offset < 8) {
+      uint8_t bit = (*keyp >> offset) & 0x01;
+      struct bit_trie_node *next = node->next[bit];
+      if (next) {
+        node = next;
+      } else {
+        *node_out = node0;
+        return keyp0 - key;
+      }
+      offset++;
+    }
+    keyp++;
+    if (node->value) {
+      node0 = node;
+      keyp0 = keyp;
+    }
+  }
+  *node_out = node0;
+  return keyp0 - key;
+}
+
+struct bit_trie_node* bit_trie_set(struct bit_trie_node *node,
+                                   unsigned char *key,
+                                   uint32_t key_len,
+                                   void *value,
+                                   uint32_t value_len) {
+  unsigned char *keyp = key;
+  while(keyp < key + key_len) {
+    uint8_t offset = 0;
+    while(offset < 8) {
+      uint8_t bit = (*keyp >> offset) & 0x01;
+      struct bit_trie_node *next = node->next[bit];
+      if (next) {
+        node = next;
+      } else {
+        next = bit_trie_create();
+        node->next[bit] = next;
+        node = next;
+      }
+      offset++;
+    }
+    keyp++;
+  }
+  node->value = value;
+  node->value_len = value_len;
+  return node;
+}
+
+static uint32_t bit_trie_free_r(struct bit_trie_node *node) {
+  uint32_t count = 0;
+  if (!node) return count;
+  count += bit_trie_free_r(node->next[0]);
+  count += bit_trie_free_r(node->next[1]);
+  free(node->value);
+  free(node);
+  count++;
+  return count;
+}
+
+uint32_t bit_trie_free(struct bit_trie_node *node) {
+  return bit_trie_free_r(node);
+}
+
+uint32_t bit_trie_byte_size(struct bit_trie_node *node) {
+  uint32_t size = 0;
+  if (!node) return size;
+  size += bit_trie_byte_size(node->next[0]);
+  size += bit_trie_byte_size(node->next[1]);
+  size += sizeof(struct bit_trie_node) + node->value_len;
+  return size;
+}
diff --git a/src/mod/applications/mod_prefix/trie.h b/src/mod/applications/mod_prefix/trie.h
new file mode 100644
index 0000000000..69d2323e38
--- /dev/null
+++ b/src/mod/applications/mod_prefix/trie.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014 Travis Cross <tc@traviscross.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+struct bit_trie_node {
+  struct bit_trie_node *next[2];
+  void *value;
+  uint32_t value_len;
+};
+
+struct bit_trie_node* bit_trie_create();
+uint32_t bit_trie_get(struct bit_trie_node **node_out,
+                      struct bit_trie_node *node,
+                      unsigned char *key,
+                      uint32_t key_len);
+struct bit_trie_node* bit_trie_set(struct bit_trie_node *node,
+                                   unsigned char *key,
+                                   uint32_t key_len,
+                                   void *value,
+                                   uint32_t value_len);
+uint32_t bit_trie_free(struct bit_trie_node *node);
+uint32_t bit_trie_byte_size(struct bit_trie_node *node);

From 31f98efc5cce6104c475b7c0ce1e9c3a76535178 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 13:54:03 -0500
Subject: [PATCH 082/130] OpenBSD FTW

---
 build/Makefile.openbsd | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 3ad18426cb..444471066f 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -8,8 +8,7 @@
 #
 
 PKG=rsync-3.1.0 git automake-1.14.1 autoconf-2.69p1 libtool gmake bzip2 jpeg wget pcre speex libldns
-FSPREFIX=/usr/local/freeswitch
-PREFIX=$(FSPREFIX)
+PREFIX=/usr/local/freeswitch
 DOWNLOAD=http://files.freeswitch.org/downloads/libs
 LIBRESSL=2.0.3
 LIBEDIT=20140618-3.1
@@ -19,7 +18,7 @@ freeswitch: has-git deps freeswitch.git/Makefile
 	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake
 
 freeswitch.git/Makefile: freeswitch.git/configure
-	cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(FSPREFIX)
+	cd freeswitch.git && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig ./configure LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' --prefix=$(PREFIX)
 
 freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize sh bootstrap.sh
@@ -57,5 +56,5 @@ curl-$(CURL)/.done: curl-$(CURL)
 curl-$(CURL):
 	(test -d $@) || (wget -4 -O $@.tar.gz $(DOWNLOAD)/$@.tar.gz && tar zxfv $@.tar.gz)
 	(rm -rf $(PREFIX)/lib/libcurl.*)
-	(cd $@ && PKG_CONFIG_PATH=/usr/local/freeswitch/lib/pkgconfig:$PKG_CONFIG_PATH LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath-link=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
+	(cd $@ && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig:$PKG_CONFIG_PATH LDFLAGS='-L$(PREFIX)/lib -Wl,-rpath-link=$(PREFIX)/lib' CFLAGS='-I$(PREFIX)/include' ./configure --prefix=$(PREFIX) && make && sudo make install && touch .done)
 

From d6574e8c0fe1dfd118a94debfca17890c9196092 Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Tue, 22 Jul 2014 15:04:28 -0400
Subject: [PATCH 083/130] dos2unix a bunch of files

For some reason these files would get marked as modified
just after a fresh clone on Linux
---
 src/mod/applications/mod_stress/FFTReal.cpp   | 1230 ++---
 src/mod/asr_tts/mod_cepstral/WinReadme.txt    |    6 +-
 .../mod_gsmopen/gsmopen_protocol.c            |   10 +-
 .../include/ctb-0.16/win32/getopt.h           |   34 +-
 .../include/ctb-0.16/win32/gpib-32.h          |  828 ++--
 src/mod/endpoints/mod_gsmopen/win_iconv.c     | 3972 ++++++++---------
 .../endpoints/mod_gsmopen/win_iconv/iconv.h   |   10 +-
 .../endpoints/mod_gsmopen/win_iconv/mlang.h   |  108 +-
 .../mod_gsmopen/win_iconv/readme.txt          |    6 +-
 .../mod_gsmopen/win_iconv/win_iconv.c         | 3972 ++++++++---------
 .../mod_gsmopen/win_iconv/win_iconv_test.c    |  522 +--
 src/mod/endpoints/mod_opal/mod_opal.cpp       | 3034 ++++++-------
 src/mod/endpoints/mod_opal/mod_opal.h         |  662 +--
 .../endpoints/mod_rtmp/libamf/amf-cmake.h.in  |   26 +-
 src/mod/languages/mod_perl/perlibs.h.in       |    2 +-
 src/mod/say/mod_say_fa/mod_say_fa.c           |  204 +-
 src/mod/say/mod_say_pt/mod_say_pt.c           | 1082 ++---
 17 files changed, 7854 insertions(+), 7854 deletions(-)

diff --git a/src/mod/applications/mod_stress/FFTReal.cpp b/src/mod/applications/mod_stress/FFTReal.cpp
index e1a77b465e..3c82fc0752 100644
--- a/src/mod/applications/mod_stress/FFTReal.cpp
+++ b/src/mod/applications/mod_stress/FFTReal.cpp
@@ -1,615 +1,615 @@
-/*****************************************************************************
-*                                                                            *
-*       DIGITAL SIGNAL PROCESSING TOOLS                                      *
-*       Version 1.03, 2001/06/15                                             *
-*       (c) 1999 - Laurent de Soras                                          *
-*                                                                            *
-*       FFTReal.cpp                                                          *
-*       Fourier transformation of real number arrays.                        *
-*       Portable ISO C++                                                     *
-*                                                                            *
-* Tab = 3                                                                    *
-*****************************************************************************/
-
-
-
-/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-#include	"FFTReal.h"
-
-#include	<cassert>
-#include	<cmath>
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (push, 8)
-#endif	// _MSC_VER
-
-
-
-/*\\\ PUBLIC MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - length: length of the array on which we want to do a FFT.       */
-/*                  Range: power of 2 only, > 0.                            */
-/*      Throws: std::bad_alloc, anything                                    */
-/*==========================================================================*/
-
-FFTReal::FFTReal (const long length)
-:	_length (length)
-,	_nbr_bits (int (floor (log (length) / log (2) + 0.5)))
-,	_bit_rev_lut (int (floor (log (length) / log (2) + 0.5)))
-,	_trigo_lut (int (floor (log (length) / log (2) + 0.5)))
-,	_sqrt2_2 (flt_t (sqrt (2) * 0.5))
-{
-	assert ((1L << _nbr_bits) == length);
-
-	_buffer_ptr = 0;
-	if (_nbr_bits > 2)
-	{
-		_buffer_ptr = new flt_t [_length];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::~FFTReal (void)
-{
-	delete [] _buffer_ptr;
-	_buffer_ptr = 0;
-}
-
-
-
-/*==========================================================================*/
-/*      Name: do_fft                                                        */
-/*      Description: Compute the FFT of the array.                          */
-/*      Input parameters:                                                   */
-/*        - x: pointer on the source array (time).                          */
-/*      Output parameters:                                                  */
-/*        - f: pointer on the destination array (frequencies).              */
-/*             f [0...length(x)/2] = real values,                           */
-/*             f [length(x)/2+1...length(x)-1] = imaginary values of        */
-/*               coefficents 1...length(x)/2-1.                             */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::do_fft (flt_t f [], const flt_t x []) const
-{
-
-/*______________________________________________
- *
- * General case
- *______________________________________________
- */
-
-	if (_nbr_bits > 2)
-	{
-		flt_t *			sf;
-		flt_t *			df;
-
-		if (_nbr_bits & 1)
-		{
-			df = _buffer_ptr;
-			sf = f;
-		}
-		else
-		{
-			df = f;
-			sf = _buffer_ptr;
-		}
-
-		/* Do the transformation in several pass */
-		{
-			int		pass;
-			long		nbr_coef;
-			long		h_nbr_coef;
-			long		d_nbr_coef;
-			long		coef_index;
-
-			/* First and second pass at once */
-			{
-				const long * const	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
-				coef_index = 0;
-				do
-				{
-					const long		rev_index_0 = bit_rev_lut_ptr [coef_index];
-					const long		rev_index_1 = bit_rev_lut_ptr [coef_index + 1];
-					const long		rev_index_2 = bit_rev_lut_ptr [coef_index + 2];
-					const long		rev_index_3 = bit_rev_lut_ptr [coef_index + 3];
-
-					flt_t	* const	df2 = df + coef_index;
-					df2 [1] = x [rev_index_0] - x [rev_index_1];
-					df2 [3] = x [rev_index_2] - x [rev_index_3];
-
-					const flt_t		sf_0 = x [rev_index_0] + x [rev_index_1];
-					const flt_t		sf_2 = x [rev_index_2] + x [rev_index_3];
-
-					df2 [0] = sf_0 + sf_2;
-					df2 [2] = sf_0 - sf_2;
-					
-					coef_index += 4;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Third pass */
-			{
-				coef_index = 0;
-				const flt_t		sqrt2_2 = _sqrt2_2;
-				do
-				{
-					flt_t				v;
-
-					sf [coef_index] = df [coef_index] + df [coef_index + 4];
-					sf [coef_index + 4] = df [coef_index] - df [coef_index + 4];
-					sf [coef_index + 2] = df [coef_index + 2];
-					sf [coef_index + 6] = df [coef_index + 6];
-
-					v = (df [coef_index + 5] - df [coef_index + 7]) * sqrt2_2;
-					sf [coef_index + 1] = df [coef_index + 1] + v;
-					sf [coef_index + 3] = df [coef_index + 1] - v;
-
-					v = (df [coef_index + 5] + df [coef_index + 7]) * sqrt2_2;
-					sf [coef_index + 5] = v + df [coef_index + 3];
-					sf [coef_index + 7] = v - df [coef_index + 3];
-
-					coef_index += 8;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Next pass */
-			for (pass = 3; pass < _nbr_bits; ++pass)
-			{
-				coef_index = 0;
-				nbr_coef = 1 << pass;
-				h_nbr_coef = nbr_coef >> 1;
-				d_nbr_coef = nbr_coef << 1;
-				const flt_t	* const	cos_ptr = _trigo_lut.get_ptr (pass);
-				do
-				{
-					long				i;
-					const flt_t	*	const sf1r = sf + coef_index;
-					const flt_t	*	const sf2r = sf1r + nbr_coef;
-					flt_t *			const dfr = df + coef_index;
-					flt_t *			const dfi = dfr + nbr_coef;
-
-					/* Extreme coefficients are always real */
-					dfr [0] = sf1r [0] + sf2r [0];
-					dfi [0] = sf1r [0] - sf2r [0];	// dfr [nbr_coef] =
-					dfr [h_nbr_coef] = sf1r [h_nbr_coef];
-					dfi [h_nbr_coef] = sf2r [h_nbr_coef];
-
-					/* Others are conjugate complex numbers */
-					const flt_t	* const	sf1i = sf1r + h_nbr_coef;
-					const flt_t	* const	sf2i = sf1i + nbr_coef;
-					for (i = 1; i < h_nbr_coef; ++ i)
-					{
-						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
-						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
-						flt_t				v;
-
-						v = sf2r [i] * c - sf2i [i] * s;
-						dfr [i] = sf1r [i] + v;
-						dfi [-i] = sf1r [i] - v;	// dfr [nbr_coef - i] =
-
-						v = sf2r [i] * s + sf2i [i] * c;
-						dfi [i] = v + sf1i [i];
-						dfi [nbr_coef - i] = v - sf1i [i];
-					}
-
-					coef_index += d_nbr_coef;
-				}
-				while (coef_index < _length);
-
-				/* Prepare to the next pass */
-				{
-					flt_t	* const		temp_ptr = df;
-					df = sf;
-					sf = temp_ptr;
-				}
-			}
-		}
-	}
-
-/*______________________________________________
- *
- * Special cases
- *______________________________________________
- */
-
-	/* 4-point FFT */
-	else if (_nbr_bits == 2)
-	{
-		f [1] = x [0] - x [2];
-		f [3] = x [1] - x [3];
-
-		const flt_t			b_0 = x [0] + x [2];
-		const flt_t			b_2 = x [1] + x [3];
-		
-		f [0] = b_0 + b_2;
-		f [2] = b_0 - b_2;
-	}
-
-	/* 2-point FFT */
-	else if (_nbr_bits == 1)
-	{
-		f [0] = x [0] + x [1];
-		f [1] = x [0] - x [1];
-	}
-
-	/* 1-point FFT */
-	else
-	{
-		f [0] = x [0];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: do_ifft                                                       */
-/*      Description: Compute the inverse FFT of the array. Notice that      */
-/*                   IFFT (FFT (x)) = x * length (x). Data must be          */
-/*                   post-scaled.                                           */
-/*      Input parameters:                                                   */
-/*        - f: pointer on the source array (frequencies).                   */
-/*             f [0...length(x)/2] = real values,                           */
-/*             f [length(x)/2+1...length(x)] = imaginary values of          */
-/*               coefficents 1...length(x)-1.                               */
-/*      Output parameters:                                                  */
-/*        - x: pointer on the destination array (time).                     */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::do_ifft (const flt_t f [], flt_t x []) const
-{
-
-/*______________________________________________
- *
- * General case
- *______________________________________________
- */
-
-	if (_nbr_bits > 2)
-	{
-		flt_t *			sf = const_cast <flt_t *> (f);
-		flt_t *			df;
-		flt_t *			df_temp;
-
-		if (_nbr_bits & 1)
-		{
-			df = _buffer_ptr;
-			df_temp = x;
-		}
-		else
-		{
-			df = x;
-			df_temp = _buffer_ptr;
-		}
-
-		/* Do the transformation in several pass */
-		{
-			int			pass;
-			long			nbr_coef;
-			long			h_nbr_coef;
-			long			d_nbr_coef;
-			long			coef_index;
-
-			/* First pass */
-			for (pass = _nbr_bits - 1; pass >= 3; --pass)
-			{
-				coef_index = 0;
-				nbr_coef = 1 << pass;
-				h_nbr_coef = nbr_coef >> 1;
-				d_nbr_coef = nbr_coef << 1;
-				const flt_t	*const cos_ptr = _trigo_lut.get_ptr (pass);
-				do
-				{
-					long				i;
-					const flt_t	*	const sfr = sf + coef_index;
-					const flt_t	*	const sfi = sfr + nbr_coef;
-					flt_t *			const df1r = df + coef_index;
-					flt_t *			const df2r = df1r + nbr_coef;
-
-					/* Extreme coefficients are always real */
-					df1r [0] = sfr [0] + sfi [0];		// + sfr [nbr_coef]
-					df2r [0] = sfr [0] - sfi [0];		// - sfr [nbr_coef]
-					df1r [h_nbr_coef] = sfr [h_nbr_coef] * 2;
-					df2r [h_nbr_coef] = sfi [h_nbr_coef] * 2;
-
-					/* Others are conjugate complex numbers */
-					flt_t * const	df1i = df1r + h_nbr_coef;
-					flt_t * const	df2i = df1i + nbr_coef;
-					for (i = 1; i < h_nbr_coef; ++ i)
-					{
-						df1r [i] = sfr [i] + sfi [-i];		// + sfr [nbr_coef - i]
-						df1i [i] = sfi [i] - sfi [nbr_coef - i];
-
-						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
-						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
-						const flt_t		vr = sfr [i] - sfi [-i];		// - sfr [nbr_coef - i]
-						const flt_t		vi = sfi [i] + sfi [nbr_coef - i];
-
-						df2r [i] = vr * c + vi * s;
-						df2i [i] = vi * c - vr * s;
-					}
-
-					coef_index += d_nbr_coef;
-				}
-				while (coef_index < _length);
-
-				/* Prepare to the next pass */
-				if (pass < _nbr_bits - 1)
-				{
-					flt_t	* const	temp_ptr = df;
-					df = sf;
-					sf = temp_ptr;
-				}
-				else
-				{
-					sf = df;
-					df = df_temp;
-				}
-			}
-
-			/* Antepenultimate pass */
-			{
-				const flt_t		sqrt2_2 = _sqrt2_2;
-				coef_index = 0;
-				do
-				{
-					df [coef_index] = sf [coef_index] + sf [coef_index + 4];
-					df [coef_index + 4] = sf [coef_index] - sf [coef_index + 4];
-					df [coef_index + 2] = sf [coef_index + 2] * 2;
-					df [coef_index + 6] = sf [coef_index + 6] * 2;
-
-					df [coef_index + 1] = sf [coef_index + 1] + sf [coef_index + 3];
-					df [coef_index + 3] = sf [coef_index + 5] - sf [coef_index + 7];
-
-					const flt_t		vr = sf [coef_index + 1] - sf [coef_index + 3];
-					const flt_t		vi = sf [coef_index + 5] + sf [coef_index + 7];
-
-					df [coef_index + 5] = (vr + vi) * sqrt2_2;
-					df [coef_index + 7] = (vi - vr) * sqrt2_2;
-
-					coef_index += 8;
-				}
-				while (coef_index < _length);
-			}
-
-			/* Penultimate and last pass at once */
-			{
-				coef_index = 0;
-				const long *	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
-				const flt_t	*	sf2 = df;
-				do
-				{
-					{
-						const flt_t		b_0 = sf2 [0] + sf2 [2];
-						const flt_t		b_2 = sf2 [0] - sf2 [2];
-						const flt_t		b_1 = sf2 [1] * 2;
-						const flt_t		b_3 = sf2 [3] * 2;
-
-						x [bit_rev_lut_ptr [0]] = b_0 + b_1;
-						x [bit_rev_lut_ptr [1]] = b_0 - b_1;
-						x [bit_rev_lut_ptr [2]] = b_2 + b_3;
-						x [bit_rev_lut_ptr [3]] = b_2 - b_3;
-					}
-					{
-						const flt_t		b_0 = sf2 [4] + sf2 [6];
-						const flt_t		b_2 = sf2 [4] - sf2 [6];
-						const flt_t		b_1 = sf2 [5] * 2;
-						const flt_t		b_3 = sf2 [7] * 2;
-
-						x [bit_rev_lut_ptr [4]] = b_0 + b_1;
-						x [bit_rev_lut_ptr [5]] = b_0 - b_1;
-						x [bit_rev_lut_ptr [6]] = b_2 + b_3;
-						x [bit_rev_lut_ptr [7]] = b_2 - b_3;
-					}
-
-					sf2 += 8;
-					coef_index += 8;
-					bit_rev_lut_ptr += 8;
-				}
-				while (coef_index < _length);
-			}
-		}
-	}
-
-/*______________________________________________
- *
- * Special cases
- *______________________________________________
- */
-
-	/* 4-point IFFT */
-	else if (_nbr_bits == 2)
-	{
-		const flt_t		b_0 = f [0] + f [2];
-		const flt_t		b_2 = f [0] - f [2];
-
-		x [0] = b_0 + f [1] * 2;
-		x [2] = b_0 - f [1] * 2;
-		x [1] = b_2 + f [3] * 2;
-		x [3] = b_2 - f [3] * 2;
-	}
-
-	/* 2-point IFFT */
-	else if (_nbr_bits == 1)
-	{
-		x [0] = f [0] + f [1];
-		x [1] = f [0] - f [1];
-	}
-
-	/* 1-point IFFT */
-	else
-	{
-		x [0] = f [0];
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: rescale                                                       */
-/*      Description: Scale an array by divide each element by its length.   */
-/*                   This function should be called after FFT + IFFT.       */
-/*      Input/Output parameters:                                            */
-/*        - x: pointer on array to rescale (time or frequency).             */
-/*      Throws: Nothing                                                     */
-/*==========================================================================*/
-
-void	FFTReal::rescale (flt_t x []) const
-{
-	const flt_t		mul = flt_t (1.0 / _length);
-	long				i = _length - 1;
-
-	do
-	{
-		x [i] *= mul;
-		--i;
-	}
-	while (i >= 0);
-}
-
-
-
-/*\\\ NESTED CLASS MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - nbr_bits: number of bits of the array on which we want to do a  */
-/*                    FFT. Range: > 0                                       */
-/*      Throws: std::bad_alloc                                              */
-/*==========================================================================*/
-
-FFTReal::BitReversedLUT::BitReversedLUT (const int nbr_bits)
-{
-	long				length;
-	long				cnt;
-	long				br_index;
-	long				bit;
-
-	length = 1L << nbr_bits;
-	_ptr = new long [length];
-
-	br_index = 0;
-	_ptr [0] = 0;
-	for (cnt = 1; cnt < length; ++cnt)
-	{
-		/* ++br_index (bit reversed) */
-		bit = length >> 1;
-		while (((br_index ^= bit) & bit) == 0)
-		{
-			bit >>= 1;
-		}
-
-		_ptr [cnt] = br_index;
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::BitReversedLUT::~BitReversedLUT (void)
-{
-	delete [] _ptr;
-	_ptr = 0;
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Constructor                                                   */
-/*      Input parameters:                                                   */
-/*        - nbr_bits: number of bits of the array on which we want to do a  */
-/*                    FFT. Range: > 0                                       */
-/*      Throws: std::bad_alloc, anything                                    */
-/*==========================================================================*/
-
-FFTReal::TrigoLUT::TrigoLUT (const int nbr_bits)
-{
-	long		total_len;
-
-	_ptr = 0;
-	if (nbr_bits > 3)
-	{
-		total_len = (1L << (nbr_bits - 1)) - 4;
-		_ptr = new flt_t [total_len];
-
-		const double	PI = atan (1) * 4;
-		for (int level = 3; level < nbr_bits; ++level)
-		{
-			const long		level_len = 1L << (level - 1);
-			flt_t	* const	level_ptr = const_cast<flt_t *> (get_ptr (level));
-			const double	mul = PI / (level_len << 1);
-
-			for (long i = 0; i < level_len; ++ i)
-			{
-				level_ptr [i] = (flt_t) cos (i * mul);
-			}
-		}
-	}
-}
-
-
-
-/*==========================================================================*/
-/*      Name: Destructor                                                    */
-/*==========================================================================*/
-
-FFTReal::TrigoLUT::~TrigoLUT (void)
-{
-	delete [] _ptr;
-	_ptr = 0;
-}
-
-
-
-#if defined (_MSC_VER)
-#pragma pack (pop)
-#endif	// _MSC_VER
-
-
-
-/*****************************************************************************
-
-	LEGAL
-
-	Source code may be freely used for any purpose, including commercial
-	applications. Programs must display in their "About" dialog-box (or
-	documentation) a text telling they use these routines by Laurent de Soras.
-	Modified source code can be distributed, but modifications must be clearly
-	indicated.
-
-	CONTACT
-
-	Laurent de Soras
-	92 avenue Albert 1er
-	92500 Rueil-Malmaison
-	France
-
-	ldesoras@club-internet.fr
-
-*****************************************************************************/
-
-
-
-/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
+/*****************************************************************************
+*                                                                            *
+*       DIGITAL SIGNAL PROCESSING TOOLS                                      *
+*       Version 1.03, 2001/06/15                                             *
+*       (c) 1999 - Laurent de Soras                                          *
+*                                                                            *
+*       FFTReal.cpp                                                          *
+*       Fourier transformation of real number arrays.                        *
+*       Portable ISO C++                                                     *
+*                                                                            *
+* Tab = 3                                                                    *
+*****************************************************************************/
+
+
+
+/*\\\ INCLUDE FILES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
+
+#include	"FFTReal.h"
+
+#include	<cassert>
+#include	<cmath>
+
+
+
+#if defined (_MSC_VER)
+#pragma pack (push, 8)
+#endif	// _MSC_VER
+
+
+
+/*\\\ PUBLIC MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
+
+
+
+/*==========================================================================*/
+/*      Name: Constructor                                                   */
+/*      Input parameters:                                                   */
+/*        - length: length of the array on which we want to do a FFT.       */
+/*                  Range: power of 2 only, > 0.                            */
+/*      Throws: std::bad_alloc, anything                                    */
+/*==========================================================================*/
+
+FFTReal::FFTReal (const long length)
+:	_length (length)
+,	_nbr_bits (int (floor (log (length) / log (2) + 0.5)))
+,	_bit_rev_lut (int (floor (log (length) / log (2) + 0.5)))
+,	_trigo_lut (int (floor (log (length) / log (2) + 0.5)))
+,	_sqrt2_2 (flt_t (sqrt (2) * 0.5))
+{
+	assert ((1L << _nbr_bits) == length);
+
+	_buffer_ptr = 0;
+	if (_nbr_bits > 2)
+	{
+		_buffer_ptr = new flt_t [_length];
+	}
+}
+
+
+
+/*==========================================================================*/
+/*      Name: Destructor                                                    */
+/*==========================================================================*/
+
+FFTReal::~FFTReal (void)
+{
+	delete [] _buffer_ptr;
+	_buffer_ptr = 0;
+}
+
+
+
+/*==========================================================================*/
+/*      Name: do_fft                                                        */
+/*      Description: Compute the FFT of the array.                          */
+/*      Input parameters:                                                   */
+/*        - x: pointer on the source array (time).                          */
+/*      Output parameters:                                                  */
+/*        - f: pointer on the destination array (frequencies).              */
+/*             f [0...length(x)/2] = real values,                           */
+/*             f [length(x)/2+1...length(x)-1] = imaginary values of        */
+/*               coefficents 1...length(x)/2-1.                             */
+/*      Throws: Nothing                                                     */
+/*==========================================================================*/
+
+void	FFTReal::do_fft (flt_t f [], const flt_t x []) const
+{
+
+/*______________________________________________
+ *
+ * General case
+ *______________________________________________
+ */
+
+	if (_nbr_bits > 2)
+	{
+		flt_t *			sf;
+		flt_t *			df;
+
+		if (_nbr_bits & 1)
+		{
+			df = _buffer_ptr;
+			sf = f;
+		}
+		else
+		{
+			df = f;
+			sf = _buffer_ptr;
+		}
+
+		/* Do the transformation in several pass */
+		{
+			int		pass;
+			long		nbr_coef;
+			long		h_nbr_coef;
+			long		d_nbr_coef;
+			long		coef_index;
+
+			/* First and second pass at once */
+			{
+				const long * const	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
+				coef_index = 0;
+				do
+				{
+					const long		rev_index_0 = bit_rev_lut_ptr [coef_index];
+					const long		rev_index_1 = bit_rev_lut_ptr [coef_index + 1];
+					const long		rev_index_2 = bit_rev_lut_ptr [coef_index + 2];
+					const long		rev_index_3 = bit_rev_lut_ptr [coef_index + 3];
+
+					flt_t	* const	df2 = df + coef_index;
+					df2 [1] = x [rev_index_0] - x [rev_index_1];
+					df2 [3] = x [rev_index_2] - x [rev_index_3];
+
+					const flt_t		sf_0 = x [rev_index_0] + x [rev_index_1];
+					const flt_t		sf_2 = x [rev_index_2] + x [rev_index_3];
+
+					df2 [0] = sf_0 + sf_2;
+					df2 [2] = sf_0 - sf_2;
+					
+					coef_index += 4;
+				}
+				while (coef_index < _length);
+			}
+
+			/* Third pass */
+			{
+				coef_index = 0;
+				const flt_t		sqrt2_2 = _sqrt2_2;
+				do
+				{
+					flt_t				v;
+
+					sf [coef_index] = df [coef_index] + df [coef_index + 4];
+					sf [coef_index + 4] = df [coef_index] - df [coef_index + 4];
+					sf [coef_index + 2] = df [coef_index + 2];
+					sf [coef_index + 6] = df [coef_index + 6];
+
+					v = (df [coef_index + 5] - df [coef_index + 7]) * sqrt2_2;
+					sf [coef_index + 1] = df [coef_index + 1] + v;
+					sf [coef_index + 3] = df [coef_index + 1] - v;
+
+					v = (df [coef_index + 5] + df [coef_index + 7]) * sqrt2_2;
+					sf [coef_index + 5] = v + df [coef_index + 3];
+					sf [coef_index + 7] = v - df [coef_index + 3];
+
+					coef_index += 8;
+				}
+				while (coef_index < _length);
+			}
+
+			/* Next pass */
+			for (pass = 3; pass < _nbr_bits; ++pass)
+			{
+				coef_index = 0;
+				nbr_coef = 1 << pass;
+				h_nbr_coef = nbr_coef >> 1;
+				d_nbr_coef = nbr_coef << 1;
+				const flt_t	* const	cos_ptr = _trigo_lut.get_ptr (pass);
+				do
+				{
+					long				i;
+					const flt_t	*	const sf1r = sf + coef_index;
+					const flt_t	*	const sf2r = sf1r + nbr_coef;
+					flt_t *			const dfr = df + coef_index;
+					flt_t *			const dfi = dfr + nbr_coef;
+
+					/* Extreme coefficients are always real */
+					dfr [0] = sf1r [0] + sf2r [0];
+					dfi [0] = sf1r [0] - sf2r [0];	// dfr [nbr_coef] =
+					dfr [h_nbr_coef] = sf1r [h_nbr_coef];
+					dfi [h_nbr_coef] = sf2r [h_nbr_coef];
+
+					/* Others are conjugate complex numbers */
+					const flt_t	* const	sf1i = sf1r + h_nbr_coef;
+					const flt_t	* const	sf2i = sf1i + nbr_coef;
+					for (i = 1; i < h_nbr_coef; ++ i)
+					{
+						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
+						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
+						flt_t				v;
+
+						v = sf2r [i] * c - sf2i [i] * s;
+						dfr [i] = sf1r [i] + v;
+						dfi [-i] = sf1r [i] - v;	// dfr [nbr_coef - i] =
+
+						v = sf2r [i] * s + sf2i [i] * c;
+						dfi [i] = v + sf1i [i];
+						dfi [nbr_coef - i] = v - sf1i [i];
+					}
+
+					coef_index += d_nbr_coef;
+				}
+				while (coef_index < _length);
+
+				/* Prepare to the next pass */
+				{
+					flt_t	* const		temp_ptr = df;
+					df = sf;
+					sf = temp_ptr;
+				}
+			}
+		}
+	}
+
+/*______________________________________________
+ *
+ * Special cases
+ *______________________________________________
+ */
+
+	/* 4-point FFT */
+	else if (_nbr_bits == 2)
+	{
+		f [1] = x [0] - x [2];
+		f [3] = x [1] - x [3];
+
+		const flt_t			b_0 = x [0] + x [2];
+		const flt_t			b_2 = x [1] + x [3];
+		
+		f [0] = b_0 + b_2;
+		f [2] = b_0 - b_2;
+	}
+
+	/* 2-point FFT */
+	else if (_nbr_bits == 1)
+	{
+		f [0] = x [0] + x [1];
+		f [1] = x [0] - x [1];
+	}
+
+	/* 1-point FFT */
+	else
+	{
+		f [0] = x [0];
+	}
+}
+
+
+
+/*==========================================================================*/
+/*      Name: do_ifft                                                       */
+/*      Description: Compute the inverse FFT of the array. Notice that      */
+/*                   IFFT (FFT (x)) = x * length (x). Data must be          */
+/*                   post-scaled.                                           */
+/*      Input parameters:                                                   */
+/*        - f: pointer on the source array (frequencies).                   */
+/*             f [0...length(x)/2] = real values,                           */
+/*             f [length(x)/2+1...length(x)] = imaginary values of          */
+/*               coefficents 1...length(x)-1.                               */
+/*      Output parameters:                                                  */
+/*        - x: pointer on the destination array (time).                     */
+/*      Throws: Nothing                                                     */
+/*==========================================================================*/
+
+void	FFTReal::do_ifft (const flt_t f [], flt_t x []) const
+{
+
+/*______________________________________________
+ *
+ * General case
+ *______________________________________________
+ */
+
+	if (_nbr_bits > 2)
+	{
+		flt_t *			sf = const_cast <flt_t *> (f);
+		flt_t *			df;
+		flt_t *			df_temp;
+
+		if (_nbr_bits & 1)
+		{
+			df = _buffer_ptr;
+			df_temp = x;
+		}
+		else
+		{
+			df = x;
+			df_temp = _buffer_ptr;
+		}
+
+		/* Do the transformation in several pass */
+		{
+			int			pass;
+			long			nbr_coef;
+			long			h_nbr_coef;
+			long			d_nbr_coef;
+			long			coef_index;
+
+			/* First pass */
+			for (pass = _nbr_bits - 1; pass >= 3; --pass)
+			{
+				coef_index = 0;
+				nbr_coef = 1 << pass;
+				h_nbr_coef = nbr_coef >> 1;
+				d_nbr_coef = nbr_coef << 1;
+				const flt_t	*const cos_ptr = _trigo_lut.get_ptr (pass);
+				do
+				{
+					long				i;
+					const flt_t	*	const sfr = sf + coef_index;
+					const flt_t	*	const sfi = sfr + nbr_coef;
+					flt_t *			const df1r = df + coef_index;
+					flt_t *			const df2r = df1r + nbr_coef;
+
+					/* Extreme coefficients are always real */
+					df1r [0] = sfr [0] + sfi [0];		// + sfr [nbr_coef]
+					df2r [0] = sfr [0] - sfi [0];		// - sfr [nbr_coef]
+					df1r [h_nbr_coef] = sfr [h_nbr_coef] * 2;
+					df2r [h_nbr_coef] = sfi [h_nbr_coef] * 2;
+
+					/* Others are conjugate complex numbers */
+					flt_t * const	df1i = df1r + h_nbr_coef;
+					flt_t * const	df2i = df1i + nbr_coef;
+					for (i = 1; i < h_nbr_coef; ++ i)
+					{
+						df1r [i] = sfr [i] + sfi [-i];		// + sfr [nbr_coef - i]
+						df1i [i] = sfi [i] - sfi [nbr_coef - i];
+
+						const flt_t		c = cos_ptr [i];					// cos (i*PI/nbr_coef);
+						const flt_t		s = cos_ptr [h_nbr_coef - i];	// sin (i*PI/nbr_coef);
+						const flt_t		vr = sfr [i] - sfi [-i];		// - sfr [nbr_coef - i]
+						const flt_t		vi = sfi [i] + sfi [nbr_coef - i];
+
+						df2r [i] = vr * c + vi * s;
+						df2i [i] = vi * c - vr * s;
+					}
+
+					coef_index += d_nbr_coef;
+				}
+				while (coef_index < _length);
+
+				/* Prepare to the next pass */
+				if (pass < _nbr_bits - 1)
+				{
+					flt_t	* const	temp_ptr = df;
+					df = sf;
+					sf = temp_ptr;
+				}
+				else
+				{
+					sf = df;
+					df = df_temp;
+				}
+			}
+
+			/* Antepenultimate pass */
+			{
+				const flt_t		sqrt2_2 = _sqrt2_2;
+				coef_index = 0;
+				do
+				{
+					df [coef_index] = sf [coef_index] + sf [coef_index + 4];
+					df [coef_index + 4] = sf [coef_index] - sf [coef_index + 4];
+					df [coef_index + 2] = sf [coef_index + 2] * 2;
+					df [coef_index + 6] = sf [coef_index + 6] * 2;
+
+					df [coef_index + 1] = sf [coef_index + 1] + sf [coef_index + 3];
+					df [coef_index + 3] = sf [coef_index + 5] - sf [coef_index + 7];
+
+					const flt_t		vr = sf [coef_index + 1] - sf [coef_index + 3];
+					const flt_t		vi = sf [coef_index + 5] + sf [coef_index + 7];
+
+					df [coef_index + 5] = (vr + vi) * sqrt2_2;
+					df [coef_index + 7] = (vi - vr) * sqrt2_2;
+
+					coef_index += 8;
+				}
+				while (coef_index < _length);
+			}
+
+			/* Penultimate and last pass at once */
+			{
+				coef_index = 0;
+				const long *	bit_rev_lut_ptr = _bit_rev_lut.get_ptr ();
+				const flt_t	*	sf2 = df;
+				do
+				{
+					{
+						const flt_t		b_0 = sf2 [0] + sf2 [2];
+						const flt_t		b_2 = sf2 [0] - sf2 [2];
+						const flt_t		b_1 = sf2 [1] * 2;
+						const flt_t		b_3 = sf2 [3] * 2;
+
+						x [bit_rev_lut_ptr [0]] = b_0 + b_1;
+						x [bit_rev_lut_ptr [1]] = b_0 - b_1;
+						x [bit_rev_lut_ptr [2]] = b_2 + b_3;
+						x [bit_rev_lut_ptr [3]] = b_2 - b_3;
+					}
+					{
+						const flt_t		b_0 = sf2 [4] + sf2 [6];
+						const flt_t		b_2 = sf2 [4] - sf2 [6];
+						const flt_t		b_1 = sf2 [5] * 2;
+						const flt_t		b_3 = sf2 [7] * 2;
+
+						x [bit_rev_lut_ptr [4]] = b_0 + b_1;
+						x [bit_rev_lut_ptr [5]] = b_0 - b_1;
+						x [bit_rev_lut_ptr [6]] = b_2 + b_3;
+						x [bit_rev_lut_ptr [7]] = b_2 - b_3;
+					}
+
+					sf2 += 8;
+					coef_index += 8;
+					bit_rev_lut_ptr += 8;
+				}
+				while (coef_index < _length);
+			}
+		}
+	}
+
+/*______________________________________________
+ *
+ * Special cases
+ *______________________________________________
+ */
+
+	/* 4-point IFFT */
+	else if (_nbr_bits == 2)
+	{
+		const flt_t		b_0 = f [0] + f [2];
+		const flt_t		b_2 = f [0] - f [2];
+
+		x [0] = b_0 + f [1] * 2;
+		x [2] = b_0 - f [1] * 2;
+		x [1] = b_2 + f [3] * 2;
+		x [3] = b_2 - f [3] * 2;
+	}
+
+	/* 2-point IFFT */
+	else if (_nbr_bits == 1)
+	{
+		x [0] = f [0] + f [1];
+		x [1] = f [0] - f [1];
+	}
+
+	/* 1-point IFFT */
+	else
+	{
+		x [0] = f [0];
+	}
+}
+
+
+
+/*==========================================================================*/
+/*      Name: rescale                                                       */
+/*      Description: Scale an array by divide each element by its length.   */
+/*                   This function should be called after FFT + IFFT.       */
+/*      Input/Output parameters:                                            */
+/*        - x: pointer on array to rescale (time or frequency).             */
+/*      Throws: Nothing                                                     */
+/*==========================================================================*/
+
+void	FFTReal::rescale (flt_t x []) const
+{
+	const flt_t		mul = flt_t (1.0 / _length);
+	long				i = _length - 1;
+
+	do
+	{
+		x [i] *= mul;
+		--i;
+	}
+	while (i >= 0);
+}
+
+
+
+/*\\\ NESTED CLASS MEMBER FUNCTIONS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
+
+
+
+/*==========================================================================*/
+/*      Name: Constructor                                                   */
+/*      Input parameters:                                                   */
+/*        - nbr_bits: number of bits of the array on which we want to do a  */
+/*                    FFT. Range: > 0                                       */
+/*      Throws: std::bad_alloc                                              */
+/*==========================================================================*/
+
+FFTReal::BitReversedLUT::BitReversedLUT (const int nbr_bits)
+{
+	long				length;
+	long				cnt;
+	long				br_index;
+	long				bit;
+
+	length = 1L << nbr_bits;
+	_ptr = new long [length];
+
+	br_index = 0;
+	_ptr [0] = 0;
+	for (cnt = 1; cnt < length; ++cnt)
+	{
+		/* ++br_index (bit reversed) */
+		bit = length >> 1;
+		while (((br_index ^= bit) & bit) == 0)
+		{
+			bit >>= 1;
+		}
+
+		_ptr [cnt] = br_index;
+	}
+}
+
+
+
+/*==========================================================================*/
+/*      Name: Destructor                                                    */
+/*==========================================================================*/
+
+FFTReal::BitReversedLUT::~BitReversedLUT (void)
+{
+	delete [] _ptr;
+	_ptr = 0;
+}
+
+
+
+/*==========================================================================*/
+/*      Name: Constructor                                                   */
+/*      Input parameters:                                                   */
+/*        - nbr_bits: number of bits of the array on which we want to do a  */
+/*                    FFT. Range: > 0                                       */
+/*      Throws: std::bad_alloc, anything                                    */
+/*==========================================================================*/
+
+FFTReal::TrigoLUT::TrigoLUT (const int nbr_bits)
+{
+	long		total_len;
+
+	_ptr = 0;
+	if (nbr_bits > 3)
+	{
+		total_len = (1L << (nbr_bits - 1)) - 4;
+		_ptr = new flt_t [total_len];
+
+		const double	PI = atan (1) * 4;
+		for (int level = 3; level < nbr_bits; ++level)
+		{
+			const long		level_len = 1L << (level - 1);
+			flt_t	* const	level_ptr = const_cast<flt_t *> (get_ptr (level));
+			const double	mul = PI / (level_len << 1);
+
+			for (long i = 0; i < level_len; ++ i)
+			{
+				level_ptr [i] = (flt_t) cos (i * mul);
+			}
+		}
+	}
+}
+
+
+
+/*==========================================================================*/
+/*      Name: Destructor                                                    */
+/*==========================================================================*/
+
+FFTReal::TrigoLUT::~TrigoLUT (void)
+{
+	delete [] _ptr;
+	_ptr = 0;
+}
+
+
+
+#if defined (_MSC_VER)
+#pragma pack (pop)
+#endif	// _MSC_VER
+
+
+
+/*****************************************************************************
+
+	LEGAL
+
+	Source code may be freely used for any purpose, including commercial
+	applications. Programs must display in their "About" dialog-box (or
+	documentation) a text telling they use these routines by Laurent de Soras.
+	Modified source code can be distributed, but modifications must be clearly
+	indicated.
+
+	CONTACT
+
+	Laurent de Soras
+	92 avenue Albert 1er
+	92500 Rueil-Malmaison
+	France
+
+	ldesoras@club-internet.fr
+
+*****************************************************************************/
+
+
+
+/*\\\ EOF \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
diff --git a/src/mod/asr_tts/mod_cepstral/WinReadme.txt b/src/mod/asr_tts/mod_cepstral/WinReadme.txt
index 56b4e79a39..50ca93d3f8 100644
--- a/src/mod/asr_tts/mod_cepstral/WinReadme.txt
+++ b/src/mod/asr_tts/mod_cepstral/WinReadme.txt
@@ -1,4 +1,4 @@
-The Cepstral SDK for Windows should be placed in c:\dev\cepstral
-ex. C:\dev\cepstral\sdk\include
-This SDK can be obtained from http://cepstral.com/
+The Cepstral SDK for Windows should be placed in c:\dev\cepstral
+ex. C:\dev\cepstral\sdk\include
+This SDK can be obtained from http://cepstral.com/
 If you want a prebuilt version you may download one from http://files.freeswitch.org/windows/installer/
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c
index d8eb66aecc..5a97ffa873 100644
--- a/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c
+++ b/src/mod/endpoints/mod_gsmopen/alsa_nogsmlib_nocplusplus/mod_gsmopen/gsmopen_protocol.c
@@ -537,11 +537,11 @@ int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
 		NOTICA("SMS=\n%s\n", GSMOPEN_P_LOG, sms->toString().c_str());
 
 #if 0
-            size = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, 0);
-            UserName=(wchar_t*)GlobalAlloc(GME­ M_ZEROINIT, size);
-            ret = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, size);
-            if(ret == 0)
-                getError(GetLastError());
+            size = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, 0);
+            UserName=(wchar_t*)GlobalAlloc(GME­ M_ZEROINIT, size);
+            ret = MultiByteToWideChar(CP_OEMCP, 0, username, strlen(username)+1, UserName, size);
+            if(ret == 0)
+                getError(GetLastError());
 #endif //0
 	return (-1);
 }
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h
index afa50d4567..d2a909fd73 100644
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h
+++ b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/getopt.h
@@ -1,17 +1,17 @@
-#ifndef LIBCTB_WIN32_GETOPT_H_INCLUDED_
-#define LIBCTB_WIN32_GETOPT_H_INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        win32/getopt.h
-// Purpose:
-// Author:      Joachim Buermann
-// Copyright:   (c) 2010 Joachim Buermann
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-extern char* optarg;
-extern int optind;
-
-int getopt(int argc, char* argv[], char* optstring);
-
-#endif
+#ifndef LIBCTB_WIN32_GETOPT_H_INCLUDED_
+#define LIBCTB_WIN32_GETOPT_H_INCLUDED_
+
+/////////////////////////////////////////////////////////////////////////////
+// Name:        win32/getopt.h
+// Purpose:
+// Author:      Joachim Buermann
+// Copyright:   (c) 2010 Joachim Buermann
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+extern char* optarg;
+extern int optind;
+
+int getopt(int argc, char* argv[], char* optstring);
+
+#endif
diff --git a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h
index 627b30acfa..307c6ce001 100644
--- a/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h
+++ b/src/mod/endpoints/mod_gsmopen/libctb-0.16/include/ctb-0.16/win32/gpib-32.h
@@ -1,414 +1,414 @@
-/*
- *
- *
- *                     Win32 include file
- *          for accessing the 32-bit GPIB DLL (gpib-32.dll)
- *
- *
- *         Contains user variables (ibsta, iberr, ibcnt, ibcntl),
- *         function prototypes and useful defined constants for
- *         calling NI-488 and NI-488.2 routines from a Microsoft
- *         C/C++ Win32 application.
- *
- *
- *            Copyright 1998 National Instruments Corporation
- *
- */
-
-#ifndef DECL_32_H       // ensure we are only included once
-#define DECL_32_H
-
-#include "windows.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***************************************************************************/
-/*    HANDY CONSTANTS FOR USE BY APPLICATION PROGRAMS ...                  */
-/***************************************************************************/
-#define UNL  0x3f  /* GPIB unlisten command                */
-#define UNT  0x5f  /* GPIB untalk command                  */
-#define GTL  0x01  /* GPIB go to local                     */
-#define SDC  0x04  /* GPIB selected device clear           */
-#define PPC  0x05  /* GPIB parallel poll configure         */
-#define GET  0x08  /* GPIB group execute trigger           */
-#define TCT  0x09  /* GPIB take control                    */
-#define LLO  0x11  /* GPIB local lock out                  */
-#define DCL  0x14  /* GPIB device clear                    */
-#define PPU  0.16  /* GPIB parallel poll unconfigure       */
-#define SPE  0x18  /* GPIB serial poll enable              */
-#define SPD  0x19  /* GPIB serial poll disable             */
-#define PPE  0x60  /* GPIB parallel poll enable            */
-#define PPD  0x70  /* GPIB parallel poll disable           */
-
-/* GPIB status bit vector :                                */
-/*       global variable ibsta and wait mask               */
-
-#define ERR     (1<<15) /* Error detected                  */
-#define TIMO    (1<<14) /* Timeout                         */
-#define END     (1<<13) /* EOI or EOS detected             */
-#define SRQI    (1<<12) /* SRQ detected by CIC             */
-#define RQS     (1<<11) /* Device needs service            */
-#define CMPL    (1<<8)  /* I/O completed                   */
-#define LOK     (1<<7)  /* Local lockout state             */
-#define REM     (1<<6)  /* Remote state                    */
-#define CIC     (1<<5)  /* Controller-in-Charge            */
-#define ATN     (1<<4)  /* Attention asserted              */
-#define TACS    (1<<3)  /* Talker active                   */
-#define LACS    (1<<2)  /* Listener active                 */
-#define DTAS    (1<<1)  /* Device trigger state            */
-#define DCAS    (1<<0)  /* Device clear state              */
-
-/* Error messages returned in global variable iberr        */
-
-#define EDVR  0  /* System error                           */
-#define ECIC  1  /* Function requires GPIB board to be CIC */
-#define ENOL  2  /* Write function detected no Listeners   */
-#define EADR  3  /* Interface board not addressed correctly*/
-#define EARG  4  /* Invalid argument to function call      */
-#define ESAC  5  /* Function requires GPIB board to be SAC */
-#define EABO  6  /* I/O operation aborted                  */
-#define ENEB  7  /* Non-existent interface board           */
-#define EDMA  8  /* Error performing DMA                   */
-#define EOIP 10  /* I/O operation started before previous  */
-                 /* operation completed                    */
-#define ECAP 11  /* No capability for intended operation   */
-#define EFSO 12  /* File system operation error            */
-#define EBUS 14  /* Command error during device call       */
-#define ESTB 15  /* Serial poll status byte lost           */
-#define ESRQ 16  /* SRQ remains asserted                   */
-#define ETAB 20  /* The return buffer is full.             */
-#define ELCK 21  /* Address or board is locked.            */
-
-/* EOS mode bits                                           */
-
-#define BIN  (1<<12) /* Eight bit compare                  */
-#define XEOS (1<<11) /* Send END with EOS byte             */
-#define REOS (1<<10) /* Terminate read on EOS              */
-
-/* Timeout values and meanings                             */
-
-#define TNONE    0   /* Infinite timeout (disabled)        */
-#define T10us    1   /* Timeout of 10 us (ideal)           */
-#define T30us    2   /* Timeout of 30 us (ideal)           */
-#define T100us   3   /* Timeout of 100 us (ideal)          */
-#define T300us   4   /* Timeout of 300 us (ideal)          */
-#define T1ms     5   /* Timeout of 1 ms (ideal)            */
-#define T3ms     6   /* Timeout of 3 ms (ideal)            */
-#define T10ms    7   /* Timeout of 10 ms (ideal)           */
-#define T30ms    8   /* Timeout of 30 ms (ideal)           */
-#define T100ms   9   /* Timeout of 100 ms (ideal)          */
-#define T300ms  10   /* Timeout of 300 ms (ideal)          */
-#define T1s     11   /* Timeout of 1 s (ideal)             */
-#define T3s     12   /* Timeout of 3 s (ideal)             */
-#define T10s    13   /* Timeout of 10 s (ideal)            */
-#define T30s    14   /* Timeout of 30 s (ideal)            */
-#define T100s   15   /* Timeout of 100 s (ideal)           */
-#define T300s   16   /* Timeout of 300 s (ideal)           */
-#define T1000s  17   /* Timeout of 1000 s (ideal)          */
-
-
-/*  IBLN Constants                                         */
-#define NO_SAD   0
-#define ALL_SAD -1
-
-
-/*  The following constants are used for the second parameter of the
- *  ibconfig function.  They are the "option" selection codes.
- */
-#define  IbcPAD        0x0001      /* Primary Address                      */
-#define  IbcSAD        0x0002      /* Secondary Address                    */
-#define  IbcTMO        0x0003      /* Timeout Value                        */
-#define  IbcEOT        0x0004      /* Send EOI with last data byte?        */
-#define  IbcPPC        0x0005      /* Parallel Poll Configure              */
-#define  IbcREADDR     0x0006      /* Repeat Addressing                    */
-#define  IbcAUTOPOLL   0x0007      /* Disable Auto Serial Polling          */
-#define  IbcCICPROT    0x0008      /* Use the CIC Protocol?                */
-#define  IbcIRQ        0x0009      /* Use PIO for I/O                      */
-#define  IbcSC         0x000A      /* Board is System Controller?          */
-#define  IbcSRE        0x000B      /* Assert SRE on device calls?          */
-#define  IbcEOSrd      0x000C      /* Terminate reads on EOS               */
-#define  IbcEOSwrt     0x000D      /* Send EOI with EOS character          */
-#define  IbcEOScmp     0x000E      /* Use 7 or 8-bit EOS compare           */
-#define  IbcEOSchar    0x000F      /* The EOS character.                   */
-#define  IbcPP2        0x0010      /* Use Parallel Poll Mode 2.            */
-#define  IbcTIMING     0x0011      /* NORMAL, HIGH, or VERY_HIGH timing.   */
-#define  IbcDMA        0x0012      /* Use DMA for I/O                      */
-#define  IbcReadAdjust 0x0013      /* Swap bytes during an ibrd.           */
-#define  IbcWriteAdjust 0x014      /* Swap bytes during an ibwrt.          */
-#define  IbcSendLLO    0x0017      /* Enable/disable the sending of LLO.      */
-#define  IbcSPollTime  0x0018      /* Set the timeout value for serial polls. */
-#define  IbcPPollTime  0x0019      /* Set the parallel poll length period.    */
-#define  IbcEndBitIsNormal 0x001A  /* Remove EOS from END bit of IBSTA.       */
-#define  IbcUnAddr         0x001B  /* Enable/disable device unaddressing.     */
-#define  IbcSignalNumber   0x001C  /* Set UNIX signal number - unsupported */
-#define  IbcBlockIfLocked  0x001D   /* Enable/disable blocking for locked boards/devices         */
-#define  IbcHSCableLength  0x001F  /* Length of cable specified for high speed timing.*/
-#define  IbcIst        0x0020      /* Set the IST bit.                     */
-#define  IbcRsv        0x0021      /* Set the RSV byte.                    */
-
-/*
- *    Constants that can be used (in addition to the ibconfig constants)
- *    when calling the ibask() function.
- */
-
-#define  IbaPAD            IbcPAD
-#define  IbaSAD            IbcSAD
-#define  IbaTMO            IbcTMO
-#define  IbaEOT            IbcEOT
-#define  IbaPPC            IbcPPC
-#define  IbaREADDR         IbcREADDR
-#define  IbaAUTOPOLL       IbcAUTOPOLL
-#define  IbaCICPROT        IbcCICPROT
-#define  IbaIRQ            IbcIRQ
-#define  IbaSC             IbcSC
-#define  IbaSRE            IbcSRE
-#define  IbaEOSrd          IbcEOSrd
-#define  IbaEOSwrt         IbcEOSwrt
-#define  IbaEOScmp         IbcEOScmp
-#define  IbaEOSchar        IbcEOSchar
-#define  IbaPP2            IbcPP2
-#define  IbaTIMING         IbcTIMING
-#define  IbaDMA            IbcDMA
-#define  IbaReadAdjust     IbcReadAdjust
-#define  IbaWriteAdjust    IbcWriteAdjust
-#define  IbaSendLLO        IbcSendLLO
-#define  IbaSPollTime      IbcSPollTime
-#define  IbaPPollTime      IbcPPollTime
-#define  IbaEndBitIsNormal IbcEndBitIsNormal
-#define  IbaUnAddr         IbcUnAddr
-#define  IbaSignalNumber   IbcSignalNumber
-#define  IbaBlockIfLocked  IbcBlockIfLocked
-#define  IbaHSCableLength  IbcHSCableLength
-#define  IbaIst            IbcIst
-#define  IbaRsv            IbcRsv
-
-#define  IbaBNA            0x0200   /* A device's access board.                  */
-
-
-/* Values used by the Send 488.2 command. */
-#define  NULLend 0x00  /* Do nothing at the end of a transfer.*/
-#define  NLend   0x01  /* Send NL with EOI after a transfer.  */
-#define  DABend  0x02  /* Send EOI with the last DAB.         */
-
-/* Value used by the 488.2 Receive command.
- */
-#define  STOPend     0x0100
-
-
-/* Address type (for 488.2 calls) */
-
-typedef short Addr4882_t;       /* System dependent: must be 16 bits */
-
-/*
- *  This macro can be used to easily create an entry in address list
- *  that is required by many of the 488.2 functions. The primary address goes in the
- *  lower 8-bits and the secondary address goes in the upper 8-bits.
- */
-#define  MakeAddr(pad, sad)   ((Addr4882_t)(((pad)&0xFF) | ((sad)<<8)))
-
-/*
- *  This value is used to terminate an address list.  It should be
- *  assigned to the last entry.
- */
-#ifndef NOADDR
-#define  NOADDR    (Addr4882_t)((unsigned short)0xFFFF)
-#endif
-
-/*
- *  The following two macros are used to "break apart" an address list
- *  entry.  They take an unsigned integer and return either the primary
- *  or secondary address stored in the integer.
- */
-#define  GetPAD(val)    ((val) & 0xFF)
-#define  GetSAD(val)    (((val) >> 8) & 0xFF)
-
-/* iblines constants */
-
-#define  ValidEOI   (short)0x0080
-#define  ValidATN   (short)0x0040
-#define  ValidSRQ   (short)0x0020
-#define  ValidREN   (short)0x0010
-#define  ValidIFC   (short)0x0008
-#define  ValidNRFD  (short)0x0004
-#define  ValidNDAC  (short)0x0002
-#define  ValidDAV   (short)0x0001
-#define  BusEOI     (short)0x8000
-#define  BusATN     (short)0x4000
-#define  BusSRQ     (short)0x2000
-#define  BusREN     (short)0x1000
-#define  BusIFC     (short)0x0800
-#define  BusNRFD    (short)0x0400
-#define  BusNDAC    (short)0x0200
-#define  BusDAV     (short)0x0100
-
-/****
- **** typedef for ibnotify callback ****
- ****/
-typedef int (__stdcall * GpibNotifyCallback_t)(int, int, int, long, PVOID);
-
-#define IBNOTIFY_REARM_FAILED    0xE00A003F
-
-
-/*************************************************************************/
-/*                                                                       */
-/*  iblockx and ibunlockx definitions --- for use with GPIB-ENET only !! */
-/*                                                                       */
-/*************************************************************************/
-#define  TIMMEDIATE                 -1
-#define  TINFINITE                  -2
-#define  MAX_LOCKSHARENAME_LENGTH   64
-
-#if defined(UNICODE)
-   #define iblockx iblockxW
-#else
-   #define iblockx iblockxA
-#endif
-
-extern int __stdcall iblockxA (int ud, int LockWaitTime, PCHAR LockShareName);
-extern int __stdcall iblockxW (int ud, int LockWaitTime, PWCHAR LockShareName);
-extern int __stdcall ibunlockx (int ud);
-
-
-/***************************************************************************/
-/*         IBSTA, IBERR, IBCNT, IBCNTL and FUNCTION PROTOTYPES             */
-/*      ( only included if not accessing the 32-bit DLL directly )         */
-/***************************************************************************/
-#if !defined(GPIB_DIRECT_ACCESS)
-
-/*
- *  Set up access to the user variables (ibsta, iberr, ibcnt, ibcntl).
- *  These are declared and exported by the 32-bit DLL.  Separate copies
- *  exist for each process that accesses the DLL.  They are shared by
- *  multiple threads of a single process.
- */
-
-extern int  ibsta;
-extern int  iberr;
-extern int  ibcnt;
-extern long ibcntl;
-
-
-#if defined(UNICODE)
-   #define ibbna  ibbnaW
-   #define ibfind ibfindW
-   #define ibrdf  ibrdfW
-   #define ibwrtf ibwrtfW
-#else
-   #define ibbna  ibbnaA
-   #define ibfind ibfindA
-   #define ibrdf  ibrdfA
-   #define ibwrtf ibwrtfA
-#endif
-
-/*
- *  Extern 32-bit GPIB DLL functions
- */
-
-/*  NI-488 Function Prototypes  */
-extern int __stdcall ibfindA   (LPCSTR udname);
-extern int __stdcall ibbnaA    (int ud, LPCSTR udname);
-extern int __stdcall ibrdfA    (int ud, LPCSTR filename);
-extern int __stdcall ibwrtfA   (int ud, LPCSTR filename);
-
-extern int __stdcall ibfindW   (LPCWSTR udname);
-extern int __stdcall ibbnaW    (int ud, LPCWSTR udname);
-extern int __stdcall ibrdfW    (int ud, LPCWSTR filename);
-extern int __stdcall ibwrtfW   (int ud, LPCWSTR filename);
-
-extern int __stdcall ibask    (int ud, int option, PINT v);
-extern int __stdcall ibcac    (int ud, int v);
-extern int __stdcall ibclr    (int ud);
-extern int __stdcall ibcmd    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibcmda   (int ud, PVOID buf, long cnt);
-extern int __stdcall ibconfig (int ud, int option, int v);
-extern int __stdcall ibdev    (int boardID, int pad, int sad, int tmo, int eot, int eos);
-extern int __stdcall ibdiag   (int ud, PVOID buf, long cnt);
-extern int __stdcall ibdma    (int ud, int v);
-extern int __stdcall ibeos    (int ud, int v);
-extern int __stdcall ibeot    (int ud, int v);
-extern int __stdcall ibgts    (int ud, int v);
-extern int __stdcall ibist    (int ud, int v);
-extern int __stdcall iblines  (int ud, PSHORT result);
-extern int __stdcall ibln     (int ud, int pad, int sad, PSHORT listen);
-extern int __stdcall ibloc    (int ud);
-extern int __stdcall ibnotify (int ud, int mask, GpibNotifyCallback_t Callback, PVOID RefData);
-extern int __stdcall ibonl    (int ud, int v);
-extern int __stdcall ibpad    (int ud, int v);
-extern int __stdcall ibpct    (int ud);
-extern int __stdcall ibpoke   (int ud, long option, long v);
-extern int __stdcall ibppc    (int ud, int v);
-extern int __stdcall ibrd     (int ud, PVOID buf, long cnt);
-extern int __stdcall ibrda    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibrpp    (int ud, PCHAR ppr);
-extern int __stdcall ibrsc    (int ud, int v);
-extern int __stdcall ibrsp    (int ud, PCHAR spr);
-extern int __stdcall ibrsv    (int ud, int v);
-extern int __stdcall ibsad    (int ud, int v);
-extern int __stdcall ibsic    (int ud);
-extern int __stdcall ibsre    (int ud, int v);
-extern int __stdcall ibstop   (int ud);
-extern int __stdcall ibtmo    (int ud, int v);
-extern int __stdcall ibtrg    (int ud);
-extern int __stdcall ibwait   (int ud, int mask);
-extern int __stdcall ibwrt    (int ud, PVOID buf, long cnt);
-extern int __stdcall ibwrta   (int ud, PVOID buf, long cnt);
-
-// GPIB-ENET only functions to support locking across machines
-extern int __stdcall iblock   (int ud);
-extern int __stdcall ibunlock (int ud);
-
-/**************************************************************************/
-/*  Functions to access Thread-Specific copies of the GPIB global vars */
-
-extern int  __stdcall ThreadIbsta (void);
-extern int  __stdcall ThreadIberr (void);
-extern int  __stdcall ThreadIbcnt (void);
-extern long __stdcall ThreadIbcntl (void);
-
-
-/**************************************************************************/
-/*  NI-488.2 Function Prototypes  */
-
-extern void __stdcall AllSpoll      (int boardID, Addr4882_t * addrlist, PSHORT results);
-extern void __stdcall DevClear      (int boardID, Addr4882_t addr);
-extern void __stdcall DevClearList  (int boardID, Addr4882_t * addrlist);
-extern void __stdcall EnableLocal   (int boardID, Addr4882_t * addrlist);
-extern void __stdcall EnableRemote  (int boardID, Addr4882_t * addrlist);
-extern void __stdcall FindLstn      (int boardID, Addr4882_t * addrlist, Addr4882_t * results, int limit);
-extern void __stdcall FindRQS       (int boardID, Addr4882_t * addrlist, PSHORT dev_stat);
-extern void __stdcall PPoll         (int boardID, PSHORT result);
-extern void __stdcall PPollConfig   (int boardID, Addr4882_t addr, int dataLine, int lineSense);
-extern void __stdcall PPollUnconfig (int boardID, Addr4882_t * addrlist);
-extern void __stdcall PassControl   (int boardID, Addr4882_t addr);
-extern void __stdcall RcvRespMsg    (int boardID, PVOID buffer, long cnt, int Termination);
-extern void __stdcall ReadStatusByte(int boardID, Addr4882_t addr, PSHORT result);
-extern void __stdcall Receive       (int boardID, Addr4882_t addr, PVOID buffer, long cnt, int Termination);
-extern void __stdcall ReceiveSetup  (int boardID, Addr4882_t addr);
-extern void __stdcall ResetSys      (int boardID, Addr4882_t * addrlist);
-extern void __stdcall Send          (int boardID, Addr4882_t addr, PVOID databuf, long datacnt, int eotMode);
-extern void __stdcall SendCmds      (int boardID, PVOID buffer, long cnt);
-extern void __stdcall SendDataBytes (int boardID, PVOID buffer, long cnt, int eot_mode);
-extern void __stdcall SendIFC       (int boardID);
-extern void __stdcall SendLLO       (int boardID);
-extern void __stdcall SendList      (int boardID, Addr4882_t * addrlist, PVOID databuf, long datacnt, int eotMode);
-extern void __stdcall SendSetup     (int boardID, Addr4882_t * addrlist);
-extern void __stdcall SetRWLS       (int boardID, Addr4882_t * addrlist);
-extern void __stdcall TestSRQ       (int boardID, PSHORT result);
-extern void __stdcall TestSys       (int boardID, Addr4882_t * addrlist, PSHORT results);
-extern void __stdcall Trigger       (int boardID, Addr4882_t addr);
-extern void __stdcall TriggerList   (int boardID, Addr4882_t * addrlist);
-extern void __stdcall WaitSRQ       (int boardID, PSHORT result);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif   // DECL_32_H
-
+/*
+ *
+ *
+ *                     Win32 include file
+ *          for accessing the 32-bit GPIB DLL (gpib-32.dll)
+ *
+ *
+ *         Contains user variables (ibsta, iberr, ibcnt, ibcntl),
+ *         function prototypes and useful defined constants for
+ *         calling NI-488 and NI-488.2 routines from a Microsoft
+ *         C/C++ Win32 application.
+ *
+ *
+ *            Copyright 1998 National Instruments Corporation
+ *
+ */
+
+#ifndef DECL_32_H       // ensure we are only included once
+#define DECL_32_H
+
+#include "windows.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***************************************************************************/
+/*    HANDY CONSTANTS FOR USE BY APPLICATION PROGRAMS ...                  */
+/***************************************************************************/
+#define UNL  0x3f  /* GPIB unlisten command                */
+#define UNT  0x5f  /* GPIB untalk command                  */
+#define GTL  0x01  /* GPIB go to local                     */
+#define SDC  0x04  /* GPIB selected device clear           */
+#define PPC  0x05  /* GPIB parallel poll configure         */
+#define GET  0x08  /* GPIB group execute trigger           */
+#define TCT  0x09  /* GPIB take control                    */
+#define LLO  0x11  /* GPIB local lock out                  */
+#define DCL  0x14  /* GPIB device clear                    */
+#define PPU  0.16  /* GPIB parallel poll unconfigure       */
+#define SPE  0x18  /* GPIB serial poll enable              */
+#define SPD  0x19  /* GPIB serial poll disable             */
+#define PPE  0x60  /* GPIB parallel poll enable            */
+#define PPD  0x70  /* GPIB parallel poll disable           */
+
+/* GPIB status bit vector :                                */
+/*       global variable ibsta and wait mask               */
+
+#define ERR     (1<<15) /* Error detected                  */
+#define TIMO    (1<<14) /* Timeout                         */
+#define END     (1<<13) /* EOI or EOS detected             */
+#define SRQI    (1<<12) /* SRQ detected by CIC             */
+#define RQS     (1<<11) /* Device needs service            */
+#define CMPL    (1<<8)  /* I/O completed                   */
+#define LOK     (1<<7)  /* Local lockout state             */
+#define REM     (1<<6)  /* Remote state                    */
+#define CIC     (1<<5)  /* Controller-in-Charge            */
+#define ATN     (1<<4)  /* Attention asserted              */
+#define TACS    (1<<3)  /* Talker active                   */
+#define LACS    (1<<2)  /* Listener active                 */
+#define DTAS    (1<<1)  /* Device trigger state            */
+#define DCAS    (1<<0)  /* Device clear state              */
+
+/* Error messages returned in global variable iberr        */
+
+#define EDVR  0  /* System error                           */
+#define ECIC  1  /* Function requires GPIB board to be CIC */
+#define ENOL  2  /* Write function detected no Listeners   */
+#define EADR  3  /* Interface board not addressed correctly*/
+#define EARG  4  /* Invalid argument to function call      */
+#define ESAC  5  /* Function requires GPIB board to be SAC */
+#define EABO  6  /* I/O operation aborted                  */
+#define ENEB  7  /* Non-existent interface board           */
+#define EDMA  8  /* Error performing DMA                   */
+#define EOIP 10  /* I/O operation started before previous  */
+                 /* operation completed                    */
+#define ECAP 11  /* No capability for intended operation   */
+#define EFSO 12  /* File system operation error            */
+#define EBUS 14  /* Command error during device call       */
+#define ESTB 15  /* Serial poll status byte lost           */
+#define ESRQ 16  /* SRQ remains asserted                   */
+#define ETAB 20  /* The return buffer is full.             */
+#define ELCK 21  /* Address or board is locked.            */
+
+/* EOS mode bits                                           */
+
+#define BIN  (1<<12) /* Eight bit compare                  */
+#define XEOS (1<<11) /* Send END with EOS byte             */
+#define REOS (1<<10) /* Terminate read on EOS              */
+
+/* Timeout values and meanings                             */
+
+#define TNONE    0   /* Infinite timeout (disabled)        */
+#define T10us    1   /* Timeout of 10 us (ideal)           */
+#define T30us    2   /* Timeout of 30 us (ideal)           */
+#define T100us   3   /* Timeout of 100 us (ideal)          */
+#define T300us   4   /* Timeout of 300 us (ideal)          */
+#define T1ms     5   /* Timeout of 1 ms (ideal)            */
+#define T3ms     6   /* Timeout of 3 ms (ideal)            */
+#define T10ms    7   /* Timeout of 10 ms (ideal)           */
+#define T30ms    8   /* Timeout of 30 ms (ideal)           */
+#define T100ms   9   /* Timeout of 100 ms (ideal)          */
+#define T300ms  10   /* Timeout of 300 ms (ideal)          */
+#define T1s     11   /* Timeout of 1 s (ideal)             */
+#define T3s     12   /* Timeout of 3 s (ideal)             */
+#define T10s    13   /* Timeout of 10 s (ideal)            */
+#define T30s    14   /* Timeout of 30 s (ideal)            */
+#define T100s   15   /* Timeout of 100 s (ideal)           */
+#define T300s   16   /* Timeout of 300 s (ideal)           */
+#define T1000s  17   /* Timeout of 1000 s (ideal)          */
+
+
+/*  IBLN Constants                                         */
+#define NO_SAD   0
+#define ALL_SAD -1
+
+
+/*  The following constants are used for the second parameter of the
+ *  ibconfig function.  They are the "option" selection codes.
+ */
+#define  IbcPAD        0x0001      /* Primary Address                      */
+#define  IbcSAD        0x0002      /* Secondary Address                    */
+#define  IbcTMO        0x0003      /* Timeout Value                        */
+#define  IbcEOT        0x0004      /* Send EOI with last data byte?        */
+#define  IbcPPC        0x0005      /* Parallel Poll Configure              */
+#define  IbcREADDR     0x0006      /* Repeat Addressing                    */
+#define  IbcAUTOPOLL   0x0007      /* Disable Auto Serial Polling          */
+#define  IbcCICPROT    0x0008      /* Use the CIC Protocol?                */
+#define  IbcIRQ        0x0009      /* Use PIO for I/O                      */
+#define  IbcSC         0x000A      /* Board is System Controller?          */
+#define  IbcSRE        0x000B      /* Assert SRE on device calls?          */
+#define  IbcEOSrd      0x000C      /* Terminate reads on EOS               */
+#define  IbcEOSwrt     0x000D      /* Send EOI with EOS character          */
+#define  IbcEOScmp     0x000E      /* Use 7 or 8-bit EOS compare           */
+#define  IbcEOSchar    0x000F      /* The EOS character.                   */
+#define  IbcPP2        0x0010      /* Use Parallel Poll Mode 2.            */
+#define  IbcTIMING     0x0011      /* NORMAL, HIGH, or VERY_HIGH timing.   */
+#define  IbcDMA        0x0012      /* Use DMA for I/O                      */
+#define  IbcReadAdjust 0x0013      /* Swap bytes during an ibrd.           */
+#define  IbcWriteAdjust 0x014      /* Swap bytes during an ibwrt.          */
+#define  IbcSendLLO    0x0017      /* Enable/disable the sending of LLO.      */
+#define  IbcSPollTime  0x0018      /* Set the timeout value for serial polls. */
+#define  IbcPPollTime  0x0019      /* Set the parallel poll length period.    */
+#define  IbcEndBitIsNormal 0x001A  /* Remove EOS from END bit of IBSTA.       */
+#define  IbcUnAddr         0x001B  /* Enable/disable device unaddressing.     */
+#define  IbcSignalNumber   0x001C  /* Set UNIX signal number - unsupported */
+#define  IbcBlockIfLocked  0x001D   /* Enable/disable blocking for locked boards/devices         */
+#define  IbcHSCableLength  0x001F  /* Length of cable specified for high speed timing.*/
+#define  IbcIst        0x0020      /* Set the IST bit.                     */
+#define  IbcRsv        0x0021      /* Set the RSV byte.                    */
+
+/*
+ *    Constants that can be used (in addition to the ibconfig constants)
+ *    when calling the ibask() function.
+ */
+
+#define  IbaPAD            IbcPAD
+#define  IbaSAD            IbcSAD
+#define  IbaTMO            IbcTMO
+#define  IbaEOT            IbcEOT
+#define  IbaPPC            IbcPPC
+#define  IbaREADDR         IbcREADDR
+#define  IbaAUTOPOLL       IbcAUTOPOLL
+#define  IbaCICPROT        IbcCICPROT
+#define  IbaIRQ            IbcIRQ
+#define  IbaSC             IbcSC
+#define  IbaSRE            IbcSRE
+#define  IbaEOSrd          IbcEOSrd
+#define  IbaEOSwrt         IbcEOSwrt
+#define  IbaEOScmp         IbcEOScmp
+#define  IbaEOSchar        IbcEOSchar
+#define  IbaPP2            IbcPP2
+#define  IbaTIMING         IbcTIMING
+#define  IbaDMA            IbcDMA
+#define  IbaReadAdjust     IbcReadAdjust
+#define  IbaWriteAdjust    IbcWriteAdjust
+#define  IbaSendLLO        IbcSendLLO
+#define  IbaSPollTime      IbcSPollTime
+#define  IbaPPollTime      IbcPPollTime
+#define  IbaEndBitIsNormal IbcEndBitIsNormal
+#define  IbaUnAddr         IbcUnAddr
+#define  IbaSignalNumber   IbcSignalNumber
+#define  IbaBlockIfLocked  IbcBlockIfLocked
+#define  IbaHSCableLength  IbcHSCableLength
+#define  IbaIst            IbcIst
+#define  IbaRsv            IbcRsv
+
+#define  IbaBNA            0x0200   /* A device's access board.                  */
+
+
+/* Values used by the Send 488.2 command. */
+#define  NULLend 0x00  /* Do nothing at the end of a transfer.*/
+#define  NLend   0x01  /* Send NL with EOI after a transfer.  */
+#define  DABend  0x02  /* Send EOI with the last DAB.         */
+
+/* Value used by the 488.2 Receive command.
+ */
+#define  STOPend     0x0100
+
+
+/* Address type (for 488.2 calls) */
+
+typedef short Addr4882_t;       /* System dependent: must be 16 bits */
+
+/*
+ *  This macro can be used to easily create an entry in address list
+ *  that is required by many of the 488.2 functions. The primary address goes in the
+ *  lower 8-bits and the secondary address goes in the upper 8-bits.
+ */
+#define  MakeAddr(pad, sad)   ((Addr4882_t)(((pad)&0xFF) | ((sad)<<8)))
+
+/*
+ *  This value is used to terminate an address list.  It should be
+ *  assigned to the last entry.
+ */
+#ifndef NOADDR
+#define  NOADDR    (Addr4882_t)((unsigned short)0xFFFF)
+#endif
+
+/*
+ *  The following two macros are used to "break apart" an address list
+ *  entry.  They take an unsigned integer and return either the primary
+ *  or secondary address stored in the integer.
+ */
+#define  GetPAD(val)    ((val) & 0xFF)
+#define  GetSAD(val)    (((val) >> 8) & 0xFF)
+
+/* iblines constants */
+
+#define  ValidEOI   (short)0x0080
+#define  ValidATN   (short)0x0040
+#define  ValidSRQ   (short)0x0020
+#define  ValidREN   (short)0x0010
+#define  ValidIFC   (short)0x0008
+#define  ValidNRFD  (short)0x0004
+#define  ValidNDAC  (short)0x0002
+#define  ValidDAV   (short)0x0001
+#define  BusEOI     (short)0x8000
+#define  BusATN     (short)0x4000
+#define  BusSRQ     (short)0x2000
+#define  BusREN     (short)0x1000
+#define  BusIFC     (short)0x0800
+#define  BusNRFD    (short)0x0400
+#define  BusNDAC    (short)0x0200
+#define  BusDAV     (short)0x0100
+
+/****
+ **** typedef for ibnotify callback ****
+ ****/
+typedef int (__stdcall * GpibNotifyCallback_t)(int, int, int, long, PVOID);
+
+#define IBNOTIFY_REARM_FAILED    0xE00A003F
+
+
+/*************************************************************************/
+/*                                                                       */
+/*  iblockx and ibunlockx definitions --- for use with GPIB-ENET only !! */
+/*                                                                       */
+/*************************************************************************/
+#define  TIMMEDIATE                 -1
+#define  TINFINITE                  -2
+#define  MAX_LOCKSHARENAME_LENGTH   64
+
+#if defined(UNICODE)
+   #define iblockx iblockxW
+#else
+   #define iblockx iblockxA
+#endif
+
+extern int __stdcall iblockxA (int ud, int LockWaitTime, PCHAR LockShareName);
+extern int __stdcall iblockxW (int ud, int LockWaitTime, PWCHAR LockShareName);
+extern int __stdcall ibunlockx (int ud);
+
+
+/***************************************************************************/
+/*         IBSTA, IBERR, IBCNT, IBCNTL and FUNCTION PROTOTYPES             */
+/*      ( only included if not accessing the 32-bit DLL directly )         */
+/***************************************************************************/
+#if !defined(GPIB_DIRECT_ACCESS)
+
+/*
+ *  Set up access to the user variables (ibsta, iberr, ibcnt, ibcntl).
+ *  These are declared and exported by the 32-bit DLL.  Separate copies
+ *  exist for each process that accesses the DLL.  They are shared by
+ *  multiple threads of a single process.
+ */
+
+extern int  ibsta;
+extern int  iberr;
+extern int  ibcnt;
+extern long ibcntl;
+
+
+#if defined(UNICODE)
+   #define ibbna  ibbnaW
+   #define ibfind ibfindW
+   #define ibrdf  ibrdfW
+   #define ibwrtf ibwrtfW
+#else
+   #define ibbna  ibbnaA
+   #define ibfind ibfindA
+   #define ibrdf  ibrdfA
+   #define ibwrtf ibwrtfA
+#endif
+
+/*
+ *  Extern 32-bit GPIB DLL functions
+ */
+
+/*  NI-488 Function Prototypes  */
+extern int __stdcall ibfindA   (LPCSTR udname);
+extern int __stdcall ibbnaA    (int ud, LPCSTR udname);
+extern int __stdcall ibrdfA    (int ud, LPCSTR filename);
+extern int __stdcall ibwrtfA   (int ud, LPCSTR filename);
+
+extern int __stdcall ibfindW   (LPCWSTR udname);
+extern int __stdcall ibbnaW    (int ud, LPCWSTR udname);
+extern int __stdcall ibrdfW    (int ud, LPCWSTR filename);
+extern int __stdcall ibwrtfW   (int ud, LPCWSTR filename);
+
+extern int __stdcall ibask    (int ud, int option, PINT v);
+extern int __stdcall ibcac    (int ud, int v);
+extern int __stdcall ibclr    (int ud);
+extern int __stdcall ibcmd    (int ud, PVOID buf, long cnt);
+extern int __stdcall ibcmda   (int ud, PVOID buf, long cnt);
+extern int __stdcall ibconfig (int ud, int option, int v);
+extern int __stdcall ibdev    (int boardID, int pad, int sad, int tmo, int eot, int eos);
+extern int __stdcall ibdiag   (int ud, PVOID buf, long cnt);
+extern int __stdcall ibdma    (int ud, int v);
+extern int __stdcall ibeos    (int ud, int v);
+extern int __stdcall ibeot    (int ud, int v);
+extern int __stdcall ibgts    (int ud, int v);
+extern int __stdcall ibist    (int ud, int v);
+extern int __stdcall iblines  (int ud, PSHORT result);
+extern int __stdcall ibln     (int ud, int pad, int sad, PSHORT listen);
+extern int __stdcall ibloc    (int ud);
+extern int __stdcall ibnotify (int ud, int mask, GpibNotifyCallback_t Callback, PVOID RefData);
+extern int __stdcall ibonl    (int ud, int v);
+extern int __stdcall ibpad    (int ud, int v);
+extern int __stdcall ibpct    (int ud);
+extern int __stdcall ibpoke   (int ud, long option, long v);
+extern int __stdcall ibppc    (int ud, int v);
+extern int __stdcall ibrd     (int ud, PVOID buf, long cnt);
+extern int __stdcall ibrda    (int ud, PVOID buf, long cnt);
+extern int __stdcall ibrpp    (int ud, PCHAR ppr);
+extern int __stdcall ibrsc    (int ud, int v);
+extern int __stdcall ibrsp    (int ud, PCHAR spr);
+extern int __stdcall ibrsv    (int ud, int v);
+extern int __stdcall ibsad    (int ud, int v);
+extern int __stdcall ibsic    (int ud);
+extern int __stdcall ibsre    (int ud, int v);
+extern int __stdcall ibstop   (int ud);
+extern int __stdcall ibtmo    (int ud, int v);
+extern int __stdcall ibtrg    (int ud);
+extern int __stdcall ibwait   (int ud, int mask);
+extern int __stdcall ibwrt    (int ud, PVOID buf, long cnt);
+extern int __stdcall ibwrta   (int ud, PVOID buf, long cnt);
+
+// GPIB-ENET only functions to support locking across machines
+extern int __stdcall iblock   (int ud);
+extern int __stdcall ibunlock (int ud);
+
+/**************************************************************************/
+/*  Functions to access Thread-Specific copies of the GPIB global vars */
+
+extern int  __stdcall ThreadIbsta (void);
+extern int  __stdcall ThreadIberr (void);
+extern int  __stdcall ThreadIbcnt (void);
+extern long __stdcall ThreadIbcntl (void);
+
+
+/**************************************************************************/
+/*  NI-488.2 Function Prototypes  */
+
+extern void __stdcall AllSpoll      (int boardID, Addr4882_t * addrlist, PSHORT results);
+extern void __stdcall DevClear      (int boardID, Addr4882_t addr);
+extern void __stdcall DevClearList  (int boardID, Addr4882_t * addrlist);
+extern void __stdcall EnableLocal   (int boardID, Addr4882_t * addrlist);
+extern void __stdcall EnableRemote  (int boardID, Addr4882_t * addrlist);
+extern void __stdcall FindLstn      (int boardID, Addr4882_t * addrlist, Addr4882_t * results, int limit);
+extern void __stdcall FindRQS       (int boardID, Addr4882_t * addrlist, PSHORT dev_stat);
+extern void __stdcall PPoll         (int boardID, PSHORT result);
+extern void __stdcall PPollConfig   (int boardID, Addr4882_t addr, int dataLine, int lineSense);
+extern void __stdcall PPollUnconfig (int boardID, Addr4882_t * addrlist);
+extern void __stdcall PassControl   (int boardID, Addr4882_t addr);
+extern void __stdcall RcvRespMsg    (int boardID, PVOID buffer, long cnt, int Termination);
+extern void __stdcall ReadStatusByte(int boardID, Addr4882_t addr, PSHORT result);
+extern void __stdcall Receive       (int boardID, Addr4882_t addr, PVOID buffer, long cnt, int Termination);
+extern void __stdcall ReceiveSetup  (int boardID, Addr4882_t addr);
+extern void __stdcall ResetSys      (int boardID, Addr4882_t * addrlist);
+extern void __stdcall Send          (int boardID, Addr4882_t addr, PVOID databuf, long datacnt, int eotMode);
+extern void __stdcall SendCmds      (int boardID, PVOID buffer, long cnt);
+extern void __stdcall SendDataBytes (int boardID, PVOID buffer, long cnt, int eot_mode);
+extern void __stdcall SendIFC       (int boardID);
+extern void __stdcall SendLLO       (int boardID);
+extern void __stdcall SendList      (int boardID, Addr4882_t * addrlist, PVOID databuf, long datacnt, int eotMode);
+extern void __stdcall SendSetup     (int boardID, Addr4882_t * addrlist);
+extern void __stdcall SetRWLS       (int boardID, Addr4882_t * addrlist);
+extern void __stdcall TestSRQ       (int boardID, PSHORT result);
+extern void __stdcall TestSys       (int boardID, Addr4882_t * addrlist, PSHORT results);
+extern void __stdcall Trigger       (int boardID, Addr4882_t addr);
+extern void __stdcall TriggerList   (int boardID, Addr4882_t * addrlist);
+extern void __stdcall WaitSRQ       (int boardID, PSHORT result);
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif   // DECL_32_H
+
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv.c b/src/mod/endpoints/mod_gsmopen/win_iconv.c
index 4eb5433196..e60f714889 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv.c
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv.c
@@ -1,1986 +1,1986 @@
-/*
- * iconv library using Win32 API to conversion.
- *
- * This file is placed in the public domain.
- *
- * Last Change: 2009-07-06
- *
- * ENVIRONMENT VARIABLE:
- *     WINICONV_LIBICONV_DLL
- *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
- *         loading the DLL or iconv_open() failed, falls back to internal
- *         conversion.  If a few DLL are specified as comma separated list,
- *         the first loadable DLL is used.  The DLL should have iconv_open(),
- *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
- *         and libiconv().
- *         (only available when USE_LIBICONV_DLL is defined at compile time)
- *
- * Win32 API does not support strict encoding conversion for some
- * codepage.  And MLang function drop or replace invalid bytes and does
- * not return useful error status as iconv.  This implementation cannot
- * be used for encoding validation purpose.
- */
-
-/* for WC_NO_BEST_FIT_CHARS */
-#ifndef WINVER
-# define WINVER 0x0500
-#endif
-
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if 0
-# define MAKE_EXE
-# define MAKE_DLL
-# define USE_LIBICONV_DLL
-#endif
-
-#if !defined(DEFAULT_LIBICONV_DLL)
-# define DEFAULT_LIBICONV_DLL ""
-#endif
-
-#define MB_CHAR_MAX 16
-
-#define UNICODE_MODE_BOM_DONE   1
-#define UNICODE_MODE_SWAPPED    2
-
-#define FLAG_USE_BOM            1
-#define FLAG_TRANSLIT           2 /* //TRANSLIT */
-#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-
-typedef void* iconv_t;
-
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-/* libiconv interface for vim */
-#if defined(MAKE_DLL)
-int
-iconvctl (iconv_t cd, int request, void* argument)
-{
-    /* not supported */
-    return 0;
-}
-#endif
-
-typedef struct compat_t compat_t;
-typedef struct csconv_t csconv_t;
-typedef struct rec_iconv_t rec_iconv_t;
-
-typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
-typedef int (*f_iconv_close)(iconv_t cd);
-typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-typedef int* (*f_errno)(void);
-typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
-typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
-
-#define COMPAT_IN   1
-#define COMPAT_OUT  2
-
-/* unicode mapping for compatibility with other conversion table. */
-struct compat_t {
-    uint in;
-    uint out;
-    uint flag;
-};
-
-struct csconv_t {
-    int codepage;
-    int flags;
-    f_mbtowc mbtowc;
-    f_wctomb wctomb;
-    f_mblen mblen;
-    f_flush flush;
-    DWORD mode;
-    compat_t *compat;
-};
-
-struct rec_iconv_t {
-    iconv_t cd;
-    f_iconv_close iconv_close;
-    f_iconv iconv;
-    f_errno _errno;
-    csconv_t from;
-    csconv_t to;
-#if defined(USE_LIBICONV_DLL)
-    HMODULE hlibiconv;
-#endif
-};
-
-static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static int win_iconv_close(iconv_t cd);
-static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-static int load_mlang();
-static int make_csconv(const char *name, csconv_t *cv);
-static int name_to_codepage(const char *name);
-static uint utf16_to_ucs4(const ushort *wbuf);
-static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
-static int mbtowc_flags(int codepage);
-static int must_use_null_useddefaultchar(int codepage);
-static char *strrstr(const char *str, const char *token);
-static char *xstrndup(const char *s, size_t n);
-static int seterror(int err);
-
-#if defined(USE_LIBICONV_DLL)
-static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
-static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
-
-static HMODULE hwiniconv;
-#endif
-
-static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-
-static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
-
-static struct {
-    int codepage;
-    const char *name;
-} codepage_alias[] = {
-    {65001, "CP65001"},
-    {65001, "UTF8"},
-    {65001, "UTF-8"},
-
-    {1200, "CP1200"},
-    {1200, "UTF16LE"},
-    {1200, "UTF-16LE"},
-    {1200, "UCS-2LE"},
-
-    {1201, "CP1201"},
-    {1201, "UTF16BE"},
-    {1201, "UTF-16BE"},
-    {1201, "UCS-2BE"},
-    {1201, "unicodeFFFE"},
-
-    {12000, "CP12000"},
-    {12000, "UTF32LE"},
-    {12000, "UTF-32LE"},
-
-    {12001, "CP12001"},
-    {12001, "UTF32BE"},
-    {12001, "UTF-32BE"},
-
-#ifndef GLIB_COMPILATION
-    /*
-     * Default is big endian.
-     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
-     */
-    {1201, "UTF16"},
-    {1201, "UTF-16"},
-    {12001, "UTF32"},
-    {12001, "UTF-32"},
-#else
-    /* Default is little endian, because the platform is */
-    {1200, "UTF16"},
-    {1200, "UTF-16"},
-    {1200, "UCS-2"},
-    {12000, "UTF32"},
-    {12000, "UTF-32"},
-#endif
-
-    /* copy from libiconv `iconv -l` */
-    /* !IsValidCodePage(367) */
-    {20127, "ANSI_X3.4-1968"},
-    {20127, "ANSI_X3.4-1986"},
-    {20127, "ASCII"},
-    {20127, "CP367"},
-    {20127, "IBM367"},
-    {20127, "ISO-IR-6"},
-    {20127, "ISO646-US"},
-    {20127, "ISO_646.IRV:1991"},
-    {20127, "US"},
-    {20127, "US-ASCII"},
-    {20127, "CSASCII"},
-
-    /* !IsValidCodePage(819) */
-    {1252, "CP819"},
-    {1252, "IBM819"},
-    {28591, "ISO-8859-1"},
-    {28591, "ISO-IR-100"},
-    {28591, "ISO8859-1"},
-    {28591, "ISO_8859-1"},
-    {28591, "ISO_8859-1:1987"},
-    {28591, "L1"},
-    {28591, "LATIN1"},
-    {28591, "CSISOLATIN1"},
-
-    {1250, "CP1250"},
-    {1250, "MS-EE"},
-    {1250, "WINDOWS-1250"},
-
-    {1251, "CP1251"},
-    {1251, "MS-CYRL"},
-    {1251, "WINDOWS-1251"},
-
-    {1252, "CP1252"},
-    {1252, "MS-ANSI"},
-    {1252, "WINDOWS-1252"},
-
-    {1253, "CP1253"},
-    {1253, "MS-GREEK"},
-    {1253, "WINDOWS-1253"},
-
-    {1254, "CP1254"},
-    {1254, "MS-TURK"},
-    {1254, "WINDOWS-1254"},
-
-    {1255, "CP1255"},
-    {1255, "MS-HEBR"},
-    {1255, "WINDOWS-1255"},
-
-    {1256, "CP1256"},
-    {1256, "MS-ARAB"},
-    {1256, "WINDOWS-1256"},
-
-    {1257, "CP1257"},
-    {1257, "WINBALTRIM"},
-    {1257, "WINDOWS-1257"},
-
-    {1258, "CP1258"},
-    {1258, "WINDOWS-1258"},
-
-    {850, "850"},
-    {850, "CP850"},
-    {850, "IBM850"},
-    {850, "CSPC850MULTILINGUAL"},
-
-    /* !IsValidCodePage(862) */
-    {862, "862"},
-    {862, "CP862"},
-    {862, "IBM862"},
-    {862, "CSPC862LATINHEBREW"},
-
-    {866, "866"},
-    {866, "CP866"},
-    {866, "IBM866"},
-    {866, "CSIBM866"},
-
-    /* !IsValidCodePage(154) */
-    {154, "CP154"},
-    {154, "CYRILLIC-ASIAN"},
-    {154, "PT154"},
-    {154, "PTCP154"},
-    {154, "CSPTCP154"},
-
-    /* !IsValidCodePage(1133) */
-    {1133, "CP1133"},
-    {1133, "IBM-CP1133"},
-
-    {874, "CP874"},
-    {874, "WINDOWS-874"},
-
-    /* !IsValidCodePage(51932) */
-    {51932, "CP51932"},
-    {51932, "MS51932"},
-    {51932, "WINDOWS-51932"},
-    {51932, "EUC-JP"},
-
-    {932, "CP932"},
-    {932, "MS932"},
-    {932, "SHIFFT_JIS"},
-    {932, "SHIFFT_JIS-MS"},
-    {932, "SJIS"},
-    {932, "SJIS-MS"},
-    {932, "SJIS-OPEN"},
-    {932, "SJIS-WIN"},
-    {932, "WINDOWS-31J"},
-    {932, "WINDOWS-932"},
-    {932, "CSWINDOWS31J"},
-
-    {50221, "CP50221"},
-    {50221, "ISO-2022-JP"},
-    {50221, "ISO-2022-JP-MS"},
-    {50221, "ISO2022-JP"},
-    {50221, "ISO2022-JP-MS"},
-    {50221, "MS50221"},
-    {50221, "WINDOWS-50221"},
-
-    {936, "CP936"},
-    {936, "GBK"},
-    {936, "MS936"},
-    {936, "WINDOWS-936"},
-
-    {950, "CP950"},
-    {950, "BIG5"},
-
-    {949, "CP949"},
-    {949, "UHC"},
-    {949, "EUC-KR"},
-
-    {1361, "CP1361"},
-    {1361, "JOHAB"},
-
-    {437, "437"},
-    {437, "CP437"},
-    {437, "IBM437"},
-    {437, "CSPC8CODEPAGE437"},
-
-    {737, "CP737"},
-
-    {775, "CP775"},
-    {775, "IBM775"},
-    {775, "CSPC775BALTIC"},
-
-    {852, "852"},
-    {852, "CP852"},
-    {852, "IBM852"},
-    {852, "CSPCP852"},
-
-    /* !IsValidCodePage(853) */
-    {853, "CP853"},
-
-    {855, "855"},
-    {855, "CP855"},
-    {855, "IBM855"},
-    {855, "CSIBM855"},
-
-    {857, "857"},
-    {857, "CP857"},
-    {857, "IBM857"},
-    {857, "CSIBM857"},
-
-    /* !IsValidCodePage(858) */
-    {858, "CP858"},
-
-    {860, "860"},
-    {860, "CP860"},
-    {860, "IBM860"},
-    {860, "CSIBM860"},
-
-    {861, "861"},
-    {861, "CP-IS"},
-    {861, "CP861"},
-    {861, "IBM861"},
-    {861, "CSIBM861"},
-
-    {863, "863"},
-    {863, "CP863"},
-    {863, "IBM863"},
-    {863, "CSIBM863"},
-
-    {864, "CP864"},
-    {864, "IBM864"},
-    {864, "CSIBM864"},
-
-    {865, "865"},
-    {865, "CP865"},
-    {865, "IBM865"},
-    {865, "CSIBM865"},
-
-    {869, "869"},
-    {869, "CP-GR"},
-    {869, "CP869"},
-    {869, "IBM869"},
-    {869, "CSIBM869"},
-
-    /* !IsValidCodePage(1152) */
-    {1125, "CP1125"},
-
-    /*
-     * Code Page Identifiers
-     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
-     */
-    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
-    {437, "IBM437"}, /* OEM United States */
-    {500, "IBM500"}, /* IBM EBCDIC International */
-    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
-    /* 709 		Arabic (ASMO-449+, BCON V4) */
-    /* 710 		Arabic - Transparent Arabic */
-    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
-    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
-    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
-    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
-    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
-    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
-    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
-    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
-    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
-    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
-    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
-    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
-    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
-    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
-    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
-    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
-    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
-    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
-    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
-    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
-    {932, "shift-jis"}, /* alternative name for it */
-    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
-    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
-    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
-    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
-    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
-    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
-    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
-    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
-    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
-    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
-    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
-    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
-    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
-    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
-    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
-    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
-    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
-    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
-    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
-    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
-    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
-    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
-    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
-    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
-    {1361, "Johab"}, /* Korean (Johab) */
-    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
-    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
-    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
-    {10003, "x-mac-korean"}, /* Korean (Mac) */
-    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
-    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
-    {10006, "x-mac-greek"}, /* Greek (Mac) */
-    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
-    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
-    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
-    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
-    {10021, "x-mac-thai"}, /* Thai (Mac) */
-    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
-    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
-    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
-    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
-    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
-    {20001, "x-cp20001"}, /* TCA Taiwan */
-    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
-    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
-    {20004, "x-cp20004"}, /* TeleText Taiwan */
-    {20005, "x-cp20005"}, /* Wang Taiwan */
-    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
-    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
-    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
-    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
-    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
-    {20261, "x-cp20261"}, /* T.61 */
-    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
-    {20273, "IBM273"}, /* IBM EBCDIC Germany */
-    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
-    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
-    {20280, "IBM280"}, /* IBM EBCDIC Italy */
-    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
-    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
-    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
-    {20297, "IBM297"}, /* IBM EBCDIC France */
-    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
-    {20423, "IBM423"}, /* IBM EBCDIC Greek */
-    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
-    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
-    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
-    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
-    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
-    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
-    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
-    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
-    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
-    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
-    {20949, "x-cp20949"}, /* Korean Wansung */
-    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
-    /* 21027 		(deprecated) */
-    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
-    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
-    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
-    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
-    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
-    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
-    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
-    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
-    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
-    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
-    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
-    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
-    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
-    {29001, "x-Europa"}, /* Europa 3 */
-    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
-    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
-    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
-    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
-    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
-    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
-    /* 50229 		ISO 2022 Traditional Chinese */
-    /* 50930 		EBCDIC Japanese (Katakana) Extended */
-    /* 50931 		EBCDIC US-Canada and Japanese */
-    /* 50933 		EBCDIC Korean Extended and Korean */
-    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
-    /* 50936 		EBCDIC Simplified Chinese */
-    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
-    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
-    {51932, "euc-jp"}, /* EUC Japanese */
-    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
-    {51949, "euc-kr"}, /* EUC Korean */
-    /* 51950 		EUC Traditional Chinese */
-    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
-    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
-    {57002, "x-iscii-de"}, /* ISCII Devanagari */
-    {57003, "x-iscii-be"}, /* ISCII Bengali */
-    {57004, "x-iscii-ta"}, /* ISCII Tamil */
-    {57005, "x-iscii-te"}, /* ISCII Telugu */
-    {57006, "x-iscii-as"}, /* ISCII Assamese */
-    {57007, "x-iscii-or"}, /* ISCII Oriya */
-    {57008, "x-iscii-ka"}, /* ISCII Kannada */
-    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
-    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
-    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
-
-    {0, NULL}
-};
-
-/*
- * SJIS SHIFTJIS table              CP932 table
- * ---- --------------------------- --------------------------------
- *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
- *   7E U+203E OVERLINE             U+007E TILDE
- * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
- * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
- * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
- * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
- * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
- * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
- * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
- * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
- *
- * EUC-JP and ISO-2022-JP should be compatible with CP932.
- *
- * Kernel and MLang have different Unicode mapping table.  Make sure
- * which API is used.
- */
-static compat_t cp932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0x301C, 0xFF5E, COMPAT_OUT},
-    {0x2016, 0x2225, COMPAT_OUT},
-    {0x2212, 0xFF0D, COMPAT_OUT},
-    {0x00A2, 0xFFE0, COMPAT_OUT},
-    {0x00A3, 0xFFE1, COMPAT_OUT},
-    {0x00AC, 0xFFE2, COMPAT_OUT},
-    {0, 0, 0}
-};
-
-static compat_t cp20932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
-    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
-    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
-    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
-    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
-    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
-    {0, 0, 0}
-};
-
-static compat_t *cp51932_compat = cp932_compat;
-
-/* cp20932_compat for kernel.  cp932_compat for mlang. */
-static compat_t *cp5022x_compat = cp932_compat;
-
-typedef HRESULT (WINAPI *CONVERTINETSTRING)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766A)(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766W)(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
-static CONVERTINETSTRING ConvertINetString;
-static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
-static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
-static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
-static LCIDTORFC1766A LcidToRfc1766A;
-static RFC1766TOLCIDA Rfc1766ToLcidA;
-
-static int
-load_mlang()
-{
-    HMODULE h;
-    if (ConvertINetString != NULL)
-        return TRUE;
-    h = LoadLibrary("mlang.dll");
-    if (!h)
-        return FALSE;
-    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
-    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
-    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
-    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
-    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
-    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
-    return TRUE;
-}
-
-iconv_t
-iconv_open(const char *tocode, const char *fromcode)
-{
-    rec_iconv_t *cd;
-
-    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
-    if (cd == NULL)
-        return (iconv_t)(-1);
-
-#if defined(USE_LIBICONV_DLL)
-    errno = 0;
-    if (libiconv_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-#endif
-
-    /* reset the errno to prevent reporting wrong error code.
-     * 0 for unsorted error. */
-    errno = 0;
-    if (win_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-
-    free(cd);
-
-    return (iconv_t)(-1);
-}
-
-int
-iconv_close(iconv_t _cd)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    int r = cd->iconv_close(cd->cd);
-    int e = *(cd->_errno());
-#if defined(USE_LIBICONV_DLL)
-    if (cd->hlibiconv != NULL)
-        FreeLibrary(cd->hlibiconv);
-#endif
-    free(cd);
-    errno = e;
-    return r;
-}
-
-size_t
-iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
-    errno = *(cd->_errno());
-    return r;
-}
-
-static int
-win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
-        return FALSE;
-    cd->iconv_close = win_iconv_close;
-    cd->iconv = win_iconv;
-    cd->_errno = _errno;
-    cd->cd = (iconv_t)cd;
-    return TRUE;
-}
-
-static int
-win_iconv_close(iconv_t cd)
-{
-    return 0;
-}
-
-static size_t
-win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int insize;
-    int outsize;
-    int wsize;
-    DWORD frommode;
-    DWORD tomode;
-    uint wc;
-    compat_t *cp;
-    int i;
-
-    if (inbuf == NULL || *inbuf == NULL)
-    {
-        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
-        {
-            tomode = cd->to.mode;
-            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
-            if (outsize == -1)
-            {
-                cd->to.mode = tomode;
-                return (size_t)(-1);
-            }
-            *outbuf += outsize;
-            *outbytesleft -= outsize;
-        }
-        cd->from.mode = 0;
-        cd->to.mode = 0;
-        return 0;
-    }
-
-    while (*inbytesleft != 0)
-    {
-        frommode = cd->from.mode;
-        tomode = cd->to.mode;
-        wsize = MB_CHAR_MAX;
-
-        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
-        if (insize == -1)
-        {
-            cd->from.mode = frommode;
-            return (size_t)(-1);
-        }
-
-        if (wsize == 0)
-        {
-            *inbuf += insize;
-            *inbytesleft -= insize;
-            continue;
-        }
-
-        if (cd->from.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->from.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
-                {
-                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        if (cd->to.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->to.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
-                {
-                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
-        if (outsize == -1)
-        {
-            cd->from.mode = frommode;
-            cd->to.mode = tomode;
-            return (size_t)(-1);
-        }
-
-        *inbuf += insize;
-        *outbuf += outsize;
-        *inbytesleft -= insize;
-        *outbytesleft -= outsize;
-    }
-
-    return 0;
-}
-
-static int
-make_csconv(const char *_name, csconv_t *cv)
-{
-    CPINFOEX cpinfoex;
-    int use_compat = TRUE;
-    int flag = 0;
-    char *name;
-    char *p;
-
-    name = xstrndup(_name, strlen(_name));
-    if (name == NULL)
-        return FALSE;
-
-    /* check for option "enc_name//opt1//opt2" */
-    while ((p = strrstr(name, "//")) != NULL)
-    {
-        if (_stricmp(p + 2, "nocompat") == 0)
-            use_compat = FALSE;
-        else if (_stricmp(p + 2, "translit") == 0)
-            flag |= FLAG_TRANSLIT;
-        else if (_stricmp(p + 2, "ignore") == 0)
-            flag |= FLAG_IGNORE;
-        *p = 0;
-    }
-
-    cv->mode = 0;
-    cv->flags = flag;
-    cv->mblen = NULL;
-    cv->flush = NULL;
-    cv->compat = NULL;
-    cv->codepage = name_to_codepage(name);
-    if (cv->codepage == 1200 || cv->codepage == 1201)
-    {
-        cv->mbtowc = utf16_mbtowc;
-        cv->wctomb = utf16_wctomb;
-        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 12000 || cv->codepage == 12001)
-    {
-        cv->mbtowc = utf32_mbtowc;
-        cv->wctomb = utf32_wctomb;
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 65001)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        cv->mblen = utf8_mblen;
-    }
-    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
-    {
-        cv->mbtowc = iso2022jp_mbtowc;
-        cv->wctomb = iso2022jp_wctomb;
-        cv->flush = iso2022jp_flush;
-    }
-    else if (cv->codepage == 51932 && load_mlang())
-    {
-        cv->mbtowc = mlang_mbtowc;
-        cv->wctomb = mlang_wctomb;
-        cv->mblen = eucjp_mblen;
-    }
-    else if (IsValidCodePage(cv->codepage)
-	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        if (cpinfoex.MaxCharSize == 1)
-            cv->mblen = sbcs_mblen;
-        else if (cpinfoex.MaxCharSize == 2)
-            cv->mblen = dbcs_mblen;
-	else
-	    cv->mblen = mbcs_mblen;
-    }
-    else
-    {
-        /* not supported */
-        free(name);
-        errno = EINVAL;
-        return FALSE;
-    }
-
-    if (use_compat)
-    {
-        switch (cv->codepage)
-        {
-        case 932: cv->compat = cp932_compat; break;
-        case 20932: cv->compat = cp20932_compat; break;
-        case 51932: cv->compat = cp51932_compat; break;
-        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
-        }
-    }
-
-    free(name);
-
-    return TRUE;
-}
-
-static int
-name_to_codepage(const char *name)
-{
-    int i;
-
-    if (*name == '\0' ||
-	strcmp(name, "char") == 0)
-        return GetACP();
-    else if (strcmp(name, "wchar_t") == 0)
-        return 1200;
-    else if (_strnicmp(name, "cp", 2) == 0)
-        return atoi(name + 2); /* CP123 */
-    else if ('0' <= name[0] && name[0] <= '9')
-        return atoi(name);     /* 123 */
-    else if (_strnicmp(name, "xx", 2) == 0)
-        return atoi(name + 2); /* XX123 for debug */
-
-    for (i = 0; codepage_alias[i].name != NULL; ++i)
-        if (_stricmp(name, codepage_alias[i].name) == 0)
-            return codepage_alias[i].codepage;
-    return -1;
-}
-
-/*
- * http://www.faqs.org/rfcs/rfc2781.html
- */
-static uint
-utf16_to_ucs4(const ushort *wbuf)
-{
-    uint wc = wbuf[0];
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
-    return wc;
-}
-
-static void
-ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
-{
-    if (wc < 0x10000)
-    {
-        wbuf[0] = wc;
-        *wbufsize = 1;
-    }
-    else
-    {
-        wc -= 0x10000;
-        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
-        wbuf[1] = 0xDC00 | (wc & 0x3FF);
-        *wbufsize = 2;
-    }
-}
-
-/*
- * Check if codepage is one of those for which the dwFlags parameter
- * to MultiByteToWideChar() must be zero. Return zero or
- * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
- * Server 2003 R2 claims that also codepage 65001 is one of these, but
- * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
- * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
- * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
- * from UTF-8.
- */
-static int
-mbtowc_flags(int codepage)
-{
-    return (codepage == 50220 || codepage == 50221 ||
-	    codepage == 50222 || codepage == 50225 ||
-	    codepage == 50227 || codepage == 50229 ||
-	    codepage == 52936 || codepage == 54936 ||
-	    (codepage >= 57002 && codepage <= 57011) ||
-	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
-}
-
-/*
- * Check if codepage is one those for which the lpUsedDefaultChar
- * parameter to WideCharToMultiByte() must be NULL.  The docs in
- * Platform SDK for for Windows Server 2003 R2 claims that this is the
- * list below, while the MSDN docs for MSVS2008 claim that it is only
- * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
- * SDK seems to be correct, at least for XP.
- */
-static int
-must_use_null_useddefaultchar(int codepage)
-{
-    return (codepage == 65000 || codepage == 65001 ||
-            codepage == 50220 || codepage == 50221 ||
-            codepage == 50222 || codepage == 50225 ||
-            codepage == 50227 || codepage == 50229 ||
-            codepage == 52936 || codepage == 54936 ||
-            (codepage >= 57002 && codepage <= 57011) ||
-            codepage == 42);
-}
-
-static char *
-strrstr(const char *str, const char *token)
-{
-    int len = strlen(token);
-    const char *p = str + strlen(str);
-
-    while (str <= --p)
-        if (p[0] == token[0] && strncmp(p, token, len) == 0)
-            return (char *)p;
-    return NULL;
-}
-
-static char *
-xstrndup(const char *s, size_t n)
-{
-    char *p;
-
-    p = (char *)malloc(n + 1);
-    if (p == NULL)
-        return NULL;
-    memcpy(p, s, n);
-    p[n] = '\0';
-    return p;
-}
-
-static int
-seterror(int err)
-{
-    errno = err;
-    return -1;
-}
-
-#if defined(USE_LIBICONV_DLL)
-static int
-libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    HMODULE hlibiconv = NULL;
-    HMODULE hmsvcrt = NULL;
-    char *dllname;
-    const char *p;
-    const char *e;
-    f_iconv_open _iconv_open;
-
-    /*
-     * always try to load dll, so that we can switch dll in runtime.
-     */
-
-    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
-    p = getenv("WINICONV_LIBICONV_DLL");
-    if (p == NULL)
-        p = DEFAULT_LIBICONV_DLL;
-    /* parse comma separated value */
-    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
-    {
-        e = strchr(p, ',');
-        if (p == e)
-            continue;
-        else if (e == NULL)
-            e = p + strlen(p);
-        dllname = xstrndup(p, e - p);
-        if (dllname == NULL)
-            return FALSE;
-        hlibiconv = LoadLibrary(dllname);
-        free(dllname);
-        if (hlibiconv != NULL)
-        {
-            if (hlibiconv == hwiniconv)
-            {
-                FreeLibrary(hlibiconv);
-                hlibiconv = NULL;
-                continue;
-            }
-            break;
-        }
-    }
-
-    if (hlibiconv == NULL)
-        goto failed;
-
-    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
-    if (hmsvcrt == NULL)
-        goto failed;
-
-    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
-    if (_iconv_open == NULL)
-        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
-    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
-    if (cd->iconv_close == NULL)
-        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
-    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
-    if (cd->iconv == NULL)
-        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
-    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
-    if (_iconv_open == NULL || cd->iconv_close == NULL
-            || cd->iconv == NULL || cd->_errno == NULL)
-        goto failed;
-
-    cd->cd = _iconv_open(tocode, fromcode);
-    if (cd->cd == (iconv_t)(-1))
-        goto failed;
-
-    cd->hlibiconv = hlibiconv;
-    return TRUE;
-
-failed:
-    if (hlibiconv != NULL)
-        FreeLibrary(hlibiconv);
-    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
-    return FALSE;
-}
-
-/*
- * Reference:
- * http://forums.belution.com/ja/vc/000/234/78s.shtml
- * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
- *
- * The formal way is
- *   imagehlp.h or dbghelp.h
- *   imagehlp.lib or dbghelp.lib
- *   ImageDirectoryEntryToData()
- */
-#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
-#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
-static PVOID
-MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
-{
-    /* TODO: MappedAsImage? */
-    PIMAGE_DATA_DIRECTORY p;
-    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
-    if (p->VirtualAddress == 0) {
-      *Size = 0;
-      return NULL;
-    }
-    *Size = p->Size;
-    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
-}
-
-static HMODULE
-find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
-{
-    DWORD Base;
-    ULONG Size;
-    PIMAGE_IMPORT_DESCRIPTOR Imp;
-    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
-    PIMAGE_IMPORT_BY_NAME ImpName;
-
-    Base = (DWORD)hModule;
-    Imp = MyImageDirectoryEntryToData(
-            (LPVOID)Base,
-            TRUE,
-            IMAGE_DIRECTORY_ENTRY_IMPORT,
-            &Size);
-    if (Imp == NULL)
-        return NULL;
-    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
-    {
-        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
-        for ( ; Name->u1.Ordinal != 0; ++Name)
-        {
-            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
-            {
-                ImpName = (PIMAGE_IMPORT_BY_NAME)
-                    (Base + (DWORD)Name->u1.AddressOfData);
-                if (strcmp((char *)ImpName->Name, funcname) == 0)
-                    return GetModuleHandle((char *)(Base + Imp->Name));
-            }
-        }
-    }
-    return NULL;
-}
-#endif
-
-static int
-sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    return 1;
-}
-
-static int
-dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (cv->codepage == 54936) {
-	if (buf[0] <= 0x7F) len = 1;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 2 &&
-		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
-		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 4 &&
-		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
-	else
-	    return seterror(EINVAL);
-	return len;
-    }
-    else
-	return seterror(EINVAL);
-}
-
-static int
-utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (buf[0] < 0x80) len = 1;
-    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
-    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
-    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
-    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
-    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
-
-    if (len == 0)
-        return seterror(EILSEQ);
-    else if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    if (buf[0] < 0x80) /* ASCII */
-        return 1;
-    else if (buf[0] == 0x8E) /* JIS X 0201 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
-            return seterror(EILSEQ);
-        return 2;
-    }
-    else if (buf[0] == 0x8F) /* JIS X 0212 */
-    {
-        if (bufsize < 3)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
-                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
-            return seterror(EILSEQ);
-        return 3;
-    }
-    else /* JIS X 0208 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
-                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
-            return seterror(EILSEQ);
-        return 2;
-    }
-}
-
-static int
-kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
-            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
-    if (*wbufsize == 0)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    BOOL usedDefaultChar = 0;
-    BOOL *p = NULL;
-    int flags = 0;
-    int len;
-
-    if (bufsize == 0)
-        return seterror(E2BIG);
-    if (!must_use_null_useddefaultchar(cv->codepage))
-    {
-        p = &usedDefaultChar;
-#ifdef WC_NO_BEST_FIT_CHARS
-        if (!(cv->flags & FLAG_TRANSLIT))
-            flags |= WC_NO_BEST_FIT_CHARS;
-#endif
-    }
-    len = WideCharToMultiByte(cv->codepage, flags,
-            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
-    if (len == 0)
-    {
-        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-            return seterror(E2BIG);
-        return seterror(EILSEQ);
-    }
-    else if (usedDefaultChar)
-        return seterror(EILSEQ);
-    else if (cv->mblen(cv, buf, len) != len) /* validate result */
-        return seterror(EILSEQ);
-    return len;
-}
-
-/*
- * It seems that the mode (cv->mode) is fixnum.
- * For example, when converting iso-2022-jp(cp50221) to unicode:
- *      in ascii sequence: mode=0xC42C0000
- *   in jisx0208 sequence: mode=0xC42C0001
- * "C42C" is same for each convert session.
- * It should be: ((codepage-1)<<16)|state
- */
-static int
-mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-    int insize;
-    HRESULT hr;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    insize = len;
-    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
-            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-
-    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
-        return seterror(EILSEQ);
-    memcpy(buf, tmpbuf, tmpsize);
-    return tmpsize;
-}
-
-static int
-utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-
-    /* swap endian: 1200 <-> 1201 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 2)
-        return seterror(EINVAL);
-    if (codepage == 1200) /* little endian */
-        wbuf[0] = (buf[1] << 8) | buf[0];
-    else if (codepage == 1201) /* big endian */
-        wbuf[0] = (buf[0] << 8) | buf[1];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wbuf[0] == 0xFFFE)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 2;
-        }
-        else if (wbuf[0] == 0xFEFF)
-        {
-            *wbufsize = 0;
-            return 2;
-        }
-    }
-
-    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
-        return seterror(EILSEQ);
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(EINVAL);
-        if (codepage == 1200) /* little endian */
-            wbuf[1] = (buf[3] << 8) | buf[2];
-        else if (codepage == 1201) /* big endian */
-            wbuf[1] = (buf[2] << 8) | buf[3];
-        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
-            return seterror(EILSEQ);
-        *wbufsize = 2;
-        return 4;
-    }
-    *wbufsize = 1;
-    return 2;
-}
-
-static int
-utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 2)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-            memcpy(buf, "\xFF\xFE", 2);
-        else if (cv->codepage == 1201) /* big endian */
-            memcpy(buf, "\xFE\xFF", 2);
-
-        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
-        if (r == -1)
-            return -1;
-        return r + 2;
-    }
-
-    if (bufsize < 2)
-        return seterror(E2BIG);
-    if (cv->codepage == 1200) /* little endian */
-    {
-        buf[0] = (wbuf[0] & 0x00FF);
-        buf[1] = (wbuf[0] & 0xFF00) >> 8;
-    }
-    else if (cv->codepage == 1201) /* big endian */
-    {
-        buf[0] = (wbuf[0] & 0xFF00) >> 8;
-        buf[1] = (wbuf[0] & 0x00FF);
-    }
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-        {
-            buf[2] = (wbuf[1] & 0x00FF);
-            buf[3] = (wbuf[1] & 0xFF00) >> 8;
-        }
-        else if (cv->codepage == 1201) /* big endian */
-        {
-            buf[2] = (wbuf[1] & 0xFF00) >> 8;
-            buf[3] = (wbuf[1] & 0x00FF);
-        }
-        return 4;
-    }
-    return 2;
-}
-
-static int
-utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-    uint wc = 0;
-
-    /* swap endian: 12000 <-> 12001 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 4)
-        return seterror(EINVAL);
-    if (codepage == 12000) /* little endian */
-        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-    else if (codepage == 12001) /* big endian */
-        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wc == 0xFFFE0000)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 4;
-        }
-        else if (wc == 0x0000FEFF)
-        {
-            *wbufsize = 0;
-            return 4;
-        }
-    }
-
-    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
-        return seterror(EILSEQ);
-    ucs4_to_utf16(wc, wbuf, wbufsize);
-    return 4;
-}
-
-static int
-utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    uint wc;
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 12000) /* little endian */
-            memcpy(buf, "\xFF\xFE\x00\x00", 4);
-        else if (cv->codepage == 12001) /* big endian */
-            memcpy(buf, "\x00\x00\xFE\xFF", 4);
-
-        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
-        if (r == -1)
-            return -1;
-        return r + 4;
-    }
-
-    if (bufsize < 4)
-        return seterror(E2BIG);
-    wc = utf16_to_ucs4(wbuf);
-    if (cv->codepage == 12000) /* little endian */
-    {
-        buf[0] = wc & 0x000000FF;
-        buf[1] = (wc & 0x0000FF00) >> 8;
-        buf[2] = (wc & 0x00FF0000) >> 16;
-        buf[3] = (wc & 0xFF000000) >> 24;
-    }
-    else if (cv->codepage == 12001) /* big endian */
-    {
-        buf[0] = (wc & 0xFF000000) >> 24;
-        buf[1] = (wc & 0x00FF0000) >> 16;
-        buf[2] = (wc & 0x0000FF00) >> 8;
-        buf[3] = wc & 0x000000FF;
-    }
-    return 4;
-}
-
-/*
- * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
- * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
- *        1 byte Kana)
- * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
- *        Kana - SO/SI)
- *
- * MultiByteToWideChar() and WideCharToMultiByte() behave differently
- * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
- * terminate result sequence with ascii escape.  But Vista does.
- * Use MLang instead.
- */
-
-#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
-#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
-#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
-
-#define ISO2022_SI  0
-#define ISO2022_SO  1
-
-/* shift in */
-static const char iso2022_SI_seq[] = "\x0F";
-/* shift out */
-static const char iso2022_SO_seq[] = "\x0E";
-
-typedef struct iso2022_esc_t iso2022_esc_t;
-struct iso2022_esc_t {
-    const char *esc;
-    int esc_len;
-    int len;
-    int cs;
-};
-
-#define ISO2022JP_CS_ASCII            0
-#define ISO2022JP_CS_JISX0201_ROMAN   1
-#define ISO2022JP_CS_JISX0201_KANA    2
-#define ISO2022JP_CS_JISX0208_1978    3
-#define ISO2022JP_CS_JISX0208_1983    4
-#define ISO2022JP_CS_JISX0212         5
-
-static iso2022_esc_t iso2022jp_esc[] = {
-    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
-    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
-    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
-    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
-    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
-    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
-    {NULL, 0, 0, 0}
-};
-
-static int
-iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int insize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    if (buf[0] == 0x1B)
-    {
-        for (i = 0; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (bufsize < esc_len)
-            {
-                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
-                    return seterror(EINVAL);
-            }
-            else
-            {
-                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
-                {
-                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
-                    *wbufsize = 0;
-                    return esc_len;
-                }
-            }
-        }
-        /* not supported escape sequence */
-        return seterror(EILSEQ);
-    }
-    else if (buf[0] == iso2022_SO_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
-        *wbufsize = 0;
-        return 1;
-    }
-    else if (buf[0] == iso2022_SI_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
-        *wbufsize = 0;
-        return 1;
-    }
-
-    cs = ISO2022_MODE_CS(cv->mode);
-    shift = ISO2022_MODE_SHIFT(cv->mode);
-
-    /* reset the mode for informal sequence */
-    if (buf[0] < 0x20)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        shift = ISO2022_SI;
-    }
-
-    len = iesc[cs].len;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    for (i = 0; i < len; ++i)
-        if (!(buf[i] < 0x80))
-            return seterror(EILSEQ);
-    esc_len = iesc[cs].esc_len;
-    memcpy(tmp, iesc[cs].esc, esc_len);
-    if (shift == ISO2022_SO)
-    {
-        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
-        esc_len += 1;
-    }
-    memcpy(tmp + esc_len, buf, len);
-
-    if ((cv->codepage == 50220 || cv->codepage == 50221
-                || cv->codepage == 50222) && shift == ISO2022_SO)
-    {
-        /* XXX: shift-out cannot be used for mbtowc (both kernel and
-         * mlang) */
-        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
-        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
-        memcpy(tmp + esc_len, buf, len);
-    }
-
-    insize = len + esc_len;
-    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
-            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len + esc_len)
-        return seterror(EILSEQ);
-
-    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (wbuf[0] == buf[0]
-            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-        return seterror(EILSEQ);
-
-    /* reset the mode for informal sequence */
-    if (cv->mode != ISO2022_MODE(cs, shift))
-        cv->mode = ISO2022_MODE(cs, shift);
-
-    return len;
-}
-
-static int
-iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len = 0;
-    int cs = 0;
-    int shift;
-    int i;
-
-    /*
-     * MultiByte = [escape sequence] + character + [escape sequence]
-     *
-     * Whether trailing escape sequence is added depends on which API is
-     * used (kernel or MLang, and its version).
-     */
-    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-
-    if (tmpsize == 1)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        esc_len = 0;
-    }
-    else
-    {
-        for (i = 1; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
-            {
-                cs = iesc[i].cs;
-                break;
-            }
-        }
-        if (iesc[i].esc == NULL)
-            /* not supported escape sequence */
-            return seterror(EILSEQ);
-    }
-
-    shift = ISO2022_SI;
-    if (tmp[esc_len] == iso2022_SO_seq[0])
-    {
-        shift = ISO2022_SO;
-        esc_len += 1;
-    }
-
-    len = iesc[cs].len;
-
-    /* Check for converting error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
-        return seterror(EILSEQ);
-    else if (tmpsize < esc_len + len)
-        return seterror(EILSEQ);
-
-    if (cv->mode == ISO2022_MODE(cs, shift))
-    {
-        /* remove escape sequence */
-        if (esc_len != 0)
-            memmove(tmp, tmp + esc_len, len);
-        esc_len = 0;
-    }
-    else
-    {
-        if (cs == ISO2022JP_CS_ASCII)
-        {
-            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
-            memmove(tmp + esc_len, tmp, len);
-            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
-        }
-        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
-        {
-            /* shift-in before changing to other mode */
-            memmove(tmp + 1, tmp, len + esc_len);
-            memcpy(tmp, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-    }
-
-    if (bufsize < len + esc_len)
-        return seterror(E2BIG);
-    memcpy(buf, tmp, len + esc_len);
-    cv->mode = ISO2022_MODE(cs, shift);
-    return len + esc_len;
-}
-
-static int
-iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    int esc_len;
-
-    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-    {
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-            esc_len += 1;
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        if (bufsize < esc_len)
-            return seterror(E2BIG);
-
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-        {
-            memcpy(buf, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-        {
-            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
-                    iesc[ISO2022JP_CS_ASCII].esc_len);
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        }
-        return esc_len;
-    }
-    return 0;
-}
-
-#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
-BOOL WINAPI
-DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
-{
-    switch( fdwReason )
-    {
-    case DLL_PROCESS_ATTACH:
-        hwiniconv = (HMODULE)hinstDLL;
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-#endif
-
-#if defined(MAKE_EXE)
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-int
-main(int argc, char **argv)
-{
-    char *fromcode = NULL;
-    char *tocode = NULL;
-    int i;
-    char inbuf[BUFSIZ];
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    size_t rest = 0;
-    iconv_t cd;
-    size_t r;
-    FILE *in = stdin;
-
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
-
-    for (i = 1; i < argc; ++i)
-    {
-        if (strcmp(argv[i], "-l") == 0)
-        {
-            for (i = 0; codepage_alias[i].name != NULL; ++i)
-                printf("%s\n", codepage_alias[i].name);
-            return 0;
-        }
-
-        if (strcmp(argv[i], "-f") == 0)
-            fromcode = argv[++i];
-        else if (strcmp(argv[i], "-t") == 0)
-            tocode = argv[++i];
-        else
-        {
-            in = fopen(argv[i], "rb");
-            if (in == NULL)
-            {
-                fprintf(stderr, "cannot open %s\n", argv[i]);
-                return 1;
-            }
-            break;
-        }
-    }
-
-    if (fromcode == NULL || tocode == NULL)
-    {
-        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
-        return 0;
-    }
-
-    cd = iconv_open(tocode, fromcode);
-    if (cd == (iconv_t)(-1))
-    {
-        perror("iconv_open error");
-        return 1;
-    }
-
-    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
-            || rest != 0)
-    {
-        inbytesleft += rest;
-        pin = inbuf;
-        pout = outbuf;
-        outbytesleft = sizeof(outbuf);
-        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
-        {
-            perror("conversion error");
-            return 1;
-        }
-        memmove(inbuf, pin, inbytesleft);
-        rest = inbytesleft;
-    }
-    pout = outbuf;
-    outbytesleft = sizeof(outbuf);
-    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-    if (r == (size_t)(-1))
-    {
-        perror("conversion error");
-        return 1;
-    }
-
-    iconv_close(cd);
-
-    return 0;
-}
-#endif
-
+/*
+ * iconv library using Win32 API to conversion.
+ *
+ * This file is placed in the public domain.
+ *
+ * Last Change: 2009-07-06
+ *
+ * ENVIRONMENT VARIABLE:
+ *     WINICONV_LIBICONV_DLL
+ *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
+ *         loading the DLL or iconv_open() failed, falls back to internal
+ *         conversion.  If a few DLL are specified as comma separated list,
+ *         the first loadable DLL is used.  The DLL should have iconv_open(),
+ *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
+ *         and libiconv().
+ *         (only available when USE_LIBICONV_DLL is defined at compile time)
+ *
+ * Win32 API does not support strict encoding conversion for some
+ * codepage.  And MLang function drop or replace invalid bytes and does
+ * not return useful error status as iconv.  This implementation cannot
+ * be used for encoding validation purpose.
+ */
+
+/* for WC_NO_BEST_FIT_CHARS */
+#ifndef WINVER
+# define WINVER 0x0500
+#endif
+
+#include <windows.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if 0
+# define MAKE_EXE
+# define MAKE_DLL
+# define USE_LIBICONV_DLL
+#endif
+
+#if !defined(DEFAULT_LIBICONV_DLL)
+# define DEFAULT_LIBICONV_DLL ""
+#endif
+
+#define MB_CHAR_MAX 16
+
+#define UNICODE_MODE_BOM_DONE   1
+#define UNICODE_MODE_SWAPPED    2
+
+#define FLAG_USE_BOM            1
+#define FLAG_TRANSLIT           2 /* //TRANSLIT */
+#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
+
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+
+typedef void* iconv_t;
+
+iconv_t iconv_open(const char *tocode, const char *fromcode);
+int iconv_close(iconv_t cd);
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+/* libiconv interface for vim */
+#if defined(MAKE_DLL)
+int
+iconvctl (iconv_t cd, int request, void* argument)
+{
+    /* not supported */
+    return 0;
+}
+#endif
+
+typedef struct compat_t compat_t;
+typedef struct csconv_t csconv_t;
+typedef struct rec_iconv_t rec_iconv_t;
+
+typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
+typedef int (*f_iconv_close)(iconv_t cd);
+typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+typedef int* (*f_errno)(void);
+typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
+typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
+
+#define COMPAT_IN   1
+#define COMPAT_OUT  2
+
+/* unicode mapping for compatibility with other conversion table. */
+struct compat_t {
+    uint in;
+    uint out;
+    uint flag;
+};
+
+struct csconv_t {
+    int codepage;
+    int flags;
+    f_mbtowc mbtowc;
+    f_wctomb wctomb;
+    f_mblen mblen;
+    f_flush flush;
+    DWORD mode;
+    compat_t *compat;
+};
+
+struct rec_iconv_t {
+    iconv_t cd;
+    f_iconv_close iconv_close;
+    f_iconv iconv;
+    f_errno _errno;
+    csconv_t from;
+    csconv_t to;
+#if defined(USE_LIBICONV_DLL)
+    HMODULE hlibiconv;
+#endif
+};
+
+static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static int win_iconv_close(iconv_t cd);
+static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+static int load_mlang();
+static int make_csconv(const char *name, csconv_t *cv);
+static int name_to_codepage(const char *name);
+static uint utf16_to_ucs4(const ushort *wbuf);
+static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
+static int mbtowc_flags(int codepage);
+static int must_use_null_useddefaultchar(int codepage);
+static char *strrstr(const char *str, const char *token);
+static char *xstrndup(const char *s, size_t n);
+static int seterror(int err);
+
+#if defined(USE_LIBICONV_DLL)
+static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
+static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
+
+static HMODULE hwiniconv;
+#endif
+
+static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+
+static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
+
+static struct {
+    int codepage;
+    const char *name;
+} codepage_alias[] = {
+    {65001, "CP65001"},
+    {65001, "UTF8"},
+    {65001, "UTF-8"},
+
+    {1200, "CP1200"},
+    {1200, "UTF16LE"},
+    {1200, "UTF-16LE"},
+    {1200, "UCS-2LE"},
+
+    {1201, "CP1201"},
+    {1201, "UTF16BE"},
+    {1201, "UTF-16BE"},
+    {1201, "UCS-2BE"},
+    {1201, "unicodeFFFE"},
+
+    {12000, "CP12000"},
+    {12000, "UTF32LE"},
+    {12000, "UTF-32LE"},
+
+    {12001, "CP12001"},
+    {12001, "UTF32BE"},
+    {12001, "UTF-32BE"},
+
+#ifndef GLIB_COMPILATION
+    /*
+     * Default is big endian.
+     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
+     */
+    {1201, "UTF16"},
+    {1201, "UTF-16"},
+    {12001, "UTF32"},
+    {12001, "UTF-32"},
+#else
+    /* Default is little endian, because the platform is */
+    {1200, "UTF16"},
+    {1200, "UTF-16"},
+    {1200, "UCS-2"},
+    {12000, "UTF32"},
+    {12000, "UTF-32"},
+#endif
+
+    /* copy from libiconv `iconv -l` */
+    /* !IsValidCodePage(367) */
+    {20127, "ANSI_X3.4-1968"},
+    {20127, "ANSI_X3.4-1986"},
+    {20127, "ASCII"},
+    {20127, "CP367"},
+    {20127, "IBM367"},
+    {20127, "ISO-IR-6"},
+    {20127, "ISO646-US"},
+    {20127, "ISO_646.IRV:1991"},
+    {20127, "US"},
+    {20127, "US-ASCII"},
+    {20127, "CSASCII"},
+
+    /* !IsValidCodePage(819) */
+    {1252, "CP819"},
+    {1252, "IBM819"},
+    {28591, "ISO-8859-1"},
+    {28591, "ISO-IR-100"},
+    {28591, "ISO8859-1"},
+    {28591, "ISO_8859-1"},
+    {28591, "ISO_8859-1:1987"},
+    {28591, "L1"},
+    {28591, "LATIN1"},
+    {28591, "CSISOLATIN1"},
+
+    {1250, "CP1250"},
+    {1250, "MS-EE"},
+    {1250, "WINDOWS-1250"},
+
+    {1251, "CP1251"},
+    {1251, "MS-CYRL"},
+    {1251, "WINDOWS-1251"},
+
+    {1252, "CP1252"},
+    {1252, "MS-ANSI"},
+    {1252, "WINDOWS-1252"},
+
+    {1253, "CP1253"},
+    {1253, "MS-GREEK"},
+    {1253, "WINDOWS-1253"},
+
+    {1254, "CP1254"},
+    {1254, "MS-TURK"},
+    {1254, "WINDOWS-1254"},
+
+    {1255, "CP1255"},
+    {1255, "MS-HEBR"},
+    {1255, "WINDOWS-1255"},
+
+    {1256, "CP1256"},
+    {1256, "MS-ARAB"},
+    {1256, "WINDOWS-1256"},
+
+    {1257, "CP1257"},
+    {1257, "WINBALTRIM"},
+    {1257, "WINDOWS-1257"},
+
+    {1258, "CP1258"},
+    {1258, "WINDOWS-1258"},
+
+    {850, "850"},
+    {850, "CP850"},
+    {850, "IBM850"},
+    {850, "CSPC850MULTILINGUAL"},
+
+    /* !IsValidCodePage(862) */
+    {862, "862"},
+    {862, "CP862"},
+    {862, "IBM862"},
+    {862, "CSPC862LATINHEBREW"},
+
+    {866, "866"},
+    {866, "CP866"},
+    {866, "IBM866"},
+    {866, "CSIBM866"},
+
+    /* !IsValidCodePage(154) */
+    {154, "CP154"},
+    {154, "CYRILLIC-ASIAN"},
+    {154, "PT154"},
+    {154, "PTCP154"},
+    {154, "CSPTCP154"},
+
+    /* !IsValidCodePage(1133) */
+    {1133, "CP1133"},
+    {1133, "IBM-CP1133"},
+
+    {874, "CP874"},
+    {874, "WINDOWS-874"},
+
+    /* !IsValidCodePage(51932) */
+    {51932, "CP51932"},
+    {51932, "MS51932"},
+    {51932, "WINDOWS-51932"},
+    {51932, "EUC-JP"},
+
+    {932, "CP932"},
+    {932, "MS932"},
+    {932, "SHIFFT_JIS"},
+    {932, "SHIFFT_JIS-MS"},
+    {932, "SJIS"},
+    {932, "SJIS-MS"},
+    {932, "SJIS-OPEN"},
+    {932, "SJIS-WIN"},
+    {932, "WINDOWS-31J"},
+    {932, "WINDOWS-932"},
+    {932, "CSWINDOWS31J"},
+
+    {50221, "CP50221"},
+    {50221, "ISO-2022-JP"},
+    {50221, "ISO-2022-JP-MS"},
+    {50221, "ISO2022-JP"},
+    {50221, "ISO2022-JP-MS"},
+    {50221, "MS50221"},
+    {50221, "WINDOWS-50221"},
+
+    {936, "CP936"},
+    {936, "GBK"},
+    {936, "MS936"},
+    {936, "WINDOWS-936"},
+
+    {950, "CP950"},
+    {950, "BIG5"},
+
+    {949, "CP949"},
+    {949, "UHC"},
+    {949, "EUC-KR"},
+
+    {1361, "CP1361"},
+    {1361, "JOHAB"},
+
+    {437, "437"},
+    {437, "CP437"},
+    {437, "IBM437"},
+    {437, "CSPC8CODEPAGE437"},
+
+    {737, "CP737"},
+
+    {775, "CP775"},
+    {775, "IBM775"},
+    {775, "CSPC775BALTIC"},
+
+    {852, "852"},
+    {852, "CP852"},
+    {852, "IBM852"},
+    {852, "CSPCP852"},
+
+    /* !IsValidCodePage(853) */
+    {853, "CP853"},
+
+    {855, "855"},
+    {855, "CP855"},
+    {855, "IBM855"},
+    {855, "CSIBM855"},
+
+    {857, "857"},
+    {857, "CP857"},
+    {857, "IBM857"},
+    {857, "CSIBM857"},
+
+    /* !IsValidCodePage(858) */
+    {858, "CP858"},
+
+    {860, "860"},
+    {860, "CP860"},
+    {860, "IBM860"},
+    {860, "CSIBM860"},
+
+    {861, "861"},
+    {861, "CP-IS"},
+    {861, "CP861"},
+    {861, "IBM861"},
+    {861, "CSIBM861"},
+
+    {863, "863"},
+    {863, "CP863"},
+    {863, "IBM863"},
+    {863, "CSIBM863"},
+
+    {864, "CP864"},
+    {864, "IBM864"},
+    {864, "CSIBM864"},
+
+    {865, "865"},
+    {865, "CP865"},
+    {865, "IBM865"},
+    {865, "CSIBM865"},
+
+    {869, "869"},
+    {869, "CP-GR"},
+    {869, "CP869"},
+    {869, "IBM869"},
+    {869, "CSIBM869"},
+
+    /* !IsValidCodePage(1152) */
+    {1125, "CP1125"},
+
+    /*
+     * Code Page Identifiers
+     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
+     */
+    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
+    {437, "IBM437"}, /* OEM United States */
+    {500, "IBM500"}, /* IBM EBCDIC International */
+    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
+    /* 709 		Arabic (ASMO-449+, BCON V4) */
+    /* 710 		Arabic - Transparent Arabic */
+    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
+    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
+    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
+    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
+    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
+    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
+    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
+    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
+    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
+    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
+    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
+    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
+    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
+    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
+    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
+    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
+    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
+    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
+    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
+    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
+    {932, "shift-jis"}, /* alternative name for it */
+    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
+    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
+    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
+    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
+    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
+    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
+    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
+    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
+    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
+    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
+    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
+    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
+    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
+    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
+    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
+    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
+    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
+    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
+    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
+    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
+    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
+    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
+    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
+    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
+    {1361, "Johab"}, /* Korean (Johab) */
+    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
+    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
+    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
+    {10003, "x-mac-korean"}, /* Korean (Mac) */
+    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
+    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
+    {10006, "x-mac-greek"}, /* Greek (Mac) */
+    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
+    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
+    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
+    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
+    {10021, "x-mac-thai"}, /* Thai (Mac) */
+    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
+    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
+    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
+    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
+    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
+    {20001, "x-cp20001"}, /* TCA Taiwan */
+    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
+    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
+    {20004, "x-cp20004"}, /* TeleText Taiwan */
+    {20005, "x-cp20005"}, /* Wang Taiwan */
+    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
+    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
+    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
+    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
+    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
+    {20261, "x-cp20261"}, /* T.61 */
+    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
+    {20273, "IBM273"}, /* IBM EBCDIC Germany */
+    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
+    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
+    {20280, "IBM280"}, /* IBM EBCDIC Italy */
+    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
+    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
+    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
+    {20297, "IBM297"}, /* IBM EBCDIC France */
+    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
+    {20423, "IBM423"}, /* IBM EBCDIC Greek */
+    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
+    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
+    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
+    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
+    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
+    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
+    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
+    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
+    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
+    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
+    {20949, "x-cp20949"}, /* Korean Wansung */
+    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
+    /* 21027 		(deprecated) */
+    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
+    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
+    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
+    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
+    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
+    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
+    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
+    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
+    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
+    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
+    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
+    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
+    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
+    {29001, "x-Europa"}, /* Europa 3 */
+    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
+    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
+    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
+    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
+    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
+    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
+    /* 50229 		ISO 2022 Traditional Chinese */
+    /* 50930 		EBCDIC Japanese (Katakana) Extended */
+    /* 50931 		EBCDIC US-Canada and Japanese */
+    /* 50933 		EBCDIC Korean Extended and Korean */
+    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
+    /* 50936 		EBCDIC Simplified Chinese */
+    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
+    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
+    {51932, "euc-jp"}, /* EUC Japanese */
+    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
+    {51949, "euc-kr"}, /* EUC Korean */
+    /* 51950 		EUC Traditional Chinese */
+    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
+    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
+    {57002, "x-iscii-de"}, /* ISCII Devanagari */
+    {57003, "x-iscii-be"}, /* ISCII Bengali */
+    {57004, "x-iscii-ta"}, /* ISCII Tamil */
+    {57005, "x-iscii-te"}, /* ISCII Telugu */
+    {57006, "x-iscii-as"}, /* ISCII Assamese */
+    {57007, "x-iscii-or"}, /* ISCII Oriya */
+    {57008, "x-iscii-ka"}, /* ISCII Kannada */
+    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
+    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
+    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
+
+    {0, NULL}
+};
+
+/*
+ * SJIS SHIFTJIS table              CP932 table
+ * ---- --------------------------- --------------------------------
+ *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
+ *   7E U+203E OVERLINE             U+007E TILDE
+ * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
+ * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
+ * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
+ * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
+ * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
+ * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
+ * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
+ * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
+ *
+ * EUC-JP and ISO-2022-JP should be compatible with CP932.
+ *
+ * Kernel and MLang have different Unicode mapping table.  Make sure
+ * which API is used.
+ */
+static compat_t cp932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0x301C, 0xFF5E, COMPAT_OUT},
+    {0x2016, 0x2225, COMPAT_OUT},
+    {0x2212, 0xFF0D, COMPAT_OUT},
+    {0x00A2, 0xFFE0, COMPAT_OUT},
+    {0x00A3, 0xFFE1, COMPAT_OUT},
+    {0x00AC, 0xFFE2, COMPAT_OUT},
+    {0, 0, 0}
+};
+
+static compat_t cp20932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
+    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
+    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
+    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
+    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
+    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
+    {0, 0, 0}
+};
+
+static compat_t *cp51932_compat = cp932_compat;
+
+/* cp20932_compat for kernel.  cp932_compat for mlang. */
+static compat_t *cp5022x_compat = cp932_compat;
+
+typedef HRESULT (WINAPI *CONVERTINETSTRING)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnSrcSize,
+    LPBYTE lpDstStr,
+    LPINT lpnDstSize
+);
+typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnMultiCharCount,
+    LPWSTR lpDstStr,
+    LPINT lpnWideCharCount
+);
+typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
+    LPDWORD lpdwMode,
+    DWORD dwEncoding,
+    LPCWSTR lpSrcStr,
+    LPINT lpnWideCharCount,
+    LPSTR lpDstStr,
+    LPINT lpnMultiCharCount
+);
+typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766A)(
+    LCID Locale,
+    LPSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766W)(
+    LCID Locale,
+    LPWSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
+    LCID *pLocale,
+    LPSTR pszRfc1766
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
+    LCID *pLocale,
+    LPWSTR pszRfc1766
+);
+static CONVERTINETSTRING ConvertINetString;
+static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
+static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
+static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
+static LCIDTORFC1766A LcidToRfc1766A;
+static RFC1766TOLCIDA Rfc1766ToLcidA;
+
+static int
+load_mlang()
+{
+    HMODULE h;
+    if (ConvertINetString != NULL)
+        return TRUE;
+    h = LoadLibrary("mlang.dll");
+    if (!h)
+        return FALSE;
+    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
+    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
+    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
+    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
+    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
+    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
+    return TRUE;
+}
+
+iconv_t
+iconv_open(const char *tocode, const char *fromcode)
+{
+    rec_iconv_t *cd;
+
+    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
+    if (cd == NULL)
+        return (iconv_t)(-1);
+
+#if defined(USE_LIBICONV_DLL)
+    errno = 0;
+    if (libiconv_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+#endif
+
+    /* reset the errno to prevent reporting wrong error code.
+     * 0 for unsorted error. */
+    errno = 0;
+    if (win_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+
+    free(cd);
+
+    return (iconv_t)(-1);
+}
+
+int
+iconv_close(iconv_t _cd)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    int r = cd->iconv_close(cd->cd);
+    int e = *(cd->_errno());
+#if defined(USE_LIBICONV_DLL)
+    if (cd->hlibiconv != NULL)
+        FreeLibrary(cd->hlibiconv);
+#endif
+    free(cd);
+    errno = e;
+    return r;
+}
+
+size_t
+iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
+    errno = *(cd->_errno());
+    return r;
+}
+
+static int
+win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
+        return FALSE;
+    cd->iconv_close = win_iconv_close;
+    cd->iconv = win_iconv;
+    cd->_errno = _errno;
+    cd->cd = (iconv_t)cd;
+    return TRUE;
+}
+
+static int
+win_iconv_close(iconv_t cd)
+{
+    return 0;
+}
+
+static size_t
+win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int insize;
+    int outsize;
+    int wsize;
+    DWORD frommode;
+    DWORD tomode;
+    uint wc;
+    compat_t *cp;
+    int i;
+
+    if (inbuf == NULL || *inbuf == NULL)
+    {
+        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
+        {
+            tomode = cd->to.mode;
+            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
+            if (outsize == -1)
+            {
+                cd->to.mode = tomode;
+                return (size_t)(-1);
+            }
+            *outbuf += outsize;
+            *outbytesleft -= outsize;
+        }
+        cd->from.mode = 0;
+        cd->to.mode = 0;
+        return 0;
+    }
+
+    while (*inbytesleft != 0)
+    {
+        frommode = cd->from.mode;
+        tomode = cd->to.mode;
+        wsize = MB_CHAR_MAX;
+
+        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
+        if (insize == -1)
+        {
+            cd->from.mode = frommode;
+            return (size_t)(-1);
+        }
+
+        if (wsize == 0)
+        {
+            *inbuf += insize;
+            *inbytesleft -= insize;
+            continue;
+        }
+
+        if (cd->from.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->from.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
+                {
+                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        if (cd->to.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->to.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
+                {
+                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
+        if (outsize == -1)
+        {
+            cd->from.mode = frommode;
+            cd->to.mode = tomode;
+            return (size_t)(-1);
+        }
+
+        *inbuf += insize;
+        *outbuf += outsize;
+        *inbytesleft -= insize;
+        *outbytesleft -= outsize;
+    }
+
+    return 0;
+}
+
+static int
+make_csconv(const char *_name, csconv_t *cv)
+{
+    CPINFOEX cpinfoex;
+    int use_compat = TRUE;
+    int flag = 0;
+    char *name;
+    char *p;
+
+    name = xstrndup(_name, strlen(_name));
+    if (name == NULL)
+        return FALSE;
+
+    /* check for option "enc_name//opt1//opt2" */
+    while ((p = strrstr(name, "//")) != NULL)
+    {
+        if (_stricmp(p + 2, "nocompat") == 0)
+            use_compat = FALSE;
+        else if (_stricmp(p + 2, "translit") == 0)
+            flag |= FLAG_TRANSLIT;
+        else if (_stricmp(p + 2, "ignore") == 0)
+            flag |= FLAG_IGNORE;
+        *p = 0;
+    }
+
+    cv->mode = 0;
+    cv->flags = flag;
+    cv->mblen = NULL;
+    cv->flush = NULL;
+    cv->compat = NULL;
+    cv->codepage = name_to_codepage(name);
+    if (cv->codepage == 1200 || cv->codepage == 1201)
+    {
+        cv->mbtowc = utf16_mbtowc;
+        cv->wctomb = utf16_wctomb;
+        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 12000 || cv->codepage == 12001)
+    {
+        cv->mbtowc = utf32_mbtowc;
+        cv->wctomb = utf32_wctomb;
+        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 65001)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        cv->mblen = utf8_mblen;
+    }
+    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
+    {
+        cv->mbtowc = iso2022jp_mbtowc;
+        cv->wctomb = iso2022jp_wctomb;
+        cv->flush = iso2022jp_flush;
+    }
+    else if (cv->codepage == 51932 && load_mlang())
+    {
+        cv->mbtowc = mlang_mbtowc;
+        cv->wctomb = mlang_wctomb;
+        cv->mblen = eucjp_mblen;
+    }
+    else if (IsValidCodePage(cv->codepage)
+	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        if (cpinfoex.MaxCharSize == 1)
+            cv->mblen = sbcs_mblen;
+        else if (cpinfoex.MaxCharSize == 2)
+            cv->mblen = dbcs_mblen;
+	else
+	    cv->mblen = mbcs_mblen;
+    }
+    else
+    {
+        /* not supported */
+        free(name);
+        errno = EINVAL;
+        return FALSE;
+    }
+
+    if (use_compat)
+    {
+        switch (cv->codepage)
+        {
+        case 932: cv->compat = cp932_compat; break;
+        case 20932: cv->compat = cp20932_compat; break;
+        case 51932: cv->compat = cp51932_compat; break;
+        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
+        }
+    }
+
+    free(name);
+
+    return TRUE;
+}
+
+static int
+name_to_codepage(const char *name)
+{
+    int i;
+
+    if (*name == '\0' ||
+	strcmp(name, "char") == 0)
+        return GetACP();
+    else if (strcmp(name, "wchar_t") == 0)
+        return 1200;
+    else if (_strnicmp(name, "cp", 2) == 0)
+        return atoi(name + 2); /* CP123 */
+    else if ('0' <= name[0] && name[0] <= '9')
+        return atoi(name);     /* 123 */
+    else if (_strnicmp(name, "xx", 2) == 0)
+        return atoi(name + 2); /* XX123 for debug */
+
+    for (i = 0; codepage_alias[i].name != NULL; ++i)
+        if (_stricmp(name, codepage_alias[i].name) == 0)
+            return codepage_alias[i].codepage;
+    return -1;
+}
+
+/*
+ * http://www.faqs.org/rfcs/rfc2781.html
+ */
+static uint
+utf16_to_ucs4(const ushort *wbuf)
+{
+    uint wc = wbuf[0];
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
+    return wc;
+}
+
+static void
+ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
+{
+    if (wc < 0x10000)
+    {
+        wbuf[0] = wc;
+        *wbufsize = 1;
+    }
+    else
+    {
+        wc -= 0x10000;
+        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
+        wbuf[1] = 0xDC00 | (wc & 0x3FF);
+        *wbufsize = 2;
+    }
+}
+
+/*
+ * Check if codepage is one of those for which the dwFlags parameter
+ * to MultiByteToWideChar() must be zero. Return zero or
+ * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
+ * Server 2003 R2 claims that also codepage 65001 is one of these, but
+ * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
+ * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
+ * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
+ * from UTF-8.
+ */
+static int
+mbtowc_flags(int codepage)
+{
+    return (codepage == 50220 || codepage == 50221 ||
+	    codepage == 50222 || codepage == 50225 ||
+	    codepage == 50227 || codepage == 50229 ||
+	    codepage == 52936 || codepage == 54936 ||
+	    (codepage >= 57002 && codepage <= 57011) ||
+	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
+}
+
+/*
+ * Check if codepage is one those for which the lpUsedDefaultChar
+ * parameter to WideCharToMultiByte() must be NULL.  The docs in
+ * Platform SDK for for Windows Server 2003 R2 claims that this is the
+ * list below, while the MSDN docs for MSVS2008 claim that it is only
+ * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
+ * SDK seems to be correct, at least for XP.
+ */
+static int
+must_use_null_useddefaultchar(int codepage)
+{
+    return (codepage == 65000 || codepage == 65001 ||
+            codepage == 50220 || codepage == 50221 ||
+            codepage == 50222 || codepage == 50225 ||
+            codepage == 50227 || codepage == 50229 ||
+            codepage == 52936 || codepage == 54936 ||
+            (codepage >= 57002 && codepage <= 57011) ||
+            codepage == 42);
+}
+
+static char *
+strrstr(const char *str, const char *token)
+{
+    int len = strlen(token);
+    const char *p = str + strlen(str);
+
+    while (str <= --p)
+        if (p[0] == token[0] && strncmp(p, token, len) == 0)
+            return (char *)p;
+    return NULL;
+}
+
+static char *
+xstrndup(const char *s, size_t n)
+{
+    char *p;
+
+    p = (char *)malloc(n + 1);
+    if (p == NULL)
+        return NULL;
+    memcpy(p, s, n);
+    p[n] = '\0';
+    return p;
+}
+
+static int
+seterror(int err)
+{
+    errno = err;
+    return -1;
+}
+
+#if defined(USE_LIBICONV_DLL)
+static int
+libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    HMODULE hlibiconv = NULL;
+    HMODULE hmsvcrt = NULL;
+    char *dllname;
+    const char *p;
+    const char *e;
+    f_iconv_open _iconv_open;
+
+    /*
+     * always try to load dll, so that we can switch dll in runtime.
+     */
+
+    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
+    p = getenv("WINICONV_LIBICONV_DLL");
+    if (p == NULL)
+        p = DEFAULT_LIBICONV_DLL;
+    /* parse comma separated value */
+    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
+    {
+        e = strchr(p, ',');
+        if (p == e)
+            continue;
+        else if (e == NULL)
+            e = p + strlen(p);
+        dllname = xstrndup(p, e - p);
+        if (dllname == NULL)
+            return FALSE;
+        hlibiconv = LoadLibrary(dllname);
+        free(dllname);
+        if (hlibiconv != NULL)
+        {
+            if (hlibiconv == hwiniconv)
+            {
+                FreeLibrary(hlibiconv);
+                hlibiconv = NULL;
+                continue;
+            }
+            break;
+        }
+    }
+
+    if (hlibiconv == NULL)
+        goto failed;
+
+    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
+    if (hmsvcrt == NULL)
+        goto failed;
+
+    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
+    if (_iconv_open == NULL)
+        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
+    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
+    if (cd->iconv_close == NULL)
+        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
+    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
+    if (cd->iconv == NULL)
+        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
+    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
+    if (_iconv_open == NULL || cd->iconv_close == NULL
+            || cd->iconv == NULL || cd->_errno == NULL)
+        goto failed;
+
+    cd->cd = _iconv_open(tocode, fromcode);
+    if (cd->cd == (iconv_t)(-1))
+        goto failed;
+
+    cd->hlibiconv = hlibiconv;
+    return TRUE;
+
+failed:
+    if (hlibiconv != NULL)
+        FreeLibrary(hlibiconv);
+    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
+    return FALSE;
+}
+
+/*
+ * Reference:
+ * http://forums.belution.com/ja/vc/000/234/78s.shtml
+ * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
+ *
+ * The formal way is
+ *   imagehlp.h or dbghelp.h
+ *   imagehlp.lib or dbghelp.lib
+ *   ImageDirectoryEntryToData()
+ */
+#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
+#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
+static PVOID
+MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
+{
+    /* TODO: MappedAsImage? */
+    PIMAGE_DATA_DIRECTORY p;
+    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
+    if (p->VirtualAddress == 0) {
+      *Size = 0;
+      return NULL;
+    }
+    *Size = p->Size;
+    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
+}
+
+static HMODULE
+find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
+{
+    DWORD Base;
+    ULONG Size;
+    PIMAGE_IMPORT_DESCRIPTOR Imp;
+    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
+    PIMAGE_IMPORT_BY_NAME ImpName;
+
+    Base = (DWORD)hModule;
+    Imp = MyImageDirectoryEntryToData(
+            (LPVOID)Base,
+            TRUE,
+            IMAGE_DIRECTORY_ENTRY_IMPORT,
+            &Size);
+    if (Imp == NULL)
+        return NULL;
+    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
+    {
+        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
+        for ( ; Name->u1.Ordinal != 0; ++Name)
+        {
+            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
+            {
+                ImpName = (PIMAGE_IMPORT_BY_NAME)
+                    (Base + (DWORD)Name->u1.AddressOfData);
+                if (strcmp((char *)ImpName->Name, funcname) == 0)
+                    return GetModuleHandle((char *)(Base + Imp->Name));
+            }
+        }
+    }
+    return NULL;
+}
+#endif
+
+static int
+sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    return 1;
+}
+
+static int
+dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (cv->codepage == 54936) {
+	if (buf[0] <= 0x7F) len = 1;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 2 &&
+		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
+		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 4 &&
+		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
+	else
+	    return seterror(EINVAL);
+	return len;
+    }
+    else
+	return seterror(EINVAL);
+}
+
+static int
+utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (buf[0] < 0x80) len = 1;
+    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
+    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
+    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
+    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
+    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
+
+    if (len == 0)
+        return seterror(EILSEQ);
+    else if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    if (buf[0] < 0x80) /* ASCII */
+        return 1;
+    else if (buf[0] == 0x8E) /* JIS X 0201 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
+            return seterror(EILSEQ);
+        return 2;
+    }
+    else if (buf[0] == 0x8F) /* JIS X 0212 */
+    {
+        if (bufsize < 3)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
+                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
+            return seterror(EILSEQ);
+        return 3;
+    }
+    else /* JIS X 0208 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
+                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
+            return seterror(EILSEQ);
+        return 2;
+    }
+}
+
+static int
+kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
+            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
+    if (*wbufsize == 0)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    BOOL usedDefaultChar = 0;
+    BOOL *p = NULL;
+    int flags = 0;
+    int len;
+
+    if (bufsize == 0)
+        return seterror(E2BIG);
+    if (!must_use_null_useddefaultchar(cv->codepage))
+    {
+        p = &usedDefaultChar;
+#ifdef WC_NO_BEST_FIT_CHARS
+        if (!(cv->flags & FLAG_TRANSLIT))
+            flags |= WC_NO_BEST_FIT_CHARS;
+#endif
+    }
+    len = WideCharToMultiByte(cv->codepage, flags,
+            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
+    if (len == 0)
+    {
+        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+            return seterror(E2BIG);
+        return seterror(EILSEQ);
+    }
+    else if (usedDefaultChar)
+        return seterror(EILSEQ);
+    else if (cv->mblen(cv, buf, len) != len) /* validate result */
+        return seterror(EILSEQ);
+    return len;
+}
+
+/*
+ * It seems that the mode (cv->mode) is fixnum.
+ * For example, when converting iso-2022-jp(cp50221) to unicode:
+ *      in ascii sequence: mode=0xC42C0000
+ *   in jisx0208 sequence: mode=0xC42C0001
+ * "C42C" is same for each convert session.
+ * It should be: ((codepage-1)<<16)|state
+ */
+static int
+mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+    int insize;
+    HRESULT hr;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    insize = len;
+    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
+            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+
+    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
+        return seterror(EILSEQ);
+    memcpy(buf, tmpbuf, tmpsize);
+    return tmpsize;
+}
+
+static int
+utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+
+    /* swap endian: 1200 <-> 1201 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 2)
+        return seterror(EINVAL);
+    if (codepage == 1200) /* little endian */
+        wbuf[0] = (buf[1] << 8) | buf[0];
+    else if (codepage == 1201) /* big endian */
+        wbuf[0] = (buf[0] << 8) | buf[1];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wbuf[0] == 0xFFFE)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 2;
+        }
+        else if (wbuf[0] == 0xFEFF)
+        {
+            *wbufsize = 0;
+            return 2;
+        }
+    }
+
+    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
+        return seterror(EILSEQ);
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(EINVAL);
+        if (codepage == 1200) /* little endian */
+            wbuf[1] = (buf[3] << 8) | buf[2];
+        else if (codepage == 1201) /* big endian */
+            wbuf[1] = (buf[2] << 8) | buf[3];
+        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
+            return seterror(EILSEQ);
+        *wbufsize = 2;
+        return 4;
+    }
+    *wbufsize = 1;
+    return 2;
+}
+
+static int
+utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 2)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+            memcpy(buf, "\xFF\xFE", 2);
+        else if (cv->codepage == 1201) /* big endian */
+            memcpy(buf, "\xFE\xFF", 2);
+
+        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
+        if (r == -1)
+            return -1;
+        return r + 2;
+    }
+
+    if (bufsize < 2)
+        return seterror(E2BIG);
+    if (cv->codepage == 1200) /* little endian */
+    {
+        buf[0] = (wbuf[0] & 0x00FF);
+        buf[1] = (wbuf[0] & 0xFF00) >> 8;
+    }
+    else if (cv->codepage == 1201) /* big endian */
+    {
+        buf[0] = (wbuf[0] & 0xFF00) >> 8;
+        buf[1] = (wbuf[0] & 0x00FF);
+    }
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+        {
+            buf[2] = (wbuf[1] & 0x00FF);
+            buf[3] = (wbuf[1] & 0xFF00) >> 8;
+        }
+        else if (cv->codepage == 1201) /* big endian */
+        {
+            buf[2] = (wbuf[1] & 0xFF00) >> 8;
+            buf[3] = (wbuf[1] & 0x00FF);
+        }
+        return 4;
+    }
+    return 2;
+}
+
+static int
+utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+    uint wc = 0;
+
+    /* swap endian: 12000 <-> 12001 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 4)
+        return seterror(EINVAL);
+    if (codepage == 12000) /* little endian */
+        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+    else if (codepage == 12001) /* big endian */
+        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wc == 0xFFFE0000)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 4;
+        }
+        else if (wc == 0x0000FEFF)
+        {
+            *wbufsize = 0;
+            return 4;
+        }
+    }
+
+    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
+        return seterror(EILSEQ);
+    ucs4_to_utf16(wc, wbuf, wbufsize);
+    return 4;
+}
+
+static int
+utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    uint wc;
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 12000) /* little endian */
+            memcpy(buf, "\xFF\xFE\x00\x00", 4);
+        else if (cv->codepage == 12001) /* big endian */
+            memcpy(buf, "\x00\x00\xFE\xFF", 4);
+
+        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
+        if (r == -1)
+            return -1;
+        return r + 4;
+    }
+
+    if (bufsize < 4)
+        return seterror(E2BIG);
+    wc = utf16_to_ucs4(wbuf);
+    if (cv->codepage == 12000) /* little endian */
+    {
+        buf[0] = wc & 0x000000FF;
+        buf[1] = (wc & 0x0000FF00) >> 8;
+        buf[2] = (wc & 0x00FF0000) >> 16;
+        buf[3] = (wc & 0xFF000000) >> 24;
+    }
+    else if (cv->codepage == 12001) /* big endian */
+    {
+        buf[0] = (wc & 0xFF000000) >> 24;
+        buf[1] = (wc & 0x00FF0000) >> 16;
+        buf[2] = (wc & 0x0000FF00) >> 8;
+        buf[3] = wc & 0x000000FF;
+    }
+    return 4;
+}
+
+/*
+ * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
+ * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
+ *        1 byte Kana)
+ * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
+ *        Kana - SO/SI)
+ *
+ * MultiByteToWideChar() and WideCharToMultiByte() behave differently
+ * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
+ * terminate result sequence with ascii escape.  But Vista does.
+ * Use MLang instead.
+ */
+
+#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
+#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
+#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
+
+#define ISO2022_SI  0
+#define ISO2022_SO  1
+
+/* shift in */
+static const char iso2022_SI_seq[] = "\x0F";
+/* shift out */
+static const char iso2022_SO_seq[] = "\x0E";
+
+typedef struct iso2022_esc_t iso2022_esc_t;
+struct iso2022_esc_t {
+    const char *esc;
+    int esc_len;
+    int len;
+    int cs;
+};
+
+#define ISO2022JP_CS_ASCII            0
+#define ISO2022JP_CS_JISX0201_ROMAN   1
+#define ISO2022JP_CS_JISX0201_KANA    2
+#define ISO2022JP_CS_JISX0208_1978    3
+#define ISO2022JP_CS_JISX0208_1983    4
+#define ISO2022JP_CS_JISX0212         5
+
+static iso2022_esc_t iso2022jp_esc[] = {
+    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
+    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
+    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
+    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
+    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
+    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
+    {NULL, 0, 0, 0}
+};
+
+static int
+iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int insize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
+
+    if (buf[0] == 0x1B)
+    {
+        for (i = 0; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (bufsize < esc_len)
+            {
+                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
+                    return seterror(EINVAL);
+            }
+            else
+            {
+                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
+                {
+                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
+                    *wbufsize = 0;
+                    return esc_len;
+                }
+            }
+        }
+        /* not supported escape sequence */
+        return seterror(EILSEQ);
+    }
+    else if (buf[0] == iso2022_SO_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
+        *wbufsize = 0;
+        return 1;
+    }
+    else if (buf[0] == iso2022_SI_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
+        *wbufsize = 0;
+        return 1;
+    }
+
+    cs = ISO2022_MODE_CS(cv->mode);
+    shift = ISO2022_MODE_SHIFT(cv->mode);
+
+    /* reset the mode for informal sequence */
+    if (buf[0] < 0x20)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        shift = ISO2022_SI;
+    }
+
+    len = iesc[cs].len;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    for (i = 0; i < len; ++i)
+        if (!(buf[i] < 0x80))
+            return seterror(EILSEQ);
+    esc_len = iesc[cs].esc_len;
+    memcpy(tmp, iesc[cs].esc, esc_len);
+    if (shift == ISO2022_SO)
+    {
+        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
+        esc_len += 1;
+    }
+    memcpy(tmp + esc_len, buf, len);
+
+    if ((cv->codepage == 50220 || cv->codepage == 50221
+                || cv->codepage == 50222) && shift == ISO2022_SO)
+    {
+        /* XXX: shift-out cannot be used for mbtowc (both kernel and
+         * mlang) */
+        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
+        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
+        memcpy(tmp + esc_len, buf, len);
+    }
+
+    insize = len + esc_len;
+    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
+            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len + esc_len)
+        return seterror(EILSEQ);
+
+    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (wbuf[0] == buf[0]
+            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+        return seterror(EILSEQ);
+
+    /* reset the mode for informal sequence */
+    if (cv->mode != ISO2022_MODE(cs, shift))
+        cv->mode = ISO2022_MODE(cs, shift);
+
+    return len;
+}
+
+static int
+iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len = 0;
+    int cs = 0;
+    int shift;
+    int i;
+
+    /*
+     * MultiByte = [escape sequence] + character + [escape sequence]
+     *
+     * Whether trailing escape sequence is added depends on which API is
+     * used (kernel or MLang, and its version).
+     */
+    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+
+    if (tmpsize == 1)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        esc_len = 0;
+    }
+    else
+    {
+        for (i = 1; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
+            {
+                cs = iesc[i].cs;
+                break;
+            }
+        }
+        if (iesc[i].esc == NULL)
+            /* not supported escape sequence */
+            return seterror(EILSEQ);
+    }
+
+    shift = ISO2022_SI;
+    if (tmp[esc_len] == iso2022_SO_seq[0])
+    {
+        shift = ISO2022_SO;
+        esc_len += 1;
+    }
+
+    len = iesc[cs].len;
+
+    /* Check for converting error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
+        return seterror(EILSEQ);
+    else if (tmpsize < esc_len + len)
+        return seterror(EILSEQ);
+
+    if (cv->mode == ISO2022_MODE(cs, shift))
+    {
+        /* remove escape sequence */
+        if (esc_len != 0)
+            memmove(tmp, tmp + esc_len, len);
+        esc_len = 0;
+    }
+    else
+    {
+        if (cs == ISO2022JP_CS_ASCII)
+        {
+            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
+            memmove(tmp + esc_len, tmp, len);
+            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
+        }
+        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
+        {
+            /* shift-in before changing to other mode */
+            memmove(tmp + 1, tmp, len + esc_len);
+            memcpy(tmp, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+    }
+
+    if (bufsize < len + esc_len)
+        return seterror(E2BIG);
+    memcpy(buf, tmp, len + esc_len);
+    cv->mode = ISO2022_MODE(cs, shift);
+    return len + esc_len;
+}
+
+static int
+iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    int esc_len;
+
+    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+    {
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+            esc_len += 1;
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        if (bufsize < esc_len)
+            return seterror(E2BIG);
+
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+        {
+            memcpy(buf, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+        {
+            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
+                    iesc[ISO2022JP_CS_ASCII].esc_len);
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        }
+        return esc_len;
+    }
+    return 0;
+}
+
+#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
+{
+    switch( fdwReason )
+    {
+    case DLL_PROCESS_ATTACH:
+        hwiniconv = (HMODULE)hinstDLL;
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
+#endif
+
+#if defined(MAKE_EXE)
+#include <stdio.h>
+#include <fcntl.h>
+#include <io.h>
+int
+main(int argc, char **argv)
+{
+    char *fromcode = NULL;
+    char *tocode = NULL;
+    int i;
+    char inbuf[BUFSIZ];
+    char outbuf[BUFSIZ];
+    const char *pin;
+    char *pout;
+    size_t inbytesleft;
+    size_t outbytesleft;
+    size_t rest = 0;
+    iconv_t cd;
+    size_t r;
+    FILE *in = stdin;
+
+    _setmode(_fileno(stdin), _O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+
+    for (i = 1; i < argc; ++i)
+    {
+        if (strcmp(argv[i], "-l") == 0)
+        {
+            for (i = 0; codepage_alias[i].name != NULL; ++i)
+                printf("%s\n", codepage_alias[i].name);
+            return 0;
+        }
+
+        if (strcmp(argv[i], "-f") == 0)
+            fromcode = argv[++i];
+        else if (strcmp(argv[i], "-t") == 0)
+            tocode = argv[++i];
+        else
+        {
+            in = fopen(argv[i], "rb");
+            if (in == NULL)
+            {
+                fprintf(stderr, "cannot open %s\n", argv[i]);
+                return 1;
+            }
+            break;
+        }
+    }
+
+    if (fromcode == NULL || tocode == NULL)
+    {
+        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
+        return 0;
+    }
+
+    cd = iconv_open(tocode, fromcode);
+    if (cd == (iconv_t)(-1))
+    {
+        perror("iconv_open error");
+        return 1;
+    }
+
+    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
+            || rest != 0)
+    {
+        inbytesleft += rest;
+        pin = inbuf;
+        pout = outbuf;
+        outbytesleft = sizeof(outbuf);
+        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
+        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
+        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
+        {
+            perror("conversion error");
+            return 1;
+        }
+        memmove(inbuf, pin, inbytesleft);
+        rest = inbytesleft;
+    }
+    pout = outbuf;
+    outbytesleft = sizeof(outbuf);
+    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
+    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
+    if (r == (size_t)(-1))
+    {
+        perror("conversion error");
+        return 1;
+    }
+
+    iconv_close(cd);
+
+    return 0;
+}
+#endif
+
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h b/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h
index 7c941fe435..455be3b6b7 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv/iconv.h
@@ -1,5 +1,5 @@
-#include <stddef.h>
-typedef void* iconv_t;
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+#include <stddef.h>
+typedef void* iconv_t;
+iconv_t iconv_open(const char *tocode, const char *fromcode);
+int iconv_close(iconv_t cd);
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h b/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h
index 525f484e98..5cbf779c92 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv/mlang.h
@@ -1,54 +1,54 @@
-HRESULT WINAPI ConvertINetString(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-
-HRESULT WINAPI ConvertINetMultiByteToUnicode(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-
-HRESULT WINAPI ConvertINetUnicodeToMultiByte(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-
-HRESULT WINAPI IsConvertINetStringAvailable(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-
-HRESULT WINAPI LcidToRfc1766A(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-
-HRESULT WINAPI LcidToRfc1766W(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-
-HRESULT WINAPI Rfc1766ToLcidA(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-
-HRESULT WINAPI Rfc1766ToLcidW(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
+HRESULT WINAPI ConvertINetString(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnSrcSize,
+    LPBYTE lpDstStr,
+    LPINT lpnDstSize
+);
+
+HRESULT WINAPI ConvertINetMultiByteToUnicode(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnMultiCharCount,
+    LPWSTR lpDstStr,
+    LPINT lpnWideCharCount
+);
+
+HRESULT WINAPI ConvertINetUnicodeToMultiByte(
+    LPDWORD lpdwMode,
+    DWORD dwEncoding,
+    LPCWSTR lpSrcStr,
+    LPINT lpnWideCharCount,
+    LPSTR lpDstStr,
+    LPINT lpnMultiCharCount
+);
+
+HRESULT WINAPI IsConvertINetStringAvailable(
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding
+);
+
+HRESULT WINAPI LcidToRfc1766A(
+    LCID Locale,
+    LPSTR pszRfc1766,
+    int nChar
+);
+
+HRESULT WINAPI LcidToRfc1766W(
+    LCID Locale,
+    LPWSTR pszRfc1766,
+    int nChar
+);
+
+HRESULT WINAPI Rfc1766ToLcidA(
+    LCID *pLocale,
+    LPSTR pszRfc1766
+);
+
+HRESULT WINAPI Rfc1766ToLcidW(
+    LCID *pLocale,
+    LPWSTR pszRfc1766
+);
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt b/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt
index c4fb7d692b..31f423dc75 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv/readme.txt
@@ -1,3 +1,3 @@
-win_iconv is a iconv library using Win32 API to conversion.
-win_iconv is placed in the public domain.
-Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
+win_iconv is a iconv library using Win32 API to conversion.
+win_iconv is placed in the public domain.
+Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c
index 94c8d4a1e7..7a3eda3e10 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv.c
@@ -1,1986 +1,1986 @@
-/*
- * iconv library using Win32 API to conversion.
- *
- * This file is placed in the public domain.
- *
- * Last Change: 2009-07-06
- *
- * ENVIRONMENT VARIABLE:
- *     WINICONV_LIBICONV_DLL
- *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
- *         loading the DLL or iconv_open() failed, falls back to internal
- *         conversion.  If a few DLL are specified as comma separated list,
- *         the first loadable DLL is used.  The DLL should have iconv_open(),
- *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
- *         and libiconv().
- *         (only available when USE_LIBICONV_DLL is defined at compile time)
- *
- * Win32 API does not support strict encoding conversion for some
- * codepage.  And MLang function drop or replace invalid bytes and does
- * not return useful error status as iconv.  This implementation cannot
- * be used for encoding validation purpose.
- */
-
-/* for WC_NO_BEST_FIT_CHARS */
-#ifndef WINVER
-# define WINVER 0x0500
-#endif
-
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if 0
-# define MAKE_EXE
-# define MAKE_DLL
-# define USE_LIBICONV_DLL
-#endif
-
-#if !defined(DEFAULT_LIBICONV_DLL)
-# define DEFAULT_LIBICONV_DLL ""
-#endif
-
-#define MB_CHAR_MAX 16
-
-#define UNICODE_MODE_BOM_DONE   1
-#define UNICODE_MODE_SWAPPED    2
-
-#define FLAG_USE_BOM            1
-#define FLAG_TRANSLIT           2 /* //TRANSLIT */
-#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-
-typedef void* iconv_t;
-
-iconv_t iconv_open(const char *tocode, const char *fromcode);
-int iconv_close(iconv_t cd);
-size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-/* libiconv interface for vim */
-#if defined(MAKE_DLL)
-int
-iconvctl (iconv_t cd, int request, void* argument)
-{
-    /* not supported */
-    return 0;
-}
-#endif
-
-typedef struct compat_t compat_t;
-typedef struct csconv_t csconv_t;
-typedef struct rec_iconv_t rec_iconv_t;
-
-typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
-typedef int (*f_iconv_close)(iconv_t cd);
-typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-typedef int* (*f_errno)(void);
-typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
-typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
-
-#define COMPAT_IN   1
-#define COMPAT_OUT  2
-
-/* unicode mapping for compatibility with other conversion table. */
-struct compat_t {
-    uint in;
-    uint out;
-    uint flag;
-};
-
-struct csconv_t {
-    int codepage;
-    int flags;
-    f_mbtowc mbtowc;
-    f_wctomb wctomb;
-    f_mblen mblen;
-    f_flush flush;
-    DWORD mode;
-    compat_t *compat;
-};
-
-struct rec_iconv_t {
-    iconv_t cd;
-    f_iconv_close iconv_close;
-    f_iconv iconv;
-    f_errno _errno;
-    csconv_t from;
-    csconv_t to;
-#if defined(USE_LIBICONV_DLL)
-    HMODULE hlibiconv;
-#endif
-};
-
-static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static int win_iconv_close(iconv_t cd);
-static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-
-static int load_mlang();
-static int make_csconv(const char *name, csconv_t *cv);
-static int name_to_codepage(const char *name);
-static uint utf16_to_ucs4(const ushort *wbuf);
-static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
-static int mbtowc_flags(int codepage);
-static int must_use_null_useddefaultchar(int codepage);
-static char *strrstr(const char *str, const char *token);
-static char *xstrndup(const char *s, size_t n);
-static int seterror(int err);
-
-#if defined(USE_LIBICONV_DLL)
-static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
-static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
-static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
-
-static HMODULE hwiniconv;
-#endif
-
-static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
-
-static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
-static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
-static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
-
-static struct {
-    int codepage;
-    const char *name;
-} codepage_alias[] = {
-    {65001, "CP65001"},
-    {65001, "UTF8"},
-    {65001, "UTF-8"},
-
-    {1200, "CP1200"},
-    {1200, "UTF16LE"},
-    {1200, "UTF-16LE"},
-    {1200, "UCS-2LE"},
-
-    {1201, "CP1201"},
-    {1201, "UTF16BE"},
-    {1201, "UTF-16BE"},
-    {1201, "UCS-2BE"},
-    {1201, "unicodeFFFE"},
-
-    {12000, "CP12000"},
-    {12000, "UTF32LE"},
-    {12000, "UTF-32LE"},
-
-    {12001, "CP12001"},
-    {12001, "UTF32BE"},
-    {12001, "UTF-32BE"},
-
-#ifndef GLIB_COMPILATION
-    /*
-     * Default is big endian.
-     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
-     */
-    {1201, "UTF16"},
-    {1201, "UTF-16"},
-    {12001, "UTF32"},
-    {12001, "UTF-32"},
-#else
-    /* Default is little endian, because the platform is */
-    {1200, "UTF16"},
-    {1200, "UTF-16"},
-    {1200, "UCS-2"},
-    {12000, "UTF32"},
-    {12000, "UTF-32"},
-#endif
-
-    /* copy from libiconv `iconv -l` */
-    /* !IsValidCodePage(367) */
-    {20127, "ANSI_X3.4-1968"},
-    {20127, "ANSI_X3.4-1986"},
-    {20127, "ASCII"},
-    {20127, "CP367"},
-    {20127, "IBM367"},
-    {20127, "ISO-IR-6"},
-    {20127, "ISO646-US"},
-    {20127, "ISO_646.IRV:1991"},
-    {20127, "US"},
-    {20127, "US-ASCII"},
-    {20127, "CSASCII"},
-
-    /* !IsValidCodePage(819) */
-    {1252, "CP819"},
-    {1252, "IBM819"},
-    {28591, "ISO-8859-1"},
-    {28591, "ISO-IR-100"},
-    {28591, "ISO8859-1"},
-    {28591, "ISO_8859-1"},
-    {28591, "ISO_8859-1:1987"},
-    {28591, "L1"},
-    {28591, "LATIN1"},
-    {28591, "CSISOLATIN1"},
-
-    {1250, "CP1250"},
-    {1250, "MS-EE"},
-    {1250, "WINDOWS-1250"},
-
-    {1251, "CP1251"},
-    {1251, "MS-CYRL"},
-    {1251, "WINDOWS-1251"},
-
-    {1252, "CP1252"},
-    {1252, "MS-ANSI"},
-    {1252, "WINDOWS-1252"},
-
-    {1253, "CP1253"},
-    {1253, "MS-GREEK"},
-    {1253, "WINDOWS-1253"},
-
-    {1254, "CP1254"},
-    {1254, "MS-TURK"},
-    {1254, "WINDOWS-1254"},
-
-    {1255, "CP1255"},
-    {1255, "MS-HEBR"},
-    {1255, "WINDOWS-1255"},
-
-    {1256, "CP1256"},
-    {1256, "MS-ARAB"},
-    {1256, "WINDOWS-1256"},
-
-    {1257, "CP1257"},
-    {1257, "WINBALTRIM"},
-    {1257, "WINDOWS-1257"},
-
-    {1258, "CP1258"},
-    {1258, "WINDOWS-1258"},
-
-    {850, "850"},
-    {850, "CP850"},
-    {850, "IBM850"},
-    {850, "CSPC850MULTILINGUAL"},
-
-    /* !IsValidCodePage(862) */
-    {862, "862"},
-    {862, "CP862"},
-    {862, "IBM862"},
-    {862, "CSPC862LATINHEBREW"},
-
-    {866, "866"},
-    {866, "CP866"},
-    {866, "IBM866"},
-    {866, "CSIBM866"},
-
-    /* !IsValidCodePage(154) */
-    {154, "CP154"},
-    {154, "CYRILLIC-ASIAN"},
-    {154, "PT154"},
-    {154, "PTCP154"},
-    {154, "CSPTCP154"},
-
-    /* !IsValidCodePage(1133) */
-    {1133, "CP1133"},
-    {1133, "IBM-CP1133"},
-
-    {874, "CP874"},
-    {874, "WINDOWS-874"},
-
-    /* !IsValidCodePage(51932) */
-    {51932, "CP51932"},
-    {51932, "MS51932"},
-    {51932, "WINDOWS-51932"},
-    {51932, "EUC-JP"},
-
-    {932, "CP932"},
-    {932, "MS932"},
-    {932, "SHIFFT_JIS"},
-    {932, "SHIFFT_JIS-MS"},
-    {932, "SJIS"},
-    {932, "SJIS-MS"},
-    {932, "SJIS-OPEN"},
-    {932, "SJIS-WIN"},
-    {932, "WINDOWS-31J"},
-    {932, "WINDOWS-932"},
-    {932, "CSWINDOWS31J"},
-
-    {50221, "CP50221"},
-    {50221, "ISO-2022-JP"},
-    {50221, "ISO-2022-JP-MS"},
-    {50221, "ISO2022-JP"},
-    {50221, "ISO2022-JP-MS"},
-    {50221, "MS50221"},
-    {50221, "WINDOWS-50221"},
-
-    {936, "CP936"},
-    {936, "GBK"},
-    {936, "MS936"},
-    {936, "WINDOWS-936"},
-
-    {950, "CP950"},
-    {950, "BIG5"},
-
-    {949, "CP949"},
-    {949, "UHC"},
-    {949, "EUC-KR"},
-
-    {1361, "CP1361"},
-    {1361, "JOHAB"},
-
-    {437, "437"},
-    {437, "CP437"},
-    {437, "IBM437"},
-    {437, "CSPC8CODEPAGE437"},
-
-    {737, "CP737"},
-
-    {775, "CP775"},
-    {775, "IBM775"},
-    {775, "CSPC775BALTIC"},
-
-    {852, "852"},
-    {852, "CP852"},
-    {852, "IBM852"},
-    {852, "CSPCP852"},
-
-    /* !IsValidCodePage(853) */
-    {853, "CP853"},
-
-    {855, "855"},
-    {855, "CP855"},
-    {855, "IBM855"},
-    {855, "CSIBM855"},
-
-    {857, "857"},
-    {857, "CP857"},
-    {857, "IBM857"},
-    {857, "CSIBM857"},
-
-    /* !IsValidCodePage(858) */
-    {858, "CP858"},
-
-    {860, "860"},
-    {860, "CP860"},
-    {860, "IBM860"},
-    {860, "CSIBM860"},
-
-    {861, "861"},
-    {861, "CP-IS"},
-    {861, "CP861"},
-    {861, "IBM861"},
-    {861, "CSIBM861"},
-
-    {863, "863"},
-    {863, "CP863"},
-    {863, "IBM863"},
-    {863, "CSIBM863"},
-
-    {864, "CP864"},
-    {864, "IBM864"},
-    {864, "CSIBM864"},
-
-    {865, "865"},
-    {865, "CP865"},
-    {865, "IBM865"},
-    {865, "CSIBM865"},
-
-    {869, "869"},
-    {869, "CP-GR"},
-    {869, "CP869"},
-    {869, "IBM869"},
-    {869, "CSIBM869"},
-
-    /* !IsValidCodePage(1152) */
-    {1125, "CP1125"},
-
-    /*
-     * Code Page Identifiers
-     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
-     */
-    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
-    {437, "IBM437"}, /* OEM United States */
-    {500, "IBM500"}, /* IBM EBCDIC International */
-    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
-    /* 709 		Arabic (ASMO-449+, BCON V4) */
-    /* 710 		Arabic - Transparent Arabic */
-    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
-    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
-    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
-    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
-    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
-    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
-    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
-    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
-    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
-    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
-    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
-    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
-    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
-    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
-    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
-    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
-    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
-    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
-    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
-    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
-    {932, "shift-jis"}, /* alternative name for it */
-    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
-    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
-    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
-    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
-    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
-    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
-    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
-    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
-    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
-    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
-    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
-    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
-    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
-    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
-    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
-    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
-    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
-    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
-    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
-    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
-    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
-    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
-    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
-    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
-    {1361, "Johab"}, /* Korean (Johab) */
-    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
-    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
-    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
-    {10003, "x-mac-korean"}, /* Korean (Mac) */
-    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
-    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
-    {10006, "x-mac-greek"}, /* Greek (Mac) */
-    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
-    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
-    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
-    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
-    {10021, "x-mac-thai"}, /* Thai (Mac) */
-    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
-    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
-    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
-    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
-    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
-    {20001, "x-cp20001"}, /* TCA Taiwan */
-    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
-    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
-    {20004, "x-cp20004"}, /* TeleText Taiwan */
-    {20005, "x-cp20005"}, /* Wang Taiwan */
-    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
-    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
-    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
-    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
-    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
-    {20261, "x-cp20261"}, /* T.61 */
-    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
-    {20273, "IBM273"}, /* IBM EBCDIC Germany */
-    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
-    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
-    {20280, "IBM280"}, /* IBM EBCDIC Italy */
-    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
-    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
-    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
-    {20297, "IBM297"}, /* IBM EBCDIC France */
-    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
-    {20423, "IBM423"}, /* IBM EBCDIC Greek */
-    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
-    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
-    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
-    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
-    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
-    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
-    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
-    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
-    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
-    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
-    {20949, "x-cp20949"}, /* Korean Wansung */
-    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
-    /* 21027 		(deprecated) */
-    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
-    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
-    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
-    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
-    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
-    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
-    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
-    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
-    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
-    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
-    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
-    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
-    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
-    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
-    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
-    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
-    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
-    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
-    {29001, "x-Europa"}, /* Europa 3 */
-    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
-    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
-    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
-    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
-    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
-    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
-    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
-    /* 50229 		ISO 2022 Traditional Chinese */
-    /* 50930 		EBCDIC Japanese (Katakana) Extended */
-    /* 50931 		EBCDIC US-Canada and Japanese */
-    /* 50933 		EBCDIC Korean Extended and Korean */
-    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
-    /* 50936 		EBCDIC Simplified Chinese */
-    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
-    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
-    {51932, "euc-jp"}, /* EUC Japanese */
-    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
-    {51949, "euc-kr"}, /* EUC Korean */
-    /* 51950 		EUC Traditional Chinese */
-    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
-    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
-    {57002, "x-iscii-de"}, /* ISCII Devanagari */
-    {57003, "x-iscii-be"}, /* ISCII Bengali */
-    {57004, "x-iscii-ta"}, /* ISCII Tamil */
-    {57005, "x-iscii-te"}, /* ISCII Telugu */
-    {57006, "x-iscii-as"}, /* ISCII Assamese */
-    {57007, "x-iscii-or"}, /* ISCII Oriya */
-    {57008, "x-iscii-ka"}, /* ISCII Kannada */
-    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
-    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
-    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
-
-    {0, NULL}
-};
-
-/*
- * SJIS SHIFTJIS table              CP932 table
- * ---- --------------------------- --------------------------------
- *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
- *   7E U+203E OVERLINE             U+007E TILDE
- * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
- * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
- * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
- * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
- * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
- * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
- * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
- * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
- *
- * EUC-JP and ISO-2022-JP should be compatible with CP932.
- *
- * Kernel and MLang have different Unicode mapping table.  Make sure
- * which API is used.
- */
-static compat_t cp932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0x301C, 0xFF5E, COMPAT_OUT},
-    {0x2016, 0x2225, COMPAT_OUT},
-    {0x2212, 0xFF0D, COMPAT_OUT},
-    {0x00A2, 0xFFE0, COMPAT_OUT},
-    {0x00A3, 0xFFE1, COMPAT_OUT},
-    {0x00AC, 0xFFE2, COMPAT_OUT},
-    {0, 0, 0}
-};
-
-static compat_t cp20932_compat[] = {
-    {0x00A5, 0x005C, COMPAT_OUT},
-    {0x203E, 0x007E, COMPAT_OUT},
-    {0x2014, 0x2015, COMPAT_OUT},
-    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
-    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
-    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
-    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
-    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
-    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
-    {0, 0, 0}
-};
-
-static compat_t *cp51932_compat = cp932_compat;
-
-/* cp20932_compat for kernel.  cp932_compat for mlang. */
-static compat_t *cp5022x_compat = cp932_compat;
-
-typedef HRESULT (WINAPI *CONVERTINETSTRING)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnSrcSize,
-    LPBYTE lpDstStr,
-    LPINT lpnDstSize
-);
-typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
-    LPDWORD lpdwMode,
-    DWORD dwSrcEncoding,
-    LPCSTR lpSrcStr,
-    LPINT lpnMultiCharCount,
-    LPWSTR lpDstStr,
-    LPINT lpnWideCharCount
-);
-typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
-    LPDWORD lpdwMode,
-    DWORD dwEncoding,
-    LPCWSTR lpSrcStr,
-    LPINT lpnWideCharCount,
-    LPSTR lpDstStr,
-    LPINT lpnMultiCharCount
-);
-typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
-    DWORD dwSrcEncoding,
-    DWORD dwDstEncoding
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766A)(
-    LCID Locale,
-    LPSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *LCIDTORFC1766W)(
-    LCID Locale,
-    LPWSTR pszRfc1766,
-    int nChar
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
-    LCID *pLocale,
-    LPSTR pszRfc1766
-);
-typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
-    LCID *pLocale,
-    LPWSTR pszRfc1766
-);
-static CONVERTINETSTRING ConvertINetString;
-static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
-static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
-static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
-static LCIDTORFC1766A LcidToRfc1766A;
-static RFC1766TOLCIDA Rfc1766ToLcidA;
-
-static int
-load_mlang()
-{
-    HMODULE h;
-    if (ConvertINetString != NULL)
-        return TRUE;
-    h = LoadLibrary("mlang.dll");
-    if (!h)
-        return FALSE;
-    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
-    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
-    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
-    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
-    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
-    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
-    return TRUE;
-}
-
-iconv_t
-iconv_open(const char *tocode, const char *fromcode)
-{
-    rec_iconv_t *cd;
-
-    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
-    if (cd == NULL)
-        return (iconv_t)(-1);
-
-#if defined(USE_LIBICONV_DLL)
-    errno = 0;
-    if (libiconv_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-#endif
-
-    /* reset the errno to prevent reporting wrong error code.
-     * 0 for unsorted error. */
-    errno = 0;
-    if (win_iconv_open(cd, tocode, fromcode))
-        return (iconv_t)cd;
-
-    free(cd);
-
-    return (iconv_t)(-1);
-}
-
-int
-iconv_close(iconv_t _cd)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    int r = cd->iconv_close(cd->cd);
-    int e = *(cd->_errno());
-#if defined(USE_LIBICONV_DLL)
-    if (cd->hlibiconv != NULL)
-        FreeLibrary(cd->hlibiconv);
-#endif
-    free(cd);
-    errno = e;
-    return r;
-}
-
-size_t
-iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
-    errno = *(cd->_errno());
-    return r;
-}
-
-static int
-win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
-        return FALSE;
-    cd->iconv_close = win_iconv_close;
-    cd->iconv = win_iconv;
-    cd->_errno = _errno;
-    cd->cd = (iconv_t)cd;
-    return TRUE;
-}
-
-static int
-win_iconv_close(iconv_t cd)
-{
-    return 0;
-}
-
-static size_t
-win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
-{
-    rec_iconv_t *cd = (rec_iconv_t *)_cd;
-    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int insize;
-    int outsize;
-    int wsize;
-    DWORD frommode;
-    DWORD tomode;
-    uint wc;
-    compat_t *cp;
-    int i;
-
-    if (inbuf == NULL || *inbuf == NULL)
-    {
-        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
-        {
-            tomode = cd->to.mode;
-            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
-            if (outsize == -1)
-            {
-                cd->to.mode = tomode;
-                return (size_t)(-1);
-            }
-            *outbuf += outsize;
-            *outbytesleft -= outsize;
-        }
-        cd->from.mode = 0;
-        cd->to.mode = 0;
-        return 0;
-    }
-
-    while (*inbytesleft != 0)
-    {
-        frommode = cd->from.mode;
-        tomode = cd->to.mode;
-        wsize = MB_CHAR_MAX;
-
-        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
-        if (insize == -1)
-        {
-            cd->from.mode = frommode;
-            return (size_t)(-1);
-        }
-
-        if (wsize == 0)
-        {
-            *inbuf += insize;
-            *inbytesleft -= insize;
-            continue;
-        }
-
-        if (cd->from.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->from.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
-                {
-                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        if (cd->to.compat != NULL)
-        {
-            wc = utf16_to_ucs4(wbuf);
-            cp = cd->to.compat;
-            for (i = 0; cp[i].in != 0; ++i)
-            {
-                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
-                {
-                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
-                    break;
-                }
-            }
-        }
-
-        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
-        if (outsize == -1)
-        {
-            cd->from.mode = frommode;
-            cd->to.mode = tomode;
-            return (size_t)(-1);
-        }
-
-        *inbuf += insize;
-        *outbuf += outsize;
-        *inbytesleft -= insize;
-        *outbytesleft -= outsize;
-    }
-
-    return 0;
-}
-
-static int
-make_csconv(const char *_name, csconv_t *cv)
-{
-    CPINFOEX cpinfoex;
-    int use_compat = TRUE;
-    int flag = 0;
-    char *name;
-    char *p;
-
-    name = xstrndup(_name, strlen(_name));
-    if (name == NULL)
-        return FALSE;
-
-    /* check for option "enc_name//opt1//opt2" */
-    while ((p = strrstr(name, "//")) != NULL)
-    {
-        if (_stricmp(p + 2, "nocompat") == 0)
-            use_compat = FALSE;
-        else if (_stricmp(p + 2, "translit") == 0)
-            flag |= FLAG_TRANSLIT;
-        else if (_stricmp(p + 2, "ignore") == 0)
-            flag |= FLAG_IGNORE;
-        *p = 0;
-    }
-
-    cv->mode = 0;
-    cv->flags = flag;
-    cv->mblen = NULL;
-    cv->flush = NULL;
-    cv->compat = NULL;
-    cv->codepage = name_to_codepage(name);
-    if (cv->codepage == 1200 || cv->codepage == 1201)
-    {
-        cv->mbtowc = utf16_mbtowc;
-        cv->wctomb = utf16_wctomb;
-        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 12000 || cv->codepage == 12001)
-    {
-        cv->mbtowc = utf32_mbtowc;
-        cv->wctomb = utf32_wctomb;
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
-            cv->flags |= FLAG_USE_BOM;
-    }
-    else if (cv->codepage == 65001)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        cv->mblen = utf8_mblen;
-    }
-    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
-    {
-        cv->mbtowc = iso2022jp_mbtowc;
-        cv->wctomb = iso2022jp_wctomb;
-        cv->flush = iso2022jp_flush;
-    }
-    else if (cv->codepage == 51932 && load_mlang())
-    {
-        cv->mbtowc = mlang_mbtowc;
-        cv->wctomb = mlang_wctomb;
-        cv->mblen = eucjp_mblen;
-    }
-    else if (IsValidCodePage(cv->codepage)
-	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
-    {
-        cv->mbtowc = kernel_mbtowc;
-        cv->wctomb = kernel_wctomb;
-        if (cpinfoex.MaxCharSize == 1)
-            cv->mblen = sbcs_mblen;
-        else if (cpinfoex.MaxCharSize == 2)
-            cv->mblen = dbcs_mblen;
-	else
-	    cv->mblen = mbcs_mblen;
-    }
-    else
-    {
-        /* not supported */
-        free(name);
-        errno = EINVAL;
-        return FALSE;
-    }
-
-    if (use_compat)
-    {
-        switch (cv->codepage)
-        {
-        case 932: cv->compat = cp932_compat; break;
-        case 20932: cv->compat = cp20932_compat; break;
-        case 51932: cv->compat = cp51932_compat; break;
-        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
-        }
-    }
-
-    free(name);
-
-    return TRUE;
-}
-
-static int
-name_to_codepage(const char *name)
-{
-    int i;
-
-    if (*name == '\0' ||
-	strcmp(name, "char") == 0)
-        return GetACP();
-    else if (strcmp(name, "wchar_t") == 0)
-        return 1200;
-    else if (_strnicmp(name, "cp", 2) == 0)
-        return atoi(name + 2); /* CP123 */
-    else if ('0' <= name[0] && name[0] <= '9')
-        return atoi(name);     /* 123 */
-    else if (_strnicmp(name, "xx", 2) == 0)
-        return atoi(name + 2); /* XX123 for debug */
-
-    for (i = 0; codepage_alias[i].name != NULL; ++i)
-        if (_stricmp(name, codepage_alias[i].name) == 0)
-            return codepage_alias[i].codepage;
-    return -1;
-}
-
-/*
- * http://www.faqs.org/rfcs/rfc2781.html
- */
-static uint
-utf16_to_ucs4(const ushort *wbuf)
-{
-    uint wc = wbuf[0];
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
-    return wc;
-}
-
-static void
-ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
-{
-    if (wc < 0x10000)
-    {
-        wbuf[0] = wc;
-        *wbufsize = 1;
-    }
-    else
-    {
-        wc -= 0x10000;
-        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
-        wbuf[1] = 0xDC00 | (wc & 0x3FF);
-        *wbufsize = 2;
-    }
-}
-
-/*
- * Check if codepage is one of those for which the dwFlags parameter
- * to MultiByteToWideChar() must be zero. Return zero or
- * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
- * Server 2003 R2 claims that also codepage 65001 is one of these, but
- * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
- * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
- * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
- * from UTF-8.
- */
-static int
-mbtowc_flags(int codepage)
-{
-    return (codepage == 50220 || codepage == 50221 ||
-	    codepage == 50222 || codepage == 50225 ||
-	    codepage == 50227 || codepage == 50229 ||
-	    codepage == 52936 || codepage == 54936 ||
-	    (codepage >= 57002 && codepage <= 57011) ||
-	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
-}
-
-/*
- * Check if codepage is one those for which the lpUsedDefaultChar
- * parameter to WideCharToMultiByte() must be NULL.  The docs in
- * Platform SDK for for Windows Server 2003 R2 claims that this is the
- * list below, while the MSDN docs for MSVS2008 claim that it is only
- * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
- * SDK seems to be correct, at least for XP.
- */
-static int
-must_use_null_useddefaultchar(int codepage)
-{
-    return (codepage == 65000 || codepage == 65001 ||
-            codepage == 50220 || codepage == 50221 ||
-            codepage == 50222 || codepage == 50225 ||
-            codepage == 50227 || codepage == 50229 ||
-            codepage == 52936 || codepage == 54936 ||
-            (codepage >= 57002 && codepage <= 57011) ||
-            codepage == 42);
-}
-
-static char *
-strrstr(const char *str, const char *token)
-{
-    int len = strlen(token);
-    const char *p = str + strlen(str);
-
-    while (str <= --p)
-        if (p[0] == token[0] && strncmp(p, token, len) == 0)
-            return (char *)p;
-    return NULL;
-}
-
-static char *
-xstrndup(const char *s, size_t n)
-{
-    char *p;
-
-    p = (char *)malloc(n + 1);
-    if (p == NULL)
-        return NULL;
-    memcpy(p, s, n);
-    p[n] = '\0';
-    return p;
-}
-
-static int
-seterror(int err)
-{
-    errno = err;
-    return -1;
-}
-
-#if defined(USE_LIBICONV_DLL)
-static int
-libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
-{
-    HMODULE hlibiconv = NULL;
-    HMODULE hmsvcrt = NULL;
-    char *dllname;
-    const char *p;
-    const char *e;
-    f_iconv_open _iconv_open;
-
-    /*
-     * always try to load dll, so that we can switch dll in runtime.
-     */
-
-    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
-    p = getenv("WINICONV_LIBICONV_DLL");
-    if (p == NULL)
-        p = DEFAULT_LIBICONV_DLL;
-    /* parse comma separated value */
-    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
-    {
-        e = strchr(p, ',');
-        if (p == e)
-            continue;
-        else if (e == NULL)
-            e = p + strlen(p);
-        dllname = xstrndup(p, e - p);
-        if (dllname == NULL)
-            return FALSE;
-        hlibiconv = LoadLibrary(dllname);
-        free(dllname);
-        if (hlibiconv != NULL)
-        {
-            if (hlibiconv == hwiniconv)
-            {
-                FreeLibrary(hlibiconv);
-                hlibiconv = NULL;
-                continue;
-            }
-            break;
-        }
-    }
-
-    if (hlibiconv == NULL)
-        goto failed;
-
-    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
-    if (hmsvcrt == NULL)
-        goto failed;
-
-    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
-    if (_iconv_open == NULL)
-        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
-    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
-    if (cd->iconv_close == NULL)
-        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
-    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
-    if (cd->iconv == NULL)
-        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
-    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
-    if (_iconv_open == NULL || cd->iconv_close == NULL
-            || cd->iconv == NULL || cd->_errno == NULL)
-        goto failed;
-
-    cd->cd = _iconv_open(tocode, fromcode);
-    if (cd->cd == (iconv_t)(-1))
-        goto failed;
-
-    cd->hlibiconv = hlibiconv;
-    return TRUE;
-
-failed:
-    if (hlibiconv != NULL)
-        FreeLibrary(hlibiconv);
-    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
-    return FALSE;
-}
-
-/*
- * Reference:
- * http://forums.belution.com/ja/vc/000/234/78s.shtml
- * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
- *
- * The formal way is
- *   imagehlp.h or dbghelp.h
- *   imagehlp.lib or dbghelp.lib
- *   ImageDirectoryEntryToData()
- */
-#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
-#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
-static PVOID
-MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
-{
-    /* TODO: MappedAsImage? */
-    PIMAGE_DATA_DIRECTORY p;
-    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
-    if (p->VirtualAddress == 0) {
-      *Size = 0;
-      return NULL;
-    }
-    *Size = p->Size;
-    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
-}
-
-static HMODULE
-find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
-{
-    DWORD Base;
-    ULONG Size;
-    PIMAGE_IMPORT_DESCRIPTOR Imp;
-    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
-    PIMAGE_IMPORT_BY_NAME ImpName;
-
-    Base = (DWORD)hModule;
-    Imp = MyImageDirectoryEntryToData(
-            (LPVOID)Base,
-            TRUE,
-            IMAGE_DIRECTORY_ENTRY_IMPORT,
-            &Size);
-    if (Imp == NULL)
-        return NULL;
-    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
-    {
-        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
-        for ( ; Name->u1.Ordinal != 0; ++Name)
-        {
-            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
-            {
-                ImpName = (PIMAGE_IMPORT_BY_NAME)
-                    (Base + (DWORD)Name->u1.AddressOfData);
-                if (strcmp((char *)ImpName->Name, funcname) == 0)
-                    return GetModuleHandle((char *)(Base + Imp->Name));
-            }
-        }
-    }
-    return NULL;
-}
-#endif
-
-static int
-sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    return 1;
-}
-
-static int
-dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (cv->codepage == 54936) {
-	if (buf[0] <= 0x7F) len = 1;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 2 &&
-		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
-		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
-	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
-		 bufsize >= 4 &&
-		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
-	else
-	    return seterror(EINVAL);
-	return len;
-    }
-    else
-	return seterror(EINVAL);
-}
-
-static int
-utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    int len = 0;
-
-    if (buf[0] < 0x80) len = 1;
-    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
-    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
-    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
-    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
-    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
-
-    if (len == 0)
-        return seterror(EILSEQ);
-    else if (bufsize < len)
-        return seterror(EINVAL);
-    return len;
-}
-
-static int
-eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
-{
-    if (buf[0] < 0x80) /* ASCII */
-        return 1;
-    else if (buf[0] == 0x8E) /* JIS X 0201 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
-            return seterror(EILSEQ);
-        return 2;
-    }
-    else if (buf[0] == 0x8F) /* JIS X 0212 */
-    {
-        if (bufsize < 3)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
-                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
-            return seterror(EILSEQ);
-        return 3;
-    }
-    else /* JIS X 0208 */
-    {
-        if (bufsize < 2)
-            return seterror(EINVAL);
-        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
-                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
-            return seterror(EILSEQ);
-        return 2;
-    }
-}
-
-static int
-kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
-            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
-    if (*wbufsize == 0)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    BOOL usedDefaultChar = 0;
-    BOOL *p = NULL;
-    int flags = 0;
-    int len;
-
-    if (bufsize == 0)
-        return seterror(E2BIG);
-    if (!must_use_null_useddefaultchar(cv->codepage))
-    {
-        p = &usedDefaultChar;
-#ifdef WC_NO_BEST_FIT_CHARS
-        if (!(cv->flags & FLAG_TRANSLIT))
-            flags |= WC_NO_BEST_FIT_CHARS;
-#endif
-    }
-    len = WideCharToMultiByte(cv->codepage, flags,
-            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
-    if (len == 0)
-    {
-        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-            return seterror(E2BIG);
-        return seterror(EILSEQ);
-    }
-    else if (usedDefaultChar)
-        return seterror(EILSEQ);
-    else if (cv->mblen(cv, buf, len) != len) /* validate result */
-        return seterror(EILSEQ);
-    return len;
-}
-
-/*
- * It seems that the mode (cv->mode) is fixnum.
- * For example, when converting iso-2022-jp(cp50221) to unicode:
- *      in ascii sequence: mode=0xC42C0000
- *   in jisx0208 sequence: mode=0xC42C0001
- * "C42C" is same for each convert session.
- * It should be: ((codepage-1)<<16)|state
- */
-static int
-mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int len;
-    int insize;
-    HRESULT hr;
-
-    len = cv->mblen(cv, buf, bufsize);
-    if (len == -1)
-        return -1;
-    insize = len;
-    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
-            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len)
-        return seterror(EILSEQ);
-    return len;
-}
-
-static int
-mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-
-    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
-        return seterror(EILSEQ);
-    memcpy(buf, tmpbuf, tmpsize);
-    return tmpsize;
-}
-
-static int
-utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-
-    /* swap endian: 1200 <-> 1201 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 2)
-        return seterror(EINVAL);
-    if (codepage == 1200) /* little endian */
-        wbuf[0] = (buf[1] << 8) | buf[0];
-    else if (codepage == 1201) /* big endian */
-        wbuf[0] = (buf[0] << 8) | buf[1];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wbuf[0] == 0xFFFE)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 2;
-        }
-        else if (wbuf[0] == 0xFEFF)
-        {
-            *wbufsize = 0;
-            return 2;
-        }
-    }
-
-    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
-        return seterror(EILSEQ);
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(EINVAL);
-        if (codepage == 1200) /* little endian */
-            wbuf[1] = (buf[3] << 8) | buf[2];
-        else if (codepage == 1201) /* big endian */
-            wbuf[1] = (buf[2] << 8) | buf[3];
-        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
-            return seterror(EILSEQ);
-        *wbufsize = 2;
-        return 4;
-    }
-    *wbufsize = 1;
-    return 2;
-}
-
-static int
-utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 2)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-            memcpy(buf, "\xFF\xFE", 2);
-        else if (cv->codepage == 1201) /* big endian */
-            memcpy(buf, "\xFE\xFF", 2);
-
-        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
-        if (r == -1)
-            return -1;
-        return r + 2;
-    }
-
-    if (bufsize < 2)
-        return seterror(E2BIG);
-    if (cv->codepage == 1200) /* little endian */
-    {
-        buf[0] = (wbuf[0] & 0x00FF);
-        buf[1] = (wbuf[0] & 0xFF00) >> 8;
-    }
-    else if (cv->codepage == 1201) /* big endian */
-    {
-        buf[0] = (wbuf[0] & 0xFF00) >> 8;
-        buf[1] = (wbuf[0] & 0x00FF);
-    }
-    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
-    {
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 1200) /* little endian */
-        {
-            buf[2] = (wbuf[1] & 0x00FF);
-            buf[3] = (wbuf[1] & 0xFF00) >> 8;
-        }
-        else if (cv->codepage == 1201) /* big endian */
-        {
-            buf[2] = (wbuf[1] & 0xFF00) >> 8;
-            buf[3] = (wbuf[1] & 0x00FF);
-        }
-        return 4;
-    }
-    return 2;
-}
-
-static int
-utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    int codepage = cv->codepage;
-    uint wc;
-
-    /* swap endian: 12000 <-> 12001 */
-    if (cv->mode & UNICODE_MODE_SWAPPED)
-        codepage ^= 1;
-
-    if (bufsize < 4)
-        return seterror(EINVAL);
-    if (codepage == 12000) /* little endian */
-        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-    else if (codepage == 12001) /* big endian */
-        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (wc == 0xFFFE0000)
-        {
-            cv->mode |= UNICODE_MODE_SWAPPED;
-            *wbufsize = 0;
-            return 4;
-        }
-        else if (wc == 0x0000FEFF)
-        {
-            *wbufsize = 0;
-            return 4;
-        }
-    }
-
-    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
-        return seterror(EILSEQ);
-    ucs4_to_utf16(wc, wbuf, wbufsize);
-    return 4;
-}
-
-static int
-utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    uint wc;
-
-    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
-    {
-        int r;
-
-        cv->mode |= UNICODE_MODE_BOM_DONE;
-        if (bufsize < 4)
-            return seterror(E2BIG);
-        if (cv->codepage == 12000) /* little endian */
-            memcpy(buf, "\xFF\xFE\x00\x00", 4);
-        else if (cv->codepage == 12001) /* big endian */
-            memcpy(buf, "\x00\x00\xFE\xFF", 4);
-
-        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
-        if (r == -1)
-            return -1;
-        return r + 4;
-    }
-
-    if (bufsize < 4)
-        return seterror(E2BIG);
-    wc = utf16_to_ucs4(wbuf);
-    if (cv->codepage == 12000) /* little endian */
-    {
-        buf[0] = wc & 0x000000FF;
-        buf[1] = (wc & 0x0000FF00) >> 8;
-        buf[2] = (wc & 0x00FF0000) >> 16;
-        buf[3] = (wc & 0xFF000000) >> 24;
-    }
-    else if (cv->codepage == 12001) /* big endian */
-    {
-        buf[0] = (wc & 0xFF000000) >> 24;
-        buf[1] = (wc & 0x00FF0000) >> 16;
-        buf[2] = (wc & 0x0000FF00) >> 8;
-        buf[3] = wc & 0x000000FF;
-    }
-    return 4;
-}
-
-/*
- * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
- * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
- *        1 byte Kana)
- * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
- *        Kana - SO/SI)
- *
- * MultiByteToWideChar() and WideCharToMultiByte() behave differently
- * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
- * terminate result sequence with ascii escape.  But Vista does.
- * Use MLang instead.
- */
-
-#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
-#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
-#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
-
-#define ISO2022_SI  0
-#define ISO2022_SO  1
-
-/* shift in */
-static const char iso2022_SI_seq[] = "\x0F";
-/* shift out */
-static const char iso2022_SO_seq[] = "\x0E";
-
-typedef struct iso2022_esc_t iso2022_esc_t;
-struct iso2022_esc_t {
-    const char *esc;
-    int esc_len;
-    int len;
-    int cs;
-};
-
-#define ISO2022JP_CS_ASCII            0
-#define ISO2022JP_CS_JISX0201_ROMAN   1
-#define ISO2022JP_CS_JISX0201_KANA    2
-#define ISO2022JP_CS_JISX0208_1978    3
-#define ISO2022JP_CS_JISX0208_1983    4
-#define ISO2022JP_CS_JISX0212         5
-
-static iso2022_esc_t iso2022jp_esc[] = {
-    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
-    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
-    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
-    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
-    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
-    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
-    {NULL, 0, 0, 0}
-};
-
-static int
-iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int insize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    if (buf[0] == 0x1B)
-    {
-        for (i = 0; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (bufsize < esc_len)
-            {
-                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
-                    return seterror(EINVAL);
-            }
-            else
-            {
-                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
-                {
-                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
-                    *wbufsize = 0;
-                    return esc_len;
-                }
-            }
-        }
-        /* not supported escape sequence */
-        return seterror(EILSEQ);
-    }
-    else if (buf[0] == iso2022_SO_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
-        *wbufsize = 0;
-        return 1;
-    }
-    else if (buf[0] == iso2022_SI_seq[0])
-    {
-        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
-        *wbufsize = 0;
-        return 1;
-    }
-
-    cs = ISO2022_MODE_CS(cv->mode);
-    shift = ISO2022_MODE_SHIFT(cv->mode);
-
-    /* reset the mode for informal sequence */
-    if (buf[0] < 0x20)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        shift = ISO2022_SI;
-    }
-
-    len = iesc[cs].len;
-    if (bufsize < len)
-        return seterror(EINVAL);
-    for (i = 0; i < len; ++i)
-        if (!(buf[i] < 0x80))
-            return seterror(EILSEQ);
-    esc_len = iesc[cs].esc_len;
-    memcpy(tmp, iesc[cs].esc, esc_len);
-    if (shift == ISO2022_SO)
-    {
-        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
-        esc_len += 1;
-    }
-    memcpy(tmp + esc_len, buf, len);
-
-    if ((cv->codepage == 50220 || cv->codepage == 50221
-                || cv->codepage == 50222) && shift == ISO2022_SO)
-    {
-        /* XXX: shift-out cannot be used for mbtowc (both kernel and
-         * mlang) */
-        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
-        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
-        memcpy(tmp + esc_len, buf, len);
-    }
-
-    insize = len + esc_len;
-    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
-            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
-    if (hr != S_OK || insize != len + esc_len)
-        return seterror(EILSEQ);
-
-    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (wbuf[0] == buf[0]
-            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-        return seterror(EILSEQ);
-
-    /* reset the mode for informal sequence */
-    if (cv->mode != ISO2022_MODE(cs, shift))
-        cv->mode = ISO2022_MODE(cs, shift);
-
-    return len;
-}
-
-static int
-iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX];
-    int tmpsize = MB_CHAR_MAX;
-    int insize = wbufsize;
-    HRESULT hr;
-    DWORD dummy = 0;
-    int len;
-    int esc_len;
-    int cs;
-    int shift;
-    int i;
-
-    /*
-     * MultiByte = [escape sequence] + character + [escape sequence]
-     *
-     * Whether trailing escape sequence is added depends on which API is
-     * used (kernel or MLang, and its version).
-     */
-    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
-            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
-    if (hr != S_OK || insize != wbufsize)
-        return seterror(EILSEQ);
-    else if (bufsize < tmpsize)
-        return seterror(E2BIG);
-
-    if (tmpsize == 1)
-    {
-        cs = ISO2022JP_CS_ASCII;
-        esc_len = 0;
-    }
-    else
-    {
-        for (i = 1; iesc[i].esc != NULL; ++i)
-        {
-            esc_len = iesc[i].esc_len;
-            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
-            {
-                cs = iesc[i].cs;
-                break;
-            }
-        }
-        if (iesc[i].esc == NULL)
-            /* not supported escape sequence */
-            return seterror(EILSEQ);
-    }
-
-    shift = ISO2022_SI;
-    if (tmp[esc_len] == iso2022_SO_seq[0])
-    {
-        shift = ISO2022_SO;
-        esc_len += 1;
-    }
-
-    len = iesc[cs].len;
-
-    /* Check for converting error.  Assuming defaultChar is 0x3F. */
-    /* ascii should be converted from ascii */
-    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
-        return seterror(EILSEQ);
-    else if (tmpsize < esc_len + len)
-        return seterror(EILSEQ);
-
-    if (cv->mode == ISO2022_MODE(cs, shift))
-    {
-        /* remove escape sequence */
-        if (esc_len != 0)
-            memmove(tmp, tmp + esc_len, len);
-        esc_len = 0;
-    }
-    else
-    {
-        if (cs == ISO2022JP_CS_ASCII)
-        {
-            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
-            memmove(tmp + esc_len, tmp, len);
-            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
-        }
-        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
-        {
-            /* shift-in before changing to other mode */
-            memmove(tmp + 1, tmp, len + esc_len);
-            memcpy(tmp, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-    }
-
-    if (bufsize < len + esc_len)
-        return seterror(E2BIG);
-    memcpy(buf, tmp, len + esc_len);
-    cv->mode = ISO2022_MODE(cs, shift);
-    return len + esc_len;
-}
-
-static int
-iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
-{
-    iso2022_esc_t *iesc = iso2022jp_esc;
-    int esc_len;
-
-    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
-    {
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-            esc_len += 1;
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        if (bufsize < esc_len)
-            return seterror(E2BIG);
-
-        esc_len = 0;
-        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
-        {
-            memcpy(buf, iso2022_SI_seq, 1);
-            esc_len += 1;
-        }
-        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
-        {
-            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
-                    iesc[ISO2022JP_CS_ASCII].esc_len);
-            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
-        }
-        return esc_len;
-    }
-    return 0;
-}
-
-#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
-BOOL WINAPI
-DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
-{
-    switch( fdwReason )
-    {
-    case DLL_PROCESS_ATTACH:
-        hwiniconv = (HMODULE)hinstDLL;
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-#endif
-
-#if defined(MAKE_EXE)
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-int
-main(int argc, char **argv)
-{
-    char *fromcode = NULL;
-    char *tocode = NULL;
-    int i;
-    char inbuf[BUFSIZ];
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    size_t rest = 0;
-    iconv_t cd;
-    size_t r;
-    FILE *in = stdin;
-
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
-
-    for (i = 1; i < argc; ++i)
-    {
-        if (strcmp(argv[i], "-l") == 0)
-        {
-            for (i = 0; codepage_alias[i].name != NULL; ++i)
-                printf("%s\n", codepage_alias[i].name);
-            return 0;
-        }
-
-        if (strcmp(argv[i], "-f") == 0)
-            fromcode = argv[++i];
-        else if (strcmp(argv[i], "-t") == 0)
-            tocode = argv[++i];
-        else
-        {
-            in = fopen(argv[i], "rb");
-            if (in == NULL)
-            {
-                fprintf(stderr, "cannot open %s\n", argv[i]);
-                return 1;
-            }
-            break;
-        }
-    }
-
-    if (fromcode == NULL || tocode == NULL)
-    {
-        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
-        return 0;
-    }
-
-    cd = iconv_open(tocode, fromcode);
-    if (cd == (iconv_t)(-1))
-    {
-        perror("iconv_open error");
-        return 1;
-    }
-
-    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
-            || rest != 0)
-    {
-        inbytesleft += rest;
-        pin = inbuf;
-        pout = outbuf;
-        outbytesleft = sizeof(outbuf);
-        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
-        {
-            perror("conversion error");
-            return 1;
-        }
-        memmove(inbuf, pin, inbytesleft);
-        rest = inbytesleft;
-    }
-    pout = outbuf;
-    outbytesleft = sizeof(outbuf);
-    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
-    if (r == (size_t)(-1))
-    {
-        perror("conversion error");
-        return 1;
-    }
-
-    iconv_close(cd);
-
-    return 0;
-}
-#endif
-
+/*
+ * iconv library using Win32 API to conversion.
+ *
+ * This file is placed in the public domain.
+ *
+ * Last Change: 2009-07-06
+ *
+ * ENVIRONMENT VARIABLE:
+ *     WINICONV_LIBICONV_DLL
+ *         If $WINICONV_LIBICONV_DLL is set, win_iconv uses the DLL.  If
+ *         loading the DLL or iconv_open() failed, falls back to internal
+ *         conversion.  If a few DLL are specified as comma separated list,
+ *         the first loadable DLL is used.  The DLL should have iconv_open(),
+ *         iconv_close() and iconv().  Or libiconv_open(), libiconv_close()
+ *         and libiconv().
+ *         (only available when USE_LIBICONV_DLL is defined at compile time)
+ *
+ * Win32 API does not support strict encoding conversion for some
+ * codepage.  And MLang function drop or replace invalid bytes and does
+ * not return useful error status as iconv.  This implementation cannot
+ * be used for encoding validation purpose.
+ */
+
+/* for WC_NO_BEST_FIT_CHARS */
+#ifndef WINVER
+# define WINVER 0x0500
+#endif
+
+#include <windows.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if 0
+# define MAKE_EXE
+# define MAKE_DLL
+# define USE_LIBICONV_DLL
+#endif
+
+#if !defined(DEFAULT_LIBICONV_DLL)
+# define DEFAULT_LIBICONV_DLL ""
+#endif
+
+#define MB_CHAR_MAX 16
+
+#define UNICODE_MODE_BOM_DONE   1
+#define UNICODE_MODE_SWAPPED    2
+
+#define FLAG_USE_BOM            1
+#define FLAG_TRANSLIT           2 /* //TRANSLIT */
+#define FLAG_IGNORE             4 /* //IGNORE (not implemented) */
+
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+
+typedef void* iconv_t;
+
+iconv_t iconv_open(const char *tocode, const char *fromcode);
+int iconv_close(iconv_t cd);
+size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+/* libiconv interface for vim */
+#if defined(MAKE_DLL)
+int
+iconvctl (iconv_t cd, int request, void* argument)
+{
+    /* not supported */
+    return 0;
+}
+#endif
+
+typedef struct compat_t compat_t;
+typedef struct csconv_t csconv_t;
+typedef struct rec_iconv_t rec_iconv_t;
+
+typedef iconv_t (*f_iconv_open)(const char *tocode, const char *fromcode);
+typedef int (*f_iconv_close)(iconv_t cd);
+typedef size_t (*f_iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+typedef int* (*f_errno)(void);
+typedef int (*f_mbtowc)(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+typedef int (*f_wctomb)(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+typedef int (*f_mblen)(csconv_t *cv, const uchar *buf, int bufsize);
+typedef int (*f_flush)(csconv_t *cv, uchar *buf, int bufsize);
+
+#define COMPAT_IN   1
+#define COMPAT_OUT  2
+
+/* unicode mapping for compatibility with other conversion table. */
+struct compat_t {
+    uint in;
+    uint out;
+    uint flag;
+};
+
+struct csconv_t {
+    int codepage;
+    int flags;
+    f_mbtowc mbtowc;
+    f_wctomb wctomb;
+    f_mblen mblen;
+    f_flush flush;
+    DWORD mode;
+    compat_t *compat;
+};
+
+struct rec_iconv_t {
+    iconv_t cd;
+    f_iconv_close iconv_close;
+    f_iconv iconv;
+    f_errno _errno;
+    csconv_t from;
+    csconv_t to;
+#if defined(USE_LIBICONV_DLL)
+    HMODULE hlibiconv;
+#endif
+};
+
+static int win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static int win_iconv_close(iconv_t cd);
+static size_t win_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+
+static int load_mlang();
+static int make_csconv(const char *name, csconv_t *cv);
+static int name_to_codepage(const char *name);
+static uint utf16_to_ucs4(const ushort *wbuf);
+static void ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize);
+static int mbtowc_flags(int codepage);
+static int must_use_null_useddefaultchar(int codepage);
+static char *strrstr(const char *str, const char *token);
+static char *xstrndup(const char *s, size_t n);
+static int seterror(int err);
+
+#if defined(USE_LIBICONV_DLL)
+static int libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode);
+static PVOID MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size);
+static HMODULE find_imported_module_by_funcname(HMODULE hModule, const char *funcname);
+
+static HMODULE hwiniconv;
+#endif
+
+static int sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+static int eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize);
+
+static int kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize);
+static int iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize);
+static int iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize);
+
+static struct {
+    int codepage;
+    const char *name;
+} codepage_alias[] = {
+    {65001, "CP65001"},
+    {65001, "UTF8"},
+    {65001, "UTF-8"},
+
+    {1200, "CP1200"},
+    {1200, "UTF16LE"},
+    {1200, "UTF-16LE"},
+    {1200, "UCS-2LE"},
+
+    {1201, "CP1201"},
+    {1201, "UTF16BE"},
+    {1201, "UTF-16BE"},
+    {1201, "UCS-2BE"},
+    {1201, "unicodeFFFE"},
+
+    {12000, "CP12000"},
+    {12000, "UTF32LE"},
+    {12000, "UTF-32LE"},
+
+    {12001, "CP12001"},
+    {12001, "UTF32BE"},
+    {12001, "UTF-32BE"},
+
+#ifndef GLIB_COMPILATION
+    /*
+     * Default is big endian.
+     * See rfc2781 4.3 Interpreting text labelled as UTF-16.
+     */
+    {1201, "UTF16"},
+    {1201, "UTF-16"},
+    {12001, "UTF32"},
+    {12001, "UTF-32"},
+#else
+    /* Default is little endian, because the platform is */
+    {1200, "UTF16"},
+    {1200, "UTF-16"},
+    {1200, "UCS-2"},
+    {12000, "UTF32"},
+    {12000, "UTF-32"},
+#endif
+
+    /* copy from libiconv `iconv -l` */
+    /* !IsValidCodePage(367) */
+    {20127, "ANSI_X3.4-1968"},
+    {20127, "ANSI_X3.4-1986"},
+    {20127, "ASCII"},
+    {20127, "CP367"},
+    {20127, "IBM367"},
+    {20127, "ISO-IR-6"},
+    {20127, "ISO646-US"},
+    {20127, "ISO_646.IRV:1991"},
+    {20127, "US"},
+    {20127, "US-ASCII"},
+    {20127, "CSASCII"},
+
+    /* !IsValidCodePage(819) */
+    {1252, "CP819"},
+    {1252, "IBM819"},
+    {28591, "ISO-8859-1"},
+    {28591, "ISO-IR-100"},
+    {28591, "ISO8859-1"},
+    {28591, "ISO_8859-1"},
+    {28591, "ISO_8859-1:1987"},
+    {28591, "L1"},
+    {28591, "LATIN1"},
+    {28591, "CSISOLATIN1"},
+
+    {1250, "CP1250"},
+    {1250, "MS-EE"},
+    {1250, "WINDOWS-1250"},
+
+    {1251, "CP1251"},
+    {1251, "MS-CYRL"},
+    {1251, "WINDOWS-1251"},
+
+    {1252, "CP1252"},
+    {1252, "MS-ANSI"},
+    {1252, "WINDOWS-1252"},
+
+    {1253, "CP1253"},
+    {1253, "MS-GREEK"},
+    {1253, "WINDOWS-1253"},
+
+    {1254, "CP1254"},
+    {1254, "MS-TURK"},
+    {1254, "WINDOWS-1254"},
+
+    {1255, "CP1255"},
+    {1255, "MS-HEBR"},
+    {1255, "WINDOWS-1255"},
+
+    {1256, "CP1256"},
+    {1256, "MS-ARAB"},
+    {1256, "WINDOWS-1256"},
+
+    {1257, "CP1257"},
+    {1257, "WINBALTRIM"},
+    {1257, "WINDOWS-1257"},
+
+    {1258, "CP1258"},
+    {1258, "WINDOWS-1258"},
+
+    {850, "850"},
+    {850, "CP850"},
+    {850, "IBM850"},
+    {850, "CSPC850MULTILINGUAL"},
+
+    /* !IsValidCodePage(862) */
+    {862, "862"},
+    {862, "CP862"},
+    {862, "IBM862"},
+    {862, "CSPC862LATINHEBREW"},
+
+    {866, "866"},
+    {866, "CP866"},
+    {866, "IBM866"},
+    {866, "CSIBM866"},
+
+    /* !IsValidCodePage(154) */
+    {154, "CP154"},
+    {154, "CYRILLIC-ASIAN"},
+    {154, "PT154"},
+    {154, "PTCP154"},
+    {154, "CSPTCP154"},
+
+    /* !IsValidCodePage(1133) */
+    {1133, "CP1133"},
+    {1133, "IBM-CP1133"},
+
+    {874, "CP874"},
+    {874, "WINDOWS-874"},
+
+    /* !IsValidCodePage(51932) */
+    {51932, "CP51932"},
+    {51932, "MS51932"},
+    {51932, "WINDOWS-51932"},
+    {51932, "EUC-JP"},
+
+    {932, "CP932"},
+    {932, "MS932"},
+    {932, "SHIFFT_JIS"},
+    {932, "SHIFFT_JIS-MS"},
+    {932, "SJIS"},
+    {932, "SJIS-MS"},
+    {932, "SJIS-OPEN"},
+    {932, "SJIS-WIN"},
+    {932, "WINDOWS-31J"},
+    {932, "WINDOWS-932"},
+    {932, "CSWINDOWS31J"},
+
+    {50221, "CP50221"},
+    {50221, "ISO-2022-JP"},
+    {50221, "ISO-2022-JP-MS"},
+    {50221, "ISO2022-JP"},
+    {50221, "ISO2022-JP-MS"},
+    {50221, "MS50221"},
+    {50221, "WINDOWS-50221"},
+
+    {936, "CP936"},
+    {936, "GBK"},
+    {936, "MS936"},
+    {936, "WINDOWS-936"},
+
+    {950, "CP950"},
+    {950, "BIG5"},
+
+    {949, "CP949"},
+    {949, "UHC"},
+    {949, "EUC-KR"},
+
+    {1361, "CP1361"},
+    {1361, "JOHAB"},
+
+    {437, "437"},
+    {437, "CP437"},
+    {437, "IBM437"},
+    {437, "CSPC8CODEPAGE437"},
+
+    {737, "CP737"},
+
+    {775, "CP775"},
+    {775, "IBM775"},
+    {775, "CSPC775BALTIC"},
+
+    {852, "852"},
+    {852, "CP852"},
+    {852, "IBM852"},
+    {852, "CSPCP852"},
+
+    /* !IsValidCodePage(853) */
+    {853, "CP853"},
+
+    {855, "855"},
+    {855, "CP855"},
+    {855, "IBM855"},
+    {855, "CSIBM855"},
+
+    {857, "857"},
+    {857, "CP857"},
+    {857, "IBM857"},
+    {857, "CSIBM857"},
+
+    /* !IsValidCodePage(858) */
+    {858, "CP858"},
+
+    {860, "860"},
+    {860, "CP860"},
+    {860, "IBM860"},
+    {860, "CSIBM860"},
+
+    {861, "861"},
+    {861, "CP-IS"},
+    {861, "CP861"},
+    {861, "IBM861"},
+    {861, "CSIBM861"},
+
+    {863, "863"},
+    {863, "CP863"},
+    {863, "IBM863"},
+    {863, "CSIBM863"},
+
+    {864, "CP864"},
+    {864, "IBM864"},
+    {864, "CSIBM864"},
+
+    {865, "865"},
+    {865, "CP865"},
+    {865, "IBM865"},
+    {865, "CSIBM865"},
+
+    {869, "869"},
+    {869, "CP-GR"},
+    {869, "CP869"},
+    {869, "IBM869"},
+    {869, "CSIBM869"},
+
+    /* !IsValidCodePage(1152) */
+    {1125, "CP1125"},
+
+    /*
+     * Code Page Identifiers
+     * http://msdn2.microsoft.com/en-us/library/ms776446.aspx
+     */
+    {37, "IBM037"}, /* IBM EBCDIC US-Canada */
+    {437, "IBM437"}, /* OEM United States */
+    {500, "IBM500"}, /* IBM EBCDIC International */
+    {708, "ASMO-708"}, /* Arabic (ASMO 708) */
+    /* 709 		Arabic (ASMO-449+, BCON V4) */
+    /* 710 		Arabic - Transparent Arabic */
+    {720, "DOS-720"}, /* Arabic (Transparent ASMO); Arabic (DOS) */
+    {737, "ibm737"}, /* OEM Greek (formerly 437G); Greek (DOS) */
+    {775, "ibm775"}, /* OEM Baltic; Baltic (DOS) */
+    {850, "ibm850"}, /* OEM Multilingual Latin 1; Western European (DOS) */
+    {852, "ibm852"}, /* OEM Latin 2; Central European (DOS) */
+    {855, "IBM855"}, /* OEM Cyrillic (primarily Russian) */
+    {857, "ibm857"}, /* OEM Turkish; Turkish (DOS) */
+    {858, "IBM00858"}, /* OEM Multilingual Latin 1 + Euro symbol */
+    {860, "IBM860"}, /* OEM Portuguese; Portuguese (DOS) */
+    {861, "ibm861"}, /* OEM Icelandic; Icelandic (DOS) */
+    {862, "DOS-862"}, /* OEM Hebrew; Hebrew (DOS) */
+    {863, "IBM863"}, /* OEM French Canadian; French Canadian (DOS) */
+    {864, "IBM864"}, /* OEM Arabic; Arabic (864) */
+    {865, "IBM865"}, /* OEM Nordic; Nordic (DOS) */
+    {866, "cp866"}, /* OEM Russian; Cyrillic (DOS) */
+    {869, "ibm869"}, /* OEM Modern Greek; Greek, Modern (DOS) */
+    {870, "IBM870"}, /* IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2 */
+    {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */
+    {875, "cp875"}, /* IBM EBCDIC Greek Modern */
+    {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */
+    {932, "shift-jis"}, /* alternative name for it */
+    {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */
+    {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */
+    {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */
+    {1026, "IBM1026"}, /* IBM EBCDIC Turkish (Latin 5) */
+    {1047, "IBM01047"}, /* IBM EBCDIC Latin 1/Open System */
+    {1140, "IBM01140"}, /* IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro) */
+    {1141, "IBM01141"}, /* IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro) */
+    {1142, "IBM01142"}, /* IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro) */
+    {1143, "IBM01143"}, /* IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro) */
+    {1144, "IBM01144"}, /* IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro) */
+    {1145, "IBM01145"}, /* IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro) */
+    {1146, "IBM01146"}, /* IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro) */
+    {1147, "IBM01147"}, /* IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro) */
+    {1148, "IBM01148"}, /* IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro) */
+    {1149, "IBM01149"}, /* IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro) */
+    {1250, "windows-1250"}, /* ANSI Central European; Central European (Windows) */
+    {1251, "windows-1251"}, /* ANSI Cyrillic; Cyrillic (Windows) */
+    {1252, "windows-1252"}, /* ANSI Latin 1; Western European (Windows) */
+    {1253, "windows-1253"}, /* ANSI Greek; Greek (Windows) */
+    {1254, "windows-1254"}, /* ANSI Turkish; Turkish (Windows) */
+    {1255, "windows-1255"}, /* ANSI Hebrew; Hebrew (Windows) */
+    {1256, "windows-1256"}, /* ANSI Arabic; Arabic (Windows) */
+    {1257, "windows-1257"}, /* ANSI Baltic; Baltic (Windows) */
+    {1258, "windows-1258"}, /* ANSI/OEM Vietnamese; Vietnamese (Windows) */
+    {1361, "Johab"}, /* Korean (Johab) */
+    {10000, "macintosh"}, /* MAC Roman; Western European (Mac) */
+    {10001, "x-mac-japanese"}, /* Japanese (Mac) */
+    {10002, "x-mac-chinesetrad"}, /* MAC Traditional Chinese (Big5); Chinese Traditional (Mac) */
+    {10003, "x-mac-korean"}, /* Korean (Mac) */
+    {10004, "x-mac-arabic"}, /* Arabic (Mac) */
+    {10005, "x-mac-hebrew"}, /* Hebrew (Mac) */
+    {10006, "x-mac-greek"}, /* Greek (Mac) */
+    {10007, "x-mac-cyrillic"}, /* Cyrillic (Mac) */
+    {10008, "x-mac-chinesesimp"}, /* MAC Simplified Chinese (GB 2312); Chinese Simplified (Mac) */
+    {10010, "x-mac-romanian"}, /* Romanian (Mac) */
+    {10017, "x-mac-ukrainian"}, /* Ukrainian (Mac) */
+    {10021, "x-mac-thai"}, /* Thai (Mac) */
+    {10029, "x-mac-ce"}, /* MAC Latin 2; Central European (Mac) */
+    {10079, "x-mac-icelandic"}, /* Icelandic (Mac) */
+    {10081, "x-mac-turkish"}, /* Turkish (Mac) */
+    {10082, "x-mac-croatian"}, /* Croatian (Mac) */
+    {20000, "x-Chinese_CNS"}, /* CNS Taiwan; Chinese Traditional (CNS) */
+    {20001, "x-cp20001"}, /* TCA Taiwan */
+    {20002, "x_Chinese-Eten"}, /* Eten Taiwan; Chinese Traditional (Eten) */
+    {20003, "x-cp20003"}, /* IBM5550 Taiwan */
+    {20004, "x-cp20004"}, /* TeleText Taiwan */
+    {20005, "x-cp20005"}, /* Wang Taiwan */
+    {20105, "x-IA5"}, /* IA5 (IRV International Alphabet No. 5, 7-bit); Western European (IA5) */
+    {20106, "x-IA5-German"}, /* IA5 German (7-bit) */
+    {20107, "x-IA5-Swedish"}, /* IA5 Swedish (7-bit) */
+    {20108, "x-IA5-Norwegian"}, /* IA5 Norwegian (7-bit) */
+    {20127, "us-ascii"}, /* US-ASCII (7-bit) */
+    {20261, "x-cp20261"}, /* T.61 */
+    {20269, "x-cp20269"}, /* ISO 6937 Non-Spacing Accent */
+    {20273, "IBM273"}, /* IBM EBCDIC Germany */
+    {20277, "IBM277"}, /* IBM EBCDIC Denmark-Norway */
+    {20278, "IBM278"}, /* IBM EBCDIC Finland-Sweden */
+    {20280, "IBM280"}, /* IBM EBCDIC Italy */
+    {20284, "IBM284"}, /* IBM EBCDIC Latin America-Spain */
+    {20285, "IBM285"}, /* IBM EBCDIC United Kingdom */
+    {20290, "IBM290"}, /* IBM EBCDIC Japanese Katakana Extended */
+    {20297, "IBM297"}, /* IBM EBCDIC France */
+    {20420, "IBM420"}, /* IBM EBCDIC Arabic */
+    {20423, "IBM423"}, /* IBM EBCDIC Greek */
+    {20424, "IBM424"}, /* IBM EBCDIC Hebrew */
+    {20833, "x-EBCDIC-KoreanExtended"}, /* IBM EBCDIC Korean Extended */
+    {20838, "IBM-Thai"}, /* IBM EBCDIC Thai */
+    {20866, "koi8-r"}, /* Russian (KOI8-R); Cyrillic (KOI8-R) */
+    {20871, "IBM871"}, /* IBM EBCDIC Icelandic */
+    {20880, "IBM880"}, /* IBM EBCDIC Cyrillic Russian */
+    {20905, "IBM905"}, /* IBM EBCDIC Turkish */
+    {20924, "IBM00924"}, /* IBM EBCDIC Latin 1/Open System (1047 + Euro symbol) */
+    {20932, "EUC-JP"}, /* Japanese (JIS 0208-1990 and 0121-1990) */
+    {20936, "x-cp20936"}, /* Simplified Chinese (GB2312); Chinese Simplified (GB2312-80) */
+    {20949, "x-cp20949"}, /* Korean Wansung */
+    {21025, "cp1025"}, /* IBM EBCDIC Cyrillic Serbian-Bulgarian */
+    /* 21027 		(deprecated) */
+    {21866, "koi8-u"}, /* Ukrainian (KOI8-U); Cyrillic (KOI8-U) */
+    {28591, "iso-8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28591, "iso8859-1"}, /* ISO 8859-1 Latin 1; Western European (ISO) */
+    {28592, "iso-8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28592, "iso8859-2"}, /* ISO 8859-2 Central European; Central European (ISO) */
+    {28593, "iso-8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28593, "iso8859-3"}, /* ISO 8859-3 Latin 3 */
+    {28594, "iso-8859-4"}, /* ISO 8859-4 Baltic */
+    {28594, "iso8859-4"}, /* ISO 8859-4 Baltic */
+    {28595, "iso-8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28595, "iso8859-5"}, /* ISO 8859-5 Cyrillic */
+    {28596, "iso-8859-6"}, /* ISO 8859-6 Arabic */
+    {28596, "iso8859-6"}, /* ISO 8859-6 Arabic */
+    {28597, "iso-8859-7"}, /* ISO 8859-7 Greek */
+    {28597, "iso8859-7"}, /* ISO 8859-7 Greek */
+    {28598, "iso-8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28598, "iso8859-8"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Visual) */
+    {28599, "iso-8859-9"}, /* ISO 8859-9 Turkish */
+    {28599, "iso8859-9"}, /* ISO 8859-9 Turkish */
+    {28603, "iso-8859-13"}, /* ISO 8859-13 Estonian */
+    {28603, "iso8859-13"}, /* ISO 8859-13 Estonian */
+    {28605, "iso-8859-15"}, /* ISO 8859-15 Latin 9 */
+    {28605, "iso8859-15"}, /* ISO 8859-15 Latin 9 */
+    {29001, "x-Europa"}, /* Europa 3 */
+    {38598, "iso-8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {38598, "iso8859-8-i"}, /* ISO 8859-8 Hebrew; Hebrew (ISO-Logical) */
+    {50220, "iso-2022-jp"}, /* ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS) */
+    {50221, "csISO2022JP"}, /* ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana) */
+    {50222, "iso-2022-jp"}, /* ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI) */
+    {50225, "iso-2022-kr"}, /* ISO 2022 Korean */
+    {50225, "iso2022-kr"}, /* ISO 2022 Korean */
+    {50227, "x-cp50227"}, /* ISO 2022 Simplified Chinese; Chinese Simplified (ISO 2022) */
+    /* 50229 		ISO 2022 Traditional Chinese */
+    /* 50930 		EBCDIC Japanese (Katakana) Extended */
+    /* 50931 		EBCDIC US-Canada and Japanese */
+    /* 50933 		EBCDIC Korean Extended and Korean */
+    /* 50935 		EBCDIC Simplified Chinese Extended and Simplified Chinese */
+    /* 50936 		EBCDIC Simplified Chinese */
+    /* 50937 		EBCDIC US-Canada and Traditional Chinese */
+    /* 50939 		EBCDIC Japanese (Latin) Extended and Japanese */
+    {51932, "euc-jp"}, /* EUC Japanese */
+    {51936, "EUC-CN"}, /* EUC Simplified Chinese; Chinese Simplified (EUC) */
+    {51949, "euc-kr"}, /* EUC Korean */
+    /* 51950 		EUC Traditional Chinese */
+    {52936, "hz-gb-2312"}, /* HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ) */
+    {54936, "GB18030"}, /* Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030) */
+    {57002, "x-iscii-de"}, /* ISCII Devanagari */
+    {57003, "x-iscii-be"}, /* ISCII Bengali */
+    {57004, "x-iscii-ta"}, /* ISCII Tamil */
+    {57005, "x-iscii-te"}, /* ISCII Telugu */
+    {57006, "x-iscii-as"}, /* ISCII Assamese */
+    {57007, "x-iscii-or"}, /* ISCII Oriya */
+    {57008, "x-iscii-ka"}, /* ISCII Kannada */
+    {57009, "x-iscii-ma"}, /* ISCII Malayalam */
+    {57010, "x-iscii-gu"}, /* ISCII Gujarati */
+    {57011, "x-iscii-pa"}, /* ISCII Punjabi */
+
+    {0, NULL}
+};
+
+/*
+ * SJIS SHIFTJIS table              CP932 table
+ * ---- --------------------------- --------------------------------
+ *   5C U+00A5 YEN SIGN             U+005C REVERSE SOLIDUS
+ *   7E U+203E OVERLINE             U+007E TILDE
+ * 815C U+2014 EM DASH              U+2015 HORIZONTAL BAR
+ * 815F U+005C REVERSE SOLIDUS      U+FF3C FULLWIDTH REVERSE SOLIDUS
+ * 8160 U+301C WAVE DASH            U+FF5E FULLWIDTH TILDE
+ * 8161 U+2016 DOUBLE VERTICAL LINE U+2225 PARALLEL TO
+ * 817C U+2212 MINUS SIGN           U+FF0D FULLWIDTH HYPHEN-MINUS
+ * 8191 U+00A2 CENT SIGN            U+FFE0 FULLWIDTH CENT SIGN
+ * 8192 U+00A3 POUND SIGN           U+FFE1 FULLWIDTH POUND SIGN
+ * 81CA U+00AC NOT SIGN             U+FFE2 FULLWIDTH NOT SIGN
+ *
+ * EUC-JP and ISO-2022-JP should be compatible with CP932.
+ *
+ * Kernel and MLang have different Unicode mapping table.  Make sure
+ * which API is used.
+ */
+static compat_t cp932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0x301C, 0xFF5E, COMPAT_OUT},
+    {0x2016, 0x2225, COMPAT_OUT},
+    {0x2212, 0xFF0D, COMPAT_OUT},
+    {0x00A2, 0xFFE0, COMPAT_OUT},
+    {0x00A3, 0xFFE1, COMPAT_OUT},
+    {0x00AC, 0xFFE2, COMPAT_OUT},
+    {0, 0, 0}
+};
+
+static compat_t cp20932_compat[] = {
+    {0x00A5, 0x005C, COMPAT_OUT},
+    {0x203E, 0x007E, COMPAT_OUT},
+    {0x2014, 0x2015, COMPAT_OUT},
+    {0xFF5E, 0x301C, COMPAT_OUT|COMPAT_IN},
+    {0x2225, 0x2016, COMPAT_OUT|COMPAT_IN},
+    {0xFF0D, 0x2212, COMPAT_OUT|COMPAT_IN},
+    {0xFFE0, 0x00A2, COMPAT_OUT|COMPAT_IN},
+    {0xFFE1, 0x00A3, COMPAT_OUT|COMPAT_IN},
+    {0xFFE2, 0x00AC, COMPAT_OUT|COMPAT_IN},
+    {0, 0, 0}
+};
+
+static compat_t *cp51932_compat = cp932_compat;
+
+/* cp20932_compat for kernel.  cp932_compat for mlang. */
+static compat_t *cp5022x_compat = cp932_compat;
+
+typedef HRESULT (WINAPI *CONVERTINETSTRING)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnSrcSize,
+    LPBYTE lpDstStr,
+    LPINT lpnDstSize
+);
+typedef HRESULT (WINAPI *CONVERTINETMULTIBYTETOUNICODE)(
+    LPDWORD lpdwMode,
+    DWORD dwSrcEncoding,
+    LPCSTR lpSrcStr,
+    LPINT lpnMultiCharCount,
+    LPWSTR lpDstStr,
+    LPINT lpnWideCharCount
+);
+typedef HRESULT (WINAPI *CONVERTINETUNICODETOMULTIBYTE)(
+    LPDWORD lpdwMode,
+    DWORD dwEncoding,
+    LPCWSTR lpSrcStr,
+    LPINT lpnWideCharCount,
+    LPSTR lpDstStr,
+    LPINT lpnMultiCharCount
+);
+typedef HRESULT (WINAPI *ISCONVERTINETSTRINGAVAILABLE)(
+    DWORD dwSrcEncoding,
+    DWORD dwDstEncoding
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766A)(
+    LCID Locale,
+    LPSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *LCIDTORFC1766W)(
+    LCID Locale,
+    LPWSTR pszRfc1766,
+    int nChar
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDA)(
+    LCID *pLocale,
+    LPSTR pszRfc1766
+);
+typedef HRESULT (WINAPI *RFC1766TOLCIDW)(
+    LCID *pLocale,
+    LPWSTR pszRfc1766
+);
+static CONVERTINETSTRING ConvertINetString;
+static CONVERTINETMULTIBYTETOUNICODE ConvertINetMultiByteToUnicode;
+static CONVERTINETUNICODETOMULTIBYTE ConvertINetUnicodeToMultiByte;
+static ISCONVERTINETSTRINGAVAILABLE IsConvertINetStringAvailable;
+static LCIDTORFC1766A LcidToRfc1766A;
+static RFC1766TOLCIDA Rfc1766ToLcidA;
+
+static int
+load_mlang()
+{
+    HMODULE h;
+    if (ConvertINetString != NULL)
+        return TRUE;
+    h = LoadLibrary("mlang.dll");
+    if (!h)
+        return FALSE;
+    ConvertINetString = (CONVERTINETSTRING)GetProcAddress(h, "ConvertINetString");
+    ConvertINetMultiByteToUnicode = (CONVERTINETMULTIBYTETOUNICODE)GetProcAddress(h, "ConvertINetMultiByteToUnicode");
+    ConvertINetUnicodeToMultiByte = (CONVERTINETUNICODETOMULTIBYTE)GetProcAddress(h, "ConvertINetUnicodeToMultiByte");
+    IsConvertINetStringAvailable = (ISCONVERTINETSTRINGAVAILABLE)GetProcAddress(h, "IsConvertINetStringAvailable");
+    LcidToRfc1766A = (LCIDTORFC1766A)GetProcAddress(h, "LcidToRfc1766A");
+    Rfc1766ToLcidA = (RFC1766TOLCIDA)GetProcAddress(h, "Rfc1766ToLcidA");
+    return TRUE;
+}
+
+iconv_t
+iconv_open(const char *tocode, const char *fromcode)
+{
+    rec_iconv_t *cd;
+
+    cd = (rec_iconv_t *)calloc(1, sizeof(rec_iconv_t));
+    if (cd == NULL)
+        return (iconv_t)(-1);
+
+#if defined(USE_LIBICONV_DLL)
+    errno = 0;
+    if (libiconv_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+#endif
+
+    /* reset the errno to prevent reporting wrong error code.
+     * 0 for unsorted error. */
+    errno = 0;
+    if (win_iconv_open(cd, tocode, fromcode))
+        return (iconv_t)cd;
+
+    free(cd);
+
+    return (iconv_t)(-1);
+}
+
+int
+iconv_close(iconv_t _cd)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    int r = cd->iconv_close(cd->cd);
+    int e = *(cd->_errno());
+#if defined(USE_LIBICONV_DLL)
+    if (cd->hlibiconv != NULL)
+        FreeLibrary(cd->hlibiconv);
+#endif
+    free(cd);
+    errno = e;
+    return r;
+}
+
+size_t
+iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    size_t r = cd->iconv(cd->cd, inbuf, inbytesleft, outbuf, outbytesleft);
+    errno = *(cd->_errno());
+    return r;
+}
+
+static int
+win_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    if (!make_csconv(fromcode, &cd->from) || !make_csconv(tocode, &cd->to))
+        return FALSE;
+    cd->iconv_close = win_iconv_close;
+    cd->iconv = win_iconv;
+    cd->_errno = _errno;
+    cd->cd = (iconv_t)cd;
+    return TRUE;
+}
+
+static int
+win_iconv_close(iconv_t cd)
+{
+    return 0;
+}
+
+static size_t
+win_iconv(iconv_t _cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
+{
+    rec_iconv_t *cd = (rec_iconv_t *)_cd;
+    ushort wbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int insize;
+    int outsize;
+    int wsize;
+    DWORD frommode;
+    DWORD tomode;
+    uint wc;
+    compat_t *cp;
+    int i;
+
+    if (inbuf == NULL || *inbuf == NULL)
+    {
+        if (outbuf != NULL && *outbuf != NULL && cd->to.flush != NULL)
+        {
+            tomode = cd->to.mode;
+            outsize = cd->to.flush(&cd->to, (uchar *)*outbuf, *outbytesleft);
+            if (outsize == -1)
+            {
+                cd->to.mode = tomode;
+                return (size_t)(-1);
+            }
+            *outbuf += outsize;
+            *outbytesleft -= outsize;
+        }
+        cd->from.mode = 0;
+        cd->to.mode = 0;
+        return 0;
+    }
+
+    while (*inbytesleft != 0)
+    {
+        frommode = cd->from.mode;
+        tomode = cd->to.mode;
+        wsize = MB_CHAR_MAX;
+
+        insize = cd->from.mbtowc(&cd->from, (const uchar *)*inbuf, *inbytesleft, wbuf, &wsize);
+        if (insize == -1)
+        {
+            cd->from.mode = frommode;
+            return (size_t)(-1);
+        }
+
+        if (wsize == 0)
+        {
+            *inbuf += insize;
+            *inbytesleft -= insize;
+            continue;
+        }
+
+        if (cd->from.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->from.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_IN) && cp[i].out == wc)
+                {
+                    ucs4_to_utf16(cp[i].in, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        if (cd->to.compat != NULL)
+        {
+            wc = utf16_to_ucs4(wbuf);
+            cp = cd->to.compat;
+            for (i = 0; cp[i].in != 0; ++i)
+            {
+                if ((cp[i].flag & COMPAT_OUT) && cp[i].in == wc)
+                {
+                    ucs4_to_utf16(cp[i].out, wbuf, &wsize);
+                    break;
+                }
+            }
+        }
+
+        outsize = cd->to.wctomb(&cd->to, wbuf, wsize, (uchar *)*outbuf, *outbytesleft);
+        if (outsize == -1)
+        {
+            cd->from.mode = frommode;
+            cd->to.mode = tomode;
+            return (size_t)(-1);
+        }
+
+        *inbuf += insize;
+        *outbuf += outsize;
+        *inbytesleft -= insize;
+        *outbytesleft -= outsize;
+    }
+
+    return 0;
+}
+
+static int
+make_csconv(const char *_name, csconv_t *cv)
+{
+    CPINFOEX cpinfoex;
+    int use_compat = TRUE;
+    int flag = 0;
+    char *name;
+    char *p;
+
+    name = xstrndup(_name, strlen(_name));
+    if (name == NULL)
+        return FALSE;
+
+    /* check for option "enc_name//opt1//opt2" */
+    while ((p = strrstr(name, "//")) != NULL)
+    {
+        if (_stricmp(p + 2, "nocompat") == 0)
+            use_compat = FALSE;
+        else if (_stricmp(p + 2, "translit") == 0)
+            flag |= FLAG_TRANSLIT;
+        else if (_stricmp(p + 2, "ignore") == 0)
+            flag |= FLAG_IGNORE;
+        *p = 0;
+    }
+
+    cv->mode = 0;
+    cv->flags = flag;
+    cv->mblen = NULL;
+    cv->flush = NULL;
+    cv->compat = NULL;
+    cv->codepage = name_to_codepage(name);
+    if (cv->codepage == 1200 || cv->codepage == 1201)
+    {
+        cv->mbtowc = utf16_mbtowc;
+        cv->wctomb = utf16_wctomb;
+        if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 12000 || cv->codepage == 12001)
+    {
+        cv->mbtowc = utf32_mbtowc;
+        cv->wctomb = utf32_wctomb;
+        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
+            cv->flags |= FLAG_USE_BOM;
+    }
+    else if (cv->codepage == 65001)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        cv->mblen = utf8_mblen;
+    }
+    else if ((cv->codepage == 50220 || cv->codepage == 50221 || cv->codepage == 50222) && load_mlang())
+    {
+        cv->mbtowc = iso2022jp_mbtowc;
+        cv->wctomb = iso2022jp_wctomb;
+        cv->flush = iso2022jp_flush;
+    }
+    else if (cv->codepage == 51932 && load_mlang())
+    {
+        cv->mbtowc = mlang_mbtowc;
+        cv->wctomb = mlang_wctomb;
+        cv->mblen = eucjp_mblen;
+    }
+    else if (IsValidCodePage(cv->codepage)
+	     && GetCPInfoEx(cv->codepage, 0, &cpinfoex) != 0)
+    {
+        cv->mbtowc = kernel_mbtowc;
+        cv->wctomb = kernel_wctomb;
+        if (cpinfoex.MaxCharSize == 1)
+            cv->mblen = sbcs_mblen;
+        else if (cpinfoex.MaxCharSize == 2)
+            cv->mblen = dbcs_mblen;
+	else
+	    cv->mblen = mbcs_mblen;
+    }
+    else
+    {
+        /* not supported */
+        free(name);
+        errno = EINVAL;
+        return FALSE;
+    }
+
+    if (use_compat)
+    {
+        switch (cv->codepage)
+        {
+        case 932: cv->compat = cp932_compat; break;
+        case 20932: cv->compat = cp20932_compat; break;
+        case 51932: cv->compat = cp51932_compat; break;
+        case 50220: case 50221: case 50222: cv->compat = cp5022x_compat; break;
+        }
+    }
+
+    free(name);
+
+    return TRUE;
+}
+
+static int
+name_to_codepage(const char *name)
+{
+    int i;
+
+    if (*name == '\0' ||
+	strcmp(name, "char") == 0)
+        return GetACP();
+    else if (strcmp(name, "wchar_t") == 0)
+        return 1200;
+    else if (_strnicmp(name, "cp", 2) == 0)
+        return atoi(name + 2); /* CP123 */
+    else if ('0' <= name[0] && name[0] <= '9')
+        return atoi(name);     /* 123 */
+    else if (_strnicmp(name, "xx", 2) == 0)
+        return atoi(name + 2); /* XX123 for debug */
+
+    for (i = 0; codepage_alias[i].name != NULL; ++i)
+        if (_stricmp(name, codepage_alias[i].name) == 0)
+            return codepage_alias[i].codepage;
+    return -1;
+}
+
+/*
+ * http://www.faqs.org/rfcs/rfc2781.html
+ */
+static uint
+utf16_to_ucs4(const ushort *wbuf)
+{
+    uint wc = wbuf[0];
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+        wc = ((wbuf[0] & 0x3FF) << 10) + (wbuf[1] & 0x3FF) + 0x10000;
+    return wc;
+}
+
+static void
+ucs4_to_utf16(uint wc, ushort *wbuf, int *wbufsize)
+{
+    if (wc < 0x10000)
+    {
+        wbuf[0] = wc;
+        *wbufsize = 1;
+    }
+    else
+    {
+        wc -= 0x10000;
+        wbuf[0] = 0xD800 | ((wc >> 10) & 0x3FF);
+        wbuf[1] = 0xDC00 | (wc & 0x3FF);
+        *wbufsize = 2;
+    }
+}
+
+/*
+ * Check if codepage is one of those for which the dwFlags parameter
+ * to MultiByteToWideChar() must be zero. Return zero or
+ * MB_ERR_INVALID_CHARS.  The docs in Platform SDK for for Windows
+ * Server 2003 R2 claims that also codepage 65001 is one of these, but
+ * that doesn't seem to be the case. The MSDN docs for MSVS2008 leave
+ * out 65001 (UTF-8), and that indeed seems to be the case on XP, it
+ * works fine to pass MB_ERR_INVALID_CHARS in dwFlags when converting
+ * from UTF-8.
+ */
+static int
+mbtowc_flags(int codepage)
+{
+    return (codepage == 50220 || codepage == 50221 ||
+	    codepage == 50222 || codepage == 50225 ||
+	    codepage == 50227 || codepage == 50229 ||
+	    codepage == 52936 || codepage == 54936 ||
+	    (codepage >= 57002 && codepage <= 57011) ||
+	    codepage == 65000 || codepage == 42) ? 0 : MB_ERR_INVALID_CHARS;
+}
+
+/*
+ * Check if codepage is one those for which the lpUsedDefaultChar
+ * parameter to WideCharToMultiByte() must be NULL.  The docs in
+ * Platform SDK for for Windows Server 2003 R2 claims that this is the
+ * list below, while the MSDN docs for MSVS2008 claim that it is only
+ * for 65000 (UTF-7) and 65001 (UTF-8). This time the earlier Platform
+ * SDK seems to be correct, at least for XP.
+ */
+static int
+must_use_null_useddefaultchar(int codepage)
+{
+    return (codepage == 65000 || codepage == 65001 ||
+            codepage == 50220 || codepage == 50221 ||
+            codepage == 50222 || codepage == 50225 ||
+            codepage == 50227 || codepage == 50229 ||
+            codepage == 52936 || codepage == 54936 ||
+            (codepage >= 57002 && codepage <= 57011) ||
+            codepage == 42);
+}
+
+static char *
+strrstr(const char *str, const char *token)
+{
+    int len = strlen(token);
+    const char *p = str + strlen(str);
+
+    while (str <= --p)
+        if (p[0] == token[0] && strncmp(p, token, len) == 0)
+            return (char *)p;
+    return NULL;
+}
+
+static char *
+xstrndup(const char *s, size_t n)
+{
+    char *p;
+
+    p = (char *)malloc(n + 1);
+    if (p == NULL)
+        return NULL;
+    memcpy(p, s, n);
+    p[n] = '\0';
+    return p;
+}
+
+static int
+seterror(int err)
+{
+    errno = err;
+    return -1;
+}
+
+#if defined(USE_LIBICONV_DLL)
+static int
+libiconv_iconv_open(rec_iconv_t *cd, const char *tocode, const char *fromcode)
+{
+    HMODULE hlibiconv = NULL;
+    HMODULE hmsvcrt = NULL;
+    char *dllname;
+    const char *p;
+    const char *e;
+    f_iconv_open _iconv_open;
+
+    /*
+     * always try to load dll, so that we can switch dll in runtime.
+     */
+
+    /* XXX: getenv() can't get variable set by SetEnvironmentVariable() */
+    p = getenv("WINICONV_LIBICONV_DLL");
+    if (p == NULL)
+        p = DEFAULT_LIBICONV_DLL;
+    /* parse comma separated value */
+    for ( ; *p != 0; p = (*e == ',') ? e + 1 : e)
+    {
+        e = strchr(p, ',');
+        if (p == e)
+            continue;
+        else if (e == NULL)
+            e = p + strlen(p);
+        dllname = xstrndup(p, e - p);
+        if (dllname == NULL)
+            return FALSE;
+        hlibiconv = LoadLibrary(dllname);
+        free(dllname);
+        if (hlibiconv != NULL)
+        {
+            if (hlibiconv == hwiniconv)
+            {
+                FreeLibrary(hlibiconv);
+                hlibiconv = NULL;
+                continue;
+            }
+            break;
+        }
+    }
+
+    if (hlibiconv == NULL)
+        goto failed;
+
+    hmsvcrt = find_imported_module_by_funcname(hlibiconv, "_errno");
+    if (hmsvcrt == NULL)
+        goto failed;
+
+    _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "libiconv_open");
+    if (_iconv_open == NULL)
+        _iconv_open = (f_iconv_open)GetProcAddress(hlibiconv, "iconv_open");
+    cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "libiconv_close");
+    if (cd->iconv_close == NULL)
+        cd->iconv_close = (f_iconv_close)GetProcAddress(hlibiconv, "iconv_close");
+    cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "libiconv");
+    if (cd->iconv == NULL)
+        cd->iconv = (f_iconv)GetProcAddress(hlibiconv, "iconv");
+    cd->_errno = (f_errno)GetProcAddress(hmsvcrt, "_errno");
+    if (_iconv_open == NULL || cd->iconv_close == NULL
+            || cd->iconv == NULL || cd->_errno == NULL)
+        goto failed;
+
+    cd->cd = _iconv_open(tocode, fromcode);
+    if (cd->cd == (iconv_t)(-1))
+        goto failed;
+
+    cd->hlibiconv = hlibiconv;
+    return TRUE;
+
+failed:
+    if (hlibiconv != NULL)
+        FreeLibrary(hlibiconv);
+    /* do not free hmsvcrt which is obtained by GetModuleHandle() */
+    return FALSE;
+}
+
+/*
+ * Reference:
+ * http://forums.belution.com/ja/vc/000/234/78s.shtml
+ * http://nienie.com/~masapico/api_ImageDirectoryEntryToData.html
+ *
+ * The formal way is
+ *   imagehlp.h or dbghelp.h
+ *   imagehlp.lib or dbghelp.lib
+ *   ImageDirectoryEntryToData()
+ */
+#define TO_DOS_HEADER(base) ((PIMAGE_DOS_HEADER)(base))
+#define TO_NT_HEADERS(base) ((PIMAGE_NT_HEADERS)((LPBYTE)(base) + TO_DOS_HEADER(base)->e_lfanew))
+static PVOID
+MyImageDirectoryEntryToData(LPVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
+{
+    /* TODO: MappedAsImage? */
+    PIMAGE_DATA_DIRECTORY p;
+    p = TO_NT_HEADERS(Base)->OptionalHeader.DataDirectory + DirectoryEntry;
+    if (p->VirtualAddress == 0) {
+      *Size = 0;
+      return NULL;
+    }
+    *Size = p->Size;
+    return (PVOID)((LPBYTE)Base + p->VirtualAddress);
+}
+
+static HMODULE
+find_imported_module_by_funcname(HMODULE hModule, const char *funcname)
+{
+    DWORD Base;
+    ULONG Size;
+    PIMAGE_IMPORT_DESCRIPTOR Imp;
+    PIMAGE_THUNK_DATA Name;         /* Import Name Table */
+    PIMAGE_IMPORT_BY_NAME ImpName;
+
+    Base = (DWORD)hModule;
+    Imp = MyImageDirectoryEntryToData(
+            (LPVOID)Base,
+            TRUE,
+            IMAGE_DIRECTORY_ENTRY_IMPORT,
+            &Size);
+    if (Imp == NULL)
+        return NULL;
+    for ( ; Imp->OriginalFirstThunk != 0; ++Imp)
+    {
+        Name = (PIMAGE_THUNK_DATA)(Base + Imp->OriginalFirstThunk);
+        for ( ; Name->u1.Ordinal != 0; ++Name)
+        {
+            if (!IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal))
+            {
+                ImpName = (PIMAGE_IMPORT_BY_NAME)
+                    (Base + (DWORD)Name->u1.AddressOfData);
+                if (strcmp((char *)ImpName->Name, funcname) == 0)
+                    return GetModuleHandle((char *)(Base + Imp->Name));
+            }
+        }
+    }
+    return NULL;
+}
+#endif
+
+static int
+sbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    return 1;
+}
+
+static int
+dbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = IsDBCSLeadByteEx(cv->codepage, buf[0]) ? 2 : 1;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+mbcs_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (cv->codepage == 54936) {
+	if (buf[0] <= 0x7F) len = 1;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 2 &&
+		 ((buf[1] >= 0x40 && buf[1] <= 0x7E) ||
+		  (buf[1] >= 0x80 && buf[1] <= 0xFE))) len = 2;
+	else if (buf[0] >= 0x81 && buf[0] <= 0xFE &&
+		 bufsize >= 4 &&
+		 buf[1] >= 0x30 && buf[1] <= 0x39) len = 4;
+	else
+	    return seterror(EINVAL);
+	return len;
+    }
+    else
+	return seterror(EINVAL);
+}
+
+static int
+utf8_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    int len = 0;
+
+    if (buf[0] < 0x80) len = 1;
+    else if ((buf[0] & 0xE0) == 0xC0) len = 2;
+    else if ((buf[0] & 0xF0) == 0xE0) len = 3;
+    else if ((buf[0] & 0xF8) == 0xF0) len = 4;
+    else if ((buf[0] & 0xFC) == 0xF8) len = 5;
+    else if ((buf[0] & 0xFE) == 0xFC) len = 6;
+
+    if (len == 0)
+        return seterror(EILSEQ);
+    else if (bufsize < len)
+        return seterror(EINVAL);
+    return len;
+}
+
+static int
+eucjp_mblen(csconv_t *cv, const uchar *buf, int bufsize)
+{
+    if (buf[0] < 0x80) /* ASCII */
+        return 1;
+    else if (buf[0] == 0x8E) /* JIS X 0201 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xDF))
+            return seterror(EILSEQ);
+        return 2;
+    }
+    else if (buf[0] == 0x8F) /* JIS X 0212 */
+    {
+        if (bufsize < 3)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[1] && buf[1] <= 0xFE)
+                || !(0xA1 <= buf[2] && buf[2] <= 0xFE))
+            return seterror(EILSEQ);
+        return 3;
+    }
+    else /* JIS X 0208 */
+    {
+        if (bufsize < 2)
+            return seterror(EINVAL);
+        else if (!(0xA1 <= buf[0] && buf[0] <= 0xFE)
+                || !(0xA1 <= buf[1] && buf[1] <= 0xFE))
+            return seterror(EILSEQ);
+        return 2;
+    }
+}
+
+static int
+kernel_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
+            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
+    if (*wbufsize == 0)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+kernel_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    BOOL usedDefaultChar = 0;
+    BOOL *p = NULL;
+    int flags = 0;
+    int len;
+
+    if (bufsize == 0)
+        return seterror(E2BIG);
+    if (!must_use_null_useddefaultchar(cv->codepage))
+    {
+        p = &usedDefaultChar;
+#ifdef WC_NO_BEST_FIT_CHARS
+        if (!(cv->flags & FLAG_TRANSLIT))
+            flags |= WC_NO_BEST_FIT_CHARS;
+#endif
+    }
+    len = WideCharToMultiByte(cv->codepage, flags,
+            (const wchar_t *)wbuf, wbufsize, (char *)buf, bufsize, NULL, p);
+    if (len == 0)
+    {
+        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+            return seterror(E2BIG);
+        return seterror(EILSEQ);
+    }
+    else if (usedDefaultChar)
+        return seterror(EILSEQ);
+    else if (cv->mblen(cv, buf, len) != len) /* validate result */
+        return seterror(EILSEQ);
+    return len;
+}
+
+/*
+ * It seems that the mode (cv->mode) is fixnum.
+ * For example, when converting iso-2022-jp(cp50221) to unicode:
+ *      in ascii sequence: mode=0xC42C0000
+ *   in jisx0208 sequence: mode=0xC42C0001
+ * "C42C" is same for each convert session.
+ * It should be: ((codepage-1)<<16)|state
+ */
+static int
+mlang_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int len;
+    int insize;
+    HRESULT hr;
+
+    len = cv->mblen(cv, buf, bufsize);
+    if (len == -1)
+        return -1;
+    insize = len;
+    hr = ConvertINetMultiByteToUnicode(&cv->mode, cv->codepage,
+            (const char *)buf, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len)
+        return seterror(EILSEQ);
+    return len;
+}
+
+static int
+mlang_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    char tmpbuf[MB_CHAR_MAX]; /* enough room for one character */
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+
+    hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
+        return seterror(EILSEQ);
+    memcpy(buf, tmpbuf, tmpsize);
+    return tmpsize;
+}
+
+static int
+utf16_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+
+    /* swap endian: 1200 <-> 1201 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 2)
+        return seterror(EINVAL);
+    if (codepage == 1200) /* little endian */
+        wbuf[0] = (buf[1] << 8) | buf[0];
+    else if (codepage == 1201) /* big endian */
+        wbuf[0] = (buf[0] << 8) | buf[1];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wbuf[0] == 0xFFFE)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 2;
+        }
+        else if (wbuf[0] == 0xFEFF)
+        {
+            *wbufsize = 0;
+            return 2;
+        }
+    }
+
+    if (0xDC00 <= wbuf[0] && wbuf[0] <= 0xDFFF)
+        return seterror(EILSEQ);
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(EINVAL);
+        if (codepage == 1200) /* little endian */
+            wbuf[1] = (buf[3] << 8) | buf[2];
+        else if (codepage == 1201) /* big endian */
+            wbuf[1] = (buf[2] << 8) | buf[3];
+        if (!(0xDC00 <= wbuf[1] && wbuf[1] <= 0xDFFF))
+            return seterror(EILSEQ);
+        *wbufsize = 2;
+        return 4;
+    }
+    *wbufsize = 1;
+    return 2;
+}
+
+static int
+utf16_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 2)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+            memcpy(buf, "\xFF\xFE", 2);
+        else if (cv->codepage == 1201) /* big endian */
+            memcpy(buf, "\xFE\xFF", 2);
+
+        r = utf16_wctomb(cv, wbuf, wbufsize, buf + 2, bufsize - 2);
+        if (r == -1)
+            return -1;
+        return r + 2;
+    }
+
+    if (bufsize < 2)
+        return seterror(E2BIG);
+    if (cv->codepage == 1200) /* little endian */
+    {
+        buf[0] = (wbuf[0] & 0x00FF);
+        buf[1] = (wbuf[0] & 0xFF00) >> 8;
+    }
+    else if (cv->codepage == 1201) /* big endian */
+    {
+        buf[0] = (wbuf[0] & 0xFF00) >> 8;
+        buf[1] = (wbuf[0] & 0x00FF);
+    }
+    if (0xD800 <= wbuf[0] && wbuf[0] <= 0xDBFF)
+    {
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 1200) /* little endian */
+        {
+            buf[2] = (wbuf[1] & 0x00FF);
+            buf[3] = (wbuf[1] & 0xFF00) >> 8;
+        }
+        else if (cv->codepage == 1201) /* big endian */
+        {
+            buf[2] = (wbuf[1] & 0xFF00) >> 8;
+            buf[3] = (wbuf[1] & 0x00FF);
+        }
+        return 4;
+    }
+    return 2;
+}
+
+static int
+utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    int codepage = cv->codepage;
+    uint wc;
+
+    /* swap endian: 12000 <-> 12001 */
+    if (cv->mode & UNICODE_MODE_SWAPPED)
+        codepage ^= 1;
+
+    if (bufsize < 4)
+        return seterror(EINVAL);
+    if (codepage == 12000) /* little endian */
+        wc = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+    else if (codepage == 12001) /* big endian */
+        wc = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (wc == 0xFFFE0000)
+        {
+            cv->mode |= UNICODE_MODE_SWAPPED;
+            *wbufsize = 0;
+            return 4;
+        }
+        else if (wc == 0x0000FEFF)
+        {
+            *wbufsize = 0;
+            return 4;
+        }
+    }
+
+    if ((0xD800 <= wc && wc <= 0xDFFF) || 0x10FFFF < wc)
+        return seterror(EILSEQ);
+    ucs4_to_utf16(wc, wbuf, wbufsize);
+    return 4;
+}
+
+static int
+utf32_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    uint wc;
+
+    if ((cv->flags & FLAG_USE_BOM) && !(cv->mode & UNICODE_MODE_BOM_DONE))
+    {
+        int r;
+
+        cv->mode |= UNICODE_MODE_BOM_DONE;
+        if (bufsize < 4)
+            return seterror(E2BIG);
+        if (cv->codepage == 12000) /* little endian */
+            memcpy(buf, "\xFF\xFE\x00\x00", 4);
+        else if (cv->codepage == 12001) /* big endian */
+            memcpy(buf, "\x00\x00\xFE\xFF", 4);
+
+        r = utf32_wctomb(cv, wbuf, wbufsize, buf + 4, bufsize - 4);
+        if (r == -1)
+            return -1;
+        return r + 4;
+    }
+
+    if (bufsize < 4)
+        return seterror(E2BIG);
+    wc = utf16_to_ucs4(wbuf);
+    if (cv->codepage == 12000) /* little endian */
+    {
+        buf[0] = wc & 0x000000FF;
+        buf[1] = (wc & 0x0000FF00) >> 8;
+        buf[2] = (wc & 0x00FF0000) >> 16;
+        buf[3] = (wc & 0xFF000000) >> 24;
+    }
+    else if (cv->codepage == 12001) /* big endian */
+    {
+        buf[0] = (wc & 0xFF000000) >> 24;
+        buf[1] = (wc & 0x00FF0000) >> 16;
+        buf[2] = (wc & 0x0000FF00) >> 8;
+        buf[3] = wc & 0x000000FF;
+    }
+    return 4;
+}
+
+/*
+ * 50220: ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
+ * 50221: ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow
+ *        1 byte Kana)
+ * 50222: ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte
+ *        Kana - SO/SI)
+ *
+ * MultiByteToWideChar() and WideCharToMultiByte() behave differently
+ * depending on Windows version.  On XP, WideCharToMultiByte() doesn't
+ * terminate result sequence with ascii escape.  But Vista does.
+ * Use MLang instead.
+ */
+
+#define ISO2022_MODE(cs, shift) (((cs) << 8) | (shift))
+#define ISO2022_MODE_CS(mode) (((mode) >> 8) & 0xFF)
+#define ISO2022_MODE_SHIFT(mode) ((mode) & 0xFF)
+
+#define ISO2022_SI  0
+#define ISO2022_SO  1
+
+/* shift in */
+static const char iso2022_SI_seq[] = "\x0F";
+/* shift out */
+static const char iso2022_SO_seq[] = "\x0E";
+
+typedef struct iso2022_esc_t iso2022_esc_t;
+struct iso2022_esc_t {
+    const char *esc;
+    int esc_len;
+    int len;
+    int cs;
+};
+
+#define ISO2022JP_CS_ASCII            0
+#define ISO2022JP_CS_JISX0201_ROMAN   1
+#define ISO2022JP_CS_JISX0201_KANA    2
+#define ISO2022JP_CS_JISX0208_1978    3
+#define ISO2022JP_CS_JISX0208_1983    4
+#define ISO2022JP_CS_JISX0212         5
+
+static iso2022_esc_t iso2022jp_esc[] = {
+    {"\x1B\x28\x42", 3, 1, ISO2022JP_CS_ASCII},
+    {"\x1B\x28\x4A", 3, 1, ISO2022JP_CS_JISX0201_ROMAN},
+    {"\x1B\x28\x49", 3, 1, ISO2022JP_CS_JISX0201_KANA},
+    {"\x1B\x24\x40", 3, 2, ISO2022JP_CS_JISX0208_1983}, /* unify 1978 with 1983 */
+    {"\x1B\x24\x42", 3, 2, ISO2022JP_CS_JISX0208_1983},
+    {"\x1B\x24\x28\x44", 4, 2, ISO2022JP_CS_JISX0212},
+    {NULL, 0, 0, 0}
+};
+
+static int
+iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int insize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
+
+    if (buf[0] == 0x1B)
+    {
+        for (i = 0; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (bufsize < esc_len)
+            {
+                if (strncmp((char *)buf, iesc[i].esc, bufsize) == 0)
+                    return seterror(EINVAL);
+            }
+            else
+            {
+                if (strncmp((char *)buf, iesc[i].esc, esc_len) == 0)
+                {
+                    cv->mode = ISO2022_MODE(iesc[i].cs, ISO2022_SI);
+                    *wbufsize = 0;
+                    return esc_len;
+                }
+            }
+        }
+        /* not supported escape sequence */
+        return seterror(EILSEQ);
+    }
+    else if (buf[0] == iso2022_SO_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SO);
+        *wbufsize = 0;
+        return 1;
+    }
+    else if (buf[0] == iso2022_SI_seq[0])
+    {
+        cv->mode = ISO2022_MODE(ISO2022_MODE_CS(cv->mode), ISO2022_SI);
+        *wbufsize = 0;
+        return 1;
+    }
+
+    cs = ISO2022_MODE_CS(cv->mode);
+    shift = ISO2022_MODE_SHIFT(cv->mode);
+
+    /* reset the mode for informal sequence */
+    if (buf[0] < 0x20)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        shift = ISO2022_SI;
+    }
+
+    len = iesc[cs].len;
+    if (bufsize < len)
+        return seterror(EINVAL);
+    for (i = 0; i < len; ++i)
+        if (!(buf[i] < 0x80))
+            return seterror(EILSEQ);
+    esc_len = iesc[cs].esc_len;
+    memcpy(tmp, iesc[cs].esc, esc_len);
+    if (shift == ISO2022_SO)
+    {
+        memcpy(tmp + esc_len, iso2022_SO_seq, 1);
+        esc_len += 1;
+    }
+    memcpy(tmp + esc_len, buf, len);
+
+    if ((cv->codepage == 50220 || cv->codepage == 50221
+                || cv->codepage == 50222) && shift == ISO2022_SO)
+    {
+        /* XXX: shift-out cannot be used for mbtowc (both kernel and
+         * mlang) */
+        esc_len = iesc[ISO2022JP_CS_JISX0201_KANA].esc_len;
+        memcpy(tmp, iesc[ISO2022JP_CS_JISX0201_KANA].esc, esc_len);
+        memcpy(tmp + esc_len, buf, len);
+    }
+
+    insize = len + esc_len;
+    hr = ConvertINetMultiByteToUnicode(&dummy, cv->codepage,
+            (const char *)tmp, &insize, (wchar_t *)wbuf, wbufsize);
+    if (hr != S_OK || insize != len + esc_len)
+        return seterror(EILSEQ);
+
+    /* Check for conversion error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (wbuf[0] == buf[0]
+            && cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+        return seterror(EILSEQ);
+
+    /* reset the mode for informal sequence */
+    if (cv->mode != ISO2022_MODE(cs, shift))
+        cv->mode = ISO2022_MODE(cs, shift);
+
+    return len;
+}
+
+static int
+iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    char tmp[MB_CHAR_MAX];
+    int tmpsize = MB_CHAR_MAX;
+    int insize = wbufsize;
+    HRESULT hr;
+    DWORD dummy = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
+
+    /*
+     * MultiByte = [escape sequence] + character + [escape sequence]
+     *
+     * Whether trailing escape sequence is added depends on which API is
+     * used (kernel or MLang, and its version).
+     */
+    hr = ConvertINetUnicodeToMultiByte(&dummy, cv->codepage,
+            (const wchar_t *)wbuf, &wbufsize, tmp, &tmpsize);
+    if (hr != S_OK || insize != wbufsize)
+        return seterror(EILSEQ);
+    else if (bufsize < tmpsize)
+        return seterror(E2BIG);
+
+    if (tmpsize == 1)
+    {
+        cs = ISO2022JP_CS_ASCII;
+        esc_len = 0;
+    }
+    else
+    {
+        for (i = 1; iesc[i].esc != NULL; ++i)
+        {
+            esc_len = iesc[i].esc_len;
+            if (strncmp(tmp, iesc[i].esc, esc_len) == 0)
+            {
+                cs = iesc[i].cs;
+                break;
+            }
+        }
+        if (iesc[i].esc == NULL)
+            /* not supported escape sequence */
+            return seterror(EILSEQ);
+    }
+
+    shift = ISO2022_SI;
+    if (tmp[esc_len] == iso2022_SO_seq[0])
+    {
+        shift = ISO2022_SO;
+        esc_len += 1;
+    }
+
+    len = iesc[cs].len;
+
+    /* Check for converting error.  Assuming defaultChar is 0x3F. */
+    /* ascii should be converted from ascii */
+    if (cs == ISO2022JP_CS_ASCII && !(wbuf[0] < 0x80))
+        return seterror(EILSEQ);
+    else if (tmpsize < esc_len + len)
+        return seterror(EILSEQ);
+
+    if (cv->mode == ISO2022_MODE(cs, shift))
+    {
+        /* remove escape sequence */
+        if (esc_len != 0)
+            memmove(tmp, tmp + esc_len, len);
+        esc_len = 0;
+    }
+    else
+    {
+        if (cs == ISO2022JP_CS_ASCII)
+        {
+            esc_len = iesc[ISO2022JP_CS_ASCII].esc_len;
+            memmove(tmp + esc_len, tmp, len);
+            memcpy(tmp, iesc[ISO2022JP_CS_ASCII].esc, esc_len);
+        }
+        if (ISO2022_MODE_SHIFT(cv->mode) == ISO2022_SO)
+        {
+            /* shift-in before changing to other mode */
+            memmove(tmp + 1, tmp, len + esc_len);
+            memcpy(tmp, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+    }
+
+    if (bufsize < len + esc_len)
+        return seterror(E2BIG);
+    memcpy(buf, tmp, len + esc_len);
+    cv->mode = ISO2022_MODE(cs, shift);
+    return len + esc_len;
+}
+
+static int
+iso2022jp_flush(csconv_t *cv, uchar *buf, int bufsize)
+{
+    iso2022_esc_t *iesc = iso2022jp_esc;
+    int esc_len;
+
+    if (cv->mode != ISO2022_MODE(ISO2022JP_CS_ASCII, ISO2022_SI))
+    {
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+            esc_len += 1;
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        if (bufsize < esc_len)
+            return seterror(E2BIG);
+
+        esc_len = 0;
+        if (ISO2022_MODE_SHIFT(cv->mode) != ISO2022_SI)
+        {
+            memcpy(buf, iso2022_SI_seq, 1);
+            esc_len += 1;
+        }
+        if (ISO2022_MODE_CS(cv->mode) != ISO2022JP_CS_ASCII)
+        {
+            memcpy(buf + esc_len, iesc[ISO2022JP_CS_ASCII].esc,
+                    iesc[ISO2022JP_CS_ASCII].esc_len);
+            esc_len += iesc[ISO2022JP_CS_ASCII].esc_len;
+        }
+        return esc_len;
+    }
+    return 0;
+}
+
+#if defined(MAKE_DLL) && defined(USE_LIBICONV_DLL)
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
+{
+    switch( fdwReason )
+    {
+    case DLL_PROCESS_ATTACH:
+        hwiniconv = (HMODULE)hinstDLL;
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
+#endif
+
+#if defined(MAKE_EXE)
+#include <stdio.h>
+#include <fcntl.h>
+#include <io.h>
+int
+main(int argc, char **argv)
+{
+    char *fromcode = NULL;
+    char *tocode = NULL;
+    int i;
+    char inbuf[BUFSIZ];
+    char outbuf[BUFSIZ];
+    const char *pin;
+    char *pout;
+    size_t inbytesleft;
+    size_t outbytesleft;
+    size_t rest = 0;
+    iconv_t cd;
+    size_t r;
+    FILE *in = stdin;
+
+    _setmode(_fileno(stdin), _O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+
+    for (i = 1; i < argc; ++i)
+    {
+        if (strcmp(argv[i], "-l") == 0)
+        {
+            for (i = 0; codepage_alias[i].name != NULL; ++i)
+                printf("%s\n", codepage_alias[i].name);
+            return 0;
+        }
+
+        if (strcmp(argv[i], "-f") == 0)
+            fromcode = argv[++i];
+        else if (strcmp(argv[i], "-t") == 0)
+            tocode = argv[++i];
+        else
+        {
+            in = fopen(argv[i], "rb");
+            if (in == NULL)
+            {
+                fprintf(stderr, "cannot open %s\n", argv[i]);
+                return 1;
+            }
+            break;
+        }
+    }
+
+    if (fromcode == NULL || tocode == NULL)
+    {
+        printf("usage: %s -f from-enc -t to-enc [file]\n", argv[0]);
+        return 0;
+    }
+
+    cd = iconv_open(tocode, fromcode);
+    if (cd == (iconv_t)(-1))
+    {
+        perror("iconv_open error");
+        return 1;
+    }
+
+    while ((inbytesleft = fread(inbuf + rest, 1, sizeof(inbuf) - rest, in)) != 0
+            || rest != 0)
+    {
+        inbytesleft += rest;
+        pin = inbuf;
+        pout = outbuf;
+        outbytesleft = sizeof(outbuf);
+        r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
+        fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
+        if (r == (size_t)(-1) && errno != E2BIG && (errno != EINVAL || feof(in)))
+        {
+            perror("conversion error");
+            return 1;
+        }
+        memmove(inbuf, pin, inbytesleft);
+        rest = inbytesleft;
+    }
+    pout = outbuf;
+    outbytesleft = sizeof(outbuf);
+    r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
+    fwrite(outbuf, 1, sizeof(outbuf) - outbytesleft, stdout);
+    if (r == (size_t)(-1))
+    {
+        perror("conversion error");
+        return 1;
+    }
+
+    iconv_close(cd);
+
+    return 0;
+}
+#endif
+
diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c
index 25b5574fa6..b2aafa4a57 100644
--- a/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c
+++ b/src/mod/endpoints/mod_gsmopen/win_iconv/win_iconv_test.c
@@ -1,261 +1,261 @@
-
-#include "win_iconv.c"
-#include <stdio.h>
-
-const char *
-tohex(const char *str, int size)
-{
-    static char buf[BUFSIZ];
-    char *pbuf = buf;
-    int i;
-    buf[0] = 0;
-    for (i = 0; i < size; ++i)
-        pbuf += sprintf(pbuf, "%02X", str[i] & 0xFF);
-    return buf;
-}
-
-const char *
-errstr(int errcode)
-{
-    static char buf[BUFSIZ];
-    switch (errcode)
-    {
-    case 0: return "NOERROR";
-    case EINVAL: return "EINVAL";
-    case EILSEQ: return "EILSEQ";
-    case E2BIG: return "E2BIG";
-    }
-    sprintf(buf, "%d\n", errcode);
-    return buf;
-}
-
-#ifdef USE_LIBICONV_DLL
-int use_dll;
-
-int
-setdll(const char *dllpath)
-{
-    char buf[BUFSIZ];
-    rec_iconv_t cd;
-
-    sprintf(buf, "WINICONV_LIBICONV_DLL=%s", dllpath);
-    putenv(buf);
-    if (libiconv_iconv_open(&cd, "ascii", "ascii"))
-    {
-        FreeLibrary(cd.hlibiconv);
-        use_dll = TRUE;
-        return TRUE;
-    }
-    use_dll = FALSE;
-    return FALSE;
-}
-#endif
-
-/*
- * We can test the codepage that is installed in the system.
- */
-int
-check_enc(const char *encname, int codepage)
-{
-    iconv_t cd;
-    int cp;
-    cd = iconv_open("utf-8", encname);
-    if (cd == (iconv_t)(-1))
-    {
-        printf("%s(%d) IS NOT SUPPORTED: SKIP THE TEST\n", encname, codepage);
-        return FALSE;
-    }
-    cp = ((rec_iconv_t *)cd)->from.codepage;
-    if (cp != codepage)
-    {
-        printf("%s(%d) ALIAS IS MAPPED TO DIFFERENT CODEPAGE (%d)\n", encname, codepage, cp);
-        exit(1);
-    }
-    iconv_close(cd);
-    return TRUE;
-}
-
-int use_dll;
-
-void
-test(const char *from, const char *fromstr, int fromsize, const char *to, const char *tostr, int tosize, int errcode, int bufsize, int line)
-{
-    char outbuf[BUFSIZ];
-    const char *pin;
-    char *pout;
-    size_t inbytesleft;
-    size_t outbytesleft;
-    iconv_t cd;
-    size_t r;
-    char dllpath[_MAX_PATH];
-
-    cd = iconv_open(to, from);
-    if (cd == (iconv_t)(-1))
-    {
-        printf("%s -> %s: NG: INVALID ENCODING NAME: line=%d\n", from, to, line);
-        exit(1);
-    }
-
-#ifdef USE_LIBICONV_DLL
-    if (((rec_iconv_t *)cd)->hlibiconv != NULL)
-        GetModuleFileName(((rec_iconv_t *)cd)->hlibiconv, dllpath, sizeof(dllpath));
-
-    if (use_dll && ((rec_iconv_t *)cd)->hlibiconv == NULL)
-    {
-        printf("%s: %s -> %s: NG: FAILED TO USE DLL: line=%d\n", dllpath, from, to, line);
-        exit(1);
-    }
-    else if (!use_dll && ((rec_iconv_t *)cd)->hlibiconv != NULL)
-    {
-        printf("%s: %s -> %s: NG: DLL IS LOADED UNEXPECTEDLY: line=%d\n", dllpath, from, to, line);
-        exit(1);
-    }
-#endif
-
-    errno = 0;
-
-    pin = fromstr;
-    pout = outbuf;
-    inbytesleft = fromsize;
-    outbytesleft = bufsize;
-    r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
-    if (r != (size_t)(-1))
-        r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
-    *pout = 0;
-
-#ifdef USE_LIBICONV_DLL
-    if (use_dll)
-        printf("%s: ", dllpath);
-#endif
-    printf("%s(%s) -> ", from, tohex(fromstr, fromsize));
-    printf("%s(%s%s%s): ", to, tohex(tostr, tosize),
-            errcode == 0 ? "" : ":",
-            errcode == 0 ? "" : errstr(errcode));
-    if (strcmp(outbuf, tostr) == 0 && errno == errcode)
-        printf("OK\n");
-    else
-    {
-        printf("RESULT(%s:%s): ", tohex(outbuf, sizeof(outbuf) - outbytesleft),
-                errstr(errno));
-        printf("NG: line=%d\n", line);
-        exit(1);
-    }
-}
-
-#define STATIC_STRLEN(arr) (sizeof(arr) - 1)
-
-#define success(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), 0, BUFSIZ, __LINE__)
-#define einval(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EINVAL, BUFSIZ, __LINE__)
-#define eilseq(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EILSEQ, BUFSIZ, __LINE__)
-#define e2big(from, fromstr, to, tostr, bufsize) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), E2BIG, bufsize, __LINE__)
-
-int
-main(int argc, char **argv)
-{
-#ifdef USE_LIBICONV_DLL
-    /* test use of dll if $DEFAULT_LIBICONV_DLL was defined. */
-    if (setdll(""))
-    {
-        success("ascii", "ABC", "ascii", "ABC");
-        success("ascii", "ABC", "utf-16be", "\x00\x41\x00\x42\x00\x43");
-    }
-    else
-    {
-        printf("\nDLL TEST IS SKIPPED\n\n");
-    }
-
-    setdll("none");
-#endif
-
-    if (check_enc("ascii", 20127))
-    {
-        success("ascii", "ABC", "ascii", "ABC");
-        /* MSB is dropped.  Hmm... */
-        success("ascii", "\x80\xFF", "ascii", "\x00\x7F");
-    }
-
-    /* unicode (CP1200 CP1201 CP12000 CP12001 CP65001) */
-    if (check_enc("utf-8", 65001)
-            && check_enc("utf-16be", 1201) && check_enc("utf-16le", 1200)
-            && check_enc("utf-32be", 12001) && check_enc("utf-32le", 12000)
-            )
-    {
-        /* Test the BOM behavior
-         * 1. Remove the BOM when "fromcode" is utf-16 or utf-32.
-         * 2. Add the BOM when "tocode" is utf-16 or utf-32.  */
-        success("utf-16", "\xFE\xFF\x01\x02", "utf-16be", "\x01\x02");
-        success("utf-16", "\xFF\xFE\x02\x01", "utf-16be", "\x01\x02");
-        success("utf-32", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\x01\x02");
-        success("utf-32", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\x01\x02");
-        success("utf-16", "\xFE\xFF\x00\x01", "utf-8", "\x01");
-#ifndef GLIB_COMPILATION
-        success("utf-8", "\x01", "utf-16", "\xFE\xFF\x00\x01");
-        success("utf-8", "\x01", "utf-32", "\x00\x00\xFE\xFF\x00\x00\x00\x01");
-#else
-        success("utf-8", "\x01", "utf-16", "\xFF\xFE\x01\x00");
-        success("utf-8", "\x01", "utf-32", "\xFF\xFE\x00\x00\x01\x00\x00\x00");
-#endif
-
-        success("utf-16be", "\xFE\xFF\x01\x02", "utf-16be", "\xFE\xFF\x01\x02");
-        success("utf-16le", "\xFF\xFE\x02\x01", "utf-16be", "\xFE\xFF\x01\x02");
-        success("utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
-        success("utf-32le", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
-        success("utf-16be", "\xFE\xFF\x00\x01", "utf-8", "\xEF\xBB\xBF\x01");
-        success("utf-8", "\xEF\xBB\xBF\x01", "utf-8", "\xEF\xBB\xBF\x01");
-
-        success("utf-16be", "\x01\x02", "utf-16le", "\x02\x01");
-        success("utf-16le", "\x02\x01", "utf-16be", "\x01\x02");
-        success("utf-16be", "\xFE\xFF", "utf-16le", "\xFF\xFE");
-        success("utf-16le", "\xFF\xFE", "utf-16be", "\xFE\xFF");
-        success("utf-32be", "\x00\x00\x03\x04", "utf-32le", "\x04\x03\x00\x00");
-        success("utf-32le", "\x04\x03\x00\x00", "utf-32be", "\x00\x00\x03\x04");
-        success("utf-32be", "\x00\x00\xFF\xFF", "utf-16be", "\xFF\xFF");
-        success("utf-16be", "\xFF\xFF", "utf-32be", "\x00\x00\xFF\xFF");
-        success("utf-32be", "\x00\x01\x00\x00", "utf-16be", "\xD8\x00\xDC\x00");
-        success("utf-16be", "\xD8\x00\xDC\x00", "utf-32be", "\x00\x01\x00\x00");
-        success("utf-32be", "\x00\x10\xFF\xFF", "utf-16be", "\xDB\xFF\xDF\xFF");
-        success("utf-16be", "\xDB\xFF\xDF\xFF", "utf-32be", "\x00\x10\xFF\xFF");
-        eilseq("utf-32be", "\x00\x11\x00\x00", "utf-16be", "");
-        eilseq("utf-16be", "\xDB\xFF\xE0\x00", "utf-32be", "");
-        success("utf-8", "\xE3\x81\x82", "utf-16be", "\x30\x42");
-        einval("utf-8", "\xE3", "utf-16be", "");
-    }
-
-    /* Japanese (CP932 CP20932 CP50220 CP50221 CP50222 CP51932) */
-    if (check_enc("cp932", 932)
-            && check_enc("cp20932", 20932) && check_enc("euc-jp", 51932)
-            && check_enc("cp50220", 50220) && check_enc("cp50221", 50221)
-            && check_enc("cp50222", 50222) && check_enc("iso-2022-jp", 50221))
-    {
-        /* Test the compatibility for each other Japanese codepage.
-         * And validate the escape sequence handling for iso-2022-jp. */
-        success("utf-16be", "\xFF\x5E", "cp932", "\x81\x60");
-        success("utf-16be", "\x30\x1C", "cp932", "\x81\x60");
-        success("utf-16be", "\xFF\x5E", "cp932//nocompat", "\x81\x60");
-        eilseq("utf-16be", "\x30\x1C", "cp932//nocompat", "");
-        success("euc-jp", "\xA4\xA2", "utf-16be", "\x30\x42");
-        einval("euc-jp", "\xA4\xA2\xA4", "utf-16be", "\x30\x42");
-        eilseq("euc-jp", "\xA4\xA2\xFF\xFF", "utf-16be", "\x30\x42");
-        success("cp932", "\x81\x60", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
-        success("UTF-16BE", "\xFF\x5E", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
-        eilseq("UTF-16BE", "\x30\x1C", "iso-2022-jp//nocompat", "");
-        success("UTF-16BE", "\x30\x42\x30\x44", "iso-2022-jp", "\x1B\x24\x42\x24\x22\x24\x24\x1B\x28\x42");
-        success("iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42", "UTF-16BE", "\xFF\x5E");
-    }
-
-    /*
-     * test for //translit
-     * U+FF41 (FULLWIDTH LATIN SMALL LETTER A) <-> U+0062 (LATIN SMALL LETTER A)
-     */
-    eilseq("UTF-16BE", "\xFF\x41", "iso-8859-1", "");
-    success("UTF-16BE", "\xFF\x41", "iso-8859-1//translit", "a");
-
-    /*
-     * TODO:
-     * Test for state after iconv() failed.
-     * Ensure iconv() error is safe and continuable.
-     */
-
-    return 0;
-}
-
+
+#include "win_iconv.c"
+#include <stdio.h>
+
+const char *
+tohex(const char *str, int size)
+{
+    static char buf[BUFSIZ];
+    char *pbuf = buf;
+    int i;
+    buf[0] = 0;
+    for (i = 0; i < size; ++i)
+        pbuf += sprintf(pbuf, "%02X", str[i] & 0xFF);
+    return buf;
+}
+
+const char *
+errstr(int errcode)
+{
+    static char buf[BUFSIZ];
+    switch (errcode)
+    {
+    case 0: return "NOERROR";
+    case EINVAL: return "EINVAL";
+    case EILSEQ: return "EILSEQ";
+    case E2BIG: return "E2BIG";
+    }
+    sprintf(buf, "%d\n", errcode);
+    return buf;
+}
+
+#ifdef USE_LIBICONV_DLL
+int use_dll;
+
+int
+setdll(const char *dllpath)
+{
+    char buf[BUFSIZ];
+    rec_iconv_t cd;
+
+    sprintf(buf, "WINICONV_LIBICONV_DLL=%s", dllpath);
+    putenv(buf);
+    if (libiconv_iconv_open(&cd, "ascii", "ascii"))
+    {
+        FreeLibrary(cd.hlibiconv);
+        use_dll = TRUE;
+        return TRUE;
+    }
+    use_dll = FALSE;
+    return FALSE;
+}
+#endif
+
+/*
+ * We can test the codepage that is installed in the system.
+ */
+int
+check_enc(const char *encname, int codepage)
+{
+    iconv_t cd;
+    int cp;
+    cd = iconv_open("utf-8", encname);
+    if (cd == (iconv_t)(-1))
+    {
+        printf("%s(%d) IS NOT SUPPORTED: SKIP THE TEST\n", encname, codepage);
+        return FALSE;
+    }
+    cp = ((rec_iconv_t *)cd)->from.codepage;
+    if (cp != codepage)
+    {
+        printf("%s(%d) ALIAS IS MAPPED TO DIFFERENT CODEPAGE (%d)\n", encname, codepage, cp);
+        exit(1);
+    }
+    iconv_close(cd);
+    return TRUE;
+}
+
+int use_dll;
+
+void
+test(const char *from, const char *fromstr, int fromsize, const char *to, const char *tostr, int tosize, int errcode, int bufsize, int line)
+{
+    char outbuf[BUFSIZ];
+    const char *pin;
+    char *pout;
+    size_t inbytesleft;
+    size_t outbytesleft;
+    iconv_t cd;
+    size_t r;
+    char dllpath[_MAX_PATH];
+
+    cd = iconv_open(to, from);
+    if (cd == (iconv_t)(-1))
+    {
+        printf("%s -> %s: NG: INVALID ENCODING NAME: line=%d\n", from, to, line);
+        exit(1);
+    }
+
+#ifdef USE_LIBICONV_DLL
+    if (((rec_iconv_t *)cd)->hlibiconv != NULL)
+        GetModuleFileName(((rec_iconv_t *)cd)->hlibiconv, dllpath, sizeof(dllpath));
+
+    if (use_dll && ((rec_iconv_t *)cd)->hlibiconv == NULL)
+    {
+        printf("%s: %s -> %s: NG: FAILED TO USE DLL: line=%d\n", dllpath, from, to, line);
+        exit(1);
+    }
+    else if (!use_dll && ((rec_iconv_t *)cd)->hlibiconv != NULL)
+    {
+        printf("%s: %s -> %s: NG: DLL IS LOADED UNEXPECTEDLY: line=%d\n", dllpath, from, to, line);
+        exit(1);
+    }
+#endif
+
+    errno = 0;
+
+    pin = fromstr;
+    pout = outbuf;
+    inbytesleft = fromsize;
+    outbytesleft = bufsize;
+    r = iconv(cd, &pin, &inbytesleft, &pout, &outbytesleft);
+    if (r != (size_t)(-1))
+        r = iconv(cd, NULL, NULL, &pout, &outbytesleft);
+    *pout = 0;
+
+#ifdef USE_LIBICONV_DLL
+    if (use_dll)
+        printf("%s: ", dllpath);
+#endif
+    printf("%s(%s) -> ", from, tohex(fromstr, fromsize));
+    printf("%s(%s%s%s): ", to, tohex(tostr, tosize),
+            errcode == 0 ? "" : ":",
+            errcode == 0 ? "" : errstr(errcode));
+    if (strcmp(outbuf, tostr) == 0 && errno == errcode)
+        printf("OK\n");
+    else
+    {
+        printf("RESULT(%s:%s): ", tohex(outbuf, sizeof(outbuf) - outbytesleft),
+                errstr(errno));
+        printf("NG: line=%d\n", line);
+        exit(1);
+    }
+}
+
+#define STATIC_STRLEN(arr) (sizeof(arr) - 1)
+
+#define success(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), 0, BUFSIZ, __LINE__)
+#define einval(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EINVAL, BUFSIZ, __LINE__)
+#define eilseq(from, fromstr, to, tostr) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), EILSEQ, BUFSIZ, __LINE__)
+#define e2big(from, fromstr, to, tostr, bufsize) test(from, fromstr, STATIC_STRLEN(fromstr), to, tostr, STATIC_STRLEN(tostr), E2BIG, bufsize, __LINE__)
+
+int
+main(int argc, char **argv)
+{
+#ifdef USE_LIBICONV_DLL
+    /* test use of dll if $DEFAULT_LIBICONV_DLL was defined. */
+    if (setdll(""))
+    {
+        success("ascii", "ABC", "ascii", "ABC");
+        success("ascii", "ABC", "utf-16be", "\x00\x41\x00\x42\x00\x43");
+    }
+    else
+    {
+        printf("\nDLL TEST IS SKIPPED\n\n");
+    }
+
+    setdll("none");
+#endif
+
+    if (check_enc("ascii", 20127))
+    {
+        success("ascii", "ABC", "ascii", "ABC");
+        /* MSB is dropped.  Hmm... */
+        success("ascii", "\x80\xFF", "ascii", "\x00\x7F");
+    }
+
+    /* unicode (CP1200 CP1201 CP12000 CP12001 CP65001) */
+    if (check_enc("utf-8", 65001)
+            && check_enc("utf-16be", 1201) && check_enc("utf-16le", 1200)
+            && check_enc("utf-32be", 12001) && check_enc("utf-32le", 12000)
+            )
+    {
+        /* Test the BOM behavior
+         * 1. Remove the BOM when "fromcode" is utf-16 or utf-32.
+         * 2. Add the BOM when "tocode" is utf-16 or utf-32.  */
+        success("utf-16", "\xFE\xFF\x01\x02", "utf-16be", "\x01\x02");
+        success("utf-16", "\xFF\xFE\x02\x01", "utf-16be", "\x01\x02");
+        success("utf-32", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\x01\x02");
+        success("utf-32", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\x01\x02");
+        success("utf-16", "\xFE\xFF\x00\x01", "utf-8", "\x01");
+#ifndef GLIB_COMPILATION
+        success("utf-8", "\x01", "utf-16", "\xFE\xFF\x00\x01");
+        success("utf-8", "\x01", "utf-32", "\x00\x00\xFE\xFF\x00\x00\x00\x01");
+#else
+        success("utf-8", "\x01", "utf-16", "\xFF\xFE\x01\x00");
+        success("utf-8", "\x01", "utf-32", "\xFF\xFE\x00\x00\x01\x00\x00\x00");
+#endif
+
+        success("utf-16be", "\xFE\xFF\x01\x02", "utf-16be", "\xFE\xFF\x01\x02");
+        success("utf-16le", "\xFF\xFE\x02\x01", "utf-16be", "\xFE\xFF\x01\x02");
+        success("utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
+        success("utf-32le", "\xFF\xFE\x00\x00\x02\x01\x00\x00", "utf-32be", "\x00\x00\xFE\xFF\x00\x00\x01\x02");
+        success("utf-16be", "\xFE\xFF\x00\x01", "utf-8", "\xEF\xBB\xBF\x01");
+        success("utf-8", "\xEF\xBB\xBF\x01", "utf-8", "\xEF\xBB\xBF\x01");
+
+        success("utf-16be", "\x01\x02", "utf-16le", "\x02\x01");
+        success("utf-16le", "\x02\x01", "utf-16be", "\x01\x02");
+        success("utf-16be", "\xFE\xFF", "utf-16le", "\xFF\xFE");
+        success("utf-16le", "\xFF\xFE", "utf-16be", "\xFE\xFF");
+        success("utf-32be", "\x00\x00\x03\x04", "utf-32le", "\x04\x03\x00\x00");
+        success("utf-32le", "\x04\x03\x00\x00", "utf-32be", "\x00\x00\x03\x04");
+        success("utf-32be", "\x00\x00\xFF\xFF", "utf-16be", "\xFF\xFF");
+        success("utf-16be", "\xFF\xFF", "utf-32be", "\x00\x00\xFF\xFF");
+        success("utf-32be", "\x00\x01\x00\x00", "utf-16be", "\xD8\x00\xDC\x00");
+        success("utf-16be", "\xD8\x00\xDC\x00", "utf-32be", "\x00\x01\x00\x00");
+        success("utf-32be", "\x00\x10\xFF\xFF", "utf-16be", "\xDB\xFF\xDF\xFF");
+        success("utf-16be", "\xDB\xFF\xDF\xFF", "utf-32be", "\x00\x10\xFF\xFF");
+        eilseq("utf-32be", "\x00\x11\x00\x00", "utf-16be", "");
+        eilseq("utf-16be", "\xDB\xFF\xE0\x00", "utf-32be", "");
+        success("utf-8", "\xE3\x81\x82", "utf-16be", "\x30\x42");
+        einval("utf-8", "\xE3", "utf-16be", "");
+    }
+
+    /* Japanese (CP932 CP20932 CP50220 CP50221 CP50222 CP51932) */
+    if (check_enc("cp932", 932)
+            && check_enc("cp20932", 20932) && check_enc("euc-jp", 51932)
+            && check_enc("cp50220", 50220) && check_enc("cp50221", 50221)
+            && check_enc("cp50222", 50222) && check_enc("iso-2022-jp", 50221))
+    {
+        /* Test the compatibility for each other Japanese codepage.
+         * And validate the escape sequence handling for iso-2022-jp. */
+        success("utf-16be", "\xFF\x5E", "cp932", "\x81\x60");
+        success("utf-16be", "\x30\x1C", "cp932", "\x81\x60");
+        success("utf-16be", "\xFF\x5E", "cp932//nocompat", "\x81\x60");
+        eilseq("utf-16be", "\x30\x1C", "cp932//nocompat", "");
+        success("euc-jp", "\xA4\xA2", "utf-16be", "\x30\x42");
+        einval("euc-jp", "\xA4\xA2\xA4", "utf-16be", "\x30\x42");
+        eilseq("euc-jp", "\xA4\xA2\xFF\xFF", "utf-16be", "\x30\x42");
+        success("cp932", "\x81\x60", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
+        success("UTF-16BE", "\xFF\x5E", "iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42");
+        eilseq("UTF-16BE", "\x30\x1C", "iso-2022-jp//nocompat", "");
+        success("UTF-16BE", "\x30\x42\x30\x44", "iso-2022-jp", "\x1B\x24\x42\x24\x22\x24\x24\x1B\x28\x42");
+        success("iso-2022-jp", "\x1B\x24\x42\x21\x41\x1B\x28\x42", "UTF-16BE", "\xFF\x5E");
+    }
+
+    /*
+     * test for //translit
+     * U+FF41 (FULLWIDTH LATIN SMALL LETTER A) <-> U+0062 (LATIN SMALL LETTER A)
+     */
+    eilseq("UTF-16BE", "\xFF\x41", "iso-8859-1", "");
+    success("UTF-16BE", "\xFF\x41", "iso-8859-1//translit", "a");
+
+    /*
+     * TODO:
+     * Test for state after iconv() failed.
+     * Ensure iconv() error is safe and continuable.
+     */
+
+    return 0;
+}
+
diff --git a/src/mod/endpoints/mod_opal/mod_opal.cpp b/src/mod/endpoints/mod_opal/mod_opal.cpp
index 7d97c29b51..c844df7052 100644
--- a/src/mod/endpoints/mod_opal/mod_opal.cpp
+++ b/src/mod/endpoints/mod_opal/mod_opal.cpp
@@ -1,1517 +1,1517 @@
-/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library /
- * Soft-Switch Application
- *
- * Version: MPL 1.1
- *
- * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com)
- * Copyright (c) 2008-2012 Vox Lucida Pty. Ltd. (robertj@voxlucida.com.au)
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Contributor(s):
- * Tuyan Ozipek   (tuyanozipek@gmail.com)
- * Lukasz Zwierko (lzwierko@gmail.com)
- * Robert Jongbloed (robertj@voxlucida.com.au)
- *
- */
-
-#include "mod_opal.h"
-#include <opal/patch.h>
-#include <rtp/rtp.h>
-#if PTLIB_CHECK_VERSION(2,11,1)
-#include <rtp/rtp_session.h>
-#endif
-#include <h323/h323pdu.h>
-#include <h323/gkclient.h>
-
-
-/* FreeSWITCH does not correctly handle an H.323 subtely, that is that a
-   MAXIMUM audio frames per packet is negotiated, and there is no
-   requirement for the remote to actually send that many. So, in say GSM, we
-   negotiate up to 3 frames or 60ms of data and the remote actually sends one
-   (20ms) frame per packet. Perfectly legal but blows up the media handling
-   in FS.
-
-   Eventually we will get around to bundling the packets, but not yet. This
-   compile flag will just force one frame/packet for all audio codecs.
- */
-#define IMPLEMENT_MULTI_FAME_AUDIO 0
-
-
-static switch_call_cause_t create_outgoing_channel(switch_core_session_t   *session,
-                                                   switch_event_t          *var_event,
-                                                   switch_caller_profile_t *outbound_profile,
-                                                   switch_core_session_t  **new_session,
-                                                   switch_memory_pool_t   **pool,
-                                                   switch_originate_flag_t  flags,
-                                                   switch_call_cause_t     *cancel_cause);
-
-
-static FSProcess *opal_process = NULL;
-
-
-static PConstString const ModuleName("opal");
-static char const ConfigFile[] = "opal.conf";
-#define FS_PREFIX "fs"
-
-
-static switch_io_routines_t opalfs_io_routines = {
-    /*.outgoing_channel */ create_outgoing_channel,
-    /*.read_frame */ FSConnection::read_audio_frame,
-    /*.write_frame */ FSConnection::write_audio_frame,
-    /*.kill_channel */ FSConnection::kill_channel,
-    /*.send_dtmf */ FSConnection::send_dtmf,
-    /*.receive_message */ FSConnection::receive_message,
-    /*.receive_event */ FSConnection::receive_event,
-    /*.state_change */ FSConnection::state_change,
-    /*.read_video_frame */ FSConnection::read_video_frame,
-    /*.write_video_frame */ FSConnection::write_video_frame
-};
-
-static switch_state_handler_table_t opalfs_event_handlers = {
-    /*.on_init */ FSConnection::on_init,
-    /*.on_routing */ FSConnection::on_routing,
-    /*.on_execute */ FSConnection::on_execute,
-    /*.on_hangup */ FSConnection::on_hangup,
-    /*.on_exchange_media */ FSConnection::on_exchange_media,
-    /*.on_soft_execute */ FSConnection::on_soft_execute,
-    /*.on_consume_media*/ NULL,
-    /*.on_hibernate*/ NULL,
-    /*.on_reset*/ NULL,
-    /*.on_park*/ NULL,
-    /*.on_reporting*/ NULL,
-    /*.on_destroy*/ FSConnection::on_destroy
-};
-
-
-SWITCH_BEGIN_EXTERN_C
-/*******************************************************************************/
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown);
-SWITCH_MODULE_DEFINITION(mod_opal, mod_opal_load, mod_opal_shutdown, NULL);
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load)
-{
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Starting loading mod_opal\n");
-
-    /* Prevent the loading of OPAL codecs via "plug ins", this is a directory
-       full of DLLs that will be loaded automatically. */
-    (void)putenv((char *)"PTLIBPLUGINDIR=/no/thanks");
-
-
-    *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-    if (!*module_interface) {
-        return SWITCH_STATUS_MEMERR;
-    }
-
-    opal_process = new FSProcess();
-    if (opal_process == NULL) {
-        return SWITCH_STATUS_MEMERR;
-    }
-
-    if (opal_process->Initialise(*module_interface)) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Opal manager initialized and running\n");
-        //unloading causes a seg in linux
-        //return SWITCH_STATUS_UNLOAD;
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-    delete opal_process;
-    opal_process = NULL;
-    return SWITCH_STATUS_FALSE;
-}
-
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown)
-{
-    delete opal_process;
-    opal_process = NULL;
-    return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_END_EXTERN_C
-/*******************************************************************************/
-
-///////////////////////////////////////////////////////////////////////
-
-#if PTRACING
-
-class FSTrace : public std::ostream
-{
-private:
-  class Buffer : public std::stringbuf
-  {
-    virtual int sync()
-    {
-      std::string s = str();
-      if (s.empty())
-        return 0;
-
-      //Due to explicit setting of flags we know exactly what we are getting
-  #define THREAD_ID_INDEX 2
-  #define FILE_NAME_INDEX 3
-  #define FILE_LINE_INDEX 4
-#if PTLIB_CHECK_VERSION(2,11,1)
-  #define CONTEXT_ID_REGEX "([0-9]+|- - - - - - -)\t"
-  #define LOG_PRINTF_FORMAT "{%s,%s} %s"
-  #define FULL_TEXT_INDEX 6
-#else
-  #define CONTEXT_ID_REGEX
-  #define LOG_PRINTF_FORMAT "{%s} %s"
-  #define FULL_TEXT_INDEX 5
-#endif
-      PStringArray fields(7);
-      static PRegularExpression logRE("^([0-9]+)\t *(.+)\t *([^(]+)\\(([0-9]+)\\)\t"CONTEXT_ID_REGEX"(.*)",
-                                      PRegularExpression::Extended);
-      if (!logRE.Execute(s.c_str(), fields)) {
-        fields[1] = "4";
-        fields[THREAD_ID_INDEX] = "unknown";
-        fields[FILE_NAME_INDEX] = __FILE__;
-        fields[FILE_LINE_INDEX] = __LINE__;
-        fields[FULL_TEXT_INDEX] = s;
-      }
-
-      switch_log_level_t level;
-      switch (fields[1].AsUnsigned()) {
-        case 0 :
-          level = SWITCH_LOG_ALERT;
-          break;
-        case 1 :
-          level = SWITCH_LOG_ERROR;
-          break;
-        case 2 :
-          level = SWITCH_LOG_WARNING;
-          break;
-        case 3 :
-          level = SWITCH_LOG_INFO;
-          break;
-        default :
-          level = SWITCH_LOG_DEBUG;
-          break;
-      }
-
-      fields[4].Replace("\t", " ", true);
-#if PTLIB_CHECK_VERSION(2,11,1)
-      fields[5].Replace("- - - - - - -", "-"),
-#endif
-      switch_log_printf(SWITCH_CHANNEL_ID_LOG,
-                        fields[FILE_NAME_INDEX],
-                        "PTLib-OPAL",
-                        fields[FILE_LINE_INDEX].AsUnsigned(),
-                        NULL,
-                        level,
-                        LOG_PRINTF_FORMAT,
-                        fields[THREAD_ID_INDEX].GetPointer(),
-#if PTLIB_CHECK_VERSION(2,11,1)
-                        fields[5].GetPointer(),
-#endif
-                        fields[FULL_TEXT_INDEX].GetPointer());
-
-      // Reset string
-      str(std::string());
-      return 0;
-    }
-  } buffer;
-
-public:
-  FSTrace()
-    : ostream(&buffer)
-  {
-  }
-};
-
-#endif // PTRACING
-
-
-///////////////////////////////////////////////////////////////////////
-
-FSProcess::FSProcess()
-  : PLibraryProcess("Vox Lucida Pty. Ltd.", MODNAME, 1, 1, BetaCode, 1)
-  , m_manager(NULL)
-{
-}
-
-
-FSProcess::~FSProcess()
-{
-  delete m_manager;
-#if PTRACING
-    PTrace::SetStream(NULL); // This will delete the FSTrace object
-#endif
-}
-
-
-bool FSProcess::Initialise(switch_loadable_module_interface_t *iface)
-{
-    m_manager = new FSManager();
-    return m_manager != NULL && m_manager->Initialise(iface);
-}
-
-
-///////////////////////////////////////////////////////////////////////
-
-FSManager::FSManager()
-  : m_context("default")
-  , m_dialplan("XML")
-{
-    // These are deleted by the OpalManager class, no need to have destructor
-    m_h323ep = new H323EndPoint(*this);
-    m_iaxep = new IAX2EndPoint(*this);
-    m_fsep = new FSEndPoint(*this);
-}
-
-
-bool FSManager::Initialise(switch_loadable_module_interface_t *iface)
-{
-    ReadConfig(false);
-
-    m_FreeSwitch = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(iface, SWITCH_ENDPOINT_INTERFACE);
-    m_FreeSwitch->interface_name = ModuleName;
-    m_FreeSwitch->io_routines = &opalfs_io_routines;
-    m_FreeSwitch->state_handler = &opalfs_event_handlers;
-
-    silenceDetectParams.m_mode = OpalSilenceDetector::NoSilenceDetection;
-
-    if (m_listeners.empty()) {
-        m_h323ep->StartListener("");
-    } else {
-        for (std::list < FSListener >::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it) {
-            if (!m_h323ep->StartListener(OpalTransportAddress(it->m_address, it->m_port))) {
-                PTRACE(2, "mod_opal\tCannot start listener for " << it->m_name);
-            }
-        }
-    }
-
-    AddRouteEntry("h323:.* = "FS_PREFIX":<da>");  // config option for direct routing
-    AddRouteEntry("iax2:.* = "FS_PREFIX":<da>");  // config option for direct routing
-    AddRouteEntry(FS_PREFIX":.* = h323:<da>");  // config option for direct routing
-
-    // Make sure all known codecs are instantiated,
-    // these are ones we know how to translate into H.323 capabilities
-    GetOpalG728();
-    GetOpalG729();
-    GetOpalG729A();
-    GetOpalG729B();
-    GetOpalG729AB();
-    GetOpalG7231_6k3();
-    GetOpalG7231_5k3();
-    GetOpalG7231A_6k3();
-    GetOpalG7231A_5k3();
-    GetOpalGSM0610();
-    GetOpalGSMAMR();
-    GetOpaliLBC();
-
-#if !IMPLEMENT_MULTI_FAME_AUDIO
-    OpalMediaFormatList allCodecs = OpalMediaFormat::GetAllRegisteredMediaFormats();
-    for (OpalMediaFormatList::iterator it = allCodecs.begin(); it != allCodecs.end(); ++it) {
-      if (it->GetMediaType() == OpalMediaType::Audio()) {
-        int ms_per_frame = it->GetFrameTime()/it->GetTimeUnits();
-        int frames_in_20_ms = (ms_per_frame+19)/ms_per_frame;
-        it->SetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption(), frames_in_20_ms);
-        it->SetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption(), frames_in_20_ms);
-        OpalMediaFormat::SetRegisteredMediaFormat(*it);
-        PTRACE(4, "mod_opal\tSet " << *it << " to " << frames_in_20_ms << "frames/packet");
-      }
-    }
-#endif // IMPLEMENT_MULTI_FAME_AUDIO
-
-    OpalMediaFormat t38 = OpalT38;
-    t38.SetOptionBoolean("UDPTL-Raw-Mode", true);
-    OpalMediaFormat::SetRegisteredMediaFormat(t38);
-
-    if (!m_gkAddress.IsEmpty()) {
-      if (m_h323ep->UseGatekeeper(m_gkAddress, m_gkIdentifer, m_gkInterface))
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Started gatekeeper: %s\n",
-                          (const char *)m_h323ep->GetGatekeeper()->GetName());
-      else
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                          "Could not start gatekeeper: addr=\"%s\", id=\"%s\", if=\"%s\"\n",
-                          (const char *)m_gkAddress,
-                          (const char *)m_gkIdentifer,
-                          (const char *)m_gkInterface);
-    }
-
-    return TRUE;
-}
-
-
-switch_status_t FSManager::ReadConfig(int reload)
-{
-    switch_event_t *request_params = NULL;
-    switch_event_create(&request_params, SWITCH_EVENT_REQUEST_PARAMS);
-    switch_assert(request_params);
-    switch_event_add_header_string(request_params, SWITCH_STACK_BOTTOM, "profile", switch_str_nil(""));
-
-    switch_xml_t cfg;
-    switch_xml_t xml = switch_xml_open_cfg(ConfigFile, &cfg, request_params);
-    if (xml == NULL) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", ConfigFile);
-        return SWITCH_STATUS_FALSE;
-    }
-
-    switch_xml_t xmlSettings = switch_xml_child(cfg, "settings");
-    if (xmlSettings) {
-        for (switch_xml_t xmlParam = switch_xml_child(xmlSettings, "param"); xmlParam != NULL; xmlParam = xmlParam->next) {
-            PConstCaselessString const var(switch_xml_attr_soft(xmlParam, "name"));
-            PConstString const val(switch_xml_attr_soft(xmlParam, "value"));
-
-            if (var == "context") {
-                m_context = val;
-            } else if (var == "dialplan") {
-                m_dialplan = val;
-            } else if (var == "codec-prefs") {
-                m_codecPrefs = val;
-            } else if (var == "disable-transcoding") {
-                m_disableTranscoding = switch_true(val);
-            } else if (var == "dtmf-type") {
-                if (val == "string")
-                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsString);
-                else if (val == "signal")
-                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsTone);
-                else if (val == "rfc2833")
-                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsRFC2833);
-                else if (val == "in-band")
-                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputInBand);
-            } else if (var == "jitter-size") {
-                SetAudioJitterDelay(val.AsUnsigned(), val.Mid(val.Find(',')+1).AsUnsigned()); // In milliseconds
-            } else if (var == "gk-address") {
-                m_gkAddress = val;
-            } else if (var == "gk-identifer") {
-                m_gkIdentifer = val;
-            } else if (var == "gk-interface") {
-                m_gkInterface = val;
-#if PTRACING
-            } else if (var == "trace-level") {
-                unsigned level = val.AsUnsigned();
-                if (level > 0) {
-                    PTrace::SetLevel(level);
-                    PTrace::ClearOptions(0xffffffff); // Everything off
-                    PTrace::SetOptions(               // Except these
-                      PTrace::TraceLevel|PTrace::FileAndLine|PTrace::Thread
-#if PTLIB_CHECK_VERSION(2,11,1)
-                      |PTrace::ContextIdentifier
-#endif
-                    );
-                    PTrace::SetStream(new FSTrace);
-                }
-#endif
-            }
-        }
-    }
-
-    switch_xml_t xmlListeners = switch_xml_child(cfg, "listeners");
-    if (xmlListeners != NULL) {
-        for (switch_xml_t xmlListener = switch_xml_child(xmlListeners, "listener"); xmlListener != NULL; xmlListener = xmlListener->next) {
-
-            m_listeners.push_back(FSListener());
-            FSListener & listener = m_listeners.back();
-
-            listener.m_name = switch_xml_attr_soft(xmlListener, "name");
-            if (listener.m_name.IsEmpty())
-                listener.m_name = "unnamed";
-
-            for (switch_xml_t xmlParam = switch_xml_child(xmlListener, "param"); xmlParam != NULL; xmlParam = xmlParam->next) {
-                PConstCaselessString const var(switch_xml_attr_soft(xmlParam, "name"));
-                PConstString const val(switch_xml_attr_soft(xmlParam, "value"));
-                if (var == "h323-ip")
-                    listener.m_address = val;
-                else if (var == "h323-port")
-                    listener.m_port = (uint16_t)val.AsUnsigned();
-            }
-
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created Listener '%s'\n", (const char *) listener.m_name);
-        }
-    }
-
-    switch_event_destroy(&request_params);
-
-    if (xml)
-        switch_xml_free(xml);
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_call_cause_t create_outgoing_channel(switch_core_session_t   *session,
-                                                   switch_event_t          *var_event,
-                                                   switch_caller_profile_t *outbound_profile,
-                                                   switch_core_session_t  **new_session,
-                                                   switch_memory_pool_t   **pool,
-                                                   switch_originate_flag_t  flags,
-                                                   switch_call_cause_t     *cancel_cause)
-{
-    if (opal_process == NULL)
-      return SWITCH_CAUSE_CRASH;
-
-    FSConnection::outgoing_params params;
-    params.var_event        = var_event;
-    params.outbound_profile = outbound_profile;
-    params.new_session      = new_session;
-    params.pool             = pool;
-    params.flags            = flags;
-    params.cancel_cause     = cancel_cause;
-    params.fail_cause       = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
-
-    if (opal_process->GetManager().SetUpCall(FS_PREFIX":", outbound_profile->destination_number, &params) != NULL)
-        return SWITCH_CAUSE_SUCCESS;
-
-    if (*new_session != NULL)
-        switch_core_session_destroy(new_session);
-    return params.fail_cause;
-}
-
-
-///////////////////////////////////////////////////////////////////////
-
-FSEndPoint::FSEndPoint(FSManager & manager)
-  : OpalLocalEndPoint(manager, FS_PREFIX)
-  , m_manager(manager)
-{
-    PTRACE(4, "mod_opal\tFSEndPoint created.");
-}
-
-
-OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions* stringOptions)
-{
-    return new FSConnection(call, *this, options, stringOptions, (FSConnection::outgoing_params *)userData);
-}
-
-
-///////////////////////////////////////////////////////////////////////
-
-FSConnection::FSConnection(OpalCall & call,
-                           FSEndPoint & endpoint,
-                           unsigned options,
-                           OpalConnection::StringOptions* stringOptions,
-                           outgoing_params * params)
-  : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)
-  , m_endpoint(endpoint)
-  , m_fsSession(NULL)
-  , m_fsChannel(NULL)
-  , m_flushAudio(false)
-  , m_udptl(false)
-{
-    memset(&m_read_timer, 0, sizeof(m_read_timer));
-    memset(&m_read_codec, 0, sizeof(m_read_codec));
-    memset(&m_write_codec, 0, sizeof(m_write_codec));
-    memset(&m_vid_read_timer, 0, sizeof(m_vid_read_timer));
-    memset(&m_vid_read_codec, 0, sizeof(m_vid_read_codec));
-    memset(&m_vid_write_codec, 0, sizeof(m_vid_write_codec));
-    memset(&m_dummy_frame, 0, sizeof(m_dummy_frame));
-    m_dummy_frame.flags = SFF_CNG;
-
-    if (params != NULL) {
-        // If we fail, this is the cause
-        params->fail_cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-
-        if ((m_fsSession = switch_core_session_request(endpoint.GetManager().GetSwitchInterface(),
-                                      SWITCH_CALL_DIRECTION_OUTBOUND, params->flags, params->pool)) == NULL) {
-            PTRACE(1, "mod_opal\tCannot create session for outgoing call.");
-            return;
-        }
-    }
-    else {
-      if ((m_fsSession = switch_core_session_request(endpoint.GetManager().GetSwitchInterface(),
-                                                     SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) == NULL) {
-            PTRACE(1, "mod_opal\tCannot create session for incoming call.");
-            return;
-      }
-    }
-
-    if ((m_fsChannel = switch_core_session_get_channel(m_fsSession)) == NULL) {
-        switch_core_session_destroy(&m_fsSession);
-        return;
-    }
-
-    switch_core_session_set_private(m_fsSession, this);
-    SafeReference(); // Make sure cannot be deleted until on_destroy()
-
-    if (params != NULL) {
-        switch_caller_profile_t *caller_profile = switch_caller_profile_clone(m_fsSession, params->outbound_profile);
-        switch_channel_set_caller_profile(m_fsChannel, caller_profile);
-        SetLocalPartyName(caller_profile->caller_id_number);
-        SetDisplayName(caller_profile->caller_id_name);
-
-        *params->new_session = m_fsSession;
-    }
-
-    switch_channel_set_state(m_fsChannel, CS_INIT);
-}
-
-
-bool FSConnection::OnOutgoingSetUp()
-{
-    if (m_fsSession == NULL || m_fsChannel == NULL) {
-        PTRACE(1, "mod_opal\tSession request failed.");
-        return false;
-    }
-
-    // Transfer FS caller_id_number & caller_id_name from the FSConnection
-    // to the protocol connection (e.g. H.323) so gets sent correctly
-    // in outgoing packets
-    PSafePtr<OpalConnection> proto = GetOtherPartyConnection();
-    if (proto == NULL) {
-        PTRACE(1, "mod_opal\tNo protocol connection in call.");
-        return false;
-    }
-
-    proto->SetLocalPartyName(GetLocalPartyName());
-    proto->SetDisplayName(GetDisplayName());
-
-    switch_channel_set_name(m_fsChannel, ModuleName + '/' + GetRemotePartyURL());
-    return true;
-}
-
-
-bool FSConnection::OnIncoming()
-{
-    if (m_fsSession == NULL || m_fsChannel == NULL) {
-        PTRACE(1, "mod_opal\tSession request failed.");
-        return false;
-    }
-
-    switch_core_session_add_stream(m_fsSession, NULL);
-
-    PURL url = GetRemotePartyURL();
-    switch_caller_profile_t *caller_profile = switch_caller_profile_new(
-          switch_core_session_get_pool(m_fsSession),
-          url.GetUserName(),      /** username */
-          m_endpoint.GetManager().GetDialPlan(), /** dial plan */
-          GetRemotePartyName(),   /** caller_id_name */
-          GetRemotePartyNumber(), /** caller_id_number */
-          url.GetHostName(),      /** network addr */
-          NULL,                   /** ANI */
-          NULL,                   /** ANI II */
-          NULL,                   /** RDNIS */
-          ModuleName,             /** source */
-          m_endpoint.GetManager().GetContext(), /** set context  */
-          GetCalledPartyNumber()  /** destination_number */
-    );
-    if (caller_profile == NULL) {
-        PTRACE(1, "mod_opal\tCould not create caller profile");
-        return false;
-    }
-
-    PTRACE(4, "mod_opal\tCreated switch caller profile:\n"
-              "  username          = " << caller_profile->username << "\n"
-              "  dialplan          = " << caller_profile->dialplan << "\n"
-              "  caller_id_name    = " << caller_profile->caller_id_name << "\n"
-              "  caller_id_number  = " << caller_profile->caller_id_number << "\n"
-              "  network_addr      = " << caller_profile->network_addr << "\n"
-              "  source            = " << caller_profile->source << "\n"
-              "  context           = " << caller_profile->context << "\n"
-              "  destination_number= " << caller_profile->destination_number);
-    switch_channel_set_caller_profile(m_fsChannel, caller_profile);
-
-    switch_channel_set_name(m_fsChannel, ModuleName + '/' + url.GetScheme() + ':' + caller_profile->destination_number);
-
-    if (switch_core_session_thread_launch(m_fsSession) != SWITCH_STATUS_SUCCESS) {
-        PTRACE(1, "mod_opal\tCould not launch session thread");
-        switch_core_session_destroy(&m_fsSession);
-        m_fsChannel = NULL;
-        return false;
-    }
-
-    return true;
-}
-
-
-void FSConnection::OnEstablished()
-{
-  OpalLocalConnection::OnEstablished();
-
-  if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-    PTRACE(4, "mod_opal\tOnEstablished for outbound call, checking for media");
-    if (GetMediaStream(OpalMediaType::Audio(), true) != NULL && GetMediaStream(OpalMediaType::Audio(), false) != NULL) {
-      PTRACE(3, "mod_opal\tOnEstablished for outbound call, making call answered");
-      switch_channel_mark_answered(m_fsChannel);
-    }
-  }
-}
-
-
-void FSConnection::OnReleased()
-{
-    m_rxAudioOpened.Signal();   // Just in case
-    m_txAudioOpened.Signal();
-
-    if (m_fsChannel != NULL) {
-        PTRACE(3, "mod_opal\tHanging up FS side");
-        switch_channel_hangup(m_fsChannel, (switch_call_cause_t)callEndReason.q931);
-    }
-
-    OpalLocalConnection::OnReleased();
-}
-
-
-PBoolean FSConnection::SetAlerting(const PString & calleeName, PBoolean withMedia)
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return false;
-
-    switch_channel_mark_ring_ready(m_fsChannel);
-    return OpalLocalConnection::SetAlerting(calleeName, withMedia);
-}
-
-
-PBoolean FSConnection::SendUserInputTone(char tone, unsigned duration)
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return false;
-
-    switch_dtmf_t dtmf = { tone, duration };
-    PTRACE(4, "mod_opal\tSending DTMF to FS: tone=" << tone << ", duration=" << duration);
-    return switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS;
-}
-
-
-OpalMediaFormatList FSConnection::GetMediaFormats() const
-{
-    if (m_switchMediaFormats.IsEmpty()) {
-        const_cast<FSConnection *>(this)->SetCodecs();
-    }
-
-    return m_switchMediaFormats;
-}
-
-
-void FSConnection::SetCodecs()
-{
-    int numCodecs = 0;
-    const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS];
-
-    PString codec_string = switch_channel_get_variable(m_fsChannel, "absolute_codec_string");
-    if (codec_string.IsEmpty()) {
-        codec_string = switch_channel_get_variable(m_fsChannel, "codec_string");
-        if (codec_string.IsEmpty()) {
-            codec_string = m_endpoint.GetManager().GetCodecPrefs();
-            if (codec_string.IsEmpty()) {
-                numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0]));
-                for (int i = 0; i < numCodecs; i++) {
-                  if (i > 0)
-                    codec_string += ',';
-                  codec_string += codecs[i]->iananame;
-                }
-                PTRACE(4, "mod_opal\tDefault to all loaded codecs=" << codec_string);
-            }
-            else {
-                PTRACE(4, "mod_opal\tSettings codec-prefs=" << codec_string);
-            }
-        }
-        else {
-            PTRACE(4, "mod_opal\tChannel codec_string=" << codec_string);
-        }
-
-        PString orig_codec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE);
-        if (!orig_codec.IsEmpty()) {
-          if (m_endpoint.GetManager().GetDisableTranscoding()) {
-              codec_string = orig_codec;
-              PTRACE(4, "mod_opal\tNo transcoding, forced to originator codec=" << orig_codec);
-          }
-          else {
-              codec_string.Splice(orig_codec+',', 0);
-              PTRACE(4, "mod_opal\tSetting preference to originator codec=" << orig_codec);
-          }
-        }
-    }
-    else {
-        PTRACE(4, "mod_opal\tChannel absolute_codec_string=" << codec_string);
-    }
-
-    {
-        char *codec_order[SWITCH_MAX_CODECS];
-        int codec_order_last = switch_separate_string((char *)codec_string.GetPointer(), ',', codec_order, SWITCH_MAX_CODECS);
-        numCodecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, codec_order, codec_order_last);
-    }
-
-    for (int i = 0; i < numCodecs; i++) {
-        const switch_codec_implementation_t *codec = codecs[i];
-
-        // See if we have a match by PayloadType/rate/name
-        OpalMediaFormat switchFormat((RTP_DataFrame::PayloadTypes)codec->ianacode,
-                                     codec->samples_per_second,
-                                     codec->iananame);
-        if (!switchFormat.IsValid()) {
-            // See if we have a match by name alone
-            switchFormat = codec->iananame;
-            if (!switchFormat.IsValid()) {
-              PTRACE(2, "mod_opal\tCould not match FS codec "
-                     << codec->iananame << '@' << codec->samples_per_second
-                     << " (pt=" << (unsigned)codec->ianacode << ")"
-                        " to an OPAL media format.");
-              continue;
-            }
-        }
-
-        PTRACE(4, "mod_opal\tMatched FS codec " << codec->iananame << " to OPAL media format " << switchFormat);
-
-#if IMPLEMENT_MULTI_FAME_AUDIO
-        // Did we match or create a new media format?
-        if (switchFormat.IsValid() && codec->codec_type == SWITCH_CODEC_TYPE_AUDIO) {
-            // Calculate frames per packet, do not use codec->codec_frames_per_packet as that field
-            // has slightly different semantics when used in streamed codecs such as G.711
-            int fpp = codec->samples_per_packet/switchFormat.GetFrameTime();
-
-            /* Set the frames/packet to maximum of what is in the FS table. The OPAL negotiations will
-               drop the value from there. This might fail if there are "holes" in the FS table, e.g.
-               if for some reason G.723.1 has 30ms and 90ms but not 60ms, then the OPAL negotiations
-               could end up with 60ms and the codec cannot be created. The "holes" are unlikely in
-               all but streamed codecs such as G.711, where it is theoretically possible for OPAL to
-               come up with 32ms and there is only 30ms and 40ms in the FS table. We deem these
-               scenarios sufficiently rare that we can safely ignore them ... for now. */
-
-            if (fpp > switchFormat.GetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption())) {
-                switchFormat.SetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption(), fpp);
-            }
-
-            if (fpp > switchFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption())) {
-                switchFormat.SetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption(), fpp);
-            }
-        }
-#endif // IMPLEMENT_MULTI_FAME_AUDIO
-
-        m_switchMediaFormats += switchFormat;
-    }
-
-#if HAVE_T38
-    OpalMediaFormat t38 = OpalT38;
-
-    /* We need to have a T.38 options for TCS, but may be before the
-       spandsp_mod has set it us. So, if not, we actually give to spandsp_mod. */
-    switch_t38_options_t *t38_options = (switch_t38_options_t *)switch_channel_get_private(m_fsChannel, "t38_options");
-    if (t38_options == NULL)
-      SetT38OptionsFromMediaFormat(t38, "_preconfigured_t38_options");
-    else {
-      t38.SetOptionInteger("T38FaxVersion", t38_options->T38FaxVersion);
-      t38.SetOptionInteger("T38MaxBitRate", t38_options->T38MaxBitRate);
-      t38.SetOptionBoolean("T38FaxFillBitRemoval", t38_options->T38FaxFillBitRemoval);
-      t38.SetOptionBoolean("T38FaxTranscodingMMR", t38_options->T38FaxTranscodingMMR);
-      t38.SetOptionBoolean("T38FaxTranscodingJBIG", t38_options->T38FaxTranscodingJBIG);
-      t38.SetOptionValue("T38FaxRateManagement", t38_options->T38FaxRateManagement);
-      t38.SetOptionInteger("T38Version", t38_options->T38FaxMaxBuffer);
-      t38.SetOptionInteger("T38Version", t38_options->T38FaxMaxDatagram);
-      t38.SetOptionValue("T38FaxUdpEC", t38_options->T38FaxUdpEC);
-    }
-
-    m_switchMediaFormats += t38;
-#endif // HAVE_T38
-}
-
-
-OpalMediaStream *FSConnection::CreateMediaStream(const OpalMediaFormat & mediaFormat, unsigned sessionID, PBoolean isSource)
-{
-    return new FSMediaStream(*this, mediaFormat, sessionID, isSource);
-}
-
-
-void FSConnection::OnPatchMediaStream(PBoolean isSource, OpalMediaPatch & patch)
-{
-    OpalConnection::OnPatchMediaStream(isSource, patch);
-
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return;
-
-    if (patch.GetSource().GetMediaFormat().GetMediaType() != OpalMediaType::Audio())
-        return;
-
-    if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_INBOUND) {
-        PTRACE(4, "mod_opal\tOnPatchMediaStream for inbound call, flagging media opened");
-        if (isSource)
-            m_rxAudioOpened.Signal();
-        else
-            m_txAudioOpened.Signal();
-    }
-    else {
-      PTRACE(4, "mod_opal\tOnPatchMediaStream for outbound call, checking media");
-      if (GetMediaStream(OpalMediaType::Audio(), !isSource) != NULL) {
-          // Have open media in both directions.
-          if (IsEstablished()) {
-              PTRACE(3, "mod_opal\tOnPatchMediaStream for outbound call, making call answered");
-              switch_channel_mark_answered(m_fsChannel);
-          }
-          else if (!IsReleased()) {
-              PTRACE(3, "mod_opal\tOnPatchMediaStream for outbound call, making call pre-answered");
-              switch_channel_mark_pre_answered(m_fsChannel);
-          }
-      }
-    }
-}
-
-
-switch_status_t FSConnection::on_init()
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return SWITCH_STATUS_FALSE;
-
-    PTRACE(4, "mod_opal\tStarted routing for connection " << *this);
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_routing()
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return SWITCH_STATUS_FALSE;
-
-    PTRACE(4, "mod_opal\tRouting connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_execute()
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return SWITCH_STATUS_FALSE;
-
-    PTRACE(4, "mod_opal\tExecuting connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_destroy()
-{
-    PTRACE(3, "mod_opal\tFS on_destroy for connection " << *this);
-
-    m_fsChannel = NULL; // Will be destroyed by FS, so don't use it any more.
-
-    switch_core_codec_destroy(&m_read_codec);
-    switch_core_codec_destroy(&m_write_codec);
-    switch_core_codec_destroy(&m_vid_read_codec);
-    switch_core_codec_destroy(&m_vid_write_codec);
-    switch_core_timer_destroy(&m_read_timer);
-    switch_core_timer_destroy(&m_vid_read_timer);
-
-    switch_core_session_set_private(m_fsSession, NULL);
-    SafeDereference();
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_hangup()
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return SWITCH_STATUS_FALSE;
-
-    /* if this is still here it was our idea to hangup not opal's */
-    ClearCallSynchronous(NULL, H323TranslateToCallEndReason(
-              (Q931::CauseValues)switch_channel_get_cause_q850(m_fsChannel), UINT_MAX));
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_exchange_media()
-{
-    PTRACE(4, "mod_opal\tExchanging media on connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::on_soft_execute()
-{
-    PTRACE(4, "mod_opal\tSoft execute on connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::kill_channel(int sig)
-{
-    switch (sig) {
-    case SWITCH_SIG_KILL:
-        PTRACE(4, "mod_opal\tSignal KILL received on connection " << *this);
-        m_rxAudioOpened.Signal();
-        m_txAudioOpened.Signal();
-        CloseMediaStreams();
-        break;
-
-    case SWITCH_SIG_BREAK:
-        PTRACE(4, "mod_opal\tSignal BREAK received on connection " << *this);
-        break;
-
-    default:
-        PTRACE(4, "mod_opal\tSignal " << sig << " received on connection " << *this);
-        break;
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::send_dtmf(const switch_dtmf_t *dtmf)
-{
-    PTRACE(4, "mod_opal\tReceived DTMF from FS: tone=" << dtmf->digit << ", duration=" << dtmf->duration);
-    OnUserInputTone(dtmf->digit, dtmf->duration);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::receive_message(switch_core_session_message_t *msg)
-{
-    if (PAssertNULL(m_fsChannel) == NULL)
-        return SWITCH_STATUS_FALSE;
-
-    switch (msg->message_id) {
-    case SWITCH_MESSAGE_INDICATE_RINGING:
-    case SWITCH_MESSAGE_INDICATE_PROGRESS:
-    case SWITCH_MESSAGE_INDICATE_ANSWER:
-    case SWITCH_MESSAGE_INDICATE_DEFLECT:
-        if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_INBOUND) {
-            switch_caller_profile_t * profile = switch_channel_get_caller_profile(m_fsChannel);
-            if (profile != NULL && profile->caller_extension != NULL)
-            {
-                PSafePtr<OpalConnection> other = GetOtherPartyConnection();
-                if (other != NULL) {
-                    other->SetLocalPartyName(profile->caller_extension->extension_number);
-                    other->SetDisplayName(profile->caller_extension->extension_name);
-                }
-                SetLocalPartyName(profile->caller_extension->extension_number);
-                SetDisplayName(profile->caller_extension->extension_name);
-            }
-        }
-        else {
-            return SWITCH_STATUS_FALSE;
-        }
-        break;
-
-    default:
-        break;
-    }
-
-    switch (msg->message_id) {
-    case SWITCH_MESSAGE_INDICATE_BRIDGE:
-    case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-    case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
-        m_flushAudio = true;
-        break;
-
-    case SWITCH_MESSAGE_INDICATE_RINGING:
-        AlertingIncoming();
-        break;
-
-    case SWITCH_MESSAGE_INDICATE_PROGRESS:
-        AutoStartMediaStreams();
-        AlertingIncoming();
-
-        if (!WaitForMedia())
-            return SWITCH_STATUS_FALSE;
-
-        if (!switch_channel_test_flag(m_fsChannel, CF_EARLY_MEDIA)) {
-            switch_channel_mark_pre_answered(m_fsChannel);
-        }
-        break;
-
-    case SWITCH_MESSAGE_INDICATE_ANSWER:
-        AcceptIncoming();
-
-        if (!WaitForMedia())
-            return SWITCH_STATUS_FALSE;
-
-        if (!switch_channel_test_flag(m_fsChannel, CF_ANSWERED)) {
-            switch_channel_mark_answered(m_fsChannel);
-        }
-        break;
-
-    case SWITCH_MESSAGE_INDICATE_DEFLECT:
-        ownerCall.Transfer(msg->string_arg, GetOtherPartyConnection());
-        break;
-
-#if HAVE_T38
-    case SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA:
-      {
-        PTRACE(2, "mod_opal\tRequesting switch to T.38");
-        PSafePtr<OpalConnection> other = GetOtherPartyConnection();
-        if (other != NULL && other->SwitchFaxMediaStreams(true))
-            switch_channel_set_flag(m_fsChannel, CF_REQ_MEDIA);
-        else {
-            PTRACE(1, "mod_opal\tMode change request to T.38 failed");
-        }
-        break;
-      }
-
-    case SWITCH_MESSAGE_INDICATE_T38_DESCRIPTION:
-        PTRACE(2, "mod_opal\tSWITCH_MESSAGE_INDICATE_T38_DESCRIPTION");
-        break;
-
-    case SWITCH_MESSAGE_INDICATE_UDPTL_MODE:
-        PTRACE(2, "mod_opal\tSWITCH_MESSAGE_INDICATE_UDPTL_MODE");
-        m_udptl = true;
-        break;
-#endif // HAVE_T38
-
-    default:
-        PTRACE(3, "mod_opal\tReceived unhandled message " << msg->message_id << " on connection " << *this);
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-bool FSConnection::WaitForMedia()
-{
-    PTRACE(4, "mod_opal\tAwaiting media start on connection " << *this);
-    m_rxAudioOpened.Wait();
-    m_txAudioOpened.Wait();
-
-    if (IsReleased()) {
-        // Call got aborted
-        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(m_fsSession), SWITCH_LOG_ERROR, "Call abandoned!\n");
-        return false;
-    }
-
-    PTRACE(3, "mod_opal\tMedia started on connection " << *this);
-    return true;
-}
-
-
-#if HAVE_T38
-void FSConnection::SetT38OptionsFromMediaFormat(const OpalMediaFormat & mediaFormat, const char * varname)
-{
-    switch_t38_options_t *t38_options = (switch_t38_options_t *)switch_channel_get_private(m_fsChannel, varname);
-    if (t38_options == NULL)
-      t38_options = (switch_t38_options_t *)switch_core_session_alloc(m_fsSession, sizeof(switch_t38_options_t));
-
-    PString value;
-    mediaFormat.GetOptionValue("T38FaxRateManagement", value);
-    t38_options->T38FaxRateManagement = switch_core_session_strdup(m_fsSession, value);
-
-    mediaFormat.GetOptionValue("T38FaxUdpEC", value);
-    t38_options->T38FaxUdpEC = switch_core_session_strdup(m_fsSession, value);
-
-    t38_options->T38MaxBitRate = mediaFormat.GetOptionInteger("T38MaxBitRate", 9600);
-    t38_options->T38FaxMaxBuffer = mediaFormat.GetOptionInteger("T38FaxMaxBuffer", 2000);
-    t38_options->T38FaxMaxDatagram = mediaFormat.GetOptionInteger("T38FaxMaxDatagram", 528);
-
-    t38_options->T38FaxFillBitRemoval = mediaFormat.GetOptionBoolean("T38FaxFillBitRemoval") ? SWITCH_TRUE : SWITCH_FALSE;
-    t38_options->T38FaxTranscodingMMR = mediaFormat.GetOptionBoolean("T38FaxTranscodingMMR") ? SWITCH_TRUE : SWITCH_FALSE;
-    t38_options->T38FaxTranscodingJBIG = mediaFormat.GetOptionBoolean("T38FaxTranscodingJBIG") ? SWITCH_TRUE : SWITCH_FALSE;
-
-    t38_options->T38VendorInfo = switch_core_session_strdup(m_fsSession, mediaFormat.GetOptionString("T38VendorInfo"));
-
-    //t38_options->remote_ip = switch_core_session_strdup(session, mediaFormat.something);
-    //t38_options->remote_port = mediaFormat.something;
-
-    switch_channel_set_private(m_fsChannel, varname, t38_options);
-    PTRACE(3, "mod_opal\tSet " << varname);
-}
-
-
-void FSConnection::OnSwitchedT38(bool toT38, bool success)
-{
-    if (toT38 && success && IndicateSwitchedT38()) {
-        PTRACE(3, "mod_opal\tMode change request to T.38 succeeded");
-    }
-    else {
-        AbortT38();
-    }
-}
-
-
-void FSConnection::OnSwitchingT38(bool toT38)
-{
-    if (toT38 && IndicateSwitchedT38()) {
-        PTRACE(3, "mod_opal\tMode change request to T.38 started");
-    }
-    else {
-      AbortT38();
-    }
-}
-
-
-void FSConnection::AbortT38()
-{
-    PTRACE(3, "mod_opal\tMode change request to T.38 failed");
-    switch_channel_set_private(m_fsChannel, "t38_options", NULL);
-    switch_channel_clear_app_flag_key("T38", m_fsChannel, CF_APP_T38);
-    switch_channel_clear_app_flag_key("T38", m_fsChannel, CF_APP_T38_REQ);
-    switch_channel_set_app_flag_key("T38", m_fsChannel, CF_APP_T38_FAIL);
-}
-
-
-bool FSConnection::IndicateSwitchedT38()
-{
-    PSafePtr<OpalConnection> other = GetOtherPartyConnection();
-    if (other == NULL) {
-        PTRACE(3, "mod_opal\tCan't change to T.38, no other connection");
-        return false;
-    }
-
-    OpalMediaFormatList otherFormats = other->GetMediaFormats();
-    OpalMediaFormatList::const_iterator t38 = otherFormats.FindFormat(OpalT38);
-    if (t38 == otherFormats.end()) {
-        PTRACE(3, "mod_opal\tCan't change to T.38, no remote capability");
-        return false;
-    }
-
-    SetT38OptionsFromMediaFormat(*t38, "t38_options");
-
-    switch_channel_set_variable(m_fsChannel, "has_t38", "true");
-    switch_channel_set_app_flag_key("T38", m_fsChannel, CF_APP_T38);
-
-    switch_channel_execute_on(m_fsChannel, "opal_execute_on_t38");
-    switch_channel_api_on(m_fsChannel, "opal_api_on_t38");
-    return true;
-}
-#endif // HAVE_T38
-
-
-switch_status_t FSConnection::receive_event(switch_event_t *event)
-{
-    PTRACE(4, "mod_opal\tReceived event " << event->event_id << " on connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::state_change()
-{
-    PTRACE(4, "mod_opal\tState changed on connection " << *this);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::read_audio_frame(switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-    return read_frame(m_udptl ? OpalMediaType::Fax() : OpalMediaType::Audio(), frame, flags);
-}
-
-
-switch_status_t FSConnection::write_audio_frame(switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-    return write_frame(m_udptl ? OpalMediaType::Fax() : OpalMediaType::Audio(), frame, flags);
-}
-
-
-switch_status_t FSConnection::read_video_frame(switch_frame_t **frame, switch_io_flag_t flag, int stream_id)
-{
-    return read_frame(OpalMediaType::Video(), frame, flag);
-}
-
-
-switch_status_t FSConnection::write_video_frame(switch_frame_t *frame, switch_io_flag_t flag, int stream_id)
-{
-    return write_frame(OpalMediaType::Video(), frame, flag);
-}
-
-
-switch_status_t FSConnection::read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags)
-{
-    if (!ownerCall.IsSwitchingT38()) {
-        PSafePtr <FSMediaStream> stream = PSafePtrCast <OpalMediaStream, FSMediaStream>(GetMediaStream(mediaType, false));
-        if (stream != NULL)
-            return stream->read_frame(frame, flags);
-
-        PTRACE(2, "mod_opal\tNo stream for read of " << mediaType);
-    }
-
-    // Avoid all the channel closing and re-opening, especially with faxa switching, upsetting FS
-    *frame = &m_dummy_frame;
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSConnection::write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags)
-{
-    // Avoid all the channel closing and re-opening, especially with faxa switching, upsetting FS
-    if (ownerCall.IsSwitchingT38())
-      return SWITCH_STATUS_SUCCESS;
-
-    PSafePtr <FSMediaStream> stream = PSafePtrCast<OpalMediaStream, FSMediaStream>(GetMediaStream(mediaType, true));
-    if (stream != NULL)
-      return stream->write_frame(frame, flags);
-
-    PTRACE(2, "mod_opal\tNo stream for write of " << mediaType);
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-///////////////////////////////////////////////////////////////////////
-
-FSMediaStream::FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, unsigned sessionID, bool isSource)
-    : OpalMediaStream(conn, mediaFormat, sessionID, isSource)
-    , m_connection(conn)
-    , m_switchTimer(NULL)
-    , m_switchCodec(NULL)
-    , m_readRTP(0, SWITCH_RECOMMENDED_BUFFER_SIZE)
-{
-    memset(&m_readFrame, 0, sizeof(m_readFrame));
-}
-
-
-PBoolean FSMediaStream::Open()
-{
-    if (IsOpen()) {
-        return true;
-    }
-
-    switch_core_session_t *fsSession = m_connection.GetSession();
-    switch_channel_t *fsChannel = m_connection.GetChannel();
-    if (PAssertNULL(fsSession) == NULL || PAssertNULL(fsChannel) == NULL)
-        return false;
-
-    bool isAudio;
-    OpalMediaType mediaType = mediaFormat.GetMediaType();
-    if (mediaType == OpalMediaType::Audio())
-        isAudio = true;
-    else if (mediaType == OpalMediaType::Video())
-        isAudio = false;
-#if HAVE_T38
-    else if (mediaType == OpalMediaType::Fax()) {
-        m_readFrame.flags = SFF_UDPTL_PACKET|SFF_PROXY_PACKET;
-        return OpalMediaStream::Open();
-    }
-#endif
-    else {
-        PTRACE(1, "mod_opal\tUnsupported media type: " << mediaType);
-        return false;
-    }
-
-    int ptime = mediaFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption()) * mediaFormat.GetFrameTime() / mediaFormat.GetTimeUnits();
-
-    if (IsSink()) {
-        m_switchCodec = isAudio ? &m_connection.m_read_codec : &m_connection.m_vid_read_codec;
-        m_switchTimer = isAudio ? &m_connection.m_read_timer : &m_connection.m_vid_read_timer;
-        m_readFrame.codec = m_switchCodec;
-        m_readFrame.rate = mediaFormat.GetClockRate();
-    } else {
-        m_switchCodec = isAudio ? &m_connection.m_write_codec : &m_connection.m_vid_write_codec;
-    }
-
-    // The following is performed on two different instances of this object.
-    if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP
-                               mediaFormat.GetClockRate(), ptime, 1,  // Channels
-                               SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,   // Settings
-                               switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
-        // Could not select a codecs using negotiated frames/packet, so try using default.
-        if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP
-                                   mediaFormat.GetClockRate(), 0, 1,  // Channels
-                                   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,   // Settings
-                                   switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
-            PTRACE(1, "mod_opal\t" << switch_channel_get_name(fsChannel)
-                   << " cannot initialise " << (IsSink()? "read" : "write") << ' '
-                   << mediaType << " codec " << mediaFormat << " for connection " << *this);
-            switch_channel_hangup(fsChannel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
-            return false;
-        }
-        PTRACE(2, "mod_opal\t" << switch_channel_get_name(fsChannel)
-               << " unsupported ptime of " << ptime << " on " << (IsSink()? "read" : "write") << ' '
-               << mediaType << " codec " << mediaFormat << " for connection " << *this);
-    }
-
-    if (IsSink()) {
-        if (isAudio) {
-            switch_core_session_set_read_codec(fsSession, m_switchCodec);
-            if (switch_core_timer_init(m_switchTimer,
-                                       "soft",
-                                       m_switchCodec->implementation->microseconds_per_packet / 1000,
-                                       m_switchCodec->implementation->samples_per_packet,
-                                       switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
-                PTRACE(1, "mod_opal\t" << switch_channel_get_name(fsChannel)
-                       << " timer init failed on " << (IsSink()? "read" : "write") << ' '
-                       << mediaType << " codec " << mediaFormat << " for connection " << *this);
-                switch_core_codec_destroy(m_switchCodec);
-                m_switchCodec = NULL;
-                return false;
-            }
-        } else {
-            switch_core_session_set_video_read_codec(fsSession, m_switchCodec);
-            switch_channel_set_flag(fsChannel, CF_VIDEO);
-        }
-    } else {
-        if (isAudio) {
-            switch_core_session_set_write_codec(fsSession, m_switchCodec);
-        } else {
-            switch_core_session_set_video_write_codec(fsSession, m_switchCodec);
-            switch_channel_set_flag(fsChannel, CF_VIDEO);
-        }
-    }
-
-    PTRACE(3, "mod_opal\t" << switch_channel_get_name(fsChannel)
-           << " initialised " << (IsSink()? "read" : "write") << ' '
-           << mediaType << " codec " << mediaFormat << " for connection " << *this);
-
-    return OpalMediaStream::Open();
-}
-
-
-void FSMediaStream::InternalClose()
-{
-}
-
-
-PBoolean FSMediaStream::IsSynchronous() const
-{
-    return true;
-}
-
-
-PBoolean FSMediaStream::RequiresPatchThread(OpalMediaStream *) const
-{
-    return false;
-}
-
-
-int FSMediaStream::StartReadWrite(PatchPtr & mediaPatch) const
-{
-    if (!IsOpen()) {
-        PTRACE(1, "mod_opal\tNot open!");
-        return -1;
-    }
-
-    if (!m_connection.IsChannelReady()) {
-        PTRACE(1, "mod_opal\tChannel not ready!");
-        return -1;
-    }
-
-    // We make referenced copy of pointer so can't be deleted out from under us
-    mediaPatch = m_mediaPatch;
-    if (mediaPatch == NULL) {
-        /*There is a race here... sometimes we make it here and m_mediaPatch is NULL
-          if we wait it shows up in 1ms, maybe there is a better way to wait. */
-        PTRACE(2, "mod_opal\tPatch not ready!");
-        return 1;
-    }
-
-    return 0;
-}
-
-
-switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag_t flags)
-{
-    *frame = &m_readFrame;
-    m_readFrame.flags |= SFF_CNG;
-
-    PatchPtr mediaPatch;
-    switch (StartReadWrite(mediaPatch)) {
-      case -1 :
-        return SWITCH_STATUS_FALSE;
-      case 1 :
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-    if (m_connection.NeedFlushAudio()) {
-        mediaPatch->GetSource().EnableJitterBuffer(); // This flushes data and resets jitter buffer
-        m_readRTP.SetPayloadSize(0);
-    } else {
-        if (m_switchCodec != NULL) {
-            m_readRTP.SetTimestamp(m_readFrame.timestamp + m_switchCodec->implementation->samples_per_packet);
-        }
-
-        if (!mediaPatch->GetSource().ReadPacket(m_readRTP)) {
-            PTRACE(1, "mod_opal\tread_frame: no source data!");
-            return SWITCH_STATUS_FALSE;
-        }
-    }
-
-    if (m_switchTimer != NULL) {
-        switch_core_timer_next(m_switchTimer);
-    }
-
-    if (m_switchCodec != NULL) {
-        if (!switch_core_codec_ready(m_switchCodec)) {
-            PTRACE(1, "mod_opal\tread_frame: codec not ready!");
-            return SWITCH_STATUS_FALSE;
-        }
-    }
-
-    if (switch_test_flag(&m_readFrame, SFF_UDPTL_PACKET)) {
-        m_readFrame.flags    &= ~SFF_CNG;
-        m_readFrame.packet    = m_readRTP.GetPayloadPtr();
-        m_readFrame.packetlen = m_readRTP.GetPayloadSize();
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-    if (switch_test_flag(&m_readFrame, SFF_RAW_RTP)) {
-        m_readFrame.flags    &= ~SFF_CNG;
-        m_readFrame.packet    = m_readRTP.GetPointer();
-        m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readRTP.GetPayloadSize();
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-#if IMPLEMENT_MULTI_FAME_AUDIO
-    // Repackage frames in incoming packet to agree with what FS expects.
-    // Not implmented yet!!!!!!!!!
-    // Cheating and only supporting one frame per packet
-#endif
-
-    m_readFrame.buflen    = m_readRTP.GetSize();
-    m_readFrame.data      = m_readRTP.GetPayloadPtr();
-    m_readFrame.datalen   = m_readRTP.GetPayloadSize();
-    m_readFrame.timestamp = m_readRTP.GetTimestamp();
-    m_readFrame.seq       = m_readRTP.GetSequenceNumber();
-    m_readFrame.ssrc      = m_readRTP.GetSyncSource();
-    m_readFrame.m         = m_readRTP.GetMarker() ? SWITCH_TRUE : SWITCH_FALSE;
-    m_readFrame.payload   = (switch_payload_t)m_readRTP.GetPayloadType();
-
-    if (m_readFrame.datalen > 0 &&
-        m_readFrame.payload != RTP_DataFrame::CN &&
-        m_readFrame.payload != RTP_DataFrame::Cisco_CN) {
-        m_readFrame.flags &= ~SFF_CNG;
-    }
-
-    return SWITCH_STATUS_SUCCESS;
-}
-
-
-switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_io_flag_t flags)
-{
-    PatchPtr mediaPatch;
-    switch (StartReadWrite(mediaPatch)) {
-      case -1 :
-        return SWITCH_STATUS_FALSE;
-      case 1 :
-        return SWITCH_STATUS_SUCCESS;
-    }
-
-    RTP_DataFrame rtp;
-    if (switch_test_flag(frame, SFF_RAW_RTP)) {
-        rtp = RTP_DataFrame((const BYTE *)frame->packet, frame->packetlen, false);
-    }
-    else if (switch_test_flag(frame, SFF_UDPTL_PACKET)) {
-        rtp.SetPayloadSize(frame->packetlen);
-        memcpy(rtp.GetPayloadPtr(), frame->packet, frame->packetlen);
-    }
-    else {
-        rtp.SetPayloadSize(frame->datalen);
-        memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen);
-
-        rtp.SetPayloadType(mediaFormat.GetPayloadType());
-
-        /* Not sure what FS is going to give us!
-           Suspect it depends on the mod on the other side sending it. */
-        if (frame->timestamp != 0)
-            timestamp = frame->timestamp;
-        else if (frame->samples != 0)
-            timestamp += frame->samples;
-        else if (m_switchCodec != NULL)
-            timestamp += m_switchCodec->implementation->samples_per_packet;
-        rtp.SetTimestamp(timestamp);
-    }
-
-    if (mediaPatch->PushFrame(rtp))
-      return SWITCH_STATUS_SUCCESS;
-
-    PTRACE(1, "mod_opal\tread_frame: push failed!");
-    return SWITCH_STATUS_FALSE;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:nil
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:s:
- */
+/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library /
+ * Soft-Switch Application
+ *
+ * Version: MPL 1.1
+ *
+ * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com)
+ * Copyright (c) 2008-2012 Vox Lucida Pty. Ltd. (robertj@voxlucida.com.au)
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Contributor(s):
+ * Tuyan Ozipek   (tuyanozipek@gmail.com)
+ * Lukasz Zwierko (lzwierko@gmail.com)
+ * Robert Jongbloed (robertj@voxlucida.com.au)
+ *
+ */
+
+#include "mod_opal.h"
+#include <opal/patch.h>
+#include <rtp/rtp.h>
+#if PTLIB_CHECK_VERSION(2,11,1)
+#include <rtp/rtp_session.h>
+#endif
+#include <h323/h323pdu.h>
+#include <h323/gkclient.h>
+
+
+/* FreeSWITCH does not correctly handle an H.323 subtely, that is that a
+   MAXIMUM audio frames per packet is negotiated, and there is no
+   requirement for the remote to actually send that many. So, in say GSM, we
+   negotiate up to 3 frames or 60ms of data and the remote actually sends one
+   (20ms) frame per packet. Perfectly legal but blows up the media handling
+   in FS.
+
+   Eventually we will get around to bundling the packets, but not yet. This
+   compile flag will just force one frame/packet for all audio codecs.
+ */
+#define IMPLEMENT_MULTI_FAME_AUDIO 0
+
+
+static switch_call_cause_t create_outgoing_channel(switch_core_session_t   *session,
+                                                   switch_event_t          *var_event,
+                                                   switch_caller_profile_t *outbound_profile,
+                                                   switch_core_session_t  **new_session,
+                                                   switch_memory_pool_t   **pool,
+                                                   switch_originate_flag_t  flags,
+                                                   switch_call_cause_t     *cancel_cause);
+
+
+static FSProcess *opal_process = NULL;
+
+
+static PConstString const ModuleName("opal");
+static char const ConfigFile[] = "opal.conf";
+#define FS_PREFIX "fs"
+
+
+static switch_io_routines_t opalfs_io_routines = {
+    /*.outgoing_channel */ create_outgoing_channel,
+    /*.read_frame */ FSConnection::read_audio_frame,
+    /*.write_frame */ FSConnection::write_audio_frame,
+    /*.kill_channel */ FSConnection::kill_channel,
+    /*.send_dtmf */ FSConnection::send_dtmf,
+    /*.receive_message */ FSConnection::receive_message,
+    /*.receive_event */ FSConnection::receive_event,
+    /*.state_change */ FSConnection::state_change,
+    /*.read_video_frame */ FSConnection::read_video_frame,
+    /*.write_video_frame */ FSConnection::write_video_frame
+};
+
+static switch_state_handler_table_t opalfs_event_handlers = {
+    /*.on_init */ FSConnection::on_init,
+    /*.on_routing */ FSConnection::on_routing,
+    /*.on_execute */ FSConnection::on_execute,
+    /*.on_hangup */ FSConnection::on_hangup,
+    /*.on_exchange_media */ FSConnection::on_exchange_media,
+    /*.on_soft_execute */ FSConnection::on_soft_execute,
+    /*.on_consume_media*/ NULL,
+    /*.on_hibernate*/ NULL,
+    /*.on_reset*/ NULL,
+    /*.on_park*/ NULL,
+    /*.on_reporting*/ NULL,
+    /*.on_destroy*/ FSConnection::on_destroy
+};
+
+
+SWITCH_BEGIN_EXTERN_C
+/*******************************************************************************/
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown);
+SWITCH_MODULE_DEFINITION(mod_opal, mod_opal_load, mod_opal_shutdown, NULL);
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load)
+{
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Starting loading mod_opal\n");
+
+    /* Prevent the loading of OPAL codecs via "plug ins", this is a directory
+       full of DLLs that will be loaded automatically. */
+    (void)putenv((char *)"PTLIBPLUGINDIR=/no/thanks");
+
+
+    *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+    if (!*module_interface) {
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    opal_process = new FSProcess();
+    if (opal_process == NULL) {
+        return SWITCH_STATUS_MEMERR;
+    }
+
+    if (opal_process->Initialise(*module_interface)) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Opal manager initialized and running\n");
+        //unloading causes a seg in linux
+        //return SWITCH_STATUS_UNLOAD;
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    delete opal_process;
+    opal_process = NULL;
+    return SWITCH_STATUS_FALSE;
+}
+
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown)
+{
+    delete opal_process;
+    opal_process = NULL;
+    return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_END_EXTERN_C
+/*******************************************************************************/
+
+///////////////////////////////////////////////////////////////////////
+
+#if PTRACING
+
+class FSTrace : public std::ostream
+{
+private:
+  class Buffer : public std::stringbuf
+  {
+    virtual int sync()
+    {
+      std::string s = str();
+      if (s.empty())
+        return 0;
+
+      //Due to explicit setting of flags we know exactly what we are getting
+  #define THREAD_ID_INDEX 2
+  #define FILE_NAME_INDEX 3
+  #define FILE_LINE_INDEX 4
+#if PTLIB_CHECK_VERSION(2,11,1)
+  #define CONTEXT_ID_REGEX "([0-9]+|- - - - - - -)\t"
+  #define LOG_PRINTF_FORMAT "{%s,%s} %s"
+  #define FULL_TEXT_INDEX 6
+#else
+  #define CONTEXT_ID_REGEX
+  #define LOG_PRINTF_FORMAT "{%s} %s"
+  #define FULL_TEXT_INDEX 5
+#endif
+      PStringArray fields(7);
+      static PRegularExpression logRE("^([0-9]+)\t *(.+)\t *([^(]+)\\(([0-9]+)\\)\t"CONTEXT_ID_REGEX"(.*)",
+                                      PRegularExpression::Extended);
+      if (!logRE.Execute(s.c_str(), fields)) {
+        fields[1] = "4";
+        fields[THREAD_ID_INDEX] = "unknown";
+        fields[FILE_NAME_INDEX] = __FILE__;
+        fields[FILE_LINE_INDEX] = __LINE__;
+        fields[FULL_TEXT_INDEX] = s;
+      }
+
+      switch_log_level_t level;
+      switch (fields[1].AsUnsigned()) {
+        case 0 :
+          level = SWITCH_LOG_ALERT;
+          break;
+        case 1 :
+          level = SWITCH_LOG_ERROR;
+          break;
+        case 2 :
+          level = SWITCH_LOG_WARNING;
+          break;
+        case 3 :
+          level = SWITCH_LOG_INFO;
+          break;
+        default :
+          level = SWITCH_LOG_DEBUG;
+          break;
+      }
+
+      fields[4].Replace("\t", " ", true);
+#if PTLIB_CHECK_VERSION(2,11,1)
+      fields[5].Replace("- - - - - - -", "-"),
+#endif
+      switch_log_printf(SWITCH_CHANNEL_ID_LOG,
+                        fields[FILE_NAME_INDEX],
+                        "PTLib-OPAL",
+                        fields[FILE_LINE_INDEX].AsUnsigned(),
+                        NULL,
+                        level,
+                        LOG_PRINTF_FORMAT,
+                        fields[THREAD_ID_INDEX].GetPointer(),
+#if PTLIB_CHECK_VERSION(2,11,1)
+                        fields[5].GetPointer(),
+#endif
+                        fields[FULL_TEXT_INDEX].GetPointer());
+
+      // Reset string
+      str(std::string());
+      return 0;
+    }
+  } buffer;
+
+public:
+  FSTrace()
+    : ostream(&buffer)
+  {
+  }
+};
+
+#endif // PTRACING
+
+
+///////////////////////////////////////////////////////////////////////
+
+FSProcess::FSProcess()
+  : PLibraryProcess("Vox Lucida Pty. Ltd.", MODNAME, 1, 1, BetaCode, 1)
+  , m_manager(NULL)
+{
+}
+
+
+FSProcess::~FSProcess()
+{
+  delete m_manager;
+#if PTRACING
+    PTrace::SetStream(NULL); // This will delete the FSTrace object
+#endif
+}
+
+
+bool FSProcess::Initialise(switch_loadable_module_interface_t *iface)
+{
+    m_manager = new FSManager();
+    return m_manager != NULL && m_manager->Initialise(iface);
+}
+
+
+///////////////////////////////////////////////////////////////////////
+
+FSManager::FSManager()
+  : m_context("default")
+  , m_dialplan("XML")
+{
+    // These are deleted by the OpalManager class, no need to have destructor
+    m_h323ep = new H323EndPoint(*this);
+    m_iaxep = new IAX2EndPoint(*this);
+    m_fsep = new FSEndPoint(*this);
+}
+
+
+bool FSManager::Initialise(switch_loadable_module_interface_t *iface)
+{
+    ReadConfig(false);
+
+    m_FreeSwitch = (switch_endpoint_interface_t *) switch_loadable_module_create_interface(iface, SWITCH_ENDPOINT_INTERFACE);
+    m_FreeSwitch->interface_name = ModuleName;
+    m_FreeSwitch->io_routines = &opalfs_io_routines;
+    m_FreeSwitch->state_handler = &opalfs_event_handlers;
+
+    silenceDetectParams.m_mode = OpalSilenceDetector::NoSilenceDetection;
+
+    if (m_listeners.empty()) {
+        m_h323ep->StartListener("");
+    } else {
+        for (std::list < FSListener >::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it) {
+            if (!m_h323ep->StartListener(OpalTransportAddress(it->m_address, it->m_port))) {
+                PTRACE(2, "mod_opal\tCannot start listener for " << it->m_name);
+            }
+        }
+    }
+
+    AddRouteEntry("h323:.* = "FS_PREFIX":<da>");  // config option for direct routing
+    AddRouteEntry("iax2:.* = "FS_PREFIX":<da>");  // config option for direct routing
+    AddRouteEntry(FS_PREFIX":.* = h323:<da>");  // config option for direct routing
+
+    // Make sure all known codecs are instantiated,
+    // these are ones we know how to translate into H.323 capabilities
+    GetOpalG728();
+    GetOpalG729();
+    GetOpalG729A();
+    GetOpalG729B();
+    GetOpalG729AB();
+    GetOpalG7231_6k3();
+    GetOpalG7231_5k3();
+    GetOpalG7231A_6k3();
+    GetOpalG7231A_5k3();
+    GetOpalGSM0610();
+    GetOpalGSMAMR();
+    GetOpaliLBC();
+
+#if !IMPLEMENT_MULTI_FAME_AUDIO
+    OpalMediaFormatList allCodecs = OpalMediaFormat::GetAllRegisteredMediaFormats();
+    for (OpalMediaFormatList::iterator it = allCodecs.begin(); it != allCodecs.end(); ++it) {
+      if (it->GetMediaType() == OpalMediaType::Audio()) {
+        int ms_per_frame = it->GetFrameTime()/it->GetTimeUnits();
+        int frames_in_20_ms = (ms_per_frame+19)/ms_per_frame;
+        it->SetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption(), frames_in_20_ms);
+        it->SetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption(), frames_in_20_ms);
+        OpalMediaFormat::SetRegisteredMediaFormat(*it);
+        PTRACE(4, "mod_opal\tSet " << *it << " to " << frames_in_20_ms << "frames/packet");
+      }
+    }
+#endif // IMPLEMENT_MULTI_FAME_AUDIO
+
+    OpalMediaFormat t38 = OpalT38;
+    t38.SetOptionBoolean("UDPTL-Raw-Mode", true);
+    OpalMediaFormat::SetRegisteredMediaFormat(t38);
+
+    if (!m_gkAddress.IsEmpty()) {
+      if (m_h323ep->UseGatekeeper(m_gkAddress, m_gkIdentifer, m_gkInterface))
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Started gatekeeper: %s\n",
+                          (const char *)m_h323ep->GetGatekeeper()->GetName());
+      else
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+                          "Could not start gatekeeper: addr=\"%s\", id=\"%s\", if=\"%s\"\n",
+                          (const char *)m_gkAddress,
+                          (const char *)m_gkIdentifer,
+                          (const char *)m_gkInterface);
+    }
+
+    return TRUE;
+}
+
+
+switch_status_t FSManager::ReadConfig(int reload)
+{
+    switch_event_t *request_params = NULL;
+    switch_event_create(&request_params, SWITCH_EVENT_REQUEST_PARAMS);
+    switch_assert(request_params);
+    switch_event_add_header_string(request_params, SWITCH_STACK_BOTTOM, "profile", switch_str_nil(""));
+
+    switch_xml_t cfg;
+    switch_xml_t xml = switch_xml_open_cfg(ConfigFile, &cfg, request_params);
+    if (xml == NULL) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", ConfigFile);
+        return SWITCH_STATUS_FALSE;
+    }
+
+    switch_xml_t xmlSettings = switch_xml_child(cfg, "settings");
+    if (xmlSettings) {
+        for (switch_xml_t xmlParam = switch_xml_child(xmlSettings, "param"); xmlParam != NULL; xmlParam = xmlParam->next) {
+            PConstCaselessString const var(switch_xml_attr_soft(xmlParam, "name"));
+            PConstString const val(switch_xml_attr_soft(xmlParam, "value"));
+
+            if (var == "context") {
+                m_context = val;
+            } else if (var == "dialplan") {
+                m_dialplan = val;
+            } else if (var == "codec-prefs") {
+                m_codecPrefs = val;
+            } else if (var == "disable-transcoding") {
+                m_disableTranscoding = switch_true(val);
+            } else if (var == "dtmf-type") {
+                if (val == "string")
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsString);
+                else if (val == "signal")
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsTone);
+                else if (val == "rfc2833")
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsRFC2833);
+                else if (val == "in-band")
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputInBand);
+            } else if (var == "jitter-size") {
+                SetAudioJitterDelay(val.AsUnsigned(), val.Mid(val.Find(',')+1).AsUnsigned()); // In milliseconds
+            } else if (var == "gk-address") {
+                m_gkAddress = val;
+            } else if (var == "gk-identifer") {
+                m_gkIdentifer = val;
+            } else if (var == "gk-interface") {
+                m_gkInterface = val;
+#if PTRACING
+            } else if (var == "trace-level") {
+                unsigned level = val.AsUnsigned();
+                if (level > 0) {
+                    PTrace::SetLevel(level);
+                    PTrace::ClearOptions(0xffffffff); // Everything off
+                    PTrace::SetOptions(               // Except these
+                      PTrace::TraceLevel|PTrace::FileAndLine|PTrace::Thread
+#if PTLIB_CHECK_VERSION(2,11,1)
+                      |PTrace::ContextIdentifier
+#endif
+                    );
+                    PTrace::SetStream(new FSTrace);
+                }
+#endif
+            }
+        }
+    }
+
+    switch_xml_t xmlListeners = switch_xml_child(cfg, "listeners");
+    if (xmlListeners != NULL) {
+        for (switch_xml_t xmlListener = switch_xml_child(xmlListeners, "listener"); xmlListener != NULL; xmlListener = xmlListener->next) {
+
+            m_listeners.push_back(FSListener());
+            FSListener & listener = m_listeners.back();
+
+            listener.m_name = switch_xml_attr_soft(xmlListener, "name");
+            if (listener.m_name.IsEmpty())
+                listener.m_name = "unnamed";
+
+            for (switch_xml_t xmlParam = switch_xml_child(xmlListener, "param"); xmlParam != NULL; xmlParam = xmlParam->next) {
+                PConstCaselessString const var(switch_xml_attr_soft(xmlParam, "name"));
+                PConstString const val(switch_xml_attr_soft(xmlParam, "value"));
+                if (var == "h323-ip")
+                    listener.m_address = val;
+                else if (var == "h323-port")
+                    listener.m_port = (uint16_t)val.AsUnsigned();
+            }
+
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created Listener '%s'\n", (const char *) listener.m_name);
+        }
+    }
+
+    switch_event_destroy(&request_params);
+
+    if (xml)
+        switch_xml_free(xml);
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_call_cause_t create_outgoing_channel(switch_core_session_t   *session,
+                                                   switch_event_t          *var_event,
+                                                   switch_caller_profile_t *outbound_profile,
+                                                   switch_core_session_t  **new_session,
+                                                   switch_memory_pool_t   **pool,
+                                                   switch_originate_flag_t  flags,
+                                                   switch_call_cause_t     *cancel_cause)
+{
+    if (opal_process == NULL)
+      return SWITCH_CAUSE_CRASH;
+
+    FSConnection::outgoing_params params;
+    params.var_event        = var_event;
+    params.outbound_profile = outbound_profile;
+    params.new_session      = new_session;
+    params.pool             = pool;
+    params.flags            = flags;
+    params.cancel_cause     = cancel_cause;
+    params.fail_cause       = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
+
+    if (opal_process->GetManager().SetUpCall(FS_PREFIX":", outbound_profile->destination_number, &params) != NULL)
+        return SWITCH_CAUSE_SUCCESS;
+
+    if (*new_session != NULL)
+        switch_core_session_destroy(new_session);
+    return params.fail_cause;
+}
+
+
+///////////////////////////////////////////////////////////////////////
+
+FSEndPoint::FSEndPoint(FSManager & manager)
+  : OpalLocalEndPoint(manager, FS_PREFIX)
+  , m_manager(manager)
+{
+    PTRACE(4, "mod_opal\tFSEndPoint created.");
+}
+
+
+OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions* stringOptions)
+{
+    return new FSConnection(call, *this, options, stringOptions, (FSConnection::outgoing_params *)userData);
+}
+
+
+///////////////////////////////////////////////////////////////////////
+
+FSConnection::FSConnection(OpalCall & call,
+                           FSEndPoint & endpoint,
+                           unsigned options,
+                           OpalConnection::StringOptions* stringOptions,
+                           outgoing_params * params)
+  : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)
+  , m_endpoint(endpoint)
+  , m_fsSession(NULL)
+  , m_fsChannel(NULL)
+  , m_flushAudio(false)
+  , m_udptl(false)
+{
+    memset(&m_read_timer, 0, sizeof(m_read_timer));
+    memset(&m_read_codec, 0, sizeof(m_read_codec));
+    memset(&m_write_codec, 0, sizeof(m_write_codec));
+    memset(&m_vid_read_timer, 0, sizeof(m_vid_read_timer));
+    memset(&m_vid_read_codec, 0, sizeof(m_vid_read_codec));
+    memset(&m_vid_write_codec, 0, sizeof(m_vid_write_codec));
+    memset(&m_dummy_frame, 0, sizeof(m_dummy_frame));
+    m_dummy_frame.flags = SFF_CNG;
+
+    if (params != NULL) {
+        // If we fail, this is the cause
+        params->fail_cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+
+        if ((m_fsSession = switch_core_session_request(endpoint.GetManager().GetSwitchInterface(),
+                                      SWITCH_CALL_DIRECTION_OUTBOUND, params->flags, params->pool)) == NULL) {
+            PTRACE(1, "mod_opal\tCannot create session for outgoing call.");
+            return;
+        }
+    }
+    else {
+      if ((m_fsSession = switch_core_session_request(endpoint.GetManager().GetSwitchInterface(),
+                                                     SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) == NULL) {
+            PTRACE(1, "mod_opal\tCannot create session for incoming call.");
+            return;
+      }
+    }
+
+    if ((m_fsChannel = switch_core_session_get_channel(m_fsSession)) == NULL) {
+        switch_core_session_destroy(&m_fsSession);
+        return;
+    }
+
+    switch_core_session_set_private(m_fsSession, this);
+    SafeReference(); // Make sure cannot be deleted until on_destroy()
+
+    if (params != NULL) {
+        switch_caller_profile_t *caller_profile = switch_caller_profile_clone(m_fsSession, params->outbound_profile);
+        switch_channel_set_caller_profile(m_fsChannel, caller_profile);
+        SetLocalPartyName(caller_profile->caller_id_number);
+        SetDisplayName(caller_profile->caller_id_name);
+
+        *params->new_session = m_fsSession;
+    }
+
+    switch_channel_set_state(m_fsChannel, CS_INIT);
+}
+
+
+bool FSConnection::OnOutgoingSetUp()
+{
+    if (m_fsSession == NULL || m_fsChannel == NULL) {
+        PTRACE(1, "mod_opal\tSession request failed.");
+        return false;
+    }
+
+    // Transfer FS caller_id_number & caller_id_name from the FSConnection
+    // to the protocol connection (e.g. H.323) so gets sent correctly
+    // in outgoing packets
+    PSafePtr<OpalConnection> proto = GetOtherPartyConnection();
+    if (proto == NULL) {
+        PTRACE(1, "mod_opal\tNo protocol connection in call.");
+        return false;
+    }
+
+    proto->SetLocalPartyName(GetLocalPartyName());
+    proto->SetDisplayName(GetDisplayName());
+
+    switch_channel_set_name(m_fsChannel, ModuleName + '/' + GetRemotePartyURL());
+    return true;
+}
+
+
+bool FSConnection::OnIncoming()
+{
+    if (m_fsSession == NULL || m_fsChannel == NULL) {
+        PTRACE(1, "mod_opal\tSession request failed.");
+        return false;
+    }
+
+    switch_core_session_add_stream(m_fsSession, NULL);
+
+    PURL url = GetRemotePartyURL();
+    switch_caller_profile_t *caller_profile = switch_caller_profile_new(
+          switch_core_session_get_pool(m_fsSession),
+          url.GetUserName(),      /** username */
+          m_endpoint.GetManager().GetDialPlan(), /** dial plan */
+          GetRemotePartyName(),   /** caller_id_name */
+          GetRemotePartyNumber(), /** caller_id_number */
+          url.GetHostName(),      /** network addr */
+          NULL,                   /** ANI */
+          NULL,                   /** ANI II */
+          NULL,                   /** RDNIS */
+          ModuleName,             /** source */
+          m_endpoint.GetManager().GetContext(), /** set context  */
+          GetCalledPartyNumber()  /** destination_number */
+    );
+    if (caller_profile == NULL) {
+        PTRACE(1, "mod_opal\tCould not create caller profile");
+        return false;
+    }
+
+    PTRACE(4, "mod_opal\tCreated switch caller profile:\n"
+              "  username          = " << caller_profile->username << "\n"
+              "  dialplan          = " << caller_profile->dialplan << "\n"
+              "  caller_id_name    = " << caller_profile->caller_id_name << "\n"
+              "  caller_id_number  = " << caller_profile->caller_id_number << "\n"
+              "  network_addr      = " << caller_profile->network_addr << "\n"
+              "  source            = " << caller_profile->source << "\n"
+              "  context           = " << caller_profile->context << "\n"
+              "  destination_number= " << caller_profile->destination_number);
+    switch_channel_set_caller_profile(m_fsChannel, caller_profile);
+
+    switch_channel_set_name(m_fsChannel, ModuleName + '/' + url.GetScheme() + ':' + caller_profile->destination_number);
+
+    if (switch_core_session_thread_launch(m_fsSession) != SWITCH_STATUS_SUCCESS) {
+        PTRACE(1, "mod_opal\tCould not launch session thread");
+        switch_core_session_destroy(&m_fsSession);
+        m_fsChannel = NULL;
+        return false;
+    }
+
+    return true;
+}
+
+
+void FSConnection::OnEstablished()
+{
+  OpalLocalConnection::OnEstablished();
+
+  if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+    PTRACE(4, "mod_opal\tOnEstablished for outbound call, checking for media");
+    if (GetMediaStream(OpalMediaType::Audio(), true) != NULL && GetMediaStream(OpalMediaType::Audio(), false) != NULL) {
+      PTRACE(3, "mod_opal\tOnEstablished for outbound call, making call answered");
+      switch_channel_mark_answered(m_fsChannel);
+    }
+  }
+}
+
+
+void FSConnection::OnReleased()
+{
+    m_rxAudioOpened.Signal();   // Just in case
+    m_txAudioOpened.Signal();
+
+    if (m_fsChannel != NULL) {
+        PTRACE(3, "mod_opal\tHanging up FS side");
+        switch_channel_hangup(m_fsChannel, (switch_call_cause_t)callEndReason.q931);
+    }
+
+    OpalLocalConnection::OnReleased();
+}
+
+
+PBoolean FSConnection::SetAlerting(const PString & calleeName, PBoolean withMedia)
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return false;
+
+    switch_channel_mark_ring_ready(m_fsChannel);
+    return OpalLocalConnection::SetAlerting(calleeName, withMedia);
+}
+
+
+PBoolean FSConnection::SendUserInputTone(char tone, unsigned duration)
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return false;
+
+    switch_dtmf_t dtmf = { tone, duration };
+    PTRACE(4, "mod_opal\tSending DTMF to FS: tone=" << tone << ", duration=" << duration);
+    return switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS;
+}
+
+
+OpalMediaFormatList FSConnection::GetMediaFormats() const
+{
+    if (m_switchMediaFormats.IsEmpty()) {
+        const_cast<FSConnection *>(this)->SetCodecs();
+    }
+
+    return m_switchMediaFormats;
+}
+
+
+void FSConnection::SetCodecs()
+{
+    int numCodecs = 0;
+    const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS];
+
+    PString codec_string = switch_channel_get_variable(m_fsChannel, "absolute_codec_string");
+    if (codec_string.IsEmpty()) {
+        codec_string = switch_channel_get_variable(m_fsChannel, "codec_string");
+        if (codec_string.IsEmpty()) {
+            codec_string = m_endpoint.GetManager().GetCodecPrefs();
+            if (codec_string.IsEmpty()) {
+                numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0]));
+                for (int i = 0; i < numCodecs; i++) {
+                  if (i > 0)
+                    codec_string += ',';
+                  codec_string += codecs[i]->iananame;
+                }
+                PTRACE(4, "mod_opal\tDefault to all loaded codecs=" << codec_string);
+            }
+            else {
+                PTRACE(4, "mod_opal\tSettings codec-prefs=" << codec_string);
+            }
+        }
+        else {
+            PTRACE(4, "mod_opal\tChannel codec_string=" << codec_string);
+        }
+
+        PString orig_codec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE);
+        if (!orig_codec.IsEmpty()) {
+          if (m_endpoint.GetManager().GetDisableTranscoding()) {
+              codec_string = orig_codec;
+              PTRACE(4, "mod_opal\tNo transcoding, forced to originator codec=" << orig_codec);
+          }
+          else {
+              codec_string.Splice(orig_codec+',', 0);
+              PTRACE(4, "mod_opal\tSetting preference to originator codec=" << orig_codec);
+          }
+        }
+    }
+    else {
+        PTRACE(4, "mod_opal\tChannel absolute_codec_string=" << codec_string);
+    }
+
+    {
+        char *codec_order[SWITCH_MAX_CODECS];
+        int codec_order_last = switch_separate_string((char *)codec_string.GetPointer(), ',', codec_order, SWITCH_MAX_CODECS);
+        numCodecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, codec_order, codec_order_last);
+    }
+
+    for (int i = 0; i < numCodecs; i++) {
+        const switch_codec_implementation_t *codec = codecs[i];
+
+        // See if we have a match by PayloadType/rate/name
+        OpalMediaFormat switchFormat((RTP_DataFrame::PayloadTypes)codec->ianacode,
+                                     codec->samples_per_second,
+                                     codec->iananame);
+        if (!switchFormat.IsValid()) {
+            // See if we have a match by name alone
+            switchFormat = codec->iananame;
+            if (!switchFormat.IsValid()) {
+              PTRACE(2, "mod_opal\tCould not match FS codec "
+                     << codec->iananame << '@' << codec->samples_per_second
+                     << " (pt=" << (unsigned)codec->ianacode << ")"
+                        " to an OPAL media format.");
+              continue;
+            }
+        }
+
+        PTRACE(4, "mod_opal\tMatched FS codec " << codec->iananame << " to OPAL media format " << switchFormat);
+
+#if IMPLEMENT_MULTI_FAME_AUDIO
+        // Did we match or create a new media format?
+        if (switchFormat.IsValid() && codec->codec_type == SWITCH_CODEC_TYPE_AUDIO) {
+            // Calculate frames per packet, do not use codec->codec_frames_per_packet as that field
+            // has slightly different semantics when used in streamed codecs such as G.711
+            int fpp = codec->samples_per_packet/switchFormat.GetFrameTime();
+
+            /* Set the frames/packet to maximum of what is in the FS table. The OPAL negotiations will
+               drop the value from there. This might fail if there are "holes" in the FS table, e.g.
+               if for some reason G.723.1 has 30ms and 90ms but not 60ms, then the OPAL negotiations
+               could end up with 60ms and the codec cannot be created. The "holes" are unlikely in
+               all but streamed codecs such as G.711, where it is theoretically possible for OPAL to
+               come up with 32ms and there is only 30ms and 40ms in the FS table. We deem these
+               scenarios sufficiently rare that we can safely ignore them ... for now. */
+
+            if (fpp > switchFormat.GetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption())) {
+                switchFormat.SetOptionInteger(OpalAudioFormat::RxFramesPerPacketOption(), fpp);
+            }
+
+            if (fpp > switchFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption())) {
+                switchFormat.SetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption(), fpp);
+            }
+        }
+#endif // IMPLEMENT_MULTI_FAME_AUDIO
+
+        m_switchMediaFormats += switchFormat;
+    }
+
+#if HAVE_T38
+    OpalMediaFormat t38 = OpalT38;
+
+    /* We need to have a T.38 options for TCS, but may be before the
+       spandsp_mod has set it us. So, if not, we actually give to spandsp_mod. */
+    switch_t38_options_t *t38_options = (switch_t38_options_t *)switch_channel_get_private(m_fsChannel, "t38_options");
+    if (t38_options == NULL)
+      SetT38OptionsFromMediaFormat(t38, "_preconfigured_t38_options");
+    else {
+      t38.SetOptionInteger("T38FaxVersion", t38_options->T38FaxVersion);
+      t38.SetOptionInteger("T38MaxBitRate", t38_options->T38MaxBitRate);
+      t38.SetOptionBoolean("T38FaxFillBitRemoval", t38_options->T38FaxFillBitRemoval);
+      t38.SetOptionBoolean("T38FaxTranscodingMMR", t38_options->T38FaxTranscodingMMR);
+      t38.SetOptionBoolean("T38FaxTranscodingJBIG", t38_options->T38FaxTranscodingJBIG);
+      t38.SetOptionValue("T38FaxRateManagement", t38_options->T38FaxRateManagement);
+      t38.SetOptionInteger("T38Version", t38_options->T38FaxMaxBuffer);
+      t38.SetOptionInteger("T38Version", t38_options->T38FaxMaxDatagram);
+      t38.SetOptionValue("T38FaxUdpEC", t38_options->T38FaxUdpEC);
+    }
+
+    m_switchMediaFormats += t38;
+#endif // HAVE_T38
+}
+
+
+OpalMediaStream *FSConnection::CreateMediaStream(const OpalMediaFormat & mediaFormat, unsigned sessionID, PBoolean isSource)
+{
+    return new FSMediaStream(*this, mediaFormat, sessionID, isSource);
+}
+
+
+void FSConnection::OnPatchMediaStream(PBoolean isSource, OpalMediaPatch & patch)
+{
+    OpalConnection::OnPatchMediaStream(isSource, patch);
+
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return;
+
+    if (patch.GetSource().GetMediaFormat().GetMediaType() != OpalMediaType::Audio())
+        return;
+
+    if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_INBOUND) {
+        PTRACE(4, "mod_opal\tOnPatchMediaStream for inbound call, flagging media opened");
+        if (isSource)
+            m_rxAudioOpened.Signal();
+        else
+            m_txAudioOpened.Signal();
+    }
+    else {
+      PTRACE(4, "mod_opal\tOnPatchMediaStream for outbound call, checking media");
+      if (GetMediaStream(OpalMediaType::Audio(), !isSource) != NULL) {
+          // Have open media in both directions.
+          if (IsEstablished()) {
+              PTRACE(3, "mod_opal\tOnPatchMediaStream for outbound call, making call answered");
+              switch_channel_mark_answered(m_fsChannel);
+          }
+          else if (!IsReleased()) {
+              PTRACE(3, "mod_opal\tOnPatchMediaStream for outbound call, making call pre-answered");
+              switch_channel_mark_pre_answered(m_fsChannel);
+          }
+      }
+    }
+}
+
+
+switch_status_t FSConnection::on_init()
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return SWITCH_STATUS_FALSE;
+
+    PTRACE(4, "mod_opal\tStarted routing for connection " << *this);
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_routing()
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return SWITCH_STATUS_FALSE;
+
+    PTRACE(4, "mod_opal\tRouting connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_execute()
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return SWITCH_STATUS_FALSE;
+
+    PTRACE(4, "mod_opal\tExecuting connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_destroy()
+{
+    PTRACE(3, "mod_opal\tFS on_destroy for connection " << *this);
+
+    m_fsChannel = NULL; // Will be destroyed by FS, so don't use it any more.
+
+    switch_core_codec_destroy(&m_read_codec);
+    switch_core_codec_destroy(&m_write_codec);
+    switch_core_codec_destroy(&m_vid_read_codec);
+    switch_core_codec_destroy(&m_vid_write_codec);
+    switch_core_timer_destroy(&m_read_timer);
+    switch_core_timer_destroy(&m_vid_read_timer);
+
+    switch_core_session_set_private(m_fsSession, NULL);
+    SafeDereference();
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_hangup()
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return SWITCH_STATUS_FALSE;
+
+    /* if this is still here it was our idea to hangup not opal's */
+    ClearCallSynchronous(NULL, H323TranslateToCallEndReason(
+              (Q931::CauseValues)switch_channel_get_cause_q850(m_fsChannel), UINT_MAX));
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_exchange_media()
+{
+    PTRACE(4, "mod_opal\tExchanging media on connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::on_soft_execute()
+{
+    PTRACE(4, "mod_opal\tSoft execute on connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::kill_channel(int sig)
+{
+    switch (sig) {
+    case SWITCH_SIG_KILL:
+        PTRACE(4, "mod_opal\tSignal KILL received on connection " << *this);
+        m_rxAudioOpened.Signal();
+        m_txAudioOpened.Signal();
+        CloseMediaStreams();
+        break;
+
+    case SWITCH_SIG_BREAK:
+        PTRACE(4, "mod_opal\tSignal BREAK received on connection " << *this);
+        break;
+
+    default:
+        PTRACE(4, "mod_opal\tSignal " << sig << " received on connection " << *this);
+        break;
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::send_dtmf(const switch_dtmf_t *dtmf)
+{
+    PTRACE(4, "mod_opal\tReceived DTMF from FS: tone=" << dtmf->digit << ", duration=" << dtmf->duration);
+    OnUserInputTone(dtmf->digit, dtmf->duration);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::receive_message(switch_core_session_message_t *msg)
+{
+    if (PAssertNULL(m_fsChannel) == NULL)
+        return SWITCH_STATUS_FALSE;
+
+    switch (msg->message_id) {
+    case SWITCH_MESSAGE_INDICATE_RINGING:
+    case SWITCH_MESSAGE_INDICATE_PROGRESS:
+    case SWITCH_MESSAGE_INDICATE_ANSWER:
+    case SWITCH_MESSAGE_INDICATE_DEFLECT:
+        if (switch_channel_direction(m_fsChannel) == SWITCH_CALL_DIRECTION_INBOUND) {
+            switch_caller_profile_t * profile = switch_channel_get_caller_profile(m_fsChannel);
+            if (profile != NULL && profile->caller_extension != NULL)
+            {
+                PSafePtr<OpalConnection> other = GetOtherPartyConnection();
+                if (other != NULL) {
+                    other->SetLocalPartyName(profile->caller_extension->extension_number);
+                    other->SetDisplayName(profile->caller_extension->extension_name);
+                }
+                SetLocalPartyName(profile->caller_extension->extension_number);
+                SetDisplayName(profile->caller_extension->extension_name);
+            }
+        }
+        else {
+            return SWITCH_STATUS_FALSE;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    switch (msg->message_id) {
+    case SWITCH_MESSAGE_INDICATE_BRIDGE:
+    case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
+    case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
+        m_flushAudio = true;
+        break;
+
+    case SWITCH_MESSAGE_INDICATE_RINGING:
+        AlertingIncoming();
+        break;
+
+    case SWITCH_MESSAGE_INDICATE_PROGRESS:
+        AutoStartMediaStreams();
+        AlertingIncoming();
+
+        if (!WaitForMedia())
+            return SWITCH_STATUS_FALSE;
+
+        if (!switch_channel_test_flag(m_fsChannel, CF_EARLY_MEDIA)) {
+            switch_channel_mark_pre_answered(m_fsChannel);
+        }
+        break;
+
+    case SWITCH_MESSAGE_INDICATE_ANSWER:
+        AcceptIncoming();
+
+        if (!WaitForMedia())
+            return SWITCH_STATUS_FALSE;
+
+        if (!switch_channel_test_flag(m_fsChannel, CF_ANSWERED)) {
+            switch_channel_mark_answered(m_fsChannel);
+        }
+        break;
+
+    case SWITCH_MESSAGE_INDICATE_DEFLECT:
+        ownerCall.Transfer(msg->string_arg, GetOtherPartyConnection());
+        break;
+
+#if HAVE_T38
+    case SWITCH_MESSAGE_INDICATE_REQUEST_IMAGE_MEDIA:
+      {
+        PTRACE(2, "mod_opal\tRequesting switch to T.38");
+        PSafePtr<OpalConnection> other = GetOtherPartyConnection();
+        if (other != NULL && other->SwitchFaxMediaStreams(true))
+            switch_channel_set_flag(m_fsChannel, CF_REQ_MEDIA);
+        else {
+            PTRACE(1, "mod_opal\tMode change request to T.38 failed");
+        }
+        break;
+      }
+
+    case SWITCH_MESSAGE_INDICATE_T38_DESCRIPTION:
+        PTRACE(2, "mod_opal\tSWITCH_MESSAGE_INDICATE_T38_DESCRIPTION");
+        break;
+
+    case SWITCH_MESSAGE_INDICATE_UDPTL_MODE:
+        PTRACE(2, "mod_opal\tSWITCH_MESSAGE_INDICATE_UDPTL_MODE");
+        m_udptl = true;
+        break;
+#endif // HAVE_T38
+
+    default:
+        PTRACE(3, "mod_opal\tReceived unhandled message " << msg->message_id << " on connection " << *this);
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+bool FSConnection::WaitForMedia()
+{
+    PTRACE(4, "mod_opal\tAwaiting media start on connection " << *this);
+    m_rxAudioOpened.Wait();
+    m_txAudioOpened.Wait();
+
+    if (IsReleased()) {
+        // Call got aborted
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(m_fsSession), SWITCH_LOG_ERROR, "Call abandoned!\n");
+        return false;
+    }
+
+    PTRACE(3, "mod_opal\tMedia started on connection " << *this);
+    return true;
+}
+
+
+#if HAVE_T38
+void FSConnection::SetT38OptionsFromMediaFormat(const OpalMediaFormat & mediaFormat, const char * varname)
+{
+    switch_t38_options_t *t38_options = (switch_t38_options_t *)switch_channel_get_private(m_fsChannel, varname);
+    if (t38_options == NULL)
+      t38_options = (switch_t38_options_t *)switch_core_session_alloc(m_fsSession, sizeof(switch_t38_options_t));
+
+    PString value;
+    mediaFormat.GetOptionValue("T38FaxRateManagement", value);
+    t38_options->T38FaxRateManagement = switch_core_session_strdup(m_fsSession, value);
+
+    mediaFormat.GetOptionValue("T38FaxUdpEC", value);
+    t38_options->T38FaxUdpEC = switch_core_session_strdup(m_fsSession, value);
+
+    t38_options->T38MaxBitRate = mediaFormat.GetOptionInteger("T38MaxBitRate", 9600);
+    t38_options->T38FaxMaxBuffer = mediaFormat.GetOptionInteger("T38FaxMaxBuffer", 2000);
+    t38_options->T38FaxMaxDatagram = mediaFormat.GetOptionInteger("T38FaxMaxDatagram", 528);
+
+    t38_options->T38FaxFillBitRemoval = mediaFormat.GetOptionBoolean("T38FaxFillBitRemoval") ? SWITCH_TRUE : SWITCH_FALSE;
+    t38_options->T38FaxTranscodingMMR = mediaFormat.GetOptionBoolean("T38FaxTranscodingMMR") ? SWITCH_TRUE : SWITCH_FALSE;
+    t38_options->T38FaxTranscodingJBIG = mediaFormat.GetOptionBoolean("T38FaxTranscodingJBIG") ? SWITCH_TRUE : SWITCH_FALSE;
+
+    t38_options->T38VendorInfo = switch_core_session_strdup(m_fsSession, mediaFormat.GetOptionString("T38VendorInfo"));
+
+    //t38_options->remote_ip = switch_core_session_strdup(session, mediaFormat.something);
+    //t38_options->remote_port = mediaFormat.something;
+
+    switch_channel_set_private(m_fsChannel, varname, t38_options);
+    PTRACE(3, "mod_opal\tSet " << varname);
+}
+
+
+void FSConnection::OnSwitchedT38(bool toT38, bool success)
+{
+    if (toT38 && success && IndicateSwitchedT38()) {
+        PTRACE(3, "mod_opal\tMode change request to T.38 succeeded");
+    }
+    else {
+        AbortT38();
+    }
+}
+
+
+void FSConnection::OnSwitchingT38(bool toT38)
+{
+    if (toT38 && IndicateSwitchedT38()) {
+        PTRACE(3, "mod_opal\tMode change request to T.38 started");
+    }
+    else {
+      AbortT38();
+    }
+}
+
+
+void FSConnection::AbortT38()
+{
+    PTRACE(3, "mod_opal\tMode change request to T.38 failed");
+    switch_channel_set_private(m_fsChannel, "t38_options", NULL);
+    switch_channel_clear_app_flag_key("T38", m_fsChannel, CF_APP_T38);
+    switch_channel_clear_app_flag_key("T38", m_fsChannel, CF_APP_T38_REQ);
+    switch_channel_set_app_flag_key("T38", m_fsChannel, CF_APP_T38_FAIL);
+}
+
+
+bool FSConnection::IndicateSwitchedT38()
+{
+    PSafePtr<OpalConnection> other = GetOtherPartyConnection();
+    if (other == NULL) {
+        PTRACE(3, "mod_opal\tCan't change to T.38, no other connection");
+        return false;
+    }
+
+    OpalMediaFormatList otherFormats = other->GetMediaFormats();
+    OpalMediaFormatList::const_iterator t38 = otherFormats.FindFormat(OpalT38);
+    if (t38 == otherFormats.end()) {
+        PTRACE(3, "mod_opal\tCan't change to T.38, no remote capability");
+        return false;
+    }
+
+    SetT38OptionsFromMediaFormat(*t38, "t38_options");
+
+    switch_channel_set_variable(m_fsChannel, "has_t38", "true");
+    switch_channel_set_app_flag_key("T38", m_fsChannel, CF_APP_T38);
+
+    switch_channel_execute_on(m_fsChannel, "opal_execute_on_t38");
+    switch_channel_api_on(m_fsChannel, "opal_api_on_t38");
+    return true;
+}
+#endif // HAVE_T38
+
+
+switch_status_t FSConnection::receive_event(switch_event_t *event)
+{
+    PTRACE(4, "mod_opal\tReceived event " << event->event_id << " on connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::state_change()
+{
+    PTRACE(4, "mod_opal\tState changed on connection " << *this);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::read_audio_frame(switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
+{
+    return read_frame(m_udptl ? OpalMediaType::Fax() : OpalMediaType::Audio(), frame, flags);
+}
+
+
+switch_status_t FSConnection::write_audio_frame(switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
+{
+    return write_frame(m_udptl ? OpalMediaType::Fax() : OpalMediaType::Audio(), frame, flags);
+}
+
+
+switch_status_t FSConnection::read_video_frame(switch_frame_t **frame, switch_io_flag_t flag, int stream_id)
+{
+    return read_frame(OpalMediaType::Video(), frame, flag);
+}
+
+
+switch_status_t FSConnection::write_video_frame(switch_frame_t *frame, switch_io_flag_t flag, int stream_id)
+{
+    return write_frame(OpalMediaType::Video(), frame, flag);
+}
+
+
+switch_status_t FSConnection::read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags)
+{
+    if (!ownerCall.IsSwitchingT38()) {
+        PSafePtr <FSMediaStream> stream = PSafePtrCast <OpalMediaStream, FSMediaStream>(GetMediaStream(mediaType, false));
+        if (stream != NULL)
+            return stream->read_frame(frame, flags);
+
+        PTRACE(2, "mod_opal\tNo stream for read of " << mediaType);
+    }
+
+    // Avoid all the channel closing and re-opening, especially with faxa switching, upsetting FS
+    *frame = &m_dummy_frame;
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSConnection::write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags)
+{
+    // Avoid all the channel closing and re-opening, especially with faxa switching, upsetting FS
+    if (ownerCall.IsSwitchingT38())
+      return SWITCH_STATUS_SUCCESS;
+
+    PSafePtr <FSMediaStream> stream = PSafePtrCast<OpalMediaStream, FSMediaStream>(GetMediaStream(mediaType, true));
+    if (stream != NULL)
+      return stream->write_frame(frame, flags);
+
+    PTRACE(2, "mod_opal\tNo stream for write of " << mediaType);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+///////////////////////////////////////////////////////////////////////
+
+FSMediaStream::FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, unsigned sessionID, bool isSource)
+    : OpalMediaStream(conn, mediaFormat, sessionID, isSource)
+    , m_connection(conn)
+    , m_switchTimer(NULL)
+    , m_switchCodec(NULL)
+    , m_readRTP(0, SWITCH_RECOMMENDED_BUFFER_SIZE)
+{
+    memset(&m_readFrame, 0, sizeof(m_readFrame));
+}
+
+
+PBoolean FSMediaStream::Open()
+{
+    if (IsOpen()) {
+        return true;
+    }
+
+    switch_core_session_t *fsSession = m_connection.GetSession();
+    switch_channel_t *fsChannel = m_connection.GetChannel();
+    if (PAssertNULL(fsSession) == NULL || PAssertNULL(fsChannel) == NULL)
+        return false;
+
+    bool isAudio;
+    OpalMediaType mediaType = mediaFormat.GetMediaType();
+    if (mediaType == OpalMediaType::Audio())
+        isAudio = true;
+    else if (mediaType == OpalMediaType::Video())
+        isAudio = false;
+#if HAVE_T38
+    else if (mediaType == OpalMediaType::Fax()) {
+        m_readFrame.flags = SFF_UDPTL_PACKET|SFF_PROXY_PACKET;
+        return OpalMediaStream::Open();
+    }
+#endif
+    else {
+        PTRACE(1, "mod_opal\tUnsupported media type: " << mediaType);
+        return false;
+    }
+
+    int ptime = mediaFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption()) * mediaFormat.GetFrameTime() / mediaFormat.GetTimeUnits();
+
+    if (IsSink()) {
+        m_switchCodec = isAudio ? &m_connection.m_read_codec : &m_connection.m_vid_read_codec;
+        m_switchTimer = isAudio ? &m_connection.m_read_timer : &m_connection.m_vid_read_timer;
+        m_readFrame.codec = m_switchCodec;
+        m_readFrame.rate = mediaFormat.GetClockRate();
+    } else {
+        m_switchCodec = isAudio ? &m_connection.m_write_codec : &m_connection.m_vid_write_codec;
+    }
+
+    // The following is performed on two different instances of this object.
+    if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP
+                               mediaFormat.GetClockRate(), ptime, 1,  // Channels
+                               SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,   // Settings
+                               switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
+        // Could not select a codecs using negotiated frames/packet, so try using default.
+        if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP
+                                   mediaFormat.GetClockRate(), 0, 1,  // Channels
+                                   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,   // Settings
+                                   switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
+            PTRACE(1, "mod_opal\t" << switch_channel_get_name(fsChannel)
+                   << " cannot initialise " << (IsSink()? "read" : "write") << ' '
+                   << mediaType << " codec " << mediaFormat << " for connection " << *this);
+            switch_channel_hangup(fsChannel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
+            return false;
+        }
+        PTRACE(2, "mod_opal\t" << switch_channel_get_name(fsChannel)
+               << " unsupported ptime of " << ptime << " on " << (IsSink()? "read" : "write") << ' '
+               << mediaType << " codec " << mediaFormat << " for connection " << *this);
+    }
+
+    if (IsSink()) {
+        if (isAudio) {
+            switch_core_session_set_read_codec(fsSession, m_switchCodec);
+            if (switch_core_timer_init(m_switchTimer,
+                                       "soft",
+                                       m_switchCodec->implementation->microseconds_per_packet / 1000,
+                                       m_switchCodec->implementation->samples_per_packet,
+                                       switch_core_session_get_pool(fsSession)) != SWITCH_STATUS_SUCCESS) {
+                PTRACE(1, "mod_opal\t" << switch_channel_get_name(fsChannel)
+                       << " timer init failed on " << (IsSink()? "read" : "write") << ' '
+                       << mediaType << " codec " << mediaFormat << " for connection " << *this);
+                switch_core_codec_destroy(m_switchCodec);
+                m_switchCodec = NULL;
+                return false;
+            }
+        } else {
+            switch_core_session_set_video_read_codec(fsSession, m_switchCodec);
+            switch_channel_set_flag(fsChannel, CF_VIDEO);
+        }
+    } else {
+        if (isAudio) {
+            switch_core_session_set_write_codec(fsSession, m_switchCodec);
+        } else {
+            switch_core_session_set_video_write_codec(fsSession, m_switchCodec);
+            switch_channel_set_flag(fsChannel, CF_VIDEO);
+        }
+    }
+
+    PTRACE(3, "mod_opal\t" << switch_channel_get_name(fsChannel)
+           << " initialised " << (IsSink()? "read" : "write") << ' '
+           << mediaType << " codec " << mediaFormat << " for connection " << *this);
+
+    return OpalMediaStream::Open();
+}
+
+
+void FSMediaStream::InternalClose()
+{
+}
+
+
+PBoolean FSMediaStream::IsSynchronous() const
+{
+    return true;
+}
+
+
+PBoolean FSMediaStream::RequiresPatchThread(OpalMediaStream *) const
+{
+    return false;
+}
+
+
+int FSMediaStream::StartReadWrite(PatchPtr & mediaPatch) const
+{
+    if (!IsOpen()) {
+        PTRACE(1, "mod_opal\tNot open!");
+        return -1;
+    }
+
+    if (!m_connection.IsChannelReady()) {
+        PTRACE(1, "mod_opal\tChannel not ready!");
+        return -1;
+    }
+
+    // We make referenced copy of pointer so can't be deleted out from under us
+    mediaPatch = m_mediaPatch;
+    if (mediaPatch == NULL) {
+        /*There is a race here... sometimes we make it here and m_mediaPatch is NULL
+          if we wait it shows up in 1ms, maybe there is a better way to wait. */
+        PTRACE(2, "mod_opal\tPatch not ready!");
+        return 1;
+    }
+
+    return 0;
+}
+
+
+switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag_t flags)
+{
+    *frame = &m_readFrame;
+    m_readFrame.flags |= SFF_CNG;
+
+    PatchPtr mediaPatch;
+    switch (StartReadWrite(mediaPatch)) {
+      case -1 :
+        return SWITCH_STATUS_FALSE;
+      case 1 :
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    if (m_connection.NeedFlushAudio()) {
+        mediaPatch->GetSource().EnableJitterBuffer(); // This flushes data and resets jitter buffer
+        m_readRTP.SetPayloadSize(0);
+    } else {
+        if (m_switchCodec != NULL) {
+            m_readRTP.SetTimestamp(m_readFrame.timestamp + m_switchCodec->implementation->samples_per_packet);
+        }
+
+        if (!mediaPatch->GetSource().ReadPacket(m_readRTP)) {
+            PTRACE(1, "mod_opal\tread_frame: no source data!");
+            return SWITCH_STATUS_FALSE;
+        }
+    }
+
+    if (m_switchTimer != NULL) {
+        switch_core_timer_next(m_switchTimer);
+    }
+
+    if (m_switchCodec != NULL) {
+        if (!switch_core_codec_ready(m_switchCodec)) {
+            PTRACE(1, "mod_opal\tread_frame: codec not ready!");
+            return SWITCH_STATUS_FALSE;
+        }
+    }
+
+    if (switch_test_flag(&m_readFrame, SFF_UDPTL_PACKET)) {
+        m_readFrame.flags    &= ~SFF_CNG;
+        m_readFrame.packet    = m_readRTP.GetPayloadPtr();
+        m_readFrame.packetlen = m_readRTP.GetPayloadSize();
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    if (switch_test_flag(&m_readFrame, SFF_RAW_RTP)) {
+        m_readFrame.flags    &= ~SFF_CNG;
+        m_readFrame.packet    = m_readRTP.GetPointer();
+        m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readRTP.GetPayloadSize();
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+#if IMPLEMENT_MULTI_FAME_AUDIO
+    // Repackage frames in incoming packet to agree with what FS expects.
+    // Not implmented yet!!!!!!!!!
+    // Cheating and only supporting one frame per packet
+#endif
+
+    m_readFrame.buflen    = m_readRTP.GetSize();
+    m_readFrame.data      = m_readRTP.GetPayloadPtr();
+    m_readFrame.datalen   = m_readRTP.GetPayloadSize();
+    m_readFrame.timestamp = m_readRTP.GetTimestamp();
+    m_readFrame.seq       = m_readRTP.GetSequenceNumber();
+    m_readFrame.ssrc      = m_readRTP.GetSyncSource();
+    m_readFrame.m         = m_readRTP.GetMarker() ? SWITCH_TRUE : SWITCH_FALSE;
+    m_readFrame.payload   = (switch_payload_t)m_readRTP.GetPayloadType();
+
+    if (m_readFrame.datalen > 0 &&
+        m_readFrame.payload != RTP_DataFrame::CN &&
+        m_readFrame.payload != RTP_DataFrame::Cisco_CN) {
+        m_readFrame.flags &= ~SFF_CNG;
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
+switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_io_flag_t flags)
+{
+    PatchPtr mediaPatch;
+    switch (StartReadWrite(mediaPatch)) {
+      case -1 :
+        return SWITCH_STATUS_FALSE;
+      case 1 :
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+    RTP_DataFrame rtp;
+    if (switch_test_flag(frame, SFF_RAW_RTP)) {
+        rtp = RTP_DataFrame((const BYTE *)frame->packet, frame->packetlen, false);
+    }
+    else if (switch_test_flag(frame, SFF_UDPTL_PACKET)) {
+        rtp.SetPayloadSize(frame->packetlen);
+        memcpy(rtp.GetPayloadPtr(), frame->packet, frame->packetlen);
+    }
+    else {
+        rtp.SetPayloadSize(frame->datalen);
+        memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen);
+
+        rtp.SetPayloadType(mediaFormat.GetPayloadType());
+
+        /* Not sure what FS is going to give us!
+           Suspect it depends on the mod on the other side sending it. */
+        if (frame->timestamp != 0)
+            timestamp = frame->timestamp;
+        else if (frame->samples != 0)
+            timestamp += frame->samples;
+        else if (m_switchCodec != NULL)
+            timestamp += m_switchCodec->implementation->samples_per_packet;
+        rtp.SetTimestamp(timestamp);
+    }
+
+    if (mediaPatch->PushFrame(rtp))
+      return SWITCH_STATUS_SUCCESS;
+
+    PTRACE(1, "mod_opal\tread_frame: push failed!");
+    return SWITCH_STATUS_FALSE;
+}
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:nil
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:s:
+ */
diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h
index 4b0cd62a02..4ee10910ee 100644
--- a/src/mod/endpoints/mod_opal/mod_opal.h
+++ b/src/mod/endpoints/mod_opal/mod_opal.h
@@ -1,331 +1,331 @@
-/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library /
- * Soft-Switch Application
- *
- * Version: MPL 1.1
- *
- * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com)
- * Copyright (c) 2008-2012 Vox Lucida Pty. Ltd. (robertj@voxlucida.com.au)
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Contributor(s):
- * Tuyan Ozipek   (tuyanozipek@gmail.com)
- * Lukasz Zwierko (lzwierko@gmail.com)
- * Robert Jongbloed (robertj@voxlucida.com.au)
- *
- */
-
-
-#ifndef __FREESWITCH_MOD_OPAL__
-#define __FREESWITCH_MOD_OPAL__
-
-#if defined(__GNUC__) && defined(HAVE_VISIBILITY)
-#pragma GCC visibility push(default)
-#endif
-
-#include <ptlib.h>
-#include <opal/manager.h>
-
-#ifndef OPAL_CHECK_VERSION
-  #define OPAL_CHECK_VERSION(a,b,c) 0
-#endif
-
-#if !OPAL_CHECK_VERSION(3,12,8)
-  #error OPAL is too old to use, must be >= 2.12.8
-#endif
-
-#include <ep/localep.h>
-#include <h323/h323ep.h>
-#include <iax2/iax2ep.h>
-
-#if defined(__GNUC__) && defined(HAVE_VISIBILITY)
-#pragma GCC visibility pop
-#endif
-
-#undef strcasecmp
-#undef strncasecmp
-
-#include <switch.h>
-
-#define MODNAME "mod_opal"
-
-#define HAVE_T38 OPAL_T38_CAPABILITY
-
-
-
-class FSEndPoint;
-class FSManager;
-
-
-class FSProcess : public PLibraryProcess
-{
-    PCLASSINFO(FSProcess, PLibraryProcess);
-  public:
-    FSProcess();
-    ~FSProcess();
-
-    bool Initialise(switch_loadable_module_interface_t *iface);
-
-    FSManager & GetManager() const
-    {
-        return *m_manager;
-    }
-
-  protected:
-    FSManager * m_manager;
-};
-
-
-struct FSListener
-{
-    FSListener() : m_port(H323EndPoint::DefaultTcpSignalPort) { }
-
-    PString            m_name;
-    PIPSocket::Address m_address;
-    uint16_t           m_port;
-};
-
-
-class FSManager : public OpalManager
-{
-    PCLASSINFO(FSManager, OpalManager);
-
-  public:
-    FSManager();
-
-    bool Initialise(switch_loadable_module_interface_t *iface);
-
-    switch_status_t ReadConfig(int reload);
-
-    switch_endpoint_interface_t *GetSwitchInterface() const { return m_FreeSwitch; }
-    const PString & GetContext() const { return m_context; }
-    const PString & GetDialPlan() const { return m_dialplan; }
-    const PString & GetCodecPrefs() const { return m_codecPrefs; }
-    bool GetDisableTranscoding() const { return m_disableTranscoding; }
-
-  private:
-    switch_endpoint_interface_t *m_FreeSwitch;
-
-    H323EndPoint *m_h323ep;
-    IAX2EndPoint *m_iaxep;
-    FSEndPoint   *m_fsep;
-
-    PString m_context;
-    PString m_dialplan;
-    PString m_codecPrefs;
-    bool    m_disableTranscoding;
-    PString m_gkAddress;
-    PString m_gkIdentifer;
-    PString m_gkInterface;
-
-    list <FSListener> m_listeners;
-};
-
-
-class FSEndPoint : public OpalLocalEndPoint
-{
-    PCLASSINFO(FSEndPoint, OpalLocalEndPoint);
-  public:
-    FSEndPoint(FSManager & manager);
-
-    virtual OpalLocalConnection *CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions * stringOptions);
-
-    FSManager & GetManager() const { return m_manager; }
-
-  protected:
-    FSManager & m_manager;
-};
-
-
-class FSConnection;
-
-
-class FSMediaStream : public OpalMediaStream
-{
-    PCLASSINFO(FSMediaStream, OpalMediaStream);
-  public:
-    FSMediaStream(
-      FSConnection & conn,
-      const OpalMediaFormat & mediaFormat,    ///<  Media format for stream
-      unsigned sessionID,    ///<  Session number for stream
-      bool isSource    ///<  Is a source stream
-    );
-
-    virtual PBoolean Open();
-    virtual PBoolean IsSynchronous() const;
-    virtual PBoolean RequiresPatchThread(OpalMediaStream *) const;
-
-    switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags);
-    switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags);
-
-  protected:
-    virtual void InternalClose();
-    int StartReadWrite(PatchPtr & mediaPatch) const;
-
-  private:
-    bool CheckPatchAndLock();
-
-    FSConnection          &m_connection;
-    switch_timer_t        *m_switchTimer;
-    switch_codec_t        *m_switchCodec;
-    switch_frame_t         m_readFrame;
-    RTP_DataFrame          m_readRTP;
-};
-
-
-#define DECLARE_CALLBACK0(name)                           \
-    static switch_status_t name(switch_core_session_t *session) {       \
-        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
-        return tech_pvt != NULL ? tech_pvt->name() : SWITCH_STATUS_FALSE; } \
-    switch_status_t name()
-
-#define DECLARE_CALLBACK1(name, type1, name1)                           \
-    static switch_status_t name(switch_core_session_t *session, type1 name1) { \
-        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
-        return tech_pvt != NULL ? tech_pvt->name(name1) : SWITCH_STATUS_FALSE; } \
-    switch_status_t name(type1 name1)
-
-#define DECLARE_CALLBACK3(name, type1, name1, type2, name2, type3, name3) \
-    static switch_status_t name(switch_core_session_t *session, type1 name1, type2 name2, type3 name3) { \
-        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
-        return tech_pvt != NULL ? tech_pvt->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \
-    switch_status_t name(type1 name1, type2 name2, type3 name3)
-
-
-
-
-class FSConnection : public OpalLocalConnection
-{
-    PCLASSINFO(FSConnection, OpalLocalConnection)
-
-  public:
-    struct outgoing_params {
-      switch_event_t          *var_event;
-      switch_caller_profile_t *outbound_profile;
-      switch_core_session_t  **new_session;
-      switch_memory_pool_t   **pool;
-      switch_originate_flag_t  flags;
-      switch_call_cause_t     *cancel_cause;
-      switch_call_cause_t      fail_cause;
-    };
-
-    FSConnection(OpalCall & call,
-                 FSEndPoint & endpoint,
-                 unsigned options,
-                 OpalConnection::StringOptions * stringOptions,
-                 outgoing_params * params);
-
-    virtual bool OnOutgoingSetUp();
-    virtual bool OnIncoming();
-    virtual void OnEstablished();
-    virtual void OnReleased();
-    virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia);
-    virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean);
-    virtual void OnPatchMediaStream(PBoolean isSource, OpalMediaPatch & patch);
-    virtual OpalMediaFormatList GetMediaFormats() const;
-    virtual PBoolean SendUserInputTone(char tone, unsigned duration);
-#if HAVE_T38
-    virtual void OnSwitchedT38(bool toT38, bool success);
-    virtual void OnSwitchingT38(bool toT38);
-#endif
-
-    DECLARE_CALLBACK0(on_init);
-    DECLARE_CALLBACK0(on_destroy);
-    DECLARE_CALLBACK0(on_routing);
-    DECLARE_CALLBACK0(on_execute);
-    DECLARE_CALLBACK0(on_hangup);
-
-    DECLARE_CALLBACK0(on_exchange_media);
-    DECLARE_CALLBACK0(on_soft_execute);
-
-    DECLARE_CALLBACK1(kill_channel, int, sig);
-    DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf);
-    DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg);
-    DECLARE_CALLBACK1(receive_event, switch_event_t *, event);
-    DECLARE_CALLBACK0(state_change);
-    DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id);
-    DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id);
-    DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id);
-    DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id);
-
-    __inline switch_core_session_t *GetSession() const
-    {
-        return m_fsSession;
-    }
-
-    __inline switch_channel_t *GetChannel() const
-    {
-        return m_fsChannel;
-    }
-
-    bool IsChannelReady() const
-    {
-        return m_fsChannel != NULL && switch_channel_ready(m_fsChannel);
-    }
-
-    bool NeedFlushAudio()
-    {
-        if (!m_flushAudio)
-          return false;
-        m_flushAudio = false;
-        return true;
-    }
-
-  protected:
-    void SetCodecs();
-    bool WaitForMedia();
-#if HAVE_T38
-    void SetT38OptionsFromMediaFormat(const OpalMediaFormat & mediaFormat, const char * varname);
-    bool IndicateSwitchedT38();
-    void AbortT38();
-#endif
-
-    switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags);
-    switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags);
-
-  private:
-    FSEndPoint            &m_endpoint;
-    switch_core_session_t *m_fsSession;
-    switch_channel_t      *m_fsChannel;
-    PSyncPoint             m_rxAudioOpened;
-    PSyncPoint             m_txAudioOpened;
-    OpalMediaFormatList    m_switchMediaFormats;
-
-    // If FS ever supports more than one audio and one video, this needs to change
-    switch_timer_t m_read_timer;
-    switch_codec_t m_read_codec;
-    switch_codec_t m_write_codec;
-
-    switch_timer_t m_vid_read_timer;
-    switch_codec_t m_vid_read_codec;
-    switch_codec_t m_vid_write_codec;
-
-    switch_frame_t m_dummy_frame;
-
-    bool m_flushAudio;
-    bool m_udptl;
-
-    friend PBoolean FSMediaStream::Open();
-};
-
-
-#endif /* __FREESWITCH_MOD_OPAL__ */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:nil
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:s:
- */
+/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library /
+ * Soft-Switch Application
+ *
+ * Version: MPL 1.1
+ *
+ * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek@gmail.com)
+ * Copyright (c) 2008-2012 Vox Lucida Pty. Ltd. (robertj@voxlucida.com.au)
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Contributor(s):
+ * Tuyan Ozipek   (tuyanozipek@gmail.com)
+ * Lukasz Zwierko (lzwierko@gmail.com)
+ * Robert Jongbloed (robertj@voxlucida.com.au)
+ *
+ */
+
+
+#ifndef __FREESWITCH_MOD_OPAL__
+#define __FREESWITCH_MOD_OPAL__
+
+#if defined(__GNUC__) && defined(HAVE_VISIBILITY)
+#pragma GCC visibility push(default)
+#endif
+
+#include <ptlib.h>
+#include <opal/manager.h>
+
+#ifndef OPAL_CHECK_VERSION
+  #define OPAL_CHECK_VERSION(a,b,c) 0
+#endif
+
+#if !OPAL_CHECK_VERSION(3,12,8)
+  #error OPAL is too old to use, must be >= 2.12.8
+#endif
+
+#include <ep/localep.h>
+#include <h323/h323ep.h>
+#include <iax2/iax2ep.h>
+
+#if defined(__GNUC__) && defined(HAVE_VISIBILITY)
+#pragma GCC visibility pop
+#endif
+
+#undef strcasecmp
+#undef strncasecmp
+
+#include <switch.h>
+
+#define MODNAME "mod_opal"
+
+#define HAVE_T38 OPAL_T38_CAPABILITY
+
+
+
+class FSEndPoint;
+class FSManager;
+
+
+class FSProcess : public PLibraryProcess
+{
+    PCLASSINFO(FSProcess, PLibraryProcess);
+  public:
+    FSProcess();
+    ~FSProcess();
+
+    bool Initialise(switch_loadable_module_interface_t *iface);
+
+    FSManager & GetManager() const
+    {
+        return *m_manager;
+    }
+
+  protected:
+    FSManager * m_manager;
+};
+
+
+struct FSListener
+{
+    FSListener() : m_port(H323EndPoint::DefaultTcpSignalPort) { }
+
+    PString            m_name;
+    PIPSocket::Address m_address;
+    uint16_t           m_port;
+};
+
+
+class FSManager : public OpalManager
+{
+    PCLASSINFO(FSManager, OpalManager);
+
+  public:
+    FSManager();
+
+    bool Initialise(switch_loadable_module_interface_t *iface);
+
+    switch_status_t ReadConfig(int reload);
+
+    switch_endpoint_interface_t *GetSwitchInterface() const { return m_FreeSwitch; }
+    const PString & GetContext() const { return m_context; }
+    const PString & GetDialPlan() const { return m_dialplan; }
+    const PString & GetCodecPrefs() const { return m_codecPrefs; }
+    bool GetDisableTranscoding() const { return m_disableTranscoding; }
+
+  private:
+    switch_endpoint_interface_t *m_FreeSwitch;
+
+    H323EndPoint *m_h323ep;
+    IAX2EndPoint *m_iaxep;
+    FSEndPoint   *m_fsep;
+
+    PString m_context;
+    PString m_dialplan;
+    PString m_codecPrefs;
+    bool    m_disableTranscoding;
+    PString m_gkAddress;
+    PString m_gkIdentifer;
+    PString m_gkInterface;
+
+    list <FSListener> m_listeners;
+};
+
+
+class FSEndPoint : public OpalLocalEndPoint
+{
+    PCLASSINFO(FSEndPoint, OpalLocalEndPoint);
+  public:
+    FSEndPoint(FSManager & manager);
+
+    virtual OpalLocalConnection *CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions * stringOptions);
+
+    FSManager & GetManager() const { return m_manager; }
+
+  protected:
+    FSManager & m_manager;
+};
+
+
+class FSConnection;
+
+
+class FSMediaStream : public OpalMediaStream
+{
+    PCLASSINFO(FSMediaStream, OpalMediaStream);
+  public:
+    FSMediaStream(
+      FSConnection & conn,
+      const OpalMediaFormat & mediaFormat,    ///<  Media format for stream
+      unsigned sessionID,    ///<  Session number for stream
+      bool isSource    ///<  Is a source stream
+    );
+
+    virtual PBoolean Open();
+    virtual PBoolean IsSynchronous() const;
+    virtual PBoolean RequiresPatchThread(OpalMediaStream *) const;
+
+    switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags);
+    switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags);
+
+  protected:
+    virtual void InternalClose();
+    int StartReadWrite(PatchPtr & mediaPatch) const;
+
+  private:
+    bool CheckPatchAndLock();
+
+    FSConnection          &m_connection;
+    switch_timer_t        *m_switchTimer;
+    switch_codec_t        *m_switchCodec;
+    switch_frame_t         m_readFrame;
+    RTP_DataFrame          m_readRTP;
+};
+
+
+#define DECLARE_CALLBACK0(name)                           \
+    static switch_status_t name(switch_core_session_t *session) {       \
+        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
+        return tech_pvt != NULL ? tech_pvt->name() : SWITCH_STATUS_FALSE; } \
+    switch_status_t name()
+
+#define DECLARE_CALLBACK1(name, type1, name1)                           \
+    static switch_status_t name(switch_core_session_t *session, type1 name1) { \
+        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
+        return tech_pvt != NULL ? tech_pvt->name(name1) : SWITCH_STATUS_FALSE; } \
+    switch_status_t name(type1 name1)
+
+#define DECLARE_CALLBACK3(name, type1, name1, type2, name2, type3, name3) \
+    static switch_status_t name(switch_core_session_t *session, type1 name1, type2 name2, type3 name3) { \
+        FSConnection *tech_pvt = (FSConnection *) switch_core_session_get_private(session); \
+        return tech_pvt != NULL ? tech_pvt->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \
+    switch_status_t name(type1 name1, type2 name2, type3 name3)
+
+
+
+
+class FSConnection : public OpalLocalConnection
+{
+    PCLASSINFO(FSConnection, OpalLocalConnection)
+
+  public:
+    struct outgoing_params {
+      switch_event_t          *var_event;
+      switch_caller_profile_t *outbound_profile;
+      switch_core_session_t  **new_session;
+      switch_memory_pool_t   **pool;
+      switch_originate_flag_t  flags;
+      switch_call_cause_t     *cancel_cause;
+      switch_call_cause_t      fail_cause;
+    };
+
+    FSConnection(OpalCall & call,
+                 FSEndPoint & endpoint,
+                 unsigned options,
+                 OpalConnection::StringOptions * stringOptions,
+                 outgoing_params * params);
+
+    virtual bool OnOutgoingSetUp();
+    virtual bool OnIncoming();
+    virtual void OnEstablished();
+    virtual void OnReleased();
+    virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia);
+    virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean);
+    virtual void OnPatchMediaStream(PBoolean isSource, OpalMediaPatch & patch);
+    virtual OpalMediaFormatList GetMediaFormats() const;
+    virtual PBoolean SendUserInputTone(char tone, unsigned duration);
+#if HAVE_T38
+    virtual void OnSwitchedT38(bool toT38, bool success);
+    virtual void OnSwitchingT38(bool toT38);
+#endif
+
+    DECLARE_CALLBACK0(on_init);
+    DECLARE_CALLBACK0(on_destroy);
+    DECLARE_CALLBACK0(on_routing);
+    DECLARE_CALLBACK0(on_execute);
+    DECLARE_CALLBACK0(on_hangup);
+
+    DECLARE_CALLBACK0(on_exchange_media);
+    DECLARE_CALLBACK0(on_soft_execute);
+
+    DECLARE_CALLBACK1(kill_channel, int, sig);
+    DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf);
+    DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg);
+    DECLARE_CALLBACK1(receive_event, switch_event_t *, event);
+    DECLARE_CALLBACK0(state_change);
+    DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id);
+    DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id);
+    DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id);
+    DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id);
+
+    __inline switch_core_session_t *GetSession() const
+    {
+        return m_fsSession;
+    }
+
+    __inline switch_channel_t *GetChannel() const
+    {
+        return m_fsChannel;
+    }
+
+    bool IsChannelReady() const
+    {
+        return m_fsChannel != NULL && switch_channel_ready(m_fsChannel);
+    }
+
+    bool NeedFlushAudio()
+    {
+        if (!m_flushAudio)
+          return false;
+        m_flushAudio = false;
+        return true;
+    }
+
+  protected:
+    void SetCodecs();
+    bool WaitForMedia();
+#if HAVE_T38
+    void SetT38OptionsFromMediaFormat(const OpalMediaFormat & mediaFormat, const char * varname);
+    bool IndicateSwitchedT38();
+    void AbortT38();
+#endif
+
+    switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags);
+    switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags);
+
+  private:
+    FSEndPoint            &m_endpoint;
+    switch_core_session_t *m_fsSession;
+    switch_channel_t      *m_fsChannel;
+    PSyncPoint             m_rxAudioOpened;
+    PSyncPoint             m_txAudioOpened;
+    OpalMediaFormatList    m_switchMediaFormats;
+
+    // If FS ever supports more than one audio and one video, this needs to change
+    switch_timer_t m_read_timer;
+    switch_codec_t m_read_codec;
+    switch_codec_t m_write_codec;
+
+    switch_timer_t m_vid_read_timer;
+    switch_codec_t m_vid_read_codec;
+    switch_codec_t m_vid_write_codec;
+
+    switch_frame_t m_dummy_frame;
+
+    bool m_flushAudio;
+    bool m_udptl;
+
+    friend PBoolean FSMediaStream::Open();
+};
+
+
+#endif /* __FREESWITCH_MOD_OPAL__ */
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:nil
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:s:
+ */
diff --git a/src/mod/endpoints/mod_rtmp/libamf/amf-cmake.h.in b/src/mod/endpoints/mod_rtmp/libamf/amf-cmake.h.in
index 40ee41139a..327c5f6b6e 100644
--- a/src/mod/endpoints/mod_rtmp/libamf/amf-cmake.h.in
+++ b/src/mod/endpoints/mod_rtmp/libamf/amf-cmake.h.in
@@ -79,27 +79,27 @@
    such a type exists and the standard includes do not define it. */
 #cmakedefine uint8_t unsigned char
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
 #include <stdlib.h>
 
 /* AMF number */
-typedef
-#if SIZEOF_FLOAT == 8
-float
-#elif SIZEOF_DOUBLE == 8
-double
-#elif SIZEOF_LONG_DOUBLE == 8
-long double
-#else
-uint64_t
-#endif
+typedef
+#if SIZEOF_FLOAT == 8
+float
+#elif SIZEOF_DOUBLE == 8
+double
+#elif SIZEOF_LONG_DOUBLE == 8
+long double
+#else
+uint64_t
+#endif
 number64_t;
 
 /* custom read/write function type */
-typedef size_t (*read_proc_t)(void * out_buffer, size_t size, void * user_data);
+typedef size_t (*read_proc_t)(void * out_buffer, size_t size, void * user_data);
 typedef size_t (*write_proc_t)(const void * in_buffer, size_t size, void * user_data);
 
 #endif /* __AMF_H__ */
diff --git a/src/mod/languages/mod_perl/perlibs.h.in b/src/mod/languages/mod_perl/perlibs.h.in
index 6aa25587d3..1575944b4b 100644
--- a/src/mod/languages/mod_perl/perlibs.h.in
+++ b/src/mod/languages/mod_perl/perlibs.h.in
@@ -1 +1 @@
-#define PERL_LIB "@PERL_LIB@"
+#define PERL_LIB "@PERL_LIB@"
diff --git a/src/mod/say/mod_say_fa/mod_say_fa.c b/src/mod/say/mod_say_fa/mod_say_fa.c
index e665e9e16e..24716fd2e6 100644
--- a/src/mod/say/mod_say_fa/mod_say_fa.c
+++ b/src/mod/say/mod_say_fa/mod_say_fa.c
@@ -49,9 +49,9 @@
 #include <math.h>
 #include <ctype.h>
 
-void gregorian_to_jalali(/* output */ int *j_y, int *j_m, int *j_d,
+void gregorian_to_jalali(/* output */ int *j_y, int *j_m, int *j_d,
                          /*  input */ int  g_y, int  g_m, int  g_d);
-void jalali_to_gregorian(/* output */ int *g_y, int *g_m, int *g_d,
+void jalali_to_gregorian(/* output */ int *g_y, int *g_m, int *g_d,
                          /*  input */ int  j_y, int  j_m, int  j_d);
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_say_fa_load);
@@ -575,108 +575,108 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_say_fa_load)
 int g_days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 int j_days_in_month[12] = {31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29};
 
-void gregorian_to_jalali(int *j_y, int *j_m, int *j_d,
-						 int  g_y, int  g_m, int  g_d)
-{
-   int gy, gm, gd;
-   int jy, jm, jd;
-   long g_day_no, j_day_no;
-   int j_np;
- 
-   int i;
-
-   gy = g_y-1600;
-   gm = g_m-1;
-   gd = g_d-1;
- 
-   g_day_no = 365*gy+(gy+3)/4-(gy+99)/100+(gy+399)/400;
-   for (i=0;i<gm;++i)
-      g_day_no += g_days_in_month[i];
-   if (gm>1 && ((gy%4==0 && gy%100!=0) || (gy%400==0)))
-      /* leap and after Feb */
-      ++g_day_no;
-   g_day_no += gd;
- 
-   j_day_no = g_day_no-79;
- 
-   j_np = j_day_no / 12053;
-   j_day_no %= 12053;
- 
-   jy = 979+33*j_np+4*(j_day_no/1461);
-   j_day_no %= 1461;
- 
-   if (j_day_no >= 366) {
-      jy += (j_day_no-1)/365;
-      j_day_no = (j_day_no-1)%365;
-   }
- 
-   for (i = 0; i < 11 && j_day_no >= j_days_in_month[i]; ++i) {
-      j_day_no -= j_days_in_month[i];
-   }
-   jm = i+1;
-   jd = j_day_no+1;
-   *j_y = jy;
-   *j_m = jm;
-   *j_d = jd;
+void gregorian_to_jalali(int *j_y, int *j_m, int *j_d,
+						 int  g_y, int  g_m, int  g_d)
+{
+   int gy, gm, gd;
+   int jy, jm, jd;
+   long g_day_no, j_day_no;
+   int j_np;
+ 
+   int i;
+
+   gy = g_y-1600;
+   gm = g_m-1;
+   gd = g_d-1;
+ 
+   g_day_no = 365*gy+(gy+3)/4-(gy+99)/100+(gy+399)/400;
+   for (i=0;i<gm;++i)
+      g_day_no += g_days_in_month[i];
+   if (gm>1 && ((gy%4==0 && gy%100!=0) || (gy%400==0)))
+      /* leap and after Feb */
+      ++g_day_no;
+   g_day_no += gd;
+ 
+   j_day_no = g_day_no-79;
+ 
+   j_np = j_day_no / 12053;
+   j_day_no %= 12053;
+ 
+   jy = 979+33*j_np+4*(j_day_no/1461);
+   j_day_no %= 1461;
+ 
+   if (j_day_no >= 366) {
+      jy += (j_day_no-1)/365;
+      j_day_no = (j_day_no-1)%365;
+   }
+ 
+   for (i = 0; i < 11 && j_day_no >= j_days_in_month[i]; ++i) {
+      j_day_no -= j_days_in_month[i];
+   }
+   jm = i+1;
+   jd = j_day_no+1;
+   *j_y = jy;
+   *j_m = jm;
+   *j_d = jd;
 }
 
-void jalali_to_gregorian(int *g_y, int *g_m, int *g_d,
-						 int  j_y, int  j_m, int  j_d)
-{
-   int gy, gm, gd;
-   int jy, jm, jd;
-   long g_day_no, j_day_no;
-   int leap;
-
-   int i;
-
-   jy = j_y-979;
-   jm = j_m-1;
-   jd = j_d-1;
-
-   j_day_no = 365*jy + (jy/33)*8 + (jy%33+3)/4;
-   for (i=0; i < jm; ++i)
-      j_day_no += j_days_in_month[i];
-
-   j_day_no += jd;
-
-   g_day_no = j_day_no+79;
-
-   gy = 1600 + 400*(g_day_no/146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */
-   g_day_no = g_day_no % 146097;
-
-   leap = 1;
-   if (g_day_no >= 36525) /* 36525 = 365*100 + 100/4 */
-   {
-      g_day_no--;
-      gy += 100*(g_day_no/36524); /* 36524 = 365*100 + 100/4 - 100/100 */
-      g_day_no = g_day_no % 36524;
-      
-      if (g_day_no >= 365)
-         g_day_no++;
-      else
-         leap = 0;
-   }
-
-   gy += 4*(g_day_no/1461); /* 1461 = 365*4 + 4/4 */
-   g_day_no %= 1461;
-
-   if (g_day_no >= 366) {
-      leap = 0;
-
-      g_day_no--;
-      gy += g_day_no/365;
-      g_day_no = g_day_no % 365;
-   }
-
-   for (i = 0; g_day_no >= g_days_in_month[i] + (i == 1 && leap); i++)
-      g_day_no -= g_days_in_month[i] + (i == 1 && leap);
-   gm = i+1;
-   gd = g_day_no+1;
-
-   *g_y = gy;
-   *g_m = gm;
-   *g_d = gd;
+void jalali_to_gregorian(int *g_y, int *g_m, int *g_d,
+						 int  j_y, int  j_m, int  j_d)
+{
+   int gy, gm, gd;
+   int jy, jm, jd;
+   long g_day_no, j_day_no;
+   int leap;
+
+   int i;
+
+   jy = j_y-979;
+   jm = j_m-1;
+   jd = j_d-1;
+
+   j_day_no = 365*jy + (jy/33)*8 + (jy%33+3)/4;
+   for (i=0; i < jm; ++i)
+      j_day_no += j_days_in_month[i];
+
+   j_day_no += jd;
+
+   g_day_no = j_day_no+79;
+
+   gy = 1600 + 400*(g_day_no/146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */
+   g_day_no = g_day_no % 146097;
+
+   leap = 1;
+   if (g_day_no >= 36525) /* 36525 = 365*100 + 100/4 */
+   {
+      g_day_no--;
+      gy += 100*(g_day_no/36524); /* 36524 = 365*100 + 100/4 - 100/100 */
+      g_day_no = g_day_no % 36524;
+      
+      if (g_day_no >= 365)
+         g_day_no++;
+      else
+         leap = 0;
+   }
+
+   gy += 4*(g_day_no/1461); /* 1461 = 365*4 + 4/4 */
+   g_day_no %= 1461;
+
+   if (g_day_no >= 366) {
+      leap = 0;
+
+      g_day_no--;
+      gy += g_day_no/365;
+      g_day_no = g_day_no % 365;
+   }
+
+   for (i = 0; g_day_no >= g_days_in_month[i] + (i == 1 && leap); i++)
+      g_day_no -= g_days_in_month[i] + (i == 1 && leap);
+   gm = i+1;
+   gd = g_day_no+1;
+
+   *g_y = gy;
+   *g_m = gm;
+   *g_d = gd;
 }
 
 /* For Emacs:
diff --git a/src/mod/say/mod_say_pt/mod_say_pt.c b/src/mod/say/mod_say_pt/mod_say_pt.c
index b1e0db9b52..a0b9d5b863 100644
--- a/src/mod/say/mod_say_pt/mod_say_pt.c
+++ b/src/mod/say/mod_say_pt/mod_say_pt.c
@@ -1,546 +1,546 @@
-/*
- * Copyright (c) 2007-2014, Anthony Minessale II
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- * Michael B. Murdock <mike@mmurdock.org>
- * António Silva <asilva@wirelessmundi.com>
- *
- * mod_say_pt.c -- Say for Portuguese
- *
- */
-
-#include <switch.h>
-#include <math.h>
-#include <ctype.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_say_pt_load);
-SWITCH_MODULE_DEFINITION(mod_say_pt, mod_say_pt_load, NULL, NULL);
-
-#define say_num(num, meth) {											\
-		char tmp[80];													\
-		switch_status_t tstatus;										\
-		switch_say_method_t smeth = say_args->method;					\
-		switch_say_type_t stype = say_args->type;						\
-		say_args->type = SST_ITEMS; say_args->method = meth;			\
-		switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num);			\
-		if ((tstatus =													\
-			 pt_say_general_count(session, tmp, say_args, args))		\
-			!= SWITCH_STATUS_SUCCESS) {									\
-			return tstatus;												\
-		}																\
-		say_args->method = smeth; say_args->type = stype;				\
-	}																	\
-
-
-#define say_file(...) {													\
-		char tmp[80];													\
-		switch_status_t tstatus;										\
-		switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);					\
-		if ((tstatus =													\
-			 switch_ivr_play_file(session, NULL, tmp, args))			\
-			!= SWITCH_STATUS_SUCCESS){									\
-			return tstatus;												\
-		}																\
-		if (!switch_channel_ready(switch_core_session_get_channel(session))) { \
-			return SWITCH_STATUS_FALSE;									\
-		}}																\
-
-
-static switch_status_t play_group(switch_say_method_t method, int a, int b, int c, char *what, switch_core_session_t *session, switch_input_args_t *args)
-{
-
-	/*a => 1xx-9xx*/
-	if (a) {
-		switch (a) {
-		case 1:
-			if (b || c) {
-				say_file("digits/hundred.wav");
-			} else {
-				say_file("digits/100.wav");
-			}
-			break;
-		case 2:
-			say_file("digits/200.wav");
-			break;
-		case 3:
-			say_file("digits/300.wav");
-			break;
-		case 5:
-			say_file("digits/500.wav");
-			break;
-		default:
-			say_file("digits/%d.wav", a);
-			say_file("digits/hundreds.wav");
-			break;
-		}
-		if (b || c) {
-			say_file("currency/and.wav");
-		}
-	}
-	/* b => 1x - 9x */
-	if (b) {
-		if (b > 1) {
-			if (method == SSM_COUNTED) {
-				say_file("digits/h-%d0.wav", b);
-			} else {
-				say_file("digits/%d0.wav", b);
-				if (c > 0) {
-					say_file("currency/and.wav");
-				}
-			}
-		} else {
-			say_file("digits/%d%d.wav", b, c);
-			c = 0;
-		}
-	}
-	/* c => 0 - 9*/
-	if (c) {
-		if (method == SSM_COUNTED) {
-			say_file("digits/h-%d.wav", c);
-		} else {
-			say_file("digits/%d.wav", c);
-		}
-	}
-
-	if (what && (a || b || c)) {
-		say_file(what);
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t pt_say_general_count(switch_core_session_t *session,	char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
-{
-	int in;
-	int x = 0;
-	int places[9] = { 0 };
-	char sbuf[128] = "";
-	switch_status_t status;
-
-	if (say_args->method == SSM_ITERATED) {
-		if ((tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1))) {
-			char *p;
-			for (p = tosay; p && *p; p++) {
-				say_file("digits/%c.wav", *p);
-			}
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
-			return SWITCH_STATUS_GENERR;
-		}
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if (!(tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1)) || strlen(tosay) > 9) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	in = atoi(tosay);
-
-	if (in != 0) {
-		for (x = 8; x >= 0; x--) {
-			int num = (int) pow(10, x);
-			if ((places[(uint32_t) x] = in / num)) {
-				in -= places[(uint32_t) x] * num;
-			}
-		}
-
-		switch (say_args->method) {
-		case SSM_COUNTED:
-		case SSM_PRONOUNCED:
+/*
+ * Copyright (c) 2007-2014, Anthony Minessale II
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Michael B. Murdock <mike@mmurdock.org>
+ * António Silva <asilva@wirelessmundi.com>
+ *
+ * mod_say_pt.c -- Say for Portuguese
+ *
+ */
+
+#include <switch.h>
+#include <math.h>
+#include <ctype.h>
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_say_pt_load);
+SWITCH_MODULE_DEFINITION(mod_say_pt, mod_say_pt_load, NULL, NULL);
+
+#define say_num(num, meth) {											\
+		char tmp[80];													\
+		switch_status_t tstatus;										\
+		switch_say_method_t smeth = say_args->method;					\
+		switch_say_type_t stype = say_args->type;						\
+		say_args->type = SST_ITEMS; say_args->method = meth;			\
+		switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num);			\
+		if ((tstatus =													\
+			 pt_say_general_count(session, tmp, say_args, args))		\
+			!= SWITCH_STATUS_SUCCESS) {									\
+			return tstatus;												\
+		}																\
+		say_args->method = smeth; say_args->type = stype;				\
+	}																	\
+
+
+#define say_file(...) {													\
+		char tmp[80];													\
+		switch_status_t tstatus;										\
+		switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);					\
+		if ((tstatus =													\
+			 switch_ivr_play_file(session, NULL, tmp, args))			\
+			!= SWITCH_STATUS_SUCCESS){									\
+			return tstatus;												\
+		}																\
+		if (!switch_channel_ready(switch_core_session_get_channel(session))) { \
+			return SWITCH_STATUS_FALSE;									\
+		}}																\
+
+
+static switch_status_t play_group(switch_say_method_t method, int a, int b, int c, char *what, switch_core_session_t *session, switch_input_args_t *args)
+{
+
+	/*a => 1xx-9xx*/
+	if (a) {
+		switch (a) {
+		case 1:
+			if (b || c) {
+				say_file("digits/hundred.wav");
+			} else {
+				say_file("digits/100.wav");
+			}
+			break;
+		case 2:
+			say_file("digits/200.wav");
+			break;
+		case 3:
+			say_file("digits/300.wav");
+			break;
+		case 5:
+			say_file("digits/500.wav");
+			break;
+		default:
+			say_file("digits/%d.wav", a);
+			say_file("digits/hundreds.wav");
+			break;
+		}
+		if (b || c) {
+			say_file("currency/and.wav");
+		}
+	}
+	/* b => 1x - 9x */
+	if (b) {
+		if (b > 1) {
+			if (method == SSM_COUNTED) {
+				say_file("digits/h-%d0.wav", b);
+			} else {
+				say_file("digits/%d0.wav", b);
+				if (c > 0) {
+					say_file("currency/and.wav");
+				}
+			}
+		} else {
+			say_file("digits/%d%d.wav", b, c);
+			c = 0;
+		}
+	}
+	/* c => 0 - 9*/
+	if (c) {
+		if (method == SSM_COUNTED) {
+			say_file("digits/h-%d.wav", c);
+		} else {
+			say_file("digits/%d.wav", c);
+		}
+	}
+
+	if (what && (a || b || c)) {
+		say_file(what);
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t pt_say_general_count(switch_core_session_t *session,	char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
+{
+	int in;
+	int x = 0;
+	int places[9] = { 0 };
+	char sbuf[128] = "";
+	switch_status_t status;
+
+	if (say_args->method == SSM_ITERATED) {
+		if ((tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1))) {
+			char *p;
+			for (p = tosay; p && *p; p++) {
+				say_file("digits/%c.wav", *p);
+			}
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
+			return SWITCH_STATUS_GENERR;
+		}
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	if (!(tosay = switch_strip_commas(tosay, sbuf, sizeof(sbuf)-1)) || strlen(tosay) > 9) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
+		return SWITCH_STATUS_GENERR;
+	}
+
+	in = atoi(tosay);
+
+	if (in != 0) {
+		for (x = 8; x >= 0; x--) {
+			int num = (int) pow(10, x);
+			if ((places[(uint32_t) x] = in / num)) {
+				in -= places[(uint32_t) x] * num;
+			}
+		}
+
+		switch (say_args->method) {
+		case SSM_COUNTED:
+		case SSM_PRONOUNCED:
 			/* specific case, one million => um milhão */
 			if (!places[8] && !places[7] && (places[6] == 1)) {
 				say_file("digits/1.wav");
 				say_file("digits/million.wav");
-			} else if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/millions.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
-				return status;
-			}
-			if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
-				return status;
-			}
-			if ((status = play_group(say_args->method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) {
-				return status;
-			}
-			break;
-		default:
-			break;
-		}
-	} else {
-		say_file("digits/0.wav");
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t pt_say_time(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
-{
-	int32_t t;
-	switch_time_t target = 0, target_now = 0;
-	switch_time_exp_t tm, tm_now;
-	uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	const char *tz = switch_channel_get_variable(channel, "timezone");
-
-	if (say_args->type == SST_TIME_MEASUREMENT) {
-		int64_t hours = 0;
-		int64_t minutes = 0;
-		int64_t seconds = 0;
-		int64_t r = 0;
-
-		if (strchr(tosay, ':')) {
-			char *tme = switch_core_session_strdup(session, tosay);
-			char *p;
-
-			if ((p = strrchr(tme, ':'))) {
-				*p++ = '\0';
-				seconds = atoi(p);
-				if ((p = strchr(tme, ':'))) {
-					*p++ = '\0';
-					minutes = atoi(p);
-					hours = atoi(tme);
-				} else {
-					minutes = atoi(tme);
-				}
-			}
-		} else {
-			if ((seconds = atol(tosay)) <= 0) {
-				seconds = (int64_t) switch_epoch_time_now(NULL);
-			}
-
-			if (seconds >= 60) {
-				minutes = seconds / 60;
-				r = seconds % 60;
-				seconds = r;
-			}
-
-			if (minutes >= 60) {
-				hours = minutes / 60;
-				r = minutes % 60;
-				minutes = r;
-			}
-		}
-
-		if (hours) {
-			say_num(hours, SSM_PRONOUNCED);
-			if (hours == 1) {
-				say_file("time/hour.wav");
-			} else {
-				say_file("time/hours.wav");
-			}
-		} else {
-			say_file("digits/0.wav");
-			say_file("time/hours.wav");
-		}
-
-		if (minutes) {
-			say_num(minutes, SSM_PRONOUNCED);
-			if (minutes == 1) {
-				say_file("time/minute.wav");
-			} else {
-				say_file("time/minutes.wav");
-			}
-		} else {
-			say_file("digits/0.wav");
-			say_file("time/minutes.wav");
-		}
-
-		if (seconds) {
-			say_num(seconds, SSM_PRONOUNCED);
-			if (seconds == 1) {
-				say_file("time/second.wav");
-			} else {
-				say_file("time/seconds.wav");
-			}
-		} else {
-			say_file("digits/0.wav");
-			say_file("time/seconds.wav");
-		}
-
-		return SWITCH_STATUS_SUCCESS;
-	}
-
-	if ((t = atol(tosay)) > 0) {
-		target = switch_time_make(t, 0);
-		target_now = switch_micro_time_now();
-	} else {
-		target = switch_micro_time_now();
-		target_now = switch_micro_time_now();
-	}
-
-	if (tz) {
-		int check = atoi(tz);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
-		if (check) {
-			switch_time_exp_tz(&tm, target, check);
-			switch_time_exp_tz(&tm_now, target_now, check);
-		} else {
-			switch_time_exp_tz_name(tz, &tm, target);
-			switch_time_exp_tz_name(tz, &tm_now, target_now);
-		}
-	} else {
-		switch_time_exp_lt(&tm, target);
-		switch_time_exp_lt(&tm_now, target_now);
-	}
-
-	switch (say_args->type) {
-	case SST_CURRENT_DATE_TIME:
-		say_date = say_time = 1;
-		break;
-	case SST_CURRENT_DATE:
-		say_date = 1;
-		break;
-	case SST_CURRENT_TIME:
-		say_time = 1;
-		break;
-	case SST_SHORT_DATE_TIME:
-		say_time = 1;
-		if (tm.tm_year != tm_now.tm_year) {
-			say_date = 1;
-			break;
-		}
-		if (tm.tm_yday == tm_now.tm_yday) {
-			say_today = 1;
-			break;
-		}
-		if (tm.tm_yday == tm_now.tm_yday - 1) {
-			say_yesterday = 1;
-			break;
-		}
-		if (tm.tm_yday >= tm_now.tm_yday - 5) {
-			say_dow = 1;
-			break;
-		}
-		if (tm.tm_mon != tm_now.tm_mon) {
-			say_month = say_day = say_dow = 1;
-			break;
-		}
-
-		say_month = say_day = say_dow = 1;
-
-		break;
-	default:
-		break;
-	}
-
-	if (say_today) {
-		say_file("time/today.wav");
-	}
-	if (say_yesterday) {
-		say_file("time/yesterday.wav");
-	}
-	if (say_dow) {
-		say_file("time/day-%d.wav", tm.tm_wday);
-	}
-
-	if (say_date) {
-		say_year = say_month = say_day = say_dow = 1;
-		say_today = say_yesterday = 0;
-	}
-
-	if (say_month) {
-		say_file("time/mon-%d.wav", tm.tm_mon);
-	}
-	if (say_day) {
-		say_num(tm.tm_mday, SSM_COUNTED);
-	}
-	if (say_year) {
-		say_num(tm.tm_year + 1900, SSM_PRONOUNCED);
-	}
-
-	if (say_time) {
-		int32_t hour = tm.tm_hour, pm = 0;
-
-		if (say_date || say_today || say_yesterday || say_dow) {
-			if (hour == 1) {
-				say_file("time/at.wav");
-			} else {
-				say_file("time/ats.wav");
-			}
-		}
-
-		if (hour > 12) {
-			hour -= 12;
-			pm = 1;
-		} else if (hour == 12) {
-			pm = 1;
-		} else if (hour == 0) {
-			hour = 12;
-			pm = 0;
-		}
-
-		say_num(hour, SSM_PRONOUNCED);
-
-		if (tm.tm_min) {
-			say_file("currency/and.wav");
-			say_num(tm.tm_min, SSM_PRONOUNCED);
-		} else { 
-			say_file("time/oclock.wav");
-		}
-
-		say_file("time/%s.wav", pm ? "p-m" : "a-m");
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t pt_say_money(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
-{
-	char sbuf[16] = "";			/* enough for 999,999,999,999.99 (w/o the commas or leading $) */
-	char *dollars = NULL;
-	char *cents = NULL;
-
-	if (strlen(tosay) > 15 || !switch_strip_nonnumerics(tosay, sbuf, sizeof(sbuf)-1)) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
-		return SWITCH_STATUS_GENERR;
-	}
-
-	dollars = sbuf;
-
-	if ((cents = strchr(sbuf, '.'))) {
-		*cents++ = '\0';
-		if (strlen(cents) > 2) {
-			cents[2] = '\0';
-		}
-	}
-
-	/* If positive sign - skip over" */
-	if (sbuf[0] == '+') {
-		dollars++;
-	}
-
-	/* If negative say "negative" */
-	if (sbuf[0] == '-') {
-		say_file("currency/negative.wav");
-		dollars++;
-	}
-
-	/* Say dollar amount */
-	pt_say_general_count(session, dollars, say_args, args);
-	if (atoi(dollars) == 1) {
-		say_file("currency/dollar.wav");
-	} else {
-		say_file("currency/dollars.wav");
-	}
-
-	/* Say "and" */
-	say_file("currency/and.wav");
-
-	/* Say cents */
-	if (cents) {
-		pt_say_general_count(session, cents, say_args, args);
-		if (atoi(cents) == 1) {
-			say_file("currency/cent.wav");
-		} else {
-			say_file("currency/cents.wav");
-		}
-	} else {
-		say_file("digits/0.wav");
-		say_file("currency/cents.wav");
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-}
-
-
-
-static switch_status_t pt_say(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
-{
-
-	switch_say_callback_t say_cb = NULL;
-
-	switch (say_args->type) {
-	case SST_NUMBER:
-	case SST_ITEMS:
-	case SST_PERSONS:
-	case SST_MESSAGES:
-		say_cb = pt_say_general_count;
-		break;
-	case SST_TIME_MEASUREMENT:
-	case SST_CURRENT_DATE:
-	case SST_CURRENT_TIME:
-	case SST_CURRENT_DATE_TIME:
-	case SST_SHORT_DATE_TIME:
-		say_cb = pt_say_time;
-		break;
-	case SST_IP_ADDRESS:
-		return switch_ivr_say_ip(session, tosay, pt_say_general_count, say_args, args);
-		break;
-	case SST_NAME_SPELLED:
-	case SST_NAME_PHONETIC:
-		return switch_ivr_say_spell(session, tosay, say_args, args);
-		break;
-	case SST_CURRENCY:
-		say_cb = pt_say_money;
-		break;
-	default:
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", say_args->type);
-		break;
-	}
-
-	if (say_cb) {
-		return say_cb(session, tosay, say_args, args);
-	}
-
-	return SWITCH_STATUS_FALSE;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_say_pt_load)
-{
-	switch_say_interface_t *say_interface;
-	/* connect my internal structure to the blank pointer passed to me */
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
-	say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
-	say_interface->interface_name = "pt";
-	say_interface->say_function = pt_say;
-
-	/* indicate that the module should continue to be loaded */
-	return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+			} else if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/millions.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
+				return status;
+			}
+			if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
+				return status;
+			}
+			if ((status = play_group(say_args->method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) {
+				return status;
+			}
+			break;
+		default:
+			break;
+		}
+	} else {
+		say_file("digits/0.wav");
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t pt_say_time(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
+{
+	int32_t t;
+	switch_time_t target = 0, target_now = 0;
+	switch_time_exp_t tm, tm_now;
+	uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0;
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+	const char *tz = switch_channel_get_variable(channel, "timezone");
+
+	if (say_args->type == SST_TIME_MEASUREMENT) {
+		int64_t hours = 0;
+		int64_t minutes = 0;
+		int64_t seconds = 0;
+		int64_t r = 0;
+
+		if (strchr(tosay, ':')) {
+			char *tme = switch_core_session_strdup(session, tosay);
+			char *p;
+
+			if ((p = strrchr(tme, ':'))) {
+				*p++ = '\0';
+				seconds = atoi(p);
+				if ((p = strchr(tme, ':'))) {
+					*p++ = '\0';
+					minutes = atoi(p);
+					hours = atoi(tme);
+				} else {
+					minutes = atoi(tme);
+				}
+			}
+		} else {
+			if ((seconds = atol(tosay)) <= 0) {
+				seconds = (int64_t) switch_epoch_time_now(NULL);
+			}
+
+			if (seconds >= 60) {
+				minutes = seconds / 60;
+				r = seconds % 60;
+				seconds = r;
+			}
+
+			if (minutes >= 60) {
+				hours = minutes / 60;
+				r = minutes % 60;
+				minutes = r;
+			}
+		}
+
+		if (hours) {
+			say_num(hours, SSM_PRONOUNCED);
+			if (hours == 1) {
+				say_file("time/hour.wav");
+			} else {
+				say_file("time/hours.wav");
+			}
+		} else {
+			say_file("digits/0.wav");
+			say_file("time/hours.wav");
+		}
+
+		if (minutes) {
+			say_num(minutes, SSM_PRONOUNCED);
+			if (minutes == 1) {
+				say_file("time/minute.wav");
+			} else {
+				say_file("time/minutes.wav");
+			}
+		} else {
+			say_file("digits/0.wav");
+			say_file("time/minutes.wav");
+		}
+
+		if (seconds) {
+			say_num(seconds, SSM_PRONOUNCED);
+			if (seconds == 1) {
+				say_file("time/second.wav");
+			} else {
+				say_file("time/seconds.wav");
+			}
+		} else {
+			say_file("digits/0.wav");
+			say_file("time/seconds.wav");
+		}
+
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	if ((t = atol(tosay)) > 0) {
+		target = switch_time_make(t, 0);
+		target_now = switch_micro_time_now();
+	} else {
+		target = switch_micro_time_now();
+		target_now = switch_micro_time_now();
+	}
+
+	if (tz) {
+		int check = atoi(tz);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Timezone is [%s]\n", tz);
+		if (check) {
+			switch_time_exp_tz(&tm, target, check);
+			switch_time_exp_tz(&tm_now, target_now, check);
+		} else {
+			switch_time_exp_tz_name(tz, &tm, target);
+			switch_time_exp_tz_name(tz, &tm_now, target_now);
+		}
+	} else {
+		switch_time_exp_lt(&tm, target);
+		switch_time_exp_lt(&tm_now, target_now);
+	}
+
+	switch (say_args->type) {
+	case SST_CURRENT_DATE_TIME:
+		say_date = say_time = 1;
+		break;
+	case SST_CURRENT_DATE:
+		say_date = 1;
+		break;
+	case SST_CURRENT_TIME:
+		say_time = 1;
+		break;
+	case SST_SHORT_DATE_TIME:
+		say_time = 1;
+		if (tm.tm_year != tm_now.tm_year) {
+			say_date = 1;
+			break;
+		}
+		if (tm.tm_yday == tm_now.tm_yday) {
+			say_today = 1;
+			break;
+		}
+		if (tm.tm_yday == tm_now.tm_yday - 1) {
+			say_yesterday = 1;
+			break;
+		}
+		if (tm.tm_yday >= tm_now.tm_yday - 5) {
+			say_dow = 1;
+			break;
+		}
+		if (tm.tm_mon != tm_now.tm_mon) {
+			say_month = say_day = say_dow = 1;
+			break;
+		}
+
+		say_month = say_day = say_dow = 1;
+
+		break;
+	default:
+		break;
+	}
+
+	if (say_today) {
+		say_file("time/today.wav");
+	}
+	if (say_yesterday) {
+		say_file("time/yesterday.wav");
+	}
+	if (say_dow) {
+		say_file("time/day-%d.wav", tm.tm_wday);
+	}
+
+	if (say_date) {
+		say_year = say_month = say_day = say_dow = 1;
+		say_today = say_yesterday = 0;
+	}
+
+	if (say_month) {
+		say_file("time/mon-%d.wav", tm.tm_mon);
+	}
+	if (say_day) {
+		say_num(tm.tm_mday, SSM_COUNTED);
+	}
+	if (say_year) {
+		say_num(tm.tm_year + 1900, SSM_PRONOUNCED);
+	}
+
+	if (say_time) {
+		int32_t hour = tm.tm_hour, pm = 0;
+
+		if (say_date || say_today || say_yesterday || say_dow) {
+			if (hour == 1) {
+				say_file("time/at.wav");
+			} else {
+				say_file("time/ats.wav");
+			}
+		}
+
+		if (hour > 12) {
+			hour -= 12;
+			pm = 1;
+		} else if (hour == 12) {
+			pm = 1;
+		} else if (hour == 0) {
+			hour = 12;
+			pm = 0;
+		}
+
+		say_num(hour, SSM_PRONOUNCED);
+
+		if (tm.tm_min) {
+			say_file("currency/and.wav");
+			say_num(tm.tm_min, SSM_PRONOUNCED);
+		} else { 
+			say_file("time/oclock.wav");
+		}
+
+		say_file("time/%s.wav", pm ? "p-m" : "a-m");
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_status_t pt_say_money(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
+{
+	char sbuf[16] = "";			/* enough for 999,999,999,999.99 (w/o the commas or leading $) */
+	char *dollars = NULL;
+	char *cents = NULL;
+
+	if (strlen(tosay) > 15 || !switch_strip_nonnumerics(tosay, sbuf, sizeof(sbuf)-1)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
+		return SWITCH_STATUS_GENERR;
+	}
+
+	dollars = sbuf;
+
+	if ((cents = strchr(sbuf, '.'))) {
+		*cents++ = '\0';
+		if (strlen(cents) > 2) {
+			cents[2] = '\0';
+		}
+	}
+
+	/* If positive sign - skip over" */
+	if (sbuf[0] == '+') {
+		dollars++;
+	}
+
+	/* If negative say "negative" */
+	if (sbuf[0] == '-') {
+		say_file("currency/negative.wav");
+		dollars++;
+	}
+
+	/* Say dollar amount */
+	pt_say_general_count(session, dollars, say_args, args);
+	if (atoi(dollars) == 1) {
+		say_file("currency/dollar.wav");
+	} else {
+		say_file("currency/dollars.wav");
+	}
+
+	/* Say "and" */
+	say_file("currency/and.wav");
+
+	/* Say cents */
+	if (cents) {
+		pt_say_general_count(session, cents, say_args, args);
+		if (atoi(cents) == 1) {
+			say_file("currency/cent.wav");
+		} else {
+			say_file("currency/cents.wav");
+		}
+	} else {
+		say_file("digits/0.wav");
+		say_file("currency/cents.wav");
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+
+static switch_status_t pt_say(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
+{
+
+	switch_say_callback_t say_cb = NULL;
+
+	switch (say_args->type) {
+	case SST_NUMBER:
+	case SST_ITEMS:
+	case SST_PERSONS:
+	case SST_MESSAGES:
+		say_cb = pt_say_general_count;
+		break;
+	case SST_TIME_MEASUREMENT:
+	case SST_CURRENT_DATE:
+	case SST_CURRENT_TIME:
+	case SST_CURRENT_DATE_TIME:
+	case SST_SHORT_DATE_TIME:
+		say_cb = pt_say_time;
+		break;
+	case SST_IP_ADDRESS:
+		return switch_ivr_say_ip(session, tosay, pt_say_general_count, say_args, args);
+		break;
+	case SST_NAME_SPELLED:
+	case SST_NAME_PHONETIC:
+		return switch_ivr_say_spell(session, tosay, say_args, args);
+		break;
+	case SST_CURRENCY:
+		say_cb = pt_say_money;
+		break;
+	default:
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", say_args->type);
+		break;
+	}
+
+	if (say_cb) {
+		return say_cb(session, tosay, say_args, args);
+	}
+
+	return SWITCH_STATUS_FALSE;
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_say_pt_load)
+{
+	switch_say_interface_t *say_interface;
+	/* connect my internal structure to the blank pointer passed to me */
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	say_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SAY_INTERFACE);
+	say_interface->interface_name = "pt";
+	say_interface->say_function = pt_say;
+
+	/* indicate that the module should continue to be loaded */
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
  */

From 93983e63cce6bfbde46a9ab5c8352a75bc305d28 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 23 Jul 2014 01:01:44 +0500
Subject: [PATCH 084/130] revert fd9d77feee5b6d57b5266eb671c8ea238c28a471

---
 .../mod_conference/mod_conference.c           | 154 +++---------------
 1 file changed, 19 insertions(+), 135 deletions(-)

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 36430e1e14..7242f03557 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -401,7 +401,6 @@ typedef struct conference_obj {
 	switch_memory_pool_t *pool;
 	switch_thread_rwlock_t *rwlock;
 	uint32_t count;
-	uint32_t count3d;
 	int32_t energy_level;
 	uint8_t min;
 	switch_speech_handle_t lsh;
@@ -465,7 +464,6 @@ struct conference_member {
 	conference_obj_t *conference;
 	switch_memory_pool_t *pool;
 	switch_buffer_t *audio_buffer;
-	switch_buffer_t *clean_audio_buffer;
 	switch_buffer_t *mux_buffer;
 	switch_buffer_t *resample_buffer;
 	uint32_t flags;
@@ -487,13 +485,10 @@ struct conference_member {
 	switch_time_t rec_time;
 	conference_record_t *rec;
 	uint8_t *frame;
-	uint8_t *clean_frame;
 	uint8_t *last_frame;
 	uint32_t frame_size;
-	uint32_t clean_frame_size;
 	uint8_t *mux_frame;
 	uint32_t read;
-	uint32_t clean_read;
 	uint32_t vol_period;
 	int32_t energy_level;
 	int32_t agc_volume_in_level;
@@ -682,7 +677,7 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
 
 	offset = 180 / (count - 1);
 
-	radius = 1.5f;//3.0f; //(float)count / 2.0f; //3.0f;
+	radius = 2.0f;//3.0f; //(float)count / 2.0f; //3.0f;
 
 	pos = -90.0f;// + (offset / 2.0f);
 	
@@ -694,9 +689,6 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
 
 		if (!member->al) {
 			member->al = create_al(member->pool);
-			switch_mutex_lock(member->conference->member_mutex);
-			member->conference->count3d++;
-			switch_mutex_unlock(member->conference->member_mutex);
 		}
 		switch_set_flag(member, MFLAG_POSITIONAL);
 
@@ -776,7 +768,7 @@ static void process_al(al_handle_t *al, void *data, switch_size_t datalen, int r
 			
 			alGenSources(1, &al->source);
 			alSourcef( al->source, AL_PITCH, 1.);
-			alSourcef( al->source, AL_GAIN, 1.2);
+			alSourcef( al->source, AL_GAIN, 1.);
 			alGenBuffers(2, al->buffer_in);
 
 			alBufferData(al->buffer_in[0], AL_FORMAT_MONO16, data, datalen, rate);
@@ -2362,9 +2354,6 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 					
 					switch_set_flag(member, MFLAG_POSITIONAL);
 					member->al = create_al(member->pool);
-					switch_mutex_lock(member->conference->member_mutex);
-					member->conference->count3d++;
-					switch_mutex_unlock(member->conference->member_mutex);
 				}
 			} else {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,	"%s cannot set position data on mono conference.\n", switch_channel_get_name(channel));
@@ -2701,6 +2690,12 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
 
 	conference_cdr_del(member);
 
+#ifdef OPENAL_POSITIONING	
+	if (member->al && member->al->device) {
+		close_al(member->al);
+	}
+#endif
+
 	member_fnode = member->fnode;
 	member_sh = member->sh;
 	member->fnode = NULL;
@@ -2718,13 +2713,6 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
 	lock_member(member);
 	switch_clear_flag(member, MFLAG_INTREE);
 
-#ifdef OPENAL_POSITIONING	
-	if (member->al && member->al->device) {
-		member->conference->count3d--;
-		close_al(member->al);
-	}
-#endif
-
 	for (imember = conference->members; imember; imember = imember->next) {
 		if (imember == member) {
 			if (last) {
@@ -3142,13 +3130,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 				switch_set_flag_locked(imember, MFLAG_HAS_AUDIO);
 				ready++;
 			}
-
-			if (imember->clean_audio_buffer && imember->clean_frame && switch_buffer_inuse(imember->clean_audio_buffer) >= bytes
-				&& (buf_read = (uint32_t) switch_buffer_read(imember->clean_audio_buffer, imember->clean_frame, bytes))) {
-				imember->clean_read = buf_read;
-			} else {
-				imember->clean_read = 0;
-			}
 			switch_mutex_unlock(imember->audio_in_mutex);
 		}
 		
@@ -3318,14 +3299,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 			/* Use more bits in the main_frame to preserve the exact sum of the audio samples. */
 			int main_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
 			int16_t write_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
-			int clean_main_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
-			int clean = 0;
 
-#ifdef OPENAL_POSITIONING
-			if (conference->channels == 2) {
-				clean = 1;
-			}
-#endif
 
 			/* Init the main frame with file data if there is any. */
 			bptr = (int16_t *) file_frame;
@@ -3334,14 +3308,9 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 				for (x = 0; x < bytes / 2; x++) {
 					if (x <= file_sample_len * conference->channels) {
 						main_frame[x] = (int32_t) bptr[x];
-						if (clean) {
-							clean_main_frame[x] = (int32_t) bptr[x];
-						}
 					} else {
 						memset(&main_frame[x], 255, sizeof(main_frame[x]));
-						if (clean) {
-							memset(&clean_main_frame[x], 255, sizeof(main_frame[x]));
-						}
+						//printf("FUCCCK %d <= %ld (%ld/%d)\n", x, file_sample_len * conference->channels, file_sample_len, conference->channels);
 					}
 				}
 			}
@@ -3370,14 +3339,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 				for (x = 0; x < omember->read / 2; x++) {
 					main_frame[x] += (int32_t) bptr[x];
 				}
-
-				if (clean && omember->clean_read) {
-					bptr = (int16_t *) omember->clean_frame;
-					for (x = 0; x < omember->clean_read / 2; x++) {
-						clean_main_frame[x] += (int32_t) bptr[x];
-					}
-				}
-
 			}
 
 			if (conference->agc_level && conference->member_loop_count) {
@@ -3412,21 +3373,10 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 					continue;
 				}
 
-				if (omember->read_impl.number_of_channels == 1 && omember->clean_read) {
-					bptr = (int16_t *) omember->clean_frame;
-				} else {
-					bptr = (int16_t *) omember->frame;
-				}
+				bptr = (int16_t *) omember->frame;
 				
 				for (x = 0; x < bytes / 2 ; x++) {
-					
-					if (omember->read_impl.number_of_channels == 1 && omember->clean_read) {
-						z = clean_main_frame[x];
-					} else {
-						z = main_frame[x];
-					}
-
-					
+					z = main_frame[x];
 
 					/* bptr[x] represents my own contribution to this audio sample */
 					if (switch_test_flag(omember, MFLAG_HAS_AUDIO) && x <= omember->read / 2) {
@@ -4227,10 +4177,8 @@ static void check_agc_levels(conference_member_t *member)
 	}
 }
 
- static int member_check_channels(switch_frame_t *frame, conference_member_t *member, switch_bool_t in, switch_bool_t skip3d)
+static void member_check_channels(switch_frame_t *frame, conference_member_t *member, switch_bool_t in)
 {
-	int r = 0;
-
 	if (member->conference->channels != member->read_impl.number_of_channels || switch_test_flag(member, MFLAG_POSITIONAL)) {
 		uint32_t rlen;
 		int from, to;
@@ -4245,7 +4193,7 @@ static void check_agc_levels(conference_member_t *member)
 
 		rlen = frame->datalen / 2 / from; 
 
-		if (in && frame->rate == 48000 && ((from == 1 && to == 2) || (from == 2 && to == 2)) && switch_test_flag(member, MFLAG_POSITIONAL) && !skip3d) {
+		if (in && frame->rate == 48000 && ((from == 1 && to == 2) || (from == 2 && to == 2)) && switch_test_flag(member, MFLAG_POSITIONAL)) {
 			if (from == 2 && to == 2) {
 				switch_mux_channels((int16_t *) frame->data, rlen, 2, 1);
 				frame->datalen /= 2;
@@ -4253,15 +4201,13 @@ static void check_agc_levels(conference_member_t *member)
 			}
 			
 			process_al(member->al, frame->data, frame->datalen, frame->rate);
-			r++;
 		} else {
 			switch_mux_channels((int16_t *) frame->data, rlen, from, to);
 		}
 		
 		frame->datalen = rlen * 2 * to;
+		
 	}
-
-	return r;
 }
 
 
@@ -4561,7 +4507,6 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 			switch_audio_resampler_t *read_resampler = member->read_resampler;
 			void *data;
 			uint32_t datalen;
-			int16_t save_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
 
 			if (read_resampler) {
 				int16_t *bptr = (int16_t *) read_frame->data;
@@ -4577,14 +4522,11 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 				datalen = read_frame->datalen;
 			}
 
-			if (member->clean_audio_buffer) {
-				memcpy(save_frame, data, datalen);
-			}
-
 			tmp_frame.data = data;
 			tmp_frame.datalen = datalen;
 			tmp_frame.rate = member->conference->rate;
-			member_check_channels(&tmp_frame, member, SWITCH_TRUE, SWITCH_FALSE);
+			member_check_channels(&tmp_frame, member, SWITCH_TRUE);
+			
 
 			if (datalen) {
 				switch_size_t ok = 1;
@@ -4593,24 +4535,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 				switch_mutex_lock(member->audio_in_mutex);
 				if (switch_buffer_inuse(member->audio_buffer) > flush_len) {
 					switch_buffer_zero(member->audio_buffer);
-
-					if (member->clean_audio_buffer) {
-						switch_buffer_zero(member->clean_audio_buffer);
-					}
 					switch_channel_audio_sync(channel);
 				}
-				
 				ok = switch_buffer_write(member->audio_buffer, tmp_frame.data, tmp_frame.datalen);
-
-				if (member->clean_audio_buffer) {
-					if (member->conference->count3d) {
-						tmp_frame.data = save_frame;
-						tmp_frame.datalen = datalen;
-						member_check_channels(&tmp_frame, member, SWITCH_TRUE, SWITCH_TRUE);
-						switch_buffer_write(member->clean_audio_buffer, tmp_frame.data, tmp_frame.datalen);
-					}
-				}
-
 				switch_mutex_unlock(member->audio_in_mutex);
 				if (!ok) {
 					switch_mutex_unlock(member->read_mutex);
@@ -4991,7 +4918,7 @@ static void conference_loop_output(conference_member_t *member)
 						member_add_file_data(member, write_frame.data, write_frame.datalen);
 					}
 
-					member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
+					member_check_channels(&write_frame, member, SWITCH_FALSE);
 
 					if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
 						switch_mutex_unlock(member->audio_out_mutex);
@@ -5007,7 +4934,7 @@ static void conference_loop_output(conference_member_t *member)
 			memset(write_frame.data, 255, write_frame.datalen);
 			write_frame.timestamp = timer.samplecount;
 			member_add_file_data(member, write_frame.data, write_frame.datalen);
-			member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
+			member_check_channels(&write_frame, member, SWITCH_FALSE);
 			if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
 				switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 				break;
@@ -5024,7 +4951,7 @@ static void conference_loop_output(conference_member_t *member)
 			write_frame.samples = samples;
 			write_frame.timestamp = timer.samplecount;
 			
-			member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
+			member_check_channels(&write_frame, member, SWITCH_FALSE);
 
 			if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
 				switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
@@ -5173,13 +5100,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
 	member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
 
 
-#ifdef OPENAL_POSITIONING
-	if (member->conference->channels == 2) {
-		member->clean_frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
-		member->clean_frame = switch_core_alloc(member->pool, member->clean_frame_size);
-	}
-#endif
-
 	switch_mutex_init(&member->write_mutex, SWITCH_MUTEX_NESTED, rec->pool);
 	switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
 	switch_mutex_init(&member->fnode_mutex, SWITCH_MUTEX_NESTED, rec->pool);
@@ -5194,17 +5114,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
 		goto end;
 	}
 
-#ifdef OPENAL_POSITIONING
-	if (conference->channels == 2) {
-		/* Setup an audio buffer for the incoming audio */
-		if (switch_buffer_create_dynamic(&member->clean_audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-			goto end;
-		}
-	}
-#endif
-
-
 	/* Setup an audio buffer for the outgoing audio */
 	if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
@@ -5344,9 +5253,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
 	conference_del_member(conference, member);
 
 	switch_buffer_destroy(&member->audio_buffer);
-	if (member->clean_audio_buffer) {
-		switch_buffer_destroy(&member->clean_audio_buffer);
-	}
 	switch_buffer_destroy(&member->mux_buffer);
 	switch_clear_flag_locked(member, MFLAG_RUNNING);
 	if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
@@ -6583,9 +6489,6 @@ static switch_status_t conf_api_sub_position(conference_member_t *member, switch
 		if (!switch_test_flag(member, MFLAG_POSITIONAL) && member->conference->channels == 2) {
 			switch_set_flag(member, MFLAG_POSITIONAL);
 			member->al = create_al(member->pool);
-			switch_mutex_lock(member->conference->member_mutex);
-			member->conference->count3d++;
-			switch_mutex_unlock(member->conference->member_mutex);
 		} else {
 		
 			if (stream) {
@@ -9036,14 +8939,6 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
 		member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
 	}
 
-
-#ifdef OPENAL_POSITIONING
-	if (conference->channels == 2) {
-		member->clean_frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
-		member->clean_frame = switch_core_alloc(member->pool, member->clean_frame_size);
-	}
-#endif
-
 	if (read_impl.actual_samples_per_second != conference->rate) {
 		if (switch_resample_create(&member->read_resampler,
 								   read_impl.actual_samples_per_second,
@@ -9088,14 +8983,6 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
 		goto codec_done1;
 	}
 
-	if (conference->channels == 2) {
-		/* Setup an audio buffer for the incoming audio */
-		if (switch_buffer_create_dynamic(&member->clean_audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
-			goto codec_done1;
-		}
-	}
-
 	/* Setup an audio buffer for the outgoing audio */
 	if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
@@ -9683,9 +9570,6 @@ SWITCH_STANDARD_APP(conference_function)
 	switch_event_destroy(&params);
 	switch_buffer_destroy(&member.resample_buffer);
 	switch_buffer_destroy(&member.audio_buffer);
-	if (member.clean_audio_buffer) {
-		switch_buffer_destroy(&member.clean_audio_buffer);
-	}
 	switch_buffer_destroy(&member.mux_buffer);
 
 	if (conference) {

From 025e65a0cdbcaed2272c5496115741584acfbe16 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 23 Jul 2014 01:04:35 +0500
Subject: [PATCH 085/130] fix resampler issue caused by refactoring impacting
 audio quality of resampled calls in the conference

---
 src/mod/applications/mod_conference/mod_conference.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 7242f03557..14df48212a 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -4512,9 +4512,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
 				int16_t *bptr = (int16_t *) read_frame->data;
 				int len = (int) read_frame->datalen;
 
-				switch_resample_process(read_resampler, bptr, len / 2 / member->conference->channels);
-				memcpy(member->resample_out, read_resampler->to, read_resampler->to_len * 2 * member->conference->channels);
-				len = read_resampler->to_len * 2 * member->conference->channels;
+				switch_resample_process(read_resampler, bptr, len / 2 / member->read_impl.number_of_channels);
+				memcpy(member->resample_out, read_resampler->to, read_resampler->to_len * 2 * member->read_impl.number_of_channels);
+				len = read_resampler->to_len * 2 * member->read_impl.number_of_channels;
 				datalen = len;
 				data = member->resample_out;
 			} else {
@@ -8942,7 +8942,7 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
 	if (read_impl.actual_samples_per_second != conference->rate) {
 		if (switch_resample_create(&member->read_resampler,
 								   read_impl.actual_samples_per_second,
-								   conference->rate, member->frame_size, SWITCH_RESAMPLE_QUALITY, conference->channels) != SWITCH_STATUS_SUCCESS) {
+								   conference->rate, member->frame_size, SWITCH_RESAMPLE_QUALITY, read_impl.number_of_channels) != SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Unable to create resampler!\n");
 			goto done;
 		}

From f0d1be5f415a3aa2505d639ad1c16425fd7ad1ef Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 23 Jul 2014 01:05:55 +0500
Subject: [PATCH 086/130] reduce radius for auto positioning

---
 src/mod/applications/mod_conference/mod_conference.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 14df48212a..452d0663a2 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -677,9 +677,9 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
 
 	offset = 180 / (count - 1);
 
-	radius = 2.0f;//3.0f; //(float)count / 2.0f; //3.0f;
+	radius = 1.0f;
 
-	pos = -90.0f;// + (offset / 2.0f);
+	pos = -90.0f;
 	
 	for (member = conference->members; member; member = member->next) {
 

From 35eec3704c036911ef951ab10764ea36f237494c Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 22 Jul 2014 15:19:40 -0500
Subject: [PATCH 087/130] just do the sounds too

---
 build/Makefile.centos5   | 2 +-
 build/Makefile.centos6   | 2 +-
 build/Makefile.openbsd   | 2 +-
 build/Makefile.solaris11 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Makefile.centos5 b/build/Makefile.centos5
index 7eab269d46..ba3188603b 100644
--- a/build/Makefile.centos5
+++ b/build/Makefile.centos5
@@ -32,7 +32,7 @@ freeswitch.git/bootstrap.sh: has-git
 	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git  freeswitch.git
 
 install: freeswitch
-	cd freeswitch.git && make install
+	cd freeswitch.git && make install cd-sounds-install cd-moh-install
 
 install-git: .done
 .done:
diff --git a/build/Makefile.centos6 b/build/Makefile.centos6
index c0dd9b761f..463e31c8c7 100644
--- a/build/Makefile.centos6
+++ b/build/Makefile.centos6
@@ -25,7 +25,7 @@ rpmforge:
 	(which rpm && rpm -i http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm) || true
 
 install:
-	cd freeswitch.git && make install
+	cd freeswitch.git && make install cd-sounds-install cd-moh-install
 
 has-git:
 	@git --version || (echo "please install git" && false)
diff --git a/build/Makefile.openbsd b/build/Makefile.openbsd
index 444471066f..58b0051720 100644
--- a/build/Makefile.openbsd
+++ b/build/Makefile.openbsd
@@ -27,7 +27,7 @@ freeswitch.git/bootstrap.sh: has-git
 	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git freeswitch.git
 
 install:
-	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake install
+	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake install cd-sounds-install cd-moh-install
 
 clean:
 	@rm -rf openssl* ldns* jpeg* pcre* perl* pkg-config* speex* sqlite* libedit* curl* *~
diff --git a/build/Makefile.solaris11 b/build/Makefile.solaris11
index 0097ba1196..c510808e1e 100644
--- a/build/Makefile.solaris11
+++ b/build/Makefile.solaris11
@@ -34,7 +34,7 @@ freeswitch.git/bootstrap.sh: has-git
 	test -d freeswitch.git || git clone https://stash.freeswitch.org/scm/fs/freeswitch.git  freeswitch.git
 
 install: freeswitch
-	cd freeswitch.git && gmake install
+	cd freeswitch.git && gmake install cd-sounds-install cd-moh-install
 
 install-git:
 	pkg install git autoconf automake libtool libjpeg gcc-45 wget

From 03c4014d0eb02305e2416a79b286b1ca8bdbd5de Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 23 Jul 2014 16:10:04 +0000
Subject: [PATCH 088/130] Update bundled version of opus for debian

---
 debian/util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/util.sh b/debian/util.sh
index 61e10633c7..64740b1bd3 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -106,7 +106,7 @@ getlibs () {
   getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz
+  getlib http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/openldap-2.4.19.tar.gz
   getlib http://download.zeromq.org/zeromq-2.1.9.tar.gz \
     || getlib http://download.zeromq.org/historic/zeromq-2.1.9.tar.gz

From f11c40d889584d18e64edabe68a8d96069a0a7da Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 23 Jul 2014 11:26:23 -0500
Subject: [PATCH 089/130] FS-6680 #resolve

---
 src/switch_nat.c | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/switch_nat.c b/src/switch_nat.c
index 503fa891c3..445d2f2b6d 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -151,11 +151,7 @@ static int get_pmp_pubaddr(char *pub_addr)
 	char *pubaddr = NULL;
 	natpmp_t natpmp;
 	const char *err = NULL;
-	switch_pollfd_t *pollfd = NULL;
-	switch_socket_t *sock = NULL;
-	switch_memory_pool_t *pool;
-	int32_t num = 0;
-	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	int pflags;
 
 	if ((r = initnatpmp(&natpmp)) < 0) {
 		err = "init failed";
@@ -167,15 +163,6 @@ static int get_pmp_pubaddr(char *pub_addr)
 		goto end;
 	}
 
-	switch_core_new_memory_pool(&pool);
-
-	switch_os_sock_put(&sock, &natpmp.s, pool);
-
-	if (switch_socket_create_pollset(&pollfd, sock, SWITCH_POLLIN | SWITCH_POLLERR, pool) != SWITCH_STATUS_SUCCESS) {
-		err = "cannot create pollset";
-		goto end;
-	}
-
 	do {
 		struct timeval timeout = { 1, 0 };
 		i++;
@@ -185,16 +172,14 @@ static int get_pmp_pubaddr(char *pub_addr)
 			err = "get timeout failed";
 			goto end;
 		}
-		
-		status = switch_poll(pollfd, 1, &num, switch_interval_time_from_timeval(&timeout));
 
-		if (!(status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_TIMEOUT)) {
-			err = "poll failed";
+		pflags = switch_wait_sock(natpmp.s, 100, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
+
+		if ((pflags & SWITCH_POLL_ERROR) || (pflags & SWITCH_POLL_HUP)) {
+			err = "wait sock failed";
 			goto end;
 		}
-
 		r = readnatpmpresponseorretry(&natpmp, &response);
-
 	} while (r == NATPMP_TRYAGAIN && i < max);
 
 	if (r < 0) {
@@ -210,8 +195,6 @@ static int get_pmp_pubaddr(char *pub_addr)
 
   end:
 
-	switch_core_destroy_memory_pool(&pool);
-
 	if (err) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error checking for PMP [%s]\n", err);
 	}

From 1be1219afe0df55b03d165c77a8b2a2fee524fdb Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 23 Jul 2014 11:28:07 -0500
Subject: [PATCH 090/130] FS-6680 #resolve

---
 src/switch_nat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/switch_nat.c b/src/switch_nat.c
index 445d2f2b6d..51f0c3d1d2 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -173,7 +173,7 @@ static int get_pmp_pubaddr(char *pub_addr)
 			goto end;
 		}
 
-		pflags = switch_wait_sock(natpmp.s, 100, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
+		pflags = switch_wait_sock(natpmp.s, switch_interval_time_from_timeval(&timeout), SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
 
 		if ((pflags & SWITCH_POLL_ERROR) || (pflags & SWITCH_POLL_HUP)) {
 			err = "wait sock failed";

From cf786b184dccf641f3af332acb592c1a4d3d3381 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 23 Jul 2014 13:31:06 -0500
Subject: [PATCH 091/130] FS-6685 mod_skinny: fix behavior of ring if other SLA
 extension is active

---
 src/mod/endpoints/mod_skinny/mod_skinny.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index ab319b2d1b..a6c50d2816 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -528,8 +528,9 @@ uint32_t skinny_line_count_active(listener_t *listener)
 	if ((sql = switch_mprintf(
 			"SELECT call_state FROM skinny_active_lines "
 			"WHERE device_name='%s' AND device_instance=%d "
-			"AND call_state != 2",
-			listener->device_name, listener->device_instance
+			"AND call_state not in (%d,%d,%d)",
+			listener->device_name, listener->device_instance, 
+			SKINNY_ON_HOOK, SKINNY_IN_USE_REMOTELY, SKINNY_HOLD
 			))) {
 
 		skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_count_active_callback, &helper);

From a1d73dfd0901355e2d5878bf2556f273519ab8b7 Mon Sep 17 00:00:00 2001
From: Charlie Root <root@openbsd.mcalester.net>
Date: Wed, 23 Jul 2014 14:52:07 -0500
Subject: [PATCH 092/130] Fix configure check for libjpeg to not break other
 checks

---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d255162dbe..2928a0ab24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,13 +709,16 @@ AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
 AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
 AM_CONDITIONAL([SYSTEM_APRUTIL],[test "${use_system_aprutil}" = "yes"])
 
+save_LIBS="$LIBS"
+LIBS=
 AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
 
 AC_CHECK_LIB(jbig, jbg_enc_out, have_libjbig=yes, have_libjbig=no)
 if test "x$have_libjbig" = "xyes"  ; then
-SPANDSP_LA_JBIG="-ljbig"
+SPANDSP_LA_JBIG="-ljbig $LIBS"
 AC_SUBST(SPANDSP_LA_JBIG)
 fi
+LIBS="$save_LIBS"
 
 AC_CHECK_LIB(lzma, lzma_code, have_liblzma=yes, have_liblzma=no)
 if test "x$have_liblzma" = "xyes" ; then

From 6eda1c0f04301ce382543fb2f85f5a3c30ba7ff3 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 23 Jul 2014 15:39:33 -0500
Subject: [PATCH 093/130] tweak timeout a little as it was changing to 1000000
 on the 5th try on return from switch_interval_time_from_timeval on OpenBSD

---
 src/switch_nat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/switch_nat.c b/src/switch_nat.c
index 51f0c3d1d2..d1ab09eba1 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -165,15 +165,15 @@ static int get_pmp_pubaddr(char *pub_addr)
 
 	do {
 		struct timeval timeout = { 1, 0 };
+
 		i++;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP %d/%d\n", i, max);
-
 		if ((r = getnatpmprequesttimeout(&natpmp, &timeout)) < 0) {
 			err = "get timeout failed";
 			goto end;
 		}
 
-		pflags = switch_wait_sock(natpmp.s, switch_interval_time_from_timeval(&timeout), SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
+		pflags = switch_wait_sock(natpmp.s, 1000, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
 
 		if ((pflags & SWITCH_POLL_ERROR) || (pflags & SWITCH_POLL_HUP)) {
 			err = "wait sock failed";

From 3d5d8163b329f86aafed087815a51494ce50ce1a Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 23 Jul 2014 17:26:24 -0500
Subject: [PATCH 094/130] mod_skinny:

Changes by Ryan Lantzer <lantzer@mst.edu> to correct the generation of
line_instance value in outbound ringer requests as part of trying to
diagnose 79x1 series phones not using the correct ring tone for
calls coming into secondary lines.
---
 src/mod/endpoints/mod_skinny/mod_skinny.c    |  2 +-
 src/mod/endpoints/mod_skinny/skinny_server.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index a6c50d2816..afbeb69325 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -998,7 +998,7 @@ int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnN
 			/* re-enabling for testing to bring back bad behavior */
 			send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
 		}
-		send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
+		send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, line_instance, call_id);
 	}
 	return 0;
 }
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 26566423f0..c1ed9c54b2 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -173,7 +173,7 @@ switch_status_t skinny_create_incoming_session(listener_t *listener, uint32_t *l
 	}
 	skinny_session_set_variables(nsession, listener, *line_instance_p);
 
-	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, *line_instance_p, tech_pvt->call_id);
 	send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
 	send_set_lamp(listener, SKINNY_BUTTON_LINE, *line_instance_p, SKINNY_LAMP_ON);
 	skinny_line_set_state(listener, *line_instance_p, tech_pvt->call_id, SKINNY_OFF_HOOK);
@@ -644,12 +644,12 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
 		send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_BLINK);
 
 		if ( active_calls < 1 && ring_on_idle ) {
-			send_set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+			send_set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, line_instance, helper->tech_pvt->call_id);
 		} else if ( active_calls > 0 && ring_on_active ) {
 			send_start_tone(listener, SKINNY_TONE_CALLWAITTONE, 0, line_instance, helper->tech_pvt->call_id);
 			send_stop_tone(listener, line_instance, helper->tech_pvt->call_id);
 		} else {
-			send_set_ringer(listener, SKINNY_RING_FLASHONLY, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+			send_set_ringer(listener, SKINNY_RING_FLASHONLY, SKINNY_RING_FOREVER, line_instance, helper->tech_pvt->call_id);
 		}
 		switch_channel_ring_ready(channel);
 	}
@@ -750,7 +750,7 @@ int skinny_session_answer_callback(void *pArg, int argc, char **argv, char **col
 
 			send_display_prompt_status_textid(listener, 0, SKINNY_TEXTID_IN_USE_REMOTE, line_instance, helper->tech_pvt->call_id);
 
-			send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+			send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, line_instance, helper->tech_pvt->call_id);
 		}
 	}
 	return 0;
@@ -771,7 +771,7 @@ switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t
 	channel = switch_core_session_get_channel(session);
 	tech_pvt = switch_core_session_get_private(session);
 
-	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, line_instance, tech_pvt->call_id);
 	send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
 	send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
 	skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_OFF_HOOK);
@@ -850,7 +850,7 @@ switch_status_t skinny_session_hold_line(switch_core_session_t *session, listene
 
 	skinny_session_send_call_info(tech_pvt->session, listener, line_instance);
 	send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
-	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, line_instance, tech_pvt->call_id);
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -866,7 +866,7 @@ switch_status_t skinny_session_unhold_line(switch_core_session_t *session, liste
 	tech_pvt = switch_core_session_get_private(session);
 
 	skinny_hold_active_calls(listener);
-	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+	send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, line_instance, tech_pvt->call_id);
 	send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
 	send_select_soft_keys(listener, line_instance, tech_pvt->call_id, SKINNY_KEY_SET_RING_OUT, 0xffff);
 

From 7c01f06e74e4765c121df686e53dd600e94f20dc Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 23 Jul 2014 20:28:15 +0500
Subject: [PATCH 095/130] use final_delivery variable in chat plan to indicate
 that you do not want to deliver the message to its intended recipient because
 you have already pre-empted the message

---
 src/switch_loadable_module.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index f9bda289f2..2f0e3a7c94 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -592,8 +592,6 @@ static switch_status_t do_chat_send(switch_event_t *message_event)
 	const char *hint;
 	*/		
 
-
-
 	dest_proto = switch_event_get_header(message_event, "dest_proto");
 
 	if (!dest_proto) {
@@ -626,20 +624,21 @@ static switch_status_t do_chat_send(switch_event_t *message_event)
 			if ((ci = (switch_chat_interface_t *) val)) {
 				if (ci->chat_send && !strncasecmp(ci->interface_name, "GLOBAL_", 7)) {
 					status = ci->chat_send(message_event);
+					
 					if (status == SWITCH_STATUS_SUCCESS) {
-						/* The event was handled by an extension in the chatplan, 
-						 * so the event will be duplicated, modified and queued again, 
-						 * but it won't be processed by the chatplan again.
-						 * So this copy of the event can be destroyed by the caller.
-						 */ 
-						switch_mutex_unlock(loadable_modules.mutex);
-						return SWITCH_STATUS_SUCCESS;
+						if (switch_true(switch_event_get_header(message_event, "final_delivery"))) {
+							/* The event was handled by an extension in the chatplan, 
+							 * so the event will be duplicated, modified and queued again, 
+							 * but it won't be processed by the chatplan again.
+							 * So this copy of the event can be destroyed by the caller.
+							 */ 
+							do_skip = 1;
+						}
 					} else if (status == SWITCH_STATUS_BREAK) {
 						/* The event went through the chatplan, but no extension matched
 						 * to handle the sms messsage. It'll be attempted to be delivered
 						 * directly, and unless that works the sms delivery will have failed.
 						 */
-						do_skip = 1;
 					} else {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Chat Interface Error [%s]!\n", dest_proto);
 						break;

From cb7a3385aa8528108d5f59131ba9434671633128 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 10:13:13 +0500
Subject: [PATCH 096/130] go back to hosting js files for demo since some
 places block it

---
 html5/verto/demo/css/jquery.mobile.min.css   |   3 +
 html5/verto/demo/js/jquery-2.1.1.min.js      |   4 +
 html5/verto/demo/js/jquery.dataTables.min.js | 155 +++++++++++++++++++
 html5/verto/demo/js/jquery.mobile.min.js     |  10 ++
 4 files changed, 172 insertions(+)
 create mode 100644 html5/verto/demo/css/jquery.mobile.min.css
 create mode 100644 html5/verto/demo/js/jquery-2.1.1.min.js
 create mode 100644 html5/verto/demo/js/jquery.dataTables.min.js
 create mode 100644 html5/verto/demo/js/jquery.mobile.min.js

diff --git a/html5/verto/demo/css/jquery.mobile.min.css b/html5/verto/demo/css/jquery.mobile.min.css
new file mode 100644
index 0000000000..d15453aa13
--- /dev/null
+++ b/html5/verto/demo/css/jquery.mobile.min.css
@@ -0,0 +1,3 @@
+/*! jQuery Mobile 1.4.3 | Git HEADhash: b9c6473 <> 2014-07-01T15:37:36Z | (c) 2010, 2014 jQuery Foundation, Inc. | jquery.org/license */
+
+.ui-icon-action:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M9%2C5v3l5-4L9%2C0v3c0%2C0-5%2C0-5%2C7C6%2C5%2C9%2C5%2C9%2C5z%20M11%2C12H2V5h1l2-2H0v11h13V7l-2%2C2V12z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-alert:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M7%2C0L0%2C12h14L7%2C0z%20M7%2C11c-0.553%2C0-1-0.447-1-1s0.447-1%2C1-1c0.553%2C0%2C1%2C0.447%2C1%2C1S7.553%2C11%2C7%2C11z%20M7%2C8%20C6.447%2C8%2C6%2C7.553%2C6%2C7V5c0-0.553%2C0.447-1%2C1-1c0.553%2C0%2C1%2C0.447%2C1%2C1v2C8%2C7.553%2C7.553%2C8%2C7%2C8z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-arrow-d-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C3%2011%2C0%203.5%2C7.5%200%2C4%200%2C14%2010%2C14%206.5%2C10.5%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-d-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2210.5%2C7.5%203%2C0%200%2C3%207.5%2C10.5%204%2C14%2014%2C14%2014%2C4%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-d:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%229%2C7%209%2C0%205%2C0%205%2C7%200%2C7%207%2C14%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%227%2C5%207%2C0%200%2C7%207%2C14%207%2C9%2014%2C9%2014%2C5%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C7%207%2C0%207%2C5%200%2C5%200%2C9%207%2C9%207%2C14%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-u-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C11%206.5%2C3.5%2010%2C0%200%2C0%200%2C10%203.5%2C6.5%2011%2C14%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-u-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C0%204%2C0%207.5%2C3.5%200%2C11%203%2C14%2010.5%2C6.5%2014%2C10%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-arrow-u:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%227%2C0%200%2C7%205%2C7%205%2C14%209%2C14%209%2C7%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-audio:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214.018px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014.018%2014%22%20style%3D%22enable-background%3Anew%200%200%2014.018%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M1%2C4C0.447%2C4%2C0%2C4.447%2C0%2C5v4c0%2C0.553%2C0.447%2C1%2C1%2C1h1l4%2C4V0L2%2C4H1z%20M10.346%2C7c0-1.699-1.042-3.154-2.546-3.867L6.982%2C4.68%20C7.885%2C5.107%2C8.51%2C5.98%2C8.51%2C7S7.885%2C8.893%2C6.982%2C9.32L7.8%2C10.867C9.304%2C10.154%2C10.346%2C8.699%2C10.346%2C7z%20M9.447%2C0.017L8.618%2C1.586%20C10.723%2C2.584%2C12.182%2C4.621%2C12.182%2C7s-1.459%2C4.416-3.563%2C5.414l0.829%2C1.569c2.707-1.283%2C4.57-3.925%2C4.57-6.983%20S12.154%2C1.3%2C9.447%2C0.017z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-back:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M5%2C3V0L1%2C4l4%2C4V5c0%2C0%2C6%2C0%2C6%2C3s-5%2C4-5%2C4v2c0%2C0%2C7-1%2C7-6C13%2C4%2C8%2C3%2C5%2C3z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-bars:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M1%2C4h12c0.553%2C0%2C1-0.447%2C1-1s-0.447-1-1-1H1C0.447%2C2%2C0%2C2.447%2C0%2C3S0.447%2C4%2C1%2C4z%20M13%2C6H1%20C0.447%2C6%2C0%2C6.447%2C0%2C7c0%2C0.553%2C0.447%2C1%2C1%2C1h12c0.553%2C0%2C1-0.447%2C1-1C14%2C6.447%2C13.553%2C6%2C13%2C6z%20M13%2C10H1c-0.553%2C0-1%2C0.447-1%2C1%20s0.447%2C1%2C1%2C1h12c0.553%2C0%2C1-0.447%2C1-1S13.553%2C10%2C13%2C10z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-bullets:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M5%2C4h8c0.553%2C0%2C1-0.447%2C1-1s-0.447-1-1-1H5C4.447%2C2%2C4%2C2.447%2C4%2C3S4.447%2C4%2C5%2C4z%20M13%2C6H5%20C4.447%2C6%2C4%2C6.447%2C4%2C7c0%2C0.553%2C0.447%2C1%2C1%2C1h8c0.553%2C0%2C1-0.447%2C1-1C14%2C6.447%2C13.553%2C6%2C13%2C6z%20M13%2C10H5c-0.553%2C0-1%2C0.447-1%2C1%20s0.447%2C1%2C1%2C1h8c0.553%2C0%2C1-0.447%2C1-1S13.553%2C10%2C13%2C10z%20M1%2C2C0.447%2C2%2C0%2C2.447%2C0%2C3s0.447%2C1%2C1%2C1s1-0.447%2C1-1S1.553%2C2%2C1%2C2z%20M1%2C6%20C0.447%2C6%2C0%2C6.447%2C0%2C7c0%2C0.553%2C0.447%2C1%2C1%2C1s1-0.447%2C1-1C2%2C6.447%2C1.553%2C6%2C1%2C6z%20M1%2C10c-0.553%2C0-1%2C0.447-1%2C1s0.447%2C1%2C1%2C1s1-0.447%2C1-1%20S1.553%2C10%2C1%2C10z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-calendar:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M0%2C8h2V6H0V8z%20M3%2C8h2V6H3V8z%20M6%2C8h2V6H6V8z%20M9%2C8h2V6H9V8z%20M12%2C8h2V6h-2V8z%20M0%2C11h2V9H0V11z%20M3%2C11h2V9H3V11z%20M6%2C11h2V9H6V11z%20%20M9%2C11h2V9H9V11z%20M12%2C11h2V9h-2V11z%20M0%2C14h2v-2H0V14z%20M3%2C14h2v-2H3V14z%20M6%2C14h2v-2H6V14z%20M9%2C14h2v-2H9V14z%20M12%2C1%20c0-0.553-0.447-1-1-1s-1%2C0.447-1%2C1H4c0-0.553-0.447-1-1-1S2%2C0.447%2C2%2C1H0v4h14V1H12z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-camera:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M12%2C2.5H9.908c-0.206-0.581-0.756-1-1.408-1h-3c-0.652%2C0-1.202%2C0.419-1.408%2C1H2c-1.104%2C0-2%2C0.896-2%2C2%20v6c0%2C1.104%2C0.896%2C2%2C2%2C2h10c1.104%2C0%2C2-0.896%2C2-2v-6C14%2C3.396%2C13.104%2C2.5%2C12%2C2.5z%20M7%2C10.5c-1.657%2C0-3-1.344-3-3c0-1.657%2C1.343-3%2C3-3%20s3%2C1.343%2C3%2C3C10%2C9.156%2C8.657%2C10.5%2C7%2C10.5z%20M7%2C5.5c-1.104%2C0-2%2C0.896-2%2C2c0%2C1.104%2C0.896%2C2%2C2%2C2c1.104%2C0%2C2-0.896%2C2-2%20C9%2C6.396%2C8.104%2C5.5%2C7%2C5.5z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-carat-d:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%2211.949%2C3.404%207%2C8.354%202.05%2C3.404%20-0.071%2C5.525%207%2C12.596%2014.07%2C5.525%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-carat-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%2210.596%2C11.949%205.646%2C7%2010.596%2C2.05%208.475%2C-0.071%201.404%2C7%208.475%2C14.07%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-carat-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%223.404%2C2.051%208.354%2C7%203.404%2C11.95%205.525%2C14.07%2012.596%2C7%205.525%2C-0.071%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-carat-u:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%222.051%2C10.596%207%2C5.646%2011.95%2C10.596%2014.07%2C8.475%207%2C1.404%20-0.071%2C8.475%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-check:after,html .ui-btn.ui-checkbox-on.ui-checkbox-on:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%2214%2C4%2011%2C1%205.003%2C6.997%203%2C5%200%2C8%204.966%2C13%204.983%2C12.982%205%2C13%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-clock:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M7%2C0C3.134%2C0%2C0%2C3.134%2C0%2C7s3.134%2C7%2C7%2C7s7-3.134%2C7-7S10.866%2C0%2C7%2C0z%20M7%2C12c-2.762%2C0-5-2.238-5-5s2.238-5%2C5-5s5%2C2.238%2C5%2C5%20S9.762%2C12%2C7%2C12z%20M9%2C6H8V4c0-0.553-0.447-1-1-1S6%2C3.447%2C6%2C4v3c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1S9.553%2C6%2C9%2C6z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-cloud:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M14%2C9.5c0-0.793-0.465-1.473-1.134-1.795C12.949%2C7.484%2C13%2C7.249%2C13%2C7c0-1.104-0.896-2-2-2%20c-0.158%2C0-0.311%2C0.023-0.457%2C0.058C9.816%2C3.549%2C8.286%2C2.5%2C6.5%2C2.5c-2.33%2C0-4.224%2C1.777-4.454%2C4.046C0.883%2C6.76%2C0%2C7.773%2C0%2C9%20c0%2C1.381%2C1.119%2C2.5%2C2.5%2C2.5h10v-0.07C13.361%2C11.206%2C14%2C10.432%2C14%2C9.5z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-comment:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M12%2C0H2C0.896%2C0%2C0%2C0.896%2C0%2C2v7c0%2C1.104%2C0.896%2C2%2C2%2C2h1v3l3-3h6c1.104%2C0%2C2-0.896%2C2-2V2C14%2C0.896%2C13.104%2C0%2C12%2C0z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-delete:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C3%2011%2C0%207%2C4%203%2C0%200%2C3%204%2C7%200%2C11%203%2C14%207%2C10%2011%2C14%2014%2C11%2010%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-edit:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M1%2C10l-1%2C4l4-1l7-7L8%2C3L1%2C10z%20M11%2C0L9%2C2l3%2C3l2-2L11%2C0z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-eye:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M7%2C2C3%2C2%2C0%2C7%2C0%2C7s3%2C5%2C7%2C5s7-5%2C7-5S11%2C2%2C7%2C2z%20M7%2C10c-1.657%2C0-3-1.344-3-3c0-1.657%2C1.343-3%2C3-3%20s3%2C1.343%2C3%2C3C10%2C8.656%2C8.657%2C10%2C7%2C10z%20M7%2C6C6.448%2C6%2C6%2C6.447%2C6%2C7c0%2C0.553%2C0.448%2C1%2C1%2C1s1-0.447%2C1-1C8%2C6.447%2C7.552%2C6%2C7%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-forbidden:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M12.601%2C11.187C13.476%2C10.018%2C14%2C8.572%2C14%2C7c0-3.866-3.134-7-7-7C5.428%2C0%2C3.982%2C0.524%2C2.813%2C1.399L2.757%2C1.343L2.053%2C2.048%20L2.048%2C2.053L1.343%2C2.758l0.056%2C0.056C0.524%2C3.982%2C0%2C5.428%2C0%2C7c0%2C3.866%2C3.134%2C7%2C7%2C7c1.572%2C0%2C3.018-0.524%2C4.187-1.399l0.056%2C0.057%20l0.705-0.705l0.005-0.005l0.705-0.705L12.601%2C11.187z%20M7%2C2c2.761%2C0%2C5%2C2.238%2C5%2C5c0%2C1.019-0.308%2C1.964-0.832%2C2.754L4.246%2C2.832%20C5.036%2C2.308%2C5.981%2C2%2C7%2C2z%20M7%2C12c-2.761%2C0-5-2.238-5-5c0-1.019%2C0.308-1.964%2C0.832-2.754l6.922%2C6.922C8.964%2C11.692%2C8.019%2C12%2C7%2C12z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-forward:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M13%2C4L9%2C0v3C6%2C3%2C1%2C4%2C1%2C8c0%2C5%2C7%2C6%2C7%2C6v-2c0%2C0-5-1-5-4s6-3%2C6-3v3L13%2C4z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-gear:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M13.621%2C5.904l-1.036-0.259c-0.168-0.042-0.303-0.168-0.355-0.332c-0.092-0.284-0.205-0.559-0.339-0.82%20c-0.079-0.153-0.073-0.337%2C0.017-0.486l0.549-0.915c0.118-0.196%2C0.088-0.448-0.075-0.61l-0.862-0.863%20c-0.162-0.163-0.414-0.193-0.611-0.075l-0.916%2C0.55C9.844%2C2.182%2C9.659%2C2.188%2C9.506%2C2.109C9.244%2C1.975%2C8.97%2C1.861%2C8.686%2C1.77%20c-0.165-0.052-0.29-0.187-0.332-0.354L8.095%2C0.379C8.039%2C0.156%2C7.839%2C0%2C7.609%2C0H6.391c-0.229%2C0-0.43%2C0.156-0.485%2C0.379L5.646%2C1.415%20C5.604%2C1.582%2C5.479%2C1.718%2C5.313%2C1.77c-0.284%2C0.092-0.559%2C0.206-0.82%2C0.34C4.339%2C2.188%2C4.155%2C2.182%2C4.007%2C2.093L3.092%2C1.544%20c-0.196-0.118-0.448-0.087-0.61%2C0.075L1.619%2C2.481C1.457%2C2.644%2C1.426%2C2.896%2C1.544%2C3.093l0.549%2C0.914%20c0.089%2C0.148%2C0.095%2C0.332%2C0.017%2C0.486C1.975%2C4.755%2C1.861%2C5.029%2C1.77%2C5.314c-0.053%2C0.164-0.188%2C0.29-0.354%2C0.332L0.379%2C5.905%20C0.156%2C5.961%2C0%2C6.161%2C0%2C6.391v1.219c0%2C0.229%2C0.156%2C0.43%2C0.379%2C0.485l1.036%2C0.26C1.582%2C8.396%2C1.717%2C8.521%2C1.77%2C8.687%20c0.092%2C0.284%2C0.205%2C0.559%2C0.34%2C0.82C2.188%2C9.66%2C2.182%2C9.844%2C2.093%2C9.993l-0.549%2C0.915c-0.118%2C0.195-0.087%2C0.448%2C0.075%2C0.61%20l0.862%2C0.862c0.162%2C0.163%2C0.414%2C0.193%2C0.61%2C0.075l0.915-0.549c0.148-0.089%2C0.332-0.095%2C0.486-0.017%20c0.262%2C0.135%2C0.536%2C0.248%2C0.82%2C0.34c0.165%2C0.053%2C0.291%2C0.187%2C0.332%2C0.354l0.259%2C1.036C5.96%2C13.844%2C6.16%2C14%2C6.39%2C14h1.22%20c0.229%2C0%2C0.43-0.156%2C0.485-0.379l0.259-1.036c0.042-0.167%2C0.168-0.302%2C0.333-0.354c0.284-0.092%2C0.559-0.205%2C0.82-0.34%20c0.154-0.078%2C0.338-0.072%2C0.486%2C0.017l0.914%2C0.549c0.197%2C0.118%2C0.449%2C0.088%2C0.611-0.074l0.862-0.863%20c0.163-0.162%2C0.193-0.415%2C0.075-0.611l-0.549-0.915c-0.089-0.148-0.096-0.332-0.017-0.485c0.134-0.263%2C0.248-0.536%2C0.339-0.82%20c0.053-0.165%2C0.188-0.291%2C0.355-0.333l1.036-0.259C13.844%2C8.039%2C14%2C7.839%2C14%2C7.609V6.39C14%2C6.16%2C13.844%2C5.96%2C13.621%2C5.904z%20M7%2C10%20c-1.657%2C0-3-1.343-3-3s1.343-3%2C3-3s3%2C1.343%2C3%2C3S8.657%2C10%2C7%2C10z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-grid:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M3%2C0H1C0.447%2C0%2C0%2C0.447%2C0%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C4%2C0.447%2C3.553%2C0%2C3%2C0z%20M8%2C0H6%20C5.447%2C0%2C5%2C0.447%2C5%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C9%2C0.447%2C8.553%2C0%2C8%2C0z%20M13%2C0h-2c-0.553%2C0-1%2C0.447-1%2C1v2%20c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C14%2C0.447%2C13.553%2C0%2C13%2C0z%20M3%2C5H1C0.447%2C5%2C0%2C5.447%2C0%2C6v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2%20c0.553%2C0%2C1-0.447%2C1-1V6C4%2C5.447%2C3.553%2C5%2C3%2C5z%20M8%2C5H6C5.447%2C5%2C5%2C5.447%2C5%2C6v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V6%20C9%2C5.447%2C8.553%2C5%2C8%2C5z%20M13%2C5h-2c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V6C14%2C5.447%2C13.553%2C5%2C13%2C5z%20M3%2C10%20H1c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1v-2C4%2C10.447%2C3.553%2C10%2C3%2C10z%20M8%2C10H6c-0.553%2C0-1%2C0.447-1%2C1v2%20c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1v-2C9%2C10.447%2C8.553%2C10%2C8%2C10z%20M13%2C10h-2c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2%20c0.553%2C0%2C1-0.447%2C1-1v-2C14%2C10.447%2C13.553%2C10%2C13%2C10z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-heart:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M7%2C1.872c-2-3-7-2-7%2C2c0%2C3%2C4%2C7%2C4%2C7s2.417%2C2.479%2C3%2C3c0.583-0.521%2C3-3%2C3-3s4-4%2C4-7%20C14-0.128%2C9-1.128%2C7%2C1.872z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-home:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%227%2C0%200%2C7%202%2C7%202%2C14%205%2C14%205%2C9%209%2C9%209%2C14%2012%2C14%2012%2C7%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-info:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M7%2C0C3.134%2C0%2C0%2C3.134%2C0%2C7s3.134%2C7%2C7%2C7s7-3.134%2C7-7S10.866%2C0%2C7%2C0z%20M7%2C2c0.552%2C0%2C1%2C0.447%2C1%2C1S7.552%2C4%2C7%2C4S6%2C3.553%2C6%2C3%20S6.448%2C2%2C7%2C2z%20M9%2C11H5v-1h1V6H5V5h3v5h1V11z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-location:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M7%2C0C4.791%2C0%2C3%2C1.791%2C3%2C4c0%2C2%2C4%2C10%2C4%2C10s4-8%2C4-10C11%2C1.791%2C9.209%2C0%2C7%2C0z%20M7%2C6C5.896%2C6%2C5%2C5.104%2C5%2C4%20s0.896-2%2C2-2c1.104%2C0%2C2%2C0.896%2C2%2C2S8.104%2C6%2C7%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-lock:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M12%2C6V5c0-2.762-2.238-5-5-5C4.239%2C0%2C2%2C2.238%2C2%2C5v1H1v8h12V6H12z%20M7.5%2C9.848V12h-1V9.848%20C6.207%2C9.673%2C6%2C9.366%2C6%2C9c0-0.553%2C0.448-1%2C1-1s1%2C0.447%2C1%2C1C8%2C9.366%2C7.793%2C9.673%2C7.5%2C9.848z%20M10%2C6H4V5c0-1.657%2C1.343-3%2C3-3%20s3%2C1.343%2C3%2C3V6z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-mail:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M0%2C3.75V12h14V3.75L7%2C9L0%2C3.75z%20M14%2C2H0l7%2C5L14%2C2z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-minus:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Crect%20y%3D%225%22%20style%3D%22fill%3A%23FFFFFF%3B%22%20width%3D%2214%22%20height%3D%224%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-navigation:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%2213%2C1%200%2C6%207%2C7%208%2C14%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-phone:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%22-0.01%200.008%2014%2014%22%20style%3D%22enable-background%3Anew%20-0.01%200.008%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M6.939%2C9.189C6.165%2C8.557%2C5.271%2C7.705%2C4.497%2C6.744C3.953%2C6.071%2C3.473%2C5.363%2C3.969%2C4.866l-3.482-3.48%20C-0.021%2C2.02-1.146%2C5.04%2C3.675%2C9.984c5.08%2C5.211%2C8.356%2C4.097%2C8.92%2C3.511l-3.396-3.4C8.725%2C10.568%2C8.113%2C10.146%2C6.939%2C9.189z%20%20M13.82%2C11.519v-0.004c0%2C0-2.648-2.646-2.649-2.647c-0.21-0.211-0.546-0.205-0.754%2C0.002L9.455%2C9.831l3.403%2C3.407%20c0%2C0%2C0.962-0.96%2C0.961-0.961l0.002-0.001C14.043%2C12.056%2C14.021%2C11.721%2C13.82%2C11.519z%20M5.192%2C3.644V3.642%20c0.222-0.222%2C0.2-0.557%2C0-0.758V2.881c0%2C0-2.726-2.725-2.727-2.726C2.255-0.055%2C1.92-0.05%2C1.712%2C0.156L0.751%2C1.121l3.479%2C3.482%20C4.231%2C4.604%2C5.192%2C3.645%2C5.192%2C3.644z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-plus:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23FFF%22%20points%3D%2214%2C5%209%2C5%209%2C0%205%2C0%205%2C5%200%2C5%200%2C9%205%2C9%205%2C14%209%2C14%209%2C9%2014%2C9%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-power:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M11.243%2C2.408c-0.392-0.401-1.024-0.401-1.415%2C0c-0.391%2C0.401-0.391%2C1.054%2C0%2C1.455%20C10.584%2C4.642%2C11%2C5.675%2C11%2C6.773s-0.416%2C2.133-1.172%2C2.91c-1.512%2C1.558-4.145%2C1.558-5.656%2C0C3.416%2C8.904%2C3%2C7.872%2C3%2C6.773%20C3%2C5.673%2C3.416%2C4.64%2C4.172%2C3.863c0.39-0.401%2C0.39-1.054%2C0-1.455c-0.391-0.401-1.024-0.401-1.415%2C0C1.624%2C3.574%2C1%2C5.125%2C1%2C6.773%20c0%2C1.647%2C0.624%2C3.199%2C1.757%2C4.365c1.134%2C1.166%2C2.64%2C1.809%2C4.243%2C1.809c1.604%2C0%2C3.109-0.645%2C4.243-1.811%20C12.376%2C9.975%2C13%2C8.423%2C13%2C6.773C13%2C5.125%2C12.376%2C3.574%2C11.243%2C2.408z%20M7%2C8.053c0.553%2C0%2C1-0.445%2C1-1v-6c0-0.553-0.447-1-1-1%20c-0.553%2C0-1%2C0.447-1%2C1v6C6%2C7.604%2C6.447%2C8.053%2C7%2C8.053z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-recycle:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M3%2C7h1L2%2C4L0%2C7h1c0%2C3.313%2C2.687%2C6%2C6%2C6c0.702%2C0%2C1.374-0.127%2C2-0.35v-2.205C8.41%2C10.789%2C7.732%2C11%2C7%2C11%20C4.791%2C11%2C3%2C9.209%2C3%2C7z%20M13%2C7c0-3.313-2.688-6-6-6C6.298%2C1%2C5.626%2C1.127%2C5%2C1.349v2.206C5.59%2C3.211%2C6.268%2C3%2C7%2C3c2.209%2C0%2C4%2C1.791%2C4%2C4%20h-1l2%2C3l2-3H13z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-refresh:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214.001px%22%20height%3D%2214.002px%22%20viewBox%3D%220%200%2014.001%2014.002%22%20style%3D%22enable-background%3Anew%200%200%2014.001%2014.002%3B%22%20%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M14.001%2C6.001v-6l-2.06%2C2.06c-0.423-0.424-0.897-0.809-1.44-1.122C7.153-0.994%2C2.872%2C0.153%2C0.939%2C3.501%20c-1.933%2C3.348-0.786%2C7.629%2C2.562%2C9.562c3.348%2C1.933%2C7.629%2C0.785%2C9.562-2.562l-1.732-1c-1.381%2C2.392-4.438%2C3.211-6.83%2C1.83%20s-3.211-4.438-1.83-6.83s4.438-3.211%2C6.83-1.83c0.389%2C0.225%2C0.718%2C0.506%2C1.02%2C0.81l-2.52%2C2.52H14.001z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-search:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M10.171%2C8.766c0.617-0.888%2C0.979-1.964%2C0.979-3.126c0-3.037-2.463-5.5-5.5-5.5s-5.5%2C2.463-5.5%2C5.5%20s2.463%2C5.5%2C5.5%2C5.5c1.152%2C0%2C2.223-0.355%2C3.104-0.962l3.684%2C3.683l1.414-1.414L10.171%2C8.766z%20M5.649%2C9.14c-1.933%2C0-3.5-1.567-3.5-3.5%20c0-1.933%2C1.567-3.5%2C3.5-3.5c1.933%2C0%2C3.5%2C1.567%2C3.5%2C3.5C9.149%2C7.572%2C7.582%2C9.14%2C5.649%2C9.14z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-shop:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M10%2C4V3c0-1.657-1.343-3-3-3S4%2C1.343%2C4%2C3v1H1v10h12V4H10z%20M4.5%2C6C4.224%2C6%2C4%2C5.776%2C4%2C5.5%20S4.224%2C5%2C4.5%2C5S5%2C5.224%2C5%2C5.5S4.776%2C6%2C4.5%2C6z%20M5%2C3c0-1.104%2C0.896-2%2C2-2c1.104%2C0%2C2%2C0.896%2C2%2C2v1H5V3z%20M9.5%2C6C9.225%2C6%2C9%2C5.776%2C9%2C5.5%20S9.225%2C5%2C9.5%2C5S10%2C5.224%2C10%2C5.5S9.775%2C6%2C9.5%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-star:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20style%3D%22fill%3A%23FFFFFF%3B%22%20points%3D%2214%2C5%209%2C5%207%2C0%205%2C5%200%2C5%204%2C8%202.625%2C13%207%2C10%2011.375%2C13%2010%2C8%20%22%2F%3E%3C%2Fsvg%3E")}.ui-icon-tag:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M5%2C0H0v5l9%2C9l5-5L5%2C0z%20M3%2C4C2.447%2C4%2C2%2C3.553%2C2%2C3s0.447-1%2C1-1s1%2C0.447%2C1%2C1S3.553%2C4%2C3%2C4z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-user:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M8.851%2C10.101c-0.18-0.399-0.2-0.763-0.153-1.104C9.383%2C8.49%2C9.738%2C7.621%2C9.891%2C6.465C10.493%2C6.355%2C10.5%2C5.967%2C10.5%2C5.5%20c0-0.437-0.008-0.804-0.502-0.94C9.999%2C4.539%2C10%2C4.521%2C10%2C4.5c0-2.103-1-4-2-4C8%2C0.5%2C7.5%2C0%2C6.5%2C0C5%2C0%2C4%2C1.877%2C4%2C4.5%20c0%2C0.021%2C0.001%2C0.039%2C0.002%2C0.06C3.508%2C4.696%2C3.5%2C5.063%2C3.5%2C5.5c0%2C0.467%2C0.007%2C0.855%2C0.609%2C0.965%20C4.262%2C7.621%2C4.617%2C8.49%2C5.303%2C8.997c0.047%2C0.341%2C0.026%2C0.704-0.153%2C1.104C1.503%2C10.503%2C0%2C12%2C0%2C12v2h14v-2%20C14%2C12%2C12.497%2C10.503%2C8.851%2C10.101z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-icon-video:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%20-2%2014%2014%22%20style%3D%22enable-background%3Anew%200%20-2%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20style%3D%22fill%3A%23FFFFFF%3B%22%20d%3D%22M8%2C0H2C0.896%2C0%2C0%2C0.896%2C0%2C2v6c0%2C1.104%2C0.896%2C2%2C2%2C2h6c1.104%2C0%2C2-0.896%2C2-2V5V2C10%2C0.896%2C9.104%2C0%2C8%2C0z%20%20M10%2C5l4%2C4V1L10%2C5z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-action:after,.ui-alt-icon .ui-icon-action:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M9%2C5v3l5-4L9%2C0v3c0%2C0-5%2C0-5%2C7C6%2C5%2C9%2C5%2C9%2C5z%20M11%2C12H2V5h1l2-2H0v11h13V7l-2%2C2V12z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-alert:after,.ui-alt-icon .ui-icon-alert:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C0L0%2C12h14L7%2C0z%20M7%2C11c-0.553%2C0-1-0.447-1-1s0.447-1%2C1-1c0.553%2C0%2C1%2C0.447%2C1%2C1S7.553%2C11%2C7%2C11z%20M7%2C8C6.447%2C8%2C6%2C7.553%2C6%2C7V5%20c0-0.553%2C0.447-1%2C1-1c0.553%2C0%2C1%2C0.447%2C1%2C1v2C8%2C7.553%2C7.553%2C8%2C7%2C8z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-d:after,.ui-alt-icon .ui-icon-arrow-d:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%229%2C7%209%2C0%205%2C0%205%2C7%200%2C7%207%2C14%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-d-l:after,.ui-alt-icon .ui-icon-arrow-d-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C3%2011%2C0%203.5%2C7.5%200%2C4%200%2C14%2010%2C14%206.5%2C10.5%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-d-r:after,.ui-alt-icon .ui-icon-arrow-d-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2210.5%2C7.5%203%2C0%200%2C3%207.5%2C10.5%204%2C14%2014%2C14%2014%2C4%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-l:after,.ui-alt-icon .ui-icon-arrow-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%227%2C5%207%2C0%200%2C7%207%2C14%207%2C9%2014%2C9%2014%2C5%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-r:after,.ui-alt-icon .ui-icon-arrow-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C7%207%2C0%207%2C5%200%2C5%200%2C9%207%2C9%207%2C14%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-u:after,.ui-alt-icon .ui-icon-arrow-u:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%227%2C0%200%2C7%205%2C7%205%2C14%209%2C14%209%2C7%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-u-l:after,.ui-alt-icon .ui-icon-arrow-u-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C11%206.5%2C3.5%2010%2C0%200%2C0%200%2C10%203.5%2C6.5%2011%2C14%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-arrow-u-r:after,.ui-alt-icon .ui-icon-arrow-u-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C0%204%2C0%207.5%2C3.5%200%2C11%203%2C14%2010.5%2C6.5%2014%2C10%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-audio:after,.ui-alt-icon .ui-icon-audio:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214.018px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014.018%2014%22%20style%3D%22enable-background%3Anew%200%200%2014.018%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M1%2C4C0.447%2C4%2C0%2C4.447%2C0%2C5v4c0%2C0.553%2C0.447%2C1%2C1%2C1h1l4%2C4V0L2%2C4H1z%20M10.346%2C7c0-1.699-1.042-3.154-2.546-3.867L6.982%2C4.68%20C7.885%2C5.107%2C8.51%2C5.98%2C8.51%2C7S7.885%2C8.893%2C6.982%2C9.32L7.8%2C10.867C9.304%2C10.154%2C10.346%2C8.699%2C10.346%2C7z%20M9.447%2C0.017L8.618%2C1.586%20C10.723%2C2.584%2C12.182%2C4.621%2C12.182%2C7s-1.459%2C4.416-3.563%2C5.414l0.829%2C1.569c2.707-1.283%2C4.57-3.925%2C4.57-6.983%20S12.154%2C1.3%2C9.447%2C0.017z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-back:after,.ui-alt-icon .ui-icon-back:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M5%2C3V0L1%2C4l4%2C4V5c0%2C0%2C6%2C0%2C6%2C3s-5%2C4-5%2C4v2c0%2C0%2C7-1%2C7-6C13%2C4%2C8%2C3%2C5%2C3z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-bars:after,.ui-alt-icon .ui-icon-bars:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M1%2C4h12c0.553%2C0%2C1-0.447%2C1-1s-0.447-1-1-1H1C0.447%2C2%2C0%2C2.447%2C0%2C3S0.447%2C4%2C1%2C4z%20M13%2C6H1C0.447%2C6%2C0%2C6.447%2C0%2C7%20c0%2C0.553%2C0.447%2C1%2C1%2C1h12c0.553%2C0%2C1-0.447%2C1-1C14%2C6.447%2C13.553%2C6%2C13%2C6z%20M13%2C10H1c-0.553%2C0-1%2C0.447-1%2C1s0.447%2C1%2C1%2C1h12%20c0.553%2C0%2C1-0.447%2C1-1S13.553%2C10%2C13%2C10z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-bullets:after,.ui-alt-icon .ui-icon-bullets:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M5%2C4h8c0.553%2C0%2C1-0.447%2C1-1s-0.447-1-1-1H5C4.447%2C2%2C4%2C2.447%2C4%2C3S4.447%2C4%2C5%2C4z%20M13%2C6H5C4.447%2C6%2C4%2C6.447%2C4%2C7%20c0%2C0.553%2C0.447%2C1%2C1%2C1h8c0.553%2C0%2C1-0.447%2C1-1C14%2C6.447%2C13.553%2C6%2C13%2C6z%20M13%2C10H5c-0.553%2C0-1%2C0.447-1%2C1s0.447%2C1%2C1%2C1h8%20c0.553%2C0%2C1-0.447%2C1-1S13.553%2C10%2C13%2C10z%20M1%2C2C0.447%2C2%2C0%2C2.447%2C0%2C3s0.447%2C1%2C1%2C1s1-0.447%2C1-1S1.553%2C2%2C1%2C2z%20M1%2C6C0.447%2C6%2C0%2C6.447%2C0%2C7%20c0%2C0.553%2C0.447%2C1%2C1%2C1s1-0.447%2C1-1C2%2C6.447%2C1.553%2C6%2C1%2C6z%20M1%2C10c-0.553%2C0-1%2C0.447-1%2C1s0.447%2C1%2C1%2C1s1-0.447%2C1-1S1.553%2C10%2C1%2C10z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-calendar:after,.ui-alt-icon .ui-icon-calendar:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M0%2C8h2V6H0V8z%20M3%2C8h2V6H3V8z%20M6%2C8h2V6H6V8z%20M9%2C8h2V6H9V8z%20M12%2C8h2V6h-2V8z%20M0%2C11h2V9H0V11z%20M3%2C11h2V9H3V11z%20M6%2C11h2V9H6V11z%20%20M9%2C11h2V9H9V11z%20M12%2C11h2V9h-2V11z%20M0%2C14h2v-2H0V14z%20M3%2C14h2v-2H3V14z%20M6%2C14h2v-2H6V14z%20M9%2C14h2v-2H9V14z%20M12%2C1%20c0-0.553-0.447-1-1-1s-1%2C0.447-1%2C1H4c0-0.553-0.447-1-1-1S2%2C0.447%2C2%2C1H0v4h14V1H12z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-camera:after,.ui-alt-icon .ui-icon-camera:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M12%2C2.5H9.908c-0.206-0.581-0.756-1-1.408-1h-3c-0.652%2C0-1.202%2C0.419-1.408%2C1H2c-1.104%2C0-2%2C0.896-2%2C2v6c0%2C1.104%2C0.896%2C2%2C2%2C2%20h10c1.104%2C0%2C2-0.896%2C2-2v-6C14%2C3.396%2C13.104%2C2.5%2C12%2C2.5z%20M7%2C10.5c-1.657%2C0-3-1.344-3-3c0-1.657%2C1.343-3%2C3-3s3%2C1.343%2C3%2C3%20C10%2C9.156%2C8.657%2C10.5%2C7%2C10.5z%20M7%2C5.5c-1.104%2C0-2%2C0.896-2%2C2c0%2C1.104%2C0.896%2C2%2C2%2C2c1.104%2C0%2C2-0.896%2C2-2C9%2C6.396%2C8.104%2C5.5%2C7%2C5.5z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-carat-d:after,.ui-alt-icon .ui-icon-carat-d:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2211.949%2C3.404%207%2C8.354%202.05%2C3.404%20-0.071%2C5.525%207%2C12.596%2014.07%2C5.525%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-carat-l:after,.ui-alt-icon .ui-icon-carat-l:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2210.596%2C11.949%205.646%2C7%2010.596%2C2.05%208.475%2C-0.071%201.404%2C7%208.475%2C14.07%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-carat-r:after,.ui-alt-icon .ui-icon-carat-r:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%223.404%2C2.051%208.354%2C7%203.404%2C11.95%205.525%2C14.07%2012.596%2C7%205.525%2C-0.071%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-carat-u:after,.ui-alt-icon .ui-icon-carat-u:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%222.051%2C10.596%207%2C5.646%2011.95%2C10.596%2014.07%2C8.475%207%2C1.404%20-0.071%2C8.475%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-check:after,.ui-alt-icon .ui-icon-check:after,html .ui-alt-icon.ui-btn.ui-checkbox-on:after,html .ui-alt-icon .ui-btn.ui-checkbox-on:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C4%2011%2C1%205.003%2C6.997%203%2C5%200%2C8%204.966%2C13%204.983%2C12.982%205%2C13%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-clock:after,.ui-alt-icon .ui-icon-clock:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C0C3.134%2C0%2C0%2C3.134%2C0%2C7s3.134%2C7%2C7%2C7s7-3.134%2C7-7S10.866%2C0%2C7%2C0z%20M7%2C12c-2.762%2C0-5-2.238-5-5s2.238-5%2C5-5s5%2C2.238%2C5%2C5%20S9.762%2C12%2C7%2C12z%20M9%2C6H8V4c0-0.553-0.447-1-1-1S6%2C3.447%2C6%2C4v3c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1S9.553%2C6%2C9%2C6z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-cloud:after,.ui-alt-icon .ui-icon-cloud:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M14%2C9.5c0-0.793-0.465-1.473-1.134-1.795C12.949%2C7.484%2C13%2C7.249%2C13%2C7c0-1.104-0.896-2-2-2c-0.158%2C0-0.311%2C0.023-0.457%2C0.058%20C9.816%2C3.549%2C8.286%2C2.5%2C6.5%2C2.5c-2.33%2C0-4.224%2C1.777-4.454%2C4.046C0.883%2C6.76%2C0%2C7.773%2C0%2C9c0%2C1.381%2C1.119%2C2.5%2C2.5%2C2.5h10v-0.07%20C13.361%2C11.206%2C14%2C10.432%2C14%2C9.5z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-comment:after,.ui-alt-icon .ui-icon-comment:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M12%2C0H2C0.896%2C0%2C0%2C0.896%2C0%2C2v7c0%2C1.104%2C0.896%2C2%2C2%2C2h1v3l3-3h6c1.104%2C0%2C2-0.896%2C2-2V2C14%2C0.896%2C13.104%2C0%2C12%2C0z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-delete:after,.ui-alt-icon .ui-icon-delete:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C3%2011%2C0%207%2C4%203%2C0%200%2C3%204%2C7%200%2C11%203%2C14%207%2C10%2011%2C14%2014%2C11%2010%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-edit:after,.ui-alt-icon .ui-icon-edit:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M1%2C10l-1%2C4l4-1l7-7L8%2C3L1%2C10z%20M11%2C0L9%2C2l3%2C3l2-2L11%2C0z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-eye:after,.ui-alt-icon .ui-icon-eye:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C2C3%2C2%2C0%2C7%2C0%2C7s3%2C5%2C7%2C5s7-5%2C7-5S11%2C2%2C7%2C2z%20M7%2C10c-1.657%2C0-3-1.344-3-3c0-1.657%2C1.343-3%2C3-3s3%2C1.343%2C3%2C3%20C10%2C8.656%2C8.657%2C10%2C7%2C10z%20M7%2C6C6.448%2C6%2C6%2C6.447%2C6%2C7c0%2C0.553%2C0.448%2C1%2C1%2C1s1-0.447%2C1-1C8%2C6.447%2C7.552%2C6%2C7%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-forbidden:after,.ui-alt-icon .ui-icon-forbidden:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M12.601%2C11.187C13.476%2C10.018%2C14%2C8.572%2C14%2C7c0-3.866-3.134-7-7-7C5.428%2C0%2C3.982%2C0.524%2C2.813%2C1.399L2.757%2C1.343L2.053%2C2.048%20L2.048%2C2.053L1.343%2C2.758l0.056%2C0.056C0.524%2C3.982%2C0%2C5.428%2C0%2C7c0%2C3.866%2C3.134%2C7%2C7%2C7c1.572%2C0%2C3.018-0.524%2C4.187-1.399l0.056%2C0.057%20l0.705-0.705l0.005-0.005l0.705-0.705L12.601%2C11.187z%20M7%2C2c2.761%2C0%2C5%2C2.238%2C5%2C5c0%2C1.019-0.308%2C1.964-0.832%2C2.754L4.246%2C2.832%20C5.036%2C2.308%2C5.981%2C2%2C7%2C2z%20M7%2C12c-2.761%2C0-5-2.238-5-5c0-1.019%2C0.308-1.964%2C0.832-2.754l6.922%2C6.922C8.964%2C11.692%2C8.019%2C12%2C7%2C12z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-forward:after,.ui-alt-icon .ui-icon-forward:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M13%2C4L9%2C0v3C6%2C3%2C1%2C4%2C1%2C8c0%2C5%2C7%2C6%2C7%2C6v-2c0%2C0-5-1-5-4s6-3%2C6-3v3L13%2C4z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-gear:after,.ui-alt-icon .ui-icon-gear:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M13.621%2C5.904l-1.036-0.259c-0.168-0.042-0.303-0.168-0.355-0.332c-0.092-0.284-0.205-0.559-0.339-0.82%20c-0.079-0.153-0.073-0.337%2C0.017-0.486l0.549-0.915c0.118-0.196%2C0.088-0.448-0.075-0.61l-0.862-0.863%20c-0.162-0.163-0.414-0.193-0.611-0.075l-0.916%2C0.55C9.844%2C2.182%2C9.659%2C2.188%2C9.506%2C2.109C9.244%2C1.975%2C8.97%2C1.861%2C8.686%2C1.77%20c-0.165-0.052-0.29-0.187-0.332-0.354L8.095%2C0.379C8.039%2C0.156%2C7.839%2C0%2C7.609%2C0H6.391c-0.229%2C0-0.43%2C0.156-0.485%2C0.379L5.646%2C1.415%20C5.604%2C1.582%2C5.479%2C1.718%2C5.313%2C1.77c-0.284%2C0.092-0.559%2C0.206-0.82%2C0.34C4.339%2C2.188%2C4.155%2C2.182%2C4.007%2C2.093L3.092%2C1.544%20c-0.196-0.118-0.448-0.087-0.61%2C0.075L1.619%2C2.481C1.457%2C2.644%2C1.426%2C2.896%2C1.544%2C3.093l0.549%2C0.914%20c0.089%2C0.148%2C0.095%2C0.332%2C0.017%2C0.486C1.975%2C4.755%2C1.861%2C5.029%2C1.77%2C5.314c-0.053%2C0.164-0.188%2C0.29-0.354%2C0.332L0.379%2C5.905%20C0.156%2C5.961%2C0%2C6.161%2C0%2C6.391v1.219c0%2C0.229%2C0.156%2C0.43%2C0.379%2C0.485l1.036%2C0.26C1.582%2C8.396%2C1.717%2C8.521%2C1.77%2C8.687%20c0.092%2C0.284%2C0.205%2C0.559%2C0.34%2C0.82C2.188%2C9.66%2C2.182%2C9.844%2C2.093%2C9.993l-0.549%2C0.915c-0.118%2C0.195-0.087%2C0.448%2C0.075%2C0.61%20l0.862%2C0.862c0.162%2C0.163%2C0.414%2C0.193%2C0.61%2C0.075l0.915-0.549c0.148-0.089%2C0.332-0.095%2C0.486-0.017%20c0.262%2C0.135%2C0.536%2C0.248%2C0.82%2C0.34c0.165%2C0.053%2C0.291%2C0.187%2C0.332%2C0.354l0.259%2C1.036C5.96%2C13.844%2C6.16%2C14%2C6.39%2C14h1.22%20c0.229%2C0%2C0.43-0.156%2C0.485-0.379l0.259-1.036c0.042-0.167%2C0.168-0.302%2C0.333-0.354c0.284-0.092%2C0.559-0.205%2C0.82-0.34%20c0.154-0.078%2C0.338-0.072%2C0.486%2C0.017l0.914%2C0.549c0.197%2C0.118%2C0.449%2C0.088%2C0.611-0.074l0.862-0.863%20c0.163-0.162%2C0.193-0.415%2C0.075-0.611l-0.549-0.915c-0.089-0.148-0.096-0.332-0.017-0.485c0.134-0.263%2C0.248-0.536%2C0.339-0.82%20c0.053-0.165%2C0.188-0.291%2C0.355-0.333l1.036-0.259C13.844%2C8.039%2C14%2C7.839%2C14%2C7.609V6.39C14%2C6.16%2C13.844%2C5.96%2C13.621%2C5.904z%20M7%2C10%20c-1.657%2C0-3-1.343-3-3s1.343-3%2C3-3s3%2C1.343%2C3%2C3S8.657%2C10%2C7%2C10z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-grid:after,.ui-alt-icon .ui-icon-grid:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M3%2C0H1C0.447%2C0%2C0%2C0.447%2C0%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C4%2C0.447%2C3.553%2C0%2C3%2C0z%20M8%2C0H6%20C5.447%2C0%2C5%2C0.447%2C5%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C9%2C0.447%2C8.553%2C0%2C8%2C0z%20M13%2C0h-2c-0.553%2C0-1%2C0.447-1%2C1v2%20c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V1C14%2C0.447%2C13.553%2C0%2C13%2C0z%20M3%2C5H1C0.447%2C5%2C0%2C5.447%2C0%2C6v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2%20c0.553%2C0%2C1-0.447%2C1-1V6C4%2C5.447%2C3.553%2C5%2C3%2C5z%20M8%2C5H6C5.447%2C5%2C5%2C5.447%2C5%2C6v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V6%20C9%2C5.447%2C8.553%2C5%2C8%2C5z%20M13%2C5h-2c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1V6C14%2C5.447%2C13.553%2C5%2C13%2C5z%20M3%2C10%20H1c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1v-2C4%2C10.447%2C3.553%2C10%2C3%2C10z%20M8%2C10H6c-0.553%2C0-1%2C0.447-1%2C1v2%20c0%2C0.553%2C0.447%2C1%2C1%2C1h2c0.553%2C0%2C1-0.447%2C1-1v-2C9%2C10.447%2C8.553%2C10%2C8%2C10z%20M13%2C10h-2c-0.553%2C0-1%2C0.447-1%2C1v2c0%2C0.553%2C0.447%2C1%2C1%2C1h2%20c0.553%2C0%2C1-0.447%2C1-1v-2C14%2C10.447%2C13.553%2C10%2C13%2C10z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-heart:after,.ui-alt-icon .ui-icon-heart:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C1.958c-2-3-7-2.128-7%2C1.872c0%2C3%2C4%2C7%2C4%2C7s2.417%2C2.48%2C3%2C3c0.583-0.52%2C3-3%2C3-3s4-4%2C4-7C14-0.169%2C9-1.042%2C7%2C1.958z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-home:after,.ui-alt-icon .ui-icon-home:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%227%2C0%200%2C7%202%2C7%202%2C14%205%2C14%205%2C9%209%2C9%209%2C14%2012%2C14%2012%2C7%2014%2C7%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-info:after,.ui-alt-icon .ui-icon-info:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C0C3.134%2C0%2C0%2C3.134%2C0%2C7s3.134%2C7%2C7%2C7s7-3.134%2C7-7S10.866%2C0%2C7%2C0z%20M7%2C2c0.552%2C0%2C1%2C0.447%2C1%2C1S7.552%2C4%2C7%2C4S6%2C3.553%2C6%2C3%20S6.448%2C2%2C7%2C2z%20M9%2C11H5v-1h1V6H5V5h3v5h1V11z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-location:after,.ui-alt-icon .ui-icon-location:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M7%2C0C4.791%2C0%2C3%2C1.791%2C3%2C4c0%2C2%2C4%2C10%2C4%2C10s4-8%2C4-10C11%2C1.791%2C9.209%2C0%2C7%2C0z%20M7%2C6C5.896%2C6%2C5%2C5.104%2C5%2C4s0.896-2%2C2-2%20c1.104%2C0%2C2%2C0.896%2C2%2C2S8.104%2C6%2C7%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-lock:after,.ui-alt-icon .ui-icon-lock:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M12%2C6V5c0-2.762-2.238-5-5-5C4.239%2C0%2C2%2C2.238%2C2%2C5v1H1v8h12V6H12z%20M7.5%2C9.848V12h-1V9.848C6.207%2C9.673%2C6%2C9.366%2C6%2C9%20c0-0.553%2C0.448-1%2C1-1s1%2C0.447%2C1%2C1C8%2C9.366%2C7.793%2C9.673%2C7.5%2C9.848z%20M10%2C6H4V5c0-1.657%2C1.343-3%2C3-3s3%2C1.343%2C3%2C3V6z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-mail:after,.ui-alt-icon .ui-icon-mail:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M0%2C3.75V12h14V3.75L7%2C9L0%2C3.75z%20M14%2C2H0l7%2C5L14%2C2z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-minus:after,.ui-alt-icon .ui-icon-minus:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Crect%20y%3D%225%22%20width%3D%2214%22%20height%3D%224%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-navigation:after,.ui-alt-icon .ui-icon-navigation:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2213%2C1%200%2C6%207%2C7%208%2C14%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-phone:after,.ui-alt-icon .ui-icon-phone:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M6.949%2C9.182C6.175%2C8.549%2C5.281%2C7.697%2C4.507%2C6.736C3.963%2C6.063%2C3.483%2C5.355%2C3.979%2C4.858l-3.482-3.48%20c-0.508%2C0.634-1.633%2C3.654%2C3.188%2C8.598c5.08%2C5.211%2C8.356%2C4.097%2C8.92%2C3.511l-3.396-3.399C8.734%2C10.561%2C8.123%2C10.139%2C6.949%2C9.182z%20%20M13.83%2C11.512v-0.004c0%2C0-2.648-2.646-2.649-2.647c-0.21-0.212-0.546-0.205-0.754%2C0.002L9.465%2C9.823l3.402%2C3.407%20c0%2C0%2C0.963-0.961%2C0.961-0.961l0.002-0.002C14.053%2C12.049%2C14.031%2C11.713%2C13.83%2C11.512z%20M5.202%2C3.636V3.634%20c0.222-0.222%2C0.2-0.557%2C0-0.758V2.873c0%2C0-2.726-2.725-2.727-2.726c-0.21-0.21-0.545-0.205-0.753%2C0.001L0.761%2C1.113L4.24%2C4.595%20C4.241%2C4.596%2C5.202%2C3.637%2C5.202%2C3.636z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-plus:after,.ui-alt-icon .ui-icon-plus:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C5%209%2C5%209%2C0%205%2C0%205%2C5%200%2C5%200%2C9%205%2C9%205%2C14%209%2C14%209%2C9%2014%2C9%20%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-power:after,.ui-alt-icon .ui-icon-power:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M11.243%2C2.408c-0.392-0.401-1.024-0.401-1.415%2C0c-0.391%2C0.401-0.391%2C1.054%2C0%2C1.455C10.584%2C4.642%2C11%2C5.675%2C11%2C6.773%20s-0.416%2C2.133-1.172%2C2.91c-1.512%2C1.558-4.145%2C1.558-5.656%2C0C3.416%2C8.904%2C3%2C7.872%2C3%2C6.773C3%2C5.673%2C3.416%2C4.64%2C4.172%2C3.863%20c0.39-0.401%2C0.39-1.054%2C0-1.455c-0.391-0.401-1.024-0.401-1.415%2C0C1.624%2C3.574%2C1%2C5.125%2C1%2C6.773c0%2C1.647%2C0.624%2C3.199%2C1.757%2C4.365%20c1.134%2C1.166%2C2.64%2C1.809%2C4.243%2C1.809c1.604%2C0%2C3.109-0.645%2C4.243-1.811C12.376%2C9.975%2C13%2C8.423%2C13%2C6.773%20C13%2C5.125%2C12.376%2C3.574%2C11.243%2C2.408z%20M7%2C8.053c0.553%2C0%2C1-0.445%2C1-1v-6c0-0.553-0.447-1-1-1c-0.553%2C0-1%2C0.447-1%2C1v6%20C6%2C7.604%2C6.447%2C8.053%2C7%2C8.053z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-recycle:after,.ui-alt-icon .ui-icon-recycle:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M3%2C7h1L2%2C4L0%2C7h1c0%2C3.313%2C2.687%2C6%2C6%2C6c0.702%2C0%2C1.374-0.127%2C2-0.35v-2.205C8.41%2C10.789%2C7.732%2C11%2C7%2C11C4.791%2C11%2C3%2C9.209%2C3%2C7z%20%20M13%2C7c0-3.313-2.688-6-6-6C6.298%2C1%2C5.626%2C1.127%2C5%2C1.349v2.206C5.59%2C3.211%2C6.268%2C3%2C7%2C3c2.209%2C0%2C4%2C1.791%2C4%2C4h-1l2%2C3l2-3H13z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-refresh:after,.ui-alt-icon .ui-icon-refresh:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214.001px%22%20height%3D%2214.002px%22%20viewBox%3D%220%200%2014.001%2014.002%22%20style%3D%22enable-background%3Anew%200%200%2014.001%2014.002%3B%22%20%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M14.001%2C6.001v-6l-2.06%2C2.06c-0.423-0.424-0.897-0.809-1.44-1.122C7.153-0.994%2C2.872%2C0.153%2C0.939%2C3.501%20c-1.933%2C3.348-0.786%2C7.629%2C2.562%2C9.562c3.348%2C1.933%2C7.629%2C0.785%2C9.562-2.562l-1.732-1c-1.381%2C2.392-4.438%2C3.211-6.83%2C1.83%20s-3.211-4.438-1.83-6.83s4.438-3.211%2C6.83-1.83c0.389%2C0.225%2C0.718%2C0.506%2C1.02%2C0.81l-2.52%2C2.52H14.001z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-search:after,.ui-alt-icon .ui-icon-search:after,.ui-input-search:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M10.171%2C8.766c0.617-0.888%2C0.979-1.964%2C0.979-3.126c0-3.037-2.463-5.5-5.5-5.5s-5.5%2C2.463-5.5%2C5.5s2.463%2C5.5%2C5.5%2C5.5%20c1.152%2C0%2C2.223-0.355%2C3.104-0.962l3.684%2C3.683l1.414-1.414L10.171%2C8.766z%20M5.649%2C9.14c-1.933%2C0-3.5-1.567-3.5-3.5%20c0-1.933%2C1.567-3.5%2C3.5-3.5c1.933%2C0%2C3.5%2C1.567%2C3.5%2C3.5C9.149%2C7.572%2C7.582%2C9.14%2C5.649%2C9.14z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-shop:after,.ui-alt-icon .ui-icon-shop:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M10%2C4V3c0-1.657-1.343-3-3-3S4%2C1.343%2C4%2C3v1H1v10h12V4H10z%20M4.5%2C6C4.224%2C6%2C4%2C5.776%2C4%2C5.5S4.224%2C5%2C4.5%2C5S5%2C5.224%2C5%2C5.5%20S4.776%2C6%2C4.5%2C6z%20M5%2C3c0-1.104%2C0.896-2%2C2-2c1.104%2C0%2C2%2C0.896%2C2%2C2v1H5V3z%20M9.5%2C6C9.225%2C6%2C9%2C5.776%2C9%2C5.5S9.225%2C5%2C9.5%2C5S10%2C5.224%2C10%2C5.5%20S9.775%2C6%2C9.5%2C6z%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-star:after,.ui-alt-icon .ui-icon-star:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20points%3D%2214%2C5%209%2C5%207%2C0%205%2C5%200%2C5%204%2C8%202.625%2C13%207%2C10%2011.375%2C13%2010%2C8%20%22%2F%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-tag:after,.ui-alt-icon .ui-icon-tag:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M5%2C0H0v5l9%2C9l5-5L5%2C0z%20M3%2C4C2.447%2C4%2C2%2C3.553%2C2%2C3s0.447-1%2C1-1s1%2C0.447%2C1%2C1S3.553%2C4%2C3%2C4z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-user:after,.ui-alt-icon .ui-icon-user:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%200%2014%2014%22%20style%3D%22enable-background%3Anew%200%200%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M8.851%2C10.101c-0.18-0.399-0.2-0.763-0.153-1.104C9.383%2C8.49%2C9.738%2C7.621%2C9.891%2C6.465C10.493%2C6.355%2C10.5%2C5.967%2C10.5%2C5.5%20c0-0.437-0.008-0.804-0.502-0.94C9.999%2C4.539%2C10%2C4.521%2C10%2C4.5c0-2.103-1-4-2-4C8%2C0.5%2C7.5%2C0%2C6.5%2C0C5%2C0%2C4%2C1.877%2C4%2C4.5%20c0%2C0.021%2C0.001%2C0.039%2C0.002%2C0.06C3.508%2C4.696%2C3.5%2C5.063%2C3.5%2C5.5c0%2C0.467%2C0.007%2C0.855%2C0.609%2C0.965%20C4.262%2C7.621%2C4.617%2C8.49%2C5.303%2C8.997c0.047%2C0.341%2C0.026%2C0.704-0.153%2C1.104C1.503%2C10.503%2C0%2C12%2C0%2C12v2h14v-2%20C14%2C12%2C12.497%2C10.503%2C8.851%2C10.101z%22%2F%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3Cg%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.ui-alt-icon.ui-icon-video:after,.ui-alt-icon .ui-icon-video:after{background-image:url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22iso-8859-1%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2214px%22%20height%3D%2214px%22%20viewBox%3D%220%20-2%2014%2014%22%20style%3D%22enable-background%3Anew%200%20-2%2014%2014%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20d%3D%22M8%2C0H2C0.896%2C0%2C0%2C0.896%2C0%2C2v6c0%2C1.104%2C0.896%2C2%2C2%2C2h6c1.104%2C0%2C2-0.896%2C2-2V5V2C10%2C0.896%2C9.104%2C0%2C8%2C0z%20M10%2C5l4%2C4V1L10%2C5z%22%2F%3E%3C%2Fsvg%3E")}.ui-nosvg .ui-icon-action:after{background-image:url(images/icons-png/action-white.png)}.ui-nosvg .ui-icon-alert:after{background-image:url(images/icons-png/alert-white.png)}.ui-nosvg .ui-icon-arrow-d-l:after{background-image:url(images/icons-png/arrow-d-l-white.png)}.ui-nosvg .ui-icon-arrow-d-r:after{background-image:url(images/icons-png/arrow-d-r-white.png)}.ui-nosvg .ui-icon-arrow-d:after{background-image:url(images/icons-png/arrow-d-white.png)}.ui-nosvg .ui-icon-arrow-l:after{background-image:url(images/icons-png/arrow-l-white.png)}.ui-nosvg .ui-icon-arrow-r:after{background-image:url(images/icons-png/arrow-r-white.png)}.ui-nosvg .ui-icon-arrow-u-l:after{background-image:url(images/icons-png/arrow-u-l-white.png)}.ui-nosvg .ui-icon-arrow-u-r:after{background-image:url(images/icons-png/arrow-u-r-white.png)}.ui-nosvg .ui-icon-arrow-u:after{background-image:url(images/icons-png/arrow-u-white.png)}.ui-nosvg .ui-icon-audio:after{background-image:url(images/icons-png/audio-white.png)}.ui-nosvg .ui-icon-back:after{background-image:url(images/icons-png/back-white.png)}.ui-nosvg .ui-icon-bars:after{background-image:url(images/icons-png/bars-white.png)}.ui-nosvg .ui-icon-bullets:after{background-image:url(images/icons-png/bullets-white.png)}.ui-nosvg .ui-icon-calendar:after{background-image:url(images/icons-png/calendar-white.png)}.ui-nosvg .ui-icon-camera:after{background-image:url(images/icons-png/camera-white.png)}.ui-nosvg .ui-icon-carat-d:after{background-image:url(images/icons-png/carat-d-white.png)}.ui-nosvg .ui-icon-carat-l:after{background-image:url(images/icons-png/carat-l-white.png)}.ui-nosvg .ui-icon-carat-r:after{background-image:url(images/icons-png/carat-r-white.png)}.ui-nosvg .ui-icon-carat-u:after{background-image:url(images/icons-png/carat-u-white.png)}.ui-nosvg .ui-icon-check:after,html.ui-nosvg .ui-btn.ui-checkbox-on:after{background-image:url(images/icons-png/check-white.png)}.ui-nosvg .ui-icon-clock:after{background-image:url(images/icons-png/clock-white.png)}.ui-nosvg .ui-icon-cloud:after{background-image:url(images/icons-png/cloud-white.png)}.ui-nosvg .ui-icon-comment:after{background-image:url(images/icons-png/comment-white.png)}.ui-nosvg .ui-icon-delete:after{background-image:url(images/icons-png/delete-white.png)}.ui-nosvg .ui-icon-edit:after{background-image:url(images/icons-png/edit-white.png)}.ui-nosvg .ui-icon-eye:after{background-image:url(images/icons-png/eye-white.png)}.ui-nosvg .ui-icon-forbidden:after{background-image:url(images/icons-png/forbidden-white.png)}.ui-nosvg .ui-icon-forward:after{background-image:url(images/icons-png/forward-white.png)}.ui-nosvg .ui-icon-gear:after{background-image:url(images/icons-png/gear-white.png)}.ui-nosvg .ui-icon-grid:after{background-image:url(images/icons-png/grid-white.png)}.ui-nosvg .ui-icon-heart:after{background-image:url(images/icons-png/heart-white.png)}.ui-nosvg .ui-icon-home:after{background-image:url(images/icons-png/home-white.png)}.ui-nosvg .ui-icon-info:after{background-image:url(images/icons-png/info-white.png)}.ui-nosvg .ui-icon-location:after{background-image:url(images/icons-png/location-white.png)}.ui-nosvg .ui-icon-lock:after{background-image:url(images/icons-png/lock-white.png)}.ui-nosvg .ui-icon-mail:after{background-image:url(images/icons-png/mail-white.png)}.ui-nosvg .ui-icon-minus:after{background-image:url(images/icons-png/minus-white.png)}.ui-nosvg .ui-icon-navigation:after{background-image:url(images/icons-png/navigation-white.png)}.ui-nosvg .ui-icon-phone:after{background-image:url(images/icons-png/phone-white.png)}.ui-nosvg .ui-icon-plus:after{background-image:url(images/icons-png/plus-white.png)}.ui-nosvg .ui-icon-power:after{background-image:url(images/icons-png/power-white.png)}.ui-nosvg .ui-icon-recycle:after{background-image:url(images/icons-png/recycle-white.png)}.ui-nosvg .ui-icon-refresh:after{background-image:url(images/icons-png/refresh-white.png)}.ui-nosvg .ui-icon-search:after{background-image:url(images/icons-png/search-white.png)}.ui-nosvg .ui-icon-shop:after{background-image:url(images/icons-png/shop-white.png)}.ui-nosvg .ui-icon-star:after{background-image:url(images/icons-png/star-white.png)}.ui-nosvg .ui-icon-tag:after{background-image:url(images/icons-png/tag-white.png)}.ui-nosvg .ui-icon-user:after{background-image:url(images/icons-png/user-white.png)}.ui-nosvg .ui-icon-video:after{background-image:url(images/icons-png/video-white.png)}.ui-nosvg .ui-alt-icon.ui-icon-action:after,.ui-nosvg .ui-alt-icon .ui-icon-action:after{background-image:url(images/icons-png/action-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-alert:after,.ui-nosvg .ui-alt-icon .ui-icon-alert:after{background-image:url(images/icons-png/alert-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-d:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-d:after{background-image:url(images/icons-png/arrow-d-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-d-l:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-d-l:after{background-image:url(images/icons-png/arrow-d-l-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-d-r:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-d-r:after{background-image:url(images/icons-png/arrow-d-r-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-l:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-l:after{background-image:url(images/icons-png/arrow-l-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-r:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-r:after{background-image:url(images/icons-png/arrow-r-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-u:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-u:after{background-image:url(images/icons-png/arrow-u-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-u-l:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-u-l:after{background-image:url(images/icons-png/arrow-u-l-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-arrow-u-r:after,.ui-nosvg .ui-alt-icon .ui-icon-arrow-u-r:after{background-image:url(images/icons-png/arrow-u-r-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-audio:after,.ui-nosvg .ui-alt-icon .ui-icon-audio:after{background-image:url(images/icons-png/audio-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-back:after,.ui-nosvg .ui-alt-icon .ui-icon-back:after{background-image:url(images/icons-png/back-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-bars:after,.ui-nosvg .ui-alt-icon .ui-icon-bars:after{background-image:url(images/icons-png/bars-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-bullets:after,.ui-nosvg .ui-alt-icon .ui-icon-bullets:after{background-image:url(images/icons-png/bullets-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-calendar:after,.ui-nosvg .ui-alt-icon .ui-icon-calendar:after{background-image:url(images/icons-png/calendar-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-camera:after,.ui-nosvg .ui-alt-icon .ui-icon-camera:after{background-image:url(images/icons-png/camera-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-carat-d:after,.ui-nosvg .ui-alt-icon .ui-icon-carat-d:after{background-image:url(images/icons-png/carat-d-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-carat-l:after,.ui-nosvg .ui-alt-icon .ui-icon-carat-l:after{background-image:url(images/icons-png/carat-l-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-carat-r:after,.ui-nosvg .ui-alt-icon .ui-icon-carat-r:after{background-image:url(images/icons-png/carat-r-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-carat-u:after,.ui-nosvg .ui-alt-icon .ui-icon-carat-u:after{background-image:url(images/icons-png/carat-u-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-check:after,.ui-nosvg .ui-alt-icon .ui-icon-check:after,.ui-nosvg .ui-alt-icon.ui-btn.ui-checkbox-on:after,.ui-nosvg .ui-alt-icon .ui-btn.ui-checkbox-on:after{background-image:url(images/icons-png/check-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-clock:after,.ui-nosvg .ui-alt-icon .ui-icon-clock:after{background-image:url(images/icons-png/clock-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-cloud:after,.ui-nosvg .ui-alt-icon .ui-icon-cloud:after{background-image:url(images/icons-png/cloud-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-comment:after,.ui-nosvg .ui-alt-icon .ui-icon-comment:after{background-image:url(images/icons-png/comment-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-delete:after,.ui-nosvg .ui-alt-icon .ui-icon-delete:after{background-image:url(images/icons-png/delete-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-edit:after,.ui-nosvg .ui-alt-icon .ui-icon-edit:after{background-image:url(images/icons-png/edit-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-eye:after,.ui-nosvg .ui-alt-icon .ui-icon-eye:after{background-image:url(images/icons-png/eye-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-forbidden:after,.ui-nosvg .ui-alt-icon .ui-icon-forbidden:after{background-image:url(images/icons-png/forbidden-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-forward:after,.ui-nosvg .ui-alt-icon .ui-icon-forward:after{background-image:url(images/icons-png/forward-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-gear:after,.ui-nosvg .ui-alt-icon .ui-icon-gear:after{background-image:url(images/icons-png/gear-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-grid:after,.ui-nosvg .ui-alt-icon .ui-icon-grid:after{background-image:url(images/icons-png/grid-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-heart:after,.ui-nosvg .ui-alt-icon .ui-icon-heart:after{background-image:url(images/icons-png/heart-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-home:after,.ui-nosvg .ui-alt-icon .ui-icon-home:after{background-image:url(images/icons-png/home-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-info:after,.ui-nosvg .ui-alt-icon .ui-icon-info:after{background-image:url(images/icons-png/info-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-location:after,.ui-nosvg .ui-alt-icon .ui-icon-location:after{background-image:url(images/icons-png/location-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-lock:after,.ui-nosvg .ui-alt-icon .ui-icon-lock:after{background-image:url(images/icons-png/lock-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-mail:after,.ui-nosvg .ui-alt-icon .ui-icon-mail:after{background-image:url(images/icons-png/mail-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-minus:after,.ui-nosvg .ui-alt-icon .ui-icon-minus:after{background-image:url(images/icons-png/minus-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-navigation:after,.ui-nosvg .ui-alt-icon .ui-icon-navigation:after{background-image:url(images/icons-png/navigation-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-phone:after,.ui-nosvg .ui-alt-icon .ui-icon-phone:after{background-image:url(images/icons-png/phone-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-plus:after,.ui-nosvg .ui-alt-icon .ui-icon-plus:after{background-image:url(images/icons-png/plus-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-power:after,.ui-nosvg .ui-alt-icon .ui-icon-power:after{background-image:url(images/icons-png/power-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-recycle:after,.ui-nosvg .ui-alt-icon .ui-icon-recycle:after{background-image:url(images/icons-png/recycle-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-refresh:after,.ui-nosvg .ui-alt-icon .ui-icon-refresh:after{background-image:url(images/icons-png/refresh-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-search:after,.ui-nosvg .ui-alt-icon .ui-icon-search:after,.ui-nosvg .ui-input-search:after{background-image:url(images/icons-png/search-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-shop:after,.ui-nosvg .ui-alt-icon .ui-icon-shop:after{background-image:url(images/icons-png/shop-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-star:after,.ui-nosvg .ui-alt-icon .ui-icon-star:after{background-image:url(images/icons-png/star-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-tag:after,.ui-nosvg .ui-alt-icon .ui-icon-tag:after{background-image:url(images/icons-png/tag-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-user:after,.ui-nosvg .ui-alt-icon .ui-icon-user:after{background-image:url(images/icons-png/user-black.png)}.ui-nosvg .ui-alt-icon.ui-icon-video:after,.ui-nosvg .ui-alt-icon .ui-icon-video:after{background-image:url(images/icons-png/video-black.png)}html{font-size:100%}body,input,select,textarea,button,.ui-btn{font-size:1em;line-height:1.3;font-family:sans-serif}legend,.ui-input-text input,.ui-input-search input{color:inherit;text-shadow:inherit}.ui-mobile label,div.ui-controlgroup-label{font-weight:400;font-size:16px}.ui-field-contain{border-bottom-color:#828282;border-bottom-color:rgba(0,0,0,.15);border-bottom-width:1px;border-bottom-style:solid}.table-stroke thead th,.table-stripe thead th,.table-stripe tbody tr:last-child{border-bottom:1px solid #d6d6d6;border-bottom:1px solid rgba(0,0,0,.1)}.table-stroke tbody th,.table-stroke tbody td{border-bottom:1px solid #e6e6e6;border-bottom:1px solid rgba(0,0,0,.05)}.table-stripe.table-stroke tbody tr:last-child th,.table-stripe.table-stroke tbody tr:last-child td{border-bottom:0}.table-stripe tbody tr:nth-child(odd) td,.table-stripe tbody tr:nth-child(odd) th{background-color:#eee;background-color:rgba(0,0,0,.04)}.ui-btn,label.ui-btn{font-weight:700;border-width:1px;border-style:solid}.ui-btn{text-decoration:none!important}.ui-btn-active{cursor:pointer}.ui-corner-all{-webkit-border-radius:.3125em;border-radius:.3125em}.ui-btn-corner-all,.ui-btn.ui-corner-all,.ui-slider-track.ui-corner-all,.ui-flipswitch.ui-corner-all,.ui-li-count{-webkit-border-radius:.3125em;border-radius:.3125em}.ui-btn-icon-notext.ui-btn-corner-all,.ui-btn-icon-notext.ui-corner-all{-webkit-border-radius:1em;border-radius:1em}.ui-btn-corner-all,.ui-corner-all{-webkit-background-clip:padding;background-clip:padding-box}.ui-popup.ui-corner-all>.ui-popup-arrow-guide{left:.6em;right:.6em;top:.6em;bottom:.6em}.ui-shadow{-webkit-box-shadow:0 1px 3px rgba(0,0,0,.15);-moz-box-shadow:0 1px 3px rgba(0,0,0,.15);box-shadow:0 1px 3px rgba(0,0,0,.15)}.ui-shadow-inset{-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.2);-moz-box-shadow:inset 0 1px 3px rgba(0,0,0,.2);box-shadow:inset 0 1px 3px rgba(0,0,0,.2)}.ui-overlay-shadow{-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);-moz-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-btn-icon-left:after,.ui-btn-icon-right:after,.ui-btn-icon-top:after,.ui-btn-icon-bottom:after,.ui-btn-icon-notext:after{background-color:#666;background-color:rgba(0,0,0,.3);background-position:center center;background-repeat:no-repeat;-webkit-border-radius:1em;border-radius:1em}.ui-alt-icon.ui-btn:after,.ui-alt-icon .ui-btn:after,html .ui-alt-icon.ui-checkbox-off:after,html .ui-alt-icon.ui-radio-off:after,html .ui-alt-icon .ui-checkbox-off:after,html .ui-alt-icon .ui-radio-off:after{background-color:#666;background-color:rgba(0,0,0,.15)}.ui-nodisc-icon.ui-btn:after,.ui-nodisc-icon .ui-btn:after{background-color:transparent}.ui-shadow-icon.ui-btn:after,.ui-shadow-icon .ui-btn:after{-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-btn.ui-checkbox-off:after,.ui-btn.ui-checkbox-on:after,.ui-btn.ui-radio-off:after,.ui-btn.ui-radio-on:after{display:block;width:18px;height:18px;margin:-9px 2px 0 2px}.ui-checkbox-off:after,.ui-btn.ui-radio-off:after{filter:Alpha(Opacity=30);opacity:.3}.ui-btn.ui-checkbox-off:after,.ui-btn.ui-checkbox-on:after{-webkit-border-radius:.1875em;border-radius:.1875em}.ui-btn.ui-checkbox-off:after{background-color:#666;background-color:rgba(0,0,0,.3)}.ui-radio .ui-btn.ui-radio-on:after{background-image:none;background-color:#fff;width:8px;height:8px;border-width:5px;border-style:solid}.ui-alt-icon.ui-btn.ui-radio-on:after,.ui-alt-icon .ui-btn.ui-radio-on:after{background-color:#000}.ui-icon-loading{background:url(images/ajax-loader.gif);background-size:2.875em 2.875em}.ui-bar-a,.ui-page-theme-a .ui-bar-inherit,html .ui-bar-a .ui-bar-inherit,html .ui-body-a .ui-bar-inherit,html body .ui-group-theme-a .ui-bar-inherit{background-color:#e9e9e9;border-color:#ddd;color:#333;text-shadow:0 1px 0 #eee;font-weight:700}.ui-bar-a{border-width:1px;border-style:solid}.ui-overlay-a,.ui-page-theme-a,.ui-page-theme-a .ui-panel-wrapper{background-color:#f9f9f9;border-color:#bbb;color:#333;text-shadow:0 1px 0 #f3f3f3}.ui-body-a,.ui-page-theme-a .ui-body-inherit,html .ui-bar-a .ui-body-inherit,html .ui-body-a .ui-body-inherit,html body .ui-group-theme-a .ui-body-inherit,html .ui-panel-page-container-a{background-color:#fff;border-color:#ddd;color:#333;text-shadow:0 1px 0 #f3f3f3}.ui-body-a{border-width:1px;border-style:solid}.ui-page-theme-a a,html .ui-bar-a a,html .ui-body-a a,html body .ui-group-theme-a a{color:#38c;font-weight:700}.ui-page-theme-a a:visited,html .ui-bar-a a:visited,html .ui-body-a a:visited,html body .ui-group-theme-a a:visited{color:#38c}.ui-page-theme-a a:hover,html .ui-bar-a a:hover,html .ui-body-a a:hover,html body .ui-group-theme-a a:hover{color:#059}.ui-page-theme-a a:active,html .ui-bar-a a:active,html .ui-body-a a:active,html body .ui-group-theme-a a:active{color:#059}.ui-page-theme-a .ui-btn,html .ui-bar-a .ui-btn,html .ui-body-a .ui-btn,html body .ui-group-theme-a .ui-btn,html head+body .ui-btn.ui-btn-a,.ui-page-theme-a .ui-btn:visited,html .ui-bar-a .ui-btn:visited,html .ui-body-a .ui-btn:visited,html body .ui-group-theme-a .ui-btn:visited,html head+body .ui-btn.ui-btn-a:visited{background-color:#f6f6f6;border-color:#ddd;color:#333;text-shadow:0 1px 0 #f3f3f3}.ui-page-theme-a .ui-btn:hover,html .ui-bar-a .ui-btn:hover,html .ui-body-a .ui-btn:hover,html body .ui-group-theme-a .ui-btn:hover,html head+body .ui-btn.ui-btn-a:hover{background-color:#ededed;border-color:#ddd;color:#333;text-shadow:0 1px 0 #f3f3f3}.ui-page-theme-a .ui-btn:active,html .ui-bar-a .ui-btn:active,html .ui-body-a .ui-btn:active,html body .ui-group-theme-a .ui-btn:active,html head+body .ui-btn.ui-btn-a:active{background-color:#e8e8e8;border-color:#ddd;color:#333;text-shadow:0 1px 0 #f3f3f3}.ui-page-theme-a .ui-btn.ui-btn-active,html .ui-bar-a .ui-btn.ui-btn-active,html .ui-body-a .ui-btn.ui-btn-active,html body .ui-group-theme-a .ui-btn.ui-btn-active,html head+body .ui-btn.ui-btn-a.ui-btn-active,.ui-page-theme-a .ui-checkbox-on:after,html .ui-bar-a .ui-checkbox-on:after,html .ui-body-a .ui-checkbox-on:after,html body .ui-group-theme-a .ui-checkbox-on:after,.ui-btn.ui-checkbox-on.ui-btn-a:after,.ui-page-theme-a .ui-flipswitch-active,html .ui-bar-a .ui-flipswitch-active,html .ui-body-a .ui-flipswitch-active,html body .ui-group-theme-a .ui-flipswitch-active,html body .ui-flipswitch.ui-bar-a.ui-flipswitch-active,.ui-page-theme-a .ui-slider-track .ui-btn-active,html .ui-bar-a .ui-slider-track .ui-btn-active,html .ui-body-a .ui-slider-track .ui-btn-active,html body .ui-group-theme-a .ui-slider-track .ui-btn-active,html body div.ui-slider-track.ui-body-a .ui-btn-active{background-color:#38c;border-color:#38c;color:#fff;text-shadow:0 1px 0 #059}.ui-page-theme-a .ui-radio-on:after,html .ui-bar-a .ui-radio-on:after,html .ui-body-a .ui-radio-on:after,html body .ui-group-theme-a .ui-radio-on:after,.ui-btn.ui-radio-on.ui-btn-a:after{border-color:#38c}.ui-page-theme-a .ui-btn:focus,html .ui-bar-a .ui-btn:focus,html .ui-body-a .ui-btn:focus,html body .ui-group-theme-a .ui-btn:focus,html head+body .ui-btn.ui-btn-a:focus,.ui-page-theme-a .ui-focus,html .ui-bar-a .ui-focus,html .ui-body-a .ui-focus,html body .ui-group-theme-a .ui-focus,html head+body .ui-btn-a.ui-focus,html head+body .ui-body-a.ui-focus{-webkit-box-shadow:0 0 12px #38c;-moz-box-shadow:0 0 12px #38c;box-shadow:0 0 12px #38c}.ui-bar-b,.ui-page-theme-b .ui-bar-inherit,html .ui-bar-b .ui-bar-inherit,html .ui-body-b .ui-bar-inherit,html body .ui-group-theme-b .ui-bar-inherit{background-color:#1d1d1d;border-color:#1b1b1b;color:#fff;text-shadow:0 1px 0 #111;font-weight:700}.ui-bar-b{border-width:1px;border-style:solid}.ui-overlay-b,.ui-page-theme-b,.ui-page-theme-b .ui-panel-wrapper{background-color:#252525;border-color:#454545;color:#fff;text-shadow:0 1px 0 #111}.ui-body-b,.ui-page-theme-b .ui-body-inherit,html .ui-bar-b .ui-body-inherit,html .ui-body-b .ui-body-inherit,html body .ui-group-theme-b .ui-body-inherit,html .ui-panel-page-container-b{background-color:#2a2a2a;border-color:#1d1d1d;color:#fff;text-shadow:0 1px 0 #111}.ui-body-b{border-width:1px;border-style:solid}.ui-page-theme-b a,html .ui-bar-b a,html .ui-body-b a,html body .ui-group-theme-b a{color:#2ad;font-weight:700}.ui-page-theme-b a:visited,html .ui-bar-b a:visited,html .ui-body-b a:visited,html body .ui-group-theme-b a:visited{color:#2ad}.ui-page-theme-b a:hover,html .ui-bar-b a:hover,html .ui-body-b a:hover,html body .ui-group-theme-b a:hover{color:#08b}.ui-page-theme-b a:active,html .ui-bar-b a:active,html .ui-body-b a:active,html body .ui-group-theme-b a:active{color:#08b}.ui-page-theme-b .ui-btn,html .ui-bar-b .ui-btn,html .ui-body-b .ui-btn,html body .ui-group-theme-b .ui-btn,html head+body .ui-btn.ui-btn-b,.ui-page-theme-b .ui-btn:visited,html .ui-bar-b .ui-btn:visited,html .ui-body-b .ui-btn:visited,html body .ui-group-theme-b .ui-btn:visited,html head+body .ui-btn.ui-btn-b:visited{background-color:#333;border-color:#1f1f1f;color:#fff;text-shadow:0 1px 0 #111}.ui-page-theme-b .ui-btn:hover,html .ui-bar-b .ui-btn:hover,html .ui-body-b .ui-btn:hover,html body .ui-group-theme-b .ui-btn:hover,html head+body .ui-btn.ui-btn-b:hover{background-color:#373737;border-color:#1f1f1f;color:#fff;text-shadow:0 1px 0 #111}.ui-page-theme-b .ui-btn:active,html .ui-bar-b .ui-btn:active,html .ui-body-b .ui-btn:active,html body .ui-group-theme-b .ui-btn:active,html head+body .ui-btn.ui-btn-b:active{background-color:#404040;border-color:#1f1f1f;color:#fff;text-shadow:0 1px 0 #111}.ui-page-theme-b .ui-btn.ui-btn-active,html .ui-bar-b .ui-btn.ui-btn-active,html .ui-body-b .ui-btn.ui-btn-active,html body .ui-group-theme-b .ui-btn.ui-btn-active,html head+body .ui-btn.ui-btn-b.ui-btn-active,.ui-page-theme-b .ui-checkbox-on:after,html .ui-bar-b .ui-checkbox-on:after,html .ui-body-b .ui-checkbox-on:after,html body .ui-group-theme-b .ui-checkbox-on:after,.ui-btn.ui-checkbox-on.ui-btn-b:after,.ui-page-theme-b .ui-flipswitch-active,html .ui-bar-b .ui-flipswitch-active,html .ui-body-b .ui-flipswitch-active,html body .ui-group-theme-b .ui-flipswitch-active,html body .ui-flipswitch.ui-bar-b.ui-flipswitch-active,.ui-page-theme-b .ui-slider-track .ui-btn-active,html .ui-bar-b .ui-slider-track .ui-btn-active,html .ui-body-b .ui-slider-track .ui-btn-active,html body .ui-group-theme-b .ui-slider-track .ui-btn-active,html body div.ui-slider-track.ui-body-b .ui-btn-active{background-color:#2ad;border-color:#2ad;color:#fff;text-shadow:0 1px 0 #08b}.ui-page-theme-b .ui-radio-on:after,html .ui-bar-b .ui-radio-on:after,html .ui-body-b .ui-radio-on:after,html body .ui-group-theme-b .ui-radio-on:after,.ui-btn.ui-radio-on.ui-btn-b:after{border-color:#2ad}.ui-page-theme-b .ui-btn:focus,html .ui-bar-b .ui-btn:focus,html .ui-body-b .ui-btn:focus,html body .ui-group-theme-b .ui-btn:focus,html head+body .ui-btn.ui-btn-b:focus,.ui-page-theme-b .ui-focus,html .ui-bar-b .ui-focus,html .ui-body-b .ui-focus,html body .ui-group-theme-b .ui-focus,html head+body .ui-btn-b.ui-focus,html head+body .ui-body-b.ui-focus{-webkit-box-shadow:0 0 12px #2ad;-moz-box-shadow:0 0 12px #2ad;box-shadow:0 0 12px #2ad}.ui-disabled,.ui-state-disabled,button[disabled],.ui-select .ui-btn.ui-state-disabled{filter:Alpha(Opacity=30);opacity:.3;cursor:default!important;pointer-events:none}.ui-btn:focus,.ui-btn.ui-focus{outline:0}.ui-noboxshadow .ui-shadow,.ui-noboxshadow .ui-shadow-inset,.ui-noboxshadow .ui-overlay-shadow,.ui-noboxshadow .ui-shadow-icon.ui-btn:after,.ui-noboxshadow .ui-shadow-icon .ui-btn:after,.ui-noboxshadow .ui-focus,.ui-noboxshadow .ui-btn:focus,.ui-noboxshadow input:focus,.ui-noboxshadow .ui-panel{-webkit-box-shadow:none!important;-moz-box-shadow:none!important;box-shadow:none!important}.ui-noboxshadow .ui-btn:focus,.ui-noboxshadow .ui-focus{outline-width:1px;outline-style:auto}.ui-mobile,.ui-mobile body{height:99.9%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border-width:0}.ui-mobile fieldset{min-width:0}@-moz-document url-prefix(){.ui-mobile fieldset{display:table-column;vertical-align:middle}}.ui-mobile-viewport{margin:0;overflow-x:visible;-webkit-text-size-adjust:100%;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}body.ui-mobile-viewport,div.ui-mobile-viewport{overflow-x:hidden}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-page{outline:0}.ui-mobile .ui-page-active{display:block;overflow:visible;overflow-x:hidden}@media screen and (orientation:portrait){.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile .ui-page{min-height:300px}}.ui-mobile-rendering>*{visibility:hidden}.ui-nojs{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-loading .ui-loader{display:block}.ui-loader{display:none;z-index:9999999;position:fixed;top:50%;left:50%;border:0}.ui-loader-default{background:0;filter:Alpha(Opacity=18);opacity:.18;width:2.875em;height:2.875em;margin-left:-1.4375em;margin-top:-1.4375em}.ui-loader-verbose{width:12.5em;filter:Alpha(Opacity=88);opacity:.88;box-shadow:0 1px 1px -1px #fff;height:auto;margin-left:-6.875em;margin-top:-2.6875em;padding:.625em}.ui-loader-default h1{font-size:0;width:0;height:0;overflow:hidden}.ui-loader-verbose h1{font-size:1em;margin:0;text-align:center}.ui-loader .ui-icon-loading{background-color:#000;display:block;margin:0;width:2.75em;height:2.75em;padding:.0625em;-webkit-border-radius:2.25em;border-radius:2.25em}.ui-loader-verbose .ui-icon-loading{margin:0 auto .625em;filter:Alpha(Opacity=75);opacity:.75}.ui-loader-textonly{padding:.9375em;margin-left:-7.1875em}.ui-loader-textonly .ui-icon-loading{display:none}.ui-loader-fakefix{position:absolute}.ui-bar,.ui-body{position:relative;padding:.4em 1em;overflow:hidden;display:block;clear:both}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:1em;display:inline-block}.ui-header,.ui-footer{border-width:1px 0;border-style:solid;position:relative}.ui-header:empty,.ui-footer:empty{min-height:2.6875em}.ui-header .ui-title,.ui-footer .ui-title{font-size:1em;min-height:1.1em;text-align:center;display:block;margin:0 30%;padding:.7em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:0 1em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:1em}.ui-corner-all>.ui-header:first-child,.ui-corner-all>.ui-content:first-child,.ui-corner-all>.ui-footer:first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-corner-all>.ui-header:last-child,.ui-corner-all>.ui-content:last-child,.ui-corner-all>.ui-footer:last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-btn{font-size:16px;margin:.5em 0;padding:.7em 1em;display:block;position:relative;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ui-btn-icon-notext,.ui-header button.ui-btn.ui-btn-icon-notext,.ui-footer button.ui-btn.ui-btn-icon-notext{padding:0;width:1.75em;height:1.75em;text-indent:-9999px;white-space:nowrap!important}.ui-mini{font-size:12.5px}.ui-mini .ui-btn{font-size:inherit}.ui-header .ui-btn,.ui-footer .ui-btn{font-size:12.5px;display:inline-block;vertical-align:middle}.ui-header .ui-controlgroup .ui-btn-icon-notext,.ui-footer .ui-controlgroup .ui-btn-icon-notext{font-size:12.5px}.ui-header .ui-btn-left,.ui-header .ui-btn-right{font-size:12.5px}.ui-mini.ui-btn-icon-notext,.ui-mini .ui-btn-icon-notext,.ui-header .ui-btn-icon-notext,.ui-footer .ui-btn-icon-notext{font-size:16px;padding:0}.ui-btn-inline{display:inline-block;vertical-align:middle;margin-right:.625em}.ui-btn-icon-left{padding-left:2.5em}.ui-btn-icon-right{padding-right:2.5em}.ui-btn-icon-top{padding-top:2.5em}.ui-btn-icon-bottom{padding-bottom:2.5em}.ui-header .ui-btn-icon-top,.ui-footer .ui-btn-icon-top,.ui-header .ui-btn-icon-bottom,.ui-footer .ui-btn-icon-bottom{padding-left:.3125em;padding-right:.3125em}.ui-btn-icon-left:after,.ui-btn-icon-right:after,.ui-btn-icon-top:after,.ui-btn-icon-bottom:after,.ui-btn-icon-notext:after{content:"";position:absolute;display:block;width:22px;height:22px}.ui-btn-icon-notext:after,.ui-btn-icon-left:after,.ui-btn-icon-right:after{top:50%;margin-top:-11px}.ui-btn-icon-left:after{left:.5625em}.ui-btn-icon-right:after{right:.5625em}.ui-mini.ui-btn-icon-left:after,.ui-mini .ui-btn-icon-left:after,.ui-header .ui-btn-icon-left:after,.ui-footer .ui-btn-icon-left:after{left:.37em}.ui-mini.ui-btn-icon-right:after,.ui-mini .ui-btn-icon-right:after,.ui-header .ui-btn-icon-right:after,.ui-footer .ui-btn-icon-right:after{right:.37em}.ui-btn-icon-notext:after,.ui-btn-icon-top:after,.ui-btn-icon-bottom:after{left:50%;margin-left:-11px}.ui-btn-icon-top:after{top:.5625em}.ui-btn-icon-bottom:after{top:auto;bottom:.5625em}.ui-header .ui-btn-left,.ui-header .ui-btn-right,.ui-btn-left>[class*=ui-],.ui-btn-right>[class*=ui-]{margin:0}.ui-btn-left,.ui-btn-right{position:absolute;top:.24em}.ui-btn-left{left:.4em}.ui-btn-right{right:.4em}.ui-btn-icon-notext.ui-btn-left{top:.3125em;left:.3125em}.ui-btn-icon-notext.ui-btn-right{top:.3125em;right:.3125em}button.ui-btn,.ui-controlgroup-controls button.ui-btn-icon-notext{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;width:100%}button.ui-btn-inline,.ui-header button.ui-btn,.ui-footer button.ui-btn{width:auto}button.ui-btn::-moz-focus-inner{border:0}button.ui-btn-icon-notext,.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-btn{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;width:1.75em}.ui-mobile label,.ui-controlgroup-label{display:block;margin:0 0 .4em}.ui-hide-label>label,.ui-hide-label .ui-controlgroup-label,.ui-hide-label .ui-rangeslider label,.ui-hidden-accessible{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-screen-hidden{display:none!important}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-page-pre-in{opacity:0}.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-timing-function:ease-out;animation-duration:350ms}.out{-webkit-animation-timing-function:ease-in;-webkit-animation-duration:225ms;-moz-animation-timing-function:ease-in;-moz-animation-duration:225ms;animation-timing-function:ease-in;animation-duration:225ms}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-moz-keyframes fadein{from{opacity:0}to{opacity:1}}@keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}@-moz-keyframes fadeout{from{opacity:1}to{opacity:0}}@keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{opacity:0;-webkit-animation-duration:125ms;-webkit-animation-name:fadeout;-moz-animation-duration:125ms;-moz-animation-name:fadeout;animation-duration:125ms;animation-name:fadeout}.fade.in{opacity:1;-webkit-animation-duration:225ms;-webkit-animation-name:fadein;-moz-animation-duration:225ms;-moz-animation-name:fadein;animation-duration:225ms;animation-name:fadein}.pop{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%;transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);-webkit-animation-name:popin;-webkit-animation-duration:350ms;-moz-transform:scale(1);-moz-animation-name:popin;-moz-animation-duration:350ms;transform:scale(1);animation-name:popin;animation-duration:350ms;opacity:1}.pop.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms;opacity:0}.pop.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;animation-name:fadein}.pop.out.reverse{-webkit-transform:scale(.8);-webkit-animation-name:popout;-moz-transform:scale(.8);-moz-animation-name:popout;transform:scale(.8);animation-name:popout}@-webkit-keyframes popin{from{-webkit-transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-moz-keyframes popin{from{-moz-transform:scale(.8);opacity:0}to{-moz-transform:scale(1);opacity:1}}@keyframes popin{from{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.8);opacity:0}}@-moz-keyframes popout{from{-moz-transform:scale(1);opacity:1}to{-moz-transform:scale(.8);opacity:0}}@keyframes popout{from{transform:scale(1);opacity:1}to{transform:scale(.8);opacity:0}}@-webkit-keyframes slideinfromright{from{-webkit-transform:translate3d(100%,0,0)}to{-webkit-transform:translate3d(0,0,0)}}@-moz-keyframes slideinfromright{from{-moz-transform:translateX(100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromright{from{transform:translateX(100%)}to{transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translate3d(-100%,0,0)}to{-webkit-transform:translate3d(0,0,0)}}@-moz-keyframes slideinfromleft{from{-moz-transform:translateX(-100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromleft{from{transform:translateX(-100%)}to{transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(-100%,0,0)}}@-moz-keyframes slideouttoleft{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(-100%)}}@keyframes slideouttoleft{from{transform:translateX(0)}to{transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(100%,0,0)}}@-moz-keyframes slideouttoright{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(100%)}}@keyframes slideouttoright{from{transform:translateX(0)}to{transform:translateX(100%)}}.slide.out,.slide.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-timing-function:ease-out;animation-duration:350ms}.slide.out{-webkit-transform:translate3d(-100%,0,0);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;transform:translateX(-100%);animation-name:slideouttoleft}.slide.in{-webkit-transform:translate3d(0,0,0);-webkit-animation-name:slideinfromright;-moz-transform:translateX(0);-moz-animation-name:slideinfromright;transform:translateX(0);animation-name:slideinfromright}.slide.out.reverse{-webkit-transform:translate3d(100%,0,0);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;transform:translateX(100%);animation-name:slideouttoright}.slide.in.reverse{-webkit-transform:translate3d(0,0,0);-webkit-animation-name:slideinfromleft;-moz-transform:translateX(0);-moz-animation-name:slideinfromleft;transform:translateX(0);animation-name:slideinfromleft}.slidefade.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-webkit-animation-duration:225ms;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;-moz-animation-duration:225ms;transform:translateX(-100%);animation-name:slideouttoleft;animation-duration:225ms}.slidefade.in{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidefade.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-webkit-animation-duration:200ms;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;-moz-animation-duration:200ms;transform:translateX(100%);animation-name:slideouttoright;animation-duration:200ms}.slidefade.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidedown.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfromtop;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfromtop;animation-duration:250ms}.slidedown.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slidedown.out.reverse{-webkit-transform:translateY(-100%);-webkit-animation-name:slideouttotop;-webkit-animation-duration:200ms;-moz-transform:translateY(-100%);-moz-animation-name:slideouttotop;-moz-animation-duration:200ms;transform:translateY(-100%);animation-name:slideouttotop;animation-duration:200ms}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfromtop{from{-moz-transform:translateY(-100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfromtop{from{transform:translateY(-100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-moz-keyframes slideouttotop{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(-100%)}}@keyframes slideouttotop{from{transform:translateY(0)}to{transform:translateY(-100%)}}.slideup.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfrombottom;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfrombottom;animation-duration:250ms}.slideup.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slideup.out.reverse{-webkit-transform:translateY(100%);-webkit-animation-name:slideouttobottom;-webkit-animation-duration:200ms;-moz-transform:translateY(100%);-moz-animation-name:slideouttobottom;-moz-animation-duration:200ms;transform:translateY(100%);animation-name:slideouttobottom;animation-duration:200ms}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfrombottom{from{-moz-transform:translateY(100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfrombottom{from{transform:translateY(100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-moz-keyframes slideouttobottom{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(100%)}}@keyframes slideouttobottom{from{transform:translateY(0)}to{transform:translateY(100%)}}.viewport-flip{-webkit-perspective:1000;-moz-perspective:1000;perspective:1000;position:absolute}.flip{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-moz-backface-visibility:hidden;-moz-transform:translateX(0);backface-visibility:hidden;transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:175ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:175ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:175ms}.flip.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:225ms;-moz-animation-name:flipintoright;-moz-animation-duration:225ms;animation-name:flipintoright;animation-duration:225ms}.flip.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.flip.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.viewport-turn{-webkit-perspective:200px;-moz-perspective:200px;-ms-perspective:200px;perspective:200px;position:absolute}.turn{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-webkit-transform-origin:0;-moz-backface-visibility:hidden;-moz-transform:translateX(0);-moz-transform-origin:0;backface-visibility:hidden;transform:translateX(0);transform-origin:0}.turn.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:125ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:125ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:125ms}.turn.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:250ms;-moz-animation-name:flipintoright;-moz-animation-duration:250ms;animation-name:flipintoright;animation-duration:250ms}.turn.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.turn.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.flow{-webkit-transform-origin:50% 30%;-webkit-box-shadow:0 0 20px rgba(0,0,0,.4);-moz-transform-origin:50% 30%;-moz-box-shadow:0 0 20px rgba(0,0,0,.4);transform-origin:50% 30%;box-shadow:0 0 20px rgba(0,0,0,.4)}.ui-dialog.flow{-webkit-transform-origin:none;-webkit-box-shadow:none;-moz-transform-origin:none;-moz-box-shadow:none;transform-origin:none;box-shadow:none}.flow.out{-webkit-transform:translateX(-100%) scale(.7);-webkit-animation-name:flowouttoleft;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(-100%) scale(.7);-moz-animation-name:flowouttoleft;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(-100%) scale(.7);animation-name:flowouttoleft;animation-timing-function:ease;animation-duration:350ms}.flow.in{-webkit-transform:translateX(0) scale(1);-webkit-animation-name:flowinfromright;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(0) scale(1);-moz-animation-name:flowinfromright;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(0) scale(1);animation-name:flowinfromright;animation-timing-function:ease;animation-duration:350ms}.flow.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:flowouttoright;-moz-transform:translateX(100%);-moz-animation-name:flowouttoright;transform:translateX(100%);animation-name:flowouttoright}.flow.in.reverse{-webkit-animation-name:flowinfromleft;-moz-animation-name:flowinfromleft;animation-name:flowinfromleft}@-webkit-keyframes flowouttoleft{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(-100%) scale(.7)}}@-moz-keyframes flowouttoleft{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(-100%) scale(.7)}}@keyframes flowouttoleft{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(-100%) scale(.7)}}@-webkit-keyframes flowouttoright{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(100%) scale(.7)}}@-moz-keyframes flowouttoright{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(100%) scale(.7)}}@keyframes flowouttoright{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(100%) scale(.7)}}@-webkit-keyframes flowinfromleft{0%{-webkit-transform:translateX(-100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromleft{0%{-moz-transform:translateX(-100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromleft{0%{transform:translateX(-100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}@-webkit-keyframes flowinfromright{0%{-webkit-transform:translateX(100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromright{0%{-moz-transform:translateX(100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromright{0%{transform:translateX(100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}.ui-field-contain,.ui-mobile fieldset.ui-field-contain{display:block;position:relative;overflow:visible;clear:both;padding:.8em 0}.ui-field-contain>label~[class*=ui-],.ui-field-contain .ui-controlgroup-controls{margin:0}.ui-field-contain:last-child{border-bottom-width:0}@media (min-width:28em){.ui-field-contain,.ui-mobile fieldset.ui-field-contain{padding:0;margin:1em 0;border-bottom-width:0}.ui-field-contain:before,.ui-field-contain:after{content:"";display:table}.ui-field-contain:after{clear:both}.ui-field-contain>label,.ui-field-contain .ui-controlgroup-label,.ui-field-contain>.ui-rangeslider>label{float:left;width:20%;margin:.5em 2% 0 0}.ui-popup .ui-field-contain>label,.ui-popup .ui-field-contain .ui-controlgroup-label,.ui-popup .ui-field-contain>.ui-rangeslider>label{float:none;width:auto;margin:0 0 .4em}.ui-field-contain>label~[class*=ui-],.ui-field-contain .ui-controlgroup-controls{float:left;width:78%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-hide-label>label~[class*=ui-],.ui-hide-label .ui-controlgroup-controls,.ui-popup .ui-field-contain>label~[class*=ui-],.ui-popup .ui-field-contain .ui-controlgroup-controls{float:none;width:100%}.ui-field-contain>label~.ui-btn-inline{width:auto;margin-right:.625em}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d,.ui-grid-solo{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-block-a{clear:left}ul.ui-grid-a,ul.ui-grid-b,ul.ui-grid-c,ul.ui-grid-d,ul.ui-grid-solo,li.ui-block-a,li.ui-block-b,li.ui-block-c,li.ui-block-d,li.ui-block-e{margin-left:0;margin-right:0;padding:0;list-style:none}[class*=ui-block-]>button.ui-btn{margin-right:0;margin-left:0}[class*=ui-block-]>.ui-btn,[class*=ui-block-]>.ui-select,[class*=ui-block-]>.ui-checkbox,[class*=ui-block-]>.ui-radio,[class*=ui-block-]>button.ui-btn-inline,[class*=ui-block-]>button.ui-btn-icon-notext,.ui-header [class*=ui-block-]>button.ui-btn,.ui-footer [class*=ui-block-]>button.ui-btn{margin-right:.3125em;margin-left:.3125em}.ui-grid-a>.ui-block-a,.ui-grid-a>.ui-block-b{width:50%}.ui-grid-b>.ui-block-a,.ui-grid-b>.ui-block-b,.ui-grid-b>.ui-block-c{width:33.333%}.ui-grid-c>.ui-block-a,.ui-grid-c>.ui-block-b,.ui-grid-c>.ui-block-c,.ui-grid-c>.ui-block-d{width:25%}.ui-grid-d>.ui-block-a,.ui-grid-d>.ui-block-b,.ui-grid-d>.ui-block-c,.ui-grid-d>.ui-block-d,.ui-grid-d>.ui-block-e{width:20%}.ui-grid-solo>.ui-block-a{width:100%;float:none}@media (max-width:35em){.ui-responsive>.ui-block-a,.ui-responsive>.ui-block-b,.ui-responsive>.ui-block-c,.ui-responsive>.ui-block-d,.ui-responsive>.ui-block-e{width:100%;float:none}}.ui-header-fixed,.ui-footer-fixed{left:0;right:0;width:100%;position:fixed;z-index:1000}.ui-header-fixed{top:-1px;padding-top:1px}.ui-header-fixed.ui-fixed-hidden{top:0;padding-top:0}.ui-header-fixed .ui-btn-left,.ui-header-fixed .ui-btn-right{margin-top:1px}.ui-header-fixed.ui-fixed-hidden .ui-btn-left,.ui-header-fixed.ui-fixed-hidden .ui-btn-right{margin-top:0}.ui-footer-fixed{bottom:-1px;padding-bottom:1px}.ui-footer-fixed.ui-fixed-hidden{bottom:0;padding-bottom:0}.ui-header-fullscreen,.ui-footer-fullscreen{filter:Alpha(Opacity=90);opacity:.9}.ui-page-header-fixed{padding-top:2.8125em}.ui-page-footer-fixed{padding-bottom:2.8125em}.ui-page-header-fullscreen>.ui-content,.ui-page-footer-fullscreen>.ui-content{padding:0}.ui-fixed-hidden{position:absolute}.ui-footer-fixed.ui-fixed-hidden{display:none}.ui-page .ui-footer-fixed.ui-fixed-hidden{display:block}.ui-page-header-fullscreen .ui-fixed-hidden,.ui-page-footer-fullscreen .ui-fixed-hidden{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-header-fixed .ui-btn,.ui-footer-fixed .ui-btn{z-index:10}.ui-android-2x-fixed .ui-li-has-thumb{-webkit-transform:translate3d(0,0,0)}.ui-navbar{max-width:100%}.ui-navbar ul:before,.ui-navbar ul:after{content:"";display:table}.ui-navbar ul:after{clear:both}.ui-navbar ul{list-style:none;margin:0;padding:0;position:relative;display:block;border:0;max-width:100%;overflow:visible}.ui-navbar li .ui-btn{font-size:12.5px;display:block;margin:0;border-right-width:0}.ui-navbar .ui-btn:focus{z-index:1}.ui-navbar li:last-child .ui-btn{margin-right:-4px}.ui-navbar li:last-child .ui-btn:after{margin-right:4px}.ui-content .ui-navbar li:last-child .ui-btn,.ui-content .ui-navbar .ui-grid-duo .ui-block-b .ui-btn{border-right-width:1px;margin-right:0}.ui-content .ui-navbar li:last-child .ui-btn:after,.ui-content .ui-navbar .ui-grid-duo .ui-block-b .ui-btn:after{margin-right:0}.ui-navbar .ui-grid-duo .ui-block-a:last-child .ui-btn{border-right-width:1px;margin-right:-1px}.ui-navbar .ui-grid-duo .ui-block-a:last-child .ui-btn:after{margin-right:1px}.ui-navbar .ui-grid-duo .ui-btn{border-top-width:0}.ui-navbar .ui-grid-duo .ui-block-a:first-child .ui-btn,.ui-navbar .ui-grid-duo .ui-block-a:first-child+.ui-block-b .ui-btn{border-top-width:1px}.ui-header .ui-navbar .ui-btn,.ui-footer .ui-navbar .ui-btn{border-top-width:0;border-bottom-width:0}.ui-header .ui-navbar .ui-grid-duo .ui-block-a:first-child .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-block-a:first-child .ui-btn,.ui-header .ui-navbar .ui-grid-duo .ui-block-a:first-child+.ui-block-b .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-block-a:first-child+.ui-block-b .ui-btn{border-top-width:0}.ui-header .ui-title~.ui-navbar .ui-btn,.ui-footer .ui-title~.ui-navbar .ui-btn,.ui-header .ui-navbar .ui-grid-duo .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-btn,.ui-header .ui-title~.ui-navbar .ui-grid-duo .ui-block-a:first-child .ui-btn,.ui-footer .ui-title~.ui-navbar .ui-grid-duo .ui-block-a:first-child .ui-btn,.ui-header .ui-title~.ui-navbar .ui-grid-duo .ui-block-a:first-child+.ui-block-b .ui-btn,.ui-footer .ui-title~.ui-navbar .ui-grid-duo .ui-block-a:first-child+.ui-block-b .ui-btn{border-top-width:1px}.ui-input-btn input{position:absolute;top:0;left:0;width:100%;height:100%;padding:0;border:0;outline:0;-webkit-border-radius:inherit;border-radius:inherit;-webkit-appearance:none;-moz-appearance:none;cursor:pointer;background:#fff;background:rgba(255,255,255,0);filter:Alpha(Opacity=0);opacity:.1;font-size:1px;text-indent:-9999px;z-index:2}.ui-input-btn.ui-state-disabled input{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-collapsible{margin:0 -1em}.ui-collapsible-inset,.ui-collapsible-set{margin:.5em 0}.ui-collapsible-heading{display:block;margin:0;padding:0;position:relative}.ui-collapsible-heading .ui-btn{text-align:left;margin:0;border-left-width:0;border-right-width:0}.ui-collapsible-heading .ui-btn-icon-top,.ui-collapsible-heading .ui-btn-icon-bottom{text-align:center}.ui-collapsible-inset .ui-collapsible-heading .ui-btn{border-right-width:1px;border-left-width:1px}.ui-collapsible-collapsed+.ui-collapsible:not(.ui-collapsible-inset)>.ui-collapsible-heading .ui-btn{border-top-width:0}.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:1px}.ui-collapsible-heading-status{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-collapsible-content{display:block;margin:0;padding:.5em 1em}.ui-collapsible-themed-content .ui-collapsible-content{border-left-width:0;border-right-width:0;border-top-width:0;border-bottom-width:1px;border-style:solid}.ui-collapsible-inset.ui-collapsible-themed-content .ui-collapsible-content{border-left-width:1px;border-right-width:1px}.ui-collapsible-inset .ui-collapsible-content{margin:0}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set>.ui-collapsible.ui-corner-all{-webkit-border-radius:0;border-radius:0}.ui-collapsible-heading,.ui-collapsible-heading>.ui-btn{-webkit-border-radius:inherit;border-radius:inherit}.ui-collapsible-set .ui-collapsible.ui-first-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-collapsible-content,.ui-collapsible-set .ui-collapsible.ui-last-child{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-collapsible-themed-content:not(.ui-collapsible-collapsed)>.ui-collapsible-heading{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-collapsible-set .ui-collapsible{margin:-1px -1em 0}.ui-collapsible-set .ui-collapsible-inset{margin:-1px 0 0}.ui-collapsible-set .ui-collapsible.ui-first-child{margin-top:0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0}.ui-field-contain .ui-controlgroup,.ui-field-contain fieldset.ui-controlgroup{margin:0}.ui-mini .ui-controlgroup-label{font-size:16px}.ui-controlgroup.ui-mini .ui-btn-icon-notext,.ui-controlgroup .ui-mini.ui-btn-icon-notext{font-size:inherit}.ui-controlgroup-controls .ui-btn,.ui-controlgroup-controls .ui-checkbox,.ui-controlgroup-controls .ui-radio,.ui-controlgroup-controls .ui-select{margin:0}.ui-controlgroup-controls .ui-btn:focus,.ui-controlgroup-controls .ui-btn.ui-focus{z-index:1}.ui-controlgroup-controls li{list-style:none}.ui-controlgroup-horizontal .ui-controlgroup-controls{display:inline-block;vertical-align:middle}.ui-controlgroup-horizontal .ui-controlgroup-controls:before,.ui-controlgroup-horizontal .ui-controlgroup-controls:after{content:"";display:table}.ui-controlgroup-horizontal .ui-controlgroup-controls:after{clear:both}.ui-controlgroup-horizontal .ui-controlgroup-controls>.ui-btn,.ui-controlgroup-horizontal .ui-controlgroup-controls li>.ui-btn,.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-checkbox,.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-radio,.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-select{float:left;clear:none}.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-btn,.ui-controlgroup-controls .ui-btn-icon-notext{width:auto}.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn-icon-notext,.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-btn-icon-notext{width:1.5em}.ui-controlgroup-controls .ui-btn-icon-notext{height:auto;padding:.7em 1em}.ui-controlgroup-vertical .ui-controlgroup-controls .ui-btn{border-bottom-width:0}.ui-controlgroup-vertical .ui-controlgroup-controls .ui-btn.ui-last-child{border-bottom-width:1px}.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn{border-right-width:0}.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn.ui-last-child{border-right-width:1px}.ui-controlgroup-controls .ui-btn-corner-all,.ui-controlgroup-controls .ui-btn.ui-corner-all{-webkit-border-radius:0;border-radius:0}.ui-controlgroup-controls,.ui-controlgroup-controls .ui-radio,.ui-controlgroup-controls .ui-checkbox,.ui-controlgroup-controls .ui-select,.ui-controlgroup-controls li{-webkit-border-radius:inherit;border-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-last-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup-controls a.ui-shadow:not(:focus),.ui-controlgroup-controls button.ui-shadow:not(:focus),.ui-controlgroup-controls div.ui-shadow:not(.ui-focus){-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.ui-controlgroup-label legend{max-width:100%}.ui-controlgroup-controls>label{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-dialog{background:none!important}.ui-dialog-contain{width:92.5%;max-width:500px;margin:10% auto 1em;padding:0;position:relative;top:-1em}.ui-dialog-contain>.ui-header,.ui-dialog-contain>.ui-content,.ui-dialog-contain>.ui-footer{display:block;position:relative;width:auto;margin:0}.ui-dialog-contain>.ui-header{overflow:hidden;z-index:10;padding:0;border-top-width:0}.ui-dialog-contain>.ui-footer{z-index:10;padding:0 1em;border-bottom-width:0}.ui-popup-open .ui-header-fixed,.ui-popup-open .ui-footer-fixed{position:absolute!important}.ui-popup-screen{background-image:url("data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==");top:0;left:0;right:0;bottom:1px;position:absolute;filter:Alpha(Opacity=0);opacity:0;z-index:1099}.ui-popup-screen.in{opacity:.5;filter:Alpha(Opacity=50)}.ui-popup-screen.out{opacity:0;filter:Alpha(Opacity=0)}.ui-popup-container{z-index:1100;display:inline-block;position:absolute;padding:0;outline:0}.ui-popup{position:relative}.ui-popup.ui-body-inherit{border-width:1px;border-style:solid}.ui-popup-hidden{left:0;top:0;position:absolute!important;visibility:hidden}.ui-popup-truncate{height:1px;width:1px;margin:-1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-popup.ui-content,.ui-popup .ui-content{overflow:visible}.ui-popup>.ui-header{border-top-width:0}.ui-popup>.ui-footer{border-bottom-width:0}.ui-popup>p,.ui-popup>h1,.ui-popup>h2,.ui-popup>h3,.ui-popup>h4,.ui-popup>h5,.ui-popup>h6{margin:.5em .4375em}.ui-popup>span{display:block;margin:.5em .4375em}.ui-popup-container .ui-content>p,.ui-popup-container .ui-content>h1,.ui-popup-container .ui-content>h2,.ui-popup-container .ui-content>h3,.ui-popup-container .ui-content>h4,.ui-popup-container .ui-content>h5,.ui-popup-container .ui-content>h6{margin:.5em 0}.ui-popup-container .ui-content>span{margin:0}.ui-popup-container .ui-content>p:first-child,.ui-popup-container .ui-content>h1:first-child,.ui-popup-container .ui-content>h2:first-child,.ui-popup-container .ui-content>h3:first-child,.ui-popup-container .ui-content>h4:first-child,.ui-popup-container .ui-content>h5:first-child,.ui-popup-container .ui-content>h6:first-child{margin-top:0}.ui-popup-container .ui-content>p:last-child,.ui-popup-container .ui-content>h1:last-child,.ui-popup-container .ui-content>h2:last-child,.ui-popup-container .ui-content>h3:last-child,.ui-popup-container .ui-content>h4:last-child,.ui-popup-container .ui-content>h5:last-child,.ui-popup-container .ui-content>h6:last-child{margin-bottom:0}.ui-popup>img{max-width:100%;max-height:100%;vertical-align:middle}.ui-popup:not(.ui-content)>img:only-child,.ui-popup:not(.ui-content)>.ui-btn-left:first-child+img:last-child,.ui-popup:not(.ui-content)>.ui-btn-right:first-child+img:last-child{-webkit-border-radius:inherit;border-radius:inherit}.ui-popup iframe{vertical-align:middle}.ui-popup>.ui-btn-left,.ui-popup>.ui-btn-right{position:absolute;top:-11px;margin:0;z-index:1101}.ui-popup>.ui-btn-left{left:-11px}.ui-popup>.ui-btn-right{right:-11px}.ui-popup-arrow-container{width:20px;height:20px}.ui-popup-arrow-container.ui-popup-arrow-l{left:-10px;clip:rect(-1000px,10px,2000px,-1000px)}.ui-popup-arrow-container.ui-popup-arrow-t{top:-10px;clip:rect(-1000px,2000px,10px,-1000px)}.ui-popup-arrow-container.ui-popup-arrow-r{right:-10px;clip:rect(-1000px,2000px,2000px,10px)}.ui-popup-arrow-container.ui-popup-arrow-b{bottom:-10px;clip:rect(10px,2000px,1000px,-1000px)}.ui-popup-arrow-container .ui-popup-arrow{width:28.284271247px;height:28.284271247px;border-width:1px;border-style:solid}.ui-popup-arrow-container.ui-popup-arrow-t .ui-popup-arrow{left:-4.142135623px;top:5.857864376px}.ui-popup-arrow-container.ui-popup-arrow-b .ui-popup-arrow{left:-4.142135623px;top:-14.142135623px}.ui-popup-arrow-container.ui-popup-arrow-l .ui-popup-arrow{left:5.857864376px;top:-4.142135623px}.ui-popup-arrow-container.ui-popup-arrow-r .ui-popup-arrow{left:-14.142135623px;top:-4.142135623px}.ui-popup-arrow-container.ui-popup-arrow-t.ie .ui-popup-arrow{margin-left:-5.857864376269049px;margin-top:-7.0710678118654755px}.ui-popup-arrow-container.ui-popup-arrow-b.ie .ui-popup-arrow{margin-left:-5.857864376269049px;margin-top:-4.142135623730951px}.ui-popup-arrow-container.ui-popup-arrow-l.ie .ui-popup-arrow{margin-left:-7.0710678118654755px;margin-top:-5.857864376269049px}.ui-popup-arrow-container.ui-popup-arrow-r.ie .ui-popup-arrow{margin-left:-4.142135623730951px;margin-top:-5.857864376269049px}.ui-popup>.ui-popup-arrow-guide{position:absolute;left:0;right:0;top:0;bottom:0;visibility:hidden}.ui-popup-arrow-container{position:absolute}.ui-popup-arrow{-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);position:absolute;overflow:hidden;box-sizing:border-box}.ui-popup-arrow-container.ie .ui-popup-arrow{-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(M11=0.7071067811865474, M12=-0.7071067811865477, M21=0.7071067811865477, M22=0.7071067811865474, SizingMethod='auto expand')";filter:progid:DXImageTransform.Microsoft.Matrix(M11=.7071067811865474, M12=-.7071067811865477, M21=.7071067811865477, M22=.7071067811865474, SizingMethod='auto expand')}.ui-checkbox,.ui-radio{margin:.5em 0;position:relative}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;white-space:normal;z-index:2}.ui-controlgroup .ui-checkbox .ui-btn.ui-focus,.ui-controlgroup .ui-radio .ui-btn.ui-focus{z-index:3}.ui-checkbox .ui-btn-icon-top,.ui-radio .ui-btn-icon-top,.ui-checkbox .ui-btn-icon-bottom,.ui-radio .ui-btn-icon-bottom{text-align:center}.ui-controlgroup-horizontal .ui-checkbox .ui-btn:after,.ui-controlgroup-horizontal .ui-radio .ui-btn:after{content:none;display:none}.ui-checkbox input,.ui-radio input{position:absolute;left:.466em;top:50%;width:22px;height:22px;margin:-11px 0 0 0;outline:0!important;z-index:1}.ui-controlgroup-horizontal .ui-checkbox input,.ui-controlgroup-horizontal .ui-radio input{left:50%;margin-left:-9px}.ui-checkbox input:disabled,.ui-radio input:disabled{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-select{margin-top:.5em;margin-bottom:.5em;position:relative}.ui-select>select{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-select .ui-btn{margin:0;opacity:1}.ui-select .ui-btn select{position:absolute;top:0;left:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;outline:0;-webkit-border-radius:inherit;border-radius:inherit;-webkit-appearance:none;-moz-appearance:none;cursor:pointer;filter:Alpha(Opacity=0);opacity:0;z-index:2}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-state-disabled select{display:none}.ui-select span.ui-state-disabled{filter:Alpha(Opacity=100);opacity:1}.ui-select .ui-btn.ui-select-nativeonly{border-radius:0;border:0}.ui-select .ui-btn.ui-select-nativeonly select{opacity:1;text-indent:0;display:block}.ui-select .ui-li-has-count.ui-btn{padding-right:2.8125em}.ui-select .ui-li-has-count.ui-btn-icon-right{padding-right:4.6875em}.ui-select .ui-btn-icon-right .ui-li-count{right:3.2em}.ui-select .ui-btn>span:not(.ui-li-count){display:block;text-overflow:ellipsis;overflow:hidden!important;white-space:nowrap}.ui-selectmenu.ui-popup{min-width:11em}.ui-selectmenu .ui-dialog-contain{overflow:hidden}.ui-selectmenu .ui-header{margin:0;padding:0;border-width:0}.ui-selectmenu.ui-dialog .ui-header{z-index:1;position:relative}.ui-selectmenu.ui-popup .ui-header{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-selectmenu.ui-popup .ui-header h1:after{content:'.';visibility:hidden}.ui-selectmenu .ui-header .ui-title{margin:0 2.875em}.ui-selectmenu.ui-dialog .ui-content{overflow:visible;z-index:1}.ui-selectmenu .ui-selectmenu-list{margin:0;-webkit-border-radius:inherit;border-radius:inherit}.ui-header:not(.ui-screen-hidden)+.ui-selectmenu-list{-webkit-border-top-right-radius:0;border-top-right-radius:0;-webkit-border-top-left-radius:0;border-top-left-radius:0}.ui-header.ui-screen-hidden+.ui-selectmenu-list li.ui-first-child .ui-btn{border-top-width:0}.ui-selectmenu .ui-selectmenu-list li.ui-last-child .ui-btn{border-bottom-width:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu .ui-selectmenu-placeholder{display:none}.ui-listview,.ui-listview>li{margin:0;padding:0;list-style:none}.ui-content .ui-listview,.ui-panel-inner>.ui-listview{margin:-1em}.ui-content .ui-listview-inset,.ui-panel-inner>.ui-listview-inset{margin:1em 0}.ui-collapsible-content>.ui-listview{margin:-.5em -1em}.ui-collapsible-content>.ui-listview-inset{margin:.5em 0}.ui-listview>li{display:block;position:relative;overflow:visible}.ui-listview>.ui-li-static,.ui-listview>.ui-li-divider,.ui-listview>li>a.ui-btn{margin:0;display:block;position:relative;text-align:left;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-listview>li>.ui-btn:focus{z-index:1}.ui-listview>.ui-li-static,.ui-listview>.ui-li-divider,.ui-listview>li>a.ui-btn{border-width:1px 0 0;border-style:solid}.ui-listview-inset>.ui-li-static,.ui-listview-inset>.ui-li-divider,.ui-listview-inset>li>a.ui-btn{border-right-width:1px;border-left-width:1px}.ui-listview>.ui-li-static.ui-last-child,.ui-listview>.ui-li-divider.ui-last-child,.ui-listview>li.ui-last-child>a.ui-btn{border-bottom-width:1px}.ui-collapsible-content>.ui-listview:not(.ui-listview-inset)>li.ui-first-child,.ui-collapsible-content>.ui-listview:not(.ui-listview-inset)>li.ui-first-child>a.ui-btn{border-top-width:0}.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset)>li.ui-last-child,.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset)>li.ui-last-child>a.ui-btn{border-bottom-width:0}.ui-listview>li.ui-first-child,.ui-listview>li.ui-first-child>a.ui-btn{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview>li.ui-last-child,.ui-listview>li.ui-last-child>a.ui-btn{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-listview>li.ui-li-has-alt>a.ui-btn{-webkit-border-top-right-radius:0;border-top-right-radius:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0}.ui-listview>li.ui-first-child>a.ui-btn+a.ui-btn{-webkit-border-top-left-radius:0;border-top-left-radius:0;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-listview>li.ui-last-child>a.ui-btn+a.ui-btn{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-listview>li.ui-first-child img:first-child:not(.ui-li-icon){-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview>li.ui-last-child img:first-child:not(.ui-li-icon){-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-collapsible-content>.ui-listview:not(.ui-listview-inset){-webkit-border-radius:inherit;border-radius:inherit}.ui-listview>.ui-li-static{padding:.7em 1em}.ui-listview>.ui-li-divider{padding:.5em 1.143em;font-size:14px;font-weight:700;cursor:default;outline:0}.ui-listview>.ui-li-has-count>.ui-btn,.ui-listview>.ui-li-static.ui-li-has-count,.ui-listview>.ui-li-divider.ui-li-has-count{padding-right:2.8125em}.ui-listview>.ui-li-has-count>.ui-btn-icon-right{padding-right:4.6875em}.ui-listview>.ui-li-has-thumb>.ui-btn,.ui-listview>.ui-li-static.ui-li-has-thumb{min-height:3.625em;padding-left:6.25em}.ui-listview>.ui-li-has-icon>.ui-btn,.ui-listview>.ui-li-static.ui-li-has-icon{min-height:1.25em;padding-left:2.5em}.ui-li-count{position:absolute;font-size:12.5px;font-weight:700;text-align:center;border-width:1px;border-style:solid;padding:0 .48em;line-height:1.6em;min-height:1.6em;min-width:.64em;right:.8em;top:50%;margin-top:-.88em}.ui-listview .ui-btn-icon-right .ui-li-count{right:3.2em}.ui-listview .ui-li-has-thumb>img:first-child,.ui-listview .ui-li-has-thumb>.ui-btn>img:first-child,.ui-listview .ui-li-has-thumb .ui-li-thumb{position:absolute;left:0;top:0;max-height:5em;max-width:5em}.ui-listview>.ui-li-has-icon>img:first-child,.ui-listview>.ui-li-has-icon>.ui-btn>img:first-child{position:absolute;left:.625em;top:.9em;max-height:1em;max-width:1em}.ui-listview>li h1,.ui-listview>li h2,.ui-listview>li h3,.ui-listview>li h4,.ui-listview>li h5,.ui-listview>li h6{font-size:1em;font-weight:700;display:block;margin:.45em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-listview>li p{font-size:.75em;font-weight:400;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-listview .ui-li-aside{position:absolute;top:1em;right:3.333em;margin:0;text-align:right}.ui-listview>li.ui-li-has-alt>.ui-btn{margin-right:2.5em;border-right-width:0}.ui-listview>li.ui-li-has-alt>.ui-btn+.ui-btn{position:absolute;width:2.5em;height:100%;min-height:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-listview-inset>li.ui-li-has-alt>.ui-btn+.ui-btn{border-right-width:1px}.ui-listview>li.ui-li-has-alt>.ui-btn+.ui-btn:focus{z-index:3}ol.ui-listview,ol.ui-listview>.ui-li-divider{counter-reset:listnumbering}ol.ui-listview>li>.ui-btn,ol.ui-listview>li.ui-li-static{vertical-align:middle}ol.ui-listview>li>.ui-btn:first-child:before,ol.ui-listview>li.ui-li-static:before,ol.ui-listview>li.ui-field-contain>label:before,ol.ui-listview>li.ui-field-contain>.ui-controlgroup-label:before{display:inline-block;font-size:.9em;font-weight:400;padding-right:.3em;min-width:1.4em;line-height:1.5;vertical-align:middle;counter-increment:listnumbering;content:counter(listnumbering) "."}ol.ui-listview>li.ui-field-contain:before{content:none;display:none}ol.ui-listview>li h1:first-child,ol.ui-listview>li h2:first-child,ol.ui-listview>li h3:first-child,ol.ui-listview>li h4:first-child,ol.ui-listview>li h5:first-child,ol.ui-listview>li h6:first-child,ol.ui-listview>li p:first-child,ol.ui-listview>li img:first-child+*{display:inline-block;vertical-align:middle}ol.ui-listview>li h1:first-child~*,ol.ui-listview>li h2:first-child~*,ol.ui-listview>li h3:first-child~*,ol.ui-listview>li h4:first-child~*,ol.ui-listview>li h5:first-child~*,ol.ui-listview>li h6:first-child~*,ol.ui-listview>li p:first-child~*,ol.ui-listview>li img:first-child+*~*{margin-top:0;text-indent:2.04em}html .ui-filterable+.ui-listview,html .ui-filterable.ui-listview{margin-top:.5em}.ui-collapsible-content>form.ui-filterable{margin-top:-.5em}.ui-collapsible-content>.ui-input-search.ui-filterable{margin-top:0}.ui-collapsible-content>.ui-filterable+.ui-listview:not(.ui-listview-inset)>li.ui-first-child,.ui-collapsible-content>.ui-filterable+.ui-listview:not(.ui-listview-inset)>li.ui-first-child>a.ui-btn,.ui-collapsible-content>.ui-filterable.ui-listview:not(.ui-listview-inset)>li.ui-first-child,.ui-collapsible-content>.ui-filterable.ui-listview:not(.ui-listview-inset)>li.ui-first-child>a.ui-btn{border-top-width:1px}div.ui-slider{height:30px;margin:.5em 0;padding:0;-ms-touch-action:pan-y pinch-zoom double-tap-zoom}div.ui-slider:before,div.ui-slider:after{content:"";display:table}div.ui-slider:after{clear:both}input.ui-slider-input{display:block;float:left;font-size:14px;font-weight:700;margin:0;padding:4px;width:40px;height:20px;line-height:20px;border-width:1px;border-style:solid;outline:0;text-align:center;vertical-align:text-bottom;-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-slider-input::-webkit-outer-spin-button,.ui-slider-input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.ui-slider-track{position:relative;overflow:visible;border-width:1px;border-style:solid;height:15px;margin:0 15px 0 68px;top:6px}.ui-slider-track.ui-mini{height:12px;top:8px}.ui-slider-track .ui-slider-bg{height:100%}.ui-slider-track .ui-btn.ui-slider-handle{position:absolute;z-index:1;top:50%;width:28px;height:28px;margin:-15px 0 0 -15px;outline:0;padding:0}.ui-slider-track.ui-mini .ui-slider-handle{height:14px;width:14px;margin:-8px 0 0 -8px}select.ui-slider-switch{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}div.ui-slider-switch{display:inline-block;height:32px;width:5.8em;top:0}div.ui-slider-switch:before,div.ui-slider-switch:after{display:none;clear:none}div.ui-slider-switch.ui-mini{height:29px;top:0}.ui-slider-inneroffset{margin:0 16px;position:relative;z-index:1}.ui-slider-switch.ui-mini .ui-slider-inneroffset{margin:0 15px 0 14px}.ui-slider-switch .ui-btn.ui-slider-handle{margin:1px 0 0 -15px}.ui-slider-switch.ui-mini .ui-slider-handle{width:25px;height:25px;margin:1px 0 0 -13px;padding:0}.ui-slider-handle-snapping{-webkit-transition:left 70ms linear;-moz-transition:left 70ms linear;transition:left 70ms linear}.ui-slider-switch .ui-slider-label{position:absolute;text-align:center;width:100%;overflow:hidden;font-size:16px;top:0;line-height:2;min-height:100%;white-space:nowrap;cursor:pointer}.ui-slider-switch.ui-mini .ui-slider-label{font-size:14px}.ui-slider-switch .ui-slider-label-a{z-index:1;left:0;text-indent:-1.5em}.ui-slider-switch .ui-slider-label-b{z-index:0;right:0;text-indent:1.5em}.ui-slider-track .ui-slider-bg,.ui-slider-switch .ui-slider-label,.ui-slider-switch .ui-slider-inneroffset,.ui-slider-handle{-webkit-border-radius:inherit;border-radius:inherit}.ui-field-contain div.ui-slider-switch{margin:0}.ui-field-contain div.ui-slider-switch,.ui-field-contain.ui-hide-label div.ui-slider-switch,html .ui-popup .ui-field-contain div.ui-slider-switch{display:inline-block;width:5.8em}.ui-slider-popup{width:64px;height:64px;font-size:36px;padding-top:14px;opacity:.8}.ui-slider-popup{position:absolute!important;text-align:center;z-index:100}.ui-slider-track .ui-btn.ui-slider-handle{font-size:.9em;line-height:30px}.ui-rangeslider{margin:.5em 0}.ui-rangeslider:before,.ui-rangeslider:after{content:"";display:table}.ui-rangeslider:after{clear:both}.ui-rangeslider .ui-slider-input.ui-rangeslider-last{float:right}.ui-rangeslider .ui-rangeslider-sliders{position:relative;overflow:visible;height:30px;margin:0 68px}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track{position:absolute;top:6px;right:0;left:0;margin:0}.ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track{top:8px}.ui-rangeslider .ui-slider-track:first-child .ui-slider-bg{display:none}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child{background-color:transparent;background:0;border-width:0;height:0}html >body .ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child{height:15px;border-width:1px}html >body .ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track:first-child{height:12px}div.ui-rangeslider label{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.ui-field-contain .ui-rangeslider input.ui-slider-input,.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input,.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders{margin-top:0;margin-bottom:0}.ui-input-text,.ui-input-search{margin:.5em 0;border-width:1px;border-style:solid}.ui-input-text input,.ui-input-search input,textarea.ui-input-text{padding:.4em;line-height:1.4em;display:block;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;outline:0}.ui-input-text input,.ui-input-search input{margin:0;min-height:2.2em;text-align:left;border:0;background:transparent none;-webkit-appearance:none;-webkit-border-radius:inherit;border-radius:inherit}textarea.ui-input-text{overflow:auto;resize:vertical}.ui-mini .ui-input-text input,.ui-mini .ui-input-search input,.ui-input-text.ui-mini input,.ui-input-search.ui-mini input,.ui-mini textarea.ui-input-text,textarea.ui-mini{font-size:14px}.ui-mini textarea.ui-input-text,textarea.ui-mini{margin:.446em 0}.ui-input-has-clear,.ui-input-search{position:relative}.ui-input-has-clear{padding-right:2.375em}.ui-mini.ui-input-has-clear{padding-right:2.923em}.ui-input-has-clear input{padding-right:0;-webkit-border-top-right-radius:0;border-top-right-radius:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0}.ui-input-search input{padding-left:1.75em}.ui-input-search:after{position:absolute;left:.3125em;top:50%;margin-top:-7px;content:"";background-position:center center;background-repeat:no-repeat;width:14px;height:14px;filter:Alpha(Opacity=50);opacity:.5}.ui-input-search.ui-input-has-clear .ui-btn.ui-input-clear,.ui-input-text.ui-input-has-clear .ui-btn.ui-input-clear{position:absolute;right:0;top:50%;margin:-14px .3125em 0;border:0;background-color:transparent}.ui-input-search .ui-input-clear-hidden,.ui-input-text .ui-input-clear-hidden{display:none}.ui-input-text input::-moz-placeholder,.ui-input-search input::-moz-placeholder,textarea.ui-input-text::-moz-placeholder{color:#aaa}.ui-input-text input:-ms-input-placeholder,.ui-input-search input:-ms-input-placeholder,textarea.ui-input-text:-ms-input-placeholder{color:#aaa}.ui-input-text input[type=number]::-webkit-outer-spin-button{margin:0}.ui-input-text input::-ms-clear,.ui-input-search input::-ms-clear{display:none}.ui-input-text input:focus,.ui-input-search input:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}textarea.ui-input-text.ui-textinput-autogrow{overflow:hidden}.ui-textinput-autogrow-resize{-webkit-transition:height .25s;-o-transition:height .25s;-moz-transition:height .25s;transition:height .25s}.ui-flipswitch{display:inline-block;vertical-align:middle;width:5.875em;height:1.875em;border-width:1px;border-style:solid;margin:.5em 0;overflow:hidden;-webkit-transition-property:padding,width,background-color,color,border-color;-moz-transition-property:padding,width,background-color,color,border-color;-o-transition-property:padding,width,background-color,color,border-color;transition-property:padding,width,background-color,color,border-color;-webkit-transition-duration:100ms;-moz-transition-duration:100ms;-o-transition-duration:100ms;transition-duration:100ms;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.ui-flipswitch.ui-flipswitch-active{padding-left:4em;width:1.875em}.ui-flipswitch-input{position:absolute;height:1px;width:1px;margin:-1px;overflow:hidden;clip:rect(1px,1px,1px,1px);border:0;outline:0;filter:Alpha(Opacity=0);opacity:0}.ui-flipswitch .ui-btn.ui-flipswitch-on,.ui-flipswitch .ui-flipswitch-off{float:left;height:1.75em;margin:.0625em;line-height:1.65em}.ui-flipswitch .ui-btn.ui-flipswitch-on{width:1.75em;padding:0;text-indent:-2.6em;text-align:left;border-width:1px;border-style:solid;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:inherit;overflow:visible;color:inherit;text-shadow:inherit}.ui-flipswitch .ui-flipswitch-off{padding:1px;text-indent:1em}html .ui-field-contain>label+.ui-flipswitch,html .ui-popup .ui-field-contain>label+.ui-flipswitch{display:inline-block;width:5.875em;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-field-contain .ui-flipswitch.ui-flipswitch-active,.ui-popup .ui-field-contain .ui-flipswitch.ui-flipswitch-active{width:1.875em}.ui-table{border:0;border-collapse:collapse;padding:0;width:100%}.ui-table th,.ui-table td{line-height:1.5em;text-align:left;padding:.4em .5em;vertical-align:top}.ui-table th .ui-btn,.ui-table td .ui-btn{line-height:normal}.ui-table th{font-weight:700}.ui-table caption{text-align:left;margin-bottom:1.4em;opacity:.5}.ui-table-columntoggle-btn{float:right;margin-bottom:.8em}.ui-table-columntoggle-popup fieldset{margin:0}.ui-table-columntoggle{clear:both}@media only all{th.ui-table-priority-6,td.ui-table-priority-6,th.ui-table-priority-5,td.ui-table-priority-5,th.ui-table-priority-4,td.ui-table-priority-4,th.ui-table-priority-3,td.ui-table-priority-3,th.ui-table-priority-2,td.ui-table-priority-2,th.ui-table-priority-1,td.ui-table-priority-1{display:none}}@media screen and (min-width:20em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-1,.ui-table-columntoggle.ui-responsive td.ui-table-priority-1{display:table-cell}}@media screen and (min-width:30em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-2,.ui-table-columntoggle.ui-responsive td.ui-table-priority-2{display:table-cell}}@media screen and (min-width:40em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-3,.ui-table-columntoggle.ui-responsive td.ui-table-priority-3{display:table-cell}}@media screen and (min-width:50em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-4,.ui-table-columntoggle.ui-responsive td.ui-table-priority-4{display:table-cell}}@media screen and (min-width:60em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-5,.ui-table-columntoggle.ui-responsive td.ui-table-priority-5{display:table-cell}}@media screen and (min-width:70em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-6,.ui-table-columntoggle.ui-responsive td.ui-table-priority-6{display:table-cell}}.ui-table-columntoggle th.ui-table-cell-hidden,.ui-table-columntoggle td.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive th.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive td.ui-table-cell-hidden{display:none}.ui-table-columntoggle th.ui-table-cell-visible,.ui-table-columntoggle td.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive th.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive td.ui-table-cell-visible{display:table-cell}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{display:none}@media only all{.ui-table-reflow thead td,.ui-table-reflow thead th{display:none}.ui-table-reflow td,.ui-table-reflow th{text-align:left;display:block}.ui-table-reflow tbody th{margin-top:3em}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{padding:.4em;min-width:30%;display:inline-block;margin:-.4em 1em -.4em -.4em}.ui-table-reflow th .ui-table-cell-label-top,.ui-table-reflow td .ui-table-cell-label-top{display:block;padding:.4em 0;margin:.4em 0;text-transform:uppercase;font-size:.9em;font-weight:400}}@media (min-width:35em){.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th,.ui-table-reflow.ui-responsive tbody th,.ui-table-reflow.ui-responsive tbody td,.ui-table-reflow.ui-responsive thead td,.ui-table-reflow.ui-responsive thead th{display:table-cell;margin:0}.ui-table-reflow.ui-responsive td .ui-table-cell-label,.ui-table-reflow.ui-responsive th .ui-table-cell-label{display:none}}@media (max-width:35em){.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;clear:left}}.ui-panel{width:17em;min-height:100%;max-height:none;border-width:0;position:absolute;top:0;display:block}.ui-panel-closed{width:0;max-height:100%;overflow:hidden;visibility:hidden}.ui-panel-fixed{position:fixed;bottom:-1px;padding-bottom:1px}.ui-panel-display-reveal{z-index:1}.ui-panel-display-push{z-index:999}.ui-panel-display-overlay{z-index:1001}.ui-panel-inner{padding:1em}.ui-panel-page-container{overflow-x:visible}.ui-panel-page-container-themed .ui-page-active{background:0}.ui-panel-wrapper{position:relative;min-height:inherit;border:0;overflow-x:hidden;z-index:999}.ui-panel-fixed-toolbar{overflow-x:hidden}.ui-panel-dismiss{position:absolute;top:0;left:0;right:0;height:100%;z-index:1002;display:none}.ui-panel-dismiss-open{display:block}.ui-panel-animate{-webkit-transition:-webkit-transform 300ms ease;-webkit-transition-duration:300ms;-moz-transition:-moz-transform 300ms ease;transition:transform 300ms ease}@media screen and (max-device-width:768px){.ui-page-header-fixed .ui-panel-animate.ui-panel-wrapper,.ui-page-footer-fixed .ui-panel-animate.ui-panel-wrapper,.ui-panel-animate.ui-panel-fixed-toolbar{-ms-transition:none}.ui-panel-animate.ui-panel-fixed-toolbar{-ms-transition:-ms-transform 1ms;-ms-transform:rotate(0deg)}}.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal){-webkit-backface-visibility:hidden;-webkit-transform:translate3d(0,0,0)}.ui-panel-position-left{left:-17em}.ui-panel-animate.ui-panel-position-left.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-left.ui-panel-display-push{left:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-position-left.ui-panel-display-reveal,.ui-panel-open.ui-panel-position-left{left:0}.ui-panel-animate.ui-panel-open.ui-panel-position-left.ui-panel-display-overlay,.ui-panel-animate.ui-panel-open.ui-panel-position-left.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-moz-transform:none}.ui-panel-position-right{right:-17em}.ui-panel-animate.ui-panel-position-right.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-right.ui-panel-display-push{right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-position-right.ui-panel-display-reveal,.ui-panel-position-right.ui-panel-open{right:0}.ui-panel-animate.ui-panel-open.ui-panel-position-right.ui-panel-display-overlay,.ui-panel-animate.ui-panel-open.ui-panel-position-right.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-moz-transform:none}.ui-panel-page-content-position-left{left:17em;right:-17em}.ui-panel-animate.ui-panel-page-content-position-left{left:0;right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-page-content-position-right{left:-17em;right:17em}.ui-panel-animate.ui-panel-page-content-position-right{left:0;right:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-dismiss-open.ui-panel-dismiss-position-left{left:17em}.ui-panel-dismiss-open.ui-panel-dismiss-position-right{right:17em}.ui-panel-display-reveal{-webkit-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);box-shadow:inset -5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-reveal{-webkit-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);box-shadow:inset 5px 0 5px rgba(0,0,0,.15)}.ui-panel-display-overlay{-webkit-box-shadow:5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:5px 0 5px rgba(0,0,0,.15);box-shadow:5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-overlay{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15)}.ui-panel-open.ui-panel-position-left.ui-panel-display-push{border-right-width:1px;margin-right:-1px}.ui-panel-page-content-position-left.ui-panel-page-content-display-push{margin-left:1px;width:auto}.ui-panel-open.ui-panel-position-right.ui-panel-display-push{border-left-width:1px;margin-left:-1px}.ui-panel-page-content-position-right.ui-panel-page-content-display-push{margin-right:1px;width:auto}@media (min-width:55em){.ui-responsive-panel .ui-panel-page-content-open.ui-panel-page-content-position-left{margin-right:17em}.ui-responsive-panel .ui-panel-page-content-open.ui-panel-page-content-position-right{margin-left:17em}.ui-responsive-panel .ui-panel-page-content-open{width:auto}.ui-responsive-panel .ui-panel-dismiss-display-push,.ui-responsive-panel.ui-page-active~.ui-panel-dismiss-display-push{display:none}}.ui-tabs{position:relative;padding:.2em}
\ No newline at end of file
diff --git a/html5/verto/demo/js/jquery-2.1.1.min.js b/html5/verto/demo/js/jquery-2.1.1.min.js
new file mode 100644
index 0000000000..e5ace116b6
--- /dev/null
+++ b/html5/verto/demo/js/jquery-2.1.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
+},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
+},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Ic=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Jc})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Lc=a.jQuery,Mc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Mc),b&&a.jQuery===n&&(a.jQuery=Lc),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/html5/verto/demo/js/jquery.dataTables.min.js b/html5/verto/demo/js/jquery.dataTables.min.js
new file mode 100644
index 0000000000..c5936e5835
--- /dev/null
+++ b/html5/verto/demo/js/jquery.dataTables.min.js
@@ -0,0 +1,155 @@
+/*! DataTables 1.10.1
+ * ©2008-2014 SpryMedia Ltd - datatables.net/license
+ */
+(function(za,O,l){var N=function(h){function T(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),d[c]=e,"o"===b[1]&&T(a[e])});a._hungarianMap=d}function G(a,b,c){a._hungarianMap||T(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==l&&(c||b[d]===l))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),G(a[d],b[d],c)):b[d]=b[e]})}function N(a){var b=p.defaults.oLanguage,c=a.sZeroRecords;
+!a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&D(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&D(a,a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&cb(a)}function db(a){w(a,"ordering","bSort");w(a,"orderMulti","bSortMulti");w(a,"orderClasses","bSortClasses");w(a,"orderCellsTop","bSortCellsTop");w(a,"order","aaSorting");w(a,"orderFixed","aaSortingFixed");w(a,"paging","bPaginate");
+w(a,"pagingType","sPaginationType");w(a,"pageLength","iDisplayLength");w(a,"searching","bFilter");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&G(p.models.oSearch,a[b])}function eb(a){w(a,"orderable","bSortable");w(a,"orderData","aDataSort");w(a,"orderSequence","asSorting");w(a,"orderDataType","sortDataType")}function fb(a){var a=a.oBrowser,b=h("<div/>").css({position:"absolute",top:0,left:0,height:1,width:1,overflow:"hidden"}).append(h("<div/>").css({position:"absolute",top:1,left:1,width:100,
+overflow:"scroll"}).append(h('<div class="test"/>').css({width:"100%",height:10}))).appendTo("body"),c=b.find(".test");a.bScrollOversize=100===c[0].offsetWidth;a.bScrollbarLeft=1!==c.offset().left;b.remove()}function gb(a,b,c,d,e,f){var g,j=!1;c!==l&&(g=c,j=!0);for(;d!==e;)a.hasOwnProperty(d)&&(g=j?b(g,a[d],d,a):a[d],j=!0,d+=f);return g}function Aa(a,b){var c=p.defaults.column,d=a.aoColumns.length,c=h.extend({},p.models.oColumn,c,{nTh:b?b:O.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:
+"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=h.extend({},p.models.oSearch,c[d]);fa(a,d,null)}function fa(a,b,c){var b=a.aoColumns[b],d=a.oClasses,e=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var f=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==l&&null!==c&&(eb(c),G(p.defaults.column,c),c.mDataProp!==l&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&
+!c.sClass&&(c.sClass=c.className),h.extend(b,c),D(b,c,"sWidth","sWidthOrig"),"number"===typeof c.iDataSort&&(b.aDataSort=[c.iDataSort]),D(b,c,"aDataSort"));var g=b.mData,j=U(g),i=b.mRender?U(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b.fnGetData=function(a,b,c){var d=j(a,b,l,c);return i&&b?i(d,b,a,c):d};b.fnSetData=function(a,b,c){return Ba(g)(a,b,c)};a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));
+a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI)}function V(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Ca(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=
+a.oScroll;(""!==b.sY||""!==b.sX)&&W(a);u(a,null,"column-sizing",[a])}function ga(a,b){var c=X(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function Y(a,b){var c=X(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}function Z(a){return X(a,"bVisible").length}function X(a,b){var c=[];h.map(a.aoColumns,function(a,e){a[b]&&c.push(e)});return c}function Da(a){var b=a.aoColumns,c=a.aoData,d=p.ext.type.detect,e,f,g,j,i,h,m,n,k;e=0;for(f=b.length;e<f;e++)if(m=b[e],k=[],!m.sType&&m._sManualType)m.sType=
+m._sManualType;else if(!m.sType){g=0;for(j=d.length;g<j;g++){i=0;for(h=c.length;i<h&&!(k[i]===l&&(k[i]=A(a,i,e,"type")),n=d[g](k[i],a),!n||"html"===n);i++);if(n){m.sType=n;break}}m.sType||(m.sType="string")}}function hb(a,b,c,d){var e,f,g,j,i,o,m=a.aoColumns;if(b)for(e=b.length-1;0<=e;e--){o=b[e];var n=o.targets!==l?o.targets:o.aTargets;h.isArray(n)||(n=[n]);f=0;for(g=n.length;f<g;f++)if("number"===typeof n[f]&&0<=n[f]){for(;m.length<=n[f];)Aa(a);d(n[f],o)}else if("number"===typeof n[f]&&0>n[f])d(m.length+
+n[f],o);else if("string"===typeof n[f]){j=0;for(i=m.length;j<i;j++)("_all"==n[f]||h(m[j].nTh).hasClass(n[f]))&&d(j,o)}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}function I(a,b,c,d){var e=a.aoData.length,f=h.extend(!0,{},p.models.oRow,{src:c?"dom":"data"});f._aData=b;a.aoData.push(f);for(var b=a.aoColumns,f=0,g=b.length;f<g;f++)c&&Ea(a,e,f,A(a,e,f)),b[f].sType=null;a.aiDisplayMaster.push(e);(c||!a.oFeatures.bDeferRender)&&Fa(a,e,c,d);return e}function ha(a,b){var c;b instanceof h||(b=h(b));return b.map(function(b,
+e){c=ia(a,e);return I(a,c.data,e,c.cells)})}function A(a,b,c,d){var e=a.iDraw,f=a.aoColumns[c],g=a.aoData[b]._aData,j=f.sDefaultContent,c=f.fnGetData(g,d,{settings:a,row:b,col:c});if(c===l)return a.iDrawError!=e&&null===j&&(P(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b,4),a.iDrawError=e),j;if((c===g||null===c)&&null!==j)c=j;else if("function"===typeof c)return c.call(g);return null===c&&"display"==d?"":c}function Ea(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,
+d,{settings:a,row:b,col:c})}function Ga(a){return h.map(a.match(/(\\.|[^\.])+/g),function(a){return a.replace(/\\./g,".")})}function U(a){if(h.isPlainObject(a)){var b={};h.each(a,function(a,c){c&&(b[a]=U(c))});return function(a,c,f,g){var j=b[c]||b._;return j!==l?j(a,c,f,g):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,c,f,g){return a(b,c,f,g)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var c=function(a,b,f){var g,
+j;if(""!==f){j=Ga(f);for(var i=0,h=j.length;i<h;i++){f=j[i].match($);g=j[i].match(Q);if(f){j[i]=j[i].replace($,"");""!==j[i]&&(a=a[j[i]]);g=[];j.splice(0,i+1);j=j.join(".");i=0;for(h=a.length;i<h;i++)g.push(c(a[i],b,j));a=f[0].substring(1,f[0].length-1);a=""===a?g:g.join(a);break}else if(g){j[i]=j[i].replace(Q,"");a=a[j[i]]();continue}if(null===a||a[j[i]]===l)return l;a=a[j[i]]}}return a};return function(b,e){return c(b,e,a)}}return function(b){return b[a]}}function Ba(a){if(h.isPlainObject(a))return Ba(a._);
+if(null===a)return function(){};if("function"===typeof a)return function(b,d,e){a(b,"set",d,e)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var b=function(a,d,e){var e=Ga(e),f;f=e[e.length-1];for(var g,j,i=0,h=e.length-1;i<h;i++){g=e[i].match($);j=e[i].match(Q);if(g){e[i]=e[i].replace($,"");a[e[i]]=[];f=e.slice();f.splice(0,i+1);g=f.join(".");j=0;for(h=d.length;j<h;j++)f={},b(f,d[j],g),a[e[i]].push(f);return}j&&(e[i]=e[i].replace(Q,""),a=a[e[i]](d));if(null===
+a[e[i]]||a[e[i]]===l)a[e[i]]={};a=a[e[i]]}if(f.match(Q))a[f.replace(Q,"")](d);else a[f.replace($,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Ha(a){return C(a.aoData,"_aData")}function ja(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0}function ka(a,b,c){for(var d=-1,e=0,f=a.length;e<f;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===l&&a.splice(d,1)}function la(a,b,c,d){var e=a.aoData[b],f;if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=
+ia(a,e).data;else{var g=e.anCells,j;if(g){c=0;for(f=g.length;c<f;c++){for(j=g[c];j.childNodes.length;)j.removeChild(j.firstChild);g[c].innerHTML=A(a,b,c,"display")}}}e._aSortData=null;e._aFilterData=null;a=a.aoColumns;if(d!==l)a[d].sType=null;else{c=0;for(f=a.length;c<f;c++)a[c].sType=null}Ia(e)}function ia(a,b){var c=[],d=[],e=b.firstChild,f,g,j,i=0,o,m=a.aoColumns,n=function(a,b,c){"string"===typeof a&&(b=a.indexOf("@"),-1!==b&&(a=a.substring(b+1),j["@"+a]=c.getAttribute(a)))},k=function(a){g=m[i];
+o=h.trim(a.innerHTML);g&&g._bAttrSrc?(j={display:o},n(g.mData.sort,j,a),n(g.mData.type,j,a),n(g.mData.filter,j,a),c.push(j)):c.push(o);i++};if(e)for(;e;){f=e.nodeName.toUpperCase();if("TD"==f||"TH"==f)k(e),d.push(e);e=e.nextSibling}else{d=b.anCells;e=0;for(f=d.length;e<f;e++)k(d[e])}return{data:c,cells:d}}function Fa(a,b,c,d){var e=a.aoData[b],f=e._aData,g=[],j,i,h,m,n;if(null===e.nTr){j=c||O.createElement("tr");e.nTr=j;e.anCells=g;j._DT_RowIndex=b;Ia(e);m=0;for(n=a.aoColumns.length;m<n;m++){h=a.aoColumns[m];
+i=c?d[m]:O.createElement(h.sCellType);g.push(i);if(!c||h.mRender||h.mData!==m)i.innerHTML=A(a,b,m,"display");h.sClass&&(i.className+=" "+h.sClass);h.bVisible&&!c?j.appendChild(i):!h.bVisible&&c&&i.parentNode.removeChild(i);h.fnCreatedCell&&h.fnCreatedCell.call(a.oInstance,i,A(a,b,m),f,b,m)}u(a,"aoRowCreatedCallback",null,[j,f,b])}e.nTr.setAttribute("role","row")}function Ia(a){var b=a.nTr,c=a._aData;if(b){c.DT_RowId&&(b.id=c.DT_RowId);if(c.DT_RowClass){var d=c.DT_RowClass.split(" ");a.__rowc=a.__rowc?
+Ja(a.__rowc.concat(d)):d;h(b).removeClass(a.__rowc.join(" ")).addClass(c.DT_RowClass)}c.DT_RowData&&h(b).data(c.DT_RowData)}}function ib(a){var b,c,d,e,f,g=a.nTHead,j=a.nTFoot,i=0===h("th, td",g).length,o=a.oClasses,m=a.aoColumns;i&&(e=h("<tr/>").appendTo(g));b=0;for(c=m.length;b<c;b++)f=m[b],d=h(f.nTh).addClass(f.sClass),i&&d.appendTo(e),a.oFeatures.bSort&&(d.addClass(f.sSortingClass),!1!==f.bSortable&&(d.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),Ka(a,f.nTh,b))),f.sTitle!=d.html()&&
+d.html(f.sTitle),La(a,"header")(a,d,f,o);i&&aa(a.aoHeader,g);h(g).find(">tr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(o.sHeaderTH);h(j).find(">tr>th, >tr>td").addClass(o.sFooterTH);if(null!==j){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=m[b],f.nTf=a[b].cell,f.sClass&&h(f.nTf).addClass(f.sClass)}}function ba(a,b,c){var d,e,f,g=[],j=[],i=a.aoColumns.length,o;if(b){c===l&&(c=!1);d=0;for(e=b.length;d<e;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=i-1;0<=f;f--)!a.aoColumns[f].bVisible&&
+!c&&g[d].splice(f,1);j.push([])}d=0;for(e=g.length;d<e;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(o=i=1,j[d][f]===l){a.appendChild(g[d][f].cell);for(j[d][f]=1;g[d+i]!==l&&g[d][f].cell==g[d+i][f].cell;)j[d+i][f]=1,i++;for(;g[d][f+o]!==l&&g[d][f].cell==g[d][f+o].cell;){for(c=0;c<i;c++)j[d+c][f+o]=1;o++}h(g[d][f].cell).attr("rowspan",i).attr("colspan",o)}}}}function K(a){var b=u(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))B(a,!1);else{var b=
+[],c=0,d=a.asStripeClasses,e=d.length,f=a.oLanguage,g=a.iInitDisplayStart,j="ssp"==z(a),i=a.aiDisplay;a.bDrawing=!0;g!==l&&-1!==g&&(a._iDisplayStart=j?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);var g=a._iDisplayStart,o=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,B(a,!1);else if(j){if(!a.bDestroying&&!jb(a))return}else a.iDraw++;if(0!==i.length){f=j?a.aoData.length:o;for(j=j?0:g;j<f;j++){var m=i[j],n=a.aoData[m];null===n.nTr&&Fa(a,m);m=n.nTr;if(0!==e){var k=d[c%e];n._sRowStripe!=
+k&&(h(m).removeClass(n._sRowStripe).addClass(k),n._sRowStripe=k)}u(a,"aoRowCallback",null,[m,n._aData,c,j]);b.push(m);c++}}else c=f.sZeroRecords,1==a.iDraw&&"ajax"==z(a)?c=f.sLoadingRecords:f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=h("<tr/>",{"class":e?d[0]:""}).append(h("<td />",{valign:"top",colSpan:Z(a),"class":a.oClasses.sRowEmpty}).html(c))[0];u(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Ha(a),g,o,i]);u(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],
+Ha(a),g,o,i]);d=h(a.nTBody);d.children().detach();d.append(h(b));u(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function L(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&kb(a);d?ca(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;K(a);a._drawHold=!1}function lb(a){var b=a.oClasses,c=h(a.nTable),c=h("<div/>").insertBefore(c),d=a.oFeatures,e=h("<div/>",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});
+a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var f=a.sDom.split(""),g,j,i,o,m,n,k=0;k<f.length;k++){g=null;j=f[k];if("<"==j){i=h("<div/>")[0];o=f[k+1];if("'"==o||'"'==o){m="";for(n=2;f[k+n]!=o;)m+=f[k+n],n++;"H"==m?m=b.sJUIHeader:"F"==m&&(m=b.sJUIFooter);-1!=m.indexOf(".")?(o=m.split("."),i.id=o[0].substr(1,o[0].length-1),i.className=o[1]):"#"==m.charAt(0)?i.id=m.substr(1,m.length-1):i.className=m;k+=n}e.append(i);e=h(i)}else if(">"==j)e=e.parent();else if("l"==
+j&&d.bPaginate&&d.bLengthChange)g=mb(a);else if("f"==j&&d.bFilter)g=nb(a);else if("r"==j&&d.bProcessing)g=ob(a);else if("t"==j)g=pb(a);else if("i"==j&&d.bInfo)g=qb(a);else if("p"==j&&d.bPaginate)g=rb(a);else if(0!==p.ext.feature.length){i=p.ext.feature;n=0;for(o=i.length;n<o;n++)if(j==i[n].cFeature){g=i[n].fnInit(a);break}}g&&(i=a.aanFeatures,i[j]||(i[j]=[]),i[j].push(g),e.append(g))}c.replaceWith(e)}function aa(a,b){var c=h(b).children("tr"),d,e,f,g,j,i,o,m,n,k;a.splice(0,a.length);f=0;for(i=c.length;f<
+i;f++)a.push([]);f=0;for(i=c.length;f<i;f++){d=c[f];for(e=d.firstChild;e;){if("TD"==e.nodeName.toUpperCase()||"TH"==e.nodeName.toUpperCase()){m=1*e.getAttribute("colspan");n=1*e.getAttribute("rowspan");m=!m||0===m||1===m?1:m;n=!n||0===n||1===n?1:n;g=0;for(j=a[f];j[g];)g++;o=g;k=1===m?!0:!1;for(j=0;j<m;j++)for(g=0;g<n;g++)a[f+g][o+j]={cell:e,unique:k},a[f+g].nTr=d}e=e.nextSibling}}}function ma(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],aa(c,b)));for(var b=0,e=c.length;b<e;b++)for(var f=0,g=c[b].length;f<
+g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function na(a,b,c){u(a,"aoServerParams","serverParams",[b]);if(b&&h.isArray(b)){var d={},e=/(.*?)\[\]$/;h.each(b,function(a,b){var c=b.name.match(e);c?(c=c[0],d[c]||(d[c]=[]),d[c].push(b.value)):d[b.name]=b.value});b=d}var f,g=a.ajax,j=a.oInstance;if(h.isPlainObject(g)&&g.data){f=g.data;var i=h.isFunction(f)?f(b):f,b=h.isFunction(f)&&i?i:h.extend(!0,b,i);delete g.data}i={data:b,success:function(b){var d=b.error||b.sError;
+d&&a.oApi._fnLog(a,0,d);a.json=b;u(a,null,"xhr",[a,b]);c(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,c){var d=a.oApi._fnLog;"parsererror"==c?d(a,0,"Invalid JSON response",1):4===b.readyState&&d(a,0,"Ajax error",7);B(a,!1)}};a.oAjaxData=b;u(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(j,a.sAjaxSource,h.map(b,function(a,b){return{name:b,value:a}}),c,a):a.sAjaxSource||"string"===typeof g?a.jqXHR=h.ajax(h.extend(i,{url:g||a.sAjaxSource})):h.isFunction(g)?a.jqXHR=g.call(j,
+b,c,a):(a.jqXHR=h.ajax(h.extend(i,g)),g.data=f)}function jb(a){return a.bAjaxDataGet?(a.iDraw++,B(a,!0),na(a,sb(a),function(b){tb(a,b)}),!1):!0}function sb(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,f=a.aoPreSearchCols,g,j=[],i,o,m,n=R(a);g=a._iDisplayStart;i=!1!==d.bPaginate?a._iDisplayLength:-1;var k=function(a,b){j.push({name:a,value:b})};k("sEcho",a.iDraw);k("iColumns",c);k("sColumns",C(b,"sName").join(","));k("iDisplayStart",g);k("iDisplayLength",i);var l={draw:a.iDraw,
+columns:[],order:[],start:g,length:i,search:{value:e.sSearch,regex:e.bRegex}};for(g=0;g<c;g++)o=b[g],m=f[g],i="function"==typeof o.mData?"function":o.mData,l.columns.push({data:i,name:o.sName,searchable:o.bSearchable,orderable:o.bSortable,search:{value:m.sSearch,regex:m.bRegex}}),k("mDataProp_"+g,i),d.bFilter&&(k("sSearch_"+g,m.sSearch),k("bRegex_"+g,m.bRegex),k("bSearchable_"+g,o.bSearchable)),d.bSort&&k("bSortable_"+g,o.bSortable);d.bFilter&&(k("sSearch",e.sSearch),k("bRegex",e.bRegex));d.bSort&&
+(h.each(n,function(a,b){l.order.push({column:b.col,dir:b.dir});k("iSortCol_"+a,b.col);k("sSortDir_"+a,b.dir)}),k("iSortingCols",n.length));b=p.ext.legacy.ajax;return null===b?a.sAjaxSource?j:l:b?j:l}function tb(a,b){var c=b.sEcho!==l?b.sEcho:b.draw,d=b.iTotalRecords!==l?b.iTotalRecords:b.recordsTotal,e=b.iTotalDisplayRecords!==l?b.iTotalDisplayRecords:b.recordsFiltered;if(c){if(1*c<a.iDraw)return;a.iDraw=1*c}ja(a);a._iRecordsTotal=parseInt(d,10);a._iRecordsDisplay=parseInt(e,10);c=oa(a,b);d=0;for(e=
+c.length;d<e;d++)I(a,c[d]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;K(a);a._bInitComplete||pa(a,b);a.bAjaxDataGet=!0;B(a,!1)}function oa(a,b){var c=h.isPlainObject(a.ajax)&&a.ajax.dataSrc!==l?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?U(c)(b):b}function nb(a){var b=a.oClasses,c=a.sTableId,d=a.oLanguage,e=a.oPreviousSearch,f=a.aanFeatures,g='<input type="search" class="'+b.sFilterInput+'"/>',j=d.sSearch,j=j.match(/_INPUT_/)?j.replace("_INPUT_",g):j+g,b=h("<div/>",
+{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("<label/>").append(j)),f=function(){var b=!this.value?"":this.value;b!=e.sSearch&&(ca(a,{sSearch:b,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive}),a._iDisplayStart=0,K(a))},i=h("input",b).val(e.sSearch).attr("placeholder",d.sSearchPlaceholder).bind("keyup.DT search.DT input.DT paste.DT cut.DT","ssp"===z(a)?Ma(f,400):f).bind("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",c);h(a.nTable).on("search.dt.DT",
+function(b,c){if(a===c)try{i[0]!==O.activeElement&&i.val(e.sSearch)}catch(d){}});return b[0]}function ca(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};Da(a);if("ssp"!=z(a)){ub(a,b.sSearch,c,b.bEscapeRegex!==l?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<e.length;b++)vb(a,e[b].sSearch,b,e[b].bEscapeRegex!==l?!e[b].bEscapeRegex:e[b].bRegex,e[b].bSmart,e[b].bCaseInsensitive);
+wb(a)}else f(b);a.bFiltered=!0;u(a,null,"search",[a])}function wb(a){for(var b=p.ext.search,c=a.aiDisplay,d,e,f=0,g=b.length;f<g;f++){for(var j=[],i=0,h=c.length;i<h;i++)e=c[i],d=a.aoData[e],b[f](a,d._aFilterData,e,d._aData,i)&&j.push(e);c.length=0;c.push.apply(c,j)}}function vb(a,b,c,d,e,f){if(""!==b)for(var g=a.aiDisplay,d=Na(b,d,e,f),e=g.length-1;0<=e;e--)b=a.aoData[g[e]]._aFilterData[c],d.test(b)||g.splice(e,1)}function ub(a,b,c,d,e,f){var d=Na(b,d,e,f),e=a.oPreviousSearch.sSearch,f=a.aiDisplayMaster,
+g;0!==p.ext.search.length&&(c=!0);g=xb(a);if(0>=b.length)a.aiDisplay=f.slice();else{if(g||c||e.length>b.length||0!==b.indexOf(e)||a.bSorted)a.aiDisplay=f.slice();b=a.aiDisplay;for(c=b.length-1;0<=c;c--)d.test(a.aoData[b[c]]._sFilterRow)||b.splice(c,1)}}function Na(a,b,c,d){a=b?a:Oa(a);c&&(a="^(?=.*?"+h.map(a.match(/"[^"]+"|[^ ]+/g)||"",function(a){return'"'===a.charAt(0)?a.match(/^"(.*)"$/)[1]:a}).join(")(?=.*?")+").*$");return RegExp(a,d?"i":"")}function Oa(a){return a.replace(Vb,"\\$1")}function xb(a){var b=
+a.aoColumns,c,d,e,f,g,j,i,h,m=p.ext.type.search;c=!1;d=0;for(f=a.aoData.length;d<f;d++)if(h=a.aoData[d],!h._aFilterData){j=[];e=0;for(g=b.length;e<g;e++)if(c=b[e],c.bSearchable?(i=A(a,d,e,"filter"),i=m[c.sType]?m[c.sType](i):null!==i?i:""):i="",i)i.indexOf&&-1!==i.indexOf("&")&&(qa.innerHTML=i,i=Wb?qa.textContent:qa.innerText),i.replace&&(i=i.replace(/[\r\n]/g,"")),j.push(i);h._aFilterData=j;h._sFilterRow=j.join("  ");c=!0}return c}function yb(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,
+caseInsensitive:a.bCaseInsensitive}}function zb(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function qb(a){var b=a.sTableId,c=a.aanFeatures.i,d=h("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Ab,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),h(a.nTable).attr("aria-describedby",b+"_info"));return d[0]}function Ab(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,d=a._iDisplayStart+
+1,e=a.fnDisplayEnd(),f=a.fnRecordsTotal(),g=a.fnRecordsDisplay(),j=g?c.sInfo:c.sInfoEmpty;g!==f&&(j+=" "+c.sInfoFiltered);j+=c.sInfoPostFix;j=Bb(a,j);c=c.fnInfoCallback;null!==c&&(j=c.call(a.oInstance,a,d,e,f,g,j));h(b).html(j)}}function Bb(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,f=a.fnRecordsDisplay(),g=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,
+f)).replace(/_PAGE_/g,c.call(a,g?1:Math.ceil(d/e))).replace(/_PAGES_/g,c.call(a,g?1:Math.ceil(f/e)))}function ra(a){var b,c,d=a.iInitDisplayStart,e=a.aoColumns,f;c=a.oFeatures;if(a.bInitialised){lb(a);ib(a);ba(a,a.aoHeader);ba(a,a.aoFooter);B(a,!0);c.bAutoWidth&&Ca(a);b=0;for(c=e.length;b<c;b++)f=e[b],f.sWidth&&(f.nTh.style.width=s(f.sWidth));L(a);e=z(a);"ssp"!=e&&("ajax"==e?na(a,[],function(c){var f=oa(a,c);for(b=0;b<f.length;b++)I(a,f[b]);a.iInitDisplayStart=d;L(a);B(a,!1);pa(a,c)},a):(B(a,!1),
+pa(a)))}else setTimeout(function(){ra(a)},200)}function pa(a,b){a._bInitComplete=!0;b&&V(a);u(a,"aoInitComplete","init",[a,b])}function Pa(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Qa(a);u(a,null,"length",[a,c])}function mb(a){for(var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=h.isArray(d[0]),f=e?d[0]:d,d=e?d[1]:d,e=h("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),g=0,j=f.length;g<j;g++)e[0][g]=new Option(d[g],f[g]);var i=h("<div><label/></div>").addClass(b.sLength);
+a.aanFeatures.l||(i[0].id=c+"_length");i.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));h("select",i).val(a._iDisplayLength).bind("change.DT",function(){Pa(a,h(this).val());K(a)});h(a.nTable).bind("length.dt.DT",function(b,c,d){a===c&&h("select",i).val(d)});return i[0]}function rb(a){var b=a.sPaginationType,c=p.ext.pager[b],d="function"===typeof c,e=function(a){K(a)},b=h("<div/>").addClass(a.oClasses.sPaging+b)[0],f=a.aanFeatures;d||c.fnInit(a,b,e);f.p||(b.id=a.sTableId+
+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,i=a._iDisplayLength,h=a.fnRecordsDisplay(),m=-1===i,b=m?0:Math.ceil(b/i),i=m?1:Math.ceil(h/i),h=c(b,i),n,m=0;for(n=f.p.length;m<n;m++)La(a,"pageButton")(a,f.p[m],m,h,b,i)}else c.fnUpdate(a,e)},sName:"pagination"}));return b}function Ra(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===e?d=0:"number"===typeof b?(d=b*e,d>f&&(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==
+b?d+e<f&&(d+=e):"last"==b?d=Math.floor((f-1)/e)*e:P(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=d;b&&(u(a,null,"page",[a]),c&&K(a));return b}function ob(a){return h("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function B(a,b){a.oFeatures.bProcessing&&h(a.aanFeatures.r).css("display",b?"block":"none");u(a,null,"processing",[a,b])}function pb(a){var b=h(a.nTable);b.attr("role",
+"grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,f=a.oClasses,g=b.children("caption"),j=g.length?g[0]._captionSide:null,i=h(b[0].cloneNode(!1)),o=h(b[0].cloneNode(!1)),m=b.children("tfoot");c.sX&&"100%"===b.attr("width")&&b.removeAttr("width");m.length||(m=null);c=h("<div/>",{"class":f.sScrollWrapper}).append(h("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?!d?null:s(d):"100%"}).append(h("<div/>",{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",
+width:c.sXInner||"100%"}).append(i.removeAttr("id").css("margin-left",0).append(b.children("thead")))).append("top"===j?g:null)).append(h("<div/>",{"class":f.sScrollBody}).css({overflow:"auto",height:!e?null:s(e),width:!d?null:s(d)}).append(b));m&&c.append(h("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:d?!d?null:s(d):"100%"}).append(h("<div/>",{"class":f.sScrollFootInner}).append(o.removeAttr("id").css("margin-left",0).append(b.children("tfoot")))).append("bottom"===j?g:
+null));var b=c.children(),n=b[0],f=b[1],k=m?b[2]:null;d&&h(f).scroll(function(){var a=this.scrollLeft;n.scrollLeft=a;m&&(k.scrollLeft=a)});a.nScrollHead=n;a.nScrollBody=f;a.nScrollFoot=k;a.aoDrawCallback.push({fn:W,sName:"scrolling"});return c[0]}function W(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY,f=b.iBarWidth,g=h(a.nScrollHead),j=g[0].style,i=g.children("div"),o=i[0].style,m=i.children("table"),i=a.nScrollBody,n=h(i),k=i.style,l=h(a.nScrollFoot).children("div"),p=l.children("table"),r=h(a.nTHead),
+q=h(a.nTable),da=q[0],M=da.style,J=a.nTFoot?h(a.nTFoot):null,u=a.oBrowser,v=u.bScrollOversize,y,t,x,w,z,A=[],B=[],C=[],D,E=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};q.children("thead, tfoot").remove();z=r.clone().prependTo(q);y=r.find("tr");x=z.find("tr");z.find("th, td").removeAttr("tabindex");J&&(w=J.clone().prependTo(q),t=J.find("tr"),w=w.find("tr"));c||(k.width="100%",g[0].style.width="100%");h.each(ma(a,z),function(b,c){D=
+ga(a,b);c.style.width=a.aoColumns[D].sWidth});J&&F(function(a){a.style.width=""},w);b.bCollapse&&""!==e&&(k.height=n[0].offsetHeight+r[0].offsetHeight+"px");g=q.outerWidth();if(""===c){if(M.width="100%",v&&(q.find("tbody").height()>i.offsetHeight||"scroll"==n.css("overflow-y")))M.width=s(q.outerWidth()-f)}else""!==d?M.width=s(d):g==n.width()&&n.height()<q.height()?(M.width=s(g-f),q.outerWidth()>g-f&&(M.width=s(g))):M.width=s(g);g=q.outerWidth();F(E,x);F(function(a){C.push(a.innerHTML);A.push(s(h(a).css("width")))},
+x);F(function(a,b){a.style.width=A[b]},y);h(x).height(0);J&&(F(E,w),F(function(a){B.push(s(h(a).css("width")))},w),F(function(a,b){a.style.width=B[b]},t),h(w).height(0));F(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+C[b]+"</div>";a.style.width=A[b]},x);J&&F(function(a,b){a.innerHTML="";a.style.width=B[b]},w);if(q.outerWidth()<g){t=i.scrollHeight>i.offsetHeight||"scroll"==n.css("overflow-y")?g+f:g;if(v&&(i.scrollHeight>i.offsetHeight||"scroll"==n.css("overflow-y")))M.width=
+s(t-f);(""===c||""!==d)&&P(a,1,"Possible column misalignment",6)}else t="100%";k.width=s(t);j.width=s(t);J&&(a.nScrollFoot.style.width=s(t));!e&&v&&(k.height=s(da.offsetHeight+f));e&&b.bCollapse&&(k.height=s(e),b=c&&da.offsetWidth>i.offsetWidth?f:0,da.offsetHeight<i.offsetHeight&&(k.height=s(da.offsetHeight+b)));b=q.outerWidth();m[0].style.width=s(b);o.width=s(b);m=q.height()>i.clientHeight||"scroll"==n.css("overflow-y");u="padding"+(u.bScrollbarLeft?"Left":"Right");o[u]=m?f+"px":"0px";J&&(p[0].style.width=
+s(b),l[0].style.width=s(b),l[0].style[u]=m?f+"px":"0px");n.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)i.scrollTop=0}function F(a,b,c){for(var d=0,e=0,f=b.length,g,j;e<f;){g=b[e].firstChild;for(j=c?c[e].firstChild:null;g;)1===g.nodeType&&(c?a(g,j,d):a(g,d),d++),g=g.nextSibling,j=c?j.nextSibling:null;e++}}function Ca(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,e=d.sY,f=d.sX,g=d.sXInner,j=c.length,d=X(a,"bVisible"),i=h("th",a.nTHead),o=b.getAttribute("width"),m=b.parentNode,n=!1,k,l;for(k=0;k<
+d.length;k++)l=c[d[k]],null!==l.sWidth&&(l.sWidth=Cb(l.sWidthOrig,m),n=!0);if(!n&&!f&&!e&&j==Z(a)&&j==i.length)for(k=0;k<j;k++)c[k].sWidth=s(i.eq(k).width());else{j=h(b).clone().empty().css("visibility","hidden").removeAttr("id").append(h(a.nTHead).clone(!1)).append(h(a.nTFoot).clone(!1)).append(h("<tbody><tr/></tbody>"));j.find("tfoot th, tfoot td").css("width","");var p=j.find("tbody tr"),i=ma(a,j.find("thead")[0]);for(k=0;k<d.length;k++)l=c[d[k]],i[k].style.width=null!==l.sWidthOrig&&""!==l.sWidthOrig?
+s(l.sWidthOrig):"";if(a.aoData.length)for(k=0;k<d.length;k++)n=d[k],l=c[n],h(Db(a,n)).clone(!1).append(l.sContentPadding).appendTo(p);j.appendTo(m);f&&g?j.width(g):f?(j.css("width","auto"),j.width()<m.offsetWidth&&j.width(m.offsetWidth)):e?j.width(m.offsetWidth):o&&j.width(o);Eb(a,j[0]);if(f){for(k=g=0;k<d.length;k++)l=c[d[k]],e=h(i[k]).outerWidth(),g+=null===l.sWidthOrig?e:parseInt(l.sWidth,10)+e-h(i[k]).width();j.width(s(g));b.style.width=s(g)}for(k=0;k<d.length;k++)if(l=c[d[k]],e=h(i[k]).width())l.sWidth=
+s(e);b.style.width=s(j.css("width"));j.remove()}o&&(b.style.width=s(o));if((o||f)&&!a._reszEvt)h(za).bind("resize.DT-"+a.sInstance,Ma(function(){V(a)})),a._reszEvt=!0}function Ma(a,b){var c=b||200,d,e;return function(){var b=this,g=+new Date,j=arguments;d&&g<d+c?(clearTimeout(e),e=setTimeout(function(){d=l;a.apply(b,j)},c)):d?(d=g,a.apply(b,j)):d=g}}function Cb(a,b){if(!a)return 0;var c=h("<div/>").css("width",s(a)).appendTo(b||O.body),d=c[0].offsetWidth;c.remove();return d}function Eb(a,b){var c=
+a.oScroll;if(c.sX||c.sY)c=!c.sX?c.iBarWidth:0,b.style.width=s(h(b).outerWidth()-c)}function Db(a,b){var c=Fb(a,b);if(0>c)return null;var d=a.aoData[c];return!d.nTr?h("<td/>").html(A(a,c,b,"display"))[0]:d.anCells[b]}function Fb(a,b){for(var c,d=-1,e=-1,f=0,g=a.aoData.length;f<g;f++)c=A(a,f,b,"display")+"",c=c.replace(Xb,""),c.length>d&&(d=c.length,e=f);return e}function s(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function Gb(){if(!p.__scrollbarWidth){var a=
+h("<p/>").css({width:"100%",height:200,padding:0})[0],b=h("<div/>").css({position:"absolute",top:0,left:0,width:200,height:150,padding:0,overflow:"hidden",visibility:"hidden"}).append(a).appendTo("body"),c=a.offsetWidth;b.css("overflow","scroll");a=a.offsetWidth;c===a&&(a=b[0].clientWidth);b.remove();p.__scrollbarWidth=c-a}return p.__scrollbarWidth}function R(a){var b,c,d=[],e=a.aoColumns,f,g,j,i;b=a.aaSortingFixed;c=h.isPlainObject(b);var o=[];f=function(a){a.length&&!h.isArray(a[0])?o.push(a):o.push.apply(o,
+a)};h.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<o.length;a++){i=o[a][0];f=e[i].aDataSort;b=0;for(c=f.length;b<c;b++)g=f[b],j=e[g].sType||"string",d.push({src:i,col:g,dir:o[a][1],index:o[a][2],type:j,formatter:p.ext.type.order[j+"-pre"]})}return d}function kb(a){var b,c,d=[],e=p.ext.type.order,f=a.aoData,g=0,j,i=a.aiDisplayMaster,h;Da(a);h=R(a);b=0;for(c=h.length;b<c;b++)j=h[b],j.formatter&&g++,Hb(a,j.col);if("ssp"!=z(a)&&0!==h.length){b=0;for(c=i.length;b<c;b++)d[i[b]]=
+b;g===h.length?i.sort(function(a,b){var c,e,g,j,i=h.length,l=f[a]._aSortData,p=f[b]._aSortData;for(g=0;g<i;g++)if(j=h[g],c=l[j.col],e=p[j.col],c=c<e?-1:c>e?1:0,0!==c)return"asc"===j.dir?c:-c;c=d[a];e=d[b];return c<e?-1:c>e?1:0}):i.sort(function(a,b){var c,g,j,i,l=h.length,p=f[a]._aSortData,r=f[b]._aSortData;for(j=0;j<l;j++)if(i=h[j],c=p[i.col],g=r[i.col],i=e[i.type+"-"+i.dir]||e["string-"+i.dir],c=i(c,g),0!==c)return c;c=d[a];g=d[b];return c<g?-1:c>g?1:0})}a.bSorted=!0}function Ib(a){for(var b,c,
+d=a.aoColumns,e=R(a),a=a.oLanguage.oAria,f=0,g=d.length;f<g;f++){c=d[f];var j=c.asSorting;b=c.sTitle.replace(/<.*?>/g,"");var i=c.nTh;i.removeAttribute("aria-sort");c.bSortable&&(0<e.length&&e[0].col==f?(i.setAttribute("aria-sort","asc"==e[0].dir?"ascending":"descending"),c=j[e[0].index+1]||j[0]):c=j[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);i.setAttribute("aria-label",b)}}function Sa(a,b,c,d){var e=a.aaSorting,f=a.aoColumns[b].asSorting,g=function(a){var b=a._idx;b===l&&(b=h.inArray(a[1],
+f));return b+1>=f.length?0:b+1};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=h.inArray(b,C(e,"0")),-1!==c?(b=g(e[c]),e[c][1]=f[b],e[c]._idx=b):(e.push([b,f[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=g(e[0]),e.length=1,e[0][1]=f[b],e[0]._idx=b):(e.length=0,e.push([b,f[0]]),e[0]._idx=0);L(a);"function"==typeof d&&d(a)}function Ka(a,b,c,d){var e=a.aoColumns[c];Ta(b,{},function(b){!1!==e.bSortable&&(a.oFeatures.bProcessing?(B(a,!0),setTimeout(function(){Sa(a,c,b.shiftKey,
+d);"ssp"!==z(a)&&B(a,!1)},0)):Sa(a,c,b.shiftKey,d))})}function sa(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,d=R(a),e=a.oFeatures,f,g;if(e.bSort&&e.bSortClasses){e=0;for(f=b.length;e<f;e++)g=b[e].src,h(C(a.aoData,"anCells",g)).removeClass(c+(2>e?e+1:3));e=0;for(f=d.length;e<f;e++)g=d[e].src,h(C(a.aoData,"anCells",g)).addClass(c+(2>e?e+1:3))}a.aLastSort=d}function Hb(a,b){var c=a.aoColumns[b],d=p.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,Y(a,b)));for(var f,g=p.ext.type.order[c.sType+
+"-pre"],j=0,i=a.aoData.length;j<i;j++)if(c=a.aoData[j],c._aSortData||(c._aSortData=[]),!c._aSortData[b]||d)f=d?e[j]:A(a,j,b,"sort"),c._aSortData[b]=g?g(f):f}function ta(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:h.extend(!0,[],a.aaSorting),search:yb(a.oPreviousSearch),columns:h.map(a.aoColumns,function(b,d){return{visible:b.bVisible,search:yb(a.aoPreSearchCols[d])}})};u(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=
+b;a.fnStateSaveCallback.call(a.oInstance,a,b)}}function Jb(a){var b,c,d=a.aoColumns;if(a.oFeatures.bStateSave){var e=a.fnStateLoadCallback.call(a.oInstance,a);if(e&&e.time&&(b=u(a,"aoStateLoadParams","stateLoadParams",[a,e]),-1===h.inArray(!1,b)&&(b=a.iStateDuration,!(0<b&&e.time<+new Date-1E3*b)&&d.length===e.columns.length))){a.oLoadedState=h.extend(!0,{},e);a._iDisplayStart=e.start;a.iInitDisplayStart=e.start;a._iDisplayLength=e.length;a.aaSorting=[];h.each(e.order,function(b,c){a.aaSorting.push(c[0]>=
+d.length?[0,c[1]]:c)});h.extend(a.oPreviousSearch,zb(e.search));b=0;for(c=e.columns.length;b<c;b++){var f=e.columns[b];d[b].bVisible=f.visible;h.extend(a.aoPreSearchCols[b],zb(f.search))}u(a,"aoStateLoaded","stateLoaded",[a,e])}}}function ua(a){var b=p.settings,a=h.inArray(a,C(b,"nTable"));return-1!==a?b[a]:null}function P(a,b,c,d){c="DataTables warning: "+(null!==a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+d);if(b)za.console&&
+console.log&&console.log(c);else if(a=p.ext,"alert"==(a.sErrMode||a.errMode))alert(c);else throw Error(c);}function D(a,b,c,d){h.isArray(c)?h.each(c,function(c,d){h.isArray(d)?D(a,b,d[0],d[1]):D(a,b,d)}):(d===l&&(d=c),b[c]!==l&&(a[d]=b[c]))}function Kb(a,b,c){var d,e;for(e in b)b.hasOwnProperty(e)&&(d=b[e],h.isPlainObject(d)?(h.isPlainObject(a[e])||(a[e]={}),h.extend(!0,a[e],d)):a[e]=c&&"data"!==e&&"aaData"!==e&&h.isArray(d)?d.slice():d);return a}function Ta(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();
+c(b)}).bind("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).bind("selectstart.DT",function(){return!1})}function x(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function u(a,b,c,d){var e=[];b&&(e=h.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,d)}));null!==c&&h(a.nTable).trigger(c+".dt",d);return e}function Qa(a){var b=a._iDisplayStart,c=a.fnDisplayEnd(),d=a._iDisplayLength;c===a.fnRecordsDisplay()&&(b=c-d);if(-1===d||0>b)b=0;a._iDisplayStart=b}function La(a,b){var c=
+a.renderer,d=p.ext.renderer[b];return h.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===typeof c?d[c]||d._:d._}function z(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function Ua(a,b){var c=[],c=Lb.numbers_length,d=Math.floor(c/2);b<=c?c=S(0,b):a<=d?(c=S(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-d?c=S(b-(c-2),b):(c=S(a-1,a+2),c.push("ellipsis"),c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function cb(a){h.each({num:function(b){return va(b,
+a)},"num-fmt":function(b){return va(b,a,Va)},"html-num":function(b){return va(b,a,wa)},"html-num-fmt":function(b){return va(b,a,wa,Va)}},function(b,c){t.type.order[b+a+"-pre"]=c})}function Mb(a){return function(){var b=[ua(this[p.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return p.ext.internal[a].apply(this,b)}}var p,t,q,r,v,Wa={},Nb=/[\r\n]/g,wa=/<.*?>/g,Yb=/^[\w\+\-]/,Zb=/[\w\+\-]$/,Vb=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Va=/[',$\u00a3\u20ac\u00a5%\u2009\u202F]/g,
+H=function(a){return!a||!0===a||"-"===a?!0:!1},Ob=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Pb=function(a,b){Wa[b]||(Wa[b]=RegExp(Oa(b),"g"));return"string"===typeof a?a.replace(/\./g,"").replace(Wa[b],"."):a},Xa=function(a,b,c){var d="string"===typeof a;b&&d&&(a=Pb(a,b));c&&d&&(a=a.replace(Va,""));return H(a)||!isNaN(parseFloat(a))&&isFinite(a)},Qb=function(a,b,c){return H(a)?!0:!(H(a)||"string"===typeof a)?null:Xa(a.replace(wa,""),b,c)?!0:null},C=function(a,b,c){var d=
+[],e=0,f=a.length;if(c!==l)for(;e<f;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<f;e++)a[e]&&d.push(a[e][b]);return d},xa=function(a,b,c,d){var e=[],f=0,g=b.length;if(d!==l)for(;f<g;f++)e.push(a[b[f]][c][d]);else for(;f<g;f++)e.push(a[b[f]][c]);return e},S=function(a,b){var c=[],d;b===l?(b=0,d=a):(d=b,b=a);for(var e=b;e<d;e++)c.push(e);return c},Ja=function(a){var b=[],c,d,e=a.length,f,g=0;d=0;a:for(;d<e;d++){c=a[d];for(f=0;f<g;f++)if(b[f]===c)continue a;b.push(c);g++}return b},w=function(a,
+b,c){a[b]!==l&&(a[c]=a[b])},$=/\[.*?\]$/,Q=/\(\)$/,qa=h("<div>")[0],Wb=qa.textContent!==l,Xb=/<.*?>/g;p=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new q(ua(this[t.iApiIndex])):new q(this)};this.fnAddData=function(a,b){var c=this.api(!0),d=h.isArray(a)&&(h.isArray(a[0])||h.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===l||b)&&c.draw();return d.flatten().toArray()};this.fnAdjustColumnSizing=
+function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===l||a?b.draw(!1):(""!==d.sX||""!==d.sY)&&W(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===l||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var d=this.api(!0),a=d.rows(a),e=a.settings()[0],h=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,h);(c===l||c)&&d.draw();return h};this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(!a)};
+this.fnFilter=function(a,b,c,d,e,h){e=this.api(!0);null===b||b===l?e.search(a,c,d,h):e.column(b).search(a,c,d,h);e.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==l){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==l||"td"==d||"th"==d?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==l?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();
+return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===l||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===l||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return ua(this[t.iApiIndex])};
+this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var h=this.api(!0);c===l||null===c?h.row(b).data(a):h.cell(b,c).data(a);(e===l||e)&&h.columns.adjust();(d===l||d)&&h.draw();return 0};this.fnVersionCheck=t.fnVersionCheck;var b=this,c=a===l,d=this.length;c&&(a={});this.oApi=this.internal=t.internal;for(var e in p.ext.internal)e&&(this[e]=Mb(e));this.each(function(){var e={},g=1<d?Kb(e,a,!0):
+a,j=0,i,o=this.getAttribute("id"),e=!1,m=p.defaults;if("table"!=this.nodeName.toLowerCase())P(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{db(m);eb(m.column);G(m,m,!0);G(m.column,m.column,!0);G(m,g);var n=p.settings,j=0;for(i=n.length;j<i;j++){if(n[j].nTable==this){i=g.bRetrieve!==l?g.bRetrieve:m.bRetrieve;if(c||i)return n[j].oInstance;if(g.bDestroy!==l?g.bDestroy:m.bDestroy){n[j].oInstance.fnDestroy();break}else{P(n[j],0,"Cannot reinitialise DataTable",3);return}}if(n[j].sTableId==
+this.id){n.splice(j,1);break}}if(null===o||""===o)this.id=o="DataTables_Table_"+p.ext._unique++;var k=h.extend(!0,{},p.models.oSettings,{nTable:this,oApi:b.internal,oInit:g,sDestroyWidth:h(this)[0].style.width,sInstance:o,sTableId:o});n.push(k);k.oInstance=1===b.length?b:h(this).dataTable();db(g);g.oLanguage&&N(g.oLanguage);g.aLengthMenu&&!g.iDisplayLength&&(g.iDisplayLength=h.isArray(g.aLengthMenu[0])?g.aLengthMenu[0][0]:g.aLengthMenu[0]);g=Kb(h.extend(!0,{},m),g);D(k.oFeatures,g,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));
+D(k,g,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback","renderer",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"],["bJQueryUI","bJUI"]]);D(k.oScroll,g,[["sScrollX","sX"],["sScrollXInner","sXInner"],
+["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);D(k.oLanguage,g,"fnInfoCallback");x(k,"aoDrawCallback",g.fnDrawCallback,"user");x(k,"aoServerParams",g.fnServerParams,"user");x(k,"aoStateSaveParams",g.fnStateSaveParams,"user");x(k,"aoStateLoadParams",g.fnStateLoadParams,"user");x(k,"aoStateLoaded",g.fnStateLoaded,"user");x(k,"aoRowCallback",g.fnRowCallback,"user");x(k,"aoRowCreatedCallback",g.fnCreatedRow,"user");x(k,"aoHeaderCallback",g.fnHeaderCallback,"user");x(k,"aoFooterCallback",g.fnFooterCallback,
+"user");x(k,"aoInitComplete",g.fnInitComplete,"user");x(k,"aoPreDrawCallback",g.fnPreDrawCallback,"user");o=k.oClasses;g.bJQueryUI?(h.extend(o,p.ext.oJUIClasses,g.oClasses),g.sDom===m.sDom&&"lfrtip"===m.sDom&&(k.sDom='<"H"lfr>t<"F"ip>'),k.renderer)?h.isPlainObject(k.renderer)&&!k.renderer.header&&(k.renderer.header="jqueryui"):k.renderer="jqueryui":h.extend(o,p.ext.classes,g.oClasses);h(this).addClass(o.sTable);if(""!==k.oScroll.sX||""!==k.oScroll.sY)k.oScroll.iBarWidth=Gb();!0===k.oScroll.sX&&(k.oScroll.sX=
+"100%");k.iInitDisplayStart===l&&(k.iInitDisplayStart=g.iDisplayStart,k._iDisplayStart=g.iDisplayStart);null!==g.iDeferLoading&&(k.bDeferLoading=!0,j=h.isArray(g.iDeferLoading),k._iRecordsDisplay=j?g.iDeferLoading[0]:g.iDeferLoading,k._iRecordsTotal=j?g.iDeferLoading[1]:g.iDeferLoading);""!==g.oLanguage.sUrl?(k.oLanguage.sUrl=g.oLanguage.sUrl,h.getJSON(k.oLanguage.sUrl,null,function(a){N(a);G(m.oLanguage,a);h.extend(true,k.oLanguage,g.oLanguage,a);ra(k)}),e=!0):h.extend(!0,k.oLanguage,g.oLanguage);
+null===g.asStripeClasses&&(k.asStripeClasses=[o.sStripeOdd,o.sStripeEven]);var j=k.asStripeClasses,r=h("tbody tr:eq(0)",this);-1!==h.inArray(!0,h.map(j,function(a){return r.hasClass(a)}))&&(h("tbody tr",this).removeClass(j.join(" ")),k.asDestroyStripes=j.slice());var n=[],q,j=this.getElementsByTagName("thead");0!==j.length&&(aa(k.aoHeader,j[0]),n=ma(k));if(null===g.aoColumns){q=[];j=0;for(i=n.length;j<i;j++)q.push(null)}else q=g.aoColumns;j=0;for(i=q.length;j<i;j++)Aa(k,n?n[j]:null);hb(k,g.aoColumnDefs,
+q,function(a,b){fa(k,a,b)});if(r.length){var s=function(a,b){return a.getAttribute("data-"+b)?b:null};h.each(ia(k,r[0]).cells,function(a,b){var c=k.aoColumns[a];if(c.mData===a){var d=s(b,"sort")||s(b,"order"),e=s(b,"filter")||s(b,"search");if(d!==null||e!==null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:l,type:d!==null?a+".@data-"+d:l,filter:e!==null?a+".@data-"+e:l};fa(k,a)}}})}var t=k.oFeatures;g.bStateSave&&(t.bStateSave=!0,Jb(k,g),x(k,"aoDrawCallback",ta,"state_save"));if(g.aaSorting===
+l){n=k.aaSorting;j=0;for(i=n.length;j<i;j++)n[j][1]=k.aoColumns[j].asSorting[0]}sa(k);t.bSort&&x(k,"aoDrawCallback",function(){if(k.bSorted){var a=R(k),b={};h.each(a,function(a,c){b[c.src]=c.dir});u(k,null,"order",[k,a,b]);Ib(k)}});x(k,"aoDrawCallback",function(){(k.bSorted||z(k)==="ssp"||t.bDeferRender)&&sa(k)},"sc");fb(k);j=h(this).children("caption").each(function(){this._captionSide=h(this).css("caption-side")});i=h(this).children("thead");0===i.length&&(i=h("<thead/>").appendTo(this));k.nTHead=
+i[0];i=h(this).children("tbody");0===i.length&&(i=h("<tbody/>").appendTo(this));k.nTBody=i[0];i=h(this).children("tfoot");if(0===i.length&&0<j.length&&(""!==k.oScroll.sX||""!==k.oScroll.sY))i=h("<tfoot/>").appendTo(this);0===i.length||0===i.children().length?h(this).addClass(o.sNoFooter):0<i.length&&(k.nTFoot=i[0],aa(k.aoFooter,k.nTFoot));if(g.aaData)for(j=0;j<g.aaData.length;j++)I(k,g.aaData[j]);else(k.bDeferLoading||"dom"==z(k))&&ha(k,h(k.nTBody).children("tr"));k.aiDisplay=k.aiDisplayMaster.slice();
+k.bInitialised=!0;!1===e&&ra(k)}});b=null;return this};var Rb=[],y=Array.prototype,$b=function(a){var b,c,d=p.settings,e=h.map(d,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=h.inArray(a,e),-1!==b?[d[b]]:null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?c=h(a):a instanceof h&&(c=a)}else return[];if(c)return c.map(function(){b=h.inArray(this,e);return-1!==b?d[b]:null}).toArray()};
+q=function(a,b){if(!this instanceof q)throw"DT API must be constructed as a new object";var c=[],d=function(a){(a=$b(a))&&c.push.apply(c,a)};if(h.isArray(a))for(var e=0,f=a.length;e<f;e++)d(a[e]);else d(a);this.context=Ja(c);b&&this.push.apply(this,b.toArray?b.toArray():b);this.selector={rows:null,cols:null,opts:null};q.extend(this,this,Rb)};p.Api=q;q.prototype={concat:y.concat,context:[],each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=
+this.context;return b.length>a?new q(b[a],this[a]):null},filter:function(a){var b=[];if(y.filter)b=y.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new q(this.context,b)},flatten:function(){var a=[];return new q(this.context,a.concat.apply(a,this.toArray()))},join:y.join,indexOf:y.indexOf||function(a,b){for(var c=b||0,d=this.length;c<d;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c){var d=[],e,f,g,h,i,o=this.context,
+m,n,k=this.selector;"string"===typeof a&&(c=b,b=a,a=!1);f=0;for(g=o.length;f<g;f++)if("table"===b)e=c(o[f],f),e!==l&&d.push(e);else if("columns"===b||"rows"===b)e=c(o[f],this[f],f),e!==l&&d.push(e);else if("column"===b||"column-rows"===b||"row"===b||"cell"===b){n=this[f];"column-rows"===b&&(m=Ya(o[f],k.opts));h=0;for(i=n.length;h<i;h++)e=n[h],e="cell"===b?c(o[f],e.row,e.column,f,h):c(o[f],e,f,h,m),e!==l&&d.push(e)}return d.length?(a=new q(o,a?d.concat.apply([],d):d),b=a.selector,b.rows=k.rows,b.cols=
+k.cols,b.opts=k.opts,a):this},lastIndexOf:y.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(y.map)b=y.map.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new q(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:y.pop,push:y.push,reduce:y.reduce||function(a,b){return gb(this,a,b,0,this.length,1)},reduceRight:y.reduceRight||function(a,b){return gb(this,
+a,b,this.length-1,-1,-1)},reverse:y.reverse,selector:null,shift:y.shift,sort:y.sort,splice:y.splice,toArray:function(){return y.slice.call(this)},to$:function(){return h(this)},toJQuery:function(){return h(this)},unique:function(){return new q(this.context,Ja(this))},unshift:y.unshift};q.extend=function(a,b,c){if(b&&(b instanceof q||b.__dt_wrapper)){var d,e,f,g=function(a,b,c){return function(){var d=b.apply(a,arguments);q.extend(d,d,c.methodExt);return d}};d=0;for(e=c.length;d<e;d++)f=c[d],b[f.name]=
+"function"===typeof f.val?g(a,f.val,f):h.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,q.extend(a,b[f.name],f.propExt)}};q.register=r=function(a,b){if(h.isArray(a))for(var c=0,d=a.length;c<d;c++)q.register(a[c],b);else for(var e=a.split("."),f=Rb,g,j,c=0,d=e.length;c<d;c++){g=(j=-1!==e[c].indexOf("()"))?e[c].replace("()",""):e[c];var i;a:{i=0;for(var o=f.length;i<o;i++)if(f[i].name===g){i=f[i];break a}i=null}i||(i={name:g,val:{},methodExt:[],propExt:[]},f.push(i));c===d-1?i.val=b:f=j?i.methodExt:
+i.propExt}};q.registerPlural=v=function(a,b,c){q.register(a,c);q.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof q?a.length?h.isArray(a[0])?new q(a.context,a[0]):a[0]:l:a})};r("tables()",function(a){var b;if(a){b=q;var c=this.context;if("number"===typeof a)a=[c[a]];else var d=h.map(c,function(a){return a.nTable}),a=h(d).filter(a).map(function(){var a=h.inArray(this,d);return c[a]}).toArray();b=new b(a)}else b=this;return b});r("table()",function(a){var a=this.tables(a),
+b=a.context;return b.length?new q(b[0]):a});v("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable})});v("tables().body()","table().body()",function(){return this.iterator("table",function(a){return a.nTBody})});v("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead})});v("tables().footer()","table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot})});v("tables().containers()",
+"table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper})});r("draw()",function(a){return this.iterator("table",function(b){L(b,!1===a)})});r("page()",function(a){return a===l?this.page.info().page:this.iterator("table",function(b){Ra(b,a)})});r("page.info()",function(){if(0===this.context.length)return l;var a=this.context[0],b=a._iDisplayStart,c=a._iDisplayLength,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,
+end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d}});r("page.len()",function(a){return a===l?0!==this.context.length?this.context[0]._iDisplayLength:l:this.iterator("table",function(b){Pa(b,a)})});var Sb=function(a,b,c){"ssp"==z(a)?L(a,b):(B(a,!0),na(a,[],function(c){ja(a);for(var c=oa(a,c),d=0,g=c.length;d<g;d++)I(a,c[d]);L(a,b);B(a,!1)}));if(c){var d=new q(a);d.one("draw",function(){c(d.ajax.json())})}};r("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});
+r("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});r("ajax.reload()",function(a,b){return this.iterator("table",function(c){Sb(c,!1===b,a)})});r("ajax.url()",function(a){var b=this.context;if(a===l){if(0===b.length)return l;b=b[0];return b.ajax?h.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){h.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});r("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Sb(c,
+!1===b,a)})});var Za=function(a,b){var c=[],d,e,f,g,j,i;if(!a||"string"===typeof a||a.length===l)a=[a];f=0;for(g=a.length;f<g;f++){e=a[f]&&a[f].split?a[f].split(","):[a[f]];j=0;for(i=e.length;j<i;j++)(d=b("string"===typeof e[j]?h.trim(e[j]):e[j]))&&d.length&&c.push.apply(c,d)}return c},$a=function(a){a||(a={});a.filter&&!a.search&&(a.search=a.filter);return{search:a.search||"none",order:a.order||"current",page:a.page||"all"}},ab=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=
+a[b],a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Ya=function(a,b){var c,d,e,f=[],g=a.aiDisplay;c=a.aiDisplayMaster;var j=b.search;d=b.order;e=b.page;if("ssp"==z(a))return"removed"===j?[]:S(0,c.length);if("current"==e){c=a._iDisplayStart;for(d=a.fnDisplayEnd();c<d;c++)f.push(g[c])}else if("current"==d||"applied"==d)f="none"==j?c.slice():"applied"==j?g.slice():h.map(c,function(a){return-1===h.inArray(a,g)?a:null});else if("index"==d||"original"==d){c=0;for(d=a.aoData.length;c<d;c++)"none"==
+j?f.push(c):(e=h.inArray(c,g),(-1===e&&"removed"==j||0<=e&&"applied"==j)&&f.push(c))}return f};r("rows()",function(a,b){a===l?a="":h.isPlainObject(a)&&(b=a,a="");var b=$a(b),c=this.iterator("table",function(c){var e=b;return Za(a,function(a){var b=Ob(a);if(b!==null&&!e)return[b];var j=Ya(c,e);if(b!==null&&h.inArray(b,j)!==-1)return[b];if(!a)return j;for(var b=[],i=0,o=j.length;i<o;i++)b.push(c.aoData[j[i]].nTr);return a.nodeName&&h.inArray(a,b)!==-1?[a._DT_RowIndex]:h(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()})});
+c.selector.rows=a;c.selector.opts=b;return c});r("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||l})});r("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return xa(a.aoData,b,"_aData")})});v("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData:d._aSortData})});v("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,
+c){la(b,c,a)})});v("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b})});v("rows().remove()","row().remove()",function(){var a=this;return this.iterator("row",function(b,c,d){var e=b.aoData;e.splice(c,1);for(var f=0,g=e.length;f<g;f++)null!==e[f].nTr&&(e[f].nTr._DT_RowIndex=f);h.inArray(c,b.aiDisplay);ka(b.aiDisplayMaster,c);ka(b.aiDisplay,c);ka(a[d],c,!1);Qa(b)})});r("rows.add()",function(a){var b=this.iterator("table",function(b){var c,f,g,h=[];f=0;
+for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?h.push(ha(b,c)[0]):h.push(I(b,c));return h}),c=this.rows(-1);c.pop();c.push.apply(c,b.toArray());return c});r("row()",function(a,b){return ab(this.rows(a,b))});r("row().data()",function(a){var b=this.context;if(a===l)return b.length&&this.length?b[0].aoData[this[0]]._aData:l;b[0].aoData[this[0]]._aData=a;la(b[0],this[0],"data");return this});r("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||
+null:null});r("row.add()",function(a){a instanceof h&&a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?ha(b,a)[0]:I(b,a)});return this.row(b[0])});var bb=function(a){var b=a.context;b.length&&a.length&&(a=b[0].aoData[a[0]],a._details&&(a._details.remove(),a._detailsShow=l,a._details=l))},Tb=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];if(d._details){(d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach();
+var e=c[0],f=new q(e),g=e.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<C(g,"_details").length&&(f.on("draw.dt.DT_details",function(a,b){e===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(e===b)for(var c,d=Z(b),f=0,h=g.length;f<h;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",d)}),f.on("destroy.dt.DT_details",function(a,
+b){if(e===b)for(var c=0,d=g.length;c<d;c++)g[c]._details&&bb(g[c])}))}}};r("row().child()",function(a,b){var c=this.context;if(a===l)return c.length&&this.length?c[0].aoData[this[0]]._details:l;if(!0===a)this.child.show();else if(!1===a)bb(this);else if(c.length&&this.length){var d=c[0],c=c[0].aoData[this[0]],e=[],f=function(a,b){if(a.nodeName&&"tr"===a.nodeName.toLowerCase())e.push(a);else{var c=h("<tr><td/></tr>").addClass(b);h("td",c).addClass(b).html(a)[0].colSpan=Z(d);e.push(c[0])}};if(h.isArray(a)||
+a instanceof h)for(var g=0,j=a.length;g<j;g++)f(a[g],b);else f(a,b);c._details&&c._details.remove();c._details=h(e);c._detailsShow&&c._details.insertAfter(c.nTr)}return this});r(["row().child.show()","row().child().show()"],function(){Tb(this,!0);return this});r(["row().child.hide()","row().child().hide()"],function(){Tb(this,!1);return this});r(["row().child.remove()","row().child().remove()"],function(){bb(this);return this});r("row().child.isShown()",function(){var a=this.context;return a.length&&
+this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var ac=/^(.*):(name|visIdx|visible)$/;r("columns()",function(a,b){a===l?a="":h.isPlainObject(a)&&(b=a,a="");var b=$a(b),c=this.iterator("table",function(b){var c=a,f=b.aoColumns,g=C(f,"sName"),j=C(f,"nTh");return Za(c,function(a){var c=Ob(a);if(a==="")return S(f.length);if(c!==null)return[c>=0?c:f.length+c];var e=typeof a==="string"?a.match(ac):"";if(e)switch(e[2]){case "visIdx":case "visible":a=parseInt(e[1],10);if(a<0){c=h.map(f,function(a,
+b){return a.bVisible?b:null});return[c[c.length+a]]}return[ga(b,a)];case "name":return h.map(g,function(a,b){return a===e[1]?b:null})}else return h(j).filter(a).map(function(){return h.inArray(this,j)}).toArray()})});c.selector.cols=a;c.selector.opts=b;return c});v("columns().header()","column().header()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh})});v("columns().footer()","column().footer()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf})});
+v("columns().data()","column().data()",function(){return this.iterator("column-rows",function(a,b,c,d,e){for(var c=[],d=0,f=e.length;d<f;d++)c.push(A(a,e[d],b,""));return c})});v("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,f){return xa(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)})});v("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return xa(a.aoData,e,"anCells",b)})});v("columns().visible()",
+"column().visible()",function(a){return this.iterator("column",function(b,c){var d;if(a===l)d=b.aoColumns[c].bVisible;else{var e=b.aoColumns;d=e[c];var f=b.aoData,g,j,i;if(a===l)d=d.bVisible;else{if(d.bVisible!==a){if(a){var o=h.inArray(!0,C(e,"bVisible"),c+1);g=0;for(j=f.length;g<j;g++)i=f[g].nTr,e=f[g].anCells,i&&i.insertBefore(e[c],e[o]||null)}else h(C(b.aoData,"anCells",c)).detach();d.bVisible=a;ba(b,b.aoHeader);ba(b,b.aoFooter);V(b);(b.oScroll.sX||b.oScroll.sY)&&W(b);u(b,null,"column-visibility",
+[b,c,a]);ta(b)}d=void 0}}return d})});v("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?Y(b,c):c})});r("columns.adjust()",function(){return this.iterator("table",function(a){V(a)})});r("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return ga(c,b);if("fromData"===a||"toVisible"===a)return Y(c,b)}});r("column()",function(a,b){return ab(this.columns(a,b))});r("cells()",
+function(a,b,c){h.isPlainObject(a)&&(typeof a.row!==l?(c=b,b=null):(c=a,a=null));h.isPlainObject(b)&&(c=b,b=null);if(null===b||b===l)return this.iterator("table",function(b){var d=a,e=$a(c),f=b.aoData,g=Ya(b,e),e=xa(f,g,"anCells"),i=h([].concat.apply([],e)),j,m=b.aoColumns.length,o,p,r,q;return Za(d,function(a){if(a===null||a===l){o=[];p=0;for(r=g.length;p<r;p++){j=g[p];for(q=0;q<m;q++)o.push({row:j,column:q})}return o}return h.isPlainObject(a)?[a]:i.filter(a).map(function(a,b){j=b.parentNode._DT_RowIndex;
+return{row:j,column:h.inArray(b,f[j].anCells)}}).toArray()})});var d=this.columns(b,c),e=this.rows(a,c),f,g,j,i,o,m=this.iterator("table",function(a,b){f=[];g=0;for(j=e[b].length;g<j;g++){i=0;for(o=d[b].length;i<o;i++)f.push({row:e[b][g],column:d[b][i]})}return f});h.extend(m.selector,{cols:b,rows:a,opts:c});return m});v("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return a.aoData[b].anCells[c]})});r("cells().data()",function(){return this.iterator("cell",
+function(a,b,c){return A(a,b,c)})});v("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]})});v("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:Y(a,c)}})});r(["cells().invalidate()","cell().invalidate()"],function(a){var b=this.selector;this.rows(b.rows,b.opts).invalidate(a);return this});r("cell()",function(a,b,
+c){return ab(this.cells(a,b,c))});r("cell().data()",function(a){var b=this.context,c=this[0];if(a===l)return b.length&&c.length?A(b[0],c[0].row,c[0].column):l;Ea(b[0],c[0].row,c[0].column,a);la(b[0],c[0].row,"data",c[0].column);return this});r("order()",function(a,b){var c=this.context;if(a===l)return 0!==c.length?c[0].aaSorting:l;"number"===typeof a?a=[[a,b]]:h.isArray(a[0])||(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});r("order.listener()",
+function(a,b,c){return this.iterator("table",function(d){Ka(d,a,b,c)})});r(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];h.each(b[d],function(b,c){e.push([c,a])});c.aaSorting=e})});r("search()",function(a,b,c,d){var e=this.context;return a===l?0!==e.length?e[0].oPreviousSearch.sSearch:l:this.iterator("table",function(e){e.oFeatures.bFilter&&ca(e,h.extend({},e.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:
+c,bCaseInsensitive:null===d?!0:d}),1)})});r(["columns().search()","column().search()"],function(a,b,c,d){return this.iterator("column",function(e,f){var g=e.aoPreSearchCols;if(a===l)return g[f].sSearch;e.oFeatures.bFilter&&(h.extend(g[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),ca(e,e.oPreviousSearch,1))})});r("state()",function(){return this.context.length?this.context[0].oSavedState:null});r("state.clear()",function(){return this.iterator("table",
+function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});r("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});r("state.save()",function(){return this.iterator("table",function(a){ta(a)})});p.versionCheck=p.fnVersionCheck=function(a){for(var b=p.version.split("."),a=a.split("."),c,d,e=0,f=a.length;e<f;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};p.isDataTable=p.fnIsDataTable=function(a){var b=h(a).get(0),c=!1;h.each(p.settings,
+function(a,e){if(e.nTable===b||e.nScrollHead===b||e.nScrollFoot===b)c=!0});return c};p.tables=p.fnTables=function(a){return jQuery.map(p.settings,function(b){if(!a||a&&h(b.nTable).is(":visible"))return b.nTable})};p.camelToHungarian=G;r("$()",function(a,b){var c=this.rows(b).nodes(),c=h(c);return h([].concat(c.filter(a).toArray(),c.find(a).toArray()))});h.each(["on","one","off"],function(a,b){r(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0].match(/\.dt\b/)||(a[0]+=".dt");var d=
+h(this.tables().nodes());d[b].apply(d,a);return this})});r("clear()",function(){return this.iterator("table",function(a){ja(a)})});r("settings()",function(){return new q(this.context,this.context)});r("data()",function(){return this.iterator("table",function(a){return C(a.aoData,"_aData")}).flatten()});r("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,f=b.nTBody,g=b.nTHead,j=b.nTFoot,i=h(e),f=h(f),l=h(b.nTableWrapper),
+m=h.map(b.aoData,function(a){return a.nTr}),n;b.bDestroying=!0;u(b,"aoDestroyCallback","destroy",[b]);a||(new q(b)).columns().visible(!0);l.unbind(".DT").find(":not(tbody *)").unbind(".DT");h(za).unbind(".DT-"+b.sInstance);e!=g.parentNode&&(i.children("thead").detach(),i.append(g));j&&e!=j.parentNode&&(i.children("tfoot").detach(),i.append(j));i.detach();l.detach();b.aaSorting=[];b.aaSortingFixed=[];sa(b);h(m).removeClass(b.asStripeClasses.join(" "));h("th, td",g).removeClass(d.sSortable+" "+d.sSortableAsc+
+" "+d.sSortableDesc+" "+d.sSortableNone);b.bJUI&&(h("th span."+d.sSortIcon+", td span."+d.sSortIcon,g).detach(),h("th, td",g).each(function(){var a=h("div."+d.sSortJUIWrapper,this);h(this).append(a.contents());a.detach()}));!a&&c&&c.insertBefore(e,b.nTableReinsertBefore);f.children().detach();f.append(m);i.css("width",b.sDestroyWidth).removeClass(d.sTable);(n=b.asDestroyStripes.length)&&f.children().each(function(a){h(this).addClass(b.asDestroyStripes[a%n])});c=h.inArray(b,p.settings);-1!==c&&p.settings.splice(c,
+1)})});p.version="1.10.1";p.settings=[];p.models={};p.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};p.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null};p.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,
+sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};p.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,
+bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},
+fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",
+sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},p.models.oSearch),sAjaxDataProp:"data",
+sAjaxSource:null,sDom:"lfrtip",sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null};T(p.defaults);p.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};T(p.defaults.column);p.models.oSettings={oFeatures:{bAutoWidth:null,
+bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,
+asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,sPaginationType:"two_button",iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,
+bAjaxDataGet:!0,jqXHR:null,json:l,oAjaxData:l,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==z(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==z(this)?1*this._iRecordsDisplay:
+this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{}};p.ext=t={classes:{},errMode:"alert",feature:[],search:[],internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{detect:[],
+search:{},order:{}},_unique:0,fnVersionCheck:p.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:p.version};h.extend(t,{afnFiltering:t.search,aTypes:t.type.detect,ofnSearch:t.type.search,oSort:t.type.order,afnSortData:t.order,aoFeatures:t.feature,oApi:t.internal,oStdClasses:t.classes,oPagination:t.pager});h.extend(p.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",
+sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",
+sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var ya="",ya="",E=ya+"ui-state-default",ea=ya+"css_right ui-icon ui-icon-",Ub=ya+"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix";h.extend(p.ext.oJUIClasses,p.ext.classes,{sPageButton:"fg-button ui-button "+
+E,sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:E+" sorting_asc",sSortDesc:E+" sorting_desc",sSortable:E+" sorting",sSortableAsc:E+" sorting_asc_disabled",sSortableDesc:E+" sorting_desc_disabled",sSortableNone:E+" sorting_disabled",sSortJUIAsc:ea+"triangle-1-n",sSortJUIDesc:ea+"triangle-1-s",sSortJUI:ea+"carat-2-n-s",sSortJUIAscAllowed:ea+"carat-1-n",sSortJUIDescAllowed:ea+
+"carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead "+E,sScrollFoot:"dataTables_scrollFoot "+E,sHeaderTH:E,sFooterTH:E,sJUIHeader:Ub+" ui-corner-tl ui-corner-tr",sJUIFooter:Ub+" ui-corner-bl ui-corner-br"});var Lb=p.ext.pager;h.extend(Lb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},simple_numbers:function(a,b){return["previous",Ua(a,b),"next"]},full_numbers:function(a,b){return["first",
+"previous",Ua(a,b),"next","last"]},_numbers:Ua,numbers_length:7});h.extend(!0,p.ext.renderer,{pageButton:{_:function(a,b,c,d,e,f){var g=a.oClasses,j=a.oLanguage.oPaginate,i,l,m=0,n=function(b,d){var k,p,r,q,s=function(b){Ra(a,b.data.action,true)};k=0;for(p=d.length;k<p;k++){q=d[k];if(h.isArray(q)){r=h("<"+(q.DT_el||"div")+"/>").appendTo(b);n(r,q)}else{l=i="";switch(q){case "ellipsis":b.append("<span>&hellip;</span>");break;case "first":i=j.sFirst;l=q+(e>0?"":" "+g.sPageButtonDisabled);break;case "previous":i=
+j.sPrevious;l=q+(e>0?"":" "+g.sPageButtonDisabled);break;case "next":i=j.sNext;l=q+(e<f-1?"":" "+g.sPageButtonDisabled);break;case "last":i=j.sLast;l=q+(e<f-1?"":" "+g.sPageButtonDisabled);break;default:i=q+1;l=e===q?g.sPageButtonActive:""}if(i){r=h("<a>",{"class":g.sPageButton+" "+l,"aria-controls":a.sTableId,"data-dt-idx":m,tabindex:a.iTabIndex,id:c===0&&typeof q==="string"?a.sTableId+"_"+q:null}).html(i).appendTo(b);Ta(r,{action:q},s);m++}}}};try{var k=h(O.activeElement).data("dt-idx");n(h(b).empty(),
+d);k!==null&&h(b).find("[data-dt-idx="+k+"]").focus()}catch(p){}}}});var va=function(a,b,c,d){if(!a||"-"===a)return-Infinity;b&&(a=Pb(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};h.extend(t.type.order,{"date-pre":function(a){return Date.parse(a)||0},"html-pre":function(a){return H(a)?"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return H(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,
+b){return a<b?-1:a>b?1:0},"string-desc":function(a,b){return a<b?1:a>b?-1:0}});cb("");h.extend(p.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return Xa(a,c)?"num"+c:null},function(a){if(a&&(!Yb.test(a)||!Zb.test(a)))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||H(a)?"date":null},function(a,b){var c=b.oLanguage.sDecimal;return Xa(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Qb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Qb(a,
+c,!0)?"html-num-fmt"+c:null},function(a){return H(a)||"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);h.extend(p.ext.type.search,{html:function(a){return H(a)?a:"string"===typeof a?a.replace(Nb," ").replace(wa,""):""},string:function(a){return H(a)?a:"string"===typeof a?a.replace(Nb," "):a}});h.extend(!0,p.ext.renderer,{header:{_:function(a,b,c,d){h(a.nTable).on("order.dt.DT",function(e,f,g,h){if(a===f){e=c.idx;b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?
+d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass)}})},jqueryui:function(a,b,c,d){var e=c.idx;h("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(h("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);h(a.nTable).on("order.dt.DT",function(f,g,h,i){if(a===g){b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass(i[e]=="asc"?d.sSortAsc:i[e]=="desc"?d.sSortDesc:c.sSortingClass);b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+
+" "+d.sSortJUIDescAllowed).addClass(i[e]=="asc"?d.sSortJUIAsc:i[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});p.render={number:function(a,b,c,d){return{display:function(e){var f=0>e?"-":"",e=Math.abs(parseFloat(e)),g=parseInt(e,10),e=c?b+(e-g).toFixed(c).substring(2):"";return f+(d||"")+g.toString().replace(/\B(?=(\d{3})+(?!\d))/g,a)+e}}}};h.extend(p.ext.internal,{_fnExternApiFunc:Mb,_fnBuildAjax:na,_fnAjaxUpdate:jb,_fnAjaxParameters:sb,_fnAjaxUpdateDraw:tb,_fnAjaxDataSrc:oa,_fnAddColumn:Aa,
+_fnColumnOptions:fa,_fnAdjustColumnSizing:V,_fnVisibleToColumnIndex:ga,_fnColumnIndexToVisible:Y,_fnVisbleColumns:Z,_fnGetColumns:X,_fnColumnTypes:Da,_fnApplyColumnDefs:hb,_fnHungarianMap:T,_fnCamelToHungarian:G,_fnLanguageCompat:N,_fnBrowserDetect:fb,_fnAddData:I,_fnAddTr:ha,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==l?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return h.inArray(c,a.aoData[b].anCells)},_fnGetCellData:A,_fnSetCellData:Ea,_fnSplitObjNotation:Ga,_fnGetObjectDataFn:U,
+_fnSetObjectDataFn:Ba,_fnGetDataMaster:Ha,_fnClearTable:ja,_fnDeleteIndex:ka,_fnInvalidateRow:la,_fnGetRowElements:ia,_fnCreateTr:Fa,_fnBuildHead:ib,_fnDrawHead:ba,_fnDraw:K,_fnReDraw:L,_fnAddOptionsHtml:lb,_fnDetectHeader:aa,_fnGetUniqueThs:ma,_fnFeatureHtmlFilter:nb,_fnFilterComplete:ca,_fnFilterCustom:wb,_fnFilterColumn:vb,_fnFilter:ub,_fnFilterCreateSearch:Na,_fnEscapeRegex:Oa,_fnFilterData:xb,_fnFeatureHtmlInfo:qb,_fnUpdateInfo:Ab,_fnInfoMacros:Bb,_fnInitialise:ra,_fnInitComplete:pa,_fnLengthChange:Pa,
+_fnFeatureHtmlLength:mb,_fnFeatureHtmlPaginate:rb,_fnPageChange:Ra,_fnFeatureHtmlProcessing:ob,_fnProcessingDisplay:B,_fnFeatureHtmlTable:pb,_fnScrollDraw:W,_fnApplyToChildren:F,_fnCalculateColumnWidths:Ca,_fnThrottle:Ma,_fnConvertToWidth:Cb,_fnScrollingWidthAdjust:Eb,_fnGetWidestNode:Db,_fnGetMaxLenString:Fb,_fnStringToCss:s,_fnScrollBarWidth:Gb,_fnSortFlatten:R,_fnSort:kb,_fnSortAria:Ib,_fnSortListener:Sa,_fnSortAttachListener:Ka,_fnSortingClasses:sa,_fnSortData:Hb,_fnSaveState:ta,_fnLoadState:Jb,
+_fnSettingsFromNode:ua,_fnLog:P,_fnMap:D,_fnBindAction:Ta,_fnCallbackReg:x,_fnCallbackFire:u,_fnLengthOverflow:Qa,_fnRenderer:La,_fnDataSource:z,_fnRowAttributes:Ia,_fnCalculateEnd:function(){}});h.fn.dataTable=p;h.fn.dataTableSettings=p.settings;h.fn.dataTableExt=p.ext;h.fn.DataTable=function(a){return h(this).dataTable(a).api()};h.each(p,function(a,b){h.fn.DataTable[a]=b});return h.fn.dataTable};"function"===typeof define&&define.amd?define("datatables",["jquery"],N):"object"===typeof exports?N(require("jquery")):
+jQuery&&!jQuery.fn.dataTable&&N(jQuery)})(window,document);
diff --git a/html5/verto/demo/js/jquery.mobile.min.js b/html5/verto/demo/js/jquery.mobile.min.js
new file mode 100644
index 0000000000..661439e474
--- /dev/null
+++ b/html5/verto/demo/js/jquery.mobile.min.js
@@ -0,0 +1,10 @@
+/*! jQuery Mobile 1.4.3 | Git HEADhash: b9c6473 <> 2014-07-01T15:37:36Z | (c) 2010, 2014 jQuery Foundation, Inc. | jquery.org/license */
+
+!function(a,b,c){"function"==typeof define&&define.amd?define(["jquery"],function(d){return c(d,a,b),d.mobile}):c(a.jQuery,a,b)}(this,document,function(a,b,c){!function(a){a.mobile={}}(a),function(a){a.extend(a.mobile,{version:"1.4.3",subPageUrlKey:"ui-page",hideUrlBar:!0,keepNative:":jqmData(role='none'), :jqmData(role='nojs')",activePageClass:"ui-page-active",activeBtnClass:"ui-btn-active",focusClass:"ui-focus",ajaxEnabled:!0,hashListeningEnabled:!0,linkBindingEnabled:!0,defaultPageTransition:"fade",maxTransitionWidth:!1,minScrollBack:0,defaultDialogTransition:"pop",pageLoadErrorMessage:"Error Loading Page",pageLoadErrorMessageTheme:"a",phonegapNavigationEnabled:!1,autoInitializePage:!0,pushStateEnabled:!0,ignoreContentEnabled:!1,buttonMarkup:{hoverDelay:200},dynamicBaseEnabled:!0,pageContainer:a(),allowCrossDomainPages:!1,dialogHashKey:"&ui-state=dialog"})}(a,this),function(a,b,c){var d={},e=a.find,f=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,g=/:jqmData\(([^)]*)\)/g;a.extend(a.mobile,{ns:"",getAttribute:function(b,c){var d;b=b.jquery?b[0]:b,b&&b.getAttribute&&(d=b.getAttribute("data-"+a.mobile.ns+c));try{d="true"===d?!0:"false"===d?!1:"null"===d?null:+d+""===d?+d:f.test(d)?JSON.parse(d):d}catch(e){}return d},nsNormalizeDict:d,nsNormalize:function(b){return d[b]||(d[b]=a.camelCase(a.mobile.ns+b))},closestPageData:function(a){return a.closest(":jqmData(role='page'), :jqmData(role='dialog')").data("mobile-page")}}),a.fn.jqmData=function(b,d){var e;return"undefined"!=typeof b&&(b&&(b=a.mobile.nsNormalize(b)),e=arguments.length<2||d===c?this.data(b):this.data(b,d)),e},a.jqmData=function(b,c,d){var e;return"undefined"!=typeof c&&(e=a.data(b,c?a.mobile.nsNormalize(c):c,d)),e},a.fn.jqmRemoveData=function(b){return this.removeData(a.mobile.nsNormalize(b))},a.jqmRemoveData=function(b,c){return a.removeData(b,a.mobile.nsNormalize(c))},a.find=function(b,c,d,f){return b.indexOf(":jqmData")>-1&&(b=b.replace(g,"[data-"+(a.mobile.ns||"")+"$1]")),e.call(this,b,c,d,f)},a.extend(a.find,e)}(a,this),function(a,b){function d(b,c){var d,f,g,h=b.nodeName.toLowerCase();return"area"===h?(d=b.parentNode,f=d.name,b.href&&f&&"map"===d.nodeName.toLowerCase()?(g=a("img[usemap=#"+f+"]")[0],!!g&&e(g)):!1):(/input|select|textarea|button|object/.test(h)?!b.disabled:"a"===h?b.href||c:c)&&e(b)}function e(b){return a.expr.filters.visible(b)&&!a(b).parents().addBack().filter(function(){return"hidden"===a.css(this,"visibility")}).length}var f=0,g=/^ui-id-\d+$/;a.ui=a.ui||{},a.extend(a.ui,{version:"c0ab71056b936627e8a7821f03c044aec6280a40",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),a.fn.extend({focus:function(b){return function(c,d){return"number"==typeof c?this.each(function(){var b=this;setTimeout(function(){a(b).focus(),d&&d.call(b)},c)}):b.apply(this,arguments)}}(a.fn.focus),scrollParent:function(){var b;return b=a.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.css(this,"position"))&&/(auto|scroll)/.test(a.css(this,"overflow")+a.css(this,"overflow-y")+a.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(a.css(this,"overflow")+a.css(this,"overflow-y")+a.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!b.length?a(this[0].ownerDocument||c):b},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++f)})},removeUniqueId:function(){return this.each(function(){g.test(this.id)&&a(this).removeAttr("id")})}}),a.extend(a.expr[":"],{data:a.expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return d(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var c=a.attr(b,"tabindex"),e=isNaN(c);return(e||c>=0)&&d(b,!e)}}),a("<a>").outerWidth(1).jquery||a.each(["Width","Height"],function(c,d){function e(b,c,d,e){return a.each(f,function(){c-=parseFloat(a.css(b,"padding"+this))||0,d&&(c-=parseFloat(a.css(b,"border"+this+"Width"))||0),e&&(c-=parseFloat(a.css(b,"margin"+this))||0)}),c}var f="Width"===d?["Left","Right"]:["Top","Bottom"],g=d.toLowerCase(),h={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){return c===b?h["inner"+d].call(this):this.each(function(){a(this).css(g,e(this,c)+"px")})},a.fn["outer"+d]=function(b,c){return"number"!=typeof b?h["outer"+d].call(this,b):this.each(function(){a(this).css(g,e(this,b,!0,c)+"px")})}}),a.fn.addBack||(a.fn.addBack=function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}),a("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(a.fn.removeData=function(b){return function(c){return arguments.length?b.call(this,a.camelCase(c)):b.call(this)}}(a.fn.removeData)),a.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),a.support.selectstart="onselectstart"in c.createElement("div"),a.fn.extend({disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(d){if(d!==b)return this.css("zIndex",d);if(this.length)for(var e,f,g=a(this[0]);g.length&&g[0]!==c;){if(e=g.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(f=parseInt(g.css("zIndex"),10),!isNaN(f)&&0!==f))return f;g=g.parent()}return 0}}),a.ui.plugin={add:function(b,c,d){var e,f=a.ui[b].prototype;for(e in d)f.plugins[e]=f.plugins[e]||[],f.plugins[e].push([c,d[e]])},call:function(a,b,c,d){var e,f=a.plugins[b];if(f&&(d||a.element[0].parentNode&&11!==a.element[0].parentNode.nodeType))for(e=0;e<f.length;e++)a.options[f[e][0]]&&f[e][1].apply(a.element,c)}}}(a),function(a,b){var d=function(b,c){var d=b.parent(),e=[],f=d.children(":jqmData(role='header')"),g=b.children(":jqmData(role='header')"),h=d.children(":jqmData(role='footer')"),i=b.children(":jqmData(role='footer')");return 0===g.length&&f.length>0&&(e=e.concat(f.toArray())),0===i.length&&h.length>0&&(e=e.concat(h.toArray())),a.each(e,function(b,d){c-=a(d).outerHeight()}),Math.max(0,c)};a.extend(a.mobile,{window:a(b),document:a(c),keyCode:a.ui.keyCode,behaviors:{},silentScroll:function(c){"number"!==a.type(c)&&(c=a.mobile.defaultHomeScroll),a.event.special.scrollstart.enabled=!1,setTimeout(function(){b.scrollTo(0,c),a.mobile.document.trigger("silentscroll",{x:0,y:c})},20),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},getClosestBaseUrl:function(b){var c=a(b).closest(".ui-page").jqmData("url"),d=a.mobile.path.documentBase.hrefNoHash;return a.mobile.dynamicBaseEnabled&&c&&a.mobile.path.isPath(c)||(c=d),a.mobile.path.makeUrlAbsolute(c,d)},removeActiveLinkClass:function(b){!a.mobile.activeClickedLink||a.mobile.activeClickedLink.closest("."+a.mobile.activePageClass).length&&!b||a.mobile.activeClickedLink.removeClass(a.mobile.activeBtnClass),a.mobile.activeClickedLink=null},getInheritedTheme:function(a,b){for(var c,d,e=a[0],f="",g=/ui-(bar|body|overlay)-([a-z])\b/;e&&(c=e.className||"",!(c&&(d=g.exec(c))&&(f=d[2])));)e=e.parentNode;return f||b||"a"},enhanceable:function(a){return this.haveParents(a,"enhance")},hijackable:function(a){return this.haveParents(a,"ajax")},haveParents:function(b,c){if(!a.mobile.ignoreContentEnabled)return b;var d,e,f,g,h,i=b.length,j=a();for(g=0;i>g;g++){for(e=b.eq(g),f=!1,d=b[g];d;){if(h=d.getAttribute?d.getAttribute("data-"+a.mobile.ns+c):"","false"===h){f=!0;break}d=d.parentNode}f||(j=j.add(e))}return j},getScreenHeight:function(){return b.innerHeight||a.mobile.window.height()},resetActivePageHeight:function(b){var c=a("."+a.mobile.activePageClass),e=c.height(),f=c.outerHeight(!0);b=d(c,"number"==typeof b?b:a.mobile.getScreenHeight()),c.css("min-height",""),c.height()<b&&c.css("min-height",b-(f-e))},loading:function(){var b=this.loading._widget||a(a.mobile.loader.prototype.defaultHtml).loader(),c=b.loader.apply(b,arguments);return this.loading._widget=b,c}}),a.addDependents=function(b,c){var d=a(b),e=d.jqmData("dependents")||a();d.jqmData("dependents",a(e).add(c))},a.fn.extend({removeWithDependents:function(){a.removeWithDependents(this)},enhanceWithin:function(){var b,c={},d=a.mobile.page.prototype.keepNativeSelector(),e=this;a.mobile.nojs&&a.mobile.nojs(this),a.mobile.links&&a.mobile.links(this),a.mobile.degradeInputsWithin&&a.mobile.degradeInputsWithin(this),a.fn.buttonMarkup&&this.find(a.fn.buttonMarkup.initSelector).not(d).jqmEnhanceable().buttonMarkup(),a.fn.fieldcontain&&this.find(":jqmData(role='fieldcontain')").not(d).jqmEnhanceable().fieldcontain(),a.each(a.mobile.widgets,function(b,f){if(f.initSelector){var g=a.mobile.enhanceable(e.find(f.initSelector));g.length>0&&(g=g.not(d)),g.length>0&&(c[f.prototype.widgetName]=g)}});for(b in c)c[b][b]();return this},addDependents:function(b){a.addDependents(this,b)},getEncodedText:function(){return a("<a>").text(this.text()).html()},jqmEnhanceable:function(){return a.mobile.enhanceable(this)},jqmHijackable:function(){return a.mobile.hijackable(this)}}),a.removeWithDependents=function(b){var c=a(b);(c.jqmData("dependents")||a()).remove(),c.remove()},a.addDependents=function(b,c){var d=a(b),e=d.jqmData("dependents")||a();d.jqmData("dependents",a(e).add(c))},a.find.matches=function(b,c){return a.find(b,null,null,c)},a.find.matchesSelector=function(b,c){return a.find(c,null,null,[b]).length>0}}(a,this),function(a,b){var c=0,d=Array.prototype.slice,e=a.cleanData;a.cleanData=function(b){for(var c,d=0;null!=(c=b[d]);d++)try{a(c).triggerHandler("remove")}catch(f){}e(b)},a.widget=function(b,c,d){var e,f,g,h,i={},j=b.split(".")[0];return b=b.split(".")[1],e=j+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e.toLowerCase()]=function(b){return!!a.data(b,e)},a[j]=a[j]||{},f=a[j][b],g=a[j][b]=function(a,b){return this._createWidget?void(arguments.length&&this._createWidget(a,b)):new g(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,d){return a.isFunction(d)?void(i[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},e=function(a){return c.prototype[b].apply(this,a)};return function(){var b,c=this._super,f=this._superApply;return this._super=a,this._superApply=e,b=d.apply(this,arguments),this._super=c,this._superApply=f,b}}()):void(i[b]=d)}),g.prototype=a.widget.extend(h,{widgetEventPrefix:f?h.widgetEventPrefix||b:b},i,{constructor:g,namespace:j,widgetName:b,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g),g},a.widget.extend=function(c){for(var e,f,g=d.call(arguments,1),h=0,i=g.length;i>h;h++)for(e in g[h])f=g[h][e],g[h].hasOwnProperty(e)&&f!==b&&(c[e]=a.isPlainObject(f)?a.isPlainObject(c[e])?a.widget.extend({},c[e],f):a.widget.extend({},f):f);return c},a.widget.bridge=function(c,e){var f=e.prototype.widgetFullName||c;a.fn[c]=function(g){var h="string"==typeof g,i=d.call(arguments,1),j=this;return g=!h&&i.length?a.widget.extend.apply(null,[g].concat(i)):g,this.each(h?function(){var d,e=a.data(this,f);return"instance"===g?(j=e,!1):e?a.isFunction(e[g])&&"_"!==g.charAt(0)?(d=e[g].apply(e,i),d!==e&&d!==b?(j=d&&d.jquery?j.pushStack(d.get()):d,!1):void 0):a.error("no such method '"+g+"' for "+c+" widget instance"):a.error("cannot call methods on "+c+" prior to initialization; attempted to call method '"+g+"'")}:function(){var b=a.data(this,f);b?b.option(g||{})._init():a.data(this,f,new e(g,this))}),j}},a.Widget=function(){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,d){d=a(d||this.defaultElement||this)[0],this.element=a(d),this.uuid=c++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this.bindings=a(),this.hoverable=a(),this.focusable=a(),d!==this&&(a.data(d,this.widgetFullName,this),this._on(!0,this.element,{remove:function(a){a.target===d&&this.destroy()}}),this.document=a(d.style?d.ownerDocument:d.document||d),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(c,d){var e,f,g,h=c;if(0===arguments.length)return a.widget.extend({},this.options);if("string"==typeof c)if(h={},e=c.split("."),c=e.shift(),e.length){for(f=h[c]=a.widget.extend({},this.options[c]),g=0;g<e.length-1;g++)f[e[g]]=f[e[g]]||{},f=f[e[g]];if(c=e.pop(),d===b)return f[c]===b?null:f[c];f[c]=d}else{if(d===b)return this.options[c]===b?null:this.options[c];h[c]=d}return this._setOptions(h),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,"disabled"===a&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!b),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(b,c,d){var e,f=this;"boolean"!=typeof b&&(d=c,c=b,b=!1),d?(c=e=a(c),this.bindings=this.bindings.add(c)):(d=c,c=this.element,e=this.widget()),a.each(d,function(d,g){function h(){return b||f.options.disabled!==!0&&!a(this).hasClass("ui-state-disabled")?("string"==typeof g?f[g]:g).apply(f,arguments):void 0}"string"!=typeof g&&(h.guid=g.guid=g.guid||h.guid||a.guid++);var i=d.match(/^(\w+)\s*(.*)$/),j=i[1]+f.eventNamespace,k=i[2];k?e.delegate(k,j,h):c.bind(j,h)})},_off:function(a,b){b=(b||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,a.unbind(b).undelegate(b)},_delay:function(a,b){function c(){return("string"==typeof a?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];if(d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){"string"==typeof e&&(e={effect:e});var g,h=e?e===!0||"number"==typeof e?c:e.effect||c:b;e=e||{},"number"==typeof e&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&a.effects.effect[h]?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}})}(a),function(a){var b=/[A-Z]/g,c=function(a){return"-"+a.toLowerCase()};a.extend(a.Widget.prototype,{_getCreateOptions:function(){var d,e,f=this.element[0],g={};if(!a.mobile.getAttribute(f,"defaults"))for(d in this.options)e=a.mobile.getAttribute(f,d.replace(b,c)),null!=e&&(g[d]=e);return g}}),a.mobile.widget=a.Widget}(a),function(a){var b="ui-loader",c=a("html");a.widget("mobile.loader",{options:{theme:"a",textVisible:!1,html:"",text:"loading"},defaultHtml:"<div class='"+b+"'><span class='ui-icon-loading'></span><h1></h1></div>",fakeFixLoader:function(){var b=a("."+a.mobile.activeBtnClass).first();this.element.css({top:a.support.scrollTop&&this.window.scrollTop()+this.window.height()/2||b.length&&b.offset().top||100})},checkLoaderPosition:function(){var b=this.element.offset(),c=this.window.scrollTop(),d=a.mobile.getScreenHeight();(b.top<c||b.top-c>d)&&(this.element.addClass("ui-loader-fakefix"),this.fakeFixLoader(),this.window.unbind("scroll",this.checkLoaderPosition).bind("scroll",a.proxy(this.fakeFixLoader,this)))},resetHtml:function(){this.element.html(a(this.defaultHtml).html())},show:function(d,e,f){var g,h,i;this.resetHtml(),"object"===a.type(d)?(i=a.extend({},this.options,d),d=i.theme):(i=this.options,d=d||i.theme),h=e||(i.text===!1?"":i.text),c.addClass("ui-loading"),g=i.textVisible,this.element.attr("class",b+" ui-corner-all ui-body-"+d+" ui-loader-"+(g||e||d.text?"verbose":"default")+(i.textonly||f?" ui-loader-textonly":"")),i.html?this.element.html(i.html):this.element.find("h1").text(h),this.element.appendTo(a.mobile.pageContainer),this.checkLoaderPosition(),this.window.bind("scroll",a.proxy(this.checkLoaderPosition,this))},hide:function(){c.removeClass("ui-loading"),this.options.text&&this.element.removeClass("ui-loader-fakefix"),a.mobile.window.unbind("scroll",this.fakeFixLoader),a.mobile.window.unbind("scroll",this.checkLoaderPosition)}})}(a,this),function(a,b,d){"$:nomunge";function e(a){return a=a||location.href,"#"+a.replace(/^[^#]*#?(.*)$/,"$1")}var f,g="hashchange",h=c,i=a.event.special,j=h.documentMode,k="on"+g in b&&(j===d||j>7);a.fn[g]=function(a){return a?this.bind(g,a):this.trigger(g)},a.fn[g].delay=50,i[g]=a.extend(i[g],{setup:function(){return k?!1:void a(f.start)},teardown:function(){return k?!1:void a(f.stop)}}),f=function(){function c(){var d=e(),h=n(j);d!==j?(m(j=d,h),a(b).trigger(g)):h!==j&&(location.href=location.href.replace(/#.*/,"")+h),f=setTimeout(c,a.fn[g].delay)}var f,i={},j=e(),l=function(a){return a},m=l,n=l;return i.start=function(){f||c()},i.stop=function(){f&&clearTimeout(f),f=d},b.attachEvent&&!b.addEventListener&&!k&&function(){var b,d;i.start=function(){b||(d=a.fn[g].src,d=d&&d+e(),b=a('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){d||m(e()),c()}).attr("src",d||"javascript:0").insertAfter("body")[0].contentWindow,h.onpropertychange=function(){try{"title"===event.propertyName&&(b.document.title=h.title)}catch(a){}})},i.stop=l,n=function(){return e(b.location.href)},m=function(c,d){var e=b.document,f=a.fn[g].domain;c!==d&&(e.title=h.title,e.open(),f&&e.write('<script>document.domain="'+f+'"</script>'),e.close(),b.location.hash=c)}}(),i}()}(a,this),function(a){b.matchMedia=b.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(c),a.mobile.media=function(a){return b.matchMedia(a).matches}}(a),function(a){var b={touch:"ontouchend"in c};a.mobile.support=a.mobile.support||{},a.extend(a.support,b),a.extend(a.mobile.support,b)}(a),function(a){a.extend(a.support,{orientation:"orientation"in b&&"onorientationchange"in b})}(a),function(a,d){function e(a){var b,c=a.charAt(0).toUpperCase()+a.substr(1),e=(a+" "+o.join(c+" ")+c).split(" ");for(b in e)if(n[e[b]]!==d)return!0}function f(){var c=b,d=!(!c.document.createElementNS||!c.document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect||c.opera&&-1===navigator.userAgent.indexOf("Chrome")),e=function(b){b&&d||a("html").addClass("ui-nosvg")},f=new c.Image;f.onerror=function(){e(!1)},f.onload=function(){e(1===f.width&&1===f.height)},f.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=="}function g(){var e,f,g,h="transform-3d",i=a.mobile.media("(-"+o.join("-"+h+"),(-")+"-"+h+"),("+h+")");if(i)return!!i;e=c.createElement("div"),f={MozTransform:"-moz-transform",transform:"transform"},m.append(e);for(g in f)e.style[g]!==d&&(e.style[g]="translate3d( 100px, 1px, 1px )",i=b.getComputedStyle(e).getPropertyValue(f[g]));return!!i&&"none"!==i}function h(){var b,c,d=location.protocol+"//"+location.host+location.pathname+"ui-dir/",e=a("head base"),f=null,g="";return e.length?g=e.attr("href"):e=f=a("<base>",{href:d}).appendTo("head"),b=a("<a href='testurl' />").prependTo(m),c=b[0].href,e[0].href=g||location.pathname,f&&f.remove(),0===c.indexOf(d)}function i(){var a,d=c.createElement("x"),e=c.documentElement,f=b.getComputedStyle;return"pointerEvents"in d.style?(d.style.pointerEvents="auto",d.style.pointerEvents="x",e.appendChild(d),a=f&&"auto"===f(d,"").pointerEvents,e.removeChild(d),!!a):!1}function j(){var a=c.createElement("div");return"undefined"!=typeof a.getBoundingClientRect}function k(){var a=b,c=navigator.userAgent,d=navigator.platform,e=c.match(/AppleWebKit\/([0-9]+)/),f=!!e&&e[1],g=c.match(/Fennec\/([0-9]+)/),h=!!g&&g[1],i=c.match(/Opera Mobi\/([0-9]+)/),j=!!i&&i[1];return(d.indexOf("iPhone")>-1||d.indexOf("iPad")>-1||d.indexOf("iPod")>-1)&&f&&534>f||a.operamini&&"[object OperaMini]"==={}.toString.call(a.operamini)||i&&7458>j||c.indexOf("Android")>-1&&f&&533>f||h&&6>h||"palmGetResource"in b&&f&&534>f||c.indexOf("MeeGo")>-1&&c.indexOf("NokiaBrowser/8.5.0")>-1?!1:!0}var l,m=a("<body>").prependTo("html"),n=m[0].style,o=["Webkit","Moz","O"],p="palmGetResource"in b,q=b.operamini&&"[object OperaMini]"==={}.toString.call(b.operamini),r=b.blackberry&&!e("-webkit-transform");a.extend(a.mobile,{browser:{}}),a.mobile.browser.oldIE=function(){var a=3,b=c.createElement("div"),d=b.all||[];do b.innerHTML="<!--[if gt IE "+ ++a+"]><br><![endif]-->";while(d[0]);return a>4?a:!a}(),a.extend(a.support,{pushState:"pushState"in history&&"replaceState"in history&&!(b.navigator.userAgent.indexOf("Firefox")>=0&&b.top!==b)&&-1===b.navigator.userAgent.search(/CriOS/),mediaquery:a.mobile.media("only all"),cssPseudoElement:!!e("content"),touchOverflow:!!e("overflowScrolling"),cssTransform3d:g(),boxShadow:!!e("boxShadow")&&!r,fixedPosition:k(),scrollTop:("pageXOffset"in b||"scrollTop"in c.documentElement||"scrollTop"in m[0])&&!p&&!q,dynamicBaseTag:h(),cssPointerEvents:i(),boundingRect:j(),inlineSVG:f}),m.remove(),l=function(){var a=b.navigator.userAgent;return a.indexOf("Nokia")>-1&&(a.indexOf("Symbian/3")>-1||a.indexOf("Series60/5")>-1)&&a.indexOf("AppleWebKit")>-1&&a.match(/(BrowserNG|NokiaBrowser)\/7\.[0-3]/)}(),a.mobile.gradeA=function(){return(a.support.mediaquery&&a.support.cssPseudoElement||a.mobile.browser.oldIE&&a.mobile.browser.oldIE>=8)&&(a.support.boundingRect||null!==a.fn.jquery.match(/1\.[0-7+]\.[0-9+]?/))},a.mobile.ajaxBlacklist=b.blackberry&&!b.WebKitPoint||q||l,l&&a(function(){a("head link[rel='stylesheet']").attr("rel","alternate stylesheet").attr("rel","stylesheet")}),a.support.boxShadow||a("html").addClass("ui-noboxshadow")}(a),function(a,b){var c,d=a.mobile.window,e=function(){};a.event.special.beforenavigate={setup:function(){d.on("navigate",e)},teardown:function(){d.off("navigate",e)}},a.event.special.navigate=c={bound:!1,pushStateEnabled:!0,originalEventName:b,isPushStateEnabled:function(){return a.support.pushState&&a.mobile.pushStateEnabled===!0&&this.isHashChangeEnabled()},isHashChangeEnabled:function(){return a.mobile.hashListeningEnabled===!0},popstate:function(b){var c=new a.Event("navigate"),e=new a.Event("beforenavigate"),f=b.originalEvent.state||{};e.originalEvent=b,d.trigger(e),e.isDefaultPrevented()||(b.historyState&&a.extend(f,b.historyState),c.originalEvent=b,setTimeout(function(){d.trigger(c,{state:f})},0))},hashchange:function(b){var c=new a.Event("navigate"),e=new a.Event("beforenavigate");e.originalEvent=b,d.trigger(e),e.isDefaultPrevented()||(c.originalEvent=b,d.trigger(c,{state:b.hashchangeState||{}}))},setup:function(){c.bound||(c.bound=!0,c.isPushStateEnabled()?(c.originalEventName="popstate",d.bind("popstate.navigate",c.popstate)):c.isHashChangeEnabled()&&(c.originalEventName="hashchange",d.bind("hashchange.navigate",c.hashchange)))}}}(a),function(a,c){var d,e,f="&ui-state=dialog";a.mobile.path=d={uiStateKey:"&ui-state",urlParseRE:/^\s*(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,getLocation:function(a){var b=this.parseUrl(a||location.href),c=a?b:location,d=b.hash;return d="#"===d?"":d,c.protocol+b.doubleSlash+c.host+(""!==c.protocol&&"/"!==c.pathname.substring(0,1)?"/":"")+c.pathname+c.search+d},getDocumentUrl:function(b){return b?a.extend({},d.documentUrl):d.documentUrl.href},parseLocation:function(){return this.parseUrl(this.getLocation())},parseUrl:function(b){if("object"===a.type(b))return b;var c=d.urlParseRE.exec(b||"")||[];return{href:c[0]||"",hrefNoHash:c[1]||"",hrefNoSearch:c[2]||"",domain:c[3]||"",protocol:c[4]||"",doubleSlash:c[5]||"",authority:c[6]||"",username:c[8]||"",password:c[9]||"",host:c[10]||"",hostname:c[11]||"",port:c[12]||"",pathname:c[13]||"",directory:c[14]||"",filename:c[15]||"",search:c[16]||"",hash:c[17]||""}},makePathAbsolute:function(a,b){var c,d,e,f;if(a&&"/"===a.charAt(0))return a;for(a=a||"",b=b?b.replace(/^\/|(\/[^\/]*|[^\/]+)$/g,""):"",c=b?b.split("/"):[],d=a.split("/"),e=0;e<d.length;e++)switch(f=d[e]){case".":break;case"..":c.length&&c.pop();break;default:c.push(f)}return"/"+c.join("/")},isSameDomain:function(a,b){return d.parseUrl(a).domain===d.parseUrl(b).domain},isRelativeUrl:function(a){return""===d.parseUrl(a).protocol},isAbsoluteUrl:function(a){return""!==d.parseUrl(a).protocol},makeUrlAbsolute:function(a,b){if(!d.isRelativeUrl(a))return a;b===c&&(b=this.documentBase);var e=d.parseUrl(a),f=d.parseUrl(b),g=e.protocol||f.protocol,h=e.protocol?e.doubleSlash:e.doubleSlash||f.doubleSlash,i=e.authority||f.authority,j=""!==e.pathname,k=d.makePathAbsolute(e.pathname||f.filename,f.pathname),l=e.search||!j&&f.search||"",m=e.hash;return g+h+i+k+l+m},addSearchParams:function(b,c){var e=d.parseUrl(b),f="object"==typeof c?a.param(c):c,g=e.search||"?";return e.hrefNoSearch+g+("?"!==g.charAt(g.length-1)?"&":"")+f+(e.hash||"")},convertUrlToDataUrl:function(a){var c=d.parseUrl(a);return d.isEmbeddedPage(c)?c.hash.split(f)[0].replace(/^#/,"").replace(/\?.*$/,""):d.isSameDomain(c,this.documentBase)?c.hrefNoHash.replace(this.documentBase.domain,"").split(f)[0]:b.decodeURIComponent(a)},get:function(a){return a===c&&(a=d.parseLocation().hash),d.stripHash(a).replace(/[^\/]*\.[^\/*]+$/,"")},set:function(a){location.hash=a},isPath:function(a){return/\//.test(a)},clean:function(a){return a.replace(this.documentBase.domain,"")},stripHash:function(a){return a.replace(/^#/,"")},stripQueryParams:function(a){return a.replace(/\?.*$/,"")},cleanHash:function(a){return d.stripHash(a.replace(/\?.*$/,"").replace(f,""))},isHashValid:function(a){return/^#[^#]+$/.test(a)},isExternal:function(a){var b=d.parseUrl(a);return b.protocol&&b.domain!==this.documentUrl.domain?!0:!1},hasProtocol:function(a){return/^(:?\w+:)/.test(a)},isEmbeddedPage:function(a){var b=d.parseUrl(a);return""!==b.protocol?!this.isPath(b.hash)&&b.hash&&(b.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&b.hrefNoHash===this.documentBase.hrefNoHash):/^#/.test(b.href)},squash:function(a,b){var c,e,f,g,h=this.isPath(a),i=this.parseUrl(a),j=i.hash,k="";return b=b||(d.isPath(a)?d.getLocation():d.getDocumentUrl()),e=h?d.stripHash(a):a,e=d.isPath(i.hash)?d.stripHash(i.hash):e,g=e.indexOf(this.uiStateKey),g>-1&&(k=e.slice(g),e=e.slice(0,g)),c=d.makeUrlAbsolute(e,b),f=this.parseUrl(c).search,h?((d.isPath(j)||0===j.replace("#","").indexOf(this.uiStateKey))&&(j=""),k&&-1===j.indexOf(this.uiStateKey)&&(j+=k),-1===j.indexOf("#")&&""!==j&&(j="#"+j),c=d.parseUrl(c),c=c.protocol+c.doubleSlash+c.host+c.pathname+f+j):c+=c.indexOf("#")>-1?k:"#"+k,c},isPreservableHash:function(a){return 0===a.replace("#","").indexOf(this.uiStateKey)},hashToSelector:function(a){var b="#"===a.substring(0,1);return b&&(a=a.substring(1)),(b?"#":"")+a.replace(/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g,"\\$1")},getFilePath:function(b){var c="&"+a.mobile.subPageUrlKey;return b&&b.split(c)[0].split(f)[0]},isFirstPageUrl:function(b){var e=d.parseUrl(d.makeUrlAbsolute(b,this.documentBase)),f=e.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&e.hrefNoHash===this.documentBase.hrefNoHash,g=a.mobile.firstPage,h=g&&g[0]?g[0].id:c;return f&&(!e.hash||"#"===e.hash||h&&e.hash.replace(/^#/,"")===h)},isPermittedCrossDomainRequest:function(b,c){return a.mobile.allowCrossDomainPages&&("file:"===b.protocol||"content:"===b.protocol)&&-1!==c.search(/^https?:/)}},d.documentUrl=d.parseLocation(),e=a("head").find("base"),d.documentBase=e.length?d.parseUrl(d.makeUrlAbsolute(e.attr("href"),d.documentUrl.href)):d.documentUrl,d.documentBaseDiffers=d.documentUrl.hrefNoHash!==d.documentBase.hrefNoHash,d.getDocumentBase=function(b){return b?a.extend({},d.documentBase):d.documentBase.href},a.extend(a.mobile,{getDocumentUrl:d.getDocumentUrl,getDocumentBase:d.getDocumentBase})}(a),function(a,b){a.mobile.History=function(a,b){this.stack=a||[],this.activeIndex=b||0},a.extend(a.mobile.History.prototype,{getActive:function(){return this.stack[this.activeIndex]},getLast:function(){return this.stack[this.previousIndex]},getNext:function(){return this.stack[this.activeIndex+1]},getPrev:function(){return this.stack[this.activeIndex-1]},add:function(a,b){b=b||{},this.getNext()&&this.clearForward(),b.hash&&-1===b.hash.indexOf("#")&&(b.hash="#"+b.hash),b.url=a,this.stack.push(b),this.activeIndex=this.stack.length-1},clearForward:function(){this.stack=this.stack.slice(0,this.activeIndex+1)},find:function(a,b,c){b=b||this.stack;var d,e,f,g=b.length;for(e=0;g>e;e++)if(d=b[e],(decodeURIComponent(a)===decodeURIComponent(d.url)||decodeURIComponent(a)===decodeURIComponent(d.hash))&&(f=e,c))return f;return f},closest:function(a){var c,d=this.activeIndex;return c=this.find(a,this.stack.slice(0,d)),c===b&&(c=this.find(a,this.stack.slice(d),!0),c=c===b?c:c+d),c},direct:function(c){var d=this.closest(c.url),e=this.activeIndex;d!==b&&(this.activeIndex=d,this.previousIndex=e),e>d?(c.present||c.back||a.noop)(this.getActive(),"back"):d>e?(c.present||c.forward||a.noop)(this.getActive(),"forward"):d===b&&c.missing&&c.missing(this.getActive())}})}(a),function(a){var d=a.mobile.path,e=location.href;a.mobile.Navigator=function(b){this.history=b,this.ignoreInitialHashChange=!0,a.mobile.window.bind({"popstate.history":a.proxy(this.popstate,this),"hashchange.history":a.proxy(this.hashchange,this)})},a.extend(a.mobile.Navigator.prototype,{squash:function(e,f){var g,h,i=d.isPath(e)?d.stripHash(e):e;return h=d.squash(e),g=a.extend({hash:i,url:h},f),b.history.replaceState(g,g.title||c.title,h),g},hash:function(a,b){var c,e,f,g;return c=d.parseUrl(a),e=d.parseLocation(),e.pathname+e.search===c.pathname+c.search?f=c.hash?c.hash:c.pathname+c.search:d.isPath(a)?(g=d.parseUrl(b),f=g.pathname+g.search+(d.isPreservableHash(g.hash)?g.hash.replace("#",""):"")):f=a,f},go:function(e,f,g){var h,i,j,k,l=a.event.special.navigate.isPushStateEnabled();i=d.squash(e),j=this.hash(e,i),g&&j!==d.stripHash(d.parseLocation().hash)&&(this.preventNextHashChange=g),this.preventHashAssignPopState=!0,b.location.hash=j,this.preventHashAssignPopState=!1,h=a.extend({url:i,hash:j,title:c.title},f),l&&(k=new a.Event("popstate"),k.originalEvent={type:"popstate",state:null},this.squash(e,h),g||(this.ignorePopState=!0,a.mobile.window.trigger(k))),this.history.add(h.url,h)
+},popstate:function(b){var c,f;if(a.event.special.navigate.isPushStateEnabled())return this.preventHashAssignPopState?(this.preventHashAssignPopState=!1,void b.stopImmediatePropagation()):this.ignorePopState?void(this.ignorePopState=!1):!b.originalEvent.state&&1===this.history.stack.length&&this.ignoreInitialHashChange&&(this.ignoreInitialHashChange=!1,location.href===e)?void b.preventDefault():(c=d.parseLocation().hash,!b.originalEvent.state&&c?(f=this.squash(c),this.history.add(f.url,f),void(b.historyState=f)):void this.history.direct({url:(b.originalEvent.state||{}).url||c,present:function(c,d){b.historyState=a.extend({},c),b.historyState.direction=d}}))},hashchange:function(b){var e,f;if(a.event.special.navigate.isHashChangeEnabled()&&!a.event.special.navigate.isPushStateEnabled()){if(this.preventNextHashChange)return this.preventNextHashChange=!1,void b.stopImmediatePropagation();e=this.history,f=d.parseLocation().hash,this.history.direct({url:f,present:function(c,d){b.hashchangeState=a.extend({},c),b.hashchangeState.direction=d},missing:function(){e.add(f,{hash:f,title:c.title})}})}}})}(a),function(a){a.mobile.navigate=function(b,c,d){a.mobile.navigate.navigator.go(b,c,d)},a.mobile.navigate.history=new a.mobile.History,a.mobile.navigate.navigator=new a.mobile.Navigator(a.mobile.navigate.history);var b=a.mobile.path.parseLocation();a.mobile.navigate.history.add(b.href,{hash:b.hash})}(a),function(a,b){var d={animation:{},transition:{}},e=c.createElement("a"),f=["","webkit-","moz-","o-"];a.each(["animation","transition"],function(c,g){var h=0===c?g+"-name":g;a.each(f,function(c,f){return e.style[a.camelCase(f+h)]!==b?(d[g].prefix=f,!1):void 0}),d[g].duration=a.camelCase(d[g].prefix+g+"-duration"),d[g].event=a.camelCase(d[g].prefix+g+"-end"),""===d[g].prefix&&(d[g].event=d[g].event.toLowerCase())}),a.support.cssTransitions=d.transition.prefix!==b,a.support.cssAnimations=d.animation.prefix!==b,a(e).remove(),a.fn.animationComplete=function(e,f,g){var h,i,j=this,k=function(){clearTimeout(h),e.apply(this,arguments)},l=f&&"animation"!==f?"transition":"animation";return a.support.cssTransitions&&"transition"===l||a.support.cssAnimations&&"animation"===l?(g===b&&(a(this).context!==c&&(i=3e3*parseFloat(a(this).css(d[l].duration))),(0===i||i===b||isNaN(i))&&(i=a.fn.animationComplete.defaultDuration)),h=setTimeout(function(){a(j).off(d[l].event,k),e.apply(j)},i),a(this).one(d[l].event,k)):(setTimeout(a.proxy(e,this),0),a(this))},a.fn.animationComplete.defaultDuration=1e3}(a),function(a,b,c,d){function e(a){for(;a&&"undefined"!=typeof a.originalEvent;)a=a.originalEvent;return a}function f(b,c){var f,g,h,i,j,k,l,m,n,o=b.type;if(b=a.Event(b),b.type=c,f=b.originalEvent,g=a.event.props,o.search(/^(mouse|click)/)>-1&&(g=E),f)for(l=g.length,i;l;)i=g[--l],b[i]=f[i];if(o.search(/mouse(down|up)|click/)>-1&&!b.which&&(b.which=1),-1!==o.search(/^touch/)&&(h=e(f),o=h.touches,j=h.changedTouches,k=o&&o.length?o[0]:j&&j.length?j[0]:d))for(m=0,n=C.length;n>m;m++)i=C[m],b[i]=k[i];return b}function g(b){for(var c,d,e={};b;){c=a.data(b,z);for(d in c)c[d]&&(e[d]=e.hasVirtualBinding=!0);b=b.parentNode}return e}function h(b,c){for(var d;b;){if(d=a.data(b,z),d&&(!c||d[c]))return b;b=b.parentNode}return null}function i(){M=!1}function j(){M=!0}function k(){Q=0,K.length=0,L=!1,j()}function l(){i()}function m(){n(),G=setTimeout(function(){G=0,k()},a.vmouse.resetTimerDuration)}function n(){G&&(clearTimeout(G),G=0)}function o(b,c,d){var e;return(d&&d[b]||!d&&h(c.target,b))&&(e=f(c,b),a(c.target).trigger(e)),e}function p(b){var c,d=a.data(b.target,A);L||Q&&Q===d||(c=o("v"+b.type,b),c&&(c.isDefaultPrevented()&&b.preventDefault(),c.isPropagationStopped()&&b.stopPropagation(),c.isImmediatePropagationStopped()&&b.stopImmediatePropagation()))}function q(b){var c,d,f,h=e(b).touches;h&&1===h.length&&(c=b.target,d=g(c),d.hasVirtualBinding&&(Q=P++,a.data(c,A,Q),n(),l(),J=!1,f=e(b).touches[0],H=f.pageX,I=f.pageY,o("vmouseover",b,d),o("vmousedown",b,d)))}function r(a){M||(J||o("vmousecancel",a,g(a.target)),J=!0,m())}function s(b){if(!M){var c=e(b).touches[0],d=J,f=a.vmouse.moveDistanceThreshold,h=g(b.target);J=J||Math.abs(c.pageX-H)>f||Math.abs(c.pageY-I)>f,J&&!d&&o("vmousecancel",b,h),o("vmousemove",b,h),m()}}function t(a){if(!M){j();var b,c,d=g(a.target);o("vmouseup",a,d),J||(b=o("vclick",a,d),b&&b.isDefaultPrevented()&&(c=e(a).changedTouches[0],K.push({touchID:Q,x:c.clientX,y:c.clientY}),L=!0)),o("vmouseout",a,d),J=!1,m()}}function u(b){var c,d=a.data(b,z);if(d)for(c in d)if(d[c])return!0;return!1}function v(){}function w(b){var c=b.substr(1);return{setup:function(){u(this)||a.data(this,z,{});var d=a.data(this,z);d[b]=!0,F[b]=(F[b]||0)+1,1===F[b]&&O.bind(c,p),a(this).bind(c,v),N&&(F.touchstart=(F.touchstart||0)+1,1===F.touchstart&&O.bind("touchstart",q).bind("touchend",t).bind("touchmove",s).bind("scroll",r))},teardown:function(){--F[b],F[b]||O.unbind(c,p),N&&(--F.touchstart,F.touchstart||O.unbind("touchstart",q).unbind("touchmove",s).unbind("touchend",t).unbind("scroll",r));var d=a(this),e=a.data(this,z);e&&(e[b]=!1),d.unbind(c,v),u(this)||d.removeData(z)}}}var x,y,z="virtualMouseBindings",A="virtualTouchID",B="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),C="clientX clientY pageX pageY screenX screenY".split(" "),D=a.event.mouseHooks?a.event.mouseHooks.props:[],E=a.event.props.concat(D),F={},G=0,H=0,I=0,J=!1,K=[],L=!1,M=!1,N="addEventListener"in c,O=a(c),P=1,Q=0;for(a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500},y=0;y<B.length;y++)a.event.special[B[y]]=w(B[y]);N&&c.addEventListener("click",function(b){var c,d,e,f,g,h,i=K.length,j=b.target;if(i)for(c=b.clientX,d=b.clientY,x=a.vmouse.clickDistanceThreshold,e=j;e;){for(f=0;i>f;f++)if(g=K[f],h=0,e===j&&Math.abs(g.x-c)<x&&Math.abs(g.y-d)<x||a.data(e,A)===g.touchID)return b.preventDefault(),void b.stopPropagation();e=e.parentNode}},!0)}(a,b,c),function(a,b,d){function e(b,c,e,f){var g=e.type;e.type=c,f?a.event.trigger(e,d,b):a.event.dispatch.call(b,e),e.type=g}var f=a(c),g=a.mobile.support.touch,h="touchmove scroll",i=g?"touchstart":"mousedown",j=g?"touchend":"mouseup",k=g?"touchmove":"mousemove";a.each("touchstart touchmove touchend tap taphold swipe swipeleft swiperight scrollstart scrollstop".split(" "),function(b,c){a.fn[c]=function(a){return a?this.bind(c,a):this.trigger(c)},a.attrFn&&(a.attrFn[c]=!0)}),a.event.special.scrollstart={enabled:!0,setup:function(){function b(a,b){c=b,e(f,c?"scrollstart":"scrollstop",a)}var c,d,f=this,g=a(f);g.bind(h,function(e){a.event.special.scrollstart.enabled&&(c||b(e,!0),clearTimeout(d),d=setTimeout(function(){b(e,!1)},50))})},teardown:function(){a(this).unbind(h)}},a.event.special.tap={tapholdThreshold:750,emitTapOnTaphold:!0,setup:function(){var b=this,c=a(b),d=!1;c.bind("vmousedown",function(g){function h(){clearTimeout(k)}function i(){h(),c.unbind("vclick",j).unbind("vmouseup",h),f.unbind("vmousecancel",i)}function j(a){i(),d||l!==a.target?d&&a.preventDefault():e(b,"tap",a)}if(d=!1,g.which&&1!==g.which)return!1;var k,l=g.target;c.bind("vmouseup",h).bind("vclick",j),f.bind("vmousecancel",i),k=setTimeout(function(){a.event.special.tap.emitTapOnTaphold||(d=!0),e(b,"taphold",a.Event("taphold",{target:l}))},a.event.special.tap.tapholdThreshold)})},teardown:function(){a(this).unbind("vmousedown").unbind("vclick").unbind("vmouseup"),f.unbind("vmousecancel")}},a.event.special.swipe={scrollSupressionThreshold:30,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:30,getLocation:function(a){var c=b.pageXOffset,d=b.pageYOffset,e=a.clientX,f=a.clientY;return 0===a.pageY&&Math.floor(f)>Math.floor(a.pageY)||0===a.pageX&&Math.floor(e)>Math.floor(a.pageX)?(e-=c,f-=d):(f<a.pageY-d||e<a.pageX-c)&&(e=a.pageX-c,f=a.pageY-d),{x:e,y:f}},start:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b,d=a.event.special.swipe.getLocation(c);return{time:(new Date).getTime(),coords:[d.x,d.y],origin:a(b.target)}},stop:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b,d=a.event.special.swipe.getLocation(c);return{time:(new Date).getTime(),coords:[d.x,d.y]}},handleSwipe:function(b,c,d,f){if(c.time-b.time<a.event.special.swipe.durationThreshold&&Math.abs(b.coords[0]-c.coords[0])>a.event.special.swipe.horizontalDistanceThreshold&&Math.abs(b.coords[1]-c.coords[1])<a.event.special.swipe.verticalDistanceThreshold){var g=b.coords[0]>c.coords[0]?"swipeleft":"swiperight";return e(d,"swipe",a.Event("swipe",{target:f,swipestart:b,swipestop:c}),!0),e(d,g,a.Event(g,{target:f,swipestart:b,swipestop:c}),!0),!0}return!1},eventInProgress:!1,setup:function(){var b,c=this,d=a(c),e={};b=a.data(this,"mobile-events"),b||(b={length:0},a.data(this,"mobile-events",b)),b.length++,b.swipe=e,e.start=function(b){if(!a.event.special.swipe.eventInProgress){a.event.special.swipe.eventInProgress=!0;var d,g=a.event.special.swipe.start(b),h=b.target,i=!1;e.move=function(b){g&&(d=a.event.special.swipe.stop(b),i||(i=a.event.special.swipe.handleSwipe(g,d,c,h),i&&(a.event.special.swipe.eventInProgress=!1)),Math.abs(g.coords[0]-d.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault())},e.stop=function(){i=!0,a.event.special.swipe.eventInProgress=!1,f.off(k,e.move),e.move=null},f.on(k,e.move).one(j,e.stop)}},d.on(i,e.start)},teardown:function(){var b,c;b=a.data(this,"mobile-events"),b&&(c=b.swipe,delete b.swipe,b.length--,0===b.length&&a.removeData(this,"mobile-events")),c&&(c.start&&a(this).off(i,c.start),c.move&&f.off(k,c.move),c.stop&&f.off(j,c.stop))}},a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe.left",swiperight:"swipe.right"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)},teardown:function(){a(this).unbind(c)}}})}(a,this),function(a){a.event.special.throttledresize={setup:function(){a(this).bind("resize",f)},teardown:function(){a(this).unbind("resize",f)}};var b,c,d,e=250,f=function(){c=(new Date).getTime(),d=c-g,d>=e?(g=c,a(this).trigger("throttledresize")):(b&&clearTimeout(b),b=setTimeout(f,e-d))},g=0}(a),function(a,b){function d(){var a=e();a!==f&&(f=a,l.trigger(m))}var e,f,g,h,i,j,k,l=a(b),m="orientationchange",n={0:!0,180:!0};a.support.orientation&&(i=b.innerWidth||l.width(),j=b.innerHeight||l.height(),k=50,g=i>j&&i-j>k,h=n[b.orientation],(g&&h||!g&&!h)&&(n={"-90":!0,90:!0})),a.event.special.orientationchange=a.extend({},a.event.special.orientationchange,{setup:function(){return a.support.orientation&&!a.event.special.orientationchange.disabled?!1:(f=e(),void l.bind("throttledresize",d))},teardown:function(){return a.support.orientation&&!a.event.special.orientationchange.disabled?!1:void l.unbind("throttledresize",d)},add:function(a){var b=a.handler;a.handler=function(a){return a.orientation=e(),b.apply(this,arguments)}}}),a.event.special.orientationchange.orientation=e=function(){var d=!0,e=c.documentElement;return d=a.support.orientation?n[b.orientation]:e&&e.clientWidth/e.clientHeight<1.1,d?"portrait":"landscape"},a.fn[m]=function(a){return a?this.bind(m,a):this.trigger(m)},a.attrFn&&(a.attrFn[m]=!0)}(a,this),function(a){var b=a("head").children("base"),c={element:b.length?b:a("<base>",{href:a.mobile.path.documentBase.hrefNoHash}).prependTo(a("head")),linkSelector:"[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]",set:function(b){a.mobile.dynamicBaseEnabled&&a.support.dynamicBaseTag&&c.element.attr("href",a.mobile.path.makeUrlAbsolute(b,a.mobile.path.documentBase))},rewrite:function(b,d){var e=a.mobile.path.get(b);d.find(c.linkSelector).each(function(b,c){var d=a(c).is("[href]")?"href":a(c).is("[src]")?"src":"action",f=a.mobile.path.parseLocation(),g=a(c).attr(d);g=g.replace(f.protocol+f.doubleSlash+f.host+f.pathname,""),/^(\w+:|#|\/)/.test(g)||a(c).attr(d,e+g)})},reset:function(){c.element.attr("href",a.mobile.path.documentBase.hrefNoSearch)}};a.mobile.base=c}(a),function(a,b){a.mobile.widgets={};var c=a.widget,d=a.mobile.keepNative;a.widget=function(c){return function(){var d=c.apply(this,arguments),e=d.prototype.widgetName;return d.initSelector=d.prototype.initSelector!==b?d.prototype.initSelector:":jqmData(role='"+e+"')",a.mobile.widgets[e]=d,d}}(a.widget),a.extend(a.widget,c),a.mobile.document.on("create",function(b){a(b.target).enhanceWithin()}),a.widget("mobile.page",{options:{theme:"a",domCache:!1,keepNativeDefault:a.mobile.keepNative,contentTheme:null,enhanced:!1},_createWidget:function(){a.Widget.prototype._createWidget.apply(this,arguments),this._trigger("init")},_create:function(){return this._trigger("beforecreate")===!1?!1:(this.options.enhanced||this._enhance(),this._on(this.element,{pagebeforehide:"removeContainerBackground",pagebeforeshow:"_handlePageBeforeShow"}),this.element.enhanceWithin(),void("dialog"===a.mobile.getAttribute(this.element[0],"role")&&a.mobile.dialog&&this.element.dialog()))},_enhance:function(){var c="data-"+a.mobile.ns,d=this;this.options.role&&this.element.attr("data-"+a.mobile.ns+"role",this.options.role),this.element.attr("tabindex","0").addClass("ui-page ui-page-theme-"+this.options.theme),this.element.find("["+c+"role='content']").each(function(){var e=a(this),f=this.getAttribute(c+"theme")||b;d.options.contentTheme=f||d.options.contentTheme||d.options.dialog&&d.options.theme||"dialog"===d.element.jqmData("role")&&d.options.theme,e.addClass("ui-content"),d.options.contentTheme&&e.addClass("ui-body-"+d.options.contentTheme),e.attr("role","main").addClass("ui-content")})},bindRemove:function(b){var c=this.element;!c.data("mobile-page").options.domCache&&c.is(":jqmData(external-page='true')")&&c.bind("pagehide.remove",b||function(b,c){if(!c.samePage){var d=a(this),e=new a.Event("pageremove");d.trigger(e),e.isDefaultPrevented()||d.removeWithDependents()}})},_setOptions:function(c){c.theme!==b&&this.element.removeClass("ui-page-theme-"+this.options.theme).addClass("ui-page-theme-"+c.theme),c.contentTheme!==b&&this.element.find("[data-"+a.mobile.ns+"='content']").removeClass("ui-body-"+this.options.contentTheme).addClass("ui-body-"+c.contentTheme)},_handlePageBeforeShow:function(){this.setContainerBackground()},removeContainerBackground:function(){this.element.closest(":mobile-pagecontainer").pagecontainer({theme:"none"})},setContainerBackground:function(a){this.element.parent().pagecontainer({theme:a||this.options.theme})},keepNativeSelector:function(){var b=this.options,c=a.trim(b.keepNative||""),e=a.trim(a.mobile.keepNative),f=a.trim(b.keepNativeDefault),g=d===e?"":e,h=""===g?f:"";return(c?[c]:[]).concat(g?[g]:[]).concat(h?[h]:[]).join(", ")}})}(a),function(a,d){a.widget("mobile.pagecontainer",{options:{theme:"a"},initSelector:!1,_create:function(){this._trigger("beforecreate"),this.setLastScrollEnabled=!0,this._on(this.window,{navigate:"_disableRecordScroll",scrollstop:"_delayedRecordScroll"}),this._on(this.window,{navigate:"_filterNavigateEvents"}),this._on({pagechange:"_afterContentChange"}),this.window.one("navigate",a.proxy(function(){this.setLastScrollEnabled=!0},this))},_setOptions:function(a){a.theme!==d&&"none"!==a.theme?this.element.removeClass("ui-overlay-"+this.options.theme).addClass("ui-overlay-"+a.theme):a.theme!==d&&this.element.removeClass("ui-overlay-"+this.options.theme),this._super(a)},_disableRecordScroll:function(){this.setLastScrollEnabled=!1},_enableRecordScroll:function(){this.setLastScrollEnabled=!0},_afterContentChange:function(){this.setLastScrollEnabled=!0,this._off(this.window,"scrollstop"),this._on(this.window,{scrollstop:"_delayedRecordScroll"})},_recordScroll:function(){if(this.setLastScrollEnabled){var a,b,c,d=this._getActiveHistory();d&&(a=this._getScroll(),b=this._getMinScroll(),c=this._getDefaultScroll(),d.lastScroll=b>a?c:a)}},_delayedRecordScroll:function(){setTimeout(a.proxy(this,"_recordScroll"),100)},_getScroll:function(){return this.window.scrollTop()},_getMinScroll:function(){return a.mobile.minScrollBack},_getDefaultScroll:function(){return a.mobile.defaultHomeScroll},_filterNavigateEvents:function(b,c){var d;b.originalEvent&&b.originalEvent.isDefaultPrevented()||(d=b.originalEvent.type.indexOf("hashchange")>-1?c.state.hash:c.state.url,d||(d=this._getHash()),d&&"#"!==d&&0!==d.indexOf("#"+a.mobile.path.uiStateKey)||(d=location.href),this._handleNavigate(d,c.state))},_getHash:function(){return a.mobile.path.parseLocation().hash},getActivePage:function(){return this.activePage},_getInitialContent:function(){return a.mobile.firstPage},_getHistory:function(){return a.mobile.navigate.history},_getActiveHistory:function(){return a.mobile.navigate.history.getActive()},_getDocumentBase:function(){return a.mobile.path.documentBase},back:function(){this.go(-1)},forward:function(){this.go(1)},go:function(c){if(a.mobile.hashListeningEnabled)b.history.go(c);else{var d=a.mobile.navigate.history.activeIndex,e=d+parseInt(c,10),f=a.mobile.navigate.history.stack[e].url,g=c>=1?"forward":"back";a.mobile.navigate.history.activeIndex=e,a.mobile.navigate.history.previousIndex=d,this.change(f,{direction:g,changeHash:!1,fromHashChange:!0})}},_handleDestination:function(b){var c;return"string"===a.type(b)&&(b=a.mobile.path.stripHash(b)),b&&(c=this._getHistory(),b=a.mobile.path.isPath(b)?b:a.mobile.path.makeUrlAbsolute("#"+b,this._getDocumentBase()),b===a.mobile.path.makeUrlAbsolute("#"+c.initialDst,this._getDocumentBase())&&c.stack.length&&c.stack[0].url!==c.initialDst.replace(a.mobile.dialogHashKey,"")&&(b=this._getInitialContent())),b||this._getInitialContent()},_handleDialog:function(b,c){var d,e,f=this.getActivePage();return f&&!f.hasClass("ui-dialog")?("back"===c.direction?this.back():this.forward(),!1):(d=c.pageUrl,e=this._getActiveHistory(),a.extend(b,{role:e.role,transition:e.transition,reverse:"back"===c.direction}),d)},_handleNavigate:function(b,c){var e=a.mobile.path.stripHash(b),f=this._getHistory(),g=0===f.stack.length?"none":d,h={changeHash:!1,fromHashChange:!0,reverse:"back"===c.direction};a.extend(h,c,{transition:(f.getLast()||{}).transition||g}),f.activeIndex>0&&e.indexOf(a.mobile.dialogHashKey)>-1&&f.initialDst!==e&&(e=this._handleDialog(h,c),e===!1)||this._changeContent(this._handleDestination(e),h)},_changeContent:function(b,c){a.mobile.changePage(b,c)},_getBase:function(){return a.mobile.base},_getNs:function(){return a.mobile.ns},_enhance:function(a,b){return a.page({role:b})},_include:function(a,b){a.appendTo(this.element),this._enhance(a,b.role),a.page("bindRemove")},_find:function(b){var c,d=this._createFileUrl(b),e=this._createDataUrl(b),f=this._getInitialContent();return c=this.element.children("[data-"+this._getNs()+"url='"+e+"']"),0===c.length&&e&&!a.mobile.path.isPath(e)&&(c=this.element.children(a.mobile.path.hashToSelector("#"+e)).attr("data-"+this._getNs()+"url",e).jqmData("url",e)),0===c.length&&a.mobile.path.isFirstPageUrl(d)&&f&&f.parent().length&&(c=a(f)),c},_getLoader:function(){return a.mobile.loading()},_showLoading:function(b,c,d,e){this._loadMsg||(this._loadMsg=setTimeout(a.proxy(function(){this._getLoader().loader("show",c,d,e),this._loadMsg=0},this),b))},_hideLoading:function(){clearTimeout(this._loadMsg),this._loadMsg=0,this._getLoader().loader("hide")},_showError:function(){this._hideLoading(),this._showLoading(0,a.mobile.pageLoadErrorMessageTheme,a.mobile.pageLoadErrorMessage,!0),setTimeout(a.proxy(this,"_hideLoading"),1500)},_parse:function(b,c){var d,e=a("<div></div>");return e.get(0).innerHTML=b,d=e.find(":jqmData(role='page'), :jqmData(role='dialog')").first(),d.length||(d=a("<div data-"+this._getNs()+"role='page'>"+(b.split(/<\/?body[^>]*>/gim)[1]||"")+"</div>")),d.attr("data-"+this._getNs()+"url",a.mobile.path.convertUrlToDataUrl(c)).attr("data-"+this._getNs()+"external-page",!0),d},_setLoadedTitle:function(b,c){var d=c.match(/<title[^>]*>([^<]*)/)&&RegExp.$1;d&&!b.jqmData("title")&&(d=a("<div>"+d+"</div>").text(),b.jqmData("title",d))},_isRewritableBaseTag:function(){return a.mobile.dynamicBaseEnabled&&!a.support.dynamicBaseTag},_createDataUrl:function(b){return a.mobile.path.convertUrlToDataUrl(b)},_createFileUrl:function(b){return a.mobile.path.getFilePath(b)},_triggerWithDeprecated:function(b,c,d){var e=a.Event("page"+b),f=a.Event(this.widgetName+b);return(d||this.element).trigger(e,c),this._trigger(b,f,c),{deprecatedEvent:e,event:f}},_loadSuccess:function(b,c,e,f){var g=this._createFileUrl(b),h=this._createDataUrl(b);return a.proxy(function(i,j,k){var l,m=new RegExp("(<[^>]+\\bdata-"+this._getNs()+"role=[\"']?page[\"']?[^>]*>)"),n=new RegExp("\\bdata-"+this._getNs()+"url=[\"']?([^\"'>]*)[\"']?");m.test(i)&&RegExp.$1&&n.test(RegExp.$1)&&RegExp.$1&&(g=a.mobile.path.getFilePath(a("<div>"+RegExp.$1+"</div>").text())),e.prefetch===d&&this._getBase().set(g),l=this._parse(i,g),this._setLoadedTitle(l,i),c.xhr=k,c.textStatus=j,c.page=l,c.content=l,c.toPage=l,this._triggerWithDeprecated("load").event.isDefaultPrevented()||(this._isRewritableBaseTag()&&l&&this._getBase().rewrite(g,l),this._include(l,e),b.indexOf("&"+a.mobile.subPageUrlKey)>-1&&(l=this.element.children("[data-"+this._getNs()+"url='"+h+"']")),e.showLoadMsg&&this._hideLoading(),f.resolve(b,e,l))},this)},_loadDefaults:{type:"get",data:d,reloadPage:!1,reload:!1,role:d,showLoadMsg:!1,loadMsgDelay:50},load:function(b,c){var e,f,g,h,i=c&&c.deferred||a.Deferred(),j=a.extend({},this._loadDefaults,c),k=null,l=a.mobile.path.makeUrlAbsolute(b,this._findBaseWithDefault());return j.reload=j.reloadPage,j.data&&"get"===j.type&&(l=a.mobile.path.addSearchParams(l,j.data),j.data=d),j.data&&"post"===j.type&&(j.reload=!0),e=this._createFileUrl(l),f=this._createDataUrl(l),k=this._find(l),0===k.length&&a.mobile.path.isEmbeddedPage(e)&&!a.mobile.path.isFirstPageUrl(e)?(i.reject(l,j),i.promise()):(this._getBase().reset(),k.length&&!j.reload?(this._enhance(k,j.role),i.resolve(l,j,k),j.prefetch||this._getBase().set(b),i.promise()):(h={url:b,absUrl:l,toPage:b,prevPage:c?c.fromPage:d,dataUrl:f,deferred:i,options:j},g=this._triggerWithDeprecated("beforeload",h),g.deprecatedEvent.isDefaultPrevented()||g.event.isDefaultPrevented()?i.promise():(j.showLoadMsg&&this._showLoading(j.loadMsgDelay),j.prefetch===d&&this._getBase().reset(),a.mobile.allowCrossDomainPages||a.mobile.path.isSameDomain(a.mobile.path.documentUrl,l)?(a.ajax({url:e,type:j.type,data:j.data,contentType:j.contentType,dataType:"html",success:this._loadSuccess(l,h,j,i),error:this._loadError(l,h,j,i)}),i.promise()):(i.reject(l,j),i.promise()))))},_loadError:function(b,c,d,e){return a.proxy(function(f,g,h){this._getBase().set(a.mobile.path.get()),c.xhr=f,c.textStatus=g,c.errorThrown=h;var i=this._triggerWithDeprecated("loadfailed",c);i.deprecatedEvent.isDefaultPrevented()||i.event.isDefaultPrevented()||(d.showLoadMsg&&this._showError(),e.reject(b,d))},this)},_getTransitionHandler:function(b){return b=a.mobile._maybeDegradeTransition(b),a.mobile.transitionHandlers[b]||a.mobile.defaultTransitionHandler},_triggerCssTransitionEvents:function(b,c,d){var e=!1;d=d||"",c&&(b[0]===c[0]&&(e=!0),this._triggerWithDeprecated(d+"hide",{nextPage:b,toPage:b,prevPage:c,samePage:e},c)),this._triggerWithDeprecated(d+"show",{prevPage:c||a(""),toPage:b},b)},_cssTransition:function(b,c,d){var e,f,g=d.transition,h=d.reverse,i=d.deferred;this._triggerCssTransitionEvents(b,c,"before"),this._hideLoading(),e=this._getTransitionHandler(g),f=new e(g,h,b,c).transition(),f.done(a.proxy(function(){this._triggerCssTransitionEvents(b,c)},this)),f.done(function(){i.resolve.apply(i,arguments)})},_releaseTransitionLock:function(){f=!1,e.length>0&&a.mobile.changePage.apply(null,e.pop())},_removeActiveLinkClass:function(b){a.mobile.removeActiveLinkClass(b)},_loadUrl:function(b,c,d){d.target=b,d.deferred=a.Deferred(),this.load(b,d),d.deferred.done(a.proxy(function(a,b,d){f=!1,b.absUrl=c.absUrl,this.transition(d,c,b)},this)),d.deferred.fail(a.proxy(function(){this._removeActiveLinkClass(!0),this._releaseTransitionLock(),this._triggerWithDeprecated("changefailed",c)},this))},_triggerPageBeforeChange:function(b,c,d){var e;return c.prevPage=this.activePage,a.extend(c,{toPage:b,options:d}),c.absUrl="string"===a.type(b)?a.mobile.path.makeUrlAbsolute(b,this._findBaseWithDefault()):d.absUrl,e=this._triggerWithDeprecated("beforechange",c),e.event.isDefaultPrevented()||e.deprecatedEvent.isDefaultPrevented()?!1:!0},change:function(b,c){if(f)return void e.unshift(arguments);var d=a.extend({},a.mobile.changePage.defaults,c),g={};d.fromPage=d.fromPage||this.activePage,this._triggerPageBeforeChange(b,g,d)&&(b=g.toPage,"string"===a.type(b)?(f=!0,this._loadUrl(b,g,d)):this.transition(b,g,d))},transition:function(b,g,h){var i,j,k,l,m,n,o,p,q,r,s,t,u,v;if(f)return void e.unshift([b,h]);if(this._triggerPageBeforeChange(b,g,h)&&(g.prevPage=h.fromPage,v=this._triggerWithDeprecated("beforetransition",g),!v.deprecatedEvent.isDefaultPrevented()&&!v.event.isDefaultPrevented())){if(f=!0,b[0]!==a.mobile.firstPage[0]||h.dataUrl||(h.dataUrl=a.mobile.path.documentUrl.hrefNoHash),i=h.fromPage,j=h.dataUrl&&a.mobile.path.convertUrlToDataUrl(h.dataUrl)||b.jqmData("url"),k=j,l=a.mobile.path.getFilePath(j),m=a.mobile.navigate.history.getActive(),n=0===a.mobile.navigate.history.activeIndex,o=0,p=c.title,q=("dialog"===h.role||"dialog"===b.jqmData("role"))&&b.jqmData("dialog")!==!0,i&&i[0]===b[0]&&!h.allowSamePageTransition)return f=!1,this._triggerWithDeprecated("transition",g),this._triggerWithDeprecated("change",g),void(h.fromHashChange&&a.mobile.navigate.history.direct({url:j}));b.page({role:h.role}),h.fromHashChange&&(o="back"===h.direction?-1:1);try{c.activeElement&&"body"!==c.activeElement.nodeName.toLowerCase()?a(c.activeElement).blur():a("input:focus, textarea:focus, select:focus").blur()}catch(w){}r=!1,q&&m&&(m.url&&m.url.indexOf(a.mobile.dialogHashKey)>-1&&this.activePage&&!this.activePage.hasClass("ui-dialog")&&a.mobile.navigate.history.activeIndex>0&&(h.changeHash=!1,r=!0),j=m.url||"",j+=!r&&j.indexOf("#")>-1?a.mobile.dialogHashKey:"#"+a.mobile.dialogHashKey,0===a.mobile.navigate.history.activeIndex&&j===a.mobile.navigate.history.initialDst&&(j+=a.mobile.dialogHashKey)),s=m?b.jqmData("title")||b.children(":jqmData(role='header')").find(".ui-title").text():p,s&&p===c.title&&(p=s),b.jqmData("title")||b.jqmData("title",p),h.transition=h.transition||(o&&!n?m.transition:d)||(q?a.mobile.defaultDialogTransition:a.mobile.defaultPageTransition),!o&&r&&(a.mobile.navigate.history.getActive().pageUrl=k),j&&!h.fromHashChange&&(!a.mobile.path.isPath(j)&&j.indexOf("#")<0&&(j="#"+j),t={transition:h.transition,title:p,pageUrl:k,role:h.role},h.changeHash!==!1&&a.mobile.hashListeningEnabled?a.mobile.navigate(j,t,!0):b[0]!==a.mobile.firstPage[0]&&a.mobile.navigate.history.add(j,t)),c.title=p,a.mobile.activePage=b,this.activePage=b,h.reverse=h.reverse||0>o,u=a.Deferred(),this._cssTransition(b,i,{transition:h.transition,reverse:h.reverse,deferred:u}),u.done(a.proxy(function(c,d,e,f,i){a.mobile.removeActiveLinkClass(),h.duplicateCachedPage&&h.duplicateCachedPage.remove(),i||a.mobile.focusPage(b),this._releaseTransitionLock(),this._triggerWithDeprecated("transition",g),this._triggerWithDeprecated("change",g)},this))}},_findBaseWithDefault:function(){var b=this.activePage&&a.mobile.getClosestBaseUrl(this.activePage);return b||a.mobile.path.documentBase.hrefNoHash}}),a.mobile.navreadyDeferred=a.Deferred();var e=[],f=!1}(a),function(a,d){function e(a){for(;a&&("string"!=typeof a.nodeName||"a"!==a.nodeName.toLowerCase());)a=a.parentNode;return a}var f=a.Deferred(),g=a.Deferred(),h=function(){g.resolve(),g=null},i=a.mobile.path.documentUrl,j=null;a.mobile.loadPage=function(b,c){var d;return c=c||{},d=c.pageContainer||a.mobile.pageContainer,c.deferred=a.Deferred(),d.pagecontainer("load",b,c),c.deferred.promise()},a.mobile.back=function(){var c=b.navigator;this.phonegapNavigationEnabled&&c&&c.app&&c.app.backHistory?c.app.backHistory():a.mobile.pageContainer.pagecontainer("back")},a.mobile.focusPage=function(a){var b=a.find("[autofocus]"),c=a.find(".ui-title:eq(0)");return b.length?void b.focus():void(c.length?c.focus():a.focus())},a.mobile._maybeDegradeTransition=a.mobile._maybeDegradeTransition||function(a){return a},a.mobile.changePage=function(b,c){a.mobile.pageContainer.pagecontainer("change",b,c)},a.mobile.changePage.defaults={transition:d,reverse:!1,changeHash:!0,fromHashChange:!1,role:d,duplicateCachedPage:d,pageContainer:d,showLoadMsg:!0,dataUrl:d,fromPage:d,allowSamePageTransition:!1},a.mobile._registerInternalEvents=function(){var c=function(b,c){var d,e,f,g,h=!0;return!a.mobile.ajaxEnabled||b.is(":jqmData(ajax='false')")||!b.jqmHijackable().length||b.attr("target")?!1:(d=j&&j.attr("formaction")||b.attr("action"),g=(b.attr("method")||"get").toLowerCase(),d||(d=a.mobile.getClosestBaseUrl(b),"get"===g&&(d=a.mobile.path.parseUrl(d).hrefNoSearch),d===a.mobile.path.documentBase.hrefNoHash&&(d=i.hrefNoSearch)),d=a.mobile.path.makeUrlAbsolute(d,a.mobile.getClosestBaseUrl(b)),a.mobile.path.isExternal(d)&&!a.mobile.path.isPermittedCrossDomainRequest(i,d)?!1:(c||(e=b.serializeArray(),j&&j[0].form===b[0]&&(f=j.attr("name"),f&&(a.each(e,function(a,b){return b.name===f?(f="",!1):void 0}),f&&e.push({name:f,value:j.attr("value")}))),h={url:d,options:{type:g,data:a.param(e),transition:b.jqmData("transition"),reverse:"reverse"===b.jqmData("direction"),reloadPage:!0}}),h))};a.mobile.document.delegate("form","submit",function(b){var d;b.isDefaultPrevented()||(d=c(a(this)),d&&(a.mobile.changePage(d.url,d.options),b.preventDefault()))}),a.mobile.document.bind("vclick",function(b){var d,f,g=b.target,h=!1;if(!(b.which>1)&&a.mobile.linkBindingEnabled){if(j=a(g),a.data(g,"mobile-button")){if(!c(a(g).closest("form"),!0))return;g.parentNode&&(g=g.parentNode)}else{if(g=e(g),!g||"#"===a.mobile.path.parseUrl(g.getAttribute("href")||"#").hash)return;if(!a(g).jqmHijackable().length)return}~g.className.indexOf("ui-link-inherit")?g.parentNode&&(f=a.data(g.parentNode,"buttonElements")):f=a.data(g,"buttonElements"),f?g=f.outer:h=!0,d=a(g),h&&(d=d.closest(".ui-btn")),d.length>0&&!d.hasClass("ui-state-disabled")&&(a.mobile.removeActiveLinkClass(!0),a.mobile.activeClickedLink=d,a.mobile.activeClickedLink.addClass(a.mobile.activeBtnClass))}}),a.mobile.document.bind("click",function(c){if(a.mobile.linkBindingEnabled&&!c.isDefaultPrevented()){var f,g,h,j,k,l,m,n=e(c.target),o=a(n),p=function(){b.setTimeout(function(){a.mobile.removeActiveLinkClass(!0)},200)};if(a.mobile.activeClickedLink&&a.mobile.activeClickedLink[0]===c.target.parentNode&&p(),n&&!(c.which>1)&&o.jqmHijackable().length){if(o.is(":jqmData(rel='back')"))return a.mobile.back(),!1;if(f=a.mobile.getClosestBaseUrl(o),g=a.mobile.path.makeUrlAbsolute(o.attr("href")||"#",f),!a.mobile.ajaxEnabled&&!a.mobile.path.isEmbeddedPage(g))return void p();if(-1!==g.search("#")){if(g=g.replace(/[^#]*#/,""),!g)return void c.preventDefault();g=a.mobile.path.isPath(g)?a.mobile.path.makeUrlAbsolute(g,f):a.mobile.path.makeUrlAbsolute("#"+g,i.hrefNoHash)}if(h=o.is("[rel='external']")||o.is(":jqmData(ajax='false')")||o.is("[target]"),j=h||a.mobile.path.isExternal(g)&&!a.mobile.path.isPermittedCrossDomainRequest(i,g))return void p();k=o.jqmData("transition"),l="reverse"===o.jqmData("direction")||o.jqmData("back"),m=o.attr("data-"+a.mobile.ns+"rel")||d,a.mobile.changePage(g,{transition:k,reverse:l,role:m,link:o}),c.preventDefault()}}}),a.mobile.document.delegate(".ui-page","pageshow.prefetch",function(){var b=[];a(this).find("a:jqmData(prefetch)").each(function(){var c=a(this),d=c.attr("href");d&&-1===a.inArray(d,b)&&(b.push(d),a.mobile.loadPage(d,{role:c.attr("data-"+a.mobile.ns+"rel"),prefetch:!0}))})}),a.mobile.pageContainer.pagecontainer(),a.mobile.document.bind("pageshow",function(){g?g.done(a.mobile.resetActivePageHeight):a.mobile.resetActivePageHeight()}),a.mobile.window.bind("throttledresize",a.mobile.resetActivePageHeight)},a(function(){f.resolve()}),"complete"===c.readyState?h():a.mobile.window.load(h),a.when(f,a.mobile.navreadyDeferred).done(function(){a.mobile._registerInternalEvents()})}(a),function(a,b){a.mobile.Transition=function(){this.init.apply(this,arguments)
+},a.extend(a.mobile.Transition.prototype,{toPreClass:" ui-page-pre-in",init:function(b,c,d,e){a.extend(this,{name:b,reverse:c,$to:d,$from:e,deferred:new a.Deferred})},cleanFrom:function(){this.$from.removeClass(a.mobile.activePageClass+" out in reverse "+this.name).height("")},beforeDoneIn:function(){},beforeDoneOut:function(){},beforeStartOut:function(){},doneIn:function(){this.beforeDoneIn(),this.$to.removeClass("out in reverse "+this.name).height(""),this.toggleViewportClass(),a.mobile.window.scrollTop()!==this.toScroll&&this.scrollPage(),this.sequential||this.$to.addClass(a.mobile.activePageClass),this.deferred.resolve(this.name,this.reverse,this.$to,this.$from,!0)},doneOut:function(a,b,c,d){this.beforeDoneOut(),this.startIn(a,b,c,d)},hideIn:function(a){this.$to.css("z-index",-10),a.call(this),this.$to.css("z-index","")},scrollPage:function(){a.event.special.scrollstart.enabled=!1,(a.mobile.hideUrlBar||this.toScroll!==a.mobile.defaultHomeScroll)&&b.scrollTo(0,this.toScroll),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},startIn:function(b,c,d,e){this.hideIn(function(){this.$to.addClass(a.mobile.activePageClass+this.toPreClass),e||a.mobile.focusPage(this.$to),this.$to.height(b+this.toScroll),d||this.scrollPage()}),this.$to.removeClass(this.toPreClass).addClass(this.name+" in "+c),d?this.doneIn():this.$to.animationComplete(a.proxy(function(){this.doneIn()},this))},startOut:function(b,c,d){this.beforeStartOut(b,c,d),this.$from.height(b+a.mobile.window.scrollTop()).addClass(this.name+" out"+c)},toggleViewportClass:function(){a.mobile.pageContainer.toggleClass("ui-mobile-viewport-transitioning viewport-"+this.name)},transition:function(){var b,c=this.reverse?" reverse":"",d=a.mobile.getScreenHeight(),e=a.mobile.maxTransitionWidth!==!1&&a.mobile.window.width()>a.mobile.maxTransitionWidth;return this.toScroll=a.mobile.navigate.history.getActive().lastScroll||a.mobile.defaultHomeScroll,b=!a.support.cssTransitions||!a.support.cssAnimations||e||!this.name||"none"===this.name||Math.max(a.mobile.window.scrollTop(),this.toScroll)>a.mobile.getMaxScrollForTransition(),this.toggleViewportClass(),this.$from&&!b?this.startOut(d,c,b):this.doneOut(d,c,b,!0),this.deferred.promise()}})}(a,this),function(a){a.mobile.SerialTransition=function(){this.init.apply(this,arguments)},a.extend(a.mobile.SerialTransition.prototype,a.mobile.Transition.prototype,{sequential:!0,beforeDoneOut:function(){this.$from&&this.cleanFrom()},beforeStartOut:function(b,c,d){this.$from.animationComplete(a.proxy(function(){this.doneOut(b,c,d)},this))}})}(a),function(a){a.mobile.ConcurrentTransition=function(){this.init.apply(this,arguments)},a.extend(a.mobile.ConcurrentTransition.prototype,a.mobile.Transition.prototype,{sequential:!1,beforeDoneIn:function(){this.$from&&this.cleanFrom()},beforeStartOut:function(a,b,c){this.doneOut(a,b,c)}})}(a),function(a){var b=function(){return 3*a.mobile.getScreenHeight()};a.mobile.transitionHandlers={sequential:a.mobile.SerialTransition,simultaneous:a.mobile.ConcurrentTransition},a.mobile.defaultTransitionHandler=a.mobile.transitionHandlers.sequential,a.mobile.transitionFallbacks={},a.mobile._maybeDegradeTransition=function(b){return b&&!a.support.cssTransform3d&&a.mobile.transitionFallbacks[b]&&(b=a.mobile.transitionFallbacks[b]),b},a.mobile.getMaxScrollForTransition=a.mobile.getMaxScrollForTransition||b}(a),function(a){a.mobile.transitionFallbacks.flip="fade"}(a,this),function(a){a.mobile.transitionFallbacks.flow="fade"}(a,this),function(a){a.mobile.transitionFallbacks.pop="fade"}(a,this),function(a){a.mobile.transitionHandlers.slide=a.mobile.transitionHandlers.simultaneous,a.mobile.transitionFallbacks.slide="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slidedown="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slidefade="fade"}(a,this),function(a){a.mobile.transitionFallbacks.slideup="fade"}(a,this),function(a){a.mobile.transitionFallbacks.turn="fade"}(a,this),function(a){a.mobile.degradeInputs={color:!1,date:!1,datetime:!1,"datetime-local":!1,email:!1,month:!1,number:!1,range:"number",search:"text",tel:!1,time:!1,url:!1,week:!1},a.mobile.page.prototype.options.degradeInputs=a.mobile.degradeInputs,a.mobile.degradeInputsWithin=function(b){b=a(b),b.find("input").not(a.mobile.page.prototype.keepNativeSelector()).each(function(){var b,c,d,e,f=a(this),g=this.getAttribute("type"),h=a.mobile.degradeInputs[g]||"text";a.mobile.degradeInputs[g]&&(b=a("<div>").html(f.clone()).html(),c=b.indexOf(" type=")>-1,d=c?/\s+type=["']?\w+['"]?/:/\/?>/,e=' type="'+h+'" data-'+a.mobile.ns+'type="'+g+'"'+(c?"":">"),f.replaceWith(b.replace(d,e)))})}}(a),function(a,b,c){a.widget("mobile.page",a.mobile.page,{options:{closeBtn:"left",closeBtnText:"Close",overlayTheme:"a",corners:!0,dialog:!1},_create:function(){this._super(),this.options.dialog&&(a.extend(this,{_inner:this.element.children(),_headerCloseButton:null}),this.options.enhanced||this._setCloseBtn(this.options.closeBtn))},_enhance:function(){this._super(),this.options.dialog&&this.element.addClass("ui-dialog").wrapInner(a("<div/>",{role:"dialog","class":"ui-dialog-contain ui-overlay-shadow"+(this.options.corners?" ui-corner-all":"")}))},_setOptions:function(b){var d,e,f=this.options;b.corners!==c&&this._inner.toggleClass("ui-corner-all",!!b.corners),b.overlayTheme!==c&&a.mobile.activePage[0]===this.element[0]&&(f.overlayTheme=b.overlayTheme,this._handlePageBeforeShow()),b.closeBtnText!==c&&(d=f.closeBtn,e=b.closeBtnText),b.closeBtn!==c&&(d=b.closeBtn),d&&this._setCloseBtn(d,e),this._super(b)},_handlePageBeforeShow:function(){this.options.overlayTheme&&this.options.dialog?(this.removeContainerBackground(),this.setContainerBackground(this.options.overlayTheme)):this._super()},_setCloseBtn:function(b,c){var d,e=this._headerCloseButton;b="left"===b?"left":"right"===b?"right":"none","none"===b?e&&(e.remove(),e=null):e?(e.removeClass("ui-btn-left ui-btn-right").addClass("ui-btn-"+b),c&&e.text(c)):(d=this._inner.find(":jqmData(role='header')").first(),e=a("<a></a>",{href:"#","class":"ui-btn ui-corner-all ui-icon-delete ui-btn-icon-notext ui-btn-"+b}).attr("data-"+a.mobile.ns+"rel","back").text(c||this.options.closeBtnText||"").prependTo(d)),this._headerCloseButton=e}})}(a,this),function(a,b,c){a.widget("mobile.dialog",{options:{closeBtn:"left",closeBtnText:"Close",overlayTheme:"a",corners:!0},_handlePageBeforeShow:function(){this._isCloseable=!0,this.options.overlayTheme&&this.element.page("removeContainerBackground").page("setContainerBackground",this.options.overlayTheme)},_handlePageBeforeHide:function(){this._isCloseable=!1},_handleVClickSubmit:function(b){var c,d=a(b.target).closest("vclick"===b.type?"a":"form");d.length&&!d.jqmData("transition")&&(c={},c["data-"+a.mobile.ns+"transition"]=(a.mobile.navigate.history.getActive()||{}).transition||a.mobile.defaultDialogTransition,c["data-"+a.mobile.ns+"direction"]="reverse",d.attr(c))},_create:function(){var b=this.element,c=this.options;b.addClass("ui-dialog").wrapInner(a("<div/>",{role:"dialog","class":"ui-dialog-contain ui-overlay-shadow"+(c.corners?" ui-corner-all":"")})),a.extend(this,{_isCloseable:!1,_inner:b.children(),_headerCloseButton:null}),this._on(b,{vclick:"_handleVClickSubmit",submit:"_handleVClickSubmit",pagebeforeshow:"_handlePageBeforeShow",pagebeforehide:"_handlePageBeforeHide"}),this._setCloseBtn(c.closeBtn)},_setOptions:function(b){var d,e,f=this.options;b.corners!==c&&this._inner.toggleClass("ui-corner-all",!!b.corners),b.overlayTheme!==c&&a.mobile.activePage[0]===this.element[0]&&(f.overlayTheme=b.overlayTheme,this._handlePageBeforeShow()),b.closeBtnText!==c&&(d=f.closeBtn,e=b.closeBtnText),b.closeBtn!==c&&(d=b.closeBtn),d&&this._setCloseBtn(d,e),this._super(b)},_setCloseBtn:function(b,c){var d,e=this._headerCloseButton;b="left"===b?"left":"right"===b?"right":"none","none"===b?e&&(e.remove(),e=null):e?(e.removeClass("ui-btn-left ui-btn-right").addClass("ui-btn-"+b),c&&e.text(c)):(d=this._inner.find(":jqmData(role='header')").first(),e=a("<a></a>",{role:"button",href:"#","class":"ui-btn ui-corner-all ui-icon-delete ui-btn-icon-notext ui-btn-"+b}).text(c||this.options.closeBtnText||"").prependTo(d),this._on(e,{click:"close"})),this._headerCloseButton=e},close:function(){var b=a.mobile.navigate.history;this._isCloseable&&(this._isCloseable=!1,a.mobile.hashListeningEnabled&&b.activeIndex>0?a.mobile.back():a.mobile.pageContainer.pagecontainer("back"))}})}(a,this),function(a,b){var c=/([A-Z])/g,d=function(a){return"ui-btn-icon-"+(null===a?"left":a)};a.widget("mobile.collapsible",{options:{enhanced:!1,expandCueText:null,collapseCueText:null,collapsed:!0,heading:"h1,h2,h3,h4,h5,h6,legend",collapsedIcon:null,expandedIcon:null,iconpos:null,theme:null,contentTheme:null,inset:null,corners:null,mini:null},_create:function(){var b=this.element,c={accordion:b.closest(":jqmData(role='collapsible-set'),:jqmData(role='collapsibleset')"+(a.mobile.collapsibleset?", :mobile-collapsibleset":"")).addClass("ui-collapsible-set")};this._ui=c,this._renderedOptions=this._getOptions(this.options),this.options.enhanced?(c.heading=a(".ui-collapsible-heading",this.element[0]),c.content=c.heading.next(),c.anchor=a("a",c.heading[0]).first(),c.status=c.anchor.children(".ui-collapsible-heading-status")):this._enhance(b,c),this._on(c.heading,{tap:function(){c.heading.find("a").first().addClass(a.mobile.activeBtnClass)},click:function(a){this._handleExpandCollapse(!c.heading.hasClass("ui-collapsible-heading-collapsed")),a.preventDefault(),a.stopPropagation()}})},_getOptions:function(b){var d,e=this._ui.accordion,f=this._ui.accordionWidget;b=a.extend({},b),e.length&&!f&&(this._ui.accordionWidget=f=e.data("mobile-collapsibleset"));for(d in b)b[d]=null!=b[d]?b[d]:f?f.options[d]:e.length?a.mobile.getAttribute(e[0],d.replace(c,"-$1").toLowerCase()):null,null==b[d]&&(b[d]=a.mobile.collapsible.defaults[d]);return b},_themeClassFromOption:function(a,b){return b?"none"===b?"":a+b:""},_enhance:function(b,c){var e,f=this._renderedOptions,g=this._themeClassFromOption("ui-body-",f.contentTheme);return b.addClass("ui-collapsible "+(f.inset?"ui-collapsible-inset ":"")+(f.inset&&f.corners?"ui-corner-all ":"")+(g?"ui-collapsible-themed-content ":"")),c.originalHeading=b.children(this.options.heading).first(),c.content=b.wrapInner("<div class='ui-collapsible-content "+g+"'></div>").children(".ui-collapsible-content"),c.heading=c.originalHeading,c.heading.is("legend")&&(c.heading=a("<div role='heading'>"+c.heading.html()+"</div>"),c.placeholder=a("<div><!-- placeholder for legend --></div>").insertBefore(c.originalHeading),c.originalHeading.remove()),e=f.collapsed?f.collapsedIcon?"ui-icon-"+f.collapsedIcon:"":f.expandedIcon?"ui-icon-"+f.expandedIcon:"",c.status=a("<span class='ui-collapsible-heading-status'></span>"),c.anchor=c.heading.detach().addClass("ui-collapsible-heading").append(c.status).wrapInner("<a href='#' class='ui-collapsible-heading-toggle'></a>").find("a").first().addClass("ui-btn "+(e?e+" ":"")+(e?d(f.iconpos)+" ":"")+this._themeClassFromOption("ui-btn-",f.theme)+" "+(f.mini?"ui-mini ":"")),c.heading.insertBefore(c.content),this._handleExpandCollapse(this.options.collapsed),c},refresh:function(){this._applyOptions(this.options),this._renderedOptions=this._getOptions(this.options)},_applyOptions:function(a){var c,e,f,g,h,i=this.element,j=this._renderedOptions,k=this._ui,l=k.anchor,m=k.status,n=this._getOptions(a);a.collapsed!==b&&this._handleExpandCollapse(a.collapsed),c=i.hasClass("ui-collapsible-collapsed"),c?n.expandCueText!==b&&m.text(n.expandCueText):n.collapseCueText!==b&&m.text(n.collapseCueText),h=n.collapsedIcon!==b?n.collapsedIcon!==!1:j.collapsedIcon!==!1,(n.iconpos!==b||n.collapsedIcon!==b||n.expandedIcon!==b)&&(l.removeClass([d(j.iconpos)].concat(j.expandedIcon?["ui-icon-"+j.expandedIcon]:[]).concat(j.collapsedIcon?["ui-icon-"+j.collapsedIcon]:[]).join(" ")),h&&l.addClass([d(n.iconpos!==b?n.iconpos:j.iconpos)].concat(c?["ui-icon-"+(n.collapsedIcon!==b?n.collapsedIcon:j.collapsedIcon)]:["ui-icon-"+(n.expandedIcon!==b?n.expandedIcon:j.expandedIcon)]).join(" "))),n.theme!==b&&(f=this._themeClassFromOption("ui-btn-",j.theme),e=this._themeClassFromOption("ui-btn-",n.theme),l.removeClass(f).addClass(e)),n.contentTheme!==b&&(f=this._themeClassFromOption("ui-body-",j.contentTheme),e=this._themeClassFromOption("ui-body-",n.contentTheme),k.content.removeClass(f).addClass(e)),n.inset!==b&&(i.toggleClass("ui-collapsible-inset",n.inset),g=!(!n.inset||!n.corners&&!j.corners)),n.corners!==b&&(g=!(!n.corners||!n.inset&&!j.inset)),g!==b&&i.toggleClass("ui-corner-all",g),n.mini!==b&&l.toggleClass("ui-mini",n.mini)},_setOptions:function(a){this._applyOptions(a),this._super(a),this._renderedOptions=this._getOptions(this.options)},_handleExpandCollapse:function(b){var c=this._renderedOptions,d=this._ui;d.status.text(b?c.expandCueText:c.collapseCueText),d.heading.toggleClass("ui-collapsible-heading-collapsed",b).find("a").first().toggleClass("ui-icon-"+c.expandedIcon,!b).toggleClass("ui-icon-"+c.collapsedIcon,b||c.expandedIcon===c.collapsedIcon).removeClass(a.mobile.activeBtnClass),this.element.toggleClass("ui-collapsible-collapsed",b),d.content.toggleClass("ui-collapsible-content-collapsed",b).attr("aria-hidden",b).trigger("updatelayout"),this.options.collapsed=b,this._trigger(b?"collapse":"expand")},expand:function(){this._handleExpandCollapse(!1)},collapse:function(){this._handleExpandCollapse(!0)},_destroy:function(){var a=this._ui,b=this.options;b.enhanced||(a.placeholder?(a.originalHeading.insertBefore(a.placeholder),a.placeholder.remove(),a.heading.remove()):(a.status.remove(),a.heading.removeClass("ui-collapsible-heading ui-collapsible-heading-collapsed").children().contents().unwrap()),a.anchor.contents().unwrap(),a.content.contents().unwrap(),this.element.removeClass("ui-collapsible ui-collapsible-collapsed ui-collapsible-themed-content ui-collapsible-inset ui-corner-all"))}}),a.mobile.collapsible.defaults={expandCueText:" click to expand contents",collapseCueText:" click to collapse contents",collapsedIcon:"plus",contentTheme:"inherit",expandedIcon:"minus",iconpos:"left",inset:!0,corners:!0,theme:"inherit",mini:!1}}(a),function(a){function b(b){var d,e=b.length,f=[];for(d=0;e>d;d++)b[d].className.match(c)||f.push(b[d]);return a(f)}var c=/\bui-screen-hidden\b/;a.mobile.behaviors.addFirstLastClasses={_getVisibles:function(a,c){var d;return c?d=b(a):(d=a.filter(":visible"),0===d.length&&(d=b(a))),d},_addFirstLastClasses:function(a,b,c){a.removeClass("ui-first-child ui-last-child"),b.eq(0).addClass("ui-first-child").end().last().addClass("ui-last-child"),c||this.element.trigger("updatelayout")},_removeFirstLastClasses:function(a){a.removeClass("ui-first-child ui-last-child")}}}(a),function(a,b){var c=":mobile-collapsible, "+a.mobile.collapsible.initSelector;a.widget("mobile.collapsibleset",a.extend({initSelector:":jqmData(role='collapsible-set'),:jqmData(role='collapsibleset')",options:a.extend({enhanced:!1},a.mobile.collapsible.defaults),_handleCollapsibleExpand:function(b){var c=a(b.target).closest(".ui-collapsible");c.parent().is(":mobile-collapsibleset, :jqmData(role='collapsible-set')")&&c.siblings(".ui-collapsible:not(.ui-collapsible-collapsed)").collapsible("collapse")},_create:function(){var b=this.element,c=this.options;a.extend(this,{_classes:""}),c.enhanced||(b.addClass("ui-collapsible-set "+this._themeClassFromOption("ui-group-theme-",c.theme)+" "+(c.corners&&c.inset?"ui-corner-all ":"")),this.element.find(a.mobile.collapsible.initSelector).collapsible()),this._on(b,{collapsibleexpand:"_handleCollapsibleExpand"})},_themeClassFromOption:function(a,b){return b?"none"===b?"":a+b:""},_init:function(){this._refresh(!0),this.element.children(c).filter(":jqmData(collapsed='false')").collapsible("expand")},_setOptions:function(a){var c,d,e=this.element,f=this._themeClassFromOption("ui-group-theme-",a.theme);return f&&e.removeClass(this._themeClassFromOption("ui-group-theme-",this.options.theme)).addClass(f),a.inset!==b&&(d=!(!a.inset||!a.corners&&!this.options.corners)),a.corners!==b&&(d=!(!a.corners||!a.inset&&!this.options.inset)),d!==b&&e.toggleClass("ui-corner-all",d),c=this._super(a),this.element.children(":mobile-collapsible").collapsible("refresh"),c},_destroy:function(){var a=this.element;this._removeFirstLastClasses(a.children(c)),a.removeClass("ui-collapsible-set ui-corner-all "+this._themeClassFromOption("ui-group-theme-",this.options.theme)).children(":mobile-collapsible").collapsible("destroy")},_refresh:function(b){var d=this.element.children(c);this.element.find(a.mobile.collapsible.initSelector).not(".ui-collapsible").collapsible(),this._addFirstLastClasses(d,this._getVisibles(d,b),b)},refresh:function(){this._refresh(!1)}},a.mobile.behaviors.addFirstLastClasses))}(a),function(a){a.fn.fieldcontain=function(){return this.addClass("ui-field-contain")}}(a),function(a){a.fn.grid=function(b){return this.each(function(){var c,d,e=a(this),f=a.extend({grid:null},b),g=e.children(),h={solo:1,a:2,b:3,c:4,d:5},i=f.grid;if(!i)if(g.length<=5)for(d in h)h[d]===g.length&&(i=d);else i="a",e.addClass("ui-grid-duo");c=h[i],e.addClass("ui-grid-"+i),g.filter(":nth-child("+c+"n+1)").addClass("ui-block-a"),c>1&&g.filter(":nth-child("+c+"n+2)").addClass("ui-block-b"),c>2&&g.filter(":nth-child("+c+"n+3)").addClass("ui-block-c"),c>3&&g.filter(":nth-child("+c+"n+4)").addClass("ui-block-d"),c>4&&g.filter(":nth-child("+c+"n+5)").addClass("ui-block-e")})}}(a),function(a,b){a.widget("mobile.navbar",{options:{iconpos:"top",grid:null},_create:function(){var d=this.element,e=d.find("a"),f=e.filter(":jqmData(icon)").length?this.options.iconpos:b;d.addClass("ui-navbar").attr("role","navigation").find("ul").jqmEnhanceable().grid({grid:this.options.grid}),e.each(function(){var b=a.mobile.getAttribute(this,"icon"),c=a.mobile.getAttribute(this,"theme"),d="ui-btn";c&&(d+=" ui-btn-"+c),b&&(d+=" ui-icon-"+b+" ui-btn-icon-"+f),a(this).addClass(d)}),d.delegate("a","vclick",function(){var b=a(this);b.hasClass("ui-state-disabled")||b.hasClass("ui-disabled")||b.hasClass(a.mobile.activeBtnClass)||(e.removeClass(a.mobile.activeBtnClass),b.addClass(a.mobile.activeBtnClass),a(c).one("pagehide",function(){b.removeClass(a.mobile.activeBtnClass)}))}),d.closest(".ui-page").bind("pagebeforeshow",function(){e.filter(".ui-state-persist").addClass(a.mobile.activeBtnClass)})}})}(a),function(a){var b=a.mobile.getAttribute;a.widget("mobile.listview",a.extend({options:{theme:null,countTheme:null,dividerTheme:null,icon:"carat-r",splitIcon:"carat-r",splitTheme:null,corners:!0,shadow:!0,inset:!1},_create:function(){var a=this,b="";b+=a.options.inset?" ui-listview-inset":"",a.options.inset&&(b+=a.options.corners?" ui-corner-all":"",b+=a.options.shadow?" ui-shadow":""),a.element.addClass(" ui-listview"+b),a.refresh(!0)},_findFirstElementByTagName:function(a,b,c,d){var e={};for(e[c]=e[d]=!0;a;){if(e[a.nodeName])return a;a=a[b]}return null},_addThumbClasses:function(b){var c,d,e=b.length;for(c=0;e>c;c++)d=a(this._findFirstElementByTagName(b[c].firstChild,"nextSibling","img","IMG")),d.length&&a(this._findFirstElementByTagName(d[0].parentNode,"parentNode","li","LI")).addClass(d.hasClass("ui-li-icon")?"ui-li-has-icon":"ui-li-has-thumb")},_getChildrenByTagName:function(b,c,d){var e=[],f={};for(f[c]=f[d]=!0,b=b.firstChild;b;)f[b.nodeName]&&e.push(b),b=b.nextSibling;return a(e)},_beforeListviewRefresh:a.noop,_afterListviewRefresh:a.noop,refresh:function(c){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x=this.options,y=this.element,z=!!a.nodeName(y[0],"ol"),A=y.attr("start"),B={},C=y.find(".ui-li-count"),D=b(y[0],"counttheme")||this.options.countTheme,E=D?"ui-body-"+D:"ui-body-inherit";for(x.theme&&y.addClass("ui-group-theme-"+x.theme),z&&(A||0===A)&&(n=parseInt(A,10)-1,y.css("counter-reset","listnumbering "+n)),this._beforeListviewRefresh(),w=this._getChildrenByTagName(y[0],"li","LI"),e=0,f=w.length;f>e;e++)g=w.eq(e),h="",(c||g[0].className.search(/\bui-li-static\b|\bui-li-divider\b/)<0)&&(l=this._getChildrenByTagName(g[0],"a","A"),m="list-divider"===b(g[0],"role"),p=g.attr("value"),i=b(g[0],"theme"),l.length&&l[0].className.search(/\bui-btn\b/)<0&&!m?(j=b(g[0],"icon"),k=j===!1?!1:j||x.icon,l.removeClass("ui-link"),d="ui-btn",i&&(d+=" ui-btn-"+i),l.length>1?(h="ui-li-has-alt",q=l.last(),r=b(q[0],"theme")||x.splitTheme||b(g[0],"theme",!0),s=r?" ui-btn-"+r:"",t=b(q[0],"icon")||b(g[0],"icon")||x.splitIcon,u="ui-btn ui-btn-icon-notext ui-icon-"+t+s,q.attr("title",a.trim(q.getEncodedText())).addClass(u).empty(),l=l.first()):k&&(d+=" ui-btn-icon-right ui-icon-"+k),l.addClass(d)):m?(v=b(g[0],"theme")||x.dividerTheme||x.theme,h="ui-li-divider ui-bar-"+(v?v:"inherit"),g.attr("role","heading")):l.length<=0&&(h="ui-li-static ui-body-"+(i?i:"inherit")),z&&p&&(o=parseInt(p,10)-1,g.css("counter-reset","listnumbering "+o))),B[h]||(B[h]=[]),B[h].push(g[0]);for(h in B)a(B[h]).addClass(h);C.each(function(){a(this).closest("li").addClass("ui-li-has-count")}),E&&C.not("[class*='ui-body-']").addClass(E),this._addThumbClasses(w),this._addThumbClasses(w.find(".ui-btn")),this._afterListviewRefresh(),this._addFirstLastClasses(w,this._getVisibles(w,c),c)}},a.mobile.behaviors.addFirstLastClasses))}(a),function(a){function b(b){var c=a.trim(b.text())||null;return c?c=c.slice(0,1).toUpperCase():null}a.widget("mobile.listview",a.mobile.listview,{options:{autodividers:!1,autodividersSelector:b},_beforeListviewRefresh:function(){this.options.autodividers&&(this._replaceDividers(),this._superApply(arguments))},_replaceDividers:function(){var b,d,e,f,g,h=null,i=this.element;for(i.children("li:jqmData(role='list-divider')").remove(),d=i.children("li"),b=0;b<d.length;b++)e=d[b],f=this.options.autodividersSelector(a(e)),f&&h!==f&&(g=c.createElement("li"),g.appendChild(c.createTextNode(f)),g.setAttribute("data-"+a.mobile.ns+"role","list-divider"),e.parentNode.insertBefore(g,e)),h=f}})}(a),function(a){var b=/(^|\s)ui-li-divider($|\s)/,c=/(^|\s)ui-screen-hidden($|\s)/;a.widget("mobile.listview",a.mobile.listview,{options:{hideDividers:!1},_afterListviewRefresh:function(){var a,d,e,f=!0;if(this._superApply(arguments),this.options.hideDividers)for(a=this._getChildrenByTagName(this.element[0],"li","LI"),d=a.length-1;d>-1;d--)e=a[d],e.className.match(b)?(f&&(e.className=e.className+" ui-screen-hidden"),f=!0):e.className.match(c)||(f=!1)}})}(a),function(a){a.mobile.nojs=function(b){a(":jqmData(role='nojs')",b).addClass("ui-nojs")}}(a),function(a){a.mobile.behaviors.formReset={_handleFormReset:function(){this._on(this.element.closest("form"),{reset:function(){this._delay("_reset")}})}}}(a),function(a,b){var c=a.mobile.path.hashToSelector;a.widget("mobile.checkboxradio",a.extend({initSelector:"input:not( :jqmData(role='flipswitch' ) )[type='checkbox'],input[type='radio']:not( :jqmData(role='flipswitch' ))",options:{theme:"inherit",mini:!1,wrapperClass:null,enhanced:!1,iconpos:"left"},_create:function(){var b=this.element,c=this.options,d=function(a,b){return a.jqmData(b)||a.closest("form, fieldset").jqmData(b)},e=this.options.enhanced?{element:this.element.siblings("label"),isParent:!1}:this._findLabel(),f=b[0].type,g="ui-"+f+"-on",h="ui-"+f+"-off";("checkbox"===f||"radio"===f)&&(this.element[0].disabled&&(this.options.disabled=!0),c.iconpos=d(b,"iconpos")||e.element.attr("data-"+a.mobile.ns+"iconpos")||c.iconpos,c.mini=d(b,"mini")||c.mini,a.extend(this,{input:b,label:e.element,labelIsParent:e.isParent,inputtype:f,checkedClass:g,uncheckedClass:h}),this.options.enhanced||this._enhance(),this._on(e.element,{vmouseover:"_handleLabelVMouseOver",vclick:"_handleLabelVClick"}),this._on(b,{vmousedown:"_cacheVals",vclick:"_handleInputVClick",focus:"_handleInputFocus",blur:"_handleInputBlur"}),this._handleFormReset(),this.refresh())},_findLabel:function(){var b,d,e,f=this.element,g=f[0].labels;return g&&g.length>0?(d=a(g[0]),e=a.contains(d[0],f[0])):(b=f.closest("label"),e=b.length>0,d=e?b:a(this.document[0].getElementsByTagName("label")).filter("[for='"+c(f[0].id)+"']").first()),{element:d,isParent:e}},_enhance:function(){this.label.addClass("ui-btn ui-corner-all"),this.labelIsParent?this.input.add(this.label).wrapAll(this._wrapper()):(this.element.wrap(this._wrapper()),this.element.parent().prepend(this.label)),this._setOptions({theme:this.options.theme,iconpos:this.options.iconpos,mini:this.options.mini})},_wrapper:function(){return a("<div class='"+(this.options.wrapperClass?this.options.wrapperClass:"")+" ui-"+this.inputtype+(this.options.disabled?" ui-state-disabled":"")+"' ></div>")},_handleInputFocus:function(){this.label.addClass(a.mobile.focusClass)},_handleInputBlur:function(){this.label.removeClass(a.mobile.focusClass)},_handleInputVClick:function(){this.element.prop("checked",this.element.is(":checked")),this._getInputSet().not(this.element).prop("checked",!1),this._updateAll(!0)},_handleLabelVMouseOver:function(a){this.label.parent().hasClass("ui-state-disabled")&&a.stopPropagation()},_handleLabelVClick:function(a){var b=this.element;return b.is(":disabled")?void a.preventDefault():(this._cacheVals(),b.prop("checked","radio"===this.inputtype&&!0||!b.prop("checked")),b.triggerHandler("click"),this._getInputSet().not(b).prop("checked",!1),this._updateAll(),!1)},_cacheVals:function(){this._getInputSet().each(function(){a(this).attr("data-"+a.mobile.ns+"cacheVal",this.checked)})},_getInputSet:function(){var b,d,e=this.element[0],f=e.name,g=e.form,h=this.element.parents().last().get(0),i=this.element;return f&&"radio"===this.inputtype&&h&&(b="input[type='radio'][name='"+c(f)+"']",g?(d=g.getAttribute("id"),d&&(i=a(b+"[form='"+c(d)+"']",h)),i=a(g).find(b).filter(function(){return this.form===g}).add(i)):i=a(b,h).filter(function(){return!this.form})),i},_updateAll:function(b){var c=this;this._getInputSet().each(function(){var d=a(this);!this.checked&&"checkbox"!==c.inputtype||b||d.trigger("change")}).checkboxradio("refresh")},_reset:function(){this.refresh()},_hasIcon:function(){var b,c,d=a.mobile.controlgroup;return d&&(b=this.element.closest(":mobile-controlgroup,"+d.prototype.initSelector),b.length>0)?(c=a.data(b[0],"mobile-controlgroup"),"horizontal"!==(c?c.options.type:b.attr("data-"+a.mobile.ns+"type"))):!0},refresh:function(){var b=this._hasIcon(),c=this.element[0].checked,d=a.mobile.activeBtnClass,e="ui-btn-icon-"+this.options.iconpos,f=[],g=[];b?(g.push(d),f.push(e)):(g.push(e),(c?f:g).push(d)),c?(f.push(this.checkedClass),g.push(this.uncheckedClass)):(f.push(this.uncheckedClass),g.push(this.checkedClass)),this.label.addClass(f.join(" ")).removeClass(g.join(" "))},widget:function(){return this.label.parent()},_setOptions:function(a){var c=this.label,d=this.options,e=this.widget(),f=this._hasIcon();a.disabled!==b&&(this.input.prop("disabled",!!a.disabled),e.toggleClass("ui-state-disabled",!!a.disabled)),a.mini!==b&&e.toggleClass("ui-mini",!!a.mini),a.theme!==b&&c.removeClass("ui-btn-"+d.theme).addClass("ui-btn-"+a.theme),a.wrapperClass!==b&&e.removeClass(d.wrapperClass).addClass(a.wrapperClass),a.iconpos!==b&&f?c.removeClass("ui-btn-icon-"+d.iconpos).addClass("ui-btn-icon-"+a.iconpos):f||c.removeClass("ui-btn-icon-"+d.iconpos),this._super(a)}},a.mobile.behaviors.formReset))}(a),function(a,b){a.widget("mobile.button",{initSelector:"input[type='button'], input[type='submit'], input[type='reset']",options:{theme:null,icon:null,iconpos:"left",iconshadow:!1,corners:!0,shadow:!0,inline:null,mini:null,wrapperClass:null,enhanced:!1},_create:function(){this.element.is(":disabled")&&(this.options.disabled=!0),this.options.enhanced||this._enhance(),a.extend(this,{wrapper:this.element.parent()}),this._on({focus:function(){this.widget().addClass(a.mobile.focusClass)},blur:function(){this.widget().removeClass(a.mobile.focusClass)}}),this.refresh(!0)},_enhance:function(){this.element.wrap(this._button())},_button:function(){var b=this.options,c=this._getIconClasses(this.options);return a("<div class='ui-btn ui-input-btn"+(b.wrapperClass?" "+b.wrapperClass:"")+(b.theme?" ui-btn-"+b.theme:"")+(b.corners?" ui-corner-all":"")+(b.shadow?" ui-shadow":"")+(b.inline?" ui-btn-inline":"")+(b.mini?" ui-mini":"")+(b.disabled?" ui-state-disabled":"")+(c?" "+c:"")+"' >"+this.element.val()+"</div>")},widget:function(){return this.wrapper},_destroy:function(){this.element.insertBefore(this.button),this.button.remove()},_getIconClasses:function(a){return a.icon?"ui-icon-"+a.icon+(a.iconshadow?" ui-shadow-icon":"")+" ui-btn-icon-"+a.iconpos:""},_setOptions:function(c){var d=this.widget();c.theme!==b&&d.removeClass(this.options.theme).addClass("ui-btn-"+c.theme),c.corners!==b&&d.toggleClass("ui-corner-all",c.corners),c.shadow!==b&&d.toggleClass("ui-shadow",c.shadow),c.inline!==b&&d.toggleClass("ui-btn-inline",c.inline),c.mini!==b&&d.toggleClass("ui-mini",c.mini),c.disabled!==b&&(this.element.prop("disabled",c.disabled),d.toggleClass("ui-state-disabled",c.disabled)),(c.icon!==b||c.iconshadow!==b||c.iconpos!==b)&&d.removeClass(this._getIconClasses(this.options)).addClass(this._getIconClasses(a.extend({},this.options,c))),this._super(c)},refresh:function(b){var c,d=this.element.prop("disabled");this.options.icon&&"notext"===this.options.iconpos&&this.element.attr("title")&&this.element.attr("title",this.element.val()),b||(c=this.element.detach(),a(this.wrapper).text(this.element.val()).append(c)),this.options.disabled!==d&&this._setOptions({disabled:d})}})}(a),function(a){var b=a("meta[name=viewport]"),c=b.attr("content"),d=c+",maximum-scale=1, user-scalable=no",e=c+",maximum-scale=10, user-scalable=yes",f=/(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test(c);a.mobile.zoom=a.extend({},{enabled:!f,locked:!1,disable:function(c){f||a.mobile.zoom.locked||(b.attr("content",d),a.mobile.zoom.enabled=!1,a.mobile.zoom.locked=c||!1)},enable:function(c){f||a.mobile.zoom.locked&&c!==!0||(b.attr("content",e),a.mobile.zoom.enabled=!0,a.mobile.zoom.locked=!1)},restore:function(){f||(b.attr("content",c),a.mobile.zoom.enabled=!0)}})}(a),function(a,b){a.widget("mobile.textinput",{initSelector:"input[type='text'],input[type='search'],:jqmData(type='search'),input[type='number'],:jqmData(type='number'),input[type='password'],input[type='email'],input[type='url'],input[type='tel'],textarea,input[type='time'],input[type='date'],input[type='month'],input[type='week'],input[type='datetime'],input[type='datetime-local'],input[type='color'],input:not([type]),input[type='file']",options:{theme:null,corners:!0,mini:!1,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,wrapperClass:"",enhanced:!1},_create:function(){var b=this.options,c=this.element.is("[type='search'], :jqmData(type='search')"),d="TEXTAREA"===this.element[0].tagName,e=this.element.is("[data-"+(a.mobile.ns||"")+"type='range']"),f=(this.element.is("input")||this.element.is("[data-"+(a.mobile.ns||"")+"type='search']"))&&!e;this.element.prop("disabled")&&(b.disabled=!0),a.extend(this,{classes:this._classesFromOptions(),isSearch:c,isTextarea:d,isRange:e,inputNeedsWrap:f}),this._autoCorrect(),b.enhanced||this._enhance(),this._on({focus:"_handleFocus",blur:"_handleBlur"})},refresh:function(){this.setOptions({disabled:this.element.is(":disabled")})},_enhance:function(){var a=[];this.isTextarea&&a.push("ui-input-text"),(this.isTextarea||this.isRange)&&a.push("ui-shadow-inset"),this.inputNeedsWrap?this.element.wrap(this._wrap()):a=a.concat(this.classes),this.element.addClass(a.join(" "))},widget:function(){return this.inputNeedsWrap?this.element.parent():this.element},_classesFromOptions:function(){var a=this.options,b=[];return b.push("ui-body-"+(null===a.theme?"inherit":a.theme)),a.corners&&b.push("ui-corner-all"),a.mini&&b.push("ui-mini"),a.disabled&&b.push("ui-state-disabled"),a.wrapperClass&&b.push(a.wrapperClass),b},_wrap:function(){return a("<div class='"+(this.isSearch?"ui-input-search ":"ui-input-text ")+this.classes.join(" ")+" ui-shadow-inset'></div>")},_autoCorrect:function(){"undefined"==typeof this.element[0].autocorrect||a.support.touchOverflow||(this.element[0].setAttribute("autocorrect","off"),this.element[0].setAttribute("autocomplete","off"))
+},_handleBlur:function(){this.widget().removeClass(a.mobile.focusClass),this.options.preventFocusZoom&&a.mobile.zoom.enable(!0)},_handleFocus:function(){this.options.preventFocusZoom&&a.mobile.zoom.disable(!0),this.widget().addClass(a.mobile.focusClass)},_setOptions:function(a){var c=this.widget();this._super(a),(a.disabled!==b||a.mini!==b||a.corners!==b||a.theme!==b||a.wrapperClass!==b)&&(c.removeClass(this.classes.join(" ")),this.classes=this._classesFromOptions(),c.addClass(this.classes.join(" "))),a.disabled!==b&&this.element.prop("disabled",!!a.disabled)},_destroy:function(){this.options.enhanced||(this.inputNeedsWrap&&this.element.unwrap(),this.element.removeClass("ui-input-text "+this.classes.join(" ")))}})}(a),function(a,d){a.widget("mobile.slider",a.extend({initSelector:"input[type='range'], :jqmData(type='range'), :jqmData(role='slider')",widgetEventPrefix:"slide",options:{theme:null,trackTheme:null,corners:!0,mini:!1,highlight:!1},_create:function(){var e,f,g,h,i,j,k,l,m,n,o=this,p=this.element,q=this.options.trackTheme||a.mobile.getAttribute(p[0],"theme"),r=q?" ui-bar-"+q:" ui-bar-inherit",s=this.options.corners||p.jqmData("corners")?" ui-corner-all":"",t=this.options.mini||p.jqmData("mini")?" ui-mini":"",u=p[0].nodeName.toLowerCase(),v="select"===u,w=p.parent().is(":jqmData(role='rangeslider')"),x=v?"ui-slider-switch":"",y=p.attr("id"),z=a("[for='"+y+"']"),A=z.attr("id")||y+"-label",B=v?0:parseFloat(p.attr("min")),C=v?p.find("option").length-1:parseFloat(p.attr("max")),D=b.parseFloat(p.attr("step")||1),E=c.createElement("a"),F=a(E),G=c.createElement("div"),H=a(G),I=this.options.highlight&&!v?function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass,a(b).prependTo(H)}():!1;if(z.attr("id",A),this.isToggleSwitch=v,E.setAttribute("href","#"),G.setAttribute("role","application"),G.className=[this.isToggleSwitch?"ui-slider ui-slider-track ui-shadow-inset ":"ui-slider-track ui-shadow-inset ",x,r,s,t].join(""),E.className="ui-slider-handle",G.appendChild(E),F.attr({role:"slider","aria-valuemin":B,"aria-valuemax":C,"aria-valuenow":this._value(),"aria-valuetext":this._value(),title:this._value(),"aria-labelledby":A}),a.extend(this,{slider:H,handle:F,control:p,type:u,step:D,max:C,min:B,valuebg:I,isRangeslider:w,dragging:!1,beforeStart:null,userModified:!1,mouseMoved:!1}),v){for(k=p.attr("tabindex"),k&&F.attr("tabindex",k),p.attr("tabindex","-1").focus(function(){a(this).blur(),F.focus()}),f=c.createElement("div"),f.className="ui-slider-inneroffset",g=0,h=G.childNodes.length;h>g;g++)f.appendChild(G.childNodes[g]);for(G.appendChild(f),F.addClass("ui-slider-handle-snapping"),e=p.find("option"),i=0,j=e.length;j>i;i++)l=i?"a":"b",m=i?" "+a.mobile.activeBtnClass:"",n=c.createElement("span"),n.className=["ui-slider-label ui-slider-label-",l,m].join(""),n.setAttribute("role","img"),n.appendChild(c.createTextNode(e[i].innerHTML)),a(n).prependTo(H);o._labels=a(".ui-slider-label",H)}p.addClass(v?"ui-slider-switch":"ui-slider-input"),this._on(p,{change:"_controlChange",keyup:"_controlKeyup",blur:"_controlBlur",vmouseup:"_controlVMouseUp"}),H.bind("vmousedown",a.proxy(this._sliderVMouseDown,this)).bind("vclick",!1),this._on(c,{vmousemove:"_preventDocumentDrag"}),this._on(H.add(c),{vmouseup:"_sliderVMouseUp"}),H.insertAfter(p),v||w||(f=this.options.mini?"<div class='ui-slider ui-mini'>":"<div class='ui-slider'>",p.add(H).wrapAll(f)),this._on(this.handle,{vmousedown:"_handleVMouseDown",keydown:"_handleKeydown",keyup:"_handleKeyup"}),this.handle.bind("vclick",!1),this._handleFormReset(),this.refresh(d,d,!0)},_setOptions:function(a){a.theme!==d&&this._setTheme(a.theme),a.trackTheme!==d&&this._setTrackTheme(a.trackTheme),a.corners!==d&&this._setCorners(a.corners),a.mini!==d&&this._setMini(a.mini),a.highlight!==d&&this._setHighlight(a.highlight),a.disabled!==d&&this._setDisabled(a.disabled),this._super(a)},_controlChange:function(a){return this._trigger("controlchange",a)===!1?!1:void(this.mouseMoved||this.refresh(this._value(),!0))},_controlKeyup:function(){this.refresh(this._value(),!0,!0)},_controlBlur:function(){this.refresh(this._value(),!0)},_controlVMouseUp:function(){this._checkedRefresh()},_handleVMouseDown:function(){this.handle.focus()},_handleKeydown:function(b){var c=this._value();if(!this.options.disabled){switch(b.keyCode){case a.mobile.keyCode.HOME:case a.mobile.keyCode.END:case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:b.preventDefault(),this._keySliding||(this._keySliding=!0,this.handle.addClass("ui-state-active"))}switch(b.keyCode){case a.mobile.keyCode.HOME:this.refresh(this.min);break;case a.mobile.keyCode.END:this.refresh(this.max);break;case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:this.refresh(c+this.step);break;case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:this.refresh(c-this.step)}}},_handleKeyup:function(){this._keySliding&&(this._keySliding=!1,this.handle.removeClass("ui-state-active"))},_sliderVMouseDown:function(a){return this.options.disabled||1!==a.which&&0!==a.which&&a.which!==d?!1:this._trigger("beforestart",a)===!1?!1:(this.dragging=!0,this.userModified=!1,this.mouseMoved=!1,this.isToggleSwitch&&(this.beforeStart=this.element[0].selectedIndex),this.refresh(a),this._trigger("start"),!1)},_sliderVMouseUp:function(){return this.dragging?(this.dragging=!1,this.isToggleSwitch&&(this.handle.addClass("ui-slider-handle-snapping"),this.refresh(this.mouseMoved?this.userModified?0===this.beforeStart?1:0:this.beforeStart:0===this.beforeStart?1:0)),this.mouseMoved=!1,this._trigger("stop"),!1):void 0},_preventDocumentDrag:function(a){return this._trigger("drag",a)===!1?!1:this.dragging&&!this.options.disabled?(this.mouseMoved=!0,this.isToggleSwitch&&this.handle.removeClass("ui-slider-handle-snapping"),this.refresh(a),this.userModified=this.beforeStart!==this.element[0].selectedIndex,!1):void 0},_checkedRefresh:function(){this.value!==this._value()&&this.refresh(this._value())},_value:function(){return this.isToggleSwitch?this.element[0].selectedIndex:parseFloat(this.element.val())},_reset:function(){this.refresh(d,!1,!0)},refresh:function(b,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z=this,A=a.mobile.getAttribute(this.element[0],"theme"),B=this.options.theme||A,C=B?" ui-btn-"+B:"",D=this.options.trackTheme||A,E=D?" ui-bar-"+D:" ui-bar-inherit",F=this.options.corners?" ui-corner-all":"",G=this.options.mini?" ui-mini":"";if(z.slider[0].className=[this.isToggleSwitch?"ui-slider ui-slider-switch ui-slider-track ui-shadow-inset":"ui-slider-track ui-shadow-inset",E,F,G].join(""),(this.options.disabled||this.element.prop("disabled"))&&this.disable(),this.value=this._value(),this.options.highlight&&!this.isToggleSwitch&&0===this.slider.find(".ui-slider-bg").length&&(this.valuebg=function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass,a(b).prependTo(z.slider)}()),this.handle.addClass("ui-btn"+C+" ui-shadow"),l=this.element,m=!this.isToggleSwitch,n=m?[]:l.find("option"),o=m?parseFloat(l.attr("min")):0,p=m?parseFloat(l.attr("max")):n.length-1,q=m&&parseFloat(l.attr("step"))>0?parseFloat(l.attr("step")):1,"object"==typeof b){if(h=b,i=8,f=this.slider.offset().left,g=this.slider.width(),j=g/((p-o)/q),!this.dragging||h.pageX<f-i||h.pageX>f+g+i)return;k=j>1?(h.pageX-f)/g*100:Math.round((h.pageX-f)/g*100)}else null==b&&(b=m?parseFloat(l.val()||0):l[0].selectedIndex),k=(parseFloat(b)-o)/(p-o)*100;if(!isNaN(k)&&(r=k/100*(p-o)+o,s=(r-o)%q,t=r-s,2*Math.abs(s)>=q&&(t+=s>0?q:-q),u=100/((p-o)/q),r=parseFloat(t.toFixed(5)),"undefined"==typeof j&&(j=g/((p-o)/q)),j>1&&m&&(k=(r-o)*u*(1/q)),0>k&&(k=0),k>100&&(k=100),o>r&&(r=o),r>p&&(r=p),this.handle.css("left",k+"%"),this.handle[0].setAttribute("aria-valuenow",m?r:n.eq(r).attr("value")),this.handle[0].setAttribute("aria-valuetext",m?r:n.eq(r).getEncodedText()),this.handle[0].setAttribute("title",m?r:n.eq(r).getEncodedText()),this.valuebg&&this.valuebg.css("width",k+"%"),this._labels&&(v=this.handle.width()/this.slider.width()*100,w=k&&v+(100-v)*k/100,x=100===k?0:Math.min(v+100-w,100),this._labels.each(function(){var b=a(this).hasClass("ui-slider-label-a");a(this).width((b?w:x)+"%")})),!e)){if(y=!1,m?(y=l.val()!==r,l.val(r)):(y=l[0].selectedIndex!==r,l[0].selectedIndex=r),this._trigger("beforechange",b)===!1)return!1;!d&&y&&l.trigger("change")}},_setHighlight:function(a){a=!!a,a?(this.options.highlight=!!a,this.refresh()):this.valuebg&&(this.valuebg.remove(),this.valuebg=!1)},_setTheme:function(a){this.handle.removeClass("ui-btn-"+this.options.theme).addClass("ui-btn-"+a);var b=this.options.theme?this.options.theme:"inherit",c=a?a:"inherit";this.control.removeClass("ui-body-"+b).addClass("ui-body-"+c)},_setTrackTheme:function(a){var b=this.options.trackTheme?this.options.trackTheme:"inherit",c=a?a:"inherit";this.slider.removeClass("ui-body-"+b).addClass("ui-body-"+c)},_setMini:function(a){a=!!a,this.isToggleSwitch||this.isRangeslider||(this.slider.parent().toggleClass("ui-mini",a),this.element.toggleClass("ui-mini",a)),this.slider.toggleClass("ui-mini",a)},_setCorners:function(a){this.slider.toggleClass("ui-corner-all",a),this.isToggleSwitch||this.control.toggleClass("ui-corner-all",a)},_setDisabled:function(a){a=!!a,this.element.prop("disabled",a),this.slider.toggleClass("ui-state-disabled",a).attr("aria-disabled",a)}},a.mobile.behaviors.formReset))}(a),function(a){function b(){return c||(c=a("<div></div>",{"class":"ui-slider-popup ui-shadow ui-corner-all"})),c.clone()}var c;a.widget("mobile.slider",a.mobile.slider,{options:{popupEnabled:!1,showValue:!1},_create:function(){this._super(),a.extend(this,{_currentValue:null,_popup:null,_popupVisible:!1}),this._setOption("popupEnabled",this.options.popupEnabled),this._on(this.handle,{vmousedown:"_showPopup"}),this._on(this.slider.add(this.document),{vmouseup:"_hidePopup"}),this._refresh()},_positionPopup:function(){var a=this.handle.offset();this._popup.offset({left:a.left+(this.handle.width()-this._popup.width())/2,top:a.top-this._popup.outerHeight()-5})},_setOption:function(a,c){this._super(a,c),"showValue"===a?this.handle.html(c&&!this.options.mini?this._value():""):"popupEnabled"===a&&c&&!this._popup&&(this._popup=b().addClass("ui-body-"+(this.options.theme||"a")).hide().insertBefore(this.element))},refresh:function(){this._super.apply(this,arguments),this._refresh()},_refresh:function(){var a,b=this.options;b.popupEnabled&&this.handle.removeAttr("title"),a=this._value(),a!==this._currentValue&&(this._currentValue=a,b.popupEnabled&&this._popup&&(this._positionPopup(),this._popup.html(a)),b.showValue&&!this.options.mini&&this.handle.html(a))},_showPopup:function(){this.options.popupEnabled&&!this._popupVisible&&(this.handle.html(""),this._popup.show(),this._positionPopup(),this._popupVisible=!0)},_hidePopup:function(){var a=this.options;a.popupEnabled&&this._popupVisible&&(a.showValue&&!a.mini&&this.handle.html(this._value()),this._popup.hide(),this._popupVisible=!1)}})}(a),function(a,b){a.widget("mobile.flipswitch",a.extend({options:{onText:"On",offText:"Off",theme:null,enhanced:!1,wrapperClass:null,corners:!0,mini:!1},_create:function(){this.options.enhanced?a.extend(this,{flipswitch:this.element.parent(),on:this.element.find(".ui-flipswitch-on").eq(0),off:this.element.find(".ui-flipswitch-off").eq(0),type:this.element.get(0).tagName}):this._enhance(),this._handleFormReset(),this._originalTabIndex=this.element.attr("tabindex"),null!=this._originalTabIndex&&this.on.attr("tabindex",this._originalTabIndex),this.element.attr("tabindex","-1"),this._on({focus:"_handleInputFocus"}),this.element.is(":disabled")&&this._setOptions({disabled:!0}),this._on(this.flipswitch,{click:"_toggle",swipeleft:"_left",swiperight:"_right"}),this._on(this.on,{keydown:"_keydown"}),this._on({change:"refresh"})},_handleInputFocus:function(){this.on.focus()},widget:function(){return this.flipswitch},_left:function(){this.flipswitch.removeClass("ui-flipswitch-active"),"SELECT"===this.type?this.element.get(0).selectedIndex=0:this.element.prop("checked",!1),this.element.trigger("change")},_right:function(){this.flipswitch.addClass("ui-flipswitch-active"),"SELECT"===this.type?this.element.get(0).selectedIndex=1:this.element.prop("checked",!0),this.element.trigger("change")},_enhance:function(){var b=a("<div>"),c=this.options,d=this.element,e=c.theme?c.theme:"inherit",f=a("<a></a>",{href:"#"}),g=a("<span></span>"),h=d.get(0).tagName,i="INPUT"===h?c.onText:d.find("option").eq(1).text(),j="INPUT"===h?c.offText:d.find("option").eq(0).text();f.addClass("ui-flipswitch-on ui-btn ui-shadow ui-btn-inherit").text(i),g.addClass("ui-flipswitch-off").text(j),b.addClass("ui-flipswitch ui-shadow-inset ui-bar-"+e+" "+(c.wrapperClass?c.wrapperClass:"")+" "+(d.is(":checked")||d.find("option").eq(1).is(":selected")?"ui-flipswitch-active":"")+(d.is(":disabled")?" ui-state-disabled":"")+(c.corners?" ui-corner-all":"")+(c.mini?" ui-mini":"")).append(f,g),d.addClass("ui-flipswitch-input").after(b).appendTo(b),a.extend(this,{flipswitch:b,on:f,off:g,type:h})},_reset:function(){this.refresh()},refresh:function(){var a,b=this.flipswitch.hasClass("ui-flipswitch-active")?"_right":"_left";a="SELECT"===this.type?this.element.get(0).selectedIndex>0?"_right":"_left":this.element.prop("checked")?"_right":"_left",a!==b&&this[a]()},_toggle:function(){var a=this.flipswitch.hasClass("ui-flipswitch-active")?"_left":"_right";this[a]()},_keydown:function(b){b.which===a.mobile.keyCode.LEFT?this._left():b.which===a.mobile.keyCode.RIGHT?this._right():b.which===a.mobile.keyCode.SPACE&&(this._toggle(),b.preventDefault())},_setOptions:function(a){if(a.theme!==b){var c=a.theme?a.theme:"inherit",d=a.theme?a.theme:"inherit";this.widget().removeClass("ui-bar-"+c).addClass("ui-bar-"+d)}a.onText!==b&&this.on.text(a.onText),a.offText!==b&&this.off.text(a.offText),a.disabled!==b&&this.widget().toggleClass("ui-state-disabled",a.disabled),a.mini!==b&&this.widget().toggleClass("ui-mini",a.mini),a.corners!==b&&this.widget().toggleClass("ui-corner-all",a.corners),this._super(a)},_destroy:function(){this.options.enhanced||(null!=this._originalTabIndex?this.element.attr("tabindex",this._originalTabIndex):this.element.removeAttr("tabindex"),this.on.remove(),this.off.remove(),this.element.unwrap(),this.flipswitch.remove(),this.removeClass("ui-flipswitch-input"))}},a.mobile.behaviors.formReset))}(a),function(a,b){a.widget("mobile.rangeslider",a.extend({options:{theme:null,trackTheme:null,corners:!0,mini:!1,highlight:!0},_create:function(){var b=this.element,c=this.options.mini?"ui-rangeslider ui-mini":"ui-rangeslider",d=b.find("input").first(),e=b.find("input").last(),f=b.find("label").first(),g=a.data(d.get(0),"mobile-slider")||a.data(d.slider().get(0),"mobile-slider"),h=a.data(e.get(0),"mobile-slider")||a.data(e.slider().get(0),"mobile-slider"),i=g.slider,j=h.slider,k=g.handle,l=a("<div class='ui-rangeslider-sliders' />").appendTo(b);d.addClass("ui-rangeslider-first"),e.addClass("ui-rangeslider-last"),b.addClass(c),i.appendTo(l),j.appendTo(l),f.insertBefore(b),k.prependTo(j),a.extend(this,{_inputFirst:d,_inputLast:e,_sliderFirst:i,_sliderLast:j,_label:f,_targetVal:null,_sliderTarget:!1,_sliders:l,_proxy:!1}),this.refresh(),this._on(this.element.find("input.ui-slider-input"),{slidebeforestart:"_slidebeforestart",slidestop:"_slidestop",slidedrag:"_slidedrag",slidebeforechange:"_change",blur:"_change",keyup:"_change"}),this._on({mousedown:"_change"}),this._on(this.element.closest("form"),{reset:"_handleReset"}),this._on(k,{vmousedown:"_dragFirstHandle"})},_handleReset:function(){var a=this;setTimeout(function(){a._updateHighlight()},0)},_dragFirstHandle:function(b){return a.data(this._inputFirst.get(0),"mobile-slider").dragging=!0,a.data(this._inputFirst.get(0),"mobile-slider").refresh(b),!1},_slidedrag:function(b){var c=a(b.target).is(this._inputFirst),d=c?this._inputLast:this._inputFirst;return this._sliderTarget=!1,"first"===this._proxy&&c||"last"===this._proxy&&!c?(a.data(d.get(0),"mobile-slider").dragging=!0,a.data(d.get(0),"mobile-slider").refresh(b),!1):void 0},_slidestop:function(b){var c=a(b.target).is(this._inputFirst);this._proxy=!1,this.element.find("input").trigger("vmouseup"),this._sliderFirst.css("z-index",c?1:"")},_slidebeforestart:function(b){this._sliderTarget=!1,a(b.originalEvent.target).hasClass("ui-slider-track")&&(this._sliderTarget=!0,this._targetVal=a(b.target).val())},_setOptions:function(a){a.theme!==b&&this._setTheme(a.theme),a.trackTheme!==b&&this._setTrackTheme(a.trackTheme),a.mini!==b&&this._setMini(a.mini),a.highlight!==b&&this._setHighlight(a.highlight),this._super(a),this.refresh()},refresh:function(){var a=this.element,b=this.options;(this._inputFirst.is(":disabled")||this._inputLast.is(":disabled"))&&(this.options.disabled=!0),a.find("input").slider({theme:b.theme,trackTheme:b.trackTheme,disabled:b.disabled,corners:b.corners,mini:b.mini,highlight:b.highlight}).slider("refresh"),this._updateHighlight()},_change:function(b){if("keyup"===b.type)return this._updateHighlight(),!1;var c=this,d=parseFloat(this._inputFirst.val(),10),e=parseFloat(this._inputLast.val(),10),f=a(b.target).hasClass("ui-rangeslider-first"),g=f?this._inputFirst:this._inputLast,h=f?this._inputLast:this._inputFirst;if(this._inputFirst.val()>this._inputLast.val()&&"mousedown"===b.type&&!a(b.target).hasClass("ui-slider-handle"))g.blur();else if("mousedown"===b.type)return;return d>e&&!this._sliderTarget?(g.val(f?e:d).slider("refresh"),this._trigger("normalize")):d>e&&(g.val(this._targetVal).slider("refresh"),setTimeout(function(){h.val(f?d:e).slider("refresh"),a.data(h.get(0),"mobile-slider").handle.focus(),c._sliderFirst.css("z-index",f?"":1),c._trigger("normalize")},0),this._proxy=f?"first":"last"),d===e?(a.data(g.get(0),"mobile-slider").handle.css("z-index",1),a.data(h.get(0),"mobile-slider").handle.css("z-index",0)):(a.data(h.get(0),"mobile-slider").handle.css("z-index",""),a.data(g.get(0),"mobile-slider").handle.css("z-index","")),this._updateHighlight(),d>=e?!1:void 0},_updateHighlight:function(){var b=parseInt(a.data(this._inputFirst.get(0),"mobile-slider").handle.get(0).style.left,10),c=parseInt(a.data(this._inputLast.get(0),"mobile-slider").handle.get(0).style.left,10),d=c-b;this.element.find(".ui-slider-bg").css({"margin-left":b+"%",width:d+"%"})},_setTheme:function(a){this._inputFirst.slider("option","theme",a),this._inputLast.slider("option","theme",a)},_setTrackTheme:function(a){this._inputFirst.slider("option","trackTheme",a),this._inputLast.slider("option","trackTheme",a)},_setMini:function(a){this._inputFirst.slider("option","mini",a),this._inputLast.slider("option","mini",a),this.element.toggleClass("ui-mini",!!a)},_setHighlight:function(a){this._inputFirst.slider("option","highlight",a),this._inputLast.slider("option","highlight",a)},_destroy:function(){this._label.prependTo(this.element),this.element.removeClass("ui-rangeslider ui-mini"),this._inputFirst.after(this._sliderFirst),this._inputLast.after(this._sliderLast),this._sliders.remove(),this.element.find("input").removeClass("ui-rangeslider-first ui-rangeslider-last").slider("destroy")}},a.mobile.behaviors.formReset))}(a),function(a,b){a.widget("mobile.textinput",a.mobile.textinput,{options:{clearBtn:!1,clearBtnText:"Clear text"},_create:function(){this._super(),(this.options.clearBtn||this.isSearch)&&this._addClearBtn()},clearButton:function(){return a("<a href='#' class='ui-input-clear ui-btn ui-icon-delete ui-btn-icon-notext ui-corner-all' title='"+this.options.clearBtnText+"'>"+this.options.clearBtnText+"</a>")},_clearBtnClick:function(a){this.element.val("").focus().trigger("change"),this._clearBtn.addClass("ui-input-clear-hidden"),a.preventDefault()},_addClearBtn:function(){this.options.enhanced||this._enhanceClear(),a.extend(this,{_clearBtn:this.widget().find("a.ui-input-clear")}),this._bindClearEvents(),this._toggleClear()},_enhanceClear:function(){this.clearButton().appendTo(this.widget()),this.widget().addClass("ui-input-has-clear")},_bindClearEvents:function(){this._on(this._clearBtn,{click:"_clearBtnClick"}),this._on({keyup:"_toggleClear",change:"_toggleClear",input:"_toggleClear",focus:"_toggleClear",blur:"_toggleClear",cut:"_toggleClear",paste:"_toggleClear"})},_unbindClear:function(){this._off(this._clearBtn,"click"),this._off(this.element,"keyup change input focus blur cut paste")},_setOptions:function(a){this._super(a),a.clearBtn===b||this.element.is("textarea, :jqmData(type='range')")||(a.clearBtn?this._addClearBtn():this._destroyClear()),a.clearBtnText!==b&&this._clearBtn!==b&&this._clearBtn.text(a.clearBtnText).attr("title",a.clearBtnText)},_toggleClear:function(){this._delay("_toggleClearClass",0)},_toggleClearClass:function(){this._clearBtn.toggleClass("ui-input-clear-hidden",!this.element.val())},_destroyClear:function(){this.widget().removeClass("ui-input-has-clear"),this._unbindClear(),this._clearBtn.remove()},_destroy:function(){this._super(),this._destroyClear()}})}(a),function(a,b){a.widget("mobile.textinput",a.mobile.textinput,{options:{autogrow:!0,keyupTimeoutBuffer:100},_create:function(){this._super(),this.options.autogrow&&this.isTextarea&&this._autogrow()},_autogrow:function(){this.element.addClass("ui-textinput-autogrow"),this._on({keyup:"_timeout",change:"_timeout",input:"_timeout",paste:"_timeout"}),this._on(!0,this.document,{pageshow:"_handleShow",popupbeforeposition:"_handleShow",updatelayout:"_handleShow",panelopen:"_handleShow"})},_handleShow:function(b){a.contains(b.target,this.element[0])&&this.element.is(":visible")&&("popupbeforeposition"!==b.type&&this.element.addClass("ui-textinput-autogrow-resize").animationComplete(a.proxy(function(){this.element.removeClass("ui-textinput-autogrow-resize")},this),"transition"),this._timeout())},_unbindAutogrow:function(){this.element.removeClass("ui-textinput-autogrow"),this._off(this.element,"keyup change input paste"),this._off(this.document,"pageshow popupbeforeposition updatelayout panelopen")},keyupTimeout:null,_prepareHeightUpdate:function(a){this.keyupTimeout&&clearTimeout(this.keyupTimeout),a===b?this._updateHeight():this.keyupTimeout=this._delay("_updateHeight",a)},_timeout:function(){this._prepareHeightUpdate(this.options.keyupTimeoutBuffer)},_updateHeight:function(){var a,b,c,d,e,f,g,h,i,j=this.window.scrollTop();this.keyupTimeout=0,"onpage"in this.element[0]||this.element.css({height:0,"min-height":0,"max-height":0}),d=this.element[0].scrollHeight,e=this.element[0].clientHeight,f=parseFloat(this.element.css("border-top-width")),g=parseFloat(this.element.css("border-bottom-width")),h=f+g,i=d+h+15,0===e&&(a=parseFloat(this.element.css("padding-top")),b=parseFloat(this.element.css("padding-bottom")),c=a+b,i+=c),this.element.css({height:i,"min-height":"","max-height":""}),this.window.scrollTop(j)},refresh:function(){this.options.autogrow&&this.isTextarea&&this._updateHeight()},_setOptions:function(a){this._super(a),a.autogrow!==b&&this.isTextarea&&(a.autogrow?this._autogrow():this._unbindAutogrow())}})}(a),function(a){a.widget("mobile.selectmenu",a.extend({initSelector:"select:not( :jqmData(role='slider')):not( :jqmData(role='flipswitch') )",options:{theme:null,icon:"carat-d",iconpos:"right",inline:!1,corners:!0,shadow:!0,iconshadow:!1,overlayTheme:null,dividerTheme:null,hidePlaceholderMenuItems:!0,closeText:"Close",nativeMenu:!0,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,mini:!1},_button:function(){return a("<div/>")},_setDisabled:function(a){return this.element.attr("disabled",a),this.button.attr("aria-disabled",a),this._setOption("disabled",a)},_focusButton:function(){var a=this;setTimeout(function(){a.button.focus()},40)},_selectOptions:function(){return this.select.find("option")},_preExtension:function(){var b=this.options.inline||this.element.jqmData("inline"),c=this.options.mini||this.element.jqmData("mini"),d="";~this.element[0].className.indexOf("ui-btn-left")&&(d=" ui-btn-left"),~this.element[0].className.indexOf("ui-btn-right")&&(d=" ui-btn-right"),b&&(d+=" ui-btn-inline"),c&&(d+=" ui-mini"),this.select=this.element.removeClass("ui-btn-left ui-btn-right").wrap("<div class='ui-select"+d+"'>"),this.selectId=this.select.attr("id")||"select-"+this.uuid,this.buttonId=this.selectId+"-button",this.label=a("label[for='"+this.selectId+"']"),this.isMultiple=this.select[0].multiple},_destroy:function(){var a=this.element.parents(".ui-select");a.length>0&&(a.is(".ui-btn-left, .ui-btn-right")&&this.element.addClass(a.hasClass("ui-btn-left")?"ui-btn-left":"ui-btn-right"),this.element.insertAfter(a),a.remove())},_create:function(){this._preExtension(),this.button=this._button();var c=this,d=this.options,e=d.icon?d.iconpos||this.select.jqmData("iconpos"):!1,f=this.button.insertBefore(this.select).attr("id",this.buttonId).addClass("ui-btn"+(d.icon?" ui-icon-"+d.icon+" ui-btn-icon-"+e+(d.iconshadow?" ui-shadow-icon":""):"")+(d.theme?" ui-btn-"+d.theme:"")+(d.corners?" ui-corner-all":"")+(d.shadow?" ui-shadow":""));this.setButtonText(),d.nativeMenu&&b.opera&&b.opera.version&&f.addClass("ui-select-nativeonly"),this.isMultiple&&(this.buttonCount=a("<span>").addClass("ui-li-count ui-body-inherit").hide().appendTo(f.addClass("ui-li-has-count"))),(d.disabled||this.element.attr("disabled"))&&this.disable(),this.select.change(function(){c.refresh(),d.nativeMenu&&this.blur()}),this._handleFormReset(),this._on(this.button,{keydown:"_handleKeydown"}),this.build()},build:function(){var b=this;this.select.appendTo(b.button).bind("vmousedown",function(){b.button.addClass(a.mobile.activeBtnClass)}).bind("focus",function(){b.button.addClass(a.mobile.focusClass)}).bind("blur",function(){b.button.removeClass(a.mobile.focusClass)}).bind("focus vmouseover",function(){b.button.trigger("vmouseover")}).bind("vmousemove",function(){b.button.removeClass(a.mobile.activeBtnClass)}).bind("change blur vmouseout",function(){b.button.trigger("vmouseout").removeClass(a.mobile.activeBtnClass)}),b.button.bind("vmousedown",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.label.bind("click focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.select.bind("focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.button.bind("mouseup",function(){b.options.preventFocusZoom&&setTimeout(function(){a.mobile.zoom.enable(!0)},0)}),b.select.bind("blur",function(){b.options.preventFocusZoom&&a.mobile.zoom.enable(!0)})},selected:function(){return this._selectOptions().filter(":selected")},selectedIndices:function(){var a=this;return this.selected().map(function(){return a._selectOptions().index(this)}).get()},setButtonText:function(){var b=this,d=this.selected(),e=this.placeholder,f=a(c.createElement("span"));this.button.children("span").not(".ui-li-count").remove().end().end().prepend(function(){return e=d.length?d.map(function(){return a(this).text()}).get().join(", "):b.placeholder,e?f.text(e):f.html("&#160;"),f.addClass(b.select.attr("class")).addClass(d.attr("class")).removeClass("ui-screen-hidden")}())},setButtonCount:function(){var a=this.selected();this.isMultiple&&this.buttonCount[a.length>1?"show":"hide"]().text(a.length)},_handleKeydown:function(){this._delay("_refreshButton")},_reset:function(){this.refresh()},_refreshButton:function(){this.setButtonText(),this.setButtonCount()},refresh:function(){this._refreshButton()},open:a.noop,close:a.noop,disable:function(){this._setDisabled(!0),this.button.addClass("ui-state-disabled")},enable:function(){this._setDisabled(!1),this.button.removeClass("ui-state-disabled")}},a.mobile.behaviors.formReset))}(a),function(a){a.mobile.links=function(b){a(b).find("a").jqmEnhanceable().filter(":jqmData(rel='popup')[href][href!='']").each(function(){var a=this,b=a.getAttribute("href").substring(1);b&&(a.setAttribute("aria-haspopup",!0),a.setAttribute("aria-owns",b),a.setAttribute("aria-expanded",!1))}).end().not(".ui-btn, :jqmData(role='none'), :jqmData(role='nojs')").addClass("ui-link")}}(a),function(a,c){function d(a,b,c,d){var e=d;return e=b>a?c+(a-b)/2:Math.min(Math.max(c,d-b/2),c+a-b)}function e(a){return{x:a.scrollLeft(),y:a.scrollTop(),cx:a[0].innerWidth||a.width(),cy:a[0].innerHeight||a.height()}}a.widget("mobile.popup",{options:{wrapperClass:null,theme:null,overlayTheme:null,shadow:!0,corners:!0,transition:"none",positionTo:"origin",tolerance:null,closeLinkSelector:"a:jqmData(rel='back')",closeLinkEvents:"click.popup",navigateEvents:"navigate.popup",closeEvents:"navigate.popup pagebeforechange.popup",dismissible:!0,enhanced:!1,history:!a.mobile.browser.oldIE},_handleDocumentVmousedown:function(b){this._isOpen&&a.contains(this._ui.container[0],b.target)&&this._ignoreResizeEvents()},_create:function(){var b=this.element,c=b.attr("id"),d=this.options;d.history=d.history&&a.mobile.ajaxEnabled&&a.mobile.hashListeningEnabled,this._on(this.document,{vmousedown:"_handleDocumentVmousedown"}),a.extend(this,{_scrollTop:0,_page:b.closest(".ui-page"),_ui:null,_fallbackTransition:"",_currentTransition:!1,_prerequisites:null,_isOpen:!1,_tolerance:null,_resizeData:null,_ignoreResizeTo:0,_orientationchangeInProgress:!1}),0===this._page.length&&(this._page=a("body")),d.enhanced?this._ui={container:b.parent(),screen:b.parent().prev(),placeholder:a(this.document[0].getElementById(c+"-placeholder"))}:(this._ui=this._enhance(b,c),this._applyTransition(d.transition)),this._setTolerance(d.tolerance)._ui.focusElement=this._ui.container,this._on(this._ui.screen,{vclick:"_eatEventAndClose"}),this._on(this.window,{orientationchange:a.proxy(this,"_handleWindowOrientationchange"),resize:a.proxy(this,"_handleWindowResize"),keyup:a.proxy(this,"_handleWindowKeyUp")}),this._on(this.document,{focusin:"_handleDocumentFocusIn"})},_enhance:function(b,c){var d=this.options,e=d.wrapperClass,f={screen:a("<div class='ui-screen-hidden ui-popup-screen "+this._themeClassFromOption("ui-overlay-",d.overlayTheme)+"'></div>"),placeholder:a("<div style='display: none;'><!-- placeholder --></div>"),container:a("<div class='ui-popup-container ui-popup-hidden ui-popup-truncate"+(e?" "+e:"")+"'></div>")},g=this.document[0].createDocumentFragment();return g.appendChild(f.screen[0]),g.appendChild(f.container[0]),c&&(f.screen.attr("id",c+"-screen"),f.container.attr("id",c+"-popup"),f.placeholder.attr("id",c+"-placeholder").html("<!-- placeholder for "+c+" -->")),this._page[0].appendChild(g),f.placeholder.insertAfter(b),b.detach().addClass("ui-popup "+this._themeClassFromOption("ui-body-",d.theme)+" "+(d.shadow?"ui-overlay-shadow ":"")+(d.corners?"ui-corner-all ":"")).appendTo(f.container),f},_eatEventAndClose:function(a){return a.preventDefault(),a.stopImmediatePropagation(),this.options.dismissible&&this.close(),!1},_resizeScreen:function(){var a=this._ui.screen,b=this._ui.container.outerHeight(!0),c=a.removeAttr("style").height(),d=this.document.height()-1;d>c?a.height(d):b>c&&a.height(b)},_handleWindowKeyUp:function(b){return this._isOpen&&b.keyCode===a.mobile.keyCode.ESCAPE?this._eatEventAndClose(b):void 0},_expectResizeEvent:function(){var a=e(this.window);if(this._resizeData){if(a.x===this._resizeData.windowCoordinates.x&&a.y===this._resizeData.windowCoordinates.y&&a.cx===this._resizeData.windowCoordinates.cx&&a.cy===this._resizeData.windowCoordinates.cy)return!1;clearTimeout(this._resizeData.timeoutId)}return this._resizeData={timeoutId:this._delay("_resizeTimeout",200),windowCoordinates:a},!0},_resizeTimeout:function(){this._isOpen?this._expectResizeEvent()||(this._ui.container.hasClass("ui-popup-hidden")&&(this._ui.container.removeClass("ui-popup-hidden ui-popup-truncate"),this.reposition({positionTo:"window"}),this._ignoreResizeEvents()),this._resizeScreen(),this._resizeData=null,this._orientationchangeInProgress=!1):(this._resizeData=null,this._orientationchangeInProgress=!1)},_stopIgnoringResizeEvents:function(){this._ignoreResizeTo=0
+},_ignoreResizeEvents:function(){this._ignoreResizeTo&&clearTimeout(this._ignoreResizeTo),this._ignoreResizeTo=this._delay("_stopIgnoringResizeEvents",1e3)},_handleWindowResize:function(){this._isOpen&&0===this._ignoreResizeTo&&(!this._expectResizeEvent()&&!this._orientationchangeInProgress||this._ui.container.hasClass("ui-popup-hidden")||this._ui.container.addClass("ui-popup-hidden ui-popup-truncate").removeAttr("style"))},_handleWindowOrientationchange:function(){!this._orientationchangeInProgress&&this._isOpen&&0===this._ignoreResizeTo&&(this._expectResizeEvent(),this._orientationchangeInProgress=!0)},_handleDocumentFocusIn:function(b){var c,d=b.target,e=this._ui;if(this._isOpen){if(d!==e.container[0]){if(c=a(d),0===c.parents().filter(e.container[0]).length)return a(this.document[0].activeElement).one("focus",function(){c.blur()}),e.focusElement.focus(),b.preventDefault(),b.stopImmediatePropagation(),!1;e.focusElement[0]===e.container[0]&&(e.focusElement=c)}this._ignoreResizeEvents()}},_themeClassFromOption:function(a,b){return b?"none"===b?"":a+b:a+"inherit"},_applyTransition:function(b){return b&&(this._ui.container.removeClass(this._fallbackTransition),"none"!==b&&(this._fallbackTransition=a.mobile._maybeDegradeTransition(b),"none"===this._fallbackTransition&&(this._fallbackTransition=""),this._ui.container.addClass(this._fallbackTransition))),this},_setOptions:function(a){var b=this.options,d=this.element,e=this._ui.screen;return a.wrapperClass!==c&&this._ui.container.removeClass(b.wrapperClass).addClass(a.wrapperClass),a.theme!==c&&d.removeClass(this._themeClassFromOption("ui-body-",b.theme)).addClass(this._themeClassFromOption("ui-body-",a.theme)),a.overlayTheme!==c&&(e.removeClass(this._themeClassFromOption("ui-overlay-",b.overlayTheme)).addClass(this._themeClassFromOption("ui-overlay-",a.overlayTheme)),this._isOpen&&e.addClass("in")),a.shadow!==c&&d.toggleClass("ui-overlay-shadow",a.shadow),a.corners!==c&&d.toggleClass("ui-corner-all",a.corners),a.transition!==c&&(this._currentTransition||this._applyTransition(a.transition)),a.tolerance!==c&&this._setTolerance(a.tolerance),a.disabled!==c&&a.disabled&&this.close(),this._super(a)},_setTolerance:function(b){var d,e={t:30,r:15,b:30,l:15};if(b!==c)switch(d=String(b).split(","),a.each(d,function(a,b){d[a]=parseInt(b,10)}),d.length){case 1:isNaN(d[0])||(e.t=e.r=e.b=e.l=d[0]);break;case 2:isNaN(d[0])||(e.t=e.b=d[0]),isNaN(d[1])||(e.l=e.r=d[1]);break;case 4:isNaN(d[0])||(e.t=d[0]),isNaN(d[1])||(e.r=d[1]),isNaN(d[2])||(e.b=d[2]),isNaN(d[3])||(e.l=d[3])}return this._tolerance=e,this},_clampPopupWidth:function(a){var b,c=e(this.window),d={x:this._tolerance.l,y:c.y+this._tolerance.t,cx:c.cx-this._tolerance.l-this._tolerance.r,cy:c.cy-this._tolerance.t-this._tolerance.b};return a||this._ui.container.css("max-width",d.cx),b={cx:this._ui.container.outerWidth(!0),cy:this._ui.container.outerHeight(!0)},{rc:d,menuSize:b}},_calculateFinalLocation:function(a,b){var c,e=b.rc,f=b.menuSize;return c={left:d(e.cx,f.cx,e.x,a.x),top:d(e.cy,f.cy,e.y,a.y)},c.top=Math.max(0,c.top),c.top-=Math.min(c.top,Math.max(0,c.top+f.cy-this.document.height())),c},_placementCoords:function(a){return this._calculateFinalLocation(a,this._clampPopupWidth())},_createPrerequisites:function(b,c,d){var e,f=this;e={screen:a.Deferred(),container:a.Deferred()},e.screen.then(function(){e===f._prerequisites&&b()}),e.container.then(function(){e===f._prerequisites&&c()}),a.when(e.screen,e.container).done(function(){e===f._prerequisites&&(f._prerequisites=null,d())}),f._prerequisites=e},_animate:function(b){return this._ui.screen.removeClass(b.classToRemove).addClass(b.screenClassToAdd),b.prerequisites.screen.resolve(),b.transition&&"none"!==b.transition&&(b.applyTransition&&this._applyTransition(b.transition),this._fallbackTransition)?void this._ui.container.addClass(b.containerClassToAdd).removeClass(b.classToRemove).animationComplete(a.proxy(b.prerequisites.container,"resolve")):(this._ui.container.removeClass(b.classToRemove),void b.prerequisites.container.resolve())},_desiredCoords:function(b){var c,d=null,f=e(this.window),g=b.x,h=b.y,i=b.positionTo;if(i&&"origin"!==i)if("window"===i)g=f.cx/2+f.x,h=f.cy/2+f.y;else{try{d=a(i)}catch(j){d=null}d&&(d.filter(":visible"),0===d.length&&(d=null))}return d&&(c=d.offset(),g=c.left+d.outerWidth()/2,h=c.top+d.outerHeight()/2),("number"!==a.type(g)||isNaN(g))&&(g=f.cx/2+f.x),("number"!==a.type(h)||isNaN(h))&&(h=f.cy/2+f.y),{x:g,y:h}},_reposition:function(a){a={x:a.x,y:a.y,positionTo:a.positionTo},this._trigger("beforeposition",c,a),this._ui.container.offset(this._placementCoords(this._desiredCoords(a)))},reposition:function(a){this._isOpen&&this._reposition(a)},_openPrerequisitesComplete:function(){var a=this.element.attr("id");this._ui.container.addClass("ui-popup-active"),this._isOpen=!0,this._resizeScreen(),this._ui.container.attr("tabindex","0").focus(),this._ignoreResizeEvents(),a&&this.document.find("[aria-haspopup='true'][aria-owns='"+a+"']").attr("aria-expanded",!0),this._trigger("afteropen")},_open:function(b){var c=a.extend({},this.options,b),d=function(){var a=navigator.userAgent,b=a.match(/AppleWebKit\/([0-9\.]+)/),c=!!b&&b[1],d=a.match(/Android (\d+(?:\.\d+))/),e=!!d&&d[1],f=a.indexOf("Chrome")>-1;return null!==d&&"4.0"===e&&c&&c>534.13&&!f?!0:!1}();this._createPrerequisites(a.noop,a.noop,a.proxy(this,"_openPrerequisitesComplete")),this._currentTransition=c.transition,this._applyTransition(c.transition),this._ui.screen.removeClass("ui-screen-hidden"),this._ui.container.removeClass("ui-popup-truncate"),this._reposition(c),this._ui.container.removeClass("ui-popup-hidden"),this.options.overlayTheme&&d&&this.element.closest(".ui-page").addClass("ui-popup-open"),this._animate({additionalCondition:!0,transition:c.transition,classToRemove:"",screenClassToAdd:"in",containerClassToAdd:"in",applyTransition:!1,prerequisites:this._prerequisites})},_closePrerequisiteScreen:function(){this._ui.screen.removeClass("out").addClass("ui-screen-hidden")},_closePrerequisiteContainer:function(){this._ui.container.removeClass("reverse out").addClass("ui-popup-hidden ui-popup-truncate").removeAttr("style")},_closePrerequisitesDone:function(){var b=this._ui.container,d=this.element.attr("id");b.removeAttr("tabindex"),a.mobile.popup.active=c,a(":focus",b[0]).add(b[0]).blur(),d&&this.document.find("[aria-haspopup='true'][aria-owns='"+d+"']").attr("aria-expanded",!1),this._trigger("afterclose")},_close:function(b){this._ui.container.removeClass("ui-popup-active"),this._page.removeClass("ui-popup-open"),this._isOpen=!1,this._createPrerequisites(a.proxy(this,"_closePrerequisiteScreen"),a.proxy(this,"_closePrerequisiteContainer"),a.proxy(this,"_closePrerequisitesDone")),this._animate({additionalCondition:this._ui.screen.hasClass("in"),transition:b?"none":this._currentTransition,classToRemove:"in",screenClassToAdd:"out",containerClassToAdd:"reverse out",applyTransition:!0,prerequisites:this._prerequisites})},_unenhance:function(){this.options.enhanced||(this._setOptions({theme:a.mobile.popup.prototype.options.theme}),this.element.detach().insertAfter(this._ui.placeholder).removeClass("ui-popup ui-overlay-shadow ui-corner-all ui-body-inherit"),this._ui.screen.remove(),this._ui.container.remove(),this._ui.placeholder.remove())},_destroy:function(){return a.mobile.popup.active===this?(this.element.one("popupafterclose",a.proxy(this,"_unenhance")),this.close()):this._unenhance(),this},_closePopup:function(c,d){var e,f,g=this.options,h=!1;c&&c.isDefaultPrevented()||a.mobile.popup.active!==this||(b.scrollTo(0,this._scrollTop),c&&"pagebeforechange"===c.type&&d&&(e="string"==typeof d.toPage?d.toPage:d.toPage.jqmData("url"),e=a.mobile.path.parseUrl(e),f=e.pathname+e.search+e.hash,this._myUrl!==a.mobile.path.makeUrlAbsolute(f)?h=!0:c.preventDefault()),this.window.off(g.closeEvents),this.element.undelegate(g.closeLinkSelector,g.closeLinkEvents),this._close(h))},_bindContainerClose:function(){this.window.on(this.options.closeEvents,a.proxy(this,"_closePopup"))},widget:function(){return this._ui.container},open:function(b){var c,d,e,f,g,h,i=this,j=this.options;return a.mobile.popup.active||j.disabled?this:(a.mobile.popup.active=this,this._scrollTop=this.window.scrollTop(),j.history?(h=a.mobile.navigate.history,d=a.mobile.dialogHashKey,e=a.mobile.activePage,f=e?e.hasClass("ui-dialog"):!1,this._myUrl=c=h.getActive().url,(g=c.indexOf(d)>-1&&!f&&h.activeIndex>0)?(i._open(b),i._bindContainerClose(),this):(-1!==c.indexOf(d)||f?c=a.mobile.path.parseLocation().hash+d:c+=c.indexOf("#")>-1?d:"#"+d,0===h.activeIndex&&c===h.initialDst&&(c+=d),this.window.one("beforenavigate",function(a){a.preventDefault(),i._open(b),i._bindContainerClose()}),this.urlAltered=!0,a.mobile.navigate(c,{role:"dialog"}),this)):(i._open(b),i._bindContainerClose(),i.element.delegate(j.closeLinkSelector,j.closeLinkEvents,function(a){i.close(),a.preventDefault()}),this))},close:function(){return a.mobile.popup.active!==this?this:(this._scrollTop=this.window.scrollTop(),this.options.history&&this.urlAltered?(a.mobile.back(),this.urlAltered=!1):this._closePopup(),this)}}),a.mobile.popup.handleLink=function(b){var c,d=a.mobile.path,e=a(d.hashToSelector(d.parseUrl(b.attr("href")).hash)).first();e.length>0&&e.data("mobile-popup")&&(c=b.offset(),e.popup("open",{x:c.left+b.outerWidth()/2,y:c.top+b.outerHeight()/2,transition:b.jqmData("transition"),positionTo:b.jqmData("position-to")})),setTimeout(function(){b.removeClass(a.mobile.activeBtnClass)},300)},a.mobile.document.on("pagebeforechange",function(b,c){"popup"===c.options.role&&(a.mobile.popup.handleLink(c.options.link),b.preventDefault())})}(a),function(a,b){var d=".ui-disabled,.ui-state-disabled,.ui-li-divider,.ui-screen-hidden,:jqmData(role='placeholder')",e=function(a,b,c){var e=a[c+"All"]().not(d).first();e.length&&(b.blur().attr("tabindex","-1"),e.find("a").first().focus())};a.widget("mobile.selectmenu",a.mobile.selectmenu,{_create:function(){var a=this.options;return a.nativeMenu=a.nativeMenu||this.element.parents(":jqmData(role='popup'),:mobile-popup").length>0,this._super()},_handleSelectFocus:function(){this.element.blur(),this.button.focus()},_handleKeydown:function(a){this._super(a),this._handleButtonVclickKeydown(a)},_handleButtonVclickKeydown:function(b){this.options.disabled||this.isOpen||this.options.nativeMenu||("vclick"===b.type||b.keyCode&&(b.keyCode===a.mobile.keyCode.ENTER||b.keyCode===a.mobile.keyCode.SPACE))&&(this._decideFormat(),"overlay"===this.menuType?this.button.attr("href","#"+this.popupId).attr("data-"+(a.mobile.ns||"")+"rel","popup"):this.button.attr("href","#"+this.dialogId).attr("data-"+(a.mobile.ns||"")+"rel","dialog"),this.isOpen=!0)},_handleListFocus:function(b){var c="focusin"===b.type?{tabindex:"0",event:"vmouseover"}:{tabindex:"-1",event:"vmouseout"};a(b.target).attr("tabindex",c.tabindex).trigger(c.event)},_handleListKeydown:function(b){var c=a(b.target),d=c.closest("li");switch(b.keyCode){case 38:return e(d,c,"prev"),!1;case 40:return e(d,c,"next"),!1;case 13:case 32:return c.trigger("click"),!1}},_handleMenuPageHide:function(){this._delayedTrigger(),this.thisPage.page("bindRemove")},_handleHeaderCloseClick:function(){return"overlay"===this.menuType?(this.close(),!1):void 0},_handleListItemClick:function(b){var c=a(b.target).closest("li"),d=this.select[0].selectedIndex,e=a.mobile.getAttribute(c,"option-index"),f=this._selectOptions().eq(e)[0];f.selected=this.isMultiple?!f.selected:!0,this.isMultiple&&c.find("a").toggleClass("ui-checkbox-on",f.selected).toggleClass("ui-checkbox-off",!f.selected),this.isMultiple||d===e||(this._triggerChange=!0),this.isMultiple?(this.select.trigger("change"),this.list.find("li:not(.ui-li-divider)").eq(e).find("a").first().focus()):this.close(),b.preventDefault()},build:function(){var c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v=this.options;return v.nativeMenu?this._super():(c=this.selectId,d=c+"-listbox",e=c+"-dialog",f=this.label,g=this.element.closest(".ui-page"),h=this.element[0].multiple,i=c+"-menu",j=v.theme?" data-"+a.mobile.ns+"theme='"+v.theme+"'":"",k=v.overlayTheme||v.theme||null,l=k?" data-"+a.mobile.ns+"overlay-theme='"+k+"'":"",m=v.dividerTheme&&h?" data-"+a.mobile.ns+"divider-theme='"+v.dividerTheme+"'":"",n=a("<div data-"+a.mobile.ns+"role='dialog' class='ui-selectmenu' id='"+e+"'"+j+l+"><div data-"+a.mobile.ns+"role='header'><div class='ui-title'></div></div><div data-"+a.mobile.ns+"role='content'></div></div>"),o=a("<div"+j+l+" id='"+d+"' class='ui-selectmenu'></div>").insertAfter(this.select).popup(),p=a("<ul class='ui-selectmenu-list' id='"+i+"' role='listbox' aria-labelledby='"+this.buttonId+"'"+j+m+"></ul>").appendTo(o),q=a("<div class='ui-header ui-bar-"+(v.theme?v.theme:"inherit")+"'></div>").prependTo(o),r=a("<h1 class='ui-title'></h1>").appendTo(q),this.isMultiple&&(u=a("<a>",{role:"button",text:v.closeText,href:"#","class":"ui-btn ui-corner-all ui-btn-left ui-btn-icon-notext ui-icon-delete"}).appendTo(q)),a.extend(this,{selectId:c,menuId:i,popupId:d,dialogId:e,thisPage:g,menuPage:n,label:f,isMultiple:h,theme:v.theme,listbox:o,list:p,header:q,headerTitle:r,headerClose:u,menuPageContent:s,menuPageClose:t,placeholder:""}),this.refresh(),this._origTabIndex===b&&(this._origTabIndex=null===this.select[0].getAttribute("tabindex")?!1:this.select.attr("tabindex")),this.select.attr("tabindex","-1"),this._on(this.select,{focus:"_handleSelectFocus"}),this._on(this.button,{vclick:"_handleButtonVclickKeydown"}),this.list.attr("role","listbox"),this._on(this.list,{focusin:"_handleListFocus",focusout:"_handleListFocus",keydown:"_handleListKeydown","click li:not(.ui-disabled,.ui-state-disabled,.ui-li-divider)":"_handleListItemClick"}),this._on(this.menuPage,{pagehide:"_handleMenuPageHide"}),this._on(this.listbox,{popupafterclose:"_popupClosed"}),this.isMultiple&&this._on(this.headerClose,{click:"_handleHeaderCloseClick"}),this)},_popupClosed:function(){this.close(),this._delayedTrigger()},_delayedTrigger:function(){this._triggerChange&&this.element.trigger("change"),this._triggerChange=!1},_isRebuildRequired:function(){var a=this.list.find("li"),b=this._selectOptions().not(".ui-screen-hidden");return b.text()!==a.text()},selected:function(){return this._selectOptions().filter(":selected:not( :jqmData(placeholder='true') )")},refresh:function(b){var c,d;return this.options.nativeMenu?this._super(b):(c=this,(b||this._isRebuildRequired())&&c._buildList(),d=this.selectedIndices(),c.setButtonText(),c.setButtonCount(),void c.list.find("li:not(.ui-li-divider)").find("a").removeClass(a.mobile.activeBtnClass).end().attr("aria-selected",!1).each(function(b){if(a.inArray(b,d)>-1){var e=a(this);e.attr("aria-selected",!0),c.isMultiple?e.find("a").removeClass("ui-checkbox-off").addClass("ui-checkbox-on"):e.hasClass("ui-screen-hidden")?e.next().find("a").addClass(a.mobile.activeBtnClass):e.find("a").addClass(a.mobile.activeBtnClass)}}))},close:function(){if(!this.options.disabled&&this.isOpen){var a=this;"page"===a.menuType?(a.menuPage.dialog("close"),a.list.appendTo(a.listbox)):a.listbox.popup("close"),a._focusButton(),a.isOpen=!1}},open:function(){this.button.click()},_focusMenuItem:function(){var b=this.list.find("a."+a.mobile.activeBtnClass);0===b.length&&(b=this.list.find("li:not("+d+") a.ui-btn")),b.first().focus()},_decideFormat:function(){var b=this,c=this.window,d=b.list.parent(),e=d.outerHeight(),f=c.scrollTop(),g=b.button.offset().top,h=c.height();e>h-80||!a.support.scrollTop?(b.menuPage.appendTo(a.mobile.pageContainer).page(),b.menuPageContent=b.menuPage.find(".ui-content"),b.menuPageClose=b.menuPage.find(".ui-header a"),b.thisPage.unbind("pagehide.remove"),0===f&&g>h&&b.thisPage.one("pagehide",function(){a(this).jqmData("lastScroll",g)}),b.menuPage.one({pageshow:a.proxy(this,"_focusMenuItem"),pagehide:a.proxy(this,"close")}),b.menuType="page",b.menuPageContent.append(b.list),b.menuPage.find("div .ui-title").text(b.label.getEncodedText()||b.placeholder)):(b.menuType="overlay",b.listbox.one({popupafteropen:a.proxy(this,"_focusMenuItem")}))},_buildList:function(){var b,d,e,f,g,h,i,j,k,l,m,n,o,p,q=this,r=this.options,s=this.placeholder,t=!0,u="false",v="data-"+a.mobile.ns,w=v+"option-index",x=v+"icon",y=v+"role",z=v+"placeholder",A=c.createDocumentFragment(),B=!1;for(q.list.empty().filter(".ui-listview").listview("destroy"),b=this._selectOptions(),d=b.length,e=this.select[0],g=0;d>g;g++,B=!1)h=b[g],i=a(h),i.hasClass("ui-screen-hidden")||(j=h.parentNode,k=i.getEncodedText(),l=c.createElement("a"),m=[],l.setAttribute("href","#"),l.appendChild(c.createTextNode(k)),j!==e&&"optgroup"===j.nodeName.toLowerCase()&&(n=j.getAttribute("label"),n!==f&&(o=c.createElement("li"),o.setAttribute(y,"list-divider"),o.setAttribute("role","option"),o.setAttribute("tabindex","-1"),o.appendChild(c.createTextNode(n)),A.appendChild(o),f=n)),!t||h.getAttribute("value")&&0!==k.length&&!i.jqmData("placeholder")||(t=!1,B=!0,null===h.getAttribute(z)&&(this._removePlaceholderAttr=!0),h.setAttribute(z,!0),r.hidePlaceholderMenuItems&&m.push("ui-screen-hidden"),s!==k&&(s=q.placeholder=k)),p=c.createElement("li"),h.disabled&&(m.push("ui-state-disabled"),p.setAttribute("aria-disabled",!0)),p.setAttribute(w,g),p.setAttribute(x,u),B&&p.setAttribute(z,!0),p.className=m.join(" "),p.setAttribute("role","option"),l.setAttribute("tabindex","-1"),this.isMultiple&&a(l).addClass("ui-btn ui-checkbox-off ui-btn-icon-right"),p.appendChild(l),A.appendChild(p));q.list[0].appendChild(A),this.isMultiple||s.length?this.headerTitle.text(this.placeholder):this.header.addClass("ui-screen-hidden"),q.list.listview()},_button:function(){return this.options.nativeMenu?this._super():a("<a>",{href:"#",role:"button",id:this.buttonId,"aria-haspopup":"true","aria-owns":this.menuId})},_destroy:function(){this.options.nativeMenu||(this.close(),this._origTabIndex!==b&&(this._origTabIndex!==!1?this.select.attr("tabindex",this._origTabIndex):this.select.removeAttr("tabindex")),this._removePlaceholderAttr&&this._selectOptions().removeAttr("data-"+a.mobile.ns+"placeholder"),this.listbox.remove(),this.menuPage.remove()),this._super()}})}(a),function(a,b){function c(a,b){var c=b?b:[];return c.push("ui-btn"),a.theme&&c.push("ui-btn-"+a.theme),a.icon&&(c=c.concat(["ui-icon-"+a.icon,"ui-btn-icon-"+a.iconpos]),a.iconshadow&&c.push("ui-shadow-icon")),a.inline&&c.push("ui-btn-inline"),a.shadow&&c.push("ui-shadow"),a.corners&&c.push("ui-corner-all"),a.mini&&c.push("ui-mini"),c}function d(a){var c,d,e,g=!1,h=!0,i={icon:"",inline:!1,shadow:!1,corners:!1,iconshadow:!1,mini:!1},j=[];for(a=a.split(" "),c=0;c<a.length;c++)e=!0,d=f[a[c]],d!==b?(e=!1,i[d]=!0):0===a[c].indexOf("ui-btn-icon-")?(e=!1,h=!1,i.iconpos=a[c].substring(12)):0===a[c].indexOf("ui-icon-")?(e=!1,i.icon=a[c].substring(8)):0===a[c].indexOf("ui-btn-")&&8===a[c].length?(e=!1,i.theme=a[c].substring(7)):"ui-btn"===a[c]&&(e=!1,g=!0),e&&j.push(a[c]);return h&&(i.icon=""),{options:i,unknownClasses:j,alreadyEnhanced:g}}function e(a){return"-"+a.toLowerCase()}var f={"ui-shadow":"shadow","ui-corner-all":"corners","ui-btn-inline":"inline","ui-shadow-icon":"iconshadow","ui-mini":"mini"},g=function(){var c=a.mobile.getAttribute.apply(this,arguments);return null==c?b:c},h=/[A-Z]/g;a.fn.buttonMarkup=function(f,i){var j,k,l,m,n,o=a.fn.buttonMarkup.defaults;for(j=0;j<this.length;j++){if(l=this[j],k=i?{alreadyEnhanced:!1,unknownClasses:[]}:d(l.className),m=a.extend({},k.alreadyEnhanced?k.options:{},f),!k.alreadyEnhanced)for(n in o)m[n]===b&&(m[n]=g(l,n.replace(h,e)));l.className=c(a.extend({},o,m),k.unknownClasses).join(" "),"button"!==l.tagName.toLowerCase()&&l.setAttribute("role","button")}return this},a.fn.buttonMarkup.defaults={icon:"",iconpos:"left",theme:null,inline:!1,shadow:!0,corners:!0,iconshadow:!1,mini:!1},a.extend(a.fn.buttonMarkup,{initSelector:"a:jqmData(role='button'), .ui-bar > a, .ui-bar > :jqmData(role='controlgroup') > a, button"})}(a),function(a,b){a.widget("mobile.controlgroup",a.extend({options:{enhanced:!1,theme:null,shadow:!1,corners:!0,excludeInvisible:!0,type:"vertical",mini:!1},_create:function(){var b=this.element,c=this.options;a.fn.buttonMarkup&&this.element.find(a.fn.buttonMarkup.initSelector).buttonMarkup(),a.each(this._childWidgets,a.proxy(function(b,c){a.mobile[c]&&this.element.find(a.mobile[c].initSelector).not(a.mobile.page.prototype.keepNativeSelector())[c]()},this)),a.extend(this,{_ui:null,_initialRefresh:!0}),this._ui=c.enhanced?{groupLegend:b.children(".ui-controlgroup-label").children(),childWrapper:b.children(".ui-controlgroup-controls")}:this._enhance()},_childWidgets:["checkboxradio","selectmenu","button"],_themeClassFromOption:function(a){return a?"none"===a?"":"ui-group-theme-"+a:""},_enhance:function(){var b=this.element,c=this.options,d={groupLegend:b.children("legend"),childWrapper:b.addClass("ui-controlgroup ui-controlgroup-"+("horizontal"===c.type?"horizontal":"vertical")+" "+this._themeClassFromOption(c.theme)+" "+(c.corners?"ui-corner-all ":"")+(c.mini?"ui-mini ":"")).wrapInner("<div class='ui-controlgroup-controls "+(c.shadow===!0?"ui-shadow":"")+"'></div>").children()};return d.groupLegend.length>0&&a("<div role='heading' class='ui-controlgroup-label'></div>").append(d.groupLegend).prependTo(b),d},_init:function(){this.refresh()},_setOptions:function(a){var c,d,e=this.element;return a.type!==b&&(e.removeClass("ui-controlgroup-horizontal ui-controlgroup-vertical").addClass("ui-controlgroup-"+("horizontal"===a.type?"horizontal":"vertical")),c=!0),a.theme!==b&&e.removeClass(this._themeClassFromOption(this.options.theme)).addClass(this._themeClassFromOption(a.theme)),a.corners!==b&&e.toggleClass("ui-corner-all",a.corners),a.mini!==b&&e.toggleClass("ui-mini",a.mini),a.shadow!==b&&this._ui.childWrapper.toggleClass("ui-shadow",a.shadow),a.excludeInvisible!==b&&(this.options.excludeInvisible=a.excludeInvisible,c=!0),d=this._super(a),c&&this.refresh(),d},container:function(){return this._ui.childWrapper},refresh:function(){var b=this.container(),c=b.find(".ui-btn").not(".ui-slider-handle"),d=this._initialRefresh;a.mobile.checkboxradio&&b.find(":mobile-checkboxradio").checkboxradio("refresh"),this._addFirstLastClasses(c,this.options.excludeInvisible?this._getVisibles(c,d):c,d),this._initialRefresh=!1},_destroy:function(){var a,b,c=this.options;return c.enhanced?this:(a=this._ui,b=this.element.removeClass("ui-controlgroup ui-controlgroup-horizontal ui-controlgroup-vertical ui-corner-all ui-mini "+this._themeClassFromOption(c.theme)).find(".ui-btn").not(".ui-slider-handle"),this._removeFirstLastClasses(b),a.groupLegend.unwrap(),void a.childWrapper.children().unwrap())}},a.mobile.behaviors.addFirstLastClasses))}(a),function(a,b){a.widget("mobile.toolbar",{initSelector:":jqmData(role='footer'), :jqmData(role='header')",options:{theme:null,addBackBtn:!1,backBtnTheme:null,backBtnText:"Back"},_create:function(){var b,c,d=this.element.is(":jqmData(role='header')")?"header":"footer",e=this.element.closest(".ui-page");0===e.length&&(e=!1,this._on(this.document,{pageshow:"refresh"})),a.extend(this,{role:d,page:e,leftbtn:b,rightbtn:c}),this.element.attr("role","header"===d?"banner":"contentinfo").addClass("ui-"+d),this.refresh(),this._setOptions(this.options)},_setOptions:function(a){if(a.addBackBtn!==b&&this._updateBackButton(),null!=a.backBtnTheme&&this.element.find(".ui-toolbar-back-btn").addClass("ui-btn ui-btn-"+a.backBtnTheme),a.backBtnText!==b&&this.element.find(".ui-toolbar-back-btn .ui-btn-text").text(a.backBtnText),a.theme!==b){var c=this.options.theme?this.options.theme:"inherit",d=a.theme?a.theme:"inherit";this.element.removeClass("ui-bar-"+c).addClass("ui-bar-"+d)}this._super(a)},refresh:function(){"header"===this.role&&this._addHeaderButtonClasses(),this.page||(this._setRelative(),"footer"===this.role?this.element.appendTo("body"):"header"===this.role&&this._updateBackButton()),this._addHeadingClasses(),this._btnMarkup()},_setRelative:function(){a("[data-"+a.mobile.ns+"role='page']").css({position:"relative"})},_btnMarkup:function(){this.element.children("a").filter(":not([data-"+a.mobile.ns+"role='none'])").attr("data-"+a.mobile.ns+"role","button"),this.element.trigger("create")},_addHeaderButtonClasses:function(){var a=this.element.children("a, button");this.leftbtn=a.hasClass("ui-btn-left")&&!a.hasClass("ui-toolbar-back-btn"),this.rightbtn=a.hasClass("ui-btn-right"),this.leftbtn=this.leftbtn||a.eq(0).not(".ui-btn-right,.ui-toolbar-back-btn").addClass("ui-btn-left").length,this.rightbtn=this.rightbtn||a.eq(1).addClass("ui-btn-right").length},_updateBackButton:function(){var b,c=this.options,d=c.backBtnTheme||c.theme;b=this._backButton=this._backButton||{},this.options.addBackBtn&&"header"===this.role&&a(".ui-page").length>1&&(this.page?this.page[0].getAttribute("data-"+a.mobile.ns+"url")!==a.mobile.path.stripHash(location.hash):a.mobile.navigate&&a.mobile.navigate.history&&a.mobile.navigate.history.activeIndex>0)&&!this.leftbtn?b.attached||(b.element=(b.element||a("<a role='button' href='javascript:void(0);' class='ui-btn ui-corner-all ui-shadow ui-btn-left "+(d?"ui-btn-"+d+" ":"")+"ui-toolbar-back-btn ui-icon-carat-l ui-btn-icon-left' data-"+a.mobile.ns+"rel='back'>"+c.backBtnText+"</a>")).prependTo(this.element),b.attached=!0):b.element&&(b.element.detach(),b.attached=!1)},_addHeadingClasses:function(){this.element.children("h1, h2, h3, h4, h5, h6").addClass("ui-title").attr({role:"heading","aria-level":"1"})}})}(a),function(a,b){a.widget("mobile.toolbar",a.mobile.toolbar,{options:{position:null,visibleOnPageShow:!0,disablePageZoom:!0,transition:"slide",fullscreen:!1,tapToggle:!0,tapToggleBlacklist:"a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-flipswitch, .ui-popup, .ui-panel, .ui-panel-dismiss-open",hideDuringFocus:"input, textarea, select",updatePagePadding:!0,trackPersistentToolbars:!0,supportBlacklist:function(){return!a.support.fixedPosition}},_create:function(){this._super(),"fixed"!==this.options.position||this.options.supportBlacklist()||this._makeFixed()},_makeFixed:function(){this.element.addClass("ui-"+this.role+"-fixed"),this.updatePagePadding(),this._addTransitionClass(),this._bindPageEvents(),this._bindToggleHandlers()},_setOptions:function(c){if("fixed"===c.position&&"fixed"!==this.options.position&&this._makeFixed(),"fixed"===this.options.position&&!this.options.supportBlacklist()){var d=this.page?this.page:a(".ui-page-active").length>0?a(".ui-page-active"):a(".ui-page").eq(0);c.fullscreen!==b&&(c.fullscreen?(this.element.addClass("ui-"+this.role+"-fullscreen"),d.addClass("ui-page-"+this.role+"-fullscreen")):(this.element.removeClass("ui-"+this.role+"-fullscreen"),d.removeClass("ui-page-"+this.role+"-fullscreen").addClass("ui-page-"+this.role+"-fixed")))}this._super(c)},_addTransitionClass:function(){var a=this.options.transition;a&&"none"!==a&&("slide"===a&&(a=this.element.hasClass("ui-header")?"slidedown":"slideup"),this.element.addClass(a))},_bindPageEvents:function(){var a=this.page?this.element.closest(".ui-page"):this.document;this._on(a,{pagebeforeshow:"_handlePageBeforeShow",webkitAnimationStart:"_handleAnimationStart",animationstart:"_handleAnimationStart",updatelayout:"_handleAnimationStart",pageshow:"_handlePageShow",pagebeforehide:"_handlePageBeforeHide"})},_handlePageBeforeShow:function(){var b=this.options;b.disablePageZoom&&a.mobile.zoom.disable(!0),b.visibleOnPageShow||this.hide(!0)},_handleAnimationStart:function(){this.options.updatePagePadding&&this.updatePagePadding(this.page?this.page:".ui-page-active")},_handlePageShow:function(){this.updatePagePadding(this.page?this.page:".ui-page-active"),this.options.updatePagePadding&&this._on(this.window,{throttledresize:"updatePagePadding"})},_handlePageBeforeHide:function(b,c){var d,e,f,g,h=this.options;h.disablePageZoom&&a.mobile.zoom.enable(!0),h.updatePagePadding&&this._off(this.window,"throttledresize"),h.trackPersistentToolbars&&(d=a(".ui-footer-fixed:jqmData(id)",this.page),e=a(".ui-header-fixed:jqmData(id)",this.page),f=d.length&&c.nextPage&&a(".ui-footer-fixed:jqmData(id='"+d.jqmData("id")+"')",c.nextPage)||a(),g=e.length&&c.nextPage&&a(".ui-header-fixed:jqmData(id='"+e.jqmData("id")+"')",c.nextPage)||a(),(f.length||g.length)&&(f.add(g).appendTo(a.mobile.pageContainer),c.nextPage.one("pageshow",function(){g.prependTo(this),f.appendTo(this)})))},_visible:!0,updatePagePadding:function(c){var d=this.element,e="header"===this.role,f=parseFloat(d.css(e?"top":"bottom"));this.options.fullscreen||(c=c&&c.type===b&&c||this.page||d.closest(".ui-page"),c=this.page?this.page:".ui-page-active",a(c).css("padding-"+(e?"top":"bottom"),d.outerHeight()+f))},_useTransition:function(b){var c=this.window,d=this.element,e=c.scrollTop(),f=d.height(),g=this.page?d.closest(".ui-page").height():a(".ui-page-active").height(),h=a.mobile.getScreenHeight();return!b&&(this.options.transition&&"none"!==this.options.transition&&("header"===this.role&&!this.options.fullscreen&&e>f||"footer"===this.role&&!this.options.fullscreen&&g-f>e+h)||this.options.fullscreen)},show:function(a){var b="ui-fixed-hidden",c=this.element;this._useTransition(a)?c.removeClass("out "+b).addClass("in").animationComplete(function(){c.removeClass("in")}):c.removeClass(b),this._visible=!0},hide:function(a){var b="ui-fixed-hidden",c=this.element,d="out"+("slide"===this.options.transition?" reverse":"");this._useTransition(a)?c.addClass(d).removeClass("in").animationComplete(function(){c.addClass(b).removeClass(d)}):c.addClass(b).removeClass(d),this._visible=!1},toggle:function(){this[this._visible?"hide":"show"]()},_bindToggleHandlers:function(){var b,c,d=this,e=d.options,f=!0,g=this.page?this.page:a(".ui-page");g.bind("vclick",function(b){e.tapToggle&&!a(b.target).closest(e.tapToggleBlacklist).length&&d.toggle()}).bind("focusin focusout",function(g){screen.width<1025&&a(g.target).is(e.hideDuringFocus)&&!a(g.target).closest(".ui-header-fixed, .ui-footer-fixed").length&&("focusout"!==g.type||f?"focusin"===g.type&&f&&(clearTimeout(b),f=!1,c=setTimeout(function(){d.hide()},0)):(f=!0,clearTimeout(c),b=setTimeout(function(){d.show()},0)))})},_setRelative:function(){"fixed"!==this.options.position&&a("[data-"+a.mobile.ns+"role='page']").css({position:"relative"})},_destroy:function(){var a=this.element,b=a.hasClass("ui-header");a.closest(".ui-page").css("padding-"+(b?"top":"bottom"),""),a.removeClass("ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden"),a.closest(".ui-page").removeClass("ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen")}})}(a),function(a){a.widget("mobile.toolbar",a.mobile.toolbar,{_makeFixed:function(){this._super(),this._workarounds()},_workarounds:function(){var a=navigator.userAgent,b=navigator.platform,c=a.match(/AppleWebKit\/([0-9]+)/),d=!!c&&c[1],e=null,f=this;if(b.indexOf("iPhone")>-1||b.indexOf("iPad")>-1||b.indexOf("iPod")>-1)e="ios";else{if(!(a.indexOf("Android")>-1))return;e="android"}if("ios"===e)f._bindScrollWorkaround();else{if(!("android"===e&&d&&534>d))return;f._bindScrollWorkaround(),f._bindListThumbWorkaround()}},_viewportOffset:function(){var a=this.element,b=a.hasClass("ui-header"),c=Math.abs(a.offset().top-this.window.scrollTop());return b||(c=Math.round(c-this.window.height()+a.outerHeight())-60),c},_bindScrollWorkaround:function(){var a=this;this._on(this.window,{scrollstop:function(){var b=a._viewportOffset();b>2&&a._visible&&a._triggerRedraw()}})},_bindListThumbWorkaround:function(){this.element.closest(".ui-page").addClass("ui-android-2x-fixed")},_triggerRedraw:function(){var b=parseFloat(a(".ui-page-active").css("padding-bottom"));a(".ui-page-active").css("padding-bottom",b+1+"px"),setTimeout(function(){a(".ui-page-active").css("padding-bottom",b+"px")},0)},destroy:function(){this._super(),this.element.closest(".ui-page-active").removeClass("ui-android-2x-fix")}})}(a),function(a,b){function c(){var a=e.clone(),b=a.eq(0),c=a.eq(1),d=c.children();return{arEls:c.add(b),gd:b,ct:c,ar:d}
+}var d=a.mobile.browser.oldIE&&a.mobile.browser.oldIE<=8,e=a("<div class='ui-popup-arrow-guide'></div><div class='ui-popup-arrow-container"+(d?" ie":"")+"'><div class='ui-popup-arrow'></div></div>");a.widget("mobile.popup",a.mobile.popup,{options:{arrow:""},_create:function(){var a,b=this._super();return this.options.arrow&&(this._ui.arrow=a=this._addArrow()),b},_addArrow:function(){var a,b=this.options,d=c();return a=this._themeClassFromOption("ui-body-",b.theme),d.ar.addClass(a+(b.shadow?" ui-overlay-shadow":"")),d.arEls.hide().appendTo(this.element),d},_unenhance:function(){var a=this._ui.arrow;return a&&a.arEls.remove(),this._super()},_tryAnArrow:function(a,b,c,d,e){var f,g,h,i={},j={};return d.arFull[a.dimKey]>d.guideDims[a.dimKey]?e:(i[a.fst]=c[a.fst]+(d.arHalf[a.oDimKey]+d.menuHalf[a.oDimKey])*a.offsetFactor-d.contentBox[a.fst]+(d.clampInfo.menuSize[a.oDimKey]-d.contentBox[a.oDimKey])*a.arrowOffsetFactor,i[a.snd]=c[a.snd],f=d.result||this._calculateFinalLocation(i,d.clampInfo),g={x:f.left,y:f.top},j[a.fst]=g[a.fst]+d.contentBox[a.fst]+a.tipOffset,j[a.snd]=Math.max(f[a.prop]+d.guideOffset[a.prop]+d.arHalf[a.dimKey],Math.min(f[a.prop]+d.guideOffset[a.prop]+d.guideDims[a.dimKey]-d.arHalf[a.dimKey],c[a.snd])),h=Math.abs(c.x-j.x)+Math.abs(c.y-j.y),(!e||h<e.diff)&&(j[a.snd]-=d.arHalf[a.dimKey]+f[a.prop]+d.contentBox[a.snd],e={dir:b,diff:h,result:f,posProp:a.prop,posVal:j[a.snd]}),e)},_getPlacementState:function(a){var b,c,d=this._ui.arrow,e={clampInfo:this._clampPopupWidth(!a),arFull:{cx:d.ct.width(),cy:d.ct.height()},guideDims:{cx:d.gd.width(),cy:d.gd.height()},guideOffset:d.gd.offset()};return b=this.element.offset(),d.gd.css({left:0,top:0,right:0,bottom:0}),c=d.gd.offset(),e.contentBox={x:c.left-b.left,y:c.top-b.top,cx:d.gd.width(),cy:d.gd.height()},d.gd.removeAttr("style"),e.guideOffset={left:e.guideOffset.left-b.left,top:e.guideOffset.top-b.top},e.arHalf={cx:e.arFull.cx/2,cy:e.arFull.cy/2},e.menuHalf={cx:e.clampInfo.menuSize.cx/2,cy:e.clampInfo.menuSize.cy/2},e},_placementCoords:function(b){var c,e,f,g,h,i=this.options.arrow,j=this._ui.arrow;return j?(j.arEls.show(),h={},c=this._getPlacementState(!0),f={l:{fst:"x",snd:"y",prop:"top",dimKey:"cy",oDimKey:"cx",offsetFactor:1,tipOffset:-c.arHalf.cx,arrowOffsetFactor:0},r:{fst:"x",snd:"y",prop:"top",dimKey:"cy",oDimKey:"cx",offsetFactor:-1,tipOffset:c.arHalf.cx+c.contentBox.cx,arrowOffsetFactor:1},b:{fst:"y",snd:"x",prop:"left",dimKey:"cx",oDimKey:"cy",offsetFactor:-1,tipOffset:c.arHalf.cy+c.contentBox.cy,arrowOffsetFactor:1},t:{fst:"y",snd:"x",prop:"left",dimKey:"cx",oDimKey:"cy",offsetFactor:1,tipOffset:-c.arHalf.cy,arrowOffsetFactor:0}},a.each((i===!0?"l,t,r,b":i).split(","),a.proxy(function(a,d){e=this._tryAnArrow(f[d],d,b,c,e)},this)),e?(j.ct.removeClass("ui-popup-arrow-l ui-popup-arrow-t ui-popup-arrow-r ui-popup-arrow-b").addClass("ui-popup-arrow-"+e.dir).removeAttr("style").css(e.posProp,e.posVal).show(),d||(g=this.element.offset(),h[f[e.dir].fst]=j.ct.offset(),h[f[e.dir].snd]={left:g.left+c.contentBox.x,top:g.top+c.contentBox.y}),e.result):(j.arEls.hide(),this._super(b))):this._super(b)},_setOptions:function(a){var c,d=this.options.theme,e=this._ui.arrow,f=this._super(a);if(a.arrow!==b){if(!e&&a.arrow)return void(this._ui.arrow=this._addArrow());e&&!a.arrow&&(e.arEls.remove(),this._ui.arrow=null)}return e=this._ui.arrow,e&&(a.theme!==b&&(d=this._themeClassFromOption("ui-body-",d),c=this._themeClassFromOption("ui-body-",a.theme),e.ar.removeClass(d).addClass(c)),a.shadow!==b&&e.ar.toggleClass("ui-overlay-shadow",a.shadow)),f},_destroy:function(){var a=this._ui.arrow;return a&&a.arEls.remove(),this._super()}})}(a),function(a,c){a.widget("mobile.panel",{options:{classes:{panel:"ui-panel",panelOpen:"ui-panel-open",panelClosed:"ui-panel-closed",panelFixed:"ui-panel-fixed",panelInner:"ui-panel-inner",modal:"ui-panel-dismiss",modalOpen:"ui-panel-dismiss-open",pageContainer:"ui-panel-page-container",pageWrapper:"ui-panel-wrapper",pageFixedToolbar:"ui-panel-fixed-toolbar",pageContentPrefix:"ui-panel-page-content",animate:"ui-panel-animate"},animate:!0,theme:null,position:"left",dismissible:!0,display:"reveal",swipeClose:!0,positionFixed:!1},_closeLink:null,_parentPage:null,_page:null,_modal:null,_panelInner:null,_wrapper:null,_fixedToolbars:null,_create:function(){var b=this.element,c=b.closest(".ui-page, :jqmData(role='page')");a.extend(this,{_closeLink:b.find(":jqmData(rel='close')"),_parentPage:c.length>0?c:!1,_openedPage:null,_page:this._getPage,_panelInner:this._getPanelInner(),_fixedToolbars:this._getFixedToolbars}),"overlay"!==this.options.display&&this._getWrapper(),this._addPanelClasses(),a.support.cssTransform3d&&this.options.animate&&this.element.addClass(this.options.classes.animate),this._bindUpdateLayout(),this._bindCloseEvents(),this._bindLinkListeners(),this._bindPageEvents(),this.options.dismissible&&this._createModal(),this._bindSwipeEvents()},_getPanelInner:function(){var a=this.element.find("."+this.options.classes.panelInner);return 0===a.length&&(a=this.element.children().wrapAll("<div class='"+this.options.classes.panelInner+"' />").parent()),a},_createModal:function(){var b=this,c=b._parentPage?b._parentPage.parent():b.element.parent();b._modal=a("<div class='"+b.options.classes.modal+"'></div>").on("mousedown",function(){b.close()}).appendTo(c)},_getPage:function(){var b=this._openedPage||this._parentPage||a("."+a.mobile.activePageClass);return b},_getWrapper:function(){var a=this._page().find("."+this.options.classes.pageWrapper);0===a.length&&(a=this._page().children(".ui-header:not(.ui-header-fixed), .ui-content:not(.ui-popup), .ui-footer:not(.ui-footer-fixed)").wrapAll("<div class='"+this.options.classes.pageWrapper+"'></div>").parent()),this._wrapper=a},_getFixedToolbars:function(){var b=a("body").children(".ui-header-fixed, .ui-footer-fixed"),c=this._page().find(".ui-header-fixed, .ui-footer-fixed"),d=b.add(c).addClass(this.options.classes.pageFixedToolbar);return d},_getPosDisplayClasses:function(a){return a+"-position-"+this.options.position+" "+a+"-display-"+this.options.display},_getPanelClasses:function(){var a=this.options.classes.panel+" "+this._getPosDisplayClasses(this.options.classes.panel)+" "+this.options.classes.panelClosed+" ui-body-"+(this.options.theme?this.options.theme:"inherit");return this.options.positionFixed&&(a+=" "+this.options.classes.panelFixed),a},_addPanelClasses:function(){this.element.addClass(this._getPanelClasses())},_handleCloseClick:function(a){a.isDefaultPrevented()||this.close()},_bindCloseEvents:function(){this._on(this._closeLink,{click:"_handleCloseClick"}),this._on({"click a:jqmData(ajax='false')":"_handleCloseClick"})},_positionPanel:function(b){var c=this,d=c._panelInner.outerHeight(),e=d>a.mobile.getScreenHeight();e||!c.options.positionFixed?(e&&(c._unfixPanel(),a.mobile.resetActivePageHeight(d)),b&&this.window[0].scrollTo(0,a.mobile.defaultHomeScroll)):c._fixPanel()},_bindFixListener:function(){this._on(a(b),{throttledresize:"_positionPanel"})},_unbindFixListener:function(){this._off(a(b),"throttledresize")},_unfixPanel:function(){this.options.positionFixed&&a.support.fixedPosition&&this.element.removeClass(this.options.classes.panelFixed)},_fixPanel:function(){this.options.positionFixed&&a.support.fixedPosition&&this.element.addClass(this.options.classes.panelFixed)},_bindUpdateLayout:function(){var a=this;a.element.on("updatelayout",function(){a._open&&a._positionPanel()})},_bindLinkListeners:function(){this._on("body",{"click a":"_handleClick"})},_handleClick:function(b){var d,e=this.element.attr("id");b.currentTarget.href.split("#")[1]===e&&e!==c&&(b.preventDefault(),d=a(b.target),d.hasClass("ui-btn")&&(d.addClass(a.mobile.activeBtnClass),this.element.one("panelopen panelclose",function(){d.removeClass(a.mobile.activeBtnClass)})),this.toggle())},_bindSwipeEvents:function(){var a=this,b=a._modal?a.element.add(a._modal):a.element;a.options.swipeClose&&("left"===a.options.position?b.on("swipeleft.panel",function(){a.close()}):b.on("swiperight.panel",function(){a.close()}))},_bindPageEvents:function(){var a=this;this.document.on("panelbeforeopen",function(b){a._open&&b.target!==a.element[0]&&a.close()}).on("keyup.panel",function(b){27===b.keyCode&&a._open&&a.close()}),this._parentPage||"overlay"===this.options.display||this._on(this.document,{pageshow:"_getWrapper"}),a._parentPage?this.document.on("pagehide",":jqmData(role='page')",function(){a._open&&a.close(!0)}):this.document.on("pagebeforehide",function(){a._open&&a.close(!0)})},_open:!1,_pageContentOpenClasses:null,_modalOpenClasses:null,open:function(b){if(!this._open){var c=this,d=c.options,e=function(){c._off(c.document,"panelclose"),c._page().jqmData("panel","open"),a.support.cssTransform3d&&d.animate&&"overlay"!==d.display&&(c._wrapper.addClass(d.classes.animate),c._fixedToolbars().addClass(d.classes.animate)),!b&&a.support.cssTransform3d&&d.animate?(c._wrapper||c.element).animationComplete(f,"transition"):setTimeout(f,0),d.theme&&"overlay"!==d.display&&c._page().parent().addClass(d.classes.pageContainer+"-themed "+d.classes.pageContainer+"-"+d.theme),c.element.removeClass(d.classes.panelClosed).addClass(d.classes.panelOpen),c._positionPanel(!0),c._pageContentOpenClasses=c._getPosDisplayClasses(d.classes.pageContentPrefix),"overlay"!==d.display&&(c._page().parent().addClass(d.classes.pageContainer),c._wrapper.addClass(c._pageContentOpenClasses),c._fixedToolbars().addClass(c._pageContentOpenClasses)),c._modalOpenClasses=c._getPosDisplayClasses(d.classes.modal)+" "+d.classes.modalOpen,c._modal&&c._modal.addClass(c._modalOpenClasses).height(Math.max(c._modal.height(),c.document.height()))},f=function(){c._open&&("overlay"!==d.display&&(c._wrapper.addClass(d.classes.pageContentPrefix+"-open"),c._fixedToolbars().addClass(d.classes.pageContentPrefix+"-open")),c._bindFixListener(),c._trigger("open"),c._openedPage=c._page())};c._trigger("beforeopen"),"open"===c._page().jqmData("panel")?c._on(c.document,{panelclose:e}):e(),c._open=!0}},close:function(b){if(this._open){var c=this,d=this.options,e=function(){c.element.removeClass(d.classes.panelOpen),"overlay"!==d.display&&(c._wrapper.removeClass(c._pageContentOpenClasses),c._fixedToolbars().removeClass(c._pageContentOpenClasses)),!b&&a.support.cssTransform3d&&d.animate?(c._wrapper||c.element).animationComplete(f,"transition"):setTimeout(f,0),c._modal&&c._modal.removeClass(c._modalOpenClasses).height("")},f=function(){d.theme&&"overlay"!==d.display&&c._page().parent().removeClass(d.classes.pageContainer+"-themed "+d.classes.pageContainer+"-"+d.theme),c.element.addClass(d.classes.panelClosed),"overlay"!==d.display&&(c._page().parent().removeClass(d.classes.pageContainer),c._wrapper.removeClass(d.classes.pageContentPrefix+"-open"),c._fixedToolbars().removeClass(d.classes.pageContentPrefix+"-open")),a.support.cssTransform3d&&d.animate&&"overlay"!==d.display&&(c._wrapper.removeClass(d.classes.animate),c._fixedToolbars().removeClass(d.classes.animate)),c._fixPanel(),c._unbindFixListener(),a.mobile.resetActivePageHeight(),c._page().jqmRemoveData("panel"),c._trigger("close"),c._openedPage=null};c._trigger("beforeclose"),e(),c._open=!1}},toggle:function(){this[this._open?"close":"open"]()},_destroy:function(){var b,c=this.options,d=a("body > :mobile-panel").length+a.mobile.activePage.find(":mobile-panel").length>1;"overlay"!==c.display&&(b=a("body > :mobile-panel").add(a.mobile.activePage.find(":mobile-panel")),0===b.not(".ui-panel-display-overlay").not(this.element).length&&this._wrapper.children().unwrap(),this._open&&(this._fixedToolbars().removeClass(c.classes.pageContentPrefix+"-open"),a.support.cssTransform3d&&c.animate&&this._fixedToolbars().removeClass(c.classes.animate),this._page().parent().removeClass(c.classes.pageContainer),c.theme&&this._page().parent().removeClass(c.classes.pageContainer+"-themed "+c.classes.pageContainer+"-"+c.theme))),d||this.document.off("panelopen panelclose"),this._open&&this._page().jqmRemoveData("panel"),this._panelInner.children().unwrap(),this.element.removeClass([this._getPanelClasses(),c.classes.panelOpen,c.classes.animate].join(" ")).off("swipeleft.panel swiperight.panel").off("panelbeforeopen").off("panelhide").off("keyup.panel").off("updatelayout"),this._modal&&this._modal.remove()}})}(a),function(a,b){a.widget("mobile.table",{options:{classes:{table:"ui-table"},enhanced:!1},_create:function(){this.options.enhanced||this.element.addClass(this.options.classes.table),a.extend(this,{headers:b,allHeaders:b}),this._refresh(!0)},_setHeaders:function(){var a=this.element.find("thead tr");this.headers=this.element.find("tr:eq(0)").children(),this.allHeaders=this.headers.add(a.children())},refresh:function(){this._refresh()},rebuild:a.noop,_refresh:function(){var b=this.element,c=b.find("thead tr");this._setHeaders(),c.each(function(){var d=0;a(this).children().each(function(){var e,f=parseInt(this.getAttribute("colspan"),10),g=":nth-child("+(d+1)+")";if(this.setAttribute("data-"+a.mobile.ns+"colstart",d+1),f)for(e=0;f-1>e;e++)d++,g+=", :nth-child("+(d+1)+")";a(this).jqmData("cells",b.find("tr").not(c.eq(0)).not(this).children(g)),d++})})}})}(a),function(a){a.widget("mobile.table",a.mobile.table,{options:{mode:"columntoggle",columnBtnTheme:null,columnPopupTheme:null,columnBtnText:"Columns...",classes:a.extend(a.mobile.table.prototype.options.classes,{popup:"ui-table-columntoggle-popup",columnBtn:"ui-table-columntoggle-btn",priorityPrefix:"ui-table-priority-",columnToggleTable:"ui-table-columntoggle"})},_create:function(){this._super(),"columntoggle"===this.options.mode&&(a.extend(this,{_menu:null}),this.options.enhanced?(this._menu=a(this.document[0].getElementById(this._id()+"-popup")).children().first(),this._addToggles(this._menu,!0)):(this._menu=this._enhanceColToggle(),this.element.addClass(this.options.classes.columnToggleTable)),this._setupEvents(),this._setToggleState())},_id:function(){return this.element.attr("id")||this.widgetName+this.uuid},_setupEvents:function(){this._on(this.window,{throttledresize:"_setToggleState"}),this._on(this._menu,{"change input":"_menuInputChange"})},_addToggles:function(b,c){var d,e=0,f=this.options,g=b.controlgroup("container");c?d=b.find("input"):g.empty(),this.headers.not("td").each(function(){var b,h,i=a(this),j=a.mobile.getAttribute(this,"priority");j&&(h=i.add(i.jqmData("cells")),h.addClass(f.classes.priorityPrefix+j),b=(c?d.eq(e++):a("<label><input type='checkbox' checked />"+(i.children("abbr").first().attr("title")||i.text())+"</label>").appendTo(g).children(0).checkboxradio({theme:f.columnPopupTheme})).jqmData("header",i).jqmData("cells",h),i.jqmData("input",b))}),c||b.controlgroup("refresh")},_menuInputChange:function(b){var c=a(b.target),d=c[0].checked;c.jqmData("cells").toggleClass("ui-table-cell-hidden",!d).toggleClass("ui-table-cell-visible",d)},_unlockCells:function(a){a.removeClass("ui-table-cell-hidden ui-table-cell-visible")},_enhanceColToggle:function(){var b,c,d,e,f=this.element,g=this.options,h=a.mobile.ns,i=this.document[0].createDocumentFragment();return b=this._id()+"-popup",c=a("<a href='#"+b+"' class='"+g.classes.columnBtn+" ui-btn ui-btn-"+(g.columnBtnTheme||"a")+" ui-corner-all ui-shadow ui-mini' data-"+h+"rel='popup'>"+g.columnBtnText+"</a>"),d=a("<div class='"+g.classes.popup+"' id='"+b+"'></div>"),e=a("<fieldset></fieldset>").controlgroup(),this._addToggles(e,!1),e.appendTo(d),i.appendChild(d[0]),i.appendChild(c[0]),f.before(i),d.popup(),e},rebuild:function(){this._super(),"columntoggle"===this.options.mode&&this._refresh(!1)},_refresh:function(b){var c,d,e;if(this._super(b),!b&&"columntoggle"===this.options.mode)for(c=this.headers,d=[],this._menu.find("input").each(function(){var b=a(this),e=b.jqmData("header"),f=c.index(e[0]);f>-1&&!b.prop("checked")&&d.push(f)}),this._unlockCells(this.element.find(".ui-table-cell-hidden, .ui-table-cell-visible")),this._addToggles(this._menu,b),e=d.length-1;e>-1;e--)c.eq(d[e]).jqmData("input").prop("checked",!1).checkboxradio("refresh").trigger("change")},_setToggleState:function(){this._menu.find("input").each(function(){var b=a(this);this.checked="table-cell"===b.jqmData("cells").eq(0).css("display"),b.checkboxradio("refresh")})},_destroy:function(){this._super()}})}(a),function(a){a.widget("mobile.table",a.mobile.table,{options:{mode:"reflow",classes:a.extend(a.mobile.table.prototype.options.classes,{reflowTable:"ui-table-reflow",cellLabels:"ui-table-cell-label"})},_create:function(){this._super(),"reflow"===this.options.mode&&(this.options.enhanced||(this.element.addClass(this.options.classes.reflowTable),this._updateReflow()))},rebuild:function(){this._super(),"reflow"===this.options.mode&&this._refresh(!1)},_refresh:function(a){this._super(a),a||"reflow"!==this.options.mode||this._updateReflow()},_updateReflow:function(){var b=this,c=this.options;a(b.allHeaders.get().reverse()).each(function(){var d,e,f=a(this).jqmData("cells"),g=a.mobile.getAttribute(this,"colstart"),h=f.not(this).filter("thead th").length&&" ui-table-cell-label-top",i=a(this).clone().contents();i.length>0&&(h?(d=parseInt(this.getAttribute("colspan"),10),e="",d&&(e="td:nth-child("+d+"n + "+g+")"),b._addLabels(f.filter(e),c.classes.cellLabels+h,i)):b._addLabels(f,c.classes.cellLabels,i))})},_addLabels:function(b,c,d){b.not(":has(b."+c+")").prepend(a("<b class='"+c+"'></b>").append(d))}})}(a),function(a,c){var d=function(b,c){return-1===(""+(a.mobile.getAttribute(this,"filtertext")||a(this).text())).toLowerCase().indexOf(c)};a.widget("mobile.filterable",{initSelector:":jqmData(filter='true')",options:{filterReveal:!1,filterCallback:d,enhanced:!1,input:null,children:"> li, > option, > optgroup option, > tbody tr, > .ui-controlgroup-controls > .ui-btn, > .ui-controlgroup-controls > .ui-checkbox, > .ui-controlgroup-controls > .ui-radio"},_create:function(){var b=this.options;a.extend(this,{_search:null,_timer:0}),this._setInput(b.input),b.enhanced||this._filterItems((this._search&&this._search.val()||"").toLowerCase())},_onKeyUp:function(){var c,d,e=this._search;if(e){if(c=e.val().toLowerCase(),d=a.mobile.getAttribute(e[0],"lastval")+"",d&&d===c)return;this._timer&&(b.clearTimeout(this._timer),this._timer=0),this._timer=this._delay(function(){return this._trigger("beforefilter",null,{input:e})===!1?!1:(e[0].setAttribute("data-"+a.mobile.ns+"lastval",c),this._filterItems(c),void(this._timer=0))},250)}},_getFilterableItems:function(){var b=this.element,c=this.options.children,d=c?a.isFunction(c)?c():c.nodeName?a(c):c.jquery?c:this.element.find(c):{length:0};return 0===d.length&&(d=b.children()),d},_filterItems:function(b){var c,e,f,g,h=[],i=[],j=this.options,k=this._getFilterableItems();if(null!=b)for(e=j.filterCallback||d,f=k.length,c=0;f>c;c++)g=e.call(k[c],c,b)?i:h,g.push(k[c]);0===i.length?k[j.filterReveal&&0===b.length?"addClass":"removeClass"]("ui-screen-hidden"):(a(i).addClass("ui-screen-hidden"),a(h).removeClass("ui-screen-hidden")),this._refreshChildWidget(),this._trigger("filter",null,{items:k})},_refreshChildWidget:function(){var b,c,d=["collapsibleset","selectmenu","controlgroup","listview"];for(c=d.length-1;c>-1;c--)b=d[c],a.mobile[b]&&(b=this.element.data("mobile-"+b),b&&a.isFunction(b.refresh)&&b.refresh())},_setInput:function(c){var d=this._search;this._timer&&(b.clearTimeout(this._timer),this._timer=0),d&&(this._off(d,"keyup change input"),d=null),c&&(d=c.jquery?c:c.nodeName?a(c):this.document.find(c),this._on(d,{keydown:"_onKeyDown",keypress:"_onKeyPress",keyup:"_onKeyUp",change:"_onKeyUp",input:"_onKeyUp"})),this._search=d},_onKeyDown:function(b){b.keyCode===a.ui.keyCode.ENTER&&(b.preventDefault(),this._preventKeyPress=!0)},_onKeyPress:function(a){this._preventKeyPress&&(a.preventDefault(),this._preventKeyPress=!1)},_setOptions:function(a){var b=!(a.filterReveal===c&&a.filterCallback===c&&a.children===c);this._super(a),a.input!==c&&(this._setInput(a.input),b=!0),b&&this.refresh()},_destroy:function(){var a=this.options,b=this._getFilterableItems();a.enhanced?b.toggleClass("ui-screen-hidden",a.filterReveal):b.removeClass("ui-screen-hidden")},refresh:function(){this._timer&&(b.clearTimeout(this._timer),this._timer=0),this._filterItems((this._search&&this._search.val()||"").toLowerCase())}})}(a),function(a,b){var c=function(a,b){return function(c){b.call(this,c),a._syncTextInputOptions(c)}},d=/(^|\s)ui-li-divider(\s|$)/,e=a.mobile.filterable.prototype.options.filterCallback;a.mobile.filterable.prototype.options.filterCallback=function(a,b){return!this.className.match(d)&&e.call(this,a,b)},a.widget("mobile.filterable",a.mobile.filterable,{options:{filterPlaceholder:"Filter items...",filterTheme:null},_create:function(){var b,c,d=this.element,e=["collapsibleset","selectmenu","controlgroup","listview"],f={};for(this._super(),a.extend(this,{_widget:null}),b=e.length-1;b>-1;b--)if(c=e[b],a.mobile[c]){if(this._setWidget(d.data("mobile-"+c)))break;f[c+"create"]="_handleCreate"}this._widget||this._on(d,f)},_handleCreate:function(a){this._setWidget(this.element.data("mobile-"+a.type.substring(0,a.type.length-6)))},_trigger:function(a,b,c){return this._widget&&"mobile-listview"===this._widget.widgetFullName&&"beforefilter"===a&&this._widget._trigger("beforefilter",b,c),this._super(a,b,c)},_setWidget:function(a){return!this._widget&&a&&(this._widget=a,this._widget._setOptions=c(this,this._widget._setOptions)),this._widget&&(this._syncTextInputOptions(this._widget.options),"listview"===this._widget.widgetName&&(this._widget.options.hideDividers=!0,this._widget.element.listview("refresh"))),!!this._widget},_isSearchInternal:function(){return this._search&&this._search.jqmData("ui-filterable-"+this.uuid+"-internal")},_setInput:function(b){var c=this.options,d=!0,e={};if(!b){if(this._isSearchInternal())return;d=!1,b=a("<input data-"+a.mobile.ns+"type='search' placeholder='"+c.filterPlaceholder+"'></input>").jqmData("ui-filterable-"+this.uuid+"-internal",!0),a("<form class='ui-filterable'></form>").append(b).submit(function(a){a.preventDefault(),b.blur()}).insertBefore(this.element),a.mobile.textinput&&(null!=this.options.filterTheme&&(e.theme=c.filterTheme),b.textinput(e))}this._super(b),this._isSearchInternal()&&d&&this._search.attr("placeholder",this.options.filterPlaceholder)},_setOptions:function(c){var d=this._super(c);return c.filterPlaceholder!==b&&this._isSearchInternal()&&this._search.attr("placeholder",c.filterPlaceholder),c.filterTheme!==b&&this._search&&a.mobile.textinput&&this._search.textinput("option","theme",c.filterTheme),d},_destroy:function(){this._isSearchInternal()&&this._search.remove(),this._super()},_syncTextInputOptions:function(c){var d,e={};if(this._isSearchInternal()&&a.mobile.textinput){for(d in a.mobile.textinput.prototype.options)c[d]!==b&&(e[d]="theme"===d&&null!=this.options.filterTheme?this.options.filterTheme:c[d]);this._search.textinput("option",e)}}}),a.widget("mobile.listview",a.mobile.listview,{options:{filter:!1},_create:function(){return this.options.filter!==!0||this.element.data("mobile-filterable")||this.element.filterable(),this._super()},_afterListviewRefresh:function(){var a=this.element.data("mobile-filterable");this.options.filter===!0&&a&&(this._preventRefreshLoop=!0,a.refresh())},refresh:function(){var a;return this._preventRefreshLoop||(a=this._superApply(arguments)),this._preventRefreshLoop=!1,a}})}(a),function(a,b){function c(){return++e}function d(a){return a.hash.length>1&&decodeURIComponent(a.href.replace(f,""))===decodeURIComponent(location.href.replace(f,""))}var e=0,f=/#.*$/;a.widget("ui.tabs",{version:"fadf2b312a05040436451c64bbfaf4814bc62c56",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var b=this,c=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",c.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(b){a(this).is(".ui-state-disabled")&&b.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){a(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),c.active=this._initialActive(),a.isArray(c.disabled)&&(c.disabled=a.unique(c.disabled.concat(a.map(this.tabs.filter(".ui-state-disabled"),function(a){return b.tabs.index(a)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(c.active):a(),this._refresh(),this.active.length&&this.load(c.active)},_initialActive:function(){var b=this.options.active,c=this.options.collapsible,d=location.hash.substring(1);return null===b&&(d&&this.tabs.each(function(c,e){return a(e).attr("aria-controls")===d?(b=c,!1):void 0}),null===b&&(b=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===b||-1===b)&&(b=this.tabs.length?0:!1)),b!==!1&&(b=this.tabs.index(this.tabs.eq(b)),-1===b&&(b=c?!1:0)),!c&&b===!1&&this.anchors.length&&(b=0),b},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):a()}},_tabKeydown:function(b){var c=a(this.document[0].activeElement).closest("li"),d=this.tabs.index(c),e=!0;if(!this._handlePageNav(b)){switch(b.keyCode){case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:d++;break;case a.ui.keyCode.UP:case a.ui.keyCode.LEFT:e=!1,d--;break;case a.ui.keyCode.END:d=this.anchors.length-1;break;case a.ui.keyCode.HOME:d=0;break;case a.ui.keyCode.SPACE:return b.preventDefault(),clearTimeout(this.activating),void this._activate(d);case a.ui.keyCode.ENTER:return b.preventDefault(),clearTimeout(this.activating),void this._activate(d===this.options.active?!1:d);default:return}b.preventDefault(),clearTimeout(this.activating),d=this._focusNextTab(d,e),b.ctrlKey||(c.attr("aria-selected","false"),this.tabs.eq(d).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",d)},this.delay))}},_panelKeydown:function(b){this._handlePageNav(b)||b.ctrlKey&&b.keyCode===a.ui.keyCode.UP&&(b.preventDefault(),this.active.focus())},_handlePageNav:function(b){return b.altKey&&b.keyCode===a.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):b.altKey&&b.keyCode===a.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(b,c){function d(){return b>e&&(b=0),0>b&&(b=e),b}for(var e=this.tabs.length-1;-1!==a.inArray(d(),this.options.disabled);)b=c?b+1:b-1;return b},_focusNextTab:function(a,b){return a=this._findNextTab(a,b),this.tabs.eq(a).focus(),a},_setOption:function(a,b){return"active"===a?void this._activate(b):"disabled"===a?void this._setupDisabled(b):(this._super(a,b),"collapsible"===a&&(this.element.toggleClass("ui-tabs-collapsible",b),b||this.options.active!==!1||this._activate(0)),"event"===a&&this._setupEvents(b),void("heightStyle"===a&&this._setupHeightStyle(b)))},_tabId:function(a){return a.attr("aria-controls")||"ui-tabs-"+c()},_sanitizeSelector:function(a){return a?a.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var b=this.options,c=this.tablist.children(":has(a[href])");b.disabled=a.map(c.filter(".ui-state-disabled"),function(a){return c.index(a)}),this._processTabs(),b.active!==!1&&this.anchors.length?this.active.length&&!a.contains(this.tablist[0],this.active[0])?this.tabs.length===b.disabled.length?(b.active=!1,this.active=a()):this._activate(this._findNextTab(Math.max(0,b.active-1),!1)):b.active=this.tabs.index(this.active):(b.active=!1,this.active=a()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var b=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return a("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=a(),this.anchors.each(function(c,e){var f,g,h,i=a(e).uniqueId().attr("id"),j=a(e).closest("li"),k=j.attr("aria-controls");d(e)?(f=e.hash,g=b.element.find(b._sanitizeSelector(f))):(h=b._tabId(j),f="#"+h,g=b.element.find(f),g.length||(g=b._createPanel(h),g.insertAfter(b.panels[c-1]||b.tablist)),g.attr("aria-live","polite")),g.length&&(b.panels=b.panels.add(g)),k&&j.data("ui-tabs-aria-controls",k),j.attr({"aria-controls":f.substring(1),"aria-labelledby":i}),g.attr("aria-labelledby",i)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(b){return a("<div>").attr("id",b).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(b){a.isArray(b)&&(b.length?b.length===this.anchors.length&&(b=!0):b=!1);for(var c,d=0;c=this.tabs[d];d++)b===!0||-1!==a.inArray(d,b)?a(c).addClass("ui-state-disabled").attr("aria-disabled","true"):a(c).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=b},_setupEvents:function(b){var c={click:function(a){a.preventDefault()}};b&&a.each(b.split(" "),function(a,b){c[b]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,c),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(b){var c,d=this.element.parent();"fill"===b?(c=d.height(),c-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var b=a(this),d=b.css("position");"absolute"!==d&&"fixed"!==d&&(c-=b.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){c-=a(this).outerHeight(!0)}),this.panels.each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")):"auto"===b&&(c=0,this.panels.each(function(){c=Math.max(c,a(this).height("").height())}).height(c))},_eventHandler:function(b){var c=this.options,d=this.active,e=a(b.currentTarget),f=e.closest("li"),g=f[0]===d[0],h=g&&c.collapsible,i=h?a():this._getPanelForTab(f),j=d.length?this._getPanelForTab(d):a(),k={oldTab:d,oldPanel:j,newTab:h?a():f,newPanel:i};b.preventDefault(),f.hasClass("ui-state-disabled")||f.hasClass("ui-tabs-loading")||this.running||g&&!c.collapsible||this._trigger("beforeActivate",b,k)===!1||(c.active=h?!1:this.tabs.index(f),this.active=g?a():f,this.xhr&&this.xhr.abort(),j.length||i.length||a.error("jQuery UI Tabs: Mismatching fragment identifier."),i.length&&this.load(this.tabs.index(f),b),this._toggle(b,k))},_toggle:function(b,c){function d(){f.running=!1,f._trigger("activate",b,c)}function e(){c.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),g.length&&f.options.show?f._show(g,f.options.show,d):(g.show(),d())}var f=this,g=c.newPanel,h=c.oldPanel;this.running=!0,h.length&&this.options.hide?this._hide(h,this.options.hide,function(){c.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),e()}):(c.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),h.hide(),e()),h.attr({"aria-expanded":"false","aria-hidden":"true"}),c.oldTab.attr("aria-selected","false"),g.length&&h.length?c.oldTab.attr("tabIndex",-1):g.length&&this.tabs.filter(function(){return 0===a(this).attr("tabIndex")}).attr("tabIndex",-1),g.attr({"aria-expanded":"true","aria-hidden":"false"}),c.newTab.attr({"aria-selected":"true",tabIndex:0})
+},_activate:function(b){var c,d=this._findActive(b);d[0]!==this.active[0]&&(d.length||(d=this.active),c=d.find(".ui-tabs-anchor")[0],this._eventHandler({target:c,currentTarget:c,preventDefault:a.noop}))},_findActive:function(b){return b===!1?a():this.tabs.eq(b)},_getIndex:function(a){return"string"==typeof a&&(a=this.anchors.index(this.anchors.filter("[href$='"+a+"']"))),a},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){a.data(this,"ui-tabs-destroy")?a(this).remove():a(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var b=a(this),c=b.data("ui-tabs-aria-controls");c?b.attr("aria-controls",c).removeData("ui-tabs-aria-controls"):b.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(c){var d=this.options.disabled;d!==!1&&(c===b?d=!1:(c=this._getIndex(c),d=a.isArray(d)?a.map(d,function(a){return a!==c?a:null}):a.map(this.tabs,function(a,b){return b!==c?b:null})),this._setupDisabled(d))},disable:function(c){var d=this.options.disabled;if(d!==!0){if(c===b)d=!0;else{if(c=this._getIndex(c),-1!==a.inArray(c,d))return;d=a.isArray(d)?a.merge([c],d).sort():[c]}this._setupDisabled(d)}},load:function(b,c){b=this._getIndex(b);var e=this,f=this.tabs.eq(b),g=f.find(".ui-tabs-anchor"),h=this._getPanelForTab(f),i={tab:f,panel:h};d(g[0])||(this.xhr=a.ajax(this._ajaxSettings(g,c,i)),this.xhr&&"canceled"!==this.xhr.statusText&&(f.addClass("ui-tabs-loading"),h.attr("aria-busy","true"),this.xhr.success(function(a){setTimeout(function(){h.html(a),e._trigger("load",c,i)},1)}).complete(function(a,b){setTimeout(function(){"abort"===b&&e.panels.stop(!1,!0),f.removeClass("ui-tabs-loading"),h.removeAttr("aria-busy"),a===e.xhr&&delete e.xhr},1)})))},_ajaxSettings:function(b,c,d){var e=this;return{url:b.attr("href"),beforeSend:function(b,f){return e._trigger("beforeLoad",c,a.extend({jqXHR:b,ajaxSettings:f},d))}}},_getPanelForTab:function(b){var c=a(b).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+c))}})}(a),function(){}(a),function(a,b){function c(a){e=a.originalEvent,i=e.accelerationIncludingGravity,f=Math.abs(i.x),g=Math.abs(i.y),h=Math.abs(i.z),!b.orientation&&(f>7||(h>6&&8>g||8>h&&g>6)&&f>5)?d.enabled&&d.disable():d.enabled||d.enable()}a.mobile.iosorientationfixEnabled=!0;var d,e,f,g,h,i,j=navigator.userAgent;return/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(j)&&j.indexOf("AppleWebKit")>-1?(d=a.mobile.zoom,void a.mobile.document.on("mobileinit",function(){a.mobile.iosorientationfixEnabled&&a.mobile.window.bind("orientationchange.iosorientationfix",d.enable).bind("devicemotion.iosorientationfix",c)})):void(a.mobile.iosorientationfixEnabled=!1)}(a,this),function(a,b){function d(){e.removeClass("ui-mobile-rendering")}var e=a("html"),f=a.mobile.window;a(b.document).trigger("mobileinit"),a.mobile.gradeA()&&(a.mobile.ajaxBlacklist&&(a.mobile.ajaxEnabled=!1),e.addClass("ui-mobile ui-mobile-rendering"),setTimeout(d,5e3),a.extend(a.mobile,{initializePage:function(){var b=a.mobile.path,e=a(":jqmData(role='page'), :jqmData(role='dialog')"),g=b.stripHash(b.stripQueryParams(b.parseLocation().hash)),h=a.mobile.path.parseLocation(),i=c.getElementById(g);e.length||(e=a("body").wrapInner("<div data-"+a.mobile.ns+"role='page'></div>").children(0)),e.each(function(){var b=a(this);b[0].getAttribute("data-"+a.mobile.ns+"url")||b.attr("data-"+a.mobile.ns+"url",b.attr("id")||h.pathname+h.search)}),a.mobile.firstPage=e.first(),a.mobile.pageContainer=a.mobile.firstPage.parent().addClass("ui-mobile-viewport").pagecontainer(),a.mobile.navreadyDeferred.resolve(),f.trigger("pagecontainercreate"),a.mobile.loading("show"),d(),a.mobile.hashListeningEnabled&&a.mobile.path.isHashValid(location.hash)&&(a(i).is(":jqmData(role='page')")||a.mobile.path.isPath(g)||g===a.mobile.dialogHashKey)?a.event.special.navigate.isPushStateEnabled()?(a.mobile.navigate.history.stack=[],a.mobile.navigate(a.mobile.path.isPath(location.hash)?location.hash:location.href)):f.trigger("hashchange",[!0]):(a.mobile.path.isHashValid(location.hash)&&(a.mobile.navigate.history.initialDst=g.replace("#","")),a.event.special.navigate.isPushStateEnabled()&&a.mobile.navigate.navigator.squash(b.parseLocation().href),a.mobile.changePage(a.mobile.firstPage,{transition:"none",reverse:!0,changeHash:!1,fromHashChange:!0}))}}),a(function(){a.support.inlineSVG(),a.mobile.hideUrlBar&&b.scrollTo(0,1),a.mobile.defaultHomeScroll=a.support.scrollTop&&1!==a.mobile.window.scrollTop()?1:0,a.mobile.autoInitializePage&&a.mobile.initializePage(),a.mobile.hideUrlBar&&f.load(a.mobile.silentScroll),a.support.cssPointerEvents||a.mobile.document.delegate(".ui-state-disabled,.ui-disabled","vclick",function(a){a.preventDefault(),a.stopImmediatePropagation()})}))}(a,this)});
+//# sourceMappingURL=jquery.mobile.min.map
\ No newline at end of file

From 7596689865f1a24eaad5b1525969711129438735 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 10:13:32 +0500
Subject: [PATCH 097/130] add chat to demo

---
 html5/verto/demo/index.html                   | 63 ++++++++++++++-----
 html5/verto/demo/js/verto-min.js              | 18 +++---
 html5/verto/demo/verto.js                     | 49 ++++++++++++---
 html5/verto/js/src/jquery.jsonrpcclient.js    |  8 +--
 html5/verto/js/src/jquery.verto.js            | 23 ++++++-
 .../mod_conference/mod_conference.c           | 55 ++++++++--------
 src/mod/endpoints/mod_verto/mod_verto.c       | 57 ++++++++++++-----
 src/switch_loadable_module.c                  |  4 +-
 8 files changed, 196 insertions(+), 81 deletions(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index 2ccdde86dc..7a6e53acea 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -29,6 +29,36 @@
       cursor: pointer;
       }	
 
+
+
+
+      #chatwin
+      {
+      background-color: #eeeeee;
+      width: 500px;
+      height:150px;
+      max-height:150px;
+      overflow-y: scroll;
+      scrolling: auto;
+      text-align: left;
+      border-style:inset;
+      font-size: 10pt;
+      }
+
+      .l1
+      {
+      border:1;
+      background-color:#fefefe;
+      height:1px;
+      opacity:0.4;
+      }
+      #chatmsg
+      {
+      width:400px;
+      max-height:40px;
+      }
+
+
     </style>
 
   </head>
@@ -40,32 +70,32 @@
       <br>
       <a target="_CC2104" href="https://www.cluecon.com"><img border="0" width="300" src="img/cc_banner2014.gif"></a>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">Login</label>
 	<input type="text" size="20" id="login"/>
       </div>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">Password</label>
 	<input type="password" size="20" id="passwd"/>
       </div>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">CID Name</label>  
 	<input type="text" size="30" id="name"/>
       </div>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">CID Number</label>  
 	<input type="text" size="20" id="cid"/>
       </div>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">Hostname</label>
 	<input type="text" size="20" id="hostName"/>
       </div>
 
-      <div data-role="fieldcontain">
+      <div class="ui-field-contain">
 	<label for="name">Websocket URL</label>
 	<input type="text" size="20" id="wsURL"/>
       </div>
@@ -93,9 +123,16 @@
 	</table>
       </div>
 
-      <div id="display" style="font-weight:bold;font-size:18px"></div>
       <br>
-      <div data-role="fieldcontain" id="xferdiv">
+      <div id="message" hidden="true">
+	<hr class="l1" width="500"/>
+	<div id="chatwin"></div>
+<!--	<textarea readonly id="chatwin"></textarea>-->
+	<table><tr><td><textarea id="chatmsg"></textarea></td><td><button id="chatsend" style="width:100px;">Send</button></td></tr></table>
+	<hr class="l1" width="500"/><br>
+      </div>
+      
+      <div class="ui-field-contain" id="xferdiv">
 	<input data-mini="true" type="text" id="xferto"><br>
       <button data-inline="true" id="cancelxferbtn">Cancel Transfer</button>
       <button data-inline="true" class="startxferbtn">Complete Transfer</button>
@@ -146,8 +183,7 @@
       </div>
 
       <div id="online" align="center" style="width:600px">
-	<div id="text"></div>
-	<div data-role="fieldcontain">
+	<div class="ui-field-contain">
 	  <input type="text" id="ext"/><br>
 	  <div id="dialpad">
 	    <button class="dialbtn" data-inline="true">1</button>
@@ -269,13 +305,12 @@
     </div>
 
 
-    <script type="text/javascript" src="//code.jquery.com/jquery-2.1.1.min.js"></script> 
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.js"></script> 
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js"></script> 
+    <script type="text/javascript" src="js/jquery.mobile.min.js"></script> 
     <script type="text/javascript" src="js/jquery.json-2.4.min.js"></script>  
     <script type="text/javascript" src="js/jquery.cookie.js"></script>
-    <script type="text/javascript" src="//cdn.datatables.net/1.10.1/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="js/jquery.dataTables.min.js"></script>
     <script type="text/javascript" src="js/verto-min.js"></script>
-    
     <script type="text/javascript" src="verto.js"></script>
 
   </body>
diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index a0dcc3cbd9..0c161c7cf4 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -72,11 +72,11 @@ this._ws_socket.close();}}
 $.JsonRpcClient.prototype.loginData=function(params){self.options.login=params.login;self.options.passwd=params.passwd;}
 $.JsonRpcClient.prototype.connectSocket=function(onmessage_cb){var self=this;if(self.to){clearTimeout(self.to);}
 if(!self.socketReady()){self.authing=false;if(self._ws_socket){delete self._ws_socket;}
-self._ws_socket=new WebSocket(self.options.socketUrl);if(self._ws_socket){self._ws_socket.onmessage=onmessage_cb;self._ws_socket.onclose=function(w){if(!self.ws_sleep){self.ws_sleep=500;}
+self._ws_socket=new WebSocket(self.options.socketUrl);if(self._ws_socket){self._ws_socket.onmessage=onmessage_cb;self._ws_socket.onclose=function(w){if(!self.ws_sleep){self.ws_sleep=1000;}
 if(self.options.onWSClose){self.options.onWSClose(self);}
-console.error("Websocket Lost "+self.ws_cnt+" sleep: "+self.ws_sleep+"msec");self.to=setTimeout(function(){console.log("Attempting Reconnection....");self.connectSocket(onmessage_cb);},self.ws_sleep);self.ws_cnt++;if(self.ws_sleep<3000&&(self.ws_cnt%100)==0){self.ws_sleep+=500;}}
+console.error("Websocket Lost "+self.ws_cnt+" sleep: "+self.ws_sleep+"msec");self.to=setTimeout(function(){console.log("Attempting Reconnection....");self.connectSocket(onmessage_cb);},self.ws_sleep);self.ws_cnt++;if(self.ws_sleep<3000&&(self.ws_cnt%10)==0){self.ws_sleep+=1000;}}
 self._ws_socket.onopen=function(){if(self.to){clearTimeout(self.to);}
-self.ws_sleep=500;self.ws_cnt=0;if(self.options.onWSConnect){self.options.onWSConnect(self);}
+self.ws_sleep=1000;self.ws_cnt=0;if(self.options.onWSConnect){self.options.onWSConnect(self);}
 var req;while(req=$.JsonRpcClient.q.pop()){self._ws_socket.send(req);}}}}
 return self._ws_socket?true:false;}
 $.JsonRpcClient.prototype._getSocket=function(onmessage_cb){if(this.options.socketUrl===null||!("WebSocket"in window))return null;this.connectSocket(onmessage_cb);return this._ws_socket;};$.JsonRpcClient.q=[];$.JsonRpcClient.prototype._wsCall=function(socket,request,success_cb,error_cb){var request_json=$.toJSON(request);if(socket.readyState<1){self=this;$.JsonRpcClient.q.push(request_json);}
@@ -127,7 +127,7 @@ var dialog=new $.verto.dialog($.verto.enum.direction.outbound,this,args);dialog.
 return dialog;};$.verto.prototype.handleMessage=function(data){var verto=this;if(!(data&&data.method)){console.error("Invalid Data",data);return;}
 if(data.params.callID){var dialog=verto.dialogs[data.params.callID];if(dialog){switch(data.method){case'verto.bye':dialog.hangup(data.params);break;case'verto.answer':dialog.handleAnswer(data.params);break;case'verto.media':dialog.handleMedia(data.params);break;case'verto.display':dialog.handleDisplay(data.params);break;case'verto.info':dialog.handleInfo(data.params);break;default:console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED",dialog,data.method);break;}}else{switch(data.method){case'verto.attach':data.params.attach=true;if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.useVideo=true;}
 if(data.params.sdp&&data.params.sdp.indexOf("stereo=1")>0){data.params.useStereo=true;}
-dialog=new $.verto.dialog($.verto.enum.direction.inbound,verto,data.params);break;case'verto.invite':if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.wantVideo=true;}
+dialog=new $.verto.dialog($.verto.enum.direction.inbound,verto,data.params);dialog.setState($.verto.enum.state.recovering);break;case'verto.invite':if(data.params.sdp&&data.params.sdp.indexOf("m=video")>0){data.params.wantVideo=true;}
 if(data.params.sdp&&data.params.sdp.indexOf("stereo=1")>0){data.params.useStereo=true;}
 dialog=new $.verto.dialog($.verto.enum.direction.inbound,verto,data.params);break;default:console.debug("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED");break;}}
 return{method:data.method};}else{switch(data.method){case'verto.event':var list=null;var key=null;if(data.params){key=data.params.eventChannel;}
@@ -135,7 +135,7 @@ if(key){list=verto.eventSUBS[key];if(!list){list=verto.eventSUBS[key.split(".")[
 if(!list&&key&&key===verto.sessid){if(verto.callbacks.onMessage){verto.callbacks.onMessage(verto,null,$.verto.enum.message.pvtEvent,data.params);}}else if(!list&&key&&verto.dialogs[key]){verto.dialogs[key].sendMessage($.verto.enum.message.pvtEvent,data.params);}else if(!list){if(!key){key="UNDEFINED";}
 console.error("UNSUBBED or invalid EVENT "+key+" IGNORED");}else{for(var i in list){var sub=list[i];if(!sub||!sub.ready){console.error("invalid EVENT for "+key+" IGNORED");}else if(sub.handler){sub.handler(verto,data.params,sub.userData);}else if(verto.callbacks.onEvent){verto.callbacks.onEvent(verto,data.params,sub.userData);}else{console.log("EVENT:",data.params);}}}
 break;case"verto.info":if(verto.callbacks.onMessage){verto.callbacks.onMessage(verto,null,$.verto.enum.message.info,data.params.msg);}
-console.error(data);console.debug("MESSAGE from: "+data.params.msg.from,data.params.msg.body);break;default:console.error("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED",data.method);break;}}};var del_array=function(array,name){var r=[];var len=array.length;for(var i=0;i<len;i++){if(array[i]!=name){r.push(array[i]);}}
+console.debug("MESSAGE from: "+data.params.msg.from,data.params.msg.body);break;default:console.error("INVALID METHOD OR NON-EXISTANT CALL REFERENCE IGNORED",data.method);break;}}};var del_array=function(array,name){var r=[];var len=array.length;for(var i=0;i<len;i++){if(array[i]!=name){r.push(array[i]);}}
 return r;};var hashArray=function(){var vha=this;var hash={};var array=[];vha.reorder=function(a){array=a;var h=hash;hash={};var len=array.length;for(var i=0;i<len;i++){var key=array[i];if(h[key]){hash[key]=h[key];delete h[key];}}
 h=undefined;};vha.clear=function(){hash=undefined;array=undefined;hash={};array=[];};vha.add=function(name,val,insertAt){var redraw=false;if(!hash[name]){if(insertAt===undefined||insertAt<0||insertAt>=array.length){array.push(name);}else{var x=0;var n=[];var len=array.length;for(var i=0;i<len;i++){if(x++==insertAt){n.push(name);}
 n.push(array[i]);}
@@ -184,7 +184,7 @@ $.verto.confMan.prototype.modCommand=function(cmd,id,value){var confMan=this;con
 $.verto.confMan.prototype.destroy=function(){var confMan=this;confMan.destroyed=true;if(confMan.lt){confMan.lt.destroy();}
 if(confMan.params.laData.modChannel){confMan.verto.unsubscribe(confMan.params.laData.modChannel);}
 if(confMan.params.mainModID){$(confMan.params.mainModID).html("");}}
-$.verto.dialog=function(direction,verto,params){var dialog=this;dialog.params=$.extend({useVideo:verto.options.useVideo,useStereo:verto.options.useStereo,tag:verto.options.tag},params);dialog.verto=verto;dialog.direction=direction;dialog.lastState=null;dialog.state=dialog.lastState=$.verto.enum.state.new;dialog.callbacks=verto.callbacks;dialog.answered=false;dialog.attach=params.attach||false;if(dialog.params.callID){dialog.callID=dialog.params.callID;}else{dialog.callID=dialog.params.callID=generateGUID();}
+$.verto.dialog=function(direction,verto,params){var dialog=this;dialog.params=$.extend({useVideo:verto.options.useVideo,useStereo:verto.options.useStereo,tag:verto.options.tag,login:verto.options.login},params);dialog.verto=verto;dialog.direction=direction;dialog.lastState=null;dialog.state=dialog.lastState=$.verto.enum.state.new;dialog.callbacks=verto.callbacks;dialog.answered=false;dialog.attach=params.attach||false;if(dialog.params.callID){dialog.callID=dialog.params.callID;}else{dialog.callID=dialog.params.callID=generateGUID();}
 if(dialog.params.tag){dialog.audioStream=document.getElementById(dialog.params.tag);if(dialog.params.useVideo){dialog.videoStream=dialog.audioStream;}}
 dialog.verto.dialogs[dialog.callID]=dialog;var RTCcallbacks={};if(dialog.direction==$.verto.enum.direction.inbound){dialog.params.remote_caller_id_name=dialog.params.caller_id_name;dialog.params.remote_caller_id_number=dialog.params.caller_id_number;if(!dialog.params.remote_caller_id_name){dialog.params.remote_caller_id_name="Nobody";}
 if(!dialog.params.remote_caller_id_number){dialog.params.remote_caller_id_number="UNKNOWN";}
@@ -198,7 +198,7 @@ if(dialog.state==state||!checkStateChange(dialog.state,state)){console.error("Di
 console.info("Dialog "+dialog.callID+": state change from "+dialog.state.name+" to "+state.name);dialog.lastState=dialog.state;dialog.state=state;if(!dialog.causeCode){dialog.causeCode=16;}
 if(!dialog.cause){dialog.cause="NORMAL CLEARING";}
 if(dialog.callbacks.onDialogState){dialog.callbacks.onDialogState(this);}
-switch(dialog.state){case $.verto.enum.state.purge:dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.hangup:if(dialog.lastState.val>$.verto.enum.state.requesting.val&&dialog.lastState.val<$.verto.enum.state.hangup.val){dialog.sendMethod("verto.bye",{});}
+switch(dialog.state){case $.verto.enum.state.trying:setTimeout(function(){if(dialog.state==$.verto.enum.state.trying){dialog.setState($.verto.enum.state.hangup);}},5000);break;case $.verto.enum.state.purge:dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.hangup:if(dialog.lastState.val>$.verto.enum.state.requesting.val&&dialog.lastState.val<$.verto.enum.state.hangup.val){dialog.sendMethod("verto.bye",{});}
 dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.destroy:delete verto.dialogs[dialog.callID];dialog.rtc.stop();break;}
 return true;};$.verto.dialog.prototype.processReply=function(method,success,e){var dialog=this;switch(method){case"verto.answer":case"verto.attach":if(success){dialog.setState($.verto.enum.state.active);}else{dialog.hangup();}
 break;case"verto.invite":if(success){dialog.setState($.verto.enum.state.trying);}else{dialog.setState($.verto.enum.state.destroy);}
@@ -207,7 +207,7 @@ if(success){}
 break;default:break;}};$.verto.dialog.prototype.hangup=function(params){var dialog=this;if(params){if(params.causeCode){dialog.causeCode=params.causeCode;}
 if(params.cause){dialog.cause=params.cause;}}
 if(dialog.state.val>$.verto.enum.state.new.val&&dialog.state.val<$.verto.enum.state.hangup.val){dialog.setState($.verto.enum.state.hangup);}else if(dialog.state.val<$.verto.enum.state.destroy){dialog.setState($.verto.enum.state.destroy);}};$.verto.dialog.prototype.stopRinging=function(){var dialog=this;if(dialog.verto.ringer){dialog.verto.ringer.stop();}};$.verto.dialog.prototype.indicateRing=function(){var dialog=this;if(dialog.verto.ringer){dialog.verto.ringer.attr("src",dialog.verto.options.ringFile)[0].play();setTimeout(function(){dialog.stopRinging();if(dialog.state==$.verto.enum.state.ringing){dialog.indicateRing();}},dialog.verto.options.ringSleep);}};$.verto.dialog.prototype.ring=function(){var dialog=this;dialog.setState($.verto.enum.state.ringing);dialog.indicateRing();};$.verto.dialog.prototype.useVideo=function(on){var dialog=this;dialog.params.useVideo=on;if(on){dialog.videoStream=dialog.audioStream;}else{dialog.videoStream=null;}
-dialog.rtc.useVideo(dialog.videoStream);};$.verto.dialog.prototype.useStereo=function(on){var dialog=this;dialog.params.useStereo=on;dialog.rtc.useStereo(on);};$.verto.dialog.prototype.dtmf=function(digits){var dialog=this;if(digits){dialog.sendMethod("verto.info",{dtmf:digits});}};$.verto.dialog.prototype.transfer=function(dest,params){var dialog=this;if(dest){cur_call.sendMethod("verto.modify",{action:"transfer",destination:dest,params:params});}};$.verto.dialog.prototype.hold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"hold",params:params});};$.verto.dialog.prototype.unhold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"unhold",params:params});};$.verto.dialog.prototype.toggleHold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"toggleHold",params:params});};$.verto.dialog.prototype.message=function(msg){var dialog=this;var err=0;if(!msg.to){console.error("Missing To");err++;}
+dialog.rtc.useVideo(dialog.videoStream);};$.verto.dialog.prototype.useStereo=function(on){var dialog=this;dialog.params.useStereo=on;dialog.rtc.useStereo(on);};$.verto.dialog.prototype.dtmf=function(digits){var dialog=this;if(digits){dialog.sendMethod("verto.info",{dtmf:digits});}};$.verto.dialog.prototype.transfer=function(dest,params){var dialog=this;if(dest){cur_call.sendMethod("verto.modify",{action:"transfer",destination:dest,params:params});}};$.verto.dialog.prototype.hold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"hold",params:params});};$.verto.dialog.prototype.unhold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"unhold",params:params});};$.verto.dialog.prototype.toggleHold=function(params){var dialog=this;cur_call.sendMethod("verto.modify",{action:"toggleHold",params:params});};$.verto.dialog.prototype.message=function(msg){var dialog=this;var err=0;msg.from=dialog.params.login;if(!msg.to){console.error("Missing To");err++;}
 if(!msg.body){console.error("Missing Body");err++;}
 if(err){return false;}
 dialog.sendMethod("verto.info",{msg:msg});return true;};$.verto.dialog.prototype.answer=function(params){var dialog=this;if(!dialog.answered){if(params){if(params.useVideo){dialog.useVideo(true);}
@@ -216,5 +216,5 @@ dialog.rtc.createAnswer(dialog.params.sdp);dialog.answered=true;}};$.verto.dialo
 if(dialog.state.val>=$.verto.enum.state.early.val){dialog.setState($.verto.enum.state.active);}else{dialog.rtc.answer(params.sdp,function(){dialog.setState($.verto.enum.state.active);},function(e){console.error(e);dialog.hangup();});console.log("ANSWER SDP",params.sdp);}};$.verto.dialog.prototype.cidString=function(enc){var dialog=this;var party=dialog.params.remote_caller_id_name+(enc?" &lt;":" <")+dialog.params.remote_caller_id_number+(enc?"&gt;":">");return party;};$.verto.dialog.prototype.sendMessage=function(msg,params){var dialog=this;if(dialog.callbacks.onMessage){dialog.callbacks.onMessage(dialog.verto,dialog,msg,params);}};$.verto.dialog.prototype.handleInfo=function(params){var dialog=this;dialog.sendMessage($.verto.enum.message.info,params.msg);};$.verto.dialog.prototype.handleDisplay=function(params){var dialog=this;if(params.display_name){dialog.params.remote_caller_id_name=params.display_name;}
 if(params.display_number){dialog.params.remote_caller_id_number=params.display_number;}
 dialog.sendMessage($.verto.enum.message.display,{});};$.verto.dialog.prototype.handleMedia=function(params){var dialog=this;if(dialog.state.val>=$.verto.enum.state.early.val){return;}
-dialog.rtc.answer(params.sdp,function(){dialog.setState($.verto.enum.state.early);},function(e){console.error(e);dialog.hangup();});console.log("EARLY SDP",params.sdp);};$.verto.ENUM=function(s){var i=0,o={};s.split(" ").map(function(x){o[x]={name:x,val:i++};});return Object.freeze(o);};$.verto.enum={};$.verto.enum.states=Object.freeze({new:{requesting:1,ringing:1,destroy:1,answering:1},requesting:{trying:1,hangup:1},trying:{active:1,early:1,hangup:1},ringing:{answering:1,hangup:1},answering:{active:1,hangup:1},active:{hangup:1,held:1},held:{hangup:1,active:1},early:{hangup:1,active:1},hangup:{destroy:1},destroy:{},purge:{destroy:1}});$.verto.enum.state=$.verto.ENUM("new requesting trying ringing answering early active held hangup destroy purge");$.verto.enum.direction=$.verto.ENUM("inbound outbound");$.verto.enum.message=$.verto.ENUM("display info pvtEvent");$.verto.enum=Object.freeze($.verto.enum);$.verto.saved=[];$(window).bind('beforeunload',function(){for(var i in $.verto.saved){var verto=$.verto.saved[i];if(verto){verto.logout();verto.purge();}}
+dialog.rtc.answer(params.sdp,function(){dialog.setState($.verto.enum.state.early);},function(e){console.error(e);dialog.hangup();});console.log("EARLY SDP",params.sdp);};$.verto.ENUM=function(s){var i=0,o={};s.split(" ").map(function(x){o[x]={name:x,val:i++};});return Object.freeze(o);};$.verto.enum={};$.verto.enum.states=Object.freeze({new:{requesting:1,recovering:1,ringing:1,destroy:1,answering:1},requesting:{trying:1,hangup:1},recovering:{answering:1,hangup:1},trying:{active:1,early:1,hangup:1},ringing:{answering:1,hangup:1},answering:{active:1,hangup:1},active:{hangup:1,held:1},held:{hangup:1,active:1},early:{hangup:1,active:1},hangup:{destroy:1},destroy:{},purge:{destroy:1}});$.verto.enum.state=$.verto.ENUM("new requesting trying recovering ringing answering early active held hangup destroy purge");$.verto.enum.direction=$.verto.ENUM("inbound outbound");$.verto.enum.message=$.verto.ENUM("display info pvtEvent");$.verto.enum=Object.freeze($.verto.enum);$.verto.saved=[];$(window).bind('beforeunload',function(){for(var i in $.verto.saved){var verto=$.verto.saved[i];if(verto){verto.logout();verto.purge();}}
 return $.verto.warnOnUnload;});})(jQuery);
\ No newline at end of file
diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 0f72f28f9a..56700c6a9d 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -1,10 +1,10 @@
 'use strict';
 var cur_call = null;
 var confMan = null;
-var $display = $("#display");
 var verto;
 var ringing = false;
 var autocall = false;
+var chatting_with = false;
 
 $( ".selector" ).pagecontainer({ "theme": "a" });
 
@@ -19,6 +19,8 @@ function clearConfMan() {
     }
 
     $("#conf").hide();
+    $("#message").hide();
+    chatting_with = null;
 }
 
 function goto_dialog(where) {
@@ -37,9 +39,6 @@ function online(on) {
         $("#offline").hide();
         first_login = true;
     } else {
-        if (first_login && online_visible) {
-            goto_dialog("logout");
-        }
 
         $("#online").hide();
         $("#offline").show();
@@ -48,6 +47,26 @@ function online(on) {
     online_visible = on;
 }
 
+function setupChat() {
+    $("#chatwin").html("");
+
+    $("#chatsend").click(function() {
+	if (!cur_call && chatting_with) {
+	    return;
+	}
+
+	cur_call.message({to: chatting_with, body: $("#chatmsg").val()});  
+	$("#chatmsg").val("");
+    });
+
+    $("#chatmsg").keyup(function (event) {
+	if (event.keyCode == 13 && !event.shiftKey) {
+	    $( "#chatsend" ).trigger( "click" );   
+	}
+    });
+
+}
+
 function check_vid() {
     var use_vid = $("#use_vid").is(':checked');
     return use_vid;
@@ -59,7 +78,7 @@ var callbacks = {
 
         switch (msg) {
         case $.verto.enum.message.pvtEvent:
-            //console.error("pvtEvent", data.pvtData.action);
+//            console.error("pvtEvent", data.pvtData);
             if (data.pvtData) {
                 switch (data.pvtData.action) {
 
@@ -79,13 +98,22 @@ var callbacks = {
 		    });
 
                     $("#conf").show();
+		    $("#chatwin").html("");
+                    $("#message").show();
+
+		    chatting_with = data.pvtData.chatID;
 
                     break;
                 }
             }
             break;
         case $.verto.enum.message.info:
-            $("#text").html("Message from: <b>" + data.from + "</b>:<br>" + "<pre>" + data.body + "</pre>");
+	    var body = data.body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
+	    body = body.replace(/(?:\r\n|\r|\n)/g, '<br />');
+
+            $("#chatwin").append("<b>" + data.from + "</b>:<br>" + "" + body + "" + "<br>");
+	    $('#chatwin').animate({"scrollTop": $('#chatwin')[0].scrollHeight}, "fast");
+
             break;
         case $.verto.enum.message.display:
             var party = dialog.params.remote_caller_id_name + "<" + dialog.params.remote_caller_id_number + ">";
@@ -153,10 +181,11 @@ var callbacks = {
             break;
         case $.verto.enum.state.hangup:
 	    $("#main_info").html("Call ended with cause: " + d.cause);
+            goto_page("main");
         case $.verto.enum.state.destroy:
 	    $("#hangup_cause").html("");
             clearConfMan();
-            goto_page("main");
+
             cur_call = null;
             break;
         case $.verto.enum.state.held:
@@ -382,6 +411,9 @@ function init() {
     $("#webcam").hide();
 
     online(false);
+
+    setupChat();
+
 }
 
 $(document).ready(function() {
@@ -418,6 +450,9 @@ $(document).bind("pagecontainerchange", function(e, data) {
         break;
 
     case "#page-main":
+            if (cur_call) {
+                goto_page("incall");
+            }
 	break;
     case "#page-login":
 
diff --git a/html5/verto/js/src/jquery.jsonrpcclient.js b/html5/verto/js/src/jquery.jsonrpcclient.js
index 9505cd14de..be2a7a2620 100644
--- a/html5/verto/js/src/jquery.jsonrpcclient.js
+++ b/html5/verto/js/src/jquery.jsonrpcclient.js
@@ -282,7 +282,7 @@
 	      self._ws_socket.onmessage = onmessage_cb;
 	      self._ws_socket.onclose = function (w) {
 		  if (!self.ws_sleep) {
-		      self.ws_sleep = 500;
+		      self.ws_sleep = 1000;
 		  }
 
 		  if (self.options.onWSClose) {
@@ -298,8 +298,8 @@
 		  
 		  self.ws_cnt++;
 
-		  if (self.ws_sleep < 3000 && (self.ws_cnt % 100) == 0) {
-		      self.ws_sleep += 500;
+		  if (self.ws_sleep < 3000 && (self.ws_cnt % 10) == 0) {
+		      self.ws_sleep += 1000;
 		  }
 	      }
 
@@ -308,7 +308,7 @@
 		  if (self.to) {
 		      clearTimeout(self.to);
 		  }
-		  self.ws_sleep = 500;	  
+		  self.ws_sleep = 1000;	  
 		  self.ws_cnt = 0;
 		  if (self.options.onWSConnect) {
 		      self.options.onWSConnect(self);
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 5c847d8364..461617ea16 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -460,6 +460,8 @@
                     }
 
 		    dialog = new $.verto.dialog($.verto.enum.direction.inbound, verto, data.params);
+                    dialog.setState($.verto.enum.state.recovering);
+
 		    break;
                 case 'verto.invite':
 
@@ -533,7 +535,7 @@
                 if (verto.callbacks.onMessage) {
                     verto.callbacks.onMessage(verto, null, $.verto.enum.message.info, data.params.msg);
                 }
-                console.error(data);
+                //console.error(data);
                 console.debug("MESSAGE from: " + data.params.msg.from, data.params.msg.body);
 
                 break;
@@ -1389,7 +1391,8 @@
         dialog.params = $.extend({
             useVideo: verto.options.useVideo,
             useStereo: verto.options.useStereo,
-            tag: verto.options.tag
+            tag: verto.options.tag,
+	    login: verto.options.login
         },
         params);
 
@@ -1567,6 +1570,13 @@
         }
 
         switch (dialog.state) {
+        case $.verto.enum.state.trying:
+	    setTimeout(function() {
+                if (dialog.state == $.verto.enum.state.trying) {
+		    dialog.setState($.verto.enum.state.hangup);
+                }
+            }, 5000);
+	    break;
         case $.verto.enum.state.purge:
             dialog.setState($.verto.enum.state.destroy);
             break;
@@ -1760,6 +1770,8 @@
         var dialog = this;
         var err = 0;
 
+	msg.from = dialog.params.login;
+
         if (!msg.to) {
             console.error("Missing To");
             err++;
@@ -1885,6 +1897,7 @@
     $.verto.enum.states = Object.freeze({
         new: {
             requesting: 1,
+	    recovering: 1,
             ringing: 1,
             destroy: 1,
             answering: 1
@@ -1893,6 +1906,10 @@
             trying: 1,
             hangup: 1
         },
+        recovering: {
+            answering: 1,
+            hangup: 1
+        },
         trying: {
             active: 1,
             early: 1,
@@ -1927,7 +1944,7 @@
         }
     });
 
-    $.verto.enum.state = $.verto.ENUM("new requesting trying ringing answering early active held hangup destroy purge");
+    $.verto.enum.state = $.verto.ENUM("new requesting trying recovering ringing answering early active held hangup destroy purge");
     $.verto.enum.direction = $.verto.ENUM("inbound outbound");
     $.verto.enum.message = $.verto.ENUM("display info pvtEvent");
 
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 452d0663a2..bbef2f5e60 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -381,6 +381,7 @@ typedef struct conference_obj {
 	char *bad_pin_sound;
 	char *profile_name;
 	char *domain;
+	char *chat_id;
 	char *caller_controls;
 	char *moderator_controls;
 	switch_live_array_t *la;
@@ -2120,6 +2121,7 @@ static void adv_la(conference_obj_t *conference, conference_member_t *member, sw
 		cJSON_AddItemToObject(data, "laChannel", cJSON_CreateString(conference->la_event_channel));
 		cJSON_AddItemToObject(data, "laName", cJSON_CreateString(conference->la_name));
 		cJSON_AddItemToObject(data, "role", cJSON_CreateString(switch_test_flag(member, MFLAG_MOD) ? "moderator" : "participant"));
+		cJSON_AddItemToObject(data, "chatID", cJSON_CreateString(conference->chat_id));
 		if (switch_test_flag(member, MFLAG_MOD)) {
 			cJSON_AddItemToObject(data, "modChannel", cJSON_CreateString(conference->mod_event_channel));
 		}
@@ -4845,7 +4847,7 @@ static void conference_loop_output(conference_member_t *member)
 				char *from = switch_event_get_header(event, "from");
 				char *to = switch_event_get_header(event, "to");
 				char *body = switch_event_get_body(event);
-
+				
 				if (to && from && body) {
 					if (strchr(to, '+') && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) {
 						switch_event_del_header(event, "to");
@@ -5939,34 +5941,32 @@ static switch_status_t conference_say(conference_obj_t *conference, const char *
 }
 
 /* send a message to every member of the conference */
-static void chat_message_broadcast(conference_obj_t *conference, switch_stream_handle_t *stream, const char *data, const char *chat_from, const char *ouuid)
+static void chat_message_broadcast(conference_obj_t *conference, switch_event_t *event)
 {
 	conference_member_t *member = NULL;
-	char *argv[2] = { 0 };
-	char *dup = NULL;
-	switch_core_session_message_t msg = { 0 };
 
 	switch_assert(conference != NULL);
-	switch_assert(stream != NULL);
-
-	if (!(dup = strdup(chat_from))) {
-		return;
-	}
-	switch_separate_string(dup, '@', argv, (sizeof(argv) / sizeof(argv[0])));
-
-	msg.message_id = SWITCH_MESSAGE_INDICATE_MESSAGE;
-	msg.string_array_arg[2] = data;
-	msg.string_array_arg[3] = ouuid;
-	msg.from = __FILE__;
 
 	switch_mutex_lock(conference->member_mutex);
 	for (member = conference->members; member; member = member->next) {
 		if (member->session && !switch_test_flag(member, MFLAG_NOCHANNEL)) {
-			switch_core_session_t *lsession = NULL;
+			const char *presence_id = switch_channel_get_variable(member->channel, "presence_id");
+			const char *chat_proto = switch_channel_get_variable(member->channel, "chat_proto");
+			switch_event_t *reply = NULL;
+			
+			if (presence_id && chat_proto) {
+				switch_event_dup(&reply, event);
+				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "to", presence_id);
+				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "conference_name", conference->name);
+				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "conference_domain", conference->domain);
+				
+				switch_event_set_body(reply, switch_event_get_body(event));
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SENDIT\n");
+				DUMP_EVENT(reply);
 
-			lsession = member->session;
-
-			switch_core_session_receive_message(lsession, &msg);
+				switch_core_chat_deliver(chat_proto, &reply);
+				
+			}
 		}
 	}
 	switch_mutex_unlock(conference->member_mutex);
@@ -9752,16 +9752,13 @@ static switch_status_t chat_send(switch_event_t *message_event)
 	const char *body;
 	//const char *type;
 	const char *hint;
-	const char *ouuid;
 
 	proto = switch_event_get_header(message_event, "proto");
 	from = switch_event_get_header(message_event, "from");
 	to = switch_event_get_header(message_event, "to");
-	//subject = switch_event_get_header(message_event, "subject");
 	body = switch_event_get_body(message_event);
-	//type = switch_event_get_header(message_event, "type");
 	hint = switch_event_get_header(message_event, "hint");
-	ouuid = switch_event_get_header(message_event, "Channel-Call-UUID");
+
 
 	if ((p = strchr(to, '+'))) {
 		to = ++p;
@@ -9788,7 +9785,7 @@ static switch_status_t chat_send(switch_event_t *message_event)
 	if (body != NULL && (lbuf = strdup(body))) {
 		/* special case list */
 		if (conference->broadcast_chat_messages) {
-			chat_message_broadcast(conference, &stream, body, from, ouuid);
+			chat_message_broadcast(conference, message_event);
 		} else if (switch_stristr("list", lbuf)) {
 			conference_list_pretty(conference, &stream);
 			/* provide help */
@@ -9876,7 +9873,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
 	char *maxmember_sound = NULL;
 	uint32_t rate = 8000, interval = 20;
 	uint32_t channels = 1;
-	int broadcast_chat_messages = 0;
+	int broadcast_chat_messages = 1;
 	int comfort_noise_level = 0;
 	int pin_retries = 3;
 	int ivr_dtmf_timeout = 500;
@@ -10091,8 +10088,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
                                }
 			} else if (!strcasecmp(var, "moderator-controls") && !zstr(val)) {
 				moderator_controls = val;
-			} else if (!strcasecmp(var, "broadcast-chat-messages") && !zstr(val) && switch_true(val)) {
-				broadcast_chat_messages = 1;
+			} else if (!strcasecmp(var, "broadcast-chat-messages") && !zstr(val)) {
+				broadcast_chat_messages = switch_true(val);
 			} else if (!strcasecmp(var, "comfort-noise") && !zstr(val)) {
 				int tmp;
 				tmp = atoi(val);
@@ -10379,6 +10376,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
 		conference->domain = "cluecon.com";
 	}
 
+	conference->chat_id = switch_core_sprintf(conference->pool, "conf+%s@%s", conference->name, conference->domain);
+
 	conference->channels = channels;
 	conference->rate = rate;
 	conference->interval = interval;
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 61ba82f93b..e75eeea8b1 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -588,6 +588,11 @@ static switch_status_t jsock_queue_event(jsock_t *jsock, cJSON **json)
 	return status;
 }
 
+static switch_status_t jsock_queue_event_clone(jsock_t *jsock, cJSON *json)
+{
+	cJSON *dup = cJSON_Duplicate(json, 1);
+	return jsock_queue_event(jsock, &dup);
+}
 
 static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *event)
 {
@@ -604,7 +609,7 @@ static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *ev
 				cJSON_AddItemToObject(params, "eventSerno", cJSON_CreateNumber(np->serno++));
 				msg = jrpc_new_req("verto.event", NULL, &params);
 				//ws_write_json(np->jsock, &msg, SWITCH_TRUE);
-				jsock_queue_event(np->jsock, &msg);
+				jsock_queue_event_clone(np->jsock, msg);
 			}
 		}
 	}
@@ -637,7 +642,7 @@ static void jsock_send_event(cJSON *event)
 		params = cJSON_Duplicate(event, 1);
 		msg = jrpc_new_req("verto.event", NULL, &params);
 		//ws_write_json(use_jsock, &msg, SWITCH_TRUE); 
-		jsock_queue_event(use_jsock, &msg);
+		jsock_queue_event_clone(use_jsock, msg);
 		switch_thread_rwlock_unlock(use_jsock->rwlock);
 		use_jsock = NULL;
 		return;
@@ -853,7 +858,7 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 
 		switch_event_add_header_string(req_params, SWITCH_STACK_BOTTOM, "action", "jsonrpc-authenticate");
 		
-		if (switch_xml_locate_user_merged("id", id, domain, NULL, &x_user, req_params) != SWITCH_STATUS_SUCCESS) {
+		if (switch_xml_locate_user_merged("id", id, domain, NULL, &x_user, req_params) != SWITCH_STATUS_SUCCESS && !jsock->profile->blind_reg) {
 			*code = CODE_AUTH_FAILED;
 			switch_snprintf(message, mlen, "Login Incorrect");
 		} else {
@@ -864,6 +869,11 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 			jsock->domain = switch_core_strdup(jsock->pool, domain);
 			jsock->uid = switch_core_sprintf(jsock->pool, "%s@%s", id, domain);
 			
+			if (!x_user) {
+				switch_event_destroy(&req_params);
+				r = SWITCH_TRUE;
+				goto end;
+			}
 
 			if ((x_params = switch_xml_child(x_user, "params"))) {
 				for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
@@ -916,10 +926,6 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 		switch_event_destroy(&req_params);
 	}
 
-	if (jsock->profile->blind_reg) {
-		r = SWITCH_TRUE;
-	}
-	
  end:
 
 	return r;
@@ -1505,6 +1511,8 @@ static switch_status_t verto_connect(switch_core_session_t *session, const char
 
 
 		switch_channel_set_variable(tech_pvt->channel, "verto_user", jsock->uid);
+		switch_channel_set_variable(tech_pvt->channel, "presence_id", jsock->uid);
+		switch_channel_set_variable(tech_pvt->channel, "chat_proto", VERTO_CHAT_PROTO);
 		switch_channel_set_variable(tech_pvt->channel, "verto_host", jsock->domain);
 
 		if ((var = switch_event_get_header(jsock->params, "caller-id-name"))) {
@@ -1829,7 +1837,7 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 					cJSON_AddItemToObject(params, "display_name", cJSON_CreateString(name));
 					cJSON_AddItemToObject(params, "display_number", cJSON_CreateString(number));
 					//ws_write_json(jsock, &jmsg, SWITCH_TRUE);
-					jsock_queue_event(jsock, &jmsg);
+					jsock_queue_event_clone(jsock, jmsg);
 				}
 
 				switch_thread_rwlock_unlock(jsock->rwlock);
@@ -2544,9 +2552,10 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 	if ((msg = cJSON_GetObjectItem(params, "msg"))) {
 		switch_event_t *event;
 		char *to = (char *) cJSON_GetObjectCstr(msg, "to");
+		//char *from = (char *) cJSON_GetObjectCstr(msg, "from");
 		cJSON *indialog =  cJSON_GetObjectItem(msg, "inDialog");
 		const char *body = cJSON_GetObjectCstr(msg, "body");
-
+		switch_bool_t is_dialog = indialog && (indialog->type == cJSON_True || (indialog->type == cJSON_String && switch_true(indialog->valuestring)));
 
 		if (!zstr(to)) {
 			if (strchr(to, '+')) {
@@ -2560,6 +2569,7 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 		
 		if (!zstr(to) && !zstr(body) && switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", VERTO_CHAT_PROTO);
+			
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", jsock->uid);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_user", jsock->id);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from_host", jsock->domain);
@@ -2571,7 +2581,7 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "verto_profile", jsock->profile->name);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "verto_jsock_uuid", jsock->uuid_str);
 			
-			if (indialog && (indialog->type == cJSON_True || (indialog->type == cJSON_String && switch_true(indialog->valuestring))) && call_id) {
+			if (is_dialog) {
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", call_id);
 			}
 
@@ -2581,9 +2591,26 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 				switch_core_chat_send(proto, event);
 			}
 			
-			switch_core_chat_send("GLOBAL", event);
+			if (is_dialog) {
+				if ((dialog = cJSON_GetObjectItem(params, "dialogParams")) && (call_id = cJSON_GetObjectCstr(dialog, "callID"))) {
+					switch_core_session_t *session = NULL;
+					
+					if ((session = switch_core_session_locate(call_id))) {
+						switch_core_session_queue_event(session, &event);
+						switch_core_session_rwunlock(session);
+					}
+				}
+
+			} else {
+				switch_core_chat_send("GLOBAL", event);
+			}
 			
-			switch_event_destroy(&event);
+			if (event) {
+				switch_event_destroy(&event);
+			}
+
+			cJSON_AddItemToObject(*response, "message", cJSON_CreateString("SENT"));
+			r = SWITCH_TRUE;
 
 		} else {
 			r = SWITCH_FALSE;
@@ -2667,6 +2694,8 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
 	switch_channel_set_name(channel, name);
 	switch_channel_set_variable(channel, "jsock_uuid_str", jsock->uuid_str);
 	switch_channel_set_variable(channel, "verto_user", jsock->uid);
+	switch_channel_set_variable(channel, "presence_id", jsock->uid);
+	switch_channel_set_variable(channel, "chat_proto", VERTO_CHAT_PROTO);
 	switch_channel_set_variable(channel, "verto_host", jsock->domain);
 	switch_channel_set_variable(channel, "event_channel_cookie", tech_pvt->jsock_uuid);
 	switch_channel_set_variable(channel, "verto_profile_name", jsock->profile->name);
@@ -4015,7 +4044,7 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 			jsock_t *jsock;
 
 			if ((jsock = get_jsock(tech_pvt->jsock_uuid))) {
-				jsock_queue_event(jsock, &msg);
+				jsock_queue_event_clone(jsock, msg);
 				//if (ws_write_json(jsock, &msg, SWITCH_FALSE) <= 0) {
 				//	switch_channel_hangup(switch_core_session_get_channel(session), SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 				//}
@@ -4039,7 +4068,7 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
 			if (!strcmp(uid, jsock->uid)) {
 				//ws_write_json(jsock, &msg, SWITCH_FALSE);
-				jsock_queue_event(jsock, &msg);
+				jsock_queue_event_clone(jsock, msg);
 				hits++;
 			}
 		}
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 2f0e3a7c94..c9ec5f0e81 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -613,9 +613,8 @@ static switch_status_t do_chat_send(switch_event_t *message_event)
 		switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "proto", proto);
 	}
 
-
 	replying = switch_event_get_header(message_event, "replying");
-	
+
 	if (!switch_true(replying) && !switch_stristr("global", proto) && !switch_true(switch_event_get_header(message_event, "skip_global_process"))) {
 		switch_mutex_lock(loadable_modules.mutex);
 		for (hi = switch_core_hash_first(loadable_modules.chat_hash); hi; hi = switch_core_hash_next(&hi)) {
@@ -650,6 +649,7 @@ static switch_status_t do_chat_send(switch_event_t *message_event)
 		switch_mutex_unlock(loadable_modules.mutex);
 	}
 	
+
 	if (!do_skip && !switch_stristr("GLOBAL", dest_proto)) {
 		if ((ci = switch_loadable_module_get_chat_interface(dest_proto)) && ci->chat_send) {
 			status = ci->chat_send(message_event);

From bbcbb24ca4993d91c592f0a7eea5e444539dd26d Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 02:44:34 -0400
Subject: [PATCH 098/130] followup commit on last verto changes

---
 src/mod/endpoints/mod_verto/mod_verto.c | 49 +++++++++++++++----------
 src/mod/endpoints/mod_verto/mod_verto.h |  1 +
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index e75eeea8b1..6a82cd5572 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -560,17 +560,26 @@ static switch_ssize_t ws_write_json(jsock_t *jsock, cJSON **json, switch_bool_t
 	if (r <= 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "WRITE RETURNED ERROR %" SWITCH_SIZE_T_FMT " \n", r);
 		jsock->drop = 1;
+		jsock->ready = 0;
 	}
 
 	return r;
 }
 
-static switch_status_t jsock_queue_event(jsock_t *jsock, cJSON **json)
+static switch_status_t jsock_queue_event(jsock_t *jsock, cJSON **json, switch_bool_t destroy)
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
-	
-	if (switch_queue_trypush(jsock->event_queue, *json) == SWITCH_STATUS_SUCCESS) {
+	cJSON *jp;
+
+	if (destroy) {
+		jp = *json;
+	} else {
+		jp = cJSON_Duplicate(*json, 1);
+	}
+
+	if (switch_queue_trypush(jsock->event_queue, jp) == SWITCH_STATUS_SUCCESS) {
 		status = SWITCH_STATUS_SUCCESS;
+		
 		if (jsock->lost_events) {
 			int le = jsock->lost_events;
 			jsock->lost_events = 0;
@@ -580,20 +589,20 @@ static switch_status_t jsock_queue_event(jsock_t *jsock, cJSON **json)
 		if (++jsock->lost_events > MAX_MISSED) {
 			jsock->drop++;
 		}
-		cJSON_Delete(*json);
+
+		if (!destroy) {
+			cJSON_Delete(jp);
+			jp = NULL;
+		}
 	}
 
-	*json = NULL;
+	if (destroy) {
+		*json = NULL;
+	}
 
 	return status;
 }
 
-static switch_status_t jsock_queue_event_clone(jsock_t *jsock, cJSON *json)
-{
-	cJSON *dup = cJSON_Duplicate(json, 1);
-	return jsock_queue_event(jsock, &dup);
-}
-
 static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *event)
 {
 	jsock_sub_node_head_t *head;
@@ -609,7 +618,7 @@ static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *ev
 				cJSON_AddItemToObject(params, "eventSerno", cJSON_CreateNumber(np->serno++));
 				msg = jrpc_new_req("verto.event", NULL, &params);
 				//ws_write_json(np->jsock, &msg, SWITCH_TRUE);
-				jsock_queue_event_clone(np->jsock, msg);
+				jsock_queue_event(np->jsock, &msg, SWITCH_TRUE);
 			}
 		}
 	}
@@ -642,7 +651,7 @@ static void jsock_send_event(cJSON *event)
 		params = cJSON_Duplicate(event, 1);
 		msg = jrpc_new_req("verto.event", NULL, &params);
 		//ws_write_json(use_jsock, &msg, SWITCH_TRUE); 
-		jsock_queue_event_clone(use_jsock, msg);
+		jsock_queue_event(use_jsock, &msg, SWITCH_TRUE);
 		switch_thread_rwlock_unlock(use_jsock->rwlock);
 		use_jsock = NULL;
 		return;
@@ -868,6 +877,7 @@ static switch_bool_t check_auth(jsock_t *jsock, cJSON *params, int *code, char *
 			jsock->id = switch_core_strdup(jsock->pool, id);
 			jsock->domain = switch_core_strdup(jsock->pool, domain);
 			jsock->uid = switch_core_sprintf(jsock->pool, "%s@%s", id, domain);
+			jsock->ready = 1;
 			
 			if (!x_user) {
 				switch_event_destroy(&req_params);
@@ -1837,7 +1847,7 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 					cJSON_AddItemToObject(params, "display_name", cJSON_CreateString(name));
 					cJSON_AddItemToObject(params, "display_number", cJSON_CreateString(number));
 					//ws_write_json(jsock, &jmsg, SWITCH_TRUE);
-					jsock_queue_event_clone(jsock, jmsg);
+					jsock_queue_event(jsock, &jmsg, SWITCH_TRUE);
 				}
 
 				switch_thread_rwlock_unlock(jsock->rwlock);
@@ -3847,7 +3857,7 @@ static char *verto_get_dial_string(const char *uid, switch_stream_handle_t *rstr
 		switch_mutex_lock(profile->mutex);
 		
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
-			if (!zstr(jsock->uid) && !zstr(uid) && !strcmp(uid, jsock->uid)) {
+			if (jsock->ready && !zstr(jsock->uid) && !zstr(uid) && !strcmp(uid, jsock->uid)) {
 				use_stream->write_function(use_stream, "%s/u:%s,", EP_NAME, jsock->uuid_str);
 				hits++;
 			}
@@ -4044,7 +4054,7 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 			jsock_t *jsock;
 
 			if ((jsock = get_jsock(tech_pvt->jsock_uuid))) {
-				jsock_queue_event_clone(jsock, msg);
+				jsock_queue_event(jsock, &msg, SWITCH_FALSE);
 				//if (ws_write_json(jsock, &msg, SWITCH_FALSE) <= 0) {
 				//	switch_channel_hangup(switch_core_session_get_channel(session), SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 				//}
@@ -4066,9 +4076,9 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 		switch_mutex_lock(profile->mutex);
 		
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
-			if (!strcmp(uid, jsock->uid)) {
+			if (jsock->ready && !zstr(jsock->uid) && !strcmp(uid, jsock->uid)) {
 				//ws_write_json(jsock, &msg, SWITCH_FALSE);
-				jsock_queue_event_clone(jsock, msg);
+				jsock_queue_event(jsock, &msg, SWITCH_FALSE);
 				hits++;
 			}
 		}
@@ -4093,13 +4103,14 @@ static switch_status_t chat_send(switch_event_t *message_event)
 
 	if (!zstr(to) && !zstr(body) && !zstr(from)) {
 		cJSON *obj = NULL, *msg = NULL, *params = NULL;
-
+		
 		obj = jrpc_new_req("verto.info", call_id, &params);
 		msg = json_add_child_obj(params, "msg", NULL);
 		
 		cJSON_AddItemToObject(msg, "from", cJSON_CreateString(from));
 		cJSON_AddItemToObject(msg, "to", cJSON_CreateString(to));
 		cJSON_AddItemToObject(msg, "body", cJSON_CreateString(body));
+
 		verto_send_chat(to, call_id, obj);
 		cJSON_Delete(obj);
 	} else {
diff --git a/src/mod/endpoints/mod_verto/mod_verto.h b/src/mod/endpoints/mod_verto/mod_verto.h
index db61cdedd1..44aa4eafaa 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.h
+++ b/src/mod/endpoints/mod_verto/mod_verto.h
@@ -127,6 +127,7 @@ struct jsock_s {
 
 	switch_queue_t *event_queue;
 	int lost_events;
+	int ready;
 
 	struct jsock_s *next;
 };

From ac265ce495f5ab5ddaad80589a4b3875fcd59eb6 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Thu, 24 Jul 2014 08:28:38 -0500
Subject: [PATCH 099/130] FS-6682: fix arg order on
 switch_channel_export_variable called from
 switch_channel_export_variable_printf #resolve

---
 src/switch_channel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/switch_channel.c b/src/switch_channel.c
index f6d3a96ddc..78ebc97938 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1284,7 +1284,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_printf(switch_cha
 		return SWITCH_STATUS_FALSE;
 	}
 	
-	status = switch_channel_export_variable(channel, varname, export_varname, data);
+	status = switch_channel_export_variable(channel, varname, data, export_varname);
 	
 	free(data);
 	

From d9eafdf0cb12ac87d90babb7774579734729ce97 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Thu, 24 Jul 2014 08:30:44 -0500
Subject: [PATCH 100/130] FS-6681: fix dup of audio/wav and add audio/x-wav

---
 src/mod/applications/mod_httapi/mod_httapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c
index dc48c34b44..a97287be5a 100644
--- a/src/mod/applications/mod_httapi/mod_httapi.c
+++ b/src/mod/applications/mod_httapi/mod_httapi.c
@@ -2691,7 +2691,7 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char
 			if (switch_strcasecmp_any(ct, "audio/mpeg", "audio/x-mpeg", "audio/mp3", "audio/x-mp3", "audio/mpeg3", 
 									  "audio/x-mpeg3", "audio/mpg", "audio/x-mpg", "audio/x-mpegaudio", NULL)) {
 				newext = "mp3";
-			} else if (switch_strcasecmp_any(ct, "audio/wav", "audio/x-wave", "audio/wav", "audio/wave", NULL)) {
+			} else if (switch_strcasecmp_any(ct, "audio/x-wav", "audio/x-wave", "audio/wav", "audio/wave", NULL)) {
 				newext = "wav";
 			}
 		}

From c735f5c1a4f6a61181f2ced78dd55a6456333493 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 21:03:36 +0500
Subject: [PATCH 101/130] add enter press detection to the extension field to
 auto-dial

---
 html5/verto/demo/verto.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 56700c6a9d..6e05941a0f 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -414,6 +414,13 @@ function init() {
 
     setupChat();
 
+    $("#ext").keyup(function (event) {
+	if (event.keyCode == 13) {
+	    $( "#callbtn" ).trigger( "click" );   
+	}
+    });
+
+
 }
 
 $(document).ready(function() {

From fbf4ccdf0274194b35cc520cb08dec935b9584a4 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 21:24:17 +0500
Subject: [PATCH 102/130] FS-6686 #resolve #comment increased the timeout to 30
 to accomidate situations where the engine takes longer to pick an IP

---
 html5/verto/demo/js/verto-min.js   | 2 +-
 html5/verto/js/src/jquery.verto.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index 0c161c7cf4..ec48134398 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -198,7 +198,7 @@ if(dialog.state==state||!checkStateChange(dialog.state,state)){console.error("Di
 console.info("Dialog "+dialog.callID+": state change from "+dialog.state.name+" to "+state.name);dialog.lastState=dialog.state;dialog.state=state;if(!dialog.causeCode){dialog.causeCode=16;}
 if(!dialog.cause){dialog.cause="NORMAL CLEARING";}
 if(dialog.callbacks.onDialogState){dialog.callbacks.onDialogState(this);}
-switch(dialog.state){case $.verto.enum.state.trying:setTimeout(function(){if(dialog.state==$.verto.enum.state.trying){dialog.setState($.verto.enum.state.hangup);}},5000);break;case $.verto.enum.state.purge:dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.hangup:if(dialog.lastState.val>$.verto.enum.state.requesting.val&&dialog.lastState.val<$.verto.enum.state.hangup.val){dialog.sendMethod("verto.bye",{});}
+switch(dialog.state){case $.verto.enum.state.trying:setTimeout(function(){if(dialog.state==$.verto.enum.state.trying){dialog.setState($.verto.enum.state.hangup);}},30000);break;case $.verto.enum.state.purge:dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.hangup:if(dialog.lastState.val>$.verto.enum.state.requesting.val&&dialog.lastState.val<$.verto.enum.state.hangup.val){dialog.sendMethod("verto.bye",{});}
 dialog.setState($.verto.enum.state.destroy);break;case $.verto.enum.state.destroy:delete verto.dialogs[dialog.callID];dialog.rtc.stop();break;}
 return true;};$.verto.dialog.prototype.processReply=function(method,success,e){var dialog=this;switch(method){case"verto.answer":case"verto.attach":if(success){dialog.setState($.verto.enum.state.active);}else{dialog.hangup();}
 break;case"verto.invite":if(success){dialog.setState($.verto.enum.state.trying);}else{dialog.setState($.verto.enum.state.destroy);}
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 461617ea16..a2a71b7105 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1575,7 +1575,7 @@
                 if (dialog.state == $.verto.enum.state.trying) {
 		    dialog.setState($.verto.enum.state.hangup);
                 }
-            }, 5000);
+            }, 30000);
 	    break;
         case $.verto.enum.state.purge:
             dialog.setState($.verto.enum.state.destroy);

From cd5e6d331afe580d158bf3d6d5665d81fb337679 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 21:39:03 +0500
Subject: [PATCH 103/130] update css

---
 html5/verto/demo/index.html | 91 +++++++++++++++++++------------------
 html5/verto/demo/verto.js   |  2 +-
 2 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index 7a6e53acea..415def7224 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -9,54 +9,59 @@
     <title>FreeSWITCH Verto&trade; Demo</title>
 
     <style type="text/css">
-      .pageheader {
-      font-size: 22px;
-      font-weight: normal;
-      height: 27px;
-      }
+									   .pageheader {
+	 font-size: 22px;
+	 font-weight: normal;
+	 height: 27px;
+ }
 
-      .ctlbtn {
-        border: 0px;
-	color: #eeeeee;
-	background-color: #0000ae;
-	font-face: arial;
-        height:18px;
-        font-size:7pt;
-      }     	      
+									   .ctlbtn {
+	 border: 0px;
+	 color: #eeeeee;
+	 background-color: #0000ae;
+	 font-face: arial;
+	 height:18px;
+	 font-size:7pt;
+										}     	      
 
-      .ctlbtn:hover {
-      color: #ffffae;
-      cursor: pointer;
-      }	
+.ctlbtn:hover {
+	 color: #ffffae;
+	 cursor: pointer;
+ }	
 
+#chatwin
+{
+	background-color: #eeeeee;
+	width: 500px;
+	height:150px;
+	max-height:150px;
+	overflow-y: scroll;
+	scrolling: auto;
+	text-align: left;
+	border-style:inset;
+	font-size: 10pt;
+	color: #3333ff;
+}
 
+.chatuid
+{
+	font-size: 7pt;
+	font-weight: bold;
+	color: #ff3333;
+}
 
-
-      #chatwin
-      {
-      background-color: #eeeeee;
-      width: 500px;
-      height:150px;
-      max-height:150px;
-      overflow-y: scroll;
-      scrolling: auto;
-      text-align: left;
-      border-style:inset;
-      font-size: 10pt;
-      }
-
-      .l1
-      {
-      border:1;
-      background-color:#fefefe;
-      height:1px;
-      opacity:0.4;
-      }
-      #chatmsg
-      {
-      width:400px;
-      max-height:40px;
-      }
+.l1
+{
+	border:1;
+	background-color:#fefefe;
+	height:1px;
+	opacity:0.4;
+}
+#chatmsg
+{
+	width:400px;
+	max-height:40px;
+}
 
 
     </style>
diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 6e05941a0f..0c7a00d824 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -111,7 +111,7 @@ var callbacks = {
 	    var body = data.body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
 	    body = body.replace(/(?:\r\n|\r|\n)/g, '<br />');
 
-            $("#chatwin").append("<b>" + data.from + "</b>:<br>" + "" + body + "" + "<br>");
+            $("#chatwin").append("<span class=chatuid>" + data.from + ":</span><br>" + body);
 	    $('#chatwin').animate({"scrollTop": $('#chatwin')[0].scrollHeight}, "fast");
 
             break;

From 004c5ab2b0c842a423c3b4b679cece19a7d7cfae Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 22:58:12 +0500
Subject: [PATCH 104/130] fix some issues with duplicate chat events and some
 cleanup

---
 html5/verto/demo/verto.js                     | 15 +++++++++---
 .../mod_conference/mod_conference.c           | 17 +++++++++----
 src/mod/endpoints/mod_verto/mod_verto.c       | 24 +++++++++++++++----
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 0c7a00d824..b770a7c394 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -55,7 +55,11 @@ function setupChat() {
 	    return;
 	}
 
-	cur_call.message({to: chatting_with, body: $("#chatmsg").val()});  
+	cur_call.message({to: chatting_with, 
+			  body: $("#chatmsg").val(), 
+			  from_msg_name: cur_call.params.caller_id_name, 
+			  from_msg_number: cur_call.params.caller_id_number
+			 });  
 	$("#chatmsg").val("");
     });
 
@@ -109,9 +113,14 @@ var callbacks = {
             break;
         case $.verto.enum.message.info:
 	    var body = data.body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
-	    body = body.replace(/(?:\r\n|\r|\n)/g, '<br />');
 
-            $("#chatwin").append("<span class=chatuid>" + data.from + ":</span><br>" + body);
+	    if (body.slice(-1) !== "\n") {
+		body += "\n";
+	    }
+	    body = body.replace(/(?:\r\n|\r|\n)/g, '<br />');
+	    var from = data.from_msg_name || data.from;
+	    
+            $("#chatwin").append("<span class=chatuid>" + from + ":</span><br>" + body);
 	    $('#chatwin').animate({"scrollTop": $('#chatwin')[0].scrollHeight}, "fast");
 
             break;
diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index bbef2f5e60..f4a6757572 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -5944,8 +5944,10 @@ static switch_status_t conference_say(conference_obj_t *conference, const char *
 static void chat_message_broadcast(conference_obj_t *conference, switch_event_t *event)
 {
 	conference_member_t *member = NULL;
+	switch_event_t *processed;
 
 	switch_assert(conference != NULL);
+	switch_event_create(&processed, SWITCH_EVENT_CHANNEL_DATA);
 
 	switch_mutex_lock(conference->member_mutex);
 	for (member = conference->members; member; member = member->next) {
@@ -5955,20 +5957,22 @@ static void chat_message_broadcast(conference_obj_t *conference, switch_event_t
 			switch_event_t *reply = NULL;
 			
 			if (presence_id && chat_proto) {
+				if (switch_event_get_header(processed, presence_id)) {
+					continue;
+				}
 				switch_event_dup(&reply, event);
 				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "to", presence_id);
 				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "conference_name", conference->name);
 				switch_event_add_header_string(reply, SWITCH_STACK_BOTTOM, "conference_domain", conference->domain);
 				
 				switch_event_set_body(reply, switch_event_get_body(event));
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SENDIT\n");
-				DUMP_EVENT(reply);
-
-				switch_core_chat_deliver(chat_proto, &reply);
 				
+				switch_core_chat_deliver(chat_proto, &reply);
+				switch_event_add_header_string(processed, SWITCH_STACK_BOTTOM, presence_id, "true");
 			}
 		}
 	}
+	switch_event_destroy(&processed);
 	switch_mutex_unlock(conference->member_mutex);
 }
 
@@ -9796,7 +9800,10 @@ static switch_status_t chat_send(switch_event_t *message_event)
 
 	switch_safe_free(lbuf);
 
-	switch_core_chat_send_args(proto, CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", stream.data, NULL, NULL, SWITCH_FALSE);
+	if (!conference->broadcast_chat_messages) {
+		switch_core_chat_send_args(proto, CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", stream.data, NULL, NULL, SWITCH_FALSE);
+	}
+
 	switch_safe_free(stream.data);
 	switch_thread_rwlock_unlock(conference->rwlock);
 
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 6a82cd5572..b1568dcfa9 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -946,7 +946,7 @@ static void set_call_params(cJSON *params, verto_pvt_t *tech_pvt) {
 	const char *caller_id_name = NULL;
 	const char *caller_id_number = NULL;
 	
-	if (switch_channel_outbound_display(tech_pvt->channel)) {
+	if (switch_channel_inbound_display(tech_pvt->channel)) {
 		caller_id_name = switch_channel_get_variable(tech_pvt->channel, "caller_id_name");
 		caller_id_number = switch_channel_get_variable(tech_pvt->channel, "caller_id_number");
 	} else {
@@ -2563,10 +2563,10 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 		switch_event_t *event;
 		char *to = (char *) cJSON_GetObjectCstr(msg, "to");
 		//char *from = (char *) cJSON_GetObjectCstr(msg, "from");
-		cJSON *indialog =  cJSON_GetObjectItem(msg, "inDialog");
+		cJSON *i, *indialog =  cJSON_GetObjectItem(msg, "inDialog");
 		const char *body = cJSON_GetObjectCstr(msg, "body");
 		switch_bool_t is_dialog = indialog && (indialog->type == cJSON_True || (indialog->type == cJSON_String && switch_true(indialog->valuestring)));
-
+		
 		if (!zstr(to)) {
 			if (strchr(to, '+')) {
 				pproto = strdup(to);
@@ -2591,6 +2591,12 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "verto_profile", jsock->profile->name);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "verto_jsock_uuid", jsock->uuid_str);
 			
+			for(i = msg->child; i; i = i->next) {
+				if (!zstr(i->string) && !zstr(i->valuestring) && (!strncasecmp(i->string, "from_", 5) || !strncasecmp(i->string, "to_", 3))) {
+					switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, i->string, i->valuestring);
+				}
+			}
+
 			if (is_dialog) {
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", call_id);
 			}
@@ -4098,12 +4104,13 @@ static switch_status_t chat_send(switch_event_t *message_event)
 	const char *body = switch_event_get_body(message_event);
 	const char *call_id = switch_event_get_header(message_event, "call_id"); 
 
-	DUMP_EVENT(message_event);
+	//DUMP_EVENT(message_event);
 
 
 	if (!zstr(to) && !zstr(body) && !zstr(from)) {
 		cJSON *obj = NULL, *msg = NULL, *params = NULL;
-		
+		switch_event_header_t *eh;
+
 		obj = jrpc_new_req("verto.info", call_id, &params);
 		msg = json_add_child_obj(params, "msg", NULL);
 		
@@ -4111,10 +4118,17 @@ static switch_status_t chat_send(switch_event_t *message_event)
 		cJSON_AddItemToObject(msg, "to", cJSON_CreateString(to));
 		cJSON_AddItemToObject(msg, "body", cJSON_CreateString(body));
 
+		for (eh = message_event->headers; eh; eh = eh->next) {
+			if ((!strncasecmp(eh->name, "from_", 5) || !strncasecmp(eh->name, "to_", 3))) {
+				cJSON_AddItemToObject(msg, eh->name, cJSON_CreateString(eh->value)); 
+			}
+		}
+
 		verto_send_chat(to, call_id, obj);
 		cJSON_Delete(obj);
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID EVENT\n");
+		DUMP_EVENT(message_event);
 		status = SWITCH_STATUS_FALSE;
 	}
 

From acffa7961bbe93b939e09242753c9a2ea1788bfc Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 23:17:55 +0500
Subject: [PATCH 105/130] send dtmf from keyboard strokes

---
 html5/verto/demo/verto.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index b770a7c394..b1777e252a 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -429,6 +429,16 @@ function init() {
 	}
     });
 
+    $(document).keypress(function(event) {
+	if (!cur_call) return;
+	var key = String.fromCharCode(event.keyCode);
+	var i = parseInt(key);
+
+	if (key === "#" || key === "*" || key === "0" || (i > 0 && i <= 9)) {
+	    cur_call.dtmf(key);
+	}
+    });
+
 
 }
 

From bd804df7a38917cc88cc5bce8463af20e75931b6 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 24 Jul 2014 23:43:05 +0500
Subject: [PATCH 106/130] only do kepress on outside of page for dtmf

---
 html5/verto/demo/verto.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index b1777e252a..52ffd64007 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -430,10 +430,11 @@ function init() {
     });
 
     $(document).keypress(function(event) {
-	if (!cur_call) return;
+	if (!(cur_call && event.target.id == "page-incall")) return;
 	var key = String.fromCharCode(event.keyCode);
 	var i = parseInt(key);
 
+
 	if (key === "#" || key === "*" || key === "0" || (i > 0 && i <= 9)) {
 	    cur_call.dtmf(key);
 	}

From 4f1b09a3ca9e6ac1d88fc2c002bf9facbd32ddc0 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 25 Jul 2014 00:23:08 +0500
Subject: [PATCH 107/130] add switch_socket_waitlist for waiting on multiple
 sockets and abstract it to poll and select so windows can use it too

---
 src/include/switch_types.h              |   7 +
 src/include/switch_utils.h              |   2 +
 src/mod/endpoints/mod_verto/mod_verto.c | 105 +++++++------
 src/switch_utils.c                      | 193 ++++++++++++++++++++++++
 4 files changed, 261 insertions(+), 46 deletions(-)

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 8b2fd99b9f..55f1bd1614 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -2398,6 +2398,13 @@ typedef enum {
 	SWITCH_POLL_INVALID = (1 << 7)
 } switch_poll_t;
 
+typedef struct switch_waitlist_s {
+	switch_os_socket_t sock;
+	uint32_t events;
+	uint32_t revents;
+} switch_waitlist_t;
+
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index fc6c06861b..f1903c8c29 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -1067,6 +1067,8 @@ SWITCH_DECLARE(unsigned long) switch_atoul(const char *nptr);
  */
 SWITCH_DECLARE(char *) switch_strerror_r(int errnum, char *buf, switch_size_t buflen);
 SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags);
+SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t len, uint32_t ms);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index b1568dcfa9..4530505430 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -3255,11 +3255,66 @@ static void handle_mcast_sub(verto_profile_t *profile)
 
 }
 
+static int profile_one_loop(verto_profile_t *profile)
+{
+	switch_waitlist_t pfds[MAX_BIND+4];
+	int res, x = 0;
+	int i = 0;
+	int max = 2;
+
+	memset(&pfds[0], 0, sizeof(pfds[0]) * MAX_BIND+2);
+		
+	for (i = 0; i < profile->i; i++)  {
+		pfds[i].sock = profile->server_socket[i];
+		pfds[i].events = SWITCH_POLL_READ|SWITCH_POLL_ERROR;
+	}
+
+	if (profile->mcast_ip) {
+		pfds[i].sock = profile->mcast_sub.sock;
+		pfds[i++].events = SWITCH_POLL_READ|SWITCH_POLL_ERROR;
+	}
+
+	max = i;
+
+	if ((res = switch_wait_socklist(pfds, max, 1000)) < 0) {
+		if (errno != EINTR) {
+			die("POLL FAILED\n");
+		}
+	}
+
+	if (res == 0) {
+		return 0;
+	}
+			
+	for (x = 0; x < max; x++) {
+		if (pfds[x].revents & SWITCH_POLL_ERROR) {
+			die("POLL ERROR\n");
+		}
+
+		if (pfds[x].revents & SWITCH_POLL_HUP) {
+			die("POLL HUP\n");
+		}
+			
+		if (pfds[x].revents & SWITCH_POLL_READ) {
+			if (pfds[x].sock == profile->mcast_sub.sock) {
+				handle_mcast_sub(profile);
+			} else {
+				start_jsock(profile, pfds[x].sock);
+			}
+		}
+	}
+
+	return res;
+
+ error:
+	return -1;
+}
+
+
 static int runtime(verto_profile_t *profile)
 {
-	int max = 2;
 	int i;
-	
+
 	for (i = 0; i < profile->i; i++) {
 		if ((profile->server_socket[i] = prepare_socket(profile->ip[i].local_ip_addr, profile->ip[i].local_port)) < 0) {
 			die("Client Socket Error!\n");
@@ -3281,50 +3336,8 @@ static int runtime(verto_profile_t *profile)
 	
 	
 	while(profile->running) {
-		struct pollfd pfds[MAX_BIND+4];
-		int res, x = 0;
-		int i = 0;
-
-		memset(&pfds[0], 0, sizeof(pfds[0]) * MAX_BIND+2);
-		
-		for (i = 0; i < profile->i; i++)  {
-			pfds[i].fd = profile->server_socket[i];
-			pfds[i].events = POLLIN|POLLERR;
-		}
-
-		if (profile->mcast_ip) {
-			pfds[i].fd = profile->mcast_sub.sock;
-			pfds[i++].events = POLLIN|POLLERR;
-		}
-
-		max = i;
-
-		if ((res = poll(pfds, max, 1000)) < 0) {
-			if (errno != EINTR) {
-				die("POLL FAILED\n");
-			}
-		}
-
-		if (res == 0) {
-			continue;
-		}
-			
-		for (x = 0; x < max; x++) {
-			if (pfds[x].revents & POLLERR) {
-				die("POLL ERROR\n");
-			}
-
-			if (pfds[x].revents & POLLHUP) {
-				die("POLL HUP\n");
-			}
-			
-			if (pfds[x].revents & POLLIN) {
-				if (pfds[x].fd == profile->mcast_sub.sock) {
-					handle_mcast_sub(profile);
-				} else {
-					start_jsock(profile, pfds[x].fd);
-				}
-			}
+		if (profile_one_loop(profile) < 0) {
+			goto error;
 		}
 	}
 
diff --git a/src/switch_utils.c b/src/switch_utils.c
index a45187b2cc..6e7dfeacc3 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2570,6 +2570,94 @@ SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switc
 
 }
 
+SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t len, uint32_t ms)
+{
+	struct pollfd *pfds;
+	int s = 0, r = 0, i;
+
+	pfds = calloc(len, sizeof(struct pollfd));
+	
+	for (i = 0; i < len; i++) {
+		if (waitlist[i].sock == SWITCH_SOCK_INVALID) {
+			break;
+		}
+
+		pfds[i].fd = waitlist[i].sock;
+		
+		if ((waitlist[i].events & SWITCH_POLL_READ)) {
+			pfds[i].events |= POLLIN;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_WRITE)) {
+			pfds[i].events |= POLLOUT;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_ERROR)) {
+			pfds[i].events |= POLLERR;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_HUP)) {
+			pfds[i].events |= POLLHUP;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_RDNORM)) {
+			pfds[i].events |= POLLRDNORM;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_RDBAND)) {
+			pfds[i].events |= POLLRDBAND;
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_PRI)) {
+			pfds[i].events |= POLLPRI;
+		}
+	}
+	
+	s = poll(pfds, len, ms);
+
+	if (s < 0) {
+		r = s;
+	} else if (s > 0) {
+		for (i = 0; i < len; i++) {
+			if ((pfds[i].revents & POLLIN)) {
+				r |= SWITCH_POLL_READ;
+				waitlist[i].revents |= SWITCH_POLL_READ;
+			}
+			if ((pfds[i].revents & POLLOUT)) {
+				r |= SWITCH_POLL_WRITE;
+				waitlist[i].revents |= SWITCH_POLL_WRITE;
+			}
+			if ((pfds[i].revents & POLLERR)) {
+				r |= SWITCH_POLL_ERROR;
+				waitlist[i].revents |= SWITCH_POLL_ERROR;
+			}
+			if ((pfds[i].revents & POLLHUP)) {
+				r |= SWITCH_POLL_HUP;
+				waitlist[i].revents |= SWITCH_POLL_HUP;
+			}
+			if ((pfds[i].revents & POLLRDNORM)) {
+				r |= SWITCH_POLL_RDNORM;
+				waitlist[i].revents |= SWITCH_POLL_RDNORM;
+			}
+			if ((pfds[i].revents & POLLRDBAND)) {
+				r |= SWITCH_POLL_RDBAND;
+				waitlist[i].revents |= SWITCH_POLL_RDBAND;
+			}
+			if ((pfds[i].revents & POLLPRI)) {
+				r |= SWITCH_POLL_PRI;
+				waitlist[i].revents |= SWITCH_POLL_PRI;
+			}
+			if ((pfds[i].revents & POLLNVAL)) {
+				r |= SWITCH_POLL_INVALID;
+				waitlist[i].revents |= SWITCH_POLL_INVALID;
+			}
+		}
+	}
+
+	return r;
+
+}
+
 #else
 /* use select instead of poll */
 SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags)
@@ -2660,6 +2748,111 @@ SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switc
 
 	return r;
 
+}
+
+SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t len, uint32_t ms)
+{
+	int s = 0, r = 0;
+	fd_set *rfds;
+	fd_set *wfds;
+	fd_set *efds;
+	struct timeval tv;
+	int i;
+	switch_os_socket_t max_fd = 0;
+	int flags = 0;
+
+	rfds = malloc(sizeof(fd_set));
+	wfds = malloc(sizeof(fd_set));
+	efds = malloc(sizeof(fd_set));
+
+	FD_ZERO(rfds);
+	FD_ZERO(wfds);
+	FD_ZERO(efds);
+
+	for (i = 0; i < len; i++) {
+		if (waitlist[i].sock == SWITCH_SOCK_INVALID) {
+			break;
+		}
+
+		if (waitlist[i].sock > max_fd) {
+			max_fd = waitlist[i].sock;
+		}
+
+#ifndef WIN32
+		/* Wouldn't you rather know?? */
+		assert(waitlist[i].sock <= FD_SETSIZE);
+#endif
+		flags |= waitlist[i].events;
+	
+		if ((waitlist[i].events & SWITCH_POLL_READ)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+			FD_SET(waitlist[i].sock, rfds);
+#pragma warning( pop ) 
+#else
+			FD_SET(waitlist[i].sock, rfds);
+#endif
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_WRITE)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+			FD_SET(waitlist[i].sock, wfds);
+#pragma warning( pop ) 
+#else
+			FD_SET(waitlist[i].sock, wfds);
+#endif
+		}
+
+		if ((waitlist[i].events & SWITCH_POLL_ERROR)) {
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+			FD_SET(waitlist[i].sock, efds);
+#pragma warning( pop ) 
+#else
+			FD_SET(waitlist[i].sock, efds);
+#endif
+		}
+	}
+
+	tv.tv_sec = ms / 1000;
+	tv.tv_usec = (ms % 1000) * ms;
+	
+	s = select(max_fd + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv);
+
+	if (s < 0) {
+		r = s;
+	} else if (s > 0) {
+		for (i = 0; i < len; i++) {
+			if ((waitlist[i].events & SWITCH_POLL_READ) && FD_ISSET(waitlist[i].sock, rfds)) {
+				r |= SWITCH_POLL_READ;
+				waitlist[i].revents |= SWITCH_POLL_READ;
+			}
+
+			if ((waitlist[i].events & SWITCH_POLL_WRITE) && FD_ISSET(waitlist[i].sock, wfds)) {
+				r |= SWITCH_POLL_WRITE;
+				waitlist[i].revents |= SWITCH_POLL_WRITE;
+			}
+
+			if ((waitlist[i].events & SWITCH_POLL_ERROR) && FD_ISSET(waitlist[i].sock, efds)) {
+				r |= SWITCH_POLL_ERROR;
+				waitlist[i].revents |= SWITCH_POLL_ERROR;
+			}
+		}
+	}
+
+	free(rfds);
+	free(wfds);
+	free(efds);
+
+	return r;
+
 }
 #endif
 

From a47dc4b5d0c360b4f6493218d20cbae6094931cf Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 25 Jul 2014 01:31:35 +0500
Subject: [PATCH 108/130] render image urls

---
 html5/verto/demo/index.html | 5 +++++
 html5/verto/demo/verto.js   | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index 415def7224..af26f5b2b1 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -50,6 +50,11 @@
 	color: #ff3333;
 }
 
+.chatimg
+{
+	max-width:100px;
+}
+
 .l1
 {
 	border:1;
diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 52ffd64007..de27cabbb1 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -112,12 +112,19 @@ var callbacks = {
             }
             break;
         case $.verto.enum.message.info:
-	    var body = data.body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
+	    var body = data.body;
+
+	    if (body.match(/\.gif|\.jpg|\.jpeg|\.png/)) {
+		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<br><img border='0' class='chatimg' src='$1'><\/a>");
+	    } else {
+		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
+	    }
 
 	    if (body.slice(-1) !== "\n") {
 		body += "\n";
 	    }
 	    body = body.replace(/(?:\r\n|\r|\n)/g, '<br />');
+	    
 	    var from = data.from_msg_name || data.from;
 	    
             $("#chatwin").append("<span class=chatuid>" + from + ":</span><br>" + body);

From a4ff7eade7fe022fcde5d2052e1557aa68ea235e Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 25 Jul 2014 01:38:12 +0500
Subject: [PATCH 109/130] render image urls

---
 html5/verto/demo/verto.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index de27cabbb1..e8cc456867 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -115,7 +115,7 @@ var callbacks = {
 	    var body = data.body;
 
 	    if (body.match(/\.gif|\.jpg|\.jpeg|\.png/)) {
-		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<br><img border='0' class='chatimg' src='$1'><\/a>");
+		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<br><img border='0' class='chatimg' src='$1?dl=1'><\/a>");
 	    } else {
 		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
 	    }

From 6f800ef90aa2f0658e79cf72309e331cf3ded462 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 25 Jul 2014 01:55:53 +0500
Subject: [PATCH 110/130] add resize

---
 html5/verto/demo/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index af26f5b2b1..e40e1029fa 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -34,13 +34,13 @@
 	background-color: #eeeeee;
 	width: 500px;
 	height:150px;
-	max-height:150px;
 	overflow-y: scroll;
 	scrolling: auto;
 	text-align: left;
 	border-style:inset;
 	font-size: 10pt;
 	color: #3333ff;
+	resize:both;
 }
 
 .chatuid

From e09ea08c346d49ed07c86a61f92edfd2de8605d5 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 25 Jul 2014 02:03:08 +0500
Subject: [PATCH 111/130] hack for dropbox

---
 html5/verto/demo/verto.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index e8cc456867..2099824f13 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -115,7 +115,11 @@ var callbacks = {
 	    var body = data.body;
 
 	    if (body.match(/\.gif|\.jpg|\.jpeg|\.png/)) {
-		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<br><img border='0' class='chatimg' src='$1?dl=1'><\/a>");
+		var mod = "";
+		if (body.match(/dropbox.com/)) {
+		    mod = "?dl=1";
+		}
+		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<br><img border='0' class='chatimg' src='$1'" + mod + "><\/a>");
 	    } else {
 		body = body.replace(/(http[s]{0,1}:\/\/\S+)/g, "<a target='_blank' href='$1'>$1<\/a>");
 	    }

From 573257144d077d8f1a81e93e61c379f136b28458 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 25 Jul 2014 07:31:13 -0500
Subject: [PATCH 112/130] FS-6689 #comment next time please attach a diff
 #resolve

---
 debian/util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/util.sh b/debian/util.sh
index 64740b1bd3..b15bf5395a 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -102,8 +102,8 @@ getlibs () {
   getlib http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/soundtouch-1.7.1.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2
-  getlib http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz
+  getlib http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
+  getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz

From b7f2eab5f1ff0b34ffeb2fb742897232c39bfe2a Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 25 Jul 2014 10:22:26 -0500
Subject: [PATCH 113/130] Fix this to use the vars for path to wss.pem

---
 conf/vanilla/autoload_configs/verto.conf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/vanilla/autoload_configs/verto.conf.xml b/conf/vanilla/autoload_configs/verto.conf.xml
index 12897b0431..bc61c81655 100644
--- a/conf/vanilla/autoload_configs/verto.conf.xml
+++ b/conf/vanilla/autoload_configs/verto.conf.xml
@@ -8,8 +8,8 @@
     <profile name="mine">
       <param name="bind-local" value="0.0.0.0:8081"/>
       <param name="bind-local" value="0.0.0.0:8082" secure="true"/>
-      <param name="secure-combined" value="/usr/local/freeswitch/certs/wss.pem"/>
-      <param name="secure-chain" value="/usr/local/freeswitch/certs/wss.pem"/>
+      <param name="secure-combined" value="$${base_dir}/certs/wss.pem"/>
+      <param name="secure-chain" value="$${base_dir}/certs/wss.pem"/>
       <param name="userauth" value="true"/>
       <!-- setting this to true will allow anyone to register even with no account so use with care -->
       <param name="blind-reg" value="false"/>

From ed7aa96778597f521f0bb2e830277a0d95b21fd7 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 25 Jul 2014 11:08:16 -0500
Subject: [PATCH 114/130] Notes on how to make a CA and setup up everything
 quick and dirty style

---
 docs/how_to_make_your_own_ca_correctly.txt | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 docs/how_to_make_your_own_ca_correctly.txt

diff --git a/docs/how_to_make_your_own_ca_correctly.txt b/docs/how_to_make_your_own_ca_correctly.txt
new file mode 100644
index 0000000000..55c3546e4d
--- /dev/null
+++ b/docs/how_to_make_your_own_ca_correctly.txt
@@ -0,0 +1,50 @@
+Someone should probably turn this into a nice how-to:
+
+Here is how I did it.
+
+wget http://www.openssl.org/contrib/ssl.ca-0.1.tar.gz
+tar zxfv ssl.ca-0.1.tar.gz
+cd ssl.ca-0.1/
+perl -i -pe 's/md5/sha1/g' *.sh
+perl -i -pe 's/1024/2048/g' *.sh
+./new-root-ca.sh
+./new-server-cert.sh self.bkw.org
+./sign-server-cert.sh self.bkw.org
+cat self.bkw.org.crt self.bkw.org.key > /usr/local/freeswitch/certs/wss.pem
+
+Setup Apache:
+
+default-ssl:
+
+SSLCertificateFile    /usr/local/freeswitch/certs/wss.pem
+SSLCertificateKeyFile /usr/local/freeswitch/certs/wss.pem
+SSLCertificateChainFile /usr/local/freeswitch/certs/wss.pem
+
+Setup Sofia TLS:
+
+cat self.bkw.org.crt self.bkw.org.key > /usr/local/freeswitch/certs/agent.pem
+cat ca.crt > /usr/local/freeswitch/certs/cafile.pem
+
+vars.xml:
+
+<X-PRE-PROCESS cmd="set" data="internal_ssl_enable=true"/>
+<X-PRE-PROCESS cmd="set" data="external_ssl_enable=true"/>
+
+Restart FreeSWITCH.
+
+Now make sure your system has ca.crt imported so it will trust your new found hotness.
+
+TEST:
+
+openssl s_client -connect self.bkw.org:443
+openssl s_client -connect self.bkw.org:5061
+openssl s_client -connect self.bkw.org:5081
+openssl s_client -connect self.bkw.org:8082
+
+
+Depending on what you've setup you'll see:
+
+subject=/C=US/ST=Oklahoma/L=McAlester/O=Tonka Truck/OU=Secure Web Server/CN=self.bkw.org/emailAddress=brian@bkw.org
+issuer=/C=US/ST=Oklahoma/L=McAlester/O=Whizzzzzzy Bang Bang/OU=Certification Services Division/CN=WBB Root CA/emailAddress=brian@bkw.org
+
+Or there abouts.

From 327146cecf9fe3969e2dd66401ced1a7acd51853 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 25 Jul 2014 11:34:08 -0500
Subject: [PATCH 115/130] Fix WS Compile on MSVC2012

---
 libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 3b152e4fec..8a0d3addcc 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -1,6 +1,11 @@
 #include "ws.h"
 #include <pthread.h>
 
+#ifdef _MSC_VER
+/* warning C4706: assignment within conditional expression*/
+#pragma warning(disable: 4706)
+#endif
+
 #ifndef _MSC_VER
 #include <fcntl.h>
 #endif

From 7ec61d843abf2f283bca7a5dc668437637e30c47 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Sat, 26 Jul 2014 01:51:01 +0500
Subject: [PATCH 116/130] css tweak

---
 html5/verto/demo/css/jsontable.css | 4 ++--
 html5/verto/demo/js/verto-min.js   | 2 +-
 html5/verto/js/src/jquery.verto.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html5/verto/demo/css/jsontable.css b/html5/verto/demo/css/jsontable.css
index aa6b260ca0..07acd67eba 100644
--- a/html5/verto/demo/css/jsontable.css
+++ b/html5/verto/demo/css/jsontable.css
@@ -20,12 +20,12 @@
 	padding: 2px;
 	vertical-align: middle;
         height:25px;
+	font-size: 10px;
 }
 
 .jsDataTable {
     font-family: verdana; 
-    font-size:10pt;  
-
+    font-size:10pt;
 }
 
 .jsDataTable > tbody > tr:nth-child(odd),
diff --git a/html5/verto/demo/js/verto-min.js b/html5/verto/demo/js/verto-min.js
index ec48134398..9a520c7da2 100644
--- a/html5/verto/demo/js/verto-min.js
+++ b/html5/verto/demo/js/verto-min.js
@@ -174,7 +174,7 @@ confMan.params=$.extend({tableID:null,statusID:null,mainModID:null,dialog:null,h
 +"<br><br></div>";jq.html(html);$("#"+play_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("play",null,file);});$("#"+stop_id).click(function(){confMan.modCommand("stop",null,"all");});$("#"+recording_id).click(function(){var file=prompt("Please enter file name","");confMan.modCommand("recording",null,["start",file]);});$("#"+rec_stop_id).click(function(){confMan.modCommand("recording",null,["stop","all"]);});}
 function genControls(jq,rowid){var x=parseInt(rowid);var kick_id="kick_"+x;var tmute_id="tmute_"+x;var box_id="box_"+x;var volup_id="volume_in_up"+x;var voldn_id="volume_in_dn"+x;var transfer_id="transfer"+x;var html="<div id='"+box_id+"'>"+"<button class='ctlbtn' id='"+kick_id+"'>Kick</button>"+"<button class='ctlbtn' id='"+tmute_id+"'>Mute</button>"+"<button class='ctlbtn' id='"+voldn_id+"'>Vol -</button>"+"<button class='ctlbtn' id='"+volup_id+"'>Vol +</button>"+"<button class='ctlbtn' id='"+transfer_id+"'>Transfer</button>"+"</div>";jq.html(html);if(!jq.data("mouse")){$("#"+box_id).hide();}
 jq.mouseover(function(e){jq.data({"mouse":true});$("#"+box_id).show();});jq.mouseout(function(e){jq.data({"mouse":false});$("#"+box_id).hide();});$("#"+transfer_id).click(function(){var xten=prompt("Enter Extension");confMan.modCommand("transfer",x,xten);});$("#"+kick_id).click(function(){confMan.modCommand("kick",x);});$("#"+tmute_id).click(function(){confMan.modCommand("tmute",x);});$("#"+volup_id).click(function(){confMan.modCommand("volume_in",x,"up");});$("#"+voldn_id).click(function(){confMan.modCommand("volume_in",x,"down");});return html;}
-var atitle="";var awidth=0;$(".jsDataTable").width(confMan.params.hasVid?"900px":"800px");if(confMan.params.laData.role==="moderator"){atitle="Action";awidth=200;if(confMan.params.mainModID){genMainMod($(confMan.params.mainModID));$(confMan.params.displayID).html("Moderator Controls Ready<br><br>")}else{$(confMan.params.mainModID).html("");}
+var atitle="";var awidth=0;if(confMan.params.laData.role==="moderator"){atitle="Action";awidth=200;if(confMan.params.mainModID){genMainMod($(confMan.params.mainModID));$(confMan.params.displayID).html("Moderator Controls Ready<br><br>")}else{$(confMan.params.mainModID).html("");}
 verto.subscribe(confMan.params.laData.modChannel,{handler:function(v,e){console.error("MODDATA:",e.data);if(confMan.params.onBroadcast){confMan.params.onBroadcast(verto,confMan,e.data);}
 if(!confMan.destroyed&&confMan.params.displayID){$(confMan.params.displayID).html(e.data.response+"<br><br>");if(confMan.lastTimeout){clearTimeout(confMan.lastTimeout);confMan.lastTimeout=0;}
 confMan.lastTimeout=setTimeout(function(){$(confMan.params.displayID).html(confMan.destroyed?"":"Moderator Controls Ready<br><br>")},4000);}}});}
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index a2a71b7105..e0d98a44d1 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1251,7 +1251,7 @@
 	var atitle = "";
 	var awidth = 0;
 		    
-        $(".jsDataTable").width(confMan.params.hasVid ? "900px" : "800px");
+        //$(".jsDataTable").width(confMan.params.hasVid ? "900px" : "800px");
 	
 	if (confMan.params.laData.role === "moderator") {
 	    atitle = "Action";

From bf0f488b99f40efd0e7a572625f1c18071445ae7 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 25 Jul 2014 15:54:37 -0500
Subject: [PATCH 117/130] tweaks

---
 conf/vanilla/autoload_configs/conference.conf.xml | 2 ++
 conf/vanilla/directory/default.xml                | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/conf/vanilla/autoload_configs/conference.conf.xml b/conf/vanilla/autoload_configs/conference.conf.xml
index ee41f740d7..c1c0044c48 100644
--- a/conf/vanilla/autoload_configs/conference.conf.xml
+++ b/conf/vanilla/autoload_configs/conference.conf.xml
@@ -124,6 +124,8 @@
            wait_mod will wait until the moderator in,
            audio-always will always mix audio from all members regardless they are talking or not -->
       <!-- <param name="conference-flags" value="audio-always"/> -->
+      <!-- Allow live array sync for Verto -->
+      <!-- <param name="conference-flags" value="livearray-sync"/> -->
     </profile>
 
     <profile name="wideband">
diff --git a/conf/vanilla/directory/default.xml b/conf/vanilla/directory/default.xml
index 95b75b40dd..3b1f5b3ab3 100644
--- a/conf/vanilla/directory/default.xml
+++ b/conf/vanilla/directory/default.xml
@@ -22,6 +22,9 @@
   <domain name="$${domain}">
     <params>
       <param name="dial-string" value="{^^:sip_invite_domain=${dialed_domain}:presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(*/${dialed_user}@${dialed_domain})}"/>
+      <!-- These are required for Verto to function properly -->
+      <!-- <param name="jsonrpc-allowed-methods" value="verto"/> -->
+      <!-- <param name="jsonrpc-allowed-event-channels" value="demo,conference,presence"/> -->
     </params>
 
     <variables>

From c411f8c7a99ea535bac661fb70676cebd1acfac5 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Sat, 26 Jul 2014 02:24:10 +0500
Subject: [PATCH 118/130] queue more messages

---
 src/mod/endpoints/mod_verto/mod_verto.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 4530505430..c7f4128690 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -617,7 +617,6 @@ static void write_event(const char *event_channel, jsock_t *use_jsock, cJSON *ev
 				params = cJSON_Duplicate(event, 1);
 				cJSON_AddItemToObject(params, "eventSerno", cJSON_CreateNumber(np->serno++));
 				msg = jrpc_new_req("verto.event", NULL, &params);
-				//ws_write_json(np->jsock, &msg, SWITCH_TRUE);
 				jsock_queue_event(np->jsock, &msg, SWITCH_TRUE);
 			}
 		}
@@ -650,7 +649,6 @@ static void jsock_send_event(cJSON *event)
 		cJSON *msg = NULL, *params;
 		params = cJSON_Duplicate(event, 1);
 		msg = jrpc_new_req("verto.event", NULL, &params);
-		//ws_write_json(use_jsock, &msg, SWITCH_TRUE); 
 		jsock_queue_event(use_jsock, &msg, SWITCH_TRUE);
 		switch_thread_rwlock_unlock(use_jsock->rwlock);
 		use_jsock = NULL;
@@ -1037,7 +1035,7 @@ static void tech_reattach(verto_pvt_t *tech_pvt, jsock_t *jsock)
 					  switch_channel_get_name(tech_pvt->channel),
 					  tech_pvt->mparams->local_sdp_str);
 	set_call_params(params, tech_pvt);
- 	ws_write_json(jsock, &msg, SWITCH_TRUE);
+ 	jsock_queue_event(jsock, &msg, SWITCH_TRUE);
 }
 
 static void drop_detached(void)
@@ -1495,7 +1493,7 @@ static switch_status_t verto_on_hangup(switch_core_session_t *session)
 		
 		cJSON_AddItemToObject(params, "causeCode", cJSON_CreateNumber(cause));
 		cJSON_AddItemToObject(params, "cause", cJSON_CreateString(switch_channel_cause2str(cause)));
-		ws_write_json(jsock, &msg, SWITCH_TRUE);
+		jsock_queue_event(jsock, &msg, SWITCH_TRUE);
 
 		switch_thread_rwlock_unlock(jsock->rwlock);
 	}
@@ -1569,7 +1567,7 @@ static switch_status_t verto_connect(switch_core_session_t *session, const char
             cJSON_AddItemToObject(params, "sdp", cJSON_CreateString(tech_pvt->mparams->local_sdp_str));
 			set_call_params(params, tech_pvt);
 			
-            ws_write_json(jsock, &msg, SWITCH_TRUE);
+            jsock_queue_event(jsock, &msg, SWITCH_TRUE);
         } else {
             status = SWITCH_STATUS_FALSE;
         }
@@ -1815,7 +1813,7 @@ static switch_status_t verto_send_media_indication(switch_core_session_t *sessio
 
 			switch_set_flag(tech_pvt, TFLAG_SENT_MEDIA);
 
-			if (ws_write_json(jsock, &msg, SWITCH_TRUE) <= 0) {
+			if (jsock_queue_event(jsock, &msg, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
 				switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 			}
 
@@ -1846,7 +1844,6 @@ static switch_status_t messagehook (switch_core_session_t *session, switch_core_
 					jmsg = jrpc_new_req("verto.display", tech_pvt->call_id, &params);
 					cJSON_AddItemToObject(params, "display_name", cJSON_CreateString(name));
 					cJSON_AddItemToObject(params, "display_number", cJSON_CreateString(number));
-					//ws_write_json(jsock, &jmsg, SWITCH_TRUE);
 					jsock_queue_event(jsock, &jmsg, SWITCH_TRUE);
 				}
 
@@ -3276,7 +3273,7 @@ static int profile_one_loop(verto_profile_t *profile)
 
 	max = i;
 
-	if ((res = switch_wait_socklist(pfds, max, 1000)) < 0) {
+	if ((res = switch_wait_socklist(pfds, max, 100)) < 0) {
 		if (errno != EINTR) {
 			die("POLL FAILED\n");
 		}
@@ -4096,7 +4093,6 @@ static int verto_send_chat(const char *uid, const char *call_id, cJSON *msg)
 		
 		for(jsock = profile->jsock_head; jsock; jsock = jsock->next) {
 			if (jsock->ready && !zstr(jsock->uid) && !strcmp(uid, jsock->uid)) {
-				//ws_write_json(jsock, &msg, SWITCH_FALSE);
 				jsock_queue_event(jsock, &msg, SWITCH_FALSE);
 				hits++;
 			}

From 86ef5d2668e4d569b5d3ff949187f590ba73a308 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Sun, 27 Jul 2014 17:23:51 -0500
Subject: [PATCH 119/130] trivial compiler fix

---
 src/switch_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 6e7dfeacc3..2dc4144e64 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2757,7 +2757,7 @@ SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t l
 	fd_set *wfds;
 	fd_set *efds;
 	struct timeval tv;
-	int i;
+	unsigned int i;
 	switch_os_socket_t max_fd = 0;
 	int flags = 0;
 

From 4c2b84e89e618079a84cadd114e7df7a313788f1 Mon Sep 17 00:00:00 2001
From: Seven Du <dujinfang@gmail.com>
Date: Mon, 28 Jul 2014 20:02:09 +0800
Subject: [PATCH 120/130] using hosted version to avoid blocks, following
 cb7a338 7596689

---
 html5/verto/demo/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html5/verto/demo/index.html b/html5/verto/demo/index.html
index e40e1029fa..dd226989de 100644
--- a/html5/verto/demo/index.html
+++ b/html5/verto/demo/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.css"/>
+  <link rel="stylesheet" href="css/jquery.mobile.min.css"/>
   <link rel="stylesheet" type="text/css" href="css/jsontable.css" />
   <link rel="shortcut icon" href="favicon.ico" />
     <meta charset="utf-8" />

From 8d818c3be75033e9bbe3b4e74439ed0371cd41bd Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Mon, 28 Jul 2014 23:35:06 +0800
Subject: [PATCH 121/130] Fixes for DTC handling in the T.38 gateway

---
 libs/spandsp/spandsp/tsb85.xml | 14 +++++++-------
 libs/spandsp/src/dtmf.c        |  6 +++---
 libs/spandsp/src/hdlc.c        |  2 +-
 libs/spandsp/src/t30.c         |  7 ++++---
 libs/spandsp/src/t38_gateway.c | 15 ++++++++-------
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/libs/spandsp/spandsp/tsb85.xml b/libs/spandsp/spandsp/tsb85.xml
index 8fa4502444..a711100916 100644
--- a/libs/spandsp/spandsp/tsb85.xml
+++ b/libs/spandsp/spandsp/tsb85.xml
@@ -5679,7 +5679,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="PPR" value="FF C8 3D 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="HDLC" modem="V.21" tag="CTC" value="FF C8 C8 00 10"/>
+        <step dir="R" type="HDLC" modem="V.21" tag="CTC" value="FF C8 C8 00 00"/>
         <step dir="R" type="SILENCE"/>
 
         <step type="WAIT" value="75"/>
@@ -5687,7 +5687,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="CTR" value="FF C8 23"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="PP" modem="V.27ter/4800" frame_size="64" timeout="60000"/>
+        <step dir="R" type="PP" modem="V.27ter/2400" frame_size="64" timeout="60000"/>
         <step dir="R" type="HDLC" modem="V.21" tag="PPS-EOP+" value="FF C8 FD F4 ..."/>
         <step dir="R" type="SILENCE"/>
 
@@ -5696,7 +5696,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="PPR" value="FF C8 3D 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="PP" modem="V.27ter/4800" frame_size="64" timeout="60000"/>
+        <step dir="R" type="PP" modem="V.27ter/2400" frame_size="64" timeout="60000"/>
         <step dir="R" type="HDLC" modem="V.21" tag="PPS-EOP+" value="FF C8 FD F4 ..."/>
         <step dir="R" type="SILENCE"/>
 
@@ -5705,7 +5705,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="PPR" value="FF C8 3D 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="PP" modem="V.27ter/4800" frame_size="64" timeout="60000"/>
+        <step dir="R" type="PP" modem="V.27ter/2400" frame_size="64" timeout="60000"/>
         <step dir="R" type="HDLC" modem="V.21" tag="PPS-EOP+" value="FF C8 FD F4 ..."/>
         <step dir="R" type="SILENCE"/>
 
@@ -5714,7 +5714,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="PPR" value="FF C8 3D 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="PP" modem="V.27ter/4800" frame_size="64" timeout="60000"/>
+        <step dir="R" type="PP" modem="V.27ter/2400" frame_size="64" timeout="60000"/>
         <step dir="R" type="HDLC" modem="V.21" tag="PPS-EOP+" value="FF C8 FD F4 ..."/>
         <step dir="R" type="SILENCE"/>
 
@@ -5793,7 +5793,7 @@
         <step dir="T" type="HDLC" modem="V.21" tag="PPR" value="FF C8 3D 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="HDLC" modem="V.21" tag="CTC+" value="FF C8 C8 00 10"/>
+        <step dir="R" type="HDLC" modem="V.21" tag="CTC+" value="FF C8 C8 00 00"/>
         <step dir="R" type="SILENCE"/>
 
         <step type="WAIT" value="75"/>
@@ -5801,7 +5801,7 @@
         <step dir="T" type="HDLC" tag="CTR" value="FF C8 23"/>
         <step dir="T" type="POSTAMBLE"/>
 
-        <step dir="R" type="PP" modem="V.27ter/4800" frame_size="64" timeout="60000"/>
+        <step dir="R" type="PP" modem="V.27ter/2400" frame_size="64" timeout="60000"/>
         <step dir="R" type="HDLC" modem="V.21" tag="PPS-EOP+" value="FF C8 FD F4 ..."/>
 
         <step type="WAIT" value="75"/>
diff --git a/libs/spandsp/src/dtmf.c b/libs/spandsp/src/dtmf.c
index fe235f45a1..48a8836337 100644
--- a/libs/spandsp/src/dtmf.c
+++ b/libs/spandsp/src/dtmf.c
@@ -68,8 +68,6 @@
 #define DEFAULT_DTMF_TX_ON_TIME     50
 #define DEFAULT_DTMF_TX_OFF_TIME    55
 
-#define DTMF_SAMPLES_PER_BLOCK      102
-
 #if defined(SPANDSP_USE_FIXED_POINT)
 /* The fixed point version scales the 16 bit signal down by 7 bits, so the Goertzels will fit in a 32 bit word */
 #define FP_SCALE(x)                 ((int16_t) (x/128.0 + ((x >= 0.0)  ?  0.5  :  -0.5)))
@@ -80,6 +78,7 @@
 #define DTMF_RELATIVE_PEAK_COL      6.309f          /* 8dB [10.0^(8.0/10.0)] */
 #define DTMF_TO_TOTAL_ENERGY        83.868f         /* -0.85dB [DTMF_SAMPLES_PER_BLOCK*10^(-0.85/10.0)] */
 #define DTMF_POWER_OFFSET           68.251f         /* 10*log(((32768.0/128.0)^2)*DTMF_SAMPLES_PER_BLOCK) */
+#define DTMF_SAMPLES_PER_BLOCK      102
 #else
 #define FP_SCALE(x)                 (x)
 #define DTMF_THRESHOLD              171032462.0f    /* -42dBm0 [((DTMF_SAMPLES_PER_BLOCK*32768.0/1.4142)*10^((-42 - DBM0_MAX_SINE_POWER)/20.0))^2] */
@@ -89,6 +88,7 @@
 #define DTMF_RELATIVE_PEAK_COL      6.309f          /* 8dB [10.0^(8.0/10.0)] */
 #define DTMF_TO_TOTAL_ENERGY        83.868f         /* -0.85dB [DTMF_SAMPLES_PER_BLOCK*10^(-0.85/10.0)] */
 #define DTMF_POWER_OFFSET           110.395f        /* 10*log((32768.0^2)*DTMF_SAMPLES_PER_BLOCK) */
+#define DTMF_SAMPLES_PER_BLOCK      102
 #endif
 
 static const float dtmf_row[] =
@@ -604,7 +604,7 @@ SPAN_DECLARE(int) dtmf_tx_release(dtmf_tx_state_t *s)
 
 SPAN_DECLARE(int) dtmf_tx_free(dtmf_tx_state_t *s)
 {
-    queue_release(&s->queue.queue);
+    dtmf_tx_release(s);
     span_free(s);
     return 0;
 }
diff --git a/libs/spandsp/src/hdlc.c b/libs/spandsp/src/hdlc.c
index d96609b319..22589d3ed9 100644
--- a/libs/spandsp/src/hdlc.c
+++ b/libs/spandsp/src/hdlc.c
@@ -197,7 +197,7 @@ static void rx_flag_or_abort(hdlc_rx_state_t *s)
             /* Check the flags are back-to-back when testing for valid preamble. This
                greatly reduces the chances of false preamble detection, and anything
                which doesn't send them back-to-back is badly broken. */
-            if (s->num_bits != 7)
+            if (s->flags_seen != s->framing_ok_threshold - 1  &&  s->num_bits != 7)
             {
                 /* Don't set the flags seen indicator back to zero too aggressively.
                    We want to pick up with the minimum of discarded data when there
diff --git a/libs/spandsp/src/t30.c b/libs/spandsp/src/t30.c
index 784a146c1c..bd24898b3e 100644
--- a/libs/spandsp/src/t30.c
+++ b/libs/spandsp/src/t30.c
@@ -152,7 +152,8 @@ static const char *phase_names[] =
 /* These state names are modelled after places in the T.30 flow charts. */
 enum
 {
-    T30_STATE_ANSWERING = 1,
+    T30_STATE_IDLE = 0,
+    T30_STATE_ANSWERING,
     T30_STATE_B,
     T30_STATE_C,
     T30_STATE_D,
@@ -186,7 +187,7 @@ enum
 
 static const char *state_names[] =
 {
-    "NONE",
+    "IDLE",
     "ANSWERING",
     "B",
     "C",
@@ -6402,7 +6403,6 @@ SPAN_DECLARE(void) t30_front_end_status(void *user_data, int status)
             /* Cancel any receive timeout, and declare that a receive signal is present,
                since the front end is explicitly telling us we have seen something. */
             s->rx_signal_present = true;
-            timer_t2_t4_stop(s);
             break;
         }
         break;
@@ -6593,6 +6593,7 @@ SPAN_DECLARE(int) t30_restart(t30_state_t *s, bool calling_party)
 {
     release_resources(s);
     s->calling_party = calling_party;
+    s->state = T30_STATE_IDLE;
     s->phase = T30_PHASE_IDLE;
     s->next_phase = T30_PHASE_IDLE;
     s->current_fallback = 0;
diff --git a/libs/spandsp/src/t38_gateway.c b/libs/spandsp/src/t38_gateway.c
index bb3d02e902..8233baedf6 100644
--- a/libs/spandsp/src/t38_gateway.c
+++ b/libs/spandsp/src/t38_gateway.c
@@ -58,6 +58,7 @@
 #include "spandsp/alloc.h"
 #include "spandsp/logging.h"
 #include "spandsp/queue.h"
+#include "spandsp/vector_int.h"
 #include "spandsp/dc_restore.h"
 #include "spandsp/bit_operations.h"
 #include "spandsp/power_meter.h"
@@ -149,7 +150,7 @@
 #define DATA_END_TX_COUNT                       3
 
 /*! The number of consecutive flags to declare HDLC framing is OK. */
-#define HDLC_FRAMING_OK_THRESHOLD       5
+#define HDLC_FRAMING_OK_THRESHOLD               5
 
 enum
 {
@@ -700,7 +701,7 @@ static void monitor_control_messages(t38_gateway_state_t *s,
             /* If we are processing a message from the modem side, the contents determine the fast receive modem.
                we are to use. If it comes from the T.38 side the contents do not. */
             s->core.fast_bit_rate = modem_codes[i].bit_rate;
-            if (from_modem)
+            if ((buf[2] == T30_DTC  &&  !from_modem)  ||  (buf[2] != T30_DTC  &&  from_modem))
                 s->core.fast_rx_modem = modem_codes[i].modem_type;
             /*endif*/
         }
@@ -1863,7 +1864,7 @@ static void rx_flag_or_abort(hdlc_rx_state_t *t)
             /* Check the flags are back-to-back when testing for valid preamble. This
                greatly reduces the chances of false preamble detection, and anything
                which doesn't send them back-to-back is badly broken. */
-            if (t->num_bits != 7)
+            if (t->flags_seen != t->framing_ok_threshold - 1  &&  t->num_bits != 7)
                 t->flags_seen = 0;
             /*endif*/
             if (++t->flags_seen >= t->framing_ok_threshold  &&  !t->framing_ok_announced)
@@ -2070,15 +2071,15 @@ static void update_rx_timing(t38_gateway_state_t *s, int len)
             {
             case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_PAST_V21_MODEM:
                 /* Timed announcement of training, 75ms after the DCS carrier fell. */
-                s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
                 announce_training(s);
+                s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
                 break;
             case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN:
                 /* Timed announcement of training, 75ms after the DCS carrier fell. */
+                announce_training(s);
                 /* Use a timeout to ride over TEP, if it is present */
                 s->core.samples_to_timeout = ms_to_samples(500);
                 s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
-                announce_training(s);
                 break;
             case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED:
                 s->core.timed_mode = TIMED_MODE_IDLE;
@@ -2172,7 +2173,7 @@ SPAN_DECLARE_NONSTD(int) t38_gateway_tx(t38_gateway_state_t *s, int16_t amp[], i
     if (s->audio.modems.transmit_on_idle)
     {
         /* Pad to the requested length with silence */
-        memset(&amp[len], 0, (max_len - len)*sizeof(int16_t));
+        vec_zeroi16(&amp[len], max_len - len);
         len = max_len;
     }
     /*endif*/
@@ -2180,7 +2181,7 @@ SPAN_DECLARE_NONSTD(int) t38_gateway_tx(t38_gateway_state_t *s, int16_t amp[], i
     if (s->audio.modems.audio_tx_log >= 0)
     {
         if (len < required_len)
-            memset(&amp[len], 0, (required_len - len)*sizeof(int16_t));
+            vec_zeroi16(&amp[len], required_len - len);
         /*endif*/
         write(s->audio.modems.audio_tx_log, amp, required_len*sizeof(int16_t));
     }

From 0732c0b0274edc330ee99ac7ffaa52b7b8184738 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 29 Jul 2014 03:04:24 +0500
Subject: [PATCH 122/130] FS-6631 #resolve

---
 src/switch_core_media.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index ab98003c11..26987402df 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -3478,6 +3478,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
 						match = (map->rm_pt == imp->ianacode) ? 1 : 0;
 					} else {
 						match = (!strcasecmp(rm_encoding, imp->iananame) && 
+								 ((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96)) &&
 								 (remote_codec_rate == codec_rate || fmtp_remote_codec_rate == imp->actual_samples_per_second)) ? 1 : 0;
 						if (fmtp_remote_codec_rate) {
 							remote_codec_rate = fmtp_remote_codec_rate;
@@ -8404,7 +8405,8 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 							match = (map->rm_pt == imp->ianacode) ? 1 : 0;
 						} else {
 							if (map->rm_encoding) {
-								match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
+								match = !strcasecmp(map->rm_encoding, imp->iananame) &&
+									((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
 							} else {
 								match = 0;
 							}
@@ -8433,7 +8435,8 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 							match = (map->rm_pt == imp->ianacode) ? 1 : 0;
 						} else {
 							if (map->rm_encoding) {
-								match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
+								match = !strcasecmp(map->rm_encoding, imp->iananame) &&
+									((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
 							} else {
 								match = 0;
 							}
@@ -8479,7 +8482,8 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
 						match = (map->rm_pt == imp->ianacode) ? 1 : 0;
 					} else {
 						if (map->rm_encoding) {
-							match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1;
+							match = !strcasecmp(map->rm_encoding, imp->iananame) &&
+								((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
 						} else {
 							match = 0;
 						}

From af64da86f28bd7e5d2118e0294d5fb9d33e3936b Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Tue, 29 Jul 2014 21:22:47 +0800
Subject: [PATCH 123/130] Improved HDLC abort handling

---
 libs/spandsp/src/hdlc.c        | 26 ++++++++++++-----
 libs/spandsp/src/t38_gateway.c | 52 ++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/libs/spandsp/src/hdlc.c b/libs/spandsp/src/hdlc.c
index 22589d3ed9..8891c071f8 100644
--- a/libs/spandsp/src/hdlc.c
+++ b/libs/spandsp/src/hdlc.c
@@ -126,7 +126,7 @@ static __inline__ void octet_count(hdlc_rx_state_t *s)
 
 static void rx_flag_or_abort(hdlc_rx_state_t *s)
 {
-    if ((s->raw_bit_stream & 0x8000))
+    if ((s->raw_bit_stream & 0x0100))
     {
         /* Hit HDLC abort */
         s->rx_aborts++;
@@ -196,7 +196,10 @@ static void rx_flag_or_abort(hdlc_rx_state_t *s)
         {
             /* Check the flags are back-to-back when testing for valid preamble. This
                greatly reduces the chances of false preamble detection, and anything
-               which doesn't send them back-to-back is badly broken. */
+               which doesn't send them back-to-back is badly broken. When we are one
+               flag away from OK we should not apply the back-to-back consition, as
+               between an abort and the following start of frame things might not be
+               octet aligned. */
             if (s->flags_seen != s->framing_ok_threshold - 1  &&  s->num_bits != 7)
             {
                 /* Don't set the flags seen indicator back to zero too aggressively.
@@ -222,13 +225,22 @@ static void rx_flag_or_abort(hdlc_rx_state_t *s)
 
 static __inline__ void hdlc_rx_put_bit_core(hdlc_rx_state_t *s)
 {
-    if ((s->raw_bit_stream & 0x3F00) == 0x3E00)
+    if ((s->raw_bit_stream & 0x3E00) == 0x3E00)
     {
-        /* Its time to either skip a bit, for stuffing, or process a
-           flag or abort */
-        if ((s->raw_bit_stream & 0x4000))
+        /* There are at least 5 ones in a row. We could be at a:
+            - point where stuffing occurs
+            - a flag
+            - an abort
+            - the result of bit errors */
+        /* Is this a bit to be skipped for destuffing? */
+        if ((s->raw_bit_stream & 0x4100) == 0)
+            return;
+        /* Is this a flag or abort? */
+        if ((s->raw_bit_stream & 0xFE00) == 0x7E00)
+        {
             rx_flag_or_abort(s);
-        return;
+            return;
+        }
     }
     s->num_bits++;
     if (s->flags_seen < s->framing_ok_threshold)
diff --git a/libs/spandsp/src/t38_gateway.c b/libs/spandsp/src/t38_gateway.c
index 8233baedf6..88b17352c4 100644
--- a/libs/spandsp/src/t38_gateway.c
+++ b/libs/spandsp/src/t38_gateway.c
@@ -152,6 +152,8 @@
 /*! The number of consecutive flags to declare HDLC framing is OK. */
 #define HDLC_FRAMING_OK_THRESHOLD               5
 
+#define HDLC_TRAMISSION_LAG_OCTETS              2
+
 enum
 {
     DISBIT1 = 0x01,
@@ -1765,7 +1767,7 @@ static void rx_flag_or_abort(hdlc_rx_state_t *t)
 
     s = (t38_gateway_state_t *) t->frame_user_data;
     u = &s->core.to_t38;
-    if ((t->raw_bit_stream & 0x80))
+    if ((t->raw_bit_stream & 0x01))
     {
         /* Hit HDLC abort */
         t->rx_aborts++;
@@ -1774,6 +1776,23 @@ static void rx_flag_or_abort(hdlc_rx_state_t *t)
         else
             t->flags_seen = t->framing_ok_threshold - 1;
         /*endif*/
+        if (t->len > 0)
+        {
+            span_log(&s->logging, SPAN_LOG_FLOW, "HDLC frame aborted at %d\n", t->len);
+            /* If we have sent some of this frame we need to treat the abort as though it is a CRC error,
+               as reporting a bad CRC is the only way T.38 allows us to scrub a frame in progress. */
+            /* It seems some boxes may not like us sending a _SIG_END here, and then another
+               when the carrier actually drops. Lets just send T38_FIELD_HDLC_FCS_OK here. */
+            if (t->len > 2)
+            {
+                category = (s->t38x.current_tx_data_type == T38_DATA_V21)  ?  T38_PACKET_CATEGORY_CONTROL_DATA  :  T38_PACKET_CATEGORY_IMAGE_DATA;
+                if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_FCS_BAD, NULL, 0, category) < 0)
+                    span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");
+                /*endif*/
+            }
+            /*endif*/
+        }
+        /*endif*/
     }
     else
     {
@@ -1863,7 +1882,10 @@ static void rx_flag_or_abort(hdlc_rx_state_t *t)
         {
             /* Check the flags are back-to-back when testing for valid preamble. This
                greatly reduces the chances of false preamble detection, and anything
-               which doesn't send them back-to-back is badly broken. */
+               which doesn't send them back-to-back is badly broken. When we are one
+               flag away from OK we should not apply the back-to-back consition, as
+               between an abort and the following start of frame things might not be
+               octet aligned. */
             if (t->flags_seen != t->framing_ok_threshold - 1  &&  t->num_bits != 7)
                 t->flags_seen = 0;
             /*endif*/
@@ -1906,12 +1928,24 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     }
     /*endif*/
     t->raw_bit_stream = (t->raw_bit_stream << 1) | (new_bit & 1);
-    if ((t->raw_bit_stream & 0x3F) == 0x3E)
+    if ((t->raw_bit_stream & 0x3E) == 0x3E)
     {
-        /* Its time to either skip a bit, for stuffing, or process a flag or abort */
-        if ((t->raw_bit_stream & 0x40))
+        /* There are at least 5 ones in a row. We could be at a:
+            - point where stuffing occurs
+            - a flag
+            - an abort
+            - the result of bit errors */
+        /* Is this a bit to be skipped for destuffing? */
+        if ((t->raw_bit_stream & 0x41) == 0)
+            return;
+        /*endif*/
+        /* Is this a flag or abort? */
+        if ((t->raw_bit_stream & 0xFE) == 0x7E)
+        {
             rx_flag_or_abort(t);
-        return;
+            return;
+        }
+        /*endif*/
     }
     /*endif*/
     t->num_bits++;
@@ -1928,7 +1962,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     if (t->len >= (int) sizeof(t->buffer))
     {
         /* This is too long. Abandon the frame, and wait for the next flag octet. */
-        if ((t->len + 2) >= u->octets_per_data_packet)
+        if ((t->len + HDLC_TRAMISSION_LAG_OCTETS) >= u->octets_per_data_packet)
         {
             /* We will have sent some of this frame already, so we need to send termination of this bad HDLC frame. */
             category = (s->t38x.current_tx_data_type == T38_DATA_V21)  ?  T38_PACKET_CATEGORY_CONTROL_DATA  :  T38_PACKET_CATEGORY_IMAGE_DATA;
@@ -1968,7 +2002,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     u->crc = crc_itu16_calc(&t->buffer[t->len], 1, u->crc);
     /* Make the transmission lag by two octets, so we do not send the CRC, and
        do not report the CRC result too late. */
-    if (++t->len <= 2)
+    if (++t->len <= HDLC_TRAMISSION_LAG_OCTETS)
         return;
     /*endif*/
     if (s->t38x.current_tx_data_type == T38_DATA_V21)
@@ -1979,7 +2013,7 @@ static void t38_hdlc_rx_put_bit(hdlc_rx_state_t *t, int new_bit)
     }
     if (++u->data_ptr >= u->octets_per_data_packet)
     {
-        bit_reverse(u->data, &t->buffer[t->len - 2 - u->data_ptr], u->data_ptr);
+        bit_reverse(u->data, &t->buffer[t->len - HDLC_TRAMISSION_LAG_OCTETS - u->data_ptr], u->data_ptr);
         category = (s->t38x.current_tx_data_type == T38_DATA_V21)  ?  T38_PACKET_CATEGORY_CONTROL_DATA  :  T38_PACKET_CATEGORY_IMAGE_DATA;
         if (t38_core_send_data(&s->t38x.t38, s->t38x.current_tx_data_type, T38_FIELD_HDLC_DATA, u->data, u->data_ptr, category) < 0)
             span_log(&s->logging, SPAN_LOG_WARNING, "T.38 send failed\n");

From 502ddd312a4e2dfc27d0f6bd13b59f20c41ef5e4 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 29 Jul 2014 22:16:56 +0500
Subject: [PATCH 124/130] FS-6702 #resolve

---
 html5/verto/demo/verto.js               |  5 +++++
 src/mod/endpoints/mod_verto/mod_verto.c | 13 +++++++++++++
 src/switch_core_media.c                 |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/html5/verto/demo/verto.js b/html5/verto/demo/verto.js
index 2099824f13..a7c39295df 100644
--- a/html5/verto/demo/verto.js
+++ b/html5/verto/demo/verto.js
@@ -456,6 +456,7 @@ function init() {
 
 $(document).ready(function() {
     var hash = window.location.hash.substring(1);    
+    var a = [];
 
     if (hash && hash.indexOf("page-") == -1) {
 	window.location.hash = "";
@@ -463,6 +464,10 @@ $(document).ready(function() {
 	autocall = true;
     }
 
+    if (hash && (a = hash.split("&"))) {
+	window.location.hash = a[0];
+    }
+
     init();
 
 });
diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index c7f4128690..d2a5b5fdad 100644
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -1083,6 +1083,11 @@ static void detach_calls(jsock_t *jsock)
 			if (!switch_channel_up_nosig(tech_pvt->channel)) {
 				continue;
 			}
+
+			if (!switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED)) {
+				switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+				continue;
+			}
 			
 			tech_pvt->detach_time = switch_epoch_time_now(NULL);
 			globals.detached++;
@@ -2478,6 +2483,14 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
 	tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY);
 	tech_pvt->r_sdp = switch_core_session_strdup(session, sdp);
 
+
+	if (!switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED)) {
+		switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+		cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Cannot attach to a call that has not been answered."));
+		err = 1; goto cleanup;
+	}
+
+
 	switch_channel_set_variable(tech_pvt->channel, SWITCH_R_SDP_VARIABLE, tech_pvt->r_sdp);
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote SDP %s:\n%s\n", 
 					  switch_channel_get_name(tech_pvt->channel), tech_pvt->r_sdp);
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 26987402df..b04df85757 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -2882,7 +2882,7 @@ static void check_ice(switch_media_handle_t *smh, switch_media_type_t type, sdp_
 			}
 		}
 			
-		if (engine->ice_in.cands[engine->ice_in.chosen[1]][1].ready) {
+		if (engine->rtp_session && engine->ice_in.cands[engine->ice_in.chosen[1]][1].ready) {
 			if (engine->rtcp_mux > 0 && !strcmp(engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_addr, engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_addr)
 				&& engine->ice_in.cands[engine->ice_in.chosen[1]][1].con_port == engine->ice_in.cands[engine->ice_in.chosen[0]][0].con_port) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_INFO, "Skipping %s RTCP ICE (Same as RTP)\n", type2str(type));

From 388d980b860c3d0248200a952e411626a080e4ad Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 29 Jul 2014 22:20:31 +0500
Subject: [PATCH 125/130] FS-6701 #resolve

---
 src/switch_channel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 78ebc97938..ccc43aefef 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -393,6 +393,7 @@ SWITCH_DECLARE(void) switch_channel_set_direction(switch_channel_t *channel, swi
 {
 	if (!switch_core_session_in_thread(channel->session)) {
 		channel->direction = channel->logical_direction = direction;
+		switch_channel_set_variable(channel, "direction", switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
 	}
 }
 

From b1f382c67ea3a123e194c738281f2e3e1117d729 Mon Sep 17 00:00:00 2001
From: William King <william.king@quentustech.com>
Date: Tue, 29 Jul 2014 21:42:31 -0700
Subject: [PATCH 126/130] CID 1229134: fix small memory leak

---
 src/switch_utils.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 2dc4144e64..a995ebc405 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2654,6 +2654,8 @@ SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t l
 		}
 	}
 
+	free(pfds);
+
 	return r;
 
 }

From 49700ecf0fd05ff5302f503918d3ed86cbea7649 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 30 Jul 2014 22:13:57 +0500
Subject: [PATCH 127/130] fix extraneous < in sip url parser

---
 src/mod/endpoints/mod_sofia/sofia_glue.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index ef01bbc0d8..fe522fdd4f 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -1495,7 +1495,9 @@ char *sofia_glue_get_url_from_contact(char *buf, uint8_t to_dup)
 		buf++;
 	}
 
-	if ((url = strchr(buf, '<')) && (e = switch_find_end_paren(url, '<', '>'))) {
+	url = strchr(buf, '<');
+
+	if (url && (e = switch_find_end_paren(url, '<', '>'))) {
 		url++;
 		if (to_dup) {
 			url = strdup(url);
@@ -1504,6 +1506,8 @@ char *sofia_glue_get_url_from_contact(char *buf, uint8_t to_dup)
 
 		*e = '\0';
 	} else {
+		if (url) buf++;
+
 		if (to_dup) {
 			url = strdup(buf);
 		} else {

From 5075d4af0de3dbf351d45b7431a1429d1c97ef15 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 30 Jul 2014 22:17:47 +0500
Subject: [PATCH 128/130] fix typo that can lead to seg

---
 src/mod/endpoints/mod_sofia/sofia_presence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 5691da5ade..0d318b4282 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -4915,7 +4915,7 @@ void sofia_presence_handle_sip_i_message(int status,
 								reps++;
 								switch_snprintf(new_name, sizeof(new_name), "%s%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name, postfix);
 
-								if (switch_channel_get_variable(channel, new_name)) {
+								if (switch_event_get_header(event, new_name)) {
 									continue;
 								}
 

From 1933c7cb8ab4b8e7c2453d8d0c96742db2c88815 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 31 Jul 2014 03:21:19 +0000
Subject: [PATCH 129/130] Fix build on Debian sid/jessie

Debian has packaged libpq version 9.4beta2.  We were parsing the minor
version as "4beta2" and then trying to treat it as a constant integer,
which obviously doesn't work.

There's not really a perfect way to handle versions like this, so
we'll just pretend it's 9.4.0.
---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2928a0ab24..7baf54ecaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,9 +568,10 @@ if test x"$enable_core_pgsql_support" = x"yes" ; then
       POSTGRESQL_LIBDIR="`$PKG_CONFIG libpq --libs-only-L`"
       POSTGRESQL_LDFLAGS="`$PKG_CONFIG --libs libpq`"
       POSTGRESQL_VERSION="`$PKG_CONFIG --modversion libpq`"
-      POSTGRESQL_MAJOR_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f1`"
-      POSTGRESQL_MINOR_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f2`"
-      POSTGRESQL_PATCH_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f3`"
+      POSTGRESQL_MAJOR_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f1 | sed 's/^\([[0-9]]*\)[[^0-9]].*/\1/'`"
+      POSTGRESQL_MINOR_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f2 | sed 's/^\([[0-9]]*\)[[^0-9]].*/\1/'`"
+      POSTGRESQL_PATCH_VERSION="`echo $POSTGRESQL_VERSION | cut -d. -f3 | sed 's/^\([[0-9]]*\)[[^0-9]].*/\1/'`"
+      test -n "$POSTGRESQL_PATCH_VERSION" || POSTGRESQL_PATCH_VERSION=0
     fi
     save_LIBS="$LIBS"
     LIBS="$POSTGRESQL_LIBDIR $LIBS"

From 5a7144c44a0979cbfdd01ae48edcb1668be02f20 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 31 Jul 2014 02:29:02 +0000
Subject: [PATCH 130/130] Add DELETE request support to mod_curl

---
 src/mod/applications/mod_curl/mod_curl.c | 29 +++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/mod/applications/mod_curl/mod_curl.c b/src/mod/applications/mod_curl/mod_curl.c
index 43229180fd..03c0eda5c8 100644
--- a/src/mod/applications/mod_curl/mod_curl.c
+++ b/src/mod/applications/mod_curl/mod_curl.c
@@ -51,7 +51,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load);
  */
 SWITCH_MODULE_DEFINITION(mod_curl, mod_curl_load, mod_curl_shutdown, NULL);
 
-static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|timeout <seconds>] [get|head|post|put [post/put_data]]";
+static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|timeout <seconds>] [get|head|post|delete|put [data]]";
 
 #define HTTP_SENDFILE_ACK_EVENT "curl_sendfile::ack"
 #define HTTP_SENDFILE_RESPONSE_SIZE 32768
@@ -209,6 +209,17 @@ static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, c
 			switch_safe_free(ct);
 		}
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Post data: %s\n", data);
+	} else if (!strcasecmp(method, "delete")) {
+		switch_curl_easy_setopt(curl_handle, CURLOPT_CUSTOMREQUEST, "DELETE");
+		switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE, strlen(data));
+		switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, (void *) data);
+		if (content_type) {
+			char *ct = switch_mprintf("Content-Type: %s", content_type);
+			headers = switch_curl_slist_append(headers, ct);
+			switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
+			switch_safe_free(ct);
+		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DELETE data: %s\n", data);
 	} else if (!strcasecmp(method, "put")) {
 		dstream.data = data;
 		dstream.length = strlen(data);
@@ -788,6 +799,14 @@ SWITCH_STANDARD_APP(curl_app_function)
 				} else {
 					postdata = "";
 				}
+			} else if (!strcasecmp("delete", argv[i])) {
+				method = "delete";
+				if (++i < argc) {
+					postdata = switch_core_strdup(pool, argv[i]);
+					switch_url_decode(postdata);
+				} else {
+					postdata = "";
+				}
 			} else if (!strcasecmp("put", argv[i])) {
 				method = "put";
 				if (++i < argc) {
@@ -900,6 +919,14 @@ SWITCH_STANDARD_API(curl_function)
 				} else {
 					postdata = "";
 				}
+			} else if (!strcasecmp("delete", argv[i])) {
+				method = "delete";
+				if (++i < argc) {
+					postdata = switch_core_strdup(pool, argv[i]);
+					switch_url_decode(postdata);
+				} else {
+					postdata = "";
+				}
 			} else if (!strcasecmp("put", argv[i])) {
 				method = "put";
 				if (++i < argc) {